1456 files changed, 148799 insertions, 148799 deletions

diff --git a/epan/dissectors/asn1/HI2Operations/packet-HI2Operations-template.c b/epan/dissectors/asn1/HI2Operations/packet-HI2Operations-template.c
index 9b82c45f1b..1694efdf18 100644
--- a/epan/dissectors/asn1/HI2Operations/packet-HI2Operations-template.c
+++ b/epan/dissectors/asn1/HI2Operations/packet-HI2Operations-template.c
@@ -29,7 +29,7 @@ void proto_register_HI2Operations(void);
 void proto_reg_handoff_HI2Operations(void);
 
 /* Initialize the protocol and registered fields */
-int proto_HI2Operations = -1;
+int proto_HI2Operations;
 #include "packet-HI2Operations-hf.c"
 
 /* Initialize the subtree pointers */
diff --git a/epan/dissectors/asn1/acse/packet-acse-template.c b/epan/dissectors/asn1/acse/packet-acse-template.c
index 81cf9db14e..68d0851995 100644
--- a/epan/dissectors/asn1/acse/packet-acse-template.c
+++ b/epan/dissectors/asn1/acse/packet-acse-template.c
@@ -47,8 +47,8 @@ void proto_register_acse(void);
 void proto_reg_handoff_acse(void);
 
 /* Initialize the protocol and registered fields */
-int proto_acse = -1;
-int proto_clacse = -1;
+int proto_acse;
+int proto_clacse;
 
 
 
diff --git a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c
index 7c4868a374..ae7f5173b2 100644
--- a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c
+++ b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c
@@ -133,7 +133,7 @@ static int hf_gsm_map_ericsson_locationInformation_sac;
 static int hf_gsm_map_ussd_string;
 static int hf_gsm_map_spare_bits;
 static int hf_gsm_map_qos_signalling_ind;
-static int hf_gsm_map_qos_source_stat_desc = - 1;
+static int hf_gsm_map_qos_source_stat_desc;
 static int hf_gsm_map_qos_max_bitrate_upl_ext;
 static int hf_gsm_map_qos_max_bitrate_downl_ext;
 static int hf_gsm_map_qos_guar_bitrate_upl_ext;
diff --git a/epan/dissectors/asn1/idmp/packet-idmp-template.c b/epan/dissectors/asn1/idmp/packet-idmp-template.c
index 74c888e05e..ad9db5f6d3 100644
--- a/epan/dissectors/asn1/idmp/packet-idmp-template.c
+++ b/epan/dissectors/asn1/idmp/packet-idmp-template.c
@@ -48,7 +48,7 @@ static const char *saved_protocolID = NULL;
 static guint32     opcode           = -1;
 
 /* Initialize the protocol and registered fields */
-int proto_idmp = -1;
+int proto_idmp;
 
 static int hf_idmp_version;
 static int hf_idmp_final;
diff --git a/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.c b/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.c
index bb60d04f82..3baddbf1cd 100644
--- a/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.c
+++ b/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.c
@@ -35,7 +35,7 @@ void proto_register_ieee1609dot2(void);
 void proto_reg_handoff_ieee1609dot2(void);
 
 /* Initialize the protocol and registered fields */
-int proto_ieee1609dot2 = -1;
+int proto_ieee1609dot2;
 dissector_handle_t proto_ieee1609dot2_handle = NULL;
 #include "packet-ieee1609dot2-hf.c"
 
diff --git a/epan/dissectors/asn1/ocsp/packet-ocsp-template.c b/epan/dissectors/asn1/ocsp/packet-ocsp-template.c
index f24da98918..f32ff92571 100644
--- a/epan/dissectors/asn1/ocsp/packet-ocsp-template.c
+++ b/epan/dissectors/asn1/ocsp/packet-ocsp-template.c
@@ -33,7 +33,7 @@ static dissector_handle_t ocsp_request_handle;
 static dissector_handle_t ocsp_response_handle;
 
 /* Initialize the protocol and registered fields */
-int proto_ocsp = -1;
+int proto_ocsp;
 static int hf_ocsp_responseType_id;
 #include "packet-ocsp-hf.c"
 
diff --git a/epan/dissectors/asn1/rrc/packet-rrc-template.c b/epan/dissectors/asn1/rrc/packet-rrc-template.c
index a5c72db08b..6beca58356 100644
--- a/epan/dissectors/asn1/rrc/packet-rrc-template.c
+++ b/epan/dissectors/asn1/rrc/packet-rrc-template.c
@@ -312,7 +312,7 @@ static int dissect_SysInfoType22_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 #include "packet-rrc-val.h"
 
 /* Initialize the protocol and registered fields */
-int proto_rrc = -1;
+int proto_rrc;
 static int hf_test;
 static int hf_urnti;
 static int hf_urnti_new;
diff --git a/epan/dissectors/asn1/tcap/packet-tcap-template.c b/epan/dissectors/asn1/tcap/packet-tcap-template.c
index e78367e9a9..8ab859483d 100644
--- a/epan/dissectors/asn1/tcap/packet-tcap-template.c
+++ b/epan/dissectors/asn1/tcap/packet-tcap-template.c
@@ -39,11 +39,11 @@ static int hf_tcap_data;
 static int hf_tcap_tid;
 static int hf_tcap_constructor_eoc;
 
-int hf_tcapsrt_SessionId=-1;
-int hf_tcapsrt_Duplicate=-1;
-int hf_tcapsrt_BeginSession=-1;
-int hf_tcapsrt_EndSession=-1;
-int hf_tcapsrt_SessionTime=-1;
+int hf_tcapsrt_SessionId;
+int hf_tcapsrt_Duplicate;
+int hf_tcapsrt_BeginSession;
+int hf_tcapsrt_EndSession;
+int hf_tcapsrt_SessionTime;
 
 #include "packet-tcap-hf.c"
 
@@ -53,7 +53,7 @@ static gint ett_param;
 
 static gint ett_otid;
 static gint ett_dtid;
-gint ett_tcap_stat = -1;
+gint ett_tcap_stat;
 
 static struct tcapsrt_info_t * gp_tcapsrt_info;
 static gboolean tcap_subdissector_used=FALSE;
diff --git a/epan/dissectors/corba-idl/gias/README.gias b/epan/dissectors/corba-idl/gias/README.gias
index 0e8523a722..05714408e9 100644
--- a/epan/dissectors/corba-idl/gias/README.gias
+++ b/epan/dissectors/corba-idl/gias/README.gias
@@ -17,7 +17,7 @@ Errors
 ======
 
 Define the heading field:
-static int hf_UCO_InvalidInputParameter_badInputParameters = -1;
+static int hf_UCO_InvalidInputParameter_badInputParameters;
 
 Register the headings fields:
 {&hf_UCO_CompressedImage_data_loop, {"Seq length of CompressedImage_data","giop-gias.CompressedImage.data.size",FT_UINT32,BASE_DEC,NULL,0x0,NULL,
diff --git a/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.c b/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.c
index 88cd3b2169..926b3c5e65 100644
--- a/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.c
+++ b/epan/dissectors/dcerpc/budb/packet-dcerpc-budb-template.c
@@ -27,7 +27,7 @@
 void proto_register_budb(void);
 void proto_reg_handoff_budb(void);
 
-static int proto_budb = -1;
+static int proto_budb;
 ETH_HF
 
 ETH_ETT
diff --git a/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.c b/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.c
index 5d012d3603..f5aff5caed 100644
--- a/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.c
+++ b/epan/dissectors/dcerpc/butc/packet-dcerpc-butc-template.c
@@ -26,7 +26,7 @@
 void proto_register_butc(void);
 void proto_reg_handoff_butc(void);
 
-static int proto_butc = -1;
+static int proto_butc;
 ETH_HF
 
 ETH_ETT
diff --git a/epan/dissectors/file-blf.c b/epan/dissectors/file-blf.c
index cd346c2c51..2e69fa82ad 100644
--- a/epan/dissectors/file-blf.c
+++ b/epan/dissectors/file-blf.c
@@ -25,124 +25,124 @@
 #include <epan/expert.h>
 #include <wiretap/blf.h>
 
-static int proto_blf = -1;
-static int proto_blf_ethernetstatus_obj = -1;
-static int proto_blf_ethernetphystate_obj = -1;
+static int proto_blf;
+static int proto_blf_ethernetstatus_obj;
+static int proto_blf_ethernetphystate_obj;
 
 static dissector_handle_t xml_handle;
 
-static int hf_blf_file_header = -1;
-static int hf_blf_file_header_magic = -1;
-static int hf_blf_file_header_length = -1;
-static int hf_blf_file_header_api = -1;
-static int hf_blf_file_header_app = -1;
-static int hf_blf_file_header_comp_level = -1;
-static int hf_blf_file_header_app_major = -1;
-static int hf_blf_file_header_app_minor = -1;
-static int hf_blf_file_header_len_comp = -1;
-static int hf_blf_file_header_len_uncomp = -1;
-static int hf_blf_file_header_obj_count = -1;
-static int hf_blf_file_header_app_build = -1;
-static int hf_blf_file_header_start_date = -1;
-static int hf_blf_file_header_end_date = -1;
-static int hf_blf_file_header_restore_point_offset = -1;
-
-static int hf_blf_lobj = -1;
-static int hf_blf_lobj_hdr = -1;
-static int hf_blf_lobj_magic = -1;
-static int hf_blf_lobj_hdr_len = -1;
-static int hf_blf_lobj_hdr_type = -1;
-static int hf_blf_lobj_obj_len = -1;
-static int hf_blf_lobj_obj_type = -1;
-static int hf_blf_lobj_hdr_remains = -1;
-static int hf_blf_lobj_payload = -1;
-
-static int hf_blf_cont_comp_method = -1;
-static int hf_blf_cont_res1 = -1;
-static int hf_blf_cont_res2 = -1;
-static int hf_blf_cont_uncomp_size = -1;
-static int hf_blf_cont_res4 = -1;
-static int hf_blf_cont_payload = -1;
-
-static int hf_blf_app_text_source = -1;
-static int hf_blf_app_text_reservedapptext1 = -1;
-static int hf_blf_app_text_textlength = -1;
-static int hf_blf_app_text_reservedapptext2 = -1;
-static int hf_blf_app_text_data_version = -1;
-static int hf_blf_app_text_channelno = -1;
-static int hf_blf_app_text_busstype = -1;
-static int hf_blf_app_text_can_fd_channel = -1;
-static int hf_blf_app_text_metadata_remaining_length = -1;
-static int hf_blf_app_text_metadata_type = -1;
-static int hf_blf_app_text_traceline_source = -1;
-static int hf_blf_app_text_traceline_display_in_tracewindow = -1;
-static int hf_blf_app_text_traceline_ascii_conversion_wo_comment_indicator_timestamp = -1;
-static int hf_blf_app_text_text = -1;
-static int hf_blf_trigg_cond_state = -1;
-static int hf_blf_trigg_cond_triggerblocknamelength = -1;
-static int hf_blf_trigg_cond_triggerconditionlength = -1;
-static int hf_blf_trigg_cond_triggerblockname = -1;
-static int hf_blf_trigg_cond_triggercondition = -1;
-static int hf_blf_sys_var_type = -1;
-static int hf_blf_sys_var_rep = -1;
-static int hf_blf_sys_var_reservedsystemvariable1 = -1;
-static int hf_blf_sys_var_namelength = -1;
-static int hf_blf_sys_var_datalength = -1;
-static int hf_blf_sys_var_reservedsystemvariable2 = -1;
-static int hf_blf_sys_var_name = -1;
-static int hf_blf_sys_var_data = -1;
-static int hf_blf_eth_status_channel = -1;
-static int hf_blf_eth_status_flags1_b0 = -1;
-static int hf_blf_eth_status_flags1_b1 = -1;
-static int hf_blf_eth_status_flags1_b2 = -1;
-static int hf_blf_eth_status_flags1_b3 = -1;
-static int hf_blf_eth_status_flags1_b4 = -1;
-static int hf_blf_eth_status_flags1_b5 = -1;
-static int hf_blf_eth_status_flags1_b6 = -1;
-static int hf_blf_eth_status_flags1_b7 = -1;
-static int hf_blf_eth_status_flags1_b8 = -1;
-static int hf_blf_eth_status_flags1_b9 = -1;
-
-static int hf_blf_eth_status_linkstatus = -1;
-static int hf_blf_eth_status_ethernetphy = -1;
-static int hf_blf_eth_status_duplex = -1;
-static int hf_blf_eth_status_mdi = -1;
-static int hf_blf_eth_status_connector = -1;
-static int hf_blf_eth_status_clockmode = -1;
-static int hf_blf_eth_status_pairs = -1;
-static int hf_blf_eth_status_hardwarechannel = -1;
-static int hf_blf_eth_status_bitrate = -1;
-static int hf_blf_eth_status_linkupduration = -1;
-static int hf_blf_eth_frame_ext_structlength = -1;
-static int hf_blf_eth_frame_ext_flags = -1;
-static int hf_blf_eth_frame_ext_channel = -1;
-static int hf_blf_eth_frame_ext_hardwarechannel = -1;
-static int hf_blf_eth_frame_ext_frameduration = -1;
-static int hf_blf_eth_frame_ext_framechecksum = -1;
-static int hf_blf_eth_frame_ext_dir = -1;
-static int hf_blf_eth_frame_ext_framelength = -1;
-static int hf_blf_eth_frame_ext_framehandle = -1;
-static int hf_blf_eth_frame_ext_reservedethernetframeex = -1;
-
-static int hf_blf_eth_phystate_channel = -1;
-static int hf_blf_eth_phy_state_flags1_b0 = -1;
-static int hf_blf_eth_phy_state_flags1_b1 = -1;
-static int hf_blf_eth_phy_state_flags1_b2 = -1;
-static int hf_blf_eth_phy_state_phystate = -1;
-static int hf_blf_eth_phy_state_eventstate = -1;
-static int hf_blf_eth_phy_state_hardwarechannel = -1;
-static int hf_blf_eth_phy_state_res1 = -1;
-
-static expert_field ei_blf_file_header_length_too_short = EI_INIT;
-static expert_field ei_blf_object_header_length_too_short = EI_INIT;
-static expert_field ei_blf_object_length_less_than_header_length = EI_INIT;
-
-static gint ett_blf = -1;
-static gint ett_blf_header = -1;
-static gint ett_blf_obj = -1;
-static gint ett_blf_obj_header = -1;
-static gint ett_blf_logcontainer_payload = -1;
-static gint ett_blf_app_text_payload = -1;
+static int hf_blf_file_header;
+static int hf_blf_file_header_magic;
+static int hf_blf_file_header_length;
+static int hf_blf_file_header_api;
+static int hf_blf_file_header_app;
+static int hf_blf_file_header_comp_level;
+static int hf_blf_file_header_app_major;
+static int hf_blf_file_header_app_minor;
+static int hf_blf_file_header_len_comp;
+static int hf_blf_file_header_len_uncomp;
+static int hf_blf_file_header_obj_count;
+static int hf_blf_file_header_app_build;
+static int hf_blf_file_header_start_date;
+static int hf_blf_file_header_end_date;
+static int hf_blf_file_header_restore_point_offset;
+
+static int hf_blf_lobj;
+static int hf_blf_lobj_hdr;
+static int hf_blf_lobj_magic;
+static int hf_blf_lobj_hdr_len;
+static int hf_blf_lobj_hdr_type;
+static int hf_blf_lobj_obj_len;
+static int hf_blf_lobj_obj_type;
+static int hf_blf_lobj_hdr_remains;
+static int hf_blf_lobj_payload;
+
+static int hf_blf_cont_comp_method;
+static int hf_blf_cont_res1;
+static int hf_blf_cont_res2;
+static int hf_blf_cont_uncomp_size;
+static int hf_blf_cont_res4;
+static int hf_blf_cont_payload;
+
+static int hf_blf_app_text_source;
+static int hf_blf_app_text_reservedapptext1;
+static int hf_blf_app_text_textlength;
+static int hf_blf_app_text_reservedapptext2;
+static int hf_blf_app_text_data_version;
+static int hf_blf_app_text_channelno;
+static int hf_blf_app_text_busstype;
+static int hf_blf_app_text_can_fd_channel;
+static int hf_blf_app_text_metadata_remaining_length;
+static int hf_blf_app_text_metadata_type;
+static int hf_blf_app_text_traceline_source;
+static int hf_blf_app_text_traceline_display_in_tracewindow;
+static int hf_blf_app_text_traceline_ascii_conversion_wo_comment_indicator_timestamp;
+static int hf_blf_app_text_text;
+static int hf_blf_trigg_cond_state;
+static int hf_blf_trigg_cond_triggerblocknamelength;
+static int hf_blf_trigg_cond_triggerconditionlength;
+static int hf_blf_trigg_cond_triggerblockname;
+static int hf_blf_trigg_cond_triggercondition;
+static int hf_blf_sys_var_type;
+static int hf_blf_sys_var_rep;
+static int hf_blf_sys_var_reservedsystemvariable1;
+static int hf_blf_sys_var_namelength;
+static int hf_blf_sys_var_datalength;
+static int hf_blf_sys_var_reservedsystemvariable2;
+static int hf_blf_sys_var_name;
+static int hf_blf_sys_var_data;
+static int hf_blf_eth_status_channel;
+static int hf_blf_eth_status_flags1_b0;
+static int hf_blf_eth_status_flags1_b1;
+static int hf_blf_eth_status_flags1_b2;
+static int hf_blf_eth_status_flags1_b3;
+static int hf_blf_eth_status_flags1_b4;
+static int hf_blf_eth_status_flags1_b5;
+static int hf_blf_eth_status_flags1_b6;
+static int hf_blf_eth_status_flags1_b7;
+static int hf_blf_eth_status_flags1_b8;
+static int hf_blf_eth_status_flags1_b9;
+
+static int hf_blf_eth_status_linkstatus;
+static int hf_blf_eth_status_ethernetphy;
+static int hf_blf_eth_status_duplex;
+static int hf_blf_eth_status_mdi;
+static int hf_blf_eth_status_connector;
+static int hf_blf_eth_status_clockmode;
+static int hf_blf_eth_status_pairs;
+static int hf_blf_eth_status_hardwarechannel;
+static int hf_blf_eth_status_bitrate;
+static int hf_blf_eth_status_linkupduration;
+static int hf_blf_eth_frame_ext_structlength;
+static int hf_blf_eth_frame_ext_flags;
+static int hf_blf_eth_frame_ext_channel;
+static int hf_blf_eth_frame_ext_hardwarechannel;
+static int hf_blf_eth_frame_ext_frameduration;
+static int hf_blf_eth_frame_ext_framechecksum;
+static int hf_blf_eth_frame_ext_dir;
+static int hf_blf_eth_frame_ext_framelength;
+static int hf_blf_eth_frame_ext_framehandle;
+static int hf_blf_eth_frame_ext_reservedethernetframeex;
+
+static int hf_blf_eth_phystate_channel;
+static int hf_blf_eth_phy_state_flags1_b0;
+static int hf_blf_eth_phy_state_flags1_b1;
+static int hf_blf_eth_phy_state_flags1_b2;
+static int hf_blf_eth_phy_state_phystate;
+static int hf_blf_eth_phy_state_eventstate;
+static int hf_blf_eth_phy_state_hardwarechannel;
+static int hf_blf_eth_phy_state_res1;
+
+static expert_field ei_blf_file_header_length_too_short;
+static expert_field ei_blf_object_header_length_too_short;
+static expert_field ei_blf_object_length_less_than_header_length;
+
+static gint ett_blf;
+static gint ett_blf_header;
+static gint ett_blf_obj;
+static gint ett_blf_obj_header;
+static gint ett_blf_logcontainer_payload;
+static gint ett_blf_app_text_payload;
 
 static const value_string blf_object_names[] = {
     { BLF_OBJTYPE_UNKNOWN,                          "Unknown" },
diff --git a/epan/dissectors/file-btsnoop.c b/epan/dissectors/file-btsnoop.c
index 37ad95b226..4f504101b4 100644
--- a/epan/dissectors/file-btsnoop.c
+++ b/epan/dissectors/file-btsnoop.c
@@ -22,36 +22,36 @@ static dissector_handle_t hci_h1_handle;
 static dissector_handle_t hci_h4_handle;
 static dissector_handle_t hci_mon_handle;
 
-static int proto_btsnoop = -1;
-
-static int hf_btsnoop_header = -1;
-static int hf_btsnoop_magic_bytes = -1;
-static int hf_btsnoop_version = -1;
-static int hf_btsnoop_datalink = -1;
-static int hf_btsnoop_frame = -1;
-static int hf_btsnoop_origin_length = -1;
-static int hf_btsnoop_included_length = -1;
-static int hf_btsnoop_flags = -1;
-static int hf_btsnoop_cumulative_dropped_packets = -1;
-static int hf_btsnoop_timestamp_microseconds = -1;
-static int hf_btsnoop_payload = -1;
-static int hf_btsnoop_flags_h1_reserved = -1;
-static int hf_btsnoop_flags_h1_channel_type = -1;
-static int hf_btsnoop_flags_h1_direction = -1;
-static int hf_btsnoop_flags_h4_reserved = -1;
-static int hf_btsnoop_flags_h4_direction = -1;
-static int hf_btsnoop_flags_linux_monitor_opcode = -1;
-static int hf_btsnoop_flags_linux_monitor_adapter_id = -1;
-
-static expert_field ei_malformed_frame = EI_INIT;
-static expert_field ei_not_implemented_yet = EI_INIT;
-static expert_field ei_unknown_data = EI_INIT;
-
-static gint ett_btsnoop = -1;
-static gint ett_btsnoop_header = -1;
-static gint ett_btsnoop_frame = -1;
-static gint ett_btsnoop_payload = -1;
-static gint ett_btsnoop_flags = -1;
+static int proto_btsnoop;
+
+static int hf_btsnoop_header;
+static int hf_btsnoop_magic_bytes;
+static int hf_btsnoop_version;
+static int hf_btsnoop_datalink;
+static int hf_btsnoop_frame;
+static int hf_btsnoop_origin_length;
+static int hf_btsnoop_included_length;
+static int hf_btsnoop_flags;
+static int hf_btsnoop_cumulative_dropped_packets;
+static int hf_btsnoop_timestamp_microseconds;
+static int hf_btsnoop_payload;
+static int hf_btsnoop_flags_h1_reserved;
+static int hf_btsnoop_flags_h1_channel_type;
+static int hf_btsnoop_flags_h1_direction;
+static int hf_btsnoop_flags_h4_reserved;
+static int hf_btsnoop_flags_h4_direction;
+static int hf_btsnoop_flags_linux_monitor_opcode;
+static int hf_btsnoop_flags_linux_monitor_adapter_id;
+
+static expert_field ei_malformed_frame;
+static expert_field ei_not_implemented_yet;
+static expert_field ei_unknown_data;
+
+static gint ett_btsnoop;
+static gint ett_btsnoop_header;
+static gint ett_btsnoop_frame;
+static gint ett_btsnoop_payload;
+static gint ett_btsnoop_flags;
 
 static gboolean pref_dissect_next_layer = FALSE;
 
diff --git a/epan/dissectors/file-dlt.c b/epan/dissectors/file-dlt.c
index 3b03e3520f..0438ca3115 100644
--- a/epan/dissectors/file-dlt.c
+++ b/epan/dissectors/file-dlt.c
@@ -24,20 +24,20 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 
-static int proto_dlt = -1;
+static int proto_dlt;
 
-static int hf_dlt_file_magic = -1;
-static int hf_dlt_file_tstamp_s = -1;
-static int hf_dlt_file_tstamp_us = -1;
-static int hf_dlt_file_ecuid = -1;
+static int hf_dlt_file_magic;
+static int hf_dlt_file_tstamp_s;
+static int hf_dlt_file_tstamp_us;
+static int hf_dlt_file_ecuid;
 
-static int hf_dlt_file_header_type = -1;
-static int hf_dlt_file_message_counter = -1;
-static int hf_dlt_file_length = -1;
-static int hf_dlt_file_data = -1;
+static int hf_dlt_file_header_type;
+static int hf_dlt_file_message_counter;
+static int hf_dlt_file_length;
+static int hf_dlt_file_data;
 
-static gint ett_dlt = -1;
-static gint ett_dlt_item = -1;
+static gint ett_dlt;
+static gint ett_dlt_item;
 
 void proto_register_file_dlt(void);
 void proto_reg_handoff_file_dlt(void);
diff --git a/epan/dissectors/file-elf.c b/epan/dissectors/file-elf.c
index 23d3d132b5..81d220ec62 100644
--- a/epan/dissectors/file-elf.c
+++ b/epan/dissectors/file-elf.c
@@ -25,176 +25,176 @@
 
 static dissector_handle_t elf_handle;
 
-static int proto_elf = -1;
-
-static int hf_elf_magic_bytes = -1;
-static int hf_elf_file_size = -1;
-static int hf_elf_header_segment_size = -1;
-static int hf_elf_blackholes_size = -1;
-static int hf_elf_blackhole_size = -1;
-static int hf_elf_overlapping_size = -1;
-static int hf_elf_segment = -1;
-static int hf_elf_entry_bytes = -1;
-static int hf_elf_file_class = -1;
-static int hf_elf_data_encoding = -1;
-static int hf_elf_file_version = -1;
-static int hf_elf_os_abi = -1;
-static int hf_elf_abi_version = -1;
-static int hf_elf_file_padding = -1;
-static int hf_elf_type = -1;
-static int hf_elf_machine = -1;
-static int hf_elf_version = -1;
-static int hf_elf_entry = -1;
-static int hf_elf_phoff = -1;
-static int hf_elf_shoff = -1;
-static int hf_elf64_entry = -1;
-static int hf_elf64_phoff = -1;
-static int hf_elf64_shoff = -1;
-static int hf_elf_flags = -1;
-static int hf_elf_ehsize = -1;
-static int hf_elf_phentsize = -1;
-static int hf_elf_phnum = -1;
-static int hf_elf_shentsize = -1;
-static int hf_elf_shnum = -1;
-static int hf_elf_shstrndx = -1;
-static int hf_elf_p_type = -1;
-static int hf_elf_p_type_operating_system_specific = -1;
-static int hf_elf_p_type_processor_specific = -1;
-static int hf_elf_p_flags_execute = -1;
-static int hf_elf_p_flags_write = -1;
-static int hf_elf_p_flags_read = -1;
-static int hf_elf_p_flags_reserved = -1;
-static int hf_elf_p_flags_operating_system_specific = -1;
-static int hf_elf_p_flags_processor_specific = -1;
-static int hf_elf_p_offset = -1;
-static int hf_elf64_p_offset = -1;
-static int hf_elf_p_vaddr = -1;
-static int hf_elf64_p_vaddr = -1;
-static int hf_elf_p_paddr = -1;
-static int hf_elf64_p_paddr = -1;
-static int hf_elf_p_filesz = -1;
-static int hf_elf64_p_filesz = -1;
-static int hf_elf_p_memsz = -1;
-static int hf_elf64_p_memsz = -1;
-static int hf_elf_p_align = -1;
-static int hf_elf64_p_align = -1;
-
-static int hf_elf_sh_name = -1;
-static int hf_elf_sh_type_user_specific = -1;
-static int hf_elf_sh_type_operating_system_specific = -1;
-static int hf_elf_sh_type_processor_specific = -1;
-static int hf_elf_sh_type = -1;
-
-static int hf_elf_sh_flags_processor_specific = -1;
-static int hf_elf_sh_flags_operating_system_specific = -1;
-static int hf_elf_sh_flags_reserved = -1;
-static int hf_elf_sh_flags_tls = -1;
-static int hf_elf_sh_flags_group = -1;
-static int hf_elf_sh_flags_os_nonconforming = -1;
-static int hf_elf_sh_flags_link_order = -1;
-static int hf_elf_sh_flags_info_link = -1;
-static int hf_elf_sh_flags_strings = -1;
-static int hf_elf_sh_flags_merge = -1;
-static int hf_elf_sh_flags_reserved_8 = -1;
-static int hf_elf_sh_flags_exec_instr = -1;
-static int hf_elf_sh_flags_alloc = -1;
-static int hf_elf_sh_flags_write = -1;
-static int hf_elf_sh_addr = -1;
-static int hf_elf64_sh_addr = -1;
-
-static int hf_elf_sh_offset = -1;
-static int hf_elf64_sh_offset = -1;
-static int hf_elf_sh_size = -1;
-static int hf_elf64_sh_size = -1;
-static int hf_elf_sh_link = -1;
-static int hf_elf_sh_info = -1;
-static int hf_elf_sh_addralign = -1;
-static int hf_elf64_sh_addralign = -1;
-static int hf_elf_sh_entsize = -1;
-static int hf_elf64_sh_entsize = -1;
-
-static int hf_elf_eh_frame_length = -1;
-static int hf_elf_eh_frame_extended_length = -1;
-static int hf_elf_eh_frame_cie_id = -1;
-static int hf_elf_eh_frame_version = -1;
-static int hf_elf_eh_frame_augmentation_string = -1;
-static int hf_elf_eh_frame_code_alignment_factor = -1;
-static int hf_elf_eh_frame_data_alignment_factor = -1;
-static int hf_elf_eh_frame_return_address_register = -1;
-static int hf_elf_eh_frame_augmentation_length = -1;
-static int hf_elf_eh_frame_augmentation_data = -1;
-static int hf_elf_eh_frame_initial_instructions = -1;
-
-static int hf_elf_eh_frame_fde_length = -1;
-static int hf_elf_eh_frame_fde_extended_length = -1;
-static int hf_elf_eh_frame_fde_cie_pointer = -1;
-static int hf_elf_eh_frame_fde_pc_begin = -1;
-static int hf_elf_eh_frame_fde_pc_range = -1;
-static int hf_elf_eh_frame_fde_augmentation_length = -1;
-static int hf_elf_eh_frame_fde_augmentation_data = -1;
-static int hf_elf_eh_frame_fde_call_frame_instructions = -1;
-
-static int hf_elf_eh_frame_hdr_version = -1;
-static int hf_elf_eh_frame_hdr_exception_frame_pointer_encoding = -1;
-static int hf_elf_eh_frame_hdr_fde_count_encoding = -1;
-static int hf_elf_eh_frame_hdr_binary_search_table_encoding = -1;
-static int hf_elf_eh_frame_hdr_eh_frame_ptr = -1;
-static int hf_elf_eh_frame_hdr_fde_count = -1;
-static int hf_elf_eh_frame_hdr_binary_search_table_entry_initial_location = -1;
-static int hf_elf_eh_frame_hdr_binary_search_table_entry_address = -1;
-
-static int hf_elf_symbol_table_name_index = -1;
-static int hf_elf_symbol_table_value = -1;
-static int hf_elf64_symbol_table_value = -1;
-static int hf_elf_symbol_table_size = -1;
-static int hf_elf64_symbol_table_size = -1;
-static int hf_elf_symbol_table_info = -1;
-static int hf_elf_symbol_table_info_bind = -1;
-static int hf_elf_symbol_table_info_type = -1;
-static int hf_elf_symbol_table_other = -1;
-static int hf_elf_symbol_table_shndx = -1;
-
-static int hf_elf_dynamic_tag = -1;
-static int hf_elf_dynamic_value = -1;
-static int hf_elf_dynamic_pointer = -1;
-static int hf_elf_dynamic_ignored = -1;
-static int hf_elf_dynamic_unspecified = -1;
-static int hf_elf64_dynamic_tag = -1;
-static int hf_elf64_dynamic_value = -1;
-static int hf_elf64_dynamic_pointer = -1;
-static int hf_elf64_dynamic_ignored = -1;
-static int hf_elf64_dynamic_unspecified = -1;
-
-static int hf_elf_string = -1;
-
-static int hf_dwarf_omit = -1;
-static int hf_dwarf_upper = -1;
-static int hf_dwarf_format = -1;
-
-static expert_field ei_invalid_segment_size                           = EI_INIT;
-static expert_field ei_invalid_entry_size                             = EI_INIT;
-static expert_field ei_cfi_extraneous_data                            = EI_INIT;
-static expert_field ei_invalid_cie_length                             = EI_INIT;
-
-static gint ett_elf = -1;
-static gint ett_elf_header = -1;
-static gint ett_elf_program_header = -1;
-static gint ett_elf_program_header_entry = -1;
-static gint ett_elf_section_header = -1;
-static gint ett_elf_section_header_entry = -1;
-static gint ett_elf_segment = -1;
-static gint ett_elf_cfi_record = -1;
-static gint ett_elf_cie_entry = -1;
-static gint ett_elf_fde_entry = -1;
-static gint ett_elf_cie_terminator = -1;
-static gint ett_elf_info = -1;
-static gint ett_elf_black_holes = -1;
-static gint ett_elf_overlapping = -1;
-static gint ett_dwarf_encoding = -1;
-static gint ett_binary_table = -1;
-static gint ett_binary_table_entry = -1;
-static gint ett_symbol_table_entry = -1;
-static gint ett_symbol_table_info = -1;
+static int proto_elf;
+
+static int hf_elf_magic_bytes;
+static int hf_elf_file_size;
+static int hf_elf_header_segment_size;
+static int hf_elf_blackholes_size;
+static int hf_elf_blackhole_size;
+static int hf_elf_overlapping_size;
+static int hf_elf_segment;
+static int hf_elf_entry_bytes;
+static int hf_elf_file_class;
+static int hf_elf_data_encoding;
+static int hf_elf_file_version;
+static int hf_elf_os_abi;
+static int hf_elf_abi_version;
+static int hf_elf_file_padding;
+static int hf_elf_type;
+static int hf_elf_machine;
+static int hf_elf_version;
+static int hf_elf_entry;
+static int hf_elf_phoff;
+static int hf_elf_shoff;
+static int hf_elf64_entry;
+static int hf_elf64_phoff;
+static int hf_elf64_shoff;
+static int hf_elf_flags;
+static int hf_elf_ehsize;
+static int hf_elf_phentsize;
+static int hf_elf_phnum;
+static int hf_elf_shentsize;
+static int hf_elf_shnum;
+static int hf_elf_shstrndx;
+static int hf_elf_p_type;
+static int hf_elf_p_type_operating_system_specific;
+static int hf_elf_p_type_processor_specific;
+static int hf_elf_p_flags_execute;
+static int hf_elf_p_flags_write;
+static int hf_elf_p_flags_read;
+static int hf_elf_p_flags_reserved;
+static int hf_elf_p_flags_operating_system_specific;
+static int hf_elf_p_flags_processor_specific;
+static int hf_elf_p_offset;
+static int hf_elf64_p_offset;
+static int hf_elf_p_vaddr;
+static int hf_elf64_p_vaddr;
+static int hf_elf_p_paddr;
+static int hf_elf64_p_paddr;
+static int hf_elf_p_filesz;
+static int hf_elf64_p_filesz;
+static int hf_elf_p_memsz;
+static int hf_elf64_p_memsz;
+static int hf_elf_p_align;
+static int hf_elf64_p_align;
+
+static int hf_elf_sh_name;
+static int hf_elf_sh_type_user_specific;
+static int hf_elf_sh_type_operating_system_specific;
+static int hf_elf_sh_type_processor_specific;
+static int hf_elf_sh_type;
+
+static int hf_elf_sh_flags_processor_specific;
+static int hf_elf_sh_flags_operating_system_specific;
+static int hf_elf_sh_flags_reserved;
+static int hf_elf_sh_flags_tls;
+static int hf_elf_sh_flags_group;
+static int hf_elf_sh_flags_os_nonconforming;
+static int hf_elf_sh_flags_link_order;
+static int hf_elf_sh_flags_info_link;
+static int hf_elf_sh_flags_strings;
+static int hf_elf_sh_flags_merge;
+static int hf_elf_sh_flags_reserved_8;
+static int hf_elf_sh_flags_exec_instr;
+static int hf_elf_sh_flags_alloc;
+static int hf_elf_sh_flags_write;
+static int hf_elf_sh_addr;
+static int hf_elf64_sh_addr;
+
+static int hf_elf_sh_offset;
+static int hf_elf64_sh_offset;
+static int hf_elf_sh_size;
+static int hf_elf64_sh_size;
+static int hf_elf_sh_link;
+static int hf_elf_sh_info;
+static int hf_elf_sh_addralign;
+static int hf_elf64_sh_addralign;
+static int hf_elf_sh_entsize;
+static int hf_elf64_sh_entsize;
+
+static int hf_elf_eh_frame_length;
+static int hf_elf_eh_frame_extended_length;
+static int hf_elf_eh_frame_cie_id;
+static int hf_elf_eh_frame_version;
+static int hf_elf_eh_frame_augmentation_string;
+static int hf_elf_eh_frame_code_alignment_factor;
+static int hf_elf_eh_frame_data_alignment_factor;
+static int hf_elf_eh_frame_return_address_register;
+static int hf_elf_eh_frame_augmentation_length;
+static int hf_elf_eh_frame_augmentation_data;
+static int hf_elf_eh_frame_initial_instructions;
+
+static int hf_elf_eh_frame_fde_length;
+static int hf_elf_eh_frame_fde_extended_length;
+static int hf_elf_eh_frame_fde_cie_pointer;
+static int hf_elf_eh_frame_fde_pc_begin;
+static int hf_elf_eh_frame_fde_pc_range;
+static int hf_elf_eh_frame_fde_augmentation_length;
+static int hf_elf_eh_frame_fde_augmentation_data;
+static int hf_elf_eh_frame_fde_call_frame_instructions;
+
+static int hf_elf_eh_frame_hdr_version;
+static int hf_elf_eh_frame_hdr_exception_frame_pointer_encoding;
+static int hf_elf_eh_frame_hdr_fde_count_encoding;
+static int hf_elf_eh_frame_hdr_binary_search_table_encoding;
+static int hf_elf_eh_frame_hdr_eh_frame_ptr;
+static int hf_elf_eh_frame_hdr_fde_count;
+static int hf_elf_eh_frame_hdr_binary_search_table_entry_initial_location;
+static int hf_elf_eh_frame_hdr_binary_search_table_entry_address;
+
+static int hf_elf_symbol_table_name_index;
+static int hf_elf_symbol_table_value;
+static int hf_elf64_symbol_table_value;
+static int hf_elf_symbol_table_size;
+static int hf_elf64_symbol_table_size;
+static int hf_elf_symbol_table_info;
+static int hf_elf_symbol_table_info_bind;
+static int hf_elf_symbol_table_info_type;
+static int hf_elf_symbol_table_other;
+static int hf_elf_symbol_table_shndx;
+
+static int hf_elf_dynamic_tag;
+static int hf_elf_dynamic_value;
+static int hf_elf_dynamic_pointer;
+static int hf_elf_dynamic_ignored;
+static int hf_elf_dynamic_unspecified;
+static int hf_elf64_dynamic_tag;
+static int hf_elf64_dynamic_value;
+static int hf_elf64_dynamic_pointer;
+static int hf_elf64_dynamic_ignored;
+static int hf_elf64_dynamic_unspecified;
+
+static int hf_elf_string;
+
+static int hf_dwarf_omit;
+static int hf_dwarf_upper;
+static int hf_dwarf_format;
+
+static expert_field ei_invalid_segment_size;
+static expert_field ei_invalid_entry_size;
+static expert_field ei_cfi_extraneous_data;
+static expert_field ei_invalid_cie_length;
+
+static gint ett_elf;
+static gint ett_elf_header;
+static gint ett_elf_program_header;
+static gint ett_elf_program_header_entry;
+static gint ett_elf_section_header;
+static gint ett_elf_section_header_entry;
+static gint ett_elf_segment;
+static gint ett_elf_cfi_record;
+static gint ett_elf_cie_entry;
+static gint ett_elf_fde_entry;
+static gint ett_elf_cie_terminator;
+static gint ett_elf_info;
+static gint ett_elf_black_holes;
+static gint ett_elf_overlapping;
+static gint ett_dwarf_encoding;
+static gint ett_binary_table;
+static gint ett_binary_table_entry;
+static gint ett_symbol_table_entry;
+static gint ett_symbol_table_info;
 
 #define REGISTER_32_SIZE  4
 #define REGISTER_64_SIZE  8
diff --git a/epan/dissectors/file-file.c b/epan/dissectors/file-file.c
index 2c5ee342fb..eef08e7e35 100644
--- a/epan/dissectors/file-file.c
+++ b/epan/dissectors/file-file.c
@@ -33,19 +33,19 @@
 
 void proto_register_file(void);
 
-static int proto_file = -1;
-static int hf_file_record_number = -1;
-static int hf_file_record_len = -1;
-static int hf_file_ftap_encap = -1;
-static int hf_file_marked = -1;
-static int hf_file_ignored = -1;
-static int hf_file_protocols = -1;
-static int hf_file_num_p_prot_data = -1;
-static int hf_file_proto_name_and_key = -1;
-static int hf_file_color_filter_name = -1;
-static int hf_file_color_filter_text = -1;
-
-static gint ett_file = -1;
+static int proto_file;
+static int hf_file_record_number;
+static int hf_file_record_len;
+static int hf_file_ftap_encap;
+static int hf_file_marked;
+static int hf_file_ignored;
+static int hf_file_protocols;
+static int hf_file_num_p_prot_data;
+static int hf_file_proto_name_and_key;
+static int hf_file_color_filter_name;
+static int hf_file_color_filter_text;
+
+static gint ett_file;
 
 static int file_tap = -1;
 
diff --git a/epan/dissectors/file-gif.c b/epan/dissectors/file-gif.c
index e8489e7d12..8acf16a0a7 100644
--- a/epan/dissectors/file-gif.c
+++ b/epan/dissectors/file-gif.c
@@ -52,42 +52,42 @@ enum {
 
 static dissector_handle_t gif_handle;
 
-static int proto_gif = -1;
-
-static int hf_background_color = -1;
-static int hf_data_block = -1;
-static int hf_extension = -1;
-static int hf_extension_label = -1;
-static int hf_global_color_map = -1;
-static int hf_global_color_map_ordered = -1;
-static int hf_global_color_map_present = -1;
-static int hf_global_color_resolution = -1;
-static int hf_global_image_bpp = -1;
-static int hf_image = -1;
-static int hf_image_code_size = -1;
-static int hf_image_height = -1;
-static int hf_image_left = -1;
-static int hf_image_top = -1;
-static int hf_image_width = -1;
-static int hf_local_color_map = -1;
-static int hf_local_color_map_ordered = -1;
-static int hf_local_color_map_present = -1;
-static int hf_local_color_resolution = -1;
-static int hf_local_image_bpp = -1;
-static int hf_pixel_aspect_ratio = -1;
-static int hf_screen_height = -1;
-static int hf_screen_width = -1;
-static int hf_trailer = -1;
-static int hf_version = -1;
+static int proto_gif;
+
+static int hf_background_color;
+static int hf_data_block;
+static int hf_extension;
+static int hf_extension_label;
+static int hf_global_color_map;
+static int hf_global_color_map_ordered;
+static int hf_global_color_map_present;
+static int hf_global_color_resolution;
+static int hf_global_image_bpp;
+static int hf_image;
+static int hf_image_code_size;
+static int hf_image_height;
+static int hf_image_left;
+static int hf_image_top;
+static int hf_image_width;
+static int hf_local_color_map;
+static int hf_local_color_map_ordered;
+static int hf_local_color_map_present;
+static int hf_local_color_resolution;
+static int hf_local_image_bpp;
+static int hf_pixel_aspect_ratio;
+static int hf_screen_height;
+static int hf_screen_width;
+static int hf_trailer;
+static int hf_version;
 
 /* Initialize the subtree pointers */
-static gint ett_gif = -1;
-static gint ett_global_flags = -1;
-static gint ett_local_flags = -1;
-static gint ett_extension = -1;
-static gint ett_image = -1;
+static gint ett_gif;
+static gint ett_global_flags;
+static gint ett_local_flags;
+static gint ett_extension;
+static gint ett_image;
 
-static expert_field ei_gif_unknown_data_block_type = EI_INIT;
+static expert_field ei_gif_unknown_data_block_type;
 
 /****************** GIF protocol dissection functions ******************/
 
diff --git a/epan/dissectors/file-jpeg.c b/epan/dissectors/file-jpeg.c
index 12a7e57873..4c492edcea 100644
--- a/epan/dissectors/file-jpeg.c
+++ b/epan/dissectors/file-jpeg.c
@@ -460,95 +460,95 @@ static const value_string vals_exif_types[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_jfif = -1;
+static int proto_jfif;
 
 /* Marker */
-static gint hf_marker = -1;
+static gint hf_marker;
 /* Marker segment */
-static gint hf_marker_segment = -1;
-static gint hf_len = -1;
+static gint hf_marker_segment;
+static gint hf_len;
 /* MARKER_APP0 */
-static gint hf_identifier = -1;
+static gint hf_identifier;
 /* MARKER_APP0 - JFIF */
-static gint hf_version = -1;
-static gint hf_version_major = -1;
-static gint hf_version_minor = -1;
-static gint hf_units = -1;
-static gint hf_xdensity = -1;
-static gint hf_ydensity = -1;
-static gint hf_xthumbnail = -1;
-static gint hf_ythumbnail = -1;
-static gint hf_rgb = -1;
+static gint hf_version;
+static gint hf_version_major;
+static gint hf_version_minor;
+static gint hf_units;
+static gint hf_xdensity;
+static gint hf_ydensity;
+static gint hf_xthumbnail;
+static gint hf_ythumbnail;
+static gint hf_rgb;
 /* MARKER_APP0 - JFXX */
-static gint hf_extension_code = -1;
+static gint hf_extension_code;
 /* start of Frame */
-static gint hf_sof_header = -1;
-static gint hf_sof_precision = -1;
-static gint hf_sof_lines = -1;
-static gint hf_sof_samples_per_line = -1;
-static gint hf_sof_nf = -1;
-static gint hf_sof_c_i = -1;
-static gint hf_sof_h_i = -1;
-static gint hf_sof_v_i = -1;
-static gint hf_sof_tq_i = -1;
+static gint hf_sof_header;
+static gint hf_sof_precision;
+static gint hf_sof_lines;
+static gint hf_sof_samples_per_line;
+static gint hf_sof_nf;
+static gint hf_sof_c_i;
+static gint hf_sof_h_i;
+static gint hf_sof_v_i;
+static gint hf_sof_tq_i;
 
 /* Start of Scan */
-static gint hf_sos_header = -1;
-static gint hf_sos_ns = -1;
-static gint hf_sos_cs_j = -1;
-static gint hf_sos_td_j = -1;
-static gint hf_sos_ta_j = -1;
-static gint hf_sos_ss = -1;
-static gint hf_sos_se = -1;
-static gint hf_sos_ah = -1;
-static gint hf_sos_al = -1;
+static gint hf_sos_header;
+static gint hf_sos_ns;
+static gint hf_sos_cs_j;
+static gint hf_sos_td_j;
+static gint hf_sos_ta_j;
+static gint hf_sos_ss;
+static gint hf_sos_se;
+static gint hf_sos_ah;
+static gint hf_sos_al;
 
 /* Comment */
-static gint hf_comment_header = -1;
-static gint hf_comment = -1;
-
-static gint hf_remain_seg_data = -1;
-static gint hf_endianness = -1;
-static gint hf_start_ifd_offset = -1;
-static gint hf_next_ifd_offset = -1;
-static gint hf_exif_flashpix_marker = -1;
-static gint hf_entropy_coded_segment = -1;
-static gint hf_fill_bytes = -1;
-static gint hf_skipped_tiff_data = -1;
-static gint hf_ifd_num_fields = -1;
-static gint hf_ifd_tag = -1;
-static gint hf_ifd_tag_exif = -1;
-static gint hf_ifd_tag_gps = -1;
-static gint hf_ifd_tag_interop = -1;
-static gint hf_ifd_type = -1;
-static gint hf_ifd_count = -1;
-static gint hf_ifd_offset = -1;
-static gint hf_ifd_value_byte = -1;
-static gint hf_ifd_value_ascii = -1;
-static gint hf_ifd_value_short = -1;
-static gint hf_ifd_value_long = -1;
-static gint hf_ifd_value_rational = -1;
-static gint hf_ifd_value_rational_numerator = -1;
-static gint hf_ifd_value_rational_denominator = -1;
-static gint hf_ifd_value_undefined = -1;
-static gint hf_ifd_value_slong = -1;
-static gint hf_ifd_value_srational = -1;
-static gint hf_ifd_value_srational_numerator = -1;
-static gint hf_ifd_value_srational_denominator = -1;
+static gint hf_comment_header;
+static gint hf_comment;
+
+static gint hf_remain_seg_data;
+static gint hf_endianness;
+static gint hf_start_ifd_offset;
+static gint hf_next_ifd_offset;
+static gint hf_exif_flashpix_marker;
+static gint hf_entropy_coded_segment;
+static gint hf_fill_bytes;
+static gint hf_skipped_tiff_data;
+static gint hf_ifd_num_fields;
+static gint hf_ifd_tag;
+static gint hf_ifd_tag_exif;
+static gint hf_ifd_tag_gps;
+static gint hf_ifd_tag_interop;
+static gint hf_ifd_type;
+static gint hf_ifd_count;
+static gint hf_ifd_offset;
+static gint hf_ifd_value_byte;
+static gint hf_ifd_value_ascii;
+static gint hf_ifd_value_short;
+static gint hf_ifd_value_long;
+static gint hf_ifd_value_rational;
+static gint hf_ifd_value_rational_numerator;
+static gint hf_ifd_value_rational_denominator;
+static gint hf_ifd_value_undefined;
+static gint hf_ifd_value_slong;
+static gint hf_ifd_value_srational;
+static gint hf_ifd_value_srational_numerator;
+static gint hf_ifd_value_srational_denominator;
 
 
 /* Initialize the subtree pointers */
-static gint ett_jfif = -1;
-static gint ett_marker_segment = -1;
-static gint ett_details = -1;
-static gint ett_ifd = -1;
-static gint ett_rational = -1;
-static gint ett_srational = -1;
-
-static expert_field ei_file_jpeg_first_identifier_not_jfif   = EI_INIT;
-static expert_field ei_start_ifd_offset   = EI_INIT;
-static expert_field ei_next_ifd_offset   = EI_INIT;
-static expert_field ei_ifd_value_offset   = EI_INIT;
+static gint ett_jfif;
+static gint ett_marker_segment;
+static gint ett_details;
+static gint ett_ifd;
+static gint ett_rational;
+static gint ett_srational;
+
+static expert_field ei_file_jpeg_first_identifier_not_jfif;
+static expert_field ei_start_ifd_offset;
+static expert_field ei_next_ifd_offset;
+static expert_field ei_ifd_value_offset;
 
 /****************** JFIF protocol dissection functions ******************/
 
diff --git a/epan/dissectors/file-mp4.c b/epan/dissectors/file-mp4.c
index 63a46b6a99..9ad760bb18 100644
--- a/epan/dissectors/file-mp4.c
+++ b/epan/dissectors/file-mp4.c
@@ -43,78 +43,78 @@ static dissector_handle_t mp4_handle;
 static gint dissect_mp4_box(guint32 parent_box_type _U_, guint depth,
         tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree);
 
-static int proto_mp4 = -1;
-
-static gint ett_mp4 = -1;
-static gint ett_mp4_box = -1;
-static gint ett_mp4_full_box_flags = -1;
-static gint ett_mp4_entry = -1;
-
-static int hf_mp4_box_size = -1;
-static int hf_mp4_box_type_str = -1;
-static int hf_mp4_box_largesize = -1;
-static int hf_mp4_full_box_ver = -1;
-static int hf_mp4_full_box_flags = -1;
-static int hf_mp4_ftyp_brand = -1;
-static int hf_mp4_ftyp_ver = -1;
-static int hf_mp4_ftyp_add_brand = -1;
-static int hf_mp4_stsz_sample_size = -1;
-static int hf_mp4_stsz_sample_count = -1;
-static int hf_mp4_stsz_entry_size = -1;
-static int hf_mp4_stsc_entry_count = -1;
-static int hf_mp4_stsc_first_chunk = -1;
-static int hf_mp4_stsc_samples_per_chunk = -1;
-static int hf_mp4_stsc_sample_description_index = -1;
-static int hf_mp4_stco_entry_cnt = -1;
-static int hf_mp4_stco_chunk_offset = -1;
-static int hf_mp4_mvhd_creat_time = -1;
-static int hf_mp4_mvhd_mod_time = -1;
-static int hf_mp4_mvhd_timescale = -1;
-static int hf_mp4_mvhd_duration = -1;
-static int hf_mp4_mvhd_rate = -1;
-static int hf_mp4_mvhd_vol = -1;
-static int hf_mp4_mvhd_next_tid = -1;
-static int hf_mp4_mfhd_seq_num = -1;
-static int hf_mp4_tkhd_flags_enabled = -1;
-static int hf_mp4_tkhd_flags_in_movie = -1;
-static int hf_mp4_tkhd_flags_in_preview = -1;
-static int hf_mp4_tkhd_flags_size_is_aspect_ratio = -1;
-static int hf_mp4_tkhd_creat_time = -1;
-static int hf_mp4_tkhd_mod_time = -1;
-static int hf_mp4_tkhd_track_id = -1;
-static int hf_mp4_tkhd_duration = -1;
-static int hf_mp4_tkhd_width = -1;
-static int hf_mp4_tkhd_height = -1;
-static int hf_mp4_hdlr_type = -1;
-static int hf_mp4_hdlr_name = -1;
-static int hf_mp4_dref_entry_cnt = -1;
-static int hf_mp4_stsd_entry_cnt = -1;
-static int hf_mp4_url_flags_media_data_location = -1;
-static int hf_mp4_stts_entry_cnt = -1;
-static int hf_mp4_stts_sample_count = -1;
-static int hf_mp4_stts_sample_delta = -1;
-static int hf_mp4_ctts_sample_count = -1;
-static int hf_mp4_ctts_sample_offset_signed = -1;
-static int hf_mp4_ctts_sample_offset_unsigned = -1;
-static int hf_mp4_elst_entry_cnt = -1;
-static int hf_mp4_elst_segment_duration = -1;
-static int hf_mp4_elst_media_time = -1;
-static int hf_mp4_elst_media_rate_integer = -1;
-static int hf_mp4_elst_media_rate_fraction = -1;
-static int hf_mp4_sidx_reference_id = -1;
-static int hf_mp4_sidx_timescale = -1;
-static int hf_mp4_sidx_earliest_presentation_time_v0 = -1;
-static int hf_mp4_sidx_first_offset_v0 = -1;
-static int hf_mp4_sidx_earliest_presentation_time = -1;
-static int hf_mp4_sidx_first_offset = -1;
-static int hf_mp4_sidx_reserved = -1;
-static int hf_mp4_sidx_entry_cnt = -1;
-static int hf_mp4_sidx_reference_type = -1;
-static int hf_mp4_sidx_reference_size = -1;
-static int hf_mp4_sidx_subsegment_duration = -1;
-static int hf_mp4_sidx_starts_with_sap = -1;
-static int hf_mp4_sidx_sap_type = -1;
-static int hf_mp4_sidx_sap_delta_time = -1;
+static int proto_mp4;
+
+static gint ett_mp4;
+static gint ett_mp4_box;
+static gint ett_mp4_full_box_flags;
+static gint ett_mp4_entry;
+
+static int hf_mp4_box_size;
+static int hf_mp4_box_type_str;
+static int hf_mp4_box_largesize;
+static int hf_mp4_full_box_ver;
+static int hf_mp4_full_box_flags;
+static int hf_mp4_ftyp_brand;
+static int hf_mp4_ftyp_ver;
+static int hf_mp4_ftyp_add_brand;
+static int hf_mp4_stsz_sample_size;
+static int hf_mp4_stsz_sample_count;
+static int hf_mp4_stsz_entry_size;
+static int hf_mp4_stsc_entry_count;
+static int hf_mp4_stsc_first_chunk;
+static int hf_mp4_stsc_samples_per_chunk;
+static int hf_mp4_stsc_sample_description_index;
+static int hf_mp4_stco_entry_cnt;
+static int hf_mp4_stco_chunk_offset;
+static int hf_mp4_mvhd_creat_time;
+static int hf_mp4_mvhd_mod_time;
+static int hf_mp4_mvhd_timescale;
+static int hf_mp4_mvhd_duration;
+static int hf_mp4_mvhd_rate;
+static int hf_mp4_mvhd_vol;
+static int hf_mp4_mvhd_next_tid;
+static int hf_mp4_mfhd_seq_num;
+static int hf_mp4_tkhd_flags_enabled;
+static int hf_mp4_tkhd_flags_in_movie;
+static int hf_mp4_tkhd_flags_in_preview;
+static int hf_mp4_tkhd_flags_size_is_aspect_ratio;
+static int hf_mp4_tkhd_creat_time;
+static int hf_mp4_tkhd_mod_time;
+static int hf_mp4_tkhd_track_id;
+static int hf_mp4_tkhd_duration;
+static int hf_mp4_tkhd_width;
+static int hf_mp4_tkhd_height;
+static int hf_mp4_hdlr_type;
+static int hf_mp4_hdlr_name;
+static int hf_mp4_dref_entry_cnt;
+static int hf_mp4_stsd_entry_cnt;
+static int hf_mp4_url_flags_media_data_location;
+static int hf_mp4_stts_entry_cnt;
+static int hf_mp4_stts_sample_count;
+static int hf_mp4_stts_sample_delta;
+static int hf_mp4_ctts_sample_count;
+static int hf_mp4_ctts_sample_offset_signed;
+static int hf_mp4_ctts_sample_offset_unsigned;
+static int hf_mp4_elst_entry_cnt;
+static int hf_mp4_elst_segment_duration;
+static int hf_mp4_elst_media_time;
+static int hf_mp4_elst_media_rate_integer;
+static int hf_mp4_elst_media_rate_fraction;
+static int hf_mp4_sidx_reference_id;
+static int hf_mp4_sidx_timescale;
+static int hf_mp4_sidx_earliest_presentation_time_v0;
+static int hf_mp4_sidx_first_offset_v0;
+static int hf_mp4_sidx_earliest_presentation_time;
+static int hf_mp4_sidx_first_offset;
+static int hf_mp4_sidx_reserved;
+static int hf_mp4_sidx_entry_cnt;
+static int hf_mp4_sidx_reference_type;
+static int hf_mp4_sidx_reference_size;
+static int hf_mp4_sidx_subsegment_duration;
+static int hf_mp4_sidx_starts_with_sap;
+static int hf_mp4_sidx_sap_type;
+static int hf_mp4_sidx_sap_delta_time;
 
 static const value_string mp4_sidx_reference_type_vals[] = {
     { 0,  "Movie" },
@@ -123,9 +123,9 @@ static const value_string mp4_sidx_reference_type_vals[] = {
     { 0,  NULL }
 };
 
-static expert_field ei_mp4_box_too_large = EI_INIT;
-static expert_field ei_mp4_too_many_rec_lvls = EI_INIT;
-static expert_field ei_mp4_mvhd_next_tid_unknown = EI_INIT;
+static expert_field ei_mp4_box_too_large;
+static expert_field ei_mp4_too_many_rec_lvls;
+static expert_field ei_mp4_mvhd_next_tid_unknown;
 
 static guint32 mvhd_timescale = 0;
 
diff --git a/epan/dissectors/file-pcap.c b/epan/dissectors/file-pcap.c
index 867efbb74d..32a61edd14 100644
--- a/epan/dissectors/file-pcap.c
+++ b/epan/dissectors/file-pcap.c
@@ -21,34 +21,34 @@
 
 #include "packet-pcap_pktdata.h"
 
-static int proto_pcap = -1;
+static int proto_pcap;
 
 static dissector_handle_t pcap_pktdata_handle;
 
-static int hf_pcap_header = -1;
-static int hf_pcap_header_magic_number = -1;
-static int hf_pcap_header_version_major = -1;
-static int hf_pcap_header_version_minor = -1;
-static int hf_pcap_header_this_zone = -1;
-static int hf_pcap_header_sigfigs = -1;
-static int hf_pcap_header_snapshot_length = -1;
-static int hf_pcap_header_link_type = -1;
-static int hf_pcap_packet = -1;
-static int hf_pcap_packet_timestamp = -1;
-static int hf_pcap_packet_timestamp_sec = -1;
-static int hf_pcap_packet_timestamp_usec = -1;
-static int hf_pcap_packet_captured_length = -1;
-static int hf_pcap_packet_original_length = -1;
-static int hf_pcap_packet_data = -1;
-
-static expert_field ei_pcap_capt_larger_than_orig = EI_INIT;
-static expert_field ei_pcap_capt_larger_than_snap = EI_INIT;
-
-static gint ett_pcap = -1;
-static gint ett_pcap_header = -1;
-static gint ett_pcap_packet = -1;
-static gint ett_pcap_packet_data = -1;
-static gint ett_pcap_timestamp = -1;
+static int hf_pcap_header;
+static int hf_pcap_header_magic_number;
+static int hf_pcap_header_version_major;
+static int hf_pcap_header_version_minor;
+static int hf_pcap_header_this_zone;
+static int hf_pcap_header_sigfigs;
+static int hf_pcap_header_snapshot_length;
+static int hf_pcap_header_link_type;
+static int hf_pcap_packet;
+static int hf_pcap_packet_timestamp;
+static int hf_pcap_packet_timestamp_sec;
+static int hf_pcap_packet_timestamp_usec;
+static int hf_pcap_packet_captured_length;
+static int hf_pcap_packet_original_length;
+static int hf_pcap_packet_data;
+
+static expert_field ei_pcap_capt_larger_than_orig;
+static expert_field ei_pcap_capt_larger_than_snap;
+
+static gint ett_pcap;
+static gint ett_pcap_header;
+static gint ett_pcap_packet;
+static gint ett_pcap_packet_data;
+static gint ett_pcap_timestamp;
 
 static gboolean pref_dissect_next_layer = FALSE;
 
diff --git a/epan/dissectors/file-pcapng-darwin.c b/epan/dissectors/file-pcapng-darwin.c
index 055389a45b..b88d6f4d47 100644
--- a/epan/dissectors/file-pcapng-darwin.c
+++ b/epan/dissectors/file-pcapng-darwin.c
@@ -113,16 +113,16 @@
  *
  */
 
-static int proto_pcapng_darwin_process_info = -1;
+static int proto_pcapng_darwin_process_info;
 
 void proto_register_pcapng_darwin_process_info(void);
 void proto_reg_handoff_pcapng_darwin_process_info(void);
 
 
-static int hf_pcapng_option_code_darwin_process_info = -1;
-static int hf_pcapng_darwin_process_id = -1;
-static int hf_pcapng_option_darwin_process_name = -1;
-static int hf_pcapng_option_darwin_process_uuid = -1;
+static int hf_pcapng_option_code_darwin_process_info;
+static int hf_pcapng_darwin_process_id;
+static int hf_pcapng_option_darwin_process_name;
+static int hf_pcapng_option_darwin_process_uuid;
 
 #define BLOCK_DARWIN_PROCESS         0x80000001
 #define BLOCK_DARWIN_PROCESS_NAME    "Darwin Process Event Block"
diff --git a/epan/dissectors/file-pcapng.c b/epan/dissectors/file-pcapng.c
index 84fb87015c..19f0229407 100644
--- a/epan/dissectors/file-pcapng.c
+++ b/epan/dissectors/file-pcapng.c
@@ -25,153 +25,153 @@
 #include "file-pcapng.h"
 #include "packet-pcap_pktdata.h"
 
-static int proto_pcapng = -1;
+static int proto_pcapng;
 
 static dissector_handle_t  pcap_pktdata_handle;
 
-static int hf_pcapng_block = -1;
-
-static int hf_pcapng_block_type = -1;
-static int hf_pcapng_block_type_vendor = -1;
-static int hf_pcapng_block_type_value = -1;
-static int hf_pcapng_block_length = -1;
-static int hf_pcapng_block_length_trailer = -1;
-static int hf_pcapng_block_data = -1;
-
-static int hf_pcapng_section_header_byte_order_magic = -1;
-static int hf_pcapng_section_header_major_version = -1;
-static int hf_pcapng_section_header_minor_version = -1;
-static int hf_pcapng_section_header_section_length = -1;
-static int hf_pcapng_options = -1;
-static int hf_pcapng_option = -1;
-static int hf_pcapng_option_code = -1;
-static int hf_pcapng_option_code_section_header = -1;
-static int hf_pcapng_option_code_interface_description = -1;
-static int hf_pcapng_option_code_enhanced_packet = -1;
-static int hf_pcapng_option_code_packet = -1;
-static int hf_pcapng_option_code_interface_statistics = -1;
-static int hf_pcapng_option_code_name_resolution = -1;
-static int hf_pcapng_option_length = -1;
-static int hf_pcapng_option_data = -1;
-static int hf_pcapng_option_data_comment = -1;
-static int hf_pcapng_option_data_section_header_hardware = -1;
-static int hf_pcapng_option_data_section_header_os = -1;
-static int hf_pcapng_option_data_section_header_user_application = -1;
-static int hf_pcapng_option_data_interface_description_name = -1;
-static int hf_pcapng_option_data_interface_description_description = -1;
-static int hf_pcapng_option_data_ipv4 = -1;
-static int hf_pcapng_option_data_ipv4_mask = -1;
-static int hf_pcapng_option_data_ipv6 = -1;
-static int hf_pcapng_option_data_ipv6_mask = -1;
-static int hf_pcapng_option_data_mac_address = -1;
-static int hf_pcapng_option_data_eui_address = -1;
-static int hf_pcapng_option_data_interface_speed = -1;
-static int hf_pcapng_option_data_interface_timestamp_resolution = -1;
-static int hf_pcapng_option_data_interface_timestamp_resolution_base = -1;
-static int hf_pcapng_option_data_interface_timestamp_resolution_value = -1;
-static int hf_pcapng_option_data_interface_timezone = -1;
-static int hf_pcapng_option_data_interface_filter_type = -1;
-static int hf_pcapng_option_data_interface_filter_string = -1;
-static int hf_pcapng_option_data_interface_filter_bpf_program = -1;
-static int hf_pcapng_option_data_interface_filter_unknown = -1;
-static int hf_pcapng_option_data_interface_os = -1;
-static int hf_pcapng_option_data_interface_hardware = -1;
-static int hf_pcapng_option_data_interface_fcs_length = -1;
-static int hf_pcapng_option_data_interface_timestamp_offset = -1;
-static int hf_pcapng_option_data_packet_verdict_type = -1;
-static int hf_pcapng_option_data_packet_verdict_data = -1;
-static int hf_pcapng_option_data_packet_queue = -1;
-static int hf_pcapng_option_data_packet_id = -1;
-static int hf_pcapng_option_data_packet_drop_count = -1;
-static int hf_pcapng_option_data_packet_hash_algorithm = -1;
-static int hf_pcapng_option_data_packet_hash_data = -1;
-static int hf_pcapng_option_data_packet_flags = -1;
-static int hf_pcapng_option_data_packet_flags_link_layer_errors = -1;
-static int hf_pcapng_option_data_packet_flags_link_layer_errors_symbol = -1;
-static int hf_pcapng_option_data_packet_flags_link_layer_errors_preamble = -1;
-static int hf_pcapng_option_data_packet_flags_link_layer_errors_start_frame_delimiter = -1;
-static int hf_pcapng_option_data_packet_flags_link_layer_errors_unaligned_frame = -1;
-static int hf_pcapng_option_data_packet_flags_link_layer_errors_wrong_inter_frame_gap = -1;
-static int hf_pcapng_option_data_packet_flags_link_layer_errors_packet_too_short = -1;
-static int hf_pcapng_option_data_packet_flags_link_layer_errors_packet_too_long = -1;
-static int hf_pcapng_option_data_packet_flags_link_layer_errors_crc_error = -1;
-static int hf_pcapng_option_data_packet_flags_link_layer_errors_reserved = -1;
-static int hf_pcapng_option_data_packet_flags_reserved = -1;
-static int hf_pcapng_option_data_packet_flags_fcs_length = -1;
-static int hf_pcapng_option_data_packet_flags_reception_type = -1;
-static int hf_pcapng_option_data_packet_flags_direction = -1;
-static int hf_pcapng_option_data_dns_name = -1;
-static int hf_pcapng_option_data_start_time = -1;
-static int hf_pcapng_option_data_end_time = -1;
-static int hf_pcapng_option_data_interface_received = -1;
-static int hf_pcapng_option_data_interface_dropped = -1;
-static int hf_pcapng_option_data_interface_accepted_by_filter = -1;
-static int hf_pcapng_option_data_interface_dropped_by_os = -1;
-static int hf_pcapng_option_data_interface_delivered_to_user = -1;
-static int hf_pcapng_option_padding = -1;
-static int hf_pcapng_interface_description_link_type = -1;
-static int hf_pcapng_interface_description_reserved = -1;
-static int hf_pcapng_interface_description_snap_length = -1;
-static int hf_pcapng_packet_block_interface_id = -1;
-static int hf_pcapng_packet_block_drops_count = -1;
-static int hf_pcapng_captured_length = -1;
-static int hf_pcapng_original_length = -1;
-static int hf_pcapng_packet_data = -1;
-static int hf_pcapng_packet_padding = -1;
-static int hf_pcapng_interface_id = -1;
-static int hf_pcapng_timestamp_high = -1;
-static int hf_pcapng_timestamp_low = -1;
-static int hf_pcapng_timestamp = -1;
-static int hf_pcapng_records = -1;
-static int hf_pcapng_record = -1;
-static int hf_pcapng_record_code = -1;
-static int hf_pcapng_record_length = -1;
-static int hf_pcapng_record_data = -1;
-static int hf_pcapng_record_ipv4 = -1;
-static int hf_pcapng_record_ipv6 = -1;
-static int hf_pcapng_record_name = -1;
-static int hf_pcapng_record_padding = -1;
-
-static int hf_pcapng_dsb_secrets_type = -1;
-static int hf_pcapng_dsb_secrets_length = -1;
-static int hf_pcapng_dsb_secrets_data = -1;
-
-static int hf_pcapng_cb_pen = -1;
-static int hf_pcapng_cb_data = -1;
-static int hf_pcapng_cb_option_string = -1;
-static int hf_pcapng_cb_option_data = -1;
-
-static int hf_pcapng_option_data_packet_darwin_dpeb_id = -1;
-static int hf_pcapng_option_data_packet_darwin_svc_class = -1;
-static int hf_pcapng_option_data_packet_darwin_edpeb_id = -1;
-static int hf_pcapng_option_data_packet_darwin_flags = -1;
-static int hf_pcapng_option_data_packet_darwin_flags_reserved = -1;
-static int hf_pcapng_option_data_packet_darwin_flags_wk = -1;
-static int hf_pcapng_option_data_packet_darwin_flags_ch = -1;
-static int hf_pcapng_option_data_packet_darwin_flags_so = -1;
-static int hf_pcapng_option_data_packet_darwin_flags_re = -1;
-static int hf_pcapng_option_data_packet_darwin_flags_ka = -1;
-static int hf_pcapng_option_data_packet_darwin_flags_nf = -1;
-static int hf_pcapng_option_data_packet_darwin_flow_id = -1;
-
-static expert_field ei_invalid_byte_order_magic = EI_INIT;
-static expert_field ei_block_length_below_block_minimum = EI_INIT;
-static expert_field ei_block_length_below_block_content_length = EI_INIT;
-static expert_field ei_block_length_not_multiple_of_4 = EI_INIT;
-static expert_field ei_block_lengths_dont_match = EI_INIT;
-static expert_field ei_invalid_option_length = EI_INIT;
-static expert_field ei_invalid_record_length = EI_INIT;
-static expert_field ei_missing_idb = EI_INIT;
-
-static gint ett_pcapng = -1;
-static gint ett_pcapng_section_header_block = -1;
-static gint ett_pcapng_block_data = -1;
-static gint ett_pcapng_block_type = -1;
-static gint ett_pcapng_options = -1;
-static gint ett_pcapng_option = -1;
-static gint ett_pcapng_records = -1;
-static gint ett_pcapng_record = -1;
-static gint ett_pcapng_packet_data = -1;
+static int hf_pcapng_block;
+
+static int hf_pcapng_block_type;
+static int hf_pcapng_block_type_vendor;
+static int hf_pcapng_block_type_value;
+static int hf_pcapng_block_length;
+static int hf_pcapng_block_length_trailer;
+static int hf_pcapng_block_data;
+
+static int hf_pcapng_section_header_byte_order_magic;
+static int hf_pcapng_section_header_major_version;
+static int hf_pcapng_section_header_minor_version;
+static int hf_pcapng_section_header_section_length;
+static int hf_pcapng_options;
+static int hf_pcapng_option;
+static int hf_pcapng_option_code;
+static int hf_pcapng_option_code_section_header;
+static int hf_pcapng_option_code_interface_description;
+static int hf_pcapng_option_code_enhanced_packet;
+static int hf_pcapng_option_code_packet;
+static int hf_pcapng_option_code_interface_statistics;
+static int hf_pcapng_option_code_name_resolution;
+static int hf_pcapng_option_length;
+static int hf_pcapng_option_data;
+static int hf_pcapng_option_data_comment;
+static int hf_pcapng_option_data_section_header_hardware;
+static int hf_pcapng_option_data_section_header_os;
+static int hf_pcapng_option_data_section_header_user_application;
+static int hf_pcapng_option_data_interface_description_name;
+static int hf_pcapng_option_data_interface_description_description;
+static int hf_pcapng_option_data_ipv4;
+static int hf_pcapng_option_data_ipv4_mask;
+static int hf_pcapng_option_data_ipv6;
+static int hf_pcapng_option_data_ipv6_mask;
+static int hf_pcapng_option_data_mac_address;
+static int hf_pcapng_option_data_eui_address;
+static int hf_pcapng_option_data_interface_speed;
+static int hf_pcapng_option_data_interface_timestamp_resolution;
+static int hf_pcapng_option_data_interface_timestamp_resolution_base;
+static int hf_pcapng_option_data_interface_timestamp_resolution_value;
+static int hf_pcapng_option_data_interface_timezone;
+static int hf_pcapng_option_data_interface_filter_type;
+static int hf_pcapng_option_data_interface_filter_string;
+static int hf_pcapng_option_data_interface_filter_bpf_program;
+static int hf_pcapng_option_data_interface_filter_unknown;
+static int hf_pcapng_option_data_interface_os;
+static int hf_pcapng_option_data_interface_hardware;
+static int hf_pcapng_option_data_interface_fcs_length;
+static int hf_pcapng_option_data_interface_timestamp_offset;
+static int hf_pcapng_option_data_packet_verdict_type;
+static int hf_pcapng_option_data_packet_verdict_data;
+static int hf_pcapng_option_data_packet_queue;
+static int hf_pcapng_option_data_packet_id;
+static int hf_pcapng_option_data_packet_drop_count;
+static int hf_pcapng_option_data_packet_hash_algorithm;
+static int hf_pcapng_option_data_packet_hash_data;
+static int hf_pcapng_option_data_packet_flags;
+static int hf_pcapng_option_data_packet_flags_link_layer_errors;
+static int hf_pcapng_option_data_packet_flags_link_layer_errors_symbol;
+static int hf_pcapng_option_data_packet_flags_link_layer_errors_preamble;
+static int hf_pcapng_option_data_packet_flags_link_layer_errors_start_frame_delimiter;
+static int hf_pcapng_option_data_packet_flags_link_layer_errors_unaligned_frame;
+static int hf_pcapng_option_data_packet_flags_link_layer_errors_wrong_inter_frame_gap;
+static int hf_pcapng_option_data_packet_flags_link_layer_errors_packet_too_short;
+static int hf_pcapng_option_data_packet_flags_link_layer_errors_packet_too_long;
+static int hf_pcapng_option_data_packet_flags_link_layer_errors_crc_error;
+static int hf_pcapng_option_data_packet_flags_link_layer_errors_reserved;
+static int hf_pcapng_option_data_packet_flags_reserved;
+static int hf_pcapng_option_data_packet_flags_fcs_length;
+static int hf_pcapng_option_data_packet_flags_reception_type;
+static int hf_pcapng_option_data_packet_flags_direction;
+static int hf_pcapng_option_data_dns_name;
+static int hf_pcapng_option_data_start_time;
+static int hf_pcapng_option_data_end_time;
+static int hf_pcapng_option_data_interface_received;
+static int hf_pcapng_option_data_interface_dropped;
+static int hf_pcapng_option_data_interface_accepted_by_filter;
+static int hf_pcapng_option_data_interface_dropped_by_os;
+static int hf_pcapng_option_data_interface_delivered_to_user;
+static int hf_pcapng_option_padding;
+static int hf_pcapng_interface_description_link_type;
+static int hf_pcapng_interface_description_reserved;
+static int hf_pcapng_interface_description_snap_length;
+static int hf_pcapng_packet_block_interface_id;
+static int hf_pcapng_packet_block_drops_count;
+static int hf_pcapng_captured_length;
+static int hf_pcapng_original_length;
+static int hf_pcapng_packet_data;
+static int hf_pcapng_packet_padding;
+static int hf_pcapng_interface_id;
+static int hf_pcapng_timestamp_high;
+static int hf_pcapng_timestamp_low;
+static int hf_pcapng_timestamp;
+static int hf_pcapng_records;
+static int hf_pcapng_record;
+static int hf_pcapng_record_code;
+static int hf_pcapng_record_length;
+static int hf_pcapng_record_data;
+static int hf_pcapng_record_ipv4;
+static int hf_pcapng_record_ipv6;
+static int hf_pcapng_record_name;
+static int hf_pcapng_record_padding;
+
+static int hf_pcapng_dsb_secrets_type;
+static int hf_pcapng_dsb_secrets_length;
+static int hf_pcapng_dsb_secrets_data;
+
+static int hf_pcapng_cb_pen;
+static int hf_pcapng_cb_data;
+static int hf_pcapng_cb_option_string;
+static int hf_pcapng_cb_option_data;
+
+static int hf_pcapng_option_data_packet_darwin_dpeb_id;
+static int hf_pcapng_option_data_packet_darwin_svc_class;
+static int hf_pcapng_option_data_packet_darwin_edpeb_id;
+static int hf_pcapng_option_data_packet_darwin_flags;
+static int hf_pcapng_option_data_packet_darwin_flags_reserved;
+static int hf_pcapng_option_data_packet_darwin_flags_wk;
+static int hf_pcapng_option_data_packet_darwin_flags_ch;
+static int hf_pcapng_option_data_packet_darwin_flags_so;
+static int hf_pcapng_option_data_packet_darwin_flags_re;
+static int hf_pcapng_option_data_packet_darwin_flags_ka;
+static int hf_pcapng_option_data_packet_darwin_flags_nf;
+static int hf_pcapng_option_data_packet_darwin_flow_id;
+
+static expert_field ei_invalid_byte_order_magic;
+static expert_field ei_block_length_below_block_minimum;
+static expert_field ei_block_length_below_block_content_length;
+static expert_field ei_block_length_not_multiple_of_4;
+static expert_field ei_block_lengths_dont_match;
+static expert_field ei_invalid_option_length;
+static expert_field ei_invalid_record_length;
+static expert_field ei_missing_idb;
+
+static gint ett_pcapng;
+static gint ett_pcapng_section_header_block;
+static gint ett_pcapng_block_data;
+static gint ett_pcapng_block_type;
+static gint ett_pcapng_options;
+static gint ett_pcapng_option;
+static gint ett_pcapng_records;
+static gint ett_pcapng_record;
+static gint ett_pcapng_packet_data;
 
 static int * const hfx_pcapng_option_data_interface_timestamp_resolution[] = {
     &hf_pcapng_option_data_interface_timestamp_resolution_base,
diff --git a/epan/dissectors/file-png.c b/epan/dissectors/file-png.c
index 907b136288..d2b5cd2ae8 100644
--- a/epan/dissectors/file-png.c
+++ b/epan/dissectors/file-png.c
@@ -113,54 +113,54 @@ static const value_string phys_unit_vals[] = {
     { 0, NULL }
 };
 
-static int proto_png = -1;
-
-static int hf_png_bkgd_blue = -1;
-static int hf_png_bkgd_green = -1;
-static int hf_png_bkgd_greyscale = -1;
-static int hf_png_bkgd_palette_index = -1;
-static int hf_png_bkgd_red = -1;
-static int hf_png_chrm_blue_x = -1;
-static int hf_png_chrm_blue_y = -1;
-static int hf_png_chrm_green_x = -1;
-static int hf_png_chrm_green_y = -1;
-static int hf_png_chrm_red_x = -1;
-static int hf_png_chrm_red_y = -1;
-static int hf_png_chrm_white_x = -1;
-static int hf_png_chrm_white_y = -1;
-static int hf_png_chunk_crc = -1;
-static int hf_png_chunk_data = -1;
-static int hf_png_chunk_flag_anc = -1;
-static int hf_png_chunk_flag_priv = -1;
-static int hf_png_chunk_flag_stc = -1;
-static int hf_png_chunk_len = -1;
-static int hf_png_chunk_type_str = -1;
-static int hf_png_gama_gamma = -1;
-static int hf_png_ihdr_bitdepth = -1;
-static int hf_png_ihdr_colour_type = -1;
-static int hf_png_ihdr_compression_method = -1;
-static int hf_png_ihdr_filter_method = -1;
-static int hf_png_ihdr_height = -1;
-static int hf_png_ihdr_interlace_method = -1;
-static int hf_png_ihdr_width = -1;
-static int hf_png_phys_horiz = -1;
-static int hf_png_phys_unit = -1;
-static int hf_png_phys_vert = -1;
-static int hf_png_signature = -1;
-static int hf_png_srgb_intent = -1;
-static int hf_png_text_keyword = -1;
-static int hf_png_text_string = -1;
-static int hf_png_time_day = -1;
-static int hf_png_time_hour = -1;
-static int hf_png_time_minute = -1;
-static int hf_png_time_month = -1;
-static int hf_png_time_second = -1;
-static int hf_png_time_year = -1;
-
-static gint ett_png = -1;
-static gint ett_png_chunk = -1;
-
-static expert_field ei_png_chunk_too_large = EI_INIT;
+static int proto_png;
+
+static int hf_png_bkgd_blue;
+static int hf_png_bkgd_green;
+static int hf_png_bkgd_greyscale;
+static int hf_png_bkgd_palette_index;
+static int hf_png_bkgd_red;
+static int hf_png_chrm_blue_x;
+static int hf_png_chrm_blue_y;
+static int hf_png_chrm_green_x;
+static int hf_png_chrm_green_y;
+static int hf_png_chrm_red_x;
+static int hf_png_chrm_red_y;
+static int hf_png_chrm_white_x;
+static int hf_png_chrm_white_y;
+static int hf_png_chunk_crc;
+static int hf_png_chunk_data;
+static int hf_png_chunk_flag_anc;
+static int hf_png_chunk_flag_priv;
+static int hf_png_chunk_flag_stc;
+static int hf_png_chunk_len;
+static int hf_png_chunk_type_str;
+static int hf_png_gama_gamma;
+static int hf_png_ihdr_bitdepth;
+static int hf_png_ihdr_colour_type;
+static int hf_png_ihdr_compression_method;
+static int hf_png_ihdr_filter_method;
+static int hf_png_ihdr_height;
+static int hf_png_ihdr_interlace_method;
+static int hf_png_ihdr_width;
+static int hf_png_phys_horiz;
+static int hf_png_phys_unit;
+static int hf_png_phys_vert;
+static int hf_png_signature;
+static int hf_png_srgb_intent;
+static int hf_png_text_keyword;
+static int hf_png_text_string;
+static int hf_png_time_day;
+static int hf_png_time_hour;
+static int hf_png_time_minute;
+static int hf_png_time_month;
+static int hf_png_time_second;
+static int hf_png_time_year;
+
+static gint ett_png;
+static gint ett_png_chunk;
+
+static expert_field ei_png_chunk_too_large;
 
 static dissector_handle_t png_handle;
 
diff --git a/epan/dissectors/file-rbm.c b/epan/dissectors/file-rbm.c
index 988b7048d8..11d794e2bb 100644
--- a/epan/dissectors/file-rbm.c
+++ b/epan/dissectors/file-rbm.c
@@ -25,27 +25,27 @@
 #include <file-rbm.h>
 #include <wiretap/ruby_marshal.h>
 
-static int proto_rbm = -1;
-
-static int hf_rbm_version = -1;
-static int hf_rbm_type = -1;
-static int hf_rbm_integer = -1;
-static int hf_rbm_length = -1;
-static int hf_rbm_string = -1;
-static int hf_rbm_link = -1;
-static int hf_rbm_double = -1;
-static int hf_rbm_struct = -1;
-static int hf_rbm_regex_param = -1;
-
-static gint ett_rbm = -1;
-static gint ett_array = -1;
-static gint ett_array_obj = -1;
-static gint ett_hash = -1;
-static gint ett_hash_obj = -1;
-static gint ett_variable = -1;
-
-static expert_field ei_rbm_invalid = EI_INIT;
-static expert_field ei_rbm_version_unsupported = EI_INIT;
+static int proto_rbm;
+
+static int hf_rbm_version;
+static int hf_rbm_type;
+static int hf_rbm_integer;
+static int hf_rbm_length;
+static int hf_rbm_string;
+static int hf_rbm_link;
+static int hf_rbm_double;
+static int hf_rbm_struct;
+static int hf_rbm_regex_param;
+
+static gint ett_rbm;
+static gint ett_array;
+static gint ett_array_obj;
+static gint ett_hash;
+static gint ett_hash_obj;
+static gint ett_variable;
+
+static expert_field ei_rbm_invalid;
+static expert_field ei_rbm_version_unsupported;
 
 /* Marshal types */
 static const value_string rbm_types[] = {
diff --git a/epan/dissectors/file-rfc7468.c b/epan/dissectors/file-rfc7468.c
index 85c4397257..b3d6c811c7 100644
--- a/epan/dissectors/file-rfc7468.c
+++ b/epan/dissectors/file-rfc7468.c
@@ -16,16 +16,16 @@
 void proto_register_rfc7468(void);
 void proto_reg_handoff_rfc7468(void);
 
-static int proto_rfc7468 = -1;
+static int proto_rfc7468;
 
-static gint ett_rfc7468 = -1;
-static gint ett_rfc7468_preeb = -1;
-static gint ett_rfc7468_data = -1;
-static gint ett_rfc7468_posteb = -1;
+static gint ett_rfc7468;
+static gint ett_rfc7468_preeb;
+static gint ett_rfc7468_data;
+static gint ett_rfc7468_posteb;
 
-static int hf_rfc7468_preeb_label = -1;
-static int hf_rfc7468_ber_data = -1;
-static int hf_rfc7468_posteb_label = -1;
+static int hf_rfc7468_preeb_label;
+static int hf_rfc7468_ber_data;
+static int hf_rfc7468_posteb_label;
 
 static dissector_handle_t rfc7468_handle = NULL;
 static dissector_handle_t ber_handle = NULL;
diff --git a/epan/dissectors/file-rtpdump.c b/epan/dissectors/file-rtpdump.c
index 694dd6f69f..eb64a5eadb 100644
--- a/epan/dissectors/file-rtpdump.c
+++ b/epan/dissectors/file-rtpdump.c
@@ -26,43 +26,43 @@ void proto_register_rtpdump(void);
 void proto_reg_handoff_rtpdump(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_rtpdump = -1;
-
-static gint hf_rtpdump_text_header = -1;
-static gint hf_rtpdump_play_program = -1;
-static gint hf_rtpdump_version = -1;
-static gint hf_rtpdump_txt_ipv4 = -1;
-static gint hf_rtpdump_txt_ipv6 = -1;
-static gint hf_rtpdump_txt_port = -1;
-
-static gint hf_rtpdump_binary_header = -1;
-static gint hf_rtpdump_ts_sec = -1;
-static gint hf_rtpdump_ts_usec = -1;
-static gint hf_rtpdump_ts = -1;
-static gint hf_rtpdump_bin_addr = -1;
-static gint hf_rtpdump_bin_port = -1;
-static gint hf_rtpdump_padding = -1;
-
-static gint hf_rtpdump_pkt = -1;
-static gint hf_rtpdump_pkt_len = -1;
-static gint hf_rtpdump_pkt_plen = -1;
-static gint hf_rtpdump_pkt_offset = -1;
-static gint hf_rtpdump_pkt_data = -1;
+static int proto_rtpdump;
+
+static gint hf_rtpdump_text_header;
+static gint hf_rtpdump_play_program;
+static gint hf_rtpdump_version;
+static gint hf_rtpdump_txt_ipv4;
+static gint hf_rtpdump_txt_ipv6;
+static gint hf_rtpdump_txt_port;
+
+static gint hf_rtpdump_binary_header;
+static gint hf_rtpdump_ts_sec;
+static gint hf_rtpdump_ts_usec;
+static gint hf_rtpdump_ts;
+static gint hf_rtpdump_bin_addr;
+static gint hf_rtpdump_bin_port;
+static gint hf_rtpdump_padding;
+
+static gint hf_rtpdump_pkt;
+static gint hf_rtpdump_pkt_len;
+static gint hf_rtpdump_pkt_plen;
+static gint hf_rtpdump_pkt_offset;
+static gint hf_rtpdump_pkt_data;
 
 /* Initialize the subtree pointers */
-static gint ett_rtpdump = -1;
-static gint ett_rtpdump_text_header = -1;
-static gint ett_rtpdump_binary_header = -1;
-static gint ett_rtpdump_pkt = -1;
-
-static expert_field ei_rtpdump_unknown_program = EI_INIT;
-static expert_field ei_rtpdump_unknown_version = EI_INIT;
-static expert_field ei_rtpdump_bad_txt_addr = EI_INIT;
-static expert_field ei_rtpdump_bad_txt_port = EI_INIT;
-static expert_field ei_rtpdump_bin_ipv6 = EI_INIT;
-static expert_field ei_rtpdump_addrs_match = EI_INIT;
-static expert_field ei_rtpdump_addrs_mismatch = EI_INIT;
-static expert_field ei_rtpdump_caplen = EI_INIT;
+static gint ett_rtpdump;
+static gint ett_rtpdump_text_header;
+static gint ett_rtpdump_binary_header;
+static gint ett_rtpdump_pkt;
+
+static expert_field ei_rtpdump_unknown_program;
+static expert_field ei_rtpdump_unknown_version;
+static expert_field ei_rtpdump_bad_txt_addr;
+static expert_field ei_rtpdump_bad_txt_port;
+static expert_field ei_rtpdump_bin_ipv6;
+static expert_field ei_rtpdump_addrs_match;
+static expert_field ei_rtpdump_addrs_mismatch;
+static expert_field ei_rtpdump_caplen;
 
 /* Reasonable minimum length for the RTP header (including the magic):
  * - 13 for "#!rtpplay1.0 "
diff --git a/epan/dissectors/file-tiff.c b/epan/dissectors/file-tiff.c
index ac5f4212f0..ec84f70f3e 100644
--- a/epan/dissectors/file-tiff.c
+++ b/epan/dissectors/file-tiff.c
@@ -20,33 +20,33 @@
 void proto_reg_handoff_tiff(void);
 void proto_register_tiff(void);
 
-static int proto_tiff = -1;
+static int proto_tiff;
 
 // Header fields
-static int hf_tiff_header_endianness = -1;
-static int hf_tiff_header_magic = -1;
-static int hf_tiff_header_lead_ifd = -1;
+static int hf_tiff_header_endianness;
+static int hf_tiff_header_magic;
+static int hf_tiff_header_lead_ifd;
 
 // IFD fields
-static int hf_tiff_ifd_count = -1;
-static int hf_tiff_ifd_next = -1;
+static int hf_tiff_ifd_count;
+static int hf_tiff_ifd_next;
 
 // Entry fields
-static int hf_tiff_entry_tag = -1;
-static int hf_tiff_entry_type = -1;
-static int hf_tiff_entry_count = -1;
-static int hf_tiff_entry_offset = -1;
-static int hf_tiff_entry_unknown = -1;
+static int hf_tiff_entry_tag;
+static int hf_tiff_entry_type;
+static int hf_tiff_entry_count;
+static int hf_tiff_entry_offset;
+static int hf_tiff_entry_unknown;
 
 // Expert fields
-static expert_field ei_tiff_unknown_tag = EI_INIT;
-static expert_field ei_tiff_bad_entry = EI_INIT;
-static expert_field ei_tiff_zero_denom = EI_INIT;
+static expert_field ei_tiff_unknown_tag;
+static expert_field ei_tiff_bad_entry;
+static expert_field ei_tiff_zero_denom;
 
 
-static gint ett_tiff = -1;
-static gint ett_ifd = -1;
-static gint ett_t6 = -1;
+static gint ett_tiff;
+static gint ett_ifd;
+static gint ett_t6;
 
 #define TIFF_TAG_NEW_SUBFILE_TYPE 254
 // Fields TBD
@@ -55,58 +55,58 @@ static gint ett_t6 = -1;
 // Fields TBD
 
 #define TIFF_TAG_IMAGE_WIDTH 256
-static int hf_tiff_image_width = -1;
+static int hf_tiff_image_width;
 
 #define TIFF_TAG_IMAGE_LENGTH 257
-static int hf_tiff_image_length = -1;
+static int hf_tiff_image_length;
 
 #define TIFF_TAG_BITS_PER_SAMPLE 258
-static int hf_tiff_bits_per_sample = -1;
+static int hf_tiff_bits_per_sample;
 
 #define TIFF_TAG_COMPRESSION 259
-static int hf_tiff_compression = -1;
+static int hf_tiff_compression;
 
 #define TIFF_TAG_PHOTOMETRIC_INTERPRETATION 262
-static int hf_tiff_photometric_interp = -1;
+static int hf_tiff_photometric_interp;
 
 #define TIFF_TAG_THRESHHOLDING 263
-static int hf_tiff_threshholding = -1;
+static int hf_tiff_threshholding;
 
 #define TIFF_TAG_CELL_WIDTH 264
-static int hf_tiff_cell_width = -1;
+static int hf_tiff_cell_width;
 
 #define TIFF_TAG_CELL_LENGTH 265
-static int hf_tiff_cell_length = -1;
+static int hf_tiff_cell_length;
 
 #define TIFF_TAG_FILL_ORDER 266
-static int hf_tiff_fill_order = -1;
+static int hf_tiff_fill_order;
 
 #define TIFF_TAG_DOCUMENT_NAME 269
-static int hf_tiff_document_name = -1;
+static int hf_tiff_document_name;
 
 #define TIFF_TAG_IMAGE_DESCRIPTION 270
-static int hf_tiff_image_description = -1;
+static int hf_tiff_image_description;
 
 #define TIFF_TAG_MAKE 271
-static int hf_tiff_make = -1;
+static int hf_tiff_make;
 
 #define TIFF_TAG_MODEL 272
-static int hf_tiff_model = -1;
+static int hf_tiff_model;
 
 #define TIFF_TAG_STRIP_OFFSETS 273
-static int hf_tiff_strip_offset = -1;
+static int hf_tiff_strip_offset;
 
 #define TIFF_TAG_ORIENTATION 274
-static int hf_tiff_orientation = -1;
+static int hf_tiff_orientation;
 
 #define TIFF_TAG_SAMPLES_PER_PIXEL 277
-static int hf_tiff_samples_per_pixel = -1;
+static int hf_tiff_samples_per_pixel;
 
 #define TIFF_TAG_ROWS_PER_STRIP 278
-static int hf_tiff_rows_per_strip = -1;
+static int hf_tiff_rows_per_strip;
 
 #define TIFF_TAG_STRIP_BYTE_COUNTS 279
-static int hf_tiff_strip_byte_count = -1;
+static int hf_tiff_strip_byte_count;
 
 #define TIFF_TAG_MIN_SAMPLE_VALUE 280
 // Fields TBD
@@ -115,20 +115,20 @@ static int hf_tiff_strip_byte_count = -1;
 // Fields TBD
 
 #define TIFF_TAG_X_RESOLUTION 282
-static int hf_tiff_x_res_numer = -1;
-static int hf_tiff_x_res_denom = -1;
-static int hf_tiff_x_res_approx = -1;
+static int hf_tiff_x_res_numer;
+static int hf_tiff_x_res_denom;
+static int hf_tiff_x_res_approx;
 
 #define TIFF_TAG_Y_RESOLUTION 283
-static int hf_tiff_y_res_numer = -1;
-static int hf_tiff_y_res_denom = -1;
-static int hf_tiff_y_res_approx = -1;
+static int hf_tiff_y_res_numer;
+static int hf_tiff_y_res_denom;
+static int hf_tiff_y_res_approx;
 
 #define TIFF_TAG_PLANAR_CONFIGURATION 284
-static int hf_tiff_planar_configuration = -1;
+static int hf_tiff_planar_configuration;
 
 #define TIFF_TAG_PAGE_NAME 285
-static int hf_tiff_page_name = -1;
+static int hf_tiff_page_name;
 
 #define TIFF_TAG_X_POSITION 286
 // Fields TBD
@@ -143,7 +143,7 @@ static int hf_tiff_page_name = -1;
 // Fields TBD
 
 #define TIFF_TAG_GRAY_RESPONSE_UNIT 290
-static int hf_tiff_gray_response_unit = -1;
+static int hf_tiff_gray_response_unit;
 
 #define TIFF_TAG_GRAY_RESPONSE_CURVE 291
 // Fields TBD
@@ -152,12 +152,12 @@ static int hf_tiff_gray_response_unit = -1;
 // Fields TBD
 
 #define TIFF_TAG_T6_OPTIONS 293
-static int hf_tiff_t6_options = -1;
-static int hf_tiff_t6_unused = -1;
-static int hf_tiff_t6_allow_uncompresed = -1;
+static int hf_tiff_t6_options;
+static int hf_tiff_t6_unused;
+static int hf_tiff_t6_allow_uncompresed;
 
 #define TIFF_TAG_RESOLUTION_UNIT 296
-static int hf_tiff_resolution_unit = -1;
+static int hf_tiff_resolution_unit;
 
 #define TIFF_TAG_PAGE_NUMBER 297
 // Fields TBD
@@ -166,19 +166,19 @@ static int hf_tiff_resolution_unit = -1;
 // Fields TBD
 
 #define TIFF_TAG_SOFTWARE 305
-static int hf_tiff_software = -1;
+static int hf_tiff_software;
 
 #define TIFF_TAG_DATE_TIME 306
-static int hf_tiff_date_time = -1;
+static int hf_tiff_date_time;
 
 #define TIFF_TAG_ARTIST 315
-static int hf_tiff_artist = -1;
+static int hf_tiff_artist;
 
 #define TIFF_TAG_HOST_COMPUTER 316
-static int hf_tiff_host_computer = -1;
+static int hf_tiff_host_computer;
 
 #define TIFF_TAG_PREDICTOR 317
-static int hf_tiff_predictor = -1;
+static int hf_tiff_predictor;
 
 #define TIFF_TAG_WHITE_POINT 318
 // Fields TBD
@@ -193,10 +193,10 @@ static int hf_tiff_predictor = -1;
 // Fields TBD
 
 #define TIFF_TAG_TILE_WIDTH 322
-static int hf_tiff_tile_width = -1;
+static int hf_tiff_tile_width;
 
 #define TIFF_TAG_TILE_LENGTH 323
-static int hf_tiff_tile_length = -1;
+static int hf_tiff_tile_length;
 
 #define TIFF_TAG_TILE_OFFSETS 324
 // Fields TBD
@@ -205,19 +205,19 @@ static int hf_tiff_tile_length = -1;
 // Fields TBD
 
 #define TIFF_TAG_INK_SET 332
-static int hf_tiff_ink_set = -1;
+static int hf_tiff_ink_set;
 
 #define TIFF_TAG_INK_NAMES 333
 // Fields TBD
 
 #define TIFF_TAG_NUMBER_OF_INKS 334
-static int hf_tiff_number_of_inks = -1;
+static int hf_tiff_number_of_inks;
 
 #define TIFF_TAG_DOT_RANGE 336
 // Fields TBD
 
 #define TIFF_TAG_TARGET_PRINTER 337
-static int hf_tiff_target_printer = -1;
+static int hf_tiff_target_printer;
 
 #define TIFF_TAG_EXTRA_SAMPLES 338
 // Fields TBD
@@ -274,7 +274,7 @@ static int hf_tiff_target_printer = -1;
 // Fields TBD
 
 #define TIFF_TAG_COPYRIGHT 0x8298
-static int hf_tiff_copyright = -1;
+static int hf_tiff_copyright;
 
 static const value_string tiff_endianness_names[] = {
     { 0x4949, "Little-Endian" },
diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c
index 8f478f63e8..e4d91013ac 100644
--- a/epan/dissectors/packet-2dparityfec.c
+++ b/epan/dissectors/packet-2dparityfec.c
@@ -61,24 +61,24 @@ static gboolean dissect_fec = FALSE;
 
 static int fec_rtp_payload_type = 96;
 
-static int proto_2dparityfec = -1;
+static int proto_2dparityfec;
 
-static int hf_2dparityfec_index = -1;
-static int hf_2dparityfec_length_recovery = -1;
-static int hf_2dparityfec_mask = -1;
-static int hf_2dparityfec_na = -1;
-static int hf_2dparityfec_offset = -1;
-static int hf_2dparityfec_payload = -1;
-static int hf_2dparityfec_pt_recovery = -1;
-static int hf_2dparityfec_rfc2733_ext = -1;
-static int hf_2dparityfec_row_flag = -1;
-static int hf_2dparityfec_snbase_ext = -1;
-static int hf_2dparityfec_snbase_low = -1;
-static int hf_2dparityfec_ts_pro_mpeg_ext = -1;
-static int hf_2dparityfec_ts_recovery = -1;
-static int hf_2dparityfec_type = -1;
+static int hf_2dparityfec_index;
+static int hf_2dparityfec_length_recovery;
+static int hf_2dparityfec_mask;
+static int hf_2dparityfec_na;
+static int hf_2dparityfec_offset;
+static int hf_2dparityfec_payload;
+static int hf_2dparityfec_pt_recovery;
+static int hf_2dparityfec_rfc2733_ext;
+static int hf_2dparityfec_row_flag;
+static int hf_2dparityfec_snbase_ext;
+static int hf_2dparityfec_snbase_low;
+static int hf_2dparityfec_ts_pro_mpeg_ext;
+static int hf_2dparityfec_ts_recovery;
+static int hf_2dparityfec_type;
 
-static gint ett_2dparityfec = -1;
+static gint ett_2dparityfec;
 
 static const value_string fec_type_names[] = {
    {0, "XOR"},
diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c
index 203d82777a..84b475a9c5 100644
--- a/epan/dissectors/packet-3com-njack.c
+++ b/epan/dissectors/packet-3com-njack.c
@@ -48,41 +48,41 @@ void proto_reg_handoff_njack(void);
 static dissector_handle_t njack_handle;
 
 /* protocol handles */
-static int proto_njack = -1;
+static int proto_njack;
 
 /* ett handles */
-static int ett_njack = -1;
-static int ett_njack_tlv_header = -1;
+static int ett_njack;
+static int ett_njack_tlv_header;
 
 /* hf elements */
-static int hf_njack_magic = -1;
-static int hf_njack_type = -1;
+static int hf_njack_magic;
+static int hf_njack_type;
 /* type set/get response */
-static int hf_njack_tlv_length = -1;
-static int hf_njack_tlv_data = -1;
-static int hf_njack_tlv_version = -1;
-static int hf_njack_tlv_type = -1;
-static int hf_njack_tlv_typeip = -1;
-static int hf_njack_tlv_devicemac = -1;
-static int hf_njack_tlv_snmpwrite = -1;
-static int hf_njack_tlv_dhcpcontrol = -1;
-static int hf_njack_tlv_typestring = -1;
+static int hf_njack_tlv_length;
+static int hf_njack_tlv_data;
+static int hf_njack_tlv_version;
+static int hf_njack_tlv_type;
+static int hf_njack_tlv_typeip;
+static int hf_njack_tlv_devicemac;
+static int hf_njack_tlv_snmpwrite;
+static int hf_njack_tlv_dhcpcontrol;
+static int hf_njack_tlv_typestring;
 /* 1st TAB */
-static int hf_njack_tlv_countermode = -1;
-static int hf_njack_tlv_scheduling = -1;
-static int hf_njack_tlv_addtagscheme = -1;
-static int hf_njack_tlv_portingressmode = -1;
-static int hf_njack_tlv_maxframesize = -1;
-static int hf_njack_tlv_powerforwarding = -1;
+static int hf_njack_tlv_countermode;
+static int hf_njack_tlv_scheduling;
+static int hf_njack_tlv_addtagscheme;
+static int hf_njack_tlv_portingressmode;
+static int hf_njack_tlv_maxframesize;
+static int hf_njack_tlv_powerforwarding;
 /* type 07: set */
-static int hf_njack_set_length = -1;
-static int hf_njack_set_salt = -1;
-static int hf_njack_set_authdata = -1;
+static int hf_njack_set_length;
+static int hf_njack_set_salt;
+static int hf_njack_set_authdata;
 /* type 08: set result */
-static int hf_njack_setresult = -1;
+static int hf_njack_setresult;
 /* type 0b: get */
 /* type 0c: get response */
-static int hf_njack_getresp_unknown1 = -1;
+static int hf_njack_getresp_unknown1;
 
 #define PROTO_SHORT_NAME "NJACK"
 #define PROTO_LONG_NAME "3com Network Jack"
diff --git a/epan/dissectors/packet-3com-xns.c b/epan/dissectors/packet-3com-xns.c
index 4b1f549bca..aa5414f7a9 100644
--- a/epan/dissectors/packet-3com-xns.c
+++ b/epan/dissectors/packet-3com-xns.c
@@ -20,12 +20,12 @@ void proto_reg_handoff_3com_xns(void);
 
 static dissector_handle_t our_xns_handle;
 
-static int proto_3com_xns = -1;
+static int proto_3com_xns;
 
-static int hf_3com_xns_type_ethertype = -1;
-static int hf_3com_xns_type_retix_bpdu = -1;
+static int hf_3com_xns_type_ethertype;
+static int hf_3com_xns_type_retix_bpdu;
 
-static gint ett_3com_xns = -1;
+static gint ett_3com_xns;
 
 static const value_string retix_bpdu_type_vals[] = {
 	{ 0x0004, "Retix Spanning Tree" },
diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index f3cf0b5c88..cc01ccd060 100644
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -43,173 +43,173 @@ void proto_reg_handoff_a11(void);
 static int registration_request_msg =0;
 
 /* Initialize the protocol and registered fields */
-static int proto_a11 = -1;
-static int hf_a11_type = -1;
-static int hf_a11_flags = -1;
-static int hf_a11_s = -1;
-static int hf_a11_b = -1;
-static int hf_a11_d = -1;
-static int hf_a11_m = -1;
-static int hf_a11_g = -1;
-static int hf_a11_v = -1;
-static int hf_a11_t = -1;
-static int hf_a11_code = -1;
-static int hf_a11_status = -1;
-static int hf_a11_life = -1;
-static int hf_a11_homeaddr = -1;
-static int hf_a11_haaddr = -1;
-static int hf_a11_coa = -1;
-static int hf_a11_ident = -1;
-static int hf_a11_ext_type = -1;
-static int hf_a11_ext_stype = -1;
-static int hf_a11_ext_len = -1;
-static int hf_a11_ext = -1;
-static int hf_a11_aext_spi = -1;
-static int hf_a11_aext_auth = -1;
-static int hf_a11_next_nai = -1;
-
-static int hf_a11_ses_key = -1;
-static int hf_a11_ses_mnsrid = -1;
-static int hf_a11_ses_sidver = -1;
-static int hf_a11_ses_msid_type = -1;
-static int hf_a11_ses_msid_len = -1;
-static int hf_a11_ses_msid = -1;
-static int hf_a11_ses_ptype = -1;
-
-static int hf_a11_vse_vid = -1;
-static int hf_a11_vse_apptype = -1;
-static int hf_a11_vse_canid = -1;
-static int hf_a11_vse_panid = -1;
-static int hf_a11_vse_srvopt = -1;
-static int hf_a11_vse_qosmode = -1;
-static int hf_a11_vse_pdit = -1;
-static int hf_a11_vse_session_parameter = -1;
-static int hf_a11_vse_code = -1;
-static int hf_a11_vse_dormant = -1;
-static int hf_a11_vse_ehrpd_mode = -1;
-static int hf_a11_vse_ehrpd_pmk = -1;
-static int hf_a11_vse_ehrpd_handoff_info = -1;
-static int hf_a11_vse_ehrpd_tunnel_mode = -1;
-static int hf_a11_vse_ppaddr = -1;
+static int proto_a11;
+static int hf_a11_type;
+static int hf_a11_flags;
+static int hf_a11_s;
+static int hf_a11_b;
+static int hf_a11_d;
+static int hf_a11_m;
+static int hf_a11_g;
+static int hf_a11_v;
+static int hf_a11_t;
+static int hf_a11_code;
+static int hf_a11_status;
+static int hf_a11_life;
+static int hf_a11_homeaddr;
+static int hf_a11_haaddr;
+static int hf_a11_coa;
+static int hf_a11_ident;
+static int hf_a11_ext_type;
+static int hf_a11_ext_stype;
+static int hf_a11_ext_len;
+static int hf_a11_ext;
+static int hf_a11_aext_spi;
+static int hf_a11_aext_auth;
+static int hf_a11_next_nai;
+
+static int hf_a11_ses_key;
+static int hf_a11_ses_mnsrid;
+static int hf_a11_ses_sidver;
+static int hf_a11_ses_msid_type;
+static int hf_a11_ses_msid_len;
+static int hf_a11_ses_msid;
+static int hf_a11_ses_ptype;
+
+static int hf_a11_vse_vid;
+static int hf_a11_vse_apptype;
+static int hf_a11_vse_canid;
+static int hf_a11_vse_panid;
+static int hf_a11_vse_srvopt;
+static int hf_a11_vse_qosmode;
+static int hf_a11_vse_pdit;
+static int hf_a11_vse_session_parameter;
+static int hf_a11_vse_code;
+static int hf_a11_vse_dormant;
+static int hf_a11_vse_ehrpd_mode;
+static int hf_a11_vse_ehrpd_pmk;
+static int hf_a11_vse_ehrpd_handoff_info;
+static int hf_a11_vse_ehrpd_tunnel_mode;
+static int hf_a11_vse_ppaddr;
 
 /* Additional Session Information */
-static int hf_a11_ase_len_type = -1;
-static int hf_a11_ase_srid_type = -1;
-static int hf_a11_ase_servopt_type = -1;
-static int hf_a11_ase_gre_proto_type = -1;
-static int hf_a11_ase_gre_key = -1;
-static int hf_a11_ase_pcf_addr_key = -1;
-
-static int hf_a11_ase_forward_rohc_info_len = -1;
-static int hf_a11_ase_forward_maxcid = -1;
-static int hf_a11_ase_forward_mrru = -1;
-static int hf_a11_ase_forward_large_cids = -1;
-static int hf_a11_ase_forward_profile_count = -1;
-static int hf_a11_ase_forward_profile = -1;
-
-static int hf_a11_ase_reverse_rohc_info_len = -1;
-static int hf_a11_ase_reverse_maxcid = -1;
-static int hf_a11_ase_reverse_mrru = -1;
-static int hf_a11_ase_reverse_large_cids = -1;
-static int hf_a11_ase_reverse_profile_count = -1;
-static int hf_a11_ase_reverse_profile = -1;
-static int hf_a11_aut_flow_prof_sub_type = -1;
-static int hf_a11_aut_flow_prof_sub_type_len = -1;
-static int hf_a11_aut_flow_prof_sub_type_value = -1;
-static int hf_a11_serv_opt_prof_max_serv = -1;
-static int hf_a11_sub_type = -1;
-static int hf_a11_sub_type_length = -1;
-static int hf_a11_serv_opt = -1;
-static int hf_a11_max_num_serv_opt = -1;
-static int hf_a11_bcmcs_stype = -1;
-static int hf_a11_bcmcs_entry_len = -1;
+static int hf_a11_ase_len_type;
+static int hf_a11_ase_srid_type;
+static int hf_a11_ase_servopt_type;
+static int hf_a11_ase_gre_proto_type;
+static int hf_a11_ase_gre_key;
+static int hf_a11_ase_pcf_addr_key;
+
+static int hf_a11_ase_forward_rohc_info_len;
+static int hf_a11_ase_forward_maxcid;
+static int hf_a11_ase_forward_mrru;
+static int hf_a11_ase_forward_large_cids;
+static int hf_a11_ase_forward_profile_count;
+static int hf_a11_ase_forward_profile;
+
+static int hf_a11_ase_reverse_rohc_info_len;
+static int hf_a11_ase_reverse_maxcid;
+static int hf_a11_ase_reverse_mrru;
+static int hf_a11_ase_reverse_large_cids;
+static int hf_a11_ase_reverse_profile_count;
+static int hf_a11_ase_reverse_profile;
+static int hf_a11_aut_flow_prof_sub_type;
+static int hf_a11_aut_flow_prof_sub_type_len;
+static int hf_a11_aut_flow_prof_sub_type_value;
+static int hf_a11_serv_opt_prof_max_serv;
+static int hf_a11_sub_type;
+static int hf_a11_sub_type_length;
+static int hf_a11_serv_opt;
+static int hf_a11_max_num_serv_opt;
+static int hf_a11_bcmcs_stype;
+static int hf_a11_bcmcs_entry_len;
 
 /* Forward QoS Information */
-static int hf_a11_fqi_srid = -1;
-static int hf_a11_fqi_flags = -1;
-static int hf_a11_fqi_flags_ip_flow = -1;
-static int hf_a11_fqi_flags_dscp = -1;
-static int hf_a11_fqi_entry_flag = -1;
-static int hf_a11_fqi_entry_flag_dscp = -1;
-static int hf_a11_fqi_entry_flag_flow_state = -1;
-static int hf_a11_fqi_flowcount = -1;
-static int hf_a11_fqi_flowid = -1;
-static int hf_a11_fqi_entrylen = -1;
-/* static int hf_a11_fqi_flowstate = -1; */
-static int hf_a11_fqi_requested_qoslen = -1;
-static int hf_a11_fqi_flow_priority = -1;
-static int hf_a11_fqi_num_qos_attribute_set = -1;
-static int hf_a11_fqi_qos_attribute_setlen = -1;
-static int hf_a11_fqi_qos_attribute_setid = -1;
-static int hf_a11_fqi_qos_granted_attribute_setid = -1;
-static int hf_a11_fqi_verbose = -1;
-static int hf_a11_fqi_flow_profileid = -1;
-static int hf_a11_fqi_granted_qoslen = -1;
+static int hf_a11_fqi_srid;
+static int hf_a11_fqi_flags;
+static int hf_a11_fqi_flags_ip_flow;
+static int hf_a11_fqi_flags_dscp;
+static int hf_a11_fqi_entry_flag;
+static int hf_a11_fqi_entry_flag_dscp;
+static int hf_a11_fqi_entry_flag_flow_state;
+static int hf_a11_fqi_flowcount;
+static int hf_a11_fqi_flowid;
+static int hf_a11_fqi_entrylen;
+/* static int hf_a11_fqi_flowstate; */
+static int hf_a11_fqi_requested_qoslen;
+static int hf_a11_fqi_flow_priority;
+static int hf_a11_fqi_num_qos_attribute_set;
+static int hf_a11_fqi_qos_attribute_setlen;
+static int hf_a11_fqi_qos_attribute_setid;
+static int hf_a11_fqi_qos_granted_attribute_setid;
+static int hf_a11_fqi_verbose;
+static int hf_a11_fqi_flow_profileid;
+static int hf_a11_fqi_granted_qoslen;
 
 /* Reverse QoS Information */
-static int hf_a11_rqi_srid = -1;
-static int hf_a11_rqi_flowcount = -1;
-static int hf_a11_rqi_flowid = -1;
-static int hf_a11_rqi_entrylen = -1;
-static int hf_a11_rqi_entry_flag = -1;
-static int hf_a11_rqi_entry_flag_flow_state = -1;
-/* static int hf_a11_rqi_flowstate = -1; */
-static int hf_a11_rqi_requested_qoslen = -1;
-static int hf_a11_rqi_flow_priority = -1;
-static int hf_a11_rqi_num_qos_attribute_set = -1;
-static int hf_a11_rqi_qos_attribute_setlen = -1;
-static int hf_a11_rqi_qos_attribute_setid = -1;
-static int hf_a11_rqi_qos_granted_attribute_setid = -1;
-static int hf_a11_rqi_verbose = -1;
-static int hf_a11_rqi_flow_profileid = -1;
-/* static int hf_a11_rqi_requested_qos = -1; */
-static int hf_a11_rqi_granted_qoslen = -1;
-/* static int hf_a11_rqi_granted_qos = -1; */
+static int hf_a11_rqi_srid;
+static int hf_a11_rqi_flowcount;
+static int hf_a11_rqi_flowid;
+static int hf_a11_rqi_entrylen;
+static int hf_a11_rqi_entry_flag;
+static int hf_a11_rqi_entry_flag_flow_state;
+/* static int hf_a11_rqi_flowstate; */
+static int hf_a11_rqi_requested_qoslen;
+static int hf_a11_rqi_flow_priority;
+static int hf_a11_rqi_num_qos_attribute_set;
+static int hf_a11_rqi_qos_attribute_setlen;
+static int hf_a11_rqi_qos_attribute_setid;
+static int hf_a11_rqi_qos_granted_attribute_setid;
+static int hf_a11_rqi_verbose;
+static int hf_a11_rqi_flow_profileid;
+/* static int hf_a11_rqi_requested_qos; */
+static int hf_a11_rqi_granted_qoslen;
+/* static int hf_a11_rqi_granted_qos; */
 
 /* QoS Update Information */
-static int hf_a11_fqui_flowcount = -1;
-static int hf_a11_rqui_flowcount = -1;
-static int hf_a11_fqui_updated_qoslen = -1;
-static int hf_a11_fqui_updated_qos = -1;
-static int hf_a11_rqui_updated_qoslen = -1;
-static int hf_a11_rqui_updated_qos = -1;
-static int hf_a11_subsciber_profile = -1;
-/* static int hf_a11_subsciber_profile_len = -1; */
+static int hf_a11_fqui_flowcount;
+static int hf_a11_rqui_flowcount;
+static int hf_a11_fqui_updated_qoslen;
+static int hf_a11_fqui_updated_qos;
+static int hf_a11_rqui_updated_qoslen;
+static int hf_a11_rqui_updated_qos;
+static int hf_a11_subsciber_profile;
+/* static int hf_a11_subsciber_profile_len; */
 
 /* Initialize the subtree pointers */
-static gint ett_a11 = -1;
-static gint ett_a11_flags = -1;
-static gint ett_a11_ext = -1;
-static gint ett_a11_exts = -1;
-static gint ett_a11_radius = -1;
-static gint ett_a11_radiuses = -1;
-static gint ett_a11_ase = -1;
-static gint ett_a11_fqi_flowentry = -1;
-static gint ett_a11_fqi_requestedqos = -1;
-static gint ett_a11_fqi_qos_attribute_set = -1;
-static gint ett_a11_fqi_grantedqos = -1;
-static gint ett_a11_rqi_flowentry = -1;
-static gint ett_a11_rqi_requestedqos = -1;
-static gint ett_a11_rqi_qos_attribute_set = -1;
-static gint ett_a11_rqi_grantedqos = -1;
-static gint ett_a11_fqi_flags = -1;
-static gint ett_a11_fqi_entry_flags = -1;
-static gint ett_a11_rqi_entry_flags = -1;
-static gint ett_a11_fqui_flowentry = -1;
-static gint ett_a11_rqui_flowentry = -1;
-static gint ett_a11_subscriber_profile = -1;
-static gint ett_a11_forward_rohc = -1;
-static gint ett_a11_reverse_rohc = -1;
-static gint ett_a11_forward_profile = -1;
-static gint ett_a11_reverse_profile = -1;
-static gint ett_a11_aut_flow_profile_ids = -1;
-static gint ett_a11_bcmcs_entry = -1;
-
-static expert_field ei_a11_sub_type_length_not2 = EI_INIT;
-static expert_field ei_a11_sse_too_short = EI_INIT;
-static expert_field ei_a11_bcmcs_too_short = EI_INIT;
-static expert_field ei_a11_entry_data_not_dissected = EI_INIT;
-static expert_field ei_a11_session_data_not_dissected = EI_INIT;
+static gint ett_a11;
+static gint ett_a11_flags;
+static gint ett_a11_ext;
+static gint ett_a11_exts;
+static gint ett_a11_radius;
+static gint ett_a11_radiuses;
+static gint ett_a11_ase;
+static gint ett_a11_fqi_flowentry;
+static gint ett_a11_fqi_requestedqos;
+static gint ett_a11_fqi_qos_attribute_set;
+static gint ett_a11_fqi_grantedqos;
+static gint ett_a11_rqi_flowentry;
+static gint ett_a11_rqi_requestedqos;
+static gint ett_a11_rqi_qos_attribute_set;
+static gint ett_a11_rqi_grantedqos;
+static gint ett_a11_fqi_flags;
+static gint ett_a11_fqi_entry_flags;
+static gint ett_a11_rqi_entry_flags;
+static gint ett_a11_fqui_flowentry;
+static gint ett_a11_rqui_flowentry;
+static gint ett_a11_subscriber_profile;
+static gint ett_a11_forward_rohc;
+static gint ett_a11_reverse_rohc;
+static gint ett_a11_forward_profile;
+static gint ett_a11_reverse_profile;
+static gint ett_a11_aut_flow_profile_ids;
+static gint ett_a11_bcmcs_entry;
+
+static expert_field ei_a11_sub_type_length_not2;
+static expert_field ei_a11_sse_too_short;
+static expert_field ei_a11_bcmcs_too_short;
+static expert_field ei_a11_entry_data_not_dissected;
+static expert_field ei_a11_session_data_not_dissected;
 
 static dissector_handle_t a11_handle = NULL;
 
diff --git a/epan/dissectors/packet-5co-legacy.c b/epan/dissectors/packet-5co-legacy.c
index 273d2a69f3..5577f14239 100644
--- a/epan/dissectors/packet-5co-legacy.c
+++ b/epan/dissectors/packet-5co-legacy.c
@@ -89,36 +89,36 @@ static void dispMask( gchar *result, guint32 type);
 static void dispTimeout( gchar *result, guint32 type);
 
 /* Initialize the protocol and registered fields */
-static int proto_FiveCoLegacy = -1; /* Wireshark ID of the FiveCo protocol */
+static int proto_FiveCoLegacy; /* Wireshark ID of the FiveCo protocol */
 
 /* static dissector_handle_t data_handle = NULL; */
-static gint hf_fiveco_header = -1;       /* The following hf_* variables are used to hold the Wireshark IDs of */
-static gint hf_fiveco_fct = -1;          /* our header fields; they are filled out when we call */
-static gint hf_fiveco_id = -1;           /* proto_register_field_array() in proto_register_fiveco() */
-static gint hf_fiveco_length = -1;
-static gint hf_fiveco_data = -1;
-static gint hf_fiveco_cks = -1;
-static gint hf_fiveco_i2cadd = -1;
-static gint hf_fiveco_i2c2write = -1;
-static gint hf_fiveco_i2cwrite = -1;
-static gint hf_fiveco_i2c2read = -1;
-static gint hf_fiveco_i2c2scan = -1;
-static gint hf_fiveco_i2canswer = -1;
-static gint hf_fiveco_i2cwriteanswer = -1;
-static gint hf_fiveco_i2cscaned = -1;
-static gint hf_fiveco_i2cerror = -1;
-static gint hf_fiveco_i2cack = -1;
-static gint hf_fiveco_regread = -1;
-static gint hf_fiveco_regreadunknown = -1;
-static gint hf_fiveco_regreaduk = -1;
-static gint hf_fiveco_EasyIPMAC = -1;
-static gint hf_fiveco_EasyIPIP = -1;
-static gint hf_fiveco_EasyIPSM = -1;
-
-static gint ett_fiveco_header = -1; /* These are the ids of the subtrees that we may be creating */
-static gint ett_fiveco_data = -1;   /* for the header fields. */
-static gint ett_fiveco = -1;
-static gint ett_fiveco_checksum = -1;
+static gint hf_fiveco_header;       /* The following hf_* variables are used to hold the Wireshark IDs of */
+static gint hf_fiveco_fct;          /* our header fields; they are filled out when we call */
+static gint hf_fiveco_id;           /* proto_register_field_array() in proto_register_fiveco() */
+static gint hf_fiveco_length;
+static gint hf_fiveco_data;
+static gint hf_fiveco_cks;
+static gint hf_fiveco_i2cadd;
+static gint hf_fiveco_i2c2write;
+static gint hf_fiveco_i2cwrite;
+static gint hf_fiveco_i2c2read;
+static gint hf_fiveco_i2c2scan;
+static gint hf_fiveco_i2canswer;
+static gint hf_fiveco_i2cwriteanswer;
+static gint hf_fiveco_i2cscaned;
+static gint hf_fiveco_i2cerror;
+static gint hf_fiveco_i2cack;
+static gint hf_fiveco_regread;
+static gint hf_fiveco_regreadunknown;
+static gint hf_fiveco_regreaduk;
+static gint hf_fiveco_EasyIPMAC;
+static gint hf_fiveco_EasyIPIP;
+static gint hf_fiveco_EasyIPSM;
+
+static gint ett_fiveco_header; /* These are the ids of the subtrees that we may be creating */
+static gint ett_fiveco_data;   /* for the header fields. */
+static gint ett_fiveco;
+static gint ett_fiveco_checksum;
 
 /* Constants declaration */
 static const value_string packettypenames[] = {
diff --git a/epan/dissectors/packet-5co-rap.c b/epan/dissectors/packet-5co-rap.c
index c5ce3d5417..deb793e6d1 100644
--- a/epan/dissectors/packet-5co-rap.c
+++ b/epan/dissectors/packet-5co-rap.c
@@ -85,35 +85,35 @@ static void disp_mask( gchar *result, guint32 type);
 static void disp_timeout( gchar *result, guint32 type);
 
 /* Initialize the protocol and registered fields */
-static int proto_FiveCoRAP = -1; /* Wireshark ID of the FiveCo protocol */
+static int proto_FiveCoRAP; /* Wireshark ID of the FiveCo protocol */
 
  /* The following hf_* variables are used to hold the Wireshark IDs of */
  /* our header fields; they are filled out when we call */
  /* proto_register_field_array() in proto_register_fiveco() */
-static gint hf_fiveco_source_addr = -1;
-static gint hf_fiveco_dest_addr = -1;
-static gint hf_fiveco_data = -1;
-static gint hf_fiveco_regread = -1;
-static gint hf_fiveco_regread_answer = -1;
-static gint hf_fiveco_regwrite = -1;
-static gint hf_fiveco_regcall = -1;
-static gint hf_fiveco_routing = -1;
-static gint hf_fiveco_routing_answer = -1;
-static gint hf_fiveco_routing_interface = -1;
-static gint hf_fiveco_routing_timeout = -1;
-static gint hf_fiveco_routing_size = -1;
-static gint hf_fiveco_ext_regerror = -1;
-static gint hf_fiveco_ext_frameid = -1;
-static gint hf_fiveco_ext_eof = -1;
-static gint hf_fiveco_ext_frameerror = -1;
-static gint hf_fiveco_ext_easyip = -1;
-static gint hf_fiveco_ext_easyip_version = -1;
-static gint hf_fiveco_ext_easyip_interface = -1;
-static gint hf_fiveco_ext_easyip_mac = -1;
-static gint hf_fiveco_ext_easyip_ip = -1;
-static gint hf_fiveco_ext_easyip_mask = -1;
-static gint hf_fiveco_ext_unsupported = -1;
-static gint hf_fiveco_cks = -1;
+static gint hf_fiveco_source_addr;
+static gint hf_fiveco_dest_addr;
+static gint hf_fiveco_data;
+static gint hf_fiveco_regread;
+static gint hf_fiveco_regread_answer;
+static gint hf_fiveco_regwrite;
+static gint hf_fiveco_regcall;
+static gint hf_fiveco_routing;
+static gint hf_fiveco_routing_answer;
+static gint hf_fiveco_routing_interface;
+static gint hf_fiveco_routing_timeout;
+static gint hf_fiveco_routing_size;
+static gint hf_fiveco_ext_regerror;
+static gint hf_fiveco_ext_frameid;
+static gint hf_fiveco_ext_eof;
+static gint hf_fiveco_ext_frameerror;
+static gint hf_fiveco_ext_easyip;
+static gint hf_fiveco_ext_easyip_version;
+static gint hf_fiveco_ext_easyip_interface;
+static gint hf_fiveco_ext_easyip_mac;
+static gint hf_fiveco_ext_easyip_ip;
+static gint hf_fiveco_ext_easyip_mask;
+static gint hf_fiveco_ext_unsupported;
+static gint hf_fiveco_cks;
 
 /* These are the ids of the subtrees that we may be creating */
 /* for the header fields. */
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c
index 6c50b580b6..a8416fb1b9 100644
--- a/epan/dissectors/packet-6lowpan.c
+++ b/epan/dissectors/packet-6lowpan.c
@@ -240,140 +240,140 @@ void proto_reg_handoff_6lowpan(void);
 /* 6LoWPAN interface identifier length. */
 #define LOWPAN_IFC_ID_LEN               8
 /* Protocol fields handles. */
-static int proto_6lowpan = -1;
-static int hf_6lowpan_pattern = -1;
-static int hf_6lowpan_nhc_pattern = -1;
-static int hf_6lowpan_padding = -1;
+static int proto_6lowpan;
+static int hf_6lowpan_pattern;
+static int hf_6lowpan_nhc_pattern;
+static int hf_6lowpan_padding;
 
 /* Header compression fields. */
-static int hf_6lowpan_hc1_encoding = -1;
-static int hf_6lowpan_hc1_source_prefix = -1;
-static int hf_6lowpan_hc1_source_ifc = -1;
-static int hf_6lowpan_hc1_dest_prefix = -1;
-static int hf_6lowpan_hc1_dest_ifc = -1;
-static int hf_6lowpan_hc1_class = -1;
-static int hf_6lowpan_hc1_next = -1;
-static int hf_6lowpan_hc1_more = -1;
-static int hf_6lowpan_hc2_udp_encoding = -1;
-static int hf_6lowpan_hc2_udp_src = -1;
-static int hf_6lowpan_hc2_udp_dst = -1;
-static int hf_6lowpan_hc2_udp_len = -1;
+static int hf_6lowpan_hc1_encoding;
+static int hf_6lowpan_hc1_source_prefix;
+static int hf_6lowpan_hc1_source_ifc;
+static int hf_6lowpan_hc1_dest_prefix;
+static int hf_6lowpan_hc1_dest_ifc;
+static int hf_6lowpan_hc1_class;
+static int hf_6lowpan_hc1_next;
+static int hf_6lowpan_hc1_more;
+static int hf_6lowpan_hc2_udp_encoding;
+static int hf_6lowpan_hc2_udp_src;
+static int hf_6lowpan_hc2_udp_dst;
+static int hf_6lowpan_hc2_udp_len;
 
 /* 6loRH */
-static int hf_6lowpan_pagenb = -1;
-static int hf_6lowpan_routing_header = -1;
-static int hf_6lowpan_6lorhe_length = -1;
-static int hf_6lowpan_6lorhe_size   = -1;
-static int hf_6lowpan_6lorhc_size = -1;
-static int hf_6lowpan_6lorhe_type = -1;
-static int hf_6lowpan_6lorhe_hoplimit = -1;
-static int hf_6lowpan_6lorhe_bitmap = -1;
-static int hf_6lowpan_5_bit_o = -1;
-static int hf_6lowpan_5_bit_r = -1;
-static int hf_6lowpan_5_bit_f = -1;
-static int hf_6lowpan_5_bit_i = -1;
-static int hf_6lowpan_5_bit_k = -1;
-static int hf_6lowpan_sender_rank1 = -1;
-static int hf_6lowpan_sender_rank2 = -1;
-static int hf_6lowpan_rpl_instance = -1;
-static int hf_6lowpan_6lorhc_address_hop0 = -1;
-static int hf_6lowpan_6lorhc_address_hop2 = -1;
-static int hf_6lowpan_6lorhc_address_hop3 = -1;
-static int hf_6lowpan_6lorhc_address_hop4 = -1;
-static int hf_6lowpan_6lorhc_address_hop1 = -1;
-static int hf_6lowpan_6lorhc_address_src = -1;
+static int hf_6lowpan_pagenb;
+static int hf_6lowpan_routing_header;
+static int hf_6lowpan_6lorhe_length;
+static int hf_6lowpan_6lorhe_size;
+static int hf_6lowpan_6lorhc_size;
+static int hf_6lowpan_6lorhe_type;
+static int hf_6lowpan_6lorhe_hoplimit;
+static int hf_6lowpan_6lorhe_bitmap;
+static int hf_6lowpan_5_bit_o;
+static int hf_6lowpan_5_bit_r;
+static int hf_6lowpan_5_bit_f;
+static int hf_6lowpan_5_bit_i;
+static int hf_6lowpan_5_bit_k;
+static int hf_6lowpan_sender_rank1;
+static int hf_6lowpan_sender_rank2;
+static int hf_6lowpan_rpl_instance;
+static int hf_6lowpan_6lorhc_address_hop0;
+static int hf_6lowpan_6lorhc_address_hop2;
+static int hf_6lowpan_6lorhc_address_hop3;
+static int hf_6lowpan_6lorhc_address_hop4;
+static int hf_6lowpan_6lorhc_address_hop1;
+static int hf_6lowpan_6lorhc_address_src;
 
 /* IPHC header field. */
-static int hf_6lowpan_iphc_flag_tf = -1;
-static int hf_6lowpan_iphc_flag_nhdr = -1;
-static int hf_6lowpan_iphc_flag_hlim = -1;
-static int hf_6lowpan_iphc_flag_cid = -1;
-static int hf_6lowpan_iphc_flag_sac = -1;
-static int hf_6lowpan_iphc_flag_sam = -1;
-static int hf_6lowpan_iphc_flag_mcast = -1;
-static int hf_6lowpan_iphc_flag_dac = -1;
-static int hf_6lowpan_iphc_flag_dam = -1;
-static int hf_6lowpan_iphc_sci = -1;
-static int hf_6lowpan_iphc_dci = -1;
-
-static int hf_6lowpan_iphc_sctx_prefix = -1;
-static int hf_6lowpan_iphc_sctx_origin = -1;
-static int hf_6lowpan_iphc_dctx_prefix = -1;
-static int hf_6lowpan_iphc_dctx_origin = -1;
+static int hf_6lowpan_iphc_flag_tf;
+static int hf_6lowpan_iphc_flag_nhdr;
+static int hf_6lowpan_iphc_flag_hlim;
+static int hf_6lowpan_iphc_flag_cid;
+static int hf_6lowpan_iphc_flag_sac;
+static int hf_6lowpan_iphc_flag_sam;
+static int hf_6lowpan_iphc_flag_mcast;
+static int hf_6lowpan_iphc_flag_dac;
+static int hf_6lowpan_iphc_flag_dam;
+static int hf_6lowpan_iphc_sci;
+static int hf_6lowpan_iphc_dci;
+
+static int hf_6lowpan_iphc_sctx_prefix;
+static int hf_6lowpan_iphc_sctx_origin;
+static int hf_6lowpan_iphc_dctx_prefix;
+static int hf_6lowpan_iphc_dctx_origin;
 
 /* NHC IPv6 extension header fields. */
-static int hf_6lowpan_nhc_ext_eid = -1;
-static int hf_6lowpan_nhc_ext_nh = -1;
-static int hf_6lowpan_nhc_ext_next = -1;
-static int hf_6lowpan_nhc_ext_length = -1;
-static int hf_6lowpan_nhc_ext_reserved = -1;
+static int hf_6lowpan_nhc_ext_eid;
+static int hf_6lowpan_nhc_ext_nh;
+static int hf_6lowpan_nhc_ext_next;
+static int hf_6lowpan_nhc_ext_length;
+static int hf_6lowpan_nhc_ext_reserved;
 
 /* NHC UDP compression header fields. */
-static int hf_6lowpan_nhc_udp_checksum = -1;
-static int hf_6lowpan_nhc_udp_ports = -1;
+static int hf_6lowpan_nhc_udp_checksum;
+static int hf_6lowpan_nhc_udp_ports;
 
 /* Inline IPv6 header fields. */
-static int hf_6lowpan_traffic_class = -1;
-static int hf_6lowpan_flow_label = -1;
-static int hf_6lowpan_ecn = -1;
-static int hf_6lowpan_dscp = -1;
-static int hf_6lowpan_next_header = -1;
-static int hf_6lowpan_hop_limit = -1;
-static int hf_6lowpan_source = -1;
-static int hf_6lowpan_dest = -1;
+static int hf_6lowpan_traffic_class;
+static int hf_6lowpan_flow_label;
+static int hf_6lowpan_ecn;
+static int hf_6lowpan_dscp;
+static int hf_6lowpan_next_header;
+static int hf_6lowpan_hop_limit;
+static int hf_6lowpan_source;
+static int hf_6lowpan_dest;
 
 /* Inline UDP header fields. */
-static int hf_6lowpan_udp_src = -1;
-static int hf_6lowpan_udp_dst = -1;
-static int hf_6lowpan_udp_len = -1;
-static int hf_6lowpan_udp_checksum = -1;
+static int hf_6lowpan_udp_src;
+static int hf_6lowpan_udp_dst;
+static int hf_6lowpan_udp_len;
+static int hf_6lowpan_udp_checksum;
 
 /* Broadcast header fields. */
-static int hf_6lowpan_bcast_seqnum = -1;
+static int hf_6lowpan_bcast_seqnum;
 
 /* Mesh header fields. */
-static int hf_6lowpan_mesh_v = -1;
-static int hf_6lowpan_mesh_f = -1;
-static int hf_6lowpan_mesh_hops = -1;
-static int hf_6lowpan_mesh_hops8 = -1;
-static int hf_6lowpan_mesh_orig16 = -1;
-static int hf_6lowpan_mesh_orig64 = -1;
-static int hf_6lowpan_mesh_dest16 = -1;
-static int hf_6lowpan_mesh_dest64 = -1;
+static int hf_6lowpan_mesh_v;
+static int hf_6lowpan_mesh_f;
+static int hf_6lowpan_mesh_hops;
+static int hf_6lowpan_mesh_hops8;
+static int hf_6lowpan_mesh_orig16;
+static int hf_6lowpan_mesh_orig64;
+static int hf_6lowpan_mesh_dest16;
+static int hf_6lowpan_mesh_dest64;
 
 /* Fragmentation header fields. */
-static int hf_6lowpan_frag_dgram_size = -1;
-static int hf_6lowpan_frag_dgram_tag = -1;
-static int hf_6lowpan_frag_dgram_offset = -1;
+static int hf_6lowpan_frag_dgram_size;
+static int hf_6lowpan_frag_dgram_tag;
+static int hf_6lowpan_frag_dgram_offset;
 
 /* Recoverable Fragmentation header fields. */
-static int hf_6lowpan_rfrag_congestion = -1;
-static int hf_6lowpan_rfrag_ack_requested = -1;
-static int hf_6lowpan_rfrag_dgram_tag = -1;
-static int hf_6lowpan_rfrag_sequence = -1;
-static int hf_6lowpan_rfrag_size = -1;
-static int hf_6lowpan_rfrag_dgram_size = -1;
-static int hf_6lowpan_rfrag_offset = -1;
-static int hf_6lowpan_rfrag_ack_bitmap = -1;
+static int hf_6lowpan_rfrag_congestion;
+static int hf_6lowpan_rfrag_ack_requested;
+static int hf_6lowpan_rfrag_dgram_tag;
+static int hf_6lowpan_rfrag_sequence;
+static int hf_6lowpan_rfrag_size;
+static int hf_6lowpan_rfrag_dgram_size;
+static int hf_6lowpan_rfrag_offset;
+static int hf_6lowpan_rfrag_ack_bitmap;
 
 /* Protocol tree handles.  */
-static gint ett_6lowpan = -1;
-static gint ett_6lowpan_hc1 = -1;
-static gint ett_6lowpan_hc1_encoding = -1;
-static gint ett_6lowpan_hc2_udp = -1;
-static gint ett_6lowpan_iphc = -1;
-static gint ett_lowpan_routing_header_dispatch = -1;
-static gint ett_6lowpan_nhc_ext = -1;
-static gint ett_6lowpan_nhc_udp = -1;
-static gint ett_6lowpan_bcast = -1;
-static gint ett_6lowpan_mesh = -1;
-static gint ett_6lowpan_mesh_flags = -1;
-static gint ett_6lowpan_frag = -1;
-
-static expert_field ei_6lowpan_hc1_more_bits = EI_INIT;
-static expert_field ei_6lowpan_illegal_dest_addr_mode = EI_INIT;
-static expert_field ei_6lowpan_bad_ipv6_header_length = EI_INIT;
-static expert_field ei_6lowpan_bad_ext_header_length = EI_INIT;
+static gint ett_6lowpan;
+static gint ett_6lowpan_hc1;
+static gint ett_6lowpan_hc1_encoding;
+static gint ett_6lowpan_hc2_udp;
+static gint ett_6lowpan_iphc;
+static gint ett_lowpan_routing_header_dispatch;
+static gint ett_6lowpan_nhc_ext;
+static gint ett_6lowpan_nhc_udp;
+static gint ett_6lowpan_bcast;
+static gint ett_6lowpan_mesh;
+static gint ett_6lowpan_mesh_flags;
+static gint ett_6lowpan_frag;
+
+static expert_field ei_6lowpan_hc1_more_bits;
+static expert_field ei_6lowpan_illegal_dest_addr_mode;
+static expert_field ei_6lowpan_bad_ipv6_header_length;
+static expert_field ei_6lowpan_bad_ext_header_length;
 
 /* Subdissector handles. */
 static dissector_handle_t       handle_6lowpan;
@@ -506,18 +506,18 @@ static const true_false_string bit_K_RPL = {
 };
 
 /* Reassembly Data */
-static int hf_6lowpan_fragments = -1;
-static int hf_6lowpan_fragment = -1;
-static int hf_6lowpan_fragment_overlap = -1;
-static int hf_6lowpan_fragment_overlap_conflicts = -1;
-static int hf_6lowpan_fragment_multiple_tails = -1;
-static int hf_6lowpan_fragment_too_long_fragment = -1;
-static int hf_6lowpan_fragment_error = -1;
-static int hf_6lowpan_fragment_count = -1;
-static int hf_6lowpan_reassembled_in = -1;
-static int hf_6lowpan_reassembled_length = -1;
-static gint ett_6lowpan_fragment = -1;
-static gint ett_6lowpan_fragments = -1;
+static int hf_6lowpan_fragments;
+static int hf_6lowpan_fragment;
+static int hf_6lowpan_fragment_overlap;
+static int hf_6lowpan_fragment_overlap_conflicts;
+static int hf_6lowpan_fragment_multiple_tails;
+static int hf_6lowpan_fragment_too_long_fragment;
+static int hf_6lowpan_fragment_error;
+static int hf_6lowpan_fragment_count;
+static int hf_6lowpan_reassembled_in;
+static int hf_6lowpan_reassembled_length;
+static gint ett_6lowpan_fragment;
+static gint ett_6lowpan_fragments;
 
 static const fragment_items lowpan_frag_items = {
     /* Fragment subtrees */
diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c
index e35072d4da..9befcd4028 100644
--- a/epan/dissectors/packet-9p.c
+++ b/epan/dissectors/packet-9p.c
@@ -954,165 +954,165 @@ void proto_register_9P(void);
 void proto_reg_handoff_9P(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_9P = -1;
-static int hf_9P_msgsz = -1;
-static int hf_9P_msgtype = -1;
-static int hf_9P_tag = -1;
-static int hf_9P_oldtag = -1;
-static int hf_9P_parmsz = -1;
-static int hf_9P_maxsize = -1;
-static int hf_9P_fid = -1;
-static int hf_9P_nqid = -1;
-static int hf_9P_mode = -1;
-static int hf_9P_mode_rwx = -1;
-static int hf_9P_mode_t = -1;
-static int hf_9P_mode_c = -1;
-static int hf_9P_extension = -1;
-static int hf_9P_iounit = -1;
-static int hf_9P_count = -1;
-static int hf_9P_offset = -1;
-static int hf_9P_perm = -1;
-static int hf_9P_qidtype = -1;
-static int hf_9P_qidtype_dir = -1;
-static int hf_9P_qidtype_append = -1;
-static int hf_9P_qidtype_exclusive = -1;
-static int hf_9P_qidtype_mount = -1;
-static int hf_9P_qidtype_auth_file = -1;
-static int hf_9P_qidtype_temp_file = -1;
-static int hf_9P_qidvers = -1;
-static int hf_9P_qidpath = -1;
-static int hf_9P_dm_dir = -1;
-static int hf_9P_dm_append = -1;
-static int hf_9P_dm_exclusive = -1;
-static int hf_9P_dm_mount = -1;
-static int hf_9P_dm_auth_file = -1;
-static int hf_9P_dm_temp_file = -1;
-static int hf_9P_dm_read_owner = -1;
-static int hf_9P_dm_write_owner = -1;
-static int hf_9P_dm_exec_owner = -1;
-static int hf_9P_dm_read_group = -1;
-static int hf_9P_dm_write_group = -1;
-static int hf_9P_dm_exec_group = -1;
-static int hf_9P_dm_read_others = -1;
-static int hf_9P_dm_write_others = -1;
-static int hf_9P_dm_exec_others = -1;
-static int hf_9P_stattype = -1;
-static int hf_9P_statmode = -1;
-static int hf_9P_atime = -1;
-static int hf_9P_mtime = -1;
-static int hf_9P_ctime = -1;
-static int hf_9P_btime = -1;
-static int hf_9P_length = -1;
-static int hf_9P_dev = -1;
-static int hf_9P_wname = -1;
-static int hf_9P_version = -1;
-static int hf_9P_afid = -1;
-static int hf_9P_uname = -1;
-static int hf_9P_aname = -1;
-static int hf_9P_ename = -1;
-static int hf_9P_enum = -1;
-/* static int hf_9P_name = -1; */
-static int hf_9P_filename = -1;
-static int hf_9P_sdlen = -1;
-static int hf_9P_user = -1;
-static int hf_9P_group = -1;
-static int hf_9P_uid = -1;
-static int hf_9P_gid = -1;
-static int hf_9P_muid = -1;
-static int hf_9P_nwalk = -1;
-static int hf_9P_newfid = -1;
-static int hf_9P_dfid = -1;
-static int hf_9P_getattr_flags = -1;
-static int hf_9P_getattr_mode = -1;
-static int hf_9P_getattr_nlink = -1;
-static int hf_9P_getattr_uid = -1;
-static int hf_9P_getattr_gid = -1;
-static int hf_9P_getattr_rdev = -1;
-static int hf_9P_getattr_atime = -1;
-static int hf_9P_getattr_mtime = -1;
-static int hf_9P_getattr_ctime = -1;
-static int hf_9P_getattr_ino = -1;
-static int hf_9P_getattr_size = -1;
-static int hf_9P_getattr_blocks = -1;
-static int hf_9P_getattr_btime = -1;
-static int hf_9P_getattr_gen = -1;
-static int hf_9P_getattr_dataversion = -1;
-static int hf_9P_setattr_flags = -1;
-static int hf_9P_setattr_mode = -1;
-static int hf_9P_setattr_uid = -1;
-static int hf_9P_setattr_gid = -1;
-static int hf_9P_setattr_size = -1;
-static int hf_9P_setattr_atime = -1;
-static int hf_9P_setattr_mtime = -1;
-static int hf_9P_setattr_ctime = -1;
-static int hf_9P_setattr_atime_set = -1;
-static int hf_9P_setattr_mtime_set = -1;
-static int hf_9P_unlinkat_flags = -1;
-static int hf_9P_nlink = -1;
-static int hf_9P_rdev = -1;
-static int hf_9P_size = -1;
-static int hf_9P_blksize = -1;
-static int hf_9P_blocks = -1;
-static int hf_9P_gen = -1;
-static int hf_9P_dataversion = -1;
-static int hf_9P_fstype = -1;
-static int hf_9P_bfree = -1;
-static int hf_9P_bavail = -1;
-static int hf_9P_files = -1;
-static int hf_9P_ffree = -1;
-static int hf_9P_fsid = -1;
-static int hf_9P_namelen = -1;
-static int hf_9P_mknod_major = -1;
-static int hf_9P_mknod_minor = -1;
-static int hf_9P_lflags = -1;
-static int hf_9P_lflags_rdonly = -1;
-static int hf_9P_lflags_wronly = -1;
-static int hf_9P_lflags_rdwr = -1;
-static int hf_9P_lflags_create = -1;
-static int hf_9P_lflags_excl = -1;
-static int hf_9P_lflags_noctty = -1;
-static int hf_9P_lflags_trunc = -1;
-static int hf_9P_lflags_append = -1;
-static int hf_9P_lflags_nonblock = -1;
-static int hf_9P_lflags_dsync = -1;
-static int hf_9P_lflags_fasync = -1;
-static int hf_9P_lflags_direct = -1;
-static int hf_9P_lflags_largefile = -1;
-static int hf_9P_lflags_directory = -1;
-static int hf_9P_lflags_nofollow = -1;
-static int hf_9P_lflags_noatime = -1;
-static int hf_9P_lflags_cloexec = -1;
-static int hf_9P_lflags_sync = -1;
-static int hf_9P_xattr_flag = -1;
-static int hf_9P_lock_type = -1;
-static int hf_9P_lock_flag = -1;
-static int hf_9P_lock_start = -1;
-static int hf_9P_lock_length = -1;
-static int hf_9P_lock_procid = -1;
-static int hf_9P_lock_status = -1;
-static int hf_9P_unknown_message = -1;
+static int proto_9P;
+static int hf_9P_msgsz;
+static int hf_9P_msgtype;
+static int hf_9P_tag;
+static int hf_9P_oldtag;
+static int hf_9P_parmsz;
+static int hf_9P_maxsize;
+static int hf_9P_fid;
+static int hf_9P_nqid;
+static int hf_9P_mode;
+static int hf_9P_mode_rwx;
+static int hf_9P_mode_t;
+static int hf_9P_mode_c;
+static int hf_9P_extension;
+static int hf_9P_iounit;
+static int hf_9P_count;
+static int hf_9P_offset;
+static int hf_9P_perm;
+static int hf_9P_qidtype;
+static int hf_9P_qidtype_dir;
+static int hf_9P_qidtype_append;
+static int hf_9P_qidtype_exclusive;
+static int hf_9P_qidtype_mount;
+static int hf_9P_qidtype_auth_file;
+static int hf_9P_qidtype_temp_file;
+static int hf_9P_qidvers;
+static int hf_9P_qidpath;
+static int hf_9P_dm_dir;
+static int hf_9P_dm_append;
+static int hf_9P_dm_exclusive;
+static int hf_9P_dm_mount;
+static int hf_9P_dm_auth_file;
+static int hf_9P_dm_temp_file;
+static int hf_9P_dm_read_owner;
+static int hf_9P_dm_write_owner;
+static int hf_9P_dm_exec_owner;
+static int hf_9P_dm_read_group;
+static int hf_9P_dm_write_group;
+static int hf_9P_dm_exec_group;
+static int hf_9P_dm_read_others;
+static int hf_9P_dm_write_others;
+static int hf_9P_dm_exec_others;
+static int hf_9P_stattype;
+static int hf_9P_statmode;
+static int hf_9P_atime;
+static int hf_9P_mtime;
+static int hf_9P_ctime;
+static int hf_9P_btime;
+static int hf_9P_length;
+static int hf_9P_dev;
+static int hf_9P_wname;
+static int hf_9P_version;
+static int hf_9P_afid;
+static int hf_9P_uname;
+static int hf_9P_aname;
+static int hf_9P_ename;
+static int hf_9P_enum;
+/* static int hf_9P_name; */
+static int hf_9P_filename;
+static int hf_9P_sdlen;
+static int hf_9P_user;
+static int hf_9P_group;
+static int hf_9P_uid;
+static int hf_9P_gid;
+static int hf_9P_muid;
+static int hf_9P_nwalk;
+static int hf_9P_newfid;
+static int hf_9P_dfid;
+static int hf_9P_getattr_flags;
+static int hf_9P_getattr_mode;
+static int hf_9P_getattr_nlink;
+static int hf_9P_getattr_uid;
+static int hf_9P_getattr_gid;
+static int hf_9P_getattr_rdev;
+static int hf_9P_getattr_atime;
+static int hf_9P_getattr_mtime;
+static int hf_9P_getattr_ctime;
+static int hf_9P_getattr_ino;
+static int hf_9P_getattr_size;
+static int hf_9P_getattr_blocks;
+static int hf_9P_getattr_btime;
+static int hf_9P_getattr_gen;
+static int hf_9P_getattr_dataversion;
+static int hf_9P_setattr_flags;
+static int hf_9P_setattr_mode;
+static int hf_9P_setattr_uid;
+static int hf_9P_setattr_gid;
+static int hf_9P_setattr_size;
+static int hf_9P_setattr_atime;
+static int hf_9P_setattr_mtime;
+static int hf_9P_setattr_ctime;
+static int hf_9P_setattr_atime_set;
+static int hf_9P_setattr_mtime_set;
+static int hf_9P_unlinkat_flags;
+static int hf_9P_nlink;
+static int hf_9P_rdev;
+static int hf_9P_size;
+static int hf_9P_blksize;
+static int hf_9P_blocks;
+static int hf_9P_gen;
+static int hf_9P_dataversion;
+static int hf_9P_fstype;
+static int hf_9P_bfree;
+static int hf_9P_bavail;
+static int hf_9P_files;
+static int hf_9P_ffree;
+static int hf_9P_fsid;
+static int hf_9P_namelen;
+static int hf_9P_mknod_major;
+static int hf_9P_mknod_minor;
+static int hf_9P_lflags;
+static int hf_9P_lflags_rdonly;
+static int hf_9P_lflags_wronly;
+static int hf_9P_lflags_rdwr;
+static int hf_9P_lflags_create;
+static int hf_9P_lflags_excl;
+static int hf_9P_lflags_noctty;
+static int hf_9P_lflags_trunc;
+static int hf_9P_lflags_append;
+static int hf_9P_lflags_nonblock;
+static int hf_9P_lflags_dsync;
+static int hf_9P_lflags_fasync;
+static int hf_9P_lflags_direct;
+static int hf_9P_lflags_largefile;
+static int hf_9P_lflags_directory;
+static int hf_9P_lflags_nofollow;
+static int hf_9P_lflags_noatime;
+static int hf_9P_lflags_cloexec;
+static int hf_9P_lflags_sync;
+static int hf_9P_xattr_flag;
+static int hf_9P_lock_type;
+static int hf_9P_lock_flag;
+static int hf_9P_lock_start;
+static int hf_9P_lock_length;
+static int hf_9P_lock_procid;
+static int hf_9P_lock_status;
+static int hf_9P_unknown_message;
 
 /* subtree pointers */
-static gint ett_9P = -1;
-static gint ett_9P_omode = -1;
-static gint ett_9P_dm = -1;
-static gint ett_9P_wname = -1;
-static gint ett_9P_aname = -1;
-static gint ett_9P_ename = -1;
-static gint ett_9P_uname = -1;
-static gint ett_9P_user = -1;
-static gint ett_9P_group = -1;
-static gint ett_9P_muid = -1;
-static gint ett_9P_filename = -1;
-static gint ett_9P_version = -1;
-static gint ett_9P_qid = -1;
-static gint ett_9P_qidtype = -1;
-static gint ett_9P_getattr_flags = -1;
-static gint ett_9P_setattr_flags = -1;
-static gint ett_9P_lflags = -1;
-
-static expert_field ei_9P_first_250 = EI_INIT;
-static expert_field ei_9P_msgtype = EI_INIT;
+static gint ett_9P;
+static gint ett_9P_omode;
+static gint ett_9P_dm;
+static gint ett_9P_wname;
+static gint ett_9P_aname;
+static gint ett_9P_ename;
+static gint ett_9P_uname;
+static gint ett_9P_user;
+static gint ett_9P_group;
+static gint ett_9P_muid;
+static gint ett_9P_filename;
+static gint ett_9P_version;
+static gint ett_9P_qid;
+static gint ett_9P_qidtype;
+static gint ett_9P_getattr_flags;
+static gint ett_9P_setattr_flags;
+static gint ett_9P_lflags;
+
+static expert_field ei_9P_first_250;
+static expert_field ei_9P_msgtype;
 
 static wmem_map_t *_9p_hashtable = NULL;
 
diff --git a/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c
index e34f717b15..93ae149b8e 100644
--- a/epan/dissectors/packet-HI2Operations.c
+++ b/epan/dissectors/packet-HI2Operations.c
@@ -34,7 +34,7 @@ void proto_register_HI2Operations(void);
 void proto_reg_handoff_HI2Operations(void);
 
 /* Initialize the protocol and registered fields */
-int proto_HI2Operations = -1;
+int proto_HI2Operations;
 static int hf_HI2Operations_IRIsContent_PDU;      /* IRIsContent */
 static int hf_HI2Operations_UUS1_Content_PDU;     /* UUS1_Content */
 static int hf_HI2Operations_communication_Identity_Number;  /* OCTET_STRING_SIZE_1_8 */
diff --git a/epan/dissectors/packet-a21.c b/epan/dissectors/packet-a21.c
index 3fdc5b1ca1..9f0b440bb0 100644
--- a/epan/dissectors/packet-a21.c
+++ b/epan/dissectors/packet-a21.c
@@ -27,91 +27,91 @@ void proto_reg_handoff_a21(void);
 static dissector_handle_t a21_handle = NULL;
 static dissector_handle_t gcsna_handle = NULL;
 
-static int proto_a21 = -1;
-
-static int hf_a21_message_type = -1;
-static int hf_a21_element_identifier = -1;
-static int hf_a21_element_length = -1;
-static int hf_a21_corr_id_corr_value = -1;
-static int hf_a21_mn_id_msid_value = -1;
-static int hf_a21_mn_id_odd_even_indicator = -1;
-static int hf_a21_mn_id_type_of_identity = -1;
-static int hf_a21_mn_id_esn = -1;
-static int hf_a21_mn_id_identity_digit_1 = -1;
-static int hf_a21_gcsna_pdu_length = -1;
-static int hf_a21_gcsna_content = -1;
-static int hf_a21_reference_cell_id_cell = -1;
-static int hf_a21_reference_cell_id_sector = -1;
-static int hf_a21_mob_sub_info_record_id = -1;
-static int hf_a21_mob_sub_info_record_length = -1;
-static int hf_a21_mob_sub_info_record_content = -1;
-static int hf_a21_mob_sub_info_re_con_all_band_inc = -1;
-static int hf_a21_mob_sub_info_re_con_curr_band_sub = -1;
-static int hf_a21_mob_sub_info_re_band_class = -1;
-static int hf_a21_mob_sub_info_re_con_all_sub_band_inc = -1;
-static int hf_a21_mob_sub_info_re_sub_cls_len = -1;
+static int proto_a21;
+
+static int hf_a21_message_type;
+static int hf_a21_element_identifier;
+static int hf_a21_element_length;
+static int hf_a21_corr_id_corr_value;
+static int hf_a21_mn_id_msid_value;
+static int hf_a21_mn_id_odd_even_indicator;
+static int hf_a21_mn_id_type_of_identity;
+static int hf_a21_mn_id_esn;
+static int hf_a21_mn_id_identity_digit_1;
+static int hf_a21_gcsna_pdu_length;
+static int hf_a21_gcsna_content;
+static int hf_a21_reference_cell_id_cell;
+static int hf_a21_reference_cell_id_sector;
+static int hf_a21_mob_sub_info_record_id;
+static int hf_a21_mob_sub_info_record_length;
+static int hf_a21_mob_sub_info_record_content;
+static int hf_a21_mob_sub_info_re_con_all_band_inc;
+static int hf_a21_mob_sub_info_re_con_curr_band_sub;
+static int hf_a21_mob_sub_info_re_band_class;
+static int hf_a21_mob_sub_info_re_con_all_sub_band_inc;
+static int hf_a21_mob_sub_info_re_sub_cls_len;
 /*
-static int hf_a21_mob_sub_info_re_con_band_class = -1;
+static int hf_a21_mob_sub_info_re_con_band_class;
 */
-static int hf_a21_auth_chall_para_rand_num_type = -1;
-static int hf_a21_auth_chall_para_rand_value = -1;
-static int hf_a21_service_option = -1;
-static int hf_a21_gcsna_status_reserved = -1;
-static int hf_a21_gcsna_status_priority_incl = -1;
-static int hf_a21_gcsna_status_gec = -1;
-static int hf_a21_gcsna_status_status_incl = -1;
-static int hf_a21_gcsna_status = -1;
-static int hf_a21_gcsna_status_call_priority = -1;
-static int hf_a21_3G1X_parameters = -1;
-static int hf_a21_reserved = -1;
-static int hf_a21_msg_tran_ctrl_paging_msg = -1;
-static int hf_a21_msg_tran_ctrl_simul_xmit_with_next = -1;
-static int hf_a21_msg_tran_ctrl_ackrequired = -1;
-static int hf_a21_msg_tran_ctrl_3GXLogicalChannel = -1;
-static int hf_a21_msg_tran_ctrl_protocol_revision = -1;
-static int hf_a21_1x_lac_en_pdu = -1;
-static int hf_a21_pilot_list_num_of_pilots = -1;
-static int hf_a21_cause_value = -1;
-static int hf_a21_mscid_market_id = -1;
-static int hf_a21_mscid_switch_number = -1;
-static int hf_a21_event = -1;
-static int hf_a21_additional_event_info = -1;
-static int hf_a21_allowed_forward_link_message = -1;
-static int hf_a21_channel_record_length = -1;
-static int hf_a21_ch_rec_sys_type = -1;
-static int hf_a21_ch_rec_band_class = -1;
-static int hf_a21_ch_rec_ch_num = -1;
-
-static int hf_a21_cell_id_info = -1;
-static int hf_a21_msc_id = -1;
-static int hf_a21_cell_id = -1;
-static int hf_a21_sector = -1;
-static int hf_a21_hrpd_sector_id_len = -1;
+static int hf_a21_auth_chall_para_rand_num_type;
+static int hf_a21_auth_chall_para_rand_value;
+static int hf_a21_service_option;
+static int hf_a21_gcsna_status_reserved;
+static int hf_a21_gcsna_status_priority_incl;
+static int hf_a21_gcsna_status_gec;
+static int hf_a21_gcsna_status_status_incl;
+static int hf_a21_gcsna_status;
+static int hf_a21_gcsna_status_call_priority;
+static int hf_a21_3G1X_parameters;
+static int hf_a21_reserved;
+static int hf_a21_msg_tran_ctrl_paging_msg;
+static int hf_a21_msg_tran_ctrl_simul_xmit_with_next;
+static int hf_a21_msg_tran_ctrl_ackrequired;
+static int hf_a21_msg_tran_ctrl_3GXLogicalChannel;
+static int hf_a21_msg_tran_ctrl_protocol_revision;
+static int hf_a21_1x_lac_en_pdu;
+static int hf_a21_pilot_list_num_of_pilots;
+static int hf_a21_cause_value;
+static int hf_a21_mscid_market_id;
+static int hf_a21_mscid_switch_number;
+static int hf_a21_event;
+static int hf_a21_additional_event_info;
+static int hf_a21_allowed_forward_link_message;
+static int hf_a21_channel_record_length;
+static int hf_a21_ch_rec_sys_type;
+static int hf_a21_ch_rec_band_class;
+static int hf_a21_ch_rec_ch_num;
+
+static int hf_a21_cell_id_info;
+static int hf_a21_msc_id;
+static int hf_a21_cell_id;
+static int hf_a21_sector;
+static int hf_a21_hrpd_sector_id_len;
 static int hf_a21_ch_hrpd_sector_id;
-static int hf_a21_ch_reference_pilot = -1;
-static int hf_a21_ch_pilot_pn = -1;
-static int hf_a21_ch_pilot_pn_phase = -1;
-static int hf_a21_ch_pilot_strength = -1;
-static int hf_a21_ch_pilot_ow_delay_flag = -1;
-static int hf_a21_ch_pilot_ow_delay = -1;
-static int hf_a21_sc0 = -1;
-static int hf_a21_sc1 = -1;
-static int hf_a21_sc2 = -1;
-static int hf_a21_sc3 = -1;
-static int hf_a21_sc4 = -1;
-static int hf_a21_sc5 = -1;
-static int hf_a21_sc6 = -1;
-static int hf_a21_sc7 = -1;
-
-static gint ett_a21 = -1;
-static gint ett_a21_ie = -1;
-static gint ett_a21_corr_id = -1;
-static gint ett_a21_record_content = -1;
-static gint ett_a21_pilot_list = -1;
-static gint ett_a21_cr = -1;
-static gint ett_a21_band_class = -1;
-
-static expert_field ei_a21_ie_data_not_dissected_yet = EI_INIT;
+static int hf_a21_ch_reference_pilot;
+static int hf_a21_ch_pilot_pn;
+static int hf_a21_ch_pilot_pn_phase;
+static int hf_a21_ch_pilot_strength;
+static int hf_a21_ch_pilot_ow_delay_flag;
+static int hf_a21_ch_pilot_ow_delay;
+static int hf_a21_sc0;
+static int hf_a21_sc1;
+static int hf_a21_sc2;
+static int hf_a21_sc3;
+static int hf_a21_sc4;
+static int hf_a21_sc5;
+static int hf_a21_sc6;
+static int hf_a21_sc7;
+
+static gint ett_a21;
+static gint ett_a21_ie;
+static gint ett_a21_corr_id;
+static gint ett_a21_record_content;
+static gint ett_a21_pilot_list;
+static gint ett_a21_cr;
+static gint ett_a21_band_class;
+
+static expert_field ei_a21_ie_data_not_dissected_yet;
 
 static const value_string a21_message_type_vals[] = {
 	{0x01, "A21-1x Air Interface Signalling"},	/* 01H */
diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c
index 419ae1822f..0f593beba0 100644
--- a/epan/dissectors/packet-aarp.c
+++ b/epan/dissectors/packet-aarp.c
@@ -21,24 +21,24 @@
 void proto_register_aarp(void);
 void proto_reg_handoff_aarp(void);
 
-static int proto_aarp = -1;
-static int hf_aarp_hard_type = -1;
-static int hf_aarp_proto_type = -1;
-static int hf_aarp_hard_size = -1;
-static int hf_aarp_proto_size = -1;
-static int hf_aarp_opcode = -1;
-static int hf_aarp_src_hw = -1;
-static int hf_aarp_src_hw_mac = -1;
-static int hf_aarp_src_proto = -1;
-static int hf_aarp_src_proto_id = -1;
-static int hf_aarp_dst_hw = -1;
-static int hf_aarp_dst_hw_mac = -1;
-static int hf_aarp_dst_proto = -1;
-static int hf_aarp_dst_proto_id = -1;
-
-static gint ett_aarp = -1;
-
-static expert_field ei_aarp_length_invalid = EI_INIT;
+static int proto_aarp;
+static int hf_aarp_hard_type;
+static int hf_aarp_proto_type;
+static int hf_aarp_hard_size;
+static int hf_aarp_proto_size;
+static int hf_aarp_opcode;
+static int hf_aarp_src_hw;
+static int hf_aarp_src_hw_mac;
+static int hf_aarp_src_proto;
+static int hf_aarp_src_proto_id;
+static int hf_aarp_dst_hw;
+static int hf_aarp_dst_hw_mac;
+static int hf_aarp_dst_proto;
+static int hf_aarp_dst_proto_id;
+
+static gint ett_aarp;
+
+static expert_field ei_aarp_length_invalid;
 
 #ifndef AARP_REQUEST
 #define AARP_REQUEST    0x0001
diff --git a/epan/dissectors/packet-aastra-aasp.c b/epan/dissectors/packet-aastra-aasp.c
index 51d5f067eb..8d0a431a44 100644
--- a/epan/dissectors/packet-aastra-aasp.c
+++ b/epan/dissectors/packet-aastra-aasp.c
@@ -55,33 +55,33 @@ void proto_reg_handoff_aasp(void);
 static dissector_handle_t aasp_handle;
 
 /* Initialize the protocol and registered fields */
-static gint proto_aasp = -1;
-
-static gint hf_a_data = -1;
-static gint hf_a_cmd = -1;
-static gint hf_a_id = -1;
-static gint hf_a_length = -1;
-static gint hf_a_text = -1;
-static gint hf_a_line = -1;
-static gint hf_a_cdpn = -1;
-static gint hf_a_button_id = -1;
-
-static gint hf_a_attr = -1;
-
-static gint hf_a_item = -1;
-static gint hf_a_hour = -1;
-static gint hf_a_minute = -1;
-static gint hf_a_day = -1;
-static gint hf_a_month = -1;
-static gint hf_a_weekofyear = -1;
-static gint hf_a_weekday = -1;
-static gint hf_a_month_name = -1;
-static gint hf_a_weekofyear_prefix = -1;
+static gint proto_aasp;
+
+static gint hf_a_data;
+static gint hf_a_cmd;
+static gint hf_a_id;
+static gint hf_a_length;
+static gint hf_a_text;
+static gint hf_a_line;
+static gint hf_a_cdpn;
+static gint hf_a_button_id;
+
+static gint hf_a_attr;
+
+static gint hf_a_item;
+static gint hf_a_hour;
+static gint hf_a_minute;
+static gint hf_a_day;
+static gint hf_a_month;
+static gint hf_a_weekofyear;
+static gint hf_a_weekday;
+static gint hf_a_month_name;
+static gint hf_a_weekofyear_prefix;
 
 /* Initialize the subtree pointers */
-static gint ett_aasp = -1;
-static gint ett_a_cmd = -1;
-static gint ett_a_item = -1;
+static gint ett_aasp;
+static gint ett_a_cmd;
+static gint ett_a_item;
 
 /* Preferences */
 
diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c
index 0b52a7ffdc..d6cd2601be 100644
--- a/epan/dissectors/packet-acap.c
+++ b/epan/dissectors/packet-acap.c
@@ -23,17 +23,17 @@ void proto_reg_handoff_acap(void);
 
 static dissector_handle_t acap_handle;
 
-static int proto_acap = -1;
+static int proto_acap;
 
-static int hf_acap_request = -1;
-static int hf_acap_request_data = -1;
-static int hf_acap_request_tag = -1;
-static int hf_acap_response = -1;
-static int hf_acap_response_data = -1;
-static int hf_acap_response_tag = -1;
+static int hf_acap_request;
+static int hf_acap_request_data;
+static int hf_acap_request_tag;
+static int hf_acap_response;
+static int hf_acap_response_data;
+static int hf_acap_response_tag;
 
-static gint ett_acap = -1;
-static gint ett_acap_reqresp = -1;
+static gint ett_acap;
+static gint ett_acap_reqresp;
 
 #define TCP_PORT_ACAP           674
 
diff --git a/epan/dissectors/packet-acdr.c b/epan/dissectors/packet-acdr.c
index 0c598bc1eb..87db046939 100644
--- a/epan/dissectors/packet-acdr.c
+++ b/epan/dissectors/packet-acdr.c
@@ -271,112 +271,112 @@ static const value_string hf_acdr_ext_direction_vals[] = {
     {0, NULL      }
 };
 
-static int proto_acdr = -1;
-static int proto_ac5xmii = -1;
-static int proto_ac5x = -1;
-static int proto_ac48x = -1;
-static int proto_ac49x = -1;
+static int proto_acdr;
+static int proto_ac5xmii;
+static int proto_ac5x;
+static int proto_ac48x;
+static int proto_ac49x;
 
 // Define headers for acdr
-static int hf_acdr_seq_num = -1;
-static int hf_acdr_timestamp = -1;
-static int hf_acdr_sourceid = -1;
-static int hf_acdr_destid = -1;
-static int hf_acdr_version = -1;
-static int hf_acdr_trace_pt = -1;
-static int hf_acdr_media_type = -1;
-static int hf_acdr_media_type_dsp_ac5x = -1;
-static int hf_acdr_pl_offset_type = -1;
-static int hf_acdr_header_ext_len_type = -1;
-static int hf_acdr_data = -1;
-static int hf_acdr_data_mii = -1;
-static int hf_acdr_data_ipv6 = -1;
-static int hf_acdr_data_fragmented = -1;
-static int hf_acdr_data_headeradded = -1;
-static int hf_acdr_data_encrypted = -1;
-static int hf_acdr_data_mtce = -1;
-static int hf_acdr_data_li = -1;
-
-static int hf_acdr_session_id = -1;
-static int hf_acdr_session_id_board_id = -1;
-static int hf_acdr_session_id_reset_counter = -1;
-static int hf_acdr_session_id_session_number = -1;
-static int hf_acdr_session_id_long_session_number = -1;
-
-static int hf_acdr_ext_c5_control_favorite = -1;
-
-static int hf_acdr_payload_header = -1;
-static int hf_acdr_mii_header = -1;
+static int hf_acdr_seq_num;
+static int hf_acdr_timestamp;
+static int hf_acdr_sourceid;
+static int hf_acdr_destid;
+static int hf_acdr_version;
+static int hf_acdr_trace_pt;
+static int hf_acdr_media_type;
+static int hf_acdr_media_type_dsp_ac5x;
+static int hf_acdr_pl_offset_type;
+static int hf_acdr_header_ext_len_type;
+static int hf_acdr_data;
+static int hf_acdr_data_mii;
+static int hf_acdr_data_ipv6;
+static int hf_acdr_data_fragmented;
+static int hf_acdr_data_headeradded;
+static int hf_acdr_data_encrypted;
+static int hf_acdr_data_mtce;
+static int hf_acdr_data_li;
+
+static int hf_acdr_session_id;
+static int hf_acdr_session_id_board_id;
+static int hf_acdr_session_id_reset_counter;
+static int hf_acdr_session_id_session_number;
+static int hf_acdr_session_id_long_session_number;
+
+static int hf_acdr_ext_c5_control_favorite;
+
+static int hf_acdr_payload_header;
+static int hf_acdr_mii_header;
 
 // header extension
-static int hf_acdr_ext_srcudp = -1;
-static int hf_acdr_ext_dstudp = -1;
-static int hf_acdr_ext_srcip = -1;
-static int hf_acdr_ext_srcipv6 = -1;
-static int hf_acdr_ext_dstip = -1;
-static int hf_acdr_ext_dstipv6 = -1;
-static int hf_acdr_ext_protocol = -1;
-static int hf_acdr_ext_tls_application = -1;
-static int hf_acdr_ext_direction = -1;
-static int hf_acdr_ext_iptos = -1;
-static int hf_acdr_ext_c5_control_flags = -1;
-
-static int hf_acdr_unknown_packet = -1;
-static int hf_acdr_ext_pstn_trace_seq_num = -1;
-static int hf_acdr_header_extension = -1;
-static int hf_acdr_ext_dsp_core = -1;
-static int hf_acdr_ext_dsp_channel = -1;
-static int hf_acdr_ext_event_id = -1;
-static int hf_acdr_ext_event_source = -1;
+static int hf_acdr_ext_srcudp;
+static int hf_acdr_ext_dstudp;
+static int hf_acdr_ext_srcip;
+static int hf_acdr_ext_srcipv6;
+static int hf_acdr_ext_dstip;
+static int hf_acdr_ext_dstipv6;
+static int hf_acdr_ext_protocol;
+static int hf_acdr_ext_tls_application;
+static int hf_acdr_ext_direction;
+static int hf_acdr_ext_iptos;
+static int hf_acdr_ext_c5_control_flags;
+
+static int hf_acdr_unknown_packet;
+static int hf_acdr_ext_pstn_trace_seq_num;
+static int hf_acdr_header_extension;
+static int hf_acdr_ext_dsp_core;
+static int hf_acdr_ext_dsp_channel;
+static int hf_acdr_ext_event_id;
+static int hf_acdr_ext_event_source;
 
 // Mii header extension
-static int hf_acdr_mii_sequence = -1;
-static int hf_acdr_mii_packet_size = -1;
-static int hf_acdr_5x_analysis_packet_header = -1;
-static int hf_5x_analysis_version = -1;
-static int hf_5x_analysis_direction = -1;
-static int hf_5x_analysis_sub_version = -1;
-static int hf_5x_analysis_device = -1;
-static int hf_5x_analysis_sequence = -1;
-static int hf_5x_analysis_spare1 = -1;
-static int hf_5x_analysis_timestamp = -1;
-static int hf_5x_analysis_spare2 = -1;
-
-static int hf_acdr_5x_hpi_packet_header = -1;
-static int hf_5x_hpi_sync5 = -1;
-static int hf_5x_hpi_udp_checksum = -1;
-static int hf_5x_hpi_resource_id = -1;
-static int hf_5x_hpi_favorite = -1;
-static int hf_5x_hpi_protocol = -1;
-
-static int hf_ac45x_packet = -1;
-static int hf_ac48x_packet = -1;
-static int hf_ac49x_packet = -1;
-static int hf_ac5x_packet = -1;
-
-static int hf_signaling_packet = -1;
-static int hf_acdr_signaling_opcode = -1;
-static int hf_acdr_signaling_size = -1;
-static int hf_acdr_signaling_timestamp = -1;
+static int hf_acdr_mii_sequence;
+static int hf_acdr_mii_packet_size;
+static int hf_acdr_5x_analysis_packet_header;
+static int hf_5x_analysis_version;
+static int hf_5x_analysis_direction;
+static int hf_5x_analysis_sub_version;
+static int hf_5x_analysis_device;
+static int hf_5x_analysis_sequence;
+static int hf_5x_analysis_spare1;
+static int hf_5x_analysis_timestamp;
+static int hf_5x_analysis_spare2;
+
+static int hf_acdr_5x_hpi_packet_header;
+static int hf_5x_hpi_sync5;
+static int hf_5x_hpi_udp_checksum;
+static int hf_5x_hpi_resource_id;
+static int hf_5x_hpi_favorite;
+static int hf_5x_hpi_protocol;
+
+static int hf_ac45x_packet;
+static int hf_ac48x_packet;
+static int hf_ac49x_packet;
+static int hf_ac5x_packet;
+
+static int hf_signaling_packet;
+static int hf_acdr_signaling_opcode;
+static int hf_acdr_signaling_size;
+static int hf_acdr_signaling_timestamp;
 
 
 // Define the trees for acdr
-static int ett_acdr = -1;
-static int ett_extension = -1;
-static int ett_ac49x_packet = -1;
-static int ett_ac48x_packet = -1;
-static int ett_ac45x_packet = -1;
-static int ett_ac5x_packet = -1;
-static int ett_ac5x_mii_packet = -1;
-static int ett_mii_header = -1;
-static int ett_signaling_packet = -1;
-static int ett_extra_data = -1;
-static int ett_c5_cntrl_flags = -1;
-static int ett_5x_analysis_packet_header = -1;
-static int ett_5x_hpi_packet_header = -1;
-static int ett_session_id = -1;
-
-static expert_field ei_acdr_version_not_supported = EI_INIT;
+static int ett_acdr;
+static int ett_extension;
+static int ett_ac49x_packet;
+static int ett_ac48x_packet;
+static int ett_ac45x_packet;
+static int ett_ac5x_packet;
+static int ett_ac5x_mii_packet;
+static int ett_mii_header;
+static int ett_signaling_packet;
+static int ett_extra_data;
+static int ett_c5_cntrl_flags;
+static int ett_5x_analysis_packet_header;
+static int ett_5x_hpi_packet_header;
+static int ett_session_id;
+
+static expert_field ei_acdr_version_not_supported;
 
 static int proto_rtp;
 
diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c
index e259c080d3..43b68ad967 100644
--- a/epan/dissectors/packet-acn.c
+++ b/epan/dissectors/packet-acn.c
@@ -459,172 +459,172 @@ static int     dissect_acn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static int     dissect_rdmnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 data_offset, gboolean is_udp);
 
 /* Global variables */
-static int proto_acn = -1;
-static gint ett_acn = -1;
-static gint ett_acn_channel_owner_info_block = -1;
-static gint ett_acn_channel_member_info_block = -1;
-static gint ett_acn_channel_parameter = -1;
-static gint ett_acn_address = -1;
-static gint ett_acn_address_type = -1;
-static gint ett_acn_blob = -1;
-static gint ett_acn_pdu_flags = -1;
-static gint ett_acn_dmp_pdu = -1;
-static gint ett_acn_sdt_pdu = -1;
-static gint ett_acn_sdt_client_pdu = -1;
-static gint ett_acn_sdt_base_pdu = -1;
-static gint ett_acn_root_pdu = -1;
-
-static gint ett_acn_dmx_address = -1;
-static gint ett_acn_dmx_2_options = -1;
-static gint ett_acn_dmx_data_pdu = -1;
-static gint ett_acn_dmx_pdu = -1;
-
-static gint ett_rdmnet_pdu_flags = -1;
-static gint ett_rdmnet_llrp_base_pdu = -1;
-static gint ett_rdmnet_llrp_probe_request_pdu = -1;
-static gint ett_rdmnet_llrp_probe_request_filter_flags = -1;
-static gint ett_rdmnet_llrp_probe_reply_pdu = -1;
-static gint ett_rdmnet_llrp_rdm_command_pdu = -1;
-
-static gint ett_rdmnet_broker_base_pdu = -1;
-static gint ett_rdmnet_broker_client_entry_pdu = -1;
-static gint ett_rdmnet_broker_client_entry_manufacturer_protocol_ids = -1;
-static gint ett_rdmnet_broker_connect_connection_flags = -1;
-static gint ett_rdmnet_broker_client_entry_update_connection_flags = -1;
-
-static gint ett_rdmnet_rpt_base_pdu = -1;
-static gint ett_rdmnet_rpt_request_pdu = -1;
-static gint ett_rdmnet_rpt_status_pdu = -1;
-static gint ett_rdmnet_rpt_notification_pdu = -1;
-
-static gint ett_rdmnet_ept_base_pdu = -1;
-static gint ett_rdmnet_ept_data_pdu = -1;
-static gint ett_rdmnet_ept_data_vector_pdu = -1;
-static gint ett_rdmnet_ept_status_pdu = -1;
-
-static expert_field ei_acn_dmx_discovery_outofseq = EI_INIT;
+static int proto_acn;
+static gint ett_acn;
+static gint ett_acn_channel_owner_info_block;
+static gint ett_acn_channel_member_info_block;
+static gint ett_acn_channel_parameter;
+static gint ett_acn_address;
+static gint ett_acn_address_type;
+static gint ett_acn_blob;
+static gint ett_acn_pdu_flags;
+static gint ett_acn_dmp_pdu;
+static gint ett_acn_sdt_pdu;
+static gint ett_acn_sdt_client_pdu;
+static gint ett_acn_sdt_base_pdu;
+static gint ett_acn_root_pdu;
+
+static gint ett_acn_dmx_address;
+static gint ett_acn_dmx_2_options;
+static gint ett_acn_dmx_data_pdu;
+static gint ett_acn_dmx_pdu;
+
+static gint ett_rdmnet_pdu_flags;
+static gint ett_rdmnet_llrp_base_pdu;
+static gint ett_rdmnet_llrp_probe_request_pdu;
+static gint ett_rdmnet_llrp_probe_request_filter_flags;
+static gint ett_rdmnet_llrp_probe_reply_pdu;
+static gint ett_rdmnet_llrp_rdm_command_pdu;
+
+static gint ett_rdmnet_broker_base_pdu;
+static gint ett_rdmnet_broker_client_entry_pdu;
+static gint ett_rdmnet_broker_client_entry_manufacturer_protocol_ids;
+static gint ett_rdmnet_broker_connect_connection_flags;
+static gint ett_rdmnet_broker_client_entry_update_connection_flags;
+
+static gint ett_rdmnet_rpt_base_pdu;
+static gint ett_rdmnet_rpt_request_pdu;
+static gint ett_rdmnet_rpt_status_pdu;
+static gint ett_rdmnet_rpt_notification_pdu;
+
+static gint ett_rdmnet_ept_base_pdu;
+static gint ett_rdmnet_ept_data_pdu;
+static gint ett_rdmnet_ept_data_vector_pdu;
+static gint ett_rdmnet_ept_status_pdu;
+
+static expert_field ei_acn_dmx_discovery_outofseq;
 
 /*  Register fields */
 /* In alphabetical order */
-static int hf_acn_association = -1;
-static int hf_acn_blob = -1;
-/* static int hf_acn_blob_dimmer_load_properties2_type = -1; */
-static int hf_acn_blob_field_length = -1;
-static int hf_acn_blob_field_type = -1;
-static int hf_acn_blob_field_value_number = -1;
-static int hf_acn_blob_field_value_number64 = -1;
-static int hf_acn_blob_field_value_ipv4 = -1;
-static int hf_acn_blob_field_value_ipv6 = -1;
-static int hf_acn_blob_field_value_float = -1;
-static int hf_acn_blob_field_value_double = -1;
-static int hf_acn_blob_field_value_guid = -1;
-static int hf_acn_blob_field_value_string = -1;
-/* static int hf_acn_blob_metadata_types_type = -1; */
-static int hf_acn_blob_range_number = -1;
-/* static int hf_acn_blob_range_start = -1; */
-static int hf_acn_blob_range_type = -1;
-static int hf_acn_blob_tree_field_type = -1;
-static int hf_acn_blob_type = -1;
-static int hf_acn_blob_version = -1;
-static int hf_acn_blob_time_zone = -1;
-static int hf_acn_blob_dst_type = -1;
-static int hf_acn_blob_dst_start_day = -1;
-static int hf_acn_blob_dst_stop_day = -1;
-static int hf_acn_blob_dst_start_locality = -1;
-static int hf_acn_blob_dst_stop_locality = -1;
-static int hf_acn_channel_number = -1;
-static int hf_acn_cid = -1;
-/* static int hf_acn_client_protocol_id = -1; */
-static int hf_acn_data = -1;
-static int hf_acn_data8 = -1;
-static int hf_acn_data16 = -1;
-static int hf_acn_data24 = -1;
-static int hf_acn_data32 = -1;
-/* static int hf_acn_dmp_adt = -1; */ /* address and data type*/
-static int hf_acn_dmp_adt_a = -1;
-static int hf_acn_dmp_adt_v = -1;
-static int hf_acn_dmp_adt_r = -1;
-static int hf_acn_dmp_adt_d = -1;
-static int hf_acn_dmp_adt_x = -1;
-static int hf_acn_dmp_reason_code = -1;
-static int hf_acn_dmp_vector = -1;
-static int hf_acn_dmp_actual_address = -1;
-static int hf_acn_dmp_virtual_address = -1;
-static int hf_acn_dmp_actual_address_first = -1;
-static int hf_acn_dmp_virtual_address_first = -1;
-static int hf_acn_expiry = -1;
-static int hf_acn_first_member_to_ack = -1;
-static int hf_acn_first_missed_sequence = -1;
-static int hf_acn_ip_address_type = -1;
-static int hf_acn_ipv4 = -1;
-static int hf_acn_ipv6 = -1;
-static int hf_acn_last_member_to_ack = -1;
-static int hf_acn_last_missed_sequence = -1;
-static int hf_acn_mak_threshold = -1;
-static int hf_acn_member_id = -1;
-static int hf_acn_nak_holdoff = -1;
-static int hf_acn_nak_max_wait = -1;
-static int hf_acn_nak_modulus = -1;
-static int hf_acn_nak_outbound_flag = -1;
-static int hf_acn_oldest_available_wrapper = -1;
-static int hf_acn_packet_identifier = -1;
-static int hf_acn_pdu = -1;
-static int hf_acn_pdu_flag_d = -1;
-static int hf_acn_pdu_flag_h = -1;
-static int hf_acn_pdu_flag_l = -1;
-static int hf_acn_pdu_flag_v = -1;
-static int hf_acn_pdu_flags = -1;
-static int hf_acn_pdu_length = -1;
-static int hf_acn_port = -1;
-static int hf_acn_postamble_size = -1;
-static int hf_acn_preamble_size = -1;
-static int hf_acn_protocol_id = -1;
-static int hf_acn_reason_code = -1;
-static int hf_acn_reciprocal_channel = -1;
-static int hf_acn_refuse_code = -1;
-static int hf_acn_reliable_sequence_number = -1;
-static int hf_acn_adhoc_expiry = -1;
-/* static int hf_acn_sdt_pdu = -1; */
-static int hf_acn_sdt_vector = -1;
-
-static int hf_acn_dmx_vector = -1;
-static int hf_acn_dmx_extension_vector = -1;
-/* static int hf_acn_session_count = -1; */
-static int hf_acn_total_sequence_number = -1;
-static int hf_acn_dmx_source_name = -1;
-static int hf_acn_dmx_priority = -1;
-static int hf_acn_dmx_2_sync_universe = -1;
-static int hf_acn_dmx_3_reserved = -1;
-static int hf_acn_dmx_sequence_number = -1;
-static int hf_acn_dmx_2_options = -1;
-static int hf_acn_dmx_2_option_p = -1;
-static int hf_acn_dmx_2_option_s = -1;
-static int hf_acn_dmx_2_option_f = -1;
-static int hf_acn_dmx_universe = -1;
-
-static int hf_acn_dmx_start_code = -1;
-static int hf_acn_dmx_2_first_property_address = -1;
-static int hf_acn_dmx_increment = -1;
-static int hf_acn_dmx_count = -1;
-static int hf_acn_dmx_2_start_code = -1;
-static int hf_acn_dmx_data = -1;
-
-static int hf_acn_postamble_key_fingerprint = -1;
-static int hf_acn_postamble_seq_type = -1;
-static int hf_acn_postamble_seq_hi = -1;
-static int hf_acn_postamble_seq_low = -1;
-static int hf_acn_postamble_message_digest = -1;
-
-static int hf_acn_dmx_discovery_framing_reserved = -1;
-static int hf_acn_dmx_discovery_page = -1;
-static int hf_acn_dmx_discovery_last_page = -1;
-static int hf_acn_dmx_discovery_vector = -1;
-static int hf_acn_dmx_discovery_universe_list = -1;
-
-static int hf_acn_dmx_sync_universe = -1;
-static int hf_acn_dmx_sync_reserved = -1;
-
-/* static int hf_acn_dmx_dmp_vector = -1; */
+static int hf_acn_association;
+static int hf_acn_blob;
+/* static int hf_acn_blob_dimmer_load_properties2_type; */
+static int hf_acn_blob_field_length;
+static int hf_acn_blob_field_type;
+static int hf_acn_blob_field_value_number;
+static int hf_acn_blob_field_value_number64;
+static int hf_acn_blob_field_value_ipv4;
+static int hf_acn_blob_field_value_ipv6;
+static int hf_acn_blob_field_value_float;
+static int hf_acn_blob_field_value_double;
+static int hf_acn_blob_field_value_guid;
+static int hf_acn_blob_field_value_string;
+/* static int hf_acn_blob_metadata_types_type; */
+static int hf_acn_blob_range_number;
+/* static int hf_acn_blob_range_start; */
+static int hf_acn_blob_range_type;
+static int hf_acn_blob_tree_field_type;
+static int hf_acn_blob_type;
+static int hf_acn_blob_version;
+static int hf_acn_blob_time_zone;
+static int hf_acn_blob_dst_type;
+static int hf_acn_blob_dst_start_day;
+static int hf_acn_blob_dst_stop_day;
+static int hf_acn_blob_dst_start_locality;
+static int hf_acn_blob_dst_stop_locality;
+static int hf_acn_channel_number;
+static int hf_acn_cid;
+/* static int hf_acn_client_protocol_id; */
+static int hf_acn_data;
+static int hf_acn_data8;
+static int hf_acn_data16;
+static int hf_acn_data24;
+static int hf_acn_data32;
+/* static int hf_acn_dmp_adt; */ /* address and data type*/
+static int hf_acn_dmp_adt_a;
+static int hf_acn_dmp_adt_v;
+static int hf_acn_dmp_adt_r;
+static int hf_acn_dmp_adt_d;
+static int hf_acn_dmp_adt_x;
+static int hf_acn_dmp_reason_code;
+static int hf_acn_dmp_vector;
+static int hf_acn_dmp_actual_address;
+static int hf_acn_dmp_virtual_address;
+static int hf_acn_dmp_actual_address_first;
+static int hf_acn_dmp_virtual_address_first;
+static int hf_acn_expiry;
+static int hf_acn_first_member_to_ack;
+static int hf_acn_first_missed_sequence;
+static int hf_acn_ip_address_type;
+static int hf_acn_ipv4;
+static int hf_acn_ipv6;
+static int hf_acn_last_member_to_ack;
+static int hf_acn_last_missed_sequence;
+static int hf_acn_mak_threshold;
+static int hf_acn_member_id;
+static int hf_acn_nak_holdoff;
+static int hf_acn_nak_max_wait;
+static int hf_acn_nak_modulus;
+static int hf_acn_nak_outbound_flag;
+static int hf_acn_oldest_available_wrapper;
+static int hf_acn_packet_identifier;
+static int hf_acn_pdu;
+static int hf_acn_pdu_flag_d;
+static int hf_acn_pdu_flag_h;
+static int hf_acn_pdu_flag_l;
+static int hf_acn_pdu_flag_v;
+static int hf_acn_pdu_flags;
+static int hf_acn_pdu_length;
+static int hf_acn_port;
+static int hf_acn_postamble_size;
+static int hf_acn_preamble_size;
+static int hf_acn_protocol_id;
+static int hf_acn_reason_code;
+static int hf_acn_reciprocal_channel;
+static int hf_acn_refuse_code;
+static int hf_acn_reliable_sequence_number;
+static int hf_acn_adhoc_expiry;
+/* static int hf_acn_sdt_pdu; */
+static int hf_acn_sdt_vector;
+
+static int hf_acn_dmx_vector;
+static int hf_acn_dmx_extension_vector;
+/* static int hf_acn_session_count; */
+static int hf_acn_total_sequence_number;
+static int hf_acn_dmx_source_name;
+static int hf_acn_dmx_priority;
+static int hf_acn_dmx_2_sync_universe;
+static int hf_acn_dmx_3_reserved;
+static int hf_acn_dmx_sequence_number;
+static int hf_acn_dmx_2_options;
+static int hf_acn_dmx_2_option_p;
+static int hf_acn_dmx_2_option_s;
+static int hf_acn_dmx_2_option_f;
+static int hf_acn_dmx_universe;
+
+static int hf_acn_dmx_start_code;
+static int hf_acn_dmx_2_first_property_address;
+static int hf_acn_dmx_increment;
+static int hf_acn_dmx_count;
+static int hf_acn_dmx_2_start_code;
+static int hf_acn_dmx_data;
+
+static int hf_acn_postamble_key_fingerprint;
+static int hf_acn_postamble_seq_type;
+static int hf_acn_postamble_seq_hi;
+static int hf_acn_postamble_seq_low;
+static int hf_acn_postamble_message_digest;
+
+static int hf_acn_dmx_discovery_framing_reserved;
+static int hf_acn_dmx_discovery_page;
+static int hf_acn_dmx_discovery_last_page;
+static int hf_acn_dmx_discovery_vector;
+static int hf_acn_dmx_discovery_universe_list;
+
+static int hf_acn_dmx_sync_universe;
+static int hf_acn_dmx_sync_reserved;
+
+/* static int hf_acn_dmx_dmp_vector; */
 
 /* Try heuristic ACN decode */
 static gboolean global_acn_dmx_enable = FALSE;
@@ -633,144 +633,144 @@ static gint     global_acn_dmx_display_line_format = 0;
 static gboolean global_acn_dmx_display_zeros = FALSE;
 static gboolean global_acn_dmx_display_leading_zeros = FALSE;
 
-static int proto_magic = -1;
-static gint ett_magic = -1;
+static int proto_magic;
+static gint ett_magic;
 
 /* Register fields */
-static int hf_magic_protocol_id = -1;
-static int hf_magic_pdu_subtype = -1;
-static int hf_magic_major_version = -1;
-static int hf_magic_minor_version = -1;
+static int hf_magic_protocol_id;
+static int hf_magic_pdu_subtype;
+static int hf_magic_major_version;
+static int hf_magic_minor_version;
 
-static int hf_magic_v1command_vals = -1;
+static int hf_magic_v1command_vals;
 
-static int hf_magic_command_vals = -1;
-static int hf_magic_command_beacon_duration = -1;
-static int hf_magic_command_tftp = -1;
-static int hf_magic_command_reset_lease = -1;
-static int hf_magic_command_cid = -1;
-static int hf_magic_command_ip_configuration = -1;
-static int hf_magic_command_ip_address = -1;
-static int hf_magic_command_subnet_mask = -1;
-static int hf_magic_command_gateway = -1;
+static int hf_magic_command_vals;
+static int hf_magic_command_beacon_duration;
+static int hf_magic_command_tftp;
+static int hf_magic_command_reset_lease;
+static int hf_magic_command_cid;
+static int hf_magic_command_ip_configuration;
+static int hf_magic_command_ip_address;
+static int hf_magic_command_subnet_mask;
+static int hf_magic_command_gateway;
 
-static int hf_magic_reply_ip_address = -1;
-static int hf_magic_reply_subnet_mask = -1;
-static int hf_magic_reply_gateway = -1;
-static int hf_magic_reply_tftp = -1;
+static int hf_magic_reply_ip_address;
+static int hf_magic_reply_subnet_mask;
+static int hf_magic_reply_gateway;
+static int hf_magic_reply_tftp;
 
-static int hf_magic_reply_version = -1;
-static int hf_magic_reply_device_type_name = -1;
-static int hf_magic_reply_default_name = -1;
-static int hf_magic_reply_user_name = -1;
-static int hf_magic_reply_cid = -1;
-static int hf_magic_reply_dcid = -1;
+static int hf_magic_reply_version;
+static int hf_magic_reply_device_type_name;
+static int hf_magic_reply_default_name;
+static int hf_magic_reply_user_name;
+static int hf_magic_reply_cid;
+static int hf_magic_reply_dcid;
 
-static expert_field ei_magic_reply_invalid_type = EI_INIT;
+static expert_field ei_magic_reply_invalid_type;
 
 
-static int proto_rdmnet = -1;
-static gint ett_rdmnet = -1;
+static int proto_rdmnet;
+static gint ett_rdmnet;
 
 /* Register fields */
-static int hf_rdmnet_cid = -1;
-static int hf_rdmnet_packet_identifier = -1;
-static int hf_rdmnet_pdu = -1;
-static int hf_rdmnet_pdu_flag_d = -1;
-static int hf_rdmnet_pdu_flag_h = -1;
-static int hf_rdmnet_pdu_flag_l = -1;
-static int hf_rdmnet_pdu_flag_v = -1;
-static int hf_rdmnet_pdu_flags = -1;
-static int hf_rdmnet_pdu_length = -1;
-static int hf_rdmnet_postamble_size = -1;
-static int hf_rdmnet_preamble_size = -1;
-static int hf_rdmnet_protocol_id = -1;
-static int hf_rdmnet_tcp_length = -1;
-
-static int hf_rdmnet_llrp_vector = -1;
-static int hf_rdmnet_llrp_destination_cid = -1;
-static int hf_rdmnet_llrp_transaction_number = -1;
-static int hf_rdmnet_llrp_probe_request_vector = -1;
-static int hf_rdmnet_llrp_probe_request_pdu_length = -1;
-static int hf_rdmnet_llrp_probe_request_lower_uid = -1;
-static int hf_rdmnet_llrp_probe_request_upper_uid = -1;
-static int hf_rdmnet_llrp_probe_request_filter = -1;
-static int hf_rdmnet_llrp_probe_request_filter_client_tcp_inactive = -1;
-static int hf_rdmnet_llrp_probe_request_filter_brokers_only = -1;
-static int hf_rdmnet_llrp_probe_request_known_uid = -1;
-
-static int hf_rdmnet_llrp_probe_reply_vector = -1;
-static int hf_rdmnet_llrp_probe_reply_uid = -1;
-static int hf_rdmnet_llrp_probe_reply_hardware_address = -1;
-static int hf_rdmnet_llrp_probe_reply_component_type = -1;
-static int hf_rdmnet_llrp_rdm_command_start_code = -1;
-
-static int hf_rdmnet_rpt_vector = -1;
-static int hf_rdmnet_rpt_source_uid = -1;
-static int hf_rdmnet_rpt_source_endpoint_id = -1;
-static int hf_rdmnet_rpt_destination_uid = -1;
-static int hf_rdmnet_rpt_destination_endpoint_id = -1;
-static int hf_rdmnet_rpt_sequence_number = -1;
-static int hf_rdmnet_rpt_reserved = -1;
-static int hf_rdmnet_rpt_request_vector = -1;
-static int hf_rdmnet_rpt_request_rdm_command = -1;
-static int hf_rdmnet_rpt_status_vector = -1;
-static int hf_rdmnet_rpt_status_unknown_rpt_uid_string = -1;
-static int hf_rdmnet_rpt_status_rdm_timeout_string = -1;
-static int hf_rdmnet_rpt_status_rdm_invalid_response_string = -1;
-static int hf_rdmnet_rpt_status_unknown_rdm_uid_string = -1;
-static int hf_rdmnet_rpt_status_unknown_endpoint_string = -1;
-static int hf_rdmnet_rpt_status_broadcast_complete_string = -1;
-static int hf_rdmnet_rpt_status_unknown_vector_string = -1;
-static int hf_rdmnet_rpt_notification_vector = -1;
-static int hf_rdmnet_rpt_notification_rdm_command = -1;
-
-static int hf_rdmnet_broker_vector = -1;
-static int hf_rdmnet_broker_client_protocol_vector = -1;
-static int hf_rdmnet_broker_client_protocol_cid = -1;
-static int hf_rdmnet_broker_client_rpt_client_uid = -1;
-static int hf_rdmnet_broker_client_rpt_client_type = -1;
-static int hf_rdmnet_broker_client_rpt_binding_cid = -1;
-static int hf_rdmnet_broker_client_ept_protocol_vector = -1;
-static int hf_rdmnet_broker_client_ept_protocol_manufacturer_id = -1;
-static int hf_rdmnet_broker_client_ept_protocol_protocol_id = -1;
-static int hf_rdmnet_broker_client_ept_protocol_string = -1;
-static int hf_rdmnet_broker_connect_client_scope = -1;
-static int hf_rdmnet_broker_connect_e133_version = -1;
-static int hf_rdmnet_broker_connect_search_domain = -1;
-static int hf_rdmnet_broker_connect_connection_flags = -1;
-static int hf_rdmnet_broker_connect_connection_flags_incremental_updates = -1;
-static int hf_rdmnet_broker_connect_reply_connection_code = -1;
-static int hf_rdmnet_broker_connect_reply_e133_version = -1;
-static int hf_rdmnet_broker_connect_reply_broker_uid = -1;
-static int hf_rdmnet_broker_connect_reply_client_uid = -1;
-static int hf_rdmnet_broker_client_entry_update_connection_flags = -1;
-static int hf_rdmnet_broker_client_entry_update_connection_flags_incremental_updates = -1;
-static int hf_rdmnet_broker_redirect_ipv4_address = -1;
-static int hf_rdmnet_broker_redirect_ipv4_tcp_port = -1;
-static int hf_rdmnet_broker_redirect_ipv6_address = -1;
-static int hf_rdmnet_broker_redirect_ipv6_tcp_port = -1;
-static int hf_rdmnet_broker_disconnect_reason = -1;
-static int hf_rdmnet_broker_dynamic_uid_request = -1;
-static int hf_rdmnet_broker_rid = -1;
-static int hf_rdmnet_broker_assigned_dynamic_uid = -1;
-static int hf_rdmnet_broker_assigned_rid = -1;
-static int hf_rdmnet_broker_assigned_status_code = -1;
-static int hf_rdmnet_broker_fetch_dynamic_uid = -1;
-
-static int hf_rdmnet_ept_vector = -1;
-static int hf_rdmnet_ept_destination_cid = -1;
-static int hf_rdmnet_ept_data_pdu_length = -1;
-static int hf_rdmnet_ept_data_vector = -1;
-static int hf_rdmnet_ept_data_vector_manufacturer_id = -1;
-static int hf_rdmnet_ept_data_vector_protocol_id = -1;
-static int hf_rdmnet_ept_data_opaque_data = -1;
-static int hf_rdmnet_ept_status_pdu_length = -1;
-static int hf_rdmnet_ept_status_vector = -1;
-static int hf_rdmnet_ept_status_unknown_cid = -1;
-static int hf_rdmnet_ept_status_status_string = -1;
-static int hf_rdmnet_ept_status_unknown_vector = -1;
-static int hf_rdmnet_ept_status_vector_string = -1;
+static int hf_rdmnet_cid;
+static int hf_rdmnet_packet_identifier;
+static int hf_rdmnet_pdu;
+static int hf_rdmnet_pdu_flag_d;
+static int hf_rdmnet_pdu_flag_h;
+static int hf_rdmnet_pdu_flag_l;
+static int hf_rdmnet_pdu_flag_v;
+static int hf_rdmnet_pdu_flags;
+static int hf_rdmnet_pdu_length;
+static int hf_rdmnet_postamble_size;
+static int hf_rdmnet_preamble_size;
+static int hf_rdmnet_protocol_id;
+static int hf_rdmnet_tcp_length;
+
+static int hf_rdmnet_llrp_vector;
+static int hf_rdmnet_llrp_destination_cid;
+static int hf_rdmnet_llrp_transaction_number;
+static int hf_rdmnet_llrp_probe_request_vector;
+static int hf_rdmnet_llrp_probe_request_pdu_length;
+static int hf_rdmnet_llrp_probe_request_lower_uid;
+static int hf_rdmnet_llrp_probe_request_upper_uid;
+static int hf_rdmnet_llrp_probe_request_filter;
+static int hf_rdmnet_llrp_probe_request_filter_client_tcp_inactive;
+static int hf_rdmnet_llrp_probe_request_filter_brokers_only;
+static int hf_rdmnet_llrp_probe_request_known_uid;
+
+static int hf_rdmnet_llrp_probe_reply_vector;
+static int hf_rdmnet_llrp_probe_reply_uid;
+static int hf_rdmnet_llrp_probe_reply_hardware_address;
+static int hf_rdmnet_llrp_probe_reply_component_type;
+static int hf_rdmnet_llrp_rdm_command_start_code;
+
+static int hf_rdmnet_rpt_vector;
+static int hf_rdmnet_rpt_source_uid;
+static int hf_rdmnet_rpt_source_endpoint_id;
+static int hf_rdmnet_rpt_destination_uid;
+static int hf_rdmnet_rpt_destination_endpoint_id;
+static int hf_rdmnet_rpt_sequence_number;
+static int hf_rdmnet_rpt_reserved;
+static int hf_rdmnet_rpt_request_vector;
+static int hf_rdmnet_rpt_request_rdm_command;
+static int hf_rdmnet_rpt_status_vector;
+static int hf_rdmnet_rpt_status_unknown_rpt_uid_string;
+static int hf_rdmnet_rpt_status_rdm_timeout_string;
+static int hf_rdmnet_rpt_status_rdm_invalid_response_string;
+static int hf_rdmnet_rpt_status_unknown_rdm_uid_string;
+static int hf_rdmnet_rpt_status_unknown_endpoint_string;
+static int hf_rdmnet_rpt_status_broadcast_complete_string;
+static int hf_rdmnet_rpt_status_unknown_vector_string;
+static int hf_rdmnet_rpt_notification_vector;
+static int hf_rdmnet_rpt_notification_rdm_command;
+
+static int hf_rdmnet_broker_vector;
+static int hf_rdmnet_broker_client_protocol_vector;
+static int hf_rdmnet_broker_client_protocol_cid;
+static int hf_rdmnet_broker_client_rpt_client_uid;
+static int hf_rdmnet_broker_client_rpt_client_type;
+static int hf_rdmnet_broker_client_rpt_binding_cid;
+static int hf_rdmnet_broker_client_ept_protocol_vector;
+static int hf_rdmnet_broker_client_ept_protocol_manufacturer_id;
+static int hf_rdmnet_broker_client_ept_protocol_protocol_id;
+static int hf_rdmnet_broker_client_ept_protocol_string;
+static int hf_rdmnet_broker_connect_client_scope;
+static int hf_rdmnet_broker_connect_e133_version;
+static int hf_rdmnet_broker_connect_search_domain;
+static int hf_rdmnet_broker_connect_connection_flags;
+static int hf_rdmnet_broker_connect_connection_flags_incremental_updates;
+static int hf_rdmnet_broker_connect_reply_connection_code;
+static int hf_rdmnet_broker_connect_reply_e133_version;
+static int hf_rdmnet_broker_connect_reply_broker_uid;
+static int hf_rdmnet_broker_connect_reply_client_uid;
+static int hf_rdmnet_broker_client_entry_update_connection_flags;
+static int hf_rdmnet_broker_client_entry_update_connection_flags_incremental_updates;
+static int hf_rdmnet_broker_redirect_ipv4_address;
+static int hf_rdmnet_broker_redirect_ipv4_tcp_port;
+static int hf_rdmnet_broker_redirect_ipv6_address;
+static int hf_rdmnet_broker_redirect_ipv6_tcp_port;
+static int hf_rdmnet_broker_disconnect_reason;
+static int hf_rdmnet_broker_dynamic_uid_request;
+static int hf_rdmnet_broker_rid;
+static int hf_rdmnet_broker_assigned_dynamic_uid;
+static int hf_rdmnet_broker_assigned_rid;
+static int hf_rdmnet_broker_assigned_status_code;
+static int hf_rdmnet_broker_fetch_dynamic_uid;
+
+static int hf_rdmnet_ept_vector;
+static int hf_rdmnet_ept_destination_cid;
+static int hf_rdmnet_ept_data_pdu_length;
+static int hf_rdmnet_ept_data_vector;
+static int hf_rdmnet_ept_data_vector_manufacturer_id;
+static int hf_rdmnet_ept_data_vector_protocol_id;
+static int hf_rdmnet_ept_data_opaque_data;
+static int hf_rdmnet_ept_status_pdu_length;
+static int hf_rdmnet_ept_status_vector;
+static int hf_rdmnet_ept_status_unknown_cid;
+static int hf_rdmnet_ept_status_status_string;
+static int hf_rdmnet_ept_status_unknown_vector;
+static int hf_rdmnet_ept_status_vector_string;
 
 static const value_string acn_protocol_id_vals[] = {
   { ACN_PROTOCOL_ID_SDT,    "SDT Protocol" },
diff --git a/epan/dissectors/packet-acr122.c b/epan/dissectors/packet-acr122.c
index 0e1374d63c..3e85643862 100644
--- a/epan/dissectors/packet-acr122.c
+++ b/epan/dissectors/packet-acr122.c
@@ -17,67 +17,67 @@
 #include <epan/expert.h>
 #include "packet-usb.h"
 
-static int proto_acr122                                                    = -1;
-
-static int hf_class                                                        = -1;
-static int hf_ins                                                          = -1;
-static int hf_p1                                                           = -1;
-static int hf_p2                                                           = -1;
-static int hf_length                                                       = -1;
-static int hf_status_word                                                  = -1;
-static int hf_status_word_sw1                                              = -1;
-static int hf_status_word_sw2                                              = -1;
-static int hf_status_word_led_reserved                                     = -1;
-static int hf_status_word_led_green                                        = -1;
-static int hf_status_word_led_red                                          = -1;
-static int hf_command                                                      = -1;
-static int hf_response                                                     = -1;
-static int hf_response_for                                                 = -1;
-static int hf_picc_operating_auto_picc_polling                             = -1;
-static int hf_picc_operating_auto_ats_generation                           = -1;
-static int hf_picc_operating_polling_interval                              = -1;
-static int hf_picc_operating_felica_424k                                   = -1;
-static int hf_picc_operating_felica_212k                                   = -1;
-static int hf_picc_operating_topaz                                         = -1;
-static int hf_picc_operating_iso_14443_type_b                              = -1;
-static int hf_picc_operating_iso_14443_type_a                              = -1;
-static int hf_firmware_version                                             = -1;
-static int hf_led_green_blinking_state                                     = -1;
-static int hf_led_red_blinking_state                                       = -1;
-static int hf_led_green_mask                                               = -1;
-static int hf_led_red_mask                                                 = -1;
-static int hf_led_initial_green_blinking_state                             = -1;
-static int hf_led_initial_red_blinking_state                               = -1;
-static int hf_led_final_green_state                                        = -1;
-static int hf_led_final_red_state                                          = -1;
-static int hf_led_t1_duration                                              = -1;
-static int hf_led_t2_duration                                              = -1;
-static int hf_led_number_of_repetition                                     = -1;
-static int hf_led_link_to_buzzer                                           = -1;
-static int hf_timeout                                                      = -1;
-static int hf_poll_buzzer_status                                           = -1;
-static int hf_key                                                          = -1;
-static int hf_key_structure                                                = -1;
-static int hf_key_number                                                   = -1;
-static int hf_key_type                                                     = -1;
-static int hf_block_number                                                 = -1;
-static int hf_source_block_number                                          = -1;
-static int hf_target_block_number                                          = -1;
-static int hf_vb_op                                                        = -1;
-static int hf_static_byte                                                  = -1;
-static int hf_version                                                      = -1;
-static int hf_value                                                        = -1;
-static int hf_uid                                                          = -1;
-static int hf_ats                                                          = -1;
-static int hf_data                                                         = -1;
-
-static gint ett_acr122                                                 = -1;
-static gint ett_p1_item                                                    = -1;
-static gint ett_p2_item                                                    = -1;
-static gint ett_status_word                                                = -1;
-static gint ett_status_word_sw2                                            = -1;
-
-static expert_field ei_unknown_command_or_invalid_parameters          = EI_INIT;
+static int proto_acr122;
+
+static int hf_class;
+static int hf_ins;
+static int hf_p1;
+static int hf_p2;
+static int hf_length;
+static int hf_status_word;
+static int hf_status_word_sw1;
+static int hf_status_word_sw2;
+static int hf_status_word_led_reserved;
+static int hf_status_word_led_green;
+static int hf_status_word_led_red;
+static int hf_command;
+static int hf_response;
+static int hf_response_for;
+static int hf_picc_operating_auto_picc_polling;
+static int hf_picc_operating_auto_ats_generation;
+static int hf_picc_operating_polling_interval;
+static int hf_picc_operating_felica_424k;
+static int hf_picc_operating_felica_212k;
+static int hf_picc_operating_topaz;
+static int hf_picc_operating_iso_14443_type_b;
+static int hf_picc_operating_iso_14443_type_a;
+static int hf_firmware_version;
+static int hf_led_green_blinking_state;
+static int hf_led_red_blinking_state;
+static int hf_led_green_mask;
+static int hf_led_red_mask;
+static int hf_led_initial_green_blinking_state;
+static int hf_led_initial_red_blinking_state;
+static int hf_led_final_green_state;
+static int hf_led_final_red_state;
+static int hf_led_t1_duration;
+static int hf_led_t2_duration;
+static int hf_led_number_of_repetition;
+static int hf_led_link_to_buzzer;
+static int hf_timeout;
+static int hf_poll_buzzer_status;
+static int hf_key;
+static int hf_key_structure;
+static int hf_key_number;
+static int hf_key_type;
+static int hf_block_number;
+static int hf_source_block_number;
+static int hf_target_block_number;
+static int hf_vb_op;
+static int hf_static_byte;
+static int hf_version;
+static int hf_value;
+static int hf_uid;
+static int hf_ats;
+static int hf_data;
+
+static gint ett_acr122;
+static gint ett_p1_item;
+static gint ett_p2_item;
+static gint ett_status_word;
+static gint ett_status_word_sw2;
+
+static expert_field ei_unknown_command_or_invalid_parameters;
 
 static dissector_handle_t  acr122_handle;
 static dissector_handle_t  pn532_handle;
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index 254908c34f..9b63e4d6d5 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -52,8 +52,8 @@ void proto_register_acse(void);
 void proto_reg_handoff_acse(void);
 
 /* Initialize the protocol and registered fields */
-int proto_acse = -1;
-int proto_clacse = -1;
+int proto_acse;
+int proto_clacse;
 
 
 
diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c
index 83a597d304..e9455c857f 100644
--- a/epan/dissectors/packet-actrace.c
+++ b/epan/dissectors/packet-actrace.c
@@ -32,28 +32,28 @@ void proto_reg_handoff_actrace(void);
 static dissector_handle_t actrace_handle;
 
 /* Define the actrace proto */
-static int proto_actrace = -1;
+static int proto_actrace;
 
 /* Define many headers for actrace */
 /* ISDN headers */
-static int hf_actrace_isdn_direction = -1;
-static int hf_actrace_isdn_trunk = -1;
-static int hf_actrace_isdn_length = -1;
+static int hf_actrace_isdn_direction;
+static int hf_actrace_isdn_trunk;
+static int hf_actrace_isdn_length;
 
 
 /* CAS headers */
-static int hf_actrace_cas_time = -1;
-static int hf_actrace_cas_source = -1;
-static int hf_actrace_cas_current_state = -1;
-static int hf_actrace_cas_event = -1;
-static int hf_actrace_cas_next_state = -1;
-static int hf_actrace_cas_function = -1;
-static int hf_actrace_cas_par0 = -1;
-static int hf_actrace_cas_par1 = -1;
-static int hf_actrace_cas_par2 = -1;
-static int hf_actrace_cas_trunk = -1;
-static int hf_actrace_cas_bchannel = -1;
-static int hf_actrace_cas_connection_id = -1;
+static int hf_actrace_cas_time;
+static int hf_actrace_cas_source;
+static int hf_actrace_cas_current_state;
+static int hf_actrace_cas_event;
+static int hf_actrace_cas_next_state;
+static int hf_actrace_cas_function;
+static int hf_actrace_cas_par0;
+static int hf_actrace_cas_par1;
+static int hf_actrace_cas_par2;
+static int hf_actrace_cas_trunk;
+static int hf_actrace_cas_bchannel;
+static int hf_actrace_cas_connection_id;
 
 
 
@@ -409,7 +409,7 @@ static const value_string actrace_isdn_direction_vals[] = {
 /*
  * Define the tree for actrace
  */
-static int ett_actrace = -1;
+static int ett_actrace;
 
 /*
  * Define the tap for actrace
diff --git a/epan/dissectors/packet-adb.c b/epan/dissectors/packet-adb.c
index 0808990f39..abb824d76b 100644
--- a/epan/dissectors/packet-adb.c
+++ b/epan/dissectors/packet-adb.c
@@ -20,46 +20,46 @@
 #include "packet-adb_service.h"
 #include "packet-usb.h"
 
-static int proto_adb                                                       = -1;
-static int hf_command                                                      = -1;
-static int hf_argument_0                                                   = -1;
-static int hf_argument_1                                                   = -1;
-static int hf_data_length                                                  = -1;
-static int hf_data_crc32                                                   = -1;
-static int hf_magic                                                        = -1;
-static int hf_local_id                                                     = -1;
-static int hf_remote_id                                                    = -1;
-static int hf_version                                                      = -1;
-static int hf_max_data                                                     = -1;
-static int hf_zero                                                         = -1;
-static int hf_sequence                                                     = -1;
-static int hf_online                                                       = -1;
-static int hf_auth_type                                                    = -1;
-static int hf_data                                                         = -1;
-static int hf_service                                                      = -1;
-static int hf_data_fragment                                                = -1;
-static int hf_command_in_frame                                             = -1;
-static int hf_completed_in_frame                                           = -1;
-static int hf_service_start_in_frame                                       = -1;
-static int hf_close_local_in_frame                                         = -1;
-static int hf_close_remote_in_frame                                        = -1;
-static int hf_connection_info                                              = -1;
-
-static gint ett_adb                                                        = -1;
-static gint ett_adb_arg0                                                   = -1;
-static gint ett_adb_arg1                                                   = -1;
-static gint ett_adb_crc                                                    = -1;
-static gint ett_adb_magic                                                  = -1;
-
-static expert_field ei_invalid_magic                                  = EI_INIT;
-static expert_field ei_invalid_crc                                    = EI_INIT;
-static expert_field ei_invalid_data                                   = EI_INIT;
+static int proto_adb;
+static int hf_command;
+static int hf_argument_0;
+static int hf_argument_1;
+static int hf_data_length;
+static int hf_data_crc32;
+static int hf_magic;
+static int hf_local_id;
+static int hf_remote_id;
+static int hf_version;
+static int hf_max_data;
+static int hf_zero;
+static int hf_sequence;
+static int hf_online;
+static int hf_auth_type;
+static int hf_data;
+static int hf_service;
+static int hf_data_fragment;
+static int hf_command_in_frame;
+static int hf_completed_in_frame;
+static int hf_service_start_in_frame;
+static int hf_close_local_in_frame;
+static int hf_close_remote_in_frame;
+static int hf_connection_info;
+
+static gint ett_adb;
+static gint ett_adb_arg0;
+static gint ett_adb_arg1;
+static gint ett_adb_crc;
+static gint ett_adb_magic;
+
+static expert_field ei_invalid_magic;
+static expert_field ei_invalid_crc;
+static expert_field ei_invalid_data;
 
 static dissector_handle_t  adb_handle;
 static dissector_handle_t  adb_service_handle;
 
-static gint proto_tcp = -1;
-static gint proto_usb = -1;
+static gint proto_tcp;
+static gint proto_usb;
 
 static wmem_tree_t *command_info = NULL;
 static wmem_tree_t *service_info = NULL;
diff --git a/epan/dissectors/packet-adb_cs.c b/epan/dissectors/packet-adb_cs.c
index 2b6fc3c400..e05013716d 100644
--- a/epan/dissectors/packet-adb_cs.c
+++ b/epan/dissectors/packet-adb_cs.c
@@ -19,20 +19,20 @@
 
 #include "packet-adb_service.h"
 
-static int proto_adb_cs                                                    = -1;
+static int proto_adb_cs;
 
-static int hf_role                                                         = -1;
-static int hf_hex_ascii_length                                             = -1;
-static int hf_length                                                       = -1;
-static int hf_service                                                      = -1;
-static int hf_status                                                       = -1;
-static int hf_data                                                         = -1;
-static int hf_fail_reason                                                  = -1;
+static int hf_role;
+static int hf_hex_ascii_length;
+static int hf_length;
+static int hf_service;
+static int hf_status;
+static int hf_data;
+static int hf_fail_reason;
 
-static gint ett_adb_cs                                                     = -1;
-static gint ett_length                                                     = -1;
+static gint ett_adb_cs;
+static gint ett_length;
 
-static expert_field ei_incomplete_message                             = EI_INIT;
+static expert_field ei_incomplete_message;
 
 static dissector_handle_t  adb_cs_handle;
 static dissector_handle_t  adb_service_handle;
diff --git a/epan/dissectors/packet-adb_service.c b/epan/dissectors/packet-adb_service.c
index 5aecbc89f9..3caaa94c89 100644
--- a/epan/dissectors/packet-adb_service.c
+++ b/epan/dissectors/packet-adb_service.c
@@ -18,50 +18,50 @@
 
 #include "packet-adb_service.h"
 
-static int proto_adb_service                                               = -1;
-
-static int hf_service                                                      = -1;
-static int hf_fragment                                                     = -1;
-static int hf_data                                                         = -1;
-static int hf_hex_ascii_length                                             = -1;
-static int hf_length                                                       = -1;
-static int hf_version                                                      = -1;
-static int hf_hex_ascii_version                                            = -1;
-static int hf_framebuffer_version                                          = -1;
-static int hf_framebuffer_depth                                            = -1;
-static int hf_framebuffer_size                                             = -1;
-static int hf_framebuffer_width                                            = -1;
-static int hf_framebuffer_height                                           = -1;
-static int hf_framebuffer_red_offset                                       = -1;
-static int hf_framebuffer_red_length                                       = -1;
-static int hf_framebuffer_blue_offset                                      = -1;
-static int hf_framebuffer_blue_length                                      = -1;
-static int hf_framebuffer_green_offset                                     = -1;
-static int hf_framebuffer_green_length                                     = -1;
-static int hf_framebuffer_alpha_offset                                     = -1;
-static int hf_framebuffer_alpha_length                                     = -1;
-static int hf_framebuffer_pixel                                            = -1;
-static int hf_framebuffer_red_5                                            = -1;
-static int hf_framebuffer_green_6                                          = -1;
-static int hf_framebuffer_blue_5                                           = -1;
-static int hf_framebuffer_red                                              = -1;
-static int hf_framebuffer_green                                            = -1;
-static int hf_framebuffer_blue                                             = -1;
-static int hf_framebuffer_alpha                                            = -1;
-static int hf_framebuffer_unused                                           = -1;
-static int hf_devices                                                      = -1;
-static int hf_stdin                                                        = -1;
-static int hf_stdout                                                       = -1;
-static int hf_pids                                                         = -1;
-static int hf_result                                                       = -1;
-
-static expert_field ei_incomplete_message                             = EI_INIT;
-
-static gint ett_adb_service                                                = -1;
-static gint ett_length                                                     = -1;
-static gint ett_version                                                    = -1;
-static gint ett_pixel                                                      = -1;
-static gint ett_data                                                       = -1;
+static int proto_adb_service;
+
+static int hf_service;
+static int hf_fragment;
+static int hf_data;
+static int hf_hex_ascii_length;
+static int hf_length;
+static int hf_version;
+static int hf_hex_ascii_version;
+static int hf_framebuffer_version;
+static int hf_framebuffer_depth;
+static int hf_framebuffer_size;
+static int hf_framebuffer_width;
+static int hf_framebuffer_height;
+static int hf_framebuffer_red_offset;
+static int hf_framebuffer_red_length;
+static int hf_framebuffer_blue_offset;
+static int hf_framebuffer_blue_length;
+static int hf_framebuffer_green_offset;
+static int hf_framebuffer_green_length;
+static int hf_framebuffer_alpha_offset;
+static int hf_framebuffer_alpha_length;
+static int hf_framebuffer_pixel;
+static int hf_framebuffer_red_5;
+static int hf_framebuffer_green_6;
+static int hf_framebuffer_blue_5;
+static int hf_framebuffer_red;
+static int hf_framebuffer_green;
+static int hf_framebuffer_blue;
+static int hf_framebuffer_alpha;
+static int hf_framebuffer_unused;
+static int hf_devices;
+static int hf_stdin;
+static int hf_stdout;
+static int hf_pids;
+static int hf_result;
+
+static expert_field ei_incomplete_message;
+
+static gint ett_adb_service;
+static gint ett_length;
+static gint ett_version;
+static gint ett_pixel;
+static gint ett_data;
 
 static dissector_handle_t  adb_service_handle;
 static dissector_handle_t  logcat_handle;
diff --git a/epan/dissectors/packet-adwin-config.c b/epan/dissectors/packet-adwin-config.c
index 27875b1644..36b81ec35a 100644
--- a/epan/dissectors/packet-adwin-config.c
+++ b/epan/dissectors/packet-adwin-config.c
@@ -72,62 +72,62 @@ static const string_string processor_type_mapping[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_adwin_config                     = -1;
-
-static int hf_adwin_config_bootloader             = -1;
-static int hf_adwin_config_command                = -1;
-static int hf_adwin_config_data                   = -1;
-static int hf_adwin_config_date                   = -1;
-static int hf_adwin_config_description            = -1;
-static int hf_adwin_config_dhcp                   = -1;
-static int hf_adwin_config_filename               = -1;
-static int hf_adwin_config_filesize               = -1;
-static int hf_adwin_config_filetime               = -1;
-static int hf_adwin_config_updatetime             = -1;
-static int hf_adwin_config_gateway                = -1;
-static int hf_adwin_config_mac                    = -1;
-static int hf_adwin_config_netmask_count          = -1;
-static int hf_adwin_config_netmask                = -1;
-static int hf_adwin_config_password               = -1;
-static int hf_adwin_config_path                   = -1;
-static int hf_adwin_config_pattern                = -1;
-static int hf_adwin_config_port16                 = -1;
-static int hf_adwin_config_port32                 = -1;
-static int hf_adwin_config_reboot                 = -1;
-static int hf_adwin_config_scan_id                = -1;
-static int hf_adwin_config_reply_broadcast        = -1;
-static int hf_adwin_config_revision               = -1;
-static int hf_adwin_config_processor_type_raw     = -1;
-static int hf_adwin_config_system_type_raw        = -1;
-static int hf_adwin_config_processor_type         = -1;
-static int hf_adwin_config_system_type            = -1;
-static int hf_adwin_config_server_ip              = -1;
-static int hf_adwin_config_server_version         = -1;
-static int hf_adwin_config_server_version_beta    = -1;
-static int hf_adwin_config_socketshutdowns        = -1;
-static int hf_adwin_config_status                 = -1;
-static int hf_adwin_config_status_bootloader      = -1;
-static int hf_adwin_config_status_reprogrammable  = -1;
-static int hf_adwin_config_status_configurable    = -1;
-static int hf_adwin_config_status_bootloader_boots = -1;
-static int hf_adwin_config_status_bootloader_reprogrammable  = -1;
-static int hf_adwin_config_status_bootloader_receive = -1;
-static int hf_adwin_config_status_bootloader_reprogramming_done  = -1;
-static int hf_adwin_config_status_eeprom_support  = -1;
-static int hf_adwin_config_stream_length          = -1;
-static int hf_adwin_config_eeprom_support         = -1;
-static int hf_adwin_config_timeout                = -1;
-static int hf_adwin_config_timerresets            = -1;
-static int hf_adwin_config_disk_free              = -1;
-static int hf_adwin_config_disk_size              = -1;
-static int hf_adwin_config_unused                 = -1;
-static int hf_adwin_config_version                = -1;
-static int hf_adwin_config_xilinx_version         = -1;
+static int proto_adwin_config;
+
+static int hf_adwin_config_bootloader;
+static int hf_adwin_config_command;
+static int hf_adwin_config_data;
+static int hf_adwin_config_date;
+static int hf_adwin_config_description;
+static int hf_adwin_config_dhcp;
+static int hf_adwin_config_filename;
+static int hf_adwin_config_filesize;
+static int hf_adwin_config_filetime;
+static int hf_adwin_config_updatetime;
+static int hf_adwin_config_gateway;
+static int hf_adwin_config_mac;
+static int hf_adwin_config_netmask_count;
+static int hf_adwin_config_netmask;
+static int hf_adwin_config_password;
+static int hf_adwin_config_path;
+static int hf_adwin_config_pattern;
+static int hf_adwin_config_port16;
+static int hf_adwin_config_port32;
+static int hf_adwin_config_reboot;
+static int hf_adwin_config_scan_id;
+static int hf_adwin_config_reply_broadcast;
+static int hf_adwin_config_revision;
+static int hf_adwin_config_processor_type_raw;
+static int hf_adwin_config_system_type_raw;
+static int hf_adwin_config_processor_type;
+static int hf_adwin_config_system_type;
+static int hf_adwin_config_server_ip;
+static int hf_adwin_config_server_version;
+static int hf_adwin_config_server_version_beta;
+static int hf_adwin_config_socketshutdowns;
+static int hf_adwin_config_status;
+static int hf_adwin_config_status_bootloader;
+static int hf_adwin_config_status_reprogrammable;
+static int hf_adwin_config_status_configurable;
+static int hf_adwin_config_status_bootloader_boots;
+static int hf_adwin_config_status_bootloader_reprogrammable;
+static int hf_adwin_config_status_bootloader_receive;
+static int hf_adwin_config_status_bootloader_reprogramming_done;
+static int hf_adwin_config_status_eeprom_support;
+static int hf_adwin_config_stream_length;
+static int hf_adwin_config_eeprom_support;
+static int hf_adwin_config_timeout;
+static int hf_adwin_config_timerresets;
+static int hf_adwin_config_disk_free;
+static int hf_adwin_config_disk_size;
+static int hf_adwin_config_unused;
+static int hf_adwin_config_version;
+static int hf_adwin_config_xilinx_version;
 
 /* Initialize the subtree pointers */
-static gint ett_adwin_config          = -1;
-static gint ett_adwin_config_status   = -1;
-static gint ett_adwin_config_debug    = -1;
+static gint ett_adwin_config;
+static gint ett_adwin_config_status;
+static gint ett_adwin_config_debug;
 
 static void
 dissect_UDPStatus(tvbuff_t *tvb, proto_tree *adwin_tree)
diff --git a/epan/dissectors/packet-adwin.c b/epan/dissectors/packet-adwin.c
index 1710403062..43ade73c61 100644
--- a/epan/dissectors/packet-adwin.c
+++ b/epan/dissectors/packet-adwin.c
@@ -428,62 +428,62 @@ static value_string_ext packet_type_mapping_ext = VALUE_STRING_EXT_INIT(packet_t
 
 
 /* Initialize the protocol and registered fields */
-static int proto_adwin                = -1;
+static int proto_adwin;
 
 static int global_adwin_dissect_data  = 1;
 
-static int hf_adwin_address           = -1;
-static int hf_adwin_armVersion        = -1;
-static int hf_adwin_binfilesize       = -1;
-static int hf_adwin_blocksize         = -1;
-static int hf_adwin_count             = -1;
-static int hf_adwin_complete_packets  = -1;
-static int hf_adwin_data              = -1;
-static int hf_adwin_data_int          = -1;
-static int hf_adwin_data_float        = -1;
-static int hf_adwin_data_hex          = -1;
-static int hf_adwin_data_no16         = -1;
-static int hf_adwin_data_no32         = -1;
-static int hf_adwin_data_packet_index = -1;
-static int hf_adwin_data_type         = -1;
-static int hf_adwin_dll_version       = -1;
-static int hf_adwin_fifo_no16         = -1;
-static int hf_adwin_fifo_no32         = -1;
-static int hf_adwin_instruction       = -1;
-static int hf_adwin_is_range          = -1;
-static int hf_adwin_i3plus1           = -1;
-static int hf_adwin_link_addr         = -1;
-static int hf_adwin_mem_type          = -1;
-static int hf_adwin_memsize           = -1;
-static int hf_adwin_osys              = -1;
-static int hf_adwin_packet_index      = -1;
-static int hf_adwin_packet_no         = -1;
-static int hf_adwin_packet_start      = -1;
-static int hf_adwin_packet_end        = -1;
-static int hf_adwin_gdsh_status       = -1;
-static int hf_adwin_packet_type       = -1;
-static int hf_adwin_parameter         = -1;
-static int hf_adwin_password          = -1;
-static int hf_adwin_process_no        = -1;
-static int hf_adwin_processor         = -1;
-static int hf_adwin_response_in       = -1;
-static int hf_adwin_response_to       = -1;
-static int hf_adwin_response_time     = -1;
-static int hf_adwin_retry_packet_index= -1;
-static int hf_adwin_request_no        = -1;
-static int hf_adwin_start_index       = -1;
-static int hf_adwin_status            = -1;
-static int hf_adwin_timeout           = -1;
-static int hf_adwin_unused            = -1;
-static int hf_adwin_val1              = -1;
-static int hf_adwin_val1f             = -1;
-static int hf_adwin_val2              = -1;
-static int hf_adwin_val3              = -1;
-static int hf_adwin_val4              = -1;
+static int hf_adwin_address;
+static int hf_adwin_armVersion;
+static int hf_adwin_binfilesize;
+static int hf_adwin_blocksize;
+static int hf_adwin_count;
+static int hf_adwin_complete_packets;
+static int hf_adwin_data;
+static int hf_adwin_data_int;
+static int hf_adwin_data_float;
+static int hf_adwin_data_hex;
+static int hf_adwin_data_no16;
+static int hf_adwin_data_no32;
+static int hf_adwin_data_packet_index;
+static int hf_adwin_data_type;
+static int hf_adwin_dll_version;
+static int hf_adwin_fifo_no16;
+static int hf_adwin_fifo_no32;
+static int hf_adwin_instruction;
+static int hf_adwin_is_range;
+static int hf_adwin_i3plus1;
+static int hf_adwin_link_addr;
+static int hf_adwin_mem_type;
+static int hf_adwin_memsize;
+static int hf_adwin_osys;
+static int hf_adwin_packet_index;
+static int hf_adwin_packet_no;
+static int hf_adwin_packet_start;
+static int hf_adwin_packet_end;
+static int hf_adwin_gdsh_status;
+static int hf_adwin_packet_type;
+static int hf_adwin_parameter;
+static int hf_adwin_password;
+static int hf_adwin_process_no;
+static int hf_adwin_processor;
+static int hf_adwin_response_in;
+static int hf_adwin_response_to;
+static int hf_adwin_response_time;
+static int hf_adwin_retry_packet_index;
+static int hf_adwin_request_no;
+static int hf_adwin_start_index;
+static int hf_adwin_status;
+static int hf_adwin_timeout;
+static int hf_adwin_unused;
+static int hf_adwin_val1;
+static int hf_adwin_val1f;
+static int hf_adwin_val2;
+static int hf_adwin_val3;
+static int hf_adwin_val4;
 
 /* Initialize the subtree pointers */
-static gint ett_adwin                 = -1;
-static gint ett_adwin_debug           = -1;
+static gint ett_adwin;
+static gint ett_adwin_debug;
 
 /* response/request tracking */
 typedef struct _adwin_transaction_t {
diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c
index 1c34a864f7..c66d0970bf 100644
--- a/epan/dissectors/packet-aeron.c
+++ b/epan/dissectors/packet-aeron.c
@@ -30,7 +30,7 @@ void proto_register_aeron(void);
 void proto_reg_handoff_aeron(void);
 
 /* Protocol handle */
-static int proto_aeron = -1;
+static int proto_aeron;
 
 /* Dissector handles */
 static dissector_handle_t aeron_dissector_handle;
@@ -998,163 +998,163 @@ static aeron_conversation_info_t * aeron_setup_conversation_info(const packet_in
 /*----------------------------------------------------------------------------*/
 
 /* Dissector tree handles */
-static gint ett_aeron = -1;
-static gint ett_aeron_pad = -1;
-static gint ett_aeron_data = -1;
-static gint ett_aeron_data_flags = -1;
-static gint ett_aeron_data_reassembly = -1;
-static gint ett_aeron_nak = -1;
-static gint ett_aeron_sm = -1;
-static gint ett_aeron_sm_flags = -1;
-static gint ett_aeron_rtt = -1;
-static gint ett_aeron_rtt_flags = -1;
-static gint ett_aeron_err = -1;
-static gint ett_aeron_setup = -1;
-static gint ett_aeron_ext = -1;
-static gint ett_aeron_sequence_analysis = -1;
-static gint ett_aeron_sequence_analysis_retransmission_rx = -1;
-static gint ett_aeron_sequence_analysis_nak_rx = -1;
-static gint ett_aeron_sequence_analysis_term_offset = -1;
-static gint ett_aeron_stream_analysis = -1;
+static gint ett_aeron;
+static gint ett_aeron_pad;
+static gint ett_aeron_data;
+static gint ett_aeron_data_flags;
+static gint ett_aeron_data_reassembly;
+static gint ett_aeron_nak;
+static gint ett_aeron_sm;
+static gint ett_aeron_sm_flags;
+static gint ett_aeron_rtt;
+static gint ett_aeron_rtt_flags;
+static gint ett_aeron_err;
+static gint ett_aeron_setup;
+static gint ett_aeron_ext;
+static gint ett_aeron_sequence_analysis;
+static gint ett_aeron_sequence_analysis_retransmission_rx;
+static gint ett_aeron_sequence_analysis_nak_rx;
+static gint ett_aeron_sequence_analysis_term_offset;
+static gint ett_aeron_stream_analysis;
 
 /* Dissector field handles */
-static int hf_aeron_channel_id = -1;
-static int hf_aeron_pad = -1;
-static int hf_aeron_pad_frame_length = -1;
-static int hf_aeron_pad_version = -1;
-static int hf_aeron_pad_flags = -1;
-static int hf_aeron_pad_type = -1;
-static int hf_aeron_pad_term_offset = -1;
-static int hf_aeron_pad_session_id = -1;
-static int hf_aeron_pad_stream_id = -1;
-static int hf_aeron_pad_term_id = -1;
-static int hf_aeron_data = -1;
-static int hf_aeron_data_frame_length = -1;
-static int hf_aeron_data_version = -1;
-static int hf_aeron_data_flags = -1;
-static int hf_aeron_data_flags_b = -1;
-static int hf_aeron_data_flags_e = -1;
-static int hf_aeron_data_flags_s = -1;
-static int hf_aeron_data_type = -1;
-static int hf_aeron_data_term_offset = -1;
-static int hf_aeron_data_next_offset = -1;
-static int hf_aeron_data_next_offset_term = -1;
-static int hf_aeron_data_next_offset_first_frame = -1;
-static int hf_aeron_data_session_id = -1;
-static int hf_aeron_data_stream_id = -1;
-static int hf_aeron_data_term_id = -1;
-static int hf_aeron_data_reserved_value = -1;
-static int hf_aeron_data_reassembly = -1;
-static int hf_aeron_data_reassembly_fragment = -1;
-static int hf_aeron_nak = -1;
-static int hf_aeron_nak_frame_length = -1;
-static int hf_aeron_nak_version = -1;
-static int hf_aeron_nak_flags = -1;
-static int hf_aeron_nak_type = -1;
-static int hf_aeron_nak_session_id = -1;
-static int hf_aeron_nak_stream_id = -1;
-static int hf_aeron_nak_term_id = -1;
-static int hf_aeron_nak_term_offset = -1;
-static int hf_aeron_nak_length = -1;
-static int hf_aeron_sm = -1;
-static int hf_aeron_sm_frame_length = -1;
-static int hf_aeron_sm_version = -1;
-static int hf_aeron_sm_flags = -1;
-static int hf_aeron_sm_flags_s = -1;
-static int hf_aeron_sm_type = -1;
-static int hf_aeron_sm_session_id = -1;
-static int hf_aeron_sm_stream_id = -1;
-static int hf_aeron_sm_consumption_term_id = -1;
-static int hf_aeron_sm_consumption_term_offset = -1;
-static int hf_aeron_sm_receiver_window = -1;
-static int hf_aeron_sm_receiver_id = -1;
-static int hf_aeron_sm_feedback = -1;
-static int hf_aeron_err = -1;
-static int hf_aeron_err_frame_length = -1;
-static int hf_aeron_err_version = -1;
-static int hf_aeron_err_code = -1;
-static int hf_aeron_err_type = -1;
-static int hf_aeron_err_off_frame_length = -1;
-static int hf_aeron_err_off_hdr = -1;
-static int hf_aeron_err_string = -1;
-static int hf_aeron_heartbeat = -1;
-static int hf_aeron_heartbeat_frame_length = -1;
-static int hf_aeron_heartbeat_version = -1;
-static int hf_aeron_heartbeat_flags = -1;
-static int hf_aeron_heartbeat_flags_b = -1;
-static int hf_aeron_heartbeat_flags_e = -1;
-static int hf_aeron_heartbeat_type = -1;
-static int hf_aeron_heartbeat_term_offset = -1;
-static int hf_aeron_heartbeat_session_id = -1;
-static int hf_aeron_heartbeat_stream_id = -1;
-static int hf_aeron_heartbeat_term_id = -1;
-static int hf_aeron_rtt = -1;
-static int hf_aeron_rtt_frame_length = -1;
-static int hf_aeron_rtt_version = -1;
-static int hf_aeron_rtt_flags = -1;
-static int hf_aeron_rtt_flags_r = -1;
-static int hf_aeron_rtt_type = -1;
-static int hf_aeron_rtt_session_id = -1;
-static int hf_aeron_rtt_stream_id = -1;
-static int hf_aeron_rtt_echo_timestamp = -1;
-static int hf_aeron_rtt_reception_delta = -1;
-static int hf_aeron_rtt_receiver_id = -1;
-static int hf_aeron_setup = -1;
-static int hf_aeron_setup_frame_length = -1;
-static int hf_aeron_setup_version = -1;
-static int hf_aeron_setup_flags = -1;
-static int hf_aeron_setup_type = -1;
-static int hf_aeron_setup_term_offset = -1;
-static int hf_aeron_setup_session_id = -1;
-static int hf_aeron_setup_stream_id = -1;
-static int hf_aeron_setup_initial_term_id = -1;
-static int hf_aeron_setup_active_term_id = -1;
-static int hf_aeron_setup_term_length = -1;
-static int hf_aeron_setup_mtu = -1;
-static int hf_aeron_setup_ttl = -1;
-static int hf_aeron_sequence_analysis = -1;
-static int hf_aeron_sequence_analysis_channel_prev_frame = -1;
-static int hf_aeron_sequence_analysis_channel_next_frame = -1;
-static int hf_aeron_sequence_analysis_stream_prev_frame = -1;
-static int hf_aeron_sequence_analysis_stream_next_frame = -1;
-static int hf_aeron_sequence_analysis_term_prev_frame = -1;
-static int hf_aeron_sequence_analysis_term_next_frame = -1;
-static int hf_aeron_sequence_analysis_term_offset = -1;
-static int hf_aeron_sequence_analysis_term_offset_frame = -1;
-static int hf_aeron_sequence_analysis_retransmission = -1;
-static int hf_aeron_sequence_analysis_retransmission_rx = -1;
-static int hf_aeron_sequence_analysis_retransmission_rx_frame = -1;
-static int hf_aeron_sequence_analysis_keepalive = -1;
-static int hf_aeron_sequence_analysis_nak_unrecovered = -1;
-static int hf_aeron_sequence_analysis_nak_rx = -1;
-static int hf_aeron_sequence_analysis_nak_rx_frame = -1;
-static int hf_aeron_stream_analysis = -1;
-static int hf_aeron_stream_analysis_high_term_id = -1;
-static int hf_aeron_stream_analysis_high_term_offset = -1;
-static int hf_aeron_stream_analysis_completed_term_id = -1;
-static int hf_aeron_stream_analysis_completed_term_offset = -1;
-static int hf_aeron_stream_analysis_outstanding_bytes = -1;
+static int hf_aeron_channel_id;
+static int hf_aeron_pad;
+static int hf_aeron_pad_frame_length;
+static int hf_aeron_pad_version;
+static int hf_aeron_pad_flags;
+static int hf_aeron_pad_type;
+static int hf_aeron_pad_term_offset;
+static int hf_aeron_pad_session_id;
+static int hf_aeron_pad_stream_id;
+static int hf_aeron_pad_term_id;
+static int hf_aeron_data;
+static int hf_aeron_data_frame_length;
+static int hf_aeron_data_version;
+static int hf_aeron_data_flags;
+static int hf_aeron_data_flags_b;
+static int hf_aeron_data_flags_e;
+static int hf_aeron_data_flags_s;
+static int hf_aeron_data_type;
+static int hf_aeron_data_term_offset;
+static int hf_aeron_data_next_offset;
+static int hf_aeron_data_next_offset_term;
+static int hf_aeron_data_next_offset_first_frame;
+static int hf_aeron_data_session_id;
+static int hf_aeron_data_stream_id;
+static int hf_aeron_data_term_id;
+static int hf_aeron_data_reserved_value;
+static int hf_aeron_data_reassembly;
+static int hf_aeron_data_reassembly_fragment;
+static int hf_aeron_nak;
+static int hf_aeron_nak_frame_length;
+static int hf_aeron_nak_version;
+static int hf_aeron_nak_flags;
+static int hf_aeron_nak_type;
+static int hf_aeron_nak_session_id;
+static int hf_aeron_nak_stream_id;
+static int hf_aeron_nak_term_id;
+static int hf_aeron_nak_term_offset;
+static int hf_aeron_nak_length;
+static int hf_aeron_sm;
+static int hf_aeron_sm_frame_length;
+static int hf_aeron_sm_version;
+static int hf_aeron_sm_flags;
+static int hf_aeron_sm_flags_s;
+static int hf_aeron_sm_type;
+static int hf_aeron_sm_session_id;
+static int hf_aeron_sm_stream_id;
+static int hf_aeron_sm_consumption_term_id;
+static int hf_aeron_sm_consumption_term_offset;
+static int hf_aeron_sm_receiver_window;
+static int hf_aeron_sm_receiver_id;
+static int hf_aeron_sm_feedback;
+static int hf_aeron_err;
+static int hf_aeron_err_frame_length;
+static int hf_aeron_err_version;
+static int hf_aeron_err_code;
+static int hf_aeron_err_type;
+static int hf_aeron_err_off_frame_length;
+static int hf_aeron_err_off_hdr;
+static int hf_aeron_err_string;
+static int hf_aeron_heartbeat;
+static int hf_aeron_heartbeat_frame_length;
+static int hf_aeron_heartbeat_version;
+static int hf_aeron_heartbeat_flags;
+static int hf_aeron_heartbeat_flags_b;
+static int hf_aeron_heartbeat_flags_e;
+static int hf_aeron_heartbeat_type;
+static int hf_aeron_heartbeat_term_offset;
+static int hf_aeron_heartbeat_session_id;
+static int hf_aeron_heartbeat_stream_id;
+static int hf_aeron_heartbeat_term_id;
+static int hf_aeron_rtt;
+static int hf_aeron_rtt_frame_length;
+static int hf_aeron_rtt_version;
+static int hf_aeron_rtt_flags;
+static int hf_aeron_rtt_flags_r;
+static int hf_aeron_rtt_type;
+static int hf_aeron_rtt_session_id;
+static int hf_aeron_rtt_stream_id;
+static int hf_aeron_rtt_echo_timestamp;
+static int hf_aeron_rtt_reception_delta;
+static int hf_aeron_rtt_receiver_id;
+static int hf_aeron_setup;
+static int hf_aeron_setup_frame_length;
+static int hf_aeron_setup_version;
+static int hf_aeron_setup_flags;
+static int hf_aeron_setup_type;
+static int hf_aeron_setup_term_offset;
+static int hf_aeron_setup_session_id;
+static int hf_aeron_setup_stream_id;
+static int hf_aeron_setup_initial_term_id;
+static int hf_aeron_setup_active_term_id;
+static int hf_aeron_setup_term_length;
+static int hf_aeron_setup_mtu;
+static int hf_aeron_setup_ttl;
+static int hf_aeron_sequence_analysis;
+static int hf_aeron_sequence_analysis_channel_prev_frame;
+static int hf_aeron_sequence_analysis_channel_next_frame;
+static int hf_aeron_sequence_analysis_stream_prev_frame;
+static int hf_aeron_sequence_analysis_stream_next_frame;
+static int hf_aeron_sequence_analysis_term_prev_frame;
+static int hf_aeron_sequence_analysis_term_next_frame;
+static int hf_aeron_sequence_analysis_term_offset;
+static int hf_aeron_sequence_analysis_term_offset_frame;
+static int hf_aeron_sequence_analysis_retransmission;
+static int hf_aeron_sequence_analysis_retransmission_rx;
+static int hf_aeron_sequence_analysis_retransmission_rx_frame;
+static int hf_aeron_sequence_analysis_keepalive;
+static int hf_aeron_sequence_analysis_nak_unrecovered;
+static int hf_aeron_sequence_analysis_nak_rx;
+static int hf_aeron_sequence_analysis_nak_rx_frame;
+static int hf_aeron_stream_analysis;
+static int hf_aeron_stream_analysis_high_term_id;
+static int hf_aeron_stream_analysis_high_term_offset;
+static int hf_aeron_stream_analysis_completed_term_id;
+static int hf_aeron_stream_analysis_completed_term_offset;
+static int hf_aeron_stream_analysis_outstanding_bytes;
 
 /* Expert info handles */
-static expert_field ei_aeron_analysis_nak = EI_INIT;
-static expert_field ei_aeron_analysis_window_full = EI_INIT;
-static expert_field ei_aeron_analysis_idle_rx = EI_INIT;
-static expert_field ei_aeron_analysis_pacing_rx = EI_INIT;
-static expert_field ei_aeron_analysis_ooo = EI_INIT;
-static expert_field ei_aeron_analysis_ooo_gap = EI_INIT;
-static expert_field ei_aeron_analysis_keepalive = EI_INIT;
-static expert_field ei_aeron_analysis_ooo_sm = EI_INIT;
-static expert_field ei_aeron_analysis_keepalive_sm = EI_INIT;
-static expert_field ei_aeron_analysis_window_resize = EI_INIT;
-static expert_field ei_aeron_analysis_rx = EI_INIT;
-static expert_field ei_aeron_analysis_term_id_change = EI_INIT;
-static expert_field ei_aeron_analysis_invalid_pad_length = EI_INIT;
-static expert_field ei_aeron_analysis_invalid_data_length = EI_INIT;
-static expert_field ei_aeron_analysis_invalid_nak_length = EI_INIT;
-static expert_field ei_aeron_analysis_invalid_sm_length = EI_INIT;
-static expert_field ei_aeron_analysis_invalid_rtt_length = EI_INIT;
-static expert_field ei_aeron_analysis_invalid_err_length = EI_INIT;
-static expert_field ei_aeron_analysis_invalid_setup_length = EI_INIT;
+static expert_field ei_aeron_analysis_nak;
+static expert_field ei_aeron_analysis_window_full;
+static expert_field ei_aeron_analysis_idle_rx;
+static expert_field ei_aeron_analysis_pacing_rx;
+static expert_field ei_aeron_analysis_ooo;
+static expert_field ei_aeron_analysis_ooo_gap;
+static expert_field ei_aeron_analysis_keepalive;
+static expert_field ei_aeron_analysis_ooo_sm;
+static expert_field ei_aeron_analysis_keepalive_sm;
+static expert_field ei_aeron_analysis_window_resize;
+static expert_field ei_aeron_analysis_rx;
+static expert_field ei_aeron_analysis_term_id_change;
+static expert_field ei_aeron_analysis_invalid_pad_length;
+static expert_field ei_aeron_analysis_invalid_data_length;
+static expert_field ei_aeron_analysis_invalid_nak_length;
+static expert_field ei_aeron_analysis_invalid_sm_length;
+static expert_field ei_aeron_analysis_invalid_rtt_length;
+static expert_field ei_aeron_analysis_invalid_err_length;
+static expert_field ei_aeron_analysis_invalid_setup_length;
 
 /*----------------------------------------------------------------------------*/
 /* Setup packet information                                                   */
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index d5bce6247b..3c43baaaa5 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -181,190 +181,190 @@ void proto_reg_handoff_afp(void);
 #define SPOTLIGHT_TIME_DELTA G_GUINT64_CONSTANT(280878921600)
 
 /* ----------------------------- */
-static int proto_afp			    = -1;
-static int hf_afp_reserved		    = -1;
-static int hf_afp_unknown		    = -1;
-
-static int hf_afp_command		    = -1;		/* CommandCode */
-static int hf_afp_Version		    = -1;
-static int hf_afp_UAM			    = -1;
-static int hf_afp_user			    = -1;
-static int hf_afp_passwd		    = -1;
-static int hf_afp_random		    = -1;
-
-static int hf_afp_response_to		    = -1;
-static int hf_afp_time			    = -1;
-static int hf_afp_response_in		    = -1;
-
-static int hf_afp_login_flags		    = -1;
-static int hf_afp_pad			    = -1;
-
-static int hf_afp_user_type		    = -1;
-static int hf_afp_user_len		    = -1;
-static int hf_afp_user_name		    = -1;
-
-static int hf_afp_vol_flag		    = -1;
-static int hf_afp_vol_flag_passwd	    = -1;
-static int hf_afp_vol_flag_has_config	    = -1;
-static int hf_afp_server_time		    = -1;
-
-static int hf_afp_vol_bitmap		    = -1;
-static int hf_afp_vol_name_offset	    = -1;
-static int hf_afp_vol_id		    = -1;
-static int hf_afp_vol_attribute		    = -1;
-static int hf_afp_vol_name		    = -1;
-static int hf_afp_vol_signature		    = -1;
-static int hf_afp_vol_creation_date	    = -1;
-static int hf_afp_vol_modification_date	    = -1;
-static int hf_afp_vol_backup_date	    = -1;
-static int hf_afp_vol_bytes_free	    = -1;
-static int hf_afp_vol_bytes_total	    = -1;
-static int hf_afp_vol_ex_bytes_free	    = -1;
-static int hf_afp_vol_ex_bytes_total	    = -1;
-static int hf_afp_vol_block_size	    = -1;
+static int proto_afp;
+static int hf_afp_reserved;
+static int hf_afp_unknown;
+
+static int hf_afp_command;		/* CommandCode */
+static int hf_afp_Version;
+static int hf_afp_UAM;
+static int hf_afp_user;
+static int hf_afp_passwd;
+static int hf_afp_random;
+
+static int hf_afp_response_to;
+static int hf_afp_time;
+static int hf_afp_response_in;
+
+static int hf_afp_login_flags;
+static int hf_afp_pad;
+
+static int hf_afp_user_type;
+static int hf_afp_user_len;
+static int hf_afp_user_name;
+
+static int hf_afp_vol_flag;
+static int hf_afp_vol_flag_passwd;
+static int hf_afp_vol_flag_has_config;
+static int hf_afp_server_time;
+
+static int hf_afp_vol_bitmap;
+static int hf_afp_vol_name_offset;
+static int hf_afp_vol_id;
+static int hf_afp_vol_attribute;
+static int hf_afp_vol_name;
+static int hf_afp_vol_signature;
+static int hf_afp_vol_creation_date;
+static int hf_afp_vol_modification_date;
+static int hf_afp_vol_backup_date;
+static int hf_afp_vol_bytes_free;
+static int hf_afp_vol_bytes_total;
+static int hf_afp_vol_ex_bytes_free;
+static int hf_afp_vol_ex_bytes_total;
+static int hf_afp_vol_block_size;
 
 /* desktop stuff */
-static int hf_afp_comment		    = -1;
-static int hf_afp_file_creator		    = -1;
-static int hf_afp_file_type		    = -1;
-static int hf_afp_icon_type		    = -1;
-static int hf_afp_icon_length		    = -1;
-static int hf_afp_icon_tag		    = -1;
-static int hf_afp_icon_index		    = -1;
-static int hf_afp_appl_index		    = -1;
-static int hf_afp_appl_tag		    = -1;
-
-static int hf_afp_did			    = -1;
-static int hf_afp_file_id		    = -1;
-static int hf_afp_file_DataForkLen	    = -1;
-static int hf_afp_file_RsrcForkLen	    = -1;
-static int hf_afp_file_ExtDataForkLen	    = -1;
-static int hf_afp_file_ExtRsrcForkLen	    = -1;
-
-static int hf_afp_dir_bitmap		    = -1;
-static int hf_afp_dir_offspring		    = -1;
-static int hf_afp_dir_OwnerID		    = -1;
-static int hf_afp_dir_GroupID		    = -1;
-
-static int hf_afp_req_count		    = -1;
-static int hf_afp_start_index		    = -1;
-static int hf_afp_start_index32		    = -1;
-static int hf_afp_max_reply_size	    = -1;
-static int hf_afp_max_reply_size32	    = -1;
-static int hf_afp_file_flag		    = -1;
-static int hf_afp_create_flag		    = -1;
-static int hf_afp_struct_size		    = -1;
-static int hf_afp_struct_size16		    = -1;
-
-static int hf_afp_cat_count		    = -1;
-static int hf_afp_cat_req_matches	    = -1;
-static int hf_afp_cat_position		    = -1;
-
-static int hf_afp_creation_date		    = -1;
-static int hf_afp_modification_date	    = -1;
-static int hf_afp_backup_date		    = -1;
-static int hf_afp_finder_info		    = -1;
-static int hf_afp_long_name_offset	    = -1;
-static int hf_afp_short_name_offset	    = -1;
-static int hf_afp_unicode_name_offset	    = -1;
-static int hf_afp_unix_privs_uid	    = -1;
-static int hf_afp_unix_privs_gid	    = -1;
-static int hf_afp_unix_privs_permissions    = -1;
-static int hf_afp_unix_privs_ua_permissions = -1;
-
-static int hf_afp_path_type		    = -1;
-static int hf_afp_path_len		    = -1;
-static int hf_afp_path_name		    = -1;
-static int hf_afp_path_unicode_hint	    = -1;
-static int hf_afp_path_unicode_len	    = -1;
-
-static int hf_afp_flag			    = -1;
-static int hf_afp_dt_ref		    = -1;
-static int hf_afp_ofork			    = -1;
-static int hf_afp_ofork_len		    = -1;
-static int hf_afp_offset		    = -1;
-static int hf_afp_rw_count		    = -1;
-static int hf_afp_newline_mask		    = -1;
-static int hf_afp_newline_char		    = -1;
-static int hf_afp_last_written		    = -1;
-
-static int hf_afp_fork_type		    = -1;
-static int hf_afp_access_mode		    = -1;
-static int hf_afp_access_read		    = -1;
-static int hf_afp_access_write		    = -1;
-static int hf_afp_access_deny_read	    = -1;
-static int hf_afp_access_deny_write	    = -1;
-
-static gint hf_afp_lock_op		    = -1;
-static gint hf_afp_lock_from		    = -1;
-static gint hf_afp_lock_offset		    = -1;
-static gint hf_afp_lock_len		    = -1;
-static gint hf_afp_lock_range_start	    = -1;
-
-static gint ett_afp			    = -1;
-
-static gint ett_afp_vol_attribute	    = -1;
-static gint ett_afp_enumerate		    = -1;
-static gint ett_afp_enumerate_line	    = -1;
-static gint ett_afp_access_mode		    = -1;
-
-static gint ett_afp_vol_bitmap		    = -1;
-static gint ett_afp_dir_bitmap		    = -1;
-static gint ett_afp_dir_attribute	    = -1;
-static gint ett_afp_file_attribute	    = -1;
-static gint ett_afp_file_bitmap		    = -1;
-static gint ett_afp_unix_privs		    = -1;
-static gint ett_afp_path_name		    = -1;
-static gint ett_afp_lock_flags		    = -1;
-static gint ett_afp_dir_ar		    = -1;
-
-static gint ett_afp_server_vol		    = -1;
-static gint ett_afp_vol_list		    = -1;
-static gint ett_afp_vol_flag		    = -1;
-static gint ett_afp_cat_search		    = -1;
-static gint ett_afp_cat_r_bitmap	    = -1;
-static gint ett_afp_cat_spec		    = -1;
-static gint ett_afp_vol_did		    = -1;
+static int hf_afp_comment;
+static int hf_afp_file_creator;
+static int hf_afp_file_type;
+static int hf_afp_icon_type;
+static int hf_afp_icon_length;
+static int hf_afp_icon_tag;
+static int hf_afp_icon_index;
+static int hf_afp_appl_index;
+static int hf_afp_appl_tag;
+
+static int hf_afp_did;
+static int hf_afp_file_id;
+static int hf_afp_file_DataForkLen;
+static int hf_afp_file_RsrcForkLen;
+static int hf_afp_file_ExtDataForkLen;
+static int hf_afp_file_ExtRsrcForkLen;
+
+static int hf_afp_dir_bitmap;
+static int hf_afp_dir_offspring;
+static int hf_afp_dir_OwnerID;
+static int hf_afp_dir_GroupID;
+
+static int hf_afp_req_count;
+static int hf_afp_start_index;
+static int hf_afp_start_index32;
+static int hf_afp_max_reply_size;
+static int hf_afp_max_reply_size32;
+static int hf_afp_file_flag;
+static int hf_afp_create_flag;
+static int hf_afp_struct_size;
+static int hf_afp_struct_size16;
+
+static int hf_afp_cat_count;
+static int hf_afp_cat_req_matches;
+static int hf_afp_cat_position;
+
+static int hf_afp_creation_date;
+static int hf_afp_modification_date;
+static int hf_afp_backup_date;
+static int hf_afp_finder_info;
+static int hf_afp_long_name_offset;
+static int hf_afp_short_name_offset;
+static int hf_afp_unicode_name_offset;
+static int hf_afp_unix_privs_uid;
+static int hf_afp_unix_privs_gid;
+static int hf_afp_unix_privs_permissions;
+static int hf_afp_unix_privs_ua_permissions;
+
+static int hf_afp_path_type;
+static int hf_afp_path_len;
+static int hf_afp_path_name;
+static int hf_afp_path_unicode_hint;
+static int hf_afp_path_unicode_len;
+
+static int hf_afp_flag;
+static int hf_afp_dt_ref;
+static int hf_afp_ofork;
+static int hf_afp_ofork_len;
+static int hf_afp_offset;
+static int hf_afp_rw_count;
+static int hf_afp_newline_mask;
+static int hf_afp_newline_char;
+static int hf_afp_last_written;
+
+static int hf_afp_fork_type;
+static int hf_afp_access_mode;
+static int hf_afp_access_read;
+static int hf_afp_access_write;
+static int hf_afp_access_deny_read;
+static int hf_afp_access_deny_write;
+
+static gint hf_afp_lock_op;
+static gint hf_afp_lock_from;
+static gint hf_afp_lock_offset;
+static gint hf_afp_lock_len;
+static gint hf_afp_lock_range_start;
+
+static gint ett_afp;
+
+static gint ett_afp_vol_attribute;
+static gint ett_afp_enumerate;
+static gint ett_afp_enumerate_line;
+static gint ett_afp_access_mode;
+
+static gint ett_afp_vol_bitmap;
+static gint ett_afp_dir_bitmap;
+static gint ett_afp_dir_attribute;
+static gint ett_afp_file_attribute;
+static gint ett_afp_file_bitmap;
+static gint ett_afp_unix_privs;
+static gint ett_afp_path_name;
+static gint ett_afp_lock_flags;
+static gint ett_afp_dir_ar;
+
+static gint ett_afp_server_vol;
+static gint ett_afp_vol_list;
+static gint ett_afp_vol_flag;
+static gint ett_afp_cat_search;
+static gint ett_afp_cat_r_bitmap;
+static gint ett_afp_cat_spec;
+static gint ett_afp_vol_did;
 
 /* AFP 3.0 parameters */
-static gint hf_afp_lock_offset64	    = -1;
-static gint hf_afp_lock_len64		    = -1;
-static gint hf_afp_lock_range_start64	    = -1;
+static gint hf_afp_lock_offset64;
+static gint hf_afp_lock_len64;
+static gint hf_afp_lock_range_start64;
 
-static int hf_afp_offset64		    = -1;
-static int hf_afp_rw_count64		    = -1;
-static int hf_afp_reqcount64		    = -1;
+static int hf_afp_offset64;
+static int hf_afp_rw_count64;
+static int hf_afp_reqcount64;
 
-static int hf_afp_last_written64	    = -1;
+static int hf_afp_last_written64;
 
-static int hf_afp_ofork_len64		    = -1;
-static int hf_afp_session_token_type	    = -1;
-static int hf_afp_session_token_len	    = -1;
-static int hf_afp_session_token		    = -1;
-static int hf_afp_session_token_timestamp   = -1;
+static int hf_afp_ofork_len64;
+static int hf_afp_session_token_type;
+static int hf_afp_session_token_len;
+static int hf_afp_session_token;
+static int hf_afp_session_token_timestamp;
 
 /* AFP 3.2 */
 
-static int hf_afp_extattr_bitmap	    = -1;
-static int hf_afp_extattr_bitmap_NoFollow   = -1;
-static int hf_afp_extattr_bitmap_Create	    = -1;
-static int hf_afp_extattr_bitmap_Replace    = -1;
-static int ett_afp_extattr_bitmap	    = -1;
-static int hf_afp_extattr_namelen	    = -1;
-static int hf_afp_extattr_name		    = -1;
-static int hf_afp_extattr_len		    = -1;
-static int hf_afp_extattr_data		    = -1;
-static int hf_afp_extattr_req_count	    = -1;
-static int hf_afp_extattr_start_index	    = -1;
-static int hf_afp_extattr_reply_size	    = -1;
-static int ett_afp_extattr_names	    = -1;
-
-static expert_field ei_afp_subquery_count_over_safety_limit = EI_INIT;
-static expert_field ei_afp_subquery_count_over_query_count = EI_INIT;
-static expert_field ei_afp_abnormal_num_subqueries = EI_INIT;
-static expert_field ei_afp_too_many_acl_entries = EI_INIT;
-static expert_field ei_afp_ip_port_reused = EI_INIT;
-static expert_field ei_afp_toc_offset = EI_INIT;
+static int hf_afp_extattr_bitmap;
+static int hf_afp_extattr_bitmap_NoFollow;
+static int hf_afp_extattr_bitmap_Create;
+static int hf_afp_extattr_bitmap_Replace;
+static int ett_afp_extattr_bitmap;
+static int hf_afp_extattr_namelen;
+static int hf_afp_extattr_name;
+static int hf_afp_extattr_len;
+static int hf_afp_extattr_data;
+static int hf_afp_extattr_req_count;
+static int hf_afp_extattr_start_index;
+static int hf_afp_extattr_reply_size;
+static int ett_afp_extattr_names;
+
+static expert_field ei_afp_subquery_count_over_safety_limit;
+static expert_field ei_afp_subquery_count_over_query_count;
+static expert_field ei_afp_abnormal_num_subqueries;
+static expert_field ei_afp_too_many_acl_entries;
+static expert_field ei_afp_ip_port_reused;
+static expert_field ei_afp_toc_offset;
 
 
 static int afp_tap			    = -1;
@@ -578,143 +578,143 @@ static value_string_ext unicode_hint_vals_ext = VALUE_STRING_EXT_INIT(unicode_hi
 #define kFPVolExtBytesTotalBit		(1U << 10)
 #define kFPVolBlockSizeBit 	  	(1U << 11)
 
-static int hf_afp_vol_bitmap_Attributes 	= -1;
-static int hf_afp_vol_bitmap_Signature 		= -1;
-static int hf_afp_vol_bitmap_CreateDate 	= -1;
-static int hf_afp_vol_bitmap_ModDate 		= -1;
-static int hf_afp_vol_bitmap_BackupDate 	= -1;
-static int hf_afp_vol_bitmap_ID 		= -1;
-static int hf_afp_vol_bitmap_BytesFree 		= -1;
-static int hf_afp_vol_bitmap_BytesTotal 	= -1;
-static int hf_afp_vol_bitmap_Name 		= -1;
-static int hf_afp_vol_bitmap_ExtBytesFree 	= -1;
-static int hf_afp_vol_bitmap_ExtBytesTotal 	= -1;
-static int hf_afp_vol_bitmap_BlockSize 		= -1;
-
-static int hf_afp_vol_attribute_ReadOnly		    = -1;
-static int hf_afp_vol_attribute_HasVolumePassword	    = -1;
-static int hf_afp_vol_attribute_SupportsFileIDs		    = -1;
-static int hf_afp_vol_attribute_SupportsCatSearch	    = -1;
-static int hf_afp_vol_attribute_SupportsBlankAccessPrivs    = -1;
-static int hf_afp_vol_attribute_SupportsUnixPrivs	    = -1;
-static int hf_afp_vol_attribute_SupportsUTF8Names	    = -1;
-static int hf_afp_vol_attribute_NoNetworkUserID		    = -1;
-static int hf_afp_vol_attribute_DefaultPrivsFromParent	    = -1;
-static int hf_afp_vol_attribute_NoExchangeFiles		    = -1;
-static int hf_afp_vol_attribute_SupportsExtAttrs	    = -1;
-static int hf_afp_vol_attribute_SupportsACLs		    = -1;
-static int hf_afp_vol_attribute_CaseSensitive		    = -1;
-static int hf_afp_vol_attribute_SupportsTMLockSteal	    = -1;
-
-static int hf_afp_dir_bitmap_Attributes			     = -1;
-static int hf_afp_dir_bitmap_ParentDirID		     = -1;
-static int hf_afp_dir_bitmap_CreateDate			     = -1;
-static int hf_afp_dir_bitmap_ModDate			     = -1;
-static int hf_afp_dir_bitmap_BackupDate			     = -1;
-static int hf_afp_dir_bitmap_FinderInfo			     = -1;
-static int hf_afp_dir_bitmap_LongName			     = -1;
-static int hf_afp_dir_bitmap_ShortName			     = -1;
-static int hf_afp_dir_bitmap_NodeID			     = -1;
-static int hf_afp_dir_bitmap_OffspringCount		     = -1;
-static int hf_afp_dir_bitmap_OwnerID			     = -1;
-static int hf_afp_dir_bitmap_GroupID			     = -1;
-static int hf_afp_dir_bitmap_AccessRights		     = -1;
-static int hf_afp_dir_bitmap_UTF8Name			     = -1;
-static int hf_afp_dir_bitmap_UnixPrivs			     = -1;
-
-static int hf_afp_dir_attribute				     = -1;
-static int hf_afp_dir_attribute_Invisible		     = -1;
-static int hf_afp_dir_attribute_IsExpFolder		     = -1;
-static int hf_afp_dir_attribute_System			     = -1;
-static int hf_afp_dir_attribute_Mounted			     = -1;
-static int hf_afp_dir_attribute_InExpFolder		     = -1;
-static int hf_afp_dir_attribute_BackUpNeeded		     = -1;
-static int hf_afp_dir_attribute_RenameInhibit		     = -1;
-static int hf_afp_dir_attribute_DeleteInhibit		     = -1;
-
-static int hf_afp_file_bitmap				     = -1;
-static int hf_afp_file_bitmap_Attributes		     = -1;
-static int hf_afp_file_bitmap_ParentDirID		     = -1;
-static int hf_afp_file_bitmap_CreateDate		     = -1;
-static int hf_afp_file_bitmap_ModDate			     = -1;
-static int hf_afp_file_bitmap_BackupDate		     = -1;
-static int hf_afp_file_bitmap_FinderInfo		     = -1;
-static int hf_afp_file_bitmap_LongName			     = -1;
-static int hf_afp_file_bitmap_ShortName			     = -1;
-static int hf_afp_file_bitmap_NodeID			     = -1;
-static int hf_afp_file_bitmap_DataForkLen		     = -1;
-static int hf_afp_file_bitmap_RsrcForkLen		     = -1;
-static int hf_afp_file_bitmap_ExtDataForkLen		     = -1;
-static int hf_afp_file_bitmap_LaunchLimit	 	     = -1;
-
-static int hf_afp_file_bitmap_UTF8Name			     = -1;
-static int hf_afp_file_bitmap_ExtRsrcForkLen	 	     = -1;
-static int hf_afp_file_bitmap_UnixPrivs			     = -1;
-
-static int hf_afp_file_attribute			     = -1;
-static int hf_afp_file_attribute_Invisible		     = -1;
-static int hf_afp_file_attribute_MultiUser		     = -1;
-static int hf_afp_file_attribute_System			     = -1;
-static int hf_afp_file_attribute_DAlreadyOpen		     = -1;
-static int hf_afp_file_attribute_RAlreadyOpen		     = -1;
-static int hf_afp_file_attribute_WriteInhibit		     = -1;
-static int hf_afp_file_attribute_BackUpNeeded		     = -1;
-static int hf_afp_file_attribute_RenameInhibit		     = -1;
-static int hf_afp_file_attribute_DeleteInhibit		     = -1;
-static int hf_afp_file_attribute_CopyProtect		     = -1;
-static int hf_afp_file_attribute_SetClear		     = -1;
-
-static int hf_afp_map_name_type				     = -1;
-static int hf_afp_map_name				     = -1;
-static int hf_afp_map_id				     = -1;
-static int hf_afp_map_id_type				     = -1;
-static int hf_afp_map_id_reply_type			     = -1;
+static int hf_afp_vol_bitmap_Attributes;
+static int hf_afp_vol_bitmap_Signature;
+static int hf_afp_vol_bitmap_CreateDate;
+static int hf_afp_vol_bitmap_ModDate;
+static int hf_afp_vol_bitmap_BackupDate;
+static int hf_afp_vol_bitmap_ID;
+static int hf_afp_vol_bitmap_BytesFree;
+static int hf_afp_vol_bitmap_BytesTotal;
+static int hf_afp_vol_bitmap_Name;
+static int hf_afp_vol_bitmap_ExtBytesFree;
+static int hf_afp_vol_bitmap_ExtBytesTotal;
+static int hf_afp_vol_bitmap_BlockSize;
+
+static int hf_afp_vol_attribute_ReadOnly;
+static int hf_afp_vol_attribute_HasVolumePassword;
+static int hf_afp_vol_attribute_SupportsFileIDs;
+static int hf_afp_vol_attribute_SupportsCatSearch;
+static int hf_afp_vol_attribute_SupportsBlankAccessPrivs;
+static int hf_afp_vol_attribute_SupportsUnixPrivs;
+static int hf_afp_vol_attribute_SupportsUTF8Names;
+static int hf_afp_vol_attribute_NoNetworkUserID;
+static int hf_afp_vol_attribute_DefaultPrivsFromParent;
+static int hf_afp_vol_attribute_NoExchangeFiles;
+static int hf_afp_vol_attribute_SupportsExtAttrs;
+static int hf_afp_vol_attribute_SupportsACLs;
+static int hf_afp_vol_attribute_CaseSensitive;
+static int hf_afp_vol_attribute_SupportsTMLockSteal;
+
+static int hf_afp_dir_bitmap_Attributes;
+static int hf_afp_dir_bitmap_ParentDirID;
+static int hf_afp_dir_bitmap_CreateDate;
+static int hf_afp_dir_bitmap_ModDate;
+static int hf_afp_dir_bitmap_BackupDate;
+static int hf_afp_dir_bitmap_FinderInfo;
+static int hf_afp_dir_bitmap_LongName;
+static int hf_afp_dir_bitmap_ShortName;
+static int hf_afp_dir_bitmap_NodeID;
+static int hf_afp_dir_bitmap_OffspringCount;
+static int hf_afp_dir_bitmap_OwnerID;
+static int hf_afp_dir_bitmap_GroupID;
+static int hf_afp_dir_bitmap_AccessRights;
+static int hf_afp_dir_bitmap_UTF8Name;
+static int hf_afp_dir_bitmap_UnixPrivs;
+
+static int hf_afp_dir_attribute;
+static int hf_afp_dir_attribute_Invisible;
+static int hf_afp_dir_attribute_IsExpFolder;
+static int hf_afp_dir_attribute_System;
+static int hf_afp_dir_attribute_Mounted;
+static int hf_afp_dir_attribute_InExpFolder;
+static int hf_afp_dir_attribute_BackUpNeeded;
+static int hf_afp_dir_attribute_RenameInhibit;
+static int hf_afp_dir_attribute_DeleteInhibit;
+
+static int hf_afp_file_bitmap;
+static int hf_afp_file_bitmap_Attributes;
+static int hf_afp_file_bitmap_ParentDirID;
+static int hf_afp_file_bitmap_CreateDate;
+static int hf_afp_file_bitmap_ModDate;
+static int hf_afp_file_bitmap_BackupDate;
+static int hf_afp_file_bitmap_FinderInfo;
+static int hf_afp_file_bitmap_LongName;
+static int hf_afp_file_bitmap_ShortName;
+static int hf_afp_file_bitmap_NodeID;
+static int hf_afp_file_bitmap_DataForkLen;
+static int hf_afp_file_bitmap_RsrcForkLen;
+static int hf_afp_file_bitmap_ExtDataForkLen;
+static int hf_afp_file_bitmap_LaunchLimit;
+
+static int hf_afp_file_bitmap_UTF8Name;
+static int hf_afp_file_bitmap_ExtRsrcForkLen;
+static int hf_afp_file_bitmap_UnixPrivs;
+
+static int hf_afp_file_attribute;
+static int hf_afp_file_attribute_Invisible;
+static int hf_afp_file_attribute_MultiUser;
+static int hf_afp_file_attribute_System;
+static int hf_afp_file_attribute_DAlreadyOpen;
+static int hf_afp_file_attribute_RAlreadyOpen;
+static int hf_afp_file_attribute_WriteInhibit;
+static int hf_afp_file_attribute_BackUpNeeded;
+static int hf_afp_file_attribute_RenameInhibit;
+static int hf_afp_file_attribute_DeleteInhibit;
+static int hf_afp_file_attribute_CopyProtect;
+static int hf_afp_file_attribute_SetClear;
+
+static int hf_afp_map_name_type;
+static int hf_afp_map_name;
+static int hf_afp_map_id;
+static int hf_afp_map_id_type;
+static int hf_afp_map_id_reply_type;
 
 /* catsearch stuff */
-static int hf_afp_request_bitmap			     = -1;
-static int hf_afp_request_bitmap_Attributes		     = -1;
-static int hf_afp_request_bitmap_ParentDirID		     = -1;
-static int hf_afp_request_bitmap_CreateDate		     = -1;
-static int hf_afp_request_bitmap_ModDate		     = -1;
-static int hf_afp_request_bitmap_BackupDate		     = -1;
-static int hf_afp_request_bitmap_FinderInfo		     = -1;
-static int hf_afp_request_bitmap_LongName		     = -1;
-static int hf_afp_request_bitmap_DataForkLen		     = -1;
-static int hf_afp_request_bitmap_OffspringCount		     = -1;
-static int hf_afp_request_bitmap_RsrcForkLen		     = -1;
-static int hf_afp_request_bitmap_ExtDataForkLen		     = -1;
-static int hf_afp_request_bitmap_UTF8Name		     = -1;
-static int hf_afp_request_bitmap_ExtRsrcForkLen		     = -1;
-static int hf_afp_request_bitmap_PartialNames		     = -1;
+static int hf_afp_request_bitmap;
+static int hf_afp_request_bitmap_Attributes;
+static int hf_afp_request_bitmap_ParentDirID;
+static int hf_afp_request_bitmap_CreateDate;
+static int hf_afp_request_bitmap_ModDate;
+static int hf_afp_request_bitmap_BackupDate;
+static int hf_afp_request_bitmap_FinderInfo;
+static int hf_afp_request_bitmap_LongName;
+static int hf_afp_request_bitmap_DataForkLen;
+static int hf_afp_request_bitmap_OffspringCount;
+static int hf_afp_request_bitmap_RsrcForkLen;
+static int hf_afp_request_bitmap_ExtDataForkLen;
+static int hf_afp_request_bitmap_UTF8Name;
+static int hf_afp_request_bitmap_ExtRsrcForkLen;
+static int hf_afp_request_bitmap_PartialNames;
 
 /* Spotlight stuff */
-static int ett_afp_spotlight_queries			     = -1;
-static int ett_afp_spotlight_query_line			     = -1;
-static int ett_afp_spotlight_query			     = -1;
-static int ett_afp_spotlight_data			     = -1;
-static int ett_afp_spotlight_toc			     = -1;
-
-static int hf_afp_spotlight_request_flags		     = -1;
-static int hf_afp_spotlight_request_command		     = -1;
-static int hf_afp_spotlight_request_reserved		     = -1;
-static int hf_afp_spotlight_reply_reserved		     = -1;
-static int hf_afp_spotlight_volpath_server		     = -1;
-static int hf_afp_spotlight_volpath_client		     = -1;
-static int hf_afp_spotlight_returncode			     = -1;
-static int hf_afp_spotlight_volflags			     = -1;
-static int hf_afp_spotlight_reqlen			     = -1;
-static int hf_afp_spotlight_uuid			     = -1;
-static int hf_afp_spotlight_date			     = -1;
+static int ett_afp_spotlight_queries;
+static int ett_afp_spotlight_query_line;
+static int ett_afp_spotlight_query;
+static int ett_afp_spotlight_data;
+static int ett_afp_spotlight_toc;
+
+static int hf_afp_spotlight_request_flags;
+static int hf_afp_spotlight_request_command;
+static int hf_afp_spotlight_request_reserved;
+static int hf_afp_spotlight_reply_reserved;
+static int hf_afp_spotlight_volpath_server;
+static int hf_afp_spotlight_volpath_client;
+static int hf_afp_spotlight_returncode;
+static int hf_afp_spotlight_volflags;
+static int hf_afp_spotlight_reqlen;
+static int hf_afp_spotlight_uuid;
+static int hf_afp_spotlight_date;
 
 /* Status stuff from ASP or DSI */
-static int ett_afp_status				     = -1;
-static int ett_afp_uams					     = -1;
-static int ett_afp_vers					     = -1;
-static int ett_afp_server_addr				     = -1;
-static int ett_afp_server_addr_line			     = -1;
-static int ett_afp_directory				     = -1;
-static int ett_afp_utf8_name				     = -1;
-static int ett_afp_status_server_flag			     = -1;
+static int ett_afp_status;
+static int ett_afp_uams;
+static int ett_afp_vers;
+static int ett_afp_server_addr;
+static int ett_afp_server_addr_line;
+static int ett_afp_directory;
+static int ett_afp_utf8_name;
+static int ett_afp_status_server_flag;
 
 static const value_string flag_vals[] = {
 	{0,	"Start" },
@@ -822,47 +822,47 @@ static const value_string map_id_reply_type_vals[] = {
 #define AR_BLANK        (1U << 28)  /* Blank Access Privileges (use parent dir privileges) */
 #define AR_U_OWN        (1U << 31)  /* user is the owner */
 
-static int hf_afp_dir_ar           = -1;
-static int hf_afp_dir_ar_o_search  = -1;
-static int hf_afp_dir_ar_o_read    = -1;
-static int hf_afp_dir_ar_o_write   = -1;
-static int hf_afp_dir_ar_g_search  = -1;
-static int hf_afp_dir_ar_g_read    = -1;
-static int hf_afp_dir_ar_g_write   = -1;
-static int hf_afp_dir_ar_e_search  = -1;
-static int hf_afp_dir_ar_e_read    = -1;
-static int hf_afp_dir_ar_e_write   = -1;
-static int hf_afp_dir_ar_u_search  = -1;
-static int hf_afp_dir_ar_u_read    = -1;
-static int hf_afp_dir_ar_u_write   = -1;
-static int hf_afp_dir_ar_blank     = -1;
-static int hf_afp_dir_ar_u_own     = -1;
-
-static int hf_afp_user_flag        = -1;
-static int hf_afp_user_ID          = -1;
-static int hf_afp_group_ID         = -1;
-static int hf_afp_UUID      	   = -1;
-static int hf_afp_GRPUUID          = -1;
-static int hf_afp_user_bitmap      = -1;
-static int hf_afp_user_bitmap_UID  = -1;
-static int hf_afp_user_bitmap_GID  = -1;
-static int hf_afp_user_bitmap_UUID = -1;
-
-static gint ett_afp_user_bitmap    = -1;
+static int hf_afp_dir_ar;
+static int hf_afp_dir_ar_o_search;
+static int hf_afp_dir_ar_o_read;
+static int hf_afp_dir_ar_o_write;
+static int hf_afp_dir_ar_g_search;
+static int hf_afp_dir_ar_g_read;
+static int hf_afp_dir_ar_g_write;
+static int hf_afp_dir_ar_e_search;
+static int hf_afp_dir_ar_e_read;
+static int hf_afp_dir_ar_e_write;
+static int hf_afp_dir_ar_u_search;
+static int hf_afp_dir_ar_u_read;
+static int hf_afp_dir_ar_u_write;
+static int hf_afp_dir_ar_blank;
+static int hf_afp_dir_ar_u_own;
+
+static int hf_afp_user_flag;
+static int hf_afp_user_ID;
+static int hf_afp_group_ID;
+static int hf_afp_UUID;
+static int hf_afp_GRPUUID;
+static int hf_afp_user_bitmap;
+static int hf_afp_user_bitmap_UID;
+static int hf_afp_user_bitmap_GID;
+static int hf_afp_user_bitmap_UUID;
+
+static gint ett_afp_user_bitmap;
 
 static const value_string user_flag_vals[] = {
 	{0,	"Use user ID" },
 	{1,	"Default user" },
 	{0,	NULL } };
 
-static int hf_afp_message            = -1;
-static int hf_afp_message_type       = -1;
-static int hf_afp_message_bitmap     = -1;
-static int hf_afp_message_bitmap_REQ = -1;
-static int hf_afp_message_bitmap_UTF = -1;
-static int hf_afp_message_len	     = -1;
+static int hf_afp_message;
+static int hf_afp_message_type;
+static int hf_afp_message_bitmap;
+static int hf_afp_message_bitmap_REQ;
+static int hf_afp_message_bitmap_UTF;
+static int hf_afp_message_len;
 
-static gint ett_afp_message_bitmap   = -1;
+static gint ett_afp_message_bitmap;
 
 static const value_string server_message_type[] = {
 	{0,   "Login message" },
@@ -948,29 +948,29 @@ static value_string_ext token_type_vals_ext = VALUE_STRING_EXT_INIT(token_type_v
 #define kFileSec_REMOVEACL	(1U << 3)
 #define kFileSec_Inherit	(1U << 4)
 
-static int hf_afp_acl_list_bitmap		= -1;
-static int hf_afp_acl_list_bitmap_UUID		= -1;
-static int hf_afp_acl_list_bitmap_GRPUUID	= -1;
-static int hf_afp_acl_list_bitmap_ACL		= -1;
-static int hf_afp_acl_list_bitmap_REMOVEACL	= -1;
-static int hf_afp_acl_list_bitmap_Inherit	= -1;
-static int ett_afp_acl_list_bitmap		= -1;
+static int hf_afp_acl_list_bitmap;
+static int hf_afp_acl_list_bitmap_UUID;
+static int hf_afp_acl_list_bitmap_GRPUUID;
+static int hf_afp_acl_list_bitmap_ACL;
+static int hf_afp_acl_list_bitmap_REMOVEACL;
+static int hf_afp_acl_list_bitmap_Inherit;
+static int ett_afp_acl_list_bitmap;
 
-static int hf_afp_access_bitmap			= -1;
+static int hf_afp_access_bitmap;
 
-static int hf_afp_acl_entrycount	 = -1;
-static int hf_afp_acl_flags		 = -1;
+static int hf_afp_acl_entrycount;
+static int hf_afp_acl_flags;
 
-static int hf_afp_ace_flags		 = -1;
+static int hf_afp_ace_flags;
 
-static int ett_afp_ace_flags		 = -1;
-static int hf_afp_ace_flags_allow	 = -1;
-static int hf_afp_ace_flags_deny	 = -1;
-static int hf_afp_ace_flags_inherited	 = -1;
-static int hf_afp_ace_flags_fileinherit	 = -1;
-static int hf_afp_ace_flags_dirinherit	 = -1;
-static int hf_afp_ace_flags_limitinherit = -1;
-static int hf_afp_ace_flags_onlyinherit  = -1;
+static int ett_afp_ace_flags;
+static int hf_afp_ace_flags_allow;
+static int hf_afp_ace_flags_deny;
+static int hf_afp_ace_flags_inherited;
+static int hf_afp_ace_flags_fileinherit;
+static int hf_afp_ace_flags_dirinherit;
+static int hf_afp_ace_flags_limitinherit;
+static int hf_afp_ace_flags_onlyinherit;
 
 /* AFP 3.2 ACE flags */
 #define ACE_ALLOW	  (1U << 0)
@@ -981,8 +981,8 @@ static int hf_afp_ace_flags_onlyinherit  = -1;
 #define ACE_LIMIT_INHERIT (1U << 7)
 #define ACE_ONLY_INHERIT  (1U << 8)
 
-static int ett_afp_ace_entries		 = -1;
-static int ett_afp_ace_entry		 = -1;
+static int ett_afp_ace_entries;
+static int ett_afp_ace_entry;
 
 /* AFP 3.2 ACL access right cf page 248*/
 #define KAUTH_VNODE_READ_DATA		(1U << 1)
@@ -1009,81 +1009,81 @@ static int ett_afp_ace_entry		 = -1;
 #define KAUTH_VNODE_GENERIC_READ	(1U << 24)
 
 
-static int hf_afp_acl_access_bitmap		    = -1;
-static int ett_afp_acl_access_bitmap		    = -1;
-static int hf_afp_acl_access_bitmap_read_data	    = -1;
-static int hf_afp_acl_access_bitmap_write_data	    = -1;
-static int hf_afp_acl_access_bitmap_execute	    = -1;
-static int hf_afp_acl_access_bitmap_delete	    = -1;
-static int hf_afp_acl_access_bitmap_append_data	    = -1;
-static int hf_afp_acl_access_bitmap_delete_child    = -1;
-static int hf_afp_acl_access_bitmap_read_attrs	    = -1;
-static int hf_afp_acl_access_bitmap_write_attrs	    = -1;
-static int hf_afp_acl_access_bitmap_read_extattrs   = -1;
-static int hf_afp_acl_access_bitmap_write_extattrs  = -1;
-static int hf_afp_acl_access_bitmap_read_security   = -1;
-static int hf_afp_acl_access_bitmap_write_security  = -1;
-static int hf_afp_acl_access_bitmap_change_owner    = -1;
-static int hf_afp_acl_access_bitmap_synchronize	    = -1;
-static int hf_afp_acl_access_bitmap_generic_all	    = -1;
-static int hf_afp_acl_access_bitmap_generic_execute = -1;
-static int hf_afp_acl_access_bitmap_generic_write   = -1;
-static int hf_afp_acl_access_bitmap_generic_read    = -1;
+static int hf_afp_acl_access_bitmap;
+static int ett_afp_acl_access_bitmap;
+static int hf_afp_acl_access_bitmap_read_data;
+static int hf_afp_acl_access_bitmap_write_data;
+static int hf_afp_acl_access_bitmap_execute;
+static int hf_afp_acl_access_bitmap_delete;
+static int hf_afp_acl_access_bitmap_append_data;
+static int hf_afp_acl_access_bitmap_delete_child;
+static int hf_afp_acl_access_bitmap_read_attrs;
+static int hf_afp_acl_access_bitmap_write_attrs;
+static int hf_afp_acl_access_bitmap_read_extattrs;
+static int hf_afp_acl_access_bitmap_write_extattrs;
+static int hf_afp_acl_access_bitmap_read_security;
+static int hf_afp_acl_access_bitmap_write_security;
+static int hf_afp_acl_access_bitmap_change_owner;
+static int hf_afp_acl_access_bitmap_synchronize;
+static int hf_afp_acl_access_bitmap_generic_all;
+static int hf_afp_acl_access_bitmap_generic_execute;
+static int hf_afp_acl_access_bitmap_generic_write;
+static int hf_afp_acl_access_bitmap_generic_read;
 
 /* Status stuff from ASP or DSI */
-static int hf_afp_server_name = -1;
-static int hf_afp_utf8_server_name_len = -1;
-static int hf_afp_utf8_server_name = -1;
-static int hf_afp_server_type = -1;
-static int hf_afp_server_vers = -1;
-static int hf_afp_server_uams = -1;
-static int hf_afp_server_icon = -1;
-static int hf_afp_server_directory = -1;
-
-static int hf_afp_server_flag = -1;
-static int hf_afp_server_flag_copyfile = -1;
-static int hf_afp_server_flag_passwd   = -1;
-static int hf_afp_server_flag_no_save_passwd = -1;
-static int hf_afp_server_flag_srv_msg   = -1;
-static int hf_afp_server_flag_srv_sig   = -1;
-static int hf_afp_server_flag_tcpip     = -1;
-static int hf_afp_server_flag_notify    = -1;
-static int hf_afp_server_flag_reconnect = -1;
-static int hf_afp_server_flag_directory = -1;
-static int hf_afp_server_flag_utf8_name = -1;
-static int hf_afp_server_flag_uuid      = -1;
-static int hf_afp_server_flag_ext_sleep = -1;
-static int hf_afp_server_flag_fast_copy = -1;
-static int hf_afp_server_signature      = -1;
-
-static int hf_afp_server_addr_len       = -1;
-static int hf_afp_server_addr_type      = -1;
-static int hf_afp_server_addr_value     = -1;
+static int hf_afp_server_name;
+static int hf_afp_utf8_server_name_len;
+static int hf_afp_utf8_server_name;
+static int hf_afp_server_type;
+static int hf_afp_server_vers;
+static int hf_afp_server_uams;
+static int hf_afp_server_icon;
+static int hf_afp_server_directory;
+
+static int hf_afp_server_flag;
+static int hf_afp_server_flag_copyfile;
+static int hf_afp_server_flag_passwd;
+static int hf_afp_server_flag_no_save_passwd;
+static int hf_afp_server_flag_srv_msg;
+static int hf_afp_server_flag_srv_sig;
+static int hf_afp_server_flag_tcpip;
+static int hf_afp_server_flag_notify;
+static int hf_afp_server_flag_reconnect;
+static int hf_afp_server_flag_directory;
+static int hf_afp_server_flag_utf8_name;
+static int hf_afp_server_flag_uuid;
+static int hf_afp_server_flag_ext_sleep;
+static int hf_afp_server_flag_fast_copy;
+static int hf_afp_server_signature;
+
+static int hf_afp_server_addr_len;
+static int hf_afp_server_addr_type;
+static int hf_afp_server_addr_value;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_afp_int64 = -1;
-static int hf_afp_float = -1;
-static int hf_afp_unknown16 = -1;
-static int hf_afp_unknown32 = -1;
-static int hf_afp_cnid = -1;
-static int hf_afp_null = -1;
-static int hf_afp_string = -1;
-static int hf_afp_utf_16_string = -1;
-static int hf_afp_bool = -1;
-static int hf_afp_query_type = -1;
-static int hf_afp_toc_offset = -1;
-static int hf_afp_toc_entry = -1;
-static int hf_afp_endianness = -1;
-static int hf_afp_query_len = -1;
-static int hf_afp_num_toc_entries = -1;
-static int hf_afp_machine_offset = -1;
-static int hf_afp_version_offset = -1;
-static int hf_afp_uams_offset = -1;
-static int hf_afp_icon_offset = -1;
-static int hf_afp_signature_offset = -1;
-static int hf_afp_network_address_offset = -1;
-static int hf_afp_directory_services_offset = -1;
-static int hf_afp_utf8_server_name_offset = -1;
+static int hf_afp_int64;
+static int hf_afp_float;
+static int hf_afp_unknown16;
+static int hf_afp_unknown32;
+static int hf_afp_cnid;
+static int hf_afp_null;
+static int hf_afp_string;
+static int hf_afp_utf_16_string;
+static int hf_afp_bool;
+static int hf_afp_query_type;
+static int hf_afp_toc_offset;
+static int hf_afp_toc_entry;
+static int hf_afp_endianness;
+static int hf_afp_query_len;
+static int hf_afp_num_toc_entries;
+static int hf_afp_machine_offset;
+static int hf_afp_version_offset;
+static int hf_afp_uams_offset;
+static int hf_afp_icon_offset;
+static int hf_afp_signature_offset;
+static int hf_afp_network_address_offset;
+static int hf_afp_directory_services_offset;
+static int hf_afp_utf8_server_name_offset;
 
 static const value_string afp_server_addr_type_vals[] = {
 	{1,   "IP address" },
diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c
index 0da2a0987a..386e6150be 100644
--- a/epan/dissectors/packet-afs.c
+++ b/epan/dissectors/packet-afs.c
@@ -147,312 +147,312 @@ struct afs_volumeinfo {
 	guint16 Part7;
 };
 
-static int proto_afs = -1;
-static int hf_afs_fs = -1;
-static int hf_afs_cb = -1;
-static int hf_afs_prot = -1;
-static int hf_afs_vldb = -1;
-static int hf_afs_kauth = -1;
-static int hf_afs_vol = -1;
-static int hf_afs_error = -1;
-static int hf_afs_bos = -1;
-static int hf_afs_update = -1;
-static int hf_afs_rmtsys = -1;
-static int hf_afs_ubik = -1;
-static int hf_afs_backup = -1;
-static int hf_afs_butc = -1;
-static int hf_afs_service = -1;
-
-static int hf_afs_fs_opcode = -1;
-static int hf_afs_cb_opcode = -1;
-static int hf_afs_prot_opcode = -1;
-static int hf_afs_vldb_opcode = -1;
-static int hf_afs_kauth_opcode = -1;
-static int hf_afs_vol_opcode = -1;
-static int hf_afs_error_opcode = -1;
-static int hf_afs_bos_opcode = -1;
-static int hf_afs_update_opcode = -1;
-static int hf_afs_rmtsys_opcode = -1;
-static int hf_afs_ubik_opcode = -1;
-static int hf_afs_backup_opcode = -1;
-static int hf_afs_butc_opcode = -1;
-
-static int hf_afs_fs_fid_volume = -1;
-static int hf_afs_fs_fid_vnode = -1;
-static int hf_afs_fs_fid_uniqifier = -1;
-static int hf_afs_fs_offset = -1;
-static int hf_afs_fs_length = -1;
-static int hf_afs_fs_flength = -1;
-static int hf_afs_fs_offset64 = -1;
-static int hf_afs_fs_length64 = -1;
-static int hf_afs_fs_flength64 = -1;
-static int hf_afs_fs_errcode = -1;
-static int hf_afs_fs_data = -1;
-static int hf_afs_fs_name = -1;
-static int hf_afs_fs_oldname = -1;
-static int hf_afs_fs_newname = -1;
-static int hf_afs_fs_symlink_name = -1;
-static int hf_afs_fs_symlink_content = -1;
-static int hf_afs_fs_volid = -1;
-static int hf_afs_fs_volname = -1;
-static int hf_afs_fs_timestamp = -1;
-static int hf_afs_fs_offlinemsg = -1;
-static int hf_afs_fs_motd = -1;
-static int hf_afs_fs_xstats_version = -1;
-static int hf_afs_fs_xstats_timestamp = -1;
-static int hf_afs_fs_xstats_clientversion = -1;
-static int hf_afs_fs_xstats_collnumber = -1;
-static int hf_afs_fs_cps_spare1 = -1;
-static int hf_afs_fs_cps_spare2 = -1;
-static int hf_afs_fs_cps_spare3 = -1;
-static int hf_afs_fs_vicelocktype = -1;
-static int hf_afs_fs_viceid = -1;
-static int hf_afs_fs_ipaddr = -1;
-static int hf_afs_fs_token = -1;
-
-static int hf_afs_fs_status_anonymousaccess = -1;
-static int hf_afs_fs_status_author = -1;
-static int hf_afs_fs_status_calleraccess = -1;
-static int hf_afs_fs_status_clientmodtime = -1;
-static int hf_afs_fs_status_dataversion = -1;
-static int hf_afs_fs_status_dataversionhigh = -1;
-static int hf_afs_fs_status_filetype = -1;
-static int hf_afs_fs_status_group = -1;
-static int hf_afs_fs_status_interfaceversion = -1;
-static int hf_afs_fs_status_length = -1;
-static int hf_afs_fs_status_linkcount = -1;
-static int hf_afs_fs_status_mask = -1;
-static int hf_afs_fs_status_mask_fsync = -1;
-static int hf_afs_fs_status_mask_setgroup = -1;
-static int hf_afs_fs_status_mask_setmode = -1;
-static int hf_afs_fs_status_mask_setmodtime = -1;
-static int hf_afs_fs_status_mask_setowner = -1;
-static int hf_afs_fs_status_mask_setsegsize = -1;
-static int hf_afs_fs_status_mode = -1;
-static int hf_afs_fs_status_owner = -1;
-static int hf_afs_fs_status_parentunique = -1;
-static int hf_afs_fs_status_parentvnode = -1;
-static int hf_afs_fs_status_segsize = -1;
-static int hf_afs_fs_status_servermodtime = -1;
-static int hf_afs_fs_status_spare2 = -1;
-static int hf_afs_fs_status_spare3 = -1;
-static int hf_afs_fs_status_spare4 = -1;
-static int hf_afs_fs_status_synccounter = -1;
-
-static int hf_afs_fs_volsync_spare1 = -1;
-static int hf_afs_fs_volsync_spare2 = -1;
-static int hf_afs_fs_volsync_spare3 = -1;
-static int hf_afs_fs_volsync_spare4 = -1;
-static int hf_afs_fs_volsync_spare5 = -1;
-static int hf_afs_fs_volsync_spare6 = -1;
-
-static int hf_afs_fs_acl_datasize = -1;
-static int hf_afs_fs_acl_count_negative = -1;
-static int hf_afs_fs_acl_count_positive = -1;
-static int hf_afs_fs_acl_entity = -1;
-static int hf_afs_fs_acl_r = -1;
-static int hf_afs_fs_acl_l = -1;
-static int hf_afs_fs_acl_i = -1;
-static int hf_afs_fs_acl_d = -1;
-static int hf_afs_fs_acl_w = -1;
-static int hf_afs_fs_acl_k = -1;
-static int hf_afs_fs_acl_a = -1;
-
-static int hf_afs_fs_callback_version = -1;
-static int hf_afs_fs_callback_expires = -1;
-static int hf_afs_fs_callback_type = -1;
-
-static int hf_afs_bos_errcode = -1;
-static int hf_afs_bos_type = -1;
-static int hf_afs_bos_instance = -1;
-static int hf_afs_bos_status = -1;
-static int hf_afs_bos_statusdesc = -1;
-static int hf_afs_bos_num = -1;
-static int hf_afs_bos_size = -1;
-static int hf_afs_bos_flags = -1;
-static int hf_afs_bos_date = -1;
-static int hf_afs_bos_content = -1;
-static int hf_afs_bos_user = -1;
-static int hf_afs_bos_key = -1;
-static int hf_afs_bos_path = -1;
-static int hf_afs_bos_file = -1;
-static int hf_afs_bos_cmd = -1;
-static int hf_afs_bos_error = -1;
-static int hf_afs_bos_spare1 = -1;
-static int hf_afs_bos_spare2 = -1;
-static int hf_afs_bos_spare3 = -1;
-static int hf_afs_bos_parm = -1;
-static int hf_afs_bos_kvno = -1;
-static int hf_afs_bos_cell = -1;
-static int hf_afs_bos_host = -1;
-static int hf_afs_bos_newtime = -1;
-static int hf_afs_bos_baktime = -1;
-static int hf_afs_bos_oldtime = -1;
-static int hf_afs_bos_data = -1;
-static int hf_afs_bos_keymodtime = -1;
-static int hf_afs_bos_keychecksum = -1;
-static int hf_afs_bos_keyspare2 = -1;
-
-static int hf_afs_vldb_errcode = -1;
-static int hf_afs_vldb_name = -1;
-static int hf_afs_vldb_name_uint_string = -1;
-static int hf_afs_vldb_id = -1;
-static int hf_afs_vldb_type = -1;
-static int hf_afs_vldb_bump = -1;
-static int hf_afs_vldb_index = -1;
-static int hf_afs_vldb_nextindex = -1;
-static int hf_afs_vldb_count = -1;
-static int hf_afs_vldb_numservers = -1;
-static int hf_afs_vldb_server = -1;
-static int hf_afs_vldb_serveruuid = -1;
-static int hf_afs_vldb_serveruniq = -1;
-static int hf_afs_vldb_serverflags = -1;
-static int hf_afs_vldb_serverip = -1;
-static int hf_afs_vldb_partition = -1;
-static int hf_afs_vldb_rovol = -1;
-static int hf_afs_vldb_rwvol = -1;
-static int hf_afs_vldb_bkvol = -1;
-static int hf_afs_vldb_clonevol = -1;
-static int hf_afs_vldb_flags = -1;
-static int hf_afs_vldb_flags_rwexists = -1;
-static int hf_afs_vldb_flags_roexists = -1;
-static int hf_afs_vldb_flags_bkexists = -1;
-static int hf_afs_vldb_flags_dfsfileset = -1;
-
-static int hf_afs_vldb_spare1 = -1;
-static int hf_afs_vldb_spare2 = -1;
-static int hf_afs_vldb_spare3 = -1;
-static int hf_afs_vldb_spare4 = -1;
-static int hf_afs_vldb_spare5 = -1;
-static int hf_afs_vldb_spare6 = -1;
-static int hf_afs_vldb_spare7 = -1;
-static int hf_afs_vldb_spare8 = -1;
-static int hf_afs_vldb_spare9 = -1;
-
-static int hf_afs_kauth_errcode = -1;
-static int hf_afs_kauth_princ = -1;
-static int hf_afs_kauth_realm = -1;
-static int hf_afs_kauth_domain = -1;
-static int hf_afs_kauth_kvno = -1;
-static int hf_afs_kauth_name = -1;
-static int hf_afs_kauth_data = -1;
-
-static int hf_afs_vol_errcode = -1;
-static int hf_afs_vol_count = -1;
-static int hf_afs_vol_id = -1;
-static int hf_afs_vol_name = -1;
-
-static int hf_afs_cb_errcode = -1;
-static int hf_afs_cb_callback_version = -1;
-static int hf_afs_cb_callback_type = -1;
-static int hf_afs_cb_callback_expires = -1;
-static int hf_afs_cb_fid_volume = -1;
-static int hf_afs_cb_fid_vnode = -1;
-static int hf_afs_cb_fid_uniqifier = -1;
-
-static int hf_afs_cm_uuid = -1;
-static int hf_afs_cm_numint = -1;
-static int hf_afs_cm_ipaddr = -1;
-static int hf_afs_cm_netmask = -1;
-static int hf_afs_cm_mtu = -1;
-static int hf_afs_cm_numcap = -1;
-static int hf_afs_cm_capabilities = -1;
-static int hf_afs_cm_cap_errortrans = -1;
-
-static int hf_afs_prot_errcode = -1;
-static int hf_afs_prot_name = -1;
-static int hf_afs_prot_name_uint_string = -1;
-static int hf_afs_prot_id = -1;
-static int hf_afs_prot_count = -1;
-static int hf_afs_prot_oldid = -1;
-static int hf_afs_prot_newid = -1;
-static int hf_afs_prot_pos = -1;
-static int hf_afs_prot_flag = -1;
-static int hf_afs_prot_uid = -1;
-static int hf_afs_prot_gid = -1;
-static int hf_afs_prot_maxuid = -1;
-static int hf_afs_prot_maxgid = -1;
-
-static int hf_afs_backup_errcode = -1;
-static int hf_afs_butc_errcode = -1;
-
-/* static int hf_afs_ubik_errcode = -1; */
-static int hf_afs_ubik_version_epoch = -1;
-static int hf_afs_ubik_version_counter = -1;
-static int hf_afs_ubik_votestart = -1;
-static int hf_afs_ubik_state = -1;
-static int hf_afs_ubik_site = -1;
-static int hf_afs_ubik_interface = -1;
-static int hf_afs_ubik_null_addresses = -1;
-static int hf_afs_ubik_file = -1;
-static int hf_afs_ubik_pos = -1;
-static int hf_afs_ubik_length = -1;
-static int hf_afs_ubik_locktype = -1;
-/* static int hf_afs_ubik_voteend = -1; */
-/* static int hf_afs_ubik_votetype = -1; */
-
-static int hf_afs_ubik_now = -1;
-static int hf_afs_ubik_lastyestime = -1;
-static int hf_afs_ubik_lastyeshost = -1;
-static int hf_afs_ubik_lastyesstate = -1;
-static int hf_afs_ubik_lastyesclaim = -1;
-static int hf_afs_ubik_lowesthost = -1;
-static int hf_afs_ubik_lowesttime = -1;
-static int hf_afs_ubik_synchost = -1;
-static int hf_afs_ubik_synctime = -1;
-static int hf_afs_ubik_amsyncsite = -1;
-static int hf_afs_ubik_syncsiteuntil = -1;
-static int hf_afs_ubik_nservers = -1;
-static int hf_afs_ubik_lockedpages = -1;
-static int hf_afs_ubik_writelockedpages = -1;
-static int hf_afs_ubik_activewrite = -1;
-static int hf_afs_ubik_tidcounter = -1;
-static int hf_afs_ubik_anyreadlocks = -1;
-static int hf_afs_ubik_anywritelocks = -1;
-static int hf_afs_ubik_recoverystate = -1;
-static int hf_afs_ubik_currenttrans = -1;
-static int hf_afs_ubik_writetrans = -1;
-static int hf_afs_ubik_epochtime = -1;
-static int hf_afs_ubik_isclone = -1;
-static int hf_afs_ubik_addr = -1;
-static int hf_afs_ubik_lastvotetime = -1;
-static int hf_afs_ubik_lastbeaconsent = -1;
-static int hf_afs_ubik_lastvote = -1;
-static int hf_afs_ubik_currentdb = -1;
-static int hf_afs_ubik_beaconsincedown = -1;
-static int hf_afs_ubik_up = -1;
-static int hf_afs_repframe = -1;
-static int hf_afs_reqframe = -1;
-static int hf_afs_time = -1;
-
-static int hf_afs_fragments = -1;
-static int hf_afs_fragment = -1;
-static int hf_afs_fragment_overlap = -1;
-static int hf_afs_fragment_overlap_conflicts = -1;
-static int hf_afs_fragment_multiple_tails = -1;
-static int hf_afs_fragment_too_long_fragment = -1;
-static int hf_afs_fragment_error = -1;
-static int hf_afs_fragment_count = -1;
-static int hf_afs_reassembled_in = -1;
-static int hf_afs_reassembled_length = -1;
-
-static gint ett_afs = -1;
-static gint ett_afs_op = -1;
-static gint ett_afs_acl = -1;
-static gint ett_afs_fid = -1;
-static gint ett_afs_callback = -1;
-static gint ett_afs_ubikver = -1;
-static gint ett_afs_status = -1;
-static gint ett_afs_status_mask = -1;
-static gint ett_afs_volsync = -1;
-static gint ett_afs_volumeinfo = -1;
-static gint ett_afs_vicestat = -1;
-static gint ett_afs_vldb_flags = -1;
-
-static gint ett_afs_fragment = -1;
-static gint ett_afs_fragments = -1;
-static gint ett_afs_cm_interfaces = -1;
-static gint ett_afs_cm_capabilities = -1;
+static int proto_afs;
+static int hf_afs_fs;
+static int hf_afs_cb;
+static int hf_afs_prot;
+static int hf_afs_vldb;
+static int hf_afs_kauth;
+static int hf_afs_vol;
+static int hf_afs_error;
+static int hf_afs_bos;
+static int hf_afs_update;
+static int hf_afs_rmtsys;
+static int hf_afs_ubik;
+static int hf_afs_backup;
+static int hf_afs_butc;
+static int hf_afs_service;
+
+static int hf_afs_fs_opcode;
+static int hf_afs_cb_opcode;
+static int hf_afs_prot_opcode;
+static int hf_afs_vldb_opcode;
+static int hf_afs_kauth_opcode;
+static int hf_afs_vol_opcode;
+static int hf_afs_error_opcode;
+static int hf_afs_bos_opcode;
+static int hf_afs_update_opcode;
+static int hf_afs_rmtsys_opcode;
+static int hf_afs_ubik_opcode;
+static int hf_afs_backup_opcode;
+static int hf_afs_butc_opcode;
+
+static int hf_afs_fs_fid_volume;
+static int hf_afs_fs_fid_vnode;
+static int hf_afs_fs_fid_uniqifier;
+static int hf_afs_fs_offset;
+static int hf_afs_fs_length;
+static int hf_afs_fs_flength;
+static int hf_afs_fs_offset64;
+static int hf_afs_fs_length64;
+static int hf_afs_fs_flength64;
+static int hf_afs_fs_errcode;
+static int hf_afs_fs_data;
+static int hf_afs_fs_name;
+static int hf_afs_fs_oldname;
+static int hf_afs_fs_newname;
+static int hf_afs_fs_symlink_name;
+static int hf_afs_fs_symlink_content;
+static int hf_afs_fs_volid;
+static int hf_afs_fs_volname;
+static int hf_afs_fs_timestamp;
+static int hf_afs_fs_offlinemsg;
+static int hf_afs_fs_motd;
+static int hf_afs_fs_xstats_version;
+static int hf_afs_fs_xstats_timestamp;
+static int hf_afs_fs_xstats_clientversion;
+static int hf_afs_fs_xstats_collnumber;
+static int hf_afs_fs_cps_spare1;
+static int hf_afs_fs_cps_spare2;
+static int hf_afs_fs_cps_spare3;
+static int hf_afs_fs_vicelocktype;
+static int hf_afs_fs_viceid;
+static int hf_afs_fs_ipaddr;
+static int hf_afs_fs_token;
+
+static int hf_afs_fs_status_anonymousaccess;
+static int hf_afs_fs_status_author;
+static int hf_afs_fs_status_calleraccess;
+static int hf_afs_fs_status_clientmodtime;
+static int hf_afs_fs_status_dataversion;
+static int hf_afs_fs_status_dataversionhigh;
+static int hf_afs_fs_status_filetype;
+static int hf_afs_fs_status_group;
+static int hf_afs_fs_status_interfaceversion;
+static int hf_afs_fs_status_length;
+static int hf_afs_fs_status_linkcount;
+static int hf_afs_fs_status_mask;
+static int hf_afs_fs_status_mask_fsync;
+static int hf_afs_fs_status_mask_setgroup;
+static int hf_afs_fs_status_mask_setmode;
+static int hf_afs_fs_status_mask_setmodtime;
+static int hf_afs_fs_status_mask_setowner;
+static int hf_afs_fs_status_mask_setsegsize;
+static int hf_afs_fs_status_mode;
+static int hf_afs_fs_status_owner;
+static int hf_afs_fs_status_parentunique;
+static int hf_afs_fs_status_parentvnode;
+static int hf_afs_fs_status_segsize;
+static int hf_afs_fs_status_servermodtime;
+static int hf_afs_fs_status_spare2;
+static int hf_afs_fs_status_spare3;
+static int hf_afs_fs_status_spare4;
+static int hf_afs_fs_status_synccounter;
+
+static int hf_afs_fs_volsync_spare1;
+static int hf_afs_fs_volsync_spare2;
+static int hf_afs_fs_volsync_spare3;
+static int hf_afs_fs_volsync_spare4;
+static int hf_afs_fs_volsync_spare5;
+static int hf_afs_fs_volsync_spare6;
+
+static int hf_afs_fs_acl_datasize;
+static int hf_afs_fs_acl_count_negative;
+static int hf_afs_fs_acl_count_positive;
+static int hf_afs_fs_acl_entity;
+static int hf_afs_fs_acl_r;
+static int hf_afs_fs_acl_l;
+static int hf_afs_fs_acl_i;
+static int hf_afs_fs_acl_d;
+static int hf_afs_fs_acl_w;
+static int hf_afs_fs_acl_k;
+static int hf_afs_fs_acl_a;
+
+static int hf_afs_fs_callback_version;
+static int hf_afs_fs_callback_expires;
+static int hf_afs_fs_callback_type;
+
+static int hf_afs_bos_errcode;
+static int hf_afs_bos_type;
+static int hf_afs_bos_instance;
+static int hf_afs_bos_status;
+static int hf_afs_bos_statusdesc;
+static int hf_afs_bos_num;
+static int hf_afs_bos_size;
+static int hf_afs_bos_flags;
+static int hf_afs_bos_date;
+static int hf_afs_bos_content;
+static int hf_afs_bos_user;
+static int hf_afs_bos_key;
+static int hf_afs_bos_path;
+static int hf_afs_bos_file;
+static int hf_afs_bos_cmd;
+static int hf_afs_bos_error;
+static int hf_afs_bos_spare1;
+static int hf_afs_bos_spare2;
+static int hf_afs_bos_spare3;
+static int hf_afs_bos_parm;
+static int hf_afs_bos_kvno;
+static int hf_afs_bos_cell;
+static int hf_afs_bos_host;
+static int hf_afs_bos_newtime;
+static int hf_afs_bos_baktime;
+static int hf_afs_bos_oldtime;
+static int hf_afs_bos_data;
+static int hf_afs_bos_keymodtime;
+static int hf_afs_bos_keychecksum;
+static int hf_afs_bos_keyspare2;
+
+static int hf_afs_vldb_errcode;
+static int hf_afs_vldb_name;
+static int hf_afs_vldb_name_uint_string;
+static int hf_afs_vldb_id;
+static int hf_afs_vldb_type;
+static int hf_afs_vldb_bump;
+static int hf_afs_vldb_index;
+static int hf_afs_vldb_nextindex;
+static int hf_afs_vldb_count;
+static int hf_afs_vldb_numservers;
+static int hf_afs_vldb_server;
+static int hf_afs_vldb_serveruuid;
+static int hf_afs_vldb_serveruniq;
+static int hf_afs_vldb_serverflags;
+static int hf_afs_vldb_serverip;
+static int hf_afs_vldb_partition;
+static int hf_afs_vldb_rovol;
+static int hf_afs_vldb_rwvol;
+static int hf_afs_vldb_bkvol;
+static int hf_afs_vldb_clonevol;
+static int hf_afs_vldb_flags;
+static int hf_afs_vldb_flags_rwexists;
+static int hf_afs_vldb_flags_roexists;
+static int hf_afs_vldb_flags_bkexists;
+static int hf_afs_vldb_flags_dfsfileset;
+
+static int hf_afs_vldb_spare1;
+static int hf_afs_vldb_spare2;
+static int hf_afs_vldb_spare3;
+static int hf_afs_vldb_spare4;
+static int hf_afs_vldb_spare5;
+static int hf_afs_vldb_spare6;
+static int hf_afs_vldb_spare7;
+static int hf_afs_vldb_spare8;
+static int hf_afs_vldb_spare9;
+
+static int hf_afs_kauth_errcode;
+static int hf_afs_kauth_princ;
+static int hf_afs_kauth_realm;
+static int hf_afs_kauth_domain;
+static int hf_afs_kauth_kvno;
+static int hf_afs_kauth_name;
+static int hf_afs_kauth_data;
+
+static int hf_afs_vol_errcode;
+static int hf_afs_vol_count;
+static int hf_afs_vol_id;
+static int hf_afs_vol_name;
+
+static int hf_afs_cb_errcode;
+static int hf_afs_cb_callback_version;
+static int hf_afs_cb_callback_type;
+static int hf_afs_cb_callback_expires;
+static int hf_afs_cb_fid_volume;
+static int hf_afs_cb_fid_vnode;
+static int hf_afs_cb_fid_uniqifier;
+
+static int hf_afs_cm_uuid;
+static int hf_afs_cm_numint;
+static int hf_afs_cm_ipaddr;
+static int hf_afs_cm_netmask;
+static int hf_afs_cm_mtu;
+static int hf_afs_cm_numcap;
+static int hf_afs_cm_capabilities;
+static int hf_afs_cm_cap_errortrans;
+
+static int hf_afs_prot_errcode;
+static int hf_afs_prot_name;
+static int hf_afs_prot_name_uint_string;
+static int hf_afs_prot_id;
+static int hf_afs_prot_count;
+static int hf_afs_prot_oldid;
+static int hf_afs_prot_newid;
+static int hf_afs_prot_pos;
+static int hf_afs_prot_flag;
+static int hf_afs_prot_uid;
+static int hf_afs_prot_gid;
+static int hf_afs_prot_maxuid;
+static int hf_afs_prot_maxgid;
+
+static int hf_afs_backup_errcode;
+static int hf_afs_butc_errcode;
+
+/* static int hf_afs_ubik_errcode; */
+static int hf_afs_ubik_version_epoch;
+static int hf_afs_ubik_version_counter;
+static int hf_afs_ubik_votestart;
+static int hf_afs_ubik_state;
+static int hf_afs_ubik_site;
+static int hf_afs_ubik_interface;
+static int hf_afs_ubik_null_addresses;
+static int hf_afs_ubik_file;
+static int hf_afs_ubik_pos;
+static int hf_afs_ubik_length;
+static int hf_afs_ubik_locktype;
+/* static int hf_afs_ubik_voteend; */
+/* static int hf_afs_ubik_votetype; */
+
+static int hf_afs_ubik_now;
+static int hf_afs_ubik_lastyestime;
+static int hf_afs_ubik_lastyeshost;
+static int hf_afs_ubik_lastyesstate;
+static int hf_afs_ubik_lastyesclaim;
+static int hf_afs_ubik_lowesthost;
+static int hf_afs_ubik_lowesttime;
+static int hf_afs_ubik_synchost;
+static int hf_afs_ubik_synctime;
+static int hf_afs_ubik_amsyncsite;
+static int hf_afs_ubik_syncsiteuntil;
+static int hf_afs_ubik_nservers;
+static int hf_afs_ubik_lockedpages;
+static int hf_afs_ubik_writelockedpages;
+static int hf_afs_ubik_activewrite;
+static int hf_afs_ubik_tidcounter;
+static int hf_afs_ubik_anyreadlocks;
+static int hf_afs_ubik_anywritelocks;
+static int hf_afs_ubik_recoverystate;
+static int hf_afs_ubik_currenttrans;
+static int hf_afs_ubik_writetrans;
+static int hf_afs_ubik_epochtime;
+static int hf_afs_ubik_isclone;
+static int hf_afs_ubik_addr;
+static int hf_afs_ubik_lastvotetime;
+static int hf_afs_ubik_lastbeaconsent;
+static int hf_afs_ubik_lastvote;
+static int hf_afs_ubik_currentdb;
+static int hf_afs_ubik_beaconsincedown;
+static int hf_afs_ubik_up;
+static int hf_afs_repframe;
+static int hf_afs_reqframe;
+static int hf_afs_time;
+
+static int hf_afs_fragments;
+static int hf_afs_fragment;
+static int hf_afs_fragment_overlap;
+static int hf_afs_fragment_overlap_conflicts;
+static int hf_afs_fragment_multiple_tails;
+static int hf_afs_fragment_too_long_fragment;
+static int hf_afs_fragment_error;
+static int hf_afs_fragment_count;
+static int hf_afs_reassembled_in;
+static int hf_afs_reassembled_length;
+
+static gint ett_afs;
+static gint ett_afs_op;
+static gint ett_afs_acl;
+static gint ett_afs_fid;
+static gint ett_afs_callback;
+static gint ett_afs_ubikver;
+static gint ett_afs_status;
+static gint ett_afs_status_mask;
+static gint ett_afs_volsync;
+static gint ett_afs_volumeinfo;
+static gint ett_afs_vicestat;
+static gint ett_afs_vldb_flags;
+
+static gint ett_afs_fragment;
+static gint ett_afs_fragments;
+static gint ett_afs_cm_interfaces;
+static gint ett_afs_cm_capabilities;
 
 static const fragment_items afs_frag_items = {
 	/* Fragment subtrees */
diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c
index 17a3d314e7..6d160accef 100644
--- a/epan/dissectors/packet-agentx.c
+++ b/epan/dissectors/packet-agentx.c
@@ -27,71 +27,71 @@ void proto_reg_handoff_agentx(void);
 static dissector_handle_t agentx_handle;
 
 /* Define the agentx proto */
-static int proto_agentx = -1;
-
-
-static int hf_version = -1;
-static int hf_type   = -1;
-static int hf_flags  = -1;
-static int hf_flags_register  = -1;
-static int hf_flags_newindex  = -1;
-static int hf_flags_anyindex  = -1;
-static int hf_flags_context  = -1;
-static int hf_flags_byteorder  = -1;
-static int hf_session_id = -1;
-static int hf_trans_id = -1;
-static int hf_packet_id = -1;
-static int hf_payload_len = -1;
-static int hf_ostring_len = -1;
-static int hf_ostring  = -1;
-static int hf_oid_sub = -1;
-static int hf_oid_prefix = -1;
-static int hf_oid_include = -1;
-static int hf_oid_str = -1;
-static int hf_resp_uptime = -1;
-static int hf_resp_error = -1;
-static int hf_resp_index = -1;
-static int hf_vtag = -1;
-static int hf_val32 = -1;
-static int hf_val64 = -1;
-static int hf_open_timeout = -1;
-static int hf_close_reason = -1;
-static int hf_reg_timeout = -1;
-static int hf_reg_prio = -1;
-static int hf_reg_rsid = -1;
-static int hf_reg_ubound = -1;
-static int hf_unreg_timeout = -1;
-static int hf_unreg_prio = -1;
-static int hf_unreg_rsid = -1;
-static int hf_unreg_ubound = -1;
-static int hf_gbulk_nrepeat = -1;
-static int hf_gbulk_mrepeat = -1;
-
-
-static gint ett_flags = -1;
-static gint ett_agentx = -1;
-static gint ett_pdu_hdr = -1;
-static gint ett_get = -1;
-static gint ett_getnext = -1;
-static gint ett_search_range = -1;
-static gint ett_obj_ident = -1;
-static gint ett_response = -1;
-static gint ett_valrep = -1;
-static gint ett_open = -1;
-static gint ett_close = -1;
-static gint ett_register = -1;
-static gint ett_unregister = -1;
-static gint ett_getbulk = -1;
-static gint ett_testset = -1;
-static gint ett_commitset = -1;
-static gint ett_undoset = -1;
-static gint ett_cleanupset = -1;
-static gint ett_notify = -1;
-static gint ett_ping = -1;
-static gint ett_idxalloc = -1;
-static gint ett_idxdalloc = -1;
-static gint ett_addcap = -1;
-static gint ett_remcap = -1;
+static int proto_agentx;
+
+
+static int hf_version;
+static int hf_type;
+static int hf_flags;
+static int hf_flags_register;
+static int hf_flags_newindex;
+static int hf_flags_anyindex;
+static int hf_flags_context;
+static int hf_flags_byteorder;
+static int hf_session_id;
+static int hf_trans_id;
+static int hf_packet_id;
+static int hf_payload_len;
+static int hf_ostring_len;
+static int hf_ostring;
+static int hf_oid_sub;
+static int hf_oid_prefix;
+static int hf_oid_include;
+static int hf_oid_str;
+static int hf_resp_uptime;
+static int hf_resp_error;
+static int hf_resp_index;
+static int hf_vtag;
+static int hf_val32;
+static int hf_val64;
+static int hf_open_timeout;
+static int hf_close_reason;
+static int hf_reg_timeout;
+static int hf_reg_prio;
+static int hf_reg_rsid;
+static int hf_reg_ubound;
+static int hf_unreg_timeout;
+static int hf_unreg_prio;
+static int hf_unreg_rsid;
+static int hf_unreg_ubound;
+static int hf_gbulk_nrepeat;
+static int hf_gbulk_mrepeat;
+
+
+static gint ett_flags;
+static gint ett_agentx;
+static gint ett_pdu_hdr;
+static gint ett_get;
+static gint ett_getnext;
+static gint ett_search_range;
+static gint ett_obj_ident;
+static gint ett_response;
+static gint ett_valrep;
+static gint ett_open;
+static gint ett_close;
+static gint ett_register;
+static gint ett_unregister;
+static gint ett_getbulk;
+static gint ett_testset;
+static gint ett_commitset;
+static gint ett_undoset;
+static gint ett_cleanupset;
+static gint ett_notify;
+static gint ett_ping;
+static gint ett_idxalloc;
+static gint ett_idxdalloc;
+static gint ett_addcap;
+static gint ett_remcap;
 
 
 #define 	AGENTX_OPEN_PDU 		 1
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c
index 142b61b5f4..cdaad0af98 100644
--- a/epan/dissectors/packet-aim.c
+++ b/epan/dissectors/packet-aim.c
@@ -273,270 +273,270 @@ static int dissect_aim_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, pr
 static int dissect_aim_tlv_value_uint16(proto_item *ti, guint16, tvbuff_t *, packet_info *);
 
 
-static int proto_aim = -1;
-static int proto_aim_admin = -1;
-static int proto_aim_adverts = -1;
-static int proto_aim_bos = -1;
-static int proto_aim_buddylist = -1;
-static int proto_aim_chat = -1;
-static int proto_aim_chatnav = -1;
-static int proto_aim_directory = -1;
-static int proto_aim_email = -1;
-static int proto_aim_generic = -1;
-static int proto_aim_icq = -1;
-static int proto_aim_invitation = -1;
-static int proto_aim_location = -1;
-static int proto_aim_messaging = -1;
-static int proto_aim_popup = -1;
-static int proto_aim_signon = -1;
-static int proto_aim_ssi = -1;
-static int proto_aim_sst = -1;
-static int proto_aim_stats = -1;
-static int proto_aim_translate = -1;
-static int proto_aim_userlookup = -1;
-
-
-static int hf_aim_cmd_start = -1;
-static int hf_aim_channel = -1;
-static int hf_aim_seqno = -1;
-static int hf_aim_data = -1;
-static int hf_aim_data_len = -1;
-static int hf_aim_tlv_length = -1;
-static int hf_aim_tlv_value_id = -1;
-static int hf_aim_fnac_family = -1;
-static int hf_aim_fnac_subtype = -1;
-static int hf_aim_fnac_flags = -1;
-static int hf_aim_fnac_flag_next_is_related = -1;
-static int hf_aim_fnac_flag_contains_version = -1;
-static int hf_aim_fnac_id = -1;
-static int hf_aim_buddyname_len = -1;
-static int hf_aim_buddyname = -1;
-static int hf_aim_userinfo_warninglevel = -1;
-static int hf_aim_snac_error = -1;
-static int hf_aim_ssi_result_code = -1;
-static int hf_aim_tlvcount = -1;
-static int hf_aim_version = -1;
-static int hf_aim_userclass_unconfirmed = -1;
-static int hf_aim_userclass_administrator = -1;
-static int hf_aim_userclass_aol = -1;
-static int hf_aim_userclass_commercial = -1;
-static int hf_aim_userclass_aim = -1;
-static int hf_aim_userclass_away = -1;
-static int hf_aim_userclass_icq = -1;
-static int hf_aim_userclass_wireless = -1;
-static int hf_aim_userclass_unknown100 = -1;
-static int hf_aim_userclass_imf = -1;
-static int hf_aim_userclass_bot = -1;
-static int hf_aim_userclass_unknown800 = -1;
-static int hf_aim_userclass_one_way_wireless = -1;
-static int hf_aim_userclass_unknown2000 = -1;
-static int hf_aim_userclass_unknown4000 = -1;
-static int hf_aim_userclass_unknown8000 = -1;
-static int hf_aim_userclass_unknown10000 = -1;
-static int hf_aim_userclass_unknown20000 = -1;
-static int hf_aim_userclass_no_knock_knock = -1;
-static int hf_aim_userclass_forward_mobile = -1;
-static int hf_aim_nickinfo_caps = -1;
-static int hf_aim_nickinfo_short_caps = -1;
-static int hf_aim_messageblock_featuresdes = -1;
-static int hf_aim_messageblock_featureslen = -1;
-static int hf_aim_messageblock_features = -1;
-static int hf_aim_messageblock_info = -1;
-static int hf_aim_messageblock_len = -1;
-static int hf_aim_messageblock_charset = -1;
-static int hf_aim_messageblock_charsubset = -1;
-static int hf_aim_messageblock_message = -1;
-
-static int hf_aim_dcinfo_ip = -1;
-static int hf_aim_dcinfo_tcpport = -1;
-static int hf_aim_dcinfo_type = -1;
-static int hf_aim_dcinfo_proto_version = -1;
-static int hf_aim_dcinfo_auth_cookie = -1;
-static int hf_aim_dcinfo_webport = -1;
-static int hf_aim_dcinfo_client_future = -1;
-static int hf_aim_dcinfo_last_info_update = -1;
-static int hf_aim_dcinfo_last_ext_info_update = -1;
-static int hf_aim_dcinfo_last_ext_status_update = -1;
-static int hf_aim_dcinfo_unknown = -1;
-static int hf_aim_string08 = -1;
-
-static int hf_admin_acctinfo_code = -1;
-static int hf_admin_acctinfo_unknown = -1;
-static int hf_admin_acctinfo_permissions = -1;
-static int hf_admin_confirm_status = -1;
-
-/* static int hf_aim_bos_data = -1; */
-static int hf_aim_bos_class = -1;
-
-static int hf_aim_buddylist_userinfo_warninglevel = -1;
-
-static int hf_aim_chat_screen_name = -1;
-
-static int hf_generic_motd_motdtype = -1;
-static int hf_generic_family = -1;
-static int hf_generic_version = -1;
-static int hf_generic_dll_version = -1;
-static int hf_generic_servicereq_service = -1;
-static int hf_generic_rateinfo_numclasses = -1;
-static int hf_generic_rateinfo_windowsize = -1;
-static int hf_generic_rateinfo_clearlevel = -1;
-static int hf_generic_rateinfo_alertlevel = -1;
-static int hf_generic_rateinfo_limitlevel = -1;
-static int hf_generic_rateinfo_disconnectlevel = -1;
-static int hf_generic_rateinfo_currentlevel = -1;
-static int hf_generic_rateinfo_maxlevel = -1;
-static int hf_generic_rateinfo_lasttime = -1;
-static int hf_generic_rateinfo_curstate = -1;
-static int hf_generic_rateinfo_classid = -1;
-static int hf_generic_rateinfo_numpairs = -1;
-static int hf_generic_rateinfoack_group = -1;
-static int hf_generic_ratechange_msg    = -1;
-static int hf_generic_migration_numfams  = -1;
-static int hf_generic_priv_flags = -1;
-static int hf_generic_allow_idle_see = -1;
-static int hf_generic_allow_member_see = -1;
-static int hf_generic_selfinfo_warninglevel = -1;
-static int hf_generic_evil_new_warn_level = -1;
-static int hf_generic_idle_time = -1;
-static int hf_generic_client_ver_req_offset = -1;
-static int hf_generic_client_ver_req_length = -1;
-static int hf_generic_client_ver_req_hash = -1;
-static int hf_generic_ext_status_type = -1;
-static int hf_generic_ext_status_length = -1;
-static int hf_generic_ext_status_flags = -1;
-static int hf_generic_ext_status_data = -1;
-
-static int hf_icq_tlv_data_chunk_size = -1;
-static int hf_icq_tlv_request_owner_uid = -1;
-static int hf_icq_tlv_request_type = -1;
-static int hf_icq_meta_subtype = -1;
-static int hf_icq_tlv_request_seq_num = -1;
-static int hf_icq_dropped_msg_flag = -1;
-
-static int hf_aim_snac_location_request_user_info_infotype = -1;
-static int hf_aim_location_userinfo_warninglevel = -1;
-static int hf_aim_location_buddyname_len = -1;
-static int hf_aim_location_buddyname = -1;
-
-static int hf_aim_icbm_channel = -1;
-static int hf_aim_icbm_cookie = -1;
-static int hf_aim_icbm_msg_flags = -1;
-static int hf_aim_icbm_max_sender_warnlevel = -1;
-static int hf_aim_icbm_max_receiver_warnlevel = -1;
-static int hf_aim_icbm_max_snac_size = -1;
-static int hf_aim_icbm_min_msg_interval = -1;
-static int hf_aim_icbm_notification_cookie = -1;
-static int hf_aim_icbm_notification_channel = -1;
-static int hf_aim_icbm_notification_type = -1;
-static int hf_aim_icbm_rendezvous_nak = -1;
-static int hf_aim_icbm_rendezvous_nak_length = -1;
-static int hf_aim_message_channel_id = -1;
-static int hf_aim_icbm_evil = -1;
-static int hf_aim_evil_warn_level = -1;
-static int hf_aim_evil_new_warn_level = -1;
-static int hf_aim_rendezvous_msg_type = -1;
-static int hf_aim_icbm_client_err_reason = -1;
-static int hf_aim_icbm_client_err_protocol_version = -1;
-static int hf_aim_icbm_client_err_client_caps_flags = -1;
-static int hf_aim_rendezvous_extended_data_message_type = -1;
-static int hf_aim_rendezvous_extended_data_message_flags = -1;
-static int hf_aim_rendezvous_extended_data_message_flags_normal = -1;
-static int hf_aim_rendezvous_extended_data_message_flags_auto = -1;
-static int hf_aim_rendezvous_extended_data_message_flags_multi = -1;
-static int hf_aim_rendezvous_extended_data_message_status_code = -1;
-static int hf_aim_rendezvous_extended_data_message_priority_code = -1;
-static int hf_aim_rendezvous_extended_data_message_text_length = -1;
-static int hf_aim_rendezvous_extended_data_message_text = -1;
-
-static int hf_aim_messaging_plugin = -1;
-static int hf_aim_icbm_client_err_length = -1;
-static int hf_aim_messaging_unknown_uint8 = -1;
-static int hf_aim_messaging_unknown_uint16 = -1;
-static int hf_aim_icbm_client_err_downcounter = -1;
-static int hf_aim_messaging_unknown_data = -1;
-static int hf_aim_messaging_plugin_specific_data = -1;
-
-static int hf_aim_infotype = -1;
-static int hf_aim_signon_challenge_len = -1;
-static int hf_aim_signon_challenge = -1;
-
-static int hf_aim_fnac_subtype_ssi_version = -1;
-static int hf_aim_fnac_subtype_ssi_numitems = -1;
-static int hf_aim_fnac_subtype_ssi_last_change_time = -1;
-static int hf_aim_fnac_subtype_ssi_buddyname_len = -1;
-static int hf_aim_fnac_subtype_ssi_buddyname_len8 = -1;
-static int hf_aim_fnac_subtype_ssi_buddyname = -1;
-static int hf_aim_fnac_subtype_ssi_gid = -1;
-static int hf_aim_fnac_subtype_ssi_bid = -1;
-static int hf_aim_fnac_subtype_ssi_type = -1;
-static int hf_aim_fnac_subtype_ssi_tlvlen = -1;
-/* static int hf_aim_fnac_subtype_ssi_data = -1; */
-static int hf_aim_fnac_subtype_ssi_reason_str_len = -1;
-static int hf_aim_fnac_subtype_ssi_reason_str = -1;
-static int hf_aim_fnac_subtype_ssi_grant_auth_unkn = -1;
-static int hf_aim_fnac_subtype_ssi_allow_auth = -1;
-
-static int hf_aim_sst_unknown = -1;
-static int hf_aim_sst_md5_hash = -1;
-static int hf_aim_sst_md5_hash_size = -1;
-static int hf_aim_sst_ref_num = -1;
-static int hf_aim_sst_icon_size = -1;
-static int hf_aim_sst_icon = -1;
-
-static int hf_aim_userlookup_email = -1;
+static int proto_aim;
+static int proto_aim_admin;
+static int proto_aim_adverts;
+static int proto_aim_bos;
+static int proto_aim_buddylist;
+static int proto_aim_chat;
+static int proto_aim_chatnav;
+static int proto_aim_directory;
+static int proto_aim_email;
+static int proto_aim_generic;
+static int proto_aim_icq;
+static int proto_aim_invitation;
+static int proto_aim_location;
+static int proto_aim_messaging;
+static int proto_aim_popup;
+static int proto_aim_signon;
+static int proto_aim_ssi;
+static int proto_aim_sst;
+static int proto_aim_stats;
+static int proto_aim_translate;
+static int proto_aim_userlookup;
+
+
+static int hf_aim_cmd_start;
+static int hf_aim_channel;
+static int hf_aim_seqno;
+static int hf_aim_data;
+static int hf_aim_data_len;
+static int hf_aim_tlv_length;
+static int hf_aim_tlv_value_id;
+static int hf_aim_fnac_family;
+static int hf_aim_fnac_subtype;
+static int hf_aim_fnac_flags;
+static int hf_aim_fnac_flag_next_is_related;
+static int hf_aim_fnac_flag_contains_version;
+static int hf_aim_fnac_id;
+static int hf_aim_buddyname_len;
+static int hf_aim_buddyname;
+static int hf_aim_userinfo_warninglevel;
+static int hf_aim_snac_error;
+static int hf_aim_ssi_result_code;
+static int hf_aim_tlvcount;
+static int hf_aim_version;
+static int hf_aim_userclass_unconfirmed;
+static int hf_aim_userclass_administrator;
+static int hf_aim_userclass_aol;
+static int hf_aim_userclass_commercial;
+static int hf_aim_userclass_aim;
+static int hf_aim_userclass_away;
+static int hf_aim_userclass_icq;
+static int hf_aim_userclass_wireless;
+static int hf_aim_userclass_unknown100;
+static int hf_aim_userclass_imf;
+static int hf_aim_userclass_bot;
+static int hf_aim_userclass_unknown800;
+static int hf_aim_userclass_one_way_wireless;
+static int hf_aim_userclass_unknown2000;
+static int hf_aim_userclass_unknown4000;
+static int hf_aim_userclass_unknown8000;
+static int hf_aim_userclass_unknown10000;
+static int hf_aim_userclass_unknown20000;
+static int hf_aim_userclass_no_knock_knock;
+static int hf_aim_userclass_forward_mobile;
+static int hf_aim_nickinfo_caps;
+static int hf_aim_nickinfo_short_caps;
+static int hf_aim_messageblock_featuresdes;
+static int hf_aim_messageblock_featureslen;
+static int hf_aim_messageblock_features;
+static int hf_aim_messageblock_info;
+static int hf_aim_messageblock_len;
+static int hf_aim_messageblock_charset;
+static int hf_aim_messageblock_charsubset;
+static int hf_aim_messageblock_message;
+
+static int hf_aim_dcinfo_ip;
+static int hf_aim_dcinfo_tcpport;
+static int hf_aim_dcinfo_type;
+static int hf_aim_dcinfo_proto_version;
+static int hf_aim_dcinfo_auth_cookie;
+static int hf_aim_dcinfo_webport;
+static int hf_aim_dcinfo_client_future;
+static int hf_aim_dcinfo_last_info_update;
+static int hf_aim_dcinfo_last_ext_info_update;
+static int hf_aim_dcinfo_last_ext_status_update;
+static int hf_aim_dcinfo_unknown;
+static int hf_aim_string08;
+
+static int hf_admin_acctinfo_code;
+static int hf_admin_acctinfo_unknown;
+static int hf_admin_acctinfo_permissions;
+static int hf_admin_confirm_status;
+
+/* static int hf_aim_bos_data; */
+static int hf_aim_bos_class;
+
+static int hf_aim_buddylist_userinfo_warninglevel;
+
+static int hf_aim_chat_screen_name;
+
+static int hf_generic_motd_motdtype;
+static int hf_generic_family;
+static int hf_generic_version;
+static int hf_generic_dll_version;
+static int hf_generic_servicereq_service;
+static int hf_generic_rateinfo_numclasses;
+static int hf_generic_rateinfo_windowsize;
+static int hf_generic_rateinfo_clearlevel;
+static int hf_generic_rateinfo_alertlevel;
+static int hf_generic_rateinfo_limitlevel;
+static int hf_generic_rateinfo_disconnectlevel;
+static int hf_generic_rateinfo_currentlevel;
+static int hf_generic_rateinfo_maxlevel;
+static int hf_generic_rateinfo_lasttime;
+static int hf_generic_rateinfo_curstate;
+static int hf_generic_rateinfo_classid;
+static int hf_generic_rateinfo_numpairs;
+static int hf_generic_rateinfoack_group;
+static int hf_generic_ratechange_msg;
+static int hf_generic_migration_numfams;
+static int hf_generic_priv_flags;
+static int hf_generic_allow_idle_see;
+static int hf_generic_allow_member_see;
+static int hf_generic_selfinfo_warninglevel;
+static int hf_generic_evil_new_warn_level;
+static int hf_generic_idle_time;
+static int hf_generic_client_ver_req_offset;
+static int hf_generic_client_ver_req_length;
+static int hf_generic_client_ver_req_hash;
+static int hf_generic_ext_status_type;
+static int hf_generic_ext_status_length;
+static int hf_generic_ext_status_flags;
+static int hf_generic_ext_status_data;
+
+static int hf_icq_tlv_data_chunk_size;
+static int hf_icq_tlv_request_owner_uid;
+static int hf_icq_tlv_request_type;
+static int hf_icq_meta_subtype;
+static int hf_icq_tlv_request_seq_num;
+static int hf_icq_dropped_msg_flag;
+
+static int hf_aim_snac_location_request_user_info_infotype;
+static int hf_aim_location_userinfo_warninglevel;
+static int hf_aim_location_buddyname_len;
+static int hf_aim_location_buddyname;
+
+static int hf_aim_icbm_channel;
+static int hf_aim_icbm_cookie;
+static int hf_aim_icbm_msg_flags;
+static int hf_aim_icbm_max_sender_warnlevel;
+static int hf_aim_icbm_max_receiver_warnlevel;
+static int hf_aim_icbm_max_snac_size;
+static int hf_aim_icbm_min_msg_interval;
+static int hf_aim_icbm_notification_cookie;
+static int hf_aim_icbm_notification_channel;
+static int hf_aim_icbm_notification_type;
+static int hf_aim_icbm_rendezvous_nak;
+static int hf_aim_icbm_rendezvous_nak_length;
+static int hf_aim_message_channel_id;
+static int hf_aim_icbm_evil;
+static int hf_aim_evil_warn_level;
+static int hf_aim_evil_new_warn_level;
+static int hf_aim_rendezvous_msg_type;
+static int hf_aim_icbm_client_err_reason;
+static int hf_aim_icbm_client_err_protocol_version;
+static int hf_aim_icbm_client_err_client_caps_flags;
+static int hf_aim_rendezvous_extended_data_message_type;
+static int hf_aim_rendezvous_extended_data_message_flags;
+static int hf_aim_rendezvous_extended_data_message_flags_normal;
+static int hf_aim_rendezvous_extended_data_message_flags_auto;
+static int hf_aim_rendezvous_extended_data_message_flags_multi;
+static int hf_aim_rendezvous_extended_data_message_status_code;
+static int hf_aim_rendezvous_extended_data_message_priority_code;
+static int hf_aim_rendezvous_extended_data_message_text_length;
+static int hf_aim_rendezvous_extended_data_message_text;
+
+static int hf_aim_messaging_plugin;
+static int hf_aim_icbm_client_err_length;
+static int hf_aim_messaging_unknown_uint8;
+static int hf_aim_messaging_unknown_uint16;
+static int hf_aim_icbm_client_err_downcounter;
+static int hf_aim_messaging_unknown_data;
+static int hf_aim_messaging_plugin_specific_data;
+
+static int hf_aim_infotype;
+static int hf_aim_signon_challenge_len;
+static int hf_aim_signon_challenge;
+
+static int hf_aim_fnac_subtype_ssi_version;
+static int hf_aim_fnac_subtype_ssi_numitems;
+static int hf_aim_fnac_subtype_ssi_last_change_time;
+static int hf_aim_fnac_subtype_ssi_buddyname_len;
+static int hf_aim_fnac_subtype_ssi_buddyname_len8;
+static int hf_aim_fnac_subtype_ssi_buddyname;
+static int hf_aim_fnac_subtype_ssi_gid;
+static int hf_aim_fnac_subtype_ssi_bid;
+static int hf_aim_fnac_subtype_ssi_type;
+static int hf_aim_fnac_subtype_ssi_tlvlen;
+/* static int hf_aim_fnac_subtype_ssi_data; */
+static int hf_aim_fnac_subtype_ssi_reason_str_len;
+static int hf_aim_fnac_subtype_ssi_reason_str;
+static int hf_aim_fnac_subtype_ssi_grant_auth_unkn;
+static int hf_aim_fnac_subtype_ssi_allow_auth;
+
+static int hf_aim_sst_unknown;
+static int hf_aim_sst_md5_hash;
+static int hf_aim_sst_md5_hash_size;
+static int hf_aim_sst_ref_num;
+static int hf_aim_sst_icon_size;
+static int hf_aim_sst_icon;
+
+static int hf_aim_userlookup_email;
 
 /* Initialize the subtree pointers */
-static gint ett_aim                     = -1;
-static gint ett_aim_dcinfo              = -1;
-static gint ett_aim_buddyname           = -1;
-static gint ett_aim_fnac                = -1;
-static gint ett_aim_fnac_flags          = -1;
-static gint ett_aim_tlv                 = -1;
-static gint ett_aim_tlv_value           = -1;
-static gint ett_aim_userclass           = -1;
-static gint ett_aim_messageblock        = -1;
-static gint ett_aim_nickinfo_caps       = -1;
-static gint ett_aim_nickinfo_short_caps = -1;
-static gint ett_aim_string08_array      = -1;
-
-static gint ett_aim_admin               = -1;
-static gint ett_aim_adverts             = -1;
-static gint ett_aim_bos                 = -1;
-static gint ett_aim_buddylist           = -1;
-static gint ett_aim_chat                = -1;
-static gint ett_aim_chatnav             = -1;
-static gint ett_aim_directory           = -1;
-static gint ett_aim_email               = -1;
-
-static gint ett_generic_clientready     = -1;
-static gint ett_generic_migratefamilies = -1;
-static gint ett_generic_clientready_item= -1;
-static gint ett_generic_serverready     = -1;
-static gint ett_generic                 = -1;
-static gint ett_generic_priv_flags      = -1;
-static gint ett_generic_rateinfo_class  = -1;
-static gint ett_generic_rateinfo_classes= -1;
-static gint ett_generic_rateinfo_groups = -1;
-static gint ett_generic_rateinfo_group  = -1;
-
-static gint ett_aim_invitation          = -1;
-static gint ett_aim_icq                 = -1;
-static gint ett_aim_icq_tlv             = -1;
-static gint ett_aim_location            = -1;
-static gint ett_aim_messaging           = -1;
-static gint ett_aim_rendezvous_data     = -1;
-static gint ett_aim_extended_data       = -1;
-static gint ett_aim_extended_data_message_flags = -1;
-static gint ett_aim_popup               = -1;
-static gint ett_aim_signon              = -1;
-static gint ett_aim_ssi                 = -1;
-static gint ett_ssi                     = -1;
-static gint ett_aim_sst                 = -1;
-static gint ett_aim_stats               = -1;
-static gint ett_aim_translate           = -1;
-static gint ett_aim_userlookup          = -1;
-
-static expert_field ei_aim_messageblock_len = EI_INIT;
+static gint ett_aim;
+static gint ett_aim_dcinfo;
+static gint ett_aim_buddyname;
+static gint ett_aim_fnac;
+static gint ett_aim_fnac_flags;
+static gint ett_aim_tlv;
+static gint ett_aim_tlv_value;
+static gint ett_aim_userclass;
+static gint ett_aim_messageblock;
+static gint ett_aim_nickinfo_caps;
+static gint ett_aim_nickinfo_short_caps;
+static gint ett_aim_string08_array;
+
+static gint ett_aim_admin;
+static gint ett_aim_adverts;
+static gint ett_aim_bos;
+static gint ett_aim_buddylist;
+static gint ett_aim_chat;
+static gint ett_aim_chatnav;
+static gint ett_aim_directory;
+static gint ett_aim_email;
+
+static gint ett_generic_clientready;
+static gint ett_generic_migratefamilies;
+static gint ett_generic_clientready_item;
+static gint ett_generic_serverready;
+static gint ett_generic;
+static gint ett_generic_priv_flags;
+static gint ett_generic_rateinfo_class;
+static gint ett_generic_rateinfo_classes;
+static gint ett_generic_rateinfo_groups;
+static gint ett_generic_rateinfo_group;
+
+static gint ett_aim_invitation;
+static gint ett_aim_icq;
+static gint ett_aim_icq_tlv;
+static gint ett_aim_location;
+static gint ett_aim_messaging;
+static gint ett_aim_rendezvous_data;
+static gint ett_aim_extended_data;
+static gint ett_aim_extended_data_message_flags;
+static gint ett_aim_popup;
+static gint ett_aim_signon;
+static gint ett_aim_ssi;
+static gint ett_ssi;
+static gint ett_aim_sst;
+static gint ett_aim_stats;
+static gint ett_aim_translate;
+static gint ett_aim_userlookup;
+
+static expert_field ei_aim_messageblock_len;
 
 /* desegmentation of AIM over TCP */
 static gboolean aim_desegment = TRUE;
diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c
index 2b87801f0e..2b4a90f3f4 100644
--- a/epan/dissectors/packet-ajp13.c
+++ b/epan/dissectors/packet-ajp13.c
@@ -156,74 +156,74 @@ static const value_string http_method_codes[] = {
 
 
 
-static int proto_ajp13     = -1;
-static int hf_ajp13_magic  = -1;
-static int hf_ajp13_len    = -1;
-static int hf_ajp13_code   = -1;
-static int hf_ajp13_method = -1;
-static int hf_ajp13_ver    = -1;
-static int hf_ajp13_uri    = -1;
-static int hf_ajp13_raddr  = -1;
-static int hf_ajp13_rhost  = -1;
-static int hf_ajp13_srv    = -1;
-static int hf_ajp13_port   = -1;
-static int hf_ajp13_sslp   = -1;
-static int hf_ajp13_nhdr   = -1;
+static int proto_ajp13;
+static int hf_ajp13_magic;
+static int hf_ajp13_len;
+static int hf_ajp13_code;
+static int hf_ajp13_method;
+static int hf_ajp13_ver;
+static int hf_ajp13_uri;
+static int hf_ajp13_raddr;
+static int hf_ajp13_rhost;
+static int hf_ajp13_srv;
+static int hf_ajp13_port;
+static int hf_ajp13_sslp;
+static int hf_ajp13_nhdr;
 
 /* response headers */
-static int hf_ajp13_unknown_header    = -1;
-static int hf_ajp13_content_type      = -1;
-static int hf_ajp13_content_language  = -1;
-static int hf_ajp13_content_length    = -1;
-static int hf_ajp13_date              = -1;
-static int hf_ajp13_last_modified     = -1;
-static int hf_ajp13_location          = -1;
-static int hf_ajp13_set_cookie        = -1;
-static int hf_ajp13_set_cookie2       = -1;
-static int hf_ajp13_servlet_engine    = -1;
-static int hf_ajp13_status            = -1;
-static int hf_ajp13_www_authenticate  = -1;
+static int hf_ajp13_unknown_header;
+static int hf_ajp13_content_type;
+static int hf_ajp13_content_language;
+static int hf_ajp13_content_length;
+static int hf_ajp13_date;
+static int hf_ajp13_last_modified;
+static int hf_ajp13_location;
+static int hf_ajp13_set_cookie;
+static int hf_ajp13_set_cookie2;
+static int hf_ajp13_servlet_engine;
+static int hf_ajp13_status;
+static int hf_ajp13_www_authenticate;
 
 /* request headers */
-static int hf_ajp13_accept            = -1;
-static int hf_ajp13_accept_charset    = -1;
-static int hf_ajp13_accept_encoding   = -1;
-static int hf_ajp13_accept_language   = -1;
-static int hf_ajp13_authorization     = -1;
-static int hf_ajp13_connection        = -1;
+static int hf_ajp13_accept;
+static int hf_ajp13_accept_charset;
+static int hf_ajp13_accept_encoding;
+static int hf_ajp13_accept_language;
+static int hf_ajp13_authorization;
+static int hf_ajp13_connection;
                  /* content_type   */
                  /* content_length */
-static int hf_ajp13_cookie            = -1;
-static int hf_ajp13_cookie2           = -1;
-static int hf_ajp13_host              = -1;
-static int hf_ajp13_pragma            = -1;
-static int hf_ajp13_referer           = -1;
-static int hf_ajp13_user_agent        = -1;
+static int hf_ajp13_cookie;
+static int hf_ajp13_cookie2;
+static int hf_ajp13_host;
+static int hf_ajp13_pragma;
+static int hf_ajp13_referer;
+static int hf_ajp13_user_agent;
 
 /* request attributes */
-static int hf_ajp13_unknown_attribute     = -1;
-static int hf_ajp13_req_attribute         = -1;
-static int hf_ajp13_context               = -1;
-static int hf_ajp13_servlet_path          = -1;
-static int hf_ajp13_remote_user           = -1;
-static int hf_ajp13_auth_type             = -1;
-static int hf_ajp13_query_string          = -1;
-static int hf_ajp13_route                 = -1;
-static int hf_ajp13_ssl_cert              = -1;
-static int hf_ajp13_ssl_cipher            = -1;
-static int hf_ajp13_ssl_session           = -1;
-static int hf_ajp13_ssl_key_size          = -1;
-static int hf_ajp13_secret                = -1;
-static int hf_ajp13_stored_method         = -1;
-
-static int hf_ajp13_rlen   = -1;
-static int hf_ajp13_reusep = -1;
-static int hf_ajp13_rstatus= -1;
-static int hf_ajp13_rsmsg  = -1;
-static int hf_ajp13_data   = -1;
-static gint ett_ajp13 = -1;
-
-static expert_field ei_ajp13_content_length_invalid = EI_INIT;
+static int hf_ajp13_unknown_attribute;
+static int hf_ajp13_req_attribute;
+static int hf_ajp13_context;
+static int hf_ajp13_servlet_path;
+static int hf_ajp13_remote_user;
+static int hf_ajp13_auth_type;
+static int hf_ajp13_query_string;
+static int hf_ajp13_route;
+static int hf_ajp13_ssl_cert;
+static int hf_ajp13_ssl_cipher;
+static int hf_ajp13_ssl_session;
+static int hf_ajp13_ssl_key_size;
+static int hf_ajp13_secret;
+static int hf_ajp13_stored_method;
+
+static int hf_ajp13_rlen;
+static int hf_ajp13_reusep;
+static int hf_ajp13_rstatus;
+static int hf_ajp13_rsmsg;
+static int hf_ajp13_data;
+static gint ett_ajp13;
+
+static expert_field ei_ajp13_content_length_invalid;
 
 /*
  * Request/response header codes. Common headers are stored as ints in
diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c
index b20813e65d..eb97b11cde 100644
--- a/epan/dissectors/packet-alcap.c
+++ b/epan/dissectors/packet-alcap.c
@@ -190,216 +190,216 @@ static const value_string all_cids_vals[] = {
 };
 
 /* Initialize the subtree pointers */
-static gint ett_alcap = -1;
-static gint ett_leg = -1;
-static gint ett_compat = -1;
-static gint ett_cau_diag = -1;
+static gint ett_alcap;
+static gint ett_leg;
+static gint ett_compat;
+static gint ett_cau_diag;
 
 /* Initialize the protocol and registered fields */
-static int proto_alcap = -1;
-
-static int hf_alcap_dsaid = -1;
-static int hf_alcap_msg_id = -1;
-static int hf_alcap_compat = -1;
-static int hf_alcap_compat_pass_on_sni = -1;
-static int hf_alcap_compat_pass_on_ii = -1;
-static int hf_alcap_compat_general_sni = -1;
-static int hf_alcap_compat_general_ii = -1;
-
-static int hf_alcap_param_id = -1;
-static int hf_alcap_param_len = -1;
-
-static int hf_alcap_unknown = -1;
-
-static int hf_alcap_cau_coding = -1;
-static int hf_alcap_cau_value_itu = -1;
-static int hf_alcap_cau_value_non_itu = -1;
-static int hf_alcap_cau_diag = -1;
-static int hf_alcap_cau_diag_len = -1;
-static int hf_alcap_cau_diag_msg = -1;
-static int hf_alcap_cau_diag_param_id = -1;
-static int hf_alcap_cau_diag_field_num = -1;
-
-static int hf_alcap_ceid_pathid = -1;
-static int hf_alcap_ceid_cid = -1;
-
-static int hf_alcap_dnsea = -1;
-
-static int hf_alcap_alc_max_br_fw = -1;
-static int hf_alcap_alc_max_br_bw = -1;
-static int hf_alcap_alc_avg_br_fw = -1;
-static int hf_alcap_alc_avg_br_bw = -1;
-static int hf_alcap_alc_max_sdu_fw = -1;
-static int hf_alcap_alc_max_sdu_bw = -1;
-static int hf_alcap_alc_avg_sdu_fw = -1;
-static int hf_alcap_alc_avg_sdu_bw = -1;
-
-static int hf_alcap_osaid = -1;
-
-static int hf_alcap_sugr = -1;
-
-static int hf_alcap_sut_len = -1;
-static int hf_alcap_sut = -1;
-
-static int hf_alcap_ssia_pr_type = -1;
-static int hf_alcap_ssia_pr_id = -1;
-static int hf_alcap_ssia_frm = -1;
-static int hf_alcap_ssia_cmd = -1;
-static int hf_alcap_ssia_mfr2 = -1;
-static int hf_alcap_ssia_mfr1 = -1;
-static int hf_alcap_ssia_dtmf = -1;
-static int hf_alcap_ssia_cas = -1;
-static int hf_alcap_ssia_fax = -1;
-static int hf_alcap_ssia_pcm = -1;
-static int hf_alcap_ssia_max_len = -1;
-static int hf_alcap_ssia_oui = -1;
-
-static int hf_alcap_ssim_frm = -1;
-static int hf_alcap_ssim_mult = -1;
-static int hf_alcap_ssim_max = -1;
-
-static int hf_alcap_ssisa_max_sssar_fw = -1;
-static int hf_alcap_ssisa_max_sssar_bw = -1;
-static int hf_alcap_ssisa_max_sscop_sdu_fw = -1;
-static int hf_alcap_ssisa_max_sscop_sdu_bw = -1;
-static int hf_alcap_ssisa_max_sscop_uu_fw = -1;
-static int hf_alcap_ssisa_max_sscop_uu_bw = -1;
-
-static int hf_alcap_ssisu_max_sssar_fw = -1;
-static int hf_alcap_ssisu_max_sssar_bw = -1;
-static int hf_alcap_ssisu_ted = -1;
-
-static int hf_alcap_pt = -1;
-
-static int hf_alcap_plc_max_br_fw = -1;
-static int hf_alcap_plc_max_br_bw = -1;
-static int hf_alcap_plc_avg_br_fw = -1;
-static int hf_alcap_plc_avg_br_bw = -1;
-static int hf_alcap_plc_max_sdu_fw = -1;
-static int hf_alcap_plc_max_sdu_bw = -1;
-static int hf_alcap_plc_avg_sdu_fw = -1;
-static int hf_alcap_plc_avg_sdu_bw = -1;
-
-static int hf_alcap_pssiae_pr_type = -1;
-static int hf_alcap_pssiae_pr_id = -1;
-static int hf_alcap_pssiae_lb = -1;
-static int hf_alcap_pssiae_rc = -1;
-static int hf_alcap_pssiae_syn = -1;
-static int hf_alcap_pssiae_frm = -1;
-static int hf_alcap_pssiae_cmd = -1;
-static int hf_alcap_pssiae_mfr2 = -1;
-static int hf_alcap_pssiae_mfr1 = -1;
-static int hf_alcap_pssiae_dtmf = -1;
-static int hf_alcap_pssiae_cas = -1;
-static int hf_alcap_pssiae_fax = -1;
-static int hf_alcap_pssiae_pcm = -1;
-static int hf_alcap_pssiae_max_len = -1;
-static int hf_alcap_pssiae_oui = -1;
-
-static int hf_alcap_pssime_frm = -1;
-static int hf_alcap_pssime_lb = -1;
-static int hf_alcap_pssime_mult = -1;
-static int hf_alcap_pssime_max = -1;
-
-static int hf_alcap_suci = -1;
-
-static int hf_alcap_onsea = -1;
-
-static int hf_alcap_ssiae_pr_type = -1;
-static int hf_alcap_ssiae_pr_id = -1;
-static int hf_alcap_ssiae_lb = -1;
-static int hf_alcap_ssiae_rc = -1;
-static int hf_alcap_ssiae_syn = -1;
-static int hf_alcap_ssiae_frm = -1;
-static int hf_alcap_ssiae_cmd = -1;
-static int hf_alcap_ssiae_mfr2 = -1;
-static int hf_alcap_ssiae_mfr1 = -1;
-static int hf_alcap_ssiae_dtmf = -1;
-static int hf_alcap_ssiae_cas = -1;
-static int hf_alcap_ssiae_fax = -1;
-static int hf_alcap_ssiae_pcm = -1;
-static int hf_alcap_ssiae_max_len = -1;
-static int hf_alcap_ssiae_oui = -1;
-
-static int hf_alcap_ssime_frm = -1;
-static int hf_alcap_ssime_lb = -1;
-static int hf_alcap_ssime_mult = -1;
-static int hf_alcap_ssime_max = -1;
-
-static int hf_alcap_acc_level = -1;
-
-static int hf_alcap_cp = -1;
-
-static int hf_alcap_hc = -1;
-
-static int hf_alcap_pfbw_br_fw = -1;
-static int hf_alcap_pfbw_br_bw = -1;
-static int hf_alcap_pfbw_bucket_fw = -1;
-static int hf_alcap_pfbw_bucket_bw = -1;
-static int hf_alcap_pfbw_size_fw = -1;
-static int hf_alcap_pfbw_size_bw = -1;
-
-static int hf_alcap_pvbws_br_fw = -1;
-static int hf_alcap_pvbws_br_bw = -1;
-static int hf_alcap_pvbws_bucket_fw = -1;
-static int hf_alcap_pvbws_bucket_bw = -1;
-static int hf_alcap_pvbws_size_fw = -1;
-static int hf_alcap_pvbws_size_bw = -1;
-static int hf_alcap_pvbws_stt = -1;
-
-static int hf_alcap_pvbwt_peak_br_fw = -1;
-static int hf_alcap_pvbwt_peak_br_bw = -1;
-static int hf_alcap_pvbwt_peak_bucket_fw = -1;
-static int hf_alcap_pvbwt_peak_bucket_bw = -1;
-static int hf_alcap_pvbwt_sust_br_fw = -1;
-static int hf_alcap_pvbwt_sust_br_bw = -1;
-static int hf_alcap_pvbwt_sust_bucket_fw = -1;
-static int hf_alcap_pvbwt_sust_bucket_bw = -1;
-static int hf_alcap_pvbwt_size_fw = -1;
-static int hf_alcap_pvbwt_size_bw = -1;
-
-static int hf_alcap_fbw_br_fw = -1;
-static int hf_alcap_fbw_br_bw = -1;
-static int hf_alcap_fbw_bucket_fw = -1;
-static int hf_alcap_fbw_bucket_bw = -1;
-static int hf_alcap_fbw_size_fw = -1;
-static int hf_alcap_fbw_size_bw = -1;
-
-static int hf_alcap_vbws_br_fw = -1;
-static int hf_alcap_vbws_br_bw = -1;
-static int hf_alcap_vbws_bucket_fw = -1;
-static int hf_alcap_vbws_bucket_bw = -1;
-static int hf_alcap_vbws_size_fw = -1;
-static int hf_alcap_vbws_size_bw = -1;
-static int hf_alcap_vbws_stt = -1;
-
-static int hf_alcap_vbwt_peak_br_fw = -1;
-static int hf_alcap_vbwt_peak_br_bw = -1;
-static int hf_alcap_vbwt_peak_bucket_fw = -1;
-static int hf_alcap_vbwt_peak_bucket_bw = -1;
-static int hf_alcap_vbwt_sust_br_fw = -1;
-static int hf_alcap_vbwt_sust_br_bw = -1;
-static int hf_alcap_vbwt_sust_bucket_fw = -1;
-static int hf_alcap_vbwt_sust_bucket_bw = -1;
-static int hf_alcap_vbwt_size_fw = -1;
-static int hf_alcap_vbwt_size_bw = -1;
-
-
-static int hf_alcap_leg_osaid = -1;
-static int hf_alcap_leg_dsaid = -1;
-static int hf_alcap_leg_pathid = -1;
-static int hf_alcap_leg_cid = -1;
-static int hf_alcap_leg_sugr = -1;
-static int hf_alcap_leg_dnsea = -1;
-static int hf_alcap_leg_onsea = -1;
-static int hf_alcap_leg_frame = -1;
-static int hf_alcap_leg_release_cause = -1;
-
-static expert_field ei_alcap_parameter_field_bad_length = EI_INIT;
-static expert_field ei_alcap_undecoded = EI_INIT;
-static expert_field ei_alcap_release_cause_not31 = EI_INIT;
-static expert_field ei_alcap_abnormal_release = EI_INIT;
-static expert_field ei_alcap_response = EI_INIT;
+static int proto_alcap;
+
+static int hf_alcap_dsaid;
+static int hf_alcap_msg_id;
+static int hf_alcap_compat;
+static int hf_alcap_compat_pass_on_sni;
+static int hf_alcap_compat_pass_on_ii;
+static int hf_alcap_compat_general_sni;
+static int hf_alcap_compat_general_ii;
+
+static int hf_alcap_param_id;
+static int hf_alcap_param_len;
+
+static int hf_alcap_unknown;
+
+static int hf_alcap_cau_coding;
+static int hf_alcap_cau_value_itu;
+static int hf_alcap_cau_value_non_itu;
+static int hf_alcap_cau_diag;
+static int hf_alcap_cau_diag_len;
+static int hf_alcap_cau_diag_msg;
+static int hf_alcap_cau_diag_param_id;
+static int hf_alcap_cau_diag_field_num;
+
+static int hf_alcap_ceid_pathid;
+static int hf_alcap_ceid_cid;
+
+static int hf_alcap_dnsea;
+
+static int hf_alcap_alc_max_br_fw;
+static int hf_alcap_alc_max_br_bw;
+static int hf_alcap_alc_avg_br_fw;
+static int hf_alcap_alc_avg_br_bw;
+static int hf_alcap_alc_max_sdu_fw;
+static int hf_alcap_alc_max_sdu_bw;
+static int hf_alcap_alc_avg_sdu_fw;
+static int hf_alcap_alc_avg_sdu_bw;
+
+static int hf_alcap_osaid;
+
+static int hf_alcap_sugr;
+
+static int hf_alcap_sut_len;
+static int hf_alcap_sut;
+
+static int hf_alcap_ssia_pr_type;
+static int hf_alcap_ssia_pr_id;
+static int hf_alcap_ssia_frm;
+static int hf_alcap_ssia_cmd;
+static int hf_alcap_ssia_mfr2;
+static int hf_alcap_ssia_mfr1;
+static int hf_alcap_ssia_dtmf;
+static int hf_alcap_ssia_cas;
+static int hf_alcap_ssia_fax;
+static int hf_alcap_ssia_pcm;
+static int hf_alcap_ssia_max_len;
+static int hf_alcap_ssia_oui;
+
+static int hf_alcap_ssim_frm;
+static int hf_alcap_ssim_mult;
+static int hf_alcap_ssim_max;
+
+static int hf_alcap_ssisa_max_sssar_fw;
+static int hf_alcap_ssisa_max_sssar_bw;
+static int hf_alcap_ssisa_max_sscop_sdu_fw;
+static int hf_alcap_ssisa_max_sscop_sdu_bw;
+static int hf_alcap_ssisa_max_sscop_uu_fw;
+static int hf_alcap_ssisa_max_sscop_uu_bw;
+
+static int hf_alcap_ssisu_max_sssar_fw;
+static int hf_alcap_ssisu_max_sssar_bw;
+static int hf_alcap_ssisu_ted;
+
+static int hf_alcap_pt;
+
+static int hf_alcap_plc_max_br_fw;
+static int hf_alcap_plc_max_br_bw;
+static int hf_alcap_plc_avg_br_fw;
+static int hf_alcap_plc_avg_br_bw;
+static int hf_alcap_plc_max_sdu_fw;
+static int hf_alcap_plc_max_sdu_bw;
+static int hf_alcap_plc_avg_sdu_fw;
+static int hf_alcap_plc_avg_sdu_bw;
+
+static int hf_alcap_pssiae_pr_type;
+static int hf_alcap_pssiae_pr_id;
+static int hf_alcap_pssiae_lb;
+static int hf_alcap_pssiae_rc;
+static int hf_alcap_pssiae_syn;
+static int hf_alcap_pssiae_frm;
+static int hf_alcap_pssiae_cmd;
+static int hf_alcap_pssiae_mfr2;
+static int hf_alcap_pssiae_mfr1;
+static int hf_alcap_pssiae_dtmf;
+static int hf_alcap_pssiae_cas;
+static int hf_alcap_pssiae_fax;
+static int hf_alcap_pssiae_pcm;
+static int hf_alcap_pssiae_max_len;
+static int hf_alcap_pssiae_oui;
+
+static int hf_alcap_pssime_frm;
+static int hf_alcap_pssime_lb;
+static int hf_alcap_pssime_mult;
+static int hf_alcap_pssime_max;
+
+static int hf_alcap_suci;
+
+static int hf_alcap_onsea;
+
+static int hf_alcap_ssiae_pr_type;
+static int hf_alcap_ssiae_pr_id;
+static int hf_alcap_ssiae_lb;
+static int hf_alcap_ssiae_rc;
+static int hf_alcap_ssiae_syn;
+static int hf_alcap_ssiae_frm;
+static int hf_alcap_ssiae_cmd;
+static int hf_alcap_ssiae_mfr2;
+static int hf_alcap_ssiae_mfr1;
+static int hf_alcap_ssiae_dtmf;
+static int hf_alcap_ssiae_cas;
+static int hf_alcap_ssiae_fax;
+static int hf_alcap_ssiae_pcm;
+static int hf_alcap_ssiae_max_len;
+static int hf_alcap_ssiae_oui;
+
+static int hf_alcap_ssime_frm;
+static int hf_alcap_ssime_lb;
+static int hf_alcap_ssime_mult;
+static int hf_alcap_ssime_max;
+
+static int hf_alcap_acc_level;
+
+static int hf_alcap_cp;
+
+static int hf_alcap_hc;
+
+static int hf_alcap_pfbw_br_fw;
+static int hf_alcap_pfbw_br_bw;
+static int hf_alcap_pfbw_bucket_fw;
+static int hf_alcap_pfbw_bucket_bw;
+static int hf_alcap_pfbw_size_fw;
+static int hf_alcap_pfbw_size_bw;
+
+static int hf_alcap_pvbws_br_fw;
+static int hf_alcap_pvbws_br_bw;
+static int hf_alcap_pvbws_bucket_fw;
+static int hf_alcap_pvbws_bucket_bw;
+static int hf_alcap_pvbws_size_fw;
+static int hf_alcap_pvbws_size_bw;
+static int hf_alcap_pvbws_stt;
+
+static int hf_alcap_pvbwt_peak_br_fw;
+static int hf_alcap_pvbwt_peak_br_bw;
+static int hf_alcap_pvbwt_peak_bucket_fw;
+static int hf_alcap_pvbwt_peak_bucket_bw;
+static int hf_alcap_pvbwt_sust_br_fw;
+static int hf_alcap_pvbwt_sust_br_bw;
+static int hf_alcap_pvbwt_sust_bucket_fw;
+static int hf_alcap_pvbwt_sust_bucket_bw;
+static int hf_alcap_pvbwt_size_fw;
+static int hf_alcap_pvbwt_size_bw;
+
+static int hf_alcap_fbw_br_fw;
+static int hf_alcap_fbw_br_bw;
+static int hf_alcap_fbw_bucket_fw;
+static int hf_alcap_fbw_bucket_bw;
+static int hf_alcap_fbw_size_fw;
+static int hf_alcap_fbw_size_bw;
+
+static int hf_alcap_vbws_br_fw;
+static int hf_alcap_vbws_br_bw;
+static int hf_alcap_vbws_bucket_fw;
+static int hf_alcap_vbws_bucket_bw;
+static int hf_alcap_vbws_size_fw;
+static int hf_alcap_vbws_size_bw;
+static int hf_alcap_vbws_stt;
+
+static int hf_alcap_vbwt_peak_br_fw;
+static int hf_alcap_vbwt_peak_br_bw;
+static int hf_alcap_vbwt_peak_bucket_fw;
+static int hf_alcap_vbwt_peak_bucket_bw;
+static int hf_alcap_vbwt_sust_br_fw;
+static int hf_alcap_vbwt_sust_br_bw;
+static int hf_alcap_vbwt_sust_bucket_fw;
+static int hf_alcap_vbwt_sust_bucket_bw;
+static int hf_alcap_vbwt_size_fw;
+static int hf_alcap_vbwt_size_bw;
+
+
+static int hf_alcap_leg_osaid;
+static int hf_alcap_leg_dsaid;
+static int hf_alcap_leg_pathid;
+static int hf_alcap_leg_cid;
+static int hf_alcap_leg_sugr;
+static int hf_alcap_leg_dnsea;
+static int hf_alcap_leg_onsea;
+static int hf_alcap_leg_frame;
+static int hf_alcap_leg_release_cause;
+
+static expert_field ei_alcap_parameter_field_bad_length;
+static expert_field ei_alcap_undecoded;
+static expert_field ei_alcap_release_cause_not31;
+static expert_field ei_alcap_abnormal_release;
+static expert_field ei_alcap_response;
 
 static dissector_handle_t alcap_handle = NULL;
 
diff --git a/epan/dissectors/packet-alljoyn.c b/epan/dissectors/packet-alljoyn.c
index 8dee1bff58..02960c10d0 100644
--- a/epan/dissectors/packet-alljoyn.c
+++ b/epan/dissectors/packet-alljoyn.c
@@ -34,57 +34,57 @@ static dissector_handle_t alljoyn_handle_ardp;
    registered in proto_register_AllJoyn() with a call to
    proto_register_protocol().
 */
-static int proto_AllJoyn_mess = -1; /* The top level. Entire AllJoyn message protocol. */
+static int proto_AllJoyn_mess; /* The top level. Entire AllJoyn message protocol. */
 
 /* These are Wireshark header fields. You can search/filter on these values. */
 /* The initial byte sent when first connecting. */
-static int hf_alljoyn_connect_byte_value = -1;
+static int hf_alljoyn_connect_byte_value;
 
 /* SASL fields. */
-static int hf_alljoyn_sasl_command = -1;
-static int hf_alljoyn_sasl_parameter = -1;
+static int hf_alljoyn_sasl_command;
+static int hf_alljoyn_sasl_parameter;
 /* Message header fields.
 See http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-messages
 for details. */
-static int hf_alljoyn_mess_header = -1;              /* The complete header. */
-static int hf_alljoyn_mess_header_endian = -1;       /* 1st byte. */
-static int hf_alljoyn_mess_header_type = -1;         /* 2nd byte. */
-static int hf_alljoyn_mess_header_flags = -1;        /* 3rd byte. */
-static int hf_alljoyn_mess_header_majorversion = -1; /* 4th byte. */
-static int hf_alljoyn_mess_header_body_length = -1;  /* 1st uint32. */
-static int hf_alljoyn_mess_header_serial = -1;       /* 2nd uint32. */
-static int hf_alljoyn_mess_header_header_length = -1;/* 3rd uint32. AllJoyn extension. */
-
-static int hf_alljoyn_mess_header_flags_no_reply = -1;          /* Part of 3rd byte. */
-static int hf_alljoyn_mess_header_flags_no_auto_start = -1;     /* Part of 3rd byte. */
-static int hf_alljoyn_mess_header_flags_allow_remote_msg = -1;  /* Part of 3rd byte. */
-static int hf_alljoyn_mess_header_flags_sessionless = -1;       /* Part of 3rd byte. */
-static int hf_alljoyn_mess_header_flags_global_broadcast = -1;  /* Part of 3rd byte. */
-static int hf_alljoyn_mess_header_flags_compressed = -1;        /* Part of 3rd byte. */
-static int hf_alljoyn_mess_header_flags_encrypted = -1;         /* Part of 3rd byte. */
-static int hf_alljoyn_mess_header_field = -1;
-static int hf_alljoyn_mess_header_fields = -1;
-static int hf_alljoyn_mess_body_header_fieldcode = -1;
-static int hf_alljoyn_mess_body_header_typeid = -1;
-static int hf_alljoyn_mess_body_array = -1;
-static int hf_alljoyn_mess_body_structure = -1;
-static int hf_alljoyn_mess_body_dictionary_entry = -1;
-static int hf_alljoyn_mess_body_parameters = -1;
-static int hf_alljoyn_mess_body_variant = -1;
-static int hf_alljoyn_mess_body_signature = -1;
-static int hf_alljoyn_mess_body_signature_length = -1;
-
-static int hf_alljoyn_boolean = -1;
-static int hf_alljoyn_uint8 = -1;
-static int hf_alljoyn_int16 = -1;
-static int hf_alljoyn_uint16 = -1;
-static int hf_alljoyn_int32 = -1;
-static int hf_alljoyn_handle = -1;
-static int hf_alljoyn_uint32 = -1;
-static int hf_alljoyn_int64 = -1;
-static int hf_alljoyn_uint64 = -1;
-static int hf_alljoyn_double = -1;
-static int hf_padding = -1;         /* Some fields are padded to an even number of 2, 4, or 8 bytes. */
+static int hf_alljoyn_mess_header;              /* The complete header. */
+static int hf_alljoyn_mess_header_endian;       /* 1st byte. */
+static int hf_alljoyn_mess_header_type;         /* 2nd byte. */
+static int hf_alljoyn_mess_header_flags;        /* 3rd byte. */
+static int hf_alljoyn_mess_header_majorversion; /* 4th byte. */
+static int hf_alljoyn_mess_header_body_length;  /* 1st uint32. */
+static int hf_alljoyn_mess_header_serial;       /* 2nd uint32. */
+static int hf_alljoyn_mess_header_header_length;/* 3rd uint32. AllJoyn extension. */
+
+static int hf_alljoyn_mess_header_flags_no_reply;          /* Part of 3rd byte. */
+static int hf_alljoyn_mess_header_flags_no_auto_start;     /* Part of 3rd byte. */
+static int hf_alljoyn_mess_header_flags_allow_remote_msg;  /* Part of 3rd byte. */
+static int hf_alljoyn_mess_header_flags_sessionless;       /* Part of 3rd byte. */
+static int hf_alljoyn_mess_header_flags_global_broadcast;  /* Part of 3rd byte. */
+static int hf_alljoyn_mess_header_flags_compressed;        /* Part of 3rd byte. */
+static int hf_alljoyn_mess_header_flags_encrypted;         /* Part of 3rd byte. */
+static int hf_alljoyn_mess_header_field;
+static int hf_alljoyn_mess_header_fields;
+static int hf_alljoyn_mess_body_header_fieldcode;
+static int hf_alljoyn_mess_body_header_typeid;
+static int hf_alljoyn_mess_body_array;
+static int hf_alljoyn_mess_body_structure;
+static int hf_alljoyn_mess_body_dictionary_entry;
+static int hf_alljoyn_mess_body_parameters;
+static int hf_alljoyn_mess_body_variant;
+static int hf_alljoyn_mess_body_signature;
+static int hf_alljoyn_mess_body_signature_length;
+
+static int hf_alljoyn_boolean;
+static int hf_alljoyn_uint8;
+static int hf_alljoyn_int16;
+static int hf_alljoyn_uint16;
+static int hf_alljoyn_int32;
+static int hf_alljoyn_handle;
+static int hf_alljoyn_uint32;
+static int hf_alljoyn_int64;
+static int hf_alljoyn_uint64;
+static int hf_alljoyn_double;
+static int hf_padding;         /* Some fields are padded to an even number of 2, 4, or 8 bytes. */
 
 #define MESSAGE_HEADER_FLAG_NO_REPLY_EXPECTED 0x01
 #define MESSAGE_HEADER_FLAG_NO_AUTO_START     0x02
@@ -95,18 +95,18 @@ static int hf_padding = -1;         /* Some fields are padded to an even number
 #define MESSAGE_HEADER_FLAG_ENCRYPTED         0x80
 
 /* Protocol identifiers. */
-static int proto_AllJoyn_ns = -1;  /* The top level. Entire AllJoyn Name Service protocol. */
+static int proto_AllJoyn_ns;  /* The top level. Entire AllJoyn Name Service protocol. */
 
-static int hf_alljoyn_answer = -1;
-static int hf_alljoyn_isat_entry = -1;
-static int hf_alljoyn_isat_guid_string = -1;
+static int hf_alljoyn_answer;
+static int hf_alljoyn_isat_entry;
+static int hf_alljoyn_isat_guid_string;
 
-static int hf_alljoyn_ns_header = -1;
-static int hf_alljoyn_ns_sender_version = -1;
-static int hf_alljoyn_ns_message_version = -1;
-static int hf_alljoyn_ns_questions = -1;
-static int hf_alljoyn_ns_answers = -1;
-static int hf_alljoyn_ns_timer = -1;
+static int hf_alljoyn_ns_header;
+static int hf_alljoyn_ns_sender_version;
+static int hf_alljoyn_ns_message_version;
+static int hf_alljoyn_ns_questions;
+static int hf_alljoyn_ns_answers;
+static int hf_alljoyn_ns_timer;
 
 /* These are bit masks for version 0 "who has" records. */
 /* These bits are deprecated and do not exist for version 1. */
@@ -115,14 +115,14 @@ static int hf_alljoyn_ns_timer = -1;
 #define WHOHAS_S 0x02
 #define WHOHAS_F 0x01
 
-static int hf_alljoyn_ns_whohas = -1;
-static int hf_alljoyn_ns_whohas_t_flag = -1;   /* 0x8 -- TCP  */
-static int hf_alljoyn_ns_whohas_u_flag = -1;   /* 0x4 -- UDP  */
-static int hf_alljoyn_ns_whohas_s_flag = -1;   /* 0x2 -- IPV6 */
-static int hf_alljoyn_ns_whohas_f_flag = -1;   /* 0x1 -- IPV4 */
+static int hf_alljoyn_ns_whohas;
+static int hf_alljoyn_ns_whohas_t_flag;   /* 0x8 -- TCP  */
+static int hf_alljoyn_ns_whohas_u_flag;   /* 0x4 -- UDP  */
+static int hf_alljoyn_ns_whohas_s_flag;   /* 0x2 -- IPV6 */
+static int hf_alljoyn_ns_whohas_f_flag;   /* 0x1 -- IPV4 */
 /* End of version 0 bit masks. */
 
-static int hf_alljoyn_ns_whohas_count = -1;    /* octet count of bus names */
+static int hf_alljoyn_ns_whohas_count;    /* octet count of bus names */
 
 /* Bitmasks common to v0 and v1 IS-AT messages. */
 #define ISAT_C 0x10
@@ -150,43 +150,43 @@ static int hf_alljoyn_ns_whohas_count = -1;    /* octet count of bus names */
 #define TRANSPORT_WFD       0x0080  /* Transport using Wi-Fi Direct transport. */
 
 /* Tree indexes common to v0 and v1 IS-AT messages. */
-static int hf_alljoyn_ns_isat_g_flag = -1;     /* 0x20 -- GUID present */
-static int hf_alljoyn_ns_isat_c_flag = -1;     /* 0x10 -- Complete */
+static int hf_alljoyn_ns_isat_g_flag;     /* 0x20 -- GUID present */
+static int hf_alljoyn_ns_isat_c_flag;     /* 0x10 -- Complete */
 
 /* Tree indexes for v0 IS-AT messages. */
-static int hf_alljoyn_ns_isat_t_flag = -1;     /* 0x8 -- TCP */
-static int hf_alljoyn_ns_isat_u_flag = -1;     /* 0x4 -- UDP */
-static int hf_alljoyn_ns_isat_s_flag = -1;     /* 0x2 -- IPV6 */
-static int hf_alljoyn_ns_isat_f_flag = -1;     /* 0x1 -- IPV4 */
-static int hf_alljoyn_ns_isat_count = -1;      /* octet count of bus names */
-static int hf_alljoyn_ns_isat_port = -1;       /* two octets of port number */
-static int hf_alljoyn_ns_isat_ipv4 = -1;       /* four octets of IPv4 address */
-static int hf_alljoyn_ns_isat_ipv6 = -1;       /* sixteen octets of IPv6 address */
+static int hf_alljoyn_ns_isat_t_flag;     /* 0x8 -- TCP */
+static int hf_alljoyn_ns_isat_u_flag;     /* 0x4 -- UDP */
+static int hf_alljoyn_ns_isat_s_flag;     /* 0x2 -- IPV6 */
+static int hf_alljoyn_ns_isat_f_flag;     /* 0x1 -- IPV4 */
+static int hf_alljoyn_ns_isat_count;      /* octet count of bus names */
+static int hf_alljoyn_ns_isat_port;       /* two octets of port number */
+static int hf_alljoyn_ns_isat_ipv4;       /* four octets of IPv4 address */
+static int hf_alljoyn_ns_isat_ipv6;       /* sixteen octets of IPv6 address */
 
 /* Tree indexes for v1 IS-AT messages. */
-static int hf_alljoyn_ns_isat_u6_flag = -1;    /* 0x8 -- UDP IPV6 */
-static int hf_alljoyn_ns_isat_r6_flag = -1;    /* 0x4 -- TCP IPV6 */
-static int hf_alljoyn_ns_isat_u4_flag = -1;    /* 0x2 -- UDP IPV4 */
-static int hf_alljoyn_ns_isat_r4_flag = -1;    /* 0x1 -- TCP IPV4 */
+static int hf_alljoyn_ns_isat_u6_flag;    /* 0x8 -- UDP IPV6 */
+static int hf_alljoyn_ns_isat_r6_flag;    /* 0x4 -- TCP IPV6 */
+static int hf_alljoyn_ns_isat_u4_flag;    /* 0x2 -- UDP IPV4 */
+static int hf_alljoyn_ns_isat_r4_flag;    /* 0x1 -- TCP IPV4 */
 
-static int hf_alljoyn_ns_isat_transport_mask = -1; /* All bits of the transport mask. */
+static int hf_alljoyn_ns_isat_transport_mask; /* All bits of the transport mask. */
 
 /* Individual bits of the mask. */
-static int hf_alljoyn_ns_isat_transport_mask_local = -1;    /* Local (same device) transport */
-static int hf_alljoyn_ns_isat_transport_mask_bluetooth = -1;/* Bluetooth transport */
-static int hf_alljoyn_ns_isat_transport_mask_tcp = -1;      /* Transport using TCP (same as TRANSPORT_WLAN) */
-static int hf_alljoyn_ns_isat_transport_mask_wwan = -1;     /* Wireless wide-area network transport */
-static int hf_alljoyn_ns_isat_transport_mask_lan = -1;      /* Wired local-area network transport */
-static int hf_alljoyn_ns_isat_transport_mask_ice = -1;      /* Transport using ICE protocol */
-static int hf_alljoyn_ns_isat_transport_mask_wfd = -1;      /* Transport using Wi-Fi Direct transport */
-
-static int hf_alljoyn_string = -1;
-static int hf_alljoyn_string_size_8bit = -1;    /* 8-bit size of string */
-static int hf_alljoyn_string_size_32bit = -1;   /* 32-bit size of string */
-static int hf_alljoyn_string_data = -1;         /* string characters */
+static int hf_alljoyn_ns_isat_transport_mask_local;    /* Local (same device) transport */
+static int hf_alljoyn_ns_isat_transport_mask_bluetooth;/* Bluetooth transport */
+static int hf_alljoyn_ns_isat_transport_mask_tcp;      /* Transport using TCP (same as TRANSPORT_WLAN) */
+static int hf_alljoyn_ns_isat_transport_mask_wwan;     /* Wireless wide-area network transport */
+static int hf_alljoyn_ns_isat_transport_mask_lan;      /* Wired local-area network transport */
+static int hf_alljoyn_ns_isat_transport_mask_ice;      /* Transport using ICE protocol */
+static int hf_alljoyn_ns_isat_transport_mask_wfd;      /* Transport using Wi-Fi Direct transport */
+
+static int hf_alljoyn_string;
+static int hf_alljoyn_string_size_8bit;    /* 8-bit size of string */
+static int hf_alljoyn_string_size_32bit;   /* 32-bit size of string */
+static int hf_alljoyn_string_data;         /* string characters */
 
 /* Protocol identifiers. */
-static int proto_AllJoyn_ardp = -1;  /* The top level. Entire AllJoyn Reliable Datagram Protocol. */
+static int proto_AllJoyn_ardp;  /* The top level. Entire AllJoyn Reliable Datagram Protocol. */
 
 #define ARDP_SYN_FIXED_HDR_LEN  28 /* Size of the fixed part for the ARDP connection packet header. */
 #define ARDP_FIXED_HDR_LEN      34 /* Size of the fixed part for the ARDP header. */
@@ -205,50 +205,50 @@ static int proto_AllJoyn_ardp = -1;  /* The top level. Entire AllJoyn Reliable D
 #define ARDP_VER1 0x80
 #define ARDP_VER (ARDP_VER0 | ARDP_VER1)
 
-static int hf_ardp_syn_flag = -1;       /* 0x01 -- SYN */
-static int hf_ardp_ack_flag = -1;       /* 0x02 -- ACK */
-static int hf_ardp_eak_flag = -1;       /* 0x04 -- EAK */
-static int hf_ardp_rst_flag = -1;       /* 0x08 -- RST */
-static int hf_ardp_nul_flag = -1;       /* 0x10 -- NUL */
-static int hf_ardp_unused_flag = -1;    /* 0x20 -- UNUSED */
-static int hf_ardp_version_field = -1;  /* 0xc0 */
-
-static int hf_ardp_hlen = -1;   /* header length */
-static int hf_ardp_src = -1;    /* source port */
-static int hf_ardp_dst = -1;    /* destination port */
-static int hf_ardp_dlen = -1;   /* data length */
-static int hf_ardp_seq = -1;    /* sequence number */
-static int hf_ardp_ack = -1;    /* acknowledge number */
-static int hf_ardp_ttl = -1;    /* time to live (ms) */
-static int hf_ardp_lcs = -1;    /* last consumed sequence number */
-static int hf_ardp_nsa = -1;    /* next sequence to ack */
-static int hf_ardp_fss = -1;    /* fragment starting sequence number */
-static int hf_ardp_fcnt = -1;   /* fragment count */
-static int hf_ardp_bmp = -1;    /* EACK bitmap */
-static int hf_ardp_segmax = -1; /* The maximum number of outstanding segments the other side can send without acknowledgment. */
-static int hf_ardp_segbmax = -1;/* The maximum segment size we are willing to receive. */
-static int hf_ardp_dackt = -1;  /* Receiver's delayed ACK timeout. Used in TTL estimate prior to sending a message. */
-static int hf_ardp_options = -1;/* Options for the connection. Always Sequenced Delivery Mode (SDM). */
-
-static expert_field ei_alljoyn_empty_arg = EI_INIT;
+static int hf_ardp_syn_flag;       /* 0x01 -- SYN */
+static int hf_ardp_ack_flag;       /* 0x02 -- ACK */
+static int hf_ardp_eak_flag;       /* 0x04 -- EAK */
+static int hf_ardp_rst_flag;       /* 0x08 -- RST */
+static int hf_ardp_nul_flag;       /* 0x10 -- NUL */
+static int hf_ardp_unused_flag;    /* 0x20 -- UNUSED */
+static int hf_ardp_version_field;  /* 0xc0 */
+
+static int hf_ardp_hlen;   /* header length */
+static int hf_ardp_src;    /* source port */
+static int hf_ardp_dst;    /* destination port */
+static int hf_ardp_dlen;   /* data length */
+static int hf_ardp_seq;    /* sequence number */
+static int hf_ardp_ack;    /* acknowledge number */
+static int hf_ardp_ttl;    /* time to live (ms) */
+static int hf_ardp_lcs;    /* last consumed sequence number */
+static int hf_ardp_nsa;    /* next sequence to ack */
+static int hf_ardp_fss;    /* fragment starting sequence number */
+static int hf_ardp_fcnt;   /* fragment count */
+static int hf_ardp_bmp;    /* EACK bitmap */
+static int hf_ardp_segmax; /* The maximum number of outstanding segments the other side can send without acknowledgment. */
+static int hf_ardp_segbmax;/* The maximum segment size we are willing to receive. */
+static int hf_ardp_dackt;  /* Receiver's delayed ACK timeout. Used in TTL estimate prior to sending a message. */
+static int hf_ardp_options;/* Options for the connection. Always Sequenced Delivery Mode (SDM). */
+
+static expert_field ei_alljoyn_empty_arg;
 
 /* These are the ids of the subtrees we will be creating */
-static gint ett_alljoyn_ns = -1;    /* This is the top NS tree. */
-static gint ett_alljoyn_ns_header = -1;
-static gint ett_alljoyn_ns_answers = -1;
-static gint ett_alljoyn_ns_guid_string = -1;
-static gint ett_alljoyn_ns_isat_entry = -1;
-static gint ett_alljoyn_ns_string = -1;
-static gint ett_alljoyn_whohas = -1;
-static gint ett_alljoyn_string = -1;
-static gint ett_alljoyn_isat_entry = -1;
-static gint ett_alljoyn_mess = -1;  /* This is the top message tree. */
-static gint ett_alljoyn_header = -1;
-static gint ett_alljoyn_header_flags = -1;
-static gint ett_alljoyn_mess_header_field = -1;
-static gint ett_alljoyn_mess_header = -1;
-static gint ett_alljoyn_mess_body_parameters = -1;
-static gint ett_alljoyn_ardp = -1;  /* This is the top ARDP tree. */
+static gint ett_alljoyn_ns;    /* This is the top NS tree. */
+static gint ett_alljoyn_ns_header;
+static gint ett_alljoyn_ns_answers;
+static gint ett_alljoyn_ns_guid_string;
+static gint ett_alljoyn_ns_isat_entry;
+static gint ett_alljoyn_ns_string;
+static gint ett_alljoyn_whohas;
+static gint ett_alljoyn_string;
+static gint ett_alljoyn_isat_entry;
+static gint ett_alljoyn_mess;  /* This is the top message tree. */
+static gint ett_alljoyn_header;
+static gint ett_alljoyn_header_flags;
+static gint ett_alljoyn_mess_header_field;
+static gint ett_alljoyn_mess_header;
+static gint ett_alljoyn_mess_body_parameters;
+static gint ett_alljoyn_ardp;  /* This is the top ARDP tree. */
 
 #define ROUND_TO_2BYTE(len) WS_ROUNDUP_2(len)
 #define ROUND_TO_4BYTE(len) WS_ROUNDUP_4(len)
diff --git a/epan/dissectors/packet-alp.c b/epan/dissectors/packet-alp.c
index 149de7fa2c..b3cabb0e98 100644
--- a/epan/dissectors/packet-alp.c
+++ b/epan/dissectors/packet-alp.c
@@ -22,20 +22,20 @@
 void proto_reg_handoff_alp(void);
 void proto_register_alp(void);
 
-static int proto_alp = -1;
-static gint ett_alp = -1;
-static gint ett_alp_si = -1;
-static gint ett_alp_he = -1;
-static gint ett_alp_sig_info = -1;
-static gint ett_alp_lmt = -1;
-static gint ett_alp_lmt_plp = -1;
-static gint ett_alp_lmt_plp_mc = -1;
+static int proto_alp;
+static gint ett_alp;
+static gint ett_alp_si;
+static gint ett_alp_he;
+static gint ett_alp_sig_info;
+static gint ett_alp_lmt;
+static gint ett_alp_lmt_plp;
+static gint ett_alp_lmt_plp_mc;
 
 static dissector_handle_t alp_handle;
 static dissector_handle_t ip_handle;
 static dissector_handle_t ts_handle;
 
-static int hf_alp_packet_type = -1;
+static int hf_alp_packet_type;
 #define ALP_PACKET_TYPE_MASK 0xE0
 #define ALP_PACKET_TYPE_IPV4 0
 #define ALP_PACKET_TYPE_SIGNALLING 4
@@ -52,18 +52,18 @@ static const value_string alp_packet_type_vals[] = {
     { 0, NULL }
 };
 
-static int hf_alp_mpegts_numts = -1;
-static int hf_alp_mpegts_ahf = -1;
-static int hf_alp_mpegts_hdm = -1;
-static int hf_alp_mpegts_dnp = -1;
+static int hf_alp_mpegts_numts;
+static int hf_alp_mpegts_ahf;
+static int hf_alp_mpegts_hdm;
+static int hf_alp_mpegts_dnp;
 #define ALP_MPEGTS_NUMTS_MASK 0x1E
 #define ALP_MPEGTS_AHF_MASK 0x01
 #define ALP_MPEGTS_HDM_MASK 0x80
 #define ALP_MPEGTS_DNP_MASK 0x7F
 
-static int hf_alp_payload_configuration = -1;
-static int hf_alp_header_mode = -1;
-static int hf_alp_segmentation_concatenation = -1;
+static int hf_alp_payload_configuration;
+static int hf_alp_header_mode;
+static int hf_alp_segmentation_concatenation;
 #define ALP_PAYLOAD_CONFIGURATION_MASK 0x10
 #define ALP_HEADER_MODE_MASK 0x08
 #define ALP_SEGMENTATION_CONCATENATION_MASK 0x08
@@ -73,49 +73,49 @@ static const value_string alp_segmentation_concatenation_vals[] = {
     { 0, NULL }
 };
 
-static int hf_alp_length = -1;
+static int hf_alp_length;
 #define ALP_LENGTH_MASK 0x07FF
 
-static int hf_alp_single_length = -1;
-static int hf_alp_single_sif = -1;
-static int hf_alp_single_hef = -1;
+static int hf_alp_single_length;
+static int hf_alp_single_sif;
+static int hf_alp_single_hef;
 #define ALP_SINGLE_LENGTH_MASK 0x07FFF8
 #define ALP_SINGLE_SIF_MASK 0x02
 #define ALP_SINGLE_HEF_MASK 0x01
 
-static int hf_alp_segment_sequence_number = -1;
-static int hf_alp_segment_last_indicator = -1;
-static int hf_alp_segment_sif = -1;
-static int hf_alp_segment_hef = -1;
+static int hf_alp_segment_sequence_number;
+static int hf_alp_segment_last_indicator;
+static int hf_alp_segment_sif;
+static int hf_alp_segment_hef;
 #define ALP_SEGMENT_SEQUENCE_NUMBER_MASK 0xF8
 #define ALP_SEGMENT_LAST_INDICATOR_MASK 0x04
 #define ALP_SEGMENT_SIF_MASK 0x02
 #define ALP_SEGMENT_HEF_MASK 0x01
 
-static int hf_alp_concat_length = -1;
-static int hf_alp_concat_count = -1;
-static int hf_alp_concat_sif = -1;
+static int hf_alp_concat_length;
+static int hf_alp_concat_count;
+static int hf_alp_concat_sif;
 #define ALP_CONCAT_LENGTH_MASK 0x07FFF0
 #define ALP_CONCAT_COUNT_MASK 0x0E
 #define ALP_CONCAT_SIF_MASK 0x01
 
-static int hf_alp_si = -1;
-static int hf_alp_sid = -1;
-
-static int hf_alp_header_extension = -1;
-static int hf_alp_header_extension_type = -1;
-static int hf_alp_header_extension_length = -1;
-
-static int hf_alp_header_extension_sony_l1d_timeinfo = -1;
-static int hf_alp_header_extension_sony_l1d_timeinfo_flag = -1;
-static int hf_alp_header_extension_sony_l1d_timeinfo_sec = -1;
-static int hf_alp_header_extension_sony_l1d_timeinfo_ms = -1;
-static int hf_alp_header_extension_sony_l1d_timeinfo_us = -1;
-static int hf_alp_header_extension_sony_l1d_timeinfo_ns = -1;
-static int hf_alp_header_extension_sony_l1d_timeinfo_time = -1;
-static int hf_alp_header_extension_sony_l1d_timeinfo_time_ns = -1;
-static int hf_alp_header_extension_sony_plp_id = -1;
-static int hf_alp_header_extension_sony_plp_unk = -1;
+static int hf_alp_si;
+static int hf_alp_sid;
+
+static int hf_alp_header_extension;
+static int hf_alp_header_extension_type;
+static int hf_alp_header_extension_length;
+
+static int hf_alp_header_extension_sony_l1d_timeinfo;
+static int hf_alp_header_extension_sony_l1d_timeinfo_flag;
+static int hf_alp_header_extension_sony_l1d_timeinfo_sec;
+static int hf_alp_header_extension_sony_l1d_timeinfo_ms;
+static int hf_alp_header_extension_sony_l1d_timeinfo_us;
+static int hf_alp_header_extension_sony_l1d_timeinfo_ns;
+static int hf_alp_header_extension_sony_l1d_timeinfo_time;
+static int hf_alp_header_extension_sony_l1d_timeinfo_time_ns;
+static int hf_alp_header_extension_sony_plp_id;
+static int hf_alp_header_extension_sony_plp_unk;
 #define ALP_HE_SONY_L1D_TIME_FLAG_MASK 0xC000000000000000
 #define ALP_HE_SONY_L1D_TIME_SEC_MASK  0x3FFFFFFFC0000000
 #define ALP_HE_SONY_L1D_TIME_MS_MASK   0x000000003FF00000
@@ -124,12 +124,12 @@ static int hf_alp_header_extension_sony_plp_unk = -1;
 #define ALP_HE_SONY_PLP_NUM_MASK 0xFC
 #define ALP_HE_SONY_PLP_UNK_MASK 0x03
 
-static int hf_alp_sig_info = -1;
-static int hf_alp_sig_info_type = -1;
-static int hf_alp_sig_info_type_extension = -1;
-static int hf_alp_sig_info_version = -1;
-static int hf_alp_sig_info_format = -1;
-static int hf_alp_sig_info_encoding = -1;
+static int hf_alp_sig_info;
+static int hf_alp_sig_info_type;
+static int hf_alp_sig_info_type_extension;
+static int hf_alp_sig_info_version;
+static int hf_alp_sig_info_format;
+static int hf_alp_sig_info_encoding;
 #define ALP_SIG_INFO_FORMAT_MASK 0xC0
 #define ALP_SIG_INFO_ENCODING_MASK 0x30
 #define ALP_SIG_INFO_TYPE_LMT 0x01
@@ -153,23 +153,23 @@ static const value_string alp_sig_info_encoding_vals[] = {
     { 0, NULL }
 };
 
-static int hf_alp_lmt = -1;
-static int hf_alp_lmt_numplp = -1;
-static int hf_alp_lmt_reserved = -1;
-static int hf_alp_lmt_plp = -1;
-static int hf_alp_lmt_plp_id = -1;
-static int hf_alp_lmt_plp_reserved = -1;
-static int hf_alp_lmt_plp_nummc = -1;
-static int hf_alp_lmt_plp_mc = -1;
-static int hf_alp_lmt_plp_mc_src_ip = -1;
-static int hf_alp_lmt_plp_mc_dst_ip = -1;
-static int hf_alp_lmt_plp_mc_src_port = -1;
-static int hf_alp_lmt_plp_mc_dst_port = -1;
-static int hf_alp_lmt_plp_mc_sid_flag = -1;
-static int hf_alp_lmt_plp_mc_comp_flag = -1;
-static int hf_alp_lmt_plp_mc_reserved = -1;
-static int hf_alp_lmt_plp_mc_sid = -1;
-static int hf_alp_lmt_plp_mc_context_id = -1;
+static int hf_alp_lmt;
+static int hf_alp_lmt_numplp;
+static int hf_alp_lmt_reserved;
+static int hf_alp_lmt_plp;
+static int hf_alp_lmt_plp_id;
+static int hf_alp_lmt_plp_reserved;
+static int hf_alp_lmt_plp_nummc;
+static int hf_alp_lmt_plp_mc;
+static int hf_alp_lmt_plp_mc_src_ip;
+static int hf_alp_lmt_plp_mc_dst_ip;
+static int hf_alp_lmt_plp_mc_src_port;
+static int hf_alp_lmt_plp_mc_dst_port;
+static int hf_alp_lmt_plp_mc_sid_flag;
+static int hf_alp_lmt_plp_mc_comp_flag;
+static int hf_alp_lmt_plp_mc_reserved;
+static int hf_alp_lmt_plp_mc_sid;
+static int hf_alp_lmt_plp_mc_context_id;
 
 #define ALP_LMT_NUMPLP_MASK 0xFC
 #define ALP_LMT_RESERVED_MASK 0x03
@@ -179,7 +179,7 @@ static int hf_alp_lmt_plp_mc_context_id = -1;
 #define ALP_LMT_PLP_MC_COMP_MASK 0x40
 #define ALP_LMT_PLP_MC_RESERVED_MASK 0x3F
 
-static int hf_alp_junk = -1;
+static int hf_alp_junk;
 
 static int
 dissect_alp_mpegts(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, proto_tree *alp_tree)
diff --git a/epan/dissectors/packet-amp.c b/epan/dissectors/packet-amp.c
index d0ef967b62..cf3c49b76a 100644
--- a/epan/dissectors/packet-amp.c
+++ b/epan/dissectors/packet-amp.c
@@ -74,51 +74,51 @@ static dissector_handle_t amp_handle;
 void proto_register_amp(void);
 void proto_reg_handoff_amp(void);
 
-static int hf_amp_message_header = -1;
-static int hf_amp_report_bytestring = -1;
-static int hf_amp_report_data = -1;
-static int hf_amp_report_integer8_small = -1;
-static int hf_amp_report_integer = -1;
-static int hf_amp_cbor_header = -1;
-static int hf_amp_primary_timestamp = -1;
-static int hf_amp_agent_name = -1;
-static int hf_amp_text_string = -1;
-static int hf_amp_ari_flags = -1;
-static int hf_ari_value = -1;
-static int hf_ari_struct = -1;
-static int hf_ari_nickname = -1;
-static int hf_ari_parameters = -1;
-static int hf_ari_issuer = -1;
-static int hf_ari_tag = -1;
-static int hf_amp_tnvc_flags = -1;
-static int hf_amp_tnvc_reserved = -1;
-static int hf_amp_tnvc_mixed = -1;
-static int hf_amp_tnvc_typed = -1;
-static int hf_amp_tnvc_name = -1;
-static int hf_amp_tnvc_values = -1;
+static int hf_amp_message_header;
+static int hf_amp_report_bytestring;
+static int hf_amp_report_data;
+static int hf_amp_report_integer8_small;
+static int hf_amp_report_integer;
+static int hf_amp_cbor_header;
+static int hf_amp_primary_timestamp;
+static int hf_amp_agent_name;
+static int hf_amp_text_string;
+static int hf_amp_ari_flags;
+static int hf_ari_value;
+static int hf_ari_struct;
+static int hf_ari_nickname;
+static int hf_ari_parameters;
+static int hf_ari_issuer;
+static int hf_ari_tag;
+static int hf_amp_tnvc_flags;
+static int hf_amp_tnvc_reserved;
+static int hf_amp_tnvc_mixed;
+static int hf_amp_tnvc_typed;
+static int hf_amp_tnvc_name;
+static int hf_amp_tnvc_values;
 
 /* Initialize the protocol and registered fields */
-static int proto_amp = -1;
-
-static gint ett_amp_message_header = -1;
-static gint ett_amp_proto = -1;
-static gint ett_amp = -1;
-static gint ett_amp_cbor_header = -1;
-static gint ett_amp_message = -1;
-static gint ett_amp_register = -1;
-static gint ett_amp_report_set = -1;
-static gint ett_amp_report = -1;
-static gint ett_amp_tnvc_flags = -1;
-static gint ett_amp_ari_flags = -1;
-
-static int hf_amp_reserved = -1;
-static int hf_amp_acl = -1;
-static int hf_amp_nack = -1;
+static int proto_amp;
+
+static gint ett_amp_message_header;
+static gint ett_amp_proto;
+static gint ett_amp;
+static gint ett_amp_cbor_header;
+static gint ett_amp_message;
+static gint ett_amp_register;
+static gint ett_amp_report_set;
+static gint ett_amp_report;
+static gint ett_amp_tnvc_flags;
+static gint ett_amp_ari_flags;
+
+static int hf_amp_reserved;
+static int hf_amp_acl;
+static int hf_amp_nack;
 static int hf_amp_ack = 0;
-static int hf_amp_opcode = -1;
-static int hf_amp_rx_name = -1;
+static int hf_amp_opcode;
+static int hf_amp_rx_name;
 
-static expert_field ei_amp_cbor_malformed = EI_INIT;
+static expert_field ei_amp_cbor_malformed;
 
 static const value_string opcode[] = {
     { 0, "Register Agent" },
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index eb566f30ff..48d85813f6 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -707,157 +707,157 @@ format_amqp_0_10_sequence_set(tvbuff_t *tvb, guint offset, guint length,
 
 /*  Various handles  */
 
-static int proto_amqp = -1;
-static int proto_amqpv0_9 = -1;
-static int proto_amqpv0_10 = -1;
-static int proto_amqpv1_0 = -1;
+static int proto_amqp;
+static int proto_amqpv0_9;
+static int proto_amqpv0_10;
+static int proto_amqpv1_0;
 
 /* 1.0 handles */
 
-static int hf_amqp_1_0_size = -1;
-static int hf_amqp_1_0_doff = -1;
-static int hf_amqp_1_0_type = -1;
-static int hf_amqp_1_0_containerId = -1;
-static int hf_amqp_1_0_hostname = -1;
-static int hf_amqp_1_0_maxFrameSize = -1;
-static int hf_amqp_1_0_channelMax = -1;
-static int hf_amqp_1_0_idleTimeOut = -1;
-static int hf_amqp_1_0_outgoingLocales = -1;
-static int hf_amqp_1_0_incomingLocales = -1;
-static int hf_amqp_1_0_offeredCapabilities = -1;
-static int hf_amqp_1_0_desiredCapabilities = -1;
-static int hf_amqp_1_0_properties = -1;
-static int hf_amqp_1_0_remoteChannel = -1;
-static int hf_amqp_1_0_nextOutgoingId = -1;
-static int hf_amqp_1_0_incomingWindow = -1;
-static int hf_amqp_1_0_outgoingWindow = -1;
-static int hf_amqp_1_0_handleMax = -1;
-static int hf_amqp_1_0_name = -1;
-static int hf_amqp_1_0_handle = -1;
-static int hf_amqp_1_0_role = -1;
-static int hf_amqp_1_0_sndSettleMode = -1;
-static int hf_amqp_1_0_rcvSettleMode = -1;
-static int hf_amqp_1_0_source = -1;
-static int hf_amqp_1_0_target = -1;
-static int hf_amqp_1_0_deleteOnClose = -1;
-static int hf_amqp_1_0_deleteOnNoLinks = -1;
-static int hf_amqp_1_0_deleteOnNoMessages = -1;
-static int hf_amqp_1_0_deleteOnNoLinksOrMessages = -1;
-static int hf_amqp_1_0_coordinator = -1;
-static int hf_amqp_1_0_declare = -1;
-static int hf_amqp_1_0_globalId = -1;
-static int hf_amqp_1_0_discharge = -1;
-static int hf_amqp_1_0_txnId = -1;
-static int hf_amqp_1_0_fail = -1;
-static int hf_amqp_1_0_declared = -1;
-static int hf_amqp_1_0_transactionalState = -1;
-static int hf_amqp_1_0_outcome = -1;
-static int hf_amqp_1_0_unsettled = -1;
-static int hf_amqp_1_0_incompleteUnsettled = -1;
-static int hf_amqp_1_0_initialDeliveryCount = -1;
-static int hf_amqp_1_0_maxMessageSize = -1;
-static int hf_amqp_1_0_nextIncomingId = -1;
-static int hf_amqp_1_0_deliveryCount = -1;
-static int hf_amqp_1_0_sectionNumber = -1;
-static int hf_amqp_1_0_sectionOffset = -1;
-static int hf_amqp_1_0_deliveryFailed = -1;
-static int hf_amqp_1_0_undeliverableHere = -1;
-static int hf_amqp_1_0_linkCredit = -1;
-static int hf_amqp_1_0_available = -1;
-static int hf_amqp_1_0_drain = -1;
-static int hf_amqp_1_0_echo = -1;
-static int hf_amqp_1_0_deliveryId = -1;
-static int hf_amqp_1_0_deliveryTag = -1;
-static int hf_amqp_1_0_messageFormat = -1;
-static int hf_amqp_1_0_settled = -1;
-static int hf_amqp_1_0_more = -1;
-static int hf_amqp_1_0_state = -1;
-static int hf_amqp_1_0_resume = -1;
-static int hf_amqp_1_0_aborted = -1;
-static int hf_amqp_1_0_batchable = -1;
-static int hf_amqp_1_0_first = -1;
-static int hf_amqp_1_0_last = -1;
-static int hf_amqp_1_0_closed = -1;
-static int hf_amqp_1_0_amqp_performative = -1;
-static int hf_amqp_1_0_error = -1;
-static int hf_amqp_1_0_messageHeader = -1;
-static int hf_amqp_1_0_deliveryAnnotations = -1;
-static int hf_amqp_1_0_messageAnnotations = -1;
-static int hf_amqp_1_0_messageProperties = -1;
-static int hf_amqp_1_0_applicationProperties = -1;
-static int hf_amqp_1_0_data = -1;
-static int hf_amqp_1_0_amqp_sequence = -1;
-static int hf_amqp_1_0_amqp_value = -1;
-static int hf_amqp_1_0_footer = -1;
-static int hf_amqp_1_0_received = -1;
-static int hf_amqp_1_0_accepted = -1;
-static int hf_amqp_1_0_rejected = -1;
-static int hf_amqp_1_0_released = -1;
-static int hf_amqp_1_0_modified = -1;
-static int hf_amqp_1_0_condition = -1;
-static int hf_amqp_1_0_description = -1;
-static int hf_amqp_1_0_info = -1;
-static int hf_amqp_1_0_address = -1;
-static int hf_amqp_1_0_durable = -1;
-static int hf_amqp_1_0_terminusDurable = -1;
-static int hf_amqp_1_0_priority = -1;
-static int hf_amqp_1_0_ttl = -1;
-static int hf_amqp_1_0_firstAcquirer = -1;
-static int hf_amqp_1_0_expiryPolicy = -1;
-static int hf_amqp_1_0_timeout = -1;
-static int hf_amqp_1_0_dynamic = -1;
-static int hf_amqp_1_0_dynamicNodeProperties = -1;
-static int hf_amqp_1_0_distributionMode = -1;
-static int hf_amqp_1_0_filter = -1;
-static int hf_amqp_1_0_defaultOutcome = -1;
-static int hf_amqp_1_0_outcomes = -1;
-static int hf_amqp_1_0_capabilities = -1;
-static int hf_amqp_1_0_messageId = -1;
-static int hf_amqp_1_0_userId = -1;
-static int hf_amqp_1_0_to = -1;
-static int hf_amqp_1_0_subject = -1;
-static int hf_amqp_1_0_replyTo = -1;
-static int hf_amqp_1_0_correlationId = -1;
-static int hf_amqp_1_0_contentType = -1;
-static int hf_amqp_1_0_contentEncoding = -1;
-static int hf_amqp_1_0_absoluteExpiryTime = -1;
-static int hf_amqp_1_0_creationTime = -1;
-static int hf_amqp_1_0_groupId = -1;
-static int hf_amqp_1_0_groupSequence = -1;
-static int hf_amqp_1_0_replyToGroupId = -1;
-static int hf_amqp_1_0_sasl_method = -1;
-static int hf_amqp_1_0_mechanisms = -1;
-static int hf_amqp_1_0_mechanism = -1;
-static int hf_amqp_1_0_initResponse = -1;
-static int hf_amqp_1_0_saslChallenge = -1;
-static int hf_amqp_1_0_saslResponse = -1;
-static int hf_amqp_1_0_saslCode = -1;
-static int hf_amqp_1_0_saslAdditionalData = -1;
-static int hf_amqp_1_0_list = -1;
-static int hf_amqp_1_0_map = -1;
+static int hf_amqp_1_0_size;
+static int hf_amqp_1_0_doff;
+static int hf_amqp_1_0_type;
+static int hf_amqp_1_0_containerId;
+static int hf_amqp_1_0_hostname;
+static int hf_amqp_1_0_maxFrameSize;
+static int hf_amqp_1_0_channelMax;
+static int hf_amqp_1_0_idleTimeOut;
+static int hf_amqp_1_0_outgoingLocales;
+static int hf_amqp_1_0_incomingLocales;
+static int hf_amqp_1_0_offeredCapabilities;
+static int hf_amqp_1_0_desiredCapabilities;
+static int hf_amqp_1_0_properties;
+static int hf_amqp_1_0_remoteChannel;
+static int hf_amqp_1_0_nextOutgoingId;
+static int hf_amqp_1_0_incomingWindow;
+static int hf_amqp_1_0_outgoingWindow;
+static int hf_amqp_1_0_handleMax;
+static int hf_amqp_1_0_name;
+static int hf_amqp_1_0_handle;
+static int hf_amqp_1_0_role;
+static int hf_amqp_1_0_sndSettleMode;
+static int hf_amqp_1_0_rcvSettleMode;
+static int hf_amqp_1_0_source;
+static int hf_amqp_1_0_target;
+static int hf_amqp_1_0_deleteOnClose;
+static int hf_amqp_1_0_deleteOnNoLinks;
+static int hf_amqp_1_0_deleteOnNoMessages;
+static int hf_amqp_1_0_deleteOnNoLinksOrMessages;
+static int hf_amqp_1_0_coordinator;
+static int hf_amqp_1_0_declare;
+static int hf_amqp_1_0_globalId;
+static int hf_amqp_1_0_discharge;
+static int hf_amqp_1_0_txnId;
+static int hf_amqp_1_0_fail;
+static int hf_amqp_1_0_declared;
+static int hf_amqp_1_0_transactionalState;
+static int hf_amqp_1_0_outcome;
+static int hf_amqp_1_0_unsettled;
+static int hf_amqp_1_0_incompleteUnsettled;
+static int hf_amqp_1_0_initialDeliveryCount;
+static int hf_amqp_1_0_maxMessageSize;
+static int hf_amqp_1_0_nextIncomingId;
+static int hf_amqp_1_0_deliveryCount;
+static int hf_amqp_1_0_sectionNumber;
+static int hf_amqp_1_0_sectionOffset;
+static int hf_amqp_1_0_deliveryFailed;
+static int hf_amqp_1_0_undeliverableHere;
+static int hf_amqp_1_0_linkCredit;
+static int hf_amqp_1_0_available;
+static int hf_amqp_1_0_drain;
+static int hf_amqp_1_0_echo;
+static int hf_amqp_1_0_deliveryId;
+static int hf_amqp_1_0_deliveryTag;
+static int hf_amqp_1_0_messageFormat;
+static int hf_amqp_1_0_settled;
+static int hf_amqp_1_0_more;
+static int hf_amqp_1_0_state;
+static int hf_amqp_1_0_resume;
+static int hf_amqp_1_0_aborted;
+static int hf_amqp_1_0_batchable;
+static int hf_amqp_1_0_first;
+static int hf_amqp_1_0_last;
+static int hf_amqp_1_0_closed;
+static int hf_amqp_1_0_amqp_performative;
+static int hf_amqp_1_0_error;
+static int hf_amqp_1_0_messageHeader;
+static int hf_amqp_1_0_deliveryAnnotations;
+static int hf_amqp_1_0_messageAnnotations;
+static int hf_amqp_1_0_messageProperties;
+static int hf_amqp_1_0_applicationProperties;
+static int hf_amqp_1_0_data;
+static int hf_amqp_1_0_amqp_sequence;
+static int hf_amqp_1_0_amqp_value;
+static int hf_amqp_1_0_footer;
+static int hf_amqp_1_0_received;
+static int hf_amqp_1_0_accepted;
+static int hf_amqp_1_0_rejected;
+static int hf_amqp_1_0_released;
+static int hf_amqp_1_0_modified;
+static int hf_amqp_1_0_condition;
+static int hf_amqp_1_0_description;
+static int hf_amqp_1_0_info;
+static int hf_amqp_1_0_address;
+static int hf_amqp_1_0_durable;
+static int hf_amqp_1_0_terminusDurable;
+static int hf_amqp_1_0_priority;
+static int hf_amqp_1_0_ttl;
+static int hf_amqp_1_0_firstAcquirer;
+static int hf_amqp_1_0_expiryPolicy;
+static int hf_amqp_1_0_timeout;
+static int hf_amqp_1_0_dynamic;
+static int hf_amqp_1_0_dynamicNodeProperties;
+static int hf_amqp_1_0_distributionMode;
+static int hf_amqp_1_0_filter;
+static int hf_amqp_1_0_defaultOutcome;
+static int hf_amqp_1_0_outcomes;
+static int hf_amqp_1_0_capabilities;
+static int hf_amqp_1_0_messageId;
+static int hf_amqp_1_0_userId;
+static int hf_amqp_1_0_to;
+static int hf_amqp_1_0_subject;
+static int hf_amqp_1_0_replyTo;
+static int hf_amqp_1_0_correlationId;
+static int hf_amqp_1_0_contentType;
+static int hf_amqp_1_0_contentEncoding;
+static int hf_amqp_1_0_absoluteExpiryTime;
+static int hf_amqp_1_0_creationTime;
+static int hf_amqp_1_0_groupId;
+static int hf_amqp_1_0_groupSequence;
+static int hf_amqp_1_0_replyToGroupId;
+static int hf_amqp_1_0_sasl_method;
+static int hf_amqp_1_0_mechanisms;
+static int hf_amqp_1_0_mechanism;
+static int hf_amqp_1_0_initResponse;
+static int hf_amqp_1_0_saslChallenge;
+static int hf_amqp_1_0_saslResponse;
+static int hf_amqp_1_0_saslCode;
+static int hf_amqp_1_0_saslAdditionalData;
+static int hf_amqp_1_0_list;
+static int hf_amqp_1_0_map;
 /* variables for variant sub-types (see amqp_synonym_types)
  * - fields of type="*" can be of any type
  * - fields with multiple="true" may contain the type or an array */
-static int hf_amqp_1_0_outgoingLocales_sym = -1;
-static int hf_amqp_1_0_incomingLocales_sym = -1;
-static int hf_amqp_1_0_offeredCapabilities_sym = -1;
-static int hf_amqp_1_0_desiredCapabilities_sym = -1;
-static int hf_amqp_1_0_address_str = -1;
-static int hf_amqp_1_0_source_str = -1;
-static int hf_amqp_1_0_target_str = -1;
-static int hf_amqp_1_0_outcomes_sym = -1;
-static int hf_amqp_1_0_capabilities_sym = -1;
-static int hf_amqp_1_0_messageId_uint = -1;
-static int hf_amqp_1_0_messageId_str = -1;
-static int hf_amqp_1_0_messageId_bin = -1;
-static int hf_amqp_1_0_messageId_uuid = -1;
-static int hf_amqp_1_0_correlationId_uint = -1;
-static int hf_amqp_1_0_correlationId_str = -1;
-static int hf_amqp_1_0_correlationId_bin = -1;
-static int hf_amqp_1_0_correlationId_uuid = -1;
-static int hf_amqp_1_0_to_str = -1;
-static int hf_amqp_1_0_replyTo_str = -1;
-static int hf_amqp_1_0_mechanisms_sym = -1;
+static int hf_amqp_1_0_outgoingLocales_sym;
+static int hf_amqp_1_0_incomingLocales_sym;
+static int hf_amqp_1_0_offeredCapabilities_sym;
+static int hf_amqp_1_0_desiredCapabilities_sym;
+static int hf_amqp_1_0_address_str;
+static int hf_amqp_1_0_source_str;
+static int hf_amqp_1_0_target_str;
+static int hf_amqp_1_0_outcomes_sym;
+static int hf_amqp_1_0_capabilities_sym;
+static int hf_amqp_1_0_messageId_uint;
+static int hf_amqp_1_0_messageId_str;
+static int hf_amqp_1_0_messageId_bin;
+static int hf_amqp_1_0_messageId_uuid;
+static int hf_amqp_1_0_correlationId_uint;
+static int hf_amqp_1_0_correlationId_str;
+static int hf_amqp_1_0_correlationId_bin;
+static int hf_amqp_1_0_correlationId_uuid;
+static int hf_amqp_1_0_to_str;
+static int hf_amqp_1_0_replyTo_str;
+static int hf_amqp_1_0_mechanisms_sym;
 
 /* Several field can be of multiple types. To distinguish it among hf_amqp_1_0_* variables,
  * table below "translates" original hf_amqp_1_0_* variable to the type-specific one.
@@ -1016,566 +1016,566 @@ static int * const amqp_1_0_transactionalState_items[] = { &hf_amqp_1_0_txnId,
 
 /* 0-10 handles */
 
-static int hf_amqp_0_10_format = -1;
-static int hf_amqp_0_10_position = -1;
-static int hf_amqp_0_10_type = -1;
-static int hf_amqp_0_10_size = -1;
-static int hf_amqp_0_10_track = -1;
-static int hf_amqp_0_10_class = -1;
-static int hf_amqp_0_10_connection_method = -1;
-static int hf_amqp_0_10_session_method = -1;
-static int hf_amqp_0_10_execution_method = -1;
-static int hf_amqp_0_10_message_method = -1;
-static int hf_amqp_0_10_tx_method = -1;
-static int hf_amqp_0_10_dtx_method = -1;
-static int hf_amqp_0_10_exchange_method = -1;
-static int hf_amqp_0_10_queue_method = -1;
-static int hf_amqp_0_10_file_method = -1;
-static int hf_amqp_0_10_stream_method = -1;
-static int hf_amqp_0_10_argument_packing_flags = -1;
-static int hf_amqp_0_10_session_header = -1;
-static int hf_amqp_0_10_session_header_sync = -1;
-static int hf_amqp_0_10_struct32_size = -1;
-static int hf_amqp_0_10_struct32 = -1;
-static int hf_amqp_0_10_struct32_padding = -1;
-static int hf_amqp_0_10_struct32_class = -1;
-static int hf_amqp_0_10_struct32_struct = -1;
-static int hf_amqp_0_10_array_type = -1;
-static int hf_amqp_0_10_array_element_count = -1;
-static int hf_amqp_0_10_array_string = -1;
-static int hf_amqp_0_10_message_body = -1;
-static int hf_amqp_0_10_dtx_xid = -1;
-static int hf_amqp_0_10_dtx_xid_format = -1;
-static int hf_amqp_0_10_dtx_xid_global_id = -1;
-static int hf_amqp_0_10_dtx_xid_branch_id = -1;
-static int hf_amqp_0_10_struct_delivery_properties_discard_unroutable = -1;
-static int hf_amqp_0_10_struct_delivery_properties_immediate = -1;
-static int hf_amqp_0_10_struct_delivery_properties_redelivered = -1;
-static int hf_amqp_0_10_struct_delivery_properties_priority = -1;
-static int hf_amqp_0_10_struct_delivery_properties_mode = -1;
-static int hf_amqp_0_10_struct_delivery_properties_ttl = -1;
-static int hf_amqp_0_10_struct_delivery_properties_timestamp = -1;
-static int hf_amqp_0_10_struct_delivery_properties_expiration = -1;
-static int hf_amqp_0_10_struct_delivery_properties_exchange = -1;
-static int hf_amqp_0_10_struct_delivery_properties_routing_key = -1;
-static int hf_amqp_0_10_struct_delivery_properties_resume_ttl = -1;
-static int hf_amqp_0_10_struct_fragment_properties_first = -1;
-static int hf_amqp_0_10_struct_fragment_properties_last = -1;
-static int hf_amqp_0_10_struct_fragment_properties_size = -1;
-/* static int hf_amqp_0_10_struct_message_properties = -1; */
-static int hf_amqp_0_10_struct_message_properties_content_len = -1;
-static int hf_amqp_0_10_struct_message_properties_message_id = -1;
-static int hf_amqp_0_10_struct_message_properties_correlation = -1;
-static int hf_amqp_0_10_struct_message_properties_reply_to = -1;
-static int hf_amqp_0_10_struct_message_properties_content_type = -1;
-static int hf_amqp_0_10_struct_message_properties_content_encoding = -1;
-static int hf_amqp_0_10_struct_message_properties_user_id = -1;
-static int hf_amqp_0_10_struct_message_properties_app_id = -1;
-static int hf_amqp_0_10_struct_message_properties_application_headers = -1;
-static int hf_amqp_0_10_struct_reply_to_exchange = -1;
-static int hf_amqp_0_10_struct_reply_to_routing_key = -1;
-static int hf_amqp_0_10_struct_acquired_transfers = -1;
-static int hf_amqp_0_10_struct_resume_result_offset = -1;
-static int hf_amqp_0_10_struct_exchange_query_result_durable = -1;
-static int hf_amqp_0_10_struct_exchange_query_result_not_found = -1;
-static int hf_amqp_0_10_struct_exchange_bound_result_exchange_not_found = -1;
-static int hf_amqp_0_10_struct_exchange_bound_result_queue_not_found = -1;
-static int hf_amqp_0_10_struct_exchange_bound_result_queue_not_matched = -1;
-static int hf_amqp_0_10_struct_exchange_bound_result_key_not_matched = -1;
-static int hf_amqp_0_10_struct_exchange_bound_result_args_not_matched = -1;
-static int hf_amqp_0_10_struct_queue_query_result_durable = -1;
-static int hf_amqp_0_10_struct_queue_query_result_exclusive = -1;
-static int hf_amqp_0_10_struct_queue_query_result_auto_delete = -1;
-static int hf_amqp_0_10_struct_queue_query_result_message_count = -1;
-static int hf_amqp_0_10_struct_queue_query_result_subscriber_count = -1;
-static int hf_amqp_0_10_struct_file_properties_content_type = -1;
-static int hf_amqp_0_10_struct_file_properties_content_encoding = -1;
-static int hf_amqp_0_10_struct_file_properties_headers = -1;
-static int hf_amqp_0_10_struct_file_properties_priority = -1;
-static int hf_amqp_0_10_struct_file_properties_reply_to = -1;
-static int hf_amqp_0_10_struct_file_properties_message_id = -1;
-static int hf_amqp_0_10_struct_file_properties_filename = -1;
-static int hf_amqp_0_10_struct_file_properties_timestamp = -1;
-static int hf_amqp_0_10_struct_file_properties_cluster_id = -1;
-static int hf_amqp_0_10_struct_stream_properties_content_type = -1;
-static int hf_amqp_0_10_struct_stream_properties_content_encoding = -1;
-static int hf_amqp_0_10_struct_stream_properties_headers = -1;
-static int hf_amqp_0_10_struct_stream_properties_priority = -1;
-static int hf_amqp_0_10_struct_stream_properties_timestamp = -1;
-static int hf_amqp_0_10_method_session_attach_name = -1;
-static int hf_amqp_0_10_method_session_attach_name_size = -1;
-static int hf_amqp_0_10_method_session_attach_force = -1;
-static int hf_amqp_0_10_method_session_detached_code = -1;
-static int hf_amqp_0_10_method_session_timeout = -1;
-static int hf_amqp_0_10_method_session_completed_timely = -1;
-static int hf_amqp_0_10_method_session_flush_expected = -1;
-static int hf_amqp_0_10_method_session_flush_confirmed = -1;
-static int hf_amqp_0_10_method_session_flush_completed = -1;
-static int hf_amqp_0_10_method_session_command_point_id = -1;
-static int hf_amqp_0_10_method_session_command_point_offset = -1;
-static int hf_amqp_0_10_method_session_commands = -1;
-static int hf_amqp_0_10_method_session_fragments = -1;
-static int hf_amqp_0_10_method_execution_command_id = -1;
-static int hf_amqp_0_10_method_execution_exception_error = -1;
-static int hf_amqp_0_10_method_execution_field_index = -1;
-static int hf_amqp_0_10_method_execution_description = -1;
-static int hf_amqp_0_10_method_execution_error_info = -1;
-static int hf_amqp_0_10_method_message_transfer_destination = -1;
-static int hf_amqp_0_10_method_message_transfer_accept_mode = -1;
-static int hf_amqp_0_10_method_message_transfer_acquire_mode = -1;
-static int hf_amqp_0_10_method_message_accept_transfers = -1;
-static int hf_amqp_0_10_method_message_transfer_reject_code = -1;
-static int hf_amqp_0_10_method_message_reject_text = -1;
-static int hf_amqp_0_10_method_message_release_set_redelivered = -1;
-static int hf_amqp_0_10_method_message_dest = -1;
-static int hf_amqp_0_10_method_message_resume_id = -1;
-static int hf_amqp_0_10_method_message_subscribe_queue = -1;
-static int hf_amqp_0_10_method_message_subscribe_exclusive = -1;
-static int hf_amqp_0_10_method_message_subscribe_resume_ttl = -1;
-static int hf_amqp_0_10_method_message_subscribe_args = -1;
-static int hf_amqp_0_10_method_message_flow_mode = -1;
-static int hf_amqp_0_10_method_message_credit_unit = -1;
-static int hf_amqp_0_10_method_message_credit_value = -1;
-static int hf_amqp_0_10_method_dtx_start_join = -1;
-static int hf_amqp_0_10_method_dtx_start_resume = -1;
-static int hf_amqp_0_10_method_dtx_end_fail = -1;
-static int hf_amqp_0_10_method_dtx_end_suspend = -1;
-static int hf_amqp_0_10_method_dtx_commit_one_phase = -1;
-static int hf_amqp_0_10_method_dtx_set_timeout_timeout = -1;
-static int hf_amqp_0_10_method_exchange_declare_exchange = -1;
-static int hf_amqp_0_10_method_exchange_declare_type = -1;
-static int hf_amqp_0_10_method_exchange_declare_alt_exchange = -1;
-static int hf_amqp_0_10_method_exchange_declare_passive = -1;
-static int hf_amqp_0_10_method_exchange_declare_durable = -1;
-static int hf_amqp_0_10_method_exchange_declare_auto_delete = -1;
-static int hf_amqp_0_10_method_exchange_declare_arguments = -1;
-static int hf_amqp_0_10_method_exchange_delete_if_unused = -1;
-static int hf_amqp_0_10_method_exchange_bind_queue = -1;
-static int hf_amqp_0_10_method_exchange_binding_key = -1;
-static int hf_amqp_0_10_method_queue_name = -1;
-static int hf_amqp_0_10_method_queue_alt_exchange = -1;
-static int hf_amqp_0_10_method_queue_declare_passive = -1;
-static int hf_amqp_0_10_method_queue_declare_durable = -1;
-static int hf_amqp_0_10_method_queue_declare_exclusive = -1;
-static int hf_amqp_0_10_method_queue_declare_auto_delete = -1;
-static int hf_amqp_0_10_method_queue_declare_arguments = -1;
-static int hf_amqp_0_10_method_queue_delete_if_unused = -1;
-static int hf_amqp_0_10_method_queue_delete_if_empty = -1;
-static int hf_amqp_0_10_method_file_qos_prefetch_size = -1;
-static int hf_amqp_0_10_method_file_qos_prefetch_count = -1;
-static int hf_amqp_0_10_method_file_qos_global = -1;
-static int hf_amqp_0_10_method_file_consumer_tag = -1;
-static int hf_amqp_0_10_method_file_consume_no_local = -1;
-static int hf_amqp_0_10_method_file_consume_no_ack = -1;
-static int hf_amqp_0_10_method_file_consume_exclusive = -1;
-static int hf_amqp_0_10_method_file_consume_nowait = -1;
-static int hf_amqp_0_10_method_file_consume_arguments = -1;
-static int hf_amqp_0_10_method_file_identifier = -1;
-static int hf_amqp_0_10_method_file_open_content_size = -1;
-static int hf_amqp_0_10_method_file_open_ok_staged_size = -1;
-static int hf_amqp_0_10_method_file_publish_exchange = -1;
-static int hf_amqp_0_10_method_file_publish_routing_key = -1;
-static int hf_amqp_0_10_method_file_publish_mandatory = -1;
-static int hf_amqp_0_10_method_file_publish_immediate = -1;
-static int hf_amqp_0_10_method_file_return_reply_code = -1;
-static int hf_amqp_0_10_method_file_return_reply_text = -1;
-static int hf_amqp_0_10_method_file_return_exchange = -1;
-static int hf_amqp_0_10_method_file_return_routing_key = -1;
-static int hf_amqp_0_10_method_file_deliver_consumer_tag = -1;
-static int hf_amqp_0_10_method_file_deliver_delivery_tag = -1;
-static int hf_amqp_0_10_method_file_deliver_redelivered = -1;
-static int hf_amqp_0_10_method_file_deliver_exchange = -1;
-static int hf_amqp_0_10_method_file_deliver_routing_key = -1;
-static int hf_amqp_0_10_method_file_ack_delivery_tag = -1;
-static int hf_amqp_0_10_method_file_ack_multiple = -1;
-static int hf_amqp_0_10_method_file_reject_delivery_tag = -1;
-static int hf_amqp_0_10_method_file_reject_requeue = -1;
-static int hf_amqp_0_10_method_stream_qos_prefetch_size = -1;
-static int hf_amqp_0_10_method_stream_qos_prefetch_count = -1;
-/* static int hf_amqp_0_10_method_stream_qos_consume_rate = -1; */
-static int hf_amqp_0_10_method_stream_qos_global = -1;
-static int hf_amqp_0_10_method_stream_consumer_tag = -1;
-static int hf_amqp_0_10_method_stream_consume_no_local = -1;
-static int hf_amqp_0_10_method_stream_consume_exclusive = -1;
-static int hf_amqp_0_10_method_stream_consume_nowait = -1;
-static int hf_amqp_0_10_method_stream_consume_arguments = -1;
-static int hf_amqp_0_10_method_stream_publish_exchange = -1;
-static int hf_amqp_0_10_method_stream_publish_routing_key = -1;
-static int hf_amqp_0_10_method_stream_publish_mandatory = -1;
-static int hf_amqp_0_10_method_stream_publish_immediate = -1;
-static int hf_amqp_0_10_method_stream_return_reply_code = -1;
-static int hf_amqp_0_10_method_stream_return_reply_text = -1;
-static int hf_amqp_0_10_method_stream_return_exchange = -1;
-static int hf_amqp_0_10_method_stream_return_routing_key = -1;
-static int hf_amqp_0_10_method_stream_deliver_consumer_tag = -1;
-static int hf_amqp_0_10_method_stream_deliver_delivery_tag = -1;
-static int hf_amqp_0_10_method_stream_deliver_exchange = -1;
-static int hf_amqp_0_10_method_stream_deliver_queue = -1;
-static int hf_amqp_channel = -1;
-static int hf_amqp_reserved = -1;
-static int hf_amqp_0_9_type = -1;
-static int hf_amqp_0_9_length = -1;
-static int hf_amqp_0_9_method_class_id = -1;
-static int hf_amqp_method_connection_method_id = -1;
-static int hf_amqp_method_channel_method_id = -1;
-static int hf_amqp_method_access_method_id = -1;
-static int hf_amqp_method_exchange_method_id = -1;
-static int hf_amqp_method_queue_method_id = -1;
-static int hf_amqp_method_basic_method_id = -1;
-static int hf_amqp_method_file_method_id = -1;
-static int hf_amqp_method_stream_method_id = -1;
-static int hf_amqp_method_tx_method_id = -1;
-static int hf_amqp_method_dtx_method_id = -1;
-static int hf_amqp_method_tunnel_method_id = -1;
-static int hf_amqp_method_confirm_method_id = -1;
-static int hf_amqp_method_arguments = -1;
-static int hf_amqp_method_connection_start_version_major = -1;
-static int hf_amqp_method_connection_start_version_minor = -1;
-static int hf_amqp_method_connection_start_server_properties = -1;
-static int hf_amqp_0_9_method_connection_start_mechanisms = -1;
-static int hf_amqp_0_10_method_connection_start_mechanisms = -1;
-static int hf_amqp_0_9_method_connection_start_locales = -1;
-static int hf_amqp_0_10_method_connection_start_locales = -1;
-static int hf_amqp_method_connection_start_ok_client_properties = -1;
-static int hf_amqp_method_connection_start_ok_mechanism = -1;
-static int hf_amqp_method_connection_start_ok_response = -1;
-static int hf_amqp_method_connection_start_ok_locale = -1;
-static int hf_amqp_method_connection_secure_challenge = -1;
-static int hf_amqp_method_connection_secure_ok_response = -1;
-static int hf_amqp_method_connection_tune_channel_max = -1;
-static int hf_amqp_0_9_method_connection_tune_frame_max = -1;
-static int hf_amqp_0_10_method_connection_tune_frame_max = -1;
-static int hf_amqp_0_9_method_connection_tune_heartbeat = -1;
-static int hf_amqp_0_10_method_connection_tune_heartbeat_min = -1;
-static int hf_amqp_0_10_method_connection_tune_heartbeat_max = -1;
-static int hf_amqp_method_connection_tune_ok_channel_max = -1;
-static int hf_amqp_0_9_method_connection_tune_ok_frame_max = -1;
-static int hf_amqp_0_10_method_connection_tune_ok_frame_max = -1;
-static int hf_amqp_method_connection_tune_ok_heartbeat = -1;
-static int hf_amqp_method_connection_open_virtual_host = -1;
-static int hf_amqp_0_9_method_connection_open_capabilities = -1;
-static int hf_amqp_0_10_method_connection_open_capabilities = -1;
-static int hf_amqp_0_9_method_connection_open_insist = -1;
-static int hf_amqp_0_10_method_connection_open_insist = -1;
-static int hf_amqp_0_9_method_connection_open_ok_known_hosts = -1;
-static int hf_amqp_0_10_method_connection_open_ok_known_hosts = -1;
-static int hf_amqp_method_connection_redirect_host = -1;
-static int hf_amqp_0_9_method_connection_redirect_known_hosts = -1;
-static int hf_amqp_0_10_method_connection_redirect_known_hosts = -1;
-static int hf_amqp_0_9_method_connection_close_reply_code = -1;
-static int hf_amqp_0_10_method_connection_close_reply_code = -1;
-static int hf_amqp_method_connection_close_reply_text = -1;
-static int hf_amqp_method_connection_close_class_id = -1;
-static int hf_amqp_method_connection_close_method_id = -1;
-static int hf_amqp_method_connection_blocked_reason = -1;
-static int hf_amqp_method_channel_open_out_of_band = -1;
-static int hf_amqp_method_channel_open_ok_channel_id = -1;
-static int hf_amqp_method_channel_flow_active = -1;
-static int hf_amqp_method_channel_flow_ok_active = -1;
-static int hf_amqp_method_channel_close_reply_code = -1;
-static int hf_amqp_method_channel_close_reply_text = -1;
-static int hf_amqp_method_channel_close_class_id = -1;
-static int hf_amqp_method_channel_close_method_id = -1;
-static int hf_amqp_method_channel_resume_channel_id = -1;
-static int hf_amqp_method_access_request_realm = -1;
-static int hf_amqp_method_access_request_exclusive = -1;
-static int hf_amqp_method_access_request_passive = -1;
-static int hf_amqp_method_access_request_active = -1;
-static int hf_amqp_method_access_request_write = -1;
-static int hf_amqp_method_access_request_read = -1;
-static int hf_amqp_method_access_request_ok_ticket = -1;
-static int hf_amqp_method_exchange_declare_ticket = -1;
-static int hf_amqp_method_exchange_declare_exchange = -1;
-static int hf_amqp_method_exchange_declare_type = -1;
-static int hf_amqp_method_exchange_declare_passive = -1;
-static int hf_amqp_method_exchange_declare_durable = -1;
-static int hf_amqp_method_exchange_declare_auto_delete = -1;
-static int hf_amqp_method_exchange_declare_internal = -1;
-static int hf_amqp_method_exchange_declare_nowait = -1;
-static int hf_amqp_method_exchange_declare_arguments = -1;
-static int hf_amqp_method_exchange_bind_destination = -1;
-static int hf_amqp_method_exchange_bind_source = -1;
-static int hf_amqp_method_exchange_bind_routing_key = -1;
-static int hf_amqp_method_exchange_bind_nowait = -1;
-static int hf_amqp_method_exchange_bind_arguments = -1;
-static int hf_amqp_method_exchange_delete_ticket = -1;
-static int hf_amqp_method_exchange_delete_exchange = -1;
-static int hf_amqp_method_exchange_delete_if_unused = -1;
-static int hf_amqp_method_exchange_delete_nowait = -1;
-static int hf_amqp_method_queue_declare_ticket = -1;
-static int hf_amqp_method_queue_declare_queue = -1;
-static int hf_amqp_method_queue_declare_passive = -1;
-static int hf_amqp_method_queue_declare_durable = -1;
-static int hf_amqp_method_queue_declare_exclusive = -1;
-static int hf_amqp_method_queue_declare_auto_delete = -1;
-static int hf_amqp_method_queue_declare_nowait = -1;
-static int hf_amqp_method_queue_declare_arguments = -1;
-static int hf_amqp_method_queue_declare_ok_queue = -1;
-static int hf_amqp_method_queue_declare_ok_message_count = -1;
-static int hf_amqp_method_queue_declare_ok_consumer_count = -1;
-static int hf_amqp_method_queue_bind_ticket = -1;
-static int hf_amqp_method_queue_bind_queue = -1;
-static int hf_amqp_method_queue_bind_exchange = -1;
-static int hf_amqp_method_queue_bind_routing_key = -1;
-static int hf_amqp_method_queue_bind_nowait = -1;
-static int hf_amqp_method_queue_bind_arguments = -1;
-static int hf_amqp_method_queue_unbind_ticket = -1;
-static int hf_amqp_method_queue_unbind_queue = -1;
-static int hf_amqp_method_queue_unbind_exchange = -1;
-static int hf_amqp_method_queue_unbind_routing_key = -1;
-static int hf_amqp_method_queue_unbind_arguments = -1;
-static int hf_amqp_method_queue_purge_ticket = -1;
-static int hf_amqp_method_queue_purge_queue = -1;
-static int hf_amqp_method_queue_purge_nowait = -1;
-static int hf_amqp_method_queue_purge_ok_message_count = -1;
-static int hf_amqp_method_queue_delete_ticket = -1;
-static int hf_amqp_method_queue_delete_queue = -1;
-static int hf_amqp_method_queue_delete_if_unused = -1;
-static int hf_amqp_method_queue_delete_if_empty = -1;
-static int hf_amqp_method_queue_delete_nowait = -1;
-static int hf_amqp_method_queue_delete_ok_message_count = -1;
-static int hf_amqp_method_basic_qos_prefetch_size = -1;
-static int hf_amqp_method_basic_qos_prefetch_count = -1;
-static int hf_amqp_method_basic_qos_global = -1;
-static int hf_amqp_method_basic_consume_ticket = -1;
-static int hf_amqp_method_basic_consume_queue = -1;
-static int hf_amqp_method_basic_consume_consumer_tag = -1;
-static int hf_amqp_method_basic_consume_no_local = -1;
-static int hf_amqp_method_basic_consume_no_ack = -1;
-static int hf_amqp_method_basic_consume_exclusive = -1;
-static int hf_amqp_method_basic_consume_nowait = -1;
-static int hf_amqp_method_basic_consume_filter = -1;
-static int hf_amqp_method_basic_consume_ok_consumer_tag = -1;
-static int hf_amqp_method_basic_cancel_consumer_tag = -1;
-static int hf_amqp_method_basic_cancel_nowait = -1;
-static int hf_amqp_method_basic_cancel_ok_consumer_tag = -1;
-static int hf_amqp_method_basic_publish_number = -1;
-static int hf_amqp_method_basic_publish_ticket = -1;
-static int hf_amqp_method_basic_publish_exchange = -1;
-static int hf_amqp_method_basic_publish_routing_key = -1;
-static int hf_amqp_method_basic_publish_mandatory = -1;
-static int hf_amqp_method_basic_publish_immediate = -1;
-static int hf_amqp_method_basic_return_reply_code = -1;
-static int hf_amqp_method_basic_return_reply_text = -1;
-static int hf_amqp_method_basic_return_exchange = -1;
-static int hf_amqp_method_basic_return_routing_key = -1;
-static int hf_amqp_method_basic_deliver_consumer_tag = -1;
-static int hf_amqp_method_basic_deliver_delivery_tag = -1;
-static int hf_amqp_method_basic_deliver_redelivered = -1;
-static int hf_amqp_method_basic_deliver_exchange = -1;
-static int hf_amqp_method_basic_deliver_routing_key = -1;
-static int hf_amqp_method_basic_get_ticket = -1;
-static int hf_amqp_method_basic_get_queue = -1;
-static int hf_amqp_method_basic_get_no_ack = -1;
-static int hf_amqp_method_basic_get_ok_delivery_tag = -1;
-static int hf_amqp_method_basic_get_ok_redelivered = -1;
-static int hf_amqp_method_basic_get_ok_exchange = -1;
-static int hf_amqp_method_basic_get_ok_routing_key = -1;
-static int hf_amqp_method_basic_get_ok_message_count = -1;
-static int hf_amqp_method_basic_get_empty_cluster_id = -1;
-static int hf_amqp_method_basic_ack_delivery_tag = -1;
-static int hf_amqp_method_basic_ack_multiple = -1;
-static int hf_amqp_method_basic_reject_delivery_tag = -1;
-static int hf_amqp_method_basic_reject_requeue = -1;
-static int hf_amqp_method_basic_recover_requeue = -1;
-static int hf_amqp_method_basic_nack_delivery_tag = -1;
-static int hf_amqp_method_basic_nack_multiple = -1;
-static int hf_amqp_method_basic_nack_requeue = -1;
-static int hf_amqp_method_file_qos_prefetch_size = -1;
-static int hf_amqp_method_file_qos_prefetch_count = -1;
-static int hf_amqp_method_file_qos_global = -1;
-static int hf_amqp_method_file_consume_ticket = -1;
-static int hf_amqp_method_file_consume_queue = -1;
-static int hf_amqp_method_file_consume_consumer_tag = -1;
-static int hf_amqp_method_file_consume_no_local = -1;
-static int hf_amqp_method_file_consume_no_ack = -1;
-static int hf_amqp_method_file_consume_exclusive = -1;
-static int hf_amqp_method_file_consume_nowait = -1;
-static int hf_amqp_method_file_consume_filter = -1;
-static int hf_amqp_method_file_consume_ok_consumer_tag = -1;
-static int hf_amqp_method_file_cancel_consumer_tag = -1;
-static int hf_amqp_method_file_cancel_nowait = -1;
-static int hf_amqp_method_file_cancel_ok_consumer_tag = -1;
-static int hf_amqp_method_file_open_identifier = -1;
-static int hf_amqp_method_file_open_content_size = -1;
-static int hf_amqp_method_file_open_ok_staged_size = -1;
-static int hf_amqp_method_file_publish_ticket = -1;
-static int hf_amqp_method_file_publish_exchange = -1;
-static int hf_amqp_method_file_publish_routing_key = -1;
-static int hf_amqp_method_file_publish_mandatory = -1;
-static int hf_amqp_method_file_publish_immediate = -1;
-static int hf_amqp_method_file_publish_identifier = -1;
-static int hf_amqp_method_file_return_reply_code = -1;
-static int hf_amqp_method_file_return_reply_text = -1;
-static int hf_amqp_method_file_return_exchange = -1;
-static int hf_amqp_method_file_return_routing_key = -1;
-static int hf_amqp_method_file_deliver_consumer_tag = -1;
-static int hf_amqp_method_file_deliver_delivery_tag = -1;
-static int hf_amqp_method_file_deliver_redelivered = -1;
-static int hf_amqp_method_file_deliver_exchange = -1;
-static int hf_amqp_method_file_deliver_routing_key = -1;
-static int hf_amqp_method_file_deliver_identifier = -1;
-static int hf_amqp_method_file_ack_delivery_tag = -1;
-static int hf_amqp_method_file_ack_multiple = -1;
-static int hf_amqp_method_file_reject_delivery_tag = -1;
-static int hf_amqp_method_file_reject_requeue = -1;
-static int hf_amqp_method_stream_qos_prefetch_size = -1;
-static int hf_amqp_method_stream_qos_prefetch_count = -1;
-static int hf_amqp_method_stream_qos_consume_rate = -1;
-static int hf_amqp_method_stream_qos_global = -1;
-static int hf_amqp_method_stream_consume_ticket = -1;
-static int hf_amqp_method_stream_consume_queue = -1;
-static int hf_amqp_method_stream_consume_consumer_tag = -1;
-static int hf_amqp_method_stream_consume_no_local = -1;
-static int hf_amqp_method_stream_consume_exclusive = -1;
-static int hf_amqp_method_stream_consume_nowait = -1;
-static int hf_amqp_method_stream_consume_filter = -1;
-static int hf_amqp_method_stream_consume_ok_consumer_tag = -1;
-static int hf_amqp_method_stream_cancel_consumer_tag = -1;
-static int hf_amqp_method_stream_cancel_nowait = -1;
-static int hf_amqp_method_stream_cancel_ok_consumer_tag = -1;
-static int hf_amqp_method_stream_publish_ticket = -1;
-static int hf_amqp_method_stream_publish_exchange = -1;
-static int hf_amqp_method_stream_publish_routing_key = -1;
-static int hf_amqp_method_stream_publish_mandatory = -1;
-static int hf_amqp_method_stream_publish_immediate = -1;
-static int hf_amqp_method_stream_return_reply_code = -1;
-static int hf_amqp_method_stream_return_reply_text = -1;
-static int hf_amqp_method_stream_return_exchange = -1;
-static int hf_amqp_method_stream_return_routing_key = -1;
-static int hf_amqp_method_stream_deliver_consumer_tag = -1;
-static int hf_amqp_method_stream_deliver_delivery_tag = -1;
-static int hf_amqp_method_stream_deliver_exchange = -1;
-static int hf_amqp_method_stream_deliver_queue = -1;
-static int hf_amqp_method_dtx_start_dtx_identifier = -1;
-static int hf_amqp_method_tunnel_request_meta_data = -1;
-static int hf_amqp_method_confirm_select_nowait = -1;
-static int hf_amqp_field = -1;
-static int hf_amqp_field_name = -1;
-static int hf_amqp_field_type = -1;
-static int hf_amqp_field_integer = -1;
-static int hf_amqp_field_unsigned_integer = -1;
-static int hf_amqp_field_string = -1;
-static int hf_amqp_field_boolean = -1;
-static int hf_amqp_field_byte = -1;
-static int hf_amqp_field_unsigned_byte = -1;
-static int hf_amqp_field_short_int = -1;
-static int hf_amqp_field_short_uint = -1;
-static int hf_amqp_field_long_int = -1;
-static int hf_amqp_field_float = -1;
-static int hf_amqp_field_double = -1;
-static int hf_amqp_field_decimal = -1;
-static int hf_amqp_field_timestamp = -1;
-static int hf_amqp_field_byte_array = -1;
-static int hf_amqp_header_class_id = -1;
-static int hf_amqp_header_weight = -1;
-static int hf_amqp_header_body_size = -1;
-static int hf_amqp_header_property_flags = -1;
-static int hf_amqp_header_properties = -1;
-static int hf_amqp_header_basic_content_type = -1;
-static int hf_amqp_header_basic_content_encoding = -1;
-static int hf_amqp_header_basic_headers = -1;
-static int hf_amqp_header_basic_delivery_mode = -1;
-static int hf_amqp_header_basic_priority = -1;
-static int hf_amqp_header_basic_correlation_id = -1;
-static int hf_amqp_header_basic_reply_to = -1;
-static int hf_amqp_header_basic_expiration = -1;
-static int hf_amqp_header_basic_message_id = -1;
-static int hf_amqp_header_basic_timestamp = -1;
-static int hf_amqp_header_basic_type = -1;
-static int hf_amqp_header_basic_user_id = -1;
-static int hf_amqp_header_basic_app_id = -1;
-static int hf_amqp_header_basic_cluster_id = -1;
-static int hf_amqp_header_file_content_type = -1;
-static int hf_amqp_header_file_content_encoding = -1;
-static int hf_amqp_header_file_headers = -1;
-static int hf_amqp_header_file_priority = -1;
-static int hf_amqp_header_file_reply_to = -1;
-static int hf_amqp_header_file_message_id = -1;
-static int hf_amqp_header_file_filename = -1;
-static int hf_amqp_header_file_timestamp = -1;
-static int hf_amqp_header_file_cluster_id = -1;
-static int hf_amqp_header_stream_content_type = -1;
-static int hf_amqp_header_stream_content_encoding = -1;
-static int hf_amqp_header_stream_headers = -1;
-static int hf_amqp_header_stream_priority = -1;
-static int hf_amqp_header_stream_timestamp = -1;
-static int hf_amqp_header_tunnel_headers = -1;
-static int hf_amqp_header_tunnel_proxy_name = -1;
-static int hf_amqp_header_tunnel_data_name = -1;
-static int hf_amqp_header_tunnel_durable = -1;
-static int hf_amqp_header_tunnel_broadcast = -1;
-static int hf_amqp_0_10_dtx_xa_status = -1;
-static int hf_amqp_payload = -1;
-static int hf_amqp_init_protocol = -1;
-static int hf_amqp_init_id = -1;
-static int hf_amqp_init_id_major = -1;
-static int hf_amqp_init_id_minor = -1;
-static int hf_amqp_init_version_major = -1;
-static int hf_amqp_init_version_minor = -1;
-static int hf_amqp_init_version_revision = -1;
-static int hf_amqp_message_in = -1;
-static int hf_amqp_ack_in = -1;
-static int hf_amqp_method_connection_start_server_properties_size = -1;
-static int hf_amqp_0_10_method_connection_start_mechanisms_size = -1;
-static int hf_amqp_0_10_method_connection_start_locales_size = -1;
-static int hf_amqp_method_connection_start_ok_client_properties_size = -1;
-static int hf_amqp_0_10_method_connection_open_capabilities_size = -1;
-static int hf_amqp_0_10_method_connection_open_ok_known_hosts_size = -1;
-static int hf_amqp_0_10_method_connection_redirect_known_hosts_size = -1;
-static int hf_amqp_0_10_method_execution_error_info_size = -1;
-static int hf_amqp_0_10_method_exchange_declare_arguments_size = -1;
-static int hf_amqp_0_10_method_queue_declare_arguments_size = -1;
-static int hf_amqp_0_10_method_file_consume_arguments_size = -1;
-static int hf_amqp_0_10_method_stream_consume_arguments_size = -1;
-static int hf_amqp_0_10_struct_message_properties_application_headers_size = -1;
-static int hf_amqp_0_10_struct_file_properties_headers_size = -1;
-static int hf_amqp_0_10_struct_stream_properties_headers_size = -1;
-static int hf_amqp_0_10_struct_dtx_recover_result_size = -1;
-
-static gint ett_amqp = -1;
-static gint ett_header = -1;
-static gint ett_args = -1;
-static gint ett_props = -1;
-static gint ett_field_table = -1;
-static gint ett_amqp_init = -1;
-static gint ett_amqp_0_9_field = -1;
-static gint ett_amqp_0_10_map = -1;
-static gint ett_amqp_0_10_array = -1;
-static gint ett_amqp_0_10_struct = -1;
-static gint ett_amqp_1_0_list = -1;
-static gint ett_amqp_1_0_array = -1;
-static gint ett_amqp_1_0_map = -1;
-
-static expert_field ei_amqp_connection_error = EI_INIT;
-static expert_field ei_amqp_channel_error = EI_INIT;
-static expert_field ei_amqp_message_undeliverable = EI_INIT;
-static expert_field ei_amqp_bad_flag_value = EI_INIT;
-static expert_field ei_amqp_unknown_stream_method = EI_INIT;
-static expert_field ei_amqp_unknown_basic_method = EI_INIT;
-static expert_field ei_amqp_unknown_frame_type = EI_INIT;
-static expert_field ei_amqp_field_short = EI_INIT;
-static expert_field ei_amqp_bad_length = EI_INIT;
-static expert_field ei_amqp_unknown_command_class = EI_INIT;
-static expert_field ei_amqp_unknown_tunnel_method = EI_INIT;
-static expert_field ei_amqp_unknown_confirm_method = EI_INIT;
-static expert_field ei_amqp_invalid_class_code = EI_INIT;
-static expert_field ei_amqp_unknown_access_method = EI_INIT;
-static expert_field ei_amqp_unknown_tx_method = EI_INIT;
-static expert_field ei_amqp_unknown_header_class = EI_INIT;
-static expert_field ei_amqp_unknown_connection_method = EI_INIT;
-static expert_field ei_amqp_unknown_queue_method = EI_INIT;
-static expert_field ei_amqp_unknown_channel_method = EI_INIT;
-static expert_field ei_amqp_unknown_dtx_method = EI_INIT;
-static expert_field ei_amqp_unknown_method_class = EI_INIT;
-static expert_field ei_amqp_unknown_file_method = EI_INIT;
-static expert_field ei_amqp_unknown_exchange_method = EI_INIT;
-static expert_field ei_amqp_unknown_sasl_command = EI_INIT;
-static expert_field ei_amqp_unknown_amqp_command = EI_INIT;
-static expert_field ei_amqp_unknown_amqp_type = EI_INIT;
-static expert_field ei_amqp_invalid_number_of_params = EI_INIT;
-static expert_field ei_amqp_size_exceeds_65K = EI_INIT;
-static expert_field ei_amqp_array_type_unknown = EI_INIT;
+static int hf_amqp_0_10_format;
+static int hf_amqp_0_10_position;
+static int hf_amqp_0_10_type;
+static int hf_amqp_0_10_size;
+static int hf_amqp_0_10_track;
+static int hf_amqp_0_10_class;
+static int hf_amqp_0_10_connection_method;
+static int hf_amqp_0_10_session_method;
+static int hf_amqp_0_10_execution_method;
+static int hf_amqp_0_10_message_method;
+static int hf_amqp_0_10_tx_method;
+static int hf_amqp_0_10_dtx_method;
+static int hf_amqp_0_10_exchange_method;
+static int hf_amqp_0_10_queue_method;
+static int hf_amqp_0_10_file_method;
+static int hf_amqp_0_10_stream_method;
+static int hf_amqp_0_10_argument_packing_flags;
+static int hf_amqp_0_10_session_header;
+static int hf_amqp_0_10_session_header_sync;
+static int hf_amqp_0_10_struct32_size;
+static int hf_amqp_0_10_struct32;
+static int hf_amqp_0_10_struct32_padding;
+static int hf_amqp_0_10_struct32_class;
+static int hf_amqp_0_10_struct32_struct;
+static int hf_amqp_0_10_array_type;
+static int hf_amqp_0_10_array_element_count;
+static int hf_amqp_0_10_array_string;
+static int hf_amqp_0_10_message_body;
+static int hf_amqp_0_10_dtx_xid;
+static int hf_amqp_0_10_dtx_xid_format;
+static int hf_amqp_0_10_dtx_xid_global_id;
+static int hf_amqp_0_10_dtx_xid_branch_id;
+static int hf_amqp_0_10_struct_delivery_properties_discard_unroutable;
+static int hf_amqp_0_10_struct_delivery_properties_immediate;
+static int hf_amqp_0_10_struct_delivery_properties_redelivered;
+static int hf_amqp_0_10_struct_delivery_properties_priority;
+static int hf_amqp_0_10_struct_delivery_properties_mode;
+static int hf_amqp_0_10_struct_delivery_properties_ttl;
+static int hf_amqp_0_10_struct_delivery_properties_timestamp;
+static int hf_amqp_0_10_struct_delivery_properties_expiration;
+static int hf_amqp_0_10_struct_delivery_properties_exchange;
+static int hf_amqp_0_10_struct_delivery_properties_routing_key;
+static int hf_amqp_0_10_struct_delivery_properties_resume_ttl;
+static int hf_amqp_0_10_struct_fragment_properties_first;
+static int hf_amqp_0_10_struct_fragment_properties_last;
+static int hf_amqp_0_10_struct_fragment_properties_size;
+/* static int hf_amqp_0_10_struct_message_properties; */
+static int hf_amqp_0_10_struct_message_properties_content_len;
+static int hf_amqp_0_10_struct_message_properties_message_id;
+static int hf_amqp_0_10_struct_message_properties_correlation;
+static int hf_amqp_0_10_struct_message_properties_reply_to;
+static int hf_amqp_0_10_struct_message_properties_content_type;
+static int hf_amqp_0_10_struct_message_properties_content_encoding;
+static int hf_amqp_0_10_struct_message_properties_user_id;
+static int hf_amqp_0_10_struct_message_properties_app_id;
+static int hf_amqp_0_10_struct_message_properties_application_headers;
+static int hf_amqp_0_10_struct_reply_to_exchange;
+static int hf_amqp_0_10_struct_reply_to_routing_key;
+static int hf_amqp_0_10_struct_acquired_transfers;
+static int hf_amqp_0_10_struct_resume_result_offset;
+static int hf_amqp_0_10_struct_exchange_query_result_durable;
+static int hf_amqp_0_10_struct_exchange_query_result_not_found;
+static int hf_amqp_0_10_struct_exchange_bound_result_exchange_not_found;
+static int hf_amqp_0_10_struct_exchange_bound_result_queue_not_found;
+static int hf_amqp_0_10_struct_exchange_bound_result_queue_not_matched;
+static int hf_amqp_0_10_struct_exchange_bound_result_key_not_matched;
+static int hf_amqp_0_10_struct_exchange_bound_result_args_not_matched;
+static int hf_amqp_0_10_struct_queue_query_result_durable;
+static int hf_amqp_0_10_struct_queue_query_result_exclusive;
+static int hf_amqp_0_10_struct_queue_query_result_auto_delete;
+static int hf_amqp_0_10_struct_queue_query_result_message_count;
+static int hf_amqp_0_10_struct_queue_query_result_subscriber_count;
+static int hf_amqp_0_10_struct_file_properties_content_type;
+static int hf_amqp_0_10_struct_file_properties_content_encoding;
+static int hf_amqp_0_10_struct_file_properties_headers;
+static int hf_amqp_0_10_struct_file_properties_priority;
+static int hf_amqp_0_10_struct_file_properties_reply_to;
+static int hf_amqp_0_10_struct_file_properties_message_id;
+static int hf_amqp_0_10_struct_file_properties_filename;
+static int hf_amqp_0_10_struct_file_properties_timestamp;
+static int hf_amqp_0_10_struct_file_properties_cluster_id;
+static int hf_amqp_0_10_struct_stream_properties_content_type;
+static int hf_amqp_0_10_struct_stream_properties_content_encoding;
+static int hf_amqp_0_10_struct_stream_properties_headers;
+static int hf_amqp_0_10_struct_stream_properties_priority;
+static int hf_amqp_0_10_struct_stream_properties_timestamp;
+static int hf_amqp_0_10_method_session_attach_name;
+static int hf_amqp_0_10_method_session_attach_name_size;
+static int hf_amqp_0_10_method_session_attach_force;
+static int hf_amqp_0_10_method_session_detached_code;
+static int hf_amqp_0_10_method_session_timeout;
+static int hf_amqp_0_10_method_session_completed_timely;
+static int hf_amqp_0_10_method_session_flush_expected;
+static int hf_amqp_0_10_method_session_flush_confirmed;
+static int hf_amqp_0_10_method_session_flush_completed;
+static int hf_amqp_0_10_method_session_command_point_id;
+static int hf_amqp_0_10_method_session_command_point_offset;
+static int hf_amqp_0_10_method_session_commands;
+static int hf_amqp_0_10_method_session_fragments;
+static int hf_amqp_0_10_method_execution_command_id;
+static int hf_amqp_0_10_method_execution_exception_error;
+static int hf_amqp_0_10_method_execution_field_index;
+static int hf_amqp_0_10_method_execution_description;
+static int hf_amqp_0_10_method_execution_error_info;
+static int hf_amqp_0_10_method_message_transfer_destination;
+static int hf_amqp_0_10_method_message_transfer_accept_mode;
+static int hf_amqp_0_10_method_message_transfer_acquire_mode;
+static int hf_amqp_0_10_method_message_accept_transfers;
+static int hf_amqp_0_10_method_message_transfer_reject_code;
+static int hf_amqp_0_10_method_message_reject_text;
+static int hf_amqp_0_10_method_message_release_set_redelivered;
+static int hf_amqp_0_10_method_message_dest;
+static int hf_amqp_0_10_method_message_resume_id;
+static int hf_amqp_0_10_method_message_subscribe_queue;
+static int hf_amqp_0_10_method_message_subscribe_exclusive;
+static int hf_amqp_0_10_method_message_subscribe_resume_ttl;
+static int hf_amqp_0_10_method_message_subscribe_args;
+static int hf_amqp_0_10_method_message_flow_mode;
+static int hf_amqp_0_10_method_message_credit_unit;
+static int hf_amqp_0_10_method_message_credit_value;
+static int hf_amqp_0_10_method_dtx_start_join;
+static int hf_amqp_0_10_method_dtx_start_resume;
+static int hf_amqp_0_10_method_dtx_end_fail;
+static int hf_amqp_0_10_method_dtx_end_suspend;
+static int hf_amqp_0_10_method_dtx_commit_one_phase;
+static int hf_amqp_0_10_method_dtx_set_timeout_timeout;
+static int hf_amqp_0_10_method_exchange_declare_exchange;
+static int hf_amqp_0_10_method_exchange_declare_type;
+static int hf_amqp_0_10_method_exchange_declare_alt_exchange;
+static int hf_amqp_0_10_method_exchange_declare_passive;
+static int hf_amqp_0_10_method_exchange_declare_durable;
+static int hf_amqp_0_10_method_exchange_declare_auto_delete;
+static int hf_amqp_0_10_method_exchange_declare_arguments;
+static int hf_amqp_0_10_method_exchange_delete_if_unused;
+static int hf_amqp_0_10_method_exchange_bind_queue;
+static int hf_amqp_0_10_method_exchange_binding_key;
+static int hf_amqp_0_10_method_queue_name;
+static int hf_amqp_0_10_method_queue_alt_exchange;
+static int hf_amqp_0_10_method_queue_declare_passive;
+static int hf_amqp_0_10_method_queue_declare_durable;
+static int hf_amqp_0_10_method_queue_declare_exclusive;
+static int hf_amqp_0_10_method_queue_declare_auto_delete;
+static int hf_amqp_0_10_method_queue_declare_arguments;
+static int hf_amqp_0_10_method_queue_delete_if_unused;
+static int hf_amqp_0_10_method_queue_delete_if_empty;
+static int hf_amqp_0_10_method_file_qos_prefetch_size;
+static int hf_amqp_0_10_method_file_qos_prefetch_count;
+static int hf_amqp_0_10_method_file_qos_global;
+static int hf_amqp_0_10_method_file_consumer_tag;
+static int hf_amqp_0_10_method_file_consume_no_local;
+static int hf_amqp_0_10_method_file_consume_no_ack;
+static int hf_amqp_0_10_method_file_consume_exclusive;
+static int hf_amqp_0_10_method_file_consume_nowait;
+static int hf_amqp_0_10_method_file_consume_arguments;
+static int hf_amqp_0_10_method_file_identifier;
+static int hf_amqp_0_10_method_file_open_content_size;
+static int hf_amqp_0_10_method_file_open_ok_staged_size;
+static int hf_amqp_0_10_method_file_publish_exchange;
+static int hf_amqp_0_10_method_file_publish_routing_key;
+static int hf_amqp_0_10_method_file_publish_mandatory;
+static int hf_amqp_0_10_method_file_publish_immediate;
+static int hf_amqp_0_10_method_file_return_reply_code;
+static int hf_amqp_0_10_method_file_return_reply_text;
+static int hf_amqp_0_10_method_file_return_exchange;
+static int hf_amqp_0_10_method_file_return_routing_key;
+static int hf_amqp_0_10_method_file_deliver_consumer_tag;
+static int hf_amqp_0_10_method_file_deliver_delivery_tag;
+static int hf_amqp_0_10_method_file_deliver_redelivered;
+static int hf_amqp_0_10_method_file_deliver_exchange;
+static int hf_amqp_0_10_method_file_deliver_routing_key;
+static int hf_amqp_0_10_method_file_ack_delivery_tag;
+static int hf_amqp_0_10_method_file_ack_multiple;
+static int hf_amqp_0_10_method_file_reject_delivery_tag;
+static int hf_amqp_0_10_method_file_reject_requeue;
+static int hf_amqp_0_10_method_stream_qos_prefetch_size;
+static int hf_amqp_0_10_method_stream_qos_prefetch_count;
+/* static int hf_amqp_0_10_method_stream_qos_consume_rate; */
+static int hf_amqp_0_10_method_stream_qos_global;
+static int hf_amqp_0_10_method_stream_consumer_tag;
+static int hf_amqp_0_10_method_stream_consume_no_local;
+static int hf_amqp_0_10_method_stream_consume_exclusive;
+static int hf_amqp_0_10_method_stream_consume_nowait;
+static int hf_amqp_0_10_method_stream_consume_arguments;
+static int hf_amqp_0_10_method_stream_publish_exchange;
+static int hf_amqp_0_10_method_stream_publish_routing_key;
+static int hf_amqp_0_10_method_stream_publish_mandatory;
+static int hf_amqp_0_10_method_stream_publish_immediate;
+static int hf_amqp_0_10_method_stream_return_reply_code;
+static int hf_amqp_0_10_method_stream_return_reply_text;
+static int hf_amqp_0_10_method_stream_return_exchange;
+static int hf_amqp_0_10_method_stream_return_routing_key;
+static int hf_amqp_0_10_method_stream_deliver_consumer_tag;
+static int hf_amqp_0_10_method_stream_deliver_delivery_tag;
+static int hf_amqp_0_10_method_stream_deliver_exchange;
+static int hf_amqp_0_10_method_stream_deliver_queue;
+static int hf_amqp_channel;
+static int hf_amqp_reserved;
+static int hf_amqp_0_9_type;
+static int hf_amqp_0_9_length;
+static int hf_amqp_0_9_method_class_id;
+static int hf_amqp_method_connection_method_id;
+static int hf_amqp_method_channel_method_id;
+static int hf_amqp_method_access_method_id;
+static int hf_amqp_method_exchange_method_id;
+static int hf_amqp_method_queue_method_id;
+static int hf_amqp_method_basic_method_id;
+static int hf_amqp_method_file_method_id;
+static int hf_amqp_method_stream_method_id;
+static int hf_amqp_method_tx_method_id;
+static int hf_amqp_method_dtx_method_id;
+static int hf_amqp_method_tunnel_method_id;
+static int hf_amqp_method_confirm_method_id;
+static int hf_amqp_method_arguments;
+static int hf_amqp_method_connection_start_version_major;
+static int hf_amqp_method_connection_start_version_minor;
+static int hf_amqp_method_connection_start_server_properties;
+static int hf_amqp_0_9_method_connection_start_mechanisms;
+static int hf_amqp_0_10_method_connection_start_mechanisms;
+static int hf_amqp_0_9_method_connection_start_locales;
+static int hf_amqp_0_10_method_connection_start_locales;
+static int hf_amqp_method_connection_start_ok_client_properties;
+static int hf_amqp_method_connection_start_ok_mechanism;
+static int hf_amqp_method_connection_start_ok_response;
+static int hf_amqp_method_connection_start_ok_locale;
+static int hf_amqp_method_connection_secure_challenge;
+static int hf_amqp_method_connection_secure_ok_response;
+static int hf_amqp_method_connection_tune_channel_max;
+static int hf_amqp_0_9_method_connection_tune_frame_max;
+static int hf_amqp_0_10_method_connection_tune_frame_max;
+static int hf_amqp_0_9_method_connection_tune_heartbeat;
+static int hf_amqp_0_10_method_connection_tune_heartbeat_min;
+static int hf_amqp_0_10_method_connection_tune_heartbeat_max;
+static int hf_amqp_method_connection_tune_ok_channel_max;
+static int hf_amqp_0_9_method_connection_tune_ok_frame_max;
+static int hf_amqp_0_10_method_connection_tune_ok_frame_max;
+static int hf_amqp_method_connection_tune_ok_heartbeat;
+static int hf_amqp_method_connection_open_virtual_host;
+static int hf_amqp_0_9_method_connection_open_capabilities;
+static int hf_amqp_0_10_method_connection_open_capabilities;
+static int hf_amqp_0_9_method_connection_open_insist;
+static int hf_amqp_0_10_method_connection_open_insist;
+static int hf_amqp_0_9_method_connection_open_ok_known_hosts;
+static int hf_amqp_0_10_method_connection_open_ok_known_hosts;
+static int hf_amqp_method_connection_redirect_host;
+static int hf_amqp_0_9_method_connection_redirect_known_hosts;
+static int hf_amqp_0_10_method_connection_redirect_known_hosts;
+static int hf_amqp_0_9_method_connection_close_reply_code;
+static int hf_amqp_0_10_method_connection_close_reply_code;
+static int hf_amqp_method_connection_close_reply_text;
+static int hf_amqp_method_connection_close_class_id;
+static int hf_amqp_method_connection_close_method_id;
+static int hf_amqp_method_connection_blocked_reason;
+static int hf_amqp_method_channel_open_out_of_band;
+static int hf_amqp_method_channel_open_ok_channel_id;
+static int hf_amqp_method_channel_flow_active;
+static int hf_amqp_method_channel_flow_ok_active;
+static int hf_amqp_method_channel_close_reply_code;
+static int hf_amqp_method_channel_close_reply_text;
+static int hf_amqp_method_channel_close_class_id;
+static int hf_amqp_method_channel_close_method_id;
+static int hf_amqp_method_channel_resume_channel_id;
+static int hf_amqp_method_access_request_realm;
+static int hf_amqp_method_access_request_exclusive;
+static int hf_amqp_method_access_request_passive;
+static int hf_amqp_method_access_request_active;
+static int hf_amqp_method_access_request_write;
+static int hf_amqp_method_access_request_read;
+static int hf_amqp_method_access_request_ok_ticket;
+static int hf_amqp_method_exchange_declare_ticket;
+static int hf_amqp_method_exchange_declare_exchange;
+static int hf_amqp_method_exchange_declare_type;
+static int hf_amqp_method_exchange_declare_passive;
+static int hf_amqp_method_exchange_declare_durable;
+static int hf_amqp_method_exchange_declare_auto_delete;
+static int hf_amqp_method_exchange_declare_internal;
+static int hf_amqp_method_exchange_declare_nowait;
+static int hf_amqp_method_exchange_declare_arguments;
+static int hf_amqp_method_exchange_bind_destination;
+static int hf_amqp_method_exchange_bind_source;
+static int hf_amqp_method_exchange_bind_routing_key;
+static int hf_amqp_method_exchange_bind_nowait;
+static int hf_amqp_method_exchange_bind_arguments;
+static int hf_amqp_method_exchange_delete_ticket;
+static int hf_amqp_method_exchange_delete_exchange;
+static int hf_amqp_method_exchange_delete_if_unused;
+static int hf_amqp_method_exchange_delete_nowait;
+static int hf_amqp_method_queue_declare_ticket;
+static int hf_amqp_method_queue_declare_queue;
+static int hf_amqp_method_queue_declare_passive;
+static int hf_amqp_method_queue_declare_durable;
+static int hf_amqp_method_queue_declare_exclusive;
+static int hf_amqp_method_queue_declare_auto_delete;
+static int hf_amqp_method_queue_declare_nowait;
+static int hf_amqp_method_queue_declare_arguments;
+static int hf_amqp_method_queue_declare_ok_queue;
+static int hf_amqp_method_queue_declare_ok_message_count;
+static int hf_amqp_method_queue_declare_ok_consumer_count;
+static int hf_amqp_method_queue_bind_ticket;
+static int hf_amqp_method_queue_bind_queue;
+static int hf_amqp_method_queue_bind_exchange;
+static int hf_amqp_method_queue_bind_routing_key;
+static int hf_amqp_method_queue_bind_nowait;
+static int hf_amqp_method_queue_bind_arguments;
+static int hf_amqp_method_queue_unbind_ticket;
+static int hf_amqp_method_queue_unbind_queue;
+static int hf_amqp_method_queue_unbind_exchange;
+static int hf_amqp_method_queue_unbind_routing_key;
+static int hf_amqp_method_queue_unbind_arguments;
+static int hf_amqp_method_queue_purge_ticket;
+static int hf_amqp_method_queue_purge_queue;
+static int hf_amqp_method_queue_purge_nowait;
+static int hf_amqp_method_queue_purge_ok_message_count;
+static int hf_amqp_method_queue_delete_ticket;
+static int hf_amqp_method_queue_delete_queue;
+static int hf_amqp_method_queue_delete_if_unused;
+static int hf_amqp_method_queue_delete_if_empty;
+static int hf_amqp_method_queue_delete_nowait;
+static int hf_amqp_method_queue_delete_ok_message_count;
+static int hf_amqp_method_basic_qos_prefetch_size;
+static int hf_amqp_method_basic_qos_prefetch_count;
+static int hf_amqp_method_basic_qos_global;
+static int hf_amqp_method_basic_consume_ticket;
+static int hf_amqp_method_basic_consume_queue;
+static int hf_amqp_method_basic_consume_consumer_tag;
+static int hf_amqp_method_basic_consume_no_local;
+static int hf_amqp_method_basic_consume_no_ack;
+static int hf_amqp_method_basic_consume_exclusive;
+static int hf_amqp_method_basic_consume_nowait;
+static int hf_amqp_method_basic_consume_filter;
+static int hf_amqp_method_basic_consume_ok_consumer_tag;
+static int hf_amqp_method_basic_cancel_consumer_tag;
+static int hf_amqp_method_basic_cancel_nowait;
+static int hf_amqp_method_basic_cancel_ok_consumer_tag;
+static int hf_amqp_method_basic_publish_number;
+static int hf_amqp_method_basic_publish_ticket;
+static int hf_amqp_method_basic_publish_exchange;
+static int hf_amqp_method_basic_publish_routing_key;
+static int hf_amqp_method_basic_publish_mandatory;
+static int hf_amqp_method_basic_publish_immediate;
+static int hf_amqp_method_basic_return_reply_code;
+static int hf_amqp_method_basic_return_reply_text;
+static int hf_amqp_method_basic_return_exchange;
+static int hf_amqp_method_basic_return_routing_key;
+static int hf_amqp_method_basic_deliver_consumer_tag;
+static int hf_amqp_method_basic_deliver_delivery_tag;
+static int hf_amqp_method_basic_deliver_redelivered;
+static int hf_amqp_method_basic_deliver_exchange;
+static int hf_amqp_method_basic_deliver_routing_key;
+static int hf_amqp_method_basic_get_ticket;
+static int hf_amqp_method_basic_get_queue;
+static int hf_amqp_method_basic_get_no_ack;
+static int hf_amqp_method_basic_get_ok_delivery_tag;
+static int hf_amqp_method_basic_get_ok_redelivered;
+static int hf_amqp_method_basic_get_ok_exchange;
+static int hf_amqp_method_basic_get_ok_routing_key;
+static int hf_amqp_method_basic_get_ok_message_count;
+static int hf_amqp_method_basic_get_empty_cluster_id;
+static int hf_amqp_method_basic_ack_delivery_tag;
+static int hf_amqp_method_basic_ack_multiple;
+static int hf_amqp_method_basic_reject_delivery_tag;
+static int hf_amqp_method_basic_reject_requeue;
+static int hf_amqp_method_basic_recover_requeue;
+static int hf_amqp_method_basic_nack_delivery_tag;
+static int hf_amqp_method_basic_nack_multiple;
+static int hf_amqp_method_basic_nack_requeue;
+static int hf_amqp_method_file_qos_prefetch_size;
+static int hf_amqp_method_file_qos_prefetch_count;
+static int hf_amqp_method_file_qos_global;
+static int hf_amqp_method_file_consume_ticket;
+static int hf_amqp_method_file_consume_queue;
+static int hf_amqp_method_file_consume_consumer_tag;
+static int hf_amqp_method_file_consume_no_local;
+static int hf_amqp_method_file_consume_no_ack;
+static int hf_amqp_method_file_consume_exclusive;
+static int hf_amqp_method_file_consume_nowait;
+static int hf_amqp_method_file_consume_filter;
+static int hf_amqp_method_file_consume_ok_consumer_tag;
+static int hf_amqp_method_file_cancel_consumer_tag;
+static int hf_amqp_method_file_cancel_nowait;
+static int hf_amqp_method_file_cancel_ok_consumer_tag;
+static int hf_amqp_method_file_open_identifier;
+static int hf_amqp_method_file_open_content_size;
+static int hf_amqp_method_file_open_ok_staged_size;
+static int hf_amqp_method_file_publish_ticket;
+static int hf_amqp_method_file_publish_exchange;
+static int hf_amqp_method_file_publish_routing_key;
+static int hf_amqp_method_file_publish_mandatory;
+static int hf_amqp_method_file_publish_immediate;
+static int hf_amqp_method_file_publish_identifier;
+static int hf_amqp_method_file_return_reply_code;
+static int hf_amqp_method_file_return_reply_text;
+static int hf_amqp_method_file_return_exchange;
+static int hf_amqp_method_file_return_routing_key;
+static int hf_amqp_method_file_deliver_consumer_tag;
+static int hf_amqp_method_file_deliver_delivery_tag;
+static int hf_amqp_method_file_deliver_redelivered;
+static int hf_amqp_method_file_deliver_exchange;
+static int hf_amqp_method_file_deliver_routing_key;
+static int hf_amqp_method_file_deliver_identifier;
+static int hf_amqp_method_file_ack_delivery_tag;
+static int hf_amqp_method_file_ack_multiple;
+static int hf_amqp_method_file_reject_delivery_tag;
+static int hf_amqp_method_file_reject_requeue;
+static int hf_amqp_method_stream_qos_prefetch_size;
+static int hf_amqp_method_stream_qos_prefetch_count;
+static int hf_amqp_method_stream_qos_consume_rate;
+static int hf_amqp_method_stream_qos_global;
+static int hf_amqp_method_stream_consume_ticket;
+static int hf_amqp_method_stream_consume_queue;
+static int hf_amqp_method_stream_consume_consumer_tag;
+static int hf_amqp_method_stream_consume_no_local;
+static int hf_amqp_method_stream_consume_exclusive;
+static int hf_amqp_method_stream_consume_nowait;
+static int hf_amqp_method_stream_consume_filter;
+static int hf_amqp_method_stream_consume_ok_consumer_tag;
+static int hf_amqp_method_stream_cancel_consumer_tag;
+static int hf_amqp_method_stream_cancel_nowait;
+static int hf_amqp_method_stream_cancel_ok_consumer_tag;
+static int hf_amqp_method_stream_publish_ticket;
+static int hf_amqp_method_stream_publish_exchange;
+static int hf_amqp_method_stream_publish_routing_key;
+static int hf_amqp_method_stream_publish_mandatory;
+static int hf_amqp_method_stream_publish_immediate;
+static int hf_amqp_method_stream_return_reply_code;
+static int hf_amqp_method_stream_return_reply_text;
+static int hf_amqp_method_stream_return_exchange;
+static int hf_amqp_method_stream_return_routing_key;
+static int hf_amqp_method_stream_deliver_consumer_tag;
+static int hf_amqp_method_stream_deliver_delivery_tag;
+static int hf_amqp_method_stream_deliver_exchange;
+static int hf_amqp_method_stream_deliver_queue;
+static int hf_amqp_method_dtx_start_dtx_identifier;
+static int hf_amqp_method_tunnel_request_meta_data;
+static int hf_amqp_method_confirm_select_nowait;
+static int hf_amqp_field;
+static int hf_amqp_field_name;
+static int hf_amqp_field_type;
+static int hf_amqp_field_integer;
+static int hf_amqp_field_unsigned_integer;
+static int hf_amqp_field_string;
+static int hf_amqp_field_boolean;
+static int hf_amqp_field_byte;
+static int hf_amqp_field_unsigned_byte;
+static int hf_amqp_field_short_int;
+static int hf_amqp_field_short_uint;
+static int hf_amqp_field_long_int;
+static int hf_amqp_field_float;
+static int hf_amqp_field_double;
+static int hf_amqp_field_decimal;
+static int hf_amqp_field_timestamp;
+static int hf_amqp_field_byte_array;
+static int hf_amqp_header_class_id;
+static int hf_amqp_header_weight;
+static int hf_amqp_header_body_size;
+static int hf_amqp_header_property_flags;
+static int hf_amqp_header_properties;
+static int hf_amqp_header_basic_content_type;
+static int hf_amqp_header_basic_content_encoding;
+static int hf_amqp_header_basic_headers;
+static int hf_amqp_header_basic_delivery_mode;
+static int hf_amqp_header_basic_priority;
+static int hf_amqp_header_basic_correlation_id;
+static int hf_amqp_header_basic_reply_to;
+static int hf_amqp_header_basic_expiration;
+static int hf_amqp_header_basic_message_id;
+static int hf_amqp_header_basic_timestamp;
+static int hf_amqp_header_basic_type;
+static int hf_amqp_header_basic_user_id;
+static int hf_amqp_header_basic_app_id;
+static int hf_amqp_header_basic_cluster_id;
+static int hf_amqp_header_file_content_type;
+static int hf_amqp_header_file_content_encoding;
+static int hf_amqp_header_file_headers;
+static int hf_amqp_header_file_priority;
+static int hf_amqp_header_file_reply_to;
+static int hf_amqp_header_file_message_id;
+static int hf_amqp_header_file_filename;
+static int hf_amqp_header_file_timestamp;
+static int hf_amqp_header_file_cluster_id;
+static int hf_amqp_header_stream_content_type;
+static int hf_amqp_header_stream_content_encoding;
+static int hf_amqp_header_stream_headers;
+static int hf_amqp_header_stream_priority;
+static int hf_amqp_header_stream_timestamp;
+static int hf_amqp_header_tunnel_headers;
+static int hf_amqp_header_tunnel_proxy_name;
+static int hf_amqp_header_tunnel_data_name;
+static int hf_amqp_header_tunnel_durable;
+static int hf_amqp_header_tunnel_broadcast;
+static int hf_amqp_0_10_dtx_xa_status;
+static int hf_amqp_payload;
+static int hf_amqp_init_protocol;
+static int hf_amqp_init_id;
+static int hf_amqp_init_id_major;
+static int hf_amqp_init_id_minor;
+static int hf_amqp_init_version_major;
+static int hf_amqp_init_version_minor;
+static int hf_amqp_init_version_revision;
+static int hf_amqp_message_in;
+static int hf_amqp_ack_in;
+static int hf_amqp_method_connection_start_server_properties_size;
+static int hf_amqp_0_10_method_connection_start_mechanisms_size;
+static int hf_amqp_0_10_method_connection_start_locales_size;
+static int hf_amqp_method_connection_start_ok_client_properties_size;
+static int hf_amqp_0_10_method_connection_open_capabilities_size;
+static int hf_amqp_0_10_method_connection_open_ok_known_hosts_size;
+static int hf_amqp_0_10_method_connection_redirect_known_hosts_size;
+static int hf_amqp_0_10_method_execution_error_info_size;
+static int hf_amqp_0_10_method_exchange_declare_arguments_size;
+static int hf_amqp_0_10_method_queue_declare_arguments_size;
+static int hf_amqp_0_10_method_file_consume_arguments_size;
+static int hf_amqp_0_10_method_stream_consume_arguments_size;
+static int hf_amqp_0_10_struct_message_properties_application_headers_size;
+static int hf_amqp_0_10_struct_file_properties_headers_size;
+static int hf_amqp_0_10_struct_stream_properties_headers_size;
+static int hf_amqp_0_10_struct_dtx_recover_result_size;
+
+static gint ett_amqp;
+static gint ett_header;
+static gint ett_args;
+static gint ett_props;
+static gint ett_field_table;
+static gint ett_amqp_init;
+static gint ett_amqp_0_9_field;
+static gint ett_amqp_0_10_map;
+static gint ett_amqp_0_10_array;
+static gint ett_amqp_0_10_struct;
+static gint ett_amqp_1_0_list;
+static gint ett_amqp_1_0_array;
+static gint ett_amqp_1_0_map;
+
+static expert_field ei_amqp_connection_error;
+static expert_field ei_amqp_channel_error;
+static expert_field ei_amqp_message_undeliverable;
+static expert_field ei_amqp_bad_flag_value;
+static expert_field ei_amqp_unknown_stream_method;
+static expert_field ei_amqp_unknown_basic_method;
+static expert_field ei_amqp_unknown_frame_type;
+static expert_field ei_amqp_field_short;
+static expert_field ei_amqp_bad_length;
+static expert_field ei_amqp_unknown_command_class;
+static expert_field ei_amqp_unknown_tunnel_method;
+static expert_field ei_amqp_unknown_confirm_method;
+static expert_field ei_amqp_invalid_class_code;
+static expert_field ei_amqp_unknown_access_method;
+static expert_field ei_amqp_unknown_tx_method;
+static expert_field ei_amqp_unknown_header_class;
+static expert_field ei_amqp_unknown_connection_method;
+static expert_field ei_amqp_unknown_queue_method;
+static expert_field ei_amqp_unknown_channel_method;
+static expert_field ei_amqp_unknown_dtx_method;
+static expert_field ei_amqp_unknown_method_class;
+static expert_field ei_amqp_unknown_file_method;
+static expert_field ei_amqp_unknown_exchange_method;
+static expert_field ei_amqp_unknown_sasl_command;
+static expert_field ei_amqp_unknown_amqp_command;
+static expert_field ei_amqp_unknown_amqp_type;
+static expert_field ei_amqp_invalid_number_of_params;
+static expert_field ei_amqp_size_exceeds_65K;
+static expert_field ei_amqp_array_type_unknown;
 
 static dissector_handle_t amqp_tcp_handle = NULL;
 
diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c
index 2a647bd6cd..4f029d410a 100644
--- a/epan/dissectors/packet-amr.c
+++ b/epan/dissectors/packet-amr.c
@@ -42,47 +42,47 @@ static dissector_handle_t amr_handle;
 static dissector_handle_t amr_wb_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_amr = -1;
-static int proto_amr_wb = -1;
-static int hf_amr_nb_cmr = -1;
-static int hf_amr_wb_cmr = -1;
-static int hf_amr_payload_decoded_as = -1;
-static int hf_amr_reserved = -1;
-static int hf_amr_toc_f = -1;
-static int hf_amr_nb_toc_ft = -1;
-static int hf_amr_wb_toc_ft = -1;
-static int hf_amr_toc_q = -1;
-
-static int hf_amr_speech_data = -1;
-static int hf_amr_frame_data = -1;
-static int hf_amr_nb_if1_ft = -1;
-static int hf_amr_wb_if1_ft = -1;
-static int hf_amr_if1_fqi = -1;
-static int hf_amr_nb_if1_mode_req = -1;
-static int hf_amr_wb_if1_mode_req = -1;
-static int hf_amr_if1_sti = -1;
-static int hf_amr_nb_if1_mode_ind = -1;
-static int hf_amr_wb_if1_mode_ind = -1;
-static int hf_amr_nb_if1_sti_mode_ind = -1;
-static int hf_amr_wb_if1_sti_mode_ind = -1;
-static int hf_amr_if2_sti = -1;
-static int hf_amr_nb_if2_sti_mode_ind = -1;
-static int hf_amr_wb_if2_sti_mode_ind = -1;
-
-static int hf_amr_nb_if2_ft = -1;
-static int hf_amr_wb_if2_ft = -1;
+static int proto_amr;
+static int proto_amr_wb;
+static int hf_amr_nb_cmr;
+static int hf_amr_wb_cmr;
+static int hf_amr_payload_decoded_as;
+static int hf_amr_reserved;
+static int hf_amr_toc_f;
+static int hf_amr_nb_toc_ft;
+static int hf_amr_wb_toc_ft;
+static int hf_amr_toc_q;
+
+static int hf_amr_speech_data;
+static int hf_amr_frame_data;
+static int hf_amr_nb_if1_ft;
+static int hf_amr_wb_if1_ft;
+static int hf_amr_if1_fqi;
+static int hf_amr_nb_if1_mode_req;
+static int hf_amr_wb_if1_mode_req;
+static int hf_amr_if1_sti;
+static int hf_amr_nb_if1_mode_ind;
+static int hf_amr_wb_if1_mode_ind;
+static int hf_amr_nb_if1_sti_mode_ind;
+static int hf_amr_wb_if1_sti_mode_ind;
+static int hf_amr_if2_sti;
+static int hf_amr_nb_if2_sti_mode_ind;
+static int hf_amr_wb_if2_sti_mode_ind;
+
+static int hf_amr_nb_if2_ft;
+static int hf_amr_wb_if2_ft;
 
 
 /* Initialize the subtree pointers */
-static int ett_amr = -1;
-static int ett_amr_toc = -1;
-
-static expert_field ei_amr_spare_bit_not0 = EI_INIT;
-static expert_field ei_amr_not_enough_data_for_frames = EI_INIT;
-static expert_field ei_amr_superfluous_data = EI_INIT;
-static expert_field ei_amr_padding_bits_not0 = EI_INIT;
-static expert_field ei_amr_padding_bits_correct = EI_INIT;
-static expert_field ei_amr_reserved = EI_INIT;
+static int ett_amr;
+static int ett_amr_toc;
+
+static expert_field ei_amr_spare_bit_not0;
+static expert_field ei_amr_not_enough_data_for_frames;
+static expert_field ei_amr_superfluous_data;
+static expert_field ei_amr_padding_bits_not0;
+static expert_field ei_amr_padding_bits_correct;
+static expert_field ei_amr_reserved;
 
 static gint  amr_encoding_type         = AMR_OA;
 static gint  pref_amr_mode             = AMR_NB;
diff --git a/epan/dissectors/packet-amt.c b/epan/dissectors/packet-amt.c
index 05dc47ebf6..1028850d5b 100644
--- a/epan/dissectors/packet-amt.c
+++ b/epan/dissectors/packet-amt.c
@@ -24,28 +24,28 @@ void proto_register_amt(void);
 
 static dissector_handle_t amt_handle;
 
-static int proto_amt = -1;
-static int hf_amt_version = -1;
-static int hf_amt_type = -1;
-static int hf_amt_reserved = -1;
-static int hf_amt_discovery_nonce = -1;
-static int hf_amt_relay_address_ipv4 = -1;
-static int hf_amt_relay_address_ipv6 = -1;
-static int hf_amt_request_nonce = -1;
-static int hf_amt_request_reserved = -1;
-static int hf_amt_request_p = -1;
-static int hf_amt_membership_query_reserved = -1;
-static int hf_amt_membership_query_l = -1;
-static int hf_amt_membership_query_g = -1;
-static int hf_amt_response_mac = -1;
-static int hf_amt_gateway_port_number = -1;
-static int hf_amt_gateway_ip_address = -1;
-static int hf_amt_multicast_data = -1;
-
-static expert_field ei_amt_relay_address_unknown = EI_INIT;
-static expert_field ei_amt_unknown = EI_INIT;
-
-static gint ett_amt = -1;
+static int proto_amt;
+static int hf_amt_version;
+static int hf_amt_type;
+static int hf_amt_reserved;
+static int hf_amt_discovery_nonce;
+static int hf_amt_relay_address_ipv4;
+static int hf_amt_relay_address_ipv6;
+static int hf_amt_request_nonce;
+static int hf_amt_request_reserved;
+static int hf_amt_request_p;
+static int hf_amt_membership_query_reserved;
+static int hf_amt_membership_query_l;
+static int hf_amt_membership_query_g;
+static int hf_amt_response_mac;
+static int hf_amt_gateway_port_number;
+static int hf_amt_gateway_ip_address;
+static int hf_amt_multicast_data;
+
+static expert_field ei_amt_relay_address_unknown;
+static expert_field ei_amt_unknown;
+
+static gint ett_amt;
 
 #define RELAY_DISCOVERY         1
 #define RELAY_ADVERTISEMENT     2
diff --git a/epan/dissectors/packet-ancp.c b/epan/dissectors/packet-ancp.c
index 4fedf7d0c0..1de1ecf7d7 100644
--- a/epan/dissectors/packet-ancp.c
+++ b/epan/dissectors/packet-ancp.c
@@ -61,84 +61,84 @@ void proto_reg_handoff_ancp(void);
 
 static dissector_handle_t ancp_handle;
 
-static int hf_ancp_len = -1;
-static int hf_ancp_len2 = -1;
-static int hf_ancp_ver = -1;
-static int hf_ancp_mtype = -1;
-static int hf_ancp_timer = -1;
-static int hf_ancp_adj_code = -1;
-static int hf_ancp_sender_name = -1;
-static int hf_ancp_receiver_name = -1;
-static int hf_ancp_sender_port = -1;
-static int hf_ancp_receiver_port = -1;
-static int hf_ancp_p_info = -1;
-static int hf_ancp_sender_instance = -1;
-static int hf_ancp_p_id = -1;
-static int hf_ancp_receiver_instance = -1;
-static int hf_ancp_tech_type = -1;
-static int hf_ancp_num_tlvs = -1;
-static int hf_ancp_tot_len = -1;
-static int hf_ancp_cap = -1;
-static int hf_ancp_result = -1;
-static int hf_ancp_code = -1;
-static int hf_ancp_trans_id = -1;
-static int hf_ancp_i_flag = -1;
-static int hf_ancp_submsg_num = -1;
-static int hf_ancp_pudm_unused = -1;
-static int hf_ancp_function = -1;
-static int hf_ancp_x_function = -1;
-static int hf_ancp_ext_flags_res = -1;
-static int hf_ancp_reserved = -1;
-static int hf_ancp_blk_len = -1;
-static int hf_ancp_num_ext_tlvs = -1;
-static int hf_ancp_ext_tlv_type = -1;
-static int hf_ancp_ext_tlv_len = -1;
-static int hf_ancp_dsl_line_stlv_type = -1;
-static int hf_ancp_dsl_line_stlv_len = -1;
-static int hf_ancp_dsl_line_stlv_value = -1;
-static int hf_ancp_ext_tlv_value_str = -1;
-static int hf_ancp_oam_opaque = -1;
-static int hf_ancp_oam_loopb_cnt = -1;
-static int hf_ancp_oam_timeout = -1;
-
-static gint ett_ancp_len = -1;
-static gint ett_ancp_ver = -1;
-static gint ett_ancp_mtype = -1;
-static gint ett_ancp_timer = -1;
-static gint ett_ancp_adj_code = -1;
-static gint ett_ancp_sender_name = -1;
-static gint ett_ancp_receiver_name = -1;
-static gint ett_ancp_sender_port = -1;
-static gint ett_ancp_receiver_port = -1;
-static gint ett_ancp_p_info = -1;
-static gint ett_ancp_sender_instance = -1;
-static gint ett_ancp_p_id = -1;
-static gint ett_ancp_receiver_instance = -1;
-static gint ett_ancp_tech_type = -1;
-static gint ett_ancp_num_tlvs = -1;
-static gint ett_ancp_tot_len = -1;
-static gint ett_ancp_cap = -1;
-static gint ett_ancp_result = -1;
-static gint ett_ancp_code = -1;
-static gint ett_ancp_trans_id = -1;
-static gint ett_ancp_i_flag = -1;
-static gint ett_ancp_submsg_num = -1;
-static gint ett_ancp_port = -1;
-static gint ett_ancp_port_sess_num= -1;
-static gint ett_ancp_evt_seq_num = -1;
-static gint ett_ancp_label = -1;
-static gint ett_ancp_reserved = -1;
-static gint ett_ancp_blk_len = -1;
-static gint ett_ancp_num_ext_tlvs = -1;
-static gint ett_ancp_ext_tlv_type = -1;
-static gint ett_ancp_dsl_line_stlv_type = -1;
-static gint ett_ancp_dsl_line_stlv_val = -1;
-static gint ett_ancp_ext_tlv_value_str = -1;
-static gint ett_ancp_oam_opaque = -1;
-static gint ett_ancp_oam_loopb_cnt = -1;
-static gint ett_ancp_oam_timeout = -1;
-
-static int proto_ancp = -1;
+static int hf_ancp_len;
+static int hf_ancp_len2;
+static int hf_ancp_ver;
+static int hf_ancp_mtype;
+static int hf_ancp_timer;
+static int hf_ancp_adj_code;
+static int hf_ancp_sender_name;
+static int hf_ancp_receiver_name;
+static int hf_ancp_sender_port;
+static int hf_ancp_receiver_port;
+static int hf_ancp_p_info;
+static int hf_ancp_sender_instance;
+static int hf_ancp_p_id;
+static int hf_ancp_receiver_instance;
+static int hf_ancp_tech_type;
+static int hf_ancp_num_tlvs;
+static int hf_ancp_tot_len;
+static int hf_ancp_cap;
+static int hf_ancp_result;
+static int hf_ancp_code;
+static int hf_ancp_trans_id;
+static int hf_ancp_i_flag;
+static int hf_ancp_submsg_num;
+static int hf_ancp_pudm_unused;
+static int hf_ancp_function;
+static int hf_ancp_x_function;
+static int hf_ancp_ext_flags_res;
+static int hf_ancp_reserved;
+static int hf_ancp_blk_len;
+static int hf_ancp_num_ext_tlvs;
+static int hf_ancp_ext_tlv_type;
+static int hf_ancp_ext_tlv_len;
+static int hf_ancp_dsl_line_stlv_type;
+static int hf_ancp_dsl_line_stlv_len;
+static int hf_ancp_dsl_line_stlv_value;
+static int hf_ancp_ext_tlv_value_str;
+static int hf_ancp_oam_opaque;
+static int hf_ancp_oam_loopb_cnt;
+static int hf_ancp_oam_timeout;
+
+static gint ett_ancp_len;
+static gint ett_ancp_ver;
+static gint ett_ancp_mtype;
+static gint ett_ancp_timer;
+static gint ett_ancp_adj_code;
+static gint ett_ancp_sender_name;
+static gint ett_ancp_receiver_name;
+static gint ett_ancp_sender_port;
+static gint ett_ancp_receiver_port;
+static gint ett_ancp_p_info;
+static gint ett_ancp_sender_instance;
+static gint ett_ancp_p_id;
+static gint ett_ancp_receiver_instance;
+static gint ett_ancp_tech_type;
+static gint ett_ancp_num_tlvs;
+static gint ett_ancp_tot_len;
+static gint ett_ancp_cap;
+static gint ett_ancp_result;
+static gint ett_ancp_code;
+static gint ett_ancp_trans_id;
+static gint ett_ancp_i_flag;
+static gint ett_ancp_submsg_num;
+static gint ett_ancp_port;
+static gint ett_ancp_port_sess_num;
+static gint ett_ancp_evt_seq_num;
+static gint ett_ancp_label;
+static gint ett_ancp_reserved;
+static gint ett_ancp_blk_len;
+static gint ett_ancp_num_ext_tlvs;
+static gint ett_ancp_ext_tlv_type;
+static gint ett_ancp_dsl_line_stlv_type;
+static gint ett_ancp_dsl_line_stlv_val;
+static gint ett_ancp_ext_tlv_value_str;
+static gint ett_ancp_oam_opaque;
+static gint ett_ancp_oam_loopb_cnt;
+static gint ett_ancp_oam_timeout;
+
+static int proto_ancp;
 
 /* ANCP stats - Tap interface */
 static const guint8 *st_str_packets        = "Total Packets";
diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c
index 16f72512ab..11458fbb96 100644
--- a/epan/dissectors/packet-ans.c
+++ b/epan/dissectors/packet-ans.c
@@ -41,16 +41,16 @@ void proto_reg_handoff_ans(void);
 static dissector_handle_t ans_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_ans        = -1;
+static int proto_ans;
 
-static int hf_ans_app_id    = -1;
-static int hf_ans_rev_id    = -1;
-static int hf_ans_seq_num   = -1;
-static int hf_ans_sender_id = -1;
-static int hf_ans_team_id   = -1;
+static int hf_ans_app_id;
+static int hf_ans_rev_id;
+static int hf_ans_seq_num;
+static int hf_ans_sender_id;
+static int hf_ans_team_id;
 
 /* Initialize the subtree pointers */
-static gint ett_ans = -1;
+static gint ett_ans;
 
 /* Code to actually dissect the packets */
 static int
diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c
index 03b77c64ef..c438556285 100644
--- a/epan/dissectors/packet-ansi_637.c
+++ b/epan/dissectors/packet-ansi_637.c
@@ -196,138 +196,138 @@ static const unsigned char air_digits[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_ansi_637_tele = -1;
-static int proto_ansi_637_trans = -1;
-
-static int hf_ansi_637_trans_param_id = -1;
-static int hf_ansi_637_trans_length = -1;
-static int hf_ansi_637_trans_bin_addr = -1;
-static int hf_ansi_637_trans_tele_id = -1;
-static int hf_ansi_637_trans_srvc_cat = -1;
-static int hf_ansi_637_trans_addr_param_digit_mode = -1;
-static int hf_ansi_637_trans_addr_param_number_mode = -1;
-static int hf_ansi_637_trans_addr_param_ton = -1;
-static int hf_ansi_637_trans_addr_param_plan = -1;
-static int hf_ansi_637_trans_addr_param_num_fields = -1;
-static int hf_ansi_637_trans_addr_param_number = -1;
-static int hf_ansi_637_trans_subaddr_type = -1;
-static int hf_ansi_637_trans_subaddr_odd_even_ind = -1;
-static int hf_ansi_637_trans_subaddr_num_fields = -1;
-static int hf_ansi_637_trans_bearer_reply_seq_num = -1;
-static int hf_ansi_637_trans_cause_codes_seq_num = -1;
-static int hf_ansi_637_trans_cause_codes_error_class = -1;
-static int hf_ansi_637_trans_cause_codes_code = -1;
-
-static int hf_ansi_637_tele_msg_type = -1;
-static int hf_ansi_637_tele_msg_id = -1;
-static int hf_ansi_637_tele_length = -1;
-static int hf_ansi_637_tele_msg_status = -1;
-static int hf_ansi_637_tele_msg_header_ind = -1;
-static int hf_ansi_637_tele_msg_rsvd = -1;
-static int hf_ansi_637_tele_subparam_id = -1;
-static int hf_ansi_637_tele_user_data_text = -1;
-static int hf_ansi_637_tele_user_data_encoding = -1;
-static int hf_ansi_637_tele_user_data_message_type = -1;
-static int hf_ansi_637_tele_user_data_num_fields = -1;
-static int hf_ansi_637_tele_response_code = -1;
-static int hf_ansi_637_tele_message_center_ts_year = -1;
-static int hf_ansi_637_tele_message_center_ts_month = -1;
-static int hf_ansi_637_tele_message_center_ts_day = -1;
-static int hf_ansi_637_tele_message_center_ts_hours = -1;
-static int hf_ansi_637_tele_message_center_ts_minutes = -1;
-static int hf_ansi_637_tele_message_center_ts_seconds = -1;
-static int hf_ansi_637_tele_validity_period_ts_year = -1;
-static int hf_ansi_637_tele_validity_period_ts_month = -1;
-static int hf_ansi_637_tele_validity_period_ts_day = -1;
-static int hf_ansi_637_tele_validity_period_ts_hours = -1;
-static int hf_ansi_637_tele_validity_period_ts_minutes = -1;
-static int hf_ansi_637_tele_validity_period_ts_seconds = -1;
-static int hf_ansi_637_tele_validity_period_relative_validity = -1;
-static int hf_ansi_637_tele_deferred_del_ts_year = -1;
-static int hf_ansi_637_tele_deferred_del_ts_month = -1;
-static int hf_ansi_637_tele_deferred_del_ts_day = -1;
-static int hf_ansi_637_tele_deferred_del_ts_hours = -1;
-static int hf_ansi_637_tele_deferred_del_ts_minutes = -1;
-static int hf_ansi_637_tele_deferred_del_ts_seconds = -1;
-static int hf_ansi_637_tele_deferred_del_relative = -1;
-static int hf_ansi_637_tele_priority_indicator = -1;
-static int hf_ansi_637_tele_privacy_indicator = -1;
-static int hf_ansi_637_tele_reply_option_user_ack_req = -1;
-static int hf_ansi_637_tele_reply_option_dak_req = -1;
-static int hf_ansi_637_tele_reply_option_read_ack_req = -1;
-static int hf_ansi_637_tele_reply_option_report_req = -1;
-static int hf_ansi_637_tele_num_messages = -1;
-static int hf_ansi_637_tele_alert_msg_delivery_priority = -1;
-static int hf_ansi_637_tele_language = -1;
-static int hf_ansi_637_tele_cb_num_digit_mode = -1;
-static int hf_ansi_637_tele_cb_num_ton = -1;
-static int hf_ansi_637_tele_cb_num_plan = -1;
-static int hf_ansi_637_tele_cb_num_num_fields = -1;
-static int hf_ansi_637_tele_cb_num_num_fields07f8 = -1;
-static int hf_ansi_637_tele_cb_num_number = -1;
-static int hf_ansi_637_tele_msg_display_mode = -1;
-static int hf_ansi_637_tele_msg_deposit_idx = -1;
-static int hf_ansi_637_tele_srvc_cat_prog_results_srvc_cat = -1;
-static int hf_ansi_637_tele_srvc_cat_prog_results_result = -1;
-static int hf_ansi_637_tele_msg_status_error_class = -1;
-static int hf_ansi_637_tele_msg_status_code = -1;
-static int hf_ansi_637_tele_tp_failure_cause_value = -1;
-static int hf_ansi_637_reserved_bits_8_generic = -1;
-static int hf_ansi_637_reserved_bits_8_03 = -1;
-static int hf_ansi_637_reserved_bits_8_07 = -1;
-static int hf_ansi_637_reserved_bits_8_0f = -1;
-static int hf_ansi_637_reserved_bits_8_3f = -1;
-static int hf_ansi_637_reserved_bits_8_7f = -1;
-static int hf_ansi_637_reserved_bits_16_generic = -1;
-static int hf_ansi_637_tele_cmas_encoding = -1;
-static int hf_ansi_637_tele_cmas_num_fields = -1;
-static int hf_ansi_637_tele_cmas_protocol_version = -1;
-static int hf_ansi_637_tele_cmas_record_type = -1;
-static int hf_ansi_637_tele_cmas_record_len = -1;
-static int hf_ansi_637_tele_cmas_char_set = -1;
-static int hf_ansi_637_tele_cmas_category = -1;
-static int hf_ansi_637_tele_cmas_response_type = -1;
-static int hf_ansi_637_tele_cmas_severity = -1;
-static int hf_ansi_637_tele_cmas_urgency = -1;
-static int hf_ansi_637_tele_cmas_certainty = -1;
-static int hf_ansi_637_tele_cmas_identifier = -1;
-static int hf_ansi_637_tele_cmas_alert_handling = -1;
-static int hf_ansi_637_tele_cmas_expires_year = -1;
-static int hf_ansi_637_tele_cmas_expires_month = -1;
-static int hf_ansi_637_tele_cmas_expires_day = -1;
-static int hf_ansi_637_tele_cmas_expires_hours = -1;
-static int hf_ansi_637_tele_cmas_expires_minutes = -1;
-static int hf_ansi_637_tele_cmas_expires_seconds = -1;
-static int hf_ansi_637_tele_cmas_language = -1;
-static int hf_ansi_637_tele_cmas_text = -1;
-static int hf_ansi_637_tele_mult_enc_user_data_encoding = -1;
-static int hf_ansi_637_tele_mult_enc_user_data_num_fields = -1;
-static int hf_ansi_637_tele_mult_enc_user_data_text = -1;
-static int hf_ansi_637_tele_srvc_cat_prog_data_encoding = -1;
-static int hf_ansi_637_tele_srvc_cat_prog_data_operation_code = -1;
-static int hf_ansi_637_tele_srvc_cat_prog_data_category = -1;
-static int hf_ansi_637_tele_srvc_cat_prog_data_language = -1;
-static int hf_ansi_637_tele_srvc_cat_prog_data_max_messages = -1;
-static int hf_ansi_637_tele_srvc_cat_prog_data_alert_option = -1;
-static int hf_ansi_637_tele_srvc_cat_prog_data_num_fields = -1;
-static int hf_ansi_637_tele_srvc_cat_prog_data_text = -1;
+static int proto_ansi_637_tele;
+static int proto_ansi_637_trans;
+
+static int hf_ansi_637_trans_param_id;
+static int hf_ansi_637_trans_length;
+static int hf_ansi_637_trans_bin_addr;
+static int hf_ansi_637_trans_tele_id;
+static int hf_ansi_637_trans_srvc_cat;
+static int hf_ansi_637_trans_addr_param_digit_mode;
+static int hf_ansi_637_trans_addr_param_number_mode;
+static int hf_ansi_637_trans_addr_param_ton;
+static int hf_ansi_637_trans_addr_param_plan;
+static int hf_ansi_637_trans_addr_param_num_fields;
+static int hf_ansi_637_trans_addr_param_number;
+static int hf_ansi_637_trans_subaddr_type;
+static int hf_ansi_637_trans_subaddr_odd_even_ind;
+static int hf_ansi_637_trans_subaddr_num_fields;
+static int hf_ansi_637_trans_bearer_reply_seq_num;
+static int hf_ansi_637_trans_cause_codes_seq_num;
+static int hf_ansi_637_trans_cause_codes_error_class;
+static int hf_ansi_637_trans_cause_codes_code;
+
+static int hf_ansi_637_tele_msg_type;
+static int hf_ansi_637_tele_msg_id;
+static int hf_ansi_637_tele_length;
+static int hf_ansi_637_tele_msg_status;
+static int hf_ansi_637_tele_msg_header_ind;
+static int hf_ansi_637_tele_msg_rsvd;
+static int hf_ansi_637_tele_subparam_id;
+static int hf_ansi_637_tele_user_data_text;
+static int hf_ansi_637_tele_user_data_encoding;
+static int hf_ansi_637_tele_user_data_message_type;
+static int hf_ansi_637_tele_user_data_num_fields;
+static int hf_ansi_637_tele_response_code;
+static int hf_ansi_637_tele_message_center_ts_year;
+static int hf_ansi_637_tele_message_center_ts_month;
+static int hf_ansi_637_tele_message_center_ts_day;
+static int hf_ansi_637_tele_message_center_ts_hours;
+static int hf_ansi_637_tele_message_center_ts_minutes;
+static int hf_ansi_637_tele_message_center_ts_seconds;
+static int hf_ansi_637_tele_validity_period_ts_year;
+static int hf_ansi_637_tele_validity_period_ts_month;
+static int hf_ansi_637_tele_validity_period_ts_day;
+static int hf_ansi_637_tele_validity_period_ts_hours;
+static int hf_ansi_637_tele_validity_period_ts_minutes;
+static int hf_ansi_637_tele_validity_period_ts_seconds;
+static int hf_ansi_637_tele_validity_period_relative_validity;
+static int hf_ansi_637_tele_deferred_del_ts_year;
+static int hf_ansi_637_tele_deferred_del_ts_month;
+static int hf_ansi_637_tele_deferred_del_ts_day;
+static int hf_ansi_637_tele_deferred_del_ts_hours;
+static int hf_ansi_637_tele_deferred_del_ts_minutes;
+static int hf_ansi_637_tele_deferred_del_ts_seconds;
+static int hf_ansi_637_tele_deferred_del_relative;
+static int hf_ansi_637_tele_priority_indicator;
+static int hf_ansi_637_tele_privacy_indicator;
+static int hf_ansi_637_tele_reply_option_user_ack_req;
+static int hf_ansi_637_tele_reply_option_dak_req;
+static int hf_ansi_637_tele_reply_option_read_ack_req;
+static int hf_ansi_637_tele_reply_option_report_req;
+static int hf_ansi_637_tele_num_messages;
+static int hf_ansi_637_tele_alert_msg_delivery_priority;
+static int hf_ansi_637_tele_language;
+static int hf_ansi_637_tele_cb_num_digit_mode;
+static int hf_ansi_637_tele_cb_num_ton;
+static int hf_ansi_637_tele_cb_num_plan;
+static int hf_ansi_637_tele_cb_num_num_fields;
+static int hf_ansi_637_tele_cb_num_num_fields07f8;
+static int hf_ansi_637_tele_cb_num_number;
+static int hf_ansi_637_tele_msg_display_mode;
+static int hf_ansi_637_tele_msg_deposit_idx;
+static int hf_ansi_637_tele_srvc_cat_prog_results_srvc_cat;
+static int hf_ansi_637_tele_srvc_cat_prog_results_result;
+static int hf_ansi_637_tele_msg_status_error_class;
+static int hf_ansi_637_tele_msg_status_code;
+static int hf_ansi_637_tele_tp_failure_cause_value;
+static int hf_ansi_637_reserved_bits_8_generic;
+static int hf_ansi_637_reserved_bits_8_03;
+static int hf_ansi_637_reserved_bits_8_07;
+static int hf_ansi_637_reserved_bits_8_0f;
+static int hf_ansi_637_reserved_bits_8_3f;
+static int hf_ansi_637_reserved_bits_8_7f;
+static int hf_ansi_637_reserved_bits_16_generic;
+static int hf_ansi_637_tele_cmas_encoding;
+static int hf_ansi_637_tele_cmas_num_fields;
+static int hf_ansi_637_tele_cmas_protocol_version;
+static int hf_ansi_637_tele_cmas_record_type;
+static int hf_ansi_637_tele_cmas_record_len;
+static int hf_ansi_637_tele_cmas_char_set;
+static int hf_ansi_637_tele_cmas_category;
+static int hf_ansi_637_tele_cmas_response_type;
+static int hf_ansi_637_tele_cmas_severity;
+static int hf_ansi_637_tele_cmas_urgency;
+static int hf_ansi_637_tele_cmas_certainty;
+static int hf_ansi_637_tele_cmas_identifier;
+static int hf_ansi_637_tele_cmas_alert_handling;
+static int hf_ansi_637_tele_cmas_expires_year;
+static int hf_ansi_637_tele_cmas_expires_month;
+static int hf_ansi_637_tele_cmas_expires_day;
+static int hf_ansi_637_tele_cmas_expires_hours;
+static int hf_ansi_637_tele_cmas_expires_minutes;
+static int hf_ansi_637_tele_cmas_expires_seconds;
+static int hf_ansi_637_tele_cmas_language;
+static int hf_ansi_637_tele_cmas_text;
+static int hf_ansi_637_tele_mult_enc_user_data_encoding;
+static int hf_ansi_637_tele_mult_enc_user_data_num_fields;
+static int hf_ansi_637_tele_mult_enc_user_data_text;
+static int hf_ansi_637_tele_srvc_cat_prog_data_encoding;
+static int hf_ansi_637_tele_srvc_cat_prog_data_operation_code;
+static int hf_ansi_637_tele_srvc_cat_prog_data_category;
+static int hf_ansi_637_tele_srvc_cat_prog_data_language;
+static int hf_ansi_637_tele_srvc_cat_prog_data_max_messages;
+static int hf_ansi_637_tele_srvc_cat_prog_data_alert_option;
+static int hf_ansi_637_tele_srvc_cat_prog_data_num_fields;
+static int hf_ansi_637_tele_srvc_cat_prog_data_text;
 
 /* Initialize the subtree pointers */
-static gint ett_ansi_637_tele = -1;
-static gint ett_ansi_637_trans = -1;
-static gint ett_ansi_637_header_ind = -1;
-static gint ett_params = -1;
-
-static expert_field ei_ansi_637_extraneous_data = EI_INIT;
-static expert_field ei_ansi_637_short_data = EI_INIT;
-static expert_field ei_ansi_637_unexpected_length = EI_INIT;
-static expert_field ei_ansi_637_unknown_encoding = EI_INIT;
-static expert_field ei_ansi_637_failed_conversion = EI_INIT;
-static expert_field ei_ansi_637_unknown_cmas_record_type = EI_INIT;
-static expert_field ei_ansi_637_unknown_trans_parameter = EI_INIT;
-static expert_field ei_ansi_637_no_trans_parameter_dissector = EI_INIT;
-static expert_field ei_ansi_637_unknown_tele_parameter = EI_INIT;
-static expert_field ei_ansi_637_no_tele_parameter_dissector = EI_INIT;
+static gint ett_ansi_637_tele;
+static gint ett_ansi_637_trans;
+static gint ett_ansi_637_header_ind;
+static gint ett_params;
+
+static expert_field ei_ansi_637_extraneous_data;
+static expert_field ei_ansi_637_short_data;
+static expert_field ei_ansi_637_unexpected_length;
+static expert_field ei_ansi_637_unknown_encoding;
+static expert_field ei_ansi_637_failed_conversion;
+static expert_field ei_ansi_637_unknown_cmas_record_type;
+static expert_field ei_ansi_637_unknown_trans_parameter;
+static expert_field ei_ansi_637_no_trans_parameter_dissector;
+static expert_field ei_ansi_637_unknown_tele_parameter;
+static expert_field ei_ansi_637_no_tele_parameter_dissector;
 
 static dissector_handle_t ansi_637_tele_handle;
 static dissector_handle_t ansi_637_trans_handle;
diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c
index 0992c8679a..db62e73d2c 100644
--- a/epan/dissectors/packet-ansi_683.c
+++ b/epan/dissectors/packet-ansi_683.c
@@ -34,172 +34,172 @@ static const char *ansi_proto_name = "ANSI IS-683 (OTA (Mobile))";
 
 
 /* Initialize the subtree pointers */
-static gint ett_ansi_683 = -1;
-static gint ett_for_nam_block = -1;
-static gint ett_for_sspr_block = -1;
-static gint ett_rev_sspr_block = -1;
-static gint ett_rev_nam_block = -1;
-static gint ett_key_p = -1;
-static gint ett_key_g = -1;
-static gint ett_rev_feat = -1;
-static gint ett_for_val_block = -1;
-static gint ett_band_cap = -1;
-static gint ett_scm = -1;
-static gint ett_for_puzl_block = -1;
-static gint ett_rev_puzl_block = -1;
-static gint ett_for_3gpd_block = -1;
-static gint ett_rev_3gpd_block = -1;
-static gint ett_for_mmd_block = -1;
-static gint ett_rev_mmd_block = -1;
-static gint ett_for_mms_block = -1;
-static gint ett_rev_mms_block = -1;
-static gint ett_rev_cap = -1;
-static gint ett_segment = -1;
+static gint ett_ansi_683;
+static gint ett_for_nam_block;
+static gint ett_for_sspr_block;
+static gint ett_rev_sspr_block;
+static gint ett_rev_nam_block;
+static gint ett_key_p;
+static gint ett_key_g;
+static gint ett_rev_feat;
+static gint ett_for_val_block;
+static gint ett_band_cap;
+static gint ett_scm;
+static gint ett_for_puzl_block;
+static gint ett_rev_puzl_block;
+static gint ett_for_3gpd_block;
+static gint ett_rev_3gpd_block;
+static gint ett_for_mmd_block;
+static gint ett_rev_mmd_block;
+static gint ett_for_mms_block;
+static gint ett_rev_mms_block;
+static gint ett_rev_cap;
+static gint ett_segment;
 
 /* Initialize the protocol and registered fields */
-static int proto_ansi_683 = -1;
-static int hf_ansi_683_for_msg_type = -1;
-static int hf_ansi_683_rev_msg_type = -1;
-static int hf_ansi_683_length = -1;
-static int hf_ansi_683_reserved8 = -1;
-static int hf_ansi_683_reserved16_f = -1;
-static int hf_ansi_683_reserved24_f = -1;
-static int hf_ansi_683_reserved_bytes = -1;
+static int proto_ansi_683;
+static int hf_ansi_683_for_msg_type;
+static int hf_ansi_683_rev_msg_type;
+static int hf_ansi_683_length;
+static int hf_ansi_683_reserved8;
+static int hf_ansi_683_reserved16_f;
+static int hf_ansi_683_reserved24_f;
+static int hf_ansi_683_reserved_bytes;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_ansi_683_spasm_protection_for_the_active_nam_000010 = -1;
-static int hf_ansi_683_imsi_t_11_12 = -1;
-static int hf_ansi_683_otapa_spasm_validation_signature_indicator_800000 = -1;
-static int hf_ansi_683_accolc_3c = -1;
-static int hf_ansi_683_otapa_spasm_validation_signature = -1;
-static int hf_ansi_683_mcc_m_0ffc = -1;
-static int hf_ansi_683_home_sid = -1;
-static int hf_ansi_683_sid_nid_pairs_3fff = -1;
-static int hf_ansi_683_identifiers_present8 = -1;
-static int hf_ansi_683_authentication_data_input_parameter = -1;
-static int hf_ansi_683_feature_protocol_version = -1;
-static int hf_ansi_683_parameter_p = -1;
-static int hf_ansi_683_key_id_reserved = -1;
-static int hf_ansi_683_local_control_status_0010 = -1;
-static int hf_ansi_683_mob_term_for_nid_0002 = -1;
-static int hf_ansi_683_mob_term_for_nid_40 = -1;
-static int hf_ansi_683_power_class = -1;
-static int hf_ansi_683_mobile_station_fw_rev = -1;
-static int hf_ansi_683_fresh_incl8 = -1;
-static int hf_ansi_683_random_number_smck_generation = -1;
-static int hf_ansi_683_key_id_ims_root_key = -1;
-static int hf_ansi_683_num_sid_nid_01fe = -1;
-static int hf_ansi_683_n_digits = -1;
-static int hf_ansi_683_stored_sid_nid_3fc0 = -1;
-static int hf_ansi_683_mob_term_for_sid_0004 = -1;
-static int hf_ansi_683_capability_data = -1;
-static int hf_ansi_683_mobile_station_calculation_result = -1;
-static int hf_ansi_683_maximum_segment_size = -1;
-static int hf_ansi_683_otasp_mobile_protocol_revision = -1;
-static int hf_ansi_683_otasp_protocol_revision = -1;
-static int hf_ansi_683_start_secure_mode = -1;
-static int hf_ansi_683_security = -1;
-static int hf_ansi_683_imsi_t_10 = -1;
-static int hf_ansi_683_meid = -1;
-static int hf_ansi_683_nam_lock_indicator = -1;
-static int hf_ansi_683_start_otapa_session = -1;
-static int hf_ansi_683_band_class_1_cdma = -1;
-static int hf_ansi_683_segment_offset = -1;
-static int hf_ansi_683_identifiers_present16 = -1;
-static int hf_ansi_683_user_zone_id = -1;
-static int hf_ansi_683_mcc_m_01ff80 = -1;
-static int hf_ansi_683_max_sid_nid_3fc0 = -1;
-static int hf_ansi_683_segment_size = -1;
-static int hf_ansi_683_imsi_m_class8000 = -1;
-static int hf_ansi_683_local_control_status_02 = -1;
-static int hf_ansi_683_transmission = -1;
-static int hf_ansi_683_max_sid_nid_01fe = -1;
-static int hf_ansi_683_spasm_random_challenge = -1;
-static int hf_ansi_683_extended_scm_indicator = -1;
-static int hf_ansi_683_a_key_protocol_revision = -1;
-static int hf_ansi_683_cdma_analog_mode = -1;
-static int hf_ansi_683_mob_term_home_08 = -1;
-static int hf_ansi_683_imsi_m_11_12_3f80 = -1;
-static int hf_ansi_683_user_zone_sid = -1;
-static int hf_ansi_683_fresh_incl16 = -1;
-static int hf_ansi_683_sid_nid_pairs_01ff = -1;
-static int hf_ansi_683_imsi_t_addr_num = -1;
-static int hf_ansi_683_slotted_mode = -1;
-static int hf_ansi_683_imsi_m_class10 = -1;
-static int hf_ansi_683_secure_mode_result_code = -1;
-static int hf_ansi_683_ismi_m_addr_num_e = -1;
-static int hf_ansi_683_mob_term_for_nid_4000 = -1;
-static int hf_ansi_683_station_class_mark = -1;
-static int hf_ansi_683_otapa_spasm_validation_signature_indicator_80 = -1;
-static int hf_ansi_683_mob_term_for_sid_8000 = -1;
-static int hf_ansi_683_imsi_m_11_12_7f = -1;
-static int hf_ansi_683_sspr_configuration_result_code = -1;
-static int hf_ansi_683_mob_p_rev_1fe0 = -1;
-static int hf_ansi_683_puzl_configuration_result_code = -1;
-static int hf_ansi_683_key_id_wlan_root_key = -1;
-static int hf_ansi_683_firstchp = -1;
-static int hf_ansi_683_key_id_bcmcs_root_key = -1;
-static int hf_ansi_683_band_class_0_cdma = -1;
-static int hf_ansi_683_fresh = -1;
-static int hf_ansi_683_extended_address_indicator = -1;
-static int hf_ansi_683_mob_term_home_01 = -1;
-static int hf_ansi_683_imsi_t_class = -1;
-static int hf_ansi_683_system_tag_download_result_code = -1;
-static int hf_ansi_683_band_class_0_analog = -1;
-static int hf_ansi_683_service_key_generation_result_code = -1;
-static int hf_ansi_683_sspr_download_result_code = -1;
-static int hf_ansi_683_band_class_6_cdma = -1;
-static int hf_ansi_683_data_commit_result_code = -1;
-static int hf_ansi_683_mob_p_rev_ff = -1;
-static int hf_ansi_683_number_of_capability_records = -1;
-static int hf_ansi_683_system_tag_result_code = -1;
-static int hf_ansi_683_mcc_t = -1;
-static int hf_ansi_683_call_history_parameter = -1;
-static int hf_ansi_683_randc = -1;
-static int hf_ansi_683_mob_term_for_sid_80 = -1;
-static int hf_ansi_683_parameter_g = -1;
-static int hf_ansi_683_num_features = -1;
-static int hf_ansi_683_cdma_analog_slotted = -1;
-static int hf_ansi_683_spasm_protection_for_the_active_nam_40 = -1;
-static int hf_ansi_683_25mhz_bandwidth = -1;
-static int hf_ansi_683_base_station_calculation_result = -1;
-static int hf_ansi_683_key_exchange_result_code = -1;
-static int hf_ansi_683_mobile_station_manuf_model_number = -1;
-static int hf_ansi_683_random_challenge_value = -1;
-static int hf_ansi_683_imsi_m_10 = -1;
-static int hf_ansi_683_stored_sid_nid_01fe = -1;
-static int hf_ansi_683_number_of_parameter_blocks = -1;
-static int hf_ansi_683_imsi_m_addr_num_7000 = -1;
-static int hf_ansi_683_block_data = -1;
-static int hf_ansi_683_feature_id = -1;
-static int hf_ansi_683_num_sid_nid_3fc0 = -1;
-static int hf_ansi_683_more_additional_fields = -1;
-static int hf_ansi_683_band_class_3_cdma = -1;
-static int hf_ansi_683_authr = -1;
-static int hf_ansi_683_accolc_01e0 = -1;
-static int hf_ansi_683_result_code = -1;
-static int hf_ansi_683_cap_info_record_type = -1;
-static int hf_ansi_683_param_block_val = -1;
-static int hf_ansi_683_rev_param_block_sspr = -1;
-static int hf_ansi_683_for_param_block_sspr = -1;
-static int hf_ansi_683_rev_param_block_nam = -1;
-static int hf_ansi_683_for_param_block_nam = -1;
-static int hf_ansi_683_rev_param_block_puzl = -1;
-static int hf_ansi_683_for_param_block_puzl = -1;
-static int hf_ansi_683_rev_param_block_3gpd = -1;
-static int hf_ansi_683_for_param_block_3gpd = -1;
-static int hf_ansi_683_rev_param_block_mmd = -1;
-static int hf_ansi_683_for_param_block_mmd = -1;
-static int hf_ansi_683_rev_param_block_systag = -1;
-static int hf_ansi_683_for_param_block_systag = -1;
-static int hf_ansi_683_rev_param_block_mms = -1;
-static int hf_ansi_683_for_param_block_mms = -1;
-static int hf_ansi_683_mobile_directory_number = -1;
-static int hf_ansi_683_service_programming_code = -1;
-
-static expert_field ei_ansi_683_extraneous_data = EI_INIT;
-static expert_field ei_ansi_683_short_data = EI_INIT;
-static expert_field ei_ansi_683_data_length = EI_INIT;
+static int hf_ansi_683_spasm_protection_for_the_active_nam_000010;
+static int hf_ansi_683_imsi_t_11_12;
+static int hf_ansi_683_otapa_spasm_validation_signature_indicator_800000;
+static int hf_ansi_683_accolc_3c;
+static int hf_ansi_683_otapa_spasm_validation_signature;
+static int hf_ansi_683_mcc_m_0ffc;
+static int hf_ansi_683_home_sid;
+static int hf_ansi_683_sid_nid_pairs_3fff;
+static int hf_ansi_683_identifiers_present8;
+static int hf_ansi_683_authentication_data_input_parameter;
+static int hf_ansi_683_feature_protocol_version;
+static int hf_ansi_683_parameter_p;
+static int hf_ansi_683_key_id_reserved;
+static int hf_ansi_683_local_control_status_0010;
+static int hf_ansi_683_mob_term_for_nid_0002;
+static int hf_ansi_683_mob_term_for_nid_40;
+static int hf_ansi_683_power_class;
+static int hf_ansi_683_mobile_station_fw_rev;
+static int hf_ansi_683_fresh_incl8;
+static int hf_ansi_683_random_number_smck_generation;
+static int hf_ansi_683_key_id_ims_root_key;
+static int hf_ansi_683_num_sid_nid_01fe;
+static int hf_ansi_683_n_digits;
+static int hf_ansi_683_stored_sid_nid_3fc0;
+static int hf_ansi_683_mob_term_for_sid_0004;
+static int hf_ansi_683_capability_data;
+static int hf_ansi_683_mobile_station_calculation_result;
+static int hf_ansi_683_maximum_segment_size;
+static int hf_ansi_683_otasp_mobile_protocol_revision;
+static int hf_ansi_683_otasp_protocol_revision;
+static int hf_ansi_683_start_secure_mode;
+static int hf_ansi_683_security;
+static int hf_ansi_683_imsi_t_10;
+static int hf_ansi_683_meid;
+static int hf_ansi_683_nam_lock_indicator;
+static int hf_ansi_683_start_otapa_session;
+static int hf_ansi_683_band_class_1_cdma;
+static int hf_ansi_683_segment_offset;
+static int hf_ansi_683_identifiers_present16;
+static int hf_ansi_683_user_zone_id;
+static int hf_ansi_683_mcc_m_01ff80;
+static int hf_ansi_683_max_sid_nid_3fc0;
+static int hf_ansi_683_segment_size;
+static int hf_ansi_683_imsi_m_class8000;
+static int hf_ansi_683_local_control_status_02;
+static int hf_ansi_683_transmission;
+static int hf_ansi_683_max_sid_nid_01fe;
+static int hf_ansi_683_spasm_random_challenge;
+static int hf_ansi_683_extended_scm_indicator;
+static int hf_ansi_683_a_key_protocol_revision;
+static int hf_ansi_683_cdma_analog_mode;
+static int hf_ansi_683_mob_term_home_08;
+static int hf_ansi_683_imsi_m_11_12_3f80;
+static int hf_ansi_683_user_zone_sid;
+static int hf_ansi_683_fresh_incl16;
+static int hf_ansi_683_sid_nid_pairs_01ff;
+static int hf_ansi_683_imsi_t_addr_num;
+static int hf_ansi_683_slotted_mode;
+static int hf_ansi_683_imsi_m_class10;
+static int hf_ansi_683_secure_mode_result_code;
+static int hf_ansi_683_ismi_m_addr_num_e;
+static int hf_ansi_683_mob_term_for_nid_4000;
+static int hf_ansi_683_station_class_mark;
+static int hf_ansi_683_otapa_spasm_validation_signature_indicator_80;
+static int hf_ansi_683_mob_term_for_sid_8000;
+static int hf_ansi_683_imsi_m_11_12_7f;
+static int hf_ansi_683_sspr_configuration_result_code;
+static int hf_ansi_683_mob_p_rev_1fe0;
+static int hf_ansi_683_puzl_configuration_result_code;
+static int hf_ansi_683_key_id_wlan_root_key;
+static int hf_ansi_683_firstchp;
+static int hf_ansi_683_key_id_bcmcs_root_key;
+static int hf_ansi_683_band_class_0_cdma;
+static int hf_ansi_683_fresh;
+static int hf_ansi_683_extended_address_indicator;
+static int hf_ansi_683_mob_term_home_01;
+static int hf_ansi_683_imsi_t_class;
+static int hf_ansi_683_system_tag_download_result_code;
+static int hf_ansi_683_band_class_0_analog;
+static int hf_ansi_683_service_key_generation_result_code;
+static int hf_ansi_683_sspr_download_result_code;
+static int hf_ansi_683_band_class_6_cdma;
+static int hf_ansi_683_data_commit_result_code;
+static int hf_ansi_683_mob_p_rev_ff;
+static int hf_ansi_683_number_of_capability_records;
+static int hf_ansi_683_system_tag_result_code;
+static int hf_ansi_683_mcc_t;
+static int hf_ansi_683_call_history_parameter;
+static int hf_ansi_683_randc;
+static int hf_ansi_683_mob_term_for_sid_80;
+static int hf_ansi_683_parameter_g;
+static int hf_ansi_683_num_features;
+static int hf_ansi_683_cdma_analog_slotted;
+static int hf_ansi_683_spasm_protection_for_the_active_nam_40;
+static int hf_ansi_683_25mhz_bandwidth;
+static int hf_ansi_683_base_station_calculation_result;
+static int hf_ansi_683_key_exchange_result_code;
+static int hf_ansi_683_mobile_station_manuf_model_number;
+static int hf_ansi_683_random_challenge_value;
+static int hf_ansi_683_imsi_m_10;
+static int hf_ansi_683_stored_sid_nid_01fe;
+static int hf_ansi_683_number_of_parameter_blocks;
+static int hf_ansi_683_imsi_m_addr_num_7000;
+static int hf_ansi_683_block_data;
+static int hf_ansi_683_feature_id;
+static int hf_ansi_683_num_sid_nid_3fc0;
+static int hf_ansi_683_more_additional_fields;
+static int hf_ansi_683_band_class_3_cdma;
+static int hf_ansi_683_authr;
+static int hf_ansi_683_accolc_01e0;
+static int hf_ansi_683_result_code;
+static int hf_ansi_683_cap_info_record_type;
+static int hf_ansi_683_param_block_val;
+static int hf_ansi_683_rev_param_block_sspr;
+static int hf_ansi_683_for_param_block_sspr;
+static int hf_ansi_683_rev_param_block_nam;
+static int hf_ansi_683_for_param_block_nam;
+static int hf_ansi_683_rev_param_block_puzl;
+static int hf_ansi_683_for_param_block_puzl;
+static int hf_ansi_683_rev_param_block_3gpd;
+static int hf_ansi_683_for_param_block_3gpd;
+static int hf_ansi_683_rev_param_block_mmd;
+static int hf_ansi_683_for_param_block_mmd;
+static int hf_ansi_683_rev_param_block_systag;
+static int hf_ansi_683_for_param_block_systag;
+static int hf_ansi_683_rev_param_block_mms;
+static int hf_ansi_683_for_param_block_mms;
+static int hf_ansi_683_mobile_directory_number;
+static int hf_ansi_683_service_programming_code;
+
+static expert_field ei_ansi_683_extraneous_data;
+static expert_field ei_ansi_683_short_data;
+static expert_field ei_ansi_683_data_length;
 
 static const char dtmf_digits[16] = {'?','1','2','3','4','5','6','7','8','9','0','?','?','?','?','?'};
 
diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index e42debd6a6..b14cbf6a0e 100644
--- a/epan/dissectors/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
@@ -37,152 +37,152 @@ static const char *ansi_proto_name_short = "IS-801";
 
 
 /* Initialize the subtree pointers */
-static gint ett_ansi_801 = -1;
-static gint ett_gps = -1;
-static gint ett_loc = -1;
+static gint ett_ansi_801;
+static gint ett_gps;
+static gint ett_loc;
 
 /* Initialize the protocol and registered fields */
-static int proto_ansi_801 = -1;
-static int hf_ansi_801_for_req_type = -1;
-static int hf_ansi_801_for_rsp_type = -1;
-static int hf_ansi_801_rev_req_type = -1;
-static int hf_ansi_801_rev_rsp_type = -1;
-static int hf_ansi_801_for_sess_tag = -1;
-static int hf_ansi_801_rev_sess_tag = -1;
-static int hf_ansi_801_sess_tag = -1;
-
-static int hf_ansi_801_time_ref_cdma = -1;
-static int hf_ansi_801_lat = -1;
-static int hf_ansi_801_long = -1;
-static int hf_ansi_801_loc_uncrtnty_ang = -1;
-static int hf_ansi_801_loc_uncrtnty_a = -1;
-static int hf_ansi_801_loc_uncrtnty_p = -1;
-static int hf_ansi_801_fix_type = -1;
-static int hf_ansi_801_velocity_incl = -1;
-static int hf_ansi_801_velocity_hor = -1;
-static int hf_ansi_801_heading = -1;
-static int hf_ansi_801_velocity_ver = -1;
-static int hf_ansi_801_clock_incl = -1;
-static int hf_ansi_801_clock_bias = -1;
-static int hf_ansi_801_clock_drift = -1;
-static int hf_ansi_801_height_incl = -1;
-static int hf_ansi_801_height = -1;
-static int hf_ansi_801_loc_uncrtnty_v = -1;
-static int hf_ansi_801_reserved_bits = -1;
-
-static int hf_ansi_801_bad_sv_present = -1;
-static int hf_ansi_801_num_bad_sv = -1;
-static int hf_ansi_801_bad_sv_prn_num = -1;
-static int hf_ansi_801_dopp_req = -1;
-static int hf_ansi_801_add_dopp_req = -1;
-static int hf_ansi_801_code_ph_par_req = -1;
-static int hf_ansi_801_az_el_req = -1;
-
-static int hf_ansi_801_pref_resp_qual = -1;
-static int hf_ansi_801_num_fixes = -1;
-static int hf_ansi_801_t_betw_fixes = -1;
-static int hf_ansi_801_offset_req = -1;
+static int proto_ansi_801;
+static int hf_ansi_801_for_req_type;
+static int hf_ansi_801_for_rsp_type;
+static int hf_ansi_801_rev_req_type;
+static int hf_ansi_801_rev_rsp_type;
+static int hf_ansi_801_for_sess_tag;
+static int hf_ansi_801_rev_sess_tag;
+static int hf_ansi_801_sess_tag;
+
+static int hf_ansi_801_time_ref_cdma;
+static int hf_ansi_801_lat;
+static int hf_ansi_801_long;
+static int hf_ansi_801_loc_uncrtnty_ang;
+static int hf_ansi_801_loc_uncrtnty_a;
+static int hf_ansi_801_loc_uncrtnty_p;
+static int hf_ansi_801_fix_type;
+static int hf_ansi_801_velocity_incl;
+static int hf_ansi_801_velocity_hor;
+static int hf_ansi_801_heading;
+static int hf_ansi_801_velocity_ver;
+static int hf_ansi_801_clock_incl;
+static int hf_ansi_801_clock_bias;
+static int hf_ansi_801_clock_drift;
+static int hf_ansi_801_height_incl;
+static int hf_ansi_801_height;
+static int hf_ansi_801_loc_uncrtnty_v;
+static int hf_ansi_801_reserved_bits;
+
+static int hf_ansi_801_bad_sv_present;
+static int hf_ansi_801_num_bad_sv;
+static int hf_ansi_801_bad_sv_prn_num;
+static int hf_ansi_801_dopp_req;
+static int hf_ansi_801_add_dopp_req;
+static int hf_ansi_801_code_ph_par_req;
+static int hf_ansi_801_az_el_req;
+
+static int hf_ansi_801_pref_resp_qual;
+static int hf_ansi_801_num_fixes;
+static int hf_ansi_801_t_betw_fixes;
+static int hf_ansi_801_offset_req;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_ansi_801_for_message_number_responsesF0 = -1;
-static int hf_ansi_801_apdc_id = -1;
-static int hf_ansi_801_num_sv_p32 = -1;
-static int hf_ansi_801_regulatory_services_indicator = -1;
-static int hf_ansi_801_session_source = -1;
-static int hf_ansi_801_reserved8_E0 = -1;
-static int hf_ansi_801_action_time = -1;
-static int hf_ansi_801_rev_message_number_responsesF0 = -1;
-static int hf_ansi_801_reserved24_3 = -1;
-static int hf_ansi_801_cancellation_type = -1;
-static int hf_ansi_801_gps_navigation_message_bits = -1;
-static int hf_ansi_801_num_dr_p = -1;
-static int hf_ansi_801_rev_message_number_requests8 = -1;
-static int hf_ansi_801_reserved8_F0 = -1;
-static int hf_ansi_801_for_req_loc_clock_correction_for_gps_time = -1;
-static int hf_ansi_801_for_response_length = -1;
-static int hf_ansi_801_session_end = -1;
-static int hf_ansi_801_reserved8_1F = -1;
-static int hf_ansi_801_part_num = -1;
-static int hf_ansi_801_dr_size = -1;
-static int hf_ansi_801_reserved_24_700 = -1;
-static int hf_ansi_801_for_message_number_responses0F = -1;
-static int hf_ansi_801_rev_message_number_requests16 = -1;
-static int hf_ansi_801_lcc_capable_using_location_assistance_spherical = -1;
-static int hf_ansi_801_part_num32 = -1;
-static int hf_ansi_801_part_num16 = -1;
-static int hf_ansi_801_reserved8_07 = -1;
-static int hf_ansi_801_reserved24_1 = -1;
-static int hf_ansi_801_reserved_24_F80000 = -1;
-static int hf_ansi_801_extended_base_station_almanac = -1;
-static int hf_ansi_801_no_outstanding_request_element = -1;
-static int hf_ansi_801_for_request_length = -1;
-static int hf_ansi_801_week_num = -1;
-static int hf_ansi_801_total_parts16 = -1;
-static int hf_ansi_801_pd_message_type = -1;
-static int hf_ansi_801_total_parts32 = -1;
-static int hf_ansi_801_alpha_and_beta_parameters = -1;
-static int hf_ansi_801_lcc_using_gps_ephemeris_assistance = -1;
-static int hf_ansi_801_rev_request_length = -1;
-static int hf_ansi_801_reserved8_7F = -1;
-static int hf_ansi_801_unsolicited_response_indicator = -1;
-static int hf_ansi_801_autonomous_location_calculation_capable = -1;
-static int hf_ansi_801_gps_almanac_correction = -1;
-static int hf_ansi_801_total_parts = -1;
-static int hf_ansi_801_session_start = -1;
-static int hf_ansi_801_ref_bit_num = -1;
-static int hf_ansi_801_aflt_lcc = -1;
-static int hf_ansi_801_reject_reason = -1;
-static int hf_ansi_801_gps_ephemeris = -1;
-static int hf_ansi_801_pre_programmed_location = -1;
-static int hf_ansi_801_rev_response_length = -1;
-static int hf_ansi_801_afltc_id = -1;
-static int hf_ansi_801_rev_req_loc_height_information = -1;
-static int hf_ansi_801_reserved8_01 = -1;
-static int hf_ansi_801_pilot_ph_cap = -1;
-static int hf_ansi_801_gps_acquisition_assistance = -1;
-static int hf_ansi_801_coordinate_type_requested = -1;
-static int hf_ansi_801_gps_almanac = -1;
-static int hf_ansi_801_rev_req_loc_velocity_information = -1;
-static int hf_ansi_801_gps_autonomous_acquisition_capable = -1;
-static int hf_ansi_801_num_sv_p16 = -1;
-static int hf_ansi_801_mob_sys_t_offset = -1;
-static int hf_ansi_801_desired_pilot_phase_resolution = -1;
-static int hf_ansi_801_for_req_loc_velocity_information = -1;
-static int hf_ansi_801_reserved8_0F = -1;
-static int hf_ansi_801_hybrid_gps_and_aflt_lcc = -1;
-static int hf_ansi_801_gps_acq_cap = -1;
-static int hf_ansi_801_gps_sensitivity_assistance = -1;
-static int hf_ansi_801_ms_ls_rev = -1;
-static int hf_ansi_801_reject_request_type = -1;
-static int hf_ansi_801_ms_mode = -1;
-static int hf_ansi_801_bs_ls_rev = -1;
-static int hf_ansi_801_ref_pn = -1;
-static int hf_ansi_801_rev_message_number_responses0F = -1;
-static int hf_ansi_801_for_req_loc_height_information = -1;
-static int hf_ansi_801_gps_capability_indicator = -1;
-static int hf_ansi_801_rev_req_loc_clock_correction_for_gps_time = -1;
-static int hf_ansi_801_data_records = -1;
-static int hf_ansi_801_for_message_number_requests8 = -1;
-static int hf_ansi_801_subframes_4_and_5 = -1;
-static int hf_ansi_801_use_action_time_indicator = -1;
-static int hf_ansi_801_lcc_using_gps_almanac_assistance = -1;
-static int hf_ansi_801_lcc_using_gps_almanac_correction = -1;
-static int hf_ansi_801_pd_message_len = -1;
-static int hf_ansi_801_lcc_using_location_assistance_cartesian = -1;
-static int hf_ansi_801_for_message_number_requests16 = -1;
-static int hf_ansi_801_reserved_24_7 = -1;
-static int hf_ansi_801_loc_calc_cap = -1;
-static int hf_ansi_801_toa = -1;
-static int hf_ansi_801_data = -1;
-static int hf_ansi_801_proprietary_data = -1;
-static int hf_ansi_801_time_ref_ms = -1;
-static int hf_ansi_801_time_of_almanac = -1;
-static int hf_ansi_801_gps_week_number = -1;
-
-
-static expert_field ei_ansi_801_extraneous_data = EI_INIT;
-static expert_field ei_ansi_801_short_data = EI_INIT;
-static expert_field ei_ansi_801_unexpected_length = EI_INIT;
+static int hf_ansi_801_for_message_number_responsesF0;
+static int hf_ansi_801_apdc_id;
+static int hf_ansi_801_num_sv_p32;
+static int hf_ansi_801_regulatory_services_indicator;
+static int hf_ansi_801_session_source;
+static int hf_ansi_801_reserved8_E0;
+static int hf_ansi_801_action_time;
+static int hf_ansi_801_rev_message_number_responsesF0;
+static int hf_ansi_801_reserved24_3;
+static int hf_ansi_801_cancellation_type;
+static int hf_ansi_801_gps_navigation_message_bits;
+static int hf_ansi_801_num_dr_p;
+static int hf_ansi_801_rev_message_number_requests8;
+static int hf_ansi_801_reserved8_F0;
+static int hf_ansi_801_for_req_loc_clock_correction_for_gps_time;
+static int hf_ansi_801_for_response_length;
+static int hf_ansi_801_session_end;
+static int hf_ansi_801_reserved8_1F;
+static int hf_ansi_801_part_num;
+static int hf_ansi_801_dr_size;
+static int hf_ansi_801_reserved_24_700;
+static int hf_ansi_801_for_message_number_responses0F;
+static int hf_ansi_801_rev_message_number_requests16;
+static int hf_ansi_801_lcc_capable_using_location_assistance_spherical;
+static int hf_ansi_801_part_num32;
+static int hf_ansi_801_part_num16;
+static int hf_ansi_801_reserved8_07;
+static int hf_ansi_801_reserved24_1;
+static int hf_ansi_801_reserved_24_F80000;
+static int hf_ansi_801_extended_base_station_almanac;
+static int hf_ansi_801_no_outstanding_request_element;
+static int hf_ansi_801_for_request_length;
+static int hf_ansi_801_week_num;
+static int hf_ansi_801_total_parts16;
+static int hf_ansi_801_pd_message_type;
+static int hf_ansi_801_total_parts32;
+static int hf_ansi_801_alpha_and_beta_parameters;
+static int hf_ansi_801_lcc_using_gps_ephemeris_assistance;
+static int hf_ansi_801_rev_request_length;
+static int hf_ansi_801_reserved8_7F;
+static int hf_ansi_801_unsolicited_response_indicator;
+static int hf_ansi_801_autonomous_location_calculation_capable;
+static int hf_ansi_801_gps_almanac_correction;
+static int hf_ansi_801_total_parts;
+static int hf_ansi_801_session_start;
+static int hf_ansi_801_ref_bit_num;
+static int hf_ansi_801_aflt_lcc;
+static int hf_ansi_801_reject_reason;
+static int hf_ansi_801_gps_ephemeris;
+static int hf_ansi_801_pre_programmed_location;
+static int hf_ansi_801_rev_response_length;
+static int hf_ansi_801_afltc_id;
+static int hf_ansi_801_rev_req_loc_height_information;
+static int hf_ansi_801_reserved8_01;
+static int hf_ansi_801_pilot_ph_cap;
+static int hf_ansi_801_gps_acquisition_assistance;
+static int hf_ansi_801_coordinate_type_requested;
+static int hf_ansi_801_gps_almanac;
+static int hf_ansi_801_rev_req_loc_velocity_information;
+static int hf_ansi_801_gps_autonomous_acquisition_capable;
+static int hf_ansi_801_num_sv_p16;
+static int hf_ansi_801_mob_sys_t_offset;
+static int hf_ansi_801_desired_pilot_phase_resolution;
+static int hf_ansi_801_for_req_loc_velocity_information;
+static int hf_ansi_801_reserved8_0F;
+static int hf_ansi_801_hybrid_gps_and_aflt_lcc;
+static int hf_ansi_801_gps_acq_cap;
+static int hf_ansi_801_gps_sensitivity_assistance;
+static int hf_ansi_801_ms_ls_rev;
+static int hf_ansi_801_reject_request_type;
+static int hf_ansi_801_ms_mode;
+static int hf_ansi_801_bs_ls_rev;
+static int hf_ansi_801_ref_pn;
+static int hf_ansi_801_rev_message_number_responses0F;
+static int hf_ansi_801_for_req_loc_height_information;
+static int hf_ansi_801_gps_capability_indicator;
+static int hf_ansi_801_rev_req_loc_clock_correction_for_gps_time;
+static int hf_ansi_801_data_records;
+static int hf_ansi_801_for_message_number_requests8;
+static int hf_ansi_801_subframes_4_and_5;
+static int hf_ansi_801_use_action_time_indicator;
+static int hf_ansi_801_lcc_using_gps_almanac_assistance;
+static int hf_ansi_801_lcc_using_gps_almanac_correction;
+static int hf_ansi_801_pd_message_len;
+static int hf_ansi_801_lcc_using_location_assistance_cartesian;
+static int hf_ansi_801_for_message_number_requests16;
+static int hf_ansi_801_reserved_24_7;
+static int hf_ansi_801_loc_calc_cap;
+static int hf_ansi_801_toa;
+static int hf_ansi_801_data;
+static int hf_ansi_801_proprietary_data;
+static int hf_ansi_801_time_ref_ms;
+static int hf_ansi_801_time_of_almanac;
+static int hf_ansi_801_gps_week_number;
+
+
+static expert_field ei_ansi_801_extraneous_data;
+static expert_field ei_ansi_801_short_data;
+static expert_field ei_ansi_801_unexpected_length;
 
 
 static dissector_handle_t ansi_801_handle;
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index 72ce29cdb9..ae0aa53466 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -923,8 +923,8 @@ value_string_ext ansi_tsb58_srvc_cat_vals_ext = VALUE_STRING_EXT_INIT(ansi_tsb58
 
 
 /* Initialize the protocol and registered fields */
-static int proto_a_bsmap = -1;
-static int proto_a_dtap = -1;
+static int proto_a_bsmap;
+static int proto_a_dtap;
 
 const ext_value_string_t *ansi_a_bsmap_strings = NULL;
 const ext_value_string_t *ansi_a_dtap_strings = NULL;
@@ -932,435 +932,435 @@ const ext_value_string_t *ansi_a_elem_1_strings = NULL;
 
 static int ansi_a_tap = -1;
 
-static int hf_ansi_a_bsmap_msgtype = -1;
-static int hf_ansi_a_dtap_msgtype = -1;
-static int hf_ansi_a_protocol_disc = -1;
-static int hf_ansi_a_reserved_octet = -1;
-static int hf_ansi_a_ti_flag = -1;
-static int hf_ansi_a_ti_ti = -1;
-static int hf_ansi_a_cm_svrc_type = -1;
-static int hf_ansi_a_elem_id = -1;
-static int hf_ansi_a_elem_id_f0 = -1;
-static int hf_ansi_a_length = -1;
-static int hf_ansi_a_esn = -1;
-static int hf_ansi_a_imsi = -1;
-static int hf_ansi_a_meid = -1;
-static int hf_ansi_a_cld_party_bcd_num = -1;
-static int hf_ansi_a_cld_party_ascii_num = -1;
-static int hf_ansi_a_clg_party_ascii_num = -1;
-static int hf_ansi_a_cell_ci = -1;
-static int hf_ansi_a_cell_lac = -1;
-static int hf_ansi_a_cell_mscid = -1;
-static int hf_ansi_a_pdsn_ip_addr = -1;
-static int hf_ansi_a_s_pdsn_ip_addr = -1;
-static int hf_ansi_a_anchor_ip_addr = -1;
-static int hf_ansi_a_anchor_pp_ip_addr = -1;
-static int hf_ansi_a_so = -1;
-static int hf_ansi_a_cause_1 = -1;      /* 1 octet cause */
-static int hf_ansi_a_cause_2 = -1;      /* 2 octet cause */
-static int hf_ansi_a_ms_info_rec_signal_type = -1;
-static int hf_ansi_a_ms_info_rec_signal_alert_pitch = -1;
-static int hf_ansi_a_ms_info_rec_signal_tone = -1;
-static int hf_ansi_a_ms_info_rec_signal_isdn_alert = -1;
-static int hf_ansi_a_ms_info_rec_signal_is54b_alert = -1;
-static int hf_ansi_a_ms_info_rec_call_waiting_ind = -1;
-static int hf_ansi_a_extension_8_80 = -1;
-static int hf_ansi_a_reserved_bits_8_generic = -1;
-static int hf_ansi_a_reserved_bits_8_01 = -1;
-static int hf_ansi_a_reserved_bits_8_07 = -1;
-static int hf_ansi_a_reserved_bits_8_0c = -1;
-static int hf_ansi_a_reserved_bits_8_0f = -1;
-static int hf_ansi_a_reserved_bits_8_10 = -1;
-static int hf_ansi_a_reserved_bits_8_18 = -1;
-static int hf_ansi_a_reserved_bits_8_1c = -1;
-static int hf_ansi_a_reserved_bits_8_1f = -1;
-static int hf_ansi_a_reserved_bits_8_3f = -1;
-static int hf_ansi_a_reserved_bits_8_7f = -1;
-static int hf_ansi_a_reserved_bits_8_80 = -1;
-static int hf_ansi_a_reserved_bits_8_c0 = -1;
-static int hf_ansi_a_reserved_bits_8_e0 = -1;
-static int hf_ansi_a_reserved_bits_8_f0 = -1;
-static int hf_ansi_a_reserved_bits_8_f8 = -1;
-static int hf_ansi_a_reserved_bits_8_fc = -1;
-static int hf_ansi_a_reserved_bits_8_fe = -1;
-static int hf_ansi_a_reserved_bits_8_ff = -1;
-static int hf_ansi_a_reserved_bits_16_001f = -1;
-static int hf_ansi_a_reserved_bits_16_003f = -1;
-static int hf_ansi_a_reserved_bits_16_8000 = -1;
-static int hf_ansi_a_reserved_bits_16_f800 = -1;
-static int hf_ansi_a_reserved_bits_24_001800 = -1;
-static int hf_ansi_a_reserved_bits_24_006000 = -1;
-static int hf_ansi_a_reserved_bits_24_007000 = -1;
-static int hf_ansi_a_speech_or_data_indicator = -1;
-static int hf_ansi_a_channel_number = -1;
-static int hf_ansi_a_IOS5_channel_number = -1;
-static int hf_ansi_a_chan_rate_and_type = -1;
-static int hf_ansi_a_speech_enc_or_data_rate = -1;
-static int hf_ansi_a_chan_type_data_ext = -1;
-static int hf_ansi_a_chan_type_data_transparent = -1;
-static int hf_ansi_a_return_cause = -1;
-static int hf_ansi_a_rf_chan_id_color_code = -1;
-static int hf_ansi_a_rf_chan_id_n_amps_based = -1;
-static int hf_ansi_a_rf_chan_id_amps_based = -1;
-static int hf_ansi_a_rf_chan_id_timeslot = -1;
-static int hf_ansi_a_rf_chan_id_channel_number = -1;
-static int hf_ansi_a_sr_id = -1;
-static int hf_ansi_a_sid = -1;
-static int hf_ansi_a_is95_chan_id_hho = -1;
-static int hf_ansi_a_is95_chan_id_num_chans_add = -1;
-static int hf_ansi_a_is95_chan_id_frame_offset = -1;
-static int hf_ansi_a_is95_chan_id_walsh_code_chan_idx = -1;
-static int hf_ansi_a_is95_chan_id_pilot_pn = -1;
-static int hf_ansi_a_is95_chan_id_power_combined = -1;
-static int hf_ansi_a_is95_chan_id_freq_incl = -1;
-static int hf_ansi_a_is95_chan_id_channel_number = -1;
-static int hf_ansi_a_enc_info_enc_parm_id = -1;
-static int hf_ansi_a_enc_info_status = -1;
-static int hf_ansi_a_enc_info_available = -1;
-static int hf_ansi_a_cm2_mob_p_rev = -1;
-static int hf_ansi_a_cm2_see_list = -1;
-static int hf_ansi_a_cm2_rf_power_cap = -1;
-static int hf_ansi_a_cm2_nar_an_cap = -1;
-static int hf_ansi_a_cm2_is95 = -1;
-static int hf_ansi_a_cm2_slotted = -1;
-static int hf_ansi_a_cm2_dtx = -1;
-static int hf_ansi_a_cm2_mobile_term = -1;
-static int hf_ansi_a_cm2_analog_cap = -1;
-static int hf_ansi_a_cm2_psi = -1;
-static int hf_ansi_a_cm2_scm_len = -1;
-static int hf_ansi_a_cm2_scm = -1;
-static int hf_ansi_a_cm2_scm_ext_scm_ind = -1;
-static int hf_ansi_a_cm2_scm_dual_mode = -1;
-static int hf_ansi_a_cm2_scm_slotted = -1;
-static int hf_ansi_a_cm2_scm_meid_configured = -1;
-static int hf_ansi_a_cm2_scm_25MHz_bandwidth = -1;
-static int hf_ansi_a_cm2_scm_transmission = -1;
-static int hf_ansi_a_cm2_scm_power_class = -1;
-static int hf_ansi_a_cm2_scm_band_class_count = -1;
-static int hf_ansi_a_cm2_scm_band_class_entry_len = -1;
-static int hf_ansi_a_scm_band_class_entry_band_class = -1;
-static int hf_ansi_a_scm_band_class_entry_opmode0_1 = -1;
-static int hf_ansi_a_scm_band_class_entry_opmode1_1 = -1;
-static int hf_ansi_a_scm_band_class_entry_opmode2_1 = -1;
-static int hf_ansi_a_scm_band_class_entry_opmode3_1 = -1;
-static int hf_ansi_a_scm_band_class_entry_opmode4_1 = -1;
-static int hf_ansi_a_scm_band_class_entry_opmode0_2 = -1;
-static int hf_ansi_a_scm_band_class_entry_opmode1_2 = -1;
-static int hf_ansi_a_scm_band_class_entry_opmode2_2 = -1;
-static int hf_ansi_a_scm_band_class_entry_opmode3_2 = -1;
-static int hf_ansi_a_scm_band_class_entry_opmode4_2 = -1;
-static int hf_ansi_a_scm_band_class_entry_opmode5_2 = -1;
-static int hf_ansi_a_scm_band_class_entry_opmode6_2 = -1;
-static int hf_ansi_a_scm_band_class_entry_p_rev = -1;
-static int hf_ansi_a_meid_mid_digit_1 = -1;
-static int hf_ansi_a_imsi_mid_digit_1 = -1;
-static int hf_ansi_a_mid_odd_even_ind = -1;
-static int hf_ansi_a_mid_type_of_id = -1;
-static int hf_ansi_a_mid_broadcast_priority = -1;
-static int hf_ansi_a_mid_broadcast_message_id = -1;
-static int hf_ansi_a_mid_broadcast_zone_id = -1;
-static int hf_ansi_a_mid_broadcast_srvc_cat = -1;
-static int hf_ansi_a_mid_broadcast_language = -1;
-static int hf_ansi_a_mid_unused = -1;
-static int hf_ansi_a_sci_sign = -1;
-static int hf_ansi_a_sci = -1;
-static int hf_ansi_a_prio_call_priority = -1;
-static int hf_ansi_a_prio_queue_allowed = -1;
-static int hf_ansi_a_prio_preempt_allowed = -1;
-static int hf_ansi_a_mob_p_rev = -1;
-static int hf_ansi_a_cause_1_ext = -1;
-static int hf_ansi_a_cause_2_ext = -1;
-static int hf_ansi_a_cell_id_disc = -1;
-static int hf_ansi_a_cic = -1;
-static int hf_ansi_a_cic_pcm_multi = -1;
-static int hf_ansi_a_cic_timeslot = -1;
-static int hf_ansi_a_cic_ext_cic = -1;
-static int hf_ansi_a_cic_ext_pcm_multi = -1;
-static int hf_ansi_a_cic_ext_timeslot = -1;
-static int hf_ansi_a_cic_ext_circuit_mode = -1;
-static int hf_ansi_a_ssci_mopd = -1;
-static int hf_ansi_a_ssci_geci = -1;
-static int hf_ansi_a_downlink_re_num_cells = -1;
-static int hf_ansi_a_downlink_re_sig_str_raw = -1;
-static int hf_ansi_a_downlink_re_cdma_towd = -1;
-static int hf_ansi_a_downlink_re_entry_env_len = -1;
-static int hf_ansi_a_ho_pow_lev_num_cells = -1;
-static int hf_ansi_a_ho_pow_lev_id_type = -1;
-static int hf_ansi_a_ho_pow_lev_pow_lev = -1;
-static int hf_ansi_a_uz_id = -1;
-static int hf_ansi_a_info_rec_req = -1;
-static int hf_ansi_a_is2000_chan_id_otd = -1;
-static int hf_ansi_a_is2000_chan_id_chan_count = -1;
-static int hf_ansi_a_is2000_chan_id_frame_offset = -1;
-static int hf_ansi_a_is2000_chan_id_chan_chan_type = -1;
-static int hf_ansi_a_is2000_chan_id_chan_rev_fch_gating = -1;
-static int hf_ansi_a_is2000_chan_id_chan_rev_pilot_gating_rate = -1;
-static int hf_ansi_a_is2000_chan_id_chan_qof_mask = -1;
-static int hf_ansi_a_is2000_chan_id_chan_walsh_code_chan_idx = -1;
-static int hf_ansi_a_is2000_chan_id_chan_pilot_pn_code = -1;
-static int hf_ansi_a_is2000_chan_id_chan_power_combined = -1;
-static int hf_ansi_a_is2000_chan_id_chan_freq_incl = -1;
-static int hf_ansi_a_is2000_chan_id_chan_channel_number = -1;
-static int hf_ansi_a_is2000_chan_id_chan_fdc_length = -1;
-static int hf_ansi_a_is2000_chan_id_chan_fdc_band_class = -1;
-static int hf_ansi_a_is2000_chan_id_chan_fdc_fwd_chan_freq = -1;
-static int hf_ansi_a_is2000_chan_id_chan_fdc_rev_chan_freq = -1;
-static int hf_ansi_a_is95_ms_meas_chan_id_band_class = -1;
-static int hf_ansi_a_is95_ms_meas_chan_id_channel_number = -1;
-static int hf_ansi_a_clg_party_ascii_num_ton = -1;
-static int hf_ansi_a_clg_party_ascii_num_plan = -1;
-static int hf_ansi_a_clg_party_ascii_num_pi = -1;
-static int hf_ansi_a_clg_party_ascii_num_si = -1;
-static int hf_ansi_a_lai_mcc = -1;
-static int hf_ansi_a_lai_mnc = -1;
-static int hf_ansi_a_lai_lac = -1;
-static int hf_ansi_a_rej_cause = -1;
-static int hf_ansi_a_auth_chlg_param_rand_num_type = -1;
-static int hf_ansi_a_auth_chlg_param_rand = -1;
-static int hf_ansi_a_auth_resp_param_sig_type = -1;
-static int hf_ansi_a_auth_resp_param_sig = -1;
-static int hf_ansi_a_auth_param_count_count = -1;
-static int hf_ansi_a_mwi_num_messages = -1;
-static int hf_ansi_a_signal_signal_value = -1;
-static int hf_ansi_a_signal_alert_pitch = -1;
-static int hf_ansi_a_clg_party_bcd_num_ton = -1;
-static int hf_ansi_a_clg_party_bcd_num_plan = -1;
-static int hf_ansi_a_qos_params_packet_priority = -1;
-static int hf_ansi_a_cause_l3_coding_standard = -1;
-static int hf_ansi_a_cause_l3_location = -1;
-static int hf_ansi_a_cause_l3_class = -1;
-static int hf_ansi_a_cause_l3_value_without_class = -1;
-static int hf_ansi_a_cause_l3_value = -1;
-static int hf_ansi_a_auth_conf_param_randc = -1;
-static int hf_ansi_a_xmode_tfo_mode = -1;
-static int hf_ansi_a_reg_type_type = -1;
-static int hf_ansi_a_tag_value = -1;
-static int hf_ansi_a_hho_params_band_class = -1;
-static int hf_ansi_a_hho_params_num_pream_frames = -1;
-static int hf_ansi_a_hho_params_reset_l2 = -1;
-static int hf_ansi_a_hho_params_reset_fpc = -1;
-static int hf_ansi_a_hho_params_enc_mode = -1;
-static int hf_ansi_a_hho_params_private_lcm = -1;
-static int hf_ansi_a_hho_params_rev_pwr_cntl_delay_incl = -1;
-static int hf_ansi_a_hho_params_rev_pwr_cntl_delay = -1;
-static int hf_ansi_a_hho_params_nom_pwr_ext = -1;
-static int hf_ansi_a_hho_params_nom_pwr = -1;
-static int hf_ansi_a_hho_params_fpc_subchan_info = -1;
-static int hf_ansi_a_hho_params_fpc_subchan_info_incl = -1;
-static int hf_ansi_a_hho_params_pwr_cntl_step = -1;
-static int hf_ansi_a_hho_params_pwr_cntl_step_incl = -1;
-static int hf_ansi_a_sw_ver_major = -1;
-static int hf_ansi_a_sw_ver_minor = -1;
-static int hf_ansi_a_sw_ver_point = -1;
-static int hf_ansi_a_so_proprietary_ind = -1;
-static int hf_ansi_a_so_revision = -1;
-static int hf_ansi_a_so_base_so_num = -1;
-static int hf_ansi_a_soci = -1;
-static int hf_ansi_a_so_list_num = -1;
-static int hf_ansi_a_so_list_sr_id = -1;
-static int hf_ansi_a_so_list_soci = -1;
-static int hf_ansi_a_nid = -1;
-static int hf_ansi_a_pzid = -1;
-static int hf_ansi_a_adds_user_part_burst_type = -1;
-static int hf_ansi_a_adds_user_part_ext_burst_type = -1;
-static int hf_ansi_a_adds_user_part_ext_data = -1;
-static int hf_ansi_a_adds_user_part_unknown_data = -1;
-static int hf_ansi_a_amps_hho_params_enc_mode = -1;
-static int hf_ansi_a_is2000_scr_num_fill_bits = -1;
-static int hf_ansi_a_is2000_scr_for_mux_option = -1;
-static int hf_ansi_a_is2000_scr_rev_mux_option = -1;
-static int hf_ansi_a_is2000_scr_for_fch_rate = -1;
-static int hf_ansi_a_is2000_scr_rev_fch_rate = -1;
-static int hf_ansi_a_is2000_scr_num_socr = -1;
-static int hf_ansi_a_is2000_scr_socr_soc_ref = -1;
-static int hf_ansi_a_is2000_scr_socr_so = -1;
-static int hf_ansi_a_is2000_scr_socr_for_chan_type = -1;
-static int hf_ansi_a_is2000_scr_socr_rev_chan_type = -1;
-static int hf_ansi_a_is2000_scr_socr_ui_enc_mode = -1;
-static int hf_ansi_a_is2000_scr_socr_sr_id = -1;
-static int hf_ansi_a_is2000_scr_socr_rlp_info_incl = -1;
-static int hf_ansi_a_is2000_scr_socr_rlp_blob_len = -1;
-static int hf_ansi_a_is2000_scr_socr_rlp_blob_msb = -1;
-static int hf_ansi_a_is2000_scr_socr_rlp_blob = -1;
-static int hf_ansi_a_is2000_scr_socr_rlp_blob_lsb = -1;
-static int hf_ansi_a_is2000_scr_socr_fch_cc_incl = -1;
-static int hf_ansi_a_is2000_scr_socr_fch_frame_size_support_ind = -1;
-static int hf_ansi_a_is2000_scr_socr_for_fch_rc = -1;
-static int hf_ansi_a_is2000_scr_socr_rev_fch_rc = -1;
-static int hf_ansi_a_is2000_nn_scr_num_fill_bits = -1;
-static int hf_ansi_a_is2000_nn_scr_content = -1;
-static int hf_ansi_a_is2000_nn_scr_fill_bits = -1;
-static int hf_ansi_a_is2000_mob_cap_rev_pdch_support_ind = -1;
-static int hf_ansi_a_is2000_mob_cap_for_pdch_support_ind = -1;
-static int hf_ansi_a_is2000_mob_cap_eram_support_ind = -1;
-static int hf_ansi_a_is2000_mob_cap_dcch_support_ind = -1;
-static int hf_ansi_a_is2000_mob_cap_fch_support_ind = -1;
-static int hf_ansi_a_is2000_mob_cap_otd_support_ind = -1;
-static int hf_ansi_a_is2000_mob_cap_enh_rc_cfg_support_ind = -1;
-static int hf_ansi_a_is2000_mob_cap_qpch_support_ind = -1;
-static int hf_ansi_a_is2000_mob_cap_fch_info_octet_len = -1;
-static int hf_ansi_a_is2000_mob_cap_fch_info_geo_loc_type = -1;
-static int hf_ansi_a_is2000_mob_cap_fch_info_geo_loc_incl = -1;
-static int hf_ansi_a_is2000_mob_cap_fch_info_num_fill_bits = -1;
-static int hf_ansi_a_is2000_mob_cap_fch_info_content = -1;
-static int hf_ansi_a_is2000_mob_cap_fch_info_fill_bits = -1;
-static int hf_ansi_a_is2000_mob_cap_dcch_info_octet_len = -1;
-static int hf_ansi_a_is2000_mob_cap_dcch_info_num_fill_bits = -1;
-static int hf_ansi_a_is2000_mob_cap_dcch_info_content = -1;
-static int hf_ansi_a_is2000_mob_cap_dcch_info_fill_bits = -1;
-static int hf_ansi_a_is2000_mob_cap_for_pdch_info_octet_len = -1;
-static int hf_ansi_a_is2000_mob_cap_for_pdch_info_num_fill_bits = -1;
-static int hf_ansi_a_is2000_mob_cap_for_pdch_info_content = -1;
-static int hf_ansi_a_is2000_mob_cap_for_pdch_info_fill_bits = -1;
-static int hf_ansi_a_is2000_mob_cap_rev_pdch_info_octet_len = -1;
-static int hf_ansi_a_is2000_mob_cap_rev_pdch_info_num_fill_bits = -1;
-static int hf_ansi_a_is2000_mob_cap_rev_pdch_info_content = -1;
-static int hf_ansi_a_is2000_mob_cap_rev_pdch_info_fill_bits = -1;
-static int hf_ansi_a_is2000_mob_cap_vp_support = -1;
-static int hf_ansi_a_is2000_mob_cap_vp_support_a7 = -1;
-static int hf_ansi_a_is2000_mob_cap_vp_support_a6 = -1;
-static int hf_ansi_a_is2000_mob_cap_vp_support_a5 = -1;
-static int hf_ansi_a_is2000_mob_cap_vp_support_a4 = -1;
-static int hf_ansi_a_is2000_mob_cap_vp_support_a3 = -1;
-static int hf_ansi_a_is2000_mob_cap_vp_support_a2 = -1;
-static int hf_ansi_a_is2000_mob_cap_vp_support_a1 = -1;
-static int hf_ansi_a_protocol_type = -1;
-static int hf_ansi_a_fwd_ms_info_rec_cld_pn_num_type = -1;
-static int hf_ansi_a_fwd_ms_info_rec_cld_pn_num_plan = -1;
-static int hf_ansi_a_fwd_ms_info_rec_cld_pn_num = -1;
-static int hf_ansi_a_fwd_ms_info_rec_clg_pn_num_type = -1;
-static int hf_ansi_a_fwd_ms_info_rec_clg_pn_num_plan = -1;
-static int hf_ansi_a_fwd_ms_info_rec_clg_pn_num = -1;
-static int hf_ansi_a_fwd_ms_info_rec_clg_pn_pi = -1;
-static int hf_ansi_a_fwd_ms_info_rec_clg_pn_si = -1;
-static int hf_ansi_a_fwd_ms_info_rec_mw_num = -1;
-static int hf_ansi_a_fwd_ms_info_rec_content = -1;
-static int hf_ansi_a_rev_ms_info_rec_cld_pn_num_type = -1;
-static int hf_ansi_a_rev_ms_info_rec_cld_pn_num_plan = -1;
-static int hf_ansi_a_rev_ms_info_rec_cld_pn_num = -1;
-static int hf_ansi_a_rev_ms_info_rec_clg_pn_num_type = -1;
-static int hf_ansi_a_rev_ms_info_rec_clg_pn_num_plan = -1;
-static int hf_ansi_a_rev_ms_info_rec_clg_pn_num = -1;
-static int hf_ansi_a_rev_ms_info_rec_clg_pn_pi = -1;
-static int hf_ansi_a_rev_ms_info_rec_clg_pn_si = -1;
-static int hf_ansi_a_rev_ms_info_rec_so_info_fwd_support = -1;
-static int hf_ansi_a_rev_ms_info_rec_so_info_rev_support = -1;
-static int hf_ansi_a_rev_ms_info_rec_so_info_so = -1;
-static int hf_ansi_a_rev_ms_info_rec_content = -1;
-static int hf_ansi_a_ext_ho_dir_params_srch_win_a = -1;
-static int hf_ansi_a_ext_ho_dir_params_srch_win_n = -1;
-static int hf_ansi_a_ext_ho_dir_params_srch_win_r = -1;
-static int hf_ansi_a_ext_ho_dir_params_t_add = -1;
-static int hf_ansi_a_ext_ho_dir_params_t_drop = -1;
-static int hf_ansi_a_ext_ho_dir_params_t_comp = -1;
-static int hf_ansi_a_ext_ho_dir_params_t_tdrop = -1;
-static int hf_ansi_a_ext_ho_dir_params_nghbor_max_age = -1;
-static int hf_ansi_a_ext_ho_dir_params_target_bs_values_incl = -1;
-static int hf_ansi_a_ext_ho_dir_params_soft_slope = -1;
-static int hf_ansi_a_ext_ho_dir_params_add_intercept = -1;
-static int hf_ansi_a_ext_ho_dir_params_drop_intercept = -1;
-static int hf_ansi_a_ext_ho_dir_params_target_bs_p_rev = -1;
-static int hf_ansi_a_cdma_sowd_sowd = -1;
-static int hf_ansi_a_cdma_sowd_resolution = -1;
-static int hf_ansi_a_cdma_sowd_timestamp = -1;
-static int hf_ansi_a_re_res_prio_incl = -1;
-static int hf_ansi_a_re_res_forward = -1;
-static int hf_ansi_a_re_res_reverse = -1;
-static int hf_ansi_a_re_res_alloc = -1;
-static int hf_ansi_a_re_res_avail = -1;
-static int hf_ansi_a_cld_party_ascii_num_ton = -1;
-static int hf_ansi_a_cld_party_ascii_num_plan = -1;
-static int hf_ansi_a_band_class = -1;
-static int hf_ansi_a_is2000_cause = -1;
-static int hf_ansi_a_auth_event = -1;
-static int hf_ansi_a_psmm_count = -1;
-static int hf_ansi_a_geo_loc = -1;
-static int hf_ansi_a_cct_group_all_circuits = -1;
-static int hf_ansi_a_cct_group_inclusive = -1;
-static int hf_ansi_a_cct_group_count = -1;
-static int hf_ansi_a_cct_group_first_cic = -1;
-static int hf_ansi_a_cct_group_first_cic_pcm_multi = -1;
-static int hf_ansi_a_cct_group_first_cic_timeslot = -1;
-static int hf_ansi_a_paca_timestamp_queuing_time = -1;
-static int hf_ansi_a_paca_order_action_reqd = -1;
-static int hf_ansi_a_paca_reoi_pri = -1;
-static int hf_ansi_a_a2p_bearer_sess_max_frames = -1;
-static int hf_ansi_a_a2p_bearer_sess_ip_addr_type = -1;
-static int hf_ansi_a_a2p_bearer_sess_addr_flag = -1;
-static int hf_ansi_a_a2p_bearer_sess_ipv4_addr = -1;
-static int hf_ansi_a_a2p_bearer_sess_ipv6_addr = -1;
-static int hf_ansi_a_a2p_bearer_sess_udp_port = -1;
-static int hf_ansi_a_a2p_bearer_form_num_formats = -1;
-static int hf_ansi_a_a2p_bearer_form_ip_addr_type = -1;
-static int hf_ansi_a_a2p_bearer_form_format_len = -1;
-static int hf_ansi_a_a2p_bearer_form_format_tag_type = -1;
-static int hf_ansi_a_a2p_bearer_form_format_format_id = -1;
-static int hf_ansi_a_a2p_bearer_form_format_rtp_payload_type = -1;
-static int hf_ansi_a_a2p_bearer_form_format_bearer_addr_flag = -1;
-static int hf_ansi_a_a2p_bearer_form_format_ipv4_addr = -1;
-static int hf_ansi_a_a2p_bearer_form_format_ipv6_addr = -1;
-static int hf_ansi_a_a2p_bearer_form_format_udp_port = -1;
-static int hf_ansi_a_a2p_bearer_form_format_ext_len = -1;
-static int hf_ansi_a_a2p_bearer_form_format_ext_id = -1;
-static int hf_ansi_a_ms_des_freq_band_class = -1;
-static int hf_ansi_a_ms_des_freq_cdma_channel = -1;
-static int hf_ansi_a_plcm_id_plcm_type = -1;
-static int hf_ansi_a_bdtmf_trans_info_dtmf_off_len = -1;
-static int hf_ansi_a_bdtmf_trans_info_dtmf_on_len = -1;
-static int hf_ansi_a_bdtmf_chars_num_chars = -1;
-static int hf_ansi_a_bdtmf_chars_digits = -1;
-static int hf_ansi_a_encryption_parameter_value = -1;
-static int hf_ansi_a_layer3_info = -1;
-static int hf_ansi_a_manufacturer_software_info = -1;
-static int hf_ansi_a_circuit_bitmap = -1;
-static int hf_ansi_a_extension_parameter_value = -1;
-static int hf_ansi_a_msb_first_digit = -1;
-static int hf_ansi_a_dcch_cc_incl = -1;
-static int hf_ansi_a_for_sch_cc_incl = -1;
-static int hf_ansi_a_rev_sch_cc_incl = -1;
-static int hf_ansi_a_plcm42 = -1;
+static int hf_ansi_a_bsmap_msgtype;
+static int hf_ansi_a_dtap_msgtype;
+static int hf_ansi_a_protocol_disc;
+static int hf_ansi_a_reserved_octet;
+static int hf_ansi_a_ti_flag;
+static int hf_ansi_a_ti_ti;
+static int hf_ansi_a_cm_svrc_type;
+static int hf_ansi_a_elem_id;
+static int hf_ansi_a_elem_id_f0;
+static int hf_ansi_a_length;
+static int hf_ansi_a_esn;
+static int hf_ansi_a_imsi;
+static int hf_ansi_a_meid;
+static int hf_ansi_a_cld_party_bcd_num;
+static int hf_ansi_a_cld_party_ascii_num;
+static int hf_ansi_a_clg_party_ascii_num;
+static int hf_ansi_a_cell_ci;
+static int hf_ansi_a_cell_lac;
+static int hf_ansi_a_cell_mscid;
+static int hf_ansi_a_pdsn_ip_addr;
+static int hf_ansi_a_s_pdsn_ip_addr;
+static int hf_ansi_a_anchor_ip_addr;
+static int hf_ansi_a_anchor_pp_ip_addr;
+static int hf_ansi_a_so;
+static int hf_ansi_a_cause_1;      /* 1 octet cause */
+static int hf_ansi_a_cause_2;      /* 2 octet cause */
+static int hf_ansi_a_ms_info_rec_signal_type;
+static int hf_ansi_a_ms_info_rec_signal_alert_pitch;
+static int hf_ansi_a_ms_info_rec_signal_tone;
+static int hf_ansi_a_ms_info_rec_signal_isdn_alert;
+static int hf_ansi_a_ms_info_rec_signal_is54b_alert;
+static int hf_ansi_a_ms_info_rec_call_waiting_ind;
+static int hf_ansi_a_extension_8_80;
+static int hf_ansi_a_reserved_bits_8_generic;
+static int hf_ansi_a_reserved_bits_8_01;
+static int hf_ansi_a_reserved_bits_8_07;
+static int hf_ansi_a_reserved_bits_8_0c;
+static int hf_ansi_a_reserved_bits_8_0f;
+static int hf_ansi_a_reserved_bits_8_10;
+static int hf_ansi_a_reserved_bits_8_18;
+static int hf_ansi_a_reserved_bits_8_1c;
+static int hf_ansi_a_reserved_bits_8_1f;
+static int hf_ansi_a_reserved_bits_8_3f;
+static int hf_ansi_a_reserved_bits_8_7f;
+static int hf_ansi_a_reserved_bits_8_80;
+static int hf_ansi_a_reserved_bits_8_c0;
+static int hf_ansi_a_reserved_bits_8_e0;
+static int hf_ansi_a_reserved_bits_8_f0;
+static int hf_ansi_a_reserved_bits_8_f8;
+static int hf_ansi_a_reserved_bits_8_fc;
+static int hf_ansi_a_reserved_bits_8_fe;
+static int hf_ansi_a_reserved_bits_8_ff;
+static int hf_ansi_a_reserved_bits_16_001f;
+static int hf_ansi_a_reserved_bits_16_003f;
+static int hf_ansi_a_reserved_bits_16_8000;
+static int hf_ansi_a_reserved_bits_16_f800;
+static int hf_ansi_a_reserved_bits_24_001800;
+static int hf_ansi_a_reserved_bits_24_006000;
+static int hf_ansi_a_reserved_bits_24_007000;
+static int hf_ansi_a_speech_or_data_indicator;
+static int hf_ansi_a_channel_number;
+static int hf_ansi_a_IOS5_channel_number;
+static int hf_ansi_a_chan_rate_and_type;
+static int hf_ansi_a_speech_enc_or_data_rate;
+static int hf_ansi_a_chan_type_data_ext;
+static int hf_ansi_a_chan_type_data_transparent;
+static int hf_ansi_a_return_cause;
+static int hf_ansi_a_rf_chan_id_color_code;
+static int hf_ansi_a_rf_chan_id_n_amps_based;
+static int hf_ansi_a_rf_chan_id_amps_based;
+static int hf_ansi_a_rf_chan_id_timeslot;
+static int hf_ansi_a_rf_chan_id_channel_number;
+static int hf_ansi_a_sr_id;
+static int hf_ansi_a_sid;
+static int hf_ansi_a_is95_chan_id_hho;
+static int hf_ansi_a_is95_chan_id_num_chans_add;
+static int hf_ansi_a_is95_chan_id_frame_offset;
+static int hf_ansi_a_is95_chan_id_walsh_code_chan_idx;
+static int hf_ansi_a_is95_chan_id_pilot_pn;
+static int hf_ansi_a_is95_chan_id_power_combined;
+static int hf_ansi_a_is95_chan_id_freq_incl;
+static int hf_ansi_a_is95_chan_id_channel_number;
+static int hf_ansi_a_enc_info_enc_parm_id;
+static int hf_ansi_a_enc_info_status;
+static int hf_ansi_a_enc_info_available;
+static int hf_ansi_a_cm2_mob_p_rev;
+static int hf_ansi_a_cm2_see_list;
+static int hf_ansi_a_cm2_rf_power_cap;
+static int hf_ansi_a_cm2_nar_an_cap;
+static int hf_ansi_a_cm2_is95;
+static int hf_ansi_a_cm2_slotted;
+static int hf_ansi_a_cm2_dtx;
+static int hf_ansi_a_cm2_mobile_term;
+static int hf_ansi_a_cm2_analog_cap;
+static int hf_ansi_a_cm2_psi;
+static int hf_ansi_a_cm2_scm_len;
+static int hf_ansi_a_cm2_scm;
+static int hf_ansi_a_cm2_scm_ext_scm_ind;
+static int hf_ansi_a_cm2_scm_dual_mode;
+static int hf_ansi_a_cm2_scm_slotted;
+static int hf_ansi_a_cm2_scm_meid_configured;
+static int hf_ansi_a_cm2_scm_25MHz_bandwidth;
+static int hf_ansi_a_cm2_scm_transmission;
+static int hf_ansi_a_cm2_scm_power_class;
+static int hf_ansi_a_cm2_scm_band_class_count;
+static int hf_ansi_a_cm2_scm_band_class_entry_len;
+static int hf_ansi_a_scm_band_class_entry_band_class;
+static int hf_ansi_a_scm_band_class_entry_opmode0_1;
+static int hf_ansi_a_scm_band_class_entry_opmode1_1;
+static int hf_ansi_a_scm_band_class_entry_opmode2_1;
+static int hf_ansi_a_scm_band_class_entry_opmode3_1;
+static int hf_ansi_a_scm_band_class_entry_opmode4_1;
+static int hf_ansi_a_scm_band_class_entry_opmode0_2;
+static int hf_ansi_a_scm_band_class_entry_opmode1_2;
+static int hf_ansi_a_scm_band_class_entry_opmode2_2;
+static int hf_ansi_a_scm_band_class_entry_opmode3_2;
+static int hf_ansi_a_scm_band_class_entry_opmode4_2;
+static int hf_ansi_a_scm_band_class_entry_opmode5_2;
+static int hf_ansi_a_scm_band_class_entry_opmode6_2;
+static int hf_ansi_a_scm_band_class_entry_p_rev;
+static int hf_ansi_a_meid_mid_digit_1;
+static int hf_ansi_a_imsi_mid_digit_1;
+static int hf_ansi_a_mid_odd_even_ind;
+static int hf_ansi_a_mid_type_of_id;
+static int hf_ansi_a_mid_broadcast_priority;
+static int hf_ansi_a_mid_broadcast_message_id;
+static int hf_ansi_a_mid_broadcast_zone_id;
+static int hf_ansi_a_mid_broadcast_srvc_cat;
+static int hf_ansi_a_mid_broadcast_language;
+static int hf_ansi_a_mid_unused;
+static int hf_ansi_a_sci_sign;
+static int hf_ansi_a_sci;
+static int hf_ansi_a_prio_call_priority;
+static int hf_ansi_a_prio_queue_allowed;
+static int hf_ansi_a_prio_preempt_allowed;
+static int hf_ansi_a_mob_p_rev;
+static int hf_ansi_a_cause_1_ext;
+static int hf_ansi_a_cause_2_ext;
+static int hf_ansi_a_cell_id_disc;
+static int hf_ansi_a_cic;
+static int hf_ansi_a_cic_pcm_multi;
+static int hf_ansi_a_cic_timeslot;
+static int hf_ansi_a_cic_ext_cic;
+static int hf_ansi_a_cic_ext_pcm_multi;
+static int hf_ansi_a_cic_ext_timeslot;
+static int hf_ansi_a_cic_ext_circuit_mode;
+static int hf_ansi_a_ssci_mopd;
+static int hf_ansi_a_ssci_geci;
+static int hf_ansi_a_downlink_re_num_cells;
+static int hf_ansi_a_downlink_re_sig_str_raw;
+static int hf_ansi_a_downlink_re_cdma_towd;
+static int hf_ansi_a_downlink_re_entry_env_len;
+static int hf_ansi_a_ho_pow_lev_num_cells;
+static int hf_ansi_a_ho_pow_lev_id_type;
+static int hf_ansi_a_ho_pow_lev_pow_lev;
+static int hf_ansi_a_uz_id;
+static int hf_ansi_a_info_rec_req;
+static int hf_ansi_a_is2000_chan_id_otd;
+static int hf_ansi_a_is2000_chan_id_chan_count;
+static int hf_ansi_a_is2000_chan_id_frame_offset;
+static int hf_ansi_a_is2000_chan_id_chan_chan_type;
+static int hf_ansi_a_is2000_chan_id_chan_rev_fch_gating;
+static int hf_ansi_a_is2000_chan_id_chan_rev_pilot_gating_rate;
+static int hf_ansi_a_is2000_chan_id_chan_qof_mask;
+static int hf_ansi_a_is2000_chan_id_chan_walsh_code_chan_idx;
+static int hf_ansi_a_is2000_chan_id_chan_pilot_pn_code;
+static int hf_ansi_a_is2000_chan_id_chan_power_combined;
+static int hf_ansi_a_is2000_chan_id_chan_freq_incl;
+static int hf_ansi_a_is2000_chan_id_chan_channel_number;
+static int hf_ansi_a_is2000_chan_id_chan_fdc_length;
+static int hf_ansi_a_is2000_chan_id_chan_fdc_band_class;
+static int hf_ansi_a_is2000_chan_id_chan_fdc_fwd_chan_freq;
+static int hf_ansi_a_is2000_chan_id_chan_fdc_rev_chan_freq;
+static int hf_ansi_a_is95_ms_meas_chan_id_band_class;
+static int hf_ansi_a_is95_ms_meas_chan_id_channel_number;
+static int hf_ansi_a_clg_party_ascii_num_ton;
+static int hf_ansi_a_clg_party_ascii_num_plan;
+static int hf_ansi_a_clg_party_ascii_num_pi;
+static int hf_ansi_a_clg_party_ascii_num_si;
+static int hf_ansi_a_lai_mcc;
+static int hf_ansi_a_lai_mnc;
+static int hf_ansi_a_lai_lac;
+static int hf_ansi_a_rej_cause;
+static int hf_ansi_a_auth_chlg_param_rand_num_type;
+static int hf_ansi_a_auth_chlg_param_rand;
+static int hf_ansi_a_auth_resp_param_sig_type;
+static int hf_ansi_a_auth_resp_param_sig;
+static int hf_ansi_a_auth_param_count_count;
+static int hf_ansi_a_mwi_num_messages;
+static int hf_ansi_a_signal_signal_value;
+static int hf_ansi_a_signal_alert_pitch;
+static int hf_ansi_a_clg_party_bcd_num_ton;
+static int hf_ansi_a_clg_party_bcd_num_plan;
+static int hf_ansi_a_qos_params_packet_priority;
+static int hf_ansi_a_cause_l3_coding_standard;
+static int hf_ansi_a_cause_l3_location;
+static int hf_ansi_a_cause_l3_class;
+static int hf_ansi_a_cause_l3_value_without_class;
+static int hf_ansi_a_cause_l3_value;
+static int hf_ansi_a_auth_conf_param_randc;
+static int hf_ansi_a_xmode_tfo_mode;
+static int hf_ansi_a_reg_type_type;
+static int hf_ansi_a_tag_value;
+static int hf_ansi_a_hho_params_band_class;
+static int hf_ansi_a_hho_params_num_pream_frames;
+static int hf_ansi_a_hho_params_reset_l2;
+static int hf_ansi_a_hho_params_reset_fpc;
+static int hf_ansi_a_hho_params_enc_mode;
+static int hf_ansi_a_hho_params_private_lcm;
+static int hf_ansi_a_hho_params_rev_pwr_cntl_delay_incl;
+static int hf_ansi_a_hho_params_rev_pwr_cntl_delay;
+static int hf_ansi_a_hho_params_nom_pwr_ext;
+static int hf_ansi_a_hho_params_nom_pwr;
+static int hf_ansi_a_hho_params_fpc_subchan_info;
+static int hf_ansi_a_hho_params_fpc_subchan_info_incl;
+static int hf_ansi_a_hho_params_pwr_cntl_step;
+static int hf_ansi_a_hho_params_pwr_cntl_step_incl;
+static int hf_ansi_a_sw_ver_major;
+static int hf_ansi_a_sw_ver_minor;
+static int hf_ansi_a_sw_ver_point;
+static int hf_ansi_a_so_proprietary_ind;
+static int hf_ansi_a_so_revision;
+static int hf_ansi_a_so_base_so_num;
+static int hf_ansi_a_soci;
+static int hf_ansi_a_so_list_num;
+static int hf_ansi_a_so_list_sr_id;
+static int hf_ansi_a_so_list_soci;
+static int hf_ansi_a_nid;
+static int hf_ansi_a_pzid;
+static int hf_ansi_a_adds_user_part_burst_type;
+static int hf_ansi_a_adds_user_part_ext_burst_type;
+static int hf_ansi_a_adds_user_part_ext_data;
+static int hf_ansi_a_adds_user_part_unknown_data;
+static int hf_ansi_a_amps_hho_params_enc_mode;
+static int hf_ansi_a_is2000_scr_num_fill_bits;
+static int hf_ansi_a_is2000_scr_for_mux_option;
+static int hf_ansi_a_is2000_scr_rev_mux_option;
+static int hf_ansi_a_is2000_scr_for_fch_rate;
+static int hf_ansi_a_is2000_scr_rev_fch_rate;
+static int hf_ansi_a_is2000_scr_num_socr;
+static int hf_ansi_a_is2000_scr_socr_soc_ref;
+static int hf_ansi_a_is2000_scr_socr_so;
+static int hf_ansi_a_is2000_scr_socr_for_chan_type;
+static int hf_ansi_a_is2000_scr_socr_rev_chan_type;
+static int hf_ansi_a_is2000_scr_socr_ui_enc_mode;
+static int hf_ansi_a_is2000_scr_socr_sr_id;
+static int hf_ansi_a_is2000_scr_socr_rlp_info_incl;
+static int hf_ansi_a_is2000_scr_socr_rlp_blob_len;
+static int hf_ansi_a_is2000_scr_socr_rlp_blob_msb;
+static int hf_ansi_a_is2000_scr_socr_rlp_blob;
+static int hf_ansi_a_is2000_scr_socr_rlp_blob_lsb;
+static int hf_ansi_a_is2000_scr_socr_fch_cc_incl;
+static int hf_ansi_a_is2000_scr_socr_fch_frame_size_support_ind;
+static int hf_ansi_a_is2000_scr_socr_for_fch_rc;
+static int hf_ansi_a_is2000_scr_socr_rev_fch_rc;
+static int hf_ansi_a_is2000_nn_scr_num_fill_bits;
+static int hf_ansi_a_is2000_nn_scr_content;
+static int hf_ansi_a_is2000_nn_scr_fill_bits;
+static int hf_ansi_a_is2000_mob_cap_rev_pdch_support_ind;
+static int hf_ansi_a_is2000_mob_cap_for_pdch_support_ind;
+static int hf_ansi_a_is2000_mob_cap_eram_support_ind;
+static int hf_ansi_a_is2000_mob_cap_dcch_support_ind;
+static int hf_ansi_a_is2000_mob_cap_fch_support_ind;
+static int hf_ansi_a_is2000_mob_cap_otd_support_ind;
+static int hf_ansi_a_is2000_mob_cap_enh_rc_cfg_support_ind;
+static int hf_ansi_a_is2000_mob_cap_qpch_support_ind;
+static int hf_ansi_a_is2000_mob_cap_fch_info_octet_len;
+static int hf_ansi_a_is2000_mob_cap_fch_info_geo_loc_type;
+static int hf_ansi_a_is2000_mob_cap_fch_info_geo_loc_incl;
+static int hf_ansi_a_is2000_mob_cap_fch_info_num_fill_bits;
+static int hf_ansi_a_is2000_mob_cap_fch_info_content;
+static int hf_ansi_a_is2000_mob_cap_fch_info_fill_bits;
+static int hf_ansi_a_is2000_mob_cap_dcch_info_octet_len;
+static int hf_ansi_a_is2000_mob_cap_dcch_info_num_fill_bits;
+static int hf_ansi_a_is2000_mob_cap_dcch_info_content;
+static int hf_ansi_a_is2000_mob_cap_dcch_info_fill_bits;
+static int hf_ansi_a_is2000_mob_cap_for_pdch_info_octet_len;
+static int hf_ansi_a_is2000_mob_cap_for_pdch_info_num_fill_bits;
+static int hf_ansi_a_is2000_mob_cap_for_pdch_info_content;
+static int hf_ansi_a_is2000_mob_cap_for_pdch_info_fill_bits;
+static int hf_ansi_a_is2000_mob_cap_rev_pdch_info_octet_len;
+static int hf_ansi_a_is2000_mob_cap_rev_pdch_info_num_fill_bits;
+static int hf_ansi_a_is2000_mob_cap_rev_pdch_info_content;
+static int hf_ansi_a_is2000_mob_cap_rev_pdch_info_fill_bits;
+static int hf_ansi_a_is2000_mob_cap_vp_support;
+static int hf_ansi_a_is2000_mob_cap_vp_support_a7;
+static int hf_ansi_a_is2000_mob_cap_vp_support_a6;
+static int hf_ansi_a_is2000_mob_cap_vp_support_a5;
+static int hf_ansi_a_is2000_mob_cap_vp_support_a4;
+static int hf_ansi_a_is2000_mob_cap_vp_support_a3;
+static int hf_ansi_a_is2000_mob_cap_vp_support_a2;
+static int hf_ansi_a_is2000_mob_cap_vp_support_a1;
+static int hf_ansi_a_protocol_type;
+static int hf_ansi_a_fwd_ms_info_rec_cld_pn_num_type;
+static int hf_ansi_a_fwd_ms_info_rec_cld_pn_num_plan;
+static int hf_ansi_a_fwd_ms_info_rec_cld_pn_num;
+static int hf_ansi_a_fwd_ms_info_rec_clg_pn_num_type;
+static int hf_ansi_a_fwd_ms_info_rec_clg_pn_num_plan;
+static int hf_ansi_a_fwd_ms_info_rec_clg_pn_num;
+static int hf_ansi_a_fwd_ms_info_rec_clg_pn_pi;
+static int hf_ansi_a_fwd_ms_info_rec_clg_pn_si;
+static int hf_ansi_a_fwd_ms_info_rec_mw_num;
+static int hf_ansi_a_fwd_ms_info_rec_content;
+static int hf_ansi_a_rev_ms_info_rec_cld_pn_num_type;
+static int hf_ansi_a_rev_ms_info_rec_cld_pn_num_plan;
+static int hf_ansi_a_rev_ms_info_rec_cld_pn_num;
+static int hf_ansi_a_rev_ms_info_rec_clg_pn_num_type;
+static int hf_ansi_a_rev_ms_info_rec_clg_pn_num_plan;
+static int hf_ansi_a_rev_ms_info_rec_clg_pn_num;
+static int hf_ansi_a_rev_ms_info_rec_clg_pn_pi;
+static int hf_ansi_a_rev_ms_info_rec_clg_pn_si;
+static int hf_ansi_a_rev_ms_info_rec_so_info_fwd_support;
+static int hf_ansi_a_rev_ms_info_rec_so_info_rev_support;
+static int hf_ansi_a_rev_ms_info_rec_so_info_so;
+static int hf_ansi_a_rev_ms_info_rec_content;
+static int hf_ansi_a_ext_ho_dir_params_srch_win_a;
+static int hf_ansi_a_ext_ho_dir_params_srch_win_n;
+static int hf_ansi_a_ext_ho_dir_params_srch_win_r;
+static int hf_ansi_a_ext_ho_dir_params_t_add;
+static int hf_ansi_a_ext_ho_dir_params_t_drop;
+static int hf_ansi_a_ext_ho_dir_params_t_comp;
+static int hf_ansi_a_ext_ho_dir_params_t_tdrop;
+static int hf_ansi_a_ext_ho_dir_params_nghbor_max_age;
+static int hf_ansi_a_ext_ho_dir_params_target_bs_values_incl;
+static int hf_ansi_a_ext_ho_dir_params_soft_slope;
+static int hf_ansi_a_ext_ho_dir_params_add_intercept;
+static int hf_ansi_a_ext_ho_dir_params_drop_intercept;
+static int hf_ansi_a_ext_ho_dir_params_target_bs_p_rev;
+static int hf_ansi_a_cdma_sowd_sowd;
+static int hf_ansi_a_cdma_sowd_resolution;
+static int hf_ansi_a_cdma_sowd_timestamp;
+static int hf_ansi_a_re_res_prio_incl;
+static int hf_ansi_a_re_res_forward;
+static int hf_ansi_a_re_res_reverse;
+static int hf_ansi_a_re_res_alloc;
+static int hf_ansi_a_re_res_avail;
+static int hf_ansi_a_cld_party_ascii_num_ton;
+static int hf_ansi_a_cld_party_ascii_num_plan;
+static int hf_ansi_a_band_class;
+static int hf_ansi_a_is2000_cause;
+static int hf_ansi_a_auth_event;
+static int hf_ansi_a_psmm_count;
+static int hf_ansi_a_geo_loc;
+static int hf_ansi_a_cct_group_all_circuits;
+static int hf_ansi_a_cct_group_inclusive;
+static int hf_ansi_a_cct_group_count;
+static int hf_ansi_a_cct_group_first_cic;
+static int hf_ansi_a_cct_group_first_cic_pcm_multi;
+static int hf_ansi_a_cct_group_first_cic_timeslot;
+static int hf_ansi_a_paca_timestamp_queuing_time;
+static int hf_ansi_a_paca_order_action_reqd;
+static int hf_ansi_a_paca_reoi_pri;
+static int hf_ansi_a_a2p_bearer_sess_max_frames;
+static int hf_ansi_a_a2p_bearer_sess_ip_addr_type;
+static int hf_ansi_a_a2p_bearer_sess_addr_flag;
+static int hf_ansi_a_a2p_bearer_sess_ipv4_addr;
+static int hf_ansi_a_a2p_bearer_sess_ipv6_addr;
+static int hf_ansi_a_a2p_bearer_sess_udp_port;
+static int hf_ansi_a_a2p_bearer_form_num_formats;
+static int hf_ansi_a_a2p_bearer_form_ip_addr_type;
+static int hf_ansi_a_a2p_bearer_form_format_len;
+static int hf_ansi_a_a2p_bearer_form_format_tag_type;
+static int hf_ansi_a_a2p_bearer_form_format_format_id;
+static int hf_ansi_a_a2p_bearer_form_format_rtp_payload_type;
+static int hf_ansi_a_a2p_bearer_form_format_bearer_addr_flag;
+static int hf_ansi_a_a2p_bearer_form_format_ipv4_addr;
+static int hf_ansi_a_a2p_bearer_form_format_ipv6_addr;
+static int hf_ansi_a_a2p_bearer_form_format_udp_port;
+static int hf_ansi_a_a2p_bearer_form_format_ext_len;
+static int hf_ansi_a_a2p_bearer_form_format_ext_id;
+static int hf_ansi_a_ms_des_freq_band_class;
+static int hf_ansi_a_ms_des_freq_cdma_channel;
+static int hf_ansi_a_plcm_id_plcm_type;
+static int hf_ansi_a_bdtmf_trans_info_dtmf_off_len;
+static int hf_ansi_a_bdtmf_trans_info_dtmf_on_len;
+static int hf_ansi_a_bdtmf_chars_num_chars;
+static int hf_ansi_a_bdtmf_chars_digits;
+static int hf_ansi_a_encryption_parameter_value;
+static int hf_ansi_a_layer3_info;
+static int hf_ansi_a_manufacturer_software_info;
+static int hf_ansi_a_circuit_bitmap;
+static int hf_ansi_a_extension_parameter_value;
+static int hf_ansi_a_msb_first_digit;
+static int hf_ansi_a_dcch_cc_incl;
+static int hf_ansi_a_for_sch_cc_incl;
+static int hf_ansi_a_rev_sch_cc_incl;
+static int hf_ansi_a_plcm42;
 
 
 /* Initialize the subtree pointers */
-static gint ett_bsmap = -1;
-static gint ett_dtap = -1;
-static gint ett_elems = -1;
-static gint ett_elem = -1;
-static gint ett_dtap_oct_1 = -1;
-static gint ett_cm_srvc_type = -1;
-static gint ett_ansi_ms_info_rec_reserved = -1;
-static gint ett_ansi_enc_info = -1;
-static gint ett_scm = -1;
-static gint ett_cell_list = -1;
-static gint ett_bearer_list = -1;
-static gint ett_re_list = -1;
-static gint ett_so_list = -1;
-static gint ett_adds_user_part = -1;
-static gint ett_scr = -1;
-static gint ett_scr_socr = -1;
-static gint ett_cm2_band_class = -1;
-static gint ett_vp_algs = -1;
-static gint ett_chan_list = -1;
-static gint ett_cic = -1;
-static gint ett_is2000_mob_cap_fch_info = -1;
-static gint ett_is2000_mob_cap_dcch_info = -1;
-static gint ett_is2000_mob_cap_for_pdch_info = -1;
-static gint ett_is2000_mob_cap_rev_pdch_info = -1;
-
-static expert_field ei_ansi_a_extraneous_data = EI_INIT;
-static expert_field ei_ansi_a_short_data = EI_INIT;
-static expert_field ei_ansi_a_missing_mand_elem = EI_INIT;
-static expert_field ei_ansi_a_unknown_format = EI_INIT;
-static expert_field ei_ansi_a_no_tlv_elem_diss = EI_INIT;
-static expert_field ei_ansi_a_no_tv_elem_diss = EI_INIT;
-static expert_field ei_ansi_a_no_lv_elem_diss = EI_INIT;
-static expert_field ei_ansi_a_no_v_elem_diss = EI_INIT;
-static expert_field ei_ansi_a_miss_dtap_msg_diss = EI_INIT;
-static expert_field ei_ansi_a_miss_bsmap_msg_diss = EI_INIT;
-static expert_field ei_ansi_a_is2000_chan_id_pilot_pn = EI_INIT;
-static expert_field ei_ansi_a_unknown_dtap_msg = EI_INIT;
-static expert_field ei_ansi_a_unknown_bsmap_msg = EI_INIT;
-static expert_field ei_ansi_a_undecoded = EI_INIT;
+static gint ett_bsmap;
+static gint ett_dtap;
+static gint ett_elems;
+static gint ett_elem;
+static gint ett_dtap_oct_1;
+static gint ett_cm_srvc_type;
+static gint ett_ansi_ms_info_rec_reserved;
+static gint ett_ansi_enc_info;
+static gint ett_scm;
+static gint ett_cell_list;
+static gint ett_bearer_list;
+static gint ett_re_list;
+static gint ett_so_list;
+static gint ett_adds_user_part;
+static gint ett_scr;
+static gint ett_scr_socr;
+static gint ett_cm2_band_class;
+static gint ett_vp_algs;
+static gint ett_chan_list;
+static gint ett_cic;
+static gint ett_is2000_mob_cap_fch_info;
+static gint ett_is2000_mob_cap_dcch_info;
+static gint ett_is2000_mob_cap_for_pdch_info;
+static gint ett_is2000_mob_cap_rev_pdch_info;
+
+static expert_field ei_ansi_a_extraneous_data;
+static expert_field ei_ansi_a_short_data;
+static expert_field ei_ansi_a_missing_mand_elem;
+static expert_field ei_ansi_a_unknown_format;
+static expert_field ei_ansi_a_no_tlv_elem_diss;
+static expert_field ei_ansi_a_no_tv_elem_diss;
+static expert_field ei_ansi_a_no_lv_elem_diss;
+static expert_field ei_ansi_a_no_v_elem_diss;
+static expert_field ei_ansi_a_miss_dtap_msg_diss;
+static expert_field ei_ansi_a_miss_bsmap_msg_diss;
+static expert_field ei_ansi_a_is2000_chan_id_pilot_pn;
+static expert_field ei_ansi_a_unknown_dtap_msg;
+static expert_field ei_ansi_a_unknown_bsmap_msg;
+static expert_field ei_ansi_a_undecoded;
 
 static dissector_handle_t dtap_handle;
 static dissector_handle_t bsmap_handle;
diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c
index d462b05304..80fc6af5bd 100644
--- a/epan/dissectors/packet-aodv.c
+++ b/epan/dissectors/packet-aodv.c
@@ -89,44 +89,44 @@ typedef struct v6_ext {
 } aodv_ext_t;
 
 /* Initialize the protocol and registered fields */
-static int proto_aodv = -1;
-static int hf_aodv_type = -1;
-static int hf_aodv_flags = -1;
-static int hf_aodv_prefix_sz = -1;
-static int hf_aodv_hopcount = -1;
-static int hf_aodv_rreq_id = -1;
-static int hf_aodv_dest_ip = -1;
-static int hf_aodv_dest_ipv6 = -1;
-static int hf_aodv_dest_seqno = -1;
-static int hf_aodv_orig_ip = -1;
-static int hf_aodv_orig_ipv6 = -1;
-static int hf_aodv_orig_seqno = -1;
-static int hf_aodv_lifetime = -1;
-static int hf_aodv_destcount = -1;
-static int hf_aodv_unreach_dest_ip = -1;
-static int hf_aodv_unreach_dest_ipv6 = -1;
-/* static int hf_aodv_unreach_dest_seqno = -1; */
-static int hf_aodv_flags_rreq_join = -1;
-static int hf_aodv_flags_rreq_repair = -1;
-static int hf_aodv_flags_rreq_gratuitous = -1;
-static int hf_aodv_flags_rreq_destinationonly = -1;
-static int hf_aodv_flags_rreq_unknown = -1;
-static int hf_aodv_flags_rrep_repair = -1;
-static int hf_aodv_flags_rrep_ack = -1;
-static int hf_aodv_flags_rerr_nodelete = -1;
-static int hf_aodv_ext_type = -1;
-static int hf_aodv_ext_length = -1;
-static int hf_aodv_ext_interval = -1;
-static int hf_aodv_ext_timestamp = -1;
+static int proto_aodv;
+static int hf_aodv_type;
+static int hf_aodv_flags;
+static int hf_aodv_prefix_sz;
+static int hf_aodv_hopcount;
+static int hf_aodv_rreq_id;
+static int hf_aodv_dest_ip;
+static int hf_aodv_dest_ipv6;
+static int hf_aodv_dest_seqno;
+static int hf_aodv_orig_ip;
+static int hf_aodv_orig_ipv6;
+static int hf_aodv_orig_seqno;
+static int hf_aodv_lifetime;
+static int hf_aodv_destcount;
+static int hf_aodv_unreach_dest_ip;
+static int hf_aodv_unreach_dest_ipv6;
+/* static int hf_aodv_unreach_dest_seqno; */
+static int hf_aodv_flags_rreq_join;
+static int hf_aodv_flags_rreq_repair;
+static int hf_aodv_flags_rreq_gratuitous;
+static int hf_aodv_flags_rreq_destinationonly;
+static int hf_aodv_flags_rreq_unknown;
+static int hf_aodv_flags_rrep_repair;
+static int hf_aodv_flags_rrep_ack;
+static int hf_aodv_flags_rerr_nodelete;
+static int hf_aodv_ext_type;
+static int hf_aodv_ext_length;
+static int hf_aodv_ext_interval;
+static int hf_aodv_ext_timestamp;
 
 /* Initialize the subtree pointers */
-static gint ett_aodv = -1;
-static gint ett_aodv_flags = -1;
-static gint ett_aodv_unreach_dest = -1;
-static gint ett_aodv_extensions = -1;
+static gint ett_aodv;
+static gint ett_aodv_flags;
+static gint ett_aodv_unreach_dest;
+static gint ett_aodv_extensions;
 
-static expert_field ei_aodv_ext_length = EI_INIT;
-static expert_field ei_aodv_type = EI_INIT;
+static expert_field ei_aodv_ext_length;
+static expert_field ei_aodv_type;
 
 /* Code to actually dissect the packets */
 
diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c
index 8f8c3e3362..fc1497ad3a 100644
--- a/epan/dissectors/packet-aoe.c
+++ b/epan/dissectors/packet-aoe.c
@@ -22,29 +22,29 @@ void proto_reg_handoff_aoe(void);
 static dissector_handle_t aoe_handle;
 
 static int proto_aoe;
-static int hf_aoe_version=-1;
-static int hf_aoe_flags_response=-1;
-static int hf_aoe_flags_error=-1;
-static int hf_aoe_error=-1;
-static int hf_aoe_major=-1;
-static int hf_aoe_minor=-1;
-static int hf_aoe_cmd=-1;
-static int hf_aoe_tag=-1;
-static int hf_aoe_aflags_e=-1;
-static int hf_aoe_aflags_d=-1;
-static int hf_aoe_aflags_a=-1;
-static int hf_aoe_aflags_w=-1;
-static int hf_aoe_err_feature=-1;
-static int hf_aoe_sector_count=-1;
-static int hf_aoe_acmd=-1;
-static int hf_aoe_astatus=-1;
-static int hf_aoe_lba=-1;
-static int hf_aoe_response_in=-1;
-static int hf_aoe_response_to=-1;
-static int hf_aoe_time=-1;
-
-static gint ett_aoe = -1;
-static gint ett_aoe_flags = -1;
+static int hf_aoe_version;
+static int hf_aoe_flags_response;
+static int hf_aoe_flags_error;
+static int hf_aoe_error;
+static int hf_aoe_major;
+static int hf_aoe_minor;
+static int hf_aoe_cmd;
+static int hf_aoe_tag;
+static int hf_aoe_aflags_e;
+static int hf_aoe_aflags_d;
+static int hf_aoe_aflags_a;
+static int hf_aoe_aflags_w;
+static int hf_aoe_err_feature;
+static int hf_aoe_sector_count;
+static int hf_aoe_acmd;
+static int hf_aoe_astatus;
+static int hf_aoe_lba;
+static int hf_aoe_response_in;
+static int hf_aoe_response_to;
+static int hf_aoe_time;
+
+static gint ett_aoe;
+static gint ett_aoe_flags;
 
 #define AOE_FLAGS_RESPONSE 0x08
 #define AOE_FLAGS_ERROR    0x04
diff --git a/epan/dissectors/packet-aol.c b/epan/dissectors/packet-aol.c
index a8a0a59d56..94f0257076 100644
--- a/epan/dissectors/packet-aol.c
+++ b/epan/dissectors/packet-aol.c
@@ -67,56 +67,56 @@ static const value_string aol_wmem_mode[] = {
 };
 
 /* Protocol */
-static int proto_aol            = -1;
+static int proto_aol;
 
 /* Special fields */
-static int hf_aol_udata         = -1;
-static int hf_aol_init          = -1;
+static int hf_aol_udata;
+static int hf_aol_init;
 
 /* Header fields */
-static int hf_aol_start         = -1;
-static int hf_aol_crc           = -1;
-static int hf_aol_len           = -1;
-static int hf_aol_tx_seq        = -1;
-static int hf_aol_rx_seq        = -1;
-static int hf_aol_type          = -1;
-static int hf_aol_token         = -1;
-static int hf_aol_data          = -1;
-static int hf_aol_end           = -1;
+static int hf_aol_start;
+static int hf_aol_crc;
+static int hf_aol_len;
+static int hf_aol_tx_seq;
+static int hf_aol_rx_seq;
+static int hf_aol_type;
+static int hf_aol_token;
+static int hf_aol_data;
+static int hf_aol_end;
 
 /* 'INIT' PDU Fields */
-static int hf_aol_platform      = -1;
-static int hf_aol_version       = -1;
-static int hf_aol_subversion    = -1;
-static int hf_aol_unused        = -1;
-static int hf_aol_machine_mem   = -1;
-static int hf_aol_app_mem       = -1;
-static int hf_aol_pc_type       = -1;
-static int hf_aol_rel_month     = -1;
-static int hf_aol_rel_day       = -1;
-static int hf_aol_cust_class    = -1;
-static int hf_aol_udo_timestamp = -1;
-static int hf_aol_dos_ver       = -1;
-static int hf_aol_sess_flags    = -1;
-static int hf_aol_video_type    = -1;
-static int hf_aol_cpu_type      = -1;
-static int hf_aol_media_type    = -1;
-static int hf_aol_win_ver       = -1;
-static int hf_aol_wmem_mode     = -1;
-static int hf_aol_horiz_res     = -1;
-static int hf_aol_vert_res      = -1;
-static int hf_aol_num_colors    = -1;
-static int hf_aol_filler        = -1;
-static int hf_aol_region        = -1;
-static int hf_aol_lang          = -1;
-static int hf_aol_conn_spd      = -1;
+static int hf_aol_platform;
+static int hf_aol_version;
+static int hf_aol_subversion;
+static int hf_aol_unused;
+static int hf_aol_machine_mem;
+static int hf_aol_app_mem;
+static int hf_aol_pc_type;
+static int hf_aol_rel_month;
+static int hf_aol_rel_day;
+static int hf_aol_cust_class;
+static int hf_aol_udo_timestamp;
+static int hf_aol_dos_ver;
+static int hf_aol_sess_flags;
+static int hf_aol_video_type;
+static int hf_aol_cpu_type;
+static int hf_aol_media_type;
+static int hf_aol_win_ver;
+static int hf_aol_wmem_mode;
+static int hf_aol_horiz_res;
+static int hf_aol_vert_res;
+static int hf_aol_num_colors;
+static int hf_aol_filler;
+static int hf_aol_region;
+static int hf_aol_lang;
+static int hf_aol_conn_spd;
 
 /* Subtrees */
-static int ett_aol              = -1;
-static int ett_aol_data         = -1;
+static int ett_aol;
+static int ett_aol_data;
 
-static expert_field ei_aol_pdu_length_bad = EI_INIT;
-static expert_field ei_aol_end_missing = EI_INIT;
+static expert_field ei_aol_pdu_length_bad;
+static expert_field ei_aol_end_missing;
 
 /* Prefs */
 static gboolean aol_desegment  = TRUE;
diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c
index 9084a9407f..d2e504753d 100644
--- a/epan/dissectors/packet-ap1394.c
+++ b/epan/dissectors/packet-ap1394.c
@@ -23,12 +23,12 @@ void proto_reg_handoff_ap1394(void);
 static dissector_handle_t ap1394_handle;
 static capture_dissector_handle_t ap1394_cap_handle;
 
-static int proto_ap1394 = -1;
-static int hf_ap1394_dst = -1;
-static int hf_ap1394_src = -1;
-static int hf_ap1394_type = -1;
+static int proto_ap1394;
+static int hf_ap1394_dst;
+static int hf_ap1394_src;
+static int hf_ap1394_type;
 
-static gint ett_ap1394 = -1;
+static gint ett_ap1394;
 
 static dissector_table_t ethertype_subdissector_table;
 
diff --git a/epan/dissectors/packet-app-pkix-cert.c b/epan/dissectors/packet-app-pkix-cert.c
index 9c8a5f2cfd..d2b8fe5bca 100644
--- a/epan/dissectors/packet-app-pkix-cert.c
+++ b/epan/dissectors/packet-app-pkix-cert.c
@@ -27,12 +27,12 @@ void proto_reg_handoff_cert(void);
 static dissector_handle_t cert_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_cert = -1;
+static int proto_cert;
 
-static gint hf_cert = -1;
+static gint hf_cert;
 
 /* Initialize the subtree pointers */
-static gint ett_cert = -1;
+static gint ett_cert;
 
 
 static int
diff --git a/epan/dissectors/packet-applemidi.c b/epan/dissectors/packet-applemidi.c
index 59aa4c39d9..7cde41ab72 100644
--- a/epan/dissectors/packet-applemidi.c
+++ b/epan/dissectors/packet-applemidi.c
@@ -61,25 +61,25 @@ void proto_reg_handoff_applemidi(void);
 #define APPLEMIDI_COMMAND_RECEIVER_FEEDBACK		0x5253		/*   "RS"   */
 #define APPLEMIDI_COMMAND_BITRATE_RECEIVE_LIMIT		0x524c		/*   "RL"   */
 
-static int	hf_applemidi_signature			= -1;
-static int	hf_applemidi_command			= -1;
-static int	hf_applemidi_protocol_version		= -1;
-static int	hf_applemidi_token			= -1;
-static int	hf_applemidi_ssrc			= -1;
-static int	hf_applemidi_name			= -1;
-static int	hf_applemidi_count			= -1;
-static int	hf_applemidi_padding			= -1;
-static int	hf_applemidi_timestamp1			= -1;
-static int	hf_applemidi_timestamp2			= -1;
-static int	hf_applemidi_timestamp3			= -1;
-static int	hf_applemidi_sequence_num		= -1;
-static int	hf_applemidi_rtp_sequence_num		= -1;
-static int	hf_applemidi_rtp_bitrate_limit		= -1;
-static int	hf_applemidi_unknown_data		= -1;
-
-
-static gint	ett_applemidi				= -1;
-static gint	ett_applemidi_seq_num			= -1;
+static int	hf_applemidi_signature;
+static int	hf_applemidi_command;
+static int	hf_applemidi_protocol_version;
+static int	hf_applemidi_token;
+static int	hf_applemidi_ssrc;
+static int	hf_applemidi_name;
+static int	hf_applemidi_count;
+static int	hf_applemidi_padding;
+static int	hf_applemidi_timestamp1;
+static int	hf_applemidi_timestamp2;
+static int	hf_applemidi_timestamp3;
+static int	hf_applemidi_sequence_num;
+static int	hf_applemidi_rtp_sequence_num;
+static int	hf_applemidi_rtp_bitrate_limit;
+static int	hf_applemidi_unknown_data;
+
+
+static gint	ett_applemidi;
+static gint	ett_applemidi_seq_num;
 
 
 static const value_string applemidi_commands[] = {
@@ -94,7 +94,7 @@ static const value_string applemidi_commands[] = {
 };
 
 
-static int			proto_applemidi		= -1;
+static int			proto_applemidi;
 
 static dissector_handle_t	applemidi_handle;
 static dissector_handle_t	rtp_handle;
diff --git a/epan/dissectors/packet-aprs.c b/epan/dissectors/packet-aprs.c
index ceb023ac9c..49673ed3e7 100644
--- a/epan/dissectors/packet-aprs.c
+++ b/epan/dissectors/packet-aprs.c
@@ -37,130 +37,130 @@
 
 void proto_register_aprs(void);
 
-static int proto_aprs			= -1;
+static int proto_aprs;
 
 /* aprs timestamp items */
-static int hf_aprs_dhm			= -1;
-static int hf_aprs_hms			= -1;
-static int hf_aprs_mdhm			= -1;
-static int hf_aprs_tz			= -1;
+static int hf_aprs_dhm;
+static int hf_aprs_hms;
+static int hf_aprs_mdhm;
+static int hf_aprs_tz;
 
 /* aprs position items */
-/* static int hf_aprs_position		= -1; */
-static int hf_aprs_lat			= -1;
-static int hf_aprs_long			= -1;
+/* static int hf_aprs_position; */
+static int hf_aprs_lat;
+static int hf_aprs_long;
 
 /* aprs msg items */
-static int hf_aprs_msg			= -1;
-static int hf_aprs_msg_rng		= -1;
-static int hf_aprs_msg_cse		= -1;
-static int hf_aprs_msg_spd		= -1;
-static int hf_aprs_msg_dir		= -1;
-static int hf_aprs_msg_brg		= -1;
-static int hf_aprs_msg_nrq		= -1;
+static int hf_aprs_msg;
+static int hf_aprs_msg_rng;
+static int hf_aprs_msg_cse;
+static int hf_aprs_msg_spd;
+static int hf_aprs_msg_dir;
+static int hf_aprs_msg_brg;
+static int hf_aprs_msg_nrq;
 
 /* aprs compression type items */
-static int hf_aprs_compression_type	= -1;
-static int hf_aprs_ct_gps_fix		= -1;
-static int hf_aprs_ct_nmea_src		= -1;
-static int hf_aprs_ct_origin		= -1;
+static int hf_aprs_compression_type;
+static int hf_aprs_ct_gps_fix;
+static int hf_aprs_ct_nmea_src;
+static int hf_aprs_ct_origin;
 
 /* phg msg items */
-static int hf_aprs_msg_phg_p		= -1;
-static int hf_aprs_msg_phg_h		= -1;
-static int hf_aprs_msg_phg_g		= -1;
-static int hf_aprs_msg_phg_d		= -1;
+static int hf_aprs_msg_phg_p;
+static int hf_aprs_msg_phg_h;
+static int hf_aprs_msg_phg_g;
+static int hf_aprs_msg_phg_d;
 
 /* dfs msg items */
-static int hf_aprs_msg_dfs_s		= -1;
-static int hf_aprs_msg_dfs_h		= -1;
-static int hf_aprs_msg_dfs_g		= -1;
-static int hf_aprs_msg_dfs_d		= -1;
+static int hf_aprs_msg_dfs_s;
+static int hf_aprs_msg_dfs_h;
+static int hf_aprs_msg_dfs_g;
+static int hf_aprs_msg_dfs_d;
 
 /* weather items */
-static int hf_aprs_weather_dir		= -1;
-static int hf_aprs_weather_spd		= -1;
-static int hf_aprs_weather_peak		= -1;
-static int hf_aprs_weather_temp		= -1;
-static int hf_aprs_weather_rain_1	= -1;
-static int hf_aprs_weather_rain_24	= -1;
-static int hf_aprs_weather_rain		= -1;
-static int hf_aprs_weather_humidty	= -1;
-static int hf_aprs_weather_press	= -1;
-static int hf_aprs_weather_luminosity	= -1;
-static int hf_aprs_weather_snow		= -1;
-static int hf_aprs_weather_raw_rain	= -1;
-static int hf_aprs_weather_software	= -1;
-static int hf_aprs_weather_unit		= -1;
+static int hf_aprs_weather_dir;
+static int hf_aprs_weather_spd;
+static int hf_aprs_weather_peak;
+static int hf_aprs_weather_temp;
+static int hf_aprs_weather_rain_1;
+static int hf_aprs_weather_rain_24;
+static int hf_aprs_weather_rain;
+static int hf_aprs_weather_humidty;
+static int hf_aprs_weather_press;
+static int hf_aprs_weather_luminosity;
+static int hf_aprs_weather_snow;
+static int hf_aprs_weather_raw_rain;
+static int hf_aprs_weather_software;
+static int hf_aprs_weather_unit;
 
 /* aod msg items */
-static int hf_aprs_msg_aod_t		= -1;
-static int hf_aprs_msg_aod_c		= -1;
+static int hf_aprs_msg_aod_t;
+static int hf_aprs_msg_aod_c;
 
 /* mic-e msg items */
-static int hf_aprs_mic_e_dst		= -1;
-static int hf_aprs_mic_e_long_d		= -1;
-static int hf_aprs_mic_e_long_m		= -1;
-static int hf_aprs_mic_e_long_h		= -1;
-static int hf_aprs_mic_e_spd_sp		= -1;
-static int hf_aprs_mic_e_spd_dc		= -1;
-static int hf_aprs_mic_e_spd_se		= -1;
-static int hf_aprs_mic_e_telemetry	= -1;
-static int hf_aprs_mic_e_status		= -1;
+static int hf_aprs_mic_e_dst;
+static int hf_aprs_mic_e_long_d;
+static int hf_aprs_mic_e_long_m;
+static int hf_aprs_mic_e_long_h;
+static int hf_aprs_mic_e_spd_sp;
+static int hf_aprs_mic_e_spd_dc;
+static int hf_aprs_mic_e_spd_se;
+static int hf_aprs_mic_e_telemetry;
+static int hf_aprs_mic_e_status;
 
 /* Storm items */
-static int hf_aprs_storm_dir		= -1;
-static int hf_aprs_storm_spd		= -1;
-static int hf_aprs_storm_type		= -1;
-static int hf_aprs_storm_sws		= -1;
-static int hf_aprs_storm_pwg		= -1;
-static int hf_aprs_storm_cp		= -1;
-static int hf_aprs_storm_rhw		= -1;
-static int hf_aprs_storm_rtsw		= -1;
-static int hf_aprs_storm_rwg		= -1;
+static int hf_aprs_storm_dir;
+static int hf_aprs_storm_spd;
+static int hf_aprs_storm_type;
+static int hf_aprs_storm_sws;
+static int hf_aprs_storm_pwg;
+static int hf_aprs_storm_cp;
+static int hf_aprs_storm_rhw;
+static int hf_aprs_storm_rtsw;
+static int hf_aprs_storm_rwg;
 
 /* aprs sundry items */
-static int hf_aprs_dti			= -1;
-static int hf_aprs_sym_id		= -1;
-static int hf_aprs_sym_code		= -1;
-static int hf_aprs_comment		= -1;
-static int hf_aprs_storm		= -1;
+static int hf_aprs_dti;
+static int hf_aprs_sym_id;
+static int hf_aprs_sym_code;
+static int hf_aprs_comment;
+static int hf_aprs_storm;
 
 /* aprs main catgories items */
-static int hf_ultimeter_2000		= -1;
-static int hf_aprs_status		= -1;
-static int hf_aprs_object		= -1;
-static int hf_aprs_item			= -1;
-static int hf_aprs_query		= -1;
-static int hf_aprs_telemetry		= -1;
-static int hf_aprs_raw			= -1;
-static int hf_aprs_station		= -1;
-static int hf_aprs_message		= -1;
-static int hf_aprs_agrelo		= -1;
-static int hf_aprs_maidenhead		= -1;
-static int hf_aprs_weather		= -1;
-static int hf_aprs_invalid_test		= -1;
-static int hf_aprs_user_defined		= -1;
-static int hf_aprs_third_party		= -1;
-static int hf_aprs_mic_e_0_current	= -1;
-static int hf_aprs_mic_e_0_old		= -1;
-static int hf_aprs_mic_e_old		= -1;
-static int hf_aprs_mic_e_current	= -1;
-static int hf_aprs_peet_1		= -1;
-static int hf_aprs_peet_2		= -1;
-static int hf_aprs_map_feature		= -1;
-static int hf_aprs_shelter_data		= -1;
-static int hf_aprs_space_weather	= -1;
+static int hf_ultimeter_2000;
+static int hf_aprs_status;
+static int hf_aprs_object;
+static int hf_aprs_item;
+static int hf_aprs_query;
+static int hf_aprs_telemetry;
+static int hf_aprs_raw;
+static int hf_aprs_station;
+static int hf_aprs_message;
+static int hf_aprs_agrelo;
+static int hf_aprs_maidenhead;
+static int hf_aprs_weather;
+static int hf_aprs_invalid_test;
+static int hf_aprs_user_defined;
+static int hf_aprs_third_party;
+static int hf_aprs_mic_e_0_current;
+static int hf_aprs_mic_e_0_old;
+static int hf_aprs_mic_e_old;
+static int hf_aprs_mic_e_current;
+static int hf_aprs_peet_1;
+static int hf_aprs_peet_2;
+static int hf_aprs_map_feature;
+static int hf_aprs_shelter_data;
+static int hf_aprs_space_weather;
 
 
 static gboolean gPREF_APRS_LAX = FALSE;
 
-static gint ett_aprs		= -1;
-static gint ett_aprs_msg	= -1;
-static gint ett_aprs_ct		= -1;
-static gint ett_aprs_weather	= -1;
-static gint ett_aprs_storm	= -1;
-static gint ett_aprs_mic_e	= -1;
+static gint ett_aprs;
+static gint ett_aprs_msg;
+static gint ett_aprs_ct;
+static gint ett_aprs_weather;
+static gint ett_aprs_storm;
+static gint ett_aprs_mic_e;
 
 
 static const value_string ctype_vals[] = {
diff --git a/epan/dissectors/packet-ar_drone.c b/epan/dissectors/packet-ar_drone.c
index 15682fe73a..dce3ff58d5 100644
--- a/epan/dissectors/packet-ar_drone.c
+++ b/epan/dissectors/packet-ar_drone.c
@@ -25,55 +25,55 @@ void proto_reg_handoff_ar_drone(void);
 /* ************************************************ */
 
 /* ar_drone Protocol */
-static int proto_ar_drone = -1;
+static int proto_ar_drone;
 
 /* ar_drone Dissector handle */
 static dissector_handle_t ar_drone_handle;
 
 /* Headers */
-static int hf_command = -1;
-static int hf_PCMD_id = -1;
-static int hf_PCMD_flag = -1;
-static int hf_PCMD_roll = -1;
-static int hf_PCMD_pitch = -1;
-static int hf_PCMD_gaz = -1;
-static int hf_PCMD_yaw = -1;
-static int hf_REF_id = -1;
-static int hf_REF_ctrl = -1;
-static int hf_FTRIM_seq = -1;
-static int hf_CONFIG_seq = -1;
-static int hf_CONFIG_name = -1;
-static int hf_CONFIG_val = -1;
-static int hf_CONFIG_ID_seq = -1;
-static int hf_CONFIG_ID_session = -1;
-static int hf_CONFIG_ID_user = -1;
-static int hf_CONFIG_ID_app = -1;
-static int hf_COMWDG = -1;
-static int hf_LED_seq = -1;
-static int hf_LED_anim = -1;
-static int hf_LED_freq = -1;
-static int hf_LED_sec = -1;
-static int hf_ANIM_seq = -1;
-static int hf_ANIM_anim = -1;
-static int hf_ANIM_sec = -1;
-static int hf_CTRL_seq = -1;
-static int hf_CTRL_mode = -1;
-static int hf_CTRL_fsize = -1;
+static int hf_command;
+static int hf_PCMD_id;
+static int hf_PCMD_flag;
+static int hf_PCMD_roll;
+static int hf_PCMD_pitch;
+static int hf_PCMD_gaz;
+static int hf_PCMD_yaw;
+static int hf_REF_id;
+static int hf_REF_ctrl;
+static int hf_FTRIM_seq;
+static int hf_CONFIG_seq;
+static int hf_CONFIG_name;
+static int hf_CONFIG_val;
+static int hf_CONFIG_ID_seq;
+static int hf_CONFIG_ID_session;
+static int hf_CONFIG_ID_user;
+static int hf_CONFIG_ID_app;
+static int hf_COMWDG;
+static int hf_LED_seq;
+static int hf_LED_anim;
+static int hf_LED_freq;
+static int hf_LED_sec;
+static int hf_ANIM_seq;
+static int hf_ANIM_anim;
+static int hf_ANIM_sec;
+static int hf_CTRL_seq;
+static int hf_CTRL_mode;
+static int hf_CTRL_fsize;
 
 /**Subtrees */
-static gint ett_FTRIM = -1;
-static gint ett_ar_drone = -1;
-static gint ett_PCMD = -1;
-static gint ett_REF = -1;
-static gint ett_CONFIG = -1;
-static gint ett_CONFIG_ID = -1;
-static gint ett_COMWDG = -1;
-static gint ett_LED = -1;
-static gint ett_ANIM = -1;
-static gint ett_CTRL = -1;
-
-static expert_field ei_NO_COMMA = EI_INIT;
-static expert_field ei_NO_CR = EI_INIT;
+static gint ett_FTRIM;
+static gint ett_ar_drone;
+static gint ett_PCMD;
+static gint ett_REF;
+static gint ett_CONFIG;
+static gint ett_CONFIG_ID;
+static gint ett_COMWDG;
+static gint ett_LED;
+static gint ett_ANIM;
+static gint ett_CTRL;
+
+static expert_field ei_NO_COMMA;
+static expert_field ei_NO_CR;
 
 /* Value String */
 #if 0 /* TODO: Delete these?  Or make use of them? */
diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c
index c774f819be..51f493e3ba 100644
--- a/epan/dissectors/packet-arcnet.c
+++ b/epan/dissectors/packet-arcnet.c
@@ -28,18 +28,18 @@ static capture_dissector_handle_t arcnet_cap_handle;
 static capture_dissector_handle_t arcnet_cap_has_ex_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_arcnet = -1;
-static int hf_arcnet_src = -1;
-static int hf_arcnet_dst = -1;
-static int hf_arcnet_offset = -1;
-static int hf_arcnet_protID = -1;
-static int hf_arcnet_exception_flag = -1;
-static int hf_arcnet_split_flag = -1;
-static int hf_arcnet_sequence = -1;
-static int hf_arcnet_padding = -1;
+static int proto_arcnet;
+static int hf_arcnet_src;
+static int hf_arcnet_dst;
+static int hf_arcnet_offset;
+static int hf_arcnet_protID;
+static int hf_arcnet_exception_flag;
+static int hf_arcnet_split_flag;
+static int hf_arcnet_sequence;
+static int hf_arcnet_padding;
 
 /* Initialize the subtree pointers */
-static gint ett_arcnet = -1;
+static gint ett_arcnet;
 
 static int arcnet_address_type = -1;
 
@@ -49,7 +49,7 @@ static capture_dissector_handle_t ip_cap_handle;
 static capture_dissector_handle_t arp_cap_handle;
 
 /* Cache protocol for packet counting */
-static int proto_ipx = -1;
+static int proto_ipx;
 
 static int arcnet_str_len(const address* addr _U_)
 {
diff --git a/epan/dissectors/packet-arinc615a.c b/epan/dissectors/packet-arinc615a.c
index 1baa797e0c..f4da9d12f4 100644
--- a/epan/dissectors/packet-arinc615a.c
+++ b/epan/dissectors/packet-arinc615a.c
@@ -53,44 +53,44 @@ static const value_string a615a_operation_status_codes[] = {
     {0x1007, "Load of this header file has failed, details in status description"},
     {0, NULL}};
 
-static int proto_a615a = -1;
-
-static gint ett_a615a = -1;
-
-static int hf_a615a_file_length = -1;
-static int hf_a615a_protocol_version = -1;
-static int hf_a615a_counter = -1;
-static int hf_a615a_operation_status = -1;
-static int hf_a615a_exception_timer = -1;
-static int hf_a615a_estimated_time = -1;
-static int hf_a615a_status_description = -1;
-static int hf_a615a_load_ratio = -1;
-static int hf_a615a_file_count = -1;
-static int hf_a615a_file_name = -1;
-static int hf_a615a_file_description = -1;
-static int hf_a615a_part_number = -1;
-static int hf_a615a_number_target_hardware = -1;
-static int hf_a615a_literal_name = -1;
-static int hf_a615a_serial_number = -1;
-static int hf_a615a_part_number_count = -1;
-static int hf_a615a_amendment = -1;
-static int hf_a615a_designation = -1;
-static int hf_a615a_user_data = -1;
-static int hf_a615a_file_type = -1;
+static int proto_a615a;
+
+static gint ett_a615a;
+
+static int hf_a615a_file_length;
+static int hf_a615a_protocol_version;
+static int hf_a615a_counter;
+static int hf_a615a_operation_status;
+static int hf_a615a_exception_timer;
+static int hf_a615a_estimated_time;
+static int hf_a615a_status_description;
+static int hf_a615a_load_ratio;
+static int hf_a615a_file_count;
+static int hf_a615a_file_name;
+static int hf_a615a_file_description;
+static int hf_a615a_part_number;
+static int hf_a615a_number_target_hardware;
+static int hf_a615a_literal_name;
+static int hf_a615a_serial_number;
+static int hf_a615a_part_number_count;
+static int hf_a615a_amendment;
+static int hf_a615a_designation;
+static int hf_a615a_user_data;
+static int hf_a615a_file_type;
 
 #define FIND_PORT 1001
 
-static int proto_find = -1;
+static int proto_find;
 
-static gint ett_find = -1;
+static gint ett_find;
 
-static int hf_find_opcode = -1;
-static int hf_find_target_hardware_identifier = -1;
-static int hf_find_target_type_name = -1;
-static int hf_find_target_position = -1;
-static int hf_find_literal_name = -1;
-static int hf_find_manufacturer_code = -1;
-static int hf_find_packet_terminator = -1;
+static int hf_find_opcode;
+static int hf_find_target_hardware_identifier;
+static int hf_find_target_type_name;
+static int hf_find_target_position;
+static int hf_find_literal_name;
+static int hf_find_manufacturer_code;
+static int hf_find_packet_terminator;
 
 static dissector_handle_t find_handle;
 
diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c
index 3b98927ce3..0d33ef2d46 100644
--- a/epan/dissectors/packet-armagetronad.c
+++ b/epan/dissectors/packet-armagetronad.c
@@ -16,17 +16,17 @@ void proto_register_armagetronad(void);
 void proto_reg_handoff_armagetronad(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_armagetronad = -1;
-static int hf_armagetronad_descriptor_id = -1;
-static int hf_armagetronad_message_id = -1;
-static int hf_armagetronad_data_len = -1;
-static int hf_armagetronad_data = -1;
-static int hf_armagetronad_sender_id = -1;
-static int hf_armagetronad_msg_subtree = -1;
+static int proto_armagetronad;
+static int hf_armagetronad_descriptor_id;
+static int hf_armagetronad_message_id;
+static int hf_armagetronad_data_len;
+static int hf_armagetronad_data;
+static int hf_armagetronad_sender_id;
+static int hf_armagetronad_msg_subtree;
 
 /* Initialize the subtree pointers */
-static gint ett_armagetronad = -1;
-static gint ett_message = -1;
+static gint ett_armagetronad;
+static gint ett_message;
 
 static dissector_handle_t armagetronad_handle = NULL;
 
diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c
index 7045ca74f8..45a1536c8d 100644
--- a/epan/dissectors/packet-arp.c
+++ b/epan/dissectors/packet-arp.c
@@ -29,69 +29,69 @@
 void proto_register_arp(void);
 void proto_reg_handoff_arp(void);
 
-static int proto_arp = -1;
-static int hf_arp_hard_type = -1;
-static int hf_arp_proto_type = -1;
-static int hf_arp_hard_size = -1;
-static int hf_atmarp_sht = -1;
-static int hf_atmarp_shl = -1;
-static int hf_atmarp_sst = -1;
-static int hf_atmarp_ssl = -1;
-static int hf_arp_proto_size = -1;
-static int hf_arp_opcode = -1;
-static int hf_arp_isgratuitous = -1;
-static int hf_arp_isprobe = -1;
-static int hf_arp_isannouncement = -1;
-
-static int proto_atmarp = -1;
-static int hf_atmarp_spln = -1;
-static int hf_atmarp_tht = -1;
-static int hf_atmarp_thl = -1;
-static int hf_atmarp_tst = -1;
-static int hf_atmarp_tsl = -1;
-static int hf_atmarp_tpln = -1;
-static int hf_arp_src_hw = -1;
-static int hf_arp_src_hw_mac = -1;
-static int hf_arp_src_proto = -1;
-static int hf_arp_src_proto_ipv4 = -1;
-static int hf_arp_dst_hw = -1;
-static int hf_arp_dst_hw_mac = -1;
-static int hf_arp_dst_proto = -1;
-static int hf_arp_dst_proto_ipv4 = -1;
-static int hf_drarp_error_status = -1;
-static int hf_arp_duplicate_ip_address_earlier_frame = -1;
-static int hf_arp_duplicate_ip_address_seconds_since_earlier_frame = -1;
-
-static int hf_atmarp_src_atm_num_e164 = -1;
-static int hf_atmarp_src_atm_num_nsap = -1;
-static int hf_atmarp_src_atm_subaddr = -1;
-static int hf_atmarp_dst_atm_num_e164 = -1;
-static int hf_atmarp_dst_atm_num_nsap = -1;
-static int hf_atmarp_dst_atm_subaddr = -1;
+static int proto_arp;
+static int hf_arp_hard_type;
+static int hf_arp_proto_type;
+static int hf_arp_hard_size;
+static int hf_atmarp_sht;
+static int hf_atmarp_shl;
+static int hf_atmarp_sst;
+static int hf_atmarp_ssl;
+static int hf_arp_proto_size;
+static int hf_arp_opcode;
+static int hf_arp_isgratuitous;
+static int hf_arp_isprobe;
+static int hf_arp_isannouncement;
+
+static int proto_atmarp;
+static int hf_atmarp_spln;
+static int hf_atmarp_tht;
+static int hf_atmarp_thl;
+static int hf_atmarp_tst;
+static int hf_atmarp_tsl;
+static int hf_atmarp_tpln;
+static int hf_arp_src_hw;
+static int hf_arp_src_hw_mac;
+static int hf_arp_src_proto;
+static int hf_arp_src_proto_ipv4;
+static int hf_arp_dst_hw;
+static int hf_arp_dst_hw_mac;
+static int hf_arp_dst_proto;
+static int hf_arp_dst_proto_ipv4;
+static int hf_drarp_error_status;
+static int hf_arp_duplicate_ip_address_earlier_frame;
+static int hf_arp_duplicate_ip_address_seconds_since_earlier_frame;
+
+static int hf_atmarp_src_atm_num_e164;
+static int hf_atmarp_src_atm_num_nsap;
+static int hf_atmarp_src_atm_subaddr;
+static int hf_atmarp_dst_atm_num_e164;
+static int hf_atmarp_dst_atm_num_nsap;
+static int hf_atmarp_dst_atm_subaddr;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_atmarp_src_atm_data_country_code = -1;
-static int hf_atmarp_src_atm_data_country_code_group = -1;
-static int hf_atmarp_src_atm_e_164_isdn = -1;
-static int hf_atmarp_src_atm_e_164_isdn_group = -1;
-static int hf_atmarp_src_atm_rest_of_address = -1;
-static int hf_atmarp_src_atm_end_system_identifier = -1;
-static int hf_atmarp_src_atm_high_order_dsp = -1;
-static int hf_atmarp_src_atm_selector = -1;
-static int hf_atmarp_src_atm_international_code_designator = -1;
-static int hf_atmarp_src_atm_international_code_designator_group = -1;
-static int hf_atmarp_src_atm_afi = -1;
-
-static int hf_arp_dst_hw_ax25 = -1;
-static int hf_arp_src_hw_ax25 = -1;
-
-static gint ett_arp = -1;
-static gint ett_atmarp_nsap = -1;
-static gint ett_atmarp_tl = -1;
-static gint ett_arp_duplicate_address = -1;
-
-static expert_field ei_seq_arp_dup_ip = EI_INIT;
-static expert_field ei_seq_arp_storm = EI_INIT;
-static expert_field ei_atmarp_src_atm_unknown_afi = EI_INIT;
+static int hf_atmarp_src_atm_data_country_code;
+static int hf_atmarp_src_atm_data_country_code_group;
+static int hf_atmarp_src_atm_e_164_isdn;
+static int hf_atmarp_src_atm_e_164_isdn_group;
+static int hf_atmarp_src_atm_rest_of_address;
+static int hf_atmarp_src_atm_end_system_identifier;
+static int hf_atmarp_src_atm_high_order_dsp;
+static int hf_atmarp_src_atm_selector;
+static int hf_atmarp_src_atm_international_code_designator;
+static int hf_atmarp_src_atm_international_code_designator_group;
+static int hf_atmarp_src_atm_afi;
+
+static int hf_arp_dst_hw_ax25;
+static int hf_arp_src_hw_ax25;
+
+static gint ett_arp;
+static gint ett_atmarp_nsap;
+static gint ett_atmarp_tl;
+static gint ett_arp_duplicate_address;
+
+static expert_field ei_seq_arp_dup_ip;
+static expert_field ei_seq_arp_storm;
+static expert_field ei_atmarp_src_atm_unknown_afi;
 
 static dissector_handle_t arp_handle;
 
diff --git a/epan/dissectors/packet-artemis.c b/epan/dissectors/packet-artemis.c
index 146b736019..c8a256eb05 100644
--- a/epan/dissectors/packet-artemis.c
+++ b/epan/dissectors/packet-artemis.c
@@ -21,17 +21,17 @@
 
 #define ARTEMIS_PORT 5445 /* Not IANA registered */
 
-static int proto_artemis = -1;
+static int proto_artemis;
 
 /* handles */
-static int hf_artemis_len = -1;
-static int hf_artemis_type = -1;
-static int hf_artemis_channel = -1;
-static int hf_artemis_buffer = -1;
+static int hf_artemis_len;
+static int hf_artemis_type;
+static int hf_artemis_channel;
+static int hf_artemis_buffer;
 
-static gint ett_artemis = -1;
+static gint ett_artemis;
 
-static expert_field ei_artemis_len_short = EI_INIT;
+static expert_field ei_artemis_len_short;
 
 
 static dissector_handle_t artemis_tcp_handle = NULL;
diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c
index 9c5542a48b..aece8764e6 100644
--- a/epan/dissectors/packet-artnet.c
+++ b/epan/dissectors/packet-artnet.c
@@ -3881,35 +3881,35 @@ static const value_string vals_artnet_poll_reply_node_report_status_code[] = {
 };
 
 /* Define the artnet proto */
-static int proto_artnet = -1;
+static int proto_artnet;
 expert_module_t* expert_artnet;
 
 /* general */
-static int hf_artnet_filler = -1;
-static int hf_artnet_spare = -1;
-static int hf_artnet_data = -1;
-static int hf_artnet_excess_bytes = -1;
+static int hf_artnet_filler;
+static int hf_artnet_spare;
+static int hf_artnet_data;
+static int hf_artnet_excess_bytes;
 
 /* Header */
-static int hf_artnet_header = -1;
-static int hf_artnet_header_id = -1;
-static int hf_artnet_header_opcode = -1;
-static int hf_artnet_header_protver = -1;
+static int hf_artnet_header;
+static int hf_artnet_header_id;
+static int hf_artnet_header_opcode;
+static int hf_artnet_header_protver;
 
 /* ArtPoll */
-static int hf_artnet_poll = -1;
-static int hf_artnet_poll_talktome = -1;
-static int hf_artnet_poll_talktome_reply_change= -1;
-static int hf_artnet_poll_talktome_diag = -1;
-static int hf_artnet_poll_talktome_diag_unicast = -1;
-static int hf_artnet_poll_talktome_vlc = -1;
-static int hf_artnet_poll_talktome_targeted = -1;
+static int hf_artnet_poll;
+static int hf_artnet_poll_talktome;
+static int hf_artnet_poll_talktome_reply_change;
+static int hf_artnet_poll_talktome_diag;
+static int hf_artnet_poll_talktome_diag_unicast;
+static int hf_artnet_poll_talktome_vlc;
+static int hf_artnet_poll_talktome_targeted;
 
-static int hf_artnet_poll_diag_priority = -1;
-static int hf_artnet_poll_target_port_top = -1;
-static int hf_artnet_poll_target_port_bottom = -1;
+static int hf_artnet_poll_diag_priority;
+static int hf_artnet_poll_target_port_top;
+static int hf_artnet_poll_target_port_bottom;
 
-static gint ett_artnet_poll_talktome = -1;
+static gint ett_artnet_poll_talktome;
 
 static int * const artnet_poll_talktome_fields[] = {
   &hf_artnet_poll_talktome_reply_change,
@@ -3937,143 +3937,143 @@ static const value_string artnet_talktome_diag_priority_vals[] = {
 };
 
 /* ArtPollReply */
-static int hf_artnet_poll_reply = -1;
-static int hf_artnet_poll_reply_ip_address = -1;
-static int hf_artnet_poll_reply_port_nr = -1;
-static int hf_artnet_poll_reply_versinfo = -1;
-static int hf_artnet_poll_reply_netswitch = -1;
-static int hf_artnet_poll_reply_subswitch = -1;
-static int hf_artnet_poll_reply_oem = -1;
-static int hf_artnet_poll_reply_ubea_version = -1;
-static int hf_artnet_poll_reply_status = -1;
-static int hf_artnet_poll_reply_status_ubea_present = -1;
-static int hf_artnet_poll_reply_status_rdm_supported = -1;
-static int hf_artnet_poll_reply_status_rom_booted = -1;
-static int hf_artnet_poll_reply_status_port_prog = -1;
-static int hf_artnet_poll_reply_status_indicator = -1;
-
-static int hf_artnet_poll_reply_esta_man = -1;
-static int hf_artnet_poll_reply_short_name = -1;
-static int hf_artnet_poll_reply_long_name = -1;
-static int hf_artnet_poll_reply_node_report = -1;
-static int hf_artnet_poll_reply_port_info = -1;
-static int hf_artnet_poll_reply_num_ports = -1;
-static int hf_artnet_poll_reply_port_types = -1;
-static int hf_artnet_poll_reply_port_types_1 = -1;
-static int hf_artnet_poll_reply_port_types_2 = -1;
-static int hf_artnet_poll_reply_port_types_3 = -1;
-static int hf_artnet_poll_reply_port_types_4 = -1;
-static int hf_artnet_poll_reply_good_input = -1;
-static int hf_artnet_poll_reply_good_input_1 = -1;
-static int hf_artnet_poll_reply_good_input_2 = -1;
-static int hf_artnet_poll_reply_good_input_3 = -1;
-static int hf_artnet_poll_reply_good_input_4 = -1;
-static int hf_artnet_poll_reply_good_output = -1;
-static int hf_artnet_poll_reply_good_output_1 = -1;
-static int hf_artnet_poll_reply_good_output_2 = -1;
-static int hf_artnet_poll_reply_good_output_3 = -1;
-static int hf_artnet_poll_reply_good_output_4 = -1;
-static int hf_artnet_poll_reply_good_output_b = -1;
-static int hf_artnet_poll_reply_good_output_b_1 = -1;
-static int hf_artnet_poll_reply_good_output_b_2 = -1;
-static int hf_artnet_poll_reply_good_output_b_3 = -1;
-static int hf_artnet_poll_reply_good_output_b_4 = -1;
-static int hf_artnet_poll_reply_good_output_tx_proto = -1;
-static int hf_artnet_poll_reply_good_output_merge_ltp = -1;
-static int hf_artnet_poll_reply_good_output_short = -1;
-static int hf_artnet_poll_reply_good_output_merge_artnet = -1;
-static int hf_artnet_poll_reply_good_output_dmx_text = -1;
-static int hf_artnet_poll_reply_good_output_dmx_sip = -1;
-static int hf_artnet_poll_reply_good_output_dmx_test = -1;
-static int hf_artnet_poll_reply_good_output_data = -1;
-static int hf_artnet_poll_reply_good_output_style = -1;
-static int hf_artnet_poll_reply_good_output_rdm = -1;
-static int hf_artnet_poll_reply_swin = -1;
-static int hf_artnet_poll_reply_swin_1 = -1;
-static int hf_artnet_poll_reply_swin_2 = -1;
-static int hf_artnet_poll_reply_swin_3 = -1;
-static int hf_artnet_poll_reply_swin_4 = -1;
-static int hf_artnet_poll_reply_swin_1_universe = -1;
-static int hf_artnet_poll_reply_swin_2_universe = -1;
-static int hf_artnet_poll_reply_swin_3_universe = -1;
-static int hf_artnet_poll_reply_swin_4_universe = -1;
-static int hf_artnet_poll_reply_swout = -1;
-static int hf_artnet_poll_reply_swout_1 = -1;
-static int hf_artnet_poll_reply_swout_2 = -1;
-static int hf_artnet_poll_reply_swout_3 = -1;
-static int hf_artnet_poll_reply_swout_4 = -1;
-static int hf_artnet_poll_reply_swout_1_universe = -1;
-static int hf_artnet_poll_reply_swout_2_universe = -1;
-static int hf_artnet_poll_reply_swout_3_universe = -1;
-static int hf_artnet_poll_reply_swout_4_universe = -1;
-static int hf_artnet_poll_reply_sacnprio = -1;
-static int hf_artnet_poll_reply_swmacro = -1;
-static int hf_artnet_poll_reply_swremote = -1;
-static int hf_artnet_poll_reply_style = -1;
-static int hf_artnet_poll_reply_mac = -1;
-static int hf_artnet_poll_reply_bind_ip_address = -1;
-static int hf_artnet_poll_reply_bind_index = -1;
-static int hf_artnet_poll_reply_status2 = -1;
-static int hf_artnet_poll_reply_status2_web_supported = -1;
-static int hf_artnet_poll_reply_status2_dhcp_used = -1;
-static int hf_artnet_poll_reply_status2_dhcp_supported = -1;
-static int hf_artnet_poll_reply_status2_bigaddr_supported = -1;
-static int hf_artnet_poll_reply_status2_sacn_supported = -1;
-static int hf_artnet_poll_reply_status2_squawking = -1;
-static int hf_artnet_poll_reply_status2_output_switching_supported = -1;
-static int hf_artnet_poll_reply_status2_control_rdm_supported = -1;
-static int hf_artnet_poll_reply_status3 = -1;
-static int hf_artnet_poll_reply_status3_switching_port_supported = -1;
-static int hf_artnet_poll_reply_status3_llrp_supported = -1;
-static int hf_artnet_poll_reply_status3_failover_supported = -1;
-static int hf_artnet_poll_reply_status3_failsafe_state = -1;
-static int hf_artnet_poll_reply_default_responder_uid = -1;
-static int hf_artnet_poll_reply_node_report_status_code = -1;
-static int hf_artnet_poll_reply_node_report_response_counter = -1;
-static int hf_artnet_poll_reply_node_report_status_string = -1;
-
-static gint ett_artnet_poll_reply_status = -1;
-static gint ett_artnet_poll_reply_good_input_1 = -1;
-static gint ett_artnet_poll_reply_good_input_2 = -1;
-static gint ett_artnet_poll_reply_good_input_3 = -1;
-static gint ett_artnet_poll_reply_good_input_4 = -1;
-static gint ett_artnet_poll_reply_good_output_1 = -1;
-static gint ett_artnet_poll_reply_good_output_2 = -1;
-static gint ett_artnet_poll_reply_good_output_3 = -1;
-static gint ett_artnet_poll_reply_good_output_4 = -1;
-static gint ett_artnet_poll_reply_good_output_b_1 = -1;
-static gint ett_artnet_poll_reply_good_output_b_2 = -1;
-static gint ett_artnet_poll_reply_good_output_b_3 = -1;
-static gint ett_artnet_poll_reply_good_output_b_4 = -1;
-static gint ett_artnet_poll_reply_swmacro = -1;
-static gint ett_artnet_poll_reply_swremote = -1;
-static gint ett_artnet_poll_reply_status2 = -1;
-static gint ett_artnet_poll_reply_status3 = -1;
-
-static int hf_artnet_poll_reply_good_input_recv_error = -1;
-static int hf_artnet_poll_reply_good_input_disabled = -1;
-static int hf_artnet_poll_reply_good_input_dmx_text = -1;
-static int hf_artnet_poll_reply_good_input_dmx_sip = -1;
-static int hf_artnet_poll_reply_good_input_dmx_test = -1;
-static int hf_artnet_poll_reply_good_input_data = -1;
-
-static int hf_artnet_poll_reply_swmacro_1 = -1;
-static int hf_artnet_poll_reply_swmacro_2 = -1;
-static int hf_artnet_poll_reply_swmacro_3 = -1;
-static int hf_artnet_poll_reply_swmacro_4 = -1;
-static int hf_artnet_poll_reply_swmacro_5 = -1;
-static int hf_artnet_poll_reply_swmacro_6 = -1;
-static int hf_artnet_poll_reply_swmacro_7 = -1;
-static int hf_artnet_poll_reply_swmacro_8 = -1;
-
-static int hf_artnet_poll_reply_swremote_1 = -1;
-static int hf_artnet_poll_reply_swremote_2 = -1;
-static int hf_artnet_poll_reply_swremote_3 = -1;
-static int hf_artnet_poll_reply_swremote_4 = -1;
-static int hf_artnet_poll_reply_swremote_5 = -1;
-static int hf_artnet_poll_reply_swremote_6 = -1;
-static int hf_artnet_poll_reply_swremote_7 = -1;
-static int hf_artnet_poll_reply_swremote_8 = -1;
+static int hf_artnet_poll_reply;
+static int hf_artnet_poll_reply_ip_address;
+static int hf_artnet_poll_reply_port_nr;
+static int hf_artnet_poll_reply_versinfo;
+static int hf_artnet_poll_reply_netswitch;
+static int hf_artnet_poll_reply_subswitch;
+static int hf_artnet_poll_reply_oem;
+static int hf_artnet_poll_reply_ubea_version;
+static int hf_artnet_poll_reply_status;
+static int hf_artnet_poll_reply_status_ubea_present;
+static int hf_artnet_poll_reply_status_rdm_supported;
+static int hf_artnet_poll_reply_status_rom_booted;
+static int hf_artnet_poll_reply_status_port_prog;
+static int hf_artnet_poll_reply_status_indicator;
+
+static int hf_artnet_poll_reply_esta_man;
+static int hf_artnet_poll_reply_short_name;
+static int hf_artnet_poll_reply_long_name;
+static int hf_artnet_poll_reply_node_report;
+static int hf_artnet_poll_reply_port_info;
+static int hf_artnet_poll_reply_num_ports;
+static int hf_artnet_poll_reply_port_types;
+static int hf_artnet_poll_reply_port_types_1;
+static int hf_artnet_poll_reply_port_types_2;
+static int hf_artnet_poll_reply_port_types_3;
+static int hf_artnet_poll_reply_port_types_4;
+static int hf_artnet_poll_reply_good_input;
+static int hf_artnet_poll_reply_good_input_1;
+static int hf_artnet_poll_reply_good_input_2;
+static int hf_artnet_poll_reply_good_input_3;
+static int hf_artnet_poll_reply_good_input_4;
+static int hf_artnet_poll_reply_good_output;
+static int hf_artnet_poll_reply_good_output_1;
+static int hf_artnet_poll_reply_good_output_2;
+static int hf_artnet_poll_reply_good_output_3;
+static int hf_artnet_poll_reply_good_output_4;
+static int hf_artnet_poll_reply_good_output_b;
+static int hf_artnet_poll_reply_good_output_b_1;
+static int hf_artnet_poll_reply_good_output_b_2;
+static int hf_artnet_poll_reply_good_output_b_3;
+static int hf_artnet_poll_reply_good_output_b_4;
+static int hf_artnet_poll_reply_good_output_tx_proto;
+static int hf_artnet_poll_reply_good_output_merge_ltp;
+static int hf_artnet_poll_reply_good_output_short;
+static int hf_artnet_poll_reply_good_output_merge_artnet;
+static int hf_artnet_poll_reply_good_output_dmx_text;
+static int hf_artnet_poll_reply_good_output_dmx_sip;
+static int hf_artnet_poll_reply_good_output_dmx_test;
+static int hf_artnet_poll_reply_good_output_data;
+static int hf_artnet_poll_reply_good_output_style;
+static int hf_artnet_poll_reply_good_output_rdm;
+static int hf_artnet_poll_reply_swin;
+static int hf_artnet_poll_reply_swin_1;
+static int hf_artnet_poll_reply_swin_2;
+static int hf_artnet_poll_reply_swin_3;
+static int hf_artnet_poll_reply_swin_4;
+static int hf_artnet_poll_reply_swin_1_universe;
+static int hf_artnet_poll_reply_swin_2_universe;
+static int hf_artnet_poll_reply_swin_3_universe;
+static int hf_artnet_poll_reply_swin_4_universe;
+static int hf_artnet_poll_reply_swout;
+static int hf_artnet_poll_reply_swout_1;
+static int hf_artnet_poll_reply_swout_2;
+static int hf_artnet_poll_reply_swout_3;
+static int hf_artnet_poll_reply_swout_4;
+static int hf_artnet_poll_reply_swout_1_universe;
+static int hf_artnet_poll_reply_swout_2_universe;
+static int hf_artnet_poll_reply_swout_3_universe;
+static int hf_artnet_poll_reply_swout_4_universe;
+static int hf_artnet_poll_reply_sacnprio;
+static int hf_artnet_poll_reply_swmacro;
+static int hf_artnet_poll_reply_swremote;
+static int hf_artnet_poll_reply_style;
+static int hf_artnet_poll_reply_mac;
+static int hf_artnet_poll_reply_bind_ip_address;
+static int hf_artnet_poll_reply_bind_index;
+static int hf_artnet_poll_reply_status2;
+static int hf_artnet_poll_reply_status2_web_supported;
+static int hf_artnet_poll_reply_status2_dhcp_used;
+static int hf_artnet_poll_reply_status2_dhcp_supported;
+static int hf_artnet_poll_reply_status2_bigaddr_supported;
+static int hf_artnet_poll_reply_status2_sacn_supported;
+static int hf_artnet_poll_reply_status2_squawking;
+static int hf_artnet_poll_reply_status2_output_switching_supported;
+static int hf_artnet_poll_reply_status2_control_rdm_supported;
+static int hf_artnet_poll_reply_status3;
+static int hf_artnet_poll_reply_status3_switching_port_supported;
+static int hf_artnet_poll_reply_status3_llrp_supported;
+static int hf_artnet_poll_reply_status3_failover_supported;
+static int hf_artnet_poll_reply_status3_failsafe_state;
+static int hf_artnet_poll_reply_default_responder_uid;
+static int hf_artnet_poll_reply_node_report_status_code;
+static int hf_artnet_poll_reply_node_report_response_counter;
+static int hf_artnet_poll_reply_node_report_status_string;
+
+static gint ett_artnet_poll_reply_status;
+static gint ett_artnet_poll_reply_good_input_1;
+static gint ett_artnet_poll_reply_good_input_2;
+static gint ett_artnet_poll_reply_good_input_3;
+static gint ett_artnet_poll_reply_good_input_4;
+static gint ett_artnet_poll_reply_good_output_1;
+static gint ett_artnet_poll_reply_good_output_2;
+static gint ett_artnet_poll_reply_good_output_3;
+static gint ett_artnet_poll_reply_good_output_4;
+static gint ett_artnet_poll_reply_good_output_b_1;
+static gint ett_artnet_poll_reply_good_output_b_2;
+static gint ett_artnet_poll_reply_good_output_b_3;
+static gint ett_artnet_poll_reply_good_output_b_4;
+static gint ett_artnet_poll_reply_swmacro;
+static gint ett_artnet_poll_reply_swremote;
+static gint ett_artnet_poll_reply_status2;
+static gint ett_artnet_poll_reply_status3;
+
+static int hf_artnet_poll_reply_good_input_recv_error;
+static int hf_artnet_poll_reply_good_input_disabled;
+static int hf_artnet_poll_reply_good_input_dmx_text;
+static int hf_artnet_poll_reply_good_input_dmx_sip;
+static int hf_artnet_poll_reply_good_input_dmx_test;
+static int hf_artnet_poll_reply_good_input_data;
+
+static int hf_artnet_poll_reply_swmacro_1;
+static int hf_artnet_poll_reply_swmacro_2;
+static int hf_artnet_poll_reply_swmacro_3;
+static int hf_artnet_poll_reply_swmacro_4;
+static int hf_artnet_poll_reply_swmacro_5;
+static int hf_artnet_poll_reply_swmacro_6;
+static int hf_artnet_poll_reply_swmacro_7;
+static int hf_artnet_poll_reply_swmacro_8;
+
+static int hf_artnet_poll_reply_swremote_1;
+static int hf_artnet_poll_reply_swremote_2;
+static int hf_artnet_poll_reply_swremote_3;
+static int hf_artnet_poll_reply_swremote_4;
+static int hf_artnet_poll_reply_swremote_5;
+static int hf_artnet_poll_reply_swremote_6;
+static int hf_artnet_poll_reply_swremote_7;
+static int hf_artnet_poll_reply_swremote_8;
 
 static int * const artnet_poll_reply_status_fields[] = {
   &hf_artnet_poll_reply_status_ubea_present,
@@ -4156,47 +4156,47 @@ static int * const artnet_poll_reply_swremote_fields[] = {
   NULL
 };
 
-static expert_field ei_artnet_poll_reply_bind_ip_without_index = EI_INIT;
-static expert_field ei_artnet_poll_reply_bind_index_without_ip = EI_INIT;
-static expert_field ei_artnet_poll_reply_node_report_invalid_format = EI_INIT;
+static expert_field ei_artnet_poll_reply_bind_ip_without_index;
+static expert_field ei_artnet_poll_reply_bind_index_without_ip;
+static expert_field ei_artnet_poll_reply_node_report_invalid_format;
 
 /* ArtOutput */
-static int hf_artnet_output = -1;
-static int hf_artnet_output_sequence = -1;
-static int hf_artnet_output_physical = -1;
-static int hf_artnet_output_universe = -1;
-static int hf_artnet_output_length = -1;
+static int hf_artnet_output;
+static int hf_artnet_output_sequence;
+static int hf_artnet_output_physical;
+static int hf_artnet_output_universe;
+static int hf_artnet_output_length;
 
 /* ArtSync */
-static int hf_artnet_sync = -1;
-static int hf_artnet_sync_aux = -1;
+static int hf_artnet_sync;
+static int hf_artnet_sync_aux;
 
 /* ArtAddress */
-static int hf_artnet_address = -1;
-static int hf_artnet_address_netswitch_special = -1;
-static int hf_artnet_address_netswitch_net = -1;
-static int hf_artnet_address_netswitch_write = -1;
-static int hf_artnet_address_bind_index = -1;
-static int hf_artnet_address_short_name = -1;
-static int hf_artnet_address_long_name = -1;
-static int hf_artnet_address_swin = -1;
-static int hf_artnet_address_swin_1 = -1;
-static int hf_artnet_address_swin_2 = -1;
-static int hf_artnet_address_swin_3 = -1;
-static int hf_artnet_address_swin_4 = -1;
-static int hf_artnet_address_swout = -1;
-static int hf_artnet_address_swout_1 = -1;
-static int hf_artnet_address_swout_2 = -1;
-static int hf_artnet_address_swout_3 = -1;
-static int hf_artnet_address_swout_4 = -1;
-static int hf_artnet_address_subswitch_special = -1;
-static int hf_artnet_address_subswitch_sub = -1;
-static int hf_artnet_address_subswitch_write = -1;
-static int hf_artnet_address_sacnprio = -1;
-static int hf_artnet_address_command = -1;
-
-static gint ett_artnet_address_netswitch = -1;
-static gint ett_artnet_address_subswitch = -1;
+static int hf_artnet_address;
+static int hf_artnet_address_netswitch_special;
+static int hf_artnet_address_netswitch_net;
+static int hf_artnet_address_netswitch_write;
+static int hf_artnet_address_bind_index;
+static int hf_artnet_address_short_name;
+static int hf_artnet_address_long_name;
+static int hf_artnet_address_swin;
+static int hf_artnet_address_swin_1;
+static int hf_artnet_address_swin_2;
+static int hf_artnet_address_swin_3;
+static int hf_artnet_address_swin_4;
+static int hf_artnet_address_swout;
+static int hf_artnet_address_swout_1;
+static int hf_artnet_address_swout_2;
+static int hf_artnet_address_swout_3;
+static int hf_artnet_address_swout_4;
+static int hf_artnet_address_subswitch_special;
+static int hf_artnet_address_subswitch_sub;
+static int hf_artnet_address_subswitch_write;
+static int hf_artnet_address_sacnprio;
+static int hf_artnet_address_command;
+
+static gint ett_artnet_address_netswitch;
+static gint ett_artnet_address_subswitch;
 
 static int * const artnet_address_netswitch_fields[] = {
   &hf_artnet_address_netswitch_net,
@@ -4217,20 +4217,20 @@ static const value_string artnet_address_switch_vals[] = {
 };
 
 /* ArtInput */
-static int hf_artnet_input = -1;
-static int hf_artnet_input_bind_index = -1;
-static int hf_artnet_input_num_ports = -1;
-static int hf_artnet_input_input = -1;
-static int hf_artnet_input_input_1 = -1;
-static int hf_artnet_input_input_2 = -1;
-static int hf_artnet_input_input_3 = -1;
-static int hf_artnet_input_input_4 = -1;
-static int hf_artnet_input_input_disabled = -1;
-
-static gint ett_artnet_input_input_1 = -1;
-static gint ett_artnet_input_input_2 = -1;
-static gint ett_artnet_input_input_3 = -1;
-static gint ett_artnet_input_input_4 = -1;
+static int hf_artnet_input;
+static int hf_artnet_input_bind_index;
+static int hf_artnet_input_num_ports;
+static int hf_artnet_input_input;
+static int hf_artnet_input_input_1;
+static int hf_artnet_input_input_2;
+static int hf_artnet_input_input_3;
+static int hf_artnet_input_input_4;
+static int hf_artnet_input_input_disabled;
+
+static gint ett_artnet_input_input_1;
+static gint ett_artnet_input_input_2;
+static gint ett_artnet_input_input_3;
+static gint ett_artnet_input_input_4;
 
 static int * const artnet_input_input_fields[] = {
   &hf_artnet_input_input_disabled,
@@ -4238,101 +4238,101 @@ static int * const artnet_input_input_fields[] = {
 };
 
 /* ArtFirmwareMaster */
-static int hf_artnet_firmware_master = -1;
-static int hf_artnet_firmware_master_type = -1;
-static int hf_artnet_firmware_master_block_id = -1;
-static int hf_artnet_firmware_master_length = -1;
-static int hf_artnet_firmware_master_data = -1;
+static int hf_artnet_firmware_master;
+static int hf_artnet_firmware_master_type;
+static int hf_artnet_firmware_master_block_id;
+static int hf_artnet_firmware_master_length;
+static int hf_artnet_firmware_master_data;
 
 /* ArtFirmwareReply */
-static int hf_artnet_firmware_reply = -1;
-static int hf_artnet_firmware_reply_type = -1;
+static int hf_artnet_firmware_reply;
+static int hf_artnet_firmware_reply_type;
 
 /* ArtVideoSetup */
-static int hf_artnet_video_setup_control = -1;
-static int hf_artnet_video_setup_font_height = -1;
-static int hf_artnet_video_setup_first_font = -1;
-static int hf_artnet_video_setup_last_font = -1;
-static int hf_artnet_video_setup_win_font_name = -1;
-static int hf_artnet_video_setup_font_data = -1;
+static int hf_artnet_video_setup_control;
+static int hf_artnet_video_setup_font_height;
+static int hf_artnet_video_setup_first_font;
+static int hf_artnet_video_setup_last_font;
+static int hf_artnet_video_setup_win_font_name;
+static int hf_artnet_video_setup_font_data;
 
 /* ArtVideoPalette */
-static int hf_artnet_video_palette_colour_red = -1;
-static int hf_artnet_video_palette_colour_green = -1;
-static int hf_artnet_video_palette_colour_blue = -1;
+static int hf_artnet_video_palette_colour_red;
+static int hf_artnet_video_palette_colour_green;
+static int hf_artnet_video_palette_colour_blue;
 
 /* ArtVideoData */
-static int hf_artnet_video_data_pos_x = -1;
-static int hf_artnet_video_data_pos_y = -1;
-static int hf_artnet_video_data_len_x = -1;
-static int hf_artnet_video_data_len_y = -1;
-static int hf_artnet_video_data_data = -1;
+static int hf_artnet_video_data_pos_x;
+static int hf_artnet_video_data_pos_y;
+static int hf_artnet_video_data_len_x;
+static int hf_artnet_video_data_len_y;
+static int hf_artnet_video_data_data;
 
 /* ArtPollFpReply */
-static int hf_artnet_poll_fp_reply = -1;
+static int hf_artnet_poll_fp_reply;
 
 /* ArtTodRequest */
-static int hf_artnet_tod_request = -1;
-static int hf_artnet_tod_request_net = -1;
-static int hf_artnet_tod_request_command = -1;
-static int hf_artnet_tod_request_ad_count = -1;
-static int hf_artnet_tod_request_address = -1;
+static int hf_artnet_tod_request;
+static int hf_artnet_tod_request_net;
+static int hf_artnet_tod_request_command;
+static int hf_artnet_tod_request_ad_count;
+static int hf_artnet_tod_request_address;
 
 /* ArtTodData */
-static int hf_artnet_tod_data = -1;
-static int hf_artnet_tod_data_rdm_ver = -1;
-static int hf_artnet_tod_data_bind_index = -1;
-static int hf_artnet_tod_data_port = -1;
-static int hf_artnet_tod_data_net = -1;
-static int hf_artnet_tod_data_command_response = -1;
-static int hf_artnet_tod_data_address = -1;
-static int hf_artnet_tod_data_uid_total = -1;
-static int hf_artnet_tod_data_block_count = -1;
-static int hf_artnet_tod_data_uid_count = -1;
-static int hf_artnet_tod_data_tod = -1;
+static int hf_artnet_tod_data;
+static int hf_artnet_tod_data_rdm_ver;
+static int hf_artnet_tod_data_bind_index;
+static int hf_artnet_tod_data_port;
+static int hf_artnet_tod_data_net;
+static int hf_artnet_tod_data_command_response;
+static int hf_artnet_tod_data_address;
+static int hf_artnet_tod_data_uid_total;
+static int hf_artnet_tod_data_block_count;
+static int hf_artnet_tod_data_uid_count;
+static int hf_artnet_tod_data_tod;
 
 /* ArtTodControl */
-static int hf_artnet_tod_control = -1;
-static int hf_artnet_tod_control_net = -1;
-static int hf_artnet_tod_control_command = -1;
-static int hf_artnet_tod_control_address = -1;
-static int hf_artnet_tod_control_universe = -1;
+static int hf_artnet_tod_control;
+static int hf_artnet_tod_control_net;
+static int hf_artnet_tod_control_command;
+static int hf_artnet_tod_control_address;
+static int hf_artnet_tod_control_universe;
 
 /* ArtRdm */
-static int hf_artnet_rdm = -1;
-static int hf_artnet_rdm_command = -1;
-static int hf_artnet_rdm_address = -1;
-static int hf_artnet_rdm_sc = -1;
+static int hf_artnet_rdm;
+static int hf_artnet_rdm_command;
+static int hf_artnet_rdm_address;
+static int hf_artnet_rdm_sc;
 
-static int hf_artnet_rdm_rdmver = -1;
-static int hf_artnet_rdm_net = -1;
+static int hf_artnet_rdm_rdmver;
+static int hf_artnet_rdm_net;
 
 /* ArtRdmSub */
-static int hf_artnet_rdm_sub = -1;
-static int hf_artnet_rdm_sub_uid = -1;
-static int hf_artnet_rdm_sub_command_class = -1;
-static int hf_artnet_rdm_sub_pid = -1;
-static int hf_artnet_rdm_sub_sub_device = -1;
-static int hf_artnet_rdm_sub_sub_count = -1;
-static int hf_artnet_rdm_sub_data = -1;
+static int hf_artnet_rdm_sub;
+static int hf_artnet_rdm_sub_uid;
+static int hf_artnet_rdm_sub_command_class;
+static int hf_artnet_rdm_sub_pid;
+static int hf_artnet_rdm_sub_sub_device;
+static int hf_artnet_rdm_sub_sub_count;
+static int hf_artnet_rdm_sub_data;
 
 /* ArtIpProg */
-static int hf_artnet_ip_prog = -1;
-static int hf_artnet_ip_prog_command = -1;
-static int hf_artnet_ip_prog_command_prog_port = -1;
-static int hf_artnet_ip_prog_command_prog_sm = -1;
-static int hf_artnet_ip_prog_command_prog_ip = -1;
-static int hf_artnet_ip_prog_command_reset = -1;
-static int hf_artnet_ip_prog_command_gw = -1;
-static int hf_artnet_ip_prog_command_unused = -1;
-static int hf_artnet_ip_prog_command_dhcp_enable = -1;
-static int hf_artnet_ip_prog_command_prog_enable = -1;
-static int hf_artnet_ip_prog_ip = -1;
-static int hf_artnet_ip_prog_sm = -1;
-static int hf_artnet_ip_prog_port = -1;
-static int hf_artnet_ip_prog_gw = -1;
-
-static gint ett_artnet_ip_prog_command = -1;
+static int hf_artnet_ip_prog;
+static int hf_artnet_ip_prog_command;
+static int hf_artnet_ip_prog_command_prog_port;
+static int hf_artnet_ip_prog_command_prog_sm;
+static int hf_artnet_ip_prog_command_prog_ip;
+static int hf_artnet_ip_prog_command_reset;
+static int hf_artnet_ip_prog_command_gw;
+static int hf_artnet_ip_prog_command_unused;
+static int hf_artnet_ip_prog_command_dhcp_enable;
+static int hf_artnet_ip_prog_command_prog_enable;
+static int hf_artnet_ip_prog_ip;
+static int hf_artnet_ip_prog_sm;
+static int hf_artnet_ip_prog_port;
+static int hf_artnet_ip_prog_gw;
+
+static gint ett_artnet_ip_prog_command;
 
 static int * const artnet_ip_prog_command_fields[] = {
   &hf_artnet_ip_prog_command_prog_port,
@@ -4347,16 +4347,16 @@ static int * const artnet_ip_prog_command_fields[] = {
 };
 
 /* ArtIpProgReply */
-static int hf_artnet_ip_prog_reply = -1;
-static int hf_artnet_ip_prog_reply_ip = -1;
-static int hf_artnet_ip_prog_reply_sm = -1;
-static int hf_artnet_ip_prog_reply_port = -1;
-static int hf_artnet_ip_prog_reply_status = -1;
-static int hf_artnet_ip_prog_reply_status_unused = -1;
-static int hf_artnet_ip_prog_reply_status_dhcp_enable = -1;
-static int hf_artnet_ip_prog_reply_gw = -1;
+static int hf_artnet_ip_prog_reply;
+static int hf_artnet_ip_prog_reply_ip;
+static int hf_artnet_ip_prog_reply_sm;
+static int hf_artnet_ip_prog_reply_port;
+static int hf_artnet_ip_prog_reply_status;
+static int hf_artnet_ip_prog_reply_status_unused;
+static int hf_artnet_ip_prog_reply_status_dhcp_enable;
+static int hf_artnet_ip_prog_reply_gw;
 
-static gint ett_artnet_ip_prog_reply_status = -1;
+static gint ett_artnet_ip_prog_reply_status;
 
 static int * const artnet_ip_prog_reply_status_fields[] = {
   &hf_artnet_ip_prog_reply_status_unused,
@@ -4365,37 +4365,37 @@ static int * const artnet_ip_prog_reply_status_fields[] = {
 };
 
 /* ArtDiagData */
-static int hf_artnet_diag_data = -1;
-static int hf_artnet_diag_data_priority = -1;
-static int hf_artnet_diag_data_port = -1;
-static int hf_artnet_diag_data_length = -1;
-static int hf_artnet_diag_data_data = -1;
+static int hf_artnet_diag_data;
+static int hf_artnet_diag_data_priority;
+static int hf_artnet_diag_data_port;
+static int hf_artnet_diag_data_length;
+static int hf_artnet_diag_data_data;
 
 /* ArtCommand */
-static int hf_artnet_command = -1;
-static int hf_artnet_command_esta_man = -1;
-static int hf_artnet_command_length = -1;
-static int hf_artnet_command_data = -1;
+static int hf_artnet_command;
+static int hf_artnet_command_esta_man;
+static int hf_artnet_command_length;
+static int hf_artnet_command_data;
 
 /* ArtMedia */
-static int hf_artnet_media = -1;
+static int hf_artnet_media;
 
 /* ArtMediaPatch */
-static int hf_artnet_media_patch = -1;
+static int hf_artnet_media_patch;
 
 /* ArtMediaControl */
-static int hf_artnet_media_control = -1;
+static int hf_artnet_media_control;
 
 /* ArtMediaControlReply */
-static int hf_artnet_media_control_reply = -1;
+static int hf_artnet_media_control_reply;
 
 /* ArtTimeCode */
-static int hf_artnet_time_code = -1;
-static int hf_artnet_time_code_frames = -1;
-static int hf_artnet_time_code_seconds = -1;
-static int hf_artnet_time_code_minutes = -1;
-static int hf_artnet_time_code_hours = -1;
-static int hf_artnet_time_code_type = -1;
+static int hf_artnet_time_code;
+static int hf_artnet_time_code_frames;
+static int hf_artnet_time_code_seconds;
+static int hf_artnet_time_code_minutes;
+static int hf_artnet_time_code_hours;
+static int hf_artnet_time_code_type;
 
 static const value_string artnet_time_code_vals[] = {
   { 0x00, "Film (24fps)" },
@@ -4406,17 +4406,17 @@ static const value_string artnet_time_code_vals[] = {
 };
 
 /* ArtTimeSync */
-static int hf_artnet_time_sync = -1;
+static int hf_artnet_time_sync;
 
 /* ArtTrigger */
 #define ARTNET_TRIGGER_NOT_OEM_SPECIFIC 0xFFFF
 
-static int hf_artnet_trigger = -1;
-static int hf_artnet_trigger_oemcode = -1;
-static int hf_artnet_trigger_key = -1;
-static int hf_artnet_trigger_key_unspecific = -1;
-static int hf_artnet_trigger_subkey = -1;
-static int hf_artnet_trigger_data = -1;
+static int hf_artnet_trigger;
+static int hf_artnet_trigger_oemcode;
+static int hf_artnet_trigger_key;
+static int hf_artnet_trigger_key_unspecific;
+static int hf_artnet_trigger_subkey;
+static int hf_artnet_trigger_data;
 
 static const value_string artnet_trigger_key_vals[] = {
   { 0x00, "KeyAscii" },
@@ -4427,73 +4427,73 @@ static const value_string artnet_trigger_key_vals[] = {
 };
 
 /* ArtDirectory */
-static int hf_artnet_directory = -1;
-static int hf_artnet_directory_filler = -1;
-static int hf_artnet_directory_cmd = -1;
-static int hf_artnet_directory_file = -1;
+static int hf_artnet_directory;
+static int hf_artnet_directory_filler;
+static int hf_artnet_directory_cmd;
+static int hf_artnet_directory_file;
 
 /* ArtDirectoryReply */
-static int hf_artnet_directory_reply = -1;
-static int hf_artnet_directory_reply_filler = -1;
-static int hf_artnet_directory_reply_flags = -1;
-static int hf_artnet_directory_reply_file = -1;
-static int hf_artnet_directory_reply_name = -1;
-static int hf_artnet_directory_reply_desc = -1;
-static int hf_artnet_directory_reply_length = -1;
-static int hf_artnet_directory_reply_data = -1;
+static int hf_artnet_directory_reply;
+static int hf_artnet_directory_reply_filler;
+static int hf_artnet_directory_reply_flags;
+static int hf_artnet_directory_reply_file;
+static int hf_artnet_directory_reply_name;
+static int hf_artnet_directory_reply_desc;
+static int hf_artnet_directory_reply_length;
+static int hf_artnet_directory_reply_data;
 
 /* ArtMacMaster */
-static int hf_artnet_mac_master = -1;
+static int hf_artnet_mac_master;
 
 /* ArtMacSlave */
-static int hf_artnet_mac_slave = -1;
+static int hf_artnet_mac_slave;
 
 /* ArtFileTnMaster */
-static int hf_artnet_file_tn_master = -1;
-static int hf_artnet_file_tn_master_filler = -1;
-static int hf_artnet_file_tn_master_type = -1;
-static int hf_artnet_file_tn_master_block_id = -1;
-static int hf_artnet_file_tn_master_length = -1;
-static int hf_artnet_file_tn_master_name = -1;
-static int hf_artnet_file_tn_master_checksum = -1;
-static int hf_artnet_file_tn_master_spare = -1;
-static int hf_artnet_file_tn_master_data = -1;
+static int hf_artnet_file_tn_master;
+static int hf_artnet_file_tn_master_filler;
+static int hf_artnet_file_tn_master_type;
+static int hf_artnet_file_tn_master_block_id;
+static int hf_artnet_file_tn_master_length;
+static int hf_artnet_file_tn_master_name;
+static int hf_artnet_file_tn_master_checksum;
+static int hf_artnet_file_tn_master_spare;
+static int hf_artnet_file_tn_master_data;
 
 
 /* ArtFileFnMaster */
-static int hf_artnet_file_fn_master = -1;
+static int hf_artnet_file_fn_master;
 
 /* ArtFileFnReply */
-static int hf_artnet_file_fn_reply = -1;
+static int hf_artnet_file_fn_reply;
 
 /* ArtNzs */
-static int hf_artnet_nzs = -1;
-static int hf_artnet_nzs_sequence = -1;
-static int hf_artnet_nzs_start_code = -1;
-static int hf_artnet_nzs_subuni = -1;
-static int hf_artnet_nzs_net = -1;
-static int hf_artnet_nzs_length = -1;
-static int hf_artnet_nzs_vlc_man_id = -1;
-static int hf_artnet_nzs_vlc_sub_code = -1;
-static int hf_artnet_nzs_vlc_flags = -1;
-static int hf_artnet_nzs_vlc_flags_ieee = -1;
-static int hf_artnet_nzs_vlc_flags_reply = -1;
-static int hf_artnet_nzs_vlc_flags_beacon = -1;
-static int hf_artnet_nzs_vlc_transaction = -1;
-static int hf_artnet_nzs_vlc_slot_addr = -1;
-static int hf_artnet_nzs_vlc_payload_size = -1;
-static int hf_artnet_nzs_vlc_payload_checksum = -1;
-static int hf_artnet_nzs_vlc_mod_depth = -1;
-static int hf_artnet_nzs_vlc_mod_freq = -1;
-static int hf_artnet_nzs_vlc_mod_type = -1;
-static int hf_artnet_nzs_vlc_lang_code = -1;
-static int hf_artnet_nzs_vlc_beacon_repeat = -1;
-static int hf_artnet_nzs_vlc_payload = -1;
-static int hf_artnet_nzs_vlc_payload_beacon_url = -1;
-static int hf_artnet_nzs_vlc_payload_beacon_text = -1;
-static int hf_artnet_nzs_vlc_payload_beacon_location_id = -1;
-
-static gint ett_artnet_nzs_vlc_flags = -1;
+static int hf_artnet_nzs;
+static int hf_artnet_nzs_sequence;
+static int hf_artnet_nzs_start_code;
+static int hf_artnet_nzs_subuni;
+static int hf_artnet_nzs_net;
+static int hf_artnet_nzs_length;
+static int hf_artnet_nzs_vlc_man_id;
+static int hf_artnet_nzs_vlc_sub_code;
+static int hf_artnet_nzs_vlc_flags;
+static int hf_artnet_nzs_vlc_flags_ieee;
+static int hf_artnet_nzs_vlc_flags_reply;
+static int hf_artnet_nzs_vlc_flags_beacon;
+static int hf_artnet_nzs_vlc_transaction;
+static int hf_artnet_nzs_vlc_slot_addr;
+static int hf_artnet_nzs_vlc_payload_size;
+static int hf_artnet_nzs_vlc_payload_checksum;
+static int hf_artnet_nzs_vlc_mod_depth;
+static int hf_artnet_nzs_vlc_mod_freq;
+static int hf_artnet_nzs_vlc_mod_type;
+static int hf_artnet_nzs_vlc_lang_code;
+static int hf_artnet_nzs_vlc_beacon_repeat;
+static int hf_artnet_nzs_vlc_payload;
+static int hf_artnet_nzs_vlc_payload_beacon_url;
+static int hf_artnet_nzs_vlc_payload_beacon_text;
+static int hf_artnet_nzs_vlc_payload_beacon_location_id;
+
+static gint ett_artnet_nzs_vlc_flags;
 
 static int * const artnet_nzs_vlc_flags_fields[] = {
   &hf_artnet_nzs_vlc_flags_beacon,
@@ -4531,7 +4531,7 @@ static const value_string vals_artnet_nzs_vlc_lang_code[] = {
 
 
 /* Define the tree for artnet */
-static int ett_artnet = -1;
+static int ett_artnet;
 
 /* A static handle for the rdm dissector */
 static dissector_handle_t rdm_handle;
diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c
index 312536be61..bd4e50c9dd 100644
--- a/epan/dissectors/packet-aruba-adp.c
+++ b/epan/dissectors/packet-aruba-adp.c
@@ -24,14 +24,14 @@ void proto_reg_handoff_aruba_adp(void);
 
 static dissector_handle_t adp_handle;
 
-static int proto_aruba_adp = -1;
-static gint ett_aruba_adp  = -1;
-
-static int hf_adp_version  = -1;
-static int hf_adp_type     = -1;
-static int hf_adp_id       = -1;
-static int hf_adp_mac      = -1;
-static int hf_adp_switchip = -1;
+static int proto_aruba_adp;
+static gint ett_aruba_adp;
+
+static int hf_adp_version;
+static int hf_adp_type;
+static int hf_adp_id;
+static int hf_adp_mac;
+static int hf_adp_switchip;
 
 static const value_string adp_type_val[] =
 {
diff --git a/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c
index c9afcbeeb9..aa4371c266 100644
--- a/epan/dissectors/packet-aruba-erm.c
+++ b/epan/dissectors/packet-aruba-erm.c
@@ -126,27 +126,27 @@ void proto_reg_handoff_aruba_erm_radio(void);
 static gint  aruba_erm_type         = 0;
 #endif
 
-static int  proto_aruba_erm       = -1;
-static int  proto_aruba_erm_type0 = -1;
-static int  proto_aruba_erm_type1 = -1;
-static int  proto_aruba_erm_type2 = -1;
-static int  proto_aruba_erm_type3 = -1;
-static int  proto_aruba_erm_type4 = -1;
-static int  proto_aruba_erm_type5 = -1;
-static int  proto_aruba_erm_type6 = -1;
-
-static int  hf_aruba_erm_time             = -1;
-static int  hf_aruba_erm_incl_len         = -1;
-static int  hf_aruba_erm_orig_len         = -1;
-static int  hf_aruba_erm_data_rate        = -1;
-static int  hf_aruba_erm_data_rate_gen    = -1;
-static int  hf_aruba_erm_channel          = -1;
-static int  hf_aruba_erm_signal_strength  = -1;
-
-static gint ett_aruba_erm = -1;
-
-static expert_field ei_aruba_erm_airmagnet = EI_INIT;
-static expert_field ei_aruba_erm_decode = EI_INIT;
+static int  proto_aruba_erm;
+static int  proto_aruba_erm_type0;
+static int  proto_aruba_erm_type1;
+static int  proto_aruba_erm_type2;
+static int  proto_aruba_erm_type3;
+static int  proto_aruba_erm_type4;
+static int  proto_aruba_erm_type5;
+static int  proto_aruba_erm_type6;
+
+static int  hf_aruba_erm_time;
+static int  hf_aruba_erm_incl_len;
+static int  hf_aruba_erm_orig_len;
+static int  hf_aruba_erm_data_rate;
+static int  hf_aruba_erm_data_rate_gen;
+static int  hf_aruba_erm_channel;
+static int  hf_aruba_erm_signal_strength;
+
+static gint ett_aruba_erm;
+
+static expert_field ei_aruba_erm_airmagnet;
+static expert_field ei_aruba_erm_decode;
 
 static dissector_handle_t aruba_erm_handle;
 static dissector_handle_t aruba_erm_handle_type0;
diff --git a/epan/dissectors/packet-aruba-iap.c b/epan/dissectors/packet-aruba-iap.c
index 60f733fef1..f792325eb2 100644
--- a/epan/dissectors/packet-aruba-iap.c
+++ b/epan/dissectors/packet-aruba-iap.c
@@ -39,21 +39,21 @@ void proto_reg_handoff_aruba_iap(void);
 
 static dissector_handle_t iap_handle;
 
-static int proto_aruba_iap = -1;
-static gint ett_aruba_iap  = -1;
-
-static int hf_iap_magic = -1;
-static int hf_iap_version = -1;
-static int hf_iap_type = -1;
-static int hf_iap_length = -1;
-static int hf_iap_id = -1;
-static int hf_iap_status = -1;
-static int hf_iap_uptime = -1;
-static int hf_iap_vc_ip = -1;
-static int hf_iap_pvid = -1;
-static int hf_iap_model = -1;
-static int hf_iap_unknown_uint = -1;
-static int hf_iap_unknown_bytes = -1;
+static int proto_aruba_iap;
+static gint ett_aruba_iap;
+
+static int hf_iap_magic;
+static int hf_iap_version;
+static int hf_iap_type;
+static int hf_iap_length;
+static int hf_iap_id;
+static int hf_iap_status;
+static int hf_iap_uptime;
+static int hf_iap_vc_ip;
+static int hf_iap_pvid;
+static int hf_iap_model;
+static int hf_iap_unknown_uint;
+static int hf_iap_unknown_bytes;
 
 static const value_string iap_model[] = {
     { 0x0a, "Orion (IAP-104, IAP-105, IAP-175, RAP-3WN and RAP-3WNP)" },
diff --git a/epan/dissectors/packet-aruba-papi.c b/epan/dissectors/packet-aruba-papi.c
index 384821945e..9eda0a9aa7 100644
--- a/epan/dissectors/packet-aruba-papi.c
+++ b/epan/dissectors/packet-aruba-papi.c
@@ -27,59 +27,59 @@ void proto_reg_handoff_papi(void);
 static dissector_handle_t papi_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_papi = -1;
-static int hf_papi_hdr_magic = -1;
-static int hf_papi_hdr_version = -1;
-static int hf_papi_hdr_dest_ip = -1;
-static int hf_papi_hdr_src_ip = -1;
-static int hf_papi_hdr_nat_port_number = -1;
-static int hf_papi_hdr_garbage = -1;
-static int hf_papi_hdr_dest_port = -1;
-static int hf_papi_hdr_src_port = -1;
-static int hf_papi_hdr_packet_type = -1;
-static int hf_papi_hdr_packet_size = -1;
-static int hf_papi_hdr_seq_number = -1;
-static int hf_papi_hdr_message_code = -1;
-static int hf_papi_hdr_checksum = -1;
-
-static int hf_papi_hdr_srcipv6 = -1;
-static int hf_papi_hdr_destipv6 = -1;
-
-static int hf_papi_debug = -1;
-static int hf_papi_debug_text = -1;
-static int hf_papi_debug_text_length = -1;
-static int hf_papi_debug_48bits = -1;
-static int hf_papi_debug_8bits = -1;
-static int hf_papi_debug_16bits = -1;
-static int hf_papi_debug_32bits = -1;
-static int hf_papi_debug_ipv4 = -1;
-static int hf_papi_debug_64bits = -1;
-static int hf_papi_debug_bytes = -1;
-static int hf_papi_debug_bytes_length = -1;
-
-static int hf_papi_licmgr = -1;
-static int hf_papi_licmgr_payload_len = -1;
-static int hf_papi_licmgr_tlv = -1;
-static int hf_papi_licmgr_type = -1;
-static int hf_papi_licmgr_length = -1;
-static int hf_papi_licmgr_value = -1;
-static int hf_papi_licmgr_ip = -1;
-static int hf_papi_licmgr_serial_number = -1;
-static int hf_papi_licmgr_hostname = -1;
-static int hf_papi_licmgr_mac_address = -1;
-static int hf_papi_licmgr_license_ap_remaining = -1;
-static int hf_papi_licmgr_license_pef_remaining = -1;
-static int hf_papi_licmgr_license_rfp_remaining = -1;
-static int hf_papi_licmgr_license_xsec_remaining = -1;
-static int hf_papi_licmgr_license_acr_remaining = -1;
-static int hf_papi_licmgr_license_ap_used = -1;
-static int hf_papi_licmgr_license_pef_used = -1;
-static int hf_papi_licmgr_license_rfp_used = -1;
-static int hf_papi_licmgr_license_xsec_used = -1;
-static int hf_papi_licmgr_license_acr_used = -1;
-static int hf_papi_licmgr_padding = -1;
-
-static expert_field ei_papi_debug_unknown = EI_INIT;
+static int proto_papi;
+static int hf_papi_hdr_magic;
+static int hf_papi_hdr_version;
+static int hf_papi_hdr_dest_ip;
+static int hf_papi_hdr_src_ip;
+static int hf_papi_hdr_nat_port_number;
+static int hf_papi_hdr_garbage;
+static int hf_papi_hdr_dest_port;
+static int hf_papi_hdr_src_port;
+static int hf_papi_hdr_packet_type;
+static int hf_papi_hdr_packet_size;
+static int hf_papi_hdr_seq_number;
+static int hf_papi_hdr_message_code;
+static int hf_papi_hdr_checksum;
+
+static int hf_papi_hdr_srcipv6;
+static int hf_papi_hdr_destipv6;
+
+static int hf_papi_debug;
+static int hf_papi_debug_text;
+static int hf_papi_debug_text_length;
+static int hf_papi_debug_48bits;
+static int hf_papi_debug_8bits;
+static int hf_papi_debug_16bits;
+static int hf_papi_debug_32bits;
+static int hf_papi_debug_ipv4;
+static int hf_papi_debug_64bits;
+static int hf_papi_debug_bytes;
+static int hf_papi_debug_bytes_length;
+
+static int hf_papi_licmgr;
+static int hf_papi_licmgr_payload_len;
+static int hf_papi_licmgr_tlv;
+static int hf_papi_licmgr_type;
+static int hf_papi_licmgr_length;
+static int hf_papi_licmgr_value;
+static int hf_papi_licmgr_ip;
+static int hf_papi_licmgr_serial_number;
+static int hf_papi_licmgr_hostname;
+static int hf_papi_licmgr_mac_address;
+static int hf_papi_licmgr_license_ap_remaining;
+static int hf_papi_licmgr_license_pef_remaining;
+static int hf_papi_licmgr_license_rfp_remaining;
+static int hf_papi_licmgr_license_xsec_remaining;
+static int hf_papi_licmgr_license_acr_remaining;
+static int hf_papi_licmgr_license_ap_used;
+static int hf_papi_licmgr_license_pef_used;
+static int hf_papi_licmgr_license_rfp_used;
+static int hf_papi_licmgr_license_xsec_used;
+static int hf_papi_licmgr_license_acr_used;
+static int hf_papi_licmgr_padding;
+
+static expert_field ei_papi_debug_unknown;
 
 /* variable for dissector table for subdissectors */
 static dissector_table_t papi_dissector_table;
@@ -88,9 +88,9 @@ static dissector_table_t papi_dissector_table;
 static gboolean g_papi_debug = FALSE;
 
 /* Initialize the subtree pointers */
-static gint ett_papi = -1;
-static gint ett_papi_licmgr = -1;
-static gint ett_papi_licmgr_tlv = -1;
+static gint ett_papi;
+static gint ett_papi_licmgr;
+static gint ett_papi_licmgr_tlv;
 
 #define SAMBA_WRAPPER               8442
 #define RESOLVER_PORT               8392
diff --git a/epan/dissectors/packet-aruba-ubt.c b/epan/dissectors/packet-aruba-ubt.c
index d3b6f45a6d..46d817eb55 100644
--- a/epan/dissectors/packet-aruba-ubt.c
+++ b/epan/dissectors/packet-aruba-ubt.c
@@ -27,106 +27,106 @@ void proto_reg_handoff_ubt(void);
 static dissector_handle_t ubt_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_ubt = -1;
-static int hf_ubt_packet_len = -1;
-static int hf_ubt_msg_type = -1;
-static int hf_ubt_tlv_header = -1;
-static int hf_ubt_tlv = -1;
-static int hf_ubt_type = -1;
-static int hf_ubt_length = -1;
-static int hf_ubt_switch_seqno = -1;
-static int hf_ubt_switch_macaddr = -1;
+static int proto_ubt;
+static int hf_ubt_packet_len;
+static int hf_ubt_msg_type;
+static int hf_ubt_tlv_header;
+static int hf_ubt_tlv;
+static int hf_ubt_type;
+static int hf_ubt_length;
+static int hf_ubt_switch_seqno;
+static int hf_ubt_switch_macaddr;
 
 /* for data attributes */
-static int hf_ubt_dt_unknown = -1;
-static int hf_ubt_dt_grekey = -1;
-static int hf_ubt_dt_firmwareversion = -1;
-static int hf_ubt_dt_userkey = -1;
-static int hf_ubt_dt_sacmode = -1;
-static int hf_ubt_dt_sacipv4 = -1;
-static int hf_ubt_dt_sacipv6 = -1;
-static int hf_ubt_dt_heartbeattimeout = -1;
-static int hf_ubt_dt_usermac = -1;
-static int hf_ubt_dt_uservlan = -1;
-static int hf_ubt_dt_flags = -1;
+static int hf_ubt_dt_unknown;
+static int hf_ubt_dt_grekey;
+static int hf_ubt_dt_firmwareversion;
+static int hf_ubt_dt_userkey;
+static int hf_ubt_dt_sacmode;
+static int hf_ubt_dt_sacipv4;
+static int hf_ubt_dt_sacipv6;
+static int hf_ubt_dt_heartbeattimeout;
+static int hf_ubt_dt_usermac;
+static int hf_ubt_dt_uservlan;
+static int hf_ubt_dt_flags;
 
 /* for ip attributes */
-static int hf_ubt_ip_type = -1;
-static int hf_ubt_ip_padding = -1;
-static int hf_ubt_ip_unassigned = -1;
+static int hf_ubt_ip_type;
+static int hf_ubt_ip_padding;
+static int hf_ubt_ip_unassigned;
 
 /* for switch & user flags */
-static int hf_ubt_switch_flags_bcmctoucast = -1;
-static int hf_ubt_user_flags_tag = -1;
-static int hf_ubt_user_flags_auth = -1;
-static int hf_ubt_user_flags_bcmctoucast = -1;
-static int hf_ubt_user_flags_dormant = -1;
-static int hf_ubt_user_flags_uback = -1;
-
-static int hf_ubt_dt_tunnelmtu = -1;
-static int hf_ubt_dt_userrole = -1;
-static int hf_ubt_dt_reasoncode = -1;
-static int hf_ubt_dt_nodelist = -1;
-static int hf_ubt_dt_clustername = -1;
-static int hf_ubt_dt_clusterenabled = -1;
-static int hf_ubt_dt_ssacindex = -1;
-static int hf_ubt_dt_reserved = -1;
-static int hf_ubt_dt_uaccount = -1;
-static int hf_ubt_dt_uaciplist = -1;
-static int hf_ubt_dt_uacipv4 = -1;
-static int hf_ubt_dt_uacipv6 = -1;
-static int hf_ubt_dt_bucketmap = -1;
-static int hf_ubt_dt_timestamp = -1;
-static int hf_ubt_dt_identifier = -1;
+static int hf_ubt_switch_flags_bcmctoucast;
+static int hf_ubt_user_flags_tag;
+static int hf_ubt_user_flags_auth;
+static int hf_ubt_user_flags_bcmctoucast;
+static int hf_ubt_user_flags_dormant;
+static int hf_ubt_user_flags_uback;
+
+static int hf_ubt_dt_tunnelmtu;
+static int hf_ubt_dt_userrole;
+static int hf_ubt_dt_reasoncode;
+static int hf_ubt_dt_nodelist;
+static int hf_ubt_dt_clustername;
+static int hf_ubt_dt_clusterenabled;
+static int hf_ubt_dt_ssacindex;
+static int hf_ubt_dt_reserved;
+static int hf_ubt_dt_uaccount;
+static int hf_ubt_dt_uaciplist;
+static int hf_ubt_dt_uacipv4;
+static int hf_ubt_dt_uacipv6;
+static int hf_ubt_dt_bucketmap;
+static int hf_ubt_dt_timestamp;
+static int hf_ubt_dt_identifier;
 
 /* for active map arrays */
-static int hf_ubt_dt_activemap1 = -1;
-static int hf_ubt_dt_activemap2 = -1;
-static int hf_ubt_dt_activemap3 = -1;
-static int hf_ubt_dt_activemap4 = -1;
-static int hf_ubt_dt_activemap5 = -1;
-static int hf_ubt_dt_activemap6 = -1;
-static int hf_ubt_dt_activemap7 = -1;
-static int hf_ubt_dt_activemap8 = -1;
+static int hf_ubt_dt_activemap1;
+static int hf_ubt_dt_activemap2;
+static int hf_ubt_dt_activemap3;
+static int hf_ubt_dt_activemap4;
+static int hf_ubt_dt_activemap5;
+static int hf_ubt_dt_activemap6;
+static int hf_ubt_dt_activemap7;
+static int hf_ubt_dt_activemap8;
 
 /* for standby map arrays */
-static int hf_ubt_dt_standbymap1 = -1;
-static int hf_ubt_dt_standbymap2 = -1;
-static int hf_ubt_dt_standbymap3 = -1;
-static int hf_ubt_dt_standbymap4 = -1;
-static int hf_ubt_dt_standbymap5 = -1;
-static int hf_ubt_dt_standbymap6 = -1;
-static int hf_ubt_dt_standbymap7 = -1;
-static int hf_ubt_dt_standbymap8 = -1;
+static int hf_ubt_dt_standbymap1;
+static int hf_ubt_dt_standbymap2;
+static int hf_ubt_dt_standbymap3;
+static int hf_ubt_dt_standbymap4;
+static int hf_ubt_dt_standbymap5;
+static int hf_ubt_dt_standbymap6;
+static int hf_ubt_dt_standbymap7;
+static int hf_ubt_dt_standbymap8;
 
 /* for l2conn arrays */
-static int hf_ubt_dt_l2conn1 = -1;
-static int hf_ubt_dt_l2conn2 = -1;
-static int hf_ubt_dt_l2conn3 = -1;
-static int hf_ubt_dt_l2conn4 = -1;
-static int hf_ubt_dt_l2conn5 = -1;
-static int hf_ubt_dt_l2conn6 = -1;
-static int hf_ubt_dt_l2conn7 = -1;
-static int hf_ubt_dt_l2conn8 = -1;
-
-static int hf_ubt_dt_status = -1;
-static int hf_ubt_dt_mcastkey = -1;
-static int hf_ubt_dt_serveripv4 = -1;
-static int hf_ubt_dt_serveripv6 = -1;
-static int hf_ubt_dt_userauthmethod = -1;
-static int hf_ubt_dt_username = -1;
-static int hf_ubt_dt_userportname = -1;
-static int hf_ubt_dt_switchname = -1;
-static int hf_ubt_dt_silentclientvlans = -1;
-static int hf_ubt_dt_silentclientvlan = -1;
-static int hf_ubt_dt_maxmsgs = -1;
-
-static expert_field ei_ubt_unknown = EI_INIT;
+static int hf_ubt_dt_l2conn1;
+static int hf_ubt_dt_l2conn2;
+static int hf_ubt_dt_l2conn3;
+static int hf_ubt_dt_l2conn4;
+static int hf_ubt_dt_l2conn5;
+static int hf_ubt_dt_l2conn6;
+static int hf_ubt_dt_l2conn7;
+static int hf_ubt_dt_l2conn8;
+
+static int hf_ubt_dt_status;
+static int hf_ubt_dt_mcastkey;
+static int hf_ubt_dt_serveripv4;
+static int hf_ubt_dt_serveripv6;
+static int hf_ubt_dt_userauthmethod;
+static int hf_ubt_dt_username;
+static int hf_ubt_dt_userportname;
+static int hf_ubt_dt_switchname;
+static int hf_ubt_dt_silentclientvlans;
+static int hf_ubt_dt_silentclientvlan;
+static int hf_ubt_dt_maxmsgs;
+
+static expert_field ei_ubt_unknown;
 
 /* Initialize the subtree pointers */
-static gint ett_ubt = -1;
-static gint ett_ubt_tlv = -1;
-static gint ett_ubt_flags = -1;
+static gint ett_ubt;
+static gint ett_ubt_tlv;
+static gint ett_ubt_flags;
 
 /* Definition of different sizes and counts used throughout the program */
 #define PAPI_PACKET_SIZE 76
diff --git a/epan/dissectors/packet-asam-cmp.c b/epan/dissectors/packet-asam-cmp.c
index 27c99e3e83..b40da50520 100644
--- a/epan/dissectors/packet-asam-cmp.c
+++ b/epan/dissectors/packet-asam-cmp.c
@@ -28,7 +28,7 @@
 void proto_register_asam_cmp(void);
 void proto_reg_handoff_asam_cmp(void);
 
-static int proto_asam_cmp = -1;
+static int proto_asam_cmp;
 
 static dissector_handle_t eth_handle;
 
@@ -38,48 +38,48 @@ static gboolean old_11bit_canid_encoding = FALSE;
 static dissector_table_t lin_subdissector_table;
 
 /* Header fields */
-static int hf_cmp_header = -1;
-static int hf_cmp_version = -1;
-static int hf_cmp_header_res = -1;
-static int hf_cmp_device_id = -1;
-static int hf_cmp_msg_type = -1;
-static int hf_cmp_stream_id = -1;
-static int hf_cmp_stream_seq_ctr = -1;
+static int hf_cmp_header;
+static int hf_cmp_version;
+static int hf_cmp_header_res;
+static int hf_cmp_device_id;
+static int hf_cmp_msg_type;
+static int hf_cmp_stream_id;
+static int hf_cmp_stream_seq_ctr;
 
 /* Message Fields */
 /* Message Header Fields */
-static int hf_cmp_msg_header = -1;
-
-static int hf_cmp_common_flag_recal = -1;
-static int hf_cmp_common_flag_insync = -1;
-static int hf_cmp_common_flag_seg = -1;
-static int hf_cmp_common_flag_dir_on_if = -1;
-static int hf_cmp_common_flag_overflow = -1;
-static int hf_cmp_common_flag_err_in_payload = -1;
-static int hf_cmp_common_flag_reserved = -1;
-static int hf_cmp_common_flag_reserved_ctrl = -1;
-
-static int hf_cmp_msg_timestamp = -1;
-static int hf_cmp_msg_timestamp_ns = -1;
-static int hf_cmp_msg_reserved = -1;
-static int hf_cmp_msg_common_flags = -1;
-static int hf_cmp_msg_vendor_id = -1;
-static int hf_cmp_msg_payload_length = -1;
-static int hf_cmp_msg_payload = -1;
+static int hf_cmp_msg_header;
+
+static int hf_cmp_common_flag_recal;
+static int hf_cmp_common_flag_insync;
+static int hf_cmp_common_flag_seg;
+static int hf_cmp_common_flag_dir_on_if;
+static int hf_cmp_common_flag_overflow;
+static int hf_cmp_common_flag_err_in_payload;
+static int hf_cmp_common_flag_reserved;
+static int hf_cmp_common_flag_reserved_ctrl;
+
+static int hf_cmp_msg_timestamp;
+static int hf_cmp_msg_timestamp_ns;
+static int hf_cmp_msg_reserved;
+static int hf_cmp_msg_common_flags;
+static int hf_cmp_msg_vendor_id;
+static int hf_cmp_msg_payload_length;
+static int hf_cmp_msg_payload;
 
 /* Additional Data Message Header Fields */
-static int hf_cmp_interface_id = -1;
-static int hf_cmp_payload_type = -1;
+static int hf_cmp_interface_id;
+static int hf_cmp_payload_type;
 
 /* Additional Control Message Header Fields */
-static int hf_cmp_ctrl_msg_reserved = -1;
-static int hf_cmp_ctrl_msg_payload_type = -1;
+static int hf_cmp_ctrl_msg_reserved;
+static int hf_cmp_ctrl_msg_payload_type;
 
 /* Additional Status Message Header Fields */
-static int hf_cmp_status_msg_payload_type = -1;
+static int hf_cmp_status_msg_payload_type;
 
 /* Additional Status Message Header Fields */
-static int hf_cmp_vendor_msg_payload_type = -1;
+static int hf_cmp_vendor_msg_payload_type;
 
 /* Data Message Payload Fields */
 /* CAN */
@@ -96,37 +96,37 @@ static int hf_cmp_vendor_msg_payload_type = -1;
 #define CMP_CAN_CRC_RES             0x7fff8000
 #define CMP_CAN_CRC_CRC_SUPP        0x80000000
 
-static int hf_cmp_can_flags = -1;
-
-static int hf_cmp_can_flag_crc_err = -1;
-static int hf_cmp_can_flag_ack_err = -1;
-static int hf_cmp_can_flag_passive_ack_err = -1;
-static int hf_cmp_can_flag_active_ack_err = -1;
-static int hf_cmp_can_flag_ack_del_err = -1;
-static int hf_cmp_can_flag_form_err = -1;
-static int hf_cmp_can_flag_stuff_err = -1;
-static int hf_cmp_can_flag_crc_del_err = -1;
-static int hf_cmp_can_flag_eof_err = -1;
-static int hf_cmp_can_flag_bit_err = -1;
-static int hf_cmp_can_flag_r0 = -1;
-static int hf_cmp_can_flag_srr_dom = -1;
-static int hf_cmp_can_flag_reserved = -1;
-
-static int hf_cmp_can_reserved = -1;
-static int hf_cmp_can_id = -1;
-static int hf_cmp_can_id_11bit = -1;
-static int hf_cmp_can_id_11bit_old = -1;
-static int hf_cmp_can_id_29bit = -1;
-static int hf_cmp_can_id_res = -1;
-static int hf_cmp_can_id_rtr = -1;
-static int hf_cmp_can_id_ide = -1;
-static int hf_cmp_can_crc = -1;
-static int hf_cmp_can_crc_crc = -1;
-static int hf_cmp_can_crc_res = -1;
-static int hf_cmp_can_crc_crc_support = -1;
-static int hf_cmp_can_err_pos = -1;
-static int hf_cmp_can_dlc = -1;
-static int hf_cmp_can_data_len = -1;
+static int hf_cmp_can_flags;
+
+static int hf_cmp_can_flag_crc_err;
+static int hf_cmp_can_flag_ack_err;
+static int hf_cmp_can_flag_passive_ack_err;
+static int hf_cmp_can_flag_active_ack_err;
+static int hf_cmp_can_flag_ack_del_err;
+static int hf_cmp_can_flag_form_err;
+static int hf_cmp_can_flag_stuff_err;
+static int hf_cmp_can_flag_crc_del_err;
+static int hf_cmp_can_flag_eof_err;
+static int hf_cmp_can_flag_bit_err;
+static int hf_cmp_can_flag_r0;
+static int hf_cmp_can_flag_srr_dom;
+static int hf_cmp_can_flag_reserved;
+
+static int hf_cmp_can_reserved;
+static int hf_cmp_can_id;
+static int hf_cmp_can_id_11bit;
+static int hf_cmp_can_id_11bit_old;
+static int hf_cmp_can_id_29bit;
+static int hf_cmp_can_id_res;
+static int hf_cmp_can_id_rtr;
+static int hf_cmp_can_id_ide;
+static int hf_cmp_can_crc;
+static int hf_cmp_can_crc_crc;
+static int hf_cmp_can_crc_res;
+static int hf_cmp_can_crc_crc_support;
+static int hf_cmp_can_err_pos;
+static int hf_cmp_can_dlc;
+static int hf_cmp_can_data_len;
 
 /* CAN FD */
 #define CMP_CANFD_FLAGS_ERRORS      0x03ff
@@ -142,269 +142,269 @@ static int hf_cmp_can_data_len = -1;
 #define CMP_CANFD_CRC_SBC_SUPP      0x40000000
 #define CMP_CANFD_CRC_CRC_SUPP      0x80000000
 
-static int hf_cmp_canfd_flags = -1;
-
-static int hf_cmp_canfd_flag_crc_err = -1;
-static int hf_cmp_canfd_flag_ack_err = -1;
-static int hf_cmp_canfd_flag_passive_ack_err = -1;
-static int hf_cmp_canfd_flag_active_ack_err = -1;
-static int hf_cmp_canfd_flag_ack_del_err = -1;
-static int hf_cmp_canfd_flag_form_err = -1;
-static int hf_cmp_canfd_flag_stuff_err = -1;
-static int hf_cmp_canfd_flag_crc_del_err = -1;
-static int hf_cmp_canfd_flag_eof_err = -1;
-static int hf_cmp_canfd_flag_bit_err = -1;
-static int hf_cmp_canfd_flag_res = -1;
-static int hf_cmp_canfd_flag_srr_dom = -1;
-static int hf_cmp_canfd_flag_brs = -1;
-static int hf_cmp_canfd_flag_esi = -1;
-static int hf_cmp_canfd_flag_reserved = -1;
-
-static int hf_cmp_canfd_reserved = -1;
-static int hf_cmp_canfd_id = -1;
-static int hf_cmp_canfd_id_11bit = -1;
-static int hf_cmp_canfd_id_11bit_old = -1;
-static int hf_cmp_canfd_id_29bit = -1;
-static int hf_cmp_canfd_id_res = -1;
-static int hf_cmp_canfd_id_rrs = -1;
-static int hf_cmp_canfd_id_ide = -1;
-static int hf_cmp_canfd_crc = -1;
-static int hf_cmp_canfd_crc_crc17 = -1;
-static int hf_cmp_canfd_crc_crc21 = -1;
-static int hf_cmp_canfd_crc_sbc = -1;
-static int hf_cmp_canfd_crc_sbc_parity = -1;
-static int hf_cmp_canfd_crc_res = -1;
-static int hf_cmp_canfd_crc_sbc_support = -1;
-static int hf_cmp_canfd_crc_crc_support = -1;
-static int hf_cmp_canfd_err_pos = -1;
-static int hf_cmp_canfd_dlc = -1;
-static int hf_cmp_canfd_data_len = -1;
+static int hf_cmp_canfd_flags;
+
+static int hf_cmp_canfd_flag_crc_err;
+static int hf_cmp_canfd_flag_ack_err;
+static int hf_cmp_canfd_flag_passive_ack_err;
+static int hf_cmp_canfd_flag_active_ack_err;
+static int hf_cmp_canfd_flag_ack_del_err;
+static int hf_cmp_canfd_flag_form_err;
+static int hf_cmp_canfd_flag_stuff_err;
+static int hf_cmp_canfd_flag_crc_del_err;
+static int hf_cmp_canfd_flag_eof_err;
+static int hf_cmp_canfd_flag_bit_err;
+static int hf_cmp_canfd_flag_res;
+static int hf_cmp_canfd_flag_srr_dom;
+static int hf_cmp_canfd_flag_brs;
+static int hf_cmp_canfd_flag_esi;
+static int hf_cmp_canfd_flag_reserved;
+
+static int hf_cmp_canfd_reserved;
+static int hf_cmp_canfd_id;
+static int hf_cmp_canfd_id_11bit;
+static int hf_cmp_canfd_id_11bit_old;
+static int hf_cmp_canfd_id_29bit;
+static int hf_cmp_canfd_id_res;
+static int hf_cmp_canfd_id_rrs;
+static int hf_cmp_canfd_id_ide;
+static int hf_cmp_canfd_crc;
+static int hf_cmp_canfd_crc_crc17;
+static int hf_cmp_canfd_crc_crc21;
+static int hf_cmp_canfd_crc_sbc;
+static int hf_cmp_canfd_crc_sbc_parity;
+static int hf_cmp_canfd_crc_res;
+static int hf_cmp_canfd_crc_sbc_support;
+static int hf_cmp_canfd_crc_crc_support;
+static int hf_cmp_canfd_err_pos;
+static int hf_cmp_canfd_dlc;
+static int hf_cmp_canfd_data_len;
 
 /* LIN */
 #define CMP_CANFD_PID_PARITY_MASK   0xc0
 #define CMP_CANFD_PID_ID_MASK       0x3f
 
-static int hf_cmp_lin_flags = -1;
-static int hf_cmp_lin_flag_checksum_err = -1;
-static int hf_cmp_lin_flag_col_err = -1;
-static int hf_cmp_lin_flag_parity_err = -1;
-static int hf_cmp_lin_flag_no_slave_res_err = -1;
-static int hf_cmp_lin_flag_sync_err = -1;
-static int hf_cmp_lin_flag_framing_err = -1;
-static int hf_cmp_lin_flag_short_dom_err = -1;
-static int hf_cmp_lin_flag_long_dom_err = -1;
-static int hf_cmp_lin_flag_wup = -1;
-static int hf_cmp_lin_flag_reserved = -1;
-
-static int hf_cmp_lin_reserved = -1;
-static int hf_cmp_lin_pid = -1;
-static int hf_cmp_lin_pid_parity = -1;
-static int hf_cmp_lin_pid_id = -1;
-static int hf_cmp_lin_reserved_2 = -1;
-static int hf_cmp_lin_checksum = -1;
-static int hf_cmp_lin_data_len = -1;
+static int hf_cmp_lin_flags;
+static int hf_cmp_lin_flag_checksum_err;
+static int hf_cmp_lin_flag_col_err;
+static int hf_cmp_lin_flag_parity_err;
+static int hf_cmp_lin_flag_no_slave_res_err;
+static int hf_cmp_lin_flag_sync_err;
+static int hf_cmp_lin_flag_framing_err;
+static int hf_cmp_lin_flag_short_dom_err;
+static int hf_cmp_lin_flag_long_dom_err;
+static int hf_cmp_lin_flag_wup;
+static int hf_cmp_lin_flag_reserved;
+
+static int hf_cmp_lin_reserved;
+static int hf_cmp_lin_pid;
+static int hf_cmp_lin_pid_parity;
+static int hf_cmp_lin_pid_id;
+static int hf_cmp_lin_reserved_2;
+static int hf_cmp_lin_checksum;
+static int hf_cmp_lin_data_len;
 
 /* FlexRay */
 #define CMP_FLEXRAY_FLAGS_NF 0x0004
 
-static int hf_cmp_flexray_flags = -1;
-
-static int hf_cmp_flexray_flag_crc_frame_err = -1;
-static int hf_cmp_flexray_flag_crc_header_err = -1;
-static int hf_cmp_flexray_flag_nf = -1;
-static int hf_cmp_flexray_flag_sf = -1;
-static int hf_cmp_flexray_flag_sync = -1;
-static int hf_cmp_flexray_flag_wus = -1;
-static int hf_cmp_flexray_flag_ppi = -1;
-static int hf_cmp_flexray_flag_cas = -1;
-static int hf_cmp_flexray_flag_reserved = -1;
-
-static int hf_cmp_flexray_reserved = -1;
-static int hf_cmp_flexray_header_crc = -1;
-static int hf_cmp_flexray_frame_id = -1;
-static int hf_cmp_flexray_cycle = -1;
-static int hf_cmp_flexray_frame_crc = -1;
-static int hf_cmp_flexray_reserved_2 = -1;
-static int hf_cmp_flexray_data_len = -1;
+static int hf_cmp_flexray_flags;
+
+static int hf_cmp_flexray_flag_crc_frame_err;
+static int hf_cmp_flexray_flag_crc_header_err;
+static int hf_cmp_flexray_flag_nf;
+static int hf_cmp_flexray_flag_sf;
+static int hf_cmp_flexray_flag_sync;
+static int hf_cmp_flexray_flag_wus;
+static int hf_cmp_flexray_flag_ppi;
+static int hf_cmp_flexray_flag_cas;
+static int hf_cmp_flexray_flag_reserved;
+
+static int hf_cmp_flexray_reserved;
+static int hf_cmp_flexray_header_crc;
+static int hf_cmp_flexray_frame_id;
+static int hf_cmp_flexray_cycle;
+static int hf_cmp_flexray_frame_crc;
+static int hf_cmp_flexray_reserved_2;
+static int hf_cmp_flexray_data_len;
 
 /* UART/RS-232 */
 #define CMP_UART_DATA_DATA_MASK     0x01FF
 
-static int hf_cmp_uart_flags = -1;
+static int hf_cmp_uart_flags;
 
-static int hf_cmp_uart_flag_cl = -1;
-static int hf_cmp_uart_flag_reserved = -1;
+static int hf_cmp_uart_flag_cl;
+static int hf_cmp_uart_flag_reserved;
 
-static int hf_cmp_uart_reserved = -1;
-static int hf_cmp_uart_data_len = -1;
-static int hf_cmp_uart_data = -1;
+static int hf_cmp_uart_reserved;
+static int hf_cmp_uart_data_len;
+static int hf_cmp_uart_data;
 
-static int hf_cmp_uart_data_data = -1;
-static int hf_cmp_uart_data_reserved = -1;
-static int hf_cmp_uart_data_framing_err = -1;
-static int hf_cmp_uart_data_break_condition = -1;
-static int hf_cmp_uart_data_parity_err = -1;
+static int hf_cmp_uart_data_data;
+static int hf_cmp_uart_data_reserved;
+static int hf_cmp_uart_data_framing_err;
+static int hf_cmp_uart_data_break_condition;
+static int hf_cmp_uart_data_parity_err;
 
 /* Analog */
-static int hf_cmp_analog_flags = -1;
+static int hf_cmp_analog_flags;
 
-static int hf_cmp_analog_flag_sample_dt = -1;
-static int hf_cmp_analog_flag_reserved = -1;
+static int hf_cmp_analog_flag_sample_dt;
+static int hf_cmp_analog_flag_reserved;
 
-static int hf_cmp_analog_reserved = -1;
-static int hf_cmp_analog_unit = -1;
-static int hf_cmp_analog_sample_interval = -1;
-static int hf_cmp_analog_sample_scalar = -1;
-static int hf_cmp_analog_sample_offset = -1;
-static int hf_cmp_analog_sample = -1;
+static int hf_cmp_analog_reserved;
+static int hf_cmp_analog_unit;
+static int hf_cmp_analog_sample_interval;
+static int hf_cmp_analog_sample_scalar;
+static int hf_cmp_analog_sample_offset;
+static int hf_cmp_analog_sample;
 
 /* Ethernet */
-static int hf_cmp_eth_flags = -1;
+static int hf_cmp_eth_flags;
 
-static int hf_cmp_eth_flag_fcs_err = -1;
-static int hf_cmp_eth_flag_short_err = -1;
-static int hf_cmp_eth_flag_tx_down = -1;
-static int hf_cmp_eth_flag_collision = -1;
-static int hf_cmp_eth_flag_long_err = -1;
-static int hf_cmp_eth_flag_phy_err = -1;
-static int hf_cmp_eth_flag_truncated = -1;
-static int hf_cmp_eth_flag_fcs_supported = -1;
-static int hf_cmp_eth_flag_reserved = -1;
+static int hf_cmp_eth_flag_fcs_err;
+static int hf_cmp_eth_flag_short_err;
+static int hf_cmp_eth_flag_tx_down;
+static int hf_cmp_eth_flag_collision;
+static int hf_cmp_eth_flag_long_err;
+static int hf_cmp_eth_flag_phy_err;
+static int hf_cmp_eth_flag_truncated;
+static int hf_cmp_eth_flag_fcs_supported;
+static int hf_cmp_eth_flag_reserved;
 
-static int hf_cmp_eth_reserved = -1;
-static int hf_cmp_eth_payload_length = -1;
+static int hf_cmp_eth_reserved;
+static int hf_cmp_eth_payload_length;
 
 /* Control Message Payload Fields */
 /* Data Sink Ready */
-static int hf_cmp_ctrl_msg_device_id = -1;
+static int hf_cmp_ctrl_msg_device_id;
 
 /* User Event */
-static int hf_cmp_ctrl_msg_event_id = -1;
+static int hf_cmp_ctrl_msg_event_id;
 
 /* Vendor specific */
-static int hf_cmp_ctrl_msg_vendor_id = -1;
-static int hf_cmp_ctrl_msg_vendor_payload_type = -1;
+static int hf_cmp_ctrl_msg_vendor_id;
+static int hf_cmp_ctrl_msg_vendor_payload_type;
 
 /* Status Message Payload Fields */
 /* Capture Module Status Message */
-static int hf_cmp_status_msg_cm_uptime_ns = -1;
-static int hf_cmp_status_msg_cm_uptime_s = -1;
-static int hf_cmp_status_msg_gm_identity = -1;
-static int hf_cmp_status_msg_gm_clock_quality = -1;
-static int hf_cmp_status_msg_current_utc_offset = -1;
-static int hf_cmp_status_msg_time_source = -1;
-static int hf_cmp_status_msg_domain_num = -1;
-static int hf_cmp_status_msg_res = -1;
-static int hf_cmp_gptp_flags = -1;
-
-static int hf_cmp_gptp_flags_leap61 = -1;
-static int hf_cmp_gptp_flags_leap59 = -1;
-static int hf_cmp_gptp_flags_cur_utco_valid = -1;
-static int hf_cmp_gptp_flags_ptp_timescale = -1;
-static int hf_cmp_gptp_flags_time_traceable = -1;
-static int hf_cmp_gptp_flags_freq_traceable = -1;
-static int hf_cmp_gptp_flags_reserved = -1;
-
-static int hf_cmp_status_dev_desc_length = -1;
-static int hf_cmp_status_dev_desc = -1;
-static int hf_cmp_status_sn_length = -1;
-static int hf_cmp_status_sn = -1;
-static int hf_cmp_status_hw_ver_length = -1;
-static int hf_cmp_status_hw_ver = -1;
-static int hf_cmp_status_sw_ver_length = -1;
-static int hf_cmp_status_sw_ver = -1;
-static int hf_cmp_status_vendor_data_length = -1;
-static int hf_cmp_status_vendor_data = -1;
+static int hf_cmp_status_msg_cm_uptime_ns;
+static int hf_cmp_status_msg_cm_uptime_s;
+static int hf_cmp_status_msg_gm_identity;
+static int hf_cmp_status_msg_gm_clock_quality;
+static int hf_cmp_status_msg_current_utc_offset;
+static int hf_cmp_status_msg_time_source;
+static int hf_cmp_status_msg_domain_num;
+static int hf_cmp_status_msg_res;
+static int hf_cmp_gptp_flags;
+
+static int hf_cmp_gptp_flags_leap61;
+static int hf_cmp_gptp_flags_leap59;
+static int hf_cmp_gptp_flags_cur_utco_valid;
+static int hf_cmp_gptp_flags_ptp_timescale;
+static int hf_cmp_gptp_flags_time_traceable;
+static int hf_cmp_gptp_flags_freq_traceable;
+static int hf_cmp_gptp_flags_reserved;
+
+static int hf_cmp_status_dev_desc_length;
+static int hf_cmp_status_dev_desc;
+static int hf_cmp_status_sn_length;
+static int hf_cmp_status_sn;
+static int hf_cmp_status_hw_ver_length;
+static int hf_cmp_status_hw_ver;
+static int hf_cmp_status_sw_ver_length;
+static int hf_cmp_status_sw_ver;
+static int hf_cmp_status_vendor_data_length;
+static int hf_cmp_status_vendor_data;
 
 /* Interface Status Message */
-static int hf_cmp_iface_interface = -1;
-static int hf_cmp_iface_iface_id = -1;
-static int hf_cmp_iface_msg_total_rx = -1;
-static int hf_cmp_iface_msg_total_tx = -1;
-static int hf_cmp_iface_msg_dropped_rx = -1;
-static int hf_cmp_iface_msg_dropped_tx = -1;
-static int hf_cmp_iface_errs_total_rx = -1;
-static int hf_cmp_iface_errs_total_tx = -1;
-static int hf_cmp_iface_iface_type = -1;
-static int hf_cmp_iface_iface_status = -1;
-static int hf_cmp_iface_stream_id_cnt = -1;
-static int hf_cmp_iface_reserved = -1;
-
-static int hf_cmp_iface_feat = -1;
-static int hf_cmp_iface_feat_can_pas_ack = -1;
-static int hf_cmp_iface_feat_can_act_ack = -1;
-static int hf_cmp_iface_feat_can_ack_del_err = -1;
-static int hf_cmp_iface_feat_can_crc_del_err = -1;
-static int hf_cmp_iface_feat_can_eof_err = -1;
-static int hf_cmp_iface_feat_can_r0 = -1;
-static int hf_cmp_iface_feat_can_srr_dom = -1;
-
-static int hf_cmp_iface_feat_canfd_pas_ack = -1;
-static int hf_cmp_iface_feat_canfd_act_ack = -1;
-static int hf_cmp_iface_feat_canfd_ack_del_err = -1;
-static int hf_cmp_iface_feat_canfd_crc_del_err = -1;
-static int hf_cmp_iface_feat_canfd_eof_err = -1;
-static int hf_cmp_iface_feat_canfd_rsvd = -1;
-static int hf_cmp_iface_feat_canfd_srr_dom = -1;
-static int hf_cmp_iface_feat_canfd_brs_dom = -1;
-static int hf_cmp_iface_feat_canfd_esi_dom = -1;
-
-static int hf_cmp_iface_feat_lin_sync_err = -1;
-static int hf_cmp_iface_feat_lin_framing_err = -1;
-static int hf_cmp_iface_feat_lin_short_dom_err = -1;
-static int hf_cmp_iface_feat_lin_long_dom_err = -1;
-static int hf_cmp_iface_feat_lin_wup = -1;
-
-static int hf_cmp_iface_feat_eth_too_long = -1;
-static int hf_cmp_iface_feat_eth_phy_err = -1;
-static int hf_cmp_iface_feat_eth_trunc = -1;
-
-static int hf_cmp_iface_stream_ids = -1;
-static int hf_cmp_iface_stream_id = -1;
-static int hf_cmp_iface_vendor_data_len = -1;
-static int hf_cmp_iface_vendor_data = -1;
+static int hf_cmp_iface_interface;
+static int hf_cmp_iface_iface_id;
+static int hf_cmp_iface_msg_total_rx;
+static int hf_cmp_iface_msg_total_tx;
+static int hf_cmp_iface_msg_dropped_rx;
+static int hf_cmp_iface_msg_dropped_tx;
+static int hf_cmp_iface_errs_total_rx;
+static int hf_cmp_iface_errs_total_tx;
+static int hf_cmp_iface_iface_type;
+static int hf_cmp_iface_iface_status;
+static int hf_cmp_iface_stream_id_cnt;
+static int hf_cmp_iface_reserved;
+
+static int hf_cmp_iface_feat;
+static int hf_cmp_iface_feat_can_pas_ack;
+static int hf_cmp_iface_feat_can_act_ack;
+static int hf_cmp_iface_feat_can_ack_del_err;
+static int hf_cmp_iface_feat_can_crc_del_err;
+static int hf_cmp_iface_feat_can_eof_err;
+static int hf_cmp_iface_feat_can_r0;
+static int hf_cmp_iface_feat_can_srr_dom;
+
+static int hf_cmp_iface_feat_canfd_pas_ack;
+static int hf_cmp_iface_feat_canfd_act_ack;
+static int hf_cmp_iface_feat_canfd_ack_del_err;
+static int hf_cmp_iface_feat_canfd_crc_del_err;
+static int hf_cmp_iface_feat_canfd_eof_err;
+static int hf_cmp_iface_feat_canfd_rsvd;
+static int hf_cmp_iface_feat_canfd_srr_dom;
+static int hf_cmp_iface_feat_canfd_brs_dom;
+static int hf_cmp_iface_feat_canfd_esi_dom;
+
+static int hf_cmp_iface_feat_lin_sync_err;
+static int hf_cmp_iface_feat_lin_framing_err;
+static int hf_cmp_iface_feat_lin_short_dom_err;
+static int hf_cmp_iface_feat_lin_long_dom_err;
+static int hf_cmp_iface_feat_lin_wup;
+
+static int hf_cmp_iface_feat_eth_too_long;
+static int hf_cmp_iface_feat_eth_phy_err;
+static int hf_cmp_iface_feat_eth_trunc;
+
+static int hf_cmp_iface_stream_ids;
+static int hf_cmp_iface_stream_id;
+static int hf_cmp_iface_vendor_data_len;
+static int hf_cmp_iface_vendor_data;
 
 /* Configuration Status Message */
-static int hf_cmp_status_msg_config = -1;
+static int hf_cmp_status_msg_config;
 
 /* Data Lost Event Status Message */
-static int hf_cmp_dataloss_data_sink_port = -1;
-static int hf_cmp_dataloss_device_id = -1;
-static int hf_cmp_dataloss_reserved = -1;
-static int hf_cmp_dataloss_stream_id = -1;
-static int hf_cmp_dataloss_last_ssq_value = -1;
-static int hf_cmp_dataloss_current_ssq_value = -1;
+static int hf_cmp_dataloss_data_sink_port;
+static int hf_cmp_dataloss_device_id;
+static int hf_cmp_dataloss_reserved;
+static int hf_cmp_dataloss_stream_id;
+static int hf_cmp_dataloss_last_ssq_value;
+static int hf_cmp_dataloss_current_ssq_value;
 
 /* Time Sync Lost Event Status Message */
-static int hf_cmp_timeloss_port_nr = -1;
-static int hf_cmp_timeloss_device_id = -1;
-static int hf_cmp_timeloss_error_flags = -1;
+static int hf_cmp_timeloss_port_nr;
+static int hf_cmp_timeloss_device_id;
+static int hf_cmp_timeloss_error_flags;
 
-static int hf_cmp_timeloss_error_flags_ts = -1;
-static int hf_cmp_timeloss_error_flags_insync = -1;
-static int hf_cmp_timeloss_error_flags_delta = -1;
-static int hf_cmp_timeloss_error_flags_reserved = -1;
+static int hf_cmp_timeloss_error_flags_ts;
+static int hf_cmp_timeloss_error_flags_insync;
+static int hf_cmp_timeloss_error_flags_delta;
+static int hf_cmp_timeloss_error_flags_reserved;
 
 /* Vendor Specific */
-static int hf_cmp_status_msg_vendor_specific = -1;
+static int hf_cmp_status_msg_vendor_specific;
 
 /* Protocol trees */
-static gint ett_asam_cmp = -1;
-static gint ett_asam_cmp_header = -1;
-static gint ett_asam_cmp_timestamp = -1;
-static gint ett_asam_cmp_common_flags = -1;
-static gint ett_asam_cmp_payload = -1;
-static gint ett_asam_cmp_payload_flags = -1;
-static gint ett_asam_cmp_lin_pid = -1;
-static gint ett_asam_cmp_can_id = -1;
-static gint ett_asam_cmp_can_crc = -1;
-static gint ett_asam_cmp_uart_data = -1;
-static gint ett_asam_cmp_status_cm_flags = -1;
-static gint ett_asam_cmp_status_cm_uptime = -1;
-static gint ett_asam_cmp_status_timeloss_flags = -1;
-static gint ett_asam_cmp_status_interface = -1;
-static gint ett_asam_cmp_status_feature_support = -1;
-static gint ett_asam_cmp_status_stream_ids = -1;
+static gint ett_asam_cmp;
+static gint ett_asam_cmp_header;
+static gint ett_asam_cmp_timestamp;
+static gint ett_asam_cmp_common_flags;
+static gint ett_asam_cmp_payload;
+static gint ett_asam_cmp_payload_flags;
+static gint ett_asam_cmp_lin_pid;
+static gint ett_asam_cmp_can_id;
+static gint ett_asam_cmp_can_crc;
+static gint ett_asam_cmp_uart_data;
+static gint ett_asam_cmp_status_cm_flags;
+static gint ett_asam_cmp_status_cm_uptime;
+static gint ett_asam_cmp_status_timeloss_flags;
+static gint ett_asam_cmp_status_interface;
+static gint ett_asam_cmp_status_feature_support;
+static gint ett_asam_cmp_status_stream_ids;
 
 /* General */
 #define CMP_HEADER_LEN                         8
@@ -742,8 +742,8 @@ UAT_CSTRING_CB_DEF(asam_cmp_interfaces, name, interface_config_t)
 UAT_HEX_CB_DEF(asam_cmp_interfaces, bus_id, interface_config_t)
 
 /*** expert info items ***/
-static expert_field ei_asam_cmp_length_mismatch = EI_INIT;
-static expert_field ei_asam_cmp_unsupported_crc_not_zero = EI_INIT;
+static expert_field ei_asam_cmp_length_mismatch;
+static expert_field ei_asam_cmp_unsupported_crc_not_zero;
 
 /* generic UAT */
 static void
diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c
index f33f4eedb1..2f7aca4a55 100644
--- a/epan/dissectors/packet-asap.c
+++ b/epan/dissectors/packet-asap.c
@@ -38,56 +38,56 @@ static dissector_handle_t asap_handle;
 
 /* Initialize the protocol and registered fields */
 static int asap_tap = -1;
-static int proto_asap = -1;
-static int hf_cause_code = -1;
-static int hf_cause_length = -1;
-static int hf_cause_info = -1;
-static int hf_cause_padding = -1;
-static int hf_message_type = -1;
-static int hf_message_flags = -1;
-static int hf_message_length = -1;
-static int hf_parameter_type = -1;
-static int hf_parameter_length = -1;
-static int hf_parameter_value = -1;
-static int hf_parameter_padding = -1;
-static int hf_parameter_ipv4_address = -1;
-static int hf_parameter_ipv6_address = -1;
-static int hf_dccp_port = -1;
-static int hf_dccp_reserved = -1;
-static int hf_dccp_service_code = -1;
-static int hf_sctp_port = -1;
-static int hf_transport_use = -1;
-static int hf_tcp_port = -1;
-static int hf_udp_port = -1;
-static int hf_udp_reserved = -1;
-static int hf_udp_lite_port = -1;
-static int hf_udp_lite_reserved = -1;
-static int hf_policy_type = -1;
-static int hf_policy_value = -1;
-static int hf_policy_weight = -1;
-static int hf_policy_priority = -1;
-static int hf_policy_load = -1;
-static int hf_policy_degradation = -1;
-static int hf_policy_loaddpf = -1;
-static int hf_policy_weightdpf = -1;
-static int hf_policy_distance = -1;
-static int hf_pool_handle = -1;
-static int hf_pe_pe_identifier = -1;
-static int hf_home_enrp_id = -1;
-static int hf_reg_life = -1;
-static int hf_server_identifier = -1;
-static int hf_cookie = -1;
-static int hf_pe_identifier = -1;
-static int hf_pe_checksum = -1;
-static int hf_hropt_items = -1;
-static int hf_home_enrp_server_bit = -1;
-static int hf_reject_bit = -1;
+static int proto_asap;
+static int hf_cause_code;
+static int hf_cause_length;
+static int hf_cause_info;
+static int hf_cause_padding;
+static int hf_message_type;
+static int hf_message_flags;
+static int hf_message_length;
+static int hf_parameter_type;
+static int hf_parameter_length;
+static int hf_parameter_value;
+static int hf_parameter_padding;
+static int hf_parameter_ipv4_address;
+static int hf_parameter_ipv6_address;
+static int hf_dccp_port;
+static int hf_dccp_reserved;
+static int hf_dccp_service_code;
+static int hf_sctp_port;
+static int hf_transport_use;
+static int hf_tcp_port;
+static int hf_udp_port;
+static int hf_udp_reserved;
+static int hf_udp_lite_port;
+static int hf_udp_lite_reserved;
+static int hf_policy_type;
+static int hf_policy_value;
+static int hf_policy_weight;
+static int hf_policy_priority;
+static int hf_policy_load;
+static int hf_policy_degradation;
+static int hf_policy_loaddpf;
+static int hf_policy_weightdpf;
+static int hf_policy_distance;
+static int hf_pool_handle;
+static int hf_pe_pe_identifier;
+static int hf_home_enrp_id;
+static int hf_reg_life;
+static int hf_server_identifier;
+static int hf_cookie;
+static int hf_pe_identifier;
+static int hf_pe_checksum;
+static int hf_hropt_items;
+static int hf_home_enrp_server_bit;
+static int hf_reject_bit;
 
 /* Initialize the subtree pointers */
-static gint ett_asap = -1;
-static gint ett_asap_parameter = -1;
-static gint ett_asap_cause = -1;
-static gint ett_asap_flags = -1;
+static gint ett_asap;
+static gint ett_asap_parameter;
+static gint ett_asap_cause;
+static gint ett_asap_flags;
 
 static guint64 asap_total_msgs = 0;
 static guint64 asap_total_bytes = 0;
diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c
index ed683dd507..6593257171 100644
--- a/epan/dissectors/packet-ascend.c
+++ b/epan/dissectors/packet-ascend.c
@@ -15,15 +15,15 @@
 void proto_register_ascend(void);
 void proto_reg_handoff_ascend(void);
 
-static int proto_ascend  = -1;
-static int hf_link_type  = -1;
-static int hf_session_id = -1;
-static int hf_called_number = -1;
-static int hf_chunk      = -1;
-static int hf_task       = -1;
-static int hf_user_name  = -1;
-
-static gint ett_raw = -1;
+static int proto_ascend;
+static int hf_link_type;
+static int hf_session_id;
+static int hf_called_number;
+static int hf_chunk;
+static int hf_task;
+static int hf_user_name;
+
+static gint ett_raw;
 
 static const value_string encaps_vals[] = {
   {ASCEND_PFX_WDS_X,  "PPP Transmit"               },
diff --git a/epan/dissectors/packet-asf.c b/epan/dissectors/packet-asf.c
index 63895e256f..10ebf1eb7e 100644
--- a/epan/dissectors/packet-asf.c
+++ b/epan/dissectors/packet-asf.c
@@ -31,27 +31,27 @@ static dissector_handle_t asf_handle;
 
 #define RMCP_CLASS_ASF 0x06
 
-static int proto_asf = -1;
-static int hf_asf_iana = -1;
-static int hf_asf_type = -1;
-static int hf_asf_tag = -1;
-static int hf_asf_len = -1;
-static int hf_asf_rssp_status_code = -1;
-static int hf_asf_mgt_console_id = -1;
-static int hf_asf_client_id = -1;
-static int hf_asf_payload = -1;
-static int hf_asf_payload_type = -1;
-static int hf_asf_payload_len = -1;
-static int hf_asf_payload_data = -1;
-static int hf_asf_auth_alg = -1;
-static int hf_asf_integrity_alg = -1;
-static int hf_asf_reserved = -1;
-
-static gint ett_asf = -1;
-static gint ett_asf_payload = -1;
-static gint ett_asf_alg_payload = -1;
-
-static expert_field ei_asf_payload_too_short = EI_INIT;
+static int proto_asf;
+static int hf_asf_iana;
+static int hf_asf_type;
+static int hf_asf_tag;
+static int hf_asf_len;
+static int hf_asf_rssp_status_code;
+static int hf_asf_mgt_console_id;
+static int hf_asf_client_id;
+static int hf_asf_payload;
+static int hf_asf_payload_type;
+static int hf_asf_payload_len;
+static int hf_asf_payload_data;
+static int hf_asf_auth_alg;
+static int hf_asf_integrity_alg;
+static int hf_asf_reserved;
+
+static gint ett_asf;
+static gint ett_asf_payload;
+static gint ett_asf_alg_payload;
+
+static expert_field ei_asf_payload_too_short;
 
 
 #define ASF_TYPE_RESET                  0x10
diff --git a/epan/dissectors/packet-asphodel.c b/epan/dissectors/packet-asphodel.c
index c27e2e8660..fe1cf7b542 100644
--- a/epan/dissectors/packet-asphodel.c
+++ b/epan/dissectors/packet-asphodel.c
@@ -175,52 +175,52 @@ static const true_false_string notify_connect_disconnect = {
     "Disconnect"
 };
 
-static int proto_asphodel = -1;
+static int proto_asphodel;
 
 // asphodel inquiry fields
-static int hf_asphodel_version = -1;
-static int hf_asphodel_identifier = -1;
+static int hf_asphodel_version;
+static int hf_asphodel_identifier;
 
 // asphodel response fields
-static int hf_asphodel_tcp_version = -1;
-static int hf_asphodel_connected = -1;
-static int hf_asphodel_max_incoming_param_length = -1;
-static int hf_asphodel_max_outgoing_param_length = -1;
-static int hf_asphodel_stream_packet_length = -1;
-static int hf_asphodel_protocol_type = -1;
-static int hf_asphodel_protocol_type_rf_power = -1;
-static int hf_asphodel_protocol_type_radio = -1;
-static int hf_asphodel_protocol_type_remote = -1;
-static int hf_asphodel_protocol_type_bootloader = -1;
-static int hf_asphodel_serial_number = -1;
-static int hf_asphodel_board_rev = -1;
-static int hf_asphodel_board_type = -1;
-static int hf_asphodel_build_info = -1;
-static int hf_asphodel_build_date = -1;
-static int hf_asphodel_user_tag1 = -1;
-static int hf_asphodel_user_tag2 = -1;
-static int hf_asphodel_remote_max_incoming_param_length = -1;
-static int hf_asphodel_remote_max_outgoing_param_length = -1;
-static int hf_asphodel_remote_stream_packet_length = -1;
+static int hf_asphodel_tcp_version;
+static int hf_asphodel_connected;
+static int hf_asphodel_max_incoming_param_length;
+static int hf_asphodel_max_outgoing_param_length;
+static int hf_asphodel_stream_packet_length;
+static int hf_asphodel_protocol_type;
+static int hf_asphodel_protocol_type_rf_power;
+static int hf_asphodel_protocol_type_radio;
+static int hf_asphodel_protocol_type_remote;
+static int hf_asphodel_protocol_type_bootloader;
+static int hf_asphodel_serial_number;
+static int hf_asphodel_board_rev;
+static int hf_asphodel_board_type;
+static int hf_asphodel_build_info;
+static int hf_asphodel_build_date;
+static int hf_asphodel_user_tag1;
+static int hf_asphodel_user_tag2;
+static int hf_asphodel_remote_max_incoming_param_length;
+static int hf_asphodel_remote_max_outgoing_param_length;
+static int hf_asphodel_remote_stream_packet_length;
 
 // asphodel tcp fields
-static int hf_asphodel_length = -1;
-static int hf_asphodel_type = -1;
-static int hf_asphodel_seq = -1;
-static int hf_asphodel_cmd = -1;
-static int hf_asphodel_err_code = -1;
-static int hf_asphodel_params = -1;
-static int hf_asphodel_stream_data = -1;
-static int hf_asphodel_notify = -1;
-static int hf_asphodel_notify_serial = -1;
-
-static gint ett_asphodel = -1;
-static gint ett_asphodel_protocol_type = -1;
-
-static expert_field ei_asphodel_bad_param_length = EI_INIT;
-static expert_field ei_asphodel_bad_length = EI_INIT;
-static expert_field ei_asphodel_cmd_error = EI_INIT;
-static expert_field ei_asphodel_unknown_type = EI_INIT;
+static int hf_asphodel_length;
+static int hf_asphodel_type;
+static int hf_asphodel_seq;
+static int hf_asphodel_cmd;
+static int hf_asphodel_err_code;
+static int hf_asphodel_params;
+static int hf_asphodel_stream_data;
+static int hf_asphodel_notify;
+static int hf_asphodel_notify_serial;
+
+static gint ett_asphodel;
+static gint ett_asphodel_protocol_type;
+
+static expert_field ei_asphodel_bad_param_length;
+static expert_field ei_asphodel_bad_length;
+static expert_field ei_asphodel_cmd_error;
+static expert_field ei_asphodel_unknown_type;
 
 static dissector_handle_t asphodel_inquiry_handle;
 static dissector_handle_t asphodel_response_handle;
diff --git a/epan/dissectors/packet-assa_r3.c b/epan/dissectors/packet-assa_r3.c
index a50f3fee2b..09a43a6f3d 100644
--- a/epan/dissectors/packet-assa_r3.c
+++ b/epan/dissectors/packet-assa_r3.c
@@ -1024,726 +1024,726 @@ userType_e;
 /*
  *  Wireshark ID of the R3 protocol
  */
-static gint proto_r3 = -1;
+static gint proto_r3;
 
 /*
  *  Packet variables
  */
-static gint hf_r3_tildex3ds = -1;           /* Got ~~~ds */
-
-static gint hf_r3_header = -1;              /* Packet header */
-static gint hf_r3_payload = -1;             /* Packet payload */
-static gint hf_r3_tail = -1;                /* Packet tail */
-
-static gint hf_r3_sigil = -1;               /* Packet sigil */
-static gint hf_r3_address = -1;             /* Packet address */
-static gint hf_r3_packetnumber = -1;        /* Packet number */
-static gint hf_r3_packetlength = -1;        /* Packet length */
-static gint hf_r3_encryption = -1;          /* Packet encryption scheme */
-static gint hf_r3_crc = -1;                 /* Packet CRC */
-static gint hf_r3_crc_bad = -1;             /* Packet CRC bad (for filtering) */
-static gint hf_r3_xor = -1;                 /* Packet Xor */
-static gint hf_r3_xor_bad = -1;             /* Packet Xor bad (for filtering) */
-
-static gint hf_r3_commandlength = -1;       /* Command length */
-static gint hf_r3_command = -1;             /* Command (cmdCommand_e) */
-static gint hf_r3_commanddata = -1;         /* Command data (not always present) */
-
-static gint hf_r3_commandmfglength = -1;    /* Mfg Command length */
-static gint hf_r3_commandmfg = -1;          /* Mfg Command (cmdCommand_e) */
-/*static gint hf_r3_commandmfgdata = -1;*/    /* Mfg Command data (not always present) */
-
-static gint hf_r3_responselength = -1;      /* Response length */
-static gint hf_r3_responsecommand = -1;     /* Response command */
-static gint hf_r3_responsetype = -1;        /* Response type (responseType_e) */
-static gint hf_r3_responsetocommand = -1;   /* Response to command (cmdCommand_e) */
-/*static gint hf_r3_responsedata = -1;*/       /* Response data (not always present) */
-
-static gint hf_r3_upstreamcommand = -1;
-
-static gint hf_r3_upstreamfield = -1;       /* Upstream field (length + type + data) */
-static gint hf_r3_upstreamfieldlength = -1; /* Upstream field length */
-static gint hf_r3_upstreamfieldtype = -1;   /* Upstream field type (upstreamField_e) */
-/*static gint hf_r3_upstreamfielddatalen = -1;*/         /* Upstream field data length */
-static gint hf_r3_upstreamfielderror = -1;  /* Upstream field is unknown type */
+static gint hf_r3_tildex3ds;           /* Got ~~~ds */
+
+static gint hf_r3_header;              /* Packet header */
+static gint hf_r3_payload;             /* Packet payload */
+static gint hf_r3_tail;                /* Packet tail */
+
+static gint hf_r3_sigil;               /* Packet sigil */
+static gint hf_r3_address;             /* Packet address */
+static gint hf_r3_packetnumber;        /* Packet number */
+static gint hf_r3_packetlength;        /* Packet length */
+static gint hf_r3_encryption;          /* Packet encryption scheme */
+static gint hf_r3_crc;                 /* Packet CRC */
+static gint hf_r3_crc_bad;             /* Packet CRC bad (for filtering) */
+static gint hf_r3_xor;                 /* Packet Xor */
+static gint hf_r3_xor_bad;             /* Packet Xor bad (for filtering) */
+
+static gint hf_r3_commandlength;       /* Command length */
+static gint hf_r3_command;             /* Command (cmdCommand_e) */
+static gint hf_r3_commanddata;         /* Command data (not always present) */
+
+static gint hf_r3_commandmfglength;    /* Mfg Command length */
+static gint hf_r3_commandmfg;          /* Mfg Command (cmdCommand_e) */
+/*static gint hf_r3_commandmfgdata;*/    /* Mfg Command data (not always present) */
+
+static gint hf_r3_responselength;      /* Response length */
+static gint hf_r3_responsecommand;     /* Response command */
+static gint hf_r3_responsetype;        /* Response type (responseType_e) */
+static gint hf_r3_responsetocommand;   /* Response to command (cmdCommand_e) */
+/*static gint hf_r3_responsedata;*/       /* Response data (not always present) */
+
+static gint hf_r3_upstreamcommand;
+
+static gint hf_r3_upstreamfield;       /* Upstream field (length + type + data) */
+static gint hf_r3_upstreamfieldlength; /* Upstream field length */
+static gint hf_r3_upstreamfieldtype;   /* Upstream field type (upstreamField_e) */
+/*static gint hf_r3_upstreamfielddatalen;*/         /* Upstream field data length */
+static gint hf_r3_upstreamfielderror;  /* Upstream field is unknown type */
 static gint hf_r3_upstreamfieldarray[UPSTREAMFIELD_LAST];
 
-static gint hf_r3_configitems = -1;
-static gint hf_r3_configitem = -1;
-/*static gint hf_r3_configfield = -1;*/
-static gint hf_r3_configitemlength = -1;
-static gint hf_r3_configitemtype = -1;
-static gint hf_r3_configitemdata = -1;
-static gint hf_r3_configitemdata_bool = -1;
-static gint hf_r3_configitemdata_8 = -1;
-static gint hf_r3_configitemdata_16 = -1;
-static gint hf_r3_configitemdata_32 = -1;
-static gint hf_r3_configitemdata_string = -1;
-
-static gint hf_r3_timezonearray0 = -1;
-static gint hf_r3_timezonearray1 = -1;
-static gint hf_r3_timezonearray2 = -1;
-static gint hf_r3_timezonearray3 = -1;
-static gint hf_r3_timezonearray4 = -1;
-static gint hf_r3_timezonearray5 = -1;
-static gint hf_r3_timezonearray6 = -1;
-static gint hf_r3_timezonearray7 = -1;
-static gint hf_r3_timezonearray8 = -1;
-static gint hf_r3_timezonearray9 = -1;
-static gint hf_r3_timezonearray10 = -1;
-static gint hf_r3_timezonearray11 = -1;
-static gint hf_r3_timezonearray12 = -1;
-static gint hf_r3_timezonearray13 = -1;
-static gint hf_r3_timezonearray14 = -1;
-static gint hf_r3_timezonearray15 = -1;
-static gint hf_r3_timezonearray16 = -1;
-static gint hf_r3_timezonearray17 = -1;
-static gint hf_r3_timezonearray18 = -1;
-static gint hf_r3_timezonearray19 = -1;
-static gint hf_r3_timezonearray20 = -1;
-static gint hf_r3_timezonearray21 = -1;
-static gint hf_r3_timezonearray22 = -1;
-static gint hf_r3_timezonearray23 = -1;
-static gint hf_r3_timezonearray24 = -1;
-static gint hf_r3_timezonearray25 = -1;
-static gint hf_r3_timezonearray26 = -1;
-static gint hf_r3_timezonearray27 = -1;
-static gint hf_r3_timezonearray28 = -1;
-static gint hf_r3_timezonearray29 = -1;
-static gint hf_r3_timezonearray30 = -1;
-static gint hf_r3_timezonearray31 = -1;
-
-static gint hf_r3_expireon_year = -1;
-static gint hf_r3_expireon_month = -1;
-static gint hf_r3_expireon_day = -1;
-
-static gint hf_r3_datetime_year = -1;
-static gint hf_r3_datetime_month = -1;
-static gint hf_r3_datetime_day = -1;
-static gint hf_r3_datetime_dow = -1;
-static gint hf_r3_datetime_hours = -1;
-static gint hf_r3_datetime_minutes = -1;
-static gint hf_r3_datetime_seconds = -1;
-static gint hf_r3_datetime_dst = -1;
-
-static gint hf_r3_eventlog_recordnumber = -1;
-static gint hf_r3_eventlog_year = -1;
-static gint hf_r3_eventlog_month = -1;
-static gint hf_r3_eventlog_day = -1;
-static gint hf_r3_eventlog_hour = -1;
-static gint hf_r3_eventlog_minute = -1;
-static gint hf_r3_eventlog_second = -1;
-static gint hf_r3_eventlog_usernumber = -1;
-static gint hf_r3_eventlog_event = -1;
-
-static gint hf_r3_declinedlog_recordnumber = -1;
-static gint hf_r3_declinedlog_year = -1;
-static gint hf_r3_declinedlog_month = -1;
-static gint hf_r3_declinedlog_day = -1;
-static gint hf_r3_declinedlog_hour = -1;
-static gint hf_r3_declinedlog_minute = -1;
-static gint hf_r3_declinedlog_second = -1;
-static gint hf_r3_declinedlog_usernumber = -1;
-static gint hf_r3_declinedlog_cred1type = -1;
-static gint hf_r3_declinedlog_cred2type = -1;
-static gint hf_r3_declinedlog_cred1 = -1;
-static gint hf_r3_declinedlog_cred2 = -1;
-
-static gint hf_r3_alarmlog_recordnumber = -1;
-static gint hf_r3_alarmlog_year = -1;
-static gint hf_r3_alarmlog_month = -1;
-static gint hf_r3_alarmlog_day = -1;
-static gint hf_r3_alarmlog_hour = -1;
-static gint hf_r3_alarmlog_minute = -1;
-static gint hf_r3_alarmlog_second = -1;
-static gint hf_r3_alarmlog_id = -1;
-static gint hf_r3_alarmlog_usernumber = -1;
-
-static gint hf_r3_debugmsg = -1;
-
-static gint hf_r3_setdate_year = -1;
-static gint hf_r3_setdate_month = -1;
-static gint hf_r3_setdate_day = -1;
-static gint hf_r3_setdate_dow = -1;
-static gint hf_r3_setdate_hours = -1;
-static gint hf_r3_setdate_minutes = -1;
-static gint hf_r3_setdate_seconds = -1;
-
-static gint hf_r3_deleteusers = -1;
-
-static gint hf_r3_defineexception_number = -1;
-static gint hf_r3_defineexception_startdate_month = -1;
-static gint hf_r3_defineexception_startdate_day = -1;
-static gint hf_r3_defineexception_startdate_hours = -1;
-static gint hf_r3_defineexception_startdate_minutes = -1;
-static gint hf_r3_defineexception_enddate_month = -1;
-static gint hf_r3_defineexception_enddate_day = -1;
-static gint hf_r3_defineexception_enddate_hours = -1;
-static gint hf_r3_defineexception_enddate_minutes = -1;
-
-static gint hf_r3_defineexceptiongroup_number = -1;
-static gint hf_r3_defineexceptiongroup_bits = -1;
-
-static gint hf_r3_definecalendar_number = -1;
-static gint hf_r3_definecalendar_bits = -1;
-
-static gint hf_r3_definetimezone_number = -1;
-static gint hf_r3_definetimezone_starttime_hours = -1;
-static gint hf_r3_definetimezone_starttime_minutes = -1;
-static gint hf_r3_definetimezone_endtime_hours = -1;
-static gint hf_r3_definetimezone_endtime_minutes = -1;
-static gint hf_r3_definetimezone_daymap = -1;
-static gint hf_r3_definetimezone_daymap0 = -1;
-static gint hf_r3_definetimezone_daymap1 = -1;
-static gint hf_r3_definetimezone_daymap2 = -1;
-static gint hf_r3_definetimezone_daymap3 = -1;
-static gint hf_r3_definetimezone_daymap4 = -1;
-static gint hf_r3_definetimezone_daymap5 = -1;
-static gint hf_r3_definetimezone_daymap6 = -1;
-static gint hf_r3_definetimezone_exceptiongroup = -1;
-static gint hf_r3_definetimezone_mode = -1;
-static gint hf_r3_definetimezone_calendar = -1;
-
-static gint hf_r3_rmtauthretry_sequence = -1;
-static gint hf_r3_rmtauthretry_retry = -1;
-
-static gint hf_r3_eventlogdump_starttime_year = -1;
-static gint hf_r3_eventlogdump_starttime_month = -1;
-static gint hf_r3_eventlogdump_starttime_day = -1;
-static gint hf_r3_eventlogdump_starttime_hours = -1;
-static gint hf_r3_eventlogdump_starttime_minutes = -1;
-static gint hf_r3_eventlogdump_endtime_year = -1;
-static gint hf_r3_eventlogdump_endtime_month = -1;
-static gint hf_r3_eventlogdump_endtime_day = -1;
-static gint hf_r3_eventlogdump_endtime_hours = -1;
-static gint hf_r3_eventlogdump_endtime_minutes = -1;
-static gint hf_r3_eventlogdump_user = -1;
-
-static gint hf_r3_declinedlogdump_starttime_year = -1;
-static gint hf_r3_declinedlogdump_starttime_month = -1;
-static gint hf_r3_declinedlogdump_starttime_day = -1;
-static gint hf_r3_declinedlogdump_starttime_hours = -1;
-static gint hf_r3_declinedlogdump_starttime_minutes = -1;
-static gint hf_r3_declinedlogdump_endtime_year = -1;
-static gint hf_r3_declinedlogdump_endtime_month = -1;
-static gint hf_r3_declinedlogdump_endtime_day = -1;
-static gint hf_r3_declinedlogdump_endtime_hours = -1;
-static gint hf_r3_declinedlogdump_endtime_minutes = -1;
-
-static gint hf_r3_alarmlogdump_starttime_year = -1;
-static gint hf_r3_alarmlogdump_starttime_month = -1;
-static gint hf_r3_alarmlogdump_starttime_day = -1;
-static gint hf_r3_alarmlogdump_starttime_hours = -1;
-static gint hf_r3_alarmlogdump_starttime_minutes = -1;
-static gint hf_r3_alarmlogdump_endtime_year = -1;
-static gint hf_r3_alarmlogdump_endtime_month = -1;
-static gint hf_r3_alarmlogdump_endtime_day = -1;
-static gint hf_r3_alarmlogdump_endtime_hours = -1;
-static gint hf_r3_alarmlogdump_endtime_minutes = -1;
-
-static gint hf_r3_nvramclearoptions = -1;
-static gint hf_r3_nvramclearoptions0 = -1;
-static gint hf_r3_nvramclearoptions1 = -1;
-static gint hf_r3_nvramclearoptions2 = -1;
-static gint hf_r3_nvramclearoptions3 = -1;
-static gint hf_r3_nvramclearoptions4 = -1;
-static gint hf_r3_nvramclearoptions5 = -1;
-static gint hf_r3_nvramclearoptions6 = -1;
-static gint hf_r3_nvramclearoptions7 = -1;
-static gint hf_r3_nvramclearoptions8 = -1;
-static gint hf_r3_nvramclearoptions9 = -1;
-static gint hf_r3_nvramclearoptions10 = -1;
-static gint hf_r3_nvramclearoptions11 = -1;
-static gint hf_r3_nvramclearoptions12 = -1;
-static gint hf_r3_nvramclearoptions13 = -1;
-static gint hf_r3_nvramclearoptions14 = -1;
-static gint hf_r3_nvramclearoptions15 = -1;
-
-static gint hf_r3_writeeventlog_user = -1;
-static gint hf_r3_writeeventlog_event = -1;
-
-static gint hf_r3_powertableselection = -1;
-
-static gint hf_r3_filter_type = -1;
-static gint hf_r3_filter_list = -1;
-
-static gint hf_r3_alarm_length = -1;
-static gint hf_r3_alarm_id = -1;
-static gint hf_r3_alarm_state = -1;
-
-static gint hf_r3_dpac_action = -1;
-static gint hf_r3_dpac_waittime = -1;
-static gint hf_r3_dpac_command = -1;
-
-static gint hf_r3_dpacreply_stuff = -1;
-static gint hf_r3_dpacreply_length = -1;
-static gint hf_r3_dpacreply_reply = -1;
-
-static gint hf_r3_mfgfield_length = -1;
-static gint hf_r3_mfgfield = -1;
-/*static gint hf_r3_mfgfield_data = -1;*/
-
-static gint hf_r3_mfgsetserialnumber = -1;
-static gint hf_r3_mfgsetcryptkey = -1;
-static gint hf_r3_mfgdumpnvram = -1;
-static gint hf_r3_mfgremoteunlock = -1;
-static gint hf_r3_mfgtestpreserve = -1;
+static gint hf_r3_configitems;
+static gint hf_r3_configitem;
+/*static gint hf_r3_configfield;*/
+static gint hf_r3_configitemlength;
+static gint hf_r3_configitemtype;
+static gint hf_r3_configitemdata;
+static gint hf_r3_configitemdata_bool;
+static gint hf_r3_configitemdata_8;
+static gint hf_r3_configitemdata_16;
+static gint hf_r3_configitemdata_32;
+static gint hf_r3_configitemdata_string;
+
+static gint hf_r3_timezonearray0;
+static gint hf_r3_timezonearray1;
+static gint hf_r3_timezonearray2;
+static gint hf_r3_timezonearray3;
+static gint hf_r3_timezonearray4;
+static gint hf_r3_timezonearray5;
+static gint hf_r3_timezonearray6;
+static gint hf_r3_timezonearray7;
+static gint hf_r3_timezonearray8;
+static gint hf_r3_timezonearray9;
+static gint hf_r3_timezonearray10;
+static gint hf_r3_timezonearray11;
+static gint hf_r3_timezonearray12;
+static gint hf_r3_timezonearray13;
+static gint hf_r3_timezonearray14;
+static gint hf_r3_timezonearray15;
+static gint hf_r3_timezonearray16;
+static gint hf_r3_timezonearray17;
+static gint hf_r3_timezonearray18;
+static gint hf_r3_timezonearray19;
+static gint hf_r3_timezonearray20;
+static gint hf_r3_timezonearray21;
+static gint hf_r3_timezonearray22;
+static gint hf_r3_timezonearray23;
+static gint hf_r3_timezonearray24;
+static gint hf_r3_timezonearray25;
+static gint hf_r3_timezonearray26;
+static gint hf_r3_timezonearray27;
+static gint hf_r3_timezonearray28;
+static gint hf_r3_timezonearray29;
+static gint hf_r3_timezonearray30;
+static gint hf_r3_timezonearray31;
+
+static gint hf_r3_expireon_year;
+static gint hf_r3_expireon_month;
+static gint hf_r3_expireon_day;
+
+static gint hf_r3_datetime_year;
+static gint hf_r3_datetime_month;
+static gint hf_r3_datetime_day;
+static gint hf_r3_datetime_dow;
+static gint hf_r3_datetime_hours;
+static gint hf_r3_datetime_minutes;
+static gint hf_r3_datetime_seconds;
+static gint hf_r3_datetime_dst;
+
+static gint hf_r3_eventlog_recordnumber;
+static gint hf_r3_eventlog_year;
+static gint hf_r3_eventlog_month;
+static gint hf_r3_eventlog_day;
+static gint hf_r3_eventlog_hour;
+static gint hf_r3_eventlog_minute;
+static gint hf_r3_eventlog_second;
+static gint hf_r3_eventlog_usernumber;
+static gint hf_r3_eventlog_event;
+
+static gint hf_r3_declinedlog_recordnumber;
+static gint hf_r3_declinedlog_year;
+static gint hf_r3_declinedlog_month;
+static gint hf_r3_declinedlog_day;
+static gint hf_r3_declinedlog_hour;
+static gint hf_r3_declinedlog_minute;
+static gint hf_r3_declinedlog_second;
+static gint hf_r3_declinedlog_usernumber;
+static gint hf_r3_declinedlog_cred1type;
+static gint hf_r3_declinedlog_cred2type;
+static gint hf_r3_declinedlog_cred1;
+static gint hf_r3_declinedlog_cred2;
+
+static gint hf_r3_alarmlog_recordnumber;
+static gint hf_r3_alarmlog_year;
+static gint hf_r3_alarmlog_month;
+static gint hf_r3_alarmlog_day;
+static gint hf_r3_alarmlog_hour;
+static gint hf_r3_alarmlog_minute;
+static gint hf_r3_alarmlog_second;
+static gint hf_r3_alarmlog_id;
+static gint hf_r3_alarmlog_usernumber;
+
+static gint hf_r3_debugmsg;
+
+static gint hf_r3_setdate_year;
+static gint hf_r3_setdate_month;
+static gint hf_r3_setdate_day;
+static gint hf_r3_setdate_dow;
+static gint hf_r3_setdate_hours;
+static gint hf_r3_setdate_minutes;
+static gint hf_r3_setdate_seconds;
+
+static gint hf_r3_deleteusers;
+
+static gint hf_r3_defineexception_number;
+static gint hf_r3_defineexception_startdate_month;
+static gint hf_r3_defineexception_startdate_day;
+static gint hf_r3_defineexception_startdate_hours;
+static gint hf_r3_defineexception_startdate_minutes;
+static gint hf_r3_defineexception_enddate_month;
+static gint hf_r3_defineexception_enddate_day;
+static gint hf_r3_defineexception_enddate_hours;
+static gint hf_r3_defineexception_enddate_minutes;
+
+static gint hf_r3_defineexceptiongroup_number;
+static gint hf_r3_defineexceptiongroup_bits;
+
+static gint hf_r3_definecalendar_number;
+static gint hf_r3_definecalendar_bits;
+
+static gint hf_r3_definetimezone_number;
+static gint hf_r3_definetimezone_starttime_hours;
+static gint hf_r3_definetimezone_starttime_minutes;
+static gint hf_r3_definetimezone_endtime_hours;
+static gint hf_r3_definetimezone_endtime_minutes;
+static gint hf_r3_definetimezone_daymap;
+static gint hf_r3_definetimezone_daymap0;
+static gint hf_r3_definetimezone_daymap1;
+static gint hf_r3_definetimezone_daymap2;
+static gint hf_r3_definetimezone_daymap3;
+static gint hf_r3_definetimezone_daymap4;
+static gint hf_r3_definetimezone_daymap5;
+static gint hf_r3_definetimezone_daymap6;
+static gint hf_r3_definetimezone_exceptiongroup;
+static gint hf_r3_definetimezone_mode;
+static gint hf_r3_definetimezone_calendar;
+
+static gint hf_r3_rmtauthretry_sequence;
+static gint hf_r3_rmtauthretry_retry;
+
+static gint hf_r3_eventlogdump_starttime_year;
+static gint hf_r3_eventlogdump_starttime_month;
+static gint hf_r3_eventlogdump_starttime_day;
+static gint hf_r3_eventlogdump_starttime_hours;
+static gint hf_r3_eventlogdump_starttime_minutes;
+static gint hf_r3_eventlogdump_endtime_year;
+static gint hf_r3_eventlogdump_endtime_month;
+static gint hf_r3_eventlogdump_endtime_day;
+static gint hf_r3_eventlogdump_endtime_hours;
+static gint hf_r3_eventlogdump_endtime_minutes;
+static gint hf_r3_eventlogdump_user;
+
+static gint hf_r3_declinedlogdump_starttime_year;
+static gint hf_r3_declinedlogdump_starttime_month;
+static gint hf_r3_declinedlogdump_starttime_day;
+static gint hf_r3_declinedlogdump_starttime_hours;
+static gint hf_r3_declinedlogdump_starttime_minutes;
+static gint hf_r3_declinedlogdump_endtime_year;
+static gint hf_r3_declinedlogdump_endtime_month;
+static gint hf_r3_declinedlogdump_endtime_day;
+static gint hf_r3_declinedlogdump_endtime_hours;
+static gint hf_r3_declinedlogdump_endtime_minutes;
+
+static gint hf_r3_alarmlogdump_starttime_year;
+static gint hf_r3_alarmlogdump_starttime_month;
+static gint hf_r3_alarmlogdump_starttime_day;
+static gint hf_r3_alarmlogdump_starttime_hours;
+static gint hf_r3_alarmlogdump_starttime_minutes;
+static gint hf_r3_alarmlogdump_endtime_year;
+static gint hf_r3_alarmlogdump_endtime_month;
+static gint hf_r3_alarmlogdump_endtime_day;
+static gint hf_r3_alarmlogdump_endtime_hours;
+static gint hf_r3_alarmlogdump_endtime_minutes;
+
+static gint hf_r3_nvramclearoptions;
+static gint hf_r3_nvramclearoptions0;
+static gint hf_r3_nvramclearoptions1;
+static gint hf_r3_nvramclearoptions2;
+static gint hf_r3_nvramclearoptions3;
+static gint hf_r3_nvramclearoptions4;
+static gint hf_r3_nvramclearoptions5;
+static gint hf_r3_nvramclearoptions6;
+static gint hf_r3_nvramclearoptions7;
+static gint hf_r3_nvramclearoptions8;
+static gint hf_r3_nvramclearoptions9;
+static gint hf_r3_nvramclearoptions10;
+static gint hf_r3_nvramclearoptions11;
+static gint hf_r3_nvramclearoptions12;
+static gint hf_r3_nvramclearoptions13;
+static gint hf_r3_nvramclearoptions14;
+static gint hf_r3_nvramclearoptions15;
+
+static gint hf_r3_writeeventlog_user;
+static gint hf_r3_writeeventlog_event;
+
+static gint hf_r3_powertableselection;
+
+static gint hf_r3_filter_type;
+static gint hf_r3_filter_list;
+
+static gint hf_r3_alarm_length;
+static gint hf_r3_alarm_id;
+static gint hf_r3_alarm_state;
+
+static gint hf_r3_dpac_action;
+static gint hf_r3_dpac_waittime;
+static gint hf_r3_dpac_command;
+
+static gint hf_r3_dpacreply_stuff;
+static gint hf_r3_dpacreply_length;
+static gint hf_r3_dpacreply_reply;
+
+static gint hf_r3_mfgfield_length;
+static gint hf_r3_mfgfield;
+/*static gint hf_r3_mfgfield_data;*/
+
+static gint hf_r3_mfgsetserialnumber;
+static gint hf_r3_mfgsetcryptkey;
+static gint hf_r3_mfgdumpnvram;
+static gint hf_r3_mfgremoteunlock;
+static gint hf_r3_mfgtestpreserve;
 
 static gint hf_r3_adc [8];
 
-static gint hf_r3_hardwareid_board = -1;
-static gint hf_r3_hardwareid_cpuid = -1;
-static gint hf_r3_hardwareid_cpurev = -1;
-
-static gint hf_r3_testkeypad = -1;
-static gint hf_r3_testmagcard = -1;
-static gint hf_r3_testproxcard = -1;
-
-static gint hf_r3_nvramdump_record = -1;
-static gint hf_r3_nvramdump_length = -1;
-static gint hf_r3_nvramdump_data = -1;
-
-static gint hf_r3_nvramdumprle_record = -1;
-static gint hf_r3_nvramdumprle_length = -1;
-static gint hf_r3_nvramdumprle_data = -1;
-
-static gint hf_r3_iopins_lat = -1;
-static gint hf_r3_iopins_port = -1;
-static gint hf_r3_iopins_tris = -1;
-
-static gint hf_r3_mortisepins_s1 = -1;
-static gint hf_r3_mortisepins_s2 = -1;
-static gint hf_r3_mortisepins_s3 = -1;
-static gint hf_r3_mortisepins_s4 = -1;
-
-static gint hf_r3_checksumresults = -1;
-static gint hf_r3_checksumresults_field = -1;
-static gint hf_r3_checksumresults_length = -1;
-static gint hf_r3_checksumresults_state = -1;
-
-static gint hf_r3_forceoptions_length = -1;
-static gint hf_r3_forceoptions_item = -1;
-static gint hf_r3_forceoptions_state_8= -1;
-static gint hf_r3_forceoptions_state_16 = -1;
-static gint hf_r3_forceoptions_state_24 = -1;
-static gint hf_r3_forceoptions_state_32 = -1;
-
-static gint hf_r3_peekpoke_operation = -1;
-static gint hf_r3_peekpoke_address = -1;
-static gint hf_r3_peekpoke_length = -1;
-static gint hf_r3_peekpoke_poke8 = -1;
-static gint hf_r3_peekpoke_poke16 = -1;
-static gint hf_r3_peekpoke_poke24 = -1;
-static gint hf_r3_peekpoke_poke32 = -1;
-static gint hf_r3_peekpoke_pokestring = -1;
-
-static gint hf_r3_firmwaredownload_length = -1;
-static gint hf_r3_firmwaredownload_record = -1;
-static gint hf_r3_firmwaredownload_action = -1;
-static gint hf_r3_firmwaredownload_timeout = -1;
-static gint hf_r3_firmwaredownload_nvram = -1;
-static gint hf_r3_firmwaredownload_address = -1;
-static gint hf_r3_firmwaredownload_bytes = -1;
-static gint hf_r3_firmwaredownload_data = -1;
-static gint hf_r3_firmwaredownload_crc = -1;
-static gint hf_r3_firmwaredownload_crc_bad = -1;
-
-static gint hf_r3_nvramchecksumvalue = -1;
-static gint hf_r3_nvramchecksumvalue_fixup = -1;
-
-static gint hf_r3_capabilities = -1;
-static gint hf_r3_capabilities_length = -1;
-static gint hf_r3_capabilities_type = -1;
-static gint hf_r3_capabilities_value = -1;
-
-static gint hf_r3_lockstate = -1;
-static gint hf_r3_lockstate_passage = -1;
-static gint hf_r3_lockstate_panic = -1;
-static gint hf_r3_lockstate_lockout = -1;
-static gint hf_r3_lockstate_relock = -1;
-static gint hf_r3_lockstate_autoopen = -1;
-static gint hf_r3_lockstate_nextauto = -1;
-static gint hf_r3_lockstate_lockstate = -1;
-static gint hf_r3_lockstate_wantstate = -1;
-static gint hf_r3_lockstate_remote = -1;
-static gint hf_r3_lockstate_update = -1;
-static gint hf_r3_lockstate_exceptionspresent = -1;
-static gint hf_r3_lockstate_exceptionsactive = -1;
-static gint hf_r3_lockstate_timezonespresent = -1;
-static gint hf_r3_lockstate_timezonesactive = -1;
-static gint hf_r3_lockstate_autounlockspresent = -1;
-static gint hf_r3_lockstate_autounlocksactive = -1;
-static gint hf_r3_lockstate_uapmspresent = -1;
-static gint hf_r3_lockstate_uapmsactive = -1;
-static gint hf_r3_lockstate_uapmrelockspresent = -1;
-static gint hf_r3_lockstate_uapmreslocksactive = -1;
-static gint hf_r3_lockstate_nvramprotect = -1;
-static gint hf_r3_lockstate_nvramchecksum = -1;
-
-/*static gint hf_r3_mortisestatelog = -1;*/
-static gint hf_r3_mortisestatelog_pointer = -1;
-static gint hf_r3_mortisestatelog_mortisetype = -1;
-static gint hf_r3_mortisestatelog_waiting = -1;
-static gint hf_r3_mortisestatelog_state = -1;
-static gint hf_r3_mortisestatelog_last = -1;
-static gint hf_r3_mortisestatelog_event = -1;
-
-static gint hf_r3_timerchain_newtick = -1;
-static gint hf_r3_timerchain_currentboundary = -1;
-static gint hf_r3_timerchain_tasktag = -1;
-static gint hf_r3_timerchain_address = -1;
-static gint hf_r3_timerchain_reload = -1;
-static gint hf_r3_timerchain_boundary = -1;
-static gint hf_r3_timerchain_count = -1;
-static gint hf_r3_timerchain_flags = -1;
-
-static gint hf_r3_taskflags_taskid = -1;
-static gint hf_r3_taskflags_flags = -1;
-
-static gint hf_r3_checkpointlog_entryptr = -1;
-static gint hf_r3_checkpointlog_rcon = -1;
-static gint hf_r3_checkpointlog_checkpoint = -1;
-
-static gint hf_r3_cpuregisters_intcon = -1;
-static gint hf_r3_cpuregisters_intcon2 = -1;
-static gint hf_r3_cpuregisters_intcon3 = -1;
-static gint hf_r3_cpuregisters_pir1 = -1;
-static gint hf_r3_cpuregisters_pir2 = -1;
-static gint hf_r3_cpuregisters_pir3 = -1;
-static gint hf_r3_cpuregisters_pie1 = -1;
-static gint hf_r3_cpuregisters_pie2 = -1;
-static gint hf_r3_cpuregisters_pie3 = -1;
-static gint hf_r3_cpuregisters_ipr1 = -1;
-static gint hf_r3_cpuregisters_ipr2 = -1;
-static gint hf_r3_cpuregisters_ipr3 = -1;
-static gint hf_r3_cpuregisters_rcon = -1;
-static gint hf_r3_cpuregisters_osccon = -1;
-static gint hf_r3_cpuregisters_rcsta = -1;
-static gint hf_r3_cpuregisters_txsta = -1;
-static gint hf_r3_cpuregisters_rcsta2 = -1;
-static gint hf_r3_cpuregisters_txsta2 = -1;
-static gint hf_r3_cpuregisters_wdtcon = -1;
-
-static gint hf_r3_cpuregisters_intcon_rbif = -1;
-static gint hf_r3_cpuregisters_intcon_int0if = -1;
-static gint hf_r3_cpuregisters_intcon_tmr0if = -1;
-static gint hf_r3_cpuregisters_intcon_rbie = -1;
-static gint hf_r3_cpuregisters_intcon_int0ie = -1;
-static gint hf_r3_cpuregisters_intcon_tmr0ie = -1;
-static gint hf_r3_cpuregisters_intcon_giel = -1;
-static gint hf_r3_cpuregisters_intcon_gieh = -1;
-static gint hf_r3_cpuregisters_intcon2_rbip = -1;
-static gint hf_r3_cpuregisters_intcon2_int3ip = -1;
-static gint hf_r3_cpuregisters_intcon2_tmr0ip = -1;
-static gint hf_r3_cpuregisters_intcon2_intedg3 = -1;
-static gint hf_r3_cpuregisters_intcon2_intedg2 = -1;
-static gint hf_r3_cpuregisters_intcon2_intedg1 = -1;
-static gint hf_r3_cpuregisters_intcon2_intedg0 = -1;
-static gint hf_r3_cpuregisters_intcon2_rbpu = -1;
-static gint hf_r3_cpuregisters_intcon3_int1if = -1;
-static gint hf_r3_cpuregisters_intcon3_int2if = -1;
-static gint hf_r3_cpuregisters_intcon3_int3if = -1;
-static gint hf_r3_cpuregisters_intcon3_int1ie = -1;
-static gint hf_r3_cpuregisters_intcon3_int2ie = -1;
-static gint hf_r3_cpuregisters_intcon3_int3ie = -1;
-static gint hf_r3_cpuregisters_intcon3_int1ip = -1;
-static gint hf_r3_cpuregisters_intcon3_int2ip = -1;
-static gint hf_r3_cpuregisters_pir1_tmr1if = -1;
-static gint hf_r3_cpuregisters_pir1_tmr2if = -1;
-static gint hf_r3_cpuregisters_pir1_ccp1if = -1;
-static gint hf_r3_cpuregisters_pir1_ssp1if = -1;
-static gint hf_r3_cpuregisters_pir1_tx1if = -1;
-static gint hf_r3_cpuregisters_pir1_rc1if = -1;
-static gint hf_r3_cpuregisters_pir1_adif = -1;
-static gint hf_r3_cpuregisters_pir1_pspif = -1;
-static gint hf_r3_cpuregisters_pir2_ccp2if = -1;
-static gint hf_r3_cpuregisters_pir2_tmr3if = -1;
-static gint hf_r3_cpuregisters_pir2_hlvdif = -1;
-static gint hf_r3_cpuregisters_pir2_bcl1if = -1;
-static gint hf_r3_cpuregisters_pir2_eeif = -1;
-static gint hf_r3_cpuregisters_pir2_unused5 = -1;
-static gint hf_r3_cpuregisters_pir2_cmif = -1;
-static gint hf_r3_cpuregisters_pir2_oscfif = -1;
-static gint hf_r3_cpuregisters_pir3_ccp3if = -1;
-static gint hf_r3_cpuregisters_pir3_ccp4if = -1;
-static gint hf_r3_cpuregisters_pir3_ccp5if = -1;
-static gint hf_r3_cpuregisters_pir3_tmr4if = -1;
-static gint hf_r3_cpuregisters_pir3_tx2if = -1;
-static gint hf_r3_cpuregisters_pir3_rc2if = -1;
-static gint hf_r3_cpuregisters_pir3_bcl2if = -1;
-static gint hf_r3_cpuregisters_pir3_ssp2if = -1;
-static gint hf_r3_cpuregisters_pie1_tmr1ie = -1;
-static gint hf_r3_cpuregisters_pie1_tmr2ie = -1;
-static gint hf_r3_cpuregisters_pie1_ccp1ie = -1;
-static gint hf_r3_cpuregisters_pie1_ssp1ie = -1;
-static gint hf_r3_cpuregisters_pie1_tx1ie = -1;
-static gint hf_r3_cpuregisters_pie1_rc1ie = -1;
-static gint hf_r3_cpuregisters_pie1_adie = -1;
-static gint hf_r3_cpuregisters_pie1_pspie = -1;
-static gint hf_r3_cpuregisters_pie2_oscfie = -1;
-static gint hf_r3_cpuregisters_pie2_cmie = -1;
-static gint hf_r3_cpuregisters_pie2_unused2 = -1;
-static gint hf_r3_cpuregisters_pie2_eeie = -1;
-static gint hf_r3_cpuregisters_pie2_bcl1ie = -1;
-static gint hf_r3_cpuregisters_pie2_hlvdie = -1;
-static gint hf_r3_cpuregisters_pie2_tmr3ie = -1;
-static gint hf_r3_cpuregisters_pie2_ccp2ie = -1;
-static gint hf_r3_cpuregisters_pie3_ccp3ie = -1;
-static gint hf_r3_cpuregisters_pie3_ccp4ie = -1;
-static gint hf_r3_cpuregisters_pie3_ccp5ie = -1;
-static gint hf_r3_cpuregisters_pie3_tmr4ie = -1;
-static gint hf_r3_cpuregisters_pie3_tx2ie = -1;
-static gint hf_r3_cpuregisters_pie3_rc2ie = -1;
-static gint hf_r3_cpuregisters_pie3_bcl2ie = -1;
-static gint hf_r3_cpuregisters_pie3_ssp2ie = -1;
-static gint hf_r3_cpuregisters_ipr1_tmr1ip = -1;
-static gint hf_r3_cpuregisters_ipr1_tmr2ip = -1;
-static gint hf_r3_cpuregisters_ipr1_ccp1ip = -1;
-static gint hf_r3_cpuregisters_ipr1_ssp1ip = -1;
-static gint hf_r3_cpuregisters_ipr1_tx1ip = -1;
-static gint hf_r3_cpuregisters_ipr1_rc1ip = -1;
-static gint hf_r3_cpuregisters_ipr1_adip = -1;
-static gint hf_r3_cpuregisters_ipr1_pspip = -1;
-static gint hf_r3_cpuregisters_ipr2_ccp2ip = -1;
-static gint hf_r3_cpuregisters_ipr2_tmr3ip = -1;
-static gint hf_r3_cpuregisters_ipr2_hlvdip = -1;
-static gint hf_r3_cpuregisters_ipr2_bcl1ip = -1;
-static gint hf_r3_cpuregisters_ipr2_eeip = -1;
-static gint hf_r3_cpuregisters_ipr2_unused5 = -1;
-static gint hf_r3_cpuregisters_ipr2_cmip = -1;
-static gint hf_r3_cpuregisters_ipr2_oscfip = -1;
-static gint hf_r3_cpuregisters_ipr3_ccp2ip = -1;
-static gint hf_r3_cpuregisters_ipr3_ccp4ip = -1;
-static gint hf_r3_cpuregisters_ipr3_ccp5ip = -1;
-static gint hf_r3_cpuregisters_ipr3_tmr4ip = -1;
-static gint hf_r3_cpuregisters_ipr3_tx2ip = -1;
-static gint hf_r3_cpuregisters_ipr3_rc2ip = -1;
-static gint hf_r3_cpuregisters_ipr3_bcl2ip = -1;
-static gint hf_r3_cpuregisters_ipr3_ssp2ip = -1;
-static gint hf_r3_cpuregisters_rcon_bor = -1;
-static gint hf_r3_cpuregisters_rcon_por = -1;
-static gint hf_r3_cpuregisters_rcon_pd = -1;
-static gint hf_r3_cpuregisters_rcon_to = -1;
-static gint hf_r3_cpuregisters_rcon_unused4 = -1;
-static gint hf_r3_cpuregisters_rcon_ri = -1;
-static gint hf_r3_cpuregisters_rcon_sboren = -1;
-static gint hf_r3_cpuregisters_rcon_ipen = -1;
-static gint hf_r3_cpuregisters_osccon_scs0 = -1;
-static gint hf_r3_cpuregisters_osccon_scs1 = -1;
-static gint hf_r3_cpuregisters_osccon_iofs = -1;
-static gint hf_r3_cpuregisters_osccon_osts = -1;
-static gint hf_r3_cpuregisters_osccon_ircf0 = -1;
-static gint hf_r3_cpuregisters_osccon_ircf1 = -1;
-static gint hf_r3_cpuregisters_osccon_ircf2 = -1;
-static gint hf_r3_cpuregisters_osccon_idlen = -1;
-static gint hf_r3_cpuregisters_rcsta_rx9d = -1;
-static gint hf_r3_cpuregisters_rcsta_oerr = -1;
-static gint hf_r3_cpuregisters_rcsta_ferr = -1;
-static gint hf_r3_cpuregisters_rcsta_adden = -1;
-static gint hf_r3_cpuregisters_rcsta_cren = -1;
-static gint hf_r3_cpuregisters_rcsta_sren = -1;
-static gint hf_r3_cpuregisters_rcsta_rx9 = -1;
-static gint hf_r3_cpuregisters_rcsta_spen = -1;
-static gint hf_r3_cpuregisters_txsta_tx9d = -1;
-static gint hf_r3_cpuregisters_txsta_trmt = -1;
-static gint hf_r3_cpuregisters_txsta_brgh = -1;
-static gint hf_r3_cpuregisters_txsta_sendb = -1;
-static gint hf_r3_cpuregisters_txsta_sync = -1;
-static gint hf_r3_cpuregisters_txsta_txen = -1;
-static gint hf_r3_cpuregisters_txsta_tx9 = -1;
-static gint hf_r3_cpuregisters_txsta_csrc = -1;
-static gint hf_r3_cpuregisters_rcsta2_rx9d = -1;
-static gint hf_r3_cpuregisters_rcsta2_oerr = -1;
-static gint hf_r3_cpuregisters_rcsta2_ferr = -1;
-static gint hf_r3_cpuregisters_rcsta2_adden = -1;
-static gint hf_r3_cpuregisters_rcsta2_cren = -1;
-static gint hf_r3_cpuregisters_rcsta2_sren = -1;
-static gint hf_r3_cpuregisters_rcsta2_rx9 = -1;
-static gint hf_r3_cpuregisters_rcsta2_spen = -1;
-static gint hf_r3_cpuregisters_txsta2_tx9d = -1;
-static gint hf_r3_cpuregisters_txsta2_trmt = -1;
-static gint hf_r3_cpuregisters_txsta2_brgh = -1;
-static gint hf_r3_cpuregisters_txsta2_sendb = -1;
-static gint hf_r3_cpuregisters_txsta2_sync = -1;
-static gint hf_r3_cpuregisters_txsta2_txen = -1;
-static gint hf_r3_cpuregisters_txsta2_tx9 = -1;
-static gint hf_r3_cpuregisters_txsta2_csrc = -1;
-static gint hf_r3_cpuregisters_wdtcon_swdten = -1;
-static gint hf_r3_cpuregisters_wdtcon_unused1 = -1;
-static gint hf_r3_cpuregisters_wdtcon_unused2 = -1;
-static gint hf_r3_cpuregisters_wdtcon_unused3 = -1;
-static gint hf_r3_cpuregisters_wdtcon_unused4 = -1;
-static gint hf_r3_cpuregisters_wdtcon_unused5 = -1;
-static gint hf_r3_cpuregisters_wdtcon_unused6 = -1;
-static gint hf_r3_cpuregisters_wdtcon_unused7 = -1;
-
-static gint hf_r3_dumpm41t81_reg00 = -1;
-static gint hf_r3_dumpm41t81_reg01 = -1;
-static gint hf_r3_dumpm41t81_reg02 = -1;
-static gint hf_r3_dumpm41t81_reg03 = -1;
-static gint hf_r3_dumpm41t81_reg04 = -1;
-static gint hf_r3_dumpm41t81_reg05 = -1;
-static gint hf_r3_dumpm41t81_reg06 = -1;
-static gint hf_r3_dumpm41t81_reg07 = -1;
-static gint hf_r3_dumpm41t81_reg08 = -1;
-static gint hf_r3_dumpm41t81_reg09 = -1;
-static gint hf_r3_dumpm41t81_reg0a = -1;
-static gint hf_r3_dumpm41t81_reg0b = -1;
-static gint hf_r3_dumpm41t81_reg0c = -1;
-static gint hf_r3_dumpm41t81_reg0d = -1;
-static gint hf_r3_dumpm41t81_reg0e = -1;
-static gint hf_r3_dumpm41t81_reg0f = -1;
-static gint hf_r3_dumpm41t81_reg10 = -1;
-static gint hf_r3_dumpm41t81_reg11 = -1;
-static gint hf_r3_dumpm41t81_reg12 = -1;
-static gint hf_r3_dumpm41t81_reg13 = -1;
-
-static gint hf_r3_dumpm41t81_reg00_sec1 = -1;
-static gint hf_r3_dumpm41t81_reg00_sec01 = -1;
-static gint hf_r3_dumpm41t81_reg01_st = -1;
-static gint hf_r3_dumpm41t81_reg01_10sec = -1;
-static gint hf_r3_dumpm41t81_reg01_1sec = -1;
-static gint hf_r3_dumpm41t81_reg02_notused = -1;
-static gint hf_r3_dumpm41t81_reg02_10min = -1;
-static gint hf_r3_dumpm41t81_reg02_1min = -1;
-static gint hf_r3_dumpm41t81_reg03_cbe = -1;
-static gint hf_r3_dumpm41t81_reg03_cb = -1;
-static gint hf_r3_dumpm41t81_reg03_10hour = -1;
-static gint hf_r3_dumpm41t81_reg03_1hour = -1;
-static gint hf_r3_dumpm41t81_reg04_notused = -1;
-static gint hf_r3_dumpm41t81_reg04_dow = -1;
-static gint hf_r3_dumpm41t81_reg05_notused = -1;
-static gint hf_r3_dumpm41t81_reg05_10day = -1;
-static gint hf_r3_dumpm41t81_reg05_1day = -1;
-static gint hf_r3_dumpm41t81_reg06_notused = -1;
-static gint hf_r3_dumpm41t81_reg06_10month = -1;
-static gint hf_r3_dumpm41t81_reg06_1month = -1;
-static gint hf_r3_dumpm41t81_reg07_10year = -1;
-static gint hf_r3_dumpm41t81_reg07_1year = -1;
-static gint hf_r3_dumpm41t81_reg08_out = -1;
-static gint hf_r3_dumpm41t81_reg08_ft = -1;
-static gint hf_r3_dumpm41t81_reg08_s = -1;
-static gint hf_r3_dumpm41t81_reg08_cal = -1;
-static gint hf_r3_dumpm41t81_reg09_notused = -1;
-static gint hf_r3_dumpm41t81_reg09_bmb = -1;
-static gint hf_r3_dumpm41t81_reg09_rb = -1;
-static gint hf_r3_dumpm41t81_reg0a_afe = -1;
-static gint hf_r3_dumpm41t81_reg0a_sqwe = -1;
-static gint hf_r3_dumpm41t81_reg0a_abe = -1;
-static gint hf_r3_dumpm41t81_reg0a_10monthalm = -1;
-static gint hf_r3_dumpm41t81_reg0a_1monthalm = -1;
-static gint hf_r3_dumpm41t81_reg0b_rpt5 = -1;
-static gint hf_r3_dumpm41t81_reg0b_rpt4 = -1;
-static gint hf_r3_dumpm41t81_reg0b_10dayalm = -1;
-static gint hf_r3_dumpm41t81_reg0b_1dayalm = -1;
-static gint hf_r3_dumpm41t81_reg0c_rpt3 = -1;
-static gint hf_r3_dumpm41t81_reg0c_ht = -1;
-static gint hf_r3_dumpm41t81_reg0c_10houralm = -1;
-static gint hf_r3_dumpm41t81_reg0c_1houralm = -1;
-static gint hf_r3_dumpm41t81_reg0d_rpt2 = -1;
-static gint hf_r3_dumpm41t81_reg0d_10minalm = -1;
-static gint hf_r3_dumpm41t81_reg0d_1minalm = -1;
-static gint hf_r3_dumpm41t81_reg0e_rpt1 = -1;
-static gint hf_r3_dumpm41t81_reg0e_10secalm = -1;
-static gint hf_r3_dumpm41t81_reg0e_1secalm = -1;
-static gint hf_r3_dumpm41t81_reg0f_wdf = -1;
-static gint hf_r3_dumpm41t81_reg0f_af = -1;
-static gint hf_r3_dumpm41t81_reg0f_notused = -1;
-static gint hf_r3_dumpm41t81_reg10_notused = -1;
-static gint hf_r3_dumpm41t81_reg11_notused = -1;
-static gint hf_r3_dumpm41t81_reg12_notused = -1;
-static gint hf_r3_dumpm41t81_reg13_rs = -1;
-static gint hf_r3_dumpm41t81_reg13_notused = -1;
-
-static gint hf_r3_sn_manufacturer = -1;
-static gint hf_r3_sn_year = -1;
-static gint hf_r3_sn_week = -1;
-static gint hf_r3_sn_model = -1;
-static gint hf_r3_sn_sequence = -1;
-static gint hf_r3_sn_group = -1;
-static gint hf_r3_sn_nid = -1;
-static gint hf_r3_sn_hid = -1;
-static gint hf_r3_sn_power_supply = -1;
-static gint hf_r3_sn_mortise = -1;
-
-static gint hf_r3_debuglog_recordnumber = -1;
-static gint hf_r3_debuglog_flags = -1;
-static gint hf_r3_debuglog_tick = -1;
-
-static gint hf_r3_adduserparamtype = -1;
-static gint hf_r3_adduserparamtypelength = -1;
-static gint hf_r3_adduserparamtypetype = -1;
-/*static gint hf_r3_adduserparamtypedatalen = -1;*/
-/*static gint hf_r3_adduserparamtypeerror = -1;*/
+static gint hf_r3_hardwareid_board;
+static gint hf_r3_hardwareid_cpuid;
+static gint hf_r3_hardwareid_cpurev;
+
+static gint hf_r3_testkeypad;
+static gint hf_r3_testmagcard;
+static gint hf_r3_testproxcard;
+
+static gint hf_r3_nvramdump_record;
+static gint hf_r3_nvramdump_length;
+static gint hf_r3_nvramdump_data;
+
+static gint hf_r3_nvramdumprle_record;
+static gint hf_r3_nvramdumprle_length;
+static gint hf_r3_nvramdumprle_data;
+
+static gint hf_r3_iopins_lat;
+static gint hf_r3_iopins_port;
+static gint hf_r3_iopins_tris;
+
+static gint hf_r3_mortisepins_s1;
+static gint hf_r3_mortisepins_s2;
+static gint hf_r3_mortisepins_s3;
+static gint hf_r3_mortisepins_s4;
+
+static gint hf_r3_checksumresults;
+static gint hf_r3_checksumresults_field;
+static gint hf_r3_checksumresults_length;
+static gint hf_r3_checksumresults_state;
+
+static gint hf_r3_forceoptions_length;
+static gint hf_r3_forceoptions_item;
+static gint hf_r3_forceoptions_state_8;
+static gint hf_r3_forceoptions_state_16;
+static gint hf_r3_forceoptions_state_24;
+static gint hf_r3_forceoptions_state_32;
+
+static gint hf_r3_peekpoke_operation;
+static gint hf_r3_peekpoke_address;
+static gint hf_r3_peekpoke_length;
+static gint hf_r3_peekpoke_poke8;
+static gint hf_r3_peekpoke_poke16;
+static gint hf_r3_peekpoke_poke24;
+static gint hf_r3_peekpoke_poke32;
+static gint hf_r3_peekpoke_pokestring;
+
+static gint hf_r3_firmwaredownload_length;
+static gint hf_r3_firmwaredownload_record;
+static gint hf_r3_firmwaredownload_action;
+static gint hf_r3_firmwaredownload_timeout;
+static gint hf_r3_firmwaredownload_nvram;
+static gint hf_r3_firmwaredownload_address;
+static gint hf_r3_firmwaredownload_bytes;
+static gint hf_r3_firmwaredownload_data;
+static gint hf_r3_firmwaredownload_crc;
+static gint hf_r3_firmwaredownload_crc_bad;
+
+static gint hf_r3_nvramchecksumvalue;
+static gint hf_r3_nvramchecksumvalue_fixup;
+
+static gint hf_r3_capabilities;
+static gint hf_r3_capabilities_length;
+static gint hf_r3_capabilities_type;
+static gint hf_r3_capabilities_value;
+
+static gint hf_r3_lockstate;
+static gint hf_r3_lockstate_passage;
+static gint hf_r3_lockstate_panic;
+static gint hf_r3_lockstate_lockout;
+static gint hf_r3_lockstate_relock;
+static gint hf_r3_lockstate_autoopen;
+static gint hf_r3_lockstate_nextauto;
+static gint hf_r3_lockstate_lockstate;
+static gint hf_r3_lockstate_wantstate;
+static gint hf_r3_lockstate_remote;
+static gint hf_r3_lockstate_update;
+static gint hf_r3_lockstate_exceptionspresent;
+static gint hf_r3_lockstate_exceptionsactive;
+static gint hf_r3_lockstate_timezonespresent;
+static gint hf_r3_lockstate_timezonesactive;
+static gint hf_r3_lockstate_autounlockspresent;
+static gint hf_r3_lockstate_autounlocksactive;
+static gint hf_r3_lockstate_uapmspresent;
+static gint hf_r3_lockstate_uapmsactive;
+static gint hf_r3_lockstate_uapmrelockspresent;
+static gint hf_r3_lockstate_uapmreslocksactive;
+static gint hf_r3_lockstate_nvramprotect;
+static gint hf_r3_lockstate_nvramchecksum;
+
+/*static gint hf_r3_mortisestatelog;*/
+static gint hf_r3_mortisestatelog_pointer;
+static gint hf_r3_mortisestatelog_mortisetype;
+static gint hf_r3_mortisestatelog_waiting;
+static gint hf_r3_mortisestatelog_state;
+static gint hf_r3_mortisestatelog_last;
+static gint hf_r3_mortisestatelog_event;
+
+static gint hf_r3_timerchain_newtick;
+static gint hf_r3_timerchain_currentboundary;
+static gint hf_r3_timerchain_tasktag;
+static gint hf_r3_timerchain_address;
+static gint hf_r3_timerchain_reload;
+static gint hf_r3_timerchain_boundary;
+static gint hf_r3_timerchain_count;
+static gint hf_r3_timerchain_flags;
+
+static gint hf_r3_taskflags_taskid;
+static gint hf_r3_taskflags_flags;
+
+static gint hf_r3_checkpointlog_entryptr;
+static gint hf_r3_checkpointlog_rcon;
+static gint hf_r3_checkpointlog_checkpoint;
+
+static gint hf_r3_cpuregisters_intcon;
+static gint hf_r3_cpuregisters_intcon2;
+static gint hf_r3_cpuregisters_intcon3;
+static gint hf_r3_cpuregisters_pir1;
+static gint hf_r3_cpuregisters_pir2;
+static gint hf_r3_cpuregisters_pir3;
+static gint hf_r3_cpuregisters_pie1;
+static gint hf_r3_cpuregisters_pie2;
+static gint hf_r3_cpuregisters_pie3;
+static gint hf_r3_cpuregisters_ipr1;
+static gint hf_r3_cpuregisters_ipr2;
+static gint hf_r3_cpuregisters_ipr3;
+static gint hf_r3_cpuregisters_rcon;
+static gint hf_r3_cpuregisters_osccon;
+static gint hf_r3_cpuregisters_rcsta;
+static gint hf_r3_cpuregisters_txsta;
+static gint hf_r3_cpuregisters_rcsta2;
+static gint hf_r3_cpuregisters_txsta2;
+static gint hf_r3_cpuregisters_wdtcon;
+
+static gint hf_r3_cpuregisters_intcon_rbif;
+static gint hf_r3_cpuregisters_intcon_int0if;
+static gint hf_r3_cpuregisters_intcon_tmr0if;
+static gint hf_r3_cpuregisters_intcon_rbie;
+static gint hf_r3_cpuregisters_intcon_int0ie;
+static gint hf_r3_cpuregisters_intcon_tmr0ie;
+static gint hf_r3_cpuregisters_intcon_giel;
+static gint hf_r3_cpuregisters_intcon_gieh;
+static gint hf_r3_cpuregisters_intcon2_rbip;
+static gint hf_r3_cpuregisters_intcon2_int3ip;
+static gint hf_r3_cpuregisters_intcon2_tmr0ip;
+static gint hf_r3_cpuregisters_intcon2_intedg3;
+static gint hf_r3_cpuregisters_intcon2_intedg2;
+static gint hf_r3_cpuregisters_intcon2_intedg1;
+static gint hf_r3_cpuregisters_intcon2_intedg0;
+static gint hf_r3_cpuregisters_intcon2_rbpu;
+static gint hf_r3_cpuregisters_intcon3_int1if;
+static gint hf_r3_cpuregisters_intcon3_int2if;
+static gint hf_r3_cpuregisters_intcon3_int3if;
+static gint hf_r3_cpuregisters_intcon3_int1ie;
+static gint hf_r3_cpuregisters_intcon3_int2ie;
+static gint hf_r3_cpuregisters_intcon3_int3ie;
+static gint hf_r3_cpuregisters_intcon3_int1ip;
+static gint hf_r3_cpuregisters_intcon3_int2ip;
+static gint hf_r3_cpuregisters_pir1_tmr1if;
+static gint hf_r3_cpuregisters_pir1_tmr2if;
+static gint hf_r3_cpuregisters_pir1_ccp1if;
+static gint hf_r3_cpuregisters_pir1_ssp1if;
+static gint hf_r3_cpuregisters_pir1_tx1if;
+static gint hf_r3_cpuregisters_pir1_rc1if;
+static gint hf_r3_cpuregisters_pir1_adif;
+static gint hf_r3_cpuregisters_pir1_pspif;
+static gint hf_r3_cpuregisters_pir2_ccp2if;
+static gint hf_r3_cpuregisters_pir2_tmr3if;
+static gint hf_r3_cpuregisters_pir2_hlvdif;
+static gint hf_r3_cpuregisters_pir2_bcl1if;
+static gint hf_r3_cpuregisters_pir2_eeif;
+static gint hf_r3_cpuregisters_pir2_unused5;
+static gint hf_r3_cpuregisters_pir2_cmif;
+static gint hf_r3_cpuregisters_pir2_oscfif;
+static gint hf_r3_cpuregisters_pir3_ccp3if;
+static gint hf_r3_cpuregisters_pir3_ccp4if;
+static gint hf_r3_cpuregisters_pir3_ccp5if;
+static gint hf_r3_cpuregisters_pir3_tmr4if;
+static gint hf_r3_cpuregisters_pir3_tx2if;
+static gint hf_r3_cpuregisters_pir3_rc2if;
+static gint hf_r3_cpuregisters_pir3_bcl2if;
+static gint hf_r3_cpuregisters_pir3_ssp2if;
+static gint hf_r3_cpuregisters_pie1_tmr1ie;
+static gint hf_r3_cpuregisters_pie1_tmr2ie;
+static gint hf_r3_cpuregisters_pie1_ccp1ie;
+static gint hf_r3_cpuregisters_pie1_ssp1ie;
+static gint hf_r3_cpuregisters_pie1_tx1ie;
+static gint hf_r3_cpuregisters_pie1_rc1ie;
+static gint hf_r3_cpuregisters_pie1_adie;
+static gint hf_r3_cpuregisters_pie1_pspie;
+static gint hf_r3_cpuregisters_pie2_oscfie;
+static gint hf_r3_cpuregisters_pie2_cmie;
+static gint hf_r3_cpuregisters_pie2_unused2;
+static gint hf_r3_cpuregisters_pie2_eeie;
+static gint hf_r3_cpuregisters_pie2_bcl1ie;
+static gint hf_r3_cpuregisters_pie2_hlvdie;
+static gint hf_r3_cpuregisters_pie2_tmr3ie;
+static gint hf_r3_cpuregisters_pie2_ccp2ie;
+static gint hf_r3_cpuregisters_pie3_ccp3ie;
+static gint hf_r3_cpuregisters_pie3_ccp4ie;
+static gint hf_r3_cpuregisters_pie3_ccp5ie;
+static gint hf_r3_cpuregisters_pie3_tmr4ie;
+static gint hf_r3_cpuregisters_pie3_tx2ie;
+static gint hf_r3_cpuregisters_pie3_rc2ie;
+static gint hf_r3_cpuregisters_pie3_bcl2ie;
+static gint hf_r3_cpuregisters_pie3_ssp2ie;
+static gint hf_r3_cpuregisters_ipr1_tmr1ip;
+static gint hf_r3_cpuregisters_ipr1_tmr2ip;
+static gint hf_r3_cpuregisters_ipr1_ccp1ip;
+static gint hf_r3_cpuregisters_ipr1_ssp1ip;
+static gint hf_r3_cpuregisters_ipr1_tx1ip;
+static gint hf_r3_cpuregisters_ipr1_rc1ip;
+static gint hf_r3_cpuregisters_ipr1_adip;
+static gint hf_r3_cpuregisters_ipr1_pspip;
+static gint hf_r3_cpuregisters_ipr2_ccp2ip;
+static gint hf_r3_cpuregisters_ipr2_tmr3ip;
+static gint hf_r3_cpuregisters_ipr2_hlvdip;
+static gint hf_r3_cpuregisters_ipr2_bcl1ip;
+static gint hf_r3_cpuregisters_ipr2_eeip;
+static gint hf_r3_cpuregisters_ipr2_unused5;
+static gint hf_r3_cpuregisters_ipr2_cmip;
+static gint hf_r3_cpuregisters_ipr2_oscfip;
+static gint hf_r3_cpuregisters_ipr3_ccp2ip;
+static gint hf_r3_cpuregisters_ipr3_ccp4ip;
+static gint hf_r3_cpuregisters_ipr3_ccp5ip;
+static gint hf_r3_cpuregisters_ipr3_tmr4ip;
+static gint hf_r3_cpuregisters_ipr3_tx2ip;
+static gint hf_r3_cpuregisters_ipr3_rc2ip;
+static gint hf_r3_cpuregisters_ipr3_bcl2ip;
+static gint hf_r3_cpuregisters_ipr3_ssp2ip;
+static gint hf_r3_cpuregisters_rcon_bor;
+static gint hf_r3_cpuregisters_rcon_por;
+static gint hf_r3_cpuregisters_rcon_pd;
+static gint hf_r3_cpuregisters_rcon_to;
+static gint hf_r3_cpuregisters_rcon_unused4;
+static gint hf_r3_cpuregisters_rcon_ri;
+static gint hf_r3_cpuregisters_rcon_sboren;
+static gint hf_r3_cpuregisters_rcon_ipen;
+static gint hf_r3_cpuregisters_osccon_scs0;
+static gint hf_r3_cpuregisters_osccon_scs1;
+static gint hf_r3_cpuregisters_osccon_iofs;
+static gint hf_r3_cpuregisters_osccon_osts;
+static gint hf_r3_cpuregisters_osccon_ircf0;
+static gint hf_r3_cpuregisters_osccon_ircf1;
+static gint hf_r3_cpuregisters_osccon_ircf2;
+static gint hf_r3_cpuregisters_osccon_idlen;
+static gint hf_r3_cpuregisters_rcsta_rx9d;
+static gint hf_r3_cpuregisters_rcsta_oerr;
+static gint hf_r3_cpuregisters_rcsta_ferr;
+static gint hf_r3_cpuregisters_rcsta_adden;
+static gint hf_r3_cpuregisters_rcsta_cren;
+static gint hf_r3_cpuregisters_rcsta_sren;
+static gint hf_r3_cpuregisters_rcsta_rx9;
+static gint hf_r3_cpuregisters_rcsta_spen;
+static gint hf_r3_cpuregisters_txsta_tx9d;
+static gint hf_r3_cpuregisters_txsta_trmt;
+static gint hf_r3_cpuregisters_txsta_brgh;
+static gint hf_r3_cpuregisters_txsta_sendb;
+static gint hf_r3_cpuregisters_txsta_sync;
+static gint hf_r3_cpuregisters_txsta_txen;
+static gint hf_r3_cpuregisters_txsta_tx9;
+static gint hf_r3_cpuregisters_txsta_csrc;
+static gint hf_r3_cpuregisters_rcsta2_rx9d;
+static gint hf_r3_cpuregisters_rcsta2_oerr;
+static gint hf_r3_cpuregisters_rcsta2_ferr;
+static gint hf_r3_cpuregisters_rcsta2_adden;
+static gint hf_r3_cpuregisters_rcsta2_cren;
+static gint hf_r3_cpuregisters_rcsta2_sren;
+static gint hf_r3_cpuregisters_rcsta2_rx9;
+static gint hf_r3_cpuregisters_rcsta2_spen;
+static gint hf_r3_cpuregisters_txsta2_tx9d;
+static gint hf_r3_cpuregisters_txsta2_trmt;
+static gint hf_r3_cpuregisters_txsta2_brgh;
+static gint hf_r3_cpuregisters_txsta2_sendb;
+static gint hf_r3_cpuregisters_txsta2_sync;
+static gint hf_r3_cpuregisters_txsta2_txen;
+static gint hf_r3_cpuregisters_txsta2_tx9;
+static gint hf_r3_cpuregisters_txsta2_csrc;
+static gint hf_r3_cpuregisters_wdtcon_swdten;
+static gint hf_r3_cpuregisters_wdtcon_unused1;
+static gint hf_r3_cpuregisters_wdtcon_unused2;
+static gint hf_r3_cpuregisters_wdtcon_unused3;
+static gint hf_r3_cpuregisters_wdtcon_unused4;
+static gint hf_r3_cpuregisters_wdtcon_unused5;
+static gint hf_r3_cpuregisters_wdtcon_unused6;
+static gint hf_r3_cpuregisters_wdtcon_unused7;
+
+static gint hf_r3_dumpm41t81_reg00;
+static gint hf_r3_dumpm41t81_reg01;
+static gint hf_r3_dumpm41t81_reg02;
+static gint hf_r3_dumpm41t81_reg03;
+static gint hf_r3_dumpm41t81_reg04;
+static gint hf_r3_dumpm41t81_reg05;
+static gint hf_r3_dumpm41t81_reg06;
+static gint hf_r3_dumpm41t81_reg07;
+static gint hf_r3_dumpm41t81_reg08;
+static gint hf_r3_dumpm41t81_reg09;
+static gint hf_r3_dumpm41t81_reg0a;
+static gint hf_r3_dumpm41t81_reg0b;
+static gint hf_r3_dumpm41t81_reg0c;
+static gint hf_r3_dumpm41t81_reg0d;
+static gint hf_r3_dumpm41t81_reg0e;
+static gint hf_r3_dumpm41t81_reg0f;
+static gint hf_r3_dumpm41t81_reg10;
+static gint hf_r3_dumpm41t81_reg11;
+static gint hf_r3_dumpm41t81_reg12;
+static gint hf_r3_dumpm41t81_reg13;
+
+static gint hf_r3_dumpm41t81_reg00_sec1;
+static gint hf_r3_dumpm41t81_reg00_sec01;
+static gint hf_r3_dumpm41t81_reg01_st;
+static gint hf_r3_dumpm41t81_reg01_10sec;
+static gint hf_r3_dumpm41t81_reg01_1sec;
+static gint hf_r3_dumpm41t81_reg02_notused;
+static gint hf_r3_dumpm41t81_reg02_10min;
+static gint hf_r3_dumpm41t81_reg02_1min;
+static gint hf_r3_dumpm41t81_reg03_cbe;
+static gint hf_r3_dumpm41t81_reg03_cb;
+static gint hf_r3_dumpm41t81_reg03_10hour;
+static gint hf_r3_dumpm41t81_reg03_1hour;
+static gint hf_r3_dumpm41t81_reg04_notused;
+static gint hf_r3_dumpm41t81_reg04_dow;
+static gint hf_r3_dumpm41t81_reg05_notused;
+static gint hf_r3_dumpm41t81_reg05_10day;
+static gint hf_r3_dumpm41t81_reg05_1day;
+static gint hf_r3_dumpm41t81_reg06_notused;
+static gint hf_r3_dumpm41t81_reg06_10month;
+static gint hf_r3_dumpm41t81_reg06_1month;
+static gint hf_r3_dumpm41t81_reg07_10year;
+static gint hf_r3_dumpm41t81_reg07_1year;
+static gint hf_r3_dumpm41t81_reg08_out;
+static gint hf_r3_dumpm41t81_reg08_ft;
+static gint hf_r3_dumpm41t81_reg08_s;
+static gint hf_r3_dumpm41t81_reg08_cal;
+static gint hf_r3_dumpm41t81_reg09_notused;
+static gint hf_r3_dumpm41t81_reg09_bmb;
+static gint hf_r3_dumpm41t81_reg09_rb;
+static gint hf_r3_dumpm41t81_reg0a_afe;
+static gint hf_r3_dumpm41t81_reg0a_sqwe;
+static gint hf_r3_dumpm41t81_reg0a_abe;
+static gint hf_r3_dumpm41t81_reg0a_10monthalm;
+static gint hf_r3_dumpm41t81_reg0a_1monthalm;
+static gint hf_r3_dumpm41t81_reg0b_rpt5;
+static gint hf_r3_dumpm41t81_reg0b_rpt4;
+static gint hf_r3_dumpm41t81_reg0b_10dayalm;
+static gint hf_r3_dumpm41t81_reg0b_1dayalm;
+static gint hf_r3_dumpm41t81_reg0c_rpt3;
+static gint hf_r3_dumpm41t81_reg0c_ht;
+static gint hf_r3_dumpm41t81_reg0c_10houralm;
+static gint hf_r3_dumpm41t81_reg0c_1houralm;
+static gint hf_r3_dumpm41t81_reg0d_rpt2;
+static gint hf_r3_dumpm41t81_reg0d_10minalm;
+static gint hf_r3_dumpm41t81_reg0d_1minalm;
+static gint hf_r3_dumpm41t81_reg0e_rpt1;
+static gint hf_r3_dumpm41t81_reg0e_10secalm;
+static gint hf_r3_dumpm41t81_reg0e_1secalm;
+static gint hf_r3_dumpm41t81_reg0f_wdf;
+static gint hf_r3_dumpm41t81_reg0f_af;
+static gint hf_r3_dumpm41t81_reg0f_notused;
+static gint hf_r3_dumpm41t81_reg10_notused;
+static gint hf_r3_dumpm41t81_reg11_notused;
+static gint hf_r3_dumpm41t81_reg12_notused;
+static gint hf_r3_dumpm41t81_reg13_rs;
+static gint hf_r3_dumpm41t81_reg13_notused;
+
+static gint hf_r3_sn_manufacturer;
+static gint hf_r3_sn_year;
+static gint hf_r3_sn_week;
+static gint hf_r3_sn_model;
+static gint hf_r3_sn_sequence;
+static gint hf_r3_sn_group;
+static gint hf_r3_sn_nid;
+static gint hf_r3_sn_hid;
+static gint hf_r3_sn_power_supply;
+static gint hf_r3_sn_mortise;
+
+static gint hf_r3_debuglog_recordnumber;
+static gint hf_r3_debuglog_flags;
+static gint hf_r3_debuglog_tick;
+
+static gint hf_r3_adduserparamtype;
+static gint hf_r3_adduserparamtypelength;
+static gint hf_r3_adduserparamtypetype;
+/*static gint hf_r3_adduserparamtypedatalen;*/
+/*static gint hf_r3_adduserparamtypeerror;*/
 static gint hf_r3_adduserparamtypearray [ADDUSERPARAMTYPE_LAST];
 
-static gint ett_r3 = -1;
-static gint ett_r3header = -1;
-static gint ett_r3tail = -1;
-static gint ett_r3payload = -1;
-static gint ett_r3cmd = -1;
-static gint ett_r3configitem = -1;
-static gint ett_r3upstreamcommand = -1;
-static gint ett_r3upstreamfield = -1;
-static gint ett_r3timezone = -1;
-static gint ett_r3expireon = -1;
-static gint ett_r3datetime = -1;
-static gint ett_r3eventlogrecord = -1;
-static gint ett_r3declinedlogrecord = -1;
-static gint ett_r3alarmlogrecord = -1;
-static gint ett_r3debugmsg = -1;
-static gint ett_r3defineexceptionstartdate = -1;
-static gint ett_r3defineexceptionenddate = -1;
-static gint ett_r3defineexceptiongroupbits = -1;
+static gint ett_r3;
+static gint ett_r3header;
+static gint ett_r3tail;
+static gint ett_r3payload;
+static gint ett_r3cmd;
+static gint ett_r3configitem;
+static gint ett_r3upstreamcommand;
+static gint ett_r3upstreamfield;
+static gint ett_r3timezone;
+static gint ett_r3expireon;
+static gint ett_r3datetime;
+static gint ett_r3eventlogrecord;
+static gint ett_r3declinedlogrecord;
+static gint ett_r3alarmlogrecord;
+static gint ett_r3debugmsg;
+static gint ett_r3defineexceptionstartdate;
+static gint ett_r3defineexceptionenddate;
+static gint ett_r3defineexceptiongroupbits;
 static gint ett_r3definecalendarmonth [13];
-static gint ett_r3definetimezonestarttime = -1;
-static gint ett_r3definetimezoneendtime = -1;
-static gint ett_r3definetimezonedaymap = -1;
-static gint ett_r3eventlogdumpstarttime = -1;
-static gint ett_r3eventlogdumpendtime = -1;
-static gint ett_r3declinedlogdumpstarttime = -1;
-static gint ett_r3declinedlogdumpendtime = -1;
-static gint ett_r3alarmlogdumpstarttime = -1;
-static gint ett_r3alarmlogdumpendtime = -1;
-static gint ett_r3clearnvram = -1;
-static gint ett_r3filters = -1;
-static gint ett_r3alarmlist = -1;
-static gint ett_r3alarmcfg = -1;
-static gint ett_r3commandmfg = -1;
-static gint ett_r3serialnumber = -1;
-static gint ett_r3iopins = -1;
-static gint ett_r3checksumresults = -1;
-static gint ett_r3checksumresultsfield = -1;
-static gint ett_r3forceoptions = -1;
-static gint ett_r3peekpoke = -1;
-static gint ett_r3downloadfirmware = -1;
-static gint ett_r3capabilities = -1;
-static gint ett_r3lockstate = -1;
-static gint ett_r3mortisestatelog = -1;
-static gint ett_r3timerchain = -1;
-static gint ett_r3taskflags = -1;
-static gint ett_r3taskflagsentry = -1;
-static gint ett_r3checkpointlog = -1;
-static gint ett_r3checkpointlogentry = -1;
-static gint ett_r3cpuregisters = -1;
-static gint ett_r3cpuregister = -1;
-static gint ett_r3m41t81registers = -1;
-static gint ett_r3m41t81register = -1;
-static gint ett_r3debuglogrecord = -1;
-static gint ett_r3setdatetime = -1;
-static gint ett_r3manageuser = -1;
-
-static expert_field ei_r3_response_hasdata_octet_2 = EI_INIT;
-static expert_field ei_r3_mfgfield_too_many_adc_values = EI_INIT;
-static expert_field ei_r3_peekpoke_operation = EI_INIT;
-static expert_field ei_r3_response_hasdata_octet_1 = EI_INIT;
-static expert_field ei_r3_reserved_upstream_command_value = EI_INIT;
-static expert_field ei_r3_firmwaredownload_action = EI_INIT;
-static expert_field ei_r3_malformed_length = EI_INIT;
-static expert_field ei_r3_mfgfield = EI_INIT;
-static expert_field ei_r3_unknown_command_value = EI_INIT;
-static expert_field ei_r3_response_hasdata_octet_3 = EI_INIT;
-static expert_field ei_r3_cmd_downloadfirmwaretimeout = EI_INIT;
+static gint ett_r3definetimezonestarttime;
+static gint ett_r3definetimezoneendtime;
+static gint ett_r3definetimezonedaymap;
+static gint ett_r3eventlogdumpstarttime;
+static gint ett_r3eventlogdumpendtime;
+static gint ett_r3declinedlogdumpstarttime;
+static gint ett_r3declinedlogdumpendtime;
+static gint ett_r3alarmlogdumpstarttime;
+static gint ett_r3alarmlogdumpendtime;
+static gint ett_r3clearnvram;
+static gint ett_r3filters;
+static gint ett_r3alarmlist;
+static gint ett_r3alarmcfg;
+static gint ett_r3commandmfg;
+static gint ett_r3serialnumber;
+static gint ett_r3iopins;
+static gint ett_r3checksumresults;
+static gint ett_r3checksumresultsfield;
+static gint ett_r3forceoptions;
+static gint ett_r3peekpoke;
+static gint ett_r3downloadfirmware;
+static gint ett_r3capabilities;
+static gint ett_r3lockstate;
+static gint ett_r3mortisestatelog;
+static gint ett_r3timerchain;
+static gint ett_r3taskflags;
+static gint ett_r3taskflagsentry;
+static gint ett_r3checkpointlog;
+static gint ett_r3checkpointlogentry;
+static gint ett_r3cpuregisters;
+static gint ett_r3cpuregister;
+static gint ett_r3m41t81registers;
+static gint ett_r3m41t81register;
+static gint ett_r3debuglogrecord;
+static gint ett_r3setdatetime;
+static gint ett_r3manageuser;
+
+static expert_field ei_r3_response_hasdata_octet_2;
+static expert_field ei_r3_mfgfield_too_many_adc_values;
+static expert_field ei_r3_peekpoke_operation;
+static expert_field ei_r3_response_hasdata_octet_1;
+static expert_field ei_r3_reserved_upstream_command_value;
+static expert_field ei_r3_firmwaredownload_action;
+static expert_field ei_r3_malformed_length;
+static expert_field ei_r3_mfgfield;
+static expert_field ei_r3_unknown_command_value;
+static expert_field ei_r3_response_hasdata_octet_3;
+static expert_field ei_r3_cmd_downloadfirmwaretimeout;
 
 static dissector_handle_t r3_handle = NULL;
 
diff --git a/epan/dissectors/packet-at-ldf.c b/epan/dissectors/packet-at-ldf.c
index 7a9392f8e3..554ec76adc 100644
--- a/epan/dissectors/packet-at-ldf.c
+++ b/epan/dissectors/packet-at-ldf.c
@@ -20,17 +20,17 @@ void proto_reg_handoff_at_ldf(void);
 
 static dissector_handle_t at_ldf_handle;
 
-static int proto_at_ldf = -1;
+static int proto_at_ldf;
 
 /* Fields */
-static int hf_at_ldf_version  = -1;
-static int hf_at_ldf_src_vlan = -1;
-static int hf_at_ldf_src_port = -1;
-static int hf_at_ldf_ttl      = -1;
-static int hf_at_ldf_id       = -1;
-static int hf_at_ldf_text     = -1;
-
-static gint ett_at_ldf     = -1;
+static int hf_at_ldf_version;
+static int hf_at_ldf_src_vlan;
+static int hf_at_ldf_src_port;
+static int hf_at_ldf_ttl;
+static int hf_at_ldf_id;
+static int hf_at_ldf_text;
+
+static gint ett_at_ldf;
 
 static int
 dissect_at_ldf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *data _U_)
diff --git a/epan/dissectors/packet-at.c b/epan/dissectors/packet-at.c
index 1296d3345d..a52575eaee 100644
--- a/epan/dissectors/packet-at.c
+++ b/epan/dissectors/packet-at.c
@@ -26,149 +26,149 @@
 void proto_register_at_command(void);
 void proto_reg_handoff_at_command(void);
 
-static int proto_at = -1;
+static int proto_at;
 
 static dissector_handle_t gsm_sim_handle;
 static dissector_handle_t gsm_sms_handle;
 
-static int hf_command                                                      = -1;
-static int hf_data_part                                                    = -1;
-static int hf_parameters                                                   = -1;
-static int hf_role                                                         = -1;
-static int hf_at_cmd                                                       = -1;
-static int hf_at_cmd_type                                                  = -1;
-static int hf_at_command_line_prefix                                       = -1;
-static int hf_at_ignored                                                   = -1;
-static int hf_parameter                                                    = -1;
-static int hf_unknown_parameter                                            = -1;
-static int hf_data                                                         = -1;
-static int hf_chld_mode                                                    = -1;
-static int hf_chld_mode_1x                                                 = -1;
-static int hf_chld_mode_2x                                                 = -1;
-static int hf_chld_supported_modes                                         = -1;
-static int hf_cimi_imsi                                                    = -1;
-static int hf_cmer_mode                                                    = -1;
-static int hf_cmer_keyp                                                    = -1;
-static int hf_cmer_disp                                                    = -1;
-static int hf_cmer_ind                                                     = -1;
-static int hf_cmer_bfr                                                     = -1;
-static int hf_cmee                                                         = -1;
-static int hf_cme_error                                                    = -1;
-static int hf_cme_error_verbose                                            = -1;
-static int hf_cmgl_req_status                                              = -1;
-static int hf_cmgl_msg_index                                               = -1;
-static int hf_cmgl_msg_status                                              = -1;
-static int hf_cmgl_msg_originator_name                                     = -1;
-static int hf_cmgl_msg_length                                              = -1;
-static int hf_cmgl_msg_pdu                                                 = -1;
-static int hf_cmgr_address                                                 = -1;
-static int hf_cmgr_mode                                                    = -1;
-static int hf_cmgr_msg_index                                               = -1;
-static int hf_cmgr_msg_length                                              = -1;
-static int hf_cmgr_msg_pdu                                                 = -1;
-static int hf_cmgr_stat                                                    = -1;
-static int hf_cmux_k                                                       = -1;
-static int hf_cmux_n1                                                      = -1;
-static int hf_cmux_n2                                                      = -1;
-static int hf_cmux_port_speed                                              = -1;
-static int hf_cmux_subset                                                  = -1;
-static int hf_cmux_t1                                                      = -1;
-static int hf_cmux_t2                                                      = -1;
-static int hf_cmux_t3                                                      = -1;
-static int hf_cmux_transparency                                            = -1;
-static int hf_cnum_speed                                                   = -1;
-static int hf_cnum_service                                                 = -1;
-static int hf_cnum_itc                                                     = -1;
-static int hf_ciev_indicator_index                                         = -1;
-static int hf_vts_dtmf                                                     = -1;
-static int hf_vts_duration                                                 = -1;
-static int hf_cops_mode                                                    = -1;
-static int hf_cops_format                                                  = -1;
-static int hf_cops_operator                                                = -1;
-static int hf_cops_act                                                     = -1;
-static int hf_cpin_code                                                    = -1;
-static int hf_cpin_newpin                                                  = -1;
-static int hf_cpin_pin                                                     = -1;
-static int hf_cpms_mem1                                                    = -1;
-static int hf_cpms_mem2                                                    = -1;
-static int hf_cpms_mem3                                                    = -1;
-static int hf_cpms_used1                                                   = -1;
-static int hf_cpms_used2                                                   = -1;
-static int hf_cpms_used3                                                   = -1;
-static int hf_cpms_total1                                                  = -1;
-static int hf_cpms_total2                                                  = -1;
-static int hf_cpms_total3                                                  = -1;
-static int hf_cscs_chset                                                   = -1;
-static int hf_csim_command                                                 = -1;
-static int hf_csim_length                                                  = -1;
-static int hf_csim_response                                                = -1;
-static int hf_csq_ber                                                      = -1;
-static int hf_csq_rssi                                                     = -1;
-static int hf_at_number                                                    = -1;
-static int hf_at_type                                                      = -1;
-static int hf_at_subaddress                                                = -1;
-static int hf_at_subaddress_type                                           = -1;
-static int hf_at_alpha                                                     = -1;
-static int hf_at_priority                                                  = -1;
-static int hf_at_cli_validity                                              = -1;
-static int hf_clip_mode                                                    = -1;
-static int hf_clip_status                                                  = -1;
-static int hf_clcc_id                                                      = -1;
-static int hf_clcc_dir                                                     = -1;
-static int hf_clcc_stat                                                    = -1;
-static int hf_clcc_mode                                                    = -1;
-static int hf_clcc_mpty                                                    = -1;
-static int hf_ccwa_show_result_code                                        = -1;
-static int hf_ccwa_mode                                                    = -1;
-static int hf_ccwa_class                                                   = -1;
-static int hf_cfun_fun                                                     = -1;
-static int hf_cfun_rst                                                     = -1;
-static int hf_cgdcont_cid                                                  = -1;
-static int hf_cgdcont_pdp_type                                             = -1;
-static int hf_cgdcont_apn                                                  = -1;
-static int hf_cgdcont_pdp_addr                                             = -1;
-static int hf_cgdcont_d_comp                                               = -1;
-static int hf_cgdcont_h_comp                                               = -1;
-static int hf_cgmi_manufacturer_id                                         = -1;
-static int hf_cgmm_model_id                                                = -1;
-static int hf_cgmr_revision_id                                             = -1;
-static int hf_gmi_manufacturer_id                                          = -1;
-static int hf_gmm_model_id                                                 = -1;
-static int hf_gmr_revision_id                                              = -1;
-static int hf_zpas_network                                                 = -1;
-static int hf_zpas_srv_domain                                              = -1;
-static int hf_zusim_usim_card                                              = -1;
+static int hf_command;
+static int hf_data_part;
+static int hf_parameters;
+static int hf_role;
+static int hf_at_cmd;
+static int hf_at_cmd_type;
+static int hf_at_command_line_prefix;
+static int hf_at_ignored;
+static int hf_parameter;
+static int hf_unknown_parameter;
+static int hf_data;
+static int hf_chld_mode;
+static int hf_chld_mode_1x;
+static int hf_chld_mode_2x;
+static int hf_chld_supported_modes;
+static int hf_cimi_imsi;
+static int hf_cmer_mode;
+static int hf_cmer_keyp;
+static int hf_cmer_disp;
+static int hf_cmer_ind;
+static int hf_cmer_bfr;
+static int hf_cmee;
+static int hf_cme_error;
+static int hf_cme_error_verbose;
+static int hf_cmgl_req_status;
+static int hf_cmgl_msg_index;
+static int hf_cmgl_msg_status;
+static int hf_cmgl_msg_originator_name;
+static int hf_cmgl_msg_length;
+static int hf_cmgl_msg_pdu;
+static int hf_cmgr_address;
+static int hf_cmgr_mode;
+static int hf_cmgr_msg_index;
+static int hf_cmgr_msg_length;
+static int hf_cmgr_msg_pdu;
+static int hf_cmgr_stat;
+static int hf_cmux_k;
+static int hf_cmux_n1;
+static int hf_cmux_n2;
+static int hf_cmux_port_speed;
+static int hf_cmux_subset;
+static int hf_cmux_t1;
+static int hf_cmux_t2;
+static int hf_cmux_t3;
+static int hf_cmux_transparency;
+static int hf_cnum_speed;
+static int hf_cnum_service;
+static int hf_cnum_itc;
+static int hf_ciev_indicator_index;
+static int hf_vts_dtmf;
+static int hf_vts_duration;
+static int hf_cops_mode;
+static int hf_cops_format;
+static int hf_cops_operator;
+static int hf_cops_act;
+static int hf_cpin_code;
+static int hf_cpin_newpin;
+static int hf_cpin_pin;
+static int hf_cpms_mem1;
+static int hf_cpms_mem2;
+static int hf_cpms_mem3;
+static int hf_cpms_used1;
+static int hf_cpms_used2;
+static int hf_cpms_used3;
+static int hf_cpms_total1;
+static int hf_cpms_total2;
+static int hf_cpms_total3;
+static int hf_cscs_chset;
+static int hf_csim_command;
+static int hf_csim_length;
+static int hf_csim_response;
+static int hf_csq_ber;
+static int hf_csq_rssi;
+static int hf_at_number;
+static int hf_at_type;
+static int hf_at_subaddress;
+static int hf_at_subaddress_type;
+static int hf_at_alpha;
+static int hf_at_priority;
+static int hf_at_cli_validity;
+static int hf_clip_mode;
+static int hf_clip_status;
+static int hf_clcc_id;
+static int hf_clcc_dir;
+static int hf_clcc_stat;
+static int hf_clcc_mode;
+static int hf_clcc_mpty;
+static int hf_ccwa_show_result_code;
+static int hf_ccwa_mode;
+static int hf_ccwa_class;
+static int hf_cfun_fun;
+static int hf_cfun_rst;
+static int hf_cgdcont_cid;
+static int hf_cgdcont_pdp_type;
+static int hf_cgdcont_apn;
+static int hf_cgdcont_pdp_addr;
+static int hf_cgdcont_d_comp;
+static int hf_cgdcont_h_comp;
+static int hf_cgmi_manufacturer_id;
+static int hf_cgmm_model_id;
+static int hf_cgmr_revision_id;
+static int hf_gmi_manufacturer_id;
+static int hf_gmm_model_id;
+static int hf_gmr_revision_id;
+static int hf_zpas_network;
+static int hf_zpas_srv_domain;
+static int hf_zusim_usim_card;
 static int hf_indicator[20];
 
-static expert_field ei_unknown_command                                = EI_INIT;
-static expert_field ei_invalid_usage                                  = EI_INIT;
-static expert_field ei_unknown_parameter                              = EI_INIT;
-static expert_field ei_cmer_mode                                      = EI_INIT;
-static expert_field ei_cmer_keyp                                      = EI_INIT;
-static expert_field ei_cmer_disp                                      = EI_INIT;
-static expert_field ei_cmer_ind                                       = EI_INIT;
-static expert_field ei_cmer_bfr                                       = EI_INIT;
-static expert_field ei_chld_mode                                      = EI_INIT;
-static expert_field ei_ciev_indicator                                 = EI_INIT;
-static expert_field ei_cfun_res_fun                                   = EI_INIT;
-static expert_field ei_cfun_range_fun                                 = EI_INIT;
-static expert_field ei_cfun_rst                                       = EI_INIT;
-static expert_field ei_vts_dtmf                                       = EI_INIT;
-static expert_field ei_at_type                                        = EI_INIT;
-static expert_field ei_cnum_service                                   = EI_INIT;
-static expert_field ei_cnum_itc                                       = EI_INIT;
-static expert_field ei_empty_hex                                      = EI_INIT;
-static expert_field ei_invalid_hex                                    = EI_INIT;
-static expert_field ei_odd_len                                        = EI_INIT;
-static expert_field ei_csq_ber                                        = EI_INIT;
-static expert_field ei_csq_rssi                                       = EI_INIT;
+static expert_field ei_unknown_command;
+static expert_field ei_invalid_usage;
+static expert_field ei_unknown_parameter;
+static expert_field ei_cmer_mode;
+static expert_field ei_cmer_keyp;
+static expert_field ei_cmer_disp;
+static expert_field ei_cmer_ind;
+static expert_field ei_cmer_bfr;
+static expert_field ei_chld_mode;
+static expert_field ei_ciev_indicator;
+static expert_field ei_cfun_res_fun;
+static expert_field ei_cfun_range_fun;
+static expert_field ei_cfun_rst;
+static expert_field ei_vts_dtmf;
+static expert_field ei_at_type;
+static expert_field ei_cnum_service;
+static expert_field ei_cnum_itc;
+static expert_field ei_empty_hex;
+static expert_field ei_invalid_hex;
+static expert_field ei_odd_len;
+static expert_field ei_csq_ber;
+static expert_field ei_csq_rssi;
 
 
 /* Subtree handles: set by register_subtree_array */
-static gint ett_at = -1;
-static gint ett_at_command    = -1;
-static gint ett_at_data_part    = -1;
-static gint ett_at_parameters = -1;
+static gint ett_at;
+static gint ett_at_command;
+static gint ett_at_data_part;
+static gint ett_at_parameters;
 
 #define ROLE_UNKNOWN   0
 #define ROLE_DCE       1
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index 396e7af519..7d3c379a8b 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -51,12 +51,12 @@ static dissector_handle_t llap_handle;
 static capture_dissector_handle_t llap_cap_handle;
 
 
-static int proto_llap = -1;
-static int hf_llap_dst = -1;
-static int hf_llap_src = -1;
-static int hf_llap_type = -1;
+static int proto_llap;
+static int hf_llap_dst;
+static int hf_llap_src;
+static int hf_llap_type;
 
-static int hf_llc_apple_atalk_pid = -1;
+static int hf_llc_apple_atalk_pid;
 
 /*
  * See Inside AppleTalk.
@@ -68,19 +68,19 @@ static const value_string apple_atalk_pid_vals[] = {
   {0, NULL}
 };
 
-static int proto_ddp = -1;
-static int hf_ddp_hopcount = -1;
-static int hf_ddp_len = -1;
-static int hf_ddp_checksum = -1;
-static int hf_ddp_dst = -1;
-static int hf_ddp_dst_net = -1;
-static int hf_ddp_src = -1;
-static int hf_ddp_src_net = -1;
-static int hf_ddp_dst_node = -1;
-static int hf_ddp_src_node = -1;
-static int hf_ddp_dst_socket = -1;
-static int hf_ddp_src_socket = -1;
-static int hf_ddp_type = -1;
+static int proto_ddp;
+static int hf_ddp_hopcount;
+static int hf_ddp_len;
+static int hf_ddp_checksum;
+static int hf_ddp_dst;
+static int hf_ddp_dst_net;
+static int hf_ddp_src;
+static int hf_ddp_src_net;
+static int hf_ddp_dst_node;
+static int hf_ddp_src_node;
+static int hf_ddp_dst_socket;
+static int hf_ddp_src_socket;
+static int hf_ddp_type;
 
 static dissector_handle_t ddp_handle;
 static dissector_handle_t ddp_short_handle;
@@ -120,56 +120,56 @@ static dissector_handle_t ddp_short_handle;
 static dissector_handle_t asp_handle;
 static dissector_handle_t pap_handle;
 
-static int proto_atp = -1;
-static int hf_atp_ctrlinfo  = -1; /* guint8_t    control information */
-static int hf_atp_function  = -1; /* bits 7,6    function */
-static int hf_atp_xo        = -1; /* bit 5       exactly-once */
-static int hf_atp_eom       = -1; /* bit 4       end-of-message */
-static int hf_atp_sts       = -1; /* bit 3       send transaction status */
-static int hf_atp_treltimer = -1; /* bits 2,1,0  TRel timeout indicator */
-
-static int hf_atp_bitmap = -1;   /* guint8_t  bitmap or sequence number */
-static int hf_atp_tid = -1;      /* guint16_t transaction id. */
-static int hf_atp_user_bytes = -1;
-
-static int hf_atp_segments = -1;
-static int hf_atp_segment = -1;
-static int hf_atp_segment_overlap = -1;
-static int hf_atp_segment_overlap_conflict = -1;
-static int hf_atp_segment_multiple_tails = -1;
-static int hf_atp_segment_too_long_segment = -1;
-static int hf_atp_segment_error = -1;
-static int hf_atp_segment_count = -1;
-static int hf_atp_reassembled_in = -1;
-static int hf_atp_reassembled_length = -1;
+static int proto_atp;
+static int hf_atp_ctrlinfo; /* guint8_t    control information */
+static int hf_atp_function; /* bits 7,6    function */
+static int hf_atp_xo; /* bit 5       exactly-once */
+static int hf_atp_eom; /* bit 4       end-of-message */
+static int hf_atp_sts; /* bit 3       send transaction status */
+static int hf_atp_treltimer; /* bits 2,1,0  TRel timeout indicator */
+
+static int hf_atp_bitmap;   /* guint8_t  bitmap or sequence number */
+static int hf_atp_tid;      /* guint16_t transaction id. */
+static int hf_atp_user_bytes;
+
+static int hf_atp_segments;
+static int hf_atp_segment;
+static int hf_atp_segment_overlap;
+static int hf_atp_segment_overlap_conflict;
+static int hf_atp_segment_multiple_tails;
+static int hf_atp_segment_too_long_segment;
+static int hf_atp_segment_error;
+static int hf_atp_segment_count;
+static int hf_atp_reassembled_in;
+static int hf_atp_reassembled_length;
 
 /* ------------------------- */
-static int proto_zip = -1;
+static int proto_zip;
 static dissector_handle_t zip_atp_handle;
 
-static int hf_zip_function = -1;
-static int hf_zip_atp_function = -1;
-static int hf_zip_start_index = -1;
-static int hf_zip_count = -1;
-static int hf_zip_zero_value = -1;
+static int hf_zip_function;
+static int hf_zip_atp_function;
+static int hf_zip_start_index;
+static int hf_zip_count;
+static int hf_zip_zero_value;
 
-static int hf_zip_network_count = -1;
-static int hf_zip_network = -1;
-static int hf_zip_network_start = -1;
-static int hf_zip_network_end = -1;
+static int hf_zip_network_count;
+static int hf_zip_network;
+static int hf_zip_network_start;
+static int hf_zip_network_end;
 
-static int hf_zip_flags = -1;
-static int hf_zip_flags_zone_invalid  = -1;
-static int hf_zip_flags_use_broadcast = -1;
-static int hf_zip_flags_only_one_zone = -1;
+static int hf_zip_flags;
+static int hf_zip_flags_zone_invalid;
+static int hf_zip_flags_use_broadcast;
+static int hf_zip_flags_only_one_zone;
 
-static int hf_zip_last_flag = -1;
+static int hf_zip_last_flag;
 
-static int hf_zip_zone_name    = -1;
-static int hf_zip_default_zone = -1;
+static int hf_zip_zone_name;
+static int hf_zip_default_zone;
 
-static int hf_zip_multicast_length  = -1;
-static int hf_zip_multicast_address = -1;
+static int hf_zip_multicast_length;
+static int hf_zip_multicast_address;
 
 static const value_string zip_function_vals[] = {
   {1, "Query"},
@@ -189,10 +189,10 @@ static const value_string zip_atp_function_vals[] = {
   {0, NULL}
 };
 
-static gint ett_zip              = -1;
-static gint ett_zip_flags        = -1;
-static gint ett_zip_zones_list   = -1;
-static gint ett_zip_network_list = -1;
+static gint ett_zip;
+static gint ett_zip_flags;
+static gint ett_zip_zones_list;
+static gint ett_zip_network_list;
 
 /* --------------------------------
  * from netatalk/include/atalk/ats.h
@@ -220,17 +220,17 @@ static gint ett_zip_network_list = -1;
 #define ASPERR_TOOMANY  (-1074)
 #define ASPERR_NOACK    (-1075)
 
-static int proto_asp            = -1;
-static int hf_asp_func          = -1;
-static int hf_asp_error         = -1;
-static int hf_asp_socket        = -1;
-static int hf_asp_version       = -1;
-static int hf_asp_session_id    = -1;
-static int hf_asp_zero_value    = -1;
-static int hf_asp_init_error    = -1;
-static int hf_asp_attn_code     = -1;
-static int hf_asp_seq           = -1;
-static int hf_asp_size          = -1;
+static int proto_asp;
+static int hf_asp_func;
+static int hf_asp_error;
+static int hf_asp_socket;
+static int hf_asp_version;
+static int hf_asp_session_id;
+static int hf_asp_zero_value;
+static int hf_asp_init_error;
+static int hf_asp_attn_code;
+static int hf_asp_seq;
+static int hf_asp_size;
 
 typedef struct {
   guint32 conversation;
@@ -269,49 +269,49 @@ static wmem_map_t *atp_request_hash = NULL;
 
 
 /* ------------------------------------ */
-static int proto_nbp = -1;
-static int hf_nbp_op = -1;
-static int hf_nbp_info = -1;
-static int hf_nbp_count = -1;
-static int hf_nbp_tid = -1;
-
-static int hf_nbp_node_net = -1;
-static int hf_nbp_node_port = -1;
-static int hf_nbp_node_node = -1;
-static int hf_nbp_node_enum = -1;
-static int hf_nbp_node_object = -1;
-static int hf_nbp_node_type = -1;
-static int hf_nbp_node_zone = -1;
-
-static int proto_rtmp = -1;
-static int hf_rtmp_net = -1;
-static int hf_rtmp_node_len = -1;
-static int hf_rtmp_node = -1;
-static int hf_rtmp_tuple_net = -1;
-static int hf_rtmp_tuple_range_start = -1;
-static int hf_rtmp_tuple_range_end = -1;
-static int hf_rtmp_tuple_dist = -1;
-static int hf_rtmp_version = -1;
-static int hf_rtmp_function = -1;
-
-static gint ett_atp = -1;
-
-static gint ett_atp_segments = -1;
-static gint ett_atp_segment = -1;
-static gint ett_atp_info = -1;
-static gint ett_asp = -1;
-static gint ett_pap = -1;
-
-static gint ett_nbp = -1;
-static gint ett_nbp_info = -1;
-static gint ett_nbp_node = -1;
-static gint ett_rtmp = -1;
-static gint ett_rtmp_tuple = -1;
-static gint ett_ddp = -1;
-static gint ett_llap = -1;
-static gint ett_pstring = -1;
-
-static expert_field ei_ddp_len_invalid = EI_INIT;
+static int proto_nbp;
+static int hf_nbp_op;
+static int hf_nbp_info;
+static int hf_nbp_count;
+static int hf_nbp_tid;
+
+static int hf_nbp_node_net;
+static int hf_nbp_node_port;
+static int hf_nbp_node_node;
+static int hf_nbp_node_enum;
+static int hf_nbp_node_object;
+static int hf_nbp_node_type;
+static int hf_nbp_node_zone;
+
+static int proto_rtmp;
+static int hf_rtmp_net;
+static int hf_rtmp_node_len;
+static int hf_rtmp_node;
+static int hf_rtmp_tuple_net;
+static int hf_rtmp_tuple_range_start;
+static int hf_rtmp_tuple_range_end;
+static int hf_rtmp_tuple_dist;
+static int hf_rtmp_version;
+static int hf_rtmp_function;
+
+static gint ett_atp;
+
+static gint ett_atp_segments;
+static gint ett_atp_segment;
+static gint ett_atp_info;
+static gint ett_asp;
+static gint ett_pap;
+
+static gint ett_nbp;
+static gint ett_nbp_info;
+static gint ett_nbp_node;
+static gint ett_rtmp;
+static gint ett_rtmp_tuple;
+static gint ett_ddp;
+static gint ett_llap;
+static gint ett_pstring;
+
+static expert_field ei_ddp_len_invalid;
 
 static const fragment_items atp_frag_items = {
   &ett_atp_segment,
@@ -343,19 +343,19 @@ static const fragment_items atp_frag_items = {
 #define PAPSendStatus     8
 #define PAPStatus         9
 
-static int proto_pap = -1;
+static int proto_pap;
 
-static int hf_pap_connid   = -1;
-static int hf_pap_function = -1;
-static int hf_pap_socket   = -1;
-static int hf_pap_quantum  = -1;
-static int hf_pap_waittime = -1;
-static int hf_pap_result   = -1;
-static int hf_pap_status   = -1;
-static int hf_pap_seq      = -1;
-static int hf_pap_eof      = -1;
+static int hf_pap_connid;
+static int hf_pap_function;
+static int hf_pap_socket;
+static int hf_pap_quantum;
+static int hf_pap_waittime;
+static int hf_pap_result;
+static int hf_pap_status;
+static int hf_pap_seq;
+static int hf_pap_eof;
 
-static int hf_pap_pad = -1;
+static int hf_pap_pad;
 
 static int atalk_address_type = -1;
 
diff --git a/epan/dissectors/packet-ath.c b/epan/dissectors/packet-ath.c
index 2b72ec6832..54b542b036 100644
--- a/epan/dissectors/packet-ath.c
+++ b/epan/dissectors/packet-ath.c
@@ -40,31 +40,31 @@ static dissector_handle_t ath_handle;
 
 #define ATH_PORT 45564 /* Not IANA registered */
 
-static int proto_ath = -1;
-
-static int hf_ath_begin   = -1;
-static int hf_ath_padding = -1;
-static int hf_ath_length  = -1;
-static int hf_ath_alive   = -1;
-static int hf_ath_port    = -1;
-static int hf_ath_sport   = -1;
-static int hf_ath_uport   = -1;
-static int hf_ath_hlen    = -1;
-static int hf_ath_ipv4    = -1;
-static int hf_ath_ipv6    = -1;
-static int hf_ath_clen    = -1;
-static int hf_ath_comm    = -1;
-static int hf_ath_dlen    = -1;
-static int hf_ath_domain  = -1;
-static int hf_ath_unique  = -1;
-static int hf_ath_plen    = -1;
-static int hf_ath_payload = -1;
-static int hf_ath_end     = -1;
-
-static gint ett_ath = -1;
-
-static expert_field ei_ath_hlen_invalid  = EI_INIT;
-static expert_field ei_ath_hmark_invalid = EI_INIT;
+static int proto_ath;
+
+static int hf_ath_begin;
+static int hf_ath_padding;
+static int hf_ath_length;
+static int hf_ath_alive;
+static int hf_ath_port;
+static int hf_ath_sport;
+static int hf_ath_uport;
+static int hf_ath_hlen;
+static int hf_ath_ipv4;
+static int hf_ath_ipv6;
+static int hf_ath_clen;
+static int hf_ath_comm;
+static int hf_ath_dlen;
+static int hf_ath_domain;
+static int hf_ath_unique;
+static int hf_ath_plen;
+static int hf_ath_payload;
+static int hf_ath_end;
+
+static gint ett_ath;
+
+static expert_field ei_ath_hlen_invalid;
+static expert_field ei_ath_hmark_invalid;
 
 static gboolean
 test_ath(tvbuff_t *tvb)
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c
index f47dcb2888..3478812ec7 100644
--- a/epan/dissectors/packet-atm.c
+++ b/epan/dissectors/packet-atm.c
@@ -32,97 +32,97 @@
 void proto_register_atm(void);
 void proto_reg_handoff_atm(void);
 
-static int proto_atm = -1;
-static int hf_atm_aal = -1;
-static int hf_atm_gfc = -1;
-static int hf_atm_vpi = -1;
-static int hf_atm_vci = -1;
-static int hf_atm_cid = -1;
-static int hf_atm_reserved = -1;
-static int proto_atm_lane = -1;
-static int proto_ilmi = -1;
-static int proto_aal1 = -1;
-static int proto_aal3_4 = -1;
-static int proto_oamaal = -1;
-
-static int hf_atm_le_client_client = -1;
-static int hf_atm_lan_destination_tag = -1;
-static int hf_atm_lan_destination_mac = -1;
-static int hf_atm_le_control_tlv_type = -1;
-static int hf_atm_le_control_tlv_length = -1;
-static int hf_atm_lan_destination_route_desc = -1;
-static int hf_atm_lan_destination_lan_id = -1;
-static int hf_atm_lan_destination_bridge_num = -1;
-static int hf_atm_source_atm = -1;
-static int hf_atm_target_atm = -1;
-static int hf_atm_le_configure_join_frame_lan_type = -1;
-static int hf_atm_le_configure_join_frame_max_frame_size = -1;
-static int hf_atm_le_configure_join_frame_num_tlvs = -1;
-static int hf_atm_le_configure_join_frame_elan_name_size = -1;
-static int hf_atm_le_configure_join_frame_elan_name = -1;
-static int hf_atm_le_registration_frame_num_tlvs = -1;
-static int hf_atm_le_arp_frame_num_tlvs = -1;
-static int hf_atm_le_verify_frame_num_tlvs = -1;
-static int hf_atm_le_control_marker = -1;
-static int hf_atm_le_control_protocol = -1;
-static int hf_atm_le_control_version = -1;
-static int hf_atm_le_control_opcode = -1;
-static int hf_atm_le_control_status = -1;
-static int hf_atm_le_control_transaction_id = -1;
-static int hf_atm_le_control_requester_lecid = -1;
-static int hf_atm_le_control_flags = -1;
-static int hf_atm_le_control_flag_v2_capable = -1;
-static int hf_atm_le_control_flag_selective_multicast = -1;
-static int hf_atm_le_control_flag_v2_required = -1;
-static int hf_atm_le_control_flag_proxy = -1;
-static int hf_atm_le_control_flag_exclude_explorer_frames = -1;
-static int hf_atm_le_control_flag_address = -1;
-static int hf_atm_le_control_topology_change = -1;
-static int hf_atm_traffic_type = -1;
-static int hf_atm_traffic_vcmx = -1;
-static int hf_atm_traffic_lane = -1;
-static int hf_atm_traffic_ipsilon = -1;
-static int hf_atm_cells = -1;
-static int hf_atm_aal5_uu = -1;
-static int hf_atm_aal5_cpi = -1;
-static int hf_atm_aal5_len = -1;
-static int hf_atm_aal5_crc = -1;
-static int hf_atm_payload_type = -1;
-static int hf_atm_cell_loss_priority = -1;
-static int hf_atm_header_error_check = -1;
-static int hf_atm_channel = -1;
-static int hf_atm_aa1_csi = -1;
-static int hf_atm_aa1_seq_count = -1;
-static int hf_atm_aa1_crc = -1;
-static int hf_atm_aa1_parity = -1;
-static int hf_atm_aa1_payload = -1;
-static int hf_atm_aal3_4_seg_type = -1;
-static int hf_atm_aal3_4_seq_num = -1;
-static int hf_atm_aal3_4_multiplex_id = -1;
-static int hf_atm_aal3_4_information = -1;
-static int hf_atm_aal3_4_length_indicator = -1;
-static int hf_atm_aal3_4_crc = -1;
-static int hf_atm_aal_oamcell_type = -1;
-static int hf_atm_aal_oamcell_type_fm = -1;
-static int hf_atm_aal_oamcell_type_pm = -1;
-static int hf_atm_aal_oamcell_type_ad = -1;
-static int hf_atm_aal_oamcell_type_ft = -1;
-static int hf_atm_aal_oamcell_func_spec = -1;
-static int hf_atm_aal_oamcell_crc = -1;
-static int hf_atm_padding = -1;
-
-static gint ett_atm = -1;
-static gint ett_atm_lane = -1;
-static gint ett_atm_lane_lc_lan_dest = -1;
-static gint ett_atm_lane_lc_lan_dest_rd = -1;
-static gint ett_atm_lane_lc_flags = -1;
-static gint ett_atm_lane_lc_tlv = -1;
-static gint ett_ilmi = -1;
-static gint ett_aal1 = -1;
-static gint ett_aal3_4 = -1;
-static gint ett_oamaal = -1;
-
-static expert_field ei_atm_reassembly_failed = EI_INIT;
+static int proto_atm;
+static int hf_atm_aal;
+static int hf_atm_gfc;
+static int hf_atm_vpi;
+static int hf_atm_vci;
+static int hf_atm_cid;
+static int hf_atm_reserved;
+static int proto_atm_lane;
+static int proto_ilmi;
+static int proto_aal1;
+static int proto_aal3_4;
+static int proto_oamaal;
+
+static int hf_atm_le_client_client;
+static int hf_atm_lan_destination_tag;
+static int hf_atm_lan_destination_mac;
+static int hf_atm_le_control_tlv_type;
+static int hf_atm_le_control_tlv_length;
+static int hf_atm_lan_destination_route_desc;
+static int hf_atm_lan_destination_lan_id;
+static int hf_atm_lan_destination_bridge_num;
+static int hf_atm_source_atm;
+static int hf_atm_target_atm;
+static int hf_atm_le_configure_join_frame_lan_type;
+static int hf_atm_le_configure_join_frame_max_frame_size;
+static int hf_atm_le_configure_join_frame_num_tlvs;
+static int hf_atm_le_configure_join_frame_elan_name_size;
+static int hf_atm_le_configure_join_frame_elan_name;
+static int hf_atm_le_registration_frame_num_tlvs;
+static int hf_atm_le_arp_frame_num_tlvs;
+static int hf_atm_le_verify_frame_num_tlvs;
+static int hf_atm_le_control_marker;
+static int hf_atm_le_control_protocol;
+static int hf_atm_le_control_version;
+static int hf_atm_le_control_opcode;
+static int hf_atm_le_control_status;
+static int hf_atm_le_control_transaction_id;
+static int hf_atm_le_control_requester_lecid;
+static int hf_atm_le_control_flags;
+static int hf_atm_le_control_flag_v2_capable;
+static int hf_atm_le_control_flag_selective_multicast;
+static int hf_atm_le_control_flag_v2_required;
+static int hf_atm_le_control_flag_proxy;
+static int hf_atm_le_control_flag_exclude_explorer_frames;
+static int hf_atm_le_control_flag_address;
+static int hf_atm_le_control_topology_change;
+static int hf_atm_traffic_type;
+static int hf_atm_traffic_vcmx;
+static int hf_atm_traffic_lane;
+static int hf_atm_traffic_ipsilon;
+static int hf_atm_cells;
+static int hf_atm_aal5_uu;
+static int hf_atm_aal5_cpi;
+static int hf_atm_aal5_len;
+static int hf_atm_aal5_crc;
+static int hf_atm_payload_type;
+static int hf_atm_cell_loss_priority;
+static int hf_atm_header_error_check;
+static int hf_atm_channel;
+static int hf_atm_aa1_csi;
+static int hf_atm_aa1_seq_count;
+static int hf_atm_aa1_crc;
+static int hf_atm_aa1_parity;
+static int hf_atm_aa1_payload;
+static int hf_atm_aal3_4_seg_type;
+static int hf_atm_aal3_4_seq_num;
+static int hf_atm_aal3_4_multiplex_id;
+static int hf_atm_aal3_4_information;
+static int hf_atm_aal3_4_length_indicator;
+static int hf_atm_aal3_4_crc;
+static int hf_atm_aal_oamcell_type;
+static int hf_atm_aal_oamcell_type_fm;
+static int hf_atm_aal_oamcell_type_pm;
+static int hf_atm_aal_oamcell_type_ad;
+static int hf_atm_aal_oamcell_type_ft;
+static int hf_atm_aal_oamcell_func_spec;
+static int hf_atm_aal_oamcell_crc;
+static int hf_atm_padding;
+
+static gint ett_atm;
+static gint ett_atm_lane;
+static gint ett_atm_lane_lc_lan_dest;
+static gint ett_atm_lane_lc_lan_dest_rd;
+static gint ett_atm_lane_lc_flags;
+static gint ett_atm_lane_lc_tlv;
+static gint ett_ilmi;
+static gint ett_aal1;
+static gint ett_aal3_4;
+static gint ett_oamaal;
+
+static expert_field ei_atm_reassembly_failed;
 
 static dissector_handle_t atm_handle;
 static dissector_handle_t atm_untruncated_handle;
diff --git a/epan/dissectors/packet-atmtcp.c b/epan/dissectors/packet-atmtcp.c
index d4dd1ef09a..1a6dee5259 100644
--- a/epan/dissectors/packet-atmtcp.c
+++ b/epan/dissectors/packet-atmtcp.c
@@ -23,14 +23,14 @@ void proto_reg_handoff_atmtcp(void);
 
 static dissector_handle_t atmtcp_handle;
 
-static int proto_atmtcp = -1;
-static int hf_atmtcp_vpi = -1;
-static int hf_atmtcp_vci = -1;
-static int hf_atmtcp_length = -1;
+static int proto_atmtcp;
+static int hf_atmtcp_vpi;
+static int hf_atmtcp_vci;
+static int hf_atmtcp_length;
 
 #define ATMTCP_TCP_PORT     2812
 
-static gint ett_atmtcp = -1;
+static gint ett_atmtcp;
 
 #define ATMTCP_HDR_MAGIC        (~0)    /* this length indicates a command */
 #define ATMTCP_CTRL_OPEN        1       /* request/reply */
diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c
index 7273504d4c..3dbfe53e4d 100644
--- a/epan/dissectors/packet-auto_rp.c
+++ b/epan/dissectors/packet-auto_rp.c
@@ -23,24 +23,24 @@ void proto_reg_handoff_auto_rp(void);
 
 static dissector_handle_t auto_rp_handle;
 
-static gint proto_auto_rp = -1;
-static gint ett_auto_rp = -1;
-static gint ett_auto_rp_ver_type = -1;
-static gint ett_auto_rp_map = -1;
-static gint ett_auto_rp_group = -1;
-
-static gint hf_auto_rp_version = -1;
-static gint hf_auto_rp_type = -1;
-static gint hf_auto_rp_count = -1;
-static gint hf_auto_rp_holdtime = -1;
-static gint hf_auto_rp_pim_ver = -1;
-static gint hf_auto_rp_rp_addr = -1;
-static gint hf_auto_rp_prefix_sgn = -1;
-static gint hf_auto_rp_mask_len = -1;
-static gint hf_auto_rp_group_prefix = -1;
-static gint hf_auto_rp_reserved = -1;
-static gint hf_auto_rp_trailing_junk = -1;
-static gint hf_auto_rp_group_num = -1;
+static gint proto_auto_rp;
+static gint ett_auto_rp;
+static gint ett_auto_rp_ver_type;
+static gint ett_auto_rp_map;
+static gint ett_auto_rp_group;
+
+static gint hf_auto_rp_version;
+static gint hf_auto_rp_type;
+static gint hf_auto_rp_count;
+static gint hf_auto_rp_holdtime;
+static gint hf_auto_rp_pim_ver;
+static gint hf_auto_rp_rp_addr;
+static gint hf_auto_rp_prefix_sgn;
+static gint hf_auto_rp_mask_len;
+static gint hf_auto_rp_group_prefix;
+static gint hf_auto_rp_reserved;
+static gint hf_auto_rp_trailing_junk;
+static gint hf_auto_rp_group_num;
 
 #define UDP_PORT_PIM_RP_DISC 496
 
diff --git a/epan/dissectors/packet-autosar-ipdu-multiplexer.c b/epan/dissectors/packet-autosar-ipdu-multiplexer.c
index 067b9be09c..e45051f5c2 100644
--- a/epan/dissectors/packet-autosar-ipdu-multiplexer.c
+++ b/epan/dissectors/packet-autosar-ipdu-multiplexer.c
@@ -32,7 +32,7 @@ void proto_reg_handoff_autosar_ipdu_multiplexer(void);
  */
 
 /* this protocol */
-static int proto_ipdu_multiplexer = -1;
+static int proto_ipdu_multiplexer;
 #define IPDUM_NAME "AUTOSAR I-PduM"
 
 /* dissector handles - incoming messages */
@@ -45,14 +45,14 @@ static dissector_handle_t ipdum_handle_pdu_transport    = NULL;
 static dissector_table_t subdissector_table;
 
 /* header field */
-static int hf_pdu                       = -1;
-static int hf_pdu_id                    = -1;
-static int hf_pdu_name                  = -1;
-static int hf_payload_unparsed          = -1;
+static int hf_pdu;
+static int hf_pdu_id;
+static int hf_pdu_name;
+static int hf_payload_unparsed;
 
 /* etts */
-static gint ett_ipdum                   = -1;
-static gint ett_ipdum_pdu               = -1;
+static gint ett_ipdum;
+static gint ett_ipdum_pdu;
 
 /**************************************
  ********      UAT configs     ********
diff --git a/epan/dissectors/packet-autosar-nm.c b/epan/dissectors/packet-autosar-nm.c
index c02f30baa2..dcec611744 100644
--- a/epan/dissectors/packet-autosar-nm.c
+++ b/epan/dissectors/packet-autosar-nm.c
@@ -39,34 +39,34 @@ typedef struct _user_data_field_t {
   gchar*  udf_value_desc;
 } user_data_field_t;
 
-static int proto_autosar_nm = -1;
+static int proto_autosar_nm;
 
 static dissector_handle_t nm_handle;
 static dissector_handle_t nm_handle_can;
 
 /*** header fields ***/
-static int hf_autosar_nm_source_node_identifier = -1;
-static int hf_autosar_nm_control_bit_vector = -1;
-static int hf_autosar_nm_control_bit_vector_repeat_msg_req = -1;
-static int hf_autosar_nm_control_bit_vector_reserved1 = -1;
-static int hf_autosar_nm_control_bit_vector_pn_shutdown_request = -1;
-static int hf_autosar_nm_control_bit_vector_reserved2 = -1;
-static int hf_autosar_nm_control_bit_vector_nm_coord_id = -1;
-static int hf_autosar_nm_control_bit_vector_reserved3 = -1;
-static int hf_autosar_nm_control_bit_vector_nm_coord_sleep = -1;
-static int hf_autosar_nm_control_bit_vector_reserved4 = -1;
-static int hf_autosar_nm_control_bit_vector_active_wakeup = -1;
-static int hf_autosar_nm_control_bit_vector_reserved5 = -1;
-static int hf_autosar_nm_control_bit_vector_pn_learning = -1;
-static int hf_autosar_nm_control_bit_vector_pni = -1;
-static int hf_autosar_nm_control_bit_vector_reserved6 = -1;
-static int hf_autosar_nm_control_bit_vector_reserved7 = -1;
-static int hf_autosar_nm_user_data = -1;
+static int hf_autosar_nm_source_node_identifier;
+static int hf_autosar_nm_control_bit_vector;
+static int hf_autosar_nm_control_bit_vector_repeat_msg_req;
+static int hf_autosar_nm_control_bit_vector_reserved1;
+static int hf_autosar_nm_control_bit_vector_pn_shutdown_request;
+static int hf_autosar_nm_control_bit_vector_reserved2;
+static int hf_autosar_nm_control_bit_vector_nm_coord_id;
+static int hf_autosar_nm_control_bit_vector_reserved3;
+static int hf_autosar_nm_control_bit_vector_nm_coord_sleep;
+static int hf_autosar_nm_control_bit_vector_reserved4;
+static int hf_autosar_nm_control_bit_vector_active_wakeup;
+static int hf_autosar_nm_control_bit_vector_reserved5;
+static int hf_autosar_nm_control_bit_vector_pn_learning;
+static int hf_autosar_nm_control_bit_vector_pni;
+static int hf_autosar_nm_control_bit_vector_reserved6;
+static int hf_autosar_nm_control_bit_vector_reserved7;
+static int hf_autosar_nm_user_data;
 
 /*** protocol tree items ***/
-static gint ett_autosar_nm = -1;
-static gint ett_autosar_nm_cbv = -1;
-static gint ett_autosar_nm_user_data = -1;
+static gint ett_autosar_nm;
+static gint ett_autosar_nm_cbv;
+static gint ett_autosar_nm_user_data;
 
 /*** Bit meanings ***/
 static const true_false_string tfs_autosar_nm_control_rep_msg_req = {
diff --git a/epan/dissectors/packet-avsp.c b/epan/dissectors/packet-avsp.c
index 80ee3ab313..536399d997 100644
--- a/epan/dissectors/packet-avsp.c
+++ b/epan/dissectors/packet-avsp.c
@@ -60,30 +60,30 @@ void proto_reg_handoff_avsp(void);
 void proto_register_avsp(void);
 
 static dissector_handle_t avsp_handle;
-static int proto_avsp = -1;
+static int proto_avsp;
 
 /* sub trees */
-static gint ett_avsp = -1;
-static gint ett_avsp_ts_48 = -1;
-static gint ett_avsp_ts_64 = -1;
-static gint ett_avsp_tgen_hdr = -1;
-static gint ett_avsp_tgen_hdr_ctrl = -1;
-static gint ett_avsp_tgen_payload = -1;
+static gint ett_avsp;
+static gint ett_avsp_ts_48;
+static gint ett_avsp_ts_64;
+static gint ett_avsp_tgen_hdr;
+static gint ett_avsp_tgen_hdr_ctrl;
+static gint ett_avsp_tgen_payload;
 
 /* AVSP Timestamp subtype header fields */
-static int hf_avsp_subtype = -1;
-static int hf_avsp_ts_version = -1;
-static int hf_avsp_ts_64_tai = -1;
-static int hf_avsp_ts_64_utc = -1;
-static int hf_avsp_ts_64_sec = -1;
-static int hf_avsp_ts_64_ns = -1;
-static int hf_avsp_ts_48_tai = -1;
-static int hf_avsp_ts_48_utc = -1;
-static int hf_avsp_ts_48_sec = -1;
-static int hf_avsp_ts_48_ns = -1;
-
-static int hf_avsp_etype = -1;
-static int hf_avsp_trailer = -1;
+static int hf_avsp_subtype;
+static int hf_avsp_ts_version;
+static int hf_avsp_ts_64_tai;
+static int hf_avsp_ts_64_utc;
+static int hf_avsp_ts_64_sec;
+static int hf_avsp_ts_64_ns;
+static int hf_avsp_ts_48_tai;
+static int hf_avsp_ts_48_utc;
+static int hf_avsp_ts_48_sec;
+static int hf_avsp_ts_48_ns;
+
+static int hf_avsp_etype;
+static int hf_avsp_trailer;
 
 /*
   TGen subtype format
@@ -104,15 +104,15 @@ static int hf_avsp_trailer = -1;
 */
 
 /* AVSP TGen subtype header fields */
-static int hf_avsp_tgen_version = -1;
-static int hf_avsp_tgen_hdr = -1;
-static int hf_avsp_tgen_hdr_ctrl = -1;
-static int hf_avsp_tgen_hdr_ctrl_fcs_inverted = -1;
-static int hf_avsp_tgen_hdr_ctrl_reserved = -1;
-static int hf_avsp_tgen_hdr_seq_num = -1;
-static int hf_avsp_tgen_hdr_payload_len = -1;
-static int hf_avsp_tgen_payload = -1;
-static int hf_avsp_tgen_payload_data = -1;
+static int hf_avsp_tgen_version;
+static int hf_avsp_tgen_hdr;
+static int hf_avsp_tgen_hdr_ctrl;
+static int hf_avsp_tgen_hdr_ctrl_fcs_inverted;
+static int hf_avsp_tgen_hdr_ctrl_reserved;
+static int hf_avsp_tgen_hdr_seq_num;
+static int hf_avsp_tgen_hdr_payload_len;
+static int hf_avsp_tgen_payload;
+static int hf_avsp_tgen_payload_data;
 
 static int* const avsp_tgen_ctrl[] = {
     &hf_avsp_tgen_hdr_ctrl_fcs_inverted,
@@ -141,9 +141,9 @@ static const value_string tgen_versions[] = {
     {0, NULL}
 };
 
-static expert_field ei_avsp_unknown_subtype = EI_INIT;
-static expert_field ei_avsp_ts_unknown_version = EI_INIT;
-static expert_field ei_avsp_tgen_unknown_version = EI_INIT;
+static expert_field ei_avsp_unknown_subtype;
+static expert_field ei_avsp_ts_unknown_version;
+static expert_field ei_avsp_tgen_unknown_version;
 
 static int
 dissect_avsp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* data _U_)
diff --git a/epan/dissectors/packet-awdl.c b/epan/dissectors/packet-awdl.c
index 3950937d5f..b202f788eb 100644
--- a/epan/dissectors/packet-awdl.c
+++ b/epan/dissectors/packet-awdl.c
@@ -37,258 +37,258 @@ typedef struct awdl_tagged_field_data
 
 static const unit_name_string units_ieee80211_tu = { " TU", NULL }; /* 1 TU = 1024 microseconds */
 
-static int proto_awdl = -1;
-static int proto_awdl_data = -1;
-
-static int hf_awdl_unknown = -1;
-
-static int hf_awdl_fixed_parameters = -1;
-static int hf_awdl_tagged_parameters = -1;
-
-static int hf_awdl_data_seq = -1;
-static int hf_awdl_data_header = -1;
-static int hf_awdl_data_ethertype = -1;
-
-static int hf_awdl_type = -1;
-static int hf_awdl_subtype = -1;
-static int hf_awdl_rsvd = -1;
-static int hf_awdl_phytime = -1;
-static int hf_awdl_targettime = -1;
-static int hf_awdl_txdelay = -1;
-
-static int hf_awdl_tag = -1;
-static int hf_awdl_tag_number = -1;
-static int hf_awdl_tag_length = -1;
-static int hf_awdl_tag_data = -1;
-static int hf_awdl_tag_padding = -1;
-
-static int hf_awdl_version = -1;
-static int hf_awdl_version_minor = -1;
-static int hf_awdl_version_major = -1;
-static int hf_awdl_version_devclass = -1;
-
-static int hf_awdl_datastate_flags = -1;
-static int hf_awdl_datastate_flags_0 = -1;
-static int hf_awdl_datastate_flags_1 = -1;
-static int hf_awdl_datastate_flags_2 = -1;
-static int hf_awdl_datastate_flags_3 = -1;
-static int hf_awdl_datastate_flags_4 = -1;
-static int hf_awdl_datastate_flags_5 = -1;
-static int hf_awdl_datastate_flags_6 = -1;
-static int hf_awdl_datastate_flags_7 = -1;
-static int hf_awdl_datastate_flags_8 = -1;
-static int hf_awdl_datastate_flags_9 = -1;
-static int hf_awdl_datastate_flags_10 = -1;
-static int hf_awdl_datastate_flags_11 = -1;
-static int hf_awdl_datastate_flags_12 = -1;
-static int hf_awdl_datastate_flags_13 = -1;
-static int hf_awdl_datastate_flags_14 = -1;
-static int hf_awdl_datastate_flags_15 = -1;
-static int hf_awdl_datastate_extflags = -1;
-static int hf_awdl_datastate_extflags_0 = -1;
-static int hf_awdl_datastate_extflags_1 = -1;
-static int hf_awdl_datastate_extflags_2 = -1;
-static int hf_awdl_datastate_extflags_3to15 = -1;
-static int hf_awdl_datastate_infra_channel = -1;
-static int hf_awdl_datastate_countrycode = -1;
-static int hf_awdl_datastate_social_channel = -1;
-static int hf_awdl_datastate_social_channel_map = -1;
-static int hf_awdl_datastate_social_channel_map_6 = -1;
-static int hf_awdl_datastate_social_channel_map_44 = -1;
-static int hf_awdl_datastate_social_channel_map_149 = -1;
-static int hf_awdl_datastate_social_channel_map_unused = -1;
-static int hf_awdl_datastate_infra_bssid = -1;
-static int hf_awdl_datastate_infra_address = -1;
-static int hf_awdl_datastate_awdl_address = -1;
-static int hf_awdl_datastate_umi = -1;
-static int hf_awdl_datastate_umioptions = -1;
-static int hf_awdl_datastate_umioptions_length = -1;
-static int hf_awdl_datastate_logtrigger = -1;
-static int hf_awdl_datastate_undecoded = -1;
-
-static int hf_awdl_synctree_addr = -1;
-
-static int hf_awdl_syncparams_master = -1;
-static int hf_awdl_syncparams_awcounter = -1;
-static int hf_awdl_syncparams_apbeaconalignment = -1;
-static int hf_awdl_syncparams_tx_chan = -1;
-static int hf_awdl_syncparams_tx_counter = -1;
-static int hf_awdl_syncparams_master_chan = -1;
-static int hf_awdl_syncparams_guard_time = -1;
-static int hf_awdl_syncparams_aw_period = -1;
-static int hf_awdl_syncparams_action_frame_period = -1;
-static int hf_awdl_syncparams_awdl_flags = -1;
-static int hf_awdl_syncparams_aw_ext_length = -1;
-static int hf_awdl_syncparams_aw_cmn_length = -1;
-static int hf_awdl_syncparams_aw_remaining = -1;
-static int hf_awdl_syncparams_ext_min = -1;
-static int hf_awdl_syncparams_ext_max_multi = -1;
-static int hf_awdl_syncparams_ext_max_uni = -1;
-static int hf_awdl_syncparams_ext_max_af = -1;
-static int hf_awdl_syncparams_presence_mode = -1;
-
-static int hf_awdl_channelseq_enc = -1;
-static int hf_awdl_channelseq_duplicate = -1;
-static int hf_awdl_channelseq_step_count = -1;
-static int hf_awdl_channelseq_fill_chan = -1;
-static int hf_awdl_channelseq_channel_count = -1;
-static int hf_awdl_channelseq_channel_list = -1;
-static int hf_awdl_channelseq_channel = -1;
-static int hf_awdl_channelseq_channel_number = -1;
-static int hf_awdl_channelseq_channel_flags = -1;
-static int hf_awdl_channelseq_channel_operating_class = -1;
+static int proto_awdl;
+static int proto_awdl_data;
+
+static int hf_awdl_unknown;
+
+static int hf_awdl_fixed_parameters;
+static int hf_awdl_tagged_parameters;
+
+static int hf_awdl_data_seq;
+static int hf_awdl_data_header;
+static int hf_awdl_data_ethertype;
+
+static int hf_awdl_type;
+static int hf_awdl_subtype;
+static int hf_awdl_rsvd;
+static int hf_awdl_phytime;
+static int hf_awdl_targettime;
+static int hf_awdl_txdelay;
+
+static int hf_awdl_tag;
+static int hf_awdl_tag_number;
+static int hf_awdl_tag_length;
+static int hf_awdl_tag_data;
+static int hf_awdl_tag_padding;
+
+static int hf_awdl_version;
+static int hf_awdl_version_minor;
+static int hf_awdl_version_major;
+static int hf_awdl_version_devclass;
+
+static int hf_awdl_datastate_flags;
+static int hf_awdl_datastate_flags_0;
+static int hf_awdl_datastate_flags_1;
+static int hf_awdl_datastate_flags_2;
+static int hf_awdl_datastate_flags_3;
+static int hf_awdl_datastate_flags_4;
+static int hf_awdl_datastate_flags_5;
+static int hf_awdl_datastate_flags_6;
+static int hf_awdl_datastate_flags_7;
+static int hf_awdl_datastate_flags_8;
+static int hf_awdl_datastate_flags_9;
+static int hf_awdl_datastate_flags_10;
+static int hf_awdl_datastate_flags_11;
+static int hf_awdl_datastate_flags_12;
+static int hf_awdl_datastate_flags_13;
+static int hf_awdl_datastate_flags_14;
+static int hf_awdl_datastate_flags_15;
+static int hf_awdl_datastate_extflags;
+static int hf_awdl_datastate_extflags_0;
+static int hf_awdl_datastate_extflags_1;
+static int hf_awdl_datastate_extflags_2;
+static int hf_awdl_datastate_extflags_3to15;
+static int hf_awdl_datastate_infra_channel;
+static int hf_awdl_datastate_countrycode;
+static int hf_awdl_datastate_social_channel;
+static int hf_awdl_datastate_social_channel_map;
+static int hf_awdl_datastate_social_channel_map_6;
+static int hf_awdl_datastate_social_channel_map_44;
+static int hf_awdl_datastate_social_channel_map_149;
+static int hf_awdl_datastate_social_channel_map_unused;
+static int hf_awdl_datastate_infra_bssid;
+static int hf_awdl_datastate_infra_address;
+static int hf_awdl_datastate_awdl_address;
+static int hf_awdl_datastate_umi;
+static int hf_awdl_datastate_umioptions;
+static int hf_awdl_datastate_umioptions_length;
+static int hf_awdl_datastate_logtrigger;
+static int hf_awdl_datastate_undecoded;
+
+static int hf_awdl_synctree_addr;
+
+static int hf_awdl_syncparams_master;
+static int hf_awdl_syncparams_awcounter;
+static int hf_awdl_syncparams_apbeaconalignment;
+static int hf_awdl_syncparams_tx_chan;
+static int hf_awdl_syncparams_tx_counter;
+static int hf_awdl_syncparams_master_chan;
+static int hf_awdl_syncparams_guard_time;
+static int hf_awdl_syncparams_aw_period;
+static int hf_awdl_syncparams_action_frame_period;
+static int hf_awdl_syncparams_awdl_flags;
+static int hf_awdl_syncparams_aw_ext_length;
+static int hf_awdl_syncparams_aw_cmn_length;
+static int hf_awdl_syncparams_aw_remaining;
+static int hf_awdl_syncparams_ext_min;
+static int hf_awdl_syncparams_ext_max_multi;
+static int hf_awdl_syncparams_ext_max_uni;
+static int hf_awdl_syncparams_ext_max_af;
+static int hf_awdl_syncparams_presence_mode;
+
+static int hf_awdl_channelseq_enc;
+static int hf_awdl_channelseq_duplicate;
+static int hf_awdl_channelseq_step_count;
+static int hf_awdl_channelseq_fill_chan;
+static int hf_awdl_channelseq_channel_count;
+static int hf_awdl_channelseq_channel_list;
+static int hf_awdl_channelseq_channel;
+static int hf_awdl_channelseq_channel_number;
+static int hf_awdl_channelseq_channel_flags;
+static int hf_awdl_channelseq_channel_operating_class;
 /* legacy encoding flags */
-static int hf_awdl_channelseq_legacy_unused = -1;
-static int hf_awdl_channelseq_legacy_band = -1;
-static int hf_awdl_channelseq_legacy_bandwidth = -1;
-static int hf_awdl_channelseq_legacy_control_channel = -1;
-
-static int hf_awdl_electionparams_master = -1;
-static int hf_awdl_electionparams_flags = -1;
-static int hf_awdl_electionparams_id = -1;
-static int hf_awdl_electionparams_distance = -1;
-static int hf_awdl_electionparams_mastermetric = -1;
-static int hf_awdl_electionparams_selfmetric = -1;
-static int hf_awdl_electionparams_unknown = -1;
-static int hf_awdl_electionparams_private_master = -1;
-static int hf_awdl_electionparams_private_mastermetric = -1;
-static int hf_awdl_electionparams_private_id = -1;
-static int hf_awdl_electionparams_private_phc = -1;
-
-static int hf_awdl_electionparams2_master = -1;
-static int hf_awdl_electionparams2_other = -1;
-static int hf_awdl_electionparams2_mastermetric = -1;
-static int hf_awdl_electionparams2_selfmetric = -1;
-static int hf_awdl_electionparams2_mastercounter = -1;
-static int hf_awdl_electionparams2_selfcounter = -1;
-static int hf_awdl_electionparams2_distance = -1;
-static int hf_awdl_electionparams2_unknown = -1;
-static int hf_awdl_electionparams2_reserved = -1;
-
-static int hf_awdl_dns_name_len = -1;
-static int hf_awdl_dns_name = -1;
-static int hf_awdl_dns_name_label = -1;
-static int hf_awdl_dns_name_short = -1;
-static int hf_awdl_dns_type = -1;
-static int hf_awdl_dns_data_len = -1;
-static int hf_awdl_dns_txt = -1;
-static int hf_awdl_dns_ptr = -1;
-static int hf_awdl_dns_ptr_label = -1;
-static int hf_awdl_dns_ptr_short = -1;
-static int hf_awdl_dns_target = -1;
-static int hf_awdl_dns_target_label = -1;
-static int hf_awdl_dns_target_short = -1;
-static int hf_awdl_dns_unknown = -1;
-static int hf_awdl_dns_priority = -1;
-static int hf_awdl_dns_weight = -1;
-static int hf_awdl_dns_port = -1;
-
-static int hf_awdl_serviceparams_sui = -1;
-static int hf_awdl_serviceparams_enc_values = -1;
-static int hf_awdl_serviceparams_bitmask = -1;
-static int hf_awdl_serviceparams_bitmask_0 = -1;
-static int hf_awdl_serviceparams_bitmask_1 = -1;
-static int hf_awdl_serviceparams_bitmask_2 = -1;
-static int hf_awdl_serviceparams_bitmask_3 = -1;
-static int hf_awdl_serviceparams_bitmask_4 = -1;
-static int hf_awdl_serviceparams_bitmask_5 = -1;
-static int hf_awdl_serviceparams_bitmask_6 = -1;
-static int hf_awdl_serviceparams_bitmask_7 = -1;
-static int hf_awdl_serviceparams_bitmask_8 = -1;
-static int hf_awdl_serviceparams_bitmask_9 = -1;
-static int hf_awdl_serviceparams_bitmask_10 = -1;
-static int hf_awdl_serviceparams_bitmask_11 = -1;
-static int hf_awdl_serviceparams_bitmask_12= -1;
-static int hf_awdl_serviceparams_bitmask_13 = -1;
-static int hf_awdl_serviceparams_bitmask_14 = -1;
-static int hf_awdl_serviceparams_bitmask_15 = -1;
-static int hf_awdl_serviceparams_bitmask_16 = -1;
-static int hf_awdl_serviceparams_bitmask_17 = -1;
-static int hf_awdl_serviceparams_bitmask_18 = -1;
-static int hf_awdl_serviceparams_bitmask_19 = -1;
-static int hf_awdl_serviceparams_bitmask_20 = -1;
-static int hf_awdl_serviceparams_bitmask_21 = -1;
-static int hf_awdl_serviceparams_bitmask_22 = -1;
-static int hf_awdl_serviceparams_bitmask_23 = -1;
-static int hf_awdl_serviceparams_bitmask_24 = -1;
-static int hf_awdl_serviceparams_bitmask_25 = -1;
-static int hf_awdl_serviceparams_bitmask_26 = -1;
-static int hf_awdl_serviceparams_bitmask_27 = -1;
-static int hf_awdl_serviceparams_bitmask_28 = -1;
-static int hf_awdl_serviceparams_bitmask_29 = -1;
-static int hf_awdl_serviceparams_bitmask_30 = -1;
-static int hf_awdl_serviceparams_bitmask_31 = -1;
-static int hf_awdl_serviceparams_values = -1;
-static int hf_awdl_serviceparams_values_0 = -1;
-static int hf_awdl_serviceparams_values_1 = -1;
-static int hf_awdl_serviceparams_values_2 = -1;
-static int hf_awdl_serviceparams_values_3 = -1;
-static int hf_awdl_serviceparams_values_4 = -1;
-static int hf_awdl_serviceparams_values_5 = -1;
-static int hf_awdl_serviceparams_values_6 = -1;
-static int hf_awdl_serviceparams_values_7 = -1;
-
-static int hf_awdl_arpa = -1;
-static int hf_awdl_arpa_flags = -1;
-static int hf_awdl_arpa_name = -1;
-static int hf_awdl_arpa_short = -1;
-
-static int hf_awdl_ht_unknown = -1;
+static int hf_awdl_channelseq_legacy_unused;
+static int hf_awdl_channelseq_legacy_band;
+static int hf_awdl_channelseq_legacy_bandwidth;
+static int hf_awdl_channelseq_legacy_control_channel;
+
+static int hf_awdl_electionparams_master;
+static int hf_awdl_electionparams_flags;
+static int hf_awdl_electionparams_id;
+static int hf_awdl_electionparams_distance;
+static int hf_awdl_electionparams_mastermetric;
+static int hf_awdl_electionparams_selfmetric;
+static int hf_awdl_electionparams_unknown;
+static int hf_awdl_electionparams_private_master;
+static int hf_awdl_electionparams_private_mastermetric;
+static int hf_awdl_electionparams_private_id;
+static int hf_awdl_electionparams_private_phc;
+
+static int hf_awdl_electionparams2_master;
+static int hf_awdl_electionparams2_other;
+static int hf_awdl_electionparams2_mastermetric;
+static int hf_awdl_electionparams2_selfmetric;
+static int hf_awdl_electionparams2_mastercounter;
+static int hf_awdl_electionparams2_selfcounter;
+static int hf_awdl_electionparams2_distance;
+static int hf_awdl_electionparams2_unknown;
+static int hf_awdl_electionparams2_reserved;
+
+static int hf_awdl_dns_name_len;
+static int hf_awdl_dns_name;
+static int hf_awdl_dns_name_label;
+static int hf_awdl_dns_name_short;
+static int hf_awdl_dns_type;
+static int hf_awdl_dns_data_len;
+static int hf_awdl_dns_txt;
+static int hf_awdl_dns_ptr;
+static int hf_awdl_dns_ptr_label;
+static int hf_awdl_dns_ptr_short;
+static int hf_awdl_dns_target;
+static int hf_awdl_dns_target_label;
+static int hf_awdl_dns_target_short;
+static int hf_awdl_dns_unknown;
+static int hf_awdl_dns_priority;
+static int hf_awdl_dns_weight;
+static int hf_awdl_dns_port;
+
+static int hf_awdl_serviceparams_sui;
+static int hf_awdl_serviceparams_enc_values;
+static int hf_awdl_serviceparams_bitmask;
+static int hf_awdl_serviceparams_bitmask_0;
+static int hf_awdl_serviceparams_bitmask_1;
+static int hf_awdl_serviceparams_bitmask_2;
+static int hf_awdl_serviceparams_bitmask_3;
+static int hf_awdl_serviceparams_bitmask_4;
+static int hf_awdl_serviceparams_bitmask_5;
+static int hf_awdl_serviceparams_bitmask_6;
+static int hf_awdl_serviceparams_bitmask_7;
+static int hf_awdl_serviceparams_bitmask_8;
+static int hf_awdl_serviceparams_bitmask_9;
+static int hf_awdl_serviceparams_bitmask_10;
+static int hf_awdl_serviceparams_bitmask_11;
+static int hf_awdl_serviceparams_bitmask_12;
+static int hf_awdl_serviceparams_bitmask_13;
+static int hf_awdl_serviceparams_bitmask_14;
+static int hf_awdl_serviceparams_bitmask_15;
+static int hf_awdl_serviceparams_bitmask_16;
+static int hf_awdl_serviceparams_bitmask_17;
+static int hf_awdl_serviceparams_bitmask_18;
+static int hf_awdl_serviceparams_bitmask_19;
+static int hf_awdl_serviceparams_bitmask_20;
+static int hf_awdl_serviceparams_bitmask_21;
+static int hf_awdl_serviceparams_bitmask_22;
+static int hf_awdl_serviceparams_bitmask_23;
+static int hf_awdl_serviceparams_bitmask_24;
+static int hf_awdl_serviceparams_bitmask_25;
+static int hf_awdl_serviceparams_bitmask_26;
+static int hf_awdl_serviceparams_bitmask_27;
+static int hf_awdl_serviceparams_bitmask_28;
+static int hf_awdl_serviceparams_bitmask_29;
+static int hf_awdl_serviceparams_bitmask_30;
+static int hf_awdl_serviceparams_bitmask_31;
+static int hf_awdl_serviceparams_values;
+static int hf_awdl_serviceparams_values_0;
+static int hf_awdl_serviceparams_values_1;
+static int hf_awdl_serviceparams_values_2;
+static int hf_awdl_serviceparams_values_3;
+static int hf_awdl_serviceparams_values_4;
+static int hf_awdl_serviceparams_values_5;
+static int hf_awdl_serviceparams_values_6;
+static int hf_awdl_serviceparams_values_7;
+
+static int hf_awdl_arpa;
+static int hf_awdl_arpa_flags;
+static int hf_awdl_arpa_name;
+static int hf_awdl_arpa_short;
+
+static int hf_awdl_ht_unknown;
 /* from hf_ieee80211_* from packet-ieee80211.c */
-static int hf_awdl_ht_cap = -1;
-static int hf_awdl_ht_ldpc_coding = -1;
-static int hf_awdl_ht_chan_width = -1;
-static int hf_awdl_ht_sm_pwsave = -1;
-static int hf_awdl_ht_green = -1;
-static int hf_awdl_ht_short20 = -1;
-static int hf_awdl_ht_short40 = -1;
-static int hf_awdl_ht_tx_stbc = -1;
-static int hf_awdl_ht_rx_stbc = -1;
-static int hf_awdl_ht_delayed_block_ack = -1;
-static int hf_awdl_ht_max_amsdu = -1;
-static int hf_awdl_ht_dss_cck_40 = -1;
-static int hf_awdl_ht_psmp = -1;
-static int hf_awdl_ht_40_mhz_intolerant = -1;
-static int hf_awdl_ht_l_sig = -1;
-static int hf_awdl_ampduparam = -1;
-static int hf_awdl_ampduparam_mpdu = -1;
-static int hf_awdl_ampduparam_mpdu_start_spacing = -1;
-static int hf_awdl_ampduparam_reserved = -1;
-static int hf_awdl_mcsset = -1;
-static int hf_awdl_mcsset_rx_bitmask = -1;
-static int hf_awdl_mcsset_rx_bitmask_0to7 = -1;
-static int hf_awdl_mcsset_rx_bitmask_8to15 = -1;
-static int hf_awdl_mcsset_rx_bitmask_16to23 = -1;
-static int hf_awdl_mcsset_rx_bitmask_24to31 = -1;
-
-static int hf_llc_apple_awdl_pid = -1;
-
-static gint ett_awdl_data = -1;
-static gint ett_awdl = -1;
-static gint ett_awdl_fixed_parameters = -1;
-static gint ett_awdl_tagged_parameters = -1;
-static gint ett_awdl_unknown = -1;
-static gint ett_awdl_tag = -1;
-static gint ett_awdl_channelseq_flags = -1;
-static gint ett_awdl_version = -1;
-static gint ett_awdl_dns_record = -1;
-static gint ett_awdl_dns_name = -1;
-static gint ett_awdl_channelseq_channel_list = -1;
-static gint ett_awdl_channelseq_channel = -1;
-static gint ett_awdl_datastate_flags = -1;
-static gint ett_awdl_datastate_social_channel_map = -1;
-static gint ett_awdl_datastate_extflags = -1;
-static gint ett_awdl_ht_capabilities = -1;
-static gint ett_awdl_ht_ampduparam = -1;
-static gint ett_awdl_ht_mcsset_tree = -1;
-static gint ett_awdl_ht_mcsbit_tree = -1;
-static gint ett_awdl_serviceparams_bitmask = -1;
-static gint ett_awdl_serviceparams_values = -1;
-static gint ett_awdl_serviceparams_value = -1;
-
-static expert_field ei_awdl_tag_length = EI_INIT;
-static expert_field ei_awdl_tag_data = EI_INIT;
-static expert_field ei_awdl_dns_data_len = EI_INIT;
+static int hf_awdl_ht_cap;
+static int hf_awdl_ht_ldpc_coding;
+static int hf_awdl_ht_chan_width;
+static int hf_awdl_ht_sm_pwsave;
+static int hf_awdl_ht_green;
+static int hf_awdl_ht_short20;
+static int hf_awdl_ht_short40;
+static int hf_awdl_ht_tx_stbc;
+static int hf_awdl_ht_rx_stbc;
+static int hf_awdl_ht_delayed_block_ack;
+static int hf_awdl_ht_max_amsdu;
+static int hf_awdl_ht_dss_cck_40;
+static int hf_awdl_ht_psmp;
+static int hf_awdl_ht_40_mhz_intolerant;
+static int hf_awdl_ht_l_sig;
+static int hf_awdl_ampduparam;
+static int hf_awdl_ampduparam_mpdu;
+static int hf_awdl_ampduparam_mpdu_start_spacing;
+static int hf_awdl_ampduparam_reserved;
+static int hf_awdl_mcsset;
+static int hf_awdl_mcsset_rx_bitmask;
+static int hf_awdl_mcsset_rx_bitmask_0to7;
+static int hf_awdl_mcsset_rx_bitmask_8to15;
+static int hf_awdl_mcsset_rx_bitmask_16to23;
+static int hf_awdl_mcsset_rx_bitmask_24to31;
+
+static int hf_llc_apple_awdl_pid;
+
+static gint ett_awdl_data;
+static gint ett_awdl;
+static gint ett_awdl_fixed_parameters;
+static gint ett_awdl_tagged_parameters;
+static gint ett_awdl_unknown;
+static gint ett_awdl_tag;
+static gint ett_awdl_channelseq_flags;
+static gint ett_awdl_version;
+static gint ett_awdl_dns_record;
+static gint ett_awdl_dns_name;
+static gint ett_awdl_channelseq_channel_list;
+static gint ett_awdl_channelseq_channel;
+static gint ett_awdl_datastate_flags;
+static gint ett_awdl_datastate_social_channel_map;
+static gint ett_awdl_datastate_extflags;
+static gint ett_awdl_ht_capabilities;
+static gint ett_awdl_ht_ampduparam;
+static gint ett_awdl_ht_mcsset_tree;
+static gint ett_awdl_ht_mcsbit_tree;
+static gint ett_awdl_serviceparams_bitmask;
+static gint ett_awdl_serviceparams_values;
+static gint ett_awdl_serviceparams_value;
+
+static expert_field ei_awdl_tag_length;
+static expert_field ei_awdl_tag_data;
+static expert_field ei_awdl_dns_data_len;
 
 static dissector_table_t ethertype_subdissector_table;
 static dissector_table_t tagged_field_table;
diff --git a/epan/dissectors/packet-ax25-kiss.c b/epan/dissectors/packet-ax25-kiss.c
index abb442da11..e565216a66 100644
--- a/epan/dissectors/packet-ax25-kiss.c
+++ b/epan/dissectors/packet-ax25-kiss.c
@@ -128,22 +128,22 @@ void proto_register_ax25_kiss(void);
 void proto_reg_handoff_ax25_kiss(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_ax25_kiss           = -1;
+static int proto_ax25_kiss;
 
-static int hf_ax25_kiss_cmd		= -1;
-static int hf_ax25_kiss_port		= -1;
-static int hf_ax25_kiss_txdelay		= -1;
-static int hf_ax25_kiss_persistence	= -1;
-static int hf_ax25_kiss_slottime	= -1;
-static int hf_ax25_kiss_txtail		= -1;
-static int hf_ax25_kiss_fullduplex	= -1;
-static int hf_ax25_kiss_sethardware	= -1;
-static int hf_ax25_kiss_data_ack	= -1;
-static int hf_ax25_kiss_cksum		= -1;
+static int hf_ax25_kiss_cmd;
+static int hf_ax25_kiss_port;
+static int hf_ax25_kiss_txdelay;
+static int hf_ax25_kiss_persistence;
+static int hf_ax25_kiss_slottime;
+static int hf_ax25_kiss_txtail;
+static int hf_ax25_kiss_fullduplex;
+static int hf_ax25_kiss_sethardware;
+static int hf_ax25_kiss_data_ack;
+static int hf_ax25_kiss_cksum;
 
 
 /* Initialize the subtree pointers */
-static gint ett_ax25_kiss = -1;
+static gint ett_ax25_kiss;
 
 static dissector_handle_t kiss_handle;
 
diff --git a/epan/dissectors/packet-ax25-nol3.c b/epan/dissectors/packet-ax25-nol3.c
index 67207b02c0..a919116fae 100644
--- a/epan/dissectors/packet-ax25-nol3.c
+++ b/epan/dissectors/packet-ax25-nol3.c
@@ -47,21 +47,21 @@ void proto_reg_handoff_ax25_nol3(void);
 static dissector_handle_t aprs_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_ax25_nol3		= -1;
-static int proto_dx			= -1;
+static int proto_ax25_nol3;
+static int proto_dx;
 
-static int hf_dx_report			= -1;
+static int hf_dx_report;
 
-/* static int hf_text			= -1; */
+/* static int hf_text; */
 
 /* Global preferences */
 static gboolean gPREF_APRS     = FALSE;
 static gboolean gPREF_DX       = FALSE;
 
 /* Initialize the subtree pointers */
-static gint ett_ax25_nol3 = -1;
+static gint ett_ax25_nol3;
 
-static gint ett_dx		= -1;
+static gint ett_dx;
 
 
 /* Code to actually dissect the packets */
diff --git a/epan/dissectors/packet-ax25.c b/epan/dissectors/packet-ax25.c
index f1740b5038..a7de32e471 100644
--- a/epan/dissectors/packet-ax25.c
+++ b/epan/dissectors/packet-ax25.c
@@ -53,27 +53,27 @@ static dissector_table_t ax25_dissector_table;
 static capture_dissector_handle_t ax25_cap_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_ax25		= -1;
-static int hf_ax25_dst		= -1;
-static int hf_ax25_src		= -1;
+static int proto_ax25;
+static int hf_ax25_dst;
+static int hf_ax25_src;
 static int hf_ax25_via[ AX25_MAX_DIGIS ];
 
-static int hf_ax25_ctl		= -1;
+static int hf_ax25_ctl;
 
-static int hf_ax25_n_r		= -1;
-static int hf_ax25_n_s		= -1;
+static int hf_ax25_n_r;
+static int hf_ax25_n_s;
 
-static int hf_ax25_p		= -1;
-static int hf_ax25_f		= -1;
+static int hf_ax25_p;
+static int hf_ax25_f;
 
-static int hf_ax25_ftype_s	= -1;
-static int hf_ax25_ftype_i	= -1;
-static int hf_ax25_ftype_su	= -1;
+static int hf_ax25_ftype_s;
+static int hf_ax25_ftype_i;
+static int hf_ax25_ftype_su;
 
-static int hf_ax25_u_cmd	= -1;
-static int hf_ax25_u_resp	= -1;
+static int hf_ax25_u_cmd;
+static int hf_ax25_u_resp;
 
-static int hf_ax25_pid		= -1;
+static int hf_ax25_pid;
 
 static const xdlc_cf_items ax25_cf_items = {
 	&hf_ax25_n_r,
@@ -105,8 +105,8 @@ static const value_string pid_vals[] = {
 	{ 0, NULL }
 };
 
-static gint ett_ax25 = -1;
-static gint ett_ax25_ctl = -1;
+static gint ett_ax25;
+static gint ett_ax25_ctl;
 
 static dissector_handle_t ax25_handle;
 
diff --git a/epan/dissectors/packet-ax4000.c b/epan/dissectors/packet-ax4000.c
index 44c0397d87..e89c19fcb2 100644
--- a/epan/dissectors/packet-ax4000.c
+++ b/epan/dissectors/packet-ax4000.c
@@ -20,17 +20,17 @@ void proto_reg_handoff_ax4000(void);
 static dissector_handle_t ax4000_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_ax4000 = -1;
-static int hf_ax4000_port = -1;
-static int hf_ax4000_chassis = -1;
-static int hf_ax4000_fill = -1;
-static int hf_ax4000_index = -1;
-static int hf_ax4000_timestamp = -1;
-static int hf_ax4000_seq = -1;
-static int hf_ax4000_crc = -1;
+static int proto_ax4000;
+static int hf_ax4000_port;
+static int hf_ax4000_chassis;
+static int hf_ax4000_fill;
+static int hf_ax4000_index;
+static int hf_ax4000_timestamp;
+static int hf_ax4000_seq;
+static int hf_ax4000_crc;
 
 /* Initialize the subtree pointers */
-static gint ett_ax4000 = -1;
+static gint ett_ax4000;
 
 /* Code to actually dissect the packets */
 static int
diff --git a/epan/dissectors/packet-ayiya.c b/epan/dissectors/packet-ayiya.c
index b01bc8947c..725e4da0bb 100644
--- a/epan/dissectors/packet-ayiya.c
+++ b/epan/dissectors/packet-ayiya.c
@@ -21,19 +21,19 @@ void proto_reg_handoff_ayiya(void);
 
 static dissector_table_t ip_dissector_table;
 
-static int proto_ayiya = -1;
-static int hf_id_len = -1;
-static int hf_id_type = -1;
-static int hf_sig_len = -1;
-static int hf_hash_method = -1;
-static int hf_auth_method = -1;
-static int hf_opcode = -1;
-static int hf_next_header = -1;
-static int hf_epoch = -1;
-static int hf_identity = -1;
-static int hf_signature = -1;
-
-static gint ett_ayiya = -1;
+static int proto_ayiya;
+static int hf_id_len;
+static int hf_id_type;
+static int hf_sig_len;
+static int hf_hash_method;
+static int hf_auth_method;
+static int hf_opcode;
+static int hf_next_header;
+static int hf_epoch;
+static int hf_identity;
+static int hf_signature;
+
+static gint ett_ayiya;
 
 static dissector_handle_t ayiya_handle = NULL;
 
diff --git a/epan/dissectors/packet-babel.c b/epan/dissectors/packet-babel.c
index a6043d90d3..4adf93c649 100644
--- a/epan/dissectors/packet-babel.c
+++ b/epan/dissectors/packet-babel.c
@@ -18,41 +18,41 @@ void proto_reg_handoff_babel(void);
 
 static dissector_handle_t babel_handle;
 
-static int proto_babel = -1;
-
-static gint ett_babel = -1;
-static int hf_babel_magic = -1;
-static int hf_babel_version = -1;
-static int hf_babel_bodylen = -1;
-
-static int hf_babel_message = -1;
-static gint ett_message = -1;
-static int hf_babel_message_type = -1;
-static int hf_babel_message_length = -1;
-static int hf_babel_message_nonce = -1;
-static int hf_babel_message_interval = -1;
-static int hf_babel_message_seqno = -1;
-static int hf_babel_message_ae = -1;
-static int hf_babel_message_prefix = -1;
-static int hf_babel_message_rxcost = -1;
-static int hf_babel_message_routerid = -1;
-static int hf_babel_message_flags = -1;
-static int hf_babel_message_plen = -1;
-static int hf_babel_message_omitted = -1;
-static int hf_babel_message_metric = -1;
-static int hf_babel_message_hopcount = -1;
-static int hf_babel_message_index = -1;
-static int hf_babel_subtlv = -1;
-static int hf_babel_subtlv_type = -1;
-static int hf_babel_subtlv_len = -1;
-static int hf_babel_subtlv_diversity = -1;
-
-static gint ett_subtree = -1;
-static gint ett_packet_trailer = -1;
-static gint ett_unicast = -1;
-static gint ett_subtlv = -1;
-static gint ett_timestamp = -1;
-static gint ett_mandatory = -1;
+static int proto_babel;
+
+static gint ett_babel;
+static int hf_babel_magic;
+static int hf_babel_version;
+static int hf_babel_bodylen;
+
+static int hf_babel_message;
+static gint ett_message;
+static int hf_babel_message_type;
+static int hf_babel_message_length;
+static int hf_babel_message_nonce;
+static int hf_babel_message_interval;
+static int hf_babel_message_seqno;
+static int hf_babel_message_ae;
+static int hf_babel_message_prefix;
+static int hf_babel_message_rxcost;
+static int hf_babel_message_routerid;
+static int hf_babel_message_flags;
+static int hf_babel_message_plen;
+static int hf_babel_message_omitted;
+static int hf_babel_message_metric;
+static int hf_babel_message_hopcount;
+static int hf_babel_message_index;
+static int hf_babel_subtlv;
+static int hf_babel_subtlv_type;
+static int hf_babel_subtlv_len;
+static int hf_babel_subtlv_diversity;
+
+static gint ett_subtree;
+static gint ett_packet_trailer;
+static gint ett_unicast;
+static gint ett_subtlv;
+static gint ett_timestamp;
+static gint ett_mandatory;
 
 #define UDP_PORT_RANGE_BABEL "6696"
 
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index 48f936654e..2a2a771092 100644
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -6647,92 +6647,92 @@ BACnetVendorIdentifiers [] = {
 };
 static value_string_ext BACnetVendorIdentifiers_ext = VALUE_STRING_EXT_INIT(BACnetVendorIdentifiers);
 
-static int proto_bacapp = -1;
-static int hf_bacapp_type = -1;
-static int hf_bacapp_pduflags = -1;
-static int hf_bacapp_SEG = -1;
-static int hf_bacapp_MOR = -1;
-static int hf_bacapp_SA = -1;
-static int hf_bacapp_response_segments = -1;
-static int hf_bacapp_max_adpu_size = -1;
-static int hf_bacapp_invoke_id = -1;
-static int hf_bacapp_objectType = -1;
-static int hf_bacapp_object_name = -1;
-static int hf_bacapp_instanceNumber = -1;
-static int hf_bacapp_sequence_number = -1;
-static int hf_bacapp_window_size = -1;
-static int hf_bacapp_service = -1;
-static int hf_bacapp_NAK = -1;
-static int hf_bacapp_SRV = -1;
-static int hf_bacapp_notify_type = -1;
-static int hf_bacapp_event_type = -1;
-static int hf_bacapp_error_class = -1;
-static int hf_bacapp_error_code = -1;
-static int hf_Device_Instance_Range_Low_Limit = -1;
-static int hf_Device_Instance_Range_High_Limit = -1;
-static int hf_BACnetRejectReason = -1;
-static int hf_BACnetAbortReason = -1;
-static int hf_BACnetApplicationTagNumber = -1;
-static int hf_BACnetContextTagNumber = -1;
-static int hf_BACnetExtendedTagNumber = -1;
-static int hf_BACnetNamedTag = -1;
-static int hf_BACnetTagClass = -1;
-static int hf_BACnetCharacterSet = -1;
-static int hf_BACnetCodePage = -1;
-static int hf_bacapp_tag_lvt = -1;
-static int hf_bacapp_tag_ProcessId = -1;
-static int hf_bacapp_tag_to_state = -1;
-static int hf_bacapp_tag_from_state = -1;
-static int hf_bacapp_uservice = -1;
-static int hf_BACnetPropertyIdentifier = -1;
-static int hf_BACnetVendorIdentifier = -1;
-static int hf_BACnetRestartReason = -1;
-static int hf_bacapp_tag_IPV4 = -1;
-static int hf_bacapp_tag_IPV6 = -1;
-static int hf_bacapp_tag_PORT = -1;
-static int hf_bacapp_tag_mac_address_broadcast = -1;
-static int hf_bacapp_reserved_ashrea = -1;
-static int hf_bacapp_unused_bits = -1;
-static int hf_bacapp_bit = -1;
-static int hf_bacapp_complete_bitstring = -1;
+static int proto_bacapp;
+static int hf_bacapp_type;
+static int hf_bacapp_pduflags;
+static int hf_bacapp_SEG;
+static int hf_bacapp_MOR;
+static int hf_bacapp_SA;
+static int hf_bacapp_response_segments;
+static int hf_bacapp_max_adpu_size;
+static int hf_bacapp_invoke_id;
+static int hf_bacapp_objectType;
+static int hf_bacapp_object_name;
+static int hf_bacapp_instanceNumber;
+static int hf_bacapp_sequence_number;
+static int hf_bacapp_window_size;
+static int hf_bacapp_service;
+static int hf_bacapp_NAK;
+static int hf_bacapp_SRV;
+static int hf_bacapp_notify_type;
+static int hf_bacapp_event_type;
+static int hf_bacapp_error_class;
+static int hf_bacapp_error_code;
+static int hf_Device_Instance_Range_Low_Limit;
+static int hf_Device_Instance_Range_High_Limit;
+static int hf_BACnetRejectReason;
+static int hf_BACnetAbortReason;
+static int hf_BACnetApplicationTagNumber;
+static int hf_BACnetContextTagNumber;
+static int hf_BACnetExtendedTagNumber;
+static int hf_BACnetNamedTag;
+static int hf_BACnetTagClass;
+static int hf_BACnetCharacterSet;
+static int hf_BACnetCodePage;
+static int hf_bacapp_tag_lvt;
+static int hf_bacapp_tag_ProcessId;
+static int hf_bacapp_tag_to_state;
+static int hf_bacapp_tag_from_state;
+static int hf_bacapp_uservice;
+static int hf_BACnetPropertyIdentifier;
+static int hf_BACnetVendorIdentifier;
+static int hf_BACnetRestartReason;
+static int hf_bacapp_tag_IPV4;
+static int hf_bacapp_tag_IPV6;
+static int hf_bacapp_tag_PORT;
+static int hf_bacapp_tag_mac_address_broadcast;
+static int hf_bacapp_reserved_ashrea;
+static int hf_bacapp_unused_bits;
+static int hf_bacapp_bit;
+static int hf_bacapp_complete_bitstring;
 
 /* present value */
-static int hf_bacapp_present_value_null = -1;
-static int hf_bacapp_present_value_bool = -1;
-static int hf_bacapp_present_value_unsigned = -1;
-static int hf_bacapp_present_value_signed = -1;
-static int hf_bacapp_present_value_real = -1;
-static int hf_bacapp_present_value_double = -1;
-static int hf_bacapp_present_value_octet_string = -1;
-static int hf_bacapp_present_value_char_string = -1;
-static int hf_bacapp_present_value_bit_string = -1;
-static int hf_bacapp_present_value_enum_index = -1;
+static int hf_bacapp_present_value_null;
+static int hf_bacapp_present_value_bool;
+static int hf_bacapp_present_value_unsigned;
+static int hf_bacapp_present_value_signed;
+static int hf_bacapp_present_value_real;
+static int hf_bacapp_present_value_double;
+static int hf_bacapp_present_value_octet_string;
+static int hf_bacapp_present_value_char_string;
+static int hf_bacapp_present_value_bit_string;
+static int hf_bacapp_present_value_enum_index;
 
 /* some more variables for segmented messages */
-static int hf_msg_fragments = -1;
-static int hf_msg_fragment = -1;
-static int hf_msg_fragment_overlap = -1;
-static int hf_msg_fragment_overlap_conflicts = -1;
-static int hf_msg_fragment_multiple_tails = -1;
-static int hf_msg_fragment_too_long_fragment = -1;
-static int hf_msg_fragment_error = -1;
-static int hf_msg_fragment_count = -1;
-static int hf_msg_reassembled_in = -1;
-static int hf_msg_reassembled_length = -1;
-
-static gint ett_msg_fragment = -1;
-static gint ett_msg_fragments = -1;
-
-static gint ett_bacapp = -1;
-static gint ett_bacapp_control = -1;
-static gint ett_bacapp_tag = -1;
-static gint ett_bacapp_list = -1;
-static gint ett_bacapp_value = -1;
-
-static expert_field ei_bacapp_bad_length = EI_INIT;
-static expert_field ei_bacapp_bad_tag = EI_INIT;
-static expert_field ei_bacapp_opening_tag = EI_INIT;
-static expert_field ei_bacapp_max_recursion_depth_reached = EI_INIT;
+static int hf_msg_fragments;
+static int hf_msg_fragment;
+static int hf_msg_fragment_overlap;
+static int hf_msg_fragment_overlap_conflicts;
+static int hf_msg_fragment_multiple_tails;
+static int hf_msg_fragment_too_long_fragment;
+static int hf_msg_fragment_error;
+static int hf_msg_fragment_count;
+static int hf_msg_reassembled_in;
+static int hf_msg_reassembled_length;
+
+static gint ett_msg_fragment;
+static gint ett_msg_fragments;
+
+static gint ett_bacapp;
+static gint ett_bacapp_control;
+static gint ett_bacapp_tag;
+static gint ett_bacapp_list;
+static gint ett_bacapp_value;
+
+static expert_field ei_bacapp_bad_length;
+static expert_field ei_bacapp_bad_tag;
+static expert_field ei_bacapp_opening_tag;
+static expert_field ei_bacapp_max_recursion_depth_reached;
 
 static gint32 propertyIdentifier = -1;
 static gint32 propertyArrayIndex = -1;
diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c
index 9622113ba5..1eb015f648 100644
--- a/epan/dissectors/packet-bacnet.c
+++ b/epan/dissectors/packet-bacnet.c
@@ -196,112 +196,112 @@ static const true_false_string tfs_clear_do_not_clear = {
 	"Do Not Clear"
 };
 
-static int proto_bacnet = -1;
-static int hf_bacnet_version = -1;
-static int hf_bacnet_control = -1;
-static int hf_bacnet_control_net = -1;
-static int hf_bacnet_control_res1 = -1;
-static int hf_bacnet_control_dest = -1;
-static int hf_bacnet_control_res2 = -1;
-static int hf_bacnet_control_src = -1;
-static int hf_bacnet_control_expect = -1;
-static int hf_bacnet_control_prio_high = -1;
-static int hf_bacnet_control_prio_low = -1;
-static int hf_bacnet_dnet = -1;
-static int hf_bacnet_dlen = -1;
-static int hf_bacnet_dadr_eth = -1;
-static int hf_bacnet_dadr_mstp = -1;
-static int hf_bacnet_dadr_tmp = -1;
-static int hf_bacnet_snet = -1;
-static int hf_bacnet_slen = -1;
-static int hf_bacnet_sadr_eth = -1;
-static int hf_bacnet_sadr_mstp = -1;
-static int hf_bacnet_sadr_tmp = -1;
-static int hf_bacnet_hopc = -1;
-static int hf_bacnet_mesgtyp = -1;
-static int hf_bacnet_vendor = -1;
-static int hf_bacnet_perf = -1;
-static int hf_bacnet_rejectreason = -1;
-static int hf_bacnet_rportnum = -1;
-static int hf_bacnet_portid = -1;
-static int hf_bacnet_pinfo = -1;
-static int hf_bacnet_pinfolen = -1;
-static int hf_bacnet_term_time_value = -1;
-static int hf_bacnet_netno_status = -1;
-
-static int hf_bacnet_wrapper_control = -1;
-static int hf_bacnet_wrapper_control_secured_by_router = -1;
-static int hf_bacnet_wrapper_control_non_trusted_source = -1;
-static int hf_bacnet_wrapper_control_do_not_decrypt = -1;
-static int hf_bacnet_wrapper_control_do_not_unwrap = -1;
-static int hf_bacnet_wrapper_control_auth_data_present = -1;
-static int hf_bacnet_wrapper_control_reserved = -1;
-static int hf_bacnet_wrapper_control_msg_is_encrypted = -1;
-static int hf_bacnet_wrapper_control_msg_is_networklayer = -1;
-static int hf_bacnet_wrapper_key_revision = -1;
-static int hf_bacnet_wrapper_key_identifier = -1;
-static int hf_bacnet_wrapper_src_dev_instance = -1;
-static int hf_bacnet_wrapper_message_id = -1;
-static int hf_bacnet_wrapper_time_stamp = -1;
-static int hf_bacnet_wrapper_dst_dev_instance = -1;
-static int hf_bacnet_wrapper_dnet = -1;
-static int hf_bacnet_wrapper_dlen = -1;
-static int hf_bacnet_wrapper_dadr = -1;
-static int hf_bacnet_wrapper_snet = -1;
-static int hf_bacnet_wrapper_slen = -1;
-static int hf_bacnet_wrapper_sadr = -1;
-static int hf_bacnet_wrapper_auth_mech = -1;
-static int hf_bacnet_wrapper_auth_usr_id = -1;
-static int hf_bacnet_wrapper_auth_usr_role = -1;
-static int hf_bacnet_wrapper_auth_len = -1;
-static int hf_bacnet_wrapper_auth_data = -1;
-static int hf_bacnet_wrapper_signature = -1;
-static int hf_bacnet_wrapper_encrypted_data = -1;
-static int hf_bacnet_msg_is_challenged = -1;
-static int hf_bacnet_security_original_message_id = -1;
-static int hf_bacnet_security_original_time_stamp = -1;
-static int hf_bacnet_security_msg_len = -1;
-static int hf_bacnet_security_response_code = -1;
-static int hf_bacnet_security_response_expected_time_stamp = -1;
-static int hf_bacnet_security_response_key_algo = -1;
-static int hf_bacnet_security_response_key_id = -1;
-static int hf_bacnet_security_response_original_authentication_mech = -1;
-static int hf_bacnet_security_response_vendor_id = -1;
-static int hf_bacnet_security_response_key_revision = -1;
-static int hf_bacnet_security_response_number_keys = -1;
-static int hf_bacnet_security_set1_key_reveision = -1;
-static int hf_bacnet_security_set1_activation_time_stamp = -1;
-static int hf_bacnet_security_set1_expiration_time_stamp = -1;
-static int hf_bacnet_security_set1_key_algo = -1;
-static int hf_bacnet_security_set1_key_id = -1;
-static int hf_bacnet_security_set1_key_data = -1;
-static int hf_bacnet_security_set2_key_reveision = -1;
-static int hf_bacnet_security_set2_activation_time_stamp = -1;
-static int hf_bacnet_security_set2_expiration_time_stamp = -1;
-static int hf_bacnet_security_set2_key_algo = -1;
-static int hf_bacnet_security_set2_key_id = -1;
-static int hf_bacnet_security_set2_key_data = -1;
-static int hf_bacnet_security_dist_key_revision = -1;
-static int hf_bacnet_security_dist_key_algo = -1;
-static int hf_bacnet_security_dist_key_id = -1;
-static int hf_bacnet_security_dist_key_data = -1;
-static int hf_bacnet_security_master_key_algo = -1;
-static int hf_bacnet_security_master_key_id = -1;
-static int hf_bacnet_security_master_key_data = -1;
-static int hf_bacnet_update_control = -1;
-static int hf_bacnet_update_control_remove = -1;
-static int hf_bacnet_update_control_more_follows = -1;
-static int hf_bacnet_update_control_clear_set2 = -1;
-static int hf_bacnet_update_control_set2_params_present = -1;
-static int hf_bacnet_update_control_set2_times_present = -1;
-static int hf_bacnet_update_control_clear_set1 = -1;
-static int hf_bacnet_update_control_set1_params_present = -1;
-static int hf_bacnet_update_control_set1_times_present = -1;
-
-static gint ett_bacnet = -1;
-static gint ett_bacnet_control = -1;
-static gint ett_bacnet_wrapper_control = -1;
-static gint ett_bacnet_update_control = -1;
+static int proto_bacnet;
+static int hf_bacnet_version;
+static int hf_bacnet_control;
+static int hf_bacnet_control_net;
+static int hf_bacnet_control_res1;
+static int hf_bacnet_control_dest;
+static int hf_bacnet_control_res2;
+static int hf_bacnet_control_src;
+static int hf_bacnet_control_expect;
+static int hf_bacnet_control_prio_high;
+static int hf_bacnet_control_prio_low;
+static int hf_bacnet_dnet;
+static int hf_bacnet_dlen;
+static int hf_bacnet_dadr_eth;
+static int hf_bacnet_dadr_mstp;
+static int hf_bacnet_dadr_tmp;
+static int hf_bacnet_snet;
+static int hf_bacnet_slen;
+static int hf_bacnet_sadr_eth;
+static int hf_bacnet_sadr_mstp;
+static int hf_bacnet_sadr_tmp;
+static int hf_bacnet_hopc;
+static int hf_bacnet_mesgtyp;
+static int hf_bacnet_vendor;
+static int hf_bacnet_perf;
+static int hf_bacnet_rejectreason;
+static int hf_bacnet_rportnum;
+static int hf_bacnet_portid;
+static int hf_bacnet_pinfo;
+static int hf_bacnet_pinfolen;
+static int hf_bacnet_term_time_value;
+static int hf_bacnet_netno_status;
+
+static int hf_bacnet_wrapper_control;
+static int hf_bacnet_wrapper_control_secured_by_router;
+static int hf_bacnet_wrapper_control_non_trusted_source;
+static int hf_bacnet_wrapper_control_do_not_decrypt;
+static int hf_bacnet_wrapper_control_do_not_unwrap;
+static int hf_bacnet_wrapper_control_auth_data_present;
+static int hf_bacnet_wrapper_control_reserved;
+static int hf_bacnet_wrapper_control_msg_is_encrypted;
+static int hf_bacnet_wrapper_control_msg_is_networklayer;
+static int hf_bacnet_wrapper_key_revision;
+static int hf_bacnet_wrapper_key_identifier;
+static int hf_bacnet_wrapper_src_dev_instance;
+static int hf_bacnet_wrapper_message_id;
+static int hf_bacnet_wrapper_time_stamp;
+static int hf_bacnet_wrapper_dst_dev_instance;
+static int hf_bacnet_wrapper_dnet;
+static int hf_bacnet_wrapper_dlen;
+static int hf_bacnet_wrapper_dadr;
+static int hf_bacnet_wrapper_snet;
+static int hf_bacnet_wrapper_slen;
+static int hf_bacnet_wrapper_sadr;
+static int hf_bacnet_wrapper_auth_mech;
+static int hf_bacnet_wrapper_auth_usr_id;
+static int hf_bacnet_wrapper_auth_usr_role;
+static int hf_bacnet_wrapper_auth_len;
+static int hf_bacnet_wrapper_auth_data;
+static int hf_bacnet_wrapper_signature;
+static int hf_bacnet_wrapper_encrypted_data;
+static int hf_bacnet_msg_is_challenged;
+static int hf_bacnet_security_original_message_id;
+static int hf_bacnet_security_original_time_stamp;
+static int hf_bacnet_security_msg_len;
+static int hf_bacnet_security_response_code;
+static int hf_bacnet_security_response_expected_time_stamp;
+static int hf_bacnet_security_response_key_algo;
+static int hf_bacnet_security_response_key_id;
+static int hf_bacnet_security_response_original_authentication_mech;
+static int hf_bacnet_security_response_vendor_id;
+static int hf_bacnet_security_response_key_revision;
+static int hf_bacnet_security_response_number_keys;
+static int hf_bacnet_security_set1_key_reveision;
+static int hf_bacnet_security_set1_activation_time_stamp;
+static int hf_bacnet_security_set1_expiration_time_stamp;
+static int hf_bacnet_security_set1_key_algo;
+static int hf_bacnet_security_set1_key_id;
+static int hf_bacnet_security_set1_key_data;
+static int hf_bacnet_security_set2_key_reveision;
+static int hf_bacnet_security_set2_activation_time_stamp;
+static int hf_bacnet_security_set2_expiration_time_stamp;
+static int hf_bacnet_security_set2_key_algo;
+static int hf_bacnet_security_set2_key_id;
+static int hf_bacnet_security_set2_key_data;
+static int hf_bacnet_security_dist_key_revision;
+static int hf_bacnet_security_dist_key_algo;
+static int hf_bacnet_security_dist_key_id;
+static int hf_bacnet_security_dist_key_data;
+static int hf_bacnet_security_master_key_algo;
+static int hf_bacnet_security_master_key_id;
+static int hf_bacnet_security_master_key_data;
+static int hf_bacnet_update_control;
+static int hf_bacnet_update_control_remove;
+static int hf_bacnet_update_control_more_follows;
+static int hf_bacnet_update_control_clear_set2;
+static int hf_bacnet_update_control_set2_params_present;
+static int hf_bacnet_update_control_set2_times_present;
+static int hf_bacnet_update_control_clear_set1;
+static int hf_bacnet_update_control_set1_params_present;
+static int hf_bacnet_update_control_set1_times_present;
+
+static gint ett_bacnet;
+static gint ett_bacnet_control;
+static gint ett_bacnet_wrapper_control;
+static gint ett_bacnet_update_control;
 
 static dissector_handle_t bacnet_handle = NULL;
 
diff --git a/epan/dissectors/packet-banana.c b/epan/dissectors/packet-banana.c
index 891b66a3ef..5f23549b71 100644
--- a/epan/dissectors/packet-banana.c
+++ b/epan/dissectors/packet-banana.c
@@ -23,25 +23,25 @@ void proto_register_banana(void);
 void proto_reg_handoff_banana(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_banana = -1;
-static int hf_banana_list = -1;
-static int hf_banana_int = -1;
-static int hf_banana_string = -1;
-static int hf_banana_neg_int = -1;
-static int hf_banana_float = -1;
-static int hf_banana_lg_int = -1;
-static int hf_banana_lg_neg_int = -1;
-static int hf_banana_pb = -1;
+static int proto_banana;
+static int hf_banana_list;
+static int hf_banana_int;
+static int hf_banana_string;
+static int hf_banana_neg_int;
+static int hf_banana_float;
+static int hf_banana_lg_int;
+static int hf_banana_lg_neg_int;
+static int hf_banana_pb;
 
 /* Initialize the subtree pointers */
-static gint ett_banana = -1;
-static gint ett_list = -1;
-
-static expert_field ei_banana_unknown_type = EI_INIT;
-static expert_field ei_banana_too_many_value_bytes = EI_INIT;
-static expert_field ei_banana_length_too_long = EI_INIT;
-static expert_field ei_banana_value_too_large = EI_INIT;
-static expert_field ei_banana_pb_error = EI_INIT;
+static gint ett_banana;
+static gint ett_list;
+
+static expert_field ei_banana_unknown_type;
+static expert_field ei_banana_too_many_value_bytes;
+static expert_field ei_banana_length_too_long;
+static expert_field ei_banana_value_too_large;
+static expert_field ei_banana_pb_error;
 
 static dissector_handle_t banana_handle;
 
diff --git a/epan/dissectors/packet-bat.c b/epan/dissectors/packet-bat.c
index e5acfe9159..ed0c86d313 100644
--- a/epan/dissectors/packet-bat.c
+++ b/epan/dissectors/packet-bat.c
@@ -89,47 +89,47 @@ struct vis_data_v23 {
 /* End content from packet-bat.h */
 
 /* trees */
-static gint ett_bat_batman = -1;
-static gint ett_bat_batman_flags = -1;
-static gint ett_bat_batman_gwflags = -1;
-static gint ett_bat_batman_hna = -1;
-static gint ett_bat_gw = -1;
-static gint ett_bat_vis = -1;
-static gint ett_bat_vis_entry = -1;
+static gint ett_bat_batman;
+static gint ett_bat_batman_flags;
+static gint ett_bat_batman_gwflags;
+static gint ett_bat_batman_hna;
+static gint ett_bat_gw;
+static gint ett_bat_vis;
+static gint ett_bat_vis_entry;
 
 /* hfs */
-static int hf_bat_batman_version = -1;
-static int hf_bat_batman_flags = -1;
-static int hf_bat_batman_ttl = -1;
-static int hf_bat_batman_gwflags = -1;
-static int hf_bat_batman_gwflags_dl_speed = -1;
-static int hf_bat_batman_gwflags_ul_speed = -1;
-static int hf_bat_batman_seqno = -1;
-static int hf_bat_batman_gwport = -1;
-static int hf_bat_batman_orig = -1;
-static int hf_bat_batman_old_orig = -1;
-static int hf_bat_batman_tq = -1;
-static int hf_bat_batman_hna_len = -1;
-static int hf_bat_batman_hna_network = -1;
-static int hf_bat_batman_hna_netmask = -1;
-
-static int hf_bat_gw_type = -1;
-static int hf_bat_gw_ip = -1;
-
-static int hf_bat_vis_vis_orig = -1;
-static int hf_bat_vis_version = -1;
-static int hf_bat_vis_gwflags = -1;
-static int hf_bat_max_tq_v22 = -1;
-static int hf_bat_max_tq_v23 = -1;
-static int hf_bat_vis_data_type = -1;
-static int hf_bat_vis_netmask = -1;
-static int hf_bat_vis_tq_v22 = -1;
-static int hf_bat_vis_tq_v23 = -1;
-static int hf_bat_vis_data_ip = -1;
+static int hf_bat_batman_version;
+static int hf_bat_batman_flags;
+static int hf_bat_batman_ttl;
+static int hf_bat_batman_gwflags;
+static int hf_bat_batman_gwflags_dl_speed;
+static int hf_bat_batman_gwflags_ul_speed;
+static int hf_bat_batman_seqno;
+static int hf_bat_batman_gwport;
+static int hf_bat_batman_orig;
+static int hf_bat_batman_old_orig;
+static int hf_bat_batman_tq;
+static int hf_bat_batman_hna_len;
+static int hf_bat_batman_hna_network;
+static int hf_bat_batman_hna_netmask;
+
+static int hf_bat_gw_type;
+static int hf_bat_gw_ip;
+
+static int hf_bat_vis_vis_orig;
+static int hf_bat_vis_version;
+static int hf_bat_vis_gwflags;
+static int hf_bat_max_tq_v22;
+static int hf_bat_max_tq_v23;
+static int hf_bat_vis_data_type;
+static int hf_bat_vis_netmask;
+static int hf_bat_vis_tq_v22;
+static int hf_bat_vis_tq_v23;
+static int hf_bat_vis_data_ip;
 
 /* flags */
-static int hf_bat_batman_flags_unidirectional = -1;
-static int hf_bat_batman_flags_directlink = -1;
+static int hf_bat_batman_flags_unidirectional;
+static int hf_bat_batman_flags_directlink;
 
 static const value_string gw_packettypenames[] = {
 	{ TUNNEL_DATA,		    "DATA" },
@@ -161,9 +161,9 @@ static void dissect_bat_hna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 /* other dissectors */
 static dissector_handle_t ip_handle;
 
-static int proto_bat_plugin = -1;
-static int proto_bat_gw = -1;
-static int proto_bat_vis = -1;
+static int proto_bat_plugin;
+static int proto_bat_gw;
+static int proto_bat_vis;
 
 /* tap */
 static int bat_tap = -1;
diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c
index aee96fd84a..6fee5dfda9 100644
--- a/epan/dissectors/packet-batadv.c
+++ b/epan/dissectors/packet-batadv.c
@@ -471,239 +471,239 @@ struct unicast_tvlv_packet_v15 {
 /* End content from packet-batadv.h */
 
 /* trees */
-static gint ett_batadv_batman = -1;
-static gint ett_batadv_batman_flags = -1;
-static gint ett_batadv_batman_gwflags = -1;
-static gint ett_batadv_batman_tt = -1;
-static gint ett_batadv_iv_ogm = -1;
-static gint ett_batadv_iv_ogm_flags = -1;
-static gint ett_batadv_elp = -1;
-static gint ett_batadv_ogm2 = -1;
-//static gint ett_batadv_ogm2_flags = -1;
-static gint ett_batadv_bcast = -1;
-static gint ett_batadv_icmp = -1;
-static gint ett_batadv_icmp_rr = -1;
-static gint ett_batadv_unicast = -1;
-static gint ett_batadv_unicast_4addr = -1;
-static gint ett_batadv_unicast_frag = -1;
-static gint ett_batadv_unicast_tvlv = -1;
-static gint ett_batadv_vis = -1;
-static gint ett_batadv_vis_entry = -1;
-static gint ett_batadv_tt_query = -1;
-static gint ett_batadv_tt_query_flags = -1;
-static gint ett_batadv_tt_entry = -1;
-static gint ett_batadv_tt_entry_flags = -1;
-static gint ett_batadv_roam_adv = -1;
-static gint ett_batadv_coded = -1;
-static gint ett_batadv_tvlv = -1;
-static gint ett_batadv_tvlv_mcast_flags = -1;
-static gint ett_batadv_tvlv_vid = -1;
-static gint ett_batadv_tvlv_tt_flags = -1;
-static gint ett_batadv_tvlv_tt_vlan = -1;
-static gint ett_batadv_tvlv_tt_change = -1;
-static gint ett_msg_fragment = -1;
-static gint ett_msg_fragments = -1;
-
-static expert_field ei_batadv_tvlv_unknown_version = EI_INIT;
-static expert_field ei_batadv_tvlv_tt_vlan_crc = EI_INIT;
-static expert_field ei_batadv_tvlv_tt_vlan_empty = EI_INIT;
+static gint ett_batadv_batman;
+static gint ett_batadv_batman_flags;
+static gint ett_batadv_batman_gwflags;
+static gint ett_batadv_batman_tt;
+static gint ett_batadv_iv_ogm;
+static gint ett_batadv_iv_ogm_flags;
+static gint ett_batadv_elp;
+static gint ett_batadv_ogm2;
+//static gint ett_batadv_ogm2_flags;
+static gint ett_batadv_bcast;
+static gint ett_batadv_icmp;
+static gint ett_batadv_icmp_rr;
+static gint ett_batadv_unicast;
+static gint ett_batadv_unicast_4addr;
+static gint ett_batadv_unicast_frag;
+static gint ett_batadv_unicast_tvlv;
+static gint ett_batadv_vis;
+static gint ett_batadv_vis_entry;
+static gint ett_batadv_tt_query;
+static gint ett_batadv_tt_query_flags;
+static gint ett_batadv_tt_entry;
+static gint ett_batadv_tt_entry_flags;
+static gint ett_batadv_roam_adv;
+static gint ett_batadv_coded;
+static gint ett_batadv_tvlv;
+static gint ett_batadv_tvlv_mcast_flags;
+static gint ett_batadv_tvlv_vid;
+static gint ett_batadv_tvlv_tt_flags;
+static gint ett_batadv_tvlv_tt_vlan;
+static gint ett_batadv_tvlv_tt_change;
+static gint ett_msg_fragment;
+static gint ett_msg_fragments;
+
+static expert_field ei_batadv_tvlv_unknown_version;
+static expert_field ei_batadv_tvlv_tt_vlan_crc;
+static expert_field ei_batadv_tvlv_tt_vlan_empty;
 
 /* hfs */
-static int hf_batadv_packet_type = -1;
-
-static int hf_batadv_batman_version = -1;
-static int hf_batadv_batman_flags = -1;
-static int hf_batadv_batman_ttl = -1;
-static int hf_batadv_batman_gwflags = -1;
-static int hf_batadv_batman_gwflags_dl_speed = -1;
-static int hf_batadv_batman_gwflags_ul_speed = -1;
-static int hf_batadv_batman_tq = -1;
-static int hf_batadv_batman_seqno = -1;
-static int hf_batadv_batman_seqno32 = -1;
-static int hf_batadv_batman_orig = -1;
-static int hf_batadv_batman_prev_sender = -1;
-static int hf_batadv_batman_num_tt = -1;
-static int hf_batadv_batman_tt_num_changes = -1;
-static int hf_batadv_batman_ttvn = -1;
-static int hf_batadv_batman_tt_crc = -1;
-static int hf_batadv_batman_tt = -1;
-
-static int hf_batadv_iv_ogm_version = -1;
-static int hf_batadv_iv_ogm_ttl = -1;
-static int hf_batadv_iv_ogm_flags = -1;
-static int hf_batadv_iv_ogm_seqno = -1;
-static int hf_batadv_iv_ogm_orig = -1;
-static int hf_batadv_iv_ogm_prev_sender = -1;
-static int hf_batadv_iv_ogm_tq = -1;
-static int hf_batadv_iv_ogm_tvlv_len = -1;
-
-static int hf_batadv_elp_version = -1;
-static int hf_batadv_elp_orig = -1;
-static int hf_batadv_elp_seqno = -1;
-static int hf_batadv_elp_interval = -1;
-
-static int hf_batadv_ogm2_version = -1;
-static int hf_batadv_ogm2_ttl = -1;
-static int hf_batadv_ogm2_flags = -1;
-static int hf_batadv_ogm2_seqno = -1;
-static int hf_batadv_ogm2_orig = -1;
-static int hf_batadv_ogm2_tvlv_len = -1;
-static int hf_batadv_ogm2_throughput = -1;
-
-static int hf_batadv_bcast_version = -1;
-static int hf_batadv_bcast_orig = -1;
-static int hf_batadv_bcast_seqno = -1;
-static int hf_batadv_bcast_seqno32 = -1;
-static int hf_batadv_bcast_ttl = -1;
-
-static int hf_batadv_icmp_version = -1;
-static int hf_batadv_icmp_msg_type = -1;
-static int hf_batadv_icmp_dst = -1;
-static int hf_batadv_icmp_orig = -1;
-static int hf_batadv_icmp_ttl = -1;
-static int hf_batadv_icmp_uid = -1;
-static int hf_batadv_icmp_seqno = -1;
-
-static int hf_batadv_icmp_rr_pointer = -1;
-static int hf_batadv_icmp_rr_ether = -1;
-
-static int hf_batadv_icmp_tp_subtype = -1;
-static int hf_batadv_icmp_tp_session = -1;
-static int hf_batadv_icmp_tp_seqno = -1;
-static int hf_batadv_icmp_tp_timestamp = -1;
-
-static int hf_batadv_unicast_version = -1;
-static int hf_batadv_unicast_dst = -1;
-static int hf_batadv_unicast_ttl = -1;
-static int hf_batadv_unicast_ttvn = -1;
-
-static int hf_batadv_unicast_4addr_version = -1;
-static int hf_batadv_unicast_4addr_dst = -1;
-static int hf_batadv_unicast_4addr_ttl = -1;
-static int hf_batadv_unicast_4addr_ttvn = -1;
-static int hf_batadv_unicast_4addr_src = -1;
-static int hf_batadv_unicast_4addr_subtype = -1;
-
-static int hf_batadv_unicast_frag_version = -1;
-static int hf_batadv_unicast_frag_dst = -1;
-static int hf_batadv_unicast_frag_ttl = -1;
-static int hf_batadv_unicast_frag_ttvn = -1;
-static int hf_batadv_unicast_frag_flags = -1;
-static int hf_batadv_unicast_frag_orig = -1;
-static int hf_batadv_unicast_frag_seqno = -1;
-static int hf_batadv_unicast_frag_no = -1;
-static int hf_batadv_unicast_frag_priority = -1;
-static int hf_batadv_unicast_frag_total_size = -1;
-
-static int hf_batadv_unicast_tvlv_version = -1;
-static int hf_batadv_unicast_tvlv_ttl = -1;
-static int hf_batadv_unicast_tvlv_dst = -1;
-static int hf_batadv_unicast_tvlv_src = -1;
-static int hf_batadv_unicast_tvlv_len = -1;
-
-static int hf_batadv_vis_version = -1;
-static int hf_batadv_vis_type = -1;
-static int hf_batadv_vis_seqno = -1;
-static int hf_batadv_vis_seqno32 = -1;
-static int hf_batadv_vis_entries = -1;
-static int hf_batadv_vis_ttl = -1;
-static int hf_batadv_vis_vis_orig = -1;
-static int hf_batadv_vis_target_orig = -1;
-static int hf_batadv_vis_sender_orig = -1;
-static int hf_batadv_vis_entry_src = -1;
-static int hf_batadv_vis_entry_dst = -1;
-static int hf_batadv_vis_entry_quality = -1;
-
-static int hf_batadv_tt_query_version = -1;
-static int hf_batadv_tt_query_ttl = -1;
-static int hf_batadv_tt_query_flags = -1;
-static int hf_batadv_tt_query_flags_type = -1;
-static int hf_batadv_tt_query_flags_full_table = -1;
-static int hf_batadv_tt_query_dst = -1;
-static int hf_batadv_tt_query_src = -1;
-static int hf_batadv_tt_query_ttvn = -1;
-static int hf_batadv_tt_query_tt_crc = -1;
-static int hf_batadv_tt_query_entries = -1;
-static int hf_batadv_tt_entry = -1;
-static int hf_batadv_tt_entry_flags = -1;
-static int hf_batadv_tt_entry_flags_change_del = -1;
-static int hf_batadv_tt_entry_flags_client_roam = -1;
-
-static int hf_batadv_roam_adv_version = -1;
-static int hf_batadv_roam_adv_ttl = -1;
-static int hf_batadv_roam_adv_dst = -1;
-static int hf_batadv_roam_adv_src = -1;
-static int hf_batadv_roam_adv_client = -1;
-
-static int hf_batadv_coded_version = -1;
-static int hf_batadv_coded_ttl = -1;
-static int hf_batadv_coded_first_ttvn = -1;
-static int hf_batadv_coded_first_source = -1;
-static int hf_batadv_coded_first_orig_dest = -1;
-static int hf_batadv_coded_first_crc = -1;
-static int hf_batadv_coded_second_ttl = -1;
-static int hf_batadv_coded_second_ttvn = -1;
-static int hf_batadv_coded_second_dest = -1;
-static int hf_batadv_coded_second_source = -1;
-static int hf_batadv_coded_second_orig_dest = -1;
-static int hf_batadv_coded_second_crc = -1;
-static int hf_batadv_coded_coded_len = -1;
-
-static int hf_msg_fragments = -1;
-static int hf_msg_fragment = -1;
-static int hf_msg_fragment_overlap = -1;
-static int hf_msg_fragment_overlap_conflicts = -1;
-static int hf_msg_fragment_multiple_tails = -1;
-static int hf_msg_fragment_too_long_fragment = -1;
-static int hf_msg_fragment_error = -1;
-static int hf_msg_fragment_count = -1;
-static int hf_msg_reassembled_in = -1;
-static int hf_msg_reassembled_length = -1;
-
-static int hf_batadv_tvlv_type = -1;
-static int hf_batadv_tvlv_version = -1;
-static int hf_batadv_tvlv_len = -1;
-
-static int hf_batadv_tvlv_gw_download = -1;
-static int hf_batadv_tvlv_gw_upload = -1;
-
-static int hf_batadv_tvlv_roam_addr = -1;
-static int hf_batadv_tvlv_roam_vid = -1;
-static int hf_batadv_tvlv_vid_vlan = -1;
-static int hf_batadv_tvlv_vid_tagged = -1;
-
-static int hf_batadv_tvlv_tt_flags = -1;
-static int hf_batadv_tvlv_tt_flags_type = -1;
-static int hf_batadv_tvlv_tt_flags_full_table = -1;
-static int hf_batadv_tvlv_tt_ttvn = -1;
-static int hf_batadv_tvlv_tt_num_vlan = -1;
-static int hf_batadv_tvlv_tt_vlan_crc = -1;
-static int hf_batadv_tvlv_tt_vlan_crc_status = -1;
-static int hf_batadv_tvlv_tt_vlan_vid = -1;
-static int hf_batadv_tvlv_tt_change_flags = -1;
-static int hf_batadv_tvlv_tt_change_vid = -1;
-static int hf_batadv_tvlv_tt_change_addr = -1;
+static int hf_batadv_packet_type;
+
+static int hf_batadv_batman_version;
+static int hf_batadv_batman_flags;
+static int hf_batadv_batman_ttl;
+static int hf_batadv_batman_gwflags;
+static int hf_batadv_batman_gwflags_dl_speed;
+static int hf_batadv_batman_gwflags_ul_speed;
+static int hf_batadv_batman_tq;
+static int hf_batadv_batman_seqno;
+static int hf_batadv_batman_seqno32;
+static int hf_batadv_batman_orig;
+static int hf_batadv_batman_prev_sender;
+static int hf_batadv_batman_num_tt;
+static int hf_batadv_batman_tt_num_changes;
+static int hf_batadv_batman_ttvn;
+static int hf_batadv_batman_tt_crc;
+static int hf_batadv_batman_tt;
+
+static int hf_batadv_iv_ogm_version;
+static int hf_batadv_iv_ogm_ttl;
+static int hf_batadv_iv_ogm_flags;
+static int hf_batadv_iv_ogm_seqno;
+static int hf_batadv_iv_ogm_orig;
+static int hf_batadv_iv_ogm_prev_sender;
+static int hf_batadv_iv_ogm_tq;
+static int hf_batadv_iv_ogm_tvlv_len;
+
+static int hf_batadv_elp_version;
+static int hf_batadv_elp_orig;
+static int hf_batadv_elp_seqno;
+static int hf_batadv_elp_interval;
+
+static int hf_batadv_ogm2_version;
+static int hf_batadv_ogm2_ttl;
+static int hf_batadv_ogm2_flags;
+static int hf_batadv_ogm2_seqno;
+static int hf_batadv_ogm2_orig;
+static int hf_batadv_ogm2_tvlv_len;
+static int hf_batadv_ogm2_throughput;
+
+static int hf_batadv_bcast_version;
+static int hf_batadv_bcast_orig;
+static int hf_batadv_bcast_seqno;
+static int hf_batadv_bcast_seqno32;
+static int hf_batadv_bcast_ttl;
+
+static int hf_batadv_icmp_version;
+static int hf_batadv_icmp_msg_type;
+static int hf_batadv_icmp_dst;
+static int hf_batadv_icmp_orig;
+static int hf_batadv_icmp_ttl;
+static int hf_batadv_icmp_uid;
+static int hf_batadv_icmp_seqno;
+
+static int hf_batadv_icmp_rr_pointer;
+static int hf_batadv_icmp_rr_ether;
+
+static int hf_batadv_icmp_tp_subtype;
+static int hf_batadv_icmp_tp_session;
+static int hf_batadv_icmp_tp_seqno;
+static int hf_batadv_icmp_tp_timestamp;
+
+static int hf_batadv_unicast_version;
+static int hf_batadv_unicast_dst;
+static int hf_batadv_unicast_ttl;
+static int hf_batadv_unicast_ttvn;
+
+static int hf_batadv_unicast_4addr_version;
+static int hf_batadv_unicast_4addr_dst;
+static int hf_batadv_unicast_4addr_ttl;
+static int hf_batadv_unicast_4addr_ttvn;
+static int hf_batadv_unicast_4addr_src;
+static int hf_batadv_unicast_4addr_subtype;
+
+static int hf_batadv_unicast_frag_version;
+static int hf_batadv_unicast_frag_dst;
+static int hf_batadv_unicast_frag_ttl;
+static int hf_batadv_unicast_frag_ttvn;
+static int hf_batadv_unicast_frag_flags;
+static int hf_batadv_unicast_frag_orig;
+static int hf_batadv_unicast_frag_seqno;
+static int hf_batadv_unicast_frag_no;
+static int hf_batadv_unicast_frag_priority;
+static int hf_batadv_unicast_frag_total_size;
+
+static int hf_batadv_unicast_tvlv_version;
+static int hf_batadv_unicast_tvlv_ttl;
+static int hf_batadv_unicast_tvlv_dst;
+static int hf_batadv_unicast_tvlv_src;
+static int hf_batadv_unicast_tvlv_len;
+
+static int hf_batadv_vis_version;
+static int hf_batadv_vis_type;
+static int hf_batadv_vis_seqno;
+static int hf_batadv_vis_seqno32;
+static int hf_batadv_vis_entries;
+static int hf_batadv_vis_ttl;
+static int hf_batadv_vis_vis_orig;
+static int hf_batadv_vis_target_orig;
+static int hf_batadv_vis_sender_orig;
+static int hf_batadv_vis_entry_src;
+static int hf_batadv_vis_entry_dst;
+static int hf_batadv_vis_entry_quality;
+
+static int hf_batadv_tt_query_version;
+static int hf_batadv_tt_query_ttl;
+static int hf_batadv_tt_query_flags;
+static int hf_batadv_tt_query_flags_type;
+static int hf_batadv_tt_query_flags_full_table;
+static int hf_batadv_tt_query_dst;
+static int hf_batadv_tt_query_src;
+static int hf_batadv_tt_query_ttvn;
+static int hf_batadv_tt_query_tt_crc;
+static int hf_batadv_tt_query_entries;
+static int hf_batadv_tt_entry;
+static int hf_batadv_tt_entry_flags;
+static int hf_batadv_tt_entry_flags_change_del;
+static int hf_batadv_tt_entry_flags_client_roam;
+
+static int hf_batadv_roam_adv_version;
+static int hf_batadv_roam_adv_ttl;
+static int hf_batadv_roam_adv_dst;
+static int hf_batadv_roam_adv_src;
+static int hf_batadv_roam_adv_client;
+
+static int hf_batadv_coded_version;
+static int hf_batadv_coded_ttl;
+static int hf_batadv_coded_first_ttvn;
+static int hf_batadv_coded_first_source;
+static int hf_batadv_coded_first_orig_dest;
+static int hf_batadv_coded_first_crc;
+static int hf_batadv_coded_second_ttl;
+static int hf_batadv_coded_second_ttvn;
+static int hf_batadv_coded_second_dest;
+static int hf_batadv_coded_second_source;
+static int hf_batadv_coded_second_orig_dest;
+static int hf_batadv_coded_second_crc;
+static int hf_batadv_coded_coded_len;
+
+static int hf_msg_fragments;
+static int hf_msg_fragment;
+static int hf_msg_fragment_overlap;
+static int hf_msg_fragment_overlap_conflicts;
+static int hf_msg_fragment_multiple_tails;
+static int hf_msg_fragment_too_long_fragment;
+static int hf_msg_fragment_error;
+static int hf_msg_fragment_count;
+static int hf_msg_reassembled_in;
+static int hf_msg_reassembled_length;
+
+static int hf_batadv_tvlv_type;
+static int hf_batadv_tvlv_version;
+static int hf_batadv_tvlv_len;
+
+static int hf_batadv_tvlv_gw_download;
+static int hf_batadv_tvlv_gw_upload;
+
+static int hf_batadv_tvlv_roam_addr;
+static int hf_batadv_tvlv_roam_vid;
+static int hf_batadv_tvlv_vid_vlan;
+static int hf_batadv_tvlv_vid_tagged;
+
+static int hf_batadv_tvlv_tt_flags;
+static int hf_batadv_tvlv_tt_flags_type;
+static int hf_batadv_tvlv_tt_flags_full_table;
+static int hf_batadv_tvlv_tt_ttvn;
+static int hf_batadv_tvlv_tt_num_vlan;
+static int hf_batadv_tvlv_tt_vlan_crc;
+static int hf_batadv_tvlv_tt_vlan_crc_status;
+static int hf_batadv_tvlv_tt_vlan_vid;
+static int hf_batadv_tvlv_tt_change_flags;
+static int hf_batadv_tvlv_tt_change_vid;
+static int hf_batadv_tvlv_tt_change_addr;
 
 /* flags */
-static int hf_batadv_batman_flags_directlink = -1;
-static int hf_batadv_batman_flags_vis_server = -1;
-static int hf_batadv_batman_flags_not_best_next_hop = -1;
-static int hf_batadv_batman_flags_primaries_first_hop = -1;
-static int hf_batadv_unicast_frag_flags_head = -1;
-static int hf_batadv_unicast_frag_flags_largetail = -1;
-static int hf_batadv_iv_ogm_flags_not_best_next_hop = -1;
-static int hf_batadv_iv_ogm_flags_primaries_first_hop = -1;
-static int hf_batadv_iv_ogm_flags_directlink = -1;
-static int hf_batadv_tvlv_mcast_flags = -1;
-static int hf_batadv_tvlv_mcast_flags_unsnoopables = -1;
-static int hf_batadv_tvlv_mcast_flags_ipv4 = -1;
-static int hf_batadv_tvlv_mcast_flags_ipv6 = -1;
-static int hf_batadv_tvlv_mcast_flags_no_rtr4 = -1;
-static int hf_batadv_tvlv_mcast_flags_no_rtr6 = -1;
-static int hf_batadv_tvlv_tt_change_flags_del = -1;
-static int hf_batadv_tvlv_tt_change_flags_roam = -1;
-static int hf_batadv_tvlv_tt_change_flags_wifi = -1;
-static int hf_batadv_tvlv_tt_change_flags_isolate = -1;
+static int hf_batadv_batman_flags_directlink;
+static int hf_batadv_batman_flags_vis_server;
+static int hf_batadv_batman_flags_not_best_next_hop;
+static int hf_batadv_batman_flags_primaries_first_hop;
+static int hf_batadv_unicast_frag_flags_head;
+static int hf_batadv_unicast_frag_flags_largetail;
+static int hf_batadv_iv_ogm_flags_not_best_next_hop;
+static int hf_batadv_iv_ogm_flags_primaries_first_hop;
+static int hf_batadv_iv_ogm_flags_directlink;
+static int hf_batadv_tvlv_mcast_flags;
+static int hf_batadv_tvlv_mcast_flags_unsnoopables;
+static int hf_batadv_tvlv_mcast_flags_ipv4;
+static int hf_batadv_tvlv_mcast_flags_ipv6;
+static int hf_batadv_tvlv_mcast_flags_no_rtr4;
+static int hf_batadv_tvlv_mcast_flags_no_rtr6;
+static int hf_batadv_tvlv_tt_change_flags_del;
+static int hf_batadv_tvlv_tt_change_flags_roam;
+static int hf_batadv_tvlv_tt_change_flags_wifi;
+static int hf_batadv_tvlv_tt_change_flags_isolate;
 
 static const value_string unicast_4addr_typenames[] = {
 	{ UNICAST_4ADDR_DATA, "Data" },
@@ -905,7 +905,7 @@ static int dissect_batadv_tvlv_v15_tt_change(tvbuff_t *tvb, packet_info *pinfo _
 /* other dissectors */
 static dissector_handle_t eth_handle;
 
-static int proto_batadv_plugin = -1;
+static int proto_batadv_plugin;
 
 /* tap */
 static int batadv_tap = -1;
diff --git a/epan/dissectors/packet-bblog.c b/epan/dissectors/packet-bblog.c
index 20321ebf2e..57f18f6894 100644
--- a/epan/dissectors/packet-bblog.c
+++ b/epan/dissectors/packet-bblog.c
@@ -24,103 +24,103 @@ void proto_reg_handoff_bblog(void);
 
 static dissector_handle_t bblog_handle;
 
-static int proto_bblog                      = -1;
-
-static int hf_ticks                         = -1;
-static int hf_serial_nr                     = -1;
-static int hf_stack_id                      = -1;
-static int hf_event_id                      = -1;
-static int hf_event_flags                   = -1;
-static int hf_event_flags_rxbuf             = -1;
-static int hf_event_flags_txbuf             = -1;
-static int hf_event_flags_hdr               = -1;
-static int hf_event_flags_verbose           = -1;
-static int hf_event_flags_stack             = -1;
-static int hf_errno                         = -1;
-static int hf_rxb_acc                       = -1;
-static int hf_rxb_ccc                       = -1;
-static int hf_rxb_spare                     = -1;
-static int hf_txb_acc                       = -1;
-static int hf_txb_ccc                       = -1;
-static int hf_txb_spare                     = -1;
-static int hf_state                         = -1;
-static int hf_starttime                     = -1;
-static int hf_iss                           = -1;
-static int hf_t_flags                       = -1;
-static int hf_t_flags_ack_now               = -1;
-static int hf_t_flags_delayed_ack           = -1;
-static int hf_t_flags_no_delay              = -1;
-static int hf_t_flags_no_opt                = -1;
-static int hf_t_flags_sent_fin              = -1;
-static int hf_t_flags_request_window_scale  = -1;
-static int hf_t_flags_received_window_scale = -1;
-static int hf_t_flags_request_timestamp     = -1;
-static int hf_t_flags_received_timestamp    = -1;
-static int hf_t_flags_sack_permitted        = -1;
-static int hf_t_flags_need_syn              = -1;
-static int hf_t_flags_need_fin              = -1;
-static int hf_t_flags_no_push               = -1;
-static int hf_t_flags_prev_valid            = -1;
-static int hf_t_flags_wake_socket_receive   = -1;
-static int hf_t_flags_goodput_in_progress   = -1;
-static int hf_t_flags_more_to_come          = -1;
-static int hf_t_flags_listen_queue_overflow = -1;
-static int hf_t_flags_last_idle             = -1;
-static int hf_t_flags_zero_recv_window_sent = -1;
-static int hf_t_flags_be_in_fast_recovery   = -1;
-static int hf_t_flags_was_in_fast_recovery  = -1;
-static int hf_t_flags_signature             = -1;
-static int hf_t_flags_force_data            = -1;
-static int hf_t_flags_tso                   = -1;
-static int hf_t_flags_toe                   = -1;
-static int hf_t_flags_unused_1              = -1;
-static int hf_t_flags_unused_2              = -1;
-static int hf_t_flags_lost_rtx_detection    = -1;
-static int hf_t_flags_be_in_cong_recovery   = -1;
-static int hf_t_flags_was_in_cong_recovery  = -1;
-static int hf_t_flags_fast_open             = -1;
-static int hf_snd_una                       = -1;
-static int hf_snd_max                       = -1;
-static int hf_snd_cwnd                      = -1;
-static int hf_snd_nxt                       = -1;
-static int hf_snd_recover                   = -1;
-static int hf_snd_wnd                       = -1;
-static int hf_snd_ssthresh                  = -1;
-static int hf_srtt                          = -1;
-static int hf_rttvar                        = -1;
-static int hf_rcv_up                        = -1;
-static int hf_rcv_adv                       = -1;
-static int hf_t_flags2                      = -1;
-static int hf_t_flags2_plpmtu_blackhole     = -1;
-static int hf_t_flags2_plpmtu_pmtud         = -1;
-static int hf_t_flags2_plpmtu_maxsegsnt     = -1;
-static int hf_t_flags2_log_auto             = -1;
-static int hf_t_flags2_drop_after_data      = -1;
-static int hf_t_flags2_ecn_permit           = -1;
-static int hf_t_flags2_ecn_snd_cwr          = -1;
-static int hf_t_flags2_ecn_snd_ece          = -1;
-static int hf_t_flags2_ace_permit           = -1;
-static int hf_t_flags2_first_bytes_complete = -1;
-static int hf_rcv_nxt                       = -1;
-static int hf_rcv_wnd                       = -1;
-static int hf_dupacks                       = -1;
-static int hf_seg_qlen                      = -1;
-static int hf_snd_num_holes                 = -1;
-static int hf_flex_1                        = -1;
-static int hf_flex_2                        = -1;
-static int hf_first_byte_in                 = -1;
-static int hf_first_byte_out                = -1;
-static int hf_snd_scale                     = -1;
-static int hf_rcv_scale                     = -1;
-static int hf_pad_1                         = -1;
-static int hf_pad_2                         = -1;
-static int hf_pad_3                         = -1;
-static int hf_payload_len                   = -1;
-
-static gint ett_bblog                       = -1;
-static gint ett_bblog_flags                 = -1;
-static gint ett_bblog_t_flags               = -1;
-static gint ett_bblog_t_flags2              = -1;
+static int proto_bblog;
+
+static int hf_ticks;
+static int hf_serial_nr;
+static int hf_stack_id;
+static int hf_event_id;
+static int hf_event_flags;
+static int hf_event_flags_rxbuf;
+static int hf_event_flags_txbuf;
+static int hf_event_flags_hdr;
+static int hf_event_flags_verbose;
+static int hf_event_flags_stack;
+static int hf_errno;
+static int hf_rxb_acc;
+static int hf_rxb_ccc;
+static int hf_rxb_spare;
+static int hf_txb_acc;
+static int hf_txb_ccc;
+static int hf_txb_spare;
+static int hf_state;
+static int hf_starttime;
+static int hf_iss;
+static int hf_t_flags;
+static int hf_t_flags_ack_now;
+static int hf_t_flags_delayed_ack;
+static int hf_t_flags_no_delay;
+static int hf_t_flags_no_opt;
+static int hf_t_flags_sent_fin;
+static int hf_t_flags_request_window_scale;
+static int hf_t_flags_received_window_scale;
+static int hf_t_flags_request_timestamp;
+static int hf_t_flags_received_timestamp;
+static int hf_t_flags_sack_permitted;
+static int hf_t_flags_need_syn;
+static int hf_t_flags_need_fin;
+static int hf_t_flags_no_push;
+static int hf_t_flags_prev_valid;
+static int hf_t_flags_wake_socket_receive;
+static int hf_t_flags_goodput_in_progress;
+static int hf_t_flags_more_to_come;
+static int hf_t_flags_listen_queue_overflow;
+static int hf_t_flags_last_idle;
+static int hf_t_flags_zero_recv_window_sent;
+static int hf_t_flags_be_in_fast_recovery;
+static int hf_t_flags_was_in_fast_recovery;
+static int hf_t_flags_signature;
+static int hf_t_flags_force_data;
+static int hf_t_flags_tso;
+static int hf_t_flags_toe;
+static int hf_t_flags_unused_1;
+static int hf_t_flags_unused_2;
+static int hf_t_flags_lost_rtx_detection;
+static int hf_t_flags_be_in_cong_recovery;
+static int hf_t_flags_was_in_cong_recovery;
+static int hf_t_flags_fast_open;
+static int hf_snd_una;
+static int hf_snd_max;
+static int hf_snd_cwnd;
+static int hf_snd_nxt;
+static int hf_snd_recover;
+static int hf_snd_wnd;
+static int hf_snd_ssthresh;
+static int hf_srtt;
+static int hf_rttvar;
+static int hf_rcv_up;
+static int hf_rcv_adv;
+static int hf_t_flags2;
+static int hf_t_flags2_plpmtu_blackhole;
+static int hf_t_flags2_plpmtu_pmtud;
+static int hf_t_flags2_plpmtu_maxsegsnt;
+static int hf_t_flags2_log_auto;
+static int hf_t_flags2_drop_after_data;
+static int hf_t_flags2_ecn_permit;
+static int hf_t_flags2_ecn_snd_cwr;
+static int hf_t_flags2_ecn_snd_ece;
+static int hf_t_flags2_ace_permit;
+static int hf_t_flags2_first_bytes_complete;
+static int hf_rcv_nxt;
+static int hf_rcv_wnd;
+static int hf_dupacks;
+static int hf_seg_qlen;
+static int hf_snd_num_holes;
+static int hf_flex_1;
+static int hf_flex_2;
+static int hf_first_byte_in;
+static int hf_first_byte_out;
+static int hf_snd_scale;
+static int hf_rcv_scale;
+static int hf_pad_1;
+static int hf_pad_2;
+static int hf_pad_3;
+static int hf_payload_len;
+
+static gint ett_bblog;
+static gint ett_bblog_flags;
+static gint ett_bblog_t_flags;
+static gint ett_bblog_t_flags2;
 
 static int * const bblog_event_flags[] = {
   &hf_event_flags_rxbuf,
diff --git a/epan/dissectors/packet-bctp.c b/epan/dissectors/packet-bctp.c
index 0730982643..ee64eecd50 100644
--- a/epan/dissectors/packet-bctp.c
+++ b/epan/dissectors/packet-bctp.c
@@ -24,13 +24,13 @@
 void proto_register_bctp(void);
 void proto_reg_handoff_bctp(void);
 
-static int proto_bctp = -1;
-static int hf_bctp_bvei = -1;
-static int hf_bctp_bvi = -1;
-static int hf_bctp_tpei = -1;
-static int hf_bctp_tpi = -1;
+static int proto_bctp;
+static int hf_bctp_bvei;
+static int hf_bctp_bvi;
+static int hf_bctp_tpei;
+static int hf_bctp_tpi;
 
-static gint ett_bctp = -1;
+static gint ett_bctp;
 static dissector_table_t bctp_dissector_table;
 static dissector_handle_t text_handle;
 
diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c
index 3e1b3fccf2..52b2d7fe7c 100644
--- a/epan/dissectors/packet-beep.c
+++ b/epan/dissectors/packet-beep.c
@@ -36,30 +36,30 @@ static dissector_handle_t beep_handle;
 static range_t *global_beep_tcp_ports = NULL;
 static int global_beep_strict_term = TRUE;
 
-static int proto_beep = -1;
-
-static int hf_beep_req = -1;
-static int hf_beep_cmd = -1;
-static int hf_beep_req_chan = -1;
-/* static int hf_beep_rsp_chan = -1; */
-static int hf_beep_seq_chan = -1;
-/* static int hf_beep_rsp = -1; */
-static int hf_beep_more = -1;
-static int hf_beep_msgno = -1;
-static int hf_beep_ansno = -1;
-static int hf_beep_seqno = -1;
-static int hf_beep_size = -1;
-static int hf_beep_channel = -1;
-static int hf_beep_mime_header = -1;
-static int hf_beep_header = -1;
+static int proto_beep;
+
+static int hf_beep_req;
+static int hf_beep_cmd;
+static int hf_beep_req_chan;
+/* static int hf_beep_rsp_chan; */
+static int hf_beep_seq_chan;
+/* static int hf_beep_rsp; */
+static int hf_beep_more;
+static int hf_beep_msgno;
+static int hf_beep_ansno;
+static int hf_beep_seqno;
+static int hf_beep_size;
+static int hf_beep_channel;
+static int hf_beep_mime_header;
+static int hf_beep_header;
 #if 0
-static int hf_beep_status = -1;
+static int hf_beep_status;
 #endif
-static int hf_beep_ackno = -1;
-static int hf_beep_window = -1;
-static int hf_beep_payload = -1;
-static int hf_beep_payload_undissected = -1;
-static int hf_beep_crlf_terminator = -1;
+static int hf_beep_ackno;
+static int hf_beep_window;
+static int hf_beep_payload;
+static int hf_beep_payload_undissected;
+static int hf_beep_crlf_terminator;
 
 #if 0
 static const value_string beep_status_vals[] = {
@@ -98,15 +98,15 @@ static int *seq_chan_hfa[]   = { &hf_beep_channel, &hf_beep_seq_chan, NULL };
 static int *seq_ackno_hfa[]  = { &hf_beep_ackno, NULL };
 static int *seq_window_hfa[] = { &hf_beep_window, NULL };
 
-static int ett_beep = -1;
-static int ett_mime_header = -1;
-static int ett_header = -1;
-static int ett_trailer = -1;
+static int ett_beep;
+static int ett_mime_header;
+static int ett_header;
+static int ett_trailer;
 
-static expert_field ei_beep_more = EI_INIT;
-static expert_field ei_beep_cr_terminator = EI_INIT;
-static expert_field ei_beep_lf_terminator = EI_INIT;
-static expert_field ei_beep_invalid_terminator = EI_INIT;
+static expert_field ei_beep_more;
+static expert_field ei_beep_cr_terminator;
+static expert_field ei_beep_lf_terminator;
+static expert_field ei_beep_invalid_terminator;
 
 /* Get the state of the more flag ... */
 
diff --git a/epan/dissectors/packet-bencode.c b/epan/dissectors/packet-bencode.c
index 1f893e4c00..a4112139e0 100644
--- a/epan/dissectors/packet-bencode.c
+++ b/epan/dissectors/packet-bencode.c
@@ -19,27 +19,27 @@
 
 void proto_register_bencode(void);
 
-static int proto_bencode = -1;
-
-static gint hf_bencode_str_length     = -1;
-static gint hf_bencode_str            = -1;
-static gint hf_bencode_int            = -1;
-static gint hf_bencode_dict           = -1;
-static gint hf_bencode_dict_entry     = -1;
-static gint hf_bencode_list           = -1;
-static gint hf_bencode_truncated_data = -1;
-
-static gint ett_bencode_dict = -1;
-static gint ett_bencode_dict_entry = -1;
-static gint ett_bencode_list = -1;
-
-static expert_field ei_bencode_str        = EI_INIT;
-static expert_field ei_bencode_str_length = EI_INIT;
-static expert_field ei_bencode_int        = EI_INIT;
-static expert_field ei_bencode_nest       = EI_INIT;
-static expert_field ei_bencode_dict_key   = EI_INIT;
-static expert_field ei_bencode_dict_value = EI_INIT;
-static expert_field ei_bencode_invalid    = EI_INIT;
+static int proto_bencode;
+
+static gint hf_bencode_str_length;
+static gint hf_bencode_str;
+static gint hf_bencode_int;
+static gint hf_bencode_dict;
+static gint hf_bencode_dict_entry;
+static gint hf_bencode_list;
+static gint hf_bencode_truncated_data;
+
+static gint ett_bencode_dict;
+static gint ett_bencode_dict_entry;
+static gint ett_bencode_list;
+
+static expert_field ei_bencode_str;
+static expert_field ei_bencode_str_length;
+static expert_field ei_bencode_int;
+static expert_field ei_bencode_nest;
+static expert_field ei_bencode_dict_key;
+static expert_field ei_bencode_dict_value;
+static expert_field ei_bencode_invalid;
 
 static int dissect_bencoding_str(tvbuff_t *tvb, packet_info *pinfo,
                                  int offset, int length, proto_tree *tree, proto_item *ti, int treeadd)
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index e145fd1020..94060bb3aa 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -71,116 +71,116 @@
 void proto_register_ber(void);
 void proto_reg_handoff_ber(void);
 
-static gint proto_ber = -1;
-static gint hf_ber_id_class = -1;
-static gint hf_ber_id_pc = -1;
-static gint hf_ber_id_uni_tag = -1;
-static gint hf_ber_id_uni_tag_ext = -1;
-static gint hf_ber_id_tag = -1;
-static gint hf_ber_id_tag_ext = -1;
-static gint hf_ber_length = -1;
-static gint hf_ber_length_octets = -1;
-static gint hf_ber_bitstring_padding = -1;
-static gint hf_ber_bitstring_empty = -1;
-static gint hf_ber_unknown_OID = -1;
-static gint hf_ber_unknown_relative_OID = -1;
-static gint hf_ber_unknown_BOOLEAN = -1;
-static gint hf_ber_unknown_OCTETSTRING = -1;
-static gint hf_ber_unknown_BER_OCTETSTRING = -1;
-static gint hf_ber_unknown_BER_primitive = -1;
-static gint hf_ber_unknown_GraphicString = -1;
-static gint hf_ber_unknown_NumericString = -1;
-static gint hf_ber_unknown_PrintableString = -1;
-static gint hf_ber_unknown_TeletexString = -1;
-static gint hf_ber_unknown_VisibleString = -1;
-static gint hf_ber_unknown_GeneralString = -1;
-static gint hf_ber_unknown_UniversalString = -1;
-static gint hf_ber_unknown_BMPString = -1;
-static gint hf_ber_unknown_IA5String = -1;
-static gint hf_ber_unknown_UTCTime = -1;
-static gint hf_ber_unknown_UTF8String = -1;
-static gint hf_ber_unknown_GeneralizedTime = -1;
-static gint hf_ber_unknown_INTEGER = -1;
-static gint hf_ber_unknown_REAL = -1;
-static gint hf_ber_unknown_BITSTRING = -1;
-static gint hf_ber_unknown_ENUMERATED = -1;
-static gint hf_ber_direct_reference = -1;         /* OBJECT_IDENTIFIER */
-static gint hf_ber_indirect_reference = -1;       /* INTEGER */
-static gint hf_ber_data_value_descriptor = -1;    /* ObjectDescriptor */
-static gint hf_ber_encoding = -1;                 /* T_encoding */
-static gint hf_ber_single_ASN1_type = -1;         /* T_single_ASN1_type */
-static gint hf_ber_octet_aligned = -1;            /* OCTET_STRING */
-static gint hf_ber_arbitrary = -1;                /* BIT_STRING */
-static gint hf_ber_extra_data = -1;
-static gint hf_ber_encoding_boiler_plate = -1;
+static gint proto_ber;
+static gint hf_ber_id_class;
+static gint hf_ber_id_pc;
+static gint hf_ber_id_uni_tag;
+static gint hf_ber_id_uni_tag_ext;
+static gint hf_ber_id_tag;
+static gint hf_ber_id_tag_ext;
+static gint hf_ber_length;
+static gint hf_ber_length_octets;
+static gint hf_ber_bitstring_padding;
+static gint hf_ber_bitstring_empty;
+static gint hf_ber_unknown_OID;
+static gint hf_ber_unknown_relative_OID;
+static gint hf_ber_unknown_BOOLEAN;
+static gint hf_ber_unknown_OCTETSTRING;
+static gint hf_ber_unknown_BER_OCTETSTRING;
+static gint hf_ber_unknown_BER_primitive;
+static gint hf_ber_unknown_GraphicString;
+static gint hf_ber_unknown_NumericString;
+static gint hf_ber_unknown_PrintableString;
+static gint hf_ber_unknown_TeletexString;
+static gint hf_ber_unknown_VisibleString;
+static gint hf_ber_unknown_GeneralString;
+static gint hf_ber_unknown_UniversalString;
+static gint hf_ber_unknown_BMPString;
+static gint hf_ber_unknown_IA5String;
+static gint hf_ber_unknown_UTCTime;
+static gint hf_ber_unknown_UTF8String;
+static gint hf_ber_unknown_GeneralizedTime;
+static gint hf_ber_unknown_INTEGER;
+static gint hf_ber_unknown_REAL;
+static gint hf_ber_unknown_BITSTRING;
+static gint hf_ber_unknown_ENUMERATED;
+static gint hf_ber_direct_reference;         /* OBJECT_IDENTIFIER */
+static gint hf_ber_indirect_reference;       /* INTEGER */
+static gint hf_ber_data_value_descriptor;    /* ObjectDescriptor */
+static gint hf_ber_encoding;                 /* T_encoding */
+static gint hf_ber_single_ASN1_type;         /* T_single_ASN1_type */
+static gint hf_ber_octet_aligned;            /* OCTET_STRING */
+static gint hf_ber_arbitrary;                /* BIT_STRING */
+static gint hf_ber_extra_data;
+static gint hf_ber_encoding_boiler_plate;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_ber_seq_of_eoc = -1;
-static int hf_ber_64bit_uint_as_bytes = -1;
-static int hf_ber_choice_eoc = -1;
-static int hf_ber_seq_field_eoc = -1;
-static int hf_ber_seq_eoc = -1;
-static int hf_ber_set_field_eoc = -1;
-static int hf_ber_set_eoc = -1;
-static int hf_ber_null_tag = -1;
-static int hf_ber_unknown_octetstring = -1;
-static int hf_ber_unknown_data = -1;
-
-static int hf_ber_fragments = -1;
-static int hf_ber_fragment = -1;
-static int hf_ber_fragment_overlap = -1;
-static int hf_ber_fragment_overlap_conflicts = -1;
-static int hf_ber_fragment_multiple_tails = -1;
-static int hf_ber_fragment_too_long_fragment = -1;
-static int hf_ber_fragment_error = -1;
-static int hf_ber_fragment_count = -1;
-static int hf_ber_reassembled_in = -1;
-static int hf_ber_reassembled_length = -1;
-
-static gint ett_ber_octet_string = -1;
-static gint ett_ber_reassembled_octet_string = -1;
-static gint ett_ber_primitive = -1;
-static gint ett_ber_unknown = -1;
-static gint ett_ber_SEQUENCE = -1;
-static gint ett_ber_EXTERNAL = -1;
-static gint ett_ber_T_encoding = -1;
-static gint ett_ber_fragment = -1;
-static gint ett_ber_fragments = -1;
-
-static expert_field ei_ber_size_constraint_string = EI_INIT;
-static expert_field ei_ber_size_constraint_value = EI_INIT;
-static expert_field ei_ber_size_constraint_items = EI_INIT;
-static expert_field ei_ber_sequence_field_wrong = EI_INIT;
-static expert_field ei_ber_expected_octet_string = EI_INIT;
-static expert_field ei_ber_expected_null = EI_INIT;
-static expert_field ei_ber_expected_null_zero_length = EI_INIT;
-static expert_field ei_ber_expected_sequence = EI_INIT;
-static expert_field ei_ber_expected_set = EI_INIT;
-static expert_field ei_ber_expected_string = EI_INIT;
-static expert_field ei_ber_expected_object_identifier = EI_INIT;
-static expert_field ei_ber_expected_generalized_time = EI_INIT;
-static expert_field ei_ber_expected_utc_time = EI_INIT;
-static expert_field ei_ber_expected_bitstring = EI_INIT;
-static expert_field ei_ber_error_length = EI_INIT;
-static expert_field ei_ber_wrong_tag_in_tagged_type = EI_INIT;
-static expert_field ei_ber_universal_tag_unknown = EI_INIT;
-static expert_field ei_ber_no_oid = EI_INIT;
-static expert_field ei_ber_syntax_not_implemented = EI_INIT;
-static expert_field ei_ber_oid_not_implemented = EI_INIT;
-static expert_field ei_ber_value_too_many_bytes = EI_INIT;
-static expert_field ei_ber_unknown_field_sequence = EI_INIT;
-static expert_field ei_ber_unknown_field_set = EI_INIT;
-static expert_field ei_ber_missing_field_set = EI_INIT;
-static expert_field ei_ber_empty_choice = EI_INIT;
-static expert_field ei_ber_choice_not_found = EI_INIT;
-static expert_field ei_ber_bits_unknown = EI_INIT;
-static expert_field ei_ber_bits_set_padded = EI_INIT;
-static expert_field ei_ber_illegal_padding = EI_INIT;
-static expert_field ei_ber_invalid_format_generalized_time = EI_INIT;
-static expert_field ei_ber_invalid_format_utctime = EI_INIT;
-static expert_field ei_hf_field_not_integer_type = EI_INIT;
-static expert_field ei_ber_constr_bitstr = EI_INIT;
-static expert_field ei_ber_real_not_primitive = EI_INIT;
+static int hf_ber_seq_of_eoc;
+static int hf_ber_64bit_uint_as_bytes;
+static int hf_ber_choice_eoc;
+static int hf_ber_seq_field_eoc;
+static int hf_ber_seq_eoc;
+static int hf_ber_set_field_eoc;
+static int hf_ber_set_eoc;
+static int hf_ber_null_tag;
+static int hf_ber_unknown_octetstring;
+static int hf_ber_unknown_data;
+
+static int hf_ber_fragments;
+static int hf_ber_fragment;
+static int hf_ber_fragment_overlap;
+static int hf_ber_fragment_overlap_conflicts;
+static int hf_ber_fragment_multiple_tails;
+static int hf_ber_fragment_too_long_fragment;
+static int hf_ber_fragment_error;
+static int hf_ber_fragment_count;
+static int hf_ber_reassembled_in;
+static int hf_ber_reassembled_length;
+
+static gint ett_ber_octet_string;
+static gint ett_ber_reassembled_octet_string;
+static gint ett_ber_primitive;
+static gint ett_ber_unknown;
+static gint ett_ber_SEQUENCE;
+static gint ett_ber_EXTERNAL;
+static gint ett_ber_T_encoding;
+static gint ett_ber_fragment;
+static gint ett_ber_fragments;
+
+static expert_field ei_ber_size_constraint_string;
+static expert_field ei_ber_size_constraint_value;
+static expert_field ei_ber_size_constraint_items;
+static expert_field ei_ber_sequence_field_wrong;
+static expert_field ei_ber_expected_octet_string;
+static expert_field ei_ber_expected_null;
+static expert_field ei_ber_expected_null_zero_length;
+static expert_field ei_ber_expected_sequence;
+static expert_field ei_ber_expected_set;
+static expert_field ei_ber_expected_string;
+static expert_field ei_ber_expected_object_identifier;
+static expert_field ei_ber_expected_generalized_time;
+static expert_field ei_ber_expected_utc_time;
+static expert_field ei_ber_expected_bitstring;
+static expert_field ei_ber_error_length;
+static expert_field ei_ber_wrong_tag_in_tagged_type;
+static expert_field ei_ber_universal_tag_unknown;
+static expert_field ei_ber_no_oid;
+static expert_field ei_ber_syntax_not_implemented;
+static expert_field ei_ber_oid_not_implemented;
+static expert_field ei_ber_value_too_many_bytes;
+static expert_field ei_ber_unknown_field_sequence;
+static expert_field ei_ber_unknown_field_set;
+static expert_field ei_ber_missing_field_set;
+static expert_field ei_ber_empty_choice;
+static expert_field ei_ber_choice_not_found;
+static expert_field ei_ber_bits_unknown;
+static expert_field ei_ber_bits_set_padded;
+static expert_field ei_ber_illegal_padding;
+static expert_field ei_ber_invalid_format_generalized_time;
+static expert_field ei_ber_invalid_format_utctime;
+static expert_field ei_hf_field_not_integer_type;
+static expert_field ei_ber_constr_bitstr;
+static expert_field ei_ber_real_not_primitive;
 
 static dissector_handle_t ber_handle;
 static dissector_handle_t ber_file_handle;
diff --git a/epan/dissectors/packet-bfcp.c b/epan/dissectors/packet-bfcp.c
index 3f356edce9..c307ec56c2 100644
--- a/epan/dissectors/packet-bfcp.c
+++ b/epan/dissectors/packet-bfcp.c
@@ -27,50 +27,50 @@ void proto_register_bfcp(void);
 void proto_reg_handoff_bfcp(void);
 
 /* Initialize protocol and registered fields */
-static int proto_bfcp = -1;
-
-static int hf_bfcp_version = -1;
-static int hf_bfcp_hdr_r_bit = -1;
-static int hf_bfcp_hdr_f_bit = -1;
-static int hf_bfcp_primitive = -1;
-static int hf_bfcp_payload_length = -1;
-static int hf_bfcp_conference_id = -1;
-static int hf_bfcp_transaction_id = -1;
-static int hf_bfcp_user_id = -1;
-static int hf_bfcp_fragment_offset = -1;
-static int hf_bfcp_fragment_length = -1;
-static int hf_bfcp_payload = -1;
-static int hf_bfcp_attribute_types = -1;
-static int hf_bfcp_attribute_types_m_bit = -1;
-static int hf_bfcp_attribute_length = -1;
-static int hf_bfcp_beneficiary_id = -1;
-static int hf_bfcp_floor_id = -1;
-static int hf_bfcp_floor_request_id = -1;
-static int hf_bfcp_priority = -1;
-static int hf_bfcp_request_status = -1;
-static int hf_bfcp_queue_pos = -1;
-static int hf_bfcp_error_code = -1;
-static int hf_bfcp_error_info_text = -1;
-static int hf_bfcp_part_prov_info_text = -1;
-static int hf_bfcp_status_info_text = -1;
-static int hf_bfcp_supp_attr = -1;
-static int hf_bfcp_supp_prim = -1;
-static int hf_bfcp_user_disp_name = -1;
-static int hf_bfcp_user_uri = -1;
-static int hf_bfcp_req_by_id = -1;
-static int hf_bfcp_padding = -1;
-static int hf_bfcp_error_specific_details = -1;
+static int proto_bfcp;
+
+static int hf_bfcp_version;
+static int hf_bfcp_hdr_r_bit;
+static int hf_bfcp_hdr_f_bit;
+static int hf_bfcp_primitive;
+static int hf_bfcp_payload_length;
+static int hf_bfcp_conference_id;
+static int hf_bfcp_transaction_id;
+static int hf_bfcp_user_id;
+static int hf_bfcp_fragment_offset;
+static int hf_bfcp_fragment_length;
+static int hf_bfcp_payload;
+static int hf_bfcp_attribute_types;
+static int hf_bfcp_attribute_types_m_bit;
+static int hf_bfcp_attribute_length;
+static int hf_bfcp_beneficiary_id;
+static int hf_bfcp_floor_id;
+static int hf_bfcp_floor_request_id;
+static int hf_bfcp_priority;
+static int hf_bfcp_request_status;
+static int hf_bfcp_queue_pos;
+static int hf_bfcp_error_code;
+static int hf_bfcp_error_info_text;
+static int hf_bfcp_part_prov_info_text;
+static int hf_bfcp_status_info_text;
+static int hf_bfcp_supp_attr;
+static int hf_bfcp_supp_prim;
+static int hf_bfcp_user_disp_name;
+static int hf_bfcp_user_uri;
+static int hf_bfcp_req_by_id;
+static int hf_bfcp_padding;
+static int hf_bfcp_error_specific_details;
 /* BFCP setup fields */
-static int hf_bfcp_setup        = -1;
-static int hf_bfcp_setup_frame  = -1;
-static int hf_bfcp_setup_method = -1;
+static int hf_bfcp_setup;
+static int hf_bfcp_setup_frame;
+static int hf_bfcp_setup_method;
 
 /* Initialize subtree pointers */
-static gint ett_bfcp = -1;
-static gint ett_bfcp_setup = -1;
-static gint ett_bfcp_attr = -1;
+static gint ett_bfcp;
+static gint ett_bfcp_setup;
+static gint ett_bfcp_attr;
 
-static expert_field ei_bfcp_attribute_length_too_small = EI_INIT;
+static expert_field ei_bfcp_attribute_length_too_small;
 
 static dissector_handle_t bfcp_handle;
 
diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c
index ca31799272..0d443014bf 100644
--- a/epan/dissectors/packet-bfd.c
+++ b/epan/dissectors/packet-bfd.c
@@ -118,61 +118,61 @@ static const value_string bfd_control_auth_type_values[] = {
 #define SHA1_AUTH_LEN 28
 #define SHA1_CHECKSUM_LEN 20
 
-static gint proto_bfd = -1;
-static gint proto_bfd_echo = -1;
-
-static gint hf_bfd_version = -1;
-static gint hf_bfd_diag = -1;
-static gint hf_bfd_sta = -1;
-static gint hf_bfd_flags = -1;
-static gint hf_bfd_flags_h = -1;
-static gint hf_bfd_flags_p = -1;
-static gint hf_bfd_flags_f = -1;
-static gint hf_bfd_flags_c = -1;
-static gint hf_bfd_flags_a = -1;
-static gint hf_bfd_flags_d = -1;
-static gint hf_bfd_flags_m = -1;
-static gint hf_bfd_flags_d_v0 = -1;
-static gint hf_bfd_flags_p_v0 = -1;
-static gint hf_bfd_flags_f_v0 = -1;
-static gint hf_bfd_detect_time_multiplier = -1;
-static gint hf_bfd_message_length = -1;
-static gint hf_bfd_my_discriminator = -1;
-static gint hf_bfd_your_discriminator = -1;
-static gint hf_bfd_desired_min_tx_interval = -1;
-static gint hf_bfd_required_min_rx_interval = -1;
-static gint hf_bfd_required_min_echo_interval = -1;
-static gint hf_bfd_checksum = -1;
-
-static gint hf_bfd_auth_type = -1;
-static gint hf_bfd_auth_len = -1;
-static gint hf_bfd_auth_key = -1;
-static gint hf_bfd_auth_password = -1;
-static gint hf_bfd_auth_seq_num = -1;
-
-static gint hf_bfd_echo = -1;
-
-static gint ett_bfd = -1;
-static gint ett_bfd_flags = -1;
-static gint ett_bfd_auth = -1;
-
-static gint ett_bfd_echo = -1;
-
-static expert_field ei_bfd_auth_len_invalid = EI_INIT;
-static expert_field ei_bfd_auth_no_data = EI_INIT;
-
-static gint hf_mep_type = -1;
-static gint hf_mep_len = -1;
-static gint hf_mep_global_id = -1;
-static gint hf_mep_node_id = -1;
-/* static gint hf_mep_interface_no = -1; */
-static gint hf_mep_tunnel_no = -1;
-static gint hf_mep_lsp_no = -1;
-static gint hf_mep_ac_id = -1;
-static gint hf_mep_agi_type = -1;
-static gint hf_mep_agi_len = -1;
-static gint hf_mep_agi_val = -1;
-static gint hf_section_interface_no = -1;
+static gint proto_bfd;
+static gint proto_bfd_echo;
+
+static gint hf_bfd_version;
+static gint hf_bfd_diag;
+static gint hf_bfd_sta;
+static gint hf_bfd_flags;
+static gint hf_bfd_flags_h;
+static gint hf_bfd_flags_p;
+static gint hf_bfd_flags_f;
+static gint hf_bfd_flags_c;
+static gint hf_bfd_flags_a;
+static gint hf_bfd_flags_d;
+static gint hf_bfd_flags_m;
+static gint hf_bfd_flags_d_v0;
+static gint hf_bfd_flags_p_v0;
+static gint hf_bfd_flags_f_v0;
+static gint hf_bfd_detect_time_multiplier;
+static gint hf_bfd_message_length;
+static gint hf_bfd_my_discriminator;
+static gint hf_bfd_your_discriminator;
+static gint hf_bfd_desired_min_tx_interval;
+static gint hf_bfd_required_min_rx_interval;
+static gint hf_bfd_required_min_echo_interval;
+static gint hf_bfd_checksum;
+
+static gint hf_bfd_auth_type;
+static gint hf_bfd_auth_len;
+static gint hf_bfd_auth_key;
+static gint hf_bfd_auth_password;
+static gint hf_bfd_auth_seq_num;
+
+static gint hf_bfd_echo;
+
+static gint ett_bfd;
+static gint ett_bfd_flags;
+static gint ett_bfd_auth;
+
+static gint ett_bfd_echo;
+
+static expert_field ei_bfd_auth_len_invalid;
+static expert_field ei_bfd_auth_no_data;
+
+static gint hf_mep_type;
+static gint hf_mep_len;
+static gint hf_mep_global_id;
+static gint hf_mep_node_id;
+/* static gint hf_mep_interface_no; */
+static gint hf_mep_tunnel_no;
+static gint hf_mep_lsp_no;
+static gint hf_mep_ac_id;
+static gint hf_mep_agi_type;
+static gint hf_mep_agi_len;
+static gint hf_mep_agi_val;
+static gint hf_section_interface_no;
 /*
  * Control packet version 0, draft-katz-ward-bfd-01.txt
  *
diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c
index ebaf934b6b..69a2a04b46 100644
--- a/epan/dissectors/packet-bgp.c
+++ b/epan/dissectors/packet-bgp.c
@@ -2033,241 +2033,241 @@ static const true_false_string tfs_manually_auto_derived = { "manually derived",
 /* Maximal size of an IP address string */
 #define MAX_SIZE_OF_IP_ADDR_STRING      16
 
-static int proto_bgp = -1;
+static int proto_bgp;
 
 /* BGP header field initialisation */
 
 /* global BGP header filed */
 
-static int hf_bgp_marker = -1;
-static int hf_bgp_length = -1;
-static int hf_bgp_prefix_length = -1;
-static int hf_bgp_rd = -1;
-static int hf_bgp_continuation = -1;
-static int hf_bgp_originating_as = -1;
-static int hf_bgp_community_prefix = -1;
-static int hf_bgp_endpoint_address = -1;
-static int hf_bgp_endpoint_address_ipv6 = -1;
-static int hf_bgp_label_stack = -1;
-static int hf_bgp_large_communities = -1;
-static int hf_bgp_large_communities_ga = -1;
-static int hf_bgp_large_communities_ldp1 = -1;
-static int hf_bgp_large_communities_ldp2 = -1;
-static int hf_bgp_vplsad_length = -1;
-static int hf_bgp_vplsad_rd = -1;
-static int hf_bgp_bgpad_pe_addr = -1;
-static int hf_bgp_vplsbgp_ce_id = -1;
-static int hf_bgp_vplsbgp_labelblock_offset = -1;
-static int hf_bgp_vplsbgp_labelblock_size = -1;
-static int hf_bgp_vplsbgp_labelblock_base = -1;
-static int hf_bgp_wildcard_route_target = -1;
-static int hf_bgp_type = -1;
+static int hf_bgp_marker;
+static int hf_bgp_length;
+static int hf_bgp_prefix_length;
+static int hf_bgp_rd;
+static int hf_bgp_continuation;
+static int hf_bgp_originating_as;
+static int hf_bgp_community_prefix;
+static int hf_bgp_endpoint_address;
+static int hf_bgp_endpoint_address_ipv6;
+static int hf_bgp_label_stack;
+static int hf_bgp_large_communities;
+static int hf_bgp_large_communities_ga;
+static int hf_bgp_large_communities_ldp1;
+static int hf_bgp_large_communities_ldp2;
+static int hf_bgp_vplsad_length;
+static int hf_bgp_vplsad_rd;
+static int hf_bgp_bgpad_pe_addr;
+static int hf_bgp_vplsbgp_ce_id;
+static int hf_bgp_vplsbgp_labelblock_offset;
+static int hf_bgp_vplsbgp_labelblock_size;
+static int hf_bgp_vplsbgp_labelblock_base;
+static int hf_bgp_wildcard_route_target;
+static int hf_bgp_type;
 
 /* BGP open message header filed */
 
-static int hf_bgp_open_version = -1;
-static int hf_bgp_open_myas = -1;
-static int hf_bgp_open_holdtime = -1;
-static int hf_bgp_open_identifier = -1;
-static int hf_bgp_open_opt_len = -1;
-static int hf_bgp_open_opt_extension = -1;
-static int hf_bgp_open_opt_extension_mark = -1;
-static int hf_bgp_open_opt_extension_len = -1;
-static int hf_bgp_open_opt_params = -1;
-static int hf_bgp_open_opt_param = -1;
-static int hf_bgp_open_opt_param_type = -1;
-static int hf_bgp_open_opt_param_len = -1;
-static int hf_bgp_open_opt_param_auth = -1;
-static int hf_bgp_open_opt_param_unknown = -1;
+static int hf_bgp_open_version;
+static int hf_bgp_open_myas;
+static int hf_bgp_open_holdtime;
+static int hf_bgp_open_identifier;
+static int hf_bgp_open_opt_len;
+static int hf_bgp_open_opt_extension;
+static int hf_bgp_open_opt_extension_mark;
+static int hf_bgp_open_opt_extension_len;
+static int hf_bgp_open_opt_params;
+static int hf_bgp_open_opt_param;
+static int hf_bgp_open_opt_param_type;
+static int hf_bgp_open_opt_param_len;
+static int hf_bgp_open_opt_param_auth;
+static int hf_bgp_open_opt_param_unknown;
 
 /* BGP notify header field */
 
-static int hf_bgp_notify_major_error = -1;
-static int hf_bgp_notify_minor_msg_hdr = -1;
-static int hf_bgp_notify_minor_open_msg = -1;
-static int hf_bgp_notify_minor_update_msg = -1;
-static int hf_bgp_notify_minor_ht_expired = -1;
-static int hf_bgp_notify_minor_state_machine = -1;
-static int hf_bgp_notify_minor_cease = -1;
-static int hf_bgp_notify_minor_rr_msg = -1;
-static int hf_bgp_notify_minor_unknown = -1;
-static int hf_bgp_notify_data = -1;
-static int hf_bgp_notify_error_open_bad_peer_as = -1;
-static int hf_bgp_notify_communication_length = -1;
-static int hf_bgp_notify_communication = -1;
+static int hf_bgp_notify_major_error;
+static int hf_bgp_notify_minor_msg_hdr;
+static int hf_bgp_notify_minor_open_msg;
+static int hf_bgp_notify_minor_update_msg;
+static int hf_bgp_notify_minor_ht_expired;
+static int hf_bgp_notify_minor_state_machine;
+static int hf_bgp_notify_minor_cease;
+static int hf_bgp_notify_minor_rr_msg;
+static int hf_bgp_notify_minor_unknown;
+static int hf_bgp_notify_data;
+static int hf_bgp_notify_error_open_bad_peer_as;
+static int hf_bgp_notify_communication_length;
+static int hf_bgp_notify_communication;
 
 /* BGP route refresh header field */
 
-static int hf_bgp_route_refresh_afi = -1;
-static int hf_bgp_route_refresh_subtype = -1;
-static int hf_bgp_route_refresh_safi = -1;
-static int hf_bgp_route_refresh_orf = -1;
-static int hf_bgp_route_refresh_orf_flag = -1;
-static int hf_bgp_route_refresh_orf_type = -1;
-static int hf_bgp_route_refresh_orf_length = -1;
-static int hf_bgp_route_refresh_orf_entry_prefixlist = -1;
-static int hf_bgp_route_refresh_orf_entry_action = -1;
-static int hf_bgp_route_refresh_orf_entry_match = -1;
-static int hf_bgp_route_refresh_orf_entry_sequence = -1;
-static int hf_bgp_route_refresh_orf_entry_prefixmask_lower = -1;
-static int hf_bgp_route_refresh_orf_entry_prefixmask_upper = -1;
-static int hf_bgp_route_refresh_orf_entry_ip = -1;
+static int hf_bgp_route_refresh_afi;
+static int hf_bgp_route_refresh_subtype;
+static int hf_bgp_route_refresh_safi;
+static int hf_bgp_route_refresh_orf;
+static int hf_bgp_route_refresh_orf_flag;
+static int hf_bgp_route_refresh_orf_type;
+static int hf_bgp_route_refresh_orf_length;
+static int hf_bgp_route_refresh_orf_entry_prefixlist;
+static int hf_bgp_route_refresh_orf_entry_action;
+static int hf_bgp_route_refresh_orf_entry_match;
+static int hf_bgp_route_refresh_orf_entry_sequence;
+static int hf_bgp_route_refresh_orf_entry_prefixmask_lower;
+static int hf_bgp_route_refresh_orf_entry_prefixmask_upper;
+static int hf_bgp_route_refresh_orf_entry_ip;
 
 /* BGP capabilities header field */
 
-static int hf_bgp_cap = -1;
-static int hf_bgp_cap_type = -1;
-static int hf_bgp_cap_length = -1;
-static int hf_bgp_cap_action = -1;
-static int hf_bgp_cap_unknown = -1;
-static int hf_bgp_cap_reserved = -1;
-static int hf_bgp_cap_mp_afi = -1;
-static int hf_bgp_cap_mp_safi = -1;
-static int hf_bgp_cap_enh_afi = -1;
-static int hf_bgp_cap_enh_safi = -1;
-static int hf_bgp_cap_enh_nhafi = -1;
-static int hf_bgp_cap_role = -1;
-static int hf_bgp_cap_gr_timers = -1;
-static int hf_bgp_cap_gr_timers_restart_flag = -1;
-static int hf_bgp_cap_gr_timers_notification_flag = -1;
-static int hf_bgp_cap_gr_timers_restart_time = -1;
-static int hf_bgp_cap_gr_afi = -1;
-static int hf_bgp_cap_gr_safi = -1;
-static int hf_bgp_cap_gr_flag = -1;
-static int hf_bgp_cap_gr_flag_pfs = -1;
-static int hf_bgp_cap_4as = -1;
-static int hf_bgp_cap_dc = -1;
-static int hf_bgp_cap_ap_afi = -1;
-static int hf_bgp_cap_ap_safi = -1;
-static int hf_bgp_cap_ap_sendreceive = -1;
-static int hf_bgp_cap_orf_afi = -1;
-static int hf_bgp_cap_orf_safi = -1;
-static int hf_bgp_cap_orf_number = -1;
-static int hf_bgp_cap_orf_type = -1;
-static int hf_bgp_cap_orf_sendreceive = -1;
-static int hf_bgp_cap_fqdn_hostname_len = -1;
-static int hf_bgp_cap_fqdn_hostname = -1;
-static int hf_bgp_cap_fqdn_domain_name_len = -1;
-static int hf_bgp_cap_fqdn_domain_name = -1;
-static int hf_bgp_cap_multisession_flags = -1;
-static int hf_bgp_cap_bgpsec_flags = -1;
-static int hf_bgp_cap_bgpsec_version = -1;
-static int hf_bgp_cap_bgpsec_sendreceive = -1;
-static int hf_bgp_cap_bgpsec_reserved = -1;
-static int hf_bgp_cap_bgpsec_afi = -1;
-static int hf_bgp_cap_soft_version = -1;
-static int hf_bgp_cap_soft_version_len = -1;
+static int hf_bgp_cap;
+static int hf_bgp_cap_type;
+static int hf_bgp_cap_length;
+static int hf_bgp_cap_action;
+static int hf_bgp_cap_unknown;
+static int hf_bgp_cap_reserved;
+static int hf_bgp_cap_mp_afi;
+static int hf_bgp_cap_mp_safi;
+static int hf_bgp_cap_enh_afi;
+static int hf_bgp_cap_enh_safi;
+static int hf_bgp_cap_enh_nhafi;
+static int hf_bgp_cap_role;
+static int hf_bgp_cap_gr_timers;
+static int hf_bgp_cap_gr_timers_restart_flag;
+static int hf_bgp_cap_gr_timers_notification_flag;
+static int hf_bgp_cap_gr_timers_restart_time;
+static int hf_bgp_cap_gr_afi;
+static int hf_bgp_cap_gr_safi;
+static int hf_bgp_cap_gr_flag;
+static int hf_bgp_cap_gr_flag_pfs;
+static int hf_bgp_cap_4as;
+static int hf_bgp_cap_dc;
+static int hf_bgp_cap_ap_afi;
+static int hf_bgp_cap_ap_safi;
+static int hf_bgp_cap_ap_sendreceive;
+static int hf_bgp_cap_orf_afi;
+static int hf_bgp_cap_orf_safi;
+static int hf_bgp_cap_orf_number;
+static int hf_bgp_cap_orf_type;
+static int hf_bgp_cap_orf_sendreceive;
+static int hf_bgp_cap_fqdn_hostname_len;
+static int hf_bgp_cap_fqdn_hostname;
+static int hf_bgp_cap_fqdn_domain_name_len;
+static int hf_bgp_cap_fqdn_domain_name;
+static int hf_bgp_cap_multisession_flags;
+static int hf_bgp_cap_bgpsec_flags;
+static int hf_bgp_cap_bgpsec_version;
+static int hf_bgp_cap_bgpsec_sendreceive;
+static int hf_bgp_cap_bgpsec_reserved;
+static int hf_bgp_cap_bgpsec_afi;
+static int hf_bgp_cap_soft_version;
+static int hf_bgp_cap_soft_version_len;
 
 /* BGP update global header field */
-static int hf_bgp_update_withdrawn_routes_length = -1;
-static int hf_bgp_update_withdrawn_routes = -1;
+static int hf_bgp_update_withdrawn_routes_length;
+static int hf_bgp_update_withdrawn_routes;
 
 
 /* BGP update path attribute header field */
-static int hf_bgp_update_total_path_attribute_length = -1;
-static int hf_bgp_update_path_attributes = -1;
-static int hf_bgp_update_path_attributes_unknown = -1;
-static int hf_bgp_update_path_attribute_communities = -1;
-static int hf_bgp_update_path_attribute_community_well_known = -1;
-static int hf_bgp_update_path_attribute_community = -1;
-static int hf_bgp_update_path_attribute_community_as = -1;
-static int hf_bgp_update_path_attribute_community_value = -1;
-static int hf_bgp_update_path_attribute = -1;
-static int hf_bgp_update_path_attribute_flags = -1;
-static int hf_bgp_update_path_attribute_flags_optional = -1;
-static int hf_bgp_update_path_attribute_flags_transitive = -1;
-static int hf_bgp_update_path_attribute_flags_partial = -1;
-static int hf_bgp_update_path_attribute_flags_extended_length = -1;
-static int hf_bgp_update_path_attribute_flags_unused = -1;
-static int hf_bgp_update_path_attribute_type_code = -1;
-static int hf_bgp_update_path_attribute_length = -1;
-static int hf_bgp_update_path_attribute_next_hop = -1;
-static int hf_bgp_update_path_attribute_as_path_segment = -1;
-static int hf_bgp_update_path_attribute_as_path_segment_type = -1;
-static int hf_bgp_update_path_attribute_as_path_segment_length = -1;
-static int hf_bgp_update_path_attribute_as_path_segment_as2 = -1;
-static int hf_bgp_update_path_attribute_as_path_segment_as4 = -1;
-static int hf_bgp_update_path_attribute_origin = -1;
-static int hf_bgp_update_path_attribute_cluster_list = -1;
-static int hf_bgp_update_path_attribute_cluster_id = -1;
-static int hf_bgp_update_path_attribute_originator_id = -1;
-static int hf_bgp_update_path_attribute_local_pref = -1;
-static int hf_bgp_update_path_attribute_attrset_origin_as = -1;
-static int hf_bgp_update_path_attribute_multi_exit_disc = -1;
-static int hf_bgp_update_path_attribute_aggregator_as = -1;
-static int hf_bgp_update_path_attribute_aggregator_origin = -1;
-static int hf_bgp_update_path_attribute_link_state = -1;
-static int hf_bgp_update_path_attribute_mp_reach_nlri_address_family = -1;
-static int hf_bgp_update_path_attribute_mp_reach_nlri_safi = -1;
-static int hf_bgp_update_path_attribute_mp_reach_nlri_next_hop = -1;
-static int hf_bgp_update_path_attribute_mp_reach_nlri_next_hop_rd = -1;
-static int hf_bgp_update_path_attribute_mp_reach_nlri_next_hop_ipv4 = -1;
-static int hf_bgp_update_path_attribute_mp_reach_nlri_next_hop_ipv6 = -1;
-static int hf_bgp_update_path_attribute_mp_reach_nlri_next_hop_ipv6_link_local = -1;
-static int hf_bgp_update_path_attribute_mp_reach_nlri_nbr_snpa = -1;
-static int hf_bgp_update_path_attribute_mp_reach_nlri_snpa_length = -1;
-static int hf_bgp_update_path_attribute_mp_reach_nlri_snpa = -1;
-static int hf_bgp_update_path_attribute_mp_reach_nlri = -1;
-static int hf_bgp_update_path_attribute_mp_unreach_nlri_address_family = -1;
-static int hf_bgp_update_path_attribute_mp_unreach_nlri_safi = -1;
-static int hf_bgp_update_path_attribute_mp_unreach_nlri = -1;
-static int hf_bgp_update_path_attribute_aigp = -1;
-static int hf_bgp_update_path_attribute_bgpsec_sb_len = -1;
-static int hf_bgp_update_path_attribute_bgpsec_algo_id = -1;
-static int hf_bgp_update_path_attribute_bgpsec_sps_pcount = -1;
-static int hf_bgp_update_path_attribute_bgpsec_sps_flags = -1;
-static int hf_bgp_update_path_attribute_bgpsec_sps_as = -1;
-static int hf_bgp_update_path_attribute_bgpsec_sp_len = -1;
-static int hf_bgp_update_path_attribute_bgpsec_ski = -1;
-static int hf_bgp_update_path_attribute_bgpsec_sig_len = -1;
-static int hf_bgp_update_path_attribute_bgpsec_sig = -1;
-static int hf_bgp_update_path_attribute_otc = -1;
-static int hf_bgp_update_path_attribute_d_path = -1;
-static int hf_bgp_d_path_ga = -1;
-static int hf_bgp_d_path_la = -1;
-static int hf_bgp_d_path_length = -1;
-static int hf_bgp_d_path_isf_safi = -1;
-static int hf_bgp_evpn_nlri = -1;
-static int hf_bgp_evpn_nlri_rt = -1;
-static int hf_bgp_evpn_nlri_len = -1;
-static int hf_bgp_evpn_nlri_rd = -1;
-static int hf_bgp_evpn_nlri_esi = -1;
-static int hf_bgp_evpn_nlri_esi_type = -1;
-static int hf_bgp_evpn_nlri_esi_lacp_mac = -1;
-static int hf_bgp_evpn_nlri_esi_portk = -1;
-static int hf_bgp_evpn_nlri_esi_remain = -1;
-static int hf_bgp_evpn_nlri_esi_value = -1;
-static int hf_bgp_evpn_nlri_esi_value_type0 = -1;
-static int hf_bgp_evpn_nlri_esi_rb_mac = -1;
-static int hf_bgp_evpn_nlri_esi_rbprio = -1;
-static int hf_bgp_evpn_nlri_esi_sys_mac = -1;
-static int hf_bgp_evpn_nlri_esi_mac_discr = -1;
-static int hf_bgp_evpn_nlri_esi_router_id = -1;
-static int hf_bgp_evpn_nlri_esi_router_discr = -1;
-static int hf_bgp_evpn_nlri_esi_asn = -1;
-static int hf_bgp_evpn_nlri_esi_asn_discr = -1;
-static int hf_bgp_evpn_nlri_esi_reserved = -1;
-static int hf_bgp_evpn_nlri_etag = -1;
-static int hf_bgp_evpn_nlri_mpls_ls1 = -1;
-static int hf_bgp_evpn_nlri_mpls_ls2 = -1;
-static int hf_bgp_evpn_nlri_vni = -1;
-static int hf_bgp_evpn_nlri_maclen = -1;
-static int hf_bgp_evpn_nlri_mac_addr = -1;
-static int hf_bgp_evpn_nlri_iplen = -1;
-static int hf_bgp_evpn_nlri_prefix_len = -1;
-static int hf_bgp_evpn_nlri_ip_addr = -1;
-static int hf_bgp_evpn_nlri_ipv6_addr = -1;
-static int hf_bgp_evpn_nlri_ipv4_gtw = -1;
-static int hf_bgp_evpn_nlri_ipv6_gtw = -1;
-static int hf_bgp_evpn_nlri_igmp_mc_or_length = -1;
-static int hf_bgp_evpn_nlri_igmp_mc_or_addr_ipv4 = -1;
-static int hf_bgp_evpn_nlri_igmp_mc_or_addr_ipv6 = -1;
-static int hf_bgp_evpn_nlri_igmp_mc_flags = -1;
-static int hf_bgp_evpn_nlri_igmp_mc_flags_v1 = -1;
-static int hf_bgp_evpn_nlri_igmp_mc_flags_v2 = -1;
-static int hf_bgp_evpn_nlri_igmp_mc_flags_v3 = -1;
-static int hf_bgp_evpn_nlri_igmp_mc_flags_ie = -1;
-static int hf_bgp_evpn_nlri_igmp_mc_flags_reserved = -1;
+static int hf_bgp_update_total_path_attribute_length;
+static int hf_bgp_update_path_attributes;
+static int hf_bgp_update_path_attributes_unknown;
+static int hf_bgp_update_path_attribute_communities;
+static int hf_bgp_update_path_attribute_community_well_known;
+static int hf_bgp_update_path_attribute_community;
+static int hf_bgp_update_path_attribute_community_as;
+static int hf_bgp_update_path_attribute_community_value;
+static int hf_bgp_update_path_attribute;
+static int hf_bgp_update_path_attribute_flags;
+static int hf_bgp_update_path_attribute_flags_optional;
+static int hf_bgp_update_path_attribute_flags_transitive;
+static int hf_bgp_update_path_attribute_flags_partial;
+static int hf_bgp_update_path_attribute_flags_extended_length;
+static int hf_bgp_update_path_attribute_flags_unused;
+static int hf_bgp_update_path_attribute_type_code;
+static int hf_bgp_update_path_attribute_length;
+static int hf_bgp_update_path_attribute_next_hop;
+static int hf_bgp_update_path_attribute_as_path_segment;
+static int hf_bgp_update_path_attribute_as_path_segment_type;
+static int hf_bgp_update_path_attribute_as_path_segment_length;
+static int hf_bgp_update_path_attribute_as_path_segment_as2;
+static int hf_bgp_update_path_attribute_as_path_segment_as4;
+static int hf_bgp_update_path_attribute_origin;
+static int hf_bgp_update_path_attribute_cluster_list;
+static int hf_bgp_update_path_attribute_cluster_id;
+static int hf_bgp_update_path_attribute_originator_id;
+static int hf_bgp_update_path_attribute_local_pref;
+static int hf_bgp_update_path_attribute_attrset_origin_as;
+static int hf_bgp_update_path_attribute_multi_exit_disc;
+static int hf_bgp_update_path_attribute_aggregator_as;
+static int hf_bgp_update_path_attribute_aggregator_origin;
+static int hf_bgp_update_path_attribute_link_state;
+static int hf_bgp_update_path_attribute_mp_reach_nlri_address_family;
+static int hf_bgp_update_path_attribute_mp_reach_nlri_safi;
+static int hf_bgp_update_path_attribute_mp_reach_nlri_next_hop;
+static int hf_bgp_update_path_attribute_mp_reach_nlri_next_hop_rd;
+static int hf_bgp_update_path_attribute_mp_reach_nlri_next_hop_ipv4;
+static int hf_bgp_update_path_attribute_mp_reach_nlri_next_hop_ipv6;
+static int hf_bgp_update_path_attribute_mp_reach_nlri_next_hop_ipv6_link_local;
+static int hf_bgp_update_path_attribute_mp_reach_nlri_nbr_snpa;
+static int hf_bgp_update_path_attribute_mp_reach_nlri_snpa_length;
+static int hf_bgp_update_path_attribute_mp_reach_nlri_snpa;
+static int hf_bgp_update_path_attribute_mp_reach_nlri;
+static int hf_bgp_update_path_attribute_mp_unreach_nlri_address_family;
+static int hf_bgp_update_path_attribute_mp_unreach_nlri_safi;
+static int hf_bgp_update_path_attribute_mp_unreach_nlri;
+static int hf_bgp_update_path_attribute_aigp;
+static int hf_bgp_update_path_attribute_bgpsec_sb_len;
+static int hf_bgp_update_path_attribute_bgpsec_algo_id;
+static int hf_bgp_update_path_attribute_bgpsec_sps_pcount;
+static int hf_bgp_update_path_attribute_bgpsec_sps_flags;
+static int hf_bgp_update_path_attribute_bgpsec_sps_as;
+static int hf_bgp_update_path_attribute_bgpsec_sp_len;
+static int hf_bgp_update_path_attribute_bgpsec_ski;
+static int hf_bgp_update_path_attribute_bgpsec_sig_len;
+static int hf_bgp_update_path_attribute_bgpsec_sig;
+static int hf_bgp_update_path_attribute_otc;
+static int hf_bgp_update_path_attribute_d_path;
+static int hf_bgp_d_path_ga;
+static int hf_bgp_d_path_la;
+static int hf_bgp_d_path_length;
+static int hf_bgp_d_path_isf_safi;
+static int hf_bgp_evpn_nlri;
+static int hf_bgp_evpn_nlri_rt;
+static int hf_bgp_evpn_nlri_len;
+static int hf_bgp_evpn_nlri_rd;
+static int hf_bgp_evpn_nlri_esi;
+static int hf_bgp_evpn_nlri_esi_type;
+static int hf_bgp_evpn_nlri_esi_lacp_mac;
+static int hf_bgp_evpn_nlri_esi_portk;
+static int hf_bgp_evpn_nlri_esi_remain;
+static int hf_bgp_evpn_nlri_esi_value;
+static int hf_bgp_evpn_nlri_esi_value_type0;
+static int hf_bgp_evpn_nlri_esi_rb_mac;
+static int hf_bgp_evpn_nlri_esi_rbprio;
+static int hf_bgp_evpn_nlri_esi_sys_mac;
+static int hf_bgp_evpn_nlri_esi_mac_discr;
+static int hf_bgp_evpn_nlri_esi_router_id;
+static int hf_bgp_evpn_nlri_esi_router_discr;
+static int hf_bgp_evpn_nlri_esi_asn;
+static int hf_bgp_evpn_nlri_esi_asn_discr;
+static int hf_bgp_evpn_nlri_esi_reserved;
+static int hf_bgp_evpn_nlri_etag;
+static int hf_bgp_evpn_nlri_mpls_ls1;
+static int hf_bgp_evpn_nlri_mpls_ls2;
+static int hf_bgp_evpn_nlri_vni;
+static int hf_bgp_evpn_nlri_maclen;
+static int hf_bgp_evpn_nlri_mac_addr;
+static int hf_bgp_evpn_nlri_iplen;
+static int hf_bgp_evpn_nlri_prefix_len;
+static int hf_bgp_evpn_nlri_ip_addr;
+static int hf_bgp_evpn_nlri_ipv6_addr;
+static int hf_bgp_evpn_nlri_ipv4_gtw;
+static int hf_bgp_evpn_nlri_ipv6_gtw;
+static int hf_bgp_evpn_nlri_igmp_mc_or_length;
+static int hf_bgp_evpn_nlri_igmp_mc_or_addr_ipv4;
+static int hf_bgp_evpn_nlri_igmp_mc_or_addr_ipv6;
+static int hf_bgp_evpn_nlri_igmp_mc_flags;
+static int hf_bgp_evpn_nlri_igmp_mc_flags_v1;
+static int hf_bgp_evpn_nlri_igmp_mc_flags_v2;
+static int hf_bgp_evpn_nlri_igmp_mc_flags_v3;
+static int hf_bgp_evpn_nlri_igmp_mc_flags_ie;
+static int hf_bgp_evpn_nlri_igmp_mc_flags_reserved;
 
 static int * const evpn_nlri_igmp_mc_flags[] = {
        &hf_bgp_evpn_nlri_igmp_mc_flags_v1,
@@ -2280,308 +2280,308 @@ static int * const evpn_nlri_igmp_mc_flags[] = {
 
 /* BGP update tunnel encaps attribute RFC 5512 */
 
-static int hf_bgp_update_encaps_tunnel_tlv_len = -1;
-static int hf_bgp_update_encaps_tunnel_tlv_type = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_len = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_type = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_session_id = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_cookie = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_gre_key = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_color_value = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_lb_block_length = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_value = -1;
+static int hf_bgp_update_encaps_tunnel_tlv_len;
+static int hf_bgp_update_encaps_tunnel_tlv_type;
+static int hf_bgp_update_encaps_tunnel_subtlv_len;
+static int hf_bgp_update_encaps_tunnel_subtlv_type;
+static int hf_bgp_update_encaps_tunnel_subtlv_session_id;
+static int hf_bgp_update_encaps_tunnel_subtlv_cookie;
+static int hf_bgp_update_encaps_tunnel_subtlv_gre_key;
+static int hf_bgp_update_encaps_tunnel_subtlv_color_value;
+static int hf_bgp_update_encaps_tunnel_subtlv_lb_block_length;
+static int hf_bgp_update_encaps_tunnel_subtlv_value;
 
 /* draft-ietf-idr-tunnel-encaps */
-static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_flags = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_flags_valid_vnid = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_flags_valid_mac = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_flags_reserved = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_vnid = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_mac = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_reserved = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_gpe_flags = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_gpe_flags_version = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_gpe_flags_valid_vnid = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_gpe_flags_reserved = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_gpe_vnid = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_gpe_reserved = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_nvgre_flags = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_nvgre_flags_valid_vnid = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_nvgre_flags_valid_mac = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_nvgre_flags_reserved = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_nvgre_vnid = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_nvgre_mac = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_nvgre_reserved = -1;
+static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_flags;
+static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_flags_valid_vnid;
+static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_flags_valid_mac;
+static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_flags_reserved;
+static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_vnid;
+static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_mac;
+static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_reserved;
+static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_gpe_flags;
+static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_gpe_flags_version;
+static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_gpe_flags_valid_vnid;
+static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_gpe_flags_reserved;
+static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_gpe_vnid;
+static int hf_bgp_update_encaps_tunnel_subtlv_vxlan_gpe_reserved;
+static int hf_bgp_update_encaps_tunnel_subtlv_nvgre_flags;
+static int hf_bgp_update_encaps_tunnel_subtlv_nvgre_flags_valid_vnid;
+static int hf_bgp_update_encaps_tunnel_subtlv_nvgre_flags_valid_mac;
+static int hf_bgp_update_encaps_tunnel_subtlv_nvgre_flags_reserved;
+static int hf_bgp_update_encaps_tunnel_subtlv_nvgre_vnid;
+static int hf_bgp_update_encaps_tunnel_subtlv_nvgre_mac;
+static int hf_bgp_update_encaps_tunnel_subtlv_nvgre_reserved;
 
 /* draft-ietf-idr-segment-routing-te-policy */
-static int hf_bgp_update_encaps_tunnel_subtlv_pref_flags = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_pref_reserved = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_pref_preference = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_binding_sid_flags = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_binding_sid_flags_specified = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_binding_sid_flags_invalid = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_binding_sid_flags_reserved = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_binding_sid_reserved = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_binding_sid_sid= -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_enlp_flags = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_enlp_reserved = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_enlp_enlp = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_priority_priority = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_priority_reserved = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_reserved = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_type = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_length = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_data = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_flags = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_flags_verification = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_flags_algorithm = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_flags_reserved = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_reserved = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_mpls_label = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_traffic_class = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_bottom_stack = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_ttl = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_policy_name_reserved = -1;
-static int hf_bgp_update_encaps_tunnel_subtlv_policy_name_name = -1;
+static int hf_bgp_update_encaps_tunnel_subtlv_pref_flags;
+static int hf_bgp_update_encaps_tunnel_subtlv_pref_reserved;
+static int hf_bgp_update_encaps_tunnel_subtlv_pref_preference;
+static int hf_bgp_update_encaps_tunnel_subtlv_binding_sid_flags;
+static int hf_bgp_update_encaps_tunnel_subtlv_binding_sid_flags_specified;
+static int hf_bgp_update_encaps_tunnel_subtlv_binding_sid_flags_invalid;
+static int hf_bgp_update_encaps_tunnel_subtlv_binding_sid_flags_reserved;
+static int hf_bgp_update_encaps_tunnel_subtlv_binding_sid_reserved;
+static int hf_bgp_update_encaps_tunnel_subtlv_binding_sid_sid;
+static int hf_bgp_update_encaps_tunnel_subtlv_enlp_flags;
+static int hf_bgp_update_encaps_tunnel_subtlv_enlp_reserved;
+static int hf_bgp_update_encaps_tunnel_subtlv_enlp_enlp;
+static int hf_bgp_update_encaps_tunnel_subtlv_priority_priority;
+static int hf_bgp_update_encaps_tunnel_subtlv_priority_reserved;
+static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_reserved;
+static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv;
+static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_type;
+static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_length;
+static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_data;
+static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_flags;
+static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_flags_verification;
+static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_flags_algorithm;
+static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_flags_reserved;
+static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_reserved;
+static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_mpls_label;
+static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_traffic_class;
+static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_bottom_stack;
+static int hf_bgp_update_encaps_tunnel_subtlv_segment_list_subtlv_ttl;
+static int hf_bgp_update_encaps_tunnel_subtlv_policy_name_reserved;
+static int hf_bgp_update_encaps_tunnel_subtlv_policy_name_name;
 
 /* RFC 6514 PMSI Tunnel Attribute */
-static int hf_bgp_pmsi_tunnel_flags = -1;
-static int hf_bgp_pmsi_tunnel_type = -1;
-static int hf_bgp_pmsi_tunnel_id = -1;
-static int hf_bgp_pmsi_tunnel_not_present = -1;
-static int hf_bgp_pmsi_tunnel_rsvp_p2mp_id = -1; /* RFC4875 section 19 */
-static int hf_bgp_pmsi_tunnel_rsvp_p2mp_tunnel_id = -1;
-static int hf_bgp_pmsi_tunnel_rsvp_p2mp_ext_tunnel_idv4 = -1;
-static int hf_bgp_pmsi_tunnel_mldp_fec_el_type = -1; /* RFC 6388 section 2.3 */
-static int hf_bgp_pmsi_tunnel_mldp_fec_el_afi = -1;
-static int hf_bgp_pmsi_tunnel_mldp_fec_el_adr_len = -1;
-static int hf_bgp_pmsi_tunnel_mldp_fec_el_root_nodev4 = -1;
-static int hf_bgp_pmsi_tunnel_mldp_fec_el_root_nodev6 = -1;
-static int hf_bgp_pmsi_tunnel_mldp_fec_el_opa_len = -1;
-static int hf_bgp_pmsi_tunnel_mldp_fec_el_opa_val_type = -1;
-static int hf_bgp_pmsi_tunnel_mldp_fec_el_opa_val_len = -1;
-static int hf_bgp_pmsi_tunnel_mldp_fec_el_opa_value_rn = -1;
-static int hf_bgp_pmsi_tunnel_mldp_fec_el_opa_value_str = -1;
-static int hf_bgp_pmsi_tunnel_mldp_fec_el_opa_val_ext_type = -1;
-static int hf_bgp_pmsi_tunnel_mldp_fec_el_opa_val_ext_len = -1;
-static int hf_bgp_pmsi_tunnel_pimsm_sender = -1;
-static int hf_bgp_pmsi_tunnel_pimsm_pmc_group = -1;
-static int hf_bgp_pmsi_tunnel_pimssm_root_node = -1;
-static int hf_bgp_pmsi_tunnel_pimssm_pmc_group = -1;
-static int hf_bgp_pmsi_tunnel_pimbidir_sender = -1;
-static int hf_bgp_pmsi_tunnel_pimbidir_pmc_group = -1;
-static int hf_bgp_pmsi_tunnel_ingress_rep_addr = -1;
-static int hf_bgp_pmsi_tunnel_ingress_rep_addr6 = -1;
+static int hf_bgp_pmsi_tunnel_flags;
+static int hf_bgp_pmsi_tunnel_type;
+static int hf_bgp_pmsi_tunnel_id;
+static int hf_bgp_pmsi_tunnel_not_present;
+static int hf_bgp_pmsi_tunnel_rsvp_p2mp_id; /* RFC4875 section 19 */
+static int hf_bgp_pmsi_tunnel_rsvp_p2mp_tunnel_id;
+static int hf_bgp_pmsi_tunnel_rsvp_p2mp_ext_tunnel_idv4;
+static int hf_bgp_pmsi_tunnel_mldp_fec_el_type; /* RFC 6388 section 2.3 */
+static int hf_bgp_pmsi_tunnel_mldp_fec_el_afi;
+static int hf_bgp_pmsi_tunnel_mldp_fec_el_adr_len;
+static int hf_bgp_pmsi_tunnel_mldp_fec_el_root_nodev4;
+static int hf_bgp_pmsi_tunnel_mldp_fec_el_root_nodev6;
+static int hf_bgp_pmsi_tunnel_mldp_fec_el_opa_len;
+static int hf_bgp_pmsi_tunnel_mldp_fec_el_opa_val_type;
+static int hf_bgp_pmsi_tunnel_mldp_fec_el_opa_val_len;
+static int hf_bgp_pmsi_tunnel_mldp_fec_el_opa_value_rn;
+static int hf_bgp_pmsi_tunnel_mldp_fec_el_opa_value_str;
+static int hf_bgp_pmsi_tunnel_mldp_fec_el_opa_val_ext_type;
+static int hf_bgp_pmsi_tunnel_mldp_fec_el_opa_val_ext_len;
+static int hf_bgp_pmsi_tunnel_pimsm_sender;
+static int hf_bgp_pmsi_tunnel_pimsm_pmc_group;
+static int hf_bgp_pmsi_tunnel_pimssm_root_node;
+static int hf_bgp_pmsi_tunnel_pimssm_pmc_group;
+static int hf_bgp_pmsi_tunnel_pimbidir_sender;
+static int hf_bgp_pmsi_tunnel_pimbidir_pmc_group;
+static int hf_bgp_pmsi_tunnel_ingress_rep_addr;
+static int hf_bgp_pmsi_tunnel_ingress_rep_addr6;
 
 /* RFC 7311 attribute */
-static int hf_bgp_aigp_type = -1;
-static int hf_bgp_aigp_tlv_length = -1;
-static int hf_bgp_aigp_accu_igp_metric = -1;
+static int hf_bgp_aigp_type;
+static int hf_bgp_aigp_tlv_length;
+static int hf_bgp_aigp_accu_igp_metric;
 
 
 /* MPLS labels decoding */
-static int hf_bgp_update_mpls_label = -1;
-static int hf_bgp_update_mpls_label_value = -1;
-static int hf_bgp_update_mpls_label_value_20bits = -1;
-static int hf_bgp_update_mpls_traffic_class = -1;
-static int hf_bgp_update_mpls_bottom_stack = -1;
+static int hf_bgp_update_mpls_label;
+static int hf_bgp_update_mpls_label_value;
+static int hf_bgp_update_mpls_label_value_20bits;
+static int hf_bgp_update_mpls_traffic_class;
+static int hf_bgp_update_mpls_bottom_stack;
 
 /* BGP update path attribute SSA SAFI Specific attribute (deprecated should we keep it ?) */
 
-static int hf_bgp_ssa_t = -1;
-static int hf_bgp_ssa_type = -1;
-static int hf_bgp_ssa_len = -1;
-static int hf_bgp_ssa_value = -1;
-static int hf_bgp_ssa_l2tpv3_pref = -1;
-static int hf_bgp_ssa_l2tpv3_s = -1;
-static int hf_bgp_ssa_l2tpv3_unused = -1;
-static int hf_bgp_ssa_l2tpv3_cookie_len = -1;
-static int hf_bgp_ssa_l2tpv3_session_id = -1;
-static int hf_bgp_ssa_l2tpv3_cookie = -1;
+static int hf_bgp_ssa_t;
+static int hf_bgp_ssa_type;
+static int hf_bgp_ssa_len;
+static int hf_bgp_ssa_value;
+static int hf_bgp_ssa_l2tpv3_pref;
+static int hf_bgp_ssa_l2tpv3_s;
+static int hf_bgp_ssa_l2tpv3_unused;
+static int hf_bgp_ssa_l2tpv3_cookie_len;
+static int hf_bgp_ssa_l2tpv3_session_id;
+static int hf_bgp_ssa_l2tpv3_cookie;
 
 /* BGP NLRI head field */
-static int hf_bgp_update_nlri = -1;
+static int hf_bgp_update_nlri;
 
-static int hf_bgp_mp_reach_nlri_ipv4_prefix = -1;
-static int hf_bgp_mp_unreach_nlri_ipv4_prefix = -1;
-static int hf_bgp_mp_reach_nlri_ipv6_prefix = -1;
-static int hf_bgp_mp_unreach_nlri_ipv6_prefix = -1;
-static int hf_bgp_mp_nlri_tnl_id = -1;
-static int hf_bgp_withdrawn_prefix = -1;
-static int hf_bgp_nlri_prefix = -1;
-static int hf_bgp_nlri_path_id = -1;
+static int hf_bgp_mp_reach_nlri_ipv4_prefix;
+static int hf_bgp_mp_unreach_nlri_ipv4_prefix;
+static int hf_bgp_mp_reach_nlri_ipv6_prefix;
+static int hf_bgp_mp_unreach_nlri_ipv6_prefix;
+static int hf_bgp_mp_nlri_tnl_id;
+static int hf_bgp_withdrawn_prefix;
+static int hf_bgp_nlri_prefix;
+static int hf_bgp_nlri_path_id;
 
 /* BGP mcast IP VPN nlri header field */
 
-static int hf_bgp_mcast_vpn_nlri_t = -1;
-static int hf_bgp_mcast_vpn_nlri_route_type = -1;
-static int hf_bgp_mcast_vpn_nlri_length = -1;
-static int hf_bgp_mcast_vpn_nlri_rd = -1;
-static int hf_bgp_mcast_vpn_nlri_origin_router_ipv4 = -1;
-static int hf_bgp_mcast_vpn_nlri_origin_router_ipv6 = -1;
-static int hf_bgp_mcast_vpn_nlri_source_as = -1;
-static int hf_bgp_mcast_vpn_nlri_source_length = -1;
-static int hf_bgp_mcast_vpn_nlri_group_length = -1;
-static int hf_bgp_mcast_vpn_nlri_source_addr_ipv4 = -1;
-static int hf_bgp_mcast_vpn_nlri_source_addr_ipv6 = -1;
-static int hf_bgp_mcast_vpn_nlri_group_addr_ipv4 = -1;
-static int hf_bgp_mcast_vpn_nlri_group_addr_ipv6 = -1;
-static int hf_bgp_mcast_vpn_nlri_route_key = -1;
+static int hf_bgp_mcast_vpn_nlri_t;
+static int hf_bgp_mcast_vpn_nlri_route_type;
+static int hf_bgp_mcast_vpn_nlri_length;
+static int hf_bgp_mcast_vpn_nlri_rd;
+static int hf_bgp_mcast_vpn_nlri_origin_router_ipv4;
+static int hf_bgp_mcast_vpn_nlri_origin_router_ipv6;
+static int hf_bgp_mcast_vpn_nlri_source_as;
+static int hf_bgp_mcast_vpn_nlri_source_length;
+static int hf_bgp_mcast_vpn_nlri_group_length;
+static int hf_bgp_mcast_vpn_nlri_source_addr_ipv4;
+static int hf_bgp_mcast_vpn_nlri_source_addr_ipv6;
+static int hf_bgp_mcast_vpn_nlri_group_addr_ipv4;
+static int hf_bgp_mcast_vpn_nlri_group_addr_ipv6;
+static int hf_bgp_mcast_vpn_nlri_route_key;
 
 /* BGP SR policy nlri field */
-static int hf_bgp_sr_policy_nlri_length = - 1;
-static int hf_bgp_sr_policy_nlri_distinguisher = - 1;
-static int hf_bgp_sr_policy_nlri_policy_color = - 1;
-static int hf_bgp_sr_policy_nlri_endpoint_v4 = - 1;
-static int hf_bgp_sr_policy_nlri_endpoint_v6 = - 1;
+static int hf_bgp_sr_policy_nlri_length;
+static int hf_bgp_sr_policy_nlri_distinguisher;
+static int hf_bgp_sr_policy_nlri_policy_color;
+static int hf_bgp_sr_policy_nlri_endpoint_v4;
+static int hf_bgp_sr_policy_nlri_endpoint_v6;
 
 /* BGP-LS */
 
-static int hf_bgp_ls_type = -1;
-static int hf_bgp_ls_length = -1;
-
-static int hf_bgp_ls_nlri = -1;
-static int hf_bgp_ls_safi128_nlri = -1;
-static int hf_bgp_ls_safi128_nlri_route_distinguisher = -1;
-static int hf_bgp_ls_safi128_nlri_route_distinguisher_type = -1;
-static int hf_bgp_ls_safi128_nlri_route_dist_admin_asnum_2 = -1;
-static int hf_bgp_ls_safi128_nlri_route_dist_admin_ipv4 = -1;
-static int hf_bgp_ls_safi128_nlri_route_dist_admin_asnum_4 = -1;
-static int hf_bgp_ls_safi128_nlri_route_dist_asnum_2 = -1;
-static int hf_bgp_ls_safi128_nlri_route_dist_asnum_4 = -1;
-static int hf_bgp_ls_nlri_type = -1;
-static int hf_bgp_ls_nlri_length = -1;
-static int hf_bgp_ls_nlri_link_nlri_type = -1;
-static int hf_bgp_ls_nlri_link_descriptors_tlv = -1;
-static int hf_bgp_ls_nlri_prefix_descriptors_tlv = -1;
-static int hf_bgp_ls_nlri_srv6_sid_descriptors_tlv = -1;
-static int hf_bgp_ls_nlri_link_local_identifier = -1;
-static int hf_bgp_ls_nlri_link_remote_identifier = -1;
-static int hf_bgp_ls_nlri_ipv4_interface_address = -1;
-static int hf_bgp_ls_nlri_ipv4_neighbor_address = -1;
-static int hf_bgp_ls_nlri_ipv6_interface_address = -1;
-static int hf_bgp_ls_nlri_ipv6_neighbor_address = -1;
-static int hf_bgp_ls_nlri_multi_topology_id = -1;
-static int hf_bgp_ls_nlri_ospf_route_type = -1;
-static int hf_bgp_ls_nlri_ip_reachability_prefix_ip = -1;
-static int hf_bgp_ls_nlri_ip_reachability_prefix_ip6 = -1;
-static int hf_bgp_ls_nlri_node_nlri_type = -1;
-static int hf_bgp_ls_nlri_node_protocol_id = -1;
-static int hf_bgp_ls_nlri_node_identifier = -1;
-static int hf_bgp_ls_ipv4_topology_prefix_nlri_type = -1;
-static int hf_bgp_ls_ipv6_topology_prefix_nlri_type = -1;
-static int hf_bgp_ls_nlri_srv6_sid_nlri_type = -1;
+static int hf_bgp_ls_type;
+static int hf_bgp_ls_length;
+
+static int hf_bgp_ls_nlri;
+static int hf_bgp_ls_safi128_nlri;
+static int hf_bgp_ls_safi128_nlri_route_distinguisher;
+static int hf_bgp_ls_safi128_nlri_route_distinguisher_type;
+static int hf_bgp_ls_safi128_nlri_route_dist_admin_asnum_2;
+static int hf_bgp_ls_safi128_nlri_route_dist_admin_ipv4;
+static int hf_bgp_ls_safi128_nlri_route_dist_admin_asnum_4;
+static int hf_bgp_ls_safi128_nlri_route_dist_asnum_2;
+static int hf_bgp_ls_safi128_nlri_route_dist_asnum_4;
+static int hf_bgp_ls_nlri_type;
+static int hf_bgp_ls_nlri_length;
+static int hf_bgp_ls_nlri_link_nlri_type;
+static int hf_bgp_ls_nlri_link_descriptors_tlv;
+static int hf_bgp_ls_nlri_prefix_descriptors_tlv;
+static int hf_bgp_ls_nlri_srv6_sid_descriptors_tlv;
+static int hf_bgp_ls_nlri_link_local_identifier;
+static int hf_bgp_ls_nlri_link_remote_identifier;
+static int hf_bgp_ls_nlri_ipv4_interface_address;
+static int hf_bgp_ls_nlri_ipv4_neighbor_address;
+static int hf_bgp_ls_nlri_ipv6_interface_address;
+static int hf_bgp_ls_nlri_ipv6_neighbor_address;
+static int hf_bgp_ls_nlri_multi_topology_id;
+static int hf_bgp_ls_nlri_ospf_route_type;
+static int hf_bgp_ls_nlri_ip_reachability_prefix_ip;
+static int hf_bgp_ls_nlri_ip_reachability_prefix_ip6;
+static int hf_bgp_ls_nlri_node_nlri_type;
+static int hf_bgp_ls_nlri_node_protocol_id;
+static int hf_bgp_ls_nlri_node_identifier;
+static int hf_bgp_ls_ipv4_topology_prefix_nlri_type;
+static int hf_bgp_ls_ipv6_topology_prefix_nlri_type;
+static int hf_bgp_ls_nlri_srv6_sid_nlri_type;
 
 /* BGP-LS + SR */
-static int hf_bgp_ls_sr_tlv_capabilities = -1;
-static int hf_bgp_ls_sr_tlv_capabilities_range_size = -1;
-static int hf_bgp_ls_sr_tlv_capabilities_flags = -1;
-static int hf_bgp_ls_sr_tlv_capabilities_flags_i = -1;
-static int hf_bgp_ls_sr_tlv_capabilities_flags_v = -1;
-static int hf_bgp_ls_sr_tlv_capabilities_flags_h = -1;
-static int hf_bgp_ls_sr_tlv_capabilities_flags_reserved = -1;
-static int hf_bgp_ls_sr_tlv_capabilities_sid_label = -1;
-static int hf_bgp_ls_sr_tlv_capabilities_sid_index = -1;
-static int hf_bgp_ls_sr_tlv_algorithm = -1;
-static int hf_bgp_ls_sr_tlv_algorithm_value = -1;
-static int hf_bgp_ls_sr_tlv_local_block = -1;                      /* 1036 */
-static int hf_bgp_ls_sr_tlv_local_block_flags = -1;
-static int hf_bgp_ls_sr_tlv_local_block_range_size = -1;
-static int hf_bgp_ls_sr_tlv_local_block_sid_label = -1;
-static int hf_bgp_ls_sr_tlv_local_block_sid_index = -1;
-static int hf_bgp_ls_sr_tlv_srv6_cap = -1;                         /* 1037 */
-static int hf_bgp_ls_sr_tlv_srv6_cap_flags = -1;
-static int hf_bgp_ls_sr_tlv_srv6_cap_flags_o = -1;
-static int hf_bgp_ls_sr_tlv_srv6_cap_flags_reserved = -1;
-static int hf_bgp_ls_sr_tlv_srv6_cap_reserved = -1;
-static int hf_bgp_ls_sr_tlv_flex_algo_def = -1;                    /* 1039 */
-static int hf_bgp_ls_sr_tlv_flex_algo_algorithm = -1;
-static int hf_bgp_ls_sr_tlv_flex_algo_metric_type = -1;
-static int hf_bgp_ls_sr_tlv_flex_algo_calc_type = -1;
-static int hf_bgp_ls_sr_tlv_flex_algo_priority = -1;
-static int hf_bgp_ls_sr_tlv_flex_algo_exc_any_affinity = -1;       /* 1040 */
-static int hf_bgp_ls_sr_tlv_flex_algo_inc_any_affinity = -1;       /* 1041 */
-static int hf_bgp_ls_sr_tlv_flex_algo_inc_all_affinity = -1;       /* 1042 */
-static int hf_bgp_ls_sr_tlv_prefix_sid = -1;
-static int hf_bgp_ls_sr_tlv_prefix_sid_flags = -1;
-static int hf_bgp_ls_sr_tlv_prefix_sid_flags_r = -1;
-static int hf_bgp_ls_sr_tlv_prefix_sid_flags_n = -1;
-static int hf_bgp_ls_sr_tlv_prefix_sid_flags_np = -1;
-static int hf_bgp_ls_sr_tlv_prefix_sid_flags_p = -1;
-static int hf_bgp_ls_sr_tlv_prefix_sid_flags_m = -1;
-static int hf_bgp_ls_sr_tlv_prefix_sid_flags_e = -1;
-static int hf_bgp_ls_sr_tlv_prefix_sid_flags_v = -1;
-static int hf_bgp_ls_sr_tlv_prefix_sid_flags_l = -1;
-static int hf_bgp_ls_sr_tlv_prefix_sid_algo = -1;
-static int hf_bgp_ls_sr_tlv_prefix_sid_label = -1;
-static int hf_bgp_ls_sr_tlv_prefix_sid_index = -1;
-static int hf_bgp_ls_sr_tlv_adjacency_sid = -1;
-static int hf_bgp_ls_sr_tlv_adjacency_sid_flags = -1;
-static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_fi = -1;
-static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_bi = -1;
-static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_bo = -1;
-static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_vi = -1;
-static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_vo = -1;
-static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_li = -1;
-static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_lo = -1;
-static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_si = -1;
-static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_so = -1;
-static int hf_bgp_ls_sr_tlv_adjacency_sid_weight = -1;
-static int hf_bgp_ls_sr_tlv_adjacency_sid_label = -1;
-static int hf_bgp_ls_sr_tlv_adjacency_sid_index = -1;
-static int hf_bgp_ls_sr_tlv_peer_node_sid = -1;                    /* 1101 */
-static int hf_bgp_ls_sr_tlv_peer_adj_sid = -1;                     /* 1102 */
-static int hf_bgp_ls_sr_tlv_peer_set_sid = -1;                     /* 1103 */
-static int hf_bgp_ls_sr_tlv_peer_sid_flags = -1;
-static int hf_bgp_ls_sr_tlv_peer_sid_flags_v = -1;
-static int hf_bgp_ls_sr_tlv_peer_sid_flags_l = -1;
-static int hf_bgp_ls_sr_tlv_peer_sid_flags_b = -1;
-static int hf_bgp_ls_sr_tlv_peer_sid_flags_p = -1;
-static int hf_bgp_ls_sr_tlv_peer_sid_weight = -1;
-static int hf_bgp_ls_sr_tlv_peer_sid_label = -1;
-static int hf_bgp_ls_sr_tlv_peer_sid_index = -1;
-static int hf_bgp_ls_sr_tlv_srv6_endx_sid = -1;                   /* 1106 */
-static int hf_bgp_ls_sr_tlv_srv6_lan_endx_sid = -1;               /* 1107 */
-static int hf_bgp_ls_sr_tlv_srv6_endx_sid_endpoint_behavior = -1;
-static int hf_bgp_ls_sr_tlv_srv6_endx_sid_flags = -1;
-static int hf_bgp_ls_sr_tlv_srv6_endx_sid_flags_b = -1;
-static int hf_bgp_ls_sr_tlv_srv6_endx_sid_flags_s = -1;
-static int hf_bgp_ls_sr_tlv_srv6_endx_sid_flags_p = -1;
-static int hf_bgp_ls_sr_tlv_srv6_endx_sid_flags_reserved = -1;
-static int hf_bgp_ls_sr_tlv_srv6_endx_sid_algo = -1;
-static int hf_bgp_ls_sr_tlv_srv6_endx_sid_weight = -1;
-static int hf_bgp_ls_sr_tlv_srv6_endx_sid_reserved = -1;
-static int hf_bgp_ls_sr_tlv_srv6_endx_sid_neighbor_isis = -1;
-static int hf_bgp_ls_sr_tlv_srv6_endx_sid_neighbor_ospf = -1;
-static int hf_bgp_ls_sr_tlv_srv6_endx_sid_sid = -1;
-static int hf_bgp_ls_sr_tlv_srv6_locator = -1;                     /* 1162 */
-static int hf_bgp_ls_sr_tlv_srv6_locator_flags = -1;
-static int hf_bgp_ls_sr_tlv_srv6_locator_flags_d = -1;
-static int hf_bgp_ls_sr_tlv_srv6_locator_flags_reserved = -1;
-static int hf_bgp_ls_sr_tlv_srv6_locator_algo = -1;
-static int hf_bgp_ls_sr_tlv_srv6_locator_reserved = -1;
-static int hf_bgp_ls_sr_tlv_srv6_locator_metric = -1;
-static int hf_bgp_ls_sr_tlv_prefix_attr_flags = -1;                /* 1170 */
-static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags = -1;
-static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_unknown= -1;
-static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_ao = -1;
-static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_no = -1;
-static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_eo = -1;
-static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_xi = -1;
-static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_ri = -1;
-static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_ni = -1;
-static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_ei = -1;
-static int hf_bgp_ls_sr_tlv_source_router_id = -1;                 /* 1171 */
-static int hf_bgp_ls_sr_tlv_srv6_endpoint_behavior = -1;           /* 1250 */
-static int hf_bgp_ls_sr_tlv_srv6_endpoint_behavior_endpoint_behavior = -1;
-static int hf_bgp_ls_sr_tlv_srv6_endpoint_behavior_flags = -1;
-static int hf_bgp_ls_sr_tlv_srv6_endpoint_behavior_algo = -1;
-static int hf_bgp_ls_sr_tlv_srv6_sid_struct = -1;                  /* 1252 */
-static int hf_bgp_ls_sr_tlv_srv6_sid_struct_lb_len = -1;
-static int hf_bgp_ls_sr_tlv_srv6_sid_struct_ln_len = -1;
-static int hf_bgp_ls_sr_tlv_srv6_sid_struct_fun_len = -1;
-static int hf_bgp_ls_sr_tlv_srv6_sid_struct_arg_len = -1;
+static int hf_bgp_ls_sr_tlv_capabilities;
+static int hf_bgp_ls_sr_tlv_capabilities_range_size;
+static int hf_bgp_ls_sr_tlv_capabilities_flags;
+static int hf_bgp_ls_sr_tlv_capabilities_flags_i;
+static int hf_bgp_ls_sr_tlv_capabilities_flags_v;
+static int hf_bgp_ls_sr_tlv_capabilities_flags_h;
+static int hf_bgp_ls_sr_tlv_capabilities_flags_reserved;
+static int hf_bgp_ls_sr_tlv_capabilities_sid_label;
+static int hf_bgp_ls_sr_tlv_capabilities_sid_index;
+static int hf_bgp_ls_sr_tlv_algorithm;
+static int hf_bgp_ls_sr_tlv_algorithm_value;
+static int hf_bgp_ls_sr_tlv_local_block;                      /* 1036 */
+static int hf_bgp_ls_sr_tlv_local_block_flags;
+static int hf_bgp_ls_sr_tlv_local_block_range_size;
+static int hf_bgp_ls_sr_tlv_local_block_sid_label;
+static int hf_bgp_ls_sr_tlv_local_block_sid_index;
+static int hf_bgp_ls_sr_tlv_srv6_cap;                         /* 1037 */
+static int hf_bgp_ls_sr_tlv_srv6_cap_flags;
+static int hf_bgp_ls_sr_tlv_srv6_cap_flags_o;
+static int hf_bgp_ls_sr_tlv_srv6_cap_flags_reserved;
+static int hf_bgp_ls_sr_tlv_srv6_cap_reserved;
+static int hf_bgp_ls_sr_tlv_flex_algo_def;                    /* 1039 */
+static int hf_bgp_ls_sr_tlv_flex_algo_algorithm;
+static int hf_bgp_ls_sr_tlv_flex_algo_metric_type;
+static int hf_bgp_ls_sr_tlv_flex_algo_calc_type;
+static int hf_bgp_ls_sr_tlv_flex_algo_priority;
+static int hf_bgp_ls_sr_tlv_flex_algo_exc_any_affinity;       /* 1040 */
+static int hf_bgp_ls_sr_tlv_flex_algo_inc_any_affinity;       /* 1041 */
+static int hf_bgp_ls_sr_tlv_flex_algo_inc_all_affinity;       /* 1042 */
+static int hf_bgp_ls_sr_tlv_prefix_sid;
+static int hf_bgp_ls_sr_tlv_prefix_sid_flags;
+static int hf_bgp_ls_sr_tlv_prefix_sid_flags_r;
+static int hf_bgp_ls_sr_tlv_prefix_sid_flags_n;
+static int hf_bgp_ls_sr_tlv_prefix_sid_flags_np;
+static int hf_bgp_ls_sr_tlv_prefix_sid_flags_p;
+static int hf_bgp_ls_sr_tlv_prefix_sid_flags_m;
+static int hf_bgp_ls_sr_tlv_prefix_sid_flags_e;
+static int hf_bgp_ls_sr_tlv_prefix_sid_flags_v;
+static int hf_bgp_ls_sr_tlv_prefix_sid_flags_l;
+static int hf_bgp_ls_sr_tlv_prefix_sid_algo;
+static int hf_bgp_ls_sr_tlv_prefix_sid_label;
+static int hf_bgp_ls_sr_tlv_prefix_sid_index;
+static int hf_bgp_ls_sr_tlv_adjacency_sid;
+static int hf_bgp_ls_sr_tlv_adjacency_sid_flags;
+static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_fi;
+static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_bi;
+static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_bo;
+static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_vi;
+static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_vo;
+static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_li;
+static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_lo;
+static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_si;
+static int hf_bgp_ls_sr_tlv_adjacency_sid_flags_so;
+static int hf_bgp_ls_sr_tlv_adjacency_sid_weight;
+static int hf_bgp_ls_sr_tlv_adjacency_sid_label;
+static int hf_bgp_ls_sr_tlv_adjacency_sid_index;
+static int hf_bgp_ls_sr_tlv_peer_node_sid;                    /* 1101 */
+static int hf_bgp_ls_sr_tlv_peer_adj_sid;                     /* 1102 */
+static int hf_bgp_ls_sr_tlv_peer_set_sid;                     /* 1103 */
+static int hf_bgp_ls_sr_tlv_peer_sid_flags;
+static int hf_bgp_ls_sr_tlv_peer_sid_flags_v;
+static int hf_bgp_ls_sr_tlv_peer_sid_flags_l;
+static int hf_bgp_ls_sr_tlv_peer_sid_flags_b;
+static int hf_bgp_ls_sr_tlv_peer_sid_flags_p;
+static int hf_bgp_ls_sr_tlv_peer_sid_weight;
+static int hf_bgp_ls_sr_tlv_peer_sid_label;
+static int hf_bgp_ls_sr_tlv_peer_sid_index;
+static int hf_bgp_ls_sr_tlv_srv6_endx_sid;                   /* 1106 */
+static int hf_bgp_ls_sr_tlv_srv6_lan_endx_sid;               /* 1107 */
+static int hf_bgp_ls_sr_tlv_srv6_endx_sid_endpoint_behavior;
+static int hf_bgp_ls_sr_tlv_srv6_endx_sid_flags;
+static int hf_bgp_ls_sr_tlv_srv6_endx_sid_flags_b;
+static int hf_bgp_ls_sr_tlv_srv6_endx_sid_flags_s;
+static int hf_bgp_ls_sr_tlv_srv6_endx_sid_flags_p;
+static int hf_bgp_ls_sr_tlv_srv6_endx_sid_flags_reserved;
+static int hf_bgp_ls_sr_tlv_srv6_endx_sid_algo;
+static int hf_bgp_ls_sr_tlv_srv6_endx_sid_weight;
+static int hf_bgp_ls_sr_tlv_srv6_endx_sid_reserved;
+static int hf_bgp_ls_sr_tlv_srv6_endx_sid_neighbor_isis;
+static int hf_bgp_ls_sr_tlv_srv6_endx_sid_neighbor_ospf;
+static int hf_bgp_ls_sr_tlv_srv6_endx_sid_sid;
+static int hf_bgp_ls_sr_tlv_srv6_locator;                     /* 1162 */
+static int hf_bgp_ls_sr_tlv_srv6_locator_flags;
+static int hf_bgp_ls_sr_tlv_srv6_locator_flags_d;
+static int hf_bgp_ls_sr_tlv_srv6_locator_flags_reserved;
+static int hf_bgp_ls_sr_tlv_srv6_locator_algo;
+static int hf_bgp_ls_sr_tlv_srv6_locator_reserved;
+static int hf_bgp_ls_sr_tlv_srv6_locator_metric;
+static int hf_bgp_ls_sr_tlv_prefix_attr_flags;                /* 1170 */
+static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags;
+static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_unknown;
+static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_ao;
+static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_no;
+static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_eo;
+static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_xi;
+static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_ri;
+static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_ni;
+static int hf_bgp_ls_sr_tlv_prefix_attr_flags_flags_ei;
+static int hf_bgp_ls_sr_tlv_source_router_id;                 /* 1171 */
+static int hf_bgp_ls_sr_tlv_srv6_endpoint_behavior;           /* 1250 */
+static int hf_bgp_ls_sr_tlv_srv6_endpoint_behavior_endpoint_behavior;
+static int hf_bgp_ls_sr_tlv_srv6_endpoint_behavior_flags;
+static int hf_bgp_ls_sr_tlv_srv6_endpoint_behavior_algo;
+static int hf_bgp_ls_sr_tlv_srv6_sid_struct;                  /* 1252 */
+static int hf_bgp_ls_sr_tlv_srv6_sid_struct_lb_len;
+static int hf_bgp_ls_sr_tlv_srv6_sid_struct_ln_len;
+static int hf_bgp_ls_sr_tlv_srv6_sid_struct_fun_len;
+static int hf_bgp_ls_sr_tlv_srv6_sid_struct_arg_len;
 
 static int * const srv6_endx_sid_flags[] = {
     &hf_bgp_ls_sr_tlv_srv6_endx_sid_flags_b,
@@ -2592,424 +2592,424 @@ static int * const srv6_endx_sid_flags[] = {
 };
 
 /* RFC7752 TLVs */
-static int hf_bgp_ls_tlv_local_node_descriptors = -1;              /* 256 */
-static int hf_bgp_ls_tlv_remote_node_descriptors = -1;             /* 257 */
-static int hf_bgp_ls_tlv_link_local_remote_identifiers = -1;       /* 258 */
-static int hf_bgp_ls_tlv_ipv4_interface_address = -1;              /* 259 */
-static int hf_bgp_ls_tlv_ipv4_neighbor_address = -1;               /* 260 */
-static int hf_bgp_ls_tlv_ipv6_interface_address = -1;              /* 261 */
-static int hf_bgp_ls_tlv_ipv6_neighbor_address = -1;               /* 262 */
-static int hf_bgp_ls_tlv_multi_topology_id = -1;                   /* 263 */
-static int hf_bgp_ls_tlv_ospf_route_type = -1;                     /* 264 */
-static int hf_bgp_ls_tlv_ip_reachability_information = -1;         /* 265 */
-static int hf_bgp_ls_tlv_node_msd = -1;                            /* 266 */
-static int hf_bgp_ls_tlv_link_msd = -1;                            /* 267 */
-static int hf_bgp_ls_tlv_igp_msd_type = -1;
-static int hf_bgp_ls_tlv_igp_msd_value = -1;
-
-static int hf_bgp_ls_tlv_autonomous_system = -1;                   /* 512 */
-static int hf_bgp_ls_tlv_autonomous_system_id = -1;
-static int hf_bgp_ls_tlv_bgp_ls_identifier = -1;                   /* 513 */
-static int hf_bgp_ls_tlv_bgp_ls_identifier_id = -1;
-static int hf_bgp_ls_tlv_area_id = -1;                             /* 514 */
-static int hf_bgp_ls_tlv_area_id_id = -1;
-static int hf_bgp_ls_tlv_igp_router = -1;                          /* 515 */
-static int hf_bgp_ls_tlv_igp_router_id = -1;
-static int hf_bgp_ls_tlv_bgp_router_id = -1;                       /* 516 */
-static int hf_bgp_ls_tlv_bgp_router_id_id = -1;
-static int hf_bgp_ls_tlv_srv6_sid_info = -1;                       /* 518 */
-static int hf_bgp_ls_tlv_srv6_sid_info_sid = -1;
-
-static int hf_bgp_ls_tlv_node_flags_bits = -1;                     /* 1024 */
-static int hf_bgp_ls_tlv_opaque_node_properties = -1;              /* 1025 */
-static int hf_bgp_ls_tlv_opaque_node_properties_value = -1;
-static int hf_bgp_ls_tlv_node_name = -1;                           /* 1026 */
-static int hf_bgp_ls_tlv_node_name_value = -1;
-static int hf_bgp_ls_tlv_is_is_area_identifier = -1;               /* 1027 */
-static int hf_bgp_ls_tlv_is_is_area_identifier_value = -1;
-static int hf_bgp_ls_tlv_ipv4_router_id_of_local_node = -1;        /* 1028 */
-static int hf_bgp_ls_tlv_ipv4_router_id_value = -1;
-static int hf_bgp_ls_tlv_ipv6_router_id_value = -1;
-static int hf_bgp_ls_tlv_ipv6_router_id_of_local_node = -1;        /* 1029 */
-static int hf_bgp_ls_tlv_ipv4_router_id_of_remote_node = -1;       /* 1030 */
-static int hf_bgp_ls_tlv_ipv6_router_id_of_remote_node = -1;       /* 1031 */
-
-static int hf_bgp_ls_tlv_administrative_group_color = -1;          /* 1088 */
-static int hf_bgp_ls_tlv_administrative_group_color_value = -1;
-static int hf_bgp_ls_tlv_administrative_group = -1;
-static int hf_bgp_ls_tlv_max_link_bandwidth = -1;                  /* 1089 */
-static int hf_bgp_ls_tlv_max_reservable_link_bandwidth = -1;       /* 1090 */
-static int hf_bgp_ls_tlv_unreserved_bandwidth = -1;                /* 1091 */
-static int hf_bgp_ls_bandwidth_value = -1;
-static int hf_bgp_ls_tlv_te_default_metric = -1;                   /* 1092 */
-static int hf_bgp_ls_tlv_te_default_metric_value_old = -1;
-static int hf_bgp_ls_tlv_te_default_metric_value = -1;
-static int hf_bgp_ls_tlv_link_protection_type = -1;                /* 1093 */
-static int hf_bgp_ls_tlv_link_protection_type_value = -1;
-static int hf_bgp_ls_tlv_mpls_protocol_mask = -1;                  /* 1094 */
-static int hf_bgp_ls_tlv_metric = -1;                              /* 1095 */
-static int hf_bgp_ls_tlv_metric_value1 = -1;
-static int hf_bgp_ls_tlv_metric_value2 = -1;
-static int hf_bgp_ls_tlv_metric_value3 = -1;
-static int hf_bgp_ls_tlv_shared_risk_link_group = -1;              /* 1096 */
-static int hf_bgp_ls_tlv_shared_risk_link_group_value = -1;
-static int hf_bgp_ls_tlv_opaque_link_attribute = -1;               /* 1097 */
-static int hf_bgp_ls_tlv_opaque_link_attribute_value = -1;
-static int hf_bgp_ls_tlv_link_name_attribute = -1;                 /* 1098 */
-static int hf_bgp_ls_tlv_link_name_attribute_value = -1;
-static int hf_bgp_ls_tlv_app_spec_link_attrs = -1;                 /* 1122 */
-static int hf_bgp_ls_tlv_app_spec_link_attrs_sabm_len = -1;
-static int hf_bgp_ls_tlv_app_spec_link_attrs_udabm_len = -1;
-static int hf_bgp_ls_tlv_app_spec_link_attrs_reserved = -1;
-static int hf_bgp_ls_tlv_app_spec_link_attrs_sabm = -1;
-static int hf_bgp_ls_tlv_app_spec_link_attrs_sabm_r = -1;
-static int hf_bgp_ls_tlv_app_spec_link_attrs_sabm_s = -1;
-static int hf_bgp_ls_tlv_app_spec_link_attrs_sabm_f = -1;
-static int hf_bgp_ls_tlv_app_spec_link_attrs_sabm_x = -1;
-static int hf_bgp_ls_tlv_app_spec_link_attrs_udabm = -1;
-
-static int hf_bgp_ls_tlv_igp_flags = -1;                           /* 1152 */
-static int hf_bgp_ls_tlv_route_tag = -1;                           /* 1153 */
-static int hf_bgp_ls_tlv_route_tag_value = -1;
-static int hf_bgp_ls_tlv_route_extended_tag = -1;                  /* 1154 */
-static int hf_bgp_ls_tlv_route_extended_tag_value = -1;
-static int hf_bgp_ls_tlv_prefix_metric = -1;                       /* 1155 */
-static int hf_bgp_ls_tlv_prefix_metric_value = -1;
-static int hf_bgp_ls_ospf_forwarding_address = -1;                 /* 1156 */
-static int hf_bgp_ls_ospf_forwarding_address_ipv4_address = -1;
-static int hf_bgp_ls_ospf_forwarding_address_ipv6_address = -1;
-static int hf_bgp_ls_opaque_prefix_attribute = -1;                 /* 1157 */
-static int hf_bgp_ls_opaque_prefix_attribute_value = -1;
-static int hf_bgp_ls_extended_administrative_group = -1;           /* 1173 */
-static int hf_bgp_ls_extended_administrative_group_value = -1;
+static int hf_bgp_ls_tlv_local_node_descriptors;              /* 256 */
+static int hf_bgp_ls_tlv_remote_node_descriptors;             /* 257 */
+static int hf_bgp_ls_tlv_link_local_remote_identifiers;       /* 258 */
+static int hf_bgp_ls_tlv_ipv4_interface_address;              /* 259 */
+static int hf_bgp_ls_tlv_ipv4_neighbor_address;               /* 260 */
+static int hf_bgp_ls_tlv_ipv6_interface_address;              /* 261 */
+static int hf_bgp_ls_tlv_ipv6_neighbor_address;               /* 262 */
+static int hf_bgp_ls_tlv_multi_topology_id;                   /* 263 */
+static int hf_bgp_ls_tlv_ospf_route_type;                     /* 264 */
+static int hf_bgp_ls_tlv_ip_reachability_information;         /* 265 */
+static int hf_bgp_ls_tlv_node_msd;                            /* 266 */
+static int hf_bgp_ls_tlv_link_msd;                            /* 267 */
+static int hf_bgp_ls_tlv_igp_msd_type;
+static int hf_bgp_ls_tlv_igp_msd_value;
+
+static int hf_bgp_ls_tlv_autonomous_system;                   /* 512 */
+static int hf_bgp_ls_tlv_autonomous_system_id;
+static int hf_bgp_ls_tlv_bgp_ls_identifier;                   /* 513 */
+static int hf_bgp_ls_tlv_bgp_ls_identifier_id;
+static int hf_bgp_ls_tlv_area_id;                             /* 514 */
+static int hf_bgp_ls_tlv_area_id_id;
+static int hf_bgp_ls_tlv_igp_router;                          /* 515 */
+static int hf_bgp_ls_tlv_igp_router_id;
+static int hf_bgp_ls_tlv_bgp_router_id;                       /* 516 */
+static int hf_bgp_ls_tlv_bgp_router_id_id;
+static int hf_bgp_ls_tlv_srv6_sid_info;                       /* 518 */
+static int hf_bgp_ls_tlv_srv6_sid_info_sid;
+
+static int hf_bgp_ls_tlv_node_flags_bits;                     /* 1024 */
+static int hf_bgp_ls_tlv_opaque_node_properties;              /* 1025 */
+static int hf_bgp_ls_tlv_opaque_node_properties_value;
+static int hf_bgp_ls_tlv_node_name;                           /* 1026 */
+static int hf_bgp_ls_tlv_node_name_value;
+static int hf_bgp_ls_tlv_is_is_area_identifier;               /* 1027 */
+static int hf_bgp_ls_tlv_is_is_area_identifier_value;
+static int hf_bgp_ls_tlv_ipv4_router_id_of_local_node;        /* 1028 */
+static int hf_bgp_ls_tlv_ipv4_router_id_value;
+static int hf_bgp_ls_tlv_ipv6_router_id_value;
+static int hf_bgp_ls_tlv_ipv6_router_id_of_local_node;        /* 1029 */
+static int hf_bgp_ls_tlv_ipv4_router_id_of_remote_node;       /* 1030 */
+static int hf_bgp_ls_tlv_ipv6_router_id_of_remote_node;       /* 1031 */
+
+static int hf_bgp_ls_tlv_administrative_group_color;          /* 1088 */
+static int hf_bgp_ls_tlv_administrative_group_color_value;
+static int hf_bgp_ls_tlv_administrative_group;
+static int hf_bgp_ls_tlv_max_link_bandwidth;                  /* 1089 */
+static int hf_bgp_ls_tlv_max_reservable_link_bandwidth;       /* 1090 */
+static int hf_bgp_ls_tlv_unreserved_bandwidth;                /* 1091 */
+static int hf_bgp_ls_bandwidth_value;
+static int hf_bgp_ls_tlv_te_default_metric;                   /* 1092 */
+static int hf_bgp_ls_tlv_te_default_metric_value_old;
+static int hf_bgp_ls_tlv_te_default_metric_value;
+static int hf_bgp_ls_tlv_link_protection_type;                /* 1093 */
+static int hf_bgp_ls_tlv_link_protection_type_value;
+static int hf_bgp_ls_tlv_mpls_protocol_mask;                  /* 1094 */
+static int hf_bgp_ls_tlv_metric;                              /* 1095 */
+static int hf_bgp_ls_tlv_metric_value1;
+static int hf_bgp_ls_tlv_metric_value2;
+static int hf_bgp_ls_tlv_metric_value3;
+static int hf_bgp_ls_tlv_shared_risk_link_group;              /* 1096 */
+static int hf_bgp_ls_tlv_shared_risk_link_group_value;
+static int hf_bgp_ls_tlv_opaque_link_attribute;               /* 1097 */
+static int hf_bgp_ls_tlv_opaque_link_attribute_value;
+static int hf_bgp_ls_tlv_link_name_attribute;                 /* 1098 */
+static int hf_bgp_ls_tlv_link_name_attribute_value;
+static int hf_bgp_ls_tlv_app_spec_link_attrs;                 /* 1122 */
+static int hf_bgp_ls_tlv_app_spec_link_attrs_sabm_len;
+static int hf_bgp_ls_tlv_app_spec_link_attrs_udabm_len;
+static int hf_bgp_ls_tlv_app_spec_link_attrs_reserved;
+static int hf_bgp_ls_tlv_app_spec_link_attrs_sabm;
+static int hf_bgp_ls_tlv_app_spec_link_attrs_sabm_r;
+static int hf_bgp_ls_tlv_app_spec_link_attrs_sabm_s;
+static int hf_bgp_ls_tlv_app_spec_link_attrs_sabm_f;
+static int hf_bgp_ls_tlv_app_spec_link_attrs_sabm_x;
+static int hf_bgp_ls_tlv_app_spec_link_attrs_udabm;
+
+static int hf_bgp_ls_tlv_igp_flags;                           /* 1152 */
+static int hf_bgp_ls_tlv_route_tag;                           /* 1153 */
+static int hf_bgp_ls_tlv_route_tag_value;
+static int hf_bgp_ls_tlv_route_extended_tag;                  /* 1154 */
+static int hf_bgp_ls_tlv_route_extended_tag_value;
+static int hf_bgp_ls_tlv_prefix_metric;                       /* 1155 */
+static int hf_bgp_ls_tlv_prefix_metric_value;
+static int hf_bgp_ls_ospf_forwarding_address;                 /* 1156 */
+static int hf_bgp_ls_ospf_forwarding_address_ipv4_address;
+static int hf_bgp_ls_ospf_forwarding_address_ipv6_address;
+static int hf_bgp_ls_opaque_prefix_attribute;                 /* 1157 */
+static int hf_bgp_ls_opaque_prefix_attribute_value;
+static int hf_bgp_ls_extended_administrative_group;           /* 1173 */
+static int hf_bgp_ls_extended_administrative_group_value;
 
 
 /* Link Protection Types */
-static int hf_bgp_ls_link_protection_type_extra_traffic = -1;
-static int hf_bgp_ls_link_protection_type_unprotected = -1;
-static int hf_bgp_ls_link_protection_type_shared = -1;
-static int hf_bgp_ls_link_protection_type_dedicated_1to1 = -1;
-static int hf_bgp_ls_link_protection_type_dedicated_1plus1 = -1;
-static int hf_bgp_ls_link_protection_type_enhanced = -1;
+static int hf_bgp_ls_link_protection_type_extra_traffic;
+static int hf_bgp_ls_link_protection_type_unprotected;
+static int hf_bgp_ls_link_protection_type_shared;
+static int hf_bgp_ls_link_protection_type_dedicated_1to1;
+static int hf_bgp_ls_link_protection_type_dedicated_1plus1;
+static int hf_bgp_ls_link_protection_type_enhanced;
 /* MPLS Protocol Mask flags */
-static int hf_bgp_ls_mpls_protocol_mask_flag_l = -1;
-static int hf_bgp_ls_mpls_protocol_mask_flag_r = -1;
+static int hf_bgp_ls_mpls_protocol_mask_flag_l;
+static int hf_bgp_ls_mpls_protocol_mask_flag_r;
 /* BGP-LS IGP Flags */
-static int hf_bgp_ls_igp_flags_flag_d = -1;
+static int hf_bgp_ls_igp_flags_flag_d;
 /* Node Flag Bits TLV's flags */
-static int hf_bgp_ls_node_flag_bits_overload = -1;
-static int hf_bgp_ls_node_flag_bits_attached = -1;
-static int hf_bgp_ls_node_flag_bits_external = -1;
-static int hf_bgp_ls_node_flag_bits_abr = -1;
+static int hf_bgp_ls_node_flag_bits_overload;
+static int hf_bgp_ls_node_flag_bits_attached;
+static int hf_bgp_ls_node_flag_bits_external;
+static int hf_bgp_ls_node_flag_bits_abr;
 
 /* RFC8669 BGP Prefix-SID header field */
-static int hf_bgp_prefix_sid_unknown = -1;
-static int hf_bgp_prefix_sid_label_index = -1;
-static int hf_bgp_prefix_sid_label_index_value = -1;
-static int hf_bgp_prefix_sid_label_index_flags = -1;
-static int hf_bgp_prefix_sid_originator_srgb = -1;
-static int hf_bgp_prefix_sid_originator_srgb_blocks = -1;
-static int hf_bgp_prefix_sid_originator_srgb_block = -1;
-static int hf_bgp_prefix_sid_originator_srgb_flags = -1;
-static int hf_bgp_prefix_sid_originator_srgb_base = -1;
-static int hf_bgp_prefix_sid_originator_srgb_range = -1;
-static int hf_bgp_prefix_sid_type = -1;
-static int hf_bgp_prefix_sid_length = -1;
-static int hf_bgp_prefix_sid_value = -1;
-static int hf_bgp_prefix_sid_reserved = -1;
+static int hf_bgp_prefix_sid_unknown;
+static int hf_bgp_prefix_sid_label_index;
+static int hf_bgp_prefix_sid_label_index_value;
+static int hf_bgp_prefix_sid_label_index_flags;
+static int hf_bgp_prefix_sid_originator_srgb;
+static int hf_bgp_prefix_sid_originator_srgb_blocks;
+static int hf_bgp_prefix_sid_originator_srgb_block;
+static int hf_bgp_prefix_sid_originator_srgb_flags;
+static int hf_bgp_prefix_sid_originator_srgb_base;
+static int hf_bgp_prefix_sid_originator_srgb_range;
+static int hf_bgp_prefix_sid_type;
+static int hf_bgp_prefix_sid_length;
+static int hf_bgp_prefix_sid_value;
+static int hf_bgp_prefix_sid_reserved;
 
 /* draft-ietf-bess-srv6-services-05 header field */
-static int hf_bgp_prefix_sid_srv6_l3vpn = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sub_tlvs = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sub_tlv = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sub_tlv_type = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sub_tlv_length = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sub_tlv_value = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sub_tlv_reserved = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sid_value = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sid_flags = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_srv6_endpoint_behavior = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_reserved = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sub_sub_tlvs = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sub_sub_tlv = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sub_sub_tlv_type = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sub_sub_tlv_length = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sub_sub_tlv_value = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sid_locator_block_len = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sid_locator_node_len = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sid_func_len = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sid_arg_len = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sid_trans_len = -1;
-static int hf_bgp_prefix_sid_srv6_l3vpn_sid_trans_offset = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sub_tlvs = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sub_tlv = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sub_tlv_type = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sub_tlv_length = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sub_tlv_value = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sub_tlv_reserved = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sid_value = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sid_flags = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_srv6_endpoint_behavior = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_reserved = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sub_sub_tlvs = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sub_sub_tlv = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sub_sub_tlv_type = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sub_sub_tlv_length = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sub_sub_tlv_value = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sid_locator_block_len = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sid_locator_node_len = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sid_func_len = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sid_arg_len = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sid_trans_len = -1;
-static int hf_bgp_prefix_sid_srv6_l2vpn_sid_trans_offset = -1;
+static int hf_bgp_prefix_sid_srv6_l3vpn;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sub_tlvs;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sub_tlv;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sub_tlv_type;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sub_tlv_length;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sub_tlv_value;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sub_tlv_reserved;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sid_value;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sid_flags;
+static int hf_bgp_prefix_sid_srv6_l3vpn_srv6_endpoint_behavior;
+static int hf_bgp_prefix_sid_srv6_l3vpn_reserved;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sub_sub_tlvs;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sub_sub_tlv;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sub_sub_tlv_type;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sub_sub_tlv_length;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sub_sub_tlv_value;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sid_locator_block_len;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sid_locator_node_len;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sid_func_len;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sid_arg_len;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sid_trans_len;
+static int hf_bgp_prefix_sid_srv6_l3vpn_sid_trans_offset;
+static int hf_bgp_prefix_sid_srv6_l2vpn;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sub_tlvs;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sub_tlv;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sub_tlv_type;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sub_tlv_length;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sub_tlv_value;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sub_tlv_reserved;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sid_value;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sid_flags;
+static int hf_bgp_prefix_sid_srv6_l2vpn_srv6_endpoint_behavior;
+static int hf_bgp_prefix_sid_srv6_l2vpn_reserved;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sub_sub_tlvs;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sub_sub_tlv;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sub_sub_tlv_type;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sub_sub_tlv_length;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sub_sub_tlv_value;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sid_locator_block_len;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sid_locator_node_len;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sid_func_len;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sid_arg_len;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sid_trans_len;
+static int hf_bgp_prefix_sid_srv6_l2vpn_sid_trans_offset;
 
 /* BGP flow spec nlri header field */
 
-static int hf_bgp_flowspec_nlri_t = -1;
-static int hf_bgp_flowspec_nlri_route_distinguisher = -1;
-static int hf_bgp_flowspec_nlri_route_distinguisher_type = -1;
-static int hf_bgp_flowspec_nlri_route_dist_admin_asnum_2 = -1;
-static int hf_bgp_flowspec_nlri_route_dist_admin_ipv4 = -1;
-static int hf_bgp_flowspec_nlri_route_dist_admin_asnum_4 = -1;
-static int hf_bgp_flowspec_nlri_route_dist_asnum_2 = -1;
-static int hf_bgp_flowspec_nlri_route_dist_asnum_4 = -1;
-static int hf_bgp_flowspec_nlri_filter = -1;
-static int hf_bgp_flowspec_nlri_filter_type = -1;
-static int hf_bgp_flowspec_nlri_length = -1;
-static int hf_bgp_flowspec_nlri_dst_pref_ipv4 = -1;
-static int hf_bgp_flowspec_nlri_src_pref_ipv4 = -1;
-static int hf_bgp_flowspec_nlri_op_flags = -1;
-static int hf_bgp_flowspec_nlri_op_eol = -1;
-static int hf_bgp_flowspec_nlri_op_and = -1;
-static int hf_bgp_flowspec_nlri_op_val_len = -1;
-static int hf_bgp_flowspec_nlri_op_un_bit4 = -1;
-static int hf_bgp_flowspec_nlri_op_un_bit5 = -1;
-static int hf_bgp_flowspec_nlri_op_lt = -1;
-static int hf_bgp_flowspec_nlri_op_gt = -1;
-static int hf_bgp_flowspec_nlri_op_eq = -1;
-static int hf_bgp_flowspec_nlri_dec_val_8 = -1;
-static int hf_bgp_flowspec_nlri_dec_val_16 = -1;
-static int hf_bgp_flowspec_nlri_dec_val_32 = -1;
-static int hf_bgp_flowspec_nlri_dec_val_64 = -1;
-static int hf_bgp_flowspec_nlri_op_flg_not = -1;
-static int hf_bgp_flowspec_nlri_op_flg_match = -1;
-static int hf_bgp_flowspec_nlri_tcp_flags = -1;
-static int hf_bgp_flowspec_nlri_tcp_flags_cwr = -1;
-static int hf_bgp_flowspec_nlri_tcp_flags_ecn = -1;
-static int hf_bgp_flowspec_nlri_tcp_flags_urg = -1;
-static int hf_bgp_flowspec_nlri_tcp_flags_ack = -1;
-static int hf_bgp_flowspec_nlri_tcp_flags_push = -1;
-static int hf_bgp_flowspec_nlri_tcp_flags_reset = -1;
-static int hf_bgp_flowspec_nlri_tcp_flags_syn = -1;
-static int hf_bgp_flowspec_nlri_tcp_flags_fin = -1;
-static int hf_bgp_flowspec_nlri_fflag = -1;
-static int hf_bgp_flowspec_nlri_fflag_lf = -1;
-static int hf_bgp_flowspec_nlri_fflag_ff = -1;
-static int hf_bgp_flowspec_nlri_fflag_isf = -1;
-static int hf_bgp_flowspec_nlri_fflag_df = -1;
-static int hf_bgp_flowspec_nlri_dscp = -1;
-static int hf_bgp_flowspec_nlri_src_ipv6_pref = -1;
-static int hf_bgp_flowspec_nlri_dst_ipv6_pref = -1;
-static int hf_bgp_flowspec_nlri_ipv6_pref_len = -1;
-static int hf_bgp_flowspec_nlri_ipv6_pref_offset = -1;
+static int hf_bgp_flowspec_nlri_t;
+static int hf_bgp_flowspec_nlri_route_distinguisher;
+static int hf_bgp_flowspec_nlri_route_distinguisher_type;
+static int hf_bgp_flowspec_nlri_route_dist_admin_asnum_2;
+static int hf_bgp_flowspec_nlri_route_dist_admin_ipv4;
+static int hf_bgp_flowspec_nlri_route_dist_admin_asnum_4;
+static int hf_bgp_flowspec_nlri_route_dist_asnum_2;
+static int hf_bgp_flowspec_nlri_route_dist_asnum_4;
+static int hf_bgp_flowspec_nlri_filter;
+static int hf_bgp_flowspec_nlri_filter_type;
+static int hf_bgp_flowspec_nlri_length;
+static int hf_bgp_flowspec_nlri_dst_pref_ipv4;
+static int hf_bgp_flowspec_nlri_src_pref_ipv4;
+static int hf_bgp_flowspec_nlri_op_flags;
+static int hf_bgp_flowspec_nlri_op_eol;
+static int hf_bgp_flowspec_nlri_op_and;
+static int hf_bgp_flowspec_nlri_op_val_len;
+static int hf_bgp_flowspec_nlri_op_un_bit4;
+static int hf_bgp_flowspec_nlri_op_un_bit5;
+static int hf_bgp_flowspec_nlri_op_lt;
+static int hf_bgp_flowspec_nlri_op_gt;
+static int hf_bgp_flowspec_nlri_op_eq;
+static int hf_bgp_flowspec_nlri_dec_val_8;
+static int hf_bgp_flowspec_nlri_dec_val_16;
+static int hf_bgp_flowspec_nlri_dec_val_32;
+static int hf_bgp_flowspec_nlri_dec_val_64;
+static int hf_bgp_flowspec_nlri_op_flg_not;
+static int hf_bgp_flowspec_nlri_op_flg_match;
+static int hf_bgp_flowspec_nlri_tcp_flags;
+static int hf_bgp_flowspec_nlri_tcp_flags_cwr;
+static int hf_bgp_flowspec_nlri_tcp_flags_ecn;
+static int hf_bgp_flowspec_nlri_tcp_flags_urg;
+static int hf_bgp_flowspec_nlri_tcp_flags_ack;
+static int hf_bgp_flowspec_nlri_tcp_flags_push;
+static int hf_bgp_flowspec_nlri_tcp_flags_reset;
+static int hf_bgp_flowspec_nlri_tcp_flags_syn;
+static int hf_bgp_flowspec_nlri_tcp_flags_fin;
+static int hf_bgp_flowspec_nlri_fflag;
+static int hf_bgp_flowspec_nlri_fflag_lf;
+static int hf_bgp_flowspec_nlri_fflag_ff;
+static int hf_bgp_flowspec_nlri_fflag_isf;
+static int hf_bgp_flowspec_nlri_fflag_df;
+static int hf_bgp_flowspec_nlri_dscp;
+static int hf_bgp_flowspec_nlri_src_ipv6_pref;
+static int hf_bgp_flowspec_nlri_dst_ipv6_pref;
+static int hf_bgp_flowspec_nlri_ipv6_pref_len;
+static int hf_bgp_flowspec_nlri_ipv6_pref_offset;
 
 /* BGP update safi ndt nlri  draft-nalawade-idr-mdt-safi-03 */
 
-static int hf_bgp_mdt_nlri_safi_rd = -1;
-static int hf_bgp_mdt_nlri_safi_ipv4_addr = -1;
-static int hf_bgp_mdt_nlri_safi_group_addr = -1;
+static int hf_bgp_mdt_nlri_safi_rd;
+static int hf_bgp_mdt_nlri_safi_ipv4_addr;
+static int hf_bgp_mdt_nlri_safi_group_addr;
 
 /* BGP update extended community header field */
 
-static int hf_bgp_ext_communities = -1;
-static int hf_bgp_ext_community = -1;
-static int hf_bgp_ext_com_type_auth = -1;
-static int hf_bgp_ext_com_type_tran = -1;
-
-static int hf_bgp_ext_com_type_high = -1;
-static int hf_bgp_ext_com_stype_low_unknown = -1;
-static int hf_bgp_ext_com_stype_tr_evpn = -1;
-static int hf_bgp_ext_com_stype_tr_as2 = -1;
-static int hf_bgp_ext_com_stype_ntr_as2 = -1;
-static int hf_bgp_ext_com_stype_tr_as4 = -1;
-static int hf_bgp_ext_com_stype_ntr_as4 = -1;
-static int hf_bgp_ext_com_stype_tr_IP4 = -1;
-static int hf_bgp_ext_com_stype_ntr_IP4 = -1;
-static int hf_bgp_ext_com_stype_tr_opaque = -1;
-static int hf_bgp_ext_com_stype_ntr_opaque = -1;
-static int hf_bgp_ext_com_tunnel_type = -1;
-static int hf_bgp_ext_com_stype_tr_mup = -1;
-static int hf_bgp_ext_com_stype_tr_exp = -1;
-static int hf_bgp_ext_com_stype_tr_exp_2 = -1;
-static int hf_bgp_ext_com_stype_tr_exp_3 = -1;
-
-static int hf_bgp_ext_com_value_as2 = -1;
-static int hf_bgp_ext_com_value_as4 = -1;
-static int hf_bgp_ext_com_value_IP4 = -1;
-static int hf_bgp_ext_com_value_an2 = -1;
-static int hf_bgp_ext_com_value_an4 = -1;
-static int hf_bgp_ext_com_value_raw = -1;
-static int hf_bgp_ext_com_value_link_bw = -1;
-static int hf_bgp_ext_com_value_ospf_rt_area = -1;
-static int hf_bgp_ext_com_value_ospf_rt_type = -1;
-static int hf_bgp_ext_com_value_ospf_rt_options = -1;
-static int hf_bgp_ext_com_value_ospf_rt_options_mt = -1;
-static int hf_bgp_ext_com_value_ospf_rid = -1;
-static int hf_bgp_ext_com_value_fs_remark = -1;
-static int hf_bgp_ext_com_local_admin_flags = -1;
-static int hf_bgp_ext_com_local_admin_auto_derived_flag = -1;
-static int hf_bgp_ext_com_local_admin_type = -1;
-static int hf_bgp_ext_com_local_admin_domain_id = -1;
-static int hf_bgp_ext_com_local_admin_service_id = -1;
+static int hf_bgp_ext_communities;
+static int hf_bgp_ext_community;
+static int hf_bgp_ext_com_type_auth;
+static int hf_bgp_ext_com_type_tran;
+
+static int hf_bgp_ext_com_type_high;
+static int hf_bgp_ext_com_stype_low_unknown;
+static int hf_bgp_ext_com_stype_tr_evpn;
+static int hf_bgp_ext_com_stype_tr_as2;
+static int hf_bgp_ext_com_stype_ntr_as2;
+static int hf_bgp_ext_com_stype_tr_as4;
+static int hf_bgp_ext_com_stype_ntr_as4;
+static int hf_bgp_ext_com_stype_tr_IP4;
+static int hf_bgp_ext_com_stype_ntr_IP4;
+static int hf_bgp_ext_com_stype_tr_opaque;
+static int hf_bgp_ext_com_stype_ntr_opaque;
+static int hf_bgp_ext_com_tunnel_type;
+static int hf_bgp_ext_com_stype_tr_mup;
+static int hf_bgp_ext_com_stype_tr_exp;
+static int hf_bgp_ext_com_stype_tr_exp_2;
+static int hf_bgp_ext_com_stype_tr_exp_3;
+
+static int hf_bgp_ext_com_value_as2;
+static int hf_bgp_ext_com_value_as4;
+static int hf_bgp_ext_com_value_IP4;
+static int hf_bgp_ext_com_value_an2;
+static int hf_bgp_ext_com_value_an4;
+static int hf_bgp_ext_com_value_raw;
+static int hf_bgp_ext_com_value_link_bw;
+static int hf_bgp_ext_com_value_ospf_rt_area;
+static int hf_bgp_ext_com_value_ospf_rt_type;
+static int hf_bgp_ext_com_value_ospf_rt_options;
+static int hf_bgp_ext_com_value_ospf_rt_options_mt;
+static int hf_bgp_ext_com_value_ospf_rid;
+static int hf_bgp_ext_com_value_fs_remark;
+static int hf_bgp_ext_com_local_admin_flags;
+static int hf_bgp_ext_com_local_admin_auto_derived_flag;
+static int hf_bgp_ext_com_local_admin_type;
+static int hf_bgp_ext_com_local_admin_domain_id;
+static int hf_bgp_ext_com_local_admin_service_id;
 
 /* BGP QoS propagation draft-knoll-idr-qos-attribute */
 
-static int hf_bgp_ext_com_qos_flags = -1;
-static int hf_bgp_ext_com_qos_flags_remarking = -1;
-static int hf_bgp_ext_com_qos_flags_ignore_remarking = -1;
-static int hf_bgp_ext_com_qos_flags_agg_marking = -1;
-static int hf_bgp_ext_com_cos_flags = -1;
-static int hf_bgp_ext_com_cos_flags_be = -1;
-static int hf_bgp_ext_com_cos_flags_ef = -1;
-static int hf_bgp_ext_com_cos_flags_af = -1;
-static int hf_bgp_ext_com_cos_flags_le = -1;
-static int hf_bgp_ext_com_qos_set_number = -1;
-static int hf_bgp_ext_com_qos_tech_type = -1;
-static int hf_bgp_ext_com_qos_marking_o = -1;
-static int hf_bgp_ext_com_qos_marking_a = -1;
-static int hf_bgp_ext_com_qos_default_to_zero = -1;
+static int hf_bgp_ext_com_qos_flags;
+static int hf_bgp_ext_com_qos_flags_remarking;
+static int hf_bgp_ext_com_qos_flags_ignore_remarking;
+static int hf_bgp_ext_com_qos_flags_agg_marking;
+static int hf_bgp_ext_com_cos_flags;
+static int hf_bgp_ext_com_cos_flags_be;
+static int hf_bgp_ext_com_cos_flags_ef;
+static int hf_bgp_ext_com_cos_flags_af;
+static int hf_bgp_ext_com_cos_flags_le;
+static int hf_bgp_ext_com_qos_set_number;
+static int hf_bgp_ext_com_qos_tech_type;
+static int hf_bgp_ext_com_qos_marking_o;
+static int hf_bgp_ext_com_qos_marking_a;
+static int hf_bgp_ext_com_qos_default_to_zero;
 
 /* BGP Flow spec extended community RFC 5575 */
 
-static int hf_bgp_ext_com_flow_rate_float = -1;
-static int hf_bgp_ext_com_flow_act_allset = -1;
-static int hf_bgp_ext_com_flow_act_term_act = -1;
-static int hf_bgp_ext_com_flow_act_samp_act = -1;
+static int hf_bgp_ext_com_flow_rate_float;
+static int hf_bgp_ext_com_flow_act_allset;
+static int hf_bgp_ext_com_flow_act_term_act;
+static int hf_bgp_ext_com_flow_act_samp_act;
 
 /* BGP L2 extended community RFC 4761, RFC 6624 */
 /* draft-ietf-l2vpn-vpls-multihoming */
 
-static int hf_bgp_ext_com_l2_encaps = -1;
-static int hf_bgp_ext_com_l2_c_flags = -1;
-static int hf_bgp_ext_com_l2_mtu = -1;
-static int hf_bgp_ext_com_l2_flag_d = -1;
-static int hf_bgp_ext_com_l2_flag_z1 = -1;
-static int hf_bgp_ext_com_l2_flag_f = -1;
-static int hf_bgp_ext_com_l2_flag_z345 = -1;
-static int hf_bgp_ext_com_l2_flag_c = -1;
-static int hf_bgp_ext_com_l2_flag_s = -1;
-static int hf_bgp_ext_com_l2_esi_label_flag = -1;
-static int hf_bgp_ext_com_evpn_mmac_flag = -1;
-static int hf_bgp_ext_com_evpn_mmac_seq = -1;
-static int hf_bgp_ext_com_evpn_esirt = -1;
-static int hf_bgp_ext_com_evpn_routermac = -1;
-static int hf_bgp_ext_com_evpn_mmac_flag_sticky = -1;
+static int hf_bgp_ext_com_l2_encaps;
+static int hf_bgp_ext_com_l2_c_flags;
+static int hf_bgp_ext_com_l2_mtu;
+static int hf_bgp_ext_com_l2_flag_d;
+static int hf_bgp_ext_com_l2_flag_z1;
+static int hf_bgp_ext_com_l2_flag_f;
+static int hf_bgp_ext_com_l2_flag_z345;
+static int hf_bgp_ext_com_l2_flag_c;
+static int hf_bgp_ext_com_l2_flag_s;
+static int hf_bgp_ext_com_l2_esi_label_flag;
+static int hf_bgp_ext_com_evpn_mmac_flag;
+static int hf_bgp_ext_com_evpn_mmac_seq;
+static int hf_bgp_ext_com_evpn_esirt;
+static int hf_bgp_ext_com_evpn_routermac;
+static int hf_bgp_ext_com_evpn_mmac_flag_sticky;
 
 /* BGP E-Tree Info extended community RFC 7796 */
 
-static int hf_bgp_ext_com_etree_flags = -1;
-static int hf_bgp_ext_com_etree_root_vlan = -1;
-static int hf_bgp_ext_com_etree_leaf_vlan = -1;
-static int hf_bgp_ext_com_etree_flag_reserved = -1;
-static int hf_bgp_ext_com_etree_flag_p = -1;
-static int hf_bgp_ext_com_etree_flag_v = -1;
+static int hf_bgp_ext_com_etree_flags;
+static int hf_bgp_ext_com_etree_root_vlan;
+static int hf_bgp_ext_com_etree_leaf_vlan;
+static int hf_bgp_ext_com_etree_flag_reserved;
+static int hf_bgp_ext_com_etree_flag_p;
+static int hf_bgp_ext_com_etree_flag_v;
 
 /* VPWS Support in EVPN  RFC 8214 */
 /* draft-yu-bess-evpn-l2-attributes-04 */
 
-static int hf_bgp_ext_com_evpn_l2attr_flags = -1;
-static int hf_bgp_ext_com_evpn_l2attr_flag_reserved = -1;
-static int hf_bgp_ext_com_evpn_l2attr_flag_ci = -1;
-static int hf_bgp_ext_com_evpn_l2attr_flag_f = -1;
-static int hf_bgp_ext_com_evpn_l2attr_flag_c = -1;
-static int hf_bgp_ext_com_evpn_l2attr_flag_p = -1;
-static int hf_bgp_ext_com_evpn_l2attr_flag_b = -1;
-static int hf_bgp_ext_com_evpn_l2attr_l2_mtu = -1;
-static int hf_bgp_ext_com_evpn_l2attr_reserved = -1;
+static int hf_bgp_ext_com_evpn_l2attr_flags;
+static int hf_bgp_ext_com_evpn_l2attr_flag_reserved;
+static int hf_bgp_ext_com_evpn_l2attr_flag_ci;
+static int hf_bgp_ext_com_evpn_l2attr_flag_f;
+static int hf_bgp_ext_com_evpn_l2attr_flag_c;
+static int hf_bgp_ext_com_evpn_l2attr_flag_p;
+static int hf_bgp_ext_com_evpn_l2attr_flag_b;
+static int hf_bgp_ext_com_evpn_l2attr_l2_mtu;
+static int hf_bgp_ext_com_evpn_l2attr_reserved;
 
 /* E-Tree RFC8317 */
 
-static int hf_bgp_ext_com_evpn_etree_flags = -1;
-static int hf_bgp_ext_com_evpn_etree_flag_reserved = -1;
-static int hf_bgp_ext_com_evpn_etree_flag_l = -1;
-static int hf_bgp_ext_com_evpn_etree_reserved = -1;
+static int hf_bgp_ext_com_evpn_etree_flags;
+static int hf_bgp_ext_com_evpn_etree_flag_reserved;
+static int hf_bgp_ext_com_evpn_etree_flag_l;
+static int hf_bgp_ext_com_evpn_etree_reserved;
 
 /* BGP Cost Community */
 
-static int hf_bgp_ext_com_cost_poi = -1;
-static int hf_bgp_ext_com_cost_cid = -1;
-static int hf_bgp_ext_com_cost_cost = -1;
-static int hf_bgp_ext_com_cost_cid_rep = -1;
+static int hf_bgp_ext_com_cost_poi;
+static int hf_bgp_ext_com_cost_cid;
+static int hf_bgp_ext_com_cost_cost;
+static int hf_bgp_ext_com_cost_cid_rep;
 
 /* EIGRP route attributes extended communities */
 
-static int hf_bgp_ext_com_stype_tr_exp_eigrp = -1;
-static int hf_bgp_ext_com_eigrp_flags = -1;
-static int hf_bgp_ext_com_eigrp_flags_rt = -1;
-static int hf_bgp_ext_com_eigrp_rtag = -1;
-static int hf_bgp_ext_com_eigrp_asn = -1;
-static int hf_bgp_ext_com_eigrp_delay = -1;
-static int hf_bgp_ext_com_eigrp_rly = -1;
-static int hf_bgp_ext_com_eigrp_hops = -1;
-static int hf_bgp_ext_com_eigrp_bw = -1;
-static int hf_bgp_ext_com_eigrp_load = -1;
-static int hf_bgp_ext_com_eigrp_mtu = -1;
-static int hf_bgp_ext_com_eigrp_rid = -1;
-static int hf_bgp_ext_com_eigrp_e_asn = -1;
-static int hf_bgp_ext_com_eigrp_e_rid = -1;
-static int hf_bgp_ext_com_eigrp_e_pid = -1;
-static int hf_bgp_ext_com_eigrp_e_m = -1;
+static int hf_bgp_ext_com_stype_tr_exp_eigrp;
+static int hf_bgp_ext_com_eigrp_flags;
+static int hf_bgp_ext_com_eigrp_flags_rt;
+static int hf_bgp_ext_com_eigrp_rtag;
+static int hf_bgp_ext_com_eigrp_asn;
+static int hf_bgp_ext_com_eigrp_delay;
+static int hf_bgp_ext_com_eigrp_rly;
+static int hf_bgp_ext_com_eigrp_hops;
+static int hf_bgp_ext_com_eigrp_bw;
+static int hf_bgp_ext_com_eigrp_load;
+static int hf_bgp_ext_com_eigrp_mtu;
+static int hf_bgp_ext_com_eigrp_rid;
+static int hf_bgp_ext_com_eigrp_e_asn;
+static int hf_bgp_ext_com_eigrp_e_rid;
+static int hf_bgp_ext_com_eigrp_e_pid;
+static int hf_bgp_ext_com_eigrp_e_m;
 
 /* MUP extended community */
 
-static int hf_bgp_ext_com_mup_segment_id2 = -1;
-static int hf_bgp_ext_com_mup_segment_id4 = -1;
+static int hf_bgp_ext_com_mup_segment_id2;
+static int hf_bgp_ext_com_mup_segment_id4;
 
 /* RFC8571 BGP-LS Advertisement of IGP TE Metric Extensions */
-static int hf_bgp_ls_igp_te_metric_flags = -1;
-static int hf_bgp_ls_igp_te_metric_flags_a = -1;
-static int hf_bgp_ls_igp_te_metric_flags_reserved = -1;
-static int hf_bgp_ls_igp_te_metric_delay = -1;
-static int hf_bgp_ls_igp_te_metric_delay_value = -1;
-static int hf_bgp_ls_igp_te_metric_delay_min_max = -1;
-static int hf_bgp_ls_igp_te_metric_delay_min = -1;
-static int hf_bgp_ls_igp_te_metric_delay_max = -1;
-static int hf_bgp_ls_igp_te_metric_delay_variation = -1;
-static int hf_bgp_ls_igp_te_metric_delay_variation_value = -1;
-static int hf_bgp_ls_igp_te_metric_link_loss = -1;
-static int hf_bgp_ls_igp_te_metric_link_loss_value = -1;
-static int hf_bgp_ls_igp_te_metric_bandwidth_residual = -1;
-static int hf_bgp_ls_igp_te_metric_bandwidth_residual_value = -1;
-static int hf_bgp_ls_igp_te_metric_bandwidth_available = -1;
-static int hf_bgp_ls_igp_te_metric_bandwidth_available_value = -1;
-static int hf_bgp_ls_igp_te_metric_bandwidth_utilized = -1;
-static int hf_bgp_ls_igp_te_metric_bandwidth_utilized_value = -1;
-static int hf_bgp_ls_igp_te_metric_reserved = -1;
+static int hf_bgp_ls_igp_te_metric_flags;
+static int hf_bgp_ls_igp_te_metric_flags_a;
+static int hf_bgp_ls_igp_te_metric_flags_reserved;
+static int hf_bgp_ls_igp_te_metric_delay;
+static int hf_bgp_ls_igp_te_metric_delay_value;
+static int hf_bgp_ls_igp_te_metric_delay_min_max;
+static int hf_bgp_ls_igp_te_metric_delay_min;
+static int hf_bgp_ls_igp_te_metric_delay_max;
+static int hf_bgp_ls_igp_te_metric_delay_variation;
+static int hf_bgp_ls_igp_te_metric_delay_variation_value;
+static int hf_bgp_ls_igp_te_metric_link_loss;
+static int hf_bgp_ls_igp_te_metric_link_loss_value;
+static int hf_bgp_ls_igp_te_metric_bandwidth_residual;
+static int hf_bgp_ls_igp_te_metric_bandwidth_residual_value;
+static int hf_bgp_ls_igp_te_metric_bandwidth_available;
+static int hf_bgp_ls_igp_te_metric_bandwidth_available_value;
+static int hf_bgp_ls_igp_te_metric_bandwidth_utilized;
+static int hf_bgp_ls_igp_te_metric_bandwidth_utilized_value;
+static int hf_bgp_ls_igp_te_metric_reserved;
 
 /* draft-mpmz-bess-mup-safi-00 */
-static int hf_bgp_mup_nlri = -1;
-static int hf_bgp_mup_nlri_at = -1;
-static int hf_bgp_mup_nlri_rt = -1;
-static int hf_bgp_mup_nlri_len = -1;
-static int hf_bgp_mup_nlri_rd = -1;
-static int hf_bgp_mup_nlri_prefixlen = -1;
-static int hf_bgp_mup_nlri_ip_prefix = -1;
-static int hf_bgp_mup_nlri_ipv6_prefix = -1;
-static int hf_bgp_mup_nlri_ip_addr = -1;
-static int hf_bgp_mup_nlri_ipv6_addr = -1;
-static int hf_bgp_mup_nlri_3gpp_5g_type1_st_route = -1;
-static int hf_bgp_mup_nlri_3gpp_5g_teid = -1;
-static int hf_bgp_mup_nlri_3gpp_5g_qfi = -1;
-static int hf_bgp_mup_nlri_3gpp_5g_ep_addr_len = -1;
-static int hf_bgp_mup_nlri_3gpp_5g_ep_ip_addr = -1;
-static int hf_bgp_mup_nlri_3gpp_5g_ep_ipv6_addr = -1;
-static int hf_bgp_mup_nlri_3gpp_5g_type2_st_route = -1;
-static int hf_bgp_mup_nlri_ep_len = -1;
-static int hf_bgp_mup_nlri_ep_ip_addr = -1;
-static int hf_bgp_mup_nlri_ep_ipv6_addr = -1;
-static int hf_bgp_mup_nlri_3gpp_5g_ep_teid = -1;
-static int hf_bgp_mup_nlri_unknown_data = -1;
+static int hf_bgp_mup_nlri;
+static int hf_bgp_mup_nlri_at;
+static int hf_bgp_mup_nlri_rt;
+static int hf_bgp_mup_nlri_len;
+static int hf_bgp_mup_nlri_rd;
+static int hf_bgp_mup_nlri_prefixlen;
+static int hf_bgp_mup_nlri_ip_prefix;
+static int hf_bgp_mup_nlri_ipv6_prefix;
+static int hf_bgp_mup_nlri_ip_addr;
+static int hf_bgp_mup_nlri_ipv6_addr;
+static int hf_bgp_mup_nlri_3gpp_5g_type1_st_route;
+static int hf_bgp_mup_nlri_3gpp_5g_teid;
+static int hf_bgp_mup_nlri_3gpp_5g_qfi;
+static int hf_bgp_mup_nlri_3gpp_5g_ep_addr_len;
+static int hf_bgp_mup_nlri_3gpp_5g_ep_ip_addr;
+static int hf_bgp_mup_nlri_3gpp_5g_ep_ipv6_addr;
+static int hf_bgp_mup_nlri_3gpp_5g_type2_st_route;
+static int hf_bgp_mup_nlri_ep_len;
+static int hf_bgp_mup_nlri_ep_ip_addr;
+static int hf_bgp_mup_nlri_ep_ipv6_addr;
+static int hf_bgp_mup_nlri_3gpp_5g_ep_teid;
+static int hf_bgp_mup_nlri_unknown_data;
 
 static int * const ls_igp_te_metric_flags[] = {
        &hf_bgp_ls_igp_te_metric_flags_a,
@@ -3017,128 +3017,128 @@ static int * const ls_igp_te_metric_flags[] = {
        NULL
        };
 
-static gint ett_bgp = -1;
-static gint ett_bgp_prefix = -1;
-static gint ett_bgp_unfeas = -1;
-static gint ett_bgp_attrs = -1;
-static gint ett_bgp_attr = -1;
-static gint ett_bgp_attr_flags = -1;
-static gint ett_bgp_mp_nhna = -1;
-static gint ett_bgp_mp_reach_nlri = -1;
-static gint ett_bgp_mp_unreach_nlri = -1;
-static gint ett_bgp_mp_snpa = -1;
-static gint ett_bgp_nlri = -1;
-static gint ett_bgp_open = -1;
-static gint ett_bgp_update = -1;
-static gint ett_bgp_notification = -1;
-static gint ett_bgp_route_refresh = -1; /* ROUTE-REFRESH message tree */
-static gint ett_bgp_capability = -1;
-static gint ett_bgp_as_path_segment = -1;
-static gint ett_bgp_as_path_segment_asn = -1;
-static gint ett_bgp_communities = -1;
-static gint ett_bgp_community = -1;
-static gint ett_bgp_cluster_list = -1;  /* cluster list tree          */
-static gint ett_bgp_options = -1;       /* optional parameters tree   */
-static gint ett_bgp_option = -1;        /* an optional parameter tree */
-static gint ett_bgp_options_ext = -1;
-static gint ett_bgp_cap = -1;           /* an cap parameter tree */
-static gint ett_bgp_extended_communities = -1; /* extended communities list tree */
-static gint ett_bgp_extended_community = -1; /* extended community tree for each community of BGP update */
-static gint ett_bgp_ext_com_type = -1;  /* Extended Community Type High tree (IANA, Transitive bits) */
-static gint ett_bgp_extended_com_fspec_redir = -1; /* extended communities BGP flow act redirect */
-static gint ett_bgp_ext_com_flags = -1; /* extended communities flags tree */
-static gint ett_bgp_ext_com_l2_flags = -1; /* extended commuties tree for l2 services flags */
-static gint ett_bgp_ext_com_etree_flags = -1;
-static gint ett_bgp_ext_com_evpn_mmac_flags = -1;
-static gint ett_bgp_ext_com_evpn_l2attr_flags = -1;
-static gint ett_bgp_ext_com_evpn_etree_flags = -1;
-static gint ett_bgp_ext_com_cost_cid = -1; /* Cost community CommunityID tree (replace/evaluate after bit) */
-static gint ett_bgp_ext_com_ospf_rt_opt = -1; /* Tree for Options bitfield of OSPF Route Type extended community */
-static gint ett_bgp_ext_com_eigrp_flags = -1; /* Tree for EIGRP route flags */
-static gint ett_bgp_ssa = -1;           /* safi specific attribute */
-static gint ett_bgp_ssa_subtree = -1;   /* safi specific attribute Subtrees */
-static gint ett_bgp_orf = -1;           /* orf (outbound route filter) tree */
-static gint ett_bgp_orf_entry = -1;     /* orf entry tree */
-static gint ett_bgp_mcast_vpn_nlri = -1;
-static gint ett_bgp_flow_spec_nlri = -1;
-static gint ett_bgp_flow_spec_nlri_filter = -1; /* tree decoding multiple op and value pairs */
-static gint ett_bgp_flow_spec_nlri_op_flags = -1; /* tree decoding each op and val pair within the op and value set */
-static gint ett_bgp_flow_spec_nlri_tcp = -1;
-static gint ett_bgp_flow_spec_nlri_ff = -1;
-static gint ett_bgp_tunnel_tlv = -1;
-static gint ett_bgp_tunnel_tlv_subtree = -1;
-static gint ett_bgp_tunnel_subtlv = -1;
-static gint ett_bgp_tunnel_subtlv_subtree = -1;
-static gint ett_bgp_link_state = -1;
-static gint ett_bgp_evpn_nlri = -1;
-static gint ett_bgp_evpn_nlri_esi = -1;
-static gint ett_bgp_evpn_nlri_mc = -1;
-static gint ett_bgp_mpls_labels = -1;
-static gint ett_bgp_pmsi_tunnel_id = -1;
-static gint ett_bgp_aigp_attr = -1;
-static gint ett_bgp_large_communities = -1;
-static gint ett_bgp_dpath = -1;
-static gint ett_bgp_prefix_sid_originator_srgb = -1;
-static gint ett_bgp_prefix_sid_originator_srgb_block = -1;
-static gint ett_bgp_prefix_sid_originator_srgb_blocks = -1;
-static gint ett_bgp_prefix_sid_label_index = -1;
-static gint ett_bgp_prefix_sid_ipv6 = -1;
-static gint ett_bgp_bgpsec_secure_path = -1;
-static gint ett_bgp_bgpsec_secure_path_segment = -1;
-static gint ett_bgp_bgpsec_signature_block = -1;
-static gint ett_bgp_bgpsec_signature_segment = -1;
-static gint ett_bgp_vxlan = -1;
-static gint ett_bgp_binding_sid = -1;
-static gint ett_bgp_segment_list = -1;
-static gint ett_bgp_prefix_sid_unknown = -1;
-static gint ett_bgp_prefix_sid_srv6_l3vpn = -1;
-static gint ett_bgp_prefix_sid_srv6_l3vpn_sub_tlvs = -1;
-static gint ett_bgp_prefix_sid_srv6_l3vpn_sid_information = -1;
-static gint ett_bgp_prefix_sid_srv6_l3vpn_sub_sub_tlvs = -1;
-static gint ett_bgp_prefix_sid_srv6_l3vpn_sid_structure = -1;
-static gint ett_bgp_prefix_sid_srv6_l3vpn_sid_unknown = -1;
-static gint ett_bgp_prefix_sid_srv6_l3vpn_unknown = -1;
-static gint ett_bgp_prefix_sid_srv6_l2vpn = -1;
-static gint ett_bgp_prefix_sid_srv6_l2vpn_sub_tlvs = -1;
-static gint ett_bgp_prefix_sid_srv6_l2vpn_sid_information = -1;
-static gint ett_bgp_prefix_sid_srv6_l2vpn_sub_sub_tlvs = -1;
-static gint ett_bgp_prefix_sid_srv6_l2vpn_sid_structure = -1;
-static gint ett_bgp_prefix_sid_srv6_l2vpn_sid_unknown = -1;
-static gint ett_bgp_prefix_sid_srv6_l2vpn_unknown = -1;
-static gint ett_bgp_mup_nlri = -1;
-static gint ett_bgp_mup_nlri_3gpp_5g_type1_st_route = -1;
-static gint ett_bgp_mup_nlri_3gpp_5g_type2_st_route = -1;
-
-static expert_field ei_bgp_marker_invalid = EI_INIT;
-static expert_field ei_bgp_cap_len_bad = EI_INIT;
-static expert_field ei_bgp_cap_gr_helper_mode_only = EI_INIT;
-static expert_field ei_bgp_notify_minor_unknown = EI_INIT;
-static expert_field ei_bgp_route_refresh_orf_type_unknown = EI_INIT;
-static expert_field ei_bgp_length_invalid = EI_INIT;
-static expert_field ei_bgp_prefix_length_invalid = EI_INIT;
-static expert_field ei_bgp_afi_type_not_supported = EI_INIT;
-static expert_field ei_bgp_unknown_afi = EI_INIT;
-static expert_field ei_bgp_unknown_safi = EI_INIT;
-static expert_field ei_bgp_unknown_label_vpn = EI_INIT;
-static expert_field ei_bgp_ls_error = EI_INIT;
-static expert_field ei_bgp_ls_warn = EI_INIT;
-static expert_field ei_bgp_ext_com_len_bad = EI_INIT;
-static expert_field ei_bgp_attr_pmsi_opaque_type = EI_INIT;
-static expert_field ei_bgp_attr_pmsi_tunnel_type = EI_INIT;
-static expert_field ei_bgp_prefix_length_err = EI_INIT;
-static expert_field ei_bgp_attr_aigp_type = EI_INIT;
-static expert_field ei_bgp_attr_as_path_as_len_err = EI_INIT;
-static expert_field ei_bgp_next_hop_ipv6_scope = EI_INIT;
-static expert_field ei_bgp_next_hop_rd_nonzero = EI_INIT;
-
-static expert_field ei_bgp_evpn_nlri_rt_type_err = EI_INIT;
-static expert_field ei_bgp_evpn_nlri_rt_len_err = EI_INIT;
-static expert_field ei_bgp_evpn_nlri_esi_type_err = EI_INIT;
-static expert_field ei_bgp_evpn_nlri_rt4_no_ip = EI_INIT;
-
-static expert_field ei_bgp_mup_unknown_at = EI_INIT;
-static expert_field ei_bgp_mup_unknown_rt = EI_INIT;
-static expert_field ei_bgp_mup_nlri_addr_len_err = EI_INIT;
+static gint ett_bgp;
+static gint ett_bgp_prefix;
+static gint ett_bgp_unfeas;
+static gint ett_bgp_attrs;
+static gint ett_bgp_attr;
+static gint ett_bgp_attr_flags;
+static gint ett_bgp_mp_nhna;
+static gint ett_bgp_mp_reach_nlri;
+static gint ett_bgp_mp_unreach_nlri;
+static gint ett_bgp_mp_snpa;
+static gint ett_bgp_nlri;
+static gint ett_bgp_open;
+static gint ett_bgp_update;
+static gint ett_bgp_notification;
+static gint ett_bgp_route_refresh; /* ROUTE-REFRESH message tree */
+static gint ett_bgp_capability;
+static gint ett_bgp_as_path_segment;
+static gint ett_bgp_as_path_segment_asn;
+static gint ett_bgp_communities;
+static gint ett_bgp_community;
+static gint ett_bgp_cluster_list;  /* cluster list tree          */
+static gint ett_bgp_options;       /* optional parameters tree   */
+static gint ett_bgp_option;        /* an optional parameter tree */
+static gint ett_bgp_options_ext;
+static gint ett_bgp_cap;           /* an cap parameter tree */
+static gint ett_bgp_extended_communities; /* extended communities list tree */
+static gint ett_bgp_extended_community; /* extended community tree for each community of BGP update */
+static gint ett_bgp_ext_com_type;  /* Extended Community Type High tree (IANA, Transitive bits) */
+static gint ett_bgp_extended_com_fspec_redir; /* extended communities BGP flow act redirect */
+static gint ett_bgp_ext_com_flags; /* extended communities flags tree */
+static gint ett_bgp_ext_com_l2_flags; /* extended commuties tree for l2 services flags */
+static gint ett_bgp_ext_com_etree_flags;
+static gint ett_bgp_ext_com_evpn_mmac_flags;
+static gint ett_bgp_ext_com_evpn_l2attr_flags;
+static gint ett_bgp_ext_com_evpn_etree_flags;
+static gint ett_bgp_ext_com_cost_cid; /* Cost community CommunityID tree (replace/evaluate after bit) */
+static gint ett_bgp_ext_com_ospf_rt_opt; /* Tree for Options bitfield of OSPF Route Type extended community */
+static gint ett_bgp_ext_com_eigrp_flags; /* Tree for EIGRP route flags */
+static gint ett_bgp_ssa;           /* safi specific attribute */
+static gint ett_bgp_ssa_subtree;   /* safi specific attribute Subtrees */
+static gint ett_bgp_orf;           /* orf (outbound route filter) tree */
+static gint ett_bgp_orf_entry;     /* orf entry tree */
+static gint ett_bgp_mcast_vpn_nlri;
+static gint ett_bgp_flow_spec_nlri;
+static gint ett_bgp_flow_spec_nlri_filter; /* tree decoding multiple op and value pairs */
+static gint ett_bgp_flow_spec_nlri_op_flags; /* tree decoding each op and val pair within the op and value set */
+static gint ett_bgp_flow_spec_nlri_tcp;
+static gint ett_bgp_flow_spec_nlri_ff;
+static gint ett_bgp_tunnel_tlv;
+static gint ett_bgp_tunnel_tlv_subtree;
+static gint ett_bgp_tunnel_subtlv;
+static gint ett_bgp_tunnel_subtlv_subtree;
+static gint ett_bgp_link_state;
+static gint ett_bgp_evpn_nlri;
+static gint ett_bgp_evpn_nlri_esi;
+static gint ett_bgp_evpn_nlri_mc;
+static gint ett_bgp_mpls_labels;
+static gint ett_bgp_pmsi_tunnel_id;
+static gint ett_bgp_aigp_attr;
+static gint ett_bgp_large_communities;
+static gint ett_bgp_dpath;
+static gint ett_bgp_prefix_sid_originator_srgb;
+static gint ett_bgp_prefix_sid_originator_srgb_block;
+static gint ett_bgp_prefix_sid_originator_srgb_blocks;
+static gint ett_bgp_prefix_sid_label_index;
+static gint ett_bgp_prefix_sid_ipv6;
+static gint ett_bgp_bgpsec_secure_path;
+static gint ett_bgp_bgpsec_secure_path_segment;
+static gint ett_bgp_bgpsec_signature_block;
+static gint ett_bgp_bgpsec_signature_segment;
+static gint ett_bgp_vxlan;
+static gint ett_bgp_binding_sid;
+static gint ett_bgp_segment_list;
+static gint ett_bgp_prefix_sid_unknown;
+static gint ett_bgp_prefix_sid_srv6_l3vpn;
+static gint ett_bgp_prefix_sid_srv6_l3vpn_sub_tlvs;
+static gint ett_bgp_prefix_sid_srv6_l3vpn_sid_information;
+static gint ett_bgp_prefix_sid_srv6_l3vpn_sub_sub_tlvs;
+static gint ett_bgp_prefix_sid_srv6_l3vpn_sid_structure;
+static gint ett_bgp_prefix_sid_srv6_l3vpn_sid_unknown;
+static gint ett_bgp_prefix_sid_srv6_l3vpn_unknown;
+static gint ett_bgp_prefix_sid_srv6_l2vpn;
+static gint ett_bgp_prefix_sid_srv6_l2vpn_sub_tlvs;
+static gint ett_bgp_prefix_sid_srv6_l2vpn_sid_information;
+static gint ett_bgp_prefix_sid_srv6_l2vpn_sub_sub_tlvs;
+static gint ett_bgp_prefix_sid_srv6_l2vpn_sid_structure;
+static gint ett_bgp_prefix_sid_srv6_l2vpn_sid_unknown;
+static gint ett_bgp_prefix_sid_srv6_l2vpn_unknown;
+static gint ett_bgp_mup_nlri;
+static gint ett_bgp_mup_nlri_3gpp_5g_type1_st_route;
+static gint ett_bgp_mup_nlri_3gpp_5g_type2_st_route;
+
+static expert_field ei_bgp_marker_invalid;
+static expert_field ei_bgp_cap_len_bad;
+static expert_field ei_bgp_cap_gr_helper_mode_only;
+static expert_field ei_bgp_notify_minor_unknown;
+static expert_field ei_bgp_route_refresh_orf_type_unknown;
+static expert_field ei_bgp_length_invalid;
+static expert_field ei_bgp_prefix_length_invalid;
+static expert_field ei_bgp_afi_type_not_supported;
+static expert_field ei_bgp_unknown_afi;
+static expert_field ei_bgp_unknown_safi;
+static expert_field ei_bgp_unknown_label_vpn;
+static expert_field ei_bgp_ls_error;
+static expert_field ei_bgp_ls_warn;
+static expert_field ei_bgp_ext_com_len_bad;
+static expert_field ei_bgp_attr_pmsi_opaque_type;
+static expert_field ei_bgp_attr_pmsi_tunnel_type;
+static expert_field ei_bgp_prefix_length_err;
+static expert_field ei_bgp_attr_aigp_type;
+static expert_field ei_bgp_attr_as_path_as_len_err;
+static expert_field ei_bgp_next_hop_ipv6_scope;
+static expert_field ei_bgp_next_hop_rd_nonzero;
+
+static expert_field ei_bgp_evpn_nlri_rt_type_err;
+static expert_field ei_bgp_evpn_nlri_rt_len_err;
+static expert_field ei_bgp_evpn_nlri_esi_type_err;
+static expert_field ei_bgp_evpn_nlri_rt4_no_ip;
+
+static expert_field ei_bgp_mup_unknown_at;
+static expert_field ei_bgp_mup_unknown_rt;
+static expert_field ei_bgp_mup_nlri_addr_len_err;
 
 /* desegmentation */
 static gboolean bgp_desegment = TRUE;
diff --git a/epan/dissectors/packet-bicc_mst.c b/epan/dissectors/packet-bicc_mst.c
index 4c4f645124..a09f987f31 100644
--- a/epan/dissectors/packet-bicc_mst.c
+++ b/epan/dissectors/packet-bicc_mst.c
@@ -24,16 +24,16 @@
 
 void proto_register_bicc_mst(void);
 
-static int proto_bicc_mst = -1;
+static int proto_bicc_mst;
 
-static int hf_lcls_gcr_network_id_len = -1;
-static int hf_lcls_gcr_network_id = -1;
-static int hf_lcls_gcr_node_id_len = -1;
-static int hf_lcls_gcr_node_id = -1;
-static int hf_lcls_gcr_call_ref_id_len = -1;
-static int hf_lcls_gcr_call_ref_id = -1;
+static int hf_lcls_gcr_network_id_len;
+static int hf_lcls_gcr_network_id;
+static int hf_lcls_gcr_node_id_len;
+static int hf_lcls_gcr_node_id;
+static int hf_lcls_gcr_call_ref_id_len;
+static int hf_lcls_gcr_call_ref_id;
 
-static int ett_lcls_gcr = -1;
+static int ett_lcls_gcr;
 
 guint
 dissect_bicc_mst_lcls_gcr(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
diff --git a/epan/dissectors/packet-bitcoin.c b/epan/dissectors/packet-bitcoin.c
index e0fa3f43cf..0cfc921d81 100644
--- a/epan/dissectors/packet-bitcoin.c
+++ b/epan/dissectors/packet-bitcoin.c
@@ -89,187 +89,187 @@ static dissector_handle_t bitcoin_handle;
 
 static dissector_table_t bitcoin_command_table;
 
-static int proto_bitcoin = -1;
-
-static int hf_address_address = -1;
-static int hf_address_port = -1;
-static int hf_address_services = -1;
-static int hf_bitcoin_checksum = -1;
-static int hf_bitcoin_command = -1;
-static int hf_bitcoin_length = -1;
-static int hf_bitcoin_magic = -1;
-static int hf_bitcoin_msg_addr = -1;
-static int hf_bitcoin_msg_block = -1;
-static int hf_bitcoin_msg_feefilter = -1;
-static int hf_bitcoin_msg_filteradd = -1;
-static int hf_bitcoin_msg_filterload = -1;
-static int hf_bitcoin_msg_getblocks = -1;
-static int hf_bitcoin_msg_getdata = -1;
-static int hf_bitcoin_msg_getheaders = -1;
-static int hf_bitcoin_msg_headers = -1;
-static int hf_bitcoin_msg_inv = -1;
-static int hf_bitcoin_msg_merkleblock = -1;
-static int hf_bitcoin_msg_notfound = -1;
-static int hf_bitcoin_msg_ping = -1;
-static int hf_bitcoin_msg_pong = -1;
-static int hf_bitcoin_msg_reject = -1;
-static int hf_bitcoin_msg_sendcmpct = -1;
-static int hf_bitcoin_msg_tx = -1;
-static int hf_bitcoin_msg_version = -1;
-static int hf_data_value = -1;
-static int hf_data_varint_count16 = -1;
-static int hf_data_varint_count32 = -1;
-static int hf_data_varint_count64 = -1;
-static int hf_data_varint_count8 = -1;
-static int hf_msg_addr_address = -1;
-static int hf_msg_addr_count16 = -1;
-static int hf_msg_addr_count32 = -1;
-static int hf_msg_addr_count64 = -1;
-static int hf_msg_addr_count8 = -1;
-static int hf_msg_addr_timestamp = -1;
-static int hf_msg_block_bits = -1;
-static int hf_msg_block_merkle_root = -1;
-static int hf_msg_block_nonce = -1;
-static int hf_msg_block_prev_block = -1;
-static int hf_msg_block_time = -1;
-static int hf_msg_block_transactions16 = -1;
-static int hf_msg_block_transactions32 = -1;
-static int hf_msg_block_transactions64 = -1;
-static int hf_msg_block_transactions8 = -1;
-static int hf_msg_block_version = -1;
-static int hf_msg_feefilter_value = -1;
-static int hf_msg_filteradd_data = -1;
-static int hf_msg_filterload_filter = -1;
-static int hf_msg_filterload_nflags = -1;
-static int hf_msg_filterload_nhashfunc = -1;
-static int hf_msg_filterload_ntweak = -1;
-static int hf_msg_getblocks_count16 = -1;
-static int hf_msg_getblocks_count32 = -1;
-static int hf_msg_getblocks_count64 = -1;
-static int hf_msg_getblocks_count8 = -1;
-static int hf_msg_getblocks_start = -1;
-static int hf_msg_getblocks_stop = -1;
-static int hf_msg_getdata_count16 = -1;
-static int hf_msg_getdata_count32 = -1;
-static int hf_msg_getdata_count64 = -1;
-static int hf_msg_getdata_count8 = -1;
-static int hf_msg_getdata_hash = -1;
-static int hf_msg_getdata_type = -1;
-static int hf_msg_getheaders_count16 = -1;
-static int hf_msg_getheaders_count32 = -1;
-static int hf_msg_getheaders_count64 = -1;
-static int hf_msg_getheaders_count8 = -1;
-static int hf_msg_getheaders_start = -1;
-static int hf_msg_getheaders_stop = -1;
-static int hf_msg_getheaders_version = -1;
-static int hf_msg_headers_bits = -1;
-static int hf_msg_headers_count16 = -1;
-static int hf_msg_headers_count32 = -1;
-static int hf_msg_headers_count64 = -1;
-static int hf_msg_headers_count8 = -1;
-static int hf_msg_headers_merkle_root = -1;
-static int hf_msg_headers_nonce = -1;
-static int hf_msg_headers_prev_block = -1;
-static int hf_msg_headers_time = -1;
-static int hf_msg_headers_version = -1;
-static int hf_msg_inv_count16 = -1;
-static int hf_msg_inv_count32 = -1;
-static int hf_msg_inv_count64 = -1;
-static int hf_msg_inv_count8 = -1;
-static int hf_msg_inv_hash = -1;
-static int hf_msg_inv_type = -1;
-static int hf_msg_merkleblock_bits = -1;
-static int hf_msg_merkleblock_flags_data = -1;
-static int hf_msg_merkleblock_flags_size16 = -1;
-static int hf_msg_merkleblock_flags_size32 = -1;
-static int hf_msg_merkleblock_flags_size64 = -1;
-static int hf_msg_merkleblock_flags_size8 = -1;
-static int hf_msg_merkleblock_hashes_count16 = -1;
-static int hf_msg_merkleblock_hashes_count32 = -1;
-static int hf_msg_merkleblock_hashes_count64 = -1;
-static int hf_msg_merkleblock_hashes_count8 = -1;
-static int hf_msg_merkleblock_hashes_hash = -1;
-static int hf_msg_merkleblock_merkle_root = -1;
-static int hf_msg_merkleblock_nonce = -1;
-static int hf_msg_merkleblock_prev_block = -1;
-static int hf_msg_merkleblock_time = -1;
-static int hf_msg_merkleblock_transactions = -1;
-static int hf_msg_merkleblock_version = -1;
-static int hf_msg_notfound_count16 = -1;
-static int hf_msg_notfound_count32 = -1;
-static int hf_msg_notfound_count64 = -1;
-static int hf_msg_notfound_count8 = -1;
-static int hf_msg_notfound_hash = -1;
-static int hf_msg_notfound_type = -1;
-static int hf_msg_ping_nonce = -1;
-static int hf_msg_pong_nonce = -1;
-static int hf_msg_reject_ccode = -1;
-static int hf_msg_reject_data = -1;
-static int hf_msg_reject_message = -1;
-static int hf_msg_reject_reason = -1;
-static int hf_msg_sendcmpct_announce = -1;
-static int hf_msg_sendcmpct_version = -1;
-static int hf_msg_tx_in = -1;
-static int hf_msg_tx_in_count16 = -1;
-static int hf_msg_tx_in_count32 = -1;
-static int hf_msg_tx_in_count64 = -1;
-static int hf_msg_tx_in_count8 = -1;
-static int hf_msg_tx_in_prev_outp_hash = -1;
-static int hf_msg_tx_in_prev_outp_index = -1;
-static int hf_msg_tx_in_prev_output = -1;
-static int hf_msg_tx_in_script16 = -1;
-static int hf_msg_tx_in_script32 = -1;
-static int hf_msg_tx_in_script64 = -1;
-static int hf_msg_tx_in_script8 = -1;
-static int hf_msg_tx_in_seq = -1;
-static int hf_msg_tx_in_sig_script = -1;
-static int hf_msg_tx_lock_time = -1;
-static int hf_msg_tx_out = -1;
-static int hf_msg_tx_out_count16 = -1;
-static int hf_msg_tx_out_count32 = -1;
-static int hf_msg_tx_out_count64 = -1;
-static int hf_msg_tx_out_count8 = -1;
-static int hf_msg_tx_out_script = -1;
-static int hf_msg_tx_out_script16 = -1;
-static int hf_msg_tx_out_script32 = -1;
-static int hf_msg_tx_out_script64 = -1;
-static int hf_msg_tx_out_script8 = -1;
-static int hf_msg_tx_out_value = -1;
-static int hf_msg_tx_witness = -1;
-static int hf_msg_tx_witness_components16 = -1;
-static int hf_msg_tx_witness_components32 = -1;
-static int hf_msg_tx_witness_components64 = -1;
-static int hf_msg_tx_witness_components8 = -1;
-static int hf_msg_tx_witness_component = -1;
-static int hf_msg_tx_witness_component_length16 = -1;
-static int hf_msg_tx_witness_component_length32 = -1;
-static int hf_msg_tx_witness_component_length64 = -1;
-static int hf_msg_tx_witness_component_length8 = -1;
-static int hf_msg_tx_witness_component_data = -1;
-static int hf_msg_tx_version = -1;
-static int hf_msg_tx_flag = -1;
-static int hf_msg_version_addr_me = -1;
-static int hf_msg_version_addr_you = -1;
-static int hf_msg_version_nonce = -1;
-static int hf_msg_version_relay = -1;
-static int hf_msg_version_services = -1;
-static int hf_msg_version_start_height = -1;
-static int hf_msg_version_timestamp = -1;
-static int hf_msg_version_user_agent = -1;
-static int hf_msg_version_version = -1;
-static int hf_services_network = -1;
-static int hf_services_getutxo = -1;
-static int hf_services_bloom = -1;
-static int hf_services_witness = -1;
-static int hf_services_xthin = -1;
-static int hf_services_compactfilters = -1;
-static int hf_services_networklimited = -1;
-static int hf_services_p2pv2 = -1;
-static int hf_string_value = -1;
-static int hf_string_varint_count16 = -1;
-static int hf_string_varint_count32 = -1;
-static int hf_string_varint_count64 = -1;
-static int hf_string_varint_count8 = -1;
+static int proto_bitcoin;
+
+static int hf_address_address;
+static int hf_address_port;
+static int hf_address_services;
+static int hf_bitcoin_checksum;
+static int hf_bitcoin_command;
+static int hf_bitcoin_length;
+static int hf_bitcoin_magic;
+static int hf_bitcoin_msg_addr;
+static int hf_bitcoin_msg_block;
+static int hf_bitcoin_msg_feefilter;
+static int hf_bitcoin_msg_filteradd;
+static int hf_bitcoin_msg_filterload;
+static int hf_bitcoin_msg_getblocks;
+static int hf_bitcoin_msg_getdata;
+static int hf_bitcoin_msg_getheaders;
+static int hf_bitcoin_msg_headers;
+static int hf_bitcoin_msg_inv;
+static int hf_bitcoin_msg_merkleblock;
+static int hf_bitcoin_msg_notfound;
+static int hf_bitcoin_msg_ping;
+static int hf_bitcoin_msg_pong;
+static int hf_bitcoin_msg_reject;
+static int hf_bitcoin_msg_sendcmpct;
+static int hf_bitcoin_msg_tx;
+static int hf_bitcoin_msg_version;
+static int hf_data_value;
+static int hf_data_varint_count16;
+static int hf_data_varint_count32;
+static int hf_data_varint_count64;
+static int hf_data_varint_count8;
+static int hf_msg_addr_address;
+static int hf_msg_addr_count16;
+static int hf_msg_addr_count32;
+static int hf_msg_addr_count64;
+static int hf_msg_addr_count8;
+static int hf_msg_addr_timestamp;
+static int hf_msg_block_bits;
+static int hf_msg_block_merkle_root;
+static int hf_msg_block_nonce;
+static int hf_msg_block_prev_block;
+static int hf_msg_block_time;
+static int hf_msg_block_transactions16;
+static int hf_msg_block_transactions32;
+static int hf_msg_block_transactions64;
+static int hf_msg_block_transactions8;
+static int hf_msg_block_version;
+static int hf_msg_feefilter_value;
+static int hf_msg_filteradd_data;
+static int hf_msg_filterload_filter;
+static int hf_msg_filterload_nflags;
+static int hf_msg_filterload_nhashfunc;
+static int hf_msg_filterload_ntweak;
+static int hf_msg_getblocks_count16;
+static int hf_msg_getblocks_count32;
+static int hf_msg_getblocks_count64;
+static int hf_msg_getblocks_count8;
+static int hf_msg_getblocks_start;
+static int hf_msg_getblocks_stop;
+static int hf_msg_getdata_count16;
+static int hf_msg_getdata_count32;
+static int hf_msg_getdata_count64;
+static int hf_msg_getdata_count8;
+static int hf_msg_getdata_hash;
+static int hf_msg_getdata_type;
+static int hf_msg_getheaders_count16;
+static int hf_msg_getheaders_count32;
+static int hf_msg_getheaders_count64;
+static int hf_msg_getheaders_count8;
+static int hf_msg_getheaders_start;
+static int hf_msg_getheaders_stop;
+static int hf_msg_getheaders_version;
+static int hf_msg_headers_bits;
+static int hf_msg_headers_count16;
+static int hf_msg_headers_count32;
+static int hf_msg_headers_count64;
+static int hf_msg_headers_count8;
+static int hf_msg_headers_merkle_root;
+static int hf_msg_headers_nonce;
+static int hf_msg_headers_prev_block;
+static int hf_msg_headers_time;
+static int hf_msg_headers_version;
+static int hf_msg_inv_count16;
+static int hf_msg_inv_count32;
+static int hf_msg_inv_count64;
+static int hf_msg_inv_count8;
+static int hf_msg_inv_hash;
+static int hf_msg_inv_type;
+static int hf_msg_merkleblock_bits;
+static int hf_msg_merkleblock_flags_data;
+static int hf_msg_merkleblock_flags_size16;
+static int hf_msg_merkleblock_flags_size32;
+static int hf_msg_merkleblock_flags_size64;
+static int hf_msg_merkleblock_flags_size8;
+static int hf_msg_merkleblock_hashes_count16;
+static int hf_msg_merkleblock_hashes_count32;
+static int hf_msg_merkleblock_hashes_count64;
+static int hf_msg_merkleblock_hashes_count8;
+static int hf_msg_merkleblock_hashes_hash;
+static int hf_msg_merkleblock_merkle_root;
+static int hf_msg_merkleblock_nonce;
+static int hf_msg_merkleblock_prev_block;
+static int hf_msg_merkleblock_time;
+static int hf_msg_merkleblock_transactions;
+static int hf_msg_merkleblock_version;
+static int hf_msg_notfound_count16;
+static int hf_msg_notfound_count32;
+static int hf_msg_notfound_count64;
+static int hf_msg_notfound_count8;
+static int hf_msg_notfound_hash;
+static int hf_msg_notfound_type;
+static int hf_msg_ping_nonce;
+static int hf_msg_pong_nonce;
+static int hf_msg_reject_ccode;
+static int hf_msg_reject_data;
+static int hf_msg_reject_message;
+static int hf_msg_reject_reason;
+static int hf_msg_sendcmpct_announce;
+static int hf_msg_sendcmpct_version;
+static int hf_msg_tx_in;
+static int hf_msg_tx_in_count16;
+static int hf_msg_tx_in_count32;
+static int hf_msg_tx_in_count64;
+static int hf_msg_tx_in_count8;
+static int hf_msg_tx_in_prev_outp_hash;
+static int hf_msg_tx_in_prev_outp_index;
+static int hf_msg_tx_in_prev_output;
+static int hf_msg_tx_in_script16;
+static int hf_msg_tx_in_script32;
+static int hf_msg_tx_in_script64;
+static int hf_msg_tx_in_script8;
+static int hf_msg_tx_in_seq;
+static int hf_msg_tx_in_sig_script;
+static int hf_msg_tx_lock_time;
+static int hf_msg_tx_out;
+static int hf_msg_tx_out_count16;
+static int hf_msg_tx_out_count32;
+static int hf_msg_tx_out_count64;
+static int hf_msg_tx_out_count8;
+static int hf_msg_tx_out_script;
+static int hf_msg_tx_out_script16;
+static int hf_msg_tx_out_script32;
+static int hf_msg_tx_out_script64;
+static int hf_msg_tx_out_script8;
+static int hf_msg_tx_out_value;
+static int hf_msg_tx_witness;
+static int hf_msg_tx_witness_components16;
+static int hf_msg_tx_witness_components32;
+static int hf_msg_tx_witness_components64;
+static int hf_msg_tx_witness_components8;
+static int hf_msg_tx_witness_component;
+static int hf_msg_tx_witness_component_length16;
+static int hf_msg_tx_witness_component_length32;
+static int hf_msg_tx_witness_component_length64;
+static int hf_msg_tx_witness_component_length8;
+static int hf_msg_tx_witness_component_data;
+static int hf_msg_tx_version;
+static int hf_msg_tx_flag;
+static int hf_msg_version_addr_me;
+static int hf_msg_version_addr_you;
+static int hf_msg_version_nonce;
+static int hf_msg_version_relay;
+static int hf_msg_version_services;
+static int hf_msg_version_start_height;
+static int hf_msg_version_timestamp;
+static int hf_msg_version_user_agent;
+static int hf_msg_version_version;
+static int hf_services_network;
+static int hf_services_getutxo;
+static int hf_services_bloom;
+static int hf_services_witness;
+static int hf_services_xthin;
+static int hf_services_compactfilters;
+static int hf_services_networklimited;
+static int hf_services_p2pv2;
+static int hf_string_value;
+static int hf_string_varint_count16;
+static int hf_string_varint_count32;
+static int hf_string_varint_count64;
+static int hf_string_varint_count8;
 
 static int * const services_hf_flags[] = {
   &hf_services_network,
@@ -283,25 +283,25 @@ static int * const services_hf_flags[] = {
   NULL
 };
 
-static gint ett_bitcoin = -1;
-static gint ett_bitcoin_msg = -1;
-static gint ett_services = -1;
-static gint ett_address = -1;
-static gint ett_string = -1;
-static gint ett_addr_list = -1;
-static gint ett_inv_list = -1;
-static gint ett_getdata_list = -1;
-static gint ett_notfound_list = -1;
-static gint ett_getblocks_list = -1;
-static gint ett_getheaders_list = -1;
-static gint ett_tx_in_list = -1;
-static gint ett_tx_in_outp = -1;
-static gint ett_tx_out_list = -1;
-static gint ett_tx_witness_list = -1;
-static gint ett_tx_witness_component_list = -1;
-
-static expert_field ei_bitcoin_command_unknown = EI_INIT;
-static expert_field ei_bitcoin_script_len = EI_INIT;
+static gint ett_bitcoin;
+static gint ett_bitcoin_msg;
+static gint ett_services;
+static gint ett_address;
+static gint ett_string;
+static gint ett_addr_list;
+static gint ett_inv_list;
+static gint ett_getdata_list;
+static gint ett_notfound_list;
+static gint ett_getblocks_list;
+static gint ett_getheaders_list;
+static gint ett_tx_in_list;
+static gint ett_tx_in_outp;
+static gint ett_tx_out_list;
+static gint ett_tx_witness_list;
+static gint ett_tx_witness_component_list;
+
+static expert_field ei_bitcoin_command_unknown;
+static expert_field ei_bitcoin_script_len;
 
 
 static gboolean bitcoin_desegment  = TRUE;
diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c
index 2ae5701740..2977dc2c94 100644
--- a/epan/dissectors/packet-bittorrent.c
+++ b/epan/dissectors/packet-bittorrent.c
@@ -138,39 +138,39 @@ static const struct amp_message amp_messages[] = {
 
 static dissector_handle_t dissector_handle;
 static dissector_handle_t bencode_handle;
-static int proto_bittorrent = -1;
-
-/* static gint hf_bittorrent_field_length  = -1; */
-static gint hf_bittorrent_prot_name_len = -1;
-static gint hf_bittorrent_prot_name     = -1;
-static gint hf_bittorrent_reserved      = -1;
-static gint hf_bittorrent_sha1_hash     = -1;
-static gint hf_bittorrent_peer_id       = -1;
-static gint hf_bittorrent_msg           = -1;
-static gint hf_bittorrent_msg_len       = -1;
-static gint hf_bittorrent_msg_type      = -1;
-static gint hf_azureus_msg              = -1;
-static gint hf_azureus_msg_type_len     = -1;
-static gint hf_azureus_msg_type         = -1;
-static gint hf_azureus_msg_prio         = -1;
-static gint hf_bittorrent_bitfield_data = -1;
-static gint hf_bittorrent_piece_index   = -1;
-static gint hf_bittorrent_piece_begin   = -1;
-static gint hf_bittorrent_piece_length  = -1;
-static gint hf_bittorrent_piece_data    = -1;
-static gint hf_azureus_jpc_addrlen      = -1;
-static gint hf_azureus_jpc_addr         = -1;
-static gint hf_azureus_jpc_port         = -1;
-static gint hf_azureus_jpc_session      = -1;
-static gint hf_bittorrent_port          = -1;
-static gint hf_bittorrent_extended_id   = -1;
-static gint hf_bittorrent_extended      = -1;
-static gint hf_bittorrent_continuous_data = -1;
-static gint hf_bittorrent_version       = -1;
-
-static gint ett_bittorrent              = -1;
-static gint ett_bittorrent_msg          = -1;
-static gint ett_peer_id                 = -1;
+static int proto_bittorrent;
+
+/* static gint hf_bittorrent_field_length; */
+static gint hf_bittorrent_prot_name_len;
+static gint hf_bittorrent_prot_name;
+static gint hf_bittorrent_reserved;
+static gint hf_bittorrent_sha1_hash;
+static gint hf_bittorrent_peer_id;
+static gint hf_bittorrent_msg;
+static gint hf_bittorrent_msg_len;
+static gint hf_bittorrent_msg_type;
+static gint hf_azureus_msg;
+static gint hf_azureus_msg_type_len;
+static gint hf_azureus_msg_type;
+static gint hf_azureus_msg_prio;
+static gint hf_bittorrent_bitfield_data;
+static gint hf_bittorrent_piece_index;
+static gint hf_bittorrent_piece_begin;
+static gint hf_bittorrent_piece_length;
+static gint hf_bittorrent_piece_data;
+static gint hf_azureus_jpc_addrlen;
+static gint hf_azureus_jpc_addr;
+static gint hf_azureus_jpc_port;
+static gint hf_azureus_jpc_session;
+static gint hf_bittorrent_port;
+static gint hf_bittorrent_extended_id;
+static gint hf_bittorrent_extended;
+static gint hf_bittorrent_continuous_data;
+static gint hf_bittorrent_version;
+
+static gint ett_bittorrent;
+static gint ett_bittorrent_msg;
+static gint ett_peer_id;
 
 static gboolean bittorrent_desegment      = TRUE;
 static gboolean decode_client_information = FALSE;
diff --git a/epan/dissectors/packet-bjnp.c b/epan/dissectors/packet-bjnp.c
index 329e361dc3..377bf90bb4 100644
--- a/epan/dissectors/packet-bjnp.c
+++ b/epan/dissectors/packet-bjnp.c
@@ -37,17 +37,17 @@
 void proto_register_bjnp(void);
 void proto_reg_handoff_bjnp(void);
 
-static int proto_bjnp = -1;
+static int proto_bjnp;
 
-static int hf_bjnp_id = -1;
-static int hf_dev_type = -1;
-static int hf_cmd_code = -1;
-static int hf_seq_no = -1;
-static int hf_session_id = -1;
-static int hf_payload_len = -1;
-static int hf_payload = -1;
+static int hf_bjnp_id;
+static int hf_dev_type;
+static int hf_cmd_code;
+static int hf_seq_no;
+static int hf_session_id;
+static int hf_payload_len;
+static int hf_payload;
 
-static gint ett_bjnp = -1;
+static gint ett_bjnp;
 
 static dissector_handle_t bjnp_handle;
 
diff --git a/epan/dissectors/packet-blip.c b/epan/dissectors/packet-blip.c
index 6159abb4a4..2692c0cae2 100644
--- a/epan/dissectors/packet-blip.c
+++ b/epan/dissectors/packet-blip.c
@@ -69,18 +69,18 @@ typedef struct
 
 // File level variables
 static dissector_handle_t blip_handle;
-static int proto_blip = -1;
-static int hf_blip_message_number = -1;
-static int hf_blip_frame_flags = -1;
-static int hf_blip_properties_length = -1;
-static int hf_blip_properties = -1;
-static int hf_blip_message_body = -1;
-static int hf_blip_ack_size = -1;
-static int hf_blip_checksum = -1;
-
-static gint ett_blip = -1;
-
-static expert_field ei_blip_decompress_buffer_error = EI_INIT;
+static int proto_blip;
+static int hf_blip_message_number;
+static int hf_blip_frame_flags;
+static int hf_blip_properties_length;
+static int hf_blip_properties;
+static int hf_blip_message_body;
+static int hf_blip_ack_size;
+static int hf_blip_checksum;
+
+static gint ett_blip;
+
+static expert_field ei_blip_decompress_buffer_error;
 
 // Compressed = 0x08
 // Urgent	  = 0x10
diff --git a/epan/dissectors/packet-bluecom.c b/epan/dissectors/packet-bluecom.c
index e21f0e516b..edefba1167 100644
--- a/epan/dissectors/packet-bluecom.c
+++ b/epan/dissectors/packet-bluecom.c
@@ -73,74 +73,74 @@ void proto_register_bluecom(void);
 static dissector_handle_t bcp_handle;
 static dissector_table_t bcp_subdissector_table;
 
-static gint proto_bcp = -1;
-static gint ett_bcp = -1;
-static gint ett_bcp_header = -1;
-static gint ett_bcp_blockheader = -1;
-static gint ett_bcp_data = -1;
+static gint proto_bcp;
+static gint ett_bcp;
+static gint ett_bcp_header;
+static gint ett_bcp_blockheader;
+static gint ett_bcp_data;
 
 /* protocol data id */
-static gint hf_bcp_hdr_version = -1;
-static gint hf_bcp_hdr_format = -1;
-static gint hf_bcp_hdr_protflags = -1;
-static gint hf_bcp_hdr_blocknb = -1;
-static gint hf_bcp_hdr_segcode = -1;
-static gint hf_bcp_hdr_auth = -1;
-static gint hf_bcp_hdr_sourceid = -1;
-static gint hf_bcp_hdr_destid = -1;
-static gint hf_bcp_hdr_transid = -1;
-static gint hf_bcp_hdr_cmd = -1;
-static gint hf_bcp_hdr_slavestate = -1;
-static gint hf_bcp_hdr_blockflags = -1;
-static gint hf_bcp_hdr_len = -1;
-static gint hf_bcp_hdr_timestamp = -1;
-static gint hf_bcp_hdr_fragoffset = -1;
-
-static gint hf_bcp_sync_starttime = -1;
-static gint hf_bcp_sync_cycletime = -1;
-static gint hf_bcp_sync_dataratio = -1;
-static gint hf_bcp_sync_identify = -1;
-static gint hf_bcp_sync_vlantag = -1;
-static gint hf_bcp_sync_ethaddr = -1;
-static gint hf_bcp_sync_ethaddr2 = -1;
-
-static gint hf_bcp_identify_error = -1;
-static gint hf_bcp_identify_starttime = -1;
-static gint hf_bcp_identify_ipaddr = -1;
-static gint hf_bcp_identify_name = -1;
-static gint hf_bcp_identify_ethaddr = -1;
-static gint hf_bcp_identify_ethaddr2 = -1;
-
-static gint hf_bcp_searchreq_addrtype = -1;
-static gint hf_bcp_searchreq_reserved = -1;
-static gint hf_bcp_searchreq_name = -1;
-static gint hf_bcp_searchreq_ipaddrfirst = -1;
-static gint hf_bcp_searchreq_ipaddrlast = -1;
-static gint hf_bcp_searchreq_addrdata = -1;
-
-static gint hf_bcp_searchrsp_error = -1;
-static gint hf_bcp_searchrsp_starttime = -1;
-static gint hf_bcp_searchrsp_lenin = -1;
-static gint hf_bcp_searchrsp_lenout = -1;
-static gint hf_bcp_searchrsp_ipaddr = -1;
-static gint hf_bcp_searchrsp_name = -1;
-static gint hf_bcp_searchrsp_ethaddr = -1;
-static gint hf_bcp_searchrsp_ethaddr2 = -1;
-
-static gint hf_bcp_connectreq_lenin = -1;
-static gint hf_bcp_connectreq_lenout = -1;
-static gint hf_bcp_connectreq_cycletime = -1;
-static gint hf_bcp_connectreq_offlinefactor = -1;
-static gint hf_bcp_connectreq_ipaddr = -1;
-static gint hf_bcp_connectreq_name = -1;
-static gint hf_bcp_connectreq_ethaddr = -1;
-static gint hf_bcp_connectreq_ethaddr2 = -1;
-
-static gint hf_bcp_connectrsp_error = -1;
-static gint hf_bcp_connectrsp_lenin = -1;
-static gint hf_bcp_connectrsp_lenout = -1;
-
-static gint hf_bcp_userdata = -1;
+static gint hf_bcp_hdr_version;
+static gint hf_bcp_hdr_format;
+static gint hf_bcp_hdr_protflags;
+static gint hf_bcp_hdr_blocknb;
+static gint hf_bcp_hdr_segcode;
+static gint hf_bcp_hdr_auth;
+static gint hf_bcp_hdr_sourceid;
+static gint hf_bcp_hdr_destid;
+static gint hf_bcp_hdr_transid;
+static gint hf_bcp_hdr_cmd;
+static gint hf_bcp_hdr_slavestate;
+static gint hf_bcp_hdr_blockflags;
+static gint hf_bcp_hdr_len;
+static gint hf_bcp_hdr_timestamp;
+static gint hf_bcp_hdr_fragoffset;
+
+static gint hf_bcp_sync_starttime;
+static gint hf_bcp_sync_cycletime;
+static gint hf_bcp_sync_dataratio;
+static gint hf_bcp_sync_identify;
+static gint hf_bcp_sync_vlantag;
+static gint hf_bcp_sync_ethaddr;
+static gint hf_bcp_sync_ethaddr2;
+
+static gint hf_bcp_identify_error;
+static gint hf_bcp_identify_starttime;
+static gint hf_bcp_identify_ipaddr;
+static gint hf_bcp_identify_name;
+static gint hf_bcp_identify_ethaddr;
+static gint hf_bcp_identify_ethaddr2;
+
+static gint hf_bcp_searchreq_addrtype;
+static gint hf_bcp_searchreq_reserved;
+static gint hf_bcp_searchreq_name;
+static gint hf_bcp_searchreq_ipaddrfirst;
+static gint hf_bcp_searchreq_ipaddrlast;
+static gint hf_bcp_searchreq_addrdata;
+
+static gint hf_bcp_searchrsp_error;
+static gint hf_bcp_searchrsp_starttime;
+static gint hf_bcp_searchrsp_lenin;
+static gint hf_bcp_searchrsp_lenout;
+static gint hf_bcp_searchrsp_ipaddr;
+static gint hf_bcp_searchrsp_name;
+static gint hf_bcp_searchrsp_ethaddr;
+static gint hf_bcp_searchrsp_ethaddr2;
+
+static gint hf_bcp_connectreq_lenin;
+static gint hf_bcp_connectreq_lenout;
+static gint hf_bcp_connectreq_cycletime;
+static gint hf_bcp_connectreq_offlinefactor;
+static gint hf_bcp_connectreq_ipaddr;
+static gint hf_bcp_connectreq_name;
+static gint hf_bcp_connectreq_ethaddr;
+static gint hf_bcp_connectreq_ethaddr2;
+
+static gint hf_bcp_connectrsp_error;
+static gint hf_bcp_connectrsp_lenin;
+static gint hf_bcp_connectrsp_lenout;
+
+static gint hf_bcp_userdata;
 
 /* command defines */
 static const value_string bcp_cmds[] = {
diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c
index 8866c2307c..b7ae063964 100644
--- a/epan/dissectors/packet-bluetooth.c
+++ b/epan/dissectors/packet-bluetooth.c
@@ -35,18 +35,18 @@ static dissector_handle_t bluetooth_bthci_handle;
 static dissector_handle_t bluetooth_btmon_handle;
 static dissector_handle_t bluetooth_usb_handle;
 
-int proto_bluetooth = -1;
+int proto_bluetooth;
 
-static int hf_bluetooth_src = -1;
-static int hf_bluetooth_dst = -1;
-static int hf_bluetooth_addr = -1;
-static int hf_bluetooth_src_str = -1;
-static int hf_bluetooth_dst_str = -1;
-static int hf_bluetooth_addr_str = -1;
+static int hf_bluetooth_src;
+static int hf_bluetooth_dst;
+static int hf_bluetooth_addr;
+static int hf_bluetooth_src_str;
+static int hf_bluetooth_dst_str;
+static int hf_bluetooth_addr_str;
 
-static int hf_llc_bluetooth_pid = -1;
+static int hf_llc_bluetooth_pid;
 
-static gint ett_bluetooth = -1;
+static gint ett_bluetooth;
 
 static dissector_handle_t btle_handle;
 static dissector_handle_t hci_usb_handle;
@@ -5088,13 +5088,13 @@ proto_reg_handoff_bluetooth(void)
 /* TODO: Add UUID128 verion of UUID16; UUID32? UUID16? */
 }
 
-static int proto_btad_apple_ibeacon = -1;
+static int proto_btad_apple_ibeacon;
 
-static int hf_btad_apple_ibeacon_uuid128 = -1;
-static int hf_btad_apple_ibeacon_major = -1;
-static int hf_btad_apple_ibeacon_minor = -1;
+static int hf_btad_apple_ibeacon_uuid128;
+static int hf_btad_apple_ibeacon_major;
+static int hf_btad_apple_ibeacon_minor;
 
-static gint ett_btad_apple_ibeacon = -1;
+static gint ett_btad_apple_ibeacon;
 
 static dissector_handle_t btad_apple_ibeacon;
 
@@ -5163,14 +5163,14 @@ proto_reg_handoff_btad_apple_ibeacon(void)
 }
 
 
-static int proto_btad_alt_beacon = -1;
+static int proto_btad_alt_beacon;
 
-static int hf_btad_alt_beacon_code = -1;
-static int hf_btad_alt_beacon_id = -1;
-static int hf_btad_alt_beacon_reference_rssi = -1;
-static int hf_btad_alt_beacon_manufacturer_data = -1;
+static int hf_btad_alt_beacon_code;
+static int hf_btad_alt_beacon_id;
+static int hf_btad_alt_beacon_reference_rssi;
+static int hf_btad_alt_beacon_manufacturer_data;
 
-static gint ett_btad_alt_beacon = -1;
+static gint ett_btad_alt_beacon;
 
 static dissector_handle_t btad_alt_beacon;
 
@@ -5245,12 +5245,12 @@ proto_reg_handoff_btad_alt_beacon(void)
     dissector_add_for_decode_as("btcommon.eir_ad.manufacturer_company_id", btad_alt_beacon);
 }
 
-static int proto_btad_gaen = -1;
+static int proto_btad_gaen;
 
-static int hf_btad_gaen_rpi128 = -1;
-static int hf_btad_gaen_aemd32 = -1;
+static int hf_btad_gaen_rpi128;
+static int hf_btad_gaen_aemd32;
 
-static gint ett_btad_gaen = -1;
+static gint ett_btad_gaen;
 
 static dissector_handle_t btad_gaen;
 
diff --git a/epan/dissectors/packet-bmc.c b/epan/dissectors/packet-bmc.c
index ea2c195282..5c3d805cd1 100644
--- a/epan/dissectors/packet-bmc.c
+++ b/epan/dissectors/packet-bmc.c
@@ -24,22 +24,22 @@ static int dissect_bmc_cbs_message     (tvbuff_t *tvb, packet_info *pinfo, proto
 static int dissect_bmc_schedule_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 static int dissect_bmc_cbs41_message   (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 
-static int proto_bmc = -1;
-static int hf_bmc_message_type = -1;
-static int hf_bmc_message_id = -1;
-static int hf_bmc_serial_number = -1;
-/* static int hf_bmc_data_coding_scheme = -1; */
-/* static int hf_bmc_cb_data = -1; */
-static int hf_bmc_offset_to_begin_ctch_bs_index = -1;
-static int hf_bmc_length_of_cbs_schedule_period = -1;
-static int hf_bmc_new_message_bitmap = -1;
-static int hf_bmc_message_description_type = -1;
-static int hf_bmc_offset_to_ctch_bs_index_of_first_transmission = -1;
-static int hf_bmc_broadcast_address = -1;
-static int hf_bmc_cb_data41 = -1;
-static int hf_bmc_future_extension_bitmap = -1;
-static int hf_bmc_length_of_serial_number_list = -1;
-static int hf_bmc_ctch_bs_index = -1;
+static int proto_bmc;
+static int hf_bmc_message_type;
+static int hf_bmc_message_id;
+static int hf_bmc_serial_number;
+/* static int hf_bmc_data_coding_scheme; */
+/* static int hf_bmc_cb_data; */
+static int hf_bmc_offset_to_begin_ctch_bs_index;
+static int hf_bmc_length_of_cbs_schedule_period;
+static int hf_bmc_new_message_bitmap;
+static int hf_bmc_message_description_type;
+static int hf_bmc_offset_to_ctch_bs_index_of_first_transmission;
+static int hf_bmc_broadcast_address;
+static int hf_bmc_cb_data41;
+static int hf_bmc_future_extension_bitmap;
+static int hf_bmc_length_of_serial_number_list;
+static int hf_bmc_ctch_bs_index;
 
 #define MESSAGE_TYPE_CBS_MESSAGE        1
 #define MESSAGE_TYPE_SCHEDULE_MESSAGE   2
@@ -65,8 +65,8 @@ static const value_string message_description_type_vals[] = {
     {0, NULL}
 };
 
-static gint ett_bmc = -1;
-static gint ett_bmc_message_description = -1;
+static gint ett_bmc;
+static gint ett_bmc_message_description;
 
 static int
 dissect_bmc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
diff --git a/epan/dissectors/packet-bmp.c b/epan/dissectors/packet-bmp.c
index fb8d1ec081..55907e92e7 100644
--- a/epan/dissectors/packet-bmp.c
+++ b/epan/dissectors/packet-bmp.c
@@ -271,190 +271,190 @@ static const value_string route_mirroring_information_typevals[] = {
 };
 
 
-static int proto_bmp = -1;
+static int proto_bmp;
 
 /* BMP Common Header field */
-static int hf_bmp_version = -1;
-static int hf_bmp_length = -1;
-static int hf_bmp_type = -1;
+static int hf_bmp_version;
+static int hf_bmp_length;
+static int hf_bmp_type;
 
 /* BMP Unused Bytes field */
-static int hf_bmp_unused = -1;
+static int hf_bmp_unused;
 
 /* BMP Initiation Header field */
-static int hf_init_types = -1;
-static int hf_init_type = -1;
-static int hf_init_length = -1;
-static int hf_init_info = -1;
+static int hf_init_types;
+static int hf_init_type;
+static int hf_init_length;
+static int hf_init_info;
 
 /* BMP Per Peer Header field */
-static int hf_peer_header = -1;
-static int hf_peer_type = -1;
-static int hf_peer_flags = -1;
-static int hf_peer_flags_ipv6 = -1;
-static int hf_peer_flags_post_policy = -1;
-static int hf_peer_flags_as_path = -1;
-static int hf_peer_flags_adj_rib_out = -1;
-static int hf_peer_flags_res = -1;
-static int hf_peer_flags_loc_rib = -1;
-static int hf_peer_flags_loc_rib_res = -1;
-static int hf_peer_distinguisher = -1;
-static int hf_peer_ipv4_address = -1;
-static int hf_peer_ipv6_address = -1;
-static int hf_peer_asn = -1;
-static int hf_peer_bgp_id = -1;
-static int hf_peer_timestamp_sec = -1;
-static int hf_peer_timestamp_msec = -1;
-
-static int hf_peer_route_mirroring_type = -1;
-static int hf_peer_route_mirroring_length = -1;
-static int hf_peer_route_mirroring_code = -1;
+static int hf_peer_header;
+static int hf_peer_type;
+static int hf_peer_flags;
+static int hf_peer_flags_ipv6;
+static int hf_peer_flags_post_policy;
+static int hf_peer_flags_as_path;
+static int hf_peer_flags_adj_rib_out;
+static int hf_peer_flags_res;
+static int hf_peer_flags_loc_rib;
+static int hf_peer_flags_loc_rib_res;
+static int hf_peer_distinguisher;
+static int hf_peer_ipv4_address;
+static int hf_peer_ipv6_address;
+static int hf_peer_asn;
+static int hf_peer_bgp_id;
+static int hf_peer_timestamp_sec;
+static int hf_peer_timestamp_msec;
+
+static int hf_peer_route_mirroring_type;
+static int hf_peer_route_mirroring_length;
+static int hf_peer_route_mirroring_code;
 
 /* BMP Peer Up Notification field */
-static int hf_peer_up_ipv4_address = -1;
-static int hf_peer_up_ipv6_address = -1;
-static int hf_peer_up_local_port = -1;
-static int hf_peer_up_remote_port = -1;
-
-static int hf_peer_state_tlv = -1;
-static int hf_peer_state_tlv_type = -1;
-static int hf_peer_state_tlv_length = -1;
-static int hf_peer_state_tlv_value = -1;
-static int hf_peer_state_tlv_vrf_table_name = -1;
-static int hf_peer_up_tlv_string = -1;
-static int hf_peer_up_tlv_sys_name = -1;
-static int hf_peer_up_tlv_sys_descr = -1;
-static int hf_peer_up_tlv_admin_label = -1;
+static int hf_peer_up_ipv4_address;
+static int hf_peer_up_ipv6_address;
+static int hf_peer_up_local_port;
+static int hf_peer_up_remote_port;
+
+static int hf_peer_state_tlv;
+static int hf_peer_state_tlv_type;
+static int hf_peer_state_tlv_length;
+static int hf_peer_state_tlv_value;
+static int hf_peer_state_tlv_vrf_table_name;
+static int hf_peer_up_tlv_string;
+static int hf_peer_up_tlv_sys_name;
+static int hf_peer_up_tlv_sys_descr;
+static int hf_peer_up_tlv_admin_label;
 
 /* BMP Peer Down Notification field */
-static int hf_peer_down_reason = -1;
-static int hf_peer_down_data = -1;
+static int hf_peer_down_reason;
+static int hf_peer_down_data;
 
 /* BMP Stat Reports field */
-static int hf_stats_count = -1;
-static int hf_stat_type = -1;
-static int hf_stat_len = -1;
-static int hf_stat_data = -1;
-static int hf_stat_data_prefix_rej = -1;
-static int hf_stat_data_prefix_dup = -1;
-static int hf_stat_data_withdraw_dup = -1;
-static int hf_stat_data_cluster_loop = -1;
-static int hf_stat_data_as_loop = -1;
-static int hf_stat_data_inv_originator = -1;
-static int hf_stat_data_as_confed_loop = -1;
-static int hf_stat_data_routes_adj_rib_in = -1;
-static int hf_stat_data_routes_loc_rib = -1;
-static int hf_stat_data_routes_per_adj_rib_in_afi = -1;
-static int hf_stat_data_routes_per_adj_rib_in_safi = -1;
-static int hf_stat_data_routes_per_adj_rib_in = -1;
-static int hf_stat_data_routes_per_loc_rib_afi = -1;
-static int hf_stat_data_routes_per_loc_rib_safi = -1;
-static int hf_stat_data_routes_per_loc_rib = -1;
-static int hf_stat_data_update_treat = -1;
-static int hf_stat_data_prefixes_treat = -1;
-static int hf_stat_data_duplicate_update = -1;
-static int hf_stat_data_routes_pre_adj_rib_out = -1;
-static int hf_stat_data_routes_post_adj_rib_out = -1;
-static int hf_stat_data_routes_pre_per_adj_rib_out_afi = -1;
-static int hf_stat_data_routes_pre_per_adj_rib_out_safi = -1;
-static int hf_stat_data_routes_pre_per_adj_rib_out = -1;
-static int hf_stat_data_routes_post_per_adj_rib_out_afi = -1;
-static int hf_stat_data_routes_post_per_adj_rib_out_safi = -1;
-static int hf_stat_data_routes_post_per_adj_rib_out = -1;
+static int hf_stats_count;
+static int hf_stat_type;
+static int hf_stat_len;
+static int hf_stat_data;
+static int hf_stat_data_prefix_rej;
+static int hf_stat_data_prefix_dup;
+static int hf_stat_data_withdraw_dup;
+static int hf_stat_data_cluster_loop;
+static int hf_stat_data_as_loop;
+static int hf_stat_data_inv_originator;
+static int hf_stat_data_as_confed_loop;
+static int hf_stat_data_routes_adj_rib_in;
+static int hf_stat_data_routes_loc_rib;
+static int hf_stat_data_routes_per_adj_rib_in_afi;
+static int hf_stat_data_routes_per_adj_rib_in_safi;
+static int hf_stat_data_routes_per_adj_rib_in;
+static int hf_stat_data_routes_per_loc_rib_afi;
+static int hf_stat_data_routes_per_loc_rib_safi;
+static int hf_stat_data_routes_per_loc_rib;
+static int hf_stat_data_update_treat;
+static int hf_stat_data_prefixes_treat;
+static int hf_stat_data_duplicate_update;
+static int hf_stat_data_routes_pre_adj_rib_out;
+static int hf_stat_data_routes_post_adj_rib_out;
+static int hf_stat_data_routes_pre_per_adj_rib_out_afi;
+static int hf_stat_data_routes_pre_per_adj_rib_out_safi;
+static int hf_stat_data_routes_pre_per_adj_rib_out;
+static int hf_stat_data_routes_post_per_adj_rib_out_afi;
+static int hf_stat_data_routes_post_per_adj_rib_out_safi;
+static int hf_stat_data_routes_post_per_adj_rib_out;
 
 /* BMP Termination field */
-static int hf_term_types = -1;
-static int hf_term_type = -1;
-static int hf_term_len = -1;
-static int hf_term_info = -1;
-static int hf_term_reason = -1;
+static int hf_term_types;
+static int hf_term_type;
+static int hf_term_len;
+static int hf_term_info;
+static int hf_term_reason;
 
 /* BMP Route Policy */
-static int hf_route_policy_flags = -1;
-static int hf_route_policy_flags_ipv6 = -1;
-static int hf_route_policy_flags_res = -1;
-static int hf_route_policy_rd = -1;
-static int hf_route_policy_prefix_length = -1;
-static int hf_route_policy_prefix_ipv4 = -1;
-static int hf_route_policy_prefix_reserved = -1;
-static int hf_route_policy_prefix_ipv6 = -1;
-static int hf_route_policy_route_origin = -1;
-static int hf_route_policy_event_count = -1;
-static int hf_route_policy_total_event_length = -1;
-static int hf_route_policy_single_event_length = -1;
-static int hf_route_policy_event_index = -1;
-static int hf_route_policy_timestamp_sec = -1;
-static int hf_route_policy_timestamp_msec = -1;
-static int hf_route_policy_path_identifier = -1;
-static int hf_route_policy_afi  = -1;
-static int hf_route_policy_safi  = -1;
-static int hf_route_policy_tlv  = -1;
-static int hf_route_policy_tlv_type  = -1;
-static int hf_route_policy_tlv_length  = -1;
-static int hf_route_policy_tlv_value  = -1;
-static int hf_route_policy_tlv_vrf_table_id  = -1;
-static int hf_route_policy_tlv_vrf_table_name = -1;
-static int hf_route_policy_tlv_policy_flags = -1;
-static int hf_route_policy_tlv_policy_flags_m  = -1;
-static int hf_route_policy_tlv_policy_flags_p = -1;
-static int hf_route_policy_tlv_policy_flags_d = -1;
-static int hf_route_policy_tlv_policy_flags_res = -1;
-static int hf_route_policy_tlv_policy_count = -1;
-static int hf_route_policy_tlv_policy_class = -1;
-static int hf_route_policy_tlv_policy_peer_ipv4 = -1;
-static int hf_route_policy_tlv_policy_peer_ipv6 = -1;
-static int hf_route_policy_tlv_policy_peer_reserved = -1;
-static int hf_route_policy_tlv_policy_peer_router_id = -1;
-static int hf_route_policy_tlv_policy_peer_as = -1;
-static int hf_route_policy_tlv_policy = -1;
-static int hf_route_policy_tlv_policy_name_length = -1;
-static int hf_route_policy_tlv_policy_item_id_length = -1;
-static int hf_route_policy_tlv_policy_name = -1;
-static int hf_route_policy_tlv_policy_item_id = -1;
-static int hf_route_policy_tlv_policy_flag = -1;
-static int hf_route_policy_tlv_policy_flag_c = -1;
-static int hf_route_policy_tlv_policy_flag_r = -1;
-static int hf_route_policy_tlv_policy_flag_res2 = -1;
-
-static int hf_route_policy_tlv_string  = -1;
-
-static int hf_bmpv4_tlv = -1;
-static int hf_bmpv4_tlv_type = -1;
-static int hf_bmpv4_tlv_length = -1;
-static int hf_bmpv4_tlv_index = -1;
-static int hf_bmpv4_tlv_value_bytes = -1;
-static int hf_bmpv4_tlv_value_string = -1;
-static int hf_bmpv4_tlv_value_bool = -1;
-static int hf_bmpv4_tlv_value_index = -1;
-static int hf_bmpv4_tlv_group_id = -1;
-
-static gint ett_bmp = -1;
-static gint ett_bmp_route_monitoring = -1;
-static gint ett_bmp_stat_report = -1;
-static gint ett_bmp_stat_type = -1;
-static gint ett_bmp_peer_down = -1;
-static gint ett_bmp_peer_up = -1;
-static gint ett_bmp_peer_state_tlv = -1;
-static gint ett_bmp_peer_header = -1;
-static gint ett_bmp_peer_flags = -1;
-static gint ett_bmp_init = -1;
-static gint ett_bmp_init_types = -1;
-static gint ett_bmp_init_type = -1;
-static gint ett_bmp_term = -1;
-static gint ett_bmp_term_type = -1;
-static gint ett_bmp_term_types = -1;
-static gint ett_bmp_route_mirroring = -1;
-static gint ett_bmp_route_policy_flags = -1;
-static gint ett_bmp_route_policy_tlv = -1;
-static gint ett_bmp_route_policy_tlv_policy_flags = -1;
-static gint ett_bmp_route_policy_tlv_policy = -1;
-static gint ett_bmpv4_tlv = -1;
-static gint ett_bmpv4_tlv_value = -1;
-
-static expert_field ei_stat_data_unknown = EI_INIT;
-static expert_field ei_bmpv4_tlv_wrong_cap_size = EI_INIT;
-static expert_field ei_bmpv4_tlv_wrong_cap_value = EI_INIT;
-static expert_field ei_bmpv4_tlv_string_bad_length = EI_INIT;
+static int hf_route_policy_flags;
+static int hf_route_policy_flags_ipv6;
+static int hf_route_policy_flags_res;
+static int hf_route_policy_rd;
+static int hf_route_policy_prefix_length;
+static int hf_route_policy_prefix_ipv4;
+static int hf_route_policy_prefix_reserved;
+static int hf_route_policy_prefix_ipv6;
+static int hf_route_policy_route_origin;
+static int hf_route_policy_event_count;
+static int hf_route_policy_total_event_length;
+static int hf_route_policy_single_event_length;
+static int hf_route_policy_event_index;
+static int hf_route_policy_timestamp_sec;
+static int hf_route_policy_timestamp_msec;
+static int hf_route_policy_path_identifier;
+static int hf_route_policy_afi;
+static int hf_route_policy_safi;
+static int hf_route_policy_tlv;
+static int hf_route_policy_tlv_type;
+static int hf_route_policy_tlv_length;
+static int hf_route_policy_tlv_value;
+static int hf_route_policy_tlv_vrf_table_id;
+static int hf_route_policy_tlv_vrf_table_name;
+static int hf_route_policy_tlv_policy_flags;
+static int hf_route_policy_tlv_policy_flags_m;
+static int hf_route_policy_tlv_policy_flags_p;
+static int hf_route_policy_tlv_policy_flags_d;
+static int hf_route_policy_tlv_policy_flags_res;
+static int hf_route_policy_tlv_policy_count;
+static int hf_route_policy_tlv_policy_class;
+static int hf_route_policy_tlv_policy_peer_ipv4;
+static int hf_route_policy_tlv_policy_peer_ipv6;
+static int hf_route_policy_tlv_policy_peer_reserved;
+static int hf_route_policy_tlv_policy_peer_router_id;
+static int hf_route_policy_tlv_policy_peer_as;
+static int hf_route_policy_tlv_policy;
+static int hf_route_policy_tlv_policy_name_length;
+static int hf_route_policy_tlv_policy_item_id_length;
+static int hf_route_policy_tlv_policy_name;
+static int hf_route_policy_tlv_policy_item_id;
+static int hf_route_policy_tlv_policy_flag;
+static int hf_route_policy_tlv_policy_flag_c;
+static int hf_route_policy_tlv_policy_flag_r;
+static int hf_route_policy_tlv_policy_flag_res2;
+
+static int hf_route_policy_tlv_string;
+
+static int hf_bmpv4_tlv;
+static int hf_bmpv4_tlv_type;
+static int hf_bmpv4_tlv_length;
+static int hf_bmpv4_tlv_index;
+static int hf_bmpv4_tlv_value_bytes;
+static int hf_bmpv4_tlv_value_string;
+static int hf_bmpv4_tlv_value_bool;
+static int hf_bmpv4_tlv_value_index;
+static int hf_bmpv4_tlv_group_id;
+
+static gint ett_bmp;
+static gint ett_bmp_route_monitoring;
+static gint ett_bmp_stat_report;
+static gint ett_bmp_stat_type;
+static gint ett_bmp_peer_down;
+static gint ett_bmp_peer_up;
+static gint ett_bmp_peer_state_tlv;
+static gint ett_bmp_peer_header;
+static gint ett_bmp_peer_flags;
+static gint ett_bmp_init;
+static gint ett_bmp_init_types;
+static gint ett_bmp_init_type;
+static gint ett_bmp_term;
+static gint ett_bmp_term_type;
+static gint ett_bmp_term_types;
+static gint ett_bmp_route_mirroring;
+static gint ett_bmp_route_policy_flags;
+static gint ett_bmp_route_policy_tlv;
+static gint ett_bmp_route_policy_tlv_policy_flags;
+static gint ett_bmp_route_policy_tlv_policy;
+static gint ett_bmpv4_tlv;
+static gint ett_bmpv4_tlv_value;
+
+static expert_field ei_stat_data_unknown;
+static expert_field ei_bmpv4_tlv_wrong_cap_size;
+static expert_field ei_bmpv4_tlv_wrong_cap_value;
+static expert_field ei_bmpv4_tlv_string_bad_length;
 
 static dissector_handle_t bmp_handle;
 static dissector_handle_t dissector_bgp;
diff --git a/epan/dissectors/packet-bofl.c b/epan/dissectors/packet-bofl.c
index 35f3122df8..a7098c7bc6 100644
--- a/epan/dissectors/packet-bofl.c
+++ b/epan/dissectors/packet-bofl.c
@@ -70,13 +70,13 @@ void proto_reg_handoff_bofl(void);
 static dissector_handle_t bofl_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_bofl       = -1;
-static int hf_bofl_pdu      = -1;
-static int hf_bofl_sequence = -1;
-static int hf_bofl_padding  = -1;
+static int proto_bofl;
+static int hf_bofl_pdu;
+static int hf_bofl_sequence;
+static int hf_bofl_padding;
 
 /* Initialize the subtree pointers */
-static gint ett_bofl = -1;
+static gint ett_bofl;
 
 /* Code to actually dissect the packets */
 static int
diff --git a/epan/dissectors/packet-bootparams.c b/epan/dissectors/packet-bootparams.c
index cde7b35195..5766293dd2 100644
--- a/epan/dissectors/packet-bootparams.c
+++ b/epan/dissectors/packet-bootparams.c
@@ -24,17 +24,17 @@
 void proto_register_bootparams(void);
 void proto_reg_handoff_bootparams(void);
 
-static int proto_bootparams = -1;
-static int hf_bootparams_procedure_v1 = -1;
-static int hf_bootparams_host = -1;
-static int hf_bootparams_domain = -1;
-static int hf_bootparams_fileid = -1;
-static int hf_bootparams_filepath = -1;
-static int hf_bootparams_hostaddr = -1;
-static int hf_bootparams_routeraddr = -1;
-static int hf_bootparams_addresstype = -1;
-
-static gint ett_bootparams = -1;
+static int proto_bootparams;
+static int hf_bootparams_procedure_v1;
+static int hf_bootparams_host;
+static int hf_bootparams_domain;
+static int hf_bootparams_fileid;
+static int hf_bootparams_filepath;
+static int hf_bootparams_hostaddr;
+static int hf_bootparams_routeraddr;
+static int hf_bootparams_addresstype;
+
+static gint ett_bootparams;
 
 
 static const value_string addr_type[] =
diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c
index 734e9831bf..4e745c918d 100644
--- a/epan/dissectors/packet-bpdu.c
+++ b/epan/dissectors/packet-bpdu.c
@@ -91,94 +91,94 @@
 void proto_register_bpdu(void);
 void proto_reg_handoff_bpdu(void);
 
-static int proto_bpdu = -1;
-static int hf_bpdu_proto_id = -1;
-static int hf_bpdu_version_id = -1;
-static int hf_bpdu_type = -1;
-static int hf_bpdu_flags = -1;
-static int hf_bpdu_flags_tcack = -1;
-static int hf_bpdu_flags_agreement = -1;
-static int hf_bpdu_flags_forwarding = -1;
-static int hf_bpdu_flags_learning = -1;
-static int hf_bpdu_flags_port_role = -1;
-static int hf_bpdu_flags_proposal = -1;
-static int hf_bpdu_flags_tc = -1;
-static int hf_bpdu_root_prio = -1;
-static int hf_bpdu_root_sys_id_ext = -1;
-static int hf_bpdu_root_mac = -1;
-static int hf_bpdu_root_cost = -1;
-static int hf_bpdu_bridge_prio = -1;
-static int hf_bpdu_bridge_sys_id_ext = -1;
-static int hf_bpdu_bridge_mac = -1;
-static int hf_bpdu_port_id = -1;
-static int hf_bpdu_msg_age = -1;
-static int hf_bpdu_max_age = -1;
-static int hf_bpdu_hello_time = -1;
-static int hf_bpdu_forward_delay = -1;
-static int hf_bpdu_version_1_length = -1;
-static int hf_bpdu_version_3_length = -1;
-static int hf_bpdu_mst_config_format_selector = -1;
-static int hf_bpdu_mst_config_name = -1;
-static int hf_bpdu_mst_config_revision_level = -1;
-static int hf_bpdu_mst_config_digest = -1;
-static int hf_bpdu_cist_internal_root_path_cost = -1;
-static int hf_bpdu_cist_bridge_prio = -1;
-static int hf_bpdu_cist_bridge_sys_id_ext = -1;
-static int hf_bpdu_cist_bridge_mac = -1;
-static int hf_bpdu_cist_remaining_hops = -1;
-static int hf_bpdu_msti_flags = -1;
-static int hf_bpdu_msti_id = -1;
-static int hf_bpdu_msti_id_FFF = -1;
-static int hf_bpdu_mst_priority = -1;
-static int hf_bpdu_msti_regional_root_id = -1;
-static int hf_bpdu_msti_regional_root_mac = -1;
-static int hf_bpdu_msti_internal_root_path_cost = -1;
-static int hf_bpdu_msti_bridge_identifier_priority = -1;
-static int hf_bpdu_msti_port_identifier_priority = -1;
-static int hf_bpdu_msti_port_id = -1;
-static int hf_bpdu_msti_bridge_id = -1;
-static int hf_bpdu_msti_bridge_id_priority = -1;
-static int hf_bpdu_msti_bridge_id_mac = -1;
-static int hf_bpdu_msti_remaining_hops = -1;
-static int hf_bpdu_version_4_length = -1;
-static int hf_bpdu_spt_config_format_selector = -1;
-static int hf_bpdu_spt_config_name = -1;
-static int hf_bpdu_spt_config_revision_level = -1;
-static int hf_bpdu_spt_config_digest = -1;
-static int hf_bpdu_flags_agree_num = -1;
-static int hf_bpdu_flags_dagree_num = -1;
-static int hf_bpdu_flags_agree_valid = -1;
-static int hf_bpdu_flags_restricted_role = -1;
-static int hf_bpdu_spt_agreement_digest = -1;
-static int hf_bpdu_agreement_digest_format_id = -1;
-static int hf_bpdu_agreement_digest_format_capabilities = -1;
-static int hf_bpdu_agreement_digest_convention_id = -1;
-static int hf_bpdu_agreement_digest_convention_capabilities = -1;
-static int hf_bpdu_agreement_digest_edge_count = -1;
-
-static int hf_bpdu_pvst_tlvtype = -1;
-static int hf_bpdu_pvst_tlvlength = -1;
-static int hf_bpdu_pvst_tlvvalue = -1;
-static int hf_bpdu_pvst_tlv_origvlan = -1;
-
-static gint ett_bpdu = -1;
-static gint ett_bpdu_flags = -1;
-static gint ett_root_id = -1;
-static gint ett_bridge_id = -1;
-static gint ett_mstp = -1;
-static gint ett_msti = -1;
-static gint ett_cist_bridge_id = -1;
-static gint ett_spt = -1;
-static gint ett_aux_mcid = -1;
-static gint ett_agreement = -1;
-static gint ett_bpdu_pvst_tlv = -1;
-
-static expert_field ei_pvst_tlv_length_invalid = EI_INIT;
-static expert_field ei_pvst_tlv_origvlan_missing = EI_INIT;
-static expert_field ei_pvst_tlv_truncated = EI_INIT;
-static expert_field ei_pvst_tlv_unknown = EI_INIT;
-static expert_field ei_bpdu_type = EI_INIT;
-static expert_field ei_bpdu_version_support = EI_INIT;
+static int proto_bpdu;
+static int hf_bpdu_proto_id;
+static int hf_bpdu_version_id;
+static int hf_bpdu_type;
+static int hf_bpdu_flags;
+static int hf_bpdu_flags_tcack;
+static int hf_bpdu_flags_agreement;
+static int hf_bpdu_flags_forwarding;
+static int hf_bpdu_flags_learning;
+static int hf_bpdu_flags_port_role;
+static int hf_bpdu_flags_proposal;
+static int hf_bpdu_flags_tc;
+static int hf_bpdu_root_prio;
+static int hf_bpdu_root_sys_id_ext;
+static int hf_bpdu_root_mac;
+static int hf_bpdu_root_cost;
+static int hf_bpdu_bridge_prio;
+static int hf_bpdu_bridge_sys_id_ext;
+static int hf_bpdu_bridge_mac;
+static int hf_bpdu_port_id;
+static int hf_bpdu_msg_age;
+static int hf_bpdu_max_age;
+static int hf_bpdu_hello_time;
+static int hf_bpdu_forward_delay;
+static int hf_bpdu_version_1_length;
+static int hf_bpdu_version_3_length;
+static int hf_bpdu_mst_config_format_selector;
+static int hf_bpdu_mst_config_name;
+static int hf_bpdu_mst_config_revision_level;
+static int hf_bpdu_mst_config_digest;
+static int hf_bpdu_cist_internal_root_path_cost;
+static int hf_bpdu_cist_bridge_prio;
+static int hf_bpdu_cist_bridge_sys_id_ext;
+static int hf_bpdu_cist_bridge_mac;
+static int hf_bpdu_cist_remaining_hops;
+static int hf_bpdu_msti_flags;
+static int hf_bpdu_msti_id;
+static int hf_bpdu_msti_id_FFF;
+static int hf_bpdu_mst_priority;
+static int hf_bpdu_msti_regional_root_id;
+static int hf_bpdu_msti_regional_root_mac;
+static int hf_bpdu_msti_internal_root_path_cost;
+static int hf_bpdu_msti_bridge_identifier_priority;
+static int hf_bpdu_msti_port_identifier_priority;
+static int hf_bpdu_msti_port_id;
+static int hf_bpdu_msti_bridge_id;
+static int hf_bpdu_msti_bridge_id_priority;
+static int hf_bpdu_msti_bridge_id_mac;
+static int hf_bpdu_msti_remaining_hops;
+static int hf_bpdu_version_4_length;
+static int hf_bpdu_spt_config_format_selector;
+static int hf_bpdu_spt_config_name;
+static int hf_bpdu_spt_config_revision_level;
+static int hf_bpdu_spt_config_digest;
+static int hf_bpdu_flags_agree_num;
+static int hf_bpdu_flags_dagree_num;
+static int hf_bpdu_flags_agree_valid;
+static int hf_bpdu_flags_restricted_role;
+static int hf_bpdu_spt_agreement_digest;
+static int hf_bpdu_agreement_digest_format_id;
+static int hf_bpdu_agreement_digest_format_capabilities;
+static int hf_bpdu_agreement_digest_convention_id;
+static int hf_bpdu_agreement_digest_convention_capabilities;
+static int hf_bpdu_agreement_digest_edge_count;
+
+static int hf_bpdu_pvst_tlvtype;
+static int hf_bpdu_pvst_tlvlength;
+static int hf_bpdu_pvst_tlvvalue;
+static int hf_bpdu_pvst_tlv_origvlan;
+
+static gint ett_bpdu;
+static gint ett_bpdu_flags;
+static gint ett_root_id;
+static gint ett_bridge_id;
+static gint ett_mstp;
+static gint ett_msti;
+static gint ett_cist_bridge_id;
+static gint ett_spt;
+static gint ett_aux_mcid;
+static gint ett_agreement;
+static gint ett_bpdu_pvst_tlv;
+
+static expert_field ei_pvst_tlv_length_invalid;
+static expert_field ei_pvst_tlv_origvlan_missing;
+static expert_field ei_pvst_tlv_truncated;
+static expert_field ei_pvst_tlv_unknown;
+static expert_field ei_bpdu_type;
+static expert_field ei_bpdu_version_support;
 
 
 static gboolean bpdu_use_system_id_extensions = TRUE;
diff --git a/epan/dissectors/packet-bpq.c b/epan/dissectors/packet-bpq.c
index 3f72de54c2..bef1260c77 100644
--- a/epan/dissectors/packet-bpq.c
+++ b/epan/dissectors/packet-bpq.c
@@ -39,10 +39,10 @@ static dissector_handle_t ax25_handle;
 
 static capture_dissector_handle_t ax25_cap_handle;
 
-static int proto_bpq            = -1;
-static int hf_bpq_len		= -1;
+static int proto_bpq;
+static int hf_bpq_len;
 
-static gint ett_bpq = -1;
+static gint ett_bpq;
 
 static int
 dissect_bpq( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data _U_ )
diff --git a/epan/dissectors/packet-bpsec.c b/epan/dissectors/packet-bpsec.c
index 03a1bb2196..5b1cca3e6d 100644
--- a/epan/dissectors/packet-bpsec.c
+++ b/epan/dissectors/packet-bpsec.c
@@ -33,7 +33,7 @@ void proto_reg_handoff_bpsec(void);
 //static const char *LOG_DOMAIN = "bpsec";
 
 /// Protocol handles
-static int proto_bpsec = -1;
+static int proto_bpsec;
 
 /// Dissect opaque CBOR data
 static dissector_handle_t handle_cbor = NULL;
@@ -54,34 +54,34 @@ static const val64_string aesvar_vals[] = {
     {0, NULL},
 };
 
-static int hf_bib = -1;
-static int hf_bcb = -1;
-static int hf_asb_target_list = -1;
-static int hf_asb_target = -1;
-static int hf_asb_ctxid = -1;
-static int hf_asb_flags = -1;
-static int hf_asb_flags_has_params = -1;
-static int hf_asb_secsrc_nodeid = -1;
-static int hf_asb_secsrc_uri = -1;
-static int hf_asb_param_list = -1;
-static int hf_asb_param_pair = -1;
-static int hf_asb_param_id = -1;
-static int hf_asb_result_all_list = -1;
-static int hf_asb_result_tgt_list = -1;
-static int hf_asb_result_tgt_ref = -1;
-static int hf_asb_result_pair = -1;
-static int hf_asb_result_id = -1;
-
-static int hf_defaultsc_shavar = -1;
-static int hf_defaultsc_wrapedkey = -1;
-static int hf_defaultsc_scope = -1;
-static int hf_defaultsc_scope_pri_block = -1;
-static int hf_defaultsc_scope_tgt_head = -1;
-static int hf_defaultsc_scope_sec_head = -1;
-static int hf_defaultsc_hmac = -1;
-static int hf_defaultsc_iv = -1;
-static int hf_defaultsc_aesvar = -1;
-static int hf_defaultsc_authtag = -1;
+static int hf_bib;
+static int hf_bcb;
+static int hf_asb_target_list;
+static int hf_asb_target;
+static int hf_asb_ctxid;
+static int hf_asb_flags;
+static int hf_asb_flags_has_params;
+static int hf_asb_secsrc_nodeid;
+static int hf_asb_secsrc_uri;
+static int hf_asb_param_list;
+static int hf_asb_param_pair;
+static int hf_asb_param_id;
+static int hf_asb_result_all_list;
+static int hf_asb_result_tgt_list;
+static int hf_asb_result_tgt_ref;
+static int hf_asb_result_pair;
+static int hf_asb_result_id;
+
+static int hf_defaultsc_shavar;
+static int hf_defaultsc_wrapedkey;
+static int hf_defaultsc_scope;
+static int hf_defaultsc_scope_pri_block;
+static int hf_defaultsc_scope_tgt_head;
+static int hf_defaultsc_scope_sec_head;
+static int hf_defaultsc_hmac;
+static int hf_defaultsc_iv;
+static int hf_defaultsc_aesvar;
+static int hf_defaultsc_authtag;
 
 /// Field definitions
 static hf_register_info fields[] = {
@@ -127,15 +127,15 @@ static int *const defaultsc_scope[] = {
     NULL
 };
 
-static int ett_asb = -1;
-static int ett_asb_flags = -1;
-static int ett_tgt_list = -1;
-static int ett_param_list = -1;
-static int ett_param_pair = -1;
-static int ett_result_all_list = -1;
-static int ett_result_tgt_list = -1;
-static int ett_result_pair = -1;
-static int ett_defaultsc_scope = -1;
+static int ett_asb;
+static int ett_asb_flags;
+static int ett_tgt_list;
+static int ett_param_list;
+static int ett_param_pair;
+static int ett_result_all_list;
+static int ett_result_tgt_list;
+static int ett_result_pair;
+static int ett_defaultsc_scope;
 /// Tree structures
 static int *ett[] = {
     &ett_asb,
@@ -149,11 +149,11 @@ static int *ett[] = {
     &ett_defaultsc_scope,
 };
 
-static expert_field ei_secsrc_diff = EI_INIT;
-static expert_field ei_ctxid_zero = EI_INIT;
-static expert_field ei_ctxid_priv = EI_INIT;
-static expert_field ei_target_invalid = EI_INIT;
-static expert_field ei_value_partial_decode = EI_INIT;
+static expert_field ei_secsrc_diff;
+static expert_field ei_ctxid_zero;
+static expert_field ei_ctxid_priv;
+static expert_field ei_target_invalid;
+static expert_field ei_value_partial_decode;
 static ei_register_info expertitems[] = {
     {&ei_secsrc_diff, {"bpsec.secsrc_diff", PI_SECURITY, PI_CHAT, "BPSec Security Source different from bundle Source", EXPFILL}},
     {&ei_ctxid_zero, {"bpsec.ctxid_zero", PI_SECURITY, PI_WARN, "BPSec Security Context ID zero is reserved", EXPFILL}},
diff --git a/epan/dissectors/packet-bpv6.c b/epan/dissectors/packet-bpv6.c
index ed53a6774d..39c19a22c6 100644
--- a/epan/dissectors/packet-bpv6.c
+++ b/epan/dissectors/packet-bpv6.c
@@ -67,197 +67,197 @@ static int add_sdnv_time_to_tree(proto_tree *tree, tvbuff_t *tvb, int offset, in
 static gint64
 evaluate_sdnv_64(tvbuff_t *tvb, int offset, int *bytecount);
 
-static int proto_bundle = -1;
+static int proto_bundle;
 static dissector_handle_t bundle_handle = NULL;
 static dissector_handle_t bpv6_handle = NULL;
 static dissector_handle_t bpv7_handle = NULL;
 
-static int hf_bundle_pdu_version = -1;
+static int hf_bundle_pdu_version;
 
 /* Primary Header Processing Flag Variables */
-static int hf_bundle_procflags = -1;
-static int hf_bundle_procflags_fragment = -1;
-static int hf_bundle_procflags_admin = -1;
-static int hf_bundle_procflags_dont_fragment = -1;
-static int hf_bundle_procflags_cust_xfer_req = -1;
-static int hf_bundle_procflags_dest_singleton = -1;
-static int hf_bundle_procflags_application_ack = -1;
+static int hf_bundle_procflags;
+static int hf_bundle_procflags_fragment;
+static int hf_bundle_procflags_admin;
+static int hf_bundle_procflags_dont_fragment;
+static int hf_bundle_procflags_cust_xfer_req;
+static int hf_bundle_procflags_dest_singleton;
+static int hf_bundle_procflags_application_ack;
 
 /* Additions for Version 5 */
-static int hf_bundle_control_flags = -1;
-static int hf_bundle_procflags_general = -1;
-static int hf_bundle_procflags_cos = -1;
-static int hf_bundle_procflags_status = -1;
+static int hf_bundle_control_flags;
+static int hf_bundle_procflags_general;
+static int hf_bundle_procflags_cos;
+static int hf_bundle_procflags_status;
 
 /* Primary Header COS Flag Variables */
-static int hf_bundle_cosflags = -1;
-static int hf_bundle_cosflags_priority = -1;
+static int hf_bundle_cosflags;
+static int hf_bundle_cosflags_priority;
 
 /* Primary Header Status Report Request Flag Variables */
-static int hf_bundle_srrflags = -1;
-static int hf_bundle_srrflags_report_receipt = -1;
-static int hf_bundle_srrflags_report_cust_accept = -1;
-static int hf_bundle_srrflags_report_forward = -1;
-static int hf_bundle_srrflags_report_delivery = -1;
-static int hf_bundle_srrflags_report_deletion = -1;
-static int hf_bundle_srrflags_report_ack = -1;
+static int hf_bundle_srrflags;
+static int hf_bundle_srrflags_report_receipt;
+static int hf_bundle_srrflags_report_cust_accept;
+static int hf_bundle_srrflags_report_forward;
+static int hf_bundle_srrflags_report_delivery;
+static int hf_bundle_srrflags_report_deletion;
+static int hf_bundle_srrflags_report_ack;
 
 /* Primary Header Fields*/
-static int hf_bundle_primary_header_len = -1;
-static int hf_bundle_primary_dictionary_len = -1;
-static int hf_bundle_primary_timestamp = -1;
-static int hf_bundle_primary_fragment_offset = -1;
-static int hf_bundle_primary_total_adu_len = -1;
-static int hf_bundle_primary_timestamp_seq_num64 = -1;
-static int hf_bundle_primary_timestamp_seq_num32 = -1;
-
-static int hf_bundle_dest_scheme_offset_u16 = -1;
-static int hf_bundle_dest_scheme_offset_i32 = -1;
-static int hf_bundle_dest_ssp_offset_u16 = -1;
-static int hf_bundle_dest_ssp_offset_i32 = -1;
-static int hf_bundle_source_scheme_offset_u16 = -1;
-static int hf_bundle_source_scheme_offset_i32 = -1;
-static int hf_bundle_source_ssp_offset_u16 = -1;
-static int hf_bundle_source_ssp_offset_i32 = -1;
-static int hf_bundle_report_scheme_offset_u16 = -1;
-static int hf_bundle_report_scheme_offset_i32 = -1;
-static int hf_bundle_report_ssp_offset_u16 = -1;
-static int hf_bundle_report_ssp_offset_i32 = -1;
-static int hf_bundle_cust_scheme_offset_u16 = -1;
-static int hf_bundle_cust_scheme_offset_i32 = -1;
-static int hf_bundle_cust_ssp_offset_u16 = -1;
-static int hf_bundle_cust_ssp_offset_i32 = -1;
+static int hf_bundle_primary_header_len;
+static int hf_bundle_primary_dictionary_len;
+static int hf_bundle_primary_timestamp;
+static int hf_bundle_primary_fragment_offset;
+static int hf_bundle_primary_total_adu_len;
+static int hf_bundle_primary_timestamp_seq_num64;
+static int hf_bundle_primary_timestamp_seq_num32;
+
+static int hf_bundle_dest_scheme_offset_u16;
+static int hf_bundle_dest_scheme_offset_i32;
+static int hf_bundle_dest_ssp_offset_u16;
+static int hf_bundle_dest_ssp_offset_i32;
+static int hf_bundle_source_scheme_offset_u16;
+static int hf_bundle_source_scheme_offset_i32;
+static int hf_bundle_source_ssp_offset_u16;
+static int hf_bundle_source_ssp_offset_i32;
+static int hf_bundle_report_scheme_offset_u16;
+static int hf_bundle_report_scheme_offset_i32;
+static int hf_bundle_report_ssp_offset_u16;
+static int hf_bundle_report_ssp_offset_i32;
+static int hf_bundle_cust_scheme_offset_u16;
+static int hf_bundle_cust_scheme_offset_i32;
+static int hf_bundle_cust_ssp_offset_u16;
+static int hf_bundle_cust_ssp_offset_i32;
 
 /* Dictionary EIDs */
-static int hf_bundle_dest_scheme = -1;
-static int hf_bundle_dest_ssp = -1;
-static int hf_bundle_source_scheme = -1;
-static int hf_bundle_source_ssp = -1;
-static int hf_bundle_report_scheme = -1;
-static int hf_bundle_report_ssp = -1;
-static int hf_bundle_custodian_scheme = -1;
-static int hf_bundle_custodian_ssp = -1;
+static int hf_bundle_dest_scheme;
+static int hf_bundle_dest_ssp;
+static int hf_bundle_source_scheme;
+static int hf_bundle_source_ssp;
+static int hf_bundle_report_scheme;
+static int hf_bundle_report_ssp;
+static int hf_bundle_custodian_scheme;
+static int hf_bundle_custodian_ssp;
 
 /* Remaining Primary Header Fields */
-static int hf_bundle_creation_timestamp = -1;
-static int hf_bundle_lifetime = -1;
-static int hf_bundle_lifetime_sdnv = -1;
+static int hf_bundle_creation_timestamp;
+static int hf_bundle_lifetime;
+static int hf_bundle_lifetime_sdnv;
 
 /* Secondary Header Processing Flag Variables */
-static int hf_bundle_payload_length = -1;
-static int hf_bundle_payload_header_type = -1;
-static int hf_bundle_payload_data = -1;
-static int hf_bundle_payload_flags = -1;
-static int hf_bundle_payload_flags_replicate_hdr = -1;
-static int hf_bundle_payload_flags_xmit_report = -1;
-static int hf_bundle_payload_flags_discard_on_fail = -1;
-static int hf_bundle_payload_flags_last_header = -1;
+static int hf_bundle_payload_length;
+static int hf_bundle_payload_header_type;
+static int hf_bundle_payload_data;
+static int hf_bundle_payload_flags;
+static int hf_bundle_payload_flags_replicate_hdr;
+static int hf_bundle_payload_flags_xmit_report;
+static int hf_bundle_payload_flags_discard_on_fail;
+static int hf_bundle_payload_flags_last_header;
 
 /* Block Processing Control Flag Variables (Version 5) */
-static int hf_block_control_flags = -1;
-static int hf_block_control_flags_sdnv = -1;
-static int hf_block_control_replicate = -1;
-static int hf_block_control_transmit_status = -1;
-static int hf_block_control_delete_bundle = -1;
-static int hf_block_control_last_block = -1;
-static int hf_block_control_discard_block = -1;
-static int hf_block_control_not_processed = -1;
-static int hf_block_control_eid_reference = -1;
-static int hf_block_control_block_length = -1;
-static int hf_block_control_block_cteb_custody_id = -1;
-static int hf_block_control_block_cteb_creator_custodian_eid = -1;
+static int hf_block_control_flags;
+static int hf_block_control_flags_sdnv;
+static int hf_block_control_replicate;
+static int hf_block_control_transmit_status;
+static int hf_block_control_delete_bundle;
+static int hf_block_control_last_block;
+static int hf_block_control_discard_block;
+static int hf_block_control_not_processed;
+static int hf_block_control_eid_reference;
+static int hf_block_control_block_length;
+static int hf_block_control_block_cteb_custody_id;
+static int hf_block_control_block_cteb_creator_custodian_eid;
 
 /* Non-Primary Block Type Code Variable */
-static int hf_bundle_block_type_code = -1;
-static int hf_bundle_unprocessed_block_data = -1;
+static int hf_bundle_block_type_code;
+static int hf_bundle_unprocessed_block_data;
 
 /* ECOS Flag Variables */
-static int hf_ecos_flags = -1;
-static int hf_ecos_flags_critical = -1;
-static int hf_ecos_flags_streaming = -1;
-static int hf_ecos_flags_flowlabel = -1;
-static int hf_ecos_flags_reliable = -1;
-static int hf_ecos_flow_label = -1;
+static int hf_ecos_flags;
+static int hf_ecos_flags_critical;
+static int hf_ecos_flags_streaming;
+static int hf_ecos_flags_flowlabel;
+static int hf_ecos_flags_reliable;
+static int hf_ecos_flow_label;
 
-static int hf_ecos_ordinal = -1;
+static int hf_ecos_ordinal;
 
 /* Administrative Record Variables */
-static int hf_bundle_admin_record_type = -1;
-static int hf_bundle_admin_record_fragment = -1;
-static int hf_bundle_admin_statflags = -1;
-static int hf_bundle_admin_rcvd = -1;
-static int hf_bundle_admin_accepted = -1;
-static int hf_bundle_admin_forwarded = -1;
-static int hf_bundle_admin_delivered = -1;
-static int hf_bundle_admin_deleted = -1;
-static int hf_bundle_admin_acked = -1;
-static int hf_bundle_admin_fragment_offset = -1;
-static int hf_bundle_admin_fragment_length = -1;
-static int hf_bundle_admin_timestamp_seq_num64 = -1;
-static int hf_bundle_admin_timestamp_seq_num32 = -1;
-static int hf_bundle_admin_endpoint_length = -1;
-static int hf_bundle_admin_endpoint_id = -1;
-
-static int hf_bundle_admin_receipt_time = -1;
-static int hf_bundle_admin_accept_time = -1;
-static int hf_bundle_admin_forward_time = -1;
-static int hf_bundle_admin_delivery_time = -1;
-static int hf_bundle_admin_delete_time = -1;
-static int hf_bundle_admin_ack_time = -1;
-static int hf_bundle_admin_timestamp_copy = -1;
-static int hf_bundle_admin_signal_time = -1;
-static int hf_bundle_status_report_reason_code = -1;
-static int hf_bundle_custody_trf_succ_flg = -1;
-static int hf_bundle_custody_signal_reason = -1;
-static int hf_bundle_custody_id_range_start = -1;
-static int hf_bundle_custody_id_range_end = -1;
-
-static int hf_bundle_age_extension_block_code = -1;
-static int hf_bundle_block_previous_hop_scheme = -1;
-static int hf_bundle_block_previous_hop_eid = -1;
+static int hf_bundle_admin_record_type;
+static int hf_bundle_admin_record_fragment;
+static int hf_bundle_admin_statflags;
+static int hf_bundle_admin_rcvd;
+static int hf_bundle_admin_accepted;
+static int hf_bundle_admin_forwarded;
+static int hf_bundle_admin_delivered;
+static int hf_bundle_admin_deleted;
+static int hf_bundle_admin_acked;
+static int hf_bundle_admin_fragment_offset;
+static int hf_bundle_admin_fragment_length;
+static int hf_bundle_admin_timestamp_seq_num64;
+static int hf_bundle_admin_timestamp_seq_num32;
+static int hf_bundle_admin_endpoint_length;
+static int hf_bundle_admin_endpoint_id;
+
+static int hf_bundle_admin_receipt_time;
+static int hf_bundle_admin_accept_time;
+static int hf_bundle_admin_forward_time;
+static int hf_bundle_admin_delivery_time;
+static int hf_bundle_admin_delete_time;
+static int hf_bundle_admin_ack_time;
+static int hf_bundle_admin_timestamp_copy;
+static int hf_bundle_admin_signal_time;
+static int hf_bundle_status_report_reason_code;
+static int hf_bundle_custody_trf_succ_flg;
+static int hf_bundle_custody_signal_reason;
+static int hf_bundle_custody_id_range_start;
+static int hf_bundle_custody_id_range_end;
+
+static int hf_bundle_age_extension_block_code;
+static int hf_bundle_block_previous_hop_scheme;
+static int hf_bundle_block_previous_hop_eid;
 
 /* Security Block Variables */
-static int hf_bundle_target_block_type = -1;
-static int hf_bundle_target_block_occurrence = -1;
-static int hf_bundle_ciphersuite_type = -1;
-static int hf_bundle_ciphersuite_flags = -1;
-static int hf_block_ciphersuite_params = -1;
-static int hf_block_ciphersuite_params_length = -1;
-static int hf_block_ciphersuite_params_item_length = -1;
-static int hf_block_ciphersuite_param_type = -1;
-static int hf_block_ciphersuite_param_data = -1;
-static int hf_block_ciphersuite_result_length = -1;
-static int hf_block_ciphersuite_result_item_length = -1;
-static int hf_block_ciphersuite_result_type = -1;
-static int hf_block_ciphersuite_result_data = -1;
-static int hf_block_ciphersuite_range_offset = -1;
-static int hf_block_ciphersuite_range_length = -1;
+static int hf_bundle_target_block_type;
+static int hf_bundle_target_block_occurrence;
+static int hf_bundle_ciphersuite_type;
+static int hf_bundle_ciphersuite_flags;
+static int hf_block_ciphersuite_params;
+static int hf_block_ciphersuite_params_length;
+static int hf_block_ciphersuite_params_item_length;
+static int hf_block_ciphersuite_param_type;
+static int hf_block_ciphersuite_param_data;
+static int hf_block_ciphersuite_result_length;
+static int hf_block_ciphersuite_result_item_length;
+static int hf_block_ciphersuite_result_type;
+static int hf_block_ciphersuite_result_data;
+static int hf_block_ciphersuite_range_offset;
+static int hf_block_ciphersuite_range_length;
 
 /* Tree Node Variables */
-static gint ett_bundle = -1;
-static gint ett_bundle_hdr = -1;
-static gint ett_primary_hdr = -1;
-static gint ett_proc_flags = -1;
-static gint ett_gen_flags = -1;
-static gint ett_cos_flags = -1;
-static gint ett_srr_flags = -1;
-static gint ett_dictionary = -1;
-static gint ett_payload_hdr = -1;
-static gint ett_payload_flags = -1;
-static gint ett_block_flags = -1;
-static gint ett_admin_record = -1;
-static gint ett_admin_rec_status = -1;
-static gint ett_metadata_hdr = -1;
-static gint ett_sec_block_param_data = -1;
-
-static expert_field ei_bundle_payload_length = EI_INIT;
-static expert_field ei_bundle_control_flags_length = EI_INIT;
-static expert_field ei_bundle_block_control_flags = EI_INIT;
-static expert_field ei_bundle_sdnv_length = EI_INIT;
-static expert_field ei_bundle_timestamp_seq_num = EI_INIT;
-static expert_field ei_bundle_offset_error = EI_INIT;
-static expert_field ei_block_control_block_cteb_invalid = EI_INIT;
-static expert_field ei_block_control_block_cteb_valid = EI_INIT;
+static gint ett_bundle;
+static gint ett_bundle_hdr;
+static gint ett_primary_hdr;
+static gint ett_proc_flags;
+static gint ett_gen_flags;
+static gint ett_cos_flags;
+static gint ett_srr_flags;
+static gint ett_dictionary;
+static gint ett_payload_hdr;
+static gint ett_payload_flags;
+static gint ett_block_flags;
+static gint ett_admin_record;
+static gint ett_admin_rec_status;
+static gint ett_metadata_hdr;
+static gint ett_sec_block_param_data;
+
+static expert_field ei_bundle_payload_length;
+static expert_field ei_bundle_control_flags_length;
+static expert_field ei_bundle_block_control_flags;
+static expert_field ei_bundle_sdnv_length;
+static expert_field ei_bundle_timestamp_seq_num;
+static expert_field ei_bundle_offset_error;
+static expert_field ei_block_control_block_cteb_invalid;
+static expert_field ei_block_control_block_cteb_valid;
 
 
 typedef struct dictionary_data {
diff --git a/epan/dissectors/packet-bpv7.c b/epan/dissectors/packet-bpv7.c
index f0ea84698a..eaa8ca55b3 100644
--- a/epan/dissectors/packet-bpv7.c
+++ b/epan/dissectors/packet-bpv7.c
@@ -46,11 +46,11 @@ static gboolean bp_reassemble_payload = TRUE;
 static gboolean bp_payload_try_heur = FALSE;
 
 /// Protocol handles
-static int proto_bp = -1;
+static int proto_bp;
 static int bp_tap = -1;
-static int proto_blocktype = -1;
-static int proto_bp_admin = -1;
-static int proto_admintype = -1;
+static int proto_blocktype;
+static int proto_bp_admin;
+static int proto_admintype;
 /// Protocol-level data
 static bp_history_t *bp_history = NULL;
 
@@ -140,110 +140,110 @@ enum {
     PROTO_DATA_BUNDLE = 1,
 };
 
-static int hf_bundle_head = -1;
-static int hf_bundle_break = -1;
-static int hf_block = -1;
-
-static int hf_crc_type = -1;
-static int hf_crc_field_uint16 = -1;
-static int hf_crc_field_uint32 = -1;
-static int hf_crc_status = -1;
-
-static int hf_time_dtntime = -1;
-static int hf_time_utctime = -1;
-
-static int hf_create_ts_time = -1;
-static int hf_create_ts_seqno = -1;
-
-static int hf_eid_scheme = -1;
-static int hf_eid_dtn_ssp_code = -1;
-static int hf_eid_dtn_ssp_text = -1;
-static int hf_eid_ipn_node = -1;
-static int hf_eid_ipn_service = -1;
-static int hf_eid_dtn_wkssp = -1;
-static int hf_eid_dtn_serv = -1;
-
-static int hf_primary_version = -1;
-static int hf_primary_bundle_flags = -1;
-static int hf_primary_bundle_flags_deletion_report = -1;
-static int hf_primary_bundle_flags_delivery_report = -1;
-static int hf_primary_bundle_flags_forwarding_report = -1;
-static int hf_primary_bundle_flags_reception_report = -1;
-static int hf_primary_bundle_flags_req_status_time = -1;
-static int hf_primary_bundle_flags_user_app_ack = -1;
-static int hf_primary_bundle_flags_no_fragment = -1;
-static int hf_primary_bundle_flags_payload_admin = -1;
-static int hf_primary_bundle_flags_is_fragment = -1;
-static int hf_primary_dst_eid = -1;
-static int hf_primary_dst_uri = -1;
-static int hf_primary_src_nodeid = -1;
-static int hf_primary_src_uri = -1;
-static int hf_primary_srcdst_uri = -1;
-static int hf_primary_report_nodeid = -1;
-static int hf_primary_report_uri = -1;
-static int hf_primary_create_ts = -1;
-static int hf_primary_lifetime = -1;
-static int hf_primary_lifetime_exp = -1;
-static int hf_primary_expire_ts = -1;
-static int hf_primary_frag_offset = -1;
-static int hf_primary_total_length = -1;
-
-static int hf_bundle_ident = -1;
-static int hf_bundle_first_seen = -1;
-static int hf_bundle_retrans_seen = -1;
-static int hf_bundle_seen_time_diff = -1;
-static int hf_bundle_dst_dtn_srv = -1;
-static int hf_bundle_dst_ipn_srv = -1;
-static int hf_bundle_status_ref = -1;
-
-static int hf_canonical_type_code = -1;
-static int hf_canonical_block_num = -1;
-static int hf_canonical_block_flags = -1;
-static int hf_canonical_block_flags_delete_no_process = -1;
-static int hf_canonical_block_flags_status_no_process = -1;
-static int hf_canonical_block_flags_remove_no_process = -1;
-static int hf_canonical_block_flags_replicate_in_fragment = -1;
-static int hf_canonical_data_size = -1;
-static int hf_canonical_data = -1;
-
-static int hf_previous_node_nodeid = -1;
-static int hf_previous_node_uri = -1;
-static int hf_bundle_age_time = -1;
-static int hf_hop_count_limit = -1;
-static int hf_hop_count_current = -1;
-
-static int hf_admin_record_type = -1;
-static int hf_status_rep = -1;
-static int hf_status_rep_status_info = -1;
-static int hf_status_assert_val = -1;
-static int hf_status_assert_time = -1;
-static int hf_status_rep_received = -1;
-static int hf_status_rep_forwarded = -1;
-static int hf_status_rep_delivered = -1;
-static int hf_status_rep_deleted = -1;
-static int hf_status_rep_reason_code = -1;
-static int hf_status_rep_subj_src_nodeid = -1;
-static int hf_status_rep_subj_src_uri = -1;
-static int hf_status_rep_subj_ts = -1;
-static int hf_status_rep_subj_frag_offset = -1;
-static int hf_status_rep_subj_payload_len = -1;
-static int hf_status_rep_subj_ident = -1;
-static int hf_status_rep_subj_ref = -1;
-static int hf_status_time_diff = -1;
-
-static int hf_payload_fragments = -1;
-static int hf_payload_fragment = -1;
-static int hf_payload_fragment_overlap = -1;
-static int hf_payload_fragment_overlap_conflicts = -1;
-static int hf_payload_fragment_multiple_tails = -1;
-static int hf_payload_fragment_too_long_fragment = -1;
-static int hf_payload_fragment_error = -1;
-static int hf_payload_fragment_count = -1;
-static int hf_payload_reassembled_in = -1;
-static int hf_payload_reassembled_length = -1;
-static int hf_payload_reassembled_data = -1;
-static gint ett_payload_fragment = -1;
-static gint ett_payload_fragments = -1;
+static int hf_bundle_head;
+static int hf_bundle_break;
+static int hf_block;
+
+static int hf_crc_type;
+static int hf_crc_field_uint16;
+static int hf_crc_field_uint32;
+static int hf_crc_status;
+
+static int hf_time_dtntime;
+static int hf_time_utctime;
+
+static int hf_create_ts_time;
+static int hf_create_ts_seqno;
+
+static int hf_eid_scheme;
+static int hf_eid_dtn_ssp_code;
+static int hf_eid_dtn_ssp_text;
+static int hf_eid_ipn_node;
+static int hf_eid_ipn_service;
+static int hf_eid_dtn_wkssp;
+static int hf_eid_dtn_serv;
+
+static int hf_primary_version;
+static int hf_primary_bundle_flags;
+static int hf_primary_bundle_flags_deletion_report;
+static int hf_primary_bundle_flags_delivery_report;
+static int hf_primary_bundle_flags_forwarding_report;
+static int hf_primary_bundle_flags_reception_report;
+static int hf_primary_bundle_flags_req_status_time;
+static int hf_primary_bundle_flags_user_app_ack;
+static int hf_primary_bundle_flags_no_fragment;
+static int hf_primary_bundle_flags_payload_admin;
+static int hf_primary_bundle_flags_is_fragment;
+static int hf_primary_dst_eid;
+static int hf_primary_dst_uri;
+static int hf_primary_src_nodeid;
+static int hf_primary_src_uri;
+static int hf_primary_srcdst_uri;
+static int hf_primary_report_nodeid;
+static int hf_primary_report_uri;
+static int hf_primary_create_ts;
+static int hf_primary_lifetime;
+static int hf_primary_lifetime_exp;
+static int hf_primary_expire_ts;
+static int hf_primary_frag_offset;
+static int hf_primary_total_length;
+
+static int hf_bundle_ident;
+static int hf_bundle_first_seen;
+static int hf_bundle_retrans_seen;
+static int hf_bundle_seen_time_diff;
+static int hf_bundle_dst_dtn_srv;
+static int hf_bundle_dst_ipn_srv;
+static int hf_bundle_status_ref;
+
+static int hf_canonical_type_code;
+static int hf_canonical_block_num;
+static int hf_canonical_block_flags;
+static int hf_canonical_block_flags_delete_no_process;
+static int hf_canonical_block_flags_status_no_process;
+static int hf_canonical_block_flags_remove_no_process;
+static int hf_canonical_block_flags_replicate_in_fragment;
+static int hf_canonical_data_size;
+static int hf_canonical_data;
+
+static int hf_previous_node_nodeid;
+static int hf_previous_node_uri;
+static int hf_bundle_age_time;
+static int hf_hop_count_limit;
+static int hf_hop_count_current;
+
+static int hf_admin_record_type;
+static int hf_status_rep;
+static int hf_status_rep_status_info;
+static int hf_status_assert_val;
+static int hf_status_assert_time;
+static int hf_status_rep_received;
+static int hf_status_rep_forwarded;
+static int hf_status_rep_delivered;
+static int hf_status_rep_deleted;
+static int hf_status_rep_reason_code;
+static int hf_status_rep_subj_src_nodeid;
+static int hf_status_rep_subj_src_uri;
+static int hf_status_rep_subj_ts;
+static int hf_status_rep_subj_frag_offset;
+static int hf_status_rep_subj_payload_len;
+static int hf_status_rep_subj_ident;
+static int hf_status_rep_subj_ref;
+static int hf_status_time_diff;
+
+static int hf_payload_fragments;
+static int hf_payload_fragment;
+static int hf_payload_fragment_overlap;
+static int hf_payload_fragment_overlap_conflicts;
+static int hf_payload_fragment_multiple_tails;
+static int hf_payload_fragment_too_long_fragment;
+static int hf_payload_fragment_error;
+static int hf_payload_fragment_count;
+static int hf_payload_reassembled_in;
+static int hf_payload_reassembled_length;
+static int hf_payload_reassembled_data;
+static gint ett_payload_fragment;
+static gint ett_payload_fragments;
 
 /// Field definitions
 static hf_register_info fields[] = {
@@ -400,20 +400,20 @@ static int *const block_flags[] = {
     NULL
 };
 
-static int ett_bundle = -1;
-static int ett_bundle_flags = -1;
-static int ett_block = -1;
-static int ett_eid = -1;
-static int ett_time = -1;
-static int ett_create_ts = -1;
-static int ett_ident = -1;
-static int ett_block_flags = -1;
-static int ett_canonical_data = -1;
-static int ett_payload = -1;
-static int ett_admin = -1;
-static int ett_status_rep = -1;
-static int ett_status_info = -1;
-static int ett_status_assert = -1;
+static int ett_bundle;
+static int ett_bundle_flags;
+static int ett_block;
+static int ett_eid;
+static int ett_time;
+static int ett_create_ts;
+static int ett_ident;
+static int ett_block_flags;
+static int ett_canonical_data;
+static int ett_payload;
+static int ett_admin;
+static int ett_status_rep;
+static int ett_status_info;
+static int ett_status_assert;
 /// Tree structures
 static int *ett[] = {
     &ett_bundle,
@@ -455,23 +455,23 @@ static const fragment_items payload_frag_items = {
     "Payload fragments"
 };
 
-static expert_field ei_invalid_framing = EI_INIT;
-static expert_field ei_invalid_bp_version = EI_INIT;
-static expert_field ei_eid_scheme_unknown = EI_INIT;
-static expert_field ei_eid_ssp_type_invalid = EI_INIT;
-static expert_field ei_eid_wkssp_unknown = EI_INIT;
-static expert_field ei_block_type_dupe = EI_INIT;
-static expert_field ei_sub_type_unknown = EI_INIT;
-static expert_field ei_sub_partial_decode = EI_INIT;
-static expert_field ei_crc_type_unknown = EI_INIT;
-static expert_field ei_block_failed_crc = EI_INIT;
-static expert_field ei_block_num_dupe = EI_INIT;
-static expert_field ei_block_payload_index = EI_INIT;
-static expert_field ei_block_payload_num = EI_INIT;
-static expert_field ei_fragment_reassemble_size = EI_INIT;
-static expert_field ei_fragment_tot_mismatch = EI_INIT;
-static expert_field ei_block_sec_bib_tgt = EI_INIT;
-static expert_field ei_block_sec_bcb_tgt = EI_INIT;
+static expert_field ei_invalid_framing;
+static expert_field ei_invalid_bp_version;
+static expert_field ei_eid_scheme_unknown;
+static expert_field ei_eid_ssp_type_invalid;
+static expert_field ei_eid_wkssp_unknown;
+static expert_field ei_block_type_dupe;
+static expert_field ei_sub_type_unknown;
+static expert_field ei_sub_partial_decode;
+static expert_field ei_crc_type_unknown;
+static expert_field ei_block_failed_crc;
+static expert_field ei_block_num_dupe;
+static expert_field ei_block_payload_index;
+static expert_field ei_block_payload_num;
+static expert_field ei_fragment_reassemble_size;
+static expert_field ei_fragment_tot_mismatch;
+static expert_field ei_block_sec_bib_tgt;
+static expert_field ei_block_sec_bcb_tgt;
 static ei_register_info expertitems[] = {
     {&ei_invalid_framing, {"bpv7.invalid_framing", PI_MALFORMED, PI_WARN, "Invalid framing", EXPFILL}},
     {&ei_invalid_bp_version, {"bpv7.invalid_bp_version", PI_MALFORMED, PI_ERROR, "Invalid BP version", EXPFILL}},
diff --git a/epan/dissectors/packet-brcm-tag.c b/epan/dissectors/packet-brcm-tag.c
index 39a95eb307..1be7cf37dd 100644
--- a/epan/dissectors/packet-brcm-tag.c
+++ b/epan/dissectors/packet-brcm-tag.c
@@ -36,19 +36,19 @@ static dissector_handle_t brcm_tag_handle;
 #define BRCM_TAG_MR_SHIFT               4
 #define BRCM_TAG_MO_SHIFT               3
 
-static int proto_brcm_tag               = -1;
-
-static int hf_brcm_tag_opcode           = -1;
-static int hf_brcm_tag_frame_octet_cnt  = -1;
-static int hf_brcm_tag_mr               = -1;
-static int hf_brcm_tag_mo               = -1;
-static int hf_brcm_tag_reserved         = -1;
-static int hf_brcm_tag_dest_dev_id      = -1;
-static int hf_brcm_tag_dest_port_id     = -1;
-static int hf_brcm_tag_src_dev_id       = -1;
-static int hf_brcm_tag_src_port_id      = -1;
-
-static gint ett_brcm_tag                = -1;
+static int proto_brcm_tag;
+
+static int hf_brcm_tag_opcode;
+static int hf_brcm_tag_frame_octet_cnt;
+static int hf_brcm_tag_mr;
+static int hf_brcm_tag_mo;
+static int hf_brcm_tag_reserved;
+static int hf_brcm_tag_dest_dev_id;
+static int hf_brcm_tag_dest_port_id;
+static int hf_brcm_tag_src_dev_id;
+static int hf_brcm_tag_src_port_id;
+
+static gint ett_brcm_tag;
 
 #define TVB_LEN_GREATEST  1
 #define TVB_LEN_UNDEF     0
diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c
index 9f40fda647..d2074d2bb7 100644
--- a/epan/dissectors/packet-brdwlk.c
+++ b/epan/dissectors/packet-brdwlk.c
@@ -64,27 +64,27 @@ static const value_string brdwlk_eof_vals[] = {
     {0, NULL},
 };
 
-static int hf_brdwlk_sof = -1;
-static int hf_brdwlk_eof = -1;
-static int hf_brdwlk_error = -1;
-static int hf_brdwlk_vsan = -1;
-static int hf_brdwlk_pktcnt = -1;
-static int hf_brdwlk_drop = -1;
-static int hf_brdwlk_plen = -1;
-static int hf_brdwlk_error_plp = -1;
-static int hf_brdwlk_error_ef = -1;
-static int hf_brdwlk_error_nd = -1;
-static int hf_brdwlk_error_tr = -1;
-static int hf_brdwlk_error_badcrc = -1;
-static int hf_brdwlk_error_ff = -1;
-static int hf_brdwlk_error_jumbo = -1;
-static int hf_brdwlk_error_ctrl = -1;
+static int hf_brdwlk_sof;
+static int hf_brdwlk_eof;
+static int hf_brdwlk_error;
+static int hf_brdwlk_vsan;
+static int hf_brdwlk_pktcnt;
+static int hf_brdwlk_drop;
+static int hf_brdwlk_plen;
+static int hf_brdwlk_error_plp;
+static int hf_brdwlk_error_ef;
+static int hf_brdwlk_error_nd;
+static int hf_brdwlk_error_tr;
+static int hf_brdwlk_error_badcrc;
+static int hf_brdwlk_error_ff;
+static int hf_brdwlk_error_jumbo;
+static int hf_brdwlk_error_ctrl;
 
 /* Initialize the subtree pointers */
-static gint ett_brdwlk = -1;
-static gint ett_brdwlk_error = -1;
+static gint ett_brdwlk;
+static gint ett_brdwlk_error;
 
-static gint proto_brdwlk = -1;
+static gint proto_brdwlk;
 
 static guint16 packet_count = 0;
 static gboolean first_pkt = TRUE;                /* start of capture */
diff --git a/epan/dissectors/packet-brp.c b/epan/dissectors/packet-brp.c
index 56f85d9549..968584d7be 100644
--- a/epan/dissectors/packet-brp.c
+++ b/epan/dissectors/packet-brp.c
@@ -26,7 +26,7 @@ void proto_reg_handoff_brp(void);
 #define PROTO_TAG_BRP   "BRP"
 
 /* Wireshark ID of the BRP protocol */
-static int proto_brp = -1;
+static int proto_brp;
 
 static dissector_handle_t brp_handle;
 
@@ -80,37 +80,37 @@ static const value_string brp_stat_vals[] = {
 * our data fields; they are filled out when we call
 * proto_register_field_array() in proto_register_brp()
 */
-static gint hf_brp_type = -1;
-static gint hf_brp_trans = -1;
-static gint hf_brp_ver = -1;
-static gint hf_brp_stat = -1;
-static gint hf_brp_srcip = -1;
-static gint hf_brp_dstip = -1;
-static gint hf_brp_dstuport = -1;
-static gint hf_brp_mbz = -1;
-static gint hf_brp_bw = -1;
-static gint hf_brp_life = -1;
-static gint hf_brp_flid = -1;
-static gint hf_brp_rmttl = -1;
-static gint hf_brp_fltype = -1;
+static gint hf_brp_type;
+static gint hf_brp_trans;
+static gint hf_brp_ver;
+static gint hf_brp_stat;
+static gint hf_brp_srcip;
+static gint hf_brp_dstip;
+static gint hf_brp_dstuport;
+static gint hf_brp_mbz;
+static gint hf_brp_bw;
+static gint hf_brp_life;
+static gint hf_brp_flid;
+static gint hf_brp_rmttl;
+static gint hf_brp_fltype;
 
 /* These are the ids of the subtrees that we may be creating */
-static gint ett_brp = -1;
-static gint ett_brp_type = -1;
-static gint ett_brp_trans = -1;
-static gint ett_brp_ver = -1;
-static gint ett_brp_stat = -1;
-static gint ett_brp_srcip = -1;
-static gint ett_brp_dstip = -1;
-static gint ett_brp_dstuport = -1;
-static gint ett_brp_mbz = -1;
-static gint ett_brp_bw = -1;
-static gint ett_brp_life = -1;
-static gint ett_brp_flid = -1;
-static gint ett_brp_rmttl = -1;
-static gint ett_brp_fltype = -1;
-
-static expert_field ei_brp_type_unknown = EI_INIT;
+static gint ett_brp;
+static gint ett_brp_type;
+static gint ett_brp_trans;
+static gint ett_brp_ver;
+static gint ett_brp_stat;
+static gint ett_brp_srcip;
+static gint ett_brp_dstip;
+static gint ett_brp_dstuport;
+static gint ett_brp_mbz;
+static gint ett_brp_bw;
+static gint ett_brp_life;
+static gint ett_brp_flid;
+static gint ett_brp_rmttl;
+static gint ett_brp_fltype;
+
+static expert_field ei_brp_type_unknown;
 
 static int
 dissect_brp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c
index 4e390565e6..949e333e40 100644
--- a/epan/dissectors/packet-bssap.c
+++ b/epan/dissectors/packet-bssap.c
@@ -229,119 +229,119 @@ static const value_string bssap_plus_ie_id_values[] = {
 static value_string_ext bssap_plus_ie_id_values_ext = VALUE_STRING_EXT_INIT(bssap_plus_ie_id_values);
 
 /* Initialize the protocol and registered fields */
-static int proto_bssap = -1;
-static int proto_bsap = -1;
-static int proto_bssap_le = -1;
-static int proto_bssap_plus = -1;
-static int hf_bssap_pdu_type = -1;
-static int hf_bsap_pdu_type = -1;
-static int hf_bssap_dlci_cc = -1;
-static int hf_bsap_dlci_cc = -1;
-static int hf_bssap_dlci_spare = -1;
-static int hf_bsap_dlci_rsvd = -1;
-static int hf_bssap_dlci_sapi = -1;
-static int hf_bsap_dlci_sapi = -1;
-static int hf_bssap_length = -1;
-static int hf_bssap_plus_ie = -1;
-static int hf_bssap_plus_ie_len = -1;
-
-static int hf_bssap_plus_message_type = -1;
-static int hf_bssap_imsi_ie = -1;
-static int hf_bssap_imsi_det_from_gprs_serv_type_ie = -1;
-static int hf_bssap_imsi_det_from_non_gprs_serv_type_ie = -1;
-static int hf_bssap_info_req_ie = -1;
-static int hf_bssap_loc_area_id_ie = -1;
-static int hf_bssap_loc_inf_age_ie = -1;
-static int hf_bssap_mm_information_ie = -1;
-static int hf_bssap_mobile_id_ie = -1;
-static int hf_bssap_mobile_stn_cls_mrk1_ie = -1;
-static int hf_bssap_mobile_station_state_ie = -1;
-static int hf_bssap_ptmsi_ie = -1;
-static int hf_bssap_reject_cause_ie = -1;
-static int hf_bssap_service_area_id_ie = -1;
-static int hf_bssap_sgsn_nr_ie = -1;
-static int hf_bssap_tmsi_ie = -1;
-static int hf_bssap_tmsi_status_ie = -1;
-static int hf_bssap_vlr_number_ie = -1;
-static int hf_bssap_global_cn_id_ie = -1;
-static int hf_bssap_plus_ie_data = -1;
-
-static int hf_bssap_extension = -1;
-static int hf_bssap_type_of_number = -1;
-static int hf_bssap_numbering_plan_id = -1;
-static int hf_bssap_sgsn_number = -1;
-static int hf_bssap_vlr_number = -1;
-static int hf_bssap_call_priority = -1;
-static int hf_bssap_gprs_loc_upd_type_ie = -1;
-static int hf_bssap_Gs_cause_ie = -1;
-static int hf_bssap_imei_ie = -1;
-static int hf_bssap_imeisv_ie = -1;
-static int hf_bssap_cell_global_id_ie = -1;
-static int hf_bssap_channel_needed_ie = -1;
-static int hf_bssap_dlink_tnl_pld_cntrl_amd_inf_ie = -1;
-static int hf_bssap_ulink_tnl_pld_cntrl_amd_inf_ie = -1;
-static int hf_bssap_emlpp_prio_ie = -1;
-static int hf_bssap_gprs_erroneous_msg_ie = -1;
-
-static int hf_bssap_gprs_loc_upd_type = -1;
-static int hf_bssap_Gs_cause = -1;
-static int hf_bssap_imei = -1;
-static int hf_bssap_imeisv = -1;
-static int hf_bssap_imsi_det_from_gprs_serv_type = -1;
-static int hf_bssap_info_req = -1;
-static int hf_bssap_loc_inf_age = -1;
-static int hf_bssap_mobile_station_state = -1;
-static int hf_bssap_ptmsi = -1;
-static int hf_bssap_tmsi = -1;
-static int hf_bssap_tmsi_status = -1;
-static int hf_bssap_tom_prot_disc = -1;
-static int hf_bssap_e_bit = -1;
-static int hf_bssap_tunnel_prio = -1;
-static int hf_bssap_global_cn_id = -1;
-static int hf_bssap_plmn_id = -1;
-static int hf_bssap_cn_id = -1;
-static int hf_bssap_cell_global_id = -1;
-static int hf_bssap_extraneous_data = -1;
-static int hf_bssap_conditional_ie = -1;
+static int proto_bssap;
+static int proto_bsap;
+static int proto_bssap_le;
+static int proto_bssap_plus;
+static int hf_bssap_pdu_type;
+static int hf_bsap_pdu_type;
+static int hf_bssap_dlci_cc;
+static int hf_bsap_dlci_cc;
+static int hf_bssap_dlci_spare;
+static int hf_bsap_dlci_rsvd;
+static int hf_bssap_dlci_sapi;
+static int hf_bsap_dlci_sapi;
+static int hf_bssap_length;
+static int hf_bssap_plus_ie;
+static int hf_bssap_plus_ie_len;
+
+static int hf_bssap_plus_message_type;
+static int hf_bssap_imsi_ie;
+static int hf_bssap_imsi_det_from_gprs_serv_type_ie;
+static int hf_bssap_imsi_det_from_non_gprs_serv_type_ie;
+static int hf_bssap_info_req_ie;
+static int hf_bssap_loc_area_id_ie;
+static int hf_bssap_loc_inf_age_ie;
+static int hf_bssap_mm_information_ie;
+static int hf_bssap_mobile_id_ie;
+static int hf_bssap_mobile_stn_cls_mrk1_ie;
+static int hf_bssap_mobile_station_state_ie;
+static int hf_bssap_ptmsi_ie;
+static int hf_bssap_reject_cause_ie;
+static int hf_bssap_service_area_id_ie;
+static int hf_bssap_sgsn_nr_ie;
+static int hf_bssap_tmsi_ie;
+static int hf_bssap_tmsi_status_ie;
+static int hf_bssap_vlr_number_ie;
+static int hf_bssap_global_cn_id_ie;
+static int hf_bssap_plus_ie_data;
+
+static int hf_bssap_extension;
+static int hf_bssap_type_of_number;
+static int hf_bssap_numbering_plan_id;
+static int hf_bssap_sgsn_number;
+static int hf_bssap_vlr_number;
+static int hf_bssap_call_priority;
+static int hf_bssap_gprs_loc_upd_type_ie;
+static int hf_bssap_Gs_cause_ie;
+static int hf_bssap_imei_ie;
+static int hf_bssap_imeisv_ie;
+static int hf_bssap_cell_global_id_ie;
+static int hf_bssap_channel_needed_ie;
+static int hf_bssap_dlink_tnl_pld_cntrl_amd_inf_ie;
+static int hf_bssap_ulink_tnl_pld_cntrl_amd_inf_ie;
+static int hf_bssap_emlpp_prio_ie;
+static int hf_bssap_gprs_erroneous_msg_ie;
+
+static int hf_bssap_gprs_loc_upd_type;
+static int hf_bssap_Gs_cause;
+static int hf_bssap_imei;
+static int hf_bssap_imeisv;
+static int hf_bssap_imsi_det_from_gprs_serv_type;
+static int hf_bssap_info_req;
+static int hf_bssap_loc_inf_age;
+static int hf_bssap_mobile_station_state;
+static int hf_bssap_ptmsi;
+static int hf_bssap_tmsi;
+static int hf_bssap_tmsi_status;
+static int hf_bssap_tom_prot_disc;
+static int hf_bssap_e_bit;
+static int hf_bssap_tunnel_prio;
+static int hf_bssap_global_cn_id;
+static int hf_bssap_plmn_id;
+static int hf_bssap_cn_id;
+static int hf_bssap_cell_global_id;
+static int hf_bssap_extraneous_data;
+static int hf_bssap_conditional_ie;
 
 /* Initialize the subtree pointers */
-static gint ett_bssap = -1;
-static gint ett_bssap_dlci = -1;
-static gint ett_bssap_imsi = -1;
-static gint ett_bssap_imsi_det_from_gprs_serv_type = -1;
-static gint ett_bssap_imsi_det_from_non_gprs_serv_type = -1;
-static gint ett_bssap_info_req = -1;
-static gint ett_bssap_loc_area_id = -1;
-static gint ett_bssap_loc_inf_age = -1;
-static gint ett_bssap_mm_information = -1;
-static gint ett_bssap_mobile_id = -1;
-static gint ett_bssap_sgsn_nr = -1;
-static gint ett_bssap_tmsi = -1;
-static gint ett_bssap_tmsi_status = -1;
-static gint ett_bssap_vlr_number = -1;
-static gint ett_bssap_global_cn = -1;
-static gint ett_bssap_gprs_loc_upd = -1;
-static gint ett_bassp_Gs_cause = -1;
-static gint ett_bassp_imei = -1;
-static gint ett_bassp_imeisv = -1;
-static gint ett_bssap_cell_global_id = -1;
-static gint ett_bssap_cgi = -1;
-static gint ett_bssap_channel_needed = -1;
-static gint ett_bssap_dlink_tnl_pld_cntrl_amd_inf = -1;
-static gint ett_bssap_ulink_tnl_pld_cntrl_amd_inf = -1;
-static gint ett_bssap_emlpp_prio = -1;
-static gint ett_bssap_erroneous_msg = -1;
-static gint ett_bssap_mobile_stn_cls_mrk1 = -1;
-static gint ett_bssap_mobile_station_state = -1;
-static gint ett_bssap_ptmsi = -1;
-static gint ett_bssap_reject_cause = -1;
-static gint ett_bssap_service_area_id =-1;
-static gint ett_bssap_global_cn_id = -1;
-static gint ett_bssap_plmn = -1;
-
-static expert_field ei_bssap_unknown_message = EI_INIT;
-static expert_field ei_bssap_unknown_parameter = EI_INIT;
-static expert_field ei_bssap_mandatory_ie = EI_INIT;
+static gint ett_bssap;
+static gint ett_bssap_dlci;
+static gint ett_bssap_imsi;
+static gint ett_bssap_imsi_det_from_gprs_serv_type;
+static gint ett_bssap_imsi_det_from_non_gprs_serv_type;
+static gint ett_bssap_info_req;
+static gint ett_bssap_loc_area_id;
+static gint ett_bssap_loc_inf_age;
+static gint ett_bssap_mm_information;
+static gint ett_bssap_mobile_id;
+static gint ett_bssap_sgsn_nr;
+static gint ett_bssap_tmsi;
+static gint ett_bssap_tmsi_status;
+static gint ett_bssap_vlr_number;
+static gint ett_bssap_global_cn;
+static gint ett_bssap_gprs_loc_upd;
+static gint ett_bassp_Gs_cause;
+static gint ett_bassp_imei;
+static gint ett_bassp_imeisv;
+static gint ett_bssap_cell_global_id;
+static gint ett_bssap_cgi;
+static gint ett_bssap_channel_needed;
+static gint ett_bssap_dlink_tnl_pld_cntrl_amd_inf;
+static gint ett_bssap_ulink_tnl_pld_cntrl_amd_inf;
+static gint ett_bssap_emlpp_prio;
+static gint ett_bssap_erroneous_msg;
+static gint ett_bssap_mobile_stn_cls_mrk1;
+static gint ett_bssap_mobile_station_state;
+static gint ett_bssap_ptmsi;
+static gint ett_bssap_reject_cause;
+static gint ett_bssap_service_area_id;
+static gint ett_bssap_global_cn_id;
+static gint ett_bssap_plmn;
+
+static expert_field ei_bssap_unknown_message;
+static expert_field ei_bssap_unknown_parameter;
+static expert_field ei_bssap_mandatory_ie;
 
 
 static dissector_handle_t rrlp_handle;
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index 5ce4e78e21..5183524222 100644
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -73,160 +73,160 @@ static module_t *bssgp_module;
 static dissector_table_t diameter_3gpp_avp_dissector_table;
 
 /* Initialize the protocol and registered fields */
-static int proto_bssgp = -1;
-static int hf_bssgp_msg_type = -1;
-int hf_bssgp_elem_id = -1;
-static int hf_bssgp_ci = -1;
-static int hf_bssgp_flush_action = -1;
-static int hf_bssgp_llc_frames_disc = -1;
-static int hf_bssgp_ra_discriminator = -1;
-static int hf_bssgp_rim_app_id = -1;
-static int hf_bssgp_rim_seq_no = -1;
-static int hf_bssgp_rat_discriminator = -1;
-static int hf_bssgp_nacc_cause = -1;
-static int hf_bssgp_si3_cause = -1;
-static int hf_bssgp_mbms_data_ch_cause = -1;
-static int hf_bssgp_utra_si_cause = -1;
-static int hf_bssgp_num_si_psi = -1;
-static int hf_bssgp_si_psi_type = -1;
-static int hf_bssgp_ran_inf_req_pdu_t_ext_c = -1;
-static int hf_bssgp_ran_inf_pdu_t_ext_c = -1;
-static int hf_bssgp_rim_pdu_ind_ack = -1;
-static int hf_bssgp_rim_proto_ver_no = -1;
-static int hf_bssgp_bss_area_ind = -1;
-static int hf_bssgp_bvci = -1;
-static int hf_bssgp_bmax = -1;
-static int hf_bssgp_r = -1;
-static int hf_bssgp_r_pfc = -1;
-static int hf_bssgp_bucket_size = -1;
-static int hf_bssgp_bmax_pfc = -1;
-static int hf_bssgp_omc_id = -1;
-static int hf_bssgp_nsei = -1;
-static int hf_bssgp_rrlp_flag1 = -1;
-
-static int hf_bssgp_delay_val = -1;
-static int hf_bssgp_cause = -1;
-static int hf_bssgp_peak_rate_gran = -1;
-static int hf_bssgp_cr_bit = -1;
-static int hf_bssgp_t_bit = -1;
-static int hf_bssgp_a_bit = -1;
-static int hf_bssgp_ra_cause = -1;
-static int hf_bssgp_ra_cap_upd_cause = -1;
-static int hf_bssgp_r_default_ms = -1;
-static int hf_bssgp_suspend_ref_no = -1;
-static int hf_bssgp_tag = -1;
-static int hf_bssgp_trace_ref = -1;
-static int hf_bssgp_trigger_id = -1;
-static int hf_bssgp_transaction_id = -1;
-static int hf_bssgp_no_of_oct = -1;
-static int hf_bssgp_unit_val = -1;
-static int hf_bssgp_gprs_timer = -1;
-static int hf_bssgp_mbms = -1;
-static int hf_bssgp_EnhancedRadioStatus = -1;
-static int hf_bssgp_pfcfc = -1;
-static int hf_bssgp_rim = -1;
-static int hf_bssgp_lcs = -1;
-static int hf_bssgp_inr = -1;
-static int hf_bssgp_cbl = -1;
-static int hf_bssgp_pfc = -1;
-static int hf_bssgp_bucket_full_ratio = -1;
-static int hf_bssgp_b_pfc = -1;
-
-static int hf_bssgp_precedence = -1;
-static int hf_bssgp_serv_utran_cco = -1;
-static int hf_bssgp_mbms_session_id = -1;
-static int hf_bssgp_mbms_cause = -1;
-static int hf_bssgp_mbms_stop_cause = -1;
-static int hf_bssgp_mbms_num_ra_ids = -1;
-static int hf_bssgp_session_inf = -1;
-static int hf_bssgp_ec_gsm_iot = -1;
-static int hf_bssgp_mocn = -1;
-static int hf_bssgp_csps_coord = -1;
-static int hf_bssgp_eDRX = -1;
-static int hf_bssgp_dcn = -1;
-static int hf_bssgp_gb_if = -1;
-static int hf_bssgp_ps_ho = -1;
-static int hf_bssgp_src_to_trg_transp_cont = -1;
-static int hf_bssgp_trg_to_src_transp_cont = -1;
-static int hf_bssgp_rnc_id = -1;
-static int hf_bssgp_page_mode = -1;
-static int hf_bssgp_container_id = -1;
-static int hf_bssgp_global_tfi = -1;
-static int hf_bssgp_ul_tfi = -1;
-static int hf_bssgp_dl_tfi = -1;
-static int hf_bssgp_time_to_MBMS_data_tran = -1;
-static int hf_bssgp_mbms_session_rep_no = -1;
-static int hf_bssgp_ps_ho_cmd = -1;
-static int hf_bssgp_sipsi = -1;
-static int hf_bssgp_type = -1;
-static int hf_bssgp_cs_indication = -1;
-static int hf_bssgp_flow_control_gran = -1;
-static int hf_bssgp_serv_eutran_cco = -1;
-static int hf_bssgp_sub_prof_id_f_rat_freq_prio = -1;
-static int hf_bssgp_eutran_irat_ho_inf_req = -1;
-static int hf_bssgp_irat_ho_inf_req = -1;
-
-static int hf_bssgp_rel_int_rat_ho_inf_ind = -1;
-static int hf_bssgp_csg_id = -1;
-static int hf_bssgp_cell_acc_mode = -1;
-static int hf_bssgp_redir_complete_outcome = -1;
-static int hf_bssgp_redir_indication_reroute_reject_cause = -1;
-static int hf_bssgp_unconfirm_send_state_var = -1;
-static int hf_bssgp_Global_ENB_ID_PDU = -1;
-static int hf_bssgp_SONtransferRequestContainer_PDU = -1;
-static int hf_bssgp_plmn_id = -1;
-static int hf_bssgp_num_pfc = -1;
-static int hf_bssgp_llc_data = -1;
-static int hf_bssgp_pdu_data = -1;
-static int hf_bssgp_rrlp_apdu = -1;
-static int hf_bssgp_dtm_handover_command_data = -1;
-static int hf_bssgp_message_elements = -1;
-static int hf_bssgp_spare = -1;
-static int hf_bssgp_si = -1;
-static int hf_bssgp_psi = -1;
-static int hf_bssgp_peak_bit_rate = -1;
-static int hf_bssgp_sys_info_type3_msg = -1;
-static int hf_bssgp_trace_type_data = -1;
-static int hf_bssgp_si_item = -1;
-static int hf_bssgp_sci = -1;
-static int hf_bssgp_ggsn_pgw_location = -1;
-static int hf_bssgp_edrx_cycle_value = -1;
-static int hf_bssgp_tunpo_minutes = -1;
-static int hf_bssgp_tunpo_seconds = -1;
-static int hf_bssgp_ec_dl_coverage_class = -1;
-static int hf_bssgp_ec_ul_coverage_class = -1;
-static int hf_bssgp_pei = -1;
-static int hf_bssgp_paging_attempt_count = -1;
-static int hf_bssgp_intended_num_of_pag_attempts = -1;
-static int hf_bssgp_extended_feature_bitmap = -1;
-static int hf_bssgp_prio_class_ind = -1;
-static int hf_bssgp_prio_class_flag_b0 = -1;
+static int proto_bssgp;
+static int hf_bssgp_msg_type;
+int hf_bssgp_elem_id;
+static int hf_bssgp_ci;
+static int hf_bssgp_flush_action;
+static int hf_bssgp_llc_frames_disc;
+static int hf_bssgp_ra_discriminator;
+static int hf_bssgp_rim_app_id;
+static int hf_bssgp_rim_seq_no;
+static int hf_bssgp_rat_discriminator;
+static int hf_bssgp_nacc_cause;
+static int hf_bssgp_si3_cause;
+static int hf_bssgp_mbms_data_ch_cause;
+static int hf_bssgp_utra_si_cause;
+static int hf_bssgp_num_si_psi;
+static int hf_bssgp_si_psi_type;
+static int hf_bssgp_ran_inf_req_pdu_t_ext_c;
+static int hf_bssgp_ran_inf_pdu_t_ext_c;
+static int hf_bssgp_rim_pdu_ind_ack;
+static int hf_bssgp_rim_proto_ver_no;
+static int hf_bssgp_bss_area_ind;
+static int hf_bssgp_bvci;
+static int hf_bssgp_bmax;
+static int hf_bssgp_r;
+static int hf_bssgp_r_pfc;
+static int hf_bssgp_bucket_size;
+static int hf_bssgp_bmax_pfc;
+static int hf_bssgp_omc_id;
+static int hf_bssgp_nsei;
+static int hf_bssgp_rrlp_flag1;
+
+static int hf_bssgp_delay_val;
+static int hf_bssgp_cause;
+static int hf_bssgp_peak_rate_gran;
+static int hf_bssgp_cr_bit;
+static int hf_bssgp_t_bit;
+static int hf_bssgp_a_bit;
+static int hf_bssgp_ra_cause;
+static int hf_bssgp_ra_cap_upd_cause;
+static int hf_bssgp_r_default_ms;
+static int hf_bssgp_suspend_ref_no;
+static int hf_bssgp_tag;
+static int hf_bssgp_trace_ref;
+static int hf_bssgp_trigger_id;
+static int hf_bssgp_transaction_id;
+static int hf_bssgp_no_of_oct;
+static int hf_bssgp_unit_val;
+static int hf_bssgp_gprs_timer;
+static int hf_bssgp_mbms;
+static int hf_bssgp_EnhancedRadioStatus;
+static int hf_bssgp_pfcfc;
+static int hf_bssgp_rim;
+static int hf_bssgp_lcs;
+static int hf_bssgp_inr;
+static int hf_bssgp_cbl;
+static int hf_bssgp_pfc;
+static int hf_bssgp_bucket_full_ratio;
+static int hf_bssgp_b_pfc;
+
+static int hf_bssgp_precedence;
+static int hf_bssgp_serv_utran_cco;
+static int hf_bssgp_mbms_session_id;
+static int hf_bssgp_mbms_cause;
+static int hf_bssgp_mbms_stop_cause;
+static int hf_bssgp_mbms_num_ra_ids;
+static int hf_bssgp_session_inf;
+static int hf_bssgp_ec_gsm_iot;
+static int hf_bssgp_mocn;
+static int hf_bssgp_csps_coord;
+static int hf_bssgp_eDRX;
+static int hf_bssgp_dcn;
+static int hf_bssgp_gb_if;
+static int hf_bssgp_ps_ho;
+static int hf_bssgp_src_to_trg_transp_cont;
+static int hf_bssgp_trg_to_src_transp_cont;
+static int hf_bssgp_rnc_id;
+static int hf_bssgp_page_mode;
+static int hf_bssgp_container_id;
+static int hf_bssgp_global_tfi;
+static int hf_bssgp_ul_tfi;
+static int hf_bssgp_dl_tfi;
+static int hf_bssgp_time_to_MBMS_data_tran;
+static int hf_bssgp_mbms_session_rep_no;
+static int hf_bssgp_ps_ho_cmd;
+static int hf_bssgp_sipsi;
+static int hf_bssgp_type;
+static int hf_bssgp_cs_indication;
+static int hf_bssgp_flow_control_gran;
+static int hf_bssgp_serv_eutran_cco;
+static int hf_bssgp_sub_prof_id_f_rat_freq_prio;
+static int hf_bssgp_eutran_irat_ho_inf_req;
+static int hf_bssgp_irat_ho_inf_req;
+
+static int hf_bssgp_rel_int_rat_ho_inf_ind;
+static int hf_bssgp_csg_id;
+static int hf_bssgp_cell_acc_mode;
+static int hf_bssgp_redir_complete_outcome;
+static int hf_bssgp_redir_indication_reroute_reject_cause;
+static int hf_bssgp_unconfirm_send_state_var;
+static int hf_bssgp_Global_ENB_ID_PDU;
+static int hf_bssgp_SONtransferRequestContainer_PDU;
+static int hf_bssgp_plmn_id;
+static int hf_bssgp_num_pfc;
+static int hf_bssgp_llc_data;
+static int hf_bssgp_pdu_data;
+static int hf_bssgp_rrlp_apdu;
+static int hf_bssgp_dtm_handover_command_data;
+static int hf_bssgp_message_elements;
+static int hf_bssgp_spare;
+static int hf_bssgp_si;
+static int hf_bssgp_psi;
+static int hf_bssgp_peak_bit_rate;
+static int hf_bssgp_sys_info_type3_msg;
+static int hf_bssgp_trace_type_data;
+static int hf_bssgp_si_item;
+static int hf_bssgp_sci;
+static int hf_bssgp_ggsn_pgw_location;
+static int hf_bssgp_edrx_cycle_value;
+static int hf_bssgp_tunpo_minutes;
+static int hf_bssgp_tunpo_seconds;
+static int hf_bssgp_ec_dl_coverage_class;
+static int hf_bssgp_ec_ul_coverage_class;
+static int hf_bssgp_pei;
+static int hf_bssgp_paging_attempt_count;
+static int hf_bssgp_intended_num_of_pag_attempts;
+static int hf_bssgp_extended_feature_bitmap;
+static int hf_bssgp_prio_class_ind;
+static int hf_bssgp_prio_class_flag_b0;
 
 /* Initialize the subtree pointers */
-static gint ett_bssgp = -1;
-static gint ett_bssgp_new = -1;
-static gint ett_bssgp_pfcs_to_be_set_up_list = -1;
-static gint ett_bssgp_pfcs_to_be_set_up_list_pft = -1;
-static gint ett_bssgp_pfcs_to_be_set_up_list_abqp = -1;
-static gint ett_bssgp_pfcs_to_be_set_up_list_arp = -1;
-static gint ett_bssgp_pfcs_to_be_set_up_list_t10 = -1;
-static gint ett_bssgp_list_of_setup_pfcs = -1;
-static gint ett_bssgp_pfc_flow_control_parameters_pfc = -1;
-static gint ett_bssgp_ra_id = -1;
-static gint ett_bssgp_extended_feature_bitmap = -1;
-static gint ett_bssgp_prio_class_ind = -1;
-
-static expert_field ei_bssgp_extraneous_data = EI_INIT;
-static expert_field ei_bssgp_missing_mandatory_element = EI_INIT;
-static expert_field ei_bssgp_not_dissected_yet = EI_INIT;
-static expert_field ei_bssgp_erroneous_app_container = EI_INIT;
-static expert_field ei_bssgp_si_item = EI_INIT;
-static expert_field ei_bssgp_unknown_rim_app_id_data = EI_INIT;
-static expert_field ei_bssgp_unknown_app_container = EI_INIT;
-static expert_field ei_bssgp_ra_discriminator = EI_INIT;
-static expert_field ei_bssgp_unknown_rim_app_id = EI_INIT;
-static expert_field ei_bssgp_msg_type = EI_INIT;
-static expert_field ei_bssgp_ran_inf_app_cont_utra_si = EI_INIT;
+static gint ett_bssgp;
+static gint ett_bssgp_new;
+static gint ett_bssgp_pfcs_to_be_set_up_list;
+static gint ett_bssgp_pfcs_to_be_set_up_list_pft;
+static gint ett_bssgp_pfcs_to_be_set_up_list_abqp;
+static gint ett_bssgp_pfcs_to_be_set_up_list_arp;
+static gint ett_bssgp_pfcs_to_be_set_up_list_t10;
+static gint ett_bssgp_list_of_setup_pfcs;
+static gint ett_bssgp_pfc_flow_control_parameters_pfc;
+static gint ett_bssgp_ra_id;
+static gint ett_bssgp_extended_feature_bitmap;
+static gint ett_bssgp_prio_class_ind;
+
+static expert_field ei_bssgp_extraneous_data;
+static expert_field ei_bssgp_missing_mandatory_element;
+static expert_field ei_bssgp_not_dissected_yet;
+static expert_field ei_bssgp_erroneous_app_container;
+static expert_field ei_bssgp_si_item;
+static expert_field ei_bssgp_unknown_rim_app_id_data;
+static expert_field ei_bssgp_unknown_app_container;
+static expert_field ei_bssgp_ra_discriminator;
+static expert_field ei_bssgp_unknown_rim_app_id;
+static expert_field ei_bssgp_msg_type;
+static expert_field ei_bssgp_ran_inf_app_cont_utra_si;
 
 /* PDU type coding, v6.5.0, table 11.3.26, p 80 */
 #define BSSGP_PDU_DL_UNITDATA                  0x00
diff --git a/epan/dissectors/packet-bt-dht.c b/epan/dissectors/packet-bt-dht.c
index 4d442a76a5..6410308a25 100644
--- a/epan/dissectors/packet-bt-dht.c
+++ b/epan/dissectors/packet-bt-dht.c
@@ -34,40 +34,40 @@ void proto_reg_handoff_bt_dht(void);
  * https://www.bittorrent.org/beps/bep_0042.html BEP 42 DHT Security extension
  */
 
-static int proto_bt_dht = -1;
+static int proto_bt_dht;
 static dissector_handle_t bt_dht_handle;
 
 /* fields */
-static int hf_bencoded_int = -1;
-static int hf_bencoded_string = -1;
-static int hf_bencoded_list = -1;
-static int hf_bencoded_dict = -1;
-static int hf_bencoded_dict_entry = -1;
-static int hf_bencoded_list_terminator = -1;
-
-static int hf_bt_dht_error = -1;
-static int hf_bt_dht_peers = -1;
-static int hf_bt_dht_peer = -1;
-static int hf_bt_dht_nodes = -1;
-static int hf_bt_dht_node = -1;
-static int hf_bt_dht_id = -1;
-
-static int hf_ip = -1;
-static int hf_ip6 = -1;
-static int hf_port = -1;
-static int hf_truncated_data = -1;
-
-static expert_field ei_int_string = EI_INIT;
-static expert_field ei_invalid_len = EI_INIT;
+static int hf_bencoded_int;
+static int hf_bencoded_string;
+static int hf_bencoded_list;
+static int hf_bencoded_dict;
+static int hf_bencoded_dict_entry;
+static int hf_bencoded_list_terminator;
+
+static int hf_bt_dht_error;
+static int hf_bt_dht_peers;
+static int hf_bt_dht_peer;
+static int hf_bt_dht_nodes;
+static int hf_bt_dht_node;
+static int hf_bt_dht_id;
+
+static int hf_ip;
+static int hf_ip6;
+static int hf_port;
+static int hf_truncated_data;
+
+static expert_field ei_int_string;
+static expert_field ei_invalid_len;
 
 /* tree types */
-static gint ett_bt_dht = -1;
-static gint ett_bencoded_list = -1;
-static gint ett_bencoded_dict = -1;
-static gint ett_bencoded_dict_entry = -1;
-static gint ett_bt_dht_error = -1;
-static gint ett_bt_dht_peers = -1;
-static gint ett_bt_dht_nodes = -1;
+static gint ett_bt_dht;
+static gint ett_bencoded_list;
+static gint ett_bencoded_dict;
+static gint ett_bencoded_dict_entry;
+static gint ett_bt_dht_error;
+static gint ett_bt_dht_peers;
+static gint ett_bt_dht_nodes;
 
 /* some keys use short name in packet */
 static const value_string short_key_name_value_string[] = {
diff --git a/epan/dissectors/packet-bt-tracker.c b/epan/dissectors/packet-bt-tracker.c
index 1f856c3a13..ec0219f387 100644
--- a/epan/dissectors/packet-bt-tracker.c
+++ b/epan/dissectors/packet-bt-tracker.c
@@ -84,43 +84,43 @@ static const value_string bt_tracker_extension_type_vals[] = {
   { 0, NULL }
 };
 
-static int proto_bt_tracker = -1;
+static int proto_bt_tracker;
 static dissector_handle_t bt_tracker_handle;
 
-static int hf_bt_tracker_msg_type = -1;
-static int hf_bt_tracker_protocol_id = -1;
-static int hf_bt_tracker_action = -1;
-static int hf_bt_tracker_transaction_id = -1;
-static int hf_bt_tracker_connection_id = -1;
-static int hf_bt_tracker_info_hash = -1;
-static int hf_bt_tracker_peer_id = -1;
-static int hf_bt_tracker_downloaded = -1;
-static int hf_bt_tracker_left = -1;
-static int hf_bt_tracker_uploaded = -1;
-static int hf_bt_tracker_event = -1;
-static int hf_bt_tracker_ip_address = -1;
-static int hf_bt_tracker_key = -1;
-static int hf_bt_tracker_num_want = -1;
-static int hf_bt_tracker_port = -1;
-static int hf_bt_tracker_interval = -1;
-static int hf_bt_tracker_leechers = -1;
-static int hf_bt_tracker_seeders = -1;
-static int hf_bt_tracker_trackers = -1;
-static int hf_bt_tracker_tracker = -1;
-static int hf_bt_tracker_tr_ip = -1;
-static int hf_bt_tracker_tr_ip6 = -1;
-static int hf_bt_tracker_tr_port = -1;
-static int hf_bt_tracker_completed = -1;
-static int hf_bt_tracker_error_msg = -1;
-static int hf_bt_tracker_extension = -1;
-static int hf_bt_tracker_extension_type = -1;
-static int hf_bt_tracker_extension_len = -1;
-static int hf_bt_tracker_extension_unknown = -1;
-static int hf_bt_tracker_extension_urldata = -1;
-
-static gint ett_bt_tracker = -1;
-static gint ett_bt_tracker_trackers = -1;
-static gint ett_bt_tracker_extension = -1;
+static int hf_bt_tracker_msg_type;
+static int hf_bt_tracker_protocol_id;
+static int hf_bt_tracker_action;
+static int hf_bt_tracker_transaction_id;
+static int hf_bt_tracker_connection_id;
+static int hf_bt_tracker_info_hash;
+static int hf_bt_tracker_peer_id;
+static int hf_bt_tracker_downloaded;
+static int hf_bt_tracker_left;
+static int hf_bt_tracker_uploaded;
+static int hf_bt_tracker_event;
+static int hf_bt_tracker_ip_address;
+static int hf_bt_tracker_key;
+static int hf_bt_tracker_num_want;
+static int hf_bt_tracker_port;
+static int hf_bt_tracker_interval;
+static int hf_bt_tracker_leechers;
+static int hf_bt_tracker_seeders;
+static int hf_bt_tracker_trackers;
+static int hf_bt_tracker_tracker;
+static int hf_bt_tracker_tr_ip;
+static int hf_bt_tracker_tr_ip6;
+static int hf_bt_tracker_tr_port;
+static int hf_bt_tracker_completed;
+static int hf_bt_tracker_error_msg;
+static int hf_bt_tracker_extension;
+static int hf_bt_tracker_extension_type;
+static int hf_bt_tracker_extension_len;
+static int hf_bt_tracker_extension_unknown;
+static int hf_bt_tracker_extension_urldata;
+
+static gint ett_bt_tracker;
+static gint ett_bt_tracker_trackers;
+static gint ett_bt_tracker_extension;
 
 #define MAGIC_CONSTANT 0x41727101980
 
diff --git a/epan/dissectors/packet-bt-utp.c b/epan/dissectors/packet-bt-utp.c
index af05ca4449..0cfb53cfb1 100644
--- a/epan/dissectors/packet-bt-utp.c
+++ b/epan/dissectors/packet-bt-utp.c
@@ -117,7 +117,7 @@ static const value_string bt_utp_close_reason_vals[] = {
   {  0, NULL }
 };
 
-static int proto_bt_utp = -1;
+static int proto_bt_utp;
 
 /* ---  "Original" uTP Header ("version 0" ?) --------------
 
@@ -192,34 +192,34 @@ Fields Types
 static dissector_handle_t bt_utp_handle;
 static dissector_handle_t bittorrent_handle;
 
-static int hf_bt_utp_ver = -1;
-static int hf_bt_utp_type = -1;
-static int hf_bt_utp_flags = -1;
-static int hf_bt_utp_extension = -1;
-static int hf_bt_utp_next_extension_type = -1;
-static int hf_bt_utp_extension_len = -1;
-static int hf_bt_utp_extension_bitmask = -1;
-static int hf_bt_utp_extension_close_reason = -1;
-static int hf_bt_utp_extension_unknown = -1;
-static int hf_bt_utp_connection_id_v0 = -1;
-static int hf_bt_utp_connection_id_v1 = -1;
-static int hf_bt_utp_stream = -1;
-static int hf_bt_utp_timestamp_sec = -1;
-static int hf_bt_utp_timestamp_us = -1;
-static int hf_bt_utp_timestamp_diff_us = -1;
-static int hf_bt_utp_wnd_size_v0 = -1;
-static int hf_bt_utp_wnd_size_v1 = -1;
-static int hf_bt_utp_seq_nr = -1;
-static int hf_bt_utp_ack_nr = -1;
-static int hf_bt_utp_len = -1;
-static int hf_bt_utp_data = -1;
-static int hf_bt_utp_pdu_size = -1;
-static int hf_bt_utp_continuation_to = -1;
-
-static expert_field ei_extension_len_invalid = EI_INIT;
-
-static gint ett_bt_utp = -1;
-static gint ett_bt_utp_extension = -1;
+static int hf_bt_utp_ver;
+static int hf_bt_utp_type;
+static int hf_bt_utp_flags;
+static int hf_bt_utp_extension;
+static int hf_bt_utp_next_extension_type;
+static int hf_bt_utp_extension_len;
+static int hf_bt_utp_extension_bitmask;
+static int hf_bt_utp_extension_close_reason;
+static int hf_bt_utp_extension_unknown;
+static int hf_bt_utp_connection_id_v0;
+static int hf_bt_utp_connection_id_v1;
+static int hf_bt_utp_stream;
+static int hf_bt_utp_timestamp_sec;
+static int hf_bt_utp_timestamp_us;
+static int hf_bt_utp_timestamp_diff_us;
+static int hf_bt_utp_wnd_size_v0;
+static int hf_bt_utp_wnd_size_v1;
+static int hf_bt_utp_seq_nr;
+static int hf_bt_utp_ack_nr;
+static int hf_bt_utp_len;
+static int hf_bt_utp_data;
+static int hf_bt_utp_pdu_size;
+static int hf_bt_utp_continuation_to;
+
+static expert_field ei_extension_len_invalid;
+
+static gint ett_bt_utp;
+static gint ett_bt_utp_extension;
 
 static gboolean enable_version0 = FALSE;
 static guint max_window_size = V1_MAX_WINDOW_SIZE;
diff --git a/epan/dissectors/packet-bt3ds.c b/epan/dissectors/packet-bt3ds.c
index cc0ee9887a..cc77beed44 100644
--- a/epan/dissectors/packet-bt3ds.c
+++ b/epan/dissectors/packet-bt3ds.c
@@ -19,20 +19,20 @@
 #include "packet-btl2cap.h"
 #include "packet-btsdp.h"
 
-static int proto_bt3ds = -1;
+static int proto_bt3ds;
 
-static int hf_message_opcode                                               = -1;
-static int hf_association_notification                                     = -1;
-static int hf_user_request_for_battery_level_display                       = -1;
-static int hf_reserved                                                     = -1;
-static int hf_battery_level                                                = -1;
+static int hf_message_opcode;
+static int hf_association_notification;
+static int hf_user_request_for_battery_level_display;
+static int hf_reserved;
+static int hf_battery_level;
 
-static expert_field ei_message_opcode_reserved                        = EI_INIT;
-static expert_field ei_reserved                                       = EI_INIT;
-static expert_field ei_battery_level_reserved                         = EI_INIT;
-static expert_field ei_unexpected_data                                = EI_INIT;
+static expert_field ei_message_opcode_reserved;
+static expert_field ei_reserved;
+static expert_field ei_battery_level_reserved;
+static expert_field ei_unexpected_data;
 
-static gint ett_bt3ds                                                      = -1;
+static gint ett_bt3ds;
 
 static dissector_handle_t b3ds_handle;
 
diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c
index afb0543f2a..25bbc8ae33 100644
--- a/epan/dissectors/packet-btamp.c
+++ b/epan/dissectors/packet-btamp.c
@@ -17,39 +17,39 @@
 #include "packet-btl2cap.h"
 
 /* Initialize the protocol and registered fields */
-static int proto_btamp = -1;
-static int hf_btamp_command = -1;
-static int hf_btamp_cmd_code = -1;
-static int hf_btamp_cmd_ident = -1;
-static int hf_btamp_cmd_length = -1;
-static int hf_btamp_cmd_data = -1;
-static int hf_btamp_rej_reason = -1;
-static int hf_btamp_mtu = -1;
-static int hf_btamp_extfeatures = -1;
-static int hf_btamp_lcontroller_id = -1;
-static int hf_btamp_rcontroller_id = -1;
-static int hf_btamp_controller_list = -1;
-static int hf_btamp_controllers = -1;
-static int hf_btamp_controller_id = -1;
-static int hf_btamp_controller_type = -1;
-static int hf_btamp_controller_status = -1;
-static int hf_btamp_status = -1;
-/* static int hf_btamp_create_status = -1; */
-/* static int hf_btamp_disc_status = -1; */
-static int hf_btamp_total_bw = -1;
-static int hf_btamp_max_guaran_bw = -1;
-static int hf_btamp_min_latency = -1;
-static int hf_btamp_pal_caps_guaranteed = -1;
-static int hf_btamp_pal_caps_mask = -1;
-static int hf_btamp_amp_assoc_size = -1;
-static int hf_btamp_amp_assoc = -1;
+static int proto_btamp;
+static int hf_btamp_command;
+static int hf_btamp_cmd_code;
+static int hf_btamp_cmd_ident;
+static int hf_btamp_cmd_length;
+static int hf_btamp_cmd_data;
+static int hf_btamp_rej_reason;
+static int hf_btamp_mtu;
+static int hf_btamp_extfeatures;
+static int hf_btamp_lcontroller_id;
+static int hf_btamp_rcontroller_id;
+static int hf_btamp_controller_list;
+static int hf_btamp_controllers;
+static int hf_btamp_controller_id;
+static int hf_btamp_controller_type;
+static int hf_btamp_controller_status;
+static int hf_btamp_status;
+/* static int hf_btamp_create_status; */
+/* static int hf_btamp_disc_status; */
+static int hf_btamp_total_bw;
+static int hf_btamp_max_guaran_bw;
+static int hf_btamp_min_latency;
+static int hf_btamp_pal_caps_guaranteed;
+static int hf_btamp_pal_caps_mask;
+static int hf_btamp_amp_assoc_size;
+static int hf_btamp_amp_assoc;
 
 /* Initialize the subtree pointers */
-static gint ett_btamp = -1;
-static gint ett_btamp_cmd = -1;
-static gint ett_btamp_caps = -1;
-static gint ett_btamp_controller_entry = -1;
-static gint ett_btamp_controller_list = -1;
+static gint ett_btamp;
+static gint ett_btamp_cmd;
+static gint ett_btamp_caps;
+static gint ett_btamp_controller_entry;
+static gint ett_btamp_controller_list;
 
 static dissector_handle_t btamp_handle;
 
diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c
index 3fbede4727..e1ec65fece 100644
--- a/epan/dissectors/packet-btatt.c
+++ b/epan/dissectors/packet-btatt.c
@@ -41,1160 +41,1160 @@ static reassembly_table msg_reassembly_table;
 /* end packet reassebly */
 
 /* Initialize the protocol and registered fields */
-static int proto_btatt = -1;
-static int proto_btgatt = -1;
-
-static int hf_btatt_opcode = -1;
-static int hf_btatt_handle = -1;
-static int hf_btatt_starting_handle = -1;
-static int hf_btatt_ending_handle = -1;
-static int hf_btatt_group_end_handle = -1;
-static int hf_btatt_value = -1;
-static int hf_btatt_req_opcode_in_error = -1;
-static int hf_btatt_handle_in_error = -1;
-static int hf_btatt_error_code = -1;
-static int hf_btatt_error_code_aios = -1;
-static int hf_btatt_error_code_ans = -1;
-static int hf_btatt_error_code_bms = -1;
-static int hf_btatt_error_code_cgms = -1;
-static int hf_btatt_error_code_cps = -1;
-static int hf_btatt_error_code_cscs = -1;
-static int hf_btatt_error_code_cts = -1;
-static int hf_btatt_error_code_ess = -1;
-static int hf_btatt_error_code_gls = -1;
-static int hf_btatt_error_code_hps = -1;
-static int hf_btatt_error_code_hrs = -1;
-static int hf_btatt_error_code_hts = -1;
-static int hf_btatt_error_code_ips = -1;
-static int hf_btatt_error_code_ots = -1;
-static int hf_btatt_error_code_rscs = -1;
-static int hf_btatt_error_code_uds = -1;
-static int hf_btatt_service_uuid16 = -1;
-static int hf_btatt_service_uuid128 = -1;
-static int hf_btatt_characteristic_uuid16 = -1;
-static int hf_btatt_characteristic_uuid128 = -1;
-static int hf_btatt_uuid16 = -1;
-static int hf_btatt_uuid128 = -1;
-static int hf_btatt_client_rx_mtu = -1;
-static int hf_btatt_server_rx_mtu = -1;
-static int hf_btatt_uuid_format = -1;
-static int hf_btatt_length = -1;
-static int hf_btatt_offset = -1;
-static int hf_btatt_flags = -1;
-static int hf_btatt_sign_counter = -1;
-static int hf_btatt_signature = -1;
-static int hf_btatt_attribute_data = -1;
-static int hf_btatt_handles_info = -1;
-static int hf_btatt_opcode_authentication_signature = -1;
-static int hf_btatt_opcode_command = -1;
-static int hf_btatt_opcode_method = -1;
-static int hf_btatt_characteristic_properties = -1;
-static int hf_btatt_characteristic_value_handle = -1;
-static int hf_btatt_characteristic_properties_extended_properties = -1;
-static int hf_btatt_characteristic_properties_authenticated_signed_writes = -1;
-static int hf_btatt_characteristic_properties_indicate = -1;
-static int hf_btatt_characteristic_properties_notify = -1;
-static int hf_btatt_characteristic_properties_write = -1;
-static int hf_btatt_characteristic_properties_write_without_response = -1;
-static int hf_btatt_characteristic_properties_read = -1;
-static int hf_btatt_characteristic_properties_broadcast = -1;
-static int hf_btatt_information_data = -1;
-static int hf_btatt_included_service_handle = -1;
-static int hf_btatt_characteristic_configuration_client = -1;
-static int hf_btatt_characteristic_configuration_client_reserved = -1;
-static int hf_btatt_characteristic_configuration_client_indication = -1;
-static int hf_btatt_characteristic_configuration_client_notification = -1;
-static int hf_btatt_characteristic_configuration_server = -1;
-static int hf_btatt_characteristic_configuration_server_reserved = -1;
-static int hf_btatt_characteristic_configuration_server_broadcast = -1;
-static int hf_btatt_hogp_protocol_mode = -1;
-static int hf_btatt_hogp_bcd_hid = -1;
-static int hf_btatt_hogp_b_country_code = -1;
-static int hf_btatt_hogp_flags = -1;
-static int hf_btatt_hogp_flags_reserved = -1;
-static int hf_btatt_hogp_flags_normally_connectable = -1;
-static int hf_btatt_hogp_flags_remote_wake = -1;
-static int hf_btatt_hogp_hid_control_point_command = -1;
-static int hf_btatt_report_reference_report_id = -1;
-static int hf_btatt_report_reference_report_type = -1;
-static int hf_btatt_characteristic_user_description = -1;
-static int hf_btatt_characteristic_extended_properties = -1;
-static int hf_btatt_characteristic_extended_properties_reserved = -1;
-static int hf_btatt_characteristic_extended_properties_writable_auxiliaries = -1;
-static int hf_btatt_characteristic_extended_properties_reliable_write = -1;
-static int hf_btatt_characteristic_presentation_format = -1;
-static int hf_btatt_characteristic_presentation_exponent = -1;
-static int hf_btatt_characteristic_presentation_unit = -1;
-static int hf_btatt_characteristic_presentation_namespace = -1;
-static int hf_btatt_characteristic_presentation_namespace_description_btsig = -1;
-static int hf_btatt_characteristic_presentation_namespace_description = -1;
-static int hf_btatt_esp_trigger_logic = -1;
-static int hf_btatt_esp_condition = -1;
-static int hf_btatt_esp_operand = -1;
-static int hf_btatt_esp_flags = -1;
-static int hf_btatt_esp_sampling_function = -1;
-static int hf_btatt_esp_measurement_period = -1;
-static int hf_btatt_esp_update_interval = -1;
-static int hf_btatt_esp_application = -1;
-static int hf_btatt_esp_measurement_uncertainty = -1;
-static int hf_btatt_device_name = -1;
-static int hf_btatt_appearance = -1;
-static int hf_btatt_appearance_category = -1;
-static int hf_btatt_appearance_subcategory = -1;
-static int hf_btatt_appearance_subcategory_watch = -1;
-static int hf_btatt_appearance_subcategory_thermometer = -1;
-static int hf_btatt_appearance_subcategory_heart_rate = -1;
-static int hf_btatt_appearance_subcategory_blood_pressure = -1;
-static int hf_btatt_appearance_subcategory_hid = -1;
-static int hf_btatt_appearance_subcategory_running_walking_sensor = -1;
-static int hf_btatt_appearance_subcategory_cycling = -1;
-static int hf_btatt_appearance_subcategory_pulse_oximeter = -1;
-static int hf_btatt_appearance_subcategory_personal_mobility_device = -1;
-static int hf_btatt_appearance_subcategory_insulin_pump = -1;
-static int hf_btatt_appearance_subcategory_outdoor_sports_activity = -1;
-static int hf_btatt_peripheral_privacy_flag = -1;
-static int hf_btatt_minimum_connection_interval = -1;
-static int hf_btatt_maximum_connection_interval = -1;
-static int hf_btatt_slave_latency = -1;
-static int hf_btatt_connection_supervision_timeout_multiplier = -1;
-static int hf_btatt_reconnection_address = -1;
-static int hf_btatt_alert_level = -1;
-static int hf_btatt_tx_power_level = -1;
-static int hf_btatt_year = -1;
-static int hf_btatt_month = -1;
-static int hf_btatt_day = -1;
-static int hf_btatt_hours = -1;
-static int hf_btatt_minutes = -1;
-static int hf_btatt_seconds = -1;
-static int hf_btatt_day_of_week = -1;
-static int hf_btatt_fractions100 = -1;
-static int hf_btatt_fractions256 = -1;
-static int hf_btatt_dst_offset = -1;
-static int hf_btatt_model_number_string = -1;
-static int hf_btatt_serial_number_string = -1;
-static int hf_btatt_firmware_revision_string = -1;
-static int hf_btatt_hardware_revision_string = -1;
-static int hf_btatt_software_revision_string = -1;
-static int hf_btatt_manufacturer_string = -1;
-static int hf_btatt_system_id_manufacturer_identifier = -1;
-static int hf_btatt_system_id_organizationally_unique_identifier = -1;
-static int hf_btatt_timezone = -1;
-static int hf_btatt_time_accuracy = -1;
-static int hf_btatt_time_source = -1;
-static int hf_btatt_time_days_since_update = -1;
-static int hf_btatt_time_hours_since_update = -1;
-static int hf_btatt_time_update_control_point = -1;
-static int hf_btatt_time_current_state = -1;
-static int hf_btatt_time_result = -1;
-static int hf_btatt_battery_level = -1;
-static int hf_btatt_battery_power_state = -1;
-static int hf_btatt_battery_power_state_present = -1;
-static int hf_btatt_battery_power_state_discharging = -1;
-static int hf_btatt_battery_power_state_charging = -1;
-static int hf_btatt_battery_power_state_level = -1;
-static int hf_btatt_temperature_type = -1;
-static int hf_btatt_measurement_interval = -1;
-static int hf_btatt_time_adjust_reason = -1;
-static int hf_btatt_time_adjust_reason_reserved = -1;
-static int hf_btatt_time_adjust_reason_change_of_dst = -1;
-static int hf_btatt_time_adjust_reason_change_of_timezone = -1;
-static int hf_btatt_time_adjust_reason_external_reference_time_update = -1;
-static int hf_btatt_time_adjust_reason_manual_time_update = -1;
-static int hf_btatt_magnetic_declination = -1;
-static int hf_btatt_scan_refresh = -1;
-static int hf_btatt_body_sensor_location = -1;
-static int hf_btatt_heart_rate_control_point = -1;
-static int hf_btatt_alert_status = -1;
-static int hf_btatt_alert_status_reserved = -1;
-static int hf_btatt_alert_status_display_alert_status = -1;
-static int hf_btatt_alert_status_vibrate_state = -1;
-static int hf_btatt_alert_status_ringer_state = -1;
-static int hf_btatt_ringer_control_point = -1;
-static int hf_btatt_ringer_setting = -1;
-static int hf_btatt_alert_category_id_bitmask_1 = -1;
-static int hf_btatt_alert_category_id_bitmask_1_schedule = -1;
-static int hf_btatt_alert_category_id_bitmask_1_voice_mail = -1;
-static int hf_btatt_alert_category_id_bitmask_1_sms_mms = -1;
-static int hf_btatt_alert_category_id_bitmask_1_missed_call = -1;
-static int hf_btatt_alert_category_id_bitmask_1_call = -1;
-static int hf_btatt_alert_category_id_bitmask_1_news = -1;
-static int hf_btatt_alert_category_id_bitmask_1_email = -1;
-static int hf_btatt_alert_category_id_bitmask_1_simple_alert = -1;
-static int hf_btatt_alert_category_id_bitmask_2 = -1;
-static int hf_btatt_alert_category_id_bitmask_2_reserved = -1;
-static int hf_btatt_alert_category_id_bitmask_2_instant_message = -1;
-static int hf_btatt_alert_category_id_bitmask_2_high_prioritized_alert = -1;
-static int hf_btatt_alert_category_id = -1;
-static int hf_btatt_alert_command_id = -1;
-static int hf_btatt_alert_unread_count = -1;
-static int hf_btatt_alert_number_of_new_alert = -1;
-static int hf_btatt_alert_text_string_information = -1;
-static int hf_btatt_blood_pressure_feature = -1;
-static int hf_btatt_blood_pressure_feature_reserved = -1;
-static int hf_btatt_blood_pressure_feature_multiple_bond = -1;
-static int hf_btatt_blood_pressure_feature_measurement_position_detection = -1;
-static int hf_btatt_blood_pressure_feature_puls_rate_range = -1;
-static int hf_btatt_blood_pressure_feature_irregular_pulse_detection = -1;
-static int hf_btatt_blood_pressure_feature_cuff_fit_detection = -1;
-static int hf_btatt_blood_pressure_feature_body_movement_detection = -1;
-static int hf_btatt_le_scan_interval = -1;
-static int hf_btatt_le_scan_window = -1;
-static int hf_btatt_pnp_id_vendor_id_source = -1;
-static int hf_btatt_pnp_id_vendor_id = -1;
-static int hf_btatt_pnp_id_vendor_id_bluetooth_sig = -1;
-static int hf_btatt_pnp_id_vendor_id_usb_forum = -1;
-static int hf_btatt_pnp_id_product_id = -1;
-static int hf_btatt_pnp_id_product_version = -1;
-static int hf_btatt_glucose_feature = -1;
-static int hf_btatt_glucose_feature_reserved = -1;
-static int hf_btatt_glucose_feature_multiple_bond = -1;
-static int hf_btatt_glucose_feature_time_fault = -1;
-static int hf_btatt_glucose_feature_general_device_fault = -1;
-static int hf_btatt_glucose_feature_sensor_read_interrupt_detection = -1;
-static int hf_btatt_glucose_feature_sensor_temperature_high_low_detection = -1;
-static int hf_btatt_glucose_feature_sensor_result_high_low_detection = -1;
-static int hf_btatt_glucose_feature_sensor_strip_type_error_detection = -1;
-static int hf_btatt_glucose_feature_sensor_strip_insertion_error_detection = -1;
-static int hf_btatt_glucose_feature_sensor_sample_size = -1;
-static int hf_btatt_glucose_feature_sensor_malfunction_detection = -1;
-static int hf_btatt_glucose_feature_low_battery_detection_during_measurement = -1;
-static int hf_btatt_rsc_feature = -1;
-static int hf_btatt_rsc_feature_reserved = -1;
-static int hf_btatt_rsc_feature_multiple_sensor_locations = -1;
-static int hf_btatt_rsc_feature_calibration_procedure = -1;
-static int hf_btatt_rsc_feature_walking_or_running_status = -1;
-static int hf_btatt_rsc_feature_total_distance_measurement = -1;
-static int hf_btatt_rsc_feature_instantaneous_stride_length_measurement = -1;
-static int hf_btatt_csc_feature = -1;
-static int hf_btatt_csc_feature_reserved = -1;
-static int hf_btatt_csc_feature_multiple_sensor_locations = -1;
-static int hf_btatt_csc_feature_crank_revolution_data = -1;
-static int hf_btatt_csc_feature_wheel_revolution_data = -1;
-static int hf_btatt_sensor_location = -1;
-static int hf_btatt_elevation = -1;
-static int hf_btatt_pressure = -1;
-static int hf_btatt_temperature = -1;
-static int hf_btatt_humidity = -1;
-static int hf_btatt_true_wind_speed = -1;
-static int hf_btatt_true_wind_direction = -1;
-static int hf_btatt_apparent_wind_speed = -1;
-static int hf_btatt_apparent_wind_direction = -1;
-static int hf_btatt_gust_factor = -1;
-static int hf_btatt_pollen_concentration = -1;
-static int hf_btatt_uv_index = -1;
-static int hf_btatt_irradiance = -1;
-static int hf_btatt_rainfall = -1;
-static int hf_btatt_wind_chill = -1;
-static int hf_btatt_heart_index = -1;
-static int hf_btatt_dew_point = -1;
-static int hf_btatt_descriptor_value_changed_flags = -1;
-static int hf_btatt_descriptor_value_changed_flags_reserved = -1;
-static int hf_btatt_descriptor_value_changed_flags_change_to_characteristic_user_description_descriptor = -1;
-static int hf_btatt_descriptor_value_changed_flags_change_to_es_measurement_descriptor = -1;
-static int hf_btatt_descriptor_value_changed_flags_change_to_es_configuration_descriptor = -1;
-static int hf_btatt_descriptor_value_changed_flags_change_to_one_or_more_es_trigger_setting_descriptors = -1;
-static int hf_btatt_descriptor_value_changed_flags_source_of_change = -1;
-static int hf_btatt_aerobic_heart_rate_lower_limit = -1;
-static int hf_btatt_aerobic_threshold = -1;
-static int hf_btatt_age = -1;
-static int hf_btatt_anaerobic_heart_rate_lower_limit = -1;
-static int hf_btatt_anaerobic_heart_rate_upper_limit = -1;
-static int hf_btatt_anaerobic_threshold = -1;
-static int hf_btatt_aerobic_heart_rate_upper_limit = -1;
-static int hf_btatt_email_address = -1;
-static int hf_btatt_fat_burn_heart_rate_lower_limit = -1;
-static int hf_btatt_fat_burn_heart_rate_upper_limit = -1;
-static int hf_btatt_first_name = -1;
-static int hf_btatt_five_zone_heart_rate_limits_very_light_light_limit = -1;
-static int hf_btatt_five_zone_heart_rate_limits_light_moderate_limit = -1;
-static int hf_btatt_five_zone_heart_rate_limits_moderate_hard_limit = -1;
-static int hf_btatt_five_zone_heart_rate_limits_hard_maximum_limit = -1;
-static int hf_btatt_gender = -1;
-static int hf_btatt_heart_rate_max = -1;
-static int hf_btatt_height = -1;
-static int hf_btatt_hip_circumference = -1;
-static int hf_btatt_last_name = -1;
-static int hf_btatt_maximum_recommended_heart_rate = -1;
-static int hf_btatt_resting_heart_rate = -1;
-static int hf_btatt_sport_type_for_aerobic_and_anaerobic_thresholds = -1;
-static int hf_btatt_three_zone_heart_rate_limits_light_moderate = -1;
-static int hf_btatt_three_zone_heart_rate_limits_moderate_hard = -1;
-static int hf_btatt_two_zone_heart_rate_limit_fat_burn_fitness = -1;
-static int hf_btatt_vo2_max =-1;
-static int hf_btatt_waist_circumference =-1;
-static int hf_btatt_weight =-1;
-static int hf_btatt_database_change_increment =-1;
-static int hf_btatt_user_index = -1;
-static int hf_btatt_magnetic_flux_density_x = -1;
-static int hf_btatt_magnetic_flux_density_y = -1;
-static int hf_btatt_magnetic_flux_density_z = -1;
-static int hf_btatt_language = -1;
-static int hf_btatt_barometric_pressure_trend = -1;
-static int hf_btatt_central_address_resolution = -1;
-static int hf_btatt_resolvable_private_address = -1;
-static int hf_btatt_cycling_power_feature = -1;
-static int hf_btatt_cycling_power_feature_reserved = -1;
-static int hf_btatt_cycling_power_feature_factory_calibration_date = -1;
-static int hf_btatt_cycling_power_feature_instantaneous_measurement_direction = -1;
-static int hf_btatt_cycling_power_feature_sensor_measurement_context = -1;
-static int hf_btatt_cycling_power_feature_span_length_adjustment = -1;
-static int hf_btatt_cycling_power_feature_chain_weight_adjustment = -1;
-static int hf_btatt_cycling_power_feature_chain_length_adjustment = -1;
-static int hf_btatt_cycling_power_feature_crank_length_adjustment = -1;
-static int hf_btatt_cycling_power_feature_multiple_sensor_locations = -1;
-static int hf_btatt_cycling_power_feature_cycling_power_measurement_characteristic_content_masking = -1;
-static int hf_btatt_cycling_power_feature_offset_compensation = -1;
-static int hf_btatt_cycling_power_feature_offset_compensation_indicator = -1;
-static int hf_btatt_cycling_power_feature_accumulated_energy = -1;
-static int hf_btatt_cycling_power_feature_top_and_bottom_dead_spot_angles = -1;
-static int hf_btatt_cycling_power_feature_extreme_angles = -1;
-static int hf_btatt_cycling_power_feature_extreme_magnitudes = -1;
-static int hf_btatt_cycling_power_feature_crank_revolution_data = -1;
-static int hf_btatt_cycling_power_feature_wheel_revolution_data = -1;
-static int hf_btatt_cycling_power_feature_accumulated_torque = -1;
-static int hf_btatt_cycling_power_feature_pedal_power_balance = -1;
-static int hf_btatt_ln_feature = -1;
-static int hf_btatt_ln_feature_reserved = -1;
-static int hf_btatt_ln_feature_position_status = -1;
-static int hf_btatt_ln_feature_elevation_setting = -1;
-static int hf_btatt_ln_feature_fix_rate_setting = -1;
-static int hf_btatt_ln_feature_location_and_speed_characteristic_content_masking = -1;
-static int hf_btatt_ln_feature_vertical_dilution_of_precision = -1;
-static int hf_btatt_ln_feature_horizontal_dilution_of_precision = -1;
-static int hf_btatt_ln_feature_estimated_vertical_position_error = -1;
-static int hf_btatt_ln_feature_estimated_horizontal_position_error = -1;
-static int hf_btatt_ln_feature_time_to_first_fix = -1;
-static int hf_btatt_ln_feature_number_of_beacons_in_view = -1;
-static int hf_btatt_ln_feature_number_of_beacons_in_solution = -1;
-static int hf_btatt_ln_feature_estimated_time_of_arrival = -1;
-static int hf_btatt_ln_feature_remaining_vertical_distance = -1;
-static int hf_btatt_ln_feature_remaining_distance = -1;
-static int hf_btatt_ln_feature_utc_time = -1;
-static int hf_btatt_ln_feature_rolling_time = -1;
-static int hf_btatt_ln_feature_heading = -1;
-static int hf_btatt_ln_feature_elevation = -1;
-static int hf_btatt_ln_feature_location = -1;
-static int hf_btatt_ln_feature_total_distance = -1;
-static int hf_btatt_ln_feature_instantaneous_speed = -1;
-static int hf_btatt_body_composition_feature = -1;
-static int hf_btatt_body_composition_feature_reserved = -1;
-static int hf_btatt_body_composition_feature_height_measurement_resolution = -1;
-static int hf_btatt_body_composition_feature_mass_measurement_resolution = -1;
-static int hf_btatt_body_composition_feature_height = -1;
-static int hf_btatt_body_composition_feature_weight = -1;
-static int hf_btatt_body_composition_feature_impedance = -1;
-static int hf_btatt_body_composition_feature_body_water_mass = -1;
-static int hf_btatt_body_composition_feature_soft_lean_mass = -1;
-static int hf_btatt_body_composition_feature_fat_free_mass = -1;
-static int hf_btatt_body_composition_feature_muscle_mass = -1;
-static int hf_btatt_body_composition_feature_muscle_percentage = -1;
-static int hf_btatt_body_composition_feature_basal_metabolism = -1;
-static int hf_btatt_body_composition_feature_multiple_users = -1;
-static int hf_btatt_body_composition_feature_timestamp = -1;
-static int hf_btatt_weight_scale_feature = -1;
-static int hf_btatt_weight_scale_feature_reserved = -1;
-static int hf_btatt_weight_scale_feature_height_measurement_resolution = -1;
-static int hf_btatt_weight_scale_feature_weight_measurement_resolution = -1;
-static int hf_btatt_weight_scale_feature_bmi = -1;
-static int hf_btatt_weight_scale_feature_multiple_users = -1;
-static int hf_btatt_weight_scale_feature_timestamp = -1;
-static int hf_btatt_glucose_measurement_flags = -1;
-static int hf_btatt_glucose_measurement_flags_reserved = -1;
-static int hf_btatt_glucose_measurement_flags_context_information_follows = -1;
-static int hf_btatt_glucose_measurement_flags_sensor_status_annunciation_present = -1;
-static int hf_btatt_glucose_measurement_flags_glucose_concentration_units = -1;
-static int hf_btatt_glucose_measurement_flags_glucose_concentration_type_and_sample_location_present = -1;
-static int hf_btatt_glucose_measurement_flags_time_offset_present = -1;
-static int hf_btatt_glucose_measurement_sequence_number = -1;
-static int hf_btatt_glucose_measurement_base_time = -1;
-static int hf_btatt_glucose_measurement_time_offset = -1;
-static int hf_btatt_glucose_measurement_glucose_concentration_kg_per_l = -1;
-static int hf_btatt_glucose_measurement_glucose_concentration_mol_per_l = -1;
-static int hf_btatt_glucose_measurement_type_and_sample_location = -1;
-static int hf_btatt_glucose_measurement_type_and_sample_location_type = -1;
-static int hf_btatt_glucose_measurement_type_and_sample_location_sample_location = -1;
-static int hf_btatt_glucose_measurement_sensor_status_annunciation = -1;
-static int hf_btatt_glucose_measurement_sensor_status_annunciation_reserved = -1;
-static int hf_btatt_glucose_measurement_sensor_status_annunciation_time_fault = -1;
-static int hf_btatt_glucose_measurement_sensor_status_annunciation_general_fault = -1;
-static int hf_btatt_glucose_measurement_sensor_status_annunciation_read_interrupted = -1;
-static int hf_btatt_glucose_measurement_sensor_status_annunciation_temperature_too_low = -1;
-static int hf_btatt_glucose_measurement_sensor_status_annunciation_temperature_too_high = -1;
-static int hf_btatt_glucose_measurement_sensor_status_annunciation_result_too_low = -1;
-static int hf_btatt_glucose_measurement_sensor_status_annunciation_result_too_high = -1;
-static int hf_btatt_glucose_measurement_sensor_status_annunciation_strip_type_incorrect = -1;
-static int hf_btatt_glucose_measurement_sensor_status_annunciation_strip_insertion_error = -1;
-static int hf_btatt_glucose_measurement_sensor_status_annunciation_size_insufficient = -1;
-static int hf_btatt_glucose_measurement_sensor_status_annunciation_fault = -1;
-static int hf_btatt_glucose_measurement_sensor_status_annunciation_battery_low = -1;
-static int hf_btatt_bond_management_feature = -1;
-static int hf_btatt_bond_management_feature_feature_extension = -1;
-static int hf_btatt_bond_management_feature_reserved = -1;
-static int hf_btatt_bond_management_feature_identify_yourself = -1;
-static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_9 = -1;
-static int hf_btatt_bond_management_feature_remove_all_but_the_active_bond_on_le_transport_only_server = -1;
-static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_8 = -1;
-static int hf_btatt_bond_management_feature_remove_all_but_the_active_bond_on_br_edr_transport_only_server = -1;
-static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_7 = -1;
-static int hf_btatt_bond_management_feature_remove_all_but_the_active_bond_on_br_edr_and_le_server = -1;
-static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_6 = -1;
-static int hf_btatt_bond_management_feature_remove_all_bonds_on_le_transport_only_server = -1;
-static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_5 = -1;
-static int hf_btatt_bond_management_feature_remove_all_bonds_on_br_edr_transport_only_server = -1;
-static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_4 = -1;
-static int hf_btatt_bond_management_feature_remove_all_bonds_on_br_edr_and_le_server = -1;
-static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_3 = -1;
-static int hf_btatt_bond_management_feature_delete_bond_of_current_le_transport_only_connection = -1;
-static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_2 = -1;
-static int hf_btatt_bond_management_feature_delete_bond_of_current_br_edr_transport_only_connection = -1;
-static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_1 = -1;
-static int hf_btatt_bond_management_feature_delete_bond_of_current_br_edr_and_le_connection = -1;
-static int hf_btatt_bond_management_feature_nth = -1;
-static int hf_btatt_bond_management_feature_nth_feature_extension = -1;
-static int hf_btatt_bond_management_feature_nth_reserved = -1;
-static int hf_btatt_bond_management_control_point_opcode = -1;
-static int hf_btatt_bond_management_control_point_authorization_code = -1;
-static int hf_btatt_temperature_measurement_flags = -1;
-static int hf_btatt_temperature_measurement_flags_reserved = -1;
-static int hf_btatt_temperature_measurement_flags_temperature_type = -1;
-static int hf_btatt_temperature_measurement_flags_timestamp = -1;
-static int hf_btatt_temperature_measurement_flags_temperature_unit = -1;
-static int hf_btatt_temperature_measurement_value_celsius = -1;
-static int hf_btatt_temperature_measurement_value_fahrenheit = -1;
-static int hf_btatt_temperature_measurement_timestamp = -1;
-static int hf_btatt_glucose_measurement_context_flags = -1;
-static int hf_btatt_glucose_measurement_context_flags_extended_flags = -1;
-static int hf_btatt_glucose_measurement_context_flags_hba1c = -1;
-static int hf_btatt_glucose_measurement_context_flags_medication_value_units = -1;
-static int hf_btatt_glucose_measurement_context_flags_medication_id_and_medication = -1;
-static int hf_btatt_glucose_measurement_context_flags_exercise_duration_and_exercise_intensity = -1;
-static int hf_btatt_glucose_measurement_context_flags_tester_health = -1;
-static int hf_btatt_glucose_measurement_context_flags_meal = -1;
-static int hf_btatt_glucose_measurement_context_flags_carbohydrate_id_and_carbohydrate = -1;
-static int hf_btatt_glucose_measurement_context_sequence_number = -1;
-static int hf_btatt_glucose_measurement_context_extended_flags = -1;
-static int hf_btatt_glucose_measurement_context_extended_flags_reserved = -1;
-static int hf_btatt_glucose_measurement_context_carbohydrate_id = -1;
-static int hf_btatt_glucose_measurement_context_carbohydrate_kg = -1;
-static int hf_btatt_glucose_measurement_context_meal = -1;
-static int hf_btatt_glucose_measurement_context_tester_health = -1;
-static int hf_btatt_glucose_measurement_context_tester = -1;
-static int hf_btatt_glucose_measurement_context_health = -1;
-static int hf_btatt_glucose_measurement_context_exercise_duration = -1;
-static int hf_btatt_glucose_measurement_context_exercise_intensity = -1;
-static int hf_btatt_glucose_measurement_context_medication_id = -1;
-static int hf_btatt_glucose_measurement_context_medication_l = -1;
-static int hf_btatt_glucose_measurement_context_medication_kg = -1;
-static int hf_btatt_glucose_measurement_context_hba1c = -1;
-static int hf_btatt_blood_pressure_measurement_flags = -1;
-static int hf_btatt_blood_pressure_measurement_flags_reserved = -1;
-static int hf_btatt_blood_pressure_measurement_flags_measurement_status = -1;
-static int hf_btatt_blood_pressure_measurement_flags_user_id = -1;
-static int hf_btatt_blood_pressure_measurement_flags_pulse_rate = -1;
-static int hf_btatt_blood_pressure_measurement_flags_timestamp = -1;
-static int hf_btatt_blood_pressure_measurement_flags_unit = -1;
-static int hf_btatt_blood_pressure_measurement_compound_value_systolic_kpa = -1;
-static int hf_btatt_blood_pressure_measurement_compound_value_diastolic_kpa = -1;
-static int hf_btatt_blood_pressure_measurement_compound_value_mean_arterial_pressure_kpa = -1;
-static int hf_btatt_blood_pressure_measurement_compound_value_systolic_mmhg = -1;
-static int hf_btatt_blood_pressure_measurement_compound_value_diastolic_mmhg = -1;
-static int hf_btatt_blood_pressure_measurement_compound_value_mean_arterial_pressure_mmhg = -1;
-static int hf_btatt_blood_pressure_measurement_timestamp = -1;
-static int hf_btatt_blood_pressure_measurement_pulse_rate = -1;
-static int hf_btatt_blood_pressure_measurement_user_id = -1;
-static int hf_btatt_blood_pressure_measurement_status = -1;
-static int hf_btatt_blood_pressure_measurement_status_reserved = -1;
-static int hf_btatt_blood_pressure_measurement_status_improper_measurement_position = -1;
-static int hf_btatt_blood_pressure_measurement_status_pulse_rate_range_detection = -1;
-static int hf_btatt_blood_pressure_measurement_status_irregular_pulse = -1;
-static int hf_btatt_blood_pressure_measurement_status_cuff_fit_too_loose = -1;
-static int hf_btatt_blood_pressure_measurement_status_body_movement = -1;
-static int hf_btatt_heart_rate_measurement_flags = -1;
-static int hf_btatt_heart_rate_measurement_flags_reserved = -1;
-static int hf_btatt_heart_rate_measurement_flags_rr_interval = -1;
-static int hf_btatt_heart_rate_measurement_flags_energy_expended = -1;
-static int hf_btatt_heart_rate_measurement_flags_sensor_contact_status_support = -1;
-static int hf_btatt_heart_rate_measurement_flags_sensor_contact_status_contact = -1;
-static int hf_btatt_heart_rate_measurement_flags_value_16 = -1;
-static int hf_btatt_heart_rate_measurement_value_8 = -1;
-static int hf_btatt_heart_rate_measurement_value_16 = -1;
-static int hf_btatt_heart_rate_measurement_energy_expended = -1;
-static int hf_btatt_heart_rate_measurement_rr_intervals = -1;
-static int hf_btatt_heart_rate_measurement_rr_interval = -1;
-static int hf_btatt_record_access_control_point_opcode = -1;
-static int hf_btatt_record_access_control_point_operator = -1;
-static int hf_btatt_record_access_control_point_operand = -1;
-static int hf_btatt_record_access_control_point_operand_filter_type = -1;
-static int hf_btatt_record_access_control_point_operand_min_time_offset = -1;
-static int hf_btatt_record_access_control_point_operand_max_time_offset = -1;
-static int hf_btatt_record_access_control_point_operand_number_of_records = -1;
-static int hf_btatt_record_access_control_point_request_opcode = -1;
-static int hf_btatt_record_access_control_point_response_code = -1;
-static int hf_btatt_value_trigger_setting_condition = -1;
-static int hf_btatt_value_trigger_setting_analog = -1;
-static int hf_btatt_value_trigger_setting_analog_one = -1;
-static int hf_btatt_value_trigger_setting_analog_two = -1;
-static int hf_btatt_digital = -1;
-static int hf_btatt_digital_output = -1;
-static int hf_btatt_analog = -1;
-static int hf_btatt_analog_output = -1;
-static int hf_btatt_location_name = -1;
-static int hf_btatt_uncertainty = -1;
-static int hf_btatt_uncertainty_reserved = -1;
-static int hf_btatt_uncertainty_precision = -1;
-static int hf_btatt_uncertainty_update_time = -1;
-static int hf_btatt_uncertainty_stationary = -1;
-static int hf_btatt_latitude = -1;
-static int hf_btatt_longitude = -1;
-static int hf_btatt_local_north_coordinate = -1;
-static int hf_btatt_local_east_coordinate = -1;
-static int hf_btatt_floor_number = -1;
-static int hf_btatt_altitude = -1;
-static int hf_btatt_indoor_positioning_configuration = -1;
-static int hf_btatt_indoor_positioning_configuration_reserved = -1;
-static int hf_btatt_indoor_positioning_configuration_location_name = -1;
-static int hf_btatt_indoor_positioning_configuration_uncertainty = -1;
-static int hf_btatt_indoor_positioning_configuration_floor_number = -1;
-static int hf_btatt_indoor_positioning_configuration_altitude = -1;
-static int hf_btatt_indoor_positioning_configuration_tx_power = -1;
-static int hf_btatt_indoor_positioning_configuration_coordinate_system = -1;
-static int hf_btatt_indoor_positioning_configuration_coordinates = -1;
-static int hf_btatt_number_of_digitals = -1;
-static int hf_btatt_time_trigger_setting_condition = -1;
-static int hf_btatt_time_trigger_setting_value = -1;
-static int hf_btatt_time_trigger_setting_value_count = -1;
-static int hf_btatt_time_trigger_setting_value_time_interval = -1;
-static int hf_btatt_rsc_measurement_flags = -1;
-static int hf_btatt_rsc_measurement_flags_reserved = -1;
-static int hf_btatt_rsc_measurement_flags_type_of_movement = -1;
-static int hf_btatt_rsc_measurement_flags_total_distance_present = -1;
-static int hf_btatt_rsc_measurement_flags_instantaneous_stride_length_present = -1;
-static int hf_btatt_rsc_measurement_instantaneous_speed = -1;
-static int hf_btatt_rsc_measurement_instantaneous_cadence = -1;
-static int hf_btatt_rsc_measurement_instantaneous_stride_length = -1;
-static int hf_btatt_rsc_measurement_total_distance = -1;
-static int hf_btatt_sc_control_point_opcode = -1;
-static int hf_btatt_sc_control_point_cumulative_value = -1;
-static int hf_btatt_sc_control_point_request_opcode = -1;
-static int hf_btatt_sc_control_point_response_value = -1;
-static int hf_btatt_cycling_power_measurement_flags = -1;
-static int hf_btatt_cycling_power_measurement_flags_reserved = -1;
-static int hf_btatt_cycling_power_measurement_flags_offset_compensation_indicator = -1;
-static int hf_btatt_cycling_power_measurement_flags_accumulated_energy = -1;
-static int hf_btatt_cycling_power_measurement_flags_bottom_dead_spot_angle = -1;
-static int hf_btatt_cycling_power_measurement_flags_top_dead_spot_angle = -1;
-static int hf_btatt_cycling_power_measurement_flags_extreme_angles = -1;
-static int hf_btatt_cycling_power_measurement_flags_extreme_torque_magnitudes = -1;
-static int hf_btatt_cycling_power_measurement_flags_extreme_force_magnitudes = -1;
-static int hf_btatt_cycling_power_measurement_flags_crank_revolution_data = -1;
-static int hf_btatt_cycling_power_measurement_flags_wheel_revolution_data = -1;
-static int hf_btatt_cycling_power_measurement_flags_accumulated_torque_source = -1;
-static int hf_btatt_cycling_power_measurement_flags_accumulated_torque = -1;
-static int hf_btatt_cycling_power_measurement_flags_pedal_power_balance_reference = -1;
-static int hf_btatt_cycling_power_measurement_flags_pedal_power_balance = -1;
-static int hf_btatt_cycling_power_measurement_instantaneous_power = -1;
-static int hf_btatt_cycling_power_measurement_pedal_power_balance = -1;
-static int hf_btatt_cycling_power_measurement_accumulated_torque = -1;
-static int hf_btatt_cycling_power_measurement_wheel_revolution_data_cumulative_wheel_revolutions = -1;
-static int hf_btatt_cycling_power_measurement_wheel_revolution_data_last_wheel_event_time = -1;
-static int hf_btatt_cycling_power_measurement_crank_revolution_data_cumulative_crank_revolutions = -1;
-static int hf_btatt_cycling_power_measurement_crank_revolution_data_last_crank_event_time = -1;
-static int hf_btatt_cycling_power_measurement_extreme_force_magnitudes_maximum_force_magnitude = -1;
-static int hf_btatt_cycling_power_measurement_extreme_force_magnitudes_minimum_force_magnitude = -1;
-static int hf_btatt_cycling_power_measurement_extreme_torque_magnitudes_maximum_torque_magnitude = -1;
-static int hf_btatt_cycling_power_measurement_extreme_torque_magnitudes_minimum_torque_magnitude = -1;
-static int hf_btatt_cycling_power_measurement_extreme_angles = -1;
-static int hf_btatt_cycling_power_measurement_extreme_angles_maximum = -1;
-static int hf_btatt_cycling_power_measurement_extreme_angles_minimum = -1;
-static int hf_btatt_cycling_power_measurement_top_dead_spot_angle = -1;
-static int hf_btatt_cycling_power_measurement_bottom_dead_spot_angle = -1;
-static int hf_btatt_cycling_power_measurement_accumulated_energy = -1;
-static int hf_btatt_csc_measurement_flags = -1;
-static int hf_btatt_csc_measurement_flags_reserved = -1;
-static int hf_btatt_csc_measurement_flags_crank_revolution_data = -1;
-static int hf_btatt_csc_measurement_flags_wheel_revolution_data = -1;
-static int hf_btatt_csc_measurement_cumulative_wheel_revolutions = -1;
-static int hf_btatt_csc_measurement_cumulative_crank_revolutions = -1;
-static int hf_btatt_csc_measurement_last_event_time = -1;
-static int hf_btatt_cycling_power_vector_flags = -1;
-static int hf_btatt_cycling_power_vector_flags_reserved = -1;
-static int hf_btatt_cycling_power_vector_flags_instantaneous_measurement_direction = -1;
-static int hf_btatt_cycling_power_vector_flags_instantaneous_torque_magnitude_array = -1;
-static int hf_btatt_cycling_power_vector_flags_instantaneous_force_magnitude_array = -1;
-static int hf_btatt_cycling_power_vector_flags_first_crank_measurement_angle = -1;
-static int hf_btatt_cycling_power_vector_flags_crank_revolution_data = -1;
-static int hf_btatt_cycling_power_vector_crank_revolution_data_cumulative_crank_revolutions = -1;
-static int hf_btatt_cycling_power_vector_crank_revolution_data_last_crank_event_time = -1;
-static int hf_btatt_cycling_power_vector_first_crank_measurement_angle = -1;
-static int hf_btatt_cycling_power_vector_instantaneous_force_magnitude_array = -1;
-static int hf_btatt_cycling_power_vector_instantaneous_torque_magnitude_array = -1;
-static int hf_btatt_cycling_power_control_point_opcode = -1;
-static int hf_btatt_cycling_power_control_point_cumulative_value = -1;
-static int hf_btatt_cycling_power_control_point_sensor_location = -1;
-static int hf_btatt_cycling_power_control_point_crank_length = -1;
-static int hf_btatt_cycling_power_control_point_chain_length = -1;
-static int hf_btatt_cycling_power_control_point_chain_weight = -1;
-static int hf_btatt_cycling_power_control_point_span_length = -1;
-static int hf_btatt_cycling_power_control_point_content_mask = -1;
-static int hf_btatt_cycling_power_control_point_content_mask_reserved = -1;
-static int hf_btatt_cycling_power_control_point_content_mask_accumulated_energy = -1;
-static int hf_btatt_cycling_power_control_point_content_mask_bottom_dead_spot_angle = -1;
-static int hf_btatt_cycling_power_control_point_content_mask_top_dead_spot_angle = -1;
-static int hf_btatt_cycling_power_control_point_content_mask_extreme_angles = -1;
-static int hf_btatt_cycling_power_control_point_content_mask_extreme_magnitudes = -1;
-static int hf_btatt_cycling_power_control_point_content_mask_crank_revolution_data = -1;
-static int hf_btatt_cycling_power_control_point_content_mask_wheel_revolution_data = -1;
-static int hf_btatt_cycling_power_control_point_content_mask_accumulated_torque = -1;
-static int hf_btatt_cycling_power_control_point_content_mask_pedal_power_balance = -1;
-static int hf_btatt_cycling_power_control_point_request_opcode = -1;
-static int hf_btatt_cycling_power_control_point_response_value = -1;
-static int hf_btatt_cycling_power_control_point_start_offset_compensation = -1;
-static int hf_btatt_cycling_power_control_point_sampling_rate = -1;
-static int hf_btatt_cycling_power_control_point_factory_calibration_date = -1;
-static int hf_btatt_location_and_speed_flags = -1;
-static int hf_btatt_location_and_speed_flags_reserved = -1;
-static int hf_btatt_location_and_speed_flags_heading_source = -1;
-static int hf_btatt_location_and_speed_flags_elevation_source = -1;
-static int hf_btatt_location_and_speed_flags_speed_and_distance_format = -1;
-static int hf_btatt_location_and_speed_flags_position_status = -1;
-static int hf_btatt_location_and_speed_flags_utc_time = -1;
-static int hf_btatt_location_and_speed_flags_rolling_time = -1;
-static int hf_btatt_location_and_speed_flags_heading = -1;
-static int hf_btatt_location_and_speed_flags_elevation = -1;
-static int hf_btatt_location_and_speed_flags_location = -1;
-static int hf_btatt_location_and_speed_flags_total_distance = -1;
-static int hf_btatt_location_and_speed_flags_instantaneous_speed = -1;
-static int hf_btatt_location_and_speed_instantaneous_speed = -1;
-static int hf_btatt_location_and_speed_total_distance = -1;
-static int hf_btatt_location_and_speed_location_latitude = -1;
-static int hf_btatt_location_and_speed_location_longitude = -1;
-static int hf_btatt_location_and_speed_elevation = -1;
-static int hf_btatt_location_and_speed_heading = -1;
-static int hf_btatt_location_and_speed_rolling_time = -1;
-static int hf_btatt_location_and_speed_utc_time = -1;
-static int hf_btatt_navigation_flags = -1;
-static int hf_btatt_navigation_flags_reserved = -1;
-static int hf_btatt_navigation_flags_destination_reached = -1;
-static int hf_btatt_navigation_flags_waypoint_reached = -1;
-static int hf_btatt_navigation_flags_navigation_indicator_type = -1;
-static int hf_btatt_navigation_flags_heading_source = -1;
-static int hf_btatt_navigation_flags_position_status = -1;
-static int hf_btatt_navigation_flags_estimated_time_of_arrival = -1;
-static int hf_btatt_navigation_flags_remaining_vertical_distance = -1;
-static int hf_btatt_navigation_flags_remaining_distance = -1;
-static int hf_btatt_navigation_bearing = -1;
-static int hf_btatt_navigation_heading = -1;
-static int hf_btatt_navigation_remaining_distance = -1;
-static int hf_btatt_navigation_remaining_vertical_distance = -1;
-static int hf_btatt_navigation_estimated_time_of_arrival = -1;
-static int hf_btatt_position_quality_flags = -1;
-static int hf_btatt_position_quality_flags_reserved = -1;
-static int hf_btatt_position_quality_flags_position_status = -1;
-static int hf_btatt_position_quality_flags_vdop = -1;
-static int hf_btatt_position_quality_flags_hdop = -1;
-static int hf_btatt_position_quality_flags_evpe = -1;
-static int hf_btatt_position_quality_flags_ehpe = -1;
-static int hf_btatt_position_quality_flags_time_to_first_fix = -1;
-static int hf_btatt_position_quality_flags_number_of_beacons_in_view = -1;
-static int hf_btatt_position_quality_flags_number_of_beacons_in_solution = -1;
-static int hf_btatt_position_quality_number_of_beacons_in_solution = -1;
-static int hf_btatt_position_quality_number_of_beacons_in_view = -1;
-static int hf_btatt_position_quality_time_to_first_fix = -1;
-static int hf_btatt_position_quality_ehpe = -1;
-static int hf_btatt_position_quality_evpe = -1;
-static int hf_btatt_position_quality_hdop = -1;
-static int hf_btatt_position_quality_vdop = -1;
-static int hf_btatt_ln_control_point_opcode = -1;
-static int hf_btatt_ln_control_point_cumulative_value = -1;
-static int hf_btatt_ln_control_point_content_mask = -1;
-static int hf_btatt_ln_control_point_content_mask_reserved = -1;
-static int hf_btatt_ln_control_point_content_mask_utc_time = -1;
-static int hf_btatt_ln_control_point_content_mask_rolling_time = -1;
-static int hf_btatt_ln_control_point_content_mask_heading = -1;
-static int hf_btatt_ln_control_point_content_mask_elevation = -1;
-static int hf_btatt_ln_control_point_content_mask_location = -1;
-static int hf_btatt_ln_control_point_content_mask_total_distance = -1;
-static int hf_btatt_ln_control_point_content_mask_instantaneous_speed = -1;
-static int hf_btatt_ln_control_point_navigation_control = -1;
-static int hf_btatt_ln_control_point_route_number = -1;
-static int hf_btatt_ln_control_point_fix_rate = -1;
-static int hf_btatt_ln_control_point_elevation = -1;
-static int hf_btatt_ln_control_point_request_opcode = -1;
-static int hf_btatt_ln_control_point_response_value = -1;
-static int hf_btatt_ln_control_point_response_value_number_of_routes = -1;
-static int hf_btatt_ln_control_point_response_value_name_of_route = -1;
-static int hf_btatt_body_composition_measurement_flags = -1;
-static int hf_btatt_body_composition_measurement_flags_reserved = -1;
-static int hf_btatt_body_composition_measurement_flags_multiple_packet_measurement = -1;
-static int hf_btatt_body_composition_measurement_flags_height = -1;
-static int hf_btatt_body_composition_measurement_flags_weight = -1;
-static int hf_btatt_body_composition_measurement_flags_impedance = -1;
-static int hf_btatt_body_composition_measurement_flags_body_water_mass = -1;
-static int hf_btatt_body_composition_measurement_flags_soft_lean_mass = -1;
-static int hf_btatt_body_composition_measurement_flags_fat_free_mass = -1;
-static int hf_btatt_body_composition_measurement_flags_muscle_mass = -1;
-static int hf_btatt_body_composition_measurement_flags_muscle_percentage = -1;
-static int hf_btatt_body_composition_measurement_flags_basal_metabolism = -1;
-static int hf_btatt_body_composition_measurement_flags_user_id = -1;
-static int hf_btatt_body_composition_measurement_flags_timestamp = -1;
-static int hf_btatt_body_composition_measurement_flags_measurement_units = -1;
-static int hf_btatt_body_composition_measurement_body_fat_percentage = -1;
-static int hf_btatt_body_composition_measurement_timestamp = -1;
-static int hf_btatt_body_composition_measurement_user_id = -1;
-static int hf_btatt_body_composition_measurement_basal_metabolism = -1;
-static int hf_btatt_body_composition_measurement_muscle_percentage = -1;
-static int hf_btatt_body_composition_measurement_muscle_mass_lb = -1;
-static int hf_btatt_body_composition_measurement_muscle_mass_kg = -1;
-static int hf_btatt_body_composition_measurement_fat_free_mass_lb = -1;
-static int hf_btatt_body_composition_measurement_fat_free_mass_kg = -1;
-static int hf_btatt_body_composition_measurement_soft_lean_mass_lb = -1;
-static int hf_btatt_body_composition_measurement_soft_lean_mass_kg = -1;
-static int hf_btatt_body_composition_measurement_body_water_mass_lb = -1;
-static int hf_btatt_body_composition_measurement_body_water_mass_kg = -1;
-static int hf_btatt_body_composition_measurement_impedance = -1;
-static int hf_btatt_body_composition_measurement_weight_lb = -1;
-static int hf_btatt_body_composition_measurement_weight_kg = -1;
-static int hf_btatt_body_composition_measurement_height_inches = -1;
-static int hf_btatt_body_composition_measurement_height_meter = -1;
-static int hf_btatt_weight_measurement_flags = -1;
-static int hf_btatt_weight_measurement_flags_reserved = -1;
-static int hf_btatt_weight_measurement_flags_bmi_and_height = -1;
-static int hf_btatt_weight_measurement_flags_user_id = -1;
-static int hf_btatt_weight_measurement_flags_timestamp = -1;
-static int hf_btatt_weight_measurement_flags_measurement_units = -1;
-static int hf_btatt_weight_measurement_weight_lb = -1;
-static int hf_btatt_weight_measurement_weight_kg = -1;
-static int hf_btatt_weight_measurement_timestamp = -1;
-static int hf_btatt_weight_measurement_user_id = -1;
-static int hf_btatt_weight_measurement_bmi = -1;
-static int hf_btatt_weight_measurement_height_in = -1;
-static int hf_btatt_weight_measurement_height_m = -1;
-static int hf_btatt_user_control_point_opcode = -1;
-static int hf_btatt_user_control_point_request_opcode = -1;
-static int hf_btatt_user_control_point_response_value = -1;
-static int hf_btatt_user_control_point_consent_code = -1;
-static int hf_btatt_cgm_measurement_size = -1;
-static int hf_btatt_cgm_measurement_flags = -1;
-static int hf_btatt_cgm_measurement_flags_cgm_trend_information = -1;
-static int hf_btatt_cgm_measurement_flags_cgm_quality = -1;
-static int hf_btatt_cgm_measurement_flags_reserved = -1;
-static int hf_btatt_cgm_measurement_flags_sensor_status_annunciation_warning = -1;
-static int hf_btatt_cgm_measurement_flags_sensor_status_annunciation_cal_temp = -1;
-static int hf_btatt_cgm_measurement_flags_sensor_status_annunciation_status = -1;
-static int hf_btatt_cgm_measurement_glucose_concentration = -1;
-static int hf_btatt_cgm_measurement_time_offset = -1;
-static int hf_btatt_cgm_sensor_status_annunciation = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_status = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_status_reserved = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_status_general_device_fault_has_occurred_in_the_sensor = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_status_device_specific_alert = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_status_sensor_malfunction = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_status_sensor_type_incorrect_for_device = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_status_device_battery_low = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_status_session_stopped = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_cal_temp = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_cal_temp_reserved = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_cal_temp_sensor_temperature_too_low_for_valid_test_result_at_time_of_measurement = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_cal_temp_sensor_temperature_too_high_for_valid_test_result_at_time_of_measurement = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_cal_temp_calibration_required = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_cal_temp_calibration_recommended = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_cal_temp_calibration_not_allowed = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_cal_temp_time_synchronization_between_sensor_and_collector_required = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_warning = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_result_higher_than_the_device_can_process = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_result_lower_than_the_device_can_process = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_rate_of_increase_exceeded = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_rate_of_decrease_exceeded = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_result_higher_than_the_hyper_level = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_result_lower_than_the_hypo_level = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_result_higher_than_the_patient_high_level = -1;
-static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_result_lower_than_the_patient_low_level = -1;
-static int hf_btatt_cgm_measurement_trend_information = -1;
-static int hf_btatt_cgm_measurement_quality = -1;
-static int hf_btatt_cgm_e2e_crc = -1;
-static int hf_btatt_cgm_feature_feature = -1;
-static int hf_btatt_cgm_feature_feature_reserved = -1;
-static int hf_btatt_cgm_feature_feature_quality = -1;
-static int hf_btatt_cgm_feature_feature_trend_information = -1;
-static int hf_btatt_cgm_feature_feature_multiple_sessions = -1;
-static int hf_btatt_cgm_feature_feature_multiple_bond = -1;
-static int hf_btatt_cgm_feature_feature_e2e_crc = -1;
-static int hf_btatt_cgm_feature_feature_general_device_fault = -1;
-static int hf_btatt_cgm_feature_feature_sensor_type_error_detection = -1;
-static int hf_btatt_cgm_feature_feature_low_battery_detection = -1;
-static int hf_btatt_cgm_feature_feature_sensor_result_high_low_detection = -1;
-static int hf_btatt_cgm_feature_feature_sensor_temperature_high_low_detection = -1;
-static int hf_btatt_cgm_feature_feature_sensor_malfunction_detection = -1;
-static int hf_btatt_cgm_feature_feature_device_specific_alert = -1;
-static int hf_btatt_cgm_feature_feature_rate_of_increase_decrease_alerts = -1;
-static int hf_btatt_cgm_feature_feature_hyper_alerts = -1;
-static int hf_btatt_cgm_feature_feature_hypo_alerts = -1;
-static int hf_btatt_cgm_feature_feature_patient_high_low_alerts = -1;
-static int hf_btatt_cgm_feature_feature_calibration = -1;
-static int hf_btatt_cgm_type_and_sample_location = -1;
-static int hf_btatt_cgm_type = -1;
-static int hf_btatt_cgm_sample_location = -1;
-static int hf_btatt_cgm_time_offset = -1;
-static int hf_btatt_cgm_status = -1;
-static int hf_btatt_cgm_session_start_time = -1;
-static int hf_btatt_cgm_session_run_time = -1;
-static int hf_btatt_cgm_specific_ops_control_point_opcode = -1;
-static int hf_btatt_cgm_specific_ops_control_point_operand = -1;
-static int hf_btatt_cgm_specific_ops_control_point_operand_communication_interval = -1;
-static int hf_btatt_cgm_specific_ops_control_point_calibration_glucose_concentration = -1;
-static int hf_btatt_cgm_specific_ops_control_point_calibration_time = -1;
-static int hf_btatt_cgm_specific_ops_control_point_next_calibration_time = -1;
-static int hf_btatt_cgm_specific_ops_control_point_calibration_data_record_number = -1;
-static int hf_btatt_cgm_specific_ops_control_point_calibration_status = -1;
-static int hf_btatt_cgm_specific_ops_control_point_calibration_status_reserved = -1;
-static int hf_btatt_cgm_specific_ops_control_point_calibration_status_pending = -1;
-static int hf_btatt_cgm_specific_ops_control_point_calibration_status_out_of_range = -1;
-static int hf_btatt_cgm_specific_ops_control_point_calibration_status_rejected = -1;
-static int hf_btatt_cgm_specific_ops_control_point_operand_calibration_data_record_number = -1;
-static int hf_btatt_cgm_specific_ops_control_point_operand_alert_level = -1;
-static int hf_btatt_cgm_specific_ops_control_point_operand_alert_level_rate = -1;
-static int hf_btatt_cgm_specific_ops_control_point_request_opcode = -1;
-static int hf_btatt_cgm_specific_ops_control_point_response_code = -1;
-static int hf_btatt_uri = -1;
-static int hf_btatt_http_headers = -1;
-static int hf_btatt_http_status_code = -1;
-static int hf_btatt_http_data_status = -1;
-static int hf_btatt_http_data_status_reserved = -1;
-static int hf_btatt_http_data_status_body_truncated = -1;
-static int hf_btatt_http_data_status_body_received = -1;
-static int hf_btatt_http_data_status_headers_truncated = -1;
-static int hf_btatt_http_data_status_headers_received = -1;
-static int hf_btatt_http_entity_body = -1;
-static int hf_btatt_http_control_point_opcode = -1;
-static int hf_btatt_https_security = -1;
-static int hf_btatt_tds_opcode = -1;
-static int hf_btatt_tds_result_code = -1;
-static int hf_btatt_tds_organization_id = -1;
-static int hf_btatt_tds_data = -1;
-static int hf_btatt_ots_feature_oacp = -1;
-static int hf_btatt_ots_feature_oacp_reserved = -1;
-static int hf_btatt_ots_feature_oacp_abort = -1;
-static int hf_btatt_ots_feature_oacp_patching_of_object = -1;
-static int hf_btatt_ots_feature_oacp_truncation_of_objects = -1;
-static int hf_btatt_ots_feature_oacp_appending_additional_data_to_object = -1;
-static int hf_btatt_ots_feature_oacp_write = -1;
-static int hf_btatt_ots_feature_oacp_read = -1;
-static int hf_btatt_ots_feature_oacp_execute = -1;
-static int hf_btatt_ots_feature_oacp_calculate_checksum = -1;
-static int hf_btatt_ots_feature_oacp_delete = -1;
-static int hf_btatt_ots_feature_oacp_create = -1;
-static int hf_btatt_ots_feature_olcp = -1;
-static int hf_btatt_ots_feature_olcp_reserved = -1;
-static int hf_btatt_ots_feature_olcp_clear_marking = -1;
-static int hf_btatt_ots_feature_olcp_request_number_of_objects = -1;
-static int hf_btatt_ots_feature_olcp_order = -1;
-static int hf_btatt_ots_feature_olcp_go_to = -1;
-static int hf_btatt_ots_object_name = -1;
-static int hf_btatt_ots_current_size = -1;
-static int hf_btatt_ots_allocated_size = -1;
-static int hf_btatt_ots_object_id = -1;
-static int hf_btatt_ots_properties = -1;
-static int hf_btatt_ots_properties_reserved = -1;
-static int hf_btatt_ots_properties_mark = -1;
-static int hf_btatt_ots_properties_patch = -1;
-static int hf_btatt_ots_properties_truncate = -1;
-static int hf_btatt_ots_properties_append = -1;
-static int hf_btatt_ots_properties_write = -1;
-static int hf_btatt_ots_properties_read = -1;
-static int hf_btatt_ots_properties_execute = -1;
-static int hf_btatt_ots_properties_delete = -1;
-static int hf_btatt_ots_flags = -1;
-static int hf_btatt_ots_flags_reserved = -1;
-static int hf_btatt_ots_flags_object_deletion = -1;
-static int hf_btatt_ots_flags_object_creation = -1;
-static int hf_btatt_ots_flags_change_occurred_to_the_object_metadata = -1;
-static int hf_btatt_ots_flags_change_occurred_to_the_object_contents = -1;
-static int hf_btatt_ots_flags_source_of_change = -1;
-static int hf_btatt_ots_action_opcode = -1;
-static int hf_btatt_ots_size = -1;
-static int hf_btatt_ots_offset = -1;
-static int hf_btatt_ots_length = -1;
-static int hf_btatt_ots_execute_data = -1;
-static int hf_btatt_ots_action_response_opcode = -1;
-static int hf_btatt_ots_action_result_code = -1;
-static int hf_btatt_ots_checksum = -1;
-static int hf_btatt_ots_list_opcode = -1;
-static int hf_btatt_ots_list_order = -1;
-static int hf_btatt_ots_list_response_opcode = -1;
-static int hf_btatt_ots_list_result_code = -1;
-static int hf_btatt_ots_list_total_number_of_objects = -1;
-static int hf_btatt_ots_filter = -1;
-static int hf_btatt_ots_name_string = -1;
-static int hf_btatt_ots_size_from = -1;
-static int hf_btatt_ots_size_to = -1;
-static int hf_btatt_ots_object_first_created = -1;
-static int hf_btatt_ots_object_last_modified = -1;
-static int hf_btatt_plx_spot_check_measurement_flags = -1;
-static int hf_btatt_plx_spot_check_measurement_flags_reserved = -1;
-static int hf_btatt_plx_spot_check_measurement_flags_device_clock_is_not_set = -1;
-static int hf_btatt_plx_spot_check_measurement_flags_pulse_amplitude_index = -1;
-static int hf_btatt_plx_spot_check_measurement_flags_device_and_sensor_status = -1;
-static int hf_btatt_plx_spot_check_measurement_flags_measurement_status = -1;
-static int hf_btatt_plx_spot_check_measurement_flags_timestamp = -1;
-static int hf_btatt_plx_spo2 = -1;
-static int hf_btatt_plx_pulse_rate = -1;
-static int hf_btatt_plx_spot_check_measurement_timestamp = -1;
-static int hf_btatt_plx_measurement_status = -1;
-static int hf_btatt_plx_measurement_status_invalid_measurement_detected = -1;
-static int hf_btatt_plx_measurement_status_questionable_measurement_detected = -1;
-static int hf_btatt_plx_measurement_status_measurement_unavailable = -1;
-static int hf_btatt_plx_measurement_status_calibration_ongoing = -1;
-static int hf_btatt_plx_measurement_status_data_for_testing = -1;
-static int hf_btatt_plx_measurement_status_data_for_demonstration = -1;
-static int hf_btatt_plx_measurement_status_data_from_measurement_storage = -1;
-static int hf_btatt_plx_measurement_status_fully_qualified_data = -1;
-static int hf_btatt_plx_measurement_status_validated_data = -1;
-static int hf_btatt_plx_measurement_status_early_estimated_data = -1;
-static int hf_btatt_plx_measurement_status_measurement_ongoing = -1;
-static int hf_btatt_plx_measurement_status_reserved = -1;
-static int hf_btatt_plx_device_and_sensor_status = -1;
-static int hf_btatt_plx_device_and_sensor_status_reserved = -1;
-static int hf_btatt_plx_device_and_sensor_status_sensor_disconnected = -1;
-static int hf_btatt_plx_device_and_sensor_status_sensor_malfunctioning = -1;
-static int hf_btatt_plx_device_and_sensor_status_sensor_displaced = -1;
-static int hf_btatt_plx_device_and_sensor_status_unknown_sensor_connected = -1;
-static int hf_btatt_plx_device_and_sensor_status_sensor_unconnected_to_user = -1;
-static int hf_btatt_plx_device_and_sensor_status_sensor_interference_detected = -1;
-static int hf_btatt_plx_device_and_sensor_status_signal_analysis_ongoing = -1;
-static int hf_btatt_plx_device_and_sensor_status_questionable_pulse_detected = -1;
-static int hf_btatt_plx_device_and_sensor_status_non_pulsatile_signal_detected = -1;
-static int hf_btatt_plx_device_and_sensor_status_erratic_signal_detected = -1;
-static int hf_btatt_plx_device_and_sensor_status_low_perfusion_detected = -1;
-static int hf_btatt_plx_device_and_sensor_status_poor_signal_detected = -1;
-static int hf_btatt_plx_device_and_sensor_status_inadequate_signal_detected = -1;
-static int hf_btatt_plx_device_and_sensor_status_signal_processing_irregularity_detected = -1;
-static int hf_btatt_plx_device_and_sensor_status_equipment_malfunction_detected = -1;
-static int hf_btatt_plx_device_and_sensor_status_extended_display_update_ongoing = -1;
-static int hf_btatt_plx_pulse_amplitude_index = -1;
-static int hf_btatt_plx_spo2pr_spot_check = -1;
-static int hf_btatt_plx_spo2pr_normal = -1;
-static int hf_btatt_plx_spo2pr_fast = -1;
-static int hf_btatt_plx_spo2pr_slow = -1;
-static int hf_btatt_plx_continuous_measurement_flags = -1;
-static int hf_btatt_plx_continuous_measurement_flags_reserved = -1;
-static int hf_btatt_plx_continuous_measurement_flags_pulse_amplitude_index = -1;
-static int hf_btatt_plx_continuous_measurement_flags_device_and_sensor_status = -1;
-static int hf_btatt_plx_continuous_measurement_flags_measurement_status = -1;
-static int hf_btatt_plx_continuous_measurement_flags_spo2pr_slow = -1;
-static int hf_btatt_plx_continuous_measurement_flags_spo2pr_fast = -1;
-static int hf_btatt_plx_features_supported_features = -1;
-static int hf_btatt_plx_features_supported_features_reserved = -1;
-static int hf_btatt_plx_features_supported_features_multiple_bonds = -1;
-static int hf_btatt_plx_features_supported_features_pulse_amplitude_index = -1;
-static int hf_btatt_plx_features_supported_features_spo2pr_slow = -1;
-static int hf_btatt_plx_features_supported_features_spo2pr_fast = -1;
-static int hf_btatt_plx_features_supported_features_timestamp_storage_for_spot_check = -1;
-static int hf_btatt_plx_features_supported_features_measurement_storage_for_spot_check = -1;
-static int hf_btatt_plx_features_supported_features_device_and_sensor_status = -1;
-static int hf_btatt_plx_features_supported_features_measurement_status = -1;
-static int hf_btatt_regulatory_certification_data_list_count = -1;
-static int hf_btatt_regulatory_certification_data_list_length = -1;
-static int hf_btatt_regulatory_certification_data_list_item = -1;
-static int hf_btatt_regulatory_certification_data_list_item_body = -1;
-static int hf_btatt_regulatory_certification_data_list_item_body_structure_type = -1;
-static int hf_btatt_regulatory_certification_data_list_item_body_structure_length = -1;
-static int hf_btatt_regulatory_certification_data_list_item_authorizing_body_data = -1;
-static int hf_btatt_regulatory_certification_data_list_item_authorizing_body_data_major_ig_version = -1;
-static int hf_btatt_regulatory_certification_data_list_item_authorizing_body_data_minor_ig_version = -1;
-static int hf_btatt_regulatory_certification_data_list_item_authorizing_body_data_certification_data_list_count = -1;
-static int hf_btatt_regulatory_certification_data_list_item_authorizing_body_data_certification_data_list_length = -1;
-static int hf_btatt_regulatory_certification_data_list_item_authorizing_body_data_certification_data_list = -1;
-static int hf_btatt_regulatory_certification_data_list_item_authorizing_body_data_certified_device_class = -1;
-static int hf_btatt_regulatory_certification_data_list_item_regulation_bit_field_type = -1;
-static int hf_btatt_regulatory_certification_data_list_item_data = -1;
-static int hf_btatt_timezone_information = -1;
-static int hf_btatt_timezone_information_information = -1;
-static int hf_btatt_timezone_information_information_type = -1;
-static int hf_gatt_nordic_uart_tx = -1;
-static int hf_gatt_nordic_uart_rx = -1;
-static int hf_gatt_nordic_dfu_packet = -1;
-static int hf_gatt_nordic_dfu_control_point_opcode = -1;
-static int hf_gatt_nordic_dfu_control_point_init_packet = -1;
-static int hf_gatt_nordic_dfu_control_point_number_of_bytes = -1;
-static int hf_gatt_nordic_dfu_control_point_image_type = -1;
-static int hf_gatt_nordic_dfu_control_point_number_of_packets = -1;
-static int hf_gatt_nordic_dfu_control_point_request_opcode = -1;
-static int hf_gatt_nordic_dfu_control_point_response_value = -1;
-static int hf_gatt_microbit_accelerometer_data = -1;
-static int hf_gatt_microbit_accelerometer_x = -1;
-static int hf_gatt_microbit_accelerometer_y = -1;
-static int hf_gatt_microbit_accelerometer_z = -1;
-static int hf_gatt_microbit_accelerometer_period = -1;
-static int hf_gatt_microbit_magnetometer_data = -1;
-static int hf_gatt_microbit_magnetometer_x = -1;
-static int hf_gatt_microbit_magnetometer_y = -1;
-static int hf_gatt_microbit_magnetometer_z = -1;
-static int hf_gatt_microbit_magnetometer_period = -1;
-static int hf_gatt_microbit_magnetometer_bearing = -1;
-static int hf_gatt_microbit_button_a_state = -1;
-static int hf_gatt_microbit_button_b_state = -1;
-static int hf_gatt_microbit_pin_data = -1;
-static int hf_gatt_microbit_pin_number = -1;
-static int hf_gatt_microbit_pin_value = -1;
-static int hf_gatt_microbit_pin_ad_config = -1;
-static int hf_gatt_microbit_ad_pin0 = -1;
-static int hf_gatt_microbit_ad_pin1 = -1;
-static int hf_gatt_microbit_ad_pin2 = -1;
-static int hf_gatt_microbit_ad_pin3 = -1;
-static int hf_gatt_microbit_ad_pin4 = -1;
-static int hf_gatt_microbit_ad_pin5 = -1;
-static int hf_gatt_microbit_ad_pin6 = -1;
-static int hf_gatt_microbit_ad_pin7 = -1;
-static int hf_gatt_microbit_ad_pin8 = -1;
-static int hf_gatt_microbit_ad_pin9 = -1;
-static int hf_gatt_microbit_ad_pin10 = -1;
-static int hf_gatt_microbit_ad_pin11 = -1;
-static int hf_gatt_microbit_ad_pin12 = -1;
-static int hf_gatt_microbit_ad_pin13 = -1;
-static int hf_gatt_microbit_ad_pin14 = -1;
-static int hf_gatt_microbit_ad_pin15 = -1;
-static int hf_gatt_microbit_ad_pin16 = -1;
-static int hf_gatt_microbit_ad_pin17 = -1;
-static int hf_gatt_microbit_ad_pin18 = -1;
-static int hf_gatt_microbit_ad_pin19 = -1;
-static int hf_gatt_microbit_pin_io_config = -1;
-static int hf_gatt_microbit_io_pin0 = -1;
-static int hf_gatt_microbit_io_pin1 = -1;
-static int hf_gatt_microbit_io_pin2 = -1;
-static int hf_gatt_microbit_io_pin3 = -1;
-static int hf_gatt_microbit_io_pin4 = -1;
-static int hf_gatt_microbit_io_pin5 = -1;
-static int hf_gatt_microbit_io_pin6 = -1;
-static int hf_gatt_microbit_io_pin7 = -1;
-static int hf_gatt_microbit_io_pin8 = -1;
-static int hf_gatt_microbit_io_pin9 = -1;
-static int hf_gatt_microbit_io_pin10 = -1;
-static int hf_gatt_microbit_io_pin11 = -1;
-static int hf_gatt_microbit_io_pin12 = -1;
-static int hf_gatt_microbit_io_pin13 = -1;
-static int hf_gatt_microbit_io_pin14 = -1;
-static int hf_gatt_microbit_io_pin15 = -1;
-static int hf_gatt_microbit_io_pin16 = -1;
-static int hf_gatt_microbit_io_pin17 = -1;
-static int hf_gatt_microbit_io_pin18 = -1;
-static int hf_gatt_microbit_io_pin19 = -1;
-static int hf_gatt_microbit_pwm_control = -1;
-static int hf_gatt_microbit_led_matrix = -1;
-static int hf_gatt_microbit_led_text = -1;
-static int hf_gatt_microbit_scrolling_delay = -1;
-static int hf_gatt_microbit_microbit_requirements = -1;
-static int hf_gatt_microbit_microbit_event = -1;
-static int hf_gatt_microbit_client_requirements = -1;
-static int hf_gatt_microbit_client_event = -1;
-static int hf_gatt_microbit_dfu_control = -1;
-static int hf_gatt_microbit_temperature_value = -1;
-static int hf_gatt_microbit_temperature_period = -1;
-static int hf_btatt_valid_range_lower_inclusive_value = -1;
-static int hf_btatt_valid_range_upper_inclusive_value = -1;
-static int hf_btatt_temperature_celsius = -1;
-static int hf_btatt_temperature_fahrenheit = -1;
-static int hf_btatt_removable = -1;
-static int hf_btatt_removable_reserved = -1;
-static int hf_btatt_removable_removable = -1;
-static int hf_btatt_service_required = -1;
-static int hf_btatt_service_required_reserved = -1;
-static int hf_btatt_service_required_service_required = -1;
-static int hf_btatt_scientific_temperature_celsius = -1;
-static int hf_btatt_string = -1;
-static int hf_btatt_network_availability = -1;
-static int hf_btatt_fitness_machine_features = -1;
-static int hf_btatt_fitness_machine_features_reserved = -1;
-static int hf_btatt_fitness_machine_features_user_data_retention = -1;
-static int hf_btatt_fitness_machine_features_force_on_belt_and_power_output = -1;
-static int hf_btatt_fitness_machine_features_power_measurement = -1;
-static int hf_btatt_fitness_machine_features_remaining_time = -1;
-static int hf_btatt_fitness_machine_features_elapsed_time = -1;
-static int hf_btatt_fitness_machine_features_metabolic_equivalent = -1;
-static int hf_btatt_fitness_machine_features_heart_rate_measurement = -1;
-static int hf_btatt_fitness_machine_features_expended_energy = -1;
-static int hf_btatt_fitness_machine_features_stride_count = -1;
-static int hf_btatt_fitness_machine_features_resistance_level = -1;
-static int hf_btatt_fitness_machine_features_step_count = -1;
-static int hf_btatt_fitness_machine_features_pace = -1;
-static int hf_btatt_fitness_machine_features_elevation_gain = -1;
-static int hf_btatt_fitness_machine_features_inclination = -1;
-static int hf_btatt_fitness_machine_features_total_distance = -1;
-static int hf_btatt_fitness_machine_features_cadence = -1;
-static int hf_btatt_fitness_machine_features_average_speed = -1;
-static int hf_btatt_target_setting_features = -1;
-static int hf_btatt_target_setting_features_reserved = -1;
-static int hf_btatt_target_setting_features_targeted_cadence_configuration = -1;
-static int hf_btatt_target_setting_features_spin_down_control = -1;
-static int hf_btatt_target_setting_features_wheel_circumference_configuration = -1;
-static int hf_btatt_target_setting_features_indoor_bike_simulation_parameters = -1;
-static int hf_btatt_target_setting_features_targeted_time_in_five_heart_rate_zones_configuration = -1;
-static int hf_btatt_target_setting_features_targeted_time_in_three_heart_rate_zones_configuration = -1;
-static int hf_btatt_target_setting_features_targeted_time_in_two_heart_rate_zones_configuration = -1;
-static int hf_btatt_target_setting_features_targeted_training_time_configuration = -1;
-static int hf_btatt_target_setting_features_targeted_distance_configuration = -1;
-static int hf_btatt_target_setting_features_targeted_stride_number_configuration = -1;
-static int hf_btatt_target_setting_features_targeted_step_number_configuration = -1;
-static int hf_btatt_target_setting_features_targeted_expended_energy_configuration = -1;
-static int hf_btatt_target_setting_features_heart_rate_target_setting = -1;
-static int hf_btatt_target_setting_features_power_target_setting = -1;
-static int hf_btatt_target_setting_features_resistance_target_setting = -1;
-static int hf_btatt_target_setting_features_inclination_target_setting = -1;
-static int hf_btatt_target_setting_features_speed_target_setting = -1;
-static int hf_btatt_training_status_flags = -1;
-static int hf_btatt_training_status_flags_reserved = -1;
-static int hf_btatt_training_status_flags_extended_string = -1;
-static int hf_btatt_training_status_flags_training_status_string = -1;
-static int hf_btatt_training_status_status = -1;
-static int hf_btatt_training_status_status_string = -1;
-static int hf_btatt_supported_speed_range_minimum_speed = -1;
-static int hf_btatt_supported_speed_range_maximum_speed = -1;
-static int hf_btatt_supported_speed_range_minimum_increment = -1;
-static int hf_btatt_supported_inclination_range_minimum_inclination = -1;
-static int hf_btatt_supported_inclination_range_maximum_inclination = -1;
-static int hf_btatt_supported_inclination_range_minimum_increment = -1;
-static int hf_btatt_supported_resistance_level_range_minimum_resistance_level = -1;
-static int hf_btatt_supported_resistance_level_range_maximum_resistance_level = -1;
-static int hf_btatt_supported_resistance_level_range_minimum_increment = -1;
-static int hf_btatt_supported_heart_rate_range_minimum_heart_rate = -1;
-static int hf_btatt_supported_heart_rate_range_maximum_heart_rate = -1;
-static int hf_btatt_supported_heart_rate_range_minimum_increment = -1;
-static int hf_btatt_supported_power_range_minimum_power = -1;
-static int hf_btatt_supported_power_range_maximum_power = -1;
-static int hf_btatt_supported_power_range_minimum_increment = -1;
-static int hf_btatt_fitness_machine_status_opcode = -1;
-static int hf_btatt_fitness_machine_control_information = -1;
-static int hf_btatt_fitness_machine_spin_down_status = -1;
-static int hf_btatt_fitness_machine_speed = -1;
-static int hf_btatt_fitness_machine_incline = -1;
-static int hf_btatt_fitness_machine_resistance_level = -1;
-static int hf_btatt_fitness_machine_power = -1;
-static int hf_btatt_fitness_machine_heart_rate = -1;
-static int hf_btatt_fitness_machine_expended_energy = -1;
-static int hf_btatt_fitness_machine_number_of_steps = -1;
-static int hf_btatt_fitness_machine_number_of_strides = -1;
-static int hf_btatt_fitness_machine_distance = -1;
-static int hf_btatt_fitness_machine_training_time = -1;
-static int hf_btatt_fitness_machine_wheel_circumference = -1;
-static int hf_btatt_fitness_machine_cadence = -1;
-static int hf_btatt_fitness_machine_wind_speed = -1;
-static int hf_btatt_fitness_machine_grade = -1;
-static int hf_btatt_fitness_machine_coefficient_of_rolling_resistance = -1;
-static int hf_btatt_fitness_machine_wind_resistance_coefficient = -1;
-static int hf_btatt_fitness_machine_targeted_time_in_fat_burn_zone = -1;
-static int hf_btatt_fitness_machine_targeted_time_in_fitness_zone = -1;
-static int hf_btatt_fitness_machine_targeted_time_in_very_light_zone = -1;
-static int hf_btatt_fitness_machine_targeted_time_in_light_zone = -1;
-static int hf_btatt_fitness_machine_targeted_time_in_moderate_zone = -1;
-static int hf_btatt_fitness_machine_targeted_time_in_hard_zone = -1;
-static int hf_btatt_fitness_machine_targeted_time_in_maximum_zone = -1;
-static int hf_btatt_volume_setting = -1;
-static int hf_btatt_volume_mute = -1;
-static int hf_btatt_volume_change_counter = -1;
-static int hf_btatt_volume_control_point_procedure = -1;
-static int hf_btatt_volume_flags = -1;
-
-static int hf_request_in_frame = -1;
-static int hf_response_in_frame = -1;
+static int proto_btatt;
+static int proto_btgatt;
+
+static int hf_btatt_opcode;
+static int hf_btatt_handle;
+static int hf_btatt_starting_handle;
+static int hf_btatt_ending_handle;
+static int hf_btatt_group_end_handle;
+static int hf_btatt_value;
+static int hf_btatt_req_opcode_in_error;
+static int hf_btatt_handle_in_error;
+static int hf_btatt_error_code;
+static int hf_btatt_error_code_aios;
+static int hf_btatt_error_code_ans;
+static int hf_btatt_error_code_bms;
+static int hf_btatt_error_code_cgms;
+static int hf_btatt_error_code_cps;
+static int hf_btatt_error_code_cscs;
+static int hf_btatt_error_code_cts;
+static int hf_btatt_error_code_ess;
+static int hf_btatt_error_code_gls;
+static int hf_btatt_error_code_hps;
+static int hf_btatt_error_code_hrs;
+static int hf_btatt_error_code_hts;
+static int hf_btatt_error_code_ips;
+static int hf_btatt_error_code_ots;
+static int hf_btatt_error_code_rscs;
+static int hf_btatt_error_code_uds;
+static int hf_btatt_service_uuid16;
+static int hf_btatt_service_uuid128;
+static int hf_btatt_characteristic_uuid16;
+static int hf_btatt_characteristic_uuid128;
+static int hf_btatt_uuid16;
+static int hf_btatt_uuid128;
+static int hf_btatt_client_rx_mtu;
+static int hf_btatt_server_rx_mtu;
+static int hf_btatt_uuid_format;
+static int hf_btatt_length;
+static int hf_btatt_offset;
+static int hf_btatt_flags;
+static int hf_btatt_sign_counter;
+static int hf_btatt_signature;
+static int hf_btatt_attribute_data;
+static int hf_btatt_handles_info;
+static int hf_btatt_opcode_authentication_signature;
+static int hf_btatt_opcode_command;
+static int hf_btatt_opcode_method;
+static int hf_btatt_characteristic_properties;
+static int hf_btatt_characteristic_value_handle;
+static int hf_btatt_characteristic_properties_extended_properties;
+static int hf_btatt_characteristic_properties_authenticated_signed_writes;
+static int hf_btatt_characteristic_properties_indicate;
+static int hf_btatt_characteristic_properties_notify;
+static int hf_btatt_characteristic_properties_write;
+static int hf_btatt_characteristic_properties_write_without_response;
+static int hf_btatt_characteristic_properties_read;
+static int hf_btatt_characteristic_properties_broadcast;
+static int hf_btatt_information_data;
+static int hf_btatt_included_service_handle;
+static int hf_btatt_characteristic_configuration_client;
+static int hf_btatt_characteristic_configuration_client_reserved;
+static int hf_btatt_characteristic_configuration_client_indication;
+static int hf_btatt_characteristic_configuration_client_notification;
+static int hf_btatt_characteristic_configuration_server;
+static int hf_btatt_characteristic_configuration_server_reserved;
+static int hf_btatt_characteristic_configuration_server_broadcast;
+static int hf_btatt_hogp_protocol_mode;
+static int hf_btatt_hogp_bcd_hid;
+static int hf_btatt_hogp_b_country_code;
+static int hf_btatt_hogp_flags;
+static int hf_btatt_hogp_flags_reserved;
+static int hf_btatt_hogp_flags_normally_connectable;
+static int hf_btatt_hogp_flags_remote_wake;
+static int hf_btatt_hogp_hid_control_point_command;
+static int hf_btatt_report_reference_report_id;
+static int hf_btatt_report_reference_report_type;
+static int hf_btatt_characteristic_user_description;
+static int hf_btatt_characteristic_extended_properties;
+static int hf_btatt_characteristic_extended_properties_reserved;
+static int hf_btatt_characteristic_extended_properties_writable_auxiliaries;
+static int hf_btatt_characteristic_extended_properties_reliable_write;
+static int hf_btatt_characteristic_presentation_format;
+static int hf_btatt_characteristic_presentation_exponent;
+static int hf_btatt_characteristic_presentation_unit;
+static int hf_btatt_characteristic_presentation_namespace;
+static int hf_btatt_characteristic_presentation_namespace_description_btsig;
+static int hf_btatt_characteristic_presentation_namespace_description;
+static int hf_btatt_esp_trigger_logic;
+static int hf_btatt_esp_condition;
+static int hf_btatt_esp_operand;
+static int hf_btatt_esp_flags;
+static int hf_btatt_esp_sampling_function;
+static int hf_btatt_esp_measurement_period;
+static int hf_btatt_esp_update_interval;
+static int hf_btatt_esp_application;
+static int hf_btatt_esp_measurement_uncertainty;
+static int hf_btatt_device_name;
+static int hf_btatt_appearance;
+static int hf_btatt_appearance_category;
+static int hf_btatt_appearance_subcategory;
+static int hf_btatt_appearance_subcategory_watch;
+static int hf_btatt_appearance_subcategory_thermometer;
+static int hf_btatt_appearance_subcategory_heart_rate;
+static int hf_btatt_appearance_subcategory_blood_pressure;
+static int hf_btatt_appearance_subcategory_hid;
+static int hf_btatt_appearance_subcategory_running_walking_sensor;
+static int hf_btatt_appearance_subcategory_cycling;
+static int hf_btatt_appearance_subcategory_pulse_oximeter;
+static int hf_btatt_appearance_subcategory_personal_mobility_device;
+static int hf_btatt_appearance_subcategory_insulin_pump;
+static int hf_btatt_appearance_subcategory_outdoor_sports_activity;
+static int hf_btatt_peripheral_privacy_flag;
+static int hf_btatt_minimum_connection_interval;
+static int hf_btatt_maximum_connection_interval;
+static int hf_btatt_slave_latency;
+static int hf_btatt_connection_supervision_timeout_multiplier;
+static int hf_btatt_reconnection_address;
+static int hf_btatt_alert_level;
+static int hf_btatt_tx_power_level;
+static int hf_btatt_year;
+static int hf_btatt_month;
+static int hf_btatt_day;
+static int hf_btatt_hours;
+static int hf_btatt_minutes;
+static int hf_btatt_seconds;
+static int hf_btatt_day_of_week;
+static int hf_btatt_fractions100;
+static int hf_btatt_fractions256;
+static int hf_btatt_dst_offset;
+static int hf_btatt_model_number_string;
+static int hf_btatt_serial_number_string;
+static int hf_btatt_firmware_revision_string;
+static int hf_btatt_hardware_revision_string;
+static int hf_btatt_software_revision_string;
+static int hf_btatt_manufacturer_string;
+static int hf_btatt_system_id_manufacturer_identifier;
+static int hf_btatt_system_id_organizationally_unique_identifier;
+static int hf_btatt_timezone;
+static int hf_btatt_time_accuracy;
+static int hf_btatt_time_source;
+static int hf_btatt_time_days_since_update;
+static int hf_btatt_time_hours_since_update;
+static int hf_btatt_time_update_control_point;
+static int hf_btatt_time_current_state;
+static int hf_btatt_time_result;
+static int hf_btatt_battery_level;
+static int hf_btatt_battery_power_state;
+static int hf_btatt_battery_power_state_present;
+static int hf_btatt_battery_power_state_discharging;
+static int hf_btatt_battery_power_state_charging;
+static int hf_btatt_battery_power_state_level;
+static int hf_btatt_temperature_type;
+static int hf_btatt_measurement_interval;
+static int hf_btatt_time_adjust_reason;
+static int hf_btatt_time_adjust_reason_reserved;
+static int hf_btatt_time_adjust_reason_change_of_dst;
+static int hf_btatt_time_adjust_reason_change_of_timezone;
+static int hf_btatt_time_adjust_reason_external_reference_time_update;
+static int hf_btatt_time_adjust_reason_manual_time_update;
+static int hf_btatt_magnetic_declination;
+static int hf_btatt_scan_refresh;
+static int hf_btatt_body_sensor_location;
+static int hf_btatt_heart_rate_control_point;
+static int hf_btatt_alert_status;
+static int hf_btatt_alert_status_reserved;
+static int hf_btatt_alert_status_display_alert_status;
+static int hf_btatt_alert_status_vibrate_state;
+static int hf_btatt_alert_status_ringer_state;
+static int hf_btatt_ringer_control_point;
+static int hf_btatt_ringer_setting;
+static int hf_btatt_alert_category_id_bitmask_1;
+static int hf_btatt_alert_category_id_bitmask_1_schedule;
+static int hf_btatt_alert_category_id_bitmask_1_voice_mail;
+static int hf_btatt_alert_category_id_bitmask_1_sms_mms;
+static int hf_btatt_alert_category_id_bitmask_1_missed_call;
+static int hf_btatt_alert_category_id_bitmask_1_call;
+static int hf_btatt_alert_category_id_bitmask_1_news;
+static int hf_btatt_alert_category_id_bitmask_1_email;
+static int hf_btatt_alert_category_id_bitmask_1_simple_alert;
+static int hf_btatt_alert_category_id_bitmask_2;
+static int hf_btatt_alert_category_id_bitmask_2_reserved;
+static int hf_btatt_alert_category_id_bitmask_2_instant_message;
+static int hf_btatt_alert_category_id_bitmask_2_high_prioritized_alert;
+static int hf_btatt_alert_category_id;
+static int hf_btatt_alert_command_id;
+static int hf_btatt_alert_unread_count;
+static int hf_btatt_alert_number_of_new_alert;
+static int hf_btatt_alert_text_string_information;
+static int hf_btatt_blood_pressure_feature;
+static int hf_btatt_blood_pressure_feature_reserved;
+static int hf_btatt_blood_pressure_feature_multiple_bond;
+static int hf_btatt_blood_pressure_feature_measurement_position_detection;
+static int hf_btatt_blood_pressure_feature_puls_rate_range;
+static int hf_btatt_blood_pressure_feature_irregular_pulse_detection;
+static int hf_btatt_blood_pressure_feature_cuff_fit_detection;
+static int hf_btatt_blood_pressure_feature_body_movement_detection;
+static int hf_btatt_le_scan_interval;
+static int hf_btatt_le_scan_window;
+static int hf_btatt_pnp_id_vendor_id_source;
+static int hf_btatt_pnp_id_vendor_id;
+static int hf_btatt_pnp_id_vendor_id_bluetooth_sig;
+static int hf_btatt_pnp_id_vendor_id_usb_forum;
+static int hf_btatt_pnp_id_product_id;
+static int hf_btatt_pnp_id_product_version;
+static int hf_btatt_glucose_feature;
+static int hf_btatt_glucose_feature_reserved;
+static int hf_btatt_glucose_feature_multiple_bond;
+static int hf_btatt_glucose_feature_time_fault;
+static int hf_btatt_glucose_feature_general_device_fault;
+static int hf_btatt_glucose_feature_sensor_read_interrupt_detection;
+static int hf_btatt_glucose_feature_sensor_temperature_high_low_detection;
+static int hf_btatt_glucose_feature_sensor_result_high_low_detection;
+static int hf_btatt_glucose_feature_sensor_strip_type_error_detection;
+static int hf_btatt_glucose_feature_sensor_strip_insertion_error_detection;
+static int hf_btatt_glucose_feature_sensor_sample_size;
+static int hf_btatt_glucose_feature_sensor_malfunction_detection;
+static int hf_btatt_glucose_feature_low_battery_detection_during_measurement;
+static int hf_btatt_rsc_feature;
+static int hf_btatt_rsc_feature_reserved;
+static int hf_btatt_rsc_feature_multiple_sensor_locations;
+static int hf_btatt_rsc_feature_calibration_procedure;
+static int hf_btatt_rsc_feature_walking_or_running_status;
+static int hf_btatt_rsc_feature_total_distance_measurement;
+static int hf_btatt_rsc_feature_instantaneous_stride_length_measurement;
+static int hf_btatt_csc_feature;
+static int hf_btatt_csc_feature_reserved;
+static int hf_btatt_csc_feature_multiple_sensor_locations;
+static int hf_btatt_csc_feature_crank_revolution_data;
+static int hf_btatt_csc_feature_wheel_revolution_data;
+static int hf_btatt_sensor_location;
+static int hf_btatt_elevation;
+static int hf_btatt_pressure;
+static int hf_btatt_temperature;
+static int hf_btatt_humidity;
+static int hf_btatt_true_wind_speed;
+static int hf_btatt_true_wind_direction;
+static int hf_btatt_apparent_wind_speed;
+static int hf_btatt_apparent_wind_direction;
+static int hf_btatt_gust_factor;
+static int hf_btatt_pollen_concentration;
+static int hf_btatt_uv_index;
+static int hf_btatt_irradiance;
+static int hf_btatt_rainfall;
+static int hf_btatt_wind_chill;
+static int hf_btatt_heart_index;
+static int hf_btatt_dew_point;
+static int hf_btatt_descriptor_value_changed_flags;
+static int hf_btatt_descriptor_value_changed_flags_reserved;
+static int hf_btatt_descriptor_value_changed_flags_change_to_characteristic_user_description_descriptor;
+static int hf_btatt_descriptor_value_changed_flags_change_to_es_measurement_descriptor;
+static int hf_btatt_descriptor_value_changed_flags_change_to_es_configuration_descriptor;
+static int hf_btatt_descriptor_value_changed_flags_change_to_one_or_more_es_trigger_setting_descriptors;
+static int hf_btatt_descriptor_value_changed_flags_source_of_change;
+static int hf_btatt_aerobic_heart_rate_lower_limit;
+static int hf_btatt_aerobic_threshold;
+static int hf_btatt_age;
+static int hf_btatt_anaerobic_heart_rate_lower_limit;
+static int hf_btatt_anaerobic_heart_rate_upper_limit;
+static int hf_btatt_anaerobic_threshold;
+static int hf_btatt_aerobic_heart_rate_upper_limit;
+static int hf_btatt_email_address;
+static int hf_btatt_fat_burn_heart_rate_lower_limit;
+static int hf_btatt_fat_burn_heart_rate_upper_limit;
+static int hf_btatt_first_name;
+static int hf_btatt_five_zone_heart_rate_limits_very_light_light_limit;
+static int hf_btatt_five_zone_heart_rate_limits_light_moderate_limit;
+static int hf_btatt_five_zone_heart_rate_limits_moderate_hard_limit;
+static int hf_btatt_five_zone_heart_rate_limits_hard_maximum_limit;
+static int hf_btatt_gender;
+static int hf_btatt_heart_rate_max;
+static int hf_btatt_height;
+static int hf_btatt_hip_circumference;
+static int hf_btatt_last_name;
+static int hf_btatt_maximum_recommended_heart_rate;
+static int hf_btatt_resting_heart_rate;
+static int hf_btatt_sport_type_for_aerobic_and_anaerobic_thresholds;
+static int hf_btatt_three_zone_heart_rate_limits_light_moderate;
+static int hf_btatt_three_zone_heart_rate_limits_moderate_hard;
+static int hf_btatt_two_zone_heart_rate_limit_fat_burn_fitness;
+static int hf_btatt_vo2_max;
+static int hf_btatt_waist_circumference;
+static int hf_btatt_weight;
+static int hf_btatt_database_change_increment;
+static int hf_btatt_user_index;
+static int hf_btatt_magnetic_flux_density_x;
+static int hf_btatt_magnetic_flux_density_y;
+static int hf_btatt_magnetic_flux_density_z;
+static int hf_btatt_language;
+static int hf_btatt_barometric_pressure_trend;
+static int hf_btatt_central_address_resolution;
+static int hf_btatt_resolvable_private_address;
+static int hf_btatt_cycling_power_feature;
+static int hf_btatt_cycling_power_feature_reserved;
+static int hf_btatt_cycling_power_feature_factory_calibration_date;
+static int hf_btatt_cycling_power_feature_instantaneous_measurement_direction;
+static int hf_btatt_cycling_power_feature_sensor_measurement_context;
+static int hf_btatt_cycling_power_feature_span_length_adjustment;
+static int hf_btatt_cycling_power_feature_chain_weight_adjustment;
+static int hf_btatt_cycling_power_feature_chain_length_adjustment;
+static int hf_btatt_cycling_power_feature_crank_length_adjustment;
+static int hf_btatt_cycling_power_feature_multiple_sensor_locations;
+static int hf_btatt_cycling_power_feature_cycling_power_measurement_characteristic_content_masking;
+static int hf_btatt_cycling_power_feature_offset_compensation;
+static int hf_btatt_cycling_power_feature_offset_compensation_indicator;
+static int hf_btatt_cycling_power_feature_accumulated_energy;
+static int hf_btatt_cycling_power_feature_top_and_bottom_dead_spot_angles;
+static int hf_btatt_cycling_power_feature_extreme_angles;
+static int hf_btatt_cycling_power_feature_extreme_magnitudes;
+static int hf_btatt_cycling_power_feature_crank_revolution_data;
+static int hf_btatt_cycling_power_feature_wheel_revolution_data;
+static int hf_btatt_cycling_power_feature_accumulated_torque;
+static int hf_btatt_cycling_power_feature_pedal_power_balance;
+static int hf_btatt_ln_feature;
+static int hf_btatt_ln_feature_reserved;
+static int hf_btatt_ln_feature_position_status;
+static int hf_btatt_ln_feature_elevation_setting;
+static int hf_btatt_ln_feature_fix_rate_setting;
+static int hf_btatt_ln_feature_location_and_speed_characteristic_content_masking;
+static int hf_btatt_ln_feature_vertical_dilution_of_precision;
+static int hf_btatt_ln_feature_horizontal_dilution_of_precision;
+static int hf_btatt_ln_feature_estimated_vertical_position_error;
+static int hf_btatt_ln_feature_estimated_horizontal_position_error;
+static int hf_btatt_ln_feature_time_to_first_fix;
+static int hf_btatt_ln_feature_number_of_beacons_in_view;
+static int hf_btatt_ln_feature_number_of_beacons_in_solution;
+static int hf_btatt_ln_feature_estimated_time_of_arrival;
+static int hf_btatt_ln_feature_remaining_vertical_distance;
+static int hf_btatt_ln_feature_remaining_distance;
+static int hf_btatt_ln_feature_utc_time;
+static int hf_btatt_ln_feature_rolling_time;
+static int hf_btatt_ln_feature_heading;
+static int hf_btatt_ln_feature_elevation;
+static int hf_btatt_ln_feature_location;
+static int hf_btatt_ln_feature_total_distance;
+static int hf_btatt_ln_feature_instantaneous_speed;
+static int hf_btatt_body_composition_feature;
+static int hf_btatt_body_composition_feature_reserved;
+static int hf_btatt_body_composition_feature_height_measurement_resolution;
+static int hf_btatt_body_composition_feature_mass_measurement_resolution;
+static int hf_btatt_body_composition_feature_height;
+static int hf_btatt_body_composition_feature_weight;
+static int hf_btatt_body_composition_feature_impedance;
+static int hf_btatt_body_composition_feature_body_water_mass;
+static int hf_btatt_body_composition_feature_soft_lean_mass;
+static int hf_btatt_body_composition_feature_fat_free_mass;
+static int hf_btatt_body_composition_feature_muscle_mass;
+static int hf_btatt_body_composition_feature_muscle_percentage;
+static int hf_btatt_body_composition_feature_basal_metabolism;
+static int hf_btatt_body_composition_feature_multiple_users;
+static int hf_btatt_body_composition_feature_timestamp;
+static int hf_btatt_weight_scale_feature;
+static int hf_btatt_weight_scale_feature_reserved;
+static int hf_btatt_weight_scale_feature_height_measurement_resolution;
+static int hf_btatt_weight_scale_feature_weight_measurement_resolution;
+static int hf_btatt_weight_scale_feature_bmi;
+static int hf_btatt_weight_scale_feature_multiple_users;
+static int hf_btatt_weight_scale_feature_timestamp;
+static int hf_btatt_glucose_measurement_flags;
+static int hf_btatt_glucose_measurement_flags_reserved;
+static int hf_btatt_glucose_measurement_flags_context_information_follows;
+static int hf_btatt_glucose_measurement_flags_sensor_status_annunciation_present;
+static int hf_btatt_glucose_measurement_flags_glucose_concentration_units;
+static int hf_btatt_glucose_measurement_flags_glucose_concentration_type_and_sample_location_present;
+static int hf_btatt_glucose_measurement_flags_time_offset_present;
+static int hf_btatt_glucose_measurement_sequence_number;
+static int hf_btatt_glucose_measurement_base_time;
+static int hf_btatt_glucose_measurement_time_offset;
+static int hf_btatt_glucose_measurement_glucose_concentration_kg_per_l;
+static int hf_btatt_glucose_measurement_glucose_concentration_mol_per_l;
+static int hf_btatt_glucose_measurement_type_and_sample_location;
+static int hf_btatt_glucose_measurement_type_and_sample_location_type;
+static int hf_btatt_glucose_measurement_type_and_sample_location_sample_location;
+static int hf_btatt_glucose_measurement_sensor_status_annunciation;
+static int hf_btatt_glucose_measurement_sensor_status_annunciation_reserved;
+static int hf_btatt_glucose_measurement_sensor_status_annunciation_time_fault;
+static int hf_btatt_glucose_measurement_sensor_status_annunciation_general_fault;
+static int hf_btatt_glucose_measurement_sensor_status_annunciation_read_interrupted;
+static int hf_btatt_glucose_measurement_sensor_status_annunciation_temperature_too_low;
+static int hf_btatt_glucose_measurement_sensor_status_annunciation_temperature_too_high;
+static int hf_btatt_glucose_measurement_sensor_status_annunciation_result_too_low;
+static int hf_btatt_glucose_measurement_sensor_status_annunciation_result_too_high;
+static int hf_btatt_glucose_measurement_sensor_status_annunciation_strip_type_incorrect;
+static int hf_btatt_glucose_measurement_sensor_status_annunciation_strip_insertion_error;
+static int hf_btatt_glucose_measurement_sensor_status_annunciation_size_insufficient;
+static int hf_btatt_glucose_measurement_sensor_status_annunciation_fault;
+static int hf_btatt_glucose_measurement_sensor_status_annunciation_battery_low;
+static int hf_btatt_bond_management_feature;
+static int hf_btatt_bond_management_feature_feature_extension;
+static int hf_btatt_bond_management_feature_reserved;
+static int hf_btatt_bond_management_feature_identify_yourself;
+static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_9;
+static int hf_btatt_bond_management_feature_remove_all_but_the_active_bond_on_le_transport_only_server;
+static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_8;
+static int hf_btatt_bond_management_feature_remove_all_but_the_active_bond_on_br_edr_transport_only_server;
+static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_7;
+static int hf_btatt_bond_management_feature_remove_all_but_the_active_bond_on_br_edr_and_le_server;
+static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_6;
+static int hf_btatt_bond_management_feature_remove_all_bonds_on_le_transport_only_server;
+static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_5;
+static int hf_btatt_bond_management_feature_remove_all_bonds_on_br_edr_transport_only_server;
+static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_4;
+static int hf_btatt_bond_management_feature_remove_all_bonds_on_br_edr_and_le_server;
+static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_3;
+static int hf_btatt_bond_management_feature_delete_bond_of_current_le_transport_only_connection;
+static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_2;
+static int hf_btatt_bond_management_feature_delete_bond_of_current_br_edr_transport_only_connection;
+static int hf_btatt_bond_management_feature_authorization_code_required_for_feature_above_1;
+static int hf_btatt_bond_management_feature_delete_bond_of_current_br_edr_and_le_connection;
+static int hf_btatt_bond_management_feature_nth;
+static int hf_btatt_bond_management_feature_nth_feature_extension;
+static int hf_btatt_bond_management_feature_nth_reserved;
+static int hf_btatt_bond_management_control_point_opcode;
+static int hf_btatt_bond_management_control_point_authorization_code;
+static int hf_btatt_temperature_measurement_flags;
+static int hf_btatt_temperature_measurement_flags_reserved;
+static int hf_btatt_temperature_measurement_flags_temperature_type;
+static int hf_btatt_temperature_measurement_flags_timestamp;
+static int hf_btatt_temperature_measurement_flags_temperature_unit;
+static int hf_btatt_temperature_measurement_value_celsius;
+static int hf_btatt_temperature_measurement_value_fahrenheit;
+static int hf_btatt_temperature_measurement_timestamp;
+static int hf_btatt_glucose_measurement_context_flags;
+static int hf_btatt_glucose_measurement_context_flags_extended_flags;
+static int hf_btatt_glucose_measurement_context_flags_hba1c;
+static int hf_btatt_glucose_measurement_context_flags_medication_value_units;
+static int hf_btatt_glucose_measurement_context_flags_medication_id_and_medication;
+static int hf_btatt_glucose_measurement_context_flags_exercise_duration_and_exercise_intensity;
+static int hf_btatt_glucose_measurement_context_flags_tester_health;
+static int hf_btatt_glucose_measurement_context_flags_meal;
+static int hf_btatt_glucose_measurement_context_flags_carbohydrate_id_and_carbohydrate;
+static int hf_btatt_glucose_measurement_context_sequence_number;
+static int hf_btatt_glucose_measurement_context_extended_flags;
+static int hf_btatt_glucose_measurement_context_extended_flags_reserved;
+static int hf_btatt_glucose_measurement_context_carbohydrate_id;
+static int hf_btatt_glucose_measurement_context_carbohydrate_kg;
+static int hf_btatt_glucose_measurement_context_meal;
+static int hf_btatt_glucose_measurement_context_tester_health;
+static int hf_btatt_glucose_measurement_context_tester;
+static int hf_btatt_glucose_measurement_context_health;
+static int hf_btatt_glucose_measurement_context_exercise_duration;
+static int hf_btatt_glucose_measurement_context_exercise_intensity;
+static int hf_btatt_glucose_measurement_context_medication_id;
+static int hf_btatt_glucose_measurement_context_medication_l;
+static int hf_btatt_glucose_measurement_context_medication_kg;
+static int hf_btatt_glucose_measurement_context_hba1c;
+static int hf_btatt_blood_pressure_measurement_flags;
+static int hf_btatt_blood_pressure_measurement_flags_reserved;
+static int hf_btatt_blood_pressure_measurement_flags_measurement_status;
+static int hf_btatt_blood_pressure_measurement_flags_user_id;
+static int hf_btatt_blood_pressure_measurement_flags_pulse_rate;
+static int hf_btatt_blood_pressure_measurement_flags_timestamp;
+static int hf_btatt_blood_pressure_measurement_flags_unit;
+static int hf_btatt_blood_pressure_measurement_compound_value_systolic_kpa;
+static int hf_btatt_blood_pressure_measurement_compound_value_diastolic_kpa;
+static int hf_btatt_blood_pressure_measurement_compound_value_mean_arterial_pressure_kpa;
+static int hf_btatt_blood_pressure_measurement_compound_value_systolic_mmhg;
+static int hf_btatt_blood_pressure_measurement_compound_value_diastolic_mmhg;
+static int hf_btatt_blood_pressure_measurement_compound_value_mean_arterial_pressure_mmhg;
+static int hf_btatt_blood_pressure_measurement_timestamp;
+static int hf_btatt_blood_pressure_measurement_pulse_rate;
+static int hf_btatt_blood_pressure_measurement_user_id;
+static int hf_btatt_blood_pressure_measurement_status;
+static int hf_btatt_blood_pressure_measurement_status_reserved;
+static int hf_btatt_blood_pressure_measurement_status_improper_measurement_position;
+static int hf_btatt_blood_pressure_measurement_status_pulse_rate_range_detection;
+static int hf_btatt_blood_pressure_measurement_status_irregular_pulse;
+static int hf_btatt_blood_pressure_measurement_status_cuff_fit_too_loose;
+static int hf_btatt_blood_pressure_measurement_status_body_movement;
+static int hf_btatt_heart_rate_measurement_flags;
+static int hf_btatt_heart_rate_measurement_flags_reserved;
+static int hf_btatt_heart_rate_measurement_flags_rr_interval;
+static int hf_btatt_heart_rate_measurement_flags_energy_expended;
+static int hf_btatt_heart_rate_measurement_flags_sensor_contact_status_support;
+static int hf_btatt_heart_rate_measurement_flags_sensor_contact_status_contact;
+static int hf_btatt_heart_rate_measurement_flags_value_16;
+static int hf_btatt_heart_rate_measurement_value_8;
+static int hf_btatt_heart_rate_measurement_value_16;
+static int hf_btatt_heart_rate_measurement_energy_expended;
+static int hf_btatt_heart_rate_measurement_rr_intervals;
+static int hf_btatt_heart_rate_measurement_rr_interval;
+static int hf_btatt_record_access_control_point_opcode;
+static int hf_btatt_record_access_control_point_operator;
+static int hf_btatt_record_access_control_point_operand;
+static int hf_btatt_record_access_control_point_operand_filter_type;
+static int hf_btatt_record_access_control_point_operand_min_time_offset;
+static int hf_btatt_record_access_control_point_operand_max_time_offset;
+static int hf_btatt_record_access_control_point_operand_number_of_records;
+static int hf_btatt_record_access_control_point_request_opcode;
+static int hf_btatt_record_access_control_point_response_code;
+static int hf_btatt_value_trigger_setting_condition;
+static int hf_btatt_value_trigger_setting_analog;
+static int hf_btatt_value_trigger_setting_analog_one;
+static int hf_btatt_value_trigger_setting_analog_two;
+static int hf_btatt_digital;
+static int hf_btatt_digital_output;
+static int hf_btatt_analog;
+static int hf_btatt_analog_output;
+static int hf_btatt_location_name;
+static int hf_btatt_uncertainty;
+static int hf_btatt_uncertainty_reserved;
+static int hf_btatt_uncertainty_precision;
+static int hf_btatt_uncertainty_update_time;
+static int hf_btatt_uncertainty_stationary;
+static int hf_btatt_latitude;
+static int hf_btatt_longitude;
+static int hf_btatt_local_north_coordinate;
+static int hf_btatt_local_east_coordinate;
+static int hf_btatt_floor_number;
+static int hf_btatt_altitude;
+static int hf_btatt_indoor_positioning_configuration;
+static int hf_btatt_indoor_positioning_configuration_reserved;
+static int hf_btatt_indoor_positioning_configuration_location_name;
+static int hf_btatt_indoor_positioning_configuration_uncertainty;
+static int hf_btatt_indoor_positioning_configuration_floor_number;
+static int hf_btatt_indoor_positioning_configuration_altitude;
+static int hf_btatt_indoor_positioning_configuration_tx_power;
+static int hf_btatt_indoor_positioning_configuration_coordinate_system;
+static int hf_btatt_indoor_positioning_configuration_coordinates;
+static int hf_btatt_number_of_digitals;
+static int hf_btatt_time_trigger_setting_condition;
+static int hf_btatt_time_trigger_setting_value;
+static int hf_btatt_time_trigger_setting_value_count;
+static int hf_btatt_time_trigger_setting_value_time_interval;
+static int hf_btatt_rsc_measurement_flags;
+static int hf_btatt_rsc_measurement_flags_reserved;
+static int hf_btatt_rsc_measurement_flags_type_of_movement;
+static int hf_btatt_rsc_measurement_flags_total_distance_present;
+static int hf_btatt_rsc_measurement_flags_instantaneous_stride_length_present;
+static int hf_btatt_rsc_measurement_instantaneous_speed;
+static int hf_btatt_rsc_measurement_instantaneous_cadence;
+static int hf_btatt_rsc_measurement_instantaneous_stride_length;
+static int hf_btatt_rsc_measurement_total_distance;
+static int hf_btatt_sc_control_point_opcode;
+static int hf_btatt_sc_control_point_cumulative_value;
+static int hf_btatt_sc_control_point_request_opcode;
+static int hf_btatt_sc_control_point_response_value;
+static int hf_btatt_cycling_power_measurement_flags;
+static int hf_btatt_cycling_power_measurement_flags_reserved;
+static int hf_btatt_cycling_power_measurement_flags_offset_compensation_indicator;
+static int hf_btatt_cycling_power_measurement_flags_accumulated_energy;
+static int hf_btatt_cycling_power_measurement_flags_bottom_dead_spot_angle;
+static int hf_btatt_cycling_power_measurement_flags_top_dead_spot_angle;
+static int hf_btatt_cycling_power_measurement_flags_extreme_angles;
+static int hf_btatt_cycling_power_measurement_flags_extreme_torque_magnitudes;
+static int hf_btatt_cycling_power_measurement_flags_extreme_force_magnitudes;
+static int hf_btatt_cycling_power_measurement_flags_crank_revolution_data;
+static int hf_btatt_cycling_power_measurement_flags_wheel_revolution_data;
+static int hf_btatt_cycling_power_measurement_flags_accumulated_torque_source;
+static int hf_btatt_cycling_power_measurement_flags_accumulated_torque;
+static int hf_btatt_cycling_power_measurement_flags_pedal_power_balance_reference;
+static int hf_btatt_cycling_power_measurement_flags_pedal_power_balance;
+static int hf_btatt_cycling_power_measurement_instantaneous_power;
+static int hf_btatt_cycling_power_measurement_pedal_power_balance;
+static int hf_btatt_cycling_power_measurement_accumulated_torque;
+static int hf_btatt_cycling_power_measurement_wheel_revolution_data_cumulative_wheel_revolutions;
+static int hf_btatt_cycling_power_measurement_wheel_revolution_data_last_wheel_event_time;
+static int hf_btatt_cycling_power_measurement_crank_revolution_data_cumulative_crank_revolutions;
+static int hf_btatt_cycling_power_measurement_crank_revolution_data_last_crank_event_time;
+static int hf_btatt_cycling_power_measurement_extreme_force_magnitudes_maximum_force_magnitude;
+static int hf_btatt_cycling_power_measurement_extreme_force_magnitudes_minimum_force_magnitude;
+static int hf_btatt_cycling_power_measurement_extreme_torque_magnitudes_maximum_torque_magnitude;
+static int hf_btatt_cycling_power_measurement_extreme_torque_magnitudes_minimum_torque_magnitude;
+static int hf_btatt_cycling_power_measurement_extreme_angles;
+static int hf_btatt_cycling_power_measurement_extreme_angles_maximum;
+static int hf_btatt_cycling_power_measurement_extreme_angles_minimum;
+static int hf_btatt_cycling_power_measurement_top_dead_spot_angle;
+static int hf_btatt_cycling_power_measurement_bottom_dead_spot_angle;
+static int hf_btatt_cycling_power_measurement_accumulated_energy;
+static int hf_btatt_csc_measurement_flags;
+static int hf_btatt_csc_measurement_flags_reserved;
+static int hf_btatt_csc_measurement_flags_crank_revolution_data;
+static int hf_btatt_csc_measurement_flags_wheel_revolution_data;
+static int hf_btatt_csc_measurement_cumulative_wheel_revolutions;
+static int hf_btatt_csc_measurement_cumulative_crank_revolutions;
+static int hf_btatt_csc_measurement_last_event_time;
+static int hf_btatt_cycling_power_vector_flags;
+static int hf_btatt_cycling_power_vector_flags_reserved;
+static int hf_btatt_cycling_power_vector_flags_instantaneous_measurement_direction;
+static int hf_btatt_cycling_power_vector_flags_instantaneous_torque_magnitude_array;
+static int hf_btatt_cycling_power_vector_flags_instantaneous_force_magnitude_array;
+static int hf_btatt_cycling_power_vector_flags_first_crank_measurement_angle;
+static int hf_btatt_cycling_power_vector_flags_crank_revolution_data;
+static int hf_btatt_cycling_power_vector_crank_revolution_data_cumulative_crank_revolutions;
+static int hf_btatt_cycling_power_vector_crank_revolution_data_last_crank_event_time;
+static int hf_btatt_cycling_power_vector_first_crank_measurement_angle;
+static int hf_btatt_cycling_power_vector_instantaneous_force_magnitude_array;
+static int hf_btatt_cycling_power_vector_instantaneous_torque_magnitude_array;
+static int hf_btatt_cycling_power_control_point_opcode;
+static int hf_btatt_cycling_power_control_point_cumulative_value;
+static int hf_btatt_cycling_power_control_point_sensor_location;
+static int hf_btatt_cycling_power_control_point_crank_length;
+static int hf_btatt_cycling_power_control_point_chain_length;
+static int hf_btatt_cycling_power_control_point_chain_weight;
+static int hf_btatt_cycling_power_control_point_span_length;
+static int hf_btatt_cycling_power_control_point_content_mask;
+static int hf_btatt_cycling_power_control_point_content_mask_reserved;
+static int hf_btatt_cycling_power_control_point_content_mask_accumulated_energy;
+static int hf_btatt_cycling_power_control_point_content_mask_bottom_dead_spot_angle;
+static int hf_btatt_cycling_power_control_point_content_mask_top_dead_spot_angle;
+static int hf_btatt_cycling_power_control_point_content_mask_extreme_angles;
+static int hf_btatt_cycling_power_control_point_content_mask_extreme_magnitudes;
+static int hf_btatt_cycling_power_control_point_content_mask_crank_revolution_data;
+static int hf_btatt_cycling_power_control_point_content_mask_wheel_revolution_data;
+static int hf_btatt_cycling_power_control_point_content_mask_accumulated_torque;
+static int hf_btatt_cycling_power_control_point_content_mask_pedal_power_balance;
+static int hf_btatt_cycling_power_control_point_request_opcode;
+static int hf_btatt_cycling_power_control_point_response_value;
+static int hf_btatt_cycling_power_control_point_start_offset_compensation;
+static int hf_btatt_cycling_power_control_point_sampling_rate;
+static int hf_btatt_cycling_power_control_point_factory_calibration_date;
+static int hf_btatt_location_and_speed_flags;
+static int hf_btatt_location_and_speed_flags_reserved;
+static int hf_btatt_location_and_speed_flags_heading_source;
+static int hf_btatt_location_and_speed_flags_elevation_source;
+static int hf_btatt_location_and_speed_flags_speed_and_distance_format;
+static int hf_btatt_location_and_speed_flags_position_status;
+static int hf_btatt_location_and_speed_flags_utc_time;
+static int hf_btatt_location_and_speed_flags_rolling_time;
+static int hf_btatt_location_and_speed_flags_heading;
+static int hf_btatt_location_and_speed_flags_elevation;
+static int hf_btatt_location_and_speed_flags_location;
+static int hf_btatt_location_and_speed_flags_total_distance;
+static int hf_btatt_location_and_speed_flags_instantaneous_speed;
+static int hf_btatt_location_and_speed_instantaneous_speed;
+static int hf_btatt_location_and_speed_total_distance;
+static int hf_btatt_location_and_speed_location_latitude;
+static int hf_btatt_location_and_speed_location_longitude;
+static int hf_btatt_location_and_speed_elevation;
+static int hf_btatt_location_and_speed_heading;
+static int hf_btatt_location_and_speed_rolling_time;
+static int hf_btatt_location_and_speed_utc_time;
+static int hf_btatt_navigation_flags;
+static int hf_btatt_navigation_flags_reserved;
+static int hf_btatt_navigation_flags_destination_reached;
+static int hf_btatt_navigation_flags_waypoint_reached;
+static int hf_btatt_navigation_flags_navigation_indicator_type;
+static int hf_btatt_navigation_flags_heading_source;
+static int hf_btatt_navigation_flags_position_status;
+static int hf_btatt_navigation_flags_estimated_time_of_arrival;
+static int hf_btatt_navigation_flags_remaining_vertical_distance;
+static int hf_btatt_navigation_flags_remaining_distance;
+static int hf_btatt_navigation_bearing;
+static int hf_btatt_navigation_heading;
+static int hf_btatt_navigation_remaining_distance;
+static int hf_btatt_navigation_remaining_vertical_distance;
+static int hf_btatt_navigation_estimated_time_of_arrival;
+static int hf_btatt_position_quality_flags;
+static int hf_btatt_position_quality_flags_reserved;
+static int hf_btatt_position_quality_flags_position_status;
+static int hf_btatt_position_quality_flags_vdop;
+static int hf_btatt_position_quality_flags_hdop;
+static int hf_btatt_position_quality_flags_evpe;
+static int hf_btatt_position_quality_flags_ehpe;
+static int hf_btatt_position_quality_flags_time_to_first_fix;
+static int hf_btatt_position_quality_flags_number_of_beacons_in_view;
+static int hf_btatt_position_quality_flags_number_of_beacons_in_solution;
+static int hf_btatt_position_quality_number_of_beacons_in_solution;
+static int hf_btatt_position_quality_number_of_beacons_in_view;
+static int hf_btatt_position_quality_time_to_first_fix;
+static int hf_btatt_position_quality_ehpe;
+static int hf_btatt_position_quality_evpe;
+static int hf_btatt_position_quality_hdop;
+static int hf_btatt_position_quality_vdop;
+static int hf_btatt_ln_control_point_opcode;
+static int hf_btatt_ln_control_point_cumulative_value;
+static int hf_btatt_ln_control_point_content_mask;
+static int hf_btatt_ln_control_point_content_mask_reserved;
+static int hf_btatt_ln_control_point_content_mask_utc_time;
+static int hf_btatt_ln_control_point_content_mask_rolling_time;
+static int hf_btatt_ln_control_point_content_mask_heading;
+static int hf_btatt_ln_control_point_content_mask_elevation;
+static int hf_btatt_ln_control_point_content_mask_location;
+static int hf_btatt_ln_control_point_content_mask_total_distance;
+static int hf_btatt_ln_control_point_content_mask_instantaneous_speed;
+static int hf_btatt_ln_control_point_navigation_control;
+static int hf_btatt_ln_control_point_route_number;
+static int hf_btatt_ln_control_point_fix_rate;
+static int hf_btatt_ln_control_point_elevation;
+static int hf_btatt_ln_control_point_request_opcode;
+static int hf_btatt_ln_control_point_response_value;
+static int hf_btatt_ln_control_point_response_value_number_of_routes;
+static int hf_btatt_ln_control_point_response_value_name_of_route;
+static int hf_btatt_body_composition_measurement_flags;
+static int hf_btatt_body_composition_measurement_flags_reserved;
+static int hf_btatt_body_composition_measurement_flags_multiple_packet_measurement;
+static int hf_btatt_body_composition_measurement_flags_height;
+static int hf_btatt_body_composition_measurement_flags_weight;
+static int hf_btatt_body_composition_measurement_flags_impedance;
+static int hf_btatt_body_composition_measurement_flags_body_water_mass;
+static int hf_btatt_body_composition_measurement_flags_soft_lean_mass;
+static int hf_btatt_body_composition_measurement_flags_fat_free_mass;
+static int hf_btatt_body_composition_measurement_flags_muscle_mass;
+static int hf_btatt_body_composition_measurement_flags_muscle_percentage;
+static int hf_btatt_body_composition_measurement_flags_basal_metabolism;
+static int hf_btatt_body_composition_measurement_flags_user_id;
+static int hf_btatt_body_composition_measurement_flags_timestamp;
+static int hf_btatt_body_composition_measurement_flags_measurement_units;
+static int hf_btatt_body_composition_measurement_body_fat_percentage;
+static int hf_btatt_body_composition_measurement_timestamp;
+static int hf_btatt_body_composition_measurement_user_id;
+static int hf_btatt_body_composition_measurement_basal_metabolism;
+static int hf_btatt_body_composition_measurement_muscle_percentage;
+static int hf_btatt_body_composition_measurement_muscle_mass_lb;
+static int hf_btatt_body_composition_measurement_muscle_mass_kg;
+static int hf_btatt_body_composition_measurement_fat_free_mass_lb;
+static int hf_btatt_body_composition_measurement_fat_free_mass_kg;
+static int hf_btatt_body_composition_measurement_soft_lean_mass_lb;
+static int hf_btatt_body_composition_measurement_soft_lean_mass_kg;
+static int hf_btatt_body_composition_measurement_body_water_mass_lb;
+static int hf_btatt_body_composition_measurement_body_water_mass_kg;
+static int hf_btatt_body_composition_measurement_impedance;
+static int hf_btatt_body_composition_measurement_weight_lb;
+static int hf_btatt_body_composition_measurement_weight_kg;
+static int hf_btatt_body_composition_measurement_height_inches;
+static int hf_btatt_body_composition_measurement_height_meter;
+static int hf_btatt_weight_measurement_flags;
+static int hf_btatt_weight_measurement_flags_reserved;
+static int hf_btatt_weight_measurement_flags_bmi_and_height;
+static int hf_btatt_weight_measurement_flags_user_id;
+static int hf_btatt_weight_measurement_flags_timestamp;
+static int hf_btatt_weight_measurement_flags_measurement_units;
+static int hf_btatt_weight_measurement_weight_lb;
+static int hf_btatt_weight_measurement_weight_kg;
+static int hf_btatt_weight_measurement_timestamp;
+static int hf_btatt_weight_measurement_user_id;
+static int hf_btatt_weight_measurement_bmi;
+static int hf_btatt_weight_measurement_height_in;
+static int hf_btatt_weight_measurement_height_m;
+static int hf_btatt_user_control_point_opcode;
+static int hf_btatt_user_control_point_request_opcode;
+static int hf_btatt_user_control_point_response_value;
+static int hf_btatt_user_control_point_consent_code;
+static int hf_btatt_cgm_measurement_size;
+static int hf_btatt_cgm_measurement_flags;
+static int hf_btatt_cgm_measurement_flags_cgm_trend_information;
+static int hf_btatt_cgm_measurement_flags_cgm_quality;
+static int hf_btatt_cgm_measurement_flags_reserved;
+static int hf_btatt_cgm_measurement_flags_sensor_status_annunciation_warning;
+static int hf_btatt_cgm_measurement_flags_sensor_status_annunciation_cal_temp;
+static int hf_btatt_cgm_measurement_flags_sensor_status_annunciation_status;
+static int hf_btatt_cgm_measurement_glucose_concentration;
+static int hf_btatt_cgm_measurement_time_offset;
+static int hf_btatt_cgm_sensor_status_annunciation;
+static int hf_btatt_cgm_sensor_status_annunciation_status;
+static int hf_btatt_cgm_sensor_status_annunciation_status_reserved;
+static int hf_btatt_cgm_sensor_status_annunciation_status_general_device_fault_has_occurred_in_the_sensor;
+static int hf_btatt_cgm_sensor_status_annunciation_status_device_specific_alert;
+static int hf_btatt_cgm_sensor_status_annunciation_status_sensor_malfunction;
+static int hf_btatt_cgm_sensor_status_annunciation_status_sensor_type_incorrect_for_device;
+static int hf_btatt_cgm_sensor_status_annunciation_status_device_battery_low;
+static int hf_btatt_cgm_sensor_status_annunciation_status_session_stopped;
+static int hf_btatt_cgm_sensor_status_annunciation_cal_temp;
+static int hf_btatt_cgm_sensor_status_annunciation_cal_temp_reserved;
+static int hf_btatt_cgm_sensor_status_annunciation_cal_temp_sensor_temperature_too_low_for_valid_test_result_at_time_of_measurement;
+static int hf_btatt_cgm_sensor_status_annunciation_cal_temp_sensor_temperature_too_high_for_valid_test_result_at_time_of_measurement;
+static int hf_btatt_cgm_sensor_status_annunciation_cal_temp_calibration_required;
+static int hf_btatt_cgm_sensor_status_annunciation_cal_temp_calibration_recommended;
+static int hf_btatt_cgm_sensor_status_annunciation_cal_temp_calibration_not_allowed;
+static int hf_btatt_cgm_sensor_status_annunciation_cal_temp_time_synchronization_between_sensor_and_collector_required;
+static int hf_btatt_cgm_sensor_status_annunciation_warning;
+static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_result_higher_than_the_device_can_process;
+static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_result_lower_than_the_device_can_process;
+static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_rate_of_increase_exceeded;
+static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_rate_of_decrease_exceeded;
+static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_result_higher_than_the_hyper_level;
+static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_result_lower_than_the_hypo_level;
+static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_result_higher_than_the_patient_high_level;
+static int hf_btatt_cgm_sensor_status_annunciation_warning_sensor_result_lower_than_the_patient_low_level;
+static int hf_btatt_cgm_measurement_trend_information;
+static int hf_btatt_cgm_measurement_quality;
+static int hf_btatt_cgm_e2e_crc;
+static int hf_btatt_cgm_feature_feature;
+static int hf_btatt_cgm_feature_feature_reserved;
+static int hf_btatt_cgm_feature_feature_quality;
+static int hf_btatt_cgm_feature_feature_trend_information;
+static int hf_btatt_cgm_feature_feature_multiple_sessions;
+static int hf_btatt_cgm_feature_feature_multiple_bond;
+static int hf_btatt_cgm_feature_feature_e2e_crc;
+static int hf_btatt_cgm_feature_feature_general_device_fault;
+static int hf_btatt_cgm_feature_feature_sensor_type_error_detection;
+static int hf_btatt_cgm_feature_feature_low_battery_detection;
+static int hf_btatt_cgm_feature_feature_sensor_result_high_low_detection;
+static int hf_btatt_cgm_feature_feature_sensor_temperature_high_low_detection;
+static int hf_btatt_cgm_feature_feature_sensor_malfunction_detection;
+static int hf_btatt_cgm_feature_feature_device_specific_alert;
+static int hf_btatt_cgm_feature_feature_rate_of_increase_decrease_alerts;
+static int hf_btatt_cgm_feature_feature_hyper_alerts;
+static int hf_btatt_cgm_feature_feature_hypo_alerts;
+static int hf_btatt_cgm_feature_feature_patient_high_low_alerts;
+static int hf_btatt_cgm_feature_feature_calibration;
+static int hf_btatt_cgm_type_and_sample_location;
+static int hf_btatt_cgm_type;
+static int hf_btatt_cgm_sample_location;
+static int hf_btatt_cgm_time_offset;
+static int hf_btatt_cgm_status;
+static int hf_btatt_cgm_session_start_time;
+static int hf_btatt_cgm_session_run_time;
+static int hf_btatt_cgm_specific_ops_control_point_opcode;
+static int hf_btatt_cgm_specific_ops_control_point_operand;
+static int hf_btatt_cgm_specific_ops_control_point_operand_communication_interval;
+static int hf_btatt_cgm_specific_ops_control_point_calibration_glucose_concentration;
+static int hf_btatt_cgm_specific_ops_control_point_calibration_time;
+static int hf_btatt_cgm_specific_ops_control_point_next_calibration_time;
+static int hf_btatt_cgm_specific_ops_control_point_calibration_data_record_number;
+static int hf_btatt_cgm_specific_ops_control_point_calibration_status;
+static int hf_btatt_cgm_specific_ops_control_point_calibration_status_reserved;
+static int hf_btatt_cgm_specific_ops_control_point_calibration_status_pending;
+static int hf_btatt_cgm_specific_ops_control_point_calibration_status_out_of_range;
+static int hf_btatt_cgm_specific_ops_control_point_calibration_status_rejected;
+static int hf_btatt_cgm_specific_ops_control_point_operand_calibration_data_record_number;
+static int hf_btatt_cgm_specific_ops_control_point_operand_alert_level;
+static int hf_btatt_cgm_specific_ops_control_point_operand_alert_level_rate;
+static int hf_btatt_cgm_specific_ops_control_point_request_opcode;
+static int hf_btatt_cgm_specific_ops_control_point_response_code;
+static int hf_btatt_uri;
+static int hf_btatt_http_headers;
+static int hf_btatt_http_status_code;
+static int hf_btatt_http_data_status;
+static int hf_btatt_http_data_status_reserved;
+static int hf_btatt_http_data_status_body_truncated;
+static int hf_btatt_http_data_status_body_received;
+static int hf_btatt_http_data_status_headers_truncated;
+static int hf_btatt_http_data_status_headers_received;
+static int hf_btatt_http_entity_body;
+static int hf_btatt_http_control_point_opcode;
+static int hf_btatt_https_security;
+static int hf_btatt_tds_opcode;
+static int hf_btatt_tds_result_code;
+static int hf_btatt_tds_organization_id;
+static int hf_btatt_tds_data;
+static int hf_btatt_ots_feature_oacp;
+static int hf_btatt_ots_feature_oacp_reserved;
+static int hf_btatt_ots_feature_oacp_abort;
+static int hf_btatt_ots_feature_oacp_patching_of_object;
+static int hf_btatt_ots_feature_oacp_truncation_of_objects;
+static int hf_btatt_ots_feature_oacp_appending_additional_data_to_object;
+static int hf_btatt_ots_feature_oacp_write;
+static int hf_btatt_ots_feature_oacp_read;
+static int hf_btatt_ots_feature_oacp_execute;
+static int hf_btatt_ots_feature_oacp_calculate_checksum;
+static int hf_btatt_ots_feature_oacp_delete;
+static int hf_btatt_ots_feature_oacp_create;
+static int hf_btatt_ots_feature_olcp;
+static int hf_btatt_ots_feature_olcp_reserved;
+static int hf_btatt_ots_feature_olcp_clear_marking;
+static int hf_btatt_ots_feature_olcp_request_number_of_objects;
+static int hf_btatt_ots_feature_olcp_order;
+static int hf_btatt_ots_feature_olcp_go_to;
+static int hf_btatt_ots_object_name;
+static int hf_btatt_ots_current_size;
+static int hf_btatt_ots_allocated_size;
+static int hf_btatt_ots_object_id;
+static int hf_btatt_ots_properties;
+static int hf_btatt_ots_properties_reserved;
+static int hf_btatt_ots_properties_mark;
+static int hf_btatt_ots_properties_patch;
+static int hf_btatt_ots_properties_truncate;
+static int hf_btatt_ots_properties_append;
+static int hf_btatt_ots_properties_write;
+static int hf_btatt_ots_properties_read;
+static int hf_btatt_ots_properties_execute;
+static int hf_btatt_ots_properties_delete;
+static int hf_btatt_ots_flags;
+static int hf_btatt_ots_flags_reserved;
+static int hf_btatt_ots_flags_object_deletion;
+static int hf_btatt_ots_flags_object_creation;
+static int hf_btatt_ots_flags_change_occurred_to_the_object_metadata;
+static int hf_btatt_ots_flags_change_occurred_to_the_object_contents;
+static int hf_btatt_ots_flags_source_of_change;
+static int hf_btatt_ots_action_opcode;
+static int hf_btatt_ots_size;
+static int hf_btatt_ots_offset;
+static int hf_btatt_ots_length;
+static int hf_btatt_ots_execute_data;
+static int hf_btatt_ots_action_response_opcode;
+static int hf_btatt_ots_action_result_code;
+static int hf_btatt_ots_checksum;
+static int hf_btatt_ots_list_opcode;
+static int hf_btatt_ots_list_order;
+static int hf_btatt_ots_list_response_opcode;
+static int hf_btatt_ots_list_result_code;
+static int hf_btatt_ots_list_total_number_of_objects;
+static int hf_btatt_ots_filter;
+static int hf_btatt_ots_name_string;
+static int hf_btatt_ots_size_from;
+static int hf_btatt_ots_size_to;
+static int hf_btatt_ots_object_first_created;
+static int hf_btatt_ots_object_last_modified;
+static int hf_btatt_plx_spot_check_measurement_flags;
+static int hf_btatt_plx_spot_check_measurement_flags_reserved;
+static int hf_btatt_plx_spot_check_measurement_flags_device_clock_is_not_set;
+static int hf_btatt_plx_spot_check_measurement_flags_pulse_amplitude_index;
+static int hf_btatt_plx_spot_check_measurement_flags_device_and_sensor_status;
+static int hf_btatt_plx_spot_check_measurement_flags_measurement_status;
+static int hf_btatt_plx_spot_check_measurement_flags_timestamp;
+static int hf_btatt_plx_spo2;
+static int hf_btatt_plx_pulse_rate;
+static int hf_btatt_plx_spot_check_measurement_timestamp;
+static int hf_btatt_plx_measurement_status;
+static int hf_btatt_plx_measurement_status_invalid_measurement_detected;
+static int hf_btatt_plx_measurement_status_questionable_measurement_detected;
+static int hf_btatt_plx_measurement_status_measurement_unavailable;
+static int hf_btatt_plx_measurement_status_calibration_ongoing;
+static int hf_btatt_plx_measurement_status_data_for_testing;
+static int hf_btatt_plx_measurement_status_data_for_demonstration;
+static int hf_btatt_plx_measurement_status_data_from_measurement_storage;
+static int hf_btatt_plx_measurement_status_fully_qualified_data;
+static int hf_btatt_plx_measurement_status_validated_data;
+static int hf_btatt_plx_measurement_status_early_estimated_data;
+static int hf_btatt_plx_measurement_status_measurement_ongoing;
+static int hf_btatt_plx_measurement_status_reserved;
+static int hf_btatt_plx_device_and_sensor_status;
+static int hf_btatt_plx_device_and_sensor_status_reserved;
+static int hf_btatt_plx_device_and_sensor_status_sensor_disconnected;
+static int hf_btatt_plx_device_and_sensor_status_sensor_malfunctioning;
+static int hf_btatt_plx_device_and_sensor_status_sensor_displaced;
+static int hf_btatt_plx_device_and_sensor_status_unknown_sensor_connected;
+static int hf_btatt_plx_device_and_sensor_status_sensor_unconnected_to_user;
+static int hf_btatt_plx_device_and_sensor_status_sensor_interference_detected;
+static int hf_btatt_plx_device_and_sensor_status_signal_analysis_ongoing;
+static int hf_btatt_plx_device_and_sensor_status_questionable_pulse_detected;
+static int hf_btatt_plx_device_and_sensor_status_non_pulsatile_signal_detected;
+static int hf_btatt_plx_device_and_sensor_status_erratic_signal_detected;
+static int hf_btatt_plx_device_and_sensor_status_low_perfusion_detected;
+static int hf_btatt_plx_device_and_sensor_status_poor_signal_detected;
+static int hf_btatt_plx_device_and_sensor_status_inadequate_signal_detected;
+static int hf_btatt_plx_device_and_sensor_status_signal_processing_irregularity_detected;
+static int hf_btatt_plx_device_and_sensor_status_equipment_malfunction_detected;
+static int hf_btatt_plx_device_and_sensor_status_extended_display_update_ongoing;
+static int hf_btatt_plx_pulse_amplitude_index;
+static int hf_btatt_plx_spo2pr_spot_check;
+static int hf_btatt_plx_spo2pr_normal;
+static int hf_btatt_plx_spo2pr_fast;
+static int hf_btatt_plx_spo2pr_slow;
+static int hf_btatt_plx_continuous_measurement_flags;
+static int hf_btatt_plx_continuous_measurement_flags_reserved;
+static int hf_btatt_plx_continuous_measurement_flags_pulse_amplitude_index;
+static int hf_btatt_plx_continuous_measurement_flags_device_and_sensor_status;
+static int hf_btatt_plx_continuous_measurement_flags_measurement_status;
+static int hf_btatt_plx_continuous_measurement_flags_spo2pr_slow;
+static int hf_btatt_plx_continuous_measurement_flags_spo2pr_fast;
+static int hf_btatt_plx_features_supported_features;
+static int hf_btatt_plx_features_supported_features_reserved;
+static int hf_btatt_plx_features_supported_features_multiple_bonds;
+static int hf_btatt_plx_features_supported_features_pulse_amplitude_index;
+static int hf_btatt_plx_features_supported_features_spo2pr_slow;
+static int hf_btatt_plx_features_supported_features_spo2pr_fast;
+static int hf_btatt_plx_features_supported_features_timestamp_storage_for_spot_check;
+static int hf_btatt_plx_features_supported_features_measurement_storage_for_spot_check;
+static int hf_btatt_plx_features_supported_features_device_and_sensor_status;
+static int hf_btatt_plx_features_supported_features_measurement_status;
+static int hf_btatt_regulatory_certification_data_list_count;
+static int hf_btatt_regulatory_certification_data_list_length;
+static int hf_btatt_regulatory_certification_data_list_item;
+static int hf_btatt_regulatory_certification_data_list_item_body;
+static int hf_btatt_regulatory_certification_data_list_item_body_structure_type;
+static int hf_btatt_regulatory_certification_data_list_item_body_structure_length;
+static int hf_btatt_regulatory_certification_data_list_item_authorizing_body_data;
+static int hf_btatt_regulatory_certification_data_list_item_authorizing_body_data_major_ig_version;
+static int hf_btatt_regulatory_certification_data_list_item_authorizing_body_data_minor_ig_version;
+static int hf_btatt_regulatory_certification_data_list_item_authorizing_body_data_certification_data_list_count;
+static int hf_btatt_regulatory_certification_data_list_item_authorizing_body_data_certification_data_list_length;
+static int hf_btatt_regulatory_certification_data_list_item_authorizing_body_data_certification_data_list;
+static int hf_btatt_regulatory_certification_data_list_item_authorizing_body_data_certified_device_class;
+static int hf_btatt_regulatory_certification_data_list_item_regulation_bit_field_type;
+static int hf_btatt_regulatory_certification_data_list_item_data;
+static int hf_btatt_timezone_information;
+static int hf_btatt_timezone_information_information;
+static int hf_btatt_timezone_information_information_type;
+static int hf_gatt_nordic_uart_tx;
+static int hf_gatt_nordic_uart_rx;
+static int hf_gatt_nordic_dfu_packet;
+static int hf_gatt_nordic_dfu_control_point_opcode;
+static int hf_gatt_nordic_dfu_control_point_init_packet;
+static int hf_gatt_nordic_dfu_control_point_number_of_bytes;
+static int hf_gatt_nordic_dfu_control_point_image_type;
+static int hf_gatt_nordic_dfu_control_point_number_of_packets;
+static int hf_gatt_nordic_dfu_control_point_request_opcode;
+static int hf_gatt_nordic_dfu_control_point_response_value;
+static int hf_gatt_microbit_accelerometer_data;
+static int hf_gatt_microbit_accelerometer_x;
+static int hf_gatt_microbit_accelerometer_y;
+static int hf_gatt_microbit_accelerometer_z;
+static int hf_gatt_microbit_accelerometer_period;
+static int hf_gatt_microbit_magnetometer_data;
+static int hf_gatt_microbit_magnetometer_x;
+static int hf_gatt_microbit_magnetometer_y;
+static int hf_gatt_microbit_magnetometer_z;
+static int hf_gatt_microbit_magnetometer_period;
+static int hf_gatt_microbit_magnetometer_bearing;
+static int hf_gatt_microbit_button_a_state;
+static int hf_gatt_microbit_button_b_state;
+static int hf_gatt_microbit_pin_data;
+static int hf_gatt_microbit_pin_number;
+static int hf_gatt_microbit_pin_value;
+static int hf_gatt_microbit_pin_ad_config;
+static int hf_gatt_microbit_ad_pin0;
+static int hf_gatt_microbit_ad_pin1;
+static int hf_gatt_microbit_ad_pin2;
+static int hf_gatt_microbit_ad_pin3;
+static int hf_gatt_microbit_ad_pin4;
+static int hf_gatt_microbit_ad_pin5;
+static int hf_gatt_microbit_ad_pin6;
+static int hf_gatt_microbit_ad_pin7;
+static int hf_gatt_microbit_ad_pin8;
+static int hf_gatt_microbit_ad_pin9;
+static int hf_gatt_microbit_ad_pin10;
+static int hf_gatt_microbit_ad_pin11;
+static int hf_gatt_microbit_ad_pin12;
+static int hf_gatt_microbit_ad_pin13;
+static int hf_gatt_microbit_ad_pin14;
+static int hf_gatt_microbit_ad_pin15;
+static int hf_gatt_microbit_ad_pin16;
+static int hf_gatt_microbit_ad_pin17;
+static int hf_gatt_microbit_ad_pin18;
+static int hf_gatt_microbit_ad_pin19;
+static int hf_gatt_microbit_pin_io_config;
+static int hf_gatt_microbit_io_pin0;
+static int hf_gatt_microbit_io_pin1;
+static int hf_gatt_microbit_io_pin2;
+static int hf_gatt_microbit_io_pin3;
+static int hf_gatt_microbit_io_pin4;
+static int hf_gatt_microbit_io_pin5;
+static int hf_gatt_microbit_io_pin6;
+static int hf_gatt_microbit_io_pin7;
+static int hf_gatt_microbit_io_pin8;
+static int hf_gatt_microbit_io_pin9;
+static int hf_gatt_microbit_io_pin10;
+static int hf_gatt_microbit_io_pin11;
+static int hf_gatt_microbit_io_pin12;
+static int hf_gatt_microbit_io_pin13;
+static int hf_gatt_microbit_io_pin14;
+static int hf_gatt_microbit_io_pin15;
+static int hf_gatt_microbit_io_pin16;
+static int hf_gatt_microbit_io_pin17;
+static int hf_gatt_microbit_io_pin18;
+static int hf_gatt_microbit_io_pin19;
+static int hf_gatt_microbit_pwm_control;
+static int hf_gatt_microbit_led_matrix;
+static int hf_gatt_microbit_led_text;
+static int hf_gatt_microbit_scrolling_delay;
+static int hf_gatt_microbit_microbit_requirements;
+static int hf_gatt_microbit_microbit_event;
+static int hf_gatt_microbit_client_requirements;
+static int hf_gatt_microbit_client_event;
+static int hf_gatt_microbit_dfu_control;
+static int hf_gatt_microbit_temperature_value;
+static int hf_gatt_microbit_temperature_period;
+static int hf_btatt_valid_range_lower_inclusive_value;
+static int hf_btatt_valid_range_upper_inclusive_value;
+static int hf_btatt_temperature_celsius;
+static int hf_btatt_temperature_fahrenheit;
+static int hf_btatt_removable;
+static int hf_btatt_removable_reserved;
+static int hf_btatt_removable_removable;
+static int hf_btatt_service_required;
+static int hf_btatt_service_required_reserved;
+static int hf_btatt_service_required_service_required;
+static int hf_btatt_scientific_temperature_celsius;
+static int hf_btatt_string;
+static int hf_btatt_network_availability;
+static int hf_btatt_fitness_machine_features;
+static int hf_btatt_fitness_machine_features_reserved;
+static int hf_btatt_fitness_machine_features_user_data_retention;
+static int hf_btatt_fitness_machine_features_force_on_belt_and_power_output;
+static int hf_btatt_fitness_machine_features_power_measurement;
+static int hf_btatt_fitness_machine_features_remaining_time;
+static int hf_btatt_fitness_machine_features_elapsed_time;
+static int hf_btatt_fitness_machine_features_metabolic_equivalent;
+static int hf_btatt_fitness_machine_features_heart_rate_measurement;
+static int hf_btatt_fitness_machine_features_expended_energy;
+static int hf_btatt_fitness_machine_features_stride_count;
+static int hf_btatt_fitness_machine_features_resistance_level;
+static int hf_btatt_fitness_machine_features_step_count;
+static int hf_btatt_fitness_machine_features_pace;
+static int hf_btatt_fitness_machine_features_elevation_gain;
+static int hf_btatt_fitness_machine_features_inclination;
+static int hf_btatt_fitness_machine_features_total_distance;
+static int hf_btatt_fitness_machine_features_cadence;
+static int hf_btatt_fitness_machine_features_average_speed;
+static int hf_btatt_target_setting_features;
+static int hf_btatt_target_setting_features_reserved;
+static int hf_btatt_target_setting_features_targeted_cadence_configuration;
+static int hf_btatt_target_setting_features_spin_down_control;
+static int hf_btatt_target_setting_features_wheel_circumference_configuration;
+static int hf_btatt_target_setting_features_indoor_bike_simulation_parameters;
+static int hf_btatt_target_setting_features_targeted_time_in_five_heart_rate_zones_configuration;
+static int hf_btatt_target_setting_features_targeted_time_in_three_heart_rate_zones_configuration;
+static int hf_btatt_target_setting_features_targeted_time_in_two_heart_rate_zones_configuration;
+static int hf_btatt_target_setting_features_targeted_training_time_configuration;
+static int hf_btatt_target_setting_features_targeted_distance_configuration;
+static int hf_btatt_target_setting_features_targeted_stride_number_configuration;
+static int hf_btatt_target_setting_features_targeted_step_number_configuration;
+static int hf_btatt_target_setting_features_targeted_expended_energy_configuration;
+static int hf_btatt_target_setting_features_heart_rate_target_setting;
+static int hf_btatt_target_setting_features_power_target_setting;
+static int hf_btatt_target_setting_features_resistance_target_setting;
+static int hf_btatt_target_setting_features_inclination_target_setting;
+static int hf_btatt_target_setting_features_speed_target_setting;
+static int hf_btatt_training_status_flags;
+static int hf_btatt_training_status_flags_reserved;
+static int hf_btatt_training_status_flags_extended_string;
+static int hf_btatt_training_status_flags_training_status_string;
+static int hf_btatt_training_status_status;
+static int hf_btatt_training_status_status_string;
+static int hf_btatt_supported_speed_range_minimum_speed;
+static int hf_btatt_supported_speed_range_maximum_speed;
+static int hf_btatt_supported_speed_range_minimum_increment;
+static int hf_btatt_supported_inclination_range_minimum_inclination;
+static int hf_btatt_supported_inclination_range_maximum_inclination;
+static int hf_btatt_supported_inclination_range_minimum_increment;
+static int hf_btatt_supported_resistance_level_range_minimum_resistance_level;
+static int hf_btatt_supported_resistance_level_range_maximum_resistance_level;
+static int hf_btatt_supported_resistance_level_range_minimum_increment;
+static int hf_btatt_supported_heart_rate_range_minimum_heart_rate;
+static int hf_btatt_supported_heart_rate_range_maximum_heart_rate;
+static int hf_btatt_supported_heart_rate_range_minimum_increment;
+static int hf_btatt_supported_power_range_minimum_power;
+static int hf_btatt_supported_power_range_maximum_power;
+static int hf_btatt_supported_power_range_minimum_increment;
+static int hf_btatt_fitness_machine_status_opcode;
+static int hf_btatt_fitness_machine_control_information;
+static int hf_btatt_fitness_machine_spin_down_status;
+static int hf_btatt_fitness_machine_speed;
+static int hf_btatt_fitness_machine_incline;
+static int hf_btatt_fitness_machine_resistance_level;
+static int hf_btatt_fitness_machine_power;
+static int hf_btatt_fitness_machine_heart_rate;
+static int hf_btatt_fitness_machine_expended_energy;
+static int hf_btatt_fitness_machine_number_of_steps;
+static int hf_btatt_fitness_machine_number_of_strides;
+static int hf_btatt_fitness_machine_distance;
+static int hf_btatt_fitness_machine_training_time;
+static int hf_btatt_fitness_machine_wheel_circumference;
+static int hf_btatt_fitness_machine_cadence;
+static int hf_btatt_fitness_machine_wind_speed;
+static int hf_btatt_fitness_machine_grade;
+static int hf_btatt_fitness_machine_coefficient_of_rolling_resistance;
+static int hf_btatt_fitness_machine_wind_resistance_coefficient;
+static int hf_btatt_fitness_machine_targeted_time_in_fat_burn_zone;
+static int hf_btatt_fitness_machine_targeted_time_in_fitness_zone;
+static int hf_btatt_fitness_machine_targeted_time_in_very_light_zone;
+static int hf_btatt_fitness_machine_targeted_time_in_light_zone;
+static int hf_btatt_fitness_machine_targeted_time_in_moderate_zone;
+static int hf_btatt_fitness_machine_targeted_time_in_hard_zone;
+static int hf_btatt_fitness_machine_targeted_time_in_maximum_zone;
+static int hf_btatt_volume_setting;
+static int hf_btatt_volume_mute;
+static int hf_btatt_volume_change_counter;
+static int hf_btatt_volume_control_point_procedure;
+static int hf_btatt_volume_flags;
+
+static int hf_request_in_frame;
+static int hf_response_in_frame;
 
 static int btatt_tap_handles = -1;
 
@@ -2107,34 +2107,34 @@ static int * const hfx_btatt_training_status_flags[] = {
 };
 
 /* Initialize the subtree pointers */
-static gint ett_btatt = -1;
-static gint ett_btatt_list = -1;
-static gint ett_btatt_value = -1;
-static gint ett_btatt_opcode = -1;
-static gint ett_btatt_handle = -1;
-static gint ett_btatt_characteristic_properties = -1;
-static gint ett_btgatt = -1;
-static gint ett_btgatt_microbit_accelerometer = -1;
-static gint ett_btgatt_microbit_magnetometer = -1;
-static gint ett_btgatt_microbit_pin_data = -1;
-static gint ett_btgatt_microbit_pin_ad_config = -1;
-static gint ett_btgatt_microbit_pin_io_config = -1;
-static gint ett_btatt_fragment = -1;
-static gint ett_btatt_fragments = -1;
-
-static expert_field ei_btatt_uuid_format_unknown = EI_INIT;
-static expert_field ei_btatt_handle_too_few = EI_INIT;
-static expert_field ei_btatt_mtu_exceeded = EI_INIT;
-static expert_field ei_btatt_mtu_full = EI_INIT;
-static expert_field ei_btatt_consent_out_of_bounds = EI_INIT;
-static expert_field ei_btatt_cgm_size_too_small = EI_INIT;
-static expert_field ei_btatt_opcode_invalid_request = EI_INIT;
-static expert_field ei_btatt_opcode_invalid_response = EI_INIT;
-       expert_field ei_btatt_invalid_usage = EI_INIT;
-static expert_field ei_btatt_bad_data = EI_INIT;
-static expert_field ei_btatt_unexpected_data = EI_INIT;
-static expert_field ei_btatt_undecoded = EI_INIT;
-static expert_field ei_btatt_invalid_length = EI_INIT;
+static gint ett_btatt;
+static gint ett_btatt_list;
+static gint ett_btatt_value;
+static gint ett_btatt_opcode;
+static gint ett_btatt_handle;
+static gint ett_btatt_characteristic_properties;
+static gint ett_btgatt;
+static gint ett_btgatt_microbit_accelerometer;
+static gint ett_btgatt_microbit_magnetometer;
+static gint ett_btgatt_microbit_pin_data;
+static gint ett_btgatt_microbit_pin_ad_config;
+static gint ett_btgatt_microbit_pin_io_config;
+static gint ett_btatt_fragment;
+static gint ett_btatt_fragments;
+
+static expert_field ei_btatt_uuid_format_unknown;
+static expert_field ei_btatt_handle_too_few;
+static expert_field ei_btatt_mtu_exceeded;
+static expert_field ei_btatt_mtu_full;
+static expert_field ei_btatt_consent_out_of_bounds;
+static expert_field ei_btatt_cgm_size_too_small;
+static expert_field ei_btatt_opcode_invalid_request;
+static expert_field ei_btatt_opcode_invalid_response;
+       expert_field ei_btatt_invalid_usage;
+static expert_field ei_btatt_bad_data;
+static expert_field ei_btatt_unexpected_data;
+static expert_field ei_btatt_undecoded;
+static expert_field ei_btatt_invalid_length;
 
 static wmem_tree_t *mtus = NULL;
 static wmem_tree_t *requests = NULL;
@@ -2151,17 +2151,17 @@ static dissector_handle_t btmesh_proxy_handle;
 
 static dissector_table_t att_handle_dissector_table;
 
-static gint hf_btatt_fragments = -1;
-static gint hf_btatt_fragment = -1;
-static gint hf_btatt_fragment_overlap = -1;
-static gint hf_btatt_fragment_overlap_conflicts = -1;
-static gint hf_btatt_fragment_multiple_tails = -1;
-static gint hf_btatt_fragment_too_long_fragment = -1;
-static gint hf_btatt_fragment_error = -1;
-static gint hf_btatt_fragment_count = -1;
-static gint hf_btatt_reassembled_in = -1;
-static gint hf_btatt_reassembled_length = -1;
-static gint hf_btatt_reassembled_data = -1;
+static gint hf_btatt_fragments;
+static gint hf_btatt_fragment;
+static gint hf_btatt_fragment_overlap;
+static gint hf_btatt_fragment_overlap_conflicts;
+static gint hf_btatt_fragment_multiple_tails;
+static gint hf_btatt_fragment_too_long_fragment;
+static gint hf_btatt_fragment_error;
+static gint hf_btatt_fragment_count;
+static gint hf_btatt_reassembled_in;
+static gint hf_btatt_reassembled_length;
+static gint hf_btatt_reassembled_data;
 
 static const fragment_items msg_frag_items = {
     /* Fragment subtrees */
diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c
index 18aae017d8..66e9934321 100644
--- a/epan/dissectors/packet-btavctp.c
+++ b/epan/dissectors/packet-btavctp.c
@@ -28,20 +28,20 @@
 #define PACKET_TYPE_CONTINUE  0x02
 #define PACKET_TYPE_END       0x03
 
-int proto_btavctp = -1;
+int proto_btavctp;
 
-static int hf_btavctp_transaction               = -1;
-static int hf_btavctp_packet_type               = -1;
-static int hf_btavctp_cr                        = -1;
-static int hf_btavctp_ipid                      = -1;
-static int hf_btavctp_rfa                       = -1;
-static int hf_btavctp_pid                       = -1;
-static int hf_btavctp_number_of_packets         = -1;
+static int hf_btavctp_transaction;
+static int hf_btavctp_packet_type;
+static int hf_btavctp_cr;
+static int hf_btavctp_ipid;
+static int hf_btavctp_rfa;
+static int hf_btavctp_pid;
+static int hf_btavctp_number_of_packets;
 
-static gint ett_btavctp             = -1;
+static gint ett_btavctp;
 
-static expert_field ei_btavctp_unexpected_frame = EI_INIT;
-static expert_field ei_btavctp_invalid_profile = EI_INIT;
+static expert_field ei_btavctp_unexpected_frame;
+static expert_field ei_btavctp_invalid_profile;
 
 static dissector_handle_t btavctp_handle;
 
diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c
index 92732863a9..d3b08db16a 100644
--- a/epan/dissectors/packet-btavdtp.c
+++ b/epan/dissectors/packet-btavdtp.c
@@ -122,174 +122,174 @@
 #endif
 /* ========================================================== */
 
-static int proto_btavdtp = -1;
-
-static int hf_btavdtp_data                                                 = -1;
-static int hf_btavdtp_message_type                                         = -1;
-static int hf_btavdtp_packet_type                                          = -1;
-static int hf_btavdtp_transaction                                          = -1;
-static int hf_btavdtp_signal                                               = -1;
-static int hf_btavdtp_signal_id                                            = -1;
-static int hf_btavdtp_rfa0                                                 = -1;
-static int hf_btavdtp_number_of_signal_packets                             = -1;
-static int hf_btavdtp_sep_seid                                             = -1;
-static int hf_btavdtp_sep_inuse                                            = -1;
-static int hf_btavdtp_sep_rfa0                                             = -1;
-static int hf_btavdtp_sep_media_type                                       = -1;
-static int hf_btavdtp_sep_type                                             = -1;
-static int hf_btavdtp_sep_rfa1                                             = -1;
-static int hf_btavdtp_error_code                                           = -1;
-static int hf_btavdtp_acp_sep                                              = -1;
-static int hf_btavdtp_acp_seid_item                                        = -1;
-static int hf_btavdtp_int_seid_item                                        = -1;
-static int hf_btavdtp_acp_seid                                             = -1;
-static int hf_btavdtp_int_seid                                             = -1;
-static int hf_btavdtp_service_category                                     = -1;
-static int hf_btavdtp_rfa_seid                                             = -1;
-static int hf_btavdtp_delay                                                = -1;
-static int hf_btavdtp_length_of_service_category                           = -1;
-static int hf_btavdtp_recovery_type                                        = -1;
-static int hf_btavdtp_maximum_recovery_window_size                         = -1;
-static int hf_btavdtp_maximum_number_of_media_packet_in_parity_code        = -1;
-static int hf_btavdtp_multiplexing_fragmentation                           = -1;
-static int hf_btavdtp_multiplexing_rfa                                     = -1;
-static int hf_btavdtp_multiplexing_tsid                                    = -1;
-static int hf_btavdtp_multiplexing_tcid                                    = -1;
-static int hf_btavdtp_multiplexing_entry_rfa                               = -1;
-static int hf_btavdtp_header_compression_backch                            = -1;
-static int hf_btavdtp_header_compression_media                             = -1;
-static int hf_btavdtp_header_compression_recovery                          = -1;
-static int hf_btavdtp_header_compression_rfa                               = -1;
-static int hf_btavdtp_content_protection_type                              = -1;
-static int hf_btavdtp_media_codec_media_type                               = -1;
-static int hf_btavdtp_media_codec_rfa                                      = -1;
-static int hf_btavdtp_media_codec_unknown_type                             = -1;
-static int hf_btavdtp_media_codec_audio_type                               = -1;
-static int hf_btavdtp_media_codec_video_type                               = -1;
-static int hf_btavdtp_sbc_sampling_frequency_16000                         = -1;
-static int hf_btavdtp_sbc_sampling_frequency_32000                         = -1;
-static int hf_btavdtp_sbc_sampling_frequency_44100                         = -1;
-static int hf_btavdtp_sbc_sampling_frequency_48000                         = -1;
-static int hf_btavdtp_sbc_channel_mode_mono                                = -1;
-static int hf_btavdtp_sbc_channel_mode_dual_channel                        = -1;
-static int hf_btavdtp_sbc_channel_mode_stereo                              = -1;
-static int hf_btavdtp_sbc_channel_mode_joint_stereo                        = -1;
-static int hf_btavdtp_sbc_block_4                                          = -1;
-static int hf_btavdtp_sbc_block_8                                          = -1;
-static int hf_btavdtp_sbc_block_12                                         = -1;
-static int hf_btavdtp_sbc_block_16                                         = -1;
-static int hf_btavdtp_sbc_subbands_4                                       = -1;
-static int hf_btavdtp_sbc_subbands_8                                       = -1;
-static int hf_btavdtp_sbc_allocation_method_snr                            = -1;
-static int hf_btavdtp_sbc_allocation_method_loudness                       = -1;
-static int hf_btavdtp_sbc_min_bitpool                                      = -1;
-static int hf_btavdtp_sbc_max_bitpool                                      = -1;
-static int hf_btavdtp_mpeg12_layer_1                                       = -1;
-static int hf_btavdtp_mpeg12_layer_2                                       = -1;
-static int hf_btavdtp_mpeg12_layer_3                                       = -1;
-static int hf_btavdtp_mpeg12_crc_protection                                = -1;
-static int hf_btavdtp_mpeg12_channel_mode_mono                             = -1;
-static int hf_btavdtp_mpeg12_channel_mode_dual_channel                     = -1;
-static int hf_btavdtp_mpeg12_channel_mode_stereo                           = -1;
-static int hf_btavdtp_mpeg12_channel_mode_joint_stereo                     = -1;
-static int hf_btavdtp_mpeg12_rfa                                           = -1;
-static int hf_btavdtp_mpeg12_mpf_2                                         = -1;
-static int hf_btavdtp_mpeg12_sampling_frequency_16000                      = -1;
-static int hf_btavdtp_mpeg12_sampling_frequency_22050                      = -1;
-static int hf_btavdtp_mpeg12_sampling_frequency_24000                      = -1;
-static int hf_btavdtp_mpeg12_sampling_frequency_32000                      = -1;
-static int hf_btavdtp_mpeg12_sampling_frequency_44100                      = -1;
-static int hf_btavdtp_mpeg12_sampling_frequency_48000                      = -1;
-static int hf_btavdtp_mpeg12_vbr_supported                                 = -1;
-static int hf_btavdtp_mpeg12_bit_rate                                      = -1;
-static int hf_btavdtp_mpeg24_object_type_mpeg2_aac_lc                      = -1;
-static int hf_btavdtp_mpeg24_object_type_mpeg4_aac_lc                      = -1;
-static int hf_btavdtp_mpeg24_object_type_mpeg4_aac_ltp                     = -1;
-static int hf_btavdtp_mpeg24_object_type_mpeg4_aac_scalable                = -1;
-static int hf_btavdtp_mpeg24_object_type_rfa                               = -1;
-static int hf_btavdtp_mpeg24_sampling_frequency_8000                       = -1;
-static int hf_btavdtp_mpeg24_sampling_frequency_11025                      = -1;
-static int hf_btavdtp_mpeg24_sampling_frequency_12000                      = -1;
-static int hf_btavdtp_mpeg24_sampling_frequency_16000                      = -1;
-static int hf_btavdtp_mpeg24_sampling_frequency_22050                      = -1;
-static int hf_btavdtp_mpeg24_sampling_frequency_24000                      = -1;
-static int hf_btavdtp_mpeg24_sampling_frequency_32000                      = -1;
-static int hf_btavdtp_mpeg24_sampling_frequency_44100                      = -1;
-static int hf_btavdtp_mpeg24_sampling_frequency_48000                      = -1;
-static int hf_btavdtp_mpeg24_sampling_frequency_64000                      = -1;
-static int hf_btavdtp_mpeg24_sampling_frequency_88200                      = -1;
-static int hf_btavdtp_mpeg24_sampling_frequency_96000                      = -1;
-static int hf_btavdtp_mpeg24_channels_1                                    = -1;
-static int hf_btavdtp_mpeg24_channels_2                                    = -1;
-static int hf_btavdtp_mpeg24_rfa                                           = -1;
-static int hf_btavdtp_mpeg24_vbr_supported                                 = -1;
-static int hf_btavdtp_mpeg24_bit_rate                                      = -1;
-static int hf_btavdtp_atrac_version                                        = -1;
-static int hf_btavdtp_atrac_channel_mode_single_channel                    = -1;
-static int hf_btavdtp_atrac_channel_mode_dual_channel                      = -1;
-static int hf_btavdtp_atrac_channel_mode_joint_stereo                      = -1;
-static int hf_btavdtp_atrac_rfa1                                           = -1;
-static int hf_btavdtp_atrac_rfa2                                           = -1;
-static int hf_btavdtp_atrac_sampling_frequency_44100                       = -1;
-static int hf_btavdtp_atrac_sampling_frequency_48000                       = -1;
-static int hf_btavdtp_atrac_vbr_supported                                  = -1;
-static int hf_btavdtp_atrac_bit_rate                                       = -1;
-static int hf_btavdtp_atrac_maximum_sul                                    = -1;
-static int hf_btavdtp_atrac_rfa3                                           = -1;
-static int hf_btavdtp_vendor_specific_aptx_sampling_frequency_16000        = -1;
-static int hf_btavdtp_vendor_specific_aptx_sampling_frequency_32000        = -1;
-static int hf_btavdtp_vendor_specific_aptx_sampling_frequency_44100        = -1;
-static int hf_btavdtp_vendor_specific_aptx_sampling_frequency_48000        = -1;
-static int hf_btavdtp_vendor_specific_aptx_channel_mode_mono               = -1;
-static int hf_btavdtp_vendor_specific_aptx_channel_mode_dual_channel       = -1;
-static int hf_btavdtp_vendor_specific_aptx_channel_mode_stereo             = -1;
-static int hf_btavdtp_vendor_specific_aptx_channel_mode_joint_stereo       = -1;
-static int hf_btavdtp_vendor_specific_aptxhd_sampling_frequency_16000      = -1;
-static int hf_btavdtp_vendor_specific_aptxhd_sampling_frequency_32000      = -1;
-static int hf_btavdtp_vendor_specific_aptxhd_sampling_frequency_44100      = -1;
-static int hf_btavdtp_vendor_specific_aptxhd_sampling_frequency_48000      = -1;
-static int hf_btavdtp_vendor_specific_aptxhd_channel_mode_mono             = -1;
-static int hf_btavdtp_vendor_specific_aptxhd_channel_mode_dual_channel     = -1;
-static int hf_btavdtp_vendor_specific_aptxhd_channel_mode_stereo           = -1;
-static int hf_btavdtp_vendor_specific_aptxhd_channel_mode_joint_stereo     = -1;
-static int hf_btavdtp_vendor_specific_aptxhd_rfa                           = -1;
-static int hf_btavdtp_vendor_specific_ldac_rfa1                            = -1;
-static int hf_btavdtp_vendor_specific_ldac_sampling_frequency_44100        = -1;
-static int hf_btavdtp_vendor_specific_ldac_sampling_frequency_48000        = -1;
-static int hf_btavdtp_vendor_specific_ldac_sampling_frequency_88200        = -1;
-static int hf_btavdtp_vendor_specific_ldac_sampling_frequency_96000        = -1;
-static int hf_btavdtp_vendor_specific_ldac_sampling_frequency_176400       = -1;
-static int hf_btavdtp_vendor_specific_ldac_sampling_frequency_192000       = -1;
-static int hf_btavdtp_vendor_specific_ldac_rfa2                            = -1;
-static int hf_btavdtp_vendor_specific_ldac_channel_mode_mono               = -1;
-static int hf_btavdtp_vendor_specific_ldac_channel_mode_dual_channel       = -1;
-static int hf_btavdtp_vendor_specific_ldac_channel_mode_stereo             = -1;
-static int hf_btavdtp_h263_level_10                                        = -1;
-static int hf_btavdtp_h263_level_20                                        = -1;
-static int hf_btavdtp_h263_level_30                                        = -1;
-static int hf_btavdtp_h263_level_rfa                                       = -1;
-static int hf_btavdtp_mpeg4_level_0                                        = -1;
-static int hf_btavdtp_mpeg4_level_1                                        = -1;
-static int hf_btavdtp_mpeg4_level_2                                        = -1;
-static int hf_btavdtp_mpeg4_level_3                                        = -1;
-static int hf_btavdtp_mpeg4_level_rfa                                      = -1;
-static int hf_btavdtp_vendor_id                                            = -1;
-static int hf_btavdtp_vendor_specific_codec_id                             = -1;
-static int hf_btavdtp_vendor_specific_value                                = -1;
-static int hf_btavdtp_vendor_specific_apt_codec_id                         = -1;
-static int hf_btavdtp_vendor_specific_ldac_codec_id                        = -1;
-static int hf_btavdtp_capabilities                                         = -1;
-static int hf_btavdtp_service                                              = -1;
-static int hf_btavdtp_service_multiplexing_entry                           = -1;
-
-static gint ett_btavdtp               = -1;
-static gint ett_btavdtp_sep           = -1;
-static gint ett_btavdtp_capabilities  = -1;
-static gint ett_btavdtp_service       = -1;
-
-static expert_field ei_btavdtp_sbc_min_bitpool_out_of_range = EI_INIT;
-static expert_field ei_btavdtp_sbc_max_bitpool_out_of_range = EI_INIT;
-static expert_field ei_btavdtp_unexpected_losc_data = EI_INIT;
+static int proto_btavdtp;
+
+static int hf_btavdtp_data;
+static int hf_btavdtp_message_type;
+static int hf_btavdtp_packet_type;
+static int hf_btavdtp_transaction;
+static int hf_btavdtp_signal;
+static int hf_btavdtp_signal_id;
+static int hf_btavdtp_rfa0;
+static int hf_btavdtp_number_of_signal_packets;
+static int hf_btavdtp_sep_seid;
+static int hf_btavdtp_sep_inuse;
+static int hf_btavdtp_sep_rfa0;
+static int hf_btavdtp_sep_media_type;
+static int hf_btavdtp_sep_type;
+static int hf_btavdtp_sep_rfa1;
+static int hf_btavdtp_error_code;
+static int hf_btavdtp_acp_sep;
+static int hf_btavdtp_acp_seid_item;
+static int hf_btavdtp_int_seid_item;
+static int hf_btavdtp_acp_seid;
+static int hf_btavdtp_int_seid;
+static int hf_btavdtp_service_category;
+static int hf_btavdtp_rfa_seid;
+static int hf_btavdtp_delay;
+static int hf_btavdtp_length_of_service_category;
+static int hf_btavdtp_recovery_type;
+static int hf_btavdtp_maximum_recovery_window_size;
+static int hf_btavdtp_maximum_number_of_media_packet_in_parity_code;
+static int hf_btavdtp_multiplexing_fragmentation;
+static int hf_btavdtp_multiplexing_rfa;
+static int hf_btavdtp_multiplexing_tsid;
+static int hf_btavdtp_multiplexing_tcid;
+static int hf_btavdtp_multiplexing_entry_rfa;
+static int hf_btavdtp_header_compression_backch;
+static int hf_btavdtp_header_compression_media;
+static int hf_btavdtp_header_compression_recovery;
+static int hf_btavdtp_header_compression_rfa;
+static int hf_btavdtp_content_protection_type;
+static int hf_btavdtp_media_codec_media_type;
+static int hf_btavdtp_media_codec_rfa;
+static int hf_btavdtp_media_codec_unknown_type;
+static int hf_btavdtp_media_codec_audio_type;
+static int hf_btavdtp_media_codec_video_type;
+static int hf_btavdtp_sbc_sampling_frequency_16000;
+static int hf_btavdtp_sbc_sampling_frequency_32000;
+static int hf_btavdtp_sbc_sampling_frequency_44100;
+static int hf_btavdtp_sbc_sampling_frequency_48000;
+static int hf_btavdtp_sbc_channel_mode_mono;
+static int hf_btavdtp_sbc_channel_mode_dual_channel;
+static int hf_btavdtp_sbc_channel_mode_stereo;
+static int hf_btavdtp_sbc_channel_mode_joint_stereo;
+static int hf_btavdtp_sbc_block_4;
+static int hf_btavdtp_sbc_block_8;
+static int hf_btavdtp_sbc_block_12;
+static int hf_btavdtp_sbc_block_16;
+static int hf_btavdtp_sbc_subbands_4;
+static int hf_btavdtp_sbc_subbands_8;
+static int hf_btavdtp_sbc_allocation_method_snr;
+static int hf_btavdtp_sbc_allocation_method_loudness;
+static int hf_btavdtp_sbc_min_bitpool;
+static int hf_btavdtp_sbc_max_bitpool;
+static int hf_btavdtp_mpeg12_layer_1;
+static int hf_btavdtp_mpeg12_layer_2;
+static int hf_btavdtp_mpeg12_layer_3;
+static int hf_btavdtp_mpeg12_crc_protection;
+static int hf_btavdtp_mpeg12_channel_mode_mono;
+static int hf_btavdtp_mpeg12_channel_mode_dual_channel;
+static int hf_btavdtp_mpeg12_channel_mode_stereo;
+static int hf_btavdtp_mpeg12_channel_mode_joint_stereo;
+static int hf_btavdtp_mpeg12_rfa;
+static int hf_btavdtp_mpeg12_mpf_2;
+static int hf_btavdtp_mpeg12_sampling_frequency_16000;
+static int hf_btavdtp_mpeg12_sampling_frequency_22050;
+static int hf_btavdtp_mpeg12_sampling_frequency_24000;
+static int hf_btavdtp_mpeg12_sampling_frequency_32000;
+static int hf_btavdtp_mpeg12_sampling_frequency_44100;
+static int hf_btavdtp_mpeg12_sampling_frequency_48000;
+static int hf_btavdtp_mpeg12_vbr_supported;
+static int hf_btavdtp_mpeg12_bit_rate;
+static int hf_btavdtp_mpeg24_object_type_mpeg2_aac_lc;
+static int hf_btavdtp_mpeg24_object_type_mpeg4_aac_lc;
+static int hf_btavdtp_mpeg24_object_type_mpeg4_aac_ltp;
+static int hf_btavdtp_mpeg24_object_type_mpeg4_aac_scalable;
+static int hf_btavdtp_mpeg24_object_type_rfa;
+static int hf_btavdtp_mpeg24_sampling_frequency_8000;
+static int hf_btavdtp_mpeg24_sampling_frequency_11025;
+static int hf_btavdtp_mpeg24_sampling_frequency_12000;
+static int hf_btavdtp_mpeg24_sampling_frequency_16000;
+static int hf_btavdtp_mpeg24_sampling_frequency_22050;
+static int hf_btavdtp_mpeg24_sampling_frequency_24000;
+static int hf_btavdtp_mpeg24_sampling_frequency_32000;
+static int hf_btavdtp_mpeg24_sampling_frequency_44100;
+static int hf_btavdtp_mpeg24_sampling_frequency_48000;
+static int hf_btavdtp_mpeg24_sampling_frequency_64000;
+static int hf_btavdtp_mpeg24_sampling_frequency_88200;
+static int hf_btavdtp_mpeg24_sampling_frequency_96000;
+static int hf_btavdtp_mpeg24_channels_1;
+static int hf_btavdtp_mpeg24_channels_2;
+static int hf_btavdtp_mpeg24_rfa;
+static int hf_btavdtp_mpeg24_vbr_supported;
+static int hf_btavdtp_mpeg24_bit_rate;
+static int hf_btavdtp_atrac_version;
+static int hf_btavdtp_atrac_channel_mode_single_channel;
+static int hf_btavdtp_atrac_channel_mode_dual_channel;
+static int hf_btavdtp_atrac_channel_mode_joint_stereo;
+static int hf_btavdtp_atrac_rfa1;
+static int hf_btavdtp_atrac_rfa2;
+static int hf_btavdtp_atrac_sampling_frequency_44100;
+static int hf_btavdtp_atrac_sampling_frequency_48000;
+static int hf_btavdtp_atrac_vbr_supported;
+static int hf_btavdtp_atrac_bit_rate;
+static int hf_btavdtp_atrac_maximum_sul;
+static int hf_btavdtp_atrac_rfa3;
+static int hf_btavdtp_vendor_specific_aptx_sampling_frequency_16000;
+static int hf_btavdtp_vendor_specific_aptx_sampling_frequency_32000;
+static int hf_btavdtp_vendor_specific_aptx_sampling_frequency_44100;
+static int hf_btavdtp_vendor_specific_aptx_sampling_frequency_48000;
+static int hf_btavdtp_vendor_specific_aptx_channel_mode_mono;
+static int hf_btavdtp_vendor_specific_aptx_channel_mode_dual_channel;
+static int hf_btavdtp_vendor_specific_aptx_channel_mode_stereo;
+static int hf_btavdtp_vendor_specific_aptx_channel_mode_joint_stereo;
+static int hf_btavdtp_vendor_specific_aptxhd_sampling_frequency_16000;
+static int hf_btavdtp_vendor_specific_aptxhd_sampling_frequency_32000;
+static int hf_btavdtp_vendor_specific_aptxhd_sampling_frequency_44100;
+static int hf_btavdtp_vendor_specific_aptxhd_sampling_frequency_48000;
+static int hf_btavdtp_vendor_specific_aptxhd_channel_mode_mono;
+static int hf_btavdtp_vendor_specific_aptxhd_channel_mode_dual_channel;
+static int hf_btavdtp_vendor_specific_aptxhd_channel_mode_stereo;
+static int hf_btavdtp_vendor_specific_aptxhd_channel_mode_joint_stereo;
+static int hf_btavdtp_vendor_specific_aptxhd_rfa;
+static int hf_btavdtp_vendor_specific_ldac_rfa1;
+static int hf_btavdtp_vendor_specific_ldac_sampling_frequency_44100;
+static int hf_btavdtp_vendor_specific_ldac_sampling_frequency_48000;
+static int hf_btavdtp_vendor_specific_ldac_sampling_frequency_88200;
+static int hf_btavdtp_vendor_specific_ldac_sampling_frequency_96000;
+static int hf_btavdtp_vendor_specific_ldac_sampling_frequency_176400;
+static int hf_btavdtp_vendor_specific_ldac_sampling_frequency_192000;
+static int hf_btavdtp_vendor_specific_ldac_rfa2;
+static int hf_btavdtp_vendor_specific_ldac_channel_mode_mono;
+static int hf_btavdtp_vendor_specific_ldac_channel_mode_dual_channel;
+static int hf_btavdtp_vendor_specific_ldac_channel_mode_stereo;
+static int hf_btavdtp_h263_level_10;
+static int hf_btavdtp_h263_level_20;
+static int hf_btavdtp_h263_level_30;
+static int hf_btavdtp_h263_level_rfa;
+static int hf_btavdtp_mpeg4_level_0;
+static int hf_btavdtp_mpeg4_level_1;
+static int hf_btavdtp_mpeg4_level_2;
+static int hf_btavdtp_mpeg4_level_3;
+static int hf_btavdtp_mpeg4_level_rfa;
+static int hf_btavdtp_vendor_id;
+static int hf_btavdtp_vendor_specific_codec_id;
+static int hf_btavdtp_vendor_specific_value;
+static int hf_btavdtp_vendor_specific_apt_codec_id;
+static int hf_btavdtp_vendor_specific_ldac_codec_id;
+static int hf_btavdtp_capabilities;
+static int hf_btavdtp_service;
+static int hf_btavdtp_service_multiplexing_entry;
+
+static gint ett_btavdtp;
+static gint ett_btavdtp_sep;
+static gint ett_btavdtp_capabilities;
+static gint ett_btavdtp_service;
+
+static expert_field ei_btavdtp_sbc_min_bitpool_out_of_range;
+static expert_field ei_btavdtp_sbc_max_bitpool_out_of_range;
+static expert_field ei_btavdtp_unexpected_losc_data;
 
 static dissector_handle_t btavdtp_handle;
 static dissector_handle_t bta2dp_handle;
@@ -302,23 +302,23 @@ static wmem_tree_t *sep_open             = NULL;
 static wmem_tree_t *media_packet_times   = NULL;
 
 /* A2DP declarations */
-static gint proto_bta2dp                        = -1;
-static gint ett_bta2dp                          = -1;
-static gint proto_bta2dp_cph_scms_t             = -1;
-static gint ett_bta2dp_cph_scms_t               = -1;
-
-static int hf_bta2dp_acp_seid                           = -1;
-static int hf_bta2dp_int_seid                           = -1;
-static int hf_bta2dp_codec                              = -1;
-static int hf_bta2dp_vendor_id                          = -1;
-static int hf_bta2dp_vendor_codec_id                    = -1;
-static int hf_bta2dp_content_protection                 = -1;
-static int hf_bta2dp_stream_start_in_frame              = -1;
-static int hf_bta2dp_stream_end_in_frame                = -1;
-static int hf_bta2dp_stream_number                      = -1;
-static int hf_bta2dp_l_bit                              = -1;
-static int hf_bta2dp_cp_bit                             = -1;
-static int hf_bta2dp_reserved                           = -1;
+static gint proto_bta2dp;
+static gint ett_bta2dp;
+static gint proto_bta2dp_cph_scms_t;
+static gint ett_bta2dp_cph_scms_t;
+
+static int hf_bta2dp_acp_seid;
+static int hf_bta2dp_int_seid;
+static int hf_bta2dp_codec;
+static int hf_bta2dp_vendor_id;
+static int hf_bta2dp_vendor_codec_id;
+static int hf_bta2dp_content_protection;
+static int hf_bta2dp_stream_start_in_frame;
+static int hf_bta2dp_stream_end_in_frame;
+static int hf_bta2dp_stream_number;
+static int hf_bta2dp_l_bit;
+static int hf_bta2dp_cp_bit;
+static int hf_bta2dp_reserved;
 
 static dissector_handle_t sbc_handle;
 static dissector_handle_t mp2t_handle;
@@ -342,23 +342,23 @@ static const enum_val_t pref_a2dp_codec[] = {
 
 
 /* VDP declarations */
-static gint proto_btvdp                         = -1;
-static gint ett_btvdp                           = -1;
-static gint proto_btvdp_cph_scms_t              = -1;
-static gint ett_btvdp_cph_scms_t                = -1;
-
-static int hf_btvdp_acp_seid                           = -1;
-static int hf_btvdp_int_seid                           = -1;
-static int hf_btvdp_codec                              = -1;
-static int hf_btvdp_vendor_id                          = -1;
-static int hf_btvdp_vendor_codec_id                    = -1;
-static int hf_btvdp_content_protection                 = -1;
-static int hf_btvdp_stream_start_in_frame              = -1;
-static int hf_btvdp_stream_end_in_frame                = -1;
-static int hf_btvdp_stream_number                      = -1;
-static int hf_btvdp_l_bit                              = -1;
-static int hf_btvdp_cp_bit                             = -1;
-static int hf_btvdp_reserved                           = -1;
+static gint proto_btvdp;
+static gint ett_btvdp;
+static gint proto_btvdp_cph_scms_t;
+static gint ett_btvdp_cph_scms_t;
+
+static int hf_btvdp_acp_seid;
+static int hf_btvdp_int_seid;
+static int hf_btvdp_codec;
+static int hf_btvdp_vendor_id;
+static int hf_btvdp_vendor_codec_id;
+static int hf_btvdp_content_protection;
+static int hf_btvdp_stream_start_in_frame;
+static int hf_btvdp_stream_end_in_frame;
+static int hf_btvdp_stream_number;
+static int hf_btvdp_l_bit;
+static int hf_btvdp_cp_bit;
+static int hf_btvdp_reserved;
 
 static dissector_handle_t h263_handle;
 static dissector_handle_t mp4v_es_handle;
@@ -373,39 +373,39 @@ static const enum_val_t pref_vdp_codec[] = {
 };
 
 /* APT-X Codec */
-static int  proto_aptx                            = -1;
-static int  hf_aptx_data                          = -1;
-static int  hf_aptx_cumulative_frame_duration    = -1;
-static int  hf_aptx_delta_time                    = -1;
-static int  hf_aptx_avrcp_song_position           = -1;
-static int  hf_aptx_delta_time_from_the_beginning = -1;
-static int  hf_aptx_cumulative_duration          = -1;
-static int  hf_aptx_diff                          = -1;
-static gint ett_aptx                              = -1;
+static int  proto_aptx;
+static int  hf_aptx_data;
+static int  hf_aptx_cumulative_frame_duration;
+static int  hf_aptx_delta_time;
+static int  hf_aptx_avrcp_song_position;
+static int  hf_aptx_delta_time_from_the_beginning;
+static int  hf_aptx_cumulative_duration;
+static int  hf_aptx_diff;
+static gint ett_aptx;
 static dissector_handle_t aptx_handle;
 
 /* LDAC Codec */
-static int  proto_ldac                            = -1;
-static int  hf_ldac_fragmented                    = -1;
-static int  hf_ldac_starting_packet               = -1;
-static int  hf_ldac_last_packet                   = -1;
-static int  hf_ldac_rfa                           = -1;
-static int  hf_ldac_number_of_frames              = -1;
-
-static int hf_ldac_syncword                       = -1;
-static int hf_ldac_sampling_frequency             = -1;
-static int hf_ldac_channel_config_index           = -1;
-static int hf_ldac_frame_length_h                 = -1;
-static int hf_ldac_frame_length_l                 = -1;
-static int hf_ldac_frame_status                   = -1;
-
-static int hf_ldac_expected_data_speed            = -1;
-
-static int  hf_ldac_data                          = -1;
-static gint ett_ldac                              = -1;
-static gint ett_ldac_list                         = -1;
-static expert_field ei_ldac_syncword = EI_INIT;
-static expert_field ei_ldac_truncated_or_bad_length = EI_INIT;
+static int  proto_ldac;
+static int  hf_ldac_fragmented;
+static int  hf_ldac_starting_packet;
+static int  hf_ldac_last_packet;
+static int  hf_ldac_rfa;
+static int  hf_ldac_number_of_frames;
+
+static int hf_ldac_syncword;
+static int hf_ldac_sampling_frequency;
+static int hf_ldac_channel_config_index;
+static int hf_ldac_frame_length_h;
+static int hf_ldac_frame_length_l;
+static int hf_ldac_frame_status;
+
+static int hf_ldac_expected_data_speed;
+
+static int  hf_ldac_data;
+static gint ett_ldac;
+static gint ett_ldac_list;
+static expert_field ei_ldac_syncword;
+static expert_field ei_ldac_truncated_or_bad_length;
 static dissector_handle_t ldac_handle;
 #define LDAC_CCI_MONO   0x0
 #define LDAC_CCI_DUAL   0x1
diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c
index 6a8e2dd49a..6c8660c0ed 100644
--- a/epan/dissectors/packet-btavrcp.c
+++ b/epan/dissectors/packet-btavrcp.c
@@ -22,187 +22,187 @@
 #include "packet-btavctp.h"
 #include "packet-btavrcp.h"
 
-static int proto_btavrcp                                                   = -1;
-
-static int hf_btavrcp_rfa                                                  = -1;
-static int hf_btavrcp_ctype                                                = -1;
-static int hf_btavrcp_subunit_type                                         = -1;
-static int hf_btavrcp_subunit_id                                           = -1;
-static int hf_btavrcp_opcode                                               = -1;
-static int hf_btavrcp_company_id                                           = -1;
-static int hf_btavrcp_length                                               = -1;
-static int hf_btavrcp_pdu_id                                               = -1;
-static int hf_btavrcp_bt_pdu_id                                            = -1;
-static int hf_btavrcp_bt_continuing_pdu_id                                 = -1;
-static int hf_btavrcp_browsing_pdu_id                                      = -1;
-static int hf_btavrcp_reserved                                             = -1;
-static int hf_btavrcp_packet_type                                          = -1;
-static int hf_btavrcp_passthrough_state                                    = -1;
-static int hf_btavrcp_passthrough_operation                                = -1;
-static int hf_btavrcp_passthrough_data_length                              = -1;
-static int hf_btavrcp_passthrough_company_id                               = -1;
-static int hf_btavrcp_passthrough_vendor_unique_id                         = -1;
-static int hf_btavrcp_unit_unknown                                         = -1;
-static int hf_btavrcp_unit_type                                            = -1;
-static int hf_btavrcp_unit_id                                              = -1;
-static int hf_btavrcp_subunit_page                                         = -1;
-static int hf_btavrcp_subunit_extension_code                               = -1;
-static int hf_btavrcp_item                                                 = -1;
-static int hf_btavrcp_folder                                               = -1;
-static int hf_btavrcp_player_id                                            = -1;
-static int hf_btavrcp_status                                               = -1;
-static int hf_btavrcp_uid_counter                                          = -1;
-static int hf_btavrcp_number_of_items                                      = -1;
-static int hf_btavrcp_number_of_items16                                    = -1;
-static int hf_btavrcp_character_set                                        = -1;
-static int hf_btavrcp_folder_depth                                         = -1;
-static int hf_btavrcp_folder_name_length                                   = -1;
-static int hf_btavrcp_folder_name                                          = -1;
-static int hf_btavrcp_search                                               = -1;
-static int hf_btavrcp_search_length                                        = -1;
-static int hf_btavrcp_number_of_attributes                                 = -1;
-static int hf_btavrcp_uid                                                  = -1;
-static int hf_btavrcp_scope                                                = -1;
-static int hf_btavrcp_start_item                                           = -1;
-static int hf_btavrcp_end_item                                             = -1;
-static int hf_btavrcp_direction                                            = -1;
-static int hf_btavrcp_identifier                                           = -1;
-static int hf_btavrcp_song_length                                          = -1;
-static int hf_btavrcp_song_position                                        = -1;
-static int hf_btavrcp_play_status                                          = -1;
-static int hf_btavrcp_notification_interval                                = -1;
-static int hf_btavrcp_event_id                                             = -1;
-static int hf_btavrcp_battery_status                                       = -1;
-static int hf_btavrcp_number_of_character_set                              = -1;
-static int hf_btavrcp_absolute_volume_rfa                                  = -1;
-static int hf_btavrcp_absolute_volume                                      = -1;
-static int hf_btavrcp_capability                                           = -1;
-static int hf_btavrcp_capability_count                                     = -1;
-static int hf_btavrcp_item_type                                            = -1;
-static int hf_btavrcp_item_length                                          = -1;
-static int hf_btavrcp_system_status                                        = -1;
-static int hf_btavrcp_number_of_settings                                   = -1;
-static int hf_btavrcp_settings_attribute                                   = -1;
-static int hf_btavrcp_settings_value                                       = -1;
-static int hf_btavrcp_displayable_name                                     = -1;
-static int hf_btavrcp_displayable_name_length                              = -1;
-static int hf_btavrcp_media_type                                           = -1;
-static int hf_btavrcp_folder_type                                          = -1;
-static int hf_btavrcp_folder_playable                                      = -1;
-static int hf_btavrcp_major_player_type                                    = -1;
-static int hf_btavrcp_player_subtype                                       = -1;
-static int hf_btavrcp_player_item                                          = -1;
-static int hf_btavrcp_attribute                                            = -1;
-static int hf_btavrcp_attribute_count                                      = -1;
-static int hf_btavrcp_attribute_value                                      = -1;
-static int hf_btavrcp_attribute_value_length                               = -1;
-static int hf_btavrcp_attribute_item                                       = -1;
-static int hf_btavrcp_attribute_list                                       = -1;
-static int hf_btavrcp_attribute_entries                                    = -1;
-static int hf_btavrcp_attribute_name_length                                = -1;
-static int hf_btavrcp_attribute_name                                       = -1;
-static int hf_btavrcp_setting_value_length                                 = -1;
-static int hf_btavrcp_setting_value                                        = -1;
-static int hf_btavrcp_features                                             = -1;
-static int hf_btavrcp_not_used_features                                    = -1;
-static int hf_btavrcp_feature_reserved_0                                   = -1;
-static int hf_btavrcp_feature_reserved_1                                   = -1;
-static int hf_btavrcp_feature_reserved_2                                   = -1;
-static int hf_btavrcp_feature_reserved_3                                   = -1;
-static int hf_btavrcp_feature_reserved_4                                   = -1;
-static int hf_btavrcp_feature_reserved_5                                   = -1;
-static int hf_btavrcp_feature_reserved_6                                   = -1;
-static int hf_btavrcp_feature_reserved_7                                   = -1;
-static int hf_btavrcp_feature_passthrough_select                           = -1;
-static int hf_btavrcp_feature_passthrough_up                               = -1;
-static int hf_btavrcp_feature_passthrough_down                             = -1;
-static int hf_btavrcp_feature_passthrough_left                             = -1;
-static int hf_btavrcp_feature_passthrough_right                            = -1;
-static int hf_btavrcp_feature_passthrough_right_up                         = -1;
-static int hf_btavrcp_feature_passthrough_right_down                       = -1;
-static int hf_btavrcp_feature_passthrough_left_up                          = -1;
-static int hf_btavrcp_feature_passthrough_left_down                        = -1;
-static int hf_btavrcp_feature_passthrough_root_menu                        = -1;
-static int hf_btavrcp_feature_passthrough_setup_menu                       = -1;
-static int hf_btavrcp_feature_passthrough_contents_menu                    = -1;
-static int hf_btavrcp_feature_passthrough_favorite_menu                    = -1;
-static int hf_btavrcp_feature_passthrough_exit                             = -1;
-static int hf_btavrcp_feature_passthrough_0                                = -1;
-static int hf_btavrcp_feature_passthrough_1                                = -1;
-static int hf_btavrcp_feature_passthrough_2                                = -1;
-static int hf_btavrcp_feature_passthrough_3                                = -1;
-static int hf_btavrcp_feature_passthrough_4                                = -1;
-static int hf_btavrcp_feature_passthrough_5                                = -1;
-static int hf_btavrcp_feature_passthrough_6                                = -1;
-static int hf_btavrcp_feature_passthrough_7                                = -1;
-static int hf_btavrcp_feature_passthrough_8                                = -1;
-static int hf_btavrcp_feature_passthrough_9                                = -1;
-static int hf_btavrcp_feature_passthrough_dot                              = -1;
-static int hf_btavrcp_feature_passthrough_enter                            = -1;
-static int hf_btavrcp_feature_passthrough_clear                            = -1;
-static int hf_btavrcp_feature_passthrough_channel_up                       = -1;
-static int hf_btavrcp_feature_passthrough_channel_down                     = -1;
-static int hf_btavrcp_feature_passthrough_previous_channel                 = -1;
-static int hf_btavrcp_feature_passthrough_sound_select                     = -1;
-static int hf_btavrcp_feature_passthrough_input_select                     = -1;
-static int hf_btavrcp_feature_passthrough_display_information              = -1;
-static int hf_btavrcp_feature_passthrough_help                             = -1;
-static int hf_btavrcp_feature_passthrough_page_up                          = -1;
-static int hf_btavrcp_feature_passthrough_page_down                        = -1;
-static int hf_btavrcp_feature_passthrough_power                            = -1;
-static int hf_btavrcp_feature_passthrough_volume_up                        = -1;
-static int hf_btavrcp_feature_passthrough_volume_down                      = -1;
-static int hf_btavrcp_feature_passthrough_mute                             = -1;
-static int hf_btavrcp_feature_passthrough_play                             = -1;
-static int hf_btavrcp_feature_passthrough_stop                             = -1;
-static int hf_btavrcp_feature_passthrough_pause                            = -1;
-static int hf_btavrcp_feature_passthrough_record                           = -1;
-static int hf_btavrcp_feature_passthrough_rewind                           = -1;
-static int hf_btavrcp_feature_passthrough_fast_forward                     = -1;
-static int hf_btavrcp_feature_passthrough_eject                            = -1;
-static int hf_btavrcp_feature_passthrough_forward                          = -1;
-static int hf_btavrcp_feature_passthrough_backward                         = -1;
-static int hf_btavrcp_feature_passthrough_angle                            = -1;
-static int hf_btavrcp_feature_passthrough_subpicture                       = -1;
-static int hf_btavrcp_feature_passthrough_f1                               = -1;
-static int hf_btavrcp_feature_passthrough_f2                               = -1;
-static int hf_btavrcp_feature_passthrough_f3                               = -1;
-static int hf_btavrcp_feature_passthrough_f4                               = -1;
-static int hf_btavrcp_feature_passthrough_f5                               = -1;
-static int hf_btavrcp_feature_vendor_unique                                = -1;
-static int hf_btavrcp_feature_basic_group_navigation                       = -1;
-static int hf_btavrcp_feature_advanced_control_player                      = -1;
-static int hf_btavrcp_feature_browsing                                     = -1;
-static int hf_btavrcp_feature_searching                                    = -1;
-static int hf_btavrcp_feature_addtonowplayer                               = -1;
-static int hf_btavrcp_feature_uid_unique                                   = -1;
-static int hf_btavrcp_feature_only_browsable_when_addressed                = -1;
-static int hf_btavrcp_feature_only_searchable_when_addressed               = -1;
-static int hf_btavrcp_feature_nowplaying                                   = -1;
-static int hf_btavrcp_feature_uid_persistency                              = -1;
-static int hf_btavrcp_feature_number_of_items                              = -1;
-static int hf_btavrcp_feature_cover_art                                    = -1;
-static int hf_btavrcp_reassembled                                          = -1;
-static int hf_btavrcp_current_path                                         = -1;
-static int hf_btavrcp_response_time                                        = -1;
-static int hf_btavrcp_command_in_frame                                     = -1;
-static int hf_btavrcp_response_in_frame                                    = -1;
-static int hf_btavrcp_data                                                 = -1;
-
-static gint ett_btavrcp                                                    = -1;
-static gint ett_btavrcp_attribute_list                                     = -1;
-static gint ett_btavrcp_attribute_entry                                    = -1;
-static gint ett_btavrcp_attribute_entries                                  = -1;
-static gint ett_btavrcp_element                                            = -1;
-static gint ett_btavrcp_folder                                             = -1;
-static gint ett_btavrcp_player                                             = -1;
-static gint ett_btavrcp_features                                           = -1;
-static gint ett_btavrcp_features_not_used                                  = -1;
-static gint ett_btavrcp_path                                               = -1;
-
-static expert_field ei_btavrcp_no_response = EI_INIT;
-static expert_field ei_btavrcp_item_length_bad = EI_INIT;
-static expert_field ei_btavrcp_unexpected_data = EI_INIT;
+static int proto_btavrcp;
+
+static int hf_btavrcp_rfa;
+static int hf_btavrcp_ctype;
+static int hf_btavrcp_subunit_type;
+static int hf_btavrcp_subunit_id;
+static int hf_btavrcp_opcode;
+static int hf_btavrcp_company_id;
+static int hf_btavrcp_length;
+static int hf_btavrcp_pdu_id;
+static int hf_btavrcp_bt_pdu_id;
+static int hf_btavrcp_bt_continuing_pdu_id;
+static int hf_btavrcp_browsing_pdu_id;
+static int hf_btavrcp_reserved;
+static int hf_btavrcp_packet_type;
+static int hf_btavrcp_passthrough_state;
+static int hf_btavrcp_passthrough_operation;
+static int hf_btavrcp_passthrough_data_length;
+static int hf_btavrcp_passthrough_company_id;
+static int hf_btavrcp_passthrough_vendor_unique_id;
+static int hf_btavrcp_unit_unknown;
+static int hf_btavrcp_unit_type;
+static int hf_btavrcp_unit_id;
+static int hf_btavrcp_subunit_page;
+static int hf_btavrcp_subunit_extension_code;
+static int hf_btavrcp_item;
+static int hf_btavrcp_folder;
+static int hf_btavrcp_player_id;
+static int hf_btavrcp_status;
+static int hf_btavrcp_uid_counter;
+static int hf_btavrcp_number_of_items;
+static int hf_btavrcp_number_of_items16;
+static int hf_btavrcp_character_set;
+static int hf_btavrcp_folder_depth;
+static int hf_btavrcp_folder_name_length;
+static int hf_btavrcp_folder_name;
+static int hf_btavrcp_search;
+static int hf_btavrcp_search_length;
+static int hf_btavrcp_number_of_attributes;
+static int hf_btavrcp_uid;
+static int hf_btavrcp_scope;
+static int hf_btavrcp_start_item;
+static int hf_btavrcp_end_item;
+static int hf_btavrcp_direction;
+static int hf_btavrcp_identifier;
+static int hf_btavrcp_song_length;
+static int hf_btavrcp_song_position;
+static int hf_btavrcp_play_status;
+static int hf_btavrcp_notification_interval;
+static int hf_btavrcp_event_id;
+static int hf_btavrcp_battery_status;
+static int hf_btavrcp_number_of_character_set;
+static int hf_btavrcp_absolute_volume_rfa;
+static int hf_btavrcp_absolute_volume;
+static int hf_btavrcp_capability;
+static int hf_btavrcp_capability_count;
+static int hf_btavrcp_item_type;
+static int hf_btavrcp_item_length;
+static int hf_btavrcp_system_status;
+static int hf_btavrcp_number_of_settings;
+static int hf_btavrcp_settings_attribute;
+static int hf_btavrcp_settings_value;
+static int hf_btavrcp_displayable_name;
+static int hf_btavrcp_displayable_name_length;
+static int hf_btavrcp_media_type;
+static int hf_btavrcp_folder_type;
+static int hf_btavrcp_folder_playable;
+static int hf_btavrcp_major_player_type;
+static int hf_btavrcp_player_subtype;
+static int hf_btavrcp_player_item;
+static int hf_btavrcp_attribute;
+static int hf_btavrcp_attribute_count;
+static int hf_btavrcp_attribute_value;
+static int hf_btavrcp_attribute_value_length;
+static int hf_btavrcp_attribute_item;
+static int hf_btavrcp_attribute_list;
+static int hf_btavrcp_attribute_entries;
+static int hf_btavrcp_attribute_name_length;
+static int hf_btavrcp_attribute_name;
+static int hf_btavrcp_setting_value_length;
+static int hf_btavrcp_setting_value;
+static int hf_btavrcp_features;
+static int hf_btavrcp_not_used_features;
+static int hf_btavrcp_feature_reserved_0;
+static int hf_btavrcp_feature_reserved_1;
+static int hf_btavrcp_feature_reserved_2;
+static int hf_btavrcp_feature_reserved_3;
+static int hf_btavrcp_feature_reserved_4;
+static int hf_btavrcp_feature_reserved_5;
+static int hf_btavrcp_feature_reserved_6;
+static int hf_btavrcp_feature_reserved_7;
+static int hf_btavrcp_feature_passthrough_select;
+static int hf_btavrcp_feature_passthrough_up;
+static int hf_btavrcp_feature_passthrough_down;
+static int hf_btavrcp_feature_passthrough_left;
+static int hf_btavrcp_feature_passthrough_right;
+static int hf_btavrcp_feature_passthrough_right_up;
+static int hf_btavrcp_feature_passthrough_right_down;
+static int hf_btavrcp_feature_passthrough_left_up;
+static int hf_btavrcp_feature_passthrough_left_down;
+static int hf_btavrcp_feature_passthrough_root_menu;
+static int hf_btavrcp_feature_passthrough_setup_menu;
+static int hf_btavrcp_feature_passthrough_contents_menu;
+static int hf_btavrcp_feature_passthrough_favorite_menu;
+static int hf_btavrcp_feature_passthrough_exit;
+static int hf_btavrcp_feature_passthrough_0;
+static int hf_btavrcp_feature_passthrough_1;
+static int hf_btavrcp_feature_passthrough_2;
+static int hf_btavrcp_feature_passthrough_3;
+static int hf_btavrcp_feature_passthrough_4;
+static int hf_btavrcp_feature_passthrough_5;
+static int hf_btavrcp_feature_passthrough_6;
+static int hf_btavrcp_feature_passthrough_7;
+static int hf_btavrcp_feature_passthrough_8;
+static int hf_btavrcp_feature_passthrough_9;
+static int hf_btavrcp_feature_passthrough_dot;
+static int hf_btavrcp_feature_passthrough_enter;
+static int hf_btavrcp_feature_passthrough_clear;
+static int hf_btavrcp_feature_passthrough_channel_up;
+static int hf_btavrcp_feature_passthrough_channel_down;
+static int hf_btavrcp_feature_passthrough_previous_channel;
+static int hf_btavrcp_feature_passthrough_sound_select;
+static int hf_btavrcp_feature_passthrough_input_select;
+static int hf_btavrcp_feature_passthrough_display_information;
+static int hf_btavrcp_feature_passthrough_help;
+static int hf_btavrcp_feature_passthrough_page_up;
+static int hf_btavrcp_feature_passthrough_page_down;
+static int hf_btavrcp_feature_passthrough_power;
+static int hf_btavrcp_feature_passthrough_volume_up;
+static int hf_btavrcp_feature_passthrough_volume_down;
+static int hf_btavrcp_feature_passthrough_mute;
+static int hf_btavrcp_feature_passthrough_play;
+static int hf_btavrcp_feature_passthrough_stop;
+static int hf_btavrcp_feature_passthrough_pause;
+static int hf_btavrcp_feature_passthrough_record;
+static int hf_btavrcp_feature_passthrough_rewind;
+static int hf_btavrcp_feature_passthrough_fast_forward;
+static int hf_btavrcp_feature_passthrough_eject;
+static int hf_btavrcp_feature_passthrough_forward;
+static int hf_btavrcp_feature_passthrough_backward;
+static int hf_btavrcp_feature_passthrough_angle;
+static int hf_btavrcp_feature_passthrough_subpicture;
+static int hf_btavrcp_feature_passthrough_f1;
+static int hf_btavrcp_feature_passthrough_f2;
+static int hf_btavrcp_feature_passthrough_f3;
+static int hf_btavrcp_feature_passthrough_f4;
+static int hf_btavrcp_feature_passthrough_f5;
+static int hf_btavrcp_feature_vendor_unique;
+static int hf_btavrcp_feature_basic_group_navigation;
+static int hf_btavrcp_feature_advanced_control_player;
+static int hf_btavrcp_feature_browsing;
+static int hf_btavrcp_feature_searching;
+static int hf_btavrcp_feature_addtonowplayer;
+static int hf_btavrcp_feature_uid_unique;
+static int hf_btavrcp_feature_only_browsable_when_addressed;
+static int hf_btavrcp_feature_only_searchable_when_addressed;
+static int hf_btavrcp_feature_nowplaying;
+static int hf_btavrcp_feature_uid_persistency;
+static int hf_btavrcp_feature_number_of_items;
+static int hf_btavrcp_feature_cover_art;
+static int hf_btavrcp_reassembled;
+static int hf_btavrcp_current_path;
+static int hf_btavrcp_response_time;
+static int hf_btavrcp_command_in_frame;
+static int hf_btavrcp_response_in_frame;
+static int hf_btavrcp_data;
+
+static gint ett_btavrcp;
+static gint ett_btavrcp_attribute_list;
+static gint ett_btavrcp_attribute_entry;
+static gint ett_btavrcp_attribute_entries;
+static gint ett_btavrcp_element;
+static gint ett_btavrcp_folder;
+static gint ett_btavrcp_player;
+static gint ett_btavrcp_features;
+static gint ett_btavrcp_features_not_used;
+static gint ett_btavrcp_path;
+
+static expert_field ei_btavrcp_no_response;
+static expert_field ei_btavrcp_item_length_bad;
+static expert_field ei_btavrcp_unexpected_data;
 
 static dissector_handle_t btavrcp_handle;
 
diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c
index 0ce39f97da..a906422650 100644
--- a/epan/dissectors/packet-btbnep.c
+++ b/epan/dissectors/packet-btbnep.c
@@ -28,39 +28,39 @@
 #define BNEP_TYPE_COMPRESSED_ETHERNET_DESTINATION_ONLY                      0x04
 #define RESERVED_802                                                        0x7F
 
-static int proto_btbnep                                                    = -1;
-static int hf_btbnep_bnep_type                                             = -1;
-static int hf_btbnep_extension_flag                                        = -1;
-static int hf_btbnep_extension_type                                        = -1;
-static int hf_btbnep_extension_length                                      = -1;
-static int hf_btbnep_dst                                                   = -1;
-static int hf_btbnep_src                                                   = -1;
-static int hf_btbnep_len                                                   = -1;
-static int hf_btbnep_invalid_lentype                                       = -1;
-static int hf_btbnep_type                                                  = -1;
-static int hf_btbnep_addr                                                  = -1;
-static int hf_btbnep_lg                                                    = -1;
-static int hf_btbnep_ig                                                    = -1;
-static int hf_btbnep_control_type                                          = -1;
-static int hf_btbnep_unknown_control_type                                  = -1;
-static int hf_btbnep_uuid_size                                             = -1;
-static int hf_btbnep_destination_service_uuid                              = -1;
-static int hf_btbnep_source_service_uuid                                   = -1;
-static int hf_btbnep_setup_connection_response_message                     = -1;
-static int hf_btbnep_filter_net_type_response_message                      = -1;
-static int hf_btbnep_filter_multi_addr_response_message                    = -1;
-static int hf_btbnep_list_length                                           = -1;
-static int hf_btbnep_network_type_start                                    = -1;
-static int hf_btbnep_network_type_end                                      = -1;
-static int hf_btbnep_multicast_address_start                               = -1;
-static int hf_btbnep_multicast_address_end                                 = -1;
-
-static gint ett_btbnep                                                     = -1;
-static gint ett_addr                                                       = -1;
-
-static expert_field ei_btbnep_src_not_group_address = EI_INIT;
-static expert_field ei_btbnep_invalid_lentype       = EI_INIT;
-static expert_field ei_btbnep_len_past_end          = EI_INIT;
+static int proto_btbnep;
+static int hf_btbnep_bnep_type;
+static int hf_btbnep_extension_flag;
+static int hf_btbnep_extension_type;
+static int hf_btbnep_extension_length;
+static int hf_btbnep_dst;
+static int hf_btbnep_src;
+static int hf_btbnep_len;
+static int hf_btbnep_invalid_lentype;
+static int hf_btbnep_type;
+static int hf_btbnep_addr;
+static int hf_btbnep_lg;
+static int hf_btbnep_ig;
+static int hf_btbnep_control_type;
+static int hf_btbnep_unknown_control_type;
+static int hf_btbnep_uuid_size;
+static int hf_btbnep_destination_service_uuid;
+static int hf_btbnep_source_service_uuid;
+static int hf_btbnep_setup_connection_response_message;
+static int hf_btbnep_filter_net_type_response_message;
+static int hf_btbnep_filter_multi_addr_response_message;
+static int hf_btbnep_list_length;
+static int hf_btbnep_network_type_start;
+static int hf_btbnep_network_type_end;
+static int hf_btbnep_multicast_address_start;
+static int hf_btbnep_multicast_address_end;
+
+static gint ett_btbnep;
+static gint ett_addr;
+
+static expert_field ei_btbnep_src_not_group_address;
+static expert_field ei_btbnep_invalid_lentype;
+static expert_field ei_btbnep_len_past_end;
 
 static dissector_handle_t btbnep_handle;
 
diff --git a/epan/dissectors/packet-btbredr_rf.c b/epan/dissectors/packet-btbredr_rf.c
index a19a34571e..f297efbfe4 100644
--- a/epan/dissectors/packet-btbredr_rf.c
+++ b/epan/dissectors/packet-btbredr_rf.c
@@ -30,113 +30,113 @@
  * - De-Whiten if the capture hardware did not already do it and we have the UAP
  */
 
-static int proto_btbredr_rf = -1;
-static int proto_btbredr_fhs = -1;
-
-static int hf_rf_channel = -1;
-static int hf_uncertain_rf_channel = -1;
-static int hf_signal_power = -1;
-static int hf_invalid_signal_power = -1;
-static int hf_noise_power = -1;
-static int hf_invalid_noise_power = -1;
-static int hf_access_address_offenses = -1;
-static int hf_payload_transport_rate = -1;
-static int hf_payload_transport_rate_payload = -1;
-static int hf_payload_transport_rate_transport = -1;
-static int hf_payload_transport_rate_ignored = -1;
-static int hf_corrected_header_bits = -1;
-static int hf_corrected_payload_bits = -1;
-static int hf_lower_address_part = -1;
-static int hf_reference_lower_address_part = -1;
-static int hf_invalid_reference_lower_address_part = -1;
-static int hf_reference_upper_addres_part = -1;
-static int hf_invalid_reference_upper_addres_part = -1;
-static int hf_whitened_packet_header = -1;
-static int hf_invalid_packet_header = -1;
-static int hf_packet_header = -1;
-static int hf_packet_header_reserved = -1;
-static int hf_packet_header_lt_addr = -1;
-static int hf_packet_header_type = -1;
-static int hf_packet_header_type_any = -1;
-static int hf_packet_header_type_sco_br = -1;
-static int hf_packet_header_type_esco_br = -1;
-static int hf_packet_header_type_esco_edr = -1;
-static int hf_packet_header_type_acl_br = -1;
-static int hf_packet_header_type_acl_edr = -1;
-static int hf_packet_header_type_csb_br = -1;
-static int hf_packet_header_type_csb_edr = -1;
-static int hf_packet_header_flow_control = -1;
-static int hf_packet_header_acknowledge_indication = -1;
-static int hf_packet_header_sequence_number = -1;
-static int hf_packet_header_header_error_check = -1;
-static int hf_packet_header_broken_lt_addr = -1;
-static int hf_packet_header_broken_type = -1;
-static int hf_packet_header_broken_type_any = -1;
-static int hf_packet_header_broken_type_sco_br = -1;
-static int hf_packet_header_broken_type_esco_br = -1;
-static int hf_packet_header_broken_type_esco_edr = -1;
-static int hf_packet_header_broken_type_acl_br = -1;
-static int hf_packet_header_broken_type_acl_edr = -1;
-static int hf_packet_header_broken_type_csb_br = -1;
-static int hf_packet_header_broken_type_csb_edr = -1;
-static int hf_packet_header_broken_flow_control = -1;
-static int hf_packet_header_broken_acknowledge_indication = -1;
-static int hf_packet_header_broken_sequence_number = -1;
-static int hf_packet_header_broken_header_error_check = -1;
-static int hf_flags = -1;
-static int hf_flags_reserved_15_14 = -1;
-static int hf_flags_mic_pass = -1;
-static int hf_flags_mic_checked = -1;
-static int hf_flags_crc_pass = -1;
-static int hf_flags_crc_checked = -1;
-static int hf_flags_hec_pass = -1;
-static int hf_flags_hec_checked = -1;
-static int hf_flags_reference_upper_addres_part_valid = -1;
-static int hf_flags_rf_channel_aliasing = -1;
-static int hf_flags_br_edr_data_present = -1;
-static int hf_flags_reference_lower_address_part_valid = -1;
-static int hf_flags_bredr_payload_decrypted = -1;
-static int hf_flags_noise_power_valid = -1;
-static int hf_flags_signal_power_valid = -1;
-static int hf_flags_packet_header_and_br_edr_payload_dewhitened = -1;
-static int hf_whitened_data = -1;
-static int hf_encrypted_data = -1;
-static int hf_data = -1;
-static int hf_isochronous_data = -1;
-static int hf_asynchronous_data = -1;
-static int hf_l2cap_fragment = -1;
-static int hf_crc = -1;
-static int hf_payload_header2 = -1;
-static int hf_payload_header2_llid = -1;
-static int hf_payload_header2_flow = -1;
-static int hf_payload_header2_length = -1;
-static int hf_payload_header2_rfu = -1;
-static int hf_payload_header1 = -1;
-static int hf_payload_header1_llid = -1;
-static int hf_payload_header1_flow = -1;
-static int hf_payload_header1_length = -1;
-static int hf_l2cap_msg_fragments = -1;
-static int hf_l2cap_msg_fragment = -1;
-static int hf_l2cap_msg_fragment_overlap = -1;
-static int hf_l2cap_msg_fragment_overlap_conflicts = -1;
-static int hf_l2cap_msg_fragment_multiple_tails = -1;
-static int hf_l2cap_msg_fragment_too_long_fragment = -1;
-static int hf_l2cap_msg_fragment_error = -1;
-static int hf_l2cap_msg_fragment_count = -1;
-static int hf_l2cap_msg_reassembled_in = -1;
-static int hf_l2cap_msg_reassembled_length = -1;
-static int hf_fhs_parity = -1;
-static int hf_fhs_lap = -1;
-static int hf_fhs_eir = -1;
-static int hf_fhs_reserved = -1;
-static int hf_fhs_sr = -1;
-static int hf_fhs_sp = -1;
-static int hf_fhs_uap = -1;
-static int hf_fhs_nap = -1;
-static int hf_fhs_class = -1;
-static int hf_fhs_ltaddr = -1;
-static int hf_fhs_clk = -1;
-static int hf_fhs_pagescanmode = -1;
+static int proto_btbredr_rf;
+static int proto_btbredr_fhs;
+
+static int hf_rf_channel;
+static int hf_uncertain_rf_channel;
+static int hf_signal_power;
+static int hf_invalid_signal_power;
+static int hf_noise_power;
+static int hf_invalid_noise_power;
+static int hf_access_address_offenses;
+static int hf_payload_transport_rate;
+static int hf_payload_transport_rate_payload;
+static int hf_payload_transport_rate_transport;
+static int hf_payload_transport_rate_ignored;
+static int hf_corrected_header_bits;
+static int hf_corrected_payload_bits;
+static int hf_lower_address_part;
+static int hf_reference_lower_address_part;
+static int hf_invalid_reference_lower_address_part;
+static int hf_reference_upper_addres_part;
+static int hf_invalid_reference_upper_addres_part;
+static int hf_whitened_packet_header;
+static int hf_invalid_packet_header;
+static int hf_packet_header;
+static int hf_packet_header_reserved;
+static int hf_packet_header_lt_addr;
+static int hf_packet_header_type;
+static int hf_packet_header_type_any;
+static int hf_packet_header_type_sco_br;
+static int hf_packet_header_type_esco_br;
+static int hf_packet_header_type_esco_edr;
+static int hf_packet_header_type_acl_br;
+static int hf_packet_header_type_acl_edr;
+static int hf_packet_header_type_csb_br;
+static int hf_packet_header_type_csb_edr;
+static int hf_packet_header_flow_control;
+static int hf_packet_header_acknowledge_indication;
+static int hf_packet_header_sequence_number;
+static int hf_packet_header_header_error_check;
+static int hf_packet_header_broken_lt_addr;
+static int hf_packet_header_broken_type;
+static int hf_packet_header_broken_type_any;
+static int hf_packet_header_broken_type_sco_br;
+static int hf_packet_header_broken_type_esco_br;
+static int hf_packet_header_broken_type_esco_edr;
+static int hf_packet_header_broken_type_acl_br;
+static int hf_packet_header_broken_type_acl_edr;
+static int hf_packet_header_broken_type_csb_br;
+static int hf_packet_header_broken_type_csb_edr;
+static int hf_packet_header_broken_flow_control;
+static int hf_packet_header_broken_acknowledge_indication;
+static int hf_packet_header_broken_sequence_number;
+static int hf_packet_header_broken_header_error_check;
+static int hf_flags;
+static int hf_flags_reserved_15_14;
+static int hf_flags_mic_pass;
+static int hf_flags_mic_checked;
+static int hf_flags_crc_pass;
+static int hf_flags_crc_checked;
+static int hf_flags_hec_pass;
+static int hf_flags_hec_checked;
+static int hf_flags_reference_upper_addres_part_valid;
+static int hf_flags_rf_channel_aliasing;
+static int hf_flags_br_edr_data_present;
+static int hf_flags_reference_lower_address_part_valid;
+static int hf_flags_bredr_payload_decrypted;
+static int hf_flags_noise_power_valid;
+static int hf_flags_signal_power_valid;
+static int hf_flags_packet_header_and_br_edr_payload_dewhitened;
+static int hf_whitened_data;
+static int hf_encrypted_data;
+static int hf_data;
+static int hf_isochronous_data;
+static int hf_asynchronous_data;
+static int hf_l2cap_fragment;
+static int hf_crc;
+static int hf_payload_header2;
+static int hf_payload_header2_llid;
+static int hf_payload_header2_flow;
+static int hf_payload_header2_length;
+static int hf_payload_header2_rfu;
+static int hf_payload_header1;
+static int hf_payload_header1_llid;
+static int hf_payload_header1_flow;
+static int hf_payload_header1_length;
+static int hf_l2cap_msg_fragments;
+static int hf_l2cap_msg_fragment;
+static int hf_l2cap_msg_fragment_overlap;
+static int hf_l2cap_msg_fragment_overlap_conflicts;
+static int hf_l2cap_msg_fragment_multiple_tails;
+static int hf_l2cap_msg_fragment_too_long_fragment;
+static int hf_l2cap_msg_fragment_error;
+static int hf_l2cap_msg_fragment_count;
+static int hf_l2cap_msg_reassembled_in;
+static int hf_l2cap_msg_reassembled_length;
+static int hf_fhs_parity;
+static int hf_fhs_lap;
+static int hf_fhs_eir;
+static int hf_fhs_reserved;
+static int hf_fhs_sr;
+static int hf_fhs_sp;
+static int hf_fhs_uap;
+static int hf_fhs_nap;
+static int hf_fhs_class;
+static int hf_fhs_ltaddr;
+static int hf_fhs_clk;
+static int hf_fhs_pagescanmode;
 
 #define FLAGS_MIC_PASS                                      0x2000
 #define FLAGS_MIC_CHECKED                                   0x1000
@@ -159,25 +159,25 @@ static int * const hfx_payload_transport_rate[] = {
     NULL
 };
 
-static expert_field ei_unexpected_data = EI_INIT;
-static expert_field ei_reserved_not_zero = EI_INIT;
-static expert_field ei_incorrect_packet_header_or_hec = EI_INIT;
-static expert_field ei_packet_header_with_hec_not_checked = EI_INIT;
-static expert_field ei_broken_packet_header_format = EI_INIT;
-static expert_field ei_incorrect_crc = EI_INIT;
-static expert_field ei_missing_fragment_start = EI_INIT;
-static expert_field ei_esco_incorrect_ltaddr = EI_INIT;
-static expert_field ei_esco_incorrect_length = EI_INIT;
-
-static gint ett_btbredr_rf = -1;
-static gint ett_flags = -1;
-static gint ett_payload_transport_rate = -1;
-static gint ett_packet_header = -1;
-static gint ett_bluetooth_header = -1;
-static gint ett_payload_header = -1;
-static gint ett_l2cap_msg_fragment = -1;
-static gint ett_l2cap_msg_fragments = -1;
-static gint ett_btbredr_fhs = -1;
+static expert_field ei_unexpected_data;
+static expert_field ei_reserved_not_zero;
+static expert_field ei_incorrect_packet_header_or_hec;
+static expert_field ei_packet_header_with_hec_not_checked;
+static expert_field ei_broken_packet_header_format;
+static expert_field ei_incorrect_crc;
+static expert_field ei_missing_fragment_start;
+static expert_field ei_esco_incorrect_ltaddr;
+static expert_field ei_esco_incorrect_length;
+
+static gint ett_btbredr_rf;
+static gint ett_flags;
+static gint ett_payload_transport_rate;
+static gint ett_packet_header;
+static gint ett_bluetooth_header;
+static gint ett_payload_header;
+static gint ett_l2cap_msg_fragment;
+static gint ett_l2cap_msg_fragments;
+static gint ett_btbredr_fhs;
 
 static dissector_table_t  packet_type_sco_br_table;
 static dissector_table_t  packet_type_esco_br_table;
diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c
index 004245fc95..8b60e52b16 100644
--- a/epan/dissectors/packet-bthci_acl.c
+++ b/epan/dissectors/packet-bthci_acl.c
@@ -25,31 +25,31 @@
 #include "packet-bthci_acl.h"
 
 /* Initialize the protocol and registered fields */
-static int proto_bthci_acl = -1;
-static int hf_bthci_acl_chandle = -1;
-static int hf_bthci_acl_pb_flag = -1;
-static int hf_bthci_acl_bc_flag = -1;
-static int hf_bthci_acl_length = -1;
-static int hf_bthci_acl_data = -1;
-static int hf_bthci_acl_continuation_to = -1;
-static int hf_bthci_acl_reassembled_in = -1;
-static int hf_bthci_acl_connect_in = -1;
-static int hf_bthci_acl_disconnect_in = -1;
-static int hf_bthci_acl_src_bd_addr = -1;
-static int hf_bthci_acl_src_name = -1;
-static int hf_bthci_acl_src_role = -1;
-static int hf_bthci_acl_dst_bd_addr = -1;
-static int hf_bthci_acl_dst_name = -1;
-static int hf_bthci_acl_dst_role = -1;
-static int hf_bthci_acl_role_last_change_in_frame = -1;
-static int hf_bthci_acl_mode = -1;
-static int hf_bthci_acl_mode_last_change_in_frame = -1;
+static int proto_bthci_acl;
+static int hf_bthci_acl_chandle;
+static int hf_bthci_acl_pb_flag;
+static int hf_bthci_acl_bc_flag;
+static int hf_bthci_acl_length;
+static int hf_bthci_acl_data;
+static int hf_bthci_acl_continuation_to;
+static int hf_bthci_acl_reassembled_in;
+static int hf_bthci_acl_connect_in;
+static int hf_bthci_acl_disconnect_in;
+static int hf_bthci_acl_src_bd_addr;
+static int hf_bthci_acl_src_name;
+static int hf_bthci_acl_src_role;
+static int hf_bthci_acl_dst_bd_addr;
+static int hf_bthci_acl_dst_name;
+static int hf_bthci_acl_dst_role;
+static int hf_bthci_acl_role_last_change_in_frame;
+static int hf_bthci_acl_mode;
+static int hf_bthci_acl_mode_last_change_in_frame;
 
 /* Initialize the subtree pointers */
-static gint ett_bthci_acl = -1;
+static gint ett_bthci_acl;
 
-static expert_field ei_invalid_session = EI_INIT;
-static expert_field ei_length_bad = EI_INIT;
+static expert_field ei_invalid_session;
+static expert_field ei_length_bad;
 
 static dissector_handle_t bthci_acl_handle;
 static dissector_handle_t btl2cap_handle = NULL;
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c
index 010e47b27e..43b6bb5a9d 100644
--- a/epan/dissectors/packet-bthci_cmd.c
+++ b/epan/dissectors/packet-bthci_cmd.c
@@ -42,613 +42,613 @@
 #include "packet-btsdp.h"
 #include "packet-btatt.h"
 
-static int proto_bthci_cmd = -1;
-
-static int hf_bthci_cmd_opcode = -1;
-static int hf_bthci_cmd_ogf = -1;
-static int hf_bthci_cmd_ocf = -1;
-static int hf_bthci_cmd_ocf_link_control = -1;
-static int hf_bthci_cmd_ocf_link_policy = -1;
-static int hf_bthci_cmd_ocf_host_controller_and_baseband = -1;
-static int hf_bthci_cmd_ocf_informational = -1;
-static int hf_bthci_cmd_ocf_status = -1;
-static int hf_bthci_cmd_ocf_testing = -1;
-static int hf_bthci_cmd_ocf_logo_testing = -1;
-static int hf_bthci_cmd_ocf_low_energy = -1;
-static int hf_bthci_cmd_param_length = -1;
-static int hf_bthci_cmd_lap = -1;
-static int hf_bthci_cmd_inq_length = -1;
-static int hf_bthci_cmd_num_responses = -1;
-static int hf_bthci_cmd_encrypt_mode = -1;
-static int hf_bthci_cmd_bd_addr = -1;
-static int hf_bthci_cmd_packet_type = -1;
-static int hf_bthci_cmd_packet_type_dh5 = -1;
-static int hf_bthci_cmd_packet_type_dm5 = -1;
-static int hf_bthci_cmd_packet_type_3dh5 = -1;
-static int hf_bthci_cmd_packet_type_2dh5 = -1;
-static int hf_bthci_cmd_packet_type_dh3 = -1;
-static int hf_bthci_cmd_packet_type_dm3 = -1;
-static int hf_bthci_cmd_packet_type_3dh3 = -1;
-static int hf_bthci_cmd_packet_type_2dh3 = -1;
-static int hf_bthci_cmd_packet_type_reserved_5_7 = -1;
-static int hf_bthci_cmd_packet_type_dh1 = -1;
-static int hf_bthci_cmd_packet_type_dm1 = -1;
-static int hf_bthci_cmd_packet_type_3dh1 = -1;
-static int hf_bthci_cmd_packet_type_2dh1 = -1;
-static int hf_bthci_cmd_packet_type_reserved_0 = -1;
-static int hf_bthci_cmd_clock_offset = -1;
-static int hf_bthci_cmd_clock_offset_valid = -1;
-static int hf_bthci_cmd_allow_role_switch = -1;
-static int hf_bthci_cmd_page_scan_mode = -1;
-static int hf_bthci_cmd_page_scan_repetition_mode = -1;
-static int hf_bthci_cmd_page_scan_period_mode = -1;
-static int hf_bthci_cmd_max_period_length = -1;
-static int hf_bthci_cmd_min_period_length = -1;
-static int hf_bthci_cmd_connection_handle = -1;
-static int hf_bthci_cmd_reason = -1;
-static int hf_bthci_cmd_num_link_keys = -1;
-static int hf_bthci_cmd_link_key = -1;
-static int hf_bthci_cmd_packet_type_hv1 = -1;
-static int hf_bthci_cmd_packet_type_hv2 = -1;
-static int hf_bthci_cmd_packet_type_hv3 = -1;
-static int hf_bthci_cmd_role = -1;
-static int hf_bthci_cmd_acr_role = -1;
-static int hf_bthci_cmd_pin_code_length = -1;
-static int hf_bthci_cmd_pin_code = -1;
-static int hf_bthci_cmd_pin_type = -1;
-static int hf_bthci_cmd_encryption_enable = -1;
-static int hf_bthci_cmd_key_flag = -1;
-static int hf_bthci_cmd_max_interval_hold = -1;
-static int hf_bthci_cmd_min_interval_hold = -1;
-static int hf_bthci_cmd_max_interval_sniff = -1;
-static int hf_bthci_cmd_min_interval_sniff = -1;
-static int hf_bthci_cmd_sniff_attempt = -1;
-static int hf_bthci_cmd_timeout = -1;
-static int hf_bthci_cmd_max_interval_beacon = -1;
-static int hf_bthci_cmd_min_interval_beacon = -1;
-static int hf_bthci_cmd_flags = -1;
-static int hf_bthci_cmd_flow_direction = -1;
-static int hf_bthci_cmd_service_type = -1;
-static int hf_bthci_cmd_token_rate = -1;
-static int hf_bthci_cmd_token_bucket_size = -1;
-static int hf_bthci_cmd_peak_bandwidth = -1;
-static int hf_bthci_cmd_latency = -1;
-static int hf_bthci_cmd_delay_variation = -1;
-static int hf_bthci_cmd_link_policy_setting_switch = -1;
-static int hf_bthci_cmd_link_policy_setting_hold = -1;
-static int hf_bthci_cmd_link_policy_setting_sniff = -1;
-static int hf_bthci_cmd_link_policy_setting_park = -1;
-static int hf_bthci_cmd_filter_type = -1;
-static int hf_bthci_cmd_inquiry_result_filter_condition_type = -1;
-static int hf_bthci_cmd_connection_setup_filter_condition_type = -1;
-static int hf_bthci_cmd_cod_class_of_device_mask = -1;
-static int hf_bthci_cmd_cod_minor_device_class_mask= -1;
-static int hf_bthci_cmd_cod_format_type_mask = -1;
-static int hf_bthci_cmd_cod_major_service_class_information_mask = -1;
-static int hf_bthci_cmd_cod_major_service_class_telephony_mask = -1;
-static int hf_bthci_cmd_cod_major_service_class_audio_mask = -1;
-static int hf_bthci_cmd_cod_major_service_class_object_transfer_mask = -1;
-static int hf_bthci_cmd_cod_major_service_class_capturing_mask = -1;
-static int hf_bthci_cmd_cod_major_service_class_rendering_mask = -1;
-static int hf_bthci_cmd_cod_major_service_class_networking_mask = -1;
-static int hf_bthci_cmd_cod_major_service_class_positioning_mask = -1;
-static int hf_bthci_cmd_cod_major_service_class_reserved_mask = -1;
-static int hf_bthci_cmd_cod_major_service_class_le_audio_mask = -1;
-static int hf_bthci_cmd_cod_major_service_class_limited_discoverable_mode_mask = -1;
-static int hf_bthci_cmd_cod_major_device_class_mask = -1;
-static int hf_bthci_cmd_auto_acc_flag = -1;
-static int hf_bthci_cmd_read_all_flag = -1;
-static int hf_bthci_cmd_delete_all_flag = -1;
-static int hf_bthci_cmd_authentication_enable = -1;
-static int hf_bthci_cmd_input_unused = -1;
-static int hf_bthci_cmd_input_coding = -1;
-static int hf_bthci_cmd_input_data_format = -1;
-static int hf_bthci_cmd_input_sample_size = -1;
-static int hf_bthci_cmd_linear_pcm_bit_pos = -1;
-static int hf_bthci_cmd_air_coding_format = -1;
-static int hf_bthci_cmd_num_broadcast_retransmissions = -1;
-static int hf_bthci_cmd_hold_mode_act_page = -1;
-static int hf_bthci_cmd_hold_mode_act_inquiry = -1;
-static int hf_bthci_cmd_hold_mode_act_periodic = -1;
-static int hf_bthci_cmd_scan_enable = -1;
-static int hf_bthci_cmd_interval = -1;
-static int hf_bthci_cmd_window = -1;
-static int hf_bthci_cmd_device_name = -1;
-static int hf_bthci_cmd_num_curr_iac = -1;
-static int hf_bthci_cmd_iac_lap = -1;
-static int hf_bthci_cmd_evt_mask_00 = -1;
-static int hf_bthci_cmd_evt_mask_01 = -1;
-static int hf_bthci_cmd_evt_mask_02 = -1;
-static int hf_bthci_cmd_evt_mask_03 = -1;
-static int hf_bthci_cmd_evt_mask_04 = -1;
-static int hf_bthci_cmd_evt_mask_05 = -1;
-static int hf_bthci_cmd_evt_mask_06 = -1;
-static int hf_bthci_cmd_evt_mask_07 = -1;
-static int hf_bthci_cmd_evt_mask_10 = -1;
-static int hf_bthci_cmd_evt_mask_11 = -1;
-static int hf_bthci_cmd_evt_mask_12 = -1;
-static int hf_bthci_cmd_evt_mask_13 = -1;
-static int hf_bthci_cmd_evt_mask_14 = -1;
-static int hf_bthci_cmd_evt_mask_17 = -1;
-static int hf_bthci_cmd_evt_mask_20 = -1;
-static int hf_bthci_cmd_evt_mask_21 = -1;
-static int hf_bthci_cmd_evt_mask_23 = -1;
-static int hf_bthci_cmd_evt_mask_24 = -1;
-static int hf_bthci_cmd_evt_mask_25 = -1;
-static int hf_bthci_cmd_evt_mask_26 = -1;
-static int hf_bthci_cmd_evt_mask_27 = -1;
-static int hf_bthci_cmd_evt_mask_30 = -1;
-static int hf_bthci_cmd_evt_mask_31 = -1;
-static int hf_bthci_cmd_evt_mask_32 = -1;
-static int hf_bthci_cmd_evt_mask_33 = -1;
-static int hf_bthci_cmd_evt_mask_34 = -1;
-static int hf_bthci_cmd_evt_mask_35 = -1;
-static int hf_bthci_cmd_evt_mask_36 = -1;
-static int hf_bthci_cmd_evt_mask_37 = -1;
-static int hf_bthci_cmd_evt_mask_40 = -1;
-static int hf_bthci_cmd_evt_mask_41 = -1;
-static int hf_bthci_cmd_evt_mask_42 = -1;
-static int hf_bthci_cmd_evt_mask_53 = -1;
-static int hf_bthci_cmd_evt_mask_54 = -1;
-static int hf_bthci_cmd_evt_mask_55 = -1;
-static int hf_bthci_cmd_evt_mask_56 = -1;
-static int hf_bthci_cmd_evt_mask_57 = -1;
-static int hf_bthci_cmd_evt_mask_60 = -1;
-static int hf_bthci_cmd_evt_mask_61 = -1;
-static int hf_bthci_cmd_evt_mask_62 = -1;
-static int hf_bthci_cmd_evt_mask_63 = -1;
-static int hf_bthci_cmd_evt_mask_64 = -1;
-static int hf_bthci_cmd_evt_mask_65 = -1;
-static int hf_bthci_cmd_evt_mask_67 = -1;
-static int hf_bthci_cmd_evt_mask_70 = -1;
-static int hf_bthci_cmd_evt_mask_72 = -1;
-static int hf_bthci_cmd_evt_mask_73 = -1;
-static int hf_bthci_cmd_sco_flow_control = -1;
-static int hf_bthci_cmd_num_handles = -1;
-static int hf_bthci_cmd_num_compl_packets = -1;
-static int hf_bthci_cmd_flow_contr_enable = -1;
-static int hf_bthci_cmd_host_data_packet_length_acl = -1;
-static int hf_bthci_cmd_host_data_packet_length_sco = -1;
-static int hf_bthci_cmd_host_total_num_acl_data_packets = -1;
-static int hf_bthci_cmd_host_total_num_sco_data_packets = -1;
-static int hf_bthci_cmd_loopback_mode = -1;
-static int hf_bthci_cmd_page_number = -1;
-static int hf_bthci_cmd_transmit_bandwidth = -1;
-static int hf_bthci_cmd_receive_bandwidth = -1;
-static int hf_bthci_cmd_max_latency_ms = -1;
-static int hf_bthci_cmd_max_latency = -1;
-static int hf_bthci_cmd_retransmission_effort = -1;
-static int hf_bthci_cmd_scan_type = -1;
-static int hf_bthci_cmd_inq_mode = -1;
-static int hf_bthci_cmd_fec_required = -1;
-static int hf_bthci_cmd_err_data_reporting = -1;
-static int hf_bthci_cmd_tx_power = -1;
-static int hf_bthci_cmd_sco_packet_type = -1;
-static int hf_bthci_cmd_sco_packet_type_hv1 = -1;
-static int hf_bthci_cmd_sco_packet_type_hv2 = -1;
-static int hf_bthci_cmd_sco_packet_type_hv3 = -1;
-static int hf_bthci_cmd_sco_packet_type_ev3 = -1;
-static int hf_bthci_cmd_sco_packet_type_ev4 = -1;
-static int hf_bthci_cmd_sco_packet_type_ev5 = -1;
-static int hf_bthci_cmd_sco_packet_type_2ev3 = -1;
-static int hf_bthci_cmd_sco_packet_type_3ev3 = -1;
-static int hf_bthci_cmd_sco_packet_type_2ev5 = -1;
-static int hf_bthci_cmd_sco_packet_type_3ev5 = -1;
-static int hf_bthci_cmd_sco_packet_type_reserved = -1;
-static int hf_bthci_cmd_min_remote_timeout = -1;
-static int hf_bthci_cmd_min_local_timeout = -1;
-static int hf_bthci_cmd_flush_packet_type = -1;
-static int hf_bthci_cmd_afh_ch_assessment_mode = -1;
-static int hf_bthci_cmd_afh_ch_classification = -1;
-static int hf_bthci_cmd_which_clock = -1;
-static int hf_bthci_cmd_io_capability = -1;
-static int hf_bthci_cmd_oob_data_present = -1;
-static int hf_bthci_cmd_auth_requirements = -1;
-static int hf_bthci_cmd_passkey = -1;
-static int hf_bthci_cmd_randomizer_r = -1;
-static int hf_bthci_cmd_hash_c = -1;
-static int hf_bthci_cmd_simple_pairing_mode = -1;
-static int hf_bthci_cmd_simple_pairing_debug_mode = -1;
-static int hf_bthci_cmd_notification_type = -1;
-static int hf_bthci_cmd_physical_link_handle = -1;
-static int hf_bthci_cmd_dedicated_amp_key_length = -1;
-static int hf_bthci_cmd_dedicated_amp_key_type = -1;
-static int hf_bthci_cmd_dedicated_amp_key = -1;
-static int hf_bthci_cmd_flow_spec = -1;
-static int hf_bthci_cmd_flow_spec_identifier = -1;
-static int hf_bthci_cmd_flow_spec_service_type = -1;
-static int hf_bthci_cmd_flow_spec_sdu_size = -1;
-static int hf_bthci_cmd_flow_spec_sdu_arrival_time = -1;
-static int hf_bthci_cmd_flow_spec_access_latency = -1;
-static int hf_bthci_cmd_flush_to_us = -1;
-static int hf_bthci_cmd_logical_link_handle = -1;
-static int hf_bthci_cmd_evt_mask2_00 = -1;
-static int hf_bthci_cmd_evt_mask2_01 = -1;
-static int hf_bthci_cmd_evt_mask2_02 = -1;
-static int hf_bthci_cmd_evt_mask2_03 = -1;
-static int hf_bthci_cmd_evt_mask2_04 = -1;
-static int hf_bthci_cmd_evt_mask2_05 = -1;
-static int hf_bthci_cmd_evt_mask2_06 = -1;
-static int hf_bthci_cmd_evt_mask2_07 = -1;
-static int hf_bthci_cmd_evt_mask2_10 = -1;
-static int hf_bthci_cmd_evt_mask2_11 = -1;
-static int hf_bthci_cmd_evt_mask2_12 = -1;
-static int hf_bthci_cmd_evt_mask2_13 = -1;
-static int hf_bthci_cmd_evt_mask2_14 = -1;
-static int hf_bthci_cmd_evt_mask2_15 = -1;
-static int hf_bthci_cmd_location_domain_aware = -1;
-static int hf_bthci_cmd_location_domain = -1;
-static int hf_bthci_cmd_location_domain_options = -1;
-static int hf_bthci_cmd_location_options = -1;
-static int hf_bthci_cmd_flow_control_mode = -1;
-static int hf_bthci_cmd_tx_power_level_type = -1;
-static int hf_bthci_cmd_short_range_mode = -1;
-static int hf_bthci_cmd_le_supported_host = -1;
-static int hf_bthci_cmd_le_simultaneous_host = -1;
-static int hf_bthci_cmd_enable_amp_recv_reports = -1;
-static int hf_bthci_cmd_amp_recv_report_interval = -1;
-static int hf_bthci_cmd_length_so_far = -1;
-static int hf_bthci_cmd_amp_assoc_length = -1;
-static int hf_bthci_cmd_amp_remaining_assoc_length = -1;
-static int hf_bthci_cmd_amp_assoc_fragment = -1;
-static int hf_bthci_cmd_le_event_mask = -1;
-static int hf_bthci_cmd_le_event_mask_le_reserved = -1;
-static int hf_bthci_cmd_le_event_mask_le_enhanced_connection_complete_v2 = -1;
-static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_response_report = -1;
-static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_subevent_data_request = -1;
-static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_sync_transfer_received_v2 = -1;
-static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_report_v2 = -1;
-static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_sync_established_v2 = -1;
-static int hf_bthci_cmd_le_event_mask_le_subrate_changed = -1;
-static int hf_bthci_cmd_le_event_mask_le_biginfo_advertising_report = -1;
-static int hf_bthci_cmd_le_event_mask_le_transmit_power_reporting = -1;
-static int hf_bthci_cmd_le_event_mask_le_path_loss_threshold = -1;
-static int hf_bthci_cmd_le_event_mask_le_request_peer_sca_complete = -1;
-static int hf_bthci_cmd_le_event_mask_le_big_sync_lost = -1;
-static int hf_bthci_cmd_le_event_mask_le_big_sync_established = -1;
-static int hf_bthci_cmd_le_event_mask_le_terminate_big_complete = -1;
-static int hf_bthci_cmd_le_event_mask_le_create_big_complete = -1;
-static int hf_bthci_cmd_le_event_mask_le_cis_request = -1;
-static int hf_bthci_cmd_le_event_mask_le_cis_established = -1;
-static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_sync_transfer_received_v1 = -1;
-static int hf_bthci_cmd_le_event_mask_le_cte_request_failed = -1;
-static int hf_bthci_cmd_le_event_mask_le_connection_iq_report = -1;
-static int hf_bthci_cmd_le_event_mask_le_connectionless_iq_report = -1;
-static int hf_bthci_cmd_le_event_mask_le_channel_selection_algorithm = -1;
-static int hf_bthci_cmd_le_event_mask_le_scan_request_received = -1;
-static int hf_bthci_cmd_le_event_mask_le_extended_advertising_set_terminated = -1;
-static int hf_bthci_cmd_le_event_mask_le_extended_scan_timeout = -1;
-static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_sync_lost = -1;
-static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_report_v1 = -1;
-static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_sync_established_v1 = -1;
-static int hf_bthci_cmd_le_event_mask_le_extended_advertising_report = -1;
-static int hf_bthci_cmd_le_event_mask_le_phy_update_complete = -1;
-static int hf_bthci_cmd_le_event_mask_le_direct_advertising_report  = -1;
-static int hf_bthci_cmd_le_event_mask_le_enhanced_connection_complete_v1 = -1;
-static int hf_bthci_cmd_le_event_mask_le_generate_dhkey_complete = -1;
-static int hf_bthci_cmd_le_event_mask_le_read_local_p256_public_key_complete = -1;
-static int hf_bthci_cmd_le_event_mask_le_data_length_change = -1;
-static int hf_bthci_cmd_le_event_mask_le_remote_connection_parameter_request = -1;
-static int hf_bthci_cmd_le_event_mask_le_long_term_key_request = -1;
-static int hf_bthci_cmd_le_event_mask_le_read_remote_features_complete = -1;
-static int hf_bthci_cmd_le_event_mask_le_connection_update_complete = -1;
-static int hf_bthci_cmd_le_event_mask_le_advertising_report = -1;
-static int hf_bthci_cmd_le_event_mask_le_connection_complete = -1;
-static int hf_bthci_cmd_le_advts_interval_min = -1;
-static int hf_bthci_cmd_le_advts_interval_max = -1;
-static int hf_bthci_cmd_le_advts_type = -1;
-static int hf_bthci_cmd_le_own_address_type = -1;
-static int hf_bthci_cmd_le_direct_address_type = -1;
-static int hf_bthci_cmd_le_advts_channel_map_1 = -1;
-static int hf_bthci_cmd_le_advts_channel_map_2 = -1;
-static int hf_bthci_cmd_le_advts_channel_map_3 = -1;
-static int hf_bthci_cmd_le_advts_filter_policy = -1;
-static int hf_bthci_cmd_le_data_length = -1;
-static int hf_bthci_cmd_le_advts_enable = -1;
-static int hf_bthci_cmd_le_scan_enable = -1;
-static int hf_bthci_cmd_le_filter_duplicates = -1;
-static int hf_bthci_cmd_le_scan_type = -1;
-static int hf_bthci_cmd_le_scan_interval = -1;
-static int hf_bthci_cmd_le_scan_window = -1;
-static int hf_bthci_cmd_le_scan_filter_policy = -1;
-static int hf_bthci_cmd_le_initiator_filter_policy = -1;
-static int hf_bthci_cmd_le_peer_address_type = -1;
-static int hf_bthci_cmd_le_peer_identity_address_type = -1;
-static int hf_bthci_cmd_le_con_interval_min = -1;
-static int hf_bthci_cmd_le_con_interval_max = -1;
-static int hf_bthci_cmd_le_con_latency = -1;
-static int hf_bthci_cmd_le_supervision_timeout = -1;
-static int hf_bthci_cmd_le_min_ce_length = -1;
-static int hf_bthci_cmd_le_max_ce_length = -1;
-static int hf_bthci_cmd_le_address_type = -1;
-static int hf_bthci_cmd_le_channel_map = -1;
-static int hf_bthci_cmd_key = -1;
-static int hf_bthci_cmd_plaintext_data = -1;
-static int hf_bthci_cmd_random_number = -1;
-static int hf_bthci_cmd_encrypted_diversifier = -1;
-static int hf_bthci_cmd_le_long_term_key = -1;
-static int hf_bthci_cmd_rx_frequency = -1;
-static int hf_bthci_cmd_tx_frequency = -1;
-static int hf_bthci_cmd_test_data_length = -1;
-static int hf_bthci_cmd_test_packet_payload = -1;
-static int hf_bthci_cmd_parameter = -1;
-static int hf_response_in_frame = -1;
-static int hf_command_response_time_delta = -1;
-static int hf_pending_in_frame = -1;
-static int hf_command_pending_time_delta = -1;
-static int hf_bthci_cmd_le_tx_octets = -1;
-static int hf_bthci_cmd_le_tx_time = -1;
-static int hf_bthci_cmd_le_suggested_max_tx_octets = -1;
-static int hf_bthci_cmd_le_suggested_max_tx_time = -1;
-static int hf_bthci_cmd_le_remote_p_256_public_key = -1;
-static int hf_bthci_cmd_le_peer_irk = -1;
-static int hf_bthci_cmd_le_local_irk = -1;
-static int hf_bthci_cmd_le_address_resolution_enable = -1;
-static int hf_bthci_cmd_le_rpa_timeout = -1;
-static int hf_bthci_cmd_advertising_ext_interval_min = -1;
-static int hf_bthci_cmd_advertising_ext_interval_max = -1;
-static int hf_bthci_cmd_advertising_handle = -1;
-static int hf_bthci_cmd_advertising_properties = -1;
-static int hf_bthci_cmd_advertising_properties_reserved = -1;
-static int hf_bthci_cmd_advertising_properties_connectable = -1;
-static int hf_bthci_cmd_advertising_properties_scannable = -1;
-static int hf_bthci_cmd_advertising_properties_directed = -1;
-static int hf_bthci_cmd_advertising_properties_hdc_connectable_directed = -1;
-static int hf_bthci_cmd_advertising_properties_legacy_adv = -1;
-static int hf_bthci_cmd_advertising_properties_anonymous_adv = -1;
-static int hf_bthci_cmd_advertising_properties_incl_txpower = -1;
-static int hf_bthci_cmd_periodic_advertising_properties = -1;
-static int hf_bthci_cmd_periodic_advertising_properties_reserved = -1;
-static int hf_bthci_cmd_primary_advertising_phy = -1;
-static int hf_bthci_cmd_sec_adv_max_skip = -1;
-static int hf_bthci_cmd_secondary_advertising_phy = -1;
-static int hf_bthci_cmd_advertising_sid = -1;
-static int hf_bthci_cmd_scan_req_notif_en = -1;
-static int hf_bthci_cmd_le_adv_data_operation = -1;
-static int hf_bthci_cmd_le_adv_data_frag_pref = -1;
-static int hf_bthci_cmd_le_adv_set = -1;
-static int hf_bthci_cmd_le_adv_en_sets = -1;
-static int hf_bthci_cmd_le_adv_duration = -1;
-static int hf_bthci_cmd_le_adv_max_extended_events = -1;
-static int hf_bthci_cmd_all_phys = -1;
-static int hf_bthci_cmd_all_phys_tx_pref = -1;
-static int hf_bthci_cmd_all_phys_rx_pref = -1;
-static int hf_bthci_cmd_all_phys_reserved = -1;
-static int hf_bthci_cmd_tx_phys = -1;
-static int hf_bthci_cmd_rx_phys = -1;
-static int hf_bthci_cmd_phys_pref_le_1m = -1;
-static int hf_bthci_cmd_phys_pref_le_2m = -1;
-static int hf_bthci_cmd_phys_pref_le_coded = -1;
-static int hf_bthci_cmd_phys_pref_reserved = -1;
-static int hf_bthci_cmd_phy_options = -1;
-static int hf_bthci_cmd_phy_options_coding =-1;
-static int hf_bthci_cmd_phy_options_reserved =- 1;
-static int hf_bthci_cmd_phy = -1;
-static int hf_bthci_cmd_modulation_index = -1;
-static int hf_bthci_cmd_le_scan_phys = -1;
-static int hf_bthci_cmd_le_scan_phys_reserved = -1;
-static int hf_bthci_cmd_le_scan_phys_le_coded = -1;
-static int hf_bthci_cmd_le_scan_phys_le_1m = -1;
-static int hf_bthci_cmd_le_scan_phy_param = -1;
-static int hf_bthci_cmd_le_scan_duration = -1;
-static int hf_bthci_cmd_le_scan_period = -1;
-static int hf_bthci_cmd_le_init_phys = -1;
-static int hf_bthci_cmd_le_phys_reserved = -1;
-static int hf_bthci_cmd_le_phys_le_coded = -1;
-static int hf_bthci_cmd_le_phys_le_2m = -1;
-static int hf_bthci_cmd_le_phys_le_1m = -1;
-static int hf_bthci_cmd_le_init_phy_param = -1;
-static int hf_bthci_cmd_le_privacy_mode = -1;
-static int hf_bthci_cmd_sync_filter_policy = -1;
-static int hf_bthci_cmd_skip = -1;
-static int hf_bthci_cmd_rf_tx_path_compensation_value = -1;
-static int hf_bthci_cmd_rf_rx_path_compensation_value = -1;
-static int hf_bthci_cmd_sync_handle = -1;
-static int hf_bthci_cmd_cte_length = -1;
-static int hf_bthci_cmd_cte_type = -1;
-static int hf_bthci_cmd_slot_durations = -1;
-static int hf_bthci_cmd_antenna_switching_pattern_length = -1;
-static int hf_bthci_cmd_antenna_switching_pattern = -1;
-static int hf_bthci_cmd_antenna_id = -1;
-static int hf_bthci_cmd_cte_count = -1;
-static int hf_bthci_cmd_cte_enable = -1;
-static int hf_bthci_cmd_iq_sampling_enable = -1;
-static int hf_bthci_cmd_max_sampled_ctes = -1;
-static int hf_bthci_cmd_cte_request_interval = -1;
-static int hf_bthci_cmd_reporting_enable = -1;
-static int hf_bthci_cmd_service_data_past = -1;
-static int hf_bthci_cmd_sync_mode = -1;
-static int hf_bthci_cmd_key_type = -1;
-static int hf_bthci_cmd_sca_action = -1;
-static int hf_bthci_cmd_sync_cte_type = -1;
-static int hf_bthci_cmd_sync_cte_type_no_sync_aoa = -1;
-static int hf_bthci_cmd_sync_cte_type_no_sync_aod_1us = -1;
-static int hf_bthci_cmd_sync_cte_type_no_sync_aod_2us = -1;
-static int hf_bthci_cmd_sync_cte_type_sync_only_with_cte = -1;
-static int hf_bthci_cmd_sync_cte_type_reserved = -1;
-static int hf_bthci_cmd_cte_types = -1;
-static int hf_bthci_cmd_cte_types_reserved = -1;
-static int hf_bthci_cmd_cte_types_aod_2us = -1;
-static int hf_bthci_cmd_cte_types_aod_1us = -1;
-static int hf_bthci_cmd_cte_types_aoa = -1;
-static int hf_bthci_cmd_cig_id = -1;
-static int hf_bthci_cmd_sdu_interval_c_to_p = -1;
-static int hf_bthci_cmd_sdu_interval_p_to_c = -1;
-static int hf_bthci_cmd_sdu_interval = -1;
-static int hf_bthci_cmd_peripherals_clock_accuracy = -1;
-static int hf_bthci_cmd_packing = -1;
-static int hf_bthci_cmd_framing = -1;
-static int hf_bthci_cmd_ft_c_to_p = -1;
-static int hf_bthci_cmd_ft_p_to_c = -1;
-static int hf_bthci_cmd_iso_interval = -1;
-static int hf_bthci_cmd_cis_count = -1;
-static int hf_bthci_cmd_cis_params = -1;
-static int hf_bthci_cmd_cis_id = -1;
-static int hf_bthci_cmd_nse = -1;
-static int hf_bthci_cmd_max_sdu_c_to_p = -1;
-static int hf_bthci_cmd_max_sdu_p_to_c = -1;
-static int hf_bthci_cmd_max_sdu = -1;
-static int hf_bthci_cmd_max_pdu_c_to_p = -1;
-static int hf_bthci_cmd_max_pdu_p_to_c = -1;
-static int hf_bthci_cmd_max_pdu = -1;
-static int hf_bthci_cmd_phy_c_to_p = -1;
-static int hf_bthci_cmd_phy_p_to_c = -1;
-static int hf_bthci_cmd_bn_c_to_p = -1;
-static int hf_bthci_cmd_bn_p_to_c = -1;
-static int hf_bthci_cmd_bn = -1;
-static int hf_bthci_cmd_max_transport_latency_c_to_p = -1;
-static int hf_bthci_cmd_max_transport_latency_p_to_c = -1;
-static int hf_bthci_cmd_max_transport_latency = -1;
-static int hf_bthci_cmd_rtn_c_to_p = -1;
-static int hf_bthci_cmd_rtn_p_to_c = -1;
-static int hf_bthci_cmd_rtn = -1;
-static int hf_bthci_cmd_cis_handle = -1;
-static int hf_bthci_cmd_big_handle = -1;
-static int hf_bthci_cmd_cis_bis_handle = -1;
-static int hf_bthci_cmd_num_bis = -1;
-static int hf_bthci_cmd_irc = -1;
-static int hf_bthci_cmd_pto = -1;
-static int hf_bthci_cmd_encryption = -1;
-static int hf_bthci_cmd_broadcast_code = -1;
-static int hf_bthci_cmd_mse = -1;
-static int hf_bthci_cmd_bis_index = -1;
-static int hf_bthci_cmd_sync_timeout = -1;
-static int hf_bthci_cmd_data_path_direction = -1;
-static int hf_bthci_cmd_data_path_id = -1;
-static int hf_bthci_cmd_coding_format = -1;
-static int hf_bthci_cmd_controller_delay = -1;
-static int hf_bthci_cmd_codec_config_length = -1;
-static int hf_bthci_cmd_codec_config = -1;
-static int hf_bthci_cmd_payload_type = -1;
-static int hf_bthci_cmd_feature_bit_number = -1;
-static int hf_bthci_cmd_feature_bit_value = -1;
-static int hf_bthci_cmd_phy_and_coding = -1;
-static int hf_bthci_cmd_high_threshold = -1;
-static int hf_bthci_cmd_high_hysteresis = -1;
-static int hf_bthci_cmd_low_threshold = -1;
-static int hf_bthci_cmd_low_hysteresis = -1;
-static int hf_bthci_cmd_min_time_spent = -1;
-static int hf_bthci_cmd_local_reporting_enable = -1;
-static int hf_bthci_cmd_remote_reporting_enable = -1;
-static int hf_bthci_cmd_addr_change_reasons = -1;
-static int hf_bthci_cmd_addr_change_reasons_adv_data = -1;
-static int hf_bthci_cmd_addr_change_reasons_scan_rsp_data = -1;
-static int hf_bthci_cmd_addr_change_reasons_reserved = -1;
-static int hf_bthci_cmd_subrate_factor_min = -1;
-static int hf_bthci_cmd_subrate_factor_max = -1;
-static int hf_bthci_cmd_continuation_number = -1;
-static int hf_bthci_cmd_primary_adv_phy_options = -1;
-static int hf_bthci_cmd_secondary_adv_phy_options = -1;
-static int hf_bthci_cmd_num_subevents = -1;
-static int hf_bthci_cmd_subevent_interval = -1;
-static int hf_bthci_cmd_response_slot_delay = -1;
-static int hf_bthci_cmd_response_slot_spacing = -1;
-static int hf_bthci_cmd_num_response_slots = -1;
-static int hf_bthci_cmd_subevent = -1;
-static int hf_bthci_cmd_subevents = -1;
-static int hf_bthci_cmd_response_slot_start = -1;
-static int hf_bthci_cmd_response_slot_count = -1;
-static int hf_bthci_cmd_subevent_data_length = -1;
-static int hf_bthci_cmd_request_event = -1;
-static int hf_bthci_cmd_request_subevent = -1;
-static int hf_bthci_cmd_response_subevent = -1;
-static int hf_bthci_cmd_response_slot = -1;
-static int hf_bthci_cmd_response_data_length = -1;
-static int hf_bthci_cmd_triggered_clock_capture = -1;
-static int hf_bthci_cmd_lpo_allowed = -1;
-static int hf_bthci_cmd_number_of_clock_captures_to_filter = -1;
-static int hf_bthci_cmd_amp_controller_type = -1;
-static int hf_bthci_cmd_esco_loopback_mode = -1;
-static int hf_bthci_cmd_dm1_acl_u_mode = -1;
-static int hf_bthci_cmd_codec_id = -1;
-static int hf_bthci_cmd_company_id = -1;
-static int hf_bthci_cmd_vendor_codec_id = -1;
-static int hf_bthci_cmd_transmit_coding_format = -1;
-static int hf_bthci_cmd_receive_coding_format = -1;
-static int hf_bthci_cmd_input_coding_format = -1;
-static int hf_bthci_cmd_output_coding_format = -1;
-static int hf_bthci_cmd_transmit_codec_frame_size = -1;
-static int hf_bthci_cmd_receive_codec_frame_size = -1;
-static int hf_bthci_cmd_input_bandwidth = -1;
-static int hf_bthci_cmd_output_bandwidth = -1;
-static int hf_bthci_cmd_input_coded_data_size = -1;
-static int hf_bthci_cmd_output_coded_data_size = -1;
-static int hf_bthci_cmd_input_pcm_data_format = -1;
-static int hf_bthci_cmd_output_pcm_data_format = -1;
-static int hf_bthci_cmd_input_pcm_sample_payload_msb_position = -1;
-static int hf_bthci_cmd_output_pcm_sample_payload_msb_position = -1;
-static int hf_bthci_cmd_input_data_path = -1;
-static int hf_bthci_cmd_output_data_path = -1;
-static int hf_bthci_cmd_input_transport_unit_size = -1;
-static int hf_bthci_cmd_output_transport_unit_size = -1;
-static int hf_bthci_cmd_connectionless_peripheral_broadcast = -1;
-static int hf_bthci_cmd_lt_addr = -1;
-static int hf_bthci_cmd_interval_min = -1;
-static int hf_bthci_cmd_interval_max = -1;
-static int hf_bthci_cmd_csb_supervision_to = -1;
-static int hf_bthci_cmd_connectionless_peripheral_broadcast_receive = -1;
-static int hf_bthci_cmd_clock_offset_32 = -1;
-static int hf_bthci_cmd_next_csb_clock = -1;
-static int hf_bthci_cmd_remote_timing_accuracy = -1;
-static int hf_bthci_cmd_csb_skip = -1;
-static int hf_bthci_cmd_afh_channel_map = -1;
-static int hf_bthci_cmd_synchronization_scan_to = -1;
-static int hf_bthci_cmd_c192 = -1;
-static int hf_bthci_cmd_r192 = -1;
-static int hf_bthci_cmd_c256 = -1;
-static int hf_bthci_cmd_r256 = -1;
-static int hf_bthci_mws_channel = -1;
-static int hf_bthci_mws_rx_center_frequency = -1;
-static int hf_bthci_mws_tx_center_frequency = -1;
-static int hf_bthci_mws_rx_channel_bandwidth = -1;
-static int hf_bthci_mws_tx_channel_bandwidth = -1;
-static int hf_bthci_mws_channel_type = -1;
-static int hf_bthci_external_frame_duration = -1;
-static int hf_bthci_external_frame_sync_assert_offset = -1;
-static int hf_bthci_external_frame_sync_assert_jitter = -1;
-static int hf_bthci_external_frame_number_of_periods = -1;
-static int hf_bthci_external_frame_periods = -1;
-static int hf_bthci_external_frame_period = -1;
-static int hf_bthci_external_frame_period_duration = -1;
-static int hf_bthci_external_frame_period_type = -1;
-static int hf_bthci_mws_rx_assert_offset = -1;
-static int hf_bthci_mws_rx_assert_jitter = -1;
-static int hf_bthci_mws_rx_deassert_offset = -1;
-static int hf_bthci_mws_rx_deassert_jitter = -1;
-static int hf_bthci_mws_tx_assert_offset = -1;
-static int hf_bthci_mws_tx_assert_jitter = -1;
-static int hf_bthci_mws_tx_deassert_offset = -1;
-static int hf_bthci_mws_tx_deassert_jitter = -1;
-static int hf_bthci_mws_pattern_assert_offset = -1;
-static int hf_bthci_mws_pattern_assert_jitter = -1;
-static int hf_bthci_mws_inactivity_duration_assert_offset = -1;
-static int hf_bthci_mws_inactivity_duration_assert_jitter = -1;
-static int hf_bthci_mws_scan_frequency_assert_offset = -1;
-static int hf_bthci_mws_scan_frequency_assert_jitter = -1;
-static int hf_bthci_mws_priority_assert_offset_request = -1;
-static int hf_bthci_mws_transport_layer = -1;
-static int hf_bthci_mws_to_baud_rate = -1;
-static int hf_bthci_mws_from_baud_rate = -1;
-static int hf_bthci_mws_number_of_frequencies = -1;
-static int hf_bthci_mws_scan_frequency_table = -1;
-static int hf_bthci_mws_scan_frequency_table_item = -1;
-static int hf_bthci_mws_scan_frequency_table_item_low = -1;
-static int hf_bthci_mws_scan_frequency_table_item_high = -1;
-static int hf_bthci_mws_pattern_index = -1;
-static int hf_bthci_mws_pattern_number_of_intervals = -1;
-static int hf_bthci_mws_patterns = -1;
-static int hf_bthci_mws_pattern = -1;
-static int hf_bthci_mws_pattern_duration = -1;
-static int hf_bthci_mws_pattern_type = -1;
-static int hf_bthci_cmd_sync_train_to = -1;
-static int hf_bthci_cmd_service_data = -1;
-static int hf_bthci_cmd_secure_connection_host_support = -1;
-static int hf_bthci_cmd_csb_fragment = -1;
-static int hf_bthci_cmd_csb_data_length = -1;
-static int hf_bthci_cmd_csb_data = -1;
-static int hf_bthci_cmd_authenticated_payload_timeout = -1;
-static int hf_bthci_cmd_extended_inquiry_length = -1;
-static int hf_bthci_cmd_min_encryption_key_size = -1;
+static int proto_bthci_cmd;
+
+static int hf_bthci_cmd_opcode;
+static int hf_bthci_cmd_ogf;
+static int hf_bthci_cmd_ocf;
+static int hf_bthci_cmd_ocf_link_control;
+static int hf_bthci_cmd_ocf_link_policy;
+static int hf_bthci_cmd_ocf_host_controller_and_baseband;
+static int hf_bthci_cmd_ocf_informational;
+static int hf_bthci_cmd_ocf_status;
+static int hf_bthci_cmd_ocf_testing;
+static int hf_bthci_cmd_ocf_logo_testing;
+static int hf_bthci_cmd_ocf_low_energy;
+static int hf_bthci_cmd_param_length;
+static int hf_bthci_cmd_lap;
+static int hf_bthci_cmd_inq_length;
+static int hf_bthci_cmd_num_responses;
+static int hf_bthci_cmd_encrypt_mode;
+static int hf_bthci_cmd_bd_addr;
+static int hf_bthci_cmd_packet_type;
+static int hf_bthci_cmd_packet_type_dh5;
+static int hf_bthci_cmd_packet_type_dm5;
+static int hf_bthci_cmd_packet_type_3dh5;
+static int hf_bthci_cmd_packet_type_2dh5;
+static int hf_bthci_cmd_packet_type_dh3;
+static int hf_bthci_cmd_packet_type_dm3;
+static int hf_bthci_cmd_packet_type_3dh3;
+static int hf_bthci_cmd_packet_type_2dh3;
+static int hf_bthci_cmd_packet_type_reserved_5_7;
+static int hf_bthci_cmd_packet_type_dh1;
+static int hf_bthci_cmd_packet_type_dm1;
+static int hf_bthci_cmd_packet_type_3dh1;
+static int hf_bthci_cmd_packet_type_2dh1;
+static int hf_bthci_cmd_packet_type_reserved_0;
+static int hf_bthci_cmd_clock_offset;
+static int hf_bthci_cmd_clock_offset_valid;
+static int hf_bthci_cmd_allow_role_switch;
+static int hf_bthci_cmd_page_scan_mode;
+static int hf_bthci_cmd_page_scan_repetition_mode;
+static int hf_bthci_cmd_page_scan_period_mode;
+static int hf_bthci_cmd_max_period_length;
+static int hf_bthci_cmd_min_period_length;
+static int hf_bthci_cmd_connection_handle;
+static int hf_bthci_cmd_reason;
+static int hf_bthci_cmd_num_link_keys;
+static int hf_bthci_cmd_link_key;
+static int hf_bthci_cmd_packet_type_hv1;
+static int hf_bthci_cmd_packet_type_hv2;
+static int hf_bthci_cmd_packet_type_hv3;
+static int hf_bthci_cmd_role;
+static int hf_bthci_cmd_acr_role;
+static int hf_bthci_cmd_pin_code_length;
+static int hf_bthci_cmd_pin_code;
+static int hf_bthci_cmd_pin_type;
+static int hf_bthci_cmd_encryption_enable;
+static int hf_bthci_cmd_key_flag;
+static int hf_bthci_cmd_max_interval_hold;
+static int hf_bthci_cmd_min_interval_hold;
+static int hf_bthci_cmd_max_interval_sniff;
+static int hf_bthci_cmd_min_interval_sniff;
+static int hf_bthci_cmd_sniff_attempt;
+static int hf_bthci_cmd_timeout;
+static int hf_bthci_cmd_max_interval_beacon;
+static int hf_bthci_cmd_min_interval_beacon;
+static int hf_bthci_cmd_flags;
+static int hf_bthci_cmd_flow_direction;
+static int hf_bthci_cmd_service_type;
+static int hf_bthci_cmd_token_rate;
+static int hf_bthci_cmd_token_bucket_size;
+static int hf_bthci_cmd_peak_bandwidth;
+static int hf_bthci_cmd_latency;
+static int hf_bthci_cmd_delay_variation;
+static int hf_bthci_cmd_link_policy_setting_switch;
+static int hf_bthci_cmd_link_policy_setting_hold;
+static int hf_bthci_cmd_link_policy_setting_sniff;
+static int hf_bthci_cmd_link_policy_setting_park;
+static int hf_bthci_cmd_filter_type;
+static int hf_bthci_cmd_inquiry_result_filter_condition_type;
+static int hf_bthci_cmd_connection_setup_filter_condition_type;
+static int hf_bthci_cmd_cod_class_of_device_mask;
+static int hf_bthci_cmd_cod_minor_device_class_mask;
+static int hf_bthci_cmd_cod_format_type_mask;
+static int hf_bthci_cmd_cod_major_service_class_information_mask;
+static int hf_bthci_cmd_cod_major_service_class_telephony_mask;
+static int hf_bthci_cmd_cod_major_service_class_audio_mask;
+static int hf_bthci_cmd_cod_major_service_class_object_transfer_mask;
+static int hf_bthci_cmd_cod_major_service_class_capturing_mask;
+static int hf_bthci_cmd_cod_major_service_class_rendering_mask;
+static int hf_bthci_cmd_cod_major_service_class_networking_mask;
+static int hf_bthci_cmd_cod_major_service_class_positioning_mask;
+static int hf_bthci_cmd_cod_major_service_class_reserved_mask;
+static int hf_bthci_cmd_cod_major_service_class_le_audio_mask;
+static int hf_bthci_cmd_cod_major_service_class_limited_discoverable_mode_mask;
+static int hf_bthci_cmd_cod_major_device_class_mask;
+static int hf_bthci_cmd_auto_acc_flag;
+static int hf_bthci_cmd_read_all_flag;
+static int hf_bthci_cmd_delete_all_flag;
+static int hf_bthci_cmd_authentication_enable;
+static int hf_bthci_cmd_input_unused;
+static int hf_bthci_cmd_input_coding;
+static int hf_bthci_cmd_input_data_format;
+static int hf_bthci_cmd_input_sample_size;
+static int hf_bthci_cmd_linear_pcm_bit_pos;
+static int hf_bthci_cmd_air_coding_format;
+static int hf_bthci_cmd_num_broadcast_retransmissions;
+static int hf_bthci_cmd_hold_mode_act_page;
+static int hf_bthci_cmd_hold_mode_act_inquiry;
+static int hf_bthci_cmd_hold_mode_act_periodic;
+static int hf_bthci_cmd_scan_enable;
+static int hf_bthci_cmd_interval;
+static int hf_bthci_cmd_window;
+static int hf_bthci_cmd_device_name;
+static int hf_bthci_cmd_num_curr_iac;
+static int hf_bthci_cmd_iac_lap;
+static int hf_bthci_cmd_evt_mask_00;
+static int hf_bthci_cmd_evt_mask_01;
+static int hf_bthci_cmd_evt_mask_02;
+static int hf_bthci_cmd_evt_mask_03;
+static int hf_bthci_cmd_evt_mask_04;
+static int hf_bthci_cmd_evt_mask_05;
+static int hf_bthci_cmd_evt_mask_06;
+static int hf_bthci_cmd_evt_mask_07;
+static int hf_bthci_cmd_evt_mask_10;
+static int hf_bthci_cmd_evt_mask_11;
+static int hf_bthci_cmd_evt_mask_12;
+static int hf_bthci_cmd_evt_mask_13;
+static int hf_bthci_cmd_evt_mask_14;
+static int hf_bthci_cmd_evt_mask_17;
+static int hf_bthci_cmd_evt_mask_20;
+static int hf_bthci_cmd_evt_mask_21;
+static int hf_bthci_cmd_evt_mask_23;
+static int hf_bthci_cmd_evt_mask_24;
+static int hf_bthci_cmd_evt_mask_25;
+static int hf_bthci_cmd_evt_mask_26;
+static int hf_bthci_cmd_evt_mask_27;
+static int hf_bthci_cmd_evt_mask_30;
+static int hf_bthci_cmd_evt_mask_31;
+static int hf_bthci_cmd_evt_mask_32;
+static int hf_bthci_cmd_evt_mask_33;
+static int hf_bthci_cmd_evt_mask_34;
+static int hf_bthci_cmd_evt_mask_35;
+static int hf_bthci_cmd_evt_mask_36;
+static int hf_bthci_cmd_evt_mask_37;
+static int hf_bthci_cmd_evt_mask_40;
+static int hf_bthci_cmd_evt_mask_41;
+static int hf_bthci_cmd_evt_mask_42;
+static int hf_bthci_cmd_evt_mask_53;
+static int hf_bthci_cmd_evt_mask_54;
+static int hf_bthci_cmd_evt_mask_55;
+static int hf_bthci_cmd_evt_mask_56;
+static int hf_bthci_cmd_evt_mask_57;
+static int hf_bthci_cmd_evt_mask_60;
+static int hf_bthci_cmd_evt_mask_61;
+static int hf_bthci_cmd_evt_mask_62;
+static int hf_bthci_cmd_evt_mask_63;
+static int hf_bthci_cmd_evt_mask_64;
+static int hf_bthci_cmd_evt_mask_65;
+static int hf_bthci_cmd_evt_mask_67;
+static int hf_bthci_cmd_evt_mask_70;
+static int hf_bthci_cmd_evt_mask_72;
+static int hf_bthci_cmd_evt_mask_73;
+static int hf_bthci_cmd_sco_flow_control;
+static int hf_bthci_cmd_num_handles;
+static int hf_bthci_cmd_num_compl_packets;
+static int hf_bthci_cmd_flow_contr_enable;
+static int hf_bthci_cmd_host_data_packet_length_acl;
+static int hf_bthci_cmd_host_data_packet_length_sco;
+static int hf_bthci_cmd_host_total_num_acl_data_packets;
+static int hf_bthci_cmd_host_total_num_sco_data_packets;
+static int hf_bthci_cmd_loopback_mode;
+static int hf_bthci_cmd_page_number;
+static int hf_bthci_cmd_transmit_bandwidth;
+static int hf_bthci_cmd_receive_bandwidth;
+static int hf_bthci_cmd_max_latency_ms;
+static int hf_bthci_cmd_max_latency;
+static int hf_bthci_cmd_retransmission_effort;
+static int hf_bthci_cmd_scan_type;
+static int hf_bthci_cmd_inq_mode;
+static int hf_bthci_cmd_fec_required;
+static int hf_bthci_cmd_err_data_reporting;
+static int hf_bthci_cmd_tx_power;
+static int hf_bthci_cmd_sco_packet_type;
+static int hf_bthci_cmd_sco_packet_type_hv1;
+static int hf_bthci_cmd_sco_packet_type_hv2;
+static int hf_bthci_cmd_sco_packet_type_hv3;
+static int hf_bthci_cmd_sco_packet_type_ev3;
+static int hf_bthci_cmd_sco_packet_type_ev4;
+static int hf_bthci_cmd_sco_packet_type_ev5;
+static int hf_bthci_cmd_sco_packet_type_2ev3;
+static int hf_bthci_cmd_sco_packet_type_3ev3;
+static int hf_bthci_cmd_sco_packet_type_2ev5;
+static int hf_bthci_cmd_sco_packet_type_3ev5;
+static int hf_bthci_cmd_sco_packet_type_reserved;
+static int hf_bthci_cmd_min_remote_timeout;
+static int hf_bthci_cmd_min_local_timeout;
+static int hf_bthci_cmd_flush_packet_type;
+static int hf_bthci_cmd_afh_ch_assessment_mode;
+static int hf_bthci_cmd_afh_ch_classification;
+static int hf_bthci_cmd_which_clock;
+static int hf_bthci_cmd_io_capability;
+static int hf_bthci_cmd_oob_data_present;
+static int hf_bthci_cmd_auth_requirements;
+static int hf_bthci_cmd_passkey;
+static int hf_bthci_cmd_randomizer_r;
+static int hf_bthci_cmd_hash_c;
+static int hf_bthci_cmd_simple_pairing_mode;
+static int hf_bthci_cmd_simple_pairing_debug_mode;
+static int hf_bthci_cmd_notification_type;
+static int hf_bthci_cmd_physical_link_handle;
+static int hf_bthci_cmd_dedicated_amp_key_length;
+static int hf_bthci_cmd_dedicated_amp_key_type;
+static int hf_bthci_cmd_dedicated_amp_key;
+static int hf_bthci_cmd_flow_spec;
+static int hf_bthci_cmd_flow_spec_identifier;
+static int hf_bthci_cmd_flow_spec_service_type;
+static int hf_bthci_cmd_flow_spec_sdu_size;
+static int hf_bthci_cmd_flow_spec_sdu_arrival_time;
+static int hf_bthci_cmd_flow_spec_access_latency;
+static int hf_bthci_cmd_flush_to_us;
+static int hf_bthci_cmd_logical_link_handle;
+static int hf_bthci_cmd_evt_mask2_00;
+static int hf_bthci_cmd_evt_mask2_01;
+static int hf_bthci_cmd_evt_mask2_02;
+static int hf_bthci_cmd_evt_mask2_03;
+static int hf_bthci_cmd_evt_mask2_04;
+static int hf_bthci_cmd_evt_mask2_05;
+static int hf_bthci_cmd_evt_mask2_06;
+static int hf_bthci_cmd_evt_mask2_07;
+static int hf_bthci_cmd_evt_mask2_10;
+static int hf_bthci_cmd_evt_mask2_11;
+static int hf_bthci_cmd_evt_mask2_12;
+static int hf_bthci_cmd_evt_mask2_13;
+static int hf_bthci_cmd_evt_mask2_14;
+static int hf_bthci_cmd_evt_mask2_15;
+static int hf_bthci_cmd_location_domain_aware;
+static int hf_bthci_cmd_location_domain;
+static int hf_bthci_cmd_location_domain_options;
+static int hf_bthci_cmd_location_options;
+static int hf_bthci_cmd_flow_control_mode;
+static int hf_bthci_cmd_tx_power_level_type;
+static int hf_bthci_cmd_short_range_mode;
+static int hf_bthci_cmd_le_supported_host;
+static int hf_bthci_cmd_le_simultaneous_host;
+static int hf_bthci_cmd_enable_amp_recv_reports;
+static int hf_bthci_cmd_amp_recv_report_interval;
+static int hf_bthci_cmd_length_so_far;
+static int hf_bthci_cmd_amp_assoc_length;
+static int hf_bthci_cmd_amp_remaining_assoc_length;
+static int hf_bthci_cmd_amp_assoc_fragment;
+static int hf_bthci_cmd_le_event_mask;
+static int hf_bthci_cmd_le_event_mask_le_reserved;
+static int hf_bthci_cmd_le_event_mask_le_enhanced_connection_complete_v2;
+static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_response_report;
+static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_subevent_data_request;
+static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_sync_transfer_received_v2;
+static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_report_v2;
+static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_sync_established_v2;
+static int hf_bthci_cmd_le_event_mask_le_subrate_changed;
+static int hf_bthci_cmd_le_event_mask_le_biginfo_advertising_report;
+static int hf_bthci_cmd_le_event_mask_le_transmit_power_reporting;
+static int hf_bthci_cmd_le_event_mask_le_path_loss_threshold;
+static int hf_bthci_cmd_le_event_mask_le_request_peer_sca_complete;
+static int hf_bthci_cmd_le_event_mask_le_big_sync_lost;
+static int hf_bthci_cmd_le_event_mask_le_big_sync_established;
+static int hf_bthci_cmd_le_event_mask_le_terminate_big_complete;
+static int hf_bthci_cmd_le_event_mask_le_create_big_complete;
+static int hf_bthci_cmd_le_event_mask_le_cis_request;
+static int hf_bthci_cmd_le_event_mask_le_cis_established;
+static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_sync_transfer_received_v1;
+static int hf_bthci_cmd_le_event_mask_le_cte_request_failed;
+static int hf_bthci_cmd_le_event_mask_le_connection_iq_report;
+static int hf_bthci_cmd_le_event_mask_le_connectionless_iq_report;
+static int hf_bthci_cmd_le_event_mask_le_channel_selection_algorithm;
+static int hf_bthci_cmd_le_event_mask_le_scan_request_received;
+static int hf_bthci_cmd_le_event_mask_le_extended_advertising_set_terminated;
+static int hf_bthci_cmd_le_event_mask_le_extended_scan_timeout;
+static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_sync_lost;
+static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_report_v1;
+static int hf_bthci_cmd_le_event_mask_le_periodic_advertising_sync_established_v1;
+static int hf_bthci_cmd_le_event_mask_le_extended_advertising_report;
+static int hf_bthci_cmd_le_event_mask_le_phy_update_complete;
+static int hf_bthci_cmd_le_event_mask_le_direct_advertising_report;
+static int hf_bthci_cmd_le_event_mask_le_enhanced_connection_complete_v1;
+static int hf_bthci_cmd_le_event_mask_le_generate_dhkey_complete;
+static int hf_bthci_cmd_le_event_mask_le_read_local_p256_public_key_complete;
+static int hf_bthci_cmd_le_event_mask_le_data_length_change;
+static int hf_bthci_cmd_le_event_mask_le_remote_connection_parameter_request;
+static int hf_bthci_cmd_le_event_mask_le_long_term_key_request;
+static int hf_bthci_cmd_le_event_mask_le_read_remote_features_complete;
+static int hf_bthci_cmd_le_event_mask_le_connection_update_complete;
+static int hf_bthci_cmd_le_event_mask_le_advertising_report;
+static int hf_bthci_cmd_le_event_mask_le_connection_complete;
+static int hf_bthci_cmd_le_advts_interval_min;
+static int hf_bthci_cmd_le_advts_interval_max;
+static int hf_bthci_cmd_le_advts_type;
+static int hf_bthci_cmd_le_own_address_type;
+static int hf_bthci_cmd_le_direct_address_type;
+static int hf_bthci_cmd_le_advts_channel_map_1;
+static int hf_bthci_cmd_le_advts_channel_map_2;
+static int hf_bthci_cmd_le_advts_channel_map_3;
+static int hf_bthci_cmd_le_advts_filter_policy;
+static int hf_bthci_cmd_le_data_length;
+static int hf_bthci_cmd_le_advts_enable;
+static int hf_bthci_cmd_le_scan_enable;
+static int hf_bthci_cmd_le_filter_duplicates;
+static int hf_bthci_cmd_le_scan_type;
+static int hf_bthci_cmd_le_scan_interval;
+static int hf_bthci_cmd_le_scan_window;
+static int hf_bthci_cmd_le_scan_filter_policy;
+static int hf_bthci_cmd_le_initiator_filter_policy;
+static int hf_bthci_cmd_le_peer_address_type;
+static int hf_bthci_cmd_le_peer_identity_address_type;
+static int hf_bthci_cmd_le_con_interval_min;
+static int hf_bthci_cmd_le_con_interval_max;
+static int hf_bthci_cmd_le_con_latency;
+static int hf_bthci_cmd_le_supervision_timeout;
+static int hf_bthci_cmd_le_min_ce_length;
+static int hf_bthci_cmd_le_max_ce_length;
+static int hf_bthci_cmd_le_address_type;
+static int hf_bthci_cmd_le_channel_map;
+static int hf_bthci_cmd_key;
+static int hf_bthci_cmd_plaintext_data;
+static int hf_bthci_cmd_random_number;
+static int hf_bthci_cmd_encrypted_diversifier;
+static int hf_bthci_cmd_le_long_term_key;
+static int hf_bthci_cmd_rx_frequency;
+static int hf_bthci_cmd_tx_frequency;
+static int hf_bthci_cmd_test_data_length;
+static int hf_bthci_cmd_test_packet_payload;
+static int hf_bthci_cmd_parameter;
+static int hf_response_in_frame;
+static int hf_command_response_time_delta;
+static int hf_pending_in_frame;
+static int hf_command_pending_time_delta;
+static int hf_bthci_cmd_le_tx_octets;
+static int hf_bthci_cmd_le_tx_time;
+static int hf_bthci_cmd_le_suggested_max_tx_octets;
+static int hf_bthci_cmd_le_suggested_max_tx_time;
+static int hf_bthci_cmd_le_remote_p_256_public_key;
+static int hf_bthci_cmd_le_peer_irk;
+static int hf_bthci_cmd_le_local_irk;
+static int hf_bthci_cmd_le_address_resolution_enable;
+static int hf_bthci_cmd_le_rpa_timeout;
+static int hf_bthci_cmd_advertising_ext_interval_min;
+static int hf_bthci_cmd_advertising_ext_interval_max;
+static int hf_bthci_cmd_advertising_handle;
+static int hf_bthci_cmd_advertising_properties;
+static int hf_bthci_cmd_advertising_properties_reserved;
+static int hf_bthci_cmd_advertising_properties_connectable;
+static int hf_bthci_cmd_advertising_properties_scannable;
+static int hf_bthci_cmd_advertising_properties_directed;
+static int hf_bthci_cmd_advertising_properties_hdc_connectable_directed;
+static int hf_bthci_cmd_advertising_properties_legacy_adv;
+static int hf_bthci_cmd_advertising_properties_anonymous_adv;
+static int hf_bthci_cmd_advertising_properties_incl_txpower;
+static int hf_bthci_cmd_periodic_advertising_properties;
+static int hf_bthci_cmd_periodic_advertising_properties_reserved;
+static int hf_bthci_cmd_primary_advertising_phy;
+static int hf_bthci_cmd_sec_adv_max_skip;
+static int hf_bthci_cmd_secondary_advertising_phy;
+static int hf_bthci_cmd_advertising_sid;
+static int hf_bthci_cmd_scan_req_notif_en;
+static int hf_bthci_cmd_le_adv_data_operation;
+static int hf_bthci_cmd_le_adv_data_frag_pref;
+static int hf_bthci_cmd_le_adv_set;
+static int hf_bthci_cmd_le_adv_en_sets;
+static int hf_bthci_cmd_le_adv_duration;
+static int hf_bthci_cmd_le_adv_max_extended_events;
+static int hf_bthci_cmd_all_phys;
+static int hf_bthci_cmd_all_phys_tx_pref;
+static int hf_bthci_cmd_all_phys_rx_pref;
+static int hf_bthci_cmd_all_phys_reserved;
+static int hf_bthci_cmd_tx_phys;
+static int hf_bthci_cmd_rx_phys;
+static int hf_bthci_cmd_phys_pref_le_1m;
+static int hf_bthci_cmd_phys_pref_le_2m;
+static int hf_bthci_cmd_phys_pref_le_coded;
+static int hf_bthci_cmd_phys_pref_reserved;
+static int hf_bthci_cmd_phy_options;
+static int hf_bthci_cmd_phy_options_coding;
+static int hf_bthci_cmd_phy_options_reserved;
+static int hf_bthci_cmd_phy;
+static int hf_bthci_cmd_modulation_index;
+static int hf_bthci_cmd_le_scan_phys;
+static int hf_bthci_cmd_le_scan_phys_reserved;
+static int hf_bthci_cmd_le_scan_phys_le_coded;
+static int hf_bthci_cmd_le_scan_phys_le_1m;
+static int hf_bthci_cmd_le_scan_phy_param;
+static int hf_bthci_cmd_le_scan_duration;
+static int hf_bthci_cmd_le_scan_period;
+static int hf_bthci_cmd_le_init_phys;
+static int hf_bthci_cmd_le_phys_reserved;
+static int hf_bthci_cmd_le_phys_le_coded;
+static int hf_bthci_cmd_le_phys_le_2m;
+static int hf_bthci_cmd_le_phys_le_1m;
+static int hf_bthci_cmd_le_init_phy_param;
+static int hf_bthci_cmd_le_privacy_mode;
+static int hf_bthci_cmd_sync_filter_policy;
+static int hf_bthci_cmd_skip;
+static int hf_bthci_cmd_rf_tx_path_compensation_value;
+static int hf_bthci_cmd_rf_rx_path_compensation_value;
+static int hf_bthci_cmd_sync_handle;
+static int hf_bthci_cmd_cte_length;
+static int hf_bthci_cmd_cte_type;
+static int hf_bthci_cmd_slot_durations;
+static int hf_bthci_cmd_antenna_switching_pattern_length;
+static int hf_bthci_cmd_antenna_switching_pattern;
+static int hf_bthci_cmd_antenna_id;
+static int hf_bthci_cmd_cte_count;
+static int hf_bthci_cmd_cte_enable;
+static int hf_bthci_cmd_iq_sampling_enable;
+static int hf_bthci_cmd_max_sampled_ctes;
+static int hf_bthci_cmd_cte_request_interval;
+static int hf_bthci_cmd_reporting_enable;
+static int hf_bthci_cmd_service_data_past;
+static int hf_bthci_cmd_sync_mode;
+static int hf_bthci_cmd_key_type;
+static int hf_bthci_cmd_sca_action;
+static int hf_bthci_cmd_sync_cte_type;
+static int hf_bthci_cmd_sync_cte_type_no_sync_aoa;
+static int hf_bthci_cmd_sync_cte_type_no_sync_aod_1us;
+static int hf_bthci_cmd_sync_cte_type_no_sync_aod_2us;
+static int hf_bthci_cmd_sync_cte_type_sync_only_with_cte;
+static int hf_bthci_cmd_sync_cte_type_reserved;
+static int hf_bthci_cmd_cte_types;
+static int hf_bthci_cmd_cte_types_reserved;
+static int hf_bthci_cmd_cte_types_aod_2us;
+static int hf_bthci_cmd_cte_types_aod_1us;
+static int hf_bthci_cmd_cte_types_aoa;
+static int hf_bthci_cmd_cig_id;
+static int hf_bthci_cmd_sdu_interval_c_to_p;
+static int hf_bthci_cmd_sdu_interval_p_to_c;
+static int hf_bthci_cmd_sdu_interval;
+static int hf_bthci_cmd_peripherals_clock_accuracy;
+static int hf_bthci_cmd_packing;
+static int hf_bthci_cmd_framing;
+static int hf_bthci_cmd_ft_c_to_p;
+static int hf_bthci_cmd_ft_p_to_c;
+static int hf_bthci_cmd_iso_interval;
+static int hf_bthci_cmd_cis_count;
+static int hf_bthci_cmd_cis_params;
+static int hf_bthci_cmd_cis_id;
+static int hf_bthci_cmd_nse;
+static int hf_bthci_cmd_max_sdu_c_to_p;
+static int hf_bthci_cmd_max_sdu_p_to_c;
+static int hf_bthci_cmd_max_sdu;
+static int hf_bthci_cmd_max_pdu_c_to_p;
+static int hf_bthci_cmd_max_pdu_p_to_c;
+static int hf_bthci_cmd_max_pdu;
+static int hf_bthci_cmd_phy_c_to_p;
+static int hf_bthci_cmd_phy_p_to_c;
+static int hf_bthci_cmd_bn_c_to_p;
+static int hf_bthci_cmd_bn_p_to_c;
+static int hf_bthci_cmd_bn;
+static int hf_bthci_cmd_max_transport_latency_c_to_p;
+static int hf_bthci_cmd_max_transport_latency_p_to_c;
+static int hf_bthci_cmd_max_transport_latency;
+static int hf_bthci_cmd_rtn_c_to_p;
+static int hf_bthci_cmd_rtn_p_to_c;
+static int hf_bthci_cmd_rtn;
+static int hf_bthci_cmd_cis_handle;
+static int hf_bthci_cmd_big_handle;
+static int hf_bthci_cmd_cis_bis_handle;
+static int hf_bthci_cmd_num_bis;
+static int hf_bthci_cmd_irc;
+static int hf_bthci_cmd_pto;
+static int hf_bthci_cmd_encryption;
+static int hf_bthci_cmd_broadcast_code;
+static int hf_bthci_cmd_mse;
+static int hf_bthci_cmd_bis_index;
+static int hf_bthci_cmd_sync_timeout;
+static int hf_bthci_cmd_data_path_direction;
+static int hf_bthci_cmd_data_path_id;
+static int hf_bthci_cmd_coding_format;
+static int hf_bthci_cmd_controller_delay;
+static int hf_bthci_cmd_codec_config_length;
+static int hf_bthci_cmd_codec_config;
+static int hf_bthci_cmd_payload_type;
+static int hf_bthci_cmd_feature_bit_number;
+static int hf_bthci_cmd_feature_bit_value;
+static int hf_bthci_cmd_phy_and_coding;
+static int hf_bthci_cmd_high_threshold;
+static int hf_bthci_cmd_high_hysteresis;
+static int hf_bthci_cmd_low_threshold;
+static int hf_bthci_cmd_low_hysteresis;
+static int hf_bthci_cmd_min_time_spent;
+static int hf_bthci_cmd_local_reporting_enable;
+static int hf_bthci_cmd_remote_reporting_enable;
+static int hf_bthci_cmd_addr_change_reasons;
+static int hf_bthci_cmd_addr_change_reasons_adv_data;
+static int hf_bthci_cmd_addr_change_reasons_scan_rsp_data;
+static int hf_bthci_cmd_addr_change_reasons_reserved;
+static int hf_bthci_cmd_subrate_factor_min;
+static int hf_bthci_cmd_subrate_factor_max;
+static int hf_bthci_cmd_continuation_number;
+static int hf_bthci_cmd_primary_adv_phy_options;
+static int hf_bthci_cmd_secondary_adv_phy_options;
+static int hf_bthci_cmd_num_subevents;
+static int hf_bthci_cmd_subevent_interval;
+static int hf_bthci_cmd_response_slot_delay;
+static int hf_bthci_cmd_response_slot_spacing;
+static int hf_bthci_cmd_num_response_slots;
+static int hf_bthci_cmd_subevent;
+static int hf_bthci_cmd_subevents;
+static int hf_bthci_cmd_response_slot_start;
+static int hf_bthci_cmd_response_slot_count;
+static int hf_bthci_cmd_subevent_data_length;
+static int hf_bthci_cmd_request_event;
+static int hf_bthci_cmd_request_subevent;
+static int hf_bthci_cmd_response_subevent;
+static int hf_bthci_cmd_response_slot;
+static int hf_bthci_cmd_response_data_length;
+static int hf_bthci_cmd_triggered_clock_capture;
+static int hf_bthci_cmd_lpo_allowed;
+static int hf_bthci_cmd_number_of_clock_captures_to_filter;
+static int hf_bthci_cmd_amp_controller_type;
+static int hf_bthci_cmd_esco_loopback_mode;
+static int hf_bthci_cmd_dm1_acl_u_mode;
+static int hf_bthci_cmd_codec_id;
+static int hf_bthci_cmd_company_id;
+static int hf_bthci_cmd_vendor_codec_id;
+static int hf_bthci_cmd_transmit_coding_format;
+static int hf_bthci_cmd_receive_coding_format;
+static int hf_bthci_cmd_input_coding_format;
+static int hf_bthci_cmd_output_coding_format;
+static int hf_bthci_cmd_transmit_codec_frame_size;
+static int hf_bthci_cmd_receive_codec_frame_size;
+static int hf_bthci_cmd_input_bandwidth;
+static int hf_bthci_cmd_output_bandwidth;
+static int hf_bthci_cmd_input_coded_data_size;
+static int hf_bthci_cmd_output_coded_data_size;
+static int hf_bthci_cmd_input_pcm_data_format;
+static int hf_bthci_cmd_output_pcm_data_format;
+static int hf_bthci_cmd_input_pcm_sample_payload_msb_position;
+static int hf_bthci_cmd_output_pcm_sample_payload_msb_position;
+static int hf_bthci_cmd_input_data_path;
+static int hf_bthci_cmd_output_data_path;
+static int hf_bthci_cmd_input_transport_unit_size;
+static int hf_bthci_cmd_output_transport_unit_size;
+static int hf_bthci_cmd_connectionless_peripheral_broadcast;
+static int hf_bthci_cmd_lt_addr;
+static int hf_bthci_cmd_interval_min;
+static int hf_bthci_cmd_interval_max;
+static int hf_bthci_cmd_csb_supervision_to;
+static int hf_bthci_cmd_connectionless_peripheral_broadcast_receive;
+static int hf_bthci_cmd_clock_offset_32;
+static int hf_bthci_cmd_next_csb_clock;
+static int hf_bthci_cmd_remote_timing_accuracy;
+static int hf_bthci_cmd_csb_skip;
+static int hf_bthci_cmd_afh_channel_map;
+static int hf_bthci_cmd_synchronization_scan_to;
+static int hf_bthci_cmd_c192;
+static int hf_bthci_cmd_r192;
+static int hf_bthci_cmd_c256;
+static int hf_bthci_cmd_r256;
+static int hf_bthci_mws_channel;
+static int hf_bthci_mws_rx_center_frequency;
+static int hf_bthci_mws_tx_center_frequency;
+static int hf_bthci_mws_rx_channel_bandwidth;
+static int hf_bthci_mws_tx_channel_bandwidth;
+static int hf_bthci_mws_channel_type;
+static int hf_bthci_external_frame_duration;
+static int hf_bthci_external_frame_sync_assert_offset;
+static int hf_bthci_external_frame_sync_assert_jitter;
+static int hf_bthci_external_frame_number_of_periods;
+static int hf_bthci_external_frame_periods;
+static int hf_bthci_external_frame_period;
+static int hf_bthci_external_frame_period_duration;
+static int hf_bthci_external_frame_period_type;
+static int hf_bthci_mws_rx_assert_offset;
+static int hf_bthci_mws_rx_assert_jitter;
+static int hf_bthci_mws_rx_deassert_offset;
+static int hf_bthci_mws_rx_deassert_jitter;
+static int hf_bthci_mws_tx_assert_offset;
+static int hf_bthci_mws_tx_assert_jitter;
+static int hf_bthci_mws_tx_deassert_offset;
+static int hf_bthci_mws_tx_deassert_jitter;
+static int hf_bthci_mws_pattern_assert_offset;
+static int hf_bthci_mws_pattern_assert_jitter;
+static int hf_bthci_mws_inactivity_duration_assert_offset;
+static int hf_bthci_mws_inactivity_duration_assert_jitter;
+static int hf_bthci_mws_scan_frequency_assert_offset;
+static int hf_bthci_mws_scan_frequency_assert_jitter;
+static int hf_bthci_mws_priority_assert_offset_request;
+static int hf_bthci_mws_transport_layer;
+static int hf_bthci_mws_to_baud_rate;
+static int hf_bthci_mws_from_baud_rate;
+static int hf_bthci_mws_number_of_frequencies;
+static int hf_bthci_mws_scan_frequency_table;
+static int hf_bthci_mws_scan_frequency_table_item;
+static int hf_bthci_mws_scan_frequency_table_item_low;
+static int hf_bthci_mws_scan_frequency_table_item_high;
+static int hf_bthci_mws_pattern_index;
+static int hf_bthci_mws_pattern_number_of_intervals;
+static int hf_bthci_mws_patterns;
+static int hf_bthci_mws_pattern;
+static int hf_bthci_mws_pattern_duration;
+static int hf_bthci_mws_pattern_type;
+static int hf_bthci_cmd_sync_train_to;
+static int hf_bthci_cmd_service_data;
+static int hf_bthci_cmd_secure_connection_host_support;
+static int hf_bthci_cmd_csb_fragment;
+static int hf_bthci_cmd_csb_data_length;
+static int hf_bthci_cmd_csb_data;
+static int hf_bthci_cmd_authenticated_payload_timeout;
+static int hf_bthci_cmd_extended_inquiry_length;
+static int hf_bthci_cmd_min_encryption_key_size;
 
 
 static int * const hfx_bthci_cmd_le_event_mask[] = {
@@ -808,252 +808,252 @@ static int * const hfx_bthci_cmd_packet_type[] = {
     NULL
 };
 
-static expert_field ei_command_undecoded                              = EI_INIT;
-static expert_field ei_command_unknown_command                        = EI_INIT;
-static expert_field ei_command_parameter_unexpected                   = EI_INIT;
+static expert_field ei_command_undecoded;
+static expert_field ei_command_unknown_command;
+static expert_field ei_command_parameter_unexpected;
 
 static dissector_table_t vendor_dissector_table;
 static dissector_table_t hci_vendor_table;
 
 /* Initialize the subtree pointers */
-static gint ett_bthci_cmd = -1;
-static gint ett_opcode = -1;
-static gint ett_cod_mask = -1;
-static gint ett_flow_spec_subtree = -1;
-static gint ett_le_channel_map = -1;
-static gint ett_le_event_mask = -1;
-static gint ett_adv_properties = -1;
-static gint ett_adv_sets = -1;
-static gint ett_phys_flags = -1;
-static gint ett_phy_param = -1;
-static gint ett_sync_cte_type = -1;
-static gint ett_coding_format = -1;
-static gint ett_packet_type = -1;
-static gint ett_sco_packet_type = -1;
-static gint ett_periods = -1;
-static gint ett_period = -1;
-static gint ett_table = -1;
-static gint ett_table_item = -1;
-static gint ett_patterns = -1;
-static gint ett_pattern = -1;
-static gint ett_cis_params = -1;
-static gint ett_addr_change_reasons = -1;
-static gint ett_adv_subevents = -1;
-
-static gint proto_btcommon = -1;
-static gint hf_btcommon_eir_ad_entry = -1;
-static gint hf_btcommon_eir_ad_advertising_data = -1;
-static gint hf_btcommon_eir_ad_extended_inquiry_response_data = -1;
-static gint hf_btcommon_eir_ad_unused = -1;
-static gint hf_btcommon_eir_ad_data = -1;
-static gint hf_btcommon_eir_ad_length = -1;
-static gint hf_btcommon_eir_ad_type = -1;
-static gint hf_btcommon_eir_ad_company_id = -1;
-static gint hf_btcommon_eir_ad_flags_reserved = -1;
-static gint hf_btcommon_eir_ad_flags_le_bredr_support_host = -1;
-static gint hf_btcommon_eir_ad_flags_le_bredr_support_controller = -1;
-static gint hf_btcommon_eir_ad_flags_bredr_not_support = -1;
-static gint hf_btcommon_eir_ad_flags_le_general_discoverable_mode = -1;
-static gint hf_btcommon_eir_ad_flags_le_limited_discoverable_mode = -1;
-static gint hf_btcommon_eir_ad_uuid_16 = -1;
-static gint hf_btcommon_eir_ad_uuid_32 = -1;
-static gint hf_btcommon_eir_ad_uuid_128 = -1;
-static gint hf_btcommon_eir_ad_custom_uuid_32 = -1;
-static gint hf_btcommon_eir_ad_custom_uuid_128 = -1;
-static gint hf_btcommon_eir_ad_name = -1;
-static gint hf_btcommon_eir_ad_tx_power = -1;
-static gint hf_btcommon_eir_ad_ssp_oob_length = -1;
-static gint hf_btcommon_eir_ad_bd_addr = -1;
-static gint hf_btcommon_eir_ad_le_bd_addr_reserved = -1;
-static gint hf_btcommon_eir_ad_le_bd_addr_type = -1;
-static gint hf_btcommon_eir_ad_le_role = -1;
-static gint hf_btcommon_eir_ad_service_data = -1;
-static gint hf_btcommon_eir_ad_did_vendor_id = -1;
-static gint hf_btcommon_eir_ad_did_vendor_id_bluetooth_sig = -1;
-static gint hf_btcommon_eir_ad_did_vendor_id_usb_forum = -1;
-static gint hf_btcommon_eir_ad_did_product_id = -1;
-static gint hf_btcommon_eir_ad_did_version = -1;
-static gint hf_btcommon_eir_ad_did_vendor_id_source = -1;
-static gint hf_btcommon_eir_ad_3ds_association_notification = -1;
-static gint hf_btcommon_eir_ad_3ds_battery_level_reporting = -1;
-static gint hf_btcommon_eir_ad_3ds_send_battery_level_report_on_startup = -1;
-static gint hf_btcommon_eir_ad_3ds_reserved = -1;
-static gint hf_btcommon_eir_ad_3ds_factory_test_mode = -1;
-static gint hf_btcommon_eir_ad_3ds_path_loss_threshold = -1;
-static gint hf_btcommon_eir_ad_3ds_legacy_fixed = -1;
-static gint hf_btcommon_eir_ad_3ds_legacy_3d_capable_tv = -1;
-static gint hf_btcommon_eir_ad_3ds_legacy_ignored_1_3 = -1;
-static gint hf_btcommon_eir_ad_3ds_legacy_fixed_4 = -1;
-static gint hf_btcommon_eir_ad_3ds_legacy_ignored_5 = -1;
-static gint hf_btcommon_eir_ad_3ds_legacy_fixed_6 = -1;
-static gint hf_btcommon_eir_ad_3ds_legacy_test_mode = -1;
-static gint hf_btcommon_eir_ad_3ds_legacy_path_loss_threshold = -1;
-static gint hf_btcommon_eir_ad_advertising_interval = -1;
-static gint hf_btcommon_eir_ad_appearance = -1;
-static gint hf_btcommon_eir_ad_hash_c = -1;
-static gint hf_btcommon_eir_ad_randomizer_r = -1;
-static gint hf_btcommon_eir_ad_le_secure_confirmation_value = -1;
-static gint hf_btcommon_eir_ad_le_secure_random_value = -1;
-static gint hf_btcommon_eir_ad_oob_flags_data_present = -1;
-static gint hf_btcommon_eir_ad_oob_flags_le_supported_host = -1;
-static gint hf_btcommon_eir_ad_oob_flags_le_bredr_support = -1;
-static gint hf_btcommon_eir_ad_oob_flags_address_type = -1;
-static gint hf_btcommon_eir_ad_oob_flags_reserved = -1;
-static gint hf_btcommon_eir_ad_connection_interval_min = -1;
-static gint hf_btcommon_eir_ad_connection_interval_max = -1;
-static gint hf_btcommon_eir_ad_uri = -1;
-static gint hf_btcommon_eir_ad_ips_flags = -1;
-static gint hf_btcommon_eir_ad_ips_flags_reserved = -1;
-static gint hf_btcommon_eir_ad_ips_flags_location_name = -1;
-static gint hf_btcommon_eir_ad_ips_flags_uncertainty = -1;
-static gint hf_btcommon_eir_ad_ips_flags_floor_number = -1;
-static gint hf_btcommon_eir_ad_ips_flags_altitude = -1;
-static gint hf_btcommon_eir_ad_ips_flags_tx_power = -1;
-static gint hf_btcommon_eir_ad_ips_flags_coordinate_system = -1;
-static gint hf_btcommon_eir_ad_ips_flags_coordinates = -1;
-static gint hf_btcommon_eir_ad_ips_uncertainty = -1;
-static gint hf_btcommon_eir_ad_ips_uncertainty_reserved = -1;
-static gint hf_btcommon_eir_ad_ips_uncertainty_precision = -1;
-static gint hf_btcommon_eir_ad_ips_uncertainty_update_time = -1;
-static gint hf_btcommon_eir_ad_ips_uncertainty_stationary = -1;
-static gint hf_btcommon_eir_ad_ips_latitude = -1;
-static gint hf_btcommon_eir_ad_ips_longitude = -1;
-static gint hf_btcommon_eir_ad_ips_local_north_coordinate = -1;
-static gint hf_btcommon_eir_ad_ips_local_east_coordinate = -1;
-static gint hf_btcommon_eir_ad_ips_tx_power_level = -1;
-static gint hf_btcommon_eir_ad_ips_floor_number = -1;
-static gint hf_btcommon_eir_ad_ips_altitude = -1;
-static gint hf_btcommon_eir_ad_tds_organization_id = -1;
-static gint hf_btcommon_eir_ad_tds_flags = -1;
-static gint hf_btcommon_eir_ad_tds_flags_reserved = -1;
-static gint hf_btcommon_eir_ad_tds_flags_transport_state = -1;
-static gint hf_btcommon_eir_ad_tds_flags_transport_data_incomplete = -1;
-static gint hf_btcommon_eir_ad_tds_flags_role = -1;
-static gint hf_btcommon_eir_ad_tds_data_length = -1;
-static gint hf_btcommon_eir_ad_tds_data = -1;
-static gint hf_btcommon_eir_ad_le_features = -1;
-static gint hf_btcommon_eir_ad_le_channel_map = -1;
-static gint hf_btcommon_eir_ad_instant = -1;
-static gint hf_btcommon_eir_ad_le_features_encryption = -1;
-static gint hf_btcommon_eir_ad_le_features_connection_parameters_request_procedure = -1;
-static gint hf_btcommon_eir_ad_le_features_extended_reject_indication = -1;
-static gint hf_btcommon_eir_ad_le_features_peripheral_initiated_features_exchange = -1;
-static gint hf_btcommon_eir_ad_le_features_ping = -1;
-static gint hf_btcommon_eir_ad_le_features_data_packet_length_extension = -1;
-static gint hf_btcommon_eir_ad_le_features_ll_privacy = -1;
-static gint hf_btcommon_eir_ad_le_features_extended_scanner_filter_policies = -1;
-static gint hf_btcommon_eir_ad_le_features_2m_phy = -1;
-static gint hf_btcommon_eir_ad_le_features_stable_modulation_index_tx =-1;
-static gint hf_btcommon_eir_ad_le_features_stable_modulation_index_rx = -1;
-static gint hf_btcommon_eir_ad_le_features_coded_phy = -1;
-static gint hf_btcommon_eir_ad_le_features_extended_advertising = -1;
-static gint hf_btcommon_eir_ad_le_features_periodic_advertising = -1;
-static gint hf_btcommon_eir_ad_le_features_channel_selection_algorithm_2 = -1;
-static gint hf_btcommon_eir_ad_le_features_power_class_1 = -1;
-static gint hf_btcommon_eir_ad_le_features_minimum_number_of_used_channels_procedure = -1;
-static gint hf_btcommon_eir_ad_le_features_reserved_1_7 = -1;
-static gint hf_btcommon_eir_ad_le_features_reserved = -1;
-static gint hf_btcommon_eir_ad_biginfo_big_offset = -1;
-static gint hf_btcommon_eir_ad_biginfo_big_offset_units = -1;
-static gint hf_btcommon_eir_ad_biginfo_iso_interval = -1;
-static gint hf_btcommon_eir_ad_biginfo_num_bis = -1;
-static gint hf_btcommon_eir_ad_biginfo_nse = -1;
-static gint hf_btcommon_eir_ad_biginfo_bn = -1;
-static gint hf_btcommon_eir_ad_biginfo_sub_interval = -1;
-static gint hf_btcommon_eir_ad_biginfo_pto = -1;
-static gint hf_btcommon_eir_ad_biginfo_bis_spacing = -1;
-static gint hf_btcommon_eir_ad_biginfo_irc = -1;
-static gint hf_btcommon_eir_ad_biginfo_max_pdu = -1;
-static gint hf_btcommon_eir_ad_biginfo_rfu = -1;
-static gint hf_btcommon_eir_ad_biginfo_seed_access_address = -1;
-static gint hf_btcommon_eir_ad_biginfo_sdu_interval = -1;
-static gint hf_btcommon_eir_ad_biginfo_max_sdu = -1;
-static gint hf_btcommon_eir_ad_biginfo_base_crc_init = -1;
-static gint hf_btcommon_eir_ad_biginfo_channel_map = -1;
-static gint hf_btcommon_eir_ad_biginfo_phy = -1;
-static gint hf_btcommon_eir_ad_biginfo_bis_payload_count = -1;
-static gint hf_btcommon_eir_ad_biginfo_framing = -1;
-static gint hf_btcommon_eir_ad_biginfo_giv = -1;
-static gint hf_btcommon_eir_ad_biginfo_gskd = -1;
-static gint hf_btcommon_eir_ad_biginfo_big_control_access_address = -1;
-static gint hf_btcommon_eir_ad_biginfo_bis_access_address = -1;
-static gint hf_btcommon_eir_ad_broadcast_code = -1;
-static gint hf_btcommon_eir_ad_rsi = -1;
-static gint hf_btcommon_eir_ad_broadcast_name = -1;
-
-static gint hf_btcommon_cod_class_of_device = -1;
-static gint hf_btcommon_cod_format_type = -1;
-static gint hf_btcommon_cod_major_service_class_information = -1;
-static gint hf_btcommon_cod_major_service_class_telephony = -1;
-static gint hf_btcommon_cod_major_service_class_audio = -1;
-static gint hf_btcommon_cod_major_service_class_object_transfer = -1;
-static gint hf_btcommon_cod_major_service_class_capturing = -1;
-static gint hf_btcommon_cod_major_service_class_rendering = -1;
-static gint hf_btcommon_cod_major_service_class_networking = -1;
-static gint hf_btcommon_cod_major_service_class_positioning = -1;
-static gint hf_btcommon_cod_major_service_class_reserved = -1;
-static gint hf_btcommon_cod_major_service_class_le_audio = -1;
-static gint hf_btcommon_cod_major_service_class_limited_discoverable_mode = -1;
-static gint hf_btcommon_cod_major_device_class = -1;
-static gint hf_btcommon_cod_minor_device_class_computer = -1;
-static gint hf_btcommon_cod_minor_device_class_phone = -1;
-static gint hf_btcommon_cod_minor_device_class_lan_net_load_factor = -1;
-static gint hf_btcommon_cod_minor_device_class_lan_net_type = -1;
-static gint hf_btcommon_cod_minor_device_class_audio_video = -1;
-static gint hf_btcommon_cod_minor_device_class_peripheral_class = -1;
-static gint hf_btcommon_cod_minor_device_class_peripheral_type = -1;
-static gint hf_btcommon_cod_minor_device_class_imaging_class_printer = -1;
-static gint hf_btcommon_cod_minor_device_class_imaging_class_scanner = -1;
-static gint hf_btcommon_cod_minor_device_class_imaging_class_camera = -1;
-static gint hf_btcommon_cod_minor_device_class_imaging_class_display = -1;
-static gint hf_btcommon_cod_minor_device_class_imaging_type = -1;
-static gint hf_btcommon_cod_minor_device_class_wearable = -1;
-static gint hf_btcommon_cod_minor_device_class_toy = -1;
-static gint hf_btcommon_cod_minor_device_class_health = -1;
-static gint hf_btcommon_cod_minor_device_class_unknown = -1;
-static gint hf_btcommon_le_channel_map_0 = -1;
-static gint hf_btcommon_le_channel_map_1 = -1;
-static gint hf_btcommon_le_channel_map_2 = -1;
-static gint hf_btcommon_le_channel_map_3 = -1;
-static gint hf_btcommon_le_channel_map_4 = -1;
-static gint hf_btcommon_le_channel_map_5 = -1;
-static gint hf_btcommon_le_channel_map_6 = -1;
-static gint hf_btcommon_le_channel_map_7 = -1;
-static gint hf_btcommon_le_channel_map_8 = -1;
-static gint hf_btcommon_le_channel_map_9 = -1;
-static gint hf_btcommon_le_channel_map_10 = -1;
-static gint hf_btcommon_le_channel_map_11 = -1;
-static gint hf_btcommon_le_channel_map_12 = -1;
-static gint hf_btcommon_le_channel_map_13 = -1;
-static gint hf_btcommon_le_channel_map_14 = -1;
-static gint hf_btcommon_le_channel_map_15 = -1;
-static gint hf_btcommon_le_channel_map_16 = -1;
-static gint hf_btcommon_le_channel_map_17 = -1;
-static gint hf_btcommon_le_channel_map_18 = -1;
-static gint hf_btcommon_le_channel_map_19 = -1;
-static gint hf_btcommon_le_channel_map_20 = -1;
-static gint hf_btcommon_le_channel_map_21 = -1;
-static gint hf_btcommon_le_channel_map_22 = -1;
-static gint hf_btcommon_le_channel_map_23 = -1;
-static gint hf_btcommon_le_channel_map_24 = -1;
-static gint hf_btcommon_le_channel_map_25 = -1;
-static gint hf_btcommon_le_channel_map_26 = -1;
-static gint hf_btcommon_le_channel_map_27 = -1;
-static gint hf_btcommon_le_channel_map_28 = -1;
-static gint hf_btcommon_le_channel_map_29 = -1;
-static gint hf_btcommon_le_channel_map_30 = -1;
-static gint hf_btcommon_le_channel_map_31 = -1;
-static gint hf_btcommon_le_channel_map_32 = -1;
-static gint hf_btcommon_le_channel_map_33 = -1;
-static gint hf_btcommon_le_channel_map_34 = -1;
-static gint hf_btcommon_le_channel_map_35 = -1;
-static gint hf_btcommon_le_channel_map_36 = -1;
-static gint hf_btcommon_le_channel_map_37 = -1;
-static gint hf_btcommon_le_channel_map_38 = -1;
-static gint hf_btcommon_le_channel_map_39 = -1;
-static gint hf_btcommon_eir_ad_mesh_msg = -1;
-static gint hf_btcommon_eir_ad_mesh_pbadv = -1;
-static gint hf_btcommon_eir_ad_mesh_beacon = -1;
+static gint ett_bthci_cmd;
+static gint ett_opcode;
+static gint ett_cod_mask;
+static gint ett_flow_spec_subtree;
+static gint ett_le_channel_map;
+static gint ett_le_event_mask;
+static gint ett_adv_properties;
+static gint ett_adv_sets;
+static gint ett_phys_flags;
+static gint ett_phy_param;
+static gint ett_sync_cte_type;
+static gint ett_coding_format;
+static gint ett_packet_type;
+static gint ett_sco_packet_type;
+static gint ett_periods;
+static gint ett_period;
+static gint ett_table;
+static gint ett_table_item;
+static gint ett_patterns;
+static gint ett_pattern;
+static gint ett_cis_params;
+static gint ett_addr_change_reasons;
+static gint ett_adv_subevents;
+
+static gint proto_btcommon;
+static gint hf_btcommon_eir_ad_entry;
+static gint hf_btcommon_eir_ad_advertising_data;
+static gint hf_btcommon_eir_ad_extended_inquiry_response_data;
+static gint hf_btcommon_eir_ad_unused;
+static gint hf_btcommon_eir_ad_data;
+static gint hf_btcommon_eir_ad_length;
+static gint hf_btcommon_eir_ad_type;
+static gint hf_btcommon_eir_ad_company_id;
+static gint hf_btcommon_eir_ad_flags_reserved;
+static gint hf_btcommon_eir_ad_flags_le_bredr_support_host;
+static gint hf_btcommon_eir_ad_flags_le_bredr_support_controller;
+static gint hf_btcommon_eir_ad_flags_bredr_not_support;
+static gint hf_btcommon_eir_ad_flags_le_general_discoverable_mode;
+static gint hf_btcommon_eir_ad_flags_le_limited_discoverable_mode;
+static gint hf_btcommon_eir_ad_uuid_16;
+static gint hf_btcommon_eir_ad_uuid_32;
+static gint hf_btcommon_eir_ad_uuid_128;
+static gint hf_btcommon_eir_ad_custom_uuid_32;
+static gint hf_btcommon_eir_ad_custom_uuid_128;
+static gint hf_btcommon_eir_ad_name;
+static gint hf_btcommon_eir_ad_tx_power;
+static gint hf_btcommon_eir_ad_ssp_oob_length;
+static gint hf_btcommon_eir_ad_bd_addr;
+static gint hf_btcommon_eir_ad_le_bd_addr_reserved;
+static gint hf_btcommon_eir_ad_le_bd_addr_type;
+static gint hf_btcommon_eir_ad_le_role;
+static gint hf_btcommon_eir_ad_service_data;
+static gint hf_btcommon_eir_ad_did_vendor_id;
+static gint hf_btcommon_eir_ad_did_vendor_id_bluetooth_sig;
+static gint hf_btcommon_eir_ad_did_vendor_id_usb_forum;
+static gint hf_btcommon_eir_ad_did_product_id;
+static gint hf_btcommon_eir_ad_did_version;
+static gint hf_btcommon_eir_ad_did_vendor_id_source;
+static gint hf_btcommon_eir_ad_3ds_association_notification;
+static gint hf_btcommon_eir_ad_3ds_battery_level_reporting;
+static gint hf_btcommon_eir_ad_3ds_send_battery_level_report_on_startup;
+static gint hf_btcommon_eir_ad_3ds_reserved;
+static gint hf_btcommon_eir_ad_3ds_factory_test_mode;
+static gint hf_btcommon_eir_ad_3ds_path_loss_threshold;
+static gint hf_btcommon_eir_ad_3ds_legacy_fixed;
+static gint hf_btcommon_eir_ad_3ds_legacy_3d_capable_tv;
+static gint hf_btcommon_eir_ad_3ds_legacy_ignored_1_3;
+static gint hf_btcommon_eir_ad_3ds_legacy_fixed_4;
+static gint hf_btcommon_eir_ad_3ds_legacy_ignored_5;
+static gint hf_btcommon_eir_ad_3ds_legacy_fixed_6;
+static gint hf_btcommon_eir_ad_3ds_legacy_test_mode;
+static gint hf_btcommon_eir_ad_3ds_legacy_path_loss_threshold;
+static gint hf_btcommon_eir_ad_advertising_interval;
+static gint hf_btcommon_eir_ad_appearance;
+static gint hf_btcommon_eir_ad_hash_c;
+static gint hf_btcommon_eir_ad_randomizer_r;
+static gint hf_btcommon_eir_ad_le_secure_confirmation_value;
+static gint hf_btcommon_eir_ad_le_secure_random_value;
+static gint hf_btcommon_eir_ad_oob_flags_data_present;
+static gint hf_btcommon_eir_ad_oob_flags_le_supported_host;
+static gint hf_btcommon_eir_ad_oob_flags_le_bredr_support;
+static gint hf_btcommon_eir_ad_oob_flags_address_type;
+static gint hf_btcommon_eir_ad_oob_flags_reserved;
+static gint hf_btcommon_eir_ad_connection_interval_min;
+static gint hf_btcommon_eir_ad_connection_interval_max;
+static gint hf_btcommon_eir_ad_uri;
+static gint hf_btcommon_eir_ad_ips_flags;
+static gint hf_btcommon_eir_ad_ips_flags_reserved;
+static gint hf_btcommon_eir_ad_ips_flags_location_name;
+static gint hf_btcommon_eir_ad_ips_flags_uncertainty;
+static gint hf_btcommon_eir_ad_ips_flags_floor_number;
+static gint hf_btcommon_eir_ad_ips_flags_altitude;
+static gint hf_btcommon_eir_ad_ips_flags_tx_power;
+static gint hf_btcommon_eir_ad_ips_flags_coordinate_system;
+static gint hf_btcommon_eir_ad_ips_flags_coordinates;
+static gint hf_btcommon_eir_ad_ips_uncertainty;
+static gint hf_btcommon_eir_ad_ips_uncertainty_reserved;
+static gint hf_btcommon_eir_ad_ips_uncertainty_precision;
+static gint hf_btcommon_eir_ad_ips_uncertainty_update_time;
+static gint hf_btcommon_eir_ad_ips_uncertainty_stationary;
+static gint hf_btcommon_eir_ad_ips_latitude;
+static gint hf_btcommon_eir_ad_ips_longitude;
+static gint hf_btcommon_eir_ad_ips_local_north_coordinate;
+static gint hf_btcommon_eir_ad_ips_local_east_coordinate;
+static gint hf_btcommon_eir_ad_ips_tx_power_level;
+static gint hf_btcommon_eir_ad_ips_floor_number;
+static gint hf_btcommon_eir_ad_ips_altitude;
+static gint hf_btcommon_eir_ad_tds_organization_id;
+static gint hf_btcommon_eir_ad_tds_flags;
+static gint hf_btcommon_eir_ad_tds_flags_reserved;
+static gint hf_btcommon_eir_ad_tds_flags_transport_state;
+static gint hf_btcommon_eir_ad_tds_flags_transport_data_incomplete;
+static gint hf_btcommon_eir_ad_tds_flags_role;
+static gint hf_btcommon_eir_ad_tds_data_length;
+static gint hf_btcommon_eir_ad_tds_data;
+static gint hf_btcommon_eir_ad_le_features;
+static gint hf_btcommon_eir_ad_le_channel_map;
+static gint hf_btcommon_eir_ad_instant;
+static gint hf_btcommon_eir_ad_le_features_encryption;
+static gint hf_btcommon_eir_ad_le_features_connection_parameters_request_procedure;
+static gint hf_btcommon_eir_ad_le_features_extended_reject_indication;
+static gint hf_btcommon_eir_ad_le_features_peripheral_initiated_features_exchange;
+static gint hf_btcommon_eir_ad_le_features_ping;
+static gint hf_btcommon_eir_ad_le_features_data_packet_length_extension;
+static gint hf_btcommon_eir_ad_le_features_ll_privacy;
+static gint hf_btcommon_eir_ad_le_features_extended_scanner_filter_policies;
+static gint hf_btcommon_eir_ad_le_features_2m_phy;
+static gint hf_btcommon_eir_ad_le_features_stable_modulation_index_tx;
+static gint hf_btcommon_eir_ad_le_features_stable_modulation_index_rx;
+static gint hf_btcommon_eir_ad_le_features_coded_phy;
+static gint hf_btcommon_eir_ad_le_features_extended_advertising;
+static gint hf_btcommon_eir_ad_le_features_periodic_advertising;
+static gint hf_btcommon_eir_ad_le_features_channel_selection_algorithm_2;
+static gint hf_btcommon_eir_ad_le_features_power_class_1;
+static gint hf_btcommon_eir_ad_le_features_minimum_number_of_used_channels_procedure;
+static gint hf_btcommon_eir_ad_le_features_reserved_1_7;
+static gint hf_btcommon_eir_ad_le_features_reserved;
+static gint hf_btcommon_eir_ad_biginfo_big_offset;
+static gint hf_btcommon_eir_ad_biginfo_big_offset_units;
+static gint hf_btcommon_eir_ad_biginfo_iso_interval;
+static gint hf_btcommon_eir_ad_biginfo_num_bis;
+static gint hf_btcommon_eir_ad_biginfo_nse;
+static gint hf_btcommon_eir_ad_biginfo_bn;
+static gint hf_btcommon_eir_ad_biginfo_sub_interval;
+static gint hf_btcommon_eir_ad_biginfo_pto;
+static gint hf_btcommon_eir_ad_biginfo_bis_spacing;
+static gint hf_btcommon_eir_ad_biginfo_irc;
+static gint hf_btcommon_eir_ad_biginfo_max_pdu;
+static gint hf_btcommon_eir_ad_biginfo_rfu;
+static gint hf_btcommon_eir_ad_biginfo_seed_access_address;
+static gint hf_btcommon_eir_ad_biginfo_sdu_interval;
+static gint hf_btcommon_eir_ad_biginfo_max_sdu;
+static gint hf_btcommon_eir_ad_biginfo_base_crc_init;
+static gint hf_btcommon_eir_ad_biginfo_channel_map;
+static gint hf_btcommon_eir_ad_biginfo_phy;
+static gint hf_btcommon_eir_ad_biginfo_bis_payload_count;
+static gint hf_btcommon_eir_ad_biginfo_framing;
+static gint hf_btcommon_eir_ad_biginfo_giv;
+static gint hf_btcommon_eir_ad_biginfo_gskd;
+static gint hf_btcommon_eir_ad_biginfo_big_control_access_address;
+static gint hf_btcommon_eir_ad_biginfo_bis_access_address;
+static gint hf_btcommon_eir_ad_broadcast_code;
+static gint hf_btcommon_eir_ad_rsi;
+static gint hf_btcommon_eir_ad_broadcast_name;
+
+static gint hf_btcommon_cod_class_of_device;
+static gint hf_btcommon_cod_format_type;
+static gint hf_btcommon_cod_major_service_class_information;
+static gint hf_btcommon_cod_major_service_class_telephony;
+static gint hf_btcommon_cod_major_service_class_audio;
+static gint hf_btcommon_cod_major_service_class_object_transfer;
+static gint hf_btcommon_cod_major_service_class_capturing;
+static gint hf_btcommon_cod_major_service_class_rendering;
+static gint hf_btcommon_cod_major_service_class_networking;
+static gint hf_btcommon_cod_major_service_class_positioning;
+static gint hf_btcommon_cod_major_service_class_reserved;
+static gint hf_btcommon_cod_major_service_class_le_audio;
+static gint hf_btcommon_cod_major_service_class_limited_discoverable_mode;
+static gint hf_btcommon_cod_major_device_class;
+static gint hf_btcommon_cod_minor_device_class_computer;
+static gint hf_btcommon_cod_minor_device_class_phone;
+static gint hf_btcommon_cod_minor_device_class_lan_net_load_factor;
+static gint hf_btcommon_cod_minor_device_class_lan_net_type;
+static gint hf_btcommon_cod_minor_device_class_audio_video;
+static gint hf_btcommon_cod_minor_device_class_peripheral_class;
+static gint hf_btcommon_cod_minor_device_class_peripheral_type;
+static gint hf_btcommon_cod_minor_device_class_imaging_class_printer;
+static gint hf_btcommon_cod_minor_device_class_imaging_class_scanner;
+static gint hf_btcommon_cod_minor_device_class_imaging_class_camera;
+static gint hf_btcommon_cod_minor_device_class_imaging_class_display;
+static gint hf_btcommon_cod_minor_device_class_imaging_type;
+static gint hf_btcommon_cod_minor_device_class_wearable;
+static gint hf_btcommon_cod_minor_device_class_toy;
+static gint hf_btcommon_cod_minor_device_class_health;
+static gint hf_btcommon_cod_minor_device_class_unknown;
+static gint hf_btcommon_le_channel_map_0;
+static gint hf_btcommon_le_channel_map_1;
+static gint hf_btcommon_le_channel_map_2;
+static gint hf_btcommon_le_channel_map_3;
+static gint hf_btcommon_le_channel_map_4;
+static gint hf_btcommon_le_channel_map_5;
+static gint hf_btcommon_le_channel_map_6;
+static gint hf_btcommon_le_channel_map_7;
+static gint hf_btcommon_le_channel_map_8;
+static gint hf_btcommon_le_channel_map_9;
+static gint hf_btcommon_le_channel_map_10;
+static gint hf_btcommon_le_channel_map_11;
+static gint hf_btcommon_le_channel_map_12;
+static gint hf_btcommon_le_channel_map_13;
+static gint hf_btcommon_le_channel_map_14;
+static gint hf_btcommon_le_channel_map_15;
+static gint hf_btcommon_le_channel_map_16;
+static gint hf_btcommon_le_channel_map_17;
+static gint hf_btcommon_le_channel_map_18;
+static gint hf_btcommon_le_channel_map_19;
+static gint hf_btcommon_le_channel_map_20;
+static gint hf_btcommon_le_channel_map_21;
+static gint hf_btcommon_le_channel_map_22;
+static gint hf_btcommon_le_channel_map_23;
+static gint hf_btcommon_le_channel_map_24;
+static gint hf_btcommon_le_channel_map_25;
+static gint hf_btcommon_le_channel_map_26;
+static gint hf_btcommon_le_channel_map_27;
+static gint hf_btcommon_le_channel_map_28;
+static gint hf_btcommon_le_channel_map_29;
+static gint hf_btcommon_le_channel_map_30;
+static gint hf_btcommon_le_channel_map_31;
+static gint hf_btcommon_le_channel_map_32;
+static gint hf_btcommon_le_channel_map_33;
+static gint hf_btcommon_le_channel_map_34;
+static gint hf_btcommon_le_channel_map_35;
+static gint hf_btcommon_le_channel_map_36;
+static gint hf_btcommon_le_channel_map_37;
+static gint hf_btcommon_le_channel_map_38;
+static gint hf_btcommon_le_channel_map_39;
+static gint hf_btcommon_eir_ad_mesh_msg;
+static gint hf_btcommon_eir_ad_mesh_pbadv;
+static gint hf_btcommon_eir_ad_mesh_beacon;
 
 static int * const hfx_btcommon_eir_ad_ips_flags[] = {
     &hf_btcommon_eir_ad_ips_flags_reserved,
@@ -1129,16 +1129,16 @@ static int * const *hfx_btcommon_eir_ad_le_features[] = {
     hfx_btcommon_eir_ad_le_features_reserved
 };
 
-static gint ett_cod = -1;
-static gint ett_eir_ad = -1;
-static gint ett_eir_ad_entry = -1;
-static gint ett_eir_ad_le_features = -1;
-static gint ett_eir_ad_biginfo_seedaa = -1;
+static gint ett_cod;
+static gint ett_eir_ad;
+static gint ett_eir_ad_entry;
+static gint ett_eir_ad_le_features;
+static gint ett_eir_ad_biginfo_seedaa;
 
-static expert_field ei_eir_ad_undecoded                               = EI_INIT;
-static expert_field ei_eir_ad_unknown                                 = EI_INIT;
-static expert_field ei_eir_ad_not_used                                = EI_INIT;
-static expert_field ei_eir_ad_invalid_length                          = EI_INIT;
+static expert_field ei_eir_ad_undecoded;
+static expert_field ei_eir_ad_unknown;
+static expert_field ei_eir_ad_not_used;
+static expert_field ei_eir_ad_invalid_length;
 
 static dissector_handle_t btcommon_cod_handle;
 static dissector_handle_t btcommon_eir_handle;
diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index 970a9df695..f53ad01d57 100644
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -47,559 +47,559 @@ static dissector_handle_t btcommon_ad_handle;
 static dissector_handle_t btcommon_le_channel_map_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_bthci_evt = -1;
-static int hf_bthci_evt_code = -1;
-static int hf_bthci_evt_param_length = -1;
-static int hf_bthci_evt_num_command_packets = -1;
-static int hf_bthci_evt_num_handles = -1;
-static int hf_bthci_evt_connection_handle = -1;
-static int hf_bthci_evt_num_compl_packets = -1;
-static int hf_bthci_evt_ret_params = -1;
-static int hf_bthci_evt_status = -1;
-static int hf_bthci_evt_status_pending = -1;
-static int hf_bthci_evt_opcode = -1;
-static int hf_bthci_evt_ogf = -1;
-static int hf_bthci_evt_ocf = -1;
-static int hf_bthci_evt_ocf_link_control = -1;
-static int hf_bthci_evt_ocf_link_policy = -1;
-static int hf_bthci_evt_ocf_host_controller_and_baseband = -1;
-static int hf_bthci_evt_ocf_informational = -1;
-static int hf_bthci_evt_ocf_status = -1;
-static int hf_bthci_evt_ocf_testing = -1;
-static int hf_bthci_evt_ocf_logo_testing = -1;
-static int hf_bthci_evt_ocf_low_energy = -1;
-static int hf_bthci_evt_bd_addr = -1;
-static int hf_bthci_evt_link_type = -1;
-static int hf_bthci_evt_encryption_mode = -1;
-static int hf_bthci_evt_reason = -1;
-static int hf_bthci_evt_remote_name = -1;
-static int hf_bthci_evt_encryption_enable = -1;
-static int hf_bthci_evt_key_flag = -1;
-static int hf_bthci_evt_vers_nr = -1;
-static int hf_bthci_bthci_evt_hci_version = -1;
-static int hf_bthci_evt_hci_revision = -1;
-static int hf_bthci_evt_comp_id = -1;
-static int hf_bthci_evt_sub_vers_nr = -1;
-static int hf_bthci_evt_flags = -1;
-static int hf_bthci_evt_service_type = -1;
-static int hf_bthci_evt_token_rate = -1;
-static int hf_bthci_evt_peak_bandwidth = -1;
-static int hf_bthci_evt_latency = -1;
-static int hf_bthci_evt_delay_variation = -1;
-static int hf_bthci_evt_hardware_code = -1;
-static int hf_bthci_evt_role = -1;
-static int hf_bthci_evt_curr_role = -1;
-static int hf_bthci_evt_curr_mode = -1;
-static int hf_bthci_evt_interval = -1;
-static int hf_bthci_evt_link_key = -1;
-static int hf_bthci_evt_key_type = -1;
-static int hf_bthci_evt_max_slots = -1;
-static int hf_bthci_evt_clock_offset = -1;
-static int hf_bthci_evt_clock_offset_32 = -1;
-static int hf_bthci_evt_page_scan_mode = -1;
-static int hf_bthci_evt_page_scan_repetition_mode = -1;
-static int hf_bthci_evt_reserved = -1;
-static int hf_bthci_evt_page_scan_period_mode = -1;
-static int hf_bthci_evt_num_keys = -1;
-static int hf_bthci_evt_num_keys_read = -1;
-static int hf_bthci_evt_max_num_keys = -1;
-static int hf_bthci_evt_num_responses = -1;
-static int hf_bthci_evt_num_keys_written = -1;
-static int hf_bthci_evt_num_keys_deleted = -1;
-static int hf_bthci_evt_link_policy_setting_switch = -1;
-static int hf_bthci_evt_link_policy_setting_hold = -1;
-static int hf_bthci_evt_link_policy_setting_sniff = -1;
-static int hf_bthci_evt_link_policy_setting_park = -1;
-static int hf_bthci_evt_pin_type = -1;
-static int hf_bthci_evt_device_name = -1;
-static int hf_bthci_evt_timeout = -1;
-static int hf_bthci_evt_scan_enable = -1;
-static int hf_bthci_evt_authentication_enable = -1;
-static int hf_bthci_evt_sco_flow_cont_enable = -1;
-static int hf_bthci_evt_window = -1;
-static int hf_bthci_evt_input_unused = -1;
-static int hf_bthci_evt_input_coding = -1;
-static int hf_bthci_evt_input_data_format = -1;
-static int hf_bthci_evt_input_sample_size = -1;
-static int hf_bthci_evt_linear_pcm_bit_pos = -1;
-static int hf_bthci_evt_air_coding_format = -1;
-static int hf_bthci_evt_num_broadcast_retransm = -1;
-static int hf_bthci_evt_hold_mode_act_page = -1;
-static int hf_bthci_evt_hold_mode_act_inquiry = -1;
-static int hf_bthci_evt_hold_mode_act_periodic = -1;
-static int hf_bthci_evt_transmit_power_level = -1;
-static int hf_bthci_evt_max_transmit_power_level = -1;
-static int hf_bthci_evt_transmit_power_level_gfsk = -1;
-static int hf_bthci_evt_transmit_power_level_dqpsk = -1;
-static int hf_bthci_evt_transmit_power_level_8dpsk = -1;
-static int hf_bthci_evt_flush_to_us = -1;
-static int hf_bthci_evt_num_supp_iac = -1;
-static int hf_bthci_evt_num_curr_iac = -1;
-static int hf_bthci_evt_iac_lap = -1;
-static int hf_bthci_evt_loopback_mode = -1;
-static int hf_bthci_evt_country_code = -1;
-static int hf_bthci_evt_failed_contact_counter = -1;
-static int hf_bthci_evt_link_quality = -1;
-static int hf_bthci_evt_rssi = -1;
-static int hf_bthci_evt_host_data_packet_length_acl = -1;
-static int hf_bthci_evt_host_data_packet_length_sco = -1;
-static int hf_bthci_evt_host_total_num_acl_data_packets = -1;
-static int hf_bthci_evt_host_total_num_sco_data_packets = -1;
-static int hf_bthci_evt_page_number = -1;
-static int hf_bthci_evt_max_page_number = -1;
-static int hf_bthci_evt_local_supported_cmds = -1;
-static int hf_bthci_evt_fec_required = -1;
-static int hf_bthci_evt_err_data_reporting = -1;
-static int hf_bthci_evt_scan_type = -1;
-static int hf_bthci_evt_inq_mode = -1;
-static int hf_bthci_evt_power_level_type = -1;
-static int hf_lmp_features = -1;
-static int hf_lmp_feature_3slot_packets = -1;
-static int hf_lmp_feature_5slot_packets = -1;
-static int hf_lmp_feature_encryption = -1;
-static int hf_lmp_feature_slot_offset = -1;
-static int hf_lmp_feature_timing_accuracy = -1;
-static int hf_lmp_feature_role_switch = -1;
-static int hf_lmp_feature_hold_mode = -1;
-static int hf_lmp_feature_sniff_mode = -1;
-static int hf_lmp_feature_park_state = -1;
-static int hf_lmp_feature_power_control_requests = -1;
-static int hf_lmp_feature_channel_quality_driven_data_rate = -1;
-static int hf_lmp_feature_sco_link = -1;
-static int hf_lmp_feature_hv2_packets = -1;
-static int hf_lmp_feature_hv3_packets = -1;
-static int hf_lmp_feature_u_law_log_synchronous_data = -1;
-static int hf_lmp_feature_a_law_log_synchronous_data = -1;
-static int hf_lmp_feature_cvsd_synchronous_data = -1;
-static int hf_lmp_feature_paging_parameter_negotiation = -1;
-static int hf_lmp_feature_power_control = -1;
-static int hf_lmp_feature_transparent_synchronous_data = -1;
-static int hf_lmp_feature_flow_control_lag = -1;
-static int hf_lmp_feature_broadcast_encryption = -1;
-static int hf_lmp_feature_reserved_24 = -1;
-static int hf_lmp_feature_edr_acl_2mbps_mode = -1;
-static int hf_lmp_feature_edr_acl_3mbps_mode = -1;
-static int hf_lmp_feature_enhanced_inquiry_scan = -1;
-static int hf_lmp_feature_interlaced_inquiry_scan = -1;
-static int hf_lmp_feature_interlaced_page_scan = -1;
-static int hf_lmp_feature_rssi_with_inquiry_results = -1;
-static int hf_lmp_feature_ev3_packets = -1;
-static int hf_lmp_feature_ev4_packets = -1;
-static int hf_lmp_feature_ev5_packets = -1;
-static int hf_lmp_feature_reserved_34 = -1;
-static int hf_lmp_feature_afh_capable_peripheral = -1;
-static int hf_lmp_feature_afh_classification_peripheral = -1;
-static int hf_lmp_feature_br_edr_not_supported = -1;
-static int hf_lmp_feature_le_supported_controller = -1;
-static int hf_lmp_feature_3slot_edr_acl_packets = -1;
-static int hf_lmp_feature_5slot_edr_acl_packets = -1;
-static int hf_lmp_feature_sniff_subrating = -1;
-static int hf_lmp_feature_pause_encryption = -1;
-static int hf_lmp_feature_afh_capable_central = -1;
-static int hf_lmp_feature_afh_classification_central = -1;
-static int hf_lmp_feature_edr_esco_2mbps_mode = -1;
-static int hf_lmp_feature_edr_esco_3mbps_mode = -1;
-static int hf_lmp_feature_3slot_edr_esco_packets = -1;
-static int hf_lmp_feature_extended_inquiry_response = -1;
-static int hf_lmp_feature_simultaneous_le_and_br_edr_controller = -1;
-static int hf_lmp_feature_reserved_50 = -1;
-static int hf_lmp_feature_secure_simple_pairing = -1;
-static int hf_lmp_feature_encapsulated_pdu = -1;
-static int hf_lmp_feature_erroneous_data_reporting = -1;
-static int hf_lmp_feature_non_flushable_packet_boundary_flag = -1;
-static int hf_lmp_feature_reserved_55 = -1;
-static int hf_lmp_feature_link_supervision_timeout_changed_event = -1;
-static int hf_lmp_feature_inquiry_tx_power_level = -1;
-static int hf_lmp_feature_enhanced_power_control = -1;
-static int hf_lmp_feature_reserved_59_62 = -1;
-static int hf_lmp_feature_extended_features = -1;
-static int hf_lmp_feature_secure_simple_pairing_host = -1;
-static int hf_lmp_feature_le_supported_host = -1;
-static int hf_lmp_feature_simultaneous_le_and_br_edr_host = -1;
-static int hf_lmp_feature_secure_connections_host = -1;
-static int hf_lmp_feature_reserved_68_71 = -1;
-static int hf_lmp_feature_csb_central_operation = -1;
-static int hf_lmp_feature_csb_peripheral_operation = -1;
-static int hf_lmp_feature_synchronization_train = -1;
-static int hf_lmp_feature_synchronization_scan = -1;
-static int hf_lmp_feature_inquiry_response_notification_event = -1;
-static int hf_lmp_feature_generalized_interlaced_scan = -1;
-static int hf_lmp_feature_coarse_clock_adjustment = -1;
-static int hf_lmp_feature_reserved_135 = -1;
-static int hf_lmp_feature_secure_connections_controller = -1;
-static int hf_lmp_feature_ping = -1;
-static int hf_lmp_feature_reserved_138 = -1;
-static int hf_lmp_feature_train_nudging = -1;
-static int hf_lmp_feature_slot_availability_mask = -1;
-static int hf_lmp_feature_reserved = -1;
-static int hf_bthci_evt_sync_link_type = -1;
-static int hf_bthci_evt_sync_tx_interval = -1;
-static int hf_bthci_evt_sync_rtx_window = -1;
-static int hf_bthci_evt_sync_rx_packet_length = -1;
-static int hf_bthci_evt_sync_tx_packet_length = -1;
-static int hf_bthci_evt_air_mode = -1;
-static int hf_bthci_evt_max_tx_latency = -1;
-static int hf_bthci_evt_max_rx_latency = -1;
-static int hf_bthci_evt_min_remote_timeout = -1;
-static int hf_bthci_evt_min_local_timeout = -1;
-static int hf_bthci_evt_link_supervision_timeout = -1;
-static int hf_bthci_evt_token_bucket_size = -1;
-static int hf_bthci_evt_flow_direction = -1;
-static int hf_bthci_evt_afh_ch_assessment_mode = -1;
-static int hf_bthci_evt_lmp_handle = -1;
-static int hf_bthci_evt_clock = -1;
-static int hf_bthci_evt_clock_accuracy = -1;
-static int hf_bthci_evt_afh_mode = -1;
-static int hf_bthci_evt_afh_channel_map = -1;
-static int hf_bthci_evt_simple_pairing_mode = -1;
-static int hf_bthci_evt_randomizer_r = -1;
-static int hf_bthci_evt_hash_c = -1;
-static int hf_bthci_evt_io_capability = -1;
-static int hf_bthci_evt_oob_data_present = -1;
-static int hf_bthci_evt_auth_requirements = -1;
-static int hf_bthci_evt_numeric_value = -1;
-static int hf_bthci_evt_passkey = -1;
-static int hf_bthci_evt_notification_type = -1;
-static int hf_bthci_evt_data_length = -1;
-static int hf_bthci_evt_location_domain_aware = -1;
-static int hf_bthci_evt_location_domain = -1;
-static int hf_bthci_evt_location_domain_options = -1;
-static int hf_bthci_evt_location_options = -1;
-static int hf_bthci_evt_flow_control_mode = -1;
-static int hf_bthci_evt_physical_link_handle = -1;
-static int hf_bthci_evt_flow_spec_identifier = -1;
-static int hf_bthci_evt_logical_link_handle = -1;
-static int hf_bthci_evt_max_acl_data_packet_length = -1;
-static int hf_bthci_evt_data_block_length = -1;
-static int hf_bthci_evt_total_num_data_blocks = -1;
-static int hf_bthci_evt_enc_key_size = -1;
-static int hf_bthci_evt_amp_remaining_assoc_length = -1;
-static int hf_bthci_evt_amp_assoc_fragment = -1;
-static int hf_bthci_evt_amp_status = -1;
-static int hf_bthci_evt_total_bandwidth = -1;
-static int hf_bthci_evt_max_guaranteed_bandwidth = -1;
-static int hf_bthci_evt_min_latency = -1;
-static int hf_bthci_evt_max_pdu_size = -1;
-static int hf_bthci_evt_amp_controller_type = -1;
-static int hf_bthci_evt_pal_capabilities_00 = -1;
-static int hf_bthci_evt_max_amp_assoc_length = -1;
-static int hf_bthci_evt_max_flush_to_us = -1;
-static int hf_bthci_evt_best_effort_flush_to_us = -1;
-static int hf_bthci_evt_link_loss_reason = -1;
-static int hf_bthci_evt_num_compl_blocks = -1;
-static int hf_bthci_evt_test_scenario = -1;
-static int hf_bthci_evt_report_reason = -1;
-static int hf_bthci_evt_report_event_type = -1;
-static int hf_bthci_evt_num_frames = -1;
-static int hf_bthci_evt_num_error_frames = -1;
-static int hf_bthci_evt_num_bits = -1;
-static int hf_bthci_evt_num_error_bits = -1;
-static int hf_bthci_evt_short_range_mode_state = -1;
-static int hf_bthci_evt_le_supported_host = -1;
-static int hf_bthci_evt_le_simultaneous_host = -1;
-static int hf_bthci_evt_le_acl_data_pkt_len = -1;
-static int hf_bthci_evt_total_num_le_acl_data_pkts = -1;
-static int hf_bthci_evt_iso_data_pkt_len = -1;
-static int hf_bthci_evt_total_num_iso_data_pkts = -1;
-static int hf_bthci_evt_filter_accept_list_size = -1;
-static int hf_bthci_evt_le_channel_map = -1;
-static int hf_bthci_evt_encrypted_data = -1;
-static int hf_bthci_evt_random_number = -1;
-static int hf_bthci_evt_le_num_packets = -1;
-static int hf_bthci_evt_le_meta_subevent = -1;
-static int hf_bthci_evt_le_peer_address_type = -1;
-static int hf_bthci_evt_le_local_rpa = -1;
-static int hf_bthci_evt_le_peer_rpa = -1;
-static int hf_bthci_evt_le_con_interval = -1;
-static int hf_bthci_evt_le_min_interval = -1;
-static int hf_bthci_evt_le_max_interval = -1;
-static int hf_bthci_evt_le_con_latency = -1;
-static int hf_bthci_evt_le_supervision_timeout = -1;
-static int hf_bthci_evt_le_max_tx_octets = -1;
-static int hf_bthci_evt_le_max_tx_time = -1;
-static int hf_bthci_evt_le_max_rx_octets = -1;
-static int hf_bthci_evt_le_max_rx_time = -1;
-static int hf_bthci_evt_le_local_p_256_public_key = -1;
-static int hf_bthci_evt_le_dhkey = -1;
-static int hf_bthci_evt_encrypted_diversifier = -1;
-static int hf_bthci_evt_le_central_clock_accuracy = -1;
-static int hf_bthci_evt_num_reports = -1;
-static int hf_bthci_evt_advts_event_type = -1;
-static int hf_bthci_evt_le_states = -1;
-static int hf_bthci_evt_le_states_00 = -1;
-static int hf_bthci_evt_le_states_01 = -1;
-static int hf_bthci_evt_le_states_02 = -1;
-static int hf_bthci_evt_le_states_03 = -1;
-static int hf_bthci_evt_le_states_04 = -1;
-static int hf_bthci_evt_le_states_05 = -1;
-static int hf_bthci_evt_le_states_06 = -1;
-static int hf_bthci_evt_le_states_07 = -1;
-static int hf_bthci_evt_le_states_10 = -1;
-static int hf_bthci_evt_le_states_11 = -1;
-static int hf_bthci_evt_le_states_12 = -1;
-static int hf_bthci_evt_le_states_13 = -1;
-static int hf_bthci_evt_le_states_14 = -1;
-static int hf_bthci_evt_le_states_15 = -1;
-static int hf_bthci_evt_le_states_16 = -1;
-static int hf_bthci_evt_le_states_17 = -1;
-static int hf_bthci_evt_le_states_20 = -1;
-static int hf_bthci_evt_le_states_21 = -1;
-static int hf_bthci_evt_le_states_22 = -1;
-static int hf_bthci_evt_le_states_23 = -1;
-static int hf_bthci_evt_le_states_24 = -1;
-static int hf_bthci_evt_le_states_25 = -1;
-static int hf_bthci_evt_le_states_26 = -1;
-static int hf_bthci_evt_le_states_27 = -1;
-static int hf_bthci_evt_le_states_30 = -1;
-static int hf_bthci_evt_le_states_31 = -1;
-static int hf_bthci_evt_le_states_32 = -1;
-static int hf_bthci_evt_le_states_33 = -1;
-static int hf_bthci_evt_le_states_34 = -1;
-static int hf_changed_in_frame = -1;
-static int hf_command_in_frame = -1;
-static int hf_pending_in_frame = -1;
-static int hf_response_in_frame = -1;
-static int hf_command_pending_time_delta = -1;
-static int hf_command_response_time_delta = -1;
-static int hf_pending_response_time_delta = -1;
-static int hf_bthci_evt_le_features = -1;
-static int hf_bthci_evt_le_features_encryption = -1;
-static int hf_bthci_evt_le_features_connection_parameters_request_procedure = -1;
-static int hf_bthci_evt_le_features_extended_reject_indication = -1;
-static int hf_bthci_evt_le_features_peripheral_initiated_features_exchange = -1;
-static int hf_bthci_evt_le_features_ping = -1;
-static int hf_bthci_evt_le_features_data_packet_length_extension = -1;
-static int hf_bthci_evt_le_features_ll_privacy = -1;
-static int hf_bthci_evt_le_features_extended_scanner_filter_policies = -1;
-static int hf_bthci_evt_le_features_2m_phy = -1;
-static int hf_bthci_evt_le_features_stable_modulation_index_tx =-1;
-static int hf_bthci_evt_le_features_stable_modulation_index_rx = -1;
-static int hf_bthci_evt_le_features_coded_phy = -1;
-static int hf_bthci_evt_le_features_extended_advertising = -1;
-static int hf_bthci_evt_le_features_periodic_advertising = -1;
-static int hf_bthci_evt_le_features_channel_selection_algorithm_2 = -1;
-static int hf_bthci_evt_le_features_power_class_1 = -1;
-static int hf_bthci_evt_le_features_minimum_number_of_used_channels_procedure = -1;
-static int hf_bthci_evt_le_features_connection_cte_request = -1;
-static int hf_bthci_evt_le_features_connection_cte_response = -1;
-static int hf_bthci_evt_le_features_connectionless_cte_tx = -1;
-static int hf_bthci_evt_le_features_connectionless_cte_rx = -1;
-static int hf_bthci_evt_le_features_antenna_switching_during_cte_tx_aod = -1;
-static int hf_bthci_evt_le_features_antenna_switching_during_cte_rx_aoa = -1;
-static int hf_bthci_evt_le_features_receiving_cte = -1;
-static int hf_bthci_evt_le_features_periodic_advertising_sync_transfer_sender = -1;
-static int hf_bthci_evt_le_features_periodic_advertising_sync_transfer_receiver = -1;
-static int hf_bthci_evt_le_features_sleep_clock_accuracy_updates = -1;
-static int hf_bthci_evt_le_features_remote_public_key_validation = -1;
-static int hf_bthci_evt_le_features_cis_central = -1;
-static int hf_bthci_evt_le_features_cis_peripheral = -1;
-static int hf_bthci_evt_le_features_isochronous_broadcaster = -1;
-static int hf_bthci_evt_le_features_synchronized_receiver = -1;
-static int hf_bthci_evt_le_features_isochronous_channels_host_support = -1;
-static int hf_bthci_evt_le_features_power_control_request = -1;
-static int hf_bthci_evt_le_features_power_change_indication = -1;
-static int hf_bthci_evt_le_features_path_loss_monitoring = -1;
-static int hf_bthci_evt_le_features_periodic_advertising_adi = -1;
-static int hf_bthci_evt_le_features_connection_subrating = -1;
-static int hf_bthci_evt_le_features_connection_subrating_host_support = -1;
-static int hf_bthci_evt_le_features_channel_classification = -1;
-static int hf_bthci_evt_le_features_coding_selection = -1;
-static int hf_bthci_evt_le_features_coding_selection_host_support = -1;
-static int hf_bthci_evt_le_features_periodic_advertising_responses_advertiser = -1;
-static int hf_bthci_evt_le_features_periodic_advertising_responses_scanner = -1;
-static int hf_bthci_evt_le_features_reserved = -1;
-static int hf_bthci_evt_mws_number_of_transports = -1;
-static int hf_bthci_evt_mws_transport_layers = -1;
-static int hf_bthci_evt_mws_transport_layers_item = -1;
-static int hf_bthci_evt_mws_transport_layer = -1;
-static int hf_bthci_evt_mws_number_of_baud_rates = -1;
-static int hf_bthci_evt_mws_to_mws_baud_rates = -1;
-static int hf_bthci_evt_mws_to_mws_baud_rates_tranport_item = -1;
-static int hf_bthci_evt_mws_to_mws_baud_rate = -1;
-static int hf_bthci_evt_mws_from_mws_baud_rates = -1;
-static int hf_bthci_evt_mws_from_mws_baud_rates_tranport_item = -1;
-static int hf_bthci_evt_mws_from_mws_baud_rate = -1;
-static int hf_bthci_evt_selected_tx_power = -1;
-static int hf_bthci_evt_which_clock = -1;
-static int hf_bthci_evt_slot_offset = -1;
-static int hf_bthci_evt_lt_addr = -1;
-static int hf_bthci_evt_next_broadcast_instant = -1;
-static int hf_bthci_evt_connectionless_peripheral_broadcast_interval = -1;
-static int hf_bthci_evt_service_data = -1;
-static int hf_bthci_evt_local_sam_index = -1;
-static int hf_bthci_evt_local_sam_tx_availability = -1;
-static int hf_bthci_evt_local_sam_rx_availability = -1;
-static int hf_bthci_evt_remote_sam_index = -1;
-static int hf_bthci_evt_remote_sam_tx_availability = -1;
-static int hf_bthci_evt_remote_sam_rx_availability = -1;
-static int hf_bthci_evt_receive_status = -1;
-static int hf_bthci_evt_fragment = -1;
-static int hf_bthci_evt_data = -1;
-static int hf_bthci_evt_le_number_of_reports = -1;
-static int hf_bthci_evt_le_report = -1;
-static int hf_bthci_evt_le_event_type = -1;
-static int hf_bthci_evt_le_direct_address_type = -1;
-static int hf_bthci_evt_le_direct_bd_addr = -1;
-static int hf_bthci_evt_le_address_type = -1;
-static int hf_bthci_evt_le_rssi = -1;
-static int hf_bthci_evt_le_tx_phy = -1;
-static int hf_bthci_evt_le_rx_phy = -1;
-static int hf_bthci_evt_max_adv_data_length = -1;
-static int hf_bthci_evt_num_supported_adv_sets = -1;
-static int hf_bthci_evt_number_of_supported_codecs = -1;
-static int hf_bthci_evt_number_of_supported_vendor_codecs = -1;
-static int hf_bthci_evt_codecs = -1;
-static int hf_bthci_evt_vendor_codecs = -1;
-static int hf_bthci_evt_vendor_codecs_item = -1;
-static int hf_bthci_evt_codec_id = -1;
-static int hf_bthci_evt_vendor_codec_id = -1;
-static int hf_bthci_evt_mws_bt_rx_priority_assert_offset = -1;
-static int hf_bthci_evt_mws_bt_rx_priority_assert_jitter = -1;
-static int hf_bthci_evt_mws_bt_rx_priority_deassert_offset = -1;
-static int hf_bthci_evt_mws_bt_rx_priority_deassert_jitter = -1;
-static int hf_bthci_evt_mws_bt_tx_priority_assert_offset = -1;
-static int hf_bthci_evt_mws_bt_tx_priority_assert_jitter = -1;
-static int hf_bthci_evt_mws_bt_tx_priority_deassert_offset = -1;
-static int hf_bthci_evt_mws_bt_tx_priority_deassert_jitter = -1;
-static int hf_bthci_evt_mws_802_rx_priority_assert_offset = -1;
-static int hf_bthci_evt_mws_802_rx_priority_assert_jitter = -1;
-static int hf_bthci_evt_mws_802_rx_priority_deassert_offset = -1;
-static int hf_bthci_evt_mws_802_rx_priority_deassert_jitter = -1;
-static int hf_bthci_evt_mws_802_tx_priority_assert_offset = -1;
-static int hf_bthci_evt_mws_802_tx_priority_assert_jitter = -1;
-static int hf_bthci_evt_mws_802_tx_priority_deassert_offset = -1;
-static int hf_bthci_evt_mws_802_tx_priority_deassert_jitter = -1;
-static int hf_bthci_evt_sync_train_interval = -1;
-static int hf_bthci_evt_sync_train_to = -1;
-static int hf_bthci_evt_secure_connection_host_support = -1;
-static int hf_bthci_evt_authenticated_payload_timeout = -1;
-static int hf_bthci_evt_c192 = -1;
-static int hf_bthci_evt_r192 = -1;
-static int hf_bthci_evt_c256 = -1;
-static int hf_bthci_evt_r256 = -1;
-static int hf_bthci_evt_extended_inquiry_length = -1;
-static int hf_bthci_evt_suggested_max_tx_octets = -1;
-static int hf_bthci_evt_suggested_max_tx_time = -1;
-static int hf_bthci_evt_suggested_max_rx_octets = -1;
-static int hf_bthci_evt_suggested_max_rx_time = -1;
-static int hf_bthci_evt_resolving_list_size = -1;
-static int hf_bthci_evt_primary_phy = -1;
-static int hf_bthci_evt_secondary_phy = -1;
-static int hf_bthci_evt_advertising_sid = -1;
-static int hf_bthci_evt_tx_power = -1;
-static int hf_bthci_evt_periodic_advertising_interval = -1;
-static int hf_bthci_evt_num_compl_ext_advertising_events = -1;
-static int hf_bthci_evt_channel_selection_algorithm = -1;
-static int hf_bthci_evt_advertiser_clock_accuracy = -1;
-static int hf_bthci_evt_advertiser_phy = -1;
-static int hf_bthci_evt_periodic_adv_list_size = -1;
-static int hf_bthci_evt_min_tx_power = -1;
-static int hf_bthci_evt_max_tx_power = -1;
-static int hf_bthci_evt_rf_tx_path_compensation = -1;
-static int hf_bthci_evt_rf_rx_path_compensation = -1;
-static int hf_bthci_evt_sync_handle = -1;
-static int hf_bthci_evt_data_status = -1;
-static int hf_bthci_evt_advertising_handle = -1;
-static int hf_bthci_evt_channel_index = -1;
-static int hf_bthci_evt_cte_rssi = -1;
-static int hf_bthci_evt_antenna_id = -1;
-static int hf_bthci_evt_cte_type = -1;
-static int hf_bthci_evt_slot_durations = -1;
-static int hf_bthci_evt_packet_status = -1;
-static int hf_bthci_evt_event_counter = -1;
-static int hf_bthci_evt_sample_count = -1;
-static int hf_bthci_evt_i_sample = -1;
-static int hf_bthci_evt_q_sample = -1;
-static int hf_bthci_evt_service_data_past = -1;
-static int hf_bthci_evt_number_antennae = -1;
-static int hf_bthci_evt_max_cte_length = -1;
-static int hf_bthci_evt_max_length_antenna_switching_pattern = -1;
-static int hf_bthci_evt_max_encryption_key_size = -1;
-static int hf_bthci_evt_sdu_packet_seq_num = -1;
-static int hf_bthci_evt_sdu_packet_timestamp = -1;
-static int hf_bthci_evt_sdu_packet_offset = -1;
-static int hf_bthci_evt_cig_id = -1;
-static int hf_bthci_evt_cis_id = -1;
-static int hf_bthci_evt_cis_count = -1;
-static int hf_bthci_evt_cis_handle = -1;
-static int hf_bthci_evt_cis_bis_handle = -1;
-static int hf_bthci_evt_big_handle = -1;
-static int hf_bthci_evt_received_packet_counter = -1;
-static int hf_bthci_evt_missed_packet_counter = -1;
-static int hf_bthci_evt_failed_packet_counter = -1;
-static int hf_bthci_evt_pkt_count_tx_unacked = -1;
-static int hf_bthci_evt_pkt_count_tx_flushed = -1;
-static int hf_bthci_evt_pkt_count_tx_last_subevent = -1;
-static int hf_bthci_evt_pkt_count_tx_retransmitted = -1;
-static int hf_bthci_evt_pkt_count_rx_crc_error = -1;
-static int hf_bthci_evt_pkt_count_rx_unreceived = -1;
-static int hf_bthci_evt_pkt_count_rx_duplicate = -1;
-static int hf_bthci_evt_phy_and_coding = -1;
-static int hf_bthci_evt_cig_sync_delay = -1;
-static int hf_bthci_evt_big_sync_delay = -1;
-static int hf_bthci_evt_cis_sync_delay = -1;
-static int hf_bthci_evt_transport_latency_c_to_p = -1;
-static int hf_bthci_evt_transport_latency_p_to_c = -1;
-static int hf_bthci_evt_big_transport_latency = -1;
-static int hf_bthci_evt_phy_c_to_p = -1;
-static int hf_bthci_evt_phy_p_to_c = -1;
-static int hf_bthci_evt_bn_c_to_p = -1;
-static int hf_bthci_evt_bn_p_to_c = -1;
-static int hf_bthci_evt_ft_c_to_p = -1;
-static int hf_bthci_evt_ft_p_to_c = -1;
-static int hf_bthci_evt_max_pdu_c_to_p = -1;
-static int hf_bthci_evt_max_pdu_p_to_c = -1;
-static int hf_bthci_evt_phy = -1;
-static int hf_bthci_evt_nse = -1;
-static int hf_bthci_evt_bn = -1;
-static int hf_bthci_evt_pto = -1;
-static int hf_bthci_evt_irc = -1;
-static int hf_bthci_evt_max_pdu = -1;
-static int hf_bthci_evt_iso_interval = -1;
-static int hf_bthci_evt_num_bis = -1;
-static int hf_bthci_evt_bis_handle = -1;
-static int hf_bthci_evt_current_path_loss = -1;
-static int hf_bthci_evt_zone_entered = -1;
-static int hf_bthci_evt_power_report_reason = -1;
-static int hf_bthci_evt_power_level_delta = -1;
-static int hf_bthci_evt_sdu_interval = -1;
-static int hf_bthci_evt_max_sdu = -1;
-static int hf_bthci_evt_framing = -1;
-static int hf_bthci_evt_peer_clock_accuracy = -1;
-static int hf_bthci_evt_subrate_factor = -1;
-static int hf_bthci_evt_continuation_number = -1;
-static int hf_bthci_evt_subevent_start = -1;
-static int hf_bthci_evt_subevent_count = -1;
-static int hf_bthci_evt_subevent = -1;
-static int hf_bthci_evt_subevent_tx_status = -1;
-static int hf_bthci_evt_subevent_responses = -1;
-static int hf_bthci_evt_response_slot = -1;
-static int hf_bthci_evt_num_subevents = -1;
-static int hf_bthci_evt_subevent_interval = -1;
-static int hf_bthci_evt_response_slot_delay = -1;
-static int hf_bthci_evt_response_slot_spacing = -1;
-static int hf_bthci_evt_periodic_event_counter = -1;
-static int hf_packet_type_acl = -1;
-static int hf_packet_type_acl_dh5 = -1;
-static int hf_packet_type_acl_dm5 = -1;
-static int hf_packet_type_acl_3dh5 = -1;
-static int hf_packet_type_acl_2dh5 = -1;
-static int hf_packet_type_acl_dh3 = -1;
-static int hf_packet_type_acl_dm3 = -1;
-static int hf_packet_type_acl_3dh3 = -1;
-static int hf_packet_type_acl_2dh3 = -1;
-static int hf_packet_type_acl_reserved_5_7 = -1;
-static int hf_packet_type_acl_dh1 = -1;
-static int hf_packet_type_acl_dm1 = -1;
-static int hf_packet_type_acl_3dh1 = -1;
-static int hf_packet_type_acl_2dh1 = -1;
-static int hf_packet_type_acl_reserved_0 = -1;
-static int hf_packet_type_sco = -1;
-static int hf_packet_type_sco_reserved_15_8 = -1;
-static int hf_packet_type_sco_hv3 = -1;
-static int hf_packet_type_sco_hv2 = -1;
-static int hf_packet_type_sco_hv1 = -1;
-static int hf_packet_type_sco_reserved_4_0 = -1;
+static int proto_bthci_evt;
+static int hf_bthci_evt_code;
+static int hf_bthci_evt_param_length;
+static int hf_bthci_evt_num_command_packets;
+static int hf_bthci_evt_num_handles;
+static int hf_bthci_evt_connection_handle;
+static int hf_bthci_evt_num_compl_packets;
+static int hf_bthci_evt_ret_params;
+static int hf_bthci_evt_status;
+static int hf_bthci_evt_status_pending;
+static int hf_bthci_evt_opcode;
+static int hf_bthci_evt_ogf;
+static int hf_bthci_evt_ocf;
+static int hf_bthci_evt_ocf_link_control;
+static int hf_bthci_evt_ocf_link_policy;
+static int hf_bthci_evt_ocf_host_controller_and_baseband;
+static int hf_bthci_evt_ocf_informational;
+static int hf_bthci_evt_ocf_status;
+static int hf_bthci_evt_ocf_testing;
+static int hf_bthci_evt_ocf_logo_testing;
+static int hf_bthci_evt_ocf_low_energy;
+static int hf_bthci_evt_bd_addr;
+static int hf_bthci_evt_link_type;
+static int hf_bthci_evt_encryption_mode;
+static int hf_bthci_evt_reason;
+static int hf_bthci_evt_remote_name;
+static int hf_bthci_evt_encryption_enable;
+static int hf_bthci_evt_key_flag;
+static int hf_bthci_evt_vers_nr;
+static int hf_bthci_bthci_evt_hci_version;
+static int hf_bthci_evt_hci_revision;
+static int hf_bthci_evt_comp_id;
+static int hf_bthci_evt_sub_vers_nr;
+static int hf_bthci_evt_flags;
+static int hf_bthci_evt_service_type;
+static int hf_bthci_evt_token_rate;
+static int hf_bthci_evt_peak_bandwidth;
+static int hf_bthci_evt_latency;
+static int hf_bthci_evt_delay_variation;
+static int hf_bthci_evt_hardware_code;
+static int hf_bthci_evt_role;
+static int hf_bthci_evt_curr_role;
+static int hf_bthci_evt_curr_mode;
+static int hf_bthci_evt_interval;
+static int hf_bthci_evt_link_key;
+static int hf_bthci_evt_key_type;
+static int hf_bthci_evt_max_slots;
+static int hf_bthci_evt_clock_offset;
+static int hf_bthci_evt_clock_offset_32;
+static int hf_bthci_evt_page_scan_mode;
+static int hf_bthci_evt_page_scan_repetition_mode;
+static int hf_bthci_evt_reserved;
+static int hf_bthci_evt_page_scan_period_mode;
+static int hf_bthci_evt_num_keys;
+static int hf_bthci_evt_num_keys_read;
+static int hf_bthci_evt_max_num_keys;
+static int hf_bthci_evt_num_responses;
+static int hf_bthci_evt_num_keys_written;
+static int hf_bthci_evt_num_keys_deleted;
+static int hf_bthci_evt_link_policy_setting_switch;
+static int hf_bthci_evt_link_policy_setting_hold;
+static int hf_bthci_evt_link_policy_setting_sniff;
+static int hf_bthci_evt_link_policy_setting_park;
+static int hf_bthci_evt_pin_type;
+static int hf_bthci_evt_device_name;
+static int hf_bthci_evt_timeout;
+static int hf_bthci_evt_scan_enable;
+static int hf_bthci_evt_authentication_enable;
+static int hf_bthci_evt_sco_flow_cont_enable;
+static int hf_bthci_evt_window;
+static int hf_bthci_evt_input_unused;
+static int hf_bthci_evt_input_coding;
+static int hf_bthci_evt_input_data_format;
+static int hf_bthci_evt_input_sample_size;
+static int hf_bthci_evt_linear_pcm_bit_pos;
+static int hf_bthci_evt_air_coding_format;
+static int hf_bthci_evt_num_broadcast_retransm;
+static int hf_bthci_evt_hold_mode_act_page;
+static int hf_bthci_evt_hold_mode_act_inquiry;
+static int hf_bthci_evt_hold_mode_act_periodic;
+static int hf_bthci_evt_transmit_power_level;
+static int hf_bthci_evt_max_transmit_power_level;
+static int hf_bthci_evt_transmit_power_level_gfsk;
+static int hf_bthci_evt_transmit_power_level_dqpsk;
+static int hf_bthci_evt_transmit_power_level_8dpsk;
+static int hf_bthci_evt_flush_to_us;
+static int hf_bthci_evt_num_supp_iac;
+static int hf_bthci_evt_num_curr_iac;
+static int hf_bthci_evt_iac_lap;
+static int hf_bthci_evt_loopback_mode;
+static int hf_bthci_evt_country_code;
+static int hf_bthci_evt_failed_contact_counter;
+static int hf_bthci_evt_link_quality;
+static int hf_bthci_evt_rssi;
+static int hf_bthci_evt_host_data_packet_length_acl;
+static int hf_bthci_evt_host_data_packet_length_sco;
+static int hf_bthci_evt_host_total_num_acl_data_packets;
+static int hf_bthci_evt_host_total_num_sco_data_packets;
+static int hf_bthci_evt_page_number;
+static int hf_bthci_evt_max_page_number;
+static int hf_bthci_evt_local_supported_cmds;
+static int hf_bthci_evt_fec_required;
+static int hf_bthci_evt_err_data_reporting;
+static int hf_bthci_evt_scan_type;
+static int hf_bthci_evt_inq_mode;
+static int hf_bthci_evt_power_level_type;
+static int hf_lmp_features;
+static int hf_lmp_feature_3slot_packets;
+static int hf_lmp_feature_5slot_packets;
+static int hf_lmp_feature_encryption;
+static int hf_lmp_feature_slot_offset;
+static int hf_lmp_feature_timing_accuracy;
+static int hf_lmp_feature_role_switch;
+static int hf_lmp_feature_hold_mode;
+static int hf_lmp_feature_sniff_mode;
+static int hf_lmp_feature_park_state;
+static int hf_lmp_feature_power_control_requests;
+static int hf_lmp_feature_channel_quality_driven_data_rate;
+static int hf_lmp_feature_sco_link;
+static int hf_lmp_feature_hv2_packets;
+static int hf_lmp_feature_hv3_packets;
+static int hf_lmp_feature_u_law_log_synchronous_data;
+static int hf_lmp_feature_a_law_log_synchronous_data;
+static int hf_lmp_feature_cvsd_synchronous_data;
+static int hf_lmp_feature_paging_parameter_negotiation;
+static int hf_lmp_feature_power_control;
+static int hf_lmp_feature_transparent_synchronous_data;
+static int hf_lmp_feature_flow_control_lag;
+static int hf_lmp_feature_broadcast_encryption;
+static int hf_lmp_feature_reserved_24;
+static int hf_lmp_feature_edr_acl_2mbps_mode;
+static int hf_lmp_feature_edr_acl_3mbps_mode;
+static int hf_lmp_feature_enhanced_inquiry_scan;
+static int hf_lmp_feature_interlaced_inquiry_scan;
+static int hf_lmp_feature_interlaced_page_scan;
+static int hf_lmp_feature_rssi_with_inquiry_results;
+static int hf_lmp_feature_ev3_packets;
+static int hf_lmp_feature_ev4_packets;
+static int hf_lmp_feature_ev5_packets;
+static int hf_lmp_feature_reserved_34;
+static int hf_lmp_feature_afh_capable_peripheral;
+static int hf_lmp_feature_afh_classification_peripheral;
+static int hf_lmp_feature_br_edr_not_supported;
+static int hf_lmp_feature_le_supported_controller;
+static int hf_lmp_feature_3slot_edr_acl_packets;
+static int hf_lmp_feature_5slot_edr_acl_packets;
+static int hf_lmp_feature_sniff_subrating;
+static int hf_lmp_feature_pause_encryption;
+static int hf_lmp_feature_afh_capable_central;
+static int hf_lmp_feature_afh_classification_central;
+static int hf_lmp_feature_edr_esco_2mbps_mode;
+static int hf_lmp_feature_edr_esco_3mbps_mode;
+static int hf_lmp_feature_3slot_edr_esco_packets;
+static int hf_lmp_feature_extended_inquiry_response;
+static int hf_lmp_feature_simultaneous_le_and_br_edr_controller;
+static int hf_lmp_feature_reserved_50;
+static int hf_lmp_feature_secure_simple_pairing;
+static int hf_lmp_feature_encapsulated_pdu;
+static int hf_lmp_feature_erroneous_data_reporting;
+static int hf_lmp_feature_non_flushable_packet_boundary_flag;
+static int hf_lmp_feature_reserved_55;
+static int hf_lmp_feature_link_supervision_timeout_changed_event;
+static int hf_lmp_feature_inquiry_tx_power_level;
+static int hf_lmp_feature_enhanced_power_control;
+static int hf_lmp_feature_reserved_59_62;
+static int hf_lmp_feature_extended_features;
+static int hf_lmp_feature_secure_simple_pairing_host;
+static int hf_lmp_feature_le_supported_host;
+static int hf_lmp_feature_simultaneous_le_and_br_edr_host;
+static int hf_lmp_feature_secure_connections_host;
+static int hf_lmp_feature_reserved_68_71;
+static int hf_lmp_feature_csb_central_operation;
+static int hf_lmp_feature_csb_peripheral_operation;
+static int hf_lmp_feature_synchronization_train;
+static int hf_lmp_feature_synchronization_scan;
+static int hf_lmp_feature_inquiry_response_notification_event;
+static int hf_lmp_feature_generalized_interlaced_scan;
+static int hf_lmp_feature_coarse_clock_adjustment;
+static int hf_lmp_feature_reserved_135;
+static int hf_lmp_feature_secure_connections_controller;
+static int hf_lmp_feature_ping;
+static int hf_lmp_feature_reserved_138;
+static int hf_lmp_feature_train_nudging;
+static int hf_lmp_feature_slot_availability_mask;
+static int hf_lmp_feature_reserved;
+static int hf_bthci_evt_sync_link_type;
+static int hf_bthci_evt_sync_tx_interval;
+static int hf_bthci_evt_sync_rtx_window;
+static int hf_bthci_evt_sync_rx_packet_length;
+static int hf_bthci_evt_sync_tx_packet_length;
+static int hf_bthci_evt_air_mode;
+static int hf_bthci_evt_max_tx_latency;
+static int hf_bthci_evt_max_rx_latency;
+static int hf_bthci_evt_min_remote_timeout;
+static int hf_bthci_evt_min_local_timeout;
+static int hf_bthci_evt_link_supervision_timeout;
+static int hf_bthci_evt_token_bucket_size;
+static int hf_bthci_evt_flow_direction;
+static int hf_bthci_evt_afh_ch_assessment_mode;
+static int hf_bthci_evt_lmp_handle;
+static int hf_bthci_evt_clock;
+static int hf_bthci_evt_clock_accuracy;
+static int hf_bthci_evt_afh_mode;
+static int hf_bthci_evt_afh_channel_map;
+static int hf_bthci_evt_simple_pairing_mode;
+static int hf_bthci_evt_randomizer_r;
+static int hf_bthci_evt_hash_c;
+static int hf_bthci_evt_io_capability;
+static int hf_bthci_evt_oob_data_present;
+static int hf_bthci_evt_auth_requirements;
+static int hf_bthci_evt_numeric_value;
+static int hf_bthci_evt_passkey;
+static int hf_bthci_evt_notification_type;
+static int hf_bthci_evt_data_length;
+static int hf_bthci_evt_location_domain_aware;
+static int hf_bthci_evt_location_domain;
+static int hf_bthci_evt_location_domain_options;
+static int hf_bthci_evt_location_options;
+static int hf_bthci_evt_flow_control_mode;
+static int hf_bthci_evt_physical_link_handle;
+static int hf_bthci_evt_flow_spec_identifier;
+static int hf_bthci_evt_logical_link_handle;
+static int hf_bthci_evt_max_acl_data_packet_length;
+static int hf_bthci_evt_data_block_length;
+static int hf_bthci_evt_total_num_data_blocks;
+static int hf_bthci_evt_enc_key_size;
+static int hf_bthci_evt_amp_remaining_assoc_length;
+static int hf_bthci_evt_amp_assoc_fragment;
+static int hf_bthci_evt_amp_status;
+static int hf_bthci_evt_total_bandwidth;
+static int hf_bthci_evt_max_guaranteed_bandwidth;
+static int hf_bthci_evt_min_latency;
+static int hf_bthci_evt_max_pdu_size;
+static int hf_bthci_evt_amp_controller_type;
+static int hf_bthci_evt_pal_capabilities_00;
+static int hf_bthci_evt_max_amp_assoc_length;
+static int hf_bthci_evt_max_flush_to_us;
+static int hf_bthci_evt_best_effort_flush_to_us;
+static int hf_bthci_evt_link_loss_reason;
+static int hf_bthci_evt_num_compl_blocks;
+static int hf_bthci_evt_test_scenario;
+static int hf_bthci_evt_report_reason;
+static int hf_bthci_evt_report_event_type;
+static int hf_bthci_evt_num_frames;
+static int hf_bthci_evt_num_error_frames;
+static int hf_bthci_evt_num_bits;
+static int hf_bthci_evt_num_error_bits;
+static int hf_bthci_evt_short_range_mode_state;
+static int hf_bthci_evt_le_supported_host;
+static int hf_bthci_evt_le_simultaneous_host;
+static int hf_bthci_evt_le_acl_data_pkt_len;
+static int hf_bthci_evt_total_num_le_acl_data_pkts;
+static int hf_bthci_evt_iso_data_pkt_len;
+static int hf_bthci_evt_total_num_iso_data_pkts;
+static int hf_bthci_evt_filter_accept_list_size;
+static int hf_bthci_evt_le_channel_map;
+static int hf_bthci_evt_encrypted_data;
+static int hf_bthci_evt_random_number;
+static int hf_bthci_evt_le_num_packets;
+static int hf_bthci_evt_le_meta_subevent;
+static int hf_bthci_evt_le_peer_address_type;
+static int hf_bthci_evt_le_local_rpa;
+static int hf_bthci_evt_le_peer_rpa;
+static int hf_bthci_evt_le_con_interval;
+static int hf_bthci_evt_le_min_interval;
+static int hf_bthci_evt_le_max_interval;
+static int hf_bthci_evt_le_con_latency;
+static int hf_bthci_evt_le_supervision_timeout;
+static int hf_bthci_evt_le_max_tx_octets;
+static int hf_bthci_evt_le_max_tx_time;
+static int hf_bthci_evt_le_max_rx_octets;
+static int hf_bthci_evt_le_max_rx_time;
+static int hf_bthci_evt_le_local_p_256_public_key;
+static int hf_bthci_evt_le_dhkey;
+static int hf_bthci_evt_encrypted_diversifier;
+static int hf_bthci_evt_le_central_clock_accuracy;
+static int hf_bthci_evt_num_reports;
+static int hf_bthci_evt_advts_event_type;
+static int hf_bthci_evt_le_states;
+static int hf_bthci_evt_le_states_00;
+static int hf_bthci_evt_le_states_01;
+static int hf_bthci_evt_le_states_02;
+static int hf_bthci_evt_le_states_03;
+static int hf_bthci_evt_le_states_04;
+static int hf_bthci_evt_le_states_05;
+static int hf_bthci_evt_le_states_06;
+static int hf_bthci_evt_le_states_07;
+static int hf_bthci_evt_le_states_10;
+static int hf_bthci_evt_le_states_11;
+static int hf_bthci_evt_le_states_12;
+static int hf_bthci_evt_le_states_13;
+static int hf_bthci_evt_le_states_14;
+static int hf_bthci_evt_le_states_15;
+static int hf_bthci_evt_le_states_16;
+static int hf_bthci_evt_le_states_17;
+static int hf_bthci_evt_le_states_20;
+static int hf_bthci_evt_le_states_21;
+static int hf_bthci_evt_le_states_22;
+static int hf_bthci_evt_le_states_23;
+static int hf_bthci_evt_le_states_24;
+static int hf_bthci_evt_le_states_25;
+static int hf_bthci_evt_le_states_26;
+static int hf_bthci_evt_le_states_27;
+static int hf_bthci_evt_le_states_30;
+static int hf_bthci_evt_le_states_31;
+static int hf_bthci_evt_le_states_32;
+static int hf_bthci_evt_le_states_33;
+static int hf_bthci_evt_le_states_34;
+static int hf_changed_in_frame;
+static int hf_command_in_frame;
+static int hf_pending_in_frame;
+static int hf_response_in_frame;
+static int hf_command_pending_time_delta;
+static int hf_command_response_time_delta;
+static int hf_pending_response_time_delta;
+static int hf_bthci_evt_le_features;
+static int hf_bthci_evt_le_features_encryption;
+static int hf_bthci_evt_le_features_connection_parameters_request_procedure;
+static int hf_bthci_evt_le_features_extended_reject_indication;
+static int hf_bthci_evt_le_features_peripheral_initiated_features_exchange;
+static int hf_bthci_evt_le_features_ping;
+static int hf_bthci_evt_le_features_data_packet_length_extension;
+static int hf_bthci_evt_le_features_ll_privacy;
+static int hf_bthci_evt_le_features_extended_scanner_filter_policies;
+static int hf_bthci_evt_le_features_2m_phy;
+static int hf_bthci_evt_le_features_stable_modulation_index_tx;
+static int hf_bthci_evt_le_features_stable_modulation_index_rx;
+static int hf_bthci_evt_le_features_coded_phy;
+static int hf_bthci_evt_le_features_extended_advertising;
+static int hf_bthci_evt_le_features_periodic_advertising;
+static int hf_bthci_evt_le_features_channel_selection_algorithm_2;
+static int hf_bthci_evt_le_features_power_class_1;
+static int hf_bthci_evt_le_features_minimum_number_of_used_channels_procedure;
+static int hf_bthci_evt_le_features_connection_cte_request;
+static int hf_bthci_evt_le_features_connection_cte_response;
+static int hf_bthci_evt_le_features_connectionless_cte_tx;
+static int hf_bthci_evt_le_features_connectionless_cte_rx;
+static int hf_bthci_evt_le_features_antenna_switching_during_cte_tx_aod;
+static int hf_bthci_evt_le_features_antenna_switching_during_cte_rx_aoa;
+static int hf_bthci_evt_le_features_receiving_cte;
+static int hf_bthci_evt_le_features_periodic_advertising_sync_transfer_sender;
+static int hf_bthci_evt_le_features_periodic_advertising_sync_transfer_receiver;
+static int hf_bthci_evt_le_features_sleep_clock_accuracy_updates;
+static int hf_bthci_evt_le_features_remote_public_key_validation;
+static int hf_bthci_evt_le_features_cis_central;
+static int hf_bthci_evt_le_features_cis_peripheral;
+static int hf_bthci_evt_le_features_isochronous_broadcaster;
+static int hf_bthci_evt_le_features_synchronized_receiver;
+static int hf_bthci_evt_le_features_isochronous_channels_host_support;
+static int hf_bthci_evt_le_features_power_control_request;
+static int hf_bthci_evt_le_features_power_change_indication;
+static int hf_bthci_evt_le_features_path_loss_monitoring;
+static int hf_bthci_evt_le_features_periodic_advertising_adi;
+static int hf_bthci_evt_le_features_connection_subrating;
+static int hf_bthci_evt_le_features_connection_subrating_host_support;
+static int hf_bthci_evt_le_features_channel_classification;
+static int hf_bthci_evt_le_features_coding_selection;
+static int hf_bthci_evt_le_features_coding_selection_host_support;
+static int hf_bthci_evt_le_features_periodic_advertising_responses_advertiser;
+static int hf_bthci_evt_le_features_periodic_advertising_responses_scanner;
+static int hf_bthci_evt_le_features_reserved;
+static int hf_bthci_evt_mws_number_of_transports;
+static int hf_bthci_evt_mws_transport_layers;
+static int hf_bthci_evt_mws_transport_layers_item;
+static int hf_bthci_evt_mws_transport_layer;
+static int hf_bthci_evt_mws_number_of_baud_rates;
+static int hf_bthci_evt_mws_to_mws_baud_rates;
+static int hf_bthci_evt_mws_to_mws_baud_rates_tranport_item;
+static int hf_bthci_evt_mws_to_mws_baud_rate;
+static int hf_bthci_evt_mws_from_mws_baud_rates;
+static int hf_bthci_evt_mws_from_mws_baud_rates_tranport_item;
+static int hf_bthci_evt_mws_from_mws_baud_rate;
+static int hf_bthci_evt_selected_tx_power;
+static int hf_bthci_evt_which_clock;
+static int hf_bthci_evt_slot_offset;
+static int hf_bthci_evt_lt_addr;
+static int hf_bthci_evt_next_broadcast_instant;
+static int hf_bthci_evt_connectionless_peripheral_broadcast_interval;
+static int hf_bthci_evt_service_data;
+static int hf_bthci_evt_local_sam_index;
+static int hf_bthci_evt_local_sam_tx_availability;
+static int hf_bthci_evt_local_sam_rx_availability;
+static int hf_bthci_evt_remote_sam_index;
+static int hf_bthci_evt_remote_sam_tx_availability;
+static int hf_bthci_evt_remote_sam_rx_availability;
+static int hf_bthci_evt_receive_status;
+static int hf_bthci_evt_fragment;
+static int hf_bthci_evt_data;
+static int hf_bthci_evt_le_number_of_reports;
+static int hf_bthci_evt_le_report;
+static int hf_bthci_evt_le_event_type;
+static int hf_bthci_evt_le_direct_address_type;
+static int hf_bthci_evt_le_direct_bd_addr;
+static int hf_bthci_evt_le_address_type;
+static int hf_bthci_evt_le_rssi;
+static int hf_bthci_evt_le_tx_phy;
+static int hf_bthci_evt_le_rx_phy;
+static int hf_bthci_evt_max_adv_data_length;
+static int hf_bthci_evt_num_supported_adv_sets;
+static int hf_bthci_evt_number_of_supported_codecs;
+static int hf_bthci_evt_number_of_supported_vendor_codecs;
+static int hf_bthci_evt_codecs;
+static int hf_bthci_evt_vendor_codecs;
+static int hf_bthci_evt_vendor_codecs_item;
+static int hf_bthci_evt_codec_id;
+static int hf_bthci_evt_vendor_codec_id;
+static int hf_bthci_evt_mws_bt_rx_priority_assert_offset;
+static int hf_bthci_evt_mws_bt_rx_priority_assert_jitter;
+static int hf_bthci_evt_mws_bt_rx_priority_deassert_offset;
+static int hf_bthci_evt_mws_bt_rx_priority_deassert_jitter;
+static int hf_bthci_evt_mws_bt_tx_priority_assert_offset;
+static int hf_bthci_evt_mws_bt_tx_priority_assert_jitter;
+static int hf_bthci_evt_mws_bt_tx_priority_deassert_offset;
+static int hf_bthci_evt_mws_bt_tx_priority_deassert_jitter;
+static int hf_bthci_evt_mws_802_rx_priority_assert_offset;
+static int hf_bthci_evt_mws_802_rx_priority_assert_jitter;
+static int hf_bthci_evt_mws_802_rx_priority_deassert_offset;
+static int hf_bthci_evt_mws_802_rx_priority_deassert_jitter;
+static int hf_bthci_evt_mws_802_tx_priority_assert_offset;
+static int hf_bthci_evt_mws_802_tx_priority_assert_jitter;
+static int hf_bthci_evt_mws_802_tx_priority_deassert_offset;
+static int hf_bthci_evt_mws_802_tx_priority_deassert_jitter;
+static int hf_bthci_evt_sync_train_interval;
+static int hf_bthci_evt_sync_train_to;
+static int hf_bthci_evt_secure_connection_host_support;
+static int hf_bthci_evt_authenticated_payload_timeout;
+static int hf_bthci_evt_c192;
+static int hf_bthci_evt_r192;
+static int hf_bthci_evt_c256;
+static int hf_bthci_evt_r256;
+static int hf_bthci_evt_extended_inquiry_length;
+static int hf_bthci_evt_suggested_max_tx_octets;
+static int hf_bthci_evt_suggested_max_tx_time;
+static int hf_bthci_evt_suggested_max_rx_octets;
+static int hf_bthci_evt_suggested_max_rx_time;
+static int hf_bthci_evt_resolving_list_size;
+static int hf_bthci_evt_primary_phy;
+static int hf_bthci_evt_secondary_phy;
+static int hf_bthci_evt_advertising_sid;
+static int hf_bthci_evt_tx_power;
+static int hf_bthci_evt_periodic_advertising_interval;
+static int hf_bthci_evt_num_compl_ext_advertising_events;
+static int hf_bthci_evt_channel_selection_algorithm;
+static int hf_bthci_evt_advertiser_clock_accuracy;
+static int hf_bthci_evt_advertiser_phy;
+static int hf_bthci_evt_periodic_adv_list_size;
+static int hf_bthci_evt_min_tx_power;
+static int hf_bthci_evt_max_tx_power;
+static int hf_bthci_evt_rf_tx_path_compensation;
+static int hf_bthci_evt_rf_rx_path_compensation;
+static int hf_bthci_evt_sync_handle;
+static int hf_bthci_evt_data_status;
+static int hf_bthci_evt_advertising_handle;
+static int hf_bthci_evt_channel_index;
+static int hf_bthci_evt_cte_rssi;
+static int hf_bthci_evt_antenna_id;
+static int hf_bthci_evt_cte_type;
+static int hf_bthci_evt_slot_durations;
+static int hf_bthci_evt_packet_status;
+static int hf_bthci_evt_event_counter;
+static int hf_bthci_evt_sample_count;
+static int hf_bthci_evt_i_sample;
+static int hf_bthci_evt_q_sample;
+static int hf_bthci_evt_service_data_past;
+static int hf_bthci_evt_number_antennae;
+static int hf_bthci_evt_max_cte_length;
+static int hf_bthci_evt_max_length_antenna_switching_pattern;
+static int hf_bthci_evt_max_encryption_key_size;
+static int hf_bthci_evt_sdu_packet_seq_num;
+static int hf_bthci_evt_sdu_packet_timestamp;
+static int hf_bthci_evt_sdu_packet_offset;
+static int hf_bthci_evt_cig_id;
+static int hf_bthci_evt_cis_id;
+static int hf_bthci_evt_cis_count;
+static int hf_bthci_evt_cis_handle;
+static int hf_bthci_evt_cis_bis_handle;
+static int hf_bthci_evt_big_handle;
+static int hf_bthci_evt_received_packet_counter;
+static int hf_bthci_evt_missed_packet_counter;
+static int hf_bthci_evt_failed_packet_counter;
+static int hf_bthci_evt_pkt_count_tx_unacked;
+static int hf_bthci_evt_pkt_count_tx_flushed;
+static int hf_bthci_evt_pkt_count_tx_last_subevent;
+static int hf_bthci_evt_pkt_count_tx_retransmitted;
+static int hf_bthci_evt_pkt_count_rx_crc_error;
+static int hf_bthci_evt_pkt_count_rx_unreceived;
+static int hf_bthci_evt_pkt_count_rx_duplicate;
+static int hf_bthci_evt_phy_and_coding;
+static int hf_bthci_evt_cig_sync_delay;
+static int hf_bthci_evt_big_sync_delay;
+static int hf_bthci_evt_cis_sync_delay;
+static int hf_bthci_evt_transport_latency_c_to_p;
+static int hf_bthci_evt_transport_latency_p_to_c;
+static int hf_bthci_evt_big_transport_latency;
+static int hf_bthci_evt_phy_c_to_p;
+static int hf_bthci_evt_phy_p_to_c;
+static int hf_bthci_evt_bn_c_to_p;
+static int hf_bthci_evt_bn_p_to_c;
+static int hf_bthci_evt_ft_c_to_p;
+static int hf_bthci_evt_ft_p_to_c;
+static int hf_bthci_evt_max_pdu_c_to_p;
+static int hf_bthci_evt_max_pdu_p_to_c;
+static int hf_bthci_evt_phy;
+static int hf_bthci_evt_nse;
+static int hf_bthci_evt_bn;
+static int hf_bthci_evt_pto;
+static int hf_bthci_evt_irc;
+static int hf_bthci_evt_max_pdu;
+static int hf_bthci_evt_iso_interval;
+static int hf_bthci_evt_num_bis;
+static int hf_bthci_evt_bis_handle;
+static int hf_bthci_evt_current_path_loss;
+static int hf_bthci_evt_zone_entered;
+static int hf_bthci_evt_power_report_reason;
+static int hf_bthci_evt_power_level_delta;
+static int hf_bthci_evt_sdu_interval;
+static int hf_bthci_evt_max_sdu;
+static int hf_bthci_evt_framing;
+static int hf_bthci_evt_peer_clock_accuracy;
+static int hf_bthci_evt_subrate_factor;
+static int hf_bthci_evt_continuation_number;
+static int hf_bthci_evt_subevent_start;
+static int hf_bthci_evt_subevent_count;
+static int hf_bthci_evt_subevent;
+static int hf_bthci_evt_subevent_tx_status;
+static int hf_bthci_evt_subevent_responses;
+static int hf_bthci_evt_response_slot;
+static int hf_bthci_evt_num_subevents;
+static int hf_bthci_evt_subevent_interval;
+static int hf_bthci_evt_response_slot_delay;
+static int hf_bthci_evt_response_slot_spacing;
+static int hf_bthci_evt_periodic_event_counter;
+static int hf_packet_type_acl;
+static int hf_packet_type_acl_dh5;
+static int hf_packet_type_acl_dm5;
+static int hf_packet_type_acl_3dh5;
+static int hf_packet_type_acl_2dh5;
+static int hf_packet_type_acl_dh3;
+static int hf_packet_type_acl_dm3;
+static int hf_packet_type_acl_3dh3;
+static int hf_packet_type_acl_2dh3;
+static int hf_packet_type_acl_reserved_5_7;
+static int hf_packet_type_acl_dh1;
+static int hf_packet_type_acl_dm1;
+static int hf_packet_type_acl_3dh1;
+static int hf_packet_type_acl_2dh1;
+static int hf_packet_type_acl_reserved_0;
+static int hf_packet_type_sco;
+static int hf_packet_type_sco_reserved_15_8;
+static int hf_packet_type_sco_hv3;
+static int hf_packet_type_sco_hv2;
+static int hf_packet_type_sco_hv1;
+static int hf_packet_type_sco_reserved_4_0;
 
 static int * const hfx_bthci_evt_le_features[] = {
     &hf_bthci_evt_le_features_encryption,
@@ -677,28 +677,28 @@ static int * const hfx_packet_type_sco[] = {
     NULL
 };
 
-static expert_field ei_event_undecoded = EI_INIT;
-static expert_field ei_event_unknown_event = EI_INIT;
-static expert_field ei_event_unexpected_event = EI_INIT;
-static expert_field ei_event_unexpected_parameter = EI_INIT;
-static expert_field ei_event_unknown_command = EI_INIT;
-static expert_field ei_parameter_unexpected = EI_INIT;
-static expert_field ei_manufacturer_data_changed = EI_INIT;
-static expert_field ei_hci_revision_changed = EI_INIT;
-static expert_field ei_lmp_subversion_changed = EI_INIT;
-static expert_field ei_bad_link_type = EI_INIT;
+static expert_field ei_event_undecoded;
+static expert_field ei_event_unknown_event;
+static expert_field ei_event_unexpected_event;
+static expert_field ei_event_unexpected_parameter;
+static expert_field ei_event_unknown_command;
+static expert_field ei_parameter_unexpected;
+static expert_field ei_manufacturer_data_changed;
+static expert_field ei_hci_revision_changed;
+static expert_field ei_lmp_subversion_changed;
+static expert_field ei_bad_link_type;
 
 static dissector_table_t vendor_dissector_table;
 static dissector_table_t hci_vendor_table;
 
-static int hf_bthci_evt_ext_advts_event_type = -1;
-static int hf_bthci_evt_ext_advts_event_type_connectable = -1;
-static int hf_bthci_evt_ext_advts_event_type_scannable = -1;
-static int hf_bthci_evt_ext_advts_event_type_directed = -1;
-static int hf_bthci_evt_ext_advts_event_type_scan_response = -1;
-static int hf_bthci_evt_ext_advts_event_type_legacy = -1;
-static int hf_bthci_evt_ext_advts_event_type_data_status = -1;
-static int hf_bthci_evt_ext_advts_event_type_reserved = -1;
+static int hf_bthci_evt_ext_advts_event_type;
+static int hf_bthci_evt_ext_advts_event_type_connectable;
+static int hf_bthci_evt_ext_advts_event_type_scannable;
+static int hf_bthci_evt_ext_advts_event_type_directed;
+static int hf_bthci_evt_ext_advts_event_type_scan_response;
+static int hf_bthci_evt_ext_advts_event_type_legacy;
+static int hf_bthci_evt_ext_advts_event_type_data_status;
+static int hf_bthci_evt_ext_advts_event_type_reserved;
 
 static int * const hfx_bthci_evt_le_ext_advts_evt_type[] = {
     &hf_bthci_evt_ext_advts_event_type_connectable,
@@ -711,11 +711,11 @@ static int * const hfx_bthci_evt_le_ext_advts_evt_type[] = {
     NULL
 };
 
-static int hf_bthci_evt_supported_switching_sample_rates = -1;
-static int hf_bthci_evt_supported_switching_sample_rates_1us_switching_aod_tx = -1;
-static int hf_bthci_evt_supported_switching_sample_rates_1us_sampling_aod_rx = -1;
-static int hf_bthci_evt_supported_switching_sample_rates_1us_switching_and_sampling_aoa_rx = -1;
-static int hf_bthci_evt_supported_switching_sample_rates_reserved = -1;
+static int hf_bthci_evt_supported_switching_sample_rates;
+static int hf_bthci_evt_supported_switching_sample_rates_1us_switching_aod_tx;
+static int hf_bthci_evt_supported_switching_sample_rates_1us_sampling_aod_rx;
+static int hf_bthci_evt_supported_switching_sample_rates_1us_switching_and_sampling_aoa_rx;
+static int hf_bthci_evt_supported_switching_sample_rates_reserved;
 
 static int * const hfx_bthci_evt_supported_switching_sample_rates[] = {
     &hf_bthci_evt_supported_switching_sample_rates_1us_switching_aod_tx,
@@ -725,9 +725,9 @@ static int * const hfx_bthci_evt_supported_switching_sample_rates[] = {
     NULL
 };
 
-static int hf_bthci_evt_simple_pairing_options = -1;
-static int hf_bthci_evt_simple_pairing_options_remote_public_key_validation = -1;
-static int hf_bthci_evt_simple_pairing_options_reserved = -1;
+static int hf_bthci_evt_simple_pairing_options;
+static int hf_bthci_evt_simple_pairing_options_remote_public_key_validation;
+static int hf_bthci_evt_simple_pairing_options_reserved;
 
 static int * const hfx_bthci_evt_simple_pairing_options[] = {
     &hf_bthci_evt_simple_pairing_options_remote_public_key_validation,
@@ -735,10 +735,10 @@ static int * const hfx_bthci_evt_simple_pairing_options[] = {
     NULL
 };
 
-static int hf_bthci_evt_transmit_power_level_flags = -1;
-static int hf_bthci_evt_transmit_power_level_flags_minimum_power = -1;
-static int hf_bthci_evt_transmit_power_level_flags_maximum_power = -1;
-static int hf_bthci_evt_transmit_power_level_flags_reserved = -1;
+static int hf_bthci_evt_transmit_power_level_flags;
+static int hf_bthci_evt_transmit_power_level_flags_minimum_power;
+static int hf_bthci_evt_transmit_power_level_flags_maximum_power;
+static int hf_bthci_evt_transmit_power_level_flags_reserved;
 
 static int * const hfx_bthci_evt_transmit_power_level_flags[] = {
     &hf_bthci_evt_transmit_power_level_flags_minimum_power,
@@ -748,29 +748,29 @@ static int * const hfx_bthci_evt_transmit_power_level_flags[] = {
 };
 
 /* Initialize the subtree pointers */
-static gint ett_bthci_evt = -1;
-static gint ett_opcode = -1;
-static gint ett_lmp_subtree = -1;
-static gint ett_ptype_subtree = -1;
-static gint ett_le_state_subtree = -1;
-static gint ett_le_channel_map = -1;
-static gint ett_le_features = -1;
-static gint ett_le_report = -1;
-static gint ett_codecs = -1;
-static gint ett_mws_transport_layers = -1;
-static gint ett_mws_transport_layers_item = -1;
-static gint ett_mws_to_mws_baud_rates = -1;
-static gint ett_mws_to_mws_baud_rates_transport_item = -1;
-static gint ett_mws_from_mws_baud_rates = -1;
-static gint ett_mws_from_mws_baud_rates_transport_item = -1;
-static gint ett_expert = -1;
-static gint ett_le_ext_advts_event_type = -1;
-static gint ett_iq_sample_list = -1;
-static gint ett_iq_samples = -1;
-static gint ett_simple_pairing_options = -1;
-static gint ett_supported_switching_sample_rates = -1;
-static gint ett_transmit_power_level_flags = -1;
-static gint ett_adv_subevent_responses = -1;
+static gint ett_bthci_evt;
+static gint ett_opcode;
+static gint ett_lmp_subtree;
+static gint ett_ptype_subtree;
+static gint ett_le_state_subtree;
+static gint ett_le_channel_map;
+static gint ett_le_features;
+static gint ett_le_report;
+static gint ett_codecs;
+static gint ett_mws_transport_layers;
+static gint ett_mws_transport_layers_item;
+static gint ett_mws_to_mws_baud_rates;
+static gint ett_mws_to_mws_baud_rates_transport_item;
+static gint ett_mws_from_mws_baud_rates;
+static gint ett_mws_from_mws_baud_rates_transport_item;
+static gint ett_expert;
+static gint ett_le_ext_advts_event_type;
+static gint ett_iq_sample_list;
+static gint ett_iq_samples;
+static gint ett_simple_pairing_options;
+static gint ett_supported_switching_sample_rates;
+static gint ett_transmit_power_level_flags;
+static gint ett_adv_subevent_responses;
 
 extern value_string_ext ext_usb_vendors_vals;
 extern value_string_ext ext_usb_products_vals;
diff --git a/epan/dissectors/packet-bthci_iso.c b/epan/dissectors/packet-bthci_iso.c
index 02a7ea6457..a6045b293c 100644
--- a/epan/dissectors/packet-bthci_iso.c
+++ b/epan/dissectors/packet-bthci_iso.c
@@ -21,30 +21,30 @@
 #include "packet-bthci_iso.h"
 
 /* Initialize the protocol and registered fields */
-static int proto_bthci_iso = -1;
-static int hf_bthci_iso_chandle = -1;
-static int hf_bthci_iso_pb_flag = -1;
-static int hf_bthci_iso_ts_flag = -1;
-static int hf_bthci_iso_reserved = -1;
-static int hf_bthci_iso_data_length = -1;
-static int hf_bthci_iso_data = -1;
-static int hf_bthci_iso_continuation_to = -1;
-static int hf_bthci_iso_reassembled_in = -1;
-static int hf_bthci_iso_connect_in = -1;
-static int hf_bthci_iso_disconnect_in = -1;
-
-static int proto_bthci_iso_data = -1;
-static int hf_bthci_iso_data_timestamp = -1;
-static int hf_bthci_iso_data_packet_seq_num = -1;
-static int hf_bthci_iso_data_sdu_length = -1;
-static int hf_bthci_iso_data_status_flag = -1;
-static int hf_bthci_iso_data_sdu = -1;
+static int proto_bthci_iso;
+static int hf_bthci_iso_chandle;
+static int hf_bthci_iso_pb_flag;
+static int hf_bthci_iso_ts_flag;
+static int hf_bthci_iso_reserved;
+static int hf_bthci_iso_data_length;
+static int hf_bthci_iso_data;
+static int hf_bthci_iso_continuation_to;
+static int hf_bthci_iso_reassembled_in;
+static int hf_bthci_iso_connect_in;
+static int hf_bthci_iso_disconnect_in;
+
+static int proto_bthci_iso_data;
+static int hf_bthci_iso_data_timestamp;
+static int hf_bthci_iso_data_packet_seq_num;
+static int hf_bthci_iso_data_sdu_length;
+static int hf_bthci_iso_data_status_flag;
+static int hf_bthci_iso_data_sdu;
 
 /* Initialize the subtree pointers */
-static gint ett_bthci_iso = -1;
-static gint ett_bthci_iso_data = -1;
+static gint ett_bthci_iso;
+static gint ett_bthci_iso_data;
 
-static expert_field ei_length_bad = EI_INIT;
+static expert_field ei_length_bad;
 
 static dissector_handle_t bthci_iso_handle;
 static dissector_handle_t bthci_iso_data_handle;
diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c
index bd8372b0b2..85ab2acdd3 100644
--- a/epan/dissectors/packet-bthci_sco.c
+++ b/epan/dissectors/packet-bthci_sco.c
@@ -21,19 +21,19 @@
 #include "packet-bthci_sco.h"
 
 /* Initialize the protocol and registered fields */
-static int proto_bthci_sco = -1;
-static int hf_bthci_sco_reserved = -1;
-static int hf_bthci_sco_packet_status = -1;
-static int hf_bthci_sco_chandle = -1;
-static int hf_bthci_sco_length = -1;
-static int hf_bthci_sco_data = -1;
+static int proto_bthci_sco;
+static int hf_bthci_sco_reserved;
+static int hf_bthci_sco_packet_status;
+static int hf_bthci_sco_chandle;
+static int hf_bthci_sco_length;
+static int hf_bthci_sco_data;
 
-static int hf_bthci_sco_connect_in = -1;
-static int hf_bthci_sco_disconnect_in = -1;
-static int hf_bthci_sco_stream_number = -1;
+static int hf_bthci_sco_connect_in;
+static int hf_bthci_sco_disconnect_in;
+static int hf_bthci_sco_stream_number;
 
 /* Initialize the subtree pointers */
-static gint ett_bthci_sco = -1;
+static gint ett_bthci_sco;
 
 wmem_tree_t *bthci_sco_stream_numbers = NULL;
 
diff --git a/epan/dissectors/packet-bthci_vendor.c b/epan/dissectors/packet-bthci_vendor.c
index 9088f4717b..34eac6b242 100644
--- a/epan/dissectors/packet-bthci_vendor.c
+++ b/epan/dissectors/packet-bthci_vendor.c
@@ -20,99 +20,99 @@
 #include "packet-bthci_cmd.h"
 #include "packet-bthci_evt.h"
 
-static int proto_bthci_vendor_broadcom = -1;
-
-static int hf_broadcom_opcode = -1;
-static int hf_broadcom_opcode_ogf = -1;
-static int hf_broadcom_opcode_ocf = -1;
-static int hf_broadcom_parameter_length = -1;
-static int hf_broadcom_number_of_allowed_command_packets = -1;
-static int hf_broadcom_event_code = -1;
-static int hf_broadcom_le_advertising_filter_subcode = -1;
-static int hf_broadcom_le_scan_condition = -1;
-static int hf_broadcom_le_filter_index = -1;
-static int hf_broadcom_le_number_of_available_filters = -1;
-static int hf_broadcom_firmware = -1;
-static int hf_broadcom_firmware_address = -1;
-static int hf_broadcom_baudrate = -1;
-static int hf_broadcom_status = -1;
-static int hf_broadcom_bd_addr = -1;
-static int hf_broadcom_max_advertising_instance = -1;
-static int hf_broadcom_resolvable_private_address_offloading = -1;
-static int hf_broadcom_total_scan_results = -1;
-static int hf_broadcom_max_irk_list = -1;
-static int hf_broadcom_filter_support = -1;
-static int hf_broadcom_max_filter = -1;
-static int hf_broadcom_energy_support = -1;
-static int hf_broadcom_connection_handle = -1;
-static int hf_broadcom_connection_priority = -1;
-static int hf_broadcom_sleep_mode = -1;
-static int hf_broadcom_host_stack_idle_threshold = -1;
-static int hf_broadcom_host_controller_idle_threshold = -1;
-static int hf_broadcom_wake_polarity = -1;
-static int hf_broadcom_host_wake_polarity = -1;
-static int hf_broadcom_allow_host_sleep_during_sco = -1;
-static int hf_broadcom_combine_sleep_mode_and_lpm = -1;
-static int hf_broadcom_enable_uart_txd_tri_state = -1;
-static int hf_broadcom_sleep_guard_time = -1;
-static int hf_broadcom_wakeup_guard_time = -1;
-static int hf_broadcom_txd_config = -1;
-static int hf_broadcom_pulsed_host_wake = -1;
-static int hf_broadcom_uart_clock = -1;
-static int hf_broadcom_codec_state = -1;
-static int hf_broadcom_codec = -1;
-static int hf_broadcom_sco_pcm_routing = -1;
-static int hf_broadcom_sco_pcm_interface_clock_rate = -1;
-static int hf_broadcom_sco_pcm_interface_frame_type = -1;
-static int hf_broadcom_sco_pcm_interface_sync_mode = -1;
-static int hf_broadcom_sco_pcm_interface_clock_mode = -1;
-static int hf_broadcom_pcm_shift_mode = -1;
-static int hf_broadcom_pcm_fill_bits = -1;
-static int hf_broadcom_pcm_fill_method = -1;
-static int hf_broadcom_pcm_fill_number_of_bits = -1;
-static int hf_broadcom_pcm_justify_mode = -1;
-static int hf_broadcom_sco_i2s_pcm_interface_mode = -1;
-static int hf_broadcom_sco_i2s_pcm_interface_role = -1;
-static int hf_broadcom_sco_i2s_pcm_interface_sample_rate = -1;
-static int hf_broadcom_sco_i2s_pcm_interface_clock_rate = -1;
-static int hf_broadcom_le_energy_total_rx_time = -1;
-static int hf_broadcom_le_energy_total_tx_time = -1;
-static int hf_broadcom_le_energy_total_idle_time = -1;
-static int hf_broadcom_le_energy_total_energy_used = -1;
-static int hf_broadcom_le_batch_scan_subcode = -1;
-static int hf_broadcom_le_batch_scan_report_format = -1;
-static int hf_broadcom_le_batch_scan_number_of_records = -1;
-static int hf_broadcom_le_batch_scan_mode = -1;
-static int hf_broadcom_le_batch_scan_enable = -1;
-static int hf_broadcom_le_batch_scan_full_max = -1;
-static int hf_broadcom_le_batch_scan_truncate_max = -1;
-static int hf_broadcom_le_batch_scan_notify_threshold = -1;
-static int hf_broadcom_le_batch_scan_window = -1;
-static int hf_broadcom_le_batch_scan_interval = -1;
-static int hf_broadcom_le_batch_scan_address_type = -1;
-static int hf_broadcom_le_batch_scan_discard_rule = -1;
-static int hf_broadcom_le_multi_advertising_subcode = -1;
-static int hf_broadcom_le_multi_advertising_enable = -1;
-static int hf_broadcom_le_multi_advertising_instance_id = -1;
-static int hf_broadcom_le_multi_advertising_type = -1;
-static int hf_broadcom_le_multi_advertising_min_interval = -1;
-static int hf_broadcom_le_multi_advertising_max_interval = -1;
-static int hf_broadcom_le_multi_advertising_address_type = -1;
-static int hf_broadcom_le_multi_advertising_filter_policy = -1;
-static int hf_broadcom_le_multi_advertising_tx_power = -1;
-static int hf_broadcom_le_multi_advertising_channel_map = -1;
+static int proto_bthci_vendor_broadcom;
+
+static int hf_broadcom_opcode;
+static int hf_broadcom_opcode_ogf;
+static int hf_broadcom_opcode_ocf;
+static int hf_broadcom_parameter_length;
+static int hf_broadcom_number_of_allowed_command_packets;
+static int hf_broadcom_event_code;
+static int hf_broadcom_le_advertising_filter_subcode;
+static int hf_broadcom_le_scan_condition;
+static int hf_broadcom_le_filter_index;
+static int hf_broadcom_le_number_of_available_filters;
+static int hf_broadcom_firmware;
+static int hf_broadcom_firmware_address;
+static int hf_broadcom_baudrate;
+static int hf_broadcom_status;
+static int hf_broadcom_bd_addr;
+static int hf_broadcom_max_advertising_instance;
+static int hf_broadcom_resolvable_private_address_offloading;
+static int hf_broadcom_total_scan_results;
+static int hf_broadcom_max_irk_list;
+static int hf_broadcom_filter_support;
+static int hf_broadcom_max_filter;
+static int hf_broadcom_energy_support;
+static int hf_broadcom_connection_handle;
+static int hf_broadcom_connection_priority;
+static int hf_broadcom_sleep_mode;
+static int hf_broadcom_host_stack_idle_threshold;
+static int hf_broadcom_host_controller_idle_threshold;
+static int hf_broadcom_wake_polarity;
+static int hf_broadcom_host_wake_polarity;
+static int hf_broadcom_allow_host_sleep_during_sco;
+static int hf_broadcom_combine_sleep_mode_and_lpm;
+static int hf_broadcom_enable_uart_txd_tri_state;
+static int hf_broadcom_sleep_guard_time;
+static int hf_broadcom_wakeup_guard_time;
+static int hf_broadcom_txd_config;
+static int hf_broadcom_pulsed_host_wake;
+static int hf_broadcom_uart_clock;
+static int hf_broadcom_codec_state;
+static int hf_broadcom_codec;
+static int hf_broadcom_sco_pcm_routing;
+static int hf_broadcom_sco_pcm_interface_clock_rate;
+static int hf_broadcom_sco_pcm_interface_frame_type;
+static int hf_broadcom_sco_pcm_interface_sync_mode;
+static int hf_broadcom_sco_pcm_interface_clock_mode;
+static int hf_broadcom_pcm_shift_mode;
+static int hf_broadcom_pcm_fill_bits;
+static int hf_broadcom_pcm_fill_method;
+static int hf_broadcom_pcm_fill_number_of_bits;
+static int hf_broadcom_pcm_justify_mode;
+static int hf_broadcom_sco_i2s_pcm_interface_mode;
+static int hf_broadcom_sco_i2s_pcm_interface_role;
+static int hf_broadcom_sco_i2s_pcm_interface_sample_rate;
+static int hf_broadcom_sco_i2s_pcm_interface_clock_rate;
+static int hf_broadcom_le_energy_total_rx_time;
+static int hf_broadcom_le_energy_total_tx_time;
+static int hf_broadcom_le_energy_total_idle_time;
+static int hf_broadcom_le_energy_total_energy_used;
+static int hf_broadcom_le_batch_scan_subcode;
+static int hf_broadcom_le_batch_scan_report_format;
+static int hf_broadcom_le_batch_scan_number_of_records;
+static int hf_broadcom_le_batch_scan_mode;
+static int hf_broadcom_le_batch_scan_enable;
+static int hf_broadcom_le_batch_scan_full_max;
+static int hf_broadcom_le_batch_scan_truncate_max;
+static int hf_broadcom_le_batch_scan_notify_threshold;
+static int hf_broadcom_le_batch_scan_window;
+static int hf_broadcom_le_batch_scan_interval;
+static int hf_broadcom_le_batch_scan_address_type;
+static int hf_broadcom_le_batch_scan_discard_rule;
+static int hf_broadcom_le_multi_advertising_subcode;
+static int hf_broadcom_le_multi_advertising_enable;
+static int hf_broadcom_le_multi_advertising_instance_id;
+static int hf_broadcom_le_multi_advertising_type;
+static int hf_broadcom_le_multi_advertising_min_interval;
+static int hf_broadcom_le_multi_advertising_max_interval;
+static int hf_broadcom_le_multi_advertising_address_type;
+static int hf_broadcom_le_multi_advertising_filter_policy;
+static int hf_broadcom_le_multi_advertising_tx_power;
+static int hf_broadcom_le_multi_advertising_channel_map;
 static int hf_broadcom_le_multi_advertising_channel_map_reserved;
-static int hf_broadcom_le_multi_advertising_channel_map_39 = -1;
-static int hf_broadcom_le_multi_advertising_channel_map_38 = -1;
-static int hf_broadcom_le_multi_advertising_channel_map_37 = -1;
-static int hf_broadcom_hid_emulation_mode = -1;
-static int hf_broadcom_vid = -1;
-static int hf_broadcom_pid = -1;
-static int hf_broadcom_chip_id = -1;
-static int hf_broadcom_target_id = -1;
-static int hf_broadcom_build_base = -1;
-static int hf_broadcom_build_number = -1;
-static int hf_broadcom_data = -1;
+static int hf_broadcom_le_multi_advertising_channel_map_39;
+static int hf_broadcom_le_multi_advertising_channel_map_38;
+static int hf_broadcom_le_multi_advertising_channel_map_37;
+static int hf_broadcom_hid_emulation_mode;
+static int hf_broadcom_vid;
+static int hf_broadcom_pid;
+static int hf_broadcom_chip_id;
+static int hf_broadcom_target_id;
+static int hf_broadcom_build_base;
+static int hf_broadcom_build_number;
+static int hf_broadcom_data;
 
 static int * const hfx_le_multi_advertising_channel_map[] = {
     &hf_broadcom_le_multi_advertising_channel_map_reserved,
@@ -122,13 +122,13 @@ static int * const hfx_le_multi_advertising_channel_map[] = {
     NULL
 };
 
-static gint ett_broadcom = -1;
-static gint ett_broadcom_opcode = -1;
-static gint ett_broadcom_channel_map = -1;
+static gint ett_broadcom;
+static gint ett_broadcom_opcode;
+static gint ett_broadcom_channel_map;
 
-static expert_field ei_broadcom_undecoded = EI_INIT;
-static expert_field ei_broadcom_unexpected_parameter = EI_INIT;
-static expert_field ei_broadcom_unexpected_data = EI_INIT;
+static expert_field ei_broadcom_undecoded;
+static expert_field ei_broadcom_unexpected_parameter;
+static expert_field ei_broadcom_unexpected_data;
 
 static dissector_handle_t bthci_vendor_broadcom_handle;
 static dissector_handle_t btcommon_ad_handle;
@@ -1533,80 +1533,80 @@ proto_reg_handoff_bthci_vendor_broadcom(void)
 
 
 
-static int proto_bthci_vendor_intel = -1;
-
-static int hf_intel_opcode = -1;
-static int hf_intel_opcode_ogf = -1;
-static int hf_intel_opcode_ocf = -1;
-static int hf_intel_parameter_length = -1;
-static int hf_intel_number_of_allowed_command_packets = -1;
-static int hf_intel_event_code = -1;
-static int hf_intel_status = -1;
-static int hf_intel_line = -1;
-static int hf_intel_module = -1;
-static int hf_intel_reason = -1;
-static int hf_intel_zero = -1;
-static int hf_intel_number_of_packets = -1;
-static int hf_intel_source = -1;
-static int hf_intel_reset_type = -1;
-static int hf_intel_reset_reason = -1;
-static int hf_intel_ddc_status = -1;
-static int hf_intel_bd_data_status = -1;
-static int hf_intel_secure_send_commands_result = -1;
-static int hf_intel_handle = -1;
-static int hf_intel_access_address = -1;
-static int hf_intel_scan_status = -1;
-static int hf_intel_scan_status_reserved = -1;
-static int hf_intel_scan_status_page_scan = -1;
-static int hf_intel_scan_status_inquiry_scan = -1;
-static int hf_intel_link_pdu_trace_type = -1;
-static int hf_intel_link_clock = -1;
-static int hf_intel_link_id = -1;
-static int hf_intel_link_count = -1;
-static int hf_intel_bd_addr = -1;
-static int hf_intel_packet_table = -1;
-static int hf_intel_exception_type = -1;
-static int hf_intel_reset_reset_type = -1;
-static int hf_intel_reset_patch_enable = -1;
-static int hf_intel_reset_ddc_reload = -1;
-static int hf_intel_reset_boot_option = -1;
-static int hf_intel_reset_boot_address = -1;
-static int hf_intel_hardware_platform = -1;
-static int hf_intel_hardware_variant = -1;
-static int hf_intel_hardware_revision = -1;
-static int hf_intel_firmware_variant = -1;
-static int hf_intel_firmware_revision = -1;
-static int hf_intel_firmware_build_version_nn = -1;
-static int hf_intel_firmware_build_version_cw = -1;
-static int hf_intel_firmware_build_version_yy = -1;
-static int hf_intel_firmware_patch = -1;
-static int hf_intel_identifier = -1;
-static int hf_intel_secure_send_type = -1;
-static int hf_intel_manufacturer_mode = -1;
-static int hf_intel_manufacturer_reset = -1;
-static int hf_intel_transmit_traces = -1;
-static int hf_intel_transmit_arq = -1;
-static int hf_intel_receive_traces = -1;
-static int hf_intel_stimulated_exception_type = -1;
-static int hf_intel_mem_address = -1;
-static int hf_intel_mem_mode = -1;
-static int hf_intel_mem_length = -1;
-static int hf_intel_ddc_config_length = -1;
-static int hf_intel_set_event_mask = -1;
-static int hf_intel_set_event_mask_reserved_15_63 = -1;
-static int hf_intel_set_event_mask_firmware_trace_string = -1;
-static int hf_intel_set_event_mask_le_link_established = -1;
-static int hf_intel_set_event_mask_reserved_12 = -1;
-static int hf_intel_set_event_mask_system_exception = -1;
-static int hf_intel_set_event_mask_fatal_exception = -1;
-static int hf_intel_set_event_mask_debug_exception = -1;
-static int hf_intel_set_event_mask_reserved_8 = -1;
-static int hf_intel_set_event_mask_scan_status = -1;
-static int hf_intel_set_event_mask_reserved_3_6 = -1;
-static int hf_intel_set_event_mask_ptt_switch_notification = -1;
-static int hf_intel_set_event_mask_sco_rejected_via_lmp = -1;
-static int hf_intel_set_event_mask_bootup = -1;
-static int hf_intel_data = -1;
+static int proto_bthci_vendor_intel;
+
+static int hf_intel_opcode;
+static int hf_intel_opcode_ogf;
+static int hf_intel_opcode_ocf;
+static int hf_intel_parameter_length;
+static int hf_intel_number_of_allowed_command_packets;
+static int hf_intel_event_code;
+static int hf_intel_status;
+static int hf_intel_line;
+static int hf_intel_module;
+static int hf_intel_reason;
+static int hf_intel_zero;
+static int hf_intel_number_of_packets;
+static int hf_intel_source;
+static int hf_intel_reset_type;
+static int hf_intel_reset_reason;
+static int hf_intel_ddc_status;
+static int hf_intel_bd_data_status;
+static int hf_intel_secure_send_commands_result;
+static int hf_intel_handle;
+static int hf_intel_access_address;
+static int hf_intel_scan_status;
+static int hf_intel_scan_status_reserved;
+static int hf_intel_scan_status_page_scan;
+static int hf_intel_scan_status_inquiry_scan;
+static int hf_intel_link_pdu_trace_type;
+static int hf_intel_link_clock;
+static int hf_intel_link_id;
+static int hf_intel_link_count;
+static int hf_intel_bd_addr;
+static int hf_intel_packet_table;
+static int hf_intel_exception_type;
+static int hf_intel_reset_reset_type;
+static int hf_intel_reset_patch_enable;
+static int hf_intel_reset_ddc_reload;
+static int hf_intel_reset_boot_option;
+static int hf_intel_reset_boot_address;
+static int hf_intel_hardware_platform;
+static int hf_intel_hardware_variant;
+static int hf_intel_hardware_revision;
+static int hf_intel_firmware_variant;
+static int hf_intel_firmware_revision;
+static int hf_intel_firmware_build_version_nn;
+static int hf_intel_firmware_build_version_cw;
+static int hf_intel_firmware_build_version_yy;
+static int hf_intel_firmware_patch;
+static int hf_intel_identifier;
+static int hf_intel_secure_send_type;
+static int hf_intel_manufacturer_mode;
+static int hf_intel_manufacturer_reset;
+static int hf_intel_transmit_traces;
+static int hf_intel_transmit_arq;
+static int hf_intel_receive_traces;
+static int hf_intel_stimulated_exception_type;
+static int hf_intel_mem_address;
+static int hf_intel_mem_mode;
+static int hf_intel_mem_length;
+static int hf_intel_ddc_config_length;
+static int hf_intel_set_event_mask;
+static int hf_intel_set_event_mask_reserved_15_63;
+static int hf_intel_set_event_mask_firmware_trace_string;
+static int hf_intel_set_event_mask_le_link_established;
+static int hf_intel_set_event_mask_reserved_12;
+static int hf_intel_set_event_mask_system_exception;
+static int hf_intel_set_event_mask_fatal_exception;
+static int hf_intel_set_event_mask_debug_exception;
+static int hf_intel_set_event_mask_reserved_8;
+static int hf_intel_set_event_mask_scan_status;
+static int hf_intel_set_event_mask_reserved_3_6;
+static int hf_intel_set_event_mask_ptt_switch_notification;
+static int hf_intel_set_event_mask_sco_rejected_via_lmp;
+static int hf_intel_set_event_mask_bootup;
+static int hf_intel_data;
 
 static int * const hfx_intel_scan_status[] = {
     &hf_intel_scan_status_reserved,
@@ -1636,14 +1636,14 @@ static dissector_handle_t bthci_vendor_intel_handle;
 static dissector_handle_t btlmp_handle;
 static dissector_handle_t btle_handle;
 
-static gint ett_intel = -1;
-static gint ett_intel_opcode = -1;
-static gint ett_intel_scan_status = -1;
-static gint ett_intel_set_event_mask = -1;
+static gint ett_intel;
+static gint ett_intel_opcode;
+static gint ett_intel_scan_status;
+static gint ett_intel_set_event_mask;
 
-static expert_field ei_intel_undecoded = EI_INIT;
-static expert_field ei_intel_unexpected_parameter = EI_INIT;
-static expert_field ei_intel_unexpected_data = EI_INIT;
+static expert_field ei_intel_undecoded;
+static expert_field ei_intel_unexpected_parameter;
+static expert_field ei_intel_unexpected_data;
 
 #define INTEL_OPCODE_VALS(base) \
     { (base) | 0x0001,  "Reset" }, \
diff --git a/epan/dissectors/packet-bthcrp.c b/epan/dissectors/packet-bthcrp.c
index 431b90c993..ce5992bafe 100644
--- a/epan/dissectors/packet-bthcrp.c
+++ b/epan/dissectors/packet-bthcrp.c
@@ -25,37 +25,37 @@ enum {
     FORCE_CLIENT_NO       = 2
 };
 
-static int proto_bthcrp = -1;
-
-static int hf_bthcrp_notification_pdu_id                                   = -1;
-static int hf_bthcrp_control_pdu_id                                        = -1;
-static int hf_bthcrp_control_transaction_id                                = -1;
-static int hf_bthcrp_control_parameter_length                              = -1;
-static int hf_bthcrp_control_status                                        = -1;
-static int hf_bthcrp_callback_context_id                                   = -1;
-static int hf_bthcrp_control_callback_timeout                              = -1;
-static int hf_bthcrp_control_timeout                                       = -1;
-static int hf_bthcrp_control_1284_id                                       = -1;
-static int hf_bthcrp_control_register                                      = -1;
-static int hf_bthcrp_control_start_byte                                    = -1;
-static int hf_bthcrp_control_number_of_bytes                               = -1;
-static int hf_bthcrp_control_client_credit_granted                         = -1;
-static int hf_bthcrp_control_server_credit_granted                         = -1;
-static int hf_bthcrp_control_client_credit_return                          = -1;
-static int hf_bthcrp_control_server_credit_return                          = -1;
-static int hf_bthcrp_control_client_credit_query                           = -1;
-static int hf_bthcrp_control_server_credit_query                           = -1;
-static int hf_bthcrp_control_status_reserved_76                            = -1;
-static int hf_bthcrp_control_status_paper_empty                            = -1;
-static int hf_bthcrp_control_status_select                                 = -1;
-static int hf_bthcrp_control_status_not_error                              = -1;
-static int hf_bthcrp_control_status_reserved_20                            = -1;
-static int hf_bthcrp_data                                                  = -1;
-
-static gint ett_bthcrp                                                     = -1;
-
-static expert_field ei_bthcrp_control_parameter_length = EI_INIT;
-static expert_field ei_bthcrp_unexpected_data = EI_INIT;
+static int proto_bthcrp;
+
+static int hf_bthcrp_notification_pdu_id;
+static int hf_bthcrp_control_pdu_id;
+static int hf_bthcrp_control_transaction_id;
+static int hf_bthcrp_control_parameter_length;
+static int hf_bthcrp_control_status;
+static int hf_bthcrp_callback_context_id;
+static int hf_bthcrp_control_callback_timeout;
+static int hf_bthcrp_control_timeout;
+static int hf_bthcrp_control_1284_id;
+static int hf_bthcrp_control_register;
+static int hf_bthcrp_control_start_byte;
+static int hf_bthcrp_control_number_of_bytes;
+static int hf_bthcrp_control_client_credit_granted;
+static int hf_bthcrp_control_server_credit_granted;
+static int hf_bthcrp_control_client_credit_return;
+static int hf_bthcrp_control_server_credit_return;
+static int hf_bthcrp_control_client_credit_query;
+static int hf_bthcrp_control_server_credit_query;
+static int hf_bthcrp_control_status_reserved_76;
+static int hf_bthcrp_control_status_paper_empty;
+static int hf_bthcrp_control_status_select;
+static int hf_bthcrp_control_status_not_error;
+static int hf_bthcrp_control_status_reserved_20;
+static int hf_bthcrp_data;
+
+static gint ett_bthcrp;
+
+static expert_field ei_bthcrp_control_parameter_length;
+static expert_field ei_bthcrp_unexpected_data;
 
 static dissector_handle_t bthcrp_handle;
 
diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c
index 378dfc5cd7..2e6bc45138 100644
--- a/epan/dissectors/packet-bthfp.c
+++ b/epan/dissectors/packet-bthfp.c
@@ -24,158 +24,158 @@
 #include "packet-btrfcomm.h"
 #include "packet-btsdp.h"
 
-static int proto_bthfp = -1;
-
-static int hf_command                                                      = -1;
-static int hf_parameters                                                   = -1;
-static int hf_role                                                         = -1;
-static int hf_at_cmd                                                       = -1;
-static int hf_at_cmd_type                                                  = -1;
-static int hf_at_command_line_prefix                                       = -1;
-static int hf_at_ignored                                                   = -1;
-static int hf_parameter                                                    = -1;
-static int hf_unknown_parameter                                            = -1;
-static int hf_data                                                         = -1;
-static int hf_fragment                                                     = -1;
-static int hf_fragmented                                                   = -1;
-static int hf_brsf_hs                                                      = -1;
-static int hf_brsf_hs_ec_nr_function                                       = -1;
-static int hf_brsf_hs_call_waiting_or_tree_way                             = -1;
-static int hf_brsf_hs_cli_presentation                                     = -1;
-static int hf_brsf_hs_voice_recognition_activation                         = -1;
-static int hf_brsf_hs_remote_volume_control                                = -1;
-static int hf_brsf_hs_enhanced_call_status                                 = -1;
-static int hf_brsf_hs_enhanced_call_control                                = -1;
-static int hf_brsf_hs_codec_negotiation                                    = -1;
-static int hf_brsf_hs_hf_indicators                                        = -1;
-static int hf_brsf_hs_esco_s4_t2_settings_support                          = -1;
-static int hf_brsf_hs_reserved                                             = -1;
-static int hf_brsf_ag                                                      = -1;
-static int hf_brsf_ag_three_way_calling                                    = -1;
-static int hf_brsf_ag_ec_nr_function                                       = -1;
-static int hf_brsf_ag_voice_recognition_function                           = -1;
-static int hf_brsf_ag_inband_ring_tone                                     = -1;
-static int hf_brsf_ag_attach_number_to_voice_tag                           = -1;
-static int hf_brsf_ag_ability_to_reject_a_call                             = -1;
-static int hf_brsf_ag_enhanced_call_status                                 = -1;
-static int hf_brsf_ag_enhanced_call_control                                = -1;
-static int hf_brsf_ag_extended_error_result_codes                          = -1;
-static int hf_brsf_ag_codec_negotiation                                    = -1;
-static int hf_brsf_ag_hf_indicators                                        = -1;
-static int hf_brsf_ag_esco_s4_t2_settings_support                          = -1;
-static int hf_brsf_ag_reserved                                             = -1;
-static int hf_vgs                                                          = -1;
-static int hf_vgm                                                          = -1;
-static int hf_nrec                                                         = -1;
-static int hf_bvra_vrect                                                   = -1;
-static int hf_bsir                                                         = -1;
-static int hf_btrh                                                         = -1;
-static int hf_chld_mode                                                    = -1;
-static int hf_chld_mode_1x                                                 = -1;
-static int hf_chld_mode_2x                                                 = -1;
-static int hf_chld_supported_modes                                         = -1;
-static int hf_cmer_mode                                                    = -1;
-static int hf_cmer_keyp                                                    = -1;
-static int hf_cmer_disp                                                    = -1;
-static int hf_cmer_ind                                                     = -1;
-static int hf_cmer_bfr                                                     = -1;
-static int hf_cmee                                                         = -1;
-static int hf_cme_error                                                    = -1;
-static int hf_cnum_speed                                                   = -1;
-static int hf_cnum_service                                                 = -1;
-static int hf_cnum_itc                                                     = -1;
-static int hf_bcs_codec                                                    = -1;
-static int hf_bac_codec                                                    = -1;
-static int hf_binp_request                                                 = -1;
-static int hf_binp_response                                                = -1;
-static int hf_ciev_indicator_index                                         = -1;
-static int hf_vts_dtmf                                                     = -1;
-static int hf_vts_duration                                                 = -1;
-static int hf_cops_mode                                                    = -1;
-static int hf_cops_format                                                  = -1;
-static int hf_cops_operator                                                = -1;
-static int hf_cops_act                                                     = -1;
-static int hf_at_number                                                    = -1;
-static int hf_at_type                                                      = -1;
-static int hf_at_subaddress                                                = -1;
-static int hf_at_subaddress_type                                           = -1;
-static int hf_at_alpha                                                     = -1;
-static int hf_at_priority                                                  = -1;
-static int hf_at_cli_validity                                              = -1;
-static int hf_clip_mode                                                    = -1;
-static int hf_clip_status                                                  = -1;
-static int hf_clcc_id                                                      = -1;
-static int hf_clcc_dir                                                     = -1;
-static int hf_clcc_stat                                                    = -1;
-static int hf_clcc_mode                                                    = -1;
-static int hf_clcc_mpty                                                    = -1;
-static int hf_ccwa_show_result_code                                        = -1;
-static int hf_ccwa_mode                                                    = -1;
-static int hf_ccwa_class                                                   = -1;
-static int hf_biev_assigned_number                                         = -1;
-static int hf_biev_value                                                   = -1;
-static int hf_bind_parameter                                               = -1;
+static int proto_bthfp;
+
+static int hf_command;
+static int hf_parameters;
+static int hf_role;
+static int hf_at_cmd;
+static int hf_at_cmd_type;
+static int hf_at_command_line_prefix;
+static int hf_at_ignored;
+static int hf_parameter;
+static int hf_unknown_parameter;
+static int hf_data;
+static int hf_fragment;
+static int hf_fragmented;
+static int hf_brsf_hs;
+static int hf_brsf_hs_ec_nr_function;
+static int hf_brsf_hs_call_waiting_or_tree_way;
+static int hf_brsf_hs_cli_presentation;
+static int hf_brsf_hs_voice_recognition_activation;
+static int hf_brsf_hs_remote_volume_control;
+static int hf_brsf_hs_enhanced_call_status;
+static int hf_brsf_hs_enhanced_call_control;
+static int hf_brsf_hs_codec_negotiation;
+static int hf_brsf_hs_hf_indicators;
+static int hf_brsf_hs_esco_s4_t2_settings_support;
+static int hf_brsf_hs_reserved;
+static int hf_brsf_ag;
+static int hf_brsf_ag_three_way_calling;
+static int hf_brsf_ag_ec_nr_function;
+static int hf_brsf_ag_voice_recognition_function;
+static int hf_brsf_ag_inband_ring_tone;
+static int hf_brsf_ag_attach_number_to_voice_tag;
+static int hf_brsf_ag_ability_to_reject_a_call;
+static int hf_brsf_ag_enhanced_call_status;
+static int hf_brsf_ag_enhanced_call_control;
+static int hf_brsf_ag_extended_error_result_codes;
+static int hf_brsf_ag_codec_negotiation;
+static int hf_brsf_ag_hf_indicators;
+static int hf_brsf_ag_esco_s4_t2_settings_support;
+static int hf_brsf_ag_reserved;
+static int hf_vgs;
+static int hf_vgm;
+static int hf_nrec;
+static int hf_bvra_vrect;
+static int hf_bsir;
+static int hf_btrh;
+static int hf_chld_mode;
+static int hf_chld_mode_1x;
+static int hf_chld_mode_2x;
+static int hf_chld_supported_modes;
+static int hf_cmer_mode;
+static int hf_cmer_keyp;
+static int hf_cmer_disp;
+static int hf_cmer_ind;
+static int hf_cmer_bfr;
+static int hf_cmee;
+static int hf_cme_error;
+static int hf_cnum_speed;
+static int hf_cnum_service;
+static int hf_cnum_itc;
+static int hf_bcs_codec;
+static int hf_bac_codec;
+static int hf_binp_request;
+static int hf_binp_response;
+static int hf_ciev_indicator_index;
+static int hf_vts_dtmf;
+static int hf_vts_duration;
+static int hf_cops_mode;
+static int hf_cops_format;
+static int hf_cops_operator;
+static int hf_cops_act;
+static int hf_at_number;
+static int hf_at_type;
+static int hf_at_subaddress;
+static int hf_at_subaddress_type;
+static int hf_at_alpha;
+static int hf_at_priority;
+static int hf_at_cli_validity;
+static int hf_clip_mode;
+static int hf_clip_status;
+static int hf_clcc_id;
+static int hf_clcc_dir;
+static int hf_clcc_stat;
+static int hf_clcc_mode;
+static int hf_clcc_mpty;
+static int hf_ccwa_show_result_code;
+static int hf_ccwa_mode;
+static int hf_ccwa_class;
+static int hf_biev_assigned_number;
+static int hf_biev_value;
+static int hf_bind_parameter;
 static int hf_bia_indicator[20];
 static int hf_indicator[20];
-static int hf_aplefm_state                                                 = -1;
-static int hf_aplsiri_state                                                = -1;
-static int hf_iphoneaccev_count                                            = -1;
-static int hf_iphoneaccev_key                                              = -1;
-static int hf_iphoneaccev_value                                            = -1;
-static int hf_xapl_accessory_info                                          = -1;
-static int hf_xapl_accessory_info_vendor_id                                = -1;
-static int hf_xapl_accessory_info_product_id                               = -1;
-static int hf_xapl_accessory_info_version                                  = -1;
-static int hf_xapl_host_info                                               = -1;
-static int hf_xapl_features                                                = -1;
-static int hf_xapl_features_reserved_x                                     = -1;
-static int hf_xapl_features_noise_reduction_status_reporting               = -1;
-static int hf_xapl_features_siri_status_reporting                          = -1;
-static int hf_xapl_features_docked_or_powered                              = -1;
-static int hf_xapl_features_battery_reporting                              = -1;
-static int hf_xapl_features_reserved                                       = -1;
-
-static expert_field ei_non_mandatory_command                          = EI_INIT;
-static expert_field ei_invalid_usage                                  = EI_INIT;
-static expert_field ei_unknown_parameter                              = EI_INIT;
-static expert_field ei_brfs_hs_reserved_bits                          = EI_INIT;
-static expert_field ei_brfs_ag_reserved_bits                          = EI_INIT;
-static expert_field ei_vgm_gain                                       = EI_INIT;
-static expert_field ei_vgs_gain                                       = EI_INIT;
-static expert_field ei_nrec                                           = EI_INIT;
-static expert_field ei_bvra                                           = EI_INIT;
-static expert_field ei_bcs                                            = EI_INIT;
-static expert_field ei_bac                                            = EI_INIT;
-static expert_field ei_bsir                                           = EI_INIT;
-static expert_field ei_btrh                                           = EI_INIT;
-static expert_field ei_binp                                           = EI_INIT;
-static expert_field ei_biev_assigned_number                           = EI_INIT;
-static expert_field ei_biev_assigned_number_no                        = EI_INIT;
-static expert_field ei_bia                                            = EI_INIT;
-static expert_field ei_cmer_mode                                      = EI_INIT;
-static expert_field ei_cmer_keyp                                      = EI_INIT;
-static expert_field ei_cmer_disp                                      = EI_INIT;
-static expert_field ei_cmer_ind                                       = EI_INIT;
-static expert_field ei_cmer_btr                                       = EI_INIT;
-static expert_field ei_chld_mode                                      = EI_INIT;
-static expert_field ei_ciev_indicator                                 = EI_INIT;
-static expert_field ei_vts_dtmf                                       = EI_INIT;
-static expert_field ei_at_type                                        = EI_INIT;
-static expert_field ei_cnum_service                                   = EI_INIT;
-static expert_field ei_cnum_itc                                       = EI_INIT;
-static expert_field ei_aplefm_out_of_range                            = EI_INIT;
-static expert_field ei_aplsiri_out_of_range                           = EI_INIT;
-static expert_field ei_iphoneaccev_key_out_of_range                   = EI_INIT;
-static expert_field ei_xapl_features_reserved                         = EI_INIT;
-static expert_field ei_parameter_blank                                = EI_INIT;
-
-static gint ett_bthfp            = -1;
-static gint ett_bthfp_command    = -1;
-static gint ett_bthfp_parameters = -1;
-static gint ett_bthfp_brsf_hf    = -1;
-static gint ett_bthfp_brsf_ag    = -1;
-static gint ett_bthfp_xapl_features = -1;
-static gint ett_bthfp_xapl_accessory_info = -1;
+static int hf_aplefm_state;
+static int hf_aplsiri_state;
+static int hf_iphoneaccev_count;
+static int hf_iphoneaccev_key;
+static int hf_iphoneaccev_value;
+static int hf_xapl_accessory_info;
+static int hf_xapl_accessory_info_vendor_id;
+static int hf_xapl_accessory_info_product_id;
+static int hf_xapl_accessory_info_version;
+static int hf_xapl_host_info;
+static int hf_xapl_features;
+static int hf_xapl_features_reserved_x;
+static int hf_xapl_features_noise_reduction_status_reporting;
+static int hf_xapl_features_siri_status_reporting;
+static int hf_xapl_features_docked_or_powered;
+static int hf_xapl_features_battery_reporting;
+static int hf_xapl_features_reserved;
+
+static expert_field ei_non_mandatory_command;
+static expert_field ei_invalid_usage;
+static expert_field ei_unknown_parameter;
+static expert_field ei_brfs_hs_reserved_bits;
+static expert_field ei_brfs_ag_reserved_bits;
+static expert_field ei_vgm_gain;
+static expert_field ei_vgs_gain;
+static expert_field ei_nrec;
+static expert_field ei_bvra;
+static expert_field ei_bcs;
+static expert_field ei_bac;
+static expert_field ei_bsir;
+static expert_field ei_btrh;
+static expert_field ei_binp;
+static expert_field ei_biev_assigned_number;
+static expert_field ei_biev_assigned_number_no;
+static expert_field ei_bia;
+static expert_field ei_cmer_mode;
+static expert_field ei_cmer_keyp;
+static expert_field ei_cmer_disp;
+static expert_field ei_cmer_ind;
+static expert_field ei_cmer_btr;
+static expert_field ei_chld_mode;
+static expert_field ei_ciev_indicator;
+static expert_field ei_vts_dtmf;
+static expert_field ei_at_type;
+static expert_field ei_cnum_service;
+static expert_field ei_cnum_itc;
+static expert_field ei_aplefm_out_of_range;
+static expert_field ei_aplsiri_out_of_range;
+static expert_field ei_iphoneaccev_key_out_of_range;
+static expert_field ei_xapl_features_reserved;
+static expert_field ei_parameter_blank;
+
+static gint ett_bthfp;
+static gint ett_bthfp_command;
+static gint ett_bthfp_parameters;
+static gint ett_bthfp_brsf_hf;
+static gint ett_bthfp_brsf_ag;
+static gint ett_bthfp_xapl_features;
+static gint ett_bthfp_xapl_accessory_info;
 
 static dissector_handle_t bthfp_handle;
 
diff --git a/epan/dissectors/packet-bthid.c b/epan/dissectors/packet-bthid.c
index 99bfe5191e..35646b3efd 100644
--- a/epan/dissectors/packet-bthid.c
+++ b/epan/dissectors/packet-bthid.c
@@ -19,27 +19,27 @@
 #include "packet-btl2cap.h"
 #include "packet-btsdp.h"
 
-static int proto_bthid                                                     = -1;
-static int hf_bthid_transaction_type                                       = -1;
-static int hf_bthid_parameter_reserved                                     = -1;
-static int hf_bthid_parameter_reserved_31                                  = -1;
-static int hf_bthid_parameter_reserved_32                                  = -1;
-static int hf_bthid_parameter_reserved_2                                   = -1;
-static int hf_bthid_parameter_result_code                                  = -1;
-static int hf_bthid_parameter_control_operation                            = -1;
-static int hf_bthid_parameter_size                                         = -1;
-static int hf_bthid_protocol                                               = -1;
-static int hf_bthid_idle_rate                                              = -1;
-static int hf_bthid_parameter_report_type                                  = -1;
-static int hf_bthid_report_id                                              = -1;
-static int hf_bthid_buffer_size                                            = -1;
-static int hf_bthid_protocol_code                                          = -1;
-static int hf_bthid_data                                                   = -1;
-
-static gint ett_bthid             = -1;
-
-static expert_field ei_bthid_parameter_control_operation_deprecated = EI_INIT;
-static expert_field ei_bthid_transaction_type_deprecated = EI_INIT;
+static int proto_bthid;
+static int hf_bthid_transaction_type;
+static int hf_bthid_parameter_reserved;
+static int hf_bthid_parameter_reserved_31;
+static int hf_bthid_parameter_reserved_32;
+static int hf_bthid_parameter_reserved_2;
+static int hf_bthid_parameter_result_code;
+static int hf_bthid_parameter_control_operation;
+static int hf_bthid_parameter_size;
+static int hf_bthid_protocol;
+static int hf_bthid_idle_rate;
+static int hf_bthid_parameter_report_type;
+static int hf_bthid_report_id;
+static int hf_bthid_buffer_size;
+static int hf_bthid_protocol_code;
+static int hf_bthid_data;
+
+static gint ett_bthid;
+
+static expert_field ei_bthid_parameter_control_operation_deprecated;
+static expert_field ei_bthid_transaction_type_deprecated;
 
 static dissector_handle_t bthid_handle;
 static dissector_handle_t usb_hid_boot_keyboard_input_report_handle;
diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c
index f57ac969dc..13465629c8 100644
--- a/epan/dissectors/packet-bthsp.c
+++ b/epan/dissectors/packet-bthsp.c
@@ -19,36 +19,36 @@
 #include "packet-btrfcomm.h"
 #include "packet-btsdp.h"
 
-static int proto_bthsp = -1;
-
-static int hf_command                                                      = -1;
-static int hf_parameters                                                   = -1;
-static int hf_command_in                                                   = -1;
-static int hf_unsolicited                                                  = -1;
-static int hf_role                                                         = -1;
-static int hf_at_cmd                                                       = -1;
-static int hf_at_cmd_type                                                  = -1;
-static int hf_at_command_line_prefix                                       = -1;
-static int hf_at_ignored                                                   = -1;
-static int hf_parameter                                                    = -1;
-static int hf_unknown_parameter                                            = -1;
-static int hf_data                                                         = -1;
-static int hf_fragment                                                     = -1;
-static int hf_fragmented                                                   = -1;
-static int hf_vgs                                                          = -1;
-static int hf_vgm                                                          = -1;
-static int hf_ckpd                                                         = -1;
-
-static expert_field ei_non_mandatory_command                          = EI_INIT;
-static expert_field ei_invalid_usage                                  = EI_INIT;
-static expert_field ei_unknown_parameter                              = EI_INIT;
-static expert_field ei_vgm_gain                                       = EI_INIT;
-static expert_field ei_vgs_gain                                       = EI_INIT;
-static expert_field ei_ckpd                                           = EI_INIT;
-
-static gint ett_bthsp            = -1;
-static gint ett_bthsp_command    = -1;
-static gint ett_bthsp_parameters = -1;
+static int proto_bthsp;
+
+static int hf_command;
+static int hf_parameters;
+static int hf_command_in;
+static int hf_unsolicited;
+static int hf_role;
+static int hf_at_cmd;
+static int hf_at_cmd_type;
+static int hf_at_command_line_prefix;
+static int hf_at_ignored;
+static int hf_parameter;
+static int hf_unknown_parameter;
+static int hf_data;
+static int hf_fragment;
+static int hf_fragmented;
+static int hf_vgs;
+static int hf_vgm;
+static int hf_ckpd;
+
+static expert_field ei_non_mandatory_command;
+static expert_field ei_invalid_usage;
+static expert_field ei_unknown_parameter;
+static expert_field ei_vgm_gain;
+static expert_field ei_vgs_gain;
+static expert_field ei_ckpd;
+
+static gint ett_bthsp;
+static gint ett_bthsp_command;
+static gint ett_bthsp_parameters;
 
 static dissector_handle_t bthsp_handle;
 
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c
index d1b940387b..f044b9cf71 100644
--- a/epan/dissectors/packet-btl2cap.c
+++ b/epan/dissectors/packet-btl2cap.c
@@ -32,131 +32,131 @@
 #include "packet-btl2cap.h"
 
 /* Initialize the protocol and registered fields */
-int proto_btl2cap = -1;
-
-static int hf_btl2cap_length = -1;
-static int hf_btl2cap_cid = -1;
-static int hf_btl2cap_payload = -1;
-static int hf_btl2cap_command = -1;
-static int hf_btl2cap_cmd_code = -1;
-static int hf_btl2cap_cmd_ident = -1;
-static int hf_btl2cap_cmd_length = -1;
-static int hf_btl2cap_cmd_data = -1;
-static int hf_btl2cap_psm = -1;
-static int hf_btl2cap_psm_dynamic = -1;
-static int hf_btl2cap_scid = -1;
-static int hf_btl2cap_dcid = -1;
-static int hf_btl2cap_icid = -1;
-static int hf_btl2cap_controller = -1;
-static int hf_btl2cap_dcontroller = -1;
-static int hf_btl2cap_result = -1;
-static int hf_btl2cap_move_result = -1;
-static int hf_btl2cap_move_confirmation_result = -1;
-static int hf_btl2cap_status = -1;
-static int hf_btl2cap_rej_reason = -1;
-static int hf_btl2cap_sig_mtu = -1;
-static int hf_btl2cap_info_mtu = -1;
-static int hf_btl2cap_info_flowcontrol = -1;
-static int hf_btl2cap_info_retransmission = -1;
-static int hf_btl2cap_info_bidirqos = -1;
-static int hf_btl2cap_info_enh_retransmission = -1;
-static int hf_btl2cap_info_streaming = -1;
-static int hf_btl2cap_info_fcs = -1;
-static int hf_btl2cap_info_flow_spec = -1;
-static int hf_btl2cap_info_fixedchan = -1;
-static int hf_btl2cap_info_fixedchans = -1;
-static int hf_btl2cap_info_fixedchans_null = -1;
-static int hf_btl2cap_info_fixedchans_signal = -1;
-static int hf_btl2cap_info_fixedchans_connless = -1;
-static int hf_btl2cap_info_fixedchans_amp_man = -1;
-static int hf_btl2cap_info_fixedchans_rfu = -1;
-static int hf_btl2cap_info_fixedchans_smp = -1;
-static int hf_btl2cap_info_fixedchans_amp_test = -1;
-static int hf_btl2cap_info_window = -1;
-static int hf_btl2cap_info_unicast = -1;
-static int hf_btl2cap_info_type = -1;
-static int hf_btl2cap_info_result = -1;
-static int hf_btl2cap_configuration_result = -1;
-static int hf_btl2cap_info_extfeatures = -1;
-static int hf_btl2cap_option = -1;
-static int hf_btl2cap_option_type = -1;
-static int hf_btl2cap_option_length = -1;
-static int hf_btl2cap_option_mtu = -1;
-static int hf_btl2cap_option_flushTO = -1;
-static int hf_btl2cap_option_flush_to_us = -1;
-static int hf_btl2cap_option_flags = -1;
-static int hf_btl2cap_option_service_type = -1;
-static int hf_btl2cap_option_tokenrate = -1;
-static int hf_btl2cap_option_tokenbucketsize = -1;
-static int hf_btl2cap_option_peakbandwidth = -1;
-static int hf_btl2cap_option_latency = -1;
-static int hf_btl2cap_option_delayvariation = -1;
-static int hf_btl2cap_option_retransmissionmode = -1;
-static int hf_btl2cap_option_txwindow = -1;
-static int hf_btl2cap_option_maxtransmit = -1;
-static int hf_btl2cap_option_retransmittimeout = -1;
-static int hf_btl2cap_option_monitortimeout = -1;
-static int hf_btl2cap_option_mps = -1;
-static int hf_btl2cap_option_fcs = -1;
-static int hf_btl2cap_option_window = -1;
-static int hf_btl2cap_option_identifier = -1;
-static int hf_btl2cap_option_sdu_size = -1;
-static int hf_btl2cap_option_sdu_arrival_time = -1;
-static int hf_btl2cap_option_access_latency = -1;
-static int hf_btl2cap_control = -1;
-static int hf_btl2cap_control_sar = -1;
-static int hf_btl2cap_control_reqseq = -1;
-static int hf_btl2cap_control_txseq = -1;
-static int hf_btl2cap_control_retransmissiondisable = -1;
-static int hf_btl2cap_control_supervisory = -1;
-static int hf_btl2cap_control_type = -1;
-static int hf_btl2cap_fcs = -1;
-static int hf_btl2cap_sdulength = -1;
-static int hf_btl2cap_continuation_to = -1;
-static int hf_btl2cap_reassembled_in = -1;
-static int hf_btl2cap_min_interval = -1;
-static int hf_btl2cap_max_interval = -1;
-static int hf_btl2cap_slave_latency = -1;
-static int hf_btl2cap_timeout_multiplier = -1;
-static int hf_btl2cap_conn_param_result = -1;
-static int hf_btl2cap_credits = -1;
-static int hf_btl2cap_initial_credits = -1;
-static int hf_btl2cap_le_result = -1;
-static int hf_btl2cap_le_psm = -1;
-static int hf_btl2cap_flags_reserved = -1;
-static int hf_btl2cap_flags_continuation = -1;
-static int hf_btl2cap_data = -1;
-static int hf_btl2cap_service = -1;
-static int hf_btl2cap_connect_in_frame = -1;
-static int hf_btl2cap_disconnect_in_frame = -1;
-
-static int hf_btl2cap_le_sdu_fragments = -1;
-static int hf_btl2cap_le_sdu_fragment = -1;
-static int hf_btl2cap_le_sdu_fragment_overlap = -1;
-static int hf_btl2cap_le_sdu_fragment_overlap_conflicts = -1;
-static int hf_btl2cap_le_sdu_fragment_multiple_tails = -1;
-static int hf_btl2cap_le_sdu_fragment_too_long_fragment = -1;
-static int hf_btl2cap_le_sdu_fragment_error = -1;
-static int hf_btl2cap_le_sdu_fragment_count = -1;
-static int hf_btl2cap_le_sdu_reassembled_in = -1;
-static int hf_btl2cap_le_sdu_reassembled_length = -1;
-
-static int hf_btl2cap_le_sdu_length = -1;
+int proto_btl2cap;
+
+static int hf_btl2cap_length;
+static int hf_btl2cap_cid;
+static int hf_btl2cap_payload;
+static int hf_btl2cap_command;
+static int hf_btl2cap_cmd_code;
+static int hf_btl2cap_cmd_ident;
+static int hf_btl2cap_cmd_length;
+static int hf_btl2cap_cmd_data;
+static int hf_btl2cap_psm;
+static int hf_btl2cap_psm_dynamic;
+static int hf_btl2cap_scid;
+static int hf_btl2cap_dcid;
+static int hf_btl2cap_icid;
+static int hf_btl2cap_controller;
+static int hf_btl2cap_dcontroller;
+static int hf_btl2cap_result;
+static int hf_btl2cap_move_result;
+static int hf_btl2cap_move_confirmation_result;
+static int hf_btl2cap_status;
+static int hf_btl2cap_rej_reason;
+static int hf_btl2cap_sig_mtu;
+static int hf_btl2cap_info_mtu;
+static int hf_btl2cap_info_flowcontrol;
+static int hf_btl2cap_info_retransmission;
+static int hf_btl2cap_info_bidirqos;
+static int hf_btl2cap_info_enh_retransmission;
+static int hf_btl2cap_info_streaming;
+static int hf_btl2cap_info_fcs;
+static int hf_btl2cap_info_flow_spec;
+static int hf_btl2cap_info_fixedchan;
+static int hf_btl2cap_info_fixedchans;
+static int hf_btl2cap_info_fixedchans_null;
+static int hf_btl2cap_info_fixedchans_signal;
+static int hf_btl2cap_info_fixedchans_connless;
+static int hf_btl2cap_info_fixedchans_amp_man;
+static int hf_btl2cap_info_fixedchans_rfu;
+static int hf_btl2cap_info_fixedchans_smp;
+static int hf_btl2cap_info_fixedchans_amp_test;
+static int hf_btl2cap_info_window;
+static int hf_btl2cap_info_unicast;
+static int hf_btl2cap_info_type;
+static int hf_btl2cap_info_result;
+static int hf_btl2cap_configuration_result;
+static int hf_btl2cap_info_extfeatures;
+static int hf_btl2cap_option;
+static int hf_btl2cap_option_type;
+static int hf_btl2cap_option_length;
+static int hf_btl2cap_option_mtu;
+static int hf_btl2cap_option_flushTO;
+static int hf_btl2cap_option_flush_to_us;
+static int hf_btl2cap_option_flags;
+static int hf_btl2cap_option_service_type;
+static int hf_btl2cap_option_tokenrate;
+static int hf_btl2cap_option_tokenbucketsize;
+static int hf_btl2cap_option_peakbandwidth;
+static int hf_btl2cap_option_latency;
+static int hf_btl2cap_option_delayvariation;
+static int hf_btl2cap_option_retransmissionmode;
+static int hf_btl2cap_option_txwindow;
+static int hf_btl2cap_option_maxtransmit;
+static int hf_btl2cap_option_retransmittimeout;
+static int hf_btl2cap_option_monitortimeout;
+static int hf_btl2cap_option_mps;
+static int hf_btl2cap_option_fcs;
+static int hf_btl2cap_option_window;
+static int hf_btl2cap_option_identifier;
+static int hf_btl2cap_option_sdu_size;
+static int hf_btl2cap_option_sdu_arrival_time;
+static int hf_btl2cap_option_access_latency;
+static int hf_btl2cap_control;
+static int hf_btl2cap_control_sar;
+static int hf_btl2cap_control_reqseq;
+static int hf_btl2cap_control_txseq;
+static int hf_btl2cap_control_retransmissiondisable;
+static int hf_btl2cap_control_supervisory;
+static int hf_btl2cap_control_type;
+static int hf_btl2cap_fcs;
+static int hf_btl2cap_sdulength;
+static int hf_btl2cap_continuation_to;
+static int hf_btl2cap_reassembled_in;
+static int hf_btl2cap_min_interval;
+static int hf_btl2cap_max_interval;
+static int hf_btl2cap_slave_latency;
+static int hf_btl2cap_timeout_multiplier;
+static int hf_btl2cap_conn_param_result;
+static int hf_btl2cap_credits;
+static int hf_btl2cap_initial_credits;
+static int hf_btl2cap_le_result;
+static int hf_btl2cap_le_psm;
+static int hf_btl2cap_flags_reserved;
+static int hf_btl2cap_flags_continuation;
+static int hf_btl2cap_data;
+static int hf_btl2cap_service;
+static int hf_btl2cap_connect_in_frame;
+static int hf_btl2cap_disconnect_in_frame;
+
+static int hf_btl2cap_le_sdu_fragments;
+static int hf_btl2cap_le_sdu_fragment;
+static int hf_btl2cap_le_sdu_fragment_overlap;
+static int hf_btl2cap_le_sdu_fragment_overlap_conflicts;
+static int hf_btl2cap_le_sdu_fragment_multiple_tails;
+static int hf_btl2cap_le_sdu_fragment_too_long_fragment;
+static int hf_btl2cap_le_sdu_fragment_error;
+static int hf_btl2cap_le_sdu_fragment_count;
+static int hf_btl2cap_le_sdu_reassembled_in;
+static int hf_btl2cap_le_sdu_reassembled_length;
+
+static int hf_btl2cap_le_sdu_length;
 
 /* Initialize the subtree pointers */
-static gint ett_btl2cap = -1;
-static gint ett_btl2cap_cmd = -1;
-static gint ett_btl2cap_option = -1;
-static gint ett_btl2cap_extfeatures = -1;
-static gint ett_btl2cap_fixedchans = -1;
-static gint ett_btl2cap_control = -1;
-static gint ett_btl2cap_le_sdu_fragment = -1;
-static gint ett_btl2cap_le_sdu_fragments = -1;
-
-static expert_field ei_btl2cap_parameter_mismatch = EI_INIT;
-static expert_field ei_btl2cap_sdulength_bad = EI_INIT;
-static expert_field ei_btl2cap_length_bad = EI_INIT;
-static expert_field ei_btl2cap_unknown_command_code = EI_INIT;
+static gint ett_btl2cap;
+static gint ett_btl2cap_cmd;
+static gint ett_btl2cap_option;
+static gint ett_btl2cap_extfeatures;
+static gint ett_btl2cap_fixedchans;
+static gint ett_btl2cap_control;
+static gint ett_btl2cap_le_sdu_fragment;
+static gint ett_btl2cap_le_sdu_fragments;
+
+static expert_field ei_btl2cap_parameter_mismatch;
+static expert_field ei_btl2cap_sdulength_bad;
+static expert_field ei_btl2cap_length_bad;
+static expert_field ei_btl2cap_unknown_command_code;
 
 /* Initialize dissector table */
 static dissector_table_t l2cap_psm_dissector_table;
diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c
index 7191a9e93a..8902a88cd2 100644
--- a/epan/dissectors/packet-btle.c
+++ b/epan/dissectors/packet-btle.c
@@ -29,339 +29,339 @@
 #include "packet-bthci_cmd.h"
 #include "packet-bthci_acl.h"
 
-static int proto_btle = -1;
-static int proto_btle_rf = -1;
-static int proto_nordic_ble = -1;
-
-static int hf_access_address = -1;
-static int hf_coding_indicator = -1;
-static int hf_crc = -1;
-static int hf_master_bd_addr = -1;
-static int hf_slave_bd_addr = -1;
-static int hf_length = -1;
-static int hf_advertising_header = -1;
-static int hf_advertising_header_pdu_type = -1;
-static int hf_advertising_header_ch_sel = -1;
-static int hf_advertising_header_rfu_1 = -1;
-static int hf_advertising_header_rfu_2 = -1;
-static int hf_advertising_header_rfu_3 = -1;
-static int hf_advertising_header_rfu_4 = -1;
-static int hf_advertising_header_randomized_tx = -1;
-static int hf_advertising_header_randomized_rx = -1;
-static int hf_advertising_header_length = -1;
-static int hf_advertising_address = -1;
-static int hf_initiator_addresss = -1;
-static int hf_target_addresss = -1;
-static int hf_scanning_address = -1;
-static int hf_scan_response_data = -1;
-static int hf_link_layer_data = -1;
-static int hf_link_layer_data_access_address = -1;
-static int hf_link_layer_data_crc_init = -1;
-static int hf_link_layer_data_window_size = -1;
-static int hf_link_layer_data_window_offset = -1;
-static int hf_link_layer_data_interval = -1;
-static int hf_link_layer_data_latency = -1;
-static int hf_link_layer_data_timeout = -1;
-static int hf_link_layer_data_channel_map = -1;
-static int hf_link_layer_data_hop = -1;
-static int hf_link_layer_data_sleep_clock_accuracy = -1;
-static int hf_extended_advertising_header = -1;
-static int hf_extended_advertising_header_length = -1;
-static int hf_extended_advertising_mode = -1;
-static int hf_extended_advertising_flags = -1;
-static int hf_extended_advertising_flags_adva = -1;
-static int hf_extended_advertising_flags_targeta = -1;
-static int hf_extended_advertising_flags_cte_info = -1;
-static int hf_extended_advertising_flags_advdatainfo = -1;
-static int hf_extended_advertising_flags_aux_ptr = -1;
-static int hf_extended_advertising_flags_sync_info = -1;
-static int hf_extended_advertising_flags_tx_power = -1;
-static int hf_extended_advertising_flags_reserved = -1;
-static int hf_extended_advertising_cte_info = -1;
-static int hf_extended_advertising_cte_info_time = -1;
-static int hf_extended_advertising_cte_info_rfu = -1;
-static int hf_extended_advertising_cte_info_type = -1;
-static int hf_extended_advertising_data_info = -1;
-static int hf_extended_advertising_data_info_did = -1;
-static int hf_extended_advertising_data_info_sid = -1;
-static int hf_extended_advertising_aux_ptr = -1;
-static int hf_extended_advertising_aux_ptr_channel = -1;
-static int hf_extended_advertising_aux_ptr_ca = -1;
-static int hf_extended_advertising_aux_ptr_offset_units = -1;
-static int hf_extended_advertising_aux_ptr_aux_offset = -1;
-static int hf_extended_advertising_aux_ptr_aux_phy = -1;
-static int hf_extended_advertising_sync_info = -1;
-static int hf_extended_advertising_sync_info_offset = -1;
-static int hf_extended_advertising_sync_info_offset_units = -1;
-static int hf_extended_advertising_sync_info_offset_adjust = -1;
-static int hf_extended_advertising_sync_info_reserved = -1;
-static int hf_extended_advertising_sync_info_interval = -1;
-static int hf_extended_advertising_sync_info_channel_map = -1;
-static int hf_extended_advertising_sync_info_sleep_clock_accuracy = -1;
-static int hf_extended_advertising_sync_info_access_address = -1;
-static int hf_extended_advertising_sync_info_crc_init = -1;
-static int hf_extended_advertising_sync_info_event_counter = -1;
-static int hf_extended_advertising_tx_power = -1;
-static int hf_extended_advertising_header_acad = -1;
-static int hf_extended_advertising_had_fragment = -1;
-static int hf_data_header = -1;
-static int hf_data_header_length = -1;
-static int hf_data_header_rfu = -1;
-static int hf_data_header_llid = -1;
-static int hf_data_header_llid_connectediso = -1;
-static int hf_data_header_llid_broadcastiso = -1;
-static int hf_data_header_more_data = -1;
-static int hf_data_header_cte_info_present = -1;
-static int hf_data_header_sequence_number = -1;
-static int hf_data_header_next_expected_sequence_number = -1;
-static int hf_data_header_rfu_57 = -1;
-static int hf_data_header_rfu_67 = -1;
-static int hf_data_header_close_isochronous_event = -1;
-static int hf_data_header_null_pdu_indicator = -1;
-static int hf_data_header_control_subevent_sequence_number = -1;
-static int hf_data_header_control_subevent_transmission_flag = -1;
-static int hf_data_header_cte_info = -1;
-static int hf_data_header_cte_info_time = -1;
-static int hf_data_header_cte_info_rfu = -1;
-static int hf_data_header_cte_info_type = -1;
-static int hf_control_opcode = -1;
-static int hf_l2cap_index = -1;
-static int hf_l2cap_fragment = -1;
-static int hf_connection_parameters_in = -1;
-static int hf_control_reject_opcode = -1;
-static int hf_control_error_code = -1;
-static int hf_control_unknown_type = -1;
-static int hf_control_version_number = -1;
-static int hf_control_company_id = -1;
-static int hf_control_subversion_number = -1;
-static int hf_control_feature_set = -1;
-static int hf_control_feature_set_le_encryption = -1;
-static int hf_control_feature_set_connection_parameters_request_procedure = -1;
-static int hf_control_feature_set_extended_reject_indication = -1;
-static int hf_control_feature_set_slave_initiated_features_exchange = -1;
-static int hf_control_feature_set_le_ping = -1;
-static int hf_control_feature_set_le_pkt_len_ext = -1;
-static int hf_control_feature_set_ll_privacy = -1;
-static int hf_control_feature_set_ext_scan_flt_pol = -1;
-static int hf_control_feature_set_le_2m_phy = -1;
-static int hf_control_feature_set_stable_modulation_index_transmitter = -1;
-static int hf_control_feature_set_stable_modulation_index_receiver = -1;
-static int hf_control_feature_set_le_coded_phy = -1;
-static int hf_control_feature_set_le_extended_advertising = -1;
-static int hf_control_feature_set_le_periodic_advertising = -1;
-static int hf_control_feature_set_channel_selection_algorithm_2 = -1;
-static int hf_control_feature_set_le_power_class_1 = -1;
-static int hf_control_feature_set_minimum_number_of_used_channels_procedure = -1;
-static int hf_control_feature_set_connection_cte_request = -1;
-static int hf_control_feature_set_connection_cte_response = -1;
-static int hf_control_feature_set_connectionless_cte_tx = -1;
-static int hf_control_feature_set_connectionless_cte_rx = -1;
-static int hf_control_feature_set_antenna_switching_tx_aod = -1;
-static int hf_control_feature_set_antenna_switching_rx_aoa = -1;
-static int hf_control_feature_set_cte_rx = -1;
-static int hf_control_feature_set_past_sender = -1;
-static int hf_control_feature_set_past_receiver = -1;
-static int hf_control_feature_set_sca_updates = -1;
-static int hf_control_feature_set_remote_public_key_validation = -1;
-static int hf_control_feature_set_cis_central = -1;
-static int hf_control_feature_set_cis_peripheral = -1;
-static int hf_control_feature_set_iso_broadcast = -1;
-static int hf_control_feature_set_synchronized_receiver = -1;
-static int hf_control_feature_set_connected_iso_host_support = -1;
-static int hf_control_feature_set_le_power_control_request1 = -1;
-static int hf_control_feature_set_le_power_control_request2 = -1;
-static int hf_control_feature_set_le_path_loss_monitoring = -1;
-static int hf_control_feature_set_le_periodic_adv_adi_support = -1;
-static int hf_control_feature_set_connection_subrating = -1;
-static int hf_control_feature_set_connection_subrating_host_support = -1;
-static int hf_control_feature_set_channel_classification = -1;
-static int hf_control_feature_set_adv_coding_selection = -1;
-static int hf_control_feature_set_adv_coding_selection_host_support = -1;
-static int hf_control_feature_set_periodic_adv_with_responses_advertiser = -1;
-static int hf_control_feature_set_periodic_adv_with_responses_scanner = -1;
-static int hf_control_feature_set_reserved_bits = -1;
-static int hf_control_feature_set_reserved = -1;
-static int hf_control_window_size = -1;
-static int hf_control_window_offset = -1;
-static int hf_control_interval = -1;
-static int hf_control_latency = -1;
-static int hf_control_timeout = -1;
-static int hf_control_instant = -1;
-static int hf_control_rfu_5 = -1;
-static int hf_control_interval_min = -1;
-static int hf_control_interval_max = -1;
-static int hf_control_preferred_periodicity = -1;
-static int hf_control_reference_connection_event_count = -1;
-static int hf_control_offset_0 = -1;
-static int hf_control_offset_1 = -1;
-static int hf_control_offset_2 = -1;
-static int hf_control_offset_3 = -1;
-static int hf_control_offset_4 = -1;
-static int hf_control_offset_5 = -1;
-static int hf_control_channel_map = -1;
-static int hf_control_random_number = -1;
-static int hf_control_encrypted_diversifier = -1;
-static int hf_control_master_session_key_diversifier = -1;
-static int hf_control_master_session_initialization_vector = -1;
-static int hf_control_slave_session_key_diversifier = -1;
-static int hf_control_slave_session_initialization_vector = -1;
-static int hf_control_max_rx_octets = -1;
-static int hf_control_max_rx_time = -1;
-static int hf_control_max_tx_octets = -1;
-static int hf_control_max_tx_time = -1;
-static int hf_control_phys_sender_le_1m_phy = -1;
-static int hf_control_phys_sender_le_2m_phy = -1;
-static int hf_control_phys_sender_le_coded_phy = -1;
-static int hf_control_phys_update_le_1m_phy = -1;
-static int hf_control_phys_update_le_2m_phy = -1;
-static int hf_control_phys_update_le_coded_phy = -1;
-static int hf_control_phys_reserved_bits = -1;
-static int hf_control_tx_phys = -1;
-static int hf_control_rx_phys = -1;
-static int hf_control_m_to_s_phy = -1;
-static int hf_control_m_to_s_phy_le_1m_phy = -1;
-static int hf_control_m_to_s_phy_le_2m_phy = -1;
-static int hf_control_m_to_s_phy_le_coded_phy = -1;
-static int hf_control_m_to_s_phy_reserved_bits = -1;
-static int hf_control_s_to_m_phy = -1;
-static int hf_control_s_to_m_phy_le_1m_phy = -1;
-static int hf_control_s_to_m_phy_le_2m_phy = -1;
-static int hf_control_s_to_m_phy_le_coded_phy = -1;
-static int hf_control_s_to_m_phy_reserved_bits = -1;
-static int hf_control_phys = -1;
-static int hf_control_phys_le_1m_phy = -1;
-static int hf_control_phys_le_2m_phy = -1;
-static int hf_control_phys_le_coded_phy = -1;
-static int hf_control_min_used_channels = -1;
-static int hf_control_cte_min_len_req = -1;
-static int hf_control_cte_rfu = -1;
-static int hf_control_cte_type_req = -1;
-static int hf_control_sync_id = -1;
-static int hf_control_sync_info_offset = -1;
-static int hf_control_sync_info_offset_units = -1;
-static int hf_control_sync_info_offset_adjust = -1;
-static int hf_control_sync_info_reserved = -1;
-static int hf_control_sync_info_interval = -1;
-static int hf_control_sync_info_channel_map = -1;
-static int hf_control_sync_info_sleep_clock_accuracy = -1;
-static int hf_control_sync_info_access_address = -1;
-static int hf_control_sync_info_crc_init = -1;
-static int hf_control_sync_info_event_counter = -1;
-static int hf_control_sync_conn_event_count = -1;
-static int hf_control_sync_last_pa_event_counter = -1;
-static int hf_control_sync_sid = -1;
-static int hf_control_sync_atype = -1;
-static int hf_control_sync_sleep_clock_accuracy = -1;
-static int hf_control_sync_sync_conn_event_counter = -1;
-static int hf_control_sleep_clock_accuracy = -1;
-static int hf_control_cig_id = -1;
-static int hf_control_cis_id = -1;
-static int hf_control_max_sdu_m_to_s = -1;
-static int hf_control_rfu_1 = -1;
-static int hf_control_framed = -1;
-static int hf_control_max_sdu_s_to_m = -1;
-static int hf_control_rfu_2 = -1;
-static int hf_control_sdu_interval_m_to_s = -1;
-static int hf_control_rfu_3 = -1;
-static int hf_control_sdu_interval_s_to_m = -1;
-static int hf_control_rfu_4 = -1;
-static int hf_control_max_pdu_m_to_s = -1;
-static int hf_control_max_pdu_s_to_m = -1;
-static int hf_control_num_sub_events = -1;
-static int hf_control_sub_interval = -1;
-static int hf_control_bn_m_to_s = -1;
-static int hf_control_bn_s_to_m = -1;
-static int hf_control_ft_m_to_s = -1;
-static int hf_control_ft_s_to_m = -1;
-static int hf_control_iso_interval = -1;
-static int hf_control_cis_offset_min = -1;
-static int hf_control_cis_offset_max = -1;
-static int hf_control_conn_event_count = -1;
-static int hf_control_access_address = -1;
-static int hf_control_cis_offset = -1;
-static int hf_control_cig_sync_delay = -1;
-static int hf_control_cis_sync_delay = -1;
-static int hf_control_pwr_phy = -1;
-static int hf_control_pwr_phy_le_1m_phy = -1;
-static int hf_control_pwr_phy_le_2m_phy = -1;
-static int hf_control_pwr_phy_le_coded_s8_phy = -1;
-static int hf_control_pwr_phy_le_coded_s2_phy = -1;
-static int hf_control_pwr_phy_reserved_bits = -1;
-static int hf_control_delta = -1;
-static int hf_control_txpwr = -1;
-static int hf_control_pwrflags = -1;
-static int hf_control_pwrflags_min = -1;
-static int hf_control_pwrflags_max = -1;
-static int hf_control_pwrflags_reserved_bits = -1;
-static int hf_control_acceptable_power_reduction = -1;
-static int hf_control_subrate_factor_min = -1;
-static int hf_control_subrate_factor_max = -1;
-static int hf_control_max_latency = -1;
-static int hf_control_continuation_number = -1;
-static int hf_control_subrate_factor = -1;
-static int hf_control_subrate_base_event = -1;
-static int hf_control_channel_reporting_enable = -1;
-static int hf_control_channel_reporting_min_spacing = -1;
-static int hf_control_channel_reporting_max_delay = -1;
-static int hf_control_channel_classification = -1;
-static int hf_control_sync_info_rsp_access_address = -1;
-static int hf_control_sync_info_num_subevents = -1;
-static int hf_control_sync_info_subevent_interval = -1;
-static int hf_control_sync_info_response_slot_delay = -1;
-static int hf_control_sync_info_response_slot_spacing = -1;
-static int hf_big_control_opcode = -1;
-static int hf_isochronous_data = -1;
-static int hf_btle_l2cap_msg_fragments = -1;
-static int hf_btle_l2cap_msg_fragment = -1;
-static int hf_btle_l2cap_msg_fragment_overlap = -1;
-static int hf_btle_l2cap_msg_fragment_overlap_conflicts = -1;
-static int hf_btle_l2cap_msg_fragment_multiple_tails = -1;
-static int hf_btle_l2cap_msg_fragment_too_long_fragment = -1;
-static int hf_btle_l2cap_msg_fragment_error = -1;
-static int hf_btle_l2cap_msg_fragment_count = -1;
-static int hf_btle_l2cap_msg_reassembled_in = -1;
-static int hf_btle_l2cap_msg_reassembled_length = -1;
-static int hf_btle_ea_host_advertising_data_fragments = -1;
-static int hf_btle_ea_host_advertising_data_fragment = -1;
-static int hf_btle_ea_host_advertising_data_fragment_overlap = -1;
-static int hf_btle_ea_host_advertising_data_fragment_overlap_conflicts = -1;
-static int hf_btle_ea_host_advertising_data_fragment_multiple_tails = -1;
-static int hf_btle_ea_host_advertising_data_fragment_too_long_fragment = -1;
-static int hf_btle_ea_host_advertising_data_fragment_error = -1;
-static int hf_btle_ea_host_advertising_data_fragment_count = -1;
-static int hf_btle_ea_host_advertising_data_reassembled_in = -1;
-static int hf_btle_ea_host_advertising_data_reassembled_length = -1;
-
-static int hf_request_in_frame = -1;
-static int hf_response_in_frame = -1;
-
-static gint ett_btle = -1;
-static gint ett_advertising_header = -1;
-static gint ett_link_layer_data = -1;
-static gint ett_data_header = -1;
-static gint ett_data_header_cte_info = -1;
-static gint ett_features = -1;
-static gint ett_tx_phys = -1;
-static gint ett_rx_phys = -1;
-static gint ett_m_to_s_phy = -1;
-static gint ett_s_to_m_phy = -1;
-static gint ett_phys = -1;
-static gint ett_pwr_phy = -1;
-static gint ett_cte = -1;
-static gint ett_channel_map = -1;
-static gint ett_scan_response_data = -1;
-static gint ett_pwrflags = -1;
-static gint ett_btle_l2cap_msg_fragment = -1;
-static gint ett_btle_l2cap_msg_fragments = -1;
-static gint ett_btle_ea_host_advertising_data_fragment = -1;
-static gint ett_btle_ea_host_advertising_data_fragments = -1;
-static gint ett_extended_advertising_header = -1;
-static gint ett_extended_advertising_flags = -1;
-static gint ett_extended_advertising_cte_info = -1;
-static gint ett_extended_advertising_data_info = -1;
-static gint ett_extended_advertising_aux_pointer = -1;
-static gint ett_extended_advertising_sync_info = -1;
-static gint ett_extended_advertising_acad = -1;
+static int proto_btle;
+static int proto_btle_rf;
+static int proto_nordic_ble;
+
+static int hf_access_address;
+static int hf_coding_indicator;
+static int hf_crc;
+static int hf_master_bd_addr;
+static int hf_slave_bd_addr;
+static int hf_length;
+static int hf_advertising_header;
+static int hf_advertising_header_pdu_type;
+static int hf_advertising_header_ch_sel;
+static int hf_advertising_header_rfu_1;
+static int hf_advertising_header_rfu_2;
+static int hf_advertising_header_rfu_3;
+static int hf_advertising_header_rfu_4;
+static int hf_advertising_header_randomized_tx;
+static int hf_advertising_header_randomized_rx;
+static int hf_advertising_header_length;
+static int hf_advertising_address;
+static int hf_initiator_addresss;
+static int hf_target_addresss;
+static int hf_scanning_address;
+static int hf_scan_response_data;
+static int hf_link_layer_data;
+static int hf_link_layer_data_access_address;
+static int hf_link_layer_data_crc_init;
+static int hf_link_layer_data_window_size;
+static int hf_link_layer_data_window_offset;
+static int hf_link_layer_data_interval;
+static int hf_link_layer_data_latency;
+static int hf_link_layer_data_timeout;
+static int hf_link_layer_data_channel_map;
+static int hf_link_layer_data_hop;
+static int hf_link_layer_data_sleep_clock_accuracy;
+static int hf_extended_advertising_header;
+static int hf_extended_advertising_header_length;
+static int hf_extended_advertising_mode;
+static int hf_extended_advertising_flags;
+static int hf_extended_advertising_flags_adva;
+static int hf_extended_advertising_flags_targeta;
+static int hf_extended_advertising_flags_cte_info;
+static int hf_extended_advertising_flags_advdatainfo;
+static int hf_extended_advertising_flags_aux_ptr;
+static int hf_extended_advertising_flags_sync_info;
+static int hf_extended_advertising_flags_tx_power;
+static int hf_extended_advertising_flags_reserved;
+static int hf_extended_advertising_cte_info;
+static int hf_extended_advertising_cte_info_time;
+static int hf_extended_advertising_cte_info_rfu;
+static int hf_extended_advertising_cte_info_type;
+static int hf_extended_advertising_data_info;
+static int hf_extended_advertising_data_info_did;
+static int hf_extended_advertising_data_info_sid;
+static int hf_extended_advertising_aux_ptr;
+static int hf_extended_advertising_aux_ptr_channel;
+static int hf_extended_advertising_aux_ptr_ca;
+static int hf_extended_advertising_aux_ptr_offset_units;
+static int hf_extended_advertising_aux_ptr_aux_offset;
+static int hf_extended_advertising_aux_ptr_aux_phy;
+static int hf_extended_advertising_sync_info;
+static int hf_extended_advertising_sync_info_offset;
+static int hf_extended_advertising_sync_info_offset_units;
+static int hf_extended_advertising_sync_info_offset_adjust;
+static int hf_extended_advertising_sync_info_reserved;
+static int hf_extended_advertising_sync_info_interval;
+static int hf_extended_advertising_sync_info_channel_map;
+static int hf_extended_advertising_sync_info_sleep_clock_accuracy;
+static int hf_extended_advertising_sync_info_access_address;
+static int hf_extended_advertising_sync_info_crc_init;
+static int hf_extended_advertising_sync_info_event_counter;
+static int hf_extended_advertising_tx_power;
+static int hf_extended_advertising_header_acad;
+static int hf_extended_advertising_had_fragment;
+static int hf_data_header;
+static int hf_data_header_length;
+static int hf_data_header_rfu;
+static int hf_data_header_llid;
+static int hf_data_header_llid_connectediso;
+static int hf_data_header_llid_broadcastiso;
+static int hf_data_header_more_data;
+static int hf_data_header_cte_info_present;
+static int hf_data_header_sequence_number;
+static int hf_data_header_next_expected_sequence_number;
+static int hf_data_header_rfu_57;
+static int hf_data_header_rfu_67;
+static int hf_data_header_close_isochronous_event;
+static int hf_data_header_null_pdu_indicator;
+static int hf_data_header_control_subevent_sequence_number;
+static int hf_data_header_control_subevent_transmission_flag;
+static int hf_data_header_cte_info;
+static int hf_data_header_cte_info_time;
+static int hf_data_header_cte_info_rfu;
+static int hf_data_header_cte_info_type;
+static int hf_control_opcode;
+static int hf_l2cap_index;
+static int hf_l2cap_fragment;
+static int hf_connection_parameters_in;
+static int hf_control_reject_opcode;
+static int hf_control_error_code;
+static int hf_control_unknown_type;
+static int hf_control_version_number;
+static int hf_control_company_id;
+static int hf_control_subversion_number;
+static int hf_control_feature_set;
+static int hf_control_feature_set_le_encryption;
+static int hf_control_feature_set_connection_parameters_request_procedure;
+static int hf_control_feature_set_extended_reject_indication;
+static int hf_control_feature_set_slave_initiated_features_exchange;
+static int hf_control_feature_set_le_ping;
+static int hf_control_feature_set_le_pkt_len_ext;
+static int hf_control_feature_set_ll_privacy;
+static int hf_control_feature_set_ext_scan_flt_pol;
+static int hf_control_feature_set_le_2m_phy;
+static int hf_control_feature_set_stable_modulation_index_transmitter;
+static int hf_control_feature_set_stable_modulation_index_receiver;
+static int hf_control_feature_set_le_coded_phy;
+static int hf_control_feature_set_le_extended_advertising;
+static int hf_control_feature_set_le_periodic_advertising;
+static int hf_control_feature_set_channel_selection_algorithm_2;
+static int hf_control_feature_set_le_power_class_1;
+static int hf_control_feature_set_minimum_number_of_used_channels_procedure;
+static int hf_control_feature_set_connection_cte_request;
+static int hf_control_feature_set_connection_cte_response;
+static int hf_control_feature_set_connectionless_cte_tx;
+static int hf_control_feature_set_connectionless_cte_rx;
+static int hf_control_feature_set_antenna_switching_tx_aod;
+static int hf_control_feature_set_antenna_switching_rx_aoa;
+static int hf_control_feature_set_cte_rx;
+static int hf_control_feature_set_past_sender;
+static int hf_control_feature_set_past_receiver;
+static int hf_control_feature_set_sca_updates;
+static int hf_control_feature_set_remote_public_key_validation;
+static int hf_control_feature_set_cis_central;
+static int hf_control_feature_set_cis_peripheral;
+static int hf_control_feature_set_iso_broadcast;
+static int hf_control_feature_set_synchronized_receiver;
+static int hf_control_feature_set_connected_iso_host_support;
+static int hf_control_feature_set_le_power_control_request1;
+static int hf_control_feature_set_le_power_control_request2;
+static int hf_control_feature_set_le_path_loss_monitoring;
+static int hf_control_feature_set_le_periodic_adv_adi_support;
+static int hf_control_feature_set_connection_subrating;
+static int hf_control_feature_set_connection_subrating_host_support;
+static int hf_control_feature_set_channel_classification;
+static int hf_control_feature_set_adv_coding_selection;
+static int hf_control_feature_set_adv_coding_selection_host_support;
+static int hf_control_feature_set_periodic_adv_with_responses_advertiser;
+static int hf_control_feature_set_periodic_adv_with_responses_scanner;
+static int hf_control_feature_set_reserved_bits;
+static int hf_control_feature_set_reserved;
+static int hf_control_window_size;
+static int hf_control_window_offset;
+static int hf_control_interval;
+static int hf_control_latency;
+static int hf_control_timeout;
+static int hf_control_instant;
+static int hf_control_rfu_5;
+static int hf_control_interval_min;
+static int hf_control_interval_max;
+static int hf_control_preferred_periodicity;
+static int hf_control_reference_connection_event_count;
+static int hf_control_offset_0;
+static int hf_control_offset_1;
+static int hf_control_offset_2;
+static int hf_control_offset_3;
+static int hf_control_offset_4;
+static int hf_control_offset_5;
+static int hf_control_channel_map;
+static int hf_control_random_number;
+static int hf_control_encrypted_diversifier;
+static int hf_control_master_session_key_diversifier;
+static int hf_control_master_session_initialization_vector;
+static int hf_control_slave_session_key_diversifier;
+static int hf_control_slave_session_initialization_vector;
+static int hf_control_max_rx_octets;
+static int hf_control_max_rx_time;
+static int hf_control_max_tx_octets;
+static int hf_control_max_tx_time;
+static int hf_control_phys_sender_le_1m_phy;
+static int hf_control_phys_sender_le_2m_phy;
+static int hf_control_phys_sender_le_coded_phy;
+static int hf_control_phys_update_le_1m_phy;
+static int hf_control_phys_update_le_2m_phy;
+static int hf_control_phys_update_le_coded_phy;
+static int hf_control_phys_reserved_bits;
+static int hf_control_tx_phys;
+static int hf_control_rx_phys;
+static int hf_control_m_to_s_phy;
+static int hf_control_m_to_s_phy_le_1m_phy;
+static int hf_control_m_to_s_phy_le_2m_phy;
+static int hf_control_m_to_s_phy_le_coded_phy;
+static int hf_control_m_to_s_phy_reserved_bits;
+static int hf_control_s_to_m_phy;
+static int hf_control_s_to_m_phy_le_1m_phy;
+static int hf_control_s_to_m_phy_le_2m_phy;
+static int hf_control_s_to_m_phy_le_coded_phy;
+static int hf_control_s_to_m_phy_reserved_bits;
+static int hf_control_phys;
+static int hf_control_phys_le_1m_phy;
+static int hf_control_phys_le_2m_phy;
+static int hf_control_phys_le_coded_phy;
+static int hf_control_min_used_channels;
+static int hf_control_cte_min_len_req;
+static int hf_control_cte_rfu;
+static int hf_control_cte_type_req;
+static int hf_control_sync_id;
+static int hf_control_sync_info_offset;
+static int hf_control_sync_info_offset_units;
+static int hf_control_sync_info_offset_adjust;
+static int hf_control_sync_info_reserved;
+static int hf_control_sync_info_interval;
+static int hf_control_sync_info_channel_map;
+static int hf_control_sync_info_sleep_clock_accuracy;
+static int hf_control_sync_info_access_address;
+static int hf_control_sync_info_crc_init;
+static int hf_control_sync_info_event_counter;
+static int hf_control_sync_conn_event_count;
+static int hf_control_sync_last_pa_event_counter;
+static int hf_control_sync_sid;
+static int hf_control_sync_atype;
+static int hf_control_sync_sleep_clock_accuracy;
+static int hf_control_sync_sync_conn_event_counter;
+static int hf_control_sleep_clock_accuracy;
+static int hf_control_cig_id;
+static int hf_control_cis_id;
+static int hf_control_max_sdu_m_to_s;
+static int hf_control_rfu_1;
+static int hf_control_framed;
+static int hf_control_max_sdu_s_to_m;
+static int hf_control_rfu_2;
+static int hf_control_sdu_interval_m_to_s;
+static int hf_control_rfu_3;
+static int hf_control_sdu_interval_s_to_m;
+static int hf_control_rfu_4;
+static int hf_control_max_pdu_m_to_s;
+static int hf_control_max_pdu_s_to_m;
+static int hf_control_num_sub_events;
+static int hf_control_sub_interval;
+static int hf_control_bn_m_to_s;
+static int hf_control_bn_s_to_m;
+static int hf_control_ft_m_to_s;
+static int hf_control_ft_s_to_m;
+static int hf_control_iso_interval;
+static int hf_control_cis_offset_min;
+static int hf_control_cis_offset_max;
+static int hf_control_conn_event_count;
+static int hf_control_access_address;
+static int hf_control_cis_offset;
+static int hf_control_cig_sync_delay;
+static int hf_control_cis_sync_delay;
+static int hf_control_pwr_phy;
+static int hf_control_pwr_phy_le_1m_phy;
+static int hf_control_pwr_phy_le_2m_phy;
+static int hf_control_pwr_phy_le_coded_s8_phy;
+static int hf_control_pwr_phy_le_coded_s2_phy;
+static int hf_control_pwr_phy_reserved_bits;
+static int hf_control_delta;
+static int hf_control_txpwr;
+static int hf_control_pwrflags;
+static int hf_control_pwrflags_min;
+static int hf_control_pwrflags_max;
+static int hf_control_pwrflags_reserved_bits;
+static int hf_control_acceptable_power_reduction;
+static int hf_control_subrate_factor_min;
+static int hf_control_subrate_factor_max;
+static int hf_control_max_latency;
+static int hf_control_continuation_number;
+static int hf_control_subrate_factor;
+static int hf_control_subrate_base_event;
+static int hf_control_channel_reporting_enable;
+static int hf_control_channel_reporting_min_spacing;
+static int hf_control_channel_reporting_max_delay;
+static int hf_control_channel_classification;
+static int hf_control_sync_info_rsp_access_address;
+static int hf_control_sync_info_num_subevents;
+static int hf_control_sync_info_subevent_interval;
+static int hf_control_sync_info_response_slot_delay;
+static int hf_control_sync_info_response_slot_spacing;
+static int hf_big_control_opcode;
+static int hf_isochronous_data;
+static int hf_btle_l2cap_msg_fragments;
+static int hf_btle_l2cap_msg_fragment;
+static int hf_btle_l2cap_msg_fragment_overlap;
+static int hf_btle_l2cap_msg_fragment_overlap_conflicts;
+static int hf_btle_l2cap_msg_fragment_multiple_tails;
+static int hf_btle_l2cap_msg_fragment_too_long_fragment;
+static int hf_btle_l2cap_msg_fragment_error;
+static int hf_btle_l2cap_msg_fragment_count;
+static int hf_btle_l2cap_msg_reassembled_in;
+static int hf_btle_l2cap_msg_reassembled_length;
+static int hf_btle_ea_host_advertising_data_fragments;
+static int hf_btle_ea_host_advertising_data_fragment;
+static int hf_btle_ea_host_advertising_data_fragment_overlap;
+static int hf_btle_ea_host_advertising_data_fragment_overlap_conflicts;
+static int hf_btle_ea_host_advertising_data_fragment_multiple_tails;
+static int hf_btle_ea_host_advertising_data_fragment_too_long_fragment;
+static int hf_btle_ea_host_advertising_data_fragment_error;
+static int hf_btle_ea_host_advertising_data_fragment_count;
+static int hf_btle_ea_host_advertising_data_reassembled_in;
+static int hf_btle_ea_host_advertising_data_reassembled_length;
+
+static int hf_request_in_frame;
+static int hf_response_in_frame;
+
+static gint ett_btle;
+static gint ett_advertising_header;
+static gint ett_link_layer_data;
+static gint ett_data_header;
+static gint ett_data_header_cte_info;
+static gint ett_features;
+static gint ett_tx_phys;
+static gint ett_rx_phys;
+static gint ett_m_to_s_phy;
+static gint ett_s_to_m_phy;
+static gint ett_phys;
+static gint ett_pwr_phy;
+static gint ett_cte;
+static gint ett_channel_map;
+static gint ett_scan_response_data;
+static gint ett_pwrflags;
+static gint ett_btle_l2cap_msg_fragment;
+static gint ett_btle_l2cap_msg_fragments;
+static gint ett_btle_ea_host_advertising_data_fragment;
+static gint ett_btle_ea_host_advertising_data_fragments;
+static gint ett_extended_advertising_header;
+static gint ett_extended_advertising_flags;
+static gint ett_extended_advertising_cte_info;
+static gint ett_extended_advertising_data_info;
+static gint ett_extended_advertising_aux_pointer;
+static gint ett_extended_advertising_sync_info;
+static gint ett_extended_advertising_acad;
 
 static int * const hfx_extended_advertising_flags[] = {
     &hf_extended_advertising_flags_adva,
@@ -514,19 +514,19 @@ static int * const hfx_control_pwrflags[] = {
     NULL
 };
 
-static expert_field ei_unknown_data = EI_INIT;
-static expert_field ei_access_address_matched = EI_INIT;
-static expert_field ei_access_address_bit_errors = EI_INIT;
-static expert_field ei_access_address_illegal = EI_INIT;
-static expert_field ei_crc_cannot_be_determined = EI_INIT;
-static expert_field ei_crc_incorrect = EI_INIT;
-static expert_field ei_missing_fragment_start = EI_INIT;
-static expert_field ei_retransmit = EI_INIT;
-static expert_field ei_nack = EI_INIT;
-static expert_field ei_control_proc_overlapping = EI_INIT;
-static expert_field ei_control_proc_invalid_collision = EI_INIT;
-static expert_field ei_control_proc_wrong_seq = EI_INIT;
-static expert_field ei_control_proc_invalid_conflict_resolution = EI_INIT;
+static expert_field ei_unknown_data;
+static expert_field ei_access_address_matched;
+static expert_field ei_access_address_bit_errors;
+static expert_field ei_access_address_illegal;
+static expert_field ei_crc_cannot_be_determined;
+static expert_field ei_crc_incorrect;
+static expert_field ei_missing_fragment_start;
+static expert_field ei_retransmit;
+static expert_field ei_nack;
+static expert_field ei_control_proc_overlapping;
+static expert_field ei_control_proc_invalid_collision;
+static expert_field ei_control_proc_wrong_seq;
+static expert_field ei_control_proc_invalid_conflict_resolution;
 
 static dissector_handle_t btle_handle;
 static dissector_handle_t btcommon_ad_handle;
diff --git a/epan/dissectors/packet-btle_rf.c b/epan/dissectors/packet-btle_rf.c
index 89b4cf84d1..9f6e11a6d3 100644
--- a/epan/dissectors/packet-btle_rf.c
+++ b/epan/dissectors/packet-btle_rf.c
@@ -33,30 +33,30 @@
 
 #define BTLE_RF_OCTETS 10
 
-static int proto_btle_rf = -1;
-
-static int hf_btle_rf_signed_byte_unused = -1;
-static int hf_btle_rf_unsigned_byte_unused = -1;
-static int hf_btle_rf_word_unused = -1;
-static int hf_btle_rf_channel = -1;
-static int hf_btle_rf_signal_dbm = -1;
-static int hf_btle_rf_noise_dbm = -1;
-static int hf_btle_rf_access_address_offenses = -1;
-static int hf_btle_rf_reference_access_address = -1;
-static int hf_btle_rf_flags = -1;
-static int hf_btle_rf_dewhitened_flag = -1;
-static int hf_btle_rf_sigpower_valid_flag = -1;
-static int hf_btle_rf_noisepower_valid_flag = -1;
-static int hf_btle_rf_packet_decrypted_flag = -1;
-static int hf_btle_rf_ref_aa_valid_flag = -1;
-static int hf_btle_rf_aa_offenses_valid_flag = -1;
-static int hf_btle_rf_channel_aliased_flag = -1;
-static int hf_btle_rf_pdu_type = -1;
-static int hf_btle_rf_crc_checked_flag = -1;
-static int hf_btle_rf_crc_valid_flag = -1;
-static int hf_btle_rf_mic_checked_flag = -1;
-static int hf_btle_rf_mic_valid_flag = -1;
-static int hf_btle_rf_phy = -1;
+static int proto_btle_rf;
+
+static int hf_btle_rf_signed_byte_unused;
+static int hf_btle_rf_unsigned_byte_unused;
+static int hf_btle_rf_word_unused;
+static int hf_btle_rf_channel;
+static int hf_btle_rf_signal_dbm;
+static int hf_btle_rf_noise_dbm;
+static int hf_btle_rf_access_address_offenses;
+static int hf_btle_rf_reference_access_address;
+static int hf_btle_rf_flags;
+static int hf_btle_rf_dewhitened_flag;
+static int hf_btle_rf_sigpower_valid_flag;
+static int hf_btle_rf_noisepower_valid_flag;
+static int hf_btle_rf_packet_decrypted_flag;
+static int hf_btle_rf_ref_aa_valid_flag;
+static int hf_btle_rf_aa_offenses_valid_flag;
+static int hf_btle_rf_channel_aliased_flag;
+static int hf_btle_rf_pdu_type;
+static int hf_btle_rf_crc_checked_flag;
+static int hf_btle_rf_crc_valid_flag;
+static int hf_btle_rf_mic_checked_flag;
+static int hf_btle_rf_mic_valid_flag;
+static int hf_btle_rf_phy;
 
 static int * const hfs_btle_rf_flags[] = {
     &hf_btle_rf_dewhitened_flag,
@@ -75,8 +75,8 @@ static int * const hfs_btle_rf_flags[] = {
     NULL
 };
 
-static int ett_btle_rf = -1;
-static int ett_btle_rf_flags = -1;
+static int ett_btle_rf;
+static int ett_btle_rf_flags;
 
 static dissector_handle_t btle_rf_handle;
 static dissector_handle_t btle_handle;
diff --git a/epan/dissectors/packet-btlmp.c b/epan/dissectors/packet-btlmp.c
index 56789c78fb..8a1c6407d2 100644
--- a/epan/dissectors/packet-btlmp.c
+++ b/epan/dissectors/packet-btlmp.c
@@ -19,13 +19,13 @@
 #include "packet-bluetooth.h"
 #include "packet-btbredr_rf.h"
 
-static int proto_btlmp = -1;
+static int proto_btlmp;
 
 static int hf_opcode[3];
 static int hf_escopcode[4];
-static int hf_accept_opcode = -1;
+static int hf_accept_opcode;
 static int hf_accept_escopcode[4];
-static int hf_errorcode = -1;
+static int hf_errorcode;
 static int hf_param_feature_page0_byte0[9];
 static int hf_param_feature_page0_byte1[9];
 static int hf_param_feature_page0_byte2[7];
@@ -37,106 +37,106 @@ static int hf_param_feature_page0_byte7[6];
 static int hf_param_feature_page1_byte0[6];
 static int hf_param_feature_page2_byte0[9];
 static int hf_param_feature_page2_byte1[6];
-static int hf_param_features_page = -1;
-static int hf_param_max_supported_page = -1;
-static int hf_param_versnr = -1;
-static int hf_param_compid = -1;
-static int hf_param_subversnr = -1;
-static int hf_param_namelength = -1;
-static int hf_param_nameoffset = -1;
-static int hf_param_namefragment = -1;
-static int hf_param_afh_mode = -1;
-static int hf_param_afh_instant = -1;
+static int hf_param_features_page;
+static int hf_param_max_supported_page;
+static int hf_param_versnr;
+static int hf_param_compid;
+static int hf_param_subversnr;
+static int hf_param_namelength;
+static int hf_param_nameoffset;
+static int hf_param_namefragment;
+static int hf_param_afh_mode;
+static int hf_param_afh_instant;
 static int hf_param_afh_channelmap[10];
-static int hf_param_afh_reportingmode = -1;
-static int hf_param_afh_mininterval = -1;
-static int hf_param_afh_maxinterval = -1;
+static int hf_param_afh_reportingmode;
+static int hf_param_afh_mininterval;
+static int hf_param_afh_maxinterval;
 static int hf_param_afh_channelclass[10][4];
-static int hf_param_rand = -1;
-static int hf_param_key = -1;
-static int hf_param_clockoffset = -1;
-static int hf_param_authresp = -1;
-static int hf_param_encryptionmode = -1;
-static int hf_param_encryptionkeysize = -1;
-static int hf_param_switchinstant = -1;
-static int hf_param_holdtime = -1;
-static int hf_param_holdinstant = -1;
-static int hf_param_dsniff = -1;
-static int hf_param_tsniff = -1;
-static int hf_param_sniffattempt = -1;
-static int hf_param_snifftimeout = -1;
+static int hf_param_rand;
+static int hf_param_key;
+static int hf_param_clockoffset;
+static int hf_param_authresp;
+static int hf_param_encryptionmode;
+static int hf_param_encryptionkeysize;
+static int hf_param_switchinstant;
+static int hf_param_holdtime;
+static int hf_param_holdinstant;
+static int hf_param_dsniff;
+static int hf_param_tsniff;
+static int hf_param_sniffattempt;
+static int hf_param_snifftimeout;
 static int hf_param_timingcontrolflags[5];
-static int hf_param_futureuse1 = -1;
+static int hf_param_futureuse1;
 static int hf_param_datarate[6];
-static int hf_param_pollinterval = -1;
-static int hf_param_nbc = -1;
-static int hf_param_scohandle = -1;
-static int hf_param_dsco = -1;
-static int hf_param_tsco = -1;
-static int hf_param_scopacket = -1;
-static int hf_param_airmode = -1;
-static int hf_param_slots = -1;
-static int hf_param_tmgacc_drift = -1;
-static int hf_param_tmgacc_jitter = -1;
-static int hf_param_slotoffset = -1;
-static int hf_param_bdaddr = -1;
-static int hf_param_pagingscheme = -1;
-static int hf_param_pagingschemesettings = -1;
-static int hf_param_supervisiontimeout = -1;
-static int hf_param_testscenario = -1;
-static int hf_param_testhoppingmode = -1;
-static int hf_param_testtxfrequency = -1;
-static int hf_param_testrxfrequency = -1;
-static int hf_param_testpowercontrolmode = -1;
-static int hf_param_testpollperiod = -1;
-static int hf_param_testpackettype = -1;
-static int hf_param_testdatalength = -1;
-static int hf_param_keysizemask = -1;
-static int hf_param_encapsulatedmajor = -1;
-static int hf_param_encapsulatedminor = -1;
-static int hf_param_encapsulatedlength = -1;
-static int hf_param_encapsulateddata = -1;
-static int hf_param_simplepaircommit = -1;
-static int hf_param_simplepairnonce = -1;
-static int hf_param_dhkeyconfirm = -1;
-static int hf_param_clkadjid = -1;
-static int hf_param_clkadjinstant = -1;
-static int hf_param_clkadjus = -1;
-static int hf_param_clkadjslots = -1;
-static int hf_param_clkadjmode = -1;
-static int hf_param_clkadjclk = -1;
-static int hf_param_clkadjperiod = -1;
-static int hf_param_packettypetable = -1;
-static int hf_param_escohandle = -1;
-static int hf_param_escoltaddr = -1;
-static int hf_param_escod = -1;
-static int hf_param_escot = -1;
-static int hf_param_escow = -1;
-static int hf_param_escopackettypems = -1;
-static int hf_param_escopackettypesm = -1;
-static int hf_param_escopacketlengthms = -1;
-static int hf_param_escopacketlengthsm = -1;
-static int hf_param_negostate = -1;
-static int hf_param_maxsniffsubrate = -1;
-static int hf_param_minsniffmodetimeout = -1;
-static int hf_param_sniffsubratinginstant = -1;
-static int hf_param_iocapcap = -1;
-static int hf_param_iocapoobauthdata = -1;
-static int hf_param_iocapauthreq = -1;
-static int hf_param_keypressnotificationtype = -1;
-static int hf_param_poweradjreq = -1;
+static int hf_param_pollinterval;
+static int hf_param_nbc;
+static int hf_param_scohandle;
+static int hf_param_dsco;
+static int hf_param_tsco;
+static int hf_param_scopacket;
+static int hf_param_airmode;
+static int hf_param_slots;
+static int hf_param_tmgacc_drift;
+static int hf_param_tmgacc_jitter;
+static int hf_param_slotoffset;
+static int hf_param_bdaddr;
+static int hf_param_pagingscheme;
+static int hf_param_pagingschemesettings;
+static int hf_param_supervisiontimeout;
+static int hf_param_testscenario;
+static int hf_param_testhoppingmode;
+static int hf_param_testtxfrequency;
+static int hf_param_testrxfrequency;
+static int hf_param_testpowercontrolmode;
+static int hf_param_testpollperiod;
+static int hf_param_testpackettype;
+static int hf_param_testdatalength;
+static int hf_param_keysizemask;
+static int hf_param_encapsulatedmajor;
+static int hf_param_encapsulatedminor;
+static int hf_param_encapsulatedlength;
+static int hf_param_encapsulateddata;
+static int hf_param_simplepaircommit;
+static int hf_param_simplepairnonce;
+static int hf_param_dhkeyconfirm;
+static int hf_param_clkadjid;
+static int hf_param_clkadjinstant;
+static int hf_param_clkadjus;
+static int hf_param_clkadjslots;
+static int hf_param_clkadjmode;
+static int hf_param_clkadjclk;
+static int hf_param_clkadjperiod;
+static int hf_param_packettypetable;
+static int hf_param_escohandle;
+static int hf_param_escoltaddr;
+static int hf_param_escod;
+static int hf_param_escot;
+static int hf_param_escow;
+static int hf_param_escopackettypems;
+static int hf_param_escopackettypesm;
+static int hf_param_escopacketlengthms;
+static int hf_param_escopacketlengthsm;
+static int hf_param_negostate;
+static int hf_param_maxsniffsubrate;
+static int hf_param_minsniffmodetimeout;
+static int hf_param_sniffsubratinginstant;
+static int hf_param_iocapcap;
+static int hf_param_iocapoobauthdata;
+static int hf_param_iocapauthreq;
+static int hf_param_keypressnotificationtype;
+static int hf_param_poweradjreq;
 static int hf_param_poweradjresp[5];
-static int hf_param_samindex = -1;
-static int hf_param_samtsm = -1;
-static int hf_param_samnsm = -1;
-static int hf_param_samsubmaps = -1;
-static int hf_param_samupdatemode = -1;
-static int hf_param_samtype0submap = -1;
-static int hf_param_samd = -1;
-static int hf_param_saminstant = -1;
-static int hf_params = -1;
-
-static gint ett_btlmp = -1;
+static int hf_param_samindex;
+static int hf_param_samtsm;
+static int hf_param_samnsm;
+static int hf_param_samsubmaps;
+static int hf_param_samupdatemode;
+static int hf_param_samtype0submap;
+static int hf_param_samd;
+static int hf_param_saminstant;
+static int hf_params;
+
+static gint ett_btlmp;
 
 static dissector_handle_t btlmp_handle;
 
diff --git a/epan/dissectors/packet-btmcap.c b/epan/dissectors/packet-btmcap.c
index bd3f7ffa69..174f2ede1b 100644
--- a/epan/dissectors/packet-btmcap.c
+++ b/epan/dissectors/packet-btmcap.c
@@ -19,30 +19,30 @@
 
 #include "packet-btsdp.h"
 
-static int proto_btmcap = -1;
-
-static int hf_btmcap_op_code                                               = -1;
-static int hf_btmcap_response_code                                         = -1;
-static int hf_btmcap_mdl_id                                                = -1;
-static int hf_btmcap_mdep_id                                               = -1;
-static int hf_btmcap_response_parameters                                   = -1;
-static int hf_btmcap_configuration                                         = -1;
-static int hf_btmcap_timestamp_required_accuracy                           = -1;
-static int hf_btmcap_timestamp_update_information                          = -1;
-static int hf_btmcap_bluetooth_clock_sync_time                             = -1;
-static int hf_btmcap_timestamp_sync_time                                   = -1;
-static int hf_btmcap_timestamp_sample_accuracy                             = -1;
-static int hf_btmcap_bluetooth_clock_access_resolution                     = -1;
-static int hf_btmcap_sync_lead_time                                        = -1;
-static int hf_btmcap_timestamp_native_resolution                           = -1;
-static int hf_btmcap_timestamp_native_accuracy                             = -1;
-static int hf_btmcap_data                                                  = -1;
-
-static gint ett_btmcap = -1;
-
-static expert_field ei_btmcap_mdl_id_ffff = EI_INIT;
-static expert_field ei_btmcap_response_parameters_bad = EI_INIT;
-static expert_field ei_btmcap_unexpected_data = EI_INIT;
+static int proto_btmcap;
+
+static int hf_btmcap_op_code;
+static int hf_btmcap_response_code;
+static int hf_btmcap_mdl_id;
+static int hf_btmcap_mdep_id;
+static int hf_btmcap_response_parameters;
+static int hf_btmcap_configuration;
+static int hf_btmcap_timestamp_required_accuracy;
+static int hf_btmcap_timestamp_update_information;
+static int hf_btmcap_bluetooth_clock_sync_time;
+static int hf_btmcap_timestamp_sync_time;
+static int hf_btmcap_timestamp_sample_accuracy;
+static int hf_btmcap_bluetooth_clock_access_resolution;
+static int hf_btmcap_sync_lead_time;
+static int hf_btmcap_timestamp_native_resolution;
+static int hf_btmcap_timestamp_native_accuracy;
+static int hf_btmcap_data;
+
+static gint ett_btmcap;
+
+static expert_field ei_btmcap_mdl_id_ffff;
+static expert_field ei_btmcap_response_parameters_bad;
+static expert_field ei_btmcap_unexpected_data;
 
 static dissector_handle_t btmcap_handle;
 
diff --git a/epan/dissectors/packet-btmesh-beacon.c b/epan/dissectors/packet-btmesh-beacon.c
index 4c33173598..6e516dd2bc 100644
--- a/epan/dissectors/packet-btmesh-beacon.c
+++ b/epan/dissectors/packet-btmesh-beacon.c
@@ -26,42 +26,42 @@
 
 void proto_register_btmesh_beacon(void);
 
-static int proto_btmesh_beacon = -1;
-
-static int hf_btmesh_beacon_type = -1;
-static int hf_btmesh_beacon_uuid = -1;
-static int hf_btmesh_beacon_oob = -1;
-static int hf_btmesh_beacon_oob_other = -1;
-static int hf_btmesh_beacon_oob_electronic = -1;
-static int hf_btmesh_beacon_oob_2d_code = -1;
-static int hf_btmesh_beacon_oob_bar_code = -1;
-static int hf_btmesh_beacon_oob_nfc= -1;
-static int hf_btmesh_beacon_oob_number = -1;
-static int hf_btmesh_beacon_oob_string = -1;
-static int hf_btmesh_beacon_oob_rfu = -1;
-static int hf_btmesh_beacon_oob_on_box = -1;
-static int hf_btmesh_beacon_oob_inside_box = -1;
-static int hf_btmesh_beacon_oob_on_paper = -1;
-static int hf_btmesh_beacon_oob_inside_manual = -1;
-static int hf_btmesh_beacon_oob_on_device = -1;
-static int hf_btmesh_beacon_uri_hash = -1;
-static int hf_btmesh_beacon_flags = -1;
-static int hf_btmesh_beacon_flags_key_refresh = -1;
-static int hf_btmesh_beacon_flags_iv_update = -1;
-static int hf_btmesh_beacon_flags_rfu = -1;
-static int hf_btmesh_beacon_network_id = -1;
-static int hf_btmesh_beacon_ivindex = -1;
+static int proto_btmesh_beacon;
+
+static int hf_btmesh_beacon_type;
+static int hf_btmesh_beacon_uuid;
+static int hf_btmesh_beacon_oob;
+static int hf_btmesh_beacon_oob_other;
+static int hf_btmesh_beacon_oob_electronic;
+static int hf_btmesh_beacon_oob_2d_code;
+static int hf_btmesh_beacon_oob_bar_code;
+static int hf_btmesh_beacon_oob_nfc;
+static int hf_btmesh_beacon_oob_number;
+static int hf_btmesh_beacon_oob_string;
+static int hf_btmesh_beacon_oob_rfu;
+static int hf_btmesh_beacon_oob_on_box;
+static int hf_btmesh_beacon_oob_inside_box;
+static int hf_btmesh_beacon_oob_on_paper;
+static int hf_btmesh_beacon_oob_inside_manual;
+static int hf_btmesh_beacon_oob_on_device;
+static int hf_btmesh_beacon_uri_hash;
+static int hf_btmesh_beacon_flags;
+static int hf_btmesh_beacon_flags_key_refresh;
+static int hf_btmesh_beacon_flags_iv_update;
+static int hf_btmesh_beacon_flags_rfu;
+static int hf_btmesh_beacon_network_id;
+static int hf_btmesh_beacon_ivindex;
 //TODO: check authentication value
-static int hf_btmesh_beacon_authentication_value = -1;
-static int hf_btmesh_beacon_unknown_data = -1;
+static int hf_btmesh_beacon_authentication_value;
+static int hf_btmesh_beacon_unknown_data;
 
-static int ett_btmesh_beacon = -1;
-static int ett_btmesh_beacon_oob = -1;
-static int ett_btmesh_beacon_flags = -1;
+static int ett_btmesh_beacon;
+static int ett_btmesh_beacon_oob;
+static int ett_btmesh_beacon_flags;
 
-static expert_field ei_btmesh_beacon_unknown_beacon_type = EI_INIT;
-static expert_field ei_btmesh_beacon_unknown_payload = EI_INIT;
-static expert_field ei_btmesh_beacon_rfu_not_zero = EI_INIT;
+static expert_field ei_btmesh_beacon_unknown_beacon_type;
+static expert_field ei_btmesh_beacon_unknown_payload;
+static expert_field ei_btmesh_beacon_rfu_not_zero;
 
 static const value_string btmesh_beacon_type[] = {
     { 0, "Unprovisioned Device Beacon" },
diff --git a/epan/dissectors/packet-btmesh-pbadv.c b/epan/dissectors/packet-btmesh-pbadv.c
index 5bd55c494e..eff558a7ff 100644
--- a/epan/dissectors/packet-btmesh-pbadv.c
+++ b/epan/dissectors/packet-btmesh-pbadv.c
@@ -36,44 +36,44 @@
 void proto_register_btmesh_pbadv(void);
 void proto_reg_handoff_btmesh_pbadv(void);
 
-static int proto_btmesh_pbadv = -1;
+static int proto_btmesh_pbadv;
 
 static dissector_handle_t btmesh_provisioning_handle;
 
-static int hf_btmesh_pbadv_linkid = -1;
-static int hf_btmesh_pbadv_trnumber = -1;
+static int hf_btmesh_pbadv_linkid;
+static int hf_btmesh_pbadv_trnumber;
 
-static int hf_btmesh_generic_provisioning_control_format = -1;
-static int hf_btmesh_gpcf_segn = -1;
-static int hf_btmesh_gpcf_total_length = -1;
+static int hf_btmesh_generic_provisioning_control_format;
+static int hf_btmesh_gpcf_segn;
+static int hf_btmesh_gpcf_total_length;
 //TODO - check FCS
-static int hf_btmesh_gpcf_fcs = -1;
-static int hf_btmesh_gpcf_padding = -1;
-static int hf_btmesh_gpcf_segment_index = -1;
-static int hf_btmesh_gpcf_bearer_opcode = -1;
-static int hf_btmesh_gpcf_bearer_opcode_device_UUID = -1;
-static int hf_btmesh_gpcf_bearer_opcode_reason = -1;
-static int hf_btmesh_gpcf_bearer_unknown_data = -1;
-
-static int hf_btmesh_gpp_payload = -1;
-static int hf_btmesh_gpp_payload_fragment = -1;
-static int hf_btmesh_gpp_fragments = -1;
-static int hf_btmesh_gpp_fragment = -1;
-static int hf_btmesh_gpp_fragment_overlap = -1;
-static int hf_btmesh_gpp_fragment_overlap_conflict = -1;
-static int hf_btmesh_gpp_fragment_multiple_tails = -1;
-static int hf_btmesh_gpp_fragment_too_long_fragment = -1;
-static int hf_btmesh_gpp_fragment_error = -1;
-static int hf_btmesh_gpp_fragment_count = -1;
-static int hf_btmesh_gpp_reassembled_length = -1;
-
-static int ett_btmesh_pbadv = -1;
-static int ett_btmesh_generic_provisioning = -1;
-static int ett_btmesh_gpp_fragments = -1;
-static int ett_btmesh_gpp_fragment = -1;
-
-static expert_field ei_btmesh_gpcf_unknown_opcode = EI_INIT;
-static expert_field ei_btmesh_gpcf_unknown_payload = EI_INIT;
+static int hf_btmesh_gpcf_fcs;
+static int hf_btmesh_gpcf_padding;
+static int hf_btmesh_gpcf_segment_index;
+static int hf_btmesh_gpcf_bearer_opcode;
+static int hf_btmesh_gpcf_bearer_opcode_device_UUID;
+static int hf_btmesh_gpcf_bearer_opcode_reason;
+static int hf_btmesh_gpcf_bearer_unknown_data;
+
+static int hf_btmesh_gpp_payload;
+static int hf_btmesh_gpp_payload_fragment;
+static int hf_btmesh_gpp_fragments;
+static int hf_btmesh_gpp_fragment;
+static int hf_btmesh_gpp_fragment_overlap;
+static int hf_btmesh_gpp_fragment_overlap_conflict;
+static int hf_btmesh_gpp_fragment_multiple_tails;
+static int hf_btmesh_gpp_fragment_too_long_fragment;
+static int hf_btmesh_gpp_fragment_error;
+static int hf_btmesh_gpp_fragment_count;
+static int hf_btmesh_gpp_reassembled_length;
+
+static int ett_btmesh_pbadv;
+static int ett_btmesh_generic_provisioning;
+static int ett_btmesh_gpp_fragments;
+static int ett_btmesh_gpp_fragment;
+
+static expert_field ei_btmesh_gpcf_unknown_opcode;
+static expert_field ei_btmesh_gpcf_unknown_payload;
 
 static const fragment_items btmesh_gpp_frag_items = {
     &ett_btmesh_gpp_fragments,
diff --git a/epan/dissectors/packet-btmesh-provisioning.c b/epan/dissectors/packet-btmesh-provisioning.c
index ebce68acd9..945d57ab36 100644
--- a/epan/dissectors/packet-btmesh-provisioning.c
+++ b/epan/dissectors/packet-btmesh-provisioning.c
@@ -39,80 +39,80 @@
 
 void proto_register_btmesh_provisioning(void);
 
-static int proto_btmesh_provisioning = -1;
-static int hf_btmesh_provisioning_pdu_type = -1;
-static int hf_btmesh_provisioning_pdu_padding = -1;
-
-static int hf_btmesh_provisioning_attention_duration = -1;
-
-static int hf_btmesh_provisioning_number_of_elements = -1;
-static int hf_btmesh_provisioning_algorithms = -1;
-static int hf_btmesh_provisioning_algorithms_p256 = -1;
-static int hf_btmesh_provisioning_algorithms_rfu = -1;
-static int hf_btmesh_provisioning_public_key_type = -1;
-static int hf_btmesh_provisioning_public_key_type_oob = -1;
-static int hf_btmesh_provisioning_public_key_type_rfu = -1;
-static int hf_btmesh_provisioning_static_oob_type = -1;
-static int hf_btmesh_provisioning_static_oob_type_static_oob_available = -1;
-static int hf_btmesh_provisioning_static_oob_type_rfu = -1;
-static int hf_btmesh_provisioning_output_oob_size = -1;
-static int hf_btmesh_provisioning_output_oob_action = -1;
-static int hf_btmesh_provisioning_output_oob_action_blink = -1;
-static int hf_btmesh_provisioning_output_oob_action_beep = -1;
-static int hf_btmesh_provisioning_output_oob_action_vibrate = -1;
-static int hf_btmesh_provisioning_output_oob_action_output_numeric = -1;
-static int hf_btmesh_provisioning_output_oob_action_output_alphanumeric = -1;
-static int hf_btmesh_provisioning_output_oob_action_output_rfu = -1;
-static int hf_btmesh_provisioning_input_oob_size = -1;
-static int hf_btmesh_provisioning_input_oob_action = -1;
-static int hf_btmesh_provisioning_input_oob_action_push = -1;
-static int hf_btmesh_provisioning_input_oob_action_twist = -1;
-static int hf_btmesh_provisioning_input_oob_action_input_numeric = -1;
-static int hf_btmesh_provisioning_input_oob_action_input_alphanumeric = -1;
-static int hf_btmesh_provisioning_input_oob_action_rfu = -1;
-static int hf_btmesh_provisioning_algorithm = -1;
-static int hf_btmesh_provisioning_public_key = -1;
-static int hf_btmesh_provisioning_authentication_method = -1;
-static int hf_btmesh_provisioning_authentication_action_no_oob_action = -1;
-static int hf_btmesh_provisioning_authentication_action_static_oob_action = -1;
-static int hf_btmesh_provisioning_authentication_action_output_oob_action = -1;
-static int hf_btmesh_provisioning_authentication_action_input_oob_action = -1;
-static int hf_btmesh_provisioning_authentication_size_no_oob_action = -1;
-static int hf_btmesh_provisioning_authentication_size_static_oob_action = -1;
-static int hf_btmesh_provisioning_authentication_size_output_oob_action = -1;
-static int hf_btmesh_provisioning_authentication_size_input_oob_action = -1;
-static int hf_btmesh_provisioning_public_key_x = -1;
-static int hf_btmesh_provisioning_public_key_y = -1;
-static int hf_btmesh_provisioning_confirmation = -1;
-static int hf_btmesh_provisioning_random = -1;
-static int hf_btmesh_provisioning_encrypted_provisioning_data = -1;
-static int hf_btmesh_provisioning_decrypted_provisioning_data_mic = -1;
-static int hf_btmesh_provisioning_error_code = -1;
-
-static int hf_btmesh_provisioning_unknown_data = -1;
-
-static int ett_btmesh_provisioning = -1;
-static int ett_btmesh_provisioning_algorithms = -1;
-static int ett_btmesh_provisioning_public_key_type = -1;
-static int ett_btmesh_provisioning_static_oob_type = -1;
-static int ett_btmesh_provisioning_output_oob_action = -1;
-static int ett_btmesh_provisioning_output_oob_size = -1;
-static int ett_btmesh_provisioning_input_oob_action = -1;
-static int ett_btmesh_provisioning_input_oob_size = -1;
-static int ett_btmesh_provisioning_algorithm = -1;
-static int ett_btmesh_provisioning_public_key = -1;
-static int ett_btmesh_provisioning_authentication_method = -1;
-static int ett_btmesh_provisioning_authentication_action = -1;
-static int ett_btmesh_provisioning_authentication_size = -1;
-static int ett_btmesh_provisioning_error_code = -1;
-
-static expert_field ei_btmesh_provisioning_unknown_opcode = EI_INIT;
-static expert_field ei_btmesh_provisioning_unknown_payload = EI_INIT;
-static expert_field ei_btmesh_provisioning_unknown_authentication_method = EI_INIT;
-static expert_field ei_btmesh_provisioning_rfu_not_zero = EI_INIT;
-static expert_field ei_btmesh_provisioning_in_rfu_range = EI_INIT;
-static expert_field ei_btmesh_provisioning_prohibited = EI_INIT;
-static expert_field ei_btmesh_provisioning_zero_elements = EI_INIT;
+static int proto_btmesh_provisioning;
+static int hf_btmesh_provisioning_pdu_type;
+static int hf_btmesh_provisioning_pdu_padding;
+
+static int hf_btmesh_provisioning_attention_duration;
+
+static int hf_btmesh_provisioning_number_of_elements;
+static int hf_btmesh_provisioning_algorithms;
+static int hf_btmesh_provisioning_algorithms_p256;
+static int hf_btmesh_provisioning_algorithms_rfu;
+static int hf_btmesh_provisioning_public_key_type;
+static int hf_btmesh_provisioning_public_key_type_oob;
+static int hf_btmesh_provisioning_public_key_type_rfu;
+static int hf_btmesh_provisioning_static_oob_type;
+static int hf_btmesh_provisioning_static_oob_type_static_oob_available;
+static int hf_btmesh_provisioning_static_oob_type_rfu;
+static int hf_btmesh_provisioning_output_oob_size;
+static int hf_btmesh_provisioning_output_oob_action;
+static int hf_btmesh_provisioning_output_oob_action_blink;
+static int hf_btmesh_provisioning_output_oob_action_beep;
+static int hf_btmesh_provisioning_output_oob_action_vibrate;
+static int hf_btmesh_provisioning_output_oob_action_output_numeric;
+static int hf_btmesh_provisioning_output_oob_action_output_alphanumeric;
+static int hf_btmesh_provisioning_output_oob_action_output_rfu;
+static int hf_btmesh_provisioning_input_oob_size;
+static int hf_btmesh_provisioning_input_oob_action;
+static int hf_btmesh_provisioning_input_oob_action_push;
+static int hf_btmesh_provisioning_input_oob_action_twist;
+static int hf_btmesh_provisioning_input_oob_action_input_numeric;
+static int hf_btmesh_provisioning_input_oob_action_input_alphanumeric;
+static int hf_btmesh_provisioning_input_oob_action_rfu;
+static int hf_btmesh_provisioning_algorithm;
+static int hf_btmesh_provisioning_public_key;
+static int hf_btmesh_provisioning_authentication_method;
+static int hf_btmesh_provisioning_authentication_action_no_oob_action;
+static int hf_btmesh_provisioning_authentication_action_static_oob_action;
+static int hf_btmesh_provisioning_authentication_action_output_oob_action;
+static int hf_btmesh_provisioning_authentication_action_input_oob_action;
+static int hf_btmesh_provisioning_authentication_size_no_oob_action;
+static int hf_btmesh_provisioning_authentication_size_static_oob_action;
+static int hf_btmesh_provisioning_authentication_size_output_oob_action;
+static int hf_btmesh_provisioning_authentication_size_input_oob_action;
+static int hf_btmesh_provisioning_public_key_x;
+static int hf_btmesh_provisioning_public_key_y;
+static int hf_btmesh_provisioning_confirmation;
+static int hf_btmesh_provisioning_random;
+static int hf_btmesh_provisioning_encrypted_provisioning_data;
+static int hf_btmesh_provisioning_decrypted_provisioning_data_mic;
+static int hf_btmesh_provisioning_error_code;
+
+static int hf_btmesh_provisioning_unknown_data;
+
+static int ett_btmesh_provisioning;
+static int ett_btmesh_provisioning_algorithms;
+static int ett_btmesh_provisioning_public_key_type;
+static int ett_btmesh_provisioning_static_oob_type;
+static int ett_btmesh_provisioning_output_oob_action;
+static int ett_btmesh_provisioning_output_oob_size;
+static int ett_btmesh_provisioning_input_oob_action;
+static int ett_btmesh_provisioning_input_oob_size;
+static int ett_btmesh_provisioning_algorithm;
+static int ett_btmesh_provisioning_public_key;
+static int ett_btmesh_provisioning_authentication_method;
+static int ett_btmesh_provisioning_authentication_action;
+static int ett_btmesh_provisioning_authentication_size;
+static int ett_btmesh_provisioning_error_code;
+
+static expert_field ei_btmesh_provisioning_unknown_opcode;
+static expert_field ei_btmesh_provisioning_unknown_payload;
+static expert_field ei_btmesh_provisioning_unknown_authentication_method;
+static expert_field ei_btmesh_provisioning_rfu_not_zero;
+static expert_field ei_btmesh_provisioning_in_rfu_range;
+static expert_field ei_btmesh_provisioning_prohibited;
+static expert_field ei_btmesh_provisioning_zero_elements;
 
 static const value_string btmesh_provisioning_pdu_type_format[] = {
     { 0, "Provisioning Invite PDU" },
diff --git a/epan/dissectors/packet-btmesh-proxy.c b/epan/dissectors/packet-btmesh-proxy.c
index 615a6a1b37..2c167737fb 100644
--- a/epan/dissectors/packet-btmesh-proxy.c
+++ b/epan/dissectors/packet-btmesh-proxy.c
@@ -44,49 +44,49 @@
 void proto_register_btmesh_proxy(void);
 void proto_reg_handoff_btmesh_proxy(void);
 
-static int proto_btmesh_proxy = -1;
-
-static int hf_btmesh_proxy_type = -1;
-static int hf_btmesh_proxy_sar = -1;
-static int hf_btmesh_proxy_data = -1;
-static int hf_btmesh_proxy_data_fragment = -1;
-static int hf_btmesh_proxy_fragments = -1;
-static int hf_btmesh_proxy_fragment = -1;
-static int hf_btmesh_proxy_fragment_overlap = -1;
-static int hf_btmesh_proxy_fragment_overlap_conflict = -1;
-static int hf_btmesh_proxy_fragment_multiple_tails = -1;
-static int hf_btmesh_proxy_fragment_too_long_fragment = -1;
-static int hf_btmesh_proxy_fragment_error = -1;
-static int hf_btmesh_proxy_fragment_count = -1;
-static int hf_btmesh_proxy_reassembled_length = -1;
-static int hf_btmesh_proxy_ivi = -1;
-static int hf_btmesh_proxy_nid = -1;
-static int hf_btmesh_proxy_ctl = -1;
-static int hf_btmesh_proxy_ttl = -1;
-static int hf_btmesh_proxy_seq = -1;
-static int hf_btmesh_proxy_src = -1;
-static int hf_btmesh_proxy_dst = -1;
-static int hf_btmesh_proxy_transport_pdu = -1;
-static int hf_btmesh_proxy_netmic = -1;
-static int hf_btmesh_proxy_control_opcode = -1;
-static int hf_btmesh_proxy_control_parameters = -1;
-static int hf_btmesh_proxy_control_filter_type = -1;
-static int hf_btmesh_proxy_control_list_size = -1;
-static int hf_btmesh_proxy_control_list_item = -1;
-
-static int ett_btmesh_proxy = -1;
-static int ett_btmesh_proxy_network_pdu = -1;
-static int ett_btmesh_proxy_transport_pdu = -1;
-static int ett_btmesh_proxy_fragments = -1;
-static int ett_btmesh_proxy_fragment = -1;
-
-static expert_field ei_btmesh_proxy_unknown_opcode = EI_INIT;
-static expert_field ei_btmesh_proxy_unknown_payload = EI_INIT;
-static expert_field ei_btmesh_proxy_wrong_ctl = EI_INIT;
-static expert_field ei_btmesh_proxy_wrong_ttl = EI_INIT;
-static expert_field ei_btmesh_proxy_wrong_dst = EI_INIT;
-static expert_field ei_btmesh_proxy_unknown_filter_type = EI_INIT;
-static expert_field ei_btmesh_proxy_wrong_address_type = EI_INIT;
+static int proto_btmesh_proxy;
+
+static int hf_btmesh_proxy_type;
+static int hf_btmesh_proxy_sar;
+static int hf_btmesh_proxy_data;
+static int hf_btmesh_proxy_data_fragment;
+static int hf_btmesh_proxy_fragments;
+static int hf_btmesh_proxy_fragment;
+static int hf_btmesh_proxy_fragment_overlap;
+static int hf_btmesh_proxy_fragment_overlap_conflict;
+static int hf_btmesh_proxy_fragment_multiple_tails;
+static int hf_btmesh_proxy_fragment_too_long_fragment;
+static int hf_btmesh_proxy_fragment_error;
+static int hf_btmesh_proxy_fragment_count;
+static int hf_btmesh_proxy_reassembled_length;
+static int hf_btmesh_proxy_ivi;
+static int hf_btmesh_proxy_nid;
+static int hf_btmesh_proxy_ctl;
+static int hf_btmesh_proxy_ttl;
+static int hf_btmesh_proxy_seq;
+static int hf_btmesh_proxy_src;
+static int hf_btmesh_proxy_dst;
+static int hf_btmesh_proxy_transport_pdu;
+static int hf_btmesh_proxy_netmic;
+static int hf_btmesh_proxy_control_opcode;
+static int hf_btmesh_proxy_control_parameters;
+static int hf_btmesh_proxy_control_filter_type;
+static int hf_btmesh_proxy_control_list_size;
+static int hf_btmesh_proxy_control_list_item;
+
+static int ett_btmesh_proxy;
+static int ett_btmesh_proxy_network_pdu;
+static int ett_btmesh_proxy_transport_pdu;
+static int ett_btmesh_proxy_fragments;
+static int ett_btmesh_proxy_fragment;
+
+static expert_field ei_btmesh_proxy_unknown_opcode;
+static expert_field ei_btmesh_proxy_unknown_payload;
+static expert_field ei_btmesh_proxy_wrong_ctl;
+static expert_field ei_btmesh_proxy_wrong_ttl;
+static expert_field ei_btmesh_proxy_wrong_dst;
+static expert_field ei_btmesh_proxy_unknown_filter_type;
+static expert_field ei_btmesh_proxy_wrong_address_type;
 
 static dissector_handle_t btmesh_handle;
 static dissector_handle_t btmesh_provisioning_handle;
diff --git a/epan/dissectors/packet-btmesh.c b/epan/dissectors/packet-btmesh.c
index 34e2e812a2..b6190a01f2 100644
--- a/epan/dissectors/packet-btmesh.c
+++ b/epan/dissectors/packet-btmesh.c
@@ -604,7 +604,7 @@
 
 void proto_register_btmesh(void);
 
-static int proto_btmesh = -1;
+static int proto_btmesh;
 static dissector_table_t btmesh_model_vendor_dissector_table;
 
 /*-------------------------------------
@@ -703,1042 +703,1042 @@ typedef struct {
     int *hf_raw_value_a2;
 } bt_property_columns_raw_value_t;
 
-static int hf_btmesh_ivi = -1;
-static int hf_btmesh_nid = -1;
-static int hf_btmesh_obfuscated = -1;
-static int hf_btmesh_encrypted = -1;
-static int hf_btmesh_netmic = -1;
-
-static int hf_btmesh_ctl = -1;
-static int hf_btmesh_ttl = -1;
-static int hf_btmesh_seq = -1;
-static int hf_btmesh_src = -1;
-static int hf_btmesh_dst = -1;
-
-static int hf_btmesh_transp_pdu = -1;
-static int hf_btmesh_cntr_seg = -1;
-static int hf_btmesh_acc_seg = -1;
-static int hf_btmesh_cntr_opcode = -1;
-static int hf_btmesh_acc_akf = -1;
-static int hf_btmesh_acc_aid = -1;
-static int hf_btmesh_obo = -1;
-static int hf_btmesh_seqzero = -1;
-static int hf_btmesh_rfu = -1;
-static int hf_btmesh_blockack = -1;
-static int hf_btmesh_cntr_criteria_rfu = -1;
-static int hf_btmesh_cntr_padding = -1;
-static int hf_btmesh_cntr_fsn = -1;
-
-static int hf_btmesh_cntr_key_refresh_flag = -1;
-static int hf_btmesh_cntr_iv_update_flag = -1;
-static int hf_btmesh_cntr_flags_rfu = -1;
-static int hf_btmesh_cntr_iv_index = -1;
-static int hf_btmesh_cntr_md = -1;
-
-static int hf_btmesh_cntr_heartbeat_rfu = -1;
-static int hf_btmesh_cntr_init_ttl = -1;
-static int hf_btmesh_cntr_feature_relay = -1;
-static int hf_btmesh_cntr_feature_proxy = -1;
-static int hf_btmesh_cntr_feature_friend = -1;
-static int hf_btmesh_cntr_feature_low_power = -1;
-static int hf_btmesh_cntr_feature_rfu = -1;
-
-static int hf_btmesh_cntr_criteria_rssifactor = -1;
-static int hf_btmesh_cntr_criteria_receivewindowfactor = -1;
-static int hf_btmesh_cntr_criteria_minqueuesizelog = -1;
-static int hf_btmesh_cntr_receivedelay = -1;
-static int hf_btmesh_cntr_polltimeout = -1;
-static int hf_btmesh_cntr_previousaddress = -1;
-static int hf_btmesh_cntr_numelements = -1;
-static int hf_btmesh_cntr_lpncounter = -1;
-static int hf_btmesh_cntr_receivewindow = -1;
-static int hf_btmesh_cntr_queuesize = -1;
-static int hf_btmesh_cntr_subscriptionlistsize = -1;
-static int hf_btmesh_cntr_rssi = -1;
-static int hf_btmesh_cntr_friendcounter = -1;
-static int hf_btmesh_cntr_lpnaddress = -1;
-static int hf_btmesh_cntr_transactionnumber = -1;
-static int hf_btmesh_enc_access_pld = -1;
-static int hf_btmesh_transtmic = -1;
-static int hf_btmesh_szmic = -1;
-static int hf_btmesh_seqzero_data = -1;
-static int hf_btmesh_sego = -1;
-static int hf_btmesh_segn = -1;
-static int hf_btmesh_seg_rfu = -1;
-static int hf_btmesh_segment = -1;
-static int hf_btmesh_cntr_unknown_payload = -1;
-
-static int hf_btmesh_segmented_access_fragments = -1;
-static int hf_btmesh_segmented_access_fragment = -1;
-static int hf_btmesh_segmented_access_fragment_overlap = -1;
-static int hf_btmesh_segmented_access_fragment_overlap_conflict = -1;
-static int hf_btmesh_segmented_access_fragment_multiple_tails = -1;
-static int hf_btmesh_segmented_access_fragment_too_long_fragment = -1;
-static int hf_btmesh_segmented_access_fragment_error = -1;
-static int hf_btmesh_segmented_access_fragment_count = -1;
-static int hf_btmesh_segmented_access_reassembled_length = -1;
-
-static int hf_btmesh_segmented_control_fragments = -1;
-static int hf_btmesh_segmented_control_fragment = -1;
-static int hf_btmesh_segmented_control_fragment_overlap = -1;
-static int hf_btmesh_segmented_control_fragment_overlap_conflict = -1;
-static int hf_btmesh_segmented_control_fragment_multiple_tails = -1;
-static int hf_btmesh_segmented_control_fragment_too_long_fragment = -1;
-static int hf_btmesh_segmented_control_fragment_error = -1;
-static int hf_btmesh_segmented_control_fragment_count = -1;
-static int hf_btmesh_segmented_control_reassembled_length = -1;
-
-static int hf_btmesh_decrypted_access = -1;
-static int hf_btmesh_model_layer_opcode = -1;
-static int hf_btmesh_model_layer_parameters = -1;
-static int hf_btmesh_model_layer_vendor_opcode = -1;
-static int hf_btmesh_model_layer_vendor = -1;
-
-static int hf_btmesh_config_appkey_add_netkeyindexandappkeyindex = -1;
-static int hf_btmesh_config_appkey_add_netkeyindexandappkeyindex_net = -1;
-static int hf_btmesh_config_appkey_add_netkeyindexandappkeyindex_app = -1;
-static int hf_btmesh_config_appkey_add_appkey = -1;
-static int hf_btmesh_config_appkey_update_netkeyindexandappkeyindex = -1;
-static int hf_btmesh_config_appkey_update_netkeyindexandappkeyindex_net = -1;
-static int hf_btmesh_config_appkey_update_netkeyindexandappkeyindex_app = -1;
-static int hf_btmesh_config_appkey_update_appkey = -1;
-static int hf_btmesh_config_composition_data_status_page = -1;
-static int hf_btmesh_config_composition_data_status_cid = -1;
-static int hf_btmesh_config_composition_data_status_pid = -1;
-static int hf_btmesh_config_composition_data_status_vid = -1;
-static int hf_btmesh_config_composition_data_status_crpl = -1;
-static int hf_btmesh_config_composition_data_status_features_relay = -1;
-static int hf_btmesh_config_composition_data_status_features_proxy = -1;
-static int hf_btmesh_config_composition_data_status_features_friend = -1;
-static int hf_btmesh_config_composition_data_status_features_low_power = -1;
-static int hf_btmesh_config_composition_data_status_features_rfu = -1;
-static int hf_btmesh_config_composition_data_status_features = -1;
-static int hf_btmesh_config_composition_data_status_loc = -1;
-static int hf_btmesh_config_composition_data_status_nums = -1;
-static int hf_btmesh_config_composition_data_status_numv = -1;
-static int hf_btmesh_config_composition_data_status_sig_model = -1;
-static int hf_btmesh_config_composition_data_status_vendor_model = -1;
-static int hf_btmesh_config_model_publication_set_elementaddress = -1;
-static int hf_btmesh_config_model_publication_set_publishaddress = -1;
-static int hf_btmesh_config_model_publication_set_appkey = -1;
-static int hf_btmesh_config_model_publication_set_appkeyindex = -1;
-static int hf_btmesh_config_model_publication_set_credentialflag = -1;
-static int hf_btmesh_config_model_publication_set_rfu = -1;
-static int hf_btmesh_config_model_publication_set_publishttl = -1;
-static int hf_btmesh_config_model_publication_set_publishperiod = -1;
-static int hf_btmesh_config_model_publication_set_publishperiod_resolution = -1;
-static int hf_btmesh_config_model_publication_set_publishperiod_steps = -1;
-static int hf_btmesh_config_model_publication_set_publishretransmit = -1;
-static int hf_btmesh_config_model_publication_set_publishretransmit_count = -1;
-static int hf_btmesh_config_model_publication_set_publishretransmit_intervalsteps = -1;
-static int hf_btmesh_config_model_publication_set_modelidentifier = -1;
-static int hf_btmesh_config_model_publication_set_vendormodelidentifier = -1;
-static int hf_btmesh_health_current_status_test_id = -1;
-static int hf_btmesh_health_current_status_company_id = -1;
-static int hf_btmesh_health_current_status_fault = -1;
-static int hf_btmesh_health_fault_status_test_id = -1;
-static int hf_btmesh_health_fault_status_company_id = -1;
-static int hf_btmesh_health_fault_status_fault = -1;
-static int hf_btmesh_config_heartbeat_publication_status_status = -1;
-static int hf_btmesh_config_heartbeat_publication_status_destination = -1;
-static int hf_btmesh_config_heartbeat_publication_status_countlog = -1;
-static int hf_btmesh_config_heartbeat_publication_status_periodlog = -1;
-static int hf_btmesh_config_heartbeat_publication_status_ttl = -1;
-static int hf_btmesh_config_heartbeat_publication_status_features_relay = -1;
-static int hf_btmesh_config_heartbeat_publication_status_features_proxy = -1;
-static int hf_btmesh_config_heartbeat_publication_status_features_friend = -1;
-static int hf_btmesh_config_heartbeat_publication_status_features_low_power = -1;
-static int hf_btmesh_config_heartbeat_publication_status_features_rfu = -1;
-static int hf_btmesh_config_heartbeat_publication_status_features = -1;
-static int hf_btmesh_config_heartbeat_publication_status_netkeyindex = -1;
-static int hf_btmesh_config_heartbeat_publication_status_netkeyindex_idx = -1;
-static int hf_btmesh_config_heartbeat_publication_status_netkeyindex_rfu = -1;
-static int hf_btmesh_config_appkey_delete_netkeyindexandappkeyindex = -1;
-static int hf_btmesh_config_appkey_delete_netkeyindexandappkeyindex_net = -1;
-static int hf_btmesh_config_appkey_delete_netkeyindexandappkeyindex_app = -1;
-static int hf_btmesh_config_appkey_get_netkeyindex = -1;
-static int hf_btmesh_config_appkey_get_netkeyindex_idx = -1;
-static int hf_btmesh_config_appkey_get_netkeyindex_rfu = -1;
-static int hf_btmesh_config_appkey_list_status = -1;
-static int hf_btmesh_config_appkey_list_netkeyindex = -1;
-static int hf_btmesh_config_appkey_list_netkeyindex_idx = -1;
-static int hf_btmesh_config_appkey_list_netkeyindex_rfu = -1;
-static int hf_btmesh_config_appkey_list_appkeyindex = -1;
-static int hf_btmesh_config_appkey_list_appkeyindex_rfu = -1;
-static int hf_btmesh_config_appkey_status_status = -1;
-static int hf_btmesh_config_appkey_status_netkeyindexandappkeyindex = -1;
-static int hf_btmesh_config_appkey_status_netkeyindexandappkeyindex_net = -1;
-static int hf_btmesh_config_appkey_status_netkeyindexandappkeyindex_app = -1;
-static int hf_btmesh_health_attention_set_attention = -1;
-static int hf_btmesh_health_attention_set_unacknowledged_attention = -1;
-static int hf_btmesh_health_attention_status_attention = -1;
-static int hf_btmesh_config_composition_data_get_page = -1;
-static int hf_btmesh_config_beacon_set_beacon = -1;
-static int hf_btmesh_config_beacon_status_beacon = -1;
-static int hf_btmesh_config_default_ttl_set_ttl = -1;
-static int hf_btmesh_config_default_ttl_status_ttl = -1;
-static int hf_btmesh_config_friend_set_friend = -1;
-static int hf_btmesh_config_friend_status_friend = -1;
-static int hf_btmesh_config_gatt_proxy_set_gattproxy = -1;
-static int hf_btmesh_config_gatt_proxy_status_gattproxy = -1;
-static int hf_btmesh_config_key_refresh_phase_get_netkeyindex = -1;
-static int hf_btmesh_config_key_refresh_phase_get_netkeyindex_idx = -1;
-static int hf_btmesh_config_key_refresh_phase_get_netkeyindex_rfu = -1;
-static int hf_btmesh_config_key_refresh_phase_set_netkeyindex = -1;
-static int hf_btmesh_config_key_refresh_phase_set_netkeyindex_idx = -1;
-static int hf_btmesh_config_key_refresh_phase_set_netkeyindex_rfu = -1;
-static int hf_btmesh_config_key_refresh_phase_set_transition = -1;
-static int hf_btmesh_config_key_refresh_phase_status_status = -1;
-static int hf_btmesh_config_key_refresh_phase_status_netkeyindex = -1;
-static int hf_btmesh_config_key_refresh_phase_status_netkeyindex_idx = -1;
-static int hf_btmesh_config_key_refresh_phase_status_netkeyindex_rfu = -1;
-static int hf_btmesh_config_key_refresh_phase_status_phase = -1;
-static int hf_btmesh_config_model_publication_get_elementaddress = -1;
-static int hf_btmesh_config_model_publication_get_modelidentifier = -1;
-static int hf_btmesh_config_model_publication_get_vendormodelidentifier = -1;
-static int hf_btmesh_config_model_publication_status_status = -1;
-static int hf_btmesh_config_model_publication_status_elementaddress = -1;
-static int hf_btmesh_config_model_publication_status_publishaddress = -1;
-static int hf_btmesh_config_model_publication_status_appkey = -1;
-static int hf_btmesh_config_model_publication_status_appkeyindex = -1;
-static int hf_btmesh_config_model_publication_status_credentialflag = -1;
-static int hf_btmesh_config_model_publication_status_rfu = -1;
-static int hf_btmesh_config_model_publication_status_publishttl = -1;
-static int hf_btmesh_config_model_publication_status_publishperiod = -1;
-static int hf_btmesh_config_model_publication_status_publishperiod_resolution = -1;
-static int hf_btmesh_config_model_publication_status_publishperiod_steps = -1;
-static int hf_btmesh_config_model_publication_status_publishretransmit = -1;
-static int hf_btmesh_config_model_publication_status_publishretransmit_count = -1;
-static int hf_btmesh_config_model_publication_status_publishretransmit_intervalsteps = -1;
-static int hf_btmesh_config_model_publication_status_modelidentifier = -1;
-static int hf_btmesh_config_model_publication_status_vendormodelidentifier = -1;
-static int hf_btmesh_config_model_publication_virtual_address_set_elementaddress = -1;
-static int hf_btmesh_config_model_publication_virtual_address_set_publishaddress = -1;
-static int hf_btmesh_config_model_publication_virtual_address_set_appkey = -1;
-static int hf_btmesh_config_model_publication_virtual_address_set_appkeyindex = -1;
-static int hf_btmesh_config_model_publication_virtual_address_set_credentialflag = -1;
-static int hf_btmesh_config_model_publication_virtual_address_set_rfu = -1;
-static int hf_btmesh_config_model_publication_virtual_address_set_publishttl = -1;
-static int hf_btmesh_config_model_publication_virtual_address_set_publishperiod = -1;
-static int hf_btmesh_config_model_publication_virtual_address_set_publishperiod_resolution = -1;
-static int hf_btmesh_config_model_publication_virtual_address_set_publishperiod_steps = -1;
-static int hf_btmesh_config_model_publication_virtual_address_set_publishretransmit = -1;
-static int hf_btmesh_config_model_publication_virtual_address_set_publishretransmit_count = -1;
-static int hf_btmesh_config_model_publication_virtual_address_set_publishretransmit_intervalsteps = -1;
-static int hf_btmesh_config_model_publication_virtual_address_set_modelidentifier = -1;
-static int hf_btmesh_config_model_publication_virtual_address_set_vendormodelidentifier = -1;
-static int hf_btmesh_config_model_subscription_add_elementaddress = -1;
-static int hf_btmesh_config_model_subscription_add_address = -1;
-static int hf_btmesh_config_model_subscription_add_modelidentifier = -1;
-static int hf_btmesh_config_model_subscription_add_vendormodelidentifier = -1;
-static int hf_btmesh_config_model_subscription_delete_elementaddress = -1;
-static int hf_btmesh_config_model_subscription_delete_address = -1;
-static int hf_btmesh_config_model_subscription_delete_modelidentifier = -1;
-static int hf_btmesh_config_model_subscription_delete_vendormodelidentifier = -1;
-static int hf_btmesh_config_model_subscription_delete_all_elementaddress = -1;
-static int hf_btmesh_config_model_subscription_delete_all_modelidentifier = -1;
-static int hf_btmesh_config_model_subscription_delete_all_vendormodelidentifier = -1;
-static int hf_btmesh_config_model_subscription_overwrite_elementaddress = -1;
-static int hf_btmesh_config_model_subscription_overwrite_address = -1;
-static int hf_btmesh_config_model_subscription_overwrite_modelidentifier = -1;
-static int hf_btmesh_config_model_subscription_overwrite_vendormodelidentifier = -1;
-static int hf_btmesh_config_model_subscription_status_status = -1;
-static int hf_btmesh_config_model_subscription_status_elementaddress = -1;
-static int hf_btmesh_config_model_subscription_status_address = -1;
-static int hf_btmesh_config_model_subscription_status_modelidentifier = -1;
-static int hf_btmesh_config_model_subscription_status_vendormodelidentifier = -1;
-static int hf_btmesh_config_model_subscription_virtual_address_add_elementaddress = -1;
-static int hf_btmesh_config_model_subscription_virtual_address_add_label = -1;
-static int hf_btmesh_config_model_subscription_virtual_address_add_modelidentifier = -1;
-static int hf_btmesh_config_model_subscription_virtual_address_add_vendormodelidentifier = -1;
-static int hf_btmesh_config_model_subscription_virtual_address_delete_elementaddress = -1;
-static int hf_btmesh_config_model_subscription_virtual_address_delete_label = -1;
-static int hf_btmesh_config_model_subscription_virtual_address_delete_modelidentifier = -1;
-static int hf_btmesh_config_model_subscription_virtual_address_delete_vendormodelidentifier = -1;
-static int hf_btmesh_config_model_subscription_virtual_address_overwrite_elementaddress = -1;
-static int hf_btmesh_config_model_subscription_virtual_address_overwrite_label = -1;
-static int hf_btmesh_config_model_subscription_virtual_address_overwrite_modelidentifier = -1;
-static int hf_btmesh_config_model_subscription_virtual_address_overwrite_vendormodelidentifier = -1;
-static int hf_btmesh_config_network_transmit_set_networktransmit = -1;
-static int hf_btmesh_config_network_transmit_set_networktransmit_count = -1;
-static int hf_btmesh_config_network_transmit_set_networktransmit_intervalsteps = -1;
-static int hf_btmesh_config_network_transmit_status_networktransmit = -1;
-static int hf_btmesh_config_network_transmit_status_networktransmit_count = -1;
-static int hf_btmesh_config_network_transmit_status_networktransmit_intervalsteps = -1;
-static int hf_btmesh_config_relay_set_relay = -1;
-static int hf_btmesh_config_relay_set_relayretransmit = -1;
-static int hf_btmesh_config_relay_set_relayretransmit_count = -1;
-static int hf_btmesh_config_relay_set_relayretransmit_intervalsteps = -1;
-static int hf_btmesh_config_relay_status_relay = -1;
-static int hf_btmesh_config_relay_status_relayretransmit = -1;
-static int hf_btmesh_config_relay_status_relayretransmit_count = -1;
-static int hf_btmesh_config_relay_status_relayretransmit_intervalsteps = -1;
-static int hf_btmesh_config_sig_model_subscription_get_elementaddress = -1;
-static int hf_btmesh_config_sig_model_subscription_get_modelidentifier = -1;
-static int hf_btmesh_config_sig_model_subscription_list_status = -1;
-static int hf_btmesh_config_sig_model_subscription_list_elementaddress = -1;
-static int hf_btmesh_config_sig_model_subscription_list_modelidentifier = -1;
-static int hf_btmesh_config_sig_model_subscription_list_address = -1;
-static int hf_btmesh_config_vendor_model_subscription_get_elementaddress = -1;
-static int hf_btmesh_config_vendor_model_subscription_get_modelidentifier = -1;
-static int hf_btmesh_config_vendor_model_subscription_list_status = -1;
-static int hf_btmesh_config_vendor_model_subscription_list_elementaddress = -1;
-static int hf_btmesh_config_vendor_model_subscription_list_modelidentifier = -1;
-static int hf_btmesh_config_vendor_model_subscription_list_address = -1;
-static int hf_btmesh_config_low_power_node_polltimeout_get_lpnaddress = -1;
-static int hf_btmesh_config_low_power_node_polltimeout_status_lpnaddress = -1;
-static int hf_btmesh_config_low_power_node_polltimeout_status_polltimeout = -1;
-static int hf_btmesh_health_fault_clear_company_id = -1;
-static int hf_btmesh_health_fault_clear_unacknowledged_company_id = -1;
-static int hf_btmesh_health_fault_get_company_id = -1;
-static int hf_btmesh_health_fault_test_test_id = -1;
-static int hf_btmesh_health_fault_test_company_id = -1;
-static int hf_btmesh_health_fault_test_unacknowledged_test_id = -1;
-static int hf_btmesh_health_fault_test_unacknowledged_company_id = -1;
-static int hf_btmesh_health_period_set_fast_period_divisor = -1;
-static int hf_btmesh_health_period_set_unacknowledged_fast_period_divisor = -1;
-static int hf_btmesh_health_period_status_fast_period_divisor = -1;
-static int hf_btmesh_config_heartbeat_publication_set_destination = -1;
-static int hf_btmesh_config_heartbeat_publication_set_countlog = -1;
-static int hf_btmesh_config_heartbeat_publication_set_periodlog = -1;
-static int hf_btmesh_config_heartbeat_publication_set_ttl = -1;
-static int hf_btmesh_config_heartbeat_publication_set_features_relay = -1;
-static int hf_btmesh_config_heartbeat_publication_set_features_proxy = -1;
-static int hf_btmesh_config_heartbeat_publication_set_features_friend = -1;
-static int hf_btmesh_config_heartbeat_publication_set_features_low_power = -1;
-static int hf_btmesh_config_heartbeat_publication_set_features_rfu = -1;
-static int hf_btmesh_config_heartbeat_publication_set_features = -1;
-static int hf_btmesh_config_heartbeat_publication_set_netkeyindex = -1;
-static int hf_btmesh_config_heartbeat_publication_set_netkeyindex_idx = -1;
-static int hf_btmesh_config_heartbeat_publication_set_netkeyindex_rfu = -1;
-static int hf_btmesh_config_heartbeat_subscription_set_source = -1;
-static int hf_btmesh_config_heartbeat_subscription_set_destination = -1;
-static int hf_btmesh_config_heartbeat_subscription_set_periodlog = -1;
-static int hf_btmesh_config_heartbeat_subscription_status_status = -1;
-static int hf_btmesh_config_heartbeat_subscription_status_source = -1;
-static int hf_btmesh_config_heartbeat_subscription_status_destination = -1;
-static int hf_btmesh_config_heartbeat_subscription_status_periodlog = -1;
-static int hf_btmesh_config_heartbeat_subscription_status_countlog = -1;
-static int hf_btmesh_config_heartbeat_subscription_status_minhops = -1;
-static int hf_btmesh_config_heartbeat_subscription_status_maxhops = -1;
-static int hf_btmesh_config_model_app_bind_elementaddress = -1;
-static int hf_btmesh_config_model_app_bind_appkeyindex = -1;
-static int hf_btmesh_config_model_app_bind_appkeyindex_idx = -1;
-static int hf_btmesh_config_model_app_bind_appkeyindex_rfu = -1;
-static int hf_btmesh_config_model_app_bind_modelidentifier = -1;
-static int hf_btmesh_config_model_app_bind_vendormodelidentifier = -1;
-static int hf_btmesh_config_model_app_status_status = -1;
-static int hf_btmesh_config_model_app_status_elementaddress = -1;
-static int hf_btmesh_config_model_app_status_appkeyindex = -1;
-static int hf_btmesh_config_model_app_status_appkeyindex_idx = -1;
-static int hf_btmesh_config_model_app_status_appkeyindex_rfu = -1;
-static int hf_btmesh_config_model_app_status_modelidentifier = -1;
-static int hf_btmesh_config_model_app_status_vendormodelidentifier = -1;
-static int hf_btmesh_config_model_app_unbind_elementaddress = -1;
-static int hf_btmesh_config_model_app_unbind_appkeyindex = -1;
-static int hf_btmesh_config_model_app_unbind_appkeyindex_idx = -1;
-static int hf_btmesh_config_model_app_unbind_appkeyindex_rfu = -1;
-static int hf_btmesh_config_model_app_unbind_modelidentifier = -1;
-static int hf_btmesh_config_model_app_unbind_vendormodelidentifier = -1;
-static int hf_btmesh_config_netkey_add_netkeyindex = -1;
-static int hf_btmesh_config_netkey_add_netkeyindex_idx = -1;
-static int hf_btmesh_config_netkey_add_netkeyindex_rfu = -1;
-static int hf_btmesh_config_netkey_add_netkey = -1;
-static int hf_btmesh_config_netkey_delete_netkeyindex = -1;
-static int hf_btmesh_config_netkey_delete_netkeyindex_idx = -1;
-static int hf_btmesh_config_netkey_delete_netkeyindex_rfu = -1;
-static int hf_btmesh_config_netkey_list_netkeyindex = -1;
-static int hf_btmesh_config_netkey_list_netkeyindex_rfu = -1;
-static int hf_btmesh_config_netkey_status_status = -1;
-static int hf_btmesh_config_netkey_status_netkeyindex = -1;
-static int hf_btmesh_config_netkey_status_netkeyindex_idx = -1;
-static int hf_btmesh_config_netkey_status_netkeyindex_rfu = -1;
-static int hf_btmesh_config_netkey_update_netkeyindex = -1;
-static int hf_btmesh_config_netkey_update_netkeyindex_idx = -1;
-static int hf_btmesh_config_netkey_update_netkeyindex_rfu = -1;
-static int hf_btmesh_config_netkey_update_netkey = -1;
-static int hf_btmesh_config_node_identity_get_netkeyindex = -1;
-static int hf_btmesh_config_node_identity_get_netkeyindex_idx = -1;
-static int hf_btmesh_config_node_identity_get_netkeyindex_rfu = -1;
-static int hf_btmesh_config_node_identity_set_netkeyindex = -1;
-static int hf_btmesh_config_node_identity_set_netkeyindex_idx = -1;
-static int hf_btmesh_config_node_identity_set_netkeyindex_rfu = -1;
-static int hf_btmesh_config_node_identity_set_identity = -1;
-static int hf_btmesh_config_node_identity_status_status = -1;
-static int hf_btmesh_config_node_identity_status_netkeyindex = -1;
-static int hf_btmesh_config_node_identity_status_netkeyindex_idx = -1;
-static int hf_btmesh_config_node_identity_status_netkeyindex_rfu = -1;
-static int hf_btmesh_config_node_identity_status_identity = -1;
-static int hf_btmesh_config_sig_model_app_get_elementaddress = -1;
-static int hf_btmesh_config_sig_model_app_get_modelidentifier = -1;
-static int hf_btmesh_config_sig_model_app_list_status = -1;
-static int hf_btmesh_config_sig_model_app_list_elementaddress = -1;
-static int hf_btmesh_config_sig_model_app_list_modelidentifier = -1;
-static int hf_btmesh_config_sig_model_app_list_appkeyindex = -1;
-static int hf_btmesh_config_sig_model_app_list_appkeyindex_rfu = -1;
-static int hf_btmesh_config_vendor_model_app_get_elementaddress = -1;
-static int hf_btmesh_config_vendor_model_app_get_modelidentifier = -1;
-static int hf_btmesh_config_vendor_model_app_list_status = -1;
-static int hf_btmesh_config_vendor_model_app_list_elementaddress = -1;
-static int hf_btmesh_config_vendor_model_app_list_modelidentifier = -1;
-static int hf_btmesh_config_vendor_model_app_list_appkeyindex = -1;
-static int hf_btmesh_config_vendor_model_app_list_appkeyindex_rfu = -1;
-static int hf_btmesh_generic_location_global_status_global_latitude = -1;
-static int hf_btmesh_generic_location_global_status_global_longitude = -1;
-static int hf_btmesh_generic_location_global_status_global_altitude = -1;
-static int hf_btmesh_generic_location_global_set_global_latitude = -1;
-static int hf_btmesh_generic_location_global_set_global_longitude = -1;
-static int hf_btmesh_generic_location_global_set_global_altitude = -1;
-static int hf_btmesh_generic_location_global_set_unacknowledged_global_latitude = -1;
-static int hf_btmesh_generic_location_global_set_unacknowledged_global_longitude = -1;
-static int hf_btmesh_generic_location_global_set_unacknowledged_global_altitude = -1;
-static int hf_btmesh_generic_onoff_set_onoff = -1;
-static int hf_btmesh_generic_onoff_set_tid = -1;
-static int hf_btmesh_generic_onoff_set_transition_time = -1;
-static int hf_btmesh_generic_onoff_set_transition_time_steps = -1;
-static int hf_btmesh_generic_onoff_set_transition_time_resolution = -1;
-static int hf_btmesh_generic_onoff_set_delay = -1;
-static int hf_btmesh_generic_onoff_set_unacknowledged_onoff = -1;
-static int hf_btmesh_generic_onoff_set_unacknowledged_tid = -1;
-static int hf_btmesh_generic_onoff_set_unacknowledged_transition_time = -1;
-static int hf_btmesh_generic_onoff_set_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_generic_onoff_set_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_generic_onoff_set_unacknowledged_delay = -1;
-static int hf_btmesh_generic_onoff_status_present_onoff = -1;
-static int hf_btmesh_generic_onoff_status_target_onoff = -1;
-static int hf_btmesh_generic_onoff_status_remaining_time = -1;
-static int hf_btmesh_generic_onoff_status_remaining_time_steps = -1;
-static int hf_btmesh_generic_onoff_status_remaining_time_resolution = -1;
-static int hf_btmesh_generic_level_set_level = -1;
-static int hf_btmesh_generic_level_set_tid = -1;
-static int hf_btmesh_generic_level_set_transition_time = -1;
-static int hf_btmesh_generic_level_set_transition_time_steps = -1;
-static int hf_btmesh_generic_level_set_transition_time_resolution = -1;
-static int hf_btmesh_generic_level_set_delay = -1;
-static int hf_btmesh_generic_level_set_unacknowledged_level = -1;
-static int hf_btmesh_generic_level_set_unacknowledged_tid = -1;
-static int hf_btmesh_generic_level_set_unacknowledged_transition_time = -1;
-static int hf_btmesh_generic_level_set_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_generic_level_set_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_generic_level_set_unacknowledged_delay = -1;
-static int hf_btmesh_generic_level_status_present_level = -1;
-static int hf_btmesh_generic_level_status_target_level = -1;
-static int hf_btmesh_generic_level_status_remaining_time = -1;
-static int hf_btmesh_generic_level_status_remaining_time_steps = -1;
-static int hf_btmesh_generic_level_status_remaining_time_resolution = -1;
-static int hf_btmesh_generic_delta_set_delta_level = -1;
-static int hf_btmesh_generic_delta_set_tid = -1;
-static int hf_btmesh_generic_delta_set_transition_time = -1;
-static int hf_btmesh_generic_delta_set_transition_time_steps = -1;
-static int hf_btmesh_generic_delta_set_transition_time_resolution = -1;
-static int hf_btmesh_generic_delta_set_delay = -1;
-static int hf_btmesh_generic_delta_set_unacknowledged_delta_level = -1;
-static int hf_btmesh_generic_delta_set_unacknowledged_tid = -1;
-static int hf_btmesh_generic_delta_set_unacknowledged_transition_time = -1;
-static int hf_btmesh_generic_delta_set_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_generic_delta_set_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_generic_delta_set_unacknowledged_delay = -1;
-static int hf_btmesh_generic_move_set_delta_level = -1;
-static int hf_btmesh_generic_move_set_tid = -1;
-static int hf_btmesh_generic_move_set_transition_time = -1;
-static int hf_btmesh_generic_move_set_transition_time_steps = -1;
-static int hf_btmesh_generic_move_set_transition_time_resolution = -1;
-static int hf_btmesh_generic_move_set_delay = -1;
-static int hf_btmesh_generic_move_set_unacknowledged_delta_level = -1;
-static int hf_btmesh_generic_move_set_unacknowledged_tid = -1;
-static int hf_btmesh_generic_move_set_unacknowledged_transition_time = -1;
-static int hf_btmesh_generic_move_set_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_generic_move_set_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_generic_move_set_unacknowledged_delay = -1;
-static int hf_btmesh_generic_default_transition_time_set_transition_time = -1;
-static int hf_btmesh_generic_default_transition_time_set_transition_time_steps = -1;
-static int hf_btmesh_generic_default_transition_time_set_transition_time_resolution = -1;
-static int hf_btmesh_generic_default_transition_time_set_unacknowledged_transition_time = -1;
-static int hf_btmesh_generic_default_transition_time_set_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_generic_default_transition_time_set_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_generic_default_transition_time_status_transition_time = -1;
-static int hf_btmesh_generic_default_transition_time_status_transition_time_steps = -1;
-static int hf_btmesh_generic_default_transition_time_status_transition_time_resolution = -1;
-static int hf_btmesh_generic_onpowerup_status_onpowerup = -1;
-static int hf_btmesh_generic_onpowerup_set_onpowerup = -1;
-static int hf_btmesh_generic_onpowerup_set_unacknowledged_onpowerup = -1;
-static int hf_btmesh_generic_power_level_set_power = -1;
-static int hf_btmesh_generic_power_level_set_tid = -1;
-static int hf_btmesh_generic_power_level_set_transition_time = -1;
-static int hf_btmesh_generic_power_level_set_transition_time_steps = -1;
-static int hf_btmesh_generic_power_level_set_transition_time_resolution = -1;
-static int hf_btmesh_generic_power_level_set_delay = -1;
-static int hf_btmesh_generic_power_level_set_unacknowledged_power = -1;
-static int hf_btmesh_generic_power_level_set_unacknowledged_tid = -1;
-static int hf_btmesh_generic_power_level_set_unacknowledged_transition_time = -1;
-static int hf_btmesh_generic_power_level_set_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_generic_power_level_set_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_generic_power_level_set_unacknowledged_delay = -1;
-static int hf_btmesh_generic_power_level_status_present_power = -1;
-static int hf_btmesh_generic_power_level_status_target_power = -1;
-static int hf_btmesh_generic_power_level_status_remaining_time = -1;
-static int hf_btmesh_generic_power_level_status_remaining_time_steps = -1;
-static int hf_btmesh_generic_power_level_status_remaining_time_resolution = -1;
-static int hf_btmesh_generic_power_last_status_power = -1;
-static int hf_btmesh_generic_power_default_status_power = -1;
-static int hf_btmesh_generic_power_range_status_status_code = -1;
-static int hf_btmesh_generic_power_range_status_range_min = -1;
-static int hf_btmesh_generic_power_range_status_range_max = -1;
-static int hf_btmesh_generic_power_default_set_power = -1;
-static int hf_btmesh_generic_power_default_set_unacknowledged_power = -1;
-static int hf_btmesh_generic_power_range_set_range_min = -1;
-static int hf_btmesh_generic_power_range_set_range_max = -1;
-static int hf_btmesh_generic_power_range_set_unacknowledged_range_min = -1;
-static int hf_btmesh_generic_power_range_set_unacknowledged_range_max = -1;
-static int hf_btmesh_generic_battery_status_battery_level = -1;
-static int hf_btmesh_generic_battery_status_time_to_discharge = -1;
-static int hf_btmesh_generic_battery_status_time_to_charge = -1;
-static int hf_btmesh_generic_battery_status_flags_presence = -1;
-static int hf_btmesh_generic_battery_status_flags_indicator = -1;
-static int hf_btmesh_generic_battery_status_flags_charging = -1;
-static int hf_btmesh_generic_battery_status_flags_serviceability = -1;
-static int hf_btmesh_generic_location_local_status_local_north = -1;
-static int hf_btmesh_generic_location_local_status_local_east = -1;
-static int hf_btmesh_generic_location_local_status_local_altitude = -1;
-static int hf_btmesh_generic_location_local_status_floor_number = -1;
-static int hf_btmesh_generic_location_local_status_uncertainty_stationary = -1;
-static int hf_btmesh_generic_location_local_status_uncertainty_rfu = -1;
-static int hf_btmesh_generic_location_local_status_uncertainty_update_time = -1;
-static int hf_btmesh_generic_location_local_status_uncertainty_precision = -1;
-static int hf_btmesh_generic_location_local_set_local_north = -1;
-static int hf_btmesh_generic_location_local_set_local_east = -1;
-static int hf_btmesh_generic_location_local_set_local_altitude = -1;
-static int hf_btmesh_generic_location_local_set_floor_number = -1;
-static int hf_btmesh_generic_location_local_set_uncertainty_stationary = -1;
-static int hf_btmesh_generic_location_local_set_uncertainty_rfu = -1;
-static int hf_btmesh_generic_location_local_set_uncertainty_update_time = -1;
-static int hf_btmesh_generic_location_local_set_uncertainty_precision = -1;
-static int hf_btmesh_generic_location_local_set_unacknowledged_local_north = -1;
-static int hf_btmesh_generic_location_local_set_unacknowledged_local_east = -1;
-static int hf_btmesh_generic_location_local_set_unacknowledged_local_altitude = -1;
-static int hf_btmesh_generic_location_local_set_unacknowledged_floor_number = -1;
-static int hf_btmesh_generic_location_local_set_unacknowledged_uncertainty_stationary = -1;
-static int hf_btmesh_generic_location_local_set_unacknowledged_uncertainty_rfu = -1;
-static int hf_btmesh_generic_location_local_set_unacknowledged_uncertainty_update_time = -1;
-static int hf_btmesh_generic_location_local_set_unacknowledged_uncertainty_precision = -1;
-static int hf_btmesh_scene_status_status_code = -1;
-static int hf_btmesh_scene_status_current_scene = -1;
-static int hf_btmesh_scene_status_target_scene = -1;
-static int hf_btmesh_scene_status_remaining_time = -1;
-static int hf_btmesh_scene_status_remaining_time_steps = -1;
-static int hf_btmesh_scene_status_remaining_time_resolution = -1;
-static int hf_btmesh_scene_recall_scene_number = -1;
-static int hf_btmesh_scene_recall_tid = -1;
-static int hf_btmesh_scene_recall_transition_time = -1;
-static int hf_btmesh_scene_recall_transition_time_steps = -1;
-static int hf_btmesh_scene_recall_transition_time_resolution = -1;
-static int hf_btmesh_scene_recall_delay = -1;
-static int hf_btmesh_scene_recall_unacknowledged_scene_number = -1;
-static int hf_btmesh_scene_recall_unacknowledged_tid = -1;
-static int hf_btmesh_scene_recall_unacknowledged_transition_time = -1;
-static int hf_btmesh_scene_recall_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_scene_recall_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_scene_recall_unacknowledged_delay = -1;
-static int hf_btmesh_scene_register_status_status_code = -1;
-static int hf_btmesh_scene_register_status_current_scene = -1;
-static int hf_btmesh_scene_register_status_scene = -1;
-static int hf_btmesh_scene_store_scene_number = -1;
-static int hf_btmesh_scene_store_unacknowledged_scene_number = -1;
-static int hf_btmesh_scene_delete_scene_number = -1;
-static int hf_btmesh_scene_delete_unacknowledged_scene_number = -1;
-static int hf_btmesh_time_set_tai_seconds = -1;
-static int hf_btmesh_time_set_subsecond = -1;
-static int hf_btmesh_time_set_uncertainty = -1;
-static int hf_btmesh_time_set_time_authority = -1;
-static int hf_btmesh_time_set_tai_utc_delta = -1;
-static int hf_btmesh_time_set_time_zone_offset = -1;
-static int hf_btmesh_time_status_tai_seconds = -1;
-static int hf_btmesh_time_status_subsecond = -1;
-static int hf_btmesh_time_status_uncertainty = -1;
-static int hf_btmesh_time_status_time_authority = -1;
-static int hf_btmesh_time_status_tai_utc_delta = -1;
-static int hf_btmesh_time_status_time_zone_offset = -1;
-static int hf_btmesh_scheduler_action_status_index = -1;
-static int hf_btmesh_scheduler_action_status_schedule_register_year = -1;
-static int hf_btmesh_scheduler_action_status_schedule_register_month = -1;
-static int hf_btmesh_scheduler_action_status_schedule_register_day = -1;
-static int hf_btmesh_scheduler_action_status_schedule_register_hour = -1;
-static int hf_btmesh_scheduler_action_status_schedule_register_minute = -1;
-static int hf_btmesh_scheduler_action_status_schedule_register_second = -1;
-static int hf_btmesh_scheduler_action_status_schedule_register_day_of_week = -1;
-static int hf_btmesh_scheduler_action_status_schedule_register_action = -1;
-static int hf_btmesh_scheduler_action_status_schedule_register_transition_time = -1;
-static int hf_btmesh_scheduler_action_status_schedule_register_transition_time_steps = -1;
-static int hf_btmesh_scheduler_action_status_schedule_register_transition_time_resolution = -1;
-static int hf_btmesh_scheduler_action_status_schedule_register_scene_number = -1;
-static int hf_btmesh_scheduler_schedule_register_month_january = -1;
-static int hf_btmesh_scheduler_schedule_register_month_february = -1;
-static int hf_btmesh_scheduler_schedule_register_month_march = -1;
-static int hf_btmesh_scheduler_schedule_register_month_april = -1;
-static int hf_btmesh_scheduler_schedule_register_month_may = -1;
-static int hf_btmesh_scheduler_schedule_register_month_june = -1;
-static int hf_btmesh_scheduler_schedule_register_month_july = -1;
-static int hf_btmesh_scheduler_schedule_register_month_august = -1;
-static int hf_btmesh_scheduler_schedule_register_month_september = -1;
-static int hf_btmesh_scheduler_schedule_register_month_october = -1;
-static int hf_btmesh_scheduler_schedule_register_month_november = -1;
-static int hf_btmesh_scheduler_schedule_register_month_december = -1;
-static int hf_btmesh_scheduler_schedule_register_day_of_week_monday = -1;
-static int hf_btmesh_scheduler_schedule_register_day_of_week_tuesday = -1;
-static int hf_btmesh_scheduler_schedule_register_day_of_week_wednesday = -1;
-static int hf_btmesh_scheduler_schedule_register_day_of_week_thursday = -1;
-static int hf_btmesh_scheduler_schedule_register_day_of_week_friday = -1;
-static int hf_btmesh_scheduler_schedule_register_day_of_week_saturday = -1;
-static int hf_btmesh_scheduler_schedule_register_day_of_week_sunday = -1;
-static int hf_btmesh_scheduler_action_set_index = -1;
-static int hf_btmesh_scheduler_action_set_schedule_register_year = -1;
-static int hf_btmesh_scheduler_action_set_schedule_register_month = -1;
-static int hf_btmesh_scheduler_action_set_schedule_register_day = -1;
-static int hf_btmesh_scheduler_action_set_schedule_register_hour = -1;
-static int hf_btmesh_scheduler_action_set_schedule_register_minute = -1;
-static int hf_btmesh_scheduler_action_set_schedule_register_second = -1;
-static int hf_btmesh_scheduler_action_set_schedule_register_day_of_week = -1;
-static int hf_btmesh_scheduler_action_set_schedule_register_action = -1;
-static int hf_btmesh_scheduler_action_set_schedule_register_transition_time = -1;
-static int hf_btmesh_scheduler_action_set_schedule_register_transition_time_steps = -1;
-static int hf_btmesh_scheduler_action_set_schedule_register_transition_time_resolution = -1;
-static int hf_btmesh_scheduler_action_set_schedule_register_scene_number = -1;
-static int hf_btmesh_scheduler_action_set_unacknowledged_index = -1;
-static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_year = -1;
-static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_month = -1;
-static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_day = -1;
-static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_hour = -1;
-static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_minute = -1;
-static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_second = -1;
-static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_day_of_week = -1;
-static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_action = -1;
-static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_transition_time = -1;
-static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_transition_time_steps = -1;
-static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_transition_time_resolution = -1;
-static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_scene_number = -1;
-static int hf_btmesh_time_role_set_time_role = -1;
-static int hf_btmesh_time_role_status_time_role = -1;
-static int hf_btmesh_time_zone_set_time_zone_offset_new = -1;
-static int hf_btmesh_time_zone_set_tai_of_zone_change = -1;
-static int hf_btmesh_time_zone_status_time_zone_offset_current = -1;
-static int hf_btmesh_time_zone_status_time_zone_offset_new = -1;
-static int hf_btmesh_time_zone_status_tai_of_zone_change = -1;
-static int hf_btmesh_tai_utc_delta_set_tai_utc_delta_new = -1;
-static int hf_btmesh_tai_utc_delta_set_padding = -1;
-static int hf_btmesh_tai_utc_delta_set_tai_of_delta_change = -1;
-static int hf_btmesh_tai_utc_delta_status_tai_utc_delta_current = -1;
-static int hf_btmesh_tai_utc_delta_status_padding_1 = -1;
-static int hf_btmesh_tai_utc_delta_status_tai_utc_delta_new = -1;
-static int hf_btmesh_tai_utc_delta_status_padding_2 = -1;
-static int hf_btmesh_tai_utc_delta_status_tai_of_delta_change = -1;
-static int hf_btmesh_scheduler_action_get_index = -1;
-static int hf_btmesh_scheduler_status_schedules = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_0 = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_1 = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_2 = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_3 = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_4 = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_5 = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_6 = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_7 = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_8 = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_9 = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_10 = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_11 = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_12 = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_13 = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_14 = -1;
-static int hf_btmesh_scheduler_status_schedules_schedule_15 = -1;
-
-static int hf_btmesh_light_lc_property_set_light_lc_property_id = -1;
-static int hf_btmesh_light_lc_property_set_light_lc_property_value = -1;
-static int hf_btmesh_light_lc_property_set_unacknowledged_light_lc_property_id = -1;
-static int hf_btmesh_light_lc_property_set_unacknowledged_light_lc_property_value = -1;
-static int hf_btmesh_light_lc_property_status_light_lc_property_id = -1;
-static int hf_btmesh_light_lc_property_status_light_lc_property_value = -1;
-static int hf_btmesh_light_lightness_set_lightness = -1;
-static int hf_btmesh_light_lightness_set_tid = -1;
-static int hf_btmesh_light_lightness_set_transition_time = -1;
-static int hf_btmesh_light_lightness_set_transition_time_steps = -1;
-static int hf_btmesh_light_lightness_set_transition_time_resolution = -1;
-static int hf_btmesh_light_lightness_set_delay = -1;
-static int hf_btmesh_light_lightness_set_unacknowledged_lightness = -1;
-static int hf_btmesh_light_lightness_set_unacknowledged_tid = -1;
-static int hf_btmesh_light_lightness_set_unacknowledged_transition_time = -1;
-static int hf_btmesh_light_lightness_set_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_light_lightness_set_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_light_lightness_set_unacknowledged_delay = -1;
-static int hf_btmesh_light_lightness_status_present_lightness = -1;
-static int hf_btmesh_light_lightness_status_target_lightness = -1;
-static int hf_btmesh_light_lightness_status_remaining_time = -1;
-static int hf_btmesh_light_lightness_status_remaining_time_steps = -1;
-static int hf_btmesh_light_lightness_status_remaining_time_resolution = -1;
-static int hf_btmesh_light_lightness_linear_set_lightness = -1;
-static int hf_btmesh_light_lightness_linear_set_tid = -1;
-static int hf_btmesh_light_lightness_linear_set_transition_time = -1;
-static int hf_btmesh_light_lightness_linear_set_transition_time_steps = -1;
-static int hf_btmesh_light_lightness_linear_set_transition_time_resolution = -1;
-static int hf_btmesh_light_lightness_linear_set_delay = -1;
-static int hf_btmesh_light_lightness_linear_set_unacknowledged_lightness = -1;
-static int hf_btmesh_light_lightness_linear_set_unacknowledged_tid = -1;
-static int hf_btmesh_light_lightness_linear_set_unacknowledged_transition_time = -1;
-static int hf_btmesh_light_lightness_linear_set_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_light_lightness_linear_set_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_light_lightness_linear_set_unacknowledged_delay = -1;
-static int hf_btmesh_light_lightness_linear_status_present_lightness = -1;
-static int hf_btmesh_light_lightness_linear_status_target_lightness = -1;
-static int hf_btmesh_light_lightness_linear_status_remaining_time = -1;
-static int hf_btmesh_light_lightness_linear_status_remaining_time_steps = -1;
-static int hf_btmesh_light_lightness_linear_status_remaining_time_resolution = -1;
-static int hf_btmesh_light_lightness_last_status_lightness = -1;
-static int hf_btmesh_light_lightness_default_status_lightness = -1;
-static int hf_btmesh_light_lightness_range_status_status_code = -1;
-static int hf_btmesh_light_lightness_range_status_range_min = -1;
-static int hf_btmesh_light_lightness_range_status_range_max = -1;
-static int hf_btmesh_light_lightness_default_set_lightness = -1;
-static int hf_btmesh_light_lightness_default_set_unacknowledged_lightness = -1;
-static int hf_btmesh_light_lightness_range_set_range_min = -1;
-static int hf_btmesh_light_lightness_range_set_range_max = -1;
-static int hf_btmesh_light_lightness_range_set_unacknowledged_range_min = -1;
-static int hf_btmesh_light_lightness_range_set_unacknowledged_range_max = -1;
-static int hf_btmesh_light_ctl_set_ctl_lightness = -1;
-static int hf_btmesh_light_ctl_set_ctl_temperature = -1;
-static int hf_btmesh_light_ctl_set_ctl_delta_uv = -1;
-static int hf_btmesh_light_ctl_set_tid = -1;
-static int hf_btmesh_light_ctl_set_transition_time = -1;
-static int hf_btmesh_light_ctl_set_transition_time_steps = -1;
-static int hf_btmesh_light_ctl_set_transition_time_resolution = -1;
-static int hf_btmesh_light_ctl_set_delay = -1;
-static int hf_btmesh_light_ctl_set_unacknowledged_ctl_lightness = -1;
-static int hf_btmesh_light_ctl_set_unacknowledged_ctl_temperature = -1;
-static int hf_btmesh_light_ctl_set_unacknowledged_ctl_delta_uv = -1;
-static int hf_btmesh_light_ctl_set_unacknowledged_tid = -1;
-static int hf_btmesh_light_ctl_set_unacknowledged_transition_time = -1;
-static int hf_btmesh_light_ctl_set_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_light_ctl_set_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_light_ctl_set_unacknowledged_delay = -1;
-static int hf_btmesh_light_ctl_status_present_ctl_lightness = -1;
-static int hf_btmesh_light_ctl_status_present_ctl_temperature = -1;
-static int hf_btmesh_light_ctl_status_target_ctl_lightness = -1;
-static int hf_btmesh_light_ctl_status_target_ctl_temperature = -1;
-static int hf_btmesh_light_ctl_status_remaining_time = -1;
-static int hf_btmesh_light_ctl_status_remaining_time_steps = -1;
-static int hf_btmesh_light_ctl_status_remaining_time_resolution = -1;
-static int hf_btmesh_light_ctl_temperature_range_status_status_code = -1;
-static int hf_btmesh_light_ctl_temperature_range_status_range_min = -1;
-static int hf_btmesh_light_ctl_temperature_range_status_range_max = -1;
-static int hf_btmesh_light_ctl_temperature_set_ctl_temperature = -1;
-static int hf_btmesh_light_ctl_temperature_set_ctl_delta_uv = -1;
-static int hf_btmesh_light_ctl_temperature_set_tid = -1;
-static int hf_btmesh_light_ctl_temperature_set_transition_time = -1;
-static int hf_btmesh_light_ctl_temperature_set_transition_time_steps = -1;
-static int hf_btmesh_light_ctl_temperature_set_transition_time_resolution = -1;
-static int hf_btmesh_light_ctl_temperature_set_delay = -1;
-static int hf_btmesh_light_ctl_temperature_set_unacknowledged_ctl_temperature = -1;
-static int hf_btmesh_light_ctl_temperature_set_unacknowledged_ctl_delta_uv = -1;
-static int hf_btmesh_light_ctl_temperature_set_unacknowledged_tid = -1;
-static int hf_btmesh_light_ctl_temperature_set_unacknowledged_transition_time = -1;
-static int hf_btmesh_light_ctl_temperature_set_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_light_ctl_temperature_set_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_light_ctl_temperature_set_unacknowledged_delay = -1;
-static int hf_btmesh_light_ctl_temperature_status_present_ctl_temperature = -1;
-static int hf_btmesh_light_ctl_temperature_status_present_ctl_delta_uv = -1;
-static int hf_btmesh_light_ctl_temperature_status_target_ctl_temperature = -1;
-static int hf_btmesh_light_ctl_temperature_status_target_ctl_delta_uv = -1;
-static int hf_btmesh_light_ctl_temperature_status_remaining_time = -1;
-static int hf_btmesh_light_ctl_temperature_status_remaining_time_steps = -1;
-static int hf_btmesh_light_ctl_temperature_status_remaining_time_resolution = -1;
-static int hf_btmesh_light_ctl_default_status_lightness = -1;
-static int hf_btmesh_light_ctl_default_status_temperature = -1;
-static int hf_btmesh_light_ctl_default_status_delta_uv = -1;
-static int hf_btmesh_light_ctl_default_set_lightness = -1;
-static int hf_btmesh_light_ctl_default_set_temperature = -1;
-static int hf_btmesh_light_ctl_default_set_delta_uv = -1;
-static int hf_btmesh_light_ctl_default_set_unacknowledged_lightness = -1;
-static int hf_btmesh_light_ctl_default_set_unacknowledged_temperature = -1;
-static int hf_btmesh_light_ctl_default_set_unacknowledged_delta_uv = -1;
-static int hf_btmesh_light_ctl_temperature_range_set_range_min = -1;
-static int hf_btmesh_light_ctl_temperature_range_set_range_max = -1;
-static int hf_btmesh_light_ctl_temperature_range_set_unacknowledged_range_min = -1;
-static int hf_btmesh_light_ctl_temperature_range_set_unacknowledged_range_max = -1;
-static int hf_btmesh_light_hsl_hue_set_hue = -1;
-static int hf_btmesh_light_hsl_hue_set_tid = -1;
-static int hf_btmesh_light_hsl_hue_set_transition_time = -1;
-static int hf_btmesh_light_hsl_hue_set_transition_time_steps = -1;
-static int hf_btmesh_light_hsl_hue_set_transition_time_resolution = -1;
-static int hf_btmesh_light_hsl_hue_set_delay = -1;
-static int hf_btmesh_light_hsl_hue_set_unacknowledged_hue = -1;
-static int hf_btmesh_light_hsl_hue_set_unacknowledged_tid = -1;
-static int hf_btmesh_light_hsl_hue_set_unacknowledged_transition_time = -1;
-static int hf_btmesh_light_hsl_hue_set_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_light_hsl_hue_set_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_light_hsl_hue_set_unacknowledged_delay = -1;
-static int hf_btmesh_light_hsl_hue_status_present_hue = -1;
-static int hf_btmesh_light_hsl_hue_status_target_hue = -1;
-static int hf_btmesh_light_hsl_hue_status_remaining_time = -1;
-static int hf_btmesh_light_hsl_hue_status_remaining_time_steps = -1;
-static int hf_btmesh_light_hsl_hue_status_remaining_time_resolution = -1;
-static int hf_btmesh_light_hsl_saturation_set_saturation = -1;
-static int hf_btmesh_light_hsl_saturation_set_tid = -1;
-static int hf_btmesh_light_hsl_saturation_set_transition_time = -1;
-static int hf_btmesh_light_hsl_saturation_set_transition_time_steps = -1;
-static int hf_btmesh_light_hsl_saturation_set_transition_time_resolution = -1;
-static int hf_btmesh_light_hsl_saturation_set_delay = -1;
-static int hf_btmesh_light_hsl_saturation_set_unacknowledged_saturation = -1;
-static int hf_btmesh_light_hsl_saturation_set_unacknowledged_tid = -1;
-static int hf_btmesh_light_hsl_saturation_set_unacknowledged_transition_time = -1;
-static int hf_btmesh_light_hsl_saturation_set_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_light_hsl_saturation_set_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_light_hsl_saturation_set_unacknowledged_delay = -1;
-static int hf_btmesh_light_hsl_saturation_status_present_saturation = -1;
-static int hf_btmesh_light_hsl_saturation_status_target_saturation = -1;
-static int hf_btmesh_light_hsl_saturation_status_remaining_time = -1;
-static int hf_btmesh_light_hsl_saturation_status_remaining_time_steps = -1;
-static int hf_btmesh_light_hsl_saturation_status_remaining_time_resolution = -1;
-static int hf_btmesh_light_hsl_set_hsl_lightness = -1;
-static int hf_btmesh_light_hsl_set_hsl_hue = -1;
-static int hf_btmesh_light_hsl_set_hsl_saturation = -1;
-static int hf_btmesh_light_hsl_set_tid = -1;
-static int hf_btmesh_light_hsl_set_transition_time = -1;
-static int hf_btmesh_light_hsl_set_transition_time_steps = -1;
-static int hf_btmesh_light_hsl_set_transition_time_resolution = -1;
-static int hf_btmesh_light_hsl_set_delay = -1;
-static int hf_btmesh_light_hsl_set_unacknowledged_hsl_lightness = -1;
-static int hf_btmesh_light_hsl_set_unacknowledged_hsl_hue = -1;
-static int hf_btmesh_light_hsl_set_unacknowledged_hsl_saturation = -1;
-static int hf_btmesh_light_hsl_set_unacknowledged_tid = -1;
-static int hf_btmesh_light_hsl_set_unacknowledged_transition_time = -1;
-static int hf_btmesh_light_hsl_set_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_light_hsl_set_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_light_hsl_set_unacknowledged_delay = -1;
-static int hf_btmesh_light_hsl_status_hsl_lightness = -1;
-static int hf_btmesh_light_hsl_status_hsl_hue = -1;
-static int hf_btmesh_light_hsl_status_hsl_saturation = -1;
-static int hf_btmesh_light_hsl_status_remaining_time = -1;
-static int hf_btmesh_light_hsl_status_remaining_time_steps = -1;
-static int hf_btmesh_light_hsl_status_remaining_time_resolution = -1;
-static int hf_btmesh_light_hsl_target_status_hsl_lightness_target = -1;
-static int hf_btmesh_light_hsl_target_status_hsl_hue_target = -1;
-static int hf_btmesh_light_hsl_target_status_hsl_saturation_target = -1;
-static int hf_btmesh_light_hsl_target_status_remaining_time = -1;
-static int hf_btmesh_light_hsl_target_status_remaining_time_steps = -1;
-static int hf_btmesh_light_hsl_target_status_remaining_time_resolution = -1;
-static int hf_btmesh_light_hsl_default_status_lightness = -1;
-static int hf_btmesh_light_hsl_default_status_hue = -1;
-static int hf_btmesh_light_hsl_default_status_saturation = -1;
-static int hf_btmesh_light_hsl_range_status_status_code = -1;
-static int hf_btmesh_light_hsl_range_status_hue_range_min = -1;
-static int hf_btmesh_light_hsl_range_status_hue_range_max = -1;
-static int hf_btmesh_light_hsl_range_status_saturation_range_min = -1;
-static int hf_btmesh_light_hsl_range_status_saturation_range_max = -1;
-static int hf_btmesh_light_hsl_default_set_lightness = -1;
-static int hf_btmesh_light_hsl_default_set_hue = -1;
-static int hf_btmesh_light_hsl_default_set_saturation = -1;
-static int hf_btmesh_light_hsl_default_set_unacknowledged_lightness = -1;
-static int hf_btmesh_light_hsl_default_set_unacknowledged_hue = -1;
-static int hf_btmesh_light_hsl_default_set_unacknowledged_saturation = -1;
-static int hf_btmesh_light_hsl_range_set_hue_range_min = -1;
-static int hf_btmesh_light_hsl_range_set_hue_range_max = -1;
-static int hf_btmesh_light_hsl_range_set_saturation_range_min = -1;
-static int hf_btmesh_light_hsl_range_set_saturation_range_max = -1;
-static int hf_btmesh_light_hsl_range_set_unacknowledged_hue_range_min = -1;
-static int hf_btmesh_light_hsl_range_set_unacknowledged_hue_range_max = -1;
-static int hf_btmesh_light_hsl_range_set_unacknowledged_saturation_range_min = -1;
-static int hf_btmesh_light_hsl_range_set_unacknowledged_saturation_range_max = -1;
-static int hf_btmesh_light_xyl_set_xyl_lightness = -1;
-static int hf_btmesh_light_xyl_set_xyl_x = -1;
-static int hf_btmesh_light_xyl_set_xyl_y = -1;
-static int hf_btmesh_light_xyl_set_tid = -1;
-static int hf_btmesh_light_xyl_set_transition_time = -1;
-static int hf_btmesh_light_xyl_set_transition_time_steps = -1;
-static int hf_btmesh_light_xyl_set_transition_time_resolution = -1;
-static int hf_btmesh_light_xyl_set_delay = -1;
-static int hf_btmesh_light_xyl_set_unacknowledged_xyl_lightness = -1;
-static int hf_btmesh_light_xyl_set_unacknowledged_xyl_x = -1;
-static int hf_btmesh_light_xyl_set_unacknowledged_xyl_y = -1;
-static int hf_btmesh_light_xyl_set_unacknowledged_tid = -1;
-static int hf_btmesh_light_xyl_set_unacknowledged_transition_time = -1;
-static int hf_btmesh_light_xyl_set_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_light_xyl_set_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_light_xyl_set_unacknowledged_delay = -1;
-static int hf_btmesh_light_xyl_status_xyl_lightness = -1;
-static int hf_btmesh_light_xyl_status_xyl_x = -1;
-static int hf_btmesh_light_xyl_status_xyl_y = -1;
-static int hf_btmesh_light_xyl_status_remaining_time = -1;
-static int hf_btmesh_light_xyl_status_remaining_time_steps = -1;
-static int hf_btmesh_light_xyl_status_remaining_time_resolution = -1;
-static int hf_btmesh_light_xyl_target_status_target_xyl_lightness = -1;
-static int hf_btmesh_light_xyl_target_status_target_xyl_x = -1;
-static int hf_btmesh_light_xyl_target_status_target_xyl_y = -1;
-static int hf_btmesh_light_xyl_target_status_remaining_time = -1;
-static int hf_btmesh_light_xyl_target_status_remaining_time_steps = -1;
-static int hf_btmesh_light_xyl_target_status_remaining_time_resolution = -1;
-static int hf_btmesh_light_xyl_default_status_lightness = -1;
-static int hf_btmesh_light_xyl_default_status_xyl_x = -1;
-static int hf_btmesh_light_xyl_default_status_xyl_y = -1;
-static int hf_btmesh_light_xyl_range_status_status_code = -1;
-static int hf_btmesh_light_xyl_range_status_xyl_x_range_min = -1;
-static int hf_btmesh_light_xyl_range_status_xyl_x_range_max = -1;
-static int hf_btmesh_light_xyl_range_status_xyl_y_range_min = -1;
-static int hf_btmesh_light_xyl_range_status_xyl_y_range_max = -1;
-static int hf_btmesh_light_xyl_default_set_lightness = -1;
-static int hf_btmesh_light_xyl_default_set_xyl_x = -1;
-static int hf_btmesh_light_xyl_default_set_xyl_y = -1;
-static int hf_btmesh_light_xyl_default_set_unacknowledged_lightness = -1;
-static int hf_btmesh_light_xyl_default_set_unacknowledged_xyl_x = -1;
-static int hf_btmesh_light_xyl_default_set_unacknowledged_xyl_y = -1;
-static int hf_btmesh_light_xyl_range_set_xyl_x_range_min = -1;
-static int hf_btmesh_light_xyl_range_set_xyl_x_range_max = -1;
-static int hf_btmesh_light_xyl_range_set_xyl_y_range_min = -1;
-static int hf_btmesh_light_xyl_range_set_xyl_y_range_max = -1;
-static int hf_btmesh_light_xyl_range_set_unacknowledged_xyl_x_range_min = -1;
-static int hf_btmesh_light_xyl_range_set_unacknowledged_xyl_x_range_max = -1;
-static int hf_btmesh_light_xyl_range_set_unacknowledged_xyl_y_range_min = -1;
-static int hf_btmesh_light_xyl_range_set_unacknowledged_xyl_y_range_max = -1;
-static int hf_btmesh_light_lc_mode_set_mode = -1;
-static int hf_btmesh_light_lc_mode_set_unacknowledged_mode = -1;
-static int hf_btmesh_light_lc_mode_status_mode = -1;
-static int hf_btmesh_light_lc_om_set_mode = -1;
-static int hf_btmesh_light_lc_om_set_unacknowledged_mode = -1;
-static int hf_btmesh_light_lc_om_status_mode = -1;
-static int hf_btmesh_light_lc_light_onoff_set_light_onoff = -1;
-static int hf_btmesh_light_lc_light_onoff_set_tid = -1;
-static int hf_btmesh_light_lc_light_onoff_set_transition_time = -1;
-static int hf_btmesh_light_lc_light_onoff_set_transition_time_steps = -1;
-static int hf_btmesh_light_lc_light_onoff_set_transition_time_resolution = -1;
-static int hf_btmesh_light_lc_light_onoff_set_delay = -1;
-static int hf_btmesh_light_lc_light_onoff_set_unacknowledged_light_onoff = -1;
-static int hf_btmesh_light_lc_light_onoff_set_unacknowledged_tid = -1;
-static int hf_btmesh_light_lc_light_onoff_set_unacknowledged_transition_time = -1;
-static int hf_btmesh_light_lc_light_onoff_set_unacknowledged_transition_time_steps = -1;
-static int hf_btmesh_light_lc_light_onoff_set_unacknowledged_transition_time_resolution = -1;
-static int hf_btmesh_light_lc_light_onoff_set_unacknowledged_delay = -1;
-static int hf_btmesh_light_lc_light_onoff_status_present_light_onoff = -1;
-static int hf_btmesh_light_lc_light_onoff_status_target_light_onoff = -1;
-static int hf_btmesh_light_lc_light_onoff_status_remaining_time = -1;
-static int hf_btmesh_light_lc_light_onoff_status_remaining_time_steps = -1;
-static int hf_btmesh_light_lc_light_onoff_status_remaining_time_resolution = -1;
-static int hf_btmesh_light_lc_property_get_light_lc_property_id = -1;
-
-static int hf_btmesh_generic_manufacturer_properties_status_manufacturer_property_id = -1;
-static int hf_btmesh_generic_manufacturer_property_set_manufacturer_property_id = -1;
-static int hf_btmesh_generic_manufacturer_property_set_manufacturer_user_access = -1;
-static int hf_btmesh_generic_manufacturer_property_set_unacknowledged_manufacturer_property_id = -1;
-static int hf_btmesh_generic_manufacturer_property_set_unacknowledged_manufacturer_user_access = -1;
-static int hf_btmesh_generic_manufacturer_property_status_manufacturer_property_id = -1;
-static int hf_btmesh_generic_manufacturer_property_status_manufacturer_user_access = -1;
-static int hf_btmesh_generic_manufacturer_property_status_manufacturer_property_value = -1;
-static int hf_btmesh_generic_admin_properties_status_admin_property_id = -1;
-static int hf_btmesh_generic_admin_property_set_admin_property_id = -1;
-static int hf_btmesh_generic_admin_property_set_admin_user_access = -1;
-static int hf_btmesh_generic_admin_property_set_admin_property_value = -1;
-static int hf_btmesh_generic_admin_property_set_unacknowledged_admin_property_id = -1;
-static int hf_btmesh_generic_admin_property_set_unacknowledged_admin_user_access = -1;
-static int hf_btmesh_generic_admin_property_set_unacknowledged_admin_property_value = -1;
-static int hf_btmesh_generic_admin_property_status_admin_property_id = -1;
-static int hf_btmesh_generic_admin_property_status_admin_user_access = -1;
-static int hf_btmesh_generic_admin_property_status_admin_property_value = -1;
-static int hf_btmesh_generic_user_properties_status_user_property_id = -1;
-static int hf_btmesh_generic_user_property_set_user_property_id = -1;
-static int hf_btmesh_generic_user_property_set_user_property_value = -1;
-static int hf_btmesh_generic_user_property_set_unacknowledged_user_property_id = -1;
-static int hf_btmesh_generic_user_property_set_unacknowledged_user_property_value = -1;
-static int hf_btmesh_generic_user_property_status_user_property_id = -1;
-static int hf_btmesh_generic_user_property_status_user_access = -1;
-static int hf_btmesh_generic_user_property_status_user_property_value = -1;
-static int hf_btmesh_generic_client_properties_get_client_property_id = -1;
-static int hf_btmesh_generic_client_properties_status_client_property_id = -1;
-static int hf_btmesh_sensor_descriptor_get_property_id = -1;
-static int hf_btmesh_sensor_descriptor_status_descriptor_sensor_property_id = -1;
-static int hf_btmesh_sensor_descriptor_status_descriptor_sensor_positive_tolerance = -1;
-static int hf_btmesh_sensor_descriptor_status_descriptor_sensor_negative_tolerance = -1;
-static int hf_btmesh_sensor_descriptor_status_descriptor_sensor_sampling_function = -1;
-static int hf_btmesh_sensor_descriptor_status_descriptor_sensor_measurement_period = -1;
-static int hf_btmesh_sensor_descriptor_status_descriptor_sensor_update_interval = -1;
-static int hf_btmesh_sensor_status_mpid_format = -1;
-static int hf_btmesh_sensor_status_mpid_format_a_length = -1;
-static int hf_btmesh_sensor_status_mpid_format_a_property_id = -1;
-static int hf_btmesh_sensor_status_mpid_format_b_length = -1;
-static int hf_btmesh_sensor_status_mpid_format_b_property_id = -1;
-static int hf_btmesh_sensor_status_raw_value = -1;
-static int hf_btmesh_sensor_column_status_property_id = -1;
-static int hf_btmesh_sensor_column_status_raw_value_a = -1;
-static int hf_btmesh_sensor_column_status_raw_value_b = -1;
-static int hf_btmesh_sensor_column_status_raw_value_c = -1;
-static int hf_btmesh_sensor_series_status_property_id = -1;
-static int hf_btmesh_sensor_series_status_raw_value_a = -1;
-static int hf_btmesh_sensor_series_status_raw_value_b = -1;
-static int hf_btmesh_sensor_series_status_raw_value_c = -1;
-static int hf_btmesh_sensor_cadence_set_property_id = -1;
-static int hf_btmesh_sensor_cadence_set_fast_cadence_period_divisor = -1;
-static int hf_btmesh_sensor_cadence_set_status_trigger_type = -1;
-static int hf_btmesh_sensor_cadence_set_status_trigger_delta_down = -1;
-static int hf_btmesh_sensor_cadence_set_status_trigger_delta_up = -1;
-static int hf_btmesh_sensor_cadence_set_status_min_interval = -1;
-static int hf_btmesh_sensor_cadence_set_fast_cadence_low = -1;
-static int hf_btmesh_sensor_cadence_set_fast_cadence_high = -1;
-static int hf_btmesh_sensor_cadence_set_remainder_not_dissected = -1;
-static int hf_btmesh_sensor_cadence_set_unacknowledged_property_id = -1;
-static int hf_btmesh_sensor_cadence_set_unacknowledged_fast_cadence_period_divisor = -1;
-static int hf_btmesh_sensor_cadence_set_unacknowledged_status_trigger_type = -1;
-static int hf_btmesh_sensor_cadence_set_unacknowledged_status_trigger_delta_down = -1;
-static int hf_btmesh_sensor_cadence_set_unacknowledged_status_trigger_delta_up = -1;
-static int hf_btmesh_sensor_cadence_set_unacknowledged_status_min_interval = -1;
-static int hf_btmesh_sensor_cadence_set_unacknowledged_fast_cadence_low = -1;
-static int hf_btmesh_sensor_cadence_set_unacknowledged_fast_cadence_high = -1;
-static int hf_btmesh_sensor_cadence_set_unacknowledged_remainder_not_dissected = -1;
-static int hf_btmesh_sensor_cadence_status_property_id = -1;
-static int hf_btmesh_sensor_cadence_status_fast_cadence_period_divisor = -1;
-static int hf_btmesh_sensor_cadence_status_status_trigger_type = -1;
-static int hf_btmesh_sensor_cadence_status_status_trigger_delta_down = -1;
-static int hf_btmesh_sensor_cadence_status_status_trigger_delta_up = -1;
-static int hf_btmesh_sensor_cadence_status_status_min_interval = -1;
-static int hf_btmesh_sensor_cadence_status_fast_cadence_low = -1;
-static int hf_btmesh_sensor_cadence_status_fast_cadence_high = -1;
-static int hf_btmesh_sensor_cadence_status_remainder_not_dissected = -1;
-static int hf_btmesh_sensor_settings_status_sensor_property_id = -1;
-static int hf_btmesh_sensor_settings_status_sensor_setting_property_id = -1;
-static int hf_btmesh_sensor_setting_set_sensor_property_id = -1;
-static int hf_btmesh_sensor_setting_set_sensor_setting_property_id = -1;
-static int hf_btmesh_sensor_setting_set_sensor_setting_raw = -1;
-static int hf_btmesh_sensor_setting_set_unacknowledged_sensor_property_id = -1;
-static int hf_btmesh_sensor_setting_set_unacknowledged_sensor_setting_property_id = -1;
-static int hf_btmesh_sensor_setting_set_unacknowledged_sensor_setting_raw = -1;
-static int hf_btmesh_sensor_setting_status_sensor_property_id = -1;
-static int hf_btmesh_sensor_setting_status_sensor_setting_property_id = -1;
-static int hf_btmesh_sensor_setting_status_sensor_setting_access = -1;
-static int hf_btmesh_sensor_setting_status_sensor_setting_raw = -1;
-static int hf_btmesh_generic_manufacturer_property_get_manufacturer_property_id = -1;
-static int hf_btmesh_generic_admin_property_get_admin_property_id = -1;
-static int hf_btmesh_generic_user_property_get_user_property_id = -1;
-
-static int hf_btmesh_sensor_get_property_id = -1;
-static int hf_btmesh_sensor_column_get_property_id = -1;
-static int hf_btmesh_sensor_column_get_raw_value_a = -1;
-static int hf_btmesh_sensor_series_get_property_id = -1;
-static int hf_btmesh_sensor_series_get_raw_value_a1 = -1;
-static int hf_btmesh_sensor_series_get_raw_value_a2 = -1;
-static int hf_btmesh_sensor_cadence_get_property_id = -1;
-static int hf_btmesh_sensor_settings_get_sensor_property_id = -1;
-static int hf_btmesh_sensor_setting_get_sensor_property_id = -1;
-static int hf_btmesh_sensor_setting_get_sensor_setting_property_id = -1;
-
-static int hf_bt_phony_characteristic_percentage_change_16 = -1;
-static int hf_bt_phony_characteristic_index = -1;
-static int hf_bt_characteristic_time_decihour_8 = -1;
-static int hf_bt_characteristic_temperature_8 = -1;
-static int hf_bt_characteristic_temperature = -1;
-static int hf_bt_characteristic_electric_current = -1;
-static int hf_bt_characteristic_energy = -1;
-static int hf_bt_characteristic_generic_level = -1;
-static int hf_bt_characteristic_boolean = -1;
-static int hf_bt_characteristic_coefficient = -1;
-static int hf_bt_characteristic_count_16 = -1;
-static int hf_bt_characteristic_illuminance = -1;
-static int hf_bt_characteristic_perceived_lightness = -1;
-static int hf_bt_characteristic_percentage_8 = -1;
-static int hf_bt_characteristic_time_millisecond_24 = -1;
-static int hf_bt_characteristic_time_second_16 = -1;
+static int hf_btmesh_ivi;
+static int hf_btmesh_nid;
+static int hf_btmesh_obfuscated;
+static int hf_btmesh_encrypted;
+static int hf_btmesh_netmic;
+
+static int hf_btmesh_ctl;
+static int hf_btmesh_ttl;
+static int hf_btmesh_seq;
+static int hf_btmesh_src;
+static int hf_btmesh_dst;
+
+static int hf_btmesh_transp_pdu;
+static int hf_btmesh_cntr_seg;
+static int hf_btmesh_acc_seg;
+static int hf_btmesh_cntr_opcode;
+static int hf_btmesh_acc_akf;
+static int hf_btmesh_acc_aid;
+static int hf_btmesh_obo;
+static int hf_btmesh_seqzero;
+static int hf_btmesh_rfu;
+static int hf_btmesh_blockack;
+static int hf_btmesh_cntr_criteria_rfu;
+static int hf_btmesh_cntr_padding;
+static int hf_btmesh_cntr_fsn;
+
+static int hf_btmesh_cntr_key_refresh_flag;
+static int hf_btmesh_cntr_iv_update_flag;
+static int hf_btmesh_cntr_flags_rfu;
+static int hf_btmesh_cntr_iv_index;
+static int hf_btmesh_cntr_md;
+
+static int hf_btmesh_cntr_heartbeat_rfu;
+static int hf_btmesh_cntr_init_ttl;
+static int hf_btmesh_cntr_feature_relay;
+static int hf_btmesh_cntr_feature_proxy;
+static int hf_btmesh_cntr_feature_friend;
+static int hf_btmesh_cntr_feature_low_power;
+static int hf_btmesh_cntr_feature_rfu;
+
+static int hf_btmesh_cntr_criteria_rssifactor;
+static int hf_btmesh_cntr_criteria_receivewindowfactor;
+static int hf_btmesh_cntr_criteria_minqueuesizelog;
+static int hf_btmesh_cntr_receivedelay;
+static int hf_btmesh_cntr_polltimeout;
+static int hf_btmesh_cntr_previousaddress;
+static int hf_btmesh_cntr_numelements;
+static int hf_btmesh_cntr_lpncounter;
+static int hf_btmesh_cntr_receivewindow;
+static int hf_btmesh_cntr_queuesize;
+static int hf_btmesh_cntr_subscriptionlistsize;
+static int hf_btmesh_cntr_rssi;
+static int hf_btmesh_cntr_friendcounter;
+static int hf_btmesh_cntr_lpnaddress;
+static int hf_btmesh_cntr_transactionnumber;
+static int hf_btmesh_enc_access_pld;
+static int hf_btmesh_transtmic;
+static int hf_btmesh_szmic;
+static int hf_btmesh_seqzero_data;
+static int hf_btmesh_sego;
+static int hf_btmesh_segn;
+static int hf_btmesh_seg_rfu;
+static int hf_btmesh_segment;
+static int hf_btmesh_cntr_unknown_payload;
+
+static int hf_btmesh_segmented_access_fragments;
+static int hf_btmesh_segmented_access_fragment;
+static int hf_btmesh_segmented_access_fragment_overlap;
+static int hf_btmesh_segmented_access_fragment_overlap_conflict;
+static int hf_btmesh_segmented_access_fragment_multiple_tails;
+static int hf_btmesh_segmented_access_fragment_too_long_fragment;
+static int hf_btmesh_segmented_access_fragment_error;
+static int hf_btmesh_segmented_access_fragment_count;
+static int hf_btmesh_segmented_access_reassembled_length;
+
+static int hf_btmesh_segmented_control_fragments;
+static int hf_btmesh_segmented_control_fragment;
+static int hf_btmesh_segmented_control_fragment_overlap;
+static int hf_btmesh_segmented_control_fragment_overlap_conflict;
+static int hf_btmesh_segmented_control_fragment_multiple_tails;
+static int hf_btmesh_segmented_control_fragment_too_long_fragment;
+static int hf_btmesh_segmented_control_fragment_error;
+static int hf_btmesh_segmented_control_fragment_count;
+static int hf_btmesh_segmented_control_reassembled_length;
+
+static int hf_btmesh_decrypted_access;
+static int hf_btmesh_model_layer_opcode;
+static int hf_btmesh_model_layer_parameters;
+static int hf_btmesh_model_layer_vendor_opcode;
+static int hf_btmesh_model_layer_vendor;
+
+static int hf_btmesh_config_appkey_add_netkeyindexandappkeyindex;
+static int hf_btmesh_config_appkey_add_netkeyindexandappkeyindex_net;
+static int hf_btmesh_config_appkey_add_netkeyindexandappkeyindex_app;
+static int hf_btmesh_config_appkey_add_appkey;
+static int hf_btmesh_config_appkey_update_netkeyindexandappkeyindex;
+static int hf_btmesh_config_appkey_update_netkeyindexandappkeyindex_net;
+static int hf_btmesh_config_appkey_update_netkeyindexandappkeyindex_app;
+static int hf_btmesh_config_appkey_update_appkey;
+static int hf_btmesh_config_composition_data_status_page;
+static int hf_btmesh_config_composition_data_status_cid;
+static int hf_btmesh_config_composition_data_status_pid;
+static int hf_btmesh_config_composition_data_status_vid;
+static int hf_btmesh_config_composition_data_status_crpl;
+static int hf_btmesh_config_composition_data_status_features_relay;
+static int hf_btmesh_config_composition_data_status_features_proxy;
+static int hf_btmesh_config_composition_data_status_features_friend;
+static int hf_btmesh_config_composition_data_status_features_low_power;
+static int hf_btmesh_config_composition_data_status_features_rfu;
+static int hf_btmesh_config_composition_data_status_features;
+static int hf_btmesh_config_composition_data_status_loc;
+static int hf_btmesh_config_composition_data_status_nums;
+static int hf_btmesh_config_composition_data_status_numv;
+static int hf_btmesh_config_composition_data_status_sig_model;
+static int hf_btmesh_config_composition_data_status_vendor_model;
+static int hf_btmesh_config_model_publication_set_elementaddress;
+static int hf_btmesh_config_model_publication_set_publishaddress;
+static int hf_btmesh_config_model_publication_set_appkey;
+static int hf_btmesh_config_model_publication_set_appkeyindex;
+static int hf_btmesh_config_model_publication_set_credentialflag;
+static int hf_btmesh_config_model_publication_set_rfu;
+static int hf_btmesh_config_model_publication_set_publishttl;
+static int hf_btmesh_config_model_publication_set_publishperiod;
+static int hf_btmesh_config_model_publication_set_publishperiod_resolution;
+static int hf_btmesh_config_model_publication_set_publishperiod_steps;
+static int hf_btmesh_config_model_publication_set_publishretransmit;
+static int hf_btmesh_config_model_publication_set_publishretransmit_count;
+static int hf_btmesh_config_model_publication_set_publishretransmit_intervalsteps;
+static int hf_btmesh_config_model_publication_set_modelidentifier;
+static int hf_btmesh_config_model_publication_set_vendormodelidentifier;
+static int hf_btmesh_health_current_status_test_id;
+static int hf_btmesh_health_current_status_company_id;
+static int hf_btmesh_health_current_status_fault;
+static int hf_btmesh_health_fault_status_test_id;
+static int hf_btmesh_health_fault_status_company_id;
+static int hf_btmesh_health_fault_status_fault;
+static int hf_btmesh_config_heartbeat_publication_status_status;
+static int hf_btmesh_config_heartbeat_publication_status_destination;
+static int hf_btmesh_config_heartbeat_publication_status_countlog;
+static int hf_btmesh_config_heartbeat_publication_status_periodlog;
+static int hf_btmesh_config_heartbeat_publication_status_ttl;
+static int hf_btmesh_config_heartbeat_publication_status_features_relay;
+static int hf_btmesh_config_heartbeat_publication_status_features_proxy;
+static int hf_btmesh_config_heartbeat_publication_status_features_friend;
+static int hf_btmesh_config_heartbeat_publication_status_features_low_power;
+static int hf_btmesh_config_heartbeat_publication_status_features_rfu;
+static int hf_btmesh_config_heartbeat_publication_status_features;
+static int hf_btmesh_config_heartbeat_publication_status_netkeyindex;
+static int hf_btmesh_config_heartbeat_publication_status_netkeyindex_idx;
+static int hf_btmesh_config_heartbeat_publication_status_netkeyindex_rfu;
+static int hf_btmesh_config_appkey_delete_netkeyindexandappkeyindex;
+static int hf_btmesh_config_appkey_delete_netkeyindexandappkeyindex_net;
+static int hf_btmesh_config_appkey_delete_netkeyindexandappkeyindex_app;
+static int hf_btmesh_config_appkey_get_netkeyindex;
+static int hf_btmesh_config_appkey_get_netkeyindex_idx;
+static int hf_btmesh_config_appkey_get_netkeyindex_rfu;
+static int hf_btmesh_config_appkey_list_status;
+static int hf_btmesh_config_appkey_list_netkeyindex;
+static int hf_btmesh_config_appkey_list_netkeyindex_idx;
+static int hf_btmesh_config_appkey_list_netkeyindex_rfu;
+static int hf_btmesh_config_appkey_list_appkeyindex;
+static int hf_btmesh_config_appkey_list_appkeyindex_rfu;
+static int hf_btmesh_config_appkey_status_status;
+static int hf_btmesh_config_appkey_status_netkeyindexandappkeyindex;
+static int hf_btmesh_config_appkey_status_netkeyindexandappkeyindex_net;
+static int hf_btmesh_config_appkey_status_netkeyindexandappkeyindex_app;
+static int hf_btmesh_health_attention_set_attention;
+static int hf_btmesh_health_attention_set_unacknowledged_attention;
+static int hf_btmesh_health_attention_status_attention;
+static int hf_btmesh_config_composition_data_get_page;
+static int hf_btmesh_config_beacon_set_beacon;
+static int hf_btmesh_config_beacon_status_beacon;
+static int hf_btmesh_config_default_ttl_set_ttl;
+static int hf_btmesh_config_default_ttl_status_ttl;
+static int hf_btmesh_config_friend_set_friend;
+static int hf_btmesh_config_friend_status_friend;
+static int hf_btmesh_config_gatt_proxy_set_gattproxy;
+static int hf_btmesh_config_gatt_proxy_status_gattproxy;
+static int hf_btmesh_config_key_refresh_phase_get_netkeyindex;
+static int hf_btmesh_config_key_refresh_phase_get_netkeyindex_idx;
+static int hf_btmesh_config_key_refresh_phase_get_netkeyindex_rfu;
+static int hf_btmesh_config_key_refresh_phase_set_netkeyindex;
+static int hf_btmesh_config_key_refresh_phase_set_netkeyindex_idx;
+static int hf_btmesh_config_key_refresh_phase_set_netkeyindex_rfu;
+static int hf_btmesh_config_key_refresh_phase_set_transition;
+static int hf_btmesh_config_key_refresh_phase_status_status;
+static int hf_btmesh_config_key_refresh_phase_status_netkeyindex;
+static int hf_btmesh_config_key_refresh_phase_status_netkeyindex_idx;
+static int hf_btmesh_config_key_refresh_phase_status_netkeyindex_rfu;
+static int hf_btmesh_config_key_refresh_phase_status_phase;
+static int hf_btmesh_config_model_publication_get_elementaddress;
+static int hf_btmesh_config_model_publication_get_modelidentifier;
+static int hf_btmesh_config_model_publication_get_vendormodelidentifier;
+static int hf_btmesh_config_model_publication_status_status;
+static int hf_btmesh_config_model_publication_status_elementaddress;
+static int hf_btmesh_config_model_publication_status_publishaddress;
+static int hf_btmesh_config_model_publication_status_appkey;
+static int hf_btmesh_config_model_publication_status_appkeyindex;
+static int hf_btmesh_config_model_publication_status_credentialflag;
+static int hf_btmesh_config_model_publication_status_rfu;
+static int hf_btmesh_config_model_publication_status_publishttl;
+static int hf_btmesh_config_model_publication_status_publishperiod;
+static int hf_btmesh_config_model_publication_status_publishperiod_resolution;
+static int hf_btmesh_config_model_publication_status_publishperiod_steps;
+static int hf_btmesh_config_model_publication_status_publishretransmit;
+static int hf_btmesh_config_model_publication_status_publishretransmit_count;
+static int hf_btmesh_config_model_publication_status_publishretransmit_intervalsteps;
+static int hf_btmesh_config_model_publication_status_modelidentifier;
+static int hf_btmesh_config_model_publication_status_vendormodelidentifier;
+static int hf_btmesh_config_model_publication_virtual_address_set_elementaddress;
+static int hf_btmesh_config_model_publication_virtual_address_set_publishaddress;
+static int hf_btmesh_config_model_publication_virtual_address_set_appkey;
+static int hf_btmesh_config_model_publication_virtual_address_set_appkeyindex;
+static int hf_btmesh_config_model_publication_virtual_address_set_credentialflag;
+static int hf_btmesh_config_model_publication_virtual_address_set_rfu;
+static int hf_btmesh_config_model_publication_virtual_address_set_publishttl;
+static int hf_btmesh_config_model_publication_virtual_address_set_publishperiod;
+static int hf_btmesh_config_model_publication_virtual_address_set_publishperiod_resolution;
+static int hf_btmesh_config_model_publication_virtual_address_set_publishperiod_steps;
+static int hf_btmesh_config_model_publication_virtual_address_set_publishretransmit;
+static int hf_btmesh_config_model_publication_virtual_address_set_publishretransmit_count;
+static int hf_btmesh_config_model_publication_virtual_address_set_publishretransmit_intervalsteps;
+static int hf_btmesh_config_model_publication_virtual_address_set_modelidentifier;
+static int hf_btmesh_config_model_publication_virtual_address_set_vendormodelidentifier;
+static int hf_btmesh_config_model_subscription_add_elementaddress;
+static int hf_btmesh_config_model_subscription_add_address;
+static int hf_btmesh_config_model_subscription_add_modelidentifier;
+static int hf_btmesh_config_model_subscription_add_vendormodelidentifier;
+static int hf_btmesh_config_model_subscription_delete_elementaddress;
+static int hf_btmesh_config_model_subscription_delete_address;
+static int hf_btmesh_config_model_subscription_delete_modelidentifier;
+static int hf_btmesh_config_model_subscription_delete_vendormodelidentifier;
+static int hf_btmesh_config_model_subscription_delete_all_elementaddress;
+static int hf_btmesh_config_model_subscription_delete_all_modelidentifier;
+static int hf_btmesh_config_model_subscription_delete_all_vendormodelidentifier;
+static int hf_btmesh_config_model_subscription_overwrite_elementaddress;
+static int hf_btmesh_config_model_subscription_overwrite_address;
+static int hf_btmesh_config_model_subscription_overwrite_modelidentifier;
+static int hf_btmesh_config_model_subscription_overwrite_vendormodelidentifier;
+static int hf_btmesh_config_model_subscription_status_status;
+static int hf_btmesh_config_model_subscription_status_elementaddress;
+static int hf_btmesh_config_model_subscription_status_address;
+static int hf_btmesh_config_model_subscription_status_modelidentifier;
+static int hf_btmesh_config_model_subscription_status_vendormodelidentifier;
+static int hf_btmesh_config_model_subscription_virtual_address_add_elementaddress;
+static int hf_btmesh_config_model_subscription_virtual_address_add_label;
+static int hf_btmesh_config_model_subscription_virtual_address_add_modelidentifier;
+static int hf_btmesh_config_model_subscription_virtual_address_add_vendormodelidentifier;
+static int hf_btmesh_config_model_subscription_virtual_address_delete_elementaddress;
+static int hf_btmesh_config_model_subscription_virtual_address_delete_label;
+static int hf_btmesh_config_model_subscription_virtual_address_delete_modelidentifier;
+static int hf_btmesh_config_model_subscription_virtual_address_delete_vendormodelidentifier;
+static int hf_btmesh_config_model_subscription_virtual_address_overwrite_elementaddress;
+static int hf_btmesh_config_model_subscription_virtual_address_overwrite_label;
+static int hf_btmesh_config_model_subscription_virtual_address_overwrite_modelidentifier;
+static int hf_btmesh_config_model_subscription_virtual_address_overwrite_vendormodelidentifier;
+static int hf_btmesh_config_network_transmit_set_networktransmit;
+static int hf_btmesh_config_network_transmit_set_networktransmit_count;
+static int hf_btmesh_config_network_transmit_set_networktransmit_intervalsteps;
+static int hf_btmesh_config_network_transmit_status_networktransmit;
+static int hf_btmesh_config_network_transmit_status_networktransmit_count;
+static int hf_btmesh_config_network_transmit_status_networktransmit_intervalsteps;
+static int hf_btmesh_config_relay_set_relay;
+static int hf_btmesh_config_relay_set_relayretransmit;
+static int hf_btmesh_config_relay_set_relayretransmit_count;
+static int hf_btmesh_config_relay_set_relayretransmit_intervalsteps;
+static int hf_btmesh_config_relay_status_relay;
+static int hf_btmesh_config_relay_status_relayretransmit;
+static int hf_btmesh_config_relay_status_relayretransmit_count;
+static int hf_btmesh_config_relay_status_relayretransmit_intervalsteps;
+static int hf_btmesh_config_sig_model_subscription_get_elementaddress;
+static int hf_btmesh_config_sig_model_subscription_get_modelidentifier;
+static int hf_btmesh_config_sig_model_subscription_list_status;
+static int hf_btmesh_config_sig_model_subscription_list_elementaddress;
+static int hf_btmesh_config_sig_model_subscription_list_modelidentifier;
+static int hf_btmesh_config_sig_model_subscription_list_address;
+static int hf_btmesh_config_vendor_model_subscription_get_elementaddress;
+static int hf_btmesh_config_vendor_model_subscription_get_modelidentifier;
+static int hf_btmesh_config_vendor_model_subscription_list_status;
+static int hf_btmesh_config_vendor_model_subscription_list_elementaddress;
+static int hf_btmesh_config_vendor_model_subscription_list_modelidentifier;
+static int hf_btmesh_config_vendor_model_subscription_list_address;
+static int hf_btmesh_config_low_power_node_polltimeout_get_lpnaddress;
+static int hf_btmesh_config_low_power_node_polltimeout_status_lpnaddress;
+static int hf_btmesh_config_low_power_node_polltimeout_status_polltimeout;
+static int hf_btmesh_health_fault_clear_company_id;
+static int hf_btmesh_health_fault_clear_unacknowledged_company_id;
+static int hf_btmesh_health_fault_get_company_id;
+static int hf_btmesh_health_fault_test_test_id;
+static int hf_btmesh_health_fault_test_company_id;
+static int hf_btmesh_health_fault_test_unacknowledged_test_id;
+static int hf_btmesh_health_fault_test_unacknowledged_company_id;
+static int hf_btmesh_health_period_set_fast_period_divisor;
+static int hf_btmesh_health_period_set_unacknowledged_fast_period_divisor;
+static int hf_btmesh_health_period_status_fast_period_divisor;
+static int hf_btmesh_config_heartbeat_publication_set_destination;
+static int hf_btmesh_config_heartbeat_publication_set_countlog;
+static int hf_btmesh_config_heartbeat_publication_set_periodlog;
+static int hf_btmesh_config_heartbeat_publication_set_ttl;
+static int hf_btmesh_config_heartbeat_publication_set_features_relay;
+static int hf_btmesh_config_heartbeat_publication_set_features_proxy;
+static int hf_btmesh_config_heartbeat_publication_set_features_friend;
+static int hf_btmesh_config_heartbeat_publication_set_features_low_power;
+static int hf_btmesh_config_heartbeat_publication_set_features_rfu;
+static int hf_btmesh_config_heartbeat_publication_set_features;
+static int hf_btmesh_config_heartbeat_publication_set_netkeyindex;
+static int hf_btmesh_config_heartbeat_publication_set_netkeyindex_idx;
+static int hf_btmesh_config_heartbeat_publication_set_netkeyindex_rfu;
+static int hf_btmesh_config_heartbeat_subscription_set_source;
+static int hf_btmesh_config_heartbeat_subscription_set_destination;
+static int hf_btmesh_config_heartbeat_subscription_set_periodlog;
+static int hf_btmesh_config_heartbeat_subscription_status_status;
+static int hf_btmesh_config_heartbeat_subscription_status_source;
+static int hf_btmesh_config_heartbeat_subscription_status_destination;
+static int hf_btmesh_config_heartbeat_subscription_status_periodlog;
+static int hf_btmesh_config_heartbeat_subscription_status_countlog;
+static int hf_btmesh_config_heartbeat_subscription_status_minhops;
+static int hf_btmesh_config_heartbeat_subscription_status_maxhops;
+static int hf_btmesh_config_model_app_bind_elementaddress;
+static int hf_btmesh_config_model_app_bind_appkeyindex;
+static int hf_btmesh_config_model_app_bind_appkeyindex_idx;
+static int hf_btmesh_config_model_app_bind_appkeyindex_rfu;
+static int hf_btmesh_config_model_app_bind_modelidentifier;
+static int hf_btmesh_config_model_app_bind_vendormodelidentifier;
+static int hf_btmesh_config_model_app_status_status;
+static int hf_btmesh_config_model_app_status_elementaddress;
+static int hf_btmesh_config_model_app_status_appkeyindex;
+static int hf_btmesh_config_model_app_status_appkeyindex_idx;
+static int hf_btmesh_config_model_app_status_appkeyindex_rfu;
+static int hf_btmesh_config_model_app_status_modelidentifier;
+static int hf_btmesh_config_model_app_status_vendormodelidentifier;
+static int hf_btmesh_config_model_app_unbind_elementaddress;
+static int hf_btmesh_config_model_app_unbind_appkeyindex;
+static int hf_btmesh_config_model_app_unbind_appkeyindex_idx;
+static int hf_btmesh_config_model_app_unbind_appkeyindex_rfu;
+static int hf_btmesh_config_model_app_unbind_modelidentifier;
+static int hf_btmesh_config_model_app_unbind_vendormodelidentifier;
+static int hf_btmesh_config_netkey_add_netkeyindex;
+static int hf_btmesh_config_netkey_add_netkeyindex_idx;
+static int hf_btmesh_config_netkey_add_netkeyindex_rfu;
+static int hf_btmesh_config_netkey_add_netkey;
+static int hf_btmesh_config_netkey_delete_netkeyindex;
+static int hf_btmesh_config_netkey_delete_netkeyindex_idx;
+static int hf_btmesh_config_netkey_delete_netkeyindex_rfu;
+static int hf_btmesh_config_netkey_list_netkeyindex;
+static int hf_btmesh_config_netkey_list_netkeyindex_rfu;
+static int hf_btmesh_config_netkey_status_status;
+static int hf_btmesh_config_netkey_status_netkeyindex;
+static int hf_btmesh_config_netkey_status_netkeyindex_idx;
+static int hf_btmesh_config_netkey_status_netkeyindex_rfu;
+static int hf_btmesh_config_netkey_update_netkeyindex;
+static int hf_btmesh_config_netkey_update_netkeyindex_idx;
+static int hf_btmesh_config_netkey_update_netkeyindex_rfu;
+static int hf_btmesh_config_netkey_update_netkey;
+static int hf_btmesh_config_node_identity_get_netkeyindex;
+static int hf_btmesh_config_node_identity_get_netkeyindex_idx;
+static int hf_btmesh_config_node_identity_get_netkeyindex_rfu;
+static int hf_btmesh_config_node_identity_set_netkeyindex;
+static int hf_btmesh_config_node_identity_set_netkeyindex_idx;
+static int hf_btmesh_config_node_identity_set_netkeyindex_rfu;
+static int hf_btmesh_config_node_identity_set_identity;
+static int hf_btmesh_config_node_identity_status_status;
+static int hf_btmesh_config_node_identity_status_netkeyindex;
+static int hf_btmesh_config_node_identity_status_netkeyindex_idx;
+static int hf_btmesh_config_node_identity_status_netkeyindex_rfu;
+static int hf_btmesh_config_node_identity_status_identity;
+static int hf_btmesh_config_sig_model_app_get_elementaddress;
+static int hf_btmesh_config_sig_model_app_get_modelidentifier;
+static int hf_btmesh_config_sig_model_app_list_status;
+static int hf_btmesh_config_sig_model_app_list_elementaddress;
+static int hf_btmesh_config_sig_model_app_list_modelidentifier;
+static int hf_btmesh_config_sig_model_app_list_appkeyindex;
+static int hf_btmesh_config_sig_model_app_list_appkeyindex_rfu;
+static int hf_btmesh_config_vendor_model_app_get_elementaddress;
+static int hf_btmesh_config_vendor_model_app_get_modelidentifier;
+static int hf_btmesh_config_vendor_model_app_list_status;
+static int hf_btmesh_config_vendor_model_app_list_elementaddress;
+static int hf_btmesh_config_vendor_model_app_list_modelidentifier;
+static int hf_btmesh_config_vendor_model_app_list_appkeyindex;
+static int hf_btmesh_config_vendor_model_app_list_appkeyindex_rfu;
+static int hf_btmesh_generic_location_global_status_global_latitude;
+static int hf_btmesh_generic_location_global_status_global_longitude;
+static int hf_btmesh_generic_location_global_status_global_altitude;
+static int hf_btmesh_generic_location_global_set_global_latitude;
+static int hf_btmesh_generic_location_global_set_global_longitude;
+static int hf_btmesh_generic_location_global_set_global_altitude;
+static int hf_btmesh_generic_location_global_set_unacknowledged_global_latitude;
+static int hf_btmesh_generic_location_global_set_unacknowledged_global_longitude;
+static int hf_btmesh_generic_location_global_set_unacknowledged_global_altitude;
+static int hf_btmesh_generic_onoff_set_onoff;
+static int hf_btmesh_generic_onoff_set_tid;
+static int hf_btmesh_generic_onoff_set_transition_time;
+static int hf_btmesh_generic_onoff_set_transition_time_steps;
+static int hf_btmesh_generic_onoff_set_transition_time_resolution;
+static int hf_btmesh_generic_onoff_set_delay;
+static int hf_btmesh_generic_onoff_set_unacknowledged_onoff;
+static int hf_btmesh_generic_onoff_set_unacknowledged_tid;
+static int hf_btmesh_generic_onoff_set_unacknowledged_transition_time;
+static int hf_btmesh_generic_onoff_set_unacknowledged_transition_time_steps;
+static int hf_btmesh_generic_onoff_set_unacknowledged_transition_time_resolution;
+static int hf_btmesh_generic_onoff_set_unacknowledged_delay;
+static int hf_btmesh_generic_onoff_status_present_onoff;
+static int hf_btmesh_generic_onoff_status_target_onoff;
+static int hf_btmesh_generic_onoff_status_remaining_time;
+static int hf_btmesh_generic_onoff_status_remaining_time_steps;
+static int hf_btmesh_generic_onoff_status_remaining_time_resolution;
+static int hf_btmesh_generic_level_set_level;
+static int hf_btmesh_generic_level_set_tid;
+static int hf_btmesh_generic_level_set_transition_time;
+static int hf_btmesh_generic_level_set_transition_time_steps;
+static int hf_btmesh_generic_level_set_transition_time_resolution;
+static int hf_btmesh_generic_level_set_delay;
+static int hf_btmesh_generic_level_set_unacknowledged_level;
+static int hf_btmesh_generic_level_set_unacknowledged_tid;
+static int hf_btmesh_generic_level_set_unacknowledged_transition_time;
+static int hf_btmesh_generic_level_set_unacknowledged_transition_time_steps;
+static int hf_btmesh_generic_level_set_unacknowledged_transition_time_resolution;
+static int hf_btmesh_generic_level_set_unacknowledged_delay;
+static int hf_btmesh_generic_level_status_present_level;
+static int hf_btmesh_generic_level_status_target_level;
+static int hf_btmesh_generic_level_status_remaining_time;
+static int hf_btmesh_generic_level_status_remaining_time_steps;
+static int hf_btmesh_generic_level_status_remaining_time_resolution;
+static int hf_btmesh_generic_delta_set_delta_level;
+static int hf_btmesh_generic_delta_set_tid;
+static int hf_btmesh_generic_delta_set_transition_time;
+static int hf_btmesh_generic_delta_set_transition_time_steps;
+static int hf_btmesh_generic_delta_set_transition_time_resolution;
+static int hf_btmesh_generic_delta_set_delay;
+static int hf_btmesh_generic_delta_set_unacknowledged_delta_level;
+static int hf_btmesh_generic_delta_set_unacknowledged_tid;
+static int hf_btmesh_generic_delta_set_unacknowledged_transition_time;
+static int hf_btmesh_generic_delta_set_unacknowledged_transition_time_steps;
+static int hf_btmesh_generic_delta_set_unacknowledged_transition_time_resolution;
+static int hf_btmesh_generic_delta_set_unacknowledged_delay;
+static int hf_btmesh_generic_move_set_delta_level;
+static int hf_btmesh_generic_move_set_tid;
+static int hf_btmesh_generic_move_set_transition_time;
+static int hf_btmesh_generic_move_set_transition_time_steps;
+static int hf_btmesh_generic_move_set_transition_time_resolution;
+static int hf_btmesh_generic_move_set_delay;
+static int hf_btmesh_generic_move_set_unacknowledged_delta_level;
+static int hf_btmesh_generic_move_set_unacknowledged_tid;
+static int hf_btmesh_generic_move_set_unacknowledged_transition_time;
+static int hf_btmesh_generic_move_set_unacknowledged_transition_time_steps;
+static int hf_btmesh_generic_move_set_unacknowledged_transition_time_resolution;
+static int hf_btmesh_generic_move_set_unacknowledged_delay;
+static int hf_btmesh_generic_default_transition_time_set_transition_time;
+static int hf_btmesh_generic_default_transition_time_set_transition_time_steps;
+static int hf_btmesh_generic_default_transition_time_set_transition_time_resolution;
+static int hf_btmesh_generic_default_transition_time_set_unacknowledged_transition_time;
+static int hf_btmesh_generic_default_transition_time_set_unacknowledged_transition_time_steps;
+static int hf_btmesh_generic_default_transition_time_set_unacknowledged_transition_time_resolution;
+static int hf_btmesh_generic_default_transition_time_status_transition_time;
+static int hf_btmesh_generic_default_transition_time_status_transition_time_steps;
+static int hf_btmesh_generic_default_transition_time_status_transition_time_resolution;
+static int hf_btmesh_generic_onpowerup_status_onpowerup;
+static int hf_btmesh_generic_onpowerup_set_onpowerup;
+static int hf_btmesh_generic_onpowerup_set_unacknowledged_onpowerup;
+static int hf_btmesh_generic_power_level_set_power;
+static int hf_btmesh_generic_power_level_set_tid;
+static int hf_btmesh_generic_power_level_set_transition_time;
+static int hf_btmesh_generic_power_level_set_transition_time_steps;
+static int hf_btmesh_generic_power_level_set_transition_time_resolution;
+static int hf_btmesh_generic_power_level_set_delay;
+static int hf_btmesh_generic_power_level_set_unacknowledged_power;
+static int hf_btmesh_generic_power_level_set_unacknowledged_tid;
+static int hf_btmesh_generic_power_level_set_unacknowledged_transition_time;
+static int hf_btmesh_generic_power_level_set_unacknowledged_transition_time_steps;
+static int hf_btmesh_generic_power_level_set_unacknowledged_transition_time_resolution;
+static int hf_btmesh_generic_power_level_set_unacknowledged_delay;
+static int hf_btmesh_generic_power_level_status_present_power;
+static int hf_btmesh_generic_power_level_status_target_power;
+static int hf_btmesh_generic_power_level_status_remaining_time;
+static int hf_btmesh_generic_power_level_status_remaining_time_steps;
+static int hf_btmesh_generic_power_level_status_remaining_time_resolution;
+static int hf_btmesh_generic_power_last_status_power;
+static int hf_btmesh_generic_power_default_status_power;
+static int hf_btmesh_generic_power_range_status_status_code;
+static int hf_btmesh_generic_power_range_status_range_min;
+static int hf_btmesh_generic_power_range_status_range_max;
+static int hf_btmesh_generic_power_default_set_power;
+static int hf_btmesh_generic_power_default_set_unacknowledged_power;
+static int hf_btmesh_generic_power_range_set_range_min;
+static int hf_btmesh_generic_power_range_set_range_max;
+static int hf_btmesh_generic_power_range_set_unacknowledged_range_min;
+static int hf_btmesh_generic_power_range_set_unacknowledged_range_max;
+static int hf_btmesh_generic_battery_status_battery_level;
+static int hf_btmesh_generic_battery_status_time_to_discharge;
+static int hf_btmesh_generic_battery_status_time_to_charge;
+static int hf_btmesh_generic_battery_status_flags_presence;
+static int hf_btmesh_generic_battery_status_flags_indicator;
+static int hf_btmesh_generic_battery_status_flags_charging;
+static int hf_btmesh_generic_battery_status_flags_serviceability;
+static int hf_btmesh_generic_location_local_status_local_north;
+static int hf_btmesh_generic_location_local_status_local_east;
+static int hf_btmesh_generic_location_local_status_local_altitude;
+static int hf_btmesh_generic_location_local_status_floor_number;
+static int hf_btmesh_generic_location_local_status_uncertainty_stationary;
+static int hf_btmesh_generic_location_local_status_uncertainty_rfu;
+static int hf_btmesh_generic_location_local_status_uncertainty_update_time;
+static int hf_btmesh_generic_location_local_status_uncertainty_precision;
+static int hf_btmesh_generic_location_local_set_local_north;
+static int hf_btmesh_generic_location_local_set_local_east;
+static int hf_btmesh_generic_location_local_set_local_altitude;
+static int hf_btmesh_generic_location_local_set_floor_number;
+static int hf_btmesh_generic_location_local_set_uncertainty_stationary;
+static int hf_btmesh_generic_location_local_set_uncertainty_rfu;
+static int hf_btmesh_generic_location_local_set_uncertainty_update_time;
+static int hf_btmesh_generic_location_local_set_uncertainty_precision;
+static int hf_btmesh_generic_location_local_set_unacknowledged_local_north;
+static int hf_btmesh_generic_location_local_set_unacknowledged_local_east;
+static int hf_btmesh_generic_location_local_set_unacknowledged_local_altitude;
+static int hf_btmesh_generic_location_local_set_unacknowledged_floor_number;
+static int hf_btmesh_generic_location_local_set_unacknowledged_uncertainty_stationary;
+static int hf_btmesh_generic_location_local_set_unacknowledged_uncertainty_rfu;
+static int hf_btmesh_generic_location_local_set_unacknowledged_uncertainty_update_time;
+static int hf_btmesh_generic_location_local_set_unacknowledged_uncertainty_precision;
+static int hf_btmesh_scene_status_status_code;
+static int hf_btmesh_scene_status_current_scene;
+static int hf_btmesh_scene_status_target_scene;
+static int hf_btmesh_scene_status_remaining_time;
+static int hf_btmesh_scene_status_remaining_time_steps;
+static int hf_btmesh_scene_status_remaining_time_resolution;
+static int hf_btmesh_scene_recall_scene_number;
+static int hf_btmesh_scene_recall_tid;
+static int hf_btmesh_scene_recall_transition_time;
+static int hf_btmesh_scene_recall_transition_time_steps;
+static int hf_btmesh_scene_recall_transition_time_resolution;
+static int hf_btmesh_scene_recall_delay;
+static int hf_btmesh_scene_recall_unacknowledged_scene_number;
+static int hf_btmesh_scene_recall_unacknowledged_tid;
+static int hf_btmesh_scene_recall_unacknowledged_transition_time;
+static int hf_btmesh_scene_recall_unacknowledged_transition_time_steps;
+static int hf_btmesh_scene_recall_unacknowledged_transition_time_resolution;
+static int hf_btmesh_scene_recall_unacknowledged_delay;
+static int hf_btmesh_scene_register_status_status_code;
+static int hf_btmesh_scene_register_status_current_scene;
+static int hf_btmesh_scene_register_status_scene;
+static int hf_btmesh_scene_store_scene_number;
+static int hf_btmesh_scene_store_unacknowledged_scene_number;
+static int hf_btmesh_scene_delete_scene_number;
+static int hf_btmesh_scene_delete_unacknowledged_scene_number;
+static int hf_btmesh_time_set_tai_seconds;
+static int hf_btmesh_time_set_subsecond;
+static int hf_btmesh_time_set_uncertainty;
+static int hf_btmesh_time_set_time_authority;
+static int hf_btmesh_time_set_tai_utc_delta;
+static int hf_btmesh_time_set_time_zone_offset;
+static int hf_btmesh_time_status_tai_seconds;
+static int hf_btmesh_time_status_subsecond;
+static int hf_btmesh_time_status_uncertainty;
+static int hf_btmesh_time_status_time_authority;
+static int hf_btmesh_time_status_tai_utc_delta;
+static int hf_btmesh_time_status_time_zone_offset;
+static int hf_btmesh_scheduler_action_status_index;
+static int hf_btmesh_scheduler_action_status_schedule_register_year;
+static int hf_btmesh_scheduler_action_status_schedule_register_month;
+static int hf_btmesh_scheduler_action_status_schedule_register_day;
+static int hf_btmesh_scheduler_action_status_schedule_register_hour;
+static int hf_btmesh_scheduler_action_status_schedule_register_minute;
+static int hf_btmesh_scheduler_action_status_schedule_register_second;
+static int hf_btmesh_scheduler_action_status_schedule_register_day_of_week;
+static int hf_btmesh_scheduler_action_status_schedule_register_action;
+static int hf_btmesh_scheduler_action_status_schedule_register_transition_time;
+static int hf_btmesh_scheduler_action_status_schedule_register_transition_time_steps;
+static int hf_btmesh_scheduler_action_status_schedule_register_transition_time_resolution;
+static int hf_btmesh_scheduler_action_status_schedule_register_scene_number;
+static int hf_btmesh_scheduler_schedule_register_month_january;
+static int hf_btmesh_scheduler_schedule_register_month_february;
+static int hf_btmesh_scheduler_schedule_register_month_march;
+static int hf_btmesh_scheduler_schedule_register_month_april;
+static int hf_btmesh_scheduler_schedule_register_month_may;
+static int hf_btmesh_scheduler_schedule_register_month_june;
+static int hf_btmesh_scheduler_schedule_register_month_july;
+static int hf_btmesh_scheduler_schedule_register_month_august;
+static int hf_btmesh_scheduler_schedule_register_month_september;
+static int hf_btmesh_scheduler_schedule_register_month_october;
+static int hf_btmesh_scheduler_schedule_register_month_november;
+static int hf_btmesh_scheduler_schedule_register_month_december;
+static int hf_btmesh_scheduler_schedule_register_day_of_week_monday;
+static int hf_btmesh_scheduler_schedule_register_day_of_week_tuesday;
+static int hf_btmesh_scheduler_schedule_register_day_of_week_wednesday;
+static int hf_btmesh_scheduler_schedule_register_day_of_week_thursday;
+static int hf_btmesh_scheduler_schedule_register_day_of_week_friday;
+static int hf_btmesh_scheduler_schedule_register_day_of_week_saturday;
+static int hf_btmesh_scheduler_schedule_register_day_of_week_sunday;
+static int hf_btmesh_scheduler_action_set_index;
+static int hf_btmesh_scheduler_action_set_schedule_register_year;
+static int hf_btmesh_scheduler_action_set_schedule_register_month;
+static int hf_btmesh_scheduler_action_set_schedule_register_day;
+static int hf_btmesh_scheduler_action_set_schedule_register_hour;
+static int hf_btmesh_scheduler_action_set_schedule_register_minute;
+static int hf_btmesh_scheduler_action_set_schedule_register_second;
+static int hf_btmesh_scheduler_action_set_schedule_register_day_of_week;
+static int hf_btmesh_scheduler_action_set_schedule_register_action;
+static int hf_btmesh_scheduler_action_set_schedule_register_transition_time;
+static int hf_btmesh_scheduler_action_set_schedule_register_transition_time_steps;
+static int hf_btmesh_scheduler_action_set_schedule_register_transition_time_resolution;
+static int hf_btmesh_scheduler_action_set_schedule_register_scene_number;
+static int hf_btmesh_scheduler_action_set_unacknowledged_index;
+static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_year;
+static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_month;
+static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_day;
+static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_hour;
+static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_minute;
+static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_second;
+static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_day_of_week;
+static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_action;
+static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_transition_time;
+static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_transition_time_steps;
+static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_transition_time_resolution;
+static int hf_btmesh_scheduler_action_set_unacknowledged_schedule_register_scene_number;
+static int hf_btmesh_time_role_set_time_role;
+static int hf_btmesh_time_role_status_time_role;
+static int hf_btmesh_time_zone_set_time_zone_offset_new;
+static int hf_btmesh_time_zone_set_tai_of_zone_change;
+static int hf_btmesh_time_zone_status_time_zone_offset_current;
+static int hf_btmesh_time_zone_status_time_zone_offset_new;
+static int hf_btmesh_time_zone_status_tai_of_zone_change;
+static int hf_btmesh_tai_utc_delta_set_tai_utc_delta_new;
+static int hf_btmesh_tai_utc_delta_set_padding;
+static int hf_btmesh_tai_utc_delta_set_tai_of_delta_change;
+static int hf_btmesh_tai_utc_delta_status_tai_utc_delta_current;
+static int hf_btmesh_tai_utc_delta_status_padding_1;
+static int hf_btmesh_tai_utc_delta_status_tai_utc_delta_new;
+static int hf_btmesh_tai_utc_delta_status_padding_2;
+static int hf_btmesh_tai_utc_delta_status_tai_of_delta_change;
+static int hf_btmesh_scheduler_action_get_index;
+static int hf_btmesh_scheduler_status_schedules;
+static int hf_btmesh_scheduler_status_schedules_schedule_0;
+static int hf_btmesh_scheduler_status_schedules_schedule_1;
+static int hf_btmesh_scheduler_status_schedules_schedule_2;
+static int hf_btmesh_scheduler_status_schedules_schedule_3;
+static int hf_btmesh_scheduler_status_schedules_schedule_4;
+static int hf_btmesh_scheduler_status_schedules_schedule_5;
+static int hf_btmesh_scheduler_status_schedules_schedule_6;
+static int hf_btmesh_scheduler_status_schedules_schedule_7;
+static int hf_btmesh_scheduler_status_schedules_schedule_8;
+static int hf_btmesh_scheduler_status_schedules_schedule_9;
+static int hf_btmesh_scheduler_status_schedules_schedule_10;
+static int hf_btmesh_scheduler_status_schedules_schedule_11;
+static int hf_btmesh_scheduler_status_schedules_schedule_12;
+static int hf_btmesh_scheduler_status_schedules_schedule_13;
+static int hf_btmesh_scheduler_status_schedules_schedule_14;
+static int hf_btmesh_scheduler_status_schedules_schedule_15;
+
+static int hf_btmesh_light_lc_property_set_light_lc_property_id;
+static int hf_btmesh_light_lc_property_set_light_lc_property_value;
+static int hf_btmesh_light_lc_property_set_unacknowledged_light_lc_property_id;
+static int hf_btmesh_light_lc_property_set_unacknowledged_light_lc_property_value;
+static int hf_btmesh_light_lc_property_status_light_lc_property_id;
+static int hf_btmesh_light_lc_property_status_light_lc_property_value;
+static int hf_btmesh_light_lightness_set_lightness;
+static int hf_btmesh_light_lightness_set_tid;
+static int hf_btmesh_light_lightness_set_transition_time;
+static int hf_btmesh_light_lightness_set_transition_time_steps;
+static int hf_btmesh_light_lightness_set_transition_time_resolution;
+static int hf_btmesh_light_lightness_set_delay;
+static int hf_btmesh_light_lightness_set_unacknowledged_lightness;
+static int hf_btmesh_light_lightness_set_unacknowledged_tid;
+static int hf_btmesh_light_lightness_set_unacknowledged_transition_time;
+static int hf_btmesh_light_lightness_set_unacknowledged_transition_time_steps;
+static int hf_btmesh_light_lightness_set_unacknowledged_transition_time_resolution;
+static int hf_btmesh_light_lightness_set_unacknowledged_delay;
+static int hf_btmesh_light_lightness_status_present_lightness;
+static int hf_btmesh_light_lightness_status_target_lightness;
+static int hf_btmesh_light_lightness_status_remaining_time;
+static int hf_btmesh_light_lightness_status_remaining_time_steps;
+static int hf_btmesh_light_lightness_status_remaining_time_resolution;
+static int hf_btmesh_light_lightness_linear_set_lightness;
+static int hf_btmesh_light_lightness_linear_set_tid;
+static int hf_btmesh_light_lightness_linear_set_transition_time;
+static int hf_btmesh_light_lightness_linear_set_transition_time_steps;
+static int hf_btmesh_light_lightness_linear_set_transition_time_resolution;
+static int hf_btmesh_light_lightness_linear_set_delay;
+static int hf_btmesh_light_lightness_linear_set_unacknowledged_lightness;
+static int hf_btmesh_light_lightness_linear_set_unacknowledged_tid;
+static int hf_btmesh_light_lightness_linear_set_unacknowledged_transition_time;
+static int hf_btmesh_light_lightness_linear_set_unacknowledged_transition_time_steps;
+static int hf_btmesh_light_lightness_linear_set_unacknowledged_transition_time_resolution;
+static int hf_btmesh_light_lightness_linear_set_unacknowledged_delay;
+static int hf_btmesh_light_lightness_linear_status_present_lightness;
+static int hf_btmesh_light_lightness_linear_status_target_lightness;
+static int hf_btmesh_light_lightness_linear_status_remaining_time;
+static int hf_btmesh_light_lightness_linear_status_remaining_time_steps;
+static int hf_btmesh_light_lightness_linear_status_remaining_time_resolution;
+static int hf_btmesh_light_lightness_last_status_lightness;
+static int hf_btmesh_light_lightness_default_status_lightness;
+static int hf_btmesh_light_lightness_range_status_status_code;
+static int hf_btmesh_light_lightness_range_status_range_min;
+static int hf_btmesh_light_lightness_range_status_range_max;
+static int hf_btmesh_light_lightness_default_set_lightness;
+static int hf_btmesh_light_lightness_default_set_unacknowledged_lightness;
+static int hf_btmesh_light_lightness_range_set_range_min;
+static int hf_btmesh_light_lightness_range_set_range_max;
+static int hf_btmesh_light_lightness_range_set_unacknowledged_range_min;
+static int hf_btmesh_light_lightness_range_set_unacknowledged_range_max;
+static int hf_btmesh_light_ctl_set_ctl_lightness;
+static int hf_btmesh_light_ctl_set_ctl_temperature;
+static int hf_btmesh_light_ctl_set_ctl_delta_uv;
+static int hf_btmesh_light_ctl_set_tid;
+static int hf_btmesh_light_ctl_set_transition_time;
+static int hf_btmesh_light_ctl_set_transition_time_steps;
+static int hf_btmesh_light_ctl_set_transition_time_resolution;
+static int hf_btmesh_light_ctl_set_delay;
+static int hf_btmesh_light_ctl_set_unacknowledged_ctl_lightness;
+static int hf_btmesh_light_ctl_set_unacknowledged_ctl_temperature;
+static int hf_btmesh_light_ctl_set_unacknowledged_ctl_delta_uv;
+static int hf_btmesh_light_ctl_set_unacknowledged_tid;
+static int hf_btmesh_light_ctl_set_unacknowledged_transition_time;
+static int hf_btmesh_light_ctl_set_unacknowledged_transition_time_steps;
+static int hf_btmesh_light_ctl_set_unacknowledged_transition_time_resolution;
+static int hf_btmesh_light_ctl_set_unacknowledged_delay;
+static int hf_btmesh_light_ctl_status_present_ctl_lightness;
+static int hf_btmesh_light_ctl_status_present_ctl_temperature;
+static int hf_btmesh_light_ctl_status_target_ctl_lightness;
+static int hf_btmesh_light_ctl_status_target_ctl_temperature;
+static int hf_btmesh_light_ctl_status_remaining_time;
+static int hf_btmesh_light_ctl_status_remaining_time_steps;
+static int hf_btmesh_light_ctl_status_remaining_time_resolution;
+static int hf_btmesh_light_ctl_temperature_range_status_status_code;
+static int hf_btmesh_light_ctl_temperature_range_status_range_min;
+static int hf_btmesh_light_ctl_temperature_range_status_range_max;
+static int hf_btmesh_light_ctl_temperature_set_ctl_temperature;
+static int hf_btmesh_light_ctl_temperature_set_ctl_delta_uv;
+static int hf_btmesh_light_ctl_temperature_set_tid;
+static int hf_btmesh_light_ctl_temperature_set_transition_time;
+static int hf_btmesh_light_ctl_temperature_set_transition_time_steps;
+static int hf_btmesh_light_ctl_temperature_set_transition_time_resolution;
+static int hf_btmesh_light_ctl_temperature_set_delay;
+static int hf_btmesh_light_ctl_temperature_set_unacknowledged_ctl_temperature;
+static int hf_btmesh_light_ctl_temperature_set_unacknowledged_ctl_delta_uv;
+static int hf_btmesh_light_ctl_temperature_set_unacknowledged_tid;
+static int hf_btmesh_light_ctl_temperature_set_unacknowledged_transition_time;
+static int hf_btmesh_light_ctl_temperature_set_unacknowledged_transition_time_steps;
+static int hf_btmesh_light_ctl_temperature_set_unacknowledged_transition_time_resolution;
+static int hf_btmesh_light_ctl_temperature_set_unacknowledged_delay;
+static int hf_btmesh_light_ctl_temperature_status_present_ctl_temperature;
+static int hf_btmesh_light_ctl_temperature_status_present_ctl_delta_uv;
+static int hf_btmesh_light_ctl_temperature_status_target_ctl_temperature;
+static int hf_btmesh_light_ctl_temperature_status_target_ctl_delta_uv;
+static int hf_btmesh_light_ctl_temperature_status_remaining_time;
+static int hf_btmesh_light_ctl_temperature_status_remaining_time_steps;
+static int hf_btmesh_light_ctl_temperature_status_remaining_time_resolution;
+static int hf_btmesh_light_ctl_default_status_lightness;
+static int hf_btmesh_light_ctl_default_status_temperature;
+static int hf_btmesh_light_ctl_default_status_delta_uv;
+static int hf_btmesh_light_ctl_default_set_lightness;
+static int hf_btmesh_light_ctl_default_set_temperature;
+static int hf_btmesh_light_ctl_default_set_delta_uv;
+static int hf_btmesh_light_ctl_default_set_unacknowledged_lightness;
+static int hf_btmesh_light_ctl_default_set_unacknowledged_temperature;
+static int hf_btmesh_light_ctl_default_set_unacknowledged_delta_uv;
+static int hf_btmesh_light_ctl_temperature_range_set_range_min;
+static int hf_btmesh_light_ctl_temperature_range_set_range_max;
+static int hf_btmesh_light_ctl_temperature_range_set_unacknowledged_range_min;
+static int hf_btmesh_light_ctl_temperature_range_set_unacknowledged_range_max;
+static int hf_btmesh_light_hsl_hue_set_hue;
+static int hf_btmesh_light_hsl_hue_set_tid;
+static int hf_btmesh_light_hsl_hue_set_transition_time;
+static int hf_btmesh_light_hsl_hue_set_transition_time_steps;
+static int hf_btmesh_light_hsl_hue_set_transition_time_resolution;
+static int hf_btmesh_light_hsl_hue_set_delay;
+static int hf_btmesh_light_hsl_hue_set_unacknowledged_hue;
+static int hf_btmesh_light_hsl_hue_set_unacknowledged_tid;
+static int hf_btmesh_light_hsl_hue_set_unacknowledged_transition_time;
+static int hf_btmesh_light_hsl_hue_set_unacknowledged_transition_time_steps;
+static int hf_btmesh_light_hsl_hue_set_unacknowledged_transition_time_resolution;
+static int hf_btmesh_light_hsl_hue_set_unacknowledged_delay;
+static int hf_btmesh_light_hsl_hue_status_present_hue;
+static int hf_btmesh_light_hsl_hue_status_target_hue;
+static int hf_btmesh_light_hsl_hue_status_remaining_time;
+static int hf_btmesh_light_hsl_hue_status_remaining_time_steps;
+static int hf_btmesh_light_hsl_hue_status_remaining_time_resolution;
+static int hf_btmesh_light_hsl_saturation_set_saturation;
+static int hf_btmesh_light_hsl_saturation_set_tid;
+static int hf_btmesh_light_hsl_saturation_set_transition_time;
+static int hf_btmesh_light_hsl_saturation_set_transition_time_steps;
+static int hf_btmesh_light_hsl_saturation_set_transition_time_resolution;
+static int hf_btmesh_light_hsl_saturation_set_delay;
+static int hf_btmesh_light_hsl_saturation_set_unacknowledged_saturation;
+static int hf_btmesh_light_hsl_saturation_set_unacknowledged_tid;
+static int hf_btmesh_light_hsl_saturation_set_unacknowledged_transition_time;
+static int hf_btmesh_light_hsl_saturation_set_unacknowledged_transition_time_steps;
+static int hf_btmesh_light_hsl_saturation_set_unacknowledged_transition_time_resolution;
+static int hf_btmesh_light_hsl_saturation_set_unacknowledged_delay;
+static int hf_btmesh_light_hsl_saturation_status_present_saturation;
+static int hf_btmesh_light_hsl_saturation_status_target_saturation;
+static int hf_btmesh_light_hsl_saturation_status_remaining_time;
+static int hf_btmesh_light_hsl_saturation_status_remaining_time_steps;
+static int hf_btmesh_light_hsl_saturation_status_remaining_time_resolution;
+static int hf_btmesh_light_hsl_set_hsl_lightness;
+static int hf_btmesh_light_hsl_set_hsl_hue;
+static int hf_btmesh_light_hsl_set_hsl_saturation;
+static int hf_btmesh_light_hsl_set_tid;
+static int hf_btmesh_light_hsl_set_transition_time;
+static int hf_btmesh_light_hsl_set_transition_time_steps;
+static int hf_btmesh_light_hsl_set_transition_time_resolution;
+static int hf_btmesh_light_hsl_set_delay;
+static int hf_btmesh_light_hsl_set_unacknowledged_hsl_lightness;
+static int hf_btmesh_light_hsl_set_unacknowledged_hsl_hue;
+static int hf_btmesh_light_hsl_set_unacknowledged_hsl_saturation;
+static int hf_btmesh_light_hsl_set_unacknowledged_tid;
+static int hf_btmesh_light_hsl_set_unacknowledged_transition_time;
+static int hf_btmesh_light_hsl_set_unacknowledged_transition_time_steps;
+static int hf_btmesh_light_hsl_set_unacknowledged_transition_time_resolution;
+static int hf_btmesh_light_hsl_set_unacknowledged_delay;
+static int hf_btmesh_light_hsl_status_hsl_lightness;
+static int hf_btmesh_light_hsl_status_hsl_hue;
+static int hf_btmesh_light_hsl_status_hsl_saturation;
+static int hf_btmesh_light_hsl_status_remaining_time;
+static int hf_btmesh_light_hsl_status_remaining_time_steps;
+static int hf_btmesh_light_hsl_status_remaining_time_resolution;
+static int hf_btmesh_light_hsl_target_status_hsl_lightness_target;
+static int hf_btmesh_light_hsl_target_status_hsl_hue_target;
+static int hf_btmesh_light_hsl_target_status_hsl_saturation_target;
+static int hf_btmesh_light_hsl_target_status_remaining_time;
+static int hf_btmesh_light_hsl_target_status_remaining_time_steps;
+static int hf_btmesh_light_hsl_target_status_remaining_time_resolution;
+static int hf_btmesh_light_hsl_default_status_lightness;
+static int hf_btmesh_light_hsl_default_status_hue;
+static int hf_btmesh_light_hsl_default_status_saturation;
+static int hf_btmesh_light_hsl_range_status_status_code;
+static int hf_btmesh_light_hsl_range_status_hue_range_min;
+static int hf_btmesh_light_hsl_range_status_hue_range_max;
+static int hf_btmesh_light_hsl_range_status_saturation_range_min;
+static int hf_btmesh_light_hsl_range_status_saturation_range_max;
+static int hf_btmesh_light_hsl_default_set_lightness;
+static int hf_btmesh_light_hsl_default_set_hue;
+static int hf_btmesh_light_hsl_default_set_saturation;
+static int hf_btmesh_light_hsl_default_set_unacknowledged_lightness;
+static int hf_btmesh_light_hsl_default_set_unacknowledged_hue;
+static int hf_btmesh_light_hsl_default_set_unacknowledged_saturation;
+static int hf_btmesh_light_hsl_range_set_hue_range_min;
+static int hf_btmesh_light_hsl_range_set_hue_range_max;
+static int hf_btmesh_light_hsl_range_set_saturation_range_min;
+static int hf_btmesh_light_hsl_range_set_saturation_range_max;
+static int hf_btmesh_light_hsl_range_set_unacknowledged_hue_range_min;
+static int hf_btmesh_light_hsl_range_set_unacknowledged_hue_range_max;
+static int hf_btmesh_light_hsl_range_set_unacknowledged_saturation_range_min;
+static int hf_btmesh_light_hsl_range_set_unacknowledged_saturation_range_max;
+static int hf_btmesh_light_xyl_set_xyl_lightness;
+static int hf_btmesh_light_xyl_set_xyl_x;
+static int hf_btmesh_light_xyl_set_xyl_y;
+static int hf_btmesh_light_xyl_set_tid;
+static int hf_btmesh_light_xyl_set_transition_time;
+static int hf_btmesh_light_xyl_set_transition_time_steps;
+static int hf_btmesh_light_xyl_set_transition_time_resolution;
+static int hf_btmesh_light_xyl_set_delay;
+static int hf_btmesh_light_xyl_set_unacknowledged_xyl_lightness;
+static int hf_btmesh_light_xyl_set_unacknowledged_xyl_x;
+static int hf_btmesh_light_xyl_set_unacknowledged_xyl_y;
+static int hf_btmesh_light_xyl_set_unacknowledged_tid;
+static int hf_btmesh_light_xyl_set_unacknowledged_transition_time;
+static int hf_btmesh_light_xyl_set_unacknowledged_transition_time_steps;
+static int hf_btmesh_light_xyl_set_unacknowledged_transition_time_resolution;
+static int hf_btmesh_light_xyl_set_unacknowledged_delay;
+static int hf_btmesh_light_xyl_status_xyl_lightness;
+static int hf_btmesh_light_xyl_status_xyl_x;
+static int hf_btmesh_light_xyl_status_xyl_y;
+static int hf_btmesh_light_xyl_status_remaining_time;
+static int hf_btmesh_light_xyl_status_remaining_time_steps;
+static int hf_btmesh_light_xyl_status_remaining_time_resolution;
+static int hf_btmesh_light_xyl_target_status_target_xyl_lightness;
+static int hf_btmesh_light_xyl_target_status_target_xyl_x;
+static int hf_btmesh_light_xyl_target_status_target_xyl_y;
+static int hf_btmesh_light_xyl_target_status_remaining_time;
+static int hf_btmesh_light_xyl_target_status_remaining_time_steps;
+static int hf_btmesh_light_xyl_target_status_remaining_time_resolution;
+static int hf_btmesh_light_xyl_default_status_lightness;
+static int hf_btmesh_light_xyl_default_status_xyl_x;
+static int hf_btmesh_light_xyl_default_status_xyl_y;
+static int hf_btmesh_light_xyl_range_status_status_code;
+static int hf_btmesh_light_xyl_range_status_xyl_x_range_min;
+static int hf_btmesh_light_xyl_range_status_xyl_x_range_max;
+static int hf_btmesh_light_xyl_range_status_xyl_y_range_min;
+static int hf_btmesh_light_xyl_range_status_xyl_y_range_max;
+static int hf_btmesh_light_xyl_default_set_lightness;
+static int hf_btmesh_light_xyl_default_set_xyl_x;
+static int hf_btmesh_light_xyl_default_set_xyl_y;
+static int hf_btmesh_light_xyl_default_set_unacknowledged_lightness;
+static int hf_btmesh_light_xyl_default_set_unacknowledged_xyl_x;
+static int hf_btmesh_light_xyl_default_set_unacknowledged_xyl_y;
+static int hf_btmesh_light_xyl_range_set_xyl_x_range_min;
+static int hf_btmesh_light_xyl_range_set_xyl_x_range_max;
+static int hf_btmesh_light_xyl_range_set_xyl_y_range_min;
+static int hf_btmesh_light_xyl_range_set_xyl_y_range_max;
+static int hf_btmesh_light_xyl_range_set_unacknowledged_xyl_x_range_min;
+static int hf_btmesh_light_xyl_range_set_unacknowledged_xyl_x_range_max;
+static int hf_btmesh_light_xyl_range_set_unacknowledged_xyl_y_range_min;
+static int hf_btmesh_light_xyl_range_set_unacknowledged_xyl_y_range_max;
+static int hf_btmesh_light_lc_mode_set_mode;
+static int hf_btmesh_light_lc_mode_set_unacknowledged_mode;
+static int hf_btmesh_light_lc_mode_status_mode;
+static int hf_btmesh_light_lc_om_set_mode;
+static int hf_btmesh_light_lc_om_set_unacknowledged_mode;
+static int hf_btmesh_light_lc_om_status_mode;
+static int hf_btmesh_light_lc_light_onoff_set_light_onoff;
+static int hf_btmesh_light_lc_light_onoff_set_tid;
+static int hf_btmesh_light_lc_light_onoff_set_transition_time;
+static int hf_btmesh_light_lc_light_onoff_set_transition_time_steps;
+static int hf_btmesh_light_lc_light_onoff_set_transition_time_resolution;
+static int hf_btmesh_light_lc_light_onoff_set_delay;
+static int hf_btmesh_light_lc_light_onoff_set_unacknowledged_light_onoff;
+static int hf_btmesh_light_lc_light_onoff_set_unacknowledged_tid;
+static int hf_btmesh_light_lc_light_onoff_set_unacknowledged_transition_time;
+static int hf_btmesh_light_lc_light_onoff_set_unacknowledged_transition_time_steps;
+static int hf_btmesh_light_lc_light_onoff_set_unacknowledged_transition_time_resolution;
+static int hf_btmesh_light_lc_light_onoff_set_unacknowledged_delay;
+static int hf_btmesh_light_lc_light_onoff_status_present_light_onoff;
+static int hf_btmesh_light_lc_light_onoff_status_target_light_onoff;
+static int hf_btmesh_light_lc_light_onoff_status_remaining_time;
+static int hf_btmesh_light_lc_light_onoff_status_remaining_time_steps;
+static int hf_btmesh_light_lc_light_onoff_status_remaining_time_resolution;
+static int hf_btmesh_light_lc_property_get_light_lc_property_id;
+
+static int hf_btmesh_generic_manufacturer_properties_status_manufacturer_property_id;
+static int hf_btmesh_generic_manufacturer_property_set_manufacturer_property_id;
+static int hf_btmesh_generic_manufacturer_property_set_manufacturer_user_access;
+static int hf_btmesh_generic_manufacturer_property_set_unacknowledged_manufacturer_property_id;
+static int hf_btmesh_generic_manufacturer_property_set_unacknowledged_manufacturer_user_access;
+static int hf_btmesh_generic_manufacturer_property_status_manufacturer_property_id;
+static int hf_btmesh_generic_manufacturer_property_status_manufacturer_user_access;
+static int hf_btmesh_generic_manufacturer_property_status_manufacturer_property_value;
+static int hf_btmesh_generic_admin_properties_status_admin_property_id;
+static int hf_btmesh_generic_admin_property_set_admin_property_id;
+static int hf_btmesh_generic_admin_property_set_admin_user_access;
+static int hf_btmesh_generic_admin_property_set_admin_property_value;
+static int hf_btmesh_generic_admin_property_set_unacknowledged_admin_property_id;
+static int hf_btmesh_generic_admin_property_set_unacknowledged_admin_user_access;
+static int hf_btmesh_generic_admin_property_set_unacknowledged_admin_property_value;
+static int hf_btmesh_generic_admin_property_status_admin_property_id;
+static int hf_btmesh_generic_admin_property_status_admin_user_access;
+static int hf_btmesh_generic_admin_property_status_admin_property_value;
+static int hf_btmesh_generic_user_properties_status_user_property_id;
+static int hf_btmesh_generic_user_property_set_user_property_id;
+static int hf_btmesh_generic_user_property_set_user_property_value;
+static int hf_btmesh_generic_user_property_set_unacknowledged_user_property_id;
+static int hf_btmesh_generic_user_property_set_unacknowledged_user_property_value;
+static int hf_btmesh_generic_user_property_status_user_property_id;
+static int hf_btmesh_generic_user_property_status_user_access;
+static int hf_btmesh_generic_user_property_status_user_property_value;
+static int hf_btmesh_generic_client_properties_get_client_property_id;
+static int hf_btmesh_generic_client_properties_status_client_property_id;
+static int hf_btmesh_sensor_descriptor_get_property_id;
+static int hf_btmesh_sensor_descriptor_status_descriptor_sensor_property_id;
+static int hf_btmesh_sensor_descriptor_status_descriptor_sensor_positive_tolerance;
+static int hf_btmesh_sensor_descriptor_status_descriptor_sensor_negative_tolerance;
+static int hf_btmesh_sensor_descriptor_status_descriptor_sensor_sampling_function;
+static int hf_btmesh_sensor_descriptor_status_descriptor_sensor_measurement_period;
+static int hf_btmesh_sensor_descriptor_status_descriptor_sensor_update_interval;
+static int hf_btmesh_sensor_status_mpid_format;
+static int hf_btmesh_sensor_status_mpid_format_a_length;
+static int hf_btmesh_sensor_status_mpid_format_a_property_id;
+static int hf_btmesh_sensor_status_mpid_format_b_length;
+static int hf_btmesh_sensor_status_mpid_format_b_property_id;
+static int hf_btmesh_sensor_status_raw_value;
+static int hf_btmesh_sensor_column_status_property_id;
+static int hf_btmesh_sensor_column_status_raw_value_a;
+static int hf_btmesh_sensor_column_status_raw_value_b;
+static int hf_btmesh_sensor_column_status_raw_value_c;
+static int hf_btmesh_sensor_series_status_property_id;
+static int hf_btmesh_sensor_series_status_raw_value_a;
+static int hf_btmesh_sensor_series_status_raw_value_b;
+static int hf_btmesh_sensor_series_status_raw_value_c;
+static int hf_btmesh_sensor_cadence_set_property_id;
+static int hf_btmesh_sensor_cadence_set_fast_cadence_period_divisor;
+static int hf_btmesh_sensor_cadence_set_status_trigger_type;
+static int hf_btmesh_sensor_cadence_set_status_trigger_delta_down;
+static int hf_btmesh_sensor_cadence_set_status_trigger_delta_up;
+static int hf_btmesh_sensor_cadence_set_status_min_interval;
+static int hf_btmesh_sensor_cadence_set_fast_cadence_low;
+static int hf_btmesh_sensor_cadence_set_fast_cadence_high;
+static int hf_btmesh_sensor_cadence_set_remainder_not_dissected;
+static int hf_btmesh_sensor_cadence_set_unacknowledged_property_id;
+static int hf_btmesh_sensor_cadence_set_unacknowledged_fast_cadence_period_divisor;
+static int hf_btmesh_sensor_cadence_set_unacknowledged_status_trigger_type;
+static int hf_btmesh_sensor_cadence_set_unacknowledged_status_trigger_delta_down;
+static int hf_btmesh_sensor_cadence_set_unacknowledged_status_trigger_delta_up;
+static int hf_btmesh_sensor_cadence_set_unacknowledged_status_min_interval;
+static int hf_btmesh_sensor_cadence_set_unacknowledged_fast_cadence_low;
+static int hf_btmesh_sensor_cadence_set_unacknowledged_fast_cadence_high;
+static int hf_btmesh_sensor_cadence_set_unacknowledged_remainder_not_dissected;
+static int hf_btmesh_sensor_cadence_status_property_id;
+static int hf_btmesh_sensor_cadence_status_fast_cadence_period_divisor;
+static int hf_btmesh_sensor_cadence_status_status_trigger_type;
+static int hf_btmesh_sensor_cadence_status_status_trigger_delta_down;
+static int hf_btmesh_sensor_cadence_status_status_trigger_delta_up;
+static int hf_btmesh_sensor_cadence_status_status_min_interval;
+static int hf_btmesh_sensor_cadence_status_fast_cadence_low;
+static int hf_btmesh_sensor_cadence_status_fast_cadence_high;
+static int hf_btmesh_sensor_cadence_status_remainder_not_dissected;
+static int hf_btmesh_sensor_settings_status_sensor_property_id;
+static int hf_btmesh_sensor_settings_status_sensor_setting_property_id;
+static int hf_btmesh_sensor_setting_set_sensor_property_id;
+static int hf_btmesh_sensor_setting_set_sensor_setting_property_id;
+static int hf_btmesh_sensor_setting_set_sensor_setting_raw;
+static int hf_btmesh_sensor_setting_set_unacknowledged_sensor_property_id;
+static int hf_btmesh_sensor_setting_set_unacknowledged_sensor_setting_property_id;
+static int hf_btmesh_sensor_setting_set_unacknowledged_sensor_setting_raw;
+static int hf_btmesh_sensor_setting_status_sensor_property_id;
+static int hf_btmesh_sensor_setting_status_sensor_setting_property_id;
+static int hf_btmesh_sensor_setting_status_sensor_setting_access;
+static int hf_btmesh_sensor_setting_status_sensor_setting_raw;
+static int hf_btmesh_generic_manufacturer_property_get_manufacturer_property_id;
+static int hf_btmesh_generic_admin_property_get_admin_property_id;
+static int hf_btmesh_generic_user_property_get_user_property_id;
+
+static int hf_btmesh_sensor_get_property_id;
+static int hf_btmesh_sensor_column_get_property_id;
+static int hf_btmesh_sensor_column_get_raw_value_a;
+static int hf_btmesh_sensor_series_get_property_id;
+static int hf_btmesh_sensor_series_get_raw_value_a1;
+static int hf_btmesh_sensor_series_get_raw_value_a2;
+static int hf_btmesh_sensor_cadence_get_property_id;
+static int hf_btmesh_sensor_settings_get_sensor_property_id;
+static int hf_btmesh_sensor_setting_get_sensor_property_id;
+static int hf_btmesh_sensor_setting_get_sensor_setting_property_id;
+
+static int hf_bt_phony_characteristic_percentage_change_16;
+static int hf_bt_phony_characteristic_index;
+static int hf_bt_characteristic_time_decihour_8;
+static int hf_bt_characteristic_temperature_8;
+static int hf_bt_characteristic_temperature;
+static int hf_bt_characteristic_electric_current;
+static int hf_bt_characteristic_energy;
+static int hf_bt_characteristic_generic_level;
+static int hf_bt_characteristic_boolean;
+static int hf_bt_characteristic_coefficient;
+static int hf_bt_characteristic_count_16;
+static int hf_bt_characteristic_illuminance;
+static int hf_bt_characteristic_perceived_lightness;
+static int hf_bt_characteristic_percentage_8;
+static int hf_bt_characteristic_time_millisecond_24;
+static int hf_bt_characteristic_time_second_16;
 
 static const
 bt_property_raw_value_entry_t sensor_column_status_hfs = {
@@ -1796,48 +1796,48 @@ bt_property_columns_raw_value_t sensor_series_get_hfs = {
     .hf_raw_value_a2 = &hf_btmesh_sensor_series_get_raw_value_a2
 };
 
-static int ett_btmesh = -1;
-static int ett_btmesh_net_pdu = -1;
-static int ett_btmesh_transp_pdu = -1;
-static int ett_btmesh_transp_ctrl_msg = -1;
-static int ett_btmesh_upper_transp_acc_pdu = -1;
-static int ett_btmesh_segmented_access_fragments = -1;
-static int ett_btmesh_segmented_access_fragment = -1;
-static int ett_btmesh_segmented_control_fragments = -1;
-static int ett_btmesh_segmented_control_fragment = -1;
-static int ett_btmesh_access_pdu = -1;
-static int ett_btmesh_model_layer = -1;
-
-static int ett_btmesh_config_model_netapp_index = -1;
-static int ett_btmesh_config_model_publishperiod = -1;
-static int ett_btmesh_config_model_publishretransmit = -1;
-static int ett_btmesh_config_model_relayretransmit = -1;
-static int ett_btmesh_config_model_network_transmit = -1;
-static int ett_btmesh_config_model_element = -1;
-static int ett_btmesh_config_model_model = -1;
-static int ett_btmesh_config_model_vendor = -1;
-static int ett_btmesh_config_composition_data_status_features = -1;
-static int ett_btmesh_config_model_pub_app_index = -1;
-static int ett_btmesh_config_model_addresses = -1;
-static int ett_btmesh_config_model_netkey_list = -1;
-static int ett_btmesh_config_model_appkey_list = -1;
-static int ett_btmesh_config_model_net_index = -1;
-static int ett_btmesh_config_model_app_index = -1;
-static int ett_btmesh_config_heartbeat_publication_set_features = -1;
-static int ett_btmesh_config_heartbeat_publication_status_features = -1;
-static int ett_btmesh_config_model_fault_array = -1;
-static int ett_btmesh_scene_register_status_scenes = -1;
-static int ett_btmesh_scheduler_model_month = -1;
-static int ett_btmesh_scheduler_model_day_of_week = -1;
-static int ett_btmesh_scheduler_schedules = -1;
-static int ett_btmesh_user_property_ids = -1;
-static int ett_btmesh_admin_property_ids = -1;
-static int ett_btmesh_manufacturer_property_ids = -1;
-static int ett_btmesh_generic_client_property_ids = -1;
-static int ett_btmesh_sensor_setting_property_ids = -1;
-
-static expert_field ei_btmesh_not_decoded_yet = EI_INIT;
-static expert_field ei_btmesh_unknown_payload = EI_INIT;
+static int ett_btmesh;
+static int ett_btmesh_net_pdu;
+static int ett_btmesh_transp_pdu;
+static int ett_btmesh_transp_ctrl_msg;
+static int ett_btmesh_upper_transp_acc_pdu;
+static int ett_btmesh_segmented_access_fragments;
+static int ett_btmesh_segmented_access_fragment;
+static int ett_btmesh_segmented_control_fragments;
+static int ett_btmesh_segmented_control_fragment;
+static int ett_btmesh_access_pdu;
+static int ett_btmesh_model_layer;
+
+static int ett_btmesh_config_model_netapp_index;
+static int ett_btmesh_config_model_publishperiod;
+static int ett_btmesh_config_model_publishretransmit;
+static int ett_btmesh_config_model_relayretransmit;
+static int ett_btmesh_config_model_network_transmit;
+static int ett_btmesh_config_model_element;
+static int ett_btmesh_config_model_model;
+static int ett_btmesh_config_model_vendor;
+static int ett_btmesh_config_composition_data_status_features;
+static int ett_btmesh_config_model_pub_app_index;
+static int ett_btmesh_config_model_addresses;
+static int ett_btmesh_config_model_netkey_list;
+static int ett_btmesh_config_model_appkey_list;
+static int ett_btmesh_config_model_net_index;
+static int ett_btmesh_config_model_app_index;
+static int ett_btmesh_config_heartbeat_publication_set_features;
+static int ett_btmesh_config_heartbeat_publication_status_features;
+static int ett_btmesh_config_model_fault_array;
+static int ett_btmesh_scene_register_status_scenes;
+static int ett_btmesh_scheduler_model_month;
+static int ett_btmesh_scheduler_model_day_of_week;
+static int ett_btmesh_scheduler_schedules;
+static int ett_btmesh_user_property_ids;
+static int ett_btmesh_admin_property_ids;
+static int ett_btmesh_manufacturer_property_ids;
+static int ett_btmesh_generic_client_property_ids;
+static int ett_btmesh_sensor_setting_property_ids;
+
+static expert_field ei_btmesh_not_decoded_yet;
+static expert_field ei_btmesh_unknown_payload;
 
 static const value_string btmesh_ctl_vals[] = {
     { 0, "Access Message" },
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c
index 6e90c9e38a..a05c5a4702 100644
--- a/epan/dissectors/packet-btrfcomm.c
+++ b/epan/dissectors/packet-btrfcomm.c
@@ -31,82 +31,82 @@
 #include "packet-btl2cap.h"
 #include "packet-btrfcomm.h"
 
-static int hf_pf = -1;
-static int hf_ea = -1;
-static int hf_len = -1;
-static int hf_frame_type = -1;
-static int hf_cr = -1;
-static int hf_dlci = -1;
-static int hf_channel = -1;
-static int hf_direction = -1;
-static int hf_priority = -1;
-static int hf_error_recovery_mode = -1;
-static int hf_max_frame_size = -1;
-static int hf_max_retrans = -1;
-static int hf_fc_credits = -1;
-
-static int hf_mcc_pn_parameters = -1;
-static int hf_pn_i14 = -1;
-static int hf_pn_c14 = -1;
-
-static int hf_mcc = -1;
-static int hf_mcc_types = -1;
-static int hf_mcc_len = -1;
-static int hf_mcc_ea = -1;
-static int hf_mcc_cr = -1;
-static int hf_mcc_cmd = -1;
-
-static int hf_msc_parameters = -1;
-static int hf_msc_fc = -1;
-static int hf_msc_rtc = -1;
-static int hf_msc_rtr = -1;
-static int hf_msc_ic = -1;
-static int hf_msc_dv = -1;
-static int hf_msc_l = -1;
-static int hf_msc_break_bits = -1;
-
-static int hf_fcs = -1;
-
-static int hf_dun_at_cmd = -1;
-static int hf_spp_data = -1;
-static int hf_gnss_data = -1;
-
-static int hf_mcc_dlci = -1;
-static int hf_mcc_channel = -1;
-static int hf_mcc_direction = -1;
-static int hf_mcc_const_1 = -1;
-
-static int hf_mcc_pn_dlci = -1;
-static int hf_mcc_pn_channel = -1;
-static int hf_mcc_pn_direction = -1;
-static int hf_mcc_pn_zeros_padding = -1;
-
-static int hf_acknowledgement_timer_t1 = -1;
-static int hf_address = -1;
-static int hf_control = -1;
+static int hf_pf;
+static int hf_ea;
+static int hf_len;
+static int hf_frame_type;
+static int hf_cr;
+static int hf_dlci;
+static int hf_channel;
+static int hf_direction;
+static int hf_priority;
+static int hf_error_recovery_mode;
+static int hf_max_frame_size;
+static int hf_max_retrans;
+static int hf_fc_credits;
+
+static int hf_mcc_pn_parameters;
+static int hf_pn_i14;
+static int hf_pn_c14;
+
+static int hf_mcc;
+static int hf_mcc_types;
+static int hf_mcc_len;
+static int hf_mcc_ea;
+static int hf_mcc_cr;
+static int hf_mcc_cmd;
+
+static int hf_msc_parameters;
+static int hf_msc_fc;
+static int hf_msc_rtc;
+static int hf_msc_rtr;
+static int hf_msc_ic;
+static int hf_msc_dv;
+static int hf_msc_l;
+static int hf_msc_break_bits;
+
+static int hf_fcs;
+
+static int hf_dun_at_cmd;
+static int hf_spp_data;
+static int hf_gnss_data;
+
+static int hf_mcc_dlci;
+static int hf_mcc_channel;
+static int hf_mcc_direction;
+static int hf_mcc_const_1;
+
+static int hf_mcc_pn_dlci;
+static int hf_mcc_pn_channel;
+static int hf_mcc_pn_direction;
+static int hf_mcc_pn_zeros_padding;
+
+static int hf_acknowledgement_timer_t1;
+static int hf_address;
+static int hf_control;
 
 /* Initialize the protocol and registered fields */
-int proto_btrfcomm = -1;
-static int proto_btdun = -1;
-static int proto_btspp = -1;
-static int proto_btgnss = -1;
+int proto_btrfcomm;
+static int proto_btdun;
+static int proto_btspp;
+static int proto_btgnss;
 
 /* Initialize the subtree pointers */
-static gint ett_btrfcomm = -1;
-static gint ett_btrfcomm_ctrl = -1;
-static gint ett_addr = -1;
-static gint ett_control = -1;
-static gint ett_mcc = -1;
-static gint ett_ctrl_pn_ci = -1;
-static gint ett_ctrl_pn_v24 = -1;
-static gint ett_dlci = -1;
-static gint ett_mcc_dlci = -1;
-
-static gint ett_btdun = -1;
-static gint ett_btspp = -1;
-static gint ett_btgnss = -1;
-
-static expert_field ei_btrfcomm_mcc_length_bad = EI_INIT;
+static gint ett_btrfcomm;
+static gint ett_btrfcomm_ctrl;
+static gint ett_addr;
+static gint ett_control;
+static gint ett_mcc;
+static gint ett_ctrl_pn_ci;
+static gint ett_ctrl_pn_v24;
+static gint ett_dlci;
+static gint ett_mcc_dlci;
+
+static gint ett_btdun;
+static gint ett_btspp;
+static gint ett_btgnss;
+
+static expert_field ei_btrfcomm_mcc_length_bad;
 
 static dissector_handle_t btrfcomm_handle;
 static dissector_handle_t btdun_handle;
diff --git a/epan/dissectors/packet-btsap.c b/epan/dissectors/packet-btsap.c
index d0f098ac52..4b93f29732 100644
--- a/epan/dissectors/packet-btsap.c
+++ b/epan/dissectors/packet-btsap.c
@@ -37,35 +37,35 @@ enum {
     PARAMETER_COMMAND_APDU_7816            = 0x10
 };
 
-static int proto_btsap                                                     = -1;
-static int hf_btsap_header_msg_id                                          = -1;
-static int hf_btsap_header_number_of_parameters                            = -1;
-static int hf_btsap_header_reserved                                        = -1;
-static int hf_btsap_parameter                                              = -1;
-static int hf_btsap_parameter_id                                           = -1;
-static int hf_btsap_parameter_reserved                                     = -1;
-static int hf_btsap_parameter_length                                       = -1;
-static int hf_btsap_parameter_padding                                      = -1;
-static int hf_btsap_parameter_max_msg_size                                 = -1;
-static int hf_btsap_parameter_connection_status                            = -1;
-static int hf_btsap_parameter_result_code                                  = -1;
-static int hf_btsap_parameter_disconnection_type                           = -1;
-static int hf_btsap_parameter_status_change                                = -1;
-static int hf_btsap_parameter_transport_protocol                           = -1;
-static int hf_btsap_parameter_card_reader_status_card_reader_identity      = -1;
-static int hf_btsap_parameter_card_reader_status_card_reader_removable     = -1;
-static int hf_btsap_parameter_card_reader_status_card_reader_present       = -1;
-static int hf_btsap_parameter_card_reader_status_card_reader_present_lower = -1;
-static int hf_btsap_parameter_card_reader_status_card_present              = -1;
-static int hf_btsap_parameter_card_reader_status_card_powered              = -1;
-
-static int hf_btsap_data                                                   = -1;
-
-static gint ett_btsap                                                      = -1;
-static gint ett_btsap_parameter                                            = -1;
-
-static expert_field ei_btsap_parameter_error = EI_INIT;
-static expert_field ei_unexpected_data = EI_INIT;
+static int proto_btsap;
+static int hf_btsap_header_msg_id;
+static int hf_btsap_header_number_of_parameters;
+static int hf_btsap_header_reserved;
+static int hf_btsap_parameter;
+static int hf_btsap_parameter_id;
+static int hf_btsap_parameter_reserved;
+static int hf_btsap_parameter_length;
+static int hf_btsap_parameter_padding;
+static int hf_btsap_parameter_max_msg_size;
+static int hf_btsap_parameter_connection_status;
+static int hf_btsap_parameter_result_code;
+static int hf_btsap_parameter_disconnection_type;
+static int hf_btsap_parameter_status_change;
+static int hf_btsap_parameter_transport_protocol;
+static int hf_btsap_parameter_card_reader_status_card_reader_identity;
+static int hf_btsap_parameter_card_reader_status_card_reader_removable;
+static int hf_btsap_parameter_card_reader_status_card_reader_present;
+static int hf_btsap_parameter_card_reader_status_card_reader_present_lower;
+static int hf_btsap_parameter_card_reader_status_card_present;
+static int hf_btsap_parameter_card_reader_status_card_powered;
+
+static int hf_btsap_data;
+
+static gint ett_btsap;
+static gint ett_btsap_parameter;
+
+static expert_field ei_btsap_parameter_error;
+static expert_field ei_unexpected_data;
 
 static gint top_dissect = TOP_DISSECT_INTERNAL;
 
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c
index d3b9692b97..d82ae9baca 100644
--- a/epan/dissectors/packet-btsdp.c
+++ b/epan/dissectors/packet-btsdp.c
@@ -28,415 +28,415 @@
 #include "packet-btsdp.h"
 #include "packet-btl2cap.h"
 
-static gint proto_btsdp                                                    = -1;
-
-static gint hf_pdu_id                                                      = -1;
-static gint hf_tid                                                         = -1;
-static gint hf_parameter_length                                            = -1;
-static gint hf_ssr_total_count                                             = -1;
-static gint hf_ssr_current_count                                           = -1;
-static gint hf_error_code                                                  = -1;
-static gint hf_attribute_id_list                                           = -1;
-static gint hf_attribute_id_range                                          = -1;
-static gint hf_attribute_id_range_from                                     = -1;
-static gint hf_attribute_id_range_to                                       = -1;
-static gint hf_attribute_list_byte_count                                   = -1;
-static gint hf_maximum_service_record_count                                = -1;
-static gint hf_maximum_attribute_byte_count                                = -1;
-static gint hf_continuation_state                                          = -1;
-static gint hf_continuation_state_length                                   = -1;
-static gint hf_continuation_state_value                                    = -1;
-static gint hf_fragment                                                    = -1;
-static gint hf_partial_record_handle_list                                  = -1;
-static gint hf_reassembled_record_handle_list                              = -1;
-static gint hf_partial_attribute_list                                      = -1;
-static gint hf_reassembled_attribute_list                                  = -1;
-static gint hf_data_element                                                = -1;
-static gint hf_data_element_size                                           = -1;
-static gint hf_data_element_type                                           = -1;
-static gint hf_data_element_var_size                                       = -1;
-static gint hf_data_element_value                                          = -1;
-static gint hf_data_element_value_nil                                      = -1;
-static gint hf_data_element_value_boolean                                  = -1;
-static gint hf_data_element_value_signed_int                               = -1;
-static gint hf_data_element_value_unsigned_int                             = -1;
-static gint hf_data_element_value_uuid_16                                  = -1;
-static gint hf_data_element_value_uuid_32                                  = -1;
-static gint hf_data_element_value_uuid_128                                 = -1;
-static gint hf_data_element_value_uuid                                     = -1;
-static gint hf_data_element_value_string                                   = -1;
-static gint hf_data_element_value_url                                      = -1;
-static gint hf_data_element_value_alternative                              = -1;
-static gint hf_data_element_value_sequence                                 = -1;
-static gint hf_profile_descriptor_list                                     = -1;
-static gint hf_attribute_list                                              = -1;
-static gint hf_attribute_lists                                             = -1;
-static gint hf_service_search_pattern                                      = -1;
-static gint hf_service_record_handle_list                                  = -1;
-static gint hf_service_attribute                                           = -1;
-static gint hf_service_attribute_id                                        = -1;
-static gint hf_service_attribute_value                                     = -1;
-static gint hf_service_attribute_id_generic                                = -1;
-static gint hf_service_attribute_id_a2dp                                   = -1;
-static gint hf_service_attribute_id_avrcp                                  = -1;
-static gint hf_service_attribute_id_ctp                                    = -1;
-static gint hf_service_attribute_id_bip_imaging_responder                  = -1;
-static gint hf_service_attribute_id_bip_imaging_other                      = -1;
-static gint hf_service_attribute_id_bpp                                    = -1;
-static gint hf_service_attribute_id_bpp_rui                                = -1;
-static gint hf_service_attribute_id_did                                    = -1;
-static gint hf_service_attribute_id_dun                                    = -1;
-static gint hf_service_attribute_id_fax                                    = -1;
-static gint hf_service_attribute_id_ftp                                    = -1;
-static gint hf_service_attribute_id_gnss                                   = -1;
-static gint hf_service_attribute_id_hfp_hf                                 = -1;
-static gint hf_service_attribute_id_hfp_ag                                 = -1;
-static gint hf_service_attribute_id_hcrp                                   = -1;
-static gint hf_service_attribute_id_hsp                                    = -1;
-static gint hf_service_attribute_id_hdp                                    = -1;
-static gint hf_service_attribute_id_hid                                    = -1;
-static gint hf_service_attribute_id_wap                                    = -1;
-static gint hf_service_attribute_id_map_mas                                = -1;
-static gint hf_service_attribute_id_map_mns                                = -1;
-static gint hf_service_attribute_id_opp                                    = -1;
-static gint hf_service_attribute_id_pan_nap                                = -1;
-static gint hf_service_attribute_id_pan_gn                                 = -1;
-static gint hf_service_attribute_id_pan_panu                               = -1;
-static gint hf_service_attribute_id_pbap                                   = -1;
-static gint hf_service_attribute_id_synch                                  = -1;
-static gint hf_service_attribute_id_ctn_as                                 = -1;
-static gint hf_service_attribute_id_ctn_ns                                 = -1;
-static gint hf_service_attribute_id_mps                                    = -1;
-static gint hf_did_specification_id                                        = -1;
-static gint hf_did_vendor_id                                               = -1;
-static gint hf_did_vendor_id_bluetooth_sig                                 = -1;
-static gint hf_did_vendor_id_usb_forum                                     = -1;
-static gint hf_did_product_id                                              = -1;
-static gint hf_did_primary_record                                          = -1;
-static gint hf_did_version                                                 = -1;
-static gint hf_did_vendor_id_source                                        = -1;
-static gint hf_a2dp_sink_supported_features_reserved                       = -1;
-static gint hf_a2dp_sink_supported_features_amplifier                      = -1;
-static gint hf_a2dp_sink_supported_features_recorder                       = -1;
-static gint hf_a2dp_sink_supported_features_speaker                        = -1;
-static gint hf_a2dp_sink_supported_features_headphone                      = -1;
-static gint hf_a2dp_source_supported_features_reserved                     = -1;
-static gint hf_a2dp_source_supported_features_mixer                        = -1;
-static gint hf_a2dp_source_supported_features_tuner                        = -1;
-static gint hf_a2dp_source_supported_features_microphone                   = -1;
-static gint hf_a2dp_source_supported_features_player                       = -1;
-static gint hf_synch_supported_data_store                                  = -1;
-static gint hf_ctp_external_network                                        = -1;
-static gint hf_avrcp_ct_supported_features_reserved_10_15                  = -1;
-static gint hf_avrcp_ct_supported_features_cover_art_get_linked_thumbnail  = -1;
-static gint hf_avrcp_ct_supported_features_cover_art_get_image             = -1;
-static gint hf_avrcp_ct_supported_features_cover_art_get_image_properties  = -1;
-static gint hf_avrcp_ct_supported_features_browsing                        = -1;
-static gint hf_avrcp_ct_supported_features_reserved_4_5                    = -1;
-static gint hf_avrcp_ct_supported_features_category_4                      = -1;
-static gint hf_avrcp_ct_supported_features_category_3                      = -1;
-static gint hf_avrcp_ct_supported_features_category_2                      = -1;
-static gint hf_avrcp_ct_supported_features_category_1                      = -1;
-static gint hf_avrcp_tg_supported_features_reserved_9_15                   = -1;
-static gint hf_avrcp_tg_supported_features_cover_art                       = -1;
-static gint hf_avrcp_tg_supported_features_multiple_player                 = -1;
-static gint hf_avrcp_tg_supported_features_browsing                        = -1;
-static gint hf_avrcp_tg_supported_features_group_navigation                = -1;
-static gint hf_avrcp_tg_supported_features_settings                        = -1;
-static gint hf_avrcp_tg_supported_features_category_4                      = -1;
-static gint hf_avrcp_tg_supported_features_category_3                      = -1;
-static gint hf_avrcp_tg_supported_features_category_2                      = -1;
-static gint hf_avrcp_tg_supported_features_category_1                      = -1;
-static gint hf_hsp_remote_audio_volume_control                             = -1;
-static gint hf_gnss_supported_features                                     = -1;
-static gint hf_pbap_pse_supported_repositories                             = -1;
-static gint hf_pbap_pse_supported_repositories_reserved                    = -1;
-static gint hf_pbap_pse_supported_repositories_favourites                  = -1;
-static gint hf_pbap_pse_supported_repositories_speed_dial                  = -1;
-static gint hf_pbap_pse_supported_repositories_sim_card                    = -1;
-static gint hf_pbap_pse_supported_repositories_local_phonebook             = -1;
-static gint hf_fax_support_class_1                                         = -1;
-static gint hf_fax_support_class_2                                         = -1;
-static gint hf_fax_support_class_2_vendor                                  = -1;
-static gint hf_fax_support_audio_feedback                                  = -1;
-static gint hf_ftp_goep_l2cap_psm                                          = -1;
-static gint hf_map_mas_instance_id                                         = -1;
-static gint hf_map_mas_supported_message_types_reserved                    = -1;
-static gint hf_map_mas_supported_message_types_mms                         = -1;
-static gint hf_map_mas_supported_message_types_sms_cdma                    = -1;
-static gint hf_map_mas_supported_message_types_sms_gsm                     = -1;
-static gint hf_map_mas_supported_message_types_email                       = -1;
-static gint hf_hcrp_1284_id                                                = -1;
-static gint hf_hcrp_device_location                                        = -1;
-static gint hf_hcrp_device_name                                            = -1;
-static gint hf_hcrp_friendly_name                                          = -1;
-static gint hf_wap_network_address                                         = -1;
-static gint hf_wap_gateway                                                 = -1;
-static gint hf_wap_homepage_url                                            = -1;
-static gint hf_wap_stack_type                                              = -1;
-static gint hf_hdp_data_exchange                                           = -1;
-static gint hf_hdp_support_procedure_reserved_5_7                          = -1;
-static gint hf_hdp_support_procedure_sync_master_role                      = -1;
-static gint hf_hdp_support_procedure_clock_synchronization_protocol        = -1;
-static gint hf_hdp_support_procedure_reconnect_acceptance                  = -1;
-static gint hf_hdp_support_procedure_reconnect_initiation                  = -1;
-static gint hf_hdp_support_procedure_reserved                              = -1;
-static gint hf_hdp_supported_features_data                                 = -1;
-static gint hf_hdp_supported_features_data_mdep_id                         = -1;
-static gint hf_hdp_supported_features_data_mdep_data_type                  = -1;
-static gint hf_hdp_supported_features_data_mdep_role                       = -1;
-static gint hf_hdp_supported_features_data_mdep_description                = -1;
-static gint hf_hdp_supported_features_mdep_id                              = -1;
-static gint hf_hdp_supported_features_mdep_data_type                       = -1;
-static gint hf_hdp_supported_features_mdep_data_type_01                    = -1;
-static gint hf_hdp_supported_features_mdep_role                            = -1;
-static gint hf_hdp_supported_features_mdep_description                     = -1;
-static gint hf_pan_sercurity_description                                   = -1;
-static gint hf_pan_ipv4_subnet                                             = -1;
-static gint hf_pan_ipv6_subnet                                             = -1;
-static gint hf_pan_max_net_access_rate                                     = -1;
-static gint hf_pan_net_access_type                                         = -1;
-static gint hf_opp_goep_l2cap_psm                                          = -1;
-static gint hf_opp_supported_format                                        = -1;
-static gint hf_dun_escape_sequence                                         = -1;
-static gint hf_dun_support_audio_feedback                                  = -1;
-static gint hf_hfp_hf_supported_features_reserved                          = -1;
-static gint hf_hfp_hf_supported_features_wide_band_speech                  = -1;
-static gint hf_hfp_hf_supported_features_remote_volume_control             = -1;
-static gint hf_hfp_hf_supported_features_voice_recognition_activation      = -1;
-static gint hf_hfp_hf_supported_features_cli_presentation_capability       = -1;
-static gint hf_hfp_hf_supported_features_call_waiting_or_three_way_calling = -1;
-static gint hf_hfp_hf_supported_features_ec_and_or_nr_function             = -1;
-static gint hf_hfp_gw_network                                              = -1;
-static gint hf_hfp_gw_supported_features_reserved                          = -1;
-static gint hf_hfp_gw_supported_features_wide_band_speech                  = -1;
-static gint hf_hfp_gw_supported_features_attach_phone_number_to_voice_tag  = -1;
-static gint hf_hfp_gw_supported_features_inband_ring_tone_capability       = -1;
-static gint hf_hfp_gw_supported_features_voice_recognition_function        = -1;
-static gint hf_hfp_gw_supported_features_ec_and_or_nr_function             = -1;
-static gint hf_hfp_gw_supported_features_three_way_calling                 = -1;
-static gint hf_sdp_protocol_item                                           = -1;
-static gint hf_sdp_protocol                                                = -1;
-static gint hf_sdp_protocol_psm                                            = -1;
-static gint hf_sdp_protocol_channel                                        = -1;
-static gint hf_sdp_protocol_gatt_handle_start                              = -1;
-static gint hf_sdp_protocol_gatt_handle_end                                = -1;
-static gint hf_sdp_protocol_version                                        = -1;
-static gint hf_sdp_protocol_bnep_type                                      = -1;
-static gint hf_sdp_service_record_handle                                   = -1;
-static gint hf_sdp_service_record_state                                    = -1;
-static gint hf_sdp_service_info_time_to_live                               = -1;
-static gint hf_sdp_service_availability                                    = -1;
-static gint hf_sdp_service_documentation_url                               = -1;
-static gint hf_sdp_service_client_executable_url                           = -1;
-static gint hf_sdp_service_icon_url                                        = -1;
-static gint hf_sdp_service_name                                            = -1;
-static gint hf_sdp_service_description                                     = -1;
-static gint hf_sdp_service_provider_name                                   = -1;
-static gint hf_sdp_lang                                                    = -1;
-static gint hf_sdp_lang_id                                                 = -1;
-static gint hf_sdp_lang_code                                               = -1;
-static gint hf_sdp_lang_encoding                                           = -1;
-static gint hf_sdp_lang_attribute_base                                     = -1;
-static gint hf_hid_descriptor_list_descriptor_data                         = -1;
-static gint hf_hid_lang                                                    = -1;
-static gint hf_hid_device_release_number                                   = -1;
-static gint hf_hid_parser_version                                          = -1;
-static gint hf_hid_device_subclass_type                                    = -1;
-static gint hf_hid_device_subclass_subtype                                 = -1;
-static gint hf_hid_device_subclass_reserved                                = -1;
-static gint hf_hid_country_code                                            = -1;
-static gint hf_hid_virtual_cable                                           = -1;
-static gint hf_hid_reconnect_initiate                                      = -1;
-static gint hf_hid_sdp_disable                                             = -1;
-static gint hf_hid_battery_power                                           = -1;
-static gint hf_hid_remote_wake                                             = -1;
-static gint hf_hid_profile_version                                         = -1;
-static gint hf_hid_supervision_timeout                                     = -1;
-static gint hf_hid_normally_connectable                                    = -1;
-static gint hf_hid_boot_device                                             = -1;
-static gint hf_hid_ssr_host_max_latency                                    = -1;
-static gint hf_hid_ssr_host_min_timeout                                    = -1;
-static gint hf_hid_descriptor_list_type                                    = -1;
-static gint hf_hid_descriptor_list_descriptor                              = -1;
-static gint hf_bip_goep_l2cap_psm                                          = -1;
-static gint hf_bip_supported_capabilities_reserved_4_7                     = -1;
-static gint hf_bip_supported_capabilities_displaying                       = -1;
-static gint hf_bip_supported_capabilities_printing                         = -1;
-static gint hf_bip_supported_capabilities_capturing                        = -1;
-static gint hf_bip_supported_capabilities_genering_imaging                 = -1;
-static gint hf_bip_supported_features_reserved_9_15                        = -1;
-static gint hf_bip_supported_features_remote_display                       = -1;
-static gint hf_bip_supported_features_remote_camera                        = -1;
-static gint hf_bip_supported_features_automatic_archive                    = -1;
-static gint hf_bip_supported_features_advanced_image_printing              = -1;
-static gint hf_bip_supported_features_image_pull                           = -1;
-static gint hf_bip_supported_features_image_push_display                   = -1;
-static gint hf_bip_supported_features_image_push_print                     = -1;
-static gint hf_bip_supported_features_image_push_store                     = -1;
-static gint hf_bip_supported_features_image_push                           = -1;
-static gint hf_bip_supported_functions_reserved_17_31                      = -1;
-static gint hf_bip_supported_functions_get_status                          = -1;
-static gint hf_bip_supported_functions_reserved_15                         = -1;
-static gint hf_bip_supported_functions_get_monitoring_image                = -1;
-static gint hf_bip_supported_functions_start_archive                       = -1;
-static gint hf_bip_supported_functions_reserved_12                         = -1;
-static gint hf_bip_supported_functions_start_print                         = -1;
-static gint hf_bip_supported_functions_delete_image                        = -1;
-static gint hf_bip_supported_functions_get_linked_attachment               = -1;
-static gint hf_bip_supported_functions_get_linked_thumbnail                = -1;
-static gint hf_bip_supported_functions_get_image                           = -1;
-static gint hf_bip_supported_functions_get_image_property                  = -1;
-static gint hf_bip_supported_functions_get_images_list                     = -1;
-static gint hf_bip_supported_functions_remote_display                      = -1;
-static gint hf_bip_supported_functions_put_linked_thumbnail                = -1;
-static gint hf_bip_supported_functions_put_linked_attachment               = -1;
-static gint hf_bip_supported_functions_put_image                           = -1;
-static gint hf_bip_supported_functions_get_capabilities                    = -1;
-static gint hf_bip_supported_functions_reserved_13_31                      = -1;
-static gint hf_bip_supported_functions_get_partial_image                   = -1;
-static gint hf_bip_supported_functions_reserved_1_11                       = -1;
-static gint hf_bip_supported_functions_reserved_1_4                        = -1;
-static gint hf_bip_supported_functions_reserved_11_31                      = -1;
-static gint hf_bip_total_imaging_data_capacity                             = -1;
-static gint hf_bpp_document_formats_supported                              = -1;
-static gint hf_bpp_character_repertoires_support                           = -1;
-static gint hf_bpp_xhtml_print_image_formats_supported                     = -1;
-static gint hf_bpp_color_supported                                         = -1;
-static gint hf_bpp_1284_id                                                 = -1;
-static gint hf_bpp_printer_name                                            = -1;
-static gint hf_bpp_printer_location                                        = -1;
-static gint hf_bpp_duplex_supported                                        = -1;
-static gint hf_bpp_media_types_supported                                   = -1;
-static gint hf_bpp_max_media_width                                         = -1;
-static gint hf_bpp_max_media_length                                        = -1;
-static gint hf_bpp_enhanced_layout_supported                               = -1;
-static gint hf_bpp_rui_formats_supported                                   = -1;
-static gint hf_bpp_reference_printing_rui_supported                        = -1;
-static gint hf_bpp_direct_printing_rui_supported                           = -1;
-static gint hf_bpp_reference_printing_top_url                              = -1;
-static gint hf_bpp_direct_printing_top_url                                 = -1;
-static gint hf_bpp_device_name                                             = -1;
-static gint hf_bpp_printer_admin_rui_top_url                               = -1;
-static gint hf_ctn_instance_id                                             = -1;
-static gint hf_ctn_supported_features                                      = -1;
-static gint hf_ctn_supported_features_reserved                             = -1;
-static gint hf_ctn_supported_features_forward                              = -1;
-static gint hf_ctn_supported_features_delete                               = -1;
-static gint hf_ctn_supported_features_uploading                            = -1;
-static gint hf_ctn_supported_features_downloading                          = -1;
-static gint hf_ctn_supported_features_browsing                             = -1;
-static gint hf_ctn_supported_features_notification                         = -1;
-static gint hf_ctn_supported_features_account_management                   = -1;
-static gint hf_mps_mpsd_scenarios                                          = -1;
-static gint hf_mps_mpsd_scenarios_reserved                                 = -1;
-static gint hf_mps_mpsd_scenarios_37                                       = -1;
-static gint hf_mps_mpsd_scenarios_36                                       = -1;
-static gint hf_mps_mpsd_scenarios_35                                       = -1;
-static gint hf_mps_mpsd_scenarios_34                                       = -1;
-static gint hf_mps_mpsd_scenarios_33                                       = -1;
-static gint hf_mps_mpsd_scenarios_32                                       = -1;
-static gint hf_mps_mpsd_scenarios_31                                       = -1;
-static gint hf_mps_mpsd_scenarios_30                                       = -1;
-static gint hf_mps_mpsd_scenarios_29                                       = -1;
-static gint hf_mps_mpsd_scenarios_28                                       = -1;
-static gint hf_mps_mpsd_scenarios_27                                       = -1;
-static gint hf_mps_mpsd_scenarios_26                                       = -1;
-static gint hf_mps_mpsd_scenarios_25                                       = -1;
-static gint hf_mps_mpsd_scenarios_24                                       = -1;
-static gint hf_mps_mpsd_scenarios_23                                       = -1;
-static gint hf_mps_mpsd_scenarios_22                                       = -1;
-static gint hf_mps_mpsd_scenarios_21                                       = -1;
-static gint hf_mps_mpsd_scenarios_20                                       = -1;
-static gint hf_mps_mpsd_scenarios_19                                       = -1;
-static gint hf_mps_mpsd_scenarios_18                                       = -1;
-static gint hf_mps_mpsd_scenarios_17                                       = -1;
-static gint hf_mps_mpsd_scenarios_16                                       = -1;
-static gint hf_mps_mpsd_scenarios_15                                       = -1;
-static gint hf_mps_mpsd_scenarios_14                                       = -1;
-static gint hf_mps_mpsd_scenarios_13                                       = -1;
-static gint hf_mps_mpsd_scenarios_12                                       = -1;
-static gint hf_mps_mpsd_scenarios_11                                       = -1;
-static gint hf_mps_mpsd_scenarios_10                                       = -1;
-static gint hf_mps_mpsd_scenarios_9                                        = -1;
-static gint hf_mps_mpsd_scenarios_8                                        = -1;
-static gint hf_mps_mpsd_scenarios_7                                        = -1;
-static gint hf_mps_mpsd_scenarios_6                                        = -1;
-static gint hf_mps_mpsd_scenarios_5                                        = -1;
-static gint hf_mps_mpsd_scenarios_4                                        = -1;
-static gint hf_mps_mpsd_scenarios_3                                        = -1;
-static gint hf_mps_mpsd_scenarios_2                                        = -1;
-static gint hf_mps_mpsd_scenarios_1                                        = -1;
-static gint hf_mps_mpsd_scenarios_0                                        = -1;
-static gint hf_mps_mpmd_scenarios                                          = -1;
-static gint hf_mps_mpmd_scenarios_reserved                                 = -1;
-static gint hf_mps_mpmd_scenarios_18                                       = -1;
-static gint hf_mps_mpmd_scenarios_17                                       = -1;
-static gint hf_mps_mpmd_scenarios_16                                       = -1;
-static gint hf_mps_mpmd_scenarios_15                                       = -1;
-static gint hf_mps_mpmd_scenarios_14                                       = -1;
-static gint hf_mps_mpmd_scenarios_13                                       = -1;
-static gint hf_mps_mpmd_scenarios_12                                       = -1;
-static gint hf_mps_mpmd_scenarios_11                                       = -1;
-static gint hf_mps_mpmd_scenarios_10                                       = -1;
-static gint hf_mps_mpmd_scenarios_9                                        = -1;
-static gint hf_mps_mpmd_scenarios_8                                        = -1;
-static gint hf_mps_mpmd_scenarios_7                                        = -1;
-static gint hf_mps_mpmd_scenarios_6                                        = -1;
-static gint hf_mps_mpmd_scenarios_5                                        = -1;
-static gint hf_mps_mpmd_scenarios_4                                        = -1;
-static gint hf_mps_mpmd_scenarios_3                                        = -1;
-static gint hf_mps_mpmd_scenarios_2                                        = -1;
-static gint hf_mps_mpmd_scenarios_1                                        = -1;
-static gint hf_mps_mpmd_scenarios_0                                        = -1;
-static gint hf_mps_supported_profile_and_protocol_dependency               = -1;
-static gint hf_mps_supported_profile_and_protocol_dependency_reserved                       = -1;
-static gint hf_mps_supported_profile_and_protocol_dependency_dis_connection_order_behaviour = -1;
-static gint hf_mps_supported_profile_and_protocol_dependency_gavdp_requirements             = -1;
-static gint hf_mps_supported_profile_and_protocol_dependency_sniff_mode_during_streaming    = -1;
-static gint hf_map_mas_goep_l2cap_psm                                      = -1;
-static gint hf_map_mns_goep_l2cap_psm                                      = -1;
-static gint hf_map_supported_features                                      = -1;
-static gint hf_map_supported_features_reserved                             = -1;
-static gint hf_map_supported_features_extended_event_report_1_1            = -1;
-static gint hf_map_supported_features_instance_information_feature         = -1;
-static gint hf_map_supported_features_delete_feature                       = -1;
-static gint hf_map_supported_features_uploading_feature                    = -1;
-static gint hf_map_supported_features_browsing_feature                     = -1;
-static gint hf_map_supported_features_notification_feature                 = -1;
-static gint hf_map_supported_features_notification_registration_feature    = -1;
-static gint hf_pbap_pse_supported_features                                 = -1;
-static gint hf_pbap_pse_supported_features_reserved                        = -1;
-static gint hf_pbap_pse_supported_features_download                        = -1;
-static gint hf_pbap_pse_supported_features_browsing                        = -1;
-static gint hf_pbap_pse_supported_features_database_identifier             = -1;
-static gint hf_pbap_pse_supported_features_folder_version_counters         = -1;
-static gint hf_pbap_pse_supported_features_vcard_selecting                 = -1;
-static gint hf_pbap_pse_supported_features_enhanced_missed_calls           = -1;
-static gint hf_pbap_pse_supported_features_x_bt_uci_vcard_property         = -1;
-static gint hf_pbap_pse_supported_features_x_bt_uid_vcard_property         = -1;
-static gint hf_pbap_pse_supported_features_contact_referencing             = -1;
-static gint hf_pbap_pse_supported_features_default_contact_image_format    = -1;
-static gint hf_pbap_goep_l2cap_psm                                         = -1;
-
-static gint ett_btsdp                                     = -1;
-static gint ett_btsdp_ssr                                 = -1;
-static gint ett_btsdp_des                                 = -1;
-static gint ett_btsdp_attribute                           = -1;
-static gint ett_btsdp_attribute_id                        = -1;
-static gint ett_btsdp_attribute_value                     = -1;
-static gint ett_btsdp_attribute_idlist                    = -1;
-static gint ett_btsdp_service_search_pattern              = -1;
-static gint ett_btsdp_continuation_state                  = -1;
-static gint ett_btsdp_data_element                        = -1;
-static gint ett_btsdp_data_element_value                  = -1;
-static gint ett_btsdp_reassembled                         = -1;
-static gint ett_btsdp_supported_features                  = -1;
-static gint ett_btsdp_supported_features_mdep_id          = -1;
-static gint ett_btsdp_supported_features_mdep_data_type   = -1;
-static gint ett_btsdp_supported_features_mdep_role        = -1;
-static gint ett_btsdp_supported_features_mdep_description = -1;
-static gint ett_btsdp_protocol                            = -1;
+static gint proto_btsdp;
+
+static gint hf_pdu_id;
+static gint hf_tid;
+static gint hf_parameter_length;
+static gint hf_ssr_total_count;
+static gint hf_ssr_current_count;
+static gint hf_error_code;
+static gint hf_attribute_id_list;
+static gint hf_attribute_id_range;
+static gint hf_attribute_id_range_from;
+static gint hf_attribute_id_range_to;
+static gint hf_attribute_list_byte_count;
+static gint hf_maximum_service_record_count;
+static gint hf_maximum_attribute_byte_count;
+static gint hf_continuation_state;
+static gint hf_continuation_state_length;
+static gint hf_continuation_state_value;
+static gint hf_fragment;
+static gint hf_partial_record_handle_list;
+static gint hf_reassembled_record_handle_list;
+static gint hf_partial_attribute_list;
+static gint hf_reassembled_attribute_list;
+static gint hf_data_element;
+static gint hf_data_element_size;
+static gint hf_data_element_type;
+static gint hf_data_element_var_size;
+static gint hf_data_element_value;
+static gint hf_data_element_value_nil;
+static gint hf_data_element_value_boolean;
+static gint hf_data_element_value_signed_int;
+static gint hf_data_element_value_unsigned_int;
+static gint hf_data_element_value_uuid_16;
+static gint hf_data_element_value_uuid_32;
+static gint hf_data_element_value_uuid_128;
+static gint hf_data_element_value_uuid;
+static gint hf_data_element_value_string;
+static gint hf_data_element_value_url;
+static gint hf_data_element_value_alternative;
+static gint hf_data_element_value_sequence;
+static gint hf_profile_descriptor_list;
+static gint hf_attribute_list;
+static gint hf_attribute_lists;
+static gint hf_service_search_pattern;
+static gint hf_service_record_handle_list;
+static gint hf_service_attribute;
+static gint hf_service_attribute_id;
+static gint hf_service_attribute_value;
+static gint hf_service_attribute_id_generic;
+static gint hf_service_attribute_id_a2dp;
+static gint hf_service_attribute_id_avrcp;
+static gint hf_service_attribute_id_ctp;
+static gint hf_service_attribute_id_bip_imaging_responder;
+static gint hf_service_attribute_id_bip_imaging_other;
+static gint hf_service_attribute_id_bpp;
+static gint hf_service_attribute_id_bpp_rui;
+static gint hf_service_attribute_id_did;
+static gint hf_service_attribute_id_dun;
+static gint hf_service_attribute_id_fax;
+static gint hf_service_attribute_id_ftp;
+static gint hf_service_attribute_id_gnss;
+static gint hf_service_attribute_id_hfp_hf;
+static gint hf_service_attribute_id_hfp_ag;
+static gint hf_service_attribute_id_hcrp;
+static gint hf_service_attribute_id_hsp;
+static gint hf_service_attribute_id_hdp;
+static gint hf_service_attribute_id_hid;
+static gint hf_service_attribute_id_wap;
+static gint hf_service_attribute_id_map_mas;
+static gint hf_service_attribute_id_map_mns;
+static gint hf_service_attribute_id_opp;
+static gint hf_service_attribute_id_pan_nap;
+static gint hf_service_attribute_id_pan_gn;
+static gint hf_service_attribute_id_pan_panu;
+static gint hf_service_attribute_id_pbap;
+static gint hf_service_attribute_id_synch;
+static gint hf_service_attribute_id_ctn_as;
+static gint hf_service_attribute_id_ctn_ns;
+static gint hf_service_attribute_id_mps;
+static gint hf_did_specification_id;
+static gint hf_did_vendor_id;
+static gint hf_did_vendor_id_bluetooth_sig;
+static gint hf_did_vendor_id_usb_forum;
+static gint hf_did_product_id;
+static gint hf_did_primary_record;
+static gint hf_did_version;
+static gint hf_did_vendor_id_source;
+static gint hf_a2dp_sink_supported_features_reserved;
+static gint hf_a2dp_sink_supported_features_amplifier;
+static gint hf_a2dp_sink_supported_features_recorder;
+static gint hf_a2dp_sink_supported_features_speaker;
+static gint hf_a2dp_sink_supported_features_headphone;
+static gint hf_a2dp_source_supported_features_reserved;
+static gint hf_a2dp_source_supported_features_mixer;
+static gint hf_a2dp_source_supported_features_tuner;
+static gint hf_a2dp_source_supported_features_microphone;
+static gint hf_a2dp_source_supported_features_player;
+static gint hf_synch_supported_data_store;
+static gint hf_ctp_external_network;
+static gint hf_avrcp_ct_supported_features_reserved_10_15;
+static gint hf_avrcp_ct_supported_features_cover_art_get_linked_thumbnail;
+static gint hf_avrcp_ct_supported_features_cover_art_get_image;
+static gint hf_avrcp_ct_supported_features_cover_art_get_image_properties;
+static gint hf_avrcp_ct_supported_features_browsing;
+static gint hf_avrcp_ct_supported_features_reserved_4_5;
+static gint hf_avrcp_ct_supported_features_category_4;
+static gint hf_avrcp_ct_supported_features_category_3;
+static gint hf_avrcp_ct_supported_features_category_2;
+static gint hf_avrcp_ct_supported_features_category_1;
+static gint hf_avrcp_tg_supported_features_reserved_9_15;
+static gint hf_avrcp_tg_supported_features_cover_art;
+static gint hf_avrcp_tg_supported_features_multiple_player;
+static gint hf_avrcp_tg_supported_features_browsing;
+static gint hf_avrcp_tg_supported_features_group_navigation;
+static gint hf_avrcp_tg_supported_features_settings;
+static gint hf_avrcp_tg_supported_features_category_4;
+static gint hf_avrcp_tg_supported_features_category_3;
+static gint hf_avrcp_tg_supported_features_category_2;
+static gint hf_avrcp_tg_supported_features_category_1;
+static gint hf_hsp_remote_audio_volume_control;
+static gint hf_gnss_supported_features;
+static gint hf_pbap_pse_supported_repositories;
+static gint hf_pbap_pse_supported_repositories_reserved;
+static gint hf_pbap_pse_supported_repositories_favourites;
+static gint hf_pbap_pse_supported_repositories_speed_dial;
+static gint hf_pbap_pse_supported_repositories_sim_card;
+static gint hf_pbap_pse_supported_repositories_local_phonebook;
+static gint hf_fax_support_class_1;
+static gint hf_fax_support_class_2;
+static gint hf_fax_support_class_2_vendor;
+static gint hf_fax_support_audio_feedback;
+static gint hf_ftp_goep_l2cap_psm;
+static gint hf_map_mas_instance_id;
+static gint hf_map_mas_supported_message_types_reserved;
+static gint hf_map_mas_supported_message_types_mms;
+static gint hf_map_mas_supported_message_types_sms_cdma;
+static gint hf_map_mas_supported_message_types_sms_gsm;
+static gint hf_map_mas_supported_message_types_email;
+static gint hf_hcrp_1284_id;
+static gint hf_hcrp_device_location;
+static gint hf_hcrp_device_name;
+static gint hf_hcrp_friendly_name;
+static gint hf_wap_network_address;
+static gint hf_wap_gateway;
+static gint hf_wap_homepage_url;
+static gint hf_wap_stack_type;
+static gint hf_hdp_data_exchange;
+static gint hf_hdp_support_procedure_reserved_5_7;
+static gint hf_hdp_support_procedure_sync_master_role;
+static gint hf_hdp_support_procedure_clock_synchronization_protocol;
+static gint hf_hdp_support_procedure_reconnect_acceptance;
+static gint hf_hdp_support_procedure_reconnect_initiation;
+static gint hf_hdp_support_procedure_reserved;
+static gint hf_hdp_supported_features_data;
+static gint hf_hdp_supported_features_data_mdep_id;
+static gint hf_hdp_supported_features_data_mdep_data_type;
+static gint hf_hdp_supported_features_data_mdep_role;
+static gint hf_hdp_supported_features_data_mdep_description;
+static gint hf_hdp_supported_features_mdep_id;
+static gint hf_hdp_supported_features_mdep_data_type;
+static gint hf_hdp_supported_features_mdep_data_type_01;
+static gint hf_hdp_supported_features_mdep_role;
+static gint hf_hdp_supported_features_mdep_description;
+static gint hf_pan_sercurity_description;
+static gint hf_pan_ipv4_subnet;
+static gint hf_pan_ipv6_subnet;
+static gint hf_pan_max_net_access_rate;
+static gint hf_pan_net_access_type;
+static gint hf_opp_goep_l2cap_psm;
+static gint hf_opp_supported_format;
+static gint hf_dun_escape_sequence;
+static gint hf_dun_support_audio_feedback;
+static gint hf_hfp_hf_supported_features_reserved;
+static gint hf_hfp_hf_supported_features_wide_band_speech;
+static gint hf_hfp_hf_supported_features_remote_volume_control;
+static gint hf_hfp_hf_supported_features_voice_recognition_activation;
+static gint hf_hfp_hf_supported_features_cli_presentation_capability;
+static gint hf_hfp_hf_supported_features_call_waiting_or_three_way_calling;
+static gint hf_hfp_hf_supported_features_ec_and_or_nr_function;
+static gint hf_hfp_gw_network;
+static gint hf_hfp_gw_supported_features_reserved;
+static gint hf_hfp_gw_supported_features_wide_band_speech;
+static gint hf_hfp_gw_supported_features_attach_phone_number_to_voice_tag;
+static gint hf_hfp_gw_supported_features_inband_ring_tone_capability;
+static gint hf_hfp_gw_supported_features_voice_recognition_function;
+static gint hf_hfp_gw_supported_features_ec_and_or_nr_function;
+static gint hf_hfp_gw_supported_features_three_way_calling;
+static gint hf_sdp_protocol_item;
+static gint hf_sdp_protocol;
+static gint hf_sdp_protocol_psm;
+static gint hf_sdp_protocol_channel;
+static gint hf_sdp_protocol_gatt_handle_start;
+static gint hf_sdp_protocol_gatt_handle_end;
+static gint hf_sdp_protocol_version;
+static gint hf_sdp_protocol_bnep_type;
+static gint hf_sdp_service_record_handle;
+static gint hf_sdp_service_record_state;
+static gint hf_sdp_service_info_time_to_live;
+static gint hf_sdp_service_availability;
+static gint hf_sdp_service_documentation_url;
+static gint hf_sdp_service_client_executable_url;
+static gint hf_sdp_service_icon_url;
+static gint hf_sdp_service_name;
+static gint hf_sdp_service_description;
+static gint hf_sdp_service_provider_name;
+static gint hf_sdp_lang;
+static gint hf_sdp_lang_id;
+static gint hf_sdp_lang_code;
+static gint hf_sdp_lang_encoding;
+static gint hf_sdp_lang_attribute_base;
+static gint hf_hid_descriptor_list_descriptor_data;
+static gint hf_hid_lang;
+static gint hf_hid_device_release_number;
+static gint hf_hid_parser_version;
+static gint hf_hid_device_subclass_type;
+static gint hf_hid_device_subclass_subtype;
+static gint hf_hid_device_subclass_reserved;
+static gint hf_hid_country_code;
+static gint hf_hid_virtual_cable;
+static gint hf_hid_reconnect_initiate;
+static gint hf_hid_sdp_disable;
+static gint hf_hid_battery_power;
+static gint hf_hid_remote_wake;
+static gint hf_hid_profile_version;
+static gint hf_hid_supervision_timeout;
+static gint hf_hid_normally_connectable;
+static gint hf_hid_boot_device;
+static gint hf_hid_ssr_host_max_latency;
+static gint hf_hid_ssr_host_min_timeout;
+static gint hf_hid_descriptor_list_type;
+static gint hf_hid_descriptor_list_descriptor;
+static gint hf_bip_goep_l2cap_psm;
+static gint hf_bip_supported_capabilities_reserved_4_7;
+static gint hf_bip_supported_capabilities_displaying;
+static gint hf_bip_supported_capabilities_printing;
+static gint hf_bip_supported_capabilities_capturing;
+static gint hf_bip_supported_capabilities_genering_imaging;
+static gint hf_bip_supported_features_reserved_9_15;
+static gint hf_bip_supported_features_remote_display;
+static gint hf_bip_supported_features_remote_camera;
+static gint hf_bip_supported_features_automatic_archive;
+static gint hf_bip_supported_features_advanced_image_printing;
+static gint hf_bip_supported_features_image_pull;
+static gint hf_bip_supported_features_image_push_display;
+static gint hf_bip_supported_features_image_push_print;
+static gint hf_bip_supported_features_image_push_store;
+static gint hf_bip_supported_features_image_push;
+static gint hf_bip_supported_functions_reserved_17_31;
+static gint hf_bip_supported_functions_get_status;
+static gint hf_bip_supported_functions_reserved_15;
+static gint hf_bip_supported_functions_get_monitoring_image;
+static gint hf_bip_supported_functions_start_archive;
+static gint hf_bip_supported_functions_reserved_12;
+static gint hf_bip_supported_functions_start_print;
+static gint hf_bip_supported_functions_delete_image;
+static gint hf_bip_supported_functions_get_linked_attachment;
+static gint hf_bip_supported_functions_get_linked_thumbnail;
+static gint hf_bip_supported_functions_get_image;
+static gint hf_bip_supported_functions_get_image_property;
+static gint hf_bip_supported_functions_get_images_list;
+static gint hf_bip_supported_functions_remote_display;
+static gint hf_bip_supported_functions_put_linked_thumbnail;
+static gint hf_bip_supported_functions_put_linked_attachment;
+static gint hf_bip_supported_functions_put_image;
+static gint hf_bip_supported_functions_get_capabilities;
+static gint hf_bip_supported_functions_reserved_13_31;
+static gint hf_bip_supported_functions_get_partial_image;
+static gint hf_bip_supported_functions_reserved_1_11;
+static gint hf_bip_supported_functions_reserved_1_4;
+static gint hf_bip_supported_functions_reserved_11_31;
+static gint hf_bip_total_imaging_data_capacity;
+static gint hf_bpp_document_formats_supported;
+static gint hf_bpp_character_repertoires_support;
+static gint hf_bpp_xhtml_print_image_formats_supported;
+static gint hf_bpp_color_supported;
+static gint hf_bpp_1284_id;
+static gint hf_bpp_printer_name;
+static gint hf_bpp_printer_location;
+static gint hf_bpp_duplex_supported;
+static gint hf_bpp_media_types_supported;
+static gint hf_bpp_max_media_width;
+static gint hf_bpp_max_media_length;
+static gint hf_bpp_enhanced_layout_supported;
+static gint hf_bpp_rui_formats_supported;
+static gint hf_bpp_reference_printing_rui_supported;
+static gint hf_bpp_direct_printing_rui_supported;
+static gint hf_bpp_reference_printing_top_url;
+static gint hf_bpp_direct_printing_top_url;
+static gint hf_bpp_device_name;
+static gint hf_bpp_printer_admin_rui_top_url;
+static gint hf_ctn_instance_id;
+static gint hf_ctn_supported_features;
+static gint hf_ctn_supported_features_reserved;
+static gint hf_ctn_supported_features_forward;
+static gint hf_ctn_supported_features_delete;
+static gint hf_ctn_supported_features_uploading;
+static gint hf_ctn_supported_features_downloading;
+static gint hf_ctn_supported_features_browsing;
+static gint hf_ctn_supported_features_notification;
+static gint hf_ctn_supported_features_account_management;
+static gint hf_mps_mpsd_scenarios;
+static gint hf_mps_mpsd_scenarios_reserved;
+static gint hf_mps_mpsd_scenarios_37;
+static gint hf_mps_mpsd_scenarios_36;
+static gint hf_mps_mpsd_scenarios_35;
+static gint hf_mps_mpsd_scenarios_34;
+static gint hf_mps_mpsd_scenarios_33;
+static gint hf_mps_mpsd_scenarios_32;
+static gint hf_mps_mpsd_scenarios_31;
+static gint hf_mps_mpsd_scenarios_30;
+static gint hf_mps_mpsd_scenarios_29;
+static gint hf_mps_mpsd_scenarios_28;
+static gint hf_mps_mpsd_scenarios_27;
+static gint hf_mps_mpsd_scenarios_26;
+static gint hf_mps_mpsd_scenarios_25;
+static gint hf_mps_mpsd_scenarios_24;
+static gint hf_mps_mpsd_scenarios_23;
+static gint hf_mps_mpsd_scenarios_22;
+static gint hf_mps_mpsd_scenarios_21;
+static gint hf_mps_mpsd_scenarios_20;
+static gint hf_mps_mpsd_scenarios_19;
+static gint hf_mps_mpsd_scenarios_18;
+static gint hf_mps_mpsd_scenarios_17;
+static gint hf_mps_mpsd_scenarios_16;
+static gint hf_mps_mpsd_scenarios_15;
+static gint hf_mps_mpsd_scenarios_14;
+static gint hf_mps_mpsd_scenarios_13;
+static gint hf_mps_mpsd_scenarios_12;
+static gint hf_mps_mpsd_scenarios_11;
+static gint hf_mps_mpsd_scenarios_10;
+static gint hf_mps_mpsd_scenarios_9;
+static gint hf_mps_mpsd_scenarios_8;
+static gint hf_mps_mpsd_scenarios_7;
+static gint hf_mps_mpsd_scenarios_6;
+static gint hf_mps_mpsd_scenarios_5;
+static gint hf_mps_mpsd_scenarios_4;
+static gint hf_mps_mpsd_scenarios_3;
+static gint hf_mps_mpsd_scenarios_2;
+static gint hf_mps_mpsd_scenarios_1;
+static gint hf_mps_mpsd_scenarios_0;
+static gint hf_mps_mpmd_scenarios;
+static gint hf_mps_mpmd_scenarios_reserved;
+static gint hf_mps_mpmd_scenarios_18;
+static gint hf_mps_mpmd_scenarios_17;
+static gint hf_mps_mpmd_scenarios_16;
+static gint hf_mps_mpmd_scenarios_15;
+static gint hf_mps_mpmd_scenarios_14;
+static gint hf_mps_mpmd_scenarios_13;
+static gint hf_mps_mpmd_scenarios_12;
+static gint hf_mps_mpmd_scenarios_11;
+static gint hf_mps_mpmd_scenarios_10;
+static gint hf_mps_mpmd_scenarios_9;
+static gint hf_mps_mpmd_scenarios_8;
+static gint hf_mps_mpmd_scenarios_7;
+static gint hf_mps_mpmd_scenarios_6;
+static gint hf_mps_mpmd_scenarios_5;
+static gint hf_mps_mpmd_scenarios_4;
+static gint hf_mps_mpmd_scenarios_3;
+static gint hf_mps_mpmd_scenarios_2;
+static gint hf_mps_mpmd_scenarios_1;
+static gint hf_mps_mpmd_scenarios_0;
+static gint hf_mps_supported_profile_and_protocol_dependency;
+static gint hf_mps_supported_profile_and_protocol_dependency_reserved;
+static gint hf_mps_supported_profile_and_protocol_dependency_dis_connection_order_behaviour;
+static gint hf_mps_supported_profile_and_protocol_dependency_gavdp_requirements;
+static gint hf_mps_supported_profile_and_protocol_dependency_sniff_mode_during_streaming;
+static gint hf_map_mas_goep_l2cap_psm;
+static gint hf_map_mns_goep_l2cap_psm;
+static gint hf_map_supported_features;
+static gint hf_map_supported_features_reserved;
+static gint hf_map_supported_features_extended_event_report_1_1;
+static gint hf_map_supported_features_instance_information_feature;
+static gint hf_map_supported_features_delete_feature;
+static gint hf_map_supported_features_uploading_feature;
+static gint hf_map_supported_features_browsing_feature;
+static gint hf_map_supported_features_notification_feature;
+static gint hf_map_supported_features_notification_registration_feature;
+static gint hf_pbap_pse_supported_features;
+static gint hf_pbap_pse_supported_features_reserved;
+static gint hf_pbap_pse_supported_features_download;
+static gint hf_pbap_pse_supported_features_browsing;
+static gint hf_pbap_pse_supported_features_database_identifier;
+static gint hf_pbap_pse_supported_features_folder_version_counters;
+static gint hf_pbap_pse_supported_features_vcard_selecting;
+static gint hf_pbap_pse_supported_features_enhanced_missed_calls;
+static gint hf_pbap_pse_supported_features_x_bt_uci_vcard_property;
+static gint hf_pbap_pse_supported_features_x_bt_uid_vcard_property;
+static gint hf_pbap_pse_supported_features_contact_referencing;
+static gint hf_pbap_pse_supported_features_default_contact_image_format;
+static gint hf_pbap_goep_l2cap_psm;
+
+static gint ett_btsdp;
+static gint ett_btsdp_ssr;
+static gint ett_btsdp_des;
+static gint ett_btsdp_attribute;
+static gint ett_btsdp_attribute_id;
+static gint ett_btsdp_attribute_value;
+static gint ett_btsdp_attribute_idlist;
+static gint ett_btsdp_service_search_pattern;
+static gint ett_btsdp_continuation_state;
+static gint ett_btsdp_data_element;
+static gint ett_btsdp_data_element_value;
+static gint ett_btsdp_reassembled;
+static gint ett_btsdp_supported_features;
+static gint ett_btsdp_supported_features_mdep_id;
+static gint ett_btsdp_supported_features_mdep_data_type;
+static gint ett_btsdp_supported_features_mdep_role;
+static gint ett_btsdp_supported_features_mdep_description;
+static gint ett_btsdp_protocol;
 
 static int * const hfx_ctn_supported_features[] = {
     &hf_ctn_supported_features_reserved,
@@ -561,10 +561,10 @@ static int * const hfx_pbap_pse_supported_features[] = {
     NULL
 };
 
-static expert_field ei_btsdp_continuation_state_none = EI_INIT;
-static expert_field ei_btsdp_continuation_state_large = EI_INIT;
-static expert_field ei_data_element_value_large = EI_INIT;
-static expert_field ei_length_bad = EI_INIT;
+static expert_field ei_btsdp_continuation_state_none;
+static expert_field ei_btsdp_continuation_state_large;
+static expert_field ei_data_element_value_large;
+static expert_field ei_length_bad;
 
 static dissector_handle_t btsdp_handle;
 
diff --git a/epan/dissectors/packet-btsmp.c b/epan/dissectors/packet-btsmp.c
index cb205a1408..c068264ba4 100644
--- a/epan/dissectors/packet-btsmp.c
+++ b/epan/dissectors/packet-btsmp.c
@@ -21,39 +21,39 @@
 #include "packet-btl2cap.h"
 
 /* Initialize the protocol and registered fields */
-static int proto_btsmp = -1;
-
-static int hf_btsmp_opcode = -1;
-static int hf_btsmp_io_capabilities = -1;
-static int hf_btsmp_oob_data_flags = -1;
-static int hf_btsmp_reason = -1;
-static int hf_btsmp_cfm_value = -1;
-static int hf_btsmp_random = -1;
-static int hf_btsmp_long_term_key = -1;
-static int hf_btsmp_id_resolving_key = -1;
-static int hf_btsmp_signature_key = -1;
-static int hf_btsmp_bonding_flags = -1;
-static int hf_btsmp_mitm_flag = -1;
-static int hf_btsmp_secure_connection_flag = -1;
-static int hf_btsmp_keypress_flag = -1;
-static int hf_btsmp_ct2_flag = -1;
-static int hf_btsmp_reserved_flag = -1;
-static int hf_btsmp_max_enc_key_size = -1;
-static int hf_btsmp_key_dist_enc = -1;
-static int hf_btsmp_key_dist_id = -1;
-static int hf_btsmp_key_dist_sign = -1;
-static int hf_btsmp_key_dist_linkkey = -1;
-static int hf_btsmp_key_dist_reserved = -1;
-static int hf_btsmp_ediv = -1;
-static int hf_btsmp_authreq = -1;
-static int hf_btsmp_initiator_key_distribution = -1;
-static int hf_btsmp_responder_key_distribution = -1;
-static int hf_bd_addr = -1;
-static int hf_address_type = -1;
-static int hf_btsmp_public_key_x = -1;
-static int hf_btsmp_public_key_y = -1;
-static int hf_btsmp_dhkey_check = -1;
-static int hf_btsmp_notification_type = -1;
+static int proto_btsmp;
+
+static int hf_btsmp_opcode;
+static int hf_btsmp_io_capabilities;
+static int hf_btsmp_oob_data_flags;
+static int hf_btsmp_reason;
+static int hf_btsmp_cfm_value;
+static int hf_btsmp_random;
+static int hf_btsmp_long_term_key;
+static int hf_btsmp_id_resolving_key;
+static int hf_btsmp_signature_key;
+static int hf_btsmp_bonding_flags;
+static int hf_btsmp_mitm_flag;
+static int hf_btsmp_secure_connection_flag;
+static int hf_btsmp_keypress_flag;
+static int hf_btsmp_ct2_flag;
+static int hf_btsmp_reserved_flag;
+static int hf_btsmp_max_enc_key_size;
+static int hf_btsmp_key_dist_enc;
+static int hf_btsmp_key_dist_id;
+static int hf_btsmp_key_dist_sign;
+static int hf_btsmp_key_dist_linkkey;
+static int hf_btsmp_key_dist_reserved;
+static int hf_btsmp_ediv;
+static int hf_btsmp_authreq;
+static int hf_btsmp_initiator_key_distribution;
+static int hf_btsmp_responder_key_distribution;
+static int hf_bd_addr;
+static int hf_address_type;
+static int hf_btsmp_public_key_x;
+static int hf_btsmp_public_key_y;
+static int hf_btsmp_dhkey_check;
+static int hf_btsmp_notification_type;
 
 static int * const hfx_btsmp_key_distribution[] = {
     &hf_btsmp_key_dist_reserved,
@@ -76,9 +76,9 @@ static int * const hfx_btsmp_authreq[] = {
 
 
 /* Initialize the subtree pointers */
-static gint ett_btsmp = -1;
-static gint ett_btsmp_auth_req = -1;
-static gint ett_btsmp_key_dist = -1;
+static gint ett_btsmp;
+static gint ett_btsmp_auth_req;
+static gint ett_btsmp_key_dist;
 
 static dissector_handle_t btsmp_handle;
 
diff --git a/epan/dissectors/packet-busmirroring.c b/epan/dissectors/packet-busmirroring.c
index 26b6390de4..2e82347651 100644
--- a/epan/dissectors/packet-busmirroring.c
+++ b/epan/dissectors/packet-busmirroring.c
@@ -33,52 +33,52 @@ enum network_type
     NETWORK_TYPE_ETHERNET = 0x04
 };
 
-static int proto_busmirroring = -1;
-static int hf_protocol_version = -1;
-static int hf_sequence_number = -1;
-static int hf_header_timestamp = -1;
-static int hf_seconds = -1;
-static int hf_nanoseconds = -1;
-static int hf_data_length = -1;
-static int hf_timestamp = -1;
-static int hf_network_state_available = -1;
-static int hf_frame_id_available = -1;
-static int hf_payload_available = -1;
-static int hf_network_type = -1;
-static int hf_frames_lost = -1;
-static int hf_bus_online = -1;
-static int hf_can_error_passive = -1;
-static int hf_can_bus_off = -1;
-static int hf_can_tx_error_count = -1;
-static int hf_lin_header_tx_error = -1;
-static int hf_lin_tx_error = -1;
-static int hf_lin_rx_error = -1;
-static int hf_lin_rx_no_response = -1;
-static int hf_flexray_bus_synchronous = -1;
-static int hf_flexray_normal_active = -1;
-static int hf_flexray_syntax_error = -1;
-static int hf_flexray_content_error = -1;
-static int hf_flexray_boundary_violation = -1;
-static int hf_flexray_tx_conflict = -1;
-static int hf_network_id = -1;
-static int hf_network_state = -1;
-static int hf_frame_id = -1;
-static int hf_can_id_type = -1;
-static int hf_can_frame_type = -1;
-static int hf_can_id = -1;
-static int hf_lin_pid = -1;
-static int hf_flexray_channel_b = -1;
-static int hf_flexray_channel_a = -1;
-static int hf_flexray_slot_valid = -1;
-static int hf_flexray_slot_id = -1;
-static int hf_flexray_cycle = -1;
-static int hf_payload_length = -1;
-static int hf_payload = -1;
-static int ett_busmirroring = -1;
-static int ett_header_timestamp = -1;
-static int ett_data_item = -1;
-static int ett_network_state = -1;
-static int ett_frame_id = -1;
+static int proto_busmirroring;
+static int hf_protocol_version;
+static int hf_sequence_number;
+static int hf_header_timestamp;
+static int hf_seconds;
+static int hf_nanoseconds;
+static int hf_data_length;
+static int hf_timestamp;
+static int hf_network_state_available;
+static int hf_frame_id_available;
+static int hf_payload_available;
+static int hf_network_type;
+static int hf_frames_lost;
+static int hf_bus_online;
+static int hf_can_error_passive;
+static int hf_can_bus_off;
+static int hf_can_tx_error_count;
+static int hf_lin_header_tx_error;
+static int hf_lin_tx_error;
+static int hf_lin_rx_error;
+static int hf_lin_rx_no_response;
+static int hf_flexray_bus_synchronous;
+static int hf_flexray_normal_active;
+static int hf_flexray_syntax_error;
+static int hf_flexray_content_error;
+static int hf_flexray_boundary_violation;
+static int hf_flexray_tx_conflict;
+static int hf_network_id;
+static int hf_network_state;
+static int hf_frame_id;
+static int hf_can_id_type;
+static int hf_can_frame_type;
+static int hf_can_id;
+static int hf_lin_pid;
+static int hf_flexray_channel_b;
+static int hf_flexray_channel_a;
+static int hf_flexray_slot_valid;
+static int hf_flexray_slot_id;
+static int hf_flexray_cycle;
+static int hf_payload_length;
+static int hf_payload;
+static int ett_busmirroring;
+static int ett_header_timestamp;
+static int ett_data_item;
+static int ett_network_state;
+static int ett_frame_id;
 
 static int
 dissect_busmirroring(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *data _U_)
diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c
index 58acc3a9dc..6be98ca5a3 100644
--- a/epan/dissectors/packet-bvlc.c
+++ b/epan/dissectors/packet-bvlc.c
@@ -31,61 +31,61 @@ void proto_reg_handoff_bvlc(void);
 #define BAC_WRAPPER_NO_TRUST_SRC	0x02
 #define BAC_WRAPPER_SECURE_BY_RTR	0x01
 
-static int proto_bvlc = -1;
-static int proto_bscvlc = -1;
-static int hf_bvlc_type = -1;
-static int hf_bvlc_function = -1;
-static int hf_bvlc_ipv6_function = -1;
-static int hf_bvlc_length = -1;
-static int hf_bvlc_result_ip4 = -1;
-static int hf_bvlc_result_ip6 = -1;
-static int hf_bvlc_bdt_ip = -1;
-static int hf_bvlc_bdt_mask = -1;
-static int hf_bvlc_bdt_port = -1;
-static int hf_bvlc_reg_ttl = -1;
-static int hf_bvlc_fdt_ip = -1;
-static int hf_bvlc_fdt_ipv6 = -1;
-static int hf_bvlc_fdt_port = -1;
-static int hf_bvlc_fdt_ttl = -1;
-static int hf_bvlc_fdt_timeout = -1;
-static int hf_bvlc_fwd_ip = -1;
-static int hf_bvlc_fwd_port = -1;
-static int hf_bvlc_virt_source = -1;
-static int hf_bvlc_virt_dest = -1;
-static int hf_bvlc_orig_source_addr = -1;
-static int hf_bvlc_orig_source_port = -1;
-static int hf_bscvlc_control = -1;
-static int hf_bscvlc_control_data_option = -1;
-static int hf_bscvlc_control_destination_option = -1;
-static int hf_bscvlc_control_destination_address = -1;
-static int hf_bscvlc_control_origin_address = -1;
-static int hf_bscvlc_control_reserved = -1;
-static int hf_bscvlc_header = -1;
-static int hf_bscvlc_header_marker = -1;
-static int hf_bscvlc_header_length = -1;
-static int hf_bscvlc_header_data = -1;
-static int hf_bscvlc_header_opt_type = -1;
-static int hf_bscvlc_header_opt_data = -1;
-static int hf_bscvlc_header_opt_must_understand = -1;
-static int hf_bscvlc_header_opt_more = -1;
-static int hf_bscvlc_vendor_id = -1;
-static int hf_bscvlc_proprietary_opt_type = -1;
-static int hf_bscvlc_proprietary_data = -1;
-static int hf_bscvlc_hub_conn_state = -1;
-static int hf_bscvlc_accept_conns = -1;
-static int hf_bscvlc_max_bvlc_length = -1;
-static int hf_bscvlc_max_npdu_length = -1;
-static int hf_bscvlc_function = -1;
-static int hf_bscvlc_result = -1;
-static int hf_bscvlc_error_class = -1;
-static int hf_bscvlc_error_code = -1;
-static int hf_bscvlc_result_data = -1;
-static int hf_bscvlc_uris = -1;
-static int hf_bscvlc_msg_id = -1;
-static int hf_bscvlc_orig_vmac = -1;
-static int hf_bscvlc_dest_vmac = -1;
-static int hf_bscvlc_connect_vmac = -1;
-static int hf_bscvlc_connect_uuid = -1;
+static int proto_bvlc;
+static int proto_bscvlc;
+static int hf_bvlc_type;
+static int hf_bvlc_function;
+static int hf_bvlc_ipv6_function;
+static int hf_bvlc_length;
+static int hf_bvlc_result_ip4;
+static int hf_bvlc_result_ip6;
+static int hf_bvlc_bdt_ip;
+static int hf_bvlc_bdt_mask;
+static int hf_bvlc_bdt_port;
+static int hf_bvlc_reg_ttl;
+static int hf_bvlc_fdt_ip;
+static int hf_bvlc_fdt_ipv6;
+static int hf_bvlc_fdt_port;
+static int hf_bvlc_fdt_ttl;
+static int hf_bvlc_fdt_timeout;
+static int hf_bvlc_fwd_ip;
+static int hf_bvlc_fwd_port;
+static int hf_bvlc_virt_source;
+static int hf_bvlc_virt_dest;
+static int hf_bvlc_orig_source_addr;
+static int hf_bvlc_orig_source_port;
+static int hf_bscvlc_control;
+static int hf_bscvlc_control_data_option;
+static int hf_bscvlc_control_destination_option;
+static int hf_bscvlc_control_destination_address;
+static int hf_bscvlc_control_origin_address;
+static int hf_bscvlc_control_reserved;
+static int hf_bscvlc_header;
+static int hf_bscvlc_header_marker;
+static int hf_bscvlc_header_length;
+static int hf_bscvlc_header_data;
+static int hf_bscvlc_header_opt_type;
+static int hf_bscvlc_header_opt_data;
+static int hf_bscvlc_header_opt_must_understand;
+static int hf_bscvlc_header_opt_more;
+static int hf_bscvlc_vendor_id;
+static int hf_bscvlc_proprietary_opt_type;
+static int hf_bscvlc_proprietary_data;
+static int hf_bscvlc_hub_conn_state;
+static int hf_bscvlc_accept_conns;
+static int hf_bscvlc_max_bvlc_length;
+static int hf_bscvlc_max_npdu_length;
+static int hf_bscvlc_function;
+static int hf_bscvlc_result;
+static int hf_bscvlc_error_class;
+static int hf_bscvlc_error_code;
+static int hf_bscvlc_result_data;
+static int hf_bscvlc_uris;
+static int hf_bscvlc_msg_id;
+static int hf_bscvlc_orig_vmac;
+static int hf_bscvlc_dest_vmac;
+static int hf_bscvlc_connect_vmac;
+static int hf_bscvlc_connect_uuid;
 
 static dissector_table_t bvlc_dissector_table;
 static dissector_table_t bscvlc_dissector_table;
@@ -190,12 +190,12 @@ static const value_string bscvlc_hub_accept_conns_names[] = {
 	{ 0,    NULL }
 };
 
-static gint ett_bvlc = -1;
-static gint ett_bscvlc = -1;
-static gint ett_bscvlc_ctrl = -1;
-static gint ett_bscvlc_hdr = -1;
-static gint ett_bdt = -1;
-static gint ett_fdt = -1;
+static gint ett_bvlc;
+static gint ett_bscvlc;
+static gint ett_bscvlc_ctrl;
+static gint ett_bscvlc_hdr;
+static gint ett_bdt;
+static gint ett_fdt;
 
 #define BACNET_IP_ANNEX_J		0x81
 #define BACNET_IPV6_ANNEX_U		0x82
diff --git a/epan/dissectors/packet-bzr.c b/epan/dissectors/packet-bzr.c
index 13bab36b96..edc051850e 100644
--- a/epan/dissectors/packet-bzr.c
+++ b/epan/dissectors/packet-bzr.c
@@ -21,20 +21,20 @@
 void proto_register_bzr(void);
 void proto_reg_handoff_bzr(void);
 
-static int proto_bzr = -1;
-
-static gint ett_bzr = -1;
-static gint ett_prefixed_bencode = -1;
-static gint ett_prefixed_bytes = -1;
-
-static gint hf_bzr_prefixed_bencode = -1;
-static gint hf_bzr_prefixed_bencode_len = -1;
-static gint hf_bzr_bytes = -1;
-static gint hf_bzr_bytes_data = -1;
-static gint hf_bzr_bytes_length = -1;
-static gint hf_bzr_result = -1;
-static gint hf_bzr_packet_protocol_version = -1;
-static gint hf_bzr_packet_kind = -1;
+static int proto_bzr;
+
+static gint ett_bzr;
+static gint ett_prefixed_bencode;
+static gint ett_prefixed_bytes;
+
+static gint hf_bzr_prefixed_bencode;
+static gint hf_bzr_prefixed_bencode_len;
+static gint hf_bzr_bytes;
+static gint hf_bzr_bytes_data;
+static gint hf_bzr_bytes_length;
+static gint hf_bzr_result;
+static gint hf_bzr_packet_protocol_version;
+static gint hf_bzr_packet_kind;
 
 static dissector_handle_t bencode_handle;
 static dissector_handle_t bzr_handle = NULL;
diff --git a/epan/dissectors/packet-c15ch.c b/epan/dissectors/packet-c15ch.c
index b75c55596a..4d25cd3173 100644
--- a/epan/dissectors/packet-c15ch.c
+++ b/epan/dissectors/packet-c15ch.c
@@ -54,42 +54,42 @@ void proto_reg_handoff_c15ch(void);
 
 static const char * C15_LABEL = "C15";
 /* Heartbeat Protocol : distinct from normal c15 type */
-static int proto_c15ch_hbeat = -1;
+static int proto_c15ch_hbeat;
 
 /* Subtrees */
-static gint ett_c15ch_hbeat = -1;
+static gint ett_c15ch_hbeat;
 
 /* Fields */
-static int hf_c15ch_hbeat_clli = -1;
-static int hf_c15ch_hbeat_primary = -1;
-static int hf_c15ch_hbeat_secondary = -1;
-static int hf_c15ch_hbeat_interface = -1;
+static int hf_c15ch_hbeat_clli;
+static int hf_c15ch_hbeat_primary;
+static int hf_c15ch_hbeat_secondary;
+static int hf_c15ch_hbeat_interface;
 
 /* C15 base Protocol */
-static int proto_c15ch = -1;
+static int proto_c15ch;
 
 /* Dissector Table */
 static dissector_table_t c15ch_dissector_table;
 
 /* Fields */
-static int hf_c15ch_version = -1;
-static int hf_c15ch_msgtype = -1;
-static int hf_c15ch_size = -1;
-static int hf_c15ch_call_ref = -1;
+static int hf_c15ch_version;
+static int hf_c15ch_msgtype;
+static int hf_c15ch_size;
+static int hf_c15ch_call_ref;
 
-static int hf_c15ch_srce_ni = -1;
-static int hf_c15ch_srce_tn = -1;
-static int hf_c15ch_dest_ni = -1;
-static int hf_c15ch_dest_tn = -1;
+static int hf_c15ch_srce_ni;
+static int hf_c15ch_srce_tn;
+static int hf_c15ch_dest_ni;
+static int hf_c15ch_dest_tn;
 
-static int hf_c15ch_srce_ni_tn = -1;
-static int hf_c15ch_dest_ni_tn = -1;
-static int hf_c15ch_realtime = -1;
+static int hf_c15ch_srce_ni_tn;
+static int hf_c15ch_dest_ni_tn;
+static int hf_c15ch_realtime;
 
 /* Subtrees */
-static gint ett_c15ch = -1;
-static gint ett_src_ni_tn = -1;
-static gint ett_dest_ni_tn = -1;
+static gint ett_c15ch;
+static gint ett_src_ni_tn;
+static gint ett_dest_ni_tn;
 
 /* for msg_type field ...*/
 static const value_string c15_msg_types[] = {
@@ -125,12 +125,12 @@ static const value_string c15_msg_types[] = {
 static value_string_ext c15_msg_types_ext = VALUE_STRING_EXT_INIT(c15_msg_types);
 
 /* Second Level */
-static gint ett_c15ch_second_level = -1;
-static gint ett_c15ch_second_level_sub1 = -1;
-static gint ett_c15ch_second_level_sub2 = -1;
-static gint ett_c15ch_second_level_sub3 = -1;
-static gint ett_c15ch_second_level_sub4 = -1;
-static int proto_c15ch_second_level = -1;
+static gint ett_c15ch_second_level;
+static gint ett_c15ch_second_level_sub1;
+static gint ett_c15ch_second_level_sub2;
+static gint ett_c15ch_second_level_sub3;
+static gint ett_c15ch_second_level_sub4;
+static int proto_c15ch_second_level;
 
 static dissector_handle_t c15ch_hbeat_handle   = NULL;
 static dissector_handle_t c15ch_handle         = NULL;
@@ -141,22 +141,22 @@ static dissector_handle_t general_q931_handle  = NULL;
 /* ama */
 
 /* Fields */
-static int hf_c15ch_ama = -1;
-static int hf_c15ch_ama_call_code = -1;
-static int hf_c15ch_ama_orig_digits = -1;
-static int hf_c15ch_ama_num_dialed_digits = -1;
-static int hf_c15ch_ama_br_prefix = -1;
-static int hf_c15ch_ama_dialed_digits = -1;
-static int hf_c15ch_ama_start_hour = -1;
-static int hf_c15ch_ama_start_minute = -1;
-static int hf_c15ch_ama_start_second = -1;
-static int hf_c15ch_ama_start_tenth_second = -1;
-static int hf_c15ch_ama_start_day = -1;
-static int hf_c15ch_ama_start_month = -1;
-static int hf_c15ch_ama_start_year = -1;
-static int hf_c15ch_ama_answered = -1;
-static int hf_c15ch_ama_elapsed_time = -1; /*elapsed time in millisec*/
-static int hf_c15ch_ama_call_type = -1;
+static int hf_c15ch_ama;
+static int hf_c15ch_ama_call_code;
+static int hf_c15ch_ama_orig_digits;
+static int hf_c15ch_ama_num_dialed_digits;
+static int hf_c15ch_ama_br_prefix;
+static int hf_c15ch_ama_dialed_digits;
+static int hf_c15ch_ama_start_hour;
+static int hf_c15ch_ama_start_minute;
+static int hf_c15ch_ama_start_second;
+static int hf_c15ch_ama_start_tenth_second;
+static int hf_c15ch_ama_start_day;
+static int hf_c15ch_ama_start_month;
+static int hf_c15ch_ama_start_year;
+static int hf_c15ch_ama_answered;
+static int hf_c15ch_ama_elapsed_time; /*elapsed time in millisec*/
+static int hf_c15ch_ama_call_type;
 
 
 /* br_prefix labels */
@@ -229,10 +229,10 @@ static const value_string ama_call_types[] = {
 static value_string_ext ama_call_types_ext = VALUE_STRING_EXT_INIT(ama_call_types);
 /* c15 info */
 /* Fields */
-static int hf_c15ch_c15_info = -1;
-static int hf_c15ch_c15_info_code = -1;
-static int hf_c15ch_c15_info_level = -1;
-static int hf_c15ch_c15_info_text = -1;
+static int hf_c15ch_c15_info;
+static int hf_c15ch_c15_info_code;
+static int hf_c15ch_c15_info_level;
+static int hf_c15ch_c15_info_text;
 
 
 /* labels for level */
@@ -247,35 +247,35 @@ static const value_string c15ch_c15_info_level_types[] = {
 /* clli */
 
 /* Fields */
-static int hf_c15ch_clli = -1;
-static int hf_c15ch_clli_clli_string = -1;
-static int hf_c15ch_clli_active_core = -1;
-static int hf_c15ch_clli_inactive_core = -1;
-static int hf_c15ch_clli_interface_string = -1;
-static int hf_c15ch_clli_seconds = -1;
-static int hf_c15ch_clli_microseconds = -1;
+static int hf_c15ch_clli;
+static int hf_c15ch_clli_clli_string;
+static int hf_c15ch_clli_active_core;
+static int hf_c15ch_clli_inactive_core;
+static int hf_c15ch_clli_interface_string;
+static int hf_c15ch_clli_seconds;
+static int hf_c15ch_clli_microseconds;
 
 
 /* conn */
 
 /* Fields */
-static int hf_c15ch_conn = -1;
-static int hf_c15ch_conn_connfrom = -1;
-static int hf_c15ch_conn_conntype = -1;
-static int hf_c15ch_conn_perphtype = -1;
-static int hf_c15ch_conn_intra = -1;
-static int hf_c15ch_conn_srceni = -1;
-static int hf_c15ch_conn_srcenitn = -1;
-static int hf_c15ch_conn_srcetn = -1;
-static int hf_c15ch_conn_destni = -1;
-static int hf_c15ch_conn_destnitn = -1;
-static int hf_c15ch_conn_desttn = -1;
-static int hf_c15ch_conn_interlinknum = -1;
-static int hf_c15ch_conn_fromport = -1;
-static int hf_c15ch_conn_fromslot = -1;
-static int hf_c15ch_conn_toport = -1;
-static int hf_c15ch_conn_toslot = -1;
-static int hf_c15ch_conn_hubcallid = -1;
+static int hf_c15ch_conn;
+static int hf_c15ch_conn_connfrom;
+static int hf_c15ch_conn_conntype;
+static int hf_c15ch_conn_perphtype;
+static int hf_c15ch_conn_intra;
+static int hf_c15ch_conn_srceni;
+static int hf_c15ch_conn_srcenitn;
+static int hf_c15ch_conn_srcetn;
+static int hf_c15ch_conn_destni;
+static int hf_c15ch_conn_destnitn;
+static int hf_c15ch_conn_desttn;
+static int hf_c15ch_conn_interlinknum;
+static int hf_c15ch_conn_fromport;
+static int hf_c15ch_conn_fromslot;
+static int hf_c15ch_conn_toport;
+static int hf_c15ch_conn_toslot;
+static int hf_c15ch_conn_hubcallid;
 
 /* value_string arrays to label fields */
 /* for connfrom field ...*/
@@ -291,17 +291,17 @@ static const value_string c15_conn_from_types[] = {
 
 
 /* Fields */
-static int hf_c15ch_cp_state_ch = -1;
-static int hf_c15ch_cp_state_ch_oldpm = -1;
-static int hf_c15ch_cp_state_ch_newpm = -1;
-static int hf_c15ch_cp_state_ch_subpm = -1;
-static int hf_c15ch_cp_state_ch_trkpm = -1;
-static int hf_c15ch_cp_state_ch_slepm = -1;
-static int hf_c15ch_cp_state_ch_flags = -1;
-static int hf_c15ch_cp_state_ch_oldrtetype = -1;
-static int hf_c15ch_cp_state_ch_oldrteidx = -1;
-static int hf_c15ch_cp_state_ch_newrtetype = -1;
-static int hf_c15ch_cp_state_ch_newrteidx = -1;
+static int hf_c15ch_cp_state_ch;
+static int hf_c15ch_cp_state_ch_oldpm;
+static int hf_c15ch_cp_state_ch_newpm;
+static int hf_c15ch_cp_state_ch_subpm;
+static int hf_c15ch_cp_state_ch_trkpm;
+static int hf_c15ch_cp_state_ch_slepm;
+static int hf_c15ch_cp_state_ch_flags;
+static int hf_c15ch_cp_state_ch_oldrtetype;
+static int hf_c15ch_cp_state_ch_oldrteidx;
+static int hf_c15ch_cp_state_ch_newrtetype;
+static int hf_c15ch_cp_state_ch_newrteidx;
 
 /* value_string arrays to label fields */
 static const value_string c15_cp_state_pm_types[] = {
@@ -388,29 +388,29 @@ static value_string_ext c15_cp_state_pm_types_ext = VALUE_STRING_EXT_INIT(c15_cp
 /* dest digits */
 
 /* Fields */
-static int hf_c15ch_dest_digits = -1;
-static int hf_c15ch_dest_digits_digits = -1;
+static int hf_c15ch_dest_digits;
+static int hf_c15ch_dest_digits_digits;
 
 
 /* echo cancel */
 
 /* Fields */
-static int hf_c15ch_echo_cancel = -1;
-static int hf_c15ch_echo_cancel_ni = -1;
-static int hf_c15ch_echo_cancel_tn = -1;
-static int hf_c15ch_echo_cancel_ni_tn = -1;
-static int hf_c15ch_echo_cancel_old_l2_mode = -1;
-static int hf_c15ch_echo_cancel_old_channel_mode = -1;
-static int hf_c15ch_echo_cancel_old_ecan_mode = -1;
-static int hf_c15ch_echo_cancel_new_l2_mode = -1;
-static int hf_c15ch_echo_cancel_new_channel_mode = -1;
-static int hf_c15ch_echo_cancel_new_ecan_mode = -1;
-static int hf_c15ch_echo_cancel_tone_id = -1;
-static int hf_c15ch_echo_cancel_pm = -1;
-static int hf_c15ch_echo_cancel_pc = -1;
-static int hf_c15ch_echo_cancel_loop = -1;
-static int hf_c15ch_echo_cancel_slot = -1;
-static int hf_c15ch_echo_cancel_location = -1;
+static int hf_c15ch_echo_cancel;
+static int hf_c15ch_echo_cancel_ni;
+static int hf_c15ch_echo_cancel_tn;
+static int hf_c15ch_echo_cancel_ni_tn;
+static int hf_c15ch_echo_cancel_old_l2_mode;
+static int hf_c15ch_echo_cancel_old_channel_mode;
+static int hf_c15ch_echo_cancel_old_ecan_mode;
+static int hf_c15ch_echo_cancel_new_l2_mode;
+static int hf_c15ch_echo_cancel_new_channel_mode;
+static int hf_c15ch_echo_cancel_new_ecan_mode;
+static int hf_c15ch_echo_cancel_tone_id;
+static int hf_c15ch_echo_cancel_pm;
+static int hf_c15ch_echo_cancel_pc;
+static int hf_c15ch_echo_cancel_loop;
+static int hf_c15ch_echo_cancel_slot;
+static int hf_c15ch_echo_cancel_location;
 
 
 
@@ -459,32 +459,32 @@ static const value_string c15_echo_cancel_ecan_mode_types[] = {
 /* encapsulated isup */
 
 /* Fields */
-static int hf_c15ch_encap_isup = -1;
-static int hf_c15ch_encap_isup_direction = -1;
-static int hf_c15ch_encap_isup_isup_msg_length = -1;
+static int hf_c15ch_encap_isup;
+static int hf_c15ch_encap_isup_direction;
+static int hf_c15ch_encap_isup_isup_msg_length;
 
 
 /* isup ( not encapsulated )*/
 
 /* Fields */
-static int hf_c15ch_isup = -1;
-static int hf_c15ch_isup_direction = -1;
-static int hf_c15ch_isup_msgtype = -1;
-static int hf_c15ch_isup_cic = -1;
-static int hf_c15ch_isup_opcmember = -1;
-static int hf_c15ch_isup_opccluster = -1;
-static int hf_c15ch_isup_opcnetwork = -1;
-static int hf_c15ch_isup_dpcmember = -1;
-static int hf_c15ch_isup_dpccluster = -1;
-static int hf_c15ch_isup_dpcnetwork = -1;
-static int hf_c15ch_isup_level3index = -1;
-static int hf_c15ch_isup_ni = -1;
-static int hf_c15ch_isup_tn = -1;
-static int hf_c15ch_isup_ni_tn = -1;
-static int hf_c15ch_isup_c15hdr = -1;
-static int hf_c15ch_isup_layer2hdr = -1;
-static int hf_c15ch_isup_layer3hdr = -1;
-static int hf_c15ch_isup_iptime = -1;
+static int hf_c15ch_isup;
+static int hf_c15ch_isup_direction;
+static int hf_c15ch_isup_msgtype;
+static int hf_c15ch_isup_cic;
+static int hf_c15ch_isup_opcmember;
+static int hf_c15ch_isup_opccluster;
+static int hf_c15ch_isup_opcnetwork;
+static int hf_c15ch_isup_dpcmember;
+static int hf_c15ch_isup_dpccluster;
+static int hf_c15ch_isup_dpcnetwork;
+static int hf_c15ch_isup_level3index;
+static int hf_c15ch_isup_ni;
+static int hf_c15ch_isup_tn;
+static int hf_c15ch_isup_ni_tn;
+static int hf_c15ch_isup_c15hdr;
+static int hf_c15ch_isup_layer2hdr;
+static int hf_c15ch_isup_layer3hdr;
+static int hf_c15ch_isup_iptime;
 
 
 /* value_string arrays to label fields */
@@ -535,47 +535,47 @@ static const value_string c15_isup_direction_types[] = {
 
 
 /* Fields */
-static int hf_c15ch_mkbrk = -1;
-static int hf_c15ch_mkbrk_makebreak = -1;
-static int hf_c15ch_mkbrk_nshlf = -1;
-static int hf_c15ch_mkbrk_stm = -1;
-static int hf_c15ch_mkbrk_caddr = -1;
-static int hf_c15ch_mkbrk_cdata = -1;
+static int hf_c15ch_mkbrk;
+static int hf_c15ch_mkbrk_makebreak;
+static int hf_c15ch_mkbrk_nshlf;
+static int hf_c15ch_mkbrk_stm;
+static int hf_c15ch_mkbrk_caddr;
+static int hf_c15ch_mkbrk_cdata;
 
 
 /* nitn xlate */
 
 /* Fields */
-static int hf_c15ch_nitnxlate = -1;
-static int hf_c15ch_nitnxlate_ni = -1;
-static int hf_c15ch_nitnxlate_tn = -1;
-static int hf_c15ch_nitnxlate_ni_tn = -1;
-static int hf_c15ch_nitnxlate_equiptype = -1;
-static int hf_c15ch_nitnxlate_concat_string = -1;
-static int hf_c15ch_nitnxlate_sitestring = -1;
-static int hf_c15ch_nitnxlate_subsitestring = -1;
-static int hf_c15ch_nitnxlate_equipname = -1;
-static int hf_c15ch_nitnxlate_gw_type = -1;
-static int hf_c15ch_nitnxlate_parm_1 = -1;
-static int hf_c15ch_nitnxlate_parm_2 = -1;
-static int hf_c15ch_nitnxlate_parm_3 = -1;
-static int hf_c15ch_nitnxlate_parm_4 = -1;
-static int hf_c15ch_nitnxlate_key = -1;
-static int hf_c15ch_nitnxlate_user_tid = -1;
-static int hf_c15ch_nitnxlate_host = -1;
-static int hf_c15ch_nitnxlate_tg_num = -1;
-static int hf_c15ch_nitnxlate_mgcp_line_id = -1;
-static int hf_c15ch_nitnxlate_gateway = -1;
-static int hf_c15ch_nitnxlate_line = -1;
-static int hf_c15ch_nitnxlate_bay = -1;
-static int hf_c15ch_nitnxlate_shelf = -1;
-static int hf_c15ch_nitnxlate_lsg = -1;
-static int hf_c15ch_nitnxlate_idt_rdt = -1;
-static int hf_c15ch_nitnxlate_pm = -1;
-static int hf_c15ch_nitnxlate_channel = -1;
-static int hf_c15ch_nitnxlate_ptrk = -1;
-static int hf_c15ch_nitnxlate_pc_sts1 = -1;
-static int hf_c15ch_nitnxlate_port_vt15 = -1;
+static int hf_c15ch_nitnxlate;
+static int hf_c15ch_nitnxlate_ni;
+static int hf_c15ch_nitnxlate_tn;
+static int hf_c15ch_nitnxlate_ni_tn;
+static int hf_c15ch_nitnxlate_equiptype;
+static int hf_c15ch_nitnxlate_concat_string;
+static int hf_c15ch_nitnxlate_sitestring;
+static int hf_c15ch_nitnxlate_subsitestring;
+static int hf_c15ch_nitnxlate_equipname;
+static int hf_c15ch_nitnxlate_gw_type;
+static int hf_c15ch_nitnxlate_parm_1;
+static int hf_c15ch_nitnxlate_parm_2;
+static int hf_c15ch_nitnxlate_parm_3;
+static int hf_c15ch_nitnxlate_parm_4;
+static int hf_c15ch_nitnxlate_key;
+static int hf_c15ch_nitnxlate_user_tid;
+static int hf_c15ch_nitnxlate_host;
+static int hf_c15ch_nitnxlate_tg_num;
+static int hf_c15ch_nitnxlate_mgcp_line_id;
+static int hf_c15ch_nitnxlate_gateway;
+static int hf_c15ch_nitnxlate_line;
+static int hf_c15ch_nitnxlate_bay;
+static int hf_c15ch_nitnxlate_shelf;
+static int hf_c15ch_nitnxlate_lsg;
+static int hf_c15ch_nitnxlate_idt_rdt;
+static int hf_c15ch_nitnxlate_pm;
+static int hf_c15ch_nitnxlate_channel;
+static int hf_c15ch_nitnxlate_ptrk;
+static int hf_c15ch_nitnxlate_pc_sts1;
+static int hf_c15ch_nitnxlate_port_vt15;
 
 
 static const value_string ett_c15ch_nitnxlate_gwe_types[] = {
@@ -617,29 +617,29 @@ static value_string_ext ett_c15ch_nitnxlate_equip_types_ext = VALUE_STRING_EXT_I
 /* ntwk conn */
 
 /* Fields */
-static int hf_c15ch_ntwk_conn = -1;
-static int hf_c15ch_ntwk_conn_pathtype = -1;
-static int hf_c15ch_ntwk_conn_conntype = -1;
-static int hf_c15ch_ntwk_conn_fromoptimized = -1;
-static int hf_c15ch_ntwk_conn_fromsite = -1;
-static int hf_c15ch_ntwk_conn_frompm = -1;
-static int hf_c15ch_ntwk_conn_frompc = -1;
-static int hf_c15ch_ntwk_conn_fromloop = -1;
-static int hf_c15ch_ntwk_conn_fromslot = -1;
-static int hf_c15ch_ntwk_conn_fromlocation = -1;
-static int hf_c15ch_ntwk_conn_fromcnx = -1;
-static int hf_c15ch_ntwk_conn_fromntwkni = -1;
-static int hf_c15ch_ntwk_conn_fromntwktn = -1;
-static int hf_c15ch_ntwk_conn_fromntwknitn = -1;
-static int hf_c15ch_ntwk_conn_mbshold = -1;
-static int hf_c15ch_ntwk_conn_tooptimized = -1;
-static int hf_c15ch_ntwk_conn_tosite = -1;
-static int hf_c15ch_ntwk_conn_topm = -1;
-static int hf_c15ch_ntwk_conn_topc = -1;
-static int hf_c15ch_ntwk_conn_toloop = -1;
-static int hf_c15ch_ntwk_conn_toslot = -1;
-static int hf_c15ch_ntwk_conn_tolocation = -1;
-static int hf_c15ch_ntwk_conn_tocnx = -1;
+static int hf_c15ch_ntwk_conn;
+static int hf_c15ch_ntwk_conn_pathtype;
+static int hf_c15ch_ntwk_conn_conntype;
+static int hf_c15ch_ntwk_conn_fromoptimized;
+static int hf_c15ch_ntwk_conn_fromsite;
+static int hf_c15ch_ntwk_conn_frompm;
+static int hf_c15ch_ntwk_conn_frompc;
+static int hf_c15ch_ntwk_conn_fromloop;
+static int hf_c15ch_ntwk_conn_fromslot;
+static int hf_c15ch_ntwk_conn_fromlocation;
+static int hf_c15ch_ntwk_conn_fromcnx;
+static int hf_c15ch_ntwk_conn_fromntwkni;
+static int hf_c15ch_ntwk_conn_fromntwktn;
+static int hf_c15ch_ntwk_conn_fromntwknitn;
+static int hf_c15ch_ntwk_conn_mbshold;
+static int hf_c15ch_ntwk_conn_tooptimized;
+static int hf_c15ch_ntwk_conn_tosite;
+static int hf_c15ch_ntwk_conn_topm;
+static int hf_c15ch_ntwk_conn_topc;
+static int hf_c15ch_ntwk_conn_toloop;
+static int hf_c15ch_ntwk_conn_toslot;
+static int hf_c15ch_ntwk_conn_tolocation;
+static int hf_c15ch_ntwk_conn_tocnx;
 
 
 static const value_string ett_c15ch_ntwk_conn_path_types[] = {
@@ -672,35 +672,35 @@ static const value_string ett_c15ch_ntwk_conn_conn_types[] = {
 /* orig */
 
 /* Fields */
-static int hf_c15ch_orig = -1;
-static int hf_c15ch_orig_tnblocktype = -1;
-static int hf_c15ch_orig_ni = -1;
-static int hf_c15ch_orig_tn = -1;
-static int hf_c15ch_orig_ni_tn = -1;
+static int hf_c15ch_orig;
+static int hf_c15ch_orig_tnblocktype;
+static int hf_c15ch_orig_ni;
+static int hf_c15ch_orig_tn;
+static int hf_c15ch_orig_ni_tn;
 
-static int hf_c15ch_orig_dndigits = -1;
+static int hf_c15ch_orig_dndigits;
 
-static int hf_c15ch_orig_nidscrn = -1;
-static int hf_c15ch_orig_nidaddrtype = -1;
-static int hf_c15ch_orig_nidnmbrplan = -1;
-static int hf_c15ch_orig_nidprivind = -1;
-static int hf_c15ch_orig_upnsaved = -1;
+static int hf_c15ch_orig_nidscrn;
+static int hf_c15ch_orig_nidaddrtype;
+static int hf_c15ch_orig_nidnmbrplan;
+static int hf_c15ch_orig_nidprivind;
+static int hf_c15ch_orig_upnsaved;
 
-static int hf_c15ch_orig_upndigits = -1;
+static int hf_c15ch_orig_upndigits;
 
-static int hf_c15ch_orig_upnscrn = -1;
-static int hf_c15ch_orig_upnaddrtype = -1;
-static int hf_c15ch_orig_upnnmbrplan = -1;
-static int hf_c15ch_orig_upnprivind = -1;
-static int hf_c15ch_orig_rnpsaved = -1;
+static int hf_c15ch_orig_upnscrn;
+static int hf_c15ch_orig_upnaddrtype;
+static int hf_c15ch_orig_upnnmbrplan;
+static int hf_c15ch_orig_upnprivind;
+static int hf_c15ch_orig_rnpsaved;
 
-static int hf_c15ch_orig_rnpdigits = -1;
+static int hf_c15ch_orig_rnpdigits;
 
-static int hf_c15ch_orig_rnpscrn = -1;
-static int hf_c15ch_orig_rnpaddrtype = -1;
-static int hf_c15ch_orig_rnpnmbrplan = -1;
-static int hf_c15ch_orig_rnpprivind = -1;
-static int hf_c15ch_orig_iptime = -1;
+static int hf_c15ch_orig_rnpscrn;
+static int hf_c15ch_orig_rnpaddrtype;
+static int hf_c15ch_orig_rnpnmbrplan;
+static int hf_c15ch_orig_rnpprivind;
+static int hf_c15ch_orig_iptime;
 
 
 /* labels for blocktype */
@@ -929,50 +929,50 @@ static value_string_ext c15ch_orig_block_types_ext = VALUE_STRING_EXT_INIT(c15ch
 /* out gwe bc */
 
 /* Fields */
-static int hf_c15ch_outgwebc = -1;
-static int hf_c15ch_outgwebc_pbc_conn_ni = -1;
-static int hf_c15ch_outgwebc_pbc_conn_tn = -1;
-static int hf_c15ch_outgwebc_pbc_conn_ni_tn = -1;
-static int hf_c15ch_outgwebc_pbc_conn_num = -1;
-static int hf_c15ch_outgwebc_pbc_conn_type = -1;
-static int hf_c15ch_outgwebc_bc_msg_type = -1;
-static int hf_c15ch_outgwebc_op_bc_sdp_ip = -1;
-static int hf_c15ch_outgwebc_op_bc_sdp_port = -1;
-static int hf_c15ch_outgwebc_pbc_mdrp_mode = -1;
-static int hf_c15ch_outgwebc_pbc_tst_flags = -1;
+static int hf_c15ch_outgwebc;
+static int hf_c15ch_outgwebc_pbc_conn_ni;
+static int hf_c15ch_outgwebc_pbc_conn_tn;
+static int hf_c15ch_outgwebc_pbc_conn_ni_tn;
+static int hf_c15ch_outgwebc_pbc_conn_num;
+static int hf_c15ch_outgwebc_pbc_conn_type;
+static int hf_c15ch_outgwebc_bc_msg_type;
+static int hf_c15ch_outgwebc_op_bc_sdp_ip;
+static int hf_c15ch_outgwebc_op_bc_sdp_port;
+static int hf_c15ch_outgwebc_pbc_mdrp_mode;
+static int hf_c15ch_outgwebc_pbc_tst_flags;
 
 
 /* pathfind */
 /* Fields */
-static int hf_c15ch_pathfind = -1;
-static int hf_c15ch_pathfind_vds30 = -1;
-
-static int hf_c15ch_pathfind_fromgweni = -1;
-static int hf_c15ch_pathfind_fromgwetn = -1;
-static int hf_c15ch_pathfind_fromgwenitn = -1;
-static int hf_c15ch_pathfind_fromoptimized = -1;
-static int hf_c15ch_pathfind_fromsite = -1;
-static int hf_c15ch_pathfind_frompm = -1;
-static int hf_c15ch_pathfind_frompc = -1;
-static int hf_c15ch_pathfind_fromloop = -1;
-static int hf_c15ch_pathfind_fromslot = -1;
-static int hf_c15ch_pathfind_fromcnx = -1;
-static int hf_c15ch_pathfind_fromni = -1;
-static int hf_c15ch_pathfind_fromtn = -1;
-static int hf_c15ch_pathfind_fromnitn = -1;
-static int hf_c15ch_pathfind_togweni = -1;
-static int hf_c15ch_pathfind_togwetn = -1;
-static int hf_c15ch_pathfind_togwenitn = -1;
-static int hf_c15ch_pathfind_tooptimized = -1;
-static int hf_c15ch_pathfind_tosite = -1;
-static int hf_c15ch_pathfind_topm = -1;
-static int hf_c15ch_pathfind_topc = -1;
-static int hf_c15ch_pathfind_toloop = -1;
-static int hf_c15ch_pathfind_toslot = -1;
-static int hf_c15ch_pathfind_tocnx = -1;
-static int hf_c15ch_pathfind_toni = -1;
-static int hf_c15ch_pathfind_totn = -1;
-static int hf_c15ch_pathfind_tonitn = -1;
+static int hf_c15ch_pathfind;
+static int hf_c15ch_pathfind_vds30;
+
+static int hf_c15ch_pathfind_fromgweni;
+static int hf_c15ch_pathfind_fromgwetn;
+static int hf_c15ch_pathfind_fromgwenitn;
+static int hf_c15ch_pathfind_fromoptimized;
+static int hf_c15ch_pathfind_fromsite;
+static int hf_c15ch_pathfind_frompm;
+static int hf_c15ch_pathfind_frompc;
+static int hf_c15ch_pathfind_fromloop;
+static int hf_c15ch_pathfind_fromslot;
+static int hf_c15ch_pathfind_fromcnx;
+static int hf_c15ch_pathfind_fromni;
+static int hf_c15ch_pathfind_fromtn;
+static int hf_c15ch_pathfind_fromnitn;
+static int hf_c15ch_pathfind_togweni;
+static int hf_c15ch_pathfind_togwetn;
+static int hf_c15ch_pathfind_togwenitn;
+static int hf_c15ch_pathfind_tooptimized;
+static int hf_c15ch_pathfind_tosite;
+static int hf_c15ch_pathfind_topm;
+static int hf_c15ch_pathfind_topc;
+static int hf_c15ch_pathfind_toloop;
+static int hf_c15ch_pathfind_toslot;
+static int hf_c15ch_pathfind_tocnx;
+static int hf_c15ch_pathfind_toni;
+static int hf_c15ch_pathfind_totn;
+static int hf_c15ch_pathfind_tonitn;
 
 /* value_string arrays to label fields */
 /* for vds30 field ...*/
@@ -988,36 +988,36 @@ static const value_string c15ch_pathfind_vds30_types[] = {
 /* pathidle */
 
 /* Fields */
-static int hf_c15ch_pathidle = -1;
-static int hf_c15ch_pathidle_vds30 = -1;
-static int hf_c15ch_pathidle_idlecode = -1;
-static int hf_c15ch_pathidle_pathtype = -1;
-
-static int hf_c15ch_pathidle_fromgweni = -1;
-static int hf_c15ch_pathidle_fromgwenitn = -1;
-static int hf_c15ch_pathidle_fromgwetn = -1;
-static int hf_c15ch_pathidle_fromsite = -1;
-static int hf_c15ch_pathidle_frompm = -1;
-static int hf_c15ch_pathidle_frompc = -1;
-static int hf_c15ch_pathidle_fromloop = -1;
-static int hf_c15ch_pathidle_fromslot = -1;
-static int hf_c15ch_pathidle_fromcnx = -1;
-static int hf_c15ch_pathidle_fromni = -1;
-static int hf_c15ch_pathidle_fromnitn = -1;
-static int hf_c15ch_pathidle_fromtn = -1;
-
-static int hf_c15ch_pathidle_togweni = -1;
-static int hf_c15ch_pathidle_togwenitn = -1;
-static int hf_c15ch_pathidle_togwetn = -1;
-static int hf_c15ch_pathidle_tosite = -1;
-static int hf_c15ch_pathidle_topm = -1;
-static int hf_c15ch_pathidle_topc = -1;
-static int hf_c15ch_pathidle_toloop = -1;
-static int hf_c15ch_pathidle_toslot = -1;
-static int hf_c15ch_pathidle_tocnx = -1;
-static int hf_c15ch_pathidle_toni = -1;
-static int hf_c15ch_pathidle_tonitn = -1;
-static int hf_c15ch_pathidle_totn = -1;
+static int hf_c15ch_pathidle;
+static int hf_c15ch_pathidle_vds30;
+static int hf_c15ch_pathidle_idlecode;
+static int hf_c15ch_pathidle_pathtype;
+
+static int hf_c15ch_pathidle_fromgweni;
+static int hf_c15ch_pathidle_fromgwenitn;
+static int hf_c15ch_pathidle_fromgwetn;
+static int hf_c15ch_pathidle_fromsite;
+static int hf_c15ch_pathidle_frompm;
+static int hf_c15ch_pathidle_frompc;
+static int hf_c15ch_pathidle_fromloop;
+static int hf_c15ch_pathidle_fromslot;
+static int hf_c15ch_pathidle_fromcnx;
+static int hf_c15ch_pathidle_fromni;
+static int hf_c15ch_pathidle_fromnitn;
+static int hf_c15ch_pathidle_fromtn;
+
+static int hf_c15ch_pathidle_togweni;
+static int hf_c15ch_pathidle_togwenitn;
+static int hf_c15ch_pathidle_togwetn;
+static int hf_c15ch_pathidle_tosite;
+static int hf_c15ch_pathidle_topm;
+static int hf_c15ch_pathidle_topc;
+static int hf_c15ch_pathidle_toloop;
+static int hf_c15ch_pathidle_toslot;
+static int hf_c15ch_pathidle_tocnx;
+static int hf_c15ch_pathidle_toni;
+static int hf_c15ch_pathidle_tonitn;
+static int hf_c15ch_pathidle_totn;
 
 
 /* for vds30 field */
@@ -1058,12 +1058,12 @@ static const value_string c15ch_pathidle_idle_types[] = {
 /* q931 */
 
 /* Fields */
-static int hf_c15ch_q931 = -1;
-static int hf_c15ch_q931_direction = -1;
-static int hf_c15ch_q931_ni = -1;
-static int hf_c15ch_q931_tn = -1;
-static int hf_c15ch_q931_ni_tn = -1;
-static int hf_c15ch_q931_msglength = -1;
+static int hf_c15ch_q931;
+static int hf_c15ch_q931_direction;
+static int hf_c15ch_q931_ni;
+static int hf_c15ch_q931_tn;
+static int hf_c15ch_q931_ni_tn;
+static int hf_c15ch_q931_msglength;
 
 
 /* value_string arrays to label fields */
@@ -1077,39 +1077,39 @@ static const value_string c15ch_q931_direction_types[] = {
 /* quality of service (qos) */
 
 /* Fields */
-static int hf_c15ch_qos = -1;
-static int hf_c15ch_qos_ni = -1;
-static int hf_c15ch_qos_tn = -1;
-static int hf_c15ch_qos_ni_tn = -1;
-static int hf_c15ch_qos_rtcp_call_id = -1;
-static int hf_c15ch_qos_register_type = -1;
-static int hf_c15ch_qos_tg_num = -1;
-static int hf_c15ch_qos_trk_type = -1;
-static int hf_c15ch_qos_status = -1;
-static int hf_c15ch_qos_codec = -1;
-static int hf_c15ch_qos_given_ip = -1;
-static int hf_c15ch_qos_real_ip = -1;
-static int hf_c15ch_qos_local_ip = -1;
-static int hf_c15ch_qos_tx_pkts = -1;
-static int hf_c15ch_qos_lost_pkts = -1;
-static int hf_c15ch_qos_lost_pct = -1;
-static int hf_c15ch_qos_jitter = -1;
-static int hf_c15ch_qos_rtt = -1;
-static int hf_c15ch_qos_avg_rtt = -1;
-static int hf_c15ch_qos_duration = -1;
-static int hf_c15ch_qos_mos = -1;
-static int hf_c15ch_qos_ep_type = -1;
-static int hf_c15ch_qos_dn_or_tg = -1;
-static int hf_c15ch_qos_pm = -1;
-static int hf_c15ch_qos_pc = -1;
-static int hf_c15ch_qos_hour = -1;
-static int hf_c15ch_qos_min = -1;
-static int hf_c15ch_qos_sec = -1;
-static int hf_c15ch_qos_tenth_sec = -1;
-static int hf_c15ch_qos_year = -1;
-static int hf_c15ch_qos_month = -1;
-static int hf_c15ch_qos_day = -1;
-static int hf_c15ch_qos_day_of_week = -1;
+static int hf_c15ch_qos;
+static int hf_c15ch_qos_ni;
+static int hf_c15ch_qos_tn;
+static int hf_c15ch_qos_ni_tn;
+static int hf_c15ch_qos_rtcp_call_id;
+static int hf_c15ch_qos_register_type;
+static int hf_c15ch_qos_tg_num;
+static int hf_c15ch_qos_trk_type;
+static int hf_c15ch_qos_status;
+static int hf_c15ch_qos_codec;
+static int hf_c15ch_qos_given_ip;
+static int hf_c15ch_qos_real_ip;
+static int hf_c15ch_qos_local_ip;
+static int hf_c15ch_qos_tx_pkts;
+static int hf_c15ch_qos_lost_pkts;
+static int hf_c15ch_qos_lost_pct;
+static int hf_c15ch_qos_jitter;
+static int hf_c15ch_qos_rtt;
+static int hf_c15ch_qos_avg_rtt;
+static int hf_c15ch_qos_duration;
+static int hf_c15ch_qos_mos;
+static int hf_c15ch_qos_ep_type;
+static int hf_c15ch_qos_dn_or_tg;
+static int hf_c15ch_qos_pm;
+static int hf_c15ch_qos_pc;
+static int hf_c15ch_qos_hour;
+static int hf_c15ch_qos_min;
+static int hf_c15ch_qos_sec;
+static int hf_c15ch_qos_tenth_sec;
+static int hf_c15ch_qos_year;
+static int hf_c15ch_qos_month;
+static int hf_c15ch_qos_day;
+static int hf_c15ch_qos_day_of_week;
 
 
 /* value_string arrays to label fields */
@@ -1127,14 +1127,14 @@ static const value_string ett_c15ch_qos_status_types[] = {
 /* route */
 
 /* Fields */
-static int hf_c15ch_route = -1;
-static int hf_c15ch_route_number = -1;
-static int hf_c15ch_route_type = -1;
-static int hf_c15ch_route_subpm = -1;
-static int hf_c15ch_route_trkpm = -1;
-static int hf_c15ch_route_strtaindo = -1;
-static int hf_c15ch_route_cr_rte_adv = -1;
-static int hf_c15ch_route_cause = -1;
+static int hf_c15ch_route;
+static int hf_c15ch_route_number;
+static int hf_c15ch_route_type;
+static int hf_c15ch_route_subpm;
+static int hf_c15ch_route_trkpm;
+static int hf_c15ch_route_strtaindo;
+static int hf_c15ch_route_cr_rte_adv;
+static int hf_c15ch_route_cause;
 
 
 /* field labels */
@@ -1179,23 +1179,23 @@ static const value_string c15_route_types[] = {
 static value_string_ext c15_route_types_ext = VALUE_STRING_EXT_INIT(c15_route_types);
 
 /* Fields */
-static int hf_c15ch_sccp = -1;
-static int hf_c15ch_sccp_direction = -1;
-static int hf_c15ch_sccp_msgtype = -1;
-static int hf_c15ch_sccp_hopcount = -1;
-static int hf_c15ch_sccp_transactionnum = -1;
-static int hf_c15ch_sccp_opcmember = -1;
-static int hf_c15ch_sccp_opccluster = -1;
-static int hf_c15ch_sccp_opcnetwork = -1;
-static int hf_c15ch_sccp_dpcmember = -1;
-static int hf_c15ch_sccp_dpccluster = -1;
-static int hf_c15ch_sccp_dpcnetwork = -1;
-static int hf_c15ch_sccp_ni = -1;
-static int hf_c15ch_sccp_ni_tn = -1;
-static int hf_c15ch_sccp_tn = -1;
-static int hf_c15ch_sccp_sls = -1;
-static int hf_c15ch_sccp_iptime = -1;
-static int hf_c15ch_sccp_level3index = -1;
+static int hf_c15ch_sccp;
+static int hf_c15ch_sccp_direction;
+static int hf_c15ch_sccp_msgtype;
+static int hf_c15ch_sccp_hopcount;
+static int hf_c15ch_sccp_transactionnum;
+static int hf_c15ch_sccp_opcmember;
+static int hf_c15ch_sccp_opccluster;
+static int hf_c15ch_sccp_opcnetwork;
+static int hf_c15ch_sccp_dpcmember;
+static int hf_c15ch_sccp_dpccluster;
+static int hf_c15ch_sccp_dpcnetwork;
+static int hf_c15ch_sccp_ni;
+static int hf_c15ch_sccp_ni_tn;
+static int hf_c15ch_sccp_tn;
+static int hf_c15ch_sccp_sls;
+static int hf_c15ch_sccp_iptime;
+static int hf_c15ch_sccp_level3index;
 
 
 static const value_string c15ch_sccp_direction_types[] = {
@@ -1215,10 +1215,10 @@ static const value_string c15ch_sccp_msg_types[] = {
 /* srcedest */
 
 /* Fields */
-static int hf_c15ch_srcedest = -1;
-static int hf_c15ch_srcedest_conntype = -1;
-static int hf_c15ch_srcedest_pathtype = -1;
-static int hf_c15ch_srcedest_pathdirect = -1;
+static int hf_c15ch_srcedest;
+static int hf_c15ch_srcedest_conntype;
+static int hf_c15ch_srcedest_pathtype;
+static int hf_c15ch_srcedest_pathdirect;
 
 
 /* field labels */
@@ -1254,24 +1254,24 @@ static const value_string c15_srcedest_path_types[] = {
 
 /* tcap */
 /* Fields */
-static int hf_c15ch_tcap = -1;
-static int hf_c15ch_tcap_direction = -1;
-static int hf_c15ch_tcap_action = -1;
-static int hf_c15ch_tcap_package_type = -1;
-static int hf_c15ch_tcap_ssn = -1;
-static int hf_c15ch_tcap_local_ssn = -1;
-static int hf_c15ch_tcap_result_err_code = -1;
-static int hf_c15ch_tcap_return_reason = -1;
-static int hf_c15ch_tcap_feat_id = -1;
-static int hf_c15ch_tcap_feat_req = -1;
-static int hf_c15ch_tcap_cl_comp_result = -1;
-static int hf_c15ch_tcap_release_bit = -1;
-static int hf_c15ch_tcap_term_cl_request = -1;
-static int hf_c15ch_tcap_opc_index = -1;
-static int hf_c15ch_tcap_dpc_mem = -1;
-static int hf_c15ch_tcap_dpc_clus = -1;
-static int hf_c15ch_tcap_dpc_net = -1;
-static int hf_c15ch_tcap_cp_id = -1;
+static int hf_c15ch_tcap;
+static int hf_c15ch_tcap_direction;
+static int hf_c15ch_tcap_action;
+static int hf_c15ch_tcap_package_type;
+static int hf_c15ch_tcap_ssn;
+static int hf_c15ch_tcap_local_ssn;
+static int hf_c15ch_tcap_result_err_code;
+static int hf_c15ch_tcap_return_reason;
+static int hf_c15ch_tcap_feat_id;
+static int hf_c15ch_tcap_feat_req;
+static int hf_c15ch_tcap_cl_comp_result;
+static int hf_c15ch_tcap_release_bit;
+static int hf_c15ch_tcap_term_cl_request;
+static int hf_c15ch_tcap_opc_index;
+static int hf_c15ch_tcap_dpc_mem;
+static int hf_c15ch_tcap_dpc_clus;
+static int hf_c15ch_tcap_dpc_net;
+static int hf_c15ch_tcap_cp_id;
 
 /* value strings */
 static const value_string c15ch_tcap_action_types[] = {
@@ -1399,115 +1399,115 @@ static const value_string c15ch_tcap_local_ssn_types[] = {
 /* twc rswch */
 
 /* Fields */
-static int hf_c15ch_twc_rswch = -1;
-static int hf_c15ch_twc_rswch_pm = -1;
-static int hf_c15ch_twc_rswch_subpm = -1;
-static int hf_c15ch_twc_rswch_trkpm = -1;
-static int hf_c15ch_twc_rswch_devid = -1;
-static int hf_c15ch_twc_rswch_event = -1;
-static int hf_c15ch_twc_rswch_parm = -1;
-static int hf_c15ch_twc_rswch_iptime = -1;
+static int hf_c15ch_twc_rswch;
+static int hf_c15ch_twc_rswch_pm;
+static int hf_c15ch_twc_rswch_subpm;
+static int hf_c15ch_twc_rswch_trkpm;
+static int hf_c15ch_twc_rswch_devid;
+static int hf_c15ch_twc_rswch_event;
+static int hf_c15ch_twc_rswch_parm;
+static int hf_c15ch_twc_rswch_iptime;
 
 
 /* cp event */
 
 
 /* Fields */
-static int hf_c15ch_cp_event = -1;
-static int hf_c15ch_cp_event_pm = -1;
-static int hf_c15ch_cp_event_subpm = -1;
-static int hf_c15ch_cp_event_trkpm = -1;
-static int hf_c15ch_cp_event_dig_ckt_test_trkpm = -1;
-static int hf_c15ch_cp_event_devid = -1;
-static int hf_c15ch_cp_event_event = -1;
-static int hf_c15ch_cp_event_parm = -1;
-static int hf_c15ch_cp_event_iptime = -1;
-static int hf_c15ch_cp_event_subpm_orig = -1;
-static int hf_c15ch_cp_event_subpm_disc_time = -1;
-static int hf_c15ch_cp_event_subpm_revert = -1;
-static int hf_c15ch_cp_event_subpm_orig_dt = -1;
-static int hf_c15ch_cp_event_subpm_orig_ws = -1;
-static int hf_c15ch_cp_event_subpm_orig_dd = -1;
-static int hf_c15ch_cp_event_subpm_orig_id = -1;
-static int hf_c15ch_cp_event_subpm_no_test = -1;
-static int hf_c15ch_cp_event_subpm_dialing = -1;
-static int hf_c15ch_cp_event_subpm_rebuilt = -1;
-static int hf_c15ch_cp_event_subpm_acfw_reac = -1;
-static int hf_c15ch_cp_event_subpm_process_route = -1;
-static int hf_c15ch_cp_event_subpm_rte_line = -1;
-static int hf_c15ch_cp_event_subpm_mtce = -1;
-static int hf_c15ch_cp_event_subpm_aux_tone = -1;
-static int hf_c15ch_cp_event_subpm_noller = -1;
-static int hf_c15ch_cp_event_subpm_ittk = -1;
-static int hf_c15ch_cp_event_subpm_alm_send = -1;
-static int hf_c15ch_cp_event_subpm_ani_spill = -1;
-static int hf_c15ch_cp_event_subpm_trunk_term = -1;
-static int hf_c15ch_cp_event_subpm_line_term = -1;
-static int hf_c15ch_cp_event_subpm_non_cp = -1;
-static int hf_c15ch_cp_event_subpm_3wc = -1;
-static int hf_c15ch_cp_event_subpm_held_3wc = -1;
-static int hf_c15ch_cp_event_subpm_cwt = -1;
-static int hf_c15ch_cp_event_subpm_held_cwt = -1;
-static int hf_c15ch_cp_event_subpm_update_sc = -1;
-static int hf_c15ch_cp_event_subpm_orig_spdt = -1;
-static int hf_c15ch_cp_event_subpm_acfw_retm = -1;
-static int hf_c15ch_cp_event_subpm_cfw_busy = -1;
-static int hf_c15ch_cp_event_subpm_cfw = -1;
-static int hf_c15ch_cp_event_subpm_cfw_deact = -1;
-static int hf_c15ch_cp_event_subpm_rcfw = -1;
-static int hf_c15ch_cp_event_subpm_rotl_tp = -1;
-static int hf_c15ch_cp_event_subpm_chdt = -1;
-static int hf_c15ch_cp_event_subpm_chd = -1;
-static int hf_c15ch_cp_event_subpm_cheld = -1;
-static int hf_c15ch_cp_event_subpm_3wch = -1;
-static int hf_c15ch_cp_event_subpm_3wcw = -1;
-static int hf_c15ch_cp_event_subpm_cslt = -1;
-static int hf_c15ch_cp_event_subpm_dig_ckt_test = -1;
-
-static int hf_c15ch_cp_event_dig_ckt_test_subpm_sp = -1;
-static int hf_c15ch_cp_event_dig_ckt_test_subpm_mp = -1;
-static int hf_c15ch_cp_event_dig_ckt_test_subpm_coin = -1;
-static int hf_c15ch_cp_event_dig_ckt_test_subpm_isdn = -1;
-static int hf_c15ch_cp_event_dig_ckt_test_subpm_trc = -1;
-static int hf_c15ch_cp_event_dig_ckt_test_subpm_disc = -1;
-
-static int hf_c15ch_cp_event_subpm_nail = -1;
-static int hf_c15ch_cp_event_subpm_dcbi = -1;
-static int hf_c15ch_cp_event_subpm_rag_confirm = -1;
-static int hf_c15ch_cp_event_subpm_rag_process = -1;
-static int hf_c15ch_cp_event_subpm_e800 = -1;
-static int hf_c15ch_cp_event_subpm_cfra = -1;
-static int hf_c15ch_cp_event_subpm_mwi_deac = -1;
-static int hf_c15ch_cp_event_subpm_acar_cp = -1;
-static int hf_c15ch_cp_event_subpm_acar_rering = -1;
-static int hf_c15ch_cp_event_subpm_acar_ann = -1;
-static int hf_c15ch_cp_event_subpm_sle = -1;
-static int hf_c15ch_cp_event_subpm_perform_cot = -1;
-static int hf_c15ch_cp_event_subpm_clid = -1;
-static int hf_c15ch_cp_event_subpm_xpm = -1;
-static int hf_c15ch_cp_event_subpm_mwil = -1;
-static int hf_c15ch_cp_event_subpm_ldbs = -1;
-static int hf_c15ch_cp_event_subpm_acr = -1;
-static int hf_c15ch_cp_event_subpm_call_park = -1;
-static int hf_c15ch_cp_event_subpm_camp_on_recall = -1;
-static int hf_c15ch_cp_event_subpm_cff = -1;
-static int hf_c15ch_cp_event_subpm_ibert = -1;
-static int hf_c15ch_cp_event_subpm_ain = -1;
-static int hf_c15ch_cp_event_subpm_ain_sit = -1;
-static int hf_c15ch_cp_event_subpm_ain_rtg = -1;
-static int hf_c15ch_cp_event_subpm_nail_bcon = -1;
-static int hf_c15ch_cp_event_subpm_nail_dcon = -1;
-static int hf_c15ch_cp_event_subpm_qtrn_trvr = -1;
-static int hf_c15ch_cp_event_subpm_ekts = -1;
-static int hf_c15ch_cp_event_subpm_alt = -1;
-static int hf_c15ch_cp_event_subpm_calea = -1;
-static int hf_c15ch_cp_event_subpm_sim_ring = -1;
-static int hf_c15ch_cp_event_subpm_lta = -1;
-static int hf_c15ch_cp_event_subpm_hgq = -1;
-static int hf_c15ch_cp_event_subpm_idle = -1;
-static int hf_c15ch_cp_event_subpm_sig = -1;
-static int hf_c15ch_cp_event_subpm_sig_dest = -1;
-static int hf_c15ch_cp_event_subpm_agl_splrg = -1;
+static int hf_c15ch_cp_event;
+static int hf_c15ch_cp_event_pm;
+static int hf_c15ch_cp_event_subpm;
+static int hf_c15ch_cp_event_trkpm;
+static int hf_c15ch_cp_event_dig_ckt_test_trkpm;
+static int hf_c15ch_cp_event_devid;
+static int hf_c15ch_cp_event_event;
+static int hf_c15ch_cp_event_parm;
+static int hf_c15ch_cp_event_iptime;
+static int hf_c15ch_cp_event_subpm_orig;
+static int hf_c15ch_cp_event_subpm_disc_time;
+static int hf_c15ch_cp_event_subpm_revert;
+static int hf_c15ch_cp_event_subpm_orig_dt;
+static int hf_c15ch_cp_event_subpm_orig_ws;
+static int hf_c15ch_cp_event_subpm_orig_dd;
+static int hf_c15ch_cp_event_subpm_orig_id;
+static int hf_c15ch_cp_event_subpm_no_test;
+static int hf_c15ch_cp_event_subpm_dialing;
+static int hf_c15ch_cp_event_subpm_rebuilt;
+static int hf_c15ch_cp_event_subpm_acfw_reac;
+static int hf_c15ch_cp_event_subpm_process_route;
+static int hf_c15ch_cp_event_subpm_rte_line;
+static int hf_c15ch_cp_event_subpm_mtce;
+static int hf_c15ch_cp_event_subpm_aux_tone;
+static int hf_c15ch_cp_event_subpm_noller;
+static int hf_c15ch_cp_event_subpm_ittk;
+static int hf_c15ch_cp_event_subpm_alm_send;
+static int hf_c15ch_cp_event_subpm_ani_spill;
+static int hf_c15ch_cp_event_subpm_trunk_term;
+static int hf_c15ch_cp_event_subpm_line_term;
+static int hf_c15ch_cp_event_subpm_non_cp;
+static int hf_c15ch_cp_event_subpm_3wc;
+static int hf_c15ch_cp_event_subpm_held_3wc;
+static int hf_c15ch_cp_event_subpm_cwt;
+static int hf_c15ch_cp_event_subpm_held_cwt;
+static int hf_c15ch_cp_event_subpm_update_sc;
+static int hf_c15ch_cp_event_subpm_orig_spdt;
+static int hf_c15ch_cp_event_subpm_acfw_retm;
+static int hf_c15ch_cp_event_subpm_cfw_busy;
+static int hf_c15ch_cp_event_subpm_cfw;
+static int hf_c15ch_cp_event_subpm_cfw_deact;
+static int hf_c15ch_cp_event_subpm_rcfw;
+static int hf_c15ch_cp_event_subpm_rotl_tp;
+static int hf_c15ch_cp_event_subpm_chdt;
+static int hf_c15ch_cp_event_subpm_chd;
+static int hf_c15ch_cp_event_subpm_cheld;
+static int hf_c15ch_cp_event_subpm_3wch;
+static int hf_c15ch_cp_event_subpm_3wcw;
+static int hf_c15ch_cp_event_subpm_cslt;
+static int hf_c15ch_cp_event_subpm_dig_ckt_test;
+
+static int hf_c15ch_cp_event_dig_ckt_test_subpm_sp;
+static int hf_c15ch_cp_event_dig_ckt_test_subpm_mp;
+static int hf_c15ch_cp_event_dig_ckt_test_subpm_coin;
+static int hf_c15ch_cp_event_dig_ckt_test_subpm_isdn;
+static int hf_c15ch_cp_event_dig_ckt_test_subpm_trc;
+static int hf_c15ch_cp_event_dig_ckt_test_subpm_disc;
+
+static int hf_c15ch_cp_event_subpm_nail;
+static int hf_c15ch_cp_event_subpm_dcbi;
+static int hf_c15ch_cp_event_subpm_rag_confirm;
+static int hf_c15ch_cp_event_subpm_rag_process;
+static int hf_c15ch_cp_event_subpm_e800;
+static int hf_c15ch_cp_event_subpm_cfra;
+static int hf_c15ch_cp_event_subpm_mwi_deac;
+static int hf_c15ch_cp_event_subpm_acar_cp;
+static int hf_c15ch_cp_event_subpm_acar_rering;
+static int hf_c15ch_cp_event_subpm_acar_ann;
+static int hf_c15ch_cp_event_subpm_sle;
+static int hf_c15ch_cp_event_subpm_perform_cot;
+static int hf_c15ch_cp_event_subpm_clid;
+static int hf_c15ch_cp_event_subpm_xpm;
+static int hf_c15ch_cp_event_subpm_mwil;
+static int hf_c15ch_cp_event_subpm_ldbs;
+static int hf_c15ch_cp_event_subpm_acr;
+static int hf_c15ch_cp_event_subpm_call_park;
+static int hf_c15ch_cp_event_subpm_camp_on_recall;
+static int hf_c15ch_cp_event_subpm_cff;
+static int hf_c15ch_cp_event_subpm_ibert;
+static int hf_c15ch_cp_event_subpm_ain;
+static int hf_c15ch_cp_event_subpm_ain_sit;
+static int hf_c15ch_cp_event_subpm_ain_rtg;
+static int hf_c15ch_cp_event_subpm_nail_bcon;
+static int hf_c15ch_cp_event_subpm_nail_dcon;
+static int hf_c15ch_cp_event_subpm_qtrn_trvr;
+static int hf_c15ch_cp_event_subpm_ekts;
+static int hf_c15ch_cp_event_subpm_alt;
+static int hf_c15ch_cp_event_subpm_calea;
+static int hf_c15ch_cp_event_subpm_sim_ring;
+static int hf_c15ch_cp_event_subpm_lta;
+static int hf_c15ch_cp_event_subpm_hgq;
+static int hf_c15ch_cp_event_subpm_idle;
+static int hf_c15ch_cp_event_subpm_sig;
+static int hf_c15ch_cp_event_subpm_sig_dest;
+static int hf_c15ch_cp_event_subpm_agl_splrg;
 
 
 /*static const guint32 MIN_PM_VAL = 0; */
@@ -2960,21 +2960,21 @@ static value_string_ext c15_event_types_ext = VALUE_STRING_EXT_INIT(c15_event_ty
 static dissector_table_t c15ch_inc_gwe_dissector_table;
 
 /* Fields */
-static int hf_c15ch_inc_gwe = -1;
-static int hf_c15ch_inc_gwe_ni = -1;
-static int hf_c15ch_inc_gwe_tn = -1;
-static int hf_c15ch_inc_gwe_ni_tn = -1;
-static int hf_c15ch_inc_gwe_taskid = -1;
-static int hf_c15ch_inc_gwe_fiatid_invalid = -1;
-static int hf_c15ch_inc_gwe_fiatid_bc = -1;
-static int hf_c15ch_inc_gwe_fiatid_mtce = -1;
-static int hf_c15ch_inc_gwe_fiatid_om = -1;
-static int hf_c15ch_inc_gwe_fiatid_h248 = -1;
-static int hf_c15ch_inc_gwe_fiatid_sua = -1;
-static int hf_c15ch_inc_gwe_fiatid_mgcp = -1;
-static int hf_c15ch_inc_gwe_fiatid_sip_notify = -1;
-static int hf_c15ch_inc_gwe_fiatid_admn = -1;
-static int hf_c15ch_inc_gwe_datatype = -1;
+static int hf_c15ch_inc_gwe;
+static int hf_c15ch_inc_gwe_ni;
+static int hf_c15ch_inc_gwe_tn;
+static int hf_c15ch_inc_gwe_ni_tn;
+static int hf_c15ch_inc_gwe_taskid;
+static int hf_c15ch_inc_gwe_fiatid_invalid;
+static int hf_c15ch_inc_gwe_fiatid_bc;
+static int hf_c15ch_inc_gwe_fiatid_mtce;
+static int hf_c15ch_inc_gwe_fiatid_om;
+static int hf_c15ch_inc_gwe_fiatid_h248;
+static int hf_c15ch_inc_gwe_fiatid_sua;
+static int hf_c15ch_inc_gwe_fiatid_mgcp;
+static int hf_c15ch_inc_gwe_fiatid_sip_notify;
+static int hf_c15ch_inc_gwe_fiatid_admn;
+static int hf_c15ch_inc_gwe_datatype;
 
 
 /* labels */
@@ -3164,36 +3164,36 @@ static const value_string c15inc_gwe_types[] = {
 static value_string_ext c15inc_gwe_types_ext = VALUE_STRING_EXT_INIT(c15inc_gwe_types);
 
 /* Protocol for all third-level Inc GWE dissection */
-static int proto_c15ch_third_level_inc_gwe = -1;
+static int proto_c15ch_third_level_inc_gwe;
 
-static int ett_c15ch_third_level_inc_gwe = -1;
-static int ett_c15ch_third_level_inc_gwe_sub1 = -1;
+static int ett_c15ch_third_level_inc_gwe;
+static int ett_c15ch_third_level_inc_gwe_sub1;
 
 
 /* Fields */
-static int hf_c15ch_inc_gwe_admn_dn = -1;
-static int hf_c15ch_inc_gwe_admn_dn_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_admn_dn_ip_gwe_digits = -1;
+static int hf_c15ch_inc_gwe_admn_dn;
+static int hf_c15ch_inc_gwe_admn_dn_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_admn_dn_ip_gwe_digits;
 
 
 /* Fields */
-static int hf_c15ch_inc_gwe_admn_updt = -1;
-static int hf_c15ch_inc_gwe_admn_updt_ip_gwe_med_ni = -1;
-static int hf_c15ch_inc_gwe_admn_updt_ip_gwe_med_tn = -1;
-static int hf_c15ch_inc_gwe_admn_updt_ip_gwe_med_ni_tn = -1;
-static int hf_c15ch_inc_gwe_admn_updt_ip_ns_iface = -1;
-static int hf_c15ch_inc_gwe_admn_updt_ip_ns_terminal = -1;
-static int hf_c15ch_inc_gwe_admn_updt_ip_gwe_new_rec_addr = -1;
+static int hf_c15ch_inc_gwe_admn_updt;
+static int hf_c15ch_inc_gwe_admn_updt_ip_gwe_med_ni;
+static int hf_c15ch_inc_gwe_admn_updt_ip_gwe_med_tn;
+static int hf_c15ch_inc_gwe_admn_updt_ip_gwe_med_ni_tn;
+static int hf_c15ch_inc_gwe_admn_updt_ip_ns_iface;
+static int hf_c15ch_inc_gwe_admn_updt_ip_ns_terminal;
+static int hf_c15ch_inc_gwe_admn_updt_ip_gwe_new_rec_addr;
 
 /* Fields */
-static int hf_c15ch_inc_gwe_bc_pgi = -1;
-static int hf_c15ch_inc_gwe_bc_pgi_pbc_conn_num = -1;
-static int hf_c15ch_inc_gwe_bc_pgi_pbc_conn_type = -1;
-static int hf_c15ch_inc_gwe_bc_pgi_pbc_msg_type = -1;
-static int hf_c15ch_inc_gwe_bc_pgi_bc_mode = -1;
-static int hf_c15ch_inc_gwe_bc_pgi_bc_pgi_sdp = -1;
-static int hf_c15ch_inc_gwe_bc_pgi_bc_pgi_m_port = -1;
-static int hf_c15ch_inc_gwe_bc_pgi_pbc_tst_flags = -1;
+static int hf_c15ch_inc_gwe_bc_pgi;
+static int hf_c15ch_inc_gwe_bc_pgi_pbc_conn_num;
+static int hf_c15ch_inc_gwe_bc_pgi_pbc_conn_type;
+static int hf_c15ch_inc_gwe_bc_pgi_pbc_msg_type;
+static int hf_c15ch_inc_gwe_bc_pgi_bc_mode;
+static int hf_c15ch_inc_gwe_bc_pgi_bc_pgi_sdp;
+static int hf_c15ch_inc_gwe_bc_pgi_bc_pgi_m_port;
+static int hf_c15ch_inc_gwe_bc_pgi_pbc_tst_flags;
 
 /* Field Labels */
 static const value_string c15_inc_gwe_bc_pgi_pbc_conn_types[] = {
@@ -3206,78 +3206,78 @@ static const value_string c15_inc_gwe_bc_pgi_pbc_conn_types[] = {
 
 /* Subtree */
 #if 0
-static gint ett_c15ch_inc_gwe_bc_pgi = -1;
+static gint ett_c15ch_inc_gwe_bc_pgi;
 #endif
 
 /* Fields */
-static int hf_c15ch_inc_gwe_chg_hndl = -1;
-static int hf_c15ch_inc_gwe_chg_hndl_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_chg_hndl_ip_gwe_new_hndl = -1;
+static int hf_c15ch_inc_gwe_chg_hndl;
+static int hf_c15ch_inc_gwe_chg_hndl_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_chg_hndl_ip_gwe_new_hndl;
 
 
 /* Fields */
-static int hf_c15ch_inc_gwe_cl_ans = -1;
-static int hf_c15ch_inc_gwe_cl_ans_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_cl_ans_ip_gwe_conn_num= -1;
-static int hf_c15ch_inc_gwe_cl_ans_ip_cl_ans_lsdp = -1;
-static int hf_c15ch_inc_gwe_cl_ans_ip_cl_ans_m_port = -1;
-static int hf_c15ch_inc_gwe_cl_ans_encap_isup = -1;
+static int hf_c15ch_inc_gwe_cl_ans;
+static int hf_c15ch_inc_gwe_cl_ans_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_cl_ans_ip_gwe_conn_num;
+static int hf_c15ch_inc_gwe_cl_ans_ip_cl_ans_lsdp;
+static int hf_c15ch_inc_gwe_cl_ans_ip_cl_ans_m_port;
+static int hf_c15ch_inc_gwe_cl_ans_encap_isup;
 
 /* Fields */
-static int hf_c15ch_inc_gwe_cl_prog = -1;
-static int hf_c15ch_inc_gwe_cl_prog_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_cl_prog_ip_gwe_conn_num= -1;
-static int hf_c15ch_inc_gwe_cl_prog_ip_cl_prog_lsdp = -1;
-static int hf_c15ch_inc_gwe_cl_prog_ip_cl_prog_m_port = -1;
-static int hf_c15ch_inc_gwe_cl_prog_ip_gwe_stat_code = -1;
-static int hf_c15ch_inc_gwe_cl_prog_encap_isup = -1;
+static int hf_c15ch_inc_gwe_cl_prog;
+static int hf_c15ch_inc_gwe_cl_prog_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_cl_prog_ip_gwe_conn_num;
+static int hf_c15ch_inc_gwe_cl_prog_ip_cl_prog_lsdp;
+static int hf_c15ch_inc_gwe_cl_prog_ip_cl_prog_m_port;
+static int hf_c15ch_inc_gwe_cl_prog_ip_gwe_stat_code;
+static int hf_c15ch_inc_gwe_cl_prog_encap_isup;
 
 /* Fields */
-static int hf_c15ch_inc_gwe_cl_redir = -1;
-static int hf_c15ch_inc_gwe_cl_redir_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_cl_redir_ip_gwe_conn_num = -1;
-static int hf_c15ch_inc_gwe_cl_redir_ip_gwe_redir_digits = -1;
+static int hf_c15ch_inc_gwe_cl_redir;
+static int hf_c15ch_inc_gwe_cl_redir_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_cl_redir_ip_gwe_conn_num;
+static int hf_c15ch_inc_gwe_cl_redir_ip_gwe_redir_digits;
 
 
 /* Fields */
-static int hf_c15ch_inc_gwe_cl_refer = -1;
-static int hf_c15ch_inc_gwe_cl_refer_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_cl_refer_ip_gwe_conn_num = -1;
-static int hf_c15ch_inc_gwe_cl_refer_ip_gwe_trgt_digits = -1;
-static int hf_c15ch_inc_gwe_cl_refer_ip_gwe_trgt_ni = -1;
-static int hf_c15ch_inc_gwe_cl_refer_ip_gwe_trgt_tn = -1;
-static int hf_c15ch_inc_gwe_cl_refer_ip_gwe_trgt_ni_tn = -1;
+static int hf_c15ch_inc_gwe_cl_refer;
+static int hf_c15ch_inc_gwe_cl_refer_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_cl_refer_ip_gwe_conn_num;
+static int hf_c15ch_inc_gwe_cl_refer_ip_gwe_trgt_digits;
+static int hf_c15ch_inc_gwe_cl_refer_ip_gwe_trgt_ni;
+static int hf_c15ch_inc_gwe_cl_refer_ip_gwe_trgt_tn;
+static int hf_c15ch_inc_gwe_cl_refer_ip_gwe_trgt_ni_tn;
 
 
 /* Fields */
-static int hf_c15ch_inc_gwe_cl_rel = -1;
-static int hf_c15ch_inc_gwe_cl_rel_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_cl_rel_ip_gwe_conn_num = -1;
-static int hf_c15ch_inc_gwe_cl_rel_ip_gwe_stat_code = -1;
-static int hf_c15ch_inc_gwe_cl_rel_encap_isup = -1;
+static int hf_c15ch_inc_gwe_cl_rel;
+static int hf_c15ch_inc_gwe_cl_rel_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_cl_rel_ip_gwe_conn_num;
+static int hf_c15ch_inc_gwe_cl_rel_ip_gwe_stat_code;
+static int hf_c15ch_inc_gwe_cl_rel_encap_isup;
 
 
 
 /* Fields */
-static int hf_c15ch_inc_gwe_cl_setup = -1;
-static int hf_c15ch_inc_gwe_cl_setup_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_cl_setup_ip_gwe_cled_digits = -1;
-static int hf_c15ch_inc_gwe_cl_setup_ip_cl_setup_lsdp = -1;
-static int hf_c15ch_inc_gwe_cl_setup_ip_cl_setup_m_port = -1;
+static int hf_c15ch_inc_gwe_cl_setup;
+static int hf_c15ch_inc_gwe_cl_setup_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_cl_setup_ip_gwe_cled_digits;
+static int hf_c15ch_inc_gwe_cl_setup_ip_cl_setup_lsdp;
+static int hf_c15ch_inc_gwe_cl_setup_ip_cl_setup_m_port;
 
 
 /* Fields */
-static int hf_c15ch_inc_gwe_h248_digit = -1;
-static int hf_c15ch_inc_gwe_h248_digit_ip_gwe_digit = -1;
-static int hf_c15ch_inc_gwe_h248_digit_ip_gwe_digit_method = -1;
+static int hf_c15ch_inc_gwe_h248_digit;
+static int hf_c15ch_inc_gwe_h248_digit_ip_gwe_digit;
+static int hf_c15ch_inc_gwe_h248_digit_ip_gwe_digit_method;
 
 
 /* Fields */
-static int hf_c15ch_inc_gwe_info = -1;
-static int hf_c15ch_inc_gwe_info_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_info_ip_gwe_info_type = -1;
-static int hf_c15ch_inc_gwe_info_ip_gwe_info_digit = -1;
-static int hf_c15ch_inc_gwe_info_encap_isup_msg_type = -1;
+static int hf_c15ch_inc_gwe_info;
+static int hf_c15ch_inc_gwe_info_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_info_ip_gwe_info_type;
+static int hf_c15ch_inc_gwe_info_ip_gwe_info_digit;
+static int hf_c15ch_inc_gwe_info_encap_isup_msg_type;
 
 /* value_string arrays to label fields */
 /* These two encapsulated isup message types are the only valid ones for this field. */
@@ -3288,98 +3288,98 @@ static const value_string c15ch_inc_gwe_info_encap_isup_msg_types[] = {
 };
 
 /* Fields */
-static int hf_c15ch_inc_gwe_inv_repl = -1;
-static int hf_c15ch_inc_gwe_inv_repl_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_inv_repl_ip_gwe_conn_num = -1;
-static int hf_c15ch_inc_gwe_inv_repl_ip_inv_repl_rsdp_ip = -1;
-static int hf_c15ch_inc_gwe_inv_repl_ip_inv_repl_rsdp_port = -1;
+static int hf_c15ch_inc_gwe_inv_repl;
+static int hf_c15ch_inc_gwe_inv_repl_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_inv_repl_ip_gwe_conn_num;
+static int hf_c15ch_inc_gwe_inv_repl_ip_inv_repl_rsdp_ip;
+static int hf_c15ch_inc_gwe_inv_repl_ip_inv_repl_rsdp_port;
 
 /* Fields */
-static int hf_c15ch_inc_gwe_mgcp_dlcx = -1;
-static int hf_c15ch_inc_gwe_mgcp_dlcx_err_code = -1;
+static int hf_c15ch_inc_gwe_mgcp_dlcx;
+static int hf_c15ch_inc_gwe_mgcp_dlcx_err_code;
 
 /* Fields */
-static int hf_c15ch_inc_gwe_notify = -1;
-static int hf_c15ch_inc_gwe_notify_ip_gwe_mwi_stat = -1;
-static int hf_c15ch_inc_gwe_notify_ip_gwe_digits = -1;
+static int hf_c15ch_inc_gwe_notify;
+static int hf_c15ch_inc_gwe_notify_ip_gwe_mwi_stat;
+static int hf_c15ch_inc_gwe_notify_ip_gwe_digits;
 
 /* Fields */
-static int hf_c15ch_inc_gwe_ntwk_mod  = -1;
-static int hf_c15ch_inc_gwe_ntwk_mod_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_ntwk_mod_ip_gwe_conn_num= -1;
-static int hf_c15ch_inc_gwe_ntwk_mod_ip_ntwk_mod_lsdp = -1;
-static int hf_c15ch_inc_gwe_ntwk_mod_ip_ntwk_mod_l_m_port = -1;
-static int hf_c15ch_inc_gwe_ntwk_mod_ip_ntwk_mod_rsdp = -1;
-static int hf_c15ch_inc_gwe_ntwk_mod_ip_ntwk_mod_r_m_port = -1;
-static int hf_c15ch_inc_gwe_ntwk_mod_ip_gwe_stat_code = -1;
+static int hf_c15ch_inc_gwe_ntwk_mod;
+static int hf_c15ch_inc_gwe_ntwk_mod_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_ntwk_mod_ip_gwe_conn_num;
+static int hf_c15ch_inc_gwe_ntwk_mod_ip_ntwk_mod_lsdp;
+static int hf_c15ch_inc_gwe_ntwk_mod_ip_ntwk_mod_l_m_port;
+static int hf_c15ch_inc_gwe_ntwk_mod_ip_ntwk_mod_rsdp;
+static int hf_c15ch_inc_gwe_ntwk_mod_ip_ntwk_mod_r_m_port;
+static int hf_c15ch_inc_gwe_ntwk_mod_ip_gwe_stat_code;
 
 
 /* Fields */
-static int hf_c15ch_inc_gwe_ptrk_setup = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_cled_digits = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_cl_setup_lsdp = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_cl_setup_m_port = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_clid_pri = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_clng_digits = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_clng_ton = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_clng_np = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_alert_info = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_redir_digits = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_redir_ton = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_redir_np = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_ocn_digits = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_chrg_digits = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_chrg_noa = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_chrg_npi = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_npdi = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_rn_digits = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_cic_digits = -1;
-static int hf_c15ch_inc_gwe_ptrk_setup_encap_isup = -1;
+static int hf_c15ch_inc_gwe_ptrk_setup;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_cled_digits;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_cl_setup_lsdp;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_cl_setup_m_port;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_clid_pri;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_clng_digits;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_clng_ton;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_clng_np;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_alert_info;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_redir_digits;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_redir_ton;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_redir_np;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_ocn_digits;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_chrg_digits;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_chrg_noa;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_chrg_npi;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_npdi;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_rn_digits;
+static int hf_c15ch_inc_gwe_ptrk_setup_ip_gwe_cic_digits;
+static int hf_c15ch_inc_gwe_ptrk_setup_encap_isup;
 
 /* Fields */
-static int hf_c15ch_inc_gwe_reply = -1;
-static int hf_c15ch_inc_gwe_reply_ip_gwe_msg_type = -1;
-static int hf_c15ch_inc_gwe_reply_ip_gwe_stat_code = -1;
-static int hf_c15ch_inc_gwe_reply_ip_gwe_conn_num = -1;
-static int hf_c15ch_inc_gwe_reply_nw_mdcn_lsdp_ip = -1;
-static int hf_c15ch_inc_gwe_reply_nw_mdcn_lsdp_port = -1;
-static int hf_c15ch_inc_gwe_reply_nw_mdcn_rsdp_ip = -1;
-static int hf_c15ch_inc_gwe_reply_nw_mdcn_rsdp_port = -1;
+static int hf_c15ch_inc_gwe_reply;
+static int hf_c15ch_inc_gwe_reply_ip_gwe_msg_type;
+static int hf_c15ch_inc_gwe_reply_ip_gwe_stat_code;
+static int hf_c15ch_inc_gwe_reply_ip_gwe_conn_num;
+static int hf_c15ch_inc_gwe_reply_nw_mdcn_lsdp_ip;
+static int hf_c15ch_inc_gwe_reply_nw_mdcn_lsdp_port;
+static int hf_c15ch_inc_gwe_reply_nw_mdcn_rsdp_ip;
+static int hf_c15ch_inc_gwe_reply_nw_mdcn_rsdp_port;
 
 /* Fields */
-static int hf_c15ch_inc_gwe_rv_avail = -1;
-static int hf_c15ch_inc_gwe_rv_avail_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_rv_avail_ip_gwe_conn_num = -1;
-static int hf_c15ch_inc_gwe_rv_avail_ip_gwe_info_len = -1;
+static int hf_c15ch_inc_gwe_rv_avail;
+static int hf_c15ch_inc_gwe_rv_avail_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_rv_avail_ip_gwe_conn_num;
+static int hf_c15ch_inc_gwe_rv_avail_ip_gwe_info_len;
 
 /* Fields */
-static int hf_c15ch_inc_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_sua_hndl_ip_gwe_sua_hndl = -1;
+static int hf_c15ch_inc_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_sua_hndl_ip_gwe_sua_hndl;
 
 /* Fields */
-static int hf_c15ch_inc_gwe_sua_reply = -1;
-static int hf_c15ch_inc_gwe_sua_reply_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_sua_reply_ip_gwe_msg_type = -1;
-static int hf_c15ch_inc_gwe_sua_reply_ip_gwe_stat_code = -1;
-static int hf_c15ch_inc_gwe_sua_reply_ip_gwe_conn_num = -1;
-static int hf_c15ch_inc_gwe_sua_reply_nw_mdcn_lsdp_ip = -1;
-static int hf_c15ch_inc_gwe_sua_reply_nw_mdcn_lsdp_port = -1;
-static int hf_c15ch_inc_gwe_sua_reply_nw_mdcn_rsdp_ip = -1;
-static int hf_c15ch_inc_gwe_sua_reply_nw_mdcn_rsdp_port = -1;
+static int hf_c15ch_inc_gwe_sua_reply;
+static int hf_c15ch_inc_gwe_sua_reply_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_sua_reply_ip_gwe_msg_type;
+static int hf_c15ch_inc_gwe_sua_reply_ip_gwe_stat_code;
+static int hf_c15ch_inc_gwe_sua_reply_ip_gwe_conn_num;
+static int hf_c15ch_inc_gwe_sua_reply_nw_mdcn_lsdp_ip;
+static int hf_c15ch_inc_gwe_sua_reply_nw_mdcn_lsdp_port;
+static int hf_c15ch_inc_gwe_sua_reply_nw_mdcn_rsdp_ip;
+static int hf_c15ch_inc_gwe_sua_reply_nw_mdcn_rsdp_port;
 
 /* Fields */
-static int hf_c15ch_inc_gwe_subs_chg_hndl = -1;
-static int hf_c15ch_inc_gwe_subs_chg_hndl_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_subs_chg_hndl_ip_gwe_new_hndl = -1;
-static int hf_c15ch_inc_gwe_subs_chg_hndl_ip_gwe_med_ni = -1;
-static int hf_c15ch_inc_gwe_subs_chg_hndl_ip_gwe_med_tn = -1;
-static int hf_c15ch_inc_gwe_subs_chg_hndl_ip_gwe_med_ni_tn = -1;
+static int hf_c15ch_inc_gwe_subs_chg_hndl;
+static int hf_c15ch_inc_gwe_subs_chg_hndl_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_subs_chg_hndl_ip_gwe_new_hndl;
+static int hf_c15ch_inc_gwe_subs_chg_hndl_ip_gwe_med_ni;
+static int hf_c15ch_inc_gwe_subs_chg_hndl_ip_gwe_med_tn;
+static int hf_c15ch_inc_gwe_subs_chg_hndl_ip_gwe_med_ni_tn;
 
 /* Fields */
-static int hf_c15ch_inc_gwe_tgh_stat = -1;
-static int hf_c15ch_inc_gwe_tgh_stat_ip_gwe_sua_hndl = -1;
-static int hf_c15ch_inc_gwe_tgh_stat_ip_gwe_tgh_state = -1;
+static int hf_c15ch_inc_gwe_tgh_stat;
+static int hf_c15ch_inc_gwe_tgh_stat_ip_gwe_sua_hndl;
+static int hf_c15ch_inc_gwe_tgh_stat_ip_gwe_tgh_state;
 
 /* value_string arrays to label fields */
 
@@ -3391,8 +3391,8 @@ static const value_string tgh_state_types[] = {
 };
 
 /* Fields */
-static int hf_c15ch_inc_gwe_voip_cot = -1;
-static int hf_c15ch_inc_gwe_voip_cot_ip_gwe_pass_code = -1;
+static int hf_c15ch_inc_gwe_voip_cot;
+static int hf_c15ch_inc_gwe_voip_cot_ip_gwe_pass_code;
 
 /* Field Labels */
 static const true_false_string c15_inc_gwe_voip_cot_ip_gwe_pass_code_types = {
@@ -3402,7 +3402,7 @@ static const true_false_string c15_inc_gwe_voip_cot_ip_gwe_pass_code_types = {
 
 #if 0
 /* Subtree */
-static gint ett_c15ch_inc_gwe_voip_cot = -1;
+static gint ett_c15ch_inc_gwe_voip_cot;
 #endif
 
 /* out gwe */
@@ -3433,29 +3433,29 @@ static gint ett_c15ch_inc_gwe_voip_cot = -1;
 #define C15_OUT_GWE_SIP_INFO       23
 #define C15_OUT_GWE_SIP_REFER      24
 
-static int ett_c15ch_third_level_out_gwe = -1;
-static int ett_c15ch_third_level_out_gwe_sub1 = -1;
-static int ett_c15ch_third_level_out_gwe_sub2 = -1;
+static int ett_c15ch_third_level_out_gwe;
+static int ett_c15ch_third_level_out_gwe_sub1;
+static int ett_c15ch_third_level_out_gwe_sub2;
 
-static int proto_c15ch_third_level_out_gwe = -1;
+static int proto_c15ch_third_level_out_gwe;
 
 /* Dissector Table */
 static dissector_table_t c15ch_out_gwe_dissector_table;
 
 /* Fields */
-static int hf_c15ch_out_gwe = -1;
-static int hf_c15ch_out_gwe_ni = -1;
-static int hf_c15ch_out_gwe_tn = -1;
-static int hf_c15ch_out_gwe_ni_tn = -1;
-static int hf_c15ch_out_gwe_op_gwe_msg_type = -1;
-static int hf_c15ch_out_gwe_op_gwe_protocol = -1;
-static int hf_c15ch_out_gwe_op_sua_hndl = -1;
-static int hf_c15ch_out_gwe_gwe_data_type = -1;
+static int hf_c15ch_out_gwe;
+static int hf_c15ch_out_gwe_ni;
+static int hf_c15ch_out_gwe_tn;
+static int hf_c15ch_out_gwe_ni_tn;
+static int hf_c15ch_out_gwe_op_gwe_msg_type;
+static int hf_c15ch_out_gwe_op_gwe_protocol;
+static int hf_c15ch_out_gwe_op_sua_hndl;
+static int hf_c15ch_out_gwe_gwe_data_type;
 
 #if 0
 /* Subtree */
-static gint ett_c15ch_out_gwe = -1;
-static gint ett_c15ch_out_gwe_sub_ni_tn = -1;
+static gint ett_c15ch_out_gwe;
+static gint ett_c15ch_out_gwe_sub_ni_tn;
 #endif
 
 /* value labels for fields*/
@@ -3560,168 +3560,168 @@ static const value_string c15_out_gwe_msg_types[] = {
 static value_string_ext c15_out_gwe_msg_types_ext = VALUE_STRING_EXT_INIT(c15_out_gwe_msg_types);
 
 /* Fields */
-static int hf_c15ch_out_gwe_audit_conn = -1;
-static int hf_c15ch_out_gwe_audit_conn_ni = -1;
-static int hf_c15ch_out_gwe_audit_conn_tn = -1;
-static int hf_c15ch_out_gwe_audit_conn_ni_tn = -1;
-static int hf_c15ch_out_gwe_audit_conn_context = -1;
+static int hf_c15ch_out_gwe_audit_conn;
+static int hf_c15ch_out_gwe_audit_conn_ni;
+static int hf_c15ch_out_gwe_audit_conn_tn;
+static int hf_c15ch_out_gwe_audit_conn_ni_tn;
+static int hf_c15ch_out_gwe_audit_conn_context;
 
 /* Fields */
-static int hf_c15ch_out_gwe_blf_data = -1;
-static int hf_c15ch_out_gwe_blf_data_rb_ua_handle = -1;
-static int hf_c15ch_out_gwe_blf_data_rb_type = -1;
-static int hf_c15ch_out_gwe_blf_data_med_ni = -1;
-static int hf_c15ch_out_gwe_blf_data_med_tn = -1;
-static int hf_c15ch_out_gwe_blf_data_med_ni_tn = -1;
-static int hf_c15ch_out_gwe_blf_data_rb_ni = -1;
-static int hf_c15ch_out_gwe_blf_data_rb_tn = -1;
-static int hf_c15ch_out_gwe_blf_data_rb_ni_tn = -1;
+static int hf_c15ch_out_gwe_blf_data;
+static int hf_c15ch_out_gwe_blf_data_rb_ua_handle;
+static int hf_c15ch_out_gwe_blf_data_rb_type;
+static int hf_c15ch_out_gwe_blf_data_med_ni;
+static int hf_c15ch_out_gwe_blf_data_med_tn;
+static int hf_c15ch_out_gwe_blf_data_med_ni_tn;
+static int hf_c15ch_out_gwe_blf_data_rb_ni;
+static int hf_c15ch_out_gwe_blf_data_rb_tn;
+static int hf_c15ch_out_gwe_blf_data_rb_ni_tn;
 
 
 /* Fields */
-static int hf_c15ch_out_gwe_call_ans = -1;
-static int hf_c15ch_out_gwe_call_ans_conn_num = -1;
-static int hf_c15ch_out_gwe_call_ans_op_cl_ans_rsdp_ip = -1;
-static int hf_c15ch_out_gwe_call_ans_op_cl_ans_rsdp_port = -1;
-static int hf_c15ch_out_gwe_call_ans_encap_isup = -1;
+static int hf_c15ch_out_gwe_call_ans;
+static int hf_c15ch_out_gwe_call_ans_conn_num;
+static int hf_c15ch_out_gwe_call_ans_op_cl_ans_rsdp_ip;
+static int hf_c15ch_out_gwe_call_ans_op_cl_ans_rsdp_port;
+static int hf_c15ch_out_gwe_call_ans_encap_isup;
 
 /* Fields */
-static int hf_c15ch_out_gwe_call_notify = -1;
-static int hf_c15ch_out_gwe_call_notify_op_gwe_mwi = -1;
-static int hf_c15ch_out_gwe_call_notify_status_code = -1;
+static int hf_c15ch_out_gwe_call_notify;
+static int hf_c15ch_out_gwe_call_notify_op_gwe_mwi;
+static int hf_c15ch_out_gwe_call_notify_status_code;
 
 
 /* Fields */
-static int hf_c15ch_out_gwe_call_prog = -1;
-static int hf_c15ch_out_gwe_call_prog_conn_num = -1;
-static int hf_c15ch_out_gwe_call_prog_op_gwe_stat_code = -1;
-static int hf_c15ch_out_gwe_call_prog_encap_isup = -1;
+static int hf_c15ch_out_gwe_call_prog;
+static int hf_c15ch_out_gwe_call_prog_conn_num;
+static int hf_c15ch_out_gwe_call_prog_op_gwe_stat_code;
+static int hf_c15ch_out_gwe_call_prog_encap_isup;
 
 /* Fields */
-static int hf_c15ch_out_gwe_call_rel = -1;
-static int hf_c15ch_out_gwe_call_rel_status_code = -1;
-static int hf_c15ch_out_gwe_call_rel_encap_isup = -1;
+static int hf_c15ch_out_gwe_call_rel;
+static int hf_c15ch_out_gwe_call_rel_status_code;
+static int hf_c15ch_out_gwe_call_rel_encap_isup;
 
 /* Fields */
-static int hf_c15ch_out_gwe_call_setup = -1;
-static int hf_c15ch_out_gwe_call_setup_conn_num = -1;
-static int hf_c15ch_out_gwe_call_setup_op_cl_ans_rsdp_ip = -1;
-static int hf_c15ch_out_gwe_call_setup_op_cl_ans_rsdp_port = -1;
+static int hf_c15ch_out_gwe_call_setup;
+static int hf_c15ch_out_gwe_call_setup_conn_num;
+static int hf_c15ch_out_gwe_call_setup_op_cl_ans_rsdp_ip;
+static int hf_c15ch_out_gwe_call_setup_op_cl_ans_rsdp_port;
 
-static int hf_c15ch_out_gwe_call_setup_op_gwe_redir_digits = -1;
+static int hf_c15ch_out_gwe_call_setup_op_gwe_redir_digits;
 
-static int hf_c15ch_out_gwe_call_setup_op_gwe_rdir_ton = -1;
-static int hf_c15ch_out_gwe_call_setup_op_gwe_rdir_np = -1;
+static int hf_c15ch_out_gwe_call_setup_op_gwe_rdir_ton;
+static int hf_c15ch_out_gwe_call_setup_op_gwe_rdir_np;
 
-static int hf_c15ch_out_gwe_call_setup_op_gwe_ocn_digits = -1;
+static int hf_c15ch_out_gwe_call_setup_op_gwe_ocn_digits;
 
-static int hf_c15ch_out_gwe_call_setup_op_gwe_chrg_digits = -1;
+static int hf_c15ch_out_gwe_call_setup_op_gwe_chrg_digits;
 
-static int hf_c15ch_out_gwe_call_setup_op_gwe_chrg_noa = -1;
-static int hf_c15ch_out_gwe_call_setup_op_gwe_chrg_npi = -1;
+static int hf_c15ch_out_gwe_call_setup_op_gwe_chrg_noa;
+static int hf_c15ch_out_gwe_call_setup_op_gwe_chrg_npi;
 
-static int hf_c15ch_out_gwe_call_setup_encap_isup = -1;
+static int hf_c15ch_out_gwe_call_setup_encap_isup;
 
 
 /* Fields */
-static int hf_c15ch_out_gwe_conn_num = -1;
-static int hf_c15ch_out_gwe_conn_num_out_gwe_conn_num = -1;
+static int hf_c15ch_out_gwe_conn_num;
+static int hf_c15ch_out_gwe_conn_num_out_gwe_conn_num;
 
 
 /* Fields */
-static int hf_c15ch_out_gwe_del_subs_ua = -1;
-static int hf_c15ch_out_gwe_del_subs_ua_op_sip_ua_hndl = -1;
+static int hf_c15ch_out_gwe_del_subs_ua;
+static int hf_c15ch_out_gwe_del_subs_ua_op_sip_ua_hndl;
 
 
 /* Fields */
-static int hf_c15ch_out_gwe_digit_scan = -1;
-static int hf_c15ch_out_gwe_digit_scan_voip_dgmp_override = -1;
-static int hf_c15ch_out_gwe_digit_scan_actv_dgmp = -1;
-static int hf_c15ch_out_gwe_digit_scan_op_gwe_digit_scan_tone = -1;
-static int hf_c15ch_out_gwe_digit_scan_op_gwe_tone_type = -1;
-static int hf_c15ch_out_gwe_digit_scan_op_gwe_tone_to = -1;
-static int hf_c15ch_out_gwe_digit_scan_op_gwe_digit_flash = -1;
+static int hf_c15ch_out_gwe_digit_scan;
+static int hf_c15ch_out_gwe_digit_scan_voip_dgmp_override;
+static int hf_c15ch_out_gwe_digit_scan_actv_dgmp;
+static int hf_c15ch_out_gwe_digit_scan_op_gwe_digit_scan_tone;
+static int hf_c15ch_out_gwe_digit_scan_op_gwe_tone_type;
+static int hf_c15ch_out_gwe_digit_scan_op_gwe_tone_to;
+static int hf_c15ch_out_gwe_digit_scan_op_gwe_digit_flash;
 
 /* Fields */
-static int hf_c15ch_out_gwe_line_sprvsn = -1;
-static int hf_c15ch_out_gwe_line_sprvsn_op_gwe_ofhk_event = -1;
-static int hf_c15ch_out_gwe_line_sprvsn_op_gwe_onhk_event = -1;
-static int hf_c15ch_out_gwe_line_sprvsn_op_gwe_flhk_event = -1;
+static int hf_c15ch_out_gwe_line_sprvsn;
+static int hf_c15ch_out_gwe_line_sprvsn_op_gwe_ofhk_event;
+static int hf_c15ch_out_gwe_line_sprvsn_op_gwe_onhk_event;
+static int hf_c15ch_out_gwe_line_sprvsn_op_gwe_flhk_event;
 
 
 /* Fields */
-static int hf_c15ch_out_gwe_md_conn = -1;
-static int hf_c15ch_out_gwe_md_conn_conn_num = -1;
-static int hf_c15ch_out_gwe_md_conn_status_code = -1;
-static int hf_c15ch_out_gwe_md_conn_op_gwe_mode = -1;
+static int hf_c15ch_out_gwe_md_conn;
+static int hf_c15ch_out_gwe_md_conn_conn_num;
+static int hf_c15ch_out_gwe_md_conn_status_code;
+static int hf_c15ch_out_gwe_md_conn_op_gwe_mode;
 
 /* Fields */
-static int hf_c15ch_out_gwe_mk_conn = -1;
-static int hf_c15ch_out_gwe_mk_conn_conn_num = -1;
-static int hf_c15ch_out_gwe_mk_conn_op_mk_conn_rsdp_ip = -1;
-static int hf_c15ch_out_gwe_mk_conn_op_mk_conn_rsdp_port = -1;
+static int hf_c15ch_out_gwe_mk_conn;
+static int hf_c15ch_out_gwe_mk_conn_conn_num;
+static int hf_c15ch_out_gwe_mk_conn_op_mk_conn_rsdp_ip;
+static int hf_c15ch_out_gwe_mk_conn_op_mk_conn_rsdp_port;
 
 /* Fields */
-static int hf_c15ch_out_gwe_out_cot = -1;
-static int hf_c15ch_out_gwe_out_cot_ni = -1;
-static int hf_c15ch_out_gwe_out_cot_tn = -1;
-static int hf_c15ch_out_gwe_out_cot_ni_tn = -1;
+static int hf_c15ch_out_gwe_out_cot;
+static int hf_c15ch_out_gwe_out_cot_ni;
+static int hf_c15ch_out_gwe_out_cot_tn;
+static int hf_c15ch_out_gwe_out_cot_ni_tn;
 
 
 /* Fields */
-static int hf_c15ch_out_gwe_pcm_data = -1;
-static int hf_c15ch_out_gwe_pcm_data_rb_ua_handle_near = -1;
-static int hf_c15ch_out_gwe_pcm_data_rb_ua_handle_far  = -1;
+static int hf_c15ch_out_gwe_pcm_data;
+static int hf_c15ch_out_gwe_pcm_data_rb_ua_handle_near;
+static int hf_c15ch_out_gwe_pcm_data_rb_ua_handle_far;
 
 /* Fields */
-static int hf_c15ch_out_gwe_ring_line = -1;
-static int hf_c15ch_out_gwe_ring_line_op_gwe_display = -1;
-static int hf_c15ch_out_gwe_ring_line_op_gwe_display_chars = -1;
+static int hf_c15ch_out_gwe_ring_line;
+static int hf_c15ch_out_gwe_ring_line_op_gwe_display;
+static int hf_c15ch_out_gwe_ring_line_op_gwe_display_chars;
 
 
 /* Fields */
-static int hf_c15ch_out_gwe_rv_subs_data = -1;
-static int hf_c15ch_out_gwe_rv_subs_data_rb_fe_ni = -1;
-static int hf_c15ch_out_gwe_rv_subs_data_rb_fe_tn = -1;
-static int hf_c15ch_out_gwe_rv_subs_data_rb_fe_ni_tn = -1;
+static int hf_c15ch_out_gwe_rv_subs_data;
+static int hf_c15ch_out_gwe_rv_subs_data_rb_fe_ni;
+static int hf_c15ch_out_gwe_rv_subs_data_rb_fe_tn;
+static int hf_c15ch_out_gwe_rv_subs_data_rb_fe_ni_tn;
 
 
 /* Fields */
-static int hf_c15ch_out_gwe_sac_list_entry = -1;
-static int hf_c15ch_out_gwe_sac_list_entry_op_gwe_med_uri = -1;
+static int hf_c15ch_out_gwe_sac_list_entry;
+static int hf_c15ch_out_gwe_sac_list_entry_op_gwe_med_uri;
 
 
 /* Fields */
-static int hf_c15ch_out_gwe_sac_notify = -1;
-static int hf_c15ch_out_gwe_sac_notify_op_gwe_blf_state = -1;
-static int hf_c15ch_out_gwe_sac_notify_op_gwe_subs_state = -1;
+static int hf_c15ch_out_gwe_sac_notify;
+static int hf_c15ch_out_gwe_sac_notify_op_gwe_blf_state;
+static int hf_c15ch_out_gwe_sac_notify_op_gwe_subs_state;
 
 
 /* Fields */
-static int hf_c15ch_out_gwe_sac_sub_valid = -1;
-static int hf_c15ch_out_gwe_sac_sub_valid_op_gwe_subs_valid = -1;
-static int hf_c15ch_out_gwe_sac_sub_valid_op_gwe_num_list_items = -1;
+static int hf_c15ch_out_gwe_sac_sub_valid;
+static int hf_c15ch_out_gwe_sac_sub_valid_op_gwe_subs_valid;
+static int hf_c15ch_out_gwe_sac_sub_valid_op_gwe_num_list_items;
 
 
 /* Fields */
-static int hf_c15ch_out_gwe_sip_info = -1;
-static int hf_c15ch_out_gwe_sip_info_op_gwe_sip_info = -1;
-static int hf_c15ch_out_gwe_sip_info_op_gwe_sip_info_type = -1;
+static int hf_c15ch_out_gwe_sip_info;
+static int hf_c15ch_out_gwe_sip_info_op_gwe_sip_info;
+static int hf_c15ch_out_gwe_sip_info_op_gwe_sip_info_type;
 
 /* Fields */
-static int hf_c15ch_out_gwe_sip_refer = -1;
-static int hf_c15ch_out_gwe_sip_refer_op_gwe_refer_ua_hndl = -1;
+static int hf_c15ch_out_gwe_sip_refer;
+static int hf_c15ch_out_gwe_sip_refer_op_gwe_refer_ua_hndl;
 
 /* Fields */
-static int hf_c15ch_out_gwe_update_ni_tn = -1;
-static int hf_c15ch_out_gwe_update_ni_tn_ni = -1;
-static int hf_c15ch_out_gwe_update_ni_tn_tn = -1;
-static int hf_c15ch_out_gwe_update_ni_tn_ni_tn = -1;
+static int hf_c15ch_out_gwe_update_ni_tn;
+static int hf_c15ch_out_gwe_update_ni_tn_ni;
+static int hf_c15ch_out_gwe_update_ni_tn_tn;
+static int hf_c15ch_out_gwe_update_ni_tn_ni_tn;
 
 
 /* Fields */
-static int hf_c15ch_out_gwe_update_rec_addr = -1;
-static int hf_c15ch_out_gwe_update_rec_addr_op_new_rec_addr = -1;
+static int hf_c15ch_out_gwe_update_rec_addr;
+static int hf_c15ch_out_gwe_update_rec_addr_op_new_rec_addr;
 
 /* tone */
 
@@ -3819,22 +3819,22 @@ static value_string_ext tone_types_ext = VALUE_STRING_EXT_INIT(tone_types);
 static dissector_table_t c15ch_tone_dissector_table;
 
 /* Fields */
-static int hf_c15ch_tone = -1;
-static int hf_c15ch_tone_msg_type = -1;
+static int hf_c15ch_tone;
+static int hf_c15ch_tone_msg_type;
 
 /* Subtree */
-static gint ett_c15ch_third_level_tone = -1; /* for third level dissection */
-static gint ett_c15ch_third_level_tone_sub1 = -1;
+static gint ett_c15ch_third_level_tone; /* for third level dissection */
+static gint ett_c15ch_third_level_tone_sub1;
 
 /* Protocol */
-static int proto_c15ch_third_level_tone = -1;
+static int proto_c15ch_third_level_tone;
 /* Fields */
-static int hf_c15ch_tone_cot_control = -1;
-static int hf_c15ch_tone_cot_control_device_id = -1;
-static int hf_c15ch_tone_cot_control_cot_task = -1;
-static int hf_c15ch_tone_cot_control_dest_h248 = -1;
-static int hf_c15ch_tone_cot_control_srce_h248 = -1;
-static int hf_c15ch_tone_cot_control_svc_channel = -1;
+static int hf_c15ch_tone_cot_control;
+static int hf_c15ch_tone_cot_control_device_id;
+static int hf_c15ch_tone_cot_control_cot_task;
+static int hf_c15ch_tone_cot_control_dest_h248;
+static int hf_c15ch_tone_cot_control_srce_h248;
+static int hf_c15ch_tone_cot_control_svc_channel;
 
 /* value labels for fields*/
 static const value_string c15_tone_msg_types[] = {
@@ -3850,15 +3850,15 @@ static const value_string c15_tone_msg_types[] = {
 };
 
 /* Fields */
-static int hf_c15ch_tone_cpm = -1;
-static int hf_c15ch_tone_cpm_loop_type = -1;
-static int hf_c15ch_tone_cpm_device_id = -1;
-static int hf_c15ch_tone_cpm_tone_type = -1;
+static int hf_c15ch_tone_cpm;
+static int hf_c15ch_tone_cpm_loop_type;
+static int hf_c15ch_tone_cpm_device_id;
+static int hf_c15ch_tone_cpm_tone_type;
 
 
 #if 0
 /* Subtree */
-static gint ett_c15ch_tone_cpm = -1;
+static gint ett_c15ch_tone_cpm;
 #endif
 
 /* labels for loop type */
@@ -3921,47 +3921,47 @@ static value_string_ext device_types_ext = VALUE_STRING_EXT_INIT(device_types);
 
 
 /* Fields */
-static int hf_c15ch_tone_give_tone = -1;
-static int hf_c15ch_tone_give_tone_tone_id = -1;
-static int hf_c15ch_tone_give_tone_tone_type = -1;
+static int hf_c15ch_tone_give_tone;
+static int hf_c15ch_tone_give_tone_tone_id;
+static int hf_c15ch_tone_give_tone_tone_type;
 
 /* Fields */
-static int hf_c15ch_tone_madn_ring = -1;
-static int hf_c15ch_tone_madn_ring_device_id = -1;
-static int hf_c15ch_tone_madn_ring_tone_type = -1;
+static int hf_c15ch_tone_madn_ring;
+static int hf_c15ch_tone_madn_ring_device_id;
+static int hf_c15ch_tone_madn_ring_tone_type;
 
 /* Fields */
-static int hf_c15ch_tone_opls = -1;
-static int hf_c15ch_tone_opls_svce_from_ni = -1;
-static int hf_c15ch_tone_opls_svce_to_ni = -1;
-static int hf_c15ch_tone_opls_svce_to_ni_tn = -1;
-static int hf_c15ch_tone_opls_svce_to_tn = -1;
-static int hf_c15ch_tone_opls_digits = -1;
+static int hf_c15ch_tone_opls;
+static int hf_c15ch_tone_opls_svce_from_ni;
+static int hf_c15ch_tone_opls_svce_to_ni;
+static int hf_c15ch_tone_opls_svce_to_ni_tn;
+static int hf_c15ch_tone_opls_svce_to_tn;
+static int hf_c15ch_tone_opls_digits;
 
 
 /* Fields */
-static int hf_c15ch_tone_rcvr = -1;
-static int hf_c15ch_tone_rcvr_rcvr_id = -1;
-static int hf_c15ch_tone_rcvr_conn_to_ni = -1;
-static int hf_c15ch_tone_rcvr_conn_to_ni_tn = -1;
-static int hf_c15ch_tone_rcvr_conn_to_tn = -1;
+static int hf_c15ch_tone_rcvr;
+static int hf_c15ch_tone_rcvr_rcvr_id;
+static int hf_c15ch_tone_rcvr_conn_to_ni;
+static int hf_c15ch_tone_rcvr_conn_to_ni_tn;
+static int hf_c15ch_tone_rcvr_conn_to_tn;
 
 
 /* Fields */
-static int hf_c15ch_tone_timeout = -1;
-static int hf_c15ch_tone_timeout_device_id = -1;
-static int hf_c15ch_tone_timeout_service_pm = -1;
-static int hf_c15ch_tone_timeout_service_ni = -1;
-static int hf_c15ch_tone_timeout_service_ni_tn = -1;
-static int hf_c15ch_tone_timeout_service_tn = -1;
-static int hf_c15ch_tone_timeout_gw_provided = -1;
-static int hf_c15ch_tone_timeout_gw_service_tone_type_or_from_ni = -1;
+static int hf_c15ch_tone_timeout;
+static int hf_c15ch_tone_timeout_device_id;
+static int hf_c15ch_tone_timeout_service_pm;
+static int hf_c15ch_tone_timeout_service_ni;
+static int hf_c15ch_tone_timeout_service_ni_tn;
+static int hf_c15ch_tone_timeout_service_tn;
+static int hf_c15ch_tone_timeout_gw_provided;
+static int hf_c15ch_tone_timeout_gw_service_tone_type_or_from_ni;
 
 
 /* Fields */
-static int hf_c15ch_tone_tone_control = -1;
-static int hf_c15ch_tone_tone_control_device_id = -1;
-static int hf_c15ch_tone_tone_control_tone_type = -1;
+static int hf_c15ch_tone_tone_control;
+static int hf_c15ch_tone_tone_control_device_id;
+static int hf_c15ch_tone_tone_control_tone_type;
 
 
 /* util functions */
diff --git a/epan/dissectors/packet-calcappprotocol.c b/epan/dissectors/packet-calcappprotocol.c
index 5b4072db26..4dc9e51e45 100644
--- a/epan/dissectors/packet-calcappprotocol.c
+++ b/epan/dissectors/packet-calcappprotocol.c
@@ -29,20 +29,20 @@ static dissector_handle_t calcappprotocol_handle;
 
 
 /* Initialize the protocol and registered fields */
-static int proto_calcappprotocol = -1;
+static int proto_calcappprotocol;
 static int tap_calcappprotocol   = -1;
-static int hf_message_type       = -1;
-static int hf_message_flags      = -1;
-static int hf_message_length     = -1;
-static int hf_message_jobid      = -1;
-static int hf_message_jobsize    = -1;
-static int hf_message_completed  = -1;
+static int hf_message_type;
+static int hf_message_flags;
+static int hf_message_length;
+static int hf_message_jobid;
+static int hf_message_jobsize;
+static int hf_message_completed;
 
 static guint64 calcappprotocol_total_msgs     = 0;
 static guint64 calcappprotocol_total_bytes    = 0;
 
 /* Initialize the subtree pointers */
-static gint ett_calcappprotocol = -1;
+static gint ett_calcappprotocol;
 
 /* Dissectors for messages. This is specific to CalcAppProtocol */
 #define MESSAGE_TYPE_LENGTH      1
diff --git a/epan/dissectors/packet-caneth.c b/epan/dissectors/packet-caneth.c
index 6c63c241d0..5c6b7ea42a 100644
--- a/epan/dissectors/packet-caneth.c
+++ b/epan/dissectors/packet-caneth.c
@@ -37,26 +37,26 @@ void proto_register_caneth(void);
 
 static dissector_handle_t caneth_handle;
 
-static int proto_caneth = -1;
-static int hf_caneth_magic = -1;
-static int hf_caneth_version = -1;
-static int hf_caneth_frames = -1;
-static int hf_caneth_options = -1;
-
-static int hf_caneth_can_ident_ext = -1;
-static int hf_caneth_can_ident_std = -1;
-static int hf_caneth_can_extflag = -1;
-static int hf_caneth_can_rtrflag = -1;
-static int hf_caneth_can_len = -1;
-static int hf_caneth_can_padding = -1;
+static int proto_caneth;
+static int hf_caneth_magic;
+static int hf_caneth_version;
+static int hf_caneth_frames;
+static int hf_caneth_options;
+
+static int hf_caneth_can_ident_ext;
+static int hf_caneth_can_ident_std;
+static int hf_caneth_can_extflag;
+static int hf_caneth_can_rtrflag;
+static int hf_caneth_can_len;
+static int hf_caneth_can_padding;
 
 #define CANETH_UDP_PORT 11898
 
-static gint ett_caneth = -1;
-static gint ett_caneth_frames = -1;
-static gint ett_caneth_can = -1;
+static gint ett_caneth;
+static gint ett_caneth_frames;
+static gint ett_caneth_can;
 
-static int proto_can = -1;      // use CAN protocol for consistent filtering
+static int proto_can;      // use CAN protocol for consistent filtering
 
 /* A sample #define of the minimum length (in bytes) of the protocol data.
  * If data is received with fewer than this many bytes it is rejected by
diff --git a/epan/dissectors/packet-canopen.c b/epan/dissectors/packet-canopen.c
index dd9f059e2a..03fed3bf24 100644
--- a/epan/dissectors/packet-canopen.c
+++ b/epan/dissectors/packet-canopen.c
@@ -21,61 +21,61 @@ void proto_reg_handoff_canopen(void);
 static dissector_handle_t canopen_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_canopen = -1;
-static int hf_canopen_cob_id = -1;
-static int hf_canopen_function_code = -1;
-static int hf_canopen_node_id = -1;
-static int hf_canopen_pdo_data = -1;
-static int hf_canopen_pdo_data_string = -1;
-static int hf_canopen_sdo_cmd = -1;
-static int hf_canopen_sdo_cmd_ccs = -1;
-static int hf_canopen_sdo_cmd_scs = -1;
-static int hf_canopen_sdo_cmd_ccs5_subcommand = -1;
-static int hf_canopen_sdo_cmd_scs5_subcommand = -1;
-static int hf_canopen_sdo_cmd_ccs6_subcommand = -1;
-static int hf_canopen_sdo_cmd_scs6_subcommand = -1;
-static int hf_canopen_sdo_cmd_block_crc_support = -1;
-static int hf_canopen_sdo_cmd_block_s = -1;
-static int hf_canopen_sdo_cmd_block_n = -1;
-static int hf_canopen_sdo_cmd_block_blksize = -1;
-static int hf_canopen_sdo_cmd_block_pst = -1;
-static int hf_canopen_sdo_cmd_block_ackseq = -1;
-static int hf_canopen_sdo_cmd_toggle = -1;
-static int hf_canopen_sdo_cmd_updown_n = -1;
-static int hf_canopen_sdo_cmd_updown_c = -1;
-static int hf_canopen_sdo_cmd_init_n = -1;
-static int hf_canopen_sdo_cmd_init_e = -1;
-static int hf_canopen_sdo_cmd_init_s = -1;
-static int hf_canopen_sdo_main_idx = -1;
-static int hf_canopen_sdo_sub_idx = -1;
-static int hf_canopen_sdo_data = -1;
-static int hf_canopen_sdo_abort_code = -1;
-static int hf_canopen_reserved = -1;
-static int hf_canopen_em_err_code = -1;
-static int hf_canopen_em_err_reg = -1;
-static int hf_canopen_em_err_reg_ge = -1;
-static int hf_canopen_em_err_reg_cu = -1;
-static int hf_canopen_em_err_reg_vo = -1;
-static int hf_canopen_em_err_reg_te = -1;
-static int hf_canopen_em_err_reg_co = -1;
-static int hf_canopen_em_err_reg_de = -1;
-static int hf_canopen_em_err_reg_re = -1;
-static int hf_canopen_em_err_reg_ma = -1;
-static int hf_canopen_em_err_field = -1;
-static int hf_canopen_nmt_ctrl_cs = -1;
-static int hf_canopen_nmt_ctrl_node_id = -1;
-static int hf_canopen_nmt_guard_state = -1;
-static int hf_canopen_nmt_guard_toggle = -1;
-static int hf_canopen_sync_counter = -1;
-static int hf_canopen_lss_cs = -1;
-static int hf_canopen_lss_addr_vendor = -1;
-static int hf_canopen_lss_addr_product = -1;
-static int hf_canopen_lss_addr_revision = -1;
-static int hf_canopen_lss_addr_revision_low = -1;
-static int hf_canopen_lss_addr_revision_high = -1;
-static int hf_canopen_lss_addr_serial = -1;
-static int hf_canopen_lss_addr_serial_low = -1;
-static int hf_canopen_lss_addr_serial_high = -1;
+static int proto_canopen;
+static int hf_canopen_cob_id;
+static int hf_canopen_function_code;
+static int hf_canopen_node_id;
+static int hf_canopen_pdo_data;
+static int hf_canopen_pdo_data_string;
+static int hf_canopen_sdo_cmd;
+static int hf_canopen_sdo_cmd_ccs;
+static int hf_canopen_sdo_cmd_scs;
+static int hf_canopen_sdo_cmd_ccs5_subcommand;
+static int hf_canopen_sdo_cmd_scs5_subcommand;
+static int hf_canopen_sdo_cmd_ccs6_subcommand;
+static int hf_canopen_sdo_cmd_scs6_subcommand;
+static int hf_canopen_sdo_cmd_block_crc_support;
+static int hf_canopen_sdo_cmd_block_s;
+static int hf_canopen_sdo_cmd_block_n;
+static int hf_canopen_sdo_cmd_block_blksize;
+static int hf_canopen_sdo_cmd_block_pst;
+static int hf_canopen_sdo_cmd_block_ackseq;
+static int hf_canopen_sdo_cmd_toggle;
+static int hf_canopen_sdo_cmd_updown_n;
+static int hf_canopen_sdo_cmd_updown_c;
+static int hf_canopen_sdo_cmd_init_n;
+static int hf_canopen_sdo_cmd_init_e;
+static int hf_canopen_sdo_cmd_init_s;
+static int hf_canopen_sdo_main_idx;
+static int hf_canopen_sdo_sub_idx;
+static int hf_canopen_sdo_data;
+static int hf_canopen_sdo_abort_code;
+static int hf_canopen_reserved;
+static int hf_canopen_em_err_code;
+static int hf_canopen_em_err_reg;
+static int hf_canopen_em_err_reg_ge;
+static int hf_canopen_em_err_reg_cu;
+static int hf_canopen_em_err_reg_vo;
+static int hf_canopen_em_err_reg_te;
+static int hf_canopen_em_err_reg_co;
+static int hf_canopen_em_err_reg_de;
+static int hf_canopen_em_err_reg_re;
+static int hf_canopen_em_err_reg_ma;
+static int hf_canopen_em_err_field;
+static int hf_canopen_nmt_ctrl_cs;
+static int hf_canopen_nmt_ctrl_node_id;
+static int hf_canopen_nmt_guard_state;
+static int hf_canopen_nmt_guard_toggle;
+static int hf_canopen_sync_counter;
+static int hf_canopen_lss_cs;
+static int hf_canopen_lss_addr_vendor;
+static int hf_canopen_lss_addr_product;
+static int hf_canopen_lss_addr_revision;
+static int hf_canopen_lss_addr_revision_low;
+static int hf_canopen_lss_addr_revision_high;
+static int hf_canopen_lss_addr_serial;
+static int hf_canopen_lss_addr_serial_low;
+static int hf_canopen_lss_addr_serial_high;
 static int* hf_canopen_lss_addr_ident[] = {
         &hf_canopen_lss_addr_vendor,
         &hf_canopen_lss_addr_product,
@@ -90,22 +90,22 @@ static int* hf_canopen_lss_addr_inquire[] = {
         &hf_canopen_lss_addr_revision,
         &hf_canopen_lss_addr_serial
 };
-static int hf_canopen_lss_fastscan_id = -1;
-static int hf_canopen_lss_fastscan_check = -1;
-static int hf_canopen_lss_fastscan_sub = -1;
-static int hf_canopen_lss_fastscan_next = -1;
-static int hf_canopen_lss_switch_mode = -1;
-static int hf_canopen_lss_nid = -1;
-static int hf_canopen_lss_conf_id_err_code = -1;
-static int hf_canopen_lss_conf_bt_err_code = -1;
-static int hf_canopen_lss_store_conf_err_code = -1;
-static int hf_canopen_lss_spec_err = -1;
-static int hf_canopen_lss_bt_tbl_selector = -1;
-static int hf_canopen_lss_bt_tbl_index = -1;
-static int hf_canopen_lss_abt_delay = -1;
-static int hf_canopen_time_stamp = -1;
-static int hf_canopen_time_stamp_ms = -1;
-static int hf_canopen_time_stamp_days = -1;
+static int hf_canopen_lss_fastscan_id;
+static int hf_canopen_lss_fastscan_check;
+static int hf_canopen_lss_fastscan_sub;
+static int hf_canopen_lss_fastscan_next;
+static int hf_canopen_lss_switch_mode;
+static int hf_canopen_lss_nid;
+static int hf_canopen_lss_conf_id_err_code;
+static int hf_canopen_lss_conf_bt_err_code;
+static int hf_canopen_lss_store_conf_err_code;
+static int hf_canopen_lss_spec_err;
+static int hf_canopen_lss_bt_tbl_selector;
+static int hf_canopen_lss_bt_tbl_index;
+static int hf_canopen_lss_abt_delay;
+static int hf_canopen_time_stamp;
+static int hf_canopen_time_stamp_ms;
+static int hf_canopen_time_stamp_days;
 
 
   /* Download segment request (ccs=0) decode mask */
@@ -286,11 +286,11 @@ static int * const *_sdo_cmd_fields_scs6[] = {
 };
 
 /* Initialize the subtree pointers */
-static gint ett_canopen = -1;
-static gint ett_canopen_cob = -1;
-static gint ett_canopen_type = -1;
-static gint ett_canopen_sdo_cmd = -1;
-static gint ett_canopen_em_er = -1;
+static gint ett_canopen;
+static gint ett_canopen_cob;
+static gint ett_canopen_type;
+static gint ett_canopen_sdo_cmd;
+static gint ett_canopen_em_er;
 
 /* broadcast messages */
 #define FC_NMT                  0x0
diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c
index e011cc24c5..f4b19881da 100644
--- a/epan/dissectors/packet-capwap.c
+++ b/epan/dissectors/packet-capwap.c
@@ -41,565 +41,565 @@ static reassembly_table capwap_reassembly_table;
 * add support of all Messages Element Type
 */
 
-static int proto_capwap_control = -1;
-static int proto_capwap_data = -1;
-
-static int hf_capwap_preamble = -1;
-static int hf_capwap_preamble_version = -1;
-static int hf_capwap_preamble_type = -1;
-static int hf_capwap_preamble_reserved = -1;
-
-static int hf_capwap_header = -1;
-static int hf_capwap_header_hlen = -1;
-static int hf_capwap_header_rid = -1;
-static int hf_capwap_header_wbid = -1;
-
-static int hf_capwap_header_flags = -1;
-static int hf_capwap_header_flags_t = -1;
-static int hf_capwap_header_flags_f = -1;
-static int hf_capwap_header_flags_l = -1;
-static int hf_capwap_header_flags_w = -1;
-static int hf_capwap_header_flags_m = -1;
-static int hf_capwap_header_flags_k = -1;
-static int hf_capwap_header_flags_r = -1;
-
-static int hf_capwap_header_fragment_id = -1;
-static int hf_capwap_header_fragment_offset = -1;
-static int hf_capwap_header_reserved = -1;
-
-static int hf_capwap_header_mac_length = -1;
-static int hf_capwap_header_mac_eui48 = -1;
-static int hf_capwap_header_mac_eui64 = -1;
-static int hf_capwap_header_mac_data = -1;
-
-static int hf_capwap_header_wireless_length = -1;
-static int hf_capwap_header_wireless_data = -1;
-
-static int hf_capwap_header_wireless_data_ieee80211_fi = -1;
-static int hf_capwap_header_wireless_data_ieee80211_fi_rssi = -1;
-static int hf_capwap_header_wireless_data_ieee80211_fi_snr = -1;
-static int hf_capwap_header_wireless_data_ieee80211_fi_data_rate = -1;
-static int hf_capwap_header_wireless_data_ieee80211_dest_wlan = -1;
-static int hf_capwap_header_wireless_data_ieee80211_dw_wlan_id_bitmap = -1;
-static int hf_capwap_header_wireless_data_ieee80211_dw_reserved = -1;
-static int hf_capwap_header_padding = -1;
-
-static int hf_capwap_control_header = -1;
-static int hf_capwap_control_header_msg_type = -1;
-static int hf_capwap_control_header_msg_type_enterprise_nbr = -1;
-static int hf_capwap_control_header_msg_type_enterprise_specific = -1;
-static int hf_capwap_control_header_seq_number = -1;
-static int hf_capwap_control_header_flags = -1;
-static int hf_capwap_control_header_msg_element_length = -1;
-
-static int hf_capwap_message_element = -1;
-static int hf_capwap_msg_element = -1;
-static int hf_capwap_msg_element_type = -1;
-static int hf_capwap_msg_element_length = -1;
-static int hf_capwap_msg_element_value = -1;
-
-static int hf_capwap_msg_element_type_ac_descriptor_stations = -1;
-static int hf_capwap_msg_element_type_ac_descriptor_limit = -1;
-static int hf_capwap_msg_element_type_ac_descriptor_active_wtp = -1;
-static int hf_capwap_msg_element_type_ac_descriptor_max_wtp = -1;
+static int proto_capwap_control;
+static int proto_capwap_data;
+
+static int hf_capwap_preamble;
+static int hf_capwap_preamble_version;
+static int hf_capwap_preamble_type;
+static int hf_capwap_preamble_reserved;
+
+static int hf_capwap_header;
+static int hf_capwap_header_hlen;
+static int hf_capwap_header_rid;
+static int hf_capwap_header_wbid;
+
+static int hf_capwap_header_flags;
+static int hf_capwap_header_flags_t;
+static int hf_capwap_header_flags_f;
+static int hf_capwap_header_flags_l;
+static int hf_capwap_header_flags_w;
+static int hf_capwap_header_flags_m;
+static int hf_capwap_header_flags_k;
+static int hf_capwap_header_flags_r;
+
+static int hf_capwap_header_fragment_id;
+static int hf_capwap_header_fragment_offset;
+static int hf_capwap_header_reserved;
+
+static int hf_capwap_header_mac_length;
+static int hf_capwap_header_mac_eui48;
+static int hf_capwap_header_mac_eui64;
+static int hf_capwap_header_mac_data;
+
+static int hf_capwap_header_wireless_length;
+static int hf_capwap_header_wireless_data;
+
+static int hf_capwap_header_wireless_data_ieee80211_fi;
+static int hf_capwap_header_wireless_data_ieee80211_fi_rssi;
+static int hf_capwap_header_wireless_data_ieee80211_fi_snr;
+static int hf_capwap_header_wireless_data_ieee80211_fi_data_rate;
+static int hf_capwap_header_wireless_data_ieee80211_dest_wlan;
+static int hf_capwap_header_wireless_data_ieee80211_dw_wlan_id_bitmap;
+static int hf_capwap_header_wireless_data_ieee80211_dw_reserved;
+static int hf_capwap_header_padding;
+
+static int hf_capwap_control_header;
+static int hf_capwap_control_header_msg_type;
+static int hf_capwap_control_header_msg_type_enterprise_nbr;
+static int hf_capwap_control_header_msg_type_enterprise_specific;
+static int hf_capwap_control_header_seq_number;
+static int hf_capwap_control_header_flags;
+static int hf_capwap_control_header_msg_element_length;
+
+static int hf_capwap_message_element;
+static int hf_capwap_msg_element;
+static int hf_capwap_msg_element_type;
+static int hf_capwap_msg_element_length;
+static int hf_capwap_msg_element_value;
+
+static int hf_capwap_msg_element_type_ac_descriptor_stations;
+static int hf_capwap_msg_element_type_ac_descriptor_limit;
+static int hf_capwap_msg_element_type_ac_descriptor_active_wtp;
+static int hf_capwap_msg_element_type_ac_descriptor_max_wtp;
 /* AC Descriptor Security Flags... */
-static int hf_capwap_msg_element_type_ac_descriptor_security = -1;
-static int hf_capwap_msg_element_type_ac_descriptor_security_s = -1;
-static int hf_capwap_msg_element_type_ac_descriptor_security_x = -1;
-static int hf_capwap_msg_element_type_ac_descriptor_security_r = -1;
-static int hf_capwap_msg_element_type_ac_descriptor_rmac_field = -1;
-static int hf_capwap_msg_element_type_ac_descriptor_reserved = -1;
+static int hf_capwap_msg_element_type_ac_descriptor_security;
+static int hf_capwap_msg_element_type_ac_descriptor_security_s;
+static int hf_capwap_msg_element_type_ac_descriptor_security_x;
+static int hf_capwap_msg_element_type_ac_descriptor_security_r;
+static int hf_capwap_msg_element_type_ac_descriptor_rmac_field;
+static int hf_capwap_msg_element_type_ac_descriptor_reserved;
 /* AC Descriptor DTLS Policy Flags... */
-static int hf_capwap_msg_element_type_ac_descriptor_dtls_policy = -1;
-static int hf_capwap_msg_element_type_ac_descriptor_dtls_policy_d = -1;
-static int hf_capwap_msg_element_type_ac_descriptor_dtls_policy_c = -1;
-static int hf_capwap_msg_element_type_ac_descriptor_dtls_policy_r = -1;
-
-static int hf_capwap_msg_element_type_ac_information = -1;
-static int hf_capwap_msg_element_type_ac_information_vendor = -1;
-static int hf_capwap_msg_element_type_ac_information_type = -1;
-static int hf_capwap_msg_element_type_ac_information_length = -1;
-static int hf_capwap_msg_element_type_ac_information_value = -1;
-static int hf_capwap_msg_element_type_ac_information_hardware_version = -1;
-static int hf_capwap_msg_element_type_ac_information_software_version = -1;
-
-static int hf_capwap_msg_element_type_ac_name = -1;
-static int hf_capwap_msg_element_type_ac_name_with_priority = -1;
-
-static int hf_capwap_msg_element_type_ac_timestamp = -1;
-
-static int hf_capwap_msg_element_type_add_station_radio_id = -1;
-static int hf_capwap_msg_element_type_add_station_length = -1;
-static int hf_capwap_msg_element_type_add_station_mac_eui48 = -1;
-static int hf_capwap_msg_element_type_add_station_mac_eui64 = -1;
-static int hf_capwap_msg_element_type_add_station_mac_data = -1;
-static int hf_capwap_msg_element_type_add_station_vlan_name = -1;
-
-static int hf_capwap_msg_element_type_ac_ipv4_list = -1;
-static int hf_capwap_msg_element_type_ac_ipv6_list = -1;
-
-static int hf_capwap_msg_element_type_capwap_control_ipv4 = -1;
-static int hf_capwap_msg_element_type_capwap_control_ipv6 = -1;
-static int hf_capwap_msg_element_type_capwap_control_wtp_count = -1;
-
-static int hf_capwap_msg_element_type_capwap_timers_discovery = -1;
-static int hf_capwap_msg_element_type_capwap_timers_echo_request = -1;
-
-static int hf_capwap_msg_element_type_decryption_error_report_period_radio_id = -1;
-static int hf_capwap_msg_element_type_decryption_error_report_period_interval = -1;
-
-static int hf_capwap_msg_element_type_delete_station_radio_id = -1;
-static int hf_capwap_msg_element_type_delete_station_length = -1;
-static int hf_capwap_msg_element_type_delete_station_mac_eui48 = -1;
-static int hf_capwap_msg_element_type_delete_station_mac_eui64 = -1;
-static int hf_capwap_msg_element_type_delete_station_mac_data = -1;
-
-static int hf_capwap_msg_element_type_discovery_type = -1;
-
-static int hf_capwap_msg_element_type_location_data = -1;
-
-static int hf_capwap_msg_element_type_maximum_message_length = -1;
-
-static int hf_capwap_msg_element_type_capwap_local_ipv4_address = -1;
-
-static int hf_capwap_msg_element_type_idle_timeout = -1;
-static int hf_capwap_msg_element_type_radio_admin_id = -1;
-static int hf_capwap_msg_element_type_radio_admin_state = -1;
-
-static int hf_capwap_msg_element_type_radio_op_state_radio_id = -1;
-static int hf_capwap_msg_element_type_radio_op_state_radio_state = -1;
-static int hf_capwap_msg_element_type_radio_op_state_radio_cause = -1;
-static int hf_capwap_msg_element_type_result_code = -1;
-
-static int hf_capwap_msg_element_type_session_id = -1;
-
-static int hf_capwap_msg_element_type_statistics_timer = -1;
-
-static int hf_capwap_msg_element_type_vsp_vendor_identifier = -1;
-static int hf_capwap_msg_element_type_vsp_vendor_element_id = -1;
-static int hf_capwap_msg_element_type_vsp_vendor_data = -1;
-
-static int hf_capwap_msg_element_type_wtp_board_data = -1;
-static int hf_capwap_msg_element_type_wtp_board_data_vendor = -1;
-static int hf_capwap_msg_element_type_wtp_board_data_type = -1;
-static int hf_capwap_msg_element_type_wtp_board_data_length = -1;
-static int hf_capwap_msg_element_type_wtp_board_data_value = -1;
-static int hf_capwap_msg_element_type_wtp_board_data_wtp_model_number  = -1;
-static int hf_capwap_msg_element_type_wtp_board_data_wtp_serial_number  = -1;
-static int hf_capwap_msg_element_type_wtp_board_data_wtp_board_id  = -1;
-static int hf_capwap_msg_element_type_wtp_board_data_wtp_board_revision  = -1;
-static int hf_capwap_msg_element_type_wtp_board_data_base_mac_address  = -1;
-
-static int hf_capwap_msg_element_type_wtp_descriptor_max_radios = -1;
-static int hf_capwap_msg_element_type_wtp_descriptor_radio_in_use = -1;
-static int hf_capwap_msg_element_type_wtp_descriptor_number_encrypt = -1;
-static int hf_capwap_msg_element_type_wtp_descriptor_encrypt = -1;
-static int hf_capwap_msg_element_type_wtp_descriptor_encrypt_reserved = -1;
-static int hf_capwap_msg_element_type_wtp_descriptor_encrypt_wbid = -1;
-static int hf_capwap_msg_element_type_wtp_descriptor_encrypt_capabilities = -1;
-
-static int hf_capwap_msg_element_type_wtp_descriptor = -1;
-static int hf_capwap_msg_element_type_wtp_descriptor_vendor = -1;
-static int hf_capwap_msg_element_type_wtp_descriptor_type = -1;
-static int hf_capwap_msg_element_type_wtp_descriptor_length = -1;
-static int hf_capwap_msg_element_type_wtp_descriptor_value = -1;
-static int hf_capwap_msg_element_type_wtp_descriptor_hardware_version = -1;
-static int hf_capwap_msg_element_type_wtp_descriptor_active_software_version = -1;
-static int hf_capwap_msg_element_type_wtp_descriptor_boot_version = -1;
-static int hf_capwap_msg_element_type_wtp_descriptor_other_software_version = -1;
-
-static int hf_capwap_msg_element_type_wtp_fallback = -1;
-static int hf_capwap_msg_element_type_wtp_frame_tunnel_mode = -1;
-static int hf_capwap_msg_element_type_wtp_frame_tunnel_mode_n = -1;
-static int hf_capwap_msg_element_type_wtp_frame_tunnel_mode_e = -1;
-static int hf_capwap_msg_element_type_wtp_frame_tunnel_mode_l = -1;
-static int hf_capwap_msg_element_type_wtp_frame_tunnel_mode_r = -1;
-
-static int hf_capwap_msg_element_type_wtp_mac_type = -1;
-
-static int hf_capwap_msg_element_type_wtp_name = -1;
-
-static int hf_capwap_msg_element_type_wtp_reboot_statistics_reboot_count = -1;
-static int hf_capwap_msg_element_type_wtp_reboot_statistics_ac_initiated_count = -1;
-static int hf_capwap_msg_element_type_wtp_reboot_statistics_link_failure_count = -1;
-static int hf_capwap_msg_element_type_wtp_reboot_statistics_sw_failure_count = -1;
-static int hf_capwap_msg_element_type_wtp_reboot_statistics_hw_failure_count = -1;
-static int hf_capwap_msg_element_type_wtp_reboot_statistics_other_failure_count = -1;
-static int hf_capwap_msg_element_type_wtp_reboot_statistics_unknown_failure_count = -1;
-static int hf_capwap_msg_element_type_wtp_reboot_statistics_last_failure_type = -1;
-
-static int hf_capwap_msg_element_type_capwap_local_ipv6_address = -1;
-
-static int hf_capwap_msg_element_type_capwap_transport_protocol = -1;
-
-static int hf_capwap_msg_element_type_mtu_discovery_padding = -1;
-
-static int hf_capwap_msg_element_type_ecn_support = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_wlan_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_e = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_i = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_c = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_f = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_p = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_s = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_b = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_a = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_m = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_q = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_t = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_d = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_v = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_o = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_k = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_l = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_key_index = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_key_status = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_key_length = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_key = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_group_tsc = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_qos = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_auth_type = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_mac_mode = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_tunnel_mode = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_suppress_ssid = -1;
-static int hf_capwap_msg_element_type_ieee80211_add_wlan_ssid = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_antenna_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_antenna_diversity = -1;
-static int hf_capwap_msg_element_type_ieee80211_antenna_combiner = -1;
-static int hf_capwap_msg_element_type_ieee80211_antenna_count = -1;
-static int hf_capwap_msg_element_type_ieee80211_antenna_selection = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_assigned_wtp_bssid_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_assigned_wtp_bssid_wlan_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_assigned_wtp_bssid_bssid = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_delete_wlan_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_delete_wlan_wlan_id = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_direct_sequence_control_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_direct_sequence_control_reserved = -1;
-static int hf_capwap_msg_element_type_ieee80211_direct_sequence_control_current_channel = -1;
-static int hf_capwap_msg_element_type_ieee80211_direct_sequence_control_current_cca = -1;
-static int hf_capwap_msg_element_type_ieee80211_direct_sequence_control_energy_detect_threshold = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_ie_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_ie_wlan_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_ie_flags = -1;
-static int hf_capwap_msg_element_type_ieee80211_ie_flags_b = -1;
-static int hf_capwap_msg_element_type_ieee80211_ie_flags_p = -1;
-static int hf_capwap_msg_element_type_ieee80211_ie_flags_rsv = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_mac_operation_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_mac_operation_reserved = -1;
-static int hf_capwap_msg_element_type_ieee80211_mac_operation_rts_threshold = -1;
-static int hf_capwap_msg_element_type_ieee80211_mac_operation_short_retry = -1;
-static int hf_capwap_msg_element_type_ieee80211_mac_operation_long_retry = -1;
-static int hf_capwap_msg_element_type_ieee80211_mac_operation_fragmentation_threshold = -1;
-static int hf_capwap_msg_element_type_ieee80211_mac_operation_tx_msdu_lifetime = -1;
-static int hf_capwap_msg_element_type_ieee80211_mac_operation_rx_msdu_lifetime = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_mic_countermeasures_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_mic_countermeasures_wlan_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_mic_countermeasures_mac_address = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_ofdm_control_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_ofdm_control_reserved = -1;
-static int hf_capwap_msg_element_type_ieee80211_ofdm_control_current_channel = -1;
-static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support = -1;
-static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit0 = -1;
-static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit1 = -1;
-static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit2 = -1;
-static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit3 = -1;
-static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit4 = -1;
-static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit5 = -1;
-static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit6 = -1;
-static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit7 = -1;
-static int hf_capwap_msg_element_type_ieee80211_ofdm_control_ti_threshold = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_multi_domain_capability_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_multi_domain_capability_reserved = -1;
-static int hf_capwap_msg_element_type_ieee80211_multi_domain_capability_first_channel = -1;
-static int hf_capwap_msg_element_type_ieee80211_multi_domain_capability_number_of_channels = -1;
-static int hf_capwap_msg_element_type_ieee80211_multi_domain_capability_max_tx_power_level = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_rate_set_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_rate_set_rate_set = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_station_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_association_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_flags = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_mac_address = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_e = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_i = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_c = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_f = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_p = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_s = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_b = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_a = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_m = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_q = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_t = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_d = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_v = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_o = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_k = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_capabilities_l = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_wlan_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_supported_rates = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_station_session_key_mac = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_session_key_flags = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_session_key_flags_a = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_session_key_flags_c = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_session_key_pairwire_tsc = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_session_key_pairwire_rsc = -1;
-static int hf_capwap_msg_element_type_ieee80211_station_session_key_key = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_supported_rates_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_supported_rates_rate = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_tx_power_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_tx_power_reserved = -1;
-static int hf_capwap_msg_element_type_ieee80211_tx_power_current_tx_power  = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_tx_power_level_radio_id  = -1;
-static int hf_capwap_msg_element_type_ieee80211_tx_power_level_num_levels  = -1;
-static int hf_capwap_msg_element_type_ieee80211_tx_power_level_power_level = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_wlan_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_e = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_i = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_c = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_f = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_p = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_s = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_b = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_a = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_m = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_q = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_t = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_d = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_v = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_o = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_k = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_l = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_key_index = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_key_status = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_key_length = -1;
-static int hf_capwap_msg_element_type_ieee80211_update_wlan_key = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_short_preamble = -1;
-static int hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_num_of_bssids = -1;
-static int hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_dtim_period = -1;
-static int hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_bssid = -1;
-static int hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_beacon_period = -1;
-static int hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_country_string = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_id = -1;
-static int hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_reserved = -1;
-static int hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_n = -1;
-static int hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_g = -1;
-static int hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_a = -1;
-static int hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_b = -1;
-
-static int hf_capwap_msg_element_type_ieee80211_supported_mac_profiles_numbers = -1;
-static int hf_capwap_msg_element_type_ieee80211_supported_mac_profiles_profile = -1;
-static int hf_capwap_msg_element_type_ieee80211_mac_profile = -1;
-
-static int hf_capwap_data_keep_alive = -1;
-static int hf_capwap_data_keep_alive_length = -1;
-
-static int hf_capwap_fortinet_element_id = -1;
-static int hf_capwap_fortinet_value = -1;
-static int hf_capwap_fortinet_ap_scan_rid = -1;
-static int hf_capwap_fortinet_ap_scan_bgscan_intv = -1;
-static int hf_capwap_fortinet_ap_scan_bgscan_idle = -1;
-static int hf_capwap_fortinet_ap_scan_bgscan_rpt_intv = -1;
-static int hf_capwap_fortinet_ap_scan_fgscan_rpt_intv = -1;
-static int hf_capwap_fortinet_passive_rid = -1;
-static int hf_capwap_fortinet_passive = -1;
-static int hf_capwap_fortinet_daemon_rst = -1;
-static int hf_capwap_fortinet_mac_rid = -1;
-static int hf_capwap_fortinet_mac_wid = -1;
-static int hf_capwap_fortinet_mac_len = -1;
-static int hf_capwap_fortinet_mac = -1;
-static int hf_capwap_fortinet_wtp_allow_sn = -1;
-static int hf_capwap_fortinet_wtp_allow_allow = -1;
-static int hf_capwap_fortinet_wbh_sta_rid = -1;
-static int hf_capwap_fortinet_wbh_sta_len = -1;
-static int hf_capwap_fortinet_wbh_sta_mac = -1;
-static int hf_capwap_fortinet_wbh_sta_bssid = -1;
-static int hf_capwap_fortinet_wbh_sta_mhc = -1;
-static int hf_capwap_fortinet_htcap_rid = -1;
-static int hf_capwap_fortinet_htcap_mcs = -1;
-static int hf_capwap_fortinet_htcap_gi = -1;
-static int hf_capwap_fortinet_htcap_bw = -1;
-static int hf_capwap_fortinet_mvap_sn_length = -1;
-static int hf_capwap_fortinet_mvap_sn = -1;
-static int hf_capwap_fortinet_mvap_unknown = -1;
-static int hf_capwap_fortinet_mvap_age = -1;
-static int hf_capwap_fortinet_mvap_period = -1;
-static int hf_capwap_fortinet_mvap_vfid = -1;
-static int hf_capwap_fortinet_mode_rid = -1;
-static int hf_capwap_fortinet_mode = -1;
-static int hf_capwap_fortinet_coext_rid = -1;
-static int hf_capwap_fortinet_coext = -1;
-static int hf_capwap_fortinet_amsdu_rid = -1;
-static int hf_capwap_fortinet_amsdu = -1;
-static int hf_capwap_fortinet_ps_opt_rid = -1;
-static int hf_capwap_fortinet_ps_opt = -1;
-static int hf_capwap_fortinet_pure_rid = -1;
-static int hf_capwap_fortinet_pure = -1;
-static int hf_capwap_fortinet_ebptag_ebp = -1;
-static int hf_capwap_fortinet_ebptag_tag = -1;
-static int hf_capwap_fortinet_telnet_enable = -1;
-static int hf_capwap_fortinet_admin_passwd = -1;
-static int hf_capwap_fortinet_regcode = -1;
-static int hf_capwap_fortinet_countrycode_rid = -1;
-static int hf_capwap_fortinet_countrycode_code = -1;
-static int hf_capwap_fortinet_countrycode_string = -1;
-static int hf_capwap_fortinet_sta_scan_rid = -1;
-static int hf_capwap_fortinet_sta_scan = -1;
-static int hf_capwap_fortinet_fho_rid = -1;
-static int hf_capwap_fortinet_fho = -1;
-static int hf_capwap_fortinet_apho_rid = -1;
-static int hf_capwap_fortinet_apho = -1;
-static int hf_capwap_fortinet_sta_locate_rid = -1;
-static int hf_capwap_fortinet_sta_locate_enable = -1;
-static int hf_capwap_fortinet_sta_locate_interval = -1;
-static int hf_capwap_fortinet_sa_rid = -1;
-static int hf_capwap_fortinet_sa_enable = -1;
-static int hf_capwap_fortinet_sa_ssid = -1;
-static int hf_capwap_fortinet_darrp_cfg_rid = -1;
-static int hf_capwap_fortinet_darrp_cfg_enable = -1;
-static int hf_capwap_fortinet_darrp_cfg_interval = -1;
-static int hf_capwap_fortinet_ap_suppress_list_ver = -1;
-static int hf_capwap_fortinet_ap_suppress_list_op = -1;
-static int hf_capwap_fortinet_ap_suppress_list_rid = -1;
-static int hf_capwap_fortinet_ap_suppress_list_len = -1;
-static int hf_capwap_fortinet_wds_rid = -1;
-static int hf_capwap_fortinet_wds_wid = -1;
-static int hf_capwap_fortinet_wds_enable = -1;
-static int hf_capwap_fortinet_vap_vlan_tag_rid = -1;
-static int hf_capwap_fortinet_vap_vlan_tag_wid = -1;
-static int hf_capwap_fortinet_vap_vlan_tag = -1;
-static int hf_capwap_fortinet_vap_bitmap_rid = -1;
-static int hf_capwap_fortinet_vap_bitmap = -1;
-static int hf_capwap_fortinet_mcast_rate_rid = -1;
-static int hf_capwap_fortinet_mcast_rate_wid = -1;
-static int hf_capwap_fortinet_mcast_rate = -1;
-static int hf_capwap_fortinet_cfg_rid = -1;
-static int hf_capwap_fortinet_cfg_wid = -1;
-static int hf_capwap_fortinet_cfg_ip = -1;
-static int hf_capwap_fortinet_cfg_mask = -1;
-static int hf_capwap_fortinet_split_tun_cfg_enable_local_subnet = -1;
-static int hf_capwap_fortinet_split_tun_cfg_cnt = -1;
-static int hf_capwap_fortinet_mgmt_vlan_id = -1;
-static int hf_capwap_fortinet_vap_psk_passwd_rid = -1;
-static int hf_capwap_fortinet_vap_psk_passwd_wid = -1;
-static int hf_capwap_fortinet_vap_psk_passwd_key = -1;
-static int hf_capwap_fortinet_mesh_eth_bridge_enable = -1;
-static int hf_capwap_fortinet_mesh_eth_bridge_type = -1;
-static int hf_capwap_fortinet_wtp_cap = -1;
-static int hf_capwap_fortinet_txpwr_rid = -1;
-static int hf_capwap_fortinet_txpwr = -1;
-static int hf_capwap_fortinet_wids_enable_rid = -1;
-static int hf_capwap_fortinet_wids_enable = -1;
-static int hf_capwap_fortinet_unknown_rid = -1;
-static int hf_capwap_fortinet_unknown_wid = -1;
-static int hf_capwap_fortinet_unknown = -1;
-
-static int hf_capwap_cisco_element_id = -1;
-static int hf_capwap_cisco_value = -1;
-static int hf_capwap_cisco_mwar_addr = -1;
-static int hf_capwap_cisco_rad_name = -1;
-static int hf_capwap_cisco_mwar_type = -1;
-static int hf_capwap_cisco_mwar_hardware = -1;
-static int hf_capwap_cisco_mwar_software = -1;
-static int hf_capwap_cisco_mwar_active_ms = -1;
-static int hf_capwap_cisco_mwar_supported_ms = -1;
-static int hf_capwap_cisco_mwar_active_rad = -1;
-static int hf_capwap_cisco_mwar_supported_rad = -1;
-static int hf_capwap_cisco_ap_mode_and_type_mode = -1;
-static int hf_capwap_cisco_ap_mode_and_type_type = -1;
-static int hf_capwap_cisco_ap_static_ip_addr = -1;
-static int hf_capwap_cisco_ap_static_ip_netmask = -1;
-static int hf_capwap_cisco_ap_static_ip_gateway = -1;
-static int hf_capwap_cisco_ap_static_ip_type = -1;
-static int hf_capwap_cisco_ap_static_ip_reserved = -1;
-static int hf_capwap_cisco_ap_uptime_current = -1;
-static int hf_capwap_cisco_ap_uptime_last = -1;
-static int hf_capwap_cisco_ap_group_name = -1;
-static int hf_capwap_cisco_ap_led_state = -1;
-static int hf_capwap_cisco_ap_timesync = -1;
-static int hf_capwap_cisco_ap_timesync_type = -1;
-static int hf_capwap_cisco_board_data_options_ant_type = -1;
-static int hf_capwap_cisco_board_data_options_flex_connect = -1;
-static int hf_capwap_cisco_board_data_options_ap_type = -1;
-static int hf_capwap_cisco_board_data_options_join_priority = -1;
-static int hf_capwap_cisco_unknown = -1;
-
-static int hf_msg_fragments = -1;
-static int hf_msg_fragment = -1;
-static int hf_msg_fragment_overlap = -1;
-static int hf_msg_fragment_overlap_conflicts = -1;
-static int hf_msg_fragment_multiple_tails = -1;
-static int hf_msg_fragment_too_long_fragment = -1;
-static int hf_msg_fragment_error = -1;
-static int hf_msg_fragment_count = -1;
-static int hf_msg_reassembled_in = -1;
-static int hf_msg_reassembled_length = -1;
+static int hf_capwap_msg_element_type_ac_descriptor_dtls_policy;
+static int hf_capwap_msg_element_type_ac_descriptor_dtls_policy_d;
+static int hf_capwap_msg_element_type_ac_descriptor_dtls_policy_c;
+static int hf_capwap_msg_element_type_ac_descriptor_dtls_policy_r;
+
+static int hf_capwap_msg_element_type_ac_information;
+static int hf_capwap_msg_element_type_ac_information_vendor;
+static int hf_capwap_msg_element_type_ac_information_type;
+static int hf_capwap_msg_element_type_ac_information_length;
+static int hf_capwap_msg_element_type_ac_information_value;
+static int hf_capwap_msg_element_type_ac_information_hardware_version;
+static int hf_capwap_msg_element_type_ac_information_software_version;
+
+static int hf_capwap_msg_element_type_ac_name;
+static int hf_capwap_msg_element_type_ac_name_with_priority;
+
+static int hf_capwap_msg_element_type_ac_timestamp;
+
+static int hf_capwap_msg_element_type_add_station_radio_id;
+static int hf_capwap_msg_element_type_add_station_length;
+static int hf_capwap_msg_element_type_add_station_mac_eui48;
+static int hf_capwap_msg_element_type_add_station_mac_eui64;
+static int hf_capwap_msg_element_type_add_station_mac_data;
+static int hf_capwap_msg_element_type_add_station_vlan_name;
+
+static int hf_capwap_msg_element_type_ac_ipv4_list;
+static int hf_capwap_msg_element_type_ac_ipv6_list;
+
+static int hf_capwap_msg_element_type_capwap_control_ipv4;
+static int hf_capwap_msg_element_type_capwap_control_ipv6;
+static int hf_capwap_msg_element_type_capwap_control_wtp_count;
+
+static int hf_capwap_msg_element_type_capwap_timers_discovery;
+static int hf_capwap_msg_element_type_capwap_timers_echo_request;
+
+static int hf_capwap_msg_element_type_decryption_error_report_period_radio_id;
+static int hf_capwap_msg_element_type_decryption_error_report_period_interval;
+
+static int hf_capwap_msg_element_type_delete_station_radio_id;
+static int hf_capwap_msg_element_type_delete_station_length;
+static int hf_capwap_msg_element_type_delete_station_mac_eui48;
+static int hf_capwap_msg_element_type_delete_station_mac_eui64;
+static int hf_capwap_msg_element_type_delete_station_mac_data;
+
+static int hf_capwap_msg_element_type_discovery_type;
+
+static int hf_capwap_msg_element_type_location_data;
+
+static int hf_capwap_msg_element_type_maximum_message_length;
+
+static int hf_capwap_msg_element_type_capwap_local_ipv4_address;
+
+static int hf_capwap_msg_element_type_idle_timeout;
+static int hf_capwap_msg_element_type_radio_admin_id;
+static int hf_capwap_msg_element_type_radio_admin_state;
+
+static int hf_capwap_msg_element_type_radio_op_state_radio_id;
+static int hf_capwap_msg_element_type_radio_op_state_radio_state;
+static int hf_capwap_msg_element_type_radio_op_state_radio_cause;
+static int hf_capwap_msg_element_type_result_code;
+
+static int hf_capwap_msg_element_type_session_id;
+
+static int hf_capwap_msg_element_type_statistics_timer;
+
+static int hf_capwap_msg_element_type_vsp_vendor_identifier;
+static int hf_capwap_msg_element_type_vsp_vendor_element_id;
+static int hf_capwap_msg_element_type_vsp_vendor_data;
+
+static int hf_capwap_msg_element_type_wtp_board_data;
+static int hf_capwap_msg_element_type_wtp_board_data_vendor;
+static int hf_capwap_msg_element_type_wtp_board_data_type;
+static int hf_capwap_msg_element_type_wtp_board_data_length;
+static int hf_capwap_msg_element_type_wtp_board_data_value;
+static int hf_capwap_msg_element_type_wtp_board_data_wtp_model_number;
+static int hf_capwap_msg_element_type_wtp_board_data_wtp_serial_number;
+static int hf_capwap_msg_element_type_wtp_board_data_wtp_board_id;
+static int hf_capwap_msg_element_type_wtp_board_data_wtp_board_revision;
+static int hf_capwap_msg_element_type_wtp_board_data_base_mac_address;
+
+static int hf_capwap_msg_element_type_wtp_descriptor_max_radios;
+static int hf_capwap_msg_element_type_wtp_descriptor_radio_in_use;
+static int hf_capwap_msg_element_type_wtp_descriptor_number_encrypt;
+static int hf_capwap_msg_element_type_wtp_descriptor_encrypt;
+static int hf_capwap_msg_element_type_wtp_descriptor_encrypt_reserved;
+static int hf_capwap_msg_element_type_wtp_descriptor_encrypt_wbid;
+static int hf_capwap_msg_element_type_wtp_descriptor_encrypt_capabilities;
+
+static int hf_capwap_msg_element_type_wtp_descriptor;
+static int hf_capwap_msg_element_type_wtp_descriptor_vendor;
+static int hf_capwap_msg_element_type_wtp_descriptor_type;
+static int hf_capwap_msg_element_type_wtp_descriptor_length;
+static int hf_capwap_msg_element_type_wtp_descriptor_value;
+static int hf_capwap_msg_element_type_wtp_descriptor_hardware_version;
+static int hf_capwap_msg_element_type_wtp_descriptor_active_software_version;
+static int hf_capwap_msg_element_type_wtp_descriptor_boot_version;
+static int hf_capwap_msg_element_type_wtp_descriptor_other_software_version;
+
+static int hf_capwap_msg_element_type_wtp_fallback;
+static int hf_capwap_msg_element_type_wtp_frame_tunnel_mode;
+static int hf_capwap_msg_element_type_wtp_frame_tunnel_mode_n;
+static int hf_capwap_msg_element_type_wtp_frame_tunnel_mode_e;
+static int hf_capwap_msg_element_type_wtp_frame_tunnel_mode_l;
+static int hf_capwap_msg_element_type_wtp_frame_tunnel_mode_r;
+
+static int hf_capwap_msg_element_type_wtp_mac_type;
+
+static int hf_capwap_msg_element_type_wtp_name;
+
+static int hf_capwap_msg_element_type_wtp_reboot_statistics_reboot_count;
+static int hf_capwap_msg_element_type_wtp_reboot_statistics_ac_initiated_count;
+static int hf_capwap_msg_element_type_wtp_reboot_statistics_link_failure_count;
+static int hf_capwap_msg_element_type_wtp_reboot_statistics_sw_failure_count;
+static int hf_capwap_msg_element_type_wtp_reboot_statistics_hw_failure_count;
+static int hf_capwap_msg_element_type_wtp_reboot_statistics_other_failure_count;
+static int hf_capwap_msg_element_type_wtp_reboot_statistics_unknown_failure_count;
+static int hf_capwap_msg_element_type_wtp_reboot_statistics_last_failure_type;
+
+static int hf_capwap_msg_element_type_capwap_local_ipv6_address;
+
+static int hf_capwap_msg_element_type_capwap_transport_protocol;
+
+static int hf_capwap_msg_element_type_mtu_discovery_padding;
+
+static int hf_capwap_msg_element_type_ecn_support;
+
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_wlan_id;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_e;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_i;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_c;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_f;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_p;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_s;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_b;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_a;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_m;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_q;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_t;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_d;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_v;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_o;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_k;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_capability_l;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_key_index;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_key_status;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_key_length;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_key;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_group_tsc;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_qos;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_auth_type;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_mac_mode;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_tunnel_mode;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_suppress_ssid;
+static int hf_capwap_msg_element_type_ieee80211_add_wlan_ssid;
+
+static int hf_capwap_msg_element_type_ieee80211_antenna_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_antenna_diversity;
+static int hf_capwap_msg_element_type_ieee80211_antenna_combiner;
+static int hf_capwap_msg_element_type_ieee80211_antenna_count;
+static int hf_capwap_msg_element_type_ieee80211_antenna_selection;
+
+static int hf_capwap_msg_element_type_ieee80211_assigned_wtp_bssid_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_assigned_wtp_bssid_wlan_id;
+static int hf_capwap_msg_element_type_ieee80211_assigned_wtp_bssid_bssid;
+
+static int hf_capwap_msg_element_type_ieee80211_delete_wlan_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_delete_wlan_wlan_id;
+
+static int hf_capwap_msg_element_type_ieee80211_direct_sequence_control_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_direct_sequence_control_reserved;
+static int hf_capwap_msg_element_type_ieee80211_direct_sequence_control_current_channel;
+static int hf_capwap_msg_element_type_ieee80211_direct_sequence_control_current_cca;
+static int hf_capwap_msg_element_type_ieee80211_direct_sequence_control_energy_detect_threshold;
+
+static int hf_capwap_msg_element_type_ieee80211_ie_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_ie_wlan_id;
+static int hf_capwap_msg_element_type_ieee80211_ie_flags;
+static int hf_capwap_msg_element_type_ieee80211_ie_flags_b;
+static int hf_capwap_msg_element_type_ieee80211_ie_flags_p;
+static int hf_capwap_msg_element_type_ieee80211_ie_flags_rsv;
+
+static int hf_capwap_msg_element_type_ieee80211_mac_operation_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_mac_operation_reserved;
+static int hf_capwap_msg_element_type_ieee80211_mac_operation_rts_threshold;
+static int hf_capwap_msg_element_type_ieee80211_mac_operation_short_retry;
+static int hf_capwap_msg_element_type_ieee80211_mac_operation_long_retry;
+static int hf_capwap_msg_element_type_ieee80211_mac_operation_fragmentation_threshold;
+static int hf_capwap_msg_element_type_ieee80211_mac_operation_tx_msdu_lifetime;
+static int hf_capwap_msg_element_type_ieee80211_mac_operation_rx_msdu_lifetime;
+
+static int hf_capwap_msg_element_type_ieee80211_mic_countermeasures_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_mic_countermeasures_wlan_id;
+static int hf_capwap_msg_element_type_ieee80211_mic_countermeasures_mac_address;
+
+static int hf_capwap_msg_element_type_ieee80211_ofdm_control_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_ofdm_control_reserved;
+static int hf_capwap_msg_element_type_ieee80211_ofdm_control_current_channel;
+static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support;
+static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit0;
+static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit1;
+static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit2;
+static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit3;
+static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit4;
+static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit5;
+static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit6;
+static int hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit7;
+static int hf_capwap_msg_element_type_ieee80211_ofdm_control_ti_threshold;
+
+static int hf_capwap_msg_element_type_ieee80211_multi_domain_capability_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_multi_domain_capability_reserved;
+static int hf_capwap_msg_element_type_ieee80211_multi_domain_capability_first_channel;
+static int hf_capwap_msg_element_type_ieee80211_multi_domain_capability_number_of_channels;
+static int hf_capwap_msg_element_type_ieee80211_multi_domain_capability_max_tx_power_level;
+
+static int hf_capwap_msg_element_type_ieee80211_rate_set_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_rate_set_rate_set;
+
+static int hf_capwap_msg_element_type_ieee80211_station_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_station_association_id;
+static int hf_capwap_msg_element_type_ieee80211_station_flags;
+static int hf_capwap_msg_element_type_ieee80211_station_mac_address;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_e;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_i;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_c;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_f;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_p;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_s;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_b;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_a;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_m;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_q;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_t;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_d;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_v;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_o;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_k;
+static int hf_capwap_msg_element_type_ieee80211_station_capabilities_l;
+static int hf_capwap_msg_element_type_ieee80211_station_wlan_id;
+static int hf_capwap_msg_element_type_ieee80211_station_supported_rates;
+
+static int hf_capwap_msg_element_type_ieee80211_station_session_key_mac;
+static int hf_capwap_msg_element_type_ieee80211_station_session_key_flags;
+static int hf_capwap_msg_element_type_ieee80211_station_session_key_flags_a;
+static int hf_capwap_msg_element_type_ieee80211_station_session_key_flags_c;
+static int hf_capwap_msg_element_type_ieee80211_station_session_key_pairwire_tsc;
+static int hf_capwap_msg_element_type_ieee80211_station_session_key_pairwire_rsc;
+static int hf_capwap_msg_element_type_ieee80211_station_session_key_key;
+
+static int hf_capwap_msg_element_type_ieee80211_supported_rates_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_supported_rates_rate;
+
+static int hf_capwap_msg_element_type_ieee80211_tx_power_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_tx_power_reserved;
+static int hf_capwap_msg_element_type_ieee80211_tx_power_current_tx_power;
+
+static int hf_capwap_msg_element_type_ieee80211_tx_power_level_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_tx_power_level_num_levels;
+static int hf_capwap_msg_element_type_ieee80211_tx_power_level_power_level;
+
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_wlan_id;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_e;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_i;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_c;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_f;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_p;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_s;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_b;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_a;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_m;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_q;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_t;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_d;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_v;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_o;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_k;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_capability_l;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_key_index;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_key_status;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_key_length;
+static int hf_capwap_msg_element_type_ieee80211_update_wlan_key;
+
+static int hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_short_preamble;
+static int hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_num_of_bssids;
+static int hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_dtim_period;
+static int hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_bssid;
+static int hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_beacon_period;
+static int hf_capwap_msg_element_type_ieee80211_wtp_radio_cfg_country_string;
+
+static int hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_id;
+static int hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_reserved;
+static int hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_n;
+static int hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_g;
+static int hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_a;
+static int hf_capwap_msg_element_type_ieee80211_wtp_radio_info_radio_type_b;
+
+static int hf_capwap_msg_element_type_ieee80211_supported_mac_profiles_numbers;
+static int hf_capwap_msg_element_type_ieee80211_supported_mac_profiles_profile;
+static int hf_capwap_msg_element_type_ieee80211_mac_profile;
+
+static int hf_capwap_data_keep_alive;
+static int hf_capwap_data_keep_alive_length;
+
+static int hf_capwap_fortinet_element_id;
+static int hf_capwap_fortinet_value;
+static int hf_capwap_fortinet_ap_scan_rid;
+static int hf_capwap_fortinet_ap_scan_bgscan_intv;
+static int hf_capwap_fortinet_ap_scan_bgscan_idle;
+static int hf_capwap_fortinet_ap_scan_bgscan_rpt_intv;
+static int hf_capwap_fortinet_ap_scan_fgscan_rpt_intv;
+static int hf_capwap_fortinet_passive_rid;
+static int hf_capwap_fortinet_passive;
+static int hf_capwap_fortinet_daemon_rst;
+static int hf_capwap_fortinet_mac_rid;
+static int hf_capwap_fortinet_mac_wid;
+static int hf_capwap_fortinet_mac_len;
+static int hf_capwap_fortinet_mac;
+static int hf_capwap_fortinet_wtp_allow_sn;
+static int hf_capwap_fortinet_wtp_allow_allow;
+static int hf_capwap_fortinet_wbh_sta_rid;
+static int hf_capwap_fortinet_wbh_sta_len;
+static int hf_capwap_fortinet_wbh_sta_mac;
+static int hf_capwap_fortinet_wbh_sta_bssid;
+static int hf_capwap_fortinet_wbh_sta_mhc;
+static int hf_capwap_fortinet_htcap_rid;
+static int hf_capwap_fortinet_htcap_mcs;
+static int hf_capwap_fortinet_htcap_gi;
+static int hf_capwap_fortinet_htcap_bw;
+static int hf_capwap_fortinet_mvap_sn_length;
+static int hf_capwap_fortinet_mvap_sn;
+static int hf_capwap_fortinet_mvap_unknown;
+static int hf_capwap_fortinet_mvap_age;
+static int hf_capwap_fortinet_mvap_period;
+static int hf_capwap_fortinet_mvap_vfid;
+static int hf_capwap_fortinet_mode_rid;
+static int hf_capwap_fortinet_mode;
+static int hf_capwap_fortinet_coext_rid;
+static int hf_capwap_fortinet_coext;
+static int hf_capwap_fortinet_amsdu_rid;
+static int hf_capwap_fortinet_amsdu;
+static int hf_capwap_fortinet_ps_opt_rid;
+static int hf_capwap_fortinet_ps_opt;
+static int hf_capwap_fortinet_pure_rid;
+static int hf_capwap_fortinet_pure;
+static int hf_capwap_fortinet_ebptag_ebp;
+static int hf_capwap_fortinet_ebptag_tag;
+static int hf_capwap_fortinet_telnet_enable;
+static int hf_capwap_fortinet_admin_passwd;
+static int hf_capwap_fortinet_regcode;
+static int hf_capwap_fortinet_countrycode_rid;
+static int hf_capwap_fortinet_countrycode_code;
+static int hf_capwap_fortinet_countrycode_string;
+static int hf_capwap_fortinet_sta_scan_rid;
+static int hf_capwap_fortinet_sta_scan;
+static int hf_capwap_fortinet_fho_rid;
+static int hf_capwap_fortinet_fho;
+static int hf_capwap_fortinet_apho_rid;
+static int hf_capwap_fortinet_apho;
+static int hf_capwap_fortinet_sta_locate_rid;
+static int hf_capwap_fortinet_sta_locate_enable;
+static int hf_capwap_fortinet_sta_locate_interval;
+static int hf_capwap_fortinet_sa_rid;
+static int hf_capwap_fortinet_sa_enable;
+static int hf_capwap_fortinet_sa_ssid;
+static int hf_capwap_fortinet_darrp_cfg_rid;
+static int hf_capwap_fortinet_darrp_cfg_enable;
+static int hf_capwap_fortinet_darrp_cfg_interval;
+static int hf_capwap_fortinet_ap_suppress_list_ver;
+static int hf_capwap_fortinet_ap_suppress_list_op;
+static int hf_capwap_fortinet_ap_suppress_list_rid;
+static int hf_capwap_fortinet_ap_suppress_list_len;
+static int hf_capwap_fortinet_wds_rid;
+static int hf_capwap_fortinet_wds_wid;
+static int hf_capwap_fortinet_wds_enable;
+static int hf_capwap_fortinet_vap_vlan_tag_rid;
+static int hf_capwap_fortinet_vap_vlan_tag_wid;
+static int hf_capwap_fortinet_vap_vlan_tag;
+static int hf_capwap_fortinet_vap_bitmap_rid;
+static int hf_capwap_fortinet_vap_bitmap;
+static int hf_capwap_fortinet_mcast_rate_rid;
+static int hf_capwap_fortinet_mcast_rate_wid;
+static int hf_capwap_fortinet_mcast_rate;
+static int hf_capwap_fortinet_cfg_rid;
+static int hf_capwap_fortinet_cfg_wid;
+static int hf_capwap_fortinet_cfg_ip;
+static int hf_capwap_fortinet_cfg_mask;
+static int hf_capwap_fortinet_split_tun_cfg_enable_local_subnet;
+static int hf_capwap_fortinet_split_tun_cfg_cnt;
+static int hf_capwap_fortinet_mgmt_vlan_id;
+static int hf_capwap_fortinet_vap_psk_passwd_rid;
+static int hf_capwap_fortinet_vap_psk_passwd_wid;
+static int hf_capwap_fortinet_vap_psk_passwd_key;
+static int hf_capwap_fortinet_mesh_eth_bridge_enable;
+static int hf_capwap_fortinet_mesh_eth_bridge_type;
+static int hf_capwap_fortinet_wtp_cap;
+static int hf_capwap_fortinet_txpwr_rid;
+static int hf_capwap_fortinet_txpwr;
+static int hf_capwap_fortinet_wids_enable_rid;
+static int hf_capwap_fortinet_wids_enable;
+static int hf_capwap_fortinet_unknown_rid;
+static int hf_capwap_fortinet_unknown_wid;
+static int hf_capwap_fortinet_unknown;
+
+static int hf_capwap_cisco_element_id;
+static int hf_capwap_cisco_value;
+static int hf_capwap_cisco_mwar_addr;
+static int hf_capwap_cisco_rad_name;
+static int hf_capwap_cisco_mwar_type;
+static int hf_capwap_cisco_mwar_hardware;
+static int hf_capwap_cisco_mwar_software;
+static int hf_capwap_cisco_mwar_active_ms;
+static int hf_capwap_cisco_mwar_supported_ms;
+static int hf_capwap_cisco_mwar_active_rad;
+static int hf_capwap_cisco_mwar_supported_rad;
+static int hf_capwap_cisco_ap_mode_and_type_mode;
+static int hf_capwap_cisco_ap_mode_and_type_type;
+static int hf_capwap_cisco_ap_static_ip_addr;
+static int hf_capwap_cisco_ap_static_ip_netmask;
+static int hf_capwap_cisco_ap_static_ip_gateway;
+static int hf_capwap_cisco_ap_static_ip_type;
+static int hf_capwap_cisco_ap_static_ip_reserved;
+static int hf_capwap_cisco_ap_uptime_current;
+static int hf_capwap_cisco_ap_uptime_last;
+static int hf_capwap_cisco_ap_group_name;
+static int hf_capwap_cisco_ap_led_state;
+static int hf_capwap_cisco_ap_timesync;
+static int hf_capwap_cisco_ap_timesync_type;
+static int hf_capwap_cisco_board_data_options_ant_type;
+static int hf_capwap_cisco_board_data_options_flex_connect;
+static int hf_capwap_cisco_board_data_options_ap_type;
+static int hf_capwap_cisco_board_data_options_join_priority;
+static int hf_capwap_cisco_unknown;
+
+static int hf_msg_fragments;
+static int hf_msg_fragment;
+static int hf_msg_fragment_overlap;
+static int hf_msg_fragment_overlap_conflicts;
+static int hf_msg_fragment_multiple_tails;
+static int hf_msg_fragment_too_long_fragment;
+static int hf_msg_fragment_error;
+static int hf_msg_fragment_count;
+static int hf_msg_reassembled_in;
+static int hf_msg_reassembled_length;
 
 static dissector_handle_t dtls_handle;
 static dissector_handle_t ieee8023_handle;
 static dissector_handle_t ieee80211_handle;
 static dissector_handle_t ieee80211_bsfc_handle;
 
-static gint ett_capwap = -1;
-static gint ett_capwap_control = -1;
-static gint ett_capwap_data = -1;
-static gint ett_capwap_preamble = -1;
-static gint ett_capwap_header = -1;
-static gint ett_capwap_header_flags = -1;
-static gint ett_capwap_control_header = -1;
-static gint ett_capwap_control_header_msg = -1;
-static gint ett_capwap_data_keep_alive = -1;
-static gint ett_capwap_message_element = -1;
-static gint ett_capwap_data_message_bindings_ieee80211 = -1;
-static gint ett_capwap_encryption_capabilities = -1;
-static gint ett_capwap_encryption_capability = -1;
-static gint ett_capwap_ac_information = -1;
-static gint ett_capwap_wtp_descriptor = -1;
-static gint ett_capwap_board_data = -1;
-static gint ett_capwap_message_element_type = -1;
-static gint ett_capwap_ac_descriptor_security_flags = -1;
-static gint ett_capwap_ac_descriptor_dtls_flags = -1;
-static gint ett_capwap_wtp_frame_tunnel_mode = -1;
-static gint ett_capwap_ieee80211_add_wlan_capability = -1;
-static gint ett_capwap_ieee80211_ie_flags = -1;
-static gint ett_capwap_ieee80211_update_wlan_capability = -1;
-static gint ett_capwap_ieee80211_station_capabilities = -1;
-static gint ett_capwap_ieee80211_ofdm_control_band_support = -1;
-
-static gint ett_msg_fragment = -1;
-static gint ett_msg_fragments = -1;
-
-static expert_field ei_capwap_header_length_bad = EI_INIT;
-static expert_field ei_capwap_data_keep_alive_length = EI_INIT;
-static expert_field ei_capwap_msg_element_length = EI_INIT;
-static expert_field ei_capwap_message_element_type = EI_INIT;
-static expert_field ei_capwap_fortinet_mac_len = EI_INIT;
-static expert_field ei_capwap_message_element_fortinet_type = EI_INIT;
-static expert_field ei_capwap_message_element_cisco_type = EI_INIT;
+static gint ett_capwap;
+static gint ett_capwap_control;
+static gint ett_capwap_data;
+static gint ett_capwap_preamble;
+static gint ett_capwap_header;
+static gint ett_capwap_header_flags;
+static gint ett_capwap_control_header;
+static gint ett_capwap_control_header_msg;
+static gint ett_capwap_data_keep_alive;
+static gint ett_capwap_message_element;
+static gint ett_capwap_data_message_bindings_ieee80211;
+static gint ett_capwap_encryption_capabilities;
+static gint ett_capwap_encryption_capability;
+static gint ett_capwap_ac_information;
+static gint ett_capwap_wtp_descriptor;
+static gint ett_capwap_board_data;
+static gint ett_capwap_message_element_type;
+static gint ett_capwap_ac_descriptor_security_flags;
+static gint ett_capwap_ac_descriptor_dtls_flags;
+static gint ett_capwap_wtp_frame_tunnel_mode;
+static gint ett_capwap_ieee80211_add_wlan_capability;
+static gint ett_capwap_ieee80211_ie_flags;
+static gint ett_capwap_ieee80211_update_wlan_capability;
+static gint ett_capwap_ieee80211_station_capabilities;
+static gint ett_capwap_ieee80211_ofdm_control_band_support;
+
+static gint ett_msg_fragment;
+static gint ett_msg_fragments;
+
+static expert_field ei_capwap_header_length_bad;
+static expert_field ei_capwap_data_keep_alive_length;
+static expert_field ei_capwap_msg_element_length;
+static expert_field ei_capwap_message_element_type;
+static expert_field ei_capwap_fortinet_mac_len;
+static expert_field ei_capwap_message_element_fortinet_type;
+static expert_field ei_capwap_message_element_cisco_type;
 
 static int * const ieee80211_ofdm_control_band_support_flags[] = {
     &hf_capwap_msg_element_type_ieee80211_ofdm_control_band_support_bit0,
diff --git a/epan/dissectors/packet-carp.c b/epan/dissectors/packet-carp.c
index b9a852f454..6d222dc590 100644
--- a/epan/dissectors/packet-carp.c
+++ b/epan/dissectors/packet-carp.c
@@ -22,24 +22,24 @@ void proto_reg_handoff_carp(void);
 
 static dissector_handle_t carp_handle;
 
-static gint proto_carp = -1;
-static gint ett_carp = -1;
-static gint ett_carp_ver_type = -1;
-
-static gint hf_carp_ver_type = -1;
-static gint hf_carp_version = -1;
-static gint hf_carp_type = -1;
-static gint hf_carp_vhid = -1;
-static gint hf_carp_advskew = -1;
-static gint hf_carp_authlen = -1;
-static gint hf_carp_demotion = -1;
-static gint hf_carp_advbase = -1;
-static gint hf_carp_counter = -1;
-static gint hf_carp_hmac = -1;
-static gint hf_carp_checksum = -1;
-static gint hf_carp_checksum_status = -1;
-
-static expert_field ei_carp_checksum = EI_INIT;
+static gint proto_carp;
+static gint ett_carp;
+static gint ett_carp_ver_type;
+
+static gint hf_carp_ver_type;
+static gint hf_carp_version;
+static gint hf_carp_type;
+static gint hf_carp_vhid;
+static gint hf_carp_advskew;
+static gint hf_carp_authlen;
+static gint hf_carp_demotion;
+static gint hf_carp_advbase;
+static gint hf_carp_counter;
+static gint hf_carp_hmac;
+static gint hf_carp_checksum;
+static gint hf_carp_checksum_status;
+
+static expert_field ei_carp_checksum;
 
 #define CARP_VERSION_MASK 0xf0
 #define CARP_TYPE_MASK 0x0f
diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c
index af9a1e24fe..fac820e03c 100644
--- a/epan/dissectors/packet-cast.c
+++ b/epan/dissectors/packet-cast.c
@@ -271,113 +271,113 @@ static const value_string cast_callSecurityStatusTypes[] = {
 
 
 /* Initialize the protocol and registered fields */
-static int proto_cast          = -1;
-static int hf_cast_data_length = -1;
-static int hf_cast_reserved    = -1;
-static int hf_cast_messageid   = -1;
-static int hf_cast_version   = -1;
-static int hf_cast_ORCStatus = -1;
-static int hf_cast_ipAddress = -1;
-static int hf_cast_portNumber = -1;
-static int hf_cast_passThruPartyID = -1;
-static int hf_cast_callIdentifier = -1;
-static int hf_cast_conferenceID = -1;
-static int hf_cast_payloadType = -1;
-static int hf_cast_lineInstance = -1;
-static int hf_cast_payloadCapability = -1;
-static int hf_cast_isConferenceCreator = -1;
-static int hf_cast_payload_rfc_number = -1;
-static int hf_cast_videoCapCount = -1;
-static int hf_cast_dataCapCount = -1;
-static int hf_cast_RTPPayloadFormat = -1;
-static int hf_cast_customPictureFormatCount = -1;
-static int hf_cast_pictureWidth = -1;
-static int hf_cast_pictureHeight = -1;
-static int hf_cast_pixelAspectRatio = -1;
-static int hf_cast_clockConversionCode = -1;
-static int hf_cast_clockDivisor = -1;
-static int hf_cast_activeStreamsOnRegistration = -1;
-static int hf_cast_maxBW = -1;
-static int hf_cast_serviceResourceCount = -1;
-static int hf_cast_layoutCount = -1;
-static int hf_cast_layout = -1;
-static int hf_cast_maxConferences = -1;
-static int hf_cast_activeConferenceOnRegistration = -1;
-static int hf_cast_transmitOrReceive = -1;
-static int hf_cast_levelPreferenceCount = -1;
-static int hf_cast_transmitPreference = -1;
-static int hf_cast_format = -1;
-static int hf_cast_maxBitRate = -1;
-static int hf_cast_minBitRate = -1;
-static int hf_cast_MPI = -1;
-static int hf_cast_serviceNumber = -1;
-static int hf_cast_temporalSpatialTradeOffCapability = -1;
-static int hf_cast_stillImageTransmission = -1;
-static int hf_cast_h263_capability_bitfield = -1;
-static int hf_cast_annexNandWFutureUse = -1;
-static int hf_cast_modelNumber = -1;
-static int hf_cast_bandwidth = -1;
-static int hf_cast_protocolDependentData = -1;
-static int hf_cast_DSCPValue = -1;
-static int hf_cast_serviceNum = -1;
-/* static int hf_cast_precedenceValue = -1; */
-static int hf_cast_maxStreams = -1;
-static int hf_cast_millisecondPacketSize = -1;
-static int hf_cast_echoCancelType = -1;
-static int hf_cast_g723BitRate = -1;
-static int hf_cast_bitRate = -1;
-static int hf_cast_pictureFormatCount = -1;
-static int hf_cast_confServiceNum = -1;
-static int hf_cast_miscCommandType = -1;
-static int hf_cast_temporalSpatialTradeOff = -1;
-static int hf_cast_firstGOB = -1;
-static int hf_cast_numberOfGOBs = -1;
-static int hf_cast_firstMB = -1;
-static int hf_cast_numberOfMBs = -1;
-static int hf_cast_pictureNumber = -1;
-static int hf_cast_longTermPictureIndex = -1;
-static int hf_cast_recoveryReferencePictureCount = -1;
-static int hf_cast_calledParty = -1;
-static int hf_cast_privacy = -1;
-static int hf_cast_precedenceLv = -1;
-static int hf_cast_precedenceDm = -1;
-static int hf_cast_callState = -1;
-static int hf_cast_callingPartyName = -1;
-static int hf_cast_callingParty = -1;
-static int hf_cast_calledPartyName = -1;
-static int hf_cast_callType = -1;
-static int hf_cast_originalCalledPartyName = -1;
-static int hf_cast_originalCalledParty = -1;
-static int hf_cast_lastRedirectingPartyName = -1;
-static int hf_cast_lastRedirectingParty = -1;
-static int hf_cast_cgpnVoiceMailbox = -1;
-static int hf_cast_cdpnVoiceMailbox = -1;
-static int hf_cast_originalCdpnVoiceMailbox = -1;
-static int hf_cast_lastRedirectingVoiceMailbox = -1;
-static int hf_cast_originalCdpnRedirectReason = -1;
-static int hf_cast_lastRedirectingReason = -1;
-static int hf_cast_callInstance = -1;
-static int hf_cast_callSecurityStatus = -1;
-static int hf_cast_partyPIRestrictionBits_CallingPartyName = -1;
-static int hf_cast_partyPIRestrictionBits_CallingPartyNumber = -1;
-static int hf_cast_partyPIRestrictionBits_CalledPartyName = -1;
-static int hf_cast_partyPIRestrictionBits_CalledPartyNumber = -1;
-static int hf_cast_partyPIRestrictionBits_OriginalCalledPartyName = -1;
-static int hf_cast_partyPIRestrictionBits_OriginalCalledPartyNumber = -1;
-static int hf_cast_partyPIRestrictionBits_LastRedirectPartyName = -1;
-static int hf_cast_partyPIRestrictionBits_LastRedirectPartyNumber = -1;
-static int hf_cast_directoryNumber = -1;
-static int hf_cast_requestorIpAddress = -1;
-static int hf_cast_stationIpAddress = -1;
-static int hf_cast_stationFriendlyName = -1;
-static int hf_cast_stationGUID = -1;
-static int hf_cast_audio = -1;
+static int proto_cast;
+static int hf_cast_data_length;
+static int hf_cast_reserved;
+static int hf_cast_messageid;
+static int hf_cast_version;
+static int hf_cast_ORCStatus;
+static int hf_cast_ipAddress;
+static int hf_cast_portNumber;
+static int hf_cast_passThruPartyID;
+static int hf_cast_callIdentifier;
+static int hf_cast_conferenceID;
+static int hf_cast_payloadType;
+static int hf_cast_lineInstance;
+static int hf_cast_payloadCapability;
+static int hf_cast_isConferenceCreator;
+static int hf_cast_payload_rfc_number;
+static int hf_cast_videoCapCount;
+static int hf_cast_dataCapCount;
+static int hf_cast_RTPPayloadFormat;
+static int hf_cast_customPictureFormatCount;
+static int hf_cast_pictureWidth;
+static int hf_cast_pictureHeight;
+static int hf_cast_pixelAspectRatio;
+static int hf_cast_clockConversionCode;
+static int hf_cast_clockDivisor;
+static int hf_cast_activeStreamsOnRegistration;
+static int hf_cast_maxBW;
+static int hf_cast_serviceResourceCount;
+static int hf_cast_layoutCount;
+static int hf_cast_layout;
+static int hf_cast_maxConferences;
+static int hf_cast_activeConferenceOnRegistration;
+static int hf_cast_transmitOrReceive;
+static int hf_cast_levelPreferenceCount;
+static int hf_cast_transmitPreference;
+static int hf_cast_format;
+static int hf_cast_maxBitRate;
+static int hf_cast_minBitRate;
+static int hf_cast_MPI;
+static int hf_cast_serviceNumber;
+static int hf_cast_temporalSpatialTradeOffCapability;
+static int hf_cast_stillImageTransmission;
+static int hf_cast_h263_capability_bitfield;
+static int hf_cast_annexNandWFutureUse;
+static int hf_cast_modelNumber;
+static int hf_cast_bandwidth;
+static int hf_cast_protocolDependentData;
+static int hf_cast_DSCPValue;
+static int hf_cast_serviceNum;
+/* static int hf_cast_precedenceValue; */
+static int hf_cast_maxStreams;
+static int hf_cast_millisecondPacketSize;
+static int hf_cast_echoCancelType;
+static int hf_cast_g723BitRate;
+static int hf_cast_bitRate;
+static int hf_cast_pictureFormatCount;
+static int hf_cast_confServiceNum;
+static int hf_cast_miscCommandType;
+static int hf_cast_temporalSpatialTradeOff;
+static int hf_cast_firstGOB;
+static int hf_cast_numberOfGOBs;
+static int hf_cast_firstMB;
+static int hf_cast_numberOfMBs;
+static int hf_cast_pictureNumber;
+static int hf_cast_longTermPictureIndex;
+static int hf_cast_recoveryReferencePictureCount;
+static int hf_cast_calledParty;
+static int hf_cast_privacy;
+static int hf_cast_precedenceLv;
+static int hf_cast_precedenceDm;
+static int hf_cast_callState;
+static int hf_cast_callingPartyName;
+static int hf_cast_callingParty;
+static int hf_cast_calledPartyName;
+static int hf_cast_callType;
+static int hf_cast_originalCalledPartyName;
+static int hf_cast_originalCalledParty;
+static int hf_cast_lastRedirectingPartyName;
+static int hf_cast_lastRedirectingParty;
+static int hf_cast_cgpnVoiceMailbox;
+static int hf_cast_cdpnVoiceMailbox;
+static int hf_cast_originalCdpnVoiceMailbox;
+static int hf_cast_lastRedirectingVoiceMailbox;
+static int hf_cast_originalCdpnRedirectReason;
+static int hf_cast_lastRedirectingReason;
+static int hf_cast_callInstance;
+static int hf_cast_callSecurityStatus;
+static int hf_cast_partyPIRestrictionBits_CallingPartyName;
+static int hf_cast_partyPIRestrictionBits_CallingPartyNumber;
+static int hf_cast_partyPIRestrictionBits_CalledPartyName;
+static int hf_cast_partyPIRestrictionBits_CalledPartyNumber;
+static int hf_cast_partyPIRestrictionBits_OriginalCalledPartyName;
+static int hf_cast_partyPIRestrictionBits_OriginalCalledPartyNumber;
+static int hf_cast_partyPIRestrictionBits_LastRedirectPartyName;
+static int hf_cast_partyPIRestrictionBits_LastRedirectPartyNumber;
+static int hf_cast_directoryNumber;
+static int hf_cast_requestorIpAddress;
+static int hf_cast_stationIpAddress;
+static int hf_cast_stationFriendlyName;
+static int hf_cast_stationGUID;
+static int hf_cast_audio;
 
 
 
 /* Initialize the subtree pointers */
-static gint ett_cast          = -1;
-static gint ett_cast_tree     = -1;
+static gint ett_cast;
+static gint ett_cast_tree;
 
 /* desegmentation of SCCP */
 static gboolean cast_desegment = TRUE;
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index a1e61e7e74..8c96a688a1 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -36,97 +36,97 @@ void proto_reg_handoff_catapult_dct2000(void);
 void proto_register_catapult_dct2000(void);
 
 /* Protocol and registered fields. */
-static int proto_catapult_dct2000 = -1;
-
-static int hf_catapult_dct2000_context = -1;
-static int hf_catapult_dct2000_port_number = -1;
-static int hf_catapult_dct2000_timestamp = -1;
-static int hf_catapult_dct2000_protocol = -1;
-static int hf_catapult_dct2000_variant = -1;
-static int hf_catapult_dct2000_outhdr = -1;
-static int hf_catapult_dct2000_direction = -1;
-static int hf_catapult_dct2000_encap = -1;
-static int hf_catapult_dct2000_unparsed_data = -1;
-static int hf_catapult_dct2000_comment = -1;
-static int hf_catapult_dct2000_sprint = -1;
-static int hf_catapult_dct2000_error_comment = -1;
-static int hf_catapult_dct2000_tty = -1;
-static int hf_catapult_dct2000_tty_line = -1;
-static int hf_catapult_dct2000_dissected_length = -1;
-
-static int hf_catapult_dct2000_ipprim_addresses = -1;
-static int hf_catapult_dct2000_ipprim_src_addr_v4 = -1;
-static int hf_catapult_dct2000_ipprim_src_addr_v6 = -1;
-static int hf_catapult_dct2000_ipprim_dst_addr_v4 = -1;
-static int hf_catapult_dct2000_ipprim_dst_addr_v6 = -1;
-static int hf_catapult_dct2000_ipprim_addr_v4 = -1;
-static int hf_catapult_dct2000_ipprim_addr_v6 = -1;
-static int hf_catapult_dct2000_ipprim_udp_src_port = -1;
-static int hf_catapult_dct2000_ipprim_udp_dst_port = -1;
-static int hf_catapult_dct2000_ipprim_udp_port = -1;
-static int hf_catapult_dct2000_ipprim_tcp_src_port = -1;
-static int hf_catapult_dct2000_ipprim_tcp_dst_port = -1;
-static int hf_catapult_dct2000_ipprim_tcp_port = -1;
-static int hf_catapult_dct2000_ipprim_conn_id = -1;
-
-static int hf_catapult_dct2000_sctpprim_addresses = -1;
-static int hf_catapult_dct2000_sctpprim_dst_addr_v4 = -1;
-static int hf_catapult_dct2000_sctpprim_dst_addr_v6 = -1;
-static int hf_catapult_dct2000_sctpprim_addr_v4 = -1;
-static int hf_catapult_dct2000_sctpprim_addr_v6 = -1;
-static int hf_catapult_dct2000_sctpprim_dst_port = -1;
-
-static int hf_catapult_dct2000_ueid = -1;
-static int hf_catapult_dct2000_srbid = -1;
-static int hf_catapult_dct2000_drbid = -1;
-static int hf_catapult_dct2000_cellid = -1;
-static int hf_catapult_dct2000_bcch_transport = -1;
-static int hf_catapult_dct2000_rlc_op = -1;
-static int hf_catapult_dct2000_rlc_channel_type = -1;
-static int hf_catapult_dct2000_rlc_mui = -1;
-static int hf_catapult_dct2000_rlc_cnf = -1;
-static int hf_catapult_dct2000_rlc_discard_req = -1;
-static int hf_catapult_dct2000_carrier_type = -1;
-static int hf_catapult_dct2000_cell_group = -1;
-static int hf_catapult_dct2000_carrier_id = -1;
-
-static int hf_catapult_dct2000_security_mode_params = -1;
-static int hf_catapult_dct2000_uplink_sec_mode = -1;
-static int hf_catapult_dct2000_downlink_sec_mode = -1;
-static int hf_catapult_dct2000_ciphering_algorithm = -1;
-static int hf_catapult_dct2000_ciphering_key = -1;
-static int hf_catapult_dct2000_integrity_algorithm = -1;
-static int hf_catapult_dct2000_integrity_key = -1;
-
-static int hf_catapult_dct2000_lte_ccpri_opcode = -1;
-static int hf_catapult_dct2000_lte_ccpri_status = -1;
-static int hf_catapult_dct2000_lte_ccpri_channel = -1;
-
-static int hf_catapult_dct2000_lte_nas_rrc_opcode = -1;
-static int hf_catapult_dct2000_lte_nas_rrc_establish_cause = -1;
-static int hf_catapult_dct2000_lte_nas_rrc_priority = -1;
-static int hf_catapult_dct2000_lte_nas_rrc_release_cause = -1;
-
-static int hf_catapult_dct2000_nr_nas_s1ap_opcode = -1;
+static int proto_catapult_dct2000;
+
+static int hf_catapult_dct2000_context;
+static int hf_catapult_dct2000_port_number;
+static int hf_catapult_dct2000_timestamp;
+static int hf_catapult_dct2000_protocol;
+static int hf_catapult_dct2000_variant;
+static int hf_catapult_dct2000_outhdr;
+static int hf_catapult_dct2000_direction;
+static int hf_catapult_dct2000_encap;
+static int hf_catapult_dct2000_unparsed_data;
+static int hf_catapult_dct2000_comment;
+static int hf_catapult_dct2000_sprint;
+static int hf_catapult_dct2000_error_comment;
+static int hf_catapult_dct2000_tty;
+static int hf_catapult_dct2000_tty_line;
+static int hf_catapult_dct2000_dissected_length;
+
+static int hf_catapult_dct2000_ipprim_addresses;
+static int hf_catapult_dct2000_ipprim_src_addr_v4;
+static int hf_catapult_dct2000_ipprim_src_addr_v6;
+static int hf_catapult_dct2000_ipprim_dst_addr_v4;
+static int hf_catapult_dct2000_ipprim_dst_addr_v6;
+static int hf_catapult_dct2000_ipprim_addr_v4;
+static int hf_catapult_dct2000_ipprim_addr_v6;
+static int hf_catapult_dct2000_ipprim_udp_src_port;
+static int hf_catapult_dct2000_ipprim_udp_dst_port;
+static int hf_catapult_dct2000_ipprim_udp_port;
+static int hf_catapult_dct2000_ipprim_tcp_src_port;
+static int hf_catapult_dct2000_ipprim_tcp_dst_port;
+static int hf_catapult_dct2000_ipprim_tcp_port;
+static int hf_catapult_dct2000_ipprim_conn_id;
+
+static int hf_catapult_dct2000_sctpprim_addresses;
+static int hf_catapult_dct2000_sctpprim_dst_addr_v4;
+static int hf_catapult_dct2000_sctpprim_dst_addr_v6;
+static int hf_catapult_dct2000_sctpprim_addr_v4;
+static int hf_catapult_dct2000_sctpprim_addr_v6;
+static int hf_catapult_dct2000_sctpprim_dst_port;
+
+static int hf_catapult_dct2000_ueid;
+static int hf_catapult_dct2000_srbid;
+static int hf_catapult_dct2000_drbid;
+static int hf_catapult_dct2000_cellid;
+static int hf_catapult_dct2000_bcch_transport;
+static int hf_catapult_dct2000_rlc_op;
+static int hf_catapult_dct2000_rlc_channel_type;
+static int hf_catapult_dct2000_rlc_mui;
+static int hf_catapult_dct2000_rlc_cnf;
+static int hf_catapult_dct2000_rlc_discard_req;
+static int hf_catapult_dct2000_carrier_type;
+static int hf_catapult_dct2000_cell_group;
+static int hf_catapult_dct2000_carrier_id;
+
+static int hf_catapult_dct2000_security_mode_params;
+static int hf_catapult_dct2000_uplink_sec_mode;
+static int hf_catapult_dct2000_downlink_sec_mode;
+static int hf_catapult_dct2000_ciphering_algorithm;
+static int hf_catapult_dct2000_ciphering_key;
+static int hf_catapult_dct2000_integrity_algorithm;
+static int hf_catapult_dct2000_integrity_key;
+
+static int hf_catapult_dct2000_lte_ccpri_opcode;
+static int hf_catapult_dct2000_lte_ccpri_status;
+static int hf_catapult_dct2000_lte_ccpri_channel;
+
+static int hf_catapult_dct2000_lte_nas_rrc_opcode;
+static int hf_catapult_dct2000_lte_nas_rrc_establish_cause;
+static int hf_catapult_dct2000_lte_nas_rrc_priority;
+static int hf_catapult_dct2000_lte_nas_rrc_release_cause;
+
+static int hf_catapult_dct2000_nr_nas_s1ap_opcode;
 
 /* UMTS RLC fields */
-static int hf_catapult_dct2000_rbid = -1;
-static int hf_catapult_dct2000_ccch_id = -1;
-static int hf_catapult_dct2000_no_crc_error = -1;
-static int hf_catapult_dct2000_crc_error = -1;
-static int hf_catapult_dct2000_clear_tx_buffer = -1;
-static int hf_catapult_dct2000_buffer_occupancy = -1;
-static int hf_catapult_dct2000_pdu_size = -1;
-static int hf_catapult_dct2000_ueid_type = -1;
-static int hf_catapult_dct2000_tx_priority = -1;
-static int hf_catapult_dct2000_last_in_seg_set = -1;
-static int hf_catapult_dct2000_rx_timing_deviation = -1;
-static int hf_catapult_dct2000_transport_channel_type = -1;
-static int hf_catapult_dct2000_no_padding_bits = -1;
-
-static int hf_catapult_dct2000_rawtraffic_interface = -1;
-static int hf_catapult_dct2000_rawtraffic_direction = -1;
-static int hf_catapult_dct2000_rawtraffic_pdu = -1;
+static int hf_catapult_dct2000_rbid;
+static int hf_catapult_dct2000_ccch_id;
+static int hf_catapult_dct2000_no_crc_error;
+static int hf_catapult_dct2000_crc_error;
+static int hf_catapult_dct2000_clear_tx_buffer;
+static int hf_catapult_dct2000_buffer_occupancy;
+static int hf_catapult_dct2000_pdu_size;
+static int hf_catapult_dct2000_ueid_type;
+static int hf_catapult_dct2000_tx_priority;
+static int hf_catapult_dct2000_last_in_seg_set;
+static int hf_catapult_dct2000_rx_timing_deviation;
+static int hf_catapult_dct2000_transport_channel_type;
+static int hf_catapult_dct2000_no_padding_bits;
+
+static int hf_catapult_dct2000_rawtraffic_interface;
+static int hf_catapult_dct2000_rawtraffic_direction;
+static int hf_catapult_dct2000_rawtraffic_pdu;
 
 
 /* Variables used for preferences */
@@ -138,15 +138,15 @@ static gboolean catapult_dct2000_dissect_old_protocol_names = FALSE;
 static gboolean catapult_dct2000_use_protocol_name_as_dissector_name = FALSE;
 
 /* Protocol subtree. */
-static int ett_catapult_dct2000 = -1;
-static int ett_catapult_dct2000_ipprim = -1;
-static int ett_catapult_dct2000_sctpprim = -1;
-static int ett_catapult_dct2000_tty = -1;
-static int ett_catapult_dct2000_security_mode_params = -1;
-
-static expert_field ei_catapult_dct2000_lte_ccpri_status_error = EI_INIT;
-static expert_field ei_catapult_dct2000_error_comment_expert = EI_INIT;
-static expert_field ei_catapult_dct2000_string_invalid = EI_INIT;
+static int ett_catapult_dct2000;
+static int ett_catapult_dct2000_ipprim;
+static int ett_catapult_dct2000_sctpprim;
+static int ett_catapult_dct2000_tty;
+static int ett_catapult_dct2000_security_mode_params;
+
+static expert_field ei_catapult_dct2000_lte_ccpri_status_error;
+static expert_field ei_catapult_dct2000_error_comment_expert;
+static expert_field ei_catapult_dct2000_string_invalid;
 
 static const value_string direction_vals[] = {
     { 0,   "Sent" },
diff --git a/epan/dissectors/packet-cattp.c b/epan/dissectors/packet-cattp.c
index ec8458648d..e1e24812bc 100644
--- a/epan/dissectors/packet-cattp.c
+++ b/epan/dissectors/packet-cattp.c
@@ -40,23 +40,23 @@
 
 static dissector_handle_t cattp_handle;
 
-static int proto_cattp = -1;
+static int proto_cattp;
 
-static gint ett_cattp = -1;
-static gint ett_cattp_id = -1;
-static gint ett_cattp_flags = -1;
-static gint ett_cattp_eaks = -1;
+static gint ett_cattp;
+static gint ett_cattp_id;
+static gint ett_cattp_flags;
+static gint ett_cattp_eaks;
 
-static int hf_cattp_flags = -1;
+static int hf_cattp_flags;
 
 /* flag components */
-static int hf_cattp_flag_syn = -1;
-static int hf_cattp_flag_ack = -1;
-static int hf_cattp_flag_eak = -1;
-static int hf_cattp_flag_rst = -1;
-static int hf_cattp_flag_nul = -1;
-static int hf_cattp_flag_seg = -1;
-static int hf_cattp_version = -1;
+static int hf_cattp_flag_syn;
+static int hf_cattp_flag_ack;
+static int hf_cattp_flag_eak;
+static int hf_cattp_flag_rst;
+static int hf_cattp_flag_nul;
+static int hf_cattp_flag_seg;
+static int hf_cattp_version;
 
 /* structure of flag components */
 static int * const cattp_flags[] = {
@@ -70,25 +70,25 @@ static int * const cattp_flags[] = {
     NULL
 };
 
-static int hf_cattp_hlen = -1;
-static int hf_cattp_srcport = -1;
-static int hf_cattp_dstport = -1;
-static int hf_cattp_datalen = -1;
-static int hf_cattp_seq = -1;
-static int hf_cattp_ack = -1;
-static int hf_cattp_windowsize = -1;
-static int hf_cattp_checksum = -1;
-static int hf_cattp_checksum_status = -1;
-static int hf_cattp_identification = -1;
-static int hf_cattp_iccid = -1;
-static int hf_cattp_idlen = -1;
-static int hf_cattp_maxpdu = -1;
-static int hf_cattp_maxsdu = -1;
-static int hf_cattp_rc = -1;
-static int hf_cattp_eaklen = -1;
-static int hf_cattp_eaks = -1;
-
-static expert_field ei_cattp_checksum = EI_INIT;
+static int hf_cattp_hlen;
+static int hf_cattp_srcport;
+static int hf_cattp_dstport;
+static int hf_cattp_datalen;
+static int hf_cattp_seq;
+static int hf_cattp_ack;
+static int hf_cattp_windowsize;
+static int hf_cattp_checksum;
+static int hf_cattp_checksum_status;
+static int hf_cattp_identification;
+static int hf_cattp_iccid;
+static int hf_cattp_idlen;
+static int hf_cattp_maxpdu;
+static int hf_cattp_maxsdu;
+static int hf_cattp_rc;
+static int hf_cattp_eaklen;
+static int hf_cattp_eaks;
+
+static expert_field ei_cattp_checksum;
 
 /* Preference to control whether to check the CATTP checksum */
 static gboolean cattp_check_checksum = TRUE;
diff --git a/epan/dissectors/packet-cbor.c b/epan/dissectors/packet-cbor.c
index f0f1310e07..e604647c78 100644
--- a/epan/dissectors/packet-cbor.c
+++ b/epan/dissectors/packet-cbor.c
@@ -26,58 +26,58 @@
 void proto_register_cbor(void);
 void proto_reg_handoff_cbor(void);
 
-static int proto_cbor				= -1;
-
-static int hf_cbor_item_major_type		= -1;
-static int hf_cbor_item_integer_size		= -1;
-static int hf_cbor_item_length_size		= -1;
-static int hf_cbor_item_length5			= -1;
-static int hf_cbor_item_length			= -1;
-static int hf_cbor_item_items5			= -1;
-static int hf_cbor_item_items			= -1;
-static int hf_cbor_item_pairs5			= -1;
-static int hf_cbor_item_pairs			= -1;
-static int hf_cbor_item_float_simple_type	= -1;
-static int hf_cbor_item_unsigned_integer	= -1;
-static int hf_cbor_item_negative_integer	= -1;
-static int hf_cbor_item_text_string		= -1;
-static int hf_cbor_item_byte_string		= -1;
-static int hf_cbor_item_array			= -1;
-static int hf_cbor_item_map			= -1;
-static int hf_cbor_item_tag			= -1;
-static int hf_cbor_item_float_simple		= -1;
-static int hf_cbor_type_uint5			= -1;
-static int hf_cbor_type_uint			= -1;
-static int hf_cbor_type_nint			= -1;
-static int hf_cbor_type_byte_string		= -1;
-static int hf_cbor_type_byte_string_indef	= -1;
-static int hf_cbor_type_text_string		= -1;
-static int hf_cbor_type_text_string_indef	= -1;
-static int hf_cbor_type_tag5			= -1;
-static int hf_cbor_type_tag			= -1;
-static int hf_cbor_type_simple_data5		= -1;
-static int hf_cbor_type_simple_data8		= -1;
-static int hf_cbor_type_float16			= -1;
-static int hf_cbor_type_float32			= -1;
-static int hf_cbor_type_float64			= -1;
-
-static gint ett_cbor				= -1;
-static gint ett_cbor_type			= -1;
-static gint ett_cbor_unsigned_integer		= -1;
-static gint ett_cbor_negative_integer		= -1;
-static gint ett_cbor_byte_string		= -1;
-static gint ett_cbor_byte_string_indef		= -1;
-static gint ett_cbor_text_string		= -1;
-static gint ett_cbor_text_string_indef		= -1;
-static gint ett_cbor_array			= -1;
-static gint ett_cbor_map			= -1;
-static gint ett_cbor_tag			= -1;
-static gint ett_cbor_float_simple		= -1;
-
-static expert_field ei_cbor_invalid_minor_type  = EI_INIT;
-static expert_field ei_cbor_invalid_element     = EI_INIT;
-static expert_field ei_cbor_too_long_length     = EI_INIT;
-static expert_field ei_cbor_max_recursion_depth_reached = EI_INIT;
+static int proto_cbor;
+
+static int hf_cbor_item_major_type;
+static int hf_cbor_item_integer_size;
+static int hf_cbor_item_length_size;
+static int hf_cbor_item_length5;
+static int hf_cbor_item_length;
+static int hf_cbor_item_items5;
+static int hf_cbor_item_items;
+static int hf_cbor_item_pairs5;
+static int hf_cbor_item_pairs;
+static int hf_cbor_item_float_simple_type;
+static int hf_cbor_item_unsigned_integer;
+static int hf_cbor_item_negative_integer;
+static int hf_cbor_item_text_string;
+static int hf_cbor_item_byte_string;
+static int hf_cbor_item_array;
+static int hf_cbor_item_map;
+static int hf_cbor_item_tag;
+static int hf_cbor_item_float_simple;
+static int hf_cbor_type_uint5;
+static int hf_cbor_type_uint;
+static int hf_cbor_type_nint;
+static int hf_cbor_type_byte_string;
+static int hf_cbor_type_byte_string_indef;
+static int hf_cbor_type_text_string;
+static int hf_cbor_type_text_string_indef;
+static int hf_cbor_type_tag5;
+static int hf_cbor_type_tag;
+static int hf_cbor_type_simple_data5;
+static int hf_cbor_type_simple_data8;
+static int hf_cbor_type_float16;
+static int hf_cbor_type_float32;
+static int hf_cbor_type_float64;
+
+static gint ett_cbor;
+static gint ett_cbor_type;
+static gint ett_cbor_unsigned_integer;
+static gint ett_cbor_negative_integer;
+static gint ett_cbor_byte_string;
+static gint ett_cbor_byte_string_indef;
+static gint ett_cbor_text_string;
+static gint ett_cbor_text_string_indef;
+static gint ett_cbor_array;
+static gint ett_cbor_map;
+static gint ett_cbor_tag;
+static gint ett_cbor_float_simple;
+
+static expert_field ei_cbor_invalid_minor_type;
+static expert_field ei_cbor_invalid_element;
+static expert_field ei_cbor_too_long_length;
+static expert_field ei_cbor_max_recursion_depth_reached;
 
 static dissector_handle_t cbor_handle;
 static dissector_handle_t cborseq_handle;
diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c
index b920189cad..57d60474a3 100644
--- a/epan/dissectors/packet-ccsds.c
+++ b/epan/dissectors/packet-ccsds.c
@@ -31,57 +31,57 @@ void proto_reg_handoff_ccsds(void);
 
 
 /* Initialize the protocol and registered fields */
-static int proto_ccsds = -1;
+static int proto_ccsds;
 
 /* primary ccsds header */
-static int hf_ccsds_header_flags = -1;
-static int hf_ccsds_apid = -1;
-static int hf_ccsds_version = -1;
-static int hf_ccsds_secheader = -1;
-static int hf_ccsds_type = -1;
-static int hf_ccsds_seqnum = -1;
-static int hf_ccsds_seqflag = -1;
-static int hf_ccsds_length = -1;
+static int hf_ccsds_header_flags;
+static int hf_ccsds_apid;
+static int hf_ccsds_version;
+static int hf_ccsds_secheader;
+static int hf_ccsds_type;
+static int hf_ccsds_seqnum;
+static int hf_ccsds_seqflag;
+static int hf_ccsds_length;
 
 /* common ccsds secondary header */
-static int hf_ccsds_coarse_time = -1;
-static int hf_ccsds_fine_time = -1;
-static int hf_ccsds_timeid = -1;
-static int hf_ccsds_checkword_flag = -1;
+static int hf_ccsds_coarse_time;
+static int hf_ccsds_fine_time;
+static int hf_ccsds_timeid;
+static int hf_ccsds_checkword_flag;
 
 /* payload specific ccsds secondary header */
-static int hf_ccsds_zoe = -1;
-static int hf_ccsds_packet_type_unused = -1;
-static int hf_ccsds_vid = -1;
-static int hf_ccsds_dcc = -1;
+static int hf_ccsds_zoe;
+static int hf_ccsds_packet_type_unused;
+static int hf_ccsds_vid;
+static int hf_ccsds_dcc;
 
 /* core specific ccsds secondary header */
-/* static int hf_ccsds_spare1 = -1; */
-static int hf_ccsds_packet_type = -1;
-/* static int hf_ccsds_spare2 = -1; */
-static int hf_ccsds_element_id = -1;
-static int hf_ccsds_cmd_data_packet = -1;
-static int hf_ccsds_format_version_id = -1;
-static int hf_ccsds_extended_format_id = -1;
-/* static int hf_ccsds_spare3 = -1; */
-static int hf_ccsds_frame_id = -1;
-static int hf_ccsds_embedded_time = -1;
-static int hf_ccsds_user_data = -1;
+/* static int hf_ccsds_spare1; */
+static int hf_ccsds_packet_type;
+/* static int hf_ccsds_spare2; */
+static int hf_ccsds_element_id;
+static int hf_ccsds_cmd_data_packet;
+static int hf_ccsds_format_version_id;
+static int hf_ccsds_extended_format_id;
+/* static int hf_ccsds_spare3; */
+static int hf_ccsds_frame_id;
+static int hf_ccsds_embedded_time;
+static int hf_ccsds_user_data;
 
 /* ccsds checkword (checksum) */
-static int hf_ccsds_checkword = -1;
-static int hf_ccsds_checkword_good = -1;
-static int hf_ccsds_checkword_bad = -1;
+static int hf_ccsds_checkword;
+static int hf_ccsds_checkword_good;
+static int hf_ccsds_checkword_bad;
 
 /* Initialize the subtree pointers */
-static gint ett_ccsds_primary_header_flags = -1;
-static gint ett_ccsds = -1;
-static gint ett_ccsds_primary_header = -1;
-static gint ett_ccsds_secondary_header = -1;
-static gint ett_ccsds_checkword = -1;
-
-static expert_field ei_ccsds_length_error = EI_INIT;
-static expert_field ei_ccsds_checkword = EI_INIT;
+static gint ett_ccsds_primary_header_flags;
+static gint ett_ccsds;
+static gint ett_ccsds_primary_header;
+static gint ett_ccsds_secondary_header;
+static gint ett_ccsds_checkword;
+
+static expert_field ei_ccsds_length_error;
+static expert_field ei_ccsds_checkword;
 
 static dissector_handle_t ccsds_handle;
 /* Dissector table */
diff --git a/epan/dissectors/packet-cdma2k.c b/epan/dissectors/packet-cdma2k.c
index 98d6925bf1..43a2ea591f 100644
--- a/epan/dissectors/packet-cdma2k.c
+++ b/epan/dissectors/packet-cdma2k.c
@@ -44,494 +44,494 @@ static void cdma2k_message_ACTIVE_SET_RECORD_FIELDS(proto_item *item,tvbuff_t *t
 
 /*Initialize all the header parameters that are to be displayed*/
 
-static int proto_cdma2k = -1;
-static int hf_cdma2k_msghdr = -1;
+static int proto_cdma2k;
+static int hf_cdma2k_msghdr;
 
 /* Tlac Parameters */
-static int hf_cdma2k_tlac_Record = -1;
-static int hf_cdma2k_tlac_Header = -1;
-static int hf_cdma2k_tlac_Channel = -1;
-static int hf_cdma2k_tlac_1x_Protocol_Revision = -1;
-static int hf_cdma2k_tlac_msgType = -1;
-static int hf_cdma2k_tlac_Header_Record = -1;
-static int hf_cdma2k_tlac_Header_Records_Count = -1;
-static int hf_cdma2k_tlac_Header_Record_Type = -1;
-static int hf_cdma2k_tlac_Header_Record_Length = -1;
-static int hf_cdma2k_tlac_Header_Record_Values = -1;
-static int hf_cdma2k_tlac_Header_Record_Reserved = -1;
-static int hf_cdma2k_tlac_Pdu = -1;
-static int hf_cdma2k_tlac_Pdu_Length = -1;
+static int hf_cdma2k_tlac_Record;
+static int hf_cdma2k_tlac_Header;
+static int hf_cdma2k_tlac_Channel;
+static int hf_cdma2k_tlac_1x_Protocol_Revision;
+static int hf_cdma2k_tlac_msgType;
+static int hf_cdma2k_tlac_Header_Record;
+static int hf_cdma2k_tlac_Header_Records_Count;
+static int hf_cdma2k_tlac_Header_Record_Type;
+static int hf_cdma2k_tlac_Header_Record_Length;
+static int hf_cdma2k_tlac_Header_Record_Values;
+static int hf_cdma2k_tlac_Header_Record_Reserved;
+static int hf_cdma2k_tlac_Pdu;
+static int hf_cdma2k_tlac_Pdu_Length;
 
 /* Addressing Fileds */
-static int hf_cdma2k_tlac_Header_Record_MsId_Type = -1;
-static int hf_cdma2k_tlac_Header_Record_Ext_MsId_Type = -1;
-static int hf_cdma2k_tlac_Header_Record_MsId_Length = -1;
-static int hf_cdma2k_tlac_Header_Record_Imsi_M_S1 = -1;
-static int hf_cdma2k_tlac_Header_Record_Imsi_M_S1_sec_3_dig = -1;
-static int hf_cdma2k_tlac_Header_Record_Imsi_M_S1_thousand_dig = -1;
-static int hf_cdma2k_tlac_Header_Record_Imsi_M_S1_last_3_dig = -1;
-static int hf_cdma2k_tlac_Header_Record_Imsi_M_S2 = -1;
-static int hf_cdma2k_tlac_Header_Record_Esn = -1;
-static int hf_cdma2k_tlac_Header_Record_Imsi_Class = -1;
-static int hf_cdma2k_tlac_Header_Record_Imsi_Class0_Type = -1;
-static int hf_cdma2k_tlac_Header_Record_Imsi_Class1_Type = -1;
-static int hf_cdma2k_tlac_Header_Record_Imsi_S2 = -1;
-static int hf_cdma2k_tlac_Header_Record_Imsi_S1 = -1;
-static int hf_cdma2k_tlac_Header_Record_Imsi_11_12 = -1;
-static int hf_cdma2k_tlac_Header_Record_MCC = -1;
-static int hf_cdma2k_tlac_Header_Record_Imsi_Addr_Num = -1;
-static int hf_cdma2k_tlac_Header_Record_Ext_MsId_MeId = -1;
-static int hf_cdma2k_tlac_Header_Record_Tmsi_Code_Addr = -1;
-static int hf_cdma2k_tlac_Header_Record_Tmsi_Zone = -1;
+static int hf_cdma2k_tlac_Header_Record_MsId_Type;
+static int hf_cdma2k_tlac_Header_Record_Ext_MsId_Type;
+static int hf_cdma2k_tlac_Header_Record_MsId_Length;
+static int hf_cdma2k_tlac_Header_Record_Imsi_M_S1;
+static int hf_cdma2k_tlac_Header_Record_Imsi_M_S1_sec_3_dig;
+static int hf_cdma2k_tlac_Header_Record_Imsi_M_S1_thousand_dig;
+static int hf_cdma2k_tlac_Header_Record_Imsi_M_S1_last_3_dig;
+static int hf_cdma2k_tlac_Header_Record_Imsi_M_S2;
+static int hf_cdma2k_tlac_Header_Record_Esn;
+static int hf_cdma2k_tlac_Header_Record_Imsi_Class;
+static int hf_cdma2k_tlac_Header_Record_Imsi_Class0_Type;
+static int hf_cdma2k_tlac_Header_Record_Imsi_Class1_Type;
+static int hf_cdma2k_tlac_Header_Record_Imsi_S2;
+static int hf_cdma2k_tlac_Header_Record_Imsi_S1;
+static int hf_cdma2k_tlac_Header_Record_Imsi_11_12;
+static int hf_cdma2k_tlac_Header_Record_MCC;
+static int hf_cdma2k_tlac_Header_Record_Imsi_Addr_Num;
+static int hf_cdma2k_tlac_Header_Record_Ext_MsId_MeId;
+static int hf_cdma2k_tlac_Header_Record_Tmsi_Code_Addr;
+static int hf_cdma2k_tlac_Header_Record_Tmsi_Zone;
 
 /* Authentication Fields */
-static int hf_cdma2k_tlac_Header_Record_Mac_Incl = -1;
-static int hf_cdma2k_tlac_Header_Record_Auth_Incl = -1;
-static int hf_cdma2k_tlac_Header_Record_Authr = -1;
-static int hf_cdma2k_tlac_Header_Record_Randc = -1;
-static int hf_cdma2k_tlac_Header_Record_Count = -1;
-static int hf_cdma2k_tlac_Header_Record_Sdu_KeyId = -1;
-static int hf_cdma2k_tlac_Header_Record_Sdu_Algo = -1;
-static int hf_cdma2k_tlac_Header_Record_Sdu_Sseq = -1;
-static int hf_cdma2k_tlac_Header_Record_Sdu_Sseqh = -1;
-static int hf_cdma2k_tlac_Header_Record_Sdu_Sseq_Or_Sseqh = -1;
+static int hf_cdma2k_tlac_Header_Record_Mac_Incl;
+static int hf_cdma2k_tlac_Header_Record_Auth_Incl;
+static int hf_cdma2k_tlac_Header_Record_Authr;
+static int hf_cdma2k_tlac_Header_Record_Randc;
+static int hf_cdma2k_tlac_Header_Record_Count;
+static int hf_cdma2k_tlac_Header_Record_Sdu_KeyId;
+static int hf_cdma2k_tlac_Header_Record_Sdu_Algo;
+static int hf_cdma2k_tlac_Header_Record_Sdu_Sseq;
+static int hf_cdma2k_tlac_Header_Record_Sdu_Sseqh;
+static int hf_cdma2k_tlac_Header_Record_Sdu_Sseq_Or_Sseqh;
 
 /* Msg Types */
-static int hf_cdma2k_RegMsg = -1;
-static int hf_cdma2k_OrderIndMsg = -1;
-static int hf_cdma2k_DataBurstIndMsg = -1;
-static int hf_cdma2k_OrigMsg = -1;
-static int hf_cdma2k_PageRspMsg = -1;
-static int hf_cdma2k_AuthChallRspMsg = -1;
-static int hf_cdma2k_DataBurstCmdMsg = -1;
-static int hf_cdma2k_AuthChallReqMsg = -1;
-static int hf_cdma2k_GenPageReqMsg = -1;
-static int hf_cdma2k_AlertWithInfoMsg = -1;
-static int hf_cdma2k_UhdmMsg = -1;
-static int hf_cdma2k_MeIdUhdmMsg = -1;
-static int hf_cdma2k_ext_scm_ind = -1;
+static int hf_cdma2k_RegMsg;
+static int hf_cdma2k_OrderIndMsg;
+static int hf_cdma2k_DataBurstIndMsg;
+static int hf_cdma2k_OrigMsg;
+static int hf_cdma2k_PageRspMsg;
+static int hf_cdma2k_AuthChallRspMsg;
+static int hf_cdma2k_DataBurstCmdMsg;
+static int hf_cdma2k_AuthChallReqMsg;
+static int hf_cdma2k_GenPageReqMsg;
+static int hf_cdma2k_AlertWithInfoMsg;
+static int hf_cdma2k_UhdmMsg;
+static int hf_cdma2k_MeIdUhdmMsg;
+static int hf_cdma2k_ext_scm_ind;
 
 /* Registration Msg Parms */
-static int hf_cdma2k_Reg_Type = -1;
-static int hf_cdma2k_Slot_Cycle_Index = -1;
-static int hf_cdma2k_Mob_P_Rev = -1;
-static int hf_cdma2k_Ext_Scm = -1;
-static int hf_cdma2k_Sloted_Mode = -1;
-static int hf_cdma2k_Mob_Term = -1;
-static int hf_cdma2k_Return_Cause = -1;
-static int hf_cdma2k_Qpch_Supported = -1;
-static int hf_cdma2k_Enhanced_Rc = -1;
-static int hf_cdma2k_Uzid_Incl = -1;
-static int hf_cdma2k_Uzid = -1;
-static int hf_cdma2k_GeoLoc_Incl = -1;
-static int hf_cdma2k_GeoLoc_Type = -1;
+static int hf_cdma2k_Reg_Type;
+static int hf_cdma2k_Slot_Cycle_Index;
+static int hf_cdma2k_Mob_P_Rev;
+static int hf_cdma2k_Ext_Scm;
+static int hf_cdma2k_Sloted_Mode;
+static int hf_cdma2k_Mob_Term;
+static int hf_cdma2k_Return_Cause;
+static int hf_cdma2k_Qpch_Supported;
+static int hf_cdma2k_Enhanced_Rc;
+static int hf_cdma2k_Uzid_Incl;
+static int hf_cdma2k_Uzid;
+static int hf_cdma2k_GeoLoc_Incl;
+static int hf_cdma2k_GeoLoc_Type;
 
 /* Order Ind Msg Parms */
-static int hf_cdma2k_Order_Ind = -1;
-static int hf_cdma2k_Randbs = -1;
-static int hf_cdma2k_Rejected_Type = -1;
-static int hf_cdma2k_Rejected_Order = -1;
-static int hf_cdma2k_Rejected_Ordq = -1;
-static int hf_cdma2k_Rejected_Parm_Id = -1;
-static int hf_cdma2k_Rejected_Record = -1;
-static int hf_cdma2k_Tag = -1;
-
-static int hf_cdma2k_Rsc_Mode_Ind = -1;
-static int hf_cdma2k_Rsci = -1;
-static int hf_cdma2k_Rsc_End_Time_Unit = -1;
-static int hf_cdma2k_Rsc_End_Time_Value = -1;
+static int hf_cdma2k_Order_Ind;
+static int hf_cdma2k_Randbs;
+static int hf_cdma2k_Rejected_Type;
+static int hf_cdma2k_Rejected_Order;
+static int hf_cdma2k_Rejected_Ordq;
+static int hf_cdma2k_Rejected_Parm_Id;
+static int hf_cdma2k_Rejected_Record;
+static int hf_cdma2k_Tag;
+
+static int hf_cdma2k_Rsc_Mode_Ind;
+static int hf_cdma2k_Rsci;
+static int hf_cdma2k_Rsc_End_Time_Unit;
+static int hf_cdma2k_Rsc_End_Time_Value;
 
 /* Order Cmd Msg Parms */
-static int hf_cdma2k_Order_Cmd = -1;
-static int hf_cdma2k_Authbs = -1;
-static int hf_cdma2k_Roam_Ind = -1;
-static int hf_cdma2k_C_Sig_Encrypt_Mode = -1;
-static int hf_cdma2k_Enc_Key_Size = -1;
-static int hf_cdma2k_Msg_Int_Info_Incl = -1;
-static int hf_cdma2k_Change_Keys = -1;
-static int hf_cdma2k_Use_Uak = -1;
-
-static int hf_cdma2k_Retry_Type = -1;
-static int hf_cdma2k_Retry_Delay = -1;
-static int hf_cdma2k_Reject_Reason = -1;
-static int hf_cdma2k_Rejected_Msg_Type = -1;
-static int hf_cdma2k_Rejected_Msg_Seq = -1;
+static int hf_cdma2k_Order_Cmd;
+static int hf_cdma2k_Authbs;
+static int hf_cdma2k_Roam_Ind;
+static int hf_cdma2k_C_Sig_Encrypt_Mode;
+static int hf_cdma2k_Enc_Key_Size;
+static int hf_cdma2k_Msg_Int_Info_Incl;
+static int hf_cdma2k_Change_Keys;
+static int hf_cdma2k_Use_Uak;
+
+static int hf_cdma2k_Retry_Type;
+static int hf_cdma2k_Retry_Delay;
+static int hf_cdma2k_Reject_Reason;
+static int hf_cdma2k_Rejected_Msg_Type;
+static int hf_cdma2k_Rejected_Msg_Seq;
 
 /* BCMC Order type */
-static int hf_cdma2k_All_Bcmc_Flows_Ind = -1;
-static int hf_cdma2k_Clear_All_Retry_Delay = -1;
-static int hf_cdma2k_All_Bcmc_Reason = -1;
-static int hf_cdma2k_All_Bcmc_Retry_Delay = -1;
-static int hf_cdma2k_Num_Bcmc_Programs = -1;
-static int hf_cdma2k_Bcmc_Program_Id_Len = -1;
-static int hf_cdma2k_Bcmc_Program_Id = -1;
-static int hf_cdma2k_Bcmc_Flow_Discriminator_Len = -1;
-static int hf_cdma2k_Num_Flow_Discriminator = -1;
-static int hf_cdma2k_Bcmc_Flow_Discriminator = -1;
-static int hf_cdma2k_Same_As_Previous_Bcmc_Flow = -1;
-static int hf_cdma2k_Bcmc_Reason = -1;
-static int hf_cdma2k_Bcmc_Retry_Delay = -1;
-
-static int hf_cdma2k_Rsc_Mode_Supported = -1;
-static int hf_cdma2k_Max_Rsc_End_Time_Unit = -1;
-static int hf_cdma2k_Max_Rsc_End_Time_Value = -1;
-static int hf_cdma2k_Req_Rsci = -1;
-static int hf_cdma2k_Ignore_Qpch = -1;
-static int hf_cdma2k_Rer_Mode_Incl = -1;
-static int hf_cdma2k_Rer_Mode_Enabled = -1;
-static int hf_cdma2k_Rer_Max_Num_Msg_Idx = -1;
-static int hf_cdma2k_Rer_Time = -1;
-static int hf_cdma2k_Rer_Time_Unit = -1;
-static int hf_cdma2k_Max_Rer_Pilot_List_Size = -1;
-static int hf_cdma2k_Tkz_Mode_Incl = -1;
-static int hf_cdma2k_Tkz_Mode_Enabled = -1;
-static int hf_cdma2k_Tkz_Max_Num_Msg_Idx = -1;
-static int hf_cdma2k_Tkz_Update_Prd = -1;
-static int hf_cdma2k_Tkz_List_Len = -1;
-static int hf_cdma2k_Tkz_Timer = -1;
+static int hf_cdma2k_All_Bcmc_Flows_Ind;
+static int hf_cdma2k_Clear_All_Retry_Delay;
+static int hf_cdma2k_All_Bcmc_Reason;
+static int hf_cdma2k_All_Bcmc_Retry_Delay;
+static int hf_cdma2k_Num_Bcmc_Programs;
+static int hf_cdma2k_Bcmc_Program_Id_Len;
+static int hf_cdma2k_Bcmc_Program_Id;
+static int hf_cdma2k_Bcmc_Flow_Discriminator_Len;
+static int hf_cdma2k_Num_Flow_Discriminator;
+static int hf_cdma2k_Bcmc_Flow_Discriminator;
+static int hf_cdma2k_Same_As_Previous_Bcmc_Flow;
+static int hf_cdma2k_Bcmc_Reason;
+static int hf_cdma2k_Bcmc_Retry_Delay;
+
+static int hf_cdma2k_Rsc_Mode_Supported;
+static int hf_cdma2k_Max_Rsc_End_Time_Unit;
+static int hf_cdma2k_Max_Rsc_End_Time_Value;
+static int hf_cdma2k_Req_Rsci;
+static int hf_cdma2k_Ignore_Qpch;
+static int hf_cdma2k_Rer_Mode_Incl;
+static int hf_cdma2k_Rer_Mode_Enabled;
+static int hf_cdma2k_Rer_Max_Num_Msg_Idx;
+static int hf_cdma2k_Rer_Time;
+static int hf_cdma2k_Rer_Time_Unit;
+static int hf_cdma2k_Max_Rer_Pilot_List_Size;
+static int hf_cdma2k_Tkz_Mode_Incl;
+static int hf_cdma2k_Tkz_Mode_Enabled;
+static int hf_cdma2k_Tkz_Max_Num_Msg_Idx;
+static int hf_cdma2k_Tkz_Update_Prd;
+static int hf_cdma2k_Tkz_List_Len;
+static int hf_cdma2k_Tkz_Timer;
 
 /* Service Status Order */
-static int hf_cdma2k_Sr_Id_Bitmap = -1;
-static int hf_cdma2k_Service_Status = -1;
+static int hf_cdma2k_Sr_Id_Bitmap;
+static int hf_cdma2k_Service_Status;
 
 /* Location Service Order */
-static int hf_cdma2k_Regulatory_Ind_Incl = -1;
-static int hf_cdma2k_Regulatory_Ind = -1;
+static int hf_cdma2k_Regulatory_Ind_Incl;
+static int hf_cdma2k_Regulatory_Ind;
 /* Order Msg Parms */
-static int hf_cdma2k_Add_Record_Len = -1;
-static int hf_cdma2k_Order_Specific_Fields = -1;
-static int hf_cdma2k_Ordq = -1;
-static int hf_cdma2k_Con_Ref = -1;
+static int hf_cdma2k_Add_Record_Len;
+static int hf_cdma2k_Order_Specific_Fields;
+static int hf_cdma2k_Ordq;
+static int hf_cdma2k_Con_Ref;
 
 /* Data Burst Msg Parms */
-static int hf_cdma2k_Msg_Number = -1;
-static int hf_cdma2k_Burst_Type = -1;
-static int hf_cdma2k_Num_Msgs = -1;
-static int hf_cdma2k_Num_Fields = -1;
-static int hf_cdma2k_Chari_Data = -1;
-static int hf_cdma2k_Msg_Identifier = -1;
-static int hf_cdma2k_Parm_Id = -1;
-static int hf_cdma2k_Parm_Length = -1;
-static int hf_cdma2k_Parm_Value = -1;
+static int hf_cdma2k_Msg_Number;
+static int hf_cdma2k_Burst_Type;
+static int hf_cdma2k_Num_Msgs;
+static int hf_cdma2k_Num_Fields;
+static int hf_cdma2k_Chari_Data;
+static int hf_cdma2k_Msg_Identifier;
+static int hf_cdma2k_Parm_Id;
+static int hf_cdma2k_Parm_Length;
+static int hf_cdma2k_Parm_Value;
 
 /* Origination and Page Response Msg Parms */
-static int hf_cdma2k_Request_Mode = -1;
-static int hf_cdma2k_Special_Service = -1;
-static int hf_cdma2k_pm = -1;
-static int hf_cdma2k_digit_mode = -1;
-static int hf_cdma2k_More_Fields = -1;
-static int hf_cdma2k_Nar_An_Cap = -1;
-static int hf_cdma2k_Paca_Reorig = -1;
-static int hf_cdma2k_More_Records = -1;
-static int hf_cdma2k_encryption_supported = -1;
-static int hf_cdma2k_Paca_Supported = -1;
-static int hf_cdma2k_num_alt_so = -1;
-static int hf_cdma2k_DRS = -1;
-static int hf_cdma2k_SR_ID = -1;
-static int hf_cdma2k_Otd_Supported = -1;
-static int hf_cdma2k_For_Rc_Pref = -1;
-static int hf_cdma2k_Rev_Rc_Pref = -1;
-static int hf_cdma2k_Fch_Supported = -1;
-static int hf_cdma2k_Fch_capability_type_specific_Fields = -1;
-static int hf_cdma2k_Fch_Frame_Size = -1;
-static int hf_cdma2k_For_Fch_Len = -1;
-static int hf_cdma2k_For_Fch_Rc_Map = -1;
-static int hf_cdma2k_Rev_Fch_Len = -1;
-static int hf_cdma2k_Rev_Fch_Rc_Map = -1;
-static int hf_cdma2k_Dcch_capability_type_specific_Fields = -1;
-static int hf_cdma2k_Dcch_Frame_Size = -1;
-static int hf_cdma2k_For_Dcch_Len = -1;
-static int hf_cdma2k_For_Dcch_Rc_Map = -1;
-static int hf_cdma2k_Rev_Dcch_Len = -1;
-static int hf_cdma2k_Rev_Dcch_Rc_Map = -1;
-static int hf_cdma2k_Rev_Fch_Gating_Req = -1;
-static int hf_cdma2k_Orig_Reason = -1;
-static int hf_cdma2k_Orig_Count = -1;
-static int hf_cdma2k_Sts_Supported = -1;
-static int hf_cdma2k_ThreeXCchSupported = -1;
-static int hf_cdma2k_Wll_Incl = -1;
-static int hf_cdma2k_Wll_Device_Type = -1;
-static int hf_cdma2k_Global_Emergency_Call = -1;
-static int hf_cdma2k_Ms_Init_Pos_Loc_Ind = -1;
-static int hf_cdma2k_Qos_Parms_Incl = -1;
-static int hf_cdma2k_Qos_Parms_Length = -1;
-static int hf_cdma2k_Qos_Parms = -1;
-static int hf_cdma2k_Enc_Info_Incl = -1;
-static int hf_cdma2k_Sig_Encrypt_Supp = -1;
-static int hf_cdma2k_DSig_Encrypt_Req = -1;
-static int hf_cdma2k_CSig_Encrypt_Req = -1;
-static int hf_cdma2k_New_Sseq_H = -1;
-static int hf_cdma2k_New_Sseq_H_Sig = -1;
-static int hf_cdma2k_Ui_Encrypt_Req = -1;
-static int hf_cdma2k_Prev_Sid_Incl = -1;
-static int hf_cdma2k_Prev_Sid = -1;
-static int hf_cdma2k_Prev_Nid_Incl = -1;
-static int hf_cdma2k_Prev_Nid = -1;
-static int hf_cdma2k_Prev_Pzid_Incl = -1;
-static int hf_cdma2k_Prev_Pzid = -1;
-static int hf_cdma2k_So_Bitmap_Ind = -1;
-static int hf_cdma2k_So_Group_Num = -1;
-static int hf_cdma2k_So_Bitmap = -1;
-static int hf_cdma2k_Alt_So = -1;
-static int hf_cdma2k_Dcch_Supported = -1;
-static int hf_cdma2k_Hook_Status = -1;
+static int hf_cdma2k_Request_Mode;
+static int hf_cdma2k_Special_Service;
+static int hf_cdma2k_pm;
+static int hf_cdma2k_digit_mode;
+static int hf_cdma2k_More_Fields;
+static int hf_cdma2k_Nar_An_Cap;
+static int hf_cdma2k_Paca_Reorig;
+static int hf_cdma2k_More_Records;
+static int hf_cdma2k_encryption_supported;
+static int hf_cdma2k_Paca_Supported;
+static int hf_cdma2k_num_alt_so;
+static int hf_cdma2k_DRS;
+static int hf_cdma2k_SR_ID;
+static int hf_cdma2k_Otd_Supported;
+static int hf_cdma2k_For_Rc_Pref;
+static int hf_cdma2k_Rev_Rc_Pref;
+static int hf_cdma2k_Fch_Supported;
+static int hf_cdma2k_Fch_capability_type_specific_Fields;
+static int hf_cdma2k_Fch_Frame_Size;
+static int hf_cdma2k_For_Fch_Len;
+static int hf_cdma2k_For_Fch_Rc_Map;
+static int hf_cdma2k_Rev_Fch_Len;
+static int hf_cdma2k_Rev_Fch_Rc_Map;
+static int hf_cdma2k_Dcch_capability_type_specific_Fields;
+static int hf_cdma2k_Dcch_Frame_Size;
+static int hf_cdma2k_For_Dcch_Len;
+static int hf_cdma2k_For_Dcch_Rc_Map;
+static int hf_cdma2k_Rev_Dcch_Len;
+static int hf_cdma2k_Rev_Dcch_Rc_Map;
+static int hf_cdma2k_Rev_Fch_Gating_Req;
+static int hf_cdma2k_Orig_Reason;
+static int hf_cdma2k_Orig_Count;
+static int hf_cdma2k_Sts_Supported;
+static int hf_cdma2k_ThreeXCchSupported;
+static int hf_cdma2k_Wll_Incl;
+static int hf_cdma2k_Wll_Device_Type;
+static int hf_cdma2k_Global_Emergency_Call;
+static int hf_cdma2k_Ms_Init_Pos_Loc_Ind;
+static int hf_cdma2k_Qos_Parms_Incl;
+static int hf_cdma2k_Qos_Parms_Length;
+static int hf_cdma2k_Qos_Parms;
+static int hf_cdma2k_Enc_Info_Incl;
+static int hf_cdma2k_Sig_Encrypt_Supp;
+static int hf_cdma2k_DSig_Encrypt_Req;
+static int hf_cdma2k_CSig_Encrypt_Req;
+static int hf_cdma2k_New_Sseq_H;
+static int hf_cdma2k_New_Sseq_H_Sig;
+static int hf_cdma2k_Ui_Encrypt_Req;
+static int hf_cdma2k_Prev_Sid_Incl;
+static int hf_cdma2k_Prev_Sid;
+static int hf_cdma2k_Prev_Nid_Incl;
+static int hf_cdma2k_Prev_Nid;
+static int hf_cdma2k_Prev_Pzid_Incl;
+static int hf_cdma2k_Prev_Pzid;
+static int hf_cdma2k_So_Bitmap_Ind;
+static int hf_cdma2k_So_Group_Num;
+static int hf_cdma2k_So_Bitmap;
+static int hf_cdma2k_Alt_So;
+static int hf_cdma2k_Dcch_Supported;
+static int hf_cdma2k_Hook_Status;
 
 /* Auth Chall Rsp Msg Parms */
-static int hf_cdma2k_Authu = -1;
+static int hf_cdma2k_Authu;
 
 /* Auth Chall Req Msg Parms */
-static int hf_cdma2k_Randu = -1;
-static int hf_cdma2k_Gen_Cmea_Key = -1;
+static int hf_cdma2k_Randu;
+static int hf_cdma2k_Gen_Cmea_Key;
 
 /* Gen Page Req Msg Parms */
-static int hf_cdma2k_service_option = -1;
+static int hf_cdma2k_service_option;
 
 /* Handoff Dir Msg Parms */
-static int hf_cdma2k_Use_Time = -1;
-static int hf_cdma2k_Action_Time = -1;
-static int hf_cdma2k_Hdm_Seq = -1;
-static int hf_cdma2k_Parms_Incl = -1;
-static int hf_cdma2k_P_Rev = -1;
-static int hf_cdma2k_Serv_Neg_Type = -1;
-static int hf_cdma2k_Search_Incl = -1;
-static int hf_cdma2k_Pilot_Search = -1;
-static int hf_cdma2k_Srch_Win_A = -1;
-static int hf_cdma2k_Srch_Win_N = -1;
-static int hf_cdma2k_Srch_Win_R = -1;
-static int hf_cdma2k_T_Add = -1;
-static int hf_cdma2k_T_Drop = -1;
-static int hf_cdma2k_T_Comp = -1;
-static int hf_cdma2k_T_Tdrop = -1;
-static int hf_cdma2k_Soft_Slope = -1;
-static int hf_cdma2k_Add_Intercept = -1;
-static int hf_cdma2k_Drop_Intercept = -1;
-static int hf_cdma2k_Extra_Parms_Incl = -1;
-static int hf_cdma2k_Extra_Parms = -1;
-static int hf_cdma2k_Packet_Zone_Id = -1;
-static int hf_cdma2k_Frame_Offset = -1;
-static int hf_cdma2k_Private_Lcm = -1;
-static int hf_cdma2k_Reset_L2 = -1;
-static int hf_cdma2k_Reset_Fpc = -1;
-static int hf_cdma2k_Encrypt_Mode = -1;
-static int hf_cdma2k_Nom_Pwr_Ext = -1;
-static int hf_cdma2k_Nom_Pwr = -1;
-static int hf_cdma2k_Rlgain_Traffic_Pilot = -1;
-static int hf_cdma2k_Default_Rlag = -1;
-static int hf_cdma2k_Num_Preamble = -1;
-static int hf_cdma2k_Band_Class = -1;
-static int hf_cdma2k_Cdma_Freq = -1;
-static int hf_cdma2k_Return_If_Handoff_Fail = -1;
-static int hf_cdma2k_Complete_Search = -1;
-static int hf_cdma2k_Periodic_Search = -1;
-static int hf_cdma2k_Scr_Incl = -1;
-static int hf_cdma2k_Scr = -1;
-static int hf_cdma2k_Serv_Con_Seq = -1;
-static int hf_cdma2k_Record_Type = -1;
-static int hf_cdma2k_Record_Len = -1;
-static int hf_cdma2k_Type_Specific_Fields = -1;
-static int hf_cdma2k_Nnscr_Incl = -1;
-static int hf_cdma2k_Nnscr = -1;
-static int hf_cdma2k_Use_Pwr_Cntl_Step = -1;
-static int hf_cdma2k_Pwr_Cntl_Step = -1;
-static int hf_cdma2k_Clear_Retry_Delay = -1;
-static int hf_cdma2k_Sch_Incl = -1;
-static int hf_cdma2k_Sch = -1;
-static int hf_cdma2k_Num_For_Assign = -1;
-static int hf_cdma2k_Record_For_Assign = -1;
-static int hf_cdma2k_Sch_Id = -1;
-static int hf_cdma2k_Sch_Duration = -1;
-static int hf_cdma2k_Sch_Start_Time_Incl = -1;
-static int hf_cdma2k_Sch_Start_Time = -1;
-static int hf_cdma2k_Sccl_Index = -1;
-static int hf_cdma2k_Num_Rev_Assign = -1;
-static int hf_cdma2k_Record_Rev_Assign = -1;
-static int hf_cdma2k_Sch_Num_Bits_Idx = -1;
-static int hf_cdma2k_Fpc_Subchain_Gain = -1;
-static int hf_cdma2k_Use_Pc_Time = -1;
-static int hf_cdma2k_Pc_Action_Time = -1;
-static int hf_cdma2k_Ch_Ind = -1;
-static int hf_cdma2k_Active_Set_Rec_Len = -1;
-static int hf_cdma2k_Active_Set_Rec_Fields = -1;
-static int hf_cdma2k_Rev_Fch_Gating_Mode = -1;
-static int hf_cdma2k_Rev_Pwr_Cntl_Delay_Incl = -1;
-static int hf_cdma2k_Rev_Pwr_Cntl_Delay = -1;
-static int hf_cdma2k_D_Sig_Encrypt_Mode = -1;
-static int hf_cdma2k_3xfl_1xrl_Incl = -1;
-static int hf_cdma2k_1xrl_Freq_Offset = -1;
-static int hf_cdma2k_Sync_Id_Incl = -1;
-static int hf_cdma2k_Sync_Id_Len = -1;
-static int hf_cdma2k_Sync_Id = -1;
-static int hf_cdma2k_Cc_Info_Incl = -1;
-static int hf_cdma2k_Num_Calls_Assign = -1;
-static int hf_cdma2k_Record_Calls_Assign = -1;
-static int hf_cdma2k_Response_Ind = -1;
-static int hf_cdma2k_Bypass_Alert_Answer = -1;
-static int hf_cdma2k_Cs_Supported = -1;
-static int hf_cdma2k_Chm_Supported = -1;
-static int hf_cdma2k_Cdma_Off_Time_Rep_Sup_Ind = -1;
-static int hf_cdma2k_Cdma_Off_Time_Rep_Threshold_Unit = -1;
-static int hf_cdma2k_Cdma_Off_Time_Rep_Threshold = -1;
-static int hf_cdma2k_Release_To_Idle_Ind = -1;
-static int hf_cdma2k_Msg_Integrity_Sup = -1;
-static int hf_cdma2k_Gen_2g_Key = -1;
-static int hf_cdma2k_Register_In_Idle = -1;
-static int hf_cdma2k_Plcm_Type_Incl = -1;
-static int hf_cdma2k_Plcm_Type = -1;
-static int hf_cdma2k_Plcm_39 = -1;
-static int hf_cdma2k_T_Tdrop_Range_Incl = -1;
-static int hf_cdma2k_T_Tdrop_Range = -1;
-static int hf_cdma2k_For_Pdch_Supported = -1;
-static int hf_cdma2k_Pdch_Chm_Supported = -1;
-static int hf_cdma2k_Pilot_Info_Req_Supported = -1;
-static int hf_cdma2k_Enc_Supported = -1;
-static int hf_cdma2k_Sig_Encrypt_Sup = -1;
-static int hf_cdma2k_Ui_Encrypt_Sup = -1;
-static int hf_cdma2k_Use_Sync_Id = -1;
-static int hf_cdma2k_Sid_Incl = -1;
-static int hf_cdma2k_Sid = -1;
-static int hf_cdma2k_Nid_Incl = -1;
-static int hf_cdma2k_Nid = -1;
-static int hf_cdma2k_Sdb_Supported = -1;
-static int hf_cdma2k_Mob_Qos = -1;
-static int hf_cdma2k_Ms_Init_Pos_Loc_Sup_Ind = -1;
-static int hf_cdma2k_Rev_Pdch_Supported = -1;
-static int hf_cdma2k_Pz_Hyst_Enabled = -1;
-static int hf_cdma2k_Pz_Hyst_Info_Incl = -1;
-static int hf_cdma2k_Pz_Hyst_List_Len = -1;
-static int hf_cdma2k_Pz_Hyst_Act_Timer = -1;
-static int hf_cdma2k_Pz_Hyst_Timer_Mul = -1;
-static int hf_cdma2k_Pz_Hyst_Timer_Exp = -1;
-static int hf_cdma2k_Bcmc_On_Traffic_Sup = -1;
-static int hf_cdma2k_Auto_Re_Traffic_Allowed_Ind = -1;
-static int hf_cdma2k_Sch_Bcmc_Ind = -1;
-static int hf_cdma2k_Add_Plcm_For_Sch_Incl = -1;
-static int hf_cdma2k_Add_Plcm_For_Sch_Type = -1;
-static int hf_cdma2k_Add_Plcm_For_Sch_35 = -1;
-static int hf_cdma2k_Record_Sch_Bcmc = -1;
-static int hf_cdma2k_Use_Add_Plcm_For_Sch = -1;
-static int hf_cdma2k_Fsch_Outercode_Incl = -1;
-static int hf_cdma2k_Fsch_Outercode_Rate = -1;
-static int hf_cdma2k_Fsch_Outercode_Offset = -1;
-static int hf_cdma2k_Max_Add_Serv_Instance = -1;
-static int hf_cdma2k_Use_Ch_Cfg_Rrm = -1;
-static int hf_cdma2k_Tx_Pwr_Limit_Incl = -1;
-static int hf_cdma2k_Tx_Pwr_Limit_Default = -1;
-static int hf_cdma2k_Tx_Pwr_Limit = -1;
+static int hf_cdma2k_Use_Time;
+static int hf_cdma2k_Action_Time;
+static int hf_cdma2k_Hdm_Seq;
+static int hf_cdma2k_Parms_Incl;
+static int hf_cdma2k_P_Rev;
+static int hf_cdma2k_Serv_Neg_Type;
+static int hf_cdma2k_Search_Incl;
+static int hf_cdma2k_Pilot_Search;
+static int hf_cdma2k_Srch_Win_A;
+static int hf_cdma2k_Srch_Win_N;
+static int hf_cdma2k_Srch_Win_R;
+static int hf_cdma2k_T_Add;
+static int hf_cdma2k_T_Drop;
+static int hf_cdma2k_T_Comp;
+static int hf_cdma2k_T_Tdrop;
+static int hf_cdma2k_Soft_Slope;
+static int hf_cdma2k_Add_Intercept;
+static int hf_cdma2k_Drop_Intercept;
+static int hf_cdma2k_Extra_Parms_Incl;
+static int hf_cdma2k_Extra_Parms;
+static int hf_cdma2k_Packet_Zone_Id;
+static int hf_cdma2k_Frame_Offset;
+static int hf_cdma2k_Private_Lcm;
+static int hf_cdma2k_Reset_L2;
+static int hf_cdma2k_Reset_Fpc;
+static int hf_cdma2k_Encrypt_Mode;
+static int hf_cdma2k_Nom_Pwr_Ext;
+static int hf_cdma2k_Nom_Pwr;
+static int hf_cdma2k_Rlgain_Traffic_Pilot;
+static int hf_cdma2k_Default_Rlag;
+static int hf_cdma2k_Num_Preamble;
+static int hf_cdma2k_Band_Class;
+static int hf_cdma2k_Cdma_Freq;
+static int hf_cdma2k_Return_If_Handoff_Fail;
+static int hf_cdma2k_Complete_Search;
+static int hf_cdma2k_Periodic_Search;
+static int hf_cdma2k_Scr_Incl;
+static int hf_cdma2k_Scr;
+static int hf_cdma2k_Serv_Con_Seq;
+static int hf_cdma2k_Record_Type;
+static int hf_cdma2k_Record_Len;
+static int hf_cdma2k_Type_Specific_Fields;
+static int hf_cdma2k_Nnscr_Incl;
+static int hf_cdma2k_Nnscr;
+static int hf_cdma2k_Use_Pwr_Cntl_Step;
+static int hf_cdma2k_Pwr_Cntl_Step;
+static int hf_cdma2k_Clear_Retry_Delay;
+static int hf_cdma2k_Sch_Incl;
+static int hf_cdma2k_Sch;
+static int hf_cdma2k_Num_For_Assign;
+static int hf_cdma2k_Record_For_Assign;
+static int hf_cdma2k_Sch_Id;
+static int hf_cdma2k_Sch_Duration;
+static int hf_cdma2k_Sch_Start_Time_Incl;
+static int hf_cdma2k_Sch_Start_Time;
+static int hf_cdma2k_Sccl_Index;
+static int hf_cdma2k_Num_Rev_Assign;
+static int hf_cdma2k_Record_Rev_Assign;
+static int hf_cdma2k_Sch_Num_Bits_Idx;
+static int hf_cdma2k_Fpc_Subchain_Gain;
+static int hf_cdma2k_Use_Pc_Time;
+static int hf_cdma2k_Pc_Action_Time;
+static int hf_cdma2k_Ch_Ind;
+static int hf_cdma2k_Active_Set_Rec_Len;
+static int hf_cdma2k_Active_Set_Rec_Fields;
+static int hf_cdma2k_Rev_Fch_Gating_Mode;
+static int hf_cdma2k_Rev_Pwr_Cntl_Delay_Incl;
+static int hf_cdma2k_Rev_Pwr_Cntl_Delay;
+static int hf_cdma2k_D_Sig_Encrypt_Mode;
+static int hf_cdma2k_3xfl_1xrl_Incl;
+static int hf_cdma2k_1xrl_Freq_Offset;
+static int hf_cdma2k_Sync_Id_Incl;
+static int hf_cdma2k_Sync_Id_Len;
+static int hf_cdma2k_Sync_Id;
+static int hf_cdma2k_Cc_Info_Incl;
+static int hf_cdma2k_Num_Calls_Assign;
+static int hf_cdma2k_Record_Calls_Assign;
+static int hf_cdma2k_Response_Ind;
+static int hf_cdma2k_Bypass_Alert_Answer;
+static int hf_cdma2k_Cs_Supported;
+static int hf_cdma2k_Chm_Supported;
+static int hf_cdma2k_Cdma_Off_Time_Rep_Sup_Ind;
+static int hf_cdma2k_Cdma_Off_Time_Rep_Threshold_Unit;
+static int hf_cdma2k_Cdma_Off_Time_Rep_Threshold;
+static int hf_cdma2k_Release_To_Idle_Ind;
+static int hf_cdma2k_Msg_Integrity_Sup;
+static int hf_cdma2k_Gen_2g_Key;
+static int hf_cdma2k_Register_In_Idle;
+static int hf_cdma2k_Plcm_Type_Incl;
+static int hf_cdma2k_Plcm_Type;
+static int hf_cdma2k_Plcm_39;
+static int hf_cdma2k_T_Tdrop_Range_Incl;
+static int hf_cdma2k_T_Tdrop_Range;
+static int hf_cdma2k_For_Pdch_Supported;
+static int hf_cdma2k_Pdch_Chm_Supported;
+static int hf_cdma2k_Pilot_Info_Req_Supported;
+static int hf_cdma2k_Enc_Supported;
+static int hf_cdma2k_Sig_Encrypt_Sup;
+static int hf_cdma2k_Ui_Encrypt_Sup;
+static int hf_cdma2k_Use_Sync_Id;
+static int hf_cdma2k_Sid_Incl;
+static int hf_cdma2k_Sid;
+static int hf_cdma2k_Nid_Incl;
+static int hf_cdma2k_Nid;
+static int hf_cdma2k_Sdb_Supported;
+static int hf_cdma2k_Mob_Qos;
+static int hf_cdma2k_Ms_Init_Pos_Loc_Sup_Ind;
+static int hf_cdma2k_Rev_Pdch_Supported;
+static int hf_cdma2k_Pz_Hyst_Enabled;
+static int hf_cdma2k_Pz_Hyst_Info_Incl;
+static int hf_cdma2k_Pz_Hyst_List_Len;
+static int hf_cdma2k_Pz_Hyst_Act_Timer;
+static int hf_cdma2k_Pz_Hyst_Timer_Mul;
+static int hf_cdma2k_Pz_Hyst_Timer_Exp;
+static int hf_cdma2k_Bcmc_On_Traffic_Sup;
+static int hf_cdma2k_Auto_Re_Traffic_Allowed_Ind;
+static int hf_cdma2k_Sch_Bcmc_Ind;
+static int hf_cdma2k_Add_Plcm_For_Sch_Incl;
+static int hf_cdma2k_Add_Plcm_For_Sch_Type;
+static int hf_cdma2k_Add_Plcm_For_Sch_35;
+static int hf_cdma2k_Record_Sch_Bcmc;
+static int hf_cdma2k_Use_Add_Plcm_For_Sch;
+static int hf_cdma2k_Fsch_Outercode_Incl;
+static int hf_cdma2k_Fsch_Outercode_Rate;
+static int hf_cdma2k_Fsch_Outercode_Offset;
+static int hf_cdma2k_Max_Add_Serv_Instance;
+static int hf_cdma2k_Use_Ch_Cfg_Rrm;
+static int hf_cdma2k_Tx_Pwr_Limit_Incl;
+static int hf_cdma2k_Tx_Pwr_Limit_Default;
+static int hf_cdma2k_Tx_Pwr_Limit;
 
 /* Active Set Record Fields of Handoff Direction Message*/
-static int hf_cdma2k_Num_For_Sch = -1;
-static int hf_cdma2k_Record_For_Sch = -1;
-static int hf_cdma2k_Num_Rev_Sch = -1;
-static int hf_cdma2k_Record_Rev_Sch = -1;
-static int hf_cdma2k_Walsh_Id = -1;
-static int hf_cdma2k_Num_Pilots = -1;
-static int hf_cdma2k_Srch_Offset_Incl = -1;
-static int hf_cdma2k_Record_Pilots = -1;
-static int hf_cdma2k_Pilot_Pn = -1;
-static int hf_cdma2k_Srch_Offset = -1;
-static int hf_cdma2k_Add_Pilot_Rec_Incl = -1;
-static int hf_cdma2k_Pilot_Rec_Type = -1;
-static int hf_cdma2k_Pwr_Comb_Ind = -1;
-static int hf_cdma2k_Code_Chan_Fch = -1;
-static int hf_cdma2k_Qof_Mask_Id_Fch = -1;
-static int hf_cdma2k_Num_Sch = -1;
-static int hf_cdma2k_Record_Sch = -1;
-static int hf_cdma2k_Pilot_Incl = -1;
-static int hf_cdma2k_Code_Chan_Sch = -1;
-static int hf_cdma2k_Qof_Mask_Id_Sch = -1;
-static int hf_cdma2k_3xFch_Info_Incl = -1;
-static int hf_cdma2k_3xFch_Low_Incl = -1;
-static int hf_cdma2k_Qof_Mask_Id_Fch_Low = -1;
-static int hf_cdma2k_Code_Chan_Fch_Low = -1;
-static int hf_cdma2k_3xFch_High_Incl = -1;
-static int hf_cdma2k_Qof_Mask_Id_Fch_High = -1;
-static int hf_cdma2k_Code_Chan_Fch_High = -1;
-static int hf_cdma2k_3xSch_Info_Incl = -1;
-static int hf_cdma2k_3xSch_Low_Incl = -1;
-static int hf_cdma2k_Qof_Mask_Id_Sch_Low = -1;
-static int hf_cdma2k_Code_Chan_Sch_Low = -1;
-static int hf_cdma2k_3xSch_High_Incl = -1;
-static int hf_cdma2k_Qof_Mask_Id_Sch_High = -1;
-static int hf_cdma2k_Code_Chan_Sch_High = -1;
-static int hf_cdma2k_Ccsh_Included = -1;
-static int hf_cdma2k_Use_Ccsh_Encoder_Time = -1;
-static int hf_cdma2k_Ccsh_Encoder_Action_Time = -1;
-static int hf_cdma2k_Ccsh_Encoder_Type = -1;
-static int hf_cdma2k_Code_Chan_Dcch = -1;
-static int hf_cdma2k_Qof_Mask_Id_Dcch = -1;
-static int hf_cdma2k_3xDcch_Info_Incl = -1;
-static int hf_cdma2k_3xDcch_Low_Incl = -1;
-static int hf_cdma2k_Qof_Mask_Id_Dcch_Low = -1;
-static int hf_cdma2k_Code_Chan_Dcch_Low = -1;
-static int hf_cdma2k_3xDcch_High_Incl = -1;
-static int hf_cdma2k_Qof_Mask_Id_Dcch_High = -1;
-static int hf_cdma2k_Code_Chan_Dcch_High = -1;
-static int hf_cdma2k_Fundicated_Bcmc_Ind = -1;
-static int hf_cdma2k_For_Cpcch_Walsh = -1;
-static int hf_cdma2k_For_Cpcsch = -1;
-static int hf_cdma2k_Rev_Fch_Assigned = -1;
-static int hf_cdma2k_Add_Plcm_For_Fch_Incl = -1;
-static int hf_cdma2k_Add_Plcm_For_Fch_Type = -1;
-static int hf_cdma2k_Add_Plcm_For_Fch_39 = -1;
-static int hf_cdma2k_For_Cpcch_Info_Incl = -1;
+static int hf_cdma2k_Num_For_Sch;
+static int hf_cdma2k_Record_For_Sch;
+static int hf_cdma2k_Num_Rev_Sch;
+static int hf_cdma2k_Record_Rev_Sch;
+static int hf_cdma2k_Walsh_Id;
+static int hf_cdma2k_Num_Pilots;
+static int hf_cdma2k_Srch_Offset_Incl;
+static int hf_cdma2k_Record_Pilots;
+static int hf_cdma2k_Pilot_Pn;
+static int hf_cdma2k_Srch_Offset;
+static int hf_cdma2k_Add_Pilot_Rec_Incl;
+static int hf_cdma2k_Pilot_Rec_Type;
+static int hf_cdma2k_Pwr_Comb_Ind;
+static int hf_cdma2k_Code_Chan_Fch;
+static int hf_cdma2k_Qof_Mask_Id_Fch;
+static int hf_cdma2k_Num_Sch;
+static int hf_cdma2k_Record_Sch;
+static int hf_cdma2k_Pilot_Incl;
+static int hf_cdma2k_Code_Chan_Sch;
+static int hf_cdma2k_Qof_Mask_Id_Sch;
+static int hf_cdma2k_3xFch_Info_Incl;
+static int hf_cdma2k_3xFch_Low_Incl;
+static int hf_cdma2k_Qof_Mask_Id_Fch_Low;
+static int hf_cdma2k_Code_Chan_Fch_Low;
+static int hf_cdma2k_3xFch_High_Incl;
+static int hf_cdma2k_Qof_Mask_Id_Fch_High;
+static int hf_cdma2k_Code_Chan_Fch_High;
+static int hf_cdma2k_3xSch_Info_Incl;
+static int hf_cdma2k_3xSch_Low_Incl;
+static int hf_cdma2k_Qof_Mask_Id_Sch_Low;
+static int hf_cdma2k_Code_Chan_Sch_Low;
+static int hf_cdma2k_3xSch_High_Incl;
+static int hf_cdma2k_Qof_Mask_Id_Sch_High;
+static int hf_cdma2k_Code_Chan_Sch_High;
+static int hf_cdma2k_Ccsh_Included;
+static int hf_cdma2k_Use_Ccsh_Encoder_Time;
+static int hf_cdma2k_Ccsh_Encoder_Action_Time;
+static int hf_cdma2k_Ccsh_Encoder_Type;
+static int hf_cdma2k_Code_Chan_Dcch;
+static int hf_cdma2k_Qof_Mask_Id_Dcch;
+static int hf_cdma2k_3xDcch_Info_Incl;
+static int hf_cdma2k_3xDcch_Low_Incl;
+static int hf_cdma2k_Qof_Mask_Id_Dcch_Low;
+static int hf_cdma2k_Code_Chan_Dcch_Low;
+static int hf_cdma2k_3xDcch_High_Incl;
+static int hf_cdma2k_Qof_Mask_Id_Dcch_High;
+static int hf_cdma2k_Code_Chan_Dcch_High;
+static int hf_cdma2k_Fundicated_Bcmc_Ind;
+static int hf_cdma2k_For_Cpcch_Walsh;
+static int hf_cdma2k_For_Cpcsch;
+static int hf_cdma2k_Rev_Fch_Assigned;
+static int hf_cdma2k_Add_Plcm_For_Fch_Incl;
+static int hf_cdma2k_Add_Plcm_For_Fch_Type;
+static int hf_cdma2k_Add_Plcm_For_Fch_39;
+static int hf_cdma2k_For_Cpcch_Info_Incl;
 
 /* Alert With Info Msg Parms */
 
-static int hf_cdma2k_Info_Rec = -1;
-static int hf_cdma2k_Chari = -1;
-static int hf_cdma2k_Number_Type = -1;
-static int hf_cdma2k_Number_Plan = -1;
-static int hf_cdma2k_Pres_Indicator = -1;
-static int hf_cdma2k_Scr_Indicator = -1;
-static int hf_cdma2k_Signal_Type = -1;
-static int hf_cdma2k_Alert_Pitch = -1;
-static int hf_cdma2k_Signal = -1;
-static int hf_cdma2k_Msg_Count = -1;
-static int hf_cdma2k_Extension_Bit = -1;
-static int hf_cdma2k_Subaddress_Type = -1;
-static int hf_cdma2k_Odd_Even_Ind = -1;
-static int hf_cdma2k_Redirection_Reason = -1;
-static int hf_cdma2k_Pulse_Freq = -1;
-static int hf_cdma2k_Pulse_On_Time = -1;
-static int hf_cdma2k_Pulse_Off_Time = -1;
-static int hf_cdma2k_Pulse_Count = -1;
-static int hf_cdma2k_Cadence_Count = -1;
-static int hf_cdma2k_Num_Grps = -1;
-static int hf_cdma2k_Amplitude = -1;
-static int hf_cdma2k_Freq = -1;
-static int hf_cdma2k_On_Time = -1;
-static int hf_cdma2k_Off_Time = -1;
-static int hf_cdma2k_Repeat = -1;
-static int hf_cdma2k_Delay = -1;
-static int hf_cdma2k_Cadence_Type = -1;
-static int hf_cdma2k_Polarity_Incl = -1;
-static int hf_cdma2k_Toggle_Mode = -1;
-static int hf_cdma2k_Reverse_Polarity = -1;
-static int hf_cdma2k_Pwr_Denial_Time = -1;
-static int hf_cdma2k_Call_Waiting_Ind = -1;
-
-static int hf_cdma2k_Reserved = -1;
-
-static int hf_cdma2k_Cmea = -1;
-static int hf_cdma2k_Ecmea = -1;
-static int hf_cdma2k_Rea = -1;
-
-static int hf_cdma2k_scm_dual_mode = -1;
-static int hf_cdma2k_scm_slotted_class = -1;
-static int hf_cdma2k_scm_meid_sup = -1;
-static int hf_cdma2k_scm_25mhz_bw = -1;
-static int hf_cdma2k_scm_trans = -1;
-static int hf_cdma2k_scm_pow_class = -1;
-
-static expert_field ei_cdma2k_error = EI_INIT;
+static int hf_cdma2k_Info_Rec;
+static int hf_cdma2k_Chari;
+static int hf_cdma2k_Number_Type;
+static int hf_cdma2k_Number_Plan;
+static int hf_cdma2k_Pres_Indicator;
+static int hf_cdma2k_Scr_Indicator;
+static int hf_cdma2k_Signal_Type;
+static int hf_cdma2k_Alert_Pitch;
+static int hf_cdma2k_Signal;
+static int hf_cdma2k_Msg_Count;
+static int hf_cdma2k_Extension_Bit;
+static int hf_cdma2k_Subaddress_Type;
+static int hf_cdma2k_Odd_Even_Ind;
+static int hf_cdma2k_Redirection_Reason;
+static int hf_cdma2k_Pulse_Freq;
+static int hf_cdma2k_Pulse_On_Time;
+static int hf_cdma2k_Pulse_Off_Time;
+static int hf_cdma2k_Pulse_Count;
+static int hf_cdma2k_Cadence_Count;
+static int hf_cdma2k_Num_Grps;
+static int hf_cdma2k_Amplitude;
+static int hf_cdma2k_Freq;
+static int hf_cdma2k_On_Time;
+static int hf_cdma2k_Off_Time;
+static int hf_cdma2k_Repeat;
+static int hf_cdma2k_Delay;
+static int hf_cdma2k_Cadence_Type;
+static int hf_cdma2k_Polarity_Incl;
+static int hf_cdma2k_Toggle_Mode;
+static int hf_cdma2k_Reverse_Polarity;
+static int hf_cdma2k_Pwr_Denial_Time;
+static int hf_cdma2k_Call_Waiting_Ind;
+
+static int hf_cdma2k_Reserved;
+
+static int hf_cdma2k_Cmea;
+static int hf_cdma2k_Ecmea;
+static int hf_cdma2k_Rea;
+
+static int hf_cdma2k_scm_dual_mode;
+static int hf_cdma2k_scm_slotted_class;
+static int hf_cdma2k_scm_meid_sup;
+static int hf_cdma2k_scm_25mhz_bw;
+static int hf_cdma2k_scm_trans;
+static int hf_cdma2k_scm_pow_class;
+
+static expert_field ei_cdma2k_error;
 
 /* Toggle sub-tree items */
-static gint ett_cdma2k_msghdr = -1;
-static gint ett_cdma2k_subtree = -1;
-static gint ett_cdma2k_subtree1 = -1;
-static gint ett_cdma2k_subtree2 = -1;
-static gint ett_cdma2k_m_s1 = -1;
-static gint ett_cdma2000_scm = -1;
+static gint ett_cdma2k_msghdr;
+static gint ett_cdma2k_subtree;
+static gint ett_cdma2k_subtree1;
+static gint ett_cdma2k_subtree2;
+static gint ett_cdma2k_m_s1;
+static gint ett_cdma2000_scm;
 
 #define CDMA2KRegIndMsg       0x01
 #define CDMA2KOrderIndMsg     0x02
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c
index 6bf63b19f4..21407fff5b 100644
--- a/epan/dissectors/packet-cdp.c
+++ b/epan/dissectors/packet-cdp.c
@@ -51,107 +51,107 @@ static dissector_handle_t cdp_handle;
 #define TLV_TYPE        0
 #define TLV_LENGTH      2
 
-static int proto_cdp = -1;
-static int hf_cdp_version = -1;
-static int hf_cdp_checksum = -1;
-static int hf_cdp_checksum_status = -1;
-static int hf_cdp_ttl = -1;
-static int hf_cdp_tlvtype = -1;
-static int hf_cdp_tlvlength = -1;
-static int hf_cdp_nrgyz_tlvtype = -1;
-static int hf_cdp_nrgyz_tlvlength = -1;
-static int hf_cdp_deviceid = -1;
-static int hf_cdp_platform = -1;
-static int hf_cdp_portid = -1;
-static int hf_cdp_capabilities = -1;
-static int hf_cdp_capabilities_router = -1;
-static int hf_cdp_capabilities_trans_bridge = -1;
-static int hf_cdp_capabilities_src_bridge = -1;
-static int hf_cdp_capabilities_switch = -1;
-static int hf_cdp_capabilities_host = -1;
-static int hf_cdp_capabilities_igmp_capable = -1;
-static int hf_cdp_capabilities_repeater = -1;
-static int hf_cdp_capabilities_voip_phone = -1;
-static int hf_cdp_capabilities_remote = -1;
-static int hf_cdp_capabilities_cvta = -1;
-static int hf_cdp_capabilities_mac_relay = -1;
-static int hf_cdp_spare_poe_tlv = -1;
-static int hf_cdp_spare_poe_tlv_poe = -1;
-static int hf_cdp_spare_poe_tlv_spare_pair_arch = -1;
-static int hf_cdp_spare_poe_tlv_req_spare_pair_poe = -1;
-static int hf_cdp_spare_poe_tlv_pse_spare_pair_poe = -1;
+static int proto_cdp;
+static int hf_cdp_version;
+static int hf_cdp_checksum;
+static int hf_cdp_checksum_status;
+static int hf_cdp_ttl;
+static int hf_cdp_tlvtype;
+static int hf_cdp_tlvlength;
+static int hf_cdp_nrgyz_tlvtype;
+static int hf_cdp_nrgyz_tlvlength;
+static int hf_cdp_deviceid;
+static int hf_cdp_platform;
+static int hf_cdp_portid;
+static int hf_cdp_capabilities;
+static int hf_cdp_capabilities_router;
+static int hf_cdp_capabilities_trans_bridge;
+static int hf_cdp_capabilities_src_bridge;
+static int hf_cdp_capabilities_switch;
+static int hf_cdp_capabilities_host;
+static int hf_cdp_capabilities_igmp_capable;
+static int hf_cdp_capabilities_repeater;
+static int hf_cdp_capabilities_voip_phone;
+static int hf_cdp_capabilities_remote;
+static int hf_cdp_capabilities_cvta;
+static int hf_cdp_capabilities_mac_relay;
+static int hf_cdp_spare_poe_tlv;
+static int hf_cdp_spare_poe_tlv_poe;
+static int hf_cdp_spare_poe_tlv_spare_pair_arch;
+static int hf_cdp_spare_poe_tlv_req_spare_pair_poe;
+static int hf_cdp_spare_poe_tlv_pse_spare_pair_poe;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_cdp_num_tlvs_table = -1;
-static int hf_cdp_encrypted_data = -1;
-static int hf_cdp_cluster_ip = -1;
-static int hf_cdp_nrgyz_reply_to_backup_server_ip = -1;
-static int hf_cdp_nrgyz_reply_to_port = -1;
-static int hf_cdp_unknown_pad = -1;
-static int hf_cdp_cluster_version = -1;
-static int hf_cdp_hello_unknown = -1;
-static int hf_cdp_management_id = -1;
-static int hf_cdp_data = -1;
-static int hf_cdp_nrgyz_reply_to_ip_address = -1;
-static int hf_cdp_nrgyz_reply_to_name = -1;
-static int hf_cdp_nrgyz_reply_to_domain = -1;
-static int hf_cdp_nrgyz_reply_to_role = -1;
-static int hf_cdp_nrgyz_ip_address = -1;
-static int hf_cdp_nrgyz_ip6_address = -1;
-static int hf_cdp_model_number = -1;
-static int hf_cdp_nrgyz_reply_to_unknown_field = -1;
-static int hf_cdp_len_tlv_table = -1;
-static int hf_cdp_vtp_management_domain = -1;
-static int hf_cdp_hardware_version_id = -1;
-static int hf_cdp_cluster_unknown = -1;
-static int hf_cdp_native_vlan = -1;
-static int hf_cdp_ip_prefix = -1;
-static int hf_cdp_odr_default_gateway = -1;
-static int hf_cdp_power_consumption = -1;
-static int hf_cdp_cluster_status = -1;
-static int hf_cdp_power_requested = -1;
-static int hf_cdp_trust_bitmap = -1;
-static int hf_cdp_seen_sequence = -1;
-static int hf_cdp_system_name = -1;
-static int hf_cdp_power_available = -1;
-static int hf_cdp_cluster_commander_mac = -1;
-static int hf_cdp_mtu = -1;
-static int hf_cdp_protocol_length = -1;
-static int hf_cdp_system_serial_number = -1;
-static int hf_cdp_sequence_number = -1;
-static int hf_cdp_duplex = -1;
-static int hf_cdp_voice_vlan = -1;
-static int hf_cdp_request_id = -1;
-static int hf_cdp_cluster_sub_version = -1;
-static int hf_cdp_oui = -1;
-static int hf_cdp_nrgyz_reply_to_backup_server_port = -1;
-static int hf_cdp_cluster_master_ip = -1;
-static int hf_cdp_protocol = -1;
-static int hf_cdp_protocol_type = -1;
-static int hf_cdp_address = -1;
-static int hf_cdp_system_object_identifier = -1;
-static int hf_cdp_location_unknown = -1;
-static int hf_cdp_nrgyz_unknown_values = -1;
-static int hf_cdp_address_length = -1;
-static int hf_cdp_protocol_id = -1;
-static int hf_cdp_cluster_switch_mac = -1;
-static int hf_cdp_location = -1;
-static int hf_cdp_untrusted_port_cos = -1;
-static int hf_cdp_number_of_addresses = -1;
-static int hf_cdp_cluster_management_vlan = -1;
-static int hf_cdp_software_version = -1;
-
-static gint ett_cdp = -1;
-static gint ett_cdp_tlv = -1;
-static gint ett_cdp_nrgyz_tlv = -1;
-static gint ett_cdp_address = -1;
-static gint ett_cdp_capabilities = -1;
-static gint ett_cdp_spare_poe_tlv = -1;
-static gint ett_cdp_checksum = -1;
-
-static expert_field ei_cdp_invalid_data = EI_INIT;
-static expert_field ei_cdp_nrgyz_tlvlength = EI_INIT;
-static expert_field ei_cdp_checksum = EI_INIT;
+static int hf_cdp_num_tlvs_table;
+static int hf_cdp_encrypted_data;
+static int hf_cdp_cluster_ip;
+static int hf_cdp_nrgyz_reply_to_backup_server_ip;
+static int hf_cdp_nrgyz_reply_to_port;
+static int hf_cdp_unknown_pad;
+static int hf_cdp_cluster_version;
+static int hf_cdp_hello_unknown;
+static int hf_cdp_management_id;
+static int hf_cdp_data;
+static int hf_cdp_nrgyz_reply_to_ip_address;
+static int hf_cdp_nrgyz_reply_to_name;
+static int hf_cdp_nrgyz_reply_to_domain;
+static int hf_cdp_nrgyz_reply_to_role;
+static int hf_cdp_nrgyz_ip_address;
+static int hf_cdp_nrgyz_ip6_address;
+static int hf_cdp_model_number;
+static int hf_cdp_nrgyz_reply_to_unknown_field;
+static int hf_cdp_len_tlv_table;
+static int hf_cdp_vtp_management_domain;
+static int hf_cdp_hardware_version_id;
+static int hf_cdp_cluster_unknown;
+static int hf_cdp_native_vlan;
+static int hf_cdp_ip_prefix;
+static int hf_cdp_odr_default_gateway;
+static int hf_cdp_power_consumption;
+static int hf_cdp_cluster_status;
+static int hf_cdp_power_requested;
+static int hf_cdp_trust_bitmap;
+static int hf_cdp_seen_sequence;
+static int hf_cdp_system_name;
+static int hf_cdp_power_available;
+static int hf_cdp_cluster_commander_mac;
+static int hf_cdp_mtu;
+static int hf_cdp_protocol_length;
+static int hf_cdp_system_serial_number;
+static int hf_cdp_sequence_number;
+static int hf_cdp_duplex;
+static int hf_cdp_voice_vlan;
+static int hf_cdp_request_id;
+static int hf_cdp_cluster_sub_version;
+static int hf_cdp_oui;
+static int hf_cdp_nrgyz_reply_to_backup_server_port;
+static int hf_cdp_cluster_master_ip;
+static int hf_cdp_protocol;
+static int hf_cdp_protocol_type;
+static int hf_cdp_address;
+static int hf_cdp_system_object_identifier;
+static int hf_cdp_location_unknown;
+static int hf_cdp_nrgyz_unknown_values;
+static int hf_cdp_address_length;
+static int hf_cdp_protocol_id;
+static int hf_cdp_cluster_switch_mac;
+static int hf_cdp_location;
+static int hf_cdp_untrusted_port_cos;
+static int hf_cdp_number_of_addresses;
+static int hf_cdp_cluster_management_vlan;
+static int hf_cdp_software_version;
+
+static gint ett_cdp;
+static gint ett_cdp_tlv;
+static gint ett_cdp_nrgyz_tlv;
+static gint ett_cdp_address;
+static gint ett_cdp_capabilities;
+static gint ett_cdp_spare_poe_tlv;
+static gint ett_cdp_checksum;
+
+static expert_field ei_cdp_invalid_data;
+static expert_field ei_cdp_nrgyz_tlvlength;
+static expert_field ei_cdp_checksum;
 
 static int
 dissect_address_tlv(tvbuff_t *tvb, packet_info* pinfo, int offset, int length, proto_tree *tree);
diff --git a/epan/dissectors/packet-cell_broadcast.c b/epan/dissectors/packet-cell_broadcast.c
index 5594f9bf38..d7bf47c00d 100644
--- a/epan/dissectors/packet-cell_broadcast.c
+++ b/epan/dissectors/packet-cell_broadcast.c
@@ -91,40 +91,40 @@ static const value_string geographic_scope_values[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_cell_broadcast = -1;
+static int proto_cell_broadcast;
 
-static int hf_gsm_cbs_serial_number              = -1;
-static int hf_gsm_cbs_geographic_scope           = -1;
-static int hf_gsm_cbs_message_code               = -1;
-static int hf_gsm_cbs_update_number              = -1;
-static int hf_gsm_cbs_message_identifier         = -1;
-static int hf_gsm_cbs_total_pages                = -1;
-static int hf_gsm_cbs_current_page               = -1;
+static int hf_gsm_cbs_serial_number;
+static int hf_gsm_cbs_geographic_scope;
+static int hf_gsm_cbs_message_code;
+static int hf_gsm_cbs_update_number;
+static int hf_gsm_cbs_message_identifier;
+static int hf_gsm_cbs_total_pages;
+static int hf_gsm_cbs_current_page;
 
 /* These fields are used when reassembling multi-page gsm cbs messages */
-static int hf_gsm_cbs_pages                      = -1;
-static int hf_gsm_cbs_page_num                   = -1;
-static int hf_gsm_cbs_page_overlap               = -1;
-static int hf_gsm_cbs_page_overlap_conflict      = -1;
-static int hf_gsm_cbs_page_multiple_tails        = -1;
-static int hf_gsm_cbs_page_too_long_fragment     = -1;
-static int hf_gsm_cbs_page_error                 = -1;
-static int hf_gsm_cbs_page_count                 = -1;
-static int hf_gsm_cbs_message_reassembled_in    = -1;
-static int hf_gsm_cbs_message_reassembled_length = -1;
-static int hf_gsm_cbs_page_content               = -1;
-static int hf_gsm_cbs_page_content_padding       = -1;
-static int hf_gsm_cbs_message_content            = -1;
+static int hf_gsm_cbs_pages;
+static int hf_gsm_cbs_page_num;
+static int hf_gsm_cbs_page_overlap;
+static int hf_gsm_cbs_page_overlap_conflict;
+static int hf_gsm_cbs_page_multiple_tails;
+static int hf_gsm_cbs_page_too_long_fragment;
+static int hf_gsm_cbs_page_error;
+static int hf_gsm_cbs_page_count;
+static int hf_gsm_cbs_message_reassembled_in;
+static int hf_gsm_cbs_message_reassembled_length;
+static int hf_gsm_cbs_page_content;
+static int hf_gsm_cbs_page_content_padding;
+static int hf_gsm_cbs_message_content;
 
 /* Initialize the subtree pointers */
-static gint ett_cbs_msg                          = -1;
-static gint ett_cbs_serial_no                    = -1;
-static gint ett_cbs_coding                       = -1;
-static gint ett_gsm_cbs_page                     = -1;
-static gint ett_gsm_cbs_page_content             = -1;
-static gint ett_gsm_cbs_pages                    = -1;
-
-static expert_field ei_gsm_cbs_unhandled_encoding = EI_INIT;
+static gint ett_cbs_msg;
+static gint ett_cbs_serial_no;
+static gint ett_cbs_coding;
+static gint ett_gsm_cbs_page;
+static gint ett_gsm_cbs_page_content;
+static gint ett_gsm_cbs_pages;
+
+static expert_field ei_gsm_cbs_unhandled_encoding;
 
 /* reassembly of GSM multi-page messages */
 static reassembly_table gsm_cbs_reassembly_table;
diff --git a/epan/dissectors/packet-cemi.c b/epan/dissectors/packet-cemi.c
index fb02424afb..9866358759 100644
--- a/epan/dissectors/packet-cemi.c
+++ b/epan/dissectors/packet-cemi.c
@@ -114,93 +114,93 @@ void proto_reg_handoff_cemi(void);
 /* Initialize the protocol identifier that is needed for the
  protocol hook and to register the fields in the protocol tree
 */
-static gint proto_cemi = -1;
+static gint proto_cemi;
 
 /* Initialize the registered fields identifiers. These fields
  will be registered with the protocol during initialization.
  Protocol fields are like type definitions. The protocol dissector
  later on adds items of these types to the protocol tree.
 */
-static gint hf_bytes = -1;
-static gint hf_folder = -1;
-static gint hf_cemi_mc = -1;
-static gint hf_cemi_error = -1;
-static gint hf_cemi_ai_length = -1;
-static gint hf_cemi_aie_type = -1;
-static gint hf_cemi_aie_length = -1;
-static gint hf_cemi_ot = -1;
-static gint hf_cemi_oi = -1;
-static gint hf_cemi_ox = -1;
-static gint hf_cemi_px = -1;
-static gint hf_cemi_pid = -1;
-static gint hf_cemi_ne = -1;
-static gint hf_cemi_sx = -1;
-static gint hf_cemi_ft = -1;
-static gint hf_cemi_rep = -1;
-static gint hf_cemi_bt = -1;
-static gint hf_cemi_prio = -1;
-static gint hf_cemi_ack = -1;
-static gint hf_cemi_ce = -1;
-static gint hf_cemi_at = -1;
-static gint hf_cemi_hc = -1;
-static gint hf_cemi_eff = -1;
-static gint hf_cemi_sa = -1;
-static gint hf_cemi_da = -1;
-static gint hf_cemi_len = -1;
-static gint hf_cemi_tpt = -1;
-static gint hf_cemi_tst = -1;
-static gint hf_cemi_num = -1;
-static gint hf_cemi_tc = -1;
-static gint hf_cemi_ac = -1;
-static gint hf_cemi_ad = -1;
-static gint hf_cemi_ad_memory_length = -1;
-static gint hf_cemi_ad_channel = -1;
-static gint hf_cemi_ad_type = -1;
-static gint hf_cemi_ax = -1;
-static gint hf_cemi_pw = -1;
-static gint hf_cemi_pdt = -1;
-static gint hf_cemi_me = -1;
-static gint hf_cemi_ra = -1;
-static gint hf_cemi_wa = -1;
-static gint hf_cemi_ext_oi = -1;
-static gint hf_cemi_ext_pid = -1;
-static gint hf_cemi_ext_ne = -1;
-static gint hf_cemi_ext_sx = -1;
-static gint hf_cemi_ext_dt = -1;
-static gint hf_cemi_ext_px = -1;
-static gint hf_cemi_ext_memory_length = -1;
-static gint hf_cemi_ext_memory_address = -1;
-static gint hf_cemi_memory_length = -1;
-static gint hf_cemi_memory_address = -1;
-static gint hf_cemi_memory_address_ext = -1;
-static gint hf_cemi_level = -1;
-static gint hf_cemi_snp_pid = -1;
-static gint hf_cemi_snp_reserved = -1;
-static gint hf_cemi_dpt_major = -1;
-static gint hf_cemi_dpt_minor = -1;
-static gint hf_cemi_scf = -1;
-static gint hf_cemi_scf_t = -1;
-static gint hf_cemi_scf_sai = -1;
-static gint hf_cemi_scf_sbc = -1;
-static gint hf_cemi_scf_svc = -1;
-static gint hf_cemi_adc_count = -1;
+static gint hf_bytes;
+static gint hf_folder;
+static gint hf_cemi_mc;
+static gint hf_cemi_error;
+static gint hf_cemi_ai_length;
+static gint hf_cemi_aie_type;
+static gint hf_cemi_aie_length;
+static gint hf_cemi_ot;
+static gint hf_cemi_oi;
+static gint hf_cemi_ox;
+static gint hf_cemi_px;
+static gint hf_cemi_pid;
+static gint hf_cemi_ne;
+static gint hf_cemi_sx;
+static gint hf_cemi_ft;
+static gint hf_cemi_rep;
+static gint hf_cemi_bt;
+static gint hf_cemi_prio;
+static gint hf_cemi_ack;
+static gint hf_cemi_ce;
+static gint hf_cemi_at;
+static gint hf_cemi_hc;
+static gint hf_cemi_eff;
+static gint hf_cemi_sa;
+static gint hf_cemi_da;
+static gint hf_cemi_len;
+static gint hf_cemi_tpt;
+static gint hf_cemi_tst;
+static gint hf_cemi_num;
+static gint hf_cemi_tc;
+static gint hf_cemi_ac;
+static gint hf_cemi_ad;
+static gint hf_cemi_ad_memory_length;
+static gint hf_cemi_ad_channel;
+static gint hf_cemi_ad_type;
+static gint hf_cemi_ax;
+static gint hf_cemi_pw;
+static gint hf_cemi_pdt;
+static gint hf_cemi_me;
+static gint hf_cemi_ra;
+static gint hf_cemi_wa;
+static gint hf_cemi_ext_oi;
+static gint hf_cemi_ext_pid;
+static gint hf_cemi_ext_ne;
+static gint hf_cemi_ext_sx;
+static gint hf_cemi_ext_dt;
+static gint hf_cemi_ext_px;
+static gint hf_cemi_ext_memory_length;
+static gint hf_cemi_ext_memory_address;
+static gint hf_cemi_memory_length;
+static gint hf_cemi_memory_address;
+static gint hf_cemi_memory_address_ext;
+static gint hf_cemi_level;
+static gint hf_cemi_snp_pid;
+static gint hf_cemi_snp_reserved;
+static gint hf_cemi_dpt_major;
+static gint hf_cemi_dpt_minor;
+static gint hf_cemi_scf;
+static gint hf_cemi_scf_t;
+static gint hf_cemi_scf_sai;
+static gint hf_cemi_scf_sbc;
+static gint hf_cemi_scf_svc;
+static gint hf_cemi_adc_count;
 
 /* Initialize the subtree pointers. These pointers are needed to
  display the protocol in a structured tree. Subtrees hook on
  already defined fields or (the topmost) on the protocol itself
 */
-static gint ett_cemi = -1;
-static gint ett_cemi_ai = -1;
-static gint ett_cemi_aie = -1;
-static gint ett_cemi_ctrl1 = -1;
-static gint ett_cemi_ctrl2 = -1;
-static gint ett_cemi_tpci = -1;
-static gint ett_cemi_apci = -1;
-static gint ett_cemi_range = -1;
-static gint ett_cemi_pd = -1;
-static gint ett_cemi_dpt = -1;
-static gint ett_cemi_scf = -1;
-static gint ett_cemi_decrypted = -1;
+static gint ett_cemi;
+static gint ett_cemi_ai;
+static gint ett_cemi_aie;
+static gint ett_cemi_ctrl1;
+static gint ett_cemi_ctrl2;
+static gint ett_cemi_tpci;
+static gint ett_cemi_apci;
+static gint ett_cemi_range;
+static gint ett_cemi_pd;
+static gint ett_cemi_dpt;
+static gint ett_cemi_scf;
+static gint ett_cemi_decrypted;
 
 /* - - - - - - - - - - -  V A L U E   T A B L E S  - - - - - - - - - - - -
 */
diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c
index 36ecfab017..b40c27608e 100644
--- a/epan/dissectors/packet-ceph.c
+++ b/epan/dissectors/packet-ceph.c
@@ -64,768 +64,768 @@ void proto_register_ceph(void);
 static dissector_handle_t ceph_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_ceph				 = -1;
-static int hf_filter_data			 = -1;
-static int hf_node_id				 = -1;
-static int hf_node_type				 = -1;
-static int hf_node_nonce			 = -1;
-static int hf_entityinst_name			 = -1;
-static int hf_entityinst_addr			 = -1;
-static int hf_EntityName			 = -1;
-static int hf_EntityName_type			 = -1;
-static int hf_EntityName_id			 = -1;
-static int hf_src_slug				 = -1;
-static int hf_src_type				 = -1;
-static int hf_dst_type				 = -1;
-static int hf_dst_slug				 = -1;
-static int hf_banner				 = -1;
-static int hf_client_info			 = -1;
-static int hf_server_info			 = -1;
-static int hf_sockaddr				 = -1;
-static int hf_inet_family			 = -1;
-static int hf_port				 = -1;
-static int hf_addr_ipv4				 = -1;
-static int hf_addr_ipv6				 = -1;
-static int hf_data_data				 = -1;
-static int hf_data_size				 = -1;
-static int hf_string_data			 = -1;
-static int hf_string_size			 = -1;
-static int hf_keepalive_time			 = -1;
-static int hf_encoded_ver			 = -1;
-static int hf_encoded_compat			 = -1;
-static int hf_encoded_size			 = -1;
-static int hf_version				 = -1;
-static int hf_epoch				 = -1;
-static int hf_pool				 = -1;
-static int hf_key				 = -1;
-static int hf_namespace				 = -1;
-static int hf_hash				 = -1;
-static int hf_pgid_ver				 = -1;
-static int hf_pgid_pool				 = -1;
-static int hf_pgid_seed				 = -1;
-static int hf_pgid_preferred			 = -1;
-static int hf_pg_create_epoch			 = -1;
-static int hf_pg_create_parent			 = -1;
-static int hf_pg_create_splitbits		 = -1;
-static int hf_path_ver				 = -1;
-static int hf_path_inode			 = -1;
-static int hf_path_rel				 = -1;
-static int hf_mds_release_inode			 = -1;
-static int hf_mds_release_capid			 = -1;
-static int hf_mds_release_new			 = -1;
-static int hf_mds_release_wanted		 = -1;
-static int hf_mds_release_seq			 = -1;
-static int hf_mds_release_seq_issue		 = -1;
-static int hf_mds_release_mseq			 = -1;
-static int hf_mds_release_dname_seq		 = -1;
-static int hf_mds_release_dname			 = -1;
-static int hf_hitset_params			 = -1;
-static int hf_hitset_params_type		 = -1;
-static int hf_hitset_params_exphash_count	 = -1;
-static int hf_hitset_params_exphash_hit		 = -1;
-static int hf_snapinfo				 = -1;
-static int hf_snapinfo_id			 = -1;
-static int hf_snapinfo_time			 = -1;
-static int hf_snapinfo_name			 = -1;
-static int hf_pgpool				 = -1;
-static int hf_pgpool_type			 = -1;
-static int hf_pgpool_size			 = -1;
-static int hf_pgpool_crush_ruleset		 = -1;
-static int hf_pgpool_hash			 = -1;
-static int hf_pgpool_pgnum			 = -1;
-static int hf_pgpool_pgpnum			 = -1;
-static int hf_pgpool_changed			 = -1;
-static int hf_pgpool_snapseq			 = -1;
-static int hf_pgpool_snapepoch			 = -1;
-static int hf_pgpool_snap			 = -1;
-static int hf_pgpool_snap_id			 = -1;
-static int hf_pgpool_snapdel			 = -1;
-static int hf_pgpool_snapdel_from		 = -1;
-static int hf_pgpool_snapdel_to			 = -1;
-static int hf_pgpool_uid			 = -1;
-static int hf_pgpool_flags_low			 = -1;
-static int hf_pgpool_flags_high			 = -1;
-static int hf_pgpool_crash_reply_interval	 = -1;
-static int hf_pgpool_min_size			 = -1;
-static int hf_pgpool_quota_bytes		 = -1;
-static int hf_pgpool_quota_objects		 = -1;
-static int hf_pgpool_tier			 = -1;
-static int hf_pgpool_tierof			 = -1;
-static int hf_pgpool_cachemode			 = -1;
-static int hf_pgpool_readtier			 = -1;
-static int hf_pgpool_writetier			 = -1;
-static int hf_pgpool_property			 = -1;
-static int hf_pgpool_property_key		 = -1;
-static int hf_pgpool_property_val		 = -1;
-static int hf_pgpool_hitset_period		 = -1;
-static int hf_pgpool_hitset_count		 = -1;
-static int hf_pgpool_stripewidth		 = -1;
-static int hf_pgpool_targetmaxsize		 = -1;
-static int hf_pgpool_targetmaxobj		 = -1;
-static int hf_pgpool_cache_targetdirtyratio	 = -1;
-static int hf_pgpool_cache_targetfullratio	 = -1;
-static int hf_pgpool_cache_flushage_min		 = -1;
-static int hf_pgpool_cache_evictage_min		 = -1;
-static int hf_pgpool_erasurecode_profile	 = -1;
-static int hf_pgpool_lastforceresend		 = -1;
-static int hf_pgpool_flag_hashpool		 = -1;
-static int hf_pgpool_flag_full			 = -1;
-static int hf_pgpool_flag_fake_ec_pool		 = -1;
-static int hf_monmap				 = -1;
-static int hf_monmap_fsid			 = -1;
-static int hf_monmap_epoch			 = -1;
-static int hf_monmap_address			 = -1;
-static int hf_monmap_address_name		 = -1;
-static int hf_monmap_address_addr		 = -1;
-static int hf_monmap_changed			 = -1;
-static int hf_monmap_created			 = -1;
-static int hf_pg_stat_ver			 = -1;
-static int hf_pg_stat_seq			 = -1;
-static int hf_pg_stat_epoch			 = -1;
-static int hf_pg_stat_state			 = -1;
-static int hf_pg_stat_logstart			 = -1;
-static int hf_pg_stat_logstartondisk		 = -1;
-static int hf_pg_stat_created			 = -1;
-static int hf_pg_stat_lastepochclean		 = -1;
-static int hf_pg_stat_parent			 = -1;
-static int hf_pg_stat_parent_splitbits		 = -1;
-static int hf_pg_stat_lastscrub			 = -1;
-static int hf_pg_stat_lastscrubstamp		 = -1;
-static int hf_pg_stat_stats			 = -1;
-static int hf_pg_stat_logsize			 = -1;
-static int hf_pg_stat_logsizeondisk		 = -1;
-static int hf_pg_stat_up			 = -1;
-static int hf_pg_stat_acting			 = -1;
-static int hf_pg_stat_lastfresh			 = -1;
-static int hf_pg_stat_lastchange		 = -1;
-static int hf_pg_stat_lastactive		 = -1;
-static int hf_pg_stat_lastclean			 = -1;
-static int hf_pg_stat_lastunstale		 = -1;
-static int hf_pg_stat_mappingepoch		 = -1;
-static int hf_pg_stat_lastdeepscrub		 = -1;
-static int hf_pg_stat_lastdeepscrubstamp	 = -1;
-static int hf_pg_stat_statsinvalid		 = -1;
-static int hf_pg_stat_lastcleanscrubstamp	 = -1;
-static int hf_pg_stat_lastbecameactive		 = -1;
-static int hf_pg_stat_dirtystatsinvalid		 = -1;
-static int hf_pg_stat_upprimary			 = -1;
-static int hf_pg_stat_actingprimary		 = -1;
-static int hf_pg_stat_omapstatsinvalid		 = -1;
-static int hf_pg_stat_hitsetstatsinvalid	 = -1;
-static int hf_crush				 = -1;
-static int hf_osd_peerstat			 = -1;
-static int hf_osd_peerstat_timestamp		 = -1;
-static int hf_featureset_mask			 = -1;
-static int hf_featureset_name			 = -1;
-static int hf_featureset_name_val		 = -1;
-static int hf_featureset_name_name		 = -1;
-static int hf_compatset				 = -1;
-static int hf_compatset_compat			 = -1;
-static int hf_compatset_compatro		 = -1;
-static int hf_compatset_incompat		 = -1;
-static int hf_osd_superblock			 = -1;
-static int hf_osd_superblock_clusterfsid	 = -1;
-static int hf_osd_superblock_role		 = -1;
-static int hf_osd_superblock_epoch		 = -1;
-static int hf_osd_superblock_map_old		 = -1;
-static int hf_osd_superblock_map_new		 = -1;
-static int hf_osd_superblock_weight		 = -1;
-static int hf_osd_superblock_mounted		 = -1;
-static int hf_osd_superblock_osdfsid		 = -1;
-static int hf_osd_superblock_clean		 = -1;
-static int hf_osd_superblock_full		 = -1;
-static int hf_osdinfo_ver			 = -1;
-static int hf_osdinfo_lastclean_begin		 = -1;
-static int hf_osdinfo_lastclean_end		 = -1;
-static int hf_osdinfo_up_from			 = -1;
-static int hf_osdinfo_up_through		 = -1;
-static int hf_osdinfo_downat			 = -1;
-static int hf_osdinfo_lostat			 = -1;
-static int hf_osdxinfo_down			 = -1;
-static int hf_osdxinfo_laggy_probability	 = -1;
-static int hf_osdxinfo_laggy_interval		 = -1;
-static int hf_osdxinfo_oldweight		 = -1;
-static int hf_perfstat_commitlatency		 = -1;
-static int hf_perfstat_applylatency		 = -1;
-static int hf_osdstat				 = -1;
-static int hf_osdstat_kb			 = -1;
-static int hf_osdstat_kbused			 = -1;
-static int hf_osdstat_kbavail			 = -1;
-static int hf_osdstat_trimqueue			 = -1;
-static int hf_osdstat_trimming			 = -1;
-static int hf_osdstat_hbin			 = -1;
-static int hf_osdstat_hbout			 = -1;
-static int hf_osdstat_opqueue			 = -1;
-static int hf_osdstat_fsperf			 = -1;
-static int hf_osdmap				 = -1;
-static int hf_osdmap_client			 = -1;
-static int hf_osdmap_fsid			 = -1;
-static int hf_osdmap_epoch			 = -1;
-static int hf_osdmap_created			 = -1;
-static int hf_osdmap_modified			 = -1;
-static int hf_osdmap_pool			 = -1;
-static int hf_osdmap_pool_id			 = -1;
-static int hf_osdmap_poolname_item		 = -1;
-static int hf_osdmap_poolname			 = -1;
-static int hf_osdmap_poolmax			 = -1;
-static int hf_osdmap_flags			 = -1;
-static int hf_osdmap_osdmax			 = -1;
-static int hf_osdmap_osd_state			 = -1;
-static int hf_osdmap_osd_weight			 = -1;
-static int hf_osdmap_osd_addr			 = -1;
-static int hf_osdmap_pgtmp			 = -1;
-static int hf_osdmap_pgtmp_pg			 = -1;
-static int hf_osdmap_pgtmp_val			 = -1;
-static int hf_osdmap_primarytmp			 = -1;
-static int hf_osdmap_primarytmp_pg		 = -1;
-static int hf_osdmap_primarytmp_val		 = -1;
-static int hf_osdmap_osd_primaryaffinity	 = -1;
-static int hf_osdmap_erasurecodeprofile		 = -1;
-static int hf_osdmap_erasurecodeprofile_name	 = -1;
-static int hf_osdmap_erasurecodeprofile_prop	 = -1;
-static int hf_osdmap_erasurecodeprofile_k	 = -1;
-static int hf_osdmap_erasurecodeprofile_v	 = -1;
-static int hf_osdmap_osd			 = -1;
-static int hf_osdmap_hbaddr_back		 = -1;
-static int hf_osdmap_osd_info			 = -1;
-static int hf_osdmap_blacklist			 = -1;
-static int hf_osdmap_blacklist_addr		 = -1;
-static int hf_osdmap_blacklist_time		 = -1;
-static int hf_osdmap_cluster_addr		 = -1;
-static int hf_osdmap_cluster_snapepoch		 = -1;
-static int hf_osdmap_cluster_snap		 = -1;
-static int hf_osdmap_osd_uuid			 = -1;
-static int hf_osdmap_osd_xinfo			 = -1;
-static int hf_osdmap_hbaddr_front		 = -1;
-static int hf_osdmap_inc			 = -1;
-static int hf_osdmap_inc_client			 = -1;
-static int hf_osdmap_inc_fsid			 = -1;
-static int hf_osdmap_inc_osd			 = -1;
-static int hf_features_high			 = -1;
-static int hf_features_low			 = -1;
-static int hf_feature_uid			 = -1;
-static int hf_feature_nosrcaddr			 = -1;
-static int hf_feature_monclockcheck		 = -1;
-static int hf_feature_flock			 = -1;
-static int hf_feature_subscribe2		 = -1;
-static int hf_feature_monnames			 = -1;
-static int hf_feature_reconnect_seq		 = -1;
-static int hf_feature_dirlayouthash		 = -1;
-static int hf_feature_objectlocator		 = -1;
-static int hf_feature_pgid64			 = -1;
-static int hf_feature_incsubosdmap		 = -1;
-static int hf_feature_pgpool3			 = -1;
-static int hf_feature_osdreplymux		 = -1;
-static int hf_feature_osdenc			 = -1;
-static int hf_feature_omap			 = -1;
-static int hf_feature_monenc			 = -1;
-static int hf_feature_query_t			 = -1;
-static int hf_feature_indep_pg_map		 = -1;
-static int hf_feature_crush_tunables		 = -1;
-static int hf_feature_chunky_scrub		 = -1;
-static int hf_feature_mon_nullroute		 = -1;
-static int hf_feature_mon_gv			 = -1;
-static int hf_feature_backfill_reservation	 = -1;
-static int hf_feature_msg_auth			 = -1;
-static int hf_feature_recovery_reservation	 = -1;
-static int hf_feature_crush_tunables2		 = -1;
-static int hf_feature_createpoolid		 = -1;
-static int hf_feature_reply_create_inode	 = -1;
-static int hf_feature_osd_hbmsgs		 = -1;
-static int hf_feature_mdsenc			 = -1;
-static int hf_feature_osdhashpspool		 = -1;
-static int hf_feature_mon_single_paxos		 = -1;
-static int hf_feature_osd_snapmapper		 = -1;
-static int hf_feature_mon_scrub			 = -1;
-static int hf_feature_osd_packed_recovery	 = -1;
-static int hf_feature_osd_cachepool		 = -1;
-static int hf_feature_crush_v2			 = -1;
-static int hf_feature_export_peer		 = -1;
-static int hf_feature_osd_erasure_codes		 = -1;
-static int hf_feature_osd_tmap2omap		 = -1;
-static int hf_feature_osdmap_enc		 = -1;
-static int hf_feature_mds_inline_data		 = -1;
-static int hf_feature_crush_tunables3		 = -1;
-static int hf_feature_osd_primary_affinity	 = -1;
-static int hf_feature_msgr_keepalive2		 = -1;
-static int hf_feature_reserved			 = -1;
-static int hf_connect_host_type			 = -1;
-static int hf_connect_seq_global		 = -1;
-static int hf_connect_seq			 = -1;
-static int hf_connect_proto_ver			 = -1;
-static int hf_connect_auth_proto		 = -1;
-static int hf_connect_auth_size			 = -1;
-static int hf_connect_auth			 = -1;
-static int hf_flags				 = -1;
-static int hf_flag_lossy			 = -1;
-static int hf_osd_flags				 = -1;
-static int hf_osd_flag_ack			 = -1;
-static int hf_osd_flag_onnvram			 = -1;
-static int hf_osd_flag_ondisk			 = -1;
-static int hf_osd_flag_retry			 = -1;
-static int hf_osd_flag_read			 = -1;
-static int hf_osd_flag_write			 = -1;
-static int hf_osd_flag_ordersnap		 = -1;
-static int hf_osd_flag_peerstat_old		 = -1;
-static int hf_osd_flag_balance_reads		 = -1;
-static int hf_osd_flag_parallelexec		 = -1;
-static int hf_osd_flag_pgop			 = -1;
-static int hf_osd_flag_exec			 = -1;
-static int hf_osd_flag_exec_public		 = -1;
-static int hf_osd_flag_localize_reads		 = -1;
-static int hf_osd_flag_rwordered		 = -1;
-static int hf_osd_flag_ignore_cache		 = -1;
-static int hf_osd_flag_skiprwlocks		 = -1;
-static int hf_osd_flag_ignore_overlay		 = -1;
-static int hf_osd_flag_flush			 = -1;
-static int hf_osd_flag_map_snap_clone		 = -1;
-static int hf_osd_flag_enforce_snapc		 = -1;
-static int hf_osd_op_type			 = -1;
-static int hf_osd_op_data			 = -1;
-static int hf_osd_op_extent_off			 = -1;
-static int hf_osd_op_extent_size		 = -1;
-static int hf_osd_op_extent_trunc_size		 = -1;
-static int hf_osd_op_extent_trunc_seq		 = -1;
-static int hf_osd_op_payload_size		 = -1;
-static int hf_osd_redirect_oloc			 = -1;
-static int hf_osd_redirect_obj			 = -1;
-static int hf_osd_redirect_osdinstr		 = -1;
-static int hf_osd_redirect_osdinstr_data	 = -1;
-static int hf_osd_redirect_osdinstr_len		 = -1;
-static int hf_statsum_bytes			 = -1;
-static int hf_statsum_objects			 = -1;
-static int hf_statsum_clones			 = -1;
-static int hf_statsum_copies			 = -1;
-static int hf_statsum_missing			 = -1;
-static int hf_statsum_degraded			 = -1;
-static int hf_statsum_unfound			 = -1;
-static int hf_statsum_read_bytes		 = -1;
-static int hf_statsum_read_kbytes		 = -1;
-static int hf_statsum_written_bytes		 = -1;
-static int hf_statsum_written_kbytes		 = -1;
-static int hf_statsum_scrub_errors		 = -1;
-static int hf_statsum_recovered			 = -1;
-static int hf_statsum_bytes_recovered		 = -1;
-static int hf_statsum_keys_recovered		 = -1;
-static int hf_statsum_shallow_scrub_errors	 = -1;
-static int hf_statsum_deep_scrub_errors		 = -1;
-static int hf_statsum_dirty			 = -1;
-static int hf_statsum_whiteouts			 = -1;
-static int hf_statsum_omap			 = -1;
-static int hf_statsum_hitset_archive		 = -1;
-static int hf_connect				 = -1;
-static int hf_connect_reply			 = -1;
-static int hf_tag				 = -1;
-static int hf_ack				 = -1;
-static int hf_seq_existing			 = -1;
-static int hf_seq_new				 = -1;
-static int hf_head				 = -1;
-static int hf_head_seq				 = -1;
-static int hf_head_tid				 = -1;
-static int hf_head_type				 = -1;
-static int hf_head_priority			 = -1;
-static int hf_head_version			 = -1;
-static int hf_head_front_size			 = -1;
-static int hf_head_middle_size			 = -1;
-static int hf_head_data_size			 = -1;
-static int hf_head_data_off			 = -1;
-static int hf_head_srcname			 = -1;
-static int hf_head_compat_version		 = -1;
-static int hf_head_reserved			 = -1;
-static int hf_head_crc				 = -1;
-static int hf_foot				 = -1;
-static int hf_foot_front_crc			 = -1;
-static int hf_foot_middle_crc			 = -1;
-static int hf_foot_data_crc			 = -1;
-static int hf_foot_signature			 = -1;
-static int hf_msg_front				 = -1;
-static int hf_msg_middle			 = -1;
-static int hf_msg_data				 = -1;
-static int hf_statcollection			 = -1;
-static int hf_paxos				 = -1;
-static int hf_paxos_ver				 = -1;
-static int hf_paxos_mon				 = -1;
-static int hf_paxos_mon_tid			 = -1;
-static int hf_msg_mon_map			 = -1;
-static int hf_msg_statfs			 = -1;
-static int hf_msg_statfs_fsid			 = -1;
-static int hf_msg_statfsreply			 = -1;
-static int hf_msg_statfsreply_fsid		 = -1;
-static int hf_msg_statfsreply_ver		 = -1;
-static int hf_msg_statfsreply_kb		 = -1;
-static int hf_msg_statfsreply_kbused		 = -1;
-static int hf_msg_statfsreply_kbavail		 = -1;
-static int hf_msg_statfsreply_obj		 = -1;
-static int hf_msg_mon_sub			 = -1;
-static int hf_msg_mon_sub_item			 = -1;
-static int hf_msg_mon_sub_item_len		 = -1;
-static int hf_msg_mon_sub_what			 = -1;
-static int hf_msg_mon_sub_start			 = -1;
-static int hf_msg_mon_sub_flags			 = -1;
-static int hf_msg_mon_sub_flags_onetime		 = -1;
-static int hf_msg_mon_sub_ack			 = -1;
-static int hf_msg_mon_sub_ack_interval		 = -1;
-static int hf_msg_mon_sub_ack_fsid		 = -1;
-static int hf_msg_auth				 = -1;
-static int hf_msg_auth_proto			 = -1;
-static int hf_msg_auth_supportedproto		 = -1;
-static int hf_msg_auth_supportedproto_ver	 = -1;
-static int hf_msg_auth_supportedproto_proto	 = -1;
-static int hf_msg_auth_supportedproto_gid	 = -1;
-static int hf_msg_auth_cephx			 = -1;
-static int hf_msg_auth_cephx_req_type		 = -1;
-static int hf_msg_auth_monmap_epoch		 = -1;
-static int hf_msg_auth_reply			 = -1;
-static int hf_msg_auth_reply_proto		 = -1;
-static int hf_msg_auth_reply_result		 = -1;
-static int hf_msg_auth_reply_global_id		 = -1;
-static int hf_msg_auth_reply_msg		 = -1;
-static int hf_msg_mon_getversion		 = -1;
-static int hf_msg_mon_getversion_tid		 = -1;
-static int hf_msg_mon_getversion_what		 = -1;
-static int hf_msg_mon_getversionreply		 = -1;
-static int hf_msg_mon_getversionreply_tid	 = -1;
-static int hf_msg_mon_getversionreply_ver	 = -1;
-static int hf_msg_mon_getversionreply_veroldest	 = -1;
-static int hf_msg_mds_map			 = -1;
-static int hf_msg_mds_map_fsid			 = -1;
-static int hf_msg_mds_map_epoch			 = -1;
-static int hf_msg_mds_map_datai			 = -1;
-static int hf_msg_mds_map_data			 = -1;
-static int hf_msg_mds_map_data_size		 = -1;
-static int hf_msg_client_sess			 = -1;
-static int hf_msg_client_sess_op		 = -1;
-static int hf_msg_client_sess_seq		 = -1;
-static int hf_msg_client_sess_time		 = -1;
-static int hf_msg_client_sess_caps_max		 = -1;
-static int hf_msg_client_sess_leases_max	 = -1;
-static int hf_msg_client_req			 = -1;
-static int hf_msg_client_req_oldest_tid		 = -1;
-static int hf_msg_client_req_mdsmap_epoch	 = -1;
-static int hf_msg_client_req_flags		 = -1;
-static int hf_msg_client_req_retry		 = -1;
-static int hf_msg_client_req_forward		 = -1;
-static int hf_msg_client_req_releases		 = -1;
-static int hf_msg_client_req_op			 = -1;
-static int hf_msg_client_req_caller_uid		 = -1;
-static int hf_msg_client_req_caller_gid		 = -1;
-static int hf_msg_client_req_inode		 = -1;
-static int hf_msg_client_req_path_src		 = -1;
-static int hf_msg_client_req_path_dst		 = -1;
-static int hf_msg_client_req_release		 = -1;
-static int hf_msg_client_req_time		 = -1;
-static int hf_msg_client_reqfwd			 = -1;
-static int hf_msg_client_reqfwd_dst		 = -1;
-static int hf_msg_client_reqfwd_fwd		 = -1;
-static int hf_msg_client_reqfwd_resend		 = -1;
-static int hf_msg_client_reply			 = -1;
-static int hf_msg_client_reply_op		 = -1;
-static int hf_msg_client_reply_result		 = -1;
-static int hf_msg_client_reply_mdsmap_epoch	 = -1;
-static int hf_msg_client_reply_safe		 = -1;
-static int hf_msg_client_reply_isdentry		 = -1;
-static int hf_msg_client_reply_istarget		 = -1;
-static int hf_msg_client_reply_trace		 = -1;
-static int hf_msg_client_reply_extra		 = -1;
-static int hf_msg_client_reply_snaps		 = -1;
-static int hf_msg_osd_map			 = -1;
-static int hf_msg_osd_map_fsid			 = -1;
-static int hf_msg_osd_map_inc			 = -1;
-static int hf_msg_osd_map_inc_len		 = -1;
-static int hf_msg_osd_map_map			 = -1;
-static int hf_msg_osd_map_map_len		 = -1;
-static int hf_msg_osd_map_epoch			 = -1;
-static int hf_msg_osd_map_oldest		 = -1;
-static int hf_msg_osd_map_newest		 = -1;
-static int hf_msg_osd_op			 = -1;
-static int hf_msg_osd_op_client_inc		 = -1;
-static int hf_msg_osd_op_osdmap_epoch		 = -1;
-static int hf_msg_osd_op_mtime			 = -1;
-static int hf_msg_osd_op_reassert_version	 = -1;
-static int hf_msg_osd_op_oloc			 = -1;
-static int hf_msg_osd_op_pgid			 = -1;
-static int hf_msg_osd_op_oid			 = -1;
-static int hf_msg_osd_op_ops_len		 = -1;
-static int hf_msg_osd_op_op			 = -1;
-static int hf_msg_osd_op_snap_id		 = -1;
-static int hf_msg_osd_op_snap_seq		 = -1;
-static int hf_msg_osd_op_snaps_len		 = -1;
-static int hf_msg_osd_op_snap			 = -1;
-static int hf_msg_osd_op_retry_attempt		 = -1;
-static int hf_msg_osd_op_payload		 = -1;
-static int hf_msg_osd_opreply			 = -1;
-static int hf_msg_osd_opreply_oid		 = -1;
-static int hf_msg_osd_opreply_pgid		 = -1;
-static int hf_msg_osd_opreply_result		 = -1;
-static int hf_msg_osd_opreply_bad_replay_ver	 = -1;
-static int hf_msg_osd_opreply_osdmap_epoch	 = -1;
-static int hf_msg_osd_opreply_ops_len		 = -1;
-static int hf_msg_osd_opreply_op		 = -1;
-static int hf_msg_osd_opreply_retry_attempt	 = -1;
-static int hf_msg_osd_opreply_rval		 = -1;
-static int hf_msg_osd_opreply_replay_ver	 = -1;
-static int hf_msg_osd_opreply_user_ver		 = -1;
-static int hf_msg_osd_opreply_redirect		 = -1;
-static int hf_msg_osd_opreply_payload		 = -1;
-static int hf_msg_poolopreply			 = -1;
-static int hf_msg_poolopreply_fsid		 = -1;
-static int hf_msg_poolopreply_code		 = -1;
-static int hf_msg_poolopreply_epoch		 = -1;
-static int hf_msg_poolopreply_datai		 = -1;
-static int hf_msg_poolopreply_data		 = -1;
-static int hf_msg_poolopreply_data_size		 = -1;
-static int hf_msg_poolop			 = -1;
-static int hf_msg_poolop_fsid			 = -1;
-static int hf_msg_poolop_pool			 = -1;
-static int hf_msg_poolop_type			 = -1;
-static int hf_msg_poolop_auid			 = -1;
-static int hf_msg_poolop_snapid			 = -1;
-static int hf_msg_poolop_name			 = -1;
-static int hf_msg_poolop_crush_rule		 = -1;
-static int hf_msg_poolop_crush_rule8		 = -1;
-static int hf_msg_mon_cmd			 = -1;
-static int hf_msg_mon_cmd_fsid			 = -1;
-static int hf_msg_mon_cmd_arg			 = -1;
-static int hf_msg_mon_cmd_arg_len		 = -1;
-static int hf_msg_mon_cmd_str			 = -1;
-static int hf_msg_mon_cmd_ack			 = -1;
-static int hf_msg_mon_cmd_ack_code		 = -1;
-static int hf_msg_mon_cmd_ack_res		 = -1;
-static int hf_msg_mon_cmd_ack_arg		 = -1;
-static int hf_msg_mon_cmd_ack_arg_len		 = -1;
-static int hf_msg_mon_cmd_ack_arg_str		 = -1;
-static int hf_msg_mon_cmd_ack_data		 = -1;
-static int hf_msg_poolstats			 = -1;
-static int hf_msg_poolstats_fsid		 = -1;
-static int hf_msg_poolstats_pool		 = -1;
-static int hf_msg_poolstatsreply		 = -1;
-static int hf_msg_poolstatsreply_fsid		 = -1;
-static int hf_msg_poolstatsreply_stat		 = -1;
-static int hf_msg_poolstatsreply_pool		 = -1;
-static int hf_msg_poolstatsreply_log_size	 = -1;
-static int hf_msg_poolstatsreply_log_size_ondisk = -1;
-static int hf_msg_mon_globalid_max		 = -1;
-static int hf_msg_mon_election			 = -1;
-static int hf_msg_mon_election_fsid		 = -1;
-static int hf_msg_mon_election_op		 = -1;
-static int hf_msg_mon_election_epoch		 = -1;
-static int hf_msg_mon_election_quorum		 = -1;
-static int hf_msg_mon_election_quorum_features	 = -1;
-static int hf_msg_mon_election_defunct_one	 = -1;
-static int hf_msg_mon_election_defunct_two	 = -1;
-static int hf_msg_mon_election_sharing		 = -1;
-static int hf_msg_mon_election_sharing_data	 = -1;
-static int hf_msg_mon_election_sharing_size	 = -1;
-static int hf_msg_mon_paxos			 = -1;
-static int hf_msg_mon_paxos_epoch		 = -1;
-static int hf_msg_mon_paxos_op			 = -1;
-static int hf_msg_mon_paxos_first		 = -1;
-static int hf_msg_mon_paxos_last		 = -1;
-static int hf_msg_mon_paxos_pnfrom		 = -1;
-static int hf_msg_mon_paxos_pn			 = -1;
-static int hf_msg_mon_paxos_pnuncommitted	 = -1;
-static int hf_msg_mon_paxos_lease		 = -1;
-static int hf_msg_mon_paxos_sent		 = -1;
-static int hf_msg_mon_paxos_latest_ver		 = -1;
-static int hf_msg_mon_paxos_latest_val		 = -1;
-static int hf_msg_mon_paxos_latest_val_data	 = -1;
-static int hf_msg_mon_paxos_latest_val_size	 = -1;
-static int hf_msg_mon_paxos_value		 = -1;
-static int hf_msg_mon_paxos_ver			 = -1;
-static int hf_msg_mon_paxos_val			 = -1;
-static int hf_msg_mon_paxos_val_data		 = -1;
-static int hf_msg_mon_paxos_val_size		 = -1;
-static int hf_msg_mon_probe			 = -1;
-static int hf_msg_mon_probe_fsid		 = -1;
-static int hf_msg_mon_probe_type		 = -1;
-static int hf_msg_mon_probe_name		 = -1;
-static int hf_msg_mon_probe_quorum		 = -1;
-static int hf_msg_mon_probe_paxos_first_ver	 = -1;
-static int hf_msg_mon_probe_paxos_last_ver	 = -1;
-static int hf_msg_mon_probe_ever_joined		 = -1;
-static int hf_msg_mon_probe_req_features	 = -1;
-static int hf_msg_osd_ping			 = -1;
-static int hf_msg_osd_ping_fsid			 = -1;
-static int hf_msg_osd_ping_mapepoch		 = -1;
-static int hf_msg_osd_ping_peerepoch		 = -1;
-static int hf_msg_osd_ping_op			 = -1;
-static int hf_msg_osd_ping_time			 = -1;
-static int hf_msg_osd_boot			 = -1;
-static int hf_msg_osd_boot_addr_back		 = -1;
-static int hf_msg_osd_boot_addr_cluster		 = -1;
-static int hf_msg_osd_boot_epoch		 = -1;
-static int hf_msg_osd_boot_addr_front		 = -1;
-static int hf_msg_osd_boot_metadata		 = -1;
-static int hf_msg_osd_boot_metadata_k		 = -1;
-static int hf_msg_osd_boot_metadata_v		 = -1;
-static int hf_msg_pgstats			 = -1;
-static int hf_msg_pgstats_fsid			 = -1;
-static int hf_msg_pgstats_pgstat		 = -1;
-static int hf_msg_pgstats_pgstat_pg		 = -1;
-static int hf_msg_pgstats_pgstat_stat		 = -1;
-static int hf_msg_pgstats_epoch			 = -1;
-static int hf_msg_pgstats_mapfor		 = -1;
-static int hf_msg_osd_pg_create			 = -1;
-static int hf_msg_osd_pg_create_epoch		 = -1;
-static int hf_msg_osd_pg_create_mkpg		 = -1;
-static int hf_msg_osd_pg_create_mkpg_pg		 = -1;
-static int hf_msg_osd_pg_create_mkpg_create	 = -1;
-static int hf_msg_client_caps			 = -1;
-static int hf_msg_client_caps_op		 = -1;
-static int hf_msg_client_caps_inode		 = -1;
-static int hf_msg_client_caps_relam		 = -1;
-static int hf_msg_client_caps_cap_id		 = -1;
-static int hf_msg_client_caps_seq		 = -1;
-static int hf_msg_client_caps_seq_issue		 = -1;
-static int hf_msg_client_caps_new		 = -1;
-static int hf_msg_client_caps_wanted		 = -1;
-static int hf_msg_client_caps_dirty		 = -1;
-static int hf_msg_client_caps_seq_migrate	 = -1;
-static int hf_msg_client_caps_snap_follows	 = -1;
-static int hf_msg_client_caps_uid		 = -1;
-static int hf_msg_client_caps_gid		 = -1;
-static int hf_msg_client_caps_mode		 = -1;
-static int hf_msg_client_caps_nlink		 = -1;
-static int hf_msg_client_caps_xattr_ver		 = -1;
-static int hf_msg_client_caps_snap		 = -1;
-static int hf_msg_client_caps_flock		 = -1;
-static int hf_msg_client_caps_inline_ver	 = -1;
-static int hf_msg_client_caps_inline_data	 = -1;
-static int hf_msg_client_caps_xattr		 = -1;
-static int hf_msg_client_caprel			 = -1;
-static int hf_msg_client_caprel_cap		 = -1;
-static int hf_msg_client_caprel_cap_inode	 = -1;
-static int hf_msg_client_caprel_cap_id		 = -1;
-static int hf_msg_client_caprel_cap_migrate	 = -1;
-static int hf_msg_client_caprel_cap_seq		 = -1;
-static int hf_msg_timecheck			 = -1;
-static int hf_msg_timecheck_op			 = -1;
-static int hf_msg_timecheck_epoch		 = -1;
-static int hf_msg_timecheck_round		 = -1;
-static int hf_msg_timecheck_time		 = -1;
-static int hf_msg_timecheck_skew		 = -1;
-static int hf_msg_timecheck_skew_node		 = -1;
-static int hf_msg_timecheck_skew_skew		 = -1;
-static int hf_msg_timecheck_latency		 = -1;
-static int hf_msg_timecheck_latency_node	 = -1;
-static int hf_msg_timecheck_latency_latency	 = -1;
+static int proto_ceph;
+static int hf_filter_data;
+static int hf_node_id;
+static int hf_node_type;
+static int hf_node_nonce;
+static int hf_entityinst_name;
+static int hf_entityinst_addr;
+static int hf_EntityName;
+static int hf_EntityName_type;
+static int hf_EntityName_id;
+static int hf_src_slug;
+static int hf_src_type;
+static int hf_dst_type;
+static int hf_dst_slug;
+static int hf_banner;
+static int hf_client_info;
+static int hf_server_info;
+static int hf_sockaddr;
+static int hf_inet_family;
+static int hf_port;
+static int hf_addr_ipv4;
+static int hf_addr_ipv6;
+static int hf_data_data;
+static int hf_data_size;
+static int hf_string_data;
+static int hf_string_size;
+static int hf_keepalive_time;
+static int hf_encoded_ver;
+static int hf_encoded_compat;
+static int hf_encoded_size;
+static int hf_version;
+static int hf_epoch;
+static int hf_pool;
+static int hf_key;
+static int hf_namespace;
+static int hf_hash;
+static int hf_pgid_ver;
+static int hf_pgid_pool;
+static int hf_pgid_seed;
+static int hf_pgid_preferred;
+static int hf_pg_create_epoch;
+static int hf_pg_create_parent;
+static int hf_pg_create_splitbits;
+static int hf_path_ver;
+static int hf_path_inode;
+static int hf_path_rel;
+static int hf_mds_release_inode;
+static int hf_mds_release_capid;
+static int hf_mds_release_new;
+static int hf_mds_release_wanted;
+static int hf_mds_release_seq;
+static int hf_mds_release_seq_issue;
+static int hf_mds_release_mseq;
+static int hf_mds_release_dname_seq;
+static int hf_mds_release_dname;
+static int hf_hitset_params;
+static int hf_hitset_params_type;
+static int hf_hitset_params_exphash_count;
+static int hf_hitset_params_exphash_hit;
+static int hf_snapinfo;
+static int hf_snapinfo_id;
+static int hf_snapinfo_time;
+static int hf_snapinfo_name;
+static int hf_pgpool;
+static int hf_pgpool_type;
+static int hf_pgpool_size;
+static int hf_pgpool_crush_ruleset;
+static int hf_pgpool_hash;
+static int hf_pgpool_pgnum;
+static int hf_pgpool_pgpnum;
+static int hf_pgpool_changed;
+static int hf_pgpool_snapseq;
+static int hf_pgpool_snapepoch;
+static int hf_pgpool_snap;
+static int hf_pgpool_snap_id;
+static int hf_pgpool_snapdel;
+static int hf_pgpool_snapdel_from;
+static int hf_pgpool_snapdel_to;
+static int hf_pgpool_uid;
+static int hf_pgpool_flags_low;
+static int hf_pgpool_flags_high;
+static int hf_pgpool_crash_reply_interval;
+static int hf_pgpool_min_size;
+static int hf_pgpool_quota_bytes;
+static int hf_pgpool_quota_objects;
+static int hf_pgpool_tier;
+static int hf_pgpool_tierof;
+static int hf_pgpool_cachemode;
+static int hf_pgpool_readtier;
+static int hf_pgpool_writetier;
+static int hf_pgpool_property;
+static int hf_pgpool_property_key;
+static int hf_pgpool_property_val;
+static int hf_pgpool_hitset_period;
+static int hf_pgpool_hitset_count;
+static int hf_pgpool_stripewidth;
+static int hf_pgpool_targetmaxsize;
+static int hf_pgpool_targetmaxobj;
+static int hf_pgpool_cache_targetdirtyratio;
+static int hf_pgpool_cache_targetfullratio;
+static int hf_pgpool_cache_flushage_min;
+static int hf_pgpool_cache_evictage_min;
+static int hf_pgpool_erasurecode_profile;
+static int hf_pgpool_lastforceresend;
+static int hf_pgpool_flag_hashpool;
+static int hf_pgpool_flag_full;
+static int hf_pgpool_flag_fake_ec_pool;
+static int hf_monmap;
+static int hf_monmap_fsid;
+static int hf_monmap_epoch;
+static int hf_monmap_address;
+static int hf_monmap_address_name;
+static int hf_monmap_address_addr;
+static int hf_monmap_changed;
+static int hf_monmap_created;
+static int hf_pg_stat_ver;
+static int hf_pg_stat_seq;
+static int hf_pg_stat_epoch;
+static int hf_pg_stat_state;
+static int hf_pg_stat_logstart;
+static int hf_pg_stat_logstartondisk;
+static int hf_pg_stat_created;
+static int hf_pg_stat_lastepochclean;
+static int hf_pg_stat_parent;
+static int hf_pg_stat_parent_splitbits;
+static int hf_pg_stat_lastscrub;
+static int hf_pg_stat_lastscrubstamp;
+static int hf_pg_stat_stats;
+static int hf_pg_stat_logsize;
+static int hf_pg_stat_logsizeondisk;
+static int hf_pg_stat_up;
+static int hf_pg_stat_acting;
+static int hf_pg_stat_lastfresh;
+static int hf_pg_stat_lastchange;
+static int hf_pg_stat_lastactive;
+static int hf_pg_stat_lastclean;
+static int hf_pg_stat_lastunstale;
+static int hf_pg_stat_mappingepoch;
+static int hf_pg_stat_lastdeepscrub;
+static int hf_pg_stat_lastdeepscrubstamp;
+static int hf_pg_stat_statsinvalid;
+static int hf_pg_stat_lastcleanscrubstamp;
+static int hf_pg_stat_lastbecameactive;
+static int hf_pg_stat_dirtystatsinvalid;
+static int hf_pg_stat_upprimary;
+static int hf_pg_stat_actingprimary;
+static int hf_pg_stat_omapstatsinvalid;
+static int hf_pg_stat_hitsetstatsinvalid;
+static int hf_crush;
+static int hf_osd_peerstat;
+static int hf_osd_peerstat_timestamp;
+static int hf_featureset_mask;
+static int hf_featureset_name;
+static int hf_featureset_name_val;
+static int hf_featureset_name_name;
+static int hf_compatset;
+static int hf_compatset_compat;
+static int hf_compatset_compatro;
+static int hf_compatset_incompat;
+static int hf_osd_superblock;
+static int hf_osd_superblock_clusterfsid;
+static int hf_osd_superblock_role;
+static int hf_osd_superblock_epoch;
+static int hf_osd_superblock_map_old;
+static int hf_osd_superblock_map_new;
+static int hf_osd_superblock_weight;
+static int hf_osd_superblock_mounted;
+static int hf_osd_superblock_osdfsid;
+static int hf_osd_superblock_clean;
+static int hf_osd_superblock_full;
+static int hf_osdinfo_ver;
+static int hf_osdinfo_lastclean_begin;
+static int hf_osdinfo_lastclean_end;
+static int hf_osdinfo_up_from;
+static int hf_osdinfo_up_through;
+static int hf_osdinfo_downat;
+static int hf_osdinfo_lostat;
+static int hf_osdxinfo_down;
+static int hf_osdxinfo_laggy_probability;
+static int hf_osdxinfo_laggy_interval;
+static int hf_osdxinfo_oldweight;
+static int hf_perfstat_commitlatency;
+static int hf_perfstat_applylatency;
+static int hf_osdstat;
+static int hf_osdstat_kb;
+static int hf_osdstat_kbused;
+static int hf_osdstat_kbavail;
+static int hf_osdstat_trimqueue;
+static int hf_osdstat_trimming;
+static int hf_osdstat_hbin;
+static int hf_osdstat_hbout;
+static int hf_osdstat_opqueue;
+static int hf_osdstat_fsperf;
+static int hf_osdmap;
+static int hf_osdmap_client;
+static int hf_osdmap_fsid;
+static int hf_osdmap_epoch;
+static int hf_osdmap_created;
+static int hf_osdmap_modified;
+static int hf_osdmap_pool;
+static int hf_osdmap_pool_id;
+static int hf_osdmap_poolname_item;
+static int hf_osdmap_poolname;
+static int hf_osdmap_poolmax;
+static int hf_osdmap_flags;
+static int hf_osdmap_osdmax;
+static int hf_osdmap_osd_state;
+static int hf_osdmap_osd_weight;
+static int hf_osdmap_osd_addr;
+static int hf_osdmap_pgtmp;
+static int hf_osdmap_pgtmp_pg;
+static int hf_osdmap_pgtmp_val;
+static int hf_osdmap_primarytmp;
+static int hf_osdmap_primarytmp_pg;
+static int hf_osdmap_primarytmp_val;
+static int hf_osdmap_osd_primaryaffinity;
+static int hf_osdmap_erasurecodeprofile;
+static int hf_osdmap_erasurecodeprofile_name;
+static int hf_osdmap_erasurecodeprofile_prop;
+static int hf_osdmap_erasurecodeprofile_k;
+static int hf_osdmap_erasurecodeprofile_v;
+static int hf_osdmap_osd;
+static int hf_osdmap_hbaddr_back;
+static int hf_osdmap_osd_info;
+static int hf_osdmap_blacklist;
+static int hf_osdmap_blacklist_addr;
+static int hf_osdmap_blacklist_time;
+static int hf_osdmap_cluster_addr;
+static int hf_osdmap_cluster_snapepoch;
+static int hf_osdmap_cluster_snap;
+static int hf_osdmap_osd_uuid;
+static int hf_osdmap_osd_xinfo;
+static int hf_osdmap_hbaddr_front;
+static int hf_osdmap_inc;
+static int hf_osdmap_inc_client;
+static int hf_osdmap_inc_fsid;
+static int hf_osdmap_inc_osd;
+static int hf_features_high;
+static int hf_features_low;
+static int hf_feature_uid;
+static int hf_feature_nosrcaddr;
+static int hf_feature_monclockcheck;
+static int hf_feature_flock;
+static int hf_feature_subscribe2;
+static int hf_feature_monnames;
+static int hf_feature_reconnect_seq;
+static int hf_feature_dirlayouthash;
+static int hf_feature_objectlocator;
+static int hf_feature_pgid64;
+static int hf_feature_incsubosdmap;
+static int hf_feature_pgpool3;
+static int hf_feature_osdreplymux;
+static int hf_feature_osdenc;
+static int hf_feature_omap;
+static int hf_feature_monenc;
+static int hf_feature_query_t;
+static int hf_feature_indep_pg_map;
+static int hf_feature_crush_tunables;
+static int hf_feature_chunky_scrub;
+static int hf_feature_mon_nullroute;
+static int hf_feature_mon_gv;
+static int hf_feature_backfill_reservation;
+static int hf_feature_msg_auth;
+static int hf_feature_recovery_reservation;
+static int hf_feature_crush_tunables2;
+static int hf_feature_createpoolid;
+static int hf_feature_reply_create_inode;
+static int hf_feature_osd_hbmsgs;
+static int hf_feature_mdsenc;
+static int hf_feature_osdhashpspool;
+static int hf_feature_mon_single_paxos;
+static int hf_feature_osd_snapmapper;
+static int hf_feature_mon_scrub;
+static int hf_feature_osd_packed_recovery;
+static int hf_feature_osd_cachepool;
+static int hf_feature_crush_v2;
+static int hf_feature_export_peer;
+static int hf_feature_osd_erasure_codes;
+static int hf_feature_osd_tmap2omap;
+static int hf_feature_osdmap_enc;
+static int hf_feature_mds_inline_data;
+static int hf_feature_crush_tunables3;
+static int hf_feature_osd_primary_affinity;
+static int hf_feature_msgr_keepalive2;
+static int hf_feature_reserved;
+static int hf_connect_host_type;
+static int hf_connect_seq_global;
+static int hf_connect_seq;
+static int hf_connect_proto_ver;
+static int hf_connect_auth_proto;
+static int hf_connect_auth_size;
+static int hf_connect_auth;
+static int hf_flags;
+static int hf_flag_lossy;
+static int hf_osd_flags;
+static int hf_osd_flag_ack;
+static int hf_osd_flag_onnvram;
+static int hf_osd_flag_ondisk;
+static int hf_osd_flag_retry;
+static int hf_osd_flag_read;
+static int hf_osd_flag_write;
+static int hf_osd_flag_ordersnap;
+static int hf_osd_flag_peerstat_old;
+static int hf_osd_flag_balance_reads;
+static int hf_osd_flag_parallelexec;
+static int hf_osd_flag_pgop;
+static int hf_osd_flag_exec;
+static int hf_osd_flag_exec_public;
+static int hf_osd_flag_localize_reads;
+static int hf_osd_flag_rwordered;
+static int hf_osd_flag_ignore_cache;
+static int hf_osd_flag_skiprwlocks;
+static int hf_osd_flag_ignore_overlay;
+static int hf_osd_flag_flush;
+static int hf_osd_flag_map_snap_clone;
+static int hf_osd_flag_enforce_snapc;
+static int hf_osd_op_type;
+static int hf_osd_op_data;
+static int hf_osd_op_extent_off;
+static int hf_osd_op_extent_size;
+static int hf_osd_op_extent_trunc_size;
+static int hf_osd_op_extent_trunc_seq;
+static int hf_osd_op_payload_size;
+static int hf_osd_redirect_oloc;
+static int hf_osd_redirect_obj;
+static int hf_osd_redirect_osdinstr;
+static int hf_osd_redirect_osdinstr_data;
+static int hf_osd_redirect_osdinstr_len;
+static int hf_statsum_bytes;
+static int hf_statsum_objects;
+static int hf_statsum_clones;
+static int hf_statsum_copies;
+static int hf_statsum_missing;
+static int hf_statsum_degraded;
+static int hf_statsum_unfound;
+static int hf_statsum_read_bytes;
+static int hf_statsum_read_kbytes;
+static int hf_statsum_written_bytes;
+static int hf_statsum_written_kbytes;
+static int hf_statsum_scrub_errors;
+static int hf_statsum_recovered;
+static int hf_statsum_bytes_recovered;
+static int hf_statsum_keys_recovered;
+static int hf_statsum_shallow_scrub_errors;
+static int hf_statsum_deep_scrub_errors;
+static int hf_statsum_dirty;
+static int hf_statsum_whiteouts;
+static int hf_statsum_omap;
+static int hf_statsum_hitset_archive;
+static int hf_connect;
+static int hf_connect_reply;
+static int hf_tag;
+static int hf_ack;
+static int hf_seq_existing;
+static int hf_seq_new;
+static int hf_head;
+static int hf_head_seq;
+static int hf_head_tid;
+static int hf_head_type;
+static int hf_head_priority;
+static int hf_head_version;
+static int hf_head_front_size;
+static int hf_head_middle_size;
+static int hf_head_data_size;
+static int hf_head_data_off;
+static int hf_head_srcname;
+static int hf_head_compat_version;
+static int hf_head_reserved;
+static int hf_head_crc;
+static int hf_foot;
+static int hf_foot_front_crc;
+static int hf_foot_middle_crc;
+static int hf_foot_data_crc;
+static int hf_foot_signature;
+static int hf_msg_front;
+static int hf_msg_middle;
+static int hf_msg_data;
+static int hf_statcollection;
+static int hf_paxos;
+static int hf_paxos_ver;
+static int hf_paxos_mon;
+static int hf_paxos_mon_tid;
+static int hf_msg_mon_map;
+static int hf_msg_statfs;
+static int hf_msg_statfs_fsid;
+static int hf_msg_statfsreply;
+static int hf_msg_statfsreply_fsid;
+static int hf_msg_statfsreply_ver;
+static int hf_msg_statfsreply_kb;
+static int hf_msg_statfsreply_kbused;
+static int hf_msg_statfsreply_kbavail;
+static int hf_msg_statfsreply_obj;
+static int hf_msg_mon_sub;
+static int hf_msg_mon_sub_item;
+static int hf_msg_mon_sub_item_len;
+static int hf_msg_mon_sub_what;
+static int hf_msg_mon_sub_start;
+static int hf_msg_mon_sub_flags;
+static int hf_msg_mon_sub_flags_onetime;
+static int hf_msg_mon_sub_ack;
+static int hf_msg_mon_sub_ack_interval;
+static int hf_msg_mon_sub_ack_fsid;
+static int hf_msg_auth;
+static int hf_msg_auth_proto;
+static int hf_msg_auth_supportedproto;
+static int hf_msg_auth_supportedproto_ver;
+static int hf_msg_auth_supportedproto_proto;
+static int hf_msg_auth_supportedproto_gid;
+static int hf_msg_auth_cephx;
+static int hf_msg_auth_cephx_req_type;
+static int hf_msg_auth_monmap_epoch;
+static int hf_msg_auth_reply;
+static int hf_msg_auth_reply_proto;
+static int hf_msg_auth_reply_result;
+static int hf_msg_auth_reply_global_id;
+static int hf_msg_auth_reply_msg;
+static int hf_msg_mon_getversion;
+static int hf_msg_mon_getversion_tid;
+static int hf_msg_mon_getversion_what;
+static int hf_msg_mon_getversionreply;
+static int hf_msg_mon_getversionreply_tid;
+static int hf_msg_mon_getversionreply_ver;
+static int hf_msg_mon_getversionreply_veroldest;
+static int hf_msg_mds_map;
+static int hf_msg_mds_map_fsid;
+static int hf_msg_mds_map_epoch;
+static int hf_msg_mds_map_datai;
+static int hf_msg_mds_map_data;
+static int hf_msg_mds_map_data_size;
+static int hf_msg_client_sess;
+static int hf_msg_client_sess_op;
+static int hf_msg_client_sess_seq;
+static int hf_msg_client_sess_time;
+static int hf_msg_client_sess_caps_max;
+static int hf_msg_client_sess_leases_max;
+static int hf_msg_client_req;
+static int hf_msg_client_req_oldest_tid;
+static int hf_msg_client_req_mdsmap_epoch;
+static int hf_msg_client_req_flags;
+static int hf_msg_client_req_retry;
+static int hf_msg_client_req_forward;
+static int hf_msg_client_req_releases;
+static int hf_msg_client_req_op;
+static int hf_msg_client_req_caller_uid;
+static int hf_msg_client_req_caller_gid;
+static int hf_msg_client_req_inode;
+static int hf_msg_client_req_path_src;
+static int hf_msg_client_req_path_dst;
+static int hf_msg_client_req_release;
+static int hf_msg_client_req_time;
+static int hf_msg_client_reqfwd;
+static int hf_msg_client_reqfwd_dst;
+static int hf_msg_client_reqfwd_fwd;
+static int hf_msg_client_reqfwd_resend;
+static int hf_msg_client_reply;
+static int hf_msg_client_reply_op;
+static int hf_msg_client_reply_result;
+static int hf_msg_client_reply_mdsmap_epoch;
+static int hf_msg_client_reply_safe;
+static int hf_msg_client_reply_isdentry;
+static int hf_msg_client_reply_istarget;
+static int hf_msg_client_reply_trace;
+static int hf_msg_client_reply_extra;
+static int hf_msg_client_reply_snaps;
+static int hf_msg_osd_map;
+static int hf_msg_osd_map_fsid;
+static int hf_msg_osd_map_inc;
+static int hf_msg_osd_map_inc_len;
+static int hf_msg_osd_map_map;
+static int hf_msg_osd_map_map_len;
+static int hf_msg_osd_map_epoch;
+static int hf_msg_osd_map_oldest;
+static int hf_msg_osd_map_newest;
+static int hf_msg_osd_op;
+static int hf_msg_osd_op_client_inc;
+static int hf_msg_osd_op_osdmap_epoch;
+static int hf_msg_osd_op_mtime;
+static int hf_msg_osd_op_reassert_version;
+static int hf_msg_osd_op_oloc;
+static int hf_msg_osd_op_pgid;
+static int hf_msg_osd_op_oid;
+static int hf_msg_osd_op_ops_len;
+static int hf_msg_osd_op_op;
+static int hf_msg_osd_op_snap_id;
+static int hf_msg_osd_op_snap_seq;
+static int hf_msg_osd_op_snaps_len;
+static int hf_msg_osd_op_snap;
+static int hf_msg_osd_op_retry_attempt;
+static int hf_msg_osd_op_payload;
+static int hf_msg_osd_opreply;
+static int hf_msg_osd_opreply_oid;
+static int hf_msg_osd_opreply_pgid;
+static int hf_msg_osd_opreply_result;
+static int hf_msg_osd_opreply_bad_replay_ver;
+static int hf_msg_osd_opreply_osdmap_epoch;
+static int hf_msg_osd_opreply_ops_len;
+static int hf_msg_osd_opreply_op;
+static int hf_msg_osd_opreply_retry_attempt;
+static int hf_msg_osd_opreply_rval;
+static int hf_msg_osd_opreply_replay_ver;
+static int hf_msg_osd_opreply_user_ver;
+static int hf_msg_osd_opreply_redirect;
+static int hf_msg_osd_opreply_payload;
+static int hf_msg_poolopreply;
+static int hf_msg_poolopreply_fsid;
+static int hf_msg_poolopreply_code;
+static int hf_msg_poolopreply_epoch;
+static int hf_msg_poolopreply_datai;
+static int hf_msg_poolopreply_data;
+static int hf_msg_poolopreply_data_size;
+static int hf_msg_poolop;
+static int hf_msg_poolop_fsid;
+static int hf_msg_poolop_pool;
+static int hf_msg_poolop_type;
+static int hf_msg_poolop_auid;
+static int hf_msg_poolop_snapid;
+static int hf_msg_poolop_name;
+static int hf_msg_poolop_crush_rule;
+static int hf_msg_poolop_crush_rule8;
+static int hf_msg_mon_cmd;
+static int hf_msg_mon_cmd_fsid;
+static int hf_msg_mon_cmd_arg;
+static int hf_msg_mon_cmd_arg_len;
+static int hf_msg_mon_cmd_str;
+static int hf_msg_mon_cmd_ack;
+static int hf_msg_mon_cmd_ack_code;
+static int hf_msg_mon_cmd_ack_res;
+static int hf_msg_mon_cmd_ack_arg;
+static int hf_msg_mon_cmd_ack_arg_len;
+static int hf_msg_mon_cmd_ack_arg_str;
+static int hf_msg_mon_cmd_ack_data;
+static int hf_msg_poolstats;
+static int hf_msg_poolstats_fsid;
+static int hf_msg_poolstats_pool;
+static int hf_msg_poolstatsreply;
+static int hf_msg_poolstatsreply_fsid;
+static int hf_msg_poolstatsreply_stat;
+static int hf_msg_poolstatsreply_pool;
+static int hf_msg_poolstatsreply_log_size;
+static int hf_msg_poolstatsreply_log_size_ondisk;
+static int hf_msg_mon_globalid_max;
+static int hf_msg_mon_election;
+static int hf_msg_mon_election_fsid;
+static int hf_msg_mon_election_op;
+static int hf_msg_mon_election_epoch;
+static int hf_msg_mon_election_quorum;
+static int hf_msg_mon_election_quorum_features;
+static int hf_msg_mon_election_defunct_one;
+static int hf_msg_mon_election_defunct_two;
+static int hf_msg_mon_election_sharing;
+static int hf_msg_mon_election_sharing_data;
+static int hf_msg_mon_election_sharing_size;
+static int hf_msg_mon_paxos;
+static int hf_msg_mon_paxos_epoch;
+static int hf_msg_mon_paxos_op;
+static int hf_msg_mon_paxos_first;
+static int hf_msg_mon_paxos_last;
+static int hf_msg_mon_paxos_pnfrom;
+static int hf_msg_mon_paxos_pn;
+static int hf_msg_mon_paxos_pnuncommitted;
+static int hf_msg_mon_paxos_lease;
+static int hf_msg_mon_paxos_sent;
+static int hf_msg_mon_paxos_latest_ver;
+static int hf_msg_mon_paxos_latest_val;
+static int hf_msg_mon_paxos_latest_val_data;
+static int hf_msg_mon_paxos_latest_val_size;
+static int hf_msg_mon_paxos_value;
+static int hf_msg_mon_paxos_ver;
+static int hf_msg_mon_paxos_val;
+static int hf_msg_mon_paxos_val_data;
+static int hf_msg_mon_paxos_val_size;
+static int hf_msg_mon_probe;
+static int hf_msg_mon_probe_fsid;
+static int hf_msg_mon_probe_type;
+static int hf_msg_mon_probe_name;
+static int hf_msg_mon_probe_quorum;
+static int hf_msg_mon_probe_paxos_first_ver;
+static int hf_msg_mon_probe_paxos_last_ver;
+static int hf_msg_mon_probe_ever_joined;
+static int hf_msg_mon_probe_req_features;
+static int hf_msg_osd_ping;
+static int hf_msg_osd_ping_fsid;
+static int hf_msg_osd_ping_mapepoch;
+static int hf_msg_osd_ping_peerepoch;
+static int hf_msg_osd_ping_op;
+static int hf_msg_osd_ping_time;
+static int hf_msg_osd_boot;
+static int hf_msg_osd_boot_addr_back;
+static int hf_msg_osd_boot_addr_cluster;
+static int hf_msg_osd_boot_epoch;
+static int hf_msg_osd_boot_addr_front;
+static int hf_msg_osd_boot_metadata;
+static int hf_msg_osd_boot_metadata_k;
+static int hf_msg_osd_boot_metadata_v;
+static int hf_msg_pgstats;
+static int hf_msg_pgstats_fsid;
+static int hf_msg_pgstats_pgstat;
+static int hf_msg_pgstats_pgstat_pg;
+static int hf_msg_pgstats_pgstat_stat;
+static int hf_msg_pgstats_epoch;
+static int hf_msg_pgstats_mapfor;
+static int hf_msg_osd_pg_create;
+static int hf_msg_osd_pg_create_epoch;
+static int hf_msg_osd_pg_create_mkpg;
+static int hf_msg_osd_pg_create_mkpg_pg;
+static int hf_msg_osd_pg_create_mkpg_create;
+static int hf_msg_client_caps;
+static int hf_msg_client_caps_op;
+static int hf_msg_client_caps_inode;
+static int hf_msg_client_caps_relam;
+static int hf_msg_client_caps_cap_id;
+static int hf_msg_client_caps_seq;
+static int hf_msg_client_caps_seq_issue;
+static int hf_msg_client_caps_new;
+static int hf_msg_client_caps_wanted;
+static int hf_msg_client_caps_dirty;
+static int hf_msg_client_caps_seq_migrate;
+static int hf_msg_client_caps_snap_follows;
+static int hf_msg_client_caps_uid;
+static int hf_msg_client_caps_gid;
+static int hf_msg_client_caps_mode;
+static int hf_msg_client_caps_nlink;
+static int hf_msg_client_caps_xattr_ver;
+static int hf_msg_client_caps_snap;
+static int hf_msg_client_caps_flock;
+static int hf_msg_client_caps_inline_ver;
+static int hf_msg_client_caps_inline_data;
+static int hf_msg_client_caps_xattr;
+static int hf_msg_client_caprel;
+static int hf_msg_client_caprel_cap;
+static int hf_msg_client_caprel_cap_inode;
+static int hf_msg_client_caprel_cap_id;
+static int hf_msg_client_caprel_cap_migrate;
+static int hf_msg_client_caprel_cap_seq;
+static int hf_msg_timecheck;
+static int hf_msg_timecheck_op;
+static int hf_msg_timecheck_epoch;
+static int hf_msg_timecheck_round;
+static int hf_msg_timecheck_time;
+static int hf_msg_timecheck_skew;
+static int hf_msg_timecheck_skew_node;
+static int hf_msg_timecheck_skew_skew;
+static int hf_msg_timecheck_latency;
+static int hf_msg_timecheck_latency_node;
+static int hf_msg_timecheck_latency_latency;
 
 /* Initialize the expert items. */
-static expert_field ei_unused	      = EI_INIT;
-static expert_field ei_overrun	      = EI_INIT;
-static expert_field ei_tag_unknown    = EI_INIT;
-static expert_field ei_msg_unknown    = EI_INIT;
-static expert_field ei_union_unknown  = EI_INIT;
-static expert_field ei_ver_tooold     = EI_INIT;
-static expert_field ei_ver_toonew     = EI_INIT;
-static expert_field ei_oloc_both      = EI_INIT;
-/* static expert_field ei_banner_invalid = EI_INIT; */
-static expert_field ei_sizeillogical  = EI_INIT;
+static expert_field ei_unused;
+static expert_field ei_overrun;
+static expert_field ei_tag_unknown;
+static expert_field ei_msg_unknown;
+static expert_field ei_union_unknown;
+static expert_field ei_ver_tooold;
+static expert_field ei_ver_toonew;
+static expert_field ei_oloc_both;
+/* static expert_field ei_banner_invalid; */
+static expert_field ei_sizeillogical;
 
 /* Initialize the subtree pointers */
-static gint ett_ceph			   = -1;
-static gint ett_data			   = -1;
-static gint ett_str			   = -1;
-static gint ett_blob			   = -1;
-static gint ett_sockaddr		   = -1;
-static gint ett_entityaddr		   = -1;
-static gint ett_entityname		   = -1;
-static gint ett_EntityName		   = -1;
-static gint ett_entityinst		   = -1;
-static gint ett_kv			   = -1;
-static gint ett_eversion		   = -1;
-static gint ett_objectlocator		   = -1;
-static gint ett_pg			   = -1;
-static gint ett_pg_create		   = -1;
-static gint ett_filepath		   = -1;
-static gint ett_mds_release		   = -1;
-static gint ett_hitset_params		   = -1;
-static gint ett_snapinfo		   = -1;
-static gint ett_pgpool			   = -1;
-static gint ett_pgpool_snap		   = -1;
-static gint ett_pgpool_snapdel		   = -1;
-static gint ett_pgpool_property		   = -1;
-static gint ett_mon_map			   = -1;
-static gint ett_mon_map_address		   = -1;
-static gint ett_osd_peerstat		   = -1;
-static gint ett_featureset		   = -1;
-static gint ett_featureset_name		   = -1;
-static gint ett_compatset		   = -1;
-static gint ett_osd_superblock		   = -1;
-static gint ett_osd_info		   = -1;
-static gint ett_osd_xinfo		   = -1;
-static gint ett_perfstat		   = -1;
-static gint ett_osdstat			   = -1;
-static gint ett_pg_stat			   = -1;
-static gint ett_osd_map			   = -1;
-static gint ett_osd_map_client		   = -1;
-static gint ett_osd_map_pool		   = -1;
-static gint ett_osd_map_poolname	   = -1;
-static gint ett_osd_map_pgtmp		   = -1;
-static gint ett_osd_map_primarytmp	   = -1;
-static gint ett_osd_map_erasurecodeprofile = -1;
-static gint ett_osd_map_osd		   = -1;
-static gint ett_osd_map_blacklist	   = -1;
-static gint ett_osd_map_inc		   = -1;
-static gint ett_osd_map_inc_client	   = -1;
-static gint ett_osd_map_inc_osd		   = -1;
-static gint ett_osd_op			   = -1;
-static gint ett_redirect		   = -1;
-static gint ett_statcollection		   = -1;
-static gint ett_paxos			   = -1;
-static gint ett_msg_mon_map		   = -1;
-static gint ett_msg_statfs		   = -1;
-static gint ett_msg_statfsreply		   = -1;
-static gint ett_msg_mon_sub		   = -1;
-static gint ett_msg_mon_sub_item	   = -1;
-static gint ett_msg_mon_sub_flags	   = -1;
-static gint ett_msg_mon_sub_ack		   = -1;
-static gint ett_msg_auth		   = -1;
-static gint ett_msg_auth_supportedproto	   = -1;
-static gint ett_msg_auth_cephx		   = -1;
-static gint ett_msg_authreply		   = -1;
-static gint ett_msg_mon_getversion	   = -1;
-static gint ett_msg_mon_getversionreply	   = -1;
-static gint ett_msg_mds_map		   = -1;
-static gint ett_msg_client_sess		   = -1;
-static gint ett_msg_client_req		   = -1;
-static gint ett_msg_client_reqfwd	   = -1;
-static gint ett_msg_client_reply	   = -1;
-static gint ett_msg_osd_map		   = -1;
-static gint ett_msg_osd_map_inc		   = -1;
-static gint ett_msg_osd_map_full	   = -1;
-static gint ett_msg_osd_op		   = -1;
-static gint ett_msg_osd_opreply		   = -1;
-static gint ett_msg_poolopreply		   = -1;
-static gint ett_msg_poolop		   = -1;
-static gint ett_msg_mon_cmd		   = -1;
-static gint ett_msg_mon_cmd_arg		   = -1;
-static gint ett_msg_mon_cmdack		   = -1;
-static gint ett_msg_mon_cmdack_arg	   = -1;
-static gint ett_msg_poolstats		   = -1;
-static gint ett_msg_poolstatsreply	   = -1;
-static gint ett_msg_poolstatsreply_stat	   = -1;
-static gint ett_msg_mon_election	   = -1;
-static gint ett_msg_mon_paxos		   = -1;
-static gint ett_msg_mon_paxos_value	   = -1;
-static gint ett_msg_mon_probe		   = -1;
-static gint ett_msg_osd_ping		   = -1;
-static gint ett_msg_osd_boot		   = -1;
-static gint ett_msg_pgstats		   = -1;
-static gint ett_msg_pgstats_pgstat	   = -1;
-static gint ett_msg_osd_pg_create	   = -1;
-static gint ett_msg_osd_pg_create_mkpg	   = -1;
-static gint ett_msg_client_caps		   = -1;
-static gint ett_msg_client_caprel	   = -1;
-static gint ett_msg_client_caprel_cap	   = -1;
-static gint ett_msg_timecheck		   = -1;
-static gint ett_msg_timecheck_skew	   = -1;
-static gint ett_msg_timecheck_latency	   = -1;
-static gint ett_head			   = -1;
-static gint ett_foot			   = -1;
-static gint ett_connect			   = -1;
-static gint ett_connect_reply		   = -1;
-static gint ett_filter_data		   = -1;
+static gint ett_ceph;
+static gint ett_data;
+static gint ett_str;
+static gint ett_blob;
+static gint ett_sockaddr;
+static gint ett_entityaddr;
+static gint ett_entityname;
+static gint ett_EntityName;
+static gint ett_entityinst;
+static gint ett_kv;
+static gint ett_eversion;
+static gint ett_objectlocator;
+static gint ett_pg;
+static gint ett_pg_create;
+static gint ett_filepath;
+static gint ett_mds_release;
+static gint ett_hitset_params;
+static gint ett_snapinfo;
+static gint ett_pgpool;
+static gint ett_pgpool_snap;
+static gint ett_pgpool_snapdel;
+static gint ett_pgpool_property;
+static gint ett_mon_map;
+static gint ett_mon_map_address;
+static gint ett_osd_peerstat;
+static gint ett_featureset;
+static gint ett_featureset_name;
+static gint ett_compatset;
+static gint ett_osd_superblock;
+static gint ett_osd_info;
+static gint ett_osd_xinfo;
+static gint ett_perfstat;
+static gint ett_osdstat;
+static gint ett_pg_stat;
+static gint ett_osd_map;
+static gint ett_osd_map_client;
+static gint ett_osd_map_pool;
+static gint ett_osd_map_poolname;
+static gint ett_osd_map_pgtmp;
+static gint ett_osd_map_primarytmp;
+static gint ett_osd_map_erasurecodeprofile;
+static gint ett_osd_map_osd;
+static gint ett_osd_map_blacklist;
+static gint ett_osd_map_inc;
+static gint ett_osd_map_inc_client;
+static gint ett_osd_map_inc_osd;
+static gint ett_osd_op;
+static gint ett_redirect;
+static gint ett_statcollection;
+static gint ett_paxos;
+static gint ett_msg_mon_map;
+static gint ett_msg_statfs;
+static gint ett_msg_statfsreply;
+static gint ett_msg_mon_sub;
+static gint ett_msg_mon_sub_item;
+static gint ett_msg_mon_sub_flags;
+static gint ett_msg_mon_sub_ack;
+static gint ett_msg_auth;
+static gint ett_msg_auth_supportedproto;
+static gint ett_msg_auth_cephx;
+static gint ett_msg_authreply;
+static gint ett_msg_mon_getversion;
+static gint ett_msg_mon_getversionreply;
+static gint ett_msg_mds_map;
+static gint ett_msg_client_sess;
+static gint ett_msg_client_req;
+static gint ett_msg_client_reqfwd;
+static gint ett_msg_client_reply;
+static gint ett_msg_osd_map;
+static gint ett_msg_osd_map_inc;
+static gint ett_msg_osd_map_full;
+static gint ett_msg_osd_op;
+static gint ett_msg_osd_opreply;
+static gint ett_msg_poolopreply;
+static gint ett_msg_poolop;
+static gint ett_msg_mon_cmd;
+static gint ett_msg_mon_cmd_arg;
+static gint ett_msg_mon_cmdack;
+static gint ett_msg_mon_cmdack_arg;
+static gint ett_msg_poolstats;
+static gint ett_msg_poolstatsreply;
+static gint ett_msg_poolstatsreply_stat;
+static gint ett_msg_mon_election;
+static gint ett_msg_mon_paxos;
+static gint ett_msg_mon_paxos_value;
+static gint ett_msg_mon_probe;
+static gint ett_msg_osd_ping;
+static gint ett_msg_osd_boot;
+static gint ett_msg_pgstats;
+static gint ett_msg_pgstats_pgstat;
+static gint ett_msg_osd_pg_create;
+static gint ett_msg_osd_pg_create_mkpg;
+static gint ett_msg_client_caps;
+static gint ett_msg_client_caprel;
+static gint ett_msg_client_caprel_cap;
+static gint ett_msg_timecheck;
+static gint ett_msg_timecheck_skew;
+static gint ett_msg_timecheck_latency;
+static gint ett_head;
+static gint ett_foot;
+static gint ett_connect;
+static gint ett_connect_reply;
+static gint ett_filter_data;
 
 static const guint8 *C_BANNER = (const guint8*)"ceph v";
 
diff --git a/epan/dissectors/packet-cesoeth.c b/epan/dissectors/packet-cesoeth.c
index a3d532c918..178fe73bb6 100644
--- a/epan/dissectors/packet-cesoeth.c
+++ b/epan/dissectors/packet-cesoeth.c
@@ -25,25 +25,25 @@ void proto_reg_handoff_cesoeth(void);
 
 static dissector_handle_t cesoeth_handle;
 
-static int proto_cesoeth = -1;
-static int hf_cesoeth_pw_ecid = -1;
-static int hf_cesoeth_pw_res = -1;
-static int hf_cesoeth_cw = -1;
-static int hf_cesoeth_cw_reserved1 = -1;
-static int hf_cesoeth_cw_l = -1;
-static int hf_cesoeth_cw_r = -1;
-static int hf_cesoeth_cw_l0_m = -1;
-static int hf_cesoeth_cw_l1_m = -1;
-static int hf_cesoeth_cw_frg = -1;
-static int hf_cesoeth_cw_len = -1;
-static int hf_cesoeth_cw_seq = -1;
-static int hf_cesoeth_padding = -1;
-
-static gint ett_cesoeth = -1;
-static gint ett_cesoeth_cw = -1;
-
-static expert_field ei_cesoeth_reserved = EI_INIT;
-static expert_field ei_cesoeth_length = EI_INIT;
+static int proto_cesoeth;
+static int hf_cesoeth_pw_ecid;
+static int hf_cesoeth_pw_res;
+static int hf_cesoeth_cw;
+static int hf_cesoeth_cw_reserved1;
+static int hf_cesoeth_cw_l;
+static int hf_cesoeth_cw_r;
+static int hf_cesoeth_cw_l0_m;
+static int hf_cesoeth_cw_l1_m;
+static int hf_cesoeth_cw_frg;
+static int hf_cesoeth_cw_len;
+static int hf_cesoeth_cw_seq;
+static int hf_cesoeth_padding;
+
+static gint ett_cesoeth;
+static gint ett_cesoeth_cw;
+
+static expert_field ei_cesoeth_reserved;
+static expert_field ei_cesoeth_length;
 
 static int* const cesoeth_l0_cw[] =
 {
diff --git a/epan/dissectors/packet-cfdp.c b/epan/dissectors/packet-cfdp.c
index 01fa1a0c55..1d721ba011 100644
--- a/epan/dissectors/packet-cfdp.c
+++ b/epan/dissectors/packet-cfdp.c
@@ -29,127 +29,127 @@ void proto_register_cfdp(void);
 void proto_reg_handoff_cfdp(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_cfdp = -1;
-static int hf_cfdp_flags = -1;
-static int hf_cfdp_byte2 = -1;
-static int hf_cfdp_proxy_fault_hdl_overr = -1;
-static int hf_cfdp_proxy_trans_mode = -1;
-static int hf_cfdp_proxy_segment_control_byte = -1;
-static int hf_cfdp_proxy_put_resp = -1;
-static int hf_cfdp_orig_trans_id = -1;
-static int hf_cfdp_remote_stat_rep_req = -1;
-static int hf_cfdp_remote_stat_rep_resp = -1;
-static int hf_cfdp_finish_pdu_flags = -1;
-static int hf_cfdp_remote_suspend_resume_req = -1;
-static int hf_cfdp_remote_suspend_resume_resp = -1;
-static int hf_cfdp_version = -1;
-static int hf_cfdp_pdu_type = -1;
-static int hf_cfdp_direction = -1;
-static int hf_cfdp_trans_mode = -1;
-static int hf_cfdp_trans_mode_2 = -1;
-static int hf_cfdp_crc_flag = -1;
-static int hf_cfdp_res1 = -1;
-static int hf_cfdp_data_length = -1;
-static int hf_cfdp_file_data_pdu = -1;
-static int hf_cfdp_res2 = -1;
-static int hf_cfdp_entid_length = -1;
-static int hf_cfdp_res3 = -1;
-static int hf_cfdp_transeqnum_length = -1;
-static int hf_cfdp_srcid = -1;
-static int hf_cfdp_transeqnum = -1;
-static int hf_cfdp_dstid = -1;
-static int hf_cfdp_file_directive_type = -1;
-static int hf_cfdp_file_data_offset = -1;
-static int hf_cfdp_progress = -1;
-static int hf_cfdp_dir_code_ack = -1;
-static int hf_cfdp_dir_subtype_ack = -1;
-static int hf_cfdp_condition_code = -1;
-static int hf_cfdp_spare_one = -1;
-static int hf_cfdp_spare_one_2 = -1;
-static int hf_cfdp_spare_two = -1;
-static int hf_cfdp_spare_four = -1;
-static int hf_cfdp_spare_five = -1;
-static int hf_cfdp_spare_five_2 = -1;
-static int hf_cfdp_spare_seven = -1;
-static int hf_cfdp_spare_seven_2 = -1;
-static int hf_cfdp_trans_stat_ack = -1;
-static int hf_cfdp_file_checksum = -1;
-static int hf_cfdp_file_size = -1;
-static int hf_cfdp_end_system_stat = -1;
-static int hf_cfdp_delivery_code = -1;
-static int hf_cfdp_file_stat = -1;
-static int hf_cfdp_segment_control = -1;
-static int hf_cfdp_src_file_name_len = -1;
-static int hf_cfdp_src_file_name = -1;
-static int hf_cfdp_dst_file_name_len = -1;
-static int hf_cfdp_dst_file_name = -1;
-static int hf_cfdp_first_file_name_len = -1;
-static int hf_cfdp_first_file_name = -1;
-static int hf_cfdp_second_file_name_len = -1;
-static int hf_cfdp_second_file_name = -1;
-static int hf_cfdp_nak_st_scope = -1;
-static int hf_cfdp_nak_sp_scope = -1;
-static int hf_cfdp_crc = -1;
-static int hf_cfdp_action_code = -1;
-static int hf_cfdp_status_code_1 = -1;
-static int hf_cfdp_status_code_2 = -1;
-static int hf_cfdp_status_code_3 = -1;
-static int hf_cfdp_status_code_4 = -1;
-static int hf_cfdp_status_code_5 = -1;
-static int hf_cfdp_status_code_6 = -1;
-static int hf_cfdp_status_code_7 = -1;
-static int hf_cfdp_status_code_8 = -1;
-static int hf_cfdp_handler_code = -1;
-static int hf_cfdp_proxy_msg_type = -1;
-static int hf_cfdp_proxy_segment_control = -1;
-static int hf_cfdp_proxy_delivery_code = -1;
-static int hf_cfdp_response_req = -1;
-static int hf_cfdp_directory_name = -1;
-static int hf_cfdp_directory_file_name = -1;
-static int hf_cfdp_listing_resp_code = -1;
-static int hf_cfdp_report_file_name = -1;
-static int hf_cfdp_trans_stat = -1;
-static int hf_cfdp_trans_stat_2 = -1;
-static int hf_cfdp_rep_resp_code = -1;
-static int hf_cfdp_suspension_ind = -1;
-static int hf_cfdp_tlv_len = - 1;
+static int proto_cfdp;
+static int hf_cfdp_flags;
+static int hf_cfdp_byte2;
+static int hf_cfdp_proxy_fault_hdl_overr;
+static int hf_cfdp_proxy_trans_mode;
+static int hf_cfdp_proxy_segment_control_byte;
+static int hf_cfdp_proxy_put_resp;
+static int hf_cfdp_orig_trans_id;
+static int hf_cfdp_remote_stat_rep_req;
+static int hf_cfdp_remote_stat_rep_resp;
+static int hf_cfdp_finish_pdu_flags;
+static int hf_cfdp_remote_suspend_resume_req;
+static int hf_cfdp_remote_suspend_resume_resp;
+static int hf_cfdp_version;
+static int hf_cfdp_pdu_type;
+static int hf_cfdp_direction;
+static int hf_cfdp_trans_mode;
+static int hf_cfdp_trans_mode_2;
+static int hf_cfdp_crc_flag;
+static int hf_cfdp_res1;
+static int hf_cfdp_data_length;
+static int hf_cfdp_file_data_pdu;
+static int hf_cfdp_res2;
+static int hf_cfdp_entid_length;
+static int hf_cfdp_res3;
+static int hf_cfdp_transeqnum_length;
+static int hf_cfdp_srcid;
+static int hf_cfdp_transeqnum;
+static int hf_cfdp_dstid;
+static int hf_cfdp_file_directive_type;
+static int hf_cfdp_file_data_offset;
+static int hf_cfdp_progress;
+static int hf_cfdp_dir_code_ack;
+static int hf_cfdp_dir_subtype_ack;
+static int hf_cfdp_condition_code;
+static int hf_cfdp_spare_one;
+static int hf_cfdp_spare_one_2;
+static int hf_cfdp_spare_two;
+static int hf_cfdp_spare_four;
+static int hf_cfdp_spare_five;
+static int hf_cfdp_spare_five_2;
+static int hf_cfdp_spare_seven;
+static int hf_cfdp_spare_seven_2;
+static int hf_cfdp_trans_stat_ack;
+static int hf_cfdp_file_checksum;
+static int hf_cfdp_file_size;
+static int hf_cfdp_end_system_stat;
+static int hf_cfdp_delivery_code;
+static int hf_cfdp_file_stat;
+static int hf_cfdp_segment_control;
+static int hf_cfdp_src_file_name_len;
+static int hf_cfdp_src_file_name;
+static int hf_cfdp_dst_file_name_len;
+static int hf_cfdp_dst_file_name;
+static int hf_cfdp_first_file_name_len;
+static int hf_cfdp_first_file_name;
+static int hf_cfdp_second_file_name_len;
+static int hf_cfdp_second_file_name;
+static int hf_cfdp_nak_st_scope;
+static int hf_cfdp_nak_sp_scope;
+static int hf_cfdp_crc;
+static int hf_cfdp_action_code;
+static int hf_cfdp_status_code_1;
+static int hf_cfdp_status_code_2;
+static int hf_cfdp_status_code_3;
+static int hf_cfdp_status_code_4;
+static int hf_cfdp_status_code_5;
+static int hf_cfdp_status_code_6;
+static int hf_cfdp_status_code_7;
+static int hf_cfdp_status_code_8;
+static int hf_cfdp_handler_code;
+static int hf_cfdp_proxy_msg_type;
+static int hf_cfdp_proxy_segment_control;
+static int hf_cfdp_proxy_delivery_code;
+static int hf_cfdp_response_req;
+static int hf_cfdp_directory_name;
+static int hf_cfdp_directory_file_name;
+static int hf_cfdp_listing_resp_code;
+static int hf_cfdp_report_file_name;
+static int hf_cfdp_trans_stat;
+static int hf_cfdp_trans_stat_2;
+static int hf_cfdp_rep_resp_code;
+static int hf_cfdp_suspension_ind;
+static int hf_cfdp_tlv_len;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_cfdp_filestore_message_len = -1;
-static int hf_cfdp_filestore_message = -1;
-static int hf_cfdp_entity = -1;
-static int hf_cfdp_message_to_user = -1;
-static int hf_cfdp_flow_label = -1;
-static int hf_cfdp_segment_requests = -1;
-static int hf_cfdp_user_data = -1;
+static int hf_cfdp_filestore_message_len;
+static int hf_cfdp_filestore_message;
+static int hf_cfdp_entity;
+static int hf_cfdp_message_to_user;
+static int hf_cfdp_flow_label;
+static int hf_cfdp_segment_requests;
+static int hf_cfdp_user_data;
 
 /* Initialize the subtree pointers */
-static gint ett_cfdp = -1;
-static gint ett_cfdp_header = -1;
-static gint ett_cfdp_flags = -1;
-static gint ett_cfdp_byte2 = -1;
-static gint ett_cfdp_proxy_fault_hdl_overr = -1;
-static gint ett_cfdp_proxy_trans_mode = -1;
-static gint ett_cfdp_proxy_segment_control_byte = -1;
-static gint ett_cfdp_proxy_put_resp = -1;
-static gint ett_cfdp_orig_trans_id = -1;
-static gint ett_cfdp_remote_stat_rep_req = -1;
-static gint ett_cfdp_remote_stat_rep_resp = -1;
-static gint ett_cfdp_file_directive_header = -1;
-static gint ett_cfdp_file_data_header = -1;
-static gint ett_cfdp_finish_pdu_flags = -1;
-static gint ett_cfdp_remote_suspend_resume_req = -1;
-static gint ett_cfdp_remote_suspend_resume_resp = -1;
-static gint ett_cfdp_fault_location = -1;
-static gint ett_cfdp_crc = -1;
-static gint ett_cfdp_filestore_req = -1;
-static gint ett_cfdp_filestore_resp = -1;
-static gint ett_cfdp_msg_to_user = -1;
-static gint ett_cfdp_fault_hdl_overr = -1;
-static gint ett_cfdp_flow_label = -1;
-static gint ett_cfdp_proto = -1;
-
-static expert_field ei_cfdp_bad_length = EI_INIT;
+static gint ett_cfdp;
+static gint ett_cfdp_header;
+static gint ett_cfdp_flags;
+static gint ett_cfdp_byte2;
+static gint ett_cfdp_proxy_fault_hdl_overr;
+static gint ett_cfdp_proxy_trans_mode;
+static gint ett_cfdp_proxy_segment_control_byte;
+static gint ett_cfdp_proxy_put_resp;
+static gint ett_cfdp_orig_trans_id;
+static gint ett_cfdp_remote_stat_rep_req;
+static gint ett_cfdp_remote_stat_rep_resp;
+static gint ett_cfdp_file_directive_header;
+static gint ett_cfdp_file_data_header;
+static gint ett_cfdp_finish_pdu_flags;
+static gint ett_cfdp_remote_suspend_resume_req;
+static gint ett_cfdp_remote_suspend_resume_resp;
+static gint ett_cfdp_fault_location;
+static gint ett_cfdp_crc;
+static gint ett_cfdp_filestore_req;
+static gint ett_cfdp_filestore_resp;
+static gint ett_cfdp_msg_to_user;
+static gint ett_cfdp_fault_hdl_overr;
+static gint ett_cfdp_flow_label;
+static gint ett_cfdp_proto;
+
+static expert_field ei_cfdp_bad_length;
 
 
 static dissector_handle_t cfdp_handle;
diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c
index e0bd31d5dd..9dcf410669 100644
--- a/epan/dissectors/packet-cfm.c
+++ b/epan/dissectors/packet-cfm.c
@@ -445,278 +445,278 @@ static const value_string req_mep_id_tlv_lb_vals[] = {
 void proto_register_cfm(void);
 void proto_reg_handoff_cfm(void);
 
-static int proto_cfm = -1;
-
-static int hf_cfm_md_level = -1;
-static int hf_cfm_version = -1;
-static int hf_cfm_opcode = -1;
-static int hf_cfm_flags = -1;
-static int hf_cfm_flags_Reserved = -1;
-static int hf_cfm_first_tlv_offset = -1;
-
-static int hf_cfm_mep_id = -1;
-static int hf_cfm_maid = -1;
-static int hf_cfm_maid_md_name_format = -1;
-static int hf_cfm_maid_md_name_length = -1;
-static int hf_cfm_maid_md_name_string = -1;
-static int hf_cfm_maid_md_name_hex = -1;
-static int hf_cfm_maid_md_name_mac = -1;
-static int hf_cfm_maid_md_name_mac_id = -1;
-static int hf_cfm_maid_ma_name_format = -1;
-static int hf_cfm_maid_ma_name_length = -1;
-static int hf_cfm_maid_ma_name_pvid = -1;
-static int hf_cfm_maid_ma_name_string = -1;
-static int hf_cfm_maid_ma_name_id = -1;
-static int hf_cfm_maid_ma_name_vpnid_oui = -1;
-static int hf_cfm_maid_ma_name_vpnid_index = -1;
-static int hf_cfm_maid_ma_name_icc_umc = -1;
-static int hf_cfm_maid_ma_name_cc = -1;
-static int hf_cfm_maid_ma_name_hex = -1;
-static int hf_cfm_maid_padding = -1;
-
-static int hf_cfm_ccm_pdu = -1;
-static int hf_cfm_ccm_flags_RDI = -1;
-static int hf_cfm_ccm_flags_Traffic = -1;
-static int hf_cfm_ccm_flags_Reserved = -1;
-static int hf_cfm_ccm_flags_Interval = -1;
-static int hf_cfm_ccm_seq_number = -1;
-static int hf_cfm_ccm_itu_t_y1731 = -1;
-static int hf_cfm_ccm_itu_TxFCf = -1;
-static int hf_cfm_ccm_itu_RxFCb = -1;
-static int hf_cfm_ccm_itu_TxFCb = -1;
-static int hf_cfm_ccm_itu_reserved = -1;
-
-static int hf_cfm_lbm_pdu = -1;
-static int hf_cfm_lbm_lbr_transaction_id = -1;
-
-static int hf_cfm_lbr_pdu = -1;
-
-static int hf_cfm_ltm_pdu = -1;
-static int hf_cfm_ltm_flags_UseFDBonly = -1;
-static int hf_cfm_ltm_flags_Reserved = -1;
-static int hf_cfm_ltm_ltr_transaction_id = -1;
-static int hf_cfm_ltm_ltr_ttl = -1;
-static int hf_cfm_ltm_orig_addr = -1;
-static int hf_cfm_ltm_targ_addr = -1;
-
-static int hf_cfm_ltr_pdu = -1;
-static int hf_cfm_ltr_flags_UseFDBonly = -1;
-static int hf_cfm_ltr_flags_FwdYes = -1;
-static int hf_cfm_ltr_flags_TerminalMEP = -1;
-static int hf_cfm_ltr_flags_Reserved = -1;
-static int hf_cfm_ltr_relay_action = -1;
-
-static int hf_cfm_rfm_pdu = -1;
-static int hf_cfm_rfm_transaction_id = -1;
-
-static int hf_cfm_sfm_pdu = -1;
-static int hf_cfm_sfm_transaction_id = -1;
-
-static int hf_cfm_gnm_pdu = -1;
-static int hf_cfm_gnm_unknown_flags = -1;
-static int hf_cfm_gnm_subopcode = -1;
-
-static int hf_cfm_bnm_flags_Reserved = -1;
-static int hf_cfm_bnm_flags_Period = -1;
-static int hf_cfm_bnm_pdu = -1;
-static int hf_cfm_bnm_nominal_bw = -1;
-static int hf_cfm_bnm_current_bw = -1;
-static int hf_cfm_bnm_port_id = -1;
-
-static int hf_cfm_ais_pdu = -1;
-static int hf_cfm_ais_flags_Reserved = -1;
-static int hf_cfm_ais_flags_Period = -1;
-
-static int hf_cfm_lck_pdu = -1;
-static int hf_cfm_lck_flags_Reserved = -1;
-static int hf_cfm_lck_flags_Period = -1;
-
-static int hf_cfm_tst_pdu = -1;
-static int hf_cfm_tst_sequence_num = -1;
-
-static int hf_cfm_aps_pdu = -1;
-static int hf_cfm_aps_req_st = -1;
-static int hf_cfm_aps_protection_type_A = -1;
-static int hf_cfm_aps_protection_type_B = -1;
-static int hf_cfm_aps_protection_type_D = -1;
-static int hf_cfm_aps_protection_type_R = -1;
-static int hf_cfm_aps_requested_signal = -1;
-static int hf_cfm_aps_bridged_signal = -1;
-static int hf_cfm_aps_bridge_type = -1;
-
-static int hf_cfm_raps_pdu = -1;
-static int hf_cfm_raps_req_st = -1;
-static int hf_cfm_raps_event_subcode = -1;
-static int hf_cfm_raps_subcode_reserved = -1;
-static int hf_cfm_raps_status = -1;
-static int hf_cfm_raps_status_rb = -1;
-static int hf_cfm_raps_status_dnf = -1;
-static int hf_cfm_raps_status_bpr = -1;
-static int hf_cfm_raps_status_reserved_v1 = -1;
-static int hf_cfm_raps_status_reserved_v2 = -1;
-static int hf_cfm_raps_node_id = -1;
-static int hf_cfm_raps_reserved = -1;
-
-static int hf_cfm_mcc_pdu = -1;
-static int hf_cfm_mcc_oui = -1;
-static int hf_cfm_mcc_subopcode = -1;
-static int hf_cfm_mcc_data = -1;
-
-static int hf_cfm_lmm_pdu = -1;
-static int hf_cfm_lmm_lmr_flags_Reserved = -1;
-static int hf_cfm_lmm_lmr_flags_Type = -1;
-static int hf_cfm_lmm_lmr_TxFCf = -1;
-static int hf_cfm_lmm_lmr_RxFCf = -1;
-static int hf_cfm_lmm_lmr_TxFCb = -1;
-
-static int hf_cfm_lmr_pdu = -1;
-
-static int hf_cfm_odm_pdu = -1;
-static int hf_cfm_odm_dmm_dmr_flags_Reserved = -1;
-static int hf_cfm_odm_dmm_dmr_flags_Type = -1;
-static int hf_cfm_odm_dmm_dmr_TxTimestampf = -1;
-static int hf_cfm_odm_dmm_dmr_RxTimestampf = -1;
-
-static int hf_cfm_dmm_pdu = -1;
-static int hf_cfm_dmm_dmr_TxTimestampb = -1;
-static int hf_cfm_dmm_dmr_RxTimestampb = -1;
-
-static int hf_cfm_dmr_pdu = -1;
-
-static int hf_cfm_exm_pdu = -1;
-static int hf_cfm_exm_oui = -1;
-static int hf_cfm_exm_subopcode = -1;
-static int hf_cfm_exm_data = -1;
-
-static int hf_cfm_exr_pdu = -1;
-static int hf_cfm_exr_oui = -1;
-static int hf_cfm_exr_subopcode = -1;
-static int hf_cfm_exr_data = -1;
-
-static int hf_cfm_vsm_pdu = -1;
-static int hf_cfm_vsm_oui = -1;
-static int hf_cfm_vsm_subopcode = -1;
-static int hf_cfm_vsm_data = -1;
-
-static int hf_cfm_vsr_pdu = -1;
-static int hf_cfm_vsr_oui = -1;
-static int hf_cfm_vsr_subopcode = -1;
-static int hf_cfm_vsr_data = -1;
-
-static int hf_cfm_csf_pdu = -1;
-static int hf_cfm_csf_flags_Reserved = -1;
-static int hf_cfm_csf_flags_Type = -1;
-static int hf_cfm_csf_flags_Period = -1;
-
-static int hf_cfm_osl_pdu = -1;
-static int hf_cfm_osl_src_mep = -1;
-static int hf_cfm_osl_reserved = -1;
-static int hf_cfm_osl_testid = -1;
-static int hf_cfm_osl_txfcf  = -1;
-
-static int hf_cfm_slm_pdu = -1;
-static int hf_cfm_slm_slr_src_mep = -1;
-static int hf_cfm_slm_reserved = -1;
-static int hf_cfm_slm_slr_testid = -1;
-static int hf_cfm_slm_slr_txfcf = -1;
-
-static int hf_cfm_slr_pdu = -1;
-static int hf_cfm_slr_rsp_mep = -1;
-static int hf_cfm_slr_txfcb = -1;
-
-static int hf_cfm_unknown_pdu = -1;
-static int hf_cfm_unknown_flags = -1;
-static int hf_cfm_unknown_data = -1;
-
-static int hf_cfm_all_tlvs = -1;
-static int hf_cfm_tlv_type = -1;
-static int hf_cfm_tlv_length = -1;
-
-static int hf_tlv_chassis_id_length = -1;
-static int hf_tlv_chassis_id_subtype = -1;
-static int hf_tlv_chassis_id_chassis_component = -1;
-static int hf_tlv_chassis_id_interface_alias = -1;
-static int hf_tlv_chassis_id_port_component = -1;
-static int hf_tlv_chassis_id_mac_address = -1;
-static int hf_tlv_chassis_id_network_address_family = -1;
-static int hf_tlv_chassis_id_network_address_ipv4 = -1;
-static int hf_tlv_chassis_id_network_address_ipv6 = -1;
-static int hf_tlv_chassis_id_network_address_unknown = -1;
-static int hf_tlv_chassis_id_interface_name = -1;
-static int hf_tlv_chassis_id_locally_assigned = -1;
-static int hf_tlv_chassis_id_unknown = -1;
-static int hf_tlv_ma_domain_length = -1;
-static int hf_tlv_ma_domain = -1;
-static int hf_tlv_management_addr_length = -1;
-static int hf_tlv_management_addr_ipv4 = -1;
-static int hf_tlv_management_addr_ipv6 = -1;
-static int hf_tlv_management_addr_eth = -1;
-static int hf_tlv_management_addr_unknown = -1;
-static int hf_tlv_port_status_value = -1;
-static int hf_tlv_data_value = -1;
-static int hf_tlv_interface_status_value = -1;
-
-static int hf_tlv_reply_ingress_action = -1;
-static int hf_tlv_reply_ingress_mac_address = -1;
-static int hf_tlv_reply_ing_egr_portid_length = -1;
-static int hf_tlv_reply_ing_egr_portid_subtype = -1;
-static int hf_tlv_reply_ing_egr_portid_interface_alias = -1;
-static int hf_tlv_reply_ing_egr_portid_port_component = -1;
-static int hf_tlv_reply_ing_egr_portid_mac_address = -1;
-static int hf_tlv_reply_ing_egr_portid_network_address_family = -1;
-static int hf_tlv_reply_ing_egr_portid_network_address_ipv4 = -1;
-static int hf_tlv_reply_ing_egr_portid_network_address_ipv6 = -1;
-static int hf_tlv_reply_ing_egr_portid_network_address_unknown = -1;
-static int hf_tlv_reply_ing_egr_portid_interface_name = -1;
-static int hf_tlv_reply_ing_egr_portid_agent_circuit_id = -1;
-static int hf_tlv_reply_ing_egr_portid_locally_assigned = -1;
-static int hf_tlv_reply_ing_egr_portid_unknown = -1;
-static int hf_tlv_reply_egress_action = -1;
-static int hf_tlv_reply_egress_mac_address = -1;
-
-static int hf_tlv_ltr_egress_last_id_mac = -1;
-static int hf_tlv_ltr_egress_last_id_unique_identifier = -1;
-static int hf_tlv_ltr_egress_next_id_mac = -1;
-static int hf_tlv_ltr_egress_next_id_unique_identifier = -1;
-static int hf_tlv_ltm_egress_id_mac = -1;
-static int hf_tlv_ltm_egress_id_unique_identifier = -1;
-
-static int hf_tlv_pbb_te_mip_mac_address = -1;
-static int hf_tlv_pbb_te_reverse_vid = -1;
-static int hf_tlv_pbb_te_reverse_mac = -1;
-
-static int hf_tlv_org_spec_oui = -1;
-static int hf_tlv_org_spec_subtype = -1;
-static int hf_tlv_org_spec_value = -1;
-static int hf_tlv_tst_test_pattern_type = -1;
-static int hf_tlv_tst_test_pattern = -1;
-static int hf_tlv_tst_CRC32 = -1;
-
-static int hf_tlv_tgt_rpl_mep_mip_id_subtype = -1;
-static int hf_tlv_tgt_rpl_padding = -1;
-static int hf_tlv_tgt_rpl_mep_id = -1;
-static int hf_tlv_tgt_rpl_mip_id_icc = -1;
-static int hf_tlv_tgt_rpl_mip_id_node_id = -1;
-static int hf_tlv_tgt_rpl_mip_id_if_num = -1;
-static int hf_tlv_tgt_rpl_mip_id_cc = -1;
-
-static int hf_tlv_req_mep_id_lb = -1;
-static int hf_tlv_req_mep_id_reserved = -1;
-
-static int hf_tlv_tst_id_test_id = -1;
-
-static int hf_tlv_unknown_data = -1;
-
-static gint ett_cfm = -1;
-static gint ett_cfm_pdu = -1;
-static gint ett_cfm_flags = -1;
-static gint ett_cfm_maid = -1;
-static gint ett_cfm_ccm_itu = -1;
-static gint ett_cfm_all_tlvs = -1;
-static gint ett_cfm_tlv = -1;
-static gint ett_cfm_raps_status = -1;
-
-static expert_field ei_tlv_tst_id_length = EI_INIT;
+static int proto_cfm;
+
+static int hf_cfm_md_level;
+static int hf_cfm_version;
+static int hf_cfm_opcode;
+static int hf_cfm_flags;
+static int hf_cfm_flags_Reserved;
+static int hf_cfm_first_tlv_offset;
+
+static int hf_cfm_mep_id;
+static int hf_cfm_maid;
+static int hf_cfm_maid_md_name_format;
+static int hf_cfm_maid_md_name_length;
+static int hf_cfm_maid_md_name_string;
+static int hf_cfm_maid_md_name_hex;
+static int hf_cfm_maid_md_name_mac;
+static int hf_cfm_maid_md_name_mac_id;
+static int hf_cfm_maid_ma_name_format;
+static int hf_cfm_maid_ma_name_length;
+static int hf_cfm_maid_ma_name_pvid;
+static int hf_cfm_maid_ma_name_string;
+static int hf_cfm_maid_ma_name_id;
+static int hf_cfm_maid_ma_name_vpnid_oui;
+static int hf_cfm_maid_ma_name_vpnid_index;
+static int hf_cfm_maid_ma_name_icc_umc;
+static int hf_cfm_maid_ma_name_cc;
+static int hf_cfm_maid_ma_name_hex;
+static int hf_cfm_maid_padding;
+
+static int hf_cfm_ccm_pdu;
+static int hf_cfm_ccm_flags_RDI;
+static int hf_cfm_ccm_flags_Traffic;
+static int hf_cfm_ccm_flags_Reserved;
+static int hf_cfm_ccm_flags_Interval;
+static int hf_cfm_ccm_seq_number;
+static int hf_cfm_ccm_itu_t_y1731;
+static int hf_cfm_ccm_itu_TxFCf;
+static int hf_cfm_ccm_itu_RxFCb;
+static int hf_cfm_ccm_itu_TxFCb;
+static int hf_cfm_ccm_itu_reserved;
+
+static int hf_cfm_lbm_pdu;
+static int hf_cfm_lbm_lbr_transaction_id;
+
+static int hf_cfm_lbr_pdu;
+
+static int hf_cfm_ltm_pdu;
+static int hf_cfm_ltm_flags_UseFDBonly;
+static int hf_cfm_ltm_flags_Reserved;
+static int hf_cfm_ltm_ltr_transaction_id;
+static int hf_cfm_ltm_ltr_ttl;
+static int hf_cfm_ltm_orig_addr;
+static int hf_cfm_ltm_targ_addr;
+
+static int hf_cfm_ltr_pdu;
+static int hf_cfm_ltr_flags_UseFDBonly;
+static int hf_cfm_ltr_flags_FwdYes;
+static int hf_cfm_ltr_flags_TerminalMEP;
+static int hf_cfm_ltr_flags_Reserved;
+static int hf_cfm_ltr_relay_action;
+
+static int hf_cfm_rfm_pdu;
+static int hf_cfm_rfm_transaction_id;
+
+static int hf_cfm_sfm_pdu;
+static int hf_cfm_sfm_transaction_id;
+
+static int hf_cfm_gnm_pdu;
+static int hf_cfm_gnm_unknown_flags;
+static int hf_cfm_gnm_subopcode;
+
+static int hf_cfm_bnm_flags_Reserved;
+static int hf_cfm_bnm_flags_Period;
+static int hf_cfm_bnm_pdu;
+static int hf_cfm_bnm_nominal_bw;
+static int hf_cfm_bnm_current_bw;
+static int hf_cfm_bnm_port_id;
+
+static int hf_cfm_ais_pdu;
+static int hf_cfm_ais_flags_Reserved;
+static int hf_cfm_ais_flags_Period;
+
+static int hf_cfm_lck_pdu;
+static int hf_cfm_lck_flags_Reserved;
+static int hf_cfm_lck_flags_Period;
+
+static int hf_cfm_tst_pdu;
+static int hf_cfm_tst_sequence_num;
+
+static int hf_cfm_aps_pdu;
+static int hf_cfm_aps_req_st;
+static int hf_cfm_aps_protection_type_A;
+static int hf_cfm_aps_protection_type_B;
+static int hf_cfm_aps_protection_type_D;
+static int hf_cfm_aps_protection_type_R;
+static int hf_cfm_aps_requested_signal;
+static int hf_cfm_aps_bridged_signal;
+static int hf_cfm_aps_bridge_type;
+
+static int hf_cfm_raps_pdu;
+static int hf_cfm_raps_req_st;
+static int hf_cfm_raps_event_subcode;
+static int hf_cfm_raps_subcode_reserved;
+static int hf_cfm_raps_status;
+static int hf_cfm_raps_status_rb;
+static int hf_cfm_raps_status_dnf;
+static int hf_cfm_raps_status_bpr;
+static int hf_cfm_raps_status_reserved_v1;
+static int hf_cfm_raps_status_reserved_v2;
+static int hf_cfm_raps_node_id;
+static int hf_cfm_raps_reserved;
+
+static int hf_cfm_mcc_pdu;
+static int hf_cfm_mcc_oui;
+static int hf_cfm_mcc_subopcode;
+static int hf_cfm_mcc_data;
+
+static int hf_cfm_lmm_pdu;
+static int hf_cfm_lmm_lmr_flags_Reserved;
+static int hf_cfm_lmm_lmr_flags_Type;
+static int hf_cfm_lmm_lmr_TxFCf;
+static int hf_cfm_lmm_lmr_RxFCf;
+static int hf_cfm_lmm_lmr_TxFCb;
+
+static int hf_cfm_lmr_pdu;
+
+static int hf_cfm_odm_pdu;
+static int hf_cfm_odm_dmm_dmr_flags_Reserved;
+static int hf_cfm_odm_dmm_dmr_flags_Type;
+static int hf_cfm_odm_dmm_dmr_TxTimestampf;
+static int hf_cfm_odm_dmm_dmr_RxTimestampf;
+
+static int hf_cfm_dmm_pdu;
+static int hf_cfm_dmm_dmr_TxTimestampb;
+static int hf_cfm_dmm_dmr_RxTimestampb;
+
+static int hf_cfm_dmr_pdu;
+
+static int hf_cfm_exm_pdu;
+static int hf_cfm_exm_oui;
+static int hf_cfm_exm_subopcode;
+static int hf_cfm_exm_data;
+
+static int hf_cfm_exr_pdu;
+static int hf_cfm_exr_oui;
+static int hf_cfm_exr_subopcode;
+static int hf_cfm_exr_data;
+
+static int hf_cfm_vsm_pdu;
+static int hf_cfm_vsm_oui;
+static int hf_cfm_vsm_subopcode;
+static int hf_cfm_vsm_data;
+
+static int hf_cfm_vsr_pdu;
+static int hf_cfm_vsr_oui;
+static int hf_cfm_vsr_subopcode;
+static int hf_cfm_vsr_data;
+
+static int hf_cfm_csf_pdu;
+static int hf_cfm_csf_flags_Reserved;
+static int hf_cfm_csf_flags_Type;
+static int hf_cfm_csf_flags_Period;
+
+static int hf_cfm_osl_pdu;
+static int hf_cfm_osl_src_mep;
+static int hf_cfm_osl_reserved;
+static int hf_cfm_osl_testid;
+static int hf_cfm_osl_txfcf;
+
+static int hf_cfm_slm_pdu;
+static int hf_cfm_slm_slr_src_mep;
+static int hf_cfm_slm_reserved;
+static int hf_cfm_slm_slr_testid;
+static int hf_cfm_slm_slr_txfcf;
+
+static int hf_cfm_slr_pdu;
+static int hf_cfm_slr_rsp_mep;
+static int hf_cfm_slr_txfcb;
+
+static int hf_cfm_unknown_pdu;
+static int hf_cfm_unknown_flags;
+static int hf_cfm_unknown_data;
+
+static int hf_cfm_all_tlvs;
+static int hf_cfm_tlv_type;
+static int hf_cfm_tlv_length;
+
+static int hf_tlv_chassis_id_length;
+static int hf_tlv_chassis_id_subtype;
+static int hf_tlv_chassis_id_chassis_component;
+static int hf_tlv_chassis_id_interface_alias;
+static int hf_tlv_chassis_id_port_component;
+static int hf_tlv_chassis_id_mac_address;
+static int hf_tlv_chassis_id_network_address_family;
+static int hf_tlv_chassis_id_network_address_ipv4;
+static int hf_tlv_chassis_id_network_address_ipv6;
+static int hf_tlv_chassis_id_network_address_unknown;
+static int hf_tlv_chassis_id_interface_name;
+static int hf_tlv_chassis_id_locally_assigned;
+static int hf_tlv_chassis_id_unknown;
+static int hf_tlv_ma_domain_length;
+static int hf_tlv_ma_domain;
+static int hf_tlv_management_addr_length;
+static int hf_tlv_management_addr_ipv4;
+static int hf_tlv_management_addr_ipv6;
+static int hf_tlv_management_addr_eth;
+static int hf_tlv_management_addr_unknown;
+static int hf_tlv_port_status_value;
+static int hf_tlv_data_value;
+static int hf_tlv_interface_status_value;
+
+static int hf_tlv_reply_ingress_action;
+static int hf_tlv_reply_ingress_mac_address;
+static int hf_tlv_reply_ing_egr_portid_length;
+static int hf_tlv_reply_ing_egr_portid_subtype;
+static int hf_tlv_reply_ing_egr_portid_interface_alias;
+static int hf_tlv_reply_ing_egr_portid_port_component;
+static int hf_tlv_reply_ing_egr_portid_mac_address;
+static int hf_tlv_reply_ing_egr_portid_network_address_family;
+static int hf_tlv_reply_ing_egr_portid_network_address_ipv4;
+static int hf_tlv_reply_ing_egr_portid_network_address_ipv6;
+static int hf_tlv_reply_ing_egr_portid_network_address_unknown;
+static int hf_tlv_reply_ing_egr_portid_interface_name;
+static int hf_tlv_reply_ing_egr_portid_agent_circuit_id;
+static int hf_tlv_reply_ing_egr_portid_locally_assigned;
+static int hf_tlv_reply_ing_egr_portid_unknown;
+static int hf_tlv_reply_egress_action;
+static int hf_tlv_reply_egress_mac_address;
+
+static int hf_tlv_ltr_egress_last_id_mac;
+static int hf_tlv_ltr_egress_last_id_unique_identifier;
+static int hf_tlv_ltr_egress_next_id_mac;
+static int hf_tlv_ltr_egress_next_id_unique_identifier;
+static int hf_tlv_ltm_egress_id_mac;
+static int hf_tlv_ltm_egress_id_unique_identifier;
+
+static int hf_tlv_pbb_te_mip_mac_address;
+static int hf_tlv_pbb_te_reverse_vid;
+static int hf_tlv_pbb_te_reverse_mac;
+
+static int hf_tlv_org_spec_oui;
+static int hf_tlv_org_spec_subtype;
+static int hf_tlv_org_spec_value;
+static int hf_tlv_tst_test_pattern_type;
+static int hf_tlv_tst_test_pattern;
+static int hf_tlv_tst_CRC32;
+
+static int hf_tlv_tgt_rpl_mep_mip_id_subtype;
+static int hf_tlv_tgt_rpl_padding;
+static int hf_tlv_tgt_rpl_mep_id;
+static int hf_tlv_tgt_rpl_mip_id_icc;
+static int hf_tlv_tgt_rpl_mip_id_node_id;
+static int hf_tlv_tgt_rpl_mip_id_if_num;
+static int hf_tlv_tgt_rpl_mip_id_cc;
+
+static int hf_tlv_req_mep_id_lb;
+static int hf_tlv_req_mep_id_reserved;
+
+static int hf_tlv_tst_id_test_id;
+
+static int hf_tlv_unknown_data;
+
+static gint ett_cfm;
+static gint ett_cfm_pdu;
+static gint ett_cfm_flags;
+static gint ett_cfm_maid;
+static gint ett_cfm_ccm_itu;
+static gint ett_cfm_all_tlvs;
+static gint ett_cfm_tlv;
+static gint ett_cfm_raps_status;
+
+static expert_field ei_tlv_tst_id_length;
 
 static dissector_handle_t cfm_handle;
 
diff --git a/epan/dissectors/packet-cgmp.c b/epan/dissectors/packet-cgmp.c
index cb8dbab5ab..c4d657d8ba 100644
--- a/epan/dissectors/packet-cgmp.c
+++ b/epan/dissectors/packet-cgmp.c
@@ -25,15 +25,15 @@ void proto_reg_handoff_cgmp(void);
 
 static dissector_handle_t cgmp_handle;
 
-static int proto_cgmp = -1;
-static int hf_cgmp_version = -1;
-static int hf_cgmp_type = -1;
-static int hf_cgmp_reserved = -1;
-static int hf_cgmp_count = -1;
-static int hf_cgmp_gda = -1;
-static int hf_cgmp_usa = -1;
-
-static gint ett_cgmp = -1;
+static int proto_cgmp;
+static int hf_cgmp_version;
+static int hf_cgmp_type;
+static int hf_cgmp_reserved;
+static int hf_cgmp_count;
+static int hf_cgmp_gda;
+static int hf_cgmp_usa;
+
+static gint ett_cgmp;
 
 static const value_string type_vals[] = {
 	{ 0, "Join" },
diff --git a/epan/dissectors/packet-chargen.c b/epan/dissectors/packet-chargen.c
index 71e3d3d7a6..db664fa4fa 100644
--- a/epan/dissectors/packet-chargen.c
+++ b/epan/dissectors/packet-chargen.c
@@ -23,11 +23,11 @@ void proto_reg_handoff_chargen(void);
 
 static dissector_handle_t chargen_handle;
 
-static int proto_chargen = -1;
+static int proto_chargen;
 
-static int hf_chargen_data = -1;
+static int hf_chargen_data;
 
-static gint ett_chargen = -1;
+static gint ett_chargen;
 
 /* dissect_chargen - dissects chargen packet data
  * tvb - tvbuff for packet data (IN)
diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c
index 41c7870764..8ea4191ab1 100644
--- a/epan/dissectors/packet-chdlc.c
+++ b/epan/dissectors/packet-chdlc.c
@@ -36,24 +36,24 @@ void proto_reg_handoff_chdlc(void);
 void proto_register_slarp(void);
 void proto_reg_handoff_slarp(void);
 
-static int proto_chdlc = -1;
-static int hf_chdlc_addr = -1;
-static int hf_chdlc_control = -1;
-static int hf_chdlc_proto = -1;
-static int hf_chdlc_clns_padding = -1;
-
-static gint ett_chdlc = -1;
-
-static int proto_slarp = -1;
-static int hf_slarp_ptype = -1;
-static int hf_slarp_address = -1;
-static int hf_slarp_netmask = -1;
-static int hf_slarp_mysequence = -1;
-static int hf_slarp_yoursequence = -1;
-static int hf_slarp_reliability = -1;
-
-static expert_field ei_slarp_reliability = EI_INIT;
-static gint ett_slarp = -1;
+static int proto_chdlc;
+static int hf_chdlc_addr;
+static int hf_chdlc_control;
+static int hf_chdlc_proto;
+static int hf_chdlc_clns_padding;
+
+static gint ett_chdlc;
+
+static int proto_slarp;
+static int hf_slarp_ptype;
+static int hf_slarp_address;
+static int hf_slarp_netmask;
+static int hf_slarp_mysequence;
+static int hf_slarp_yoursequence;
+static int hf_slarp_reliability;
+
+static expert_field ei_slarp_reliability;
+static gint ett_slarp;
 
 /*
  * Protocol types for the Cisco HDLC format.
diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c
index e8944a47c6..17be0ddb9c 100644
--- a/epan/dissectors/packet-cigi.c
+++ b/epan/dissectors/packet-cigi.c
@@ -134,20 +134,20 @@ static gint cigi3_3_add_short_symbol_control(tvbuff_t*, proto_tree*, gint);
 static dissector_handle_t cigi_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_cigi = -1;
+static int proto_cigi;
 
 /* All CIGI Versions */
-static int hf_cigi_src_port = -1;
-static int hf_cigi_dest_port = -1;
-static int hf_cigi_port = -1;
-static int hf_cigi_data = -1;
-static int hf_cigi_packet_id = -1;
-static int hf_cigi_packet_size = -1;
-static int hf_cigi_version = -1;
+static int hf_cigi_src_port;
+static int hf_cigi_dest_port;
+static int hf_cigi_port;
+static int hf_cigi_data;
+static int hf_cigi_packet_id;
+static int hf_cigi_packet_size;
+static int hf_cigi_version;
 
-static int hf_cigi_frame_size = -1;
+static int hf_cigi_frame_size;
 
-static int hf_cigi_unknown = -1;
+static int hf_cigi_unknown;
 
 
 static const true_false_string attach_detach_tfs = {
@@ -178,7 +178,7 @@ static const true_false_string visible_occulted_tfs = {
 /*** Fields for CIGI2 ***/
 
 /* CIGI2 Packet ID */
-static int hf_cigi2_packet_id = -1;
+static int hf_cigi2_packet_id;
 #define CIGI2_PACKET_ID_IG_CONTROL                               1
 #define CIGI2_PACKET_ID_ENTITY_CONTROL                           2
 #define CIGI2_PACKET_ID_COMPONENT_CONTROL                        3
@@ -260,13 +260,13 @@ static value_string_ext cigi2_packet_id_vals_ext = VALUE_STRING_EXT_INIT(cigi2_p
 
 /* CIGI2 IG Control */
 #define CIGI2_PACKET_SIZE_IG_CONTROL 16
-static int hf_cigi2_ig_control = -1;
-static int hf_cigi2_ig_control_db_number = -1;
-static int hf_cigi2_ig_control_ig_mode = -1;
-static int hf_cigi2_ig_control_tracking_enable = -1;
-static int hf_cigi2_ig_control_boresight = -1;
-static int hf_cigi2_ig_control_frame_ctr = -1;
-static int hf_cigi2_ig_control_time_tag = -1;
+static int hf_cigi2_ig_control;
+static int hf_cigi2_ig_control_db_number;
+static int hf_cigi2_ig_control_ig_mode;
+static int hf_cigi2_ig_control_tracking_enable;
+static int hf_cigi2_ig_control_boresight;
+static int hf_cigi2_ig_control_frame_ctr;
+static int hf_cigi2_ig_control_time_tag;
 
 static const value_string cigi2_ig_control_ig_mode_vals[] = {
     {0, "Standby/Reset"},
@@ -277,22 +277,22 @@ static const value_string cigi2_ig_control_ig_mode_vals[] = {
 
 /* CIGI2 Entity Control */
 #define CIGI2_PACKET_SIZE_ENTITY_CONTROL 56
-static int hf_cigi2_entity_control = -1;
-static int hf_cigi2_entity_control_entity_id = -1;
-static int hf_cigi2_entity_control_entity_state = -1;
-static int hf_cigi2_entity_control_attach_state = -1;
-static int hf_cigi2_entity_control_collision_detect = -1;
-static int hf_cigi2_entity_control_effect_state = -1;
-static int hf_cigi2_entity_control_type = -1;
-static int hf_cigi2_entity_control_parent_id = -1;
-static int hf_cigi2_entity_control_opacity = -1;
-static int hf_cigi2_entity_control_internal_temp = -1;
-static int hf_cigi2_entity_control_roll = -1;
-static int hf_cigi2_entity_control_pitch = -1;
-static int hf_cigi2_entity_control_heading = -1;
-static int hf_cigi2_entity_control_alt = -1;
-static int hf_cigi2_entity_control_lat = -1;
-static int hf_cigi2_entity_control_lon = -1;
+static int hf_cigi2_entity_control;
+static int hf_cigi2_entity_control_entity_id;
+static int hf_cigi2_entity_control_entity_state;
+static int hf_cigi2_entity_control_attach_state;
+static int hf_cigi2_entity_control_collision_detect;
+static int hf_cigi2_entity_control_effect_state;
+static int hf_cigi2_entity_control_type;
+static int hf_cigi2_entity_control_parent_id;
+static int hf_cigi2_entity_control_opacity;
+static int hf_cigi2_entity_control_internal_temp;
+static int hf_cigi2_entity_control_roll;
+static int hf_cigi2_entity_control_pitch;
+static int hf_cigi2_entity_control_heading;
+static int hf_cigi2_entity_control_alt;
+static int hf_cigi2_entity_control_lat;
+static int hf_cigi2_entity_control_lon;
 
 static const value_string cigi2_entity_control_entity_state_vals[] = {
     {0, "Load/Hide"},
@@ -310,13 +310,13 @@ static const value_string cigi2_entity_control_effect_state_vals[] = {
 
 /* CIGI2 Component Control */
 #define CIGI2_PACKET_SIZE_COMPONENT_CONTROL 20
-static int hf_cigi2_component_control = -1;
-static int hf_cigi2_component_control_instance_id = -1;
-static int hf_cigi2_component_control_component_class = -1;
-static int hf_cigi2_component_control_component_id = -1;
-static int hf_cigi2_component_control_component_state = -1;
-static int hf_cigi2_component_control_component_val1 = -1;
-static int hf_cigi2_component_control_component_val2 = -1;
+static int hf_cigi2_component_control;
+static int hf_cigi2_component_control_instance_id;
+static int hf_cigi2_component_control_component_class;
+static int hf_cigi2_component_control_component_id;
+static int hf_cigi2_component_control_component_state;
+static int hf_cigi2_component_control_component_val1;
+static int hf_cigi2_component_control_component_val2;
 
 static const value_string cigi2_component_control_component_class_vals[] = {
     {0, "Entity"},
@@ -330,69 +330,69 @@ static const value_string cigi2_component_control_component_class_vals[] = {
 
 /* CIGI2 Articulated Parts Control */
 #define CIGI2_PACKET_SIZE_ARTICULATED_PARTS_CONTROL 32
-static int hf_cigi2_articulated_parts_control = -1;
-static int hf_cigi2_articulated_parts_control_entity_id = -1;
-static int hf_cigi2_articulated_parts_control_part_id = -1;
-static int hf_cigi2_articulated_parts_control_part_state = -1;
-static int hf_cigi2_articulated_parts_control_xoff_enable = -1;
-static int hf_cigi2_articulated_parts_control_yoff_enable = -1;
-static int hf_cigi2_articulated_parts_control_zoff_enable = -1;
-static int hf_cigi2_articulated_parts_control_roll_enable = -1;
-static int hf_cigi2_articulated_parts_control_pitch_enable = -1;
-static int hf_cigi2_articulated_parts_control_yaw_enable = -1;
-static int hf_cigi2_articulated_parts_control_x_offset = -1;
-static int hf_cigi2_articulated_parts_control_y_offset = -1;
-static int hf_cigi2_articulated_parts_control_z_offset = -1;
-static int hf_cigi2_articulated_parts_control_roll = -1;
-static int hf_cigi2_articulated_parts_control_pitch = -1;
-static int hf_cigi2_articulated_parts_control_yaw = -1;
+static int hf_cigi2_articulated_parts_control;
+static int hf_cigi2_articulated_parts_control_entity_id;
+static int hf_cigi2_articulated_parts_control_part_id;
+static int hf_cigi2_articulated_parts_control_part_state;
+static int hf_cigi2_articulated_parts_control_xoff_enable;
+static int hf_cigi2_articulated_parts_control_yoff_enable;
+static int hf_cigi2_articulated_parts_control_zoff_enable;
+static int hf_cigi2_articulated_parts_control_roll_enable;
+static int hf_cigi2_articulated_parts_control_pitch_enable;
+static int hf_cigi2_articulated_parts_control_yaw_enable;
+static int hf_cigi2_articulated_parts_control_x_offset;
+static int hf_cigi2_articulated_parts_control_y_offset;
+static int hf_cigi2_articulated_parts_control_z_offset;
+static int hf_cigi2_articulated_parts_control_roll;
+static int hf_cigi2_articulated_parts_control_pitch;
+static int hf_cigi2_articulated_parts_control_yaw;
 
 /* CIGI2 Rate Control */
 #define CIGI2_PACKET_SIZE_RATE_CONTROL 32
-static int hf_cigi2_rate_control = -1;
-static int hf_cigi2_rate_control_entity_id = -1;
-static int hf_cigi2_rate_control_part_id = -1;
-static int hf_cigi2_rate_control_x_rate = -1;
-static int hf_cigi2_rate_control_y_rate = -1;
-static int hf_cigi2_rate_control_z_rate = -1;
-static int hf_cigi2_rate_control_roll_rate = -1;
-static int hf_cigi2_rate_control_pitch_rate = -1;
-static int hf_cigi2_rate_control_yaw_rate = -1;
+static int hf_cigi2_rate_control;
+static int hf_cigi2_rate_control_entity_id;
+static int hf_cigi2_rate_control_part_id;
+static int hf_cigi2_rate_control_x_rate;
+static int hf_cigi2_rate_control_y_rate;
+static int hf_cigi2_rate_control_z_rate;
+static int hf_cigi2_rate_control_roll_rate;
+static int hf_cigi2_rate_control_pitch_rate;
+static int hf_cigi2_rate_control_yaw_rate;
 
 /* CIGI2 Environmental Control */
 #define CIGI2_PACKET_SIZE_ENVIRONMENT_CONTROL 36
-static int hf_cigi2_environment_control = -1;
-static int hf_cigi2_environment_control_hour = -1;
-static int hf_cigi2_environment_control_minute = -1;
-static int hf_cigi2_environment_control_ephemeris_enable = -1;
-static int hf_cigi2_environment_control_humidity = -1;
-static int hf_cigi2_environment_control_modtran_enable = -1;
-static int hf_cigi2_environment_control_date = -1;
-static int hf_cigi2_environment_control_air_temp = -1;
-static int hf_cigi2_environment_control_global_visibility = -1;
-static int hf_cigi2_environment_control_wind_speed = -1;
-static int hf_cigi2_environment_control_wind_direction = -1;
-static int hf_cigi2_environment_control_pressure = -1;
-static int hf_cigi2_environment_control_aerosol = -1;
+static int hf_cigi2_environment_control;
+static int hf_cigi2_environment_control_hour;
+static int hf_cigi2_environment_control_minute;
+static int hf_cigi2_environment_control_ephemeris_enable;
+static int hf_cigi2_environment_control_humidity;
+static int hf_cigi2_environment_control_modtran_enable;
+static int hf_cigi2_environment_control_date;
+static int hf_cigi2_environment_control_air_temp;
+static int hf_cigi2_environment_control_global_visibility;
+static int hf_cigi2_environment_control_wind_speed;
+static int hf_cigi2_environment_control_wind_direction;
+static int hf_cigi2_environment_control_pressure;
+static int hf_cigi2_environment_control_aerosol;
 
 /* CIGI2 Weather Control */
 #define CIGI2_PACKET_SIZE_WEATHER_CONTROL 44
-static int hf_cigi2_weather_control = -1;
-static int hf_cigi2_weather_control_entity_id = -1;
-static int hf_cigi2_weather_control_weather_enable = -1;
-static int hf_cigi2_weather_control_scud_enable = -1;
-static int hf_cigi2_weather_control_random_winds = -1;
-static int hf_cigi2_weather_control_severity = -1;
-static int hf_cigi2_weather_control_phenomenon_type = -1;
-static int hf_cigi2_weather_control_air_temp = -1;
-static int hf_cigi2_weather_control_opacity = -1;
-static int hf_cigi2_weather_control_scud_frequency = -1;
-static int hf_cigi2_weather_control_coverage = -1;
-static int hf_cigi2_weather_control_elevation = -1;
-static int hf_cigi2_weather_control_thickness = -1;
-static int hf_cigi2_weather_control_transition_band = -1;
-static int hf_cigi2_weather_control_wind_speed = -1;
-static int hf_cigi2_weather_control_wind_direction = -1;
+static int hf_cigi2_weather_control;
+static int hf_cigi2_weather_control_entity_id;
+static int hf_cigi2_weather_control_weather_enable;
+static int hf_cigi2_weather_control_scud_enable;
+static int hf_cigi2_weather_control_random_winds;
+static int hf_cigi2_weather_control_severity;
+static int hf_cigi2_weather_control_phenomenon_type;
+static int hf_cigi2_weather_control_air_temp;
+static int hf_cigi2_weather_control_opacity;
+static int hf_cigi2_weather_control_scud_frequency;
+static int hf_cigi2_weather_control_coverage;
+static int hf_cigi2_weather_control_elevation;
+static int hf_cigi2_weather_control_thickness;
+static int hf_cigi2_weather_control_transition_band;
+static int hf_cigi2_weather_control_wind_speed;
+static int hf_cigi2_weather_control_wind_direction;
 
 static const value_string cigi2_weather_control_phenomenon_type_vals[] = {
     {0, "Use Entity ID"},
@@ -407,38 +407,38 @@ static const value_string cigi2_weather_control_phenomenon_type_vals[] = {
 
 /* CIGI2 View Control */
 #define CIGI2_PACKET_SIZE_VIEW_CONTROL 32
-static int hf_cigi2_view_control = -1;
-static int hf_cigi2_view_control_entity_id = -1;
-static int hf_cigi2_view_control_view_id = -1;
-static int hf_cigi2_view_control_view_group = -1;
-static int hf_cigi2_view_control_xoff_enable = -1;
-static int hf_cigi2_view_control_yoff_enable = -1;
-static int hf_cigi2_view_control_zoff_enable = -1;
-static int hf_cigi2_view_control_roll_enable = -1;
-static int hf_cigi2_view_control_pitch_enable = -1;
-static int hf_cigi2_view_control_yaw_enable = -1;
-static int hf_cigi2_view_control_x_offset = -1;
-static int hf_cigi2_view_control_y_offset = -1;
-static int hf_cigi2_view_control_z_offset = -1;
-static int hf_cigi2_view_control_roll = -1;
-static int hf_cigi2_view_control_pitch = -1;
-static int hf_cigi2_view_control_yaw = -1;
+static int hf_cigi2_view_control;
+static int hf_cigi2_view_control_entity_id;
+static int hf_cigi2_view_control_view_id;
+static int hf_cigi2_view_control_view_group;
+static int hf_cigi2_view_control_xoff_enable;
+static int hf_cigi2_view_control_yoff_enable;
+static int hf_cigi2_view_control_zoff_enable;
+static int hf_cigi2_view_control_roll_enable;
+static int hf_cigi2_view_control_pitch_enable;
+static int hf_cigi2_view_control_yaw_enable;
+static int hf_cigi2_view_control_x_offset;
+static int hf_cigi2_view_control_y_offset;
+static int hf_cigi2_view_control_z_offset;
+static int hf_cigi2_view_control_roll;
+static int hf_cigi2_view_control_pitch;
+static int hf_cigi2_view_control_yaw;
 
 /* CIGI2 Sensor Control */
 #define CIGI2_PACKET_SIZE_SENSOR_CONTROL 24
-static int hf_cigi2_sensor_control = -1;
-static int hf_cigi2_sensor_control_view_id = -1;
-static int hf_cigi2_sensor_control_sensor_enable = -1;
-static int hf_cigi2_sensor_control_polarity = -1;
-static int hf_cigi2_sensor_control_line_dropout = -1;
-static int hf_cigi2_sensor_control_sensor_id = -1;
-static int hf_cigi2_sensor_control_track_mode = -1;
-static int hf_cigi2_sensor_control_auto_gain = -1;
-static int hf_cigi2_sensor_control_track_polarity = -1;
-static int hf_cigi2_sensor_control_gain = -1;
-static int hf_cigi2_sensor_control_level = -1;
-static int hf_cigi2_sensor_control_ac_coupling = -1;
-static int hf_cigi2_sensor_control_noise = -1;
+static int hf_cigi2_sensor_control;
+static int hf_cigi2_sensor_control_view_id;
+static int hf_cigi2_sensor_control_sensor_enable;
+static int hf_cigi2_sensor_control_polarity;
+static int hf_cigi2_sensor_control_line_dropout;
+static int hf_cigi2_sensor_control_sensor_id;
+static int hf_cigi2_sensor_control_track_mode;
+static int hf_cigi2_sensor_control_auto_gain;
+static int hf_cigi2_sensor_control_track_polarity;
+static int hf_cigi2_sensor_control_gain;
+static int hf_cigi2_sensor_control_level;
+static int hf_cigi2_sensor_control_ac_coupling;
+static int hf_cigi2_sensor_control_noise;
 
 static const true_false_string cigi2_sensor_control_polarity_tfs = {
     "Black",
@@ -456,30 +456,30 @@ static const value_string cigi2_sensor_control_track_mode_vals[] = {
 
 /* CIGI2 Trajectory Definition */
 #define CIGI2_PACKET_SIZE_TRAJECTORY_DEFINITION 16
-static int hf_cigi2_trajectory_definition = -1;
-static int hf_cigi2_trajectory_definition_entity_id = -1;
-static int hf_cigi2_trajectory_definition_acceleration = -1;
-static int hf_cigi2_trajectory_definition_retardation = -1;
-static int hf_cigi2_trajectory_definition_terminal_velocity = -1;
+static int hf_cigi2_trajectory_definition;
+static int hf_cigi2_trajectory_definition_entity_id;
+static int hf_cigi2_trajectory_definition_acceleration;
+static int hf_cigi2_trajectory_definition_retardation;
+static int hf_cigi2_trajectory_definition_terminal_velocity;
 
 /* CIGI2 Special Effect Definition */
 #define CIGI2_PACKET_SIZE_SPECIAL_EFFECT_DEFINITION 32
-static int hf_cigi2_special_effect_definition = -1;
-static int hf_cigi2_special_effect_definition_entity_id = -1;
-static int hf_cigi2_special_effect_definition_seq_direction = -1;
-static int hf_cigi2_special_effect_definition_color_enable = -1;
-static int hf_cigi2_special_effect_definition_red = -1;
-static int hf_cigi2_special_effect_definition_green = -1;
-static int hf_cigi2_special_effect_definition_blue = -1;
-static int hf_cigi2_special_effect_definition_x_scale = -1;
-static int hf_cigi2_special_effect_definition_y_scale = -1;
-static int hf_cigi2_special_effect_definition_z_scale = -1;
-static int hf_cigi2_special_effect_definition_time_scale = -1;
-static int hf_cigi2_special_effect_definition_spare = -1;
-static int hf_cigi2_special_effect_definition_effect_count = -1;
-static int hf_cigi2_special_effect_definition_separation = -1;
-static int hf_cigi2_special_effect_definition_burst_interval = -1;
-static int hf_cigi2_special_effect_definition_duration = -1;
+static int hf_cigi2_special_effect_definition;
+static int hf_cigi2_special_effect_definition_entity_id;
+static int hf_cigi2_special_effect_definition_seq_direction;
+static int hf_cigi2_special_effect_definition_color_enable;
+static int hf_cigi2_special_effect_definition_red;
+static int hf_cigi2_special_effect_definition_green;
+static int hf_cigi2_special_effect_definition_blue;
+static int hf_cigi2_special_effect_definition_x_scale;
+static int hf_cigi2_special_effect_definition_y_scale;
+static int hf_cigi2_special_effect_definition_z_scale;
+static int hf_cigi2_special_effect_definition_time_scale;
+static int hf_cigi2_special_effect_definition_spare;
+static int hf_cigi2_special_effect_definition_effect_count;
+static int hf_cigi2_special_effect_definition_separation;
+static int hf_cigi2_special_effect_definition_burst_interval;
+static int hf_cigi2_special_effect_definition_duration;
 
 static const true_false_string cigi2_special_effect_definition_seq_direction_tfs = {
     "Backward",
@@ -488,25 +488,25 @@ static const true_false_string cigi2_special_effect_definition_seq_direction_tfs
 
 /* CIGI2 View Definition */
 #define CIGI2_PACKET_SIZE_VIEW_DEFINITION 32
-static int hf_cigi2_view_definition = -1;
-static int hf_cigi2_view_definition_view_id = -1;
-static int hf_cigi2_view_definition_view_group = -1;
-static int hf_cigi2_view_definition_view_type = -1;
-static int hf_cigi2_view_definition_pixel_rep = -1;
-static int hf_cigi2_view_definition_mirror = -1;
-static int hf_cigi2_view_definition_tracker_assign = -1;
-static int hf_cigi2_view_definition_near_enable = -1;
-static int hf_cigi2_view_definition_far_enable = -1;
-static int hf_cigi2_view_definition_left_enable = -1;
-static int hf_cigi2_view_definition_right_enable = -1;
-static int hf_cigi2_view_definition_top_enable = -1;
-static int hf_cigi2_view_definition_bottom_enable = -1;
-static int hf_cigi2_view_definition_fov_near = -1;
-static int hf_cigi2_view_definition_fov_far = -1;
-static int hf_cigi2_view_definition_fov_left = -1;
-static int hf_cigi2_view_definition_fov_right = -1;
-static int hf_cigi2_view_definition_fov_top = -1;
-static int hf_cigi2_view_definition_fov_bottom = -1;
+static int hf_cigi2_view_definition;
+static int hf_cigi2_view_definition_view_id;
+static int hf_cigi2_view_definition_view_group;
+static int hf_cigi2_view_definition_view_type;
+static int hf_cigi2_view_definition_pixel_rep;
+static int hf_cigi2_view_definition_mirror;
+static int hf_cigi2_view_definition_tracker_assign;
+static int hf_cigi2_view_definition_near_enable;
+static int hf_cigi2_view_definition_far_enable;
+static int hf_cigi2_view_definition_left_enable;
+static int hf_cigi2_view_definition_right_enable;
+static int hf_cigi2_view_definition_top_enable;
+static int hf_cigi2_view_definition_bottom_enable;
+static int hf_cigi2_view_definition_fov_near;
+static int hf_cigi2_view_definition_fov_far;
+static int hf_cigi2_view_definition_fov_left;
+static int hf_cigi2_view_definition_fov_right;
+static int hf_cigi2_view_definition_fov_top;
+static int hf_cigi2_view_definition_fov_bottom;
 
 static const value_string cigi2_view_definition_pixel_rep_vals[] = {
     {0, "No Replicate"},
@@ -529,77 +529,77 @@ static const value_string cigi2_view_definition_mirror_vals[] = {
 
 /* CIGI2 Collision Detection Segment Definition */
 #define CIGI2_PACKET_SIZE_COLLISION_DETECTION_SEGMENT_DEFINITION 24
-static int hf_cigi2_collision_detection_segment_definition = -1;
-static int hf_cigi2_collision_detection_segment_definition_entity_id = -1;
-static int hf_cigi2_collision_detection_segment_definition_segment_enable = -1;
-static int hf_cigi2_collision_detection_segment_definition_segment_id = -1;
-static int hf_cigi2_collision_detection_segment_definition_collision_mask = -1;
-static int hf_cigi2_collision_detection_segment_definition_x_start = -1;
-static int hf_cigi2_collision_detection_segment_definition_y_start = -1;
-static int hf_cigi2_collision_detection_segment_definition_z_start = -1;
-static int hf_cigi2_collision_detection_segment_definition_x_end = -1;
-static int hf_cigi2_collision_detection_segment_definition_y_end = -1;
-static int hf_cigi2_collision_detection_segment_definition_z_end = -1;
+static int hf_cigi2_collision_detection_segment_definition;
+static int hf_cigi2_collision_detection_segment_definition_entity_id;
+static int hf_cigi2_collision_detection_segment_definition_segment_enable;
+static int hf_cigi2_collision_detection_segment_definition_segment_id;
+static int hf_cigi2_collision_detection_segment_definition_collision_mask;
+static int hf_cigi2_collision_detection_segment_definition_x_start;
+static int hf_cigi2_collision_detection_segment_definition_y_start;
+static int hf_cigi2_collision_detection_segment_definition_z_start;
+static int hf_cigi2_collision_detection_segment_definition_x_end;
+static int hf_cigi2_collision_detection_segment_definition_y_end;
+static int hf_cigi2_collision_detection_segment_definition_z_end;
 
 /* CIGI2 Collision Detection Volume Definition */
 #define CIGI2_PACKET_SIZE_COLLISION_DETECTION_VOLUME_DEFINITION 20
-static int hf_cigi2_collision_detection_volume_definition = -1;
-static int hf_cigi2_collision_detection_volume_definition_entity_id = -1;
-static int hf_cigi2_collision_detection_volume_definition_volume_enable = -1;
-static int hf_cigi2_collision_detection_volume_definition_volume_id = -1;
-static int hf_cigi2_collision_detection_volume_definition_x_offset = -1;
-static int hf_cigi2_collision_detection_volume_definition_y_offset = -1;
-static int hf_cigi2_collision_detection_volume_definition_z_offset = -1;
-static int hf_cigi2_collision_detection_volume_definition_height = -1;
-static int hf_cigi2_collision_detection_volume_definition_width = -1;
-static int hf_cigi2_collision_detection_volume_definition_depth = -1;
+static int hf_cigi2_collision_detection_volume_definition;
+static int hf_cigi2_collision_detection_volume_definition_entity_id;
+static int hf_cigi2_collision_detection_volume_definition_volume_enable;
+static int hf_cigi2_collision_detection_volume_definition_volume_id;
+static int hf_cigi2_collision_detection_volume_definition_x_offset;
+static int hf_cigi2_collision_detection_volume_definition_y_offset;
+static int hf_cigi2_collision_detection_volume_definition_z_offset;
+static int hf_cigi2_collision_detection_volume_definition_height;
+static int hf_cigi2_collision_detection_volume_definition_width;
+static int hf_cigi2_collision_detection_volume_definition_depth;
 
 /* CIGI2 Height Above Terrain Request */
 #define CIGI2_PACKET_SIZE_HEIGHT_ABOVE_TERRAIN_REQUEST 32
-static int hf_cigi2_height_above_terrain_request = -1;
-static int hf_cigi2_height_above_terrain_request_hat_id = -1;
-static int hf_cigi2_height_above_terrain_request_alt = -1;
-static int hf_cigi2_height_above_terrain_request_lat = -1;
-static int hf_cigi2_height_above_terrain_request_lon = -1;
+static int hf_cigi2_height_above_terrain_request;
+static int hf_cigi2_height_above_terrain_request_hat_id;
+static int hf_cigi2_height_above_terrain_request_alt;
+static int hf_cigi2_height_above_terrain_request_lat;
+static int hf_cigi2_height_above_terrain_request_lon;
 
 /* CIGI2 Line of Sight Occult Request */
 #define CIGI2_PACKET_SIZE_LINE_OF_SIGHT_OCCULT_REQUEST 56
-static int hf_cigi2_line_of_sight_occult_request = -1;
-static int hf_cigi2_line_of_sight_occult_request_los_id = -1;
-static int hf_cigi2_line_of_sight_occult_request_source_alt = -1;
-static int hf_cigi2_line_of_sight_occult_request_source_lat = -1;
-static int hf_cigi2_line_of_sight_occult_request_source_lon = -1;
-static int hf_cigi2_line_of_sight_occult_request_dest_alt = -1;
-static int hf_cigi2_line_of_sight_occult_request_dest_lat = -1;
-static int hf_cigi2_line_of_sight_occult_request_dest_lon = -1;
+static int hf_cigi2_line_of_sight_occult_request;
+static int hf_cigi2_line_of_sight_occult_request_los_id;
+static int hf_cigi2_line_of_sight_occult_request_source_alt;
+static int hf_cigi2_line_of_sight_occult_request_source_lat;
+static int hf_cigi2_line_of_sight_occult_request_source_lon;
+static int hf_cigi2_line_of_sight_occult_request_dest_alt;
+static int hf_cigi2_line_of_sight_occult_request_dest_lat;
+static int hf_cigi2_line_of_sight_occult_request_dest_lon;
 
 /* CIGI2 Line of Sight Range Request */
 #define CIGI2_PACKET_SIZE_LINE_OF_SIGHT_RANGE_REQUEST 48
-static int hf_cigi2_line_of_sight_range_request = -1;
-static int hf_cigi2_line_of_sight_range_request_los_id = -1;
-static int hf_cigi2_line_of_sight_range_request_azimuth = -1;
-static int hf_cigi2_line_of_sight_range_request_elevation = -1;
-static int hf_cigi2_line_of_sight_range_request_min_range = -1;
-static int hf_cigi2_line_of_sight_range_request_max_range = -1;
-static int hf_cigi2_line_of_sight_range_request_source_alt = -1;
-static int hf_cigi2_line_of_sight_range_request_source_lat = -1;
-static int hf_cigi2_line_of_sight_range_request_source_lon = -1;
+static int hf_cigi2_line_of_sight_range_request;
+static int hf_cigi2_line_of_sight_range_request_los_id;
+static int hf_cigi2_line_of_sight_range_request_azimuth;
+static int hf_cigi2_line_of_sight_range_request_elevation;
+static int hf_cigi2_line_of_sight_range_request_min_range;
+static int hf_cigi2_line_of_sight_range_request_max_range;
+static int hf_cigi2_line_of_sight_range_request_source_alt;
+static int hf_cigi2_line_of_sight_range_request_source_lat;
+static int hf_cigi2_line_of_sight_range_request_source_lon;
 
 /* CIGI2 Height of Terrain Request */
 #define CIGI2_PACKET_SIZE_HEIGHT_OF_TERRAIN_REQUEST 24
-static int hf_cigi2_height_of_terrain_request = -1;
-static int hf_cigi2_height_of_terrain_request_hot_id = -1;
-static int hf_cigi2_height_of_terrain_request_lat = -1;
-static int hf_cigi2_height_of_terrain_request_lon = -1;
+static int hf_cigi2_height_of_terrain_request;
+static int hf_cigi2_height_of_terrain_request_hot_id;
+static int hf_cigi2_height_of_terrain_request_lat;
+static int hf_cigi2_height_of_terrain_request_lon;
 
 /* CIGI2 Start of Frame */
 #define CIGI2_PACKET_SIZE_START_OF_FRAME 16
-static int hf_cigi2_start_of_frame = -1;
-static int hf_cigi2_start_of_frame_db_number = -1;
-static int hf_cigi2_start_of_frame_ig_status_code = -1;
-static int hf_cigi2_start_of_frame_ig_mode = -1;
-static int hf_cigi2_start_of_frame_frame_ctr = -1;
-static int hf_cigi2_start_of_frame_time_tag = -1;
+static int hf_cigi2_start_of_frame;
+static int hf_cigi2_start_of_frame_db_number;
+static int hf_cigi2_start_of_frame_ig_status_code;
+static int hf_cigi2_start_of_frame_ig_mode;
+static int hf_cigi2_start_of_frame_frame_ctr;
+static int hf_cigi2_start_of_frame_time_tag;
 
 static const value_string cigi2_start_of_frame_ig_mode_vals[] = {
     {0, "Standby/Reset"},
@@ -611,35 +611,35 @@ static const value_string cigi2_start_of_frame_ig_mode_vals[] = {
 
 /* CIGI2 Height Above Terrain Response */
 #define CIGI2_PACKET_SIZE_HEIGHT_ABOVE_TERRAIN_RESPONSE 24
-static int hf_cigi2_height_above_terrain_response = -1;
-static int hf_cigi2_height_above_terrain_response_hat_id = -1;
-static int hf_cigi2_height_above_terrain_response_valid = -1;
-static int hf_cigi2_height_above_terrain_response_material_type = -1;
-static int hf_cigi2_height_above_terrain_response_alt = -1;
+static int hf_cigi2_height_above_terrain_response;
+static int hf_cigi2_height_above_terrain_response_hat_id;
+static int hf_cigi2_height_above_terrain_response_valid;
+static int hf_cigi2_height_above_terrain_response_material_type;
+static int hf_cigi2_height_above_terrain_response_alt;
 
 /* CIGI2 Line of Sight Response */
 #define CIGI2_PACKET_SIZE_LINE_OF_SIGHT_RESPONSE 40
-static int hf_cigi2_line_of_sight_response = -1;
-static int hf_cigi2_line_of_sight_response_los_id = -1;
-static int hf_cigi2_line_of_sight_response_valid = -1;
-static int hf_cigi2_line_of_sight_response_occult_response = -1;
-static int hf_cigi2_line_of_sight_response_material_type = -1;
-static int hf_cigi2_line_of_sight_response_range = -1;
-static int hf_cigi2_line_of_sight_response_alt = -1;
-static int hf_cigi2_line_of_sight_response_lat = -1;
-static int hf_cigi2_line_of_sight_response_lon = -1;
+static int hf_cigi2_line_of_sight_response;
+static int hf_cigi2_line_of_sight_response_los_id;
+static int hf_cigi2_line_of_sight_response_valid;
+static int hf_cigi2_line_of_sight_response_occult_response;
+static int hf_cigi2_line_of_sight_response_material_type;
+static int hf_cigi2_line_of_sight_response_range;
+static int hf_cigi2_line_of_sight_response_alt;
+static int hf_cigi2_line_of_sight_response_lat;
+static int hf_cigi2_line_of_sight_response_lon;
 
 /* CIGI2 Collision Detection Segment Response */
 #define CIGI2_PACKET_SIZE_COLLISION_DETECTION_SEGMENT_RESPONSE 24
-static int hf_cigi2_collision_detection_segment_response = -1;
-static int hf_cigi2_collision_detection_segment_response_entity_id = -1;
-static int hf_cigi2_collision_detection_segment_response_segment_id = -1;
-static int hf_cigi2_collision_detection_segment_response_contact = -1;
-static int hf_cigi2_collision_detection_segment_response_contacted_entity = -1;
-static int hf_cigi2_collision_detection_segment_response_material_type = -1;
-static int hf_cigi2_collision_detection_segment_response_collision_x = -1;
-static int hf_cigi2_collision_detection_segment_response_collision_y = -1;
-static int hf_cigi2_collision_detection_segment_response_collision_z = -1;
+static int hf_cigi2_collision_detection_segment_response;
+static int hf_cigi2_collision_detection_segment_response_entity_id;
+static int hf_cigi2_collision_detection_segment_response_segment_id;
+static int hf_cigi2_collision_detection_segment_response_contact;
+static int hf_cigi2_collision_detection_segment_response_contacted_entity;
+static int hf_cigi2_collision_detection_segment_response_material_type;
+static int hf_cigi2_collision_detection_segment_response_collision_x;
+static int hf_cigi2_collision_detection_segment_response_collision_y;
+static int hf_cigi2_collision_detection_segment_response_collision_z;
 
 static const true_false_string cigi2_collision_detection_segment_response_contact_tfs = {
     "Contact with a defined entity",
@@ -648,14 +648,14 @@ static const true_false_string cigi2_collision_detection_segment_response_contac
 
 /* CIGI2 Sensor Response */
 #define CIGI2_PACKET_SIZE_SENSOR_RESPONSE 12
-static int hf_cigi2_sensor_response = -1;
-static int hf_cigi2_sensor_response_view_id = -1;
-static int hf_cigi2_sensor_response_status = -1;
-static int hf_cigi2_sensor_response_sensor_id = -1;
-static int hf_cigi2_sensor_response_x_offset = -1;
-static int hf_cigi2_sensor_response_y_offset = -1;
-static int hf_cigi2_sensor_response_x_size = -1;
-static int hf_cigi2_sensor_response_y_size = -1;
+static int hf_cigi2_sensor_response;
+static int hf_cigi2_sensor_response_view_id;
+static int hf_cigi2_sensor_response_status;
+static int hf_cigi2_sensor_response_sensor_id;
+static int hf_cigi2_sensor_response_x_offset;
+static int hf_cigi2_sensor_response_y_offset;
+static int hf_cigi2_sensor_response_x_size;
+static int hf_cigi2_sensor_response_y_size;
 
 static const value_string cigi2_sensor_response_status_vals[] = {
     {0, "Searching for Target"},
@@ -667,19 +667,19 @@ static const value_string cigi2_sensor_response_status_vals[] = {
 
 /* CIGI2 Height of Terrain Response */
 #define CIGI2_PACKET_SIZE_HEIGHT_OF_TERRAIN_RESPONSE 24
-static int hf_cigi2_height_of_terrain_response = -1;
-static int hf_cigi2_height_of_terrain_response_hot_id = -1;
-static int hf_cigi2_height_of_terrain_response_valid = -1;
-static int hf_cigi2_height_of_terrain_response_material_type = -1;
-static int hf_cigi2_height_of_terrain_response_alt = -1;
+static int hf_cigi2_height_of_terrain_response;
+static int hf_cigi2_height_of_terrain_response_hot_id;
+static int hf_cigi2_height_of_terrain_response_valid;
+static int hf_cigi2_height_of_terrain_response_material_type;
+static int hf_cigi2_height_of_terrain_response_alt;
 
 /* CIGI2 Collision Detection Volume Response */
 #define CIGI2_PACKET_SIZE_COLLISION_DETECTION_VOLUME_RESPONSE 8
-static int hf_cigi2_collision_detection_volume_response = -1;
-static int hf_cigi2_collision_detection_volume_response_entity_id = -1;
-static int hf_cigi2_collision_detection_volume_response_volume_id = -1;
-static int hf_cigi2_collision_detection_volume_response_contact = -1;
-static int hf_cigi2_collision_detection_volume_response_contact_entity = -1;
+static int hf_cigi2_collision_detection_volume_response;
+static int hf_cigi2_collision_detection_volume_response_entity_id;
+static int hf_cigi2_collision_detection_volume_response_volume_id;
+static int hf_cigi2_collision_detection_volume_response_contact;
+static int hf_cigi2_collision_detection_volume_response_contact_entity;
 
 static const true_false_string cigi2_collision_detection_volume_response_contact_tfs = {
     "Contact with a defined entity",
@@ -687,17 +687,17 @@ static const true_false_string cigi2_collision_detection_volume_response_contact
 };
 
 /* CIGI2 Image Generator Message */
-static int hf_cigi2_image_generator_message = -1;
-static int hf_cigi2_image_generator_message_id = -1;
-static int hf_cigi2_image_generator_message_message = -1;
+static int hf_cigi2_image_generator_message;
+static int hf_cigi2_image_generator_message_id;
+static int hf_cigi2_image_generator_message_message;
 
 /* CIGI2 User Definable */
-static int hf_cigi2_user_definable = -1;
+static int hf_cigi2_user_definable;
 
 
 /*** Fields for CIGI3 ***/
 
-static int hf_cigi3_byte_swap = -1;
+static int hf_cigi3_byte_swap;
 
 #define CIGI3_BYTE_SWAP_BIG_ENDIAN    0x8000
 #define CIGI3_BYTE_SWAP_LITTLE_ENDIAN 0x0080
@@ -708,7 +708,7 @@ static const value_string cigi3_byte_swap_vals[] = {
 };
 
 /* CIGI3 Packet ID */
-static int hf_cigi3_packet_id = -1;
+static int hf_cigi3_packet_id;
 #define CIGI3_PACKET_ID_IG_CONTROL                                 1
 #define CIGI3_PACKET_ID_ENTITY_CONTROL                             2
 #define CIGI3_PACKET_ID_CONFORMAL_CLAMPED_ENTITY_CONTROL           3
@@ -877,12 +877,12 @@ static value_string_ext cigi3_packet_id_vals_ext = VALUE_STRING_EXT_INIT(cigi3_p
 
 /* CIGI3 IG Control */
 #define CIGI3_PACKET_SIZE_IG_CONTROL 16
-static int hf_cigi3_ig_control = -1;
-static int hf_cigi3_ig_control_db_number = -1;
-static int hf_cigi3_ig_control_ig_mode = -1;
-static int hf_cigi3_ig_control_timestamp_valid = -1;
-static int hf_cigi3_ig_control_frame_ctr = -1;
-static int hf_cigi3_ig_control_timestamp = -1;
+static int hf_cigi3_ig_control;
+static int hf_cigi3_ig_control_db_number;
+static int hf_cigi3_ig_control_ig_mode;
+static int hf_cigi3_ig_control_timestamp_valid;
+static int hf_cigi3_ig_control_frame_ctr;
+static int hf_cigi3_ig_control_timestamp;
 
 static const value_string cigi3_ig_control_ig_mode_vals[] = {
     {0, "Reset/Standby"},
@@ -893,14 +893,14 @@ static const value_string cigi3_ig_control_ig_mode_vals[] = {
 
 /* CIGI3_2 IG Control */
 #define CIGI3_2_PACKET_SIZE_IG_CONTROL 24
-static int hf_cigi3_2_ig_control = -1;
-static int hf_cigi3_2_ig_control_db_number = -1;
-static int hf_cigi3_2_ig_control_ig_mode = -1;
-static int hf_cigi3_2_ig_control_timestamp_valid = -1;
-static int hf_cigi3_2_ig_control_minor_version = -1;
-static int hf_cigi3_2_ig_control_host_frame_number = -1;
-static int hf_cigi3_2_ig_control_timestamp = -1;
-static int hf_cigi3_2_ig_control_last_ig_frame_number = -1;
+static int hf_cigi3_2_ig_control;
+static int hf_cigi3_2_ig_control_db_number;
+static int hf_cigi3_2_ig_control_ig_mode;
+static int hf_cigi3_2_ig_control_timestamp_valid;
+static int hf_cigi3_2_ig_control_minor_version;
+static int hf_cigi3_2_ig_control_host_frame_number;
+static int hf_cigi3_2_ig_control_timestamp;
+static int hf_cigi3_2_ig_control_last_ig_frame_number;
 
 static const value_string cigi3_2_ig_control_ig_mode_vals[] = {
     {0, "Reset/Standby"},
@@ -911,15 +911,15 @@ static const value_string cigi3_2_ig_control_ig_mode_vals[] = {
 
 /* CIGI3_3 IG Control */
 #define CIGI3_3_PACKET_SIZE_IG_CONTROL 24
-static int hf_cigi3_3_ig_control = -1;
-static int hf_cigi3_3_ig_control_db_number = -1;
-static int hf_cigi3_3_ig_control_ig_mode = -1;
-static int hf_cigi3_3_ig_control_timestamp_valid = -1;
-static int hf_cigi3_3_ig_control_extrapolation_enable = -1;
-static int hf_cigi3_3_ig_control_minor_version = -1;
-/* static int hf_cigi3_3_ig_control_host_frame_number = -1; */
-/* static int hf_cigi3_3_ig_control_timestamp = -1; */
-/* static int hf_cigi3_3_ig_control_last_ig_frame_number = -1; */
+static int hf_cigi3_3_ig_control;
+static int hf_cigi3_3_ig_control_db_number;
+static int hf_cigi3_3_ig_control_ig_mode;
+static int hf_cigi3_3_ig_control_timestamp_valid;
+static int hf_cigi3_3_ig_control_extrapolation_enable;
+static int hf_cigi3_3_ig_control_minor_version;
+/* static int hf_cigi3_3_ig_control_host_frame_number; */
+/* static int hf_cigi3_3_ig_control_timestamp; */
+/* static int hf_cigi3_3_ig_control_last_ig_frame_number; */
 
 static const value_string cigi3_3_ig_control_ig_mode_vals[] = {
     {0, "Reset/Standby"},
@@ -930,25 +930,25 @@ static const value_string cigi3_3_ig_control_ig_mode_vals[] = {
 
 /* CIGI3 Entity Control */
 #define CIGI3_PACKET_SIZE_ENTITY_CONTROL 48
-static int hf_cigi3_entity_control = -1;
-static int hf_cigi3_entity_control_entity_id = -1;
-static int hf_cigi3_entity_control_entity_state = -1;
-static int hf_cigi3_entity_control_attach_state = -1;
-static int hf_cigi3_entity_control_collision_detection_request = -1;
-static int hf_cigi3_entity_control_inherit_alpha = -1;
-static int hf_cigi3_entity_control_ground_ocean_clamp = -1;
-static int hf_cigi3_entity_control_animation_direction = -1;
-static int hf_cigi3_entity_control_animation_loop_mode = -1;
-static int hf_cigi3_entity_control_animation_state = -1;
-static int hf_cigi3_entity_control_alpha = -1;
-static int hf_cigi3_entity_control_entity_type = -1;
-static int hf_cigi3_entity_control_parent_id = -1;
-static int hf_cigi3_entity_control_roll = -1;
-static int hf_cigi3_entity_control_pitch = -1;
-static int hf_cigi3_entity_control_yaw = -1;
-static int hf_cigi3_entity_control_lat_xoff = -1;
-static int hf_cigi3_entity_control_lon_yoff = -1;
-static int hf_cigi3_entity_control_alt_zoff = -1;
+static int hf_cigi3_entity_control;
+static int hf_cigi3_entity_control_entity_id;
+static int hf_cigi3_entity_control_entity_state;
+static int hf_cigi3_entity_control_attach_state;
+static int hf_cigi3_entity_control_collision_detection_request;
+static int hf_cigi3_entity_control_inherit_alpha;
+static int hf_cigi3_entity_control_ground_ocean_clamp;
+static int hf_cigi3_entity_control_animation_direction;
+static int hf_cigi3_entity_control_animation_loop_mode;
+static int hf_cigi3_entity_control_animation_state;
+static int hf_cigi3_entity_control_alpha;
+static int hf_cigi3_entity_control_entity_type;
+static int hf_cigi3_entity_control_parent_id;
+static int hf_cigi3_entity_control_roll;
+static int hf_cigi3_entity_control_pitch;
+static int hf_cigi3_entity_control_yaw;
+static int hf_cigi3_entity_control_lat_xoff;
+static int hf_cigi3_entity_control_lon_yoff;
+static int hf_cigi3_entity_control_alt_zoff;
 
 static const value_string cigi3_entity_control_entity_state_vals[] = {
     {0, "Inactive/Standby"},
@@ -993,48 +993,48 @@ static const value_string cigi3_entity_control_animation_state_vals[] = {
 };
 
 /* CIGI3_3 Entity Control */
-/* static int hf_cigi3_3_entity_control = -1; */
-static int hf_cigi3_3_entity_control_entity_id = -1;
-static int hf_cigi3_3_entity_control_entity_state = -1;
-static int hf_cigi3_3_entity_control_attach_state = -1;
-static int hf_cigi3_3_entity_control_collision_detection_request = -1;
-static int hf_cigi3_3_entity_control_inherit_alpha = -1;
-static int hf_cigi3_3_entity_control_ground_ocean_clamp = -1;
-static int hf_cigi3_3_entity_control_animation_direction = -1;
-static int hf_cigi3_3_entity_control_animation_loop_mode = -1;
-static int hf_cigi3_3_entity_control_animation_state = -1;
-static int hf_cigi3_3_entity_control_extrapolation_enable = -1;
-static int hf_cigi3_3_entity_control_alpha = -1;
-static int hf_cigi3_3_entity_control_entity_type = -1;
-static int hf_cigi3_3_entity_control_parent_id = -1;
-static int hf_cigi3_3_entity_control_roll = -1;
-static int hf_cigi3_3_entity_control_pitch = -1;
-static int hf_cigi3_3_entity_control_yaw = -1;
-static int hf_cigi3_3_entity_control_lat_xoff = -1;
-static int hf_cigi3_3_entity_control_lon_yoff = -1;
-static int hf_cigi3_3_entity_control_alt_zoff = -1;
+/* static int hf_cigi3_3_entity_control; */
+static int hf_cigi3_3_entity_control_entity_id;
+static int hf_cigi3_3_entity_control_entity_state;
+static int hf_cigi3_3_entity_control_attach_state;
+static int hf_cigi3_3_entity_control_collision_detection_request;
+static int hf_cigi3_3_entity_control_inherit_alpha;
+static int hf_cigi3_3_entity_control_ground_ocean_clamp;
+static int hf_cigi3_3_entity_control_animation_direction;
+static int hf_cigi3_3_entity_control_animation_loop_mode;
+static int hf_cigi3_3_entity_control_animation_state;
+static int hf_cigi3_3_entity_control_extrapolation_enable;
+static int hf_cigi3_3_entity_control_alpha;
+static int hf_cigi3_3_entity_control_entity_type;
+static int hf_cigi3_3_entity_control_parent_id;
+static int hf_cigi3_3_entity_control_roll;
+static int hf_cigi3_3_entity_control_pitch;
+static int hf_cigi3_3_entity_control_yaw;
+static int hf_cigi3_3_entity_control_lat_xoff;
+static int hf_cigi3_3_entity_control_lon_yoff;
+static int hf_cigi3_3_entity_control_alt_zoff;
 
 /* CIGI3 Conformal Clamped Entity Control */
 #define CIGI3_PACKET_SIZE_CONFORMAL_CLAMPED_ENTITY_CONTROL 24
-static int hf_cigi3_conformal_clamped_entity_control = -1;
-static int hf_cigi3_conformal_clamped_entity_control_entity_id = -1;
-static int hf_cigi3_conformal_clamped_entity_control_yaw = -1;
-static int hf_cigi3_conformal_clamped_entity_control_lat = -1;
-static int hf_cigi3_conformal_clamped_entity_control_lon = -1;
+static int hf_cigi3_conformal_clamped_entity_control;
+static int hf_cigi3_conformal_clamped_entity_control_entity_id;
+static int hf_cigi3_conformal_clamped_entity_control_yaw;
+static int hf_cigi3_conformal_clamped_entity_control_lat;
+static int hf_cigi3_conformal_clamped_entity_control_lon;
 
 /* CIGI3 Component Control */
 #define CIGI3_PACKET_SIZE_COMPONENT_CONTROL 32
-static int hf_cigi3_component_control = -1;
-static int hf_cigi3_component_control_component_id = -1;
-static int hf_cigi3_component_control_instance_id = -1;
-static int hf_cigi3_component_control_component_class = -1;
-static int hf_cigi3_component_control_component_state = -1;
-static int hf_cigi3_component_control_data_1 = -1;
-static int hf_cigi3_component_control_data_2 = -1;
-static int hf_cigi3_component_control_data_3 = -1;
-static int hf_cigi3_component_control_data_4 = -1;
-static int hf_cigi3_component_control_data_5 = -1;
-static int hf_cigi3_component_control_data_6 = -1;
+static int hf_cigi3_component_control;
+static int hf_cigi3_component_control_component_id;
+static int hf_cigi3_component_control_instance_id;
+static int hf_cigi3_component_control_component_class;
+static int hf_cigi3_component_control_component_state;
+static int hf_cigi3_component_control_data_1;
+static int hf_cigi3_component_control_data_2;
+static int hf_cigi3_component_control_data_3;
+static int hf_cigi3_component_control_data_4;
+static int hf_cigi3_component_control_data_5;
+static int hf_cigi3_component_control_data_6;
 
 static const value_string cigi3_component_control_component_class_vals[] = {
     {0, "Entity"},
@@ -1055,17 +1055,17 @@ static const value_string cigi3_component_control_component_class_vals[] = {
 };
 
 /* CIGI3_3 Component Control */
-/* static int hf_cigi3_3_component_control = -1; */
-static int hf_cigi3_3_component_control_component_id = -1;
-static int hf_cigi3_3_component_control_instance_id = -1;
-static int hf_cigi3_3_component_control_component_class = -1;
-static int hf_cigi3_3_component_control_component_state = -1;
-static int hf_cigi3_3_component_control_data_1 = -1;
-static int hf_cigi3_3_component_control_data_2 = -1;
-static int hf_cigi3_3_component_control_data_3 = -1;
-static int hf_cigi3_3_component_control_data_4 = -1;
-static int hf_cigi3_3_component_control_data_5 = -1;
-static int hf_cigi3_3_component_control_data_6 = -1;
+/* static int hf_cigi3_3_component_control; */
+static int hf_cigi3_3_component_control_component_id;
+static int hf_cigi3_3_component_control_instance_id;
+static int hf_cigi3_3_component_control_component_class;
+static int hf_cigi3_3_component_control_component_state;
+static int hf_cigi3_3_component_control_data_1;
+static int hf_cigi3_3_component_control_data_2;
+static int hf_cigi3_3_component_control_data_3;
+static int hf_cigi3_3_component_control_data_4;
+static int hf_cigi3_3_component_control_data_5;
+static int hf_cigi3_3_component_control_data_6;
 
 static const value_string cigi3_3_component_control_component_class_vals[] = {
     {0, "Entity"},
@@ -1089,13 +1089,13 @@ static const value_string cigi3_3_component_control_component_class_vals[] = {
 
 /* CIGI3 Short Component Control */
 #define CIGI3_PACKET_SIZE_SHORT_COMPONENT_CONTROL 16
-static int hf_cigi3_short_component_control = -1;
-static int hf_cigi3_short_component_control_component_id = -1;
-static int hf_cigi3_short_component_control_instance_id = -1;
-static int hf_cigi3_short_component_control_component_class = -1;
-static int hf_cigi3_short_component_control_component_state = -1;
-static int hf_cigi3_short_component_control_data_1 = -1;
-static int hf_cigi3_short_component_control_data_2 = -1;
+static int hf_cigi3_short_component_control;
+static int hf_cigi3_short_component_control_component_id;
+static int hf_cigi3_short_component_control_instance_id;
+static int hf_cigi3_short_component_control_component_class;
+static int hf_cigi3_short_component_control_component_state;
+static int hf_cigi3_short_component_control_data_1;
+static int hf_cigi3_short_component_control_data_2;
 
 static const value_string cigi3_short_component_control_component_class_vals[] = {
     {0, "Entity"},
@@ -1116,13 +1116,13 @@ static const value_string cigi3_short_component_control_component_class_vals[] =
 };
 
 /* CIGI3_3 Short Component Control */
-/* static int hf_cigi3_3_short_component_control = -1; */
-static int hf_cigi3_3_short_component_control_component_id = -1;
-static int hf_cigi3_3_short_component_control_instance_id = -1;
-static int hf_cigi3_3_short_component_control_component_class = -1;
-static int hf_cigi3_3_short_component_control_component_state = -1;
-static int hf_cigi3_3_short_component_control_data_1 = -1;
-static int hf_cigi3_3_short_component_control_data_2 = -1;
+/* static int hf_cigi3_3_short_component_control; */
+static int hf_cigi3_3_short_component_control_component_id;
+static int hf_cigi3_3_short_component_control_instance_id;
+static int hf_cigi3_3_short_component_control_component_class;
+static int hf_cigi3_3_short_component_control_component_state;
+static int hf_cigi3_3_short_component_control_data_1;
+static int hf_cigi3_3_short_component_control_data_2;
 
 static const value_string cigi3_3_short_component_control_component_class_vals[] = {
     {0, "Entity"},
@@ -1146,35 +1146,35 @@ static const value_string cigi3_3_short_component_control_component_class_vals[]
 
 /* CIGI3 Articulated Part Control */
 #define CIGI3_PACKET_SIZE_ARTICULATED_PART_CONTROL 32
-static int hf_cigi3_articulated_part_control = -1;
-static int hf_cigi3_articulated_part_control_entity_id = -1;
-static int hf_cigi3_articulated_part_control_part_id = -1;
-static int hf_cigi3_articulated_part_control_part_enable = -1;
-static int hf_cigi3_articulated_part_control_xoff_enable = -1;
-static int hf_cigi3_articulated_part_control_yoff_enable = -1;
-static int hf_cigi3_articulated_part_control_zoff_enable = -1;
-static int hf_cigi3_articulated_part_control_roll_enable = -1;
-static int hf_cigi3_articulated_part_control_pitch_enable = -1;
-static int hf_cigi3_articulated_part_control_yaw_enable = -1;
-static int hf_cigi3_articulated_part_control_xoff = -1;
-static int hf_cigi3_articulated_part_control_yoff = -1;
-static int hf_cigi3_articulated_part_control_zoff = -1;
-static int hf_cigi3_articulated_part_control_roll = -1;
-static int hf_cigi3_articulated_part_control_pitch = -1;
-static int hf_cigi3_articulated_part_control_yaw = -1;
+static int hf_cigi3_articulated_part_control;
+static int hf_cigi3_articulated_part_control_entity_id;
+static int hf_cigi3_articulated_part_control_part_id;
+static int hf_cigi3_articulated_part_control_part_enable;
+static int hf_cigi3_articulated_part_control_xoff_enable;
+static int hf_cigi3_articulated_part_control_yoff_enable;
+static int hf_cigi3_articulated_part_control_zoff_enable;
+static int hf_cigi3_articulated_part_control_roll_enable;
+static int hf_cigi3_articulated_part_control_pitch_enable;
+static int hf_cigi3_articulated_part_control_yaw_enable;
+static int hf_cigi3_articulated_part_control_xoff;
+static int hf_cigi3_articulated_part_control_yoff;
+static int hf_cigi3_articulated_part_control_zoff;
+static int hf_cigi3_articulated_part_control_roll;
+static int hf_cigi3_articulated_part_control_pitch;
+static int hf_cigi3_articulated_part_control_yaw;
 
 /* CIGI3 Short Articulated Part Control */
 #define CIGI3_PACKET_SIZE_SHORT_ARTICULATED_PART_CONTROL 16
-static int hf_cigi3_short_articulated_part_control = -1;
-static int hf_cigi3_short_articulated_part_control_entity_id = -1;
-static int hf_cigi3_short_articulated_part_control_part_id_1 = -1;
-static int hf_cigi3_short_articulated_part_control_part_id_2 = -1;
-static int hf_cigi3_short_articulated_part_control_dof_select_1 = -1;
-static int hf_cigi3_short_articulated_part_control_dof_select_2 = -1;
-static int hf_cigi3_short_articulated_part_control_part_enable_1 = -1;
-static int hf_cigi3_short_articulated_part_control_part_enable_2 = -1;
-static int hf_cigi3_short_articulated_part_control_dof_1 = -1;
-static int hf_cigi3_short_articulated_part_control_dof_2 = -1;
+static int hf_cigi3_short_articulated_part_control;
+static int hf_cigi3_short_articulated_part_control_entity_id;
+static int hf_cigi3_short_articulated_part_control_part_id_1;
+static int hf_cigi3_short_articulated_part_control_part_id_2;
+static int hf_cigi3_short_articulated_part_control_dof_select_1;
+static int hf_cigi3_short_articulated_part_control_dof_select_2;
+static int hf_cigi3_short_articulated_part_control_part_enable_1;
+static int hf_cigi3_short_articulated_part_control_part_enable_2;
+static int hf_cigi3_short_articulated_part_control_dof_1;
+static int hf_cigi3_short_articulated_part_control_dof_2;
 
 static const value_string cigi3_short_articulated_part_control_dof_select_vals[] = {
     {0, "Not Used"},
@@ -1189,30 +1189,30 @@ static const value_string cigi3_short_articulated_part_control_dof_select_vals[]
 
 /* CIGI3 Rate Control */
 #define CIGI3_PACKET_SIZE_RATE_CONTROL 32
-static int hf_cigi3_rate_control = -1;
-static int hf_cigi3_rate_control_entity_id = -1;
-static int hf_cigi3_rate_control_part_id = -1;
-static int hf_cigi3_rate_control_apply_to_part = -1;
-static int hf_cigi3_rate_control_x_rate = -1;
-static int hf_cigi3_rate_control_y_rate = -1;
-static int hf_cigi3_rate_control_z_rate = -1;
-static int hf_cigi3_rate_control_roll_rate = -1;
-static int hf_cigi3_rate_control_pitch_rate = -1;
-static int hf_cigi3_rate_control_yaw_rate = -1;
+static int hf_cigi3_rate_control;
+static int hf_cigi3_rate_control_entity_id;
+static int hf_cigi3_rate_control_part_id;
+static int hf_cigi3_rate_control_apply_to_part;
+static int hf_cigi3_rate_control_x_rate;
+static int hf_cigi3_rate_control_y_rate;
+static int hf_cigi3_rate_control_z_rate;
+static int hf_cigi3_rate_control_roll_rate;
+static int hf_cigi3_rate_control_pitch_rate;
+static int hf_cigi3_rate_control_yaw_rate;
 
 /* CIGI3_2 Rate Control */
 #define CIGI3_2_PACKET_SIZE_RATE_CONTROL 32
-static int hf_cigi3_2_rate_control = -1;
-static int hf_cigi3_2_rate_control_entity_id = -1;
-static int hf_cigi3_2_rate_control_part_id = -1;
-static int hf_cigi3_2_rate_control_apply_to_part = -1;
-static int hf_cigi3_2_rate_control_coordinate_system = -1;
-static int hf_cigi3_2_rate_control_x_rate = -1;
-static int hf_cigi3_2_rate_control_y_rate = -1;
-static int hf_cigi3_2_rate_control_z_rate = -1;
-static int hf_cigi3_2_rate_control_roll_rate = -1;
-static int hf_cigi3_2_rate_control_pitch_rate = -1;
-static int hf_cigi3_2_rate_control_yaw_rate = -1;
+static int hf_cigi3_2_rate_control;
+static int hf_cigi3_2_rate_control_entity_id;
+static int hf_cigi3_2_rate_control_part_id;
+static int hf_cigi3_2_rate_control_apply_to_part;
+static int hf_cigi3_2_rate_control_coordinate_system;
+static int hf_cigi3_2_rate_control_x_rate;
+static int hf_cigi3_2_rate_control_y_rate;
+static int hf_cigi3_2_rate_control_z_rate;
+static int hf_cigi3_2_rate_control_roll_rate;
+static int hf_cigi3_2_rate_control_pitch_rate;
+static int hf_cigi3_2_rate_control_yaw_rate;
 
 static const true_false_string cigi3_2_rate_control_coord_sys_select_vals = {
     "Local",
@@ -1221,45 +1221,45 @@ static const true_false_string cigi3_2_rate_control_coord_sys_select_vals = {
 
 /* CIGI3 Celestial Sphere Control */
 #define CIGI3_PACKET_SIZE_CELESTIAL_SPHERE_CONTROL 16
-static int hf_cigi3_celestial_sphere_control = -1;
-static int hf_cigi3_celestial_sphere_control_hour = -1;
-static int hf_cigi3_celestial_sphere_control_minute = -1;
-static int hf_cigi3_celestial_sphere_control_ephemeris_enable = -1;
-static int hf_cigi3_celestial_sphere_control_sun_enable = -1;
-static int hf_cigi3_celestial_sphere_control_moon_enable = -1;
-static int hf_cigi3_celestial_sphere_control_star_enable = -1;
-static int hf_cigi3_celestial_sphere_control_date_time_valid = -1;
-static int hf_cigi3_celestial_sphere_control_date = -1;
-static int hf_cigi3_celestial_sphere_control_star_intensity = -1;
+static int hf_cigi3_celestial_sphere_control;
+static int hf_cigi3_celestial_sphere_control_hour;
+static int hf_cigi3_celestial_sphere_control_minute;
+static int hf_cigi3_celestial_sphere_control_ephemeris_enable;
+static int hf_cigi3_celestial_sphere_control_sun_enable;
+static int hf_cigi3_celestial_sphere_control_moon_enable;
+static int hf_cigi3_celestial_sphere_control_star_enable;
+static int hf_cigi3_celestial_sphere_control_date_time_valid;
+static int hf_cigi3_celestial_sphere_control_date;
+static int hf_cigi3_celestial_sphere_control_star_intensity;
 
 /* CIGI3 Atmosphere Control */
 #define CIGI3_PACKET_SIZE_ATMOSPHERE_CONTROL 32
-static int hf_cigi3_atmosphere_control = -1;
-static int hf_cigi3_atmosphere_control_atmospheric_model_enable = -1;
-static int hf_cigi3_atmosphere_control_humidity = -1;
-static int hf_cigi3_atmosphere_control_air_temp = -1;
-static int hf_cigi3_atmosphere_control_visibility_range = -1;
-static int hf_cigi3_atmosphere_control_horiz_wind = -1;
-static int hf_cigi3_atmosphere_control_vert_wind = -1;
-static int hf_cigi3_atmosphere_control_wind_direction = -1;
-static int hf_cigi3_atmosphere_control_barometric_pressure = -1;
+static int hf_cigi3_atmosphere_control;
+static int hf_cigi3_atmosphere_control_atmospheric_model_enable;
+static int hf_cigi3_atmosphere_control_humidity;
+static int hf_cigi3_atmosphere_control_air_temp;
+static int hf_cigi3_atmosphere_control_visibility_range;
+static int hf_cigi3_atmosphere_control_horiz_wind;
+static int hf_cigi3_atmosphere_control_vert_wind;
+static int hf_cigi3_atmosphere_control_wind_direction;
+static int hf_cigi3_atmosphere_control_barometric_pressure;
 
 /* CIGI3 Environmental Region Control */
 #define CIGI3_PACKET_SIZE_ENVIRONMENTAL_REGION_CONTROL 48
-static int hf_cigi3_environmental_region_control = -1;
-static int hf_cigi3_environmental_region_control_region_id = -1;
-static int hf_cigi3_environmental_region_control_region_state = -1;
-static int hf_cigi3_environmental_region_control_merge_weather = -1;
-static int hf_cigi3_environmental_region_control_merge_aerosol = -1;
-static int hf_cigi3_environmental_region_control_merge_maritime = -1;
-static int hf_cigi3_environmental_region_control_merge_terrestrial = -1;
-static int hf_cigi3_environmental_region_control_lat = -1;
-static int hf_cigi3_environmental_region_control_lon = -1;
-static int hf_cigi3_environmental_region_control_size_x = -1;
-static int hf_cigi3_environmental_region_control_size_y = -1;
-static int hf_cigi3_environmental_region_control_corner_radius = -1;
-static int hf_cigi3_environmental_region_control_rotation = -1;
-static int hf_cigi3_environmental_region_control_transition_perimeter = -1;
+static int hf_cigi3_environmental_region_control;
+static int hf_cigi3_environmental_region_control_region_id;
+static int hf_cigi3_environmental_region_control_region_state;
+static int hf_cigi3_environmental_region_control_merge_weather;
+static int hf_cigi3_environmental_region_control_merge_aerosol;
+static int hf_cigi3_environmental_region_control_merge_maritime;
+static int hf_cigi3_environmental_region_control_merge_terrestrial;
+static int hf_cigi3_environmental_region_control_lat;
+static int hf_cigi3_environmental_region_control_lon;
+static int hf_cigi3_environmental_region_control_size_x;
+static int hf_cigi3_environmental_region_control_size_y;
+static int hf_cigi3_environmental_region_control_corner_radius;
+static int hf_cigi3_environmental_region_control_rotation;
+static int hf_cigi3_environmental_region_control_transition_perimeter;
 
 static const value_string cigi3_environmental_region_control_region_state_vals[] = {
     {0, "Inactive"},
@@ -1275,29 +1275,29 @@ static const true_false_string cigi3_environmental_region_control_merge_properti
 
 /* CIGI3 Weather Control */
 #define CIGI3_PACKET_SIZE_WEATHER_CONTROL 56
-static int hf_cigi3_weather_control = -1;
-static int hf_cigi3_weather_control_entity_region_id = -1;
-static int hf_cigi3_weather_control_layer_id = -1;
-static int hf_cigi3_weather_control_humidity = -1;
-static int hf_cigi3_weather_control_weather_enable = -1;
-static int hf_cigi3_weather_control_scud_enable = -1;
-static int hf_cigi3_weather_control_random_winds_enable = -1;
-static int hf_cigi3_weather_control_random_lightning_enable = -1;
-static int hf_cigi3_weather_control_cloud_type = -1;
-static int hf_cigi3_weather_control_scope = -1;
-static int hf_cigi3_weather_control_severity = -1;
-static int hf_cigi3_weather_control_air_temp = -1;
-static int hf_cigi3_weather_control_visibility_range = -1;
-static int hf_cigi3_weather_control_scud_frequency = -1;
-static int hf_cigi3_weather_control_coverage = -1;
-static int hf_cigi3_weather_control_base_elevation = -1;
-static int hf_cigi3_weather_control_thickness = -1;
-static int hf_cigi3_weather_control_transition_band = -1;
-static int hf_cigi3_weather_control_horiz_wind = -1;
-static int hf_cigi3_weather_control_vert_wind = -1;
-static int hf_cigi3_weather_control_wind_direction = -1;
-static int hf_cigi3_weather_control_barometric_pressure = -1;
-static int hf_cigi3_weather_control_aerosol_concentration = -1;
+static int hf_cigi3_weather_control;
+static int hf_cigi3_weather_control_entity_region_id;
+static int hf_cigi3_weather_control_layer_id;
+static int hf_cigi3_weather_control_humidity;
+static int hf_cigi3_weather_control_weather_enable;
+static int hf_cigi3_weather_control_scud_enable;
+static int hf_cigi3_weather_control_random_winds_enable;
+static int hf_cigi3_weather_control_random_lightning_enable;
+static int hf_cigi3_weather_control_cloud_type;
+static int hf_cigi3_weather_control_scope;
+static int hf_cigi3_weather_control_severity;
+static int hf_cigi3_weather_control_air_temp;
+static int hf_cigi3_weather_control_visibility_range;
+static int hf_cigi3_weather_control_scud_frequency;
+static int hf_cigi3_weather_control_coverage;
+static int hf_cigi3_weather_control_base_elevation;
+static int hf_cigi3_weather_control_thickness;
+static int hf_cigi3_weather_control_transition_band;
+static int hf_cigi3_weather_control_horiz_wind;
+static int hf_cigi3_weather_control_vert_wind;
+static int hf_cigi3_weather_control_wind_direction;
+static int hf_cigi3_weather_control_barometric_pressure;
+static int hf_cigi3_weather_control_aerosol_concentration;
 
 static const value_string cigi3_weather_control_layer_id_vals[] = {
     {0, "Ground Fog"},
@@ -1342,14 +1342,14 @@ static const value_string cigi3_weather_control_scope_vals[] = {
 
 /* CIGI3 Maritime Surface Conditions Control */
 #define CIGI3_PACKET_SIZE_MARITIME_SURFACE_CONDITIONS_CONTROL 24
-static int hf_cigi3_maritime_surface_conditions_control = -1;
-static int hf_cigi3_maritime_surface_conditions_control_entity_region_id = -1;
-static int hf_cigi3_maritime_surface_conditions_control_surface_conditions_enable = -1;
-static int hf_cigi3_maritime_surface_conditions_control_whitecap_enable = -1;
-static int hf_cigi3_maritime_surface_conditions_control_scope = -1;
-static int hf_cigi3_maritime_surface_conditions_control_sea_surface_height = -1;
-static int hf_cigi3_maritime_surface_conditions_control_surface_water_temp = -1;
-static int hf_cigi3_maritime_surface_conditions_control_surface_clarity = -1;
+static int hf_cigi3_maritime_surface_conditions_control;
+static int hf_cigi3_maritime_surface_conditions_control_entity_region_id;
+static int hf_cigi3_maritime_surface_conditions_control_surface_conditions_enable;
+static int hf_cigi3_maritime_surface_conditions_control_whitecap_enable;
+static int hf_cigi3_maritime_surface_conditions_control_scope;
+static int hf_cigi3_maritime_surface_conditions_control_sea_surface_height;
+static int hf_cigi3_maritime_surface_conditions_control_surface_water_temp;
+static int hf_cigi3_maritime_surface_conditions_control_surface_clarity;
 
 static const value_string cigi3_maritime_surface_conditions_control_scope_vals[] = {
     {0, "Global"},
@@ -1360,18 +1360,18 @@ static const value_string cigi3_maritime_surface_conditions_control_scope_vals[]
 
 /* CIGI3 Wave Control */
 #define CIGI3_PACKET_SIZE_WAVE_CONTROL 32
-static int hf_cigi3_wave_control = -1;
-static int hf_cigi3_wave_control_entity_region_id = -1;
-static int hf_cigi3_wave_control_wave_id = -1;
-static int hf_cigi3_wave_control_wave_enable = -1;
-static int hf_cigi3_wave_control_scope = -1;
-static int hf_cigi3_wave_control_breaker_type = -1;
-static int hf_cigi3_wave_control_height = -1;
-static int hf_cigi3_wave_control_wavelength = -1;
-static int hf_cigi3_wave_control_period = -1;
-static int hf_cigi3_wave_control_direction = -1;
-static int hf_cigi3_wave_control_phase_offset = -1;
-static int hf_cigi3_wave_control_leading = -1;
+static int hf_cigi3_wave_control;
+static int hf_cigi3_wave_control_entity_region_id;
+static int hf_cigi3_wave_control_wave_id;
+static int hf_cigi3_wave_control_wave_enable;
+static int hf_cigi3_wave_control_scope;
+static int hf_cigi3_wave_control_breaker_type;
+static int hf_cigi3_wave_control_height;
+static int hf_cigi3_wave_control_wavelength;
+static int hf_cigi3_wave_control_period;
+static int hf_cigi3_wave_control_direction;
+static int hf_cigi3_wave_control_phase_offset;
+static int hf_cigi3_wave_control_leading;
 
 static const value_string cigi3_wave_control_scope_vals[] = {
     {0, "Global"},
@@ -1389,13 +1389,13 @@ static const value_string cigi3_wave_control_breaker_type_vals[] = {
 
 /* CIGI3 Terrestrial Surface Conditions Control */
 #define CIGI3_PACKET_SIZE_TERRESTRIAL_SURFACE_CONDITIONS_CONTROL 8
-static int hf_cigi3_terrestrial_surface_conditions_control = -1;
-static int hf_cigi3_terrestrial_surface_conditions_control_entity_region_id = -1;
-static int hf_cigi3_terrestrial_surface_conditions_control_surface_condition_id = -1;
-static int hf_cigi3_terrestrial_surface_conditions_control_surface_condition_enable = -1;
-static int hf_cigi3_terrestrial_surface_conditions_control_scope = -1;
-static int hf_cigi3_terrestrial_surface_conditions_control_severity = -1;
-static int hf_cigi3_terrestrial_surface_conditions_control_coverage = -1;
+static int hf_cigi3_terrestrial_surface_conditions_control;
+static int hf_cigi3_terrestrial_surface_conditions_control_entity_region_id;
+static int hf_cigi3_terrestrial_surface_conditions_control_surface_condition_id;
+static int hf_cigi3_terrestrial_surface_conditions_control_surface_condition_enable;
+static int hf_cigi3_terrestrial_surface_conditions_control_scope;
+static int hf_cigi3_terrestrial_surface_conditions_control_severity;
+static int hf_cigi3_terrestrial_surface_conditions_control_coverage;
 
 static const value_string cigi3_terrestrial_surface_conditions_control_scope_vals[] = {
     {0, "Global"},
@@ -1406,39 +1406,39 @@ static const value_string cigi3_terrestrial_surface_conditions_control_scope_val
 
 /* CIGI3 View Control */
 #define CIGI3_PACKET_SIZE_VIEW_CONTROL 32
-static int hf_cigi3_view_control = -1;
-static int hf_cigi3_view_control_view_id = -1;
-static int hf_cigi3_view_control_group_id = -1;
-static int hf_cigi3_view_control_xoff_enable = -1;
-static int hf_cigi3_view_control_yoff_enable = -1;
-static int hf_cigi3_view_control_zoff_enable = -1;
-static int hf_cigi3_view_control_roll_enable = -1;
-static int hf_cigi3_view_control_pitch_enable = -1;
-static int hf_cigi3_view_control_yaw_enable = -1;
-static int hf_cigi3_view_control_entity_id = -1;
-static int hf_cigi3_view_control_xoff = -1;
-static int hf_cigi3_view_control_yoff = -1;
-static int hf_cigi3_view_control_zoff = -1;
-static int hf_cigi3_view_control_roll = -1;
-static int hf_cigi3_view_control_pitch = -1;
-static int hf_cigi3_view_control_yaw = -1;
+static int hf_cigi3_view_control;
+static int hf_cigi3_view_control_view_id;
+static int hf_cigi3_view_control_group_id;
+static int hf_cigi3_view_control_xoff_enable;
+static int hf_cigi3_view_control_yoff_enable;
+static int hf_cigi3_view_control_zoff_enable;
+static int hf_cigi3_view_control_roll_enable;
+static int hf_cigi3_view_control_pitch_enable;
+static int hf_cigi3_view_control_yaw_enable;
+static int hf_cigi3_view_control_entity_id;
+static int hf_cigi3_view_control_xoff;
+static int hf_cigi3_view_control_yoff;
+static int hf_cigi3_view_control_zoff;
+static int hf_cigi3_view_control_roll;
+static int hf_cigi3_view_control_pitch;
+static int hf_cigi3_view_control_yaw;
 
 /* CIGI3 Sensor Control */
 #define CIGI3_PACKET_SIZE_SENSOR_CONTROL 24
-static int hf_cigi3_sensor_control = -1;
-static int hf_cigi3_sensor_control_view_id = -1;
-static int hf_cigi3_sensor_control_sensor_id = -1;
-static int hf_cigi3_sensor_control_sensor_on_off = -1;
-static int hf_cigi3_sensor_control_polarity = -1;
-static int hf_cigi3_sensor_control_line_dropout_enable = -1;
-static int hf_cigi3_sensor_control_auto_gain = -1;
-static int hf_cigi3_sensor_control_track_white_black = -1;
-static int hf_cigi3_sensor_control_track_mode = -1;
-static int hf_cigi3_sensor_control_response_type = -1;
-static int hf_cigi3_sensor_control_gain = -1;
-static int hf_cigi3_sensor_control_level = -1;
-static int hf_cigi3_sensor_control_ac_coupling = -1;
-static int hf_cigi3_sensor_control_noise = -1;
+static int hf_cigi3_sensor_control;
+static int hf_cigi3_sensor_control_view_id;
+static int hf_cigi3_sensor_control_sensor_id;
+static int hf_cigi3_sensor_control_sensor_on_off;
+static int hf_cigi3_sensor_control_polarity;
+static int hf_cigi3_sensor_control_line_dropout_enable;
+static int hf_cigi3_sensor_control_auto_gain;
+static int hf_cigi3_sensor_control_track_white_black;
+static int hf_cigi3_sensor_control_track_mode;
+static int hf_cigi3_sensor_control_response_type;
+static int hf_cigi3_sensor_control_gain;
+static int hf_cigi3_sensor_control_level;
+static int hf_cigi3_sensor_control_ac_coupling;
+static int hf_cigi3_sensor_control_noise;
 
 static const value_string cigi3_sensor_control_track_mode_vals[] = {
     {0, "Off"},
@@ -1466,18 +1466,18 @@ static const true_false_string cigi3_sensor_control_track_white_black_tfs = {
 
 /* CIGI3 Motion Tracker Control */
 #define CIGI3_PACKET_SIZE_MOTION_TRACKER_CONTROL 8
-static int hf_cigi3_motion_tracker_control = -1;
-static int hf_cigi3_motion_tracker_control_view_group_id = -1;
-static int hf_cigi3_motion_tracker_control_tracker_id = -1;
-static int hf_cigi3_motion_tracker_control_tracker_enable = -1;
-static int hf_cigi3_motion_tracker_control_boresight_enable = -1;
-static int hf_cigi3_motion_tracker_control_x_enable = -1;
-static int hf_cigi3_motion_tracker_control_y_enable = -1;
-static int hf_cigi3_motion_tracker_control_z_enable = -1;
-static int hf_cigi3_motion_tracker_control_roll_enable = -1;
-static int hf_cigi3_motion_tracker_control_pitch_enable = -1;
-static int hf_cigi3_motion_tracker_control_yaw_enable = -1;
-static int hf_cigi3_motion_tracker_control_view_group_select = -1;
+static int hf_cigi3_motion_tracker_control;
+static int hf_cigi3_motion_tracker_control_view_group_id;
+static int hf_cigi3_motion_tracker_control_tracker_id;
+static int hf_cigi3_motion_tracker_control_tracker_enable;
+static int hf_cigi3_motion_tracker_control_boresight_enable;
+static int hf_cigi3_motion_tracker_control_x_enable;
+static int hf_cigi3_motion_tracker_control_y_enable;
+static int hf_cigi3_motion_tracker_control_z_enable;
+static int hf_cigi3_motion_tracker_control_roll_enable;
+static int hf_cigi3_motion_tracker_control_pitch_enable;
+static int hf_cigi3_motion_tracker_control_yaw_enable;
+static int hf_cigi3_motion_tracker_control_view_group_select;
 
 static const true_false_string cigi3_motion_tracker_control_view_group_select_tfs = {
     "View Group",
@@ -1486,43 +1486,43 @@ static const true_false_string cigi3_motion_tracker_control_view_group_select_tf
 
 /* CIGI3 Earth Reference Model Definition */
 #define CIGI3_PACKET_SIZE_EARTH_REFERENCE_MODEL_DEFINITION 24
-static int hf_cigi3_earth_reference_model_definition = -1;
-static int hf_cigi3_earth_reference_model_definition_erm_enable = -1;
-static int hf_cigi3_earth_reference_model_definition_equatorial_radius = -1;
-static int hf_cigi3_earth_reference_model_definition_flattening = -1;
+static int hf_cigi3_earth_reference_model_definition;
+static int hf_cigi3_earth_reference_model_definition_erm_enable;
+static int hf_cigi3_earth_reference_model_definition_equatorial_radius;
+static int hf_cigi3_earth_reference_model_definition_flattening;
 
 /* CIGI3 Trajectory Definition */
 #define CIGI3_PACKET_SIZE_TRAJECTORY_DEFINITION 24
-static int hf_cigi3_trajectory_definition = -1;
-static int hf_cigi3_trajectory_definition_entity_id = -1;
-static int hf_cigi3_trajectory_definition_acceleration_x = -1;
-static int hf_cigi3_trajectory_definition_acceleration_y = -1;
-static int hf_cigi3_trajectory_definition_acceleration_z = -1;
-static int hf_cigi3_trajectory_definition_retardation_rate = -1;
-static int hf_cigi3_trajectory_definition_terminal_velocity = -1;
+static int hf_cigi3_trajectory_definition;
+static int hf_cigi3_trajectory_definition_entity_id;
+static int hf_cigi3_trajectory_definition_acceleration_x;
+static int hf_cigi3_trajectory_definition_acceleration_y;
+static int hf_cigi3_trajectory_definition_acceleration_z;
+static int hf_cigi3_trajectory_definition_retardation_rate;
+static int hf_cigi3_trajectory_definition_terminal_velocity;
 
 /* CIGI3 View Definition */
 #define CIGI3_PACKET_SIZE_VIEW_DEFINITION 32
-static int hf_cigi3_view_definition = -1;
-static int hf_cigi3_view_definition_view_id = -1;
-static int hf_cigi3_view_definition_group_id = -1;
-static int hf_cigi3_view_definition_near_enable = -1;
-static int hf_cigi3_view_definition_far_enable = -1;
-static int hf_cigi3_view_definition_left_enable = -1;
-static int hf_cigi3_view_definition_right_enable = -1;
-static int hf_cigi3_view_definition_top_enable = -1;
-static int hf_cigi3_view_definition_bottom_enable = -1;
-static int hf_cigi3_view_definition_mirror_mode = -1;
-static int hf_cigi3_view_definition_pixel_replication = -1;
-static int hf_cigi3_view_definition_projection_type = -1;
-static int hf_cigi3_view_definition_reorder = -1;
-static int hf_cigi3_view_definition_view_type = -1;
-static int hf_cigi3_view_definition_near = -1;
-static int hf_cigi3_view_definition_far = -1;
-static int hf_cigi3_view_definition_left = -1;
-static int hf_cigi3_view_definition_right = -1;
-static int hf_cigi3_view_definition_top = -1;
-static int hf_cigi3_view_definition_bottom = -1;
+static int hf_cigi3_view_definition;
+static int hf_cigi3_view_definition_view_id;
+static int hf_cigi3_view_definition_group_id;
+static int hf_cigi3_view_definition_near_enable;
+static int hf_cigi3_view_definition_far_enable;
+static int hf_cigi3_view_definition_left_enable;
+static int hf_cigi3_view_definition_right_enable;
+static int hf_cigi3_view_definition_top_enable;
+static int hf_cigi3_view_definition_bottom_enable;
+static int hf_cigi3_view_definition_mirror_mode;
+static int hf_cigi3_view_definition_pixel_replication;
+static int hf_cigi3_view_definition_projection_type;
+static int hf_cigi3_view_definition_reorder;
+static int hf_cigi3_view_definition_view_type;
+static int hf_cigi3_view_definition_near;
+static int hf_cigi3_view_definition_far;
+static int hf_cigi3_view_definition_left;
+static int hf_cigi3_view_definition_right;
+static int hf_cigi3_view_definition_top;
+static int hf_cigi3_view_definition_bottom;
 
 static const value_string cigi3_view_definition_mirror_mode_vals[] = {
     {0, "None"},
@@ -1556,34 +1556,34 @@ static const true_false_string cigi3_view_definition_reorder_tfs = {
 
 /* CIGI3 Collision Detection Segment Definition */
 #define CIGI3_PACKET_SIZE_COLLISION_DETECTION_SEGMENT_DEFINITION 40
-static int hf_cigi3_collision_detection_segment_definition = -1;
-static int hf_cigi3_collision_detection_segment_definition_entity_id = -1;
-static int hf_cigi3_collision_detection_segment_definition_segment_id = -1;
-static int hf_cigi3_collision_detection_segment_definition_segment_enable = -1;
-static int hf_cigi3_collision_detection_segment_definition_x1 = -1;
-static int hf_cigi3_collision_detection_segment_definition_y1 = -1;
-static int hf_cigi3_collision_detection_segment_definition_z1 = -1;
-static int hf_cigi3_collision_detection_segment_definition_x2 = -1;
-static int hf_cigi3_collision_detection_segment_definition_y2 = -1;
-static int hf_cigi3_collision_detection_segment_definition_z2 = -1;
-static int hf_cigi3_collision_detection_segment_definition_material_mask = -1;
+static int hf_cigi3_collision_detection_segment_definition;
+static int hf_cigi3_collision_detection_segment_definition_entity_id;
+static int hf_cigi3_collision_detection_segment_definition_segment_id;
+static int hf_cigi3_collision_detection_segment_definition_segment_enable;
+static int hf_cigi3_collision_detection_segment_definition_x1;
+static int hf_cigi3_collision_detection_segment_definition_y1;
+static int hf_cigi3_collision_detection_segment_definition_z1;
+static int hf_cigi3_collision_detection_segment_definition_x2;
+static int hf_cigi3_collision_detection_segment_definition_y2;
+static int hf_cigi3_collision_detection_segment_definition_z2;
+static int hf_cigi3_collision_detection_segment_definition_material_mask;
 
 /* CIGI3 Collision Detection Volume Definition */
 #define CIGI3_PACKET_SIZE_COLLISION_DETECTION_VOLUME_DEFINITION 48
-static int hf_cigi3_collision_detection_volume_definition = -1;
-static int hf_cigi3_collision_detection_volume_definition_entity_id = -1;
-static int hf_cigi3_collision_detection_volume_definition_volume_id = -1;
-static int hf_cigi3_collision_detection_volume_definition_volume_enable = -1;
-static int hf_cigi3_collision_detection_volume_definition_volume_type = -1;
-static int hf_cigi3_collision_detection_volume_definition_x = -1;
-static int hf_cigi3_collision_detection_volume_definition_y = -1;
-static int hf_cigi3_collision_detection_volume_definition_z = -1;
-static int hf_cigi3_collision_detection_volume_definition_radius_height = -1;
-static int hf_cigi3_collision_detection_volume_definition_width = -1;
-static int hf_cigi3_collision_detection_volume_definition_depth = -1;
-static int hf_cigi3_collision_detection_volume_definition_roll = -1;
-static int hf_cigi3_collision_detection_volume_definition_pitch = -1;
-static int hf_cigi3_collision_detection_volume_definition_yaw = -1;
+static int hf_cigi3_collision_detection_volume_definition;
+static int hf_cigi3_collision_detection_volume_definition_entity_id;
+static int hf_cigi3_collision_detection_volume_definition_volume_id;
+static int hf_cigi3_collision_detection_volume_definition_volume_enable;
+static int hf_cigi3_collision_detection_volume_definition_volume_type;
+static int hf_cigi3_collision_detection_volume_definition_x;
+static int hf_cigi3_collision_detection_volume_definition_y;
+static int hf_cigi3_collision_detection_volume_definition_z;
+static int hf_cigi3_collision_detection_volume_definition_radius_height;
+static int hf_cigi3_collision_detection_volume_definition_width;
+static int hf_cigi3_collision_detection_volume_definition_depth;
+static int hf_cigi3_collision_detection_volume_definition_roll;
+static int hf_cigi3_collision_detection_volume_definition_pitch;
+static int hf_cigi3_collision_detection_volume_definition_yaw;
 
 static const true_false_string cigi3_collision_detection_volume_definition_volume_type_tfs = {
     "Cuboid",
@@ -1592,14 +1592,14 @@ static const true_false_string cigi3_collision_detection_volume_definition_volum
 
 /* CIGI3 HAT/HOT Request */
 #define CIGI3_PACKET_SIZE_HAT_HOT_REQUEST 32
-static int hf_cigi3_hat_hot_request = -1;
-static int hf_cigi3_hat_hot_request_hat_hot_id = -1;
-static int hf_cigi3_hat_hot_request_type = -1;
-static int hf_cigi3_hat_hot_request_coordinate_system = -1;
-static int hf_cigi3_hat_hot_request_entity_id = -1;
-static int hf_cigi3_hat_hot_request_lat_xoff = -1;
-static int hf_cigi3_hat_hot_request_lon_yoff = -1;
-static int hf_cigi3_hat_hot_request_alt_zoff = -1;
+static int hf_cigi3_hat_hot_request;
+static int hf_cigi3_hat_hot_request_hat_hot_id;
+static int hf_cigi3_hat_hot_request_type;
+static int hf_cigi3_hat_hot_request_coordinate_system;
+static int hf_cigi3_hat_hot_request_entity_id;
+static int hf_cigi3_hat_hot_request_lat_xoff;
+static int hf_cigi3_hat_hot_request_lon_yoff;
+static int hf_cigi3_hat_hot_request_alt_zoff;
 
 static const value_string cigi3_hat_hot_request_type_vals[] = {
     {0, "HAT"},
@@ -1610,15 +1610,15 @@ static const value_string cigi3_hat_hot_request_type_vals[] = {
 
 /* CIGI3_2 HAT/HOT Request */
 #define CIGI3_2_PACKET_SIZE_HAT_HOT_REQUEST 32
-static int hf_cigi3_2_hat_hot_request = -1;
-static int hf_cigi3_2_hat_hot_request_hat_hot_id = -1;
-static int hf_cigi3_2_hat_hot_request_type = -1;
-static int hf_cigi3_2_hat_hot_request_coordinate_system = -1;
-static int hf_cigi3_2_hat_hot_request_update_period = -1;
-static int hf_cigi3_2_hat_hot_request_entity_id = -1;
-static int hf_cigi3_2_hat_hot_request_lat_xoff = -1;
-static int hf_cigi3_2_hat_hot_request_lon_yoff = -1;
-static int hf_cigi3_2_hat_hot_request_alt_zoff = -1;
+static int hf_cigi3_2_hat_hot_request;
+static int hf_cigi3_2_hat_hot_request_hat_hot_id;
+static int hf_cigi3_2_hat_hot_request_type;
+static int hf_cigi3_2_hat_hot_request_coordinate_system;
+static int hf_cigi3_2_hat_hot_request_update_period;
+static int hf_cigi3_2_hat_hot_request_entity_id;
+static int hf_cigi3_2_hat_hot_request_lat_xoff;
+static int hf_cigi3_2_hat_hot_request_lon_yoff;
+static int hf_cigi3_2_hat_hot_request_alt_zoff;
 
 static const value_string cigi3_2_hat_hot_request_type_vals[] = {
     {0, "HAT"},
@@ -1629,88 +1629,88 @@ static const value_string cigi3_2_hat_hot_request_type_vals[] = {
 
 /* CIGI3 Line of Sight Segment Request */
 #define CIGI3_PACKET_SIZE_LINE_OF_SIGHT_SEGMENT_REQUEST 64
-static int hf_cigi3_line_of_sight_segment_request = -1;
-static int hf_cigi3_line_of_sight_segment_request_los_id = -1;
-static int hf_cigi3_line_of_sight_segment_request_type = -1;
-static int hf_cigi3_line_of_sight_segment_request_source_coord = -1;
-static int hf_cigi3_line_of_sight_segment_request_destination_coord = -1;
-static int hf_cigi3_line_of_sight_segment_request_response_coord = -1;
-static int hf_cigi3_line_of_sight_segment_request_alpha_threshold = -1;
-static int hf_cigi3_line_of_sight_segment_request_entity_id = -1;
-static int hf_cigi3_line_of_sight_segment_request_source_lat_xoff = -1;
-static int hf_cigi3_line_of_sight_segment_request_source_lon_yoff = -1;
-static int hf_cigi3_line_of_sight_segment_request_source_alt_zoff = -1;
-static int hf_cigi3_line_of_sight_segment_request_destination_lat_xoff = -1;
-static int hf_cigi3_line_of_sight_segment_request_destination_lon_yoff = -1;
-static int hf_cigi3_line_of_sight_segment_request_destination_alt_zoff = -1;
-static int hf_cigi3_line_of_sight_segment_request_material_mask = -1;
+static int hf_cigi3_line_of_sight_segment_request;
+static int hf_cigi3_line_of_sight_segment_request_los_id;
+static int hf_cigi3_line_of_sight_segment_request_type;
+static int hf_cigi3_line_of_sight_segment_request_source_coord;
+static int hf_cigi3_line_of_sight_segment_request_destination_coord;
+static int hf_cigi3_line_of_sight_segment_request_response_coord;
+static int hf_cigi3_line_of_sight_segment_request_alpha_threshold;
+static int hf_cigi3_line_of_sight_segment_request_entity_id;
+static int hf_cigi3_line_of_sight_segment_request_source_lat_xoff;
+static int hf_cigi3_line_of_sight_segment_request_source_lon_yoff;
+static int hf_cigi3_line_of_sight_segment_request_source_alt_zoff;
+static int hf_cigi3_line_of_sight_segment_request_destination_lat_xoff;
+static int hf_cigi3_line_of_sight_segment_request_destination_lon_yoff;
+static int hf_cigi3_line_of_sight_segment_request_destination_alt_zoff;
+static int hf_cigi3_line_of_sight_segment_request_material_mask;
 
 /* CIGI3_2 Line of Sight Segment Request */
 #define CIGI3_2_PACKET_SIZE_LINE_OF_SIGHT_SEGMENT_REQUEST 64
-static int hf_cigi3_2_line_of_sight_segment_request = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_los_id = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_type = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_source_coord = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_destination_coord = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_response_coord = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_destination_entity_id_valid = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_alpha_threshold = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_entity_id = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_source_lat_xoff = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_source_lon_yoff = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_source_alt_zoff = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_destination_lat_xoff = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_destination_lon_yoff = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_destination_alt_zoff = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_material_mask = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_update_period = -1;
-static int hf_cigi3_2_line_of_sight_segment_request_destination_entity_id = -1;
+static int hf_cigi3_2_line_of_sight_segment_request;
+static int hf_cigi3_2_line_of_sight_segment_request_los_id;
+static int hf_cigi3_2_line_of_sight_segment_request_type;
+static int hf_cigi3_2_line_of_sight_segment_request_source_coord;
+static int hf_cigi3_2_line_of_sight_segment_request_destination_coord;
+static int hf_cigi3_2_line_of_sight_segment_request_response_coord;
+static int hf_cigi3_2_line_of_sight_segment_request_destination_entity_id_valid;
+static int hf_cigi3_2_line_of_sight_segment_request_alpha_threshold;
+static int hf_cigi3_2_line_of_sight_segment_request_entity_id;
+static int hf_cigi3_2_line_of_sight_segment_request_source_lat_xoff;
+static int hf_cigi3_2_line_of_sight_segment_request_source_lon_yoff;
+static int hf_cigi3_2_line_of_sight_segment_request_source_alt_zoff;
+static int hf_cigi3_2_line_of_sight_segment_request_destination_lat_xoff;
+static int hf_cigi3_2_line_of_sight_segment_request_destination_lon_yoff;
+static int hf_cigi3_2_line_of_sight_segment_request_destination_alt_zoff;
+static int hf_cigi3_2_line_of_sight_segment_request_material_mask;
+static int hf_cigi3_2_line_of_sight_segment_request_update_period;
+static int hf_cigi3_2_line_of_sight_segment_request_destination_entity_id;
 
 /* CIGI3 Line of Sight Vector Request */
 #define CIGI3_PACKET_SIZE_LINE_OF_SIGHT_VECTOR_REQUEST 56
-static int hf_cigi3_line_of_sight_vector_request = -1;
-static int hf_cigi3_line_of_sight_vector_request_los_id = -1;
-static int hf_cigi3_line_of_sight_vector_request_type = -1;
-static int hf_cigi3_line_of_sight_vector_request_source_coord = -1;
-static int hf_cigi3_line_of_sight_vector_request_response_coord = -1;
-static int hf_cigi3_line_of_sight_vector_request_alpha = -1;
-static int hf_cigi3_line_of_sight_vector_request_entity_id = -1;
-static int hf_cigi3_line_of_sight_vector_request_azimuth = -1;
-static int hf_cigi3_line_of_sight_vector_request_elevation = -1;
-static int hf_cigi3_line_of_sight_vector_request_min_range = -1;
-static int hf_cigi3_line_of_sight_vector_request_max_range = -1;
-static int hf_cigi3_line_of_sight_vector_request_source_lat_xoff = -1;
-static int hf_cigi3_line_of_sight_vector_request_source_lon_yoff = -1;
-static int hf_cigi3_line_of_sight_vector_request_source_alt_zoff = -1;
-static int hf_cigi3_line_of_sight_vector_request_material_mask = -1;
+static int hf_cigi3_line_of_sight_vector_request;
+static int hf_cigi3_line_of_sight_vector_request_los_id;
+static int hf_cigi3_line_of_sight_vector_request_type;
+static int hf_cigi3_line_of_sight_vector_request_source_coord;
+static int hf_cigi3_line_of_sight_vector_request_response_coord;
+static int hf_cigi3_line_of_sight_vector_request_alpha;
+static int hf_cigi3_line_of_sight_vector_request_entity_id;
+static int hf_cigi3_line_of_sight_vector_request_azimuth;
+static int hf_cigi3_line_of_sight_vector_request_elevation;
+static int hf_cigi3_line_of_sight_vector_request_min_range;
+static int hf_cigi3_line_of_sight_vector_request_max_range;
+static int hf_cigi3_line_of_sight_vector_request_source_lat_xoff;
+static int hf_cigi3_line_of_sight_vector_request_source_lon_yoff;
+static int hf_cigi3_line_of_sight_vector_request_source_alt_zoff;
+static int hf_cigi3_line_of_sight_vector_request_material_mask;
 
 /* CIGI3_2 Line of Sight Vector Request */
 #define CIGI3_2_PACKET_SIZE_LINE_OF_SIGHT_VECTOR_REQUEST 56
-static int hf_cigi3_2_line_of_sight_vector_request = -1;
-static int hf_cigi3_2_line_of_sight_vector_request_los_id = -1;
-static int hf_cigi3_2_line_of_sight_vector_request_type = -1;
-static int hf_cigi3_2_line_of_sight_vector_request_source_coord = -1;
-static int hf_cigi3_2_line_of_sight_vector_request_response_coord = -1;
-static int hf_cigi3_2_line_of_sight_vector_request_alpha = -1;
-static int hf_cigi3_2_line_of_sight_vector_request_entity_id = -1;
-static int hf_cigi3_2_line_of_sight_vector_request_azimuth = -1;
-static int hf_cigi3_2_line_of_sight_vector_request_elevation = -1;
-static int hf_cigi3_2_line_of_sight_vector_request_min_range = -1;
-static int hf_cigi3_2_line_of_sight_vector_request_max_range = -1;
-static int hf_cigi3_2_line_of_sight_vector_request_source_lat_xoff = -1;
-static int hf_cigi3_2_line_of_sight_vector_request_source_lon_yoff = -1;
-static int hf_cigi3_2_line_of_sight_vector_request_source_alt_zoff = -1;
-static int hf_cigi3_2_line_of_sight_vector_request_material_mask = -1;
-static int hf_cigi3_2_line_of_sight_vector_request_update_period = -1;
+static int hf_cigi3_2_line_of_sight_vector_request;
+static int hf_cigi3_2_line_of_sight_vector_request_los_id;
+static int hf_cigi3_2_line_of_sight_vector_request_type;
+static int hf_cigi3_2_line_of_sight_vector_request_source_coord;
+static int hf_cigi3_2_line_of_sight_vector_request_response_coord;
+static int hf_cigi3_2_line_of_sight_vector_request_alpha;
+static int hf_cigi3_2_line_of_sight_vector_request_entity_id;
+static int hf_cigi3_2_line_of_sight_vector_request_azimuth;
+static int hf_cigi3_2_line_of_sight_vector_request_elevation;
+static int hf_cigi3_2_line_of_sight_vector_request_min_range;
+static int hf_cigi3_2_line_of_sight_vector_request_max_range;
+static int hf_cigi3_2_line_of_sight_vector_request_source_lat_xoff;
+static int hf_cigi3_2_line_of_sight_vector_request_source_lon_yoff;
+static int hf_cigi3_2_line_of_sight_vector_request_source_alt_zoff;
+static int hf_cigi3_2_line_of_sight_vector_request_material_mask;
+static int hf_cigi3_2_line_of_sight_vector_request_update_period;
 
 /* CIGI3 Position Request */
 #define CIGI3_PACKET_SIZE_POSITION_REQUEST 8
-static int hf_cigi3_position_request = -1;
-static int hf_cigi3_position_request_object_id = -1;
-static int hf_cigi3_position_request_part_id = -1;
-static int hf_cigi3_position_request_update_mode = -1;
-static int hf_cigi3_position_request_object_class = -1;
-static int hf_cigi3_position_request_coord_system = -1;
+static int hf_cigi3_position_request;
+static int hf_cigi3_position_request_object_id;
+static int hf_cigi3_position_request_part_id;
+static int hf_cigi3_position_request_update_mode;
+static int hf_cigi3_position_request_object_class;
+static int hf_cigi3_position_request_coord_system;
 
 static const true_false_string cigi3_position_request_update_mode_tfs = {
     "Continuous",
@@ -1735,12 +1735,12 @@ static const value_string cigi3_position_request_coord_system_vals[] = {
 
 /* CIGI3 Environmental Conditions Request */
 #define CIGI3_PACKET_SIZE_ENVIRONMENTAL_CONDITIONS_REQUEST 32
-static int hf_cigi3_environmental_conditions_request = -1;
-static int hf_cigi3_environmental_conditions_request_type = -1;
-static int hf_cigi3_environmental_conditions_request_id = -1;
-static int hf_cigi3_environmental_conditions_request_lat = -1;
-static int hf_cigi3_environmental_conditions_request_lon = -1;
-static int hf_cigi3_environmental_conditions_request_alt = -1;
+static int hf_cigi3_environmental_conditions_request;
+static int hf_cigi3_environmental_conditions_request_type;
+static int hf_cigi3_environmental_conditions_request_id;
+static int hf_cigi3_environmental_conditions_request_lat;
+static int hf_cigi3_environmental_conditions_request_lon;
+static int hf_cigi3_environmental_conditions_request_alt;
 
 static const value_string cigi3_environmental_conditions_request_type_vals[] = {
     {1, "Maritime Surface Conditions"},
@@ -1763,25 +1763,25 @@ static const value_string cigi3_environmental_conditions_request_type_vals[] = {
 
 /* CIGI3_3 Symbol Surface Definition */
 #define CIGI3_PACKET_SIZE_SYMBOL_SURFACE_DEFINITION 56
-static int hf_cigi3_3_symbol_surface_definition = -1;
-static int hf_cigi3_3_symbol_surface_definition_surface_id = -1;
-static int hf_cigi3_3_symbol_surface_definition_surface_state = -1;
-static int hf_cigi3_3_symbol_surface_definition_attach_type = -1;
-static int hf_cigi3_3_symbol_surface_definition_billboard = -1;
-static int hf_cigi3_3_symbol_surface_definition_perspective_growth_enable = -1;
-static int hf_cigi3_3_symbol_surface_definition_entity_view_id = -1;
-static int hf_cigi3_3_symbol_surface_definition_xoff_left = -1;
-static int hf_cigi3_3_symbol_surface_definition_yoff_right = -1;
-static int hf_cigi3_3_symbol_surface_definition_zoff_top = -1;
-static int hf_cigi3_3_symbol_surface_definition_yaw_bottom = -1;
-static int hf_cigi3_3_symbol_surface_definition_pitch = -1;
-static int hf_cigi3_3_symbol_surface_definition_roll = -1;
-static int hf_cigi3_3_symbol_surface_definition_width = -1;
-static int hf_cigi3_3_symbol_surface_definition_height = -1;
-static int hf_cigi3_3_symbol_surface_definition_min_u = -1;
-static int hf_cigi3_3_symbol_surface_definition_max_u = -1;
-static int hf_cigi3_3_symbol_surface_definition_min_v = -1;
-static int hf_cigi3_3_symbol_surface_definition_max_v = -1;
+static int hf_cigi3_3_symbol_surface_definition;
+static int hf_cigi3_3_symbol_surface_definition_surface_id;
+static int hf_cigi3_3_symbol_surface_definition_surface_state;
+static int hf_cigi3_3_symbol_surface_definition_attach_type;
+static int hf_cigi3_3_symbol_surface_definition_billboard;
+static int hf_cigi3_3_symbol_surface_definition_perspective_growth_enable;
+static int hf_cigi3_3_symbol_surface_definition_entity_view_id;
+static int hf_cigi3_3_symbol_surface_definition_xoff_left;
+static int hf_cigi3_3_symbol_surface_definition_yoff_right;
+static int hf_cigi3_3_symbol_surface_definition_zoff_top;
+static int hf_cigi3_3_symbol_surface_definition_yaw_bottom;
+static int hf_cigi3_3_symbol_surface_definition_pitch;
+static int hf_cigi3_3_symbol_surface_definition_roll;
+static int hf_cigi3_3_symbol_surface_definition_width;
+static int hf_cigi3_3_symbol_surface_definition_height;
+static int hf_cigi3_3_symbol_surface_definition_min_u;
+static int hf_cigi3_3_symbol_surface_definition_max_u;
+static int hf_cigi3_3_symbol_surface_definition_min_v;
+static int hf_cigi3_3_symbol_surface_definition_max_v;
 
 static const true_false_string cigi3_3_symbol_surface_definition_surface_state_tfs = {
     "Destroyed",
@@ -1800,13 +1800,13 @@ static const true_false_string cigi3_3_symbol_surface_definition_billboard_tfs =
 
 /* CIGI3_3 Symbol Text Definition */
 #define CIGI3_PACKET_SIZE_SYMBOL_TEXT_DEFINITION 56
-/* static int hf_cigi3_3_symbol_text_definition = -1; */
-static int hf_cigi3_3_symbol_text_definition_symbol_id = -1;
-static int hf_cigi3_3_symbol_text_definition_orientation = -1;
-static int hf_cigi3_3_symbol_text_definition_alignment = -1;
-static int hf_cigi3_3_symbol_text_definition_font_ident = -1;
-static int hf_cigi3_3_symbol_text_definition_font_size = -1;
-static int hf_cigi3_3_symbol_text_definition_text = -1;
+/* static int hf_cigi3_3_symbol_text_definition; */
+static int hf_cigi3_3_symbol_text_definition_symbol_id;
+static int hf_cigi3_3_symbol_text_definition_orientation;
+static int hf_cigi3_3_symbol_text_definition_alignment;
+static int hf_cigi3_3_symbol_text_definition_font_ident;
+static int hf_cigi3_3_symbol_text_definition_font_size;
+static int hf_cigi3_3_symbol_text_definition_text;
 
 static const value_string cigi3_3_symbol_text_definition_alignment_vals[] = {
     {0, "Top Left"},
@@ -1852,12 +1852,12 @@ static const value_string cigi3_3_symbol_text_definition_font_ident_vals[] = {
 
 /* CIGI3_3 Symbol Circle Definition */
 #define CIGI3_PACKET_SIZE_SYMBOL_CIRCLE_DEFINITION 56
-/* static int hf_cigi3_3_symbol_circle_definition = -1; */
-static int hf_cigi3_3_symbol_circle_definition_symbol_id = -1;
-static int hf_cigi3_3_symbol_circle_definition_drawing_style = -1;
-static int hf_cigi3_3_symbol_circle_definition_stipple_pattern = -1;
-static int hf_cigi3_3_symbol_circle_definition_line_width = -1;
-static int hf_cigi3_3_symbol_circle_definition_stipple_pattern_length = -1;
+/* static int hf_cigi3_3_symbol_circle_definition; */
+static int hf_cigi3_3_symbol_circle_definition_symbol_id;
+static int hf_cigi3_3_symbol_circle_definition_drawing_style;
+static int hf_cigi3_3_symbol_circle_definition_stipple_pattern;
+static int hf_cigi3_3_symbol_circle_definition_line_width;
+static int hf_cigi3_3_symbol_circle_definition_stipple_pattern_length;
 static int hf_cigi3_3_symbol_circle_definition_center_u[9];
 static int hf_cigi3_3_symbol_circle_definition_center_v[9];
 static int hf_cigi3_3_symbol_circle_definition_radius[9];
@@ -1872,12 +1872,12 @@ static const true_false_string cigi3_3_symbol_circle_definition_drawing_style_tf
 
 /* CIGI3_3 Symbol Line Definition */
 #define CIGI3_PACKET_SIZE_SYMBOL_LINE_DEFINITION 56
-/* static int hf_cigi3_3_symbol_line_definition = -1; */
-static int hf_cigi3_3_symbol_line_definition_symbol_id = -1;
-static int hf_cigi3_3_symbol_line_definition_primitive_type = -1;
-static int hf_cigi3_3_symbol_line_definition_stipple_pattern = -1;
-static int hf_cigi3_3_symbol_line_definition_line_width = -1;
-static int hf_cigi3_3_symbol_line_definition_stipple_pattern_length = -1;
+/* static int hf_cigi3_3_symbol_line_definition; */
+static int hf_cigi3_3_symbol_line_definition_symbol_id;
+static int hf_cigi3_3_symbol_line_definition_primitive_type;
+static int hf_cigi3_3_symbol_line_definition_stipple_pattern;
+static int hf_cigi3_3_symbol_line_definition_line_width;
+static int hf_cigi3_3_symbol_line_definition_stipple_pattern_length;
 static int hf_cigi3_3_symbol_line_definition_vertex_u[29];
 static int hf_cigi3_3_symbol_line_definition_vertex_v[29];
 
@@ -1896,10 +1896,10 @@ static const value_string cigi3_3_symbol_line_definition_primitive_type_vals[] =
 
 /* CIGI3_3 Symbol Clone */
 #define CIGI3_PACKET_SIZE_SYMBOL_CLONE_DEFINITION 8
-/* static int hf_cigi3_3_symbol_clone = -1; */
-static int hf_cigi3_3_symbol_clone_symbol_id = -1;
-static int hf_cigi3_3_symbol_clone_source_type = -1;
-static int hf_cigi3_3_symbol_clone_source_id = -1;
+/* static int hf_cigi3_3_symbol_clone; */
+static int hf_cigi3_3_symbol_clone_symbol_id;
+static int hf_cigi3_3_symbol_clone_source_type;
+static int hf_cigi3_3_symbol_clone_source_id;
 
 static const true_false_string cigi3_3_symbol_clone_source_type_tfs = {
     "Symbol Template",
@@ -1908,26 +1908,26 @@ static const true_false_string cigi3_3_symbol_clone_source_type_tfs = {
 
 /* CIGI3_3 Symbol Control */
 #define CIGI3_PACKET_SIZE_SYMBOL_CONTROL_DEFINITION 40
-/* static int hf_cigi3_3_symbol_control = -1; */
-static int hf_cigi3_3_symbol_control_symbol_id = -1;
-static int hf_cigi3_3_symbol_control_symbol_state = -1;
-static int hf_cigi3_3_symbol_control_attach_state = -1;
-static int hf_cigi3_3_symbol_control_flash_control = -1;
-static int hf_cigi3_3_symbol_control_inherit_color = -1;
-static int hf_cigi3_3_symbol_control_parent_symbol_ident = -1;
-static int hf_cigi3_3_symbol_control_surface_ident = -1;
-static int hf_cigi3_3_symbol_control_layer = -1;
-static int hf_cigi3_3_symbol_control_flash_duty_cycle = -1;
-static int hf_cigi3_3_symbol_control_flash_period = -1;
-static int hf_cigi3_3_symbol_control_position_u = -1;
-static int hf_cigi3_3_symbol_control_position_v = -1;
-static int hf_cigi3_3_symbol_control_rotation = -1;
-static int hf_cigi3_3_symbol_control_red = -1;
-static int hf_cigi3_3_symbol_control_green = -1;
-static int hf_cigi3_3_symbol_control_blue = -1;
-static int hf_cigi3_3_symbol_control_alpha = -1;
-static int hf_cigi3_3_symbol_control_scale_u = -1;
-static int hf_cigi3_3_symbol_control_scale_v = -1;
+/* static int hf_cigi3_3_symbol_control; */
+static int hf_cigi3_3_symbol_control_symbol_id;
+static int hf_cigi3_3_symbol_control_symbol_state;
+static int hf_cigi3_3_symbol_control_attach_state;
+static int hf_cigi3_3_symbol_control_flash_control;
+static int hf_cigi3_3_symbol_control_inherit_color;
+static int hf_cigi3_3_symbol_control_parent_symbol_ident;
+static int hf_cigi3_3_symbol_control_surface_ident;
+static int hf_cigi3_3_symbol_control_layer;
+static int hf_cigi3_3_symbol_control_flash_duty_cycle;
+static int hf_cigi3_3_symbol_control_flash_period;
+static int hf_cigi3_3_symbol_control_position_u;
+static int hf_cigi3_3_symbol_control_position_v;
+static int hf_cigi3_3_symbol_control_rotation;
+static int hf_cigi3_3_symbol_control_red;
+static int hf_cigi3_3_symbol_control_green;
+static int hf_cigi3_3_symbol_control_blue;
+static int hf_cigi3_3_symbol_control_alpha;
+static int hf_cigi3_3_symbol_control_scale_u;
+static int hf_cigi3_3_symbol_control_scale_v;
 
 static const value_string cigi3_3_symbol_control_symbol_state_vals[] = {
     {0, "Hidden"},
@@ -1948,26 +1948,26 @@ static const true_false_string cigi3_3_symbol_control_inherit_color_tfs = {
 
 /* CIGI3_3 Short Symbol Control */
 #define CIGI3_PACKET_SIZE_SHORT_SYMBOL_CONTROL_DEFINITION 32
-/* static int hf_cigi3_3_short_symbol_control = -1; */
-static int hf_cigi3_3_short_symbol_control_symbol_id = -1;
-static int hf_cigi3_3_short_symbol_control_inherit_color = -1;
-static int hf_cigi3_3_short_symbol_control_flash_control = -1;
-static int hf_cigi3_3_short_symbol_control_attach_state = -1;
-static int hf_cigi3_3_short_symbol_control_symbol_state = -1;
-static int hf_cigi3_3_short_symbol_control_attribute_select1 = -1;
-static int hf_cigi3_3_short_symbol_control_attribute_select2 = -1;
-static int hf_cigi3_3_short_symbol_control_attribute_value1 = -1;
-static int hf_cigi3_3_short_symbol_control_attribute_value2 = -1;
-static int hf_cigi3_3_short_symbol_control_attribute_value1f = -1;
-static int hf_cigi3_3_short_symbol_control_attribute_value2f = -1;
-static int hf_cigi3_3_short_symbol_control_red1 = -1;
-static int hf_cigi3_3_short_symbol_control_green1 = -1;
-static int hf_cigi3_3_short_symbol_control_blue1 = -1;
-static int hf_cigi3_3_short_symbol_control_alpha1 = -1;
-static int hf_cigi3_3_short_symbol_control_red2 = -1;
-static int hf_cigi3_3_short_symbol_control_green2 = -1;
-static int hf_cigi3_3_short_symbol_control_blue2 = -1;
-static int hf_cigi3_3_short_symbol_control_alpha2 = -1;
+/* static int hf_cigi3_3_short_symbol_control; */
+static int hf_cigi3_3_short_symbol_control_symbol_id;
+static int hf_cigi3_3_short_symbol_control_inherit_color;
+static int hf_cigi3_3_short_symbol_control_flash_control;
+static int hf_cigi3_3_short_symbol_control_attach_state;
+static int hf_cigi3_3_short_symbol_control_symbol_state;
+static int hf_cigi3_3_short_symbol_control_attribute_select1;
+static int hf_cigi3_3_short_symbol_control_attribute_select2;
+static int hf_cigi3_3_short_symbol_control_attribute_value1;
+static int hf_cigi3_3_short_symbol_control_attribute_value2;
+static int hf_cigi3_3_short_symbol_control_attribute_value1f;
+static int hf_cigi3_3_short_symbol_control_attribute_value2f;
+static int hf_cigi3_3_short_symbol_control_red1;
+static int hf_cigi3_3_short_symbol_control_green1;
+static int hf_cigi3_3_short_symbol_control_blue1;
+static int hf_cigi3_3_short_symbol_control_alpha1;
+static int hf_cigi3_3_short_symbol_control_red2;
+static int hf_cigi3_3_short_symbol_control_green2;
+static int hf_cigi3_3_short_symbol_control_blue2;
+static int hf_cigi3_3_short_symbol_control_alpha2;
 
 static const value_string cigi3_3_short_symbol_control_attribute_select_vals[] = {
     {0, "None"},
@@ -1987,14 +1987,14 @@ static const value_string cigi3_3_short_symbol_control_attribute_select_vals[] =
 
 /* CIGI3 Start of Frame */
 #define CIGI3_PACKET_SIZE_START_OF_FRAME 16
-static int hf_cigi3_start_of_frame = -1;
-static int hf_cigi3_start_of_frame_db_number = -1;
-static int hf_cigi3_start_of_frame_ig_status = -1;
-static int hf_cigi3_start_of_frame_ig_mode = -1;
-static int hf_cigi3_start_of_frame_timestamp_valid = -1;
-static int hf_cigi3_start_of_frame_earth_reference_model = -1;
-static int hf_cigi3_start_of_frame_frame_ctr = -1;
-static int hf_cigi3_start_of_frame_timestamp = -1;
+static int hf_cigi3_start_of_frame;
+static int hf_cigi3_start_of_frame_db_number;
+static int hf_cigi3_start_of_frame_ig_status;
+static int hf_cigi3_start_of_frame_ig_mode;
+static int hf_cigi3_start_of_frame_timestamp_valid;
+static int hf_cigi3_start_of_frame_earth_reference_model;
+static int hf_cigi3_start_of_frame_frame_ctr;
+static int hf_cigi3_start_of_frame_timestamp;
 
 static const value_string cigi3_start_of_frame_ig_mode_vals[] = {
     {0, "Reset/Standby"},
@@ -2011,16 +2011,16 @@ static const true_false_string cigi3_start_of_frame_earth_reference_model_tfs =
 
 /* CIGI3_2 Start of Frame */
 #define CIGI3_2_PACKET_SIZE_START_OF_FRAME 24
-static int hf_cigi3_2_start_of_frame = -1;
-static int hf_cigi3_2_start_of_frame_db_number = -1;
-static int hf_cigi3_2_start_of_frame_ig_status = -1;
-static int hf_cigi3_2_start_of_frame_ig_mode = -1;
-static int hf_cigi3_2_start_of_frame_timestamp_valid = -1;
-static int hf_cigi3_2_start_of_frame_earth_reference_model = -1;
-static int hf_cigi3_2_start_of_frame_minor_version = -1;
-static int hf_cigi3_2_start_of_frame_ig_frame_number = -1;
-static int hf_cigi3_2_start_of_frame_timestamp = -1;
-static int hf_cigi3_2_start_of_frame_last_host_frame_number = -1;
+static int hf_cigi3_2_start_of_frame;
+static int hf_cigi3_2_start_of_frame_db_number;
+static int hf_cigi3_2_start_of_frame_ig_status;
+static int hf_cigi3_2_start_of_frame_ig_mode;
+static int hf_cigi3_2_start_of_frame_timestamp_valid;
+static int hf_cigi3_2_start_of_frame_earth_reference_model;
+static int hf_cigi3_2_start_of_frame_minor_version;
+static int hf_cigi3_2_start_of_frame_ig_frame_number;
+static int hf_cigi3_2_start_of_frame_timestamp;
+static int hf_cigi3_2_start_of_frame_last_host_frame_number;
 
 static const value_string cigi3_2_start_of_frame_ig_mode_vals[] = {
     {0, "Reset/Standby"},
@@ -2037,11 +2037,11 @@ static const true_false_string cigi3_2_start_of_frame_earth_reference_model_tfs
 
 /* CIGI3 HAT/HOT Response */
 #define CIGI3_PACKET_SIZE_HAT_HOT_RESPONSE 16
-static int hf_cigi3_hat_hot_response = -1;
-static int hf_cigi3_hat_hot_response_hat_hot_id = -1;
-static int hf_cigi3_hat_hot_response_valid = -1;
-static int hf_cigi3_hat_hot_response_type = -1;
-static int hf_cigi3_hat_hot_response_height = -1;
+static int hf_cigi3_hat_hot_response;
+static int hf_cigi3_hat_hot_response_hat_hot_id;
+static int hf_cigi3_hat_hot_response_valid;
+static int hf_cigi3_hat_hot_response_type;
+static int hf_cigi3_hat_hot_response_height;
 
 static const true_false_string cigi3_hat_hot_response_type_tfs = {
     "HOT",
@@ -2050,12 +2050,12 @@ static const true_false_string cigi3_hat_hot_response_type_tfs = {
 
 /* CIGI3_2 HAT/HOT Response */
 #define CIGI3_2_PACKET_SIZE_HAT_HOT_RESPONSE 16
-static int hf_cigi3_2_hat_hot_response = -1;
-static int hf_cigi3_2_hat_hot_response_hat_hot_id = -1;
-static int hf_cigi3_2_hat_hot_response_valid = -1;
-static int hf_cigi3_2_hat_hot_response_type = -1;
-static int hf_cigi3_2_hat_hot_response_host_frame_number_lsn = -1;
-static int hf_cigi3_2_hat_hot_response_height = -1;
+static int hf_cigi3_2_hat_hot_response;
+static int hf_cigi3_2_hat_hot_response_hat_hot_id;
+static int hf_cigi3_2_hat_hot_response_valid;
+static int hf_cigi3_2_hat_hot_response_type;
+static int hf_cigi3_2_hat_hot_response_host_frame_number_lsn;
+static int hf_cigi3_2_hat_hot_response_height;
 
 static const true_false_string cigi3_2_hat_hot_response_type_tfs = {
     "HOT",
@@ -2064,107 +2064,107 @@ static const true_false_string cigi3_2_hat_hot_response_type_tfs = {
 
 /* CIGI3 HAT/HOT Extended Response */
 #define CIGI3_PACKET_SIZE_HAT_HOT_EXTENDED_RESPONSE 40
-static int hf_cigi3_hat_hot_extended_response = -1;
-static int hf_cigi3_hat_hot_extended_response_hat_hot_id = -1;
-static int hf_cigi3_hat_hot_extended_response_valid = -1;
-static int hf_cigi3_hat_hot_extended_response_hat = -1;
-static int hf_cigi3_hat_hot_extended_response_hot = -1;
-static int hf_cigi3_hat_hot_extended_response_material_code = -1;
-static int hf_cigi3_hat_hot_extended_response_normal_vector_azimuth = -1;
-static int hf_cigi3_hat_hot_extended_response_normal_vector_elevation = -1;
+static int hf_cigi3_hat_hot_extended_response;
+static int hf_cigi3_hat_hot_extended_response_hat_hot_id;
+static int hf_cigi3_hat_hot_extended_response_valid;
+static int hf_cigi3_hat_hot_extended_response_hat;
+static int hf_cigi3_hat_hot_extended_response_hot;
+static int hf_cigi3_hat_hot_extended_response_material_code;
+static int hf_cigi3_hat_hot_extended_response_normal_vector_azimuth;
+static int hf_cigi3_hat_hot_extended_response_normal_vector_elevation;
 
 /* CIGI3_2 HAT/HOT Extended Response */
 #define CIGI3_2_PACKET_SIZE_HAT_HOT_EXTENDED_RESPONSE 40
-static int hf_cigi3_2_hat_hot_extended_response = -1;
-static int hf_cigi3_2_hat_hot_extended_response_hat_hot_id = -1;
-static int hf_cigi3_2_hat_hot_extended_response_valid = -1;
-static int hf_cigi3_2_hat_hot_extended_response_host_frame_number_lsn = -1;
-static int hf_cigi3_2_hat_hot_extended_response_hat = -1;
-static int hf_cigi3_2_hat_hot_extended_response_hot = -1;
-static int hf_cigi3_2_hat_hot_extended_response_material_code = -1;
-static int hf_cigi3_2_hat_hot_extended_response_normal_vector_azimuth = -1;
-static int hf_cigi3_2_hat_hot_extended_response_normal_vector_elevation = -1;
+static int hf_cigi3_2_hat_hot_extended_response;
+static int hf_cigi3_2_hat_hot_extended_response_hat_hot_id;
+static int hf_cigi3_2_hat_hot_extended_response_valid;
+static int hf_cigi3_2_hat_hot_extended_response_host_frame_number_lsn;
+static int hf_cigi3_2_hat_hot_extended_response_hat;
+static int hf_cigi3_2_hat_hot_extended_response_hot;
+static int hf_cigi3_2_hat_hot_extended_response_material_code;
+static int hf_cigi3_2_hat_hot_extended_response_normal_vector_azimuth;
+static int hf_cigi3_2_hat_hot_extended_response_normal_vector_elevation;
 
 /* CIGI3 Line of Sight Response */
 #define CIGI3_PACKET_SIZE_LINE_OF_SIGHT_RESPONSE 16
-static int hf_cigi3_line_of_sight_response = -1;
-static int hf_cigi3_line_of_sight_response_los_id = -1;
-static int hf_cigi3_line_of_sight_response_valid = -1;
-static int hf_cigi3_line_of_sight_response_entity_id_valid = -1;
-static int hf_cigi3_line_of_sight_response_visible = -1;
-static int hf_cigi3_line_of_sight_response_count = -1;
-static int hf_cigi3_line_of_sight_response_entity_id = -1;
-static int hf_cigi3_line_of_sight_response_range = -1;
+static int hf_cigi3_line_of_sight_response;
+static int hf_cigi3_line_of_sight_response_los_id;
+static int hf_cigi3_line_of_sight_response_valid;
+static int hf_cigi3_line_of_sight_response_entity_id_valid;
+static int hf_cigi3_line_of_sight_response_visible;
+static int hf_cigi3_line_of_sight_response_count;
+static int hf_cigi3_line_of_sight_response_entity_id;
+static int hf_cigi3_line_of_sight_response_range;
 
 /* CIGI3_2 Line of Sight Response */
 #define CIGI3_2_PACKET_SIZE_LINE_OF_SIGHT_RESPONSE 16
-static int hf_cigi3_2_line_of_sight_response = -1;
-static int hf_cigi3_2_line_of_sight_response_los_id = -1;
-static int hf_cigi3_2_line_of_sight_response_valid = -1;
-static int hf_cigi3_2_line_of_sight_response_entity_id_valid = -1;
-static int hf_cigi3_2_line_of_sight_response_visible = -1;
-static int hf_cigi3_2_line_of_sight_response_host_frame_number_lsn = -1;
-static int hf_cigi3_2_line_of_sight_response_count = -1;
-static int hf_cigi3_2_line_of_sight_response_entity_id = -1;
-static int hf_cigi3_2_line_of_sight_response_range = -1;
+static int hf_cigi3_2_line_of_sight_response;
+static int hf_cigi3_2_line_of_sight_response_los_id;
+static int hf_cigi3_2_line_of_sight_response_valid;
+static int hf_cigi3_2_line_of_sight_response_entity_id_valid;
+static int hf_cigi3_2_line_of_sight_response_visible;
+static int hf_cigi3_2_line_of_sight_response_host_frame_number_lsn;
+static int hf_cigi3_2_line_of_sight_response_count;
+static int hf_cigi3_2_line_of_sight_response_entity_id;
+static int hf_cigi3_2_line_of_sight_response_range;
 
 /* CIGI3 Line of Sight Extended Response */
 #define CIGI3_PACKET_SIZE_LINE_OF_SIGHT_EXTENDED_RESPONSE 56
-static int hf_cigi3_line_of_sight_extended_response = -1;
-static int hf_cigi3_line_of_sight_extended_response_los_id = -1;
-static int hf_cigi3_line_of_sight_extended_response_valid = -1;
-static int hf_cigi3_line_of_sight_extended_response_entity_id_valid = -1;
-static int hf_cigi3_line_of_sight_extended_response_range_valid = -1;
-static int hf_cigi3_line_of_sight_extended_response_visible = -1;
-static int hf_cigi3_line_of_sight_extended_response_intersection_coord = -1;
-static int hf_cigi3_line_of_sight_extended_response_response_count = -1;
-static int hf_cigi3_line_of_sight_extended_response_entity_id = -1;
-static int hf_cigi3_line_of_sight_extended_response_range = -1;
-static int hf_cigi3_line_of_sight_extended_response_lat_xoff = -1;
-static int hf_cigi3_line_of_sight_extended_response_lon_yoff = -1;
-static int hf_cigi3_line_of_sight_extended_response_alt_zoff = -1;
-static int hf_cigi3_line_of_sight_extended_response_red = -1;
-static int hf_cigi3_line_of_sight_extended_response_green = -1;
-static int hf_cigi3_line_of_sight_extended_response_blue = -1;
-static int hf_cigi3_line_of_sight_extended_response_alpha = -1;
-static int hf_cigi3_line_of_sight_extended_response_material_code = -1;
-static int hf_cigi3_line_of_sight_extended_response_normal_vector_azimuth = -1;
-static int hf_cigi3_line_of_sight_extended_response_normal_vector_elevation = -1;
+static int hf_cigi3_line_of_sight_extended_response;
+static int hf_cigi3_line_of_sight_extended_response_los_id;
+static int hf_cigi3_line_of_sight_extended_response_valid;
+static int hf_cigi3_line_of_sight_extended_response_entity_id_valid;
+static int hf_cigi3_line_of_sight_extended_response_range_valid;
+static int hf_cigi3_line_of_sight_extended_response_visible;
+static int hf_cigi3_line_of_sight_extended_response_intersection_coord;
+static int hf_cigi3_line_of_sight_extended_response_response_count;
+static int hf_cigi3_line_of_sight_extended_response_entity_id;
+static int hf_cigi3_line_of_sight_extended_response_range;
+static int hf_cigi3_line_of_sight_extended_response_lat_xoff;
+static int hf_cigi3_line_of_sight_extended_response_lon_yoff;
+static int hf_cigi3_line_of_sight_extended_response_alt_zoff;
+static int hf_cigi3_line_of_sight_extended_response_red;
+static int hf_cigi3_line_of_sight_extended_response_green;
+static int hf_cigi3_line_of_sight_extended_response_blue;
+static int hf_cigi3_line_of_sight_extended_response_alpha;
+static int hf_cigi3_line_of_sight_extended_response_material_code;
+static int hf_cigi3_line_of_sight_extended_response_normal_vector_azimuth;
+static int hf_cigi3_line_of_sight_extended_response_normal_vector_elevation;
 
 /* CIGI3_2 Line of Sight Extended Response */
 #define CIGI3_2_PACKET_SIZE_LINE_OF_SIGHT_EXTENDED_RESPONSE 56
-static int hf_cigi3_2_line_of_sight_extended_response = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_los_id = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_valid = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_entity_id_valid = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_range_valid = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_visible = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_host_frame_number_lsn = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_response_count = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_entity_id = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_range = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_lat_xoff = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_lon_yoff = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_alt_zoff = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_red = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_green = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_blue = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_alpha = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_material_code = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_normal_vector_azimuth = -1;
-static int hf_cigi3_2_line_of_sight_extended_response_normal_vector_elevation = -1;
+static int hf_cigi3_2_line_of_sight_extended_response;
+static int hf_cigi3_2_line_of_sight_extended_response_los_id;
+static int hf_cigi3_2_line_of_sight_extended_response_valid;
+static int hf_cigi3_2_line_of_sight_extended_response_entity_id_valid;
+static int hf_cigi3_2_line_of_sight_extended_response_range_valid;
+static int hf_cigi3_2_line_of_sight_extended_response_visible;
+static int hf_cigi3_2_line_of_sight_extended_response_host_frame_number_lsn;
+static int hf_cigi3_2_line_of_sight_extended_response_response_count;
+static int hf_cigi3_2_line_of_sight_extended_response_entity_id;
+static int hf_cigi3_2_line_of_sight_extended_response_range;
+static int hf_cigi3_2_line_of_sight_extended_response_lat_xoff;
+static int hf_cigi3_2_line_of_sight_extended_response_lon_yoff;
+static int hf_cigi3_2_line_of_sight_extended_response_alt_zoff;
+static int hf_cigi3_2_line_of_sight_extended_response_red;
+static int hf_cigi3_2_line_of_sight_extended_response_green;
+static int hf_cigi3_2_line_of_sight_extended_response_blue;
+static int hf_cigi3_2_line_of_sight_extended_response_alpha;
+static int hf_cigi3_2_line_of_sight_extended_response_material_code;
+static int hf_cigi3_2_line_of_sight_extended_response_normal_vector_azimuth;
+static int hf_cigi3_2_line_of_sight_extended_response_normal_vector_elevation;
 
 /* CIGI3 Sensor Response */
 #define CIGI3_PACKET_SIZE_SENSOR_RESPONSE 24
-static int hf_cigi3_sensor_response = -1;
-static int hf_cigi3_sensor_response_view_id = -1;
-static int hf_cigi3_sensor_response_sensor_id = -1;
-static int hf_cigi3_sensor_response_sensor_status = -1;
-static int hf_cigi3_sensor_response_gate_x_size = -1;
-static int hf_cigi3_sensor_response_gate_y_size = -1;
-static int hf_cigi3_sensor_response_gate_x_pos = -1;
-static int hf_cigi3_sensor_response_gate_y_pos = -1;
-static int hf_cigi3_sensor_response_frame_ctr = -1;
+static int hf_cigi3_sensor_response;
+static int hf_cigi3_sensor_response_view_id;
+static int hf_cigi3_sensor_response_sensor_id;
+static int hf_cigi3_sensor_response_sensor_status;
+static int hf_cigi3_sensor_response_gate_x_size;
+static int hf_cigi3_sensor_response_gate_y_size;
+static int hf_cigi3_sensor_response_gate_x_pos;
+static int hf_cigi3_sensor_response_gate_y_pos;
+static int hf_cigi3_sensor_response_frame_ctr;
 
 static const value_string cigi3_sensor_response_sensor_status_vals[] = {
     {0, "Searching for target"},
@@ -2176,20 +2176,20 @@ static const value_string cigi3_sensor_response_sensor_status_vals[] = {
 
 /* CIGI3 Sensor Extended Response */
 #define CIGI3_PACKET_SIZE_SENSOR_EXTENDED_RESPONSE 48
-static int hf_cigi3_sensor_extended_response = -1;
-static int hf_cigi3_sensor_extended_response_view_id = -1;
-static int hf_cigi3_sensor_extended_response_sensor_id = -1;
-static int hf_cigi3_sensor_extended_response_sensor_status = -1;
-static int hf_cigi3_sensor_extended_response_entity_id_valid = -1;
-static int hf_cigi3_sensor_extended_response_entity_id = -1;
-static int hf_cigi3_sensor_extended_response_gate_x_size = -1;
-static int hf_cigi3_sensor_extended_response_gate_y_size = -1;
-static int hf_cigi3_sensor_extended_response_gate_x_pos = -1;
-static int hf_cigi3_sensor_extended_response_gate_y_pos = -1;
-static int hf_cigi3_sensor_extended_response_frame_ctr = -1;
-static int hf_cigi3_sensor_extended_response_track_lat = -1;
-static int hf_cigi3_sensor_extended_response_track_lon = -1;
-static int hf_cigi3_sensor_extended_response_track_alt = -1;
+static int hf_cigi3_sensor_extended_response;
+static int hf_cigi3_sensor_extended_response_view_id;
+static int hf_cigi3_sensor_extended_response_sensor_id;
+static int hf_cigi3_sensor_extended_response_sensor_status;
+static int hf_cigi3_sensor_extended_response_entity_id_valid;
+static int hf_cigi3_sensor_extended_response_entity_id;
+static int hf_cigi3_sensor_extended_response_gate_x_size;
+static int hf_cigi3_sensor_extended_response_gate_y_size;
+static int hf_cigi3_sensor_extended_response_gate_x_pos;
+static int hf_cigi3_sensor_extended_response_gate_y_pos;
+static int hf_cigi3_sensor_extended_response_frame_ctr;
+static int hf_cigi3_sensor_extended_response_track_lat;
+static int hf_cigi3_sensor_extended_response_track_lon;
+static int hf_cigi3_sensor_extended_response_track_alt;
 
 static const value_string cigi3_sensor_extended_response_sensor_status_vals[] = {
     {0, "Searching for target"},
@@ -2201,17 +2201,17 @@ static const value_string cigi3_sensor_extended_response_sensor_status_vals[] =
 
 /* CIGI3 Position Response */
 #define CIGI3_PACKET_SIZE_POSITION_RESPONSE 48
-static int hf_cigi3_position_response = -1;
-static int hf_cigi3_position_response_object_id = -1;
-static int hf_cigi3_position_response_part_id = -1;
-static int hf_cigi3_position_response_object_class = -1;
-static int hf_cigi3_position_response_coord_system = -1;
-static int hf_cigi3_position_response_lat_xoff = -1;
-static int hf_cigi3_position_response_lon_yoff = -1;
-static int hf_cigi3_position_response_alt_zoff = -1;
-static int hf_cigi3_position_response_roll = -1;
-static int hf_cigi3_position_response_pitch = -1;
-static int hf_cigi3_position_response_yaw = -1;
+static int hf_cigi3_position_response;
+static int hf_cigi3_position_response_object_id;
+static int hf_cigi3_position_response_part_id;
+static int hf_cigi3_position_response_object_class;
+static int hf_cigi3_position_response_coord_system;
+static int hf_cigi3_position_response_lat_xoff;
+static int hf_cigi3_position_response_lon_yoff;
+static int hf_cigi3_position_response_alt_zoff;
+static int hf_cigi3_position_response_roll;
+static int hf_cigi3_position_response_pitch;
+static int hf_cigi3_position_response_yaw;
 
 static const value_string cigi3_position_response_object_class_vals[] = {
     {0, "Entity"},
@@ -2231,46 +2231,46 @@ static const value_string cigi3_position_response_coord_system_vals[] = {
 
 /* CIGI3 Weather Conditions Response */
 #define CIGI3_PACKET_SIZE_WEATHER_CONDITIONS_RESPONSE 32
-static int hf_cigi3_weather_conditions_response = -1;
-static int hf_cigi3_weather_conditions_response_request_id = -1;
-static int hf_cigi3_weather_conditions_response_humidity = -1;
-static int hf_cigi3_weather_conditions_response_air_temp = -1;
-static int hf_cigi3_weather_conditions_response_visibility_range = -1;
-static int hf_cigi3_weather_conditions_response_horiz_speed = -1;
-static int hf_cigi3_weather_conditions_response_vert_speed = -1;
-static int hf_cigi3_weather_conditions_response_wind_direction = -1;
-static int hf_cigi3_weather_conditions_response_barometric_pressure = -1;
+static int hf_cigi3_weather_conditions_response;
+static int hf_cigi3_weather_conditions_response_request_id;
+static int hf_cigi3_weather_conditions_response_humidity;
+static int hf_cigi3_weather_conditions_response_air_temp;
+static int hf_cigi3_weather_conditions_response_visibility_range;
+static int hf_cigi3_weather_conditions_response_horiz_speed;
+static int hf_cigi3_weather_conditions_response_vert_speed;
+static int hf_cigi3_weather_conditions_response_wind_direction;
+static int hf_cigi3_weather_conditions_response_barometric_pressure;
 
 /* CIGI3 Aerosol Concentration Response */
 #define CIGI3_PACKET_SIZE_AEROSOL_CONCENTRATION_RESPONSE 8
-static int hf_cigi3_aerosol_concentration_response = -1;
-static int hf_cigi3_aerosol_concentration_response_request_id = -1;
-static int hf_cigi3_aerosol_concentration_response_layer_id = -1;
-static int hf_cigi3_aerosol_concentration_response_aerosol_concentration = -1;
+static int hf_cigi3_aerosol_concentration_response;
+static int hf_cigi3_aerosol_concentration_response_request_id;
+static int hf_cigi3_aerosol_concentration_response_layer_id;
+static int hf_cigi3_aerosol_concentration_response_aerosol_concentration;
 
 /* CIGI3 Maritime Surface Conditions Response */
 #define CIGI3_PACKET_SIZE_MARITIME_SURFACE_CONDITIONS_RESPONSE 16
-static int hf_cigi3_maritime_surface_conditions_response = -1;
-static int hf_cigi3_maritime_surface_conditions_response_request_id = -1;
-static int hf_cigi3_maritime_surface_conditions_response_sea_surface_height = -1;
-static int hf_cigi3_maritime_surface_conditions_response_surface_water_temp = -1;
-static int hf_cigi3_maritime_surface_conditions_response_surface_clarity = -1;
+static int hf_cigi3_maritime_surface_conditions_response;
+static int hf_cigi3_maritime_surface_conditions_response_request_id;
+static int hf_cigi3_maritime_surface_conditions_response_sea_surface_height;
+static int hf_cigi3_maritime_surface_conditions_response_surface_water_temp;
+static int hf_cigi3_maritime_surface_conditions_response_surface_clarity;
 
 /* CIGI3 Terrestrial Surface Conditions Response */
 #define CIGI3_PACKET_SIZE_TERRESTRIAL_SURFACE_CONDITIONS_RESPONSE 8
-static int hf_cigi3_terrestrial_surface_conditions_response = -1;
-static int hf_cigi3_terrestrial_surface_conditions_response_request_id = -1;
-static int hf_cigi3_terrestrial_surface_conditions_response_surface_id = -1;
+static int hf_cigi3_terrestrial_surface_conditions_response;
+static int hf_cigi3_terrestrial_surface_conditions_response_request_id;
+static int hf_cigi3_terrestrial_surface_conditions_response_surface_id;
 
 /* CIGI3 Collision Detection Segment Notification */
 #define CIGI3_PACKET_SIZE_COLLISION_DETECTION_SEGMENT_NOTIFICATION 16
-static int hf_cigi3_collision_detection_segment_notification = -1;
-static int hf_cigi3_collision_detection_segment_notification_entity_id = -1;
-static int hf_cigi3_collision_detection_segment_notification_segment_id = -1;
-static int hf_cigi3_collision_detection_segment_notification_type = -1;
-static int hf_cigi3_collision_detection_segment_notification_contacted_entity_id = -1;
-static int hf_cigi3_collision_detection_segment_notification_material_code = -1;
-static int hf_cigi3_collision_detection_segment_notification_intersection_distance = -1;
+static int hf_cigi3_collision_detection_segment_notification;
+static int hf_cigi3_collision_detection_segment_notification_entity_id;
+static int hf_cigi3_collision_detection_segment_notification_segment_id;
+static int hf_cigi3_collision_detection_segment_notification_type;
+static int hf_cigi3_collision_detection_segment_notification_contacted_entity_id;
+static int hf_cigi3_collision_detection_segment_notification_material_code;
+static int hf_cigi3_collision_detection_segment_notification_intersection_distance;
 
 static const true_false_string cigi3_collision_detection_segment_notification_type_tfs = {
     "Entity",
@@ -2279,12 +2279,12 @@ static const true_false_string cigi3_collision_detection_segment_notification_ty
 
 /* CIGI3 Collision Detection Volume Notification */
 #define CIGI3_PACKET_SIZE_COLLISION_DETECTION_VOLUME_NOTIFICATION 16
-static int hf_cigi3_collision_detection_volume_notification = -1;
-static int hf_cigi3_collision_detection_volume_notification_entity_id = -1;
-static int hf_cigi3_collision_detection_volume_notification_volume_id = -1;
-static int hf_cigi3_collision_detection_volume_notification_type = -1;
-static int hf_cigi3_collision_detection_volume_notification_contacted_entity_id = -1;
-static int hf_cigi3_collision_detection_volume_notification_contacted_volume_id = -1;
+static int hf_cigi3_collision_detection_volume_notification;
+static int hf_cigi3_collision_detection_volume_notification_entity_id;
+static int hf_cigi3_collision_detection_volume_notification_volume_id;
+static int hf_cigi3_collision_detection_volume_notification_type;
+static int hf_cigi3_collision_detection_volume_notification_contacted_entity_id;
+static int hf_cigi3_collision_detection_volume_notification_contacted_volume_id;
 
 static const true_false_string cigi3_collision_detection_volume_notification_type_tfs = {
     "Entity",
@@ -2293,27 +2293,27 @@ static const true_false_string cigi3_collision_detection_volume_notification_typ
 
 /* CIGI3 Animation Stop Notification */
 #define CIGI3_PACKET_SIZE_ANIMATION_STOP_NOTIFICATION 8
-static int hf_cigi3_animation_stop_notification = -1;
-static int hf_cigi3_animation_stop_notification_entity_id = -1;
+static int hf_cigi3_animation_stop_notification;
+static int hf_cigi3_animation_stop_notification_entity_id;
 
 /* CIGI3 Event Notification */
 #define CIGI3_PACKET_SIZE_EVENT_NOTIFICATION 16
-static int hf_cigi3_event_notification = -1;
-static int hf_cigi3_event_notification_event_id = -1;
-static int hf_cigi3_event_notification_data_1 = -1;
-static int hf_cigi3_event_notification_data_2 = -1;
-static int hf_cigi3_event_notification_data_3 = -1;
+static int hf_cigi3_event_notification;
+static int hf_cigi3_event_notification_event_id;
+static int hf_cigi3_event_notification_data_1;
+static int hf_cigi3_event_notification_data_2;
+static int hf_cigi3_event_notification_data_3;
 
 /* CIGI3 Image Generator Message */
-static int hf_cigi3_image_generator_message = -1;
-static int hf_cigi3_image_generator_message_id = -1;
-static int hf_cigi3_image_generator_message_message = -1;
+static int hf_cigi3_image_generator_message;
+static int hf_cigi3_image_generator_message_id;
+static int hf_cigi3_image_generator_message_message;
 
 /* CIGI3 User-Defined Packets */
-static int hf_cigi3_user_defined = -1;
+static int hf_cigi3_user_defined;
 
 
-static expert_field ei_cigi_invalid_len = EI_INIT;
+static expert_field ei_cigi_invalid_len;
 
 
 /* Global preferences */
@@ -2335,7 +2335,7 @@ static const char *global_ig_ip;
 
 
 /* Initialize the subtree pointers */
-static gint ett_cigi = -1;
+static gint ett_cigi;
 
 /* The version of cigi to use */
 static gint cigi_version = 0;
diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c
index 9cfaa600b6..63cc93754a 100644
--- a/epan/dissectors/packet-cimd.c
+++ b/epan/dissectors/packet-cimd.c
@@ -124,25 +124,25 @@ static void dissect_cimd_error_code(tvbuff_t *tvb, proto_tree *tree, gint pindex
 
 static dissector_handle_t cimd_handle;
 
-static int proto_cimd = -1;
+static int proto_cimd;
 /* Initialize the subtree pointers */
-static gint ett_cimd = -1;
+static gint ett_cimd;
 
 /* Initialize the protocol and registered fields */
-static int hf_cimd_opcode_indicator = -1;
-static int hf_cimd_packet_number_indicator = -1;
-static int hf_cimd_checksum_indicator = -1;
-static int hf_cimd_pcode_indicator = -1;
-
-static int hf_cimd_dcs_coding_group_indicatorC0 = -1;
-static int hf_cimd_dcs_coding_group_indicatorF0 = -1;
-static int hf_cimd_dcs_compressed_indicator = -1;
-static int hf_cimd_dcs_message_class_meaning_indicator = -1;
-static int hf_cimd_dcs_message_class_indicator = -1;
-static int hf_cimd_dcs_character_set_indicator0C = -1;
-static int hf_cimd_dcs_character_set_indicator04 = -1;
-static int hf_cimd_dcs_indication_sense = -1;
-static int hf_cimd_dcs_indication_type = -1;
+static int hf_cimd_opcode_indicator;
+static int hf_cimd_packet_number_indicator;
+static int hf_cimd_checksum_indicator;
+static int hf_cimd_pcode_indicator;
+
+static int hf_cimd_dcs_coding_group_indicatorC0;
+static int hf_cimd_dcs_coding_group_indicatorF0;
+static int hf_cimd_dcs_compressed_indicator;
+static int hf_cimd_dcs_message_class_meaning_indicator;
+static int hf_cimd_dcs_message_class_indicator;
+static int hf_cimd_dcs_character_set_indicator0C;
+static int hf_cimd_dcs_character_set_indicator04;
+static int hf_cimd_dcs_indication_sense;
+static int hf_cimd_dcs_indication_type;
 
 static const value_string vals_hdr_OC[] = {
   /* operation codes array */
diff --git a/epan/dissectors/packet-cimetrics.c b/epan/dissectors/packet-cimetrics.c
index acfe05cdb9..db58784db3 100644
--- a/epan/dissectors/packet-cimetrics.c
+++ b/epan/dissectors/packet-cimetrics.c
@@ -28,12 +28,12 @@ static const value_string cimetrics_pid_vals[] = {
 	{ 0,		NULL }
 };
 
-static int proto_cimetrics_mstp = -1;
-static int hf_llc_cimetrics_pid = -1;
-static gint ett_cimetrics_mstp = -1;
+static int proto_cimetrics_mstp;
+static int hf_llc_cimetrics_pid;
+static gint ett_cimetrics_mstp;
 
-static int hf_cimetrics_mstp_timer = -1;
-static int hf_cimetrics_mstp_value = -1;
+static int hf_cimetrics_mstp_timer;
+static int hf_cimetrics_mstp_value;
 
 static dissector_handle_t cimetric_handle;
 
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index e614ccc07f..1cb4f394ad 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -80,639 +80,639 @@ static heur_dissector_list_t  heur_subdissector_service;
 static gboolean cip_enhanced_info_column = TRUE;
 
 /* Initialize the protocol and registered fields */
-static int proto_cip = -1;
-static int proto_cip_class_generic = -1;
-static int proto_cip_class_cm = -1;
-static int proto_cip_class_pccc = -1;
-static int proto_cip_class_mb = -1;
-static int proto_cip_class_cco = -1;
-static int proto_enip = -1;
-static int proto_modbus = -1;
-
-int hf_attr_class_revision = -1;
-int hf_attr_class_max_instance = -1;
-int hf_attr_class_num_instance = -1;
-int hf_attr_class_opt_attr_num = -1;
-int hf_attr_class_attr_num = -1;
-int hf_attr_class_opt_service_num = -1;
-int hf_attr_class_service_code = -1;
-int hf_attr_class_num_class_attr = -1;
-int hf_attr_class_num_inst_attr = -1;
-static int hf_cip_data = -1;
-static int hf_cip_service = -1;
-static int hf_cip_service_code = -1;
-static int hf_cip_reqrsp = -1;
-static int hf_cip_epath = -1;
-static int hf_cip_genstat = -1;
-static int hf_cip_addstat_size = -1;
-static int hf_cip_add_stat = -1;
-static int hf_cip_request_path_size = -1;
-
-static int hf_cip_cm_sc = -1;
-static int hf_cip_cm_genstat = -1;
-static int hf_cip_cm_addstat_size = -1;
-static int hf_cip_cm_add_status = -1;
-static int hf_cip_cm_ext_status = -1;
-static int hf_cip_cm_priority = -1;
-static int hf_cip_cm_tick_time = -1;
-static int hf_cip_cm_timeout_tick = -1;
-static int hf_cip_cm_timeout = -1;
-static int hf_cip_cm_ot_connid = -1;
-static int hf_cip_cm_to_connid = -1;
-static int hf_cip_connid = -1;
-static int hf_cip_cm_conn_serial_num = -1;
-static int hf_cip_cm_orig_serial_num = -1;
-static int hf_cip_cm_vendor = -1;
-static int hf_cip_cm_timeout_multiplier = -1;
-static int hf_cip_cm_ot_rpi = -1;
-static int hf_cip_cm_ot_timeout = -1;
-static int hf_cip_cm_ot_net_params32 = -1;
-static int hf_cip_cm_ot_net_params16 = -1;
-static int hf_cip_cm_to_rpi = -1;
-static int hf_cip_cm_to_timeout = -1;
-
-static int hf_cip_safety_nte_ms = -1;
-
-static int hf_cip_cm_to_net_params32 = -1;
-static int hf_cip_cm_to_net_params16 = -1;
-static int hf_cip_cm_transport_type_trigger = -1;
-static int hf_cip_cm_conn_path_size = -1;
-static int hf_cip_cm_ot_api = -1;
-static int hf_cip_cm_to_api = -1;
-static int hf_cip_cm_app_reply_size = -1;
-static int hf_cip_cm_app_reply_data = -1;
-static int hf_cip_cm_consumer_number = -1;
-static int hf_cip_cm_targ_vendor_id = -1;
-static int hf_cip_cm_targ_dev_serial_num = -1;
-static int hf_cip_cm_targ_conn_serial_num = -1;
-static int hf_cip_cm_initial_timestamp = -1;
-static int hf_cip_cm_initial_rollover = -1;
-static int hf_cip_cm_remain_path_size = -1;
-static int hf_cip_cm_msg_req_size = -1;
-static int hf_cip_cm_route_path_size = -1;
-static int hf_cip_cm_fwo_con_size = -1;
-static int hf_cip_cm_lfwo_con_size = -1;
-static int hf_cip_cm_fwo_fixed_var = -1;
-static int hf_cip_cm_lfwo_fixed_var = -1;
-static int hf_cip_cm_fwo_prio = -1;
-static int hf_cip_cm_lfwo_prio = -1;
-static int hf_cip_cm_fwo_typ = -1;
-static int hf_cip_cm_lfwo_typ = -1;
-static int hf_cip_cm_fwo_own = -1;
-static int hf_cip_cm_lfwo_own = -1;
-static int hf_cip_cm_fwo_dir = -1;
-static int hf_cip_cm_fwo_trigg = -1;
-static int hf_cip_cm_fwo_class = -1;
-static int hf_cip_cm_gco_conn = -1;
-static int hf_cip_cm_gco_coo_conn = -1;
-static int hf_cip_cm_gco_roo_conn = -1;
-static int hf_cip_cm_gco_last_action = -1;
-static int hf_cip_cm_ext112_ot_rpi_type = -1;
-static int hf_cip_cm_ext112_to_rpi_type = -1;
-static int hf_cip_cm_ext112_ot_rpi = -1;
-static int hf_cip_cm_ext112_to_rpi = -1;
-static int hf_cip_cm_ext126_size = -1;
-static int hf_cip_cm_ext127_size = -1;
-static int hf_cip_cm_ext128_size = -1;
-
-static int hf_cip_pccc_sc = -1;
-static int hf_cip_pccc_req_id_len = -1;
-static int hf_cip_pccc_cip_vend_id = -1;
-static int hf_cip_pccc_cip_serial_num = -1;
-static int hf_cip_pccc_cmd_code = -1;
-static int hf_cip_pccc_sts_code = -1;
-static int hf_cip_pccc_ext_sts_code = -1;
-static int hf_cip_pccc_tns_code = -1;
-static int hf_cip_pccc_fnc_code_06 = -1;
-static int hf_cip_pccc_fnc_code_07 = -1;
-static int hf_cip_pccc_fnc_code_0f = -1;
-static int hf_cip_pccc_byte_size = -1;
-static int hf_cip_pccc_file_num = -1;
-static int hf_cip_pccc_file_type = -1;
-static int hf_cip_pccc_element_num = -1;
-static int hf_cip_pccc_subelement_num = -1;
+static int proto_cip;
+static int proto_cip_class_generic;
+static int proto_cip_class_cm;
+static int proto_cip_class_pccc;
+static int proto_cip_class_mb;
+static int proto_cip_class_cco;
+static int proto_enip;
+static int proto_modbus;
+
+int hf_attr_class_revision;
+int hf_attr_class_max_instance;
+int hf_attr_class_num_instance;
+int hf_attr_class_opt_attr_num;
+int hf_attr_class_attr_num;
+int hf_attr_class_opt_service_num;
+int hf_attr_class_service_code;
+int hf_attr_class_num_class_attr;
+int hf_attr_class_num_inst_attr;
+static int hf_cip_data;
+static int hf_cip_service;
+static int hf_cip_service_code;
+static int hf_cip_reqrsp;
+static int hf_cip_epath;
+static int hf_cip_genstat;
+static int hf_cip_addstat_size;
+static int hf_cip_add_stat;
+static int hf_cip_request_path_size;
+
+static int hf_cip_cm_sc;
+static int hf_cip_cm_genstat;
+static int hf_cip_cm_addstat_size;
+static int hf_cip_cm_add_status;
+static int hf_cip_cm_ext_status;
+static int hf_cip_cm_priority;
+static int hf_cip_cm_tick_time;
+static int hf_cip_cm_timeout_tick;
+static int hf_cip_cm_timeout;
+static int hf_cip_cm_ot_connid;
+static int hf_cip_cm_to_connid;
+static int hf_cip_connid;
+static int hf_cip_cm_conn_serial_num;
+static int hf_cip_cm_orig_serial_num;
+static int hf_cip_cm_vendor;
+static int hf_cip_cm_timeout_multiplier;
+static int hf_cip_cm_ot_rpi;
+static int hf_cip_cm_ot_timeout;
+static int hf_cip_cm_ot_net_params32;
+static int hf_cip_cm_ot_net_params16;
+static int hf_cip_cm_to_rpi;
+static int hf_cip_cm_to_timeout;
+
+static int hf_cip_safety_nte_ms;
+
+static int hf_cip_cm_to_net_params32;
+static int hf_cip_cm_to_net_params16;
+static int hf_cip_cm_transport_type_trigger;
+static int hf_cip_cm_conn_path_size;
+static int hf_cip_cm_ot_api;
+static int hf_cip_cm_to_api;
+static int hf_cip_cm_app_reply_size;
+static int hf_cip_cm_app_reply_data;
+static int hf_cip_cm_consumer_number;
+static int hf_cip_cm_targ_vendor_id;
+static int hf_cip_cm_targ_dev_serial_num;
+static int hf_cip_cm_targ_conn_serial_num;
+static int hf_cip_cm_initial_timestamp;
+static int hf_cip_cm_initial_rollover;
+static int hf_cip_cm_remain_path_size;
+static int hf_cip_cm_msg_req_size;
+static int hf_cip_cm_route_path_size;
+static int hf_cip_cm_fwo_con_size;
+static int hf_cip_cm_lfwo_con_size;
+static int hf_cip_cm_fwo_fixed_var;
+static int hf_cip_cm_lfwo_fixed_var;
+static int hf_cip_cm_fwo_prio;
+static int hf_cip_cm_lfwo_prio;
+static int hf_cip_cm_fwo_typ;
+static int hf_cip_cm_lfwo_typ;
+static int hf_cip_cm_fwo_own;
+static int hf_cip_cm_lfwo_own;
+static int hf_cip_cm_fwo_dir;
+static int hf_cip_cm_fwo_trigg;
+static int hf_cip_cm_fwo_class;
+static int hf_cip_cm_gco_conn;
+static int hf_cip_cm_gco_coo_conn;
+static int hf_cip_cm_gco_roo_conn;
+static int hf_cip_cm_gco_last_action;
+static int hf_cip_cm_ext112_ot_rpi_type;
+static int hf_cip_cm_ext112_to_rpi_type;
+static int hf_cip_cm_ext112_ot_rpi;
+static int hf_cip_cm_ext112_to_rpi;
+static int hf_cip_cm_ext126_size;
+static int hf_cip_cm_ext127_size;
+static int hf_cip_cm_ext128_size;
+
+static int hf_cip_pccc_sc;
+static int hf_cip_pccc_req_id_len;
+static int hf_cip_pccc_cip_vend_id;
+static int hf_cip_pccc_cip_serial_num;
+static int hf_cip_pccc_cmd_code;
+static int hf_cip_pccc_sts_code;
+static int hf_cip_pccc_ext_sts_code;
+static int hf_cip_pccc_tns_code;
+static int hf_cip_pccc_fnc_code_06;
+static int hf_cip_pccc_fnc_code_07;
+static int hf_cip_pccc_fnc_code_0f;
+static int hf_cip_pccc_byte_size;
+static int hf_cip_pccc_file_num;
+static int hf_cip_pccc_file_type;
+static int hf_cip_pccc_element_num;
+static int hf_cip_pccc_subelement_num;
 #if 0
-static int hf_cip_pccc_cpu_mode_3a = -1;
+static int hf_cip_pccc_cpu_mode_3a;
 #endif
-static int hf_cip_pccc_cpu_mode_80 = -1;
-static int hf_cip_pccc_resp_code = -1;
-static int hf_cip_pccc_execute_multi_count = -1;
-static int hf_cip_pccc_execute_multi_len = -1;
-static int hf_cip_pccc_execute_multi_fnc = -1;
-static int hf_cip_pccc_data = -1;
-
-static int hf_cip_mb_sc = -1;
-static int hf_cip_mb_read_coils_start_addr = -1;
-static int hf_cip_mb_read_coils_num_coils = -1;
-static int hf_cip_mb_read_coils_data = -1;
-static int hf_cip_mb_read_discrete_inputs_start_addr = -1;
-static int hf_cip_mb_read_discrete_inputs_num_inputs = -1;
-static int hf_cip_mb_read_discrete_inputs_data = -1;
-static int hf_cip_mb_read_holding_register_start_addr = -1;
-static int hf_cip_mb_read_holding_register_num_registers = -1;
-static int hf_cip_mb_read_holding_register_data = -1;
-static int hf_cip_mb_read_input_register_start_addr = -1;
-static int hf_cip_mb_read_input_register_num_registers = -1;
-static int hf_cip_mb_read_input_register_data = -1;
-static int hf_cip_mb_write_coils_start_addr = -1;
-static int hf_cip_mb_write_coils_outputs_forced = -1;
-static int hf_cip_mb_write_coils_num_coils = -1;
-static int hf_cip_mb_write_coils_data = -1;
-static int hf_cip_mb_write_registers_start_addr = -1;
-static int hf_cip_mb_write_registers_outputs_forced = -1;
-static int hf_cip_mb_write_registers_num_registers = -1;
-static int hf_cip_mb_write_registers_data = -1;
-static int hf_cip_mb_data = -1;
-
-static int hf_cip_cco_con_type = -1;
-static int hf_cip_cco_ot_rtf = -1;
-static int hf_cip_cco_to_rtf = -1;
-static int hf_cip_cco_sc = -1;
-static int hf_cip_cco_format_number = -1;
-static int hf_cip_cco_edit_signature = -1;
-static int hf_cip_cco_con_flags = -1;
-static int hf_cip_cco_tdi_vendor = -1;
-static int hf_cip_cco_tdi_devtype = -1;
-static int hf_cip_cco_tdi_prodcode = -1;
-static int hf_cip_cco_tdi_compatibility = -1;
-static int hf_cip_cco_tdi_comp_bit = -1;
-static int hf_cip_cco_tdi_majorrev = -1;
-static int hf_cip_cco_tdi_minorrev = -1;
-static int hf_cip_cco_pdi_vendor = -1;
-static int hf_cip_cco_pdi_devtype = -1;
-static int hf_cip_cco_pdi_prodcode = -1;
-static int hf_cip_cco_pdi_compatibility = -1;
-static int hf_cip_cco_pdi_comp_bit = -1;
-static int hf_cip_cco_pdi_majorrev = -1;
-static int hf_cip_cco_pdi_minorrev = -1;
-static int hf_cip_cco_cs_data_index = -1;
-static int hf_cip_cco_ot_rpi = -1;
-static int hf_cip_cco_to_rpi = -1;
-static int hf_cip_cco_ot_net_param16 = -1;
-static int hf_cip_cco_to_net_param16 = -1;
-static int hf_cip_cco_fwo_own = -1;
-static int hf_cip_cco_fwo_typ = -1;
-static int hf_cip_cco_fwo_prio = -1;
-static int hf_cip_cco_fwo_fixed_var = -1;
-static int hf_cip_cco_fwo_con_size = -1;
-static int hf_cip_cco_ot_net_param32 = -1;
-static int hf_cip_cco_to_net_param32 = -1;
-static int hf_cip_cco_lfwo_own = -1;
-static int hf_cip_cco_lfwo_typ = -1;
-static int hf_cip_cco_lfwo_prio = -1;
-static int hf_cip_cco_lfwo_fixed_var = -1;
-static int hf_cip_cco_lfwo_con_size = -1;
-static int hf_cip_cco_conn_path_size = -1;
-static int hf_cip_cco_proxy_config_size = -1;
-static int hf_cip_cco_target_config_size = -1;
-static int hf_cip_cco_iomap_format_number = -1;
-static int hf_cip_cco_iomap_size = -1;
-static int hf_cip_cco_connection_disable = -1;
-static int hf_cip_cco_net_conn_param_attr = -1;
-static int hf_cip_cco_timeout_multiplier = -1;
-static int hf_cip_cco_transport_type_trigger = -1;
-static int hf_cip_cco_fwo_dir = -1;
-static int hf_cip_cco_fwo_trigger = -1;
-static int hf_cip_cco_fwo_class = -1;
-static int hf_cip_cco_proxy_config_data = -1;
-static int hf_cip_cco_target_config_data = -1;
-static int hf_cip_cco_iomap_attribute = -1;
-static int hf_cip_cco_safety = -1;
-static int hf_cip_cco_change_type = -1;
-static int hf_cip_cco_connection_name = -1;
-static int hf_cip_cco_ext_status = -1;
-
-static int hf_cip_path_segment = -1;
-static int hf_cip_path_segment_type = -1;
-static int hf_cip_port_ex_link_addr = -1;
-static int hf_cip_port = -1;
-static int hf_cip_port_extended = -1;
-static int hf_cip_link_address_size = -1;
-static int hf_cip_link_address_byte = -1;
-static int hf_cip_link_address_string = -1;
-static int hf_cip_logical_seg_type = -1;
-static int hf_cip_logical_seg_format = -1;
-static int hf_cip_class8 = -1;
-static int hf_cip_class16 = -1;
-static int hf_cip_class32 = -1;
-static int hf_cip_instance8 = -1;
-static int hf_cip_instance16 = -1;
-static int hf_cip_instance32 = -1;
-static int hf_cip_member8 = -1;
-static int hf_cip_member16 = -1;
-static int hf_cip_member32 = -1;
-static int hf_cip_attribute8 = -1;
-static int hf_cip_attribute16 = -1;
-static int hf_cip_attribute32 = -1;
-static int hf_cip_conpoint8 = -1;
-static int hf_cip_conpoint16 = -1;
-static int hf_cip_conpoint32 = -1;
-static int hf_cip_serviceid8 = -1;
-static int hf_cip_ekey_format = -1;
-static int hf_cip_ekey_vendor = -1;
-static int hf_cip_ekey_devtype = -1;
-static int hf_cip_ekey_prodcode = -1;
-static int hf_cip_ekey_compatibility = -1;
-static int hf_cip_ekey_comp_bit = -1;
-static int hf_cip_ekey_majorrev = -1;
-static int hf_cip_ekey_minorrev = -1;
-static int hf_cip_ekey_serial_number = -1;
-static int hf_cip_ext_logical8 = -1;
-static int hf_cip_ext_logical16 = -1;
-static int hf_cip_ext_logical32 = -1;
-static int hf_cip_ext_logical_type = -1;
-static int hf_cip_data_seg_type = -1;
-static int hf_cip_data_seg_size_simple = -1;
-static int hf_cip_data_seg_size_extended = -1;
-static int hf_cip_data_seg_item = -1;
-static int hf_cip_symbol = -1;
-static int hf_cip_symbol_size = -1;
-static int hf_cip_symbol_ascii = -1;
-static int hf_cip_symbol_extended_format = -1;
-static int hf_cip_symbol_numeric_format = -1;
-static int hf_cip_symbol_double_size = -1;
-static int hf_cip_symbol_triple_size = -1;
-static int hf_cip_numeric_usint = -1;
-static int hf_cip_numeric_uint = -1;
-static int hf_cip_numeric_udint = -1;
-static int hf_cip_network_seg_type = -1;
-static int hf_cip_seg_schedule = -1;
-static int hf_cip_seg_fixed_tag = -1;
-static int hf_cip_seg_prod_inhibit_time = -1;
-static int hf_cip_seg_prod_inhibit_time_us = -1;
-static int hf_cip_seg_network_size = -1;
-static int hf_cip_seg_network_subtype = -1;
-static int hf_cip_seg_safety_format = -1;
-static int hf_cip_seg_safety_reserved = -1;
-static int hf_cip_seg_safety_configuration_crc = -1;
-static int hf_cip_seg_safety_configuration_timestamp = -1;
-static int hf_cip_seg_safety_configuration_date = -1;
-static int hf_cip_seg_safety_configuration_time = -1;
-static int hf_cip_seg_safety_time_correction_epi = -1;
-static int hf_cip_seg_safety_time_correction_net_params = -1;
-static int hf_cip_seg_safety_time_correction_own = -1;
-static int hf_cip_seg_safety_time_correction_typ = -1;
-static int hf_cip_seg_safety_time_correction_prio = -1;
-static int hf_cip_seg_safety_time_correction_fixed_var = -1;
-static int hf_cip_seg_safety_time_correction_con_size = -1;
-static int hf_cip_seg_safety_tunid = -1;
-static int hf_cip_seg_safety_tunid_snn_timestamp = -1;
-static int hf_cip_seg_safety_tunid_snn_date = -1;
-static int hf_cip_seg_safety_tunid_snn_time = -1;
-static int hf_cip_seg_safety_tunid_nodeid = -1;
-static int hf_cip_seg_safety_ounid = -1;
-static int hf_cip_seg_safety_ounid_snn_timestamp = -1;
-static int hf_cip_seg_safety_ounid_snn_date = -1;
-static int hf_cip_seg_safety_ounid_snn_time = -1;
-static int hf_cip_seg_safety_ounid_nodeid = -1;
-static int hf_cip_seg_safety_ping_epi_multiplier = -1;
-static int hf_cip_seg_safety_time_coord_msg_min_multiplier = -1;
-static int hf_cip_seg_safety_network_time_expected_multiplier = -1;
-static int hf_cip_seg_safety_timeout_multiplier = -1;
-static int hf_cip_seg_safety_max_consumer_number = -1;
-static int hf_cip_seg_safety_conn_param_crc = -1;
-static int hf_cip_seg_safety_time_correction_conn_id = -1;
-static int hf_cip_seg_safety_max_fault_number = -1;
-static int hf_cip_seg_safety_init_timestamp = -1;
-static int hf_cip_seg_safety_init_rollover = -1;
-static int hf_cip_seg_safety_data = -1;
-static int hf_cip_class_max_inst32 = -1;
-static int hf_cip_class_num_inst32 = -1;
-static int hf_cip_reserved8 = -1;
-static int hf_cip_reserved24 = -1;
-static int hf_cip_pad8 = -1;
-
-static int hf_cip_sc_get_attr_list_attr_count = -1;
-static int hf_cip_sc_get_attr_list_attr_status = -1;
-static int hf_cip_sc_set_attr_list_attr_count = -1;
-static int hf_cip_sc_set_attr_list_attr_status = -1;
-static int hf_cip_sc_reset_param = -1;
-static int hf_cip_sc_create_instance = -1;
-static int hf_cip_sc_mult_serv_pack_num_services = -1;
-static int hf_cip_sc_mult_serv_pack_offset = -1;
-static int hf_cip_find_next_object_max_instance = -1;
-static int hf_cip_find_next_object_num_instances = -1;
-static int hf_cip_find_next_object_instance_item = -1;
-static int hf_cip_sc_group_sync_is_sync = -1;
+static int hf_cip_pccc_cpu_mode_80;
+static int hf_cip_pccc_resp_code;
+static int hf_cip_pccc_execute_multi_count;
+static int hf_cip_pccc_execute_multi_len;
+static int hf_cip_pccc_execute_multi_fnc;
+static int hf_cip_pccc_data;
+
+static int hf_cip_mb_sc;
+static int hf_cip_mb_read_coils_start_addr;
+static int hf_cip_mb_read_coils_num_coils;
+static int hf_cip_mb_read_coils_data;
+static int hf_cip_mb_read_discrete_inputs_start_addr;
+static int hf_cip_mb_read_discrete_inputs_num_inputs;
+static int hf_cip_mb_read_discrete_inputs_data;
+static int hf_cip_mb_read_holding_register_start_addr;
+static int hf_cip_mb_read_holding_register_num_registers;
+static int hf_cip_mb_read_holding_register_data;
+static int hf_cip_mb_read_input_register_start_addr;
+static int hf_cip_mb_read_input_register_num_registers;
+static int hf_cip_mb_read_input_register_data;
+static int hf_cip_mb_write_coils_start_addr;
+static int hf_cip_mb_write_coils_outputs_forced;
+static int hf_cip_mb_write_coils_num_coils;
+static int hf_cip_mb_write_coils_data;
+static int hf_cip_mb_write_registers_start_addr;
+static int hf_cip_mb_write_registers_outputs_forced;
+static int hf_cip_mb_write_registers_num_registers;
+static int hf_cip_mb_write_registers_data;
+static int hf_cip_mb_data;
+
+static int hf_cip_cco_con_type;
+static int hf_cip_cco_ot_rtf;
+static int hf_cip_cco_to_rtf;
+static int hf_cip_cco_sc;
+static int hf_cip_cco_format_number;
+static int hf_cip_cco_edit_signature;
+static int hf_cip_cco_con_flags;
+static int hf_cip_cco_tdi_vendor;
+static int hf_cip_cco_tdi_devtype;
+static int hf_cip_cco_tdi_prodcode;
+static int hf_cip_cco_tdi_compatibility;
+static int hf_cip_cco_tdi_comp_bit;
+static int hf_cip_cco_tdi_majorrev;
+static int hf_cip_cco_tdi_minorrev;
+static int hf_cip_cco_pdi_vendor;
+static int hf_cip_cco_pdi_devtype;
+static int hf_cip_cco_pdi_prodcode;
+static int hf_cip_cco_pdi_compatibility;
+static int hf_cip_cco_pdi_comp_bit;
+static int hf_cip_cco_pdi_majorrev;
+static int hf_cip_cco_pdi_minorrev;
+static int hf_cip_cco_cs_data_index;
+static int hf_cip_cco_ot_rpi;
+static int hf_cip_cco_to_rpi;
+static int hf_cip_cco_ot_net_param16;
+static int hf_cip_cco_to_net_param16;
+static int hf_cip_cco_fwo_own;
+static int hf_cip_cco_fwo_typ;
+static int hf_cip_cco_fwo_prio;
+static int hf_cip_cco_fwo_fixed_var;
+static int hf_cip_cco_fwo_con_size;
+static int hf_cip_cco_ot_net_param32;
+static int hf_cip_cco_to_net_param32;
+static int hf_cip_cco_lfwo_own;
+static int hf_cip_cco_lfwo_typ;
+static int hf_cip_cco_lfwo_prio;
+static int hf_cip_cco_lfwo_fixed_var;
+static int hf_cip_cco_lfwo_con_size;
+static int hf_cip_cco_conn_path_size;
+static int hf_cip_cco_proxy_config_size;
+static int hf_cip_cco_target_config_size;
+static int hf_cip_cco_iomap_format_number;
+static int hf_cip_cco_iomap_size;
+static int hf_cip_cco_connection_disable;
+static int hf_cip_cco_net_conn_param_attr;
+static int hf_cip_cco_timeout_multiplier;
+static int hf_cip_cco_transport_type_trigger;
+static int hf_cip_cco_fwo_dir;
+static int hf_cip_cco_fwo_trigger;
+static int hf_cip_cco_fwo_class;
+static int hf_cip_cco_proxy_config_data;
+static int hf_cip_cco_target_config_data;
+static int hf_cip_cco_iomap_attribute;
+static int hf_cip_cco_safety;
+static int hf_cip_cco_change_type;
+static int hf_cip_cco_connection_name;
+static int hf_cip_cco_ext_status;
+
+static int hf_cip_path_segment;
+static int hf_cip_path_segment_type;
+static int hf_cip_port_ex_link_addr;
+static int hf_cip_port;
+static int hf_cip_port_extended;
+static int hf_cip_link_address_size;
+static int hf_cip_link_address_byte;
+static int hf_cip_link_address_string;
+static int hf_cip_logical_seg_type;
+static int hf_cip_logical_seg_format;
+static int hf_cip_class8;
+static int hf_cip_class16;
+static int hf_cip_class32;
+static int hf_cip_instance8;
+static int hf_cip_instance16;
+static int hf_cip_instance32;
+static int hf_cip_member8;
+static int hf_cip_member16;
+static int hf_cip_member32;
+static int hf_cip_attribute8;
+static int hf_cip_attribute16;
+static int hf_cip_attribute32;
+static int hf_cip_conpoint8;
+static int hf_cip_conpoint16;
+static int hf_cip_conpoint32;
+static int hf_cip_serviceid8;
+static int hf_cip_ekey_format;
+static int hf_cip_ekey_vendor;
+static int hf_cip_ekey_devtype;
+static int hf_cip_ekey_prodcode;
+static int hf_cip_ekey_compatibility;
+static int hf_cip_ekey_comp_bit;
+static int hf_cip_ekey_majorrev;
+static int hf_cip_ekey_minorrev;
+static int hf_cip_ekey_serial_number;
+static int hf_cip_ext_logical8;
+static int hf_cip_ext_logical16;
+static int hf_cip_ext_logical32;
+static int hf_cip_ext_logical_type;
+static int hf_cip_data_seg_type;
+static int hf_cip_data_seg_size_simple;
+static int hf_cip_data_seg_size_extended;
+static int hf_cip_data_seg_item;
+static int hf_cip_symbol;
+static int hf_cip_symbol_size;
+static int hf_cip_symbol_ascii;
+static int hf_cip_symbol_extended_format;
+static int hf_cip_symbol_numeric_format;
+static int hf_cip_symbol_double_size;
+static int hf_cip_symbol_triple_size;
+static int hf_cip_numeric_usint;
+static int hf_cip_numeric_uint;
+static int hf_cip_numeric_udint;
+static int hf_cip_network_seg_type;
+static int hf_cip_seg_schedule;
+static int hf_cip_seg_fixed_tag;
+static int hf_cip_seg_prod_inhibit_time;
+static int hf_cip_seg_prod_inhibit_time_us;
+static int hf_cip_seg_network_size;
+static int hf_cip_seg_network_subtype;
+static int hf_cip_seg_safety_format;
+static int hf_cip_seg_safety_reserved;
+static int hf_cip_seg_safety_configuration_crc;
+static int hf_cip_seg_safety_configuration_timestamp;
+static int hf_cip_seg_safety_configuration_date;
+static int hf_cip_seg_safety_configuration_time;
+static int hf_cip_seg_safety_time_correction_epi;
+static int hf_cip_seg_safety_time_correction_net_params;
+static int hf_cip_seg_safety_time_correction_own;
+static int hf_cip_seg_safety_time_correction_typ;
+static int hf_cip_seg_safety_time_correction_prio;
+static int hf_cip_seg_safety_time_correction_fixed_var;
+static int hf_cip_seg_safety_time_correction_con_size;
+static int hf_cip_seg_safety_tunid;
+static int hf_cip_seg_safety_tunid_snn_timestamp;
+static int hf_cip_seg_safety_tunid_snn_date;
+static int hf_cip_seg_safety_tunid_snn_time;
+static int hf_cip_seg_safety_tunid_nodeid;
+static int hf_cip_seg_safety_ounid;
+static int hf_cip_seg_safety_ounid_snn_timestamp;
+static int hf_cip_seg_safety_ounid_snn_date;
+static int hf_cip_seg_safety_ounid_snn_time;
+static int hf_cip_seg_safety_ounid_nodeid;
+static int hf_cip_seg_safety_ping_epi_multiplier;
+static int hf_cip_seg_safety_time_coord_msg_min_multiplier;
+static int hf_cip_seg_safety_network_time_expected_multiplier;
+static int hf_cip_seg_safety_timeout_multiplier;
+static int hf_cip_seg_safety_max_consumer_number;
+static int hf_cip_seg_safety_conn_param_crc;
+static int hf_cip_seg_safety_time_correction_conn_id;
+static int hf_cip_seg_safety_max_fault_number;
+static int hf_cip_seg_safety_init_timestamp;
+static int hf_cip_seg_safety_init_rollover;
+static int hf_cip_seg_safety_data;
+static int hf_cip_class_max_inst32;
+static int hf_cip_class_num_inst32;
+static int hf_cip_reserved8;
+static int hf_cip_reserved24;
+static int hf_cip_pad8;
+
+static int hf_cip_sc_get_attr_list_attr_count;
+static int hf_cip_sc_get_attr_list_attr_status;
+static int hf_cip_sc_set_attr_list_attr_count;
+static int hf_cip_sc_set_attr_list_attr_status;
+static int hf_cip_sc_reset_param;
+static int hf_cip_sc_create_instance;
+static int hf_cip_sc_mult_serv_pack_num_services;
+static int hf_cip_sc_mult_serv_pack_offset;
+static int hf_cip_find_next_object_max_instance;
+static int hf_cip_find_next_object_num_instances;
+static int hf_cip_find_next_object_instance_item;
+static int hf_cip_sc_group_sync_is_sync;
 
 /* Parsed Attributes */
-static int hf_id_vendor_id = -1;
-static int hf_id_device_type = -1;
-static int hf_id_product_code = -1;
-static int hf_id_major_rev = -1;
-static int hf_id_minor_rev = -1;
-static int hf_id_status = -1;
-static int hf_id_serial_number = -1;
-static int hf_id_product_name = -1;
-static int hf_id_state = -1;
-static int hf_id_config_value = -1;
-static int hf_id_heartbeat = -1;
-static int hf_id_status_owned = -1;
-static int hf_id_status_conf = -1;
-static int hf_id_status_extended1 = -1;
-static int hf_id_status_minor_fault_rec = -1;
-static int hf_id_status_minor_fault_unrec = -1;
-static int hf_id_status_major_fault_rec = -1;
-static int hf_id_status_major_fault_unrec = -1;
-static int hf_id_status_extended2 = -1;
-static int hf_msg_rout_num_classes = -1;
-static int hf_msg_rout_classes = -1;
-static int hf_msg_rout_num_available = -1;
-static int hf_msg_rout_num_active = -1;
-static int hf_msg_rout_active_connections = -1;
-static int hf_conn_mgr_open_requests = -1;
-static int hf_conn_mgr_open_format_rejects = -1;
-static int hf_conn_mgr_open_resource_rejects = -1;
-static int hf_conn_mgr_other_open_rejects = -1;
-static int hf_conn_mgr_close_requests = -1;
-static int hf_conn_close_format_requests = -1;
-static int hf_conn_mgr_close_other_requests = -1;
-static int hf_conn_mgr_conn_timouts = -1;
-static int hf_conn_mgr_num_conn_entries = -1;
-static int hf_conn_mgr_num_conn_entries_bytes = -1;
-static int hf_conn_mgr_conn_open_bits = -1;
-static int hf_conn_mgr_cpu_utilization = -1;
-static int hf_conn_mgr_max_buff_size = -1;
-static int hf_conn_mgr_buff_size_remaining = -1;
-static int hf_stringi_number_char = -1;
-static int hf_stringi_language_char = -1;
-static int hf_stringi_char_string_struct = -1;
-static int hf_stringi_char_set = -1;
-static int hf_stringi_international_string = -1;
-static int hf_file_filename = -1;
-static int hf_time_sync_ptp_enable = -1;
-static int hf_time_sync_is_synchronized = -1;
-static int hf_time_sync_sys_time_micro = -1;
-static int hf_time_sync_sys_time_nano = -1;
-static int hf_time_sync_offset_from_master = -1;
-static int hf_time_sync_max_offset_from_master = -1;
-static int hf_time_sync_mean_path_delay_to_master = -1;
-static int hf_time_sync_gm_clock_clock_id = -1;
-static int hf_time_sync_gm_clock_clock_class = -1;
-static int hf_time_sync_gm_clock_time_accuracy = -1;
-static int hf_time_sync_gm_clock_offset_scaled_log_variance = -1;
-static int hf_time_sync_gm_clock_current_utc_offset = -1;
-static int hf_time_sync_gm_clock_time_property_flags = -1;
-static int hf_time_sync_gm_clock_time_property_flags_leap61 = -1;
-static int hf_time_sync_gm_clock_time_property_flags_leap59 = -1;
-static int hf_time_sync_gm_clock_time_property_flags_current_utc_valid = -1;
-static int hf_time_sync_gm_clock_time_property_flags_ptp_timescale = -1;
-static int hf_time_sync_gm_clock_time_property_flags_time_traceable = -1;
-static int hf_time_sync_gm_clock_time_property_flags_freq_traceable = -1;
-static int hf_time_sync_gm_clock_time_source = -1;
-static int hf_time_sync_gm_clock_priority1 = -1;
-static int hf_time_sync_gm_clock_priority2 = -1;
-static int hf_time_sync_parent_clock_clock_id = -1;
-static int hf_time_sync_parent_clock_port_number = -1;
-static int hf_time_sync_parent_clock_observed_offset_scaled_log_variance = -1;
-static int hf_time_sync_parent_clock_observed_phase_change_rate = -1;
-static int hf_time_sync_local_clock_clock_id = -1;
-static int hf_time_sync_local_clock_clock_class = -1;
-static int hf_time_sync_local_clock_time_accuracy = -1;
-static int hf_time_sync_local_clock_offset_scaled_log_variance = -1;
-static int hf_time_sync_local_clock_current_utc_offset = -1;
-static int hf_time_sync_local_clock_time_property_flags = -1;
-static int hf_time_sync_local_clock_time_property_flags_leap61 = -1;
-static int hf_time_sync_local_clock_time_property_flags_leap59 = -1;
-static int hf_time_sync_local_clock_time_property_flags_current_utc_valid = -1;
-static int hf_time_sync_local_clock_time_property_flags_ptp_timescale = -1;
-static int hf_time_sync_local_clock_time_property_flags_time_traceable = -1;
-static int hf_time_sync_local_clock_time_property_flags_freq_traceable = -1;
-static int hf_time_sync_local_clock_time_source = -1;
-static int hf_time_sync_num_ports = -1;
-static int hf_time_sync_port_state_info_num_ports = -1;
-static int hf_time_sync_port_state_info_port_num = -1;
-static int hf_time_sync_port_state_info_port_state = -1;
-static int hf_time_sync_port_enable_cfg_num_ports = -1;
-static int hf_time_sync_port_enable_cfg_port_num = -1;
-static int hf_time_sync_port_enable_cfg_port_enable = -1;
-static int hf_time_sync_port_log_announce_num_ports = -1;
-static int hf_time_sync_port_log_announce_port_num = -1;
-static int hf_time_sync_port_log_announce_interval = -1;
-static int hf_time_sync_port_log_sync_num_ports = -1;
-static int hf_time_sync_port_log_sync_port_num = -1;
-static int hf_time_sync_port_log_sync_port_log_sync_interval = -1;
-static int hf_time_sync_priority1 = -1;
-static int hf_time_sync_priority2 = -1;
-static int hf_time_sync_domain_number = -1;
-static int hf_time_sync_clock_type = -1;
-static int hf_time_sync_clock_type_ordinary = -1;
-static int hf_time_sync_clock_type_boundary = -1;
-static int hf_time_sync_clock_type_end_to_end = -1;
-static int hf_time_sync_clock_type_management = -1;
-static int hf_time_sync_clock_type_slave_only = -1;
-static int hf_time_sync_manufacture_id_oui = -1;
-static int hf_time_sync_manufacture_id_reserved = -1;
-static int hf_time_sync_prod_desc_size = -1;
-static int hf_time_sync_prod_desc_str = -1;
-static int hf_time_sync_revision_data_size = -1;
-static int hf_time_sync_revision_data_str = -1;
-static int hf_time_sync_user_desc_size = -1;
-static int hf_time_sync_user_desc_str = -1;
-static int hf_time_sync_port_profile_id_info_num_ports = -1;
-static int hf_time_sync_port_profile_id_info_port_num = -1;
-static int hf_time_sync_port_profile_id_info_profile_id = -1;
-static int hf_time_sync_port_phys_addr_info_num_ports = -1;
-static int hf_time_sync_port_phys_addr_info_port_num = -1;
-static int hf_time_sync_port_phys_addr_info_phys_proto = -1;
-static int hf_time_sync_port_phys_addr_info_addr_size = -1;
-static int hf_time_sync_port_phys_addr_info_phys_addr = -1;
-static int hf_time_sync_port_proto_addr_info_num_ports = -1;
-static int hf_time_sync_port_proto_addr_info_port_num = -1;
-static int hf_time_sync_port_proto_addr_info_network_proto = -1;
-static int hf_time_sync_port_proto_addr_info_addr_size = -1;
-static int hf_time_sync_port_proto_addr_info_port_proto_addr = -1;
-static int hf_time_sync_steps_removed = -1;
-static int hf_time_sync_sys_time_and_offset_time = -1;
-static int hf_time_sync_sys_time_and_offset_offset = -1;
-static int hf_port_entry_port = -1;
-static int hf_port_type = -1;
-static int hf_port_number = -1;
-static int hf_port_min_node_num = -1;
-static int hf_port_max_node_num = -1;
-static int hf_port_name = -1;
-static int hf_port_num_comm_object_entries = -1;
-static int hf_path_len_usint = -1;
-static int hf_path_len_uint = -1;
-
-static int hf_32bitheader = -1;
-static int hf_32bitheader_roo = -1;
-static int hf_32bitheader_coo = -1;
-static int hf_32bitheader_run_idle = -1;
-
-static int hf_cip_connection = -1;
-static int hf_cip_fwd_open_in = -1;
-static int hf_cip_fwd_close_in = -1;
+static int hf_id_vendor_id;
+static int hf_id_device_type;
+static int hf_id_product_code;
+static int hf_id_major_rev;
+static int hf_id_minor_rev;
+static int hf_id_status;
+static int hf_id_serial_number;
+static int hf_id_product_name;
+static int hf_id_state;
+static int hf_id_config_value;
+static int hf_id_heartbeat;
+static int hf_id_status_owned;
+static int hf_id_status_conf;
+static int hf_id_status_extended1;
+static int hf_id_status_minor_fault_rec;
+static int hf_id_status_minor_fault_unrec;
+static int hf_id_status_major_fault_rec;
+static int hf_id_status_major_fault_unrec;
+static int hf_id_status_extended2;
+static int hf_msg_rout_num_classes;
+static int hf_msg_rout_classes;
+static int hf_msg_rout_num_available;
+static int hf_msg_rout_num_active;
+static int hf_msg_rout_active_connections;
+static int hf_conn_mgr_open_requests;
+static int hf_conn_mgr_open_format_rejects;
+static int hf_conn_mgr_open_resource_rejects;
+static int hf_conn_mgr_other_open_rejects;
+static int hf_conn_mgr_close_requests;
+static int hf_conn_close_format_requests;
+static int hf_conn_mgr_close_other_requests;
+static int hf_conn_mgr_conn_timouts;
+static int hf_conn_mgr_num_conn_entries;
+static int hf_conn_mgr_num_conn_entries_bytes;
+static int hf_conn_mgr_conn_open_bits;
+static int hf_conn_mgr_cpu_utilization;
+static int hf_conn_mgr_max_buff_size;
+static int hf_conn_mgr_buff_size_remaining;
+static int hf_stringi_number_char;
+static int hf_stringi_language_char;
+static int hf_stringi_char_string_struct;
+static int hf_stringi_char_set;
+static int hf_stringi_international_string;
+static int hf_file_filename;
+static int hf_time_sync_ptp_enable;
+static int hf_time_sync_is_synchronized;
+static int hf_time_sync_sys_time_micro;
+static int hf_time_sync_sys_time_nano;
+static int hf_time_sync_offset_from_master;
+static int hf_time_sync_max_offset_from_master;
+static int hf_time_sync_mean_path_delay_to_master;
+static int hf_time_sync_gm_clock_clock_id;
+static int hf_time_sync_gm_clock_clock_class;
+static int hf_time_sync_gm_clock_time_accuracy;
+static int hf_time_sync_gm_clock_offset_scaled_log_variance;
+static int hf_time_sync_gm_clock_current_utc_offset;
+static int hf_time_sync_gm_clock_time_property_flags;
+static int hf_time_sync_gm_clock_time_property_flags_leap61;
+static int hf_time_sync_gm_clock_time_property_flags_leap59;
+static int hf_time_sync_gm_clock_time_property_flags_current_utc_valid;
+static int hf_time_sync_gm_clock_time_property_flags_ptp_timescale;
+static int hf_time_sync_gm_clock_time_property_flags_time_traceable;
+static int hf_time_sync_gm_clock_time_property_flags_freq_traceable;
+static int hf_time_sync_gm_clock_time_source;
+static int hf_time_sync_gm_clock_priority1;
+static int hf_time_sync_gm_clock_priority2;
+static int hf_time_sync_parent_clock_clock_id;
+static int hf_time_sync_parent_clock_port_number;
+static int hf_time_sync_parent_clock_observed_offset_scaled_log_variance;
+static int hf_time_sync_parent_clock_observed_phase_change_rate;
+static int hf_time_sync_local_clock_clock_id;
+static int hf_time_sync_local_clock_clock_class;
+static int hf_time_sync_local_clock_time_accuracy;
+static int hf_time_sync_local_clock_offset_scaled_log_variance;
+static int hf_time_sync_local_clock_current_utc_offset;
+static int hf_time_sync_local_clock_time_property_flags;
+static int hf_time_sync_local_clock_time_property_flags_leap61;
+static int hf_time_sync_local_clock_time_property_flags_leap59;
+static int hf_time_sync_local_clock_time_property_flags_current_utc_valid;
+static int hf_time_sync_local_clock_time_property_flags_ptp_timescale;
+static int hf_time_sync_local_clock_time_property_flags_time_traceable;
+static int hf_time_sync_local_clock_time_property_flags_freq_traceable;
+static int hf_time_sync_local_clock_time_source;
+static int hf_time_sync_num_ports;
+static int hf_time_sync_port_state_info_num_ports;
+static int hf_time_sync_port_state_info_port_num;
+static int hf_time_sync_port_state_info_port_state;
+static int hf_time_sync_port_enable_cfg_num_ports;
+static int hf_time_sync_port_enable_cfg_port_num;
+static int hf_time_sync_port_enable_cfg_port_enable;
+static int hf_time_sync_port_log_announce_num_ports;
+static int hf_time_sync_port_log_announce_port_num;
+static int hf_time_sync_port_log_announce_interval;
+static int hf_time_sync_port_log_sync_num_ports;
+static int hf_time_sync_port_log_sync_port_num;
+static int hf_time_sync_port_log_sync_port_log_sync_interval;
+static int hf_time_sync_priority1;
+static int hf_time_sync_priority2;
+static int hf_time_sync_domain_number;
+static int hf_time_sync_clock_type;
+static int hf_time_sync_clock_type_ordinary;
+static int hf_time_sync_clock_type_boundary;
+static int hf_time_sync_clock_type_end_to_end;
+static int hf_time_sync_clock_type_management;
+static int hf_time_sync_clock_type_slave_only;
+static int hf_time_sync_manufacture_id_oui;
+static int hf_time_sync_manufacture_id_reserved;
+static int hf_time_sync_prod_desc_size;
+static int hf_time_sync_prod_desc_str;
+static int hf_time_sync_revision_data_size;
+static int hf_time_sync_revision_data_str;
+static int hf_time_sync_user_desc_size;
+static int hf_time_sync_user_desc_str;
+static int hf_time_sync_port_profile_id_info_num_ports;
+static int hf_time_sync_port_profile_id_info_port_num;
+static int hf_time_sync_port_profile_id_info_profile_id;
+static int hf_time_sync_port_phys_addr_info_num_ports;
+static int hf_time_sync_port_phys_addr_info_port_num;
+static int hf_time_sync_port_phys_addr_info_phys_proto;
+static int hf_time_sync_port_phys_addr_info_addr_size;
+static int hf_time_sync_port_phys_addr_info_phys_addr;
+static int hf_time_sync_port_proto_addr_info_num_ports;
+static int hf_time_sync_port_proto_addr_info_port_num;
+static int hf_time_sync_port_proto_addr_info_network_proto;
+static int hf_time_sync_port_proto_addr_info_addr_size;
+static int hf_time_sync_port_proto_addr_info_port_proto_addr;
+static int hf_time_sync_steps_removed;
+static int hf_time_sync_sys_time_and_offset_time;
+static int hf_time_sync_sys_time_and_offset_offset;
+static int hf_port_entry_port;
+static int hf_port_type;
+static int hf_port_number;
+static int hf_port_min_node_num;
+static int hf_port_max_node_num;
+static int hf_port_name;
+static int hf_port_num_comm_object_entries;
+static int hf_path_len_usint;
+static int hf_path_len_uint;
+
+static int hf_32bitheader;
+static int hf_32bitheader_roo;
+static int hf_32bitheader_coo;
+static int hf_32bitheader_run_idle;
+
+static int hf_cip_connection;
+static int hf_cip_fwd_open_in;
+static int hf_cip_fwd_close_in;
 
 /* Initialize the subtree pointers */
-static gint ett_cip = -1;
-static gint ett_cip_class_generic = -1;
-static gint ett_cip_class_cm = -1;
-static gint ett_cip_class_pccc = -1;
-static gint ett_cip_class_mb = -1;
-static gint ett_cip_class_cco = -1;
-
-static gint ett_path = -1;
-static gint ett_path_seg = -1;
-static gint ett_mcsc = -1;
-static gint ett_cia_path = -1;
-static gint ett_data_seg = -1;
-static gint ett_port_path = -1;
-static gint ett_network_seg = -1;
-static gint ett_network_seg_safety = -1;
-static gint ett_network_seg_safety_time_correction_net_params = -1;
-static gint ett_cip_seg_safety_tunid = -1;
-static gint ett_cip_seg_safety_tunid_snn = -1;
-static gint ett_cip_seg_safety_ounid = -1;
-static gint ett_cip_seg_safety_ounid_snn = -1;
-
-static gint ett_rrsc = -1;
-static gint ett_status_item = -1;
-static gint ett_add_status_item = -1;
-static gint ett_cmd_data = -1;
-
-static gint ett_cip_get_attributes_all_item = -1;
-static gint ett_cip_get_attribute_list = -1;
-static gint ett_cip_get_attribute_list_item = -1;
-static gint ett_cip_set_attribute_list = -1;
-static gint ett_cip_set_attribute_list_item = -1;
-static gint ett_cip_mult_service_packet = -1;
-static gint ett_cip_msp_offset = -1;
-
-static gint ett_cm_rrsc = -1;
-static gint ett_cm_ncp = -1;
-static gint ett_cm_mes_req = -1;
-static gint ett_cm_cmd_data = -1;
-static gint ett_cm_ttt = -1;
-static gint ett_cm_add_status_item = -1;
-static gint ett_cip_cm_pid = -1;
-static gint ett_cip_cm_safety = -1;
-
-static gint ett_pccc_rrsc = -1;
-static gint ett_pccc_req_id = -1;
-static gint ett_pccc_cmd_data = -1;
-
-static gint ett_mb_rrsc = -1;
-static gint ett_mb_cmd_data = -1;
-
-static gint ett_cco_iomap = -1;
-static gint ett_cco_con_status = -1;
-static gint ett_cco_con_flag = -1;
-static gint ett_cco_tdi = -1;
-static gint ett_cco_pdi = -1;
-static gint ett_cco_ncp = -1;
-static gint ett_cco_rrsc = -1;
-static gint ett_cco_cmd_data = -1;
-static gint ett_cco_ttt = -1;
-
-static gint ett_time_sync_gm_clock_flags = -1;
-static gint ett_time_sync_local_clock_flags = -1;
-static gint ett_time_sync_port_state_info = -1;
-static gint ett_time_sync_port_enable_cfg = -1;
-static gint ett_time_sync_port_log_announce = -1;
-static gint ett_time_sync_port_log_sync = -1;
-static gint ett_time_sync_clock_type = -1;
-static gint ett_time_sync_port_profile_id_info = -1;
-static gint ett_time_sync_port_phys_addr_info = -1;
-static gint ett_time_sync_port_proto_addr_info = -1;
-static gint ett_id_status = -1;
-static gint ett_32bitheader_tree = -1;
-
-static gint ett_connection_info = -1;
-
-static expert_field ei_mal_identity_revision = EI_INIT;
-static expert_field ei_mal_identity_status = EI_INIT;
-static expert_field ei_mal_msg_rout_num_classes = EI_INIT;
-static expert_field ei_mal_time_sync_gm_clock = EI_INIT;
-static expert_field ei_mal_time_sync_parent_clock = EI_INIT;
-static expert_field ei_mal_time_sync_local_clock = EI_INIT;
-static expert_field ei_mal_time_sync_port_state_info = EI_INIT;
-static expert_field ei_mal_time_sync_port_state_info_ports = EI_INIT;
-static expert_field ei_mal_time_sync_port_enable_cfg = EI_INIT;
-static expert_field ei_mal_time_sync_port_enable_cfg_ports = EI_INIT;
-static expert_field ei_mal_time_sync_port_log_announce = EI_INIT;
-static expert_field ei_mal_time_sync_port_log_announce_ports = EI_INIT;
-static expert_field ei_mal_time_sync_port_log_sync = EI_INIT;
-static expert_field ei_mal_time_sync_port_log_sync_ports = EI_INIT;
-static expert_field ei_mal_time_sync_clock_type = EI_INIT;
-static expert_field ei_mal_time_sync_manufacture_id = EI_INIT;
-static expert_field ei_mal_time_sync_prod_desc = EI_INIT;
-static expert_field ei_mal_time_sync_prod_desc_64 = EI_INIT;
-static expert_field ei_mal_time_sync_prod_desc_size = EI_INIT;
-static expert_field ei_mal_time_sync_revision_data = EI_INIT;
-static expert_field ei_mal_time_sync_revision_data_32 = EI_INIT;
-static expert_field ei_mal_time_sync_revision_data_size = EI_INIT;
-static expert_field ei_mal_time_sync_user_desc = EI_INIT;
-static expert_field ei_mal_time_sync_user_desc_128 = EI_INIT;
-static expert_field ei_mal_time_sync_user_desc_size = EI_INIT;
-static expert_field ei_mal_time_sync_port_profile_id_info = EI_INIT;
-static expert_field ei_mal_time_sync_port_profile_id_info_ports = EI_INIT;
-static expert_field ei_mal_time_sync_port_phys_addr_info = EI_INIT;
-static expert_field ei_mal_time_sync_port_phys_addr_info_ports = EI_INIT;
-static expert_field ei_mal_time_sync_port_proto_addr_info = EI_INIT;
-static expert_field ei_mal_time_sync_port_proto_addr_info_ports = EI_INIT;
-static expert_field ei_mal_time_sync_sys_time_and_offset = EI_INIT;
-static expert_field ei_proto_log_seg_format = EI_INIT;
-static expert_field ei_mal_incomplete_epath = EI_INIT;
-static expert_field ei_proto_electronic_key_format = EI_INIT;
-static expert_field ei_proto_special_segment_format = EI_INIT;
-static expert_field ei_proto_log_seg_type = EI_INIT;
-static expert_field ei_proto_log_sub_seg_type = EI_INIT;
-static expert_field ei_proto_ext_string_format = EI_INIT;
-static expert_field ei_proto_ext_network = EI_INIT;
-static expert_field ei_proto_seg_type = EI_INIT;
-static expert_field ei_proto_unsupported_datatype = EI_INIT;
-static expert_field ei_mal_serv_gal = EI_INIT;
-static expert_field ei_mal_serv_gal_count = EI_INIT;
-static expert_field ei_mal_serv_sal = EI_INIT;
-static expert_field ei_mal_serv_sal_count = EI_INIT;
-static expert_field ei_mal_msp_services = EI_INIT;
-static expert_field ei_mal_msp_inv_offset = EI_INIT;
-static expert_field ei_mal_msp_missing_services = EI_INIT;
-static expert_field ei_mal_serv_find_next_object = EI_INIT;
-static expert_field ei_mal_serv_find_next_object_count = EI_INIT;
-static expert_field ei_mal_rpi_no_data = EI_INIT;
-static expert_field ei_mal_fwd_close_missing_data = EI_INIT;
-static expert_field ei_mal_opt_attr_list = EI_INIT;
-static expert_field ei_mal_opt_service_list = EI_INIT;
-static expert_field ei_mal_padded_epath_size = EI_INIT;
-static expert_field ei_mal_missing_string_data = EI_INIT;
-
-static expert_field ei_cip_safety_open_type1 = EI_INIT;
-static expert_field ei_cip_safety_open_type2a = EI_INIT;
-static expert_field ei_cip_safety_open_type2b = EI_INIT;
-static expert_field ei_cip_no_fwd_close = EI_INIT;
+static gint ett_cip;
+static gint ett_cip_class_generic;
+static gint ett_cip_class_cm;
+static gint ett_cip_class_pccc;
+static gint ett_cip_class_mb;
+static gint ett_cip_class_cco;
+
+static gint ett_path;
+static gint ett_path_seg;
+static gint ett_mcsc;
+static gint ett_cia_path;
+static gint ett_data_seg;
+static gint ett_port_path;
+static gint ett_network_seg;
+static gint ett_network_seg_safety;
+static gint ett_network_seg_safety_time_correction_net_params;
+static gint ett_cip_seg_safety_tunid;
+static gint ett_cip_seg_safety_tunid_snn;
+static gint ett_cip_seg_safety_ounid;
+static gint ett_cip_seg_safety_ounid_snn;
+
+static gint ett_rrsc;
+static gint ett_status_item;
+static gint ett_add_status_item;
+static gint ett_cmd_data;
+
+static gint ett_cip_get_attributes_all_item;
+static gint ett_cip_get_attribute_list;
+static gint ett_cip_get_attribute_list_item;
+static gint ett_cip_set_attribute_list;
+static gint ett_cip_set_attribute_list_item;
+static gint ett_cip_mult_service_packet;
+static gint ett_cip_msp_offset;
+
+static gint ett_cm_rrsc;
+static gint ett_cm_ncp;
+static gint ett_cm_mes_req;
+static gint ett_cm_cmd_data;
+static gint ett_cm_ttt;
+static gint ett_cm_add_status_item;
+static gint ett_cip_cm_pid;
+static gint ett_cip_cm_safety;
+
+static gint ett_pccc_rrsc;
+static gint ett_pccc_req_id;
+static gint ett_pccc_cmd_data;
+
+static gint ett_mb_rrsc;
+static gint ett_mb_cmd_data;
+
+static gint ett_cco_iomap;
+static gint ett_cco_con_status;
+static gint ett_cco_con_flag;
+static gint ett_cco_tdi;
+static gint ett_cco_pdi;
+static gint ett_cco_ncp;
+static gint ett_cco_rrsc;
+static gint ett_cco_cmd_data;
+static gint ett_cco_ttt;
+
+static gint ett_time_sync_gm_clock_flags;
+static gint ett_time_sync_local_clock_flags;
+static gint ett_time_sync_port_state_info;
+static gint ett_time_sync_port_enable_cfg;
+static gint ett_time_sync_port_log_announce;
+static gint ett_time_sync_port_log_sync;
+static gint ett_time_sync_clock_type;
+static gint ett_time_sync_port_profile_id_info;
+static gint ett_time_sync_port_phys_addr_info;
+static gint ett_time_sync_port_proto_addr_info;
+static gint ett_id_status;
+static gint ett_32bitheader_tree;
+
+static gint ett_connection_info;
+
+static expert_field ei_mal_identity_revision;
+static expert_field ei_mal_identity_status;
+static expert_field ei_mal_msg_rout_num_classes;
+static expert_field ei_mal_time_sync_gm_clock;
+static expert_field ei_mal_time_sync_parent_clock;
+static expert_field ei_mal_time_sync_local_clock;
+static expert_field ei_mal_time_sync_port_state_info;
+static expert_field ei_mal_time_sync_port_state_info_ports;
+static expert_field ei_mal_time_sync_port_enable_cfg;
+static expert_field ei_mal_time_sync_port_enable_cfg_ports;
+static expert_field ei_mal_time_sync_port_log_announce;
+static expert_field ei_mal_time_sync_port_log_announce_ports;
+static expert_field ei_mal_time_sync_port_log_sync;
+static expert_field ei_mal_time_sync_port_log_sync_ports;
+static expert_field ei_mal_time_sync_clock_type;
+static expert_field ei_mal_time_sync_manufacture_id;
+static expert_field ei_mal_time_sync_prod_desc;
+static expert_field ei_mal_time_sync_prod_desc_64;
+static expert_field ei_mal_time_sync_prod_desc_size;
+static expert_field ei_mal_time_sync_revision_data;
+static expert_field ei_mal_time_sync_revision_data_32;
+static expert_field ei_mal_time_sync_revision_data_size;
+static expert_field ei_mal_time_sync_user_desc;
+static expert_field ei_mal_time_sync_user_desc_128;
+static expert_field ei_mal_time_sync_user_desc_size;
+static expert_field ei_mal_time_sync_port_profile_id_info;
+static expert_field ei_mal_time_sync_port_profile_id_info_ports;
+static expert_field ei_mal_time_sync_port_phys_addr_info;
+static expert_field ei_mal_time_sync_port_phys_addr_info_ports;
+static expert_field ei_mal_time_sync_port_proto_addr_info;
+static expert_field ei_mal_time_sync_port_proto_addr_info_ports;
+static expert_field ei_mal_time_sync_sys_time_and_offset;
+static expert_field ei_proto_log_seg_format;
+static expert_field ei_mal_incomplete_epath;
+static expert_field ei_proto_electronic_key_format;
+static expert_field ei_proto_special_segment_format;
+static expert_field ei_proto_log_seg_type;
+static expert_field ei_proto_log_sub_seg_type;
+static expert_field ei_proto_ext_string_format;
+static expert_field ei_proto_ext_network;
+static expert_field ei_proto_seg_type;
+static expert_field ei_proto_unsupported_datatype;
+static expert_field ei_mal_serv_gal;
+static expert_field ei_mal_serv_gal_count;
+static expert_field ei_mal_serv_sal;
+static expert_field ei_mal_serv_sal_count;
+static expert_field ei_mal_msp_services;
+static expert_field ei_mal_msp_inv_offset;
+static expert_field ei_mal_msp_missing_services;
+static expert_field ei_mal_serv_find_next_object;
+static expert_field ei_mal_serv_find_next_object_count;
+static expert_field ei_mal_rpi_no_data;
+static expert_field ei_mal_fwd_close_missing_data;
+static expert_field ei_mal_opt_attr_list;
+static expert_field ei_mal_opt_service_list;
+static expert_field ei_mal_padded_epath_size;
+static expert_field ei_mal_missing_string_data;
+
+static expert_field ei_cip_safety_open_type1;
+static expert_field ei_cip_safety_open_type2a;
+static expert_field ei_cip_safety_open_type2b;
+static expert_field ei_cip_no_fwd_close;
 
 //// Concurrent Connections
-static int hf_cip_cm_cc_version = -1;
+static int hf_cip_cm_cc_version;
 
-static int hf_cip_cc_packet_length = -1;
-static int hf_cip_cc_packet_options = -1;
-static int hf_cip_cc_packet_type = -1;
-static int hf_cip_cc_packet_keepalive = -1;
-static int hf_cip_cc_packet_keepalive_hop_count = -1;
-static int hf_cip_cc_packet_reserved = -1;
-static int hf_cip_cc_packet_seq_number = -1;
-static int hf_cip_cc_crc = -1;
+static int hf_cip_cc_packet_length;
+static int hf_cip_cc_packet_options;
+static int hf_cip_cc_packet_type;
+static int hf_cip_cc_packet_keepalive;
+static int hf_cip_cc_packet_keepalive_hop_count;
+static int hf_cip_cc_packet_reserved;
+static int hf_cip_cc_packet_seq_number;
+static int hf_cip_cc_crc;
 
 // Parameters for Concurrent Extended Network Segment
-static int hf_ext_net_seg_hops_count = -1;
-static int hf_ext_net_seg_length = -1;
-static int hf_ext_net_seg_hop = -1;
-static int hf_ext_net_seg_hop_egress_cip_port = -1;
-static int hf_ext_net_seg_hop_link_adr_type = -1;
-static int hf_ext_net_seg_hop_number_of_linkadr = -1;
-static int hf_ext_net_seg_link_address = -1;
-static int hf_ext_net_seg_link_ipv4 = -1;
-static int hf_ext_net_seg_link_hostname = -1;
-
-static int proto_cc = -1;
+static int hf_ext_net_seg_hops_count;
+static int hf_ext_net_seg_length;
+static int hf_ext_net_seg_hop;
+static int hf_ext_net_seg_hop_egress_cip_port;
+static int hf_ext_net_seg_hop_link_adr_type;
+static int hf_ext_net_seg_hop_number_of_linkadr;
+static int hf_ext_net_seg_link_address;
+static int hf_ext_net_seg_link_ipv4;
+static int hf_ext_net_seg_link_hostname;
+
+static int proto_cc;
 
 /* Define the tree for the frame */
-static gint ett_cc_header = -1;
-static gint ett_cc_hop = -1;
+static gint ett_cc_header;
+static gint ett_cc_hop;
 
-static expert_field ei_cc_invalid_header_type = EI_INIT;
+static expert_field ei_cc_invalid_header_type;
 
 static const value_string cc_link_adr_type[] = {
     { 0, "8-bit numeric link addresses" },
diff --git a/epan/dissectors/packet-cipmotion.c b/epan/dissectors/packet-cipmotion.c
index 0ad5ca9b19..6669f5c09a 100644
--- a/epan/dissectors/packet-cipmotion.c
+++ b/epan/dissectors/packet-cipmotion.c
@@ -30,283 +30,283 @@ void proto_register_cipmotion(void);
 void proto_reg_handoff_cipmotion(void);
 
 /* Protocol handle for CIP Motion */
-static int proto_cipmotion = -1;
-static int proto_cipmotion3 = -1;
+static int proto_cipmotion;
+static int proto_cipmotion3;
 
 /* Header field identifiers, these are registered in the
  * proto_register_cipmotion function along with the bites/bytes
  * they represent */
-static int hf_cip_format                    = -1;
-static int hf_cip_revision                  = -1;
-static int hf_cip_class1_seqnum             = -1;
-static int hf_configuration_block_format_rev = -1;
-static int hf_configuration_block_drive_power_struct_id = -1;
-static int hf_cip_updateid                  = -1;
-static int hf_cip_instance_cnt              = -1;
-static int hf_cip_last_update               = -1;
-static int hf_cip_node_status               = -1;
-static int hf_cip_node_control              = -1;
-static int hf_cip_node_control_remote       = -1;
-static int hf_cip_node_control_sync         = -1;
-static int hf_cip_node_data_valid           = -1;
-static int hf_cip_node_fault_reset          = -1;
-static int hf_cip_node_device_faulted       = -1;
-static int hf_cip_time_data_set             = -1;
-static int hf_cip_time_data_stamp           = -1;
-static int hf_cip_time_data_offset          = -1;
-static int hf_cip_time_data_diag            = -1;
-static int hf_cip_time_data_time_diag       = -1;
-static int hf_cip_cont_time_stamp           = -1;
-static int hf_cip_cont_time_offset          = -1;
-static int hf_cip_devc_time_stamp           = -1;
-static int hf_cip_devc_time_offset          = -1;
-static int hf_cip_lost_update               = -1;
-static int hf_cip_late_update               = -1;
-static int hf_cip_data_rx_time_stamp        = -1;
-static int hf_cip_data_tx_time_stamp        = -1;
-static int hf_cip_node_fltalarms            = -1;
-static int hf_cip_motor_cntrl               = -1;
-static int hf_cip_feedback                  = -1;
-static int hf_cip_feedback_mode             = -1;
-static int hf_cip_feedback_data_type        = -1;
-
-static int hf_connection_configuration_bits = -1;
-static int hf_connection_configuration_bits_power = -1;
-static int hf_connection_configuration_bits_safety_bit_valid = -1;
-static int hf_connection_configuration_bits_allow_network_safety = -1;
-
-static int hf_cip_axis_control              = -1;
-static int hf_cip_control_status            = -1;
-static int hf_cip_control_status_complete   = -1;
-static int hf_cip_control_status_bus_up     = -1;
-static int hf_cip_control_status_bus_unload = -1;
-static int hf_cip_control_status_power_loss = -1;
-static int hf_cip_axis_response             = -1;
-static int hf_cip_axis_resp_stat            = -1;
-static int hf_cip_cmd_data_pos_cmd          = -1;
-static int hf_cip_cmd_data_vel_cmd          = -1;
-static int hf_cip_cmd_data_acc_cmd          = -1;
-static int hf_cip_cmd_data_trq_cmd          = -1;
-static int hf_cip_cmd_data_unwind_cycle_count = -1;
-static int hf_cip_cmd_data_pos_displacement = -1;
-static int hf_cip_act_data_pos              = -1;
-static int hf_cip_act_data_vel              = -1;
-static int hf_cip_act_data_acc              = -1;
-static int hf_cip_act_unwind_cycle_count    = -1;
-static int hf_cip_act_pos_displacement      = -1;
-static int hf_cip_sts_flt                   = -1;
-static int hf_cip_sts_alrm                  = -1;
-static int hf_cip_sts_sts                   = -1;
-static int hf_cip_sts_iosts                 = -1;
-static int hf_cip_sts_axis_safety           = -1;
-static int hf_cip_intrp                     = -1;
-static int hf_cip_position_data_type        = -1;
-static int hf_cip_axis_state                = -1;
-static int hf_cip_evnt_ctrl_reg1_pos        = -1;
-static int hf_cip_evnt_ctrl_reg1_neg        = -1;
-static int hf_cip_evnt_ctrl_reg2_pos        = -1;
-static int hf_cip_evnt_ctrl_reg2_neg        = -1;
-static int hf_cip_evnt_ctrl_reg1_posrearm   = -1;
-static int hf_cip_evnt_ctrl_reg1_negrearm   = -1;
-static int hf_cip_evnt_ctrl_reg2_posrearm   = -1;
-static int hf_cip_evnt_ctrl_reg2_negrearm   = -1;
-static int hf_cip_evnt_ctrl_marker_pos      = -1;
-static int hf_cip_evnt_ctrl_marker_neg      = -1;
-static int hf_cip_evnt_ctrl_home_pos        = -1;
-static int hf_cip_evnt_ctrl_home_neg        = -1;
-static int hf_cip_evnt_ctrl_home_pp         = -1;
-static int hf_cip_evnt_ctrl_home_pm         = -1;
-static int hf_cip_evnt_ctrl_home_mp         = -1;
-static int hf_cip_evnt_ctrl_home_mm         = -1;
-static int hf_cip_evnt_ctrl_acks            = -1;
-static int hf_cip_evnt_extend_format        = -1;
-static int hf_cip_evnt_sts_reg1_pos         = -1;
-static int hf_cip_evnt_sts_reg1_neg         = -1;
-static int hf_cip_evnt_sts_reg2_pos         = -1;
-static int hf_cip_evnt_sts_reg2_neg         = -1;
-static int hf_cip_evnt_sts_reg1_posrearm    = -1;
-static int hf_cip_evnt_sts_reg1_negrearm    = -1;
-static int hf_cip_evnt_sts_reg2_posrearm    = -1;
-static int hf_cip_evnt_sts_reg2_negrearm    = -1;
-static int hf_cip_evnt_sts_marker_pos       = -1;
-static int hf_cip_evnt_sts_marker_neg       = -1;
-static int hf_cip_evnt_sts_home_pos         = -1;
-static int hf_cip_evnt_sts_home_neg         = -1;
-static int hf_cip_evnt_sts_home_pp          = -1;
-static int hf_cip_evnt_sts_home_pm          = -1;
-static int hf_cip_evnt_sts_home_mp          = -1;
-static int hf_cip_evnt_sts_home_mm          = -1;
-static int hf_cip_evnt_sts_nfs              = -1;
-static int hf_cip_evnt_sts_stat             = -1;
-static int hf_cip_evnt_type                 = -1;
-static int hf_cip_svc_code                  = -1;
-static int hf_cip_svc_sts                   = -1;
-static int hf_cip_svc_set_axis_attr_sts     = -1;
-static int hf_cip_svc_get_axis_attr_sts     = -1;
-static int hf_cip_svc_transction            = -1;
-static int hf_cip_svc_ext_status            = -1;
-static int hf_cip_svc_data                  = -1;
-static int hf_cip_ptp_grandmaster           = -1;
-static int hf_cip_axis_alarm                = -1;
-static int hf_cip_axis_fault                = -1;
-static int hf_cip_axis_sts_local_ctrl       = -1;
-static int hf_cip_axis_sts_alarm            = -1;
-static int hf_cip_axis_sts_dc_bus           = -1;
-static int hf_cip_axis_sts_pwr_struct       = -1;
-static int hf_cip_axis_sts_flux_up          = -1;
-static int hf_cip_axis_sts_tracking         = -1;
-static int hf_cip_axis_sts_pos_lock         = -1;
-static int hf_cip_axis_sts_vel_lock         = -1;
-static int hf_cip_axis_sts_vel_standstill   = -1;
-static int hf_cip_axis_sts_vel_threshold    = -1;
-static int hf_cip_axis_sts_vel_limit        = -1;
-static int hf_cip_axis_sts_acc_limit        = -1;
-static int hf_cip_axis_sts_dec_limit        = -1;
-static int hf_cip_axis_sts_torque_threshold = -1;
-static int hf_cip_axis_sts_torque_limit     = -1;
-static int hf_cip_axis_sts_cur_limit        = -1;
-static int hf_cip_axis_sts_therm_limit      = -1;
-static int hf_cip_axis_sts_feedback_integ   = -1;
-static int hf_cip_axis_sts_shutdown         = -1;
-static int hf_cip_axis_sts_in_process       = -1;
-static int hf_cip_axis_sts_dc_bus_unload    = -1;
-static int hf_cip_axis_sts_ac_pwr_loss      = -1;
-static int hf_cip_axis_sts_pos_cntrl_mode   = -1;
-static int hf_cip_axis_sts_vel_cntrl_mode   = -1;
-static int hf_cip_axis_sts_trq_cntrl_mode   = -1;
-
-static int hf_cip_axis_status2              = -1;
-static int hf_cip_axis_sts2_motor           = -1;
-static int hf_cip_axis_sts2_regenerate      = -1;
-static int hf_cip_axis_sts2_ride_thru       = -1;
-static int hf_cip_axis_sts2_ac_line_sync    = -1;
-static int hf_cip_axis_sts2_bus_volt_lock   = -1;
-static int hf_cip_axis_sts2_react_pwr_only  = -1;
-static int hf_cip_axis_sts2_volt_ctrl_mode  = -1;
-static int hf_cip_axis_sts2_pwr_loss        = -1;
-static int hf_cip_axis_sts2_ac_volt_sag     = -1;
-static int hf_cip_axis_sts2_ac_phase_loss   = -1;
-static int hf_cip_axis_sts2_ac_freq_change  = -1;
-static int hf_cip_axis_sts2_ac_sync_loss    = -1;
-static int hf_cip_axis_sts2_single_phase    = -1;
-static int hf_cip_axis_sts2_bus_volt_limit  = -1;
-static int hf_cip_axis_sts2_bus_volt_rate_limit = -1;
-static int hf_cip_axis_sts2_active_current_rate_limit = -1;
-static int hf_cip_axis_sts2_reactive_current_rate_limit = -1;
-static int hf_cip_axis_sts2_reactive_pwr_limit = -1;
-static int hf_cip_axis_sts2_reactive_pwr_rate_limit = -1;
-static int hf_cip_axis_sts2_active_current_limit = -1;
-static int hf_cip_axis_sts2_reactive_current_limit = -1;
-static int hf_cip_axis_sts2_motor_pwr_limit = -1;
-static int hf_cip_axis_sts2_regen_pwr_limit = -1;
-static int hf_cip_axis_sts2_convert_therm_limit = -1;
-
-static int hf_cip_cyclic_wrt_data           = -1;
-static int hf_cip_cyclic_rd_data            = -1;
-static int hf_cip_cyclic_write_blk          = -1;
-static int hf_cip_cyclic_read_blk           = -1;
-static int hf_cip_cyclic_write_sts          = -1;
-static int hf_cip_cyclic_read_sts           = -1;
-static int hf_cip_attribute_data            = -1;
-static int hf_cip_event_checking            = -1;
-static int hf_cip_event_ack                 = -1;
-static int hf_cip_event_status              = -1;
-static int hf_cip_event_id                  = -1;
-static int hf_cip_event_pos                 = -1;
-static int hf_cip_event_ts                  = -1;
-static int hf_cip_pos_cmd                   = -1;
-static int hf_cip_pos_cmd_int               = -1;
-static int hf_cip_vel_cmd                   = -1;
-static int hf_cip_accel_cmd                 = -1;
-static int hf_cip_trq_cmd                   = -1;
-static int hf_cip_pos_trim                  = -1;
-static int hf_cip_vel_trim                  = -1;
-static int hf_cip_accel_trim                = -1;
-static int hf_cip_trq_trim                  = -1;
-static int hf_cip_act_pos                   = -1;
-static int hf_cip_act_pos_64                = -1;
-static int hf_cip_act_vel                   = -1;
-static int hf_cip_act_accel                 = -1;
-static int hf_cip_fault_type                = -1;
-static int hf_cip_fault_sub_code            = -1;
-static int hf_cip_fault_action              = -1;
-static int hf_cip_fault_time_stamp          = -1;
-static int hf_cip_alarm_type                = -1;
-static int hf_cip_alarm_sub_code            = -1;
-static int hf_cip_alarm_state               = -1;
-static int hf_cip_alarm_time_stamp          = -1;
-static int hf_cip_axis_status               = -1;
-static int hf_cip_axis_status_mfg           = -1;
-static int hf_cip_axis_io_status            = -1;
-static int hf_cip_axis_io_status_mfg        = -1;
-static int hf_cip_axis_safety_status        = -1;
-static int hf_cip_axis_safety_status_mfg    = -1;
-static int hf_cip_axis_safety_state         = -1;
-static int hf_cip_cmd_data_set              = -1;
-static int hf_cip_act_data_set              = -1;
-static int hf_cip_sts_data_set              = -1;
-static int hf_cip_group_sync                = -1;
-static int hf_cip_command_control           = -1;
-
-static int hf_get_axis_attr_list_attribute_cnt     = -1;
-static int hf_get_axis_attr_list_attribute_id      = -1;
-static int hf_get_axis_attr_list_dimension         = -1;
-static int hf_get_axis_attr_list_element_size      = -1;
-static int hf_get_axis_attr_list_start_index       = -1;
-static int hf_get_axis_attr_list_data_elements     = -1;
-static int hf_set_axis_attr_list_attribute_cnt     = -1;
-static int hf_set_axis_attr_list_attribute_id      = -1;
-static int hf_set_axis_attr_list_dimension         = -1;
-static int hf_set_axis_attr_list_element_size      = -1;
-static int hf_set_axis_attr_list_start_index       = -1;
-static int hf_set_axis_attr_list_data_elements     = -1;
-static int hf_set_cyclic_list_attribute_cnt        = -1;
-static int hf_set_cyclic_list_attribute_id         = -1;
-static int hf_set_cyclic_list_read_block_id        = -1;
-static int hf_set_cyclic_list_attr_sts             = -1;
-static int hf_var_devce_instance                   = -1;
-static int hf_var_devce_instance_block_size        = -1;
-static int hf_var_devce_cyclic_block_size          = -1;
-static int hf_var_devce_cyclic_data_block_size     = -1;
-static int hf_var_devce_cyclic_rw_block_size       = -1;
-static int hf_var_devce_event_block_size           = -1;
-static int hf_var_devce_service_block_size         = -1;
-static int hf_cip_data                             = -1;
+static int hf_cip_format;
+static int hf_cip_revision;
+static int hf_cip_class1_seqnum;
+static int hf_configuration_block_format_rev;
+static int hf_configuration_block_drive_power_struct_id;
+static int hf_cip_updateid;
+static int hf_cip_instance_cnt;
+static int hf_cip_last_update;
+static int hf_cip_node_status;
+static int hf_cip_node_control;
+static int hf_cip_node_control_remote;
+static int hf_cip_node_control_sync;
+static int hf_cip_node_data_valid;
+static int hf_cip_node_fault_reset;
+static int hf_cip_node_device_faulted;
+static int hf_cip_time_data_set;
+static int hf_cip_time_data_stamp;
+static int hf_cip_time_data_offset;
+static int hf_cip_time_data_diag;
+static int hf_cip_time_data_time_diag;
+static int hf_cip_cont_time_stamp;
+static int hf_cip_cont_time_offset;
+static int hf_cip_devc_time_stamp;
+static int hf_cip_devc_time_offset;
+static int hf_cip_lost_update;
+static int hf_cip_late_update;
+static int hf_cip_data_rx_time_stamp;
+static int hf_cip_data_tx_time_stamp;
+static int hf_cip_node_fltalarms;
+static int hf_cip_motor_cntrl;
+static int hf_cip_feedback;
+static int hf_cip_feedback_mode;
+static int hf_cip_feedback_data_type;
+
+static int hf_connection_configuration_bits;
+static int hf_connection_configuration_bits_power;
+static int hf_connection_configuration_bits_safety_bit_valid;
+static int hf_connection_configuration_bits_allow_network_safety;
+
+static int hf_cip_axis_control;
+static int hf_cip_control_status;
+static int hf_cip_control_status_complete;
+static int hf_cip_control_status_bus_up;
+static int hf_cip_control_status_bus_unload;
+static int hf_cip_control_status_power_loss;
+static int hf_cip_axis_response;
+static int hf_cip_axis_resp_stat;
+static int hf_cip_cmd_data_pos_cmd;
+static int hf_cip_cmd_data_vel_cmd;
+static int hf_cip_cmd_data_acc_cmd;
+static int hf_cip_cmd_data_trq_cmd;
+static int hf_cip_cmd_data_unwind_cycle_count;
+static int hf_cip_cmd_data_pos_displacement;
+static int hf_cip_act_data_pos;
+static int hf_cip_act_data_vel;
+static int hf_cip_act_data_acc;
+static int hf_cip_act_unwind_cycle_count;
+static int hf_cip_act_pos_displacement;
+static int hf_cip_sts_flt;
+static int hf_cip_sts_alrm;
+static int hf_cip_sts_sts;
+static int hf_cip_sts_iosts;
+static int hf_cip_sts_axis_safety;
+static int hf_cip_intrp;
+static int hf_cip_position_data_type;
+static int hf_cip_axis_state;
+static int hf_cip_evnt_ctrl_reg1_pos;
+static int hf_cip_evnt_ctrl_reg1_neg;
+static int hf_cip_evnt_ctrl_reg2_pos;
+static int hf_cip_evnt_ctrl_reg2_neg;
+static int hf_cip_evnt_ctrl_reg1_posrearm;
+static int hf_cip_evnt_ctrl_reg1_negrearm;
+static int hf_cip_evnt_ctrl_reg2_posrearm;
+static int hf_cip_evnt_ctrl_reg2_negrearm;
+static int hf_cip_evnt_ctrl_marker_pos;
+static int hf_cip_evnt_ctrl_marker_neg;
+static int hf_cip_evnt_ctrl_home_pos;
+static int hf_cip_evnt_ctrl_home_neg;
+static int hf_cip_evnt_ctrl_home_pp;
+static int hf_cip_evnt_ctrl_home_pm;
+static int hf_cip_evnt_ctrl_home_mp;
+static int hf_cip_evnt_ctrl_home_mm;
+static int hf_cip_evnt_ctrl_acks;
+static int hf_cip_evnt_extend_format;
+static int hf_cip_evnt_sts_reg1_pos;
+static int hf_cip_evnt_sts_reg1_neg;
+static int hf_cip_evnt_sts_reg2_pos;
+static int hf_cip_evnt_sts_reg2_neg;
+static int hf_cip_evnt_sts_reg1_posrearm;
+static int hf_cip_evnt_sts_reg1_negrearm;
+static int hf_cip_evnt_sts_reg2_posrearm;
+static int hf_cip_evnt_sts_reg2_negrearm;
+static int hf_cip_evnt_sts_marker_pos;
+static int hf_cip_evnt_sts_marker_neg;
+static int hf_cip_evnt_sts_home_pos;
+static int hf_cip_evnt_sts_home_neg;
+static int hf_cip_evnt_sts_home_pp;
+static int hf_cip_evnt_sts_home_pm;
+static int hf_cip_evnt_sts_home_mp;
+static int hf_cip_evnt_sts_home_mm;
+static int hf_cip_evnt_sts_nfs;
+static int hf_cip_evnt_sts_stat;
+static int hf_cip_evnt_type;
+static int hf_cip_svc_code;
+static int hf_cip_svc_sts;
+static int hf_cip_svc_set_axis_attr_sts;
+static int hf_cip_svc_get_axis_attr_sts;
+static int hf_cip_svc_transction;
+static int hf_cip_svc_ext_status;
+static int hf_cip_svc_data;
+static int hf_cip_ptp_grandmaster;
+static int hf_cip_axis_alarm;
+static int hf_cip_axis_fault;
+static int hf_cip_axis_sts_local_ctrl;
+static int hf_cip_axis_sts_alarm;
+static int hf_cip_axis_sts_dc_bus;
+static int hf_cip_axis_sts_pwr_struct;
+static int hf_cip_axis_sts_flux_up;
+static int hf_cip_axis_sts_tracking;
+static int hf_cip_axis_sts_pos_lock;
+static int hf_cip_axis_sts_vel_lock;
+static int hf_cip_axis_sts_vel_standstill;
+static int hf_cip_axis_sts_vel_threshold;
+static int hf_cip_axis_sts_vel_limit;
+static int hf_cip_axis_sts_acc_limit;
+static int hf_cip_axis_sts_dec_limit;
+static int hf_cip_axis_sts_torque_threshold;
+static int hf_cip_axis_sts_torque_limit;
+static int hf_cip_axis_sts_cur_limit;
+static int hf_cip_axis_sts_therm_limit;
+static int hf_cip_axis_sts_feedback_integ;
+static int hf_cip_axis_sts_shutdown;
+static int hf_cip_axis_sts_in_process;
+static int hf_cip_axis_sts_dc_bus_unload;
+static int hf_cip_axis_sts_ac_pwr_loss;
+static int hf_cip_axis_sts_pos_cntrl_mode;
+static int hf_cip_axis_sts_vel_cntrl_mode;
+static int hf_cip_axis_sts_trq_cntrl_mode;
+
+static int hf_cip_axis_status2;
+static int hf_cip_axis_sts2_motor;
+static int hf_cip_axis_sts2_regenerate;
+static int hf_cip_axis_sts2_ride_thru;
+static int hf_cip_axis_sts2_ac_line_sync;
+static int hf_cip_axis_sts2_bus_volt_lock;
+static int hf_cip_axis_sts2_react_pwr_only;
+static int hf_cip_axis_sts2_volt_ctrl_mode;
+static int hf_cip_axis_sts2_pwr_loss;
+static int hf_cip_axis_sts2_ac_volt_sag;
+static int hf_cip_axis_sts2_ac_phase_loss;
+static int hf_cip_axis_sts2_ac_freq_change;
+static int hf_cip_axis_sts2_ac_sync_loss;
+static int hf_cip_axis_sts2_single_phase;
+static int hf_cip_axis_sts2_bus_volt_limit;
+static int hf_cip_axis_sts2_bus_volt_rate_limit;
+static int hf_cip_axis_sts2_active_current_rate_limit;
+static int hf_cip_axis_sts2_reactive_current_rate_limit;
+static int hf_cip_axis_sts2_reactive_pwr_limit;
+static int hf_cip_axis_sts2_reactive_pwr_rate_limit;
+static int hf_cip_axis_sts2_active_current_limit;
+static int hf_cip_axis_sts2_reactive_current_limit;
+static int hf_cip_axis_sts2_motor_pwr_limit;
+static int hf_cip_axis_sts2_regen_pwr_limit;
+static int hf_cip_axis_sts2_convert_therm_limit;
+
+static int hf_cip_cyclic_wrt_data;
+static int hf_cip_cyclic_rd_data;
+static int hf_cip_cyclic_write_blk;
+static int hf_cip_cyclic_read_blk;
+static int hf_cip_cyclic_write_sts;
+static int hf_cip_cyclic_read_sts;
+static int hf_cip_attribute_data;
+static int hf_cip_event_checking;
+static int hf_cip_event_ack;
+static int hf_cip_event_status;
+static int hf_cip_event_id;
+static int hf_cip_event_pos;
+static int hf_cip_event_ts;
+static int hf_cip_pos_cmd;
+static int hf_cip_pos_cmd_int;
+static int hf_cip_vel_cmd;
+static int hf_cip_accel_cmd;
+static int hf_cip_trq_cmd;
+static int hf_cip_pos_trim;
+static int hf_cip_vel_trim;
+static int hf_cip_accel_trim;
+static int hf_cip_trq_trim;
+static int hf_cip_act_pos;
+static int hf_cip_act_pos_64;
+static int hf_cip_act_vel;
+static int hf_cip_act_accel;
+static int hf_cip_fault_type;
+static int hf_cip_fault_sub_code;
+static int hf_cip_fault_action;
+static int hf_cip_fault_time_stamp;
+static int hf_cip_alarm_type;
+static int hf_cip_alarm_sub_code;
+static int hf_cip_alarm_state;
+static int hf_cip_alarm_time_stamp;
+static int hf_cip_axis_status;
+static int hf_cip_axis_status_mfg;
+static int hf_cip_axis_io_status;
+static int hf_cip_axis_io_status_mfg;
+static int hf_cip_axis_safety_status;
+static int hf_cip_axis_safety_status_mfg;
+static int hf_cip_axis_safety_state;
+static int hf_cip_cmd_data_set;
+static int hf_cip_act_data_set;
+static int hf_cip_sts_data_set;
+static int hf_cip_group_sync;
+static int hf_cip_command_control;
+
+static int hf_get_axis_attr_list_attribute_cnt;
+static int hf_get_axis_attr_list_attribute_id;
+static int hf_get_axis_attr_list_dimension;
+static int hf_get_axis_attr_list_element_size;
+static int hf_get_axis_attr_list_start_index;
+static int hf_get_axis_attr_list_data_elements;
+static int hf_set_axis_attr_list_attribute_cnt;
+static int hf_set_axis_attr_list_attribute_id;
+static int hf_set_axis_attr_list_dimension;
+static int hf_set_axis_attr_list_element_size;
+static int hf_set_axis_attr_list_start_index;
+static int hf_set_axis_attr_list_data_elements;
+static int hf_set_cyclic_list_attribute_cnt;
+static int hf_set_cyclic_list_attribute_id;
+static int hf_set_cyclic_list_read_block_id;
+static int hf_set_cyclic_list_attr_sts;
+static int hf_var_devce_instance;
+static int hf_var_devce_instance_block_size;
+static int hf_var_devce_cyclic_block_size;
+static int hf_var_devce_cyclic_data_block_size;
+static int hf_var_devce_cyclic_rw_block_size;
+static int hf_var_devce_event_block_size;
+static int hf_var_devce_service_block_size;
+static int hf_cip_data;
 
 /* Subtree pointers for the dissection */
-static gint ett_cipmotion           = -1;
-static gint ett_cont_dev_header     = -1;
-static gint ett_control_status      = -1;
-static gint ett_node_control        = -1;
-static gint ett_node_status         = -1;
-static gint ett_time_data_set       = -1;
-static gint ett_inst_data_header    = -1;
-static gint ett_cyclic_data_block   = -1;
-static gint ett_cyclic_command_data = -1;
-static gint ett_feedback_mode       = -1;
-static gint ett_connection_configuration_bits = -1;
-static gint ett_control_mode        = -1;
-static gint ett_feedback_config     = -1;
-static gint ett_command_data_set    = -1;
-static gint ett_actual_data_set     = -1;
-static gint ett_status_data_set     = -1;
-static gint ett_interp_control      = -1;
-static gint ett_cyclic_rd_wt        = -1;
-static gint ett_event               = -1;
-static gint ett_event_check_ctrl    = -1;
-static gint ett_event_check_sts     = -1;
-static gint ett_service             = -1;
-static gint ett_get_axis_attribute  = -1;
-static gint ett_set_axis_attribute  = -1;
-static gint ett_get_axis_attr_list  = -1;
-static gint ett_set_axis_attr_list  = -1;
-static gint ett_set_cyclic_list     = -1;
-static gint ett_group_sync          = -1;
-static gint ett_axis_status_set     = -1;
-static gint ett_command_control     = -1;
-static gint ett_configuration_block = -1;
-
-static expert_field ei_format_rev_conn_pt = EI_INIT;
+static gint ett_cipmotion;
+static gint ett_cont_dev_header;
+static gint ett_control_status;
+static gint ett_node_control;
+static gint ett_node_status;
+static gint ett_time_data_set;
+static gint ett_inst_data_header;
+static gint ett_cyclic_data_block;
+static gint ett_cyclic_command_data;
+static gint ett_feedback_mode;
+static gint ett_connection_configuration_bits;
+static gint ett_control_mode;
+static gint ett_feedback_config;
+static gint ett_command_data_set;
+static gint ett_actual_data_set;
+static gint ett_status_data_set;
+static gint ett_interp_control;
+static gint ett_cyclic_rd_wt;
+static gint ett_event;
+static gint ett_event_check_ctrl;
+static gint ett_event_check_sts;
+static gint ett_service;
+static gint ett_get_axis_attribute;
+static gint ett_set_axis_attribute;
+static gint ett_get_axis_attr_list;
+static gint ett_set_axis_attr_list;
+static gint ett_set_cyclic_list;
+static gint ett_group_sync;
+static gint ett_axis_status_set;
+static gint ett_command_control;
+static gint ett_configuration_block;
+
+static expert_field ei_format_rev_conn_pt;
 
 static dissector_handle_t cipmotion_handle;
 static dissector_handle_t cipmotion3_handle;
diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c
index 0048ccf76c..595f0536a1 100644
--- a/epan/dissectors/packet-cipsafety.c
+++ b/epan/dissectors/packet-cipsafety.c
@@ -36,281 +36,281 @@ void proto_reg_handoff_cipsafety(void);
 /* The entry point to the actual dissection is: dissect_cipsafety */
 
 /* Protocol handle for CIP Safety */
-static int proto_cipsafety                = -1;
-static int proto_cipsafety_base_data      = -1;
-static int proto_cipsafety_extended_data  = -1;
-static int proto_cipsafety_base_time_coord      = -1;
-static int proto_cipsafety_extended_time_coord  = -1;
-static int proto_cip_class_s_supervisor   = -1;
-static int proto_cip_class_s_validator    = -1;
-static int proto_cip                      = -1;
+static int proto_cipsafety;
+static int proto_cipsafety_base_data;
+static int proto_cipsafety_extended_data;
+static int proto_cipsafety_base_time_coord;
+static int proto_cipsafety_extended_time_coord;
+static int proto_cip_class_s_supervisor;
+static int proto_cip_class_s_validator;
+static int proto_cip;
 
 static dissector_table_t subdissector_class_table;
 static dissector_handle_t cip_class_s_supervisor_handle;
 static dissector_handle_t cip_class_s_validator_handle;
 
 /* CIP Safety field identifiers */
-static int hf_cipsafety_data                      = -1;
-static int hf_cipsafety_mode_byte                 = -1;
-static int hf_cipsafety_mode_byte_run_idle        = -1;
-static int hf_cipsafety_mode_byte_not_run_idle    = -1;
-static int hf_cipsafety_mode_byte_tbd_2_bit       = -1;
-static int hf_cipsafety_mode_byte_tbd_2_copy      = -1;
-static int hf_cipsafety_mode_byte_ping_count      = -1;
-static int hf_cipsafety_mode_byte_tbd             = -1;
-static int hf_cipsafety_mode_byte_not_tbd         = -1;
-static int hf_cipsafety_crc_s1                    = -1;
-static int hf_cipsafety_crc_s1_status             = -1;
-static int hf_cipsafety_crc_s2                    = -1;
-static int hf_cipsafety_crc_s2_status             = -1;
-static int hf_cipsafety_crc_s3                    = -1;
-static int hf_cipsafety_crc_s3_status             = -1;
-static int hf_cipsafety_complement_crc_s3         = -1;
-static int hf_cipsafety_complement_crc_s3_status  = -1;
-static int hf_cipsafety_timestamp                 = -1;
-static int hf_cipsafety_ack_byte                  = -1;
-static int hf_cipsafety_ack_byte_ping_count_reply = -1;
-static int hf_cipsafety_ack_byte_reserved1        = -1;
-static int hf_cipsafety_ack_byte_ping_response    = -1;
-static int hf_cipsafety_ack_byte_reserved2        = -1;
-static int hf_cipsafety_ack_byte_parity_even      = -1;
-static int hf_cipsafety_ack_byte2                 = -1;
-static int hf_cipsafety_consumer_time_value       = -1;
-static int hf_cipsafety_mcast_byte                = -1;
-static int hf_cipsafety_mcast_byte_consumer_num   = -1;
-static int hf_cipsafety_mcast_byte_reserved1      = -1;
-static int hf_cipsafety_mcast_byte_mai            = -1;
-static int hf_cipsafety_mcast_byte_reserved2      = -1;
-static int hf_cipsafety_mcast_byte_parity_even    = -1;
-static int hf_cipsafety_mcast_byte2               = -1;
-static int hf_cipsafety_time_correction           = -1;
-static int hf_cipsafety_crc_s5_0                  = -1;
-static int hf_cipsafety_crc_s5_1                  = -1;
-static int hf_cipsafety_crc_s5_2                  = -1;
-static int hf_cipsafety_crc_s5_status             = -1;
-static int hf_cipsafety_complement_data           = -1;
+static int hf_cipsafety_data;
+static int hf_cipsafety_mode_byte;
+static int hf_cipsafety_mode_byte_run_idle;
+static int hf_cipsafety_mode_byte_not_run_idle;
+static int hf_cipsafety_mode_byte_tbd_2_bit;
+static int hf_cipsafety_mode_byte_tbd_2_copy;
+static int hf_cipsafety_mode_byte_ping_count;
+static int hf_cipsafety_mode_byte_tbd;
+static int hf_cipsafety_mode_byte_not_tbd;
+static int hf_cipsafety_crc_s1;
+static int hf_cipsafety_crc_s1_status;
+static int hf_cipsafety_crc_s2;
+static int hf_cipsafety_crc_s2_status;
+static int hf_cipsafety_crc_s3;
+static int hf_cipsafety_crc_s3_status;
+static int hf_cipsafety_complement_crc_s3;
+static int hf_cipsafety_complement_crc_s3_status;
+static int hf_cipsafety_timestamp;
+static int hf_cipsafety_ack_byte;
+static int hf_cipsafety_ack_byte_ping_count_reply;
+static int hf_cipsafety_ack_byte_reserved1;
+static int hf_cipsafety_ack_byte_ping_response;
+static int hf_cipsafety_ack_byte_reserved2;
+static int hf_cipsafety_ack_byte_parity_even;
+static int hf_cipsafety_ack_byte2;
+static int hf_cipsafety_consumer_time_value;
+static int hf_cipsafety_mcast_byte;
+static int hf_cipsafety_mcast_byte_consumer_num;
+static int hf_cipsafety_mcast_byte_reserved1;
+static int hf_cipsafety_mcast_byte_mai;
+static int hf_cipsafety_mcast_byte_reserved2;
+static int hf_cipsafety_mcast_byte_parity_even;
+static int hf_cipsafety_mcast_byte2;
+static int hf_cipsafety_time_correction;
+static int hf_cipsafety_crc_s5_0;
+static int hf_cipsafety_crc_s5_1;
+static int hf_cipsafety_crc_s5_2;
+static int hf_cipsafety_crc_s5_status;
+static int hf_cipsafety_complement_data;
 
 /* CIP Safety header field identifiers */
-static int hf_cip_reqrsp            = -1;
-static int hf_cip_data              = -1;
+static int hf_cip_reqrsp;
+static int hf_cip_data;
 
 /* Safety Supervisor header field identifiers */
-static int hf_cip_ssupervisor_sc = -1;
-static int hf_cip_ssupervisor_recover_data = -1;
-static int hf_cip_ssupervisor_perform_diag_data = -1;
-static int hf_cip_ssupervisor_configure_request_password = -1;
-static int hf_cip_ssupervisor_configure_request_tunid = -1;
-static int hf_cip_ssupervisor_configure_request_tunid_snn_timestamp = -1;
-static int hf_cip_ssupervisor_configure_request_tunid_snn_date = -1;
-static int hf_cip_ssupervisor_configure_request_tunid_snn_time = -1;
-static int hf_cip_ssupervisor_configure_request_tunid_nodeid = -1;
-static int hf_cip_ssupervisor_configure_request_ounid = -1;
-static int hf_cip_ssupervisor_configure_request_ounid_snn_timestamp = -1;
-static int hf_cip_ssupervisor_configure_request_ounid_snn_date = -1;
-static int hf_cip_ssupervisor_configure_request_ounid_snn_time = -1;
-static int hf_cip_ssupervisor_configure_request_ounid_nodeid = -1;
-static int hf_cip_ssupervisor_validate_configuration_sccrc = -1;
-static int hf_cip_ssupervisor_validate_configuration_scts_timestamp = -1;
-static int hf_cip_ssupervisor_validate_configuration_scts_date = -1;
-static int hf_cip_ssupervisor_validate_configuration_scts_time = -1;
-static int hf_cip_ssupervisor_validate_configuration_ext_error = -1;
-static int hf_cip_ssupervisor_set_password_current_password = -1;
-static int hf_cip_ssupervisor_set_password_new_password = -1;
-static int hf_cip_ssupervisor_configure_lock_value = -1;
-static int hf_cip_ssupervisor_configure_lock_password = -1;
-static int hf_cip_ssupervisor_configure_lock_tunid = -1;
-static int hf_cip_ssupervisor_configure_lock_tunid_snn_timestamp = -1;
-static int hf_cip_ssupervisor_configure_lock_tunid_snn_date = -1;
-static int hf_cip_ssupervisor_configure_lock_tunid_snn_time = -1;
-static int hf_cip_ssupervisor_configure_lock_tunid_nodeid = -1;
-static int hf_cip_ssupervisor_mode_change_value = -1;
-static int hf_cip_ssupervisor_mode_change_password = -1;
-static int hf_cip_ssupervisor_reset_type = -1;
-static int hf_cip_ssupervisor_reset_password = -1;
-static int hf_cip_ssupervisor_reset_tunid = -1;
-static int hf_cip_ssupervisor_reset_tunid_tunid_snn_timestamp = -1;
-static int hf_cip_ssupervisor_reset_tunid_tunid_snn_date = -1;
-static int hf_cip_ssupervisor_reset_tunid_tunid_snn_time = -1;
-static int hf_cip_ssupervisor_reset_tunid_nodeid = -1;
-static int hf_cip_ssupervisor_reset_attr_bitmap = -1;
-static int hf_cip_ssupervisor_reset_attr_bitmap_macid = -1;
-static int hf_cip_ssupervisor_reset_attr_bitmap_baudrate = -1;
-static int hf_cip_ssupervisor_reset_attr_bitmap_tunid = -1;
-static int hf_cip_ssupervisor_reset_attr_bitmap_password = -1;
-static int hf_cip_ssupervisor_reset_attr_bitmap_cfunid = -1;
-static int hf_cip_ssupervisor_reset_attr_bitmap_ocpunid = -1;
-static int hf_cip_ssupervisor_reset_attr_bitmap_reserved = -1;
-static int hf_cip_ssupervisor_reset_attr_bitmap_extended = -1;
-static int hf_cip_ssupervisor_reset_password_data_size = -1;
-static int hf_cip_ssupervisor_reset_password_data = -1;
-static int hf_cip_ssupervisor_propose_tunid_tunid = -1;
-static int hf_cip_ssupervisor_propose_tunid_tunid_snn_timestamp = -1;
-static int hf_cip_ssupervisor_propose_tunid_tunid_snn_date = -1;
-static int hf_cip_ssupervisor_propose_tunid_tunid_snn_time = -1;
-static int hf_cip_ssupervisor_propose_tunid_tunid_nodeid = -1;
-static int hf_cip_ssupervisor_apply_tunid_tunid = -1;
-static int hf_cip_ssupervisor_apply_tunid_tunid_snn_timestamp = -1;
-static int hf_cip_ssupervisor_apply_tunid_tunid_snn_date = -1;
-static int hf_cip_ssupervisor_apply_tunid_tunid_snn_time = -1;
-static int hf_cip_ssupervisor_apply_tunid_tunid_nodeid = -1;
-
-static int hf_cip_ssupervisor_class_subclass = -1;
-static int hf_cip_ssupervisor_num_attr = -1;
-static int hf_cip_ssupervisor_attr_list = -1;
-static int hf_cip_ssupervisor_manufacture_name = -1;
-static int hf_cip_ssupervisor_manufacture_model_number = -1;
-static int hf_cip_ssupervisor_sw_rev_level = -1;
-static int hf_cip_ssupervisor_hw_rev_level = -1;
-static int hf_cip_ssupervisor_manufacture_serial_number = -1;
-static int hf_cip_ssupervisor_device_config = -1;
-static int hf_cip_ssupervisor_device_status = -1;
-static int hf_cip_ssupervisor_exception_status = -1;
-static int hf_cip_ssupervisor_exception_detail_ced_size = -1;
-static int hf_cip_ssupervisor_exception_detail_ced_detail = -1;
-static int hf_cip_ssupervisor_exception_detail_ded_size = -1;
-static int hf_cip_ssupervisor_exception_detail_ded_detail = -1;
-static int hf_cip_ssupervisor_exception_detail_med_size = -1;
-static int hf_cip_ssupervisor_exception_detail_med_detail = -1;
-static int hf_cip_ssupervisor_alarm_enable = -1;
-static int hf_cip_ssupervisor_warning_enable = -1;
-static int hf_cip_ssupervisor_time = -1;
-static int hf_cip_ssupervisor_clock_power_cycle_behavior = -1;
-static int hf_cip_ssupervisor_last_maintenance_date = -1;
-static int hf_cip_ssupervisor_next_scheduled_maintenance_date = -1;
-static int hf_cip_ssupervisor_scheduled_maintenance_expiration_timer = -1;
-static int hf_cip_ssupervisor_scheduled_maintenance_expiration_warning_enable = -1;
-static int hf_cip_ssupervisor_run_hours = -1;
-static int hf_cip_ssupervisor_configuration_lock = -1;
-static int hf_cip_ssupervisor_configuration_unid_snn_timestamp = -1;
-static int hf_cip_ssupervisor_configuration_unid_snn_date = -1;
-static int hf_cip_ssupervisor_configuration_unid_snn_time = -1;
-static int hf_cip_ssupervisor_configuration_unid_nodeid = -1;
-static int hf_cip_ssupervisor_safety_configuration_id_snn_timestamp = -1;
-static int hf_cip_ssupervisor_safety_configuration_id_snn_date = -1;
-static int hf_cip_ssupervisor_safety_configuration_id_snn_time = -1;
-static int hf_cip_ssupervisor_safety_configuration_id_sccrc = -1;
-static int hf_cip_ssupervisor_target_unid_snn_timestamp = -1;
-static int hf_cip_ssupervisor_target_unid_snn_date = -1;
-static int hf_cip_ssupervisor_target_unid_snn_time = -1;
-static int hf_cip_ssupervisor_target_unid_nodeid = -1;
-static int hf_cip_ssupervisor_cp_owners_num_entries = -1;
-static int hf_cip_ssupervisor_output_cp_owners_ocpunid_snn_timestamp = -1;
-static int hf_cip_ssupervisor_output_cp_owners_ocpunid_snn_date = -1;
-static int hf_cip_ssupervisor_output_cp_owners_ocpunid_snn_time = -1;
-static int hf_cip_ssupervisor_output_cp_owners_ocpunid_nodeid = -1;
-static int hf_cip_ssupervisor_cp_owners_app_path_size = -1;
-static int hf_cip_ssupervisor_proposed_tunid_snn_timestamp = -1;
-static int hf_cip_ssupervisor_proposed_tunid_snn_date = -1;
-static int hf_cip_ssupervisor_proposed_tunid_snn_time = -1;
-static int hf_cip_ssupervisor_proposed_tunid_nodeid = -1;
-static int hf_cip_ssupervisor_instance_subclass = -1;
+static int hf_cip_ssupervisor_sc;
+static int hf_cip_ssupervisor_recover_data;
+static int hf_cip_ssupervisor_perform_diag_data;
+static int hf_cip_ssupervisor_configure_request_password;
+static int hf_cip_ssupervisor_configure_request_tunid;
+static int hf_cip_ssupervisor_configure_request_tunid_snn_timestamp;
+static int hf_cip_ssupervisor_configure_request_tunid_snn_date;
+static int hf_cip_ssupervisor_configure_request_tunid_snn_time;
+static int hf_cip_ssupervisor_configure_request_tunid_nodeid;
+static int hf_cip_ssupervisor_configure_request_ounid;
+static int hf_cip_ssupervisor_configure_request_ounid_snn_timestamp;
+static int hf_cip_ssupervisor_configure_request_ounid_snn_date;
+static int hf_cip_ssupervisor_configure_request_ounid_snn_time;
+static int hf_cip_ssupervisor_configure_request_ounid_nodeid;
+static int hf_cip_ssupervisor_validate_configuration_sccrc;
+static int hf_cip_ssupervisor_validate_configuration_scts_timestamp;
+static int hf_cip_ssupervisor_validate_configuration_scts_date;
+static int hf_cip_ssupervisor_validate_configuration_scts_time;
+static int hf_cip_ssupervisor_validate_configuration_ext_error;
+static int hf_cip_ssupervisor_set_password_current_password;
+static int hf_cip_ssupervisor_set_password_new_password;
+static int hf_cip_ssupervisor_configure_lock_value;
+static int hf_cip_ssupervisor_configure_lock_password;
+static int hf_cip_ssupervisor_configure_lock_tunid;
+static int hf_cip_ssupervisor_configure_lock_tunid_snn_timestamp;
+static int hf_cip_ssupervisor_configure_lock_tunid_snn_date;
+static int hf_cip_ssupervisor_configure_lock_tunid_snn_time;
+static int hf_cip_ssupervisor_configure_lock_tunid_nodeid;
+static int hf_cip_ssupervisor_mode_change_value;
+static int hf_cip_ssupervisor_mode_change_password;
+static int hf_cip_ssupervisor_reset_type;
+static int hf_cip_ssupervisor_reset_password;
+static int hf_cip_ssupervisor_reset_tunid;
+static int hf_cip_ssupervisor_reset_tunid_tunid_snn_timestamp;
+static int hf_cip_ssupervisor_reset_tunid_tunid_snn_date;
+static int hf_cip_ssupervisor_reset_tunid_tunid_snn_time;
+static int hf_cip_ssupervisor_reset_tunid_nodeid;
+static int hf_cip_ssupervisor_reset_attr_bitmap;
+static int hf_cip_ssupervisor_reset_attr_bitmap_macid;
+static int hf_cip_ssupervisor_reset_attr_bitmap_baudrate;
+static int hf_cip_ssupervisor_reset_attr_bitmap_tunid;
+static int hf_cip_ssupervisor_reset_attr_bitmap_password;
+static int hf_cip_ssupervisor_reset_attr_bitmap_cfunid;
+static int hf_cip_ssupervisor_reset_attr_bitmap_ocpunid;
+static int hf_cip_ssupervisor_reset_attr_bitmap_reserved;
+static int hf_cip_ssupervisor_reset_attr_bitmap_extended;
+static int hf_cip_ssupervisor_reset_password_data_size;
+static int hf_cip_ssupervisor_reset_password_data;
+static int hf_cip_ssupervisor_propose_tunid_tunid;
+static int hf_cip_ssupervisor_propose_tunid_tunid_snn_timestamp;
+static int hf_cip_ssupervisor_propose_tunid_tunid_snn_date;
+static int hf_cip_ssupervisor_propose_tunid_tunid_snn_time;
+static int hf_cip_ssupervisor_propose_tunid_tunid_nodeid;
+static int hf_cip_ssupervisor_apply_tunid_tunid;
+static int hf_cip_ssupervisor_apply_tunid_tunid_snn_timestamp;
+static int hf_cip_ssupervisor_apply_tunid_tunid_snn_date;
+static int hf_cip_ssupervisor_apply_tunid_tunid_snn_time;
+static int hf_cip_ssupervisor_apply_tunid_tunid_nodeid;
+
+static int hf_cip_ssupervisor_class_subclass;
+static int hf_cip_ssupervisor_num_attr;
+static int hf_cip_ssupervisor_attr_list;
+static int hf_cip_ssupervisor_manufacture_name;
+static int hf_cip_ssupervisor_manufacture_model_number;
+static int hf_cip_ssupervisor_sw_rev_level;
+static int hf_cip_ssupervisor_hw_rev_level;
+static int hf_cip_ssupervisor_manufacture_serial_number;
+static int hf_cip_ssupervisor_device_config;
+static int hf_cip_ssupervisor_device_status;
+static int hf_cip_ssupervisor_exception_status;
+static int hf_cip_ssupervisor_exception_detail_ced_size;
+static int hf_cip_ssupervisor_exception_detail_ced_detail;
+static int hf_cip_ssupervisor_exception_detail_ded_size;
+static int hf_cip_ssupervisor_exception_detail_ded_detail;
+static int hf_cip_ssupervisor_exception_detail_med_size;
+static int hf_cip_ssupervisor_exception_detail_med_detail;
+static int hf_cip_ssupervisor_alarm_enable;
+static int hf_cip_ssupervisor_warning_enable;
+static int hf_cip_ssupervisor_time;
+static int hf_cip_ssupervisor_clock_power_cycle_behavior;
+static int hf_cip_ssupervisor_last_maintenance_date;
+static int hf_cip_ssupervisor_next_scheduled_maintenance_date;
+static int hf_cip_ssupervisor_scheduled_maintenance_expiration_timer;
+static int hf_cip_ssupervisor_scheduled_maintenance_expiration_warning_enable;
+static int hf_cip_ssupervisor_run_hours;
+static int hf_cip_ssupervisor_configuration_lock;
+static int hf_cip_ssupervisor_configuration_unid_snn_timestamp;
+static int hf_cip_ssupervisor_configuration_unid_snn_date;
+static int hf_cip_ssupervisor_configuration_unid_snn_time;
+static int hf_cip_ssupervisor_configuration_unid_nodeid;
+static int hf_cip_ssupervisor_safety_configuration_id_snn_timestamp;
+static int hf_cip_ssupervisor_safety_configuration_id_snn_date;
+static int hf_cip_ssupervisor_safety_configuration_id_snn_time;
+static int hf_cip_ssupervisor_safety_configuration_id_sccrc;
+static int hf_cip_ssupervisor_target_unid_snn_timestamp;
+static int hf_cip_ssupervisor_target_unid_snn_date;
+static int hf_cip_ssupervisor_target_unid_snn_time;
+static int hf_cip_ssupervisor_target_unid_nodeid;
+static int hf_cip_ssupervisor_cp_owners_num_entries;
+static int hf_cip_ssupervisor_output_cp_owners_ocpunid_snn_timestamp;
+static int hf_cip_ssupervisor_output_cp_owners_ocpunid_snn_date;
+static int hf_cip_ssupervisor_output_cp_owners_ocpunid_snn_time;
+static int hf_cip_ssupervisor_output_cp_owners_ocpunid_nodeid;
+static int hf_cip_ssupervisor_cp_owners_app_path_size;
+static int hf_cip_ssupervisor_proposed_tunid_snn_timestamp;
+static int hf_cip_ssupervisor_proposed_tunid_snn_date;
+static int hf_cip_ssupervisor_proposed_tunid_snn_time;
+static int hf_cip_ssupervisor_proposed_tunid_nodeid;
+static int hf_cip_ssupervisor_instance_subclass;
 
 
 /* Safety Validator header field identifiers */
-static int hf_cip_svalidator_sc = -1;
-
-static int hf_cip_svalidator_sconn_fault_count = -1;
-static int hf_cip_svalidator_state = -1;
-static int hf_cip_svalidator_type = -1;
-static int hf_cip_svalidator_type_pc = -1;
-static int hf_cip_svalidator_type_conn_type = -1;
-static int hf_cip_svalidator_ping_epi = -1;
-static int hf_cip_svalidator_time_coord_msg_min_mult_size = -1;
-static int hf_cip_svalidator_time_coord_msg_min_mult_item = -1;
-static int hf_cip_svalidator_network_time_multiplier_size = -1;
-static int hf_cip_svalidator_network_time_multiplier_item = -1;
-static int hf_cip_svalidator_timeout_multiplier_size = -1;
-static int hf_cip_svalidator_timeout_multiplier_item = -1;
-static int hf_cip_svalidator_max_consumer_num = -1;
-static int hf_cip_svalidator_data_conn_inst = -1;
-static int hf_cip_svalidator_coordination_conn_inst_size = -1;
-static int hf_cip_svalidator_coordination_conn_inst_item = -1;
-static int hf_cip_svalidator_correction_conn_inst = -1;
-static int hf_cip_svalidator_cco_binding = -1;
-static int hf_cip_svalidator_max_data_age = -1;
-static int hf_cip_svalidator_error_code = -1;
-static int hf_cip_svalidator_prod_cons_fault_count_size = -1;
-static int hf_cip_svalidator_prod_cons_fault_count_item = -1;
-
-static int hf_cip_sercosiii_link_snn = -1;
-static int hf_cip_sercosiii_link_communication_cycle_time = -1;
-static int hf_cip_sercosiii_link_interface_status = -1;
-static int hf_cip_sercosiii_link_error_count_mstps = -1;
-static int hf_cip_sercosiii_link_sercos_address = -1;
-static int hf_cip_sercosiii_link_error_count_p1 = -1;
-static int hf_cip_sercosiii_link_error_count_p2 = -1;
+static int hf_cip_svalidator_sc;
+
+static int hf_cip_svalidator_sconn_fault_count;
+static int hf_cip_svalidator_state;
+static int hf_cip_svalidator_type;
+static int hf_cip_svalidator_type_pc;
+static int hf_cip_svalidator_type_conn_type;
+static int hf_cip_svalidator_ping_epi;
+static int hf_cip_svalidator_time_coord_msg_min_mult_size;
+static int hf_cip_svalidator_time_coord_msg_min_mult_item;
+static int hf_cip_svalidator_network_time_multiplier_size;
+static int hf_cip_svalidator_network_time_multiplier_item;
+static int hf_cip_svalidator_timeout_multiplier_size;
+static int hf_cip_svalidator_timeout_multiplier_item;
+static int hf_cip_svalidator_max_consumer_num;
+static int hf_cip_svalidator_data_conn_inst;
+static int hf_cip_svalidator_coordination_conn_inst_size;
+static int hf_cip_svalidator_coordination_conn_inst_item;
+static int hf_cip_svalidator_correction_conn_inst;
+static int hf_cip_svalidator_cco_binding;
+static int hf_cip_svalidator_max_data_age;
+static int hf_cip_svalidator_error_code;
+static int hf_cip_svalidator_prod_cons_fault_count_size;
+static int hf_cip_svalidator_prod_cons_fault_count_item;
+
+static int hf_cip_sercosiii_link_snn;
+static int hf_cip_sercosiii_link_communication_cycle_time;
+static int hf_cip_sercosiii_link_interface_status;
+static int hf_cip_sercosiii_link_error_count_mstps;
+static int hf_cip_sercosiii_link_sercos_address;
+static int hf_cip_sercosiii_link_error_count_p1;
+static int hf_cip_sercosiii_link_error_count_p2;
 
 /* Initialize the subtree pointers */
-static gint ett_cip_safety                = -1;
-static gint ett_path                      = -1;
-static gint ett_cipsafety_mode_byte       = -1;
-static gint ett_cipsafety_ack_byte        = -1;
-static gint ett_cipsafety_mcast_byte      = -1;
-
-static gint ett_cip_class_s_supervisor    = -1;
-static gint ett_ssupervisor_rrsc          = -1;
-static gint ett_ssupervisor_cmd_data      = -1;
-static gint ett_ssupervisor_propose_tunid = -1;
-static gint ett_ssupervisor_propose_tunid_snn = -1;
-static gint ett_ssupervisor_configure_request_tunid = -1;
-static gint ett_ssupervisor_configure_request_tunid_snn = -1;
-static gint ett_ssupervisor_configure_request_ounid = -1;
-static gint ett_ssupervisor_configure_request_ounid_snn = -1;
-static gint ett_ssupervisor_configure_lock_tunid = -1;
-static gint ett_ssupervisor_configure_lock_tunid_snn = -1;
-static gint ett_ssupervisor_reset_tunid = -1;
-static gint ett_ssupervisor_reset_tunid_snn = -1;
-static gint ett_ssupervisor_apply_tunid = -1;
-static gint ett_ssupervisor_apply_tunid_snn = -1;
-static gint ett_exception_detail_common = -1;
-static gint ett_exception_detail_device = -1;
-static gint ett_exception_detail_manufacturer = -1;
-static gint ett_ssupervisor_configuration_unid = -1;
-static gint ett_ssupervisor_configuration_unid_snn = -1;
-static gint ett_ssupervisor_target_unid = -1;
-static gint ett_ssupervisor_target_unid_snn = -1;
-static gint ett_ssupervisor_output_cp_owners = -1;
-static gint ett_ssupervisor_output_cp_owners_ocpunid = -1;
-static gint ett_ssupervisor_output_cp_owners_ocpunid_snn = -1;
-static gint ett_ssupervisor_proposed_tunid = -1;
-static gint ett_ssupervisor_proposed_tunid_snn = -1;
-static gint ett_cip_ssupervisor_reset_attr_bitmap = -1;
-
-static gint ett_cip_class_s_validator     = -1;
-static gint ett_svalidator_rrsc           = -1;
-static gint ett_svalidator_cmd_data       = -1;
-static gint ett_svalidator_type           = -1;
-
-static expert_field ei_cipsafety_tbd_not_complemented = EI_INIT;
-static expert_field ei_cipsafety_tbd2_not_copied = EI_INIT;
-static expert_field ei_cipsafety_run_idle_not_complemented = EI_INIT;
-static expert_field ei_mal_io = EI_INIT;
-static expert_field ei_mal_sercosiii_link_error_count_p1p2 = EI_INIT;
-static expert_field ei_cipsafety_not_complement_data = EI_INIT;
-static expert_field ei_cipsafety_crc_s1 = EI_INIT;
-static expert_field ei_cipsafety_crc_s2 = EI_INIT;
-static expert_field ei_cipsafety_crc_s3 = EI_INIT;
-static expert_field ei_cipsafety_complement_crc_s3 = EI_INIT;
-static expert_field ei_cipsafety_crc_s5 = EI_INIT;
-
-static expert_field ei_mal_ssupervisor_exception_detail_ced = EI_INIT;
-static expert_field ei_mal_ssupervisor_exception_detail_ded = EI_INIT;
-static expert_field ei_mal_ssupervisor_exception_detail_med = EI_INIT;
-static expert_field ei_mal_ssupervisor_configuration_unid = EI_INIT;
-static expert_field ei_mal_ssupervisor_safety_configuration_id = EI_INIT;
-static expert_field ei_mal_ssupervisor_target_unid = EI_INIT;
-static expert_field ei_mal_ssupervisor_cp_owners = EI_INIT;
-static expert_field ei_mal_ssupervisor_cp_owners_entry = EI_INIT;
-static expert_field ei_mal_ssupervisor_cp_owners_app_path_size = EI_INIT;
-static expert_field ei_mal_ssupervisor_proposed_tunid = EI_INIT;
-static expert_field ei_info_ssupervisor_tunid_cancel = EI_INIT;
-
-static expert_field ei_mal_svalidator_type = EI_INIT;
-static expert_field ei_mal_svalidator_time_coord_msg_min_mult = EI_INIT;
-static expert_field ei_mal_svalidator_network_time_multiplier = EI_INIT;
-static expert_field ei_mal_svalidator_timeout_multiplier = EI_INIT;
-static expert_field ei_mal_svalidator_coordination_conn_inst = EI_INIT;
-static expert_field ei_mal_svalidator_prod_cons_fault_count = EI_INIT;
+static gint ett_cip_safety;
+static gint ett_path;
+static gint ett_cipsafety_mode_byte;
+static gint ett_cipsafety_ack_byte;
+static gint ett_cipsafety_mcast_byte;
+
+static gint ett_cip_class_s_supervisor;
+static gint ett_ssupervisor_rrsc;
+static gint ett_ssupervisor_cmd_data;
+static gint ett_ssupervisor_propose_tunid;
+static gint ett_ssupervisor_propose_tunid_snn;
+static gint ett_ssupervisor_configure_request_tunid;
+static gint ett_ssupervisor_configure_request_tunid_snn;
+static gint ett_ssupervisor_configure_request_ounid;
+static gint ett_ssupervisor_configure_request_ounid_snn;
+static gint ett_ssupervisor_configure_lock_tunid;
+static gint ett_ssupervisor_configure_lock_tunid_snn;
+static gint ett_ssupervisor_reset_tunid;
+static gint ett_ssupervisor_reset_tunid_snn;
+static gint ett_ssupervisor_apply_tunid;
+static gint ett_ssupervisor_apply_tunid_snn;
+static gint ett_exception_detail_common;
+static gint ett_exception_detail_device;
+static gint ett_exception_detail_manufacturer;
+static gint ett_ssupervisor_configuration_unid;
+static gint ett_ssupervisor_configuration_unid_snn;
+static gint ett_ssupervisor_target_unid;
+static gint ett_ssupervisor_target_unid_snn;
+static gint ett_ssupervisor_output_cp_owners;
+static gint ett_ssupervisor_output_cp_owners_ocpunid;
+static gint ett_ssupervisor_output_cp_owners_ocpunid_snn;
+static gint ett_ssupervisor_proposed_tunid;
+static gint ett_ssupervisor_proposed_tunid_snn;
+static gint ett_cip_ssupervisor_reset_attr_bitmap;
+
+static gint ett_cip_class_s_validator;
+static gint ett_svalidator_rrsc;
+static gint ett_svalidator_cmd_data;
+static gint ett_svalidator_type;
+
+static expert_field ei_cipsafety_tbd_not_complemented;
+static expert_field ei_cipsafety_tbd2_not_copied;
+static expert_field ei_cipsafety_run_idle_not_complemented;
+static expert_field ei_mal_io;
+static expert_field ei_mal_sercosiii_link_error_count_p1p2;
+static expert_field ei_cipsafety_not_complement_data;
+static expert_field ei_cipsafety_crc_s1;
+static expert_field ei_cipsafety_crc_s2;
+static expert_field ei_cipsafety_crc_s3;
+static expert_field ei_cipsafety_complement_crc_s3;
+static expert_field ei_cipsafety_crc_s5;
+
+static expert_field ei_mal_ssupervisor_exception_detail_ced;
+static expert_field ei_mal_ssupervisor_exception_detail_ded;
+static expert_field ei_mal_ssupervisor_exception_detail_med;
+static expert_field ei_mal_ssupervisor_configuration_unid;
+static expert_field ei_mal_ssupervisor_safety_configuration_id;
+static expert_field ei_mal_ssupervisor_target_unid;
+static expert_field ei_mal_ssupervisor_cp_owners;
+static expert_field ei_mal_ssupervisor_cp_owners_entry;
+static expert_field ei_mal_ssupervisor_cp_owners_app_path_size;
+static expert_field ei_mal_ssupervisor_proposed_tunid;
+static expert_field ei_info_ssupervisor_tunid_cancel;
+
+static expert_field ei_mal_svalidator_type;
+static expert_field ei_mal_svalidator_time_coord_msg_min_mult;
+static expert_field ei_mal_svalidator_network_time_multiplier;
+static expert_field ei_mal_svalidator_timeout_multiplier;
+static expert_field ei_mal_svalidator_coordination_conn_inst;
+static expert_field ei_mal_svalidator_prod_cons_fault_count;
 
 static dissector_handle_t cipsafety_handle;
 static dissector_handle_t cipsafety_base_data_handle;
diff --git a/epan/dissectors/packet-cisco-erspan.c b/epan/dissectors/packet-cisco-erspan.c
index 24cffc17fa..14ad20dae8 100644
--- a/epan/dissectors/packet-cisco-erspan.c
+++ b/epan/dissectors/packet-cisco-erspan.c
@@ -37,55 +37,55 @@
 void proto_register_erspan(void);
 void proto_reg_handoff_erspan(void);
 
-static int proto_erspan = -1;
-
-static gint ett_erspan = -1;
-
-static int hf_erspan_version = -1;
-static int hf_erspan_vlan = -1;
-static int hf_erspan_cos = -1;
-static int hf_erspan_encap = -1;
-static int hf_erspan_truncated = -1;
-static int hf_erspan_spanid = -1;
-static int hf_erspan_reserved = -1;
-static int hf_erspan_index = -1;
-static int hf_erspan_timestamp = -1;
-static int hf_erspan_direction = -1;
-
-static int hf_erspan_bso = -1;
-static int hf_erspan_sgt = -1;
-static int hf_erspan_p = -1;
-static int hf_erspan_ft = -1;
-static int hf_erspan_hw = -1;
-static int hf_erspan_gra = -1;
-static int hf_erspan_o = -1;
+static int proto_erspan;
+
+static gint ett_erspan;
+
+static int hf_erspan_version;
+static int hf_erspan_vlan;
+static int hf_erspan_cos;
+static int hf_erspan_encap;
+static int hf_erspan_truncated;
+static int hf_erspan_spanid;
+static int hf_erspan_reserved;
+static int hf_erspan_index;
+static int hf_erspan_timestamp;
+static int hf_erspan_direction;
+
+static int hf_erspan_bso;
+static int hf_erspan_sgt;
+static int hf_erspan_p;
+static int hf_erspan_ft;
+static int hf_erspan_hw;
+static int hf_erspan_gra;
+static int hf_erspan_o;
 
 /* Optional Sub-header */
-static int hf_erspan_platid = -1;
+static int hf_erspan_platid;
 /* Platform ID = 1 */
-static int hf_erspan_pid1_rsvd1 = -1;
-static int hf_erspan_pid1_domain_id = -1;
-static int hf_erspan_pid1_port_index = -1;
+static int hf_erspan_pid1_rsvd1;
+static int hf_erspan_pid1_domain_id;
+static int hf_erspan_pid1_port_index;
 /* Platform ID = 3 */
-static int hf_erspan_pid3_rsvd1 = -1;
-static int hf_erspan_pid3_port_index = -1;
-static int hf_erspan_pid3_timestamp = -1;
+static int hf_erspan_pid3_rsvd1;
+static int hf_erspan_pid3_port_index;
+static int hf_erspan_pid3_timestamp;
 /* Platform ID = 4 */
-static int hf_erspan_pid4_rsvd1 = -1;
-static int hf_erspan_pid4_rsvd2 = -1;
-static int hf_erspan_pid4_rsvd3 = -1;
+static int hf_erspan_pid4_rsvd1;
+static int hf_erspan_pid4_rsvd2;
+static int hf_erspan_pid4_rsvd3;
 /* Platform ID = 5 or 6 */
-static int hf_erspan_pid5_switchid = -1;
-static int hf_erspan_pid5_port_index = -1;
-static int hf_erspan_pid5_timestamp = -1;
+static int hf_erspan_pid5_switchid;
+static int hf_erspan_pid5_port_index;
+static int hf_erspan_pid5_timestamp;
 /* Platform ID = 7 (or 0) */
-static int hf_erspan_pid7_rsvd1 = -1;
-static int hf_erspan_pid7_source_index = -1;
-static int hf_erspan_pid7_timestamp = -1;
+static int hf_erspan_pid7_rsvd1;
+static int hf_erspan_pid7_source_index;
+static int hf_erspan_pid7_timestamp;
 /* ID: 0x0, 0x2, 0x8-0x63 are reserved. */
-static int hf_erspan_pid_rsvd = -1;
+static int hf_erspan_pid_rsvd;
 
-static expert_field ei_erspan_version_unknown = EI_INIT;
+static expert_field ei_erspan_version_unknown;
 
 #define PROTO_SHORT_NAME "ERSPAN"
 #define PROTO_LONG_NAME "Encapsulated Remote Switch Packet ANalysis"
diff --git a/epan/dissectors/packet-cisco-fp-mim.c b/epan/dissectors/packet-cisco-fp-mim.c
index be2bf2821c..52ebce10fc 100644
--- a/epan/dissectors/packet-cisco-fp-mim.c
+++ b/epan/dissectors/packet-cisco-fp-mim.c
@@ -28,35 +28,35 @@ void proto_reg_handoff_fabricpath(void);
 
 static gboolean fp_check_fcs = FALSE;
 
-static int proto_fp = -1;
-static gint ett_mim = -1;
-static gint ett_hmac = -1;
+static int proto_fp;
+static gint ett_mim;
+static gint ett_hmac;
 
 /* Main protocol items */
-static int hf_s_hmac = -1;
-static int hf_d_hmac = -1;
-static int hf_d_hmac_mc = -1;
-static int hf_ftag = -1;
-static int hf_ttl = -1;
-
-static int hf_fp_etype = -1;
-static int hf_fp_1ad_etype = -1;
-static int hf_fp_1ad_priority = -1;
-static int hf_fp_1ad_cfi = -1;
-static int hf_fp_1ad_svid = -1;
-static int hf_fp_fcs = -1;
-static int hf_fp_fcs_status = -1;
+static int hf_s_hmac;
+static int hf_d_hmac;
+static int hf_d_hmac_mc;
+static int hf_ftag;
+static int hf_ttl;
+
+static int hf_fp_etype;
+static int hf_fp_1ad_etype;
+static int hf_fp_1ad_priority;
+static int hf_fp_1ad_cfi;
+static int hf_fp_1ad_svid;
+static int hf_fp_fcs;
+static int hf_fp_fcs_status;
 
 /* HMAC subtrees */
-static int hf_swid = -1;
-static int hf_sswid = -1;
-static int hf_eid = -1;
-static int hf_lid = -1;
-static int hf_ul = -1;
-static int hf_ig = -1;
-static int hf_ooodl = -1;
-
-static expert_field ei_fp_fcs_bad = EI_INIT;
+static int hf_swid;
+static int hf_sswid;
+static int hf_eid;
+static int hf_lid;
+static int hf_ul;
+static int hf_ig;
+static int hf_ooodl;
+
+static expert_field ei_fp_fcs_bad;
 
 static const true_false_string ig_tfs = {
   "Group address (multicast/broadcast)",
diff --git a/epan/dissectors/packet-cisco-marker.c b/epan/dissectors/packet-cisco-marker.c
index 9ace1b2e4f..82dadc76a2 100644
--- a/epan/dissectors/packet-cisco-marker.c
+++ b/epan/dissectors/packet-cisco-marker.c
@@ -24,24 +24,24 @@ void proto_reg_handoff_erspan_marker(void);
 
 static dissector_handle_t marker_handle;
 
-static int proto_marker = -1;
-
-static int hf_cisco_erspan_granularity = -1;
-static int hf_cisco_erspan_info = -1;
-static int hf_cisco_erspan_prop_header = -1;
-static int hf_cisco_erspan_reserved = -1;
-static int hf_cisco_erspan_sequence_number = -1;
-static int hf_cisco_erspan_ssid = -1;
-static int hf_cisco_erspan_tail = -1;
-static int hf_cisco_erspan_timestamp = -1;
-static int hf_cisco_erspan_type = -1;
-static int hf_cisco_erspan_utc_sec = -1;
-static int hf_cisco_erspan_utc_usec = -1;
-static int hf_cisco_erspan_utcoffset = -1;
-static int hf_cisco_erspan_version = -1;
-
-
-static gint ett_marker = -1;
+static int proto_marker;
+
+static int hf_cisco_erspan_granularity;
+static int hf_cisco_erspan_info;
+static int hf_cisco_erspan_prop_header;
+static int hf_cisco_erspan_reserved;
+static int hf_cisco_erspan_sequence_number;
+static int hf_cisco_erspan_ssid;
+static int hf_cisco_erspan_tail;
+static int hf_cisco_erspan_timestamp;
+static int hf_cisco_erspan_type;
+static int hf_cisco_erspan_utc_sec;
+static int hf_cisco_erspan_utc_usec;
+static int hf_cisco_erspan_utcoffset;
+static int hf_cisco_erspan_version;
+
+
+static gint ett_marker;
 
 
 static int
diff --git a/epan/dissectors/packet-cisco-mcp.c b/epan/dissectors/packet-cisco-mcp.c
index 284f7ed4dc..2fc7cc386d 100644
--- a/epan/dissectors/packet-cisco-mcp.c
+++ b/epan/dissectors/packet-cisco-mcp.c
@@ -44,29 +44,29 @@ void proto_reg_handoff_mcp(void);
 
 static dissector_handle_t mcp_handle;
 
-static int proto_mcp = -1;
+static int proto_mcp;
 /* TLV header */
-static int hf_mcp_tlv_type = -1;
-static int hf_mcp_strict_tlv_type = -1;
-static int hf_mcp_tlv_length = -1;
+static int hf_mcp_tlv_type;
+static int hf_mcp_strict_tlv_type;
+static int hf_mcp_tlv_length;
 /* Values */
-static int hf_mcp_fabric_id = -1;
-static int hf_mcp_node_id = -1;
-static int hf_mcp_vpc_domain = -1;
-static int hf_mcp_vpc_id = -1;
-static int hf_mcp_vpc_vtep = -1;
-static int hf_mcp_port_id = -1;
-static int hf_mcp_send_time = -1;
-static int hf_mcp_strictmode = -1;
-static int hf_mcp_digest = -1;
-static int hf_mcp_unknown = -1;
-
-static expert_field ei_mcp_short_tlv = EI_INIT;
-static expert_field ei_mcp_trailing_bytes = EI_INIT;
-static expert_field ei_mcp_unexpected_tlv_length = EI_INIT;
-
-static gint ett_mcp = -1;
-static gint ett_mcp_tlv_header = -1;
+static int hf_mcp_fabric_id;
+static int hf_mcp_node_id;
+static int hf_mcp_vpc_domain;
+static int hf_mcp_vpc_id;
+static int hf_mcp_vpc_vtep;
+static int hf_mcp_port_id;
+static int hf_mcp_send_time;
+static int hf_mcp_strictmode;
+static int hf_mcp_digest;
+static int hf_mcp_unknown;
+
+static expert_field ei_mcp_short_tlv;
+static expert_field ei_mcp_trailing_bytes;
+static expert_field ei_mcp_unexpected_tlv_length;
+
+static gint ett_mcp;
+static gint ett_mcp_tlv_header;
 
 #define PROTO_SHORT_NAME "MCP"
 #define PROTO_LONG_NAME "Miscabling Protocol"
diff --git a/epan/dissectors/packet-cisco-metadata.c b/epan/dissectors/packet-cisco-metadata.c
index e9b96e8db7..878378ae3d 100644
--- a/epan/dissectors/packet-cisco-metadata.c
+++ b/epan/dissectors/packet-cisco-metadata.c
@@ -28,17 +28,17 @@ static dissector_handle_t ethertype_handle;
 
 static dissector_table_t gre_dissector_table;
 
-static int proto_cmd = -1;
+static int proto_cmd;
 
-static int hf_cmd_version = -1;
-static int hf_cmd_length = -1;
-static int hf_cmd_options = -1;
-static int hf_cmd_sgt = -1;
+static int hf_cmd_version;
+static int hf_cmd_length;
+static int hf_cmd_options;
+static int hf_cmd_sgt;
 
-static int hf_eth_type = -1;
-static int hf_cmd_trailer = -1;
+static int hf_eth_type;
+static int hf_cmd_trailer;
 
-static gint ett_cmd = -1;
+static gint ett_cmd;
 
 static int
 dissect_cmd_eth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-cisco-oui.c b/epan/dissectors/packet-cisco-oui.c
index cc48adab8b..d86bf95852 100644
--- a/epan/dissectors/packet-cisco-oui.c
+++ b/epan/dissectors/packet-cisco-oui.c
@@ -17,7 +17,7 @@
 
 void proto_register_cisco_pid(void);
 
-static int hf_llc_cisco_pid = -1;
+static int hf_llc_cisco_pid;
 
 /*
  * See various Cisco documents, including
diff --git a/epan/dissectors/packet-cisco-sm.c b/epan/dissectors/packet-cisco-sm.c
index cda29697eb..15c749bb09 100644
--- a/epan/dissectors/packet-cisco-sm.c
+++ b/epan/dissectors/packet-cisco-sm.c
@@ -220,31 +220,31 @@ static const value_string sm_pdu_type_value[] = {
 
 
 /* Initialize the protocol and registered fields */
-static int proto_sm = -1;
-
-static int hf_sm_sm_msg_type = -1;
-static int hf_sm_protocol = -1;
-static int hf_sm_msg_id = -1;
-static int hf_sm_msg_type = -1;
-static int hf_sm_channel = -1;
-static int hf_sm_bearer = -1;
-static int hf_sm_len = -1;
-static int hf_sm_ip_addr = -1;
-static int hf_sm_context = -1;
-static int hf_sm_eisup_msg_id = -1;
-static int hf_sm_tag = -1;
-static int hf_sm_alignment_type = -1;
-static int hf_sm_backhaul_reason_code = -1;
-static int hf_sm_backhaul_event_code = -1;
-static int hf_sm_backhaul_cause_code = -1;
-static int hf_sm_linkdown_cause_code = -1;
-static int hf_sm_retrieval_type = -1;
-static int hf_sm_lsc_state_type = -1;
-static int hf_sm_stat_request_type = -1;
-static int hf_sm_bsn_num = -1;
+static int proto_sm;
+
+static int hf_sm_sm_msg_type;
+static int hf_sm_protocol;
+static int hf_sm_msg_id;
+static int hf_sm_msg_type;
+static int hf_sm_channel;
+static int hf_sm_bearer;
+static int hf_sm_len;
+static int hf_sm_ip_addr;
+static int hf_sm_context;
+static int hf_sm_eisup_msg_id;
+static int hf_sm_tag;
+static int hf_sm_alignment_type;
+static int hf_sm_backhaul_reason_code;
+static int hf_sm_backhaul_event_code;
+static int hf_sm_backhaul_cause_code;
+static int hf_sm_linkdown_cause_code;
+static int hf_sm_retrieval_type;
+static int hf_sm_lsc_state_type;
+static int hf_sm_stat_request_type;
+static int hf_sm_bsn_num;
 
 /* Initialize the subtree pointers */
-static gint ett_sm = -1;
+static gint ett_sm;
 
 static dissector_handle_t sdp_handle;
 static dissector_handle_t mtp3_handle;
diff --git a/epan/dissectors/packet-cisco-ttag.c b/epan/dissectors/packet-cisco-ttag.c
index 0e054836c5..f4c060a7d6 100644
--- a/epan/dissectors/packet-cisco-ttag.c
+++ b/epan/dissectors/packet-cisco-ttag.c
@@ -24,12 +24,12 @@ static dissector_handle_t ttag_handle;
 
 static dissector_handle_t ethertype_handle;
 
-static int proto_ttag = -1;
+static int proto_ttag;
 
-static int hf_ttag_time_stamp = -1;
-static int hf_ttag_eth_type = -1;
+static int hf_ttag_time_stamp;
+static int hf_ttag_eth_type;
 
-static gint ett_ttag = -1;
+static gint ett_ttag;
 
 static int
 dissect_ttag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c
index de8fcae10e..b5bdcad63f 100644
--- a/epan/dissectors/packet-cisco-wids.c
+++ b/epan/dissectors/packet-cisco-wids.c
@@ -40,19 +40,19 @@
 #include <epan/expert.h>
 #include <epan/show_exception.h>
 
-static int proto_cwids = -1;
-static int hf_cwids_version = -1;
-static int hf_cwids_timestamp = -1;
-static int hf_cwids_unknown1 = -1;
-static int hf_cwids_channel = -1;
-static int hf_cwids_unknown2 = -1;
-static int hf_cwids_reallength = -1;
-static int hf_cwids_capturelen = -1;
-static int hf_cwids_unknown3 = -1;
-
-static gint ett_cwids = -1;
-
-static expert_field ei_ieee80211_subpacket = EI_INIT;
+static int proto_cwids;
+static int hf_cwids_version;
+static int hf_cwids_timestamp;
+static int hf_cwids_unknown1;
+static int hf_cwids_channel;
+static int hf_cwids_unknown2;
+static int hf_cwids_reallength;
+static int hf_cwids_capturelen;
+static int hf_cwids_unknown3;
+
+static gint ett_cwids;
+
+static expert_field ei_ieee80211_subpacket;
 
 static dissector_handle_t cwids_handle;
 
diff --git a/epan/dissectors/packet-cl3.c b/epan/dissectors/packet-cl3.c
index 0b1aa8f60d..8a29f0fa6b 100644
--- a/epan/dissectors/packet-cl3.c
+++ b/epan/dissectors/packet-cl3.c
@@ -36,15 +36,15 @@ void proto_reg_handoff_cl3(void);
 static dissector_handle_t cl3_handle;
 
 /* persistent handles for this dissector */
-static int               proto_cl3              = -1;
+static int               proto_cl3;
 static dissector_table_t cl3_command_table;
-static gint              ett_cl3                = -1;
-static int               hf_cl3_version         = -1;
-static int               hf_cl3_headerlen       = -1;
-static int               hf_cl3_subproto        = -1;
-static int               hf_cl3_payload         = -1;
-static expert_field      ei_cl3_badheaderlen    = EI_INIT;
-static expert_field      ei_cl3_unsup_ver       = EI_INIT;
+static gint              ett_cl3;
+static int               hf_cl3_version;
+static int               hf_cl3_headerlen;
+static int               hf_cl3_subproto;
+static int               hf_cl3_payload;
+static expert_field      ei_cl3_badheaderlen;
+static expert_field      ei_cl3_unsup_ver;
 
 
 /* Known CL3 (sub-)protocol type strings: */
diff --git a/epan/dissectors/packet-cl3dcw.c b/epan/dissectors/packet-cl3dcw.c
index bc2f123d23..752bab7f53 100644
--- a/epan/dissectors/packet-cl3dcw.c
+++ b/epan/dissectors/packet-cl3dcw.c
@@ -24,19 +24,19 @@ static dissector_handle_t cl3dcw_handle;
 #define SSID_MAX_LENGTH 32
 
 /* persistent handles for this dissector */
-static int           proto_cl3dcw               = -1;
-static gint          ett_cl3dcw                 = -1;
-static int           hf_cl3dcw_type             = -1;
-static int           hf_cl3dcw_dccount          = -1;
-static int           hf_cl3dcw_datamacaddrcount = -1;
-static int           hf_cl3dcw_datassidcount    = -1;
-static int           hf_cl3dcw_dcmacaddr        = -1;
-static int           hf_cl3dcw_dcssid           = -1;
-static int           hf_cl3dcw_dcbond           = -1;
-static gint          ett_cl3dcw_dcbond          = -1;
-static expert_field  ei_cl3dcw_unknown_type     = EI_INIT;
-static expert_field  ei_cl3dcw_nodc             = EI_INIT;
-static expert_field  ei_cl3dcw_ssid_too_big     = EI_INIT;
+static int           proto_cl3dcw;
+static gint          ett_cl3dcw;
+static int           hf_cl3dcw_type;
+static int           hf_cl3dcw_dccount;
+static int           hf_cl3dcw_datamacaddrcount;
+static int           hf_cl3dcw_datassidcount;
+static int           hf_cl3dcw_dcmacaddr;
+static int           hf_cl3dcw_dcssid;
+static int           hf_cl3dcw_dcbond;
+static gint          ett_cl3dcw_dcbond;
+static expert_field  ei_cl3dcw_unknown_type;
+static expert_field  ei_cl3dcw_nodc;
+static expert_field  ei_cl3dcw_ssid_too_big;
 
 
 /* message id types */
diff --git a/epan/dissectors/packet-classicstun.c b/epan/dissectors/packet-classicstun.c
index 48e9d16117..c644b91e9f 100644
--- a/epan/dissectors/packet-classicstun.c
+++ b/epan/dissectors/packet-classicstun.c
@@ -25,39 +25,39 @@ static heur_dissector_list_t heur_subdissector_list;
 static dissector_handle_t data_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_classicstun                          = -1;
-
-static int hf_classicstun_type                        = -1; /* CLASSIC-STUN message header */
-static int hf_classicstun_length                      = -1;
-static int hf_classicstun_id                          = -1;
-static int hf_classicstun_att                         = -1;
-static int hf_classicstun_response_in                 = -1;
-static int hf_classicstun_response_to                 = -1;
-static int hf_classicstun_time                        = -1;
-
-
-static int hf_classicstun_att_type                       = -1; /* CLASSIC-STUN attribute fields */
-static int hf_classicstun_att_length                     = -1;
-static int hf_classicstun_att_value                      = -1;
-static int hf_classicstun_att_family                     = -1;
-static int hf_classicstun_att_ipv4                       = -1;
-static int hf_classicstun_att_ipv6                       = -1;
-static int hf_classicstun_att_port                       = -1;
-static int hf_classicstun_att_change_ip                  = -1;
-static int hf_classicstun_att_change_port                = -1;
-static int hf_classicstun_att_unknown                    = -1;
-static int hf_classicstun_att_error_class                = -1;
-static int hf_classicstun_att_error_number               = -1;
-static int hf_classicstun_att_error_reason               = -1;
-static int hf_classicstun_att_server_string              = -1;
-static int hf_classicstun_att_xor_ipv4                   = -1;
-static int hf_classicstun_att_xor_ipv6                   = -1;
-static int hf_classicstun_att_xor_port                   = -1;
-static int hf_classicstun_att_lifetime                   = -1;
-static int hf_classicstun_att_magic_cookie               = -1;
-static int hf_classicstun_att_bandwidth                  = -1;
-static int hf_classicstun_att_data                       = -1;
-static int hf_classicstun_att_connection_request_binding = -1;
+static int proto_classicstun;
+
+static int hf_classicstun_type; /* CLASSIC-STUN message header */
+static int hf_classicstun_length;
+static int hf_classicstun_id;
+static int hf_classicstun_att;
+static int hf_classicstun_response_in;
+static int hf_classicstun_response_to;
+static int hf_classicstun_time;
+
+
+static int hf_classicstun_att_type; /* CLASSIC-STUN attribute fields */
+static int hf_classicstun_att_length;
+static int hf_classicstun_att_value;
+static int hf_classicstun_att_family;
+static int hf_classicstun_att_ipv4;
+static int hf_classicstun_att_ipv6;
+static int hf_classicstun_att_port;
+static int hf_classicstun_att_change_ip;
+static int hf_classicstun_att_change_port;
+static int hf_classicstun_att_unknown;
+static int hf_classicstun_att_error_class;
+static int hf_classicstun_att_error_number;
+static int hf_classicstun_att_error_reason;
+static int hf_classicstun_att_server_string;
+static int hf_classicstun_att_xor_ipv4;
+static int hf_classicstun_att_xor_ipv6;
+static int hf_classicstun_att_xor_port;
+static int hf_classicstun_att_lifetime;
+static int hf_classicstun_att_magic_cookie;
+static int hf_classicstun_att_bandwidth;
+static int hf_classicstun_att_data;
+static int hf_classicstun_att_connection_request_binding;
 
 /* Structure containing transaction specific information */
 typedef struct _classicstun_transaction_t {
@@ -129,9 +129,9 @@ typedef struct _classicstun_conv_info_t {
 
 
 /* Initialize the subtree pointers */
-static gint ett_classicstun = -1;
-static gint ett_classicstun_att_type = -1;
-static gint ett_classicstun_att = -1;
+static gint ett_classicstun;
+static gint ett_classicstun_att_type;
+static gint ett_classicstun_att;
 
 
 #define UDP_PORT_STUN   3478
diff --git a/epan/dissectors/packet-clearcase.c b/epan/dissectors/packet-clearcase.c
index 4c0c8e3d8c..fe1a1d80ef 100644
--- a/epan/dissectors/packet-clearcase.c
+++ b/epan/dissectors/packet-clearcase.c
@@ -19,10 +19,10 @@
 void proto_register_clearcase(void);
 void proto_reg_handoff_clearcase(void);
 
-static int proto_clearcase = -1;
-static int hf_clearcase_procedure_v3 = -1;
+static int proto_clearcase;
+static int hf_clearcase_procedure_v3;
 
-static gint ett_clearcase = -1;
+static gint ett_clearcase;
 
 #define CLEARCASEPROC_NULL 0
 
diff --git a/epan/dissectors/packet-clip.c b/epan/dissectors/packet-clip.c
index c3f1128a54..917a7e47c7 100644
--- a/epan/dissectors/packet-clip.c
+++ b/epan/dissectors/packet-clip.c
@@ -22,11 +22,11 @@
 void proto_register_clip(void);
 void proto_reg_handoff_clip(void);
 
-static int proto_clip = -1;
+static int proto_clip;
 
-static gint ett_clip = -1;
+static gint ett_clip;
 
-static expert_field ei_no_link_info = EI_INIT;
+static expert_field ei_no_link_info;
 
 static dissector_handle_t clip_handle;
 static dissector_handle_t ip_handle;
diff --git a/epan/dissectors/packet-clique-rm.c b/epan/dissectors/packet-clique-rm.c
index 358129563c..59adf388c6 100644
--- a/epan/dissectors/packet-clique-rm.c
+++ b/epan/dissectors/packet-clique-rm.c
@@ -18,40 +18,40 @@ void proto_register_clique_rm(void);
 void proto_reg_handoff_clique_rm(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_clique_rm = -1;
-
-static int hf_clique_rm_version = -1;
-static int hf_clique_rm_type = -1;
-static int hf_clique_rm_sender = -1;
-static int hf_clique_rm_packet_id = -1;
-static int hf_clique_rm_depends = -1;
-static int hf_clique_rm_depend_sender = -1;
-static int hf_clique_rm_depend_packet_id = -1;
-static int hf_clique_rm_failures = -1;
-static int hf_clique_rm_failures_senders = -1;
-static int hf_clique_rm_attempt_join = -1;
-static int hf_clique_rm_attempt_join_senders = -1;
-static int hf_clique_rm_join_failures = -1;
-static int hf_clique_rm_join_failures_senders = -1;
-static int hf_clique_rm_data_flags = -1;
-static int hf_clique_rm_data_size = -1;
-static int hf_clique_rm_data_stream_id = -1;
-static int hf_clique_rm_data_data = -1;
-static int hf_clique_rm_whois_request_id = -1;
-static int hf_clique_rm_whois_reply_name = -1;
-static int hf_clique_rm_whois_reply_name_length = -1;
-static int hf_clique_rm_repair_request_sender_id = -1;
-static int hf_clique_rm_repair_request_packet_id = -1;
+static int proto_clique_rm;
+
+static int hf_clique_rm_version;
+static int hf_clique_rm_type;
+static int hf_clique_rm_sender;
+static int hf_clique_rm_packet_id;
+static int hf_clique_rm_depends;
+static int hf_clique_rm_depend_sender;
+static int hf_clique_rm_depend_packet_id;
+static int hf_clique_rm_failures;
+static int hf_clique_rm_failures_senders;
+static int hf_clique_rm_attempt_join;
+static int hf_clique_rm_attempt_join_senders;
+static int hf_clique_rm_join_failures;
+static int hf_clique_rm_join_failures_senders;
+static int hf_clique_rm_data_flags;
+static int hf_clique_rm_data_size;
+static int hf_clique_rm_data_stream_id;
+static int hf_clique_rm_data_data;
+static int hf_clique_rm_whois_request_id;
+static int hf_clique_rm_whois_reply_name;
+static int hf_clique_rm_whois_reply_name_length;
+static int hf_clique_rm_repair_request_sender_id;
+static int hf_clique_rm_repair_request_packet_id;
 
 /* Initialize the subtree pointers */
-static gint ett_clique_rm = -1;
-static gint ett_clique_rm_data = -1;
-static gint ett_clique_rm_depends = -1;
-static gint ett_clique_rm_depends_item = -1;
-static gint ett_clique_rm_failures = -1;
-static gint ett_clique_rm_join_failures = -1;
-static gint ett_clique_rm_attempt_join = -1;
-static gint ett_clique_rm_join = -1;
+static gint ett_clique_rm;
+static gint ett_clique_rm_data;
+static gint ett_clique_rm_depends;
+static gint ett_clique_rm_depends_item;
+static gint ett_clique_rm_failures;
+static gint ett_clique_rm_join_failures;
+static gint ett_clique_rm_attempt_join;
+static gint ett_clique_rm_join;
 
 /* Packet types */
 typedef enum {
diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c
index 5bd2a84067..920bcd2dd3 100644
--- a/epan/dissectors/packet-clnp.c
+++ b/epan/dissectors/packet-clnp.c
@@ -27,44 +27,44 @@ void proto_reg_handoff_clnp(void);
 
 /* protocols and fields */
 
-static int  proto_clnp         = -1;
-static gint ett_clnp           = -1;
-static gint ett_clnp_type      = -1;
-static gint ett_clnp_segments  = -1;
-static gint ett_clnp_segment   = -1;
-static gint ett_clnp_disc_pdu  = -1;
-
-static int hf_clnp_id          = -1;
-static int hf_clnp_length      = -1;
-static int hf_clnp_version     = -1;
-static int hf_clnp_ttl         = -1;
-static int hf_clnp_type        = -1;
-static int hf_clnp_cnf_segmentation         = -1;
-static int hf_clnp_cnf_more_segments        = -1;
-static int hf_clnp_cnf_report_error         = -1;
-static int hf_clnp_cnf_type    = -1;
-static int hf_clnp_pdu_length  = -1;
-static int hf_clnp_data_unit_identifier     = -1;
-static int hf_clnp_segment_offset           = -1;
-static int hf_clnp_total_length             = -1;
-static int hf_clnp_checksum    = -1;
-static int hf_clnp_checksum_status          = -1;
-static int hf_clnp_dest_length = -1;
-static int hf_clnp_dest        = -1;
-static int hf_clnp_src_length  = -1;
-static int hf_clnp_src         = -1;
-       int hf_clnp_atntt       = -1; /* as referenced in packet-osi-options.c */
-       int hf_clnp_atnsc       = -1; /* as referenced in packet-osi-options.c */
-static int hf_clnp_segments    = -1;
-static int hf_clnp_segment     = -1;
-static int hf_clnp_segment_overlap          = -1;
-static int hf_clnp_segment_overlap_conflict = -1;
-static int hf_clnp_segment_multiple_tails   = -1;
-static int hf_clnp_segment_too_long_segment = -1;
-static int hf_clnp_segment_error            = -1;
-static int hf_clnp_segment_count            = -1;
-static int hf_clnp_reassembled_in           = -1;
-static int hf_clnp_reassembled_length       = -1;
+static int  proto_clnp;
+static gint ett_clnp;
+static gint ett_clnp_type;
+static gint ett_clnp_segments;
+static gint ett_clnp_segment;
+static gint ett_clnp_disc_pdu;
+
+static int hf_clnp_id;
+static int hf_clnp_length;
+static int hf_clnp_version;
+static int hf_clnp_ttl;
+static int hf_clnp_type;
+static int hf_clnp_cnf_segmentation;
+static int hf_clnp_cnf_more_segments;
+static int hf_clnp_cnf_report_error;
+static int hf_clnp_cnf_type;
+static int hf_clnp_pdu_length;
+static int hf_clnp_data_unit_identifier;
+static int hf_clnp_segment_offset;
+static int hf_clnp_total_length;
+static int hf_clnp_checksum;
+static int hf_clnp_checksum_status;
+static int hf_clnp_dest_length;
+static int hf_clnp_dest;
+static int hf_clnp_src_length;
+static int hf_clnp_src;
+       int hf_clnp_atntt; /* as referenced in packet-osi-options.c */
+       int hf_clnp_atnsc; /* as referenced in packet-osi-options.c */
+static int hf_clnp_segments;
+static int hf_clnp_segment;
+static int hf_clnp_segment_overlap;
+static int hf_clnp_segment_overlap_conflict;
+static int hf_clnp_segment_multiple_tails;
+static int hf_clnp_segment_too_long_segment;
+static int hf_clnp_segment_error;
+static int hf_clnp_segment_count;
+static int hf_clnp_reassembled_in;
+static int hf_clnp_reassembled_length;
 
 static const fragment_items clnp_frag_items = {
     &ett_clnp_segment,
@@ -84,8 +84,8 @@ static const fragment_items clnp_frag_items = {
     "segments"
 };
 
-static expert_field ei_clnp_length = EI_INIT;
-static expert_field ei_clnp_checksum = EI_INIT;
+static expert_field ei_clnp_length;
+static expert_field ei_clnp_checksum;
 
 static dissector_handle_t clnp_handle;
 static dissector_handle_t ositp_handle;
diff --git a/epan/dissectors/packet-cmpp.c b/epan/dissectors/packet-cmpp.c
index c891d2bd69..94a011fc93 100644
--- a/epan/dissectors/packet-cmpp.c
+++ b/epan/dissectors/packet-cmpp.c
@@ -26,77 +26,77 @@ void proto_reg_handoff_cmpp(void);
 static dissector_handle_t cmpp_handle;
 
 /* Initialize the protocol and registered fields */
-static gint proto_cmpp = -1;
+static gint proto_cmpp;
 
 /* These are the fix header field */
-static gint hf_cmpp_Total_Length = -1;
-static gint hf_cmpp_Command_Id = -1;
-static gint hf_cmpp_Sequence_Id = -1;
+static gint hf_cmpp_Total_Length;
+static gint hf_cmpp_Command_Id;
+static gint hf_cmpp_Sequence_Id;
 
 /* CMPP_CONNECT */
-static gint hf_cmpp_connect_Source_Addr = -1;
-static gint hf_cmpp_connect_AuthenticatorSource = -1;
-static gint hf_cmpp_Version = -1;
-static gint hf_cmpp_connect_Timestamp = -1;
+static gint hf_cmpp_connect_Source_Addr;
+static gint hf_cmpp_connect_AuthenticatorSource;
+static gint hf_cmpp_Version;
+static gint hf_cmpp_connect_Timestamp;
 
 /* CMPP_CONNECT_RESP */
-static gint hf_cmpp_connect_resp_status = -1;
-static gint hf_cmpp_connect_resp_AuthenticatorISMG = -1;
+static gint hf_cmpp_connect_resp_status;
+static gint hf_cmpp_connect_resp_AuthenticatorISMG;
 
 /* CMPP_SUBMIT */
-static gint hf_cmpp_submit_pk_total = -1;
-static gint hf_cmpp_submit_pk_number = -1;
-static gint hf_cmpp_submit_Msg_level = -1;
-static gint hf_cmpp_submit_Fee_UserType = -1;
-static gint hf_cmpp_submit_Fee_terminal_Id = -1;
-static gint hf_cmpp_submit_Fee_terminal_type = -1;
-static gint hf_cmpp_submit_Msg_src = -1;
-static gint hf_cmpp_submit_FeeType = -1;
-static gint hf_cmpp_submit_FeeCode = -1;
-static gint hf_cmpp_submit_Valld_Time = -1;
-static gint hf_cmpp_submit_At_Time = -1;
-static gint hf_cmpp_submit_Src_Id = -1;
-static gint hf_cmpp_submit_DestUsr_tl = -1;
-static gint hf_cmpp_submit_Dest_terminal_type = -1;
-static gint hf_cmpp_submit_Registered_Delivery = -1;
+static gint hf_cmpp_submit_pk_total;
+static gint hf_cmpp_submit_pk_number;
+static gint hf_cmpp_submit_Msg_level;
+static gint hf_cmpp_submit_Fee_UserType;
+static gint hf_cmpp_submit_Fee_terminal_Id;
+static gint hf_cmpp_submit_Fee_terminal_type;
+static gint hf_cmpp_submit_Msg_src;
+static gint hf_cmpp_submit_FeeType;
+static gint hf_cmpp_submit_FeeCode;
+static gint hf_cmpp_submit_Valld_Time;
+static gint hf_cmpp_submit_At_Time;
+static gint hf_cmpp_submit_Src_Id;
+static gint hf_cmpp_submit_DestUsr_tl;
+static gint hf_cmpp_submit_Dest_terminal_type;
+static gint hf_cmpp_submit_Registered_Delivery;
 
 /* Field common in CMPP_SUBMIT and CMPP_DELIVER */
-static gint hf_cmpp_Dest_terminal_Id = -1;
-static gint hf_cmpp_Service_Id = -1;
-static gint hf_cmpp_TP_pId = -1;
-static gint hf_cmpp_TP_udhi = -1;
-static gint hf_cmpp_Msg_Fmt = -1;
-static gint hf_cmpp_Msg_Length = -1;
-static gint hf_cmpp_Msg_Content = -1;
-static gint hf_cmpp_LinkID = -1;
+static gint hf_cmpp_Dest_terminal_Id;
+static gint hf_cmpp_Service_Id;
+static gint hf_cmpp_TP_pId;
+static gint hf_cmpp_TP_udhi;
+static gint hf_cmpp_Msg_Fmt;
+static gint hf_cmpp_Msg_Length;
+static gint hf_cmpp_Msg_Content;
+static gint hf_cmpp_LinkID;
 
 /* CMPP_SUBMIT_RESP */
-static gint hf_cmpp_submit_resp_Result = -1;
+static gint hf_cmpp_submit_resp_Result;
 
 /* CMPP_QUERY */
 /* CMPP_QUERY_RESP */
 /* TODO implement CMPP_QUERY and CMPP_QUERY_RESP */
 
 /* CMPP_DELIVER */
-static gint hf_cmpp_deliver_Dest_Id = -1;
-static gint hf_cmpp_deliver_Src_terminal_Id = -1;
-static gint hf_cmpp_deliver_Src_terminal_type = -1;
-static gint hf_cmpp_deliver_Registered_Delivery = -1;
+static gint hf_cmpp_deliver_Dest_Id;
+static gint hf_cmpp_deliver_Src_terminal_Id;
+static gint hf_cmpp_deliver_Src_terminal_type;
+static gint hf_cmpp_deliver_Registered_Delivery;
 
-static gint hf_cmpp_deliver_resp_Result = -1;
+static gint hf_cmpp_deliver_resp_Result;
 
 /* CMPP Deliver Report */
-static gint hf_cmpp_deliver_Report = -1;
-static gint hf_cmpp_deliver_Report_Stat = -1;
-static gint hf_cmpp_deliver_Report_Submit_time = -1;
-static gint hf_cmpp_deliver_Report_Done_time = -1;
-static gint hf_cmpp_deliver_Report_SMSC_sequence = -1;
+static gint hf_cmpp_deliver_Report;
+static gint hf_cmpp_deliver_Report_Stat;
+static gint hf_cmpp_deliver_Report_Submit_time;
+static gint hf_cmpp_deliver_Report_Done_time;
+static gint hf_cmpp_deliver_Report_SMSC_sequence;
 
 /* Msg_Id field */
-static gint hf_cmpp_msg_id = -1;
-static gint hf_msg_id_timestamp = -1;
-static gint hf_msg_id_ismg_code = -1;
-static gint hf_msg_id_sequence_id = -1;
+static gint hf_cmpp_msg_id;
+static gint hf_msg_id_timestamp;
+static gint hf_msg_id_ismg_code;
+static gint hf_msg_id_sequence_id;
 
 static gboolean cmpp_desegment = TRUE;
 
@@ -232,9 +232,9 @@ static const value_string vals_Deliver_Resp_Result[] = {
 };
 
 /* Initialize the subtree pointers */
-static gint ett_cmpp = -1;
-static gint ett_msg_id = -1;
-static gint ett_deliver_report = -1;
+static gint ett_cmpp;
+static gint ett_msg_id;
+static gint ett_deliver_report;
 
 /* Helper functions */
 
diff --git a/epan/dissectors/packet-cnip.c b/epan/dissectors/packet-cnip.c
index f5d802b3a8..7a22e4503f 100644
--- a/epan/dissectors/packet-cnip.c
+++ b/epan/dissectors/packet-cnip.c
@@ -43,24 +43,24 @@ void proto_reg_handoff_cnip(void);
 
 static dissector_handle_t cnip_handle;
 
-static gint hf_cnip_len      = -1;
-static gint hf_cnip_ver      = -1;
-static gint hf_cnip_type     = -1;
-static gint hf_cnip_exth     = -1;
-static gint hf_cnip_pf       = -1;
-static gint hf_cnip_pf_sec   = -1;
-static gint hf_cnip_pf_pcode = -1;
-static gint hf_cnip_vcode    = -1;
-static gint hf_cnip_sessid   = -1;
-static gint hf_cnip_seqno    = -1;
-static gint hf_cnip_tstamp   = -1;
-
-static gint proto_cnip       = -1;
-
-static gint ett_cnip         = -1;
-static gint ett_pf           = -1;
-
-static expert_field ei_cnip_type_unknown = EI_INIT;
+static gint hf_cnip_len;
+static gint hf_cnip_ver;
+static gint hf_cnip_type;
+static gint hf_cnip_exth;
+static gint hf_cnip_pf;
+static gint hf_cnip_pf_sec;
+static gint hf_cnip_pf_pcode;
+static gint hf_cnip_vcode;
+static gint hf_cnip_sessid;
+static gint hf_cnip_seqno;
+static gint hf_cnip_tstamp;
+
+static gint proto_cnip;
+
+static gint ett_cnip;
+static gint ett_pf;
+
+static expert_field ei_cnip_type_unknown;
 
 static dissector_table_t cnip_dissector_table;
 
diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c
index 84034aebb0..1559e7e057 100644
--- a/epan/dissectors/packet-coap.c
+++ b/epan/dissectors/packet-coap.c
@@ -42,7 +42,7 @@ void proto_register_coap(void);
 static dissector_table_t coap_tmf_media_type_dissector_table;
 static dissector_table_t media_type_dissector_table;
 
-static int proto_coap						= -1;
+static int proto_coap;
 /*
  * Used only to register the "CoAP for Thread Management Framework"
  * dissector, which uses the same protocol and field IDs as the
@@ -54,44 +54,44 @@ static int proto_coap						= -1;
  * transmissions being misreceived?), did not register a media type for
  * its messages and a 'cf' value for that media type.
  */
-static int proto_coap_for_tmf					= -1;
-
-static int hf_coap_length					= -1;
-static int hf_coap_version					= -1;
-static int hf_coap_ttype					= -1;
-static int hf_coap_token_len					= -1;
-static int hf_coap_token					= -1;
-static int hf_coap_mid						= -1;
-
-static int hf_coap_response_in					= -1;
-static int hf_coap_response_to					= -1;
-static int hf_coap_response_time				= -1;
-static int hf_coap_request_resend_in				= -1;
-static int hf_coap_response_resend_in				= -1;
-static int hf_coap_oscore_kid					= -1;
-static int hf_coap_oscore_kid_context				= -1;
-static int hf_coap_oscore_piv					= -1;
-
-static int hf_block_payload					= -1;
-static int hf_block_length					= -1;
-
-static int hf_blocks						= -1;
-static int hf_block						= -1;
-static int hf_block_overlap					= -1;
-static int hf_block_overlap_conflicts				= -1;
-static int hf_block_multiple_tails				= -1;
-static int hf_block_too_long					= -1;
-static int hf_block_error					= -1;
-static int hf_block_count					= -1;
-static int hf_block_reassembled_in				= -1;
-static int hf_block_reassembled_length				= -1;
-
-static gint ett_coap						= -1;
-
-static gint ett_block						= -1;
-static gint ett_blocks						= -1;
-
-static expert_field ei_retransmitted				= EI_INIT;
+static int proto_coap_for_tmf;
+
+static int hf_coap_length;
+static int hf_coap_version;
+static int hf_coap_ttype;
+static int hf_coap_token_len;
+static int hf_coap_token;
+static int hf_coap_mid;
+
+static int hf_coap_response_in;
+static int hf_coap_response_to;
+static int hf_coap_response_time;
+static int hf_coap_request_resend_in;
+static int hf_coap_response_resend_in;
+static int hf_coap_oscore_kid;
+static int hf_coap_oscore_kid_context;
+static int hf_coap_oscore_piv;
+
+static int hf_block_payload;
+static int hf_block_length;
+
+static int hf_blocks;
+static int hf_block;
+static int hf_block_overlap;
+static int hf_block_overlap_conflicts;
+static int hf_block_multiple_tails;
+static int hf_block_too_long;
+static int hf_block_error;
+static int hf_block_count;
+static int hf_block_reassembled_in;
+static int hf_block_reassembled_length;
+
+static gint ett_coap;
+
+static gint ett_block;
+static gint ett_blocks;
+
+static expert_field ei_retransmitted;
 
 static COAP_COMMON_LIST_T(dissect_coap_hf);
 
diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c
index 466f26c5a0..41399ef60a 100644
--- a/epan/dissectors/packet-collectd.c
+++ b/epan/dissectors/packet-collectd.c
@@ -135,45 +135,45 @@ static const val64_string severity_names[] = {
 
 #define UDP_PORT_COLLECTD 25826 /* Not IANA registered */
 
-static gint proto_collectd		= -1;
+static gint proto_collectd;
 static gint tap_collectd                = -1;
 
-static gint hf_collectd_type		= -1;
-static gint hf_collectd_length		= -1;
-static gint hf_collectd_data		= -1;
-static gint hf_collectd_data_host	= -1;
-static gint hf_collectd_data_time	= -1;
-static gint hf_collectd_data_interval	= -1;
-static gint hf_collectd_data_plugin	= -1;
-static gint hf_collectd_data_plugin_inst= -1;
-static gint hf_collectd_data_type	= -1;
-static gint hf_collectd_data_type_inst	= -1;
-static gint hf_collectd_data_valcnt	= -1;
-static gint hf_collectd_val_type	= -1;
-static gint hf_collectd_val_counter	= -1;
-static gint hf_collectd_val_gauge	= -1;
-static gint hf_collectd_val_derive	= -1;
-static gint hf_collectd_val_absolute	= -1;
-static gint hf_collectd_val_unknown	= -1;
-static gint hf_collectd_data_severity	= -1;
-static gint hf_collectd_data_message	= -1;
-static gint hf_collectd_data_sighash    = -1;
-static gint hf_collectd_data_initvec    = -1;
-static gint hf_collectd_data_username_len = -1;
-static gint hf_collectd_data_username   = -1;
-static gint hf_collectd_data_encrypted  = -1;
-
-static gint ett_collectd		= -1;
-static gint ett_collectd_string		= -1;
-static gint ett_collectd_integer	= -1;
-static gint ett_collectd_part_value	= -1;
-static gint ett_collectd_value		= -1;
-static gint ett_collectd_valinfo	= -1;
-static gint ett_collectd_signature	= -1;
-static gint ett_collectd_encryption	= -1;
-static gint ett_collectd_dispatch	= -1;
-static gint ett_collectd_invalid_length	= -1;
-static gint ett_collectd_unknown	= -1;
+static gint hf_collectd_type;
+static gint hf_collectd_length;
+static gint hf_collectd_data;
+static gint hf_collectd_data_host;
+static gint hf_collectd_data_time;
+static gint hf_collectd_data_interval;
+static gint hf_collectd_data_plugin;
+static gint hf_collectd_data_plugin_inst;
+static gint hf_collectd_data_type;
+static gint hf_collectd_data_type_inst;
+static gint hf_collectd_data_valcnt;
+static gint hf_collectd_val_type;
+static gint hf_collectd_val_counter;
+static gint hf_collectd_val_gauge;
+static gint hf_collectd_val_derive;
+static gint hf_collectd_val_absolute;
+static gint hf_collectd_val_unknown;
+static gint hf_collectd_data_severity;
+static gint hf_collectd_data_message;
+static gint hf_collectd_data_sighash;
+static gint hf_collectd_data_initvec;
+static gint hf_collectd_data_username_len;
+static gint hf_collectd_data_username;
+static gint hf_collectd_data_encrypted;
+
+static gint ett_collectd;
+static gint ett_collectd_string;
+static gint ett_collectd_integer;
+static gint ett_collectd_part_value;
+static gint ett_collectd_value;
+static gint ett_collectd_valinfo;
+static gint ett_collectd_signature;
+static gint ett_collectd_encryption;
+static gint ett_collectd_dispatch;
+static gint ett_collectd_invalid_length;
+static gint ett_collectd_unknown;
 
 static gint st_collectd_packets = -1;
 static gint st_collectd_values  = -1;
@@ -181,10 +181,10 @@ static gint st_collectd_values_hosts   = -1;
 static gint st_collectd_values_plugins = -1;
 static gint st_collectd_values_types   = -1;
 
-static expert_field ei_collectd_type = EI_INIT;
-static expert_field ei_collectd_invalid_length = EI_INIT;
-static expert_field ei_collectd_data_valcnt = EI_INIT;
-static expert_field ei_collectd_garbage = EI_INIT;
+static expert_field ei_collectd_type;
+static expert_field ei_collectd_invalid_length;
+static expert_field ei_collectd_data_valcnt;
+static expert_field ei_collectd_garbage;
 
 /* Prototype for the handoff function */
 void proto_reg_handoff_collectd (void);
diff --git a/epan/dissectors/packet-communityid.c b/epan/dissectors/packet-communityid.c
index 42e78dda7d..6b5c3816a7 100644
--- a/epan/dissectors/packet-communityid.c
+++ b/epan/dissectors/packet-communityid.c
@@ -405,13 +405,13 @@ static gboolean communityid_calc(communityid_cfg_t *cfg, guint8 proto,
 
 void proto_register_communityid(void);
 
-static int proto_communityid = -1;
-static int proto_ip = -1;
-static int proto_ipv6 = -1;
-static int proto_icmp = -1;
-static int proto_icmpv6 = -1;
+static int proto_communityid;
+static int proto_ip;
+static int proto_ipv6;
+static int proto_icmp;
+static int proto_icmpv6;
 
-static int hf_communityid_hash = -1;
+static int hf_communityid_hash;
 
 static dissector_handle_t communityid_handle;
 
diff --git a/epan/dissectors/packet-componentstatus.c b/epan/dissectors/packet-componentstatus.c
index 19346df243..0848c52cff 100644
--- a/epan/dissectors/packet-componentstatus.c
+++ b/epan/dissectors/packet-componentstatus.c
@@ -28,29 +28,29 @@ void proto_reg_handoff_componentstatusprotocol(void);
 static dissector_handle_t componentstatusprotocol_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_componentstatusprotocol = -1;
+static int proto_componentstatusprotocol;
 static int tap_componentstatusprotocol   = -1;
 
 /* Initialize the subtree pointers */
-static gint ett_componentstatusprotocol           = -1;
-static gint ett_message_flags                     = -1;
-static gint ett_message_sender_id                 = -1;
-static gint ett_cspreport_association_receiver_id = -1;
-static gint ett_association                       = -1;
+static gint ett_componentstatusprotocol;
+static gint ett_message_flags;
+static gint ett_message_sender_id;
+static gint ett_cspreport_association_receiver_id;
+static gint ett_association;
 
 
 #define COMPONENTSTATUSPROTOCOL_PORT    2960   /* Not IANA registered */
 #define COMPONENTSTATUSPROTOCOL_VERSION 0x0200
 
-static int hf_message_type             = -1;
-static int hf_message_flags            = -1;
-static int hf_message_flags_final_bit  = -1;
-static int hf_message_length           = -1;
-static int hf_message_version          = -1;
-static int hf_message_sender_id        = -1;
-static int hf_message_sender_id_group  = -1;
-static int hf_message_sender_id_object = -1;
-static int hf_message_sender_timestamp = -1;
+static int hf_message_type;
+static int hf_message_flags;
+static int hf_message_flags_final_bit;
+static int hf_message_length;
+static int hf_message_version;
+static int hf_message_sender_id;
+static int hf_message_sender_id_group;
+static int hf_message_sender_id_object;
+static int hf_message_sender_timestamp;
 
 static guint64 componentstatusprotocol_total_msgs     = 0;
 static guint64 componentstatusprotocol_total_bytes    = 0;
@@ -64,11 +64,11 @@ static const value_string message_type_values[] = {
 };
 
 
-static int hf_cspreport_report_interval = -1;
-static int hf_cspreport_location        = -1;
-static int hf_cspreport_status          = -1;
-static int hf_cspreport_workload        = -1;
-static int hf_cspreport_associations    = -1;
+static int hf_cspreport_report_interval;
+static int hf_cspreport_location;
+static int hf_cspreport_status;
+static int hf_cspreport_workload;
+static int hf_cspreport_associations;
 
 #define CSPF_FINAL (1 << 0)
 static const true_false_string message_flags_final_bit = {
@@ -92,13 +92,13 @@ static const value_string group_values[] = {
 
 #define CSR_GET_WORKLOAD(w) ((w == 0xffff) ? -1.0 : (float)(w / (float)0xfffe))
 
-static int hf_cspreport_association_receiver_id        = -1;
-static int hf_cspreport_association_receiver_id_group  = -1;
-static int hf_cspreport_association_receiver_id_object = -1;
-static int hf_cspreport_association_duration           = -1;
-static int hf_cspreport_association_flags              = -1;
-static int hf_cspreport_association_protocolid         = -1;
-static int hf_cspreport_association_ppid               = -1;
+static int hf_cspreport_association_receiver_id;
+static int hf_cspreport_association_receiver_id_group;
+static int hf_cspreport_association_receiver_id_object;
+static int hf_cspreport_association_duration;
+static int hf_cspreport_association_flags;
+static int hf_cspreport_association_protocolid;
+static int hf_cspreport_association_ppid;
 
 
 /* Setup list of header fields */
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index b53a866c35..85416b19bf 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -522,262 +522,262 @@ static const value_string pcmm_gate_state_reason[] = {
 
 
 /* Initialize the protocol and registered fields */
-static gint proto_cops = -1;
-static gint hf_cops_ver_flags = -1;
-static gint hf_cops_version = -1;
-static gint hf_cops_flags = -1;
-
-static gint hf_cops_response_in = -1;
-static gint hf_cops_response_to = -1;
-static gint hf_cops_response_time = -1;
-
-static gint hf_cops_op_code = -1;
-static gint hf_cops_client_type = -1;
-static gint hf_cops_msg_len = -1;
-
-static gint hf_cops_obj_len = -1;
-static gint hf_cops_obj_c_num = -1;
-static gint hf_cops_obj_c_type = -1;
-
-static gint hf_cops_obj_s_num = -1;
-static gint hf_cops_obj_s_type = -1;
-
-static gint hf_cops_handle = -1;
-
-static gint hf_cops_r_type_flags = -1;
-static gint hf_cops_m_type_flags = -1;
-
-static gint hf_cops_in_int_ipv4 = -1;
-static gint hf_cops_in_int_ipv6 = -1;
-static gint hf_cops_out_int_ipv4 = -1;
-static gint hf_cops_out_int_ipv6 = -1;
-static gint hf_cops_int_ifindex = -1;
-
-static gint hf_cops_reason = -1;
-static gint hf_cops_reason_sub = -1;
-
-static gint hf_cops_dec_cmd_code = -1;
-static gint hf_cops_dec_flags = -1;
-
-static gint hf_cops_error = -1;
-static gint hf_cops_error_sub = -1;
-
-static gint hf_cops_gperror = -1;
-static gint hf_cops_gperror_sub = -1;
-
-static gint hf_cops_cperror = -1;
-static gint hf_cops_cperror_sub = -1;
-
-static gint hf_cops_katimer = -1;
-
-static gint hf_cops_pepid = -1;
-
-static gint hf_cops_report_type = -1;
-
-static gint hf_cops_pdprediraddr_ipv4 = -1;
-static gint hf_cops_pdprediraddr_ipv6 = -1;
-static gint hf_cops_lastpdpaddr_ipv4 = -1;
-static gint hf_cops_lastpdpaddr_ipv6 = -1;
-static gint hf_cops_pdp_tcp_port = -1;
-
-static gint hf_cops_accttimer = -1;
-
-static gint hf_cops_key_id = -1;
-static gint hf_cops_seq_num = -1;
-
-static gint hf_cops_prid_oid = -1;
-static gint hf_cops_pprid_oid = -1;
-static gint hf_cops_errprid_oid = -1;
-static gint hf_cops_epd_null = -1;
-static gint hf_cops_epd_int = -1;
-static gint hf_cops_epd_octets = -1;
-static gint hf_cops_epd_oid = -1;
-static gint hf_cops_epd_ipv4 = -1;
-static gint hf_cops_epd_u32 = -1;
-static gint hf_cops_epd_ticks = -1;
-static gint hf_cops_epd_opaque = -1;
-static gint hf_cops_epd_i64 = -1;
-static gint hf_cops_epd_u64 = -1;
-static gint hf_cops_epd_unknown = -1;
-static gint hf_cops_reserved8 = -1;
-static gint hf_cops_reserved16 = -1;
-static gint hf_cops_reserved24 = -1;
-static gint hf_cops_keyed_message_digest = -1;
-static gint hf_cops_integrity_contents = -1;
-static gint hf_cops_opaque_data = -1;
+static gint proto_cops;
+static gint hf_cops_ver_flags;
+static gint hf_cops_version;
+static gint hf_cops_flags;
+
+static gint hf_cops_response_in;
+static gint hf_cops_response_to;
+static gint hf_cops_response_time;
+
+static gint hf_cops_op_code;
+static gint hf_cops_client_type;
+static gint hf_cops_msg_len;
+
+static gint hf_cops_obj_len;
+static gint hf_cops_obj_c_num;
+static gint hf_cops_obj_c_type;
+
+static gint hf_cops_obj_s_num;
+static gint hf_cops_obj_s_type;
+
+static gint hf_cops_handle;
+
+static gint hf_cops_r_type_flags;
+static gint hf_cops_m_type_flags;
+
+static gint hf_cops_in_int_ipv4;
+static gint hf_cops_in_int_ipv6;
+static gint hf_cops_out_int_ipv4;
+static gint hf_cops_out_int_ipv6;
+static gint hf_cops_int_ifindex;
+
+static gint hf_cops_reason;
+static gint hf_cops_reason_sub;
+
+static gint hf_cops_dec_cmd_code;
+static gint hf_cops_dec_flags;
+
+static gint hf_cops_error;
+static gint hf_cops_error_sub;
+
+static gint hf_cops_gperror;
+static gint hf_cops_gperror_sub;
+
+static gint hf_cops_cperror;
+static gint hf_cops_cperror_sub;
+
+static gint hf_cops_katimer;
+
+static gint hf_cops_pepid;
+
+static gint hf_cops_report_type;
+
+static gint hf_cops_pdprediraddr_ipv4;
+static gint hf_cops_pdprediraddr_ipv6;
+static gint hf_cops_lastpdpaddr_ipv4;
+static gint hf_cops_lastpdpaddr_ipv6;
+static gint hf_cops_pdp_tcp_port;
+
+static gint hf_cops_accttimer;
+
+static gint hf_cops_key_id;
+static gint hf_cops_seq_num;
+
+static gint hf_cops_prid_oid;
+static gint hf_cops_pprid_oid;
+static gint hf_cops_errprid_oid;
+static gint hf_cops_epd_null;
+static gint hf_cops_epd_int;
+static gint hf_cops_epd_octets;
+static gint hf_cops_epd_oid;
+static gint hf_cops_epd_ipv4;
+static gint hf_cops_epd_u32;
+static gint hf_cops_epd_ticks;
+static gint hf_cops_epd_opaque;
+static gint hf_cops_epd_i64;
+static gint hf_cops_epd_u64;
+static gint hf_cops_epd_unknown;
+static gint hf_cops_reserved8;
+static gint hf_cops_reserved16;
+static gint hf_cops_reserved24;
+static gint hf_cops_keyed_message_digest;
+static gint hf_cops_integrity_contents;
+static gint hf_cops_opaque_data;
 
 /* For PacketCable D-QoS */
-static gint hf_cops_subtree = -1;
-static gint hf_cops_pc_activity_count = -1;
-static gint hf_cops_pc_algorithm = -1;
-static gint hf_cops_pc_close_subcode = -1;
-static gint hf_cops_pc_cmts_ip = -1;
-static gint hf_cops_pc_cmts_ip_port = -1;
-static gint hf_cops_pc_prks_ip = -1;
-static gint hf_cops_pc_prks_ip_port = -1;
-static gint hf_cops_pc_srks_ip = -1;
-static gint hf_cops_pc_srks_ip_port = -1;
-static gint hf_cops_pc_delete_subcode = -1;
-static gint hf_cops_pc_dest_ip = -1;
-static gint hf_cops_pc_dest_port = -1;
-static gint hf_cops_pc_direction = -1;
-static gint hf_cops_pc_ds_field = -1;
-static gint hf_cops_pc_gate_id = -1;
-static gint hf_cops_pc_gate_spec_flags = -1;
-static gint hf_cops_pc_gate_command_type = -1;
-static gint hf_cops_pc_key = -1;
-static gint hf_cops_pc_max_packet_size = -1;
-static gint hf_cops_pc_min_policed_unit = -1;
-static gint hf_cops_pc_packetcable_err_code = -1;
-static gint hf_cops_pc_packetcable_sub_code = -1;
-static gint hf_cops_pc_peak_data_rate = -1;
-static gint hf_cops_pc_protocol_id = -1;
-static gint hf_cops_pc_reason_code = -1;
-static gint hf_cops_pc_remote_flags = -1;
-static gint hf_cops_pc_remote_gate_id = -1;
-static gint hf_cops_pc_reserved = -1;
-static gint hf_cops_pc_session_class = -1;
-static gint hf_cops_pc_slack_term = -1;
-static gint hf_cops_pc_spec_rate = -1;
-static gint hf_cops_pc_src_ip = -1;
-static gint hf_cops_pc_src_port = -1;
-static gint hf_cops_pc_subscriber_id_ipv4 = -1;
-static gint hf_cops_pc_subscriber_id_ipv6 = -1;
-static gint hf_cops_pc_t1_value = -1;
-static gint hf_cops_pc_t7_value = -1;
-static gint hf_cops_pc_t8_value = -1;
-static gint hf_cops_pc_token_bucket_rate = -1;
-static gint hf_cops_pc_token_bucket_size = -1;
-static gint hf_cops_pc_transaction_id = -1;
-static gint hf_cops_pc_bcid_ts = -1;
-static gint hf_cops_pc_bcid_id = -1;
-static gint hf_cops_pc_bcid_tz = -1;
-static gint hf_cops_pc_bcid_ev = -1;
-static gint hf_cops_pc_dfcdc_ip = -1;
-static gint hf_cops_pc_dfccc_ip = -1;
-static gint hf_cops_pc_dfcdc_ip_port = -1;
-static gint hf_cops_pc_dfccc_ip_port = -1;
-static gint hf_cops_pc_dfccc_id = -1;
+static gint hf_cops_subtree;
+static gint hf_cops_pc_activity_count;
+static gint hf_cops_pc_algorithm;
+static gint hf_cops_pc_close_subcode;
+static gint hf_cops_pc_cmts_ip;
+static gint hf_cops_pc_cmts_ip_port;
+static gint hf_cops_pc_prks_ip;
+static gint hf_cops_pc_prks_ip_port;
+static gint hf_cops_pc_srks_ip;
+static gint hf_cops_pc_srks_ip_port;
+static gint hf_cops_pc_delete_subcode;
+static gint hf_cops_pc_dest_ip;
+static gint hf_cops_pc_dest_port;
+static gint hf_cops_pc_direction;
+static gint hf_cops_pc_ds_field;
+static gint hf_cops_pc_gate_id;
+static gint hf_cops_pc_gate_spec_flags;
+static gint hf_cops_pc_gate_command_type;
+static gint hf_cops_pc_key;
+static gint hf_cops_pc_max_packet_size;
+static gint hf_cops_pc_min_policed_unit;
+static gint hf_cops_pc_packetcable_err_code;
+static gint hf_cops_pc_packetcable_sub_code;
+static gint hf_cops_pc_peak_data_rate;
+static gint hf_cops_pc_protocol_id;
+static gint hf_cops_pc_reason_code;
+static gint hf_cops_pc_remote_flags;
+static gint hf_cops_pc_remote_gate_id;
+static gint hf_cops_pc_reserved;
+static gint hf_cops_pc_session_class;
+static gint hf_cops_pc_slack_term;
+static gint hf_cops_pc_spec_rate;
+static gint hf_cops_pc_src_ip;
+static gint hf_cops_pc_src_port;
+static gint hf_cops_pc_subscriber_id_ipv4;
+static gint hf_cops_pc_subscriber_id_ipv6;
+static gint hf_cops_pc_t1_value;
+static gint hf_cops_pc_t7_value;
+static gint hf_cops_pc_t8_value;
+static gint hf_cops_pc_token_bucket_rate;
+static gint hf_cops_pc_token_bucket_size;
+static gint hf_cops_pc_transaction_id;
+static gint hf_cops_pc_bcid_ts;
+static gint hf_cops_pc_bcid_id;
+static gint hf_cops_pc_bcid_tz;
+static gint hf_cops_pc_bcid_ev;
+static gint hf_cops_pc_dfcdc_ip;
+static gint hf_cops_pc_dfccc_ip;
+static gint hf_cops_pc_dfcdc_ip_port;
+static gint hf_cops_pc_dfccc_ip_port;
+static gint hf_cops_pc_dfccc_id;
 
 /* PacketCable Multimedia */
-static gint hf_cops_pcmm_amid_app_type = -1;
-static gint hf_cops_pcmm_amid_am_tag = -1;
-static gint hf_cops_pcmm_gate_spec_flags = -1;
-static gint hf_cops_pcmm_gate_spec_flags_gate = -1;
-static gint hf_cops_pcmm_gate_spec_flags_dscp_overwrite = -1;
-static gint hf_cops_pcmm_gate_spec_dscp_tos_field = -1;
-static gint hf_cops_pcmm_gate_spec_dscp_tos_mask = -1;
-static gint hf_cops_pcmm_gate_spec_session_class_id = -1;
-static gint hf_cops_pcmm_gate_spec_session_class_id_priority = -1;
-static gint hf_cops_pcmm_gate_spec_session_class_id_preemption = -1;
-static gint hf_cops_pcmm_gate_spec_session_class_id_configurable = -1;
-static gint hf_cops_pcmm_gate_spec_timer_t1 = -1;
-static gint hf_cops_pcmm_gate_spec_timer_t2 = -1;
-static gint hf_cops_pcmm_gate_spec_timer_t3 = -1;
-static gint hf_cops_pcmm_gate_spec_timer_t4 = -1;
-static gint hf_cops_pcmm_classifier_protocol_id = -1;
-static gint hf_cops_pcmm_classifier_dscp_tos_field = -1;
-static gint hf_cops_pcmm_classifier_dscp_tos_mask = -1;
-static gint hf_cops_pcmm_classifier_src_addr = -1;
-static gint hf_cops_pcmm_classifier_src_mask = -1;
-static gint hf_cops_pcmm_classifier_dst_addr = -1;
-static gint hf_cops_pcmm_classifier_dst_mask = -1;
-static gint hf_cops_pcmm_classifier_src_port = -1;
-static gint hf_cops_pcmm_classifier_src_port_end = -1;
-static gint hf_cops_pcmm_classifier_dst_port = -1;
-static gint hf_cops_pcmm_classifier_dst_port_end = -1;
-static gint hf_cops_pcmm_classifier_priority = -1;
-static gint hf_cops_pcmm_classifier_classifier_id = -1;
-static gint hf_cops_pcmm_classifier_activation_state = -1;
-static gint hf_cops_pcmm_classifier_action = -1;
-static gint hf_cops_pcmm_classifier_flags = -1;
-static gint hf_cops_pcmm_classifier_tc_low = -1;
-static gint hf_cops_pcmm_classifier_tc_high = -1;
-static gint hf_cops_pcmm_classifier_tc_mask = -1;
-static gint hf_cops_pcmm_classifier_flow_label = -1;
-static gint hf_cops_pcmm_classifier_next_header_type = -1;
-static gint hf_cops_pcmm_classifier_source_prefix_length = -1;
-static gint hf_cops_pcmm_classifier_destination_prefix_length = -1;
-static gint hf_cops_pcmm_classifier_src_addr_v6 = -1;
-static gint hf_cops_pcmm_classifier_dst_addr_v6 = -1;
-static gint hf_cops_pcmm_flow_spec_envelope = -1;
-static gint hf_cops_pcmm_flow_spec_service_number = -1;
-static gint hf_cops_pcmm_docsis_scn = -1;
-static gint hf_cops_pcmm_envelope = -1;
-static gint hf_cops_pcmm_traffic_priority = -1;
-static gint hf_cops_pcmm_request_transmission_policy = -1;
-static gint hf_cops_pcmm_request_transmission_policy_sf_all_cm = -1;
-static gint hf_cops_pcmm_request_transmission_policy_sf_priority = -1;
-static gint hf_cops_pcmm_request_transmission_policy_sf_request_for_request = -1;
-static gint hf_cops_pcmm_request_transmission_policy_sf_data_for_data = -1;
-static gint hf_cops_pcmm_request_transmission_policy_sf_piggyback = -1;
-static gint hf_cops_pcmm_request_transmission_policy_sf_concatenate = -1;
-static gint hf_cops_pcmm_request_transmission_policy_sf_fragment = -1;
-static gint hf_cops_pcmm_request_transmission_policy_sf_suppress = -1;
-static gint hf_cops_pcmm_request_transmission_policy_sf_drop_packets = -1;
-static gint hf_cops_pcmm_max_sustained_traffic_rate = -1;
-static gint hf_cops_pcmm_max_traffic_burst = -1;
-static gint hf_cops_pcmm_min_reserved_traffic_rate = -1;
-static gint hf_cops_pcmm_ass_min_rtr_packet_size = -1;
-static gint hf_cops_pcmm_max_concat_burst = -1;
-static gint hf_cops_pcmm_req_att_mask = -1;
-static gint hf_cops_pcmm_forbid_att_mask = -1;
-static gint hf_cops_pcmm_att_aggr_rule_mask = -1;
-static gint hf_cops_pcmm_nominal_polling_interval = -1;
-static gint hf_cops_pcmm_tolerated_poll_jitter = -1;
-static gint hf_cops_pcmm_unsolicited_grant_size = -1;
-static gint hf_cops_pcmm_grants_per_interval = -1;
-static gint hf_cops_pcmm_nominal_grant_interval = -1;
-static gint hf_cops_pcmm_tolerated_grant_jitter = -1;
-static gint hf_cops_pcmm_down_resequencing = -1;
-static gint hf_cops_pcmm_down_peak_traffic_rate = -1;
-static gint hf_cops_pcmm_max_downstream_latency = -1;
-static gint hf_cops_pcmm_volume_based_usage_limit = -1;
-static gint hf_cops_pcmm_time_based_usage_limit = -1;
-static gint hf_cops_pcmm_gate_time_info = -1;
-static gint hf_cops_pcmm_gate_usage_info = -1;
-static gint hf_cops_pcmm_packetcable_error_code = -1;
-static gint hf_cops_pcmm_packetcable_error_subcode = -1;
-static gint hf_cops_pcmm_packetcable_gate_state = -1;
-static gint hf_cops_pcmm_packetcable_gate_state_reason = -1;
-static gint hf_cops_pcmm_packetcable_version_info_major = -1;
-static gint hf_cops_pcmm_packetcable_version_info_minor = -1;
-static gint hf_cops_pcmm_psid = -1;
-static gint hf_cops_pcmm_synch_options_report_type = -1;
-static gint hf_cops_pcmm_synch_options_synch_type = -1;
-static gint hf_cops_pcmm_msg_receipt_key = -1;
-static gint hf_cops_pcmm_userid = -1;
-static gint hf_cops_pcmm_sharedresourceid = -1;
+static gint hf_cops_pcmm_amid_app_type;
+static gint hf_cops_pcmm_amid_am_tag;
+static gint hf_cops_pcmm_gate_spec_flags;
+static gint hf_cops_pcmm_gate_spec_flags_gate;
+static gint hf_cops_pcmm_gate_spec_flags_dscp_overwrite;
+static gint hf_cops_pcmm_gate_spec_dscp_tos_field;
+static gint hf_cops_pcmm_gate_spec_dscp_tos_mask;
+static gint hf_cops_pcmm_gate_spec_session_class_id;
+static gint hf_cops_pcmm_gate_spec_session_class_id_priority;
+static gint hf_cops_pcmm_gate_spec_session_class_id_preemption;
+static gint hf_cops_pcmm_gate_spec_session_class_id_configurable;
+static gint hf_cops_pcmm_gate_spec_timer_t1;
+static gint hf_cops_pcmm_gate_spec_timer_t2;
+static gint hf_cops_pcmm_gate_spec_timer_t3;
+static gint hf_cops_pcmm_gate_spec_timer_t4;
+static gint hf_cops_pcmm_classifier_protocol_id;
+static gint hf_cops_pcmm_classifier_dscp_tos_field;
+static gint hf_cops_pcmm_classifier_dscp_tos_mask;
+static gint hf_cops_pcmm_classifier_src_addr;
+static gint hf_cops_pcmm_classifier_src_mask;
+static gint hf_cops_pcmm_classifier_dst_addr;
+static gint hf_cops_pcmm_classifier_dst_mask;
+static gint hf_cops_pcmm_classifier_src_port;
+static gint hf_cops_pcmm_classifier_src_port_end;
+static gint hf_cops_pcmm_classifier_dst_port;
+static gint hf_cops_pcmm_classifier_dst_port_end;
+static gint hf_cops_pcmm_classifier_priority;
+static gint hf_cops_pcmm_classifier_classifier_id;
+static gint hf_cops_pcmm_classifier_activation_state;
+static gint hf_cops_pcmm_classifier_action;
+static gint hf_cops_pcmm_classifier_flags;
+static gint hf_cops_pcmm_classifier_tc_low;
+static gint hf_cops_pcmm_classifier_tc_high;
+static gint hf_cops_pcmm_classifier_tc_mask;
+static gint hf_cops_pcmm_classifier_flow_label;
+static gint hf_cops_pcmm_classifier_next_header_type;
+static gint hf_cops_pcmm_classifier_source_prefix_length;
+static gint hf_cops_pcmm_classifier_destination_prefix_length;
+static gint hf_cops_pcmm_classifier_src_addr_v6;
+static gint hf_cops_pcmm_classifier_dst_addr_v6;
+static gint hf_cops_pcmm_flow_spec_envelope;
+static gint hf_cops_pcmm_flow_spec_service_number;
+static gint hf_cops_pcmm_docsis_scn;
+static gint hf_cops_pcmm_envelope;
+static gint hf_cops_pcmm_traffic_priority;
+static gint hf_cops_pcmm_request_transmission_policy;
+static gint hf_cops_pcmm_request_transmission_policy_sf_all_cm;
+static gint hf_cops_pcmm_request_transmission_policy_sf_priority;
+static gint hf_cops_pcmm_request_transmission_policy_sf_request_for_request;
+static gint hf_cops_pcmm_request_transmission_policy_sf_data_for_data;
+static gint hf_cops_pcmm_request_transmission_policy_sf_piggyback;
+static gint hf_cops_pcmm_request_transmission_policy_sf_concatenate;
+static gint hf_cops_pcmm_request_transmission_policy_sf_fragment;
+static gint hf_cops_pcmm_request_transmission_policy_sf_suppress;
+static gint hf_cops_pcmm_request_transmission_policy_sf_drop_packets;
+static gint hf_cops_pcmm_max_sustained_traffic_rate;
+static gint hf_cops_pcmm_max_traffic_burst;
+static gint hf_cops_pcmm_min_reserved_traffic_rate;
+static gint hf_cops_pcmm_ass_min_rtr_packet_size;
+static gint hf_cops_pcmm_max_concat_burst;
+static gint hf_cops_pcmm_req_att_mask;
+static gint hf_cops_pcmm_forbid_att_mask;
+static gint hf_cops_pcmm_att_aggr_rule_mask;
+static gint hf_cops_pcmm_nominal_polling_interval;
+static gint hf_cops_pcmm_tolerated_poll_jitter;
+static gint hf_cops_pcmm_unsolicited_grant_size;
+static gint hf_cops_pcmm_grants_per_interval;
+static gint hf_cops_pcmm_nominal_grant_interval;
+static gint hf_cops_pcmm_tolerated_grant_jitter;
+static gint hf_cops_pcmm_down_resequencing;
+static gint hf_cops_pcmm_down_peak_traffic_rate;
+static gint hf_cops_pcmm_max_downstream_latency;
+static gint hf_cops_pcmm_volume_based_usage_limit;
+static gint hf_cops_pcmm_time_based_usage_limit;
+static gint hf_cops_pcmm_gate_time_info;
+static gint hf_cops_pcmm_gate_usage_info;
+static gint hf_cops_pcmm_packetcable_error_code;
+static gint hf_cops_pcmm_packetcable_error_subcode;
+static gint hf_cops_pcmm_packetcable_gate_state;
+static gint hf_cops_pcmm_packetcable_gate_state_reason;
+static gint hf_cops_pcmm_packetcable_version_info_major;
+static gint hf_cops_pcmm_packetcable_version_info_minor;
+static gint hf_cops_pcmm_psid;
+static gint hf_cops_pcmm_synch_options_report_type;
+static gint hf_cops_pcmm_synch_options_synch_type;
+static gint hf_cops_pcmm_msg_receipt_key;
+static gint hf_cops_pcmm_userid;
+static gint hf_cops_pcmm_sharedresourceid;
 
 
 /* Initialize the subtree pointers */
-static gint ett_cops = -1;
-static gint ett_cops_ver_flags = -1;
-static gint ett_cops_obj = -1;
-static gint ett_cops_pr_obj = -1;
-static gint ett_cops_obj_data = -1;
-static gint ett_cops_r_type_flags = -1;
-static gint ett_cops_itf = -1;
-static gint ett_cops_reason = -1;
-static gint ett_cops_decision = -1;
-static gint ett_cops_error = -1;
-static gint ett_cops_clientsi = -1;
-static gint ett_cops_asn1 = -1;
-static gint ett_cops_gperror = -1;
-static gint ett_cops_cperror = -1;
-static gint ett_cops_pdp = -1;
-
-static expert_field ei_cops_pepid_not_null = EI_INIT;
-static expert_field ei_cops_trailing_garbage = EI_INIT;
-static expert_field ei_cops_bad_cops_object_length = EI_INIT;
-static expert_field ei_cops_bad_cops_pr_object_length = EI_INIT;
-static expert_field ei_cops_unknown_c_num = EI_INIT;
-/* static expert_field ei_cops_unknown_s_num = EI_INIT; */
+static gint ett_cops;
+static gint ett_cops_ver_flags;
+static gint ett_cops_obj;
+static gint ett_cops_pr_obj;
+static gint ett_cops_obj_data;
+static gint ett_cops_r_type_flags;
+static gint ett_cops_itf;
+static gint ett_cops_reason;
+static gint ett_cops_decision;
+static gint ett_cops_error;
+static gint ett_cops_clientsi;
+static gint ett_cops_asn1;
+static gint ett_cops_gperror;
+static gint ett_cops_cperror;
+static gint ett_cops_pdp;
+
+static expert_field ei_cops_pepid_not_null;
+static expert_field ei_cops_trailing_garbage;
+static expert_field ei_cops_bad_cops_object_length;
+static expert_field ei_cops_bad_cops_pr_object_length;
+static expert_field ei_cops_unknown_c_num;
+/* static expert_field ei_cops_unknown_s_num; */
 
 /* For PacketCable */
-static gint ett_cops_subtree = -1;
+static gint ett_cops_subtree;
 
-static gint ett_docsis_request_transmission_policy = -1;
+static gint ett_docsis_request_transmission_policy;
 
 static dissector_handle_t cops_handle;
 
diff --git a/epan/dissectors/packet-corosync-totemnet.c b/epan/dissectors/packet-corosync-totemnet.c
index 132155e185..e9e534ffb3 100644
--- a/epan/dissectors/packet-corosync-totemnet.c
+++ b/epan/dissectors/packet-corosync-totemnet.c
@@ -36,20 +36,20 @@ void proto_register_corosync_totemnet(void);
 void proto_reg_handoff_corosync_totemnet(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_corosync_totemnet = -1;
+static int proto_corosync_totemnet;
 
 /* field of struct security_header */
-static int hf_corosync_totemnet_security_header_hash_digest    = -1;
-static int hf_corosync_totemnet_security_header_salt           = -1;
-static int hf_corosync_totemnet_security_crypto_type           = -1;
-static int hf_corosync_totemnet_security_crypto_key            = -1;
+static int hf_corosync_totemnet_security_header_hash_digest;
+static int hf_corosync_totemnet_security_header_salt;
+static int hf_corosync_totemnet_security_crypto_type;
+static int hf_corosync_totemnet_security_crypto_key;
 
 /* configurable parameters */
 static gchar*  corosync_totemnet_private_keys      = NULL;
 static gchar** corosync_totemnet_private_keys_list = NULL;
 
 /* Initialize the subtree pointers */
-static gint ett_corosync_totemnet_security_header              = -1;
+static gint ett_corosync_totemnet_security_header;
 
 #define SALT_SIZE          16
 
diff --git a/epan/dissectors/packet-corosync-totemsrp.c b/epan/dissectors/packet-corosync-totemsrp.c
index 6f0feaf8a4..c62baf6fc1 100644
--- a/epan/dissectors/packet-corosync-totemsrp.c
+++ b/epan/dissectors/packet-corosync-totemsrp.c
@@ -48,95 +48,95 @@ void proto_register_corosync_totemsrp(void);
 void proto_reg_handoff_corosync_totemsrp(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_corosync_totemsrp = -1;
+static int proto_corosync_totemsrp;
 
 static heur_dissector_list_t heur_subdissector_list;
 
 /* fields for struct message_header */
-static int hf_corosync_totemsrp_message_header_type            = -1;
-static int hf_corosync_totemsrp_message_header_encapsulated    = -1;
-static int hf_corosync_totemsrp_message_header_endian_detector = -1;
-static int hf_corosync_totemsrp_message_header_nodeid          = -1;
+static int hf_corosync_totemsrp_message_header_type;
+static int hf_corosync_totemsrp_message_header_encapsulated;
+static int hf_corosync_totemsrp_message_header_endian_detector;
+static int hf_corosync_totemsrp_message_header_nodeid;
 
 /* fields for struct orf_token */
-static int hf_corosync_totemsrp_orf_token                      = -1;
-static int hf_corosync_totemsrp_orf_token_seq                  = -1;
-static int hf_corosync_totemsrp_orf_token_token_seq            = -1;
-static int hf_corosync_totemsrp_orf_token_aru                  = -1;
-static int hf_corosync_totemsrp_orf_token_aru_addr             = -1;
-static int hf_corosync_totemsrp_orf_token_backlog              = -1;
-static int hf_corosync_totemsrp_orf_token_fcc                  = -1;
-static int hf_corosync_totemsrp_orf_token_retrnas_flg          = -1;
-static int hf_corosync_totemsrp_orf_token_rtr_list_entries     = -1;
+static int hf_corosync_totemsrp_orf_token;
+static int hf_corosync_totemsrp_orf_token_seq;
+static int hf_corosync_totemsrp_orf_token_token_seq;
+static int hf_corosync_totemsrp_orf_token_aru;
+static int hf_corosync_totemsrp_orf_token_aru_addr;
+static int hf_corosync_totemsrp_orf_token_backlog;
+static int hf_corosync_totemsrp_orf_token_fcc;
+static int hf_corosync_totemsrp_orf_token_retrnas_flg;
+static int hf_corosync_totemsrp_orf_token_rtr_list_entries;
 
 /* field for struct memb_ring_id */
-static int hf_corosync_totemsrp_memb_ring_id                   = -1;
-static int hf_corosync_totemsrp_memb_ring_id_seq               = -1;
+static int hf_corosync_totemsrp_memb_ring_id;
+static int hf_corosync_totemsrp_memb_ring_id_seq;
 
 /* field for struct totem_ip_address */
-static int hf_corosync_totemsrp_ip_address                     = -1;
-static int hf_corosync_totemsrp_ip_address_nodeid              = -1;
-static int hf_corosync_totemsrp_ip_address_family              = -1;
-static int hf_corosync_totemsrp_ip_address_addr                = -1;
-static int hf_corosync_totemsrp_ip_address_addr4               = -1;
-static int hf_corosync_totemsrp_ip_address_addr4_padding       = -1;
-static int hf_corosync_totemsrp_ip_address_addr6               = -1;
+static int hf_corosync_totemsrp_ip_address;
+static int hf_corosync_totemsrp_ip_address_nodeid;
+static int hf_corosync_totemsrp_ip_address_family;
+static int hf_corosync_totemsrp_ip_address_addr;
+static int hf_corosync_totemsrp_ip_address_addr4;
+static int hf_corosync_totemsrp_ip_address_addr4_padding;
+static int hf_corosync_totemsrp_ip_address_addr6;
 
 /* field of struct mcast */
-static int hf_corosync_totemsrp_mcast                          = -1;
-static int hf_corosync_totemsrp_mcast_seq                      = -1;
-static int hf_corosync_totemsrp_mcast_this_seqno               = -1;
-static int hf_corosync_totemsrp_mcast_node_id                  = -1;
-static int hf_corosync_totemsrp_mcast_system_from              = -1;
-static int hf_corosync_totemsrp_mcast_guarantee                = -1;
+static int hf_corosync_totemsrp_mcast;
+static int hf_corosync_totemsrp_mcast_seq;
+static int hf_corosync_totemsrp_mcast_this_seqno;
+static int hf_corosync_totemsrp_mcast_node_id;
+static int hf_corosync_totemsrp_mcast_system_from;
+static int hf_corosync_totemsrp_mcast_guarantee;
 
 /* field of struct memb_merge_detect */
-static int hf_corosync_totemsrp_memb_merge_detect              = -1;
+static int hf_corosync_totemsrp_memb_merge_detect;
 
 /* field of struct struct srp_addr */
-static int hf_corosync_totemsrp_srp_addr                       = -1;
+static int hf_corosync_totemsrp_srp_addr;
 
 /* field of struct rtr_item */
-static int hf_corosync_totemsrp_rtr_item                       = -1;
-static int hf_corosync_totemsrp_rtr_item_seq                   = -1;
+static int hf_corosync_totemsrp_rtr_item;
+static int hf_corosync_totemsrp_rtr_item_seq;
 
 /* field of struct memb_join */
-static int hf_corosync_totemsrp_memb_join                      = -1;
-static int hf_corosync_totemsrp_memb_join_proc_list_entries    = -1;
-static int hf_corosync_totemsrp_memb_join_failed_list_entries  = -1;
-static int hf_corosync_totemsrp_memb_join_ring_seq             = -1;
+static int hf_corosync_totemsrp_memb_join;
+static int hf_corosync_totemsrp_memb_join_proc_list_entries;
+static int hf_corosync_totemsrp_memb_join_failed_list_entries;
+static int hf_corosync_totemsrp_memb_join_ring_seq;
 
 /* field of struct memb_commit_token  */
-static int hf_corosync_totemsrp_memb_commit_token              = -1;
-static int hf_corosync_totemsrp_memb_commit_token_token_seq    = -1;
-static int hf_corosync_totemsrp_memb_commit_token_retrans_flg  = -1;
-static int hf_corosync_totemsrp_memb_commit_token_memb_index   = -1;
-static int hf_corosync_totemsrp_memb_commit_token_addr_entries = -1;
+static int hf_corosync_totemsrp_memb_commit_token;
+static int hf_corosync_totemsrp_memb_commit_token_token_seq;
+static int hf_corosync_totemsrp_memb_commit_token_retrans_flg;
+static int hf_corosync_totemsrp_memb_commit_token_memb_index;
+static int hf_corosync_totemsrp_memb_commit_token_addr_entries;
 
 /* field of struct memb_commit_token_memb_entry  */
-static int hf_corosync_totemsrp_memb_commit_token_memb_entry                = -1;
-static int hf_corosync_totemsrp_memb_commit_token_memb_entry_aru            = -1;
-static int hf_corosync_totemsrp_memb_commit_token_memb_entry_high_delivered = -1;
-static int hf_corosync_totemsrp_memb_commit_token_memb_entry_received_flg   = -1;
+static int hf_corosync_totemsrp_memb_commit_token_memb_entry;
+static int hf_corosync_totemsrp_memb_commit_token_memb_entry_aru;
+static int hf_corosync_totemsrp_memb_commit_token_memb_entry_high_delivered;
+static int hf_corosync_totemsrp_memb_commit_token_memb_entry_received_flg;
 
 /* field of struct token_hold_cancel */
-static int hf_corosync_totemsrp_token_hold_cancel              = -1;
+static int hf_corosync_totemsrp_token_hold_cancel;
 
 /* Initialize the subtree pointers */
-static gint ett_corosync_totemsrp                              = -1;
-static gint ett_corosync_totemsrp_orf_token                    = -1;
-static gint ett_corosync_totemsrp_memb_ring_id                 = -1;
-static gint ett_corosync_totemsrp_ip_address                   = -1;
-static gint ett_corosync_totemsrp_mcast                        = -1;
-static gint ett_corosync_totemsrp_memb_merge_detect            = -1;
-static gint ett_corosync_totemsrp_srp_addr                     = -1;
-static gint ett_corosync_totemsrp_rtr_item                     = -1;
-static gint ett_corosync_totemsrp_memb_join                    = -1;
-static gint ett_corosync_totemsrp_memb_commit_token            = -1;
-static gint ett_corosync_totemsrp_memb_commit_token_memb_entry = -1;
-static gint ett_corosync_totemsrp_token_hold_cancel            = -1;
-static gint ett_corosync_totemsrp_memb_join_proc_list          = -1;
-static gint ett_corosync_totemsrp_memb_join_failed_list        = -1;
+static gint ett_corosync_totemsrp;
+static gint ett_corosync_totemsrp_orf_token;
+static gint ett_corosync_totemsrp_memb_ring_id;
+static gint ett_corosync_totemsrp_ip_address;
+static gint ett_corosync_totemsrp_mcast;
+static gint ett_corosync_totemsrp_memb_merge_detect;
+static gint ett_corosync_totemsrp_srp_addr;
+static gint ett_corosync_totemsrp_rtr_item;
+static gint ett_corosync_totemsrp_memb_join;
+static gint ett_corosync_totemsrp_memb_commit_token;
+static gint ett_corosync_totemsrp_memb_commit_token_memb_entry;
+static gint ett_corosync_totemsrp_token_hold_cancel;
+static gint ett_corosync_totemsrp_memb_join_proc_list;
+static gint ett_corosync_totemsrp_memb_join_failed_list;
 
 
 /*
diff --git a/epan/dissectors/packet-cose.c b/epan/dissectors/packet-cose.c
index 5f5a7e6e55..13bfbdcfd3 100644
--- a/epan/dissectors/packet-cose.c
+++ b/epan/dissectors/packet-cose.c
@@ -34,8 +34,8 @@ static const char *const proto_name_cose = "COSE";
 /// Protocol preferences and defaults
 
 /// Protocol handles
-static int proto_cose = -1;
-static int proto_cose_params = -1;
+static int proto_cose;
+static int proto_cose_params;
 
 /// Dissect opaque CBOR data
 static dissector_handle_t handle_cbor = NULL;
@@ -164,54 +164,54 @@ static const val64_string crv_vals[] = {
     {0, NULL},
 };
 
-static int hf_msg_tag = -1;
-static int hf_hdr_prot_bstr = -1;
-static int hf_hdr_unprot = -1;
-static int hf_payload_null = -1;
-static int hf_payload_bstr = -1;
-static int hf_cose_signature_list = -1;
-static int hf_cose_signature = -1;
-static int hf_signature = -1;
-static int hf_ciphertext_null = -1;
-static int hf_ciphertext_bstr = -1;
-static int hf_cose_recipient_list = -1;
-static int hf_cose_recipient = -1;
-static int hf_tag = -1;
-
-static int hf_hdr_label_int = -1;
-static int hf_hdr_label_tstr = -1;
-
-static int hf_hdr_salt = -1;
-static int hf_hdr_static_key = -1;
-static int hf_hdr_ephem_key = -1;
-static int hf_hdr_alg_int = -1;
-static int hf_hdr_alg_tstr = -1;
-static int hf_hdr_crit_list = -1;
-static int hf_hdr_ctype_uint = -1;
-static int hf_hdr_ctype_tstr = -1;
-static int hf_hdr_kid = -1;
-static int hf_hdr_iv = -1;
-static int hf_hdr_piv = -1;
-static int hf_hdr_x5bag = -1;
-static int hf_hdr_x5chain = -1;
-static int hf_hdr_x5t = -1;
-static int hf_hdr_x5t_hash = -1;
-static int hf_hdr_x5u = -1;
-
-static int hf_key = -1;
-
-static int hf_keyparam_kty_int = -1;
-static int hf_keyparam_kty_tstr = -1;
-static int hf_keyparam_keyops_list = -1;
-static int hf_keyparam_keyops_int = -1;
-static int hf_keyparam_keyops_tstr = -1;
-static int hf_keyparam_baseiv = -1;
-static int hf_keyparam_crv_int = -1;
-static int hf_keyparam_crv_tstr = -1;
-static int hf_keyparam_xcoord = -1;
-static int hf_keyparam_ycoord = -1;
-static int hf_keyparam_dcoord = -1;
-static int hf_keyparam_k = -1;
+static int hf_msg_tag;
+static int hf_hdr_prot_bstr;
+static int hf_hdr_unprot;
+static int hf_payload_null;
+static int hf_payload_bstr;
+static int hf_cose_signature_list;
+static int hf_cose_signature;
+static int hf_signature;
+static int hf_ciphertext_null;
+static int hf_ciphertext_bstr;
+static int hf_cose_recipient_list;
+static int hf_cose_recipient;
+static int hf_tag;
+
+static int hf_hdr_label_int;
+static int hf_hdr_label_tstr;
+
+static int hf_hdr_salt;
+static int hf_hdr_static_key;
+static int hf_hdr_ephem_key;
+static int hf_hdr_alg_int;
+static int hf_hdr_alg_tstr;
+static int hf_hdr_crit_list;
+static int hf_hdr_ctype_uint;
+static int hf_hdr_ctype_tstr;
+static int hf_hdr_kid;
+static int hf_hdr_iv;
+static int hf_hdr_piv;
+static int hf_hdr_x5bag;
+static int hf_hdr_x5chain;
+static int hf_hdr_x5t;
+static int hf_hdr_x5t_hash;
+static int hf_hdr_x5u;
+
+static int hf_key;
+
+static int hf_keyparam_kty_int;
+static int hf_keyparam_kty_tstr;
+static int hf_keyparam_keyops_list;
+static int hf_keyparam_keyops_int;
+static int hf_keyparam_keyops_tstr;
+static int hf_keyparam_baseiv;
+static int hf_keyparam_crv_int;
+static int hf_keyparam_crv_tstr;
+static int hf_keyparam_xcoord;
+static int hf_keyparam_ycoord;
+static int hf_keyparam_dcoord;
+static int hf_keyparam_k;
 
 /// Field definitions
 static hf_register_info fields[] = {
@@ -267,23 +267,23 @@ static hf_register_info fields[] = {
     {&hf_keyparam_k, {"Key", "cose.key.k", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 };
 
-static int ett_msg = -1;
-static int ett_sig_list = -1;
-static int ett_sig = -1;
-static int ett_recip_list = -1;
-static int ett_recip = -1;
-static int ett_prot_bstr = -1;
-static int ett_unprot = -1;
-static int ett_hdr_map = -1;
-static int ett_hdr_label = -1;
-static int ett_hdr_static_key = -1;
-static int ett_hdr_ephem_key = -1;
-static int ett_hdr_crit_list = -1;
-static int ett_hdr_x5cert_list = -1;
-static int ett_hdr_x5t_list = -1;
-static int ett_key = -1;
-static int ett_key_set = -1;
-static int ett_keyops_list = -1;
+static int ett_msg;
+static int ett_sig_list;
+static int ett_sig;
+static int ett_recip_list;
+static int ett_recip;
+static int ett_prot_bstr;
+static int ett_unprot;
+static int ett_hdr_map;
+static int ett_hdr_label;
+static int ett_hdr_static_key;
+static int ett_hdr_ephem_key;
+static int ett_hdr_crit_list;
+static int ett_hdr_x5cert_list;
+static int ett_hdr_x5t_list;
+static int ett_key;
+static int ett_key_set;
+static int ett_keyops_list;
 /// Tree structures
 static int *ett[] = {
     &ett_msg,
@@ -305,8 +305,8 @@ static int *ett[] = {
     &ett_keyops_list,
 };
 
-static expert_field ei_invalid_tag = EI_INIT;
-static expert_field ei_value_partial_decode = EI_INIT;
+static expert_field ei_invalid_tag;
+static expert_field ei_value_partial_decode;
 static ei_register_info expertitems[] = {
     {&ei_invalid_tag, { "cose.invalid_tag", PI_UNDECODED, PI_WARN, "COSE dissector did not match any known tag", EXPFILL}},
     {&ei_value_partial_decode, { "cose.partial_decode", PI_MALFORMED, PI_WARN, "Value is only partially decoded", EXPFILL}},
diff --git a/epan/dissectors/packet-coseventcomm.c b/epan/dissectors/packet-coseventcomm.c
index e7ad24a925..3e27859956 100644
--- a/epan/dissectors/packet-coseventcomm.c
+++ b/epan/dissectors/packet-coseventcomm.c
@@ -45,22 +45,22 @@ void proto_register_giop_coseventcomm(void);
 void proto_reg_handoff_giop_coseventcomm(void);
 
 /* Initialise the protocol and subtree pointers */
-static int proto_coseventcomm = -1;
-static gint ett_coseventcomm = -1;
+static int proto_coseventcomm;
+static gint ett_coseventcomm;
 
 
 /* Initialise the initial Alignment */
 static guint32  boundary = GIOP_HEADER_SIZE;  /* initial value */
 
-static int hf_operationrequest = -1;/* Request_Operation field */
+static int hf_operationrequest;/* Request_Operation field */
 
         /* Operation filters */
-static int hf_CosEventComm_PullSupplier_try_pull_has_event = -1;
+static int hf_CosEventComm_PullSupplier_try_pull_has_event;
         /* User exception filters */
         /* Expert info filters */
-static expert_field ei_coseventcomm_unknown_giop_msg = EI_INIT;
-static expert_field ei_coseventcomm_unknown_exception = EI_INIT;
-static expert_field ei_coseventcomm_unknown_reply_status = EI_INIT;
+static expert_field ei_coseventcomm_unknown_giop_msg;
+static expert_field ei_coseventcomm_unknown_exception;
+static expert_field ei_coseventcomm_unknown_reply_status;
 
 
 static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset);
diff --git a/epan/dissectors/packet-cosine.c b/epan/dissectors/packet-cosine.c
index 36f8fc581f..83325d922a 100644
--- a/epan/dissectors/packet-cosine.c
+++ b/epan/dissectors/packet-cosine.c
@@ -23,16 +23,16 @@
 void proto_register_cosine(void);
 void proto_reg_handoff_cosine(void);
 
-static int proto_cosine = -1;
-static int hf_pro = -1;
-static int hf_off = -1;
-static int hf_pri = -1;
-static int hf_rm = -1;
-static int hf_err = -1;
-static int hf_sar = -1;
-static int hf_channel_id = -1;
-
-static gint ett_raw = -1;
+static int proto_cosine;
+static int hf_pro;
+static int hf_off;
+static int hf_pri;
+static int hf_rm;
+static int hf_err;
+static int hf_sar;
+static int hf_channel_id;
+
+static gint ett_raw;
 
 static dissector_handle_t cosine_handle;
 static dissector_handle_t eth_withoutfcs_handle;
diff --git a/epan/dissectors/packet-cosnaming.c b/epan/dissectors/packet-cosnaming.c
index fbbe0c1944..af423a8b25 100644
--- a/epan/dissectors/packet-cosnaming.c
+++ b/epan/dissectors/packet-cosnaming.c
@@ -45,43 +45,43 @@ void proto_register_giop_cosnaming(void);
 void proto_reg_handoff_giop_cosnaming(void);
 
 /* Initialise the protocol and subtree pointers */
-static int proto_cosnaming = -1;
-static gint ett_cosnaming = -1;
+static int proto_cosnaming;
+static gint ett_cosnaming;
 
 
 /* Initialise the initial Alignment */
 static guint32  boundary = GIOP_HEADER_SIZE;  /* initial value */
 
-static int hf_operationrequest = -1;/* Request_Operation field */
+static int hf_operationrequest;/* Request_Operation field */
 
         /* Operation filters */
-static int hf_CosNaming_NamingContext_bind_n_loop = -1;
-static int hf_CosNaming_NamingContext_rebind_n_loop = -1;
-static int hf_CosNaming_NamingContext_bind_context_n_loop = -1;
-static int hf_CosNaming_NamingContext_rebind_context_n_loop = -1;
-static int hf_CosNaming_NamingContext_resolve_n_loop = -1;
-static int hf_CosNaming_NamingContext_unbind_n_loop = -1;
-static int hf_CosNaming_NamingContext_bind_new_context_n_loop = -1;
-static int hf_CosNaming_NamingContext_list_how_many = -1;
-static int hf_CosNaming_NamingContext_list_bl_loop = -1;
-static int hf_CosNaming_BindingIterator_next_one_return = -1;
-static int hf_CosNaming_BindingIterator_next_n_return = -1;
-static int hf_CosNaming_BindingIterator_next_n_how_many = -1;
-static int hf_CosNaming_BindingIterator_next_n_bl_loop = -1;
+static int hf_CosNaming_NamingContext_bind_n_loop;
+static int hf_CosNaming_NamingContext_rebind_n_loop;
+static int hf_CosNaming_NamingContext_bind_context_n_loop;
+static int hf_CosNaming_NamingContext_rebind_context_n_loop;
+static int hf_CosNaming_NamingContext_resolve_n_loop;
+static int hf_CosNaming_NamingContext_unbind_n_loop;
+static int hf_CosNaming_NamingContext_bind_new_context_n_loop;
+static int hf_CosNaming_NamingContext_list_how_many;
+static int hf_CosNaming_NamingContext_list_bl_loop;
+static int hf_CosNaming_BindingIterator_next_one_return;
+static int hf_CosNaming_BindingIterator_next_n_return;
+static int hf_CosNaming_BindingIterator_next_n_how_many;
+static int hf_CosNaming_BindingIterator_next_n_bl_loop;
         /* Struct filters */
-static int hf_CosNaming_NameComponent_id = -1;
-static int hf_CosNaming_NameComponent_kind = -1;
-static int hf_CosNaming_Binding_binding_name_loop = -1;
-static int hf_CosNaming_Binding_binding_type = -1;
+static int hf_CosNaming_NameComponent_id;
+static int hf_CosNaming_NameComponent_kind;
+static int hf_CosNaming_Binding_binding_name_loop;
+static int hf_CosNaming_Binding_binding_type;
         /* User exception filters */
-static int hf_CosNaming_NamingContext_NotFound_why = -1;
-static int hf_CosNaming_NamingContext_NotFound_rest_of_name_loop = -1;
-static int hf_CosNaming_NamingContext_CannotProceed_cxt = -1;
-static int hf_CosNaming_NamingContext_CannotProceed_rest_of_name_loop = -1;
+static int hf_CosNaming_NamingContext_NotFound_why;
+static int hf_CosNaming_NamingContext_NotFound_rest_of_name_loop;
+static int hf_CosNaming_NamingContext_CannotProceed_cxt;
+static int hf_CosNaming_NamingContext_CannotProceed_rest_of_name_loop;
         /* Expert info filters */
-static expert_field ei_cosnaming_unknown_giop_msg = EI_INIT;
-static expert_field ei_cosnaming_unknown_exception = EI_INIT;
-static expert_field ei_cosnaming_unknown_reply_status = EI_INIT;
+static expert_field ei_cosnaming_unknown_giop_msg;
+static expert_field ei_cosnaming_unknown_exception;
+static expert_field ei_cosnaming_unknown_reply_status;
 
 
 static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset);
diff --git a/epan/dissectors/packet-couchbase.c b/epan/dissectors/packet-couchbase.c
index 4dc4275d74..f3cfb2a575 100644
--- a/epan/dissectors/packet-couchbase.c
+++ b/epan/dissectors/packet-couchbase.c
@@ -433,232 +433,232 @@ static bool is_request_magic(guint8 magic) {
 void proto_register_couchbase(void);
 void proto_reg_handoff_couchbase(void);
 
-static int proto_couchbase = -1;
-
-static int hf_magic = -1;
-static int hf_opcode = -1;
-static int hf_server_opcode = -1;
-static int hf_extlength = -1;
-static int hf_keylength = -1;
-static int hf_value_length = -1;
-static int hf_datatype = -1;
-static int hf_datatype_json = -1;
-static int hf_datatype_snappy = -1;
-static int hf_datatype_xattr = -1;
-static int hf_vbucket = -1;
-static int hf_status = -1;
-static int hf_total_bodylength = -1;
-static int hf_opaque = -1;
-static int hf_cas = -1;
-static int hf_ttp = -1;
-static int hf_ttr = -1;
-static int hf_collection_key_id = -1;
-static int hf_collection_key_logical = -1;
-static int hf_collection_manifest_id = -1;
-
-static int hf_flex_extras_length = -1;
-static int hf_flex_keylength = -1;
-static int hf_extras = -1;
-static int hf_extras_flags = -1;
-static int hf_extras_flags_backfill = -1;
-static int hf_extras_flags_dump = -1;
-static int hf_extras_flags_list_vbuckets = -1;
-static int hf_extras_flags_takeover_vbuckets = -1;
-static int hf_extras_flags_support_ack = -1;
-static int hf_extras_flags_request_keys_only = -1;
-static int hf_extras_flags_checkpoint = -1;
-static int hf_extras_flags_dcp_connection_type = -1;
-static int hf_extras_flags_dcp_add_stream_takeover = -1;
-static int hf_extras_flags_dcp_add_stream_diskonly = -1;
-static int hf_extras_flags_dcp_add_stream_latest = -1;
-static int hf_extras_flags_dcp_snapshot_marker_memory = -1;
-static int hf_extras_flags_dcp_snapshot_marker_disk = -1;
-static int hf_extras_flags_dcp_snapshot_marker_chk = -1;
-static int hf_extras_flags_dcp_snapshot_marker_ack = -1;
-static int hf_extras_flags_dcp_snapshot_marker_history = -1;
-static int hf_extras_flags_dcp_snapshot_marker_may_contain_dups = -1;
-static int hf_extras_flags_dcp_include_xattrs = -1;
-static int hf_extras_flags_dcp_no_value = -1;
-static int hf_extras_flags_dcp_include_delete_times = -1;
-static int hf_extras_flags_dcp_collections = -1;
-static int hf_extras_flags_dcp_oso_snapshot_begin = -1;
-static int hf_extras_flags_dcp_oso_snapshot_end = -1;
-static int hf_subdoc_doc_flags = -1;
-static int hf_subdoc_doc_flags_mkdoc = -1;
-static int hf_subdoc_doc_flags_add = -1;
-static int hf_subdoc_doc_flags_accessdeleted = -1;
-static int hf_subdoc_doc_flags_createasdeleted = -1;
-static int hf_subdoc_doc_flags_revivedocument = -1;
-static int hf_subdoc_doc_flags_replicaread = -1;
-static int hf_subdoc_doc_flags_reserved = -1;
-static int hf_subdoc_flags = -1;
-static int hf_subdoc_flags_mkdirp = -1;
-static int hf_subdoc_flags_xattrpath = -1;
-static int hf_subdoc_flags_expandmacros = -1;
-static int hf_subdoc_flags_reserved = -1;
-static int hf_extras_seqno = -1;
-static int hf_extras_mutation_seqno = -1;
-static int hf_extras_opaque = -1;
-static int hf_extras_reserved = -1;
-static int hf_extras_start_seqno = -1;
-static int hf_extras_end_seqno = -1;
-static int hf_extras_high_completed_seqno = -1;
-static int hf_extras_max_visible_seqno = -1;
-static int hf_extras_timestamp = -1;
-static int hf_extras_marker_version = -1;
-static int hf_extras_vbucket_uuid = -1;
-static int hf_extras_snap_start_seqno = -1;
-static int hf_extras_snap_end_seqno = -1;
-static int hf_extras_expiration = -1;
-static int hf_extras_delta = -1;
-static int hf_extras_initial = -1;
-static int hf_extras_unknown = -1;
-static int hf_extras_by_seqno = -1;
-static int hf_extras_rev_seqno = -1;
-static int hf_extras_prepared_seqno = -1;
-static int hf_extras_commit_seqno = -1;
-static int hf_extras_abort_seqno = -1;
-static int hf_extras_deleted = -1;
-static int hf_extras_lock_time = -1;
-static int hf_extras_nmeta = -1;
-static int hf_extras_nru = -1;
-static int hf_extras_bytes_to_ack = -1;
-static int hf_extras_delete_time = -1;
-static int hf_extras_delete_unused = -1;
-static int hf_extras_system_event_id = -1;
-static int hf_extras_system_event_version = -1;
-static int hf_extras_pathlen = -1;
-static int hf_extras_dcp_oso_snapshot_flags = -1;
-static int hf_server_extras_cccp_epoch = -1;
-static int hf_server_extras_cccp_revno = -1;
-static int hf_server_clustermap_value = -1;
-static int hf_server_authentication = -1;
-static int hf_server_external_users = -1;
-static int hf_server_get_authorization = -1;
-
-static int hf_key = -1;
-static int hf_path = -1;
-static int hf_value = -1;
-static int hf_uint64_response = -1;
-static int hf_observe = -1;
-static int hf_observe_vbucket = -1;
-static int hf_observe_keylength = -1;
-static int hf_observe_key = -1;
-static int hf_observe_status = -1;
-static int hf_observe_cas = -1;
-static int hf_observe_vbucket_uuid = -1;
-static int hf_observe_failed_over = -1;
-static int hf_observe_last_persisted_seqno = -1;
-static int hf_observe_current_seqno = -1;
-static int hf_observe_old_vbucket_uuid = -1;
-static int hf_observe_last_received_seqno = -1;
-
-static int hf_get_errmap_version = -1;
-
-static int hf_failover_log = -1;
-static int hf_failover_log_size = -1;
-static int hf_failover_log_vbucket_uuid = -1;
-static int hf_failover_log_vbucket_seqno = -1;
-
-static int hf_vbucket_states = -1;
-static int hf_vbucket_states_state = -1;
-static int hf_vbucket_states_size = -1;
-static int hf_vbucket_states_id = -1;
-static int hf_vbucket_states_seqno = -1;
-
-static int hf_bucket_type = -1;
-static int hf_bucket_config = -1;
-static int hf_config_key = -1;
-static int hf_config_value = -1;
-
-static int hf_multipath_opcode = -1;
-static int hf_multipath_index = -1;
-static int hf_multipath_pathlen = -1;
-static int hf_multipath_path = -1;
-static int hf_multipath_valuelen = -1;
-static int hf_multipath_value = -1;
-
-static int hf_meta_flags = -1;
-static int hf_meta_expiration = -1;
-static int hf_meta_revseqno = -1;
-static int hf_meta_cas = -1;
-static int hf_skip_conflict = -1;
-static int hf_force_accept = -1;
-static int hf_regenerate_cas = -1;
-static int hf_force_meta = -1;
-static int hf_is_expiration = -1;
-static int hf_meta_options = -1;
-static int hf_metalen = -1;
-static int hf_meta_reqextmeta = -1;
-static int hf_meta_deleted = -1;
-static int hf_exptime = -1;
-static int hf_extras_meta_seqno = -1;
-static int hf_confres = -1;
-static int hf_hello_features = -1;
-static int hf_hello_features_feature = -1;
-
-static int hf_xattr_length = -1;
-static int hf_xattr_pair_length = -1;
-static int hf_xattr_key = -1;
-static int hf_xattr_value = -1;
-static int hf_xattrs = -1;
-
-static int hf_flex_extras = -1;
-static int hf_flex_extras_n = -1;
-static int hf_flex_frame_id_byte0 = -1;
-static int hf_flex_frame_id_req = -1;
-static int hf_flex_frame_id_res = -1;
-static int hf_flex_frame_id_req_esc = -1;
-static int hf_flex_frame_id_res_esc = -1;
-static int hf_flex_frame_len = -1;
-static int hf_flex_frame_len_esc = -1;
-static int hf_flex_frame_tracing_duration = -1;
-static int hf_flex_frame_ru_count = -1;
-static int hf_flex_frame_wu_count = -1;
-static int hf_flex_frame_durability_req = -1;
-static int hf_flex_frame_dcp_stream_id = -1;
-static int hf_flex_frame_impersonated_user = -1;
-
-static int hf_range_scan_uuid  = -1;
-static int hf_range_scan_item_limit = -1;
-static int hf_range_scan_time_limit = -1;
-static int hf_range_scan_byte_limit = -1;
-
-static expert_field ei_warn_shall_not_have_value = EI_INIT;
-static expert_field ei_warn_shall_not_have_extras = EI_INIT;
-static expert_field ei_warn_shall_not_have_key = EI_INIT;
-static expert_field ei_compression_error = EI_INIT;
-static expert_field ei_warn_unknown_flex_unsupported = EI_INIT;
-static expert_field ei_warn_unknown_flex_id = EI_INIT;
-static expert_field ei_warn_unknown_flex_len = EI_INIT;
-
-static expert_field ei_value_missing = EI_INIT;
-static expert_field ei_warn_must_have_extras = EI_INIT;
-static expert_field ei_warn_must_have_key = EI_INIT;
-static expert_field ei_warn_illegal_extras_length = EI_INIT;
-static expert_field ei_warn_illegal_value_length = EI_INIT;
-static expert_field ei_warn_unknown_magic_byte = EI_INIT;
-static expert_field ei_warn_unknown_opcode = EI_INIT;
-static expert_field ei_warn_unknown_extras = EI_INIT;
-static expert_field ei_note_status_code = EI_INIT;
-static expert_field ei_separator_not_found = EI_INIT;
-static expert_field ei_illegal_value = EI_INIT;
-
-static gint ett_couchbase = -1;
-static gint ett_extras = -1;
-static gint ett_extras_flags = -1;
-static gint ett_observe = -1;
-static gint ett_failover_log = -1;
-static gint ett_vbucket_states = -1;
-static gint ett_multipath = -1;
-static gint ett_config = -1;
-static gint ett_config_key = -1;
-static gint ett_hello_features = -1;
-static gint ett_datatype = -1;
-static gint ett_xattrs = -1;
-static gint ett_xattr_pair = -1;
-static gint ett_flex_frame_extras = -1;
-static gint ett_collection_key = -1;
+static int proto_couchbase;
+
+static int hf_magic;
+static int hf_opcode;
+static int hf_server_opcode;
+static int hf_extlength;
+static int hf_keylength;
+static int hf_value_length;
+static int hf_datatype;
+static int hf_datatype_json;
+static int hf_datatype_snappy;
+static int hf_datatype_xattr;
+static int hf_vbucket;
+static int hf_status;
+static int hf_total_bodylength;
+static int hf_opaque;
+static int hf_cas;
+static int hf_ttp;
+static int hf_ttr;
+static int hf_collection_key_id;
+static int hf_collection_key_logical;
+static int hf_collection_manifest_id;
+
+static int hf_flex_extras_length;
+static int hf_flex_keylength;
+static int hf_extras;
+static int hf_extras_flags;
+static int hf_extras_flags_backfill;
+static int hf_extras_flags_dump;
+static int hf_extras_flags_list_vbuckets;
+static int hf_extras_flags_takeover_vbuckets;
+static int hf_extras_flags_support_ack;
+static int hf_extras_flags_request_keys_only;
+static int hf_extras_flags_checkpoint;
+static int hf_extras_flags_dcp_connection_type;
+static int hf_extras_flags_dcp_add_stream_takeover;
+static int hf_extras_flags_dcp_add_stream_diskonly;
+static int hf_extras_flags_dcp_add_stream_latest;
+static int hf_extras_flags_dcp_snapshot_marker_memory;
+static int hf_extras_flags_dcp_snapshot_marker_disk;
+static int hf_extras_flags_dcp_snapshot_marker_chk;
+static int hf_extras_flags_dcp_snapshot_marker_ack;
+static int hf_extras_flags_dcp_snapshot_marker_history;
+static int hf_extras_flags_dcp_snapshot_marker_may_contain_dups;
+static int hf_extras_flags_dcp_include_xattrs;
+static int hf_extras_flags_dcp_no_value;
+static int hf_extras_flags_dcp_include_delete_times;
+static int hf_extras_flags_dcp_collections;
+static int hf_extras_flags_dcp_oso_snapshot_begin;
+static int hf_extras_flags_dcp_oso_snapshot_end;
+static int hf_subdoc_doc_flags;
+static int hf_subdoc_doc_flags_mkdoc;
+static int hf_subdoc_doc_flags_add;
+static int hf_subdoc_doc_flags_accessdeleted;
+static int hf_subdoc_doc_flags_createasdeleted;
+static int hf_subdoc_doc_flags_revivedocument;
+static int hf_subdoc_doc_flags_replicaread;
+static int hf_subdoc_doc_flags_reserved;
+static int hf_subdoc_flags;
+static int hf_subdoc_flags_mkdirp;
+static int hf_subdoc_flags_xattrpath;
+static int hf_subdoc_flags_expandmacros;
+static int hf_subdoc_flags_reserved;
+static int hf_extras_seqno;
+static int hf_extras_mutation_seqno;
+static int hf_extras_opaque;
+static int hf_extras_reserved;
+static int hf_extras_start_seqno;
+static int hf_extras_end_seqno;
+static int hf_extras_high_completed_seqno;
+static int hf_extras_max_visible_seqno;
+static int hf_extras_timestamp;
+static int hf_extras_marker_version;
+static int hf_extras_vbucket_uuid;
+static int hf_extras_snap_start_seqno;
+static int hf_extras_snap_end_seqno;
+static int hf_extras_expiration;
+static int hf_extras_delta;
+static int hf_extras_initial;
+static int hf_extras_unknown;
+static int hf_extras_by_seqno;
+static int hf_extras_rev_seqno;
+static int hf_extras_prepared_seqno;
+static int hf_extras_commit_seqno;
+static int hf_extras_abort_seqno;
+static int hf_extras_deleted;
+static int hf_extras_lock_time;
+static int hf_extras_nmeta;
+static int hf_extras_nru;
+static int hf_extras_bytes_to_ack;
+static int hf_extras_delete_time;
+static int hf_extras_delete_unused;
+static int hf_extras_system_event_id;
+static int hf_extras_system_event_version;
+static int hf_extras_pathlen;
+static int hf_extras_dcp_oso_snapshot_flags;
+static int hf_server_extras_cccp_epoch;
+static int hf_server_extras_cccp_revno;
+static int hf_server_clustermap_value;
+static int hf_server_authentication;
+static int hf_server_external_users;
+static int hf_server_get_authorization;
+
+static int hf_key;
+static int hf_path;
+static int hf_value;
+static int hf_uint64_response;
+static int hf_observe;
+static int hf_observe_vbucket;
+static int hf_observe_keylength;
+static int hf_observe_key;
+static int hf_observe_status;
+static int hf_observe_cas;
+static int hf_observe_vbucket_uuid;
+static int hf_observe_failed_over;
+static int hf_observe_last_persisted_seqno;
+static int hf_observe_current_seqno;
+static int hf_observe_old_vbucket_uuid;
+static int hf_observe_last_received_seqno;
+
+static int hf_get_errmap_version;
+
+static int hf_failover_log;
+static int hf_failover_log_size;
+static int hf_failover_log_vbucket_uuid;
+static int hf_failover_log_vbucket_seqno;
+
+static int hf_vbucket_states;
+static int hf_vbucket_states_state;
+static int hf_vbucket_states_size;
+static int hf_vbucket_states_id;
+static int hf_vbucket_states_seqno;
+
+static int hf_bucket_type;
+static int hf_bucket_config;
+static int hf_config_key;
+static int hf_config_value;
+
+static int hf_multipath_opcode;
+static int hf_multipath_index;
+static int hf_multipath_pathlen;
+static int hf_multipath_path;
+static int hf_multipath_valuelen;
+static int hf_multipath_value;
+
+static int hf_meta_flags;
+static int hf_meta_expiration;
+static int hf_meta_revseqno;
+static int hf_meta_cas;
+static int hf_skip_conflict;
+static int hf_force_accept;
+static int hf_regenerate_cas;
+static int hf_force_meta;
+static int hf_is_expiration;
+static int hf_meta_options;
+static int hf_metalen;
+static int hf_meta_reqextmeta;
+static int hf_meta_deleted;
+static int hf_exptime;
+static int hf_extras_meta_seqno;
+static int hf_confres;
+static int hf_hello_features;
+static int hf_hello_features_feature;
+
+static int hf_xattr_length;
+static int hf_xattr_pair_length;
+static int hf_xattr_key;
+static int hf_xattr_value;
+static int hf_xattrs;
+
+static int hf_flex_extras;
+static int hf_flex_extras_n;
+static int hf_flex_frame_id_byte0;
+static int hf_flex_frame_id_req;
+static int hf_flex_frame_id_res;
+static int hf_flex_frame_id_req_esc;
+static int hf_flex_frame_id_res_esc;
+static int hf_flex_frame_len;
+static int hf_flex_frame_len_esc;
+static int hf_flex_frame_tracing_duration;
+static int hf_flex_frame_ru_count;
+static int hf_flex_frame_wu_count;
+static int hf_flex_frame_durability_req;
+static int hf_flex_frame_dcp_stream_id;
+static int hf_flex_frame_impersonated_user;
+
+static int hf_range_scan_uuid;
+static int hf_range_scan_item_limit;
+static int hf_range_scan_time_limit;
+static int hf_range_scan_byte_limit;
+
+static expert_field ei_warn_shall_not_have_value;
+static expert_field ei_warn_shall_not_have_extras;
+static expert_field ei_warn_shall_not_have_key;
+static expert_field ei_compression_error;
+static expert_field ei_warn_unknown_flex_unsupported;
+static expert_field ei_warn_unknown_flex_id;
+static expert_field ei_warn_unknown_flex_len;
+
+static expert_field ei_value_missing;
+static expert_field ei_warn_must_have_extras;
+static expert_field ei_warn_must_have_key;
+static expert_field ei_warn_illegal_extras_length;
+static expert_field ei_warn_illegal_value_length;
+static expert_field ei_warn_unknown_magic_byte;
+static expert_field ei_warn_unknown_opcode;
+static expert_field ei_warn_unknown_extras;
+static expert_field ei_note_status_code;
+static expert_field ei_separator_not_found;
+static expert_field ei_illegal_value;
+
+static gint ett_couchbase;
+static gint ett_extras;
+static gint ett_extras_flags;
+static gint ett_observe;
+static gint ett_failover_log;
+static gint ett_vbucket_states;
+static gint ett_multipath;
+static gint ett_config;
+static gint ett_config_key;
+static gint ett_hello_features;
+static gint ett_datatype;
+static gint ett_xattrs;
+static gint ett_xattr_pair;
+static gint ett_flex_frame_extras;
+static gint ett_collection_key;
 
 static const value_string magic_vals[] = {
   { MAGIC_CLIENT_REQUEST, "Request" },
diff --git a/epan/dissectors/packet-cp2179.c b/epan/dissectors/packet-cp2179.c
index 6ace24338b..7b147100a3 100644
--- a/epan/dissectors/packet-cp2179.c
+++ b/epan/dissectors/packet-cp2179.c
@@ -213,83 +213,83 @@ typedef struct {
 } request_frame;
 
 
-static int proto_cp2179 = -1;
+static int proto_cp2179;
 
 /* Initialize the subtree pointers */
-static gint ett_cp2179 = -1;
-static gint ett_cp2179_header = -1;
-static gint ett_cp2179_addr = -1;
-static gint ett_cp2179_fc = -1;
-static gint ett_cp2179_data = -1;
-static gint ett_cp2179_subdata = -1;
-static gint ett_cp2179_event   = -1;
+static gint ett_cp2179;
+static gint ett_cp2179_header;
+static gint ett_cp2179_addr;
+static gint ett_cp2179_fc;
+static gint ett_cp2179_data;
+static gint ett_cp2179_subdata;
+static gint ett_cp2179_event;
 
 /* Initialize the protocol and registered fields */
-static int hf_cp2179_request_frame = -1;
-static int hf_cp2179_rtu_address = -1;
-static int hf_cp2179_master_address = -1;
-static int hf_cp2179_function_code = -1;
-static int hf_cp2179_nop_flag = -1;
-static int hf_cp2179_rst_flag = -1;
-static int hf_cp2179_reserved = -1;
-static int hf_cp2179_command_code = -1;
-static int hf_cp2179_command_code_fc04 = -1;
-static int hf_cp2179_command_code_fc20 = -1;
-static int hf_cp2179_sbo_request_point = -1;
-static int hf_cp2179_resetacc_request_point = -1;
-static int hf_cp2179_speccalc_request_point = -1;
-static int hf_cp2179_scaninc_startreq_point = -1;
-static int hf_cp2179_scaninc_stopreq_point = -1;
-static int hf_cp2179_number_characters = -1;
-static int hf_cp2179_analog_16bit = -1;
-static int hf_cp2179_accumulator = -1;
-static int hf_cp2179_crc = -1;
-/* static int hf_cp2179_data_field = -1; */
-static int hf_cp2179_status_byte = -1;
-static int hf_cp2179_port_status_byte = -1;
-static int hf_cp2179_simplestatusbit  = -1;
-static int hf_cp2179_simplestatusbit0 = -1;
-static int hf_cp2179_simplestatusbit1 = -1;
-static int hf_cp2179_simplestatusbit2 = -1;
-static int hf_cp2179_simplestatusbit3 = -1;
-static int hf_cp2179_simplestatusbit4 = -1;
-static int hf_cp2179_simplestatusbit5 = -1;
-static int hf_cp2179_simplestatusbit6 = -1;
-static int hf_cp2179_simplestatusbit7 = -1;
-static int hf_cp2179_simplestatusbit8 = -1;
-static int hf_cp2179_simplestatusbit9 = -1;
-static int hf_cp2179_simplestatusbit10 = -1;
-static int hf_cp2179_simplestatusbit11 = -1;
-static int hf_cp2179_simplestatusbit12 = -1;
-static int hf_cp2179_simplestatusbit13 = -1;
-static int hf_cp2179_simplestatusbit14 = -1;
-static int hf_cp2179_simplestatusbit15 = -1;
-static int hf_cp2179_specialcalc       = -1;
-static int hf_cp2179_2bitstatus        = -1;
-static int hf_cp2179_2bitstatuschg0    = -1;
-static int hf_cp2179_2bitstatuschg1    = -1;
-static int hf_cp2179_2bitstatuschg2    = -1;
-static int hf_cp2179_2bitstatuschg3    = -1;
-static int hf_cp2179_2bitstatuschg4    = -1;
-static int hf_cp2179_2bitstatuschg5    = -1;
-static int hf_cp2179_2bitstatuschg6    = -1;
-static int hf_cp2179_2bitstatuschg7    = -1;
-static int hf_cp2179_2bitstatusstatus0 = -1;
-static int hf_cp2179_2bitstatusstatus1 = -1;
-static int hf_cp2179_2bitstatusstatus2 = -1;
-static int hf_cp2179_2bitstatusstatus3 = -1;
-static int hf_cp2179_2bitstatusstatus4 = -1;
-static int hf_cp2179_2bitstatusstatus5 = -1;
-static int hf_cp2179_2bitstatusstatus6 = -1;
-static int hf_cp2179_2bitstatusstatus7 = -1;
-static int hf_cp2179_timetag_moredata  = -1;
-static int hf_cp2179_timetag_numsets   = -1;
-static int hf_cp2179_timetag_event_type            = -1;
-static int hf_cp2179_timetag_event_date_hundreds   = -1;
-static int hf_cp2179_timetag_event_date_tens       = -1;
-static int hf_cp2179_timetag_event_hour            = -1;
-static int hf_cp2179_timetag_event_minute          = -1;
-static int hf_cp2179_timetag_event_second          = -1;
+static int hf_cp2179_request_frame;
+static int hf_cp2179_rtu_address;
+static int hf_cp2179_master_address;
+static int hf_cp2179_function_code;
+static int hf_cp2179_nop_flag;
+static int hf_cp2179_rst_flag;
+static int hf_cp2179_reserved;
+static int hf_cp2179_command_code;
+static int hf_cp2179_command_code_fc04;
+static int hf_cp2179_command_code_fc20;
+static int hf_cp2179_sbo_request_point;
+static int hf_cp2179_resetacc_request_point;
+static int hf_cp2179_speccalc_request_point;
+static int hf_cp2179_scaninc_startreq_point;
+static int hf_cp2179_scaninc_stopreq_point;
+static int hf_cp2179_number_characters;
+static int hf_cp2179_analog_16bit;
+static int hf_cp2179_accumulator;
+static int hf_cp2179_crc;
+/* static int hf_cp2179_data_field; */
+static int hf_cp2179_status_byte;
+static int hf_cp2179_port_status_byte;
+static int hf_cp2179_simplestatusbit;
+static int hf_cp2179_simplestatusbit0;
+static int hf_cp2179_simplestatusbit1;
+static int hf_cp2179_simplestatusbit2;
+static int hf_cp2179_simplestatusbit3;
+static int hf_cp2179_simplestatusbit4;
+static int hf_cp2179_simplestatusbit5;
+static int hf_cp2179_simplestatusbit6;
+static int hf_cp2179_simplestatusbit7;
+static int hf_cp2179_simplestatusbit8;
+static int hf_cp2179_simplestatusbit9;
+static int hf_cp2179_simplestatusbit10;
+static int hf_cp2179_simplestatusbit11;
+static int hf_cp2179_simplestatusbit12;
+static int hf_cp2179_simplestatusbit13;
+static int hf_cp2179_simplestatusbit14;
+static int hf_cp2179_simplestatusbit15;
+static int hf_cp2179_specialcalc;
+static int hf_cp2179_2bitstatus;
+static int hf_cp2179_2bitstatuschg0;
+static int hf_cp2179_2bitstatuschg1;
+static int hf_cp2179_2bitstatuschg2;
+static int hf_cp2179_2bitstatuschg3;
+static int hf_cp2179_2bitstatuschg4;
+static int hf_cp2179_2bitstatuschg5;
+static int hf_cp2179_2bitstatuschg6;
+static int hf_cp2179_2bitstatuschg7;
+static int hf_cp2179_2bitstatusstatus0;
+static int hf_cp2179_2bitstatusstatus1;
+static int hf_cp2179_2bitstatusstatus2;
+static int hf_cp2179_2bitstatusstatus3;
+static int hf_cp2179_2bitstatusstatus4;
+static int hf_cp2179_2bitstatusstatus5;
+static int hf_cp2179_2bitstatusstatus6;
+static int hf_cp2179_2bitstatusstatus7;
+static int hf_cp2179_timetag_moredata;
+static int hf_cp2179_timetag_numsets;
+static int hf_cp2179_timetag_event_type;
+static int hf_cp2179_timetag_event_date_hundreds;
+static int hf_cp2179_timetag_event_date_tens;
+static int hf_cp2179_timetag_event_hour;
+static int hf_cp2179_timetag_event_minute;
+static int hf_cp2179_timetag_event_second;
 
 
 static dissector_handle_t cp2179_handle;
diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c
index 8376f19246..59f1a22f27 100644
--- a/epan/dissectors/packet-cpfi.c
+++ b/epan/dissectors/packet-cpfi.c
@@ -51,30 +51,30 @@ static guint gbl_cpfi_ttot_udp_port = CPFI_DEFAULT_TTOT_UDP_PORT;
 static gboolean cpfi_arrow_moves    = TRUE;
 
 /* Initialize the protocol and registered fields */
-static int proto_cpfi = -1;
-static int hf_cpfi_word_one = -1;
-static int hf_cpfi_word_two = -1;
+static int proto_cpfi;
+static int hf_cpfi_word_one;
+static int hf_cpfi_word_two;
 /* SOF word 1: */
-static int hf_cpfi_frame_type = -1;
-static int hf_cpfi_source = -1;
-static int hf_cpfi_dest = -1;
-static int hf_cpfi_SOF_type = -1;
-static int hf_cpfi_speed = -1;
-static int hf_cpfi_OPM_error = -1;
-static int hf_cpfi_from_LCM = -1;
+static int hf_cpfi_frame_type;
+static int hf_cpfi_source;
+static int hf_cpfi_dest;
+static int hf_cpfi_SOF_type;
+static int hf_cpfi_speed;
+static int hf_cpfi_OPM_error;
+static int hf_cpfi_from_LCM;
 /* EOF */
-static int hf_cpfi_CRC_32 = -1;
-static int hf_cpfi_EOF_type = -1;
+static int hf_cpfi_CRC_32;
+static int hf_cpfi_EOF_type;
 /* Hidden items */
-static int hf_cpfi_t_instance = -1;
-static int hf_cpfi_t_src_instance = -1;
-static int hf_cpfi_t_dst_instance = -1;
-static int hf_cpfi_t_board = -1;
-static int hf_cpfi_t_src_board = -1;
-static int hf_cpfi_t_dst_board = -1;
-static int hf_cpfi_t_port = -1;
-static int hf_cpfi_t_src_port = -1;
-static int hf_cpfi_t_dst_port = -1;
+static int hf_cpfi_t_instance;
+static int hf_cpfi_t_src_instance;
+static int hf_cpfi_t_dst_instance;
+static int hf_cpfi_t_board;
+static int hf_cpfi_t_src_board;
+static int hf_cpfi_t_dst_board;
+static int hf_cpfi_t_port;
+static int hf_cpfi_t_src_port;
+static int hf_cpfi_t_dst_port;
 
 static char src_str[20];
 static char dst_str[20];
@@ -87,9 +87,9 @@ static const char direction_and_port_string[] = "[%s %s %s] ";
 
 
 /* Initialize the subtree pointers */
-static gint ett_cpfi = -1;
-static gint ett_cpfi_header = -1;
-static gint ett_cpfi_footer = -1;
+static gint ett_cpfi;
+static gint ett_cpfi_header;
+static gint ett_cpfi_footer;
 
 static dissector_handle_t cpfi_handle;
 static dissector_handle_t fc_handle;
diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c
index 3db88678b7..a6533fa9c3 100644
--- a/epan/dissectors/packet-cpha.c
+++ b/epan/dissectors/packet-cpha.c
@@ -18,44 +18,44 @@ void proto_reg_handoff_cpha(void);
 
 static dissector_handle_t cpha_handle;
 
-static int proto_cphap = -1;
-
-static int hf_magic_number = -1;
-static int hf_cpha_protocol_ver = -1;
-static int hf_cluster_number = -1;
-static int hf_opcode = -1;
-static int hf_payload = -1;
-static int hf_src_if_num = -1;
-static int hf_random_id = -1;
-static int hf_src_machine_id = -1;
-static int hf_dst_machine_id = -1;
-static int hf_policy_id = -1;
-static int hf_filler = -1;
-static int hf_unknown_data = -1;
-static int hf_id_num = -1;
-static int hf_report_code = -1;
-static int hf_ha_mode = -1;
-static int hf_ha_time_unit = -1;
-static int hf_machine_states = -1;
-static int hf_state_node = -1;
-static int hf_interface_states = -1;
-static int hf_num_reported_ifs = -1;
-static int hf_ethernet_add = -1;
-static int hf_is_if_trusted = -1;
-static int hf_ip = -1;
-static int hf_slot_num = -1;
-static int hf_machine_num = -1;
-static int hf_seed = -1;
-static int hf_hash_len = -1;
-static int hf_status = -1;
-static int hf_in_up_num = -1;
-static int hf_in_assumed_up_num = -1;
-static int hf_out_up_num = -1;
-static int hf_out_assumed_up_num = -1;
-static int hf_cluster_last_packet = -1;
-static int hf_ifn = -1;
-
-static gint ett_cphap = -1;
+static int proto_cphap;
+
+static int hf_magic_number;
+static int hf_cpha_protocol_ver;
+static int hf_cluster_number;
+static int hf_opcode;
+static int hf_payload;
+static int hf_src_if_num;
+static int hf_random_id;
+static int hf_src_machine_id;
+static int hf_dst_machine_id;
+static int hf_policy_id;
+static int hf_filler;
+static int hf_unknown_data;
+static int hf_id_num;
+static int hf_report_code;
+static int hf_ha_mode;
+static int hf_ha_time_unit;
+static int hf_machine_states;
+static int hf_state_node;
+static int hf_interface_states;
+static int hf_num_reported_ifs;
+static int hf_ethernet_add;
+static int hf_is_if_trusted;
+static int hf_ip;
+static int hf_slot_num;
+static int hf_machine_num;
+static int hf_seed;
+static int hf_hash_len;
+static int hf_status;
+static int hf_in_up_num;
+static int hf_in_assumed_up_num;
+static int hf_out_up_num;
+static int hf_out_assumed_up_num;
+static int hf_cluster_last_packet;
+static int hf_ifn;
+
+static gint ett_cphap;
 
 #define UDP_PORT_CPHA        8116
 #define CPHA_MAGIC 0x1A90
diff --git a/epan/dissectors/packet-cql.c b/epan/dissectors/packet-cql.c
index 3f000a7ebb..6a001ce3bb 100644
--- a/epan/dissectors/packet-cql.c
+++ b/epan/dissectors/packet-cql.c
@@ -36,137 +36,137 @@
 void proto_reg_handoff_cql(void);
 void proto_register_cql(void);
 
-static int proto_cql = -1;
+static int proto_cql;
 /* CQL header frame fields */
-static int hf_cql_version = -1;
-static int hf_cql_protocol_version = -1;
-static int hf_cql_direction = -1;
+static int hf_cql_version;
+static int hf_cql_protocol_version;
+static int hf_cql_direction;
 /* CQL header frame fields */
-static int hf_cql_flags_bitmap = -1;
-static int hf_cql_flag_compression = -1;
-static int hf_cql_flag_tracing = -1;
-static int hf_cql_flag_reserved3 = -1;
-static int hf_cql_flag_custom_payload = -1;
-static int hf_cql_flag_warning = -1;
-static int hf_cql_flag_reserved4 = -1;
-static int hf_cql_stream = -1;
-static int hf_cql_opcode = -1;
-static int hf_cql_length = -1;
+static int hf_cql_flags_bitmap;
+static int hf_cql_flag_compression;
+static int hf_cql_flag_tracing;
+static int hf_cql_flag_reserved3;
+static int hf_cql_flag_custom_payload;
+static int hf_cql_flag_warning;
+static int hf_cql_flag_reserved4;
+static int hf_cql_stream;
+static int hf_cql_opcode;
+static int hf_cql_length;
 /* CQL data types */
 /*
-static int hf_cql_int = -1;
-static int hf_cql_long = -1;
-static int hf_cql_uuid = -1;
-static int hf_cql_bytes = -1;
-static int hf_cql_inet = -1;
+static int hf_cql_int;
+static int hf_cql_long;
+static int hf_cql_uuid;
+static int hf_cql_bytes;
+static int hf_cql_inet;
 */
 /* Batch flags */
 
-static int hf_cql_batch_flag_serial_consistency = -1;
-static int hf_cql_batch_flag_default_timestamp = -1;
-static int hf_cql_batch_flag_with_name_for_values = -1;
-static int hf_cql_batch_flags_bitmap = -1;
-static int ett_cql_batch_flags_bitmap = -1;
-
-static int hf_cql_consistency = -1;
-static int hf_cql_string_length = -1;
-static int hf_cql_string_map_size = -1;
-static int hf_cql_string = -1;
-static int hf_cql_auth_token = -1;
-static int hf_cql_value_count = -1;
-static int hf_cql_short_bytes_length = -1;
-static int hf_cql_bytes_length = -1;
-static int hf_cql_bytes = -1;
-static int hf_cql_bigint = -1;
-static int hf_cql_scale = -1;
-static int hf_cql_boolean = -1;
-static int hf_cql_ascii = - 1;
-static int hf_cql_double = -1;
-static int hf_cql_float = -1;
-static int hf_cql_custom = -1;
-static int hf_cql_null_value = -1;
-static int hf_cql_int = -1;
-static int hf_cql_uuid = -1;
-static int hf_cql_port = -1;
-static int hf_cql_timeuuid = -1;
-static int hf_cql_varchar = -1;
-static int hf_cql_varint_count8 = -1;
-static int hf_cql_varint_count16 = -1;
-static int hf_cql_varint_count32 = -1;
-static int hf_cql_varint_count64 = -1;
-static int hf_cql_raw_compressed_bytes = -1;
-static int hf_cql_paging_state = -1;
-static int hf_cql_page_size = -1;
-static int hf_cql_timestamp = -1;
-static int hf_cql_query_id = -1;
-static int hf_cql_event_type = -1;
-static int hf_cql_event_schema_change_type = -1;
-static int hf_cql_event_schema_change_type_target = -1;
-static int hf_cql_event_schema_change_keyspace = -1;
-static int hf_cql_event_schema_change_object = -1;
-static int hf_cql_result_timestamp = -1;
-static int hf_cql_string_list_size = -1;
-static int hf_cql_batch_type = -1;
-static int hf_cql_batch_query_type = -1;
-static int hf_cql_batch_query_size = -1;
-static int hf_cql_error_code = -1;
-static int hf_cql_result_kind = -1;
-static int hf_cql_result_rows_data_type = -1;
-
-static int hf_cql_query_flags_bitmap = -1;
-static int hf_cql_query_flags_values = -1;
-static int hf_cql_query_flags_skip_metadata = -1;
-static int hf_cql_query_flags_page_size = -1;
-static int hf_cql_query_flags_paging_state = -1;
-static int hf_cql_query_flags_serial_consistency = -1;
-static int hf_cql_query_flags_default_timestamp = -1;
-static int hf_cql_query_flags_names_for_values = -1;
-static int hf_cql_query_flags_reserved3 = -1;
-
-static int hf_cql_result_rows_flags_values = -1;
-static int hf_cql_result_rows_flag_global_tables_spec = -1;
-static int hf_cql_result_rows_flag_has_more_pages = -1;
-static int hf_cql_result_rows_flag_no_metadata = -1;
-static int hf_cql_result_rows_column_count = -1;
-static int hf_cql_result_rows_tuple_size = -1;
-
-static int hf_cql_string_result_rows_global_table_spec_ksname = -1;
-static int hf_cql_string_result_rows_global_table_spec_table_name = -1;
-static int hf_cql_string_result_rows_table_name = -1;
-static int hf_cql_string_result_rows_keyspace_name = -1;
-static int hf_cql_string_result_rows_column_name = -1;
-static int hf_cql_result_rows_row_count = -1;
-static int hf_cql_string_result_rows_udt_name = -1;
-static int hf_cql_string_result_rows_udt_size = -1;
-static int hf_cql_string_result_rows_udt_field_name = -1;
-static int hf_cql_string_result_rows_list_size = -1;
-static int hf_cql_string_result_rows_map_size = -1;
-static int hf_cql_string_result_rows_set_size = -1;
-
-static int ett_cql_protocol = -1;
-static int ett_cql_version = -1;
-static int ett_cql_message = -1;
-static int ett_cql_result_columns = -1;
-static int ett_cql_result_map = -1;
-static int ett_cql_result_set = -1;
-static int ett_cql_result_metadata = -1;
-static int ett_cql_result_rows = -1;
-static int ett_cql_result_metadata_colspec = -1;
-static int ett_cql_header_flags_bitmap = -1;
-static int ett_cql_query_flags_bitmap = -1;
-
-static int hf_cql_response_in = -1;
-static int hf_cql_response_to = -1;
-static int hf_cql_response_time = -1;
-
-static int hf_cql_ipv4 = -1;
-static int hf_cql_ipv6 = -1;
+static int hf_cql_batch_flag_serial_consistency;
+static int hf_cql_batch_flag_default_timestamp;
+static int hf_cql_batch_flag_with_name_for_values;
+static int hf_cql_batch_flags_bitmap;
+static int ett_cql_batch_flags_bitmap;
+
+static int hf_cql_consistency;
+static int hf_cql_string_length;
+static int hf_cql_string_map_size;
+static int hf_cql_string;
+static int hf_cql_auth_token;
+static int hf_cql_value_count;
+static int hf_cql_short_bytes_length;
+static int hf_cql_bytes_length;
+static int hf_cql_bytes;
+static int hf_cql_bigint;
+static int hf_cql_scale;
+static int hf_cql_boolean;
+static int hf_cql_ascii;
+static int hf_cql_double;
+static int hf_cql_float;
+static int hf_cql_custom;
+static int hf_cql_null_value;
+static int hf_cql_int;
+static int hf_cql_uuid;
+static int hf_cql_port;
+static int hf_cql_timeuuid;
+static int hf_cql_varchar;
+static int hf_cql_varint_count8;
+static int hf_cql_varint_count16;
+static int hf_cql_varint_count32;
+static int hf_cql_varint_count64;
+static int hf_cql_raw_compressed_bytes;
+static int hf_cql_paging_state;
+static int hf_cql_page_size;
+static int hf_cql_timestamp;
+static int hf_cql_query_id;
+static int hf_cql_event_type;
+static int hf_cql_event_schema_change_type;
+static int hf_cql_event_schema_change_type_target;
+static int hf_cql_event_schema_change_keyspace;
+static int hf_cql_event_schema_change_object;
+static int hf_cql_result_timestamp;
+static int hf_cql_string_list_size;
+static int hf_cql_batch_type;
+static int hf_cql_batch_query_type;
+static int hf_cql_batch_query_size;
+static int hf_cql_error_code;
+static int hf_cql_result_kind;
+static int hf_cql_result_rows_data_type;
+
+static int hf_cql_query_flags_bitmap;
+static int hf_cql_query_flags_values;
+static int hf_cql_query_flags_skip_metadata;
+static int hf_cql_query_flags_page_size;
+static int hf_cql_query_flags_paging_state;
+static int hf_cql_query_flags_serial_consistency;
+static int hf_cql_query_flags_default_timestamp;
+static int hf_cql_query_flags_names_for_values;
+static int hf_cql_query_flags_reserved3;
+
+static int hf_cql_result_rows_flags_values;
+static int hf_cql_result_rows_flag_global_tables_spec;
+static int hf_cql_result_rows_flag_has_more_pages;
+static int hf_cql_result_rows_flag_no_metadata;
+static int hf_cql_result_rows_column_count;
+static int hf_cql_result_rows_tuple_size;
+
+static int hf_cql_string_result_rows_global_table_spec_ksname;
+static int hf_cql_string_result_rows_global_table_spec_table_name;
+static int hf_cql_string_result_rows_table_name;
+static int hf_cql_string_result_rows_keyspace_name;
+static int hf_cql_string_result_rows_column_name;
+static int hf_cql_result_rows_row_count;
+static int hf_cql_string_result_rows_udt_name;
+static int hf_cql_string_result_rows_udt_size;
+static int hf_cql_string_result_rows_udt_field_name;
+static int hf_cql_string_result_rows_list_size;
+static int hf_cql_string_result_rows_map_size;
+static int hf_cql_string_result_rows_set_size;
+
+static int ett_cql_protocol;
+static int ett_cql_version;
+static int ett_cql_message;
+static int ett_cql_result_columns;
+static int ett_cql_result_map;
+static int ett_cql_result_set;
+static int ett_cql_result_metadata;
+static int ett_cql_result_rows;
+static int ett_cql_result_metadata_colspec;
+static int ett_cql_header_flags_bitmap;
+static int ett_cql_query_flags_bitmap;
+
+static int hf_cql_response_in;
+static int hf_cql_response_to;
+static int hf_cql_response_time;
+
+static int hf_cql_ipv4;
+static int hf_cql_ipv6;
 
 /* desegmentation of CQL */
 static gboolean cql_desegment = TRUE;
 
-static expert_field ei_cql_data_not_dissected_yet = EI_INIT;
-static expert_field ei_cql_unexpected_negative_value = EI_INIT;
+static expert_field ei_cql_data_not_dissected_yet;
+static expert_field ei_cql_unexpected_negative_value;
 
 
 typedef struct _cql_transaction_type {
diff --git a/epan/dissectors/packet-csm-encaps.c b/epan/dissectors/packet-csm-encaps.c
index e2b0936f2e..5896ca3d3b 100644
--- a/epan/dissectors/packet-csm-encaps.c
+++ b/epan/dissectors/packet-csm-encaps.c
@@ -65,68 +65,68 @@ static const value_string error_vals[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_csm_encaps            = -1;
-
-static int hf_csm_encaps_opcode            = -1;
-static int hf_csm_encaps_seq               = -1;
-static int hf_csm_encaps_ctrl              = -1;
-static int hf_csm_encaps_ctrl_endian       = -1;
-static int hf_csm_encaps_ctrl_ack          = -1;
-static int hf_csm_encaps_ctrl_ack_suppress = -1;
-static int hf_csm_encaps_channel           = -1;
-static int hf_csm_encaps_index             = -1;
-static int hf_csm_encaps_length            = -1;
-static int hf_csm_encaps_class             = -1;
-static int hf_csm_encaps_type              = -1;
-static int hf_csm_encaps_function_code     = -1;
-static int hf_csm_encaps_reserved          = -1;
-static int hf_csm_encaps_param_error       = -1;
-static int hf_csm_encaps_param1            = -1;
-static int hf_csm_encaps_param2            = -1;
-static int hf_csm_encaps_param3            = -1;
-static int hf_csm_encaps_param4            = -1;
-static int hf_csm_encaps_param5            = -1;
-static int hf_csm_encaps_param6            = -1;
-static int hf_csm_encaps_param7            = -1;
-static int hf_csm_encaps_param8            = -1;
-static int hf_csm_encaps_param9            = -1;
-static int hf_csm_encaps_param10           = -1;
-static int hf_csm_encaps_param11           = -1;
-static int hf_csm_encaps_param12           = -1;
-static int hf_csm_encaps_param13           = -1;
-static int hf_csm_encaps_param14           = -1;
-static int hf_csm_encaps_param15           = -1;
-static int hf_csm_encaps_param16           = -1;
-static int hf_csm_encaps_param17           = -1;
-static int hf_csm_encaps_param18           = -1;
-static int hf_csm_encaps_param19           = -1;
-static int hf_csm_encaps_param20           = -1;
-static int hf_csm_encaps_param21           = -1;
-static int hf_csm_encaps_param22           = -1;
-static int hf_csm_encaps_param23           = -1;
-static int hf_csm_encaps_param24           = -1;
-static int hf_csm_encaps_param25           = -1;
-static int hf_csm_encaps_param26           = -1;
-static int hf_csm_encaps_param27           = -1;
-static int hf_csm_encaps_param28           = -1;
-static int hf_csm_encaps_param29           = -1;
-static int hf_csm_encaps_param30           = -1;
-static int hf_csm_encaps_param31           = -1;
-static int hf_csm_encaps_param32           = -1;
-static int hf_csm_encaps_param33           = -1;
-static int hf_csm_encaps_param34           = -1;
-static int hf_csm_encaps_param35           = -1;
-static int hf_csm_encaps_param36           = -1;
-static int hf_csm_encaps_param37           = -1;
-static int hf_csm_encaps_param38           = -1;
-static int hf_csm_encaps_param39           = -1;
-static int hf_csm_encaps_param40           = -1;
-static int hf_csm_encaps_param             = -1;
+static int proto_csm_encaps;
+
+static int hf_csm_encaps_opcode;
+static int hf_csm_encaps_seq;
+static int hf_csm_encaps_ctrl;
+static int hf_csm_encaps_ctrl_endian;
+static int hf_csm_encaps_ctrl_ack;
+static int hf_csm_encaps_ctrl_ack_suppress;
+static int hf_csm_encaps_channel;
+static int hf_csm_encaps_index;
+static int hf_csm_encaps_length;
+static int hf_csm_encaps_class;
+static int hf_csm_encaps_type;
+static int hf_csm_encaps_function_code;
+static int hf_csm_encaps_reserved;
+static int hf_csm_encaps_param_error;
+static int hf_csm_encaps_param1;
+static int hf_csm_encaps_param2;
+static int hf_csm_encaps_param3;
+static int hf_csm_encaps_param4;
+static int hf_csm_encaps_param5;
+static int hf_csm_encaps_param6;
+static int hf_csm_encaps_param7;
+static int hf_csm_encaps_param8;
+static int hf_csm_encaps_param9;
+static int hf_csm_encaps_param10;
+static int hf_csm_encaps_param11;
+static int hf_csm_encaps_param12;
+static int hf_csm_encaps_param13;
+static int hf_csm_encaps_param14;
+static int hf_csm_encaps_param15;
+static int hf_csm_encaps_param16;
+static int hf_csm_encaps_param17;
+static int hf_csm_encaps_param18;
+static int hf_csm_encaps_param19;
+static int hf_csm_encaps_param20;
+static int hf_csm_encaps_param21;
+static int hf_csm_encaps_param22;
+static int hf_csm_encaps_param23;
+static int hf_csm_encaps_param24;
+static int hf_csm_encaps_param25;
+static int hf_csm_encaps_param26;
+static int hf_csm_encaps_param27;
+static int hf_csm_encaps_param28;
+static int hf_csm_encaps_param29;
+static int hf_csm_encaps_param30;
+static int hf_csm_encaps_param31;
+static int hf_csm_encaps_param32;
+static int hf_csm_encaps_param33;
+static int hf_csm_encaps_param34;
+static int hf_csm_encaps_param35;
+static int hf_csm_encaps_param36;
+static int hf_csm_encaps_param37;
+static int hf_csm_encaps_param38;
+static int hf_csm_encaps_param39;
+static int hf_csm_encaps_param40;
+static int hf_csm_encaps_param;
 
 
 /* Initialize the subtree pointers */
-static gint ett_csm_encaps         = -1;
-static gint ett_csm_encaps_control = -1;
+static gint ett_csm_encaps;
+static gint ett_csm_encaps_control;
 
 
 /* returns the command name */
diff --git a/epan/dissectors/packet-csn1.c b/epan/dissectors/packet-csn1.c
index 15b4a718e1..6b905a698b 100644
--- a/epan/dissectors/packet-csn1.c
+++ b/epan/dissectors/packet-csn1.c
@@ -19,16 +19,16 @@
 
 void proto_register_csn1(void);
 
-static int hf_null_data = -1;
+static int hf_null_data;
 
-static expert_field ei_csn1_more_bits_to_unpack = EI_INIT;
-static expert_field ei_csn1_general = EI_INIT;
-static expert_field ei_csn1_not_implemented = EI_INIT;
-static expert_field ei_csn1_union_index = EI_INIT;
-static expert_field ei_csn1_script_error = EI_INIT;
-static expert_field ei_csn1_more32bits = EI_INIT;
-static expert_field ei_csn1_fixed_not_matched = EI_INIT;
-static expert_field ei_csn1_stream_not_supported = EI_INIT;
+static expert_field ei_csn1_more_bits_to_unpack;
+static expert_field ei_csn1_general;
+static expert_field ei_csn1_not_implemented;
+static expert_field ei_csn1_union_index;
+static expert_field ei_csn1_script_error;
+static expert_field ei_csn1_more32bits;
+static expert_field ei_csn1_fixed_not_matched;
+static expert_field ei_csn1_stream_not_supported;
 
 #define pvDATA(_pv, _offset) ((void*) ((unsigned char*)_pv + _offset))
 #define pui8DATA(_pv, _offset) ((guint8*) pvDATA(_pv, _offset))
@@ -41,7 +41,7 @@ static expert_field ei_csn1_stream_not_supported = EI_INIT;
 
 static const unsigned char ixBitsTab[] = {0, 1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5};
 
-static gint proto_csn1 = -1;
+static gint proto_csn1;
 
 /* Returns no_of_bits (up to 8) masked with 0x2B */
 static guint8
diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c
index 8b6e29d15b..1884ede026 100644
--- a/epan/dissectors/packet-ctdb.c
+++ b/epan/dissectors/packet-ctdb.c
@@ -20,50 +20,50 @@ void proto_reg_handoff_ctdb(void);
 static dissector_handle_t ctdb_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_ctdb = -1;
-static int hf_ctdb_length = -1;
-static int hf_ctdb_opcode = -1;
-static int hf_ctdb_magic = -1;
-static int hf_ctdb_version = -1;
-static int hf_ctdb_dst = -1;
-static int hf_ctdb_src = -1;
-static int hf_ctdb_id = -1;
-static int hf_ctdb_flags_immediate = -1;
-static int hf_ctdb_dbid = -1;
-static int hf_ctdb_callid = -1;
-static int hf_ctdb_status = -1;
-static int hf_ctdb_keylen = -1;
-static int hf_ctdb_datalen = -1;
-static int hf_ctdb_errorlen = -1;
-static int hf_ctdb_key = -1;
-static int hf_ctdb_keyhash = -1;
-static int hf_ctdb_data = -1;
-static int hf_ctdb_error = -1;
-static int hf_ctdb_dmaster = -1;
-static int hf_ctdb_request_in = -1;
-static int hf_ctdb_response_in = -1;
-static int hf_ctdb_time = -1;
-static int hf_ctdb_generation = -1;
-static int hf_ctdb_hopcount = -1;
-static int hf_ctdb_rsn = -1;
-static int hf_ctdb_ctrl_opcode = -1;
-static int hf_ctdb_srvid = -1;
-static int hf_ctdb_clientid = -1;
-static int hf_ctdb_ctrl_flags = -1;
-static int hf_ctdb_recmaster = -1;
-static int hf_ctdb_recmode = -1;
-static int hf_ctdb_num_nodes = -1;
-static int hf_ctdb_vnn = -1;
-static int hf_ctdb_node_flags = -1;
-static int hf_ctdb_node_ip = -1;
-static int hf_ctdb_pid = -1;
-static int hf_ctdb_process_exists = -1;
+static int proto_ctdb;
+static int hf_ctdb_length;
+static int hf_ctdb_opcode;
+static int hf_ctdb_magic;
+static int hf_ctdb_version;
+static int hf_ctdb_dst;
+static int hf_ctdb_src;
+static int hf_ctdb_id;
+static int hf_ctdb_flags_immediate;
+static int hf_ctdb_dbid;
+static int hf_ctdb_callid;
+static int hf_ctdb_status;
+static int hf_ctdb_keylen;
+static int hf_ctdb_datalen;
+static int hf_ctdb_errorlen;
+static int hf_ctdb_key;
+static int hf_ctdb_keyhash;
+static int hf_ctdb_data;
+static int hf_ctdb_error;
+static int hf_ctdb_dmaster;
+static int hf_ctdb_request_in;
+static int hf_ctdb_response_in;
+static int hf_ctdb_time;
+static int hf_ctdb_generation;
+static int hf_ctdb_hopcount;
+static int hf_ctdb_rsn;
+static int hf_ctdb_ctrl_opcode;
+static int hf_ctdb_srvid;
+static int hf_ctdb_clientid;
+static int hf_ctdb_ctrl_flags;
+static int hf_ctdb_recmaster;
+static int hf_ctdb_recmode;
+static int hf_ctdb_num_nodes;
+static int hf_ctdb_vnn;
+static int hf_ctdb_node_flags;
+static int hf_ctdb_node_ip;
+static int hf_ctdb_pid;
+static int hf_ctdb_process_exists;
 
 /* Initialize the subtree pointers */
-static gint ett_ctdb = -1;
-static gint ett_ctdb_key = -1;
+static gint ett_ctdb;
+static gint ett_ctdb_key;
 
-static expert_field ei_ctdb_too_many_nodes = EI_INIT;
+static expert_field ei_ctdb_too_many_nodes;
 
 /* this tree keeps track of caller/reqid for ctdb transactions */
 static wmem_tree_t *ctdb_transactions=NULL;
diff --git a/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c
index 8d3843e227..f01e04c627 100644
--- a/epan/dissectors/packet-cups.c
+++ b/epan/dissectors/packet-cups.c
@@ -64,34 +64,34 @@ static const value_string cups_state_values[] = {
 static const true_false_string tfs_implicit_explicit = { "Implicit class", "Explicit class" };
 static const true_false_string tfs_printer_class = { "Printer class", "Single printer" };
 
-static int proto_cups = -1;
-static int hf_cups_ptype = -1;
-static int hf_cups_ptype_default = -1;
-static int hf_cups_ptype_implicit = -1;
-static int hf_cups_ptype_variable = -1;
-static int hf_cups_ptype_large = -1;
-static int hf_cups_ptype_medium = -1;
-static int hf_cups_ptype_small = -1;
-static int hf_cups_ptype_sort = -1;
-static int hf_cups_ptype_bind = -1;
-static int hf_cups_ptype_cover = -1;
-static int hf_cups_ptype_punch = -1;
-static int hf_cups_ptype_collate = -1;
-static int hf_cups_ptype_copies = -1;
-static int hf_cups_ptype_staple = -1;
-static int hf_cups_ptype_duplex = -1;
-static int hf_cups_ptype_color = -1;
-static int hf_cups_ptype_bw = -1;
-static int hf_cups_ptype_remote = -1;
-static int hf_cups_ptype_class = -1;
-static int hf_cups_state = -1;
-static int hf_cups_uri = -1;
-static int hf_cups_location = -1;
-static int hf_cups_information = -1;
-static int hf_cups_make_model = -1;
-
-static gint ett_cups = -1;
-static gint ett_cups_ptype = -1;
+static int proto_cups;
+static int hf_cups_ptype;
+static int hf_cups_ptype_default;
+static int hf_cups_ptype_implicit;
+static int hf_cups_ptype_variable;
+static int hf_cups_ptype_large;
+static int hf_cups_ptype_medium;
+static int hf_cups_ptype_small;
+static int hf_cups_ptype_sort;
+static int hf_cups_ptype_bind;
+static int hf_cups_ptype_cover;
+static int hf_cups_ptype_punch;
+static int hf_cups_ptype_collate;
+static int hf_cups_ptype_copies;
+static int hf_cups_ptype_staple;
+static int hf_cups_ptype_duplex;
+static int hf_cups_ptype_color;
+static int hf_cups_ptype_bw;
+static int hf_cups_ptype_remote;
+static int hf_cups_ptype_class;
+static int hf_cups_state;
+static int hf_cups_uri;
+static int hf_cups_location;
+static int hf_cups_information;
+static int hf_cups_make_model;
+
+static gint ett_cups;
+static gint ett_cups_ptype;
 
 /* patterns used for tvb_ws_mempbrk_pattern_guint8 */
 static ws_mempbrk_pattern pbrk_whitespace;
diff --git a/epan/dissectors/packet-cvspserver.c b/epan/dissectors/packet-cvspserver.c
index efac81e8fb..43f5585c6c 100644
--- a/epan/dissectors/packet-cvspserver.c
+++ b/epan/dissectors/packet-cvspserver.c
@@ -20,11 +20,11 @@ void proto_reg_handoff_cvspserver(void);
 
 static dissector_handle_t cvspserver_handle;
 
-static int proto_cvspserver = -1;
+static int proto_cvspserver;
 
-static int hf_cvspserver_data = -1;
+static int hf_cvspserver_data;
 
-static gint ett_cvspserver = -1;
+static gint ett_cvspserver;
 
 static int
 dissect_cvspserver(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dissector_data _U_)
diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c
index 22965b171a..cb2c982769 100644
--- a/epan/dissectors/packet-daap.c
+++ b/epan/dissectors/packet-daap.c
@@ -368,25 +368,25 @@ static const value_string vals_tag_code[] = {
 static value_string_ext vals_tag_code_ext = VALUE_STRING_EXT_INIT(vals_tag_code);
 
 /* Initialize the protocol and registered fields */
-static int proto_daap = -1;
-static int hf_daap_name = -1;
-static int hf_daap_size = -1;
-static int hf_daap_data_string = -1;
-static int hf_daap_persistent_id = -1;
-static int hf_daap_status = -1;
-static int hf_daap_rev = -1;
-static int hf_daap_id = -1;
-static int hf_daap_cnt = -1;
-static int hf_daap_timeout = -1;
-static int hf_daap_data = -1;
-static int hf_daap_playlist_id = -1;
-static int hf_daap_track_id = -1;
+static int proto_daap;
+static int hf_daap_name;
+static int hf_daap_size;
+static int hf_daap_data_string;
+static int hf_daap_persistent_id;
+static int hf_daap_status;
+static int hf_daap_rev;
+static int hf_daap_id;
+static int hf_daap_cnt;
+static int hf_daap_timeout;
+static int hf_daap_data;
+static int hf_daap_playlist_id;
+static int hf_daap_track_id;
 
 /* Initialize the subtree pointers */
-static gint ett_daap = -1;
-static gint ett_daap_sub = -1;
+static gint ett_daap;
+static gint ett_daap_sub;
 
-static expert_field ei_daap_max_recursion_depth_reached = EI_INIT;
+static expert_field ei_daap_max_recursion_depth_reached;
 
 /* Forward declarations */
 static void dissect_daap_one_tag(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb);
diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c
index 9aed276707..f7d8426188 100644
--- a/epan/dissectors/packet-data.c
+++ b/epan/dissectors/packet-data.c
@@ -23,21 +23,21 @@ void proto_register_data(void);
 void proto_reg_handoff_data(void);
 
 
-static int proto_data = -1;
+static int proto_data;
 
-static int hf_data_data = -1;
-static int hf_data_len = -1;
-static int hf_data_md5_hash = -1;
-static int hf_data_text = -1;
-static int hf_data_uncompressed_data = -1;
-static int hf_data_uncompressed_len = -1;
+static int hf_data_data;
+static int hf_data_len;
+static int hf_data_md5_hash;
+static int hf_data_text;
+static int hf_data_uncompressed_data;
+static int hf_data_uncompressed_len;
 
 static gboolean new_pane = FALSE;
 static gboolean uncompress_data = FALSE;
 static gboolean show_as_text = FALSE;
 static gboolean generate_md5_hash = FALSE;
 
-static gint ett_data = -1;
+static gint ett_data;
 
 static dissector_handle_t data_handle;
 
diff --git a/epan/dissectors/packet-daytime.c b/epan/dissectors/packet-daytime.c
index 98ae8bffe6..46aff974e7 100644
--- a/epan/dissectors/packet-daytime.c
+++ b/epan/dissectors/packet-daytime.c
@@ -19,12 +19,12 @@ void proto_reg_handoff_daytime(void);
 
 static dissector_handle_t daytime_handle;
 
-static int proto_daytime = -1;
+static int proto_daytime;
 
-static int hf_daytime_string = -1;
-static int hf_response_request = -1;
+static int hf_daytime_string;
+static int hf_response_request;
 
-static gint ett_daytime = -1;
+static gint ett_daytime;
 
 /* This dissector works for TCP and UDP daytime packets */
 #define DAYTIME_PORT 13
diff --git a/epan/dissectors/packet-db-lsp.c b/epan/dissectors/packet-db-lsp.c
index 5b35930cda..e84ce6034a 100644
--- a/epan/dissectors/packet-db-lsp.c
+++ b/epan/dissectors/packet-db-lsp.c
@@ -32,18 +32,18 @@
 void proto_register_db_lsp(void);
 void proto_reg_handoff_db_lsp(void);
 
-static int proto_db_lsp = -1;
-static int proto_db_lsp_disc = -1;
-
-static int hf_type = -1;
-static int hf_magic = -1;
-static int hf_length = -1;
-static int hf_opvalue = -1;
-static int hf_data = -1;
-static int hf_value = -1;
-static int hf_text = -1;
-
-static gint ett_db_lsp = -1;
+static int proto_db_lsp;
+static int proto_db_lsp_disc;
+
+static int hf_type;
+static int hf_magic;
+static int hf_length;
+static int hf_opvalue;
+static int hf_data;
+static int hf_value;
+static int hf_text;
+
+static gint ett_db_lsp;
 
 static heur_dissector_list_t heur_subdissector_list;
 
diff --git a/epan/dissectors/packet-dbus.c b/epan/dissectors/packet-dbus.c
index a4dd0a20a0..aa40061a2e 100644
--- a/epan/dissectors/packet-dbus.c
+++ b/epan/dissectors/packet-dbus.c
@@ -51,7 +51,7 @@
 void proto_register_dbus(void);
 void proto_reg_handoff_dbus(void);
 
-static int proto_dbus = -1;
+static int proto_dbus;
 static gboolean dbus_desegment = TRUE;
 static gboolean dbus_resolve_names = TRUE;
 
@@ -112,82 +112,82 @@ static const true_false_string allow_vals = { "Allow", "Don't allow" };
 static const true_false_string no_start_vals = { "Don't start", "Start" };
 static const true_false_string not_expected_vals = { "Not expected", "Expected" };
 
-static int hf_dbus_endianness = -1;
-static int hf_dbus_message_type = -1;
-static int hf_dbus_flags = -1;
-static int hf_dbus_flags_no_reply_expected = -1;
-static int hf_dbus_flags_no_auto_start = -1;
-static int hf_dbus_flags_allow_interactive_authorization = -1;
-static int hf_dbus_version = -1;
-static int hf_dbus_body_length = -1;
-static int hf_dbus_serial = -1;
-static int hf_dbus_field_code = -1;
-static int hf_dbus_padding = -1;
-static int hf_dbus_path = -1;
-static int hf_dbus_interface = -1;
-static int hf_dbus_member = -1;
-static int hf_dbus_error_name = -1;
-static int hf_dbus_reply_serial = -1;
-static int hf_dbus_destination = -1;
-static int hf_dbus_sender = -1;
-static int hf_dbus_signature = -1;
-static int hf_dbus_unix_fds = -1;
-static int hf_dbus_body = -1;
-static int hf_dbus_type_byte = -1;
-static int hf_dbus_type_boolean = -1;
-static int hf_dbus_type_int16 = -1;
-static int hf_dbus_type_uint16 = -1;
-static int hf_dbus_type_int32 = -1;
-static int hf_dbus_type_uint32 = -1;
-static int hf_dbus_type_int64 = -1;
-static int hf_dbus_type_uint64 = -1;
-static int hf_dbus_type_double = -1;
-static int hf_dbus_type_string = -1;
-static int hf_dbus_type_object_path = -1;
-static int hf_dbus_type_signature = -1;
-static int hf_dbus_type_array = -1;
-static int hf_dbus_type_array_length = -1;
-static int hf_dbus_type_struct = -1;
-static int hf_dbus_type_variant = -1;
-static int hf_dbus_type_variant_signature = -1;
-static int hf_dbus_type_dict_entry = -1;
-static int hf_dbus_type_dict_entry_key = -1;
-static int hf_dbus_type_unix_fd = -1;
-static int hf_dbus_response_in = -1;
-static int hf_dbus_response_to = -1;
-static int hf_dbus_response_time = -1;
-
-static int ett_dbus = -1;
-static int ett_dbus_flags = -1;
-static int ett_dbus_header_field_array = -1;
-static int ett_dbus_header_field = -1;
-static int ett_dbus_body = -1;
-static int ett_dbus_type_array = -1;
-static int ett_dbus_type_struct = -1;
-static int ett_dbus_type_variant = -1;
-static int ett_dbus_type_dict_entry = -1;
-
-static expert_field ei_dbus_endianness_invalid = EI_INIT;
-static expert_field ei_dbus_message_type_invalid = EI_INIT;
-static expert_field ei_dbus_message_type_unknown = EI_INIT;
-static expert_field ei_dbus_version_invalid = EI_INIT;
-static expert_field ei_dbus_serial_invalid = EI_INIT;
-static expert_field ei_dbus_field_code_invalid = EI_INIT;
-static expert_field ei_dbus_required_header_field_missing = EI_INIT;
-static expert_field ei_dbus_padding_invalid = EI_INIT;
-static expert_field ei_dbus_field_signature_wrong = EI_INIT;
-static expert_field ei_dbus_interface_invalid = EI_INIT;
-static expert_field ei_dbus_member_invalid = EI_INIT;
-static expert_field ei_dbus_error_name_invalid = EI_INIT;
-static expert_field ei_dbus_bus_name_invalid = EI_INIT;
-static expert_field ei_dbus_type_boolean_invalid = EI_INIT;
-static expert_field ei_dbus_string_invalid = EI_INIT;
-static expert_field ei_dbus_type_signature_invalid = EI_INIT;
-static expert_field ei_dbus_type_array_too_long = EI_INIT;
-static expert_field ei_dbus_type_array_content_out_of_bounds = EI_INIT;
-static expert_field ei_dbus_type_object_path_invalid = EI_INIT;
-static expert_field ei_dbus_type_variant_signature_invalid = EI_INIT;
-static expert_field ei_dbus_nested_too_deeply = EI_INIT;
+static int hf_dbus_endianness;
+static int hf_dbus_message_type;
+static int hf_dbus_flags;
+static int hf_dbus_flags_no_reply_expected;
+static int hf_dbus_flags_no_auto_start;
+static int hf_dbus_flags_allow_interactive_authorization;
+static int hf_dbus_version;
+static int hf_dbus_body_length;
+static int hf_dbus_serial;
+static int hf_dbus_field_code;
+static int hf_dbus_padding;
+static int hf_dbus_path;
+static int hf_dbus_interface;
+static int hf_dbus_member;
+static int hf_dbus_error_name;
+static int hf_dbus_reply_serial;
+static int hf_dbus_destination;
+static int hf_dbus_sender;
+static int hf_dbus_signature;
+static int hf_dbus_unix_fds;
+static int hf_dbus_body;
+static int hf_dbus_type_byte;
+static int hf_dbus_type_boolean;
+static int hf_dbus_type_int16;
+static int hf_dbus_type_uint16;
+static int hf_dbus_type_int32;
+static int hf_dbus_type_uint32;
+static int hf_dbus_type_int64;
+static int hf_dbus_type_uint64;
+static int hf_dbus_type_double;
+static int hf_dbus_type_string;
+static int hf_dbus_type_object_path;
+static int hf_dbus_type_signature;
+static int hf_dbus_type_array;
+static int hf_dbus_type_array_length;
+static int hf_dbus_type_struct;
+static int hf_dbus_type_variant;
+static int hf_dbus_type_variant_signature;
+static int hf_dbus_type_dict_entry;
+static int hf_dbus_type_dict_entry_key;
+static int hf_dbus_type_unix_fd;
+static int hf_dbus_response_in;
+static int hf_dbus_response_to;
+static int hf_dbus_response_time;
+
+static int ett_dbus;
+static int ett_dbus_flags;
+static int ett_dbus_header_field_array;
+static int ett_dbus_header_field;
+static int ett_dbus_body;
+static int ett_dbus_type_array;
+static int ett_dbus_type_struct;
+static int ett_dbus_type_variant;
+static int ett_dbus_type_dict_entry;
+
+static expert_field ei_dbus_endianness_invalid;
+static expert_field ei_dbus_message_type_invalid;
+static expert_field ei_dbus_message_type_unknown;
+static expert_field ei_dbus_version_invalid;
+static expert_field ei_dbus_serial_invalid;
+static expert_field ei_dbus_field_code_invalid;
+static expert_field ei_dbus_required_header_field_missing;
+static expert_field ei_dbus_padding_invalid;
+static expert_field ei_dbus_field_signature_wrong;
+static expert_field ei_dbus_interface_invalid;
+static expert_field ei_dbus_member_invalid;
+static expert_field ei_dbus_error_name_invalid;
+static expert_field ei_dbus_bus_name_invalid;
+static expert_field ei_dbus_type_boolean_invalid;
+static expert_field ei_dbus_string_invalid;
+static expert_field ei_dbus_type_signature_invalid;
+static expert_field ei_dbus_type_array_too_long;
+static expert_field ei_dbus_type_array_content_out_of_bounds;
+static expert_field ei_dbus_type_object_path_invalid;
+static expert_field ei_dbus_type_variant_signature_invalid;
+static expert_field ei_dbus_nested_too_deeply;
 
 typedef struct {
 	ptvcursor_t *cursor;
diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c
index fb90ae600e..b2faac50f7 100644
--- a/epan/dissectors/packet-dcc.c
+++ b/epan/dissectors/packet-dcc.c
@@ -23,56 +23,56 @@
 void proto_register_dcc(void);
 void proto_reg_handoff_dcc(void);
 
-static int proto_dcc = -1;
-static int hf_dcc_len = -1;
-static int hf_dcc_pkt_vers = -1;
-static int hf_dcc_op = -1;
-static int hf_dcc_clientid = -1;
-static int hf_dcc_opnums_host = -1;
-static int hf_dcc_opnums_pid = -1;
-static int hf_dcc_opnums_report = -1;
-static int hf_dcc_opnums_retrans = -1;
-
-static int hf_dcc_signature = -1;
-static int hf_dcc_max_pkt_vers = -1;
-static int hf_dcc_qdelay_ms = -1;
-static int hf_dcc_brand = -1;
-
-static int hf_dcc_ck_type = -1;
-static int hf_dcc_ck_len = -1;
-static int hf_dcc_ck_sum = -1;
-
-static int hf_dcc_date = -1;
-
-static int hf_dcc_target = -1;
-static int hf_dcc_response_text = -1;
-
-static int hf_dcc_adminop = -1;
-static int hf_dcc_adminval = -1;
-static int hf_dcc_floodop = -1;
-static int hf_dcc_trace = -1;
-static int hf_dcc_trace_admin = -1;
-static int hf_dcc_trace_anon = -1;
-static int hf_dcc_trace_client = -1;
-static int hf_dcc_trace_rlim = -1;
-static int hf_dcc_trace_query = -1;
-static int hf_dcc_trace_ridc = -1;
-static int hf_dcc_trace_flood = -1;
-
-static int hf_dcc_addr = -1;
-static int hf_dcc_id = -1;
-static int hf_dcc_last_used = -1;
-static int hf_dcc_requests = -1;
-static int hf_dcc_pad = -1;
-static int hf_dcc_unused = -1;
-
-static gint ett_dcc = -1;
-static gint ett_dcc_opnums = -1;
-static gint ett_dcc_op = -1;
-static gint ett_dcc_ck = -1;
-static gint ett_dcc_trace = -1;
-
-static expert_field ei_dcc_len = EI_INIT;
+static int proto_dcc;
+static int hf_dcc_len;
+static int hf_dcc_pkt_vers;
+static int hf_dcc_op;
+static int hf_dcc_clientid;
+static int hf_dcc_opnums_host;
+static int hf_dcc_opnums_pid;
+static int hf_dcc_opnums_report;
+static int hf_dcc_opnums_retrans;
+
+static int hf_dcc_signature;
+static int hf_dcc_max_pkt_vers;
+static int hf_dcc_qdelay_ms;
+static int hf_dcc_brand;
+
+static int hf_dcc_ck_type;
+static int hf_dcc_ck_len;
+static int hf_dcc_ck_sum;
+
+static int hf_dcc_date;
+
+static int hf_dcc_target;
+static int hf_dcc_response_text;
+
+static int hf_dcc_adminop;
+static int hf_dcc_adminval;
+static int hf_dcc_floodop;
+static int hf_dcc_trace;
+static int hf_dcc_trace_admin;
+static int hf_dcc_trace_anon;
+static int hf_dcc_trace_client;
+static int hf_dcc_trace_rlim;
+static int hf_dcc_trace_query;
+static int hf_dcc_trace_ridc;
+static int hf_dcc_trace_flood;
+
+static int hf_dcc_addr;
+static int hf_dcc_id;
+static int hf_dcc_last_used;
+static int hf_dcc_requests;
+static int hf_dcc_pad;
+static int hf_dcc_unused;
+
+static gint ett_dcc;
+static gint ett_dcc_opnums;
+static gint ett_dcc_op;
+static gint ett_dcc_ck;
+static gint ett_dcc_trace;
+
+static expert_field ei_dcc_len;
 
 /* Utility macros */
 #define D_SIGNATURE() \
diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c
index 3481698c29..41bc44ddeb 100644
--- a/epan/dissectors/packet-dccp.c
+++ b/epan/dissectors/packet-dccp.c
@@ -197,114 +197,114 @@ static const range_string dccp_feature_numbers_rvals[] = {
 
 static const unit_name_string units_bytes_sec = { "bytes/sec", NULL };
 
-static int proto_dccp = -1;
+static int proto_dccp;
 static int dccp_tap = -1;
 static int dccp_follow_tap = -1;
 
-static int hf_dccp_srcport = -1;
-static int hf_dccp_dstport = -1;
-static int hf_dccp_port = -1;
-static int hf_dccp_stream = -1;
-static int hf_dccp_data_offset = -1;
-static int hf_dccp_ccval = -1;
-static int hf_dccp_cscov = -1;
-static int hf_dccp_checksum = -1;
-static int hf_dccp_checksum_status = -1;
-static int hf_dccp_res1 = -1;
-static int hf_dccp_type = -1;
-static int hf_dccp_x = -1;
-static int hf_dccp_res2 = -1;
-static int hf_dccp_seq = -1;
-static int hf_dccp_seq_abs = -1;
-
-static int hf_dccp_ack_res = -1;
-static int hf_dccp_ack = -1;
-static int hf_dccp_ack_abs = -1;
-
-static int hf_dccp_service_code = -1;
-static int hf_dccp_reset_code = -1;
-static int hf_dccp_data1 = -1;
-static int hf_dccp_data2 = -1;
-static int hf_dccp_data3 = -1;
-
-static int hf_dccp_options = -1;
-static int hf_dccp_option_type = -1;
-static int hf_dccp_feature_number = -1;
-static int hf_dccp_ndp_count = -1;
-static int hf_dccp_timestamp = -1;
-static int hf_dccp_timestamp_echo = -1;
-static int hf_dccp_elapsed_time = -1;
-static int hf_dccp_data_checksum = -1;
+static int hf_dccp_srcport;
+static int hf_dccp_dstport;
+static int hf_dccp_port;
+static int hf_dccp_stream;
+static int hf_dccp_data_offset;
+static int hf_dccp_ccval;
+static int hf_dccp_cscov;
+static int hf_dccp_checksum;
+static int hf_dccp_checksum_status;
+static int hf_dccp_res1;
+static int hf_dccp_type;
+static int hf_dccp_x;
+static int hf_dccp_res2;
+static int hf_dccp_seq;
+static int hf_dccp_seq_abs;
+
+static int hf_dccp_ack_res;
+static int hf_dccp_ack;
+static int hf_dccp_ack_abs;
+
+static int hf_dccp_service_code;
+static int hf_dccp_reset_code;
+static int hf_dccp_data1;
+static int hf_dccp_data2;
+static int hf_dccp_data3;
+
+static int hf_dccp_options;
+static int hf_dccp_option_type;
+static int hf_dccp_feature_number;
+static int hf_dccp_ndp_count;
+static int hf_dccp_timestamp;
+static int hf_dccp_timestamp_echo;
+static int hf_dccp_elapsed_time;
+static int hf_dccp_data_checksum;
 
 /* MP-DCCP Option fields */
-static int hf_mpdccp_confirm = -1;
+static int hf_mpdccp_confirm;
 
-static int hf_mpdccp_version = -1;
+static int hf_mpdccp_version;
 
-static int hf_mpdccp_join = -1;
-static int hf_mpdccp_join_id = -1;
-static int hf_mpdccp_join_token = -1;
-static int hf_mpdccp_join_nonce = -1;
+static int hf_mpdccp_join;
+static int hf_mpdccp_join_id;
+static int hf_mpdccp_join_token;
+static int hf_mpdccp_join_nonce;
 
-static int hf_mpdccp_fast_close = -1;
+static int hf_mpdccp_fast_close;
 
-static int hf_mpdccp_key = -1;
-static int hf_mpdccp_key_type = -1;
-static int hf_mpdccp_key_key = -1;
+static int hf_mpdccp_key;
+static int hf_mpdccp_key_type;
+static int hf_mpdccp_key_key;
 
-static int hf_mpdccp_seq = -1;
+static int hf_mpdccp_seq;
 
-static int hf_mpdccp_hmac = -1;
-static int hf_mpdccp_hmac_sha = -1;
+static int hf_mpdccp_hmac;
+static int hf_mpdccp_hmac_sha;
 
-static int hf_mpdccp_rtt = -1;
-static int hf_mpdccp_rtt_type = -1;
-static int hf_mpdccp_rtt_value = -1;
-static int hf_mpdccp_rtt_age = -1;
+static int hf_mpdccp_rtt;
+static int hf_mpdccp_rtt_type;
+static int hf_mpdccp_rtt_value;
+static int hf_mpdccp_rtt_age;
 
-static int hf_mpdccp_addaddr = -1;
-static int hf_mpdccp_addrid = -1;
-//static int hf_mpdccp_addr=-1;
-static int hf_mpdccp_addr_dec=-1;
-static int hf_mpdccp_addr_hex=-1;
-static int hf_mpdccp_addrport=-1;
+static int hf_mpdccp_addaddr;
+static int hf_mpdccp_addrid;
+//static int hf_mpdccp_addr;
+static int hf_mpdccp_addr_dec;
+static int hf_mpdccp_addr_hex;
+static int hf_mpdccp_addrport;
 
-static int hf_mpdccp_removeaddr = -1;
+static int hf_mpdccp_removeaddr;
 
-static int hf_mpdccp_prio = -1;
-static int hf_mpdccp_prio_value = -1;
+static int hf_mpdccp_prio;
+static int hf_mpdccp_prio_value;
 
-static int hf_mpdccp_close = -1;
-static int hf_mpdccp_close_key = -1;
+static int hf_mpdccp_close;
+static int hf_mpdccp_close_key;
 
-static int hf_mpdccp_exp=-1;
+static int hf_mpdccp_exp;
 
-static int hf_dccp_option_data = -1;
+static int hf_dccp_option_data;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_dccp_padding = -1;
-static int hf_dccp_mandatory = -1;
-static int hf_dccp_slow_receiver = -1;
-static int hf_dccp_init_cookie = -1;
-static int hf_dccp_ack_vector_nonce_0 = -1;
-static int hf_dccp_ack_vector_nonce_1 = -1;
-static int hf_dccp_data_dropped = -1;
-static int hf_dccp_ccid3_loss_event_rate = -1;
-static int hf_dccp_ccid3_loss_intervals = -1;
-static int hf_dccp_ccid3_receive_rate = -1;
-static int hf_dccp_option_reserved = -1;
-static int hf_dccp_ccid_option_data = -1;
-static int hf_dccp_option_unknown = -1;
-
-static gint ett_dccp = -1;
-static gint ett_dccp_options = -1;
-static gint ett_dccp_options_item = -1;
-static gint ett_dccp_feature = -1;
-
-static expert_field ei_dccp_option_len_bad = EI_INIT;
-static expert_field ei_dccp_advertised_header_length_bad = EI_INIT;
-static expert_field ei_dccp_packet_type_reserved = EI_INIT;
-static expert_field ei_dccp_checksum = EI_INIT;
+static int hf_dccp_padding;
+static int hf_dccp_mandatory;
+static int hf_dccp_slow_receiver;
+static int hf_dccp_init_cookie;
+static int hf_dccp_ack_vector_nonce_0;
+static int hf_dccp_ack_vector_nonce_1;
+static int hf_dccp_data_dropped;
+static int hf_dccp_ccid3_loss_event_rate;
+static int hf_dccp_ccid3_loss_intervals;
+static int hf_dccp_ccid3_receive_rate;
+static int hf_dccp_option_reserved;
+static int hf_dccp_ccid_option_data;
+static int hf_dccp_option_unknown;
+
+static gint ett_dccp;
+static gint ett_dccp_options;
+static gint ett_dccp_options_item;
+static gint ett_dccp_feature;
+
+static expert_field ei_dccp_option_len_bad;
+static expert_field ei_dccp_advertised_header_length_bad;
+static expert_field ei_dccp_packet_type_reserved;
+static expert_field ei_dccp_checksum;
 
 static dissector_table_t dccp_subdissector_table;
 static heur_dissector_list_t heur_subdissector_list;
diff --git a/epan/dissectors/packet-dcerpc-bossvr.c b/epan/dissectors/packet-dcerpc-bossvr.c
index bcce23a551..5f447bd116 100644
--- a/epan/dissectors/packet-dcerpc-bossvr.c
+++ b/epan/dissectors/packet-dcerpc-bossvr.c
@@ -22,11 +22,11 @@ void proto_register_dcerpc_bossvr(void);
 void proto_reg_handoff_dcerpc_bossvr(void);
 
 
-static int proto_bossvr = -1;
-static int hf_bossvr_opnum = -1;
+static int proto_bossvr;
+static int hf_bossvr_opnum;
 
 
-static gint ett_bossvr = -1;
+static gint ett_bossvr;
 
 
 static e_guid_t uuid_bossvr = { 0x4d37f2dd, 0xed43, 0x0000, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x01 } };
diff --git a/epan/dissectors/packet-dcerpc-browser.c b/epan/dissectors/packet-dcerpc-browser.c
index 107583a58b..cdd1183bb1 100644
--- a/epan/dissectors/packet-dcerpc-browser.c
+++ b/epan/dissectors/packet-dcerpc-browser.c
@@ -26,16 +26,16 @@
 void proto_register_dcerpc_browser(void);
 void proto_reg_handoff_dcerpc_browser(void);
 
-static int proto_dcerpc_browser = -1;
-static int hf_browser_opnum = -1;
-static int hf_browser_rc = -1;
-static int hf_browser_unknown_long = -1;
-static int hf_browser_unknown_hyper = -1;
-static int hf_browser_unknown_bytes = -1;
-static int hf_browser_unknown_string = -1;
+static int proto_dcerpc_browser;
+static int hf_browser_opnum;
+static int hf_browser_rc;
+static int hf_browser_unknown_long;
+static int hf_browser_unknown_hyper;
+static int hf_browser_unknown_bytes;
+static int hf_browser_unknown_string;
 
 
-static gint ett_dcerpc_browser = -1;
+static gint ett_dcerpc_browser;
 
 
 static int
diff --git a/epan/dissectors/packet-dcerpc-budb.c b/epan/dissectors/packet-dcerpc-budb.c
index a83302117e..c7a1d5596a 100644
--- a/epan/dissectors/packet-dcerpc-budb.c
+++ b/epan/dissectors/packet-dcerpc-budb.c
@@ -27,224 +27,224 @@
 void proto_register_budb(void);
 void proto_reg_handoff_budb(void);
 
-static int proto_budb = -1;
+static int proto_budb;
 
 
 /* INCLUDED FILE : ETH_HF */
-static int hf_budb_opnum = -1;
-static int hf_budb_rc = -1;
-static int hf_budb_principal_name = -1;
-static int hf_budb_principal_instance = -1;
-static int hf_budb_principal_cell = -1;
-static int hf_budb_principal_spare = -1;
-static int hf_budb_principal_spare1 = -1;
-static int hf_budb_principal_spare2 = -1;
-static int hf_budb_principal_spare3 = -1;
-static int hf_budb_principal_spare4 = -1;
-static int hf_budb_tapeSet_id = -1;
-static int hf_budb_tapeSet_tapeServer = -1;
-static int hf_budb_tapeSet_format = -1;
-static int hf_budb_tapeSet_maxTapes = -1;
-static int hf_budb_tapeSet_a = -1;
-static int hf_budb_tapeSet_b = -1;
-static int hf_budb_tapeSet_spare1 = -1;
-static int hf_budb_tapeSet_spare2 = -1;
-static int hf_budb_tapeSet_spare3 = -1;
-static int hf_budb_tapeSet_spare4 = -1;
-static int hf_budb_dumpEntry_id = -1;
-static int hf_budb_dumpEntry_parent = -1;
-static int hf_budb_dumpEntry_level = -1;
-static int hf_budb_dumpEntry_flags = -1;
-static int hf_budb_dumpEntry_volumeSetName = -1;
-static int hf_budb_dumpEntry_dumpPath = -1;
-static int hf_budb_dumpEntry_name = -1;
-static int hf_budb_dumpEntry_created = -1;
-static int hf_budb_dumpEntry_incTime = -1;
-static int hf_budb_dumpEntry_nVolumes = -1;
-static int hf_budb_dumpEntry_tapes = -1;
-static int hf_budb_dumpEntry_dumper = -1;
-static int hf_budb_dumpEntry_spare1 = -1;
-static int hf_budb_dumpEntry_spare2 = -1;
-static int hf_budb_dumpEntry_spare3 = -1;
-static int hf_budb_dumpEntry_spare4 = -1;
-static int hf_budb_tapeEntry_name = -1;
-static int hf_budb_tapeEntry_flags = -1;
-static int hf_budb_tapeEntry_written = -1;
-static int hf_budb_tapeEntry_expires = -1;
-static int hf_budb_tapeEntry_nMBytes = -1;
-static int hf_budb_tapeEntry_nBytes = -1;
-static int hf_budb_tapeEntry_nFiles = -1;
-static int hf_budb_tapeEntry_nVolumes = -1;
-static int hf_budb_tapeEntry_seq = -1;
-static int hf_budb_tapeEntry_tapeid = -1;
-static int hf_budb_tapeEntry_useCount = -1;
-static int hf_budb_tapeEntry_mediaType = -1;
-static int hf_budb_tapeEntry_dump = -1;
-static int hf_budb_tapeEntry_spare1 = -1;
-static int hf_budb_tapeEntry_spare2 = -1;
-static int hf_budb_tapeEntry_spare3 = -1;
-static int hf_budb_tapeEntry_spare4 = -1;
-static int hf_budb_volumeEntry_name = -1;
-static int hf_budb_volumeEntry_flags = -1;
-static int hf_budb_volumeEntry_id = -1;
-static int hf_budb_volumeEntry_server = -1;
-static int hf_budb_volumeEntry_partition = -1;
-static int hf_budb_volumeEntry_nFrags = -1;
-static int hf_budb_volumeEntry_position = -1;
-static int hf_budb_volumeEntry_clone = -1;
-static int hf_budb_volumeEntry_incTime = -1;
-static int hf_budb_volumeEntry_startByte = -1;
-static int hf_budb_volumeEntry_nBytes = -1;
-static int hf_budb_volumeEntry_seq = -1;
-static int hf_budb_volumeEntry_dump = -1;
-static int hf_budb_volumeEntry_tape = -1;
-static int hf_budb_volumeEntry_spare1 = -1;
-static int hf_budb_volumeEntry_spare2 = -1;
-static int hf_budb_volumeEntry_spare3 = -1;
-static int hf_budb_volumeEntry_spare4 = -1;
-static int hf_budb_volumeList_volumeList_len = -1;
-static int hf_budb_volumeList_volumeList_val = -1;
-static int hf_budb_dumpList_dumpList_len = -1;
-static int hf_budb_dumpList_dumpList_val = -1;
-static int hf_budb_tapeList_tapeList_len = -1;
-static int hf_budb_tapeList_tapeList_val = -1;
-static int hf_budb_charListT_charListT_len = -1;
-static int hf_budb_charListT_charListT_val = -1;
-static int hf_budb_DbHeader_dbversion = -1;
-static int hf_budb_DbHeader_created = -1;
-static int hf_budb_DbHeader_cell = -1;
-static int hf_budb_DbHeader_lastDumpId = -1;
-static int hf_budb_DbHeader_lastInstanceId = -1;
-static int hf_budb_DbHeader_lastTapeId = -1;
-static int hf_budb_DbHeader_spare1 = -1;
-static int hf_budb_DbHeader_spare2 = -1;
-static int hf_budb_DbHeader_spare3 = -1;
-static int hf_budb_DbHeader_spare4 = -1;
-static int hf_budb_dbVolume_name = -1;
-static int hf_budb_dbVolume_flags = -1;
-static int hf_budb_dbVolume_id = -1;
-static int hf_budb_dbVolume_server = -1;
-static int hf_budb_dbVolume_partition = -1;
-static int hf_budb_dbVolume_nFrags = -1;
-static int hf_budb_dbVolume_position = -1;
-static int hf_budb_dbVolume_clone = -1;
-static int hf_budb_dbVolume_incTime = -1;
-static int hf_budb_dbVolume_startByte = -1;
-static int hf_budb_dbVolume_nBytes = -1;
-static int hf_budb_dbVolume_seq = -1;
-static int hf_budb_dbVolume_dump = -1;
-static int hf_budb_dbVolume_tape = -1;
-static int hf_budb_dbVolume_spare1 = -1;
-static int hf_budb_dbVolume_spare2 = -1;
-static int hf_budb_dbVolume_spare3 = -1;
-static int hf_budb_dbVolume_spare4 = -1;
-static int hf_budb_structDumpHeader_type = -1;
-static int hf_budb_structDumpHeader_structversion = -1;
-static int hf_budb_structDumpHeader_size = -1;
-static int hf_budb_structDumpHeader_spare1 = -1;
-static int hf_budb_structDumpHeader_spare2 = -1;
-static int hf_budb_structDumpHeader_spare3 = -1;
-static int hf_budb_structDumpHeader_spare4 = -1;
-static int hf_budb_AddVolume_vol = -1;
-static int hf_budb_CreateDump_dump = -1;
-static int hf_budb_DeleteDump_id = -1;
-static int hf_budb_DeleteTape_tape = -1;
-static int hf_budb_DeleteVDP_dsname = -1;
-static int hf_budb_DeleteVDP_dumpPath = -1;
-static int hf_budb_DeleteVDP_curDumpId = -1;
-static int hf_budb_FindClone_dumpID = -1;
-static int hf_budb_FindClone_volName = -1;
-static int hf_budb_FindClone_clonetime = -1;
-static int hf_budb_FindClone_cloneSpare = -1;
-static int hf_budb_FindDump_volName = -1;
-static int hf_budb_FindDump_beforeDate = -1;
-static int hf_budb_FindDump_dateSpare = -1;
-static int hf_budb_FindDump_deptr = -1;
-static int hf_budb_FindLatestDump_vsname = -1;
-static int hf_budb_FindLatestDump_dname = -1;
-static int hf_budb_FindLatestDump_dumpentry = -1;
-static int hf_budb_FinishDump_dump = -1;
-static int hf_budb_FinishTape_tape = -1;
-static int hf_budb_GetDumps_majorVersion = -1;
-static int hf_budb_GetDumps_flags = -1;
-static int hf_budb_GetDumps_name = -1;
-static int hf_budb_GetDumps_start = -1;
-static int hf_budb_GetDumps_end = -1;
-static int hf_budb_GetDumps_index = -1;
-static int hf_budb_GetDumps_nextIndex = -1;
-static int hf_budb_GetDumps_dbUpdate = -1;
-static int hf_budb_GetDumps_dumps = -1;
-static int hf_budb_GetTapes_majorVersion = -1;
-static int hf_budb_GetTapes_flags = -1;
-static int hf_budb_GetTapes_name = -1;
-static int hf_budb_GetTapes_start = -1;
-static int hf_budb_GetTapes_end = -1;
-static int hf_budb_GetTapes_index = -1;
-static int hf_budb_GetTapes_nextIndex = -1;
-static int hf_budb_GetTapes_dbUpdate = -1;
-static int hf_budb_GetTapes_tapes = -1;
-static int hf_budb_GetVolumes_majorVersion = -1;
-static int hf_budb_GetVolumes_flags = -1;
-static int hf_budb_GetVolumes_name = -1;
-static int hf_budb_GetVolumes_start = -1;
-static int hf_budb_GetVolumes_end = -1;
-static int hf_budb_GetVolumes_index = -1;
-static int hf_budb_GetVolumes_nextIndex = -1;
-static int hf_budb_GetVolumes_dbUpdate = -1;
-static int hf_budb_GetVolumes_volumes = -1;
-static int hf_budb_UseTape_tape = -1;
-static int hf_budb_UseTape_new = -1;
-static int hf_budb_GetText_lockHandle = -1;
-static int hf_budb_GetText_textType = -1;
-static int hf_budb_GetText_maxLength = -1;
-static int hf_budb_GetText_offset = -1;
-static int hf_budb_GetText_nextOffset = -1;
-static int hf_budb_GetText_charListPtr = -1;
-static int hf_budb_GetTextVersion_textType = -1;
-static int hf_budb_GetTextVersion_tversion = -1;
-static int hf_budb_SaveText_lockHandle = -1;
-static int hf_budb_SaveText_textType = -1;
-static int hf_budb_SaveText_offset = -1;
-static int hf_budb_SaveText_flags = -1;
-static int hf_budb_SaveText_charListPtr = -1;
-static int hf_budb_FreeAllLocks_instanceId = -1;
-static int hf_budb_FreeLock_lockHandle = -1;
-static int hf_budb_GetInstanceId_instanceId = -1;
-static int hf_budb_GetLock_instanceId = -1;
-static int hf_budb_GetLock_lockName = -1;
-static int hf_budb_GetLock_expiration = -1;
-static int hf_budb_GetLock_lockHandle = -1;
-static int hf_budb_DbVerify_status = -1;
-static int hf_budb_DbVerify_orphans = -1;
-static int hf_budb_DbVerify_host = -1;
-static int hf_budb_DumpDB_maxLength = -1;
-static int hf_budb_DumpDB_flags = -1;
-static int hf_budb_DumpDB_charListPtr = -1;
-static int hf_budb_RestoreDbHeader_header = -1;
-static int hf_budb_T_GetVersion_majorVersion = -1;
-static int hf_budb_T_DumpHashTable_type = -1;
-static int hf_budb_T_DumpHashTable_filename = -1;
-static int hf_budb_T_DumpDatabase_filename = -1;
-static int hf_budb_dfs_interfaceDescription_interface_uuid = -1;
-static int hf_budb_dfs_interfaceDescription_vers_major = -1;
-static int hf_budb_dfs_interfaceDescription_vers_minor = -1;
-static int hf_budb_dfs_interfaceDescription_vers_provider = -1;
-static int hf_budb_dfs_interfaceDescription_spare0 = -1;
-static int hf_budb_dfs_interfaceDescription_spare1 = -1;
-static int hf_budb_dfs_interfaceDescription_spare2 = -1;
-static int hf_budb_dfs_interfaceDescription_spare3 = -1;
-static int hf_budb_dfs_interfaceDescription_spare4 = -1;
-static int hf_budb_dfs_interfaceDescription_spare5 = -1;
-static int hf_budb_dfs_interfaceDescription_spare6 = -1;
-static int hf_budb_dfs_interfaceDescription_spare7 = -1;
-static int hf_budb_dfs_interfaceDescription_spare8 = -1;
-static int hf_budb_dfs_interfaceDescription_spare9 = -1;
-static int hf_budb_dfs_interfaceDescription_spareText = -1;
-static int hf_budb_dfs_interfaceList_dfs_interfaceList_len = -1;
-static int hf_budb_dfs_interfaceList_dfs_interfaceList_val = -1;
-static int hf_budb_GetServerInterfaces_serverInterfacesP = -1;
-static int hf_budb_AddVolumes_cnt = -1;
-static int hf_budb_AddVolumes_vol = -1;
+static int hf_budb_opnum;
+static int hf_budb_rc;
+static int hf_budb_principal_name;
+static int hf_budb_principal_instance;
+static int hf_budb_principal_cell;
+static int hf_budb_principal_spare;
+static int hf_budb_principal_spare1;
+static int hf_budb_principal_spare2;
+static int hf_budb_principal_spare3;
+static int hf_budb_principal_spare4;
+static int hf_budb_tapeSet_id;
+static int hf_budb_tapeSet_tapeServer;
+static int hf_budb_tapeSet_format;
+static int hf_budb_tapeSet_maxTapes;
+static int hf_budb_tapeSet_a;
+static int hf_budb_tapeSet_b;
+static int hf_budb_tapeSet_spare1;
+static int hf_budb_tapeSet_spare2;
+static int hf_budb_tapeSet_spare3;
+static int hf_budb_tapeSet_spare4;
+static int hf_budb_dumpEntry_id;
+static int hf_budb_dumpEntry_parent;
+static int hf_budb_dumpEntry_level;
+static int hf_budb_dumpEntry_flags;
+static int hf_budb_dumpEntry_volumeSetName;
+static int hf_budb_dumpEntry_dumpPath;
+static int hf_budb_dumpEntry_name;
+static int hf_budb_dumpEntry_created;
+static int hf_budb_dumpEntry_incTime;
+static int hf_budb_dumpEntry_nVolumes;
+static int hf_budb_dumpEntry_tapes;
+static int hf_budb_dumpEntry_dumper;
+static int hf_budb_dumpEntry_spare1;
+static int hf_budb_dumpEntry_spare2;
+static int hf_budb_dumpEntry_spare3;
+static int hf_budb_dumpEntry_spare4;
+static int hf_budb_tapeEntry_name;
+static int hf_budb_tapeEntry_flags;
+static int hf_budb_tapeEntry_written;
+static int hf_budb_tapeEntry_expires;
+static int hf_budb_tapeEntry_nMBytes;
+static int hf_budb_tapeEntry_nBytes;
+static int hf_budb_tapeEntry_nFiles;
+static int hf_budb_tapeEntry_nVolumes;
+static int hf_budb_tapeEntry_seq;
+static int hf_budb_tapeEntry_tapeid;
+static int hf_budb_tapeEntry_useCount;
+static int hf_budb_tapeEntry_mediaType;
+static int hf_budb_tapeEntry_dump;
+static int hf_budb_tapeEntry_spare1;
+static int hf_budb_tapeEntry_spare2;
+static int hf_budb_tapeEntry_spare3;
+static int hf_budb_tapeEntry_spare4;
+static int hf_budb_volumeEntry_name;
+static int hf_budb_volumeEntry_flags;
+static int hf_budb_volumeEntry_id;
+static int hf_budb_volumeEntry_server;
+static int hf_budb_volumeEntry_partition;
+static int hf_budb_volumeEntry_nFrags;
+static int hf_budb_volumeEntry_position;
+static int hf_budb_volumeEntry_clone;
+static int hf_budb_volumeEntry_incTime;
+static int hf_budb_volumeEntry_startByte;
+static int hf_budb_volumeEntry_nBytes;
+static int hf_budb_volumeEntry_seq;
+static int hf_budb_volumeEntry_dump;
+static int hf_budb_volumeEntry_tape;
+static int hf_budb_volumeEntry_spare1;
+static int hf_budb_volumeEntry_spare2;
+static int hf_budb_volumeEntry_spare3;
+static int hf_budb_volumeEntry_spare4;
+static int hf_budb_volumeList_volumeList_len;
+static int hf_budb_volumeList_volumeList_val;
+static int hf_budb_dumpList_dumpList_len;
+static int hf_budb_dumpList_dumpList_val;
+static int hf_budb_tapeList_tapeList_len;
+static int hf_budb_tapeList_tapeList_val;
+static int hf_budb_charListT_charListT_len;
+static int hf_budb_charListT_charListT_val;
+static int hf_budb_DbHeader_dbversion;
+static int hf_budb_DbHeader_created;
+static int hf_budb_DbHeader_cell;
+static int hf_budb_DbHeader_lastDumpId;
+static int hf_budb_DbHeader_lastInstanceId;
+static int hf_budb_DbHeader_lastTapeId;
+static int hf_budb_DbHeader_spare1;
+static int hf_budb_DbHeader_spare2;
+static int hf_budb_DbHeader_spare3;
+static int hf_budb_DbHeader_spare4;
+static int hf_budb_dbVolume_name;
+static int hf_budb_dbVolume_flags;
+static int hf_budb_dbVolume_id;
+static int hf_budb_dbVolume_server;
+static int hf_budb_dbVolume_partition;
+static int hf_budb_dbVolume_nFrags;
+static int hf_budb_dbVolume_position;
+static int hf_budb_dbVolume_clone;
+static int hf_budb_dbVolume_incTime;
+static int hf_budb_dbVolume_startByte;
+static int hf_budb_dbVolume_nBytes;
+static int hf_budb_dbVolume_seq;
+static int hf_budb_dbVolume_dump;
+static int hf_budb_dbVolume_tape;
+static int hf_budb_dbVolume_spare1;
+static int hf_budb_dbVolume_spare2;
+static int hf_budb_dbVolume_spare3;
+static int hf_budb_dbVolume_spare4;
+static int hf_budb_structDumpHeader_type;
+static int hf_budb_structDumpHeader_structversion;
+static int hf_budb_structDumpHeader_size;
+static int hf_budb_structDumpHeader_spare1;
+static int hf_budb_structDumpHeader_spare2;
+static int hf_budb_structDumpHeader_spare3;
+static int hf_budb_structDumpHeader_spare4;
+static int hf_budb_AddVolume_vol;
+static int hf_budb_CreateDump_dump;
+static int hf_budb_DeleteDump_id;
+static int hf_budb_DeleteTape_tape;
+static int hf_budb_DeleteVDP_dsname;
+static int hf_budb_DeleteVDP_dumpPath;
+static int hf_budb_DeleteVDP_curDumpId;
+static int hf_budb_FindClone_dumpID;
+static int hf_budb_FindClone_volName;
+static int hf_budb_FindClone_clonetime;
+static int hf_budb_FindClone_cloneSpare;
+static int hf_budb_FindDump_volName;
+static int hf_budb_FindDump_beforeDate;
+static int hf_budb_FindDump_dateSpare;
+static int hf_budb_FindDump_deptr;
+static int hf_budb_FindLatestDump_vsname;
+static int hf_budb_FindLatestDump_dname;
+static int hf_budb_FindLatestDump_dumpentry;
+static int hf_budb_FinishDump_dump;
+static int hf_budb_FinishTape_tape;
+static int hf_budb_GetDumps_majorVersion;
+static int hf_budb_GetDumps_flags;
+static int hf_budb_GetDumps_name;
+static int hf_budb_GetDumps_start;
+static int hf_budb_GetDumps_end;
+static int hf_budb_GetDumps_index;
+static int hf_budb_GetDumps_nextIndex;
+static int hf_budb_GetDumps_dbUpdate;
+static int hf_budb_GetDumps_dumps;
+static int hf_budb_GetTapes_majorVersion;
+static int hf_budb_GetTapes_flags;
+static int hf_budb_GetTapes_name;
+static int hf_budb_GetTapes_start;
+static int hf_budb_GetTapes_end;
+static int hf_budb_GetTapes_index;
+static int hf_budb_GetTapes_nextIndex;
+static int hf_budb_GetTapes_dbUpdate;
+static int hf_budb_GetTapes_tapes;
+static int hf_budb_GetVolumes_majorVersion;
+static int hf_budb_GetVolumes_flags;
+static int hf_budb_GetVolumes_name;
+static int hf_budb_GetVolumes_start;
+static int hf_budb_GetVolumes_end;
+static int hf_budb_GetVolumes_index;
+static int hf_budb_GetVolumes_nextIndex;
+static int hf_budb_GetVolumes_dbUpdate;
+static int hf_budb_GetVolumes_volumes;
+static int hf_budb_UseTape_tape;
+static int hf_budb_UseTape_new;
+static int hf_budb_GetText_lockHandle;
+static int hf_budb_GetText_textType;
+static int hf_budb_GetText_maxLength;
+static int hf_budb_GetText_offset;
+static int hf_budb_GetText_nextOffset;
+static int hf_budb_GetText_charListPtr;
+static int hf_budb_GetTextVersion_textType;
+static int hf_budb_GetTextVersion_tversion;
+static int hf_budb_SaveText_lockHandle;
+static int hf_budb_SaveText_textType;
+static int hf_budb_SaveText_offset;
+static int hf_budb_SaveText_flags;
+static int hf_budb_SaveText_charListPtr;
+static int hf_budb_FreeAllLocks_instanceId;
+static int hf_budb_FreeLock_lockHandle;
+static int hf_budb_GetInstanceId_instanceId;
+static int hf_budb_GetLock_instanceId;
+static int hf_budb_GetLock_lockName;
+static int hf_budb_GetLock_expiration;
+static int hf_budb_GetLock_lockHandle;
+static int hf_budb_DbVerify_status;
+static int hf_budb_DbVerify_orphans;
+static int hf_budb_DbVerify_host;
+static int hf_budb_DumpDB_maxLength;
+static int hf_budb_DumpDB_flags;
+static int hf_budb_DumpDB_charListPtr;
+static int hf_budb_RestoreDbHeader_header;
+static int hf_budb_T_GetVersion_majorVersion;
+static int hf_budb_T_DumpHashTable_type;
+static int hf_budb_T_DumpHashTable_filename;
+static int hf_budb_T_DumpDatabase_filename;
+static int hf_budb_dfs_interfaceDescription_interface_uuid;
+static int hf_budb_dfs_interfaceDescription_vers_major;
+static int hf_budb_dfs_interfaceDescription_vers_minor;
+static int hf_budb_dfs_interfaceDescription_vers_provider;
+static int hf_budb_dfs_interfaceDescription_spare0;
+static int hf_budb_dfs_interfaceDescription_spare1;
+static int hf_budb_dfs_interfaceDescription_spare2;
+static int hf_budb_dfs_interfaceDescription_spare3;
+static int hf_budb_dfs_interfaceDescription_spare4;
+static int hf_budb_dfs_interfaceDescription_spare5;
+static int hf_budb_dfs_interfaceDescription_spare6;
+static int hf_budb_dfs_interfaceDescription_spare7;
+static int hf_budb_dfs_interfaceDescription_spare8;
+static int hf_budb_dfs_interfaceDescription_spare9;
+static int hf_budb_dfs_interfaceDescription_spareText;
+static int hf_budb_dfs_interfaceList_dfs_interfaceList_len;
+static int hf_budb_dfs_interfaceList_dfs_interfaceList_val;
+static int hf_budb_GetServerInterfaces_serverInterfacesP;
+static int hf_budb_AddVolumes_cnt;
+static int hf_budb_AddVolumes_vol;
 /* END OF INCLUDED FILE : ETH_HF */
 
 
@@ -252,21 +252,21 @@ static int hf_budb_AddVolumes_vol = -1;
 
 
 /* INCLUDED FILE : ETH_ETT */
-static gint ett_budb = -1;
-static gint ett_budb_principal = -1;
-static gint ett_budb_tapeSet = -1;
-static gint ett_budb_dumpEntry = -1;
-static gint ett_budb_tapeEntry = -1;
-static gint ett_budb_volumeEntry = -1;
-static gint ett_budb_volumeList = -1;
-static gint ett_budb_dumpList = -1;
-static gint ett_budb_tapeList = -1;
-static gint ett_budb_charListT = -1;
-static gint ett_budb_DbHeader = -1;
-static gint ett_budb_dbVolume = -1;
-static gint ett_budb_structDumpHeader = -1;
-static gint ett_budb_dfs_interfaceDescription = -1;
-static gint ett_budb_dfs_interfaceList = -1;
+static gint ett_budb;
+static gint ett_budb_principal;
+static gint ett_budb_tapeSet;
+static gint ett_budb_dumpEntry;
+static gint ett_budb_tapeEntry;
+static gint ett_budb_volumeEntry;
+static gint ett_budb_volumeList;
+static gint ett_budb_dumpList;
+static gint ett_budb_tapeList;
+static gint ett_budb_charListT;
+static gint ett_budb_DbHeader;
+static gint ett_budb_dbVolume;
+static gint ett_budb_structDumpHeader;
+static gint ett_budb_dfs_interfaceDescription;
+static gint ett_budb_dfs_interfaceList;
 /* END OF INCLUDED FILE : ETH_ETT */
 
 
diff --git a/epan/dissectors/packet-dcerpc-butc.c b/epan/dissectors/packet-dcerpc-butc.c
index a5f74ae765..74e15b3add 100644
--- a/epan/dissectors/packet-dcerpc-butc.c
+++ b/epan/dissectors/packet-dcerpc-butc.c
@@ -26,134 +26,134 @@
 void proto_register_butc(void);
 void proto_reg_handoff_butc(void);
 
-static int proto_butc = -1;
+static int proto_butc;
 
 
 /* INCLUDED FILE : ETH_HF */
-static int hf_butc_opnum = -1;
-static int hf_butc_rc = -1;
-static int hf_butc_Restore_flags_TC_RESTORE_CREATE = -1;
-static int hf_butc_Restore_flags_TC_RESTORE_INCR = -1;
-static int hf_butc_afsNetAddr_type = -1;
-static int hf_butc_afsNetAddr_data = -1;
-static int hf_butc_tc_dumpDesc_vid = -1;
-static int hf_butc_tc_dumpDesc_name = -1;
-static int hf_butc_tc_dumpDesc_partition = -1;
-static int hf_butc_tc_dumpDesc_date = -1;
-static int hf_butc_tc_dumpDesc_cloneDate = -1;
-static int hf_butc_tc_dumpDesc_hostAddr = -1;
-static int hf_butc_tc_dumpDesc_spare1 = -1;
-static int hf_butc_tc_dumpDesc_spare2 = -1;
-static int hf_butc_tc_dumpDesc_spare3 = -1;
-static int hf_butc_tc_dumpDesc_spare4 = -1;
-static int hf_butc_tc_restoreDesc_frag = -1;
-static int hf_butc_tc_restoreDesc_tapeName = -1;
-static int hf_butc_tc_restoreDesc_position = -1;
-static int hf_butc_tc_restoreDesc_origVid = -1;
-static int hf_butc_tc_restoreDesc_vid = -1;
-static int hf_butc_tc_restoreDesc_partition = -1;
-static int hf_butc_tc_restoreDesc_flags = -1;
-static int hf_butc_tc_restoreDesc_hostAddr = -1;
-static int hf_butc_tc_restoreDesc_realDumpId = -1;
-static int hf_butc_tc_restoreDesc_spare2 = -1;
-static int hf_butc_tc_restoreDesc_spare3 = -1;
-static int hf_butc_tc_restoreDesc_spare4 = -1;
-static int hf_butc_tc_restoreDesc_oldName = -1;
-static int hf_butc_tc_restoreDesc_newName = -1;
-static int hf_butc_tc_dumpStat_dumpID = -1;
-static int hf_butc_tc_dumpStat_bytesDumped = -1;
-static int hf_butc_tc_dumpStat_volumeBeingDumped = -1;
-static int hf_butc_tc_dumpStat_numVolErrs = -1;
-static int hf_butc_tc_dumpStat_flags = -1;
-static int hf_butc_tc_dumpStat_spare1 = -1;
-static int hf_butc_tc_dumpStat_spare2 = -1;
-static int hf_butc_tc_dumpStat_spare3 = -1;
-static int hf_butc_tc_dumpStat_spare4 = -1;
-static int hf_butc_tc_tapeLabel_size = -1;
-static int hf_butc_tc_tapeLabel_size_ext = -1;
-static int hf_butc_tc_tapeLabel_spare1 = -1;
-static int hf_butc_tc_tapeLabel_spare2 = -1;
-static int hf_butc_tc_tapeLabel_spare3 = -1;
-static int hf_butc_tc_tapeLabel_spare4 = -1;
-static int hf_butc_tc_tapeLabel_nameLen = -1;
-static int hf_butc_tc_tapeLabel_name = -1;
-static int hf_butc_tc_tapeSet_id = -1;
-static int hf_butc_tc_tapeSet_tapeServer = -1;
-static int hf_butc_tc_tapeSet_format = -1;
-static int hf_butc_tc_tapeSet_maxTapes = -1;
-static int hf_butc_tc_tapeSet_a = -1;
-static int hf_butc_tc_tapeSet_b = -1;
-static int hf_butc_tc_tapeSet_expDate = -1;
-static int hf_butc_tc_tapeSet_expType = -1;
-static int hf_butc_tc_tapeSet_spare1 = -1;
-static int hf_butc_tc_tapeSet_spare2 = -1;
-static int hf_butc_tc_tapeSet_spare3 = -1;
-static int hf_butc_tc_tapeSet_spare4 = -1;
-static int hf_butc_tc_tcInfo_tcVersion = -1;
-static int hf_butc_tc_tcInfo_spare1 = -1;
-static int hf_butc_tc_tcInfo_spare2 = -1;
-static int hf_butc_tc_tcInfo_spare3 = -1;
-static int hf_butc_tc_tcInfo_spare4 = -1;
-static int hf_butc_tc_restoreArray_tc_restoreArray_len = -1;
-static int hf_butc_tc_restoreArray_tc_restoreArray_val = -1;
-static int hf_butc_tc_dumpArray_tc_dumpArray_len = -1;
-static int hf_butc_tc_dumpArray_tc_dumpArray = -1;
-static int hf_butc_tc_dumpInterface_dumpPath = -1;
-static int hf_butc_tc_dumpInterface_volumeSetName = -1;
-static int hf_butc_tc_dumpInterface_dumpName = -1;
-static int hf_butc_tc_dumpInterface_tapeSet = -1;
-static int hf_butc_tc_dumpInterface_parentDumpId = -1;
-static int hf_butc_tc_dumpInterface_dumpLevel = -1;
-static int hf_butc_tc_dumpInterface_spare1 = -1;
-static int hf_butc_tc_dumpInterface_spare2 = -1;
-static int hf_butc_tc_dumpInterface_spare3 = -1;
-static int hf_butc_tc_dumpInterface_spare4 = -1;
-static int hf_butc_tc_statusInfoSwitchVol_nKBytes = -1;
-static int hf_butc_tc_statusInfoSwitchVol_volumeName = -1;
-static int hf_butc_tc_statusInfoSwitchVol_volsFailed = -1;
-static int hf_butc_tc_statusInfoSwitchVol_spare1 = -1;
-static int hf_butc_tc_statusInfoSwitchLabel_tapeLabel = -1;
-static int hf_butc_tc_statusInfoSwitchLabel_spare1 = -1;
-static int hf_butc_tc_statusInfoSwitch_TCOP_NONE_none = -1;
-static int hf_butc_tc_statusInfoSwitch_TCOP_DUMP_vol = -1;
-static int hf_butc_tc_statusInfoSwitch_TCOP_RESTORE_vol = -1;
-static int hf_butc_tc_statusInfoSwitch_TCOP_LABELTAPE_label = -1;
-static int hf_butc_tc_statusInfoSwitch_TCOP_READLABEL_label = -1;
-static int hf_butc_tc_statusInfoSwitch_TCOP_SCANTAPE_spare1 = -1;
-static int hf_butc_tc_statusInfoSwitch_TCOP_STATUS_spare2 = -1;
-static int hf_butc_tc_statusInfoSwitch_TCOP_SAVEDB_spare3 = -1;
-static int hf_butc_tc_statusInfoSwitch_TCOP_RESTOREDB_spare4 = -1;
-static int hf_butc_tc_statusInfoSwitch_TCOP_SPARE_spare5 = -1;
-static int hf_butc_tciStatusS_taskName = -1;
-static int hf_butc_tciStatusS_flags = -1;
-static int hf_butc_tciStatusS_lastPolled = -1;
-static int hf_butc_tciStatusS_info = -1;
-static int hf_butc_tciStatusS_taskId = -1;
-static int hf_butc_tciStatusS_spare2 = -1;
-static int hf_butc_tciStatusS_spare3 = -1;
-static int hf_butc_tciStatusS_spare4 = -1;
-static int hf_butc_BUTC_PerformDump_tcdiPtr = -1;
-static int hf_butc_BUTC_PerformDump_dumps = -1;
-static int hf_butc_BUTC_PerformDump_dumpID = -1;
-static int hf_butc_BUTC_PerformRestore_dumpSetName = -1;
-static int hf_butc_BUTC_PerformRestore_restores = -1;
-static int hf_butc_BUTC_PerformRestore_dumpID = -1;
-static int hf_butc_BUTC_AbortDump_dumpID = -1;
-static int hf_butc_BUTC_LabelTape_label = -1;
-static int hf_butc_BUTC_LabelTape_taskId = -1;
-static int hf_butc_BUTC_ReadLabel_taskId = -1;
-static int hf_butc_BUTC_ScanDumps_addDbFlag = -1;
-static int hf_butc_BUTC_ScanDumps_taskId = -1;
-static int hf_butc_BUTC_TCInfo_tciptr = -1;
-static int hf_butc_BUTC_SaveDb_taskId = -1;
-static int hf_butc_BUTC_RestoreDb_taskId = -1;
-static int hf_butc_BUTC_EndStatus_taskId = -1;
-static int hf_butc_BUTC_GetStatus_taskId = -1;
-static int hf_butc_BUTC_GetStatus_statusPtr = -1;
-static int hf_butc_BUTC_RequestAbort_taskId = -1;
-static int hf_butc_BUTC_ScanStatus_taskId = -1;
-static int hf_butc_BUTC_ScanStatus_statusPtr = -1;
-static int hf_butc_BUTC_ScanStatus_flags = -1;
+static int hf_butc_opnum;
+static int hf_butc_rc;
+static int hf_butc_Restore_flags_TC_RESTORE_CREATE;
+static int hf_butc_Restore_flags_TC_RESTORE_INCR;
+static int hf_butc_afsNetAddr_type;
+static int hf_butc_afsNetAddr_data;
+static int hf_butc_tc_dumpDesc_vid;
+static int hf_butc_tc_dumpDesc_name;
+static int hf_butc_tc_dumpDesc_partition;
+static int hf_butc_tc_dumpDesc_date;
+static int hf_butc_tc_dumpDesc_cloneDate;
+static int hf_butc_tc_dumpDesc_hostAddr;
+static int hf_butc_tc_dumpDesc_spare1;
+static int hf_butc_tc_dumpDesc_spare2;
+static int hf_butc_tc_dumpDesc_spare3;
+static int hf_butc_tc_dumpDesc_spare4;
+static int hf_butc_tc_restoreDesc_frag;
+static int hf_butc_tc_restoreDesc_tapeName;
+static int hf_butc_tc_restoreDesc_position;
+static int hf_butc_tc_restoreDesc_origVid;
+static int hf_butc_tc_restoreDesc_vid;
+static int hf_butc_tc_restoreDesc_partition;
+static int hf_butc_tc_restoreDesc_flags;
+static int hf_butc_tc_restoreDesc_hostAddr;
+static int hf_butc_tc_restoreDesc_realDumpId;
+static int hf_butc_tc_restoreDesc_spare2;
+static int hf_butc_tc_restoreDesc_spare3;
+static int hf_butc_tc_restoreDesc_spare4;
+static int hf_butc_tc_restoreDesc_oldName;
+static int hf_butc_tc_restoreDesc_newName;
+static int hf_butc_tc_dumpStat_dumpID;
+static int hf_butc_tc_dumpStat_bytesDumped;
+static int hf_butc_tc_dumpStat_volumeBeingDumped;
+static int hf_butc_tc_dumpStat_numVolErrs;
+static int hf_butc_tc_dumpStat_flags;
+static int hf_butc_tc_dumpStat_spare1;
+static int hf_butc_tc_dumpStat_spare2;
+static int hf_butc_tc_dumpStat_spare3;
+static int hf_butc_tc_dumpStat_spare4;
+static int hf_butc_tc_tapeLabel_size;
+static int hf_butc_tc_tapeLabel_size_ext;
+static int hf_butc_tc_tapeLabel_spare1;
+static int hf_butc_tc_tapeLabel_spare2;
+static int hf_butc_tc_tapeLabel_spare3;
+static int hf_butc_tc_tapeLabel_spare4;
+static int hf_butc_tc_tapeLabel_nameLen;
+static int hf_butc_tc_tapeLabel_name;
+static int hf_butc_tc_tapeSet_id;
+static int hf_butc_tc_tapeSet_tapeServer;
+static int hf_butc_tc_tapeSet_format;
+static int hf_butc_tc_tapeSet_maxTapes;
+static int hf_butc_tc_tapeSet_a;
+static int hf_butc_tc_tapeSet_b;
+static int hf_butc_tc_tapeSet_expDate;
+static int hf_butc_tc_tapeSet_expType;
+static int hf_butc_tc_tapeSet_spare1;
+static int hf_butc_tc_tapeSet_spare2;
+static int hf_butc_tc_tapeSet_spare3;
+static int hf_butc_tc_tapeSet_spare4;
+static int hf_butc_tc_tcInfo_tcVersion;
+static int hf_butc_tc_tcInfo_spare1;
+static int hf_butc_tc_tcInfo_spare2;
+static int hf_butc_tc_tcInfo_spare3;
+static int hf_butc_tc_tcInfo_spare4;
+static int hf_butc_tc_restoreArray_tc_restoreArray_len;
+static int hf_butc_tc_restoreArray_tc_restoreArray_val;
+static int hf_butc_tc_dumpArray_tc_dumpArray_len;
+static int hf_butc_tc_dumpArray_tc_dumpArray;
+static int hf_butc_tc_dumpInterface_dumpPath;
+static int hf_butc_tc_dumpInterface_volumeSetName;
+static int hf_butc_tc_dumpInterface_dumpName;
+static int hf_butc_tc_dumpInterface_tapeSet;
+static int hf_butc_tc_dumpInterface_parentDumpId;
+static int hf_butc_tc_dumpInterface_dumpLevel;
+static int hf_butc_tc_dumpInterface_spare1;
+static int hf_butc_tc_dumpInterface_spare2;
+static int hf_butc_tc_dumpInterface_spare3;
+static int hf_butc_tc_dumpInterface_spare4;
+static int hf_butc_tc_statusInfoSwitchVol_nKBytes;
+static int hf_butc_tc_statusInfoSwitchVol_volumeName;
+static int hf_butc_tc_statusInfoSwitchVol_volsFailed;
+static int hf_butc_tc_statusInfoSwitchVol_spare1;
+static int hf_butc_tc_statusInfoSwitchLabel_tapeLabel;
+static int hf_butc_tc_statusInfoSwitchLabel_spare1;
+static int hf_butc_tc_statusInfoSwitch_TCOP_NONE_none;
+static int hf_butc_tc_statusInfoSwitch_TCOP_DUMP_vol;
+static int hf_butc_tc_statusInfoSwitch_TCOP_RESTORE_vol;
+static int hf_butc_tc_statusInfoSwitch_TCOP_LABELTAPE_label;
+static int hf_butc_tc_statusInfoSwitch_TCOP_READLABEL_label;
+static int hf_butc_tc_statusInfoSwitch_TCOP_SCANTAPE_spare1;
+static int hf_butc_tc_statusInfoSwitch_TCOP_STATUS_spare2;
+static int hf_butc_tc_statusInfoSwitch_TCOP_SAVEDB_spare3;
+static int hf_butc_tc_statusInfoSwitch_TCOP_RESTOREDB_spare4;
+static int hf_butc_tc_statusInfoSwitch_TCOP_SPARE_spare5;
+static int hf_butc_tciStatusS_taskName;
+static int hf_butc_tciStatusS_flags;
+static int hf_butc_tciStatusS_lastPolled;
+static int hf_butc_tciStatusS_info;
+static int hf_butc_tciStatusS_taskId;
+static int hf_butc_tciStatusS_spare2;
+static int hf_butc_tciStatusS_spare3;
+static int hf_butc_tciStatusS_spare4;
+static int hf_butc_BUTC_PerformDump_tcdiPtr;
+static int hf_butc_BUTC_PerformDump_dumps;
+static int hf_butc_BUTC_PerformDump_dumpID;
+static int hf_butc_BUTC_PerformRestore_dumpSetName;
+static int hf_butc_BUTC_PerformRestore_restores;
+static int hf_butc_BUTC_PerformRestore_dumpID;
+static int hf_butc_BUTC_AbortDump_dumpID;
+static int hf_butc_BUTC_LabelTape_label;
+static int hf_butc_BUTC_LabelTape_taskId;
+static int hf_butc_BUTC_ReadLabel_taskId;
+static int hf_butc_BUTC_ScanDumps_addDbFlag;
+static int hf_butc_BUTC_ScanDumps_taskId;
+static int hf_butc_BUTC_TCInfo_tciptr;
+static int hf_butc_BUTC_SaveDb_taskId;
+static int hf_butc_BUTC_RestoreDb_taskId;
+static int hf_butc_BUTC_EndStatus_taskId;
+static int hf_butc_BUTC_GetStatus_taskId;
+static int hf_butc_BUTC_GetStatus_statusPtr;
+static int hf_butc_BUTC_RequestAbort_taskId;
+static int hf_butc_BUTC_ScanStatus_taskId;
+static int hf_butc_BUTC_ScanStatus_statusPtr;
+static int hf_butc_BUTC_ScanStatus_flags;
 /* END OF INCLUDED FILE : ETH_HF */
 
 
@@ -161,22 +161,22 @@ static int hf_butc_BUTC_ScanStatus_flags = -1;
 
 
 /* INCLUDED FILE : ETH_ETT */
-static gint ett_butc = -1;
-static gint ett_butc_Restore_flags = -1;
-static gint ett_butc_afsNetAddr = -1;
-static gint ett_butc_tc_dumpDesc = -1;
-static gint ett_butc_tc_restoreDesc = -1;
-static gint ett_butc_tc_dumpStat = -1;
-static gint ett_butc_tc_tapeLabel = -1;
-static gint ett_butc_tc_tapeSet = -1;
-static gint ett_butc_tc_tcInfo = -1;
-static gint ett_butc_tc_restoreArray = -1;
-static gint ett_butc_tc_dumpArray = -1;
-static gint ett_butc_tc_dumpInterface = -1;
-static gint ett_butc_tc_statusInfoSwitchVol = -1;
-static gint ett_butc_tc_statusInfoSwitchLabel = -1;
-static gint ett_butc_tc_statusInfoSwitch = -1;
-static gint ett_butc_tciStatusS = -1;
+static gint ett_butc;
+static gint ett_butc_Restore_flags;
+static gint ett_butc_afsNetAddr;
+static gint ett_butc_tc_dumpDesc;
+static gint ett_butc_tc_restoreDesc;
+static gint ett_butc_tc_dumpStat;
+static gint ett_butc_tc_tapeLabel;
+static gint ett_butc_tc_tapeSet;
+static gint ett_butc_tc_tcInfo;
+static gint ett_butc_tc_restoreArray;
+static gint ett_butc_tc_dumpArray;
+static gint ett_butc_tc_dumpInterface;
+static gint ett_butc_tc_statusInfoSwitchVol;
+static gint ett_butc_tc_statusInfoSwitchLabel;
+static gint ett_butc_tc_statusInfoSwitch;
+static gint ett_butc_tciStatusS;
 /* END OF INCLUDED FILE : ETH_ETT */
 
 
diff --git a/epan/dissectors/packet-dcerpc-cds_clerkserver.c b/epan/dissectors/packet-dcerpc-cds_clerkserver.c
index db060d4c9a..bb1d860011 100644
--- a/epan/dissectors/packet-dcerpc-cds_clerkserver.c
+++ b/epan/dissectors/packet-dcerpc-cds_clerkserver.c
@@ -22,11 +22,11 @@
 void proto_register_cds_clerkserver (void);
 void proto_reg_handoff_cds_clerkserver (void);
 
-static int proto_cds_clerkserver = -1;
-static int hf_cds_clerkserver_opnum = -1;
+static int proto_cds_clerkserver;
+static int hf_cds_clerkserver_opnum;
 
 
-static gint ett_cds_clerkserver = -1;
+static gint ett_cds_clerkserver;
 
 
 static e_guid_t uuid_cds_clerkserver = { 0x257df1c9, 0xc6d3, 0x11ca, { 0x85, 0x54, 0x08, 0x00, 0x2b, 0x1c, 0x8f, 0x1f } };
diff --git a/epan/dissectors/packet-dcerpc-cds_solicit.c b/epan/dissectors/packet-dcerpc-cds_solicit.c
index 2c65bf2582..8a2f5ef4b4 100644
--- a/epan/dissectors/packet-dcerpc-cds_solicit.c
+++ b/epan/dissectors/packet-dcerpc-cds_solicit.c
@@ -20,11 +20,11 @@
 void proto_register_cds_solicit (void);
 void proto_reg_handoff_cds_solicit (void);
 
-static int proto_cds_solicit = -1;
-static int hf_cds_solicit_opnum = -1;
+static int proto_cds_solicit;
+static int hf_cds_solicit_opnum;
 
 
-static gint ett_cds_solicit = -1;
+static gint ett_cds_solicit;
 
 
 static e_guid_t uuid_cds_solicit = { 0xd5579459, 0x8bca, 0x11ca, { 0xb7, 0x71, 0x08, 0x00, 0x2b, 0x1c, 0x8f, 0x1f } };
diff --git a/epan/dissectors/packet-dcerpc-conv.c b/epan/dissectors/packet-dcerpc-conv.c
index d64ab15493..44a670e243 100644
--- a/epan/dissectors/packet-dcerpc-conv.c
+++ b/epan/dissectors/packet-dcerpc-conv.c
@@ -19,18 +19,18 @@
 void proto_register_conv (void);
 void proto_reg_handoff_conv (void);
 
-static int proto_conv = -1;
-static int hf_conv_opnum = -1;
-static int hf_conv_rc = -1;
-static int hf_conv_who_are_you_rqst_actuid = -1;
-static int hf_conv_who_are_you_rqst_boot_time = -1;
-static int hf_conv_who_are_you2_rqst_actuid = -1;
-static int hf_conv_who_are_you2_rqst_boot_time = -1;
-static int hf_conv_who_are_you_resp_seq = -1;
-static int hf_conv_who_are_you2_resp_seq = -1;
-static int hf_conv_who_are_you2_resp_casuuid = -1;
-
-static gint ett_conv = -1;
+static int proto_conv;
+static int hf_conv_opnum;
+static int hf_conv_rc;
+static int hf_conv_who_are_you_rqst_actuid;
+static int hf_conv_who_are_you_rqst_boot_time;
+static int hf_conv_who_are_you2_rqst_actuid;
+static int hf_conv_who_are_you2_rqst_boot_time;
+static int hf_conv_who_are_you_resp_seq;
+static int hf_conv_who_are_you2_resp_seq;
+static int hf_conv_who_are_you2_resp_casuuid;
+
+static gint ett_conv;
 
 
 static e_guid_t uuid_conv = { 0x333a2276, 0x0000, 0x0000, { 0x0d, 0x00, 0x00, 0x80, 0x9c, 0x00, 0x00, 0x00 } };
diff --git a/epan/dissectors/packet-dcerpc-cprpc_server.c b/epan/dissectors/packet-dcerpc-cprpc_server.c
index ddc981969d..5848662911 100644
--- a/epan/dissectors/packet-dcerpc-cprpc_server.c
+++ b/epan/dissectors/packet-dcerpc-cprpc_server.c
@@ -20,11 +20,11 @@
 void proto_register_cprpc_server (void);
 void proto_reg_handoff_cprpc_server (void);
 
-static int proto_cprpc_server = -1;
-static int hf_cprpc_server_opnum = -1;
+static int proto_cprpc_server;
+static int hf_cprpc_server_opnum;
 
 
-static gint ett_cprpc_server = -1;
+static gint ett_cprpc_server;
 
 
 static e_guid_t uuid_cprpc_server = { 0x4885772c, 0xc6d3, 0x11ca, { 0x84, 0xc6, 0x08, 0x00, 0x2b, 0x1c, 0x8f, 0x1f } };
diff --git a/epan/dissectors/packet-dcerpc-dtsprovider.c b/epan/dissectors/packet-dcerpc-dtsprovider.c
index e4ea557b30..efbff53243 100644
--- a/epan/dissectors/packet-dcerpc-dtsprovider.c
+++ b/epan/dissectors/packet-dcerpc-dtsprovider.c
@@ -20,12 +20,12 @@
 void proto_register_dtsprovider (void);
 void proto_reg_handoff_dtsprovider (void);
 
-static int proto_dtsprovider = -1;
-static int hf_dtsprovider_opnum = -1;
-/* static int hf_dtsprovider_status = -1; */
+static int proto_dtsprovider;
+static int hf_dtsprovider_opnum;
+/* static int hf_dtsprovider_status; */
 
 
-static gint ett_dtsprovider = -1;
+static gint ett_dtsprovider;
 
 
 static e_guid_t uuid_dtsprovider = { 0xbfca1238, 0x628a, 0x11c9, { 0xa0, 0x73, 0x08, 0x00, 0x2b, 0x0d, 0xea, 0x7a } };
diff --git a/epan/dissectors/packet-dcerpc-dtsstime_req.c b/epan/dissectors/packet-dcerpc-dtsstime_req.c
index cdba01d15a..34db6506d3 100644
--- a/epan/dissectors/packet-dcerpc-dtsstime_req.c
+++ b/epan/dissectors/packet-dcerpc-dtsstime_req.c
@@ -20,11 +20,11 @@
 void proto_register_dtsstime_req (void);
 void proto_reg_handoff_dtsstime_req (void);
 
-static int proto_dtsstime_req = -1;
-static int hf_dtsstime_req_opnum = -1;
+static int proto_dtsstime_req;
+static int hf_dtsstime_req_opnum;
 
 
-static gint ett_dtsstime_req = -1;
+static gint ett_dtsstime_req;
 
 
 static e_guid_t uuid_dtsstime_req = { 0x019ee420, 0x682d, 0x11c9, { 0xa6, 0x07, 0x08, 0x00, 0x2b, 0x0d, 0xea, 0x7a } };
diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c
index d809e98647..adeb938daa 100644
--- a/epan/dissectors/packet-dcerpc-epm.c
+++ b/epan/dissectors/packet-dcerpc-epm.c
@@ -19,46 +19,46 @@
 void proto_register_epm (void);
 void proto_reg_handoff_epm (void);
 
-static int proto_epm3 = -1;
-static int proto_epm4 = -1;
-
-static int hf_epm_opnum = -1;
-static int hf_epm_inquiry_type = -1;
-static int hf_epm_object = -1;
-static int hf_epm_if_id = -1;
-static int hf_epm_ver_maj = -1;
-static int hf_epm_ver_min = -1;
-static int hf_epm_ver_opt = -1;
-static int hf_epm_hnd = -1;
-static int hf_epm_max_ents = -1;
-static int hf_epm_num_ents = -1;
-static int hf_epm_uuid = -1;
-static int hf_epm_uuid_version = -1;
-static int hf_epm_tower_length = -1;
-/* static int hf_epm_tower_data = -1; */
-static int hf_epm_max_towers = -1;
-static int hf_epm_num_towers = -1;
-static int hf_epm_rc = -1;
-static int hf_epm_replace = -1;
-static int hf_epm_tower_num_floors = -1;
-static int hf_epm_tower_rhs_len = -1;
-static int hf_epm_tower_lhs_len = -1;
-static int hf_epm_tower_proto_id = -1;
-static int hf_epm_annotation = -1;
-static int hf_epm_ann_offset = -1;
-static int hf_epm_ann_len = -1;
-static int hf_epm_proto_named_pipes = -1;
-static int hf_epm_proto_netbios_name = -1;
-static int hf_epm_proto_ip = -1;
-static int hf_epm_proto_udp_port = -1;
-static int hf_epm_proto_tcp_port = -1;
-static int hf_epm_proto_http_port = -1;
-
-static gint ett_epm = -1;
-static gint ett_epm_tower_floor = -1;
-static gint ett_epm_entry = -1;
-
-static expert_field ei_epm_proto_undecoded = EI_INIT;
+static int proto_epm3;
+static int proto_epm4;
+
+static int hf_epm_opnum;
+static int hf_epm_inquiry_type;
+static int hf_epm_object;
+static int hf_epm_if_id;
+static int hf_epm_ver_maj;
+static int hf_epm_ver_min;
+static int hf_epm_ver_opt;
+static int hf_epm_hnd;
+static int hf_epm_max_ents;
+static int hf_epm_num_ents;
+static int hf_epm_uuid;
+static int hf_epm_uuid_version;
+static int hf_epm_tower_length;
+/* static int hf_epm_tower_data; */
+static int hf_epm_max_towers;
+static int hf_epm_num_towers;
+static int hf_epm_rc;
+static int hf_epm_replace;
+static int hf_epm_tower_num_floors;
+static int hf_epm_tower_rhs_len;
+static int hf_epm_tower_lhs_len;
+static int hf_epm_tower_proto_id;
+static int hf_epm_annotation;
+static int hf_epm_ann_offset;
+static int hf_epm_ann_len;
+static int hf_epm_proto_named_pipes;
+static int hf_epm_proto_netbios_name;
+static int hf_epm_proto_ip;
+static int hf_epm_proto_udp_port;
+static int hf_epm_proto_tcp_port;
+static int hf_epm_proto_http_port;
+
+static gint ett_epm;
+static gint ett_epm_tower_floor;
+static gint ett_epm_entry;
+
+static expert_field ei_epm_proto_undecoded;
 
 
 /* the UUID is identical for interface versions 3 and 4 */
diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c
index 8da97080fe..d4ff82810c 100644
--- a/epan/dissectors/packet-dcerpc-fileexp.c
+++ b/epan/dissectors/packet-dcerpc-fileexp.c
@@ -94,189 +94,189 @@ void proto_reg_handoff_fileexp (void);
 #define AFS_FLAG_FORCEVOLQUIESCE      0x10000
 #define AFS_FLAG_FORCEREVOCATIONDOWN  0x20000
 
-static int hf_fileexp_opnum = -1;
-
-
-static int hf_fileexp_afsFid_cell_high = -1;
-static int hf_fileexp_afsuuid_uuid = -1;
-static int hf_fileexp_fetchdata_pipe_t_size = -1;
-static int hf_fileexp_afsNameString_t_principalName_string = -1;
-static int hf_fileexp_afsFid_cell_low = -1;
-static int hf_fileexp_afsFid_volume_high = -1;
-static int hf_fileexp_afsFid_volume_low = -1;
-static int hf_fileexp_afsFid_Vnode = -1;
-static int hf_fileexp_afsFid_Unique = -1;
-static int hf_fileexp_interfaceversion = -1;
-static int hf_fileexp_filetype = -1;
-static int hf_fileexp_linkcount = -1;
-static int hf_fileexp_length_high = -1;
-static int hf_fileexp_length_low = -1;
-static int hf_fileexp_dataversion_high = -1;
-static int hf_fileexp_dataversion_low = -1;
-static int hf_fileexp_author = -1;
-static int hf_fileexp_owner = -1;
-static int hf_fileexp_group = -1;
-static int hf_fileexp_calleraccess = -1;
-static int hf_fileexp_anonymousaccess = -1;
-static int hf_fileexp_aclexpirationtime = -1;
-static int hf_fileexp_mode = -1;
-static int hf_fileexp_parentvnode = -1;
-static int hf_fileexp_parentunique = -1;
-static int hf_fileexp_modtime_sec = -1;
-static int hf_fileexp_modtime_msec = -1;
-static int hf_fileexp_changetime_sec = -1;
-static int hf_fileexp_changetime_msec = -1;
-static int hf_fileexp_accesstime_sec = -1;
-static int hf_fileexp_accesstime_msec = -1;
-static int hf_fileexp_servermodtime_sec = -1;
-static int hf_fileexp_servermodtime_msec = -1;
-static int hf_fileexp_typeuuid = -1;
-static int hf_fileexp_objectuuid = -1;
-static int hf_fileexp_devicenumber = -1;
-static int hf_fileexp_blocksused = -1;
-static int hf_fileexp_clientspare1 = -1;
-static int hf_fileexp_devicenumberhighbits = -1;
-static int hf_fileexp_agtypeunique = -1;
-static int hf_fileexp_himaxspare = -1;
-static int hf_fileexp_lomaxspare = -1;
-static int hf_fileexp_pathconfspare = -1;
-static int hf_fileexp_spare4 = -1;
-static int hf_fileexp_spare5 = -1;
-static int hf_fileexp_spare6 = -1;
-static int hf_fileexp_volid_hi = -1;
-static int hf_fileexp_volid_low = -1;
-static int hf_fileexp_vvage = -1;
-static int hf_fileexp_vv_hi = -1;
-static int hf_fileexp_vv_low = -1;
-static int hf_fileexp_vvpingage = -1;
-static int hf_fileexp_vvspare1 = -1;
-static int hf_fileexp_vvspare2 = -1;
-static int hf_fileexp_beginrange = -1;
-static int hf_fileexp_beginrangeext = -1;
-static int hf_fileexp_endrange = -1;
-static int hf_fileexp_endrangeext = -1;
-static int hf_fileexp_expirationtime = -1;
-static int hf_fileexp_tokenid_hi = -1;
-static int hf_fileexp_tokenid_low = -1;
-static int hf_fileexp_type_hi = -1;
-static int hf_fileexp_type_low = -1;
-static int hf_fileexp_tn_length = -1;
-static int hf_fileexp_storestatus_accesstime_sec = -1;
-static int hf_fileexp_storestatus_accesstime_usec = -1;
-static int hf_fileexp_storestatus_changetime_sec = -1;
-static int hf_fileexp_storestatus_changetime_usec = -1;
-static int hf_fileexp_storestatus_clientspare1 = -1;
-static int hf_fileexp_storestatus_cmask = -1;
-static int hf_fileexp_storestatus_devicenumber = -1;
-static int hf_fileexp_storestatus_devicenumberhighbits = -1;
-static int hf_fileexp_storestatus_devicetype = -1;
-static int hf_fileexp_storestatus_group = -1;
-static int hf_fileexp_storestatus_length_high = -1;
-static int hf_fileexp_storestatus_length_low = -1;
-static int hf_fileexp_storestatus_mask = -1;
-static int hf_fileexp_storestatus_mode = -1;
-static int hf_fileexp_storestatus_modtime_sec = -1;
-static int hf_fileexp_storestatus_modtime_usec = -1;
-static int hf_fileexp_storestatus_owner = -1;
-static int hf_fileexp_storestatus_spare1 = -1;
-static int hf_fileexp_storestatus_spare2 = -1;
-static int hf_fileexp_storestatus_spare3 = -1;
-static int hf_fileexp_storestatus_spare4 = -1;
-static int hf_fileexp_storestatus_spare5 = -1;
-static int hf_fileexp_storestatus_spare6 = -1;
-static int hf_fileexp_storestatus_trunc_high = -1;
-static int hf_afsconnparams_mask = -1;
-static int hf_fileexp_storestatus_trunc_low = -1;
-static int hf_fileexp_storestatus_typeuuid = -1;
-static int hf_fileexp_l_end_pos = -1;
-static int hf_fileexp_l_end_pos_ext = -1;
-static int hf_fileexp_l_fstype = -1;
-static int hf_fileexp_l_pid = -1;
-static int hf_fileexp_l_start_pos = -1;
-static int hf_fileexp_l_start_pos_ext = -1;
-static int hf_fileexp_l_sysid = -1;
-static int hf_fileexp_l_type = -1;
-static int hf_fileexp_l_whence = -1;
-static int hf_fileexp_acl_len = -1;
-static int hf_fileexp_setcontext_rqst_epochtime = -1;
-static int hf_fileexp_setcontext_rqst_clientsizesattrs = -1;
-static int hf_fileexp_setcontext_rqst_parm7 = -1;
-static int hf_fileexp_afsNetAddr_type = -1;
-static int hf_fileexp_afsNetAddr_data = -1;
-static int hf_fileexp_returntokenidp_high = -1;
-static int hf_fileexp_minvvp_low = -1;
-static int hf_fileexp_position_high = -1;
-static int hf_fileexp_position_low = -1;
-static int hf_fileexp_offsetp_high = -1;
-static int hf_fileexp_nextoffsetp_low = -1;
-static int hf_fileexp_cellidp_high = -1;
-static int hf_afserrorstatus_st = -1;
-static int hf_fileexp_length = -1;
-static int hf_afsconnparams_values = -1;
-static int hf_fileexp_acltype = -1;
-static int hf_fileexp_afsTaggedPath_tp_chars = -1;
-static int hf_fileexp_afsTaggedPath_tp_tag = -1;
-static int hf_fileexp_afsacl_uuid1 = -1;
-static int hf_fileexp_bulkfetchstatus_size = -1;
-static int hf_fileexp_flags = -1;
-static int hf_fileexp_afsreturndesc_tokenid_high = -1;
-static int hf_fileexp_afsreturndesc_tokenid_low = -1;
-static int hf_fileexp_afsreturndesc_type_high = -1;
-static int hf_fileexp_afsreturndesc_type_low = -1;
-static int hf_fileexp_returntokenidp_low = -1;
-static int hf_fileexp_minvvp_high = -1;
-static int hf_fileexp_offsetp_low = -1;
-static int hf_fileexp_nextoffsetp_high = -1;
-static int hf_fileexp_cellidp_low = -1;
-static int hf_fileexp_tn_tag = -1;
-static int hf_fileexp_tn_string = -1;
-static int hf_fileexp_bulkfetchvv_numvols = -1;
-static int hf_fileexp_bulkfetchvv_spare1 = -1;
-static int hf_fileexp_bulkfetchvv_spare2 = -1;
-static int hf_fileexp_bulkkeepalive_numexecfids = -1;
-static int hf_fileexp_bulkkeepalive_spare4 = -1;
-static int hf_fileexp_bulkkeepalive_spare2 = -1;
-static int hf_fileexp_bulkkeepalive_spare1 = -1;
-static int hf_fileexp_afsacl_defaultcell_uuid = -1;
-static int hf_fileexp_gettime_syncdispersion = -1;
-static int hf_fileexp_gettime_syncdistance = -1;
-static int hf_fileexp_gettime_usecondsp = -1;
-static int hf_fileexp_readdir_size = -1;
-static int hf_fileexp_afsNameString_t_principalName_size = -1;
-static int hf_fileexp_afsTaggedPath_tp_length = -1;
-static int hf_fileexp_fstype = -1;
-static int hf_fileexp_gettime_secondsp = -1;
-
-static int proto_fileexp = -1;
-
-static gint ett_fileexp = -1;
-static gint ett_fileexp_afsFid = -1;
-static gint ett_fileexp_afsReturnDesc = -1;
-static gint ett_fileexp_afsNetAddr = -1;
-static gint ett_fileexp_fetchstatus = -1;
-static gint ett_fileexp_afsflags = -1;
-static gint ett_fileexp_volsync = -1;
-static gint ett_fileexp_minvvp = -1;
-static gint ett_fileexp_afsfidtaggedname = -1;
-static gint ett_fileexp_afstaggedname = -1;
-static gint ett_fileexp_afstoken = -1;
-static gint ett_fileexp_afsstorestatus = -1;
-static gint ett_fileexp_afsRecordLock = -1;
-static gint ett_fileexp_afsAcl = -1;
-static gint ett_fileexp_afsNameString_t = -1;
-static gint ett_fileexp_afsConnParams = -1;
-static gint ett_fileexp_afsErrorStatus = -1;
-static gint ett_fileexp_afsNetData = -1;
-static gint ett_fileexp_afsTaggedPath = -1;
-static gint ett_fileexp_afsBulkStat = -1;
-static gint ett_fileexp_afsuuid = -1;
-static gint ett_fileexp_offsetp = -1;
-static gint ett_fileexp_returntokenidp = -1;
-static gint ett_fileexp_afsbundled_stat = -1;
+static int hf_fileexp_opnum;
+
+
+static int hf_fileexp_afsFid_cell_high;
+static int hf_fileexp_afsuuid_uuid;
+static int hf_fileexp_fetchdata_pipe_t_size;
+static int hf_fileexp_afsNameString_t_principalName_string;
+static int hf_fileexp_afsFid_cell_low;
+static int hf_fileexp_afsFid_volume_high;
+static int hf_fileexp_afsFid_volume_low;
+static int hf_fileexp_afsFid_Vnode;
+static int hf_fileexp_afsFid_Unique;
+static int hf_fileexp_interfaceversion;
+static int hf_fileexp_filetype;
+static int hf_fileexp_linkcount;
+static int hf_fileexp_length_high;
+static int hf_fileexp_length_low;
+static int hf_fileexp_dataversion_high;
+static int hf_fileexp_dataversion_low;
+static int hf_fileexp_author;
+static int hf_fileexp_owner;
+static int hf_fileexp_group;
+static int hf_fileexp_calleraccess;
+static int hf_fileexp_anonymousaccess;
+static int hf_fileexp_aclexpirationtime;
+static int hf_fileexp_mode;
+static int hf_fileexp_parentvnode;
+static int hf_fileexp_parentunique;
+static int hf_fileexp_modtime_sec;
+static int hf_fileexp_modtime_msec;
+static int hf_fileexp_changetime_sec;
+static int hf_fileexp_changetime_msec;
+static int hf_fileexp_accesstime_sec;
+static int hf_fileexp_accesstime_msec;
+static int hf_fileexp_servermodtime_sec;
+static int hf_fileexp_servermodtime_msec;
+static int hf_fileexp_typeuuid;
+static int hf_fileexp_objectuuid;
+static int hf_fileexp_devicenumber;
+static int hf_fileexp_blocksused;
+static int hf_fileexp_clientspare1;
+static int hf_fileexp_devicenumberhighbits;
+static int hf_fileexp_agtypeunique;
+static int hf_fileexp_himaxspare;
+static int hf_fileexp_lomaxspare;
+static int hf_fileexp_pathconfspare;
+static int hf_fileexp_spare4;
+static int hf_fileexp_spare5;
+static int hf_fileexp_spare6;
+static int hf_fileexp_volid_hi;
+static int hf_fileexp_volid_low;
+static int hf_fileexp_vvage;
+static int hf_fileexp_vv_hi;
+static int hf_fileexp_vv_low;
+static int hf_fileexp_vvpingage;
+static int hf_fileexp_vvspare1;
+static int hf_fileexp_vvspare2;
+static int hf_fileexp_beginrange;
+static int hf_fileexp_beginrangeext;
+static int hf_fileexp_endrange;
+static int hf_fileexp_endrangeext;
+static int hf_fileexp_expirationtime;
+static int hf_fileexp_tokenid_hi;
+static int hf_fileexp_tokenid_low;
+static int hf_fileexp_type_hi;
+static int hf_fileexp_type_low;
+static int hf_fileexp_tn_length;
+static int hf_fileexp_storestatus_accesstime_sec;
+static int hf_fileexp_storestatus_accesstime_usec;
+static int hf_fileexp_storestatus_changetime_sec;
+static int hf_fileexp_storestatus_changetime_usec;
+static int hf_fileexp_storestatus_clientspare1;
+static int hf_fileexp_storestatus_cmask;
+static int hf_fileexp_storestatus_devicenumber;
+static int hf_fileexp_storestatus_devicenumberhighbits;
+static int hf_fileexp_storestatus_devicetype;
+static int hf_fileexp_storestatus_group;
+static int hf_fileexp_storestatus_length_high;
+static int hf_fileexp_storestatus_length_low;
+static int hf_fileexp_storestatus_mask;
+static int hf_fileexp_storestatus_mode;
+static int hf_fileexp_storestatus_modtime_sec;
+static int hf_fileexp_storestatus_modtime_usec;
+static int hf_fileexp_storestatus_owner;
+static int hf_fileexp_storestatus_spare1;
+static int hf_fileexp_storestatus_spare2;
+static int hf_fileexp_storestatus_spare3;
+static int hf_fileexp_storestatus_spare4;
+static int hf_fileexp_storestatus_spare5;
+static int hf_fileexp_storestatus_spare6;
+static int hf_fileexp_storestatus_trunc_high;
+static int hf_afsconnparams_mask;
+static int hf_fileexp_storestatus_trunc_low;
+static int hf_fileexp_storestatus_typeuuid;
+static int hf_fileexp_l_end_pos;
+static int hf_fileexp_l_end_pos_ext;
+static int hf_fileexp_l_fstype;
+static int hf_fileexp_l_pid;
+static int hf_fileexp_l_start_pos;
+static int hf_fileexp_l_start_pos_ext;
+static int hf_fileexp_l_sysid;
+static int hf_fileexp_l_type;
+static int hf_fileexp_l_whence;
+static int hf_fileexp_acl_len;
+static int hf_fileexp_setcontext_rqst_epochtime;
+static int hf_fileexp_setcontext_rqst_clientsizesattrs;
+static int hf_fileexp_setcontext_rqst_parm7;
+static int hf_fileexp_afsNetAddr_type;
+static int hf_fileexp_afsNetAddr_data;
+static int hf_fileexp_returntokenidp_high;
+static int hf_fileexp_minvvp_low;
+static int hf_fileexp_position_high;
+static int hf_fileexp_position_low;
+static int hf_fileexp_offsetp_high;
+static int hf_fileexp_nextoffsetp_low;
+static int hf_fileexp_cellidp_high;
+static int hf_afserrorstatus_st;
+static int hf_fileexp_length;
+static int hf_afsconnparams_values;
+static int hf_fileexp_acltype;
+static int hf_fileexp_afsTaggedPath_tp_chars;
+static int hf_fileexp_afsTaggedPath_tp_tag;
+static int hf_fileexp_afsacl_uuid1;
+static int hf_fileexp_bulkfetchstatus_size;
+static int hf_fileexp_flags;
+static int hf_fileexp_afsreturndesc_tokenid_high;
+static int hf_fileexp_afsreturndesc_tokenid_low;
+static int hf_fileexp_afsreturndesc_type_high;
+static int hf_fileexp_afsreturndesc_type_low;
+static int hf_fileexp_returntokenidp_low;
+static int hf_fileexp_minvvp_high;
+static int hf_fileexp_offsetp_low;
+static int hf_fileexp_nextoffsetp_high;
+static int hf_fileexp_cellidp_low;
+static int hf_fileexp_tn_tag;
+static int hf_fileexp_tn_string;
+static int hf_fileexp_bulkfetchvv_numvols;
+static int hf_fileexp_bulkfetchvv_spare1;
+static int hf_fileexp_bulkfetchvv_spare2;
+static int hf_fileexp_bulkkeepalive_numexecfids;
+static int hf_fileexp_bulkkeepalive_spare4;
+static int hf_fileexp_bulkkeepalive_spare2;
+static int hf_fileexp_bulkkeepalive_spare1;
+static int hf_fileexp_afsacl_defaultcell_uuid;
+static int hf_fileexp_gettime_syncdispersion;
+static int hf_fileexp_gettime_syncdistance;
+static int hf_fileexp_gettime_usecondsp;
+static int hf_fileexp_readdir_size;
+static int hf_fileexp_afsNameString_t_principalName_size;
+static int hf_fileexp_afsTaggedPath_tp_length;
+static int hf_fileexp_fstype;
+static int hf_fileexp_gettime_secondsp;
+
+static int proto_fileexp;
+
+static gint ett_fileexp;
+static gint ett_fileexp_afsFid;
+static gint ett_fileexp_afsReturnDesc;
+static gint ett_fileexp_afsNetAddr;
+static gint ett_fileexp_fetchstatus;
+static gint ett_fileexp_afsflags;
+static gint ett_fileexp_volsync;
+static gint ett_fileexp_minvvp;
+static gint ett_fileexp_afsfidtaggedname;
+static gint ett_fileexp_afstaggedname;
+static gint ett_fileexp_afstoken;
+static gint ett_fileexp_afsstorestatus;
+static gint ett_fileexp_afsRecordLock;
+static gint ett_fileexp_afsAcl;
+static gint ett_fileexp_afsNameString_t;
+static gint ett_fileexp_afsConnParams;
+static gint ett_fileexp_afsErrorStatus;
+static gint ett_fileexp_afsNetData;
+static gint ett_fileexp_afsTaggedPath;
+static gint ett_fileexp_afsBulkStat;
+static gint ett_fileexp_afsuuid;
+static gint ett_fileexp_offsetp;
+static gint ett_fileexp_returntokenidp;
+static gint ett_fileexp_afsbundled_stat;
 
 
 /* vars for our macro(s) */
-static int hf_error_st = -1;
+static int hf_error_st;
 
 static e_guid_t uuid_fileexp =
   { 0x4d37f2dd, 0xed93, 0x0000, {0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00}
diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c
index e26e01bb02..768797c27d 100644
--- a/epan/dissectors/packet-dcerpc-fldb.c
+++ b/epan/dissectors/packet-dcerpc-fldb.c
@@ -22,16 +22,16 @@
 void proto_register_fldb (void);
 void proto_reg_handoff_fldb (void);
 
-static int proto_fldb = -1;
-static int hf_fldb_opnum = -1;
+static int proto_fldb;
+static int hf_fldb_opnum;
 
-static gint ett_fldb = -1;
-static gint ett_fldb_vldbentry = -1;
-static gint ett_fldb_afsnetaddr = -1;
-static gint ett_fldb_siteflags = -1;
-static gint ett_fldb_afsflags = -1;
-static gint ett_fldb_vlconf_cell = -1;
-static gint ett_fldb_afsNameString_t = -1;
+static gint ett_fldb;
+static gint ett_fldb_vldbentry;
+static gint ett_fldb_afsnetaddr;
+static gint ett_fldb_siteflags;
+static gint ett_fldb_afsflags;
+static gint ett_fldb_vlconf_cell;
+static gint ett_fldb_afsNameString_t;
 
 
 static e_guid_t uuid_fldb =
@@ -40,141 +40,141 @@ static e_guid_t uuid_fldb =
 static guint16 ver_fldb = 4;
 
 #if 0
-static int hf_fldb_getentrybyname_rqst_var1 = -1;
-static int hf_fldb_getentrybyname_rqst_key_size = -1;
+static int hf_fldb_getentrybyname_rqst_var1;
+static int hf_fldb_getentrybyname_rqst_key_size;
 #endif
-static int hf_fldb_releaselock_rqst_fsid_high = -1;
-static int hf_fldb_releaselock_rqst_fsid_low = -1;
-static int hf_fldb_releaselock_rqst_voltype = -1;
-static int hf_fldb_releaselock_rqst_voloper = -1;
-static int hf_fldb_setlock_rqst_fsid_high = -1;
-static int hf_fldb_setlock_rqst_fsid_low = -1;
-static int hf_fldb_setlock_rqst_voltype = -1;
-static int hf_fldb_setlock_rqst_voloper = -1;
+static int hf_fldb_releaselock_rqst_fsid_high;
+static int hf_fldb_releaselock_rqst_fsid_low;
+static int hf_fldb_releaselock_rqst_voltype;
+static int hf_fldb_releaselock_rqst_voloper;
+static int hf_fldb_setlock_rqst_fsid_high;
+static int hf_fldb_setlock_rqst_fsid_low;
+static int hf_fldb_setlock_rqst_voltype;
+static int hf_fldb_setlock_rqst_voloper;
 #if 0
-static int hf_fldb_setlock_resp_st = -1;
-static int hf_fldb_setlock_resp_st2 = -1;
+static int hf_fldb_setlock_resp_st;
+static int hf_fldb_setlock_resp_st2;
 #endif
-static int hf_fldb_listentry_rqst_previous_index = -1;
-static int hf_fldb_listentry_rqst_var1 = -1;
-static int hf_fldb_listentry_resp_count = -1;
-static int hf_fldb_listentry_resp_next_index = -1;
+static int hf_fldb_listentry_rqst_previous_index;
+static int hf_fldb_listentry_rqst_var1;
+static int hf_fldb_listentry_resp_count;
+static int hf_fldb_listentry_resp_next_index;
 #if 0
-static int hf_fldb_listentry_resp_key_t = -1;
-static int hf_fldb_listentry_resp_key_size = -1;
-static int hf_fldb_listentry_resp_key_t2 = -1;
-static int hf_fldb_listentry_resp_key_size2 = -1;
-static int hf_fldb_listentry_resp_voltype = -1;
-static int hf_fldb_createentry_rqst_key_t = -1;
-static int hf_fldb_createentry_rqst_key_size = -1;
+static int hf_fldb_listentry_resp_key_t;
+static int hf_fldb_listentry_resp_key_size;
+static int hf_fldb_listentry_resp_key_t2;
+static int hf_fldb_listentry_resp_key_size2;
+static int hf_fldb_listentry_resp_voltype;
+static int hf_fldb_createentry_rqst_key_t;
+static int hf_fldb_createentry_rqst_key_size;
 #endif
-static int hf_fldb_deleteentry_rqst_fsid_high = -1;
-static int hf_fldb_deleteentry_rqst_fsid_low = -1;
-static int hf_fldb_deleteentry_rqst_voltype = -1;
-static int hf_fldb_deleteentry_rqst_voloper = -1;
+static int hf_fldb_deleteentry_rqst_fsid_high;
+static int hf_fldb_deleteentry_rqst_fsid_low;
+static int hf_fldb_deleteentry_rqst_voltype;
+static int hf_fldb_deleteentry_rqst_voloper;
 #if 0
-static int hf_fldb_getentrybyid_rqst_fsid_high = -1;
-static int hf_fldb_getentrybyid_rqst_fsid_low = -1;
-static int hf_fldb_getentrybyid_rqst_voltype = -1;
-static int hf_fldb_getentrybyid_rqst_voloper = -1;
+static int hf_fldb_getentrybyid_rqst_fsid_high;
+static int hf_fldb_getentrybyid_rqst_fsid_low;
+static int hf_fldb_getentrybyid_rqst_voltype;
+static int hf_fldb_getentrybyid_rqst_voloper;
 #endif
-static int hf_fldb_replaceentry_rqst_fsid_high = -1;
-static int hf_fldb_replaceentry_rqst_fsid_low = -1;
-static int hf_fldb_replaceentry_rqst_voltype = -1;
+static int hf_fldb_replaceentry_rqst_fsid_high;
+static int hf_fldb_replaceentry_rqst_fsid_low;
+static int hf_fldb_replaceentry_rqst_voltype;
 #if 0
-static int hf_fldb_replaceentry_rqst_key_size = -1;
-static int hf_fldb_replaceentry_rqst_key_t = -1;
-static int hf_fldb_replaceentry_resp_st = -1;
-static int hf_fldb_replaceentry_resp_st2 = -1;
+static int hf_fldb_replaceentry_rqst_key_size;
+static int hf_fldb_replaceentry_rqst_key_t;
+static int hf_fldb_replaceentry_resp_st;
+static int hf_fldb_replaceentry_resp_st2;
 #endif
 #if 0
-static int hf_fldb_getentrybyname_resp_volumetype = -1;
-static int hf_fldb_getentrybyname_resp_numservers = -1;
-static int hf_fldb_getentrybyname_resp_sitecookies = -1;
-static int hf_fldb_getentrybyname_resp_sitepartition = -1;
-static int hf_fldb_getentrybyname_resp_siteflags = -1;
-static int hf_fldb_getentrybyname_resp_sitemaxreplat = -1;
-static int hf_fldb_getentrybyname_resp_volid_high = -1;
-static int hf_fldb_getentrybyname_resp_volid_low = -1;
-static int hf_fldb_getentrybyname_resp_voltype = -1;
-static int hf_fldb_getentrybyname_resp_cloneid_high = -1;
-static int hf_fldb_getentrybyname_resp_cloneid_low = -1;
-static int hf_fldb_getentrybyname_resp_flags = -1;
-static int hf_fldb_getentrybyname_resp_maxtotallat = -1;
-static int hf_fldb_getentrybyname_resp_hardmaxtotlat = -1;
-static int hf_fldb_getentrybyname_resp_minpouncedally = -1;
-static int hf_fldb_getentrybyname_resp_defaultmaxreplat = -1;
-static int hf_fldb_getentrybyname_resp_reclaimdally = -1;
-static int hf_fldb_getentrybyname_resp_whenlocked = -1;
-static int hf_fldb_getentrybyname_resp_spare1 = -1;
-static int hf_fldb_getentrybyname_resp_spare2 = -1;
-static int hf_fldb_getentrybyname_resp_spare3 = -1;
-static int hf_fldb_getentrybyname_resp_spare4 = -1;
-static int hf_fldb_getentrybyname_resp_key_t = -1;
-static int hf_fldb_getentrybyname_resp_key_size = -1;
-static int hf_fldb_getentrybyname_resp_test = -1;
-static int hf_dcerpc_error_status = -1;
+static int hf_fldb_getentrybyname_resp_volumetype;
+static int hf_fldb_getentrybyname_resp_numservers;
+static int hf_fldb_getentrybyname_resp_sitecookies;
+static int hf_fldb_getentrybyname_resp_sitepartition;
+static int hf_fldb_getentrybyname_resp_siteflags;
+static int hf_fldb_getentrybyname_resp_sitemaxreplat;
+static int hf_fldb_getentrybyname_resp_volid_high;
+static int hf_fldb_getentrybyname_resp_volid_low;
+static int hf_fldb_getentrybyname_resp_voltype;
+static int hf_fldb_getentrybyname_resp_cloneid_high;
+static int hf_fldb_getentrybyname_resp_cloneid_low;
+static int hf_fldb_getentrybyname_resp_flags;
+static int hf_fldb_getentrybyname_resp_maxtotallat;
+static int hf_fldb_getentrybyname_resp_hardmaxtotlat;
+static int hf_fldb_getentrybyname_resp_minpouncedally;
+static int hf_fldb_getentrybyname_resp_defaultmaxreplat;
+static int hf_fldb_getentrybyname_resp_reclaimdally;
+static int hf_fldb_getentrybyname_resp_whenlocked;
+static int hf_fldb_getentrybyname_resp_spare1;
+static int hf_fldb_getentrybyname_resp_spare2;
+static int hf_fldb_getentrybyname_resp_spare3;
+static int hf_fldb_getentrybyname_resp_spare4;
+static int hf_fldb_getentrybyname_resp_key_t;
+static int hf_fldb_getentrybyname_resp_key_size;
+static int hf_fldb_getentrybyname_resp_test;
+static int hf_dcerpc_error_status;
 #endif
-static int hf_fldb_vldbentry_volumename = -1;
-static int hf_fldb_vldbentry_volumetype = -1;
-static int hf_fldb_vldbentry_nservers = -1;
-static int hf_fldb_vldbentry_sitepartition = -1;
-static int hf_fldb_afsnetaddr_type = -1;
-static int hf_fldb_afsnetaddr_data = -1;
-static int hf_fldb_siteflags = -1;
-static int hf_fldb_vldbentry_sitemaxreplicalatency = -1;
-static int hf_fldb_vldbentry_siteprincipal = -1;
-static int hf_fldb_vldbentry_siteowner = -1;
-static int hf_fldb_vldbentry_siteobjid = -1;
-static int hf_fldb_vldbentry_volids_high = -1;
-static int hf_fldb_vldbentry_volids_low = -1;
-static int hf_fldb_vldbentry_voltypes = -1;
-static int hf_fldb_vldbentry_cloneid_high = -1;
-static int hf_fldb_vldbentry_cloneid_low = -1;
-static int hf_fldb_afsflags_flags = -1;
-static int hf_fldb_vldbentry_maxtotallatency = -1;
-static int hf_fldb_vldbentry_hardmaxtotallatency = -1;
-static int hf_fldb_vldbentry_minimumpouncedally = -1;
-static int hf_fldb_vldbentry_defaultmaxreplicalatency = -1;
-static int hf_fldb_vldbentry_reclaimdally = -1;
-static int hf_fldb_vldbentry_whenlocked = -1;
-static int hf_fldb_vldbentry_spare1 = -1;
-static int hf_fldb_vldbentry_spare2 = -1;
-static int hf_fldb_vldbentry_spare3 = -1;
-static int hf_fldb_vldbentry_spare4 = -1;
-static int hf_fldb_vldbentry_lockername = -1;
-static int hf_fldb_vldbentry_charspares = -1;
-static int hf_fldb_vlconf_cell_name = -1;
-static int hf_fldb_vlconf_cell_cellid_high = -1;
-static int hf_fldb_vlconf_cell_cellid_low = -1;
-static int hf_fldb_vlconf_cell_numservers = -1;
-static int hf_fldb_vlconf_cell_hostname = -1;
-static int hf_fldb_vlconf_cell_spare1 = -1;
-static int hf_fldb_vlconf_cell_spare2 = -1;
-static int hf_fldb_vlconf_cell_spare3 = -1;
-static int hf_fldb_vlconf_cell_spare4 = -1;
-static int hf_fldb_vlconf_cell_spare5 = -1;
-static int hf_fldb_flagsp = -1;
-static int hf_fldb_nextstartp = -1;
-static int hf_fldb_afsNameString_t_principalName_string = -1;
-static int hf_fldb_afsNameString_t_principalName_size = -1;
-/* static int hf_fldb_afsNameString_t_principalName_size2 = -1; */
-static int hf_fldb_namestring = -1;
-static int hf_error_st = -1;
-static int hf_fldb_creationquota = -1;
-static int hf_fldb_creationuses = -1;
-static int hf_fldb_deletedflag = -1;
-/* static int hf_fldb_namestring_size = -1; */
-static int hf_fldb_numwanted = -1;
-static int hf_fldb_spare2 = -1;
-static int hf_fldb_spare3 = -1;
-static int hf_fldb_spare4 = -1;
-static int hf_fldb_spare5 = -1;
-static int hf_fldb_uuid_objid = -1;
-static int hf_fldb_uuid_owner = -1;
-static int hf_fldb_volid_high = -1;
-static int hf_fldb_volid_low = -1;
-static int hf_fldb_voltype = -1;
+static int hf_fldb_vldbentry_volumename;
+static int hf_fldb_vldbentry_volumetype;
+static int hf_fldb_vldbentry_nservers;
+static int hf_fldb_vldbentry_sitepartition;
+static int hf_fldb_afsnetaddr_type;
+static int hf_fldb_afsnetaddr_data;
+static int hf_fldb_siteflags;
+static int hf_fldb_vldbentry_sitemaxreplicalatency;
+static int hf_fldb_vldbentry_siteprincipal;
+static int hf_fldb_vldbentry_siteowner;
+static int hf_fldb_vldbentry_siteobjid;
+static int hf_fldb_vldbentry_volids_high;
+static int hf_fldb_vldbentry_volids_low;
+static int hf_fldb_vldbentry_voltypes;
+static int hf_fldb_vldbentry_cloneid_high;
+static int hf_fldb_vldbentry_cloneid_low;
+static int hf_fldb_afsflags_flags;
+static int hf_fldb_vldbentry_maxtotallatency;
+static int hf_fldb_vldbentry_hardmaxtotallatency;
+static int hf_fldb_vldbentry_minimumpouncedally;
+static int hf_fldb_vldbentry_defaultmaxreplicalatency;
+static int hf_fldb_vldbentry_reclaimdally;
+static int hf_fldb_vldbentry_whenlocked;
+static int hf_fldb_vldbentry_spare1;
+static int hf_fldb_vldbentry_spare2;
+static int hf_fldb_vldbentry_spare3;
+static int hf_fldb_vldbentry_spare4;
+static int hf_fldb_vldbentry_lockername;
+static int hf_fldb_vldbentry_charspares;
+static int hf_fldb_vlconf_cell_name;
+static int hf_fldb_vlconf_cell_cellid_high;
+static int hf_fldb_vlconf_cell_cellid_low;
+static int hf_fldb_vlconf_cell_numservers;
+static int hf_fldb_vlconf_cell_hostname;
+static int hf_fldb_vlconf_cell_spare1;
+static int hf_fldb_vlconf_cell_spare2;
+static int hf_fldb_vlconf_cell_spare3;
+static int hf_fldb_vlconf_cell_spare4;
+static int hf_fldb_vlconf_cell_spare5;
+static int hf_fldb_flagsp;
+static int hf_fldb_nextstartp;
+static int hf_fldb_afsNameString_t_principalName_string;
+static int hf_fldb_afsNameString_t_principalName_size;
+/* static int hf_fldb_afsNameString_t_principalName_size2; */
+static int hf_fldb_namestring;
+static int hf_error_st;
+static int hf_fldb_creationquota;
+static int hf_fldb_creationuses;
+static int hf_fldb_deletedflag;
+/* static int hf_fldb_namestring_size; */
+static int hf_fldb_numwanted;
+static int hf_fldb_spare2;
+static int hf_fldb_spare3;
+static int hf_fldb_spare4;
+static int hf_fldb_spare5;
+static int hf_fldb_uuid_objid;
+static int hf_fldb_uuid_owner;
+static int hf_fldb_volid_high;
+static int hf_fldb_volid_low;
+static int hf_fldb_voltype;
 static guint32 st;
 static const guint8 *st_str;
 
diff --git a/epan/dissectors/packet-dcerpc-frsapi.c b/epan/dissectors/packet-dcerpc-frsapi.c
index 812ee70af0..c768af1ede 100644
--- a/epan/dissectors/packet-dcerpc-frsapi.c
+++ b/epan/dissectors/packet-dcerpc-frsapi.c
@@ -19,11 +19,11 @@
 void proto_register_dcerpc_frsapi(void);
 void proto_reg_handoff_dcerpc_frsapi(void);
 
-static int proto_dcerpc_frsapi = -1;
+static int proto_dcerpc_frsapi;
 
-static int hf_frsapi_opnum = -1;
+static int hf_frsapi_opnum;
 
-static gint ett_dcerpc_frsapi = -1;
+static gint ett_dcerpc_frsapi;
 
 /*
 IDL [ uuid(d049b186-814f-11d1-9a3c-00c04fc9b232),
diff --git a/epan/dissectors/packet-dcerpc-ftserver.c b/epan/dissectors/packet-dcerpc-ftserver.c
index 054154629f..3f1e5e41b5 100644
--- a/epan/dissectors/packet-dcerpc-ftserver.c
+++ b/epan/dissectors/packet-dcerpc-ftserver.c
@@ -21,12 +21,12 @@
 void proto_register_ftserver (void);
 void proto_reg_handoff_ftserver (void);
 
-static int proto_ftserver = -1;
-static int hf_ftserver_opnum = -1;
+static int proto_ftserver;
+static int hf_ftserver_opnum;
 
 
 
-static gint ett_ftserver = -1;
+static gint ett_ftserver;
 
 
 static e_guid_t uuid_ftserver = { 0x4d37f2dd, 0xed43, 0x0004, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00 } };
diff --git a/epan/dissectors/packet-dcerpc-icl_rpc.c b/epan/dissectors/packet-dcerpc-icl_rpc.c
index 148fa7aa5d..24e004426e 100644
--- a/epan/dissectors/packet-dcerpc-icl_rpc.c
+++ b/epan/dissectors/packet-dcerpc-icl_rpc.c
@@ -20,11 +20,11 @@
 void proto_register_icl_rpc (void);
 void proto_reg_handoff_icl_rpc (void);
 
-static int proto_icl_rpc = -1;
-static int hf_icl_rpc_opnum = -1;
+static int proto_icl_rpc;
+static int hf_icl_rpc_opnum;
 
 
-static gint ett_icl_rpc = -1;
+static gint ett_icl_rpc;
 
 static e_guid_t uuid_icl_rpc = { 0x003fd39c, 0x7feb, 0x1bbc, { 0xbe, 0xbe, 0x02, 0x60, 0x8c, 0x2e, 0xf4, 0xd2 } };
 static guint16  ver_icl_rpc = 1;
diff --git a/epan/dissectors/packet-dcerpc-krb5rpc.c b/epan/dissectors/packet-dcerpc-krb5rpc.c
index 1c2f65a6ed..20c0906d6b 100644
--- a/epan/dissectors/packet-dcerpc-krb5rpc.c
+++ b/epan/dissectors/packet-dcerpc-krb5rpc.c
@@ -23,9 +23,9 @@
 void proto_register_krb5rpc (void);
 void proto_reg_handoff_krb5rpc (void);
 
-static int proto_krb5rpc = -1;
+static int proto_krb5rpc;
 
-static gint ett_krb5rpc = -1;
+static gint ett_krb5rpc;
 
 
 static e_guid_t uuid_krb5rpc =
@@ -33,16 +33,16 @@ static e_guid_t uuid_krb5rpc =
                                  0x31}
 };
 static guint16 ver_krb5rpc = 1;
-static int hf_krb5rpc_opnum = -1;
-static int hf_krb5rpc_sendto_kdc_rqst_keysize = -1;
-static int hf_krb5rpc_sendto_kdc_rqst_spare1 = -1;
-static int hf_krb5rpc_sendto_kdc_resp_len = -1;
-static int hf_krb5rpc_sendto_kdc_resp_max = -1;
-static int hf_krb5rpc_sendto_kdc_resp_spare1 = -1;
-static int hf_krb5rpc_sendto_kdc_resp_keysize = -1;
-/* static int hf_krb5rpc_sendto_kdc_resp_st = -1; */
-static int hf_krb5rpc_krb5 = -1;
-static gint ett_krb5rpc_krb5 = -1;
+static int hf_krb5rpc_opnum;
+static int hf_krb5rpc_sendto_kdc_rqst_keysize;
+static int hf_krb5rpc_sendto_kdc_rqst_spare1;
+static int hf_krb5rpc_sendto_kdc_resp_len;
+static int hf_krb5rpc_sendto_kdc_resp_max;
+static int hf_krb5rpc_sendto_kdc_resp_spare1;
+static int hf_krb5rpc_sendto_kdc_resp_keysize;
+/* static int hf_krb5rpc_sendto_kdc_resp_st; */
+static int hf_krb5rpc_krb5;
+static gint ett_krb5rpc_krb5;
 
 static int
 krb5rpc_dissect_sendto_kdc_rqst (tvbuff_t * tvb, int offset,
diff --git a/epan/dissectors/packet-dcerpc-llb.c b/epan/dissectors/packet-dcerpc-llb.c
index 365901e1c7..9d0ea2e866 100644
--- a/epan/dissectors/packet-dcerpc-llb.c
+++ b/epan/dissectors/packet-dcerpc-llb.c
@@ -21,10 +21,10 @@
 void proto_register_llb (void);
 void proto_reg_handoff_llb (void);
 
-static int proto_llb = -1;
-static int hf_llb_opnum = -1;
+static int proto_llb;
+static int hf_llb_opnum;
 
-static gint ett_llb = -1;
+static gint ett_llb;
 
 
 static e_guid_t uuid_llb =
diff --git a/epan/dissectors/packet-dcerpc-messenger.c b/epan/dissectors/packet-dcerpc-messenger.c
index a00626d8ce..e7ed77c07e 100644
--- a/epan/dissectors/packet-dcerpc-messenger.c
+++ b/epan/dissectors/packet-dcerpc-messenger.c
@@ -19,14 +19,14 @@
 void proto_register_dcerpc_messenger(void);
 void proto_reg_handoff_dcerpc_messenger(void);
 
-static int proto_dcerpc_messenger = -1;
-static int hf_messenger_opnum = -1;
-static int hf_messenger_rc = -1;
-static int hf_messenger_server = -1;
-static int hf_messenger_client = -1;
-static int hf_messenger_message = -1;
-
-static gint ett_dcerpc_messenger = -1;
+static int proto_dcerpc_messenger;
+static int hf_messenger_opnum;
+static int hf_messenger_rc;
+static int hf_messenger_server;
+static int hf_messenger_client;
+static int hf_messenger_message;
+
+static gint ett_dcerpc_messenger;
 
 
 /* Windows messenger service listens on two endpoints:
diff --git a/epan/dissectors/packet-dcerpc-mgmt.c b/epan/dissectors/packet-dcerpc-mgmt.c
index 4da786ec9c..706ac1fcc9 100644
--- a/epan/dissectors/packet-dcerpc-mgmt.c
+++ b/epan/dissectors/packet-dcerpc-mgmt.c
@@ -18,13 +18,13 @@
 void proto_register_mgmt (void);
 void proto_reg_handoff_mgmt (void);
 
-static int proto_mgmt = -1;
-static int hf_mgmt_opnum = -1;
-static int hf_mgmt_proto = -1;
-static int hf_mgmt_rc = -1;
-static int hf_mgmt_princ_size = -1;
-static int hf_mgmt_princ_name = -1;
-static gint ett_mgmt = -1;
+static int proto_mgmt;
+static int hf_mgmt_opnum;
+static int hf_mgmt_proto;
+static int hf_mgmt_rc;
+static int hf_mgmt_princ_size;
+static int hf_mgmt_princ_name;
+static gint ett_mgmt;
 
 
 static e_guid_t uuid_mgmt = { 0xafa8bd80, 0x7d8a, 0x11c9, { 0xbe, 0xf4, 0x08, 0x00, 0x2b, 0x10, 0x29, 0x89 } };
diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c
index ff646eeede..0b08c7f4a8 100644
--- a/epan/dissectors/packet-dcerpc-netlogon.c
+++ b/epan/dissectors/packet-dcerpc-netlogon.c
@@ -92,358 +92,358 @@ static wmem_map_t *netlogon_auths=NULL;
 #if 0
 static wmem_map_t *schannel_auths;
 #endif
-static int proto_dcerpc_netlogon = -1;
-
-static int hf_netlogon_TrustedDomainName_string = -1;
-static int hf_netlogon_UserName_string = -1;
-static int hf_domain_info_sid = -1;
-static int hf_dns_domain_info_sid = -1;
-static int hf_dns_domain_info_domain_guid = -1;
-static int hf_dns_domain_info_dns_domain = -1;
-static int hf_dns_domain_info_dns_forest = -1;
-static int hf_dns_domain_info_name = -1;
-static int hf_client_challenge = -1;
-static int hf_server_rid = -1;
-static int hf_server_challenge = -1;
-static int hf_client_credential = -1;
-static int hf_server_credential = -1;
-static int hf_netlogon_logon_dnslogondomainname = -1;
-static int hf_netlogon_logon_upn = -1;
-static int hf_netlogon_group_attrs_mandatory = -1;
-static int hf_netlogon_group_attrs_enabled_by_default = -1;
-static int hf_netlogon_group_attrs_enabled = -1;
-static int hf_netlogon_opnum = -1;
-static int hf_netlogon_data_length = -1;
-static int hf_netlogon_extraflags = -1;
-static int hf_netlogon_extra_flags_root_forest = -1;
-static int hf_netlogon_trust_flags_dc_firsthop = -1;
-static int hf_netlogon_trust_flags_rodc_to_dc = -1;
-static int hf_netlogon_trust_flags_rodc_ntlm = -1;
-static int hf_netlogon_package_name = -1;
-static int hf_netlogon_rc = -1;
-static int hf_netlogon_dos_rc = -1;
-static int hf_netlogon_werr_rc = -1;
-static int hf_netlogon_len = -1;
-static int hf_netlogon_sensitive_data_flag = -1;
-static int hf_netlogon_sensitive_data_len = -1;
-static int hf_netlogon_sensitive_data = -1;
-static int hf_netlogon_security_information = -1;
-static int hf_netlogon_dummy = -1;
-static int hf_netlogon_neg_flags = -1;
-/* static int hf_netlogon_neg_flags_80000000 = -1; */
-static int hf_netlogon_neg_flags_40000000 = -1;
-static int hf_netlogon_neg_flags_20000000 = -1;
-/* static int hf_netlogon_neg_flags_10000000 = -1; */
-/* static int hf_netlogon_neg_flags_8000000 = -1; */
-/* static int hf_netlogon_neg_flags_4000000 = -1; */
-/* static int hf_netlogon_neg_flags_2000000 = -1; */
-static int hf_netlogon_neg_flags_1000000 = -1;
-/* static int hf_netlogon_neg_flags_800000 = -1; */
-/* static int hf_netlogon_neg_flags_400000 = -1; */
-static int hf_netlogon_neg_flags_200000 = -1;
-static int hf_netlogon_neg_flags_100000 = -1;
-static int hf_netlogon_neg_flags_80000 = -1;
-static int hf_netlogon_neg_flags_40000 = -1;
-static int hf_netlogon_neg_flags_20000 = -1;
-static int hf_netlogon_neg_flags_10000 = -1;
-static int hf_netlogon_neg_flags_8000 = -1;
-static int hf_netlogon_neg_flags_4000 = -1;
-static int hf_netlogon_neg_flags_2000 = -1;
-static int hf_netlogon_neg_flags_1000 = -1;
-static int hf_netlogon_neg_flags_800 = -1;
-static int hf_netlogon_neg_flags_400 = -1;
-static int hf_netlogon_neg_flags_200 = -1;
-static int hf_netlogon_neg_flags_100 = -1;
-static int hf_netlogon_neg_flags_80 = -1;
-static int hf_netlogon_neg_flags_40 = -1;
-static int hf_netlogon_neg_flags_20 = -1;
-static int hf_netlogon_neg_flags_10 = -1;
-static int hf_netlogon_neg_flags_8 = -1;
-static int hf_netlogon_neg_flags_4 = -1;
-static int hf_netlogon_neg_flags_2 = -1;
-static int hf_netlogon_neg_flags_1 = -1;
-static int hf_netlogon_minworkingsetsize = -1;
-static int hf_netlogon_maxworkingsetsize = -1;
-static int hf_netlogon_pagedpoollimit = -1;
-static int hf_netlogon_pagefilelimit = -1;
-static int hf_netlogon_timelimit = -1;
-static int hf_netlogon_nonpagedpoollimit = -1;
-/* static int hf_netlogon_pac_size = -1; */
-/* static int hf_netlogon_pac_data = -1; */
-/* static int hf_netlogon_auth_size = -1; */
-/* static int hf_netlogon_auth_data = -1; */
-static int hf_netlogon_cipher_len = -1;
-static int hf_netlogon_cipher_maxlen = -1;
-static int hf_netlogon_cipher_current_data = -1;
-static int hf_netlogon_cipher_current_set_time = -1;
-static int hf_netlogon_cipher_old_data = -1;
-static int hf_netlogon_cipher_old_set_time = -1;
-static int hf_netlogon_priv = -1;
-static int hf_netlogon_privilege_entries = -1;
-static int hf_netlogon_privilege_control = -1;
-static int hf_netlogon_privilege_name = -1;
-static int hf_netlogon_systemflags = -1;
-static int hf_netlogon_pdc_connection_status = -1;
-static int hf_netlogon_tc_connection_status = -1;
-static int hf_netlogon_restart_state = -1;
-static int hf_netlogon_attrs = -1;
-static int hf_netlogon_lsapolicy_len = -1;
-/* static int hf_netlogon_lsapolicy_referentid = -1; */
-/* static int hf_netlogon_lsapolicy_pointer = -1; */
-static int hf_netlogon_count = -1;
-static int hf_netlogon_entries = -1;
-static int hf_netlogon_minpasswdlen = -1;
-static int hf_netlogon_passwdhistorylen = -1;
-static int hf_netlogon_level16 = -1;
-static int hf_netlogon_validation_level = -1;
-static int hf_netlogon_reference = -1;
-static int hf_netlogon_next_reference = -1;
-static int hf_netlogon_timestamp = -1;
-static int hf_netlogon_level = -1;
-static int hf_netlogon_challenge = -1;
-static int hf_netlogon_reserved = -1;
-static int hf_netlogon_audit_retention_period = -1;
-static int hf_netlogon_auditing_mode = -1;
-static int hf_netlogon_max_audit_event_count = -1;
-static int hf_netlogon_event_audit_option = -1;
-static int hf_netlogon_unknown_string = -1;
-static int hf_netlogon_trust_extension = -1;
-static int hf_netlogon_trust_max = -1;
-static int hf_netlogon_trust_offset = -1;
-static int hf_netlogon_trust_len = -1;
-static int hf_netlogon_dummy_string = -1;
-static int hf_netlogon_dummy_string2 = -1;
-static int hf_netlogon_dummy_string3 = -1;
-static int hf_netlogon_dummy_string4 = -1;
-static int hf_netlogon_dummy_string5 = -1;
-static int hf_netlogon_dummy_string6 = -1;
-static int hf_netlogon_dummy_string7 = -1;
-static int hf_netlogon_dummy_string8 = -1;
-static int hf_netlogon_dummy_string9 = -1;
-static int hf_netlogon_dummy_string10 = -1;
-static int hf_netlogon_unknown_short = -1;
-static int hf_netlogon_unknown_long = -1;
-static int hf_netlogon_dummy1_long = -1;
-static int hf_netlogon_dummy2_long = -1;
-static int hf_netlogon_dummy3_long = -1;
-static int hf_netlogon_dummy4_long = -1;
-static int hf_netlogon_dummy5_long = -1;
-static int hf_netlogon_dummy6_long = -1;
-static int hf_netlogon_dummy7_long = -1;
-static int hf_netlogon_dummy8_long = -1;
-static int hf_netlogon_dummy9_long = -1;
-static int hf_netlogon_dummy10_long = -1;
-static int hf_netlogon_unknown_char = -1;
-static int hf_netlogon_logon_time = -1;
-static int hf_netlogon_logoff_time = -1;
-static int hf_netlogon_last_logoff_time = -1;
-static int hf_netlogon_kickoff_time = -1;
-static int hf_netlogon_pwd_age = -1;
-static int hf_netlogon_pwd_last_set_time = -1;
-static int hf_netlogon_pwd_can_change_time = -1;
-static int hf_netlogon_pwd_must_change_time = -1;
-static int hf_netlogon_nt_chal_resp = -1;
-static int hf_netlogon_lm_chal_resp = -1;
-static int hf_netlogon_credential = -1;
-static int hf_netlogon_acct_name = -1;
-static int hf_netlogon_acct_desc = -1;
-static int hf_netlogon_group_desc = -1;
-static int hf_netlogon_full_name = -1;
-static int hf_netlogon_comment = -1;
-static int hf_netlogon_parameters = -1;
-static int hf_netlogon_logon_script = -1;
-static int hf_netlogon_profile_path = -1;
-static int hf_netlogon_home_dir = -1;
-static int hf_netlogon_dir_drive = -1;
-static int hf_netlogon_logon_count = -1;
-static int hf_netlogon_logon_count16 = -1;
-static int hf_netlogon_bad_pw_count = -1;
-static int hf_netlogon_bad_pw_count16 = -1;
-static int hf_netlogon_user_rid = -1;
-static int hf_netlogon_alias_rid = -1;
-static int hf_netlogon_group_rid = -1;
-static int hf_netlogon_logon_srv = -1;
-/* static int hf_netlogon_principal = -1; */
-static int hf_netlogon_logon_dom = -1;
-static int hf_netlogon_resourcegroupcount = -1;
-static int hf_netlogon_accountdomaingroupcount = -1;
-static int hf_netlogon_domaingroupcount = -1;
-static int hf_netlogon_membership_domains_count = -1;
-static int hf_netlogon_downlevel_domain_name = -1;
-static int hf_netlogon_dns_domain_name = -1;
-static int hf_netlogon_ad_client_dns_name = -1;
-static int hf_netlogon_domain_name = -1;
-static int hf_netlogon_domain_create_time = -1;
-static int hf_netlogon_domain_modify_time = -1;
-static int hf_netlogon_modify_count = -1;
-static int hf_netlogon_db_modify_time = -1;
-static int hf_netlogon_db_create_time = -1;
-static int hf_netlogon_oem_info = -1;
-static int hf_netlogon_serial_number = -1;
-static int hf_netlogon_num_rids = -1;
-static int hf_netlogon_num_trusts = -1;
-static int hf_netlogon_num_controllers = -1;
-static int hf_netlogon_num_sid = -1;
-static int hf_netlogon_computer_name = -1;
-static int hf_netlogon_site_name = -1;
-static int hf_netlogon_trusted_dc_name = -1;
-static int hf_netlogon_dc_name = -1;
-static int hf_netlogon_dc_site_name = -1;
-static int hf_netlogon_dns_forest_name = -1;
-static int hf_netlogon_dc_address = -1;
-static int hf_netlogon_dc_address_type = -1;
-static int hf_netlogon_client_site_name = -1;
-static int hf_netlogon_workstation = -1;
-static int hf_netlogon_workstation_site_name = -1;
-static int hf_netlogon_os_version = -1;
-static int hf_netlogon_workstation_os = -1;
-static int hf_netlogon_workstation_flags = -1;
-static int hf_netlogon_supportedenctypes = -1;
-
-static int hf_netlogon_workstations = -1;
-static int hf_netlogon_workstation_fqdn = -1;
-static int hf_netlogon_group_name = -1;
-static int hf_netlogon_alias_name = -1;
-static int hf_netlogon_country = -1;
-static int hf_netlogon_codepage = -1;
-static int hf_netlogon_flags = -1;
-static int hf_netlogon_trust_attribs = -1;
-static int hf_netlogon_trust_attribs_non_transitive = -1;
-static int hf_netlogon_trust_attribs_uplevel_only = -1;
-static int hf_netlogon_trust_attribs_quarantined_domain = -1;
-static int hf_netlogon_trust_attribs_forest_transitive = -1;
-static int hf_netlogon_trust_attribs_cross_organization = -1;
-static int hf_netlogon_trust_attribs_within_forest = -1;
-static int hf_netlogon_trust_attribs_treat_as_external = -1;
-static int hf_netlogon_trust_type = -1;
-static int hf_netlogon_trust_flags = -1;
-static int hf_netlogon_trust_flags_inbound = -1;
-static int hf_netlogon_trust_flags_outbound = -1;
-static int hf_netlogon_trust_flags_in_forest = -1;
-static int hf_netlogon_trust_flags_native_mode = -1;
-static int hf_netlogon_trust_flags_primary = -1;
-static int hf_netlogon_trust_flags_tree_root = -1;
-static int hf_netlogon_trust_parent_index = -1;
-static int hf_netlogon_user_account_control = -1;
-static int hf_netlogon_user_account_control_dont_require_preauth = -1;
-static int hf_netlogon_user_account_control_use_des_key_only = -1;
-static int hf_netlogon_user_account_control_not_delegated = -1;
-static int hf_netlogon_user_account_control_trusted_for_delegation = -1;
-static int hf_netlogon_user_account_control_smartcard_required = -1;
-static int hf_netlogon_user_account_control_encrypted_text_password_allowed = -1;
-static int hf_netlogon_user_account_control_account_auto_locked = -1;
-static int hf_netlogon_user_account_control_dont_expire_password = -1;
-static int hf_netlogon_user_account_control_server_trust_account = -1;
-static int hf_netlogon_user_account_control_workstation_trust_account = -1;
-static int hf_netlogon_user_account_control_interdomain_trust_account = -1;
-static int hf_netlogon_user_account_control_mns_logon_account = -1;
-static int hf_netlogon_user_account_control_normal_account = -1;
-static int hf_netlogon_user_account_control_temp_duplicate_account = -1;
-static int hf_netlogon_user_account_control_password_not_required = -1;
-static int hf_netlogon_user_account_control_home_directory_required = -1;
-static int hf_netlogon_user_account_control_account_disabled = -1;
-static int hf_netlogon_user_flags = -1;
-static int hf_netlogon_user_flags_extra_sids = -1;
-static int hf_netlogon_user_flags_resource_groups = -1;
-static int hf_netlogon_auth_flags = -1;
-static int hf_netlogon_pwd_expired = -1;
-static int hf_netlogon_nt_pwd_present = -1;
-static int hf_netlogon_lm_pwd_present = -1;
-static int hf_netlogon_code = -1;
-static int hf_netlogon_database_id = -1;
-static int hf_netlogon_sync_context = -1;
-static int hf_netlogon_max_size = -1;
-static int hf_netlogon_max_log_size = -1;
-static int hf_netlogon_dns_host = -1;
-static int hf_netlogon_acct_expiry_time = -1;
-static int hf_netlogon_encrypted_lm_owf_password = -1;
-static int hf_netlogon_lm_owf_password = -1;
-static int hf_netlogon_nt_owf_password = -1;
-static int hf_netlogon_param_ctrl = -1;
-static int hf_netlogon_logon_id = -1;
-static int hf_netlogon_num_deltas = -1;
-static int hf_netlogon_user_session_key = -1;
-static int hf_netlogon_blob_size = -1;
-static int hf_netlogon_blob = -1;
-static int hf_netlogon_logon_attempts = -1;
-static int hf_netlogon_authoritative = -1;
-static int hf_netlogon_secure_channel_type = -1;
-static int hf_netlogon_logonsrv_handle = -1;
-static int hf_netlogon_delta_type = -1;
-static int hf_netlogon_get_dcname_request_flags = -1;
-static int hf_netlogon_get_dcname_request_flags_force_rediscovery = -1;
-static int hf_netlogon_get_dcname_request_flags_directory_service_required = -1;
-static int hf_netlogon_get_dcname_request_flags_directory_service_preferred = -1;
-static int hf_netlogon_get_dcname_request_flags_gc_server_required = -1;
-static int hf_netlogon_get_dcname_request_flags_pdc_required = -1;
-static int hf_netlogon_get_dcname_request_flags_background_only = -1;
-static int hf_netlogon_get_dcname_request_flags_ip_required = -1;
-static int hf_netlogon_get_dcname_request_flags_kdc_required = -1;
-static int hf_netlogon_get_dcname_request_flags_timeserv_required = -1;
-static int hf_netlogon_get_dcname_request_flags_writable_required = -1;
-static int hf_netlogon_get_dcname_request_flags_good_timeserv_preferred = -1;
-static int hf_netlogon_get_dcname_request_flags_avoid_self = -1;
-static int hf_netlogon_get_dcname_request_flags_only_ldap_needed = -1;
-static int hf_netlogon_get_dcname_request_flags_is_flat_name = -1;
-static int hf_netlogon_get_dcname_request_flags_is_dns_name = -1;
-static int hf_netlogon_get_dcname_request_flags_return_dns_name = -1;
-static int hf_netlogon_get_dcname_request_flags_return_flat_name = -1;
-static int hf_netlogon_dc_flags = -1;
-static int hf_netlogon_dc_flags_pdc_flag = -1;
-static int hf_netlogon_dc_flags_gc_flag = -1;
-static int hf_netlogon_dc_flags_ldap_flag = -1;
-static int hf_netlogon_dc_flags_ds_flag = -1;
-static int hf_netlogon_dc_flags_kdc_flag = -1;
-static int hf_netlogon_dc_flags_timeserv_flag = -1;
-static int hf_netlogon_dc_flags_closest_flag = -1;
-static int hf_netlogon_dc_flags_writable_flag = -1;
-static int hf_netlogon_dc_flags_good_timeserv_flag = -1;
-static int hf_netlogon_dc_flags_ndnc_flag = -1;
-static int hf_netlogon_dc_flags_dns_controller_flag = -1;
-static int hf_netlogon_dc_flags_dns_domain_flag = -1;
-static int hf_netlogon_dc_flags_dns_forest_flag = -1;
-/* static int hf_netlogon_dnsdomaininfo = -1; */
-static int hf_netlogon_s4u2proxytarget = -1;
-static int hf_netlogon_transitedlistsize = -1;
-static int hf_netlogon_transited_service = -1;
-static int hf_netlogon_logon_duration = -1;
-static int hf_netlogon_time_created = -1;
-
-static gint ett_nt_counted_longs_as_string = -1;
-static gint ett_dcerpc_netlogon = -1;
-static gint ett_group_attrs = -1;
-static gint ett_user_flags = -1;
-static gint ett_user_account_control = -1;
-static gint ett_QUOTA_LIMITS = -1;
-static gint ett_IDENTITY_INFO = -1;
-static gint ett_DELTA_ENUM = -1;
-static gint ett_authenticate_flags = -1;
-static gint ett_CYPHER_VALUE = -1;
-static gint ett_UNICODE_MULTI = -1;
-static gint ett_DOMAIN_CONTROLLER_INFO = -1;
-static gint ett_UNICODE_STRING_512 = -1;
-static gint ett_TYPE_50 = -1;
-static gint ett_TYPE_52 = -1;
-static gint ett_DELTA_ID_UNION = -1;
-static gint ett_TYPE_44 = -1;
-static gint ett_DELTA_UNION = -1;
-static gint ett_LM_OWF_PASSWORD = -1;
-static gint ett_NT_OWF_PASSWORD = -1;
-static gint ett_GROUP_MEMBERSHIP = -1;
-static gint ett_BLOB = -1;
-static gint ett_DS_DOMAIN_TRUSTS = -1;
-static gint ett_LSA_POLICY_INFO = -1;
-static gint ett_DOMAIN_TRUST_INFO = -1;
-static gint ett_trust_flags = -1;
-static gint ett_trust_attribs = -1;
-static gint ett_get_dcname_request_flags = -1;
-static gint ett_dc_flags = -1;
-static gint ett_wstr_LOGON_IDENTITY_INFO_string = -1;
-static gint ett_domain_group_memberships = -1;
-static gint ett_domains_group_memberships = -1;
-
-static expert_field ei_netlogon_auth_nthash = EI_INIT;
-static expert_field ei_netlogon_session_key = EI_INIT;
+static int proto_dcerpc_netlogon;
+
+static int hf_netlogon_TrustedDomainName_string;
+static int hf_netlogon_UserName_string;
+static int hf_domain_info_sid;
+static int hf_dns_domain_info_sid;
+static int hf_dns_domain_info_domain_guid;
+static int hf_dns_domain_info_dns_domain;
+static int hf_dns_domain_info_dns_forest;
+static int hf_dns_domain_info_name;
+static int hf_client_challenge;
+static int hf_server_rid;
+static int hf_server_challenge;
+static int hf_client_credential;
+static int hf_server_credential;
+static int hf_netlogon_logon_dnslogondomainname;
+static int hf_netlogon_logon_upn;
+static int hf_netlogon_group_attrs_mandatory;
+static int hf_netlogon_group_attrs_enabled_by_default;
+static int hf_netlogon_group_attrs_enabled;
+static int hf_netlogon_opnum;
+static int hf_netlogon_data_length;
+static int hf_netlogon_extraflags;
+static int hf_netlogon_extra_flags_root_forest;
+static int hf_netlogon_trust_flags_dc_firsthop;
+static int hf_netlogon_trust_flags_rodc_to_dc;
+static int hf_netlogon_trust_flags_rodc_ntlm;
+static int hf_netlogon_package_name;
+static int hf_netlogon_rc;
+static int hf_netlogon_dos_rc;
+static int hf_netlogon_werr_rc;
+static int hf_netlogon_len;
+static int hf_netlogon_sensitive_data_flag;
+static int hf_netlogon_sensitive_data_len;
+static int hf_netlogon_sensitive_data;
+static int hf_netlogon_security_information;
+static int hf_netlogon_dummy;
+static int hf_netlogon_neg_flags;
+/* static int hf_netlogon_neg_flags_80000000; */
+static int hf_netlogon_neg_flags_40000000;
+static int hf_netlogon_neg_flags_20000000;
+/* static int hf_netlogon_neg_flags_10000000; */
+/* static int hf_netlogon_neg_flags_8000000; */
+/* static int hf_netlogon_neg_flags_4000000; */
+/* static int hf_netlogon_neg_flags_2000000; */
+static int hf_netlogon_neg_flags_1000000;
+/* static int hf_netlogon_neg_flags_800000; */
+/* static int hf_netlogon_neg_flags_400000; */
+static int hf_netlogon_neg_flags_200000;
+static int hf_netlogon_neg_flags_100000;
+static int hf_netlogon_neg_flags_80000;
+static int hf_netlogon_neg_flags_40000;
+static int hf_netlogon_neg_flags_20000;
+static int hf_netlogon_neg_flags_10000;
+static int hf_netlogon_neg_flags_8000;
+static int hf_netlogon_neg_flags_4000;
+static int hf_netlogon_neg_flags_2000;
+static int hf_netlogon_neg_flags_1000;
+static int hf_netlogon_neg_flags_800;
+static int hf_netlogon_neg_flags_400;
+static int hf_netlogon_neg_flags_200;
+static int hf_netlogon_neg_flags_100;
+static int hf_netlogon_neg_flags_80;
+static int hf_netlogon_neg_flags_40;
+static int hf_netlogon_neg_flags_20;
+static int hf_netlogon_neg_flags_10;
+static int hf_netlogon_neg_flags_8;
+static int hf_netlogon_neg_flags_4;
+static int hf_netlogon_neg_flags_2;
+static int hf_netlogon_neg_flags_1;
+static int hf_netlogon_minworkingsetsize;
+static int hf_netlogon_maxworkingsetsize;
+static int hf_netlogon_pagedpoollimit;
+static int hf_netlogon_pagefilelimit;
+static int hf_netlogon_timelimit;
+static int hf_netlogon_nonpagedpoollimit;
+/* static int hf_netlogon_pac_size; */
+/* static int hf_netlogon_pac_data; */
+/* static int hf_netlogon_auth_size; */
+/* static int hf_netlogon_auth_data; */
+static int hf_netlogon_cipher_len;
+static int hf_netlogon_cipher_maxlen;
+static int hf_netlogon_cipher_current_data;
+static int hf_netlogon_cipher_current_set_time;
+static int hf_netlogon_cipher_old_data;
+static int hf_netlogon_cipher_old_set_time;
+static int hf_netlogon_priv;
+static int hf_netlogon_privilege_entries;
+static int hf_netlogon_privilege_control;
+static int hf_netlogon_privilege_name;
+static int hf_netlogon_systemflags;
+static int hf_netlogon_pdc_connection_status;
+static int hf_netlogon_tc_connection_status;
+static int hf_netlogon_restart_state;
+static int hf_netlogon_attrs;
+static int hf_netlogon_lsapolicy_len;
+/* static int hf_netlogon_lsapolicy_referentid; */
+/* static int hf_netlogon_lsapolicy_pointer; */
+static int hf_netlogon_count;
+static int hf_netlogon_entries;
+static int hf_netlogon_minpasswdlen;
+static int hf_netlogon_passwdhistorylen;
+static int hf_netlogon_level16;
+static int hf_netlogon_validation_level;
+static int hf_netlogon_reference;
+static int hf_netlogon_next_reference;
+static int hf_netlogon_timestamp;
+static int hf_netlogon_level;
+static int hf_netlogon_challenge;
+static int hf_netlogon_reserved;
+static int hf_netlogon_audit_retention_period;
+static int hf_netlogon_auditing_mode;
+static int hf_netlogon_max_audit_event_count;
+static int hf_netlogon_event_audit_option;
+static int hf_netlogon_unknown_string;
+static int hf_netlogon_trust_extension;
+static int hf_netlogon_trust_max;
+static int hf_netlogon_trust_offset;
+static int hf_netlogon_trust_len;
+static int hf_netlogon_dummy_string;
+static int hf_netlogon_dummy_string2;
+static int hf_netlogon_dummy_string3;
+static int hf_netlogon_dummy_string4;
+static int hf_netlogon_dummy_string5;
+static int hf_netlogon_dummy_string6;
+static int hf_netlogon_dummy_string7;
+static int hf_netlogon_dummy_string8;
+static int hf_netlogon_dummy_string9;
+static int hf_netlogon_dummy_string10;
+static int hf_netlogon_unknown_short;
+static int hf_netlogon_unknown_long;
+static int hf_netlogon_dummy1_long;
+static int hf_netlogon_dummy2_long;
+static int hf_netlogon_dummy3_long;
+static int hf_netlogon_dummy4_long;
+static int hf_netlogon_dummy5_long;
+static int hf_netlogon_dummy6_long;
+static int hf_netlogon_dummy7_long;
+static int hf_netlogon_dummy8_long;
+static int hf_netlogon_dummy9_long;
+static int hf_netlogon_dummy10_long;
+static int hf_netlogon_unknown_char;
+static int hf_netlogon_logon_time;
+static int hf_netlogon_logoff_time;
+static int hf_netlogon_last_logoff_time;
+static int hf_netlogon_kickoff_time;
+static int hf_netlogon_pwd_age;
+static int hf_netlogon_pwd_last_set_time;
+static int hf_netlogon_pwd_can_change_time;
+static int hf_netlogon_pwd_must_change_time;
+static int hf_netlogon_nt_chal_resp;
+static int hf_netlogon_lm_chal_resp;
+static int hf_netlogon_credential;
+static int hf_netlogon_acct_name;
+static int hf_netlogon_acct_desc;
+static int hf_netlogon_group_desc;
+static int hf_netlogon_full_name;
+static int hf_netlogon_comment;
+static int hf_netlogon_parameters;
+static int hf_netlogon_logon_script;
+static int hf_netlogon_profile_path;
+static int hf_netlogon_home_dir;
+static int hf_netlogon_dir_drive;
+static int hf_netlogon_logon_count;
+static int hf_netlogon_logon_count16;
+static int hf_netlogon_bad_pw_count;
+static int hf_netlogon_bad_pw_count16;
+static int hf_netlogon_user_rid;
+static int hf_netlogon_alias_rid;
+static int hf_netlogon_group_rid;
+static int hf_netlogon_logon_srv;
+/* static int hf_netlogon_principal; */
+static int hf_netlogon_logon_dom;
+static int hf_netlogon_resourcegroupcount;
+static int hf_netlogon_accountdomaingroupcount;
+static int hf_netlogon_domaingroupcount;
+static int hf_netlogon_membership_domains_count;
+static int hf_netlogon_downlevel_domain_name;
+static int hf_netlogon_dns_domain_name;
+static int hf_netlogon_ad_client_dns_name;
+static int hf_netlogon_domain_name;
+static int hf_netlogon_domain_create_time;
+static int hf_netlogon_domain_modify_time;
+static int hf_netlogon_modify_count;
+static int hf_netlogon_db_modify_time;
+static int hf_netlogon_db_create_time;
+static int hf_netlogon_oem_info;
+static int hf_netlogon_serial_number;
+static int hf_netlogon_num_rids;
+static int hf_netlogon_num_trusts;
+static int hf_netlogon_num_controllers;
+static int hf_netlogon_num_sid;
+static int hf_netlogon_computer_name;
+static int hf_netlogon_site_name;
+static int hf_netlogon_trusted_dc_name;
+static int hf_netlogon_dc_name;
+static int hf_netlogon_dc_site_name;
+static int hf_netlogon_dns_forest_name;
+static int hf_netlogon_dc_address;
+static int hf_netlogon_dc_address_type;
+static int hf_netlogon_client_site_name;
+static int hf_netlogon_workstation;
+static int hf_netlogon_workstation_site_name;
+static int hf_netlogon_os_version;
+static int hf_netlogon_workstation_os;
+static int hf_netlogon_workstation_flags;
+static int hf_netlogon_supportedenctypes;
+
+static int hf_netlogon_workstations;
+static int hf_netlogon_workstation_fqdn;
+static int hf_netlogon_group_name;
+static int hf_netlogon_alias_name;
+static int hf_netlogon_country;
+static int hf_netlogon_codepage;
+static int hf_netlogon_flags;
+static int hf_netlogon_trust_attribs;
+static int hf_netlogon_trust_attribs_non_transitive;
+static int hf_netlogon_trust_attribs_uplevel_only;
+static int hf_netlogon_trust_attribs_quarantined_domain;
+static int hf_netlogon_trust_attribs_forest_transitive;
+static int hf_netlogon_trust_attribs_cross_organization;
+static int hf_netlogon_trust_attribs_within_forest;
+static int hf_netlogon_trust_attribs_treat_as_external;
+static int hf_netlogon_trust_type;
+static int hf_netlogon_trust_flags;
+static int hf_netlogon_trust_flags_inbound;
+static int hf_netlogon_trust_flags_outbound;
+static int hf_netlogon_trust_flags_in_forest;
+static int hf_netlogon_trust_flags_native_mode;
+static int hf_netlogon_trust_flags_primary;
+static int hf_netlogon_trust_flags_tree_root;
+static int hf_netlogon_trust_parent_index;
+static int hf_netlogon_user_account_control;
+static int hf_netlogon_user_account_control_dont_require_preauth;
+static int hf_netlogon_user_account_control_use_des_key_only;
+static int hf_netlogon_user_account_control_not_delegated;
+static int hf_netlogon_user_account_control_trusted_for_delegation;
+static int hf_netlogon_user_account_control_smartcard_required;
+static int hf_netlogon_user_account_control_encrypted_text_password_allowed;
+static int hf_netlogon_user_account_control_account_auto_locked;
+static int hf_netlogon_user_account_control_dont_expire_password;
+static int hf_netlogon_user_account_control_server_trust_account;
+static int hf_netlogon_user_account_control_workstation_trust_account;
+static int hf_netlogon_user_account_control_interdomain_trust_account;
+static int hf_netlogon_user_account_control_mns_logon_account;
+static int hf_netlogon_user_account_control_normal_account;
+static int hf_netlogon_user_account_control_temp_duplicate_account;
+static int hf_netlogon_user_account_control_password_not_required;
+static int hf_netlogon_user_account_control_home_directory_required;
+static int hf_netlogon_user_account_control_account_disabled;
+static int hf_netlogon_user_flags;
+static int hf_netlogon_user_flags_extra_sids;
+static int hf_netlogon_user_flags_resource_groups;
+static int hf_netlogon_auth_flags;
+static int hf_netlogon_pwd_expired;
+static int hf_netlogon_nt_pwd_present;
+static int hf_netlogon_lm_pwd_present;
+static int hf_netlogon_code;
+static int hf_netlogon_database_id;
+static int hf_netlogon_sync_context;
+static int hf_netlogon_max_size;
+static int hf_netlogon_max_log_size;
+static int hf_netlogon_dns_host;
+static int hf_netlogon_acct_expiry_time;
+static int hf_netlogon_encrypted_lm_owf_password;
+static int hf_netlogon_lm_owf_password;
+static int hf_netlogon_nt_owf_password;
+static int hf_netlogon_param_ctrl;
+static int hf_netlogon_logon_id;
+static int hf_netlogon_num_deltas;
+static int hf_netlogon_user_session_key;
+static int hf_netlogon_blob_size;
+static int hf_netlogon_blob;
+static int hf_netlogon_logon_attempts;
+static int hf_netlogon_authoritative;
+static int hf_netlogon_secure_channel_type;
+static int hf_netlogon_logonsrv_handle;
+static int hf_netlogon_delta_type;
+static int hf_netlogon_get_dcname_request_flags;
+static int hf_netlogon_get_dcname_request_flags_force_rediscovery;
+static int hf_netlogon_get_dcname_request_flags_directory_service_required;
+static int hf_netlogon_get_dcname_request_flags_directory_service_preferred;
+static int hf_netlogon_get_dcname_request_flags_gc_server_required;
+static int hf_netlogon_get_dcname_request_flags_pdc_required;
+static int hf_netlogon_get_dcname_request_flags_background_only;
+static int hf_netlogon_get_dcname_request_flags_ip_required;
+static int hf_netlogon_get_dcname_request_flags_kdc_required;
+static int hf_netlogon_get_dcname_request_flags_timeserv_required;
+static int hf_netlogon_get_dcname_request_flags_writable_required;
+static int hf_netlogon_get_dcname_request_flags_good_timeserv_preferred;
+static int hf_netlogon_get_dcname_request_flags_avoid_self;
+static int hf_netlogon_get_dcname_request_flags_only_ldap_needed;
+static int hf_netlogon_get_dcname_request_flags_is_flat_name;
+static int hf_netlogon_get_dcname_request_flags_is_dns_name;
+static int hf_netlogon_get_dcname_request_flags_return_dns_name;
+static int hf_netlogon_get_dcname_request_flags_return_flat_name;
+static int hf_netlogon_dc_flags;
+static int hf_netlogon_dc_flags_pdc_flag;
+static int hf_netlogon_dc_flags_gc_flag;
+static int hf_netlogon_dc_flags_ldap_flag;
+static int hf_netlogon_dc_flags_ds_flag;
+static int hf_netlogon_dc_flags_kdc_flag;
+static int hf_netlogon_dc_flags_timeserv_flag;
+static int hf_netlogon_dc_flags_closest_flag;
+static int hf_netlogon_dc_flags_writable_flag;
+static int hf_netlogon_dc_flags_good_timeserv_flag;
+static int hf_netlogon_dc_flags_ndnc_flag;
+static int hf_netlogon_dc_flags_dns_controller_flag;
+static int hf_netlogon_dc_flags_dns_domain_flag;
+static int hf_netlogon_dc_flags_dns_forest_flag;
+/* static int hf_netlogon_dnsdomaininfo; */
+static int hf_netlogon_s4u2proxytarget;
+static int hf_netlogon_transitedlistsize;
+static int hf_netlogon_transited_service;
+static int hf_netlogon_logon_duration;
+static int hf_netlogon_time_created;
+
+static gint ett_nt_counted_longs_as_string;
+static gint ett_dcerpc_netlogon;
+static gint ett_group_attrs;
+static gint ett_user_flags;
+static gint ett_user_account_control;
+static gint ett_QUOTA_LIMITS;
+static gint ett_IDENTITY_INFO;
+static gint ett_DELTA_ENUM;
+static gint ett_authenticate_flags;
+static gint ett_CYPHER_VALUE;
+static gint ett_UNICODE_MULTI;
+static gint ett_DOMAIN_CONTROLLER_INFO;
+static gint ett_UNICODE_STRING_512;
+static gint ett_TYPE_50;
+static gint ett_TYPE_52;
+static gint ett_DELTA_ID_UNION;
+static gint ett_TYPE_44;
+static gint ett_DELTA_UNION;
+static gint ett_LM_OWF_PASSWORD;
+static gint ett_NT_OWF_PASSWORD;
+static gint ett_GROUP_MEMBERSHIP;
+static gint ett_BLOB;
+static gint ett_DS_DOMAIN_TRUSTS;
+static gint ett_LSA_POLICY_INFO;
+static gint ett_DOMAIN_TRUST_INFO;
+static gint ett_trust_flags;
+static gint ett_trust_attribs;
+static gint ett_get_dcname_request_flags;
+static gint ett_dc_flags;
+static gint ett_wstr_LOGON_IDENTITY_INFO_string;
+static gint ett_domain_group_memberships;
+static gint ett_domains_group_memberships;
+
+static expert_field ei_netlogon_auth_nthash;
+static expert_field ei_netlogon_session_key;
 
 typedef struct _netlogon_auth_vars {
     guint64 client_challenge;
@@ -7590,22 +7590,22 @@ netlogon_dissect_dsrderegisterdnshostrecords_reply(tvbuff_t *tvb, int offset,
 
 /* Dissect secure channel stuff */
 
-static int hf_netlogon_secchan_nl_message_type = -1;
-static int hf_netlogon_secchan_nl_message_flags = -1;
-static int hf_netlogon_secchan_nl_message_flags_nb_domain = -1;
-static int hf_netlogon_secchan_nl_message_flags_nb_host = -1;
-static int hf_netlogon_secchan_nl_message_flags_dns_domain = -1;
-static int hf_netlogon_secchan_nl_message_flags_dns_host = -1;
-static int hf_netlogon_secchan_nl_message_flags_nb_host_utf8 = -1;
-static int hf_netlogon_secchan_nl_nb_domain = -1;
-static int hf_netlogon_secchan_nl_nb_host = -1;
-static int hf_netlogon_secchan_nl_dns_domain = -1;
-static int hf_netlogon_secchan_nl_dns_host = -1;
-static int hf_netlogon_secchan_nl_nb_host_utf8 = -1;
-
-static gint ett_secchan_verf = -1;
-static gint ett_secchan_nl_auth_message = -1;
-static gint ett_secchan_nl_auth_message_flags = -1;
+static int hf_netlogon_secchan_nl_message_type;
+static int hf_netlogon_secchan_nl_message_flags;
+static int hf_netlogon_secchan_nl_message_flags_nb_domain;
+static int hf_netlogon_secchan_nl_message_flags_nb_host;
+static int hf_netlogon_secchan_nl_message_flags_dns_domain;
+static int hf_netlogon_secchan_nl_message_flags_dns_host;
+static int hf_netlogon_secchan_nl_message_flags_nb_host_utf8;
+static int hf_netlogon_secchan_nl_nb_domain;
+static int hf_netlogon_secchan_nl_nb_host;
+static int hf_netlogon_secchan_nl_dns_domain;
+static int hf_netlogon_secchan_nl_dns_host;
+static int hf_netlogon_secchan_nl_nb_host_utf8;
+
+static gint ett_secchan_verf;
+static gint ett_secchan_nl_auth_message;
+static gint ett_secchan_nl_auth_message_flags;
 
 static const value_string nl_auth_types[] = {
     { 0x00000000,         "Request"},
@@ -7850,13 +7850,13 @@ static dcerpc_sub_dissector dcerpc_netlogon_dissectors[] = {
     {0, NULL, NULL,  NULL }
 };
 
-static int hf_netlogon_secchan_verf = -1;
-static int hf_netlogon_secchan_verf_signalg = -1;
-static int hf_netlogon_secchan_verf_sealalg = -1;
-static int hf_netlogon_secchan_verf_flag = -1;
-static int hf_netlogon_secchan_verf_digest = -1;
-static int hf_netlogon_secchan_verf_seq = -1;
-static int hf_netlogon_secchan_verf_nonce = -1;
+static int hf_netlogon_secchan_verf;
+static int hf_netlogon_secchan_verf_signalg;
+static int hf_netlogon_secchan_verf_sealalg;
+static int hf_netlogon_secchan_verf_flag;
+static int hf_netlogon_secchan_verf_digest;
+static int hf_netlogon_secchan_verf_seq;
+static int hf_netlogon_secchan_verf_nonce;
 
 static const value_string sign_algs[] = {
     { 0x0077, "HMAC-MD5"},
diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c
index 5fcc88a0da..93f1b5e719 100644
--- a/epan/dissectors/packet-dcerpc-nt.c
+++ b/epan/dissectors/packet-dcerpc-nt.c
@@ -23,22 +23,22 @@
 #include "packet-windows-common.h"
 
 
-int hf_nt_cs_len = -1;
+int hf_nt_cs_len;
 int hf_nt_error;
-int hf_nt_cs_size = -1;
-static int hf_lsa_String_name_len = -1;
-static int hf_lsa_String_name_size = -1;
-static int hf_nt_data_blob_len = -1;
-static int hf_nt_data_blob_data = -1;
-static int hf_nt_midl_blob_len = -1;
-static int hf_nt_midl_fill_bytes = -1;
-static int hf_nt_midl_version = -1;
-static int hf_nt_midl_hdr_len = -1;
+int hf_nt_cs_size;
+static int hf_lsa_String_name_len;
+static int hf_lsa_String_name_size;
+static int hf_nt_data_blob_len;
+static int hf_nt_data_blob_data;
+static int hf_nt_midl_blob_len;
+static int hf_nt_midl_fill_bytes;
+static int hf_nt_midl_version;
+static int hf_nt_midl_hdr_len;
 
-static gint ett_nt_MIDL_BLOB = -1;
-static gint ett_lsa_String = -1;
-static gint ett_nt_data_blob = -1;
-static expert_field ei_dcerpc_nt_badsid = EI_INIT;
+static gint ett_nt_MIDL_BLOB;
+static gint ett_lsa_String;
+static gint ett_nt_data_blob;
+static expert_field ei_dcerpc_nt_badsid;
 
 
 
@@ -161,7 +161,7 @@ dissect_ndr_counted_string_cb(tvbuff_t *tvb, int offset,
 	return offset;
 }
 
-static gint ett_nt_counted_string = -1;
+static gint ett_nt_counted_string;
 
 static int
 dissect_ndr_counted_string_helper(tvbuff_t *tvb, int offset,
@@ -215,7 +215,7 @@ dissect_ndr_counted_string_ptr(tvbuff_t *tvb, int offset,
 
 /* Dissect a counted byte_array as a callback to dissect_ndr_pointer_cb() */
 
-static gint ett_nt_counted_byte_array = -1;
+static gint ett_nt_counted_byte_array;
 
 /* Dissect a counted byte array in-line. */
 
@@ -322,7 +322,7 @@ dissect_ndr_counted_byte_array(tvbuff_t *tvb, int offset,
 }
 
 /* Dissect a counted ascii string in-line. */
-static gint ett_nt_counted_ascii_string = -1;
+static gint ett_nt_counted_ascii_string;
 
 int
 dissect_ndr_counted_ascii_string_cb(tvbuff_t *tvb, int offset,
@@ -380,7 +380,7 @@ dissect_ndr_counted_ascii_string(tvbuff_t *tvb, int offset,
 		tvb, offset, pinfo, tree, di, drep, hf_index, cb_str_postprocess, GINT_TO_POINTER(2 + levels));
 }
 
-static int hf_nt_guid = -1;
+static int hf_nt_guid;
 
 int
 dissect_nt_GUID(tvbuff_t *tvb, int offset,
@@ -920,10 +920,10 @@ dissect_hresult(tvbuff_t *tvb, gint offset, packet_info *pinfo,
 
 /* Dissect a NT policy handle */
 
-static int hf_nt_policy_open_frame = -1;
-static int hf_nt_policy_close_frame = -1;
+static int hf_nt_policy_open_frame;
+static int hf_nt_policy_close_frame;
 
-static gint ett_nt_policy_hnd = -1;
+static gint ett_nt_policy_hnd;
 
 /* this function is used to dissect a "handle".
  * it will keep track of which frame a handle is opened from and in which
@@ -1314,8 +1314,8 @@ int dissect_ndr_str_pointer_item(tvbuff_t *tvb, gint offset,
 
 /* SID dissection routines */
 
-static int hf_nt_count = -1;
-static int hf_nt_domain_sid = -1;
+static int hf_nt_count;
+static int hf_nt_domain_sid;
 
 /* That's a SID that is always 28 bytes long */
 int
@@ -1475,7 +1475,7 @@ dissect_ndr_nt_SID_hf_through_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	return offset;
 }
 
-static gint ett_nt_sid_pointer = -1;
+static gint ett_nt_sid_pointer;
 
 int
 dissect_ndr_nt_PSID(tvbuff_t *tvb, int offset,
@@ -1542,20 +1542,20 @@ static const true_false_string tfs_nt_acb_autolock = {
 	"This account has NOT been auto locked"
 };
 
-static gint ett_nt_acct_ctrl = -1;
-
-static int hf_nt_acct_ctrl = -1;
-static int hf_nt_acb_disabled = -1;
-static int hf_nt_acb_homedirreq = -1;
-static int hf_nt_acb_pwnotreq = -1;
-static int hf_nt_acb_tempdup = -1;
-static int hf_nt_acb_normal = -1;
-static int hf_nt_acb_mns = -1;
-static int hf_nt_acb_domtrust = -1;
-static int hf_nt_acb_wstrust = -1;
-static int hf_nt_acb_svrtrust = -1;
-static int hf_nt_acb_pwnoexp = -1;
-static int hf_nt_acb_autolock = -1;
+static gint ett_nt_acct_ctrl;
+
+static int hf_nt_acct_ctrl;
+static int hf_nt_acb_disabled;
+static int hf_nt_acb_homedirreq;
+static int hf_nt_acb_pwnotreq;
+static int hf_nt_acb_tempdup;
+static int hf_nt_acb_normal;
+static int hf_nt_acb_mns;
+static int hf_nt_acb_domtrust;
+static int hf_nt_acb_wstrust;
+static int hf_nt_acb_svrtrust;
+static int hf_nt_acb_pwnoexp;
+static int hf_nt_acb_autolock;
 
 int
 dissect_ndr_nt_acct_ctrl(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -1585,7 +1585,7 @@ dissect_ndr_nt_acct_ctrl(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	return offset;
 }
 
-static int hf_logonhours_unknown_char = -1;
+static int hf_logonhours_unknown_char;
 
 static int
 dissect_LOGON_HOURS_entry(tvbuff_t *tvb, int offset,
@@ -1597,7 +1597,7 @@ dissect_LOGON_HOURS_entry(tvbuff_t *tvb, int offset,
 	return offset;
 }
 
-static gint ett_nt_logon_hours_hours = -1;
+static gint ett_nt_logon_hours_hours;
 
 static int
 dissect_LOGON_HOURS_hours(tvbuff_t *tvb, int offset,
@@ -1618,8 +1618,8 @@ dissect_LOGON_HOURS_hours(tvbuff_t *tvb, int offset,
 	return offset;
 }
 
-static gint ett_nt_logon_hours = -1;
-static int hf_logonhours_divisions = -1;
+static gint ett_nt_logon_hours;
+static int hf_logonhours_divisions;
 
 int
 dissect_ndr_nt_LOGON_HOURS(tvbuff_t *tvb, int offset,
@@ -1668,7 +1668,7 @@ dissect_ndr_nt_PSID_ARRAY_sids (tvbuff_t *tvb, int offset,
 	return offset;
 }
 
-static gint ett_nt_sid_array = -1;
+static gint ett_nt_sid_array;
 
 int
 dissect_ndr_nt_PSID_ARRAY(tvbuff_t *tvb, int offset,
@@ -1700,8 +1700,8 @@ dissect_ndr_nt_PSID_ARRAY(tvbuff_t *tvb, int offset,
 	return offset;
 }
 
-static gint ett_nt_sid_and_attributes = -1;
-static int hf_nt_attrib = -1;
+static gint ett_nt_sid_and_attributes;
+static int hf_nt_attrib;
 
 int
 dissect_ndr_nt_SID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset,
@@ -1722,7 +1722,7 @@ dissect_ndr_nt_SID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset,
 	return offset;
 }
 
-static gint ett_nt_sid_and_attributes_array = -1;
+static gint ett_nt_sid_and_attributes_array;
 
 int
 dissect_ndr_nt_SID_AND_ATTRIBUTES_ARRAY(tvbuff_t *tvb, int offset,
diff --git a/epan/dissectors/packet-dcerpc-pnp.c b/epan/dissectors/packet-dcerpc-pnp.c
index cc055e9fe8..0f8bdbf2d5 100644
--- a/epan/dissectors/packet-dcerpc-pnp.c
+++ b/epan/dissectors/packet-dcerpc-pnp.c
@@ -19,11 +19,11 @@
 void proto_register_dcerpc_pnp(void);
 void proto_reg_handoff_dcerpc_pnp(void);
 
-static int proto_dcerpc_pnp = -1;
+static int proto_dcerpc_pnp;
 
-static int hf_pnp_opnum = -1;
+static int hf_pnp_opnum;
 
-static gint ett_dcerpc_pnp = -1;
+static gint ett_dcerpc_pnp;
 
 /*
  * The pnp MSRPC interface is typically reached using the ncacn_np transport
diff --git a/epan/dissectors/packet-dcerpc-rdaclif.c b/epan/dissectors/packet-dcerpc-rdaclif.c
index ee40f8c831..1a0692f2c7 100644
--- a/epan/dissectors/packet-dcerpc-rdaclif.c
+++ b/epan/dissectors/packet-dcerpc-rdaclif.c
@@ -21,11 +21,11 @@
 void proto_register_rdaclif (void);
 void proto_reg_handoff_rdaclif (void);
 
-static int proto_rdaclif = -1;
-static int hf_rdaclif_opnum = -1;
+static int proto_rdaclif;
+static int hf_rdaclif_opnum;
 
 
-static gint ett_rdaclif = -1;
+static gint ett_rdaclif;
 static e_guid_t uuid_rdaclif =
   { 0x47b33331, 0x8000, 0x0000, {0x0d, 0x00, 0x01, 0xdc, 0x6c, 0x00, 0x00,
                                  0x00} };
diff --git a/epan/dissectors/packet-dcerpc-rep_proc.c b/epan/dissectors/packet-dcerpc-rep_proc.c
index 964b04e558..aaca0dc069 100644
--- a/epan/dissectors/packet-dcerpc-rep_proc.c
+++ b/epan/dissectors/packet-dcerpc-rep_proc.c
@@ -21,11 +21,11 @@
 void proto_register_rep_proc (void);
 void proto_reg_handoff_rep_proc (void);
 
-static int proto_rep_proc = -1;
-static int hf_rep_proc_opnum = -1;
+static int proto_rep_proc;
+static int hf_rep_proc_opnum;
 
 
-static gint ett_rep_proc = -1;
+static gint ett_rep_proc;
 
 
 static e_guid_t uuid_rep_proc = { 0x4d37f2dd, 0xed43, 0x0005, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00 } };
diff --git a/epan/dissectors/packet-dcerpc-roverride.c b/epan/dissectors/packet-dcerpc-roverride.c
index 0bebb1a512..a08812e05e 100644
--- a/epan/dissectors/packet-dcerpc-roverride.c
+++ b/epan/dissectors/packet-dcerpc-roverride.c
@@ -21,11 +21,11 @@
 void proto_register_roverride (void);
 void proto_reg_handoff_roverride (void);
 
-static int proto_roverride = -1;
-static int hf_roverride_opnum = -1;
+static int proto_roverride;
+static int hf_roverride_opnum;
 
 
-static gint ett_roverride = -1;
+static gint ett_roverride;
 
 
 static e_guid_t uuid_roverride = { 0x5d978990, 0x4851, 0x11ca, { 0x99, 0x37, 0x08, 0x00, 0x1e, 0x03, 0x94, 0x48 } };
diff --git a/epan/dissectors/packet-dcerpc-rpriv.c b/epan/dissectors/packet-dcerpc-rpriv.c
index 808d7a85b4..eea632cdc3 100644
--- a/epan/dissectors/packet-dcerpc-rpriv.c
+++ b/epan/dissectors/packet-dcerpc-rpriv.c
@@ -21,17 +21,17 @@
 void proto_register_rpriv (void);
 void proto_reg_handoff_rpriv (void);
 
-static int proto_rpriv = -1;
-static int hf_rpriv_opnum = -1;
-static int hf_rpriv_get_eptgt_rqst_authn_svc = -1;
-static int hf_rpriv_get_eptgt_rqst_authz_svc = -1;
-static int hf_rpriv_get_eptgt_rqst_var1 = -1;
-/* static int hf_rpriv_get_eptgt_rqst_key_size = -1; */
-static int hf_rpriv_get_eptgt_rqst_key_size2 = -1;
-static int hf_rpriv_get_eptgt_rqst_key_t = -1;
-static int hf_rpriv_get_eptgt_rqst_key_t2 = -1;
-
-static gint ett_rpriv = -1;
+static int proto_rpriv;
+static int hf_rpriv_opnum;
+static int hf_rpriv_get_eptgt_rqst_authn_svc;
+static int hf_rpriv_get_eptgt_rqst_authz_svc;
+static int hf_rpriv_get_eptgt_rqst_var1;
+/* static int hf_rpriv_get_eptgt_rqst_key_size; */
+static int hf_rpriv_get_eptgt_rqst_key_size2;
+static int hf_rpriv_get_eptgt_rqst_key_t;
+static int hf_rpriv_get_eptgt_rqst_key_t2;
+
+static gint ett_rpriv;
 
 
 static e_guid_t uuid_rpriv = { 0xb1e338f8, 0x9533, 0x11c9, { 0xa3, 0x4a, 0x08, 0x00, 0x1e, 0x01, 0x9c, 0x1e } };
diff --git a/epan/dissectors/packet-dcerpc-rras.c b/epan/dissectors/packet-dcerpc-rras.c
index acee1335d1..01c37e6f2a 100644
--- a/epan/dissectors/packet-dcerpc-rras.c
+++ b/epan/dissectors/packet-dcerpc-rras.c
@@ -19,11 +19,11 @@
 void proto_register_dcerpc_rras(void);
 void proto_reg_handoff_dcerpc_rras(void);
 
-static int proto_dcerpc_rras = -1;
+static int proto_dcerpc_rras;
 
-static int hf_rras_opnum = -1;
+static int hf_rras_opnum;
 
-static gint ett_dcerpc_rras = -1;
+static gint ett_dcerpc_rras;
 
 /*
  * The rras MSRPC interface is typically reached using the ncacn_np transport
diff --git a/epan/dissectors/packet-dcerpc-rs_acct.c b/epan/dissectors/packet-dcerpc-rs_acct.c
index b823271f17..95cbbc040c 100644
--- a/epan/dissectors/packet-dcerpc-rs_acct.c
+++ b/epan/dissectors/packet-dcerpc-rs_acct.c
@@ -21,17 +21,17 @@
 void proto_register_rs_acct (void);
 void proto_reg_handoff_rs_acct (void);
 
-static int proto_rs_acct = -1;
-static int hf_rs_acct_opnum = -1;
-static int hf_rs_acct_lookup_rqst_var = -1;
-static int hf_rs_acct_lookup_rqst_key_size = -1;
-static int hf_rs_acct_lookup_rqst_key_t = -1;
-static int hf_rs_acct_get_projlist_rqst_var1 = -1;
-static int hf_rs_acct_get_projlist_rqst_key_size = -1;
-static int hf_rs_acct_get_projlist_rqst_key_t = -1;
+static int proto_rs_acct;
+static int hf_rs_acct_opnum;
+static int hf_rs_acct_lookup_rqst_var;
+static int hf_rs_acct_lookup_rqst_key_size;
+static int hf_rs_acct_lookup_rqst_key_t;
+static int hf_rs_acct_get_projlist_rqst_var1;
+static int hf_rs_acct_get_projlist_rqst_key_size;
+static int hf_rs_acct_get_projlist_rqst_key_t;
 
 
-static gint ett_rs_acct = -1;
+static gint ett_rs_acct;
 
 
 
diff --git a/epan/dissectors/packet-dcerpc-rs_attr.c b/epan/dissectors/packet-dcerpc-rs_attr.c
index ce61e96c5a..ac13008247 100644
--- a/epan/dissectors/packet-dcerpc-rs_attr.c
+++ b/epan/dissectors/packet-dcerpc-rs_attr.c
@@ -21,11 +21,11 @@
 void proto_register_rs_attr (void);
 void proto_reg_handoff_rs_attr (void);
 
-static int proto_rs_attr = -1;
-static int hf_rs_attr_opnum = -1;
+static int proto_rs_attr;
+static int hf_rs_attr_opnum;
 
 
-static gint ett_rs_attr = -1;
+static gint ett_rs_attr;
 
 
 static e_guid_t uuid_rs_attr = { 0xa71fc1e8, 0x567f, 0x11cb, { 0x98, 0xa0, 0x08, 0x00, 0x1e, 0x04, 0xde, 0x8c } };
diff --git a/epan/dissectors/packet-dcerpc-rs_attr_schema.c b/epan/dissectors/packet-dcerpc-rs_attr_schema.c
index bc82b8bddf..baa51e0a90 100644
--- a/epan/dissectors/packet-dcerpc-rs_attr_schema.c
+++ b/epan/dissectors/packet-dcerpc-rs_attr_schema.c
@@ -21,11 +21,11 @@
 void proto_register_rs_attr_schema (void);
 void proto_reg_handoff_rs_attr_schema (void);
 
-static int proto_rs_attr_schema = -1;
-static int hf_rs_attr_schema_opnum = -1;
+static int proto_rs_attr_schema;
+static int hf_rs_attr_schema_opnum;
 
 
-static gint ett_rs_attr_schema = -1;
+static gint ett_rs_attr_schema;
 static e_guid_t uuid_rs_attr_schema =
   { 0xb47c9460, 0x567f, 0x11cb, {0x8c, 0x09, 0x08, 0x00, 0x1e, 0x04, 0xde,
                                  0x8c} };
diff --git a/epan/dissectors/packet-dcerpc-rs_bind.c b/epan/dissectors/packet-dcerpc-rs_bind.c
index a598d71608..a87d1de452 100644
--- a/epan/dissectors/packet-dcerpc-rs_bind.c
+++ b/epan/dissectors/packet-dcerpc-rs_bind.c
@@ -21,10 +21,10 @@
 void proto_register_rs_bind (void);
 void proto_reg_handoff_rs_bind (void);
 
-static int proto_rs_bind = -1;
-static int hf_rs_bind_opnum = -1;
+static int proto_rs_bind;
+static int hf_rs_bind_opnum;
 
-static gint ett_rs_bind = -1;
+static gint ett_rs_bind;
 
 
 static e_guid_t uuid_rs_bind =
diff --git a/epan/dissectors/packet-dcerpc-rs_misc.c b/epan/dissectors/packet-dcerpc-rs_misc.c
index 16dd3378dc..3e44a40275 100644
--- a/epan/dissectors/packet-dcerpc-rs_misc.c
+++ b/epan/dissectors/packet-dcerpc-rs_misc.c
@@ -21,14 +21,14 @@
 void proto_register_rs_misc (void);
 void proto_reg_handoff_rs_misc (void);
 
-static int proto_rs_misc = -1;
-static int hf_rs_misc_opnum = -1;
-static int hf_rs_misc_login_get_info_rqst_var = -1;
-static int hf_rs_misc_login_get_info_rqst_key_size = -1;
-static int hf_rs_misc_login_get_info_rqst_key_t = -1;
+static int proto_rs_misc;
+static int hf_rs_misc_opnum;
+static int hf_rs_misc_login_get_info_rqst_var;
+static int hf_rs_misc_login_get_info_rqst_key_size;
+static int hf_rs_misc_login_get_info_rqst_key_t;
 
 
-static gint ett_rs_misc = -1;
+static gint ett_rs_misc;
 
 
 static e_guid_t uuid_rs_misc = { 0x4c878280, 0x5000, 0x0000, { 0x0d, 0x00, 0x02, 0x87, 0x14, 0x00, 0x00, 0x00 } };
diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c
index 89dc6b9be3..1839a5ae34 100644
--- a/epan/dissectors/packet-dcerpc-rs_pgo.c
+++ b/epan/dissectors/packet-dcerpc-rs_pgo.c
@@ -27,53 +27,53 @@ delete
 dissect_rgy_acct_user_flags_t
 */
 
-static int proto_rs_pgo = -1;
-static int hf_rs_pgo_opnum = -1;
-static int hf_rs_var1 = -1;
-static int hf_rs_pgo_query_result_t = -1;
-static int hf_rs_pgo_query_t = -1;
-static int hf_rs_pgo_query_key_t = -1;
-static int hf_error_status_t = -1;
-static int hf_sec_rgy_pgo_flags_t = -1;
-static int hf_rs_sec_rgy_pgo_item_t_quota = -1;
-static int hf_rs_sec_rgy_pgo_item_t_unix_num = -1;
-static int hf_rs_timeval = -1;
-static int hf_rs_uuid1 = -1;
-static int hf_sec_rgy_domain_t = -1;
-static int hf_sec_rgy_name_t_principalName_string = -1;
-static int hf_sec_rgy_name_t_size = -1;
-static int hf_sec_rgy_pname_t_principalName_string = -1;
-static int hf_sec_rgy_pname_t_size = -1;
-static int hf_rs_pgo_unix_num_key_t = -1;
-
-static gint ett_rs_cache_data_t = -1;
-static gint ett_sec_rgy_domain_t = -1;
-static gint ett_rgy_acct_user_flags_t = -1;
-static gint ett_sec_attr_component_name_t = -1;
-static gint ett_sec_passwd_type_t = -1;
-static gint ett_sec_rgy_acct_admin_flags_t = -1;
-static gint ett_sec_rgy_acct_admin_t = -1;
-static gint ett_sec_rgy_acct_auth_flags_t = -1;
-static gint ett_sec_rgy_acct_key_t = -1;
-static gint ett_sec_rgy_acct_user_t = -1;
-static gint ett_sec_rgy_cursor_t = -1;
-static gint ett_sec_rgy_foreign_id_t = -1;
-static gint ett_sec_rgy_login_name_t = -1;
-static gint ett_sec_rgy_name_t = -1;
-static gint ett_sec_rgy_pgo_item_t = -1;
-static gint ett_sec_rgy_pname_t = -1;
-static gint ett_sec_rgy_sid_t = -1;
-static gint ett_sec_rgy_unix_passwd_buf_t = -1;
-static gint ett_sec_rgy_unix_sid_t = -1;
-static gint ett_sec_timeval_sec_t = -1;
-static gint ett_sec_rgy_pgo_flags_t = -1;
-static gint ett_error_status_t = -1;
-static gint ett_rs_pgo_query_t = -1;
-static gint ett_rs_pgo_query_key_t = -1;
-static gint ett_rs_pgo_id_key_t = -1;
-static gint ett_rs_pgo_unix_num_key_t = -1;
-static gint ett_rs_pgo_query_result_t = -1;
-static gint ett_rs_pgo_result_t = -1;
+static int proto_rs_pgo;
+static int hf_rs_pgo_opnum;
+static int hf_rs_var1;
+static int hf_rs_pgo_query_result_t;
+static int hf_rs_pgo_query_t;
+static int hf_rs_pgo_query_key_t;
+static int hf_error_status_t;
+static int hf_sec_rgy_pgo_flags_t;
+static int hf_rs_sec_rgy_pgo_item_t_quota;
+static int hf_rs_sec_rgy_pgo_item_t_unix_num;
+static int hf_rs_timeval;
+static int hf_rs_uuid1;
+static int hf_sec_rgy_domain_t;
+static int hf_sec_rgy_name_t_principalName_string;
+static int hf_sec_rgy_name_t_size;
+static int hf_sec_rgy_pname_t_principalName_string;
+static int hf_sec_rgy_pname_t_size;
+static int hf_rs_pgo_unix_num_key_t;
+
+static gint ett_rs_cache_data_t;
+static gint ett_sec_rgy_domain_t;
+static gint ett_rgy_acct_user_flags_t;
+static gint ett_sec_attr_component_name_t;
+static gint ett_sec_passwd_type_t;
+static gint ett_sec_rgy_acct_admin_flags_t;
+static gint ett_sec_rgy_acct_admin_t;
+static gint ett_sec_rgy_acct_auth_flags_t;
+static gint ett_sec_rgy_acct_key_t;
+static gint ett_sec_rgy_acct_user_t;
+static gint ett_sec_rgy_cursor_t;
+static gint ett_sec_rgy_foreign_id_t;
+static gint ett_sec_rgy_login_name_t;
+static gint ett_sec_rgy_name_t;
+static gint ett_sec_rgy_pgo_item_t;
+static gint ett_sec_rgy_pname_t;
+static gint ett_sec_rgy_sid_t;
+static gint ett_sec_rgy_unix_passwd_buf_t;
+static gint ett_sec_rgy_unix_sid_t;
+static gint ett_sec_timeval_sec_t;
+static gint ett_sec_rgy_pgo_flags_t;
+static gint ett_error_status_t;
+static gint ett_rs_pgo_query_t;
+static gint ett_rs_pgo_query_key_t;
+static gint ett_rs_pgo_id_key_t;
+static gint ett_rs_pgo_unix_num_key_t;
+static gint ett_rs_pgo_query_result_t;
+static gint ett_rs_pgo_result_t;
 
 
 #define sec_rgy_acct_admin_valid       0x01
@@ -103,7 +103,7 @@ static gint ett_rs_pgo_result_t = -1;
 #define sec_rgy_acct_user_passwd_valid 0x01
 #define sec_rgy_acct_user_flags_none   0x00
 
-static gint ett_rs_pgo = -1;
+static gint ett_rs_pgo;
 
 static e_guid_t uuid_rs_pgo =
   { 0x4c878280, 0x3000, 0x0000, {0x0d, 0x00, 0x02, 0x87, 0x14, 0x00, 0x00,
diff --git a/epan/dissectors/packet-dcerpc-rs_plcy.c b/epan/dissectors/packet-dcerpc-rs_plcy.c
index 7864c56072..4e6fcac1b1 100644
--- a/epan/dissectors/packet-dcerpc-rs_plcy.c
+++ b/epan/dissectors/packet-dcerpc-rs_plcy.c
@@ -22,9 +22,9 @@ void proto_reg_handoff_dcerpc_rs_plcy(void);
 
 /* Global hf index fields */
 
-static int proto_dcerpc_rs_plcy = -1;
-static int hf_rs_plcy_opnum = -1;
-static gint ett_dcerpc_rs_plcy = -1;
+static int proto_dcerpc_rs_plcy;
+static int hf_rs_plcy_opnum;
+static gint ett_dcerpc_rs_plcy;
 
 static e_guid_t uuid_dcerpc_rs_plcy = {
 	0x4c878280, 0x4000, 0x0000,
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acct.c b/epan/dissectors/packet-dcerpc-rs_prop_acct.c
index 441f391913..5f87ea6b58 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_acct.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_acct.c
@@ -20,11 +20,11 @@
 void proto_register_rs_prop_acct (void);
 void proto_reg_handoff_rs_prop_acct (void);
 
-static int proto_rs_prop_acct = -1;
-static int hf_rs_prop_acct_opnum = -1;
+static int proto_rs_prop_acct;
+static int hf_rs_prop_acct_opnum;
 
 
-static gint ett_rs_prop_acct = -1;
+static gint ett_rs_prop_acct;
 static e_guid_t uuid_rs_prop_acct = { 0x68097130, 0xde43, 0x11ca, { 0xa5, 0x54, 0x08, 0x00, 0x1e, 0x03, 0x94, 0xc7 } };
 static guint16  ver_rs_prop_acct = 1;
 
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acl.c b/epan/dissectors/packet-dcerpc-rs_prop_acl.c
index 9b6e2709cf..73d7bea7bc 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_acl.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_acl.c
@@ -21,11 +21,11 @@
 void proto_register_rs_prop_acl (void);
 void proto_reg_handoff_rs_prop_acl (void);
 
-static int proto_rs_prop_acl = -1;
-static int hf_rs_prop_acl_opnum = -1;
+static int proto_rs_prop_acl;
+static int hf_rs_prop_acl_opnum;
 
 
-static gint ett_rs_prop_acl = -1;
+static gint ett_rs_prop_acl;
 static e_guid_t uuid_rs_prop_acl =
   { 0x591d87d0, 0xde64, 0x11ca, {0xa1, 0x1c, 0x08, 0x00, 0x1e, 0x03, 0x94,
                                  0xc7} };
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_attr.c b/epan/dissectors/packet-dcerpc-rs_prop_attr.c
index 77b84dcd8b..70a513580f 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_attr.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_attr.c
@@ -21,11 +21,11 @@
 void proto_register_rs_prop_attr (void);
 void proto_reg_handoff_rs_prop_attr (void);
 
-static int proto_rs_prop_attr = -1;
-static int hf_rs_prop_attr_opnum = -1;
+static int proto_rs_prop_attr;
+static int hf_rs_prop_attr_opnum;
 
 
-static gint ett_rs_prop_attr = -1;
+static gint ett_rs_prop_attr;
 static e_guid_t uuid_rs_prop_attr =
   { 0x0eff23e6, 0x555a, 0x11cd, {0x95, 0xbf, 0x08, 0x00, 0x09, 0x27, 0x84,
                                  0xc3} };
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c
index cd22429dab..5a3adbfc35 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c
@@ -21,11 +21,11 @@
 void proto_register_rs_prop_pgo (void);
 void proto_reg_handoff_rs_prop_pgo (void);
 
-static int proto_rs_prop_pgo = -1;
-static int hf_rs_prop_pgo_opnum = -1;
+static int proto_rs_prop_pgo;
+static int hf_rs_prop_pgo_opnum;
 
 
-static gint ett_rs_prop_pgo = -1;
+static gint ett_rs_prop_pgo;
 static e_guid_t uuid_rs_prop_pgo =
   { 0xc23626e8, 0xde34, 0x11ca, {0x8c, 0xbc, 0x08, 0x00, 0x1e, 0x03, 0x94,
                                  0xc7} };
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c
index 31650c1aeb..613cb07ea4 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c
@@ -21,11 +21,11 @@
 void proto_register_rs_prop_plcy (void);
 void proto_reg_handoff_rs_prop_plcy (void);
 
-static int proto_rs_prop_plcy = -1;
-static int hf_rs_prop_plcy_opnum = -1;
+static int proto_rs_prop_plcy;
+static int hf_rs_prop_plcy_opnum;
 
 
-static gint ett_rs_prop_plcy = -1;
+static gint ett_rs_prop_plcy;
 static e_guid_t uuid_rs_prop_plcy =
   { 0xe6ac5cb8, 0xde3e, 0x11ca, {0x93, 0x76, 0x08, 0x00, 0x1e, 0x03, 0x94,
                                  0xc7} };
diff --git a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
index 9d106d744e..1f757f72e8 100644
--- a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
+++ b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
@@ -21,11 +21,11 @@
 void proto_register_rs_pwd_mgmt (void);
 void proto_reg_handoff_rs_pwd_mgmt (void);
 
-static int proto_rs_pwd_mgmt = -1;
-static int hf_rs_pwd_mgmt_opnum = -1;
+static int proto_rs_pwd_mgmt;
+static int hf_rs_pwd_mgmt_opnum;
 
 
-static gint ett_rs_pwd_mgmt = -1;
+static gint ett_rs_pwd_mgmt;
 static e_guid_t uuid_rs_pwd_mgmt =
   { 0x3139a0e2, 0x68da, 0x11cd, {0x91, 0xc7, 0x08, 0x00, 0x09, 0x24, 0x24,
                                  0x44} };
diff --git a/epan/dissectors/packet-dcerpc-rs_repadm.c b/epan/dissectors/packet-dcerpc-rs_repadm.c
index d615be0560..63c2c2ea0f 100644
--- a/epan/dissectors/packet-dcerpc-rs_repadm.c
+++ b/epan/dissectors/packet-dcerpc-rs_repadm.c
@@ -21,11 +21,11 @@
 void proto_register_rs_repadm (void);
 void proto_reg_handoff_rs_repadm (void);
 
-static int proto_rs_repadm = -1;
-static int hf_rs_repadm_opnum = -1;
+static int proto_rs_repadm;
+static int hf_rs_repadm_opnum;
 
 
-static gint ett_rs_repadm = -1;
+static gint ett_rs_repadm;
 
 
 static e_guid_t uuid_rs_repadm = { 0x5b8c2fa8, 0xb60b, 0x11c9, { 0xbe, 0x0f, 0x08, 0x00, 0x1e, 0x01, 0x8f, 0xa0 } };
diff --git a/epan/dissectors/packet-dcerpc-rs_replist.c b/epan/dissectors/packet-dcerpc-rs_replist.c
index 46ccb8abe9..818bf4fba9 100644
--- a/epan/dissectors/packet-dcerpc-rs_replist.c
+++ b/epan/dissectors/packet-dcerpc-rs_replist.c
@@ -21,11 +21,11 @@
 void proto_register_rs_replist (void);
 void proto_reg_handoff_rs_replist (void);
 
-static int proto_rs_replist = -1;
-static int hf_rs_replist_opnum = -1;
+static int proto_rs_replist;
+static int hf_rs_replist_opnum;
 
 
-static gint ett_rs_replist = -1;
+static gint ett_rs_replist;
 
 
 static e_guid_t uuid_rs_replist = { 0x850446b0, 0xe95b, 0x11CA, { 0xad, 0x90, 0x08, 0x00, 0x1e, 0x01, 0x45, 0xb1 } };
diff --git a/epan/dissectors/packet-dcerpc-rs_repmgr.c b/epan/dissectors/packet-dcerpc-rs_repmgr.c
index fc4640d37d..d1bd369067 100644
--- a/epan/dissectors/packet-dcerpc-rs_repmgr.c
+++ b/epan/dissectors/packet-dcerpc-rs_repmgr.c
@@ -21,11 +21,11 @@
 void proto_register_rs_repmgr (void);
 void proto_reg_handoff_rs_repmgr (void);
 
-static int proto_rs_repmgr = -1;
-static int hf_rs_repmgr_opnum = -1;
+static int proto_rs_repmgr;
+static int hf_rs_repmgr_opnum;
 
 
-static gint ett_rs_repmgr = -1;
+static gint ett_rs_repmgr;
 static e_guid_t uuid_rs_repmgr =
   { 0xb62dc198, 0xdfd4, 0x11ca, {0x94, 0x8f, 0x08, 0x00, 0x1e, 0x02, 0x59,
                                  0x4c} };
diff --git a/epan/dissectors/packet-dcerpc-rs_unix.c b/epan/dissectors/packet-dcerpc-rs_unix.c
index e6f7f1b433..c78a18b0b8 100644
--- a/epan/dissectors/packet-dcerpc-rs_unix.c
+++ b/epan/dissectors/packet-dcerpc-rs_unix.c
@@ -21,10 +21,10 @@
 void proto_register_rs_unix (void);
 void proto_reg_handoff_rs_unix (void);
 
-static int proto_rs_unix = -1;
-static int hf_rs_unix_opnum = -1;
+static int proto_rs_unix;
+static int hf_rs_unix_opnum;
 
-static gint ett_rs_unix = -1;
+static gint ett_rs_unix;
 
 
 static e_guid_t uuid_rs_unix = { 0x361993c0, 0xb000, 0x0000, { 0x0d, 0x00, 0x00, 0x87, 0x84, 0x00, 0x00, 0x00 } };
diff --git a/epan/dissectors/packet-dcerpc-rsec_login.c b/epan/dissectors/packet-dcerpc-rsec_login.c
index b2fd44ea88..81d1ceb86e 100644
--- a/epan/dissectors/packet-dcerpc-rsec_login.c
+++ b/epan/dissectors/packet-dcerpc-rsec_login.c
@@ -21,10 +21,10 @@
 void proto_register_rsec_login (void);
 void proto_reg_handoff_rsec_login (void);
 
-static int proto_rsec_login = -1;
-static int hf_rsec_login_opnum = -1;
+static int proto_rsec_login;
+static int hf_rsec_login_opnum;
 
-static gint ett_rsec_login = -1;
+static gint ett_rsec_login;
 
 
 static e_guid_t uuid_rsec_login = { 0xa76e832a, 0x10df, 0x11cd, { 0x90, 0x56, 0x08, 0x00, 0x09, 0x24, 0x24, 0x44 } };
diff --git a/epan/dissectors/packet-dcerpc-secidmap.c b/epan/dissectors/packet-dcerpc-secidmap.c
index 99d891b19e..57119c97b1 100644
--- a/epan/dissectors/packet-dcerpc-secidmap.c
+++ b/epan/dissectors/packet-dcerpc-secidmap.c
@@ -21,11 +21,11 @@
 void proto_register_secidmap (void);
 void proto_reg_handoff_secidmap (void);
 
-static int proto_secidmap = -1;
-static int hf_secidmap_opnum = -1;
+static int proto_secidmap;
+static int hf_secidmap_opnum;
 
 
-static gint ett_secidmap = -1;
+static gint ett_secidmap;
 
 static e_guid_t uuid_secidmap = { 0x0d7c1e50, 0x113a, 0x11ca, { 0xb7, 0x1f, 0x08, 0x00, 0x1e, 0x01, 0xdc, 0x6c } };
 static guint16  ver_secidmap = 1;
diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c
index 39b01c7feb..bffdc263dc 100644
--- a/epan/dissectors/packet-dcerpc-spoolss.c
+++ b/epan/dissectors/packet-dcerpc-spoolss.c
@@ -30,42 +30,42 @@ void proto_reg_handoff_dcerpc_spoolss(void);
 
 /* GetPrinterDriver2 */
 
-static int hf_clientmajorversion = -1;
-static int hf_clientminorversion = -1;
-static int hf_servermajorversion = -1;
-static int hf_serverminorversion = -1;
-static int hf_driverpath = -1;
-static int hf_datafile = -1;
-static int hf_configfile = -1;
-static int hf_helpfile = -1;
-static int hf_monitorname = -1;
-static int hf_defaultdatatype = -1;
-static int hf_driverinfo_cversion = -1;
-static int hf_dependentfiles = -1;
-static int hf_previousdrivernames = -1;
-static int hf_color_profiles = -1;
-static int hf_core_driver_dependencies = -1;
-static int hf_driverdate = -1;
-static int hf_min_inbox_driverdate = -1;
-static int hf_padding = -1;
-static int hf_driver_version_low = -1;
-static int hf_driver_version_high = -1;
-static int hf_min_inbox_driver_version_low = -1;
-static int hf_min_inbox_driver_version_high = -1;
-static int hf_mfgname = -1;
-static int hf_oemurl = -1;
-static int hf_hardwareid= -1;
-static int hf_provider = -1;
+static int hf_clientmajorversion;
+static int hf_clientminorversion;
+static int hf_servermajorversion;
+static int hf_serverminorversion;
+static int hf_driverpath;
+static int hf_datafile;
+static int hf_configfile;
+static int hf_helpfile;
+static int hf_monitorname;
+static int hf_defaultdatatype;
+static int hf_driverinfo_cversion;
+static int hf_dependentfiles;
+static int hf_previousdrivernames;
+static int hf_color_profiles;
+static int hf_core_driver_dependencies;
+static int hf_driverdate;
+static int hf_min_inbox_driverdate;
+static int hf_padding;
+static int hf_driver_version_low;
+static int hf_driver_version_high;
+static int hf_min_inbox_driver_version_low;
+static int hf_min_inbox_driver_version_high;
+static int hf_mfgname;
+static int hf_oemurl;
+static int hf_hardwareid;
+static int hf_provider;
 
 /* GetPrinter */
 
 /* Times */
 
-static int hf_start_time = -1;
-static int hf_end_time = -1;
-static int hf_elapsed_time = -1;
-static int hf_device_not_selected_timeout = -1;
-static int hf_transmission_retry_timeout = -1;
+static int hf_start_time;
+static int hf_end_time;
+static int hf_elapsed_time;
+static int hf_device_not_selected_timeout;
+static int hf_transmission_retry_timeout;
 
 /****************************************************************************/
 
@@ -73,265 +73,265 @@ static int hf_transmission_retry_timeout = -1;
  * New hf index values - I'm in the process of doing a bit of a cleanup -tpot
  */
 
-static int hf_opnum = -1;
-static int hf_hnd = -1;
-static int hf_rc = -1;
-static int hf_hresult = -1;
-static int hf_offered = -1;
-static int hf_needed = -1;
-static int hf_returned = -1;
-static int hf_buffer_size = -1;
-static int hf_buffer_data = -1;
-static int hf_string_parm_size = -1;
-static int hf_string_parm_data= -1;
-static int hf_offset = -1;
-static int hf_level = -1;
-static int hf_access_required = -1;
-
-static int hf_printername = -1;
-static int hf_machinename = -1;
-static int hf_notifyname = -1;
-static int hf_printerdesc = -1;
-static int hf_printercomment = -1;
-static int hf_servername = -1;
-static int hf_sharename = -1;
-static int hf_portname = -1;
-static int hf_printerlocation = -1;
-static int hf_drivername = -1;
-static int hf_environment = -1;
-static int hf_username = -1;
-static int hf_documentname = -1;
-static int hf_outputfile = -1;
-static int hf_datatype = -1;
-static int hf_textstatus = -1;
-static int hf_sepfile = -1;
-static int hf_printprocessor = -1;
-static int hf_vendor_setup = -1;
-static int hf_inf_path = -1;
-static int hf_parameters = -1;
-static int hf_core_printer_driver_ids = -1;
-static int hf_core_driver_guid = -1;
-static int hf_core_driver_size = -1;
-static int hf_driver_version = -1;
-static int hf_core_printer_driver_count = -1;
-static int hf_package_id = -1;
-static int hf_language = -1;
-static int hf_driver_package_cab_size = -1;
+static int hf_opnum;
+static int hf_hnd;
+static int hf_rc;
+static int hf_hresult;
+static int hf_offered;
+static int hf_needed;
+static int hf_returned;
+static int hf_buffer_size;
+static int hf_buffer_data;
+static int hf_string_parm_size;
+static int hf_string_parm_data;
+static int hf_offset;
+static int hf_level;
+static int hf_access_required;
+
+static int hf_printername;
+static int hf_machinename;
+static int hf_notifyname;
+static int hf_printerdesc;
+static int hf_printercomment;
+static int hf_servername;
+static int hf_sharename;
+static int hf_portname;
+static int hf_printerlocation;
+static int hf_drivername;
+static int hf_environment;
+static int hf_username;
+static int hf_documentname;
+static int hf_outputfile;
+static int hf_datatype;
+static int hf_textstatus;
+static int hf_sepfile;
+static int hf_printprocessor;
+static int hf_vendor_setup;
+static int hf_inf_path;
+static int hf_parameters;
+static int hf_core_printer_driver_ids;
+static int hf_core_driver_guid;
+static int hf_core_driver_size;
+static int hf_driver_version;
+static int hf_core_printer_driver_count;
+static int hf_package_id;
+static int hf_language;
+static int hf_driver_package_cab_size;
 
 /* Printer information */
 
-static int hf_printer_cjobs = -1;
-static int hf_printer_total_jobs = -1;
-static int hf_printer_total_bytes = -1;
-static int hf_printer_global_counter = -1;
-static int hf_printer_total_pages = -1;
-static int hf_printer_major_version = -1;
-static int hf_printer_build_version = -1;
-static int hf_printer_unk7 = -1;
-static int hf_printer_unk8 = -1;
-static int hf_printer_unk9 = -1;
-static int hf_printer_session_ctr = -1;
-static int hf_printer_unk11 = -1;
-static int hf_printer_printer_errors = -1;
-static int hf_printer_unk13 = -1;
-static int hf_printer_unk14 = -1;
-static int hf_printer_unk15 = -1;
-static int hf_printer_unk16 = -1;
-static int hf_printer_changeid = -1;
-static int hf_printer_unk18 = -1;
-static int hf_printer_unk20 = -1;
-static int hf_printer_c_setprinter = -1;
-static int hf_printer_unk22 = -1;
-static int hf_printer_unk23 = -1;
-static int hf_printer_unk24 = -1;
-static int hf_printer_unk25 = -1;
-static int hf_printer_unk26 = -1;
-static int hf_printer_unk27 = -1;
-static int hf_printer_unk28 = -1;
-static int hf_printer_unk29 = -1;
-static int hf_printer_flags = -1;
-static int hf_printer_priority = -1;
-static int hf_printer_default_priority = -1;
-static int hf_printer_jobs = -1;
-static int hf_printer_averageppm = -1;
-static int hf_printer_guid = -1;
-static int hf_printer_action = -1;
+static int hf_printer_cjobs;
+static int hf_printer_total_jobs;
+static int hf_printer_total_bytes;
+static int hf_printer_global_counter;
+static int hf_printer_total_pages;
+static int hf_printer_major_version;
+static int hf_printer_build_version;
+static int hf_printer_unk7;
+static int hf_printer_unk8;
+static int hf_printer_unk9;
+static int hf_printer_session_ctr;
+static int hf_printer_unk11;
+static int hf_printer_printer_errors;
+static int hf_printer_unk13;
+static int hf_printer_unk14;
+static int hf_printer_unk15;
+static int hf_printer_unk16;
+static int hf_printer_changeid;
+static int hf_printer_unk18;
+static int hf_printer_unk20;
+static int hf_printer_c_setprinter;
+static int hf_printer_unk22;
+static int hf_printer_unk23;
+static int hf_printer_unk24;
+static int hf_printer_unk25;
+static int hf_printer_unk26;
+static int hf_printer_unk27;
+static int hf_printer_unk28;
+static int hf_printer_unk29;
+static int hf_printer_flags;
+static int hf_printer_priority;
+static int hf_printer_default_priority;
+static int hf_printer_jobs;
+static int hf_printer_averageppm;
+static int hf_printer_guid;
+static int hf_printer_action;
 
 /* Printer data */
 
-static int hf_printerdata = -1;
-static int hf_printerdata_key = -1;
-static int hf_printerdata_value = -1;
-static int hf_printerdata_type = -1;
-static int hf_printerdata_size = -1; /* Length of printer data */
-static int hf_printerdata_data = -1;
-static int hf_printerdata_data_sz = -1;
-static int hf_printerdata_data_dword = -1;
+static int hf_printerdata;
+static int hf_printerdata_key;
+static int hf_printerdata_value;
+static int hf_printerdata_type;
+static int hf_printerdata_size; /* Length of printer data */
+static int hf_printerdata_data;
+static int hf_printerdata_data_sz;
+static int hf_printerdata_data_dword;
 
 /* Devicemode */
 
-static int hf_devmodectr_size = -1;
-
-static int hf_devmode = -1;
-static int hf_devmode_size = -1;
-static int hf_devmode_spec_version = -1;
-static int hf_devmode_driver_version = -1;
-static int hf_devmode_size2 = -1;
-static int hf_devmode_driver_extra_len = -1;
-static int hf_devmode_fields = -1;
-static int hf_devmode_orientation = -1;
-static int hf_devmode_paper_size = -1;
-static int hf_devmode_paper_width = -1;
-static int hf_devmode_paper_length = -1;
-static int hf_devmode_scale = -1;
-static int hf_devmode_copies = -1;
-static int hf_devmode_default_source = -1;
-static int hf_devmode_print_quality = -1;
-static int hf_devmode_color = -1;
-static int hf_devmode_duplex = -1;
-static int hf_devmode_y_resolution = -1;
-static int hf_devmode_tt_option = -1;
-static int hf_devmode_collate = -1;
-static int hf_devmode_log_pixels = -1;
-static int hf_devmode_bits_per_pel = -1;
-static int hf_devmode_pels_width = -1;
-static int hf_devmode_pels_height = -1;
-static int hf_devmode_display_flags = -1;
-static int hf_devmode_display_freq = -1;
-static int hf_devmode_icm_method = -1;
-static int hf_devmode_icm_intent = -1;
-static int hf_devmode_media_type = -1;
-static int hf_devmode_dither_type = -1;
-static int hf_devmode_reserved1 = -1;
-static int hf_devmode_reserved2 = -1;
-static int hf_devmode_panning_width = -1;
-static int hf_devmode_panning_height = -1;
-static int hf_devmode_driver_extra = -1;
-
-static int hf_devmode_fields_orientation = -1;
-static int hf_devmode_fields_papersize = -1;
-static int hf_devmode_fields_paperlength = -1;
-static int hf_devmode_fields_paperwidth = -1;
-static int hf_devmode_fields_scale = -1;
-static int hf_devmode_fields_position = -1;
-static int hf_devmode_fields_nup = -1;
-static int hf_devmode_fields_copies = -1;
-static int hf_devmode_fields_defaultsource = -1;
-static int hf_devmode_fields_printquality = -1;
-static int hf_devmode_fields_color = -1;
-static int hf_devmode_fields_duplex = -1;
-static int hf_devmode_fields_yresolution = -1;
-static int hf_devmode_fields_ttoption = -1;
-static int hf_devmode_fields_collate = -1;
-static int hf_devmode_fields_formname = -1;
-static int hf_devmode_fields_logpixels = -1;
-static int hf_devmode_fields_bitsperpel = -1;
-static int hf_devmode_fields_pelswidth = -1;
-static int hf_devmode_fields_pelsheight = -1;
-static int hf_devmode_fields_displayflags = -1;
-static int hf_devmode_fields_displayfrequency = -1;
-static int hf_devmode_fields_icmmethod = -1;
-static int hf_devmode_fields_icmintent = -1;
-static int hf_devmode_fields_mediatype = -1;
-static int hf_devmode_fields_dithertype = -1;
-static int hf_devmode_fields_panningwidth = -1;
-static int hf_devmode_fields_panningheight = -1;
+static int hf_devmodectr_size;
+
+static int hf_devmode;
+static int hf_devmode_size;
+static int hf_devmode_spec_version;
+static int hf_devmode_driver_version;
+static int hf_devmode_size2;
+static int hf_devmode_driver_extra_len;
+static int hf_devmode_fields;
+static int hf_devmode_orientation;
+static int hf_devmode_paper_size;
+static int hf_devmode_paper_width;
+static int hf_devmode_paper_length;
+static int hf_devmode_scale;
+static int hf_devmode_copies;
+static int hf_devmode_default_source;
+static int hf_devmode_print_quality;
+static int hf_devmode_color;
+static int hf_devmode_duplex;
+static int hf_devmode_y_resolution;
+static int hf_devmode_tt_option;
+static int hf_devmode_collate;
+static int hf_devmode_log_pixels;
+static int hf_devmode_bits_per_pel;
+static int hf_devmode_pels_width;
+static int hf_devmode_pels_height;
+static int hf_devmode_display_flags;
+static int hf_devmode_display_freq;
+static int hf_devmode_icm_method;
+static int hf_devmode_icm_intent;
+static int hf_devmode_media_type;
+static int hf_devmode_dither_type;
+static int hf_devmode_reserved1;
+static int hf_devmode_reserved2;
+static int hf_devmode_panning_width;
+static int hf_devmode_panning_height;
+static int hf_devmode_driver_extra;
+
+static int hf_devmode_fields_orientation;
+static int hf_devmode_fields_papersize;
+static int hf_devmode_fields_paperlength;
+static int hf_devmode_fields_paperwidth;
+static int hf_devmode_fields_scale;
+static int hf_devmode_fields_position;
+static int hf_devmode_fields_nup;
+static int hf_devmode_fields_copies;
+static int hf_devmode_fields_defaultsource;
+static int hf_devmode_fields_printquality;
+static int hf_devmode_fields_color;
+static int hf_devmode_fields_duplex;
+static int hf_devmode_fields_yresolution;
+static int hf_devmode_fields_ttoption;
+static int hf_devmode_fields_collate;
+static int hf_devmode_fields_formname;
+static int hf_devmode_fields_logpixels;
+static int hf_devmode_fields_bitsperpel;
+static int hf_devmode_fields_pelswidth;
+static int hf_devmode_fields_pelsheight;
+static int hf_devmode_fields_displayflags;
+static int hf_devmode_fields_displayfrequency;
+static int hf_devmode_fields_icmmethod;
+static int hf_devmode_fields_icmintent;
+static int hf_devmode_fields_mediatype;
+static int hf_devmode_fields_dithertype;
+static int hf_devmode_fields_panningwidth;
+static int hf_devmode_fields_panningheight;
 
 /* Print job */
 
-static int hf_job_id = -1;
-static int hf_job_priority = -1;
-static int hf_job_position = -1;
-static int hf_job_totalpages = -1;
-static int hf_job_totalbytes = -1;
-static int hf_job_pagesprinted = -1;
-static int hf_job_bytesprinted = -1;
-static int hf_job_size = -1;
-
-static int hf_job_status = -1;
-static int hf_job_status_paused = -1;
-static int hf_job_status_error = -1;
-static int hf_job_status_deleting = -1;
-static int hf_job_status_spooling = -1;
-static int hf_job_status_printing = -1;
-static int hf_job_status_offline = -1;
-static int hf_job_status_paperout = -1;
-static int hf_job_status_printed = -1;
-static int hf_job_status_deleted = -1;
-static int hf_job_status_blocked = -1;
-static int hf_job_status_user_intervention = -1;
+static int hf_job_id;
+static int hf_job_priority;
+static int hf_job_position;
+static int hf_job_totalpages;
+static int hf_job_totalbytes;
+static int hf_job_pagesprinted;
+static int hf_job_bytesprinted;
+static int hf_job_size;
+
+static int hf_job_status;
+static int hf_job_status_paused;
+static int hf_job_status_error;
+static int hf_job_status_deleting;
+static int hf_job_status_spooling;
+static int hf_job_status_printing;
+static int hf_job_status_offline;
+static int hf_job_status_paperout;
+static int hf_job_status_printed;
+static int hf_job_status_deleted;
+static int hf_job_status_blocked;
+static int hf_job_status_user_intervention;
 
 /* Forms */
 
-static int hf_form = -1;
-static int hf_form_level = -1;
-static int hf_form_name = -1;
-static int hf_form_flags = -1;
-static int hf_form_unknown = -1;
-static int hf_form_width = -1;
-static int hf_form_height = -1;
-static int hf_form_left_margin = -1;
-static int hf_form_top_margin = -1;
-static int hf_form_horiz_len = -1;
-static int hf_form_vert_len = -1;
+static int hf_form;
+static int hf_form_level;
+static int hf_form_name;
+static int hf_form_flags;
+static int hf_form_unknown;
+static int hf_form_width;
+static int hf_form_height;
+static int hf_form_left_margin;
+static int hf_form_top_margin;
+static int hf_form_horiz_len;
+static int hf_form_vert_len;
 
-static int hf_enumforms_num = -1;
+static int hf_enumforms_num;
 
 /* Print notify */
 
-static int hf_notify_options_version = -1;
-static int hf_notify_options_flags = -1;
-static int hf_notify_options_flags_refresh = -1;
-static int hf_notify_options_count = -1;
-static int hf_notify_option_type = -1;
-static int hf_notify_option_reserved1 = -1;
-static int hf_notify_option_reserved2 = -1;
-static int hf_notify_option_reserved3 = -1;
-static int hf_notify_option_count = -1;
-static int hf_notify_option_data_count = -1;
-static int hf_notify_info_count = -1;
-static int hf_notify_info_version = -1;
-static int hf_notify_info_flags = -1;
-static int hf_notify_info_data_type = -1;
-static int hf_notify_info_data_count = -1;
-static int hf_notify_info_data_id = -1;
-static int hf_notify_info_data_value1 = -1;
-static int hf_notify_info_data_value2 = -1;
-static int hf_notify_info_data_bufsize = -1;
-static int hf_notify_info_data_buffer = -1;
-static int hf_notify_info_data_buffer_len = -1;
-static int hf_notify_info_data_buffer_data = -1;
-
-static int hf_notify_field = -1;
-
-static int hf_printerlocal = -1;
-
-static int hf_rrpcn_changelow = -1;
-static int hf_rrpcn_changehigh = -1;
-static int hf_rrpcn_unk0 = -1;
-static int hf_rrpcn_unk1 = -1;
-
-static int hf_replyopenprinter_unk0 = -1;
-static int hf_replyopenprinter_unk1 = -1;
-
-static int hf_devmode_devicename = -1;
-static int hf_devmode_form_name = -1;
-static int hf_relative_string = -1;
-static int hf_value_name = -1;
-static int hf_keybuffer = -1;
-static int hf_value_string = -1;
-
-static expert_field ei_unimplemented_dissector = EI_INIT;
-static expert_field ei_unknown_data = EI_INIT;
-static expert_field ei_spool_printer_info_level = EI_INIT;
-static expert_field ei_printer_info_level = EI_INIT;
-static expert_field ei_form_level = EI_INIT;
-static expert_field ei_job_info_level = EI_INIT;
-static expert_field ei_driver_info_level = EI_INIT;
-static expert_field ei_level = EI_INIT;
-static expert_field ei_notify_info_data_type = EI_INIT;
-static expert_field ei_enumprinterdataex_value = EI_INIT;
-static expert_field ei_buffer_size_too_long = EI_INIT;
+static int hf_notify_options_version;
+static int hf_notify_options_flags;
+static int hf_notify_options_flags_refresh;
+static int hf_notify_options_count;
+static int hf_notify_option_type;
+static int hf_notify_option_reserved1;
+static int hf_notify_option_reserved2;
+static int hf_notify_option_reserved3;
+static int hf_notify_option_count;
+static int hf_notify_option_data_count;
+static int hf_notify_info_count;
+static int hf_notify_info_version;
+static int hf_notify_info_flags;
+static int hf_notify_info_data_type;
+static int hf_notify_info_data_count;
+static int hf_notify_info_data_id;
+static int hf_notify_info_data_value1;
+static int hf_notify_info_data_value2;
+static int hf_notify_info_data_bufsize;
+static int hf_notify_info_data_buffer;
+static int hf_notify_info_data_buffer_len;
+static int hf_notify_info_data_buffer_data;
+
+static int hf_notify_field;
+
+static int hf_printerlocal;
+
+static int hf_rrpcn_changelow;
+static int hf_rrpcn_changehigh;
+static int hf_rrpcn_unk0;
+static int hf_rrpcn_unk1;
+
+static int hf_replyopenprinter_unk0;
+static int hf_replyopenprinter_unk1;
+
+static int hf_devmode_devicename;
+static int hf_devmode_form_name;
+static int hf_relative_string;
+static int hf_value_name;
+static int hf_keybuffer;
+static int hf_value_string;
+
+static expert_field ei_unimplemented_dissector;
+static expert_field ei_unknown_data;
+static expert_field ei_spool_printer_info_level;
+static expert_field ei_printer_info_level;
+static expert_field ei_form_level;
+static expert_field ei_job_info_level;
+static expert_field ei_driver_info_level;
+static expert_field ei_level;
+static expert_field ei_notify_info_data_type;
+static expert_field ei_enumprinterdataex_value;
+static expert_field ei_buffer_size_too_long;
 
 /* Registry data types */
 
@@ -372,11 +372,11 @@ static value_string_ext reg_datatypes_ext = VALUE_STRING_EXT_INIT(reg_datatypes)
  * Dissect SPOOLSS specific access rights
  */
 
-static int hf_server_access_admin = -1;
-static int hf_server_access_enum = -1;
-static int hf_printer_access_admin = -1;
-static int hf_printer_access_use = -1;
-static int hf_job_access_admin = -1;
+static int hf_server_access_admin;
+static int hf_server_access_enum;
+static int hf_printer_access_admin;
+static int hf_printer_access_use;
+static int hf_job_access_admin;
 
 static void
 spoolss_printer_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree,
@@ -439,7 +439,7 @@ typedef struct {
 	proto_item *item;
 } BUFFER;
 
-static gint ett_BUFFER = -1;
+static gint ett_BUFFER;
 
 static int
 dissect_spoolss_buffer_data(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -568,16 +568,16 @@ dissect_spoolss_string_parm(tvbuff_t *tvb, gint offset, packet_info *pinfo,
  * SYSTEM_TIME
  */
 
-static gint ett_SYSTEM_TIME = -1;
+static gint ett_SYSTEM_TIME;
 
-static int hf_time_year = -1;
-static int hf_time_month = -1;
-static int hf_time_dow = -1;
-static int hf_time_day = -1;
-static int hf_time_hour = -1;
-static int hf_time_minute = -1;
-static int hf_time_second = -1;
-static int hf_time_msec = -1;
+static int hf_time_year;
+static int hf_time_month;
+static int hf_time_dow;
+static int hf_time_day;
+static int hf_time_hour;
+static int hf_time_minute;
+static int hf_time_second;
+static int hf_time_msec;
 
 static int
 dissect_SYSTEM_TIME(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -697,8 +697,8 @@ SpoolssClosePrinter_r(tvbuff_t *tvb, int offset,
    this but that would result in one item for each byte in the printer
    data. */
 
-static gint ett_printerdata_data = -1;
-static gint ett_printerdata_value = -1;
+static gint ett_printerdata_data;
+static gint ett_printerdata_value;
 
 static int
 dissect_printerdata_data(tvbuff_t *tvb, int offset,
@@ -1013,9 +1013,9 @@ SpoolssSetPrinterData_r(tvbuff_t *tvb, int offset,
  * SpoolssSetPrinterDataEx
  */
 
-static int hf_setprinterdataex_max_len = -1;
-static int hf_setprinterdataex_real_len = -1;
-static int hf_setprinterdataex_data = -1;
+static int hf_setprinterdataex_max_len;
+static int hf_setprinterdataex_real_len;
+static int hf_setprinterdataex_data;
 
 static int
 SpoolssSetPrinterDataEx_q(tvbuff_t *tvb, int offset,
@@ -1396,7 +1396,7 @@ static const value_string devmode_dithertype_vals[] =
 	{ 0, NULL }
 };
 
-static gint ett_DEVMODE_fields = -1;
+static gint ett_DEVMODE_fields;
 
 static int
 dissect_DEVMODE_fields(tvbuff_t *tvb, gint offset, packet_info *pinfo,
@@ -1452,7 +1452,7 @@ dissect_DEVMODE_fields(tvbuff_t *tvb, gint offset, packet_info *pinfo,
 	return offset;
 }
 
-static gint ett_DEVMODE = -1;
+static gint ett_DEVMODE;
 
 static int
 dissect_DEVMODE(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -1635,7 +1635,7 @@ dissect_DEVMODE(tvbuff_t *tvb, int offset, packet_info *pinfo,
  * DEVMODE_CTR
  */
 
-static gint ett_DEVMODE_CTR = -1;
+static gint ett_DEVMODE_CTR;
 
 int
 dissect_DEVMODE_CTR(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -1663,7 +1663,7 @@ dissect_DEVMODE_CTR(tvbuff_t *tvb, int offset, packet_info *pinfo,
  * the point where the offset is parsed from.
  */
 
-static gint ett_RELSTR = -1;
+static gint ett_RELSTR;
 
 static int
 dissect_spoolss_relstr(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -1713,7 +1713,7 @@ dissect_spoolss_relstr(tvbuff_t *tvb, int offset, packet_info *pinfo,
    dissect_spoolss_relstr() function as I can't find an example driver that
    has more than one dependent file. */
 
-static gint ett_RELSTR_ARRAY = -1;
+static gint ett_RELSTR_ARRAY;
 
 static int
 dissect_spoolss_relstrarray(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -1758,7 +1758,7 @@ dissect_spoolss_relstrarray(tvbuff_t *tvb, int offset, packet_info *pinfo,
  * PRINTER_INFO_0
  */
 
-static int hf_printer_status = -1;
+static int hf_printer_status;
 
 static const value_string printer_status_vals[] =
 {
@@ -1792,7 +1792,7 @@ static const value_string printer_status_vals[] =
 };
 static value_string_ext printer_status_vals_ext = VALUE_STRING_EXT_INIT(printer_status_vals);
 
-static gint ett_PRINTER_INFO_0 = -1;
+static gint ett_PRINTER_INFO_0;
 
 static int
 dissect_PRINTER_INFO_0(tvbuff_t *tvb, int offset,
@@ -1915,7 +1915,7 @@ dissect_PRINTER_INFO_0(tvbuff_t *tvb, int offset,
  * PRINTER_INFO_1
  */
 
-static gint ett_PRINTER_INFO_1 = -1;
+static gint ett_PRINTER_INFO_1;
 
 static int
 dissect_PRINTER_INFO_1(tvbuff_t *tvb, int offset,
@@ -1998,7 +1998,7 @@ static const true_false_string tfs_job_status_user_intervention = {
 	"User intervention not required"
 };
 
-static gint ett_job_status = -1;
+static gint ett_job_status;
 
 static int
 dissect_job_status(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -2030,23 +2030,23 @@ dissect_job_status(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 /* Printer attributes */
 
-static gint ett_printer_attributes = -1;
-
-static int hf_printer_attributes = -1;
-static int hf_printer_attributes_queued = -1;
-static int hf_printer_attributes_direct = -1;
-static int hf_printer_attributes_default = -1;
-static int hf_printer_attributes_shared = -1;
-static int hf_printer_attributes_network = -1;
-static int hf_printer_attributes_hidden = -1;
-static int hf_printer_attributes_local = -1;
-static int hf_printer_attributes_enable_devq = -1;
-static int hf_printer_attributes_keep_printed_jobs = -1;
-static int hf_printer_attributes_do_complete_first = -1;
-static int hf_printer_attributes_work_offline = -1;
-static int hf_printer_attributes_enable_bidi = -1;
-static int hf_printer_attributes_raw_only = -1;
-static int hf_printer_attributes_published = -1;
+static gint ett_printer_attributes;
+
+static int hf_printer_attributes;
+static int hf_printer_attributes_queued;
+static int hf_printer_attributes_direct;
+static int hf_printer_attributes_default;
+static int hf_printer_attributes_shared;
+static int hf_printer_attributes_network;
+static int hf_printer_attributes_hidden;
+static int hf_printer_attributes_local;
+static int hf_printer_attributes_enable_devq;
+static int hf_printer_attributes_keep_printed_jobs;
+static int hf_printer_attributes_do_complete_first;
+static int hf_printer_attributes_work_offline;
+static int hf_printer_attributes_enable_bidi;
+static int hf_printer_attributes_raw_only;
+static int hf_printer_attributes_published;
 
 static const true_false_string tfs_printer_attributes_queued = {
 	"The printer starts printing after last page spooled",
@@ -2151,21 +2151,21 @@ dissect_printer_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 /* Printer Driver attributes */
 
-static gint ett_printer_driver_attributes = -1;
-
-static int hf_printer_driver_attributes = -1;
-static int hf_printer_driver_attributes_package_aware = -1;
-static int hf_printer_driver_attributes_xps = -1;
-static int hf_printer_driver_attributes_sandbox_enabled = -1;
-static int hf_printer_driver_attributes_class = -1;
-static int hf_printer_driver_attributes_derived = -1;
-static int hf_printer_driver_attributes_not_shareable = -1;
-static int hf_printer_driver_attributes_category_fax = -1;
-static int hf_printer_driver_attributes_category_file = -1;
-static int hf_printer_driver_attributes_category_virtual = -1;
-static int hf_printer_driver_attributes_category_service = -1;
-static int hf_printer_driver_attributes_soft_reset_required = -1;
-static int hf_printer_driver_attributes_category_3d = -1;
+static gint ett_printer_driver_attributes;
+
+static int hf_printer_driver_attributes;
+static int hf_printer_driver_attributes_package_aware;
+static int hf_printer_driver_attributes_xps;
+static int hf_printer_driver_attributes_sandbox_enabled;
+static int hf_printer_driver_attributes_class;
+static int hf_printer_driver_attributes_derived;
+static int hf_printer_driver_attributes_not_shareable;
+static int hf_printer_driver_attributes_category_fax;
+static int hf_printer_driver_attributes_category_file;
+static int hf_printer_driver_attributes_category_virtual;
+static int hf_printer_driver_attributes_category_service;
+static int hf_printer_driver_attributes_soft_reset_required;
+static int hf_printer_driver_attributes_category_3d;
 
 static const true_false_string tfs_printer_driver_attributes_package_aware = {
 	"Printer Driver is package aware",
@@ -2261,7 +2261,7 @@ dissect_printer_driver_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo,
  * PRINTER_INFO_2
  */
 
-static gint ett_PRINTER_INFO_2 = -1;
+static gint ett_PRINTER_INFO_2;
 
 static int
 dissect_PRINTER_INFO_2(tvbuff_t *tvb, int offset,
@@ -2372,7 +2372,7 @@ dissect_PRINTER_INFO_2(tvbuff_t *tvb, int offset,
  * PRINTER_INFO_3
  */
 
-static gint ett_PRINTER_INFO_3 = -1;
+static gint ett_PRINTER_INFO_3;
 
 static int
 dissect_PRINTER_INFO_3(tvbuff_t *tvb, int offset,
@@ -2395,7 +2395,7 @@ dissect_PRINTER_INFO_3(tvbuff_t *tvb, int offset,
  * PRINTER_INFO_5
  */
 
-static gint ett_PRINTER_INFO_5 = -1;
+static gint ett_PRINTER_INFO_5;
 
 static int
 dissect_PRINTER_INFO_5(tvbuff_t *tvb, int offset,
@@ -2428,7 +2428,7 @@ dissect_PRINTER_INFO_5(tvbuff_t *tvb, int offset,
  * PRINTER_INFO_7
  */
 
-static gint ett_PRINTER_INFO_7 = -1;
+static gint ett_PRINTER_INFO_7;
 
 static const value_string getprinter_action_vals[] = {
 	{ DS_PUBLISH, "Publish" },
@@ -2459,7 +2459,7 @@ dissect_PRINTER_INFO_7(tvbuff_t *tvb, int offset,
  * PRINTER_DATATYPE structure
  */
 
-static gint ett_PRINTER_DATATYPE = -1;
+static gint ett_PRINTER_DATATYPE;
 
 static int
 dissect_PRINTER_DATATYPE(tvbuff_t *tvb, int offset,
@@ -2480,15 +2480,15 @@ dissect_PRINTER_DATATYPE(tvbuff_t *tvb, int offset,
  * USER_LEVEL_1 structure
  */
 
-static gint ett_USER_LEVEL_1 = -1;
+static gint ett_USER_LEVEL_1;
 
-static int hf_userlevel_size = -1;
-static int hf_userlevel_client = -1;
-static int hf_userlevel_user = -1;
-static int hf_userlevel_build = -1;
-static int hf_userlevel_major = -1;
-static int hf_userlevel_minor = -1;
-static int hf_userlevel_processor = -1;
+static int hf_userlevel_size;
+static int hf_userlevel_client;
+static int hf_userlevel_user;
+static int hf_userlevel_build;
+static int hf_userlevel_major;
+static int hf_userlevel_minor;
+static int hf_userlevel_processor;
 
 static int
 dissect_USER_LEVEL_1(tvbuff_t *tvb, int offset,
@@ -2535,7 +2535,7 @@ dissect_USER_LEVEL_1(tvbuff_t *tvb, int offset,
  * USER_LEVEL_CTR structure
  */
 
-static gint ett_USER_LEVEL_CTR = -1;
+static gint ett_USER_LEVEL_CTR;
 
 int
 dissect_USER_LEVEL_CTR(tvbuff_t *tvb, int offset,
@@ -2811,7 +2811,7 @@ char *notify_plural(int count)
 	return "notifies";
 }
 
-static gint ett_NOTIFY_OPTION = -1;
+static gint ett_NOTIFY_OPTION;
 
 static int
 dissect_NOTIFY_OPTION(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -2870,7 +2870,7 @@ dissect_NOTIFY_OPTIONS_ARRAY(tvbuff_t *tvb, int offset,
 	return offset;
 }
 
-static gint ett_notify_options_flags = -1;
+static gint ett_notify_options_flags;
 
 static const true_false_string tfs_notify_options_flags_refresh = {
 	"Data for all monitored fields is present",
@@ -2923,15 +2923,15 @@ dissect_NOTIFY_OPTIONS_ARRAY_CTR(tvbuff_t *tvb, int offset,
  * SpoolssRFFPCNEX
  */
 
-static gint ett_rffpcnex_flags = -1;
+static gint ett_rffpcnex_flags;
 
-static int hf_rffpcnex_flags = -1;
-static int hf_rffpcnex_options = -1;
+static int hf_rffpcnex_flags;
+static int hf_rffpcnex_options;
 
-static int hf_rffpcnex_flags_add_printer = -1;
-static int hf_rffpcnex_flags_set_printer = -1;
-static int hf_rffpcnex_flags_delete_printer = -1;
-static int hf_rffpcnex_flags_failed_printer_connection = -1;
+static int hf_rffpcnex_flags_add_printer;
+static int hf_rffpcnex_flags_set_printer;
+static int hf_rffpcnex_flags_delete_printer;
+static int hf_rffpcnex_flags_failed_printer_connection;
 
 static const true_false_string tfs_rffpcnex_flags_add_printer = {
 	"Notify on add printer",
@@ -2953,10 +2953,10 @@ static const true_false_string tfs_rffpcnex_flags_failed_connection_printer = {
 	"Don't notify on failed printer connection"
 };
 
-static int hf_rffpcnex_flags_add_job = -1;
-static int hf_rffpcnex_flags_set_job = -1;
-static int hf_rffpcnex_flags_delete_job = -1;
-static int hf_rffpcnex_flags_write_job = -1;
+static int hf_rffpcnex_flags_add_job;
+static int hf_rffpcnex_flags_set_job;
+static int hf_rffpcnex_flags_delete_job;
+static int hf_rffpcnex_flags_write_job;
 
 static const true_false_string tfs_rffpcnex_flags_add_job = {
 	"Notify on add job",
@@ -2978,9 +2978,9 @@ static const true_false_string tfs_rffpcnex_flags_write_job = {
 	"Don't notify on write job"
 };
 
-static int hf_rffpcnex_flags_add_form = -1;
-static int hf_rffpcnex_flags_set_form = -1;
-static int hf_rffpcnex_flags_delete_form = -1;
+static int hf_rffpcnex_flags_add_form;
+static int hf_rffpcnex_flags_set_form;
+static int hf_rffpcnex_flags_delete_form;
 
 static const true_false_string tfs_rffpcnex_flags_add_form = {
 	"Notify on add form",
@@ -2997,9 +2997,9 @@ static const true_false_string tfs_rffpcnex_flags_delete_form = {
 	"Don't notify on delete form"
 };
 
-static int hf_rffpcnex_flags_add_port = -1;
-static int hf_rffpcnex_flags_configure_port = -1;
-static int hf_rffpcnex_flags_delete_port = -1;
+static int hf_rffpcnex_flags_add_port;
+static int hf_rffpcnex_flags_configure_port;
+static int hf_rffpcnex_flags_delete_port;
 
 static const true_false_string tfs_rffpcnex_flags_add_port = {
 	"Notify on add port",
@@ -3016,8 +3016,8 @@ static const true_false_string tfs_rffpcnex_flags_delete_port = {
 	"Don't notify on delete port"
 };
 
-static int hf_rffpcnex_flags_add_print_processor = -1;
-static int hf_rffpcnex_flags_delete_print_processor = -1;
+static int hf_rffpcnex_flags_add_print_processor;
+static int hf_rffpcnex_flags_delete_print_processor;
 
 static const true_false_string tfs_rffpcnex_flags_add_print_processor = {
 	"Notify on add driver",
@@ -3029,9 +3029,9 @@ static const true_false_string tfs_rffpcnex_flags_delete_print_processor = {
 	"Don't notify on add driver"
 };
 
-static int hf_rffpcnex_flags_add_driver = -1;
-static int hf_rffpcnex_flags_set_driver = -1;
-static int hf_rffpcnex_flags_delete_driver = -1;
+static int hf_rffpcnex_flags_add_driver;
+static int hf_rffpcnex_flags_set_driver;
+static int hf_rffpcnex_flags_delete_driver;
 
 static const true_false_string tfs_rffpcnex_flags_add_driver = {
 	"Notify on add driver",
@@ -3048,7 +3048,7 @@ static const true_false_string tfs_rffpcnex_flags_delete_driver = {
 	"Don't notify on delete driver"
 };
 
-static int hf_rffpcnex_flags_timeout = -1;
+static int hf_rffpcnex_flags_timeout;
 
 static const true_false_string tfs_rffpcnex_flags_timeout = {
 	"Notify on timeout",
@@ -3252,7 +3252,7 @@ SpoolssGetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	return offset;
 }
 
-static gint ett_PRINTER_INFO = -1;
+static gint ett_PRINTER_INFO;
 
 static int
 SpoolssGetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -3318,11 +3318,11 @@ SpoolssGetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
  * SEC_DESC_BUF
  */
 
-static gint ett_SEC_DESC_BUF = -1;
+static gint ett_SEC_DESC_BUF;
 
-static int hf_secdescbuf_maxlen = -1;
-static int hf_secdescbuf_undoc = -1;
-static int hf_secdescbuf_len = -1;
+static int hf_secdescbuf_maxlen;
+static int hf_secdescbuf_undoc;
+static int hf_secdescbuf_len;
 
 static int
 dissect_SEC_DESC_BUF(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -3365,12 +3365,12 @@ dissect_SEC_DESC_BUF(tvbuff_t *tvb, int offset, packet_info *pinfo,
  * SPOOL_PRINTER_INFO_LEVEL
  */
 
-static gint ett_SPOOL_PRINTER_INFO_LEVEL = -1;
+static gint ett_SPOOL_PRINTER_INFO_LEVEL;
 
 /* spool printer info */
 
-static int hf_spool_printer_info_devmode_ptr = -1;
-static int hf_spool_printer_info_secdesc_ptr = -1;
+static int hf_spool_printer_info_devmode_ptr;
+static int hf_spool_printer_info_secdesc_ptr;
 
 int
 dissect_SPOOL_PRINTER_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -3427,7 +3427,7 @@ dissect_SPOOL_PRINTER_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo,
  * SpoolssSetPrinter
  */
 
-static int hf_setprinter_cmd = -1;
+static int hf_setprinter_cmd;
 
 static const value_string setprinter_cmd_vals[] = {
 	{ SPOOLSS_PRINTER_CONTROL_UNPAUSE, "Unpause" },
@@ -3489,7 +3489,7 @@ static const value_string form_type_vals[] =
 	{ 0, NULL }
 };
 
-static gint ett_FORM_REL = -1;
+static gint ett_FORM_REL;
 
 static int
 dissect_FORM_REL(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -3709,12 +3709,12 @@ SpoolssAddPrinterEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
  * SpoolssEnumPrinterData
  */
 
-static int hf_enumprinterdata_enumindex = -1;
-static int hf_enumprinterdata_value_offered = -1;
-static int hf_enumprinterdata_data_offered = -1;
-static int hf_enumprinterdata_value_len = -1;
-static int hf_enumprinterdata_value_needed = -1;
-static int hf_enumprinterdata_data_needed = -1;
+static int hf_enumprinterdata_enumindex;
+static int hf_enumprinterdata_value_offered;
+static int hf_enumprinterdata_data_offered;
+static int hf_enumprinterdata_value_len;
+static int hf_enumprinterdata_value_needed;
+static int hf_enumprinterdata_data_needed;
 
 static int
 SpoolssEnumPrinterData_q(tvbuff_t *tvb, int offset,
@@ -3816,16 +3816,16 @@ SpoolssEnumPrinterData_r(tvbuff_t *tvb, int offset,
  * SpoolssEnumPrinters
  */
 
-static gint ett_enumprinters_flags = -1;
+static gint ett_enumprinters_flags;
 
-static int hf_enumprinters_flags = -1;
-static int hf_enumprinters_flags_local = -1;
-static int hf_enumprinters_flags_name = -1;
-static int hf_enumprinters_flags_shared = -1;
-static int hf_enumprinters_flags_default = -1;
-static int hf_enumprinters_flags_connections = -1;
-static int hf_enumprinters_flags_network = -1;
-static int hf_enumprinters_flags_remote = -1;
+static int hf_enumprinters_flags;
+static int hf_enumprinters_flags_local;
+static int hf_enumprinters_flags_name;
+static int hf_enumprinters_flags_shared;
+static int hf_enumprinters_flags_default;
+static int hf_enumprinters_flags_connections;
+static int hf_enumprinters_flags_network;
+static int hf_enumprinters_flags_remote;
 
 static int
 SpoolssEnumPrinters_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -3959,7 +3959,7 @@ SpoolssAddPrinterDriver_r(tvbuff_t *tvb, int offset,
  * FORM_1
  */
 
-static gint ett_FORM_1 = -1;
+static gint ett_FORM_1;
 
 static int
 dissect_FORM_1(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -4019,7 +4019,7 @@ dissect_FORM_1(tvbuff_t *tvb, int offset, packet_info *pinfo,
  * FORM_CTR
  */
 
-static gint ett_FORM_CTR = -1;
+static gint ett_FORM_CTR;
 
 int
 dissect_FORM_CTR(tvbuff_t *tvb, int offset,
@@ -4328,7 +4328,7 @@ SpoolssGeneric_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
  * JOB_INFO_1
  */
 
-static gint ett_JOB_INFO_1 = -1;
+static gint ett_JOB_INFO_1;
 
 static int
 dissect_spoolss_JOB_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -4397,7 +4397,7 @@ dissect_spoolss_JOB_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo,
  * JOB_INFO_2
  */
 
-static gint ett_JOB_INFO_2 = -1;
+static gint ett_JOB_INFO_2;
 
 static int
 dissect_spoolss_JOB_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -4511,8 +4511,8 @@ dissect_spoolss_JOB_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo,
  * EnumJobs
  */
 
-static int hf_enumjobs_firstjob = -1;
-static int hf_enumjobs_numjobs = -1;
+static int hf_enumjobs_firstjob;
+static int hf_enumjobs_numjobs;
 
 static int
 SpoolssEnumJobs_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -4613,7 +4613,7 @@ static const value_string setjob_commands[] = {
 	{ 0, NULL }
 };
 
-static int hf_setjob_cmd = -1;
+static int hf_setjob_cmd;
 
 static int
 SpoolssSetJob_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -4819,7 +4819,7 @@ SpoolssEndPagePrinter_r(tvbuff_t *tvb, int offset,
  * DOC_INFO_1
  */
 
-static gint ett_DOC_INFO_1 = -1;
+static gint ett_DOC_INFO_1;
 
 static int
 dissect_spoolss_doc_info_1(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -4859,7 +4859,7 @@ dissect_spoolss_doc_info_data(tvbuff_t *tvb, int offset, packet_info *pinfo,
  * DOC_INFO
  */
 
-static gint ett_DOC_INFO = -1;
+static gint ett_DOC_INFO;
 
 static int
 dissect_spoolss_doc_info(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -4886,7 +4886,7 @@ dissect_spoolss_doc_info(tvbuff_t *tvb, int offset, packet_info *pinfo,
  * DOC_INFO_CTR
  */
 
-static gint ett_DOC_INFO_CTR = -1;
+static gint ett_DOC_INFO_CTR;
 
 int
 dissect_spoolss_doc_info_ctr(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -4998,9 +4998,9 @@ SpoolssEndDocPrinter_r(tvbuff_t *tvb, int offset,
  * WritePrinter
  */
 
-static gint ett_writeprinter_buffer = -1;
+static gint ett_writeprinter_buffer;
 
-static int hf_writeprinter_numwritten = -1;
+static int hf_writeprinter_numwritten;
 
 static int
 SpoolssWritePrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -5118,7 +5118,7 @@ SpoolssDeletePrinterData_r(tvbuff_t *tvb, int offset,
  * DRIVER_INFO_1
  */
 
-static gint ett_DRIVER_INFO_1 = -1;
+static gint ett_DRIVER_INFO_1;
 
 static int
 dissect_DRIVER_INFO_1(tvbuff_t *tvb, int offset,
@@ -5150,7 +5150,7 @@ static const value_string driverinfo_cversion_vals[] =
 	{ 0, NULL }
 };
 
-static gint ett_DRIVER_INFO_2 = -1;
+static gint ett_DRIVER_INFO_2;
 
 static int
 dissect_DRIVER_INFO_2(tvbuff_t *tvb, int offset,
@@ -5193,7 +5193,7 @@ dissect_DRIVER_INFO_2(tvbuff_t *tvb, int offset,
  * DRIVER_INFO_3
  */
 
-static gint ett_DRIVER_INFO_3 = -1;
+static gint ett_DRIVER_INFO_3;
 
 static int
 dissect_DRIVER_INFO_3(tvbuff_t *tvb, int offset,
@@ -5253,7 +5253,7 @@ dissect_DRIVER_INFO_3(tvbuff_t *tvb, int offset,
 	DRIVER_INFO_6
 */
 
-static gint ett_DRIVER_INFO_6 = -1;
+static gint ett_DRIVER_INFO_6;
 
 static int
 dissect_DRIVER_INFO_6(tvbuff_t *tvb, int offset,
@@ -5348,7 +5348,7 @@ dissect_DRIVER_INFO_6(tvbuff_t *tvb, int offset,
 	DRIVER_INFO_8
 */
 
-static gint ett_DRIVER_INFO_8 = -1;
+static gint ett_DRIVER_INFO_8;
 
 static int
 dissect_DRIVER_INFO_8(tvbuff_t *tvb, int offset,
@@ -5473,7 +5473,7 @@ dissect_DRIVER_INFO_8(tvbuff_t *tvb, int offset,
 }
 
 
-static gint ett_DRIVER_INFO_101 = -1;
+static gint ett_DRIVER_INFO_101;
 
 static int
 dissect_DRIVER_INFO_101(tvbuff_t *tvb, int offset,
@@ -5506,7 +5506,7 @@ dissect_DRIVER_INFO_101(tvbuff_t *tvb, int offset,
 	CORE_PRINTER_DRIVER
 */
 
-static gint ett_CORE_PRINTER_DRIVER = -1;
+static gint ett_CORE_PRINTER_DRIVER;
 
 static int
 dissect_CORE_PRINTER_DRIVER(tvbuff_t *tvb, int offset,
@@ -6180,7 +6180,7 @@ dissect_NOTIFY_INFO_DATA_job(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	return offset;
 }
 
-static gint ett_NOTIFY_INFO_DATA = -1;
+static gint ett_NOTIFY_INFO_DATA;
 
 static int
 dissect_NOTIFY_INFO_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -6450,9 +6450,9 @@ SpoolssFCPN_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
  * RouterReplyPrinter
  */
 
-static int hf_routerreplyprinter_condition = -1;
-static int hf_routerreplyprinter_unknown1 = -1;
-static int hf_routerreplyprinter_changeid = -1;
+static int hf_routerreplyprinter_condition;
+static int hf_routerreplyprinter_unknown1;
+static int hf_routerreplyprinter_changeid;
 
 static int
 SpoolssRouterReplyPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -6491,7 +6491,7 @@ SpoolssRouterReplyPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	return offset;
 }
 
-static int hf_keybuffer_size = -1;
+static int hf_keybuffer_size;
 
 static int
 dissect_spoolss_keybuffer(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -6573,17 +6573,17 @@ SpoolssEnumPrinterKey_r(tvbuff_t *tvb, int offset,
 	return offset;
 }
 
-static int hf_enumprinterdataex_name_offset = -1;
-static int hf_enumprinterdataex_name_len = -1;
-static int hf_enumprinterdataex_name = -1;
-static int hf_enumprinterdataex_val_offset = -1;
-static int hf_enumprinterdataex_val_len = -1;
-static int hf_enumprinterdataex_val_dword_low = -1;
-static int hf_enumprinterdataex_val_dword_high = -1;
-static int hf_enumprinterdataex_value_null = -1;
-static int hf_enumprinterdataex_value_uint = -1;
-static int hf_enumprinterdataex_value_binary = -1;
-static int hf_enumprinterdataex_value_multi_sz = -1;
+static int hf_enumprinterdataex_name_offset;
+static int hf_enumprinterdataex_name_len;
+static int hf_enumprinterdataex_name;
+static int hf_enumprinterdataex_val_offset;
+static int hf_enumprinterdataex_val_len;
+static int hf_enumprinterdataex_val_dword_low;
+static int hf_enumprinterdataex_val_dword_high;
+static int hf_enumprinterdataex_value_null;
+static int hf_enumprinterdataex_value_uint;
+static int hf_enumprinterdataex_value_binary;
+static int hf_enumprinterdataex_value_multi_sz;
 
 static int
 SpoolssEnumPrinterDataEx_q(tvbuff_t *tvb, int offset,
@@ -6615,7 +6615,7 @@ SpoolssEnumPrinterDataEx_q(tvbuff_t *tvb, int offset,
 	return offset;
 }
 
-static gint ett_printer_enumdataex_value = -1;
+static gint ett_printer_enumdataex_value;
 
 static int
 dissect_spoolss_printer_enum_values(tvbuff_t *tvb, int offset,
@@ -6724,7 +6724,7 @@ dissect_spoolss_printer_enum_values(tvbuff_t *tvb, int offset,
 	return offset;
 }
 
-static gint ett_PRINTER_DATA_CTR = -1;
+static gint ett_PRINTER_DATA_CTR;
 
 static int
 SpoolssEnumPrinterDataEx_r(tvbuff_t *tvb, int offset,
@@ -7123,8 +7123,8 @@ static dcerpc_sub_dissector dcerpc_spoolss_dissectors[] = {
 
 /* Protocol registration */
 
-static int proto_dcerpc_spoolss = -1;
-static gint ett_dcerpc_spoolss = -1;
+static int proto_dcerpc_spoolss;
+static gint ett_dcerpc_spoolss;
 
 void
 proto_register_dcerpc_spoolss(void)
diff --git a/epan/dissectors/packet-dcerpc-srvsvc.c b/epan/dissectors/packet-dcerpc-srvsvc.c
index c2e3998b18..18f6777966 100644
--- a/epan/dissectors/packet-dcerpc-srvsvc.c
+++ b/epan/dissectors/packet-dcerpc-srvsvc.c
@@ -22,911 +22,911 @@ void proto_register_dcerpc_srvsvc(void);
 void proto_reg_handoff_dcerpc_srvsvc(void);
 
 /* Ett declarations */
-static gint ett_dcerpc_srvsvc = -1;
-static gint ett_srvsvc_svcctl_ServerType = -1;
-static gint ett_srvsvc_security_secinfo = -1;
-static gint ett_srvsvc_srvsvc_NetCharDevInfo0 = -1;
-static gint ett_srvsvc_srvsvc_NetCharDevCtr0 = -1;
-static gint ett_srvsvc_srvsvc_NetCharDevInfo1 = -1;
-static gint ett_srvsvc_srvsvc_NetCharDevCtr1 = -1;
-static gint ett_srvsvc_srvsvc_NetCharDevInfo = -1;
-static gint ett_srvsvc_srvsvc_NetCharDevCtr = -1;
-static gint ett_srvsvc_srvsvc_NetCharDevInfoCtr = -1;
-static gint ett_srvsvc_srvsvc_NetCharDevQInfo0 = -1;
-static gint ett_srvsvc_srvsvc_NetCharDevQCtr0 = -1;
-static gint ett_srvsvc_srvsvc_NetCharDevQInfo1 = -1;
-static gint ett_srvsvc_srvsvc_NetCharDevQCtr1 = -1;
-static gint ett_srvsvc_srvsvc_NetCharDevQInfo = -1;
-static gint ett_srvsvc_srvsvc_NetCharDevQCtr = -1;
-static gint ett_srvsvc_srvsvc_NetCharDevQInfoCtr = -1;
-static gint ett_srvsvc_srvsvc_NetConnInfo0 = -1;
-static gint ett_srvsvc_srvsvc_NetConnCtr0 = -1;
-static gint ett_srvsvc_srvsvc_NetConnInfo1 = -1;
-static gint ett_srvsvc_srvsvc_NetConnCtr1 = -1;
-static gint ett_srvsvc_srvsvc_NetConnCtr = -1;
-static gint ett_srvsvc_srvsvc_NetConnInfoCtr = -1;
-static gint ett_srvsvc_srvsvc_NetFileInfo2 = -1;
-static gint ett_srvsvc_srvsvc_NetFileCtr2 = -1;
-static gint ett_srvsvc_srvsvc_NetFileInfo3 = -1;
-static gint ett_srvsvc_srvsvc_NetFileCtr3 = -1;
-static gint ett_srvsvc_srvsvc_NetFileInfo = -1;
-static gint ett_srvsvc_srvsvc_NetFileCtr = -1;
-static gint ett_srvsvc_srvsvc_NetFileInfoCtr = -1;
-static gint ett_srvsvc_srvsvc_NetSessInfo0 = -1;
-static gint ett_srvsvc_srvsvc_NetSessCtr0 = -1;
-static gint ett_srvsvc_srvsvc_NetSessInfo1 = -1;
-static gint ett_srvsvc_srvsvc_NetSessCtr1 = -1;
-static gint ett_srvsvc_srvsvc_NetSessInfo2 = -1;
-static gint ett_srvsvc_srvsvc_NetSessCtr2 = -1;
-static gint ett_srvsvc_srvsvc_NetSessInfo10 = -1;
-static gint ett_srvsvc_srvsvc_NetSessCtr10 = -1;
-static gint ett_srvsvc_srvsvc_NetSessInfo502 = -1;
-static gint ett_srvsvc_srvsvc_NetSessCtr502 = -1;
-static gint ett_srvsvc_srvsvc_NetSessCtr = -1;
-static gint ett_srvsvc_srvsvc_NetSessInfoCtr = -1;
-static gint ett_srvsvc_srvsvc_NetShareInfo0 = -1;
-static gint ett_srvsvc_srvsvc_NetShareCtr0 = -1;
-static gint ett_srvsvc_srvsvc_NetShareInfo1 = -1;
-static gint ett_srvsvc_srvsvc_NetShareCtr1 = -1;
-static gint ett_srvsvc_srvsvc_NetShareInfo2 = -1;
-static gint ett_srvsvc_srvsvc_NetShareCtr2 = -1;
-static gint ett_srvsvc_srvsvc_NetShareInfo501 = -1;
-static gint ett_srvsvc_srvsvc_NetShareCtr501 = -1;
-static gint ett_srvsvc_srvsvc_NetShareInfo502 = -1;
-static gint ett_srvsvc_srvsvc_NetShareCtr502 = -1;
-static gint ett_srvsvc_srvsvc_NetShareInfo1004 = -1;
-static gint ett_srvsvc_srvsvc_NetShareCtr1004 = -1;
-static gint ett_srvsvc_NetShareInfo1005Flags = -1;
-static gint ett_srvsvc_srvsvc_NetShareInfo1005 = -1;
-static gint ett_srvsvc_srvsvc_NetShareCtr1005 = -1;
-static gint ett_srvsvc_srvsvc_NetShareInfo1006 = -1;
-static gint ett_srvsvc_srvsvc_NetShareCtr1006 = -1;
-static gint ett_srvsvc_srvsvc_NetShareInfo1007 = -1;
-static gint ett_srvsvc_srvsvc_NetShareCtr1007 = -1;
-static gint ett_srvsvc_srvsvc_NetShareCtr1501 = -1;
-static gint ett_srvsvc_srvsvc_NetShareInfo = -1;
-static gint ett_srvsvc_srvsvc_NetShareCtr = -1;
-static gint ett_srvsvc_srvsvc_NetShareInfoCtr = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo100 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo101 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo102 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo402 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo403 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo502 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo503 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo599 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1005 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1010 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1016 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1017 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1018 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1107 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1501 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1502 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1503 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1506 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1509 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1510 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1511 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1512 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1513 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1514 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1515 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1516 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1518 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1520 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1521 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1522 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1523 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1524 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1525 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1528 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1529 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1530 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1533 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1534 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1535 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1536 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1537 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1538 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1539 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1540 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1541 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1542 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1543 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1544 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1545 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1546 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1547 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1548 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1549 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1550 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1552 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1553 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1554 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1555 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo1556 = -1;
-static gint ett_srvsvc_srvsvc_NetSrvInfo = -1;
-static gint ett_srvsvc_srvsvc_NetDiskInfo0 = -1;
-static gint ett_srvsvc_srvsvc_NetDiskInfo = -1;
-static gint ett_srvsvc_srvsvc_Statistics = -1;
-static gint ett_srvsvc_srvsvc_NetTransportInfo0 = -1;
-static gint ett_srvsvc_srvsvc_NetTransportCtr0 = -1;
-static gint ett_srvsvc_srvsvc_NetTransportInfo1 = -1;
-static gint ett_srvsvc_srvsvc_NetTransportCtr1 = -1;
-static gint ett_srvsvc_srvsvc_NetTransportInfo2 = -1;
-static gint ett_srvsvc_srvsvc_NetTransportCtr2 = -1;
-static gint ett_srvsvc_srvsvc_NetTransportInfo3 = -1;
-static gint ett_srvsvc_srvsvc_NetTransportCtr3 = -1;
-static gint ett_srvsvc_srvsvc_NetTransportCtr = -1;
-static gint ett_srvsvc_srvsvc_NetTransportInfoCtr = -1;
-static gint ett_srvsvc_srvsvc_NetRemoteTODInfo = -1;
-static gint ett_srvsvc_srvsvc_NetTransportInfo = -1;
+static gint ett_dcerpc_srvsvc;
+static gint ett_srvsvc_svcctl_ServerType;
+static gint ett_srvsvc_security_secinfo;
+static gint ett_srvsvc_srvsvc_NetCharDevInfo0;
+static gint ett_srvsvc_srvsvc_NetCharDevCtr0;
+static gint ett_srvsvc_srvsvc_NetCharDevInfo1;
+static gint ett_srvsvc_srvsvc_NetCharDevCtr1;
+static gint ett_srvsvc_srvsvc_NetCharDevInfo;
+static gint ett_srvsvc_srvsvc_NetCharDevCtr;
+static gint ett_srvsvc_srvsvc_NetCharDevInfoCtr;
+static gint ett_srvsvc_srvsvc_NetCharDevQInfo0;
+static gint ett_srvsvc_srvsvc_NetCharDevQCtr0;
+static gint ett_srvsvc_srvsvc_NetCharDevQInfo1;
+static gint ett_srvsvc_srvsvc_NetCharDevQCtr1;
+static gint ett_srvsvc_srvsvc_NetCharDevQInfo;
+static gint ett_srvsvc_srvsvc_NetCharDevQCtr;
+static gint ett_srvsvc_srvsvc_NetCharDevQInfoCtr;
+static gint ett_srvsvc_srvsvc_NetConnInfo0;
+static gint ett_srvsvc_srvsvc_NetConnCtr0;
+static gint ett_srvsvc_srvsvc_NetConnInfo1;
+static gint ett_srvsvc_srvsvc_NetConnCtr1;
+static gint ett_srvsvc_srvsvc_NetConnCtr;
+static gint ett_srvsvc_srvsvc_NetConnInfoCtr;
+static gint ett_srvsvc_srvsvc_NetFileInfo2;
+static gint ett_srvsvc_srvsvc_NetFileCtr2;
+static gint ett_srvsvc_srvsvc_NetFileInfo3;
+static gint ett_srvsvc_srvsvc_NetFileCtr3;
+static gint ett_srvsvc_srvsvc_NetFileInfo;
+static gint ett_srvsvc_srvsvc_NetFileCtr;
+static gint ett_srvsvc_srvsvc_NetFileInfoCtr;
+static gint ett_srvsvc_srvsvc_NetSessInfo0;
+static gint ett_srvsvc_srvsvc_NetSessCtr0;
+static gint ett_srvsvc_srvsvc_NetSessInfo1;
+static gint ett_srvsvc_srvsvc_NetSessCtr1;
+static gint ett_srvsvc_srvsvc_NetSessInfo2;
+static gint ett_srvsvc_srvsvc_NetSessCtr2;
+static gint ett_srvsvc_srvsvc_NetSessInfo10;
+static gint ett_srvsvc_srvsvc_NetSessCtr10;
+static gint ett_srvsvc_srvsvc_NetSessInfo502;
+static gint ett_srvsvc_srvsvc_NetSessCtr502;
+static gint ett_srvsvc_srvsvc_NetSessCtr;
+static gint ett_srvsvc_srvsvc_NetSessInfoCtr;
+static gint ett_srvsvc_srvsvc_NetShareInfo0;
+static gint ett_srvsvc_srvsvc_NetShareCtr0;
+static gint ett_srvsvc_srvsvc_NetShareInfo1;
+static gint ett_srvsvc_srvsvc_NetShareCtr1;
+static gint ett_srvsvc_srvsvc_NetShareInfo2;
+static gint ett_srvsvc_srvsvc_NetShareCtr2;
+static gint ett_srvsvc_srvsvc_NetShareInfo501;
+static gint ett_srvsvc_srvsvc_NetShareCtr501;
+static gint ett_srvsvc_srvsvc_NetShareInfo502;
+static gint ett_srvsvc_srvsvc_NetShareCtr502;
+static gint ett_srvsvc_srvsvc_NetShareInfo1004;
+static gint ett_srvsvc_srvsvc_NetShareCtr1004;
+static gint ett_srvsvc_NetShareInfo1005Flags;
+static gint ett_srvsvc_srvsvc_NetShareInfo1005;
+static gint ett_srvsvc_srvsvc_NetShareCtr1005;
+static gint ett_srvsvc_srvsvc_NetShareInfo1006;
+static gint ett_srvsvc_srvsvc_NetShareCtr1006;
+static gint ett_srvsvc_srvsvc_NetShareInfo1007;
+static gint ett_srvsvc_srvsvc_NetShareCtr1007;
+static gint ett_srvsvc_srvsvc_NetShareCtr1501;
+static gint ett_srvsvc_srvsvc_NetShareInfo;
+static gint ett_srvsvc_srvsvc_NetShareCtr;
+static gint ett_srvsvc_srvsvc_NetShareInfoCtr;
+static gint ett_srvsvc_srvsvc_NetSrvInfo100;
+static gint ett_srvsvc_srvsvc_NetSrvInfo101;
+static gint ett_srvsvc_srvsvc_NetSrvInfo102;
+static gint ett_srvsvc_srvsvc_NetSrvInfo402;
+static gint ett_srvsvc_srvsvc_NetSrvInfo403;
+static gint ett_srvsvc_srvsvc_NetSrvInfo502;
+static gint ett_srvsvc_srvsvc_NetSrvInfo503;
+static gint ett_srvsvc_srvsvc_NetSrvInfo599;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1005;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1010;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1016;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1017;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1018;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1107;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1501;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1502;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1503;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1506;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1509;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1510;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1511;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1512;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1513;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1514;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1515;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1516;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1518;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1520;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1521;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1522;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1523;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1524;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1525;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1528;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1529;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1530;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1533;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1534;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1535;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1536;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1537;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1538;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1539;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1540;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1541;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1542;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1543;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1544;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1545;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1546;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1547;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1548;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1549;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1550;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1552;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1553;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1554;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1555;
+static gint ett_srvsvc_srvsvc_NetSrvInfo1556;
+static gint ett_srvsvc_srvsvc_NetSrvInfo;
+static gint ett_srvsvc_srvsvc_NetDiskInfo0;
+static gint ett_srvsvc_srvsvc_NetDiskInfo;
+static gint ett_srvsvc_srvsvc_Statistics;
+static gint ett_srvsvc_srvsvc_NetTransportInfo0;
+static gint ett_srvsvc_srvsvc_NetTransportCtr0;
+static gint ett_srvsvc_srvsvc_NetTransportInfo1;
+static gint ett_srvsvc_srvsvc_NetTransportCtr1;
+static gint ett_srvsvc_srvsvc_NetTransportInfo2;
+static gint ett_srvsvc_srvsvc_NetTransportCtr2;
+static gint ett_srvsvc_srvsvc_NetTransportInfo3;
+static gint ett_srvsvc_srvsvc_NetTransportCtr3;
+static gint ett_srvsvc_srvsvc_NetTransportCtr;
+static gint ett_srvsvc_srvsvc_NetTransportInfoCtr;
+static gint ett_srvsvc_srvsvc_NetRemoteTODInfo;
+static gint ett_srvsvc_srvsvc_NetTransportInfo;
 
 
 /* Header field declarations */
-static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ACCESS_BASED_DIRECTORY_ENUM = -1;
-static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ALLOW_NAMESPACE_CACHING = -1;
-static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_CSC_CACHE_AUTO_REINT = -1;
-static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_CSC_CACHE_NONE = -1;
-static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_CSC_CACHE_VDO = -1;
-static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_DFS_ROOT = -1;
-static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ENABLE_CA = -1;
-static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ENABLE_HASH = -1;
-static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ENCRYPT_DATA = -1;
-static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_FORCE_LEVELII_OPLOCK = -1;
-static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_FORCE_SHARED_DELETE = -1;
-static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_IN_DFS = -1;
-static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_RESTRICT_EXCLUSIVE_OPENS = -1;
-static gint hf_srvsvc_opnum = -1;
-static gint hf_srvsvc_sec_desc_buf_len = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevControl_device_name = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevControl_opcode = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevControl_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevCtr0_array = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevCtr0_count = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevCtr1_array = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevCtr1_count = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevCtr_ctr0 = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevCtr_ctr1 = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevEnum_info_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevEnum_max_buffer = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevEnum_resume_handle = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevEnum_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevEnum_totalentries = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevGetInfo_device_name = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevGetInfo_info = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevGetInfo_level = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevGetInfo_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevInfo0_device = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevInfo1_device = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevInfo1_status = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevInfo1_time = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevInfo1_user = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevInfoCtr_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevInfoCtr_level = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevInfo_info0 = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevInfo_info1 = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQCtr0_array = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQCtr0_count = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQCtr1_array = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQCtr1_count = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQCtr_ctr0 = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQCtr_ctr1 = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQEnum_info_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQEnum_max_buffer = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQEnum_resume_handle = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQEnum_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQEnum_totalentries = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQEnum_user = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQGetInfo_info = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQGetInfo_level = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQGetInfo_queue_name = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQGetInfo_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQGetInfo_user = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQInfo0_device = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQInfo1_device = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQInfo1_devices = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQInfo1_num_ahead = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQInfo1_priority = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQInfo1_users = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQInfoCtr_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQInfoCtr_level = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQInfo_info0 = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQInfo_info1 = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQPurgeSelf_computer_name = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQPurgeSelf_queue_name = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQPurgeSelf_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQPurge_queue_name = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQPurge_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQSetInfo_info = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQSetInfo_level = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQSetInfo_parm_error = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQSetInfo_queue_name = -1;
-static gint hf_srvsvc_srvsvc_NetCharDevQSetInfo_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetConnCtr0_array = -1;
-static gint hf_srvsvc_srvsvc_NetConnCtr0_count = -1;
-static gint hf_srvsvc_srvsvc_NetConnCtr1_array = -1;
-static gint hf_srvsvc_srvsvc_NetConnCtr1_count = -1;
-static gint hf_srvsvc_srvsvc_NetConnCtr_ctr0 = -1;
-static gint hf_srvsvc_srvsvc_NetConnCtr_ctr1 = -1;
-static gint hf_srvsvc_srvsvc_NetConnEnum_info_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetConnEnum_max_buffer = -1;
-static gint hf_srvsvc_srvsvc_NetConnEnum_path = -1;
-static gint hf_srvsvc_srvsvc_NetConnEnum_resume_handle = -1;
-static gint hf_srvsvc_srvsvc_NetConnEnum_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetConnEnum_totalentries = -1;
-static gint hf_srvsvc_srvsvc_NetConnInfo0_conn_id = -1;
-static gint hf_srvsvc_srvsvc_NetConnInfo1_conn_id = -1;
-static gint hf_srvsvc_srvsvc_NetConnInfo1_conn_time = -1;
-static gint hf_srvsvc_srvsvc_NetConnInfo1_conn_type = -1;
-static gint hf_srvsvc_srvsvc_NetConnInfo1_num_open = -1;
-static gint hf_srvsvc_srvsvc_NetConnInfo1_num_users = -1;
-static gint hf_srvsvc_srvsvc_NetConnInfo1_share = -1;
-static gint hf_srvsvc_srvsvc_NetConnInfo1_user = -1;
-static gint hf_srvsvc_srvsvc_NetConnInfoCtr_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetConnInfoCtr_level = -1;
-static gint hf_srvsvc_srvsvc_NetDiskEnum_info = -1;
-static gint hf_srvsvc_srvsvc_NetDiskEnum_level = -1;
-static gint hf_srvsvc_srvsvc_NetDiskEnum_maxlen = -1;
-static gint hf_srvsvc_srvsvc_NetDiskEnum_resume_handle = -1;
-static gint hf_srvsvc_srvsvc_NetDiskEnum_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetDiskEnum_totalentries = -1;
-static gint hf_srvsvc_srvsvc_NetDiskInfo0_disk = -1;
-static gint hf_srvsvc_srvsvc_NetDiskInfo_count = -1;
-static gint hf_srvsvc_srvsvc_NetDiskInfo_disks = -1;
-static gint hf_srvsvc_srvsvc_NetFileClose_fid = -1;
-static gint hf_srvsvc_srvsvc_NetFileClose_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetFileCtr2_array = -1;
-static gint hf_srvsvc_srvsvc_NetFileCtr2_count = -1;
-static gint hf_srvsvc_srvsvc_NetFileCtr3_array = -1;
-static gint hf_srvsvc_srvsvc_NetFileCtr3_count = -1;
-static gint hf_srvsvc_srvsvc_NetFileCtr_ctr2 = -1;
-static gint hf_srvsvc_srvsvc_NetFileCtr_ctr3 = -1;
-static gint hf_srvsvc_srvsvc_NetFileEnum_info_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetFileEnum_max_buffer = -1;
-static gint hf_srvsvc_srvsvc_NetFileEnum_path = -1;
-static gint hf_srvsvc_srvsvc_NetFileEnum_resume_handle = -1;
-static gint hf_srvsvc_srvsvc_NetFileEnum_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetFileEnum_totalentries = -1;
-static gint hf_srvsvc_srvsvc_NetFileEnum_user = -1;
-static gint hf_srvsvc_srvsvc_NetFileGetInfo_fid = -1;
-static gint hf_srvsvc_srvsvc_NetFileGetInfo_info = -1;
-static gint hf_srvsvc_srvsvc_NetFileGetInfo_level = -1;
-static gint hf_srvsvc_srvsvc_NetFileGetInfo_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetFileInfo2_fid = -1;
-static gint hf_srvsvc_srvsvc_NetFileInfo3_fid = -1;
-static gint hf_srvsvc_srvsvc_NetFileInfo3_num_locks = -1;
-static gint hf_srvsvc_srvsvc_NetFileInfo3_path = -1;
-static gint hf_srvsvc_srvsvc_NetFileInfo3_permissions = -1;
-static gint hf_srvsvc_srvsvc_NetFileInfo3_user = -1;
-static gint hf_srvsvc_srvsvc_NetFileInfoCtr_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetFileInfoCtr_level = -1;
-static gint hf_srvsvc_srvsvc_NetFileInfo_info2 = -1;
-static gint hf_srvsvc_srvsvc_NetFileInfo_info3 = -1;
-static gint hf_srvsvc_srvsvc_NetGetFileSecurity_file = -1;
-static gint hf_srvsvc_srvsvc_NetGetFileSecurity_sd_buf = -1;
-static gint hf_srvsvc_srvsvc_NetGetFileSecurity_securityinformation = -1;
-static gint hf_srvsvc_srvsvc_NetGetFileSecurity_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetGetFileSecurity_share = -1;
-static gint hf_srvsvc_srvsvc_NetNameValidate_flags = -1;
-static gint hf_srvsvc_srvsvc_NetNameValidate_name = -1;
-static gint hf_srvsvc_srvsvc_NetNameValidate_name_type = -1;
-static gint hf_srvsvc_srvsvc_NetNameValidate_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetPRNameCompare_flags = -1;
-static gint hf_srvsvc_srvsvc_NetPRNameCompare_name1 = -1;
-static gint hf_srvsvc_srvsvc_NetPRNameCompare_name2 = -1;
-static gint hf_srvsvc_srvsvc_NetPRNameCompare_name_type = -1;
-static gint hf_srvsvc_srvsvc_NetPRNameCompare_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetPathCanonicalize_can_path = -1;
-static gint hf_srvsvc_srvsvc_NetPathCanonicalize_maxbuf = -1;
-static gint hf_srvsvc_srvsvc_NetPathCanonicalize_path = -1;
-static gint hf_srvsvc_srvsvc_NetPathCanonicalize_pathflags = -1;
-static gint hf_srvsvc_srvsvc_NetPathCanonicalize_pathtype = -1;
-static gint hf_srvsvc_srvsvc_NetPathCanonicalize_prefix = -1;
-static gint hf_srvsvc_srvsvc_NetPathCanonicalize_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetPathCompare_path1 = -1;
-static gint hf_srvsvc_srvsvc_NetPathCompare_path2 = -1;
-static gint hf_srvsvc_srvsvc_NetPathCompare_pathflags = -1;
-static gint hf_srvsvc_srvsvc_NetPathCompare_pathtype = -1;
-static gint hf_srvsvc_srvsvc_NetPathCompare_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetPathType_path = -1;
-static gint hf_srvsvc_srvsvc_NetPathType_pathflags = -1;
-static gint hf_srvsvc_srvsvc_NetPathType_pathtype = -1;
-static gint hf_srvsvc_srvsvc_NetPathType_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_day = -1;
-static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_elapsed = -1;
-static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_hours = -1;
-static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_hunds = -1;
-static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_mins = -1;
-static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_month = -1;
-static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_msecs = -1;
-static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_secs = -1;
-static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_timezone = -1;
-static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_tinterval = -1;
-static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_weekday = -1;
-static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_year = -1;
-static gint hf_srvsvc_srvsvc_NetRemoteTOD_info = -1;
-static gint hf_srvsvc_srvsvc_NetRemoteTOD_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_emulated_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_servicebits = -1;
-static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_servicebitsofinterest = -1;
-static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_transport = -1;
-static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_updateimmediately = -1;
-static gint hf_srvsvc_srvsvc_NetServerStatisticsGet_level = -1;
-static gint hf_srvsvc_srvsvc_NetServerStatisticsGet_options = -1;
-static gint hf_srvsvc_srvsvc_NetServerStatisticsGet_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetServerStatisticsGet_service = -1;
-static gint hf_srvsvc_srvsvc_NetServerStatisticsGet_stats = -1;
-static gint hf_srvsvc_srvsvc_NetServerTransportAddEx_info = -1;
-static gint hf_srvsvc_srvsvc_NetServerTransportAddEx_level = -1;
-static gint hf_srvsvc_srvsvc_NetServerTransportAddEx_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr0_array = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr0_count = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr10_array = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr10_count = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr1_array = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr1_count = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr2_array = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr2_count = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr502_array = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr502_count = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr_ctr0 = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr_ctr1 = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr_ctr10 = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr_ctr2 = -1;
-static gint hf_srvsvc_srvsvc_NetSessCtr_ctr502 = -1;
-static gint hf_srvsvc_srvsvc_NetSessDel_client = -1;
-static gint hf_srvsvc_srvsvc_NetSessDel_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetSessDel_user = -1;
-static gint hf_srvsvc_srvsvc_NetSessEnum_client = -1;
-static gint hf_srvsvc_srvsvc_NetSessEnum_info_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetSessEnum_max_buffer = -1;
-static gint hf_srvsvc_srvsvc_NetSessEnum_resume_handle = -1;
-static gint hf_srvsvc_srvsvc_NetSessEnum_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetSessEnum_totalentries = -1;
-static gint hf_srvsvc_srvsvc_NetSessEnum_user = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo0_client = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo10_client = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo10_idle_time = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo10_time = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo10_user = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo1_client = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo1_idle_time = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo1_num_open = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo1_time = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo1_user = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo1_user_flags = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo2_client = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo2_client_type = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo2_idle_time = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo2_num_open = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo2_time = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo2_user = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo2_user_flags = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo502_client = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo502_client_type = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo502_idle_time = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo502_num_open = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo502_time = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo502_transport = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo502_user = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfo502_user_flags = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfoCtr_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetSessInfoCtr_level = -1;
-static gint hf_srvsvc_srvsvc_NetSetFileSecurity_file = -1;
-static gint hf_srvsvc_srvsvc_NetSetFileSecurity_sd_buf = -1;
-static gint hf_srvsvc_srvsvc_NetSetFileSecurity_securityinformation = -1;
-static gint hf_srvsvc_srvsvc_NetSetFileSecurity_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetSetFileSecurity_share = -1;
-static gint hf_srvsvc_srvsvc_NetSetServiceBits_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetSetServiceBits_servicebits = -1;
-static gint hf_srvsvc_srvsvc_NetSetServiceBits_transport = -1;
-static gint hf_srvsvc_srvsvc_NetSetServiceBits_updateimmediately = -1;
-static gint hf_srvsvc_srvsvc_NetShareAdd_info = -1;
-static gint hf_srvsvc_srvsvc_NetShareAdd_level = -1;
-static gint hf_srvsvc_srvsvc_NetShareAdd_parm_error = -1;
-static gint hf_srvsvc_srvsvc_NetShareAdd_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetShareCheck_device_name = -1;
-static gint hf_srvsvc_srvsvc_NetShareCheck_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetShareCheck_type = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr0_array = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr0_count = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr1004_array = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr1004_count = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr1005_array = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr1005_count = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr1006_array = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr1006_count = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr1007_array = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr1007_count = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr1501_array = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr1501_count = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr1_array = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr1_count = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr2_array = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr2_count = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr501_array = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr501_count = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr502_array = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr502_count = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_ctr0 = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1 = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1004 = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1005 = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1006 = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1007 = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1501 = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_ctr2 = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_ctr501 = -1;
-static gint hf_srvsvc_srvsvc_NetShareCtr_ctr502 = -1;
-static gint hf_srvsvc_srvsvc_NetShareDelCommit_hnd = -1;
-static gint hf_srvsvc_srvsvc_NetShareDelStart_hnd = -1;
-static gint hf_srvsvc_srvsvc_NetShareDelStart_reserved = -1;
-static gint hf_srvsvc_srvsvc_NetShareDelStart_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetShareDelStart_share = -1;
-static gint hf_srvsvc_srvsvc_NetShareDelSticky_reserved = -1;
-static gint hf_srvsvc_srvsvc_NetShareDelSticky_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetShareDelSticky_share_name = -1;
-static gint hf_srvsvc_srvsvc_NetShareDel_reserved = -1;
-static gint hf_srvsvc_srvsvc_NetShareDel_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetShareDel_share_name = -1;
-static gint hf_srvsvc_srvsvc_NetShareEnumAll_info_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetShareEnumAll_max_buffer = -1;
-static gint hf_srvsvc_srvsvc_NetShareEnumAll_resume_handle = -1;
-static gint hf_srvsvc_srvsvc_NetShareEnumAll_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetShareEnumAll_totalentries = -1;
-static gint hf_srvsvc_srvsvc_NetShareEnum_info_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetShareEnum_max_buffer = -1;
-static gint hf_srvsvc_srvsvc_NetShareEnum_resume_handle = -1;
-static gint hf_srvsvc_srvsvc_NetShareEnum_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetShareEnum_totalentries = -1;
-static gint hf_srvsvc_srvsvc_NetShareGetInfo_info = -1;
-static gint hf_srvsvc_srvsvc_NetShareGetInfo_level = -1;
-static gint hf_srvsvc_srvsvc_NetShareGetInfo_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetShareGetInfo_share_name = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo0_name = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo1004_comment = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo1005_dfs_flags = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo1006_max_users = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo1007_alternate_directory_name = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo1007_flags = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo1_comment = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo1_name = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo1_type = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo2_comment = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo2_current_users = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo2_max_users = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo2_name = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo2_password = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo2_path = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo2_permissions = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo2_type = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo501_comment = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo501_csc_policy = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo501_name = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo501_type = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo502_comment = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo502_current_users = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo502_max_users = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo502_name = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo502_password = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo502_path = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo502_permissions = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo502_sd_buf = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo502_type = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfoCtr_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfoCtr_level = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_info0 = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_info1 = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_info1004 = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_info1005 = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_info1006 = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_info1007 = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_info1501 = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_info2 = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_info501 = -1;
-static gint hf_srvsvc_srvsvc_NetShareInfo_info502 = -1;
-static gint hf_srvsvc_srvsvc_NetShareSetInfo_info = -1;
-static gint hf_srvsvc_srvsvc_NetShareSetInfo_level = -1;
-static gint hf_srvsvc_srvsvc_NetShareSetInfo_parm_error = -1;
-static gint hf_srvsvc_srvsvc_NetShareSetInfo_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetShareSetInfo_share_name = -1;
-static gint hf_srvsvc_srvsvc_NetSrvGetInfo_info = -1;
-static gint hf_srvsvc_srvsvc_NetSrvGetInfo_level = -1;
-static gint hf_srvsvc_srvsvc_NetSrvGetInfo_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1005_comment = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo100_platform_id = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo100_server_name = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1010_disc = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1016_hidden = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1017_announce = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1018_anndelta = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo101_comment = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo101_platform_id = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo101_server_name = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo101_server_type = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo101_version_major = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo101_version_minor = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo102_anndelta = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo102_announce = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo102_comment = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo102_disc = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo102_hidden = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo102_licenses = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo102_platform_id = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo102_server_name = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo102_server_type = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo102_userpath = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo102_users = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo102_version_major = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo102_version_minor = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1107_users = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1501_sessopens = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1502_sessvcs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1503_opensearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1506_maxworkitems = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1509_maxrawbuflen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1510_sessusers = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1511_sesscons = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1512_maxnonpagedmemoryusage = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1513_maxpagedmemoryusage = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1514_enablesoftcompat = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1515_enableforcedlogoff = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1516_timesource = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1518_lmannounce = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1520_maxcopyreadlen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1521_maxcopywritelen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1522_minkeepsearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1523_maxkeepsearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1524_minkeepcomplsearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1525_maxkeepcomplsearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1528_scavtimeout = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1529_minrcvqueue = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1530_minfreeworkitems = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1533_maxmpxct = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1534_oplockbreakwait = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1535_oplockbreakresponsewait = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1536_enableoplocks = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1537_enableoplockforceclose = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1538_enablefcbopens = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1539_enableraw = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1540_enablesharednetdrives = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1541_minfreeconnections = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1542_maxfreeconnections = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1543_initsesstable = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1544_initconntable = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1545_initfiletable = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1546_initsearchtable = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1547_alertsched = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1548_errortreshold = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1549_networkerrortreshold = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1550_diskspacetreshold = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1552_maxlinkdelay = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1553_minlinkthroughput = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1554_linkinfovalidtime = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1555_scavqosinfoupdatetime = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo1556_maxworkitemidletime = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_accessalert = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_activelocks = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_alerts = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_alertsched = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_alist_mtime = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_chdevjobs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_chdevqs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_chdevs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_connections = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_diskalert = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_erroralert = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_glist_mtime = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_guestaccount = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_lanmask = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_logonalert = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_maxaudits = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_netioalert = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_numadmin = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_numbigbufs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_numfiletasks = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_numreqbufs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_openfiles = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_opensearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_security = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_sessopen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_sessreqs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_sesssvc = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_shares = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_sizereqbufs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_srvheuristics = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo402_ulist_mtime = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_accessalert = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_activelocks = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_alerts = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_alertsched = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_alist_mtime = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_auditedevents = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_auditprofile = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_autopath = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_chdevjobs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_chdevqs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_chdevs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_connections = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_diskalert = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_erroralert = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_glist_mtime = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_guestaccount = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_lanmask = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_logonalert = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_maxaudits = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_netioalert = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_numadmin = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_numbigbufs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_numfiletasks = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_numreqbufs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_openfiles = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_opensearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_security = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_sessopen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_sessreqs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_sesssvc = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_shares = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_sizereqbufs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_srvheuristics = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo403_ulist_mtime = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_acceptdownlevelapis = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_enableforcedlogoff = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_enablesoftcompat = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_initworkitems = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_irpstacksize = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_lmannounce = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_maxnonpagedmemoryusage = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_maxpagedmemoryusage = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_maxrawbuflen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_maxworkitems = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_opensearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_rawworkitems = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_sessconns = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_sessopen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_sesssvc = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_sessusers = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_sizereqbufs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo502_timesource = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_acceptdownlevelapis = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_domain = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_enablefcbopens = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_enableforcedlogoff = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_enableoplockforceclose = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_enableoplocks = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_enableraw = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_enablesharednetdrives = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_enablesoftcompat = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_initworkitems = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_irpstacksize = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_lmannounce = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxcopyreadlen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxcopywritelen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxfreeconnections = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxkeepcomplsearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxkeepsearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxmpxct = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxnonpagedmemoryusage = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxpagedmemoryusage = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxrawbuflen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxworkitems = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_minfreeconnections = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_minfreeworkitems = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_minkeepcomplsearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_minkeepsearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_minrcvqueue = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_numlockthreads = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_opensearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_oplockbreakresponsewait = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_oplockbreakwait = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_rawworkitems = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_scavtimeout = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_sessconns = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_sessopen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_sesssvc = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_sessusers = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_sizereqbufs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_threadcountadd = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_threadpriority = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_timesource = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo503_xactmemsize = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_acceptdownlevelapis = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_alertsched = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_diskspacetreshold = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_domain = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_enablefcbopens = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_enableforcedlogoff = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_enableoplockforceclose = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_enableoplocks = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_enableraw = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_enablesharednetdrives = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_enablesoftcompat = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_errortreshold = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_initconntable = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_initfiletable = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_initsearchtable = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_initsesstable = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_initworkitems = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_irpstacksize = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_linkinfovalidtime = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_lmannounce = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxcopyreadlen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxcopywritelen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxfreeconnections = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxkeepcomplsearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxlinkdelay = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxmpxct = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxnonpagedmemoryusage = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxpagedmemoryusage = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxrawbuflen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxworkitemidletime = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxworkitems = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_minfreeconnections = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_minfreeworkitems = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_minkeepcomplsearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_minkeepsearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_minlinkthroughput = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_minrcvqueue = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_networkerrortreshold = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_numlockthreads = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_opensearch = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_oplockbreakresponsewait = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_oplockbreakwait = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_rawworkitems = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_reserved = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_scavqosinfoupdatetime = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_scavtimeout = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_sessconns = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_sessopen = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_sesssvc = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_sessusers = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_sizereqbufs = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_threadcountadd = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_threadpriority = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_timesource = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo599_xactmemsize = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info100 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1005 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info101 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1010 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1016 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1017 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1018 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info102 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1107 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1501 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1502 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1503 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1506 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1509 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1510 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1511 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1512 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1513 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1514 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1515 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1516 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1518 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1520 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1521 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1522 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1523 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1524 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1525 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1528 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1529 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1530 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1533 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1534 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1535 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1536 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1537 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1538 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1539 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1540 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1541 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1542 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1543 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1544 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1545 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1546 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1547 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1548 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1549 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1550 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1552 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1553 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1554 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1555 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info1556 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info402 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info403 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info502 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info503 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvInfo_info599 = -1;
-static gint hf_srvsvc_srvsvc_NetSrvSetInfo_info = -1;
-static gint hf_srvsvc_srvsvc_NetSrvSetInfo_level = -1;
-static gint hf_srvsvc_srvsvc_NetSrvSetInfo_parm_error = -1;
-static gint hf_srvsvc_srvsvc_NetSrvSetInfo_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetTransportAdd_info = -1;
-static gint hf_srvsvc_srvsvc_NetTransportAdd_level = -1;
-static gint hf_srvsvc_srvsvc_NetTransportAdd_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr0_array = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr0_count = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr1_array = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr1_count = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr2_array = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr2_count = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr3_array = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr3_count = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr_ctr0 = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr_ctr1 = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr_ctr2 = -1;
-static gint hf_srvsvc_srvsvc_NetTransportCtr_ctr3 = -1;
-static gint hf_srvsvc_srvsvc_NetTransportDel_info0 = -1;
-static gint hf_srvsvc_srvsvc_NetTransportDel_level = -1;
-static gint hf_srvsvc_srvsvc_NetTransportDel_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetTransportEnum_max_buffer = -1;
-static gint hf_srvsvc_srvsvc_NetTransportEnum_resume_handle = -1;
-static gint hf_srvsvc_srvsvc_NetTransportEnum_server_unc = -1;
-static gint hf_srvsvc_srvsvc_NetTransportEnum_totalentries = -1;
-static gint hf_srvsvc_srvsvc_NetTransportEnum_transports = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo0_addr = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo0_addr_len = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo0_name = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo0_net_addr = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo0_vcs = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo1_addr = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo1_addr_len = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo1_domain = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo1_name = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo1_net_addr = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo1_vcs = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo2_addr = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo2_addr_len = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo2_domain = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo2_name = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo2_net_addr = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo2_unknown = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo2_vcs = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo3_addr = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo3_addr_len = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo3_domain = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo3_name = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo3_net_addr = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo3_unknown1 = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo3_unknown2 = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo3_unknown3 = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo3_vcs = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfoCtr_ctr = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfoCtr_level = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo_info0 = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo_info1 = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo_info2 = -1;
-static gint hf_srvsvc_srvsvc_NetTransportInfo_info3 = -1;
-static gint hf_srvsvc_srvsvc_Statistics_avresponse = -1;
-static gint hf_srvsvc_srvsvc_Statistics_bigbufneed = -1;
-static gint hf_srvsvc_srvsvc_Statistics_bytesrcvd_high = -1;
-static gint hf_srvsvc_srvsvc_Statistics_bytesrcvd_low = -1;
-static gint hf_srvsvc_srvsvc_Statistics_bytessent_high = -1;
-static gint hf_srvsvc_srvsvc_Statistics_bytessent_low = -1;
-static gint hf_srvsvc_srvsvc_Statistics_devopens = -1;
-static gint hf_srvsvc_srvsvc_Statistics_fopens = -1;
-static gint hf_srvsvc_srvsvc_Statistics_jobsqueued = -1;
-static gint hf_srvsvc_srvsvc_Statistics_permerrors = -1;
-static gint hf_srvsvc_srvsvc_Statistics_pwerrors = -1;
-static gint hf_srvsvc_srvsvc_Statistics_reqbufneed = -1;
-static gint hf_srvsvc_srvsvc_Statistics_serrorout = -1;
-static gint hf_srvsvc_srvsvc_Statistics_sopens = -1;
-static gint hf_srvsvc_srvsvc_Statistics_start = -1;
-static gint hf_srvsvc_srvsvc_Statistics_stimeouts = -1;
-static gint hf_srvsvc_srvsvc_Statistics_syserrors = -1;
-static gint hf_srvsvc_werror = -1;
-
-static gint proto_dcerpc_srvsvc = -1;
+static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ACCESS_BASED_DIRECTORY_ENUM;
+static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ALLOW_NAMESPACE_CACHING;
+static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_CSC_CACHE_AUTO_REINT;
+static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_CSC_CACHE_NONE;
+static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_CSC_CACHE_VDO;
+static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_DFS_ROOT;
+static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ENABLE_CA;
+static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ENABLE_HASH;
+static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_ENCRYPT_DATA;
+static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_FORCE_LEVELII_OPLOCK;
+static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_FORCE_SHARED_DELETE;
+static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_IN_DFS;
+static gint hf_srvsvc_NetShareInfo1005Flags_SHARE_1005_RESTRICT_EXCLUSIVE_OPENS;
+static gint hf_srvsvc_opnum;
+static gint hf_srvsvc_sec_desc_buf_len;
+static gint hf_srvsvc_srvsvc_NetCharDevControl_device_name;
+static gint hf_srvsvc_srvsvc_NetCharDevControl_opcode;
+static gint hf_srvsvc_srvsvc_NetCharDevControl_server_unc;
+static gint hf_srvsvc_srvsvc_NetCharDevCtr0_array;
+static gint hf_srvsvc_srvsvc_NetCharDevCtr0_count;
+static gint hf_srvsvc_srvsvc_NetCharDevCtr1_array;
+static gint hf_srvsvc_srvsvc_NetCharDevCtr1_count;
+static gint hf_srvsvc_srvsvc_NetCharDevCtr_ctr0;
+static gint hf_srvsvc_srvsvc_NetCharDevCtr_ctr1;
+static gint hf_srvsvc_srvsvc_NetCharDevEnum_info_ctr;
+static gint hf_srvsvc_srvsvc_NetCharDevEnum_max_buffer;
+static gint hf_srvsvc_srvsvc_NetCharDevEnum_resume_handle;
+static gint hf_srvsvc_srvsvc_NetCharDevEnum_server_unc;
+static gint hf_srvsvc_srvsvc_NetCharDevEnum_totalentries;
+static gint hf_srvsvc_srvsvc_NetCharDevGetInfo_device_name;
+static gint hf_srvsvc_srvsvc_NetCharDevGetInfo_info;
+static gint hf_srvsvc_srvsvc_NetCharDevGetInfo_level;
+static gint hf_srvsvc_srvsvc_NetCharDevGetInfo_server_unc;
+static gint hf_srvsvc_srvsvc_NetCharDevInfo0_device;
+static gint hf_srvsvc_srvsvc_NetCharDevInfo1_device;
+static gint hf_srvsvc_srvsvc_NetCharDevInfo1_status;
+static gint hf_srvsvc_srvsvc_NetCharDevInfo1_time;
+static gint hf_srvsvc_srvsvc_NetCharDevInfo1_user;
+static gint hf_srvsvc_srvsvc_NetCharDevInfoCtr_ctr;
+static gint hf_srvsvc_srvsvc_NetCharDevInfoCtr_level;
+static gint hf_srvsvc_srvsvc_NetCharDevInfo_info0;
+static gint hf_srvsvc_srvsvc_NetCharDevInfo_info1;
+static gint hf_srvsvc_srvsvc_NetCharDevQCtr0_array;
+static gint hf_srvsvc_srvsvc_NetCharDevQCtr0_count;
+static gint hf_srvsvc_srvsvc_NetCharDevQCtr1_array;
+static gint hf_srvsvc_srvsvc_NetCharDevQCtr1_count;
+static gint hf_srvsvc_srvsvc_NetCharDevQCtr_ctr0;
+static gint hf_srvsvc_srvsvc_NetCharDevQCtr_ctr1;
+static gint hf_srvsvc_srvsvc_NetCharDevQEnum_info_ctr;
+static gint hf_srvsvc_srvsvc_NetCharDevQEnum_max_buffer;
+static gint hf_srvsvc_srvsvc_NetCharDevQEnum_resume_handle;
+static gint hf_srvsvc_srvsvc_NetCharDevQEnum_server_unc;
+static gint hf_srvsvc_srvsvc_NetCharDevQEnum_totalentries;
+static gint hf_srvsvc_srvsvc_NetCharDevQEnum_user;
+static gint hf_srvsvc_srvsvc_NetCharDevQGetInfo_info;
+static gint hf_srvsvc_srvsvc_NetCharDevQGetInfo_level;
+static gint hf_srvsvc_srvsvc_NetCharDevQGetInfo_queue_name;
+static gint hf_srvsvc_srvsvc_NetCharDevQGetInfo_server_unc;
+static gint hf_srvsvc_srvsvc_NetCharDevQGetInfo_user;
+static gint hf_srvsvc_srvsvc_NetCharDevQInfo0_device;
+static gint hf_srvsvc_srvsvc_NetCharDevQInfo1_device;
+static gint hf_srvsvc_srvsvc_NetCharDevQInfo1_devices;
+static gint hf_srvsvc_srvsvc_NetCharDevQInfo1_num_ahead;
+static gint hf_srvsvc_srvsvc_NetCharDevQInfo1_priority;
+static gint hf_srvsvc_srvsvc_NetCharDevQInfo1_users;
+static gint hf_srvsvc_srvsvc_NetCharDevQInfoCtr_ctr;
+static gint hf_srvsvc_srvsvc_NetCharDevQInfoCtr_level;
+static gint hf_srvsvc_srvsvc_NetCharDevQInfo_info0;
+static gint hf_srvsvc_srvsvc_NetCharDevQInfo_info1;
+static gint hf_srvsvc_srvsvc_NetCharDevQPurgeSelf_computer_name;
+static gint hf_srvsvc_srvsvc_NetCharDevQPurgeSelf_queue_name;
+static gint hf_srvsvc_srvsvc_NetCharDevQPurgeSelf_server_unc;
+static gint hf_srvsvc_srvsvc_NetCharDevQPurge_queue_name;
+static gint hf_srvsvc_srvsvc_NetCharDevQPurge_server_unc;
+static gint hf_srvsvc_srvsvc_NetCharDevQSetInfo_info;
+static gint hf_srvsvc_srvsvc_NetCharDevQSetInfo_level;
+static gint hf_srvsvc_srvsvc_NetCharDevQSetInfo_parm_error;
+static gint hf_srvsvc_srvsvc_NetCharDevQSetInfo_queue_name;
+static gint hf_srvsvc_srvsvc_NetCharDevQSetInfo_server_unc;
+static gint hf_srvsvc_srvsvc_NetConnCtr0_array;
+static gint hf_srvsvc_srvsvc_NetConnCtr0_count;
+static gint hf_srvsvc_srvsvc_NetConnCtr1_array;
+static gint hf_srvsvc_srvsvc_NetConnCtr1_count;
+static gint hf_srvsvc_srvsvc_NetConnCtr_ctr0;
+static gint hf_srvsvc_srvsvc_NetConnCtr_ctr1;
+static gint hf_srvsvc_srvsvc_NetConnEnum_info_ctr;
+static gint hf_srvsvc_srvsvc_NetConnEnum_max_buffer;
+static gint hf_srvsvc_srvsvc_NetConnEnum_path;
+static gint hf_srvsvc_srvsvc_NetConnEnum_resume_handle;
+static gint hf_srvsvc_srvsvc_NetConnEnum_server_unc;
+static gint hf_srvsvc_srvsvc_NetConnEnum_totalentries;
+static gint hf_srvsvc_srvsvc_NetConnInfo0_conn_id;
+static gint hf_srvsvc_srvsvc_NetConnInfo1_conn_id;
+static gint hf_srvsvc_srvsvc_NetConnInfo1_conn_time;
+static gint hf_srvsvc_srvsvc_NetConnInfo1_conn_type;
+static gint hf_srvsvc_srvsvc_NetConnInfo1_num_open;
+static gint hf_srvsvc_srvsvc_NetConnInfo1_num_users;
+static gint hf_srvsvc_srvsvc_NetConnInfo1_share;
+static gint hf_srvsvc_srvsvc_NetConnInfo1_user;
+static gint hf_srvsvc_srvsvc_NetConnInfoCtr_ctr;
+static gint hf_srvsvc_srvsvc_NetConnInfoCtr_level;
+static gint hf_srvsvc_srvsvc_NetDiskEnum_info;
+static gint hf_srvsvc_srvsvc_NetDiskEnum_level;
+static gint hf_srvsvc_srvsvc_NetDiskEnum_maxlen;
+static gint hf_srvsvc_srvsvc_NetDiskEnum_resume_handle;
+static gint hf_srvsvc_srvsvc_NetDiskEnum_server_unc;
+static gint hf_srvsvc_srvsvc_NetDiskEnum_totalentries;
+static gint hf_srvsvc_srvsvc_NetDiskInfo0_disk;
+static gint hf_srvsvc_srvsvc_NetDiskInfo_count;
+static gint hf_srvsvc_srvsvc_NetDiskInfo_disks;
+static gint hf_srvsvc_srvsvc_NetFileClose_fid;
+static gint hf_srvsvc_srvsvc_NetFileClose_server_unc;
+static gint hf_srvsvc_srvsvc_NetFileCtr2_array;
+static gint hf_srvsvc_srvsvc_NetFileCtr2_count;
+static gint hf_srvsvc_srvsvc_NetFileCtr3_array;
+static gint hf_srvsvc_srvsvc_NetFileCtr3_count;
+static gint hf_srvsvc_srvsvc_NetFileCtr_ctr2;
+static gint hf_srvsvc_srvsvc_NetFileCtr_ctr3;
+static gint hf_srvsvc_srvsvc_NetFileEnum_info_ctr;
+static gint hf_srvsvc_srvsvc_NetFileEnum_max_buffer;
+static gint hf_srvsvc_srvsvc_NetFileEnum_path;
+static gint hf_srvsvc_srvsvc_NetFileEnum_resume_handle;
+static gint hf_srvsvc_srvsvc_NetFileEnum_server_unc;
+static gint hf_srvsvc_srvsvc_NetFileEnum_totalentries;
+static gint hf_srvsvc_srvsvc_NetFileEnum_user;
+static gint hf_srvsvc_srvsvc_NetFileGetInfo_fid;
+static gint hf_srvsvc_srvsvc_NetFileGetInfo_info;
+static gint hf_srvsvc_srvsvc_NetFileGetInfo_level;
+static gint hf_srvsvc_srvsvc_NetFileGetInfo_server_unc;
+static gint hf_srvsvc_srvsvc_NetFileInfo2_fid;
+static gint hf_srvsvc_srvsvc_NetFileInfo3_fid;
+static gint hf_srvsvc_srvsvc_NetFileInfo3_num_locks;
+static gint hf_srvsvc_srvsvc_NetFileInfo3_path;
+static gint hf_srvsvc_srvsvc_NetFileInfo3_permissions;
+static gint hf_srvsvc_srvsvc_NetFileInfo3_user;
+static gint hf_srvsvc_srvsvc_NetFileInfoCtr_ctr;
+static gint hf_srvsvc_srvsvc_NetFileInfoCtr_level;
+static gint hf_srvsvc_srvsvc_NetFileInfo_info2;
+static gint hf_srvsvc_srvsvc_NetFileInfo_info3;
+static gint hf_srvsvc_srvsvc_NetGetFileSecurity_file;
+static gint hf_srvsvc_srvsvc_NetGetFileSecurity_sd_buf;
+static gint hf_srvsvc_srvsvc_NetGetFileSecurity_securityinformation;
+static gint hf_srvsvc_srvsvc_NetGetFileSecurity_server_unc;
+static gint hf_srvsvc_srvsvc_NetGetFileSecurity_share;
+static gint hf_srvsvc_srvsvc_NetNameValidate_flags;
+static gint hf_srvsvc_srvsvc_NetNameValidate_name;
+static gint hf_srvsvc_srvsvc_NetNameValidate_name_type;
+static gint hf_srvsvc_srvsvc_NetNameValidate_server_unc;
+static gint hf_srvsvc_srvsvc_NetPRNameCompare_flags;
+static gint hf_srvsvc_srvsvc_NetPRNameCompare_name1;
+static gint hf_srvsvc_srvsvc_NetPRNameCompare_name2;
+static gint hf_srvsvc_srvsvc_NetPRNameCompare_name_type;
+static gint hf_srvsvc_srvsvc_NetPRNameCompare_server_unc;
+static gint hf_srvsvc_srvsvc_NetPathCanonicalize_can_path;
+static gint hf_srvsvc_srvsvc_NetPathCanonicalize_maxbuf;
+static gint hf_srvsvc_srvsvc_NetPathCanonicalize_path;
+static gint hf_srvsvc_srvsvc_NetPathCanonicalize_pathflags;
+static gint hf_srvsvc_srvsvc_NetPathCanonicalize_pathtype;
+static gint hf_srvsvc_srvsvc_NetPathCanonicalize_prefix;
+static gint hf_srvsvc_srvsvc_NetPathCanonicalize_server_unc;
+static gint hf_srvsvc_srvsvc_NetPathCompare_path1;
+static gint hf_srvsvc_srvsvc_NetPathCompare_path2;
+static gint hf_srvsvc_srvsvc_NetPathCompare_pathflags;
+static gint hf_srvsvc_srvsvc_NetPathCompare_pathtype;
+static gint hf_srvsvc_srvsvc_NetPathCompare_server_unc;
+static gint hf_srvsvc_srvsvc_NetPathType_path;
+static gint hf_srvsvc_srvsvc_NetPathType_pathflags;
+static gint hf_srvsvc_srvsvc_NetPathType_pathtype;
+static gint hf_srvsvc_srvsvc_NetPathType_server_unc;
+static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_day;
+static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_elapsed;
+static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_hours;
+static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_hunds;
+static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_mins;
+static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_month;
+static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_msecs;
+static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_secs;
+static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_timezone;
+static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_tinterval;
+static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_weekday;
+static gint hf_srvsvc_srvsvc_NetRemoteTODInfo_year;
+static gint hf_srvsvc_srvsvc_NetRemoteTOD_info;
+static gint hf_srvsvc_srvsvc_NetRemoteTOD_server_unc;
+static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_emulated_server_unc;
+static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_server_unc;
+static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_servicebits;
+static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_servicebitsofinterest;
+static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_transport;
+static gint hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_updateimmediately;
+static gint hf_srvsvc_srvsvc_NetServerStatisticsGet_level;
+static gint hf_srvsvc_srvsvc_NetServerStatisticsGet_options;
+static gint hf_srvsvc_srvsvc_NetServerStatisticsGet_server_unc;
+static gint hf_srvsvc_srvsvc_NetServerStatisticsGet_service;
+static gint hf_srvsvc_srvsvc_NetServerStatisticsGet_stats;
+static gint hf_srvsvc_srvsvc_NetServerTransportAddEx_info;
+static gint hf_srvsvc_srvsvc_NetServerTransportAddEx_level;
+static gint hf_srvsvc_srvsvc_NetServerTransportAddEx_server_unc;
+static gint hf_srvsvc_srvsvc_NetSessCtr0_array;
+static gint hf_srvsvc_srvsvc_NetSessCtr0_count;
+static gint hf_srvsvc_srvsvc_NetSessCtr10_array;
+static gint hf_srvsvc_srvsvc_NetSessCtr10_count;
+static gint hf_srvsvc_srvsvc_NetSessCtr1_array;
+static gint hf_srvsvc_srvsvc_NetSessCtr1_count;
+static gint hf_srvsvc_srvsvc_NetSessCtr2_array;
+static gint hf_srvsvc_srvsvc_NetSessCtr2_count;
+static gint hf_srvsvc_srvsvc_NetSessCtr502_array;
+static gint hf_srvsvc_srvsvc_NetSessCtr502_count;
+static gint hf_srvsvc_srvsvc_NetSessCtr_ctr0;
+static gint hf_srvsvc_srvsvc_NetSessCtr_ctr1;
+static gint hf_srvsvc_srvsvc_NetSessCtr_ctr10;
+static gint hf_srvsvc_srvsvc_NetSessCtr_ctr2;
+static gint hf_srvsvc_srvsvc_NetSessCtr_ctr502;
+static gint hf_srvsvc_srvsvc_NetSessDel_client;
+static gint hf_srvsvc_srvsvc_NetSessDel_server_unc;
+static gint hf_srvsvc_srvsvc_NetSessDel_user;
+static gint hf_srvsvc_srvsvc_NetSessEnum_client;
+static gint hf_srvsvc_srvsvc_NetSessEnum_info_ctr;
+static gint hf_srvsvc_srvsvc_NetSessEnum_max_buffer;
+static gint hf_srvsvc_srvsvc_NetSessEnum_resume_handle;
+static gint hf_srvsvc_srvsvc_NetSessEnum_server_unc;
+static gint hf_srvsvc_srvsvc_NetSessEnum_totalentries;
+static gint hf_srvsvc_srvsvc_NetSessEnum_user;
+static gint hf_srvsvc_srvsvc_NetSessInfo0_client;
+static gint hf_srvsvc_srvsvc_NetSessInfo10_client;
+static gint hf_srvsvc_srvsvc_NetSessInfo10_idle_time;
+static gint hf_srvsvc_srvsvc_NetSessInfo10_time;
+static gint hf_srvsvc_srvsvc_NetSessInfo10_user;
+static gint hf_srvsvc_srvsvc_NetSessInfo1_client;
+static gint hf_srvsvc_srvsvc_NetSessInfo1_idle_time;
+static gint hf_srvsvc_srvsvc_NetSessInfo1_num_open;
+static gint hf_srvsvc_srvsvc_NetSessInfo1_time;
+static gint hf_srvsvc_srvsvc_NetSessInfo1_user;
+static gint hf_srvsvc_srvsvc_NetSessInfo1_user_flags;
+static gint hf_srvsvc_srvsvc_NetSessInfo2_client;
+static gint hf_srvsvc_srvsvc_NetSessInfo2_client_type;
+static gint hf_srvsvc_srvsvc_NetSessInfo2_idle_time;
+static gint hf_srvsvc_srvsvc_NetSessInfo2_num_open;
+static gint hf_srvsvc_srvsvc_NetSessInfo2_time;
+static gint hf_srvsvc_srvsvc_NetSessInfo2_user;
+static gint hf_srvsvc_srvsvc_NetSessInfo2_user_flags;
+static gint hf_srvsvc_srvsvc_NetSessInfo502_client;
+static gint hf_srvsvc_srvsvc_NetSessInfo502_client_type;
+static gint hf_srvsvc_srvsvc_NetSessInfo502_idle_time;
+static gint hf_srvsvc_srvsvc_NetSessInfo502_num_open;
+static gint hf_srvsvc_srvsvc_NetSessInfo502_time;
+static gint hf_srvsvc_srvsvc_NetSessInfo502_transport;
+static gint hf_srvsvc_srvsvc_NetSessInfo502_user;
+static gint hf_srvsvc_srvsvc_NetSessInfo502_user_flags;
+static gint hf_srvsvc_srvsvc_NetSessInfoCtr_ctr;
+static gint hf_srvsvc_srvsvc_NetSessInfoCtr_level;
+static gint hf_srvsvc_srvsvc_NetSetFileSecurity_file;
+static gint hf_srvsvc_srvsvc_NetSetFileSecurity_sd_buf;
+static gint hf_srvsvc_srvsvc_NetSetFileSecurity_securityinformation;
+static gint hf_srvsvc_srvsvc_NetSetFileSecurity_server_unc;
+static gint hf_srvsvc_srvsvc_NetSetFileSecurity_share;
+static gint hf_srvsvc_srvsvc_NetSetServiceBits_server_unc;
+static gint hf_srvsvc_srvsvc_NetSetServiceBits_servicebits;
+static gint hf_srvsvc_srvsvc_NetSetServiceBits_transport;
+static gint hf_srvsvc_srvsvc_NetSetServiceBits_updateimmediately;
+static gint hf_srvsvc_srvsvc_NetShareAdd_info;
+static gint hf_srvsvc_srvsvc_NetShareAdd_level;
+static gint hf_srvsvc_srvsvc_NetShareAdd_parm_error;
+static gint hf_srvsvc_srvsvc_NetShareAdd_server_unc;
+static gint hf_srvsvc_srvsvc_NetShareCheck_device_name;
+static gint hf_srvsvc_srvsvc_NetShareCheck_server_unc;
+static gint hf_srvsvc_srvsvc_NetShareCheck_type;
+static gint hf_srvsvc_srvsvc_NetShareCtr0_array;
+static gint hf_srvsvc_srvsvc_NetShareCtr0_count;
+static gint hf_srvsvc_srvsvc_NetShareCtr1004_array;
+static gint hf_srvsvc_srvsvc_NetShareCtr1004_count;
+static gint hf_srvsvc_srvsvc_NetShareCtr1005_array;
+static gint hf_srvsvc_srvsvc_NetShareCtr1005_count;
+static gint hf_srvsvc_srvsvc_NetShareCtr1006_array;
+static gint hf_srvsvc_srvsvc_NetShareCtr1006_count;
+static gint hf_srvsvc_srvsvc_NetShareCtr1007_array;
+static gint hf_srvsvc_srvsvc_NetShareCtr1007_count;
+static gint hf_srvsvc_srvsvc_NetShareCtr1501_array;
+static gint hf_srvsvc_srvsvc_NetShareCtr1501_count;
+static gint hf_srvsvc_srvsvc_NetShareCtr1_array;
+static gint hf_srvsvc_srvsvc_NetShareCtr1_count;
+static gint hf_srvsvc_srvsvc_NetShareCtr2_array;
+static gint hf_srvsvc_srvsvc_NetShareCtr2_count;
+static gint hf_srvsvc_srvsvc_NetShareCtr501_array;
+static gint hf_srvsvc_srvsvc_NetShareCtr501_count;
+static gint hf_srvsvc_srvsvc_NetShareCtr502_array;
+static gint hf_srvsvc_srvsvc_NetShareCtr502_count;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr0;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1004;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1005;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1006;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1007;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr1501;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr2;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr501;
+static gint hf_srvsvc_srvsvc_NetShareCtr_ctr502;
+static gint hf_srvsvc_srvsvc_NetShareDelCommit_hnd;
+static gint hf_srvsvc_srvsvc_NetShareDelStart_hnd;
+static gint hf_srvsvc_srvsvc_NetShareDelStart_reserved;
+static gint hf_srvsvc_srvsvc_NetShareDelStart_server_unc;
+static gint hf_srvsvc_srvsvc_NetShareDelStart_share;
+static gint hf_srvsvc_srvsvc_NetShareDelSticky_reserved;
+static gint hf_srvsvc_srvsvc_NetShareDelSticky_server_unc;
+static gint hf_srvsvc_srvsvc_NetShareDelSticky_share_name;
+static gint hf_srvsvc_srvsvc_NetShareDel_reserved;
+static gint hf_srvsvc_srvsvc_NetShareDel_server_unc;
+static gint hf_srvsvc_srvsvc_NetShareDel_share_name;
+static gint hf_srvsvc_srvsvc_NetShareEnumAll_info_ctr;
+static gint hf_srvsvc_srvsvc_NetShareEnumAll_max_buffer;
+static gint hf_srvsvc_srvsvc_NetShareEnumAll_resume_handle;
+static gint hf_srvsvc_srvsvc_NetShareEnumAll_server_unc;
+static gint hf_srvsvc_srvsvc_NetShareEnumAll_totalentries;
+static gint hf_srvsvc_srvsvc_NetShareEnum_info_ctr;
+static gint hf_srvsvc_srvsvc_NetShareEnum_max_buffer;
+static gint hf_srvsvc_srvsvc_NetShareEnum_resume_handle;
+static gint hf_srvsvc_srvsvc_NetShareEnum_server_unc;
+static gint hf_srvsvc_srvsvc_NetShareEnum_totalentries;
+static gint hf_srvsvc_srvsvc_NetShareGetInfo_info;
+static gint hf_srvsvc_srvsvc_NetShareGetInfo_level;
+static gint hf_srvsvc_srvsvc_NetShareGetInfo_server_unc;
+static gint hf_srvsvc_srvsvc_NetShareGetInfo_share_name;
+static gint hf_srvsvc_srvsvc_NetShareInfo0_name;
+static gint hf_srvsvc_srvsvc_NetShareInfo1004_comment;
+static gint hf_srvsvc_srvsvc_NetShareInfo1005_dfs_flags;
+static gint hf_srvsvc_srvsvc_NetShareInfo1006_max_users;
+static gint hf_srvsvc_srvsvc_NetShareInfo1007_alternate_directory_name;
+static gint hf_srvsvc_srvsvc_NetShareInfo1007_flags;
+static gint hf_srvsvc_srvsvc_NetShareInfo1_comment;
+static gint hf_srvsvc_srvsvc_NetShareInfo1_name;
+static gint hf_srvsvc_srvsvc_NetShareInfo1_type;
+static gint hf_srvsvc_srvsvc_NetShareInfo2_comment;
+static gint hf_srvsvc_srvsvc_NetShareInfo2_current_users;
+static gint hf_srvsvc_srvsvc_NetShareInfo2_max_users;
+static gint hf_srvsvc_srvsvc_NetShareInfo2_name;
+static gint hf_srvsvc_srvsvc_NetShareInfo2_password;
+static gint hf_srvsvc_srvsvc_NetShareInfo2_path;
+static gint hf_srvsvc_srvsvc_NetShareInfo2_permissions;
+static gint hf_srvsvc_srvsvc_NetShareInfo2_type;
+static gint hf_srvsvc_srvsvc_NetShareInfo501_comment;
+static gint hf_srvsvc_srvsvc_NetShareInfo501_csc_policy;
+static gint hf_srvsvc_srvsvc_NetShareInfo501_name;
+static gint hf_srvsvc_srvsvc_NetShareInfo501_type;
+static gint hf_srvsvc_srvsvc_NetShareInfo502_comment;
+static gint hf_srvsvc_srvsvc_NetShareInfo502_current_users;
+static gint hf_srvsvc_srvsvc_NetShareInfo502_max_users;
+static gint hf_srvsvc_srvsvc_NetShareInfo502_name;
+static gint hf_srvsvc_srvsvc_NetShareInfo502_password;
+static gint hf_srvsvc_srvsvc_NetShareInfo502_path;
+static gint hf_srvsvc_srvsvc_NetShareInfo502_permissions;
+static gint hf_srvsvc_srvsvc_NetShareInfo502_sd_buf;
+static gint hf_srvsvc_srvsvc_NetShareInfo502_type;
+static gint hf_srvsvc_srvsvc_NetShareInfoCtr_ctr;
+static gint hf_srvsvc_srvsvc_NetShareInfoCtr_level;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info0;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info1;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info1004;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info1005;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info1006;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info1007;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info1501;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info2;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info501;
+static gint hf_srvsvc_srvsvc_NetShareInfo_info502;
+static gint hf_srvsvc_srvsvc_NetShareSetInfo_info;
+static gint hf_srvsvc_srvsvc_NetShareSetInfo_level;
+static gint hf_srvsvc_srvsvc_NetShareSetInfo_parm_error;
+static gint hf_srvsvc_srvsvc_NetShareSetInfo_server_unc;
+static gint hf_srvsvc_srvsvc_NetShareSetInfo_share_name;
+static gint hf_srvsvc_srvsvc_NetSrvGetInfo_info;
+static gint hf_srvsvc_srvsvc_NetSrvGetInfo_level;
+static gint hf_srvsvc_srvsvc_NetSrvGetInfo_server_unc;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1005_comment;
+static gint hf_srvsvc_srvsvc_NetSrvInfo100_platform_id;
+static gint hf_srvsvc_srvsvc_NetSrvInfo100_server_name;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1010_disc;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1016_hidden;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1017_announce;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1018_anndelta;
+static gint hf_srvsvc_srvsvc_NetSrvInfo101_comment;
+static gint hf_srvsvc_srvsvc_NetSrvInfo101_platform_id;
+static gint hf_srvsvc_srvsvc_NetSrvInfo101_server_name;
+static gint hf_srvsvc_srvsvc_NetSrvInfo101_server_type;
+static gint hf_srvsvc_srvsvc_NetSrvInfo101_version_major;
+static gint hf_srvsvc_srvsvc_NetSrvInfo101_version_minor;
+static gint hf_srvsvc_srvsvc_NetSrvInfo102_anndelta;
+static gint hf_srvsvc_srvsvc_NetSrvInfo102_announce;
+static gint hf_srvsvc_srvsvc_NetSrvInfo102_comment;
+static gint hf_srvsvc_srvsvc_NetSrvInfo102_disc;
+static gint hf_srvsvc_srvsvc_NetSrvInfo102_hidden;
+static gint hf_srvsvc_srvsvc_NetSrvInfo102_licenses;
+static gint hf_srvsvc_srvsvc_NetSrvInfo102_platform_id;
+static gint hf_srvsvc_srvsvc_NetSrvInfo102_server_name;
+static gint hf_srvsvc_srvsvc_NetSrvInfo102_server_type;
+static gint hf_srvsvc_srvsvc_NetSrvInfo102_userpath;
+static gint hf_srvsvc_srvsvc_NetSrvInfo102_users;
+static gint hf_srvsvc_srvsvc_NetSrvInfo102_version_major;
+static gint hf_srvsvc_srvsvc_NetSrvInfo102_version_minor;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1107_users;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1501_sessopens;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1502_sessvcs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1503_opensearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1506_maxworkitems;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1509_maxrawbuflen;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1510_sessusers;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1511_sesscons;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1512_maxnonpagedmemoryusage;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1513_maxpagedmemoryusage;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1514_enablesoftcompat;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1515_enableforcedlogoff;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1516_timesource;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1518_lmannounce;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1520_maxcopyreadlen;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1521_maxcopywritelen;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1522_minkeepsearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1523_maxkeepsearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1524_minkeepcomplsearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1525_maxkeepcomplsearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1528_scavtimeout;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1529_minrcvqueue;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1530_minfreeworkitems;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1533_maxmpxct;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1534_oplockbreakwait;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1535_oplockbreakresponsewait;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1536_enableoplocks;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1537_enableoplockforceclose;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1538_enablefcbopens;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1539_enableraw;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1540_enablesharednetdrives;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1541_minfreeconnections;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1542_maxfreeconnections;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1543_initsesstable;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1544_initconntable;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1545_initfiletable;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1546_initsearchtable;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1547_alertsched;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1548_errortreshold;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1549_networkerrortreshold;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1550_diskspacetreshold;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1552_maxlinkdelay;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1553_minlinkthroughput;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1554_linkinfovalidtime;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1555_scavqosinfoupdatetime;
+static gint hf_srvsvc_srvsvc_NetSrvInfo1556_maxworkitemidletime;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_accessalert;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_activelocks;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_alerts;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_alertsched;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_alist_mtime;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_chdevjobs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_chdevqs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_chdevs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_connections;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_diskalert;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_erroralert;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_glist_mtime;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_guestaccount;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_lanmask;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_logonalert;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_maxaudits;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_netioalert;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_numadmin;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_numbigbufs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_numfiletasks;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_numreqbufs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_openfiles;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_opensearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_security;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_sessopen;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_sessreqs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_sesssvc;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_shares;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_sizereqbufs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_srvheuristics;
+static gint hf_srvsvc_srvsvc_NetSrvInfo402_ulist_mtime;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_accessalert;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_activelocks;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_alerts;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_alertsched;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_alist_mtime;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_auditedevents;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_auditprofile;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_autopath;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_chdevjobs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_chdevqs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_chdevs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_connections;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_diskalert;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_erroralert;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_glist_mtime;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_guestaccount;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_lanmask;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_logonalert;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_maxaudits;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_netioalert;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_numadmin;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_numbigbufs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_numfiletasks;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_numreqbufs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_openfiles;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_opensearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_security;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_sessopen;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_sessreqs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_sesssvc;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_shares;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_sizereqbufs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_srvheuristics;
+static gint hf_srvsvc_srvsvc_NetSrvInfo403_ulist_mtime;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_acceptdownlevelapis;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_enableforcedlogoff;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_enablesoftcompat;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_initworkitems;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_irpstacksize;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_lmannounce;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_maxnonpagedmemoryusage;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_maxpagedmemoryusage;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_maxrawbuflen;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_maxworkitems;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_opensearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_rawworkitems;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_sessconns;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_sessopen;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_sesssvc;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_sessusers;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_sizereqbufs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo502_timesource;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_acceptdownlevelapis;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_domain;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_enablefcbopens;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_enableforcedlogoff;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_enableoplockforceclose;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_enableoplocks;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_enableraw;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_enablesharednetdrives;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_enablesoftcompat;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_initworkitems;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_irpstacksize;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_lmannounce;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxcopyreadlen;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxcopywritelen;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxfreeconnections;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxkeepcomplsearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxkeepsearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxmpxct;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxnonpagedmemoryusage;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxpagedmemoryusage;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxrawbuflen;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_maxworkitems;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_minfreeconnections;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_minfreeworkitems;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_minkeepcomplsearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_minkeepsearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_minrcvqueue;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_numlockthreads;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_opensearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_oplockbreakresponsewait;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_oplockbreakwait;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_rawworkitems;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_scavtimeout;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_sessconns;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_sessopen;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_sesssvc;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_sessusers;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_sizereqbufs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_threadcountadd;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_threadpriority;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_timesource;
+static gint hf_srvsvc_srvsvc_NetSrvInfo503_xactmemsize;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_acceptdownlevelapis;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_alertsched;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_diskspacetreshold;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_domain;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_enablefcbopens;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_enableforcedlogoff;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_enableoplockforceclose;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_enableoplocks;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_enableraw;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_enablesharednetdrives;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_enablesoftcompat;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_errortreshold;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_initconntable;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_initfiletable;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_initsearchtable;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_initsesstable;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_initworkitems;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_irpstacksize;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_linkinfovalidtime;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_lmannounce;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxcopyreadlen;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxcopywritelen;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxfreeconnections;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxkeepcomplsearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxlinkdelay;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxmpxct;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxnonpagedmemoryusage;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxpagedmemoryusage;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxrawbuflen;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxworkitemidletime;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_maxworkitems;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_minfreeconnections;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_minfreeworkitems;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_minkeepcomplsearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_minkeepsearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_minlinkthroughput;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_minrcvqueue;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_networkerrortreshold;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_numlockthreads;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_opensearch;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_oplockbreakresponsewait;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_oplockbreakwait;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_rawworkitems;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_reserved;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_scavqosinfoupdatetime;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_scavtimeout;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_sessconns;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_sessopen;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_sesssvc;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_sessusers;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_sizereqbufs;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_threadcountadd;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_threadpriority;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_timesource;
+static gint hf_srvsvc_srvsvc_NetSrvInfo599_xactmemsize;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info100;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1005;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info101;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1010;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1016;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1017;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1018;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info102;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1107;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1501;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1502;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1503;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1506;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1509;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1510;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1511;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1512;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1513;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1514;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1515;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1516;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1518;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1520;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1521;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1522;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1523;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1524;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1525;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1528;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1529;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1530;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1533;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1534;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1535;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1536;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1537;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1538;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1539;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1540;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1541;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1542;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1543;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1544;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1545;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1546;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1547;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1548;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1549;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1550;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1552;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1553;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1554;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1555;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info1556;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info402;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info403;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info502;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info503;
+static gint hf_srvsvc_srvsvc_NetSrvInfo_info599;
+static gint hf_srvsvc_srvsvc_NetSrvSetInfo_info;
+static gint hf_srvsvc_srvsvc_NetSrvSetInfo_level;
+static gint hf_srvsvc_srvsvc_NetSrvSetInfo_parm_error;
+static gint hf_srvsvc_srvsvc_NetSrvSetInfo_server_unc;
+static gint hf_srvsvc_srvsvc_NetTransportAdd_info;
+static gint hf_srvsvc_srvsvc_NetTransportAdd_level;
+static gint hf_srvsvc_srvsvc_NetTransportAdd_server_unc;
+static gint hf_srvsvc_srvsvc_NetTransportCtr0_array;
+static gint hf_srvsvc_srvsvc_NetTransportCtr0_count;
+static gint hf_srvsvc_srvsvc_NetTransportCtr1_array;
+static gint hf_srvsvc_srvsvc_NetTransportCtr1_count;
+static gint hf_srvsvc_srvsvc_NetTransportCtr2_array;
+static gint hf_srvsvc_srvsvc_NetTransportCtr2_count;
+static gint hf_srvsvc_srvsvc_NetTransportCtr3_array;
+static gint hf_srvsvc_srvsvc_NetTransportCtr3_count;
+static gint hf_srvsvc_srvsvc_NetTransportCtr_ctr0;
+static gint hf_srvsvc_srvsvc_NetTransportCtr_ctr1;
+static gint hf_srvsvc_srvsvc_NetTransportCtr_ctr2;
+static gint hf_srvsvc_srvsvc_NetTransportCtr_ctr3;
+static gint hf_srvsvc_srvsvc_NetTransportDel_info0;
+static gint hf_srvsvc_srvsvc_NetTransportDel_level;
+static gint hf_srvsvc_srvsvc_NetTransportDel_server_unc;
+static gint hf_srvsvc_srvsvc_NetTransportEnum_max_buffer;
+static gint hf_srvsvc_srvsvc_NetTransportEnum_resume_handle;
+static gint hf_srvsvc_srvsvc_NetTransportEnum_server_unc;
+static gint hf_srvsvc_srvsvc_NetTransportEnum_totalentries;
+static gint hf_srvsvc_srvsvc_NetTransportEnum_transports;
+static gint hf_srvsvc_srvsvc_NetTransportInfo0_addr;
+static gint hf_srvsvc_srvsvc_NetTransportInfo0_addr_len;
+static gint hf_srvsvc_srvsvc_NetTransportInfo0_name;
+static gint hf_srvsvc_srvsvc_NetTransportInfo0_net_addr;
+static gint hf_srvsvc_srvsvc_NetTransportInfo0_vcs;
+static gint hf_srvsvc_srvsvc_NetTransportInfo1_addr;
+static gint hf_srvsvc_srvsvc_NetTransportInfo1_addr_len;
+static gint hf_srvsvc_srvsvc_NetTransportInfo1_domain;
+static gint hf_srvsvc_srvsvc_NetTransportInfo1_name;
+static gint hf_srvsvc_srvsvc_NetTransportInfo1_net_addr;
+static gint hf_srvsvc_srvsvc_NetTransportInfo1_vcs;
+static gint hf_srvsvc_srvsvc_NetTransportInfo2_addr;
+static gint hf_srvsvc_srvsvc_NetTransportInfo2_addr_len;
+static gint hf_srvsvc_srvsvc_NetTransportInfo2_domain;
+static gint hf_srvsvc_srvsvc_NetTransportInfo2_name;
+static gint hf_srvsvc_srvsvc_NetTransportInfo2_net_addr;
+static gint hf_srvsvc_srvsvc_NetTransportInfo2_unknown;
+static gint hf_srvsvc_srvsvc_NetTransportInfo2_vcs;
+static gint hf_srvsvc_srvsvc_NetTransportInfo3_addr;
+static gint hf_srvsvc_srvsvc_NetTransportInfo3_addr_len;
+static gint hf_srvsvc_srvsvc_NetTransportInfo3_domain;
+static gint hf_srvsvc_srvsvc_NetTransportInfo3_name;
+static gint hf_srvsvc_srvsvc_NetTransportInfo3_net_addr;
+static gint hf_srvsvc_srvsvc_NetTransportInfo3_unknown1;
+static gint hf_srvsvc_srvsvc_NetTransportInfo3_unknown2;
+static gint hf_srvsvc_srvsvc_NetTransportInfo3_unknown3;
+static gint hf_srvsvc_srvsvc_NetTransportInfo3_vcs;
+static gint hf_srvsvc_srvsvc_NetTransportInfoCtr_ctr;
+static gint hf_srvsvc_srvsvc_NetTransportInfoCtr_level;
+static gint hf_srvsvc_srvsvc_NetTransportInfo_info0;
+static gint hf_srvsvc_srvsvc_NetTransportInfo_info1;
+static gint hf_srvsvc_srvsvc_NetTransportInfo_info2;
+static gint hf_srvsvc_srvsvc_NetTransportInfo_info3;
+static gint hf_srvsvc_srvsvc_Statistics_avresponse;
+static gint hf_srvsvc_srvsvc_Statistics_bigbufneed;
+static gint hf_srvsvc_srvsvc_Statistics_bytesrcvd_high;
+static gint hf_srvsvc_srvsvc_Statistics_bytesrcvd_low;
+static gint hf_srvsvc_srvsvc_Statistics_bytessent_high;
+static gint hf_srvsvc_srvsvc_Statistics_bytessent_low;
+static gint hf_srvsvc_srvsvc_Statistics_devopens;
+static gint hf_srvsvc_srvsvc_Statistics_fopens;
+static gint hf_srvsvc_srvsvc_Statistics_jobsqueued;
+static gint hf_srvsvc_srvsvc_Statistics_permerrors;
+static gint hf_srvsvc_srvsvc_Statistics_pwerrors;
+static gint hf_srvsvc_srvsvc_Statistics_reqbufneed;
+static gint hf_srvsvc_srvsvc_Statistics_serrorout;
+static gint hf_srvsvc_srvsvc_Statistics_sopens;
+static gint hf_srvsvc_srvsvc_Statistics_start;
+static gint hf_srvsvc_srvsvc_Statistics_stimeouts;
+static gint hf_srvsvc_srvsvc_Statistics_syserrors;
+static gint hf_srvsvc_werror;
+
+static gint proto_dcerpc_srvsvc;
 /* Version information */
 
 
diff --git a/epan/dissectors/packet-dcerpc-tapi.c b/epan/dissectors/packet-dcerpc-tapi.c
index fe0c992aa2..b0d660a5eb 100644
--- a/epan/dissectors/packet-dcerpc-tapi.c
+++ b/epan/dissectors/packet-dcerpc-tapi.c
@@ -23,15 +23,15 @@
 void proto_register_dcerpc_tapi(void);
 void proto_reg_handoff_dcerpc_tapi(void);
 
-static int proto_dcerpc_tapi = -1;
-static int hf_tapi_opnum = -1;
-static int hf_tapi_rc = -1;
-static int hf_tapi_hnd = -1;
-static int hf_tapi_unknown_long = -1;
-static int hf_tapi_unknown_string = -1;
-static int hf_tapi_unknown_bytes = -1;
-
-static gint ett_dcerpc_tapi = -1;
+static int proto_dcerpc_tapi;
+static int hf_tapi_opnum;
+static int hf_tapi_rc;
+static int hf_tapi_hnd;
+static int hf_tapi_unknown_long;
+static int hf_tapi_unknown_string;
+static int hf_tapi_unknown_bytes;
+
+static gint ett_dcerpc_tapi;
 
 /*
   IDL [ uuid(2f5f6520-ca46-1067-b319-00dd010662da),
diff --git a/epan/dissectors/packet-dcerpc-taskschedulerservice.c b/epan/dissectors/packet-dcerpc-taskschedulerservice.c
index 098890206e..322569d2a4 100644
--- a/epan/dissectors/packet-dcerpc-taskschedulerservice.c
+++ b/epan/dissectors/packet-dcerpc-taskschedulerservice.c
@@ -17,12 +17,12 @@
 void proto_register_dcerpc_taskschedulerservice(void);
 void proto_reg_handoff_dcerpc_taskschedulerservice(void);
 
-static int hf_taskschedulerservice_opnum = -1;
+static int hf_taskschedulerservice_opnum;
 
 static e_guid_t uuid_taskschedulerservice = {0x86d35949, 0x83c9, 0x4044, {0xb4, 0x24, 0xdb, 0x36, 0x32, 0x31, 0xfd, 0x0c}};
 static guint16 ver_taskschedulerservice = 1;
-static gint ett_taskschedulerservice = -1;
-static int proto_taskschedulerservice = -1;
+static gint ett_taskschedulerservice;
+static int proto_taskschedulerservice;
 
 /* sub dissector table of ITaskSchedulerService interface */
 static dcerpc_sub_dissector taskschedulerservice_dissectors[] = {
diff --git a/epan/dissectors/packet-dcerpc-tkn4int.c b/epan/dissectors/packet-dcerpc-tkn4int.c
index 1b51140387..31b9d77baa 100644
--- a/epan/dissectors/packet-dcerpc-tkn4int.c
+++ b/epan/dissectors/packet-dcerpc-tkn4int.c
@@ -21,11 +21,11 @@
 void proto_register_tkn4int (void);
 void proto_reg_handoff_tkn4int (void);
 
-static int proto_tkn4int = -1;
-static int hf_tkn4int_opnum = -1;
+static int proto_tkn4int;
+static int hf_tkn4int_opnum;
 
 
-static gint ett_tkn4int = -1;
+static gint ett_tkn4int;
 
 
 static e_guid_t uuid_tkn4int = { 0x4d37f2dd, 0xed96, 0x0000, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00 } };
diff --git a/epan/dissectors/packet-dcerpc-trksvr.c b/epan/dissectors/packet-dcerpc-trksvr.c
index 6ae4aa192c..ff1bb7a463 100644
--- a/epan/dissectors/packet-dcerpc-trksvr.c
+++ b/epan/dissectors/packet-dcerpc-trksvr.c
@@ -20,11 +20,11 @@
 void proto_register_dcerpc_trksvr(void);
 void proto_reg_handoff_dcerpc_trksvr(void);
 
-static int proto_dcerpc_trksvr = -1;
-static int hf_trksvr_opnum = -1;
-/* static int hf_trksvr_rc = -1; */
+static int proto_dcerpc_trksvr;
+static int hf_trksvr_opnum;
+/* static int hf_trksvr_rc; */
 
-static gint ett_dcerpc_trksvr = -1;
+static gint ett_dcerpc_trksvr;
 
 /*
   IDL [ uuid(4da1-943d-11d1-acae-00c0afc2aa3f),
diff --git a/epan/dissectors/packet-dcerpc-ubikdisk.c b/epan/dissectors/packet-dcerpc-ubikdisk.c
index d42e9ba801..bccc84e440 100644
--- a/epan/dissectors/packet-dcerpc-ubikdisk.c
+++ b/epan/dissectors/packet-dcerpc-ubikdisk.c
@@ -21,11 +21,11 @@
 void proto_register_ubikdisk (void);
 void proto_reg_handoff_ubikdisk (void);
 
-static int proto_ubikdisk = -1;
-static int hf_ubikdisk_opnum = -1;
+static int proto_ubikdisk;
+static int hf_ubikdisk_opnum;
 
 
-static gint ett_ubikdisk = -1;
+static gint ett_ubikdisk;
 
 
 static e_guid_t uuid_ubikdisk = { 0x4d37f2dd, 0xed43, 0x0002, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00 } };
diff --git a/epan/dissectors/packet-dcerpc-ubikvote.c b/epan/dissectors/packet-dcerpc-ubikvote.c
index 25b901113a..8f5f097dfc 100644
--- a/epan/dissectors/packet-dcerpc-ubikvote.c
+++ b/epan/dissectors/packet-dcerpc-ubikvote.c
@@ -21,11 +21,11 @@
 void proto_register_ubikvote (void);
 void proto_reg_handoff_ubikvote (void);
 
-static int proto_ubikvote = -1;
-static int hf_ubikvote_opnum = -1;
+static int proto_ubikvote;
+static int hf_ubikvote_opnum;
 
 
-static gint ett_ubikvote = -1;
+static gint ett_ubikvote;
 
 
 static e_guid_t uuid_ubikvote = { 0x4d37f2dd, 0xed43, 0x0003, { 0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x00, 0x00 } };
diff --git a/epan/dissectors/packet-dcerpc-update.c b/epan/dissectors/packet-dcerpc-update.c
index ecea8ec764..de51a697c6 100644
--- a/epan/dissectors/packet-dcerpc-update.c
+++ b/epan/dissectors/packet-dcerpc-update.c
@@ -21,10 +21,10 @@
 void proto_register_dce_update(void);
 void proto_reg_handoff_dce_update(void);
 
-static int proto_dce_update = -1;
-static int hf_dce_update_opnum = -1;
+static int proto_dce_update;
+static int hf_dce_update_opnum;
 
-static gint ett_dce_update = -1;
+static gint ett_dce_update;
 
 static e_guid_t uuid_dce_update =
   { 0x4d37f2dd, 0xed43, 0x0000, {0x02, 0xc0, 0x37, 0xcf, 0x1e, 0x00, 0x10,
diff --git a/epan/dissectors/packet-dcerpc-wkssvc.c b/epan/dissectors/packet-dcerpc-wkssvc.c
index 0ca06cd0fd..6a362b1e45 100644
--- a/epan/dissectors/packet-dcerpc-wkssvc.c
+++ b/epan/dissectors/packet-dcerpc-wkssvc.c
@@ -22,453 +22,453 @@ void proto_register_dcerpc_wkssvc(void);
 void proto_reg_handoff_dcerpc_wkssvc(void);
 
 /* Ett declarations */
-static gint ett_dcerpc_wkssvc = -1;
-static gint ett_wkssvc_lsa_String = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo100 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo101 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo102 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo502 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1010 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1011 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1012 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1013 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1018 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1023 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1027 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1028 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1032 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1033 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1041 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1042 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1043 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1044 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1045 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1046 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1047 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1048 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1049 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1050 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1051 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1052 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1053 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1054 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1055 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1056 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1057 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1058 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1059 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1060 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1061 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo1062 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaInfo = -1;
-static gint ett_wkssvc_wkssvc_NetrWkstaUserInfo0 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaEnumUsersCtr0 = -1;
-static gint ett_wkssvc_wkssvc_NetrWkstaUserInfo1 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaEnumUsersCtr1 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaEnumUsersCtr = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaEnumUsersInfo = -1;
-static gint ett_wkssvc_wkssvc_NetrWkstaUserInfo1101 = -1;
-static gint ett_wkssvc_wkssvc_NetrWkstaUserInfo = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaTransportInfo0 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaTransportCtr0 = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaTransportCtr = -1;
-static gint ett_wkssvc_wkssvc_NetWkstaTransportInfo = -1;
-static gint ett_wkssvc_wkssvc_NetrUseInfo3 = -1;
-static gint ett_wkssvc_wkssvc_NetrUseInfo2 = -1;
-static gint ett_wkssvc_wkssvc_NetrUseInfo1 = -1;
-static gint ett_wkssvc_wkssvc_NetrUseInfo0 = -1;
-static gint ett_wkssvc_wkssvc_NetrUseGetInfoCtr = -1;
-static gint ett_wkssvc_wkssvc_NetrUseEnumCtr2 = -1;
-static gint ett_wkssvc_wkssvc_NetrUseEnumCtr1 = -1;
-static gint ett_wkssvc_wkssvc_NetrUseEnumCtr0 = -1;
-static gint ett_wkssvc_wkssvc_NetrUseEnumCtr = -1;
-static gint ett_wkssvc_wkssvc_NetrUseEnumInfo = -1;
-static gint ett_wkssvc_wkssvc_NetrWorkstationStatistics = -1;
-static gint ett_wkssvc_wkssvc_renameflags = -1;
-static gint ett_wkssvc_wkssvc_PasswordBuffer = -1;
-static gint ett_wkssvc_wkssvc_joinflags = -1;
-static gint ett_wkssvc_wkssvc_ComputerNamesCtr = -1;
+static gint ett_dcerpc_wkssvc;
+static gint ett_wkssvc_lsa_String;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo100;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo101;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo102;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo502;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1010;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1011;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1012;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1013;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1018;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1023;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1027;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1028;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1032;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1033;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1041;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1042;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1043;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1044;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1045;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1046;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1047;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1048;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1049;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1050;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1051;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1052;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1053;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1054;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1055;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1056;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1057;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1058;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1059;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1060;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1061;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo1062;
+static gint ett_wkssvc_wkssvc_NetWkstaInfo;
+static gint ett_wkssvc_wkssvc_NetrWkstaUserInfo0;
+static gint ett_wkssvc_wkssvc_NetWkstaEnumUsersCtr0;
+static gint ett_wkssvc_wkssvc_NetrWkstaUserInfo1;
+static gint ett_wkssvc_wkssvc_NetWkstaEnumUsersCtr1;
+static gint ett_wkssvc_wkssvc_NetWkstaEnumUsersCtr;
+static gint ett_wkssvc_wkssvc_NetWkstaEnumUsersInfo;
+static gint ett_wkssvc_wkssvc_NetrWkstaUserInfo1101;
+static gint ett_wkssvc_wkssvc_NetrWkstaUserInfo;
+static gint ett_wkssvc_wkssvc_NetWkstaTransportInfo0;
+static gint ett_wkssvc_wkssvc_NetWkstaTransportCtr0;
+static gint ett_wkssvc_wkssvc_NetWkstaTransportCtr;
+static gint ett_wkssvc_wkssvc_NetWkstaTransportInfo;
+static gint ett_wkssvc_wkssvc_NetrUseInfo3;
+static gint ett_wkssvc_wkssvc_NetrUseInfo2;
+static gint ett_wkssvc_wkssvc_NetrUseInfo1;
+static gint ett_wkssvc_wkssvc_NetrUseInfo0;
+static gint ett_wkssvc_wkssvc_NetrUseGetInfoCtr;
+static gint ett_wkssvc_wkssvc_NetrUseEnumCtr2;
+static gint ett_wkssvc_wkssvc_NetrUseEnumCtr1;
+static gint ett_wkssvc_wkssvc_NetrUseEnumCtr0;
+static gint ett_wkssvc_wkssvc_NetrUseEnumCtr;
+static gint ett_wkssvc_wkssvc_NetrUseEnumInfo;
+static gint ett_wkssvc_wkssvc_NetrWorkstationStatistics;
+static gint ett_wkssvc_wkssvc_renameflags;
+static gint ett_wkssvc_wkssvc_PasswordBuffer;
+static gint ett_wkssvc_wkssvc_joinflags;
+static gint ett_wkssvc_wkssvc_ComputerNamesCtr;
 
 
 /* Header field declarations */
-static gint hf_wkssvc_lsa_String_name = -1;
-static gint hf_wkssvc_lsa_String_name_len = -1;
-static gint hf_wkssvc_lsa_String_name_size = -1;
-static gint hf_wkssvc_opnum = -1;
-static gint hf_wkssvc_platform_id = -1;
-static gint hf_wkssvc_werror = -1;
-static gint hf_wkssvc_wkssvc_ComputerNamesCtr_computer_name = -1;
-static gint hf_wkssvc_wkssvc_ComputerNamesCtr_count = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr0_entries_read = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr0_user0 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr1_entries_read = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr1_user1 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_user0 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_user1 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersInfo_ctr = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersInfo_level = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaEnumUsers_entries_read = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaEnumUsers_info = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaEnumUsers_prefmaxlen = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaEnumUsers_resume_handle = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaEnumUsers_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaGetInfo_info = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaGetInfo_level = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaGetInfo_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo100_domain_name = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo100_platform_id = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo100_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo100_version_major = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo100_version_minor = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1010_char_wait = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1011_collection_time = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1012_maximum_collection_count = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1013_keep_connection = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1018_session_timeout = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo101_domain_name = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo101_lan_root = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo101_platform_id = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo101_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo101_version_major = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo101_version_minor = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1023_size_char_buf = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1027_errorlog_sz = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1028_print_buf_time = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo102_domain_name = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo102_lan_root = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo102_logged_on_users = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo102_platform_id = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo102_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo102_version_major = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo102_version_minor = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1032_wrk_heuristics = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1033_max_threads = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1041_lock_quota = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1042_lock_increment = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1043_lock_maximum = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1044_pipe_increment = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1045_pipe_maximum = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1046_dormant_file_limit = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1047_cache_file_timeout = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1048_use_opportunistic_locking = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1049_use_unlock_behind = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1050_use_close_behind = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1051_buf_named_pipes = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1052_use_lock_read_unlock = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1053_utilize_nt_caching = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1054_use_raw_read = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1055_use_raw_write = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1056_use_write_raw_data = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1057_use_encryption = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1058_buf_files_deny_write = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1059_buf_read_only_files = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1060_force_core_create_mode = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1061_use_512_byte_max_transfer = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo1062_read_ahead_throughput = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_buf_files_deny_write = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_buf_named_pipes = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_buf_read_only_files = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_cache_file_timeout = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_char_wait = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_collection_time = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_dgram_event_reset_freq = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_dormant_file_limit = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_force_core_create_mode = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_keep_connection = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_lock_increment = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_lock_maximum = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_lock_quota = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_log_election_packets = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_max_commands = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_max_illegal_dgram_events = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_max_threads = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_maximum_collection_count = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_num_mailslot_buffers = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_num_srv_announce_buffers = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_pipe_increment = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_pipe_maximum = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_read_ahead_throughput = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_session_timeout = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_size_char_buf = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_512_byte_max_transfer = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_close_behind = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_encryption = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_lock_read_unlock = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_opportunistic_locking = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_raw_read = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_raw_write = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_unlock_behind = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_write_raw_data = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo502_utilize_nt_caching = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info100 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info101 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1010 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1011 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1012 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1013 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1018 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info102 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1023 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1027 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1028 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1032 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1033 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1041 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1042 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1043 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1044 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1045 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1046 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1047 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1048 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1049 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1050 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1051 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1052 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1053 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1054 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1055 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1056 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1057 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1058 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1059 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1060 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1061 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1062 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaInfo_info502 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaSetInfo_info = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaSetInfo_level = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaSetInfo_parm_error = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaSetInfo_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportCtr0_array = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportCtr0_count = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportCtr_ctr0 = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportEnum_info = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportEnum_max_buffer = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportEnum_resume_handle = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportEnum_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportEnum_total_entries = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo0_address = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo0_name = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo0_quality_of_service = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo0_vc_count = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo0_wan_link = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo_ctr = -1;
-static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo_level = -1;
-static gint hf_wkssvc_wkssvc_NetrAddAlternateComputerName_Account = -1;
-static gint hf_wkssvc_wkssvc_NetrAddAlternateComputerName_EncryptedPassword = -1;
-static gint hf_wkssvc_wkssvc_NetrAddAlternateComputerName_NewAlternateMachineName = -1;
-static gint hf_wkssvc_wkssvc_NetrAddAlternateComputerName_Reserved = -1;
-static gint hf_wkssvc_wkssvc_NetrAddAlternateComputerName_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrEnumerateComputerNames_Reserved = -1;
-static gint hf_wkssvc_wkssvc_NetrEnumerateComputerNames_ctr = -1;
-static gint hf_wkssvc_wkssvc_NetrEnumerateComputerNames_name_type = -1;
-static gint hf_wkssvc_wkssvc_NetrEnumerateComputerNames_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrGetJoinInformation_name_buffer = -1;
-static gint hf_wkssvc_wkssvc_NetrGetJoinInformation_name_type = -1;
-static gint hf_wkssvc_wkssvc_NetrGetJoinInformation_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_Account = -1;
-static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_EncryptedPassword = -1;
-static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_domain_name = -1;
-static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_num_ous = -1;
-static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_ous = -1;
-static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_Account = -1;
-static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_domain_name = -1;
-static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_num_ous = -1;
-static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_ous = -1;
-static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_unknown = -1;
-static gint hf_wkssvc_wkssvc_NetrJoinDomain2_account_name = -1;
-static gint hf_wkssvc_wkssvc_NetrJoinDomain2_admin_account = -1;
-static gint hf_wkssvc_wkssvc_NetrJoinDomain2_domain_name = -1;
-static gint hf_wkssvc_wkssvc_NetrJoinDomain2_encrypted_password = -1;
-static gint hf_wkssvc_wkssvc_NetrJoinDomain2_join_flags = -1;
-static gint hf_wkssvc_wkssvc_NetrJoinDomain2_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrJoinDomain_Account = -1;
-static gint hf_wkssvc_wkssvc_NetrJoinDomain_account_ou = -1;
-static gint hf_wkssvc_wkssvc_NetrJoinDomain_domain_name = -1;
-static gint hf_wkssvc_wkssvc_NetrJoinDomain_join_flags = -1;
-static gint hf_wkssvc_wkssvc_NetrJoinDomain_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrJoinDomain_unknown = -1;
-static gint hf_wkssvc_wkssvc_NetrLogonDomainNameAdd_domain_name = -1;
-static gint hf_wkssvc_wkssvc_NetrLogonDomainNameDel_domain_name = -1;
-static gint hf_wkssvc_wkssvc_NetrMessageBufferSend_message_buffer = -1;
-static gint hf_wkssvc_wkssvc_NetrMessageBufferSend_message_name = -1;
-static gint hf_wkssvc_wkssvc_NetrMessageBufferSend_message_sender_name = -1;
-static gint hf_wkssvc_wkssvc_NetrMessageBufferSend_message_size = -1;
-static gint hf_wkssvc_wkssvc_NetrMessageBufferSend_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_Account = -1;
-static gint hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_AlternateMachineNameToRemove = -1;
-static gint hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_EncryptedPassword = -1;
-static gint hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_Reserved = -1;
-static gint hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_Account = -1;
-static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_EncryptedPassword = -1;
-static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_NewMachineName = -1;
-static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_RenameOptions = -1;
-static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain_Account = -1;
-static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain_NewMachineName = -1;
-static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain_RenameOptions = -1;
-static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain_password = -1;
-static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrSetPrimaryComputername_Account = -1;
-static gint hf_wkssvc_wkssvc_NetrSetPrimaryComputername_EncryptedPassword = -1;
-static gint hf_wkssvc_wkssvc_NetrSetPrimaryComputername_Reserved = -1;
-static gint hf_wkssvc_wkssvc_NetrSetPrimaryComputername_primary_name = -1;
-static gint hf_wkssvc_wkssvc_NetrSetPrimaryComputername_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrUnjoinDomain2_account = -1;
-static gint hf_wkssvc_wkssvc_NetrUnjoinDomain2_encrypted_password = -1;
-static gint hf_wkssvc_wkssvc_NetrUnjoinDomain2_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrUnjoinDomain2_unjoin_flags = -1;
-static gint hf_wkssvc_wkssvc_NetrUnjoinDomain_Account = -1;
-static gint hf_wkssvc_wkssvc_NetrUnjoinDomain_password = -1;
-static gint hf_wkssvc_wkssvc_NetrUnjoinDomain_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrUnjoinDomain_unjoin_flags = -1;
-static gint hf_wkssvc_wkssvc_NetrUseAdd_ctr = -1;
-static gint hf_wkssvc_wkssvc_NetrUseAdd_level = -1;
-static gint hf_wkssvc_wkssvc_NetrUseAdd_parm_err = -1;
-static gint hf_wkssvc_wkssvc_NetrUseAdd_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrUseDel_force_cond = -1;
-static gint hf_wkssvc_wkssvc_NetrUseDel_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrUseDel_use_name = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnumCtr0_array = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnumCtr0_count = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnumCtr1_array = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnumCtr1_count = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnumCtr2_array = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnumCtr2_count = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr0 = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr1 = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr2 = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnumInfo_ctr = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnumInfo_level = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnum_entries_read = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnum_info = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnum_prefmaxlen = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnum_resume_handle = -1;
-static gint hf_wkssvc_wkssvc_NetrUseEnum_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info0 = -1;
-static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info1 = -1;
-static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info2 = -1;
-static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info3 = -1;
-static gint hf_wkssvc_wkssvc_NetrUseGetInfo_ctr = -1;
-static gint hf_wkssvc_wkssvc_NetrUseGetInfo_level = -1;
-static gint hf_wkssvc_wkssvc_NetrUseGetInfo_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrUseGetInfo_use_name = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo0_local = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo0_remote = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo1_asg_type = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo1_local = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo1_password = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo1_ref_count = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo1_remote = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo1_status = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo1_use_count = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo2_asg_type = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo2_domain_name = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo2_local = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo2_password = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo2_ref_count = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo2_remote = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo2_status = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo2_use_count = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo2_user_name = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo3_unknown1 = -1;
-static gint hf_wkssvc_wkssvc_NetrUseInfo3_unknown2 = -1;
-static gint hf_wkssvc_wkssvc_NetrValidateName2_Account = -1;
-static gint hf_wkssvc_wkssvc_NetrValidateName2_EncryptedPassword = -1;
-static gint hf_wkssvc_wkssvc_NetrValidateName2_name = -1;
-static gint hf_wkssvc_wkssvc_NetrValidateName2_name_type = -1;
-static gint hf_wkssvc_wkssvc_NetrValidateName2_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrValidateName_Account = -1;
-static gint hf_wkssvc_wkssvc_NetrValidateName_Password = -1;
-static gint hf_wkssvc_wkssvc_NetrValidateName_name = -1;
-static gint hf_wkssvc_wkssvc_NetrValidateName_name_type = -1;
-static gint hf_wkssvc_wkssvc_NetrValidateName_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaTransportAdd_info0 = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaTransportAdd_level = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaTransportAdd_parm_err = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaTransportAdd_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaTransportDel_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaTransportDel_transport_name = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaTransportDel_unknown3 = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserGetInfo_info = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserGetInfo_level = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserGetInfo_unknown = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo0_user_name = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo1101_other_domains = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo1_logon_domain = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo1_logon_server = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo1_other_domains = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo1_user_name = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo_info0 = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo_info1 = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo_info1101 = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_info = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_level = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_parm_err = -1;
-static gint hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_unknown = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_info = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_server_name = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_unknown2 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_unknown3 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_unknown4 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown1 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown10 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown11 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown12 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown13 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown14 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown15 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown16 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown17 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown18 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown19 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown2 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown20 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown21 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown22 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown23 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown24 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown25 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown26 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown27 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown28 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown29 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown3 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown30 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown31 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown32 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown33 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown34 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown35 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown36 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown37 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown38 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown39 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown4 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown40 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown5 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown6 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown7 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown8 = -1;
-static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown9 = -1;
-static gint hf_wkssvc_wkssvc_PasswordBuffer_data = -1;
-static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE = -1;
-static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE = -1;
-static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_DEFER_SPN = -1;
-static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED = -1;
-static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_DC_ACCOUNT = -1;
-static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_TYPE = -1;
-static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_UNSECURE = -1;
-static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_WITH_NEW_NAME = -1;
-static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_MACHINE_PWD_PASSED = -1;
-static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_WIN9X_UPGRADE = -1;
-static gint hf_wkssvc_wkssvc_renameflags_WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE = -1;
-
-static gint proto_dcerpc_wkssvc = -1;
+static gint hf_wkssvc_lsa_String_name;
+static gint hf_wkssvc_lsa_String_name_len;
+static gint hf_wkssvc_lsa_String_name_size;
+static gint hf_wkssvc_opnum;
+static gint hf_wkssvc_platform_id;
+static gint hf_wkssvc_werror;
+static gint hf_wkssvc_wkssvc_ComputerNamesCtr_computer_name;
+static gint hf_wkssvc_wkssvc_ComputerNamesCtr_count;
+static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr0_entries_read;
+static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr0_user0;
+static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr1_entries_read;
+static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr1_user1;
+static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_user0;
+static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_user1;
+static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersInfo_ctr;
+static gint hf_wkssvc_wkssvc_NetWkstaEnumUsersInfo_level;
+static gint hf_wkssvc_wkssvc_NetWkstaEnumUsers_entries_read;
+static gint hf_wkssvc_wkssvc_NetWkstaEnumUsers_info;
+static gint hf_wkssvc_wkssvc_NetWkstaEnumUsers_prefmaxlen;
+static gint hf_wkssvc_wkssvc_NetWkstaEnumUsers_resume_handle;
+static gint hf_wkssvc_wkssvc_NetWkstaEnumUsers_server_name;
+static gint hf_wkssvc_wkssvc_NetWkstaGetInfo_info;
+static gint hf_wkssvc_wkssvc_NetWkstaGetInfo_level;
+static gint hf_wkssvc_wkssvc_NetWkstaGetInfo_server_name;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo100_domain_name;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo100_platform_id;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo100_server_name;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo100_version_major;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo100_version_minor;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1010_char_wait;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1011_collection_time;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1012_maximum_collection_count;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1013_keep_connection;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1018_session_timeout;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo101_domain_name;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo101_lan_root;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo101_platform_id;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo101_server_name;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo101_version_major;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo101_version_minor;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1023_size_char_buf;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1027_errorlog_sz;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1028_print_buf_time;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo102_domain_name;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo102_lan_root;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo102_logged_on_users;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo102_platform_id;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo102_server_name;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo102_version_major;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo102_version_minor;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1032_wrk_heuristics;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1033_max_threads;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1041_lock_quota;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1042_lock_increment;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1043_lock_maximum;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1044_pipe_increment;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1045_pipe_maximum;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1046_dormant_file_limit;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1047_cache_file_timeout;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1048_use_opportunistic_locking;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1049_use_unlock_behind;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1050_use_close_behind;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1051_buf_named_pipes;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1052_use_lock_read_unlock;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1053_utilize_nt_caching;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1054_use_raw_read;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1055_use_raw_write;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1056_use_write_raw_data;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1057_use_encryption;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1058_buf_files_deny_write;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1059_buf_read_only_files;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1060_force_core_create_mode;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1061_use_512_byte_max_transfer;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo1062_read_ahead_throughput;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_buf_files_deny_write;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_buf_named_pipes;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_buf_read_only_files;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_cache_file_timeout;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_char_wait;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_collection_time;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_dgram_event_reset_freq;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_dormant_file_limit;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_force_core_create_mode;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_keep_connection;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_lock_increment;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_lock_maximum;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_lock_quota;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_log_election_packets;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_max_commands;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_max_illegal_dgram_events;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_max_threads;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_maximum_collection_count;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_num_mailslot_buffers;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_num_srv_announce_buffers;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_pipe_increment;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_pipe_maximum;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_read_ahead_throughput;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_session_timeout;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_size_char_buf;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_512_byte_max_transfer;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_close_behind;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_encryption;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_lock_read_unlock;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_opportunistic_locking;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_raw_read;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_raw_write;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_unlock_behind;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_use_write_raw_data;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo502_utilize_nt_caching;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info100;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info101;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1010;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1011;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1012;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1013;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1018;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info102;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1023;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1027;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1028;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1032;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1033;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1041;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1042;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1043;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1044;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1045;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1046;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1047;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1048;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1049;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1050;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1051;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1052;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1053;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1054;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1055;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1056;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1057;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1058;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1059;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1060;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1061;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info1062;
+static gint hf_wkssvc_wkssvc_NetWkstaInfo_info502;
+static gint hf_wkssvc_wkssvc_NetWkstaSetInfo_info;
+static gint hf_wkssvc_wkssvc_NetWkstaSetInfo_level;
+static gint hf_wkssvc_wkssvc_NetWkstaSetInfo_parm_error;
+static gint hf_wkssvc_wkssvc_NetWkstaSetInfo_server_name;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportCtr0_array;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportCtr0_count;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportCtr_ctr0;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportEnum_info;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportEnum_max_buffer;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportEnum_resume_handle;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportEnum_server_name;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportEnum_total_entries;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo0_address;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo0_name;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo0_quality_of_service;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo0_vc_count;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo0_wan_link;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo_ctr;
+static gint hf_wkssvc_wkssvc_NetWkstaTransportInfo_level;
+static gint hf_wkssvc_wkssvc_NetrAddAlternateComputerName_Account;
+static gint hf_wkssvc_wkssvc_NetrAddAlternateComputerName_EncryptedPassword;
+static gint hf_wkssvc_wkssvc_NetrAddAlternateComputerName_NewAlternateMachineName;
+static gint hf_wkssvc_wkssvc_NetrAddAlternateComputerName_Reserved;
+static gint hf_wkssvc_wkssvc_NetrAddAlternateComputerName_server_name;
+static gint hf_wkssvc_wkssvc_NetrEnumerateComputerNames_Reserved;
+static gint hf_wkssvc_wkssvc_NetrEnumerateComputerNames_ctr;
+static gint hf_wkssvc_wkssvc_NetrEnumerateComputerNames_name_type;
+static gint hf_wkssvc_wkssvc_NetrEnumerateComputerNames_server_name;
+static gint hf_wkssvc_wkssvc_NetrGetJoinInformation_name_buffer;
+static gint hf_wkssvc_wkssvc_NetrGetJoinInformation_name_type;
+static gint hf_wkssvc_wkssvc_NetrGetJoinInformation_server_name;
+static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_Account;
+static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_EncryptedPassword;
+static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_domain_name;
+static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_num_ous;
+static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_ous;
+static gint hf_wkssvc_wkssvc_NetrGetJoinableOus2_server_name;
+static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_Account;
+static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_domain_name;
+static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_num_ous;
+static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_ous;
+static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_server_name;
+static gint hf_wkssvc_wkssvc_NetrGetJoinableOus_unknown;
+static gint hf_wkssvc_wkssvc_NetrJoinDomain2_account_name;
+static gint hf_wkssvc_wkssvc_NetrJoinDomain2_admin_account;
+static gint hf_wkssvc_wkssvc_NetrJoinDomain2_domain_name;
+static gint hf_wkssvc_wkssvc_NetrJoinDomain2_encrypted_password;
+static gint hf_wkssvc_wkssvc_NetrJoinDomain2_join_flags;
+static gint hf_wkssvc_wkssvc_NetrJoinDomain2_server_name;
+static gint hf_wkssvc_wkssvc_NetrJoinDomain_Account;
+static gint hf_wkssvc_wkssvc_NetrJoinDomain_account_ou;
+static gint hf_wkssvc_wkssvc_NetrJoinDomain_domain_name;
+static gint hf_wkssvc_wkssvc_NetrJoinDomain_join_flags;
+static gint hf_wkssvc_wkssvc_NetrJoinDomain_server_name;
+static gint hf_wkssvc_wkssvc_NetrJoinDomain_unknown;
+static gint hf_wkssvc_wkssvc_NetrLogonDomainNameAdd_domain_name;
+static gint hf_wkssvc_wkssvc_NetrLogonDomainNameDel_domain_name;
+static gint hf_wkssvc_wkssvc_NetrMessageBufferSend_message_buffer;
+static gint hf_wkssvc_wkssvc_NetrMessageBufferSend_message_name;
+static gint hf_wkssvc_wkssvc_NetrMessageBufferSend_message_sender_name;
+static gint hf_wkssvc_wkssvc_NetrMessageBufferSend_message_size;
+static gint hf_wkssvc_wkssvc_NetrMessageBufferSend_server_name;
+static gint hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_Account;
+static gint hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_AlternateMachineNameToRemove;
+static gint hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_EncryptedPassword;
+static gint hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_Reserved;
+static gint hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_server_name;
+static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_Account;
+static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_EncryptedPassword;
+static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_NewMachineName;
+static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_RenameOptions;
+static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_server_name;
+static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain_Account;
+static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain_NewMachineName;
+static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain_RenameOptions;
+static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain_password;
+static gint hf_wkssvc_wkssvc_NetrRenameMachineInDomain_server_name;
+static gint hf_wkssvc_wkssvc_NetrSetPrimaryComputername_Account;
+static gint hf_wkssvc_wkssvc_NetrSetPrimaryComputername_EncryptedPassword;
+static gint hf_wkssvc_wkssvc_NetrSetPrimaryComputername_Reserved;
+static gint hf_wkssvc_wkssvc_NetrSetPrimaryComputername_primary_name;
+static gint hf_wkssvc_wkssvc_NetrSetPrimaryComputername_server_name;
+static gint hf_wkssvc_wkssvc_NetrUnjoinDomain2_account;
+static gint hf_wkssvc_wkssvc_NetrUnjoinDomain2_encrypted_password;
+static gint hf_wkssvc_wkssvc_NetrUnjoinDomain2_server_name;
+static gint hf_wkssvc_wkssvc_NetrUnjoinDomain2_unjoin_flags;
+static gint hf_wkssvc_wkssvc_NetrUnjoinDomain_Account;
+static gint hf_wkssvc_wkssvc_NetrUnjoinDomain_password;
+static gint hf_wkssvc_wkssvc_NetrUnjoinDomain_server_name;
+static gint hf_wkssvc_wkssvc_NetrUnjoinDomain_unjoin_flags;
+static gint hf_wkssvc_wkssvc_NetrUseAdd_ctr;
+static gint hf_wkssvc_wkssvc_NetrUseAdd_level;
+static gint hf_wkssvc_wkssvc_NetrUseAdd_parm_err;
+static gint hf_wkssvc_wkssvc_NetrUseAdd_server_name;
+static gint hf_wkssvc_wkssvc_NetrUseDel_force_cond;
+static gint hf_wkssvc_wkssvc_NetrUseDel_server_name;
+static gint hf_wkssvc_wkssvc_NetrUseDel_use_name;
+static gint hf_wkssvc_wkssvc_NetrUseEnumCtr0_array;
+static gint hf_wkssvc_wkssvc_NetrUseEnumCtr0_count;
+static gint hf_wkssvc_wkssvc_NetrUseEnumCtr1_array;
+static gint hf_wkssvc_wkssvc_NetrUseEnumCtr1_count;
+static gint hf_wkssvc_wkssvc_NetrUseEnumCtr2_array;
+static gint hf_wkssvc_wkssvc_NetrUseEnumCtr2_count;
+static gint hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr0;
+static gint hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr1;
+static gint hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr2;
+static gint hf_wkssvc_wkssvc_NetrUseEnumInfo_ctr;
+static gint hf_wkssvc_wkssvc_NetrUseEnumInfo_level;
+static gint hf_wkssvc_wkssvc_NetrUseEnum_entries_read;
+static gint hf_wkssvc_wkssvc_NetrUseEnum_info;
+static gint hf_wkssvc_wkssvc_NetrUseEnum_prefmaxlen;
+static gint hf_wkssvc_wkssvc_NetrUseEnum_resume_handle;
+static gint hf_wkssvc_wkssvc_NetrUseEnum_server_name;
+static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info0;
+static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info1;
+static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info2;
+static gint hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info3;
+static gint hf_wkssvc_wkssvc_NetrUseGetInfo_ctr;
+static gint hf_wkssvc_wkssvc_NetrUseGetInfo_level;
+static gint hf_wkssvc_wkssvc_NetrUseGetInfo_server_name;
+static gint hf_wkssvc_wkssvc_NetrUseGetInfo_use_name;
+static gint hf_wkssvc_wkssvc_NetrUseInfo0_local;
+static gint hf_wkssvc_wkssvc_NetrUseInfo0_remote;
+static gint hf_wkssvc_wkssvc_NetrUseInfo1_asg_type;
+static gint hf_wkssvc_wkssvc_NetrUseInfo1_local;
+static gint hf_wkssvc_wkssvc_NetrUseInfo1_password;
+static gint hf_wkssvc_wkssvc_NetrUseInfo1_ref_count;
+static gint hf_wkssvc_wkssvc_NetrUseInfo1_remote;
+static gint hf_wkssvc_wkssvc_NetrUseInfo1_status;
+static gint hf_wkssvc_wkssvc_NetrUseInfo1_use_count;
+static gint hf_wkssvc_wkssvc_NetrUseInfo2_asg_type;
+static gint hf_wkssvc_wkssvc_NetrUseInfo2_domain_name;
+static gint hf_wkssvc_wkssvc_NetrUseInfo2_local;
+static gint hf_wkssvc_wkssvc_NetrUseInfo2_password;
+static gint hf_wkssvc_wkssvc_NetrUseInfo2_ref_count;
+static gint hf_wkssvc_wkssvc_NetrUseInfo2_remote;
+static gint hf_wkssvc_wkssvc_NetrUseInfo2_status;
+static gint hf_wkssvc_wkssvc_NetrUseInfo2_use_count;
+static gint hf_wkssvc_wkssvc_NetrUseInfo2_user_name;
+static gint hf_wkssvc_wkssvc_NetrUseInfo3_unknown1;
+static gint hf_wkssvc_wkssvc_NetrUseInfo3_unknown2;
+static gint hf_wkssvc_wkssvc_NetrValidateName2_Account;
+static gint hf_wkssvc_wkssvc_NetrValidateName2_EncryptedPassword;
+static gint hf_wkssvc_wkssvc_NetrValidateName2_name;
+static gint hf_wkssvc_wkssvc_NetrValidateName2_name_type;
+static gint hf_wkssvc_wkssvc_NetrValidateName2_server_name;
+static gint hf_wkssvc_wkssvc_NetrValidateName_Account;
+static gint hf_wkssvc_wkssvc_NetrValidateName_Password;
+static gint hf_wkssvc_wkssvc_NetrValidateName_name;
+static gint hf_wkssvc_wkssvc_NetrValidateName_name_type;
+static gint hf_wkssvc_wkssvc_NetrValidateName_server_name;
+static gint hf_wkssvc_wkssvc_NetrWkstaTransportAdd_info0;
+static gint hf_wkssvc_wkssvc_NetrWkstaTransportAdd_level;
+static gint hf_wkssvc_wkssvc_NetrWkstaTransportAdd_parm_err;
+static gint hf_wkssvc_wkssvc_NetrWkstaTransportAdd_server_name;
+static gint hf_wkssvc_wkssvc_NetrWkstaTransportDel_server_name;
+static gint hf_wkssvc_wkssvc_NetrWkstaTransportDel_transport_name;
+static gint hf_wkssvc_wkssvc_NetrWkstaTransportDel_unknown3;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserGetInfo_info;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserGetInfo_level;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserGetInfo_unknown;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo0_user_name;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo1101_other_domains;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo1_logon_domain;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo1_logon_server;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo1_other_domains;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo1_user_name;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo_info0;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo_info1;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserInfo_info1101;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_info;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_level;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_parm_err;
+static gint hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_unknown;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_info;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_server_name;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_unknown2;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_unknown3;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_unknown4;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown1;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown10;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown11;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown12;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown13;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown14;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown15;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown16;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown17;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown18;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown19;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown2;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown20;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown21;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown22;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown23;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown24;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown25;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown26;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown27;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown28;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown29;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown3;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown30;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown31;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown32;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown33;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown34;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown35;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown36;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown37;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown38;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown39;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown4;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown40;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown5;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown6;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown7;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown8;
+static gint hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown9;
+static gint hf_wkssvc_wkssvc_PasswordBuffer_data;
+static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE;
+static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE;
+static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_DEFER_SPN;
+static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED;
+static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_DC_ACCOUNT;
+static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_TYPE;
+static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_UNSECURE;
+static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_WITH_NEW_NAME;
+static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_MACHINE_PWD_PASSED;
+static gint hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_WIN9X_UPGRADE;
+static gint hf_wkssvc_wkssvc_renameflags_WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE;
+
+static gint proto_dcerpc_wkssvc;
 /* Version information */
 
 
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 19818c83b5..7de689e7e0 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -429,169 +429,169 @@ static const value_string rts_forward_destination_vals[] = {
 #define DCE_CN_TRANSPORT_SMBPIPE        1
 
 
-static int proto_dcerpc = -1;
+static int proto_dcerpc;
 
 /* field defines */
-static int hf_dcerpc_request_in = -1;
-static int hf_dcerpc_time = -1;
-static int hf_dcerpc_response_in = -1;
-static int hf_dcerpc_ver = -1;
-static int hf_dcerpc_ver_minor = -1;
-static int hf_dcerpc_packet_type = -1;
-static int hf_dcerpc_cn_flags = -1;
-static int hf_dcerpc_cn_flags_first_frag = -1;
-static int hf_dcerpc_cn_flags_last_frag = -1;
-static int hf_dcerpc_cn_flags_cancel_pending = -1;
-static int hf_dcerpc_cn_flags_reserved = -1;
-static int hf_dcerpc_cn_flags_mpx = -1;
-static int hf_dcerpc_cn_flags_dne = -1;
-static int hf_dcerpc_cn_flags_maybe = -1;
-static int hf_dcerpc_cn_flags_object = -1;
-static int hf_dcerpc_drep = -1;
-       int hf_dcerpc_drep_byteorder = -1;
-       int hf_dcerpc_ndr_padding = -1;
-static int hf_dcerpc_drep_character = -1;
-static int hf_dcerpc_drep_fp = -1;
-static int hf_dcerpc_cn_frag_len = -1;
-static int hf_dcerpc_cn_auth_len = -1;
-static int hf_dcerpc_cn_call_id = -1;
-static int hf_dcerpc_cn_max_xmit = -1;
-static int hf_dcerpc_cn_max_recv = -1;
-static int hf_dcerpc_cn_assoc_group = -1;
-static int hf_dcerpc_cn_num_ctx_items = -1;
-static int hf_dcerpc_cn_ctx_item = -1;
-static int hf_dcerpc_cn_ctx_id = -1;
-static int hf_dcerpc_cn_num_trans_items = -1;
-static int hf_dcerpc_cn_bind_abstract_syntax = -1;
-static int hf_dcerpc_cn_bind_if_id = -1;
-static int hf_dcerpc_cn_bind_if_ver = -1;
-static int hf_dcerpc_cn_bind_if_ver_minor = -1;
-static int hf_dcerpc_cn_bind_trans_syntax = -1;
-static int hf_dcerpc_cn_bind_trans_id = -1;
-static int hf_dcerpc_cn_bind_trans_ver = -1;
-static int hf_dcerpc_cn_bind_trans_btfn = -1;
-static int hf_dcerpc_cn_bind_trans_btfn_01 = -1;
-static int hf_dcerpc_cn_bind_trans_btfn_02 = -1;
-static int hf_dcerpc_cn_alloc_hint = -1;
-static int hf_dcerpc_cn_sec_addr_len = -1;
-static int hf_dcerpc_cn_sec_addr = -1;
-static int hf_dcerpc_cn_num_results = -1;
-static int hf_dcerpc_cn_ack_result = -1;
-static int hf_dcerpc_cn_ack_reason = -1;
-static int hf_dcerpc_cn_ack_trans_id = -1;
-static int hf_dcerpc_cn_ack_trans_ver = -1;
-static int hf_dcerpc_cn_reject_reason = -1;
-static int hf_dcerpc_cn_num_protocols = -1;
-static int hf_dcerpc_cn_protocol_ver_major = -1;
-static int hf_dcerpc_cn_protocol_ver_minor = -1;
-static int hf_dcerpc_cn_cancel_count = -1;
-static int hf_dcerpc_cn_fault_flags = -1;
-static int hf_dcerpc_cn_fault_flags_extended_error_info = -1;
-static int hf_dcerpc_cn_status = -1;
-static int hf_dcerpc_cn_deseg_req = -1;
-static int hf_dcerpc_cn_rts_flags = -1;
-static int hf_dcerpc_cn_rts_flags_ping = -1;
-static int hf_dcerpc_cn_rts_flags_other_cmd = -1;
-static int hf_dcerpc_cn_rts_flags_recycle_channel = -1;
-static int hf_dcerpc_cn_rts_flags_in_channel = -1;
-static int hf_dcerpc_cn_rts_flags_out_channel = -1;
-static int hf_dcerpc_cn_rts_flags_eof = -1;
-static int hf_dcerpc_cn_rts_commands_nb = -1;
-static int hf_dcerpc_cn_rts_command = -1;
-static int hf_dcerpc_cn_rts_command_receivewindowsize = -1;
-static int hf_dcerpc_cn_rts_command_fack_bytesreceived = -1;
-static int hf_dcerpc_cn_rts_command_fack_availablewindow = -1;
-static int hf_dcerpc_cn_rts_command_fack_channelcookie = -1;
-static int hf_dcerpc_cn_rts_command_connectiontimeout = -1;
-static int hf_dcerpc_cn_rts_command_cookie = -1;
-static int hf_dcerpc_cn_rts_command_channellifetime = -1;
-static int hf_dcerpc_cn_rts_command_clientkeepalive = -1;
-static int hf_dcerpc_cn_rts_command_version = -1;
-static int hf_dcerpc_cn_rts_command_conformancecount = -1;
-static int hf_dcerpc_cn_rts_command_padding = -1;
-static int hf_dcerpc_cn_rts_command_addrtype = -1;
-static int hf_dcerpc_cn_rts_command_associationgroupid = -1;
-static int hf_dcerpc_cn_rts_command_forwarddestination = -1;
-static int hf_dcerpc_cn_rts_command_pingtrafficsentnotify = -1;
-static int hf_dcerpc_auth_type = -1;
-static int hf_dcerpc_auth_level = -1;
-static int hf_dcerpc_auth_pad_len = -1;
-static int hf_dcerpc_auth_rsrvd = -1;
-static int hf_dcerpc_auth_ctx_id = -1;
-static int hf_dcerpc_dg_flags1 = -1;
-static int hf_dcerpc_dg_flags1_rsrvd_01 = -1;
-static int hf_dcerpc_dg_flags1_last_frag = -1;
-static int hf_dcerpc_dg_flags1_frag = -1;
-static int hf_dcerpc_dg_flags1_nofack = -1;
-static int hf_dcerpc_dg_flags1_maybe = -1;
-static int hf_dcerpc_dg_flags1_idempotent = -1;
-static int hf_dcerpc_dg_flags1_broadcast = -1;
-static int hf_dcerpc_dg_flags1_rsrvd_80 = -1;
-static int hf_dcerpc_dg_flags2 = -1;
-static int hf_dcerpc_dg_flags2_rsrvd_01 = -1;
-static int hf_dcerpc_dg_flags2_cancel_pending = -1;
-static int hf_dcerpc_dg_flags2_rsrvd_04 = -1;
-static int hf_dcerpc_dg_flags2_rsrvd_08 = -1;
-static int hf_dcerpc_dg_flags2_rsrvd_10 = -1;
-static int hf_dcerpc_dg_flags2_rsrvd_20 = -1;
-static int hf_dcerpc_dg_flags2_rsrvd_40 = -1;
-static int hf_dcerpc_dg_flags2_rsrvd_80 = -1;
-static int hf_dcerpc_dg_serial_hi = -1;
-static int hf_dcerpc_obj_id = -1;
-static int hf_dcerpc_dg_if_id = -1;
-static int hf_dcerpc_dg_act_id = -1;
-static int hf_dcerpc_dg_serial_lo = -1;
-static int hf_dcerpc_dg_ahint = -1;
-static int hf_dcerpc_dg_ihint = -1;
-static int hf_dcerpc_dg_frag_len = -1;
-static int hf_dcerpc_dg_frag_num = -1;
-static int hf_dcerpc_dg_auth_proto = -1;
-static int hf_dcerpc_opnum = -1;
-static int hf_dcerpc_dg_seqnum = -1;
-static int hf_dcerpc_dg_server_boot = -1;
-static int hf_dcerpc_dg_if_ver = -1;
-static int hf_dcerpc_krb5_av_prot_level = -1;
-static int hf_dcerpc_krb5_av_key_vers_num = -1;
-static int hf_dcerpc_krb5_av_key_auth_verifier = -1;
-static int hf_dcerpc_dg_cancel_vers = -1;
-static int hf_dcerpc_dg_cancel_id = -1;
-static int hf_dcerpc_dg_server_accepting_cancels = -1;
-static int hf_dcerpc_dg_fack_vers = -1;
-static int hf_dcerpc_dg_fack_window_size = -1;
-static int hf_dcerpc_dg_fack_max_tsdu = -1;
-static int hf_dcerpc_dg_fack_max_frag_size = -1;
-static int hf_dcerpc_dg_fack_serial_num = -1;
-static int hf_dcerpc_dg_fack_selack_len = -1;
-static int hf_dcerpc_dg_fack_selack = -1;
-static int hf_dcerpc_dg_status = -1;
-static int hf_dcerpc_array_max_count = -1;
-static int hf_dcerpc_array_offset = -1;
-static int hf_dcerpc_array_actual_count = -1;
-static int hf_dcerpc_op = -1;
-static int hf_dcerpc_referent_id32 = -1;
-static int hf_dcerpc_referent_id64 = -1;
-static int hf_dcerpc_null_pointer = -1;
-static int hf_dcerpc_fragments = -1;
-static int hf_dcerpc_fragment = -1;
-static int hf_dcerpc_fragment_overlap = -1;
-static int hf_dcerpc_fragment_overlap_conflict = -1;
-static int hf_dcerpc_fragment_multiple_tails = -1;
-static int hf_dcerpc_fragment_too_long_fragment = -1;
-static int hf_dcerpc_fragment_error = -1;
-static int hf_dcerpc_fragment_count = -1;
-static int hf_dcerpc_reassembled_in = -1;
-static int hf_dcerpc_reassembled_length = -1;
-static int hf_dcerpc_unknown_if_id = -1;
-static int hf_dcerpc_sec_vt_signature = -1;
-static int hf_dcerpc_sec_vt_command = -1;
-static int hf_dcerpc_sec_vt_command_cmd = -1;
-static int hf_dcerpc_sec_vt_command_end = -1;
-static int hf_dcerpc_sec_vt_command_must = -1;
-static int hf_dcerpc_sec_vt_command_length = -1;
-static int hf_dcerpc_sec_vt_bitmask = -1;
-static int hf_dcerpc_sec_vt_bitmask_sign = -1;
-static int hf_dcerpc_sec_vt_pcontext_uuid = -1;
-static int hf_dcerpc_sec_vt_pcontext_ver = -1;
+static int hf_dcerpc_request_in;
+static int hf_dcerpc_time;
+static int hf_dcerpc_response_in;
+static int hf_dcerpc_ver;
+static int hf_dcerpc_ver_minor;
+static int hf_dcerpc_packet_type;
+static int hf_dcerpc_cn_flags;
+static int hf_dcerpc_cn_flags_first_frag;
+static int hf_dcerpc_cn_flags_last_frag;
+static int hf_dcerpc_cn_flags_cancel_pending;
+static int hf_dcerpc_cn_flags_reserved;
+static int hf_dcerpc_cn_flags_mpx;
+static int hf_dcerpc_cn_flags_dne;
+static int hf_dcerpc_cn_flags_maybe;
+static int hf_dcerpc_cn_flags_object;
+static int hf_dcerpc_drep;
+       int hf_dcerpc_drep_byteorder;
+       int hf_dcerpc_ndr_padding;
+static int hf_dcerpc_drep_character;
+static int hf_dcerpc_drep_fp;
+static int hf_dcerpc_cn_frag_len;
+static int hf_dcerpc_cn_auth_len;
+static int hf_dcerpc_cn_call_id;
+static int hf_dcerpc_cn_max_xmit;
+static int hf_dcerpc_cn_max_recv;
+static int hf_dcerpc_cn_assoc_group;
+static int hf_dcerpc_cn_num_ctx_items;
+static int hf_dcerpc_cn_ctx_item;
+static int hf_dcerpc_cn_ctx_id;
+static int hf_dcerpc_cn_num_trans_items;
+static int hf_dcerpc_cn_bind_abstract_syntax;
+static int hf_dcerpc_cn_bind_if_id;
+static int hf_dcerpc_cn_bind_if_ver;
+static int hf_dcerpc_cn_bind_if_ver_minor;
+static int hf_dcerpc_cn_bind_trans_syntax;
+static int hf_dcerpc_cn_bind_trans_id;
+static int hf_dcerpc_cn_bind_trans_ver;
+static int hf_dcerpc_cn_bind_trans_btfn;
+static int hf_dcerpc_cn_bind_trans_btfn_01;
+static int hf_dcerpc_cn_bind_trans_btfn_02;
+static int hf_dcerpc_cn_alloc_hint;
+static int hf_dcerpc_cn_sec_addr_len;
+static int hf_dcerpc_cn_sec_addr;
+static int hf_dcerpc_cn_num_results;
+static int hf_dcerpc_cn_ack_result;
+static int hf_dcerpc_cn_ack_reason;
+static int hf_dcerpc_cn_ack_trans_id;
+static int hf_dcerpc_cn_ack_trans_ver;
+static int hf_dcerpc_cn_reject_reason;
+static int hf_dcerpc_cn_num_protocols;
+static int hf_dcerpc_cn_protocol_ver_major;
+static int hf_dcerpc_cn_protocol_ver_minor;
+static int hf_dcerpc_cn_cancel_count;
+static int hf_dcerpc_cn_fault_flags;
+static int hf_dcerpc_cn_fault_flags_extended_error_info;
+static int hf_dcerpc_cn_status;
+static int hf_dcerpc_cn_deseg_req;
+static int hf_dcerpc_cn_rts_flags;
+static int hf_dcerpc_cn_rts_flags_ping;
+static int hf_dcerpc_cn_rts_flags_other_cmd;
+static int hf_dcerpc_cn_rts_flags_recycle_channel;
+static int hf_dcerpc_cn_rts_flags_in_channel;
+static int hf_dcerpc_cn_rts_flags_out_channel;
+static int hf_dcerpc_cn_rts_flags_eof;
+static int hf_dcerpc_cn_rts_commands_nb;
+static int hf_dcerpc_cn_rts_command;
+static int hf_dcerpc_cn_rts_command_receivewindowsize;
+static int hf_dcerpc_cn_rts_command_fack_bytesreceived;
+static int hf_dcerpc_cn_rts_command_fack_availablewindow;
+static int hf_dcerpc_cn_rts_command_fack_channelcookie;
+static int hf_dcerpc_cn_rts_command_connectiontimeout;
+static int hf_dcerpc_cn_rts_command_cookie;
+static int hf_dcerpc_cn_rts_command_channellifetime;
+static int hf_dcerpc_cn_rts_command_clientkeepalive;
+static int hf_dcerpc_cn_rts_command_version;
+static int hf_dcerpc_cn_rts_command_conformancecount;
+static int hf_dcerpc_cn_rts_command_padding;
+static int hf_dcerpc_cn_rts_command_addrtype;
+static int hf_dcerpc_cn_rts_command_associationgroupid;
+static int hf_dcerpc_cn_rts_command_forwarddestination;
+static int hf_dcerpc_cn_rts_command_pingtrafficsentnotify;
+static int hf_dcerpc_auth_type;
+static int hf_dcerpc_auth_level;
+static int hf_dcerpc_auth_pad_len;
+static int hf_dcerpc_auth_rsrvd;
+static int hf_dcerpc_auth_ctx_id;
+static int hf_dcerpc_dg_flags1;
+static int hf_dcerpc_dg_flags1_rsrvd_01;
+static int hf_dcerpc_dg_flags1_last_frag;
+static int hf_dcerpc_dg_flags1_frag;
+static int hf_dcerpc_dg_flags1_nofack;
+static int hf_dcerpc_dg_flags1_maybe;
+static int hf_dcerpc_dg_flags1_idempotent;
+static int hf_dcerpc_dg_flags1_broadcast;
+static int hf_dcerpc_dg_flags1_rsrvd_80;
+static int hf_dcerpc_dg_flags2;
+static int hf_dcerpc_dg_flags2_rsrvd_01;
+static int hf_dcerpc_dg_flags2_cancel_pending;
+static int hf_dcerpc_dg_flags2_rsrvd_04;
+static int hf_dcerpc_dg_flags2_rsrvd_08;
+static int hf_dcerpc_dg_flags2_rsrvd_10;
+static int hf_dcerpc_dg_flags2_rsrvd_20;
+static int hf_dcerpc_dg_flags2_rsrvd_40;
+static int hf_dcerpc_dg_flags2_rsrvd_80;
+static int hf_dcerpc_dg_serial_hi;
+static int hf_dcerpc_obj_id;
+static int hf_dcerpc_dg_if_id;
+static int hf_dcerpc_dg_act_id;
+static int hf_dcerpc_dg_serial_lo;
+static int hf_dcerpc_dg_ahint;
+static int hf_dcerpc_dg_ihint;
+static int hf_dcerpc_dg_frag_len;
+static int hf_dcerpc_dg_frag_num;
+static int hf_dcerpc_dg_auth_proto;
+static int hf_dcerpc_opnum;
+static int hf_dcerpc_dg_seqnum;
+static int hf_dcerpc_dg_server_boot;
+static int hf_dcerpc_dg_if_ver;
+static int hf_dcerpc_krb5_av_prot_level;
+static int hf_dcerpc_krb5_av_key_vers_num;
+static int hf_dcerpc_krb5_av_key_auth_verifier;
+static int hf_dcerpc_dg_cancel_vers;
+static int hf_dcerpc_dg_cancel_id;
+static int hf_dcerpc_dg_server_accepting_cancels;
+static int hf_dcerpc_dg_fack_vers;
+static int hf_dcerpc_dg_fack_window_size;
+static int hf_dcerpc_dg_fack_max_tsdu;
+static int hf_dcerpc_dg_fack_max_frag_size;
+static int hf_dcerpc_dg_fack_serial_num;
+static int hf_dcerpc_dg_fack_selack_len;
+static int hf_dcerpc_dg_fack_selack;
+static int hf_dcerpc_dg_status;
+static int hf_dcerpc_array_max_count;
+static int hf_dcerpc_array_offset;
+static int hf_dcerpc_array_actual_count;
+static int hf_dcerpc_op;
+static int hf_dcerpc_referent_id32;
+static int hf_dcerpc_referent_id64;
+static int hf_dcerpc_null_pointer;
+static int hf_dcerpc_fragments;
+static int hf_dcerpc_fragment;
+static int hf_dcerpc_fragment_overlap;
+static int hf_dcerpc_fragment_overlap_conflict;
+static int hf_dcerpc_fragment_multiple_tails;
+static int hf_dcerpc_fragment_too_long_fragment;
+static int hf_dcerpc_fragment_error;
+static int hf_dcerpc_fragment_count;
+static int hf_dcerpc_reassembled_in;
+static int hf_dcerpc_reassembled_length;
+static int hf_dcerpc_unknown_if_id;
+static int hf_dcerpc_sec_vt_signature;
+static int hf_dcerpc_sec_vt_command;
+static int hf_dcerpc_sec_vt_command_cmd;
+static int hf_dcerpc_sec_vt_command_end;
+static int hf_dcerpc_sec_vt_command_must;
+static int hf_dcerpc_sec_vt_command_length;
+static int hf_dcerpc_sec_vt_bitmask;
+static int hf_dcerpc_sec_vt_bitmask_sign;
+static int hf_dcerpc_sec_vt_pcontext_uuid;
+static int hf_dcerpc_sec_vt_pcontext_ver;
 
 static int * const sec_vt_command_fields[] = {
     &hf_dcerpc_sec_vt_command_cmd,
@@ -599,25 +599,25 @@ static int * const sec_vt_command_fields[] = {
     &hf_dcerpc_sec_vt_command_must,
     NULL
 };
-static int hf_dcerpc_reserved = -1;
-static int hf_dcerpc_unknown = -1;
-static int hf_dcerpc_missalign = -1;
+static int hf_dcerpc_reserved;
+static int hf_dcerpc_unknown;
+static int hf_dcerpc_missalign;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_dcerpc_duplicate_ptr = -1;
-static int hf_dcerpc_encrypted_stub_data = -1;
-static int hf_dcerpc_decrypted_stub_data = -1;
-static int hf_dcerpc_payload_stub_data = -1;
-static int hf_dcerpc_stub_data_with_sec_vt = -1;
-static int hf_dcerpc_stub_data = -1;
-static int hf_dcerpc_auth_padding = -1;
-static int hf_dcerpc_auth_info = -1;
-static int hf_dcerpc_auth_credentials = -1;
-static int hf_dcerpc_fault_stub_data = -1;
-static int hf_dcerpc_fragment_data = -1;
-static int hf_dcerpc_cmd_client_ipv4 = -1;
-static int hf_dcerpc_cmd_client_ipv6 = -1;
-static int hf_dcerpc_authentication_verifier = -1;
+static int hf_dcerpc_duplicate_ptr;
+static int hf_dcerpc_encrypted_stub_data;
+static int hf_dcerpc_decrypted_stub_data;
+static int hf_dcerpc_payload_stub_data;
+static int hf_dcerpc_stub_data_with_sec_vt;
+static int hf_dcerpc_stub_data;
+static int hf_dcerpc_auth_padding;
+static int hf_dcerpc_auth_info;
+static int hf_dcerpc_auth_credentials;
+static int hf_dcerpc_fault_stub_data;
+static int hf_dcerpc_fragment_data;
+static int hf_dcerpc_cmd_client_ipv4;
+static int hf_dcerpc_cmd_client_ipv6;
+static int hf_dcerpc_authentication_verifier;
 
 static int * const dcerpc_cn_bind_trans_btfn_fields[] = {
         &hf_dcerpc_cn_bind_trans_btfn_01,
@@ -642,48 +642,48 @@ static const value_string sec_vt_command_cmd_vals[] = {
     {0, NULL}
 };
 
-static gint ett_dcerpc = -1;
-static gint ett_dcerpc_cn_flags = -1;
-static gint ett_dcerpc_cn_ctx = -1;
-static gint ett_dcerpc_cn_iface = -1;
-static gint ett_dcerpc_cn_trans_syntax = -1;
-static gint ett_dcerpc_cn_trans_btfn = -1;
-static gint ett_dcerpc_cn_bind_trans_btfn = -1;
-static gint ett_dcerpc_cn_rts_flags = -1;
-static gint ett_dcerpc_cn_rts_command = -1;
-static gint ett_dcerpc_cn_rts_pdu = -1;
-static gint ett_dcerpc_drep = -1;
-static gint ett_dcerpc_dg_flags1 = -1;
-static gint ett_dcerpc_dg_flags2 = -1;
-static gint ett_dcerpc_pointer_data = -1;
-static gint ett_dcerpc_string = -1;
-static gint ett_dcerpc_fragments = -1;
-static gint ett_dcerpc_fragment = -1;
-static gint ett_dcerpc_krb5_auth_verf = -1;
-static gint ett_dcerpc_auth_info = -1;
-static gint ett_dcerpc_verification_trailer = -1;
-static gint ett_dcerpc_sec_vt_command = -1;
-static gint ett_dcerpc_sec_vt_bitmask = -1;
-static gint ett_dcerpc_sec_vt_pcontext = -1;
-static gint ett_dcerpc_sec_vt_header = -1;
-static gint ett_dcerpc_complete_stub_data = -1;
-static gint ett_dcerpc_fault_flags = -1;
-static gint ett_dcerpc_fault_stub_data = -1;
-
-static expert_field ei_dcerpc_fragment_multiple = EI_INIT;
-static expert_field ei_dcerpc_cn_status = EI_INIT;
-static expert_field ei_dcerpc_fragment_reassembled = EI_INIT;
-static expert_field ei_dcerpc_fragment = EI_INIT;
-static expert_field ei_dcerpc_no_request_found = EI_INIT;
-/* static expert_field ei_dcerpc_context_change = EI_INIT; */
-static expert_field ei_dcerpc_cn_ctx_id_no_bind = EI_INIT;
-static expert_field ei_dcerpc_bind_not_acknowledged = EI_INIT;
-static expert_field ei_dcerpc_verifier_unavailable = EI_INIT;
-static expert_field ei_dcerpc_invalid_pdu_authentication_attempt = EI_INIT;
+static gint ett_dcerpc;
+static gint ett_dcerpc_cn_flags;
+static gint ett_dcerpc_cn_ctx;
+static gint ett_dcerpc_cn_iface;
+static gint ett_dcerpc_cn_trans_syntax;
+static gint ett_dcerpc_cn_trans_btfn;
+static gint ett_dcerpc_cn_bind_trans_btfn;
+static gint ett_dcerpc_cn_rts_flags;
+static gint ett_dcerpc_cn_rts_command;
+static gint ett_dcerpc_cn_rts_pdu;
+static gint ett_dcerpc_drep;
+static gint ett_dcerpc_dg_flags1;
+static gint ett_dcerpc_dg_flags2;
+static gint ett_dcerpc_pointer_data;
+static gint ett_dcerpc_string;
+static gint ett_dcerpc_fragments;
+static gint ett_dcerpc_fragment;
+static gint ett_dcerpc_krb5_auth_verf;
+static gint ett_dcerpc_auth_info;
+static gint ett_dcerpc_verification_trailer;
+static gint ett_dcerpc_sec_vt_command;
+static gint ett_dcerpc_sec_vt_bitmask;
+static gint ett_dcerpc_sec_vt_pcontext;
+static gint ett_dcerpc_sec_vt_header;
+static gint ett_dcerpc_complete_stub_data;
+static gint ett_dcerpc_fault_flags;
+static gint ett_dcerpc_fault_stub_data;
+
+static expert_field ei_dcerpc_fragment_multiple;
+static expert_field ei_dcerpc_cn_status;
+static expert_field ei_dcerpc_fragment_reassembled;
+static expert_field ei_dcerpc_fragment;
+static expert_field ei_dcerpc_no_request_found;
+/* static expert_field ei_dcerpc_context_change; */
+static expert_field ei_dcerpc_cn_ctx_id_no_bind;
+static expert_field ei_dcerpc_bind_not_acknowledged;
+static expert_field ei_dcerpc_verifier_unavailable;
+static expert_field ei_dcerpc_invalid_pdu_authentication_attempt;
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_dcerpc_long_frame = EI_INIT;
-static expert_field ei_dcerpc_cn_rts_command = EI_INIT;
-static expert_field ei_dcerpc_not_implemented = EI_INIT;
+static expert_field ei_dcerpc_long_frame;
+static expert_field ei_dcerpc_cn_rts_command;
+static expert_field ei_dcerpc_not_implemented;
 
 static const guint8 TRAILER_SIGNATURE[] = {0x8a, 0xe3, 0x13, 0x71, 0x02, 0xf4, 0x36, 0x71};
 static tvbuff_t *tvb_trailer_signature = NULL;
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c
index fab18c6125..cce657985d 100644
--- a/epan/dissectors/packet-dcm.c
+++ b/epan/dissectors/packet-dcm.c
@@ -282,105 +282,105 @@ static wmem_map_t *dcm_uid_table = NULL;
 static wmem_map_t *dcm_status_table = NULL;
 
 /* Initialize the protocol and registered fields */
-static int proto_dcm = -1;
+static int proto_dcm;
 
 static int dicom_eo_tap = -1;
 
-static int hf_dcm_pdu_type = -1;
-static int hf_dcm_pdu_len = -1;
-static int hf_dcm_assoc_version = -1;
-static int hf_dcm_assoc_called = -1;
-static int hf_dcm_assoc_calling = -1;
-static int hf_dcm_assoc_reject_result = -1;
-static int hf_dcm_assoc_reject_source = -1;
-static int hf_dcm_assoc_reject_reason = -1;
-static int hf_dcm_assoc_abort_source = -1;
-static int hf_dcm_assoc_abort_reason = -1;
-static int hf_dcm_assoc_item_type = -1;
-static int hf_dcm_assoc_item_len = -1;
-static int hf_dcm_actx = -1;
-static int hf_dcm_pctx_id = -1;
-static int hf_dcm_pctx_result = -1;
-static int hf_dcm_pctx_abss_syntax = -1;
-static int hf_dcm_pctx_xfer_syntax = -1;
-static int hf_dcm_info = -1;
-static int hf_dcm_info_uid = -1;
-static int hf_dcm_info_version = -1;
-static int hf_dcm_info_extneg = -1;
-static int hf_dcm_info_extneg_sopclassuid_len = -1;
-static int hf_dcm_info_extneg_sopclassuid = -1;
-static int hf_dcm_info_extneg_relational_query = -1;
-static int hf_dcm_info_extneg_date_time_matching = -1;
-static int hf_dcm_info_extneg_fuzzy_semantic_matching = -1;
-static int hf_dcm_info_extneg_timezone_query_adjustment = -1;
-static int hf_dcm_info_rolesel = -1;
-static int hf_dcm_info_rolesel_sopclassuid_len = -1;
-static int hf_dcm_info_rolesel_sopclassuid = -1;
-static int hf_dcm_info_rolesel_scurole = -1;
-static int hf_dcm_info_rolesel_scprole = -1;
-static int hf_dcm_info_async_neg = -1;
-static int hf_dcm_info_async_neg_max_num_ops_inv = -1;
-static int hf_dcm_info_async_neg_max_num_ops_per = -1;
-static int hf_dcm_info_user_identify = -1;
-static int hf_dcm_info_user_identify_type = -1;
-static int hf_dcm_info_user_identify_response_requested = -1;
-static int hf_dcm_info_user_identify_primary_field_length = -1;
-static int hf_dcm_info_user_identify_primary_field = -1;
-static int hf_dcm_info_user_identify_secondary_field_length = -1;
-static int hf_dcm_info_user_identify_secondary_field = -1;
-static int hf_dcm_info_unknown = -1;
-static int hf_dcm_assoc_item_data = -1;
-static int hf_dcm_pdu_maxlen = -1;
-static int hf_dcm_pdv_len = -1;
-static int hf_dcm_pdv_ctx = -1;
-static int hf_dcm_pdv_flags = -1;
-static int hf_dcm_data_tag = -1;
-static int hf_dcm_tag = -1;
-static int hf_dcm_tag_vr = -1;
-static int hf_dcm_tag_vl = -1;
-static int hf_dcm_tag_value_str = -1;
-static int hf_dcm_tag_value_16u = -1;
-static int hf_dcm_tag_value_16s = -1;
-static int hf_dcm_tag_value_32s = -1;
-static int hf_dcm_tag_value_32u = -1;
-static int hf_dcm_tag_value_byte = -1;
+static int hf_dcm_pdu_type;
+static int hf_dcm_pdu_len;
+static int hf_dcm_assoc_version;
+static int hf_dcm_assoc_called;
+static int hf_dcm_assoc_calling;
+static int hf_dcm_assoc_reject_result;
+static int hf_dcm_assoc_reject_source;
+static int hf_dcm_assoc_reject_reason;
+static int hf_dcm_assoc_abort_source;
+static int hf_dcm_assoc_abort_reason;
+static int hf_dcm_assoc_item_type;
+static int hf_dcm_assoc_item_len;
+static int hf_dcm_actx;
+static int hf_dcm_pctx_id;
+static int hf_dcm_pctx_result;
+static int hf_dcm_pctx_abss_syntax;
+static int hf_dcm_pctx_xfer_syntax;
+static int hf_dcm_info;
+static int hf_dcm_info_uid;
+static int hf_dcm_info_version;
+static int hf_dcm_info_extneg;
+static int hf_dcm_info_extneg_sopclassuid_len;
+static int hf_dcm_info_extneg_sopclassuid;
+static int hf_dcm_info_extneg_relational_query;
+static int hf_dcm_info_extneg_date_time_matching;
+static int hf_dcm_info_extneg_fuzzy_semantic_matching;
+static int hf_dcm_info_extneg_timezone_query_adjustment;
+static int hf_dcm_info_rolesel;
+static int hf_dcm_info_rolesel_sopclassuid_len;
+static int hf_dcm_info_rolesel_sopclassuid;
+static int hf_dcm_info_rolesel_scurole;
+static int hf_dcm_info_rolesel_scprole;
+static int hf_dcm_info_async_neg;
+static int hf_dcm_info_async_neg_max_num_ops_inv;
+static int hf_dcm_info_async_neg_max_num_ops_per;
+static int hf_dcm_info_user_identify;
+static int hf_dcm_info_user_identify_type;
+static int hf_dcm_info_user_identify_response_requested;
+static int hf_dcm_info_user_identify_primary_field_length;
+static int hf_dcm_info_user_identify_primary_field;
+static int hf_dcm_info_user_identify_secondary_field_length;
+static int hf_dcm_info_user_identify_secondary_field;
+static int hf_dcm_info_unknown;
+static int hf_dcm_assoc_item_data;
+static int hf_dcm_pdu_maxlen;
+static int hf_dcm_pdv_len;
+static int hf_dcm_pdv_ctx;
+static int hf_dcm_pdv_flags;
+static int hf_dcm_data_tag;
+static int hf_dcm_tag;
+static int hf_dcm_tag_vr;
+static int hf_dcm_tag_vl;
+static int hf_dcm_tag_value_str;
+static int hf_dcm_tag_value_16u;
+static int hf_dcm_tag_value_16s;
+static int hf_dcm_tag_value_32s;
+static int hf_dcm_tag_value_32u;
+static int hf_dcm_tag_value_byte;
 
 /* Initialize the subtree pointers */
-static gint ett_dcm = -1;
-static gint ett_assoc = -1;
-static gint ett_assoc_header = -1;
-static gint ett_assoc_actx = -1;
-static gint ett_assoc_pctx = -1;
-static gint ett_assoc_pctx_abss = -1;
-static gint ett_assoc_pctx_xfer = -1;
-static gint ett_assoc_info = -1;
-static gint ett_assoc_info_uid = -1;
-static gint ett_assoc_info_version = -1;
-static gint ett_assoc_info_extneg = -1;
-static gint ett_assoc_info_rolesel = -1;
-static gint ett_assoc_info_async_neg = -1;
-static gint ett_assoc_info_user_identify = -1;
-static gint ett_assoc_info_unknown = -1;
-static gint ett_dcm_data = -1;
-static gint ett_dcm_data_pdv = -1;
-static gint ett_dcm_data_tag = -1;
-static gint ett_dcm_data_seq = -1;
-static gint ett_dcm_data_item = -1;
-
-static expert_field ei_dcm_data_tag = EI_INIT;
-static expert_field ei_dcm_multiple_transfer_syntax = EI_INIT;
-static expert_field ei_dcm_pdv_len = EI_INIT;
-static expert_field ei_dcm_pdv_flags = EI_INIT;
-static expert_field ei_dcm_pdv_ctx = EI_INIT;
-static expert_field ei_dcm_no_abstract_syntax = EI_INIT;
-static expert_field ei_dcm_no_abstract_syntax_uid = EI_INIT;
-static expert_field ei_dcm_status_msg = EI_INIT;
-static expert_field ei_dcm_no_transfer_syntax = EI_INIT;
-static expert_field ei_dcm_multiple_abstract_syntax = EI_INIT;
-static expert_field ei_dcm_invalid_pdu_length = EI_INIT;
-static expert_field ei_dcm_assoc_item_len = EI_INIT;
-static expert_field ei_dcm_assoc_rejected = EI_INIT;
-static expert_field ei_dcm_assoc_aborted = EI_INIT;
+static gint ett_dcm;
+static gint ett_assoc;
+static gint ett_assoc_header;
+static gint ett_assoc_actx;
+static gint ett_assoc_pctx;
+static gint ett_assoc_pctx_abss;
+static gint ett_assoc_pctx_xfer;
+static gint ett_assoc_info;
+static gint ett_assoc_info_uid;
+static gint ett_assoc_info_version;
+static gint ett_assoc_info_extneg;
+static gint ett_assoc_info_rolesel;
+static gint ett_assoc_info_async_neg;
+static gint ett_assoc_info_user_identify;
+static gint ett_assoc_info_unknown;
+static gint ett_dcm_data;
+static gint ett_dcm_data_pdv;
+static gint ett_dcm_data_tag;
+static gint ett_dcm_data_seq;
+static gint ett_dcm_data_item;
+
+static expert_field ei_dcm_data_tag;
+static expert_field ei_dcm_multiple_transfer_syntax;
+static expert_field ei_dcm_pdv_len;
+static expert_field ei_dcm_pdv_flags;
+static expert_field ei_dcm_pdv_ctx;
+static expert_field ei_dcm_no_abstract_syntax;
+static expert_field ei_dcm_no_abstract_syntax_uid;
+static expert_field ei_dcm_status_msg;
+static expert_field ei_dcm_no_transfer_syntax;
+static expert_field ei_dcm_multiple_abstract_syntax;
+static expert_field ei_dcm_invalid_pdu_length;
+static expert_field ei_dcm_assoc_item_len;
+static expert_field ei_dcm_assoc_rejected;
+static expert_field ei_dcm_assoc_aborted;
 
 static dissector_handle_t dcm_handle;
 
@@ -467,21 +467,21 @@ dcm_eo_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_,
 /* ************************************************************************* */
 
 /* Initialize the subtree pointers */
-static gint ett_dcm_pdv = -1;
-
-static gint ett_dcm_pdv_fragment = -1;
-static gint ett_dcm_pdv_fragments = -1;
-
-static int hf_dcm_pdv_fragments = -1;
-static int hf_dcm_pdv_fragment = -1;
-static int hf_dcm_pdv_fragment_overlap = -1;
-static int hf_dcm_pdv_fragment_overlap_conflicts = -1;
-static int hf_dcm_pdv_fragment_multiple_tails = -1;
-static int hf_dcm_pdv_fragment_too_long_fragment = -1;
-static int hf_dcm_pdv_fragment_error = -1;
-static int hf_dcm_pdv_fragment_count = -1;
-static int hf_dcm_pdv_reassembled_in = -1;
-static int hf_dcm_pdv_reassembled_length = -1;
+static gint ett_dcm_pdv;
+
+static gint ett_dcm_pdv_fragment;
+static gint ett_dcm_pdv_fragments;
+
+static int hf_dcm_pdv_fragments;
+static int hf_dcm_pdv_fragment;
+static int hf_dcm_pdv_fragment_overlap;
+static int hf_dcm_pdv_fragment_overlap_conflicts;
+static int hf_dcm_pdv_fragment_multiple_tails;
+static int hf_dcm_pdv_fragment_too_long_fragment;
+static int hf_dcm_pdv_fragment_error;
+static int hf_dcm_pdv_fragment_count;
+static int hf_dcm_pdv_reassembled_in;
+static int hf_dcm_pdv_reassembled_length;
 
 static const fragment_items dcm_pdv_fragment_items = {
     /* Fragment subtrees */
diff --git a/epan/dissectors/packet-dcom-dispatch.c b/epan/dissectors/packet-dcom-dispatch.c
index 4cfbaed697..feeed27a59 100644
--- a/epan/dissectors/packet-dcom-dispatch.c
+++ b/epan/dissectors/packet-dcom-dispatch.c
@@ -21,58 +21,58 @@
 void proto_register_dcom_dispatch(void);
 void proto_reg_handoff_dcom_dispatch(void);
 
-static int hf_dispatch_opnum = -1;
-
-static int hf_dispatch_riid = -1;
-static int hf_dispatch_name = -1;
-static int hf_dispatch_names = -1;
-static int hf_dispatch_lcid = -1;
-static int hf_dispatch_id = -1;
-
-static int hf_dispatch_arg = -1;
-static int hf_dispatch_args = -1;
-static int hf_dispatch_named_args = -1;
-static int hf_dispatch_varref = -1;
-static int hf_dispatch_varrefidx = -1;
-static int hf_dispatch_varrefarg = -1;
-
-static int hf_dispatch_varresult = -1;
-static int hf_dispatch_code = -1;
-static int hf_dispatch_reserved16 = -1;
-static int hf_dispatch_source = -1;
-static int hf_dispatch_description = -1;
-static int hf_dispatch_help_file = -1;
-static int hf_dispatch_help_context = -1;
-static int hf_dispatch_reserved32 = -1;
-static int hf_dispatch_deferred_fill_in = -1;
-static int hf_dispatch_arg_err = -1;
-
-static int hf_dispatch_tinfo = -1;
-static int hf_dispatch_itinfo = -1;
-static int hf_dispatch_dispparams = -1;
-static int hf_dispatch_excepinfo = -1;
-static int hf_dispatch_scode = -1;
-
-
-static int hf_dispatch_flags = -1;
-static int hf_dispatch_flags_method = -1;
-static int hf_dispatch_flags_propget = -1;
-static int hf_dispatch_flags_propput = -1;
-static int hf_dispatch_flags_propputref = -1;
+static int hf_dispatch_opnum;
+
+static int hf_dispatch_riid;
+static int hf_dispatch_name;
+static int hf_dispatch_names;
+static int hf_dispatch_lcid;
+static int hf_dispatch_id;
+
+static int hf_dispatch_arg;
+static int hf_dispatch_args;
+static int hf_dispatch_named_args;
+static int hf_dispatch_varref;
+static int hf_dispatch_varrefidx;
+static int hf_dispatch_varrefarg;
+
+static int hf_dispatch_varresult;
+static int hf_dispatch_code;
+static int hf_dispatch_reserved16;
+static int hf_dispatch_source;
+static int hf_dispatch_description;
+static int hf_dispatch_help_file;
+static int hf_dispatch_help_context;
+static int hf_dispatch_reserved32;
+static int hf_dispatch_deferred_fill_in;
+static int hf_dispatch_arg_err;
+
+static int hf_dispatch_tinfo;
+static int hf_dispatch_itinfo;
+static int hf_dispatch_dispparams;
+static int hf_dispatch_excepinfo;
+static int hf_dispatch_scode;
+
+
+static int hf_dispatch_flags;
+static int hf_dispatch_flags_method;
+static int hf_dispatch_flags_propget;
+static int hf_dispatch_flags_propput;
+static int hf_dispatch_flags_propputref;
 
 #define DISPATCH_FLAGS_METHOD           1
 #define DISPATCH_FLAGS_PROPGET          2
 #define DISPATCH_FLAGS_PROPPUT          4
 #define DISPATCH_FLAGS_PROPPUTREF       8
 
-static gint ett_dispatch_flags = -1;
-static gint ett_dispatch_params = -1;
-static gint ett_dispatch_excepinfo = -1;
+static gint ett_dispatch_flags;
+static gint ett_dispatch_params;
+static gint ett_dispatch_excepinfo;
 
 static e_guid_t uuid_dispatch = { 0x00020400, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } };
 static guint16  ver_dispatch = 0;
-static gint ett_dispatch = -1;
-static int proto_dispatch = -1;
+static gint ett_dispatch;
+static int proto_dispatch;
 
 
 /*
diff --git a/epan/dissectors/packet-dcom-oxid.c b/epan/dissectors/packet-dcom-oxid.c
index 0accf0e21d..60ebf13f25 100644
--- a/epan/dissectors/packet-dcom-oxid.c
+++ b/epan/dissectors/packet-dcom-oxid.c
@@ -20,28 +20,28 @@
 void proto_register_oxid(void);
 void proto_reg_handoff_oxid(void);
 
-static int proto_oxid = -1;
-
-static int hf_oxid_opnum = -1;
-static int hf_oxid_setid = -1;
-static int hf_oxid_seqnum = -1;
-static int hf_oxid_addtoset = -1;
-static int hf_oxid_delfromset = -1;
-static int hf_oxid_oid = -1;
-static int hf_oxid_ping_backoff_factor = -1;
-static int hf_oxid_oxid = -1;
-static int hf_oxid_requested_protseqs = -1;
-static int hf_oxid_protseqs = -1;
-static int hf_oxid_bindings = -1;
-static int hf_oxid_ipid = -1;
-static int hf_oxid_authn_hint = -1;
-
-static int hf_oxid_Unknown1 = -1;
-static int hf_oxid_Unknown2 = -1;
-static int hf_oxid_ds_array = -1;
-
-
-static gint ett_oxid = -1;
+static int proto_oxid;
+
+static int hf_oxid_opnum;
+static int hf_oxid_setid;
+static int hf_oxid_seqnum;
+static int hf_oxid_addtoset;
+static int hf_oxid_delfromset;
+static int hf_oxid_oid;
+static int hf_oxid_ping_backoff_factor;
+static int hf_oxid_oxid;
+static int hf_oxid_requested_protseqs;
+static int hf_oxid_protseqs;
+static int hf_oxid_bindings;
+static int hf_oxid_ipid;
+static int hf_oxid_authn_hint;
+
+static int hf_oxid_Unknown1;
+static int hf_oxid_Unknown2;
+static int hf_oxid_ds_array;
+
+
+static gint ett_oxid;
 
 static e_guid_t uuid_oxid = { 0x99fcfec4, 0x5260, 0x101b, { 0xbb, 0xcb, 0x00, 0xaa, 0x00, 0x21, 0x34, 0x7a } };
 static guint16  ver_oxid = 0;
diff --git a/epan/dissectors/packet-dcom-provideclassinfo.c b/epan/dissectors/packet-dcom-provideclassinfo.c
index a19130d4b1..8e7ae63750 100644
--- a/epan/dissectors/packet-dcom-provideclassinfo.c
+++ b/epan/dissectors/packet-dcom-provideclassinfo.c
@@ -21,13 +21,13 @@
 void proto_register_dcom_provideclassinfo(void);
 void proto_reg_handoff_dcom_provideclassinfo(void);
 
-static int hf_provideclassinfo_opnum = -1;
-static int hf_typeinfo = -1;
+static int hf_provideclassinfo_opnum;
+static int hf_typeinfo;
 
 static e_guid_t uuid_provideclassinfo = { 0xb196b283, 0xbab4, 0x101a, { 0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07} };
 static guint16 ver_provideclassinfo = 0;
-static gint ett_provideclassinfo = -1;
-static int proto_provideclassinfo = -1;
+static gint ett_provideclassinfo;
+static int proto_provideclassinfo;
 
 static int dissect_IProvideClassInfo_GetClassInfo_rqst(tvbuff_t *tvb, int offset,
                                             packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep)
diff --git a/epan/dissectors/packet-dcom-remact.c b/epan/dissectors/packet-dcom-remact.c
index 4a8ed97dfb..9193928d4b 100644
--- a/epan/dissectors/packet-dcom-remact.c
+++ b/epan/dissectors/packet-dcom-remact.c
@@ -21,23 +21,23 @@
 void proto_register_remact(void);
 void proto_reg_handoff_remact(void);
 
-static int hf_remact_opnum = -1;
+static int hf_remact_opnum;
 
-static int hf_remact_requested_protseqs = -1;
-static int hf_remact_protseqs = -1;
-static int hf_remact_interfaces = -1;
-static int hf_remact_mode = -1;
-static int hf_remact_client_impl_level = -1;
-static int hf_remact_object_name = -1;
-static int hf_remact_object_storage = -1;
-static int hf_remact_interface_data = -1;
+static int hf_remact_requested_protseqs;
+static int hf_remact_protseqs;
+static int hf_remact_interfaces;
+static int hf_remact_mode;
+static int hf_remact_client_impl_level;
+static int hf_remact_object_name;
+static int hf_remact_object_storage;
+static int hf_remact_interface_data;
 
-static int hf_remact_oxid_bindings = -1;
-static int hf_remact_authn_hint = -1;
+static int hf_remact_oxid_bindings;
+static int hf_remact_authn_hint;
 
 
-static int proto_remact = -1;
-static gint ett_remact = -1;
+static int proto_remact;
+static gint ett_remact;
 static e_guid_t uuid_remact = { 0x4d9f4ab8, 0x7d1c, 0x11cf, { 0x86, 0x1e, 0x00, 0x20, 0xaf, 0x6e, 0x7c, 0x57 } };
 static guint16  ver_remact = 0;
 
diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c
index 3e020d39b9..702e20d4c8 100644
--- a/epan/dissectors/packet-dcom-remunkn.c
+++ b/epan/dissectors/packet-dcom-remunkn.c
@@ -20,29 +20,29 @@
 void proto_register_remunk(void);
 void proto_reg_handoff_remunk(void);
 
-static int hf_remunk_opnum = -1;
+static int hf_remunk_opnum;
 
 
-static int hf_remunk_refs = -1;
-static int hf_remunk_iids = -1;
+static int hf_remunk_refs;
+static int hf_remunk_iids;
 
-/* static int hf_remunk_flags = -1; */
-static int hf_remunk_qiresult = -1;
+/* static int hf_remunk_flags; */
+static int hf_remunk_qiresult;
 
-static gint ett_remunk_reminterfaceref = -1;
-static int hf_remunk_reminterfaceref = -1;
-static int hf_remunk_interface_refs = -1;
-static int hf_remunk_public_refs = -1;
-static int hf_remunk_private_refs = -1;
+static gint ett_remunk_reminterfaceref;
+static int hf_remunk_reminterfaceref;
+static int hf_remunk_interface_refs;
+static int hf_remunk_public_refs;
+static int hf_remunk_private_refs;
 
 
-static gint ett_remunk_rqi_result = -1;
+static gint ett_remunk_rqi_result;
 
 
-static gint ett_remunk = -1;
+static gint ett_remunk;
 static e_guid_t uuid_remunk = { 0x00000131, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } };
 static guint16  ver_remunk = 0;
-static int proto_remunk = -1;
+static int proto_remunk;
 
 static e_guid_t ipid_remunk = { 0x00000131, 0x1234, 0x5678, { 0xCA, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } };
 
@@ -52,10 +52,10 @@ static e_guid_t ipid_remunk = { 0x00000131, 0x1234, 0x5678, { 0xCA, 0xFE, 0x00,
 /* win2000 registry tells us: 0x00000143 IRemUnknown2 (7 methods) */
 /* There is some evidence, that the DCOM documentation is wrong, so using 143 for IRemUnknown2 now. */
 
-static gint ett_remunk2 = -1;
+static gint ett_remunk2;
 static e_guid_t uuid_remunk2 = { 0x00000143, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } };
 static guint16  ver_remunk2 = 0;
-static int proto_remunk2 = -1;
+static int proto_remunk2;
 
 
 typedef struct remunk_remqueryinterface_call_s {
diff --git a/epan/dissectors/packet-dcom-sysact.c b/epan/dissectors/packet-dcom-sysact.c
index 51455fd5b2..4603837e1b 100644
--- a/epan/dissectors/packet-dcom-sysact.c
+++ b/epan/dissectors/packet-dcom-sysact.c
@@ -19,111 +19,111 @@
 void proto_register_ISystemActivator(void);
 void proto_reg_handoff_ISystemActivator(void);
 
-static int proto_ISystemActivator = -1;
-
-static gint ett_isystemactivator = -1;
-static int hf_opnum = -1;
-static int hf_sysact_actproperties = -1;
-/* static int hf_sysact_unknown = -1; */
-
-static gint ett_actproperties = -1;
-static int hf_sysact_totalsize = -1;
-static int hf_sysact_res = -1;
-
-static gint ett_commonheader = -1;
-static gint ett_propguids = -1;
-static gint ett_properties = -1;
-static int hf_sysact_customhdrsize = -1;
-static int hf_sysact_dstctx = -1;
-static int hf_sysact_actpropnumber = -1;
-static int hf_sysact_actpropclsinfoid = -1;
-/* static int hf_sysact_actpropclsids = -1; */
-static int hf_sysact_actpropclsid = -1;
-/* static int hf_sysact_actpropsizes = -1; */
-static int hf_sysact_actpropsize = -1;
-
-
-static gint ett_dcom_spclsysprop = -1;
-static gint ett_dcom_reserved = -1;
-static int hf_sysact_spsysprop_sid = -1;
-static int hf_sysact_spsysprop_remotethissid = -1;
-static int hf_sysact_spsysprop_cltimpersonating = -1;
-static int hf_sysact_spsysprop_partitionid = -1;
-static int hf_sysact_spsysprop_defauthlvl = -1;
-static int hf_sysact_spsysprop_partition = -1;
-static int hf_sysact_spsysprop_procrqstflgs = -1;
-static int hf_sysact_spsysprop_origclsctx = -1;
-static int hf_sysact_spsysprop_flags = -1;
-/* static int hf_sysact_spsysprop_procid = -1; */
-/* static int hf_sysact_spsysprop_hwnd = -1; */
-
-static gint ett_dcom_instantianinfo = -1;
-static int hf_sysact_instninfo_clsid = -1;
-static int hf_sysact_instninfo_clsctx = -1;
-static int hf_sysact_instninfo_actflags = -1;
-static int hf_sysact_instninfo_issurrogate = -1;
-static int hf_sysact_instninfo_iidcount = -1;
-static int hf_sysact_instninfo_instflags = -1;
-static int hf_sysact_instninfo_entiresize = -1;
-static int hf_sysact_instninfo_iid = -1;
-
-static gint ett_dcom_actctxinfo = -1;
-static int hf_sysact_actctxinfo_cltok = -1;
-static int hf_sysact_context = -1;
-
-static gint ett_dcom_context = -1;
-static int hf_sysact_ctx_id = -1;
-static int hf_sysact_ctx_flags = -1;
-static int hf_sysact_ctx_res = -1;
-static int hf_sysact_ctx_numextents = -1;
-static int hf_sysact_ctx_extentscnt = -1;
-static int hf_sysact_ctx_mashflags = -1;
-static int hf_sysact_ctx_count = -1;
-static int hf_sysact_ctx_frozen = -1;
-
-static gint ett_dcom_securityinfo = -1;
-static int hf_sysact_si_authflalgs = -1;
-static int hf_sysact_si_ci_res = -1;
-static int hf_sysact_si_ci_string = -1;
-static int hf_sysact_si_serverinfo = -1;
-
-static gint ett_dcom_locationinfo = -1;
-static int hf_sysact_li_string = -1;
-static int hf_sysact_li_procid = -1;
-static int hf_sysact_li_apartid = -1;
-static int hf_sysact_li_ctxid = -1;
-
-static gint ett_dcom_scmrqstinfo = -1;
-static gint ett_dcom_rmtrqst = -1;
-
-static int hf_sysact_sri_cltimplvl = -1;
-static int hf_sysact_sri_protseqnum = -1;
-static int hf_sysact_sri_protseq = -1;
-
-static gint ett_dcom_propsoutput = -1;
-static int hf_sysact_pi_ifnum = -1;
-static int hf_sysact_pi_retval = -1;
-static int hf_sysact_pi_interf = -1;
-static int hf_sysact_pi_iid = -1;
-
-static gint ett_dcom_scmrespinfo = -1;
-static gint ett_dcom_rmtresp = -1;
-static gint ett_dcom_oxidbinding = -1;
-static int hf_sysact_scmri_rmtunknid = -1;
-static int hf_sysact_scmri_authhint = -1;
-static int hf_sysact_scmri_binding = -1;
-static int hf_sysact_scmri_oxid = -1;
-static int hf_sysact_unused_buffer = -1;
-
-static gint ett_typeszcommhdr = -1;
-static gint ett_typeszprivhdr = -1;
-static int hf_typeszch = -1;
-static int hf_typeszph = -1;
-static int hf_typesz_ver = -1;
-static int hf_typesz_endianness = -1;
-static int hf_typesz_commhdrlen = -1;
-static int hf_typesz_filler = -1;
-static int hf_typesz_buflen = -1;
+static int proto_ISystemActivator;
+
+static gint ett_isystemactivator;
+static int hf_opnum;
+static int hf_sysact_actproperties;
+/* static int hf_sysact_unknown; */
+
+static gint ett_actproperties;
+static int hf_sysact_totalsize;
+static int hf_sysact_res;
+
+static gint ett_commonheader;
+static gint ett_propguids;
+static gint ett_properties;
+static int hf_sysact_customhdrsize;
+static int hf_sysact_dstctx;
+static int hf_sysact_actpropnumber;
+static int hf_sysact_actpropclsinfoid;
+/* static int hf_sysact_actpropclsids; */
+static int hf_sysact_actpropclsid;
+/* static int hf_sysact_actpropsizes; */
+static int hf_sysact_actpropsize;
+
+
+static gint ett_dcom_spclsysprop;
+static gint ett_dcom_reserved;
+static int hf_sysact_spsysprop_sid;
+static int hf_sysact_spsysprop_remotethissid;
+static int hf_sysact_spsysprop_cltimpersonating;
+static int hf_sysact_spsysprop_partitionid;
+static int hf_sysact_spsysprop_defauthlvl;
+static int hf_sysact_spsysprop_partition;
+static int hf_sysact_spsysprop_procrqstflgs;
+static int hf_sysact_spsysprop_origclsctx;
+static int hf_sysact_spsysprop_flags;
+/* static int hf_sysact_spsysprop_procid; */
+/* static int hf_sysact_spsysprop_hwnd; */
+
+static gint ett_dcom_instantianinfo;
+static int hf_sysact_instninfo_clsid;
+static int hf_sysact_instninfo_clsctx;
+static int hf_sysact_instninfo_actflags;
+static int hf_sysact_instninfo_issurrogate;
+static int hf_sysact_instninfo_iidcount;
+static int hf_sysact_instninfo_instflags;
+static int hf_sysact_instninfo_entiresize;
+static int hf_sysact_instninfo_iid;
+
+static gint ett_dcom_actctxinfo;
+static int hf_sysact_actctxinfo_cltok;
+static int hf_sysact_context;
+
+static gint ett_dcom_context;
+static int hf_sysact_ctx_id;
+static int hf_sysact_ctx_flags;
+static int hf_sysact_ctx_res;
+static int hf_sysact_ctx_numextents;
+static int hf_sysact_ctx_extentscnt;
+static int hf_sysact_ctx_mashflags;
+static int hf_sysact_ctx_count;
+static int hf_sysact_ctx_frozen;
+
+static gint ett_dcom_securityinfo;
+static int hf_sysact_si_authflalgs;
+static int hf_sysact_si_ci_res;
+static int hf_sysact_si_ci_string;
+static int hf_sysact_si_serverinfo;
+
+static gint ett_dcom_locationinfo;
+static int hf_sysact_li_string;
+static int hf_sysact_li_procid;
+static int hf_sysact_li_apartid;
+static int hf_sysact_li_ctxid;
+
+static gint ett_dcom_scmrqstinfo;
+static gint ett_dcom_rmtrqst;
+
+static int hf_sysact_sri_cltimplvl;
+static int hf_sysact_sri_protseqnum;
+static int hf_sysact_sri_protseq;
+
+static gint ett_dcom_propsoutput;
+static int hf_sysact_pi_ifnum;
+static int hf_sysact_pi_retval;
+static int hf_sysact_pi_interf;
+static int hf_sysact_pi_iid;
+
+static gint ett_dcom_scmrespinfo;
+static gint ett_dcom_rmtresp;
+static gint ett_dcom_oxidbinding;
+static int hf_sysact_scmri_rmtunknid;
+static int hf_sysact_scmri_authhint;
+static int hf_sysact_scmri_binding;
+static int hf_sysact_scmri_oxid;
+static int hf_sysact_unused_buffer;
+
+static gint ett_typeszcommhdr;
+static gint ett_typeszprivhdr;
+static int hf_typeszch;
+static int hf_typeszph;
+static int hf_typesz_ver;
+static int hf_typesz_endianness;
+static int hf_typesz_commhdrlen;
+static int hf_typesz_filler;
+static int hf_typesz_buflen;
 
 static e_guid_t uuid_ISystemActivator = { 0x000001a0, 0x0000, 0x0000, { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46 } };
 static guint16  ver_ISystemActivator = 0;
diff --git a/epan/dissectors/packet-dcom-typeinfo.c b/epan/dissectors/packet-dcom-typeinfo.c
index 922883546e..fd45777c67 100644
--- a/epan/dissectors/packet-dcom-typeinfo.c
+++ b/epan/dissectors/packet-dcom-typeinfo.c
@@ -22,23 +22,23 @@
 void proto_register_dcom_typeinfo(void);
 void proto_reg_handoff_dcom_typeinfo(void);
 
-static gint ett_typeinfo_funcdesc = -1;
-static int hf_typeinfo_funcdesc = -1;
-static int hf_typeinfo_funcdesc_funcflags = -1;
-static gint ett_typeinfo_funcdesc_funcflags = -1;
-static int hf_typeinfo_funcdesc_funcflags_frestricted = -1;
-static int hf_typeinfo_funcdesc_funcflags_fsource = -1;
-static int hf_typeinfo_funcdesc_funcflags_fbindable = -1;
-static int hf_typeinfo_funcdesc_funcflags_frequestedit = -1;
-static int hf_typeinfo_funcdesc_funcflags_fdisplaybind = -1;
-static int hf_typeinfo_funcdesc_funcflags_fdefaultbind = -1;
-static int hf_typeinfo_funcdesc_funcflags_fhidden = -1;
-static int hf_typeinfo_funcdesc_funcflags_fusesgetlasterror = -1;
-static int hf_typeinfo_funcdesc_funcflags_fdefaultcollelem = -1;
-static int hf_typeinfo_funcdesc_funcflags_fuidefault = -1;
-static int hf_typeinfo_funcdesc_funcflags_fnowbrowsable = -1;
-static int hf_typeinfo_funcdesc_funcflags_freplaceable = -1;
-static int hf_typeinfo_funcdesc_funcflags_fimmediatebind = -1;
+static gint ett_typeinfo_funcdesc;
+static int hf_typeinfo_funcdesc;
+static int hf_typeinfo_funcdesc_funcflags;
+static gint ett_typeinfo_funcdesc_funcflags;
+static int hf_typeinfo_funcdesc_funcflags_frestricted;
+static int hf_typeinfo_funcdesc_funcflags_fsource;
+static int hf_typeinfo_funcdesc_funcflags_fbindable;
+static int hf_typeinfo_funcdesc_funcflags_frequestedit;
+static int hf_typeinfo_funcdesc_funcflags_fdisplaybind;
+static int hf_typeinfo_funcdesc_funcflags_fdefaultbind;
+static int hf_typeinfo_funcdesc_funcflags_fhidden;
+static int hf_typeinfo_funcdesc_funcflags_fusesgetlasterror;
+static int hf_typeinfo_funcdesc_funcflags_fdefaultcollelem;
+static int hf_typeinfo_funcdesc_funcflags_fuidefault;
+static int hf_typeinfo_funcdesc_funcflags_fnowbrowsable;
+static int hf_typeinfo_funcdesc_funcflags_freplaceable;
+static int hf_typeinfo_funcdesc_funcflags_fimmediatebind;
 
 #define FUNCFLAG_FRESTRICTED 0x1
 #define FUNCFLAG_FSOURCE 0x2
@@ -54,32 +54,32 @@ static int hf_typeinfo_funcdesc_funcflags_fimmediatebind = -1;
 #define FUNCFLAG_FREPLACEABLE 0x800
 #define FUNCFLAG_FIMMEDIATEBIND 0x1000
 
-static int hf_typeinfo_funcdesc_funckind = -1;
-static int hf_typeinfo_funcdesc_invkind = -1;
-static int hf_typeinfo_funcdesc_callconv = -1;
-static int hf_typeinfo_funcdesc_params = -1;
-static int hf_typeinfo_funcdesc_paramsopt = -1;
-static int hf_typeinfo_funcdesc_memid = -1;
-static int hf_typeinfo_funcdesc_vft = -1;
-static int hf_typeinfo_funcdesc_resv16 = -1;
-static int hf_typeinfo_funcdesc_resv32 = -1;
-static gint ett_typeinfo_elemdesc = -1;
-static int hf_typeinfo_funcdesc_elemdesc = -1;
-
-static gint ett_typeinfo_typedesc = -1;
-static int hf_typeinfo_typedesc = -1;
-
-static gint ett_typeinfo_paramdesc = -1;
-static int hf_typeinfo_paramdesc = -1;
-static gint ett_typeinfo_paramdesc_paramflags = -1;
-static int hf_typeinfo_paramdesc_paramflags = -1;
-static int hf_typeinfo_paramdesc_paramflags_fin = -1;
-static int hf_typeinfo_paramdesc_paramflags_fout = -1;
-static int hf_typeinfo_paramdesc_paramflags_flcid = -1;
-static int hf_typeinfo_paramdesc_paramflags_fretval = -1;
-static int hf_typeinfo_paramdesc_paramflags_fopt = -1;
-static int hf_typeinfo_paramdesc_paramflags_fhasdefault = -1;
-static int hf_typeinfo_paramdesc_paramflags_fhascustdata = -1;
+static int hf_typeinfo_funcdesc_funckind;
+static int hf_typeinfo_funcdesc_invkind;
+static int hf_typeinfo_funcdesc_callconv;
+static int hf_typeinfo_funcdesc_params;
+static int hf_typeinfo_funcdesc_paramsopt;
+static int hf_typeinfo_funcdesc_memid;
+static int hf_typeinfo_funcdesc_vft;
+static int hf_typeinfo_funcdesc_resv16;
+static int hf_typeinfo_funcdesc_resv32;
+static gint ett_typeinfo_elemdesc;
+static int hf_typeinfo_funcdesc_elemdesc;
+
+static gint ett_typeinfo_typedesc;
+static int hf_typeinfo_typedesc;
+
+static gint ett_typeinfo_paramdesc;
+static int hf_typeinfo_paramdesc;
+static gint ett_typeinfo_paramdesc_paramflags;
+static int hf_typeinfo_paramdesc_paramflags;
+static int hf_typeinfo_paramdesc_paramflags_fin;
+static int hf_typeinfo_paramdesc_paramflags_fout;
+static int hf_typeinfo_paramdesc_paramflags_flcid;
+static int hf_typeinfo_paramdesc_paramflags_fretval;
+static int hf_typeinfo_paramdesc_paramflags_fopt;
+static int hf_typeinfo_paramdesc_paramflags_fhasdefault;
+static int hf_typeinfo_paramdesc_paramflags_fhascustdata;
 
 #define PARAMFLAG_FIN 0x1
 #define PARAMFLAG_FOUT 0x2
@@ -89,58 +89,58 @@ static int hf_typeinfo_paramdesc_paramflags_fhascustdata = -1;
 #define PARAMFLAG_FHASDEFAULT 0x20
 #define PARAMFLAG_FHASCUSTDATA 0x40
 
-static gint ett_typeinfo_paramdescex = -1;
-static int hf_typeinfo_paramdescex = -1;
-static int hf_typeinfo_paramdescex_cbytes = -1;
-static int hf_typeinfo_paramdescex_varDefaultValue = -1;
+static gint ett_typeinfo_paramdescex;
+static int hf_typeinfo_paramdescex;
+static int hf_typeinfo_paramdescex_cbytes;
+static int hf_typeinfo_paramdescex_varDefaultValue;
 
-static int hf_typeinfo_typedesc_vtret = -1;
-static int hf_typeinfo_typedesc_hreftype = -1;
+static int hf_typeinfo_typedesc_vtret;
+static int hf_typeinfo_typedesc_hreftype;
 
-static int hf_typeinfo_opnum = -1;
-static int hf_typeinfo_index = -1;
+static int hf_typeinfo_opnum;
+static int hf_typeinfo_index;
 
-static int hf_typeinfo_memid = -1;
-static int hf_typeinfo_reserved32 = -1;
-static int hf_typeinfo_reserved16 = -1;
+static int hf_typeinfo_memid;
+static int hf_typeinfo_reserved32;
+static int hf_typeinfo_reserved16;
 
-static int hf_typeinfo_names = -1;
-static int hf_typeinfo_names_value = -1;
-static int hf_typeinfo_maxnames = -1;
+static int hf_typeinfo_names;
+static int hf_typeinfo_names_value;
+static int hf_typeinfo_maxnames;
 
-static int hf_typeinfo_docname = -1;
-static int hf_typeinfo_docstring = -1;
-static int hf_typeinfo_helpctx = -1;
-static int hf_typeinfo_helpfile = -1;
+static int hf_typeinfo_docname;
+static int hf_typeinfo_docstring;
+static int hf_typeinfo_helpctx;
+static int hf_typeinfo_helpfile;
 
-static gint ett_typeinfo_docflags = -1;
-static int hf_typeinfo_docflags = -1;
-static int hf_typeinfo_docflags_name = -1;
-static int hf_typeinfo_docflags_docstring = -1;
-static int hf_typeinfo_docflags_helpctx = -1;
-static int hf_typeinfo_docflags_helpfile = -1;
+static gint ett_typeinfo_docflags;
+static int hf_typeinfo_docflags;
+static int hf_typeinfo_docflags_name;
+static int hf_typeinfo_docflags_docstring;
+static int hf_typeinfo_docflags_helpctx;
+static int hf_typeinfo_docflags_helpfile;
 
 #define TYPEINFO_DOCFLAGS_NameArg 1
 #define TYPEINFO_DOCFLAGS_DocStringArg 2
 #define TYPEINFO_DOCFLAGS_HelpContextArg 4
 #define TYPEINFO_DOCFLAGS_HelpFileArg 8
 
-static gint ett_typeinfo_typeflags = -1;
-static int hf_typeinfo_typeflags = -1;
-static int hf_typeinfo_typeflags_fappobject = -1;
-static int hf_typeinfo_typeflags_fcancreate = -1;
-static int hf_typeinfo_typeflags_flicensed = -1;
-static int hf_typeinfo_typeflags_fpredeclid = -1;
-static int hf_typeinfo_typeflags_fhidden = -1;
-static int hf_typeinfo_typeflags_fcontrol = -1;
-static int hf_typeinfo_typeflags_fdual = -1;
-static int hf_typeinfo_typeflags_fnonextensible = -1;
-static int hf_typeinfo_typeflags_foleautomation = -1;
-static int hf_typeinfo_typeflags_frestricted = -1;
-static int hf_typeinfo_typeflags_faggregatable = -1;
-static int hf_typeinfo_typeflags_freplaceable = -1;
-static int hf_typeinfo_typeflags_fdispatchable = -1;
-static int hf_typeinfo_typeflags_fproxy = -1;
+static gint ett_typeinfo_typeflags;
+static int hf_typeinfo_typeflags;
+static int hf_typeinfo_typeflags_fappobject;
+static int hf_typeinfo_typeflags_fcancreate;
+static int hf_typeinfo_typeflags_flicensed;
+static int hf_typeinfo_typeflags_fpredeclid;
+static int hf_typeinfo_typeflags_fhidden;
+static int hf_typeinfo_typeflags_fcontrol;
+static int hf_typeinfo_typeflags_fdual;
+static int hf_typeinfo_typeflags_fnonextensible;
+static int hf_typeinfo_typeflags_foleautomation;
+static int hf_typeinfo_typeflags_frestricted;
+static int hf_typeinfo_typeflags_faggregatable;
+static int hf_typeinfo_typeflags_freplaceable;
+static int hf_typeinfo_typeflags_fdispatchable;
+static int hf_typeinfo_typeflags_fproxy;
 
 #define TYPEINFO_TYPEFLAG_FAPPOBJECT 0x1
 #define TYPEINFO_TYPEFLAG_FCANCREATE 0x2
@@ -157,26 +157,26 @@ static int hf_typeinfo_typeflags_fproxy = -1;
 #define TYPEINFO_TYPEFLAG_FDISPATCHABLE 0x1000
 #define TYPEINFO_TYPEFLAG_FPROXY 0x4000
 
-static gint ett_typeinfo_typeattr = -1;
-static int hf_typeinfo_typeattr = -1;
-static int hf_typeinfo_guid = -1;
-static int hf_typeinfo_lcid = -1;
-static int hf_typeinfo_sizeInstance = -1;
-static int hf_typeinfo_typekind = -1;
-static int hf_typeinfo_cFuncs = -1;
-static int hf_typeinfo_cVars = -1;
-static int hf_typeinfo_cImplTypes = -1;
-static int hf_typeinfo_cbSizeVft = -1;
-static int hf_typeinfo_cbAlignment = -1;
-static int hf_typeinfo_wMajorVerNum = -1;
-static int hf_typeinfo_wMinorVerNum = -1;
-
-static gint ett_typeinfo_names = -1;
+static gint ett_typeinfo_typeattr;
+static int hf_typeinfo_typeattr;
+static int hf_typeinfo_guid;
+static int hf_typeinfo_lcid;
+static int hf_typeinfo_sizeInstance;
+static int hf_typeinfo_typekind;
+static int hf_typeinfo_cFuncs;
+static int hf_typeinfo_cVars;
+static int hf_typeinfo_cImplTypes;
+static int hf_typeinfo_cbSizeVft;
+static int hf_typeinfo_cbAlignment;
+static int hf_typeinfo_wMajorVerNum;
+static int hf_typeinfo_wMinorVerNum;
+
+static gint ett_typeinfo_names;
 
 static e_guid_t uuid_typeinfo = {0x00020401, 0x0000, 0x0000, {0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}};
 static guint16 ver_typeinfo = 0;
-static gint ett_typeinfo = -1;
-static int proto_typeinfo = -1;
+static gint ett_typeinfo;
+static int proto_typeinfo;
 
 static const value_string dcom_lcid_vals[] = {
     {0x0000, "Language neutral"},
diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c
index 14f7d601b1..4b621748ac 100644
--- a/epan/dissectors/packet-dcom.c
+++ b/epan/dissectors/packet-dcom.c
@@ -67,137 +67,137 @@
 void proto_register_dcom (void);
 void proto_reg_handoff_dcom (void);
 
-static int proto_dcom = -1;
+static int proto_dcom;
 
 gboolean dcom_prefs_display_unmarshalling_details = FALSE;
 
 
-static gint ett_dcom_this = -1;
-/* static int hf_dcom_this_version_major = -1; */
-/* static int hf_dcom_this_version_minor = -1; */
-static int hf_dcom_this_flags = -1;
-static int hf_dcom_this_res = -1;
-static int hf_dcom_this_cid = -1;
+static gint ett_dcom_this;
+/* static int hf_dcom_this_version_major; */
+/* static int hf_dcom_this_version_minor; */
+static int hf_dcom_this_flags;
+static int hf_dcom_this_res;
+static int hf_dcom_this_cid;
 
-static gint ett_dcom_that = -1;
-static int hf_dcom_that_flags = -1;
+static gint ett_dcom_that;
+static int hf_dcom_that_flags;
 
-static gint ett_dcom_extent = -1;
-static int hf_dcom_extent = -1;
-static int hf_dcom_extent_array_count = -1;
-static int hf_dcom_extent_array_res = -1;
-static int hf_dcom_extent_size = -1;
-static int hf_dcom_extent_id = -1;
+static gint ett_dcom_extent;
+static int hf_dcom_extent;
+static int hf_dcom_extent_array_count;
+static int hf_dcom_extent_array_res;
+static int hf_dcom_extent_size;
+static int hf_dcom_extent_id;
 
-static int hf_dcom_hresult = -1;
-static int hf_dcom_tobedone = -1;
-static int hf_dcom_nospec = -1;
-static int hf_dcom_array_size = -1;
-static int hf_dcom_pointer_val = -1;
+static int hf_dcom_hresult;
+static int hf_dcom_tobedone;
+static int hf_dcom_nospec;
+static int hf_dcom_array_size;
+static int hf_dcom_pointer_val;
 
 /* COMVERSION */
-static int hf_dcom_version_major = -1;
-static int hf_dcom_version_minor = -1;
-
-static gint ett_dcom_lpwstr = -1;
-static int hf_dcom_max_count = -1;
-static int hf_dcom_offset = -1;
-static int hf_dcom_byte_length = -1;
-/* static int hf_dcom_actual_count = -1; */
-
-static gint ett_dcom_objref = -1;
-static int hf_dcom_objref = -1;
-static int hf_dcom_objref_signature = -1;
-static int hf_dcom_objref_flags = -1;
-int hf_dcom_iid = -1;
-int hf_dcom_clsid = -1;
-static int hf_dcom_objref_resolver_address = -1;
-static int hf_dcom_objref_cbextension = -1;
-static int hf_dcom_objref_size = -1;
-
-static gint ett_dcom_stdobjref = -1;
-static int hf_dcom_stdobjref = -1;
-static int hf_dcom_stdobjref_flags = -1;
-static int hf_dcom_stdobjref_public_refs = -1;
-int hf_dcom_oxid = -1;
-int hf_dcom_oid = -1;
-int hf_dcom_ipid = -1;
-
-
-static gint ett_dcom_custobjref = -1;
-static int hf_dcom_custobjref = -1;
-
-static gint ett_dcom_dualstringarray = -1;
-static gint ett_dcom_dualstringarray_binding = -1;
-static int hf_dcom_dualstringarray_num_entries = -1;
-static int hf_dcom_dualstringarray_security_offset = -1;
-static int hf_dcom_dualstringarray_string = -1;
-static int hf_dcom_dualstringarray_string_network_addr = -1;
-static int hf_dcom_dualstringarray_string_tower_id = -1;
-static int hf_dcom_dualstringarray_security = -1;
-static int hf_dcom_dualstringarray_security_authn_svc = -1;
-static int hf_dcom_dualstringarray_security_authz_svc = -1;
-static int hf_dcom_dualstringarray_security_princ_name = -1;
-
-static gint ett_dcom_interface_pointer = -1;
-static int hf_dcom_interface_pointer = -1;
-static int hf_dcom_ip_cnt_data = -1;
-
-static gint ett_dcom_safearray = -1;
-static int hf_dcom_safearray = -1;
-static int hf_dcom_sa_dims32 = -1;
-static int hf_dcom_sa_dims16 = -1;
-static int hf_dcom_sa_features = -1;
-static int hf_dcom_sa_element_size = -1;
-static int hf_dcom_sa_locks = -1;
-static int hf_dcom_sa_vartype32 = -1;
-static int hf_dcom_sa_vartype16 = -1;
-static int hf_dcom_sa_elements = -1;
-static int hf_dcom_sa_bound_elements = -1;
-static int hf_dcom_sa_low_bound = -1;
-
-static gint ett_dcom_sa_features = -1;
-static int hf_dcom_sa_features_auto = -1;
-static int hf_dcom_sa_features_static = -1;
-static int hf_dcom_sa_features_embedded = -1;
-static int hf_dcom_sa_features_fixedsize = -1;
-static int hf_dcom_sa_features_record = -1;
-static int hf_dcom_sa_features_have_iid = -1;
-static int hf_dcom_sa_features_have_vartype = -1;
-static int hf_dcom_sa_features_bstr = -1;
-static int hf_dcom_sa_features_unknown = -1;
-static int hf_dcom_sa_features_dispatch = -1;
-static int hf_dcom_sa_features_variant = -1;
-
-static gint ett_dcom_variant = -1;
-/* static int hf_dcom_variant = -1; */
-static int hf_dcom_variant_type = -1;
-static int hf_dcom_variant_size = -1;
-static int hf_dcom_variant_rpc_res = -1;
-static int hf_dcom_variant_wres = -1;
-static int hf_dcom_variant_type32 = -1;
-
-static int hf_dcom_vt_bool = -1;
-static int hf_dcom_vt_i1 = -1;
-static int hf_dcom_vt_i2 = -1;
-static int hf_dcom_vt_i4 = -1;
-static int hf_dcom_vt_i8 = -1;	/* only inside a SAFEARRAY, not in VARIANTs */
-static int hf_dcom_vt_cy = -1;
-static int hf_dcom_vt_ui1 = -1;
-static int hf_dcom_vt_ui2 = -1;
-static int hf_dcom_vt_ui4 = -1;
-static int hf_dcom_vt_ui8 = -1;
-static int hf_dcom_vt_r4 = -1;
-static int hf_dcom_vt_r8 = -1;
-static int hf_dcom_vt_date = -1;
-static int hf_dcom_vt_bstr = -1;
-static int hf_dcom_vt_byref = -1;
-static int hf_dcom_vt_dispatch = -1;
-
-static expert_field ei_dcom_dissection_incomplete = EI_INIT;
-static expert_field ei_dcom_no_spec = EI_INIT;
-static expert_field ei_dcom_hresult_expert = EI_INIT;
-static expert_field ei_dcom_dualstringarray_mult_ip = EI_INIT;
+static int hf_dcom_version_major;
+static int hf_dcom_version_minor;
+
+static gint ett_dcom_lpwstr;
+static int hf_dcom_max_count;
+static int hf_dcom_offset;
+static int hf_dcom_byte_length;
+/* static int hf_dcom_actual_count; */
+
+static gint ett_dcom_objref;
+static int hf_dcom_objref;
+static int hf_dcom_objref_signature;
+static int hf_dcom_objref_flags;
+int hf_dcom_iid;
+int hf_dcom_clsid;
+static int hf_dcom_objref_resolver_address;
+static int hf_dcom_objref_cbextension;
+static int hf_dcom_objref_size;
+
+static gint ett_dcom_stdobjref;
+static int hf_dcom_stdobjref;
+static int hf_dcom_stdobjref_flags;
+static int hf_dcom_stdobjref_public_refs;
+int hf_dcom_oxid;
+int hf_dcom_oid;
+int hf_dcom_ipid;
+
+
+static gint ett_dcom_custobjref;
+static int hf_dcom_custobjref;
+
+static gint ett_dcom_dualstringarray;
+static gint ett_dcom_dualstringarray_binding;
+static int hf_dcom_dualstringarray_num_entries;
+static int hf_dcom_dualstringarray_security_offset;
+static int hf_dcom_dualstringarray_string;
+static int hf_dcom_dualstringarray_string_network_addr;
+static int hf_dcom_dualstringarray_string_tower_id;
+static int hf_dcom_dualstringarray_security;
+static int hf_dcom_dualstringarray_security_authn_svc;
+static int hf_dcom_dualstringarray_security_authz_svc;
+static int hf_dcom_dualstringarray_security_princ_name;
+
+static gint ett_dcom_interface_pointer;
+static int hf_dcom_interface_pointer;
+static int hf_dcom_ip_cnt_data;
+
+static gint ett_dcom_safearray;
+static int hf_dcom_safearray;
+static int hf_dcom_sa_dims32;
+static int hf_dcom_sa_dims16;
+static int hf_dcom_sa_features;
+static int hf_dcom_sa_element_size;
+static int hf_dcom_sa_locks;
+static int hf_dcom_sa_vartype32;
+static int hf_dcom_sa_vartype16;
+static int hf_dcom_sa_elements;
+static int hf_dcom_sa_bound_elements;
+static int hf_dcom_sa_low_bound;
+
+static gint ett_dcom_sa_features;
+static int hf_dcom_sa_features_auto;
+static int hf_dcom_sa_features_static;
+static int hf_dcom_sa_features_embedded;
+static int hf_dcom_sa_features_fixedsize;
+static int hf_dcom_sa_features_record;
+static int hf_dcom_sa_features_have_iid;
+static int hf_dcom_sa_features_have_vartype;
+static int hf_dcom_sa_features_bstr;
+static int hf_dcom_sa_features_unknown;
+static int hf_dcom_sa_features_dispatch;
+static int hf_dcom_sa_features_variant;
+
+static gint ett_dcom_variant;
+/* static int hf_dcom_variant; */
+static int hf_dcom_variant_type;
+static int hf_dcom_variant_size;
+static int hf_dcom_variant_rpc_res;
+static int hf_dcom_variant_wres;
+static int hf_dcom_variant_type32;
+
+static int hf_dcom_vt_bool;
+static int hf_dcom_vt_i1;
+static int hf_dcom_vt_i2;
+static int hf_dcom_vt_i4;
+static int hf_dcom_vt_i8;	/* only inside a SAFEARRAY, not in VARIANTs */
+static int hf_dcom_vt_cy;
+static int hf_dcom_vt_ui1;
+static int hf_dcom_vt_ui2;
+static int hf_dcom_vt_ui4;
+static int hf_dcom_vt_ui8;
+static int hf_dcom_vt_r4;
+static int hf_dcom_vt_r8;
+static int hf_dcom_vt_date;
+static int hf_dcom_vt_bstr;
+static int hf_dcom_vt_byref;
+static int hf_dcom_vt_dispatch;
+
+static expert_field ei_dcom_dissection_incomplete;
+static expert_field ei_dcom_no_spec;
+static expert_field ei_dcom_hresult_expert;
+static expert_field ei_dcom_dualstringarray_mult_ip;
 
 /* this/that extension UUIDs */
 static e_guid_t uuid_debug_ext =    { 0xf1f19680, 0x4d2a, 0x11ce, { 0xa6, 0x6a, 0x00, 0x20, 0xaf, 0x6e, 0x72, 0xf4} };
diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c
index 96cadfcc2e..0a02362059 100644
--- a/epan/dissectors/packet-dcp-etsi.c
+++ b/epan/dissectors/packet-dcp-etsi.c
@@ -36,62 +36,62 @@ static dissector_table_t dcp_dissector_table;
 static dissector_table_t af_dissector_table;
 static dissector_table_t tpl_dissector_table;
 
-static int proto_dcp_etsi = -1;
-static int proto_af = -1;
-static int proto_pft = -1;
-static int proto_tpl = -1;
-static int hf_edcp_sync = -1;
-static int hf_edcp_len = -1;
-static int hf_edcp_seq = -1;
-static int hf_edcp_crcflag = -1;
-static int hf_edcp_maj = -1;
-static int hf_edcp_min = -1;
-static int hf_edcp_pt = -1;
-static int hf_edcp_crc = -1;
-static int hf_edcp_crc_ok = -1;
-/* static int hf_edcp_pft_pt = -1; */
-static int hf_edcp_pseq = -1;
-static int hf_edcp_findex = -1;
-static int hf_edcp_fcount = -1;
-static int hf_edcp_fecflag = -1;
-static int hf_edcp_addrflag = -1;
-static int hf_edcp_plen = -1;
-static int hf_edcp_rsk = -1;
-static int hf_edcp_rsz = -1;
-static int hf_edcp_source = -1;
-static int hf_edcp_dest = -1;
-static int hf_edcp_hcrc = -1;
-static int hf_edcp_hcrc_ok = -1;
-/* static int hf_edcp_c_max = -1; */
-/* static int hf_edcp_rx_min = -1; */
-/* static int hf_edcp_rs_corrected = -1; */
-static int hf_edcp_rs_ok = -1;
-static int hf_edcp_pft_payload = -1;
-
-static int hf_tpl_tlv = -1;
-/* static int hf_tpl_ptr = -1; */
-
-static int hf_edcp_fragments = -1;
-static int hf_edcp_fragment = -1;
-static int hf_edcp_fragment_overlap = -1;
-static int hf_edcp_fragment_overlap_conflicts = -1;
-static int hf_edcp_fragment_multiple_tails = -1;
-static int hf_edcp_fragment_too_long_fragment = -1;
-static int hf_edcp_fragment_error = -1;
-static int hf_edcp_fragment_count = -1;
-static int hf_edcp_reassembled_in = -1;
-static int hf_edcp_reassembled_length = -1;
+static int proto_dcp_etsi;
+static int proto_af;
+static int proto_pft;
+static int proto_tpl;
+static int hf_edcp_sync;
+static int hf_edcp_len;
+static int hf_edcp_seq;
+static int hf_edcp_crcflag;
+static int hf_edcp_maj;
+static int hf_edcp_min;
+static int hf_edcp_pt;
+static int hf_edcp_crc;
+static int hf_edcp_crc_ok;
+/* static int hf_edcp_pft_pt; */
+static int hf_edcp_pseq;
+static int hf_edcp_findex;
+static int hf_edcp_fcount;
+static int hf_edcp_fecflag;
+static int hf_edcp_addrflag;
+static int hf_edcp_plen;
+static int hf_edcp_rsk;
+static int hf_edcp_rsz;
+static int hf_edcp_source;
+static int hf_edcp_dest;
+static int hf_edcp_hcrc;
+static int hf_edcp_hcrc_ok;
+/* static int hf_edcp_c_max; */
+/* static int hf_edcp_rx_min; */
+/* static int hf_edcp_rs_corrected; */
+static int hf_edcp_rs_ok;
+static int hf_edcp_pft_payload;
+
+static int hf_tpl_tlv;
+/* static int hf_tpl_ptr; */
+
+static int hf_edcp_fragments;
+static int hf_edcp_fragment;
+static int hf_edcp_fragment_overlap;
+static int hf_edcp_fragment_overlap_conflicts;
+static int hf_edcp_fragment_multiple_tails;
+static int hf_edcp_fragment_too_long_fragment;
+static int hf_edcp_fragment_error;
+static int hf_edcp_fragment_count;
+static int hf_edcp_reassembled_in;
+static int hf_edcp_reassembled_length;
 
 /* Initialize the subtree pointers */
-static gint ett_edcp = -1;
-static gint ett_af = -1;
-static gint ett_pft = -1;
-static gint ett_tpl = -1;
-static gint ett_edcp_fragment = -1;
-static gint ett_edcp_fragments = -1;
-
-static expert_field ei_edcp_reassembly = EI_INIT;
-static expert_field ei_edcp_reassembly_info = EI_INIT;
+static gint ett_edcp;
+static gint ett_af;
+static gint ett_pft;
+static gint ett_tpl;
+static gint ett_edcp_fragment;
+static gint ett_edcp_fragments;
+
+static expert_field ei_edcp_reassembly;
+static expert_field ei_edcp_reassembly_info;
 
 static reassembly_table dcp_reassembly_table;
 
diff --git a/epan/dissectors/packet-ddtp.c b/epan/dissectors/packet-ddtp.c
index 790f9dab29..0113c90504 100644
--- a/epan/dissectors/packet-ddtp.c
+++ b/epan/dissectors/packet-ddtp.c
@@ -43,19 +43,19 @@ void proto_reg_handoff_ddtp (void);
 
 static dissector_handle_t ddtp_handle;
 
-static int proto_ddtp = -1;
-static int hf_ddtp_version = -1;
-static int hf_ddtp_encrypt = -1;
-static int hf_ddtp_hostid = -1;
-static int hf_ddtp_msgtype = -1;
-static int hf_ddtp_opcode = -1;
-static int hf_ddtp_ipaddr = -1;
-static int hf_ddtp_status = -1;
-static int hf_ddtp_alive = -1;
-
-static int ett_ddtp = -1;
-
-static expert_field ei_ddtp_msgtype = EI_INIT;
+static int proto_ddtp;
+static int hf_ddtp_version;
+static int hf_ddtp_encrypt;
+static int hf_ddtp_hostid;
+static int hf_ddtp_msgtype;
+static int hf_ddtp_opcode;
+static int hf_ddtp_ipaddr;
+static int hf_ddtp_status;
+static int hf_ddtp_alive;
+
+static int ett_ddtp;
+
+static expert_field ei_ddtp_msgtype;
 
 #define UDP_PORT_DDTP   1052
 
diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c
index 9af9fdd2a7..072339925c 100644
--- a/epan/dissectors/packet-dec-bpdu.c
+++ b/epan/dissectors/packet-dec-bpdu.c
@@ -46,27 +46,27 @@ void proto_reg_handoff_dec_bpdu(void);
 
 static dissector_handle_t dec_bpdu_handle;
 
-static int proto_dec_bpdu = -1;
-static int hf_dec_bpdu_proto_id = -1;
-static int hf_dec_bpdu_type = -1;
-static int hf_dec_bpdu_version_id = -1;
-static int hf_dec_bpdu_flags = -1;
-static int hf_dec_bpdu_flags_short_timers = -1;
-static int hf_dec_bpdu_flags_tcack = -1;
-static int hf_dec_bpdu_flags_tc = -1;
-static int hf_dec_bpdu_root_pri = -1;
-static int hf_dec_bpdu_root_mac = -1;
-static int hf_dec_bpdu_root_cost = -1;
-static int hf_dec_bpdu_bridge_pri = -1;
-static int hf_dec_bpdu_bridge_mac = -1;
-static int hf_dec_bpdu_port_id = -1;
-static int hf_dec_bpdu_msg_age = -1;
-static int hf_dec_bpdu_hello_time = -1;
-static int hf_dec_bpdu_max_age = -1;
-static int hf_dec_bpdu_forward_delay = -1;
+static int proto_dec_bpdu;
+static int hf_dec_bpdu_proto_id;
+static int hf_dec_bpdu_type;
+static int hf_dec_bpdu_version_id;
+static int hf_dec_bpdu_flags;
+static int hf_dec_bpdu_flags_short_timers;
+static int hf_dec_bpdu_flags_tcack;
+static int hf_dec_bpdu_flags_tc;
+static int hf_dec_bpdu_root_pri;
+static int hf_dec_bpdu_root_mac;
+static int hf_dec_bpdu_root_cost;
+static int hf_dec_bpdu_bridge_pri;
+static int hf_dec_bpdu_bridge_mac;
+static int hf_dec_bpdu_port_id;
+static int hf_dec_bpdu_msg_age;
+static int hf_dec_bpdu_hello_time;
+static int hf_dec_bpdu_max_age;
+static int hf_dec_bpdu_forward_delay;
 
-static gint ett_dec_bpdu = -1;
-static gint ett_dec_bpdu_flags = -1;
+static gint ett_dec_bpdu;
+static gint ett_dec_bpdu_flags;
 
 static const value_string protocol_id_vals[] = {
     { 0xe1, "DEC Spanning Tree Protocol" },
diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c
index 9e64353986..38a98905af 100644
--- a/epan/dissectors/packet-dec-dnart.c
+++ b/epan/dissectors/packet-dec-dnart.c
@@ -83,86 +83,86 @@ void proto_reg_handoff_dec_rt(void);
 
 static dissector_handle_t dec_rt_handle;
 
-static int proto_dec_rt = -1;
-
-static int hf_dec_routing_flags = -1;
-static int hf_dec_rt_ctrl_msg = -1;
-static int hf_dec_rt_long_msg = -1;
-static int hf_dec_rt_short_msg = -1;
-static int hf_dec_rt_rqr = -1;
-static int hf_dec_rt_rts = -1;
-static int hf_dec_rt_inter_eth = -1;
-static int hf_dec_rt_discard = -1;
-static int hf_dec_rt_dst_addr = -1;
-static int hf_dec_rt_src_addr = -1;
-static int hf_dec_rt_nl2 = -1;
-static int hf_dec_rt_service_class = -1;
-static int hf_dec_rt_protocol_type = -1;
-static int hf_dec_rt_visit_count = -1;
-static int hf_dec_rt_dst_node = -1;
-static int hf_dec_rt_src_node = -1;
+static int proto_dec_rt;
+
+static int hf_dec_routing_flags;
+static int hf_dec_rt_ctrl_msg;
+static int hf_dec_rt_long_msg;
+static int hf_dec_rt_short_msg;
+static int hf_dec_rt_rqr;
+static int hf_dec_rt_rts;
+static int hf_dec_rt_inter_eth;
+static int hf_dec_rt_discard;
+static int hf_dec_rt_dst_addr;
+static int hf_dec_rt_src_addr;
+static int hf_dec_rt_nl2;
+static int hf_dec_rt_service_class;
+static int hf_dec_rt_protocol_type;
+static int hf_dec_rt_visit_count;
+static int hf_dec_rt_dst_node;
+static int hf_dec_rt_src_node;
 /* Routing control messages */
-static int hf_dec_rt_visited_nodes = -1;
-static int hf_dec_ctl_msgs = -1;
-static int hf_dec_ctl_msg_hdr = -1;
-static int hf_dec_nsp_msgs = -1;
-static int hf_dec_rt_tiinfo = -1;
-static int hf_dec_rt_blk_size = -1;
-static int hf_dec_rt_version = -1;
-static int hf_dec_rt_timer = -1;
-static int hf_dec_rt_reserved = -1;
-static int hf_dec_rt_fcnval = -1;
-static int hf_dec_rt_test_data = -1;
-static int hf_dec_rt_segment = -1;
-static int hf_dec_rt_checksum = -1;
-static int hf_dec_rt_checksum_status = -1;
-static int hf_dec_rt_id = -1;
-static int hf_dec_rt_iinfo = -1;
-static int hf_dec_rt_iinfo_node_type = -1;
-static int hf_dec_rt_iinfo_vrf = -1;
-static int hf_dec_rt_iinfo_rej = -1;
-static int hf_dec_rt_iinfo_verf = -1;
-static int hf_dec_rt_iinfo_mta = -1;
-static int hf_dec_rt_iinfo_blkreq = -1;
-static int hf_dec_rt_iprio = -1;
-static int hf_dec_rt_neighbor = -1;
-static int hf_dec_rt_seed = -1;
-static int hf_dec_rt_elist = -1;
-static int hf_dec_rt_ename = -1;
-static int hf_dec_rt_router_id = -1;
-static int hf_dec_rt_router_state = -1;
-static int hf_dec_rt_router_prio = -1;
-static int hf_dec_rt_seg_size = -1;
-static int hf_dec_rt_acknum = -1;
-static int hf_dec_rt_segnum = -1;
-static int hf_dec_rt_delay = -1;
-static int hf_dec_flow_control = -1;
-static int hf_dec_rt_fc_val = -1;
-static int hf_dec_rt_services = -1;
-static int hf_dec_rt_info = -1;
-static int hf_dec_disc_reason = -1;
-static int hf_dec_conn_contents = -1;
-static int hf_dec_sess_obj_type = -1;
-static int hf_dec_sess_grp_code = -1;
-static int hf_dec_sess_usr_code = -1;
-static int hf_dec_sess_dst_name = -1;
-static int hf_dec_sess_src_name = -1;
-static int hf_dec_sess_menu_ver = -1;
-static int hf_dec_sess_rqstr_id = -1;
-
-static gint ett_dec_rt = -1;
-static gint ett_dec_routing_flags = -1;
-static gint ett_dec_msg_flags = -1;
-static gint ett_dec_rt_ctl_msg = -1;
-static gint ett_dec_rt_nsp_msg = -1;
-static gint ett_dec_rt_info_flags = -1;
-static gint ett_dec_rt_list = -1;
-static gint ett_dec_rt_rlist = -1;
-static gint ett_dec_rt_state = -1;
-static gint ett_dec_flow_control = -1;
-static gint ett_dec_sess_contents = -1;
-
-static expert_field ei_dec_rt_checksum = EI_INIT;
+static int hf_dec_rt_visited_nodes;
+static int hf_dec_ctl_msgs;
+static int hf_dec_ctl_msg_hdr;
+static int hf_dec_nsp_msgs;
+static int hf_dec_rt_tiinfo;
+static int hf_dec_rt_blk_size;
+static int hf_dec_rt_version;
+static int hf_dec_rt_timer;
+static int hf_dec_rt_reserved;
+static int hf_dec_rt_fcnval;
+static int hf_dec_rt_test_data;
+static int hf_dec_rt_segment;
+static int hf_dec_rt_checksum;
+static int hf_dec_rt_checksum_status;
+static int hf_dec_rt_id;
+static int hf_dec_rt_iinfo;
+static int hf_dec_rt_iinfo_node_type;
+static int hf_dec_rt_iinfo_vrf;
+static int hf_dec_rt_iinfo_rej;
+static int hf_dec_rt_iinfo_verf;
+static int hf_dec_rt_iinfo_mta;
+static int hf_dec_rt_iinfo_blkreq;
+static int hf_dec_rt_iprio;
+static int hf_dec_rt_neighbor;
+static int hf_dec_rt_seed;
+static int hf_dec_rt_elist;
+static int hf_dec_rt_ename;
+static int hf_dec_rt_router_id;
+static int hf_dec_rt_router_state;
+static int hf_dec_rt_router_prio;
+static int hf_dec_rt_seg_size;
+static int hf_dec_rt_acknum;
+static int hf_dec_rt_segnum;
+static int hf_dec_rt_delay;
+static int hf_dec_flow_control;
+static int hf_dec_rt_fc_val;
+static int hf_dec_rt_services;
+static int hf_dec_rt_info;
+static int hf_dec_disc_reason;
+static int hf_dec_conn_contents;
+static int hf_dec_sess_obj_type;
+static int hf_dec_sess_grp_code;
+static int hf_dec_sess_usr_code;
+static int hf_dec_sess_dst_name;
+static int hf_dec_sess_src_name;
+static int hf_dec_sess_menu_ver;
+static int hf_dec_sess_rqstr_id;
+
+static gint ett_dec_rt;
+static gint ett_dec_routing_flags;
+static gint ett_dec_msg_flags;
+static gint ett_dec_rt_ctl_msg;
+static gint ett_dec_rt_nsp_msg;
+static gint ett_dec_rt_info_flags;
+static gint ett_dec_rt_list;
+static gint ett_dec_rt_rlist;
+static gint ett_dec_rt_state;
+static gint ett_dec_flow_control;
+static gint ett_dec_sess_contents;
+
+static expert_field ei_dec_rt_checksum;
 
 static gint dec_dna_total_bytes_this_segment = 0;
 static gint dec_dna_previous_total = 0;
diff --git a/epan/dissectors/packet-dect-dlc.c b/epan/dissectors/packet-dect-dlc.c
index ec0167b3f0..f82d504b3f 100644
--- a/epan/dissectors/packet-dect-dlc.c
+++ b/epan/dissectors/packet-dect-dlc.c
@@ -24,34 +24,34 @@
 
 void proto_register_dect_dlc(void);
 
-static int proto_dect_dlc = -1;
-
-static gint hf_dect_dlc_address = -1;
-static gint hf_dect_dlc_nlf = -1;
-static gint hf_dect_dlc_lln = -1;
-static gint hf_dect_dlc_sapi = -1;
-static gint hf_dect_dlc_cr = -1;
-
-static int hf_dect_dlc_control = -1;
-static int hf_dect_dlc_n_r = -1;
-static int hf_dect_dlc_n_s = -1;
-static int hf_dect_dlc_p = -1;
-static int hf_dect_dlc_f = -1;
-static int hf_dect_dlc_s_ftype = -1;
-static int hf_dect_dlc_u_modifier_cmd = -1;
-static int hf_dect_dlc_u_modifier_resp = -1;
-static int hf_dect_dlc_ftype_i = -1;
-static int hf_dect_dlc_ftype_s_u = -1;
-
-static int hf_dect_dlc_length = -1;
-static int hf_dect_dlc_el = -1;
-static int hf_dect_dlc_m = -1;
-static int hf_dect_dlc_len = -1;
-
-static gint ett_dect_dlc = -1;
-static gint ett_dect_dlc_address = -1;
-static gint ett_dect_dlc_control = -1;
-static gint ett_dect_dlc_length = -1;
+static int proto_dect_dlc;
+
+static gint hf_dect_dlc_address;
+static gint hf_dect_dlc_nlf;
+static gint hf_dect_dlc_lln;
+static gint hf_dect_dlc_sapi;
+static gint hf_dect_dlc_cr;
+
+static int hf_dect_dlc_control;
+static int hf_dect_dlc_n_r;
+static int hf_dect_dlc_n_s;
+static int hf_dect_dlc_p;
+static int hf_dect_dlc_f;
+static int hf_dect_dlc_s_ftype;
+static int hf_dect_dlc_u_modifier_cmd;
+static int hf_dect_dlc_u_modifier_resp;
+static int hf_dect_dlc_ftype_i;
+static int hf_dect_dlc_ftype_s_u;
+
+static int hf_dect_dlc_length;
+static int hf_dect_dlc_el;
+static int hf_dect_dlc_m;
+static int hf_dect_dlc_len;
+
+static gint ett_dect_dlc;
+static gint ett_dect_dlc_address;
+static gint ett_dect_dlc_control;
+static gint ett_dect_dlc_length;
 
 static dissector_handle_t data_handle;
 
@@ -59,20 +59,20 @@ static dissector_table_t dlc_sapi_dissector_table;
 
 static reassembly_table dect_dlc_reassembly_table;
 
-static int hf_dect_dlc_fragment_data = -1;
-static int hf_dect_dlc_fragment = -1;
-static int hf_dect_dlc_fragments = -1;
-static int hf_dect_dlc_fragment_overlap = -1;
-static int hf_dect_dlc_fragment_overlap_conflicts = -1;
-static int hf_dect_dlc_fragment_multiple_tails = -1;
-static int hf_dect_dlc_fragment_too_long_fragment = -1;
-static int hf_dect_dlc_fragment_error = -1;
-static int hf_dect_dlc_fragment_count = -1;
-static int hf_dect_dlc_reassembled_in = -1;
-static int hf_dect_dlc_reassembled_length = -1;
-
-static gint ett_dect_dlc_fragment = -1;
-static gint ett_dect_dlc_fragments = -1;
+static int hf_dect_dlc_fragment_data;
+static int hf_dect_dlc_fragment;
+static int hf_dect_dlc_fragments;
+static int hf_dect_dlc_fragment_overlap;
+static int hf_dect_dlc_fragment_overlap_conflicts;
+static int hf_dect_dlc_fragment_multiple_tails;
+static int hf_dect_dlc_fragment_too_long_fragment;
+static int hf_dect_dlc_fragment_error;
+static int hf_dect_dlc_fragment_count;
+static int hf_dect_dlc_reassembled_in;
+static int hf_dect_dlc_reassembled_length;
+
+static gint ett_dect_dlc_fragment;
+static gint ett_dect_dlc_fragments;
 
 static const fragment_items dect_dlc_frag_items = {
     /* Fragment subtrees */
diff --git a/epan/dissectors/packet-dect-mitel-eth.c b/epan/dissectors/packet-dect-mitel-eth.c
index 0f4f94b13d..8030571df5 100644
--- a/epan/dissectors/packet-dect-mitel-eth.c
+++ b/epan/dissectors/packet-dect-mitel-eth.c
@@ -30,169 +30,169 @@
 void proto_register_dect_mitel_eth(void);
 void proto_reg_handoff_dect_mitel_eth(void);
 
-static int proto_dect_mitel_eth = -1;
-
-static int hf_dect_mitel_eth_len = -1;
-static int hf_dect_mitel_eth_layer = -1;
-static int hf_dect_mitel_eth_prim_type = -1;
-static int hf_dect_mitel_eth_mcei = -1;
-static int hf_dect_mitel_eth_mac_info_ind_string = -1;
-static int hf_dect_mitel_eth_pmid = -1;
-static int hf_dect_mitel_eth_subfield = -1;
-
-static int hf_dect_mitel_eth_rfpc_message_type = -1;
-static int hf_dect_mitel_eth_rfpc_item_type = -1;
-static int hf_dect_mitel_eth_rfpc_item_length = -1;
-static int hf_dect_mitel_eth_rfpc_item_value = -1;
-
-static int hf_dect_mitel_eth_rfpc_revision_generation = -1;
-static int hf_dect_mitel_eth_rfpc_revision_boot_software = -1;
-static int hf_dect_mitel_eth_rfpc_revision_prog_software = -1;
-static int hf_dect_mitel_eth_rfpc_revision_hardware = -1;
-
-static int hf_dect_mitel_eth_rfpc_rfpi_saris_available = -1;
-static int hf_dect_mitel_eth_rfpc_rfpi_ari_class = -1;
-
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_flags = -1;
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_connection_handover_supported = -1;
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_external_handover_supported = -1;
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_access_rights_requests_supported = -1;
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_coms_service_available = -1;
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_clms_service_available = -1;
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_ciss_services_available = -1;
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_non_static_fixed_part = -1;
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_sim_services_available = -1;
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_location_registration_supported = -1;
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_dsc_supported = -1;
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_dsaa_required = -1;
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_non_voice_packet_switched_service = -1;
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_non_voice_circuit_switched_service = -1;
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_gap_basic_speech = -1;
-static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_g726 = -1;
-
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_wireless_relay_stations = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_flags = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_isdn_data_services = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_dprs_class_2 = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_dprs_class_3_or_4 = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_data_service_profile_d = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_lrms = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_asymmetric_bearers_supported = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_emergency_call_supported = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_location_registration_with_tpui_allowed = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_sync_to_gps_achieved = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_isdn_intermediate_system = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_rap_part_1_profile = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_v24 = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_ppp = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_ip = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_token_ring = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_ethernet = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_ip_roaming_unrestricted_supported = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_dprs_supported = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_basis_odap_supported = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_fmms_interworking_profile_supported = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_extended_fp_info2 = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_ipq_services_supported = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_mac_suspend_resume = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_frequency_replacement_supported = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities_syncronization = -1;
-
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_flags = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_multibearer_connections = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_ipmr_error_correction = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_ipm_error_detection = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_inb_normal_delay = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_ina_minimum_delay = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_cf_messages = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_b_field_setup = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_advanced_a_field_setup = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_basic_a_field_setup = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_cl_downlink = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_cl_uplink = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_co_setup_on_dummy_allowed = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_page_repetition = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_frequency_control = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_slot_size_full = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_slot_size_half = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_slot_size_double = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_double_duplex_bearer_connections = -1;
-static int hf_dect_mitel_eth_rfpc_mac_capabilities_extended_fp_info = -1;
-
-static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_connections_1_3 = -1;
-static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_connections_4_6 = -1;
-static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_connections_7_9 = -1;
-static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_connections_10_12 = -1;
-static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_dsp_channels_1_2 = -1;
-static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_dsp_channels_3_4 = -1;
-static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_dsp_channels_5_6 = -1;
-static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_dsp_channels_7_8 = -1;
-static int hf_dect_mitel_eth_rfpc_statistic_data_lost_connections = -1;
-static int hf_dect_mitel_eth_rfpc_statistic_data_mac_reset = -1;
-static int hf_dect_mitel_eth_rfpc_statistic_data_reject_dummy = -1;
-static int hf_dect_mitel_eth_rfpc_statistic_data_handoff_timer = -1;
-static int hf_dect_mitel_eth_rfpc_statistic_data_bad_frames = -1;
-static int hf_dect_mitel_eth_rfpc_statistic_data_good_frames = -1;
-
-static int hf_dect_mitel_eth_rfpc_rfp_pli_length_indicator = -1;
-
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_flags = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_slot_type_long_640 = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_slot_type_long_672 = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_mux_e_u = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_channel_ipf = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_channel_sipf = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_channel_gf = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_wrs_ule = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_no_emission_preferred_cn = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_flags = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_ng_dect_1 = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_dprs_data_category = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_ng_dect_3 = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_permanent_clir = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_third_party_conference = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_intrusion_call = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_call_deflection = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_multiple_lines = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_no_emission = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_ng_dect_5 = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_re_keying = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_dsaa2 = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_dsc2 = -1;
-static int hf_dect_mitel_eth_rfpc_extended_capabilities2_light_data = -1;
-
-static int hf_dect_mitel_eth_mac_con_ind_flags = -1;
-static int hf_dect_mitel_eth_mac_con_ind_flag_handover = -1;
-
-static int hf_dect_mitel_eth_mac_dis_ind_reason = -1;
-
-static int hf_dect_mitel_eth_mac_page_req_flags = -1;
-
-static int hf_dect_mitel_eth_mac_enc_key_req_key = -1;
-static int hf_dect_mitel_eth_mac_enc_key_req_id = -1;
-
-static int hf_dect_mitel_eth_mac_enc_eks_ind_type = -1;
-static int hf_dect_mitel_eth_mac_enc_eks_ind_id = -1;
-static int hf_dect_mitel_eth_mac_enc_eks_ind_ppn = -1;
-
-static int hf_dect_mitel_eth_mac_ho_in_progress_res_key = -1;
-static int hf_dect_mitel_eth_mac_ho_in_progress_res_id = -1;
-
-static int hf_dect_mitel_eth_mac_ho_failed_ind_reason = -1;
-
-static int hf_dect_mitel_eth_mt_item_key = -1;
-static int hf_dect_mitel_eth_mt_item_length = -1;
-static int hf_dect_mitel_eth_mt_item_value = -1;
-
-static gint ett_dect_mitel_eth = -1;
-
-static gint ett_dect_mitel_eth_rfpc_item = -1;
-
-static gint ett_dect_mitel_eth_higher_layer_capabilities_flags = -1;
-static gint ett_dect_mitel_eth_extended_capabilities_flags = -1;
-static gint ett_dect_mitel_eth_mac_capabilities_flags = -1;
-static gint ett_dect_mitel_eth_extended_capabilities2_mac_capability_flags = -1;
-static gint ett_dect_mitel_eth_extended_capabilities2_flags = -1;
+static int proto_dect_mitel_eth;
+
+static int hf_dect_mitel_eth_len;
+static int hf_dect_mitel_eth_layer;
+static int hf_dect_mitel_eth_prim_type;
+static int hf_dect_mitel_eth_mcei;
+static int hf_dect_mitel_eth_mac_info_ind_string;
+static int hf_dect_mitel_eth_pmid;
+static int hf_dect_mitel_eth_subfield;
+
+static int hf_dect_mitel_eth_rfpc_message_type;
+static int hf_dect_mitel_eth_rfpc_item_type;
+static int hf_dect_mitel_eth_rfpc_item_length;
+static int hf_dect_mitel_eth_rfpc_item_value;
+
+static int hf_dect_mitel_eth_rfpc_revision_generation;
+static int hf_dect_mitel_eth_rfpc_revision_boot_software;
+static int hf_dect_mitel_eth_rfpc_revision_prog_software;
+static int hf_dect_mitel_eth_rfpc_revision_hardware;
+
+static int hf_dect_mitel_eth_rfpc_rfpi_saris_available;
+static int hf_dect_mitel_eth_rfpc_rfpi_ari_class;
+
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_flags;
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_connection_handover_supported;
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_external_handover_supported;
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_access_rights_requests_supported;
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_coms_service_available;
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_clms_service_available;
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_ciss_services_available;
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_non_static_fixed_part;
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_sim_services_available;
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_location_registration_supported;
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_dsc_supported;
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_dsaa_required;
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_non_voice_packet_switched_service;
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_non_voice_circuit_switched_service;
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_gap_basic_speech;
+static int hf_dect_mitel_eth_rfpc_higher_layer_capabilities_g726;
+
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_wireless_relay_stations;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_flags;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_isdn_data_services;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_dprs_class_2;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_dprs_class_3_or_4;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_data_service_profile_d;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_lrms;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_asymmetric_bearers_supported;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_emergency_call_supported;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_location_registration_with_tpui_allowed;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_sync_to_gps_achieved;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_isdn_intermediate_system;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_rap_part_1_profile;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_v24;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_ppp;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_ip;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_token_ring;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_ethernet;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_ip_roaming_unrestricted_supported;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_dprs_supported;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_basis_odap_supported;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_fmms_interworking_profile_supported;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_extended_fp_info2;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_ipq_services_supported;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_mac_suspend_resume;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_frequency_replacement_supported;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities_syncronization;
+
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_flags;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_multibearer_connections;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_ipmr_error_correction;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_ipm_error_detection;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_inb_normal_delay;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_ina_minimum_delay;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_cf_messages;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_b_field_setup;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_advanced_a_field_setup;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_basic_a_field_setup;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_cl_downlink;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_cl_uplink;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_co_setup_on_dummy_allowed;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_page_repetition;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_frequency_control;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_slot_size_full;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_slot_size_half;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_slot_size_double;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_double_duplex_bearer_connections;
+static int hf_dect_mitel_eth_rfpc_mac_capabilities_extended_fp_info;
+
+static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_connections_1_3;
+static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_connections_4_6;
+static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_connections_7_9;
+static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_connections_10_12;
+static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_dsp_channels_1_2;
+static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_dsp_channels_3_4;
+static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_dsp_channels_5_6;
+static int hf_dect_mitel_eth_rfpc_statistic_data_bmc_dsp_channels_7_8;
+static int hf_dect_mitel_eth_rfpc_statistic_data_lost_connections;
+static int hf_dect_mitel_eth_rfpc_statistic_data_mac_reset;
+static int hf_dect_mitel_eth_rfpc_statistic_data_reject_dummy;
+static int hf_dect_mitel_eth_rfpc_statistic_data_handoff_timer;
+static int hf_dect_mitel_eth_rfpc_statistic_data_bad_frames;
+static int hf_dect_mitel_eth_rfpc_statistic_data_good_frames;
+
+static int hf_dect_mitel_eth_rfpc_rfp_pli_length_indicator;
+
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_flags;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_slot_type_long_640;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_slot_type_long_672;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_mux_e_u;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_channel_ipf;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_channel_sipf;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_channel_gf;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_wrs_ule;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_mac_capability_no_emission_preferred_cn;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_flags;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_ng_dect_1;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_dprs_data_category;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_ng_dect_3;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_permanent_clir;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_third_party_conference;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_intrusion_call;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_call_deflection;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_multiple_lines;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_no_emission;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_ng_dect_5;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_re_keying;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_dsaa2;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_dsc2;
+static int hf_dect_mitel_eth_rfpc_extended_capabilities2_light_data;
+
+static int hf_dect_mitel_eth_mac_con_ind_flags;
+static int hf_dect_mitel_eth_mac_con_ind_flag_handover;
+
+static int hf_dect_mitel_eth_mac_dis_ind_reason;
+
+static int hf_dect_mitel_eth_mac_page_req_flags;
+
+static int hf_dect_mitel_eth_mac_enc_key_req_key;
+static int hf_dect_mitel_eth_mac_enc_key_req_id;
+
+static int hf_dect_mitel_eth_mac_enc_eks_ind_type;
+static int hf_dect_mitel_eth_mac_enc_eks_ind_id;
+static int hf_dect_mitel_eth_mac_enc_eks_ind_ppn;
+
+static int hf_dect_mitel_eth_mac_ho_in_progress_res_key;
+static int hf_dect_mitel_eth_mac_ho_in_progress_res_id;
+
+static int hf_dect_mitel_eth_mac_ho_failed_ind_reason;
+
+static int hf_dect_mitel_eth_mt_item_key;
+static int hf_dect_mitel_eth_mt_item_length;
+static int hf_dect_mitel_eth_mt_item_value;
+
+static gint ett_dect_mitel_eth;
+
+static gint ett_dect_mitel_eth_rfpc_item;
+
+static gint ett_dect_mitel_eth_higher_layer_capabilities_flags;
+static gint ett_dect_mitel_eth_extended_capabilities_flags;
+static gint ett_dect_mitel_eth_mac_capabilities_flags;
+static gint ett_dect_mitel_eth_extended_capabilities2_mac_capability_flags;
+static gint ett_dect_mitel_eth_extended_capabilities2_flags;
 
 static dissector_handle_t dlc_handle;
 
diff --git a/epan/dissectors/packet-dect-mitel-rfp.c b/epan/dissectors/packet-dect-mitel-rfp.c
index 37508fc70f..fa6a3ee9f2 100644
--- a/epan/dissectors/packet-dect-mitel-rfp.c
+++ b/epan/dissectors/packet-dect-mitel-rfp.c
@@ -35,198 +35,198 @@ void proto_reg_handoff_dect_mitel_rfp(void);
 void proto_register_dect_mitel_rfp(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_dect_mitel_rfp = -1;
+static int proto_dect_mitel_rfp;
 
-static int hf_dect_mitel_rfp_message_type = -1;
-static int hf_dect_mitel_rfp_message_length = -1;
+static int hf_dect_mitel_rfp_message_type;
+static int hf_dect_mitel_rfp_message_length;
 
 /* CONTROL-ACK */
-static int hf_dect_mitel_rfp_control_ack_message = -1;
-static int hf_dect_mitel_rfp_control_ack_call_id = -1;
+static int hf_dect_mitel_rfp_control_ack_message;
+static int hf_dect_mitel_rfp_control_ack_call_id;
 
 /* CONTROL-NACK */
-static int hf_dect_mitel_rfp_control_nack_message = -1;
-static int hf_dect_mitel_rfp_control_nack_call_id = -1;
-static int hf_dect_mitel_rfp_control_nack_reason = -1;
+static int hf_dect_mitel_rfp_control_nack_message;
+static int hf_dect_mitel_rfp_control_nack_call_id;
+static int hf_dect_mitel_rfp_control_nack_reason;
 
 /* CONTROL-HEARTBEAT */
-static int hf_dect_mitel_rfp_control_heartbeat_milliseconds = -1;
-static int hf_dect_mitel_rfp_control_heartbeat_nanoseconds = -1;
+static int hf_dect_mitel_rfp_control_heartbeat_milliseconds;
+static int hf_dect_mitel_rfp_control_heartbeat_nanoseconds;
 
 /* SYS-IP-OPTIONS */
-static int hf_dect_mitel_rfp_sys_ip_options_voice_tos = -1;
-static int hf_dect_mitel_rfp_sys_ip_options_signalling_tos = -1;
-static int hf_dect_mitel_rfp_sys_ip_options_ttl = -1;
-static int hf_dect_mitel_rfp_sys_ip_options_signal_vlan_priority = -1;
-static int hf_dect_mitel_rfp_sys_ip_options_voice_vlan_priority = -1;
+static int hf_dect_mitel_rfp_sys_ip_options_voice_tos;
+static int hf_dect_mitel_rfp_sys_ip_options_signalling_tos;
+static int hf_dect_mitel_rfp_sys_ip_options_ttl;
+static int hf_dect_mitel_rfp_sys_ip_options_signal_vlan_priority;
+static int hf_dect_mitel_rfp_sys_ip_options_voice_vlan_priority;
 
 /* SYS-LED */
-static int hf_dect_mitel_rfp_sys_led_id    = -1;
-static int hf_dect_mitel_rfp_sys_led_color = -1;
+static int hf_dect_mitel_rfp_sys_led_id;
+static int hf_dect_mitel_rfp_sys_led_color;
 
 /* SYS-HEARTBEAT-INTERVAL */
-static int hf_dect_mitel_rfp_sys_heartbeat_interval_value = -1;
+static int hf_dect_mitel_rfp_sys_heartbeat_interval_value;
 
 /* SYS-SYSLOG */
-static int hf_dect_mitel_rfp_sys_syslog_ip_address = -1;
-static int hf_dect_mitel_rfp_sys_syslog_port = -1;
+static int hf_dect_mitel_rfp_sys_syslog_ip_address;
+static int hf_dect_mitel_rfp_sys_syslog_port;
 
 /* SYS-MAX-CHANNELS */
-static int hf_dect_mitel_rfp_sys_max_channels_dsp = -1;
-static int hf_dect_mitel_rfp_sys_max_channels_sessions = -1;
+static int hf_dect_mitel_rfp_sys_max_channels_dsp;
+static int hf_dect_mitel_rfp_sys_max_channels_sessions;
 
 /* SYS-HTTP-SET */
-static int hf_dect_mitel_rfp_sys_http_set_ip_address = -1;
-static int hf_dect_mitel_rfp_sys_http_set_port = -1;
+static int hf_dect_mitel_rfp_sys_http_set_ip_address;
+static int hf_dect_mitel_rfp_sys_http_set_port;
 
 /* SYS-PASSWD */
-static int hf_dect_mitel_rfp_sys_passwd_remote_access_enabled = -1;
-static int hf_dect_mitel_rfp_sys_passwd_root_username = -1;
-static int hf_dect_mitel_rfp_sys_passwd_root_password = -1;
-static int hf_dect_mitel_rfp_sys_passwd_admin_username = -1;
-static int hf_dect_mitel_rfp_sys_passwd_admin_password = -1;
+static int hf_dect_mitel_rfp_sys_passwd_remote_access_enabled;
+static int hf_dect_mitel_rfp_sys_passwd_root_username;
+static int hf_dect_mitel_rfp_sys_passwd_root_password;
+static int hf_dect_mitel_rfp_sys_passwd_admin_username;
+static int hf_dect_mitel_rfp_sys_passwd_admin_password;
 
 /* SYS-RPING */
-static int hf_dect_mitel_rfp_sys_rping_ip_address = -1;
-static int hf_dect_mitel_rfp_sys_rping_rtt = -1;
+static int hf_dect_mitel_rfp_sys_rping_ip_address;
+static int hf_dect_mitel_rfp_sys_rping_rtt;
 
 /* SYS-CORE-DUMP */
-static int hf_dect_mitel_rfp_sys_core_dump_url = -1;
+static int hf_dect_mitel_rfp_sys_core_dump_url;
 
 /* SYS-VSNTP-TIME */
-static int hf_dect_mitel_rfp_sys_vsntp_time_t1_seconds = -1;
-static int hf_dect_mitel_rfp_sys_vsntp_time_t1_nanoseconds = -1;
-static int hf_dect_mitel_rfp_sys_vsntp_time_t2_seconds = -1;
-static int hf_dect_mitel_rfp_sys_vsntp_time_t2_nanoseconds = -1;
+static int hf_dect_mitel_rfp_sys_vsntp_time_t1_seconds;
+static int hf_dect_mitel_rfp_sys_vsntp_time_t1_nanoseconds;
+static int hf_dect_mitel_rfp_sys_vsntp_time_t2_seconds;
+static int hf_dect_mitel_rfp_sys_vsntp_time_t2_nanoseconds;
 
 /* SYS-INIT */
-static int hf_dect_mitel_rfp_sys_init_rfp_model = -1;
-static int hf_dect_mitel_rfp_sys_init_rfp_mac = -1;
-static int hf_dect_mitel_rfp_sys_init_crypted = -1;
-static int hf_dect_mitel_rfp_sys_init_protocol = -1;
-static int hf_dect_mitel_rfp_sys_init_rfp_capabilities = -1;
-static int hf_dect_mitel_rfp_sys_init_rfp_capability_normal_tx = -1;
-static int hf_dect_mitel_rfp_sys_init_rfp_capability_indoor = -1;
-static int hf_dect_mitel_rfp_sys_init_rfp_capability_wlan = -1;
-static int hf_dect_mitel_rfp_sys_init_rfp_capability_encryption = -1;
-static int hf_dect_mitel_rfp_sys_init_rfp_capability_frequency_shift = -1;
-static int hf_dect_mitel_rfp_sys_init_rfp_capability_low_tx = -1;
-static int hf_dect_mitel_rfp_sys_init_rfp_capability_advanced_feature = -1;
-static int hf_dect_mitel_rfp_sys_init_rfp_software_version = -1;
-static int hf_dect_mitel_rfp_sys_init_signature = -1;
+static int hf_dect_mitel_rfp_sys_init_rfp_model;
+static int hf_dect_mitel_rfp_sys_init_rfp_mac;
+static int hf_dect_mitel_rfp_sys_init_crypted;
+static int hf_dect_mitel_rfp_sys_init_protocol;
+static int hf_dect_mitel_rfp_sys_init_rfp_capabilities;
+static int hf_dect_mitel_rfp_sys_init_rfp_capability_normal_tx;
+static int hf_dect_mitel_rfp_sys_init_rfp_capability_indoor;
+static int hf_dect_mitel_rfp_sys_init_rfp_capability_wlan;
+static int hf_dect_mitel_rfp_sys_init_rfp_capability_encryption;
+static int hf_dect_mitel_rfp_sys_init_rfp_capability_frequency_shift;
+static int hf_dect_mitel_rfp_sys_init_rfp_capability_low_tx;
+static int hf_dect_mitel_rfp_sys_init_rfp_capability_advanced_feature;
+static int hf_dect_mitel_rfp_sys_init_rfp_software_version;
+static int hf_dect_mitel_rfp_sys_init_signature;
 
 /* SYS-AUTHENTICATE */
-static int hf_dect_mitel_rfp_sys_authenticate_omm_iv = -1;
-static int hf_dect_mitel_rfp_sys_authenticate_rfp_iv = -1;
+static int hf_dect_mitel_rfp_sys_authenticate_omm_iv;
+static int hf_dect_mitel_rfp_sys_authenticate_rfp_iv;
 
 /* SYS-LICENSE-TIMER */
-static int hf_dect_mitel_rfp_sys_license_timer_query = -1;
-static int hf_dect_mitel_rfp_sys_license_timer_grace_period = -1;
-static int hf_dect_mitel_rfp_sys_license_timer_checksum = -1;
+static int hf_dect_mitel_rfp_sys_license_timer_query;
+static int hf_dect_mitel_rfp_sys_license_timer_grace_period;
+static int hf_dect_mitel_rfp_sys_license_timer_checksum;
 
 /* MEDIA */
-static int hf_dect_mitel_rfp_media_handle = -1;
-static int hf_dect_mitel_rfp_media_mcei = -1;
-static int hf_dect_mitel_rfp_media_direction = -1;
+static int hf_dect_mitel_rfp_media_handle;
+static int hf_dect_mitel_rfp_media_mcei;
+static int hf_dect_mitel_rfp_media_direction;
 
 /* MEDIA-OPEN */
-static int hf_dect_mitel_rfp_media_open_codec = -1;
-static int hf_dect_mitel_rfp_media_open_slot_count = -1;
-static int hf_dect_mitel_rfp_media_open_flags = -1;
+static int hf_dect_mitel_rfp_media_open_codec;
+static int hf_dect_mitel_rfp_media_open_slot_count;
+static int hf_dect_mitel_rfp_media_open_flags;
 
 /* MEDIA-CONF */
-static int hf_dect_mitel_rfp_media_conf_vif = -1;
-static int hf_dect_mitel_rfp_media_conf_vad = -1;
-static int hf_dect_mitel_rfp_media_conf_codec_count = -1;
-static int hf_dect_mitel_rfp_media_conf_codec_type = -1;
-static int hf_dect_mitel_rfp_media_conf_codec_pt = -1;
-static int hf_dect_mitel_rfp_media_conf_codec_rate = -1;
-static int hf_dect_mitel_rfp_media_conf_ppn = -1;
-static int hf_dect_mitel_rfp_media_conf_local_port_1 = -1;
-static int hf_dect_mitel_rfp_media_conf_local_port_2 = -1;
-static int hf_dect_mitel_rfp_media_conf_rx_ip_address = -1;
-static int hf_dect_mitel_rfp_media_conf_rx_port_1 = -1;
-static int hf_dect_mitel_rfp_media_conf_rx_port_2 = -1;
-static int hf_dect_mitel_rfp_media_conf_tx_ip_address = -1;
-static int hf_dect_mitel_rfp_media_conf_tx_port_1 = -1;
-static int hf_dect_mitel_rfp_media_conf_tx_port_2 = -1;
+static int hf_dect_mitel_rfp_media_conf_vif;
+static int hf_dect_mitel_rfp_media_conf_vad;
+static int hf_dect_mitel_rfp_media_conf_codec_count;
+static int hf_dect_mitel_rfp_media_conf_codec_type;
+static int hf_dect_mitel_rfp_media_conf_codec_pt;
+static int hf_dect_mitel_rfp_media_conf_codec_rate;
+static int hf_dect_mitel_rfp_media_conf_ppn;
+static int hf_dect_mitel_rfp_media_conf_local_port_1;
+static int hf_dect_mitel_rfp_media_conf_local_port_2;
+static int hf_dect_mitel_rfp_media_conf_rx_ip_address;
+static int hf_dect_mitel_rfp_media_conf_rx_port_1;
+static int hf_dect_mitel_rfp_media_conf_rx_port_2;
+static int hf_dect_mitel_rfp_media_conf_tx_ip_address;
+static int hf_dect_mitel_rfp_media_conf_tx_port_1;
+static int hf_dect_mitel_rfp_media_conf_tx_port_2;
 
 /* MEDIA-START */
-static int hf_dect_mitel_rfp_media_start_time = -1;
-static int hf_dect_mitel_rfp_media_start_met_keep_alive = -1;
+static int hf_dect_mitel_rfp_media_start_time;
+static int hf_dect_mitel_rfp_media_start_met_keep_alive;
 
 /* MEDIA-STATISTICS */
-static int hf_dect_mitel_rfp_media_statistics_duration = -1;
-static int hf_dect_mitel_rfp_media_statistics_tx_packets = -1;
-static int hf_dect_mitel_rfp_media_statistics_tx_bytes = -1;
-static int hf_dect_mitel_rfp_media_statistics_rx_packets = -1;
-static int hf_dect_mitel_rfp_media_statistics_rx_bytes = -1;
-static int hf_dect_mitel_rfp_media_statistics_lost_packets = -1;
-static int hf_dect_mitel_rfp_media_statistics_max_jitter = -1;
-static int hf_dect_mitel_rfp_media_statistics_rtp_ip_address = -1;
+static int hf_dect_mitel_rfp_media_statistics_duration;
+static int hf_dect_mitel_rfp_media_statistics_tx_packets;
+static int hf_dect_mitel_rfp_media_statistics_tx_bytes;
+static int hf_dect_mitel_rfp_media_statistics_rx_packets;
+static int hf_dect_mitel_rfp_media_statistics_rx_bytes;
+static int hf_dect_mitel_rfp_media_statistics_lost_packets;
+static int hf_dect_mitel_rfp_media_statistics_max_jitter;
+static int hf_dect_mitel_rfp_media_statistics_rtp_ip_address;
 
 /* MEDIA-REDIRECT-START */
-static int hf_dect_mitel_rfp_media_redirect_start_local_port_1 = -1;
-static int hf_dect_mitel_rfp_media_redirect_start_local_port_2 = -1;
-static int hf_dect_mitel_rfp_media_redirect_start_remote_ip_address = -1;
-static int hf_dect_mitel_rfp_media_redirect_start_remote_port_1 = -1;
-static int hf_dect_mitel_rfp_media_redirect_start_remote_port_2 = -1;
-static int hf_dect_mitel_rfp_media_redirect_start_time = -1;
+static int hf_dect_mitel_rfp_media_redirect_start_local_port_1;
+static int hf_dect_mitel_rfp_media_redirect_start_local_port_2;
+static int hf_dect_mitel_rfp_media_redirect_start_remote_ip_address;
+static int hf_dect_mitel_rfp_media_redirect_start_remote_port_1;
+static int hf_dect_mitel_rfp_media_redirect_start_remote_port_2;
+static int hf_dect_mitel_rfp_media_redirect_start_time;
 
 /* MEDIA-REDIRECT-STOP */
-static int hf_dect_mitel_rfp_media_redirect_stop_fallback = -1;
+static int hf_dect_mitel_rfp_media_redirect_stop_fallback;
 
 /* MEDIA-DTMF */
-static int hf_dect_mitel_rfp_media_dtmf_duration = -1;
-static int hf_dect_mitel_rfp_media_dtmf_key = -1;
+static int hf_dect_mitel_rfp_media_dtmf_duration;
+static int hf_dect_mitel_rfp_media_dtmf_key;
 
 /* MEDIA-TONE */
-static int hf_dect_mitel_rfp_media_tone_count = -1;
-static int hf_dect_mitel_rfp_media_tone_frequency_1 = -1;
-static int hf_dect_mitel_rfp_media_tone_frequency_2 = -1;
-static int hf_dect_mitel_rfp_media_tone_frequency_3 = -1;
-static int hf_dect_mitel_rfp_media_tone_frequency_4 = -1;
-static int hf_dect_mitel_rfp_media_tone_cb_1 = -1;
-static int hf_dect_mitel_rfp_media_tone_cb_2 = -1;
-static int hf_dect_mitel_rfp_media_tone_cb_3 = -1;
-static int hf_dect_mitel_rfp_media_tone_cb_4 = -1;
-static int hf_dect_mitel_rfp_media_tone_duration= -1;
-static int hf_dect_mitel_rfp_media_tone_cycle_count = -1;
-static int hf_dect_mitel_rfp_media_tone_cycle_to = -1;
-static int hf_dect_mitel_rfp_media_tone_next = -1;
+static int hf_dect_mitel_rfp_media_tone_count;
+static int hf_dect_mitel_rfp_media_tone_frequency_1;
+static int hf_dect_mitel_rfp_media_tone_frequency_2;
+static int hf_dect_mitel_rfp_media_tone_frequency_3;
+static int hf_dect_mitel_rfp_media_tone_frequency_4;
+static int hf_dect_mitel_rfp_media_tone_cb_1;
+static int hf_dect_mitel_rfp_media_tone_cb_2;
+static int hf_dect_mitel_rfp_media_tone_cb_3;
+static int hf_dect_mitel_rfp_media_tone_cb_4;
+static int hf_dect_mitel_rfp_media_tone_duration;
+static int hf_dect_mitel_rfp_media_tone_cycle_count;
+static int hf_dect_mitel_rfp_media_tone_cycle_to;
+static int hf_dect_mitel_rfp_media_tone_next;
 
 /* SYNC */
-static int hf_dect_mitel_rfp_sync_payload_type = -1;
-static int hf_dect_mitel_rfp_sync_payload_length = -1;
+static int hf_dect_mitel_rfp_sync_payload_type;
+static int hf_dect_mitel_rfp_sync_payload_length;
 
 /* SYNC FREQ_CTRL_MODE_IND */
-static int hf_dect_mitel_rfp_sync_freq_ctrl_mode_ind_mode = -1;
+static int hf_dect_mitel_rfp_sync_freq_ctrl_mode_ind_mode;
 
 /* SYNC FREQ_CTRL_MODE_CFM */
-static int hf_dect_mitel_rfp_sync_freq_ctrl_mode_cfm_mode = -1;
-static int hf_dect_mitel_rfp_sync_freq_ctrl_mode_cfm_ppm = -1;
-static int hf_dect_mitel_rfp_sync_freq_ctrl_mode_cfm_avg = -1;
+static int hf_dect_mitel_rfp_sync_freq_ctrl_mode_cfm_mode;
+static int hf_dect_mitel_rfp_sync_freq_ctrl_mode_cfm_ppm;
+static int hf_dect_mitel_rfp_sync_freq_ctrl_mode_cfm_avg;
 
 /* SYNC SET_FREQUENCY */
-static int hf_dect_mitel_rfp_sync_set_frequency_value = -1;
+static int hf_dect_mitel_rfp_sync_set_frequency_value;
 
 /* SYNC START_MAC_SLAVE_MODE_IND */
-static int hf_dect_mitel_rfp_sync_start_mac_slave_mode_ind_rfp = -1;
+static int hf_dect_mitel_rfp_sync_start_mac_slave_mode_ind_rfp;
 
 /* SYNC SYSTEM_SEARCH_IND */
-static int hf_dect_mitel_rfp_sync_system_search_ind_mode = -1;
+static int hf_dect_mitel_rfp_sync_system_search_ind_mode;
 
 /* SYNC SYSTEM_SEARCH_CFM */
-static int hf_dect_mitel_rfp_sync_system_search_cfm_count = -1;
-static int hf_dect_mitel_rfp_sync_system_search_cfm_item_rpn = -1;
-static int hf_dect_mitel_rfp_sync_system_search_cfm_item_rssi = -1;
+static int hf_dect_mitel_rfp_sync_system_search_cfm_count;
+static int hf_dect_mitel_rfp_sync_system_search_cfm_item_rpn;
+static int hf_dect_mitel_rfp_sync_system_search_cfm_item_rssi;
 
 /* SYNC PHASE_OFS_WITH_RSSI_IND */
-static int hf_dect_mitel_rfp_sync_phase_ofs_with_rssi_ind_count = -1;
-static int hf_dect_mitel_rfp_sync_phase_ofs_with_rssi_ind_item_rpn = -1;
-static int hf_dect_mitel_rfp_sync_phase_ofs_with_rssi_ind_item_offset = -1;
-static int hf_dect_mitel_rfp_sync_phase_ofs_with_rssi_ind_item_rssi = -1;
-static int hf_dect_mitel_rfp_sync_phase_ofs_with_rssi_ind_item_qt_sync_check = -1;
+static int hf_dect_mitel_rfp_sync_phase_ofs_with_rssi_ind_count;
+static int hf_dect_mitel_rfp_sync_phase_ofs_with_rssi_ind_item_rpn;
+static int hf_dect_mitel_rfp_sync_phase_ofs_with_rssi_ind_item_offset;
+static int hf_dect_mitel_rfp_sync_phase_ofs_with_rssi_ind_item_rssi;
+static int hf_dect_mitel_rfp_sync_phase_ofs_with_rssi_ind_item_qt_sync_check;
 
 /* Message Type */
 enum dect_mitel_rfp_message_type_coding {
@@ -635,11 +635,11 @@ static dissector_handle_t dect_mitel_eth_handle;
 static guint tcp_port_pref = DECT_MITEL_RFP_TCP_PORT;
 
 /* Initialize the subtree pointers */
-static gint ett_dect_mitel_rfp = -1;
-static gint ett_dect_mitel_rfp_sys_init_rfp_capabilities = -1;
-static gint ett_dect_mitel_rfp_media_tone_entry = -1;
-static gint ett_dect_mitel_rfp_sync_system_search_cfm_item = -1;
-static gint ett_dect_mitel_rfp_sync_phase_ofs_with_rssi_ind_item = -1;
+static gint ett_dect_mitel_rfp;
+static gint ett_dect_mitel_rfp_sys_init_rfp_capabilities;
+static gint ett_dect_mitel_rfp_media_tone_entry;
+static gint ett_dect_mitel_rfp_sync_system_search_cfm_item;
+static gint ett_dect_mitel_rfp_sync_phase_ofs_with_rssi_ind_item;
 
 /*
 CONTROL-ACK Message
diff --git a/epan/dissectors/packet-dect-nwk.c b/epan/dissectors/packet-dect-nwk.c
index 75ad35f2df..f5ade108ef 100644
--- a/epan/dissectors/packet-dect-nwk.c
+++ b/epan/dissectors/packet-dect-nwk.c
@@ -28,262 +28,262 @@
 void proto_register_dect_nwk(void);
 void proto_reg_handoff_dect_nwk(void);
 
-static int proto_dect_nwk = -1;
+static int proto_dect_nwk;
 
-static int hf_nwk_ti = -1;
-static int hf_nwk_pdisc = -1;
-static int hf_nwk_msg_type_lce = -1;
-static int hf_nwk_msg_type_cc = -1;
-static int hf_dect_nwk_message_type_ciss = -1;
-static int hf_dect_nwk_message_type_crss = -1;
-static int hf_dect_nwk_message_type_clms = -1;
-static int hf_dect_nwk_message_type_coms = -1;
-static int hf_nwk_msg_type_mm = -1;
-
-static int ett_dect_nwk_s_ie_element = -1;
-
-static int hf_dect_nwk_s_ie_fl = -1;
-
-static int hf_dect_nwk_s_ie_fl_type = -1;
-static int hf_dect_nwk_s_ie_fl_double_octet_type = -1;
-
-static int hf_dect_nwk_s_ie_fl_control_type = -1;
-
-static int hf_dect_nwk_s_ie_fl_repeat_indicator_type = -1;
-
-static int hf_dect_nwk_s_ie_fl_shift_locking = -1;
-static int hf_dect_nwk_s_ie_fl_shift_new_codeset = -1;
-
-static int hf_dect_nwk_s_ie_fl_basic_service_call_class = -1;
-static int hf_dect_nwk_s_ie_fl_basic_service_type = -1;
-
-static int hf_dect_nwk_s_ie_fl_single_display_display_info = -1;
-
-static int hf_dect_nwk_s_ie_fl_single_keypad_keypad_info = -1;
-
-static int hf_dect_nwk_s_ie_fl_release_reason_code = -1;
-
-static int hf_dect_nwk_s_ie_fl_signal_value = -1;
-
-static int hf_dect_nwk_s_ie_fl_timer_restart_value = -1;
-
-static int hf_dect_nwk_s_ie_fl_test_hook_control_hook_value = -1;
-
-static int hf_dect_nwk_s_ie_type = -1;
-static int hf_dect_nwk_s_ie_length = -1;
-
-static int hf_dect_nwk_s_ie_octet_group_extension = -1;
-
-static int hf_dect_nwk_s_ie_auth_type_authentication_algorithm = -1;
-static int hf_dect_nwk_s_ie_auth_type_proprietary_algorithm = -1;
-static int hf_dect_nwk_s_ie_auth_type_ak_type = -1;
-static int hf_dect_nwk_s_ie_auth_type_ak_number = -1;
-static int hf_dect_nwk_s_ie_auth_type_inc = -1;
-static int hf_dect_nwk_s_ie_auth_type_def = -1;
-static int hf_dect_nwk_s_ie_auth_type_txc = -1;
-static int hf_dect_nwk_s_ie_auth_type_upc = -1;
-static int hf_dect_nwk_s_ie_auth_type_cipher_key_number = -1;
-static int hf_dect_nwk_s_ie_auth_type_cipher_key_number_related = -1;
-static int hf_dect_nwk_s_ie_auth_type_default_cipher_key_index = -1;
-static int hf_dect_nwk_s_ie_auth_type_default_cipher_key_algorithm = -1;
-
-static int hf_dect_nwk_s_ie_calling_party_number_type = -1;
-static int hf_dect_nwk_s_ie_calling_party_number_numbering_plan = -1;
-static int hf_dect_nwk_s_ie_calling_party_number_presentation = -1;
-static int hf_dect_nwk_s_ie_calling_party_number_screening = -1;
-static int hf_dect_nwk_s_ie_calling_party_number_address = -1;
-
-static int hf_dect_nwk_s_ie_cipher_info_yn = -1;
-static int hf_dect_nwk_s_ie_cipher_info_algorithm = -1;
-static int hf_dect_nwk_s_ie_cipher_info_proprietary_algorithm = -1;
-static int hf_dect_nwk_s_ie_cipher_info_key_type = -1;
-static int hf_dect_nwk_s_ie_cipher_info_key_number = -1;
-
-static int hf_dect_nwk_s_ie_duration_lock_limits = -1;
-static int hf_dect_nwk_s_ie_duration_time_limits = -1;
-static int hf_dect_nwk_s_ie_duration_time_duration = -1;
-
-static int hf_dect_nwk_s_ie_fixed_identity_type = -1;
-static int hf_dect_nwk_s_ie_fixed_identity_value_length = -1;
-static int hf_dect_nwk_s_ie_fixed_identity_arc = -1;
-static int hf_dect_nwk_s_ie_fixed_identity_ard = -1;
-static int hf_dect_nwk_s_ie_fixed_identity_padding = -1;
-
-static int hf_dect_nwk_s_ie_iwu_to_iwu_sr = -1;
-static int hf_dect_nwk_s_ie_iwu_to_iwu_protocol_discriminator = -1;
-static int hf_dect_nwk_s_ie_iwu_to_iwu_information = -1;
-static int hf_dect_nwk_s_ie_iwu_to_iwu_discriminator_type = -1;
-static int hf_dect_nwk_s_ie_iwu_to_iwu_user_specific_contents = -1;
-static int hf_dect_nwk_s_ie_iwu_to_iwu_emc_discriminator = -1;
-static int hf_dect_nwk_s_ie_iwu_to_iwu_proprietary_contents = -1;
-
-static int ett_dect_nwk_s_ie_location_area_li_type = -1;
-static int hf_dect_nwk_s_ie_location_area_li_type = -1;
-static int hf_dect_nwk_s_ie_location_area_la_level_included = -1;
-static int hf_dect_nwk_s_ie_location_area_li_extended_included = -1;
-static int hf_dect_nwk_s_ie_location_area_la_level = -1;
-static int hf_dect_nwk_s_ie_location_area_eli_type = -1;
-static int hf_dect_nwk_s_ie_location_area_lac = -1;
-static int hf_dect_nwk_s_ie_location_area_ci = -1;
-
-static int hf_dect_nwk_s_ie_multi_display_information = -1;
-
-static int hf_dect_nwk_s_ie_multi_keypad_information = -1;
-
-static int hf_dect_nwk_s_ie_nwk_assigned_identity_type = -1;
-static int hf_dect_nwk_s_ie_nwk_assigned_identity_value_length = -1;
-static int hf_dect_nwk_s_ie_nwk_assigned_identity_value = -1;
-static int hf_dect_nwk_s_ie_nwk_assigned_identity_padding = -1;
-
-static int hf_dect_nwk_s_ie_portable_identity_type = -1;
-static int hf_dect_nwk_s_ie_portable_identity_value_length = -1;
-static int hf_dect_nwk_s_ie_portable_identity_put = -1;
-static int hf_dect_nwk_s_ie_portable_identity_padding = -1;
-static int hf_dect_nwk_s_ie_portable_identity_ipei = -1;
-static int hf_dect_nwk_s_ie_portable_identity_tpui_assignment_type = -1;
-static int hf_dect_nwk_s_ie_portable_identity_tpui_value = -1;
-static int hf_dect_nwk_s_ie_portable_identity_ipui_o_number = -1;
-static int hf_dect_nwk_s_ie_portable_identity_ipui_p_poc = -1;
-static int hf_dect_nwk_s_ie_portable_identity_ipui_p_acc = -1;
-static int hf_dect_nwk_s_ie_portable_identity_ipui_q_bacn = -1;
-static int hf_dect_nwk_s_ie_portable_identity_ipui_r_imsi = -1;
-static int hf_dect_nwk_s_ie_portable_identity_ipui_s_number = -1;
-static int hf_dect_nwk_s_ie_portable_identity_ipui_t_eic = -1;
-static int hf_dect_nwk_s_ie_portable_identity_ipui_t_number = -1;
-static int hf_dect_nwk_s_ie_portable_identity_ipui_u_cacn = -1;
-
-static int hf_dect_nwk_s_ie_rand_rand_field = -1;
-
-static int hf_dect_nwk_s_ie_res_res_field = -1;
-
-static int hf_dect_nwk_s_ie_rs_rs_field = -1;
-
-static int hf_dect_nwk_s_ie_terminal_capability_tone_capabilities = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_display_capabilities = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_echo_parameter = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_n_rej = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_a_vol = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_slot_type_capability = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_slot_type_half_80 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_slot_type_long_640 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_slot_type_long_672 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_slot_type_full = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_slot_type_double = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_stored_display_characters = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_lines_in_display = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_chars_per_line = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_scrolling_behaviour = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1_cap = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1_gap = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1_dect_gsm = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1_isdn = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1_lrms = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1_dprs_stream = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1_dprs_asymmetric = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2_dprs_class_2 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2_data_services = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2_isdn = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2_dect_umts_bearer = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2_dect_umts_sms = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2_dect_umts_facsimile = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2_rap = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3_dect_gsm = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3_wrs = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3_sms = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3_dmap = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3_cta = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3_ethernet = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3_token_ring = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4_ip = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4_ppp = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4_v24 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4_cf = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4_ipq = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4_rap_2 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4_dprs = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5_mod_2bz = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5_mod_4bz = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5_mod_8bz = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5_mod_16bz = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5_mod_2a = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5_mod_4a = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5_mod_8a = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6_dect_umts = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6_dect_umts_gprs = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6_odap = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6_f_mms = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6_gf = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6_fast_hopping = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6_no_emission = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7_mod64 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7_ng_dect_1 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7_ng_dect_3 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7_headset_management = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7_re_keying = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7_associated_melody = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7_ng_dect_5 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_8 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_8_mux_e_u = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_8_channel_ipf = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_8_channel_sipf = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_8_packet_data_category = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_9 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_9_dprs_3 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_9_dprs_4 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_9_dect_ule = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_9_light_data = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_10 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_10_date_time_recovery = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_10_extended_list_change = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_10_screening = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_10_wrs_2 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_10_wrs_ule = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_dsaa2 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_dsc2 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_control_codes = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_escape_to_char_sets_1 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_escape_to_char_sets_1_latin_no1 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_escape_to_char_sets_1_latin_no9 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_escape_to_char_sets_1_latin_no5 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_escape_to_char_sets_1_greek = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_blind_slot_6 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_blind_slot_indication = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_sp0 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_sp1 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_sp2 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_sp3 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_sp4 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_blind_slot_6a = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_sp5 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_sp6 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_sp7 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_sp8 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_sp9 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_sp10 = -1;
-static int hf_dect_nwk_s_ie_terminal_capability_sp11 = -1;
-
-static int hf_dect_nwk_s_ie_escape_to_proprietary_discriminator_type = -1;
-static int hf_dect_nwk_s_ie_escape_to_proprietary_discriminator = -1;
-
-static int hf_dect_nwk_s_ie_model_identifier_manic = -1;
-static int hf_dect_nwk_s_ie_model_identifier_modic = -1;
-static int hf_dect_nwk_s_ie_model_identifier_imeisv = -1;
-
-static int hf_dect_nwk_s_ie_codec_list_negotiation_indicator = -1;
-static int hf_dect_nwk_s_ie_codec_list_codec_identifier = -1;
-static int hf_dect_nwk_s_ie_codec_list_mac_and_dlc_service = -1;
-static int hf_dect_nwk_s_ie_codec_list_last_codec = -1;
-static int hf_dect_nwk_s_ie_codec_list_c_plane_routing = -1;
-static int hf_dect_nwk_s_ie_codec_list_slot_size = -1;
-
-static gint ett_dect_nwk = -1;
+static int hf_nwk_ti;
+static int hf_nwk_pdisc;
+static int hf_nwk_msg_type_lce;
+static int hf_nwk_msg_type_cc;
+static int hf_dect_nwk_message_type_ciss;
+static int hf_dect_nwk_message_type_crss;
+static int hf_dect_nwk_message_type_clms;
+static int hf_dect_nwk_message_type_coms;
+static int hf_nwk_msg_type_mm;
+
+static int ett_dect_nwk_s_ie_element;
+
+static int hf_dect_nwk_s_ie_fl;
+
+static int hf_dect_nwk_s_ie_fl_type;
+static int hf_dect_nwk_s_ie_fl_double_octet_type;
+
+static int hf_dect_nwk_s_ie_fl_control_type;
+
+static int hf_dect_nwk_s_ie_fl_repeat_indicator_type;
+
+static int hf_dect_nwk_s_ie_fl_shift_locking;
+static int hf_dect_nwk_s_ie_fl_shift_new_codeset;
+
+static int hf_dect_nwk_s_ie_fl_basic_service_call_class;
+static int hf_dect_nwk_s_ie_fl_basic_service_type;
+
+static int hf_dect_nwk_s_ie_fl_single_display_display_info;
+
+static int hf_dect_nwk_s_ie_fl_single_keypad_keypad_info;
+
+static int hf_dect_nwk_s_ie_fl_release_reason_code;
+
+static int hf_dect_nwk_s_ie_fl_signal_value;
+
+static int hf_dect_nwk_s_ie_fl_timer_restart_value;
+
+static int hf_dect_nwk_s_ie_fl_test_hook_control_hook_value;
+
+static int hf_dect_nwk_s_ie_type;
+static int hf_dect_nwk_s_ie_length;
+
+static int hf_dect_nwk_s_ie_octet_group_extension;
+
+static int hf_dect_nwk_s_ie_auth_type_authentication_algorithm;
+static int hf_dect_nwk_s_ie_auth_type_proprietary_algorithm;
+static int hf_dect_nwk_s_ie_auth_type_ak_type;
+static int hf_dect_nwk_s_ie_auth_type_ak_number;
+static int hf_dect_nwk_s_ie_auth_type_inc;
+static int hf_dect_nwk_s_ie_auth_type_def;
+static int hf_dect_nwk_s_ie_auth_type_txc;
+static int hf_dect_nwk_s_ie_auth_type_upc;
+static int hf_dect_nwk_s_ie_auth_type_cipher_key_number;
+static int hf_dect_nwk_s_ie_auth_type_cipher_key_number_related;
+static int hf_dect_nwk_s_ie_auth_type_default_cipher_key_index;
+static int hf_dect_nwk_s_ie_auth_type_default_cipher_key_algorithm;
+
+static int hf_dect_nwk_s_ie_calling_party_number_type;
+static int hf_dect_nwk_s_ie_calling_party_number_numbering_plan;
+static int hf_dect_nwk_s_ie_calling_party_number_presentation;
+static int hf_dect_nwk_s_ie_calling_party_number_screening;
+static int hf_dect_nwk_s_ie_calling_party_number_address;
+
+static int hf_dect_nwk_s_ie_cipher_info_yn;
+static int hf_dect_nwk_s_ie_cipher_info_algorithm;
+static int hf_dect_nwk_s_ie_cipher_info_proprietary_algorithm;
+static int hf_dect_nwk_s_ie_cipher_info_key_type;
+static int hf_dect_nwk_s_ie_cipher_info_key_number;
+
+static int hf_dect_nwk_s_ie_duration_lock_limits;
+static int hf_dect_nwk_s_ie_duration_time_limits;
+static int hf_dect_nwk_s_ie_duration_time_duration;
+
+static int hf_dect_nwk_s_ie_fixed_identity_type;
+static int hf_dect_nwk_s_ie_fixed_identity_value_length;
+static int hf_dect_nwk_s_ie_fixed_identity_arc;
+static int hf_dect_nwk_s_ie_fixed_identity_ard;
+static int hf_dect_nwk_s_ie_fixed_identity_padding;
+
+static int hf_dect_nwk_s_ie_iwu_to_iwu_sr;
+static int hf_dect_nwk_s_ie_iwu_to_iwu_protocol_discriminator;
+static int hf_dect_nwk_s_ie_iwu_to_iwu_information;
+static int hf_dect_nwk_s_ie_iwu_to_iwu_discriminator_type;
+static int hf_dect_nwk_s_ie_iwu_to_iwu_user_specific_contents;
+static int hf_dect_nwk_s_ie_iwu_to_iwu_emc_discriminator;
+static int hf_dect_nwk_s_ie_iwu_to_iwu_proprietary_contents;
+
+static int ett_dect_nwk_s_ie_location_area_li_type;
+static int hf_dect_nwk_s_ie_location_area_li_type;
+static int hf_dect_nwk_s_ie_location_area_la_level_included;
+static int hf_dect_nwk_s_ie_location_area_li_extended_included;
+static int hf_dect_nwk_s_ie_location_area_la_level;
+static int hf_dect_nwk_s_ie_location_area_eli_type;
+static int hf_dect_nwk_s_ie_location_area_lac;
+static int hf_dect_nwk_s_ie_location_area_ci;
+
+static int hf_dect_nwk_s_ie_multi_display_information;
+
+static int hf_dect_nwk_s_ie_multi_keypad_information;
+
+static int hf_dect_nwk_s_ie_nwk_assigned_identity_type;
+static int hf_dect_nwk_s_ie_nwk_assigned_identity_value_length;
+static int hf_dect_nwk_s_ie_nwk_assigned_identity_value;
+static int hf_dect_nwk_s_ie_nwk_assigned_identity_padding;
+
+static int hf_dect_nwk_s_ie_portable_identity_type;
+static int hf_dect_nwk_s_ie_portable_identity_value_length;
+static int hf_dect_nwk_s_ie_portable_identity_put;
+static int hf_dect_nwk_s_ie_portable_identity_padding;
+static int hf_dect_nwk_s_ie_portable_identity_ipei;
+static int hf_dect_nwk_s_ie_portable_identity_tpui_assignment_type;
+static int hf_dect_nwk_s_ie_portable_identity_tpui_value;
+static int hf_dect_nwk_s_ie_portable_identity_ipui_o_number;
+static int hf_dect_nwk_s_ie_portable_identity_ipui_p_poc;
+static int hf_dect_nwk_s_ie_portable_identity_ipui_p_acc;
+static int hf_dect_nwk_s_ie_portable_identity_ipui_q_bacn;
+static int hf_dect_nwk_s_ie_portable_identity_ipui_r_imsi;
+static int hf_dect_nwk_s_ie_portable_identity_ipui_s_number;
+static int hf_dect_nwk_s_ie_portable_identity_ipui_t_eic;
+static int hf_dect_nwk_s_ie_portable_identity_ipui_t_number;
+static int hf_dect_nwk_s_ie_portable_identity_ipui_u_cacn;
+
+static int hf_dect_nwk_s_ie_rand_rand_field;
+
+static int hf_dect_nwk_s_ie_res_res_field;
+
+static int hf_dect_nwk_s_ie_rs_rs_field;
+
+static int hf_dect_nwk_s_ie_terminal_capability_tone_capabilities;
+static int hf_dect_nwk_s_ie_terminal_capability_display_capabilities;
+static int hf_dect_nwk_s_ie_terminal_capability_echo_parameter;
+static int hf_dect_nwk_s_ie_terminal_capability_n_rej;
+static int hf_dect_nwk_s_ie_terminal_capability_a_vol;
+static int hf_dect_nwk_s_ie_terminal_capability_slot_type_capability;
+static int hf_dect_nwk_s_ie_terminal_capability_slot_type_half_80;
+static int hf_dect_nwk_s_ie_terminal_capability_slot_type_long_640;
+static int hf_dect_nwk_s_ie_terminal_capability_slot_type_long_672;
+static int hf_dect_nwk_s_ie_terminal_capability_slot_type_full;
+static int hf_dect_nwk_s_ie_terminal_capability_slot_type_double;
+static int hf_dect_nwk_s_ie_terminal_capability_stored_display_characters;
+static int hf_dect_nwk_s_ie_terminal_capability_lines_in_display;
+static int hf_dect_nwk_s_ie_terminal_capability_chars_per_line;
+static int hf_dect_nwk_s_ie_terminal_capability_scrolling_behaviour;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1_cap;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1_gap;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1_dect_gsm;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1_isdn;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1_lrms;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1_dprs_stream;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_1_dprs_asymmetric;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2_dprs_class_2;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2_data_services;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2_isdn;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2_dect_umts_bearer;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2_dect_umts_sms;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2_dect_umts_facsimile;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_2_rap;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3_dect_gsm;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3_wrs;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3_sms;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3_dmap;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3_cta;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3_ethernet;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_3_token_ring;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4_ip;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4_ppp;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4_v24;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4_cf;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4_ipq;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4_rap_2;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_4_dprs;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5_mod_2bz;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5_mod_4bz;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5_mod_8bz;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5_mod_16bz;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5_mod_2a;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5_mod_4a;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_5_mod_8a;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6_dect_umts;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6_dect_umts_gprs;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6_odap;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6_f_mms;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6_gf;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6_fast_hopping;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_6_no_emission;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7_mod64;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7_ng_dect_1;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7_ng_dect_3;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7_headset_management;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7_re_keying;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7_associated_melody;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_7_ng_dect_5;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_8;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_8_mux_e_u;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_8_channel_ipf;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_8_channel_sipf;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_8_packet_data_category;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_9;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_9_dprs_3;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_9_dprs_4;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_9_dect_ule;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_9_light_data;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_10;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_10_date_time_recovery;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_10_extended_list_change;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_10_screening;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_10_wrs_2;
+static int hf_dect_nwk_s_ie_terminal_capability_profile_indicator_10_wrs_ule;
+static int hf_dect_nwk_s_ie_terminal_capability_dsaa2;
+static int hf_dect_nwk_s_ie_terminal_capability_dsc2;
+static int hf_dect_nwk_s_ie_terminal_capability_control_codes;
+static int hf_dect_nwk_s_ie_terminal_capability_escape_to_char_sets_1;
+static int hf_dect_nwk_s_ie_terminal_capability_escape_to_char_sets_1_latin_no1;
+static int hf_dect_nwk_s_ie_terminal_capability_escape_to_char_sets_1_latin_no9;
+static int hf_dect_nwk_s_ie_terminal_capability_escape_to_char_sets_1_latin_no5;
+static int hf_dect_nwk_s_ie_terminal_capability_escape_to_char_sets_1_greek;
+static int hf_dect_nwk_s_ie_terminal_capability_blind_slot_6;
+static int hf_dect_nwk_s_ie_terminal_capability_blind_slot_indication;
+static int hf_dect_nwk_s_ie_terminal_capability_sp0;
+static int hf_dect_nwk_s_ie_terminal_capability_sp1;
+static int hf_dect_nwk_s_ie_terminal_capability_sp2;
+static int hf_dect_nwk_s_ie_terminal_capability_sp3;
+static int hf_dect_nwk_s_ie_terminal_capability_sp4;
+static int hf_dect_nwk_s_ie_terminal_capability_blind_slot_6a;
+static int hf_dect_nwk_s_ie_terminal_capability_sp5;
+static int hf_dect_nwk_s_ie_terminal_capability_sp6;
+static int hf_dect_nwk_s_ie_terminal_capability_sp7;
+static int hf_dect_nwk_s_ie_terminal_capability_sp8;
+static int hf_dect_nwk_s_ie_terminal_capability_sp9;
+static int hf_dect_nwk_s_ie_terminal_capability_sp10;
+static int hf_dect_nwk_s_ie_terminal_capability_sp11;
+
+static int hf_dect_nwk_s_ie_escape_to_proprietary_discriminator_type;
+static int hf_dect_nwk_s_ie_escape_to_proprietary_discriminator;
+
+static int hf_dect_nwk_s_ie_model_identifier_manic;
+static int hf_dect_nwk_s_ie_model_identifier_modic;
+static int hf_dect_nwk_s_ie_model_identifier_imeisv;
+
+static int hf_dect_nwk_s_ie_codec_list_negotiation_indicator;
+static int hf_dect_nwk_s_ie_codec_list_codec_identifier;
+static int hf_dect_nwk_s_ie_codec_list_mac_and_dlc_service;
+static int hf_dect_nwk_s_ie_codec_list_last_codec;
+static int hf_dect_nwk_s_ie_codec_list_c_plane_routing;
+static int hf_dect_nwk_s_ie_codec_list_slot_size;
+
+static gint ett_dect_nwk;
 
 static dissector_handle_t dect_nwk_handle;
 
diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c
index b7ca9d4007..520f923e7f 100644
--- a/epan/dissectors/packet-dect.c
+++ b/epan/dissectors/packet-dect.c
@@ -75,144 +75,144 @@ void proto_reg_handoff_dect (void);
 
 static dissector_handle_t dect_handle;
 
-static int proto_dect = -1;
-
-
-static gint ett_dect				= -1;
-static gint ett_columns				= -1;
-static gint ett_afield				= -1;
-static gint ett_ahead				= -1;
-static gint ett_atail				= -1;
-static gint ett_aqt				= -1;
-static gint ett_bfield				= -1;
-static gint ett_bfdescrdata			= -1;
-
-static int hf_dect_transceivermode		= -1;
-static int hf_dect_preamble			= -1;
-static int hf_dect_type				= -1;
-static int hf_dect_channel			= -1;
-static int hf_dect_framenumber			= -1;
-static int hf_dect_rssi				= -1;
-static int hf_dect_slot				= -1;
-static int hf_dect_cc				= -1;
-static int hf_dect_cc_TA			= -1;
-static int hf_dect_cc_AField			= -1;
-static int hf_dect_cc_BField			= -1;
-static int hf_dect_A				= -1;
-static int hf_dect_A_Head			= -1;
-static int hf_dect_A_Head_TA_FP			= -1;
-static int hf_dect_A_Head_TA_PP			= -1;
-static int hf_dect_A_Head_Q1			= -1;
-static int hf_dect_A_Head_BA			= -1;
-static int hf_dect_A_Head_Q2			= -1;
-static int hf_dect_A_Tail			= -1;
-static int hf_dect_A_Tail_Nt			= -1;
-static int hf_dect_A_Tail_Qt_Qh			= -1;
-static int hf_dect_A_Tail_Qt_0_Sn		= -1;
-static int hf_dect_A_Tail_Qt_0_Nr		= -1;
-static int hf_dect_A_Tail_Qt_0_Sp		= -1;
-static int hf_dect_A_Tail_Qt_0_Esc		= -1;
-static int hf_dect_A_Tail_Qt_0_Txs		= -1;
-static int hf_dect_A_Tail_Qt_0_Mc		= -1;
-static int hf_dect_A_Tail_Qt_0_CA		= -1;
-static int hf_dect_A_Tail_Qt_0_Spr1		= -1;
-static int hf_dect_A_Tail_Qt_0_Cn		= -1;
-static int hf_dect_A_Tail_Qt_0_Spr2		= -1;
-static int hf_dect_A_Tail_Qt_0_PSCN		= -1;
-static int hf_dect_A_Tail_Qt_3_A12		= -1;
-static int hf_dect_A_Tail_Qt_3_A13		= -1;
-static int hf_dect_A_Tail_Qt_3_A14		= -1;
-static int hf_dect_A_Tail_Qt_3_A15		= -1;
-static int hf_dect_A_Tail_Qt_3_A16		= -1;
-static int hf_dect_A_Tail_Qt_3_A17		= -1;
-static int hf_dect_A_Tail_Qt_3_A18		= -1;
-static int hf_dect_A_Tail_Qt_3_A19		= -1;
-static int hf_dect_A_Tail_Qt_3_A20		= -1;
-static int hf_dect_A_Tail_Qt_3_A21		= -1;
-static int hf_dect_A_Tail_Qt_3_A22		= -1;
-static int hf_dect_A_Tail_Qt_3_A23		= -1;
-static int hf_dect_A_Tail_Qt_3_A24		= -1;
-static int hf_dect_A_Tail_Qt_3_A25		= -1;
-static int hf_dect_A_Tail_Qt_3_A26		= -1;
-static int hf_dect_A_Tail_Qt_3_A27		= -1;
-static int hf_dect_A_Tail_Qt_3_A28		= -1;
-static int hf_dect_A_Tail_Qt_3_A29		= -1;
-static int hf_dect_A_Tail_Qt_3_A30		= -1;
-static int hf_dect_A_Tail_Qt_3_A31		= -1;
-static int hf_dect_A_Tail_Qt_3_A32		= -1;
-static int hf_dect_A_Tail_Qt_3_A33		= -1;
-static int hf_dect_A_Tail_Qt_3_A34		= -1;
-static int hf_dect_A_Tail_Qt_3_A35		= -1;
-static int hf_dect_A_Tail_Qt_3_A36		= -1;
-static int hf_dect_A_Tail_Qt_3_A37		= -1;
-static int hf_dect_A_Tail_Qt_3_A38		= -1;
-static int hf_dect_A_Tail_Qt_3_A39		= -1;
-static int hf_dect_A_Tail_Qt_3_A40		= -1;
-static int hf_dect_A_Tail_Qt_3_A41		= -1;
-static int hf_dect_A_Tail_Qt_3_A42		= -1;
-static int hf_dect_A_Tail_Qt_3_A43		= -1;
-static int hf_dect_A_Tail_Qt_3_A44		= -1;
-static int hf_dect_A_Tail_Qt_3_A45		= -1;
-static int hf_dect_A_Tail_Qt_3_A46		= -1;
-static int hf_dect_A_Tail_Qt_3_A47		= -1;
-static int hf_dect_A_Tail_Qt_4_CRFPHops		= -1;
-static int hf_dect_A_Tail_Qt_4_CRFPEnc		= -1;
-static int hf_dect_A_Tail_Qt_4_REFHops		= -1;
-static int hf_dect_A_Tail_Qt_4_REPCap		= -1;
-static int hf_dect_A_Tail_Qt_4_Sync		= -1;
-static int hf_dect_A_Tail_Qt_4_A20		= -1;
-static int hf_dect_A_Tail_Qt_4_MACSusp		= -1;
-static int hf_dect_A_Tail_Qt_4_MACIpq		= -1;
-static int hf_dect_A_Tail_Qt_4_A23		= -1;
-static int hf_dect_A_Tail_Qt_4_A24		= -1;
-static int hf_dect_A_Tail_Qt_4_A25		= -1;
-static int hf_dect_A_Tail_Qt_4_A26		= -1;
-static int hf_dect_A_Tail_Qt_4_A27		= -1;
-static int hf_dect_A_Tail_Qt_4_A28		= -1;
-static int hf_dect_A_Tail_Qt_4_A29		= -1;
-static int hf_dect_A_Tail_Qt_4_A30		= -1;
-static int hf_dect_A_Tail_Qt_4_A31		= -1;
-static int hf_dect_A_Tail_Qt_4_A32		= -1;
-static int hf_dect_A_Tail_Qt_4_A33		= -1;
-static int hf_dect_A_Tail_Qt_4_A34		= -1;
-static int hf_dect_A_Tail_Qt_4_A35		= -1;
-static int hf_dect_A_Tail_Qt_4_A36		= -1;
-static int hf_dect_A_Tail_Qt_4_A37		= -1;
-static int hf_dect_A_Tail_Qt_4_A38		= -1;
-static int hf_dect_A_Tail_Qt_4_A39		= -1;
-static int hf_dect_A_Tail_Qt_4_A40		= -1;
-static int hf_dect_A_Tail_Qt_4_A41		= -1;
-static int hf_dect_A_Tail_Qt_4_A42		= -1;
-static int hf_dect_A_Tail_Qt_4_A43		= -1;
-static int hf_dect_A_Tail_Qt_4_A44		= -1;
-static int hf_dect_A_Tail_Qt_4_A45		= -1;
-static int hf_dect_A_Tail_Qt_4_A46		= -1;
-static int hf_dect_A_Tail_Qt_4_A47		= -1;
-static int hf_dect_A_Tail_Qt_6_Spare		= -1;
-static int hf_dect_A_Tail_Qt_6_Mfn		= -1;
-static int hf_dect_A_Tail_Mt_Mh			= -1;
-static int hf_dect_A_Tail_Mt_Mh_attr		= -1;
-static int hf_dect_A_Tail_Mt_Mh_fmid		= -1;
-static int hf_dect_A_Tail_Mt_Mh_pmid		= -1;
-static int hf_dect_A_Tail_Mt_BasicConCtrl	= -1;
-static int hf_dect_A_Tail_Mt_Encr_Cmd1		= -1;
-static int hf_dect_A_Tail_Mt_Encr_Cmd2		= -1;
-static int hf_dect_A_Tail_Pt_ExtFlag		= -1;
-static int hf_dect_A_Tail_Pt_SDU		= -1;
-static int hf_dect_A_Tail_Pt_RFPI		= -1;
-static int hf_dect_A_Tail_Pt_BsData		= -1;
-static int hf_dect_A_Tail_Pt_InfoType		= -1;
-static int hf_dect_A_Tail_Pt_SlotPairs		= -1;
-static int hf_dect_A_Tail_Pt_Fillbits		= -1;
-static int hf_dect_A_Tail_Pt_Bearer_Sn		= -1;
-static int hf_dect_A_Tail_Pt_Bearer_Cn		= -1;
-static int hf_dect_A_Tail_Pt_Bearer_Sp		= -1;
-static int hf_dect_A_RCRC			= -1;
-static int hf_dect_B				= -1;
-static int hf_dect_B_Data			= -1;
-static int hf_dect_B_DescrambledData		= -1;
-static int hf_dect_B_fn				= -1;
-static int hf_dect_B_XCRC			= -1;
+static int proto_dect;
+
+
+static gint ett_dect;
+static gint ett_columns;
+static gint ett_afield;
+static gint ett_ahead;
+static gint ett_atail;
+static gint ett_aqt;
+static gint ett_bfield;
+static gint ett_bfdescrdata;
+
+static int hf_dect_transceivermode;
+static int hf_dect_preamble;
+static int hf_dect_type;
+static int hf_dect_channel;
+static int hf_dect_framenumber;
+static int hf_dect_rssi;
+static int hf_dect_slot;
+static int hf_dect_cc;
+static int hf_dect_cc_TA;
+static int hf_dect_cc_AField;
+static int hf_dect_cc_BField;
+static int hf_dect_A;
+static int hf_dect_A_Head;
+static int hf_dect_A_Head_TA_FP;
+static int hf_dect_A_Head_TA_PP;
+static int hf_dect_A_Head_Q1;
+static int hf_dect_A_Head_BA;
+static int hf_dect_A_Head_Q2;
+static int hf_dect_A_Tail;
+static int hf_dect_A_Tail_Nt;
+static int hf_dect_A_Tail_Qt_Qh;
+static int hf_dect_A_Tail_Qt_0_Sn;
+static int hf_dect_A_Tail_Qt_0_Nr;
+static int hf_dect_A_Tail_Qt_0_Sp;
+static int hf_dect_A_Tail_Qt_0_Esc;
+static int hf_dect_A_Tail_Qt_0_Txs;
+static int hf_dect_A_Tail_Qt_0_Mc;
+static int hf_dect_A_Tail_Qt_0_CA;
+static int hf_dect_A_Tail_Qt_0_Spr1;
+static int hf_dect_A_Tail_Qt_0_Cn;
+static int hf_dect_A_Tail_Qt_0_Spr2;
+static int hf_dect_A_Tail_Qt_0_PSCN;
+static int hf_dect_A_Tail_Qt_3_A12;
+static int hf_dect_A_Tail_Qt_3_A13;
+static int hf_dect_A_Tail_Qt_3_A14;
+static int hf_dect_A_Tail_Qt_3_A15;
+static int hf_dect_A_Tail_Qt_3_A16;
+static int hf_dect_A_Tail_Qt_3_A17;
+static int hf_dect_A_Tail_Qt_3_A18;
+static int hf_dect_A_Tail_Qt_3_A19;
+static int hf_dect_A_Tail_Qt_3_A20;
+static int hf_dect_A_Tail_Qt_3_A21;
+static int hf_dect_A_Tail_Qt_3_A22;
+static int hf_dect_A_Tail_Qt_3_A23;
+static int hf_dect_A_Tail_Qt_3_A24;
+static int hf_dect_A_Tail_Qt_3_A25;
+static int hf_dect_A_Tail_Qt_3_A26;
+static int hf_dect_A_Tail_Qt_3_A27;
+static int hf_dect_A_Tail_Qt_3_A28;
+static int hf_dect_A_Tail_Qt_3_A29;
+static int hf_dect_A_Tail_Qt_3_A30;
+static int hf_dect_A_Tail_Qt_3_A31;
+static int hf_dect_A_Tail_Qt_3_A32;
+static int hf_dect_A_Tail_Qt_3_A33;
+static int hf_dect_A_Tail_Qt_3_A34;
+static int hf_dect_A_Tail_Qt_3_A35;
+static int hf_dect_A_Tail_Qt_3_A36;
+static int hf_dect_A_Tail_Qt_3_A37;
+static int hf_dect_A_Tail_Qt_3_A38;
+static int hf_dect_A_Tail_Qt_3_A39;
+static int hf_dect_A_Tail_Qt_3_A40;
+static int hf_dect_A_Tail_Qt_3_A41;
+static int hf_dect_A_Tail_Qt_3_A42;
+static int hf_dect_A_Tail_Qt_3_A43;
+static int hf_dect_A_Tail_Qt_3_A44;
+static int hf_dect_A_Tail_Qt_3_A45;
+static int hf_dect_A_Tail_Qt_3_A46;
+static int hf_dect_A_Tail_Qt_3_A47;
+static int hf_dect_A_Tail_Qt_4_CRFPHops;
+static int hf_dect_A_Tail_Qt_4_CRFPEnc;
+static int hf_dect_A_Tail_Qt_4_REFHops;
+static int hf_dect_A_Tail_Qt_4_REPCap;
+static int hf_dect_A_Tail_Qt_4_Sync;
+static int hf_dect_A_Tail_Qt_4_A20;
+static int hf_dect_A_Tail_Qt_4_MACSusp;
+static int hf_dect_A_Tail_Qt_4_MACIpq;
+static int hf_dect_A_Tail_Qt_4_A23;
+static int hf_dect_A_Tail_Qt_4_A24;
+static int hf_dect_A_Tail_Qt_4_A25;
+static int hf_dect_A_Tail_Qt_4_A26;
+static int hf_dect_A_Tail_Qt_4_A27;
+static int hf_dect_A_Tail_Qt_4_A28;
+static int hf_dect_A_Tail_Qt_4_A29;
+static int hf_dect_A_Tail_Qt_4_A30;
+static int hf_dect_A_Tail_Qt_4_A31;
+static int hf_dect_A_Tail_Qt_4_A32;
+static int hf_dect_A_Tail_Qt_4_A33;
+static int hf_dect_A_Tail_Qt_4_A34;
+static int hf_dect_A_Tail_Qt_4_A35;
+static int hf_dect_A_Tail_Qt_4_A36;
+static int hf_dect_A_Tail_Qt_4_A37;
+static int hf_dect_A_Tail_Qt_4_A38;
+static int hf_dect_A_Tail_Qt_4_A39;
+static int hf_dect_A_Tail_Qt_4_A40;
+static int hf_dect_A_Tail_Qt_4_A41;
+static int hf_dect_A_Tail_Qt_4_A42;
+static int hf_dect_A_Tail_Qt_4_A43;
+static int hf_dect_A_Tail_Qt_4_A44;
+static int hf_dect_A_Tail_Qt_4_A45;
+static int hf_dect_A_Tail_Qt_4_A46;
+static int hf_dect_A_Tail_Qt_4_A47;
+static int hf_dect_A_Tail_Qt_6_Spare;
+static int hf_dect_A_Tail_Qt_6_Mfn;
+static int hf_dect_A_Tail_Mt_Mh;
+static int hf_dect_A_Tail_Mt_Mh_attr;
+static int hf_dect_A_Tail_Mt_Mh_fmid;
+static int hf_dect_A_Tail_Mt_Mh_pmid;
+static int hf_dect_A_Tail_Mt_BasicConCtrl;
+static int hf_dect_A_Tail_Mt_Encr_Cmd1;
+static int hf_dect_A_Tail_Mt_Encr_Cmd2;
+static int hf_dect_A_Tail_Pt_ExtFlag;
+static int hf_dect_A_Tail_Pt_SDU;
+static int hf_dect_A_Tail_Pt_RFPI;
+static int hf_dect_A_Tail_Pt_BsData;
+static int hf_dect_A_Tail_Pt_InfoType;
+static int hf_dect_A_Tail_Pt_SlotPairs;
+static int hf_dect_A_Tail_Pt_Fillbits;
+static int hf_dect_A_Tail_Pt_Bearer_Sn;
+static int hf_dect_A_Tail_Pt_Bearer_Cn;
+static int hf_dect_A_Tail_Pt_Bearer_Sp;
+static int hf_dect_A_RCRC;
+static int hf_dect_B;
+static int hf_dect_B_Data;
+static int hf_dect_B_DescrambledData;
+static int hf_dect_B_fn;
+static int hf_dect_B_XCRC;
 
 static const value_string transceiver_mode[]=
 {
diff --git a/epan/dissectors/packet-devicenet.c b/epan/dissectors/packet-devicenet.c
index 388c33f8de..95864d78bf 100644
--- a/epan/dissectors/packet-devicenet.c
+++ b/epan/dissectors/packet-devicenet.c
@@ -51,59 +51,59 @@ static dissector_handle_t devicenet_handle;
 #define MESSAGE_GROUP_4_ID              0x07EF
 #define MESSAGE_GROUP_4_MSG_MASK        0x003F
 
-static int proto_devicenet = -1;
-
-static int hf_devicenet_can_id = -1;
-static int hf_devicenet_src_mac_id = -1;
-static int hf_devicenet_data = -1;
-static int hf_devicenet_grp_msg1_id = -1;
-static int hf_devicenet_grp_msg2_id = -1;
-static int hf_devicenet_grp_msg3_id = -1;
-static int hf_devicenet_grp_msg3_frag = -1;
-static int hf_devicenet_grp_msg3_xid = -1;
-static int hf_devicenet_grp_msg3_dest_mac_id = -1;
-static int hf_devicenet_grp_msg4_id = -1;
-static int hf_devicenet_rr_bit = -1;
-static int hf_devicenet_service_code = -1;
-static int hf_devicenet_connection_id = -1;
-static int hf_devicenet_open_exp_src_message_id = -1;
-static int hf_devicenet_open_exp_dest_message_id = -1;
-static int hf_devicenet_open_exp_msg_req_body_format = -1;
-static int hf_devicenet_open_exp_msg_actual_body_format = -1;
-static int hf_devicenet_open_exp_group_select = -1;
-static int hf_devicenet_open_exp_msg_reserved = -1;
-static int hf_devicenet_dup_mac_id_rr_bit = -1;
-static int hf_devicenet_dup_mac_id_physical_port_number = -1;
-static int hf_devicenet_dup_mac_id_serial_number = -1;
-static int hf_devicenet_dup_mac_id_vendor = -1;
-static int hf_devicenet_comm_fault_rsv = -1;
-static int hf_devicenet_comm_fault_match = -1;
-static int hf_devicenet_comm_fault_value = -1;
-static int hf_devicenet_offline_ownership_reserved = -1;
-static int hf_devicenet_offline_ownership_client_mac_id = -1;
-static int hf_devicenet_offline_ownership_allocate = -1;
-static int hf_devicenet_vendor = -1;
-static int hf_devicenet_serial_number = -1;
-static int hf_devicenet_class8 = -1;
-static int hf_devicenet_class16 = -1;
-static int hf_devicenet_instance8 = -1;
-static int hf_devicenet_instance16 = -1;
-static int hf_devicenet_attribute = -1;
-static int hf_devicenet_fragment_type = -1;
-static int hf_devicenet_fragment_count = -1;
-
-static gint ett_devicenet = -1;
-static gint ett_devicenet_can = -1;
-static gint ett_devicenet_contents = -1;
-static gint ett_devicenet_8_8 = -1;
-static gint ett_devicenet_8_16 = -1;
-static gint ett_devicenet_16_8 = -1;
-static gint ett_devicenet_16_16 = -1;
-
-static expert_field ei_devicenet_invalid_service = EI_INIT;
-static expert_field ei_devicenet_invalid_can_id = EI_INIT;
-static expert_field ei_devicenet_invalid_msg_id = EI_INIT;
-static expert_field ei_devicenet_frag_not_supported = EI_INIT;
+static int proto_devicenet;
+
+static int hf_devicenet_can_id;
+static int hf_devicenet_src_mac_id;
+static int hf_devicenet_data;
+static int hf_devicenet_grp_msg1_id;
+static int hf_devicenet_grp_msg2_id;
+static int hf_devicenet_grp_msg3_id;
+static int hf_devicenet_grp_msg3_frag;
+static int hf_devicenet_grp_msg3_xid;
+static int hf_devicenet_grp_msg3_dest_mac_id;
+static int hf_devicenet_grp_msg4_id;
+static int hf_devicenet_rr_bit;
+static int hf_devicenet_service_code;
+static int hf_devicenet_connection_id;
+static int hf_devicenet_open_exp_src_message_id;
+static int hf_devicenet_open_exp_dest_message_id;
+static int hf_devicenet_open_exp_msg_req_body_format;
+static int hf_devicenet_open_exp_msg_actual_body_format;
+static int hf_devicenet_open_exp_group_select;
+static int hf_devicenet_open_exp_msg_reserved;
+static int hf_devicenet_dup_mac_id_rr_bit;
+static int hf_devicenet_dup_mac_id_physical_port_number;
+static int hf_devicenet_dup_mac_id_serial_number;
+static int hf_devicenet_dup_mac_id_vendor;
+static int hf_devicenet_comm_fault_rsv;
+static int hf_devicenet_comm_fault_match;
+static int hf_devicenet_comm_fault_value;
+static int hf_devicenet_offline_ownership_reserved;
+static int hf_devicenet_offline_ownership_client_mac_id;
+static int hf_devicenet_offline_ownership_allocate;
+static int hf_devicenet_vendor;
+static int hf_devicenet_serial_number;
+static int hf_devicenet_class8;
+static int hf_devicenet_class16;
+static int hf_devicenet_instance8;
+static int hf_devicenet_instance16;
+static int hf_devicenet_attribute;
+static int hf_devicenet_fragment_type;
+static int hf_devicenet_fragment_count;
+
+static gint ett_devicenet;
+static gint ett_devicenet_can;
+static gint ett_devicenet_contents;
+static gint ett_devicenet_8_8;
+static gint ett_devicenet_8_16;
+static gint ett_devicenet_16_8;
+static gint ett_devicenet_16_16;
+
+static expert_field ei_devicenet_invalid_service;
+static expert_field ei_devicenet_invalid_can_id;
+static expert_field ei_devicenet_invalid_msg_id;
+static expert_field ei_devicenet_frag_not_supported;
 
 static int devicenet_address_type = -1;
 
diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c
index a9966d0ede..88e982ddcd 100644
--- a/epan/dissectors/packet-dhcp-failover.c
+++ b/epan/dissectors/packet-dhcp-failover.c
@@ -60,75 +60,75 @@ static const enum_val_t microsoft_compatibility[] = {
 static int dhcpfo_microsoft_compatibility = AUTODETECT_MS_DHCP;
 
 /* Initialize the protocol and registered fields */
-static int proto_dhcpfo = -1;
-static int hf_dhcpfo_length = -1;
-static int hf_dhcpfo_type = -1;
-static int hf_dhcpfo_poffset = -1;
-static int hf_dhcpfo_time = -1;
-static int hf_dhcpfo_xid = -1;
-static int hf_dhcpfo_additional_HB = -1;
-static int hf_dhcpfo_payload_data = -1;
-static int hf_dhcpfo_option_code = -1;
-static int hf_dhcpfo_dhcp_style_option = -1;
-static int hf_dhcpfo_option_length = -1;
-static int hf_dhcpfo_binding_status = -1;
-static int hf_dhcpfo_server_state = -1;
-static int hf_dhcpfo_assigned_ip_address = -1;
-static int hf_dhcpfo_delayed_service_parameter = -1;
-static int hf_dhcpfo_addresses_transferred = -1;
-static int hf_dhcpfo_client_identifier = -1;
-static int hf_dhcpfo_client_hw_type = -1;
-static int hf_dhcpfo_client_hardware_address = -1;
-static int hf_dhcpfo_ftddns = -1;
-static int hf_dhcpfo_reject_reason = -1;
-static int hf_dhcpfo_relationship_name = -1;
-static int hf_dhcpfo_message = -1;
-static int hf_dhcpfo_mclt = -1;
-static int hf_dhcpfo_vendor_class = -1;
-static int hf_dhcpfo_lease_expiration_time = -1;
-static int hf_dhcpfo_potential_expiration_time = -1;
-static int hf_dhcpfo_client_last_transaction_time = -1;
-static int hf_dhcpfo_start_time_of_state = -1;
-static int hf_dhcpfo_vendor_option = -1;
-static int hf_dhcpfo_max_unacked_bndupd = -1;
-static int hf_dhcpfo_protocol_version = -1;
-static int hf_dhcpfo_receive_timer = -1;
-static int hf_dhcpfo_message_digest = -1;
-static int hf_dhcpfo_ipflags = -1;
-static int hf_dhcpfo_ipflags_reserved = -1;
-static int hf_dhcpfo_ipflags_bootp = -1;
-static int hf_dhcpfo_ipflags_mbz = -1;
-static int hf_dhcpfo_hash_bucket_assignment = -1;
-static int hf_dhcpfo_message_digest_type = -1;
-static int hf_dhcpfo_tls_request = -1;
-static int hf_dhcpfo_tls_reply = -1;
-static int hf_dhcpfo_serverflag = -1;
-static int hf_dhcpfo_options = -1;
-static int hf_dhcpfo_ms_client_name = -1;
-static int hf_dhcpfo_ms_client_description = -1;
-static int hf_dhcpfo_ms_client_type = -1;
-static int hf_dhcpfo_ms_client_nap_status = -1;
-static int hf_dhcpfo_ms_client_nap_capable = -1;
-static int hf_dhcpfo_ms_client_nap_probation = -1;
-static int hf_dhcpfo_ms_client_matched_policy = -1;
-static int hf_dhcpfo_ms_server_name = -1;
-static int hf_dhcpfo_ms_server_ip = -1;
-static int hf_dhcpfo_ms_client_scope = -1;
-static int hf_dhcpfo_ms_client_subnet_mask = -1;
-static int hf_dhcpfo_ms_scope_id = -1;
-static int hf_dhcpfo_ms_ipflags = -1;
-static int hf_dhcpfo_ms_extended_address_state = -1;
-static int hf_dhcpfo_infoblox_client_hostname = -1;
-static int hf_dhcpfo_unknown_data = -1;
+static int proto_dhcpfo;
+static int hf_dhcpfo_length;
+static int hf_dhcpfo_type;
+static int hf_dhcpfo_poffset;
+static int hf_dhcpfo_time;
+static int hf_dhcpfo_xid;
+static int hf_dhcpfo_additional_HB;
+static int hf_dhcpfo_payload_data;
+static int hf_dhcpfo_option_code;
+static int hf_dhcpfo_dhcp_style_option;
+static int hf_dhcpfo_option_length;
+static int hf_dhcpfo_binding_status;
+static int hf_dhcpfo_server_state;
+static int hf_dhcpfo_assigned_ip_address;
+static int hf_dhcpfo_delayed_service_parameter;
+static int hf_dhcpfo_addresses_transferred;
+static int hf_dhcpfo_client_identifier;
+static int hf_dhcpfo_client_hw_type;
+static int hf_dhcpfo_client_hardware_address;
+static int hf_dhcpfo_ftddns;
+static int hf_dhcpfo_reject_reason;
+static int hf_dhcpfo_relationship_name;
+static int hf_dhcpfo_message;
+static int hf_dhcpfo_mclt;
+static int hf_dhcpfo_vendor_class;
+static int hf_dhcpfo_lease_expiration_time;
+static int hf_dhcpfo_potential_expiration_time;
+static int hf_dhcpfo_client_last_transaction_time;
+static int hf_dhcpfo_start_time_of_state;
+static int hf_dhcpfo_vendor_option;
+static int hf_dhcpfo_max_unacked_bndupd;
+static int hf_dhcpfo_protocol_version;
+static int hf_dhcpfo_receive_timer;
+static int hf_dhcpfo_message_digest;
+static int hf_dhcpfo_ipflags;
+static int hf_dhcpfo_ipflags_reserved;
+static int hf_dhcpfo_ipflags_bootp;
+static int hf_dhcpfo_ipflags_mbz;
+static int hf_dhcpfo_hash_bucket_assignment;
+static int hf_dhcpfo_message_digest_type;
+static int hf_dhcpfo_tls_request;
+static int hf_dhcpfo_tls_reply;
+static int hf_dhcpfo_serverflag;
+static int hf_dhcpfo_options;
+static int hf_dhcpfo_ms_client_name;
+static int hf_dhcpfo_ms_client_description;
+static int hf_dhcpfo_ms_client_type;
+static int hf_dhcpfo_ms_client_nap_status;
+static int hf_dhcpfo_ms_client_nap_capable;
+static int hf_dhcpfo_ms_client_nap_probation;
+static int hf_dhcpfo_ms_client_matched_policy;
+static int hf_dhcpfo_ms_server_name;
+static int hf_dhcpfo_ms_server_ip;
+static int hf_dhcpfo_ms_client_scope;
+static int hf_dhcpfo_ms_client_subnet_mask;
+static int hf_dhcpfo_ms_scope_id;
+static int hf_dhcpfo_ms_ipflags;
+static int hf_dhcpfo_ms_extended_address_state;
+static int hf_dhcpfo_infoblox_client_hostname;
+static int hf_dhcpfo_unknown_data;
 
 /* Initialize the subtree pointers */
-static gint ett_dhcpfo = -1;
-static gint ett_fo_payload = -1;
-static gint ett_fo_option = -1;
-static gint ett_fo_payload_data = -1;
+static gint ett_dhcpfo;
+static gint ett_fo_payload;
+static gint ett_fo_option;
+static gint ett_fo_payload_data;
 
-static expert_field ei_dhcpfo_bad_length = EI_INIT;
-static expert_field ei_dhcpfo_message_digest_type_not_allowed = EI_INIT;
+static expert_field ei_dhcpfo_bad_length;
+static expert_field ei_dhcpfo_message_digest_type_not_allowed;
 
 
 /* Length of fixed-length portion of header */
diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c
index e2101f2e97..01bf8466b3 100644
--- a/epan/dissectors/packet-dhcp.c
+++ b/epan/dissectors/packet-dhcp.c
@@ -147,593 +147,593 @@ void proto_register_dhcp(void);
 void proto_reg_handoff_dhcp(void);
 
 static int dhcp_bootp_tap = -1;
-static int proto_dhcp = -1;
-static int hf_dhcp_type = -1;
-static int hf_dhcp_hw_type = -1;
-static int hf_dhcp_hw_len = -1;
-static int hf_dhcp_hops = -1;
-static int hf_dhcp_id = -1;
-static int hf_dhcp_secs = -1;
-static int hf_dhcp_flags = -1;
-static int hf_dhcp_flags_broadcast = -1;
-static int hf_dhcp_flags_reserved = -1;
-static int hf_dhcp_ip_client = -1;
-static int hf_dhcp_ip_your = -1;
-static int hf_dhcp_ip_server = -1;
-static int hf_dhcp_ip_relay = -1;
-static int hf_dhcp_hw_addr = -1;
-static int hf_dhcp_hw_addr_padding = -1;
-static int hf_dhcp_hw_ether_addr = -1;
-static int hf_dhcp_server = -1;
-static int hf_dhcp_file = -1;
-static int hf_dhcp_cookie = -1;
-static int hf_dhcp_vendor_specific_options = -1;
-static int hf_dhcp_bootp = -1;
-static int hf_dhcp_fqdn_flags = -1;
-static int hf_dhcp_fqdn_s = -1;
-static int hf_dhcp_fqdn_o = -1;
-static int hf_dhcp_fqdn_e = -1;
-static int hf_dhcp_fqdn_n = -1;
-static int hf_dhcp_fqdn_mbz = -1;
-static int hf_dhcp_fqdn_rcode1 = -1;
-static int hf_dhcp_fqdn_rcode2 = -1;
-static int hf_dhcp_fqdn_name = -1;
-static int hf_dhcp_fqdn_asciiname = -1;
-static int hf_dhcp_pkt_mta_cap_len = -1;
-static int hf_dhcp_pkt_mta_cap_type = -1;
-static int hf_dhcp_docsis_cm_cap_type = -1;
-static int hf_dhcp_docsis_cm_cap_len = -1;
-static int hf_dhcp_client_identifier_uuid = -1;
-static int hf_dhcp_client_id_iaid = -1;
-static int hf_dhcp_client_id_duid_type = -1;
-static int hf_dhcp_client_hardware_address = -1;
-static int hf_dhcp_client_identifier_duid_llt_hw_type = -1;
-static int hf_dhcp_client_identifier_duid_ll_hw_type = -1;
-static int hf_dhcp_client_identifier_time = -1;
-static int hf_dhcp_client_identifier_link_layer_address = -1;
-static int hf_dhcp_client_identifier_link_layer_address_ether = -1;
-static int hf_dhcp_client_identifier_enterprise_num = -1;
-static int hf_dhcp_client_identifier = -1;
-static int hf_dhcp_client_identifier_type = -1;
-static int hf_dhcp_client_identifier_undef = -1;
-static int hf_dhcp_option_type = -1;
-static int hf_dhcp_option_length = -1;
-static int hf_dhcp_option_value = -1;
-static int hf_dhcp_option_value_8 = -1;
-static int hf_dhcp_option_value_16 = -1;
-static int hf_dhcp_option_value_u32 = -1;
-static int hf_dhcp_option_value_s_secs = -1;
-static int hf_dhcp_option_value_u_secs = -1;
-static int hf_dhcp_option_value_stringz = -1;
-static int hf_dhcp_option_value_ip_address = -1;
-static int hf_dhcp_option_value_boolean = -1;
-static int hf_dhcp_suboption_length = -1;
-
-static int hf_dhcp_option_padding = -1;					/* 0 */
-static int hf_dhcp_option_subnet_mask = -1;				/* 1 */
-static int hf_dhcp_option_time_offset = -1;				/* 2 */
-static int hf_dhcp_option_router = -1;					/* 3 */
-static int hf_dhcp_option_time_server = -1;				/* 4 */
-static int hf_dhcp_option_name_server = -1;				/* 5 */
-static int hf_dhcp_option_domain_name_server = -1;			/* 6 */
-static int hf_dhcp_option_log_server = -1;				/* 7 */
-static int hf_dhcp_option_quotes_server = -1;				/* 8 */
-static int hf_dhcp_option_lpr_server = -1;				/* 9 */
-static int hf_dhcp_option_impress_server = -1;				/* 10 */
-static int hf_dhcp_option_resource_location_server = -1;		/* 11 */
-static int hf_dhcp_option_hostname = -1;				/* 12 */
-static int hf_dhcp_option_boot_file_size = -1;				/* 13 */
-static int hf_dhcp_option_merit_dump_file = -1;				/* 14 */
-static int hf_dhcp_option_domain_name = -1;				/* 15 */
-static int hf_dhcp_option_swap_server = -1;				/* 16 */
-static int hf_dhcp_option_root_path = -1;				/* 17 */
-static int hf_dhcp_option_extension_path = -1;				/* 18 */
-static int hf_dhcp_option_ip_forwarding = -1;				/* 19 */
-static int hf_dhcp_option_non_local_source_routing = -1;		/* 20 */
-static int hf_dhcp_option_policy_filter_ip = -1;			/* 21 - IP address */
-static int hf_dhcp_option_policy_filter_subnet_mask = -1;		/* 21 - Subnet mask */
-static int hf_dhcp_option_max_datagram_reassembly_size = -1;		/* 22 */
-static int hf_dhcp_option_default_ip_ttl = -1;				/* 23 */
-static int hf_dhcp_option_path_mtu_aging_timeout = -1;			/* 24 */
-static int hf_dhcp_option_path_mtu_plateau_table_item = -1;		/* 25 */
-static int hf_dhcp_option_interface_mtu = -1;				/* 26 */
-static int hf_dhcp_option_all_subnets_are_local = -1;			/* 27 */
-static int hf_dhcp_option_broadcast_address = -1;			/* 28 */
-static int hf_dhcp_option_perform_mask_discovery = -1;			/* 29 */
-static int hf_dhcp_option_mask_supplier = -1;				/* 30 */
-static int hf_dhcp_option_perform_router_discover = -1;			/* 31 */
-static int hf_dhcp_option_router_solicitation_address = -1;		/* 32 */
-static int hf_dhcp_option_static_route_ip = -1;				/* 33 - Destination IP */
-static int hf_dhcp_option_static_route_router = -1;			/* 33 - Router */
-static int hf_dhcp_option_trailer_encapsulation = -1;			/* 34 */
-static int hf_dhcp_option_arp_cache_timeout = -1;			/* 35 */
-static int hf_dhcp_option_ethernet_encapsulation = -1;			/* 36 */
-static int hf_dhcp_option_tcp_default_ttl = -1;				/* 37 */
-static int hf_dhcp_option_tcp_keepalive_interval = -1;			/* 38 */
-static int hf_dhcp_option_tcp_keepalive_garbage = -1;			/* 39 */
-static int hf_dhcp_option_nis_domain = -1;				/* 40 */
-static int hf_dhcp_option_nis_server = -1;				/* 41 */
-static int hf_dhcp_option_ntp_server = -1;				/* 42 */
-
-static int hf_dhcp_option43_value = -1;					/* 43 suboption value */
-static int hf_dhcp_option43_value_8 = -1;				/* 43 suboption value */
-static int hf_dhcp_option43_value_32 = -1;				/* 43 suboption value */
-static int hf_dhcp_option43_value_stringz = -1;				/* 43 suboption value */
-static int hf_dhcp_option43_value_ip_address = -1;			/* 43 suboption value */
-
-static int hf_dhcp_option43_pxeclient_suboption = -1;			/* 43 suboption */
-static int hf_dhcp_option43_pxeclient_padding = -1;			/* 43:0 PXE  */
-static int hf_dhcp_option43_pxeclient_mtftp_ip = -1;			/* 43:1 PXE  */
-static int hf_dhcp_option43_pxeclient_mtftp_client_port = -1;		/* 43:2 PXE  */
-static int hf_dhcp_option43_pxeclient_mtftp_server_port = -1;		/* 43:3 PXE  */
-static int hf_dhcp_option43_pxeclient_mtftp_timeout = -1;		/* 43:4 PXE  */
-static int hf_dhcp_option43_pxeclient_mtftp_delay = -1;			/* 43:5 PXE  */
-static int hf_dhcp_option43_pxeclient_discovery_control = -1;		/* 43:6 PXE  */
-static int hf_dhcp_option43_pxeclient_discovery_control_bc = -1;	/* 43:6 PXE  */
-static int hf_dhcp_option43_pxeclient_discovery_control_mc = -1;	/* 43:6 PXE  */
-static int hf_dhcp_option43_pxeclient_discovery_control_serverlist = -1;	/* 43:6 PXE  */
-static int hf_dhcp_option43_pxeclient_discovery_control_bstrap = -1;	/* 43:6 PXE  */
-static int hf_dhcp_option43_pxeclient_multicast_address = -1;		/* 43:7 PXE  */
-static int hf_dhcp_option43_pxeclient_boot_servers = -1;		/* 43:8 PXE  */
-static int hf_dhcp_option43_pxeclient_boot_server_type = -1;		/* 43:8 PXE  */
-static int hf_dhcp_option43_pxeclient_boot_server_count = -1;		/* 43:8 PXE  */
-static int hf_dhcp_option43_pxeclient_boot_server_ip = -1;		/* 43:8 PXE  */
-static int hf_dhcp_option43_pxeclient_boot_menu = -1;			/* 43:9 PXE  */
-static int hf_dhcp_option43_pxeclient_boot_menu_type = -1;		/* 43:9 PXE  */
-static int hf_dhcp_option43_pxeclient_boot_menu_length = -1;		/* 43:9 PXE  */
-static int hf_dhcp_option43_pxeclient_boot_menu_desc = -1;		/* 43:9 PXE  */
-static int hf_dhcp_option43_pxeclient_menu_prompt = -1;			/* 43:10 PXE  */
-static int hf_dhcp_option43_pxeclient_menu_prompt_timeout = -1;		/* 43:10 PXE  */
-static int hf_dhcp_option43_pxeclient_menu_prompt_prompt = -1;		/* 43:10 PXE  */
-static int hf_dhcp_option43_pxeclient_multicast_address_alloc = -1;	/* 43:11 PXE  */
-static int hf_dhcp_option43_pxeclient_credential_types = -1;		/* 43:12 PXE  */
-static int hf_dhcp_option43_pxeclient_boot_item = -1;			/* 43:71 PXE  */
-static int hf_dhcp_option43_pxeclient_boot_item_type = -1;		/* 43:71 PXE  */
-static int hf_dhcp_option43_pxeclient_boot_item_layer = -1;		/* 43:71 PXE  */
-static int hf_dhcp_option43_pxeclient_lcm_server = -1;			/* 43:179 PXE  */
-static int hf_dhcp_option43_pxeclient_lcm_domain = -1;			/* 43:180 PXE  */
-static int hf_dhcp_option43_pxeclient_lcm_nic_option = -1;		/* 43:181 PXE  */
-static int hf_dhcp_option43_pxeclient_lcm_workgroup = -1;		/* 43:190 PXE  */
-static int hf_dhcp_option43_pxeclient_discovery = -1;			/* 43:191 PXE  */
-static int hf_dhcp_option43_pxeclient_configured = -1;			/* 43:192 PXE  */
-static int hf_dhcp_option43_pxeclient_lcm_version = -1;			/* 43:193 PXE  */
-static int hf_dhcp_option43_pxeclient_lcm_serial = -1;			/* 43:194 PXE  */
-static int hf_dhcp_option43_pxeclient_end = -1;				/* 43:255 PXE */
-
-static int hf_dhcp_option43_cl_suboption = -1;				/* 43 suboption */
-static int hf_dhcp_option43_cl_padding = -1;				/* 43:0 CL  */
-static int hf_dhcp_option43_cl_suboption_request_list = -1;		/* 43:1 CL  */
-static int hf_dhcp_option43_cl_device_type = -1;			/* 43:2 CL  */
-static int hf_dhcp_option43_cl_esafe_type = -1;				/* 43:3 CL  */
-static int hf_dhcp_option43_cl_serial_number = -1;			/* 43:4 CL  */
-static int hf_dhcp_option43_cl_hardware_version = -1;			/* 43:5 CL  */
-static int hf_dhcp_option43_cl_software_version = -1;			/* 43:6 CL  */
-static int hf_dhcp_option43_cl_boot_rom_version = -1;			/* 43:7 CL  */
-static int hf_dhcp_option43_cl_oui_bytes = -1;				/* 43:8 CL  */
-static int hf_dhcp_option43_cl_oui_string = -1;				/* 43:8 CL  */
-static int hf_dhcp_option43_cl_model_number = -1;			/* 43:9 CL  */
-static int hf_dhcp_option43_cl_vendor_name10 = -1;			/* 43:10 CL  */
-static int hf_dhcp_option43_cl_address_realm = -1;			/* 43:11 CL  */
-static int hf_dhcp_option43_cl_cm_ps_system_desc = -1;			/* 43:12 CL  */
-static int hf_dhcp_option43_cl_cm_ps_firmware_revision = -1;		/* 43:13 CL  */
-static int hf_dhcp_option43_cl_firewall_policy_file_version = -1;	/* 43:14 CL  */
-static int hf_dhcp_option43_cl_esafe_config_file_devices = -1;		/* 43:15 CL  */
-static int hf_dhcp_option43_cl_video_security_tape = -1;		/* 43:18 CL  */
-static int hf_dhcp_option43_cl_mta_mac_address = -1;			/* 43:31 CL  */
-static int hf_dhcp_option43_cl_correlation_ID = -1;			/* 43:32 CL  */
-static int hf_dhcp_option43_cl_vendor_name51 = -1;			/* 43:51 CL  */
-static int hf_dhcp_option43_cl_cablecard_capability = -1;		/* 43:52 CL  */
-static int hf_dhcp_option43_cl_device_id_ca = -1;			/* 43:53 CL  */
-static int hf_dhcp_option43_cl_device_id_x509 = -1;			/* 43:54 CL  */
-static int hf_dhcp_option43_cl_end = -1;				/* 43:255 CL */
-
-static int hf_dhcp_option43_aerohive_suboption = -1;			/* 43 suboption */
-static int hf_dhcp_option43_aerohive_unknown = -1;			/* 43:X AEROHIVE */
-static int hf_dhcp_option43_aerohive_xiqhostname = -1;			/* 43:225 AEROHIVE */
-static int hf_dhcp_option43_aerohive_xiqipaddress = -1;			/* 43:226 AEROHIVE */
-
-static int hf_dhcp_option43_bsdp_suboption = -1;			/* 43 suboption */
-static int hf_dhcp_option43_bsdp_message_type = -1;			/* 43:1 BSDP  */
-static int hf_dhcp_option43_bsdp_version = -1;				/* 43:2 BSDP  */
-static int hf_dhcp_option43_bsdp_server_identifier = -1;		/* 43:3 BSDP  */
-static int hf_dhcp_option43_bsdp_server_priority = -1;			/* 43:4 BSDP  */
-static int hf_dhcp_option43_bsdp_reply_port = -1;			/* 43:5 BSDP  */
-static int hf_dhcp_option43_bsdp_boot_image_list_path = -1;		/* 43:6 BSDP  */
-static int hf_dhcp_option43_bsdp_default_boot_image_id = -1;		/* 43:7 BSDP  */
-static int hf_dhcp_option43_bsdp_selected_boot_image_id = -1;		/* 43:8 BSDP  */
-static int hf_dhcp_option43_bsdp_boot_image_list = -1;			/* 43:9 BSDP  */
-static int hf_dhcp_option43_bsdp_netboot_firmware = -1;			/* 43:10 BSDP  */
-static int hf_dhcp_option43_bsdp_attributes_filter_list = -1;		/* 43:11 BSDP  */
-static int hf_dhcp_option43_bsdp_message_size = -1;			/* 43:12 BSDP  */
-static int hf_dhcp_option43_bsdp_boot_image_index = -1;			/* 43 BSDP  */
-static int hf_dhcp_option43_bsdp_boot_image_attribute = -1;		/* 43 BSDP  */
-static int hf_dhcp_option43_bsdp_boot_image_attribute_install = -1;	/* 43 BSDP  */
-static int hf_dhcp_option43_bsdp_boot_image_attribute_kind = -1;	/* 43 BSDP  */
-static int hf_dhcp_option43_bsdp_boot_image_attribute_reserved = -1;	/* 43 BSDP  */
-static int hf_dhcp_option43_bsdp_image_desc = -1;			/* 43 BSDP  */
-static int hf_dhcp_option43_bsdp_boot_image_name = -1;			/* 43 BSDP  */
-static int hf_dhcp_option43_bsdp_boot_image_name_len = -1;		/* 43 BSDP  */
-
-static int hf_dhcp_option43_cisco_suboption = -1;			/* 43 Cisco */
-static int hf_dhcp_option43_cisco_unknown = -1;				/* 43 Cisco */
-static int hf_dhcp_option43_cisco_unknown1 = -1;			/* 43:1 Cisco */
-static int hf_dhcp_option43_cisco_unknown2 = -1;			/* 43:2 Cisco */
-static int hf_dhcp_option43_cisco_unknown3 = -1;			/* 43:3 Cisco */
-static int hf_dhcp_option43_cisco_nodeid = -1;				/* 43:4 Cisco */
-static int hf_dhcp_option43_cisco_unknown5 = -1;			/* 43:5 Cisco */
-static int hf_dhcp_option43_cisco_unknown6 = -1;			/* 43:6 Cisco */
-static int hf_dhcp_option43_cisco_model = -1;				/* 43:7 Cisco */
-static int hf_dhcp_option43_cisco_apicuuid = -1;			/* 43:8 Cisco */
-static int hf_dhcp_option43_cisco_fabricname = -1;			/* 43:9 Cisco */
-static int hf_dhcp_option43_cisco_unknown10 = -1;			/* 43:10 Cisco */
-static int hf_dhcp_option43_cisco_serialno = -1;			/* 43:11 Cisco */
-static int hf_dhcp_option43_cisco_clientint = -1;			/* 43:12 Cisco */
-
-static int hf_dhcp_option43_alcatel_suboption = -1;			/* 43 suboption */
-static int hf_dhcp_option43_alcatel_padding = -1;			/* 43:0 Alcatel	 */
-static int hf_dhcp_option43_alcatel_vlan_id = -1;			/* 43:58 Alcatel  */
-static int hf_dhcp_option43_alcatel_tftp1 = -1;				/* 43:64 Alcatel  */
-static int hf_dhcp_option43_alcatel_tftp2 = -1;				/* 43:65 Alcatel  */
-static int hf_dhcp_option43_alcatel_app_type = -1;			/* 43:66 Alcatel  */
-static int hf_dhcp_option43_alcatel_sip_url = -1;			/* 43:67 Alcatel  */
-static int hf_dhcp_option43_alcatel_end = -1;				/* 43:255 Alcatel */
-
-static int hf_dhcp_option43_arubaap_controllerip = -1;			/* 43: ArubaAP*/
-static int hf_dhcp_option43_arubaiap = -1;				/* 43: ArubaIAP*/
-static int hf_dhcp_option43_arubaiap_nameorg = -1;			/* 43: ArubaIAP: Name Organisation*/
-static int hf_dhcp_option43_arubaiap_ampip = -1;			/* 43: ArubaIAP: AMP IP Address*/
-static int hf_dhcp_option43_arubaiap_password = -1;			/* 43 :ArubaIAP: Password*/
-
-static int hf_dhcp_option_netbios_over_tcpip_name_server = -1;		/* 44 */
-static int hf_dhcp_option_netbios_over_tcpip_dd_name_server = -1;	/* 45 */
-static int hf_dhcp_option_netbios_over_tcpip_node_type = -1;		/* 46 */
-static int hf_dhcp_option_netbios_over_tcpip_scope = -1;		/* 47 */
-static int hf_dhcp_option_xwindows_system_font_server = -1;		/* 48 */
-static int hf_dhcp_option_xwindows_system_display_manager = -1;		/* 49 */
-static int hf_dhcp_option_requested_ip_address = -1;			/* 50 */
-static int hf_dhcp_option_ip_address_lease_time = -1;			/* 51 */
-static int hf_dhcp_option_option_overload = -1;				/* 52 */
-static int hf_dhcp_option_dhcp = -1;					/* 53 */
-static int hf_dhcp_option_dhcp_server_id = -1;				/* 54 */
-static int hf_dhcp_option_parameter_request_list_item = -1;		/* 55 */
-static int hf_dhcp_option_message = -1;					/* 56 */
-static int hf_dhcp_option_dhcp_max_message_size = -1;			/* 57 */
-static int hf_dhcp_option_renewal_time_value = -1;			/* 58 */
-static int hf_dhcp_option_rebinding_time_value = -1;			/* 59 */
-static int hf_dhcp_option_vendor_class_id = -1;				/* 60 */
-static int hf_dhcp_option_vendor_class_data = -1;			/* 60 */
-
-static int hf_dhcp_option_novell_netware_ip_domain = -1;		/* 62 */
-
-static int hf_dhcp_option63_suboption = -1;				/* 63 suboption */
-static int hf_dhcp_option63_value = -1;					/* 63 suboption value */
-static int hf_dhcp_option63_value_8 = -1;				/* 63 suboption value */
-static int hf_dhcp_option63_value_ip_address = -1;			/* 63 suboption value */
-static int hf_dhcp_option63_value_boolean = -1;				/* 63 suboption value */
-static int hf_dhcp_option63_broadcast = -1;				/* 63:5 */
-static int hf_dhcp_option63_preferred_dss_server = -1;			/* 63:6 */
-static int hf_dhcp_option63_nearest_nwip_server = -1;			/* 63:7 */
-static int hf_dhcp_option63_autoretries = -1;				/* 63:8 */
-static int hf_dhcp_option63_autoretry_delay = -1;			/* 63:9 */
-static int hf_dhcp_option63_support_netware_v1_1 = -1;			/* 63:10 */
-static int hf_dhcp_option63_primary_dss = -1;				/* 63:11 */
-
-static int hf_dhcp_option_nis_plus_domain = -1;				/* 64 */
-static int hf_dhcp_option_nis_plus_server = -1;				/* 65 */
-static int hf_dhcp_option_tftp_server_name = -1;			/* 66 */
-static int hf_dhcp_option_bootfile_name = -1;				/* 67 */
-static int hf_dhcp_option_mobile_ip_home_agent = -1;			/* 68 */
-static int hf_dhcp_option_smtp_server = -1;				/* 69 */
-static int hf_dhcp_option_pop3_server = -1;				/* 70 */
-static int hf_dhcp_option_nntp_server = -1;				/* 71 */
-static int hf_dhcp_option_default_www_server = -1;			/* 72 */
-static int hf_dhcp_option_default_finger_server = -1;			/* 73 */
-static int hf_dhcp_option_default_irc_server = -1;			/* 74 */
-static int hf_dhcp_option_streettalk_server = -1;			/* 75 */
-static int hf_dhcp_option_streettalk_da_server = -1;			/* 76 */
-static int hf_dhcp_option77_user_class = -1;				/* 77 User Class instance */
-static int hf_dhcp_option77_user_class_length = -1;			/* 77 length of User Class instance */
-static int hf_dhcp_option77_user_class_data = -1;			/* 77 data of User Class instance */
-static int hf_dhcp_option77_user_class_text = -1;			/* 77 User class text */
-static int hf_dhcp_option77_user_class_binary_data_length = -1;	/* 77, Microsoft */
-static int hf_dhcp_option77_user_class_binary_data = -1;		/* 77, Microsoft */
-static int hf_dhcp_option77_user_class_padding = -1;			/* 77, Microsoft */
-static int hf_dhcp_option77_user_class_name_length = -1;		/* 77, Microsoft */
-static int hf_dhcp_option77_user_class_name = -1;				/* 77, Microsoft */
-static int hf_dhcp_option77_user_class_description_length = -1;	/* 77, Microsoft */
-static int hf_dhcp_option77_user_class_description = -1;		/* 77, Microsoft */
-static int hf_dhcp_option_slp_directory_agent_value = -1;		/* 78 */
-static int hf_dhcp_option_slp_directory_agent_slpda_address = -1;	/* 78 */
-static int hf_dhcp_option_slp_service_scope_value = -1;			/* 79 */
-static int hf_dhcp_option_slp_service_scope_string = -1;		/* 79 */
-
-static int hf_dhcp_option82_suboption = -1;				/* 82 suboption */
-static int hf_dhcp_option82_value = -1;					/* 82 suboption value */
-static int hf_dhcp_option82_value_8 = -1;				/* 82 suboption value */
-static int hf_dhcp_option82_value_16 = -1;				/* 82 suboption value */
-static int hf_dhcp_option82_value_32 = -1;				/* 82 suboption value */
-static int hf_dhcp_option82_value_ip_address = -1;			/* 82 suboption value */
-static int hf_dhcp_option82_value_stringz = -1;				/* 82 suboption value */
-static int hf_dhcp_option82_padding = -1;				/* 82:0 */
-static int hf_dhcp_option82_agent_circuit_id = -1;			/* 82:1 */
-static int hf_dhcp_option82_agent_remote_id = -1;			/* 82:2 */
-static int hf_dhcp_option82_reserved = -1;				/* 82:3 */
-static int hf_dhcp_option82_docsis_device_class = -1;			/* 82:4 */
-static int hf_dhcp_option82_link_selection = -1;			/* 82:5 */
-static int hf_dhcp_option82_subscriber_id = -1;				/* 82:6 */
-static int hf_dhcp_option82_radius_attributes = -1;			/* 82:7 */
-static int hf_dhcp_option82_authentication = -1;			/* 82:8 */
-static int hf_dhcp_option82_vi = -1;					/* 82:9 */
+static int proto_dhcp;
+static int hf_dhcp_type;
+static int hf_dhcp_hw_type;
+static int hf_dhcp_hw_len;
+static int hf_dhcp_hops;
+static int hf_dhcp_id;
+static int hf_dhcp_secs;
+static int hf_dhcp_flags;
+static int hf_dhcp_flags_broadcast;
+static int hf_dhcp_flags_reserved;
+static int hf_dhcp_ip_client;
+static int hf_dhcp_ip_your;
+static int hf_dhcp_ip_server;
+static int hf_dhcp_ip_relay;
+static int hf_dhcp_hw_addr;
+static int hf_dhcp_hw_addr_padding;
+static int hf_dhcp_hw_ether_addr;
+static int hf_dhcp_server;
+static int hf_dhcp_file;
+static int hf_dhcp_cookie;
+static int hf_dhcp_vendor_specific_options;
+static int hf_dhcp_bootp;
+static int hf_dhcp_fqdn_flags;
+static int hf_dhcp_fqdn_s;
+static int hf_dhcp_fqdn_o;
+static int hf_dhcp_fqdn_e;
+static int hf_dhcp_fqdn_n;
+static int hf_dhcp_fqdn_mbz;
+static int hf_dhcp_fqdn_rcode1;
+static int hf_dhcp_fqdn_rcode2;
+static int hf_dhcp_fqdn_name;
+static int hf_dhcp_fqdn_asciiname;
+static int hf_dhcp_pkt_mta_cap_len;
+static int hf_dhcp_pkt_mta_cap_type;
+static int hf_dhcp_docsis_cm_cap_type;
+static int hf_dhcp_docsis_cm_cap_len;
+static int hf_dhcp_client_identifier_uuid;
+static int hf_dhcp_client_id_iaid;
+static int hf_dhcp_client_id_duid_type;
+static int hf_dhcp_client_hardware_address;
+static int hf_dhcp_client_identifier_duid_llt_hw_type;
+static int hf_dhcp_client_identifier_duid_ll_hw_type;
+static int hf_dhcp_client_identifier_time;
+static int hf_dhcp_client_identifier_link_layer_address;
+static int hf_dhcp_client_identifier_link_layer_address_ether;
+static int hf_dhcp_client_identifier_enterprise_num;
+static int hf_dhcp_client_identifier;
+static int hf_dhcp_client_identifier_type;
+static int hf_dhcp_client_identifier_undef;
+static int hf_dhcp_option_type;
+static int hf_dhcp_option_length;
+static int hf_dhcp_option_value;
+static int hf_dhcp_option_value_8;
+static int hf_dhcp_option_value_16;
+static int hf_dhcp_option_value_u32;
+static int hf_dhcp_option_value_s_secs;
+static int hf_dhcp_option_value_u_secs;
+static int hf_dhcp_option_value_stringz;
+static int hf_dhcp_option_value_ip_address;
+static int hf_dhcp_option_value_boolean;
+static int hf_dhcp_suboption_length;
+
+static int hf_dhcp_option_padding;					/* 0 */
+static int hf_dhcp_option_subnet_mask;				/* 1 */
+static int hf_dhcp_option_time_offset;				/* 2 */
+static int hf_dhcp_option_router;					/* 3 */
+static int hf_dhcp_option_time_server;				/* 4 */
+static int hf_dhcp_option_name_server;				/* 5 */
+static int hf_dhcp_option_domain_name_server;			/* 6 */
+static int hf_dhcp_option_log_server;				/* 7 */
+static int hf_dhcp_option_quotes_server;				/* 8 */
+static int hf_dhcp_option_lpr_server;				/* 9 */
+static int hf_dhcp_option_impress_server;				/* 10 */
+static int hf_dhcp_option_resource_location_server;		/* 11 */
+static int hf_dhcp_option_hostname;				/* 12 */
+static int hf_dhcp_option_boot_file_size;				/* 13 */
+static int hf_dhcp_option_merit_dump_file;				/* 14 */
+static int hf_dhcp_option_domain_name;				/* 15 */
+static int hf_dhcp_option_swap_server;				/* 16 */
+static int hf_dhcp_option_root_path;				/* 17 */
+static int hf_dhcp_option_extension_path;				/* 18 */
+static int hf_dhcp_option_ip_forwarding;				/* 19 */
+static int hf_dhcp_option_non_local_source_routing;		/* 20 */
+static int hf_dhcp_option_policy_filter_ip;			/* 21 - IP address */
+static int hf_dhcp_option_policy_filter_subnet_mask;		/* 21 - Subnet mask */
+static int hf_dhcp_option_max_datagram_reassembly_size;		/* 22 */
+static int hf_dhcp_option_default_ip_ttl;				/* 23 */
+static int hf_dhcp_option_path_mtu_aging_timeout;			/* 24 */
+static int hf_dhcp_option_path_mtu_plateau_table_item;		/* 25 */
+static int hf_dhcp_option_interface_mtu;				/* 26 */
+static int hf_dhcp_option_all_subnets_are_local;			/* 27 */
+static int hf_dhcp_option_broadcast_address;			/* 28 */
+static int hf_dhcp_option_perform_mask_discovery;			/* 29 */
+static int hf_dhcp_option_mask_supplier;				/* 30 */
+static int hf_dhcp_option_perform_router_discover;			/* 31 */
+static int hf_dhcp_option_router_solicitation_address;		/* 32 */
+static int hf_dhcp_option_static_route_ip;				/* 33 - Destination IP */
+static int hf_dhcp_option_static_route_router;			/* 33 - Router */
+static int hf_dhcp_option_trailer_encapsulation;			/* 34 */
+static int hf_dhcp_option_arp_cache_timeout;			/* 35 */
+static int hf_dhcp_option_ethernet_encapsulation;			/* 36 */
+static int hf_dhcp_option_tcp_default_ttl;				/* 37 */
+static int hf_dhcp_option_tcp_keepalive_interval;			/* 38 */
+static int hf_dhcp_option_tcp_keepalive_garbage;			/* 39 */
+static int hf_dhcp_option_nis_domain;				/* 40 */
+static int hf_dhcp_option_nis_server;				/* 41 */
+static int hf_dhcp_option_ntp_server;				/* 42 */
+
+static int hf_dhcp_option43_value;					/* 43 suboption value */
+static int hf_dhcp_option43_value_8;				/* 43 suboption value */
+static int hf_dhcp_option43_value_32;				/* 43 suboption value */
+static int hf_dhcp_option43_value_stringz;				/* 43 suboption value */
+static int hf_dhcp_option43_value_ip_address;			/* 43 suboption value */
+
+static int hf_dhcp_option43_pxeclient_suboption;			/* 43 suboption */
+static int hf_dhcp_option43_pxeclient_padding;			/* 43:0 PXE  */
+static int hf_dhcp_option43_pxeclient_mtftp_ip;			/* 43:1 PXE  */
+static int hf_dhcp_option43_pxeclient_mtftp_client_port;		/* 43:2 PXE  */
+static int hf_dhcp_option43_pxeclient_mtftp_server_port;		/* 43:3 PXE  */
+static int hf_dhcp_option43_pxeclient_mtftp_timeout;		/* 43:4 PXE  */
+static int hf_dhcp_option43_pxeclient_mtftp_delay;			/* 43:5 PXE  */
+static int hf_dhcp_option43_pxeclient_discovery_control;		/* 43:6 PXE  */
+static int hf_dhcp_option43_pxeclient_discovery_control_bc;	/* 43:6 PXE  */
+static int hf_dhcp_option43_pxeclient_discovery_control_mc;	/* 43:6 PXE  */
+static int hf_dhcp_option43_pxeclient_discovery_control_serverlist;	/* 43:6 PXE  */
+static int hf_dhcp_option43_pxeclient_discovery_control_bstrap;	/* 43:6 PXE  */
+static int hf_dhcp_option43_pxeclient_multicast_address;		/* 43:7 PXE  */
+static int hf_dhcp_option43_pxeclient_boot_servers;		/* 43:8 PXE  */
+static int hf_dhcp_option43_pxeclient_boot_server_type;		/* 43:8 PXE  */
+static int hf_dhcp_option43_pxeclient_boot_server_count;		/* 43:8 PXE  */
+static int hf_dhcp_option43_pxeclient_boot_server_ip;		/* 43:8 PXE  */
+static int hf_dhcp_option43_pxeclient_boot_menu;			/* 43:9 PXE  */
+static int hf_dhcp_option43_pxeclient_boot_menu_type;		/* 43:9 PXE  */
+static int hf_dhcp_option43_pxeclient_boot_menu_length;		/* 43:9 PXE  */
+static int hf_dhcp_option43_pxeclient_boot_menu_desc;		/* 43:9 PXE  */
+static int hf_dhcp_option43_pxeclient_menu_prompt;			/* 43:10 PXE  */
+static int hf_dhcp_option43_pxeclient_menu_prompt_timeout;		/* 43:10 PXE  */
+static int hf_dhcp_option43_pxeclient_menu_prompt_prompt;		/* 43:10 PXE  */
+static int hf_dhcp_option43_pxeclient_multicast_address_alloc;	/* 43:11 PXE  */
+static int hf_dhcp_option43_pxeclient_credential_types;		/* 43:12 PXE  */
+static int hf_dhcp_option43_pxeclient_boot_item;			/* 43:71 PXE  */
+static int hf_dhcp_option43_pxeclient_boot_item_type;		/* 43:71 PXE  */
+static int hf_dhcp_option43_pxeclient_boot_item_layer;		/* 43:71 PXE  */
+static int hf_dhcp_option43_pxeclient_lcm_server;			/* 43:179 PXE  */
+static int hf_dhcp_option43_pxeclient_lcm_domain;			/* 43:180 PXE  */
+static int hf_dhcp_option43_pxeclient_lcm_nic_option;		/* 43:181 PXE  */
+static int hf_dhcp_option43_pxeclient_lcm_workgroup;		/* 43:190 PXE  */
+static int hf_dhcp_option43_pxeclient_discovery;			/* 43:191 PXE  */
+static int hf_dhcp_option43_pxeclient_configured;			/* 43:192 PXE  */
+static int hf_dhcp_option43_pxeclient_lcm_version;			/* 43:193 PXE  */
+static int hf_dhcp_option43_pxeclient_lcm_serial;			/* 43:194 PXE  */
+static int hf_dhcp_option43_pxeclient_end;				/* 43:255 PXE */
+
+static int hf_dhcp_option43_cl_suboption;				/* 43 suboption */
+static int hf_dhcp_option43_cl_padding;				/* 43:0 CL  */
+static int hf_dhcp_option43_cl_suboption_request_list;		/* 43:1 CL  */
+static int hf_dhcp_option43_cl_device_type;			/* 43:2 CL  */
+static int hf_dhcp_option43_cl_esafe_type;				/* 43:3 CL  */
+static int hf_dhcp_option43_cl_serial_number;			/* 43:4 CL  */
+static int hf_dhcp_option43_cl_hardware_version;			/* 43:5 CL  */
+static int hf_dhcp_option43_cl_software_version;			/* 43:6 CL  */
+static int hf_dhcp_option43_cl_boot_rom_version;			/* 43:7 CL  */
+static int hf_dhcp_option43_cl_oui_bytes;				/* 43:8 CL  */
+static int hf_dhcp_option43_cl_oui_string;				/* 43:8 CL  */
+static int hf_dhcp_option43_cl_model_number;			/* 43:9 CL  */
+static int hf_dhcp_option43_cl_vendor_name10;			/* 43:10 CL  */
+static int hf_dhcp_option43_cl_address_realm;			/* 43:11 CL  */
+static int hf_dhcp_option43_cl_cm_ps_system_desc;			/* 43:12 CL  */
+static int hf_dhcp_option43_cl_cm_ps_firmware_revision;		/* 43:13 CL  */
+static int hf_dhcp_option43_cl_firewall_policy_file_version;	/* 43:14 CL  */
+static int hf_dhcp_option43_cl_esafe_config_file_devices;		/* 43:15 CL  */
+static int hf_dhcp_option43_cl_video_security_tape;		/* 43:18 CL  */
+static int hf_dhcp_option43_cl_mta_mac_address;			/* 43:31 CL  */
+static int hf_dhcp_option43_cl_correlation_ID;			/* 43:32 CL  */
+static int hf_dhcp_option43_cl_vendor_name51;			/* 43:51 CL  */
+static int hf_dhcp_option43_cl_cablecard_capability;		/* 43:52 CL  */
+static int hf_dhcp_option43_cl_device_id_ca;			/* 43:53 CL  */
+static int hf_dhcp_option43_cl_device_id_x509;			/* 43:54 CL  */
+static int hf_dhcp_option43_cl_end;				/* 43:255 CL */
+
+static int hf_dhcp_option43_aerohive_suboption;			/* 43 suboption */
+static int hf_dhcp_option43_aerohive_unknown;			/* 43:X AEROHIVE */
+static int hf_dhcp_option43_aerohive_xiqhostname;			/* 43:225 AEROHIVE */
+static int hf_dhcp_option43_aerohive_xiqipaddress;			/* 43:226 AEROHIVE */
+
+static int hf_dhcp_option43_bsdp_suboption;			/* 43 suboption */
+static int hf_dhcp_option43_bsdp_message_type;			/* 43:1 BSDP  */
+static int hf_dhcp_option43_bsdp_version;				/* 43:2 BSDP  */
+static int hf_dhcp_option43_bsdp_server_identifier;		/* 43:3 BSDP  */
+static int hf_dhcp_option43_bsdp_server_priority;			/* 43:4 BSDP  */
+static int hf_dhcp_option43_bsdp_reply_port;			/* 43:5 BSDP  */
+static int hf_dhcp_option43_bsdp_boot_image_list_path;		/* 43:6 BSDP  */
+static int hf_dhcp_option43_bsdp_default_boot_image_id;		/* 43:7 BSDP  */
+static int hf_dhcp_option43_bsdp_selected_boot_image_id;		/* 43:8 BSDP  */
+static int hf_dhcp_option43_bsdp_boot_image_list;			/* 43:9 BSDP  */
+static int hf_dhcp_option43_bsdp_netboot_firmware;			/* 43:10 BSDP  */
+static int hf_dhcp_option43_bsdp_attributes_filter_list;		/* 43:11 BSDP  */
+static int hf_dhcp_option43_bsdp_message_size;			/* 43:12 BSDP  */
+static int hf_dhcp_option43_bsdp_boot_image_index;			/* 43 BSDP  */
+static int hf_dhcp_option43_bsdp_boot_image_attribute;		/* 43 BSDP  */
+static int hf_dhcp_option43_bsdp_boot_image_attribute_install;	/* 43 BSDP  */
+static int hf_dhcp_option43_bsdp_boot_image_attribute_kind;	/* 43 BSDP  */
+static int hf_dhcp_option43_bsdp_boot_image_attribute_reserved;	/* 43 BSDP  */
+static int hf_dhcp_option43_bsdp_image_desc;			/* 43 BSDP  */
+static int hf_dhcp_option43_bsdp_boot_image_name;			/* 43 BSDP  */
+static int hf_dhcp_option43_bsdp_boot_image_name_len;		/* 43 BSDP  */
+
+static int hf_dhcp_option43_cisco_suboption;			/* 43 Cisco */
+static int hf_dhcp_option43_cisco_unknown;				/* 43 Cisco */
+static int hf_dhcp_option43_cisco_unknown1;			/* 43:1 Cisco */
+static int hf_dhcp_option43_cisco_unknown2;			/* 43:2 Cisco */
+static int hf_dhcp_option43_cisco_unknown3;			/* 43:3 Cisco */
+static int hf_dhcp_option43_cisco_nodeid;				/* 43:4 Cisco */
+static int hf_dhcp_option43_cisco_unknown5;			/* 43:5 Cisco */
+static int hf_dhcp_option43_cisco_unknown6;			/* 43:6 Cisco */
+static int hf_dhcp_option43_cisco_model;				/* 43:7 Cisco */
+static int hf_dhcp_option43_cisco_apicuuid;			/* 43:8 Cisco */
+static int hf_dhcp_option43_cisco_fabricname;			/* 43:9 Cisco */
+static int hf_dhcp_option43_cisco_unknown10;			/* 43:10 Cisco */
+static int hf_dhcp_option43_cisco_serialno;			/* 43:11 Cisco */
+static int hf_dhcp_option43_cisco_clientint;			/* 43:12 Cisco */
+
+static int hf_dhcp_option43_alcatel_suboption;			/* 43 suboption */
+static int hf_dhcp_option43_alcatel_padding;			/* 43:0 Alcatel	 */
+static int hf_dhcp_option43_alcatel_vlan_id;			/* 43:58 Alcatel  */
+static int hf_dhcp_option43_alcatel_tftp1;				/* 43:64 Alcatel  */
+static int hf_dhcp_option43_alcatel_tftp2;				/* 43:65 Alcatel  */
+static int hf_dhcp_option43_alcatel_app_type;			/* 43:66 Alcatel  */
+static int hf_dhcp_option43_alcatel_sip_url;			/* 43:67 Alcatel  */
+static int hf_dhcp_option43_alcatel_end;				/* 43:255 Alcatel */
+
+static int hf_dhcp_option43_arubaap_controllerip;			/* 43: ArubaAP*/
+static int hf_dhcp_option43_arubaiap;				/* 43: ArubaIAP*/
+static int hf_dhcp_option43_arubaiap_nameorg;			/* 43: ArubaIAP: Name Organisation*/
+static int hf_dhcp_option43_arubaiap_ampip;			/* 43: ArubaIAP: AMP IP Address*/
+static int hf_dhcp_option43_arubaiap_password;			/* 43 :ArubaIAP: Password*/
+
+static int hf_dhcp_option_netbios_over_tcpip_name_server;		/* 44 */
+static int hf_dhcp_option_netbios_over_tcpip_dd_name_server;	/* 45 */
+static int hf_dhcp_option_netbios_over_tcpip_node_type;		/* 46 */
+static int hf_dhcp_option_netbios_over_tcpip_scope;		/* 47 */
+static int hf_dhcp_option_xwindows_system_font_server;		/* 48 */
+static int hf_dhcp_option_xwindows_system_display_manager;		/* 49 */
+static int hf_dhcp_option_requested_ip_address;			/* 50 */
+static int hf_dhcp_option_ip_address_lease_time;			/* 51 */
+static int hf_dhcp_option_option_overload;				/* 52 */
+static int hf_dhcp_option_dhcp;					/* 53 */
+static int hf_dhcp_option_dhcp_server_id;				/* 54 */
+static int hf_dhcp_option_parameter_request_list_item;		/* 55 */
+static int hf_dhcp_option_message;					/* 56 */
+static int hf_dhcp_option_dhcp_max_message_size;			/* 57 */
+static int hf_dhcp_option_renewal_time_value;			/* 58 */
+static int hf_dhcp_option_rebinding_time_value;			/* 59 */
+static int hf_dhcp_option_vendor_class_id;				/* 60 */
+static int hf_dhcp_option_vendor_class_data;			/* 60 */
+
+static int hf_dhcp_option_novell_netware_ip_domain;		/* 62 */
+
+static int hf_dhcp_option63_suboption;				/* 63 suboption */
+static int hf_dhcp_option63_value;					/* 63 suboption value */
+static int hf_dhcp_option63_value_8;				/* 63 suboption value */
+static int hf_dhcp_option63_value_ip_address;			/* 63 suboption value */
+static int hf_dhcp_option63_value_boolean;				/* 63 suboption value */
+static int hf_dhcp_option63_broadcast;				/* 63:5 */
+static int hf_dhcp_option63_preferred_dss_server;			/* 63:6 */
+static int hf_dhcp_option63_nearest_nwip_server;			/* 63:7 */
+static int hf_dhcp_option63_autoretries;				/* 63:8 */
+static int hf_dhcp_option63_autoretry_delay;			/* 63:9 */
+static int hf_dhcp_option63_support_netware_v1_1;			/* 63:10 */
+static int hf_dhcp_option63_primary_dss;				/* 63:11 */
+
+static int hf_dhcp_option_nis_plus_domain;				/* 64 */
+static int hf_dhcp_option_nis_plus_server;				/* 65 */
+static int hf_dhcp_option_tftp_server_name;			/* 66 */
+static int hf_dhcp_option_bootfile_name;				/* 67 */
+static int hf_dhcp_option_mobile_ip_home_agent;			/* 68 */
+static int hf_dhcp_option_smtp_server;				/* 69 */
+static int hf_dhcp_option_pop3_server;				/* 70 */
+static int hf_dhcp_option_nntp_server;				/* 71 */
+static int hf_dhcp_option_default_www_server;			/* 72 */
+static int hf_dhcp_option_default_finger_server;			/* 73 */
+static int hf_dhcp_option_default_irc_server;			/* 74 */
+static int hf_dhcp_option_streettalk_server;			/* 75 */
+static int hf_dhcp_option_streettalk_da_server;			/* 76 */
+static int hf_dhcp_option77_user_class;				/* 77 User Class instance */
+static int hf_dhcp_option77_user_class_length;			/* 77 length of User Class instance */
+static int hf_dhcp_option77_user_class_data;			/* 77 data of User Class instance */
+static int hf_dhcp_option77_user_class_text;			/* 77 User class text */
+static int hf_dhcp_option77_user_class_binary_data_length;	/* 77, Microsoft */
+static int hf_dhcp_option77_user_class_binary_data;		/* 77, Microsoft */
+static int hf_dhcp_option77_user_class_padding;			/* 77, Microsoft */
+static int hf_dhcp_option77_user_class_name_length;		/* 77, Microsoft */
+static int hf_dhcp_option77_user_class_name;				/* 77, Microsoft */
+static int hf_dhcp_option77_user_class_description_length;	/* 77, Microsoft */
+static int hf_dhcp_option77_user_class_description;		/* 77, Microsoft */
+static int hf_dhcp_option_slp_directory_agent_value;		/* 78 */
+static int hf_dhcp_option_slp_directory_agent_slpda_address;	/* 78 */
+static int hf_dhcp_option_slp_service_scope_value;			/* 79 */
+static int hf_dhcp_option_slp_service_scope_string;		/* 79 */
+
+static int hf_dhcp_option82_suboption;				/* 82 suboption */
+static int hf_dhcp_option82_value;					/* 82 suboption value */
+static int hf_dhcp_option82_value_8;				/* 82 suboption value */
+static int hf_dhcp_option82_value_16;				/* 82 suboption value */
+static int hf_dhcp_option82_value_32;				/* 82 suboption value */
+static int hf_dhcp_option82_value_ip_address;			/* 82 suboption value */
+static int hf_dhcp_option82_value_stringz;				/* 82 suboption value */
+static int hf_dhcp_option82_padding;				/* 82:0 */
+static int hf_dhcp_option82_agent_circuit_id;			/* 82:1 */
+static int hf_dhcp_option82_agent_remote_id;			/* 82:2 */
+static int hf_dhcp_option82_reserved;				/* 82:3 */
+static int hf_dhcp_option82_docsis_device_class;			/* 82:4 */
+static int hf_dhcp_option82_link_selection;			/* 82:5 */
+static int hf_dhcp_option82_subscriber_id;				/* 82:6 */
+static int hf_dhcp_option82_radius_attributes;			/* 82:7 */
+static int hf_dhcp_option82_authentication;			/* 82:8 */
+static int hf_dhcp_option82_vi;					/* 82:9 */
 									/* 82:9 suboptions */
-static int hf_dhcp_option82_vi_enterprise = -1;
-static int hf_dhcp_option82_vi_data_length = -1;
-static int hf_dhcp_option82_vi_cl_docsis_version = -1;			/* 82:9:4491:1 */
-static int hf_dhcp_option82_vi_cl_dpoe_system_version = -1;		/* 82:9:4491:2 */
-static int hf_dhcp_option82_vi_cl_dpoe_system_pbb_service = -1;		/* 82:9:4491:4 */
-static int hf_dhcp_option82_vi_cl_service_class_name = -1;		/* 82:9:4491:5 */
-static int hf_dhcp_option82_vi_cl_mso_defined_text = -1;		/* 82:9:4491:6 */
-static int hf_dhcp_option82_vi_cl_secure_file_transfer_uri = -1;	/* 82:9:4491:7 */
+static int hf_dhcp_option82_vi_enterprise;
+static int hf_dhcp_option82_vi_data_length;
+static int hf_dhcp_option82_vi_cl_docsis_version;			/* 82:9:4491:1 */
+static int hf_dhcp_option82_vi_cl_dpoe_system_version;		/* 82:9:4491:2 */
+static int hf_dhcp_option82_vi_cl_dpoe_system_pbb_service;		/* 82:9:4491:4 */
+static int hf_dhcp_option82_vi_cl_service_class_name;		/* 82:9:4491:5 */
+static int hf_dhcp_option82_vi_cl_mso_defined_text;		/* 82:9:4491:6 */
+static int hf_dhcp_option82_vi_cl_secure_file_transfer_uri;	/* 82:9:4491:7 */
 									/* 82:9 suboptions end */
-static int hf_dhcp_option82_flags = -1;					/* 82:10 */
-static int hf_dhcp_option82_server_id_override = -1;			/* 82:11 */
-static int hf_dhcp_option82_relay_agent_id = -1;			/* 82:12 */
-static int hf_dhcp_option82_option_ani_att = -1;			/* 82:13 */
-static int hf_dhcp_option82_option_ani_att_res = -1;
-static int hf_dhcp_option82_option_ani_att_att = -1;
-static int hf_dhcp_option82_option_ani_network_name = -1;		/* 82:14 */
-static int hf_dhcp_option82_option_ani_ap_name = -1;			/* 82:15 */
-static int hf_dhcp_option82_option_ani_ap_bssid = -1;			/* 82:16 */
-static int hf_dhcp_option82_option_ani_operator_id = -1;		/* 82:17 */
-static int hf_dhcp_option82_option_ani_operator_realm = -1;		/* 82:18 */
-static int hf_dhcp_option82_option_source_port = -1;			/* 82:19 */
-static int hf_dhcp_option82_link_selection_cisco = -1;			/* 82:150 */
-static int hf_dhcp_option82_vrf_name_vpn_id = -1;			/* 82:151 */
+static int hf_dhcp_option82_flags;					/* 82:10 */
+static int hf_dhcp_option82_server_id_override;			/* 82:11 */
+static int hf_dhcp_option82_relay_agent_id;			/* 82:12 */
+static int hf_dhcp_option82_option_ani_att;			/* 82:13 */
+static int hf_dhcp_option82_option_ani_att_res;
+static int hf_dhcp_option82_option_ani_att_att;
+static int hf_dhcp_option82_option_ani_network_name;		/* 82:14 */
+static int hf_dhcp_option82_option_ani_ap_name;			/* 82:15 */
+static int hf_dhcp_option82_option_ani_ap_bssid;			/* 82:16 */
+static int hf_dhcp_option82_option_ani_operator_id;		/* 82:17 */
+static int hf_dhcp_option82_option_ani_operator_realm;		/* 82:18 */
+static int hf_dhcp_option82_option_source_port;			/* 82:19 */
+static int hf_dhcp_option82_link_selection_cisco;			/* 82:150 */
+static int hf_dhcp_option82_vrf_name_vpn_id;			/* 82:151 */
 									/* 82:151 suboptions */
-static int hf_dhcp_option82_vrf_name_global = -1;
-static int hf_dhcp_option82_vrf_name = -1;
-static int hf_dhcp_option82_vrf_name_vpn_id_oui = -1;
-static int hf_dhcp_option82_vrf_name_vpn_id_index = -1;
+static int hf_dhcp_option82_vrf_name_global;
+static int hf_dhcp_option82_vrf_name;
+static int hf_dhcp_option82_vrf_name_vpn_id_oui;
+static int hf_dhcp_option82_vrf_name_vpn_id_index;
 									/* 82:151 suboptions end */
-static int hf_dhcp_option82_server_id_override_cisco = -1;		/* 82:152 */
-
-static int hf_dhcp_option_isns_functions = -1;
-static int hf_dhcp_option_isns_functions_enabled = -1;
-static int hf_dhcp_option_isns_functions_dd_authorization = -1;
-static int hf_dhcp_option_isns_functions_sec_policy_distibution = -1;
-static int hf_dhcp_option_isns_functions_reserved = -1;
-
-static int hf_dhcp_option_isns_discovery_domain_access = -1;
-static int hf_dhcp_option_isns_discovery_domain_access_enabled = -1;
-static int hf_dhcp_option_isns_discovery_domain_access_control_node = -1;
-static int hf_dhcp_option_isns_discovery_domain_access_iscsi_target = -1;
-static int hf_dhcp_option_isns_discovery_domain_access_iscsi_inititator = -1;
-static int hf_dhcp_option_isns_discovery_domain_access_ifcp_target_port = -1;
-static int hf_dhcp_option_isns_discovery_domain_access_ifcp_initiator_port = -1;
-static int hf_dhcp_option_isns_discovery_domain_access_reserved = -1;
-
-static int hf_dhcp_option_isns_administrative_flags = -1;
-static int hf_dhcp_option_isns_administrative_flags_enabled = -1;
-static int hf_dhcp_option_isns_administrative_flags_heartbeat = -1;
-static int hf_dhcp_option_isns_administrative_flags_management_scns = -1;
-static int hf_dhcp_option_isns_administrative_flags_default_dd = -1;
-static int hf_dhcp_option_isns_administrative_flags_reserved = -1;
-
-static int hf_dhcp_option_isns_server_security_bitmap = -1;
-static int hf_dhcp_option_isns_server_security_bitmap_enabled = -1;
-static int hf_dhcp_option_isns_server_security_bitmap_ike_ipsec_enabled = -1;
-static int hf_dhcp_option_isns_server_security_bitmap_main_mode = -1;
-static int hf_dhcp_option_isns_server_security_bitmap_aggressive_mode = -1;
-static int hf_dhcp_option_isns_server_security_bitmap_pfs = -1;
-static int hf_dhcp_option_isns_server_security_bitmap_transport_mode = -1;
-static int hf_dhcp_option_isns_server_security_bitmap_tunnel_mode = -1;
-static int hf_dhcp_option_isns_server_security_bitmap_reserved = -1;
-
-static int hf_dhcp_option_isns_heartbeat_originator_addr = -1;
-static int hf_dhcp_option_isns_primary_server_addr = -1;
-static int hf_dhcp_option_isns_secondary_server_addr_list = -1;
-
-static int hf_dhcp_option_novell_dss_string = -1;			/* 85 */
-static int hf_dhcp_option_novell_dss_ip = -1;				/* 85 */
-static int hf_dhcp_option_novell_ds_tree_name = -1;			/* 86 */
-static int hf_dhcp_option_novell_ds_context = -1;			/* 87 */
-static int hf_dhcp_option_dhcp_authentication_protocol = -1;		/* 90 */
-static int hf_dhcp_option_dhcp_authentication_alg_delay = -1;		/* 90 */
-static int hf_dhcp_option_dhcp_authentication_algorithm = -1;		/* 90 */
-static int hf_dhcp_option_dhcp_authentication_rdm = -1;			/* 90 */
-static int hf_dhcp_option_dhcp_authentication_rdm_replay_detection = -1;   /* 90 */
-static int hf_dhcp_option_dhcp_authentication_rdm_rdv = -1;		/* 90 */
-static int hf_dhcp_option_dhcp_authentication_secret_id = -1;		/* 90 */
-static int hf_dhcp_option_dhcp_authentication_hmac_md5_hash = -1;	/* 90 */
-static int hf_dhcp_option_dhcp_authentication_information = -1;		/* 90 */
-static int hf_dhcp_option_client_last_transaction_time = -1;		/* 91 */
-static int hf_dhcp_option_associated_ip_option = -1;			/* 92 */
-static int hf_dhcp_option_client_system_architecture = -1;		/* 93 */
-static int hf_dhcp_option_client_network_id_major_ver = -1;		/* 94 */
-static int hf_dhcp_option_client_network_id_minor_ver = -1;		/* 94 */
-static int hf_dhcp_option_civic_location_what = -1;			/* 99 */
-static int hf_dhcp_option_civic_location_country = -1;			/* 99 */
-static int hf_dhcp_option_civic_location_ca_type = -1;			/* 99 */
-static int hf_dhcp_option_civic_location_ca_length = -1;		/* 99 */
-static int hf_dhcp_option_civic_location_ca_value = -1;			/* 99 */
-static int hf_dhcp_option_tz_pcode = -1;				/* 100 */
-static int hf_dhcp_option_tz_tcode = -1;				/* 101 */
-static int hf_dhcp_option_netinfo_parent_server_address = -1;		/* 112 */
-static int hf_dhcp_option_netinfo_parent_server_tag = -1;		/* 113 */
-static int hf_dhcp_option_captive_portal = -1;				/* 114 (ex 160) */
-static int hf_dhcp_option_dhcp_auto_configuration = -1;			/* 116 */
-static int hf_dhcp_option_dhcp_name_service_search_option = -1;		/* 117 */
-static int hf_dhcp_option_dhcp_dns_domain_search_list_rfc_3396_detected = -1;	/* 119 */
-static int hf_dhcp_option_dhcp_dns_domain_search_list_refer_last_option = -1;	/* 119 */
-static int hf_dhcp_option_dhcp_dns_domain_search_list_fqdn = -1;		/* 119 */
-static int hf_dhcp_option_sip_server_rfc_3396_detected = -1;			/* 120 */
-static int hf_dhcp_option_sip_server_refer_last_option = -1;			/* 120 */
-static int hf_dhcp_option_sip_server_enc = -1;				/* 120 */
-static int hf_dhcp_option_sip_server_name = -1;				/* 120 */
-static int hf_dhcp_option_sip_server_address = -1;			/* 120 */
-static int hf_dhcp_option_classless_static_route = -1;			/* 120 */
-static int hf_dhcp_option_rfc3825_error = -1;				/* 123 */
-static int hf_dhcp_option_rfc3825_latitude = -1;			/* 123 */
-static int hf_dhcp_option_rfc3825_longitude = -1;			/* 123 */
-static int hf_dhcp_option_rfc3825_latitude_res = -1;			/* 123 */
-static int hf_dhcp_option_rfc3825_longitude_res = -1;			/* 123 */
-static int hf_dhcp_option_rfc3825_altitude = -1;			/* 123 */
-static int hf_dhcp_option_rfc3825_altitude_res = -1;			/* 123 */
-static int hf_dhcp_option_rfc3825_altitude_type = -1;			/* 123 */
-static int hf_dhcp_option_rfc3825_map_datum = -1;			/* 123 */
-static int hf_dhcp_option_cl_dss_id_option = -1;			/* 123 CL */
-static int hf_dhcp_option_cl_dss_id_len = -1;				/* 123 CL */
-static int hf_dhcp_option_cl_dss_id = -1;				/* 123 CL */
-static int hf_dhcp_option_vi_class_cl_address_mode = -1;		/* 124 */
-static int hf_dhcp_option_vi_class_enterprise = -1;			/* 124 */
-static int hf_dhcp_option_vi_class_data_length = -1;			/* 124 */
-static int hf_dhcp_option_vi_class_data_item_length = -1;		/* 124 */
-static int hf_dhcp_option_vi_class_data_item_data = -1;			/* 124 */
-
-static int hf_dhcp_option125_enterprise = -1;
-static int hf_dhcp_option125_length = -1;
-static int hf_dhcp_option125_value = -1;				/* 125 suboption value */
-static int hf_dhcp_option125_value_8 = -1;				/* 125 suboption value */
-static int hf_dhcp_option125_value_16 = -1;				/* 125 suboption value */
-static int hf_dhcp_option125_value_ip_address = -1;			/* 125 suboption value */
-static int hf_dhcp_option125_value_stringz = -1;			/* 125 suboption value */
-static int hf_dhcp_option125_tr111_suboption = -1;			/* 125 suboption */
-static int hf_dhcp_option125_tr111_device_manufacturer_oui = -1;	/* 125:TR-111 1 */
-static int hf_dhcp_option125_tr111_device_serial_number = -1;		/* 125:TR-111 2 */
-static int hf_dhcp_option125_tr111_device_product_class = -1;		/* 125:TR-111 3 */
-static int hf_dhcp_option125_tr111_gateway_manufacturer_oui = -1;	/* 125:TR-111 4 */
-static int hf_dhcp_option125_tr111_gateway_serial_number = -1;		/* 125:TR-111 5 */
-static int hf_dhcp_option125_tr111_gateway_product_class = -1;		/* 125:TR-111 6 */
-static int hf_dhcp_option125_cl_suboption = -1;				/* 125 suboption */
-static int hf_dhcp_option125_cl_option_request = -1;			/* 125:CL 1 */
-static int hf_dhcp_option125_cl_tftp_server_addresses = -1;		/* 125:CL 2 */
-static int hf_dhcp_option125_cl_erouter_container_option = -1;		/* 125:CL 3 */
-static int hf_dhcp_option125_cl_mib_environment_indicator_option = -1; /* 125:CL 4 */
-static int hf_dhcp_option125_cl_modem_capabilities = -1;		/* 125:CL 5 */
-
-static int hf_dhcp_option_subnet_selection_option = -1;			/* 118 */
-static int hf_dhcp_option_pana_agent = -1;				/* 136 */
-static int hf_dhcp_option_lost_server_domain_name = -1;			/* 137 */
-static int hf_dhcp_option_capwap_access_controller = -1;		/* 138 */
-static int hf_dhcp_option_andsf_server = -1;				/* 142 */
-static int hf_dhcp_option_forcerenew_nonce_algo = -1;			/* 145 */
-static int hf_dhcp_option_rdnss_reserved = -1;				/* 146 */
-static int hf_dhcp_option_rdnss_pref = -1;				/* 146 */
-static int hf_dhcp_option_rdnss_prim_dns_server = -1;			/* 146 */
-static int hf_dhcp_option_rdnss_sec_dns_server = -1;			/* 146 */
-static int hf_dhcp_option_rdnss_domain = -1;				/* 146 */
-static int hf_dhcp_option_tftp_server_address = -1;			/* 150 */
-static int hf_dhcp_option_bulk_lease_status_code = -1;			/* 151 */
-static int hf_dhcp_option_bulk_lease_status_message = -1;		/* 151 */
-static int hf_dhcp_option_bulk_lease_base_time = -1;			/* 152 */
-static int hf_dhcp_option_bulk_lease_start_time_of_state = -1;		/* 153 */
-static int hf_dhcp_option_bulk_lease_query_start = -1;			/* 154 */
-static int hf_dhcp_option_bulk_lease_query_end = -1;			/* 155 */
-static int hf_dhcp_option_bulk_lease_dhcp_state = -1;			/* 156 */
-static int hf_dhcp_option_bulk_lease_data_source = -1;			/* 157 */
-static int hf_dhcp_option_pcp_list_length = -1;				/* 158 */
-static int hf_dhcp_option_pcp_server = -1;				/* 158 */
-static int hf_dhcp_option_portparams_offset = -1;			/* 159 */
-static int hf_dhcp_option_portparams_psid_length = -1;			/* 159 */
-static int hf_dhcp_option_portparams_psid = -1;				/* 159 */
-static int hf_dhcp_option_mudurl = -1;					/* 161 */
-static int hf_dhcp_option_pxe_config_file = -1;				/* 209 */
-static int hf_dhcp_option_pxe_path_prefix = -1;				/* 210 */
-static int hf_dhcp_option_6RD_ipv4_mask_len = -1;			/* 212 */
-static int hf_dhcp_option_6RD_prefix_len = -1;				/* 212 */
-static int hf_dhcp_option_6RD_prefix = -1;				/* 212 */
-static int hf_dhcp_option_6RD_border_relay_ip = -1;			/* 212 */
-static int hf_dhcp_option242_avaya = -1;				/* 242 */
-static int hf_dhcp_option242_avaya_tlssrvr = -1;			/* 242 */
-static int hf_dhcp_option242_avaya_httpsrvr = -1;			/* 242 */
-static int hf_dhcp_option242_avaya_httpdir = -1;			/* 242 */
-static int hf_dhcp_option242_avaya_static = -1;				/* 242 */
-static int hf_dhcp_option242_avaya_mcipadd = -1;			/* 242 */
-static int hf_dhcp_option242_avaya_dot1x = -1;				/* 242 */
-static int hf_dhcp_option242_avaya_icmpdu = -1;				/* 242 */
-static int hf_dhcp_option242_avaya_icmpred = -1;			/* 242 */
-static int hf_dhcp_option242_avaya_l2q = -1;				/* 242 */
-static int hf_dhcp_option242_avaya_l2qvlan = -1;			/* 242 */
-static int hf_dhcp_option242_avaya_loglocal = -1;			/* 242 */
-static int hf_dhcp_option242_avaya_phy1stat = -1;			/* 242 */
-static int hf_dhcp_option242_avaya_phy2stat = -1;			/* 242 */
-static int hf_dhcp_option242_avaya_procpswd = -1;			/* 242 */
-static int hf_dhcp_option242_avaya_procstat = -1;			/* 242 */
-static int hf_dhcp_option242_avaya_snmpadd = -1;			/* 242 */
-static int hf_dhcp_option242_avaya_snmpstring = -1;			/* 242 */
-static int hf_dhcp_option242_avaya_vlantest = -1;			/* 242 */
-static int hf_dhcp_option_private_proxy_autodiscovery = -1;		/* 252 */
-static int hf_dhcp_option_end = -1;					/* 255 */
-static int hf_dhcp_option_end_overload = -1;				/* 255 (with overload)*/
-static int hf_dhcp_vendor_unknown_suboption = -1;
-static int hf_dhcp_suboption_data = -1;
-static int hf_dhcp_pc_ietf_ccc_suboption = -1;
-static int hf_dhcp_pc_i05_ccc_suboption = -1;
-
-static int hf_dhcp_cl_ietf_ccc_dev_realm_unc_key_nom_timeout = -1;
-static int hf_dhcp_cl_ietf_ccc_dev_realm_unc_key_max_timeout = -1;
-static int hf_dhcp_cl_ietf_ccc_dev_realm_unc_key_max_retries = -1;
-static int hf_dhcp_cl_ietf_ccc_dev_prov_unc_key_nom_timeout = -1;
-static int hf_dhcp_cl_ietf_ccc_dev_prov_unc_key_max_timeout = -1;
-static int hf_dhcp_cl_ietf_ccc_dev_prov_unc_key_max_retries = -1;
-
-static gint ett_dhcp = -1;
-static gint ett_dhcp_flags = -1;
-static gint ett_dhcp_option = -1;
-static gint ett_dhcp_option43_suboption = -1;
-static gint ett_dhcp_option43_suboption_discovery = -1;
-static gint ett_dhcp_option43_suboption_tree = -1;
-static gint ett_dhcp_option63_suboption = -1;
-static gint ett_dhcp_option77_instance = -1;
-static gint ett_dhcp_option82_suboption = -1;
-static gint ett_dhcp_option82_suboption9 = -1;
-static gint ett_dhcp_option124_vendor_class_data_item = -1;
-static gint ett_dhcp_option125_suboption = -1;
-static gint ett_dhcp_option125_tr111_suboption = -1;
-static gint ett_dhcp_option125_cl_suboption = -1;
-static gint ett_dhcp_option242_suboption = -1;
-static gint ett_dhcp_fqdn = -1;
-static gint ett_dhcp_fqdn_flags = -1;
-static gint ett_dhcp_filename_option = -1;
-static gint ett_dhcp_server_hostname = -1;
-static gint ett_dhcp_isns_functions = -1;
-static gint ett_dhcp_isns_discovery_domain_access = -1;
-static gint ett_dhcp_isns_administrative_flags = -1;
-static gint ett_dhcp_isns_server_security_bitmap = -1;
-static gint ett_dhcp_isns_secondary_server_addr = -1;
-static gint ett_dhcp_o43_bsdp_boot_image = -1;
-static gint ett_dhcp_o43_bsdp_attributes = -1;
-static gint ett_dhcp_o43_bsdp_image_desc_list = -1;
-static gint ett_dhcp_o43_bsdp_image_desc = -1;
-static gint ett_dhcp_o43_bsdp_attributes_flags = -1;
-static gint ett_dhcp_option158_pcp_list = -1;
-
-static expert_field ei_dhcp_bad_length = EI_INIT;
-static expert_field ei_dhcp_bad_bitfield = EI_INIT;
-static expert_field ei_dhcp_missing_subopt_length = EI_INIT;
-static expert_field ei_dhcp_missing_subopt_value = EI_INIT;
-static expert_field ei_dhcp_mal_duid = EI_INIT;
-static expert_field ei_dhcp_opt_overload_file_end_missing = EI_INIT;
-static expert_field ei_dhcp_opt_overload_sname_end_missing = EI_INIT;
-static expert_field ei_dhcp_subopt_unknown_type = EI_INIT;
-static expert_field ei_dhcp_option_civic_location_bad_cattype = EI_INIT;
-static expert_field ei_dhcp_option_dhcp_name_service_invalid = EI_INIT;
-static expert_field ei_dhcp_option_sip_server_address_encoding = EI_INIT;
-static expert_field ei_dhcp_option_classless_static_route = EI_INIT;
-static expert_field ei_dhcp_option125_enterprise_malformed = EI_INIT;
-static expert_field ei_dhcp_option_6RD_malformed = EI_INIT;
-static expert_field ei_dhcp_option82_vi_cl_tag_unknown = EI_INIT;
-static expert_field ei_dhcp_option_parse_err = EI_INIT;
-static expert_field ei_dhcp_nonstd_option_data = EI_INIT;
-static expert_field ei_dhcp_suboption_invalid = EI_INIT;
-static expert_field ei_dhcp_secs_le = EI_INIT;
-static expert_field ei_dhcp_end_option_missing = EI_INIT;
-static expert_field ei_dhcp_client_address_not_given = EI_INIT;
-static expert_field ei_dhcp_server_name_overloaded_by_dhcp = EI_INIT;
-static expert_field ei_dhcp_boot_filename_overloaded_by_dhcp = EI_INIT;
-static expert_field ei_dhcp_option_isns_ignored_bitfield = EI_INIT;
-static expert_field ei_dhcp_option242_avaya_l2qvlan_invalid = EI_INIT;
-static expert_field ei_dhcp_option242_avaya_vlantest_invalid = EI_INIT;
-static expert_field ei_dhcp_option93_client_arch_ambiguous = EI_INIT;
+static int hf_dhcp_option82_server_id_override_cisco;		/* 82:152 */
+
+static int hf_dhcp_option_isns_functions;
+static int hf_dhcp_option_isns_functions_enabled;
+static int hf_dhcp_option_isns_functions_dd_authorization;
+static int hf_dhcp_option_isns_functions_sec_policy_distibution;
+static int hf_dhcp_option_isns_functions_reserved;
+
+static int hf_dhcp_option_isns_discovery_domain_access;
+static int hf_dhcp_option_isns_discovery_domain_access_enabled;
+static int hf_dhcp_option_isns_discovery_domain_access_control_node;
+static int hf_dhcp_option_isns_discovery_domain_access_iscsi_target;
+static int hf_dhcp_option_isns_discovery_domain_access_iscsi_inititator;
+static int hf_dhcp_option_isns_discovery_domain_access_ifcp_target_port;
+static int hf_dhcp_option_isns_discovery_domain_access_ifcp_initiator_port;
+static int hf_dhcp_option_isns_discovery_domain_access_reserved;
+
+static int hf_dhcp_option_isns_administrative_flags;
+static int hf_dhcp_option_isns_administrative_flags_enabled;
+static int hf_dhcp_option_isns_administrative_flags_heartbeat;
+static int hf_dhcp_option_isns_administrative_flags_management_scns;
+static int hf_dhcp_option_isns_administrative_flags_default_dd;
+static int hf_dhcp_option_isns_administrative_flags_reserved;
+
+static int hf_dhcp_option_isns_server_security_bitmap;
+static int hf_dhcp_option_isns_server_security_bitmap_enabled;
+static int hf_dhcp_option_isns_server_security_bitmap_ike_ipsec_enabled;
+static int hf_dhcp_option_isns_server_security_bitmap_main_mode;
+static int hf_dhcp_option_isns_server_security_bitmap_aggressive_mode;
+static int hf_dhcp_option_isns_server_security_bitmap_pfs;
+static int hf_dhcp_option_isns_server_security_bitmap_transport_mode;
+static int hf_dhcp_option_isns_server_security_bitmap_tunnel_mode;
+static int hf_dhcp_option_isns_server_security_bitmap_reserved;
+
+static int hf_dhcp_option_isns_heartbeat_originator_addr;
+static int hf_dhcp_option_isns_primary_server_addr;
+static int hf_dhcp_option_isns_secondary_server_addr_list;
+
+static int hf_dhcp_option_novell_dss_string;			/* 85 */
+static int hf_dhcp_option_novell_dss_ip;				/* 85 */
+static int hf_dhcp_option_novell_ds_tree_name;			/* 86 */
+static int hf_dhcp_option_novell_ds_context;			/* 87 */
+static int hf_dhcp_option_dhcp_authentication_protocol;		/* 90 */
+static int hf_dhcp_option_dhcp_authentication_alg_delay;		/* 90 */
+static int hf_dhcp_option_dhcp_authentication_algorithm;		/* 90 */
+static int hf_dhcp_option_dhcp_authentication_rdm;			/* 90 */
+static int hf_dhcp_option_dhcp_authentication_rdm_replay_detection;   /* 90 */
+static int hf_dhcp_option_dhcp_authentication_rdm_rdv;		/* 90 */
+static int hf_dhcp_option_dhcp_authentication_secret_id;		/* 90 */
+static int hf_dhcp_option_dhcp_authentication_hmac_md5_hash;	/* 90 */
+static int hf_dhcp_option_dhcp_authentication_information;		/* 90 */
+static int hf_dhcp_option_client_last_transaction_time;		/* 91 */
+static int hf_dhcp_option_associated_ip_option;			/* 92 */
+static int hf_dhcp_option_client_system_architecture;		/* 93 */
+static int hf_dhcp_option_client_network_id_major_ver;		/* 94 */
+static int hf_dhcp_option_client_network_id_minor_ver;		/* 94 */
+static int hf_dhcp_option_civic_location_what;			/* 99 */
+static int hf_dhcp_option_civic_location_country;			/* 99 */
+static int hf_dhcp_option_civic_location_ca_type;			/* 99 */
+static int hf_dhcp_option_civic_location_ca_length;		/* 99 */
+static int hf_dhcp_option_civic_location_ca_value;			/* 99 */
+static int hf_dhcp_option_tz_pcode;				/* 100 */
+static int hf_dhcp_option_tz_tcode;				/* 101 */
+static int hf_dhcp_option_netinfo_parent_server_address;		/* 112 */
+static int hf_dhcp_option_netinfo_parent_server_tag;		/* 113 */
+static int hf_dhcp_option_captive_portal;				/* 114 (ex 160) */
+static int hf_dhcp_option_dhcp_auto_configuration;			/* 116 */
+static int hf_dhcp_option_dhcp_name_service_search_option;		/* 117 */
+static int hf_dhcp_option_dhcp_dns_domain_search_list_rfc_3396_detected;	/* 119 */
+static int hf_dhcp_option_dhcp_dns_domain_search_list_refer_last_option;	/* 119 */
+static int hf_dhcp_option_dhcp_dns_domain_search_list_fqdn;		/* 119 */
+static int hf_dhcp_option_sip_server_rfc_3396_detected;			/* 120 */
+static int hf_dhcp_option_sip_server_refer_last_option;			/* 120 */
+static int hf_dhcp_option_sip_server_enc;				/* 120 */
+static int hf_dhcp_option_sip_server_name;				/* 120 */
+static int hf_dhcp_option_sip_server_address;			/* 120 */
+static int hf_dhcp_option_classless_static_route;			/* 120 */
+static int hf_dhcp_option_rfc3825_error;				/* 123 */
+static int hf_dhcp_option_rfc3825_latitude;			/* 123 */
+static int hf_dhcp_option_rfc3825_longitude;			/* 123 */
+static int hf_dhcp_option_rfc3825_latitude_res;			/* 123 */
+static int hf_dhcp_option_rfc3825_longitude_res;			/* 123 */
+static int hf_dhcp_option_rfc3825_altitude;			/* 123 */
+static int hf_dhcp_option_rfc3825_altitude_res;			/* 123 */
+static int hf_dhcp_option_rfc3825_altitude_type;			/* 123 */
+static int hf_dhcp_option_rfc3825_map_datum;			/* 123 */
+static int hf_dhcp_option_cl_dss_id_option;			/* 123 CL */
+static int hf_dhcp_option_cl_dss_id_len;				/* 123 CL */
+static int hf_dhcp_option_cl_dss_id;				/* 123 CL */
+static int hf_dhcp_option_vi_class_cl_address_mode;		/* 124 */
+static int hf_dhcp_option_vi_class_enterprise;			/* 124 */
+static int hf_dhcp_option_vi_class_data_length;			/* 124 */
+static int hf_dhcp_option_vi_class_data_item_length;		/* 124 */
+static int hf_dhcp_option_vi_class_data_item_data;			/* 124 */
+
+static int hf_dhcp_option125_enterprise;
+static int hf_dhcp_option125_length;
+static int hf_dhcp_option125_value;				/* 125 suboption value */
+static int hf_dhcp_option125_value_8;				/* 125 suboption value */
+static int hf_dhcp_option125_value_16;				/* 125 suboption value */
+static int hf_dhcp_option125_value_ip_address;			/* 125 suboption value */
+static int hf_dhcp_option125_value_stringz;			/* 125 suboption value */
+static int hf_dhcp_option125_tr111_suboption;			/* 125 suboption */
+static int hf_dhcp_option125_tr111_device_manufacturer_oui;	/* 125:TR-111 1 */
+static int hf_dhcp_option125_tr111_device_serial_number;		/* 125:TR-111 2 */
+static int hf_dhcp_option125_tr111_device_product_class;		/* 125:TR-111 3 */
+static int hf_dhcp_option125_tr111_gateway_manufacturer_oui;	/* 125:TR-111 4 */
+static int hf_dhcp_option125_tr111_gateway_serial_number;		/* 125:TR-111 5 */
+static int hf_dhcp_option125_tr111_gateway_product_class;		/* 125:TR-111 6 */
+static int hf_dhcp_option125_cl_suboption;				/* 125 suboption */
+static int hf_dhcp_option125_cl_option_request;			/* 125:CL 1 */
+static int hf_dhcp_option125_cl_tftp_server_addresses;		/* 125:CL 2 */
+static int hf_dhcp_option125_cl_erouter_container_option;		/* 125:CL 3 */
+static int hf_dhcp_option125_cl_mib_environment_indicator_option; /* 125:CL 4 */
+static int hf_dhcp_option125_cl_modem_capabilities;		/* 125:CL 5 */
+
+static int hf_dhcp_option_subnet_selection_option;			/* 118 */
+static int hf_dhcp_option_pana_agent;				/* 136 */
+static int hf_dhcp_option_lost_server_domain_name;			/* 137 */
+static int hf_dhcp_option_capwap_access_controller;		/* 138 */
+static int hf_dhcp_option_andsf_server;				/* 142 */
+static int hf_dhcp_option_forcerenew_nonce_algo;			/* 145 */
+static int hf_dhcp_option_rdnss_reserved;				/* 146 */
+static int hf_dhcp_option_rdnss_pref;				/* 146 */
+static int hf_dhcp_option_rdnss_prim_dns_server;			/* 146 */
+static int hf_dhcp_option_rdnss_sec_dns_server;			/* 146 */
+static int hf_dhcp_option_rdnss_domain;				/* 146 */
+static int hf_dhcp_option_tftp_server_address;			/* 150 */
+static int hf_dhcp_option_bulk_lease_status_code;			/* 151 */
+static int hf_dhcp_option_bulk_lease_status_message;		/* 151 */
+static int hf_dhcp_option_bulk_lease_base_time;			/* 152 */
+static int hf_dhcp_option_bulk_lease_start_time_of_state;		/* 153 */
+static int hf_dhcp_option_bulk_lease_query_start;			/* 154 */
+static int hf_dhcp_option_bulk_lease_query_end;			/* 155 */
+static int hf_dhcp_option_bulk_lease_dhcp_state;			/* 156 */
+static int hf_dhcp_option_bulk_lease_data_source;			/* 157 */
+static int hf_dhcp_option_pcp_list_length;				/* 158 */
+static int hf_dhcp_option_pcp_server;				/* 158 */
+static int hf_dhcp_option_portparams_offset;			/* 159 */
+static int hf_dhcp_option_portparams_psid_length;			/* 159 */
+static int hf_dhcp_option_portparams_psid;				/* 159 */
+static int hf_dhcp_option_mudurl;					/* 161 */
+static int hf_dhcp_option_pxe_config_file;				/* 209 */
+static int hf_dhcp_option_pxe_path_prefix;				/* 210 */
+static int hf_dhcp_option_6RD_ipv4_mask_len;			/* 212 */
+static int hf_dhcp_option_6RD_prefix_len;				/* 212 */
+static int hf_dhcp_option_6RD_prefix;				/* 212 */
+static int hf_dhcp_option_6RD_border_relay_ip;			/* 212 */
+static int hf_dhcp_option242_avaya;				/* 242 */
+static int hf_dhcp_option242_avaya_tlssrvr;			/* 242 */
+static int hf_dhcp_option242_avaya_httpsrvr;			/* 242 */
+static int hf_dhcp_option242_avaya_httpdir;			/* 242 */
+static int hf_dhcp_option242_avaya_static;				/* 242 */
+static int hf_dhcp_option242_avaya_mcipadd;			/* 242 */
+static int hf_dhcp_option242_avaya_dot1x;				/* 242 */
+static int hf_dhcp_option242_avaya_icmpdu;				/* 242 */
+static int hf_dhcp_option242_avaya_icmpred;			/* 242 */
+static int hf_dhcp_option242_avaya_l2q;				/* 242 */
+static int hf_dhcp_option242_avaya_l2qvlan;			/* 242 */
+static int hf_dhcp_option242_avaya_loglocal;			/* 242 */
+static int hf_dhcp_option242_avaya_phy1stat;			/* 242 */
+static int hf_dhcp_option242_avaya_phy2stat;			/* 242 */
+static int hf_dhcp_option242_avaya_procpswd;			/* 242 */
+static int hf_dhcp_option242_avaya_procstat;			/* 242 */
+static int hf_dhcp_option242_avaya_snmpadd;			/* 242 */
+static int hf_dhcp_option242_avaya_snmpstring;			/* 242 */
+static int hf_dhcp_option242_avaya_vlantest;			/* 242 */
+static int hf_dhcp_option_private_proxy_autodiscovery;		/* 252 */
+static int hf_dhcp_option_end;					/* 255 */
+static int hf_dhcp_option_end_overload;				/* 255 (with overload)*/
+static int hf_dhcp_vendor_unknown_suboption;
+static int hf_dhcp_suboption_data;
+static int hf_dhcp_pc_ietf_ccc_suboption;
+static int hf_dhcp_pc_i05_ccc_suboption;
+
+static int hf_dhcp_cl_ietf_ccc_dev_realm_unc_key_nom_timeout;
+static int hf_dhcp_cl_ietf_ccc_dev_realm_unc_key_max_timeout;
+static int hf_dhcp_cl_ietf_ccc_dev_realm_unc_key_max_retries;
+static int hf_dhcp_cl_ietf_ccc_dev_prov_unc_key_nom_timeout;
+static int hf_dhcp_cl_ietf_ccc_dev_prov_unc_key_max_timeout;
+static int hf_dhcp_cl_ietf_ccc_dev_prov_unc_key_max_retries;
+
+static gint ett_dhcp;
+static gint ett_dhcp_flags;
+static gint ett_dhcp_option;
+static gint ett_dhcp_option43_suboption;
+static gint ett_dhcp_option43_suboption_discovery;
+static gint ett_dhcp_option43_suboption_tree;
+static gint ett_dhcp_option63_suboption;
+static gint ett_dhcp_option77_instance;
+static gint ett_dhcp_option82_suboption;
+static gint ett_dhcp_option82_suboption9;
+static gint ett_dhcp_option124_vendor_class_data_item;
+static gint ett_dhcp_option125_suboption;
+static gint ett_dhcp_option125_tr111_suboption;
+static gint ett_dhcp_option125_cl_suboption;
+static gint ett_dhcp_option242_suboption;
+static gint ett_dhcp_fqdn;
+static gint ett_dhcp_fqdn_flags;
+static gint ett_dhcp_filename_option;
+static gint ett_dhcp_server_hostname;
+static gint ett_dhcp_isns_functions;
+static gint ett_dhcp_isns_discovery_domain_access;
+static gint ett_dhcp_isns_administrative_flags;
+static gint ett_dhcp_isns_server_security_bitmap;
+static gint ett_dhcp_isns_secondary_server_addr;
+static gint ett_dhcp_o43_bsdp_boot_image;
+static gint ett_dhcp_o43_bsdp_attributes;
+static gint ett_dhcp_o43_bsdp_image_desc_list;
+static gint ett_dhcp_o43_bsdp_image_desc;
+static gint ett_dhcp_o43_bsdp_attributes_flags;
+static gint ett_dhcp_option158_pcp_list;
+
+static expert_field ei_dhcp_bad_length;
+static expert_field ei_dhcp_bad_bitfield;
+static expert_field ei_dhcp_missing_subopt_length;
+static expert_field ei_dhcp_missing_subopt_value;
+static expert_field ei_dhcp_mal_duid;
+static expert_field ei_dhcp_opt_overload_file_end_missing;
+static expert_field ei_dhcp_opt_overload_sname_end_missing;
+static expert_field ei_dhcp_subopt_unknown_type;
+static expert_field ei_dhcp_option_civic_location_bad_cattype;
+static expert_field ei_dhcp_option_dhcp_name_service_invalid;
+static expert_field ei_dhcp_option_sip_server_address_encoding;
+static expert_field ei_dhcp_option_classless_static_route;
+static expert_field ei_dhcp_option125_enterprise_malformed;
+static expert_field ei_dhcp_option_6RD_malformed;
+static expert_field ei_dhcp_option82_vi_cl_tag_unknown;
+static expert_field ei_dhcp_option_parse_err;
+static expert_field ei_dhcp_nonstd_option_data;
+static expert_field ei_dhcp_suboption_invalid;
+static expert_field ei_dhcp_secs_le;
+static expert_field ei_dhcp_end_option_missing;
+static expert_field ei_dhcp_client_address_not_given;
+static expert_field ei_dhcp_server_name_overloaded_by_dhcp;
+static expert_field ei_dhcp_boot_filename_overloaded_by_dhcp;
+static expert_field ei_dhcp_option_isns_ignored_bitfield;
+static expert_field ei_dhcp_option242_avaya_l2qvlan_invalid;
+static expert_field ei_dhcp_option242_avaya_vlantest_invalid;
+static expert_field ei_dhcp_option93_client_arch_ambiguous;
 
 static dissector_table_t dhcp_option_table;
 static dissector_table_t dhcp_enterprise_class_table;
@@ -5781,33 +5781,33 @@ static const value_string pkt_mdc_mib_orgs[] = {
 	{ 0,		NULL }
 };
 
-static int hf_dhcp_pkt_mdc_supp_flow_secure = -1;
-static int hf_dhcp_pkt_mdc_supp_flow_hybrid = -1;
-static int hf_dhcp_pkt_mdc_supp_flow_basic = -1;
+static int hf_dhcp_pkt_mdc_supp_flow_secure;
+static int hf_dhcp_pkt_mdc_supp_flow_hybrid;
+static int hf_dhcp_pkt_mdc_supp_flow_basic;
 
 #define PKT_MDC_MIB_CL 0x3030
-static int hf_dhcp_pkt_mdc_mib_cl_mta = -1;
-static int hf_dhcp_pkt_mdc_mib_cl_signaling = -1;
-static int hf_dhcp_pkt_mdc_mib_cl_management_event = -1;
-static int hf_dhcp_pkt_mdc_mib_cl_mta_extension = -1;
-static int hf_dhcp_pkt_mdc_mib_cl_mta_signaling_extension = -1;
-static int hf_dhcp_pkt_mdc_mib_cl_mta_mem_extension = -1;
-static int hf_dhcp_pkt_mdc_mib_cl_reserved = -1;
+static int hf_dhcp_pkt_mdc_mib_cl_mta;
+static int hf_dhcp_pkt_mdc_mib_cl_signaling;
+static int hf_dhcp_pkt_mdc_mib_cl_management_event;
+static int hf_dhcp_pkt_mdc_mib_cl_mta_extension;
+static int hf_dhcp_pkt_mdc_mib_cl_mta_signaling_extension;
+static int hf_dhcp_pkt_mdc_mib_cl_mta_mem_extension;
+static int hf_dhcp_pkt_mdc_mib_cl_reserved;
 
 #define PKT_MDC_MIB_IETF 0x3031
-static int hf_dhcp_pkt_mdc_mib_ietf_mta = -1;
-static int hf_dhcp_pkt_mdc_mib_ietf_signaling = -1;
-static int hf_dhcp_pkt_mdc_mib_ietf_management_event = -1;
-static int hf_dhcp_pkt_mdc_mib_ietf_reserved = -1;
+static int hf_dhcp_pkt_mdc_mib_ietf_mta;
+static int hf_dhcp_pkt_mdc_mib_ietf_signaling;
+static int hf_dhcp_pkt_mdc_mib_ietf_management_event;
+static int hf_dhcp_pkt_mdc_mib_ietf_reserved;
 
 #define PKT_MDC_MIB_EURO 0x3032
-static int hf_dhcp_pkt_mdc_mib_euro_mta = -1;
-static int hf_dhcp_pkt_mdc_mib_euro_signaling = -1;
-static int hf_dhcp_pkt_mdc_mib_euro_management_event = -1;
-static int hf_dhcp_pkt_mdc_mib_euro_mta_extension = -1;
-static int hf_dhcp_pkt_mdc_mib_euro_mta_signaling_extension = -1;
-static int hf_dhcp_pkt_mdc_mib_euro_mta_mem_extension = -1;
-static int hf_dhcp_pkt_mdc_mib_euro_reserved = -1;
+static int hf_dhcp_pkt_mdc_mib_euro_mta;
+static int hf_dhcp_pkt_mdc_mib_euro_signaling;
+static int hf_dhcp_pkt_mdc_mib_euro_management_event;
+static int hf_dhcp_pkt_mdc_mib_euro_mta_extension;
+static int hf_dhcp_pkt_mdc_mib_euro_mta_signaling_extension;
+static int hf_dhcp_pkt_mdc_mib_euro_mta_mem_extension;
+static int hf_dhcp_pkt_mdc_mib_euro_reserved;
 
 
 static void
@@ -6184,10 +6184,10 @@ static const value_string docsis_cm_cap_privacy_vals[] = {
 	{ 0,		NULL }
 };
 
-static int hf_dhcp_docsis_cm_cap_ranging_hold_off_cm = -1;
-static int hf_dhcp_docsis_cm_cap_ranging_hold_off_eps = -1;
-static int hf_dhcp_docsis_cm_cap_ranging_hold_off_emta = -1;
-static int hf_dhcp_docsis_cm_cap_ranging_hold_off_dsg = -1;
+static int hf_dhcp_docsis_cm_cap_ranging_hold_off_cm;
+static int hf_dhcp_docsis_cm_cap_ranging_hold_off_eps;
+static int hf_dhcp_docsis_cm_cap_ranging_hold_off_emta;
+static int hf_dhcp_docsis_cm_cap_ranging_hold_off_dsg;
 
 static const value_string docsis_cm_cap_l2vpn_vals[] = {
 	{ 0x00,	"CM not compliant with DOCSIS L2VPN Section 7 (default)" },
@@ -6201,31 +6201,31 @@ static const value_string docsis_cm_cap_filt_vals[] = {
 	{ 0,		NULL }
 };
 
-static int hf_dhcp_docsis_cm_cap_mpls_stpid = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_svid = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_spcp = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_sdei = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_ctpid = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_cvid = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_cpcp = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_ccfi = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_stci = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_ctci = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_itpid = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_isid = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_itci = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_ipcp = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_idei = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_iuca = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_btpid = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_btci = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_bpcp = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_bdei = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_bvid = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_bda = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_bsa = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_tc = -1;
-static int hf_dhcp_docsis_cm_cap_mpls_label = -1;
+static int hf_dhcp_docsis_cm_cap_mpls_stpid;
+static int hf_dhcp_docsis_cm_cap_mpls_svid;
+static int hf_dhcp_docsis_cm_cap_mpls_spcp;
+static int hf_dhcp_docsis_cm_cap_mpls_sdei;
+static int hf_dhcp_docsis_cm_cap_mpls_ctpid;
+static int hf_dhcp_docsis_cm_cap_mpls_cvid;
+static int hf_dhcp_docsis_cm_cap_mpls_cpcp;
+static int hf_dhcp_docsis_cm_cap_mpls_ccfi;
+static int hf_dhcp_docsis_cm_cap_mpls_stci;
+static int hf_dhcp_docsis_cm_cap_mpls_ctci;
+static int hf_dhcp_docsis_cm_cap_mpls_itpid;
+static int hf_dhcp_docsis_cm_cap_mpls_isid;
+static int hf_dhcp_docsis_cm_cap_mpls_itci;
+static int hf_dhcp_docsis_cm_cap_mpls_ipcp;
+static int hf_dhcp_docsis_cm_cap_mpls_idei;
+static int hf_dhcp_docsis_cm_cap_mpls_iuca;
+static int hf_dhcp_docsis_cm_cap_mpls_btpid;
+static int hf_dhcp_docsis_cm_cap_mpls_btci;
+static int hf_dhcp_docsis_cm_cap_mpls_bpcp;
+static int hf_dhcp_docsis_cm_cap_mpls_bdei;
+static int hf_dhcp_docsis_cm_cap_mpls_bvid;
+static int hf_dhcp_docsis_cm_cap_mpls_bda;
+static int hf_dhcp_docsis_cm_cap_mpls_bsa;
+static int hf_dhcp_docsis_cm_cap_mpls_tc;
+static int hf_dhcp_docsis_cm_cap_mpls_label;
 
 static const value_string docsis_cm_cap_enrgmang_vals[] = {
 	{ 0x00,	"Energy Management 1x1 Feature" },
@@ -6272,12 +6272,12 @@ static const value_string docsis_cm_cap_map_l2vpn_esafe_index_support_vals[] = {
 	{ 0,		NULL }
 };
 
-static int hf_dhcp_docsis_cm_cap_ussymrate_160 = -1;
-static int hf_dhcp_docsis_cm_cap_ussymrate_320 = -1;
-static int hf_dhcp_docsis_cm_cap_ussymrate_640 = -1;
-static int hf_dhcp_docsis_cm_cap_ussymrate_1280 = -1;
-static int hf_dhcp_docsis_cm_cap_ussymrate_2560 = -1;
-static int hf_dhcp_docsis_cm_cap_ussymrate_5120 = -1;
+static int hf_dhcp_docsis_cm_cap_ussymrate_160;
+static int hf_dhcp_docsis_cm_cap_ussymrate_320;
+static int hf_dhcp_docsis_cm_cap_ussymrate_640;
+static int hf_dhcp_docsis_cm_cap_ussymrate_1280;
+static int hf_dhcp_docsis_cm_cap_ussymrate_2560;
+static int hf_dhcp_docsis_cm_cap_ussymrate_5120;
 
 static void
 display_uint_with_range_checking(proto_item *ti, guint8 val_byte, guint16 val_uint16, int min_value, int max_value)
@@ -6886,8 +6886,8 @@ dissect_packetcable_i05_ccc(packet_info *pinfo, proto_item *v_ti, proto_tree *v_
 	return suboptoff;
 }
 
-static int hf_dhcp_ccc_ietf_sec_tkt_pc_provision_server = -1;
-static int hf_dhcp_ccc_ietf_sec_tkt_all_pc_call_management = -1;
+static int hf_dhcp_ccc_ietf_sec_tkt_pc_provision_server;
+static int hf_dhcp_ccc_ietf_sec_tkt_all_pc_call_management;
 
 static int
 dissect_packetcable_ietf_ccc(packet_info *pinfo, proto_item *v_ti, proto_tree *v_tree,
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index 1ca4ac360e..8bab66504e 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -63,258 +63,258 @@ void proto_reg_handoff_dhcpv6(void);
 static gboolean dhcpv6_bulk_leasequery_desegment  = TRUE;
 static gboolean cablelabs_interface_id = FALSE;
 
-static int proto_dhcpv6 = -1;
-static int proto_dhcpv6_bulk_leasequery = -1;
-static int proto_dhcpv6_cablelabs = -1;
-
-static int hf_dhcpv6_msgtype = -1;
-static int hf_clientfqdn_bad_msgtype = -1;
-static int hf_clientfqdn_flags = -1;
-static int hf_clientfqdn_client_n = -1;
-static int hf_clientfqdn_client_s = -1;
-static int hf_clientfqdn_server_n = -1;
-static int hf_clientfqdn_server_o = -1;
-static int hf_clientfqdn_server_s = -1;
-static int hf_option_type_str=-1;
-static int hf_option_type_num = -1;
-static int hf_option_length = -1;
-static int hf_empty_domain_name = -1;
-static int hf_remoteid_enterprise = -1;
-static int hf_vendoropts_enterprise = -1;
-static int hf_duid_bytes = -1;
-static int hf_duid_type = -1;
-static int hf_duidllt_time = -1;
-static int hf_duidllt_link_layer_addr = -1;
-static int hf_duidllt_link_layer_addr_ether = -1;
-static int hf_duidllt_hwtype = -1;
-static int hf_duidll_hwtype = -1;
-static int hf_duiden_enterprise = -1;
-static int hf_duiden_identifier = -1;
-static int hf_duidll_link_layer_addr = -1;
-static int hf_duidll_link_layer_addr_ether = -1;
-static int hf_duiduuid_bytes = -1;
-static int hf_iaid = -1;
-static int hf_iaid_t1 = -1;
-static int hf_iaid_t2 = -1;
-static int hf_iata = -1;
-static int hf_iaaddr_ip = -1;
-static int hf_iaaddr_pref_lifetime = -1;
-static int hf_iaaddr_valid_lifetime = -1;
-static int hf_requested_option_code = -1;
-static int hf_option_preference = -1;
-static int hf_elapsed_time = -1;
-static int hf_auth_protocol = -1;
-static int hf_auth_algorithm = -1;
-static int hf_auth_rdm = -1;
-static int hf_auth_replay_detection = -1;
-static int hf_auth_info = -1;
-static int hf_auth_realm = -1;
-static int hf_auth_key_id = -1;
-static int hf_auth_md5_data = -1;
-static int hf_opt_unicast = -1;
-static int hf_opt_status_code = -1;
-static int hf_opt_status_msg = -1;
-static int hf_vendorclass_enterprise = -1;
-static int hf_vendorclass_data = -1;
-static int hf_vendoropts_enterprise_option_code = -1;
-static int hf_vendoropts_enterprise_option_length = -1;
-static int hf_vendoropts_enterprise_option_data = -1;
-static int hf_interface_id = -1;
-static int hf_reconf_msg = -1;
-static int hf_sip_server_domain_search_fqdn = -1;
-static int hf_sip_server_a = -1;
-static int hf_dns_servers = -1;
-static int hf_domain_search_list_entry = -1;
-static int hf_nis_servers = -1;
-static int hf_nisp_servers = -1;
-static int hf_nis_fqdn = -1;
-static int hf_nisp_fqdn = -1;
-static int hf_sntp_servers = -1;
-static int hf_opt_lifetime = -1;
-static int hf_bcmcs_servers_fqdn = -1;
-static int hf_bcmcs_servers_a = -1;
-static int hf_remoteid_enterprise_id = -1;
-static int hf_subscriber_id = -1;
-static int hf_client_fqdn = -1;
-static int hf_pana_agent = -1;
-static int hf_opt_timezone = -1;
-static int hf_opt_tzdb = -1;
-static int hf_lq_query = -1;
-static int hf_lq_query_link_address = -1;
-static int hf_clt_time = -1;
-static int hf_lq_relay_data_peer_addr = -1;
-static int hf_lq_relay_data_msg = -1;
-static int hf_lq_client_link = -1;
-static int hf_capwap_ac_v6 = -1;
-static int hf_aftr_name = -1;
-static int hf_iaprefix_pref_lifetime = -1;
-static int hf_iaprefix_valid_lifetime = -1;
-static int hf_iaprefix_pref_len = -1;
-static int hf_iaprefix_pref_addr = -1;
-static int hf_mip6_ha = -1;
-static int hf_mip6_hoa = -1;
-static int hf_nai = -1;
-static int hf_pd_exclude_pref_len = -1;
-static int hf_pd_exclude_subnet_id = -1;
-static int hf_option_captive_portal = -1;
-static int hf_option_s46_option_code = -1;
-static int hf_option_failover_binding_status = -1;
-static int hf_option_failover_connect_flags = -1;
-static int hf_option_failover_connect_reserved_flag = -1;
-static int hf_option_failover_connect_f_flag = -1;
-static int hf_option_failover_dns_hostname = -1;
-static int hf_option_failover_dns_zonename = -1;
-static int hf_option_failover_dns_flags = -1;
-static int hf_option_failover_dns_reserved_flag = -1;
-static int hf_option_failover_dns_u_flag = -1;
-static int hf_option_failover_dns_s_flag = -1;
-static int hf_option_failover_dns_r_flag = -1;
-static int hf_option_failover_dns_f_flag = -1;
-static int hf_option_failover_expiration_time = -1;
-static int hf_option_failover_max_unacked_bndupd = -1;
-static int hf_option_failover_mclt = -1;
-static int hf_option_failover_partner_lifetime = -1;
-static int hf_option_failover_partner_lifetime_sent = -1;
-static int hf_option_failover_partner_downtime = -1;
-static int hf_option_failover_partner_raw_clt_time = -1;
-static int hf_option_failover_major_version = -1;
-static int hf_option_failover_minor_version = -1;
-static int hf_option_failover_keepalive_time = -1;
-static int hf_option_failover_reconfigure_time = -1;
-static int hf_option_failover_reconfigure_key = -1;
-static int hf_option_failover_relationship_name = -1;
-static int hf_option_failover_server_flags = -1;
-static int hf_option_failover_server_reserved_flag = -1;
-static int hf_option_failover_server_a_flag = -1;
-static int hf_option_failover_server_s_flag = -1;
-static int hf_option_failover_server_c_flag = -1;
-static int hf_option_failover_server_state = -1;
-static int hf_option_failover_start_time_of_state = -1;
-static int hf_option_failover_state_expiration_time = -1;
-static int hf_option_relay_port = -1;
-static int hf_dhcpv6_hopcount = -1;
-static int hf_dhcpv6_xid = -1;
-static int hf_dhcpv6_peeraddr = -1;
-static int hf_dhcpv6_linkaddr = -1;
-static int hf_opt_mudurl = -1;
-static int hf_option_userclass_length = -1;
-static int hf_option_userclass_opaque_data = -1;
-static int hf_option_ntpserver_type = -1;
-static int hf_option_ntpserver_length = -1;
-static int hf_option_ntpserver_addr = -1;
-static int hf_option_ntpserver_mc_addr = -1;
-static int hf_option_ntpserver_fqdn = -1;
-static int hf_packetcable_ccc_suboption = -1;
-static int hf_packetcable_ccc_pri_dhcp = -1;
-static int hf_packetcable_ccc_sec_dhcp = -1;
-static int hf_packetcable_cccV6_suboption = -1;
-static int hf_packetcable_cccV6_pri_dss = -1;
-static int hf_packetcable_cccV6_sec_dss = -1;
-static int hf_packetcable_cccV6_prov_srv_type = -1;
-static int hf_packetcable_cccV6_prov_srv_fqdn = -1;
-static int hf_packetcable_cccV6_prov_srv_ipv6 = -1;
-static int hf_packetcable_cccV6_as_krb_nominal_timeout = -1;
-static int hf_packetcable_cccV6_as_krb_max_timeout = -1;
-static int hf_packetcable_cccV6_as_krb_max_retry_count = -1;
-static int hf_packetcable_cccV6_ap_krb_nominal_timeout = -1;
-static int hf_packetcable_cccV6_ap_krb_max_timeout = -1;
-static int hf_packetcable_cccV6_ap_krb_max_retry_count = -1;
-static int hf_packetcable_cccV6_krb_realm = -1;
-static int hf_packetcable_cccV6_tgt_flag = -1;
-static int hf_packetcable_cccV6_tgt_flag_fetch = -1;
-static int hf_packetcable_cccV6_prov_timer = -1;
-static int hf_packetcable_cccV6_sec_tcm = -1;
-static int hf_packetcable_cccV6_sec_tcm_provisioning_server = -1;
-static int hf_packetcable_cccV6_sec_tcm_call_manager_server = -1;
-static int hf_cablelabs_opts = -1;
-static int hf_modem_capabilities_encoding_type = -1;
-static int hf_eue_capabilities_encoding_type = -1;
-static int hf_capabilities_encoding_length = -1;
-static int hf_capabilities_encoding_bytes = -1;
-static int hf_capabilities_encoding_number = -1;
-static int hf_cablelabs_ipv6_server = -1;
-static int hf_cablelabs_docsis_version_number = -1;
-static int hf_cablelabs_dpoe_server_version_number = -1;
-static int hf_cablelabs_interface_id = -1;
-static int hf_cablelabs_interface_id_link_address = -1;
-static int hf_option_s46_rule_flags = -1;
-static int hf_option_s46_rule_reserved_flag = -1;
-static int hf_option_s46_rule_fmr_flag = -1;
-static int hf_option_s46_rule_ea_len = -1;
-static int hf_option_s46_rule_ipv4_pref_len = -1;
-static int hf_option_s46_rule_ipv4_prefix = -1;
-static int hf_option_s46_rule_ipv6_pref_len = -1;
-static int hf_option_s46_rule_ipv6_prefix = -1;
-static int hf_option_s46_br_address = -1;
-static int hf_option_s46_dmr_pref_len = -1;
-static int hf_option_s46_dmr_prefix = -1;
-static int hf_option_s46_v4v6bind_ipv4_address = -1;
-static int hf_option_s46_v4v6bind_ipv6_pref_len = -1;
-static int hf_option_s46_v4v6bind_ipv6_prefix = -1;
-static int hf_option_s46_portparam_offset = -1;
-static int hf_option_s46_portparam_psid_len = -1;
-static int hf_option_s46_portparam_psid = -1;
-static int hf_client_link_layer_addr_hwtype = -1;
-static int hf_client_link_layer_addr = -1;
-static int hf_client_link_layer_addr_ether = -1;
-
-static int hf_dhcpv6_non_dns_encoded_name = -1;
-static int hf_dhcpv6_domain_field_len_exceeded = -1;
-static int hf_dhcpv6_decoded_portion = -1;
-static int hf_dhcpv6_encoded_fqdn_len_gt_255 = -1;
-static int hf_dhcpv6_root_only_domain_name = -1;
-static int hf_dhcpv6_tld = -1;
-static int hf_dhcpv6_partial_name_preceded_by_fqdn = -1;
-
-static gint ett_dhcpv6 = -1;
-static gint ett_dhcpv6_option = -1;
-static gint ett_dhcpv6_option_vsoption = -1;
-static gint ett_dhcpv6_vendor_option = -1;
-static gint ett_dhcpv6_pkt_option = -1;
-static gint ett_dhcpv6_userclass_option = -1;
-static gint ett_dhcpv6_netserver_option = -1;
-static gint ett_dhcpv6_tlv5_type = -1;
-static gint ett_dhcpv6_sip_server_domain_search_list_option = -1;
-static gint ett_dhcpv6_dns_domain_search_list_option = -1;
-static gint ett_dhcpv6_nis_domain_name_option = -1;
-static gint ett_dhcpv6_nisp_domain_name_option = -1;
-static gint ett_dhcpv6_bcmcs_servers_domain_search_list_option = -1;
-static gint ett_dhcpv6_s46_rule_flags = -1;
-static gint ett_dhcpv6_failover_connect_flags = -1;
-static gint ett_dhcpv6_failover_dns_flags = -1;
-static gint ett_dhcpv6_failover_server_flags = -1;
-static gint ett_clientfqdn_flags = -1;
-static gint ett_clientfqdn_expert = -1;
+static int proto_dhcpv6;
+static int proto_dhcpv6_bulk_leasequery;
+static int proto_dhcpv6_cablelabs;
+
+static int hf_dhcpv6_msgtype;
+static int hf_clientfqdn_bad_msgtype;
+static int hf_clientfqdn_flags;
+static int hf_clientfqdn_client_n;
+static int hf_clientfqdn_client_s;
+static int hf_clientfqdn_server_n;
+static int hf_clientfqdn_server_o;
+static int hf_clientfqdn_server_s;
+static int hf_option_type_str;
+static int hf_option_type_num;
+static int hf_option_length;
+static int hf_empty_domain_name;
+static int hf_remoteid_enterprise;
+static int hf_vendoropts_enterprise;
+static int hf_duid_bytes;
+static int hf_duid_type;
+static int hf_duidllt_time;
+static int hf_duidllt_link_layer_addr;
+static int hf_duidllt_link_layer_addr_ether;
+static int hf_duidllt_hwtype;
+static int hf_duidll_hwtype;
+static int hf_duiden_enterprise;
+static int hf_duiden_identifier;
+static int hf_duidll_link_layer_addr;
+static int hf_duidll_link_layer_addr_ether;
+static int hf_duiduuid_bytes;
+static int hf_iaid;
+static int hf_iaid_t1;
+static int hf_iaid_t2;
+static int hf_iata;
+static int hf_iaaddr_ip;
+static int hf_iaaddr_pref_lifetime;
+static int hf_iaaddr_valid_lifetime;
+static int hf_requested_option_code;
+static int hf_option_preference;
+static int hf_elapsed_time;
+static int hf_auth_protocol;
+static int hf_auth_algorithm;
+static int hf_auth_rdm;
+static int hf_auth_replay_detection;
+static int hf_auth_info;
+static int hf_auth_realm;
+static int hf_auth_key_id;
+static int hf_auth_md5_data;
+static int hf_opt_unicast;
+static int hf_opt_status_code;
+static int hf_opt_status_msg;
+static int hf_vendorclass_enterprise;
+static int hf_vendorclass_data;
+static int hf_vendoropts_enterprise_option_code;
+static int hf_vendoropts_enterprise_option_length;
+static int hf_vendoropts_enterprise_option_data;
+static int hf_interface_id;
+static int hf_reconf_msg;
+static int hf_sip_server_domain_search_fqdn;
+static int hf_sip_server_a;
+static int hf_dns_servers;
+static int hf_domain_search_list_entry;
+static int hf_nis_servers;
+static int hf_nisp_servers;
+static int hf_nis_fqdn;
+static int hf_nisp_fqdn;
+static int hf_sntp_servers;
+static int hf_opt_lifetime;
+static int hf_bcmcs_servers_fqdn;
+static int hf_bcmcs_servers_a;
+static int hf_remoteid_enterprise_id;
+static int hf_subscriber_id;
+static int hf_client_fqdn;
+static int hf_pana_agent;
+static int hf_opt_timezone;
+static int hf_opt_tzdb;
+static int hf_lq_query;
+static int hf_lq_query_link_address;
+static int hf_clt_time;
+static int hf_lq_relay_data_peer_addr;
+static int hf_lq_relay_data_msg;
+static int hf_lq_client_link;
+static int hf_capwap_ac_v6;
+static int hf_aftr_name;
+static int hf_iaprefix_pref_lifetime;
+static int hf_iaprefix_valid_lifetime;
+static int hf_iaprefix_pref_len;
+static int hf_iaprefix_pref_addr;
+static int hf_mip6_ha;
+static int hf_mip6_hoa;
+static int hf_nai;
+static int hf_pd_exclude_pref_len;
+static int hf_pd_exclude_subnet_id;
+static int hf_option_captive_portal;
+static int hf_option_s46_option_code;
+static int hf_option_failover_binding_status;
+static int hf_option_failover_connect_flags;
+static int hf_option_failover_connect_reserved_flag;
+static int hf_option_failover_connect_f_flag;
+static int hf_option_failover_dns_hostname;
+static int hf_option_failover_dns_zonename;
+static int hf_option_failover_dns_flags;
+static int hf_option_failover_dns_reserved_flag;
+static int hf_option_failover_dns_u_flag;
+static int hf_option_failover_dns_s_flag;
+static int hf_option_failover_dns_r_flag;
+static int hf_option_failover_dns_f_flag;
+static int hf_option_failover_expiration_time;
+static int hf_option_failover_max_unacked_bndupd;
+static int hf_option_failover_mclt;
+static int hf_option_failover_partner_lifetime;
+static int hf_option_failover_partner_lifetime_sent;
+static int hf_option_failover_partner_downtime;
+static int hf_option_failover_partner_raw_clt_time;
+static int hf_option_failover_major_version;
+static int hf_option_failover_minor_version;
+static int hf_option_failover_keepalive_time;
+static int hf_option_failover_reconfigure_time;
+static int hf_option_failover_reconfigure_key;
+static int hf_option_failover_relationship_name;
+static int hf_option_failover_server_flags;
+static int hf_option_failover_server_reserved_flag;
+static int hf_option_failover_server_a_flag;
+static int hf_option_failover_server_s_flag;
+static int hf_option_failover_server_c_flag;
+static int hf_option_failover_server_state;
+static int hf_option_failover_start_time_of_state;
+static int hf_option_failover_state_expiration_time;
+static int hf_option_relay_port;
+static int hf_dhcpv6_hopcount;
+static int hf_dhcpv6_xid;
+static int hf_dhcpv6_peeraddr;
+static int hf_dhcpv6_linkaddr;
+static int hf_opt_mudurl;
+static int hf_option_userclass_length;
+static int hf_option_userclass_opaque_data;
+static int hf_option_ntpserver_type;
+static int hf_option_ntpserver_length;
+static int hf_option_ntpserver_addr;
+static int hf_option_ntpserver_mc_addr;
+static int hf_option_ntpserver_fqdn;
+static int hf_packetcable_ccc_suboption;
+static int hf_packetcable_ccc_pri_dhcp;
+static int hf_packetcable_ccc_sec_dhcp;
+static int hf_packetcable_cccV6_suboption;
+static int hf_packetcable_cccV6_pri_dss;
+static int hf_packetcable_cccV6_sec_dss;
+static int hf_packetcable_cccV6_prov_srv_type;
+static int hf_packetcable_cccV6_prov_srv_fqdn;
+static int hf_packetcable_cccV6_prov_srv_ipv6;
+static int hf_packetcable_cccV6_as_krb_nominal_timeout;
+static int hf_packetcable_cccV6_as_krb_max_timeout;
+static int hf_packetcable_cccV6_as_krb_max_retry_count;
+static int hf_packetcable_cccV6_ap_krb_nominal_timeout;
+static int hf_packetcable_cccV6_ap_krb_max_timeout;
+static int hf_packetcable_cccV6_ap_krb_max_retry_count;
+static int hf_packetcable_cccV6_krb_realm;
+static int hf_packetcable_cccV6_tgt_flag;
+static int hf_packetcable_cccV6_tgt_flag_fetch;
+static int hf_packetcable_cccV6_prov_timer;
+static int hf_packetcable_cccV6_sec_tcm;
+static int hf_packetcable_cccV6_sec_tcm_provisioning_server;
+static int hf_packetcable_cccV6_sec_tcm_call_manager_server;
+static int hf_cablelabs_opts;
+static int hf_modem_capabilities_encoding_type;
+static int hf_eue_capabilities_encoding_type;
+static int hf_capabilities_encoding_length;
+static int hf_capabilities_encoding_bytes;
+static int hf_capabilities_encoding_number;
+static int hf_cablelabs_ipv6_server;
+static int hf_cablelabs_docsis_version_number;
+static int hf_cablelabs_dpoe_server_version_number;
+static int hf_cablelabs_interface_id;
+static int hf_cablelabs_interface_id_link_address;
+static int hf_option_s46_rule_flags;
+static int hf_option_s46_rule_reserved_flag;
+static int hf_option_s46_rule_fmr_flag;
+static int hf_option_s46_rule_ea_len;
+static int hf_option_s46_rule_ipv4_pref_len;
+static int hf_option_s46_rule_ipv4_prefix;
+static int hf_option_s46_rule_ipv6_pref_len;
+static int hf_option_s46_rule_ipv6_prefix;
+static int hf_option_s46_br_address;
+static int hf_option_s46_dmr_pref_len;
+static int hf_option_s46_dmr_prefix;
+static int hf_option_s46_v4v6bind_ipv4_address;
+static int hf_option_s46_v4v6bind_ipv6_pref_len;
+static int hf_option_s46_v4v6bind_ipv6_prefix;
+static int hf_option_s46_portparam_offset;
+static int hf_option_s46_portparam_psid_len;
+static int hf_option_s46_portparam_psid;
+static int hf_client_link_layer_addr_hwtype;
+static int hf_client_link_layer_addr;
+static int hf_client_link_layer_addr_ether;
+
+static int hf_dhcpv6_non_dns_encoded_name;
+static int hf_dhcpv6_domain_field_len_exceeded;
+static int hf_dhcpv6_decoded_portion;
+static int hf_dhcpv6_encoded_fqdn_len_gt_255;
+static int hf_dhcpv6_root_only_domain_name;
+static int hf_dhcpv6_tld;
+static int hf_dhcpv6_partial_name_preceded_by_fqdn;
+
+static gint ett_dhcpv6;
+static gint ett_dhcpv6_option;
+static gint ett_dhcpv6_option_vsoption;
+static gint ett_dhcpv6_vendor_option;
+static gint ett_dhcpv6_pkt_option;
+static gint ett_dhcpv6_userclass_option;
+static gint ett_dhcpv6_netserver_option;
+static gint ett_dhcpv6_tlv5_type;
+static gint ett_dhcpv6_sip_server_domain_search_list_option;
+static gint ett_dhcpv6_dns_domain_search_list_option;
+static gint ett_dhcpv6_nis_domain_name_option;
+static gint ett_dhcpv6_nisp_domain_name_option;
+static gint ett_dhcpv6_bcmcs_servers_domain_search_list_option;
+static gint ett_dhcpv6_s46_rule_flags;
+static gint ett_dhcpv6_failover_connect_flags;
+static gint ett_dhcpv6_failover_dns_flags;
+static gint ett_dhcpv6_failover_server_flags;
+static gint ett_clientfqdn_flags;
+static gint ett_clientfqdn_expert;
 
 /* Expert fields relating to domain names */
-static expert_field ei_dhcpv6_non_dns_encoded_name=EI_INIT;
-static expert_field ei_dhcpv6_domain_field_len_exceeded=EI_INIT;
-static expert_field ei_dhcpv6_encoded_fqdn_len_gt_255=EI_INIT;
-static expert_field ei_dhcpv6_root_only_domain_name=EI_INIT;
-static expert_field ei_dhcpv6_tld_lookup=EI_INIT;
-static expert_field ei_dhcpv6_partial_name_preceded_by_fqdn=EI_INIT;
+static expert_field ei_dhcpv6_non_dns_encoded_name;
+static expert_field ei_dhcpv6_domain_field_len_exceeded;
+static expert_field ei_dhcpv6_encoded_fqdn_len_gt_255;
+static expert_field ei_dhcpv6_root_only_domain_name;
+static expert_field ei_dhcpv6_tld_lookup;
+static expert_field ei_dhcpv6_partial_name_preceded_by_fqdn;
 /*
  * Expert fields triggered in dhcpv6_option() and others */
-static expert_field ei_dhcpv6_bogus_length = EI_INIT;
-static expert_field ei_dhcpv6_malformed_option = EI_INIT;
-static expert_field ei_dhcpv6_no_suboption_len = EI_INIT;
-static expert_field ei_dhcpv6_invalid_time_value = EI_INIT;
-static expert_field ei_dhcpv6_invalid_type = EI_INIT;
-static expert_field ei_dhcpv6_error_hopcount = EI_INIT;
-static expert_field ei_dhcpv6_clientfqdn_bad_msgtype=EI_INIT;
-static expert_field ei_dhcpv6_s_bit_should_be_zero=EI_INIT;
-
-
-static int hf_dhcpv6_bulk_leasequery_size = -1;
-static int hf_dhcpv6_bulk_leasequery_msgtype = -1;
-static int hf_dhcpv6_bulk_leasequery_reserved = -1;
-static int hf_dhcpv6_bulk_leasequery_trans_id = -1;
-
-static gint ett_dhcpv6_bulk_leasequery = -1;
-static gint ett_dhcpv6_bulk_leasequery_options = -1;
-
-static expert_field ei_dhcpv6_bulk_leasequery_bad_query_type = EI_INIT;
-static expert_field ei_dhcpv6_bulk_leasequery_bad_msg_type = EI_INIT;
+static expert_field ei_dhcpv6_bogus_length;
+static expert_field ei_dhcpv6_malformed_option;
+static expert_field ei_dhcpv6_no_suboption_len;
+static expert_field ei_dhcpv6_invalid_time_value;
+static expert_field ei_dhcpv6_invalid_type;
+static expert_field ei_dhcpv6_error_hopcount;
+static expert_field ei_dhcpv6_clientfqdn_bad_msgtype;
+static expert_field ei_dhcpv6_s_bit_should_be_zero;
+
+
+static int hf_dhcpv6_bulk_leasequery_size;
+static int hf_dhcpv6_bulk_leasequery_msgtype;
+static int hf_dhcpv6_bulk_leasequery_reserved;
+static int hf_dhcpv6_bulk_leasequery_trans_id;
+
+static gint ett_dhcpv6_bulk_leasequery;
+static gint ett_dhcpv6_bulk_leasequery_options;
+
+static expert_field ei_dhcpv6_bulk_leasequery_bad_query_type;
+static expert_field ei_dhcpv6_bulk_leasequery_bad_msg_type;
 
 static dissector_handle_t dhcpv6_handle;
 static dissector_handle_t dhcpv6_cablelabs_handle;
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index 3d987b305d..35a06bd749 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -222,89 +222,89 @@ static const value_string diameter_avp_data_addrfamily_vals[]= {
 };
 static value_string_ext diameter_avp_data_addrfamily_vals_ext = VALUE_STRING_EXT_INIT(diameter_avp_data_addrfamily_vals);
 
-static int proto_diameter = -1;
-static int hf_diameter_length = -1;
-static int hf_diameter_code = -1;
-static int hf_diameter_hopbyhopid =-1;
-static int hf_diameter_endtoendid =-1;
-static int hf_diameter_version = -1;
-static int hf_diameter_vendor_id = -1;
-static int hf_diameter_application_id = -1;
-static int hf_diameter_flags = -1;
-static int hf_diameter_flags_request = -1;
-static int hf_diameter_flags_proxyable = -1;
-static int hf_diameter_flags_error = -1;
-static int hf_diameter_flags_T		= -1;
-static int hf_diameter_flags_reserved4 = -1;
-static int hf_diameter_flags_reserved5 = -1;
-static int hf_diameter_flags_reserved6 = -1;
-static int hf_diameter_flags_reserved7 = -1;
-
-static int hf_diameter_avp = -1;
-static int hf_diameter_avp_len = -1;
-static int hf_diameter_avp_code = -1;
-static int hf_diameter_avp_flags = -1;
-static int hf_diameter_avp_flags_vendor_specific = -1;
-static int hf_diameter_avp_flags_mandatory = -1;
-static int hf_diameter_avp_flags_protected = -1;
-static int hf_diameter_avp_flags_reserved3 = -1;
-static int hf_diameter_avp_flags_reserved4 = -1;
-static int hf_diameter_avp_flags_reserved5 = -1;
-static int hf_diameter_avp_flags_reserved6 = -1;
-static int hf_diameter_avp_flags_reserved7 = -1;
-static int hf_diameter_avp_vendor_id = -1;
-static int hf_diameter_avp_data_wrong_length = -1;
-static int hf_diameter_avp_pad = -1;
-
-static int hf_diameter_answer_in = -1;
-static int hf_diameter_answer_to = -1;
-static int hf_diameter_answer_time = -1;
+static int proto_diameter;
+static int hf_diameter_length;
+static int hf_diameter_code;
+static int hf_diameter_hopbyhopid;
+static int hf_diameter_endtoendid;
+static int hf_diameter_version;
+static int hf_diameter_vendor_id;
+static int hf_diameter_application_id;
+static int hf_diameter_flags;
+static int hf_diameter_flags_request;
+static int hf_diameter_flags_proxyable;
+static int hf_diameter_flags_error;
+static int hf_diameter_flags_T;
+static int hf_diameter_flags_reserved4;
+static int hf_diameter_flags_reserved5;
+static int hf_diameter_flags_reserved6;
+static int hf_diameter_flags_reserved7;
+
+static int hf_diameter_avp;
+static int hf_diameter_avp_len;
+static int hf_diameter_avp_code;
+static int hf_diameter_avp_flags;
+static int hf_diameter_avp_flags_vendor_specific;
+static int hf_diameter_avp_flags_mandatory;
+static int hf_diameter_avp_flags_protected;
+static int hf_diameter_avp_flags_reserved3;
+static int hf_diameter_avp_flags_reserved4;
+static int hf_diameter_avp_flags_reserved5;
+static int hf_diameter_avp_flags_reserved6;
+static int hf_diameter_avp_flags_reserved7;
+static int hf_diameter_avp_vendor_id;
+static int hf_diameter_avp_data_wrong_length;
+static int hf_diameter_avp_pad;
+
+static int hf_diameter_answer_in;
+static int hf_diameter_answer_to;
+static int hf_diameter_answer_time;
 
 /* AVPs with special/extra decoding */
-static int hf_framed_ipv6_prefix_reserved = -1;
-static int hf_framed_ipv6_prefix_length = -1;
-static int hf_framed_ipv6_prefix_bytes = -1;
-static int hf_framed_ipv6_prefix_ipv6 = -1;
-static int hf_diameter_3gpp2_exp_res = -1;
-static int hf_diameter_other_vendor_exp_res = -1;
-static int hf_diameter_mip6_feature_vector = -1;
-static int hf_diameter_mip6_feature_vector_mip6_integrated = -1;
-static int hf_diameter_mip6_feature_vector_local_home_agent_assignment = -1;
-static int hf_diameter_mip6_feature_vector_pmip6_supported = -1;
-static int hf_diameter_mip6_feature_vector_ip4_hoa_supported = -1;
-static int hf_diameter_mip6_feature_vector_local_mag_routing_supported = -1;
-static int hf_diameter_3gpp_mip6_feature_vector = -1;
-static int hf_diameter_3gpp_mip6_feature_vector_assign_local_ip = -1;
-static int hf_diameter_3gpp_mip6_feature_vector_mip4_supported = -1;
-static int hf_diameter_3gpp_mip6_feature_vector_optimized_idle_mode_mobility = -1;
-static int hf_diameter_3gpp_mip6_feature_vector_gtpv2_supported = -1;
-static int hf_diameter_user_equipment_info_imeisv = -1;
-static int hf_diameter_user_equipment_info_mac = -1;
-static int hf_diameter_user_equipment_info_eui64 = -1;
-static int hf_diameter_user_equipment_info_modified_eui64 = -1;
-
-static gint ett_diameter = -1;
-static gint ett_diameter_flags = -1;
-static gint ett_diameter_avp_flags = -1;
-static gint ett_diameter_avpinfo = -1;
-static gint ett_unknown = -1;
-static gint ett_diameter_mip6_feature_vector = -1;
-static gint ett_diameter_3gpp_mip6_feature_vector = -1;
-
-static expert_field ei_diameter_reserved_bit_set = EI_INIT;
-static expert_field ei_diameter_avp_len = EI_INIT;
-static expert_field ei_diameter_avp_no_data = EI_INIT;
-static expert_field ei_diameter_application_id = EI_INIT;
-static expert_field ei_diameter_version = EI_INIT;
-static expert_field ei_diameter_avp_pad = EI_INIT;
-static expert_field ei_diameter_avp_pad_missing = EI_INIT;
-static expert_field ei_diameter_code = EI_INIT;
-static expert_field ei_diameter_avp_code = EI_INIT;
-static expert_field ei_diameter_avp_vendor_id = EI_INIT;
-static expert_field ei_diameter_invalid_ipv6_prefix_len = EI_INIT;
-static expert_field ei_diameter_invalid_avp_len = EI_INIT;
-static expert_field ei_diameter_invalid_user_equipment_info_value_len = EI_INIT;
-static expert_field ei_diameter_unexpected_imei_as_user_equipment_info = EI_INIT;
+static int hf_framed_ipv6_prefix_reserved;
+static int hf_framed_ipv6_prefix_length;
+static int hf_framed_ipv6_prefix_bytes;
+static int hf_framed_ipv6_prefix_ipv6;
+static int hf_diameter_3gpp2_exp_res;
+static int hf_diameter_other_vendor_exp_res;
+static int hf_diameter_mip6_feature_vector;
+static int hf_diameter_mip6_feature_vector_mip6_integrated;
+static int hf_diameter_mip6_feature_vector_local_home_agent_assignment;
+static int hf_diameter_mip6_feature_vector_pmip6_supported;
+static int hf_diameter_mip6_feature_vector_ip4_hoa_supported;
+static int hf_diameter_mip6_feature_vector_local_mag_routing_supported;
+static int hf_diameter_3gpp_mip6_feature_vector;
+static int hf_diameter_3gpp_mip6_feature_vector_assign_local_ip;
+static int hf_diameter_3gpp_mip6_feature_vector_mip4_supported;
+static int hf_diameter_3gpp_mip6_feature_vector_optimized_idle_mode_mobility;
+static int hf_diameter_3gpp_mip6_feature_vector_gtpv2_supported;
+static int hf_diameter_user_equipment_info_imeisv;
+static int hf_diameter_user_equipment_info_mac;
+static int hf_diameter_user_equipment_info_eui64;
+static int hf_diameter_user_equipment_info_modified_eui64;
+
+static gint ett_diameter;
+static gint ett_diameter_flags;
+static gint ett_diameter_avp_flags;
+static gint ett_diameter_avpinfo;
+static gint ett_unknown;
+static gint ett_diameter_mip6_feature_vector;
+static gint ett_diameter_3gpp_mip6_feature_vector;
+
+static expert_field ei_diameter_reserved_bit_set;
+static expert_field ei_diameter_avp_len;
+static expert_field ei_diameter_avp_no_data;
+static expert_field ei_diameter_application_id;
+static expert_field ei_diameter_version;
+static expert_field ei_diameter_avp_pad;
+static expert_field ei_diameter_avp_pad_missing;
+static expert_field ei_diameter_code;
+static expert_field ei_diameter_avp_code;
+static expert_field ei_diameter_avp_vendor_id;
+static expert_field ei_diameter_invalid_ipv6_prefix_len;
+static expert_field ei_diameter_invalid_avp_len;
+static expert_field ei_diameter_invalid_user_equipment_info_value_len;
+static expert_field ei_diameter_unexpected_imei_as_user_equipment_info;
 
 /* Tap for Diameter */
 static int diameter_tap = -1;
diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c
index 9cf477fcf9..9d7d36688f 100644
--- a/epan/dissectors/packet-diameter_3gpp.c
+++ b/epan/dissectors/packet-diameter_3gpp.c
@@ -33,572 +33,572 @@
 void proto_register_diameter_3gpp(void);
 void proto_reg_handoff_diameter_3gpp(void);
 
-static expert_field ei_diameter_3gpp_plmn_id_wrong_len = EI_INIT;
+static expert_field ei_diameter_3gpp_plmn_id_wrong_len;
 
 /* Initialize the protocol and registered fields */
-static int proto_diameter_3gpp          = -1;
-
-static int hf_diameter_3gpp_timezone = -1;
-static int hf_diameter_3gpp_timezone_adjustment = -1;
-static int hf_diameter_3gpp_rat_type = -1;
-static int hf_diameter_3gpp_path = -1;
-static int hf_diameter_3gpp_contact = -1;
-/* static int hf_diameter_3gpp_user_data = -1; */
-static int hf_diameter_3gpp_ipaddr = -1;
-static int hf_diameter_3gpp_mbms_required_qos_prio = -1;
-static int hf_diameter_3gpp_tmgi = -1;
-static int hf_diameter_3gpp_req_nodes = -1;
-static int hf_diameter_3gpp_req_nodes_bit0 = -1;
-static int hf_diameter_3gpp_req_nodes_bit1 = -1;
-static int hf_diameter_3gpp_req_nodes_bit2 = -1;
-static int hf_diameter_3gpp_req_nodes_bit3 = -1;
-static int hf_diameter_mbms_service_id = -1;
-static int hf_diameter_3gpp_spare_bits = -1;
-static int hf_diameter_3gpp_uar_flags_flags = -1;
-static int hf_diameter_3gpp_uar_flags_flags_bit0 = -1;
-static int hf_diameter_3gpp_feature_list_flags = -1;
-static int hf_diameter_3gpp_cx_feature_list_flags = -1;
-static int hf_diameter_3gpp_cx_feature_list_1_flags_bit0 = -1;
-static int hf_diameter_3gpp_cx_feature_list_1_flags_bit1 = -1;
-static int hf_diameter_3gpp_cx_feature_list_1_flags_bit2 = -1;
-static int hf_diameter_3gpp_cx_feature_list_1_flags_bit3 = -1;
-static int hf_diameter_3gpp_cx_feature_list_1_flags_spare_bits = -1;
-static int hf_diameter_3gpp_feature_list1_sh_flags_bit0 = -1;
-static int hf_diameter_3gpp_feature_list1_sh_flags_bit1 = -1;
-static int hf_diameter_3gpp_feature_list1_sh_flags_bit2 = -1;
-static int hf_diameter_3gpp_feature_list1_sh_flags_bit3 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit0 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit1 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit2 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit3 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit4 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit5 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit6 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit7 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit8 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit9 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit10 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit11 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit12 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit13 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit14 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit15 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit16 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit17 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit18 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit19 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit20 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit21 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit22 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit23 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit24 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit25 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit26 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit27 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit28 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit29 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit30 = -1;
-static int hf_diameter_3gpp_feature_list1_s6a_flags_bit31 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit0 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit1 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit2 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit3 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit4 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit5 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit6 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit7 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit8 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit9 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit10 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit11 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit12 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit13 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit14 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit15 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit16 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit17 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit18 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit19 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit20 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit21 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit22 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit23 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit24 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit25 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit26 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit27 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit28 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit29 = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_bit30 = -1;
-static int hf_diameter_3gpp_feature_list_gx_flags = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit0 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit1 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit2 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit3 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit4 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit5 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit6 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit7 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit8 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit9 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit10 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit11 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit12 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit13 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit14 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit15 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit16 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit17 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit18 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit19 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit20 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit21 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit22 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit23 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit24 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit25 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit26 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit27 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit28 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit29 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit30 = -1;
-static int hf_diameter_3gpp_feature_list1_gx_flags_bit31 = -1;
-static int hf_diameter_3gpp_feature_list2_gx_flags_bit0 = -1;
-static int hf_diameter_3gpp_feature_list2_gx_flags_bit1 = -1;
-static int hf_diameter_3gpp_feature_list2_gx_flags_bit2 = -1;
-static int hf_diameter_3gpp_feature_list2_gx_flags_bit3 = -1;
-static int hf_diameter_3gpp_feature_list2_gx_flags_bit4 = -1;
-static int hf_diameter_3gpp_feature_list2_gx_flags_bit5 = -1;
-static int hf_diameter_3gpp_feature_list2_gx_flags_bit6 = -1;
-static int hf_diameter_3gpp_feature_list2_gx_flags_bit7 = -1;
-static int hf_diameter_3gpp_feature_list_sd_flags = -1;
-static int hf_diameter_3gpp_feature_list_sd_flags_bit0 = -1;
-static int hf_diameter_3gpp_feature_list_sd_flags_bit1 = -1;
-static int hf_diameter_3gpp_feature_list_sd_flags_bit2 = -1;
-static int hf_diameter_3gpp_feature_list_sd_flags_bit3 = -1;
-static int hf_diameter_3gpp_feature_list_sd_flags_bit4 = -1;
-static int hf_diameter_3gpp_feature_list_sd_flags_bit5 = -1;
-static int hf_diameter_3gpp_feature_list_sd_flags_bit6 = -1;
-static int hf_diameter_3gpp_feature_list_sd_flags_bit7 = -1;
-static int hf_diameter_3gpp_feature_list_sd_flags_bit8 = -1;
-static int hf_diameter_3gpp_feature_list_sd_flags_bit9 = -1;
-static int hf_diameter_3gpp_feature_list_sd_flags_bit10 = -1;
-static int hf_diameter_3gpp_feature_list_sd_flags_spare_bits = -1;
-static int hf_diameter_3gpp_cms_no_gyn_session_serv_not_allowed = -1;
-static int hf_diameter_3gpp_cms_no_gyn_session_serv_allowed = -1;
-static int hf_diameter_3gpp_cms_rating_failed = -1;
-static int hf_diameter_3gpp_cms_user_unknown = -1;
-static int hf_diameter_3gpp_cms_auth_rej = -1;
-static int hf_diameter_3gpp_cms_credit_ctrl_not_applicable = -1;
-static int hf_diameter_3gpp_cms_end_user_serv_status = -1;
-static int hf_diameter_3gpp_qos_subscribed = -1;
-static int hf_diameter_3gpp_qos_reliability_cls = -1;
-static int hf_diameter_3gpp_qos_prec_class = -1;
-static int hf_diameter_3gpp_qos_delay_cls = -1;
-static int hf_diameter_3gpp_qos_peak_thr = -1;
-static int hf_diameter_3gpp_qos_mean_thr = -1;
-static int hf_diameter_3gpp_qos_al_ret_priority = -1;
-static int hf_diameter_3gpp_qos_del_of_err_sdu = -1;
-static int hf_diameter_3gpp_qos_del_order = -1;
-static int hf_diameter_3gpp_qos_traffic_cls = -1;
-static int hf_diameter_3gpp_qos_maximum_sdu_size = -1;
-static int hf_diameter_3gpp_qos_max_bitrate_upl = -1;
-static int hf_diameter_3gpp_qos_max_bitrate_downl = -1;
-static int hf_diameter_3gpp_qos_sdu_err_rat = -1;
-static int hf_diameter_3gpp_qos_ber = -1;
-static int hf_diameter_3gpp_qos_traff_hdl_pri = -1;
-static int hf_diameter_3gpp_qos_trans_delay = -1;
-static int hf_diameter_3gpp_qos_guar_bitrate_upl = -1;
-static int hf_diameter_3gpp_qos_guar_bitrate_downl = -1;
-static int hf_diameter_3gpp_qos_source_stat_desc = -1;
-static int hf_diameter_3gpp_qos_signalling_ind  = -1;
-static int hf_diameter_3gpp_qos_max_bitrate_downl_ext = -1;
-static int hf_diameter_3gpp_qos_guar_bitrate_downl_ext = -1;
-static int hf_diameter_3gpp_qos_max_bitrate_upl_ext = -1;
-static int hf_diameter_3gpp_qos_guar_bitrate_upl_ext = -1;
-static int hf_diameter_3gpp_qos_pre_emption_vulnerability = -1;
-static int hf_diameter_3gpp_qos_priority_level = -1;
-static int hf_diameter_3gpp_qos_pre_emption_capability = -1;
-static int hf_diameter_3gpp_ulr_flags = -1;
-static int hf_diameter_3gpp_ulr_flags_bit0 = -1;
-static int hf_diameter_3gpp_ulr_flags_bit1 = -1;
-static int hf_diameter_3gpp_ulr_flags_bit2 = -1;
-static int hf_diameter_3gpp_ulr_flags_bit3 = -1;
-static int hf_diameter_3gpp_ulr_flags_bit4 = -1;
-static int hf_diameter_3gpp_ulr_flags_bit5 = -1;
-static int hf_diameter_3gpp_ulr_flags_bit6 = -1;
-static int hf_diameter_3gpp_ulr_flags_bit7 = -1;
-static int hf_diameter_3gpp_ulr_flags_bit8 = -1;
-static int hf_diameter_3gpp_ula_flags = -1;
-static int hf_diameter_3gpp_ula_flags_bit0 = -1;
-static int hf_diameter_3gpp_ula_flags_bit1 = -1;
-static int hf_diameter_3gpp_dsr_flags = -1;
-static int hf_diameter_3gpp_dsr_flags_bit0 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit1 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit2 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit3 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit4 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit5 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit6 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit7 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit8 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit9 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit10 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit11 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit12 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit13 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit14 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit15 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit16 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit17 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit18 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit19 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit20 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit21 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit22 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit23 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit24 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit25 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit26 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit27 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit28 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit29 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit30 = -1;
-static int hf_diameter_3gpp_dsr_flags_bit31 = -1;
-static int hf_diameter_3gpp_dsa_flags = -1;
-static int hf_diameter_3gpp_dsa_flags_bit0 = -1;
-static int hf_diameter_3gpp_ida_flags = -1;
-static int hf_diameter_3gpp_ida_flags_bit0 = -1;
-static int hf_diameter_3gpp_pua_flags = -1;
-static int hf_diameter_3gpp_pua_flags_bit0 = -1;
-static int hf_diameter_3gpp_pua_flags_bit1 = -1;
-static int hf_diameter_3gpp_nor_flags = -1;
-static int hf_diameter_3gpp_nor_flags_bit0 = -1;
-static int hf_diameter_3gpp_nor_flags_bit1 = -1;
-static int hf_diameter_3gpp_nor_flags_bit2 = -1;
-static int hf_diameter_3gpp_nor_flags_bit3 = -1;
-static int hf_diameter_3gpp_nor_flags_bit4 = -1;
-static int hf_diameter_3gpp_nor_flags_bit5 = -1;
-static int hf_diameter_3gpp_nor_flags_bit6 = -1;
-static int hf_diameter_3gpp_nor_flags_bit7 = -1;
-static int hf_diameter_3gpp_nor_flags_bit8 = -1;
-static int hf_diameter_3gpp_nor_flags_bit9 = -1;
-static int hf_diameter_3gpp_idr_flags = -1;
-static int hf_diameter_3gpp_idr_flags_bit0 = -1;
-static int hf_diameter_3gpp_idr_flags_bit1 = -1;
-static int hf_diameter_3gpp_idr_flags_bit2 = -1;
-static int hf_diameter_3gpp_idr_flags_bit3 = -1;
-static int hf_diameter_3gpp_idr_flags_bit4 = -1;
-static int hf_diameter_3gpp_idr_flags_bit5 = -1;
-static int hf_diameter_3gpp_idr_flags_bit6 = -1;
-static int hf_diameter_3gpp_idr_flags_bit7 = -1;
-static int hf_diameter_3gpp_idr_flags_bit8 = -1;
-static int hf_diameter_3gpp_ppr_flags = -1;
-static int hf_diameter_3gpp_ppr_flags_bit0 = -1;
-static int hf_diameter_3gpp_ppr_flags_bit1 = -1;
-static int hf_diameter_3gpp_ppr_flags_bit2 = -1;
-static int hf_diameter_3gpp_ppr_flags_bit3 = -1;
-static int hf_diameter_3gpp_aaa_fail_flags = -1;
-static int hf_diameter_3gpp_aaa_fail_flags_bit0 = -1;
-static int hf_diameter_3gpp_der_flags = -1;
-static int hf_diameter_3gpp_der_flags_bit0 = -1;
-static int hf_diameter_3gpp_der_flags_bit1 = -1;
-static int hf_diameter_3gpp_dea_flags = -1;
-static int hf_diameter_3gpp_dea_flags_bit0 = -1;
-static int hf_diameter_3gpp_dea_flags_bit1 = -1;
-static int hf_diameter_3gpp_rar_flags = -1;
-static int hf_diameter_3gpp_rar_flags_bit0 = -1;
-static int hf_diameter_3gpp_rar_flags_bit1 = -1;
-static int hf_diameter_3gpp_der_s6b_flags = -1;
-static int hf_diameter_3gpp_der_s6b_flags_bit0 = -1;
-static int hf_diameter_3gpp_ipv6addr = -1;
-static int hf_diameter_3gpp_mbms_abs_time_ofmbms_data_tfer = -1;
-static int hf_diameter_3gpp_udp_port = -1;
-static int hf_diameter_3gpp_codec_data_dir = -1;
-static int hf_diameter_3gpp_codec_sdp_type = -1;
-static int hf_diameter_3gpp_af_requested_data_flags = -1;
-static int hf_diameter_3gpp_af_requested_data_flags_bit0 = -1;
-static int hf_diameter_3gpp_mbms_bearer_event = -1;
-static int hf_diameter_3gpp_mbms_bearer_event_bit0 = -1;
-static int hf_diameter_3gpp_mbms_bearer_event_bit1 = -1;
-static int hf_diameter_3gpp_mbms_bearer_event_bit2 = -1;
-static int hf_diameter_3gpp_mbms_bearer_result = -1;
-static int hf_diameter_3gpp_mbms_bearer_result_bit0 = -1;
-static int hf_diameter_3gpp_mbms_bearer_result_bit1 = -1;
-static int hf_diameter_3gpp_mbms_bearer_result_bit2 = -1;
-static int hf_diameter_3gpp_mbms_bearer_result_bit3 = -1;
-static int hf_diameter_3gpp_mbms_bearer_result_bit4 = -1;
-static int hf_diameter_3gpp_mbms_bearer_result_bit5 = -1;
-static int hf_diameter_3gpp_mbms_bearer_result_bit6 = -1;
-static int hf_diameter_3gpp_mbms_bearer_result_bit7 = -1;
-static int hf_diameter_3gpp_mbms_bearer_result_bit8 = -1;
-static int hf_diameter_3gpp_mbms_bearer_result_bit9 = -1;
-static int hf_diameter_3gpp_mbms_bearer_result_bit10 = -1;
-static int hf_diameter_3gpp_mbms_bearer_result_bit11 = -1;
-static int hf_diameter_3gpp_tmgi_allocation_result = -1;
-static int hf_diameter_3gpp_tmgi_allocation_result_bit0 = -1;
-static int hf_diameter_3gpp_tmgi_allocation_result_bit1 = -1;
-static int hf_diameter_3gpp_tmgi_allocation_result_bit2 = -1;
-static int hf_diameter_3gpp_tmgi_allocation_result_bit3 = -1;
-static int hf_diameter_3gpp_tmgi_allocation_result_bit4 = -1;
-static int hf_diameter_3gpp_tmgi_deallocation_result = -1;
-static int hf_diameter_3gpp_tmgi_deallocation_result_bit0 = -1;
-static int hf_diameter_3gpp_tmgi_deallocation_result_bit1 = -1;
-static int hf_diameter_3gpp_tmgi_deallocation_result_bit2 = -1;
-static int hf_diameter_3gpp_sar_flags = -1;
-static int hf_diameter_3gpp_sar_flags_flags_bit0 = -1;
-static int hf_diameter_3gpp_emergency_services_flags = -1;
-static int hf_diameter_3gpp_emergency_services_flags_bit0 = -1;
-static int hf_diameter_3gpp_pur_flags = -1;
-static int hf_diameter_3gpp_pur_flags_spare_bits = -1;
-static int hf_diameter_3gpp_pur_flags_bit1 = -1;
-static int hf_diameter_3gpp_pur_flags_bit0 = -1;
-static int hf_diameter_3gpp_clr_flags = -1;
-static int hf_diameter_3gpp_clr_flags_spare_bits = -1;
-static int hf_diameter_3gpp_clr_flags_bit1 = -1;
-static int hf_diameter_3gpp_clr_flags_bit0 = -1;
-static int hf_diameter_3gpp_uvr_flags = -1;
-static int hf_diameter_3gpp_uvr_flags_spare_bits = -1;
-static int hf_diameter_3gpp_uvr_flags_bit0 = -1;
-static int hf_diameter_3gpp_uva_flags = -1;
-static int hf_diameter_3gpp_uva_flags_spare_bits = -1;
-static int hf_diameter_3gpp_uva_flags_bit0 = -1;
-static int hf_diameter_3gpp_subscription_data_flags = -1;
-static int hf_diameter_3gpp_subscription_data_flags_spare_bits = -1;
-static int hf_diameter_3gpp_subscription_data_flags_bit3 = -1;
-static int hf_diameter_3gpp_subscription_data_flags_bit2 = -1;
-static int hf_diameter_3gpp_subscription_data_flags_bit1 = -1;
-static int hf_diameter_3gpp_subscription_data_flags_bit0 = -1;
-static int hf_diameter_3gpp_wlan_offloadability_eutran = -1;
-static int hf_diameter_3gpp_wlan_offloadability_eutran_spare_bits = -1;
-static int hf_diameter_3gpp_wlan_offloadability_eutran_bit0 = -1;
-static int hf_diameter_3gpp_wlan_offloadability_utran = -1;
-static int hf_diameter_3gpp_wlan_offloadability_utran_spare_bits = -1;
-static int hf_diameter_3gpp_wlan_offloadability_utran_bit0 = -1;
-static int hf_diameter_3gpp_air_flags = -1;
-static int hf_diameter_3gpp_air_flags_spare_bits = -1;
-static int hf_diameter_3gpp_air_flags_bit0 = -1;
-static int hf_diameter_3gpp_preferred_data_mode = -1;
-static int hf_diameter_3gpp_preferred_data_mode_spare_bits = -1;
-static int hf_diameter_3gpp_preferred_data_mode_bit1 = -1;
-static int hf_diameter_3gpp_preferred_data_mode_bit0 = -1;
-static int hf_diameter_3gpp_v2x_permission = -1;
-static int hf_diameter_3gpp_v2x_permission_spare_bits = -1;
-static int hf_diameter_3gpp_v2x_permission_bit1 = -1;
-static int hf_diameter_3gpp_v2x_permission_bit0 = -1;
-static int hf_diameter_3gpp_core_network_restrictions = -1;
-static int hf_diameter_3gpp_core_network_restrictions_spare_bits = -1;
-static int hf_diameter_3gpp_core_network_restrictions_bit1 = -1;
-static int hf_diameter_3gpp_core_network_restrictions_bit0 = -1;
-static int hf_diameter_3gpp_supported_gad_shapes = -1;
-static int hf_diameter_3gpp_highaccuracyellipsoidpointwithaltitudeandscalableuncertaintyellipsoid_bit10 = -1;
-static int hf_diameter_3gpp_highaccuracyellipsoidpointwithscalableuncertaintyellipse_bit9 = -1;
-static int hf_diameter_3gpp_highaccuracyellipsoidpointwithaltitudeanduncertaintyellipsoid_bit8 = -1;
-static int hf_diameter_3gpp_highaccuracyellipsoidpointwithuncertaintyellipse_bit7 = -1;
-static int hf_diameter_3gpp_ellipsoidarc_bit6 = -1;
-static int hf_diameter_3gpp_ellipsoidpointwithaltitudeanduncertaintyelipsoid_bit5 = -1;
-static int hf_diameter_3gpp_ellipsoidpointwithaltitude_bit4 = -1;
-static int hf_diameter_3gpp_polygon_bit3 = -1;
-static int hf_diameter_3gpp_ellipsoidpointwithuncertaintyellipse_bit2 = -1;
-static int hf_diameter_3gpp_ellipsoidpointwithuncertaintycircle_bit1 = -1;
-static int hf_diameter_3gpp_ellipsoidpoint_bit0 = -1;
-
-
-static int hf_diameter_3gpp_uar_flags_flags_spare_bits = -1;
-static int hf_diameter_3gpp_feature_list1_sh_flags_spare_bits = -1;
-static int hf_diameter_3gpp_feature_list2_s6a_flags_spare_bits = -1;
-static int hf_diameter_3gpp_cms_spare_bits = -1;
-static int hf_diameter_3gpp_ulr_flags_spare_bits = -1;
-static int hf_diameter_3gpp_ula_flags_spare_bits = -1;
-static int hf_diameter_3gpp_dsa_flags_spare_bits = -1;
-static int hf_diameter_3gpp_acc_res_dat_flags = -1;
-static int hf_diameter_3gpp_acc_res_dat_flags_bit0 = -1;
-static int hf_diameter_3gpp_acc_res_dat_flags_bit1 = -1;
-static int hf_diameter_3gpp_acc_res_dat_flags_bit2 = -1;
-static int hf_diameter_3gpp_acc_res_dat_flags_bit3 = -1;
-static int hf_diameter_3gpp_acc_res_dat_flags_bit4 = -1;
-static int hf_diameter_3gpp_acc_res_dat_flags_bit5 = -1;
-static int hf_diameter_3gpp_acc_res_dat_flags_bit6 = -1;
-static int hf_diameter_3gpp_acc_res_dat_flags_bit7 = -1;
-static int hf_diameter_3gpp_acc_res_dat_flags_bit8 = -1;
-static int hf_diameter_3gpp_acc_res_dat_flags_bit9 = -1;
-static int hf_diameter_3gpp_acc_res_dat_flags_bit10 = -1;
-static int hf_diameter_3gpp_acc_res_dat_flags_bit11 = -1;
-static int hf_diameter_3gpp_acc_res_dat_flags_bit12 = -1;
-static int hf_diameter_3gpp_acc_res_dat_flags_spare_bits = -1;
-static int hf_diameter_3gpp_ida_flags_spare_bits = -1;
-static int hf_diameter_3gpp_pua_flags_spare_bits = -1;
-static int hf_diameter_3gpp_nor_flags_spare_bits = -1;
-static int hf_diameter_3gpp_idr_flags_spare_bits = -1;
-static int hf_diameter_3gpp_ppr_flags_spare_bits = -1;
-static int hf_diameter_3gpp_aaa_fail_flags_spare_bits = -1;
-static int hf_diameter_3gpp_der_flags_spare_bits = -1;
-static int hf_diameter_3gpp_dea_flags_spare_bits = -1;
-static int hf_diameter_3gpp_rar_flags_spare_bits = -1;
-static int hf_diameter_3gpp_der_s6b_flags_spare_bits = -1;
-static int hf_diameter_3gpp_mbms_bearer_event_spare_bits = -1;
-static int hf_diameter_3gpp_mbms_bearer_result_spare_bits = -1;
-static int hf_diameter_3gpp_tmgi_allocation_result_spare_bits = -1;
-static int hf_diameter_3gpp_tmgi_deallocation_result_spare_bits = -1;
-static int hf_diameter_3gpp_emergency_services_flags_spare_bits = -1;
-
-static int hf_diameter_3gpp_plr_flags = -1;
-static int hf_diameter_3gpp_plr_flags_spare_bits = -1;
-static int hf_diameter_3gpp_delayed_location_reporting_support_indicator_bit2 = -1;
-static int hf_diameter_3gpp_optimized_lcs_proc_req_bit1 = -1;
-static int hf_diameter_3gpp_mo_lr_shortcircuit_indicator_bit0 = -1;
-
-static int hf_diameter_3gpp_pla_flags = -1;
-static int hf_diameter_3gpp_pla_flags_spare_bits = -1;
-static int hf_diameter_3gpp_ue_transiently_not_reachable_indicator_bit3 = -1;
-static int hf_diameter_3gpp_optimized_lcs_proc_performed_bit2 = -1;
-static int hf_diameter_3gpp_mo_lr_shortcircuit_indicator_bit1 = -1;
-static int hf_diameter_3gpp_deferred_mt_lr_response_indicator_bit0 = -1;
-
-static int hf_diameter_3gpp_deferred_location_type = -1;
-static int hf_diameter_3gpp_deferred_location_type_spare_bits = -1;
-static int hf_diameter_3gpp_ue_available_bit0 = -1;
-static int hf_diameter_3gpp_entering_into_area_bit1 = -1;
-static int hf_diameter_3gpp_leaving_from_area_bit2 = -1;
-static int hf_diameter_3gpp_being_inside_area_bit3 = -1;
-static int hf_diameter_3gpp_periodic_ldr_bit4 = -1;
-static int hf_diameter_3gpp_motion_event_bit5 = -1;
-static int hf_diameter_3gpp_ldr_activated_bit6 = -1;
-static int hf_diameter_3gpp_maximum_interval_exporation_bit7 = -1;
-
-static gint ett_diameter_3gpp_path = -1;
-static gint ett_diameter_3gpp_feature_list = -1;
-static gint ett_diameter_3gpp_uar_flags = -1;
-static gint ett_diameter_3gpp_tmgi  = -1;
-static gint ett_diameter_3gpp_cms = -1;
-
-static int hf_diameter_3gpp_secondary_rat_type = -1;
-
-static int hf_diameter_3gpp_gcip = -1;
-static int hf_diameter_3gpp_amec = -1;
-static int hf_diameter_3gpp_coame = -1;
-static int hf_diameter_3gpp_acpc = -1;
-static int hf_diameter_3gpp_rir_flags = -1;
-static int hf_diameter_3gpp_rir_spare_b31_b4 = -1;
-static int hf_diameter_3gpp_feature_list_s6t_flags = -1;
-static int hf_diameter_3gpp_feature_list_s6t_flags_bit0 = -1;
-static int hf_diameter_3gpp_feature_list_s6t_flags_bit1 = -1;
-static int hf_diameter_3gpp_feature_list_s6t_flags_bit2 = -1;
-static int hf_diameter_3gpp_feature_list_s6t_flags_bit3 = -1;
-static int hf_diameter_3gpp_feature_list_s6t_flags_bit4 = -1;
-static int hf_diameter_3gpp_feature_list_s6t_flags_bit5 = -1;
-static int hf_diameter_3gpp_feature_list_s6t_flags_bit6 = -1;
-static int hf_diameter_3gpp_feature_list_s6t_flags_bit7 = -1;
-static int hf_diameter_3gpp_feature_list_s6t_flags_bit8 = -1;
-static int hf_diameter_3gpp_feature_list_s6t_flags_bit9 = -1;
-static int hf_diameter_3gpp_feature_list_s6t_spare_b31_b10 = -1;
-static int hf_diameter_3gpp_supported_monitoring_events = -1;
-static int hf_diameter_3gpp_supported_monitoring_events_b0 = -1;
-static int hf_diameter_3gpp_supported_monitoring_events_b1 = -1;
-static int hf_diameter_3gpp_supported_monitoring_events_b2 = -1;
-static int hf_diameter_3gpp_supported_monitoring_events_b3 = -1;
-static int hf_diameter_3gpp_supported_monitoring_events_b4 = -1;
-static int hf_diameter_3gpp_supported_monitoring_events_b5 = -1;
-static int hf_diameter_3gpp_supported_monitoring_events_b6 = -1;
-static int hf_diameter_3gpp_supported_monitoring_events_b7 = -1;
-static int hf_diameter_3gpp_supported_monitoring_events_b8 = -1;
-
-static gint ett_diameter_3gpp_qos_subscribed = -1;
-static gint ett_diameter_3gpp_ulr_flags = -1;
-static gint ett_diameter_3gpp_ula_flags = -1;
-static gint ett_diameter_3gpp_dsr_flags = -1;
-static gint ett_diameter_3gpp_dsa_flags = -1;
-static gint ett_diameter_3gpp_ida_flags = -1;
-static gint ett_diameter_3gpp_pua_flags = -1;
-static gint ett_diameter_3gpp_nor_flags = -1;
-static gint ett_diameter_3gpp_idr_flags = -1;
-static gint ett_diameter_3gpp_ppr_flags = -1;
-static gint ett_diameter_3gpp_aaa_fail_flags = -1;
-static gint ett_diameter_3gpp_der_flags = -1;
-static gint ett_diameter_3gpp_dea_flags = -1;
-static gint ett_diameter_3gpp_rar_flags = -1;
-static gint ett_diameter_3gpp_der_s6b_flags = -1;
-static gint ett_diameter_3gpp_mbms_bearer_event = -1;
-static gint ett_diameter_3gpp_mbms_bearer_result = -1;
-static gint ett_diameter_3gpp_tmgi_allocation_result = -1;
-static gint ett_diameter_3gpp_tmgi_deallocation_result = -1;
-static gint ett_diameter_3gpp_sar_flags = -1;
-static gint ett_diameter_3gpp_req_nodes = -1;
-static gint ett_diameter_3gpp_emergency_services_flags = -1;
-static gint ett_diameter_3gpp_pur_flags = -1;
-static gint ett_diameter_3gpp_clr_flags = -1;
-static gint ett_diameter_3gpp_uvr_flags = -1;
-static gint ett_diameter_3gpp_uva_flags = -1;
-static gint ett_diameter_3gpp_subscription_data_flags = -1;
-static gint ett_diameter_3gpp_wlan_offloadability_eutran = -1;
-static gint ett_diameter_3gpp_wlan_offloadability_utran = -1;
-static gint ett_diameter_3gpp_air_flags = -1;
-static gint ett_diameter_3gpp_preferred_data_mode = -1;
-static gint ett_diameter_3gpp_v2x_permission = -1;
-static gint ett_diameter_3gpp_core_network_restrictions = -1;
-static gint ett_diameter_3gpp_supported_gad_shapes = -1;
-static gint ett_diameter_3gpp_plr_flags = -1;
-static gint ett_diameter_3gpp_pla_flags = -1;
-static gint ett_diameter_3gpp_deferred_location_type = -1;
-static gint ett_diameter_3gpp_rir_flags = -1;
-static gint ett_diameter_3gpp_supported_monitoring_events = -1;
-static gint ett_diameter_3gpp_af_requested_data_flags = -1;
-
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit0 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit1 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit2 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit3 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit4 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit5 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit6 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit7 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit8 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit9 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit10 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit11 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit12 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit13 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit14 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit15 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit16 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit17 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit18 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit19 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit20 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit21 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_bit22 = -1;
-static int hf_diameter_3gpp_feature_list1_rx_flags_spare_bits = -1;
-
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit0 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit1 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit2 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit3 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit4 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit5 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit6 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit7 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit8 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit9 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit10 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit11 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit12 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit13 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit14 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_bit15 = -1;
-static int hf_diameter_3gpp_feature_list2_rx_flags_spare_bits = -1;
-
-static int hf_diameter_3gpp_ran_nas_protocol_type = -1;
-static int hf_diameter_3gpp_ran_nas_cause_type = -1;
-static int hf_diameter_3gpp_ran_nas_cause_value = -1;
-static int hf_diameter_3gpp_s1ap_radio_network = -1;
-static int hf_diameter_3gpp_s1ap_transport = -1;
-static int hf_diameter_3gpp_s1ap_nas = -1;
-static int hf_diameter_3gpp_s1ap_protocol = -1;
-static int hf_diameter_3gpp_s1ap_misc = -1;
-static int hf_diameter_3gpp_emm_cause = -1;
-static int hf_diameter_3gpp_esm_cause = -1;
-static int hf_diameter_3gpp_diameter_cause = -1;
-static int hf_diameter_3gpp_ikev2_cause = -1;
+static int proto_diameter_3gpp;
+
+static int hf_diameter_3gpp_timezone;
+static int hf_diameter_3gpp_timezone_adjustment;
+static int hf_diameter_3gpp_rat_type;
+static int hf_diameter_3gpp_path;
+static int hf_diameter_3gpp_contact;
+/* static int hf_diameter_3gpp_user_data; */
+static int hf_diameter_3gpp_ipaddr;
+static int hf_diameter_3gpp_mbms_required_qos_prio;
+static int hf_diameter_3gpp_tmgi;
+static int hf_diameter_3gpp_req_nodes;
+static int hf_diameter_3gpp_req_nodes_bit0;
+static int hf_diameter_3gpp_req_nodes_bit1;
+static int hf_diameter_3gpp_req_nodes_bit2;
+static int hf_diameter_3gpp_req_nodes_bit3;
+static int hf_diameter_mbms_service_id;
+static int hf_diameter_3gpp_spare_bits;
+static int hf_diameter_3gpp_uar_flags_flags;
+static int hf_diameter_3gpp_uar_flags_flags_bit0;
+static int hf_diameter_3gpp_feature_list_flags;
+static int hf_diameter_3gpp_cx_feature_list_flags;
+static int hf_diameter_3gpp_cx_feature_list_1_flags_bit0;
+static int hf_diameter_3gpp_cx_feature_list_1_flags_bit1;
+static int hf_diameter_3gpp_cx_feature_list_1_flags_bit2;
+static int hf_diameter_3gpp_cx_feature_list_1_flags_bit3;
+static int hf_diameter_3gpp_cx_feature_list_1_flags_spare_bits;
+static int hf_diameter_3gpp_feature_list1_sh_flags_bit0;
+static int hf_diameter_3gpp_feature_list1_sh_flags_bit1;
+static int hf_diameter_3gpp_feature_list1_sh_flags_bit2;
+static int hf_diameter_3gpp_feature_list1_sh_flags_bit3;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit0;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit1;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit2;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit3;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit4;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit5;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit6;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit7;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit8;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit9;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit10;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit11;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit12;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit13;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit14;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit15;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit16;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit17;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit18;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit19;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit20;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit21;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit22;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit23;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit24;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit25;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit26;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit27;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit28;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit29;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit30;
+static int hf_diameter_3gpp_feature_list1_s6a_flags_bit31;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit0;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit1;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit2;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit3;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit4;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit5;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit6;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit7;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit8;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit9;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit10;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit11;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit12;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit13;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit14;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit15;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit16;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit17;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit18;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit19;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit20;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit21;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit22;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit23;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit24;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit25;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit26;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit27;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit28;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit29;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_bit30;
+static int hf_diameter_3gpp_feature_list_gx_flags;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit0;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit1;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit2;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit3;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit4;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit5;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit6;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit7;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit8;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit9;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit10;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit11;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit12;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit13;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit14;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit15;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit16;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit17;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit18;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit19;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit20;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit21;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit22;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit23;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit24;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit25;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit26;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit27;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit28;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit29;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit30;
+static int hf_diameter_3gpp_feature_list1_gx_flags_bit31;
+static int hf_diameter_3gpp_feature_list2_gx_flags_bit0;
+static int hf_diameter_3gpp_feature_list2_gx_flags_bit1;
+static int hf_diameter_3gpp_feature_list2_gx_flags_bit2;
+static int hf_diameter_3gpp_feature_list2_gx_flags_bit3;
+static int hf_diameter_3gpp_feature_list2_gx_flags_bit4;
+static int hf_diameter_3gpp_feature_list2_gx_flags_bit5;
+static int hf_diameter_3gpp_feature_list2_gx_flags_bit6;
+static int hf_diameter_3gpp_feature_list2_gx_flags_bit7;
+static int hf_diameter_3gpp_feature_list_sd_flags;
+static int hf_diameter_3gpp_feature_list_sd_flags_bit0;
+static int hf_diameter_3gpp_feature_list_sd_flags_bit1;
+static int hf_diameter_3gpp_feature_list_sd_flags_bit2;
+static int hf_diameter_3gpp_feature_list_sd_flags_bit3;
+static int hf_diameter_3gpp_feature_list_sd_flags_bit4;
+static int hf_diameter_3gpp_feature_list_sd_flags_bit5;
+static int hf_diameter_3gpp_feature_list_sd_flags_bit6;
+static int hf_diameter_3gpp_feature_list_sd_flags_bit7;
+static int hf_diameter_3gpp_feature_list_sd_flags_bit8;
+static int hf_diameter_3gpp_feature_list_sd_flags_bit9;
+static int hf_diameter_3gpp_feature_list_sd_flags_bit10;
+static int hf_diameter_3gpp_feature_list_sd_flags_spare_bits;
+static int hf_diameter_3gpp_cms_no_gyn_session_serv_not_allowed;
+static int hf_diameter_3gpp_cms_no_gyn_session_serv_allowed;
+static int hf_diameter_3gpp_cms_rating_failed;
+static int hf_diameter_3gpp_cms_user_unknown;
+static int hf_diameter_3gpp_cms_auth_rej;
+static int hf_diameter_3gpp_cms_credit_ctrl_not_applicable;
+static int hf_diameter_3gpp_cms_end_user_serv_status;
+static int hf_diameter_3gpp_qos_subscribed;
+static int hf_diameter_3gpp_qos_reliability_cls;
+static int hf_diameter_3gpp_qos_prec_class;
+static int hf_diameter_3gpp_qos_delay_cls;
+static int hf_diameter_3gpp_qos_peak_thr;
+static int hf_diameter_3gpp_qos_mean_thr;
+static int hf_diameter_3gpp_qos_al_ret_priority;
+static int hf_diameter_3gpp_qos_del_of_err_sdu;
+static int hf_diameter_3gpp_qos_del_order;
+static int hf_diameter_3gpp_qos_traffic_cls;
+static int hf_diameter_3gpp_qos_maximum_sdu_size;
+static int hf_diameter_3gpp_qos_max_bitrate_upl;
+static int hf_diameter_3gpp_qos_max_bitrate_downl;
+static int hf_diameter_3gpp_qos_sdu_err_rat;
+static int hf_diameter_3gpp_qos_ber;
+static int hf_diameter_3gpp_qos_traff_hdl_pri;
+static int hf_diameter_3gpp_qos_trans_delay;
+static int hf_diameter_3gpp_qos_guar_bitrate_upl;
+static int hf_diameter_3gpp_qos_guar_bitrate_downl;
+static int hf_diameter_3gpp_qos_source_stat_desc;
+static int hf_diameter_3gpp_qos_signalling_ind;
+static int hf_diameter_3gpp_qos_max_bitrate_downl_ext;
+static int hf_diameter_3gpp_qos_guar_bitrate_downl_ext;
+static int hf_diameter_3gpp_qos_max_bitrate_upl_ext;
+static int hf_diameter_3gpp_qos_guar_bitrate_upl_ext;
+static int hf_diameter_3gpp_qos_pre_emption_vulnerability;
+static int hf_diameter_3gpp_qos_priority_level;
+static int hf_diameter_3gpp_qos_pre_emption_capability;
+static int hf_diameter_3gpp_ulr_flags;
+static int hf_diameter_3gpp_ulr_flags_bit0;
+static int hf_diameter_3gpp_ulr_flags_bit1;
+static int hf_diameter_3gpp_ulr_flags_bit2;
+static int hf_diameter_3gpp_ulr_flags_bit3;
+static int hf_diameter_3gpp_ulr_flags_bit4;
+static int hf_diameter_3gpp_ulr_flags_bit5;
+static int hf_diameter_3gpp_ulr_flags_bit6;
+static int hf_diameter_3gpp_ulr_flags_bit7;
+static int hf_diameter_3gpp_ulr_flags_bit8;
+static int hf_diameter_3gpp_ula_flags;
+static int hf_diameter_3gpp_ula_flags_bit0;
+static int hf_diameter_3gpp_ula_flags_bit1;
+static int hf_diameter_3gpp_dsr_flags;
+static int hf_diameter_3gpp_dsr_flags_bit0;
+static int hf_diameter_3gpp_dsr_flags_bit1;
+static int hf_diameter_3gpp_dsr_flags_bit2;
+static int hf_diameter_3gpp_dsr_flags_bit3;
+static int hf_diameter_3gpp_dsr_flags_bit4;
+static int hf_diameter_3gpp_dsr_flags_bit5;
+static int hf_diameter_3gpp_dsr_flags_bit6;
+static int hf_diameter_3gpp_dsr_flags_bit7;
+static int hf_diameter_3gpp_dsr_flags_bit8;
+static int hf_diameter_3gpp_dsr_flags_bit9;
+static int hf_diameter_3gpp_dsr_flags_bit10;
+static int hf_diameter_3gpp_dsr_flags_bit11;
+static int hf_diameter_3gpp_dsr_flags_bit12;
+static int hf_diameter_3gpp_dsr_flags_bit13;
+static int hf_diameter_3gpp_dsr_flags_bit14;
+static int hf_diameter_3gpp_dsr_flags_bit15;
+static int hf_diameter_3gpp_dsr_flags_bit16;
+static int hf_diameter_3gpp_dsr_flags_bit17;
+static int hf_diameter_3gpp_dsr_flags_bit18;
+static int hf_diameter_3gpp_dsr_flags_bit19;
+static int hf_diameter_3gpp_dsr_flags_bit20;
+static int hf_diameter_3gpp_dsr_flags_bit21;
+static int hf_diameter_3gpp_dsr_flags_bit22;
+static int hf_diameter_3gpp_dsr_flags_bit23;
+static int hf_diameter_3gpp_dsr_flags_bit24;
+static int hf_diameter_3gpp_dsr_flags_bit25;
+static int hf_diameter_3gpp_dsr_flags_bit26;
+static int hf_diameter_3gpp_dsr_flags_bit27;
+static int hf_diameter_3gpp_dsr_flags_bit28;
+static int hf_diameter_3gpp_dsr_flags_bit29;
+static int hf_diameter_3gpp_dsr_flags_bit30;
+static int hf_diameter_3gpp_dsr_flags_bit31;
+static int hf_diameter_3gpp_dsa_flags;
+static int hf_diameter_3gpp_dsa_flags_bit0;
+static int hf_diameter_3gpp_ida_flags;
+static int hf_diameter_3gpp_ida_flags_bit0;
+static int hf_diameter_3gpp_pua_flags;
+static int hf_diameter_3gpp_pua_flags_bit0;
+static int hf_diameter_3gpp_pua_flags_bit1;
+static int hf_diameter_3gpp_nor_flags;
+static int hf_diameter_3gpp_nor_flags_bit0;
+static int hf_diameter_3gpp_nor_flags_bit1;
+static int hf_diameter_3gpp_nor_flags_bit2;
+static int hf_diameter_3gpp_nor_flags_bit3;
+static int hf_diameter_3gpp_nor_flags_bit4;
+static int hf_diameter_3gpp_nor_flags_bit5;
+static int hf_diameter_3gpp_nor_flags_bit6;
+static int hf_diameter_3gpp_nor_flags_bit7;
+static int hf_diameter_3gpp_nor_flags_bit8;
+static int hf_diameter_3gpp_nor_flags_bit9;
+static int hf_diameter_3gpp_idr_flags;
+static int hf_diameter_3gpp_idr_flags_bit0;
+static int hf_diameter_3gpp_idr_flags_bit1;
+static int hf_diameter_3gpp_idr_flags_bit2;
+static int hf_diameter_3gpp_idr_flags_bit3;
+static int hf_diameter_3gpp_idr_flags_bit4;
+static int hf_diameter_3gpp_idr_flags_bit5;
+static int hf_diameter_3gpp_idr_flags_bit6;
+static int hf_diameter_3gpp_idr_flags_bit7;
+static int hf_diameter_3gpp_idr_flags_bit8;
+static int hf_diameter_3gpp_ppr_flags;
+static int hf_diameter_3gpp_ppr_flags_bit0;
+static int hf_diameter_3gpp_ppr_flags_bit1;
+static int hf_diameter_3gpp_ppr_flags_bit2;
+static int hf_diameter_3gpp_ppr_flags_bit3;
+static int hf_diameter_3gpp_aaa_fail_flags;
+static int hf_diameter_3gpp_aaa_fail_flags_bit0;
+static int hf_diameter_3gpp_der_flags;
+static int hf_diameter_3gpp_der_flags_bit0;
+static int hf_diameter_3gpp_der_flags_bit1;
+static int hf_diameter_3gpp_dea_flags;
+static int hf_diameter_3gpp_dea_flags_bit0;
+static int hf_diameter_3gpp_dea_flags_bit1;
+static int hf_diameter_3gpp_rar_flags;
+static int hf_diameter_3gpp_rar_flags_bit0;
+static int hf_diameter_3gpp_rar_flags_bit1;
+static int hf_diameter_3gpp_der_s6b_flags;
+static int hf_diameter_3gpp_der_s6b_flags_bit0;
+static int hf_diameter_3gpp_ipv6addr;
+static int hf_diameter_3gpp_mbms_abs_time_ofmbms_data_tfer;
+static int hf_diameter_3gpp_udp_port;
+static int hf_diameter_3gpp_codec_data_dir;
+static int hf_diameter_3gpp_codec_sdp_type;
+static int hf_diameter_3gpp_af_requested_data_flags;
+static int hf_diameter_3gpp_af_requested_data_flags_bit0;
+static int hf_diameter_3gpp_mbms_bearer_event;
+static int hf_diameter_3gpp_mbms_bearer_event_bit0;
+static int hf_diameter_3gpp_mbms_bearer_event_bit1;
+static int hf_diameter_3gpp_mbms_bearer_event_bit2;
+static int hf_diameter_3gpp_mbms_bearer_result;
+static int hf_diameter_3gpp_mbms_bearer_result_bit0;
+static int hf_diameter_3gpp_mbms_bearer_result_bit1;
+static int hf_diameter_3gpp_mbms_bearer_result_bit2;
+static int hf_diameter_3gpp_mbms_bearer_result_bit3;
+static int hf_diameter_3gpp_mbms_bearer_result_bit4;
+static int hf_diameter_3gpp_mbms_bearer_result_bit5;
+static int hf_diameter_3gpp_mbms_bearer_result_bit6;
+static int hf_diameter_3gpp_mbms_bearer_result_bit7;
+static int hf_diameter_3gpp_mbms_bearer_result_bit8;
+static int hf_diameter_3gpp_mbms_bearer_result_bit9;
+static int hf_diameter_3gpp_mbms_bearer_result_bit10;
+static int hf_diameter_3gpp_mbms_bearer_result_bit11;
+static int hf_diameter_3gpp_tmgi_allocation_result;
+static int hf_diameter_3gpp_tmgi_allocation_result_bit0;
+static int hf_diameter_3gpp_tmgi_allocation_result_bit1;
+static int hf_diameter_3gpp_tmgi_allocation_result_bit2;
+static int hf_diameter_3gpp_tmgi_allocation_result_bit3;
+static int hf_diameter_3gpp_tmgi_allocation_result_bit4;
+static int hf_diameter_3gpp_tmgi_deallocation_result;
+static int hf_diameter_3gpp_tmgi_deallocation_result_bit0;
+static int hf_diameter_3gpp_tmgi_deallocation_result_bit1;
+static int hf_diameter_3gpp_tmgi_deallocation_result_bit2;
+static int hf_diameter_3gpp_sar_flags;
+static int hf_diameter_3gpp_sar_flags_flags_bit0;
+static int hf_diameter_3gpp_emergency_services_flags;
+static int hf_diameter_3gpp_emergency_services_flags_bit0;
+static int hf_diameter_3gpp_pur_flags;
+static int hf_diameter_3gpp_pur_flags_spare_bits;
+static int hf_diameter_3gpp_pur_flags_bit1;
+static int hf_diameter_3gpp_pur_flags_bit0;
+static int hf_diameter_3gpp_clr_flags;
+static int hf_diameter_3gpp_clr_flags_spare_bits;
+static int hf_diameter_3gpp_clr_flags_bit1;
+static int hf_diameter_3gpp_clr_flags_bit0;
+static int hf_diameter_3gpp_uvr_flags;
+static int hf_diameter_3gpp_uvr_flags_spare_bits;
+static int hf_diameter_3gpp_uvr_flags_bit0;
+static int hf_diameter_3gpp_uva_flags;
+static int hf_diameter_3gpp_uva_flags_spare_bits;
+static int hf_diameter_3gpp_uva_flags_bit0;
+static int hf_diameter_3gpp_subscription_data_flags;
+static int hf_diameter_3gpp_subscription_data_flags_spare_bits;
+static int hf_diameter_3gpp_subscription_data_flags_bit3;
+static int hf_diameter_3gpp_subscription_data_flags_bit2;
+static int hf_diameter_3gpp_subscription_data_flags_bit1;
+static int hf_diameter_3gpp_subscription_data_flags_bit0;
+static int hf_diameter_3gpp_wlan_offloadability_eutran;
+static int hf_diameter_3gpp_wlan_offloadability_eutran_spare_bits;
+static int hf_diameter_3gpp_wlan_offloadability_eutran_bit0;
+static int hf_diameter_3gpp_wlan_offloadability_utran;
+static int hf_diameter_3gpp_wlan_offloadability_utran_spare_bits;
+static int hf_diameter_3gpp_wlan_offloadability_utran_bit0;
+static int hf_diameter_3gpp_air_flags;
+static int hf_diameter_3gpp_air_flags_spare_bits;
+static int hf_diameter_3gpp_air_flags_bit0;
+static int hf_diameter_3gpp_preferred_data_mode;
+static int hf_diameter_3gpp_preferred_data_mode_spare_bits;
+static int hf_diameter_3gpp_preferred_data_mode_bit1;
+static int hf_diameter_3gpp_preferred_data_mode_bit0;
+static int hf_diameter_3gpp_v2x_permission;
+static int hf_diameter_3gpp_v2x_permission_spare_bits;
+static int hf_diameter_3gpp_v2x_permission_bit1;
+static int hf_diameter_3gpp_v2x_permission_bit0;
+static int hf_diameter_3gpp_core_network_restrictions;
+static int hf_diameter_3gpp_core_network_restrictions_spare_bits;
+static int hf_diameter_3gpp_core_network_restrictions_bit1;
+static int hf_diameter_3gpp_core_network_restrictions_bit0;
+static int hf_diameter_3gpp_supported_gad_shapes;
+static int hf_diameter_3gpp_highaccuracyellipsoidpointwithaltitudeandscalableuncertaintyellipsoid_bit10;
+static int hf_diameter_3gpp_highaccuracyellipsoidpointwithscalableuncertaintyellipse_bit9;
+static int hf_diameter_3gpp_highaccuracyellipsoidpointwithaltitudeanduncertaintyellipsoid_bit8;
+static int hf_diameter_3gpp_highaccuracyellipsoidpointwithuncertaintyellipse_bit7;
+static int hf_diameter_3gpp_ellipsoidarc_bit6;
+static int hf_diameter_3gpp_ellipsoidpointwithaltitudeanduncertaintyelipsoid_bit5;
+static int hf_diameter_3gpp_ellipsoidpointwithaltitude_bit4;
+static int hf_diameter_3gpp_polygon_bit3;
+static int hf_diameter_3gpp_ellipsoidpointwithuncertaintyellipse_bit2;
+static int hf_diameter_3gpp_ellipsoidpointwithuncertaintycircle_bit1;
+static int hf_diameter_3gpp_ellipsoidpoint_bit0;
+
+
+static int hf_diameter_3gpp_uar_flags_flags_spare_bits;
+static int hf_diameter_3gpp_feature_list1_sh_flags_spare_bits;
+static int hf_diameter_3gpp_feature_list2_s6a_flags_spare_bits;
+static int hf_diameter_3gpp_cms_spare_bits;
+static int hf_diameter_3gpp_ulr_flags_spare_bits;
+static int hf_diameter_3gpp_ula_flags_spare_bits;
+static int hf_diameter_3gpp_dsa_flags_spare_bits;
+static int hf_diameter_3gpp_acc_res_dat_flags;
+static int hf_diameter_3gpp_acc_res_dat_flags_bit0;
+static int hf_diameter_3gpp_acc_res_dat_flags_bit1;
+static int hf_diameter_3gpp_acc_res_dat_flags_bit2;
+static int hf_diameter_3gpp_acc_res_dat_flags_bit3;
+static int hf_diameter_3gpp_acc_res_dat_flags_bit4;
+static int hf_diameter_3gpp_acc_res_dat_flags_bit5;
+static int hf_diameter_3gpp_acc_res_dat_flags_bit6;
+static int hf_diameter_3gpp_acc_res_dat_flags_bit7;
+static int hf_diameter_3gpp_acc_res_dat_flags_bit8;
+static int hf_diameter_3gpp_acc_res_dat_flags_bit9;
+static int hf_diameter_3gpp_acc_res_dat_flags_bit10;
+static int hf_diameter_3gpp_acc_res_dat_flags_bit11;
+static int hf_diameter_3gpp_acc_res_dat_flags_bit12;
+static int hf_diameter_3gpp_acc_res_dat_flags_spare_bits;
+static int hf_diameter_3gpp_ida_flags_spare_bits;
+static int hf_diameter_3gpp_pua_flags_spare_bits;
+static int hf_diameter_3gpp_nor_flags_spare_bits;
+static int hf_diameter_3gpp_idr_flags_spare_bits;
+static int hf_diameter_3gpp_ppr_flags_spare_bits;
+static int hf_diameter_3gpp_aaa_fail_flags_spare_bits;
+static int hf_diameter_3gpp_der_flags_spare_bits;
+static int hf_diameter_3gpp_dea_flags_spare_bits;
+static int hf_diameter_3gpp_rar_flags_spare_bits;
+static int hf_diameter_3gpp_der_s6b_flags_spare_bits;
+static int hf_diameter_3gpp_mbms_bearer_event_spare_bits;
+static int hf_diameter_3gpp_mbms_bearer_result_spare_bits;
+static int hf_diameter_3gpp_tmgi_allocation_result_spare_bits;
+static int hf_diameter_3gpp_tmgi_deallocation_result_spare_bits;
+static int hf_diameter_3gpp_emergency_services_flags_spare_bits;
+
+static int hf_diameter_3gpp_plr_flags;
+static int hf_diameter_3gpp_plr_flags_spare_bits;
+static int hf_diameter_3gpp_delayed_location_reporting_support_indicator_bit2;
+static int hf_diameter_3gpp_optimized_lcs_proc_req_bit1;
+static int hf_diameter_3gpp_mo_lr_shortcircuit_indicator_bit0;
+
+static int hf_diameter_3gpp_pla_flags;
+static int hf_diameter_3gpp_pla_flags_spare_bits;
+static int hf_diameter_3gpp_ue_transiently_not_reachable_indicator_bit3;
+static int hf_diameter_3gpp_optimized_lcs_proc_performed_bit2;
+static int hf_diameter_3gpp_mo_lr_shortcircuit_indicator_bit1;
+static int hf_diameter_3gpp_deferred_mt_lr_response_indicator_bit0;
+
+static int hf_diameter_3gpp_deferred_location_type;
+static int hf_diameter_3gpp_deferred_location_type_spare_bits;
+static int hf_diameter_3gpp_ue_available_bit0;
+static int hf_diameter_3gpp_entering_into_area_bit1;
+static int hf_diameter_3gpp_leaving_from_area_bit2;
+static int hf_diameter_3gpp_being_inside_area_bit3;
+static int hf_diameter_3gpp_periodic_ldr_bit4;
+static int hf_diameter_3gpp_motion_event_bit5;
+static int hf_diameter_3gpp_ldr_activated_bit6;
+static int hf_diameter_3gpp_maximum_interval_exporation_bit7;
+
+static gint ett_diameter_3gpp_path;
+static gint ett_diameter_3gpp_feature_list;
+static gint ett_diameter_3gpp_uar_flags;
+static gint ett_diameter_3gpp_tmgi;
+static gint ett_diameter_3gpp_cms;
+
+static int hf_diameter_3gpp_secondary_rat_type;
+
+static int hf_diameter_3gpp_gcip;
+static int hf_diameter_3gpp_amec;
+static int hf_diameter_3gpp_coame;
+static int hf_diameter_3gpp_acpc;
+static int hf_diameter_3gpp_rir_flags;
+static int hf_diameter_3gpp_rir_spare_b31_b4;
+static int hf_diameter_3gpp_feature_list_s6t_flags;
+static int hf_diameter_3gpp_feature_list_s6t_flags_bit0;
+static int hf_diameter_3gpp_feature_list_s6t_flags_bit1;
+static int hf_diameter_3gpp_feature_list_s6t_flags_bit2;
+static int hf_diameter_3gpp_feature_list_s6t_flags_bit3;
+static int hf_diameter_3gpp_feature_list_s6t_flags_bit4;
+static int hf_diameter_3gpp_feature_list_s6t_flags_bit5;
+static int hf_diameter_3gpp_feature_list_s6t_flags_bit6;
+static int hf_diameter_3gpp_feature_list_s6t_flags_bit7;
+static int hf_diameter_3gpp_feature_list_s6t_flags_bit8;
+static int hf_diameter_3gpp_feature_list_s6t_flags_bit9;
+static int hf_diameter_3gpp_feature_list_s6t_spare_b31_b10;
+static int hf_diameter_3gpp_supported_monitoring_events;
+static int hf_diameter_3gpp_supported_monitoring_events_b0;
+static int hf_diameter_3gpp_supported_monitoring_events_b1;
+static int hf_diameter_3gpp_supported_monitoring_events_b2;
+static int hf_diameter_3gpp_supported_monitoring_events_b3;
+static int hf_diameter_3gpp_supported_monitoring_events_b4;
+static int hf_diameter_3gpp_supported_monitoring_events_b5;
+static int hf_diameter_3gpp_supported_monitoring_events_b6;
+static int hf_diameter_3gpp_supported_monitoring_events_b7;
+static int hf_diameter_3gpp_supported_monitoring_events_b8;
+
+static gint ett_diameter_3gpp_qos_subscribed;
+static gint ett_diameter_3gpp_ulr_flags;
+static gint ett_diameter_3gpp_ula_flags;
+static gint ett_diameter_3gpp_dsr_flags;
+static gint ett_diameter_3gpp_dsa_flags;
+static gint ett_diameter_3gpp_ida_flags;
+static gint ett_diameter_3gpp_pua_flags;
+static gint ett_diameter_3gpp_nor_flags;
+static gint ett_diameter_3gpp_idr_flags;
+static gint ett_diameter_3gpp_ppr_flags;
+static gint ett_diameter_3gpp_aaa_fail_flags;
+static gint ett_diameter_3gpp_der_flags;
+static gint ett_diameter_3gpp_dea_flags;
+static gint ett_diameter_3gpp_rar_flags;
+static gint ett_diameter_3gpp_der_s6b_flags;
+static gint ett_diameter_3gpp_mbms_bearer_event;
+static gint ett_diameter_3gpp_mbms_bearer_result;
+static gint ett_diameter_3gpp_tmgi_allocation_result;
+static gint ett_diameter_3gpp_tmgi_deallocation_result;
+static gint ett_diameter_3gpp_sar_flags;
+static gint ett_diameter_3gpp_req_nodes;
+static gint ett_diameter_3gpp_emergency_services_flags;
+static gint ett_diameter_3gpp_pur_flags;
+static gint ett_diameter_3gpp_clr_flags;
+static gint ett_diameter_3gpp_uvr_flags;
+static gint ett_diameter_3gpp_uva_flags;
+static gint ett_diameter_3gpp_subscription_data_flags;
+static gint ett_diameter_3gpp_wlan_offloadability_eutran;
+static gint ett_diameter_3gpp_wlan_offloadability_utran;
+static gint ett_diameter_3gpp_air_flags;
+static gint ett_diameter_3gpp_preferred_data_mode;
+static gint ett_diameter_3gpp_v2x_permission;
+static gint ett_diameter_3gpp_core_network_restrictions;
+static gint ett_diameter_3gpp_supported_gad_shapes;
+static gint ett_diameter_3gpp_plr_flags;
+static gint ett_diameter_3gpp_pla_flags;
+static gint ett_diameter_3gpp_deferred_location_type;
+static gint ett_diameter_3gpp_rir_flags;
+static gint ett_diameter_3gpp_supported_monitoring_events;
+static gint ett_diameter_3gpp_af_requested_data_flags;
+
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit0;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit1;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit2;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit3;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit4;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit5;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit6;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit7;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit8;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit9;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit10;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit11;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit12;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit13;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit14;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit15;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit16;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit17;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit18;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit19;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit20;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit21;
+static int hf_diameter_3gpp_feature_list1_rx_flags_bit22;
+static int hf_diameter_3gpp_feature_list1_rx_flags_spare_bits;
+
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit0;
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit1;
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit2;
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit3;
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit4;
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit5;
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit6;
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit7;
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit8;
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit9;
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit10;
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit11;
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit12;
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit13;
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit14;
+static int hf_diameter_3gpp_feature_list2_rx_flags_bit15;
+static int hf_diameter_3gpp_feature_list2_rx_flags_spare_bits;
+
+static int hf_diameter_3gpp_ran_nas_protocol_type;
+static int hf_diameter_3gpp_ran_nas_cause_type;
+static int hf_diameter_3gpp_ran_nas_cause_value;
+static int hf_diameter_3gpp_s1ap_radio_network;
+static int hf_diameter_3gpp_s1ap_transport;
+static int hf_diameter_3gpp_s1ap_nas;
+static int hf_diameter_3gpp_s1ap_protocol;
+static int hf_diameter_3gpp_s1ap_misc;
+static int hf_diameter_3gpp_emm_cause;
+static int hf_diameter_3gpp_esm_cause;
+static int hf_diameter_3gpp_diameter_cause;
+static int hf_diameter_3gpp_ikev2_cause;
 
 /* Dissector handles */
 static dissector_handle_t xml_handle;
diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c
index f0fb08266b..d60fcb3346 100644
--- a/epan/dissectors/packet-dis.c
+++ b/epan/dissectors/packet-dis.c
@@ -4338,578 +4338,578 @@ static const value_string DIS_PDU_IffModeC_Strings[] =
 *******************************************************************************/
 
 /* DIS global */
-static gint proto_dis = -1;
-static int hf_dis_proto_ver = -1;
-static int hf_dis_exercise_id = -1;
-static int hf_dis_pdu_type = -1;
-static int hf_dis_proto_fam = -1;
-static int hf_dis_header_rel_ts = -1;
-static int hf_dis_pdu_length = -1;
-static int hf_dis_padding = -1;
-static int hf_dis_pdu_status = -1;
-static int hf_pdu_status_tei = -1;
-static int hf_pdu_status_lvc = -1;
-static int hf_pdu_status_cei = -1;
-static int hf_pdu_status_fti = -1;
-static int hf_pdu_status_dti = -1;
-static int hf_pdu_status_rai = -1;
-static int hf_pdu_status_iai = -1;
-static int hf_pdu_status_ism = -1;
-static int hf_pdu_status_aii = -1;
-static int hf_pdu_status_field = -1;
-static int hf_dis_event_type = -1;
-static int hf_dis_model_type = -1;
-static int hf_dis_po_ver = -1;
-static int hf_dis_po_pdu_type = -1;
-static int hf_dis_po_database_id = -1;
-static int hf_dis_po_length = -1;
-static int hf_dis_po_pdu_count = -1;
-static int hf_dis_entity_id_site = -1;
-static int hf_dis_entity_id_application = -1;
-static int hf_dis_entity_id_entity = -1;
-static int hf_dis_emitter_id = -1;
-static int hf_dis_beam_id = -1;
-static int hf_dis_num_art_params = -1;
-static int hf_dis_clocktime = -1;
-static int hf_dis_entityKind = -1;
-static int hf_dis_entityDomain = -1;
-static int hf_dis_category_land = -1;
-static int hf_dis_category_air = -1;
-static int hf_dis_category_surface = -1;
-static int hf_dis_category_subsurface = -1;
-static int hf_dis_category_space = -1;
-static int hf_dis_category = -1;
-static int hf_dis_country = -1;
-static int hf_dis_subcategory = -1;
-static int hf_dis_specific = -1;
-static int hf_dis_extra = -1;
-static int hf_dis_site = -1;
-static int hf_dis_request_id = -1;
-static int hf_dis_reason = -1;
-static int hf_dis_frozen_behavior = -1;
-static int hf_dis_acknowledge_flag = -1;
-static int hf_dis_response_flag = -1;
-static int hf_dis_application = -1;
-static int hf_dis_action_id = -1;
-static int hf_dis_request_status = -1;
-static int hf_dis_num_fixed_data = -1;
-static int hf_dis_num_variable_data = -1;
-static int hf_dis_datum_id = -1;
-static int hf_dis_fixed_datum_value = -1;
-static int hf_dis_datum_length = -1;
-static int hf_dis_variable_datum_value = -1;
-static int hf_dis_variable_datum_value_as_text = -1;
-static int hf_dis_time_interval8 = -1;
-static int hf_dis_time_interval32 = -1;
-static int hf_dis_num_fixed_datum_id = -1;
-static int hf_dis_num_variable_datum_id = -1;
-static int hf_dis_reliability = -1;
-static int hf_dis_control_id = -1;
-static int hf_dis_orig_app_type = -1;
-static int hf_dis_recv_app_type = -1;
-static int hf_dis_num_parts = -1;
-static int hf_dis_current_part = -1;
-static int hf_dis_num_variable_records = -1;
-static int hf_dis_variable_record_type = -1;
-static int hf_dis_variable_record_len = -1;
-static int hf_dis_event_number = -1;
-static int hf_dis_num_electromagnetic_emission_systems = -1;
-static int hf_dis_emitter_name = -1;
-static int hf_dis_emission_function = -1;
-static int hf_dis_em_data_length = -1;
-static int hf_dis_em_num_beams = -1;
-static int hf_dis_emitter_id_number = -1;
-static int hf_dis_em_location_x = -1;
-static int hf_dis_em_location_y = -1;
-static int hf_dis_em_location_z = -1;
-static int hf_dis_beam_function = -1;
-static int hf_dis_radio_id = -1;
-static int hf_dis_transmitter_radio_id = -1;
-static int hf_dis_ens = -1;
-static int hf_dis_ens_class = -1;
-static int hf_dis_ens_type = -1;
-static int hf_dis_ens_type_audio = -1;
-static int hf_dis_tdl_type = -1;
-static int hf_dis_sample_rate = -1;
-static int hf_dis_data_length = -1;
-static int hf_dis_num_of_samples = -1;
-static int hf_dis_signal_data = -1;
-static int hf_dis_radio_category = -1;
-static int hf_dis_nomenclature_version = -1;
-static int hf_dis_nomenclature = -1;
-static int hf_dis_radio_transmit_state = -1;
-static int hf_dis_radio_receive_state = -1;
-static int hf_dis_radio_input_source = -1;
-static int hf_dis_antenna_location_x = -1;
-static int hf_dis_antenna_location_y = -1;
-static int hf_dis_antenna_location_z = -1;
-static int hf_dis_rel_antenna_location_x = -1;
-static int hf_dis_rel_antenna_location_y = -1;
-static int hf_dis_rel_antenna_location_z = -1;
-static int hf_dis_antenna_pattern_type = -1;
-static int hf_dis_antenna_pattern_length = -1;
-static int hf_dis_transmit_frequency = -1;
-static int hf_dis_transmit_freq_bandwidth = -1;
-static int hf_dis_transmit_power = -1;
-static int hf_dis_receive_power = -1;
-static int hf_dis_spread_spectrum_usage = -1;
-static int hf_dis_frequency_hopping = -1;
-static int hf_dis_pseudo_noise_modulation = -1;
-static int hf_dis_time_hopping = -1;
-static int hf_dis_modulation_major = -1;
-static int hf_dis_modulation_amplitude = -1;
-static int hf_dis_modulation_amplitude_angle = -1;
-static int hf_dis_modulation_angle = -1;
-static int hf_dis_modulation_combination = -1;
-static int hf_dis_modulation_pulse = -1;
-static int hf_dis_modulation_unmodulated = -1;
-static int hf_dis_modulation_detail = -1;
-static int hf_dis_modulation_system = -1;
-static int hf_dis_crypto_system = -1;
-static int hf_dis_crypto_key = -1;
-static int hf_dis_encryption_mode = -1;
-static int hf_dis_key_identifier = -1;
-static int hf_dis_modulation_parameter_length = -1;
-static int hf_dis_mod_param_fh_net_id = -1;
-static int hf_dis_mod_param_fh_set_id = -1;
-static int hf_dis_mod_param_fh_lo_set_id = -1;
-static int hf_dis_mod_param_fh_msg_start = -1;
-static int hf_dis_mod_param_fh_reserved = -1;
-static int hf_dis_mod_param_fh_sync_time_offset = -1;
-static int hf_dis_mod_param_fh_security_key = -1;
-static int hf_dis_mod_param_fh_clear_channel = -1;
-static int hf_dis_mod_param_dump = -1;
-static int hf_dis_mod_param_ts_allocation_mode = -1;
-static int hf_dis_mod_param_transmitter_prim_mode = -1;
-static int hf_dis_mod_param_transmitter_second_mode = -1;
-static int hf_dis_mod_param_sync_state = -1;
-static int hf_dis_mod_param_network_sync_id = -1;
-static int hf_dis_force_id = -1;
+static gint proto_dis;
+static int hf_dis_proto_ver;
+static int hf_dis_exercise_id;
+static int hf_dis_pdu_type;
+static int hf_dis_proto_fam;
+static int hf_dis_header_rel_ts;
+static int hf_dis_pdu_length;
+static int hf_dis_padding;
+static int hf_dis_pdu_status;
+static int hf_pdu_status_tei;
+static int hf_pdu_status_lvc;
+static int hf_pdu_status_cei;
+static int hf_pdu_status_fti;
+static int hf_pdu_status_dti;
+static int hf_pdu_status_rai;
+static int hf_pdu_status_iai;
+static int hf_pdu_status_ism;
+static int hf_pdu_status_aii;
+static int hf_pdu_status_field;
+static int hf_dis_event_type;
+static int hf_dis_model_type;
+static int hf_dis_po_ver;
+static int hf_dis_po_pdu_type;
+static int hf_dis_po_database_id;
+static int hf_dis_po_length;
+static int hf_dis_po_pdu_count;
+static int hf_dis_entity_id_site;
+static int hf_dis_entity_id_application;
+static int hf_dis_entity_id_entity;
+static int hf_dis_emitter_id;
+static int hf_dis_beam_id;
+static int hf_dis_num_art_params;
+static int hf_dis_clocktime;
+static int hf_dis_entityKind;
+static int hf_dis_entityDomain;
+static int hf_dis_category_land;
+static int hf_dis_category_air;
+static int hf_dis_category_surface;
+static int hf_dis_category_subsurface;
+static int hf_dis_category_space;
+static int hf_dis_category;
+static int hf_dis_country;
+static int hf_dis_subcategory;
+static int hf_dis_specific;
+static int hf_dis_extra;
+static int hf_dis_site;
+static int hf_dis_request_id;
+static int hf_dis_reason;
+static int hf_dis_frozen_behavior;
+static int hf_dis_acknowledge_flag;
+static int hf_dis_response_flag;
+static int hf_dis_application;
+static int hf_dis_action_id;
+static int hf_dis_request_status;
+static int hf_dis_num_fixed_data;
+static int hf_dis_num_variable_data;
+static int hf_dis_datum_id;
+static int hf_dis_fixed_datum_value;
+static int hf_dis_datum_length;
+static int hf_dis_variable_datum_value;
+static int hf_dis_variable_datum_value_as_text;
+static int hf_dis_time_interval8;
+static int hf_dis_time_interval32;
+static int hf_dis_num_fixed_datum_id;
+static int hf_dis_num_variable_datum_id;
+static int hf_dis_reliability;
+static int hf_dis_control_id;
+static int hf_dis_orig_app_type;
+static int hf_dis_recv_app_type;
+static int hf_dis_num_parts;
+static int hf_dis_current_part;
+static int hf_dis_num_variable_records;
+static int hf_dis_variable_record_type;
+static int hf_dis_variable_record_len;
+static int hf_dis_event_number;
+static int hf_dis_num_electromagnetic_emission_systems;
+static int hf_dis_emitter_name;
+static int hf_dis_emission_function;
+static int hf_dis_em_data_length;
+static int hf_dis_em_num_beams;
+static int hf_dis_emitter_id_number;
+static int hf_dis_em_location_x;
+static int hf_dis_em_location_y;
+static int hf_dis_em_location_z;
+static int hf_dis_beam_function;
+static int hf_dis_radio_id;
+static int hf_dis_transmitter_radio_id;
+static int hf_dis_ens;
+static int hf_dis_ens_class;
+static int hf_dis_ens_type;
+static int hf_dis_ens_type_audio;
+static int hf_dis_tdl_type;
+static int hf_dis_sample_rate;
+static int hf_dis_data_length;
+static int hf_dis_num_of_samples;
+static int hf_dis_signal_data;
+static int hf_dis_radio_category;
+static int hf_dis_nomenclature_version;
+static int hf_dis_nomenclature;
+static int hf_dis_radio_transmit_state;
+static int hf_dis_radio_receive_state;
+static int hf_dis_radio_input_source;
+static int hf_dis_antenna_location_x;
+static int hf_dis_antenna_location_y;
+static int hf_dis_antenna_location_z;
+static int hf_dis_rel_antenna_location_x;
+static int hf_dis_rel_antenna_location_y;
+static int hf_dis_rel_antenna_location_z;
+static int hf_dis_antenna_pattern_type;
+static int hf_dis_antenna_pattern_length;
+static int hf_dis_transmit_frequency;
+static int hf_dis_transmit_freq_bandwidth;
+static int hf_dis_transmit_power;
+static int hf_dis_receive_power;
+static int hf_dis_spread_spectrum_usage;
+static int hf_dis_frequency_hopping;
+static int hf_dis_pseudo_noise_modulation;
+static int hf_dis_time_hopping;
+static int hf_dis_modulation_major;
+static int hf_dis_modulation_amplitude;
+static int hf_dis_modulation_amplitude_angle;
+static int hf_dis_modulation_angle;
+static int hf_dis_modulation_combination;
+static int hf_dis_modulation_pulse;
+static int hf_dis_modulation_unmodulated;
+static int hf_dis_modulation_detail;
+static int hf_dis_modulation_system;
+static int hf_dis_crypto_system;
+static int hf_dis_crypto_key;
+static int hf_dis_encryption_mode;
+static int hf_dis_key_identifier;
+static int hf_dis_modulation_parameter_length;
+static int hf_dis_mod_param_fh_net_id;
+static int hf_dis_mod_param_fh_set_id;
+static int hf_dis_mod_param_fh_lo_set_id;
+static int hf_dis_mod_param_fh_msg_start;
+static int hf_dis_mod_param_fh_reserved;
+static int hf_dis_mod_param_fh_sync_time_offset;
+static int hf_dis_mod_param_fh_security_key;
+static int hf_dis_mod_param_fh_clear_channel;
+static int hf_dis_mod_param_dump;
+static int hf_dis_mod_param_ts_allocation_mode;
+static int hf_dis_mod_param_transmitter_prim_mode;
+static int hf_dis_mod_param_transmitter_second_mode;
+static int hf_dis_mod_param_sync_state;
+static int hf_dis_mod_param_network_sync_id;
+static int hf_dis_force_id;
 
 /* DIS aggregate */
-static int hf_dis_aggregate_marking = -1;
-static int hf_dis_aggregate_number_of_aggregates = -1;
-static int hf_dis_aggregate_number_of_entities = -1;
-static int hf_dis_aggregate_number_of_silent_aggregates_types = -1;
-static int hf_dis_aggregate_number_of_silent_entity_types = -1;
-static int hf_dis_aggregate_number_of_variable_datum_records = -1;
-static int hf_dis_aggregate_state = -1;
-static int hf_dis_aggregate_formation = -1;
-static int hf_dis_aggregate_kind = -1;
-static int hf_dis_aggregate_domain = -1;
-static int hf_dis_aggregate_country = -1;
-static int hf_dis_aggregate_category = -1;
-static int hf_dis_aggregate_subcategory = -1;
-static int hf_dis_aggregate_specific = -1;
-static int hf_dis_aggregate_extra = -1;
-static int hf_dis_aggregate_dimensions_x = -1;
-static int hf_dis_aggregate_dimensions_y = -1;
-static int hf_dis_aggregate_dimensions_z = -1;
-static int hf_dis_aggregate_orientation_psi = -1;
-static int hf_dis_aggregate_orientation_theta = -1;
-static int hf_dis_aggregate_orientation_phi = -1;
-static int hf_dis_aggregate_center_of_mass_x = -1;
-static int hf_dis_aggregate_center_of_mass_y = -1;
-static int hf_dis_aggregate_center_of_mass_z = -1;
-static int hf_dis_aggregate_velocity_x = -1;
-static int hf_dis_aggregate_velocity_y = -1;
-static int hf_dis_aggregate_velocity_z = -1;
-static int hf_dis_aggregate_id_site = -1;
-static int hf_dis_aggregate_id_application = -1;
-static int hf_dis_aggregate_id_aggregate = -1;
+static int hf_dis_aggregate_marking;
+static int hf_dis_aggregate_number_of_aggregates;
+static int hf_dis_aggregate_number_of_entities;
+static int hf_dis_aggregate_number_of_silent_aggregates_types;
+static int hf_dis_aggregate_number_of_silent_entity_types;
+static int hf_dis_aggregate_number_of_variable_datum_records;
+static int hf_dis_aggregate_state;
+static int hf_dis_aggregate_formation;
+static int hf_dis_aggregate_kind;
+static int hf_dis_aggregate_domain;
+static int hf_dis_aggregate_country;
+static int hf_dis_aggregate_category;
+static int hf_dis_aggregate_subcategory;
+static int hf_dis_aggregate_specific;
+static int hf_dis_aggregate_extra;
+static int hf_dis_aggregate_dimensions_x;
+static int hf_dis_aggregate_dimensions_y;
+static int hf_dis_aggregate_dimensions_z;
+static int hf_dis_aggregate_orientation_psi;
+static int hf_dis_aggregate_orientation_theta;
+static int hf_dis_aggregate_orientation_phi;
+static int hf_dis_aggregate_center_of_mass_x;
+static int hf_dis_aggregate_center_of_mass_y;
+static int hf_dis_aggregate_center_of_mass_z;
+static int hf_dis_aggregate_velocity_x;
+static int hf_dis_aggregate_velocity_y;
+static int hf_dis_aggregate_velocity_z;
+static int hf_dis_aggregate_id_site;
+static int hf_dis_aggregate_id_application;
+static int hf_dis_aggregate_id_aggregate;
 
 /* DIS environment */
-static int hf_dis_environmental_number_of_environment_records = -1;
-static int hf_dis_environmental_sequence_number = -1;
-static int hf_dis_environment_status_last = -1;
-static int hf_dis_environment_status_on = -1;
-static int hf_dis_environment_kind = -1;
-static int hf_dis_environment_domain = -1;
-static int hf_dis_environment_class = -1;
-static int hf_dis_environment_category = -1;
-static int hf_dis_environment_subcategory = -1;
-static int hf_dis_environment_specific = -1;
-static int hf_dis_environment_extra = -1;
+static int hf_dis_environmental_number_of_environment_records;
+static int hf_dis_environmental_sequence_number;
+static int hf_dis_environment_status_last;
+static int hf_dis_environment_status_on;
+static int hf_dis_environment_kind;
+static int hf_dis_environment_domain;
+static int hf_dis_environment_class;
+static int hf_dis_environment_category;
+static int hf_dis_environment_subcategory;
+static int hf_dis_environment_specific;
+static int hf_dis_environment_extra;
 
 /* DIS datums */
-static int hf_dis_fixed_datum_value_as_uint = -1;
-static int hf_dis_fixed_datum_value_as_float = -1;
-static int hf_dis_fixed_datum_value_as_int = -1;
+static int hf_dis_fixed_datum_value_as_uint;
+static int hf_dis_fixed_datum_value_as_float;
+static int hf_dis_fixed_datum_value_as_int;
 
 /* Appearance */
-static int hf_appearance_frozen_status = -1;
-static int hf_appearance_state = -1;
-static int hf_appearance_weapon_1 = -1;
-static int hf_appearance_weapon_2 = -1;
-static int hf_appearance_camouflage_type = -1;
-static int hf_appearance_concealed_stationary = -1;
-static int hf_appearance_concealed_movement = -1;
-static int hf_appearance_landform_paint_scheme = -1;
-static int hf_appearance_landform_mobility = -1;
-static int hf_appearance_landform_fire_power = -1;
-static int hf_appearance_landform_damage = -1;
-static int hf_appearance_landform_smoke_entity = -1;
-static int hf_appearance_landform_trailing_effects_entity = -1;
-static int hf_appearance_landform_hatch = -1;
-static int hf_appearance_landform_head_lights = -1;
-static int hf_appearance_landform_tail_lights = -1;
-static int hf_appearance_landform_brake_lights = -1;
-static int hf_appearance_landform_flaming = -1;
-static int hf_appearance_landform_launcher = -1;
-static int hf_appearance_landform_camouflage_type = -1;
-static int hf_appearance_landform_concealed = -1;
-static int hf_appearance_landform_frozen_status = -1;
-static int hf_appearance_landform_power_plant_status = -1;
-static int hf_appearance_landform_state = -1;
-static int hf_appearance_landform_tent = -1;
-static int hf_appearance_landform_ramp = -1;
-static int hf_appearance_landform_blackout_lights = -1;
-static int hf_appearance_landform_blackout_brake_lights = -1;
-static int hf_appearance_landform_spot_lights = -1;
-static int hf_appearance_landform_interior_lights = -1;
-static int hf_appearance_landform_surrender_state = -1;
-static int hf_appearance_landform_masked_cloaked = -1;
-static int hf_appearance_lifeform_paint_scheme = -1;
-static int hf_appearance_lifeform_health = -1;
-static int hf_appearance_lifeform_compliance = -1;
-static int hf_appearance_lifeform_flash_lights = -1;
-static int hf_appearance_lifeform_state = -1;
+static int hf_appearance_frozen_status;
+static int hf_appearance_state;
+static int hf_appearance_weapon_1;
+static int hf_appearance_weapon_2;
+static int hf_appearance_camouflage_type;
+static int hf_appearance_concealed_stationary;
+static int hf_appearance_concealed_movement;
+static int hf_appearance_landform_paint_scheme;
+static int hf_appearance_landform_mobility;
+static int hf_appearance_landform_fire_power;
+static int hf_appearance_landform_damage;
+static int hf_appearance_landform_smoke_entity;
+static int hf_appearance_landform_trailing_effects_entity;
+static int hf_appearance_landform_hatch;
+static int hf_appearance_landform_head_lights;
+static int hf_appearance_landform_tail_lights;
+static int hf_appearance_landform_brake_lights;
+static int hf_appearance_landform_flaming;
+static int hf_appearance_landform_launcher;
+static int hf_appearance_landform_camouflage_type;
+static int hf_appearance_landform_concealed;
+static int hf_appearance_landform_frozen_status;
+static int hf_appearance_landform_power_plant_status;
+static int hf_appearance_landform_state;
+static int hf_appearance_landform_tent;
+static int hf_appearance_landform_ramp;
+static int hf_appearance_landform_blackout_lights;
+static int hf_appearance_landform_blackout_brake_lights;
+static int hf_appearance_landform_spot_lights;
+static int hf_appearance_landform_interior_lights;
+static int hf_appearance_landform_surrender_state;
+static int hf_appearance_landform_masked_cloaked;
+static int hf_appearance_lifeform_paint_scheme;
+static int hf_appearance_lifeform_health;
+static int hf_appearance_lifeform_compliance;
+static int hf_appearance_lifeform_flash_lights;
+static int hf_appearance_lifeform_state;
 
 /* Entity */
-static int hf_dis_entity_marking_character_set = -1;
-static int hf_dis_aggregate_marking_character_set = -1;
-static int hf_dis_entity_dead_reckoning_algorithm = -1;
-static int hf_dis_dead_reckoning_other_parameters = -1;
-static int hf_dis_entity_location_x_double = -1;
-static int hf_dis_entity_location_x_float = -1;
-static int hf_dis_entity_location_y_double = -1;
-static int hf_dis_entity_location_y_float = -1;
-static int hf_dis_entity_location_z_double = -1;
-static int hf_dis_entity_location_z_float = -1;
-static int hf_dis_entity_orientation_psi = -1;
-static int hf_dis_entity_orientation_theta = -1;
-static int hf_dis_entity_orientation_phi = -1;
-static int hf_dis_entity_linear_velocity_x = -1;
-static int hf_dis_entity_linear_velocity_y = -1;
-static int hf_dis_entity_linear_velocity_z = -1;
-static int hf_dis_entity_linear_acceleration_x = -1;
-static int hf_dis_entity_linear_acceleration_y = -1;
-static int hf_dis_entity_linear_acceleration_z = -1;
-static int hf_dis_entity_entity_angular_velocity_x = -1;
-static int hf_dis_entity_entity_angular_velocity_y = -1;
-static int hf_dis_entity_entity_angular_velocity_z = -1;
+static int hf_dis_entity_marking_character_set;
+static int hf_dis_aggregate_marking_character_set;
+static int hf_dis_entity_dead_reckoning_algorithm;
+static int hf_dis_dead_reckoning_other_parameters;
+static int hf_dis_entity_location_x_double;
+static int hf_dis_entity_location_x_float;
+static int hf_dis_entity_location_y_double;
+static int hf_dis_entity_location_y_float;
+static int hf_dis_entity_location_z_double;
+static int hf_dis_entity_location_z_float;
+static int hf_dis_entity_orientation_psi;
+static int hf_dis_entity_orientation_theta;
+static int hf_dis_entity_orientation_phi;
+static int hf_dis_entity_linear_velocity_x;
+static int hf_dis_entity_linear_velocity_y;
+static int hf_dis_entity_linear_velocity_z;
+static int hf_dis_entity_linear_acceleration_x;
+static int hf_dis_entity_linear_acceleration_y;
+static int hf_dis_entity_linear_acceleration_z;
+static int hf_dis_entity_entity_angular_velocity_x;
+static int hf_dis_entity_entity_angular_velocity_y;
+static int hf_dis_entity_entity_angular_velocity_z;
 
 /* Intercom */
-static int hf_intercom_control_control_type = -1;
-static int hf_intercom_control_communications_channel_type = -1;
-static int hf_intercom_control_source_communications_device_id = -1;
-static int hf_intercom_control_source_line_id = -1;
-static int hf_intercom_control_transmit_priority = -1;
-static int hf_intercom_control_transmit_line_state = -1;
-static int hf_intercom_control_command = -1;
-static int hf_intercom_control_master_communications_device_id = -1;
-static int hf_intercom_control_master_channel_id = -1;
+static int hf_intercom_control_control_type;
+static int hf_intercom_control_communications_channel_type;
+static int hf_intercom_control_source_communications_device_id;
+static int hf_intercom_control_source_line_id;
+static int hf_intercom_control_transmit_priority;
+static int hf_intercom_control_transmit_line_state;
+static int hf_intercom_control_command;
+static int hf_intercom_control_master_communications_device_id;
+static int hf_intercom_control_master_channel_id;
 
 /* TODO: put them in the best matched group */
-static int hf_entity_appearance = -1;
-static int hf_dis_entity_marking = -1;
+static int hf_entity_appearance;
+static int hf_dis_entity_marking;
 
 /* Dis designator */
-static int hf_dis_designator_code_name = -1;
-static int hf_dis_designator_designator_code = -1;
-static int hf_dis_designator_power = -1;
-static int hf_dis_designator_wavelength = -1;
-static int hf_dis_designator_spot_with_respect_to_designated_entity_x = -1;
-static int hf_dis_designator_spot_with_respect_to_designated_entity_y = -1;
-static int hf_dis_designator_spot_with_respect_to_designated_entity_z = -1;
-static int hf_dis_designator_spot_location_x = -1;
-static int hf_dis_designator_spot_location_y = -1;
-static int hf_dis_designator_spot_location_z = -1;
+static int hf_dis_designator_code_name;
+static int hf_dis_designator_designator_code;
+static int hf_dis_designator_power;
+static int hf_dis_designator_wavelength;
+static int hf_dis_designator_spot_with_respect_to_designated_entity_x;
+static int hf_dis_designator_spot_with_respect_to_designated_entity_y;
+static int hf_dis_designator_spot_with_respect_to_designated_entity_z;
+static int hf_dis_designator_spot_location_x;
+static int hf_dis_designator_spot_location_y;
+static int hf_dis_designator_spot_location_z;
 
 /* Collision */
-static int hf_dis_collision_type = -1;
-static int hf_dis_collision_mass = -1;
-static int hf_dis_collision_location_x = -1;
-static int hf_dis_collision_location_y = -1;
-static int hf_dis_collision_location_z = -1;
+static int hf_dis_collision_type;
+static int hf_dis_collision_mass;
+static int hf_dis_collision_location_x;
+static int hf_dis_collision_location_y;
+static int hf_dis_collision_location_z;
 
 /* More DIS global */
-static int hf_dis_capabilities = -1;
-static int hf_dis_variable_parameter_type = -1;
-static int hf_dis_num_shafts = -1;
-static int hf_dis_num_apas = -1;
-static int hf_dis_state_update_indicator = -1;
-static int hf_dis_passive_parameter_index = -1;
-static int hf_dis_propulsion_plant_config = -1;
-static int hf_dis_shaft_rpm_current = -1;
-static int hf_dis_shaft_rpm_ordered = -1;
-static int hf_dis_shaft_rpm_change_rate = -1;
-static int hf_dis_num_ua_emitter_systems = -1;
-static int hf_dis_apas_parameter_index = -1;
-static int hf_dis_apas_value = -1;
-static int hf_dis_ua_emission_name = -1;
-static int hf_dis_ua_emission_function = -1;
-static int hf_dis_ua_emission_id_number = -1;
-static int hf_dis_ua_emitter_data_length = -1;
-static int hf_dis_ua_num_beams = -1;
-static int hf_dis_ua_location_x = -1;
-static int hf_dis_ua_location_y = -1;
-static int hf_dis_ua_location_z = -1;
-static int hf_dis_ua_beam_data_length = -1;
-static int hf_dis_ua_beam_id_number = -1;
-static int hf_dis_ua_beam_active_emission_parameter_index = -1;
-static int hf_dis_ua_beam_scan_pattern = -1;
-static int hf_dis_ua_beam_center_azimuth = -1;
-static int hf_dis_ua_beam_azimuthal_beamwidth = -1;
-static int hf_dis_ua_beam_center_de = -1;
-static int hf_dis_ua_beam_de_beamwidth = -1;
-static int hf_dis_em_beam_data_length = -1;
-static int hf_dis_em_beam_id_number = -1;
-static int hf_dis_em_beam_parameter_index = -1;
-static int hf_dis_em_fund_frequency = -1;
-static int hf_dis_em_fund_frequency_range = -1;
-static int hf_dis_em_fund_effective_radiated_power = -1;
-static int hf_dis_em_fund_pulse_repetition_freq = -1;
-static int hf_dis_em_fund_pulse_width = -1;
-static int hf_dis_em_fund_beam_azimuth_center = -1;
-static int hf_dis_em_fund_beam_azimuth_sweep = -1;
-static int hf_dis_em_fund_beam_elevation_center = -1;
-static int hf_dis_em_fund_beam_elevation_sweep = -1;
-static int hf_dis_em_fund_beem_sweep_sync = -1;
-static int hf_dis_track_jam_num_targ = -1;
-static int hf_dis_track_jam_high_density = -1;
-static int hf_dis_jamming_mode_seq = -1;
-static int hf_dis_warhead = -1;
-static int hf_dis_fuse = -1;
-static int hf_dis_quality = -1;
-static int hf_dis_rate = -1;
-static int hf_dis_fire_mission_index = -1;
-static int hf_dis_fire_location_x = -1;
-static int hf_dis_fire_location_y = -1;
-static int hf_dis_fire_location_z = -1;
-static int hf_dis_linear_velocity_x = -1;
-static int hf_dis_linear_velocity_y = -1;
-static int hf_dis_linear_velocity_z = -1;
-static int hf_dis_range = -1;
-static int hf_dis_detonation_location_x = -1;
-static int hf_dis_detonation_location_y = -1;
-static int hf_dis_detonation_location_z = -1;
-static int hf_dis_detonation_result = -1;
-static int hf_dis_simulator_type = -1;
-static int hf_dis_database_seq_num = -1;
-static int hf_dis_simulator_load = -1;
-static int hf_dis_simulation_load = -1;
-static int hf_dis_time = -1;
-static int hf_dis_packets_sent = -1;
-static int hf_dis_unit_database_version = -1;
-static int hf_dis_relative_battle_scheme = -1;
-static int hf_dis_terrain_name = -1;
-static int hf_dis_terrain_version = -1;
-static int hf_dis_host_name = -1;
-static int hf_dis_sequence_number = -1;
-static int hf_dis_persist_obj_class = -1;
-static int hf_dis_missing_from_world_state = -1;
-static int hf_dis_obj_count = -1;
-static int hf_dis_clock_rate = -1;
-static int hf_dis_sec_since_1970 = -1;
-static int hf_dis_str_data = -1;
-static int hf_dis_record_data = -1;
-static int hf_dis_alignment_padding = -1;
-static int hf_dis_vp_change_indicator = -1;
-static int hf_dis_vp_association_status = -1;
-static int hf_dis_vp_association_type = -1;
-static int hf_dis_vp_own_station_location = -1;
-static int hf_dis_vp_phys_conn_type = -1;
-static int hf_dis_vp_group_member_type = -1;
-static int hf_dis_vp_group_number = -1;
-static int hf_dis_vp_offset_type = -1;
-static int hf_dis_vp_offset_x = -1;
-static int hf_dis_vp_offset_y = -1;
-static int hf_dis_vp_offset_z = -1;
-static int hf_dis_vp_attached_indicator = -1;
-static int hf_dis_vp_part_attached_to_id = -1;
-static int hf_dis_vp_artic_param_type = -1;
-static int hf_dis_vp_change = -1;
-static int hf_dis_vp_parameter_value = -1;
-static int hf_dis_vp_padding = -1;
-static int hf_dis_vr_exercise_id = -1;
-static int hf_dis_vr_exercise_file_path = -1;
-static int hf_dis_vr_exercise_file_name = -1;
-static int hf_dis_vr_application_role = -1;
-static int hf_dis_vr_num_records = -1;
-static int hf_dis_vr_status_type = -1;
-static int hf_dis_vr_general_status = -1;
-static int hf_dis_vr_specific_status = -1;
-static int hf_dis_vr_status_value_int = -1;
-static int hf_dis_vr_status_value_float = -1;
-static int hf_dis_signal_link16_npg = -1;
-static int hf_dis_signal_link16_tsec_cvll = -1;
-static int hf_dis_signal_link16_msec_cvll = -1;
-static int hf_dis_signal_link16_message_type = -1;
-static int hf_dis_signal_link16_ptt = -1;
-static int hf_dis_signal_link16_time_slot_type = - 1;
-static int hf_dis_signal_link16_rti = -1;
-static int hf_dis_signal_link16_stn = -1;
-static int hf_dis_signal_link16_sdusn = -1;
-static int hf_dis_signal_link16_network_number = -1;
-static int hf_dis_signal_link16_time_slot_id = -1;
-static int hf_dis_iff_system_type = -1;
-static int hf_dis_iff_system_name = -1;
-static int hf_dis_iff_system_mode = -1;
-static int hf_dis_iff_change_options = -1;
-static int hf_dis_iff_change_indicator = -1;
-static int hf_dis_iff_alternate_mode_4 = -1;
-static int hf_dis_iff_alternate_mode_c = -1;
-static int hf_dis_iff_heartbeat_indicator = -1;
-static int hf_dis_iff_transponder_interrogator_indicator = -1;
-static int hf_dis_iff_simulation_mode = -1;
-static int hf_dis_iff_interactive_capable = -1;
-static int hf_dis_iff_test_mode = -1;
-static int hf_dis_iff_system_designator = -1;
-static int hf_dis_iff_system_specific_data = -1;
-static int hf_dis_iff_system_status = -1;
-static int hf_dis_iff_system_status_system_onoff = -1;
-static int hf_dis_iff_system_status_parameter_1 = -1;
-static int hf_dis_iff_system_status_parameter_2 = -1;
-static int hf_dis_iff_system_status_parameter_3 = -1;
-static int hf_dis_iff_system_status_parameter_4 = -1;
-static int hf_dis_iff_system_status_parameter_5 = -1;
-static int hf_dis_iff_system_status_parameter_6 = -1;
-static int hf_dis_iff_system_status_operational = -1;
-static int hf_dis_iff_alternate_parameter_4 = -1;
-static int hf_dis_iff_information_layers = -1;
-static int hf_dis_iff_information_layers_layer_1 = -1;
-static int hf_dis_iff_information_layers_layer_2 = -1;
-static int hf_dis_iff_information_layers_layer_3 = -1;
-static int hf_dis_iff_information_layers_layer_4 = -1;
-static int hf_dis_iff_information_layers_layer_5 = -1;
-static int hf_dis_iff_information_layers_layer_6 = -1;
-static int hf_dis_iff_information_layers_layer_7 = -1;
-static int hf_dis_iff_modifier = -1;
-static int hf_dis_iff_modifier_emergency = -1;
-static int hf_dis_iff_modifier_ident = -1;
-static int hf_dis_iff_modifier_sti = -1;
-static int hf_dis_iff_modifier_unmanned_aircraft = -1;
-static int hf_dis_iff_parameter_1 = -1;
-static int hf_dis_iff_parameter_2 = -1;
-static int hf_dis_iff_parameter_3 = -1;
-static int hf_dis_iff_parameter_4 = -1;
-static int hf_dis_iff_parameter_5 = -1;
-static int hf_dis_iff_parameter_6 = -1;
-static int hf_dis_iff_mode_code_element_1 = -1;
-static int hf_dis_iff_mode_code_element_2 = -1;
-static int hf_dis_iff_mode_code_element_3 = -1;
-static int hf_dis_iff_mode_code_element_4 = -1;
-static int hf_dis_iff_rrb = -1;
-static int hf_dis_iff_rrb_rrb_code = -1;
-static int hf_dis_iff_rrb_power_reduction_indicator = -1;
-static int hf_dis_iff_rrb_radar_enhancement_indicator = -1;
-static int hf_dis_iff_mode_4 = -1;
-static int hf_dis_iff_mode_s_interrogator_identifier = -1;
+static int hf_dis_capabilities;
+static int hf_dis_variable_parameter_type;
+static int hf_dis_num_shafts;
+static int hf_dis_num_apas;
+static int hf_dis_state_update_indicator;
+static int hf_dis_passive_parameter_index;
+static int hf_dis_propulsion_plant_config;
+static int hf_dis_shaft_rpm_current;
+static int hf_dis_shaft_rpm_ordered;
+static int hf_dis_shaft_rpm_change_rate;
+static int hf_dis_num_ua_emitter_systems;
+static int hf_dis_apas_parameter_index;
+static int hf_dis_apas_value;
+static int hf_dis_ua_emission_name;
+static int hf_dis_ua_emission_function;
+static int hf_dis_ua_emission_id_number;
+static int hf_dis_ua_emitter_data_length;
+static int hf_dis_ua_num_beams;
+static int hf_dis_ua_location_x;
+static int hf_dis_ua_location_y;
+static int hf_dis_ua_location_z;
+static int hf_dis_ua_beam_data_length;
+static int hf_dis_ua_beam_id_number;
+static int hf_dis_ua_beam_active_emission_parameter_index;
+static int hf_dis_ua_beam_scan_pattern;
+static int hf_dis_ua_beam_center_azimuth;
+static int hf_dis_ua_beam_azimuthal_beamwidth;
+static int hf_dis_ua_beam_center_de;
+static int hf_dis_ua_beam_de_beamwidth;
+static int hf_dis_em_beam_data_length;
+static int hf_dis_em_beam_id_number;
+static int hf_dis_em_beam_parameter_index;
+static int hf_dis_em_fund_frequency;
+static int hf_dis_em_fund_frequency_range;
+static int hf_dis_em_fund_effective_radiated_power;
+static int hf_dis_em_fund_pulse_repetition_freq;
+static int hf_dis_em_fund_pulse_width;
+static int hf_dis_em_fund_beam_azimuth_center;
+static int hf_dis_em_fund_beam_azimuth_sweep;
+static int hf_dis_em_fund_beam_elevation_center;
+static int hf_dis_em_fund_beam_elevation_sweep;
+static int hf_dis_em_fund_beem_sweep_sync;
+static int hf_dis_track_jam_num_targ;
+static int hf_dis_track_jam_high_density;
+static int hf_dis_jamming_mode_seq;
+static int hf_dis_warhead;
+static int hf_dis_fuse;
+static int hf_dis_quality;
+static int hf_dis_rate;
+static int hf_dis_fire_mission_index;
+static int hf_dis_fire_location_x;
+static int hf_dis_fire_location_y;
+static int hf_dis_fire_location_z;
+static int hf_dis_linear_velocity_x;
+static int hf_dis_linear_velocity_y;
+static int hf_dis_linear_velocity_z;
+static int hf_dis_range;
+static int hf_dis_detonation_location_x;
+static int hf_dis_detonation_location_y;
+static int hf_dis_detonation_location_z;
+static int hf_dis_detonation_result;
+static int hf_dis_simulator_type;
+static int hf_dis_database_seq_num;
+static int hf_dis_simulator_load;
+static int hf_dis_simulation_load;
+static int hf_dis_time;
+static int hf_dis_packets_sent;
+static int hf_dis_unit_database_version;
+static int hf_dis_relative_battle_scheme;
+static int hf_dis_terrain_name;
+static int hf_dis_terrain_version;
+static int hf_dis_host_name;
+static int hf_dis_sequence_number;
+static int hf_dis_persist_obj_class;
+static int hf_dis_missing_from_world_state;
+static int hf_dis_obj_count;
+static int hf_dis_clock_rate;
+static int hf_dis_sec_since_1970;
+static int hf_dis_str_data;
+static int hf_dis_record_data;
+static int hf_dis_alignment_padding;
+static int hf_dis_vp_change_indicator;
+static int hf_dis_vp_association_status;
+static int hf_dis_vp_association_type;
+static int hf_dis_vp_own_station_location;
+static int hf_dis_vp_phys_conn_type;
+static int hf_dis_vp_group_member_type;
+static int hf_dis_vp_group_number;
+static int hf_dis_vp_offset_type;
+static int hf_dis_vp_offset_x;
+static int hf_dis_vp_offset_y;
+static int hf_dis_vp_offset_z;
+static int hf_dis_vp_attached_indicator;
+static int hf_dis_vp_part_attached_to_id;
+static int hf_dis_vp_artic_param_type;
+static int hf_dis_vp_change;
+static int hf_dis_vp_parameter_value;
+static int hf_dis_vp_padding;
+static int hf_dis_vr_exercise_id;
+static int hf_dis_vr_exercise_file_path;
+static int hf_dis_vr_exercise_file_name;
+static int hf_dis_vr_application_role;
+static int hf_dis_vr_num_records;
+static int hf_dis_vr_status_type;
+static int hf_dis_vr_general_status;
+static int hf_dis_vr_specific_status;
+static int hf_dis_vr_status_value_int;
+static int hf_dis_vr_status_value_float;
+static int hf_dis_signal_link16_npg;
+static int hf_dis_signal_link16_tsec_cvll;
+static int hf_dis_signal_link16_msec_cvll;
+static int hf_dis_signal_link16_message_type;
+static int hf_dis_signal_link16_ptt;
+static int hf_dis_signal_link16_time_slot_type;
+static int hf_dis_signal_link16_rti;
+static int hf_dis_signal_link16_stn;
+static int hf_dis_signal_link16_sdusn;
+static int hf_dis_signal_link16_network_number;
+static int hf_dis_signal_link16_time_slot_id;
+static int hf_dis_iff_system_type;
+static int hf_dis_iff_system_name;
+static int hf_dis_iff_system_mode;
+static int hf_dis_iff_change_options;
+static int hf_dis_iff_change_indicator;
+static int hf_dis_iff_alternate_mode_4;
+static int hf_dis_iff_alternate_mode_c;
+static int hf_dis_iff_heartbeat_indicator;
+static int hf_dis_iff_transponder_interrogator_indicator;
+static int hf_dis_iff_simulation_mode;
+static int hf_dis_iff_interactive_capable;
+static int hf_dis_iff_test_mode;
+static int hf_dis_iff_system_designator;
+static int hf_dis_iff_system_specific_data;
+static int hf_dis_iff_system_status;
+static int hf_dis_iff_system_status_system_onoff;
+static int hf_dis_iff_system_status_parameter_1;
+static int hf_dis_iff_system_status_parameter_2;
+static int hf_dis_iff_system_status_parameter_3;
+static int hf_dis_iff_system_status_parameter_4;
+static int hf_dis_iff_system_status_parameter_5;
+static int hf_dis_iff_system_status_parameter_6;
+static int hf_dis_iff_system_status_operational;
+static int hf_dis_iff_alternate_parameter_4;
+static int hf_dis_iff_information_layers;
+static int hf_dis_iff_information_layers_layer_1;
+static int hf_dis_iff_information_layers_layer_2;
+static int hf_dis_iff_information_layers_layer_3;
+static int hf_dis_iff_information_layers_layer_4;
+static int hf_dis_iff_information_layers_layer_5;
+static int hf_dis_iff_information_layers_layer_6;
+static int hf_dis_iff_information_layers_layer_7;
+static int hf_dis_iff_modifier;
+static int hf_dis_iff_modifier_emergency;
+static int hf_dis_iff_modifier_ident;
+static int hf_dis_iff_modifier_sti;
+static int hf_dis_iff_modifier_unmanned_aircraft;
+static int hf_dis_iff_parameter_1;
+static int hf_dis_iff_parameter_2;
+static int hf_dis_iff_parameter_3;
+static int hf_dis_iff_parameter_4;
+static int hf_dis_iff_parameter_5;
+static int hf_dis_iff_parameter_6;
+static int hf_dis_iff_mode_code_element_1;
+static int hf_dis_iff_mode_code_element_2;
+static int hf_dis_iff_mode_code_element_3;
+static int hf_dis_iff_mode_code_element_4;
+static int hf_dis_iff_rrb;
+static int hf_dis_iff_rrb_rrb_code;
+static int hf_dis_iff_rrb_power_reduction_indicator;
+static int hf_dis_iff_rrb_radar_enhancement_indicator;
+static int hf_dis_iff_mode_4;
+static int hf_dis_iff_mode_s_interrogator_identifier;
 static int hf_dis_iff_mode_s_interrogator_identifier_primary_ic_type;
 static int hf_dis_iff_mode_s_interrogator_identifier_primary_ic_code;
 static int hf_dis_iff_mode_s_interrogator_identifier_secondary_ic_type;
 static int hf_dis_iff_mode_s_interrogator_identifier_secondary_ic_code;
-static int hf_dis_iff_mode_c_altitude_indicator = -1;
-static int hf_dis_iff_mode_c_altitude = -1;
-static int hf_dis_iff_tcas_acas = -1;
-static int hf_dis_iff_tcas_acas_basic_advanced_indicator = -1;
-static int hf_dis_iff_tcas_acas_tcas_acas_indicator = -1;
-static int hf_dis_iff_tcas_acas_software_version = -1;
-static int hf_dis_iff_tcas_acas_tcas_acas_type = -1;
-static int hf_dis_iff_tcas_acas_tcas_type = -1;
-static int hf_dis_iff_mode_status = -1;
-static int hf_dis_iff_mode_damage = -1;
-static int hf_dis_iff_mode_malfunction = -1;
-
-static gint ett_dis = -1;
-static gint ett_dis_header = -1;
-static gint ett_pdu_status = -1;
-static gint ett_dis_po_header = -1;
-static gint ett_dis_payload = -1;
-static gint ett_entity = -1;
-static gint ett_trackjam = -1;
-static gint ett_dis_ens = -1;
-static gint ett_radio_entity_type = -1;
-static gint ett_entity_type = -1;
-static gint ett_dis_crypto_key = -1;
-static gint ett_antenna_location = -1;
-static gint ett_rel_antenna_location = -1;
-static gint ett_aggregate_dimensions = -1;
-static gint ett_aggregate_orientation = -1;
-static gint ett_aggregate_velocity = -1;
-static gint ett_aggregate_id_list = -1;
-static gint ett_entity_id_list = -1;
-static gint ett_variable_datum = -1;
-
-
-
-
-
-static gint ett_modulation_type = -1;
-static gint ett_modulation_parameters = -1;
-static gint ett_entity_linear_velocity = -1;
-static gint ett_entity_location = -1;
-static gint ett_entity_orientation = -1;
-static gint ett_entity_marking_text = -1;
-static gint ett_aggregate_marking_text = -1;
-static gint ett_entity_dead_reckoning_parameters = -1;
-static gint ett_entity_linear_acceleration = -1;
-static gint ett_entity_angular_velocity = -1;
-static gint ett_environmental_environment_status = -1;
-static gint ett_environmental_environment_type = -1;
-static gint ett_aggregate_type = -1;
-static gint ett_aggregate_center_of_mass = -1;
-static gint ett_designator_spot_location = -1;
-static gint ett_designator_spot_with_respect_to_designated_entity = -1;
-static gint ett_designator_entity_linear_acceleration = -1;
-
-
-
-
-
-static gint ett_entity_appearance = -1;
-static gint ett_variable_parameter = -1;
-static gint ett_event_id = -1;
-static gint ett_shafts = -1;
-static gint ett_apas = -1;
-static gint ett_underwater_acoustic_emission = -1;
-static gint ett_acoustic_emitter_system = -1;
-static gint ett_ua_location = -1;
-static gint ett_ua_beams = -1;
-static gint ett_ua_beam_data = -1;
-static gint ett_emission_system = -1;
-static gint ett_emitter_system = -1;
-static gint ett_em_beam = -1;
-static gint ett_emitter_location = -1;
-static gint ett_em_fundamental_parameter_data = -1;
-static gint ett_burst_descriptor = -1;
-static gint ett_fire_location = -1;
-static gint ett_linear_velocity = -1;
-static gint ett_detonation_location = -1;
-static gint ett_clock_time = -1;
-static gint ett_fixed_datum = -1;
-static gint ett_record = -1;
-static gint ett_simulation_address = -1;
-static gint ett_offset_vector = -1;
-static gint ett_dis_signal_link16_network_header = -1;
-static gint ett_dis_signal_link16_message_data = -1;
-static gint ett_dis_signal_link16_jtids_header = -1;
-static gint ett_iff_location = -1;
-static gint ett_iff_system_id = -1;
-static gint ett_iff_change_options = -1;
-static gint ett_iff_fundamental_operational_data = -1;
-static gint ett_iff_system_status = -1;
-static gint ett_iff_information_layers = -1;
-static gint ett_iff_modifier = -1;
-static gint ett_iff_parameter_1 = -1;
-static gint ett_iff_rrb = -1;
-static gint ett_iff_parameter_2 = -1;
-static gint ett_iff_parameter_3 = -1;
-static gint ett_iff_parameter_4 = -1;
-static gint ett_iff_mode_s_interrogator_identifier = -1;
-static gint ett_iff_parameter_5 = -1;
-static gint ett_iff_parameter_6 = -1;
+static int hf_dis_iff_mode_c_altitude_indicator;
+static int hf_dis_iff_mode_c_altitude;
+static int hf_dis_iff_tcas_acas;
+static int hf_dis_iff_tcas_acas_basic_advanced_indicator;
+static int hf_dis_iff_tcas_acas_tcas_acas_indicator;
+static int hf_dis_iff_tcas_acas_software_version;
+static int hf_dis_iff_tcas_acas_tcas_acas_type;
+static int hf_dis_iff_tcas_acas_tcas_type;
+static int hf_dis_iff_mode_status;
+static int hf_dis_iff_mode_damage;
+static int hf_dis_iff_mode_malfunction;
+
+static gint ett_dis;
+static gint ett_dis_header;
+static gint ett_pdu_status;
+static gint ett_dis_po_header;
+static gint ett_dis_payload;
+static gint ett_entity;
+static gint ett_trackjam;
+static gint ett_dis_ens;
+static gint ett_radio_entity_type;
+static gint ett_entity_type;
+static gint ett_dis_crypto_key;
+static gint ett_antenna_location;
+static gint ett_rel_antenna_location;
+static gint ett_aggregate_dimensions;
+static gint ett_aggregate_orientation;
+static gint ett_aggregate_velocity;
+static gint ett_aggregate_id_list;
+static gint ett_entity_id_list;
+static gint ett_variable_datum;
+
+
+
+
+
+static gint ett_modulation_type;
+static gint ett_modulation_parameters;
+static gint ett_entity_linear_velocity;
+static gint ett_entity_location;
+static gint ett_entity_orientation;
+static gint ett_entity_marking_text;
+static gint ett_aggregate_marking_text;
+static gint ett_entity_dead_reckoning_parameters;
+static gint ett_entity_linear_acceleration;
+static gint ett_entity_angular_velocity;
+static gint ett_environmental_environment_status;
+static gint ett_environmental_environment_type;
+static gint ett_aggregate_type;
+static gint ett_aggregate_center_of_mass;
+static gint ett_designator_spot_location;
+static gint ett_designator_spot_with_respect_to_designated_entity;
+static gint ett_designator_entity_linear_acceleration;
+
+
+
+
+
+static gint ett_entity_appearance;
+static gint ett_variable_parameter;
+static gint ett_event_id;
+static gint ett_shafts;
+static gint ett_apas;
+static gint ett_underwater_acoustic_emission;
+static gint ett_acoustic_emitter_system;
+static gint ett_ua_location;
+static gint ett_ua_beams;
+static gint ett_ua_beam_data;
+static gint ett_emission_system;
+static gint ett_emitter_system;
+static gint ett_em_beam;
+static gint ett_emitter_location;
+static gint ett_em_fundamental_parameter_data;
+static gint ett_burst_descriptor;
+static gint ett_fire_location;
+static gint ett_linear_velocity;
+static gint ett_detonation_location;
+static gint ett_clock_time;
+static gint ett_fixed_datum;
+static gint ett_record;
+static gint ett_simulation_address;
+static gint ett_offset_vector;
+static gint ett_dis_signal_link16_network_header;
+static gint ett_dis_signal_link16_message_data;
+static gint ett_dis_signal_link16_jtids_header;
+static gint ett_iff_location;
+static gint ett_iff_system_id;
+static gint ett_iff_change_options;
+static gint ett_iff_fundamental_operational_data;
+static gint ett_iff_system_status;
+static gint ett_iff_information_layers;
+static gint ett_iff_modifier;
+static gint ett_iff_parameter_1;
+static gint ett_iff_rrb;
+static gint ett_iff_parameter_2;
+static gint ett_iff_parameter_3;
+static gint ett_iff_parameter_4;
+static gint ett_iff_mode_s_interrogator_identifier;
+static gint ett_iff_parameter_5;
+static gint ett_iff_parameter_6;
 
 static dissector_handle_t link16_handle;
 
diff --git a/epan/dissectors/packet-discard.c b/epan/dissectors/packet-discard.c
index 2e86d142a0..cc1b43f980 100644
--- a/epan/dissectors/packet-discard.c
+++ b/epan/dissectors/packet-discard.c
@@ -26,17 +26,17 @@
 void proto_register_discard(void);
 void proto_reg_handoff_discard(void);
 
-static int proto_discard = -1;
+static int proto_discard;
 
-static int hf_discard_data = -1;
-static int hf_discard_text = -1;
-static int hf_discard_md5_hash = -1;
-static int hf_discard_len = -1;
+static int hf_discard_data;
+static int hf_discard_text;
+static int hf_discard_md5_hash;
+static int hf_discard_len;
 
 static gboolean show_as_text = FALSE;
 static gboolean generate_md5_hash = FALSE;
 
-static gint ett_discard = -1;
+static gint ett_discard;
 
 /* dissect_discard - dissects discard packet data
  * tvb - tvbuff for packet data (IN)
diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c
index 2469a0f85c..43fb6b885e 100644
--- a/epan/dissectors/packet-distcc.c
+++ b/epan/dissectors/packet-distcc.c
@@ -24,20 +24,20 @@
 
 #include <wsutil/strtoi.h>
 
-static int proto_distcc = -1;
-static int hf_distcc_version = -1;
-static int hf_distcc_argc = -1;
-static int hf_distcc_argv = -1;
-static int hf_distcc_doti_source = -1;
-static int hf_distcc_stat = -1;
-static int hf_distcc_serr = -1;
-static int hf_distcc_sout = -1;
-static int hf_distcc_doto_object = -1;
+static int proto_distcc;
+static int hf_distcc_version;
+static int hf_distcc_argc;
+static int hf_distcc_argv;
+static int hf_distcc_doti_source;
+static int hf_distcc_stat;
+static int hf_distcc_serr;
+static int hf_distcc_sout;
+static int hf_distcc_doto_object;
 
 
-static gint ett_distcc = -1;
+static gint ett_distcc;
 
-static expert_field ei_distcc_short_pdu = EI_INIT;
+static expert_field ei_distcc_short_pdu;
 
 
 static gboolean distcc_desegment = TRUE;
diff --git a/epan/dissectors/packet-dji-uav.c b/epan/dissectors/packet-dji-uav.c
index 9788ed9bac..68f236f600 100644
--- a/epan/dissectors/packet-dji-uav.c
+++ b/epan/dissectors/packet-dji-uav.c
@@ -48,33 +48,33 @@ typedef struct _djiuav_transaction_t {
 /* Finally: Protocol specific stuff */
 
 /* protocol handles */
-static int proto_djiuav = -1;
+static int proto_djiuav;
 
 /* ett handles */
-static int ett_djiuav = -1;
+static int ett_djiuav;
 
 /* hf elements */
-static int hf_djiuav_magic = -1;
-static int hf_djiuav_length = -1;
-static int hf_djiuav_flags = -1;
-static int hf_djiuav_seqno = -1;
-static int hf_djiuav_cmd = -1;
-static int hf_djiuav_checksum = -1;
+static int hf_djiuav_magic;
+static int hf_djiuav_length;
+static int hf_djiuav_flags;
+static int hf_djiuav_seqno;
+static int hf_djiuav_cmd;
+static int hf_djiuav_checksum;
 #if 0
-static int hf_djiuav_cmd04_unknown = -1;
-static int hf_djiuav_resp04_unknown = -1;
+static int hf_djiuav_cmd04_unknown;
+static int hf_djiuav_resp04_unknown;
 #endif
-static int hf_djiuav_cmd20_unknown = -1;
+static int hf_djiuav_cmd20_unknown;
 #if 0
-static int hf_djiuav_resp20_unknown = -1;
+static int hf_djiuav_resp20_unknown;
 #endif
-static int hf_djiuav_cmdunk = -1;
-static int hf_djiuav_respunk = -1;
-static int hf_djiuav_extradata = -1;
+static int hf_djiuav_cmdunk;
+static int hf_djiuav_respunk;
+static int hf_djiuav_extradata;
 /* hf request/response tracking */
-static int hf_djiuav_response_in = -1;
-static int hf_djiuav_response_to = -1;
-static int hf_djiuav_response_time = -1;
+static int hf_djiuav_response_in;
+static int hf_djiuav_response_to;
+static int hf_djiuav_response_time;
 
 #define PROTO_SHORT_NAME "DJIUAV"
 #define PROTO_LONG_NAME "DJI UAV Drone Control Protocol"
diff --git a/epan/dissectors/packet-dlep.c b/epan/dissectors/packet-dlep.c
index 2ab4908389..3f35482dae 100644
--- a/epan/dissectors/packet-dlep.c
+++ b/epan/dissectors/packet-dlep.c
@@ -202,82 +202,82 @@ static dissector_table_t dlep_dataitem_table;
 void proto_register_dlep(void);
 void proto_reg_handoff_dlep(void);
 
-static gint proto_dlep = -1;
-static gint proto_dataitem = -1;
-
-static gint ett_dlep = -1;
-static gint ett_dlep_dataitem = -1;
-static gint ett_dlep_flags = -1;
-
-static gint hf_dlep_signal = -1;
-static gint hf_dlep_signal_signature = -1;
-static gint hf_dlep_signal_type = -1;
-static gint hf_dlep_signal_length = -1;
-static gint hf_dlep_message = -1;
-static gint hf_dlep_message_type = -1;
-static gint hf_dlep_message_length = -1;
-static gint hf_dlep_dataitem = -1;
-static gint hf_dlep_dataitem_type = -1;
-static gint hf_dlep_dataitem_length = -1;
-static gint hf_dlep_dataitem_value = -1;
-static gint hf_dlep_dataitem_status = -1;
-static gint hf_dlep_dataitem_status_code = -1;
-static gint hf_dlep_dataitem_status_text = -1;
-static gint hf_dlep_dataitem_v4conn = -1;
-static gint hf_dlep_dataitem_v4conn_flags = -1;
-static gint hf_dlep_dataitem_v4conn_flags_tls = -1;
-static gint hf_dlep_dataitem_v4conn_addr = -1;
-static gint hf_dlep_dataitem_v4conn_port = -1;
-static gint hf_dlep_dataitem_v6conn = -1;
-static gint hf_dlep_dataitem_v6conn_flags = -1;
-static gint hf_dlep_dataitem_v6conn_flags_tls = -1;
-static gint hf_dlep_dataitem_v6conn_addr = -1;
-static gint hf_dlep_dataitem_v6conn_port = -1;
-static gint hf_dlep_dataitem_peertype = -1;
-static gint hf_dlep_dataitem_peertype_flags = -1;
-static gint hf_dlep_dataitem_peertype_flags_smi = -1;
-static gint hf_dlep_dataitem_peertype_description = -1;
-static gint hf_dlep_dataitem_heartbeat = -1;
-static gint hf_dlep_dataitem_extsupp = -1;
-static gint hf_dlep_dataitem_extsupp_code = -1;
-static gint hf_dlep_dataitem_macaddr_eui48 = -1;
-static gint hf_dlep_dataitem_macaddr_eui64 = -1;
-static gint hf_dlep_dataitem_v4addr = -1;
-static gint hf_dlep_dataitem_v4addr_flags = -1;
-static gint hf_dlep_dataitem_v4addr_flags_adddrop = -1;
-static gint hf_dlep_dataitem_v4addr_addr = -1;
-static gint hf_dlep_dataitem_v6addr = -1;
-static gint hf_dlep_dataitem_v6addr_flags = -1;
-static gint hf_dlep_dataitem_v6addr_flags_adddrop = -1;
-static gint hf_dlep_dataitem_v6addr_addr = -1;
-static gint hf_dlep_dataitem_v4subnet = -1;
-static gint hf_dlep_dataitem_v4subnet_flags = -1;
-static gint hf_dlep_dataitem_v4subnet_flags_adddrop = -1;
-static gint hf_dlep_dataitem_v4subnet_subnet = -1;
-static gint hf_dlep_dataitem_v4subnet_prefixlen = -1;
-static gint hf_dlep_dataitem_v6subnet = -1;
-static gint hf_dlep_dataitem_v6subnet_flags = -1;
-static gint hf_dlep_dataitem_v6subnet_flags_adddrop = -1;
-static gint hf_dlep_dataitem_v6subnet_subnet = -1;
-static gint hf_dlep_dataitem_v6subnet_prefixlen = -1;
-static gint hf_dlep_dataitem_mdrr = -1;
-static gint hf_dlep_dataitem_mdrt = -1;
-static gint hf_dlep_dataitem_cdrr = -1;
-static gint hf_dlep_dataitem_cdrt = -1;
-static gint hf_dlep_dataitem_latency = -1;
-static gint hf_dlep_dataitem_resources = -1;
-static gint hf_dlep_dataitem_rlqr = -1;
-static gint hf_dlep_dataitem_rlqt = -1;
-static gint hf_dlep_dataitem_mtu = -1;
-static gint hf_dlep_dataitem_hop_count_flags = -1;
-static gint hf_dlep_dataitem_hop_count_flags_p = -1;
-static gint hf_dlep_dataitem_hop_count_flags_reserved = -1;
-static gint hf_dlep_dataitem_hop_count = -1;
-static gint hf_dlep_dataitem_hop_control = -1;
-static gint hf_dlep_dataitem_li_length = -1;
-static gint hf_dlep_dataitem_li = -1;
-static gint hf_dlep_dataitem_max_lat = -1;
-static gint hf_dlep_dataitem_min_lat = -1;
+static gint proto_dlep;
+static gint proto_dataitem;
+
+static gint ett_dlep;
+static gint ett_dlep_dataitem;
+static gint ett_dlep_flags;
+
+static gint hf_dlep_signal;
+static gint hf_dlep_signal_signature;
+static gint hf_dlep_signal_type;
+static gint hf_dlep_signal_length;
+static gint hf_dlep_message;
+static gint hf_dlep_message_type;
+static gint hf_dlep_message_length;
+static gint hf_dlep_dataitem;
+static gint hf_dlep_dataitem_type;
+static gint hf_dlep_dataitem_length;
+static gint hf_dlep_dataitem_value;
+static gint hf_dlep_dataitem_status;
+static gint hf_dlep_dataitem_status_code;
+static gint hf_dlep_dataitem_status_text;
+static gint hf_dlep_dataitem_v4conn;
+static gint hf_dlep_dataitem_v4conn_flags;
+static gint hf_dlep_dataitem_v4conn_flags_tls;
+static gint hf_dlep_dataitem_v4conn_addr;
+static gint hf_dlep_dataitem_v4conn_port;
+static gint hf_dlep_dataitem_v6conn;
+static gint hf_dlep_dataitem_v6conn_flags;
+static gint hf_dlep_dataitem_v6conn_flags_tls;
+static gint hf_dlep_dataitem_v6conn_addr;
+static gint hf_dlep_dataitem_v6conn_port;
+static gint hf_dlep_dataitem_peertype;
+static gint hf_dlep_dataitem_peertype_flags;
+static gint hf_dlep_dataitem_peertype_flags_smi;
+static gint hf_dlep_dataitem_peertype_description;
+static gint hf_dlep_dataitem_heartbeat;
+static gint hf_dlep_dataitem_extsupp;
+static gint hf_dlep_dataitem_extsupp_code;
+static gint hf_dlep_dataitem_macaddr_eui48;
+static gint hf_dlep_dataitem_macaddr_eui64;
+static gint hf_dlep_dataitem_v4addr;
+static gint hf_dlep_dataitem_v4addr_flags;
+static gint hf_dlep_dataitem_v4addr_flags_adddrop;
+static gint hf_dlep_dataitem_v4addr_addr;
+static gint hf_dlep_dataitem_v6addr;
+static gint hf_dlep_dataitem_v6addr_flags;
+static gint hf_dlep_dataitem_v6addr_flags_adddrop;
+static gint hf_dlep_dataitem_v6addr_addr;
+static gint hf_dlep_dataitem_v4subnet;
+static gint hf_dlep_dataitem_v4subnet_flags;
+static gint hf_dlep_dataitem_v4subnet_flags_adddrop;
+static gint hf_dlep_dataitem_v4subnet_subnet;
+static gint hf_dlep_dataitem_v4subnet_prefixlen;
+static gint hf_dlep_dataitem_v6subnet;
+static gint hf_dlep_dataitem_v6subnet_flags;
+static gint hf_dlep_dataitem_v6subnet_flags_adddrop;
+static gint hf_dlep_dataitem_v6subnet_subnet;
+static gint hf_dlep_dataitem_v6subnet_prefixlen;
+static gint hf_dlep_dataitem_mdrr;
+static gint hf_dlep_dataitem_mdrt;
+static gint hf_dlep_dataitem_cdrr;
+static gint hf_dlep_dataitem_cdrt;
+static gint hf_dlep_dataitem_latency;
+static gint hf_dlep_dataitem_resources;
+static gint hf_dlep_dataitem_rlqr;
+static gint hf_dlep_dataitem_rlqt;
+static gint hf_dlep_dataitem_mtu;
+static gint hf_dlep_dataitem_hop_count_flags;
+static gint hf_dlep_dataitem_hop_count_flags_p;
+static gint hf_dlep_dataitem_hop_count_flags_reserved;
+static gint hf_dlep_dataitem_hop_count;
+static gint hf_dlep_dataitem_hop_control;
+static gint hf_dlep_dataitem_li_length;
+static gint hf_dlep_dataitem_li;
+static gint hf_dlep_dataitem_max_lat;
+static gint hf_dlep_dataitem_min_lat;
 
 static const value_string signal_type_vals[] = {
   { DLEP_SIG_RESERVED,  "Reserved"        },
@@ -376,10 +376,10 @@ static const range_string hop_cntrl_action_vals[] = {
   { 0,     0,     NULL                     }
 };
 
-static expert_field ei_dlep_signal_unexpected_length = EI_INIT;
-static expert_field ei_dlep_message_unexpected_length = EI_INIT;
-static expert_field ei_dlep_dataitem_unexpected_length = EI_INIT;
-static expert_field ei_dlep_dataitem_macaddr_unexpected_length = EI_INIT;
+static expert_field ei_dlep_signal_unexpected_length;
+static expert_field ei_dlep_message_unexpected_length;
+static expert_field ei_dlep_dataitem_unexpected_length;
+static expert_field ei_dlep_dataitem_macaddr_unexpected_length;
 
 /* Section 13.1: Status */
 static int
diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c
index bb00265a4d..108b46357c 100644
--- a/epan/dissectors/packet-dlm3.c
+++ b/epan/dissectors/packet-dlm3.c
@@ -175,199 +175,199 @@ static dissector_handle_t dlm3_sctp_handle;
 
 
 /* Initialize the protocol and registered fields */
-static int proto_dlm3 = -1;
+static int proto_dlm3;
 
 /* fields for struct dlm_header(h) */
-static int hf_dlm3_h_version   = -1;
-static int hf_dlm3_h_major_version = -1;
-static int hf_dlm3_h_minor_version = -1;
-static int hf_dlm3_h_lockspace = -1;
-static int hf_dlm3_h_seq       = -1;
-static int hf_dlm3_h_nodeid    = -1;
-static int hf_dlm3_h_length    = -1;
-static int hf_dlm3_h_cmd       = -1;
-static int hf_dlm3_h_pad       = -1;
+static int hf_dlm3_h_version;
+static int hf_dlm3_h_major_version;
+static int hf_dlm3_h_minor_version;
+static int hf_dlm3_h_lockspace;
+static int hf_dlm3_h_seq;
+static int hf_dlm3_h_nodeid;
+static int hf_dlm3_h_length;
+static int hf_dlm3_h_cmd;
+static int hf_dlm3_h_pad;
 
 /* fields for struct dlm_opts(o) */
-static int hf_dlm3_o_nextcmd = -1;
-static int hf_dlm3_o_pad     = -1;
-static int hf_dlm3_o_optlen  = -1;
-static int hf_dlm3_o_pad2    = -1;
-static int hf_dlm3_o_opts    = -1;
+static int hf_dlm3_o_nextcmd;
+static int hf_dlm3_o_pad;
+static int hf_dlm3_o_optlen;
+static int hf_dlm3_o_pad2;
+static int hf_dlm3_o_opts;
 
 /* fields for struct dlm_opt_header(t) */
-static int hf_dlm3_t_type   = -1;
-static int hf_dlm3_t_length = -1;
-static int hf_dlm3_t_pad    = -1;
-static int hf_dlm3_t_value  = -1;
+static int hf_dlm3_t_type;
+static int hf_dlm3_t_length;
+static int hf_dlm3_t_pad;
+static int hf_dlm3_t_value;
 
 /* fields for struct dlm_message(m) */
-static int hf_dlm3_m_type         = -1;
-static int hf_dlm3_m_nodeid       = -1;
-static int hf_dlm3_m_pid          = -1;
-static int hf_dlm3_m_lkid         = -1;
-static int hf_dlm3_m_remid        = -1;
-static int hf_dlm3_m_parent_lkid  = -1;
-static int hf_dlm3_m_parent_remid = -1;
+static int hf_dlm3_m_type;
+static int hf_dlm3_m_nodeid;
+static int hf_dlm3_m_pid;
+static int hf_dlm3_m_lkid;
+static int hf_dlm3_m_remid;
+static int hf_dlm3_m_parent_lkid;
+static int hf_dlm3_m_parent_remid;
 
 /* bit fields for dlm_message::exflags */
 
-static int hf_dlm3_m_exflags             = -1;
-static int hf_dlm3_m_exflags_noqueue     = -1;
-static int hf_dlm3_m_exflags_cancel      = -1;
-static int hf_dlm3_m_exflags_convert     = -1;
-static int hf_dlm3_m_exflags_valblk      = -1;
-static int hf_dlm3_m_exflags_quecvt      = -1;
-static int hf_dlm3_m_exflags_ivvalblk    = -1;
-static int hf_dlm3_m_exflags_convdeadlk  = -1;
-static int hf_dlm3_m_exflags_persistent  = -1;
-static int hf_dlm3_m_exflags_nodlckwt    = -1;
-static int hf_dlm3_m_exflags_nodlckblk   = -1;
-static int hf_dlm3_m_exflags_expedite    = -1;
-static int hf_dlm3_m_exflags_noqueuebast = -1;
-static int hf_dlm3_m_exflags_headque     = -1;
-static int hf_dlm3_m_exflags_noorder     = -1;
-static int hf_dlm3_m_exflags_orphan      = -1;
-static int hf_dlm3_m_exflags_altpr       = -1;
-static int hf_dlm3_m_exflags_altcw       = -1;
-static int hf_dlm3_m_exflags_forceunlock = -1;
-static int hf_dlm3_m_exflags_timeout     = -1;
+static int hf_dlm3_m_exflags;
+static int hf_dlm3_m_exflags_noqueue;
+static int hf_dlm3_m_exflags_cancel;
+static int hf_dlm3_m_exflags_convert;
+static int hf_dlm3_m_exflags_valblk;
+static int hf_dlm3_m_exflags_quecvt;
+static int hf_dlm3_m_exflags_ivvalblk;
+static int hf_dlm3_m_exflags_convdeadlk;
+static int hf_dlm3_m_exflags_persistent;
+static int hf_dlm3_m_exflags_nodlckwt;
+static int hf_dlm3_m_exflags_nodlckblk;
+static int hf_dlm3_m_exflags_expedite;
+static int hf_dlm3_m_exflags_noqueuebast;
+static int hf_dlm3_m_exflags_headque;
+static int hf_dlm3_m_exflags_noorder;
+static int hf_dlm3_m_exflags_orphan;
+static int hf_dlm3_m_exflags_altpr;
+static int hf_dlm3_m_exflags_altcw;
+static int hf_dlm3_m_exflags_forceunlock;
+static int hf_dlm3_m_exflags_timeout;
 
 /* bit fields for dlm_message::sbflags */
-static int hf_dlm3_m_sbflags             = -1;
-static int hf_dlm3_m_sbflags_demoted     = -1;
-static int hf_dlm3_m_sbflags_valnotvalid = -1;
-static int hf_dlm3_m_sbflags_altmode     = -1;
+static int hf_dlm3_m_sbflags;
+static int hf_dlm3_m_sbflags_demoted;
+static int hf_dlm3_m_sbflags_valnotvalid;
+static int hf_dlm3_m_sbflags_altmode;
 
 /* bit fields for dlm_message::flags */
 
-static int hf_dlm3_m_flags          = -1;
-static int hf_dlm3_m_flags_user     = -1;
-static int hf_dlm3_m_flags_orphan   = -1;
+static int hf_dlm3_m_flags;
+static int hf_dlm3_m_flags_user;
+static int hf_dlm3_m_flags_orphan;
 
-static int hf_dlm3_m_lvbseq       = -1;
-static int hf_dlm3_m_hash         = -1;
-static int hf_dlm3_m_status       = -1;
-static int hf_dlm3_m_grmode       = -1;
-static int hf_dlm3_m_rqmode       = -1;
-static int hf_dlm3_m_bastmode     = -1;
+static int hf_dlm3_m_lvbseq;
+static int hf_dlm3_m_hash;
+static int hf_dlm3_m_status;
+static int hf_dlm3_m_grmode;
+static int hf_dlm3_m_rqmode;
+static int hf_dlm3_m_bastmode;
 
 /* bit fields for dlm_message::asts */
-static int hf_dlm3_m_asts         = -1;
-static int hf_dlm3_m_asts_comp    = -1;
-static int hf_dlm3_m_asts_bast    = -1;
+static int hf_dlm3_m_asts;
+static int hf_dlm3_m_asts_comp;
+static int hf_dlm3_m_asts_bast;
 
-static int hf_dlm3_m_result       = -1;
-static int hf_dlm3_m_extra        = -1;
+static int hf_dlm3_m_result;
+static int hf_dlm3_m_extra;
 
 /* fields for struct dlm_rcom(rc) */
-static int hf_dlm3_rc_type      = -1;
-static int hf_dlm3_rc_result    = -1;
-static int hf_dlm3_rc_id        = -1;
-static int hf_dlm3_rc_seq       = -1;
-static int hf_dlm3_rc_seq_reply = -1;
-static int hf_dlm3_rc_buf       = -1;
+static int hf_dlm3_rc_type;
+static int hf_dlm3_rc_result;
+static int hf_dlm3_rc_id;
+static int hf_dlm3_rc_seq;
+static int hf_dlm3_rc_seq_reply;
+static int hf_dlm3_rc_buf;
 
 /* fields for struct rcom_config(rf) */
-static int hf_dlm3_rf_lvblen              = -1;
-static int hf_dlm3_rf_lsflags             = -1;
-static int hf_dlm3_rf_lsflags_noqueue     = -1;
-static int hf_dlm3_rf_lsflags_cancel      = -1;
-static int hf_dlm3_rf_lsflags_convert     = -1;
-static int hf_dlm3_rf_lsflags_valblk      = -1;
-static int hf_dlm3_rf_lsflags_quecvt      = -1;
-static int hf_dlm3_rf_lsflags_ivvalblk    = -1;
-static int hf_dlm3_rf_lsflags_convdeadlk  = -1;
-static int hf_dlm3_rf_lsflags_persistent  = -1;
-static int hf_dlm3_rf_lsflags_nodlckwt    = -1;
-static int hf_dlm3_rf_lsflags_nodlckblk   = -1;
-static int hf_dlm3_rf_lsflags_expedite    = -1;
-static int hf_dlm3_rf_lsflags_noqueuebast = -1;
-static int hf_dlm3_rf_lsflags_headque     = -1;
-static int hf_dlm3_rf_lsflags_noorder     = -1;
-static int hf_dlm3_rf_lsflags_orphan      = -1;
-static int hf_dlm3_rf_lsflags_altpr       = -1;
-static int hf_dlm3_rf_lsflags_altcw       = -1;
-static int hf_dlm3_rf_lsflags_forceunlock = -1;
-static int hf_dlm3_rf_lsflags_timeout     = -1;
-static int hf_dlm3_rf_unused              = -1;
+static int hf_dlm3_rf_lvblen;
+static int hf_dlm3_rf_lsflags;
+static int hf_dlm3_rf_lsflags_noqueue;
+static int hf_dlm3_rf_lsflags_cancel;
+static int hf_dlm3_rf_lsflags_convert;
+static int hf_dlm3_rf_lsflags_valblk;
+static int hf_dlm3_rf_lsflags_quecvt;
+static int hf_dlm3_rf_lsflags_ivvalblk;
+static int hf_dlm3_rf_lsflags_convdeadlk;
+static int hf_dlm3_rf_lsflags_persistent;
+static int hf_dlm3_rf_lsflags_nodlckwt;
+static int hf_dlm3_rf_lsflags_nodlckblk;
+static int hf_dlm3_rf_lsflags_expedite;
+static int hf_dlm3_rf_lsflags_noqueuebast;
+static int hf_dlm3_rf_lsflags_headque;
+static int hf_dlm3_rf_lsflags_noorder;
+static int hf_dlm3_rf_lsflags_orphan;
+static int hf_dlm3_rf_lsflags_altpr;
+static int hf_dlm3_rf_lsflags_altcw;
+static int hf_dlm3_rf_lsflags_forceunlock;
+static int hf_dlm3_rf_lsflags_timeout;
+static int hf_dlm3_rf_unused;
 
 /* fields for struct rcom_status(rs) */
-static int hf_dlm3_rs_flags      = -1;
-static int hf_dlm3_rs_flags_need_slots  = -1;
-static int hf_dlm3_rs_unused1    = -1;
-static int hf_dlm3_rs_unused2    = -1;
+static int hf_dlm3_rs_flags;
+static int hf_dlm3_rs_flags_need_slots;
+static int hf_dlm3_rs_unused1;
+static int hf_dlm3_rs_unused2;
 
 /* fields for struct rcom_lock(rl) */
-static int hf_dlm3_rl_ownpid              = -1;
-static int hf_dlm3_rl_lkid                = -1;
-static int hf_dlm3_rl_remid               = -1;
-static int hf_dlm3_rl_parent_lkid         = -1;
-static int hf_dlm3_rl_parent_remid        = -1;
-static int hf_dlm3_rl_exflags             = -1;
-static int hf_dlm3_rl_exflags_noqueue     = -1;
-static int hf_dlm3_rl_exflags_cancel      = -1;
-static int hf_dlm3_rl_exflags_convert     = -1;
-static int hf_dlm3_rl_exflags_valblk      = -1;
-static int hf_dlm3_rl_exflags_quecvt      = -1;
-static int hf_dlm3_rl_exflags_ivvalblk    = -1;
-static int hf_dlm3_rl_exflags_convdeadlk  = -1;
-static int hf_dlm3_rl_exflags_persistent  = -1;
-static int hf_dlm3_rl_exflags_nodlckwt    = -1;
-static int hf_dlm3_rl_exflags_nodlckblk   = -1;
-static int hf_dlm3_rl_exflags_expedite    = -1;
-static int hf_dlm3_rl_exflags_noqueuebast = -1;
-static int hf_dlm3_rl_exflags_headque     = -1;
-static int hf_dlm3_rl_exflags_noorder     = -1;
-static int hf_dlm3_rl_exflags_orphan      = -1;
-static int hf_dlm3_rl_exflags_altpr       = -1;
-static int hf_dlm3_rl_exflags_altcw       = -1;
-static int hf_dlm3_rl_exflags_forceunlock = -1;
-static int hf_dlm3_rl_exflags_timeout     = -1;
-static int hf_dlm3_rl_flags               = -1;
-static int hf_dlm3_rl_flags_user          = -1;
-static int hf_dlm3_rl_flags_orphan        = -1;
-static int hf_dlm3_rl_lvbseq              = -1;
-static int hf_dlm3_rl_result              = -1;
-static int hf_dlm3_rl_rqmode              = -1;
-static int hf_dlm3_rl_grmode              = -1;
-static int hf_dlm3_rl_status              = -1;
-static int hf_dlm3_rl_asts                = -1;
-static int hf_dlm3_rl_asts_comp           = -1;
-static int hf_dlm3_rl_asts_bast           = -1;
-static int hf_dlm3_rl_wait_type           = -1;
-static int hf_dlm3_rl_namelen             = -1;
-static int hf_dlm3_rl_name                = -1;
-static int hf_dlm3_rl_name_contents       = -1;
-static int hf_dlm3_rl_name_padding        = -1;
-static int hf_dlm3_rl_lvb                 = -1;
+static int hf_dlm3_rl_ownpid;
+static int hf_dlm3_rl_lkid;
+static int hf_dlm3_rl_remid;
+static int hf_dlm3_rl_parent_lkid;
+static int hf_dlm3_rl_parent_remid;
+static int hf_dlm3_rl_exflags;
+static int hf_dlm3_rl_exflags_noqueue;
+static int hf_dlm3_rl_exflags_cancel;
+static int hf_dlm3_rl_exflags_convert;
+static int hf_dlm3_rl_exflags_valblk;
+static int hf_dlm3_rl_exflags_quecvt;
+static int hf_dlm3_rl_exflags_ivvalblk;
+static int hf_dlm3_rl_exflags_convdeadlk;
+static int hf_dlm3_rl_exflags_persistent;
+static int hf_dlm3_rl_exflags_nodlckwt;
+static int hf_dlm3_rl_exflags_nodlckblk;
+static int hf_dlm3_rl_exflags_expedite;
+static int hf_dlm3_rl_exflags_noqueuebast;
+static int hf_dlm3_rl_exflags_headque;
+static int hf_dlm3_rl_exflags_noorder;
+static int hf_dlm3_rl_exflags_orphan;
+static int hf_dlm3_rl_exflags_altpr;
+static int hf_dlm3_rl_exflags_altcw;
+static int hf_dlm3_rl_exflags_forceunlock;
+static int hf_dlm3_rl_exflags_timeout;
+static int hf_dlm3_rl_flags;
+static int hf_dlm3_rl_flags_user;
+static int hf_dlm3_rl_flags_orphan;
+static int hf_dlm3_rl_lvbseq;
+static int hf_dlm3_rl_result;
+static int hf_dlm3_rl_rqmode;
+static int hf_dlm3_rl_grmode;
+static int hf_dlm3_rl_status;
+static int hf_dlm3_rl_asts;
+static int hf_dlm3_rl_asts_comp;
+static int hf_dlm3_rl_asts_bast;
+static int hf_dlm3_rl_wait_type;
+static int hf_dlm3_rl_namelen;
+static int hf_dlm3_rl_name;
+static int hf_dlm3_rl_name_contents;
+static int hf_dlm3_rl_name_padding;
+static int hf_dlm3_rl_lvb;
 
 /* Initialize the subtree pointers */
-static gint ett_dlm3         = -1;
-static gint ett_dlm3_version = -1;
-
-static gint ett_dlm3_opts  = -1;
-static gint ett_dlm3_options  = -1;
-static gint ett_dlm3_next_cmd = -1;
-
-static gint ett_dlm3_msg       = -1;
-static gint ett_dlm3_m_exflags = -1;
-static gint ett_dlm3_sbflags   = -1;
-static gint ett_dlm3_m_flags   = -1;
-static gint ett_dlm3_m_asts    = -1;
-
-static gint ett_dlm3_rcom        = -1;
-static gint ett_dlm3_rcom_status = -1;
-static gint ett_dlm3_rcom_lock   = -1;
-static gint ett_dlm3_rcom_config = -1;
-
-static gint ett_dlm3_rs_flags  = -1;
-
-static gint ett_dlm3_rf_lsflags  = -1;
-static gint ett_dlm3_rl_exflags  = -1;
-static gint ett_dlm3_rl_flags    = -1;
-static gint ett_dlm3_rl_asts     = -1;
-static gint ett_dlm3_rl_name     = -1;
+static gint ett_dlm3;
+static gint ett_dlm3_version;
+
+static gint ett_dlm3_opts;
+static gint ett_dlm3_options;
+static gint ett_dlm3_next_cmd;
+
+static gint ett_dlm3_msg;
+static gint ett_dlm3_m_exflags;
+static gint ett_dlm3_sbflags;
+static gint ett_dlm3_m_flags;
+static gint ett_dlm3_m_asts;
+
+static gint ett_dlm3_rcom;
+static gint ett_dlm3_rcom_status;
+static gint ett_dlm3_rcom_lock;
+static gint ett_dlm3_rcom_config;
+
+static gint ett_dlm3_rs_flags;
+
+static gint ett_dlm3_rf_lsflags;
+static gint ett_dlm3_rl_exflags;
+static gint ett_dlm3_rl_flags;
+static gint ett_dlm3_rl_asts;
+static gint ett_dlm3_rl_name;
 
 
 /*
diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c
index 281f2d31f6..f7dbaea0ca 100644
--- a/epan/dissectors/packet-dlsw.c
+++ b/epan/dissectors/packet-dlsw.c
@@ -25,88 +25,88 @@ void proto_reg_handoff_dlsw(void);
 static dissector_handle_t dlsw_udp_handle;
 static dissector_handle_t dlsw_tcp_handle;
 
-static int proto_dlsw = -1;
-static int hf_dlsw_flow_control_indication = -1;
-static int hf_dlsw_flow_control_ack = -1;
-static int hf_dlsw_flow_control_operator = -1;
-static int hf_dlsw_flags_explorer_msg = -1;
+static int proto_dlsw;
+static int hf_dlsw_flow_control_indication;
+static int hf_dlsw_flow_control_ack;
+static int hf_dlsw_flow_control_operator;
+static int hf_dlsw_flags_explorer_msg;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_dlsw_vector_length = -1;
-static int hf_dlsw_dlc_header_sa = -1;
-static int hf_dlsw_dlc_header_fc_byte = -1;
-static int hf_dlsw_target_transport_id = -1;
-static int hf_dlsw_error_pointer = -1;
-static int hf_dlsw_capabilities_length = -1;
-static int hf_dlsw_multicast_version_number = -1;
-static int hf_dlsw_frame_direction = -1;
-static int hf_dlsw_circuit_priority = -1;
-static int hf_dlsw_origin_dlc_port_id = -1;
-static int hf_dlsw_protocol_id = -1;
-static int hf_dlsw_mac_address_list = -1;
-static int hf_dlsw_origin_link_sap = -1;
-static int hf_dlsw_header_length = -1;
-static int hf_dlsw_dlc_header_ctrl = -1;
-static int hf_dlsw_target_dlc_port_id = -1;
-static int hf_dlsw_vector_type = -1;
-static int hf_dlsw_largest_frame_size = -1;
-static int hf_dlsw_error_cause = -1;
-static int hf_dlsw_dlc_header_length = -1;
-static int hf_dlsw_oui = -1;
-static int hf_dlsw_target_dlc = -1;
-static int hf_dlsw_dlc_header_ac_byte = -1;
-static int hf_dlsw_tcp_connections = -1;
-static int hf_dlsw_initial_pacing_window = -1;
-static int hf_dlsw_old_message_type = -1;
-static int hf_dlsw_capex_type = -1;
-static int hf_dlsw_ssp_flags = -1;
-static int hf_dlsw_target_mac_address = -1;
-static int hf_dlsw_origin_mac_address = -1;
-static int hf_dlsw_dlc_header_rif = -1;
-static int hf_dlsw_message_type = -1;
-static int hf_dlsw_header_number = -1;
-static int hf_dlsw_message_length = -1;
-static int hf_dlsw_remote_dlc_pid = -1;
-static int hf_dlsw_vendor_oui = -1;
-static int hf_dlsw_flow_ctrl_byte = -1;
-static int hf_dlsw_version = -1;
-static int hf_dlsw_version_string = -1;
-static int hf_dlsw_dlsw_version = -1;
-static int hf_dlsw_remote_dlc = -1;
-static int hf_dlsw_origin_dlc = -1;
-static int hf_dlsw_origin_transport_id = -1;
-static int hf_dlsw_dlc_header_ssap = -1;
-static int hf_dlsw_target_link_sap = -1;
-static int hf_dlsw_dlc_header_da = -1;
-static int hf_dlsw_netbios_name = -1;
-static int hf_dlsw_dlc_header_dsap = -1;
-static int hf_dlsw_reserved = -1;
-static int hf_dlsw_data = -1;
-static int hf_dlsw_vector_data = -1;
-static int hf_dlsw_unknown_data = -1;
-static int hf_dlsw_mac_address_exclusivity = -1;
-static int hf_dlsw_netbios_name_exclusivity = -1;
-static int hf_dlsw_gds_id = -1;
-static int hf_dlsw_sap_list_support = -1;
-static int hf_dlsw_sap_list_support_x0 = -1;
-static int hf_dlsw_sap_list_support_x2 = -1;
-static int hf_dlsw_sap_list_support_x4 = -1;
-static int hf_dlsw_sap_list_support_x6 = -1;
-static int hf_dlsw_sap_list_support_x8 = -1;
-static int hf_dlsw_sap_list_support_xA = -1;
-static int hf_dlsw_sap_list_support_xC = -1;
-static int hf_dlsw_sap_list_support_xE = -1;
-
-static gint ett_dlsw = -1;
-static gint ett_dlsw_header = -1;
-static gint ett_dlsw_fc = -1;
-static gint ett_dlsw_sspflags = -1;
-static gint ett_dlsw_data = -1;
-static gint ett_dlsw_vector = -1;
-static gint ett_dlsw_sap_list_support = -1;
-
-static expert_field ei_dlsw_dlc_header_length = EI_INIT;
-static expert_field ei_dlsw_not_used_for_capex = EI_INIT;
-static expert_field ei_dlsw_vec_len_invalid = EI_INIT;
+static int hf_dlsw_vector_length;
+static int hf_dlsw_dlc_header_sa;
+static int hf_dlsw_dlc_header_fc_byte;
+static int hf_dlsw_target_transport_id;
+static int hf_dlsw_error_pointer;
+static int hf_dlsw_capabilities_length;
+static int hf_dlsw_multicast_version_number;
+static int hf_dlsw_frame_direction;
+static int hf_dlsw_circuit_priority;
+static int hf_dlsw_origin_dlc_port_id;
+static int hf_dlsw_protocol_id;
+static int hf_dlsw_mac_address_list;
+static int hf_dlsw_origin_link_sap;
+static int hf_dlsw_header_length;
+static int hf_dlsw_dlc_header_ctrl;
+static int hf_dlsw_target_dlc_port_id;
+static int hf_dlsw_vector_type;
+static int hf_dlsw_largest_frame_size;
+static int hf_dlsw_error_cause;
+static int hf_dlsw_dlc_header_length;
+static int hf_dlsw_oui;
+static int hf_dlsw_target_dlc;
+static int hf_dlsw_dlc_header_ac_byte;
+static int hf_dlsw_tcp_connections;
+static int hf_dlsw_initial_pacing_window;
+static int hf_dlsw_old_message_type;
+static int hf_dlsw_capex_type;
+static int hf_dlsw_ssp_flags;
+static int hf_dlsw_target_mac_address;
+static int hf_dlsw_origin_mac_address;
+static int hf_dlsw_dlc_header_rif;
+static int hf_dlsw_message_type;
+static int hf_dlsw_header_number;
+static int hf_dlsw_message_length;
+static int hf_dlsw_remote_dlc_pid;
+static int hf_dlsw_vendor_oui;
+static int hf_dlsw_flow_ctrl_byte;
+static int hf_dlsw_version;
+static int hf_dlsw_version_string;
+static int hf_dlsw_dlsw_version;
+static int hf_dlsw_remote_dlc;
+static int hf_dlsw_origin_dlc;
+static int hf_dlsw_origin_transport_id;
+static int hf_dlsw_dlc_header_ssap;
+static int hf_dlsw_target_link_sap;
+static int hf_dlsw_dlc_header_da;
+static int hf_dlsw_netbios_name;
+static int hf_dlsw_dlc_header_dsap;
+static int hf_dlsw_reserved;
+static int hf_dlsw_data;
+static int hf_dlsw_vector_data;
+static int hf_dlsw_unknown_data;
+static int hf_dlsw_mac_address_exclusivity;
+static int hf_dlsw_netbios_name_exclusivity;
+static int hf_dlsw_gds_id;
+static int hf_dlsw_sap_list_support;
+static int hf_dlsw_sap_list_support_x0;
+static int hf_dlsw_sap_list_support_x2;
+static int hf_dlsw_sap_list_support_x4;
+static int hf_dlsw_sap_list_support_x6;
+static int hf_dlsw_sap_list_support_x8;
+static int hf_dlsw_sap_list_support_xA;
+static int hf_dlsw_sap_list_support_xC;
+static int hf_dlsw_sap_list_support_xE;
+
+static gint ett_dlsw;
+static gint ett_dlsw_header;
+static gint ett_dlsw_fc;
+static gint ett_dlsw_sspflags;
+static gint ett_dlsw_data;
+static gint ett_dlsw_vector;
+static gint ett_dlsw_sap_list_support;
+
+static expert_field ei_dlsw_dlc_header_length;
+static expert_field ei_dlsw_not_used_for_capex;
+static expert_field ei_dlsw_vec_len_invalid;
 
 #define  CANUREACH               0x03
 #define  ICANREACH               0x04
diff --git a/epan/dissectors/packet-dlt.c b/epan/dissectors/packet-dlt.c
index ccc27164fe..c4b3602cbb 100644
--- a/epan/dissectors/packet-dlt.c
+++ b/epan/dissectors/packet-dlt.c
@@ -161,8 +161,8 @@ void proto_reg_handoff_dlt_storage_header(void);
 #define DLT_SERVICE_OPTIONS_WITH_LOG_TRACE              6
 #define DLT_SERVICE_OPTIONS_WITH_LOG_TRACE_TEXT         7
 
-static int proto_dlt = -1;
-static int proto_dlt_storage_header = -1;
+static int proto_dlt;
+static int proto_dlt_storage_header;
 
 static dissector_handle_t dlt_handle_udp = NULL;
 static dissector_handle_t dlt_handle_tcp = NULL;
@@ -173,82 +173,82 @@ static heur_dissector_list_t heur_subdissector_list;
 static heur_dtbl_entry_t *heur_dtbl_entry;
 
 /* header fields */
-static int hf_dlt_header_type                           = -1;
-static int hf_dlt_ht_ext_header                         = -1;
-static int hf_dlt_ht_msb_first                          = -1;
-static int hf_dlt_ht_with_ecuid                         = -1;
-static int hf_dlt_ht_with_sessionid                     = -1;
-static int hf_dlt_ht_with_timestamp                     = -1;
-static int hf_dlt_ht_version                            = -1;
-
-static int hf_dlt_msg_ctr                               = -1;
-static int hf_dlt_length                                = -1;
-
-static int hf_dlt_ecu_id                                = -1;
-static int hf_dlt_session_id                            = -1;
-static int hf_dlt_timestamp                             = -1;
-
-static int hf_dlt_ext_hdr                               = -1;
-static int hf_dlt_msg_info                              = -1;
-static int hf_dlt_mi_verbose                            = -1;
-static int hf_dlt_mi_msg_type                           = -1;
-static int hf_dlt_mi_msg_type_info                      = -1;
-static int hf_dlt_num_of_args                           = -1;
-static int hf_dlt_app_id                                = -1;
-static int hf_dlt_ctx_id                                = -1;
-
-static int hf_dlt_payload                               = -1;
-static int hf_dlt_message_id                            = -1;
-static int hf_dlt_payload_data                          = -1;
-
-static int hf_dlt_data_bool                             = -1;
-static int hf_dlt_uint8                                 = -1;
-static int hf_dlt_uint16                                = -1;
-static int hf_dlt_uint32                                = -1;
-static int hf_dlt_uint64                                = -1;
-static int hf_dlt_int8                                  = -1;
-static int hf_dlt_int16                                 = -1;
-static int hf_dlt_int32                                 = -1;
-static int hf_dlt_int64                                 = -1;
-static int hf_dlt_float                                 = -1;
-static int hf_dlt_double                                = -1;
-static int hf_dlt_rawd                                  = -1;
-static int hf_dlt_string                                = -1;
-
-static int hf_dlt_service_options                       = -1;
-static int hf_dlt_service_application_id                = -1;
-static int hf_dlt_service_context_id                    = -1;
-static int hf_dlt_service_log_level                     = -1;
-static int hf_dlt_service_new_log_level                 = -1;
-static int hf_dlt_service_trace_status                  = -1;
-static int hf_dlt_service_new_trace_status              = -1;
-static int hf_dlt_service_new_status                    = -1;
-static int hf_dlt_service_reserved                      = -1;
-static int hf_dlt_service_status                        = -1;
-static int hf_dlt_service_length                        = -1;
-static int hf_dlt_service_swVersion                     = -1;
-static int hf_dlt_service_status_log_info               = -1;
-static int hf_dlt_service_log_levels                    = -1;
-static int hf_dlt_service_count                         = -1;
-static int hf_dlt_service_app_desc                      = -1;
-static int hf_dlt_service_ctx_desc                      = -1;
-
-static int hf_dlt_storage_tstamp_s                      = -1;
-static int hf_dlt_storage_tstamp_us                     = -1;
-static int hf_dlt_storage_ecu_name                      = -1;
-static int hf_dlt_storage_reserved                      = -1;
+static int hf_dlt_header_type;
+static int hf_dlt_ht_ext_header;
+static int hf_dlt_ht_msb_first;
+static int hf_dlt_ht_with_ecuid;
+static int hf_dlt_ht_with_sessionid;
+static int hf_dlt_ht_with_timestamp;
+static int hf_dlt_ht_version;
+
+static int hf_dlt_msg_ctr;
+static int hf_dlt_length;
+
+static int hf_dlt_ecu_id;
+static int hf_dlt_session_id;
+static int hf_dlt_timestamp;
+
+static int hf_dlt_ext_hdr;
+static int hf_dlt_msg_info;
+static int hf_dlt_mi_verbose;
+static int hf_dlt_mi_msg_type;
+static int hf_dlt_mi_msg_type_info;
+static int hf_dlt_num_of_args;
+static int hf_dlt_app_id;
+static int hf_dlt_ctx_id;
+
+static int hf_dlt_payload;
+static int hf_dlt_message_id;
+static int hf_dlt_payload_data;
+
+static int hf_dlt_data_bool;
+static int hf_dlt_uint8;
+static int hf_dlt_uint16;
+static int hf_dlt_uint32;
+static int hf_dlt_uint64;
+static int hf_dlt_int8;
+static int hf_dlt_int16;
+static int hf_dlt_int32;
+static int hf_dlt_int64;
+static int hf_dlt_float;
+static int hf_dlt_double;
+static int hf_dlt_rawd;
+static int hf_dlt_string;
+
+static int hf_dlt_service_options;
+static int hf_dlt_service_application_id;
+static int hf_dlt_service_context_id;
+static int hf_dlt_service_log_level;
+static int hf_dlt_service_new_log_level;
+static int hf_dlt_service_trace_status;
+static int hf_dlt_service_new_trace_status;
+static int hf_dlt_service_new_status;
+static int hf_dlt_service_reserved;
+static int hf_dlt_service_status;
+static int hf_dlt_service_length;
+static int hf_dlt_service_swVersion;
+static int hf_dlt_service_status_log_info;
+static int hf_dlt_service_log_levels;
+static int hf_dlt_service_count;
+static int hf_dlt_service_app_desc;
+static int hf_dlt_service_ctx_desc;
+
+static int hf_dlt_storage_tstamp_s;
+static int hf_dlt_storage_tstamp_us;
+static int hf_dlt_storage_ecu_name;
+static int hf_dlt_storage_reserved;
 
 /* subtrees */
-static gint ett_dlt                                     = -1;
-static gint ett_dlt_hdr_type                            = -1;
-static gint ett_dlt_ext_hdr                             = -1;
-static gint ett_dlt_msg_info                            = -1;
-static gint ett_dlt_payload                             = -1;
-static gint ett_dlt_service_app_ids                     = -1;
-static gint ett_dlt_service_app_id                      = -1;
-static gint ett_dlt_service_ctx_id                      = -1;
+static gint ett_dlt;
+static gint ett_dlt_hdr_type;
+static gint ett_dlt_ext_hdr;
+static gint ett_dlt_msg_info;
+static gint ett_dlt_payload;
+static gint ett_dlt_service_app_ids;
+static gint ett_dlt_service_app_id;
+static gint ett_dlt_service_ctx_id;
 
-static gint ett_dlt_storage                             = -1;
+static gint ett_dlt_storage;
 
 /***************************
  ****** String Tables ******
@@ -380,12 +380,12 @@ static const value_string dlt_service_options[] = {
  ****** Expert Info ******
  *************************/
 
-static expert_field ei_dlt_unsupported_datatype = EI_INIT;
-static expert_field ei_dlt_unsupported_length_datatype = EI_INIT;
-static expert_field ei_dlt_unsupported_string_coding = EI_INIT;
-static expert_field ei_dlt_unsupported_non_verbose_msg_type = EI_INIT;
-static expert_field ei_dlt_buffer_too_short = EI_INIT;
-static expert_field ei_dlt_parsing_error = EI_INIT;
+static expert_field ei_dlt_unsupported_datatype;
+static expert_field ei_dlt_unsupported_length_datatype;
+static expert_field ei_dlt_unsupported_string_coding;
+static expert_field ei_dlt_unsupported_non_verbose_msg_type;
+static expert_field ei_dlt_buffer_too_short;
+static expert_field ei_dlt_parsing_error;
 
 static void
 expert_dlt_unsupported_parameter(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, gint offset, gint length) {
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index 211c074535..0302ee47b9 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -145,329 +145,329 @@ void proto_reg_handoff_dmp(void);
 /* Maximum lengths */
 #define MAX_SIC_LEN         30
 
-static int proto_dmp = -1;
-
-static int hf_dmp_id = -1;
-static int hf_mts_id = -1;
-static int hf_ipm_id = -1;
-
-static int hf_envelope = -1;
-static int hf_envelope_protocol_id = -1;
-static int hf_envelope_version = -1;
-static int hf_envelope_version_value = -1;
-static int hf_envelope_hop_count = -1;
-static int hf_envelope_hop_count_value = -1;
-static int hf_envelope_rec_present = -1;
-static int hf_envelope_addr_enc = -1;
-static int hf_envelope_checksum = -1;
-static int hf_envelope_extensions = -1;
-static int hf_envelope_msg_id_type = -1;
-static int hf_envelope_msg_id_length = -1;
-static int hf_envelope_mts_id_length = -1;
-static int hf_envelope_ipm_id_modifier = -1;
-static int hf_envelope_ipm_id_length = -1;
-static int hf_envelope_mts_id = -1;
-static int hf_envelope_ipm_id = -1;
-static int hf_envelope_type = -1;
-static int hf_envelope_msg_id = -1;
-static int hf_envelope_msg_id_12bit = -1;
-static int hf_envelope_subm_time = -1;
-static int hf_envelope_subm_time_value = -1;
-static int hf_envelope_time_diff_present = -1;
-static int hf_envelope_time_diff = -1;
-static int hf_envelope_time_diff_value = -1;
-static int hf_envelope_flags = -1;
-static int hf_envelope_content_id_discarded = -1;
-static int hf_envelope_recip_reassign_prohib = -1;
-static int hf_envelope_dl_expansion_prohib = -1;
-static int hf_envelope_recipients = -1;
-static int hf_envelope_ext_recipients = -1;
-
-static int hf_thales_ipm_id_modifier = -1;
-
-static int hf_extensions = -1;
-static int hf_extension = -1;
-static int hf_extension_header = -1;
-static int hf_extension_more = -1;
-static int hf_extension_length = -1;
-static int hf_extension_data = -1;
-
-static int hf_message_content = -1;
-static int hf_report_content = -1;
-static int hf_notif_content = -1;
-
-static int hf_addr_recipient = -1;
-static int hf_addr_originator = -1;
-static int hf_addr_reporting_name = -1;
-static int hf_addr_dl_expanded = -1;
-static int hf_addr_int_rec = -1;
-static int hf_addr_dir_addr_ext = -1;
-static int hf_addr_dir_rec_no = -1;
-static int hf_addr_dir_rec_no1 = -1;
-static int hf_addr_dir_rec_no2 = -1;
-static int hf_addr_dir_rec_no3 = -1;
-static int hf_addr_dir_rec_no_generated = -1;
-static int hf_addr_dir_rep_req1 = -1;
-static int hf_addr_dir_rep_req2 = -1;
-static int hf_addr_dir_rep_req3 = -1;
-static int hf_addr_dir_not_req1 = -1;
-static int hf_addr_dir_not_req2 = -1;
-static int hf_addr_dir_not_req3 = -1;
-static int hf_addr_dir_action = -1;
-static int hf_addr_dir_address = -1;
-static int hf_addr_dir_address1 = -1;
-static int hf_addr_dir_address2 = -1;
-static int hf_addr_dir_address3 = -1;
-static int hf_addr_dir_address_generated = -1;
-
-static int hf_addr_ext_form = -1;
-static int hf_addr_ext_form_orig_v1 = -1;
-static int hf_addr_ext_form_orig = -1;
-static int hf_addr_ext_action = -1;
-static int hf_addr_ext_rep_req = -1;
-static int hf_addr_ext_not_req = -1;
-static int hf_addr_ext_rec_ext = -1;
-static int hf_addr_ext_rec_no = -1;
-static int hf_addr_ext_rec_no1 = -1;
-static int hf_addr_ext_rec_no2 = -1;
-static int hf_addr_ext_rec_no_generated = -1;
-static int hf_addr_ext_address = -1;
-static int hf_addr_ext_type = -1;
-static int hf_addr_ext_type_ext = -1;
-static int hf_addr_ext_length = -1;
-static int hf_addr_ext_length1 = -1;
-static int hf_addr_ext_length2 = -1;
-static int hf_addr_ext_length_generated = -1;
-static int hf_addr_ext_asn1_ber = -1;
-static int hf_addr_ext_asn1_per = -1;
-static int hf_addr_ext_unknown = -1;
-
-static int hf_message_body = -1;
-static int hf_message_st_type = -1;
-static int hf_message_precedence = -1;
-static int hf_message_importance = -1;
-static int hf_message_body_format = -1;
-static int hf_message_sec_class_val = -1;
-static int hf_message_sec_pol = -1;
-static int hf_message_heading_flags = -1;
-static int hf_message_auth_users = -1;
-static int hf_message_subject_disc = -1;
-static int hf_message_national_policy_id = -1;
-static int hf_message_mission_policy_id = -1;
-static int hf_message_sec_label = -1;
-static int hf_message_sec_cat_nat = -1;
-static int hf_message_sec_cat_val = -1;
-static int hf_message_sec_cat_cl = -1;
-static int hf_message_sec_cat_cs = -1;
-static int hf_message_sec_cat_ex = -1;
-static int hf_message_sec_cat_ne = -1;
-static int hf_message_sec_cat_permissive = -1;
-static int hf_message_sec_cat_country_code = -1;
-static int hf_message_sec_cat_restrictive = -1;
-static int hf_message_sec_cat_extended = -1;
-static int hf_message_sec_cat_bit0 = -1;
-static int hf_message_sec_cat_bit1 = -1;
-static int hf_message_sec_cat_bit2 = -1;
-static int hf_message_sec_cat_bit3 = -1;
-static int hf_message_sec_cat_bit4 = -1;
-static int hf_message_sec_cat_bit5 = -1;
-static int hf_message_sec_cat_bit6 = -1;
-static int hf_message_sec_cat_bit7 = -1;
-static int hf_message_exp_time = -1;
-static int hf_message_exp_time_val = -1;
-static int hf_message_dtg = -1;
-static int hf_message_dtg_sign = -1;
-static int hf_message_dtg_val = -1;
-static int hf_message_sic = -1;
-static int hf_message_sic_key = -1;
-static int hf_message_sic_key_values = -1;
-static int hf_message_sic_key_type = -1;
-static int hf_message_sic_key_chars = -1;
-static int hf_message_sic_key_num = -1;
-static int hf_message_sic_bitmap = -1;
-static int hf_message_sic_bits = -1;
-static int hf_message_sic_bits_any = -1;
-static int hf_message_subj_id = -1;
-static int hf_message_subj_mts_id = -1;
-static int hf_message_subj_ipm_id = -1;
-
-static int hf_message_subject = -1;
-static int hf_message_eit = -1;
-static int hf_message_compr = -1;
-static int hf_message_body_data = -1;
-static int hf_message_body_compressed = -1;
-static int hf_message_body_plain = -1;
-static int hf_message_body_structured = -1;
-
-static int hf_delivery_report = -1;
-static int hf_non_delivery_report = -1;
-static int hf_report_type = -1;
-static int hf_report_info_present_dr = -1;
-static int hf_report_addr_enc_dr = -1;
-static int hf_report_del_time = -1;
-static int hf_report_del_time_val = -1;
-static int hf_report_addr_enc_ndr = -1;
-static int hf_report_reason = -1;
-static int hf_report_info_present_ndr = -1;
-static int hf_report_diagn = -1;
-static int hf_report_suppl_info_len = -1;
-static int hf_report_suppl_info = -1;
-
-static int hf_receipt_notif = -1;
-static int hf_non_receipt_notif = -1;
-static int hf_other_notif = -1;
-static int hf_notif_type = -1;
-static int hf_notif_rec_time = -1;
-static int hf_notif_rec_time_val = -1;
-static int hf_notif_suppl_info_len = -1;
-static int hf_notif_suppl_info = -1;
-static int hf_notif_non_rec_reason = -1;
-static int hf_notif_discard_reason = -1;
-static int hf_notif_on_type = -1;
-static int hf_notif_acp127 = -1;
-static int hf_notif_acp127recip = -1;
-
-static int hf_ack = -1;
-static int hf_ack_reason = -1;
-static int hf_ack_diagnostic = -1;
-static int hf_ack_recips = -1;
-
-static int hf_checksum = -1;
-static int hf_checksum_status = -1;
-
-static int hf_analysis_ack_time = -1;
-static int hf_analysis_total_time = -1;
-static int hf_analysis_retrans_time = -1;
-static int hf_analysis_total_retrans_time = -1;
-static int hf_analysis_msg_num = -1;
-static int hf_analysis_acks_msg_num = -1;
-static int hf_analysis_retrans_no = -1;
-static int hf_analysis_ack_num = -1;
-static int hf_analysis_ack_missing = -1;
-static int hf_analysis_ack_dup_no = -1;
-/* static int hf_analysis_rep_num = -1; */
-static int hf_analysis_acks_rep_num = -1;
-static int hf_analysis_rep_time = -1;
-/* static int hf_analysis_not_num = -1; */
-static int hf_analysis_acks_not_num = -1;
-static int hf_analysis_not_time = -1;
-static int hf_analysis_msg_resend_from = -1;
-static int hf_analysis_rep_resend_from = -1;
-static int hf_analysis_not_resend_from = -1;
-static int hf_analysis_ack_resend_from = -1;
-
-static int hf_reserved_0x01 = -1;
-static int hf_reserved_0x02 = -1;
-static int hf_reserved_0x04 = -1;
-static int hf_reserved_0x07 = -1;
-static int hf_reserved_0x08 = -1;
-static int hf_reserved_0x0F = -1;
-static int hf_reserved_0x1F = -1;
-static int hf_reserved_0x20 = -1;
-static int hf_reserved_0x40 = -1;
-static int hf_reserved_0xC0 = -1;
-static int hf_reserved_0xE0 = -1;
-static int hf_reserved_0x8000 = -1;
-
-static gint ett_dmp = -1;
-static gint ett_envelope = -1;
-static gint ett_envelope_version = -1;
-static gint ett_envelope_hop_count = -1;
-static gint ett_envelope_rec_present = -1;
-static gint ett_envelope_addr_enc = -1;
-static gint ett_envelope_checksum = -1;
-static gint ett_envelope_extensions = -1;
-static gint ett_envelope_msg_id_type = -1;
-static gint ett_envelope_msg_id = -1;
-static gint ett_envelope_mts_id_length = -1;
-static gint ett_envelope_ipm_id_length = -1;
-static gint ett_envelope_cont_type = -1;
-static gint ett_envelope_subm_time = -1;
-static gint ett_envelope_time_diff = -1;
-static gint ett_envelope_flags = -1;
-static gint ett_envelope_recipients = -1;
-static gint ett_envelope_ext_recipients = -1;
-static gint ett_envelope_addresses = -1;
-
-static gint ett_address = -1;
-static gint ett_address_direct = -1;
-static gint ett_address_rec_no = -1;
-static gint ett_address_extended = -1;
-static gint ett_address_ext_form = -1;
-static gint ett_address_ext_rec_no = -1;
-static gint ett_address_ext_action = -1;
-static gint ett_address_ext_rep_req = -1;
-static gint ett_address_ext_not_req = -1;
-static gint ett_address_ext_type = -1;
-static gint ett_address_ext_length = -1;
-
-static gint ett_extensions = -1;
-static gint ett_extension = -1;
-static gint ett_extension_header = -1;
-
-static gint ett_content = -1;
-
-static gint ett_message = -1;
-static gint ett_message_st_type = -1;
-static gint ett_message_reserved = -1;
-static gint ett_message_precedence = -1;
-static gint ett_message_importance = -1;
-static gint ett_message_body_format = -1;
-static gint ett_message_sec_class = -1;
-static gint ett_message_sec_pol = -1;
-static gint ett_message_sec_cat = -1;
-static gint ett_message_heading_flags = -1;
-static gint ett_message_exp_time = -1;
-static gint ett_message_dtg = -1;
-static gint ett_message_sic = -1;
-static gint ett_message_sic_key = -1;
-static gint ett_message_sic_bitmap = -1;
-static gint ett_message_sic_bits = -1;
-static gint ett_message_eit = -1;
-static gint ett_message_compr = -1;
-static gint ett_message_body_reserved = -1;
-static gint ett_message_body = -1;
-
-static gint ett_report = -1;
-static gint ett_report_type = -1;
-static gint ett_report_info_present_dr = -1;
-static gint ett_report_info_present_ndr = -1;
-static gint ett_report_addr_enc_dr = -1;
-static gint ett_report_addr_enc_ndr = -1;
-static gint ett_report_reserved = -1;
-static gint ett_report_del_time = -1;
-static gint ett_report_reason = -1;
-static gint ett_report_suppl_info = -1;
-static gint ett_report_diagn = -1;
-
-static gint ett_notif = -1;
-static gint ett_notif_type = -1;
-static gint ett_notif_rec_time = -1;
-static gint ett_notif_suppl_info = -1;
-static gint ett_notif_acp127recip = -1;
-
-static gint ett_ack = -1;
-static gint ett_ack_recips = -1;
-
-static gint ett_analysis = -1;
-
-static expert_field ei_reserved_value = EI_INIT;
-static expert_field ei_message_sic_illegal = EI_INIT;
-static expert_field ei_envelope_version_value = EI_INIT;
-static expert_field ei_message_compr = EI_INIT;
-static expert_field ei_ack_reason = EI_INIT;
-static expert_field ei_addr_dir_rec_no_generated = EI_INIT;
-static expert_field ei_checksum_bad = EI_INIT;
-static expert_field ei_message_body_uncompress = EI_INIT;
-static expert_field ei_addr_ext_rec_no_generated = EI_INIT;
-static expert_field ei_envelope_msg_id = EI_INIT;
-static expert_field ei_7bit_string_unused_bits = EI_INIT;
-static expert_field ei_analysis_ack_missing = EI_INIT;
-static expert_field ei_analysis_ack_dup_no = EI_INIT;
-static expert_field ei_analysis_ack_unexpected = EI_INIT;
-static expert_field ei_analysis_msg_missing = EI_INIT;
-static expert_field ei_analysis_retrans_no = EI_INIT;
-static expert_field ei_too_many_sec_cat = EI_INIT;
+static int proto_dmp;
+
+static int hf_dmp_id;
+static int hf_mts_id;
+static int hf_ipm_id;
+
+static int hf_envelope;
+static int hf_envelope_protocol_id;
+static int hf_envelope_version;
+static int hf_envelope_version_value;
+static int hf_envelope_hop_count;
+static int hf_envelope_hop_count_value;
+static int hf_envelope_rec_present;
+static int hf_envelope_addr_enc;
+static int hf_envelope_checksum;
+static int hf_envelope_extensions;
+static int hf_envelope_msg_id_type;
+static int hf_envelope_msg_id_length;
+static int hf_envelope_mts_id_length;
+static int hf_envelope_ipm_id_modifier;
+static int hf_envelope_ipm_id_length;
+static int hf_envelope_mts_id;
+static int hf_envelope_ipm_id;
+static int hf_envelope_type;
+static int hf_envelope_msg_id;
+static int hf_envelope_msg_id_12bit;
+static int hf_envelope_subm_time;
+static int hf_envelope_subm_time_value;
+static int hf_envelope_time_diff_present;
+static int hf_envelope_time_diff;
+static int hf_envelope_time_diff_value;
+static int hf_envelope_flags;
+static int hf_envelope_content_id_discarded;
+static int hf_envelope_recip_reassign_prohib;
+static int hf_envelope_dl_expansion_prohib;
+static int hf_envelope_recipients;
+static int hf_envelope_ext_recipients;
+
+static int hf_thales_ipm_id_modifier;
+
+static int hf_extensions;
+static int hf_extension;
+static int hf_extension_header;
+static int hf_extension_more;
+static int hf_extension_length;
+static int hf_extension_data;
+
+static int hf_message_content;
+static int hf_report_content;
+static int hf_notif_content;
+
+static int hf_addr_recipient;
+static int hf_addr_originator;
+static int hf_addr_reporting_name;
+static int hf_addr_dl_expanded;
+static int hf_addr_int_rec;
+static int hf_addr_dir_addr_ext;
+static int hf_addr_dir_rec_no;
+static int hf_addr_dir_rec_no1;
+static int hf_addr_dir_rec_no2;
+static int hf_addr_dir_rec_no3;
+static int hf_addr_dir_rec_no_generated;
+static int hf_addr_dir_rep_req1;
+static int hf_addr_dir_rep_req2;
+static int hf_addr_dir_rep_req3;
+static int hf_addr_dir_not_req1;
+static int hf_addr_dir_not_req2;
+static int hf_addr_dir_not_req3;
+static int hf_addr_dir_action;
+static int hf_addr_dir_address;
+static int hf_addr_dir_address1;
+static int hf_addr_dir_address2;
+static int hf_addr_dir_address3;
+static int hf_addr_dir_address_generated;
+
+static int hf_addr_ext_form;
+static int hf_addr_ext_form_orig_v1;
+static int hf_addr_ext_form_orig;
+static int hf_addr_ext_action;
+static int hf_addr_ext_rep_req;
+static int hf_addr_ext_not_req;
+static int hf_addr_ext_rec_ext;
+static int hf_addr_ext_rec_no;
+static int hf_addr_ext_rec_no1;
+static int hf_addr_ext_rec_no2;
+static int hf_addr_ext_rec_no_generated;
+static int hf_addr_ext_address;
+static int hf_addr_ext_type;
+static int hf_addr_ext_type_ext;
+static int hf_addr_ext_length;
+static int hf_addr_ext_length1;
+static int hf_addr_ext_length2;
+static int hf_addr_ext_length_generated;
+static int hf_addr_ext_asn1_ber;
+static int hf_addr_ext_asn1_per;
+static int hf_addr_ext_unknown;
+
+static int hf_message_body;
+static int hf_message_st_type;
+static int hf_message_precedence;
+static int hf_message_importance;
+static int hf_message_body_format;
+static int hf_message_sec_class_val;
+static int hf_message_sec_pol;
+static int hf_message_heading_flags;
+static int hf_message_auth_users;
+static int hf_message_subject_disc;
+static int hf_message_national_policy_id;
+static int hf_message_mission_policy_id;
+static int hf_message_sec_label;
+static int hf_message_sec_cat_nat;
+static int hf_message_sec_cat_val;
+static int hf_message_sec_cat_cl;
+static int hf_message_sec_cat_cs;
+static int hf_message_sec_cat_ex;
+static int hf_message_sec_cat_ne;
+static int hf_message_sec_cat_permissive;
+static int hf_message_sec_cat_country_code;
+static int hf_message_sec_cat_restrictive;
+static int hf_message_sec_cat_extended;
+static int hf_message_sec_cat_bit0;
+static int hf_message_sec_cat_bit1;
+static int hf_message_sec_cat_bit2;
+static int hf_message_sec_cat_bit3;
+static int hf_message_sec_cat_bit4;
+static int hf_message_sec_cat_bit5;
+static int hf_message_sec_cat_bit6;
+static int hf_message_sec_cat_bit7;
+static int hf_message_exp_time;
+static int hf_message_exp_time_val;
+static int hf_message_dtg;
+static int hf_message_dtg_sign;
+static int hf_message_dtg_val;
+static int hf_message_sic;
+static int hf_message_sic_key;
+static int hf_message_sic_key_values;
+static int hf_message_sic_key_type;
+static int hf_message_sic_key_chars;
+static int hf_message_sic_key_num;
+static int hf_message_sic_bitmap;
+static int hf_message_sic_bits;
+static int hf_message_sic_bits_any;
+static int hf_message_subj_id;
+static int hf_message_subj_mts_id;
+static int hf_message_subj_ipm_id;
+
+static int hf_message_subject;
+static int hf_message_eit;
+static int hf_message_compr;
+static int hf_message_body_data;
+static int hf_message_body_compressed;
+static int hf_message_body_plain;
+static int hf_message_body_structured;
+
+static int hf_delivery_report;
+static int hf_non_delivery_report;
+static int hf_report_type;
+static int hf_report_info_present_dr;
+static int hf_report_addr_enc_dr;
+static int hf_report_del_time;
+static int hf_report_del_time_val;
+static int hf_report_addr_enc_ndr;
+static int hf_report_reason;
+static int hf_report_info_present_ndr;
+static int hf_report_diagn;
+static int hf_report_suppl_info_len;
+static int hf_report_suppl_info;
+
+static int hf_receipt_notif;
+static int hf_non_receipt_notif;
+static int hf_other_notif;
+static int hf_notif_type;
+static int hf_notif_rec_time;
+static int hf_notif_rec_time_val;
+static int hf_notif_suppl_info_len;
+static int hf_notif_suppl_info;
+static int hf_notif_non_rec_reason;
+static int hf_notif_discard_reason;
+static int hf_notif_on_type;
+static int hf_notif_acp127;
+static int hf_notif_acp127recip;
+
+static int hf_ack;
+static int hf_ack_reason;
+static int hf_ack_diagnostic;
+static int hf_ack_recips;
+
+static int hf_checksum;
+static int hf_checksum_status;
+
+static int hf_analysis_ack_time;
+static int hf_analysis_total_time;
+static int hf_analysis_retrans_time;
+static int hf_analysis_total_retrans_time;
+static int hf_analysis_msg_num;
+static int hf_analysis_acks_msg_num;
+static int hf_analysis_retrans_no;
+static int hf_analysis_ack_num;
+static int hf_analysis_ack_missing;
+static int hf_analysis_ack_dup_no;
+/* static int hf_analysis_rep_num; */
+static int hf_analysis_acks_rep_num;
+static int hf_analysis_rep_time;
+/* static int hf_analysis_not_num; */
+static int hf_analysis_acks_not_num;
+static int hf_analysis_not_time;
+static int hf_analysis_msg_resend_from;
+static int hf_analysis_rep_resend_from;
+static int hf_analysis_not_resend_from;
+static int hf_analysis_ack_resend_from;
+
+static int hf_reserved_0x01;
+static int hf_reserved_0x02;
+static int hf_reserved_0x04;
+static int hf_reserved_0x07;
+static int hf_reserved_0x08;
+static int hf_reserved_0x0F;
+static int hf_reserved_0x1F;
+static int hf_reserved_0x20;
+static int hf_reserved_0x40;
+static int hf_reserved_0xC0;
+static int hf_reserved_0xE0;
+static int hf_reserved_0x8000;
+
+static gint ett_dmp;
+static gint ett_envelope;
+static gint ett_envelope_version;
+static gint ett_envelope_hop_count;
+static gint ett_envelope_rec_present;
+static gint ett_envelope_addr_enc;
+static gint ett_envelope_checksum;
+static gint ett_envelope_extensions;
+static gint ett_envelope_msg_id_type;
+static gint ett_envelope_msg_id;
+static gint ett_envelope_mts_id_length;
+static gint ett_envelope_ipm_id_length;
+static gint ett_envelope_cont_type;
+static gint ett_envelope_subm_time;
+static gint ett_envelope_time_diff;
+static gint ett_envelope_flags;
+static gint ett_envelope_recipients;
+static gint ett_envelope_ext_recipients;
+static gint ett_envelope_addresses;
+
+static gint ett_address;
+static gint ett_address_direct;
+static gint ett_address_rec_no;
+static gint ett_address_extended;
+static gint ett_address_ext_form;
+static gint ett_address_ext_rec_no;
+static gint ett_address_ext_action;
+static gint ett_address_ext_rep_req;
+static gint ett_address_ext_not_req;
+static gint ett_address_ext_type;
+static gint ett_address_ext_length;
+
+static gint ett_extensions;
+static gint ett_extension;
+static gint ett_extension_header;
+
+static gint ett_content;
+
+static gint ett_message;
+static gint ett_message_st_type;
+static gint ett_message_reserved;
+static gint ett_message_precedence;
+static gint ett_message_importance;
+static gint ett_message_body_format;
+static gint ett_message_sec_class;
+static gint ett_message_sec_pol;
+static gint ett_message_sec_cat;
+static gint ett_message_heading_flags;
+static gint ett_message_exp_time;
+static gint ett_message_dtg;
+static gint ett_message_sic;
+static gint ett_message_sic_key;
+static gint ett_message_sic_bitmap;
+static gint ett_message_sic_bits;
+static gint ett_message_eit;
+static gint ett_message_compr;
+static gint ett_message_body_reserved;
+static gint ett_message_body;
+
+static gint ett_report;
+static gint ett_report_type;
+static gint ett_report_info_present_dr;
+static gint ett_report_info_present_ndr;
+static gint ett_report_addr_enc_dr;
+static gint ett_report_addr_enc_ndr;
+static gint ett_report_reserved;
+static gint ett_report_del_time;
+static gint ett_report_reason;
+static gint ett_report_suppl_info;
+static gint ett_report_diagn;
+
+static gint ett_notif;
+static gint ett_notif_type;
+static gint ett_notif_rec_time;
+static gint ett_notif_suppl_info;
+static gint ett_notif_acp127recip;
+
+static gint ett_ack;
+static gint ett_ack_recips;
+
+static gint ett_analysis;
+
+static expert_field ei_reserved_value;
+static expert_field ei_message_sic_illegal;
+static expert_field ei_envelope_version_value;
+static expert_field ei_message_compr;
+static expert_field ei_ack_reason;
+static expert_field ei_addr_dir_rec_no_generated;
+static expert_field ei_checksum_bad;
+static expert_field ei_message_body_uncompress;
+static expert_field ei_addr_ext_rec_no_generated;
+static expert_field ei_envelope_msg_id;
+static expert_field ei_7bit_string_unused_bits;
+static expert_field ei_analysis_ack_missing;
+static expert_field ei_analysis_ack_dup_no;
+static expert_field ei_analysis_ack_unexpected;
+static expert_field ei_analysis_msg_missing;
+static expert_field ei_analysis_retrans_no;
+static expert_field ei_too_many_sec_cat;
 
 static dissector_handle_t dmp_handle;
 
diff --git a/epan/dissectors/packet-dmx.c b/epan/dissectors/packet-dmx.c
index 8c18a4edf3..35f13256c2 100644
--- a/epan/dissectors/packet-dmx.c
+++ b/epan/dissectors/packet-dmx.c
@@ -53,50 +53,50 @@ void proto_register_dmx_test(void);
 void proto_register_dmx_text(void);
 void proto_reg_handoff_dmx(void);
 
-static int proto_dmx = -1;
-static int proto_dmx_chan = -1;
-static int proto_dmx_sip = -1;
-static int proto_dmx_test = -1;
-static int proto_dmx_text = -1;
-
-static int hf_dmx_start_code = -1;
-
-static int hf_dmx_chan_output_dmx_data = -1;
-static int hf_dmx_chan_output_data_filter = -1;
-
-static int hf_dmx_sip_byte_count = -1;
-static int hf_dmx_sip_control_bit_field = -1;
-static int hf_dmx_sip_prev_packet_checksum = -1;
-static int hf_dmx_sip_seq_nr = -1;
-static int hf_dmx_sip_dmx_universe_nr = -1;
-static int hf_dmx_sip_dmx_proc_level = -1;
-static int hf_dmx_sip_dmx_software_version = -1;
-static int hf_dmx_sip_dmx_packet_len = -1;
-static int hf_dmx_sip_dmx_nr_packets = -1;
-static int hf_dmx_sip_orig_dev_id = -1;
-static int hf_dmx_sip_sec_dev_id = -1;
-static int hf_dmx_sip_third_dev_id = -1;
-static int hf_dmx_sip_fourth_dev_id = -1;
-static int hf_dmx_sip_fifth_dev_id = -1;
-static int hf_dmx_sip_reserved = -1;
-static int hf_dmx_sip_checksum = -1;
-static int hf_dmx_sip_checksum_status = -1;
-static int hf_dmx_sip_trailer = -1;
-
-static int hf_dmx_test_data = -1;
-static int hf_dmx_test_data_good = -1;
-static int hf_dmx_test_data_bad = -1;
-
-static int hf_dmx_text_page_nr = -1;
-static int hf_dmx_text_line_len = -1;
-static int hf_dmx_text_string = -1;
-
-static int ett_dmx_chan = -1;
-static int ett_dmx_sip = -1;
-static int ett_dmx_test = -1;
-static int ett_dmx_text = -1;
-
-static expert_field ei_dmx_sip_checksum = EI_INIT;
+static int proto_dmx;
+static int proto_dmx_chan;
+static int proto_dmx_sip;
+static int proto_dmx_test;
+static int proto_dmx_text;
+
+static int hf_dmx_start_code;
+
+static int hf_dmx_chan_output_dmx_data;
+static int hf_dmx_chan_output_data_filter;
+
+static int hf_dmx_sip_byte_count;
+static int hf_dmx_sip_control_bit_field;
+static int hf_dmx_sip_prev_packet_checksum;
+static int hf_dmx_sip_seq_nr;
+static int hf_dmx_sip_dmx_universe_nr;
+static int hf_dmx_sip_dmx_proc_level;
+static int hf_dmx_sip_dmx_software_version;
+static int hf_dmx_sip_dmx_packet_len;
+static int hf_dmx_sip_dmx_nr_packets;
+static int hf_dmx_sip_orig_dev_id;
+static int hf_dmx_sip_sec_dev_id;
+static int hf_dmx_sip_third_dev_id;
+static int hf_dmx_sip_fourth_dev_id;
+static int hf_dmx_sip_fifth_dev_id;
+static int hf_dmx_sip_reserved;
+static int hf_dmx_sip_checksum;
+static int hf_dmx_sip_checksum_status;
+static int hf_dmx_sip_trailer;
+
+static int hf_dmx_test_data;
+static int hf_dmx_test_data_good;
+static int hf_dmx_test_data_bad;
+
+static int hf_dmx_text_page_nr;
+static int hf_dmx_text_line_len;
+static int hf_dmx_text_string;
+
+static int ett_dmx_chan;
+static int ett_dmx_sip;
+static int ett_dmx_test;
+static int ett_dmx_text;
+
+static expert_field ei_dmx_sip_checksum;
 
 static dissector_table_t dmx_dissector_table;
 
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c
index 823809fb7f..565d24d613 100644
--- a/epan/dissectors/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
@@ -625,201 +625,201 @@ void proto_register_dnp3(void);
 void proto_reg_handoff_dnp3(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_dnp3 = -1;
-static int hf_dnp3_start = -1;
-static int hf_dnp3_len = -1;
-static int hf_dnp3_ctl = -1;
-static int hf_dnp3_ctl_prifunc = -1;
-static int hf_dnp3_ctl_secfunc = -1;
-static int hf_dnp3_ctl_dir = -1;
-static int hf_dnp3_ctl_prm = -1;
-static int hf_dnp3_ctl_fcb = -1;
-static int hf_dnp3_ctl_fcv = -1;
-static int hf_dnp3_ctl_dfc = -1;
-static int hf_dnp3_dst = -1;
-static int hf_dnp3_src = -1;
-static int hf_dnp3_addr = -1;
-static int hf_dnp3_data_hdr_crc = -1;
-static int hf_dnp3_data_hdr_crc_status = -1;
-static int hf_dnp3_tr_ctl = -1;
-static int hf_dnp3_tr_fin = -1;
-static int hf_dnp3_tr_fir = -1;
-static int hf_dnp3_tr_seq = -1;
-static int hf_dnp3_data_chunk = -1;
-static int hf_dnp3_data_chunk_len = -1;
-static int hf_dnp3_data_chunk_crc = -1;
-static int hf_dnp3_data_chunk_crc_status = -1;
+static int proto_dnp3;
+static int hf_dnp3_start;
+static int hf_dnp3_len;
+static int hf_dnp3_ctl;
+static int hf_dnp3_ctl_prifunc;
+static int hf_dnp3_ctl_secfunc;
+static int hf_dnp3_ctl_dir;
+static int hf_dnp3_ctl_prm;
+static int hf_dnp3_ctl_fcb;
+static int hf_dnp3_ctl_fcv;
+static int hf_dnp3_ctl_dfc;
+static int hf_dnp3_dst;
+static int hf_dnp3_src;
+static int hf_dnp3_addr;
+static int hf_dnp3_data_hdr_crc;
+static int hf_dnp3_data_hdr_crc_status;
+static int hf_dnp3_tr_ctl;
+static int hf_dnp3_tr_fin;
+static int hf_dnp3_tr_fir;
+static int hf_dnp3_tr_seq;
+static int hf_dnp3_data_chunk;
+static int hf_dnp3_data_chunk_len;
+static int hf_dnp3_data_chunk_crc;
+static int hf_dnp3_data_chunk_crc_status;
 
 /* Added for Application Layer Decoding */
-static int hf_dnp3_al_ctl = -1;
-static int hf_dnp3_al_fir = -1;
-static int hf_dnp3_al_fin = -1;
-static int hf_dnp3_al_con = -1;
-static int hf_dnp3_al_uns = -1;
-static int hf_dnp3_al_seq = -1;
-static int hf_dnp3_al_func = -1;
-static int hf_dnp3_al_iin = -1;
-static int hf_dnp3_al_iin_bmsg = -1;
-static int hf_dnp3_al_iin_cls1d = -1;
-static int hf_dnp3_al_iin_cls2d = -1;
-static int hf_dnp3_al_iin_cls3d = -1;
-static int hf_dnp3_al_iin_tsr = -1;
-static int hf_dnp3_al_iin_dol = -1;
-static int hf_dnp3_al_iin_dt = -1;
-static int hf_dnp3_al_iin_rst = -1;
-static int hf_dnp3_al_iin_fcni = -1;
-static int hf_dnp3_al_iin_obju = -1;
-static int hf_dnp3_al_iin_pioor = -1;
-static int hf_dnp3_al_iin_ebo = -1;
-static int hf_dnp3_al_iin_oae = -1;
-static int hf_dnp3_al_iin_cc = -1;
-static int hf_dnp3_al_obj = -1;
-static int hf_dnp3_al_objq_prefix = -1;
-static int hf_dnp3_al_objq_range = -1;
-static int hf_dnp3_al_range_start8 = -1;
-static int hf_dnp3_al_range_stop8 = -1;
-static int hf_dnp3_al_range_start16 = -1;
-static int hf_dnp3_al_range_stop16 = -1;
-static int hf_dnp3_al_range_start32 = -1;
-static int hf_dnp3_al_range_stop32 = -1;
-static int hf_dnp3_al_range_abs8 = -1;
-static int hf_dnp3_al_range_abs16 = -1;
-static int hf_dnp3_al_range_abs32 = -1;
-static int hf_dnp3_al_range_quant8 = -1;
-static int hf_dnp3_al_range_quant16 = -1;
-static int hf_dnp3_al_range_quant32 = -1;
-static int hf_dnp3_al_index8 = -1;
-static int hf_dnp3_al_index16 = -1;
-static int hf_dnp3_al_index32 = -1;
-static int hf_dnp3_al_size8 = -1;
-static int hf_dnp3_al_size16 = -1;
-static int hf_dnp3_al_size32 = -1;
-static int hf_dnp3_bocs_bit = -1;
-
-/*static int hf_dnp3_al_objq = -1;
-  static int hf_dnp3_al_nobj = -1; */
+static int hf_dnp3_al_ctl;
+static int hf_dnp3_al_fir;
+static int hf_dnp3_al_fin;
+static int hf_dnp3_al_con;
+static int hf_dnp3_al_uns;
+static int hf_dnp3_al_seq;
+static int hf_dnp3_al_func;
+static int hf_dnp3_al_iin;
+static int hf_dnp3_al_iin_bmsg;
+static int hf_dnp3_al_iin_cls1d;
+static int hf_dnp3_al_iin_cls2d;
+static int hf_dnp3_al_iin_cls3d;
+static int hf_dnp3_al_iin_tsr;
+static int hf_dnp3_al_iin_dol;
+static int hf_dnp3_al_iin_dt;
+static int hf_dnp3_al_iin_rst;
+static int hf_dnp3_al_iin_fcni;
+static int hf_dnp3_al_iin_obju;
+static int hf_dnp3_al_iin_pioor;
+static int hf_dnp3_al_iin_ebo;
+static int hf_dnp3_al_iin_oae;
+static int hf_dnp3_al_iin_cc;
+static int hf_dnp3_al_obj;
+static int hf_dnp3_al_objq_prefix;
+static int hf_dnp3_al_objq_range;
+static int hf_dnp3_al_range_start8;
+static int hf_dnp3_al_range_stop8;
+static int hf_dnp3_al_range_start16;
+static int hf_dnp3_al_range_stop16;
+static int hf_dnp3_al_range_start32;
+static int hf_dnp3_al_range_stop32;
+static int hf_dnp3_al_range_abs8;
+static int hf_dnp3_al_range_abs16;
+static int hf_dnp3_al_range_abs32;
+static int hf_dnp3_al_range_quant8;
+static int hf_dnp3_al_range_quant16;
+static int hf_dnp3_al_range_quant32;
+static int hf_dnp3_al_index8;
+static int hf_dnp3_al_index16;
+static int hf_dnp3_al_index32;
+static int hf_dnp3_al_size8;
+static int hf_dnp3_al_size16;
+static int hf_dnp3_al_size32;
+static int hf_dnp3_bocs_bit;
+
+/* static int hf_dnp3_al_objq;*/
+/* static int hf_dnp3_al_nobj; */
 /* XXX - unused
-static int hf_dnp3_al_ptnum = -1; */
-static int hf_dnp3_al_biq_b0 = -1;
-static int hf_dnp3_al_biq_b1 = -1;
-static int hf_dnp3_al_biq_b2 = -1;
-static int hf_dnp3_al_biq_b3 = -1;
-static int hf_dnp3_al_biq_b4 = -1;
-static int hf_dnp3_al_biq_b5 = -1;
-static int hf_dnp3_al_biq_b6 = -1;
-static int hf_dnp3_al_biq_b7 = -1;
-static int hf_dnp3_al_boq_b0 = -1;
-static int hf_dnp3_al_boq_b1 = -1;
-static int hf_dnp3_al_boq_b2 = -1;
-static int hf_dnp3_al_boq_b3 = -1;
-static int hf_dnp3_al_boq_b4 = -1;
-static int hf_dnp3_al_boq_b5 = -1;
-static int hf_dnp3_al_boq_b6 = -1;
-static int hf_dnp3_al_boq_b7 = -1;
-static int hf_dnp3_al_ctrq_b0 = -1;
-static int hf_dnp3_al_ctrq_b1 = -1;
-static int hf_dnp3_al_ctrq_b2 = -1;
-static int hf_dnp3_al_ctrq_b3 = -1;
-static int hf_dnp3_al_ctrq_b4 = -1;
-static int hf_dnp3_al_ctrq_b5 = -1;
-static int hf_dnp3_al_ctrq_b6 = -1;
-static int hf_dnp3_al_ctrq_b7 = -1;
-static int hf_dnp3_al_aiq_b0 = -1;
-static int hf_dnp3_al_aiq_b1 = -1;
-static int hf_dnp3_al_aiq_b2 = -1;
-static int hf_dnp3_al_aiq_b3 = -1;
-static int hf_dnp3_al_aiq_b4 = -1;
-static int hf_dnp3_al_aiq_b5 = -1;
-static int hf_dnp3_al_aiq_b6 = -1;
-static int hf_dnp3_al_aiq_b7 = -1;
-static int hf_dnp3_al_aoq_b0 = -1;
-static int hf_dnp3_al_aoq_b1 = -1;
-static int hf_dnp3_al_aoq_b2 = -1;
-static int hf_dnp3_al_aoq_b3 = -1;
-static int hf_dnp3_al_aoq_b4 = -1;
-static int hf_dnp3_al_aoq_b5 = -1;
-static int hf_dnp3_al_aoq_b6 = -1;
-static int hf_dnp3_al_aoq_b7 = -1;
-static int hf_dnp3_al_timestamp = -1;
-static int hf_dnp3_al_file_perms = -1;
-static int hf_dnp3_al_file_perms_read_owner = -1;
-static int hf_dnp3_al_file_perms_write_owner = -1;
-static int hf_dnp3_al_file_perms_exec_owner = -1;
-static int hf_dnp3_al_file_perms_read_group = -1;
-static int hf_dnp3_al_file_perms_write_group = -1;
-static int hf_dnp3_al_file_perms_exec_group = -1;
-static int hf_dnp3_al_file_perms_read_world = -1;
-static int hf_dnp3_al_file_perms_write_world = -1;
-static int hf_dnp3_al_file_perms_exec_world = -1;
-static int hf_dnp3_al_rel_timestamp = -1;
-static int hf_dnp3_al_ana16 = -1;
-static int hf_dnp3_al_ana32 = -1;
-static int hf_dnp3_al_anaflt = -1;
-static int hf_dnp3_al_anadbl = -1;
-static int hf_dnp3_al_bit = -1;
-static int hf_dnp3_al_2bit = -1;
-static int hf_dnp3_al_cnt16 = -1;
-static int hf_dnp3_al_cnt32 = -1;
-static int hf_dnp3_al_ctrlstatus = -1;
-static int hf_dnp3_al_anaout16 = -1;
-static int hf_dnp3_al_anaout32 = -1;
-static int hf_dnp3_al_anaoutflt = -1;
-static int hf_dnp3_al_anaoutdbl = -1;
-static int hf_dnp3_al_file_mode = -1;
-static int hf_dnp3_al_file_auth = -1;
-static int hf_dnp3_al_file_size = -1;
-static int hf_dnp3_al_file_maxblk = -1;
-static int hf_dnp3_al_file_reqID = -1;
-static int hf_dnp3_al_file_handle = -1;
-static int hf_dnp3_al_file_status = -1;
-static int hf_dnp3_al_file_blocknum = -1;
-static int hf_dnp3_al_file_lastblock = -1;
-static int hf_dnp3_al_file_data = -1;
-static int hf_dnp3_ctlobj_code_c = -1;
-static int hf_dnp3_ctlobj_code_m = -1;
-static int hf_dnp3_ctlobj_code_tc = -1;
-static int hf_dnp3_al_datatype = -1;
-static int hf_dnp3_al_da_length = -1;
-static int hf_dnp3_al_da_uint8 = -1;
-static int hf_dnp3_al_da_uint16 = -1;
-static int hf_dnp3_al_da_uint32 = -1;
-static int hf_dnp3_al_da_int8 = -1;
-static int hf_dnp3_al_da_int16 = -1;
-static int hf_dnp3_al_da_int32 = -1;
-static int hf_dnp3_al_da_flt = -1;
-static int hf_dnp3_al_da_dbl = -1;
-static int hf_dnp3_al_sa_cd = -1;
-static int hf_dnp3_al_sa_cdl = -1;
-static int hf_dnp3_al_sa_csq = -1;
-static int hf_dnp3_al_sa_err = -1;
-static int hf_dnp3_al_sa_key = -1;
-static int hf_dnp3_al_sa_kcm = -1;
-static int hf_dnp3_al_sa_ks = -1;
-static int hf_dnp3_al_sa_ksq = -1;
-static int hf_dnp3_al_sa_kwa = -1;
-static int hf_dnp3_al_sa_mac = -1;
-static int hf_dnp3_al_sa_mal = -1;
-static int hf_dnp3_al_sa_rfc = -1;
-static int hf_dnp3_al_sa_seq = -1;
-static int hf_dnp3_al_sa_uk = -1;
-static int hf_dnp3_al_sa_ukl = -1;
-static int hf_dnp3_al_sa_usr = -1;
-static int hf_dnp3_al_sa_usrn = -1;
-static int hf_dnp3_al_sa_usrnl = -1;
-static int hf_dnp3_al_sa_assoc_id = -1;
+static int hf_dnp3_al_ptnum; */
+static int hf_dnp3_al_biq_b0;
+static int hf_dnp3_al_biq_b1;
+static int hf_dnp3_al_biq_b2;
+static int hf_dnp3_al_biq_b3;
+static int hf_dnp3_al_biq_b4;
+static int hf_dnp3_al_biq_b5;
+static int hf_dnp3_al_biq_b6;
+static int hf_dnp3_al_biq_b7;
+static int hf_dnp3_al_boq_b0;
+static int hf_dnp3_al_boq_b1;
+static int hf_dnp3_al_boq_b2;
+static int hf_dnp3_al_boq_b3;
+static int hf_dnp3_al_boq_b4;
+static int hf_dnp3_al_boq_b5;
+static int hf_dnp3_al_boq_b6;
+static int hf_dnp3_al_boq_b7;
+static int hf_dnp3_al_ctrq_b0;
+static int hf_dnp3_al_ctrq_b1;
+static int hf_dnp3_al_ctrq_b2;
+static int hf_dnp3_al_ctrq_b3;
+static int hf_dnp3_al_ctrq_b4;
+static int hf_dnp3_al_ctrq_b5;
+static int hf_dnp3_al_ctrq_b6;
+static int hf_dnp3_al_ctrq_b7;
+static int hf_dnp3_al_aiq_b0;
+static int hf_dnp3_al_aiq_b1;
+static int hf_dnp3_al_aiq_b2;
+static int hf_dnp3_al_aiq_b3;
+static int hf_dnp3_al_aiq_b4;
+static int hf_dnp3_al_aiq_b5;
+static int hf_dnp3_al_aiq_b6;
+static int hf_dnp3_al_aiq_b7;
+static int hf_dnp3_al_aoq_b0;
+static int hf_dnp3_al_aoq_b1;
+static int hf_dnp3_al_aoq_b2;
+static int hf_dnp3_al_aoq_b3;
+static int hf_dnp3_al_aoq_b4;
+static int hf_dnp3_al_aoq_b5;
+static int hf_dnp3_al_aoq_b6;
+static int hf_dnp3_al_aoq_b7;
+static int hf_dnp3_al_timestamp;
+static int hf_dnp3_al_file_perms;
+static int hf_dnp3_al_file_perms_read_owner;
+static int hf_dnp3_al_file_perms_write_owner;
+static int hf_dnp3_al_file_perms_exec_owner;
+static int hf_dnp3_al_file_perms_read_group;
+static int hf_dnp3_al_file_perms_write_group;
+static int hf_dnp3_al_file_perms_exec_group;
+static int hf_dnp3_al_file_perms_read_world;
+static int hf_dnp3_al_file_perms_write_world;
+static int hf_dnp3_al_file_perms_exec_world;
+static int hf_dnp3_al_rel_timestamp;
+static int hf_dnp3_al_ana16;
+static int hf_dnp3_al_ana32;
+static int hf_dnp3_al_anaflt;
+static int hf_dnp3_al_anadbl;
+static int hf_dnp3_al_bit;
+static int hf_dnp3_al_2bit;
+static int hf_dnp3_al_cnt16;
+static int hf_dnp3_al_cnt32;
+static int hf_dnp3_al_ctrlstatus;
+static int hf_dnp3_al_anaout16;
+static int hf_dnp3_al_anaout32;
+static int hf_dnp3_al_anaoutflt;
+static int hf_dnp3_al_anaoutdbl;
+static int hf_dnp3_al_file_mode;
+static int hf_dnp3_al_file_auth;
+static int hf_dnp3_al_file_size;
+static int hf_dnp3_al_file_maxblk;
+static int hf_dnp3_al_file_reqID;
+static int hf_dnp3_al_file_handle;
+static int hf_dnp3_al_file_status;
+static int hf_dnp3_al_file_blocknum;
+static int hf_dnp3_al_file_lastblock;
+static int hf_dnp3_al_file_data;
+static int hf_dnp3_ctlobj_code_c;
+static int hf_dnp3_ctlobj_code_m;
+static int hf_dnp3_ctlobj_code_tc;
+static int hf_dnp3_al_datatype;
+static int hf_dnp3_al_da_length;
+static int hf_dnp3_al_da_uint8;
+static int hf_dnp3_al_da_uint16;
+static int hf_dnp3_al_da_uint32;
+static int hf_dnp3_al_da_int8;
+static int hf_dnp3_al_da_int16;
+static int hf_dnp3_al_da_int32;
+static int hf_dnp3_al_da_flt;
+static int hf_dnp3_al_da_dbl;
+static int hf_dnp3_al_sa_cd;
+static int hf_dnp3_al_sa_cdl;
+static int hf_dnp3_al_sa_csq;
+static int hf_dnp3_al_sa_err;
+static int hf_dnp3_al_sa_key;
+static int hf_dnp3_al_sa_kcm;
+static int hf_dnp3_al_sa_ks;
+static int hf_dnp3_al_sa_ksq;
+static int hf_dnp3_al_sa_kwa;
+static int hf_dnp3_al_sa_mac;
+static int hf_dnp3_al_sa_mal;
+static int hf_dnp3_al_sa_rfc;
+static int hf_dnp3_al_sa_seq;
+static int hf_dnp3_al_sa_uk;
+static int hf_dnp3_al_sa_ukl;
+static int hf_dnp3_al_sa_usr;
+static int hf_dnp3_al_sa_usrn;
+static int hf_dnp3_al_sa_usrnl;
+static int hf_dnp3_al_sa_assoc_id;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_dnp3_al_point_index = -1;
-static int hf_dnp3_al_da_value = -1;
-static int hf_dnp3_al_count = -1;
-static int hf_dnp3_al_on_time = -1;
-static int hf_dnp3_al_off_time = -1;
-static int hf_dnp3_al_time_delay = -1;
-static int hf_dnp3_al_file_string_offset = -1;
-static int hf_dnp3_al_file_string_length = -1;
-static int hf_dnp3_al_file_name = -1;
-static int hf_dnp3_al_octet_string = -1;
-static int hf_dnp3_unknown_data_chunk = -1;
+static int hf_dnp3_al_point_index;
+static int hf_dnp3_al_da_value;
+static int hf_dnp3_al_count;
+static int hf_dnp3_al_on_time;
+static int hf_dnp3_al_off_time;
+static int hf_dnp3_al_time_delay;
+static int hf_dnp3_al_file_string_offset;
+static int hf_dnp3_al_file_string_length;
+static int hf_dnp3_al_file_name;
+static int hf_dnp3_al_octet_string;
+static int hf_dnp3_unknown_data_chunk;
 
 /***************************************************************************/
 /* Value String Look-Ups */
@@ -1475,37 +1475,37 @@ static const value_string dnp3_al_sa_secstat_vals[] = {
 static value_string_ext dnp3_al_sa_secstat_vals_ext = VALUE_STRING_EXT_INIT(dnp3_al_sa_secstat_vals);
 
 /* Initialize the subtree pointers */
-static gint ett_dnp3 = -1;
-static gint ett_dnp3_dl = -1;
-static gint ett_dnp3_dl_ctl = -1;
-static gint ett_dnp3_tr_ctl = -1;
-static gint ett_dnp3_dl_data = -1;
-static gint ett_dnp3_dl_chunk = -1;
-static gint ett_dnp3_al = -1;
-static gint ett_dnp3_al_ctl = -1;
-static gint ett_dnp3_al_obj_point_tcc = -1;
+static gint ett_dnp3;
+static gint ett_dnp3_dl;
+static gint ett_dnp3_dl_ctl;
+static gint ett_dnp3_tr_ctl;
+static gint ett_dnp3_dl_data;
+static gint ett_dnp3_dl_chunk;
+static gint ett_dnp3_al;
+static gint ett_dnp3_al_ctl;
+static gint ett_dnp3_al_obj_point_tcc;
 
 /* Added for Application Layer Decoding */
-static gint ett_dnp3_al_iin = -1;
-static gint ett_dnp3_al_obj = -1;
-static gint ett_dnp3_al_obj_qualifier = -1;
-static gint ett_dnp3_al_obj_range = -1;
-static gint ett_dnp3_al_objdet = -1;
-static gint ett_dnp3_al_obj_quality = -1;
-static gint ett_dnp3_al_obj_point = -1;
-static gint ett_dnp3_al_obj_point_perms = -1;
-
-static expert_field ei_dnp_num_items_neg = EI_INIT;
-static expert_field ei_dnp_invalid_length = EI_INIT;
-static expert_field ei_dnp_iin_abnormal = EI_INIT;
-static expert_field ei_dnp3_data_hdr_crc_incorrect = EI_INIT;
-static expert_field ei_dnp3_data_chunk_crc_incorrect = EI_INIT;
-static expert_field ei_dnp3_unknown_object = EI_INIT;
-static expert_field ei_dnp3_unknown_group0_variation = EI_INIT;
-static expert_field ei_dnp3_num_items_invalid = EI_INIT;
+static gint ett_dnp3_al_iin;
+static gint ett_dnp3_al_obj;
+static gint ett_dnp3_al_obj_qualifier;
+static gint ett_dnp3_al_obj_range;
+static gint ett_dnp3_al_objdet;
+static gint ett_dnp3_al_obj_quality;
+static gint ett_dnp3_al_obj_point;
+static gint ett_dnp3_al_obj_point_perms;
+
+static expert_field ei_dnp_num_items_neg;
+static expert_field ei_dnp_invalid_length;
+static expert_field ei_dnp_iin_abnormal;
+static expert_field ei_dnp3_data_hdr_crc_incorrect;
+static expert_field ei_dnp3_data_chunk_crc_incorrect;
+static expert_field ei_dnp3_unknown_object;
+static expert_field ei_dnp3_unknown_group0_variation;
+static expert_field ei_dnp3_num_items_invalid;
 /* Generated from convert_proto_tree_add_text.pl */
 #if 0
-static expert_field ei_dnp3_buffering_user_data_until_final_frame_is_received = EI_INIT;
+static expert_field ei_dnp3_buffering_user_data_until_final_frame_is_received;
 #endif
 
 /* Tables for reassembly of fragments. */
@@ -1514,19 +1514,19 @@ static reassembly_table al_reassembly_table;
 /* ************************************************************************* */
 /*                   Header values for reassembly                            */
 /* ************************************************************************* */
-static int   hf_al_frag_data   = -1;
-static int   hf_dnp3_fragment  = -1;
-static int   hf_dnp3_fragments = -1;
-static int   hf_dnp3_fragment_overlap = -1;
-static int   hf_dnp3_fragment_overlap_conflict = -1;
-static int   hf_dnp3_fragment_multiple_tails = -1;
-static int   hf_dnp3_fragment_too_long_fragment = -1;
-static int   hf_dnp3_fragment_error = -1;
-static int   hf_dnp3_fragment_count = -1;
-static int   hf_dnp3_fragment_reassembled_in = -1;
-static int   hf_dnp3_fragment_reassembled_length = -1;
-static gint ett_dnp3_fragment  = -1;
-static gint ett_dnp3_fragments = -1;
+static int   hf_al_frag_data;
+static int   hf_dnp3_fragment;
+static int   hf_dnp3_fragments;
+static int   hf_dnp3_fragment_overlap;
+static int   hf_dnp3_fragment_overlap_conflict;
+static int   hf_dnp3_fragment_multiple_tails;
+static int   hf_dnp3_fragment_too_long_fragment;
+static int   hf_dnp3_fragment_error;
+static int   hf_dnp3_fragment_count;
+static int   hf_dnp3_fragment_reassembled_in;
+static int   hf_dnp3_fragment_reassembled_length;
+static gint ett_dnp3_fragment;
+static gint ett_dnp3_fragments;
 
 static dissector_handle_t dnp3_tcp_handle;
 static dissector_handle_t dnp3_udp_handle;
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 9d5b06a6ed..cae9fc79c9 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -146,372 +146,372 @@ static int st_node_service_unsolicited = -1;
 static int st_node_service_retransmission = -1;
 static int st_node_service_rrt = -1;
 
-static int proto_dns = -1;
-static int proto_mdns = -1;
-static int proto_llmnr = -1;
-static int hf_dns_length = -1;
-static int hf_dns_flags = -1;
-static int hf_dns_flags_response = -1;
-static int hf_dns_flags_opcode = -1;
-static int hf_dns_flags_authoritative = -1;
-static int hf_dns_flags_conflict_query = -1;
-static int hf_dns_flags_conflict_response = -1;
-static int hf_dns_flags_truncated = -1;
-static int hf_dns_flags_recdesired = -1;
-static int hf_dns_flags_tentative = -1;
-static int hf_dns_flags_recavail = -1;
-static int hf_dns_flags_z = -1;
-static int hf_dns_flags_authenticated = -1;
-static int hf_dns_flags_ad = -1;
-static int hf_dns_flags_checkdisable = -1;
-static int hf_dns_flags_rcode = -1;
-static int hf_dns_transaction_id = -1;
-static int hf_dns_count_questions = -1;
-static int hf_dns_count_zones = -1;
-static int hf_dns_count_answers = -1;
-static int hf_dns_count_prerequisites = -1;
-static int hf_dns_count_updates = -1;
-static int hf_dns_count_auth_rr = -1;
-static int hf_dns_count_add_rr = -1;
-static int hf_dns_qry_name = -1;
-static int hf_dns_qry_name_len = -1;
-static int hf_dns_count_labels = -1;
-static int hf_dns_qry_type = -1;
-static int hf_dns_qry_class = -1;
-static int hf_dns_qry_class_mdns = -1;
-static int hf_dns_qry_qu = -1;
-static int hf_dns_srv_instance = -1;
-static int hf_dns_srv_service = -1;
-static int hf_dns_srv_proto = -1;
-static int hf_dns_srv_name = -1;
-static int hf_dns_srv_priority = -1;
-static int hf_dns_srv_weight = -1;
-static int hf_dns_srv_port = -1;
-static int hf_dns_srv_target = -1;
-static int hf_dns_naptr_order = -1;
-static int hf_dns_naptr_preference = -1;
-static int hf_dns_naptr_flags_length = -1;
-static int hf_dns_naptr_flags = -1;
-static int hf_dns_naptr_service_length = -1;
-static int hf_dns_naptr_service = -1;
-static int hf_dns_naptr_regex_length = -1;
-static int hf_dns_naptr_regex = -1;
-static int hf_dns_naptr_replacement_length = -1;
-static int hf_dns_naptr_replacement = -1;
-static int hf_dns_rr_name = -1;
-static int hf_dns_rr_type = -1;
-static int hf_dns_rr_class = -1;
-static int hf_dns_rr_class_mdns = -1;
-static int hf_dns_rr_cache_flush = -1;
-static int hf_dns_rr_ext_rcode = -1;
-static int hf_dns_rr_edns0_version = -1;
-static int hf_dns_rr_z = -1;
-static int hf_dns_rr_z_do = -1;
-static int hf_dns_rr_z_reserved = -1;
-static int hf_dns_rr_ttl = -1;
-static int hf_dns_rr_len = -1;
-static int hf_dns_a = -1;
-static int hf_dns_a_ch_domain = -1;
-static int hf_dns_a_ch_addr = -1;
-static int hf_dns_md = -1;
-static int hf_dns_mf = -1;
-static int hf_dns_mb = -1;
-static int hf_dns_mg = -1;
-static int hf_dns_mr = -1;
-static int hf_dns_null = -1;
-static int hf_dns_aaaa = -1;
-static int hf_dns_cname = -1;
-static int hf_dns_rr_udp_payload_size = -1;
-static int hf_dns_rr_udp_payload_size_mdns = -1;
-static int hf_dns_soa_mname = -1;
-static int hf_dns_soa_rname = -1;
-static int hf_dns_soa_serial_number = -1;
-static int hf_dns_soa_refresh_interval = -1;
-static int hf_dns_soa_retry_interval = -1;
-static int hf_dns_soa_expire_limit = -1;
-static int hf_dns_soa_minimum_ttl = -1;
-static int hf_dns_ptr_domain_name = -1;
-static int hf_dns_wks_address = -1;
-static int hf_dns_wks_protocol = -1;
-static int hf_dns_wks_bits = -1;
-static int hf_dns_hinfo_cpu_length = -1;
-static int hf_dns_hinfo_cpu = -1;
-static int hf_dns_hinfo_os_length = -1;
-static int hf_dns_hinfo_os = -1;
-static int hf_dns_minfo_r_mailbox = -1;
-static int hf_dns_minfo_e_mailbox = -1;
-static int hf_dns_mx_preference = -1;
-static int hf_dns_mx_mail_exchange = -1;
-static int hf_dns_txt_length = -1;
-static int hf_dns_txt = -1;
-static int hf_dns_csync_soa = -1;
-static int hf_dns_csync_flags = -1;
-static int hf_dns_csync_flags_immediate = -1;
-static int hf_dns_csync_flags_soaminimum = -1;
-static int hf_dns_csync_type_bitmap = -1;
-static int hf_dns_zonemd_serial = -1;
-static int hf_dns_zonemd_scheme = -1;
-static int hf_dns_zonemd_hash_algo = -1;
-static int hf_dns_zonemd_digest = -1;
-static int hf_dns_svcb_priority = -1;
-static int hf_dns_svcb_target = -1;
-static int hf_dns_svcb_param_key = -1;
-static int hf_dns_svcb_param_length = -1;
-static int hf_dns_svcb_param_value = -1;
-static int hf_dns_svcb_param = -1;
-static int hf_dns_svcb_param_mandatory_key = -1;
-static int hf_dns_svcb_param_alpn_length = -1;
-static int hf_dns_svcb_param_alpn = -1;
-static int hf_dns_svcb_param_port = -1;
-static int hf_dns_svcb_param_ipv4hint_ip = -1;
-static int hf_dns_svcb_param_ipv6hint_ip = -1;
-static int hf_dns_svcb_param_dohpath = -1;
-static int hf_dns_svcb_param_odohconfig = -1;
-static int hf_dns_openpgpkey = -1;
-static int hf_dns_spf_length = -1;
-static int hf_dns_spf = -1;
-static int hf_dns_ilnp_nodeid_preference = -1;
-static int hf_dns_ilnp_nodeid = -1;
-static int hf_dns_ilnp_locator32_preference = -1;
-static int hf_dns_ilnp_locator32 = -1;
-static int hf_dns_ilnp_locator64_preference = -1;
-static int hf_dns_ilnp_locator64 = -1;
-static int hf_dns_ilnp_locatorfqdn_preference = -1;
-static int hf_dns_ilnp_locatorfqdn = -1;
-static int hf_dns_eui48 = -1;
-static int hf_dns_eui64 = -1;
-static int hf_dns_rrsig_type_covered = -1;
-static int hf_dns_rrsig_algorithm = -1;
-static int hf_dns_rrsig_labels = -1;
-static int hf_dns_rrsig_original_ttl = -1;
-static int hf_dns_rrsig_signature_expiration = -1;
-static int hf_dns_rrsig_signature_inception = -1;
-static int hf_dns_rrsig_key_tag = -1;
-static int hf_dns_rrsig_signers_name = -1;
-static int hf_dns_rrsig_signature = -1;
-static int hf_dns_dnskey_flags = -1;
-static int hf_dns_dnskey_flags_zone_key = -1;
-static int hf_dns_dnskey_flags_key_revoked = -1;
-static int hf_dns_dnskey_flags_secure_entry_point = -1;
-static int hf_dns_dnskey_flags_reserved = -1;
-static int hf_dns_dnskey_protocol = -1;
-static int hf_dns_dnskey_algorithm = -1;
-static int hf_dns_dnskey_key_id = -1;
-static int hf_dns_dnskey_public_key = -1;
-static int hf_dns_key_flags = -1;
-static int hf_dns_key_flags_authentication = -1;
-static int hf_dns_key_flags_confidentiality = -1;
-static int hf_dns_key_flags_key_required = -1;
-static int hf_dns_key_flags_associated_user = -1;
-static int hf_dns_key_flags_associated_named_entity = -1;
-static int hf_dns_key_flags_ipsec = -1;
-static int hf_dns_key_flags_mime = -1;
-static int hf_dns_key_flags_signatory = -1;
-static int hf_dns_key_protocol = -1;
-static int hf_dns_key_algorithm = -1;
-static int hf_dns_key_key_id = -1;
-static int hf_dns_key_public_key = -1;
-static int hf_dns_px_preference = -1;
-static int hf_dns_px_map822 = -1;
-static int hf_dns_px_mapx400 = -1;
-static int hf_dns_tkey_algo_name = -1;
-static int hf_dns_tkey_signature_expiration = -1;
-static int hf_dns_tkey_signature_inception = -1;
-static int hf_dns_tkey_mode = -1;
-static int hf_dns_tkey_error = -1;
-static int hf_dns_tkey_key_size = -1;
-static int hf_dns_tkey_key_data = -1;
-static int hf_dns_tkey_other_size = -1;
-static int hf_dns_tkey_other_data = -1;
-static int hf_dns_ipseckey_gateway_precedence = -1;
-static int hf_dns_ipseckey_gateway_type = -1;
-static int hf_dns_ipseckey_gateway_algorithm = -1;
-static int hf_dns_ipseckey_gateway_ipv4 = -1;
-static int hf_dns_ipseckey_gateway_ipv6 = -1;
-static int hf_dns_ipseckey_gateway_dns = -1;
-static int hf_dns_ipseckey_public_key = -1;
-static int hf_dns_xpf_ip_version = -1;
-static int hf_dns_xpf_protocol = -1;
-static int hf_dns_xpf_source_ipv4 = -1;
-static int hf_dns_xpf_destination_ipv4 = -1;
-static int hf_dns_xpf_source_ipv6 = -1;
-static int hf_dns_xpf_destination_ipv6 = -1;
-static int hf_dns_xpf_sport = -1;
-static int hf_dns_xpf_dport = -1;
-static int hf_dns_a6_prefix_len = -1;
-static int hf_dns_a6_address_suffix = -1;
-static int hf_dns_a6_prefix_name = -1;
-static int hf_dns_dname = -1;
-static int hf_dns_loc_version = -1;
-static int hf_dns_loc_size = -1;
-static int hf_dns_loc_horizontal_precision = -1;
-static int hf_dns_loc_vertical_precision = -1;
-static int hf_dns_loc_latitude = -1;
-static int hf_dns_loc_longitude = -1;
-static int hf_dns_loc_altitude = -1;
-static int hf_dns_loc_unknown_data = -1;
-static int hf_dns_nxt_next_domain_name = -1;
-static int hf_dns_kx_preference = -1;
-static int hf_dns_kx_key_exchange = -1;
-static int hf_dns_cert_type = -1;
-static int hf_dns_cert_key_tag = -1;
-static int hf_dns_cert_algorithm = -1;
-static int hf_dns_cert_certificate = -1;
-static int hf_dns_nsec_next_domain_name = -1;
-static int hf_dns_ns = -1;
-static int hf_dns_opt = -1;
-static int hf_dns_opt_code = -1;
-static int hf_dns_opt_len = -1;
-static int hf_dns_opt_data = -1;
-static int hf_dns_opt_dau = -1;
-static int hf_dns_opt_dhu = -1;
-static int hf_dns_opt_n3u = -1;
-static int hf_dns_opt_client_family = -1;
-static int hf_dns_opt_client_netmask = -1;
-static int hf_dns_opt_client_scope = -1;
-static int hf_dns_opt_client_addr = -1;
-static int hf_dns_opt_client_addr4 = -1;
-static int hf_dns_opt_client_addr6 = -1;
-static int hf_dns_opt_cookie_client = -1;
-static int hf_dns_opt_cookie_server = -1;
-static int hf_dns_opt_edns_tcp_keepalive_timeout = -1;
-static int hf_dns_opt_padding = -1;
-static int hf_dns_opt_chain_fqdn = -1;
-static int hf_dns_opt_ext_error_info_code = -1;
-static int hf_dns_opt_ext_error_extra_text = -1;
-static int hf_dns_nsec3_algo = -1;
-static int hf_dns_nsec3_flags = -1;
-static int hf_dns_nsec3_flag_optout = -1;
-static int hf_dns_nsec3_iterations = -1;
-static int hf_dns_nsec3_salt_length = -1;
-static int hf_dns_nsec3_salt_value = -1;
-static int hf_dns_nsec3_hash_length = -1;
-static int hf_dns_nsec3_hash_value = -1;
-static int hf_dns_tlsa_certificate_usage = -1;
-static int hf_dns_tlsa_selector = -1;
-static int hf_dns_tlsa_matching_type = -1;
-static int hf_dns_tlsa_certificate_association_data = -1;
-static int hf_dns_tsig_algorithm_name = -1;
-static int hf_dns_tsig_time_signed = -1;
-static int hf_dns_tsig_error = -1;
-static int hf_dns_tsig_fudge = -1;
-static int hf_dns_tsig_mac_size = -1;
-static int hf_dns_tsig_mac = -1;
-static int hf_dns_tsig_original_id = -1;
-static int hf_dns_tsig_other_len = -1;
-static int hf_dns_tsig_other_data = -1;
-static int hf_dns_response_in = -1;
-static int hf_dns_response_to = -1;
-static int hf_dns_retransmission = -1;
-static int hf_dns_retransmit_request_in = -1;
-static int hf_dns_retransmit_response_in = -1;
-static int hf_dns_time = -1;
-static int hf_dns_unsolicited = -1;
-static int hf_dns_sshfp_algorithm = -1;
-static int hf_dns_sshfp_fingerprint_type = -1;
-static int hf_dns_sshfp_fingerprint = -1;
-static int hf_dns_hip_hit_length = -1;
-static int hf_dns_hip_pk_algo = -1;
-static int hf_dns_hip_pk_length = -1;
-static int hf_dns_hip_hit = -1;
-static int hf_dns_hip_pk = -1;
-static int hf_dns_hip_rendezvous_server = -1;
-static int hf_dns_dhcid_rdata = -1;
-static int hf_dns_ds_key_id = -1;
-static int hf_dns_ds_algorithm = -1;
-static int hf_dns_apl_coded_prefix = -1;
-static int hf_dns_ds_digest_type = -1;
-static int hf_dns_ds_digest = -1;
-static int hf_dns_apl_address_family = -1;
-static int hf_dns_apl_negation = -1;
-static int hf_dns_apl_afdlength = -1;
-static int hf_dns_apl_afdpart_ipv4 = -1;
-static int hf_dns_apl_afdpart_ipv6 = -1;
-static int hf_dns_apl_afdpart_data = -1;
-static int hf_dns_gpos_longitude_length = -1;
-static int hf_dns_gpos_longitude = -1;
-static int hf_dns_gpos_latitude_length = -1;
-static int hf_dns_gpos_latitude = -1;
-static int hf_dns_gpos_altitude_length = -1;
-static int hf_dns_gpos_altitude = -1;
-static int hf_dns_rp_mailbox = -1;
-static int hf_dns_rp_txt_rr = -1;
-static int hf_dns_afsdb_subtype = -1;
-static int hf_dns_afsdb_hostname = -1;
-static int hf_dns_x25_length = -1;
-static int hf_dns_x25_psdn_address = -1;
-static int hf_dns_isdn_length = -1;
-static int hf_dns_isdn_address = -1;
-static int hf_dns_isdn_sa_length = -1;
-static int hf_dns_isdn_sa = -1;
-static int hf_dns_rt_preference = -1;
-static int hf_dns_rt_intermediate_host = -1;
-static int hf_dns_nsap_rdata = -1;
-static int hf_dns_nsap_ptr_owner = -1;
-static int hf_dns_caa_flags = -1;
-static int hf_dns_caa_flag_issuer_critical = -1;
-static int hf_dns_caa_issue = -1;
-static int hf_dns_caa_issuewild = -1;
-static int hf_dns_caa_iodef = -1;
-static int hf_dns_caa_unknown = -1;
-static int hf_dns_caa_tag_length = -1;
-static int hf_dns_caa_tag = -1;
-static int hf_dns_caa_value = -1;
-static int hf_dns_extraneous_data = -1;
-static int hf_dns_extraneous_length = -1;
-
-static int hf_dns_wins_local_flag = -1;
-static int hf_dns_wins_lookup_timeout = -1;
-static int hf_dns_wins_cache_timeout = -1;
-static int hf_dns_wins_nb_wins_servers = -1;
-static int hf_dns_wins_server = -1;
-
-static int hf_dns_winsr_local_flag = -1;
-static int hf_dns_winsr_lookup_timeout = -1;
-static int hf_dns_winsr_cache_timeout = -1;
-static int hf_dns_winsr_name_result_domain = -1;
-
-static int hf_dns_data = -1;
-
-static int hf_dns_dso = -1;
-static int hf_dns_dso_tlv = -1;
-static int hf_dns_dso_tlv_type = -1;
-static int hf_dns_dso_tlv_length = -1;
-static int hf_dns_dso_tlv_data = -1;
-static int hf_dns_dso_tlv_keepalive_inactivity = -1;
-static int hf_dns_dso_tlv_keepalive_interval = -1;
-static int hf_dns_dso_tlv_retrydelay_retrydelay = -1;
-static int hf_dns_dso_tlv_encpad_padding = -1;
-
-static gint ett_dns = -1;
-static gint ett_dns_qd = -1;
-static gint ett_dns_rr = -1;
-static gint ett_dns_qry = -1;
-static gint ett_dns_ans = -1;
-static gint ett_dns_flags = -1;
-static gint ett_dns_opts = -1;
-static gint ett_nsec3_flags = -1;
-static gint ett_key_flags = -1;
-static gint ett_t_key = -1;
-static gint ett_dns_mac = -1;
-static gint ett_caa_flags = -1;
-static gint ett_caa_data = -1;
-static gint ett_dns_csdync_flags = -1;
-static gint ett_dns_dso = -1;
-static gint ett_dns_dso_tlv = -1;
-static gint ett_dns_svcb = -1;
-static gint ett_dns_extraneous = -1;
-
-static expert_field ei_dns_a_class_undecoded = EI_INIT;
-static expert_field ei_dns_opt_bad_length = EI_INIT;
-static expert_field ei_dns_depr_opc = EI_INIT;
-static expert_field ei_ttl_high_bit_set = EI_INIT;
-static expert_field ei_dns_tsig_alg = EI_INIT;
-static expert_field ei_dns_undecoded_option = EI_INIT;
-static expert_field ei_dns_key_id_buffer_too_short = EI_INIT;
-static expert_field ei_dns_retransmit_request = EI_INIT;
-static expert_field ei_dns_retransmit_response = EI_INIT;
-static expert_field ei_dns_extraneous_data = EI_INIT;
+static int proto_dns;
+static int proto_mdns;
+static int proto_llmnr;
+static int hf_dns_length;
+static int hf_dns_flags;
+static int hf_dns_flags_response;
+static int hf_dns_flags_opcode;
+static int hf_dns_flags_authoritative;
+static int hf_dns_flags_conflict_query;
+static int hf_dns_flags_conflict_response;
+static int hf_dns_flags_truncated;
+static int hf_dns_flags_recdesired;
+static int hf_dns_flags_tentative;
+static int hf_dns_flags_recavail;
+static int hf_dns_flags_z;
+static int hf_dns_flags_authenticated;
+static int hf_dns_flags_ad;
+static int hf_dns_flags_checkdisable;
+static int hf_dns_flags_rcode;
+static int hf_dns_transaction_id;
+static int hf_dns_count_questions;
+static int hf_dns_count_zones;
+static int hf_dns_count_answers;
+static int hf_dns_count_prerequisites;
+static int hf_dns_count_updates;
+static int hf_dns_count_auth_rr;
+static int hf_dns_count_add_rr;
+static int hf_dns_qry_name;
+static int hf_dns_qry_name_len;
+static int hf_dns_count_labels;
+static int hf_dns_qry_type;
+static int hf_dns_qry_class;
+static int hf_dns_qry_class_mdns;
+static int hf_dns_qry_qu;
+static int hf_dns_srv_instance;
+static int hf_dns_srv_service;
+static int hf_dns_srv_proto;
+static int hf_dns_srv_name;
+static int hf_dns_srv_priority;
+static int hf_dns_srv_weight;
+static int hf_dns_srv_port;
+static int hf_dns_srv_target;
+static int hf_dns_naptr_order;
+static int hf_dns_naptr_preference;
+static int hf_dns_naptr_flags_length;
+static int hf_dns_naptr_flags;
+static int hf_dns_naptr_service_length;
+static int hf_dns_naptr_service;
+static int hf_dns_naptr_regex_length;
+static int hf_dns_naptr_regex;
+static int hf_dns_naptr_replacement_length;
+static int hf_dns_naptr_replacement;
+static int hf_dns_rr_name;
+static int hf_dns_rr_type;
+static int hf_dns_rr_class;
+static int hf_dns_rr_class_mdns;
+static int hf_dns_rr_cache_flush;
+static int hf_dns_rr_ext_rcode;
+static int hf_dns_rr_edns0_version;
+static int hf_dns_rr_z;
+static int hf_dns_rr_z_do;
+static int hf_dns_rr_z_reserved;
+static int hf_dns_rr_ttl;
+static int hf_dns_rr_len;
+static int hf_dns_a;
+static int hf_dns_a_ch_domain;
+static int hf_dns_a_ch_addr;
+static int hf_dns_md;
+static int hf_dns_mf;
+static int hf_dns_mb;
+static int hf_dns_mg;
+static int hf_dns_mr;
+static int hf_dns_null;
+static int hf_dns_aaaa;
+static int hf_dns_cname;
+static int hf_dns_rr_udp_payload_size;
+static int hf_dns_rr_udp_payload_size_mdns;
+static int hf_dns_soa_mname;
+static int hf_dns_soa_rname;
+static int hf_dns_soa_serial_number;
+static int hf_dns_soa_refresh_interval;
+static int hf_dns_soa_retry_interval;
+static int hf_dns_soa_expire_limit;
+static int hf_dns_soa_minimum_ttl;
+static int hf_dns_ptr_domain_name;
+static int hf_dns_wks_address;
+static int hf_dns_wks_protocol;
+static int hf_dns_wks_bits;
+static int hf_dns_hinfo_cpu_length;
+static int hf_dns_hinfo_cpu;
+static int hf_dns_hinfo_os_length;
+static int hf_dns_hinfo_os;
+static int hf_dns_minfo_r_mailbox;
+static int hf_dns_minfo_e_mailbox;
+static int hf_dns_mx_preference;
+static int hf_dns_mx_mail_exchange;
+static int hf_dns_txt_length;
+static int hf_dns_txt;
+static int hf_dns_csync_soa;
+static int hf_dns_csync_flags;
+static int hf_dns_csync_flags_immediate;
+static int hf_dns_csync_flags_soaminimum;
+static int hf_dns_csync_type_bitmap;
+static int hf_dns_zonemd_serial;
+static int hf_dns_zonemd_scheme;
+static int hf_dns_zonemd_hash_algo;
+static int hf_dns_zonemd_digest;
+static int hf_dns_svcb_priority;
+static int hf_dns_svcb_target;
+static int hf_dns_svcb_param_key;
+static int hf_dns_svcb_param_length;
+static int hf_dns_svcb_param_value;
+static int hf_dns_svcb_param;
+static int hf_dns_svcb_param_mandatory_key;
+static int hf_dns_svcb_param_alpn_length;
+static int hf_dns_svcb_param_alpn;
+static int hf_dns_svcb_param_port;
+static int hf_dns_svcb_param_ipv4hint_ip;
+static int hf_dns_svcb_param_ipv6hint_ip;
+static int hf_dns_svcb_param_dohpath;
+static int hf_dns_svcb_param_odohconfig;
+static int hf_dns_openpgpkey;
+static int hf_dns_spf_length;
+static int hf_dns_spf;
+static int hf_dns_ilnp_nodeid_preference;
+static int hf_dns_ilnp_nodeid;
+static int hf_dns_ilnp_locator32_preference;
+static int hf_dns_ilnp_locator32;
+static int hf_dns_ilnp_locator64_preference;
+static int hf_dns_ilnp_locator64;
+static int hf_dns_ilnp_locatorfqdn_preference;
+static int hf_dns_ilnp_locatorfqdn;
+static int hf_dns_eui48;
+static int hf_dns_eui64;
+static int hf_dns_rrsig_type_covered;
+static int hf_dns_rrsig_algorithm;
+static int hf_dns_rrsig_labels;
+static int hf_dns_rrsig_original_ttl;
+static int hf_dns_rrsig_signature_expiration;
+static int hf_dns_rrsig_signature_inception;
+static int hf_dns_rrsig_key_tag;
+static int hf_dns_rrsig_signers_name;
+static int hf_dns_rrsig_signature;
+static int hf_dns_dnskey_flags;
+static int hf_dns_dnskey_flags_zone_key;
+static int hf_dns_dnskey_flags_key_revoked;
+static int hf_dns_dnskey_flags_secure_entry_point;
+static int hf_dns_dnskey_flags_reserved;
+static int hf_dns_dnskey_protocol;
+static int hf_dns_dnskey_algorithm;
+static int hf_dns_dnskey_key_id;
+static int hf_dns_dnskey_public_key;
+static int hf_dns_key_flags;
+static int hf_dns_key_flags_authentication;
+static int hf_dns_key_flags_confidentiality;
+static int hf_dns_key_flags_key_required;
+static int hf_dns_key_flags_associated_user;
+static int hf_dns_key_flags_associated_named_entity;
+static int hf_dns_key_flags_ipsec;
+static int hf_dns_key_flags_mime;
+static int hf_dns_key_flags_signatory;
+static int hf_dns_key_protocol;
+static int hf_dns_key_algorithm;
+static int hf_dns_key_key_id;
+static int hf_dns_key_public_key;
+static int hf_dns_px_preference;
+static int hf_dns_px_map822;
+static int hf_dns_px_mapx400;
+static int hf_dns_tkey_algo_name;
+static int hf_dns_tkey_signature_expiration;
+static int hf_dns_tkey_signature_inception;
+static int hf_dns_tkey_mode;
+static int hf_dns_tkey_error;
+static int hf_dns_tkey_key_size;
+static int hf_dns_tkey_key_data;
+static int hf_dns_tkey_other_size;
+static int hf_dns_tkey_other_data;
+static int hf_dns_ipseckey_gateway_precedence;
+static int hf_dns_ipseckey_gateway_type;
+static int hf_dns_ipseckey_gateway_algorithm;
+static int hf_dns_ipseckey_gateway_ipv4;
+static int hf_dns_ipseckey_gateway_ipv6;
+static int hf_dns_ipseckey_gateway_dns;
+static int hf_dns_ipseckey_public_key;
+static int hf_dns_xpf_ip_version;
+static int hf_dns_xpf_protocol;
+static int hf_dns_xpf_source_ipv4;
+static int hf_dns_xpf_destination_ipv4;
+static int hf_dns_xpf_source_ipv6;
+static int hf_dns_xpf_destination_ipv6;
+static int hf_dns_xpf_sport;
+static int hf_dns_xpf_dport;
+static int hf_dns_a6_prefix_len;
+static int hf_dns_a6_address_suffix;
+static int hf_dns_a6_prefix_name;
+static int hf_dns_dname;
+static int hf_dns_loc_version;
+static int hf_dns_loc_size;
+static int hf_dns_loc_horizontal_precision;
+static int hf_dns_loc_vertical_precision;
+static int hf_dns_loc_latitude;
+static int hf_dns_loc_longitude;
+static int hf_dns_loc_altitude;
+static int hf_dns_loc_unknown_data;
+static int hf_dns_nxt_next_domain_name;
+static int hf_dns_kx_preference;
+static int hf_dns_kx_key_exchange;
+static int hf_dns_cert_type;
+static int hf_dns_cert_key_tag;
+static int hf_dns_cert_algorithm;
+static int hf_dns_cert_certificate;
+static int hf_dns_nsec_next_domain_name;
+static int hf_dns_ns;
+static int hf_dns_opt;
+static int hf_dns_opt_code;
+static int hf_dns_opt_len;
+static int hf_dns_opt_data;
+static int hf_dns_opt_dau;
+static int hf_dns_opt_dhu;
+static int hf_dns_opt_n3u;
+static int hf_dns_opt_client_family;
+static int hf_dns_opt_client_netmask;
+static int hf_dns_opt_client_scope;
+static int hf_dns_opt_client_addr;
+static int hf_dns_opt_client_addr4;
+static int hf_dns_opt_client_addr6;
+static int hf_dns_opt_cookie_client;
+static int hf_dns_opt_cookie_server;
+static int hf_dns_opt_edns_tcp_keepalive_timeout;
+static int hf_dns_opt_padding;
+static int hf_dns_opt_chain_fqdn;
+static int hf_dns_opt_ext_error_info_code;
+static int hf_dns_opt_ext_error_extra_text;
+static int hf_dns_nsec3_algo;
+static int hf_dns_nsec3_flags;
+static int hf_dns_nsec3_flag_optout;
+static int hf_dns_nsec3_iterations;
+static int hf_dns_nsec3_salt_length;
+static int hf_dns_nsec3_salt_value;
+static int hf_dns_nsec3_hash_length;
+static int hf_dns_nsec3_hash_value;
+static int hf_dns_tlsa_certificate_usage;
+static int hf_dns_tlsa_selector;
+static int hf_dns_tlsa_matching_type;
+static int hf_dns_tlsa_certificate_association_data;
+static int hf_dns_tsig_algorithm_name;
+static int hf_dns_tsig_time_signed;
+static int hf_dns_tsig_error;
+static int hf_dns_tsig_fudge;
+static int hf_dns_tsig_mac_size;
+static int hf_dns_tsig_mac;
+static int hf_dns_tsig_original_id;
+static int hf_dns_tsig_other_len;
+static int hf_dns_tsig_other_data;
+static int hf_dns_response_in;
+static int hf_dns_response_to;
+static int hf_dns_retransmission;
+static int hf_dns_retransmit_request_in;
+static int hf_dns_retransmit_response_in;
+static int hf_dns_time;
+static int hf_dns_unsolicited;
+static int hf_dns_sshfp_algorithm;
+static int hf_dns_sshfp_fingerprint_type;
+static int hf_dns_sshfp_fingerprint;
+static int hf_dns_hip_hit_length;
+static int hf_dns_hip_pk_algo;
+static int hf_dns_hip_pk_length;
+static int hf_dns_hip_hit;
+static int hf_dns_hip_pk;
+static int hf_dns_hip_rendezvous_server;
+static int hf_dns_dhcid_rdata;
+static int hf_dns_ds_key_id;
+static int hf_dns_ds_algorithm;
+static int hf_dns_apl_coded_prefix;
+static int hf_dns_ds_digest_type;
+static int hf_dns_ds_digest;
+static int hf_dns_apl_address_family;
+static int hf_dns_apl_negation;
+static int hf_dns_apl_afdlength;
+static int hf_dns_apl_afdpart_ipv4;
+static int hf_dns_apl_afdpart_ipv6;
+static int hf_dns_apl_afdpart_data;
+static int hf_dns_gpos_longitude_length;
+static int hf_dns_gpos_longitude;
+static int hf_dns_gpos_latitude_length;
+static int hf_dns_gpos_latitude;
+static int hf_dns_gpos_altitude_length;
+static int hf_dns_gpos_altitude;
+static int hf_dns_rp_mailbox;
+static int hf_dns_rp_txt_rr;
+static int hf_dns_afsdb_subtype;
+static int hf_dns_afsdb_hostname;
+static int hf_dns_x25_length;
+static int hf_dns_x25_psdn_address;
+static int hf_dns_isdn_length;
+static int hf_dns_isdn_address;
+static int hf_dns_isdn_sa_length;
+static int hf_dns_isdn_sa;
+static int hf_dns_rt_preference;
+static int hf_dns_rt_intermediate_host;
+static int hf_dns_nsap_rdata;
+static int hf_dns_nsap_ptr_owner;
+static int hf_dns_caa_flags;
+static int hf_dns_caa_flag_issuer_critical;
+static int hf_dns_caa_issue;
+static int hf_dns_caa_issuewild;
+static int hf_dns_caa_iodef;
+static int hf_dns_caa_unknown;
+static int hf_dns_caa_tag_length;
+static int hf_dns_caa_tag;
+static int hf_dns_caa_value;
+static int hf_dns_extraneous_data;
+static int hf_dns_extraneous_length;
+
+static int hf_dns_wins_local_flag;
+static int hf_dns_wins_lookup_timeout;
+static int hf_dns_wins_cache_timeout;
+static int hf_dns_wins_nb_wins_servers;
+static int hf_dns_wins_server;
+
+static int hf_dns_winsr_local_flag;
+static int hf_dns_winsr_lookup_timeout;
+static int hf_dns_winsr_cache_timeout;
+static int hf_dns_winsr_name_result_domain;
+
+static int hf_dns_data;
+
+static int hf_dns_dso;
+static int hf_dns_dso_tlv;
+static int hf_dns_dso_tlv_type;
+static int hf_dns_dso_tlv_length;
+static int hf_dns_dso_tlv_data;
+static int hf_dns_dso_tlv_keepalive_inactivity;
+static int hf_dns_dso_tlv_keepalive_interval;
+static int hf_dns_dso_tlv_retrydelay_retrydelay;
+static int hf_dns_dso_tlv_encpad_padding;
+
+static gint ett_dns;
+static gint ett_dns_qd;
+static gint ett_dns_rr;
+static gint ett_dns_qry;
+static gint ett_dns_ans;
+static gint ett_dns_flags;
+static gint ett_dns_opts;
+static gint ett_nsec3_flags;
+static gint ett_key_flags;
+static gint ett_t_key;
+static gint ett_dns_mac;
+static gint ett_caa_flags;
+static gint ett_caa_data;
+static gint ett_dns_csdync_flags;
+static gint ett_dns_dso;
+static gint ett_dns_dso_tlv;
+static gint ett_dns_svcb;
+static gint ett_dns_extraneous;
+
+static expert_field ei_dns_a_class_undecoded;
+static expert_field ei_dns_opt_bad_length;
+static expert_field ei_dns_depr_opc;
+static expert_field ei_ttl_high_bit_set;
+static expert_field ei_dns_tsig_alg;
+static expert_field ei_dns_undecoded_option;
+static expert_field ei_dns_key_id_buffer_too_short;
+static expert_field ei_dns_retransmit_request;
+static expert_field ei_dns_retransmit_response;
+static expert_field ei_dns_extraneous_data;
 
 static dissector_table_t dns_tsig_dissector_table=NULL;
 
diff --git a/epan/dissectors/packet-do-irp.c b/epan/dissectors/packet-do-irp.c
index c5e6e570a5..e58f4d7fb1 100644
--- a/epan/dissectors/packet-do-irp.c
+++ b/epan/dissectors/packet-do-irp.c
@@ -36,206 +36,206 @@ void proto_reg_handoff_do_irp(void);
 static dissector_handle_t do_irp_handle_udp;
 static dissector_handle_t do_irp_handle_tcp;
 
-static int proto_do_irp = -1;
+static int proto_do_irp;
 expert_module_t* expert_do_irp;
 
 /* Fields Generic */
-static int hf_do_irp_string_len = -1;
-static int hf_do_irp_string_value = -1;
-static int hf_do_irp_data_len = -1;
-static int hf_do_irp_data_value = -1;
+static int hf_do_irp_string_len;
+static int hf_do_irp_string_value;
+static int hf_do_irp_data_len;
+static int hf_do_irp_data_value;
 
 /* Fields Message Envelope */
-static int hf_do_irp_envelope = -1;
-static int hf_do_irp_version_major = -1;
-static int hf_do_irp_version_minor = -1;
-static int hf_do_irp_flags = -1;
-static int hf_do_irp_flag_cp = -1;
-static int hf_do_irp_flag_ec = -1;
-static int hf_do_irp_flag_tc = -1;
-static int hf_do_irp_version_major_sugg = -1;
-static int hf_do_irp_version_minor_sugg = -1;
-static int hf_do_irp_sessid = -1;
-static int hf_do_irp_reqid = -1;
-static int hf_do_irp_seq = -1;
-static int hf_do_irp_msglen = -1;
+static int hf_do_irp_envelope;
+static int hf_do_irp_version_major;
+static int hf_do_irp_version_minor;
+static int hf_do_irp_flags;
+static int hf_do_irp_flag_cp;
+static int hf_do_irp_flag_ec;
+static int hf_do_irp_flag_tc;
+static int hf_do_irp_version_major_sugg;
+static int hf_do_irp_version_minor_sugg;
+static int hf_do_irp_sessid;
+static int hf_do_irp_reqid;
+static int hf_do_irp_seq;
+static int hf_do_irp_msglen;
 
 /* Fields Message Header */
-static int hf_do_irp_header = -1;
-static int hf_do_irp_opcode = -1;
-static int hf_do_irp_responsecode = -1;
-static int hf_do_irp_opflags = -1;
-static int hf_do_irp_opflags_at = -1;
-static int hf_do_irp_opflags_ct = -1;
-static int hf_do_irp_opflags_enc = -1;
-static int hf_do_irp_opflags_rec = -1;
-static int hf_do_irp_opflags_ca = -1;
-static int hf_do_irp_opflags_cn = -1;
-static int hf_do_irp_opflags_kc = -1;
-static int hf_do_irp_opflags_po = -1;
-static int hf_do_irp_opflags_rd = -1;
-static int hf_do_irp_opflags_owe = -1;
-static int hf_do_irp_opflags_mns = -1;
-static int hf_do_irp_opflags_dnr = -1;
-static int hf_do_irp_sisn = -1;
-static int hf_do_irp_rcount = -1;
-static int hf_do_irp_expiration = -1;
-static int hf_do_irp_bodylen = -1;
+static int hf_do_irp_header;
+static int hf_do_irp_opcode;
+static int hf_do_irp_responsecode;
+static int hf_do_irp_opflags;
+static int hf_do_irp_opflags_at;
+static int hf_do_irp_opflags_ct;
+static int hf_do_irp_opflags_enc;
+static int hf_do_irp_opflags_rec;
+static int hf_do_irp_opflags_ca;
+static int hf_do_irp_opflags_cn;
+static int hf_do_irp_opflags_kc;
+static int hf_do_irp_opflags_po;
+static int hf_do_irp_opflags_rd;
+static int hf_do_irp_opflags_owe;
+static int hf_do_irp_opflags_mns;
+static int hf_do_irp_opflags_dnr;
+static int hf_do_irp_sisn;
+static int hf_do_irp_rcount;
+static int hf_do_irp_expiration;
+static int hf_do_irp_bodylen;
 
 /* Fields Message Body */
-static int hf_do_irp_body = -1;
-static int hf_do_irp_digest_algo = -1;
-static int hf_do_irp_digest = -1;
-static int hf_do_irp_error_msg = -1;
-static int hf_do_irp_error_idxcount = -1;
-static int hf_do_irp_error_idx = -1;
-static int hf_do_irp_ident = -1;
-static int hf_do_irp_idxcount = -1;
-static int hf_do_irp_idx = -1;
-static int hf_do_irp_typecount = -1;
-static int hf_do_irp_type = -1;
-static int hf_do_irp_identcount = -1;
-static int hf_do_irp_identrecord = -1;
-static int hf_do_irp_identrecord_idx = -1;
-static int hf_do_irp_identrecord_type = -1;
-static int hf_do_irp_identrecord_value = -1;
-static int hf_do_irp_identrecord_value_string = -1;
-static int hf_do_irp_identrecord_value_len = -1;
-static int hf_do_irp_identrecord_perm = -1;
-static int hf_do_irp_identrecord_perm_pw = -1;
-static int hf_do_irp_identrecord_perm_pr = -1;
-static int hf_do_irp_identrecord_perm_aw = -1;
-static int hf_do_irp_identrecord_perm_ar = -1;
-static int hf_do_irp_identrecord_ttl_type = -1;
-static int hf_do_irp_identrecord_ttl = -1;
-static int hf_do_irp_identrecord_ttl_absolute = -1;
-static int hf_do_irp_identrecord_ts = -1;
-static int hf_do_irp_identrecord_ts_utc = -1;
-static int hf_do_irp_identrecord_refcount = -1;
-static int hf_do_irp_identrecord_ref = -1;
-static int hf_do_irp_hsadmin_perm = -1;
-static int hf_do_irp_hsadmin_perm_ai = -1;
-static int hf_do_irp_hsadmin_perm_di = -1;
-static int hf_do_irp_hsadmin_perm_adp = -1;
-static int hf_do_irp_hsadmin_perm_me = -1;
-static int hf_do_irp_hsadmin_perm_de = -1;
-static int hf_do_irp_hsadmin_perm_ae = -1;
-static int hf_do_irp_hsadmin_perm_ma = -1;
-static int hf_do_irp_hsadmin_perm_ra = -1;
-static int hf_do_irp_hsadmin_perm_aa = -1;
-static int hf_do_irp_hsadmin_perm_ar = -1;
-static int hf_do_irp_hsadmin_perm_li = -1;
-static int hf_do_irp_hsadmin_perm_ldp = -1;
-static int hf_do_irp_hsadmin_idx = -1;
-static int hf_do_irp_hsadmin_ident = -1;
-static int hf_do_irp_body_hssite_version = -1;
-static int hf_do_irp_hssite_protoversion_major = -1;
-static int hf_do_irp_hssite_protoversion_minor = -1;
-static int hf_do_irp_hssite_serial = -1;
-static int hf_do_irp_hssite_primask = -1;
-static int hf_do_irp_hssite_primask_pri = -1;
-static int hf_do_irp_hssite_primask_multi = -1;
-static int hf_do_irp_hssite_hashoption = -1;
-static int hf_do_irp_hssite_hashfilter = -1;
-static int hf_do_irp_hssite_attr_count = -1;
-static int hf_do_irp_hssite_attr = -1;
-static int hf_do_irp_hssite_attr_key = -1;
-static int hf_do_irp_hssite_attr_value = -1;
-static int hf_do_irp_hssite_srvcount = -1;
-static int hf_do_irp_hssite_srv = -1;
-static int hf_do_irp_hssite_srv_id = -1;
-static int hf_do_irp_hssite_srv_addr = -1;
-static int hf_do_irp_pkrec = -1;
-static int hf_do_irp_pkrec_len = -1;
-static int hf_do_irp_pkrec_type = -1;
-static int hf_do_irp_pkrec_dsa_q = -1;
-static int hf_do_irp_pkrec_dsa_p = -1;
-static int hf_do_irp_pkrec_dsa_g = -1;
-static int hf_do_irp_pkrec_dsa_y = -1;
-static int hf_do_irp_pkrec_rsa_exp = -1;
-static int hf_do_irp_pkrec_rsa_mod = -1;
-static int hf_do_irp_pkrec_dh_p = -1;
-static int hf_do_irp_pkrec_dh_g = -1;
-static int hf_do_irp_pkrec_dh_y = -1;
-static int hf_do_irp_hssite_srv_if = -1;
-static int hf_do_irp_hssite_srv_ifcount = -1;
-static int hf_do_irp_hssite_srv_if_type = -1;
-static int hf_do_irp_hssite_srv_if_type_admin = -1;
-static int hf_do_irp_hssite_srv_if_type_res = -1;
-static int hf_do_irp_hssite_srv_if_proto = -1;
-static int hf_do_irp_hssite_srv_if_port = -1;
-static int hf_do_irp_hsserv_ident = -1;
-static int hf_do_irp_hsvlist_count = -1;
-static int hf_do_irp_hsvlist_ref = -1;
-static int hf_do_irp_hsalias = -1;
-static int hf_do_irp_hsnamespace = -1;
-static int hf_do_irp_hscert_jwt = -1;
-static int hf_do_irp_hssignature_jwt = -1;
-static int hf_do_irp_refident = -1;
-static int hf_do_irp_nonce = -1;
-static int hf_do_irp_authtype = -1;
-static int hf_do_irp_keyident = -1;
-static int hf_do_irp_keyidx = -1;
-static int hf_do_irp_challresp = -1;
-static int hf_do_irp_veri_result = -1;
-static int hf_do_irp_ignoredident = -1;
-static int hf_do_irp_keyexmode = -1;
-static int hf_do_irp_timeout = -1;
+static int hf_do_irp_body;
+static int hf_do_irp_digest_algo;
+static int hf_do_irp_digest;
+static int hf_do_irp_error_msg;
+static int hf_do_irp_error_idxcount;
+static int hf_do_irp_error_idx;
+static int hf_do_irp_ident;
+static int hf_do_irp_idxcount;
+static int hf_do_irp_idx;
+static int hf_do_irp_typecount;
+static int hf_do_irp_type;
+static int hf_do_irp_identcount;
+static int hf_do_irp_identrecord;
+static int hf_do_irp_identrecord_idx;
+static int hf_do_irp_identrecord_type;
+static int hf_do_irp_identrecord_value;
+static int hf_do_irp_identrecord_value_string;
+static int hf_do_irp_identrecord_value_len;
+static int hf_do_irp_identrecord_perm;
+static int hf_do_irp_identrecord_perm_pw;
+static int hf_do_irp_identrecord_perm_pr;
+static int hf_do_irp_identrecord_perm_aw;
+static int hf_do_irp_identrecord_perm_ar;
+static int hf_do_irp_identrecord_ttl_type;
+static int hf_do_irp_identrecord_ttl;
+static int hf_do_irp_identrecord_ttl_absolute;
+static int hf_do_irp_identrecord_ts;
+static int hf_do_irp_identrecord_ts_utc;
+static int hf_do_irp_identrecord_refcount;
+static int hf_do_irp_identrecord_ref;
+static int hf_do_irp_hsadmin_perm;
+static int hf_do_irp_hsadmin_perm_ai;
+static int hf_do_irp_hsadmin_perm_di;
+static int hf_do_irp_hsadmin_perm_adp;
+static int hf_do_irp_hsadmin_perm_me;
+static int hf_do_irp_hsadmin_perm_de;
+static int hf_do_irp_hsadmin_perm_ae;
+static int hf_do_irp_hsadmin_perm_ma;
+static int hf_do_irp_hsadmin_perm_ra;
+static int hf_do_irp_hsadmin_perm_aa;
+static int hf_do_irp_hsadmin_perm_ar;
+static int hf_do_irp_hsadmin_perm_li;
+static int hf_do_irp_hsadmin_perm_ldp;
+static int hf_do_irp_hsadmin_idx;
+static int hf_do_irp_hsadmin_ident;
+static int hf_do_irp_body_hssite_version;
+static int hf_do_irp_hssite_protoversion_major;
+static int hf_do_irp_hssite_protoversion_minor;
+static int hf_do_irp_hssite_serial;
+static int hf_do_irp_hssite_primask;
+static int hf_do_irp_hssite_primask_pri;
+static int hf_do_irp_hssite_primask_multi;
+static int hf_do_irp_hssite_hashoption;
+static int hf_do_irp_hssite_hashfilter;
+static int hf_do_irp_hssite_attr_count;
+static int hf_do_irp_hssite_attr;
+static int hf_do_irp_hssite_attr_key;
+static int hf_do_irp_hssite_attr_value;
+static int hf_do_irp_hssite_srvcount;
+static int hf_do_irp_hssite_srv;
+static int hf_do_irp_hssite_srv_id;
+static int hf_do_irp_hssite_srv_addr;
+static int hf_do_irp_pkrec;
+static int hf_do_irp_pkrec_len;
+static int hf_do_irp_pkrec_type;
+static int hf_do_irp_pkrec_dsa_q;
+static int hf_do_irp_pkrec_dsa_p;
+static int hf_do_irp_pkrec_dsa_g;
+static int hf_do_irp_pkrec_dsa_y;
+static int hf_do_irp_pkrec_rsa_exp;
+static int hf_do_irp_pkrec_rsa_mod;
+static int hf_do_irp_pkrec_dh_p;
+static int hf_do_irp_pkrec_dh_g;
+static int hf_do_irp_pkrec_dh_y;
+static int hf_do_irp_hssite_srv_if;
+static int hf_do_irp_hssite_srv_ifcount;
+static int hf_do_irp_hssite_srv_if_type;
+static int hf_do_irp_hssite_srv_if_type_admin;
+static int hf_do_irp_hssite_srv_if_type_res;
+static int hf_do_irp_hssite_srv_if_proto;
+static int hf_do_irp_hssite_srv_if_port;
+static int hf_do_irp_hsserv_ident;
+static int hf_do_irp_hsvlist_count;
+static int hf_do_irp_hsvlist_ref;
+static int hf_do_irp_hsalias;
+static int hf_do_irp_hsnamespace;
+static int hf_do_irp_hscert_jwt;
+static int hf_do_irp_hssignature_jwt;
+static int hf_do_irp_refident;
+static int hf_do_irp_nonce;
+static int hf_do_irp_authtype;
+static int hf_do_irp_keyident;
+static int hf_do_irp_keyidx;
+static int hf_do_irp_challresp;
+static int hf_do_irp_veri_result;
+static int hf_do_irp_ignoredident;
+static int hf_do_irp_keyexmode;
+static int hf_do_irp_timeout;
 
 /* Fields Message Credential */
-static int hf_do_irp_credential = -1;
-static int hf_do_irp_credential_len = -1;
-static int hf_do_irp_credential_sesscounter = -1;
-static int hf_do_irp_credential_type = -1;
-static int hf_do_irp_credential_signedinfo = -1;
-static int hf_do_irp_credential_signedinfo_len = -1;
-static int hf_do_irp_credential_signedinfo_algo = -1;
-static int hf_do_irp_credential_signedinfo_sig = -1;
+static int hf_do_irp_credential;
+static int hf_do_irp_credential_len;
+static int hf_do_irp_credential_sesscounter;
+static int hf_do_irp_credential_type;
+static int hf_do_irp_credential_signedinfo;
+static int hf_do_irp_credential_signedinfo_len;
+static int hf_do_irp_credential_signedinfo_algo;
+static int hf_do_irp_credential_signedinfo_sig;
 
 /* Conversation */
-static int hf_do_irp_response_in = -1;
-static int hf_do_irp_response_to = -1;
+static int hf_do_irp_response_in;
+static int hf_do_irp_response_to;
 
 /* Fragment handling */
-static int hf_msg_fragments = -1;
-static int hf_msg_fragment = -1;
-static int hf_msg_fragment_overlap = -1;
-static int hf_msg_fragment_overlap_conflicts = -1;
-static int hf_msg_fragment_multiple_tails = -1;
-static int hf_msg_fragment_too_long_fragment = -1;
-static int hf_msg_fragment_error = -1;
-static int hf_msg_fragment_count = -1;
-static int hf_msg_reassembled_in = -1;
-static int hf_msg_reassembled_len = -1;
-static int hf_msg_reassembled_data = -1;
+static int hf_msg_fragments;
+static int hf_msg_fragment;
+static int hf_msg_fragment_overlap;
+static int hf_msg_fragment_overlap_conflicts;
+static int hf_msg_fragment_multiple_tails;
+static int hf_msg_fragment_too_long_fragment;
+static int hf_msg_fragment_error;
+static int hf_msg_fragment_count;
+static int hf_msg_reassembled_in;
+static int hf_msg_reassembled_len;
+static int hf_msg_reassembled_data;
 
 /* Expert fields */
-static expert_field ei_do_irp_digest_unknown = EI_INIT;
-static expert_field ei_do_irp_frag_wo_tc = EI_INIT;
+static expert_field ei_do_irp_digest_unknown;
+static expert_field ei_do_irp_frag_wo_tc;
 
 /* Trees */
-static gint ett_do_irp = -1;
-static gint ett_do_irp_string = -1;
-static gint ett_do_irp_envelope = -1;
-static gint ett_do_irp_envelope_flags = -1;
-static gint ett_do_irp_header = -1;
-static gint ett_do_irp_header_flags = -1;
-static gint ett_do_irp_body = -1;
-static gint ett_do_irp_credential = -1;
-static gint ett_do_irp_credential_signedinfo = -1;
-static gint ett_do_irp_identifier_record = -1;
-static gint ett_do_irp_element_permission_flags = -1;
-static gint ett_do_irp_element_hsadmin_permission_flags = -1;
-static gint ett_do_irp_element_hsadmin_primary_flags = -1;
-static gint ett_do_irp_hsadmin = -1;
-static gint ett_do_irp_hssite = -1;
-static gint ett_do_irp_hssite_attribute = -1;
-static gint ett_do_irp_hssite_server = -1;
-static gint ett_do_irp_hssite_server_if = -1;
-static gint ett_do_irp_hssite_server_if_flags = -1;
-static gint ett_do_irp_pk = -1;
-static gint ett_msg_fragment = -1;
-static gint ett_msg_fragments = -1;
+static gint ett_do_irp;
+static gint ett_do_irp_string;
+static gint ett_do_irp_envelope;
+static gint ett_do_irp_envelope_flags;
+static gint ett_do_irp_header;
+static gint ett_do_irp_header_flags;
+static gint ett_do_irp_body;
+static gint ett_do_irp_credential;
+static gint ett_do_irp_credential_signedinfo;
+static gint ett_do_irp_identifier_record;
+static gint ett_do_irp_element_permission_flags;
+static gint ett_do_irp_element_hsadmin_permission_flags;
+static gint ett_do_irp_element_hsadmin_primary_flags;
+static gint ett_do_irp_hsadmin;
+static gint ett_do_irp_hssite;
+static gint ett_do_irp_hssite_attribute;
+static gint ett_do_irp_hssite_server;
+static gint ett_do_irp_hssite_server_if;
+static gint ett_do_irp_hssite_server_if_flags;
+static gint ett_do_irp_pk;
+static gint ett_msg_fragment;
+static gint ett_msg_fragments;
 
 static const fragment_items msg_frag_items = {
     &ett_msg_fragment,
diff --git a/epan/dissectors/packet-docsis-macmgmt.c b/epan/dissectors/packet-docsis-macmgmt.c
index 23864bbff6..b61320dc9c 100644
--- a/epan/dissectors/packet-docsis-macmgmt.c
+++ b/epan/dissectors/packet-docsis-macmgmt.c
@@ -621,842 +621,842 @@ void proto_reg_handoff_docsis_mgmt(void);
 #define KEY_MGMT_VERSION 0
 #define KEY_MGMT_MULTIPART 1
 
-static int proto_docsis_mgmt = -1;
-static int proto_docsis_sync = -1;
-static int proto_docsis_ucd = -1;
-static int proto_docsis_map_v1 = -1;
-static int proto_docsis_map_v5 = -1;
-static int proto_docsis_rngreq = -1;
-static int proto_docsis_rngrsp = -1;
-static int proto_docsis_regreq = -1;
-static int proto_docsis_regrsp = -1;
-static int proto_docsis_uccreq = -1;
-static int proto_docsis_uccrsp = -1;
-static int proto_docsis_bpkmreq = -1;
-static int proto_docsis_bpkmrsp = -1;
-static int proto_docsis_regack = -1;
-static int proto_docsis_dsareq = -1;
-static int proto_docsis_dsarsp = -1;
-static int proto_docsis_dsaack = -1;
-static int proto_docsis_dscreq = -1;
-static int proto_docsis_dscrsp = -1;
-static int proto_docsis_dscack = -1;
-static int proto_docsis_dsdreq = -1;
-static int proto_docsis_dsdrsp = -1;
-static int proto_docsis_dccreq = -1;
-static int proto_docsis_dccrsp = -1;
-static int proto_docsis_dccack = -1;
-static int proto_docsis_type29ucd = -1;
-static int proto_docsis_intrngreq = -1;
-static int proto_docsis_dcd = -1;
-static int proto_docsis_mdd = -1;
-static int proto_docsis_bintrngreq = -1;
-static int proto_docsis_type35ucd = -1;
-static int proto_docsis_dbcreq = -1;
-static int proto_docsis_dbcrsp = -1;
-static int proto_docsis_dbcack = -1;
-static int proto_docsis_dpvreq = -1;
-static int proto_docsis_dpvrsp = -1;
-static int proto_docsis_cmstatus = -1;
-static int proto_docsis_cmstatusack = -1;
-static int proto_docsis_cmctrlreq = -1;
-static int proto_docsis_cmctrlrsp = -1;
-static int proto_docsis_regreqmp = -1;
-static int proto_docsis_regrspmp = -1;
-static int proto_docsis_emreq = -1;
-static int proto_docsis_emrsp = -1;
-static int proto_docsis_ocd = -1;
-static int proto_docsis_dpd = -1;
-static int proto_docsis_type51ucd = -1;
-static int proto_docsis_optreq = -1;
-static int proto_docsis_optrsp = -1;
-static int proto_docsis_optack = -1;
-static int proto_docsis_rba = -1;
-static int proto_docsis_ext_rngreq = -1;
-
-static int hf_docsis_sync_cmts_timestamp = -1;
-
-static int hf_docsis_ucd_config_ch_cnt = -1;
-static int hf_docsis_ucd_mini_slot_size = -1;
-static int hf_docsis_ucd_type = -1;
-static int hf_docsis_ucd_length = -1;
-static int hf_docsis_ucd_burst_type = -1;
-static int hf_docsis_ucd_burst_length = -1;
-static int hf_docsis_ucd_symbol_rate = -1;
-static int hf_docsis_ucd_frequency = -1;
-static int hf_docsis_ucd_preamble_pat = -1;
-static int hf_docsis_ucd_ext_preamble_pat = -1;
-static int hf_docsis_ucd_scdma_mode_enabled = -1;
-static int hf_docsis_ucd_scdma_spreading_interval = -1;
-static int hf_docsis_ucd_scdma_codes_per_mini_slot = -1;
-static int hf_docsis_ucd_scdma_active_codes = -1;
-static int hf_docsis_ucd_scdma_code_hopping_seed = -1;
-static int hf_docsis_ucd_scdma_us_ratio_num = -1;
-static int hf_docsis_ucd_scdma_us_ratio_denom = -1;
-static int hf_docsis_ucd_scdma_timestamp_snapshot = -1;
-static int hf_docsis_ucd_maintain_power_spectral_density = -1;
-static int hf_docsis_ucd_ranging_required = -1;
-static int hf_docsis_ucd_max_scheduled_codes = -1;
-static int hf_docsis_ucd_rnghoff_cm = -1;
-static int hf_docsis_ucd_rnghoff_erouter = -1;
-static int hf_docsis_ucd_rnghoff_emta = -1;
-static int hf_docsis_ucd_rnghoff_estb = -1;
-static int hf_docsis_ucd_rnghoff_rsvd = -1;
-static int hf_docsis_ucd_rnghoff_id_ext = -1;
-static int hf_docsis_ucd_chan_class_id_cm = -1;
-static int hf_docsis_ucd_chan_class_id_erouter = -1;
-static int hf_docsis_ucd_chan_class_id_emta = -1;
-static int hf_docsis_ucd_chan_class_id_estb = -1;
-static int hf_docsis_ucd_chan_class_id_rsvd = -1;
-static int hf_docsis_ucd_chan_class_id_id_ext = -1;
-static int hf_docsis_ucd_scdma_scrambler_onoff = -1;
-static int hf_docsis_ucd_scdma_codes_per_subframe = -1;
-static int hf_docsis_ucd_scdma_framer_int_step_size = -1;
-static int hf_docsis_ucd_tcm_enabled = -1;
-static int hf_docsis_ucd_active_code_hopping = -1;
-static int hf_docsis_ucd_higher_ucd_for_same_ucid = -1;
-static int hf_docsis_ucd_higher_ucd_for_same_ucid_resv = -1;
-static int hf_docsis_ucd_scdma_selection_active_codes = -1;
-static int hf_docsis_ucd_iuc = -1;
-static int hf_docsis_ucd_change_ind_bitmask_subc_excl_band = -1;
-static int hf_docsis_ucd_change_ind_bitmask_unused_subc = -1;
-static int hf_docsis_ucd_change_ind_bitmask_other_subc = -1;
-static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc5 = -1;
-static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc6 = -1;
-static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc9 = -1;
-static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc10 = -1;
-static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc11 = -1;
-static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc12 = -1;
-static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc13 = -1;
-static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc3_or_4 = -1;
-static int hf_docsis_ucd_change_ind_bitmask_reserved = -1;
-static int hf_docsis_ucd_ofdma_timestamp_snapshot = -1;
-static int hf_docsis_ucd_ofdma_timestamp_snapshot_reserved = -1;
-static int hf_docsis_ucd_ofdma_timestamp_snapshot_d30timestamp = -1;
-static int hf_docsis_ucd_ofdma_timestamp_snapshot_4msbits_of_div20 = -1;
-static int hf_docsis_ucd_ofdma_timestamp_snapshot_minislot_count = -1;
-static int hf_docsis_ucd_ofdma_cyclic_prefix_size = -1;
-static int hf_docsis_ucd_ofdma_rolloff_period_size = -1;
-static int hf_docsis_ucd_subc_spacing = -1;
-static int hf_docsis_ucd_cent_freq_subc0 = -1;
-static int hf_docsis_ucd_subcarrier_range = -1;
-static int hf_docsis_ucd_symb_ofdma_frame = -1;
-static int hf_docsis_ucd_rand_seed = -1;
-static int hf_docsis_ucd_extended_us_channel = -1;
-
-static int hf_docsis_burst_mod_type = -1;
-static int hf_docsis_burst_diff_encoding = -1;
-static int hf_docsis_burst_preamble_len = -1;
-static int hf_docsis_burst_preamble_val_off = -1;
-static int hf_docsis_burst_fec = -1;
-static int hf_docsis_burst_fec_codeword = -1;
-static int hf_docsis_burst_scrambler_seed = -1;
-static int hf_docsis_burst_max_burst = -1;
-static int hf_docsis_burst_guard_time = -1;
-static int hf_docsis_burst_last_cw_len = -1;
-static int hf_docsis_burst_scrambler_onoff = -1;
-static int hf_docsis_rs_int_depth = -1;
-static int hf_docsis_rs_int_block = -1;
-static int hf_docsis_preamble_type = -1;
-static int hf_docsis_subc_init_rang = -1;
-static int hf_docsis_subc_fine_rang = -1;
-static int hf_docsis_ofdma_prof_mod_order = -1;
-static int hf_docsis_ofdma_prof_pilot_pattern = -1;
-static int hf_docsis_ofdma_prof_num_add_minislots = -1;
-static int hf_docsis_ofdma_ir_pow_ctrl_start_pow = -1;
-static int hf_docsis_ofdma_ir_pow_ctrl_step_size = -1;
-
-static int hf_docsis_map_ucd_count = -1;
-static int hf_docsis_map_numie = -1;
-static int hf_docsis_map_numie_v5 = -1;
-static int hf_docsis_map_alloc_start = -1;
-static int hf_docsis_map_ack_time = -1;
-static int hf_docsis_map_rng_start = -1;
-static int hf_docsis_map_rng_end = -1;
-static int hf_docsis_map_data_start = -1;
-static int hf_docsis_map_data_end = -1;
-static int hf_docsis_map_ie = -1;
-static int hf_docsis_map_probe_ie = -1;
-
-static int hf_docsis_map_rsvd = -1;
-static int hf_docsis_map_rsvd_v5 = -1;
-static int hf_docsis_map_cat = -1;
-
-static int hf_docsis_map_sid = -1;
-static int hf_docsis_map_iuc = -1;
-static int hf_docsis_map_offset = -1;
-static int hf_docsis_map_mer = -1;
-static int hf_docsis_map_pw = -1;
-static int hf_docsis_map_eq = -1;
-static int hf_docsis_map_st = -1;
-static int hf_docsis_map_probe_frame = -1;
-static int hf_docsis_map_symbol_in_frame = -1;
-static int hf_docsis_map_start_subc = -1;
-static int hf_docsis_map_subc_skip = -1;
-
-
-static int hf_docsis_rngreq_sid_field_bit15 = -1;
-static int hf_docsis_rngreq_sid_field_bit14 = -1;
-static int hf_docsis_rngreq_sid_field_bit15_14 = -1;
-static int hf_docsis_rngreq_sid = -1;
-static int hf_docsis_rngreq_pend_compl = -1;
-
-static int hf_docsis_rngrsp_type = -1;
-static int hf_docsis_rngrsp_length = -1;
-static int hf_docsis_rngrsp_sid = -1;
-static int hf_docsis_rngrsp_timing_adj = -1;
-static int hf_docsis_rngrsp_power_adj = -1;
-static int hf_docsis_rngrsp_freq_adj = -1;
-static int hf_docsis_rngrsp_xmit_eq_adj = -1;
-static int hf_docsis_rngrsp_ranging_status = -1;
-static int hf_docsis_rngrsp_down_freq_over = -1;
-static int hf_docsis_rngrsp_upstream_ch_over = -1;
-static int hf_docsis_rngrsp_xmit_eq_set = -1;
-static int hf_docsis_rngrsp_rngrsp_t4_timeout_multiplier = -1;
-static int hf_docsis_rngrsp_dynamic_range_window_upper_edge = -1;
-static int hf_docsis_rngrsp_tlv_unknown = -1;
-static int hf_docsis_rngrsp_trans_eq_data = -1;
-static int hf_docsis_rngrsp_trans_eq_enc_scdma_tdma_main_tap_location = -1;
-static int hf_docsis_rngrsp_trans_eq_enc_scdma_tdma_number_of_forward_taps_per_symbol = -1;
-static int hf_docsis_rngrsp_trans_eq_enc_scdma_tdma_number_of_forward_taps_n = -1;
-static int hf_docsis_rngrsp_trans_eq_enc_scdma_tdma_reserved = -1;
-static int hf_docsis_rngrsp_trans_eq_enc_lowest_subc = -1;
-static int hf_docsis_rngrsp_trans_eq_enc_highest_subc = -1;
-static int hf_docsis_rngrsp_trans_eq_enc_coef_real = -1;
-static int hf_docsis_rngrsp_trans_eq_enc_coef_imag = -1;
-static int hf_docsis_rngrsp_commanded_power_data = -1;
-static int hf_docsis_rngrsp_commanded_power_dynamic_range_window = -1;
-static int hf_docsis_rngrsp_commanded_power_ucid = -1;
-static int hf_docsis_rngrsp_commanded_power_trans_pow_lvl = -1;
-
-
-static int hf_docsis_regreq_sid = -1;
-static int hf_docsis_regrsp_sid = -1;
-static int hf_docsis_regrsp_response = -1;
-
-static int hf_docsis_bpkm_code = -1;
-static int hf_docsis_bpkm_length = -1;
-static int hf_docsis_bpkm_ident = -1;
-static int hf_docsis_bpkmattr = -1;
-static int hf_docsis_bpkmattr_serial_num = -1;
-static int hf_docsis_bpkmattr_manf_id = -1;
-static int hf_docsis_bpkmattr_mac_addr = -1;
-static int hf_docsis_bpkmattr_rsa_pub_key = -1;
-static int hf_docsis_bpkmattr_cm_id = -1;
-static int hf_docsis_bpkmattr_display_str = -1;
-static int hf_docsis_bpkmattr_auth_key = -1;
-static int hf_docsis_bpkmattr_tek = -1;
-static int hf_docsis_bpkmattr_key_life = -1;
-static int hf_docsis_bpkmattr_key_seq = -1;
-static int hf_docsis_bpkmattr_hmac_digest = -1;
-static int hf_docsis_bpkmattr_said = -1;
-static int hf_docsis_bpkmattr_tek_params = -1;
-static int hf_docsis_bpkmattr_cbc_iv = -1;
-static int hf_docsis_bpkmattr_error_code = -1;
-static int hf_docsis_bpkmattr_vendor_def = -1;
-static int hf_docsis_bpkmattr_ca_cert = -1;
-static int hf_docsis_bpkmattr_cm_cert = -1;
-static int hf_docsis_bpkmattr_security_cap = -1;
-static int hf_docsis_bpkmattr_crypto_suite = -1;
-static int hf_docsis_bpkmattr_crypto_suite_list = -1;
-static int hf_docsis_bpkmattr_bpi_version = -1;
-static int hf_docsis_bpkmattr_sa_descr = -1;
-static int hf_docsis_bpkmattr_sa_type = -1;
-static int hf_docsis_bpkmattr_sa_query = -1;
-static int hf_docsis_bpkmattr_sa_query_type = -1;
-static int hf_docsis_bpkmattr_ip_address = -1;
-static int hf_docsis_bpkmattr_download_param = -1;
-static int hf_docsis_bpkmattr_type = -1;
-static int hf_docsis_bpkmattr_length = -1;
-
-static int hf_docsis_regack_sid = -1;
-static int hf_docsis_regack_response = -1;
-
-static int hf_docsis_dsarsp_response = -1;
-static int hf_docsis_dsaack_response = -1;
-
-static int hf_docsis_dscrsp_response = -1;
-static int hf_docsis_dscack_response = -1;
-
-static int hf_docsis_dsdreq_rsvd = -1;
-static int hf_docsis_dsdreq_sfid = -1;
-
-static int hf_docsis_dsdrsp_confcode = -1;
-static int hf_docsis_dsdrsp_rsvd = -1;
-
-static int hf_docsis_dccreq_type = -1;
-static int hf_docsis_dccreq_length = -1;
-static int hf_docsis_dccreq_tran_id = -1;
-static int hf_docsis_dccreq_up_chan_id = -1;
-static int hf_docsis_dcc_ds_params_subtype = -1;
-static int hf_docsis_dcc_ds_params_length = -1;
-static int hf_docsis_dccreq_ds_freq = -1;
-static int hf_docsis_dccreq_ds_mod_type = -1;
-static int hf_docsis_dccreq_ds_sym_rate = -1;
-static int hf_docsis_dccreq_ds_intlv_depth_i = -1;
-static int hf_docsis_dccreq_ds_intlv_depth_j = -1;
-static int hf_docsis_dccreq_ds_chan_id = -1;
-static int hf_docsis_dccreq_ds_sync_sub = -1;
-static int hf_docsis_dccreq_ds_ofdm_block_freq = -1;
-static int hf_docsis_dccreq_init_tech = -1;
-static int hf_docsis_dccreq_ucd_sub = -1;
-static int hf_docsis_dccreq_said_sub_cur = -1;
-static int hf_docsis_dccreq_said_sub_new = -1;
-static int hf_docsis_dcc_sf_sub_subtype = -1;
-static int hf_docsis_dcc_sf_sub_length = -1;
-static int hf_docsis_dccreq_sf_sfid_cur = -1;
-static int hf_docsis_dccreq_sf_sfid_new = -1;
-static int hf_docsis_dccreq_sf_sid_cur = -1;
-static int hf_docsis_dccreq_sf_sid_new = -1;
-static int hf_docsis_dccreq_sf_unsol_grant_tref = -1;
-static int hf_docsis_dccreq_cmts_mac_addr = -1;
-static int hf_docsis_dccreq_key_seq_num = -1;
-static int hf_docsis_dccreq_hmac_digest = -1;
-static int hf_docsis_dccrsp_conf_code = -1;
-static int hf_docsis_dccrsp_type = -1;
-static int hf_docsis_dccrsp_length = -1;
-static int hf_docsis_dcc_cm_jump_subtype = -1;
-static int hf_docsis_dcc_cm_jump_length = -1;
-static int hf_docsis_dccrsp_cm_jump_time_length = -1;
-static int hf_docsis_dccrsp_cm_jump_time_start = -1;
-static int hf_docsis_dccrsp_key_seq_num = -1;
-static int hf_docsis_dccrsp_hmac_digest = -1;
-static int hf_docsis_dccack_type = -1;
-static int hf_docsis_dccack_length = -1;
-static int hf_docsis_dccack_key_seq_num = -1;
-static int hf_docsis_dccack_hmac_digest = -1;
-
-static int hf_docsis_intrngreq_sid = -1;
-
-static int hf_docsis_dcd_config_ch_cnt = -1;
-static int hf_docsis_dcd_num_of_frag = -1;
-static int hf_docsis_dcd_frag_sequence_num = -1;
-static int hf_docsis_dcd_type = -1;
-static int hf_docsis_dcd_length = -1;
-static int hf_docsis_dcd_down_classifier_subtype = -1;
-static int hf_docsis_dcd_down_classifier_length = -1;
-static int hf_docsis_dcd_cfr_id = -1;
-static int hf_docsis_dcd_cfr_rule_pri = -1;
-static int hf_docsis_dcd_cfr_ip_subtype = -1;
-static int hf_docsis_dcd_cfr_ip_length = -1;
-static int hf_docsis_dcd_cfr_ip_source_addr = -1;
-static int hf_docsis_dcd_cfr_ip_source_mask = -1;
-static int hf_docsis_dcd_cfr_ip_dest_addr = -1;
-static int hf_docsis_dcd_cfr_ip_dest_mask = -1;
-static int hf_docsis_dcd_cfr_tcpudp_srcport_start = -1;
-static int hf_docsis_dcd_cfr_tcpudp_srcport_end = -1;
-static int hf_docsis_dcd_cfr_tcpudp_dstport_start = -1;
-static int hf_docsis_dcd_cfr_tcpudp_dstport_end = -1;
-static int hf_docsis_dcd_rule_id = -1;
-static int hf_docsis_dcd_rule_pri = -1;
-static int hf_docsis_dcd_rule_ucid_list = -1;
-static int hf_docsis_dcd_clid_subtype = -1;
-static int hf_docsis_dcd_clid_length = -1;
-static int hf_docsis_dcd_clid_bcast_id = -1;
-static int hf_docsis_dcd_clid_known_mac_addr = -1;
-static int hf_docsis_dcd_clid_ca_sys_id = -1;
-static int hf_docsis_dcd_clid_app_id = -1;
-static int hf_docsis_dcd_dsg_rule_subtype = -1;
-static int hf_docsis_dcd_dsg_rule_length = -1;
-static int hf_docsis_dcd_rule_tunl_addr = -1;
-static int hf_docsis_dcd_rule_cfr_id = -1;
-static int hf_docsis_dcd_rule_vendor_spec = -1;
-static int hf_docsis_dcd_cfg_subtype = -1;
-static int hf_docsis_dcd_cfg_length = -1;
-static int hf_docsis_dcd_cfg_chan = -1;
-static int hf_docsis_dcd_cfg_tdsg1 = -1;
-static int hf_docsis_dcd_cfg_tdsg2 = -1;
-static int hf_docsis_dcd_cfg_tdsg3 = -1;
-static int hf_docsis_dcd_cfg_tdsg4 = -1;
-static int hf_docsis_dcd_cfg_vendor_spec = -1;
-
-static int hf_docsis_mdd_ccc = -1;
-static int hf_docsis_mdd_number_of_fragments = -1;
-static int hf_docsis_mdd_fragment_sequence_number = -1;
-static int hf_docsis_mdd_current_channel_dcid = -1;
-static int hf_docsis_mdd_ds_active_channel_list_subtype = -1;
-static int hf_docsis_mdd_ds_active_channel_list_length = -1;
-static int hf_docsis_mdd_downstream_active_channel_list_channel_id = -1;
-static int hf_docsis_mdd_downstream_active_channel_list_frequency = -1;
-static int hf_docsis_mdd_downstream_active_channel_list_annex = -1;
-static int hf_docsis_mdd_downstream_active_channel_list_modulation_order = -1;
-static int hf_docsis_mdd_downstream_active_channel_list_primary_capable = -1;
-static int hf_docsis_mdd_downstream_active_channel_list_map_ucd_transport_indicator = -1;
-static int hf_docsis_mdd_cm_status_event_enable_bitmask = -1;
-static int hf_docsis_mdd_cm_status_event_enable_bitmask_mdd_timeout = -1;
-static int hf_docsis_mdd_cm_status_event_enable_bitmask_qam_fec_lock_failure = -1;
-static int hf_docsis_mdd_cm_status_event_enable_bitmask_mdd_recovery = -1;
-static int hf_docsis_mdd_cm_status_event_enable_bitmask_qam_fec_lock_recovery = -1;
-static int hf_docsis_mdd_ofdm_plc_parameters = -1;
-static int hf_docsis_mdd_ofdm_plc_parameters_tukey_raised_cosine_window = -1;
-static int hf_docsis_mdd_ofdm_plc_parameters_cyclic_prefix = -1;
-static int hf_docsis_mdd_ofdm_plc_parameters_sub_carrier_spacing = -1;
-static int hf_docsis_mdd_up_active_channel_list_subtype = -1;
-static int hf_docsis_mdd_up_active_channel_list_length = -1;
-static int hf_docsis_mdd_cm_status_event_enable_bitmask_t4_timeout = -1;
-static int hf_docsis_mdd_cm_status_event_enable_bitmask_t3_retries_exceeded = -1;
-static int hf_docsis_mdd_cm_status_event_enable_bitmask_successful_ranging_after_t3_retries_exceeded = -1;
-static int hf_docsis_mdd_ds_service_group_subtype = -1;
-static int hf_docsis_mdd_ds_service_group_length = -1;
-static int hf_docsis_mdd_mac_domain_downstream_service_group_md_ds_sg_identifier = -1;
-static int hf_docsis_mdd_mac_domain_downstream_service_group_channel_id = -1;
-static int hf_docsis_mdd_type = -1;
-static int hf_docsis_mdd_length = -1;
-static int hf_docsis_mdd_downstream_ambiguity_resolution_frequency = -1;
-static int hf_docsis_mdd_channel_profile_reporting_control_subtype = -1;
-static int hf_docsis_mdd_channel_profile_reporting_control_length = -1;
-static int hf_docsis_mdd_rcp_center_frequency_spacing = -1;
-static int hf_docsis_mdd_verbose_rcp_reporting = -1;
-static int hf_docsis_mdd_fragmented_rcp_transmission = -1;
-static int hf_docsis_mdd_ip_init_param_subtype = -1;
-static int hf_docsis_mdd_ip_init_param_length = -1;
-static int hf_docsis_mdd_ip_provisioning_mode = -1;
-static int hf_docsis_mdd_pre_registration_dsid = -1;
-static int hf_docsis_mdd_early_authentication_and_encryption = -1;
-static int hf_docsis_mdd_upstream_active_channel_list_upstream_channel_id = -1;
-static int hf_docsis_mdd_upstream_active_channel_list_upstream_channel_priority = -1;
-static int hf_docsis_mdd_upstream_active_channel_list_dschids_maps_ucds = -1;
-static int hf_docsis_mdd_upstream_active_channel_list_dschids_maps_ucds_dschid = -1;
-static int hf_docsis_mdd_upstream_active_channel_list_fdx_upstream_channel = -1;
-static int hf_docsis_mdd_upstream_active_channel_list_fdx_subband_id = -1;
-static int hf_docsis_mdd_upstream_ambiguity_resolution_channel_list_channel_id = -1;
-static int hf_docsis_mdd_upstream_frequency_range = -1;
-static int hf_docsis_mdd_symbol_clock_locking_indicator = -1;
-static int hf_docsis_mdd_cm_status_event_control_subtype = -1;
-static int hf_docsis_mdd_cm_status_event_control_length = -1;
-static int hf_docsis_mdd_event_type = -1;
-static int hf_docsis_mdd_maximum_event_holdoff_timer = -1;
-static int hf_docsis_mdd_maximum_number_of_reports_per_event = -1;
-static int hf_docsis_mdd_upstream_transmit_power_reporting = -1;
-static int hf_docsis_mdd_dsg_da_to_dsid_subtype = -1;
-static int hf_docsis_mdd_dsg_da_to_dsid_length = -1;
-static int hf_docsis_mdd_dsg_da_to_dsid_association_da = -1;
-static int hf_docsis_mdd_dsg_da_to_dsid_association_dsid = -1;
-static int hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events = -1;
-static int hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events_sequence_out_of_range = -1;
-static int hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events_cm_operating_on_battery_backup = -1;
-static int hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events_cm_returned_to_ac_power = -1;
-static int hf_docsis_mdd_extended_upstream_transmit_power_support = -1;
-static int hf_docsis_mdd_unknown = -1;
-
-static int hf_docsis_mdd_cmts_major_docsis_version = -1;
-static int hf_docsis_mdd_cmts_minor_docsis_version = -1;
-static int hf_docsis_mdd_cmts_docsis_version_unknown = -1;
-
-static int hf_docsis_mdd_cm_periodic_maintenance_timeout_indicator = -1;
-static int hf_docsis_mdd_dls_broadcast_and_multicast_delivery_method = -1;
-static int hf_docsis_mdd_cm_status_event_d31_ofdm_prof_fail = -1;
-static int hf_docsis_mdd_cm_status_event_d31_prim_down_chan_change = -1;
-static int hf_docsis_mdd_cm_status_event_d31_dpd_mismatch = -1;
-static int hf_docsis_mdd_cm_status_event_d31_deprecated = -1;
-static int hf_docsis_mdd_cm_status_event_d31_ncp_prof_fail = -1;
-static int hf_docsis_mdd_cm_status_event_d31_loss_fec_plc = -1;
-static int hf_docsis_mdd_cm_status_event_d31_ncp_prof_recover = -1;
-static int hf_docsis_mdd_cm_status_event_d31_fec_recover_on_plc = -1;
-static int hf_docsis_mdd_cm_status_event_d31_fec_recover_on_ofdm_prof = -1;
-static int hf_docsis_mdd_cm_status_event_d31_ofdma_prof_fail = -1;
-static int hf_docsis_mdd_cm_status_event_d31_map_stor_overflow_ind = -1;
-static int hf_docsis_mdd_cm_status_event_d31_ofdm_map_stor_almost_full_ind = -1;
-static int hf_docsis_mdd_cm_status_event_d31_reserved = -1;
-
-static int hf_docsis_mdd_diplexer_band_edge = -1;
-static int hf_docsis_mdd_diplexer_band_edge_length = -1;
-static int hf_docsis_mdd_diplexer_us_upper_band_edge = -1;
-static int hf_docsis_mdd_diplexer_ds_lower_band_edge = -1;
-static int hf_docsis_mdd_diplexer_ds_upper_band_edge = -1;
-static int hf_docsis_mdd_diplexer_us_upper_band_edge_override = -1;
-static int hf_docsis_mdd_diplexer_ds_lower_band_edge_override = -1;
-static int hf_docsis_mdd_diplexer_ds_upper_band_edge_override = -1;
-
-static int hf_docsis_mdd_full_duplex_descriptor = -1;
-static int hf_docsis_mdd_full_duplex_descriptor_length = -1;
-static int hf_docsis_mdd_full_duplex_allocated_spectrum = -1;
-static int hf_docsis_mdd_full_duplex_total_number_of_sub_bands = -1;
-static int hf_docsis_mdd_full_duplex_sub_band_width = -1;
-static int hf_docsis_mdd_full_duplex_sub_band_descriptor = -1;
-static int hf_docsis_mdd_full_duplex_sub_band_descriptor_length = -1;
-static int hf_docsis_mdd_full_duplex_sub_band_id = -1;
-static int hf_docsis_mdd_full_duplex_sub_band_offset = -1;
-
-static int hf_docsis_bintrngreq_mddsgid = -1;
-static int hf_docsis_bintrngreq_capflags = -1;
-static int hf_docsis_bintrngreq_capflags_frag = -1;
-static int hf_docsis_bintrngreq_capflags_encrypt = -1;
-
-static int hf_docsis_dbcreq_number_of_fragments = -1;
-static int hf_docsis_dbcreq_fragment_sequence_number = -1;
-
-static int hf_docsis_dbcrsp_conf_code = -1;
-
-static int hf_docsis_dpv_flags = -1;
-static int hf_docsis_dpv_us_sf = -1;
-static int hf_docsis_dpv_n = -1;
-static int hf_docsis_dpv_start = -1;
-static int hf_docsis_dpv_end = -1;
-static int hf_docsis_dpv_ts_start = -1;
-static int hf_docsis_dpv_ts_end = -1;
-
-static int hf_docsis_cmstatus_e_t_mdd_t = -1;
-static int hf_docsis_cmstatus_e_t_qfl_f = -1;
-static int hf_docsis_cmstatus_e_t_s_o = -1;
-static int hf_docsis_cmstatus_e_t_mdd_r = -1;
-static int hf_docsis_cmstatus_e_t_qfl_r = -1;
-static int hf_docsis_cmstatus_e_t_t4_t = -1;
-static int hf_docsis_cmstatus_e_t_t3_e = -1;
-static int hf_docsis_cmstatus_e_t_rng_s = -1;
-static int hf_docsis_cmstatus_e_t_cm_b = -1;
-static int hf_docsis_cmstatus_e_t_cm_a = -1;
-static int hf_docsis_cmstatus_e_t_mac_removal = -1;
-static int hf_docsis_cmstatus_e_t_ds_ofdm_profile_failure = -1;
-static int hf_docsis_cmstatus_e_t_prim_ds_change = -1;
-static int hf_docsis_cmstatus_e_t_dpd_mismatch = -1;
-static int hf_docsis_cmstatus_e_t_ncp_profile_failure = -1;
-static int hf_docsis_cmstatus_e_t_plc_failure = -1;
-static int hf_docsis_cmstatus_e_t_ncp_profile_recovery =-1;
-static int hf_docsis_cmstatus_e_t_plc_recovery = -1;
-static int hf_docsis_cmstatus_e_t_ofdm_profile_recovery = -1;
-static int hf_docsis_cmstatus_e_t_ofdma_profile_failure = -1;
-static int hf_docsis_cmstatus_e_t_map_storage_overflow_indicator = -1;
-static int hf_docsis_cmstatus_e_t_map_storage_almost_full_indicator = -1;
-static int hf_docsis_cmstatus_e_t_unknown = -1;
-static int hf_docsis_cmstatus_status_event_ds_ch_id = -1;
-static int hf_docsis_cmstatus_status_event_us_ch_id = -1;
-static int hf_docsis_cmstatus_status_event_dsid = -1;
-static int hf_docsis_cmstatus_status_event_mac_address = -1;
-static int hf_docsis_cmstatus_status_event_ds_ofdm_profile_id = -1;
-static int hf_docsis_cmstatus_status_event_us_ofdma_profile_id = -1;
-static int hf_docsis_cmstatus_status_event_descr = -1;
-static int hf_docsis_cmstatus_tlv_data = -1;
-static int hf_docsis_cmstatus_type = -1;
-static int hf_docsis_cmstatus_length = -1;
-static int hf_docsis_cmstatus_status_event_tlv_data = -1;
-static int hf_docsis_cmstatus_status_event_type = -1;
-static int hf_docsis_cmstatus_status_event_length = -1;
-
-static int hf_docsis_cmctrl_tlv_mute = -1;
-static int hf_docsis_cmctrl_tlv_mute_timeout = -1;
-static int hf_docsis_cmctrl_tlv_reinit = -1;
-static int hf_docsis_cmctrl_tlv_disable_fwd = -1;
-static int hf_docsis_cmctrl_tlv_ds_event = -1;
-static int hf_docsis_cmctrl_tlv_us_event = -1;
-static int hf_docsis_cmctrl_tlv_event = -1;
-static int hf_docsis_cmctrlreq_tlv_data = -1;
-static int hf_docsis_cmctrlreq_type = -1;
-static int hf_docsis_cmctrlreq_length = -1;
-static int hf_docsis_cmctrlreq_us_type = -1;
-static int hf_docsis_cmctrlreq_us_length = -1;
-static int hf_docsis_cmctrl_us_event_ch_id = -1;
-static int hf_docsis_cmctrl_us_event_mask = -1;
-static int hf_docsis_cmctrl_ds_type = -1;
-static int hf_docsis_cmctrl_ds_length = -1;
-static int hf_docsis_cmctrl_ds_event_ch_id = -1;
-static int hf_docsis_cmctrl_ds_event_mask = -1;
-
-static int hf_docsis_regreqmp_sid = -1;
-static int hf_docsis_regreqmp_number_of_fragments = -1;
-static int hf_docsis_regreqmp_fragment_sequence_number = -1;
-static int hf_docsis_regrspmp_sid = -1;
-static int hf_docsis_regrspmp_response = -1;
-static int hf_docsis_regrspmp_number_of_fragments = -1;
-static int hf_docsis_regrspmp_fragment_sequence_number = -1;
-
-static int hf_docsis_emrsp_tlv_data = -1;
-static int hf_docsis_emrsp_tlv_type = -1;
-static int hf_docsis_emrsp_tlv_length = -1;
-static int hf_docsis_emrsp_tlv_holdoff_timer = -1;
-static int hf_docsis_emreq_req_power_mode = -1;
-static int hf_docsis_emreq_reserved = -1;
-static int hf_docsis_emrsp_rsp_code = -1;
-static int hf_docsis_emrsp_reserved = -1;
-static int hf_docsis_emrsp_tlv_unknown = -1;
-
-static int hf_docsis_ocd_tlv_unknown = -1;
-static int hf_docsis_ocd_ccc = -1;
-static int hf_docsis_ocd_tlv_four_trans_size = -1;
-static int hf_docsis_ocd_tlv_cycl_pref = -1;
-static int hf_docsis_ocd_tlv_roll_off = -1;
-static int hf_docsis_ocd_tlv_ofdm_spec_loc = -1;
-static int hf_docsis_ocd_tlv_time_int_depth = -1;
-static int hf_docsis_ocd_tlv_prim_cap_ind = -1;
-static int hf_docsis_ocd_tlv_subc_assign_type = -1;
-static int hf_docsis_ocd_tlv_subc_assign_value = -1;
-static int hf_docsis_ocd_subc_assign_subc_type = -1;
-static int hf_docsis_ocd_subc_assign_range = -1;
-static int hf_docsis_ocd_subc_assign_index = -1;
-static int hf_docsis_ocd_tlv_data = -1;
-static int hf_docsis_ocd_type = -1;
-static int hf_docsis_ocd_length = -1;
-
-static int hf_docsis_dpd_tlv_unknown = -1;
-static int hf_docsis_dpd_prof_id = -1;
-static int hf_docsis_dpd_ccc = -1;
-static int hf_docsis_dpd_tlv_subc_assign_type = -1;
-static int hf_docsis_dpd_tlv_subc_assign_value = -1;
-static int hf_docsis_dpd_subc_assign_range = -1;
-static int hf_docsis_dpd_tlv_subc_assign_reserved = -1;
-static int hf_docsis_dpd_tlv_subc_assign_modulation = -1;
-static int hf_docsis_dpd_subc_assign_index = -1;
-static int hf_docsis_dpd_tlv_subc_assign_vector_oddness = -1;
-static int hf_docsis_dpd_tlv_subc_assign_vector_reserved = -1;
-static int hf_docsis_dpd_tlv_subc_assign_vector_subc_start = -1;
-static int hf_docsis_dpd_tlv_subc_assign_vector_modulation_odd = -1;
-static int hf_docsis_dpd_tlv_subc_assign_vector_modulation_even = -1;
-static int hf_docsis_dpd_tlv_data = -1;
-static int hf_docsis_dpd_type = -1;
-static int hf_docsis_dpd_length = -1;
-
-static int hf_docsis_optreq_tlv_unknown = -1;
-static int hf_docsis_optreq_prof_id = -1;
-static int hf_docsis_optreq_opcode = -1;
-static int hf_docsis_optreq_reserved = -1;
-static int hf_docsis_optreq_tlv_data = -1;
-static int hf_docsis_optreq_type = -1;
-static int hf_docsis_optreq_length = -1;
-static int hf_docsis_optreq_reqstat_rxmer_stat_subc = -1;
-static int hf_docsis_optreq_reqstat_rxmer_subc_threshold_comp = -1;
-static int hf_docsis_optreq_reqstat_snr_marg_cand_prof = -1;
-static int hf_docsis_optreq_reqstat_codew_stat_cand_prof = -1;
-static int hf_docsis_optreq_reqstat_codew_thresh_comp_cand_prof = -1;
-static int hf_docsis_optreq_reqstat_ncp_field_stat = -1;
-static int hf_docsis_optreq_reqstat_ncp_crc_thresh_comp = -1;
-static int hf_docsis_optreq_reqstat_reserved = -1;
-static int hf_docsis_optreq_tlv_rxmer_thresh_data = -1;
-static int hf_docsis_optreq_xmer_thresh_params_type = -1;
-static int hf_docsis_optreq_xmer_thresh_params_length = -1;
-static int hf_docsis_optreq_tlv_rxmer_thresh_data_mod_order = -1;
-static int hf_docsis_optreq_tlv_trigger_definition_data = -1;
-static int hf_docsis_optreq_tlv_trigger_definition_data_type = -1;
-static int hf_docsis_optreq_tlv_trigger_definition_data_length = -1;
-static int hf_docsis_optreq_tlv_trigger_definition_trigger_type = -1;
-static int hf_docsis_optreq_tlv_trigger_definition_measure_duration = -1;
-static int hf_docsis_optreq_tlv_trigger_definition_triggering_sid = -1;
-static int hf_docsis_optreq_tlv_trigger_definition_us_chan_id = -1;
-static int hf_docsis_optreq_tlv_trigger_definition_sound_ambig_offset = -1;
-static int hf_docsis_optreq_tlv_trigger_definition_rx_mer_to_report = -1;
-static int hf_docsis_optreq_tlv_trigger_definition_start_time = -1;
-
-static int hf_docsis_optrsp_tlv_unknown = -1;
-static int hf_docsis_optrsp_prof_id = -1;
-static int hf_docsis_optrsp_reserved = -1;
-static int hf_docsis_optrsp_status = -1;
-static int hf_docsis_optrsp_tlv_data = -1;
-static int hf_docsis_optrsp_type = -1;
-static int hf_docsis_optrsp_length = -1;
-static int hf_docsis_optrsp_tlv_rxmer_snr_margin_data = -1;
-static int hf_docsis_optrsp_xmer_snr_margin_type = -1;
-static int hf_docsis_optrsp_xmer_snr_margin_length = -1;
-static int hf_docsis_optrsp_tlv_rxmer_snr_margin_data_rxmer_subc = -1;
-static int hf_docsis_optrsp_tlv_rxmer_snr_margin_data_snr_margin = -1;
-
-static int hf_docsis_optack_prof_id = -1;
-static int hf_docsis_optack_reserved = -1;
-
-static int hf_docsis_rba_tg_id = -1;
-static int hf_docsis_rba_ccc = -1;
-static int hf_docsis_rba_dcid = -1;
-static int hf_docsis_rba_control_byte_bitmask = -1;
-static int hf_docsis_rba_resource_block_change_bit = -1;
-static int hf_docsis_rba_expiration_time_valid_bit = -1;
-static int hf_docsis_rba_control_byte_bitmask_rsvd = -1;
-static int hf_docsis_rba_rba_time = -1;
-static int hf_docsis_rba_rba_expiration_time = -1;
-static int hf_docsis_rba_number_of_subbands = -1;
-static int hf_docsis_rba_subband_direction = -1;
-
-static int hf_docsis_mgt_upstream_chid = -1;
-static int hf_docsis_mgt_down_chid = -1;
-static int hf_docsis_mgt_tranid = -1;
-static int hf_docsis_mgt_dst_addr = -1;
-static int hf_docsis_mgt_src_addr = -1;
-static int hf_docsis_mgt_msg_len = -1;
-static int hf_docsis_mgt_dsap = -1;
-static int hf_docsis_mgt_ssap = -1;
-static int hf_docsis_mgt_30_transmit_power = -1;
-static int hf_docsis_mgt_31_transmit_power = -1;
-static int hf_docsis_mgt_40_transmit_power = -1;
-static int hf_docsis_mgt_control = -1;
-static int hf_docsis_mgt_version = -1;
-static int hf_docsis_mgt_type = -1;
-static int hf_docsis_mgt_rsvd = -1;
-static int hf_docsis_mgt_multipart = -1;
-static int hf_docsis_mgt_multipart_number_of_fragments = -1;
-static int hf_docsis_mgt_multipart_fragment_sequence_number = -1;
-
-static int hf_docsis_tlv_fragments = -1;
-static int hf_docsis_tlv_fragment = -1;
-static int hf_docsis_tlv_fragment_overlap = -1;
-static int hf_docsis_tlv_fragment_overlap_conflict = -1;
-static int hf_docsis_tlv_fragment_multiple_tails = -1;
-static int hf_docsis_tlv_fragment_too_long_fragment = -1;
-static int hf_docsis_tlv_fragment_error = -1;
-static int hf_docsis_tlv_fragment_count = -1;
-static int hf_docsis_tlv_reassembled_in = -1;
-static int hf_docsis_tlv_reassembled_length = -1;
-static int hf_docsis_tlv_reassembled_data = -1;
-
-static int hf_docsis_tlv_reassembled = -1;
-
-static gint ett_docsis_sync = -1;
-
-static gint ett_docsis_ucd = -1;
-static gint ett_docsis_tlv = -1;
-static gint ett_docsis_burst_tlv = -1;
-
-static gint ett_docsis_map = -1;
-static gint ett_docsis_map_ie = -1;
-static gint ett_docsis_map_probe_ie = -1;
-
-
-static gint ett_docsis_rngreq = -1;
-
-static gint ett_docsis_rngrsp = -1;
-static gint ett_docsis_rngrsptlv = -1;
-static gint ett_docsis_rngrsp_tlv_transmit_equalization_encodings = -1;
-static gint ett_docsis_rngrsp_tlv_transmit_equalization_encodings_coef = -1;
-static gint ett_docsis_rngrsp_tlv_commanded_power_subtlv = -1;
-static gint ett_docsis_rngrsp_tlv_commanded_power = -1;
-
-
-static gint ett_docsis_regreq = -1;
-static gint ett_docsis_regrsp = -1;
-
-static gint ett_docsis_emreq = -1;
-static gint ett_docsis_emrsp = -1;
-static gint ett_docsis_emrsp_tlv = -1;
-static gint ett_docsis_emrsp_tlvtlv = -1;
-
-static gint ett_docsis_uccreq = -1;
-static gint ett_docsis_uccrsp = -1;
-
-static gint ett_docsis_bpkmreq = -1;
-static gint ett_docsis_bpkmrsp = -1;
-static gint ett_docsis_bpkmattr = -1;
-static gint ett_docsis_bpkmattr_cmid = -1;
-static gint ett_docsis_bpkmattr_scap = -1;
-static gint ett_docsis_bpkmattr_tekp = -1;
-static gint ett_docsis_bpkmattr_sadsc = -1;
-static gint ett_docsis_bpkmattr_saqry = -1;
-static gint ett_docsis_bpkmattr_dnld = -1;
-static gint ett_docsis_bpkmattrtlv = -1;
-
-static gint ett_docsis_regack = -1;
-
-static gint ett_docsis_dsareq = -1;
-static gint ett_docsis_dsarsp = -1;
-static gint ett_docsis_dsaack = -1;
-
-static gint ett_docsis_dscreq = -1;
-static gint ett_docsis_dscrsp = -1;
-static gint ett_docsis_dscack = -1;
-
-static gint ett_docsis_dsdreq = -1;
-static gint ett_docsis_dsdrsp = -1;
-
-static gint ett_docsis_dccreq = -1;
-static gint ett_docsis_dccreq_tlv = -1;
-static gint ett_docsis_dccreq_ds_params = -1;
-static gint ett_docsis_dccreq_sf_sub = -1;
-static gint ett_docsis_dccrsp = -1;
-static gint ett_docsis_dccrsp_cm_jump_time = -1;
-static gint ett_docsis_dccrsp_tlv = -1;
-static gint ett_docsis_dccack = -1;
-static gint ett_docsis_dccack_tlv = -1;
-
-static gint ett_docsis_intrngreq = -1;
-
-static gint ett_docsis_dcd = -1;
-static gint ett_docsis_dcd_cfr = -1;
-static gint ett_docsis_dcd_cfr_ip = -1;
-static gint ett_docsis_dcd_rule = -1;
-static gint ett_docsis_dcd_clid = -1;
-static gint ett_docsis_dcd_cfg = -1;
-static gint ett_docsis_dcd_tlv = -1;
-
-static gint ett_docsis_mdd = -1;
-static gint ett_tlv = -1;
-static gint ett_sub_tlv = -1;
-static gint ett_docsis_mdd_cm_status_ev_en_for_docsis31 = -1;
-static gint ett_docsis_mdd_ds_active_channel_list = -1;
-static gint ett_docsis_mdd_ds_service_group = -1;
-static gint ett_docsis_mdd_channel_profile_reporting_control = -1;
-static gint ett_docsis_mdd_ip_init_param = -1;
-static gint ett_docsis_mdd_up_active_channel_list = -1;
-static gint ett_docsis_mdd_upstream_active_channel_list_dschids_maps_ucds_dschids = -1;
-static gint ett_docsis_mdd_cm_status_event_control = -1;
-static gint ett_docsis_mdd_dsg_da_to_dsid = -1;
-static gint ett_docsis_mdd_diplexer_band_edge = -1;
-static gint ett_docsis_mdd_full_duplex_descriptor = -1;
-static gint ett_docsis_mdd_full_duplex_sub_band_descriptor = -1;
-
-static gint ett_docsis_bintrngreq = -1;
-
-static gint ett_docsis_dbcreq = -1;
-static gint ett_docsis_dbcrsp = -1;
-static gint ett_docsis_dbcack = -1;
-
-static gint ett_docsis_dpvreq = -1;
-static gint ett_docsis_dpvrsp = -1;
-
-static gint ett_docsis_cmstatus = -1;
-static gint ett_docsis_cmstatus_tlv = -1;
-static gint ett_docsis_cmstatus_tlvtlv = -1;
-static gint ett_docsis_cmstatus_status_event_tlv = -1;
-static gint ett_docsis_cmstatus_status_event_tlvtlv = -1;
-
-static gint ett_docsis_cmstatusack = -1;
-
-static gint ett_docsis_cmctrlreq = -1;
-static gint ett_docsis_cmctrlreq_tlv = -1;
-static gint ett_docsis_cmctrlreq_tlvtlv = -1;
-static gint ett_docsis_cmctrl_tlv_us_event = -1;
-static gint ett_docsis_cmctrl_tlv_ds_event = -1;
-static gint ett_docsis_cmctrlrsp = -1;
-
-static gint ett_docsis_regreqmp = -1;
-static gint ett_docsis_regrspmp = -1;
-
-static gint ett_docsis_ocd = -1;
-static gint ett_docsis_ocd_tlv = -1;
-static gint ett_docsis_ocd_tlvtlv = -1;
-
-static gint ett_docsis_dpd = -1;
-static gint ett_docsis_dpd_tlv = -1;
-static gint ett_docsis_dpd_tlvtlv = -1;
-static gint ett_docsis_dpd_tlv_subcarrier_assignment = -1;
-static gint ett_docsis_dpd_tlv_subcarrier_assignment_vector = -1;
-
-static gint ett_docsis_optreq = -1;
-static gint ett_docsis_optreq_tlv = -1;
-static gint ett_docsis_optreq_tlvtlv = -1;
-static gint ett_docsis_optreq_tlv_rxmer_thresh_params = -1;
-static gint ett_docsis_optreq_tlv_rxmer_thresh_params_tlv = -1;
-static gint ett_docsis_optreq_tlv_trigger_definition_params = -1;
-static gint ett_docsis_optreq_tlv_trigger_definition_params_tlv = -1;
-
-static gint ett_docsis_optrsp = -1;
-static gint ett_docsis_optrsp_tlv = -1;
-static gint ett_docsis_optrsp_tlvtlv = -1;
-static gint ett_docsis_optrsp_tlv_rxmer_snr_margin_data = -1;
-static gint ett_docsis_optrsp_tlv_rxmer_snr_margin_tlv =-1;
-
-static gint ett_docsis_optack = -1;
-
-static gint ett_docsis_rba = -1;
-static gint ett_docsis_rba_control_byte = -1;
-
-static gint ett_docsis_ext_rngreq = -1;
-
-static gint ett_docsis_mgmt = -1;
-static gint ett_mgmt_pay = -1;
-
-static gint ett_docsis_tlv_fragments = -1;
-static gint ett_docsis_tlv_fragment = -1;
-static gint ett_docsis_tlv_reassembled = -1;
-
-static expert_field ei_docsis_mgmt_tlvlen_bad = EI_INIT;
-static expert_field ei_docsis_mgmt_tlvtype_unknown = EI_INIT;
-static expert_field ei_docsis_mgmt_version_unknown = EI_INIT;
-static expert_field ei_docsis_mgmt_opt_req_trigger_def_measure_duration = EI_INIT;
+static int proto_docsis_mgmt;
+static int proto_docsis_sync;
+static int proto_docsis_ucd;
+static int proto_docsis_map_v1;
+static int proto_docsis_map_v5;
+static int proto_docsis_rngreq;
+static int proto_docsis_rngrsp;
+static int proto_docsis_regreq;
+static int proto_docsis_regrsp;
+static int proto_docsis_uccreq;
+static int proto_docsis_uccrsp;
+static int proto_docsis_bpkmreq;
+static int proto_docsis_bpkmrsp;
+static int proto_docsis_regack;
+static int proto_docsis_dsareq;
+static int proto_docsis_dsarsp;
+static int proto_docsis_dsaack;
+static int proto_docsis_dscreq;
+static int proto_docsis_dscrsp;
+static int proto_docsis_dscack;
+static int proto_docsis_dsdreq;
+static int proto_docsis_dsdrsp;
+static int proto_docsis_dccreq;
+static int proto_docsis_dccrsp;
+static int proto_docsis_dccack;
+static int proto_docsis_type29ucd;
+static int proto_docsis_intrngreq;
+static int proto_docsis_dcd;
+static int proto_docsis_mdd;
+static int proto_docsis_bintrngreq;
+static int proto_docsis_type35ucd;
+static int proto_docsis_dbcreq;
+static int proto_docsis_dbcrsp;
+static int proto_docsis_dbcack;
+static int proto_docsis_dpvreq;
+static int proto_docsis_dpvrsp;
+static int proto_docsis_cmstatus;
+static int proto_docsis_cmstatusack;
+static int proto_docsis_cmctrlreq;
+static int proto_docsis_cmctrlrsp;
+static int proto_docsis_regreqmp;
+static int proto_docsis_regrspmp;
+static int proto_docsis_emreq;
+static int proto_docsis_emrsp;
+static int proto_docsis_ocd;
+static int proto_docsis_dpd;
+static int proto_docsis_type51ucd;
+static int proto_docsis_optreq;
+static int proto_docsis_optrsp;
+static int proto_docsis_optack;
+static int proto_docsis_rba;
+static int proto_docsis_ext_rngreq;
+
+static int hf_docsis_sync_cmts_timestamp;
+
+static int hf_docsis_ucd_config_ch_cnt;
+static int hf_docsis_ucd_mini_slot_size;
+static int hf_docsis_ucd_type;
+static int hf_docsis_ucd_length;
+static int hf_docsis_ucd_burst_type;
+static int hf_docsis_ucd_burst_length;
+static int hf_docsis_ucd_symbol_rate;
+static int hf_docsis_ucd_frequency;
+static int hf_docsis_ucd_preamble_pat;
+static int hf_docsis_ucd_ext_preamble_pat;
+static int hf_docsis_ucd_scdma_mode_enabled;
+static int hf_docsis_ucd_scdma_spreading_interval;
+static int hf_docsis_ucd_scdma_codes_per_mini_slot;
+static int hf_docsis_ucd_scdma_active_codes;
+static int hf_docsis_ucd_scdma_code_hopping_seed;
+static int hf_docsis_ucd_scdma_us_ratio_num;
+static int hf_docsis_ucd_scdma_us_ratio_denom;
+static int hf_docsis_ucd_scdma_timestamp_snapshot;
+static int hf_docsis_ucd_maintain_power_spectral_density;
+static int hf_docsis_ucd_ranging_required;
+static int hf_docsis_ucd_max_scheduled_codes;
+static int hf_docsis_ucd_rnghoff_cm;
+static int hf_docsis_ucd_rnghoff_erouter;
+static int hf_docsis_ucd_rnghoff_emta;
+static int hf_docsis_ucd_rnghoff_estb;
+static int hf_docsis_ucd_rnghoff_rsvd;
+static int hf_docsis_ucd_rnghoff_id_ext;
+static int hf_docsis_ucd_chan_class_id_cm;
+static int hf_docsis_ucd_chan_class_id_erouter;
+static int hf_docsis_ucd_chan_class_id_emta;
+static int hf_docsis_ucd_chan_class_id_estb;
+static int hf_docsis_ucd_chan_class_id_rsvd;
+static int hf_docsis_ucd_chan_class_id_id_ext;
+static int hf_docsis_ucd_scdma_scrambler_onoff;
+static int hf_docsis_ucd_scdma_codes_per_subframe;
+static int hf_docsis_ucd_scdma_framer_int_step_size;
+static int hf_docsis_ucd_tcm_enabled;
+static int hf_docsis_ucd_active_code_hopping;
+static int hf_docsis_ucd_higher_ucd_for_same_ucid;
+static int hf_docsis_ucd_higher_ucd_for_same_ucid_resv;
+static int hf_docsis_ucd_scdma_selection_active_codes;
+static int hf_docsis_ucd_iuc;
+static int hf_docsis_ucd_change_ind_bitmask_subc_excl_band;
+static int hf_docsis_ucd_change_ind_bitmask_unused_subc;
+static int hf_docsis_ucd_change_ind_bitmask_other_subc;
+static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc5;
+static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc6;
+static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc9;
+static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc10;
+static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc11;
+static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc12;
+static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc13;
+static int hf_docsis_ucd_change_ind_bitmask_burst_attr_iuc3_or_4;
+static int hf_docsis_ucd_change_ind_bitmask_reserved;
+static int hf_docsis_ucd_ofdma_timestamp_snapshot;
+static int hf_docsis_ucd_ofdma_timestamp_snapshot_reserved;
+static int hf_docsis_ucd_ofdma_timestamp_snapshot_d30timestamp;
+static int hf_docsis_ucd_ofdma_timestamp_snapshot_4msbits_of_div20;
+static int hf_docsis_ucd_ofdma_timestamp_snapshot_minislot_count;
+static int hf_docsis_ucd_ofdma_cyclic_prefix_size;
+static int hf_docsis_ucd_ofdma_rolloff_period_size;
+static int hf_docsis_ucd_subc_spacing;
+static int hf_docsis_ucd_cent_freq_subc0;
+static int hf_docsis_ucd_subcarrier_range;
+static int hf_docsis_ucd_symb_ofdma_frame;
+static int hf_docsis_ucd_rand_seed;
+static int hf_docsis_ucd_extended_us_channel;
+
+static int hf_docsis_burst_mod_type;
+static int hf_docsis_burst_diff_encoding;
+static int hf_docsis_burst_preamble_len;
+static int hf_docsis_burst_preamble_val_off;
+static int hf_docsis_burst_fec;
+static int hf_docsis_burst_fec_codeword;
+static int hf_docsis_burst_scrambler_seed;
+static int hf_docsis_burst_max_burst;
+static int hf_docsis_burst_guard_time;
+static int hf_docsis_burst_last_cw_len;
+static int hf_docsis_burst_scrambler_onoff;
+static int hf_docsis_rs_int_depth;
+static int hf_docsis_rs_int_block;
+static int hf_docsis_preamble_type;
+static int hf_docsis_subc_init_rang;
+static int hf_docsis_subc_fine_rang;
+static int hf_docsis_ofdma_prof_mod_order;
+static int hf_docsis_ofdma_prof_pilot_pattern;
+static int hf_docsis_ofdma_prof_num_add_minislots;
+static int hf_docsis_ofdma_ir_pow_ctrl_start_pow;
+static int hf_docsis_ofdma_ir_pow_ctrl_step_size;
+
+static int hf_docsis_map_ucd_count;
+static int hf_docsis_map_numie;
+static int hf_docsis_map_numie_v5;
+static int hf_docsis_map_alloc_start;
+static int hf_docsis_map_ack_time;
+static int hf_docsis_map_rng_start;
+static int hf_docsis_map_rng_end;
+static int hf_docsis_map_data_start;
+static int hf_docsis_map_data_end;
+static int hf_docsis_map_ie;
+static int hf_docsis_map_probe_ie;
+
+static int hf_docsis_map_rsvd;
+static int hf_docsis_map_rsvd_v5;
+static int hf_docsis_map_cat;
+
+static int hf_docsis_map_sid;
+static int hf_docsis_map_iuc;
+static int hf_docsis_map_offset;
+static int hf_docsis_map_mer;
+static int hf_docsis_map_pw;
+static int hf_docsis_map_eq;
+static int hf_docsis_map_st;
+static int hf_docsis_map_probe_frame;
+static int hf_docsis_map_symbol_in_frame;
+static int hf_docsis_map_start_subc;
+static int hf_docsis_map_subc_skip;
+
+
+static int hf_docsis_rngreq_sid_field_bit15;
+static int hf_docsis_rngreq_sid_field_bit14;
+static int hf_docsis_rngreq_sid_field_bit15_14;
+static int hf_docsis_rngreq_sid;
+static int hf_docsis_rngreq_pend_compl;
+
+static int hf_docsis_rngrsp_type;
+static int hf_docsis_rngrsp_length;
+static int hf_docsis_rngrsp_sid;
+static int hf_docsis_rngrsp_timing_adj;
+static int hf_docsis_rngrsp_power_adj;
+static int hf_docsis_rngrsp_freq_adj;
+static int hf_docsis_rngrsp_xmit_eq_adj;
+static int hf_docsis_rngrsp_ranging_status;
+static int hf_docsis_rngrsp_down_freq_over;
+static int hf_docsis_rngrsp_upstream_ch_over;
+static int hf_docsis_rngrsp_xmit_eq_set;
+static int hf_docsis_rngrsp_rngrsp_t4_timeout_multiplier;
+static int hf_docsis_rngrsp_dynamic_range_window_upper_edge;
+static int hf_docsis_rngrsp_tlv_unknown;
+static int hf_docsis_rngrsp_trans_eq_data;
+static int hf_docsis_rngrsp_trans_eq_enc_scdma_tdma_main_tap_location;
+static int hf_docsis_rngrsp_trans_eq_enc_scdma_tdma_number_of_forward_taps_per_symbol;
+static int hf_docsis_rngrsp_trans_eq_enc_scdma_tdma_number_of_forward_taps_n;
+static int hf_docsis_rngrsp_trans_eq_enc_scdma_tdma_reserved;
+static int hf_docsis_rngrsp_trans_eq_enc_lowest_subc;
+static int hf_docsis_rngrsp_trans_eq_enc_highest_subc;
+static int hf_docsis_rngrsp_trans_eq_enc_coef_real;
+static int hf_docsis_rngrsp_trans_eq_enc_coef_imag;
+static int hf_docsis_rngrsp_commanded_power_data;
+static int hf_docsis_rngrsp_commanded_power_dynamic_range_window;
+static int hf_docsis_rngrsp_commanded_power_ucid;
+static int hf_docsis_rngrsp_commanded_power_trans_pow_lvl;
+
+
+static int hf_docsis_regreq_sid;
+static int hf_docsis_regrsp_sid;
+static int hf_docsis_regrsp_response;
+
+static int hf_docsis_bpkm_code;
+static int hf_docsis_bpkm_length;
+static int hf_docsis_bpkm_ident;
+static int hf_docsis_bpkmattr;
+static int hf_docsis_bpkmattr_serial_num;
+static int hf_docsis_bpkmattr_manf_id;
+static int hf_docsis_bpkmattr_mac_addr;
+static int hf_docsis_bpkmattr_rsa_pub_key;
+static int hf_docsis_bpkmattr_cm_id;
+static int hf_docsis_bpkmattr_display_str;
+static int hf_docsis_bpkmattr_auth_key;
+static int hf_docsis_bpkmattr_tek;
+static int hf_docsis_bpkmattr_key_life;
+static int hf_docsis_bpkmattr_key_seq;
+static int hf_docsis_bpkmattr_hmac_digest;
+static int hf_docsis_bpkmattr_said;
+static int hf_docsis_bpkmattr_tek_params;
+static int hf_docsis_bpkmattr_cbc_iv;
+static int hf_docsis_bpkmattr_error_code;
+static int hf_docsis_bpkmattr_vendor_def;
+static int hf_docsis_bpkmattr_ca_cert;
+static int hf_docsis_bpkmattr_cm_cert;
+static int hf_docsis_bpkmattr_security_cap;
+static int hf_docsis_bpkmattr_crypto_suite;
+static int hf_docsis_bpkmattr_crypto_suite_list;
+static int hf_docsis_bpkmattr_bpi_version;
+static int hf_docsis_bpkmattr_sa_descr;
+static int hf_docsis_bpkmattr_sa_type;
+static int hf_docsis_bpkmattr_sa_query;
+static int hf_docsis_bpkmattr_sa_query_type;
+static int hf_docsis_bpkmattr_ip_address;
+static int hf_docsis_bpkmattr_download_param;
+static int hf_docsis_bpkmattr_type;
+static int hf_docsis_bpkmattr_length;
+
+static int hf_docsis_regack_sid;
+static int hf_docsis_regack_response;
+
+static int hf_docsis_dsarsp_response;
+static int hf_docsis_dsaack_response;
+
+static int hf_docsis_dscrsp_response;
+static int hf_docsis_dscack_response;
+
+static int hf_docsis_dsdreq_rsvd;
+static int hf_docsis_dsdreq_sfid;
+
+static int hf_docsis_dsdrsp_confcode;
+static int hf_docsis_dsdrsp_rsvd;
+
+static int hf_docsis_dccreq_type;
+static int hf_docsis_dccreq_length;
+static int hf_docsis_dccreq_tran_id;
+static int hf_docsis_dccreq_up_chan_id;
+static int hf_docsis_dcc_ds_params_subtype;
+static int hf_docsis_dcc_ds_params_length;
+static int hf_docsis_dccreq_ds_freq;
+static int hf_docsis_dccreq_ds_mod_type;
+static int hf_docsis_dccreq_ds_sym_rate;
+static int hf_docsis_dccreq_ds_intlv_depth_i;
+static int hf_docsis_dccreq_ds_intlv_depth_j;
+static int hf_docsis_dccreq_ds_chan_id;
+static int hf_docsis_dccreq_ds_sync_sub;
+static int hf_docsis_dccreq_ds_ofdm_block_freq;
+static int hf_docsis_dccreq_init_tech;
+static int hf_docsis_dccreq_ucd_sub;
+static int hf_docsis_dccreq_said_sub_cur;
+static int hf_docsis_dccreq_said_sub_new;
+static int hf_docsis_dcc_sf_sub_subtype;
+static int hf_docsis_dcc_sf_sub_length;
+static int hf_docsis_dccreq_sf_sfid_cur;
+static int hf_docsis_dccreq_sf_sfid_new;
+static int hf_docsis_dccreq_sf_sid_cur;
+static int hf_docsis_dccreq_sf_sid_new;
+static int hf_docsis_dccreq_sf_unsol_grant_tref;
+static int hf_docsis_dccreq_cmts_mac_addr;
+static int hf_docsis_dccreq_key_seq_num;
+static int hf_docsis_dccreq_hmac_digest;
+static int hf_docsis_dccrsp_conf_code;
+static int hf_docsis_dccrsp_type;
+static int hf_docsis_dccrsp_length;
+static int hf_docsis_dcc_cm_jump_subtype;
+static int hf_docsis_dcc_cm_jump_length;
+static int hf_docsis_dccrsp_cm_jump_time_length;
+static int hf_docsis_dccrsp_cm_jump_time_start;
+static int hf_docsis_dccrsp_key_seq_num;
+static int hf_docsis_dccrsp_hmac_digest;
+static int hf_docsis_dccack_type;
+static int hf_docsis_dccack_length;
+static int hf_docsis_dccack_key_seq_num;
+static int hf_docsis_dccack_hmac_digest;
+
+static int hf_docsis_intrngreq_sid;
+
+static int hf_docsis_dcd_config_ch_cnt;
+static int hf_docsis_dcd_num_of_frag;
+static int hf_docsis_dcd_frag_sequence_num;
+static int hf_docsis_dcd_type;
+static int hf_docsis_dcd_length;
+static int hf_docsis_dcd_down_classifier_subtype;
+static int hf_docsis_dcd_down_classifier_length;
+static int hf_docsis_dcd_cfr_id;
+static int hf_docsis_dcd_cfr_rule_pri;
+static int hf_docsis_dcd_cfr_ip_subtype;
+static int hf_docsis_dcd_cfr_ip_length;
+static int hf_docsis_dcd_cfr_ip_source_addr;
+static int hf_docsis_dcd_cfr_ip_source_mask;
+static int hf_docsis_dcd_cfr_ip_dest_addr;
+static int hf_docsis_dcd_cfr_ip_dest_mask;
+static int hf_docsis_dcd_cfr_tcpudp_srcport_start;
+static int hf_docsis_dcd_cfr_tcpudp_srcport_end;
+static int hf_docsis_dcd_cfr_tcpudp_dstport_start;
+static int hf_docsis_dcd_cfr_tcpudp_dstport_end;
+static int hf_docsis_dcd_rule_id;
+static int hf_docsis_dcd_rule_pri;
+static int hf_docsis_dcd_rule_ucid_list;
+static int hf_docsis_dcd_clid_subtype;
+static int hf_docsis_dcd_clid_length;
+static int hf_docsis_dcd_clid_bcast_id;
+static int hf_docsis_dcd_clid_known_mac_addr;
+static int hf_docsis_dcd_clid_ca_sys_id;
+static int hf_docsis_dcd_clid_app_id;
+static int hf_docsis_dcd_dsg_rule_subtype;
+static int hf_docsis_dcd_dsg_rule_length;
+static int hf_docsis_dcd_rule_tunl_addr;
+static int hf_docsis_dcd_rule_cfr_id;
+static int hf_docsis_dcd_rule_vendor_spec;
+static int hf_docsis_dcd_cfg_subtype;
+static int hf_docsis_dcd_cfg_length;
+static int hf_docsis_dcd_cfg_chan;
+static int hf_docsis_dcd_cfg_tdsg1;
+static int hf_docsis_dcd_cfg_tdsg2;
+static int hf_docsis_dcd_cfg_tdsg3;
+static int hf_docsis_dcd_cfg_tdsg4;
+static int hf_docsis_dcd_cfg_vendor_spec;
+
+static int hf_docsis_mdd_ccc;
+static int hf_docsis_mdd_number_of_fragments;
+static int hf_docsis_mdd_fragment_sequence_number;
+static int hf_docsis_mdd_current_channel_dcid;
+static int hf_docsis_mdd_ds_active_channel_list_subtype;
+static int hf_docsis_mdd_ds_active_channel_list_length;
+static int hf_docsis_mdd_downstream_active_channel_list_channel_id;
+static int hf_docsis_mdd_downstream_active_channel_list_frequency;
+static int hf_docsis_mdd_downstream_active_channel_list_annex;
+static int hf_docsis_mdd_downstream_active_channel_list_modulation_order;
+static int hf_docsis_mdd_downstream_active_channel_list_primary_capable;
+static int hf_docsis_mdd_downstream_active_channel_list_map_ucd_transport_indicator;
+static int hf_docsis_mdd_cm_status_event_enable_bitmask;
+static int hf_docsis_mdd_cm_status_event_enable_bitmask_mdd_timeout;
+static int hf_docsis_mdd_cm_status_event_enable_bitmask_qam_fec_lock_failure;
+static int hf_docsis_mdd_cm_status_event_enable_bitmask_mdd_recovery;
+static int hf_docsis_mdd_cm_status_event_enable_bitmask_qam_fec_lock_recovery;
+static int hf_docsis_mdd_ofdm_plc_parameters;
+static int hf_docsis_mdd_ofdm_plc_parameters_tukey_raised_cosine_window;
+static int hf_docsis_mdd_ofdm_plc_parameters_cyclic_prefix;
+static int hf_docsis_mdd_ofdm_plc_parameters_sub_carrier_spacing;
+static int hf_docsis_mdd_up_active_channel_list_subtype;
+static int hf_docsis_mdd_up_active_channel_list_length;
+static int hf_docsis_mdd_cm_status_event_enable_bitmask_t4_timeout;
+static int hf_docsis_mdd_cm_status_event_enable_bitmask_t3_retries_exceeded;
+static int hf_docsis_mdd_cm_status_event_enable_bitmask_successful_ranging_after_t3_retries_exceeded;
+static int hf_docsis_mdd_ds_service_group_subtype;
+static int hf_docsis_mdd_ds_service_group_length;
+static int hf_docsis_mdd_mac_domain_downstream_service_group_md_ds_sg_identifier;
+static int hf_docsis_mdd_mac_domain_downstream_service_group_channel_id;
+static int hf_docsis_mdd_type;
+static int hf_docsis_mdd_length;
+static int hf_docsis_mdd_downstream_ambiguity_resolution_frequency;
+static int hf_docsis_mdd_channel_profile_reporting_control_subtype;
+static int hf_docsis_mdd_channel_profile_reporting_control_length;
+static int hf_docsis_mdd_rcp_center_frequency_spacing;
+static int hf_docsis_mdd_verbose_rcp_reporting;
+static int hf_docsis_mdd_fragmented_rcp_transmission;
+static int hf_docsis_mdd_ip_init_param_subtype;
+static int hf_docsis_mdd_ip_init_param_length;
+static int hf_docsis_mdd_ip_provisioning_mode;
+static int hf_docsis_mdd_pre_registration_dsid;
+static int hf_docsis_mdd_early_authentication_and_encryption;
+static int hf_docsis_mdd_upstream_active_channel_list_upstream_channel_id;
+static int hf_docsis_mdd_upstream_active_channel_list_upstream_channel_priority;
+static int hf_docsis_mdd_upstream_active_channel_list_dschids_maps_ucds;
+static int hf_docsis_mdd_upstream_active_channel_list_dschids_maps_ucds_dschid;
+static int hf_docsis_mdd_upstream_active_channel_list_fdx_upstream_channel;
+static int hf_docsis_mdd_upstream_active_channel_list_fdx_subband_id;
+static int hf_docsis_mdd_upstream_ambiguity_resolution_channel_list_channel_id;
+static int hf_docsis_mdd_upstream_frequency_range;
+static int hf_docsis_mdd_symbol_clock_locking_indicator;
+static int hf_docsis_mdd_cm_status_event_control_subtype;
+static int hf_docsis_mdd_cm_status_event_control_length;
+static int hf_docsis_mdd_event_type;
+static int hf_docsis_mdd_maximum_event_holdoff_timer;
+static int hf_docsis_mdd_maximum_number_of_reports_per_event;
+static int hf_docsis_mdd_upstream_transmit_power_reporting;
+static int hf_docsis_mdd_dsg_da_to_dsid_subtype;
+static int hf_docsis_mdd_dsg_da_to_dsid_length;
+static int hf_docsis_mdd_dsg_da_to_dsid_association_da;
+static int hf_docsis_mdd_dsg_da_to_dsid_association_dsid;
+static int hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events;
+static int hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events_sequence_out_of_range;
+static int hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events_cm_operating_on_battery_backup;
+static int hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events_cm_returned_to_ac_power;
+static int hf_docsis_mdd_extended_upstream_transmit_power_support;
+static int hf_docsis_mdd_unknown;
+
+static int hf_docsis_mdd_cmts_major_docsis_version;
+static int hf_docsis_mdd_cmts_minor_docsis_version;
+static int hf_docsis_mdd_cmts_docsis_version_unknown;
+
+static int hf_docsis_mdd_cm_periodic_maintenance_timeout_indicator;
+static int hf_docsis_mdd_dls_broadcast_and_multicast_delivery_method;
+static int hf_docsis_mdd_cm_status_event_d31_ofdm_prof_fail;
+static int hf_docsis_mdd_cm_status_event_d31_prim_down_chan_change;
+static int hf_docsis_mdd_cm_status_event_d31_dpd_mismatch;
+static int hf_docsis_mdd_cm_status_event_d31_deprecated;
+static int hf_docsis_mdd_cm_status_event_d31_ncp_prof_fail;
+static int hf_docsis_mdd_cm_status_event_d31_loss_fec_plc;
+static int hf_docsis_mdd_cm_status_event_d31_ncp_prof_recover;
+static int hf_docsis_mdd_cm_status_event_d31_fec_recover_on_plc;
+static int hf_docsis_mdd_cm_status_event_d31_fec_recover_on_ofdm_prof;
+static int hf_docsis_mdd_cm_status_event_d31_ofdma_prof_fail;
+static int hf_docsis_mdd_cm_status_event_d31_map_stor_overflow_ind;
+static int hf_docsis_mdd_cm_status_event_d31_ofdm_map_stor_almost_full_ind;
+static int hf_docsis_mdd_cm_status_event_d31_reserved;
+
+static int hf_docsis_mdd_diplexer_band_edge;
+static int hf_docsis_mdd_diplexer_band_edge_length;
+static int hf_docsis_mdd_diplexer_us_upper_band_edge;
+static int hf_docsis_mdd_diplexer_ds_lower_band_edge;
+static int hf_docsis_mdd_diplexer_ds_upper_band_edge;
+static int hf_docsis_mdd_diplexer_us_upper_band_edge_override;
+static int hf_docsis_mdd_diplexer_ds_lower_band_edge_override;
+static int hf_docsis_mdd_diplexer_ds_upper_band_edge_override;
+
+static int hf_docsis_mdd_full_duplex_descriptor;
+static int hf_docsis_mdd_full_duplex_descriptor_length;
+static int hf_docsis_mdd_full_duplex_allocated_spectrum;
+static int hf_docsis_mdd_full_duplex_total_number_of_sub_bands;
+static int hf_docsis_mdd_full_duplex_sub_band_width;
+static int hf_docsis_mdd_full_duplex_sub_band_descriptor;
+static int hf_docsis_mdd_full_duplex_sub_band_descriptor_length;
+static int hf_docsis_mdd_full_duplex_sub_band_id;
+static int hf_docsis_mdd_full_duplex_sub_band_offset;
+
+static int hf_docsis_bintrngreq_mddsgid;
+static int hf_docsis_bintrngreq_capflags;
+static int hf_docsis_bintrngreq_capflags_frag;
+static int hf_docsis_bintrngreq_capflags_encrypt;
+
+static int hf_docsis_dbcreq_number_of_fragments;
+static int hf_docsis_dbcreq_fragment_sequence_number;
+
+static int hf_docsis_dbcrsp_conf_code;
+
+static int hf_docsis_dpv_flags;
+static int hf_docsis_dpv_us_sf;
+static int hf_docsis_dpv_n;
+static int hf_docsis_dpv_start;
+static int hf_docsis_dpv_end;
+static int hf_docsis_dpv_ts_start;
+static int hf_docsis_dpv_ts_end;
+
+static int hf_docsis_cmstatus_e_t_mdd_t;
+static int hf_docsis_cmstatus_e_t_qfl_f;
+static int hf_docsis_cmstatus_e_t_s_o;
+static int hf_docsis_cmstatus_e_t_mdd_r;
+static int hf_docsis_cmstatus_e_t_qfl_r;
+static int hf_docsis_cmstatus_e_t_t4_t;
+static int hf_docsis_cmstatus_e_t_t3_e;
+static int hf_docsis_cmstatus_e_t_rng_s;
+static int hf_docsis_cmstatus_e_t_cm_b;
+static int hf_docsis_cmstatus_e_t_cm_a;
+static int hf_docsis_cmstatus_e_t_mac_removal;
+static int hf_docsis_cmstatus_e_t_ds_ofdm_profile_failure;
+static int hf_docsis_cmstatus_e_t_prim_ds_change;
+static int hf_docsis_cmstatus_e_t_dpd_mismatch;
+static int hf_docsis_cmstatus_e_t_ncp_profile_failure;
+static int hf_docsis_cmstatus_e_t_plc_failure;
+static int hf_docsis_cmstatus_e_t_ncp_profile_recovery;
+static int hf_docsis_cmstatus_e_t_plc_recovery;
+static int hf_docsis_cmstatus_e_t_ofdm_profile_recovery;
+static int hf_docsis_cmstatus_e_t_ofdma_profile_failure;
+static int hf_docsis_cmstatus_e_t_map_storage_overflow_indicator;
+static int hf_docsis_cmstatus_e_t_map_storage_almost_full_indicator;
+static int hf_docsis_cmstatus_e_t_unknown;
+static int hf_docsis_cmstatus_status_event_ds_ch_id;
+static int hf_docsis_cmstatus_status_event_us_ch_id;
+static int hf_docsis_cmstatus_status_event_dsid;
+static int hf_docsis_cmstatus_status_event_mac_address;
+static int hf_docsis_cmstatus_status_event_ds_ofdm_profile_id;
+static int hf_docsis_cmstatus_status_event_us_ofdma_profile_id;
+static int hf_docsis_cmstatus_status_event_descr;
+static int hf_docsis_cmstatus_tlv_data;
+static int hf_docsis_cmstatus_type;
+static int hf_docsis_cmstatus_length;
+static int hf_docsis_cmstatus_status_event_tlv_data;
+static int hf_docsis_cmstatus_status_event_type;
+static int hf_docsis_cmstatus_status_event_length;
+
+static int hf_docsis_cmctrl_tlv_mute;
+static int hf_docsis_cmctrl_tlv_mute_timeout;
+static int hf_docsis_cmctrl_tlv_reinit;
+static int hf_docsis_cmctrl_tlv_disable_fwd;
+static int hf_docsis_cmctrl_tlv_ds_event;
+static int hf_docsis_cmctrl_tlv_us_event;
+static int hf_docsis_cmctrl_tlv_event;
+static int hf_docsis_cmctrlreq_tlv_data;
+static int hf_docsis_cmctrlreq_type;
+static int hf_docsis_cmctrlreq_length;
+static int hf_docsis_cmctrlreq_us_type;
+static int hf_docsis_cmctrlreq_us_length;
+static int hf_docsis_cmctrl_us_event_ch_id;
+static int hf_docsis_cmctrl_us_event_mask;
+static int hf_docsis_cmctrl_ds_type;
+static int hf_docsis_cmctrl_ds_length;
+static int hf_docsis_cmctrl_ds_event_ch_id;
+static int hf_docsis_cmctrl_ds_event_mask;
+
+static int hf_docsis_regreqmp_sid;
+static int hf_docsis_regreqmp_number_of_fragments;
+static int hf_docsis_regreqmp_fragment_sequence_number;
+static int hf_docsis_regrspmp_sid;
+static int hf_docsis_regrspmp_response;
+static int hf_docsis_regrspmp_number_of_fragments;
+static int hf_docsis_regrspmp_fragment_sequence_number;
+
+static int hf_docsis_emrsp_tlv_data;
+static int hf_docsis_emrsp_tlv_type;
+static int hf_docsis_emrsp_tlv_length;
+static int hf_docsis_emrsp_tlv_holdoff_timer;
+static int hf_docsis_emreq_req_power_mode;
+static int hf_docsis_emreq_reserved;
+static int hf_docsis_emrsp_rsp_code;
+static int hf_docsis_emrsp_reserved;
+static int hf_docsis_emrsp_tlv_unknown;
+
+static int hf_docsis_ocd_tlv_unknown;
+static int hf_docsis_ocd_ccc;
+static int hf_docsis_ocd_tlv_four_trans_size;
+static int hf_docsis_ocd_tlv_cycl_pref;
+static int hf_docsis_ocd_tlv_roll_off;
+static int hf_docsis_ocd_tlv_ofdm_spec_loc;
+static int hf_docsis_ocd_tlv_time_int_depth;
+static int hf_docsis_ocd_tlv_prim_cap_ind;
+static int hf_docsis_ocd_tlv_subc_assign_type;
+static int hf_docsis_ocd_tlv_subc_assign_value;
+static int hf_docsis_ocd_subc_assign_subc_type;
+static int hf_docsis_ocd_subc_assign_range;
+static int hf_docsis_ocd_subc_assign_index;
+static int hf_docsis_ocd_tlv_data;
+static int hf_docsis_ocd_type;
+static int hf_docsis_ocd_length;
+
+static int hf_docsis_dpd_tlv_unknown;
+static int hf_docsis_dpd_prof_id;
+static int hf_docsis_dpd_ccc;
+static int hf_docsis_dpd_tlv_subc_assign_type;
+static int hf_docsis_dpd_tlv_subc_assign_value;
+static int hf_docsis_dpd_subc_assign_range;
+static int hf_docsis_dpd_tlv_subc_assign_reserved;
+static int hf_docsis_dpd_tlv_subc_assign_modulation;
+static int hf_docsis_dpd_subc_assign_index;
+static int hf_docsis_dpd_tlv_subc_assign_vector_oddness;
+static int hf_docsis_dpd_tlv_subc_assign_vector_reserved;
+static int hf_docsis_dpd_tlv_subc_assign_vector_subc_start;
+static int hf_docsis_dpd_tlv_subc_assign_vector_modulation_odd;
+static int hf_docsis_dpd_tlv_subc_assign_vector_modulation_even;
+static int hf_docsis_dpd_tlv_data;
+static int hf_docsis_dpd_type;
+static int hf_docsis_dpd_length;
+
+static int hf_docsis_optreq_tlv_unknown;
+static int hf_docsis_optreq_prof_id;
+static int hf_docsis_optreq_opcode;
+static int hf_docsis_optreq_reserved;
+static int hf_docsis_optreq_tlv_data;
+static int hf_docsis_optreq_type;
+static int hf_docsis_optreq_length;
+static int hf_docsis_optreq_reqstat_rxmer_stat_subc;
+static int hf_docsis_optreq_reqstat_rxmer_subc_threshold_comp;
+static int hf_docsis_optreq_reqstat_snr_marg_cand_prof;
+static int hf_docsis_optreq_reqstat_codew_stat_cand_prof;
+static int hf_docsis_optreq_reqstat_codew_thresh_comp_cand_prof;
+static int hf_docsis_optreq_reqstat_ncp_field_stat;
+static int hf_docsis_optreq_reqstat_ncp_crc_thresh_comp;
+static int hf_docsis_optreq_reqstat_reserved;
+static int hf_docsis_optreq_tlv_rxmer_thresh_data;
+static int hf_docsis_optreq_xmer_thresh_params_type;
+static int hf_docsis_optreq_xmer_thresh_params_length;
+static int hf_docsis_optreq_tlv_rxmer_thresh_data_mod_order;
+static int hf_docsis_optreq_tlv_trigger_definition_data;
+static int hf_docsis_optreq_tlv_trigger_definition_data_type;
+static int hf_docsis_optreq_tlv_trigger_definition_data_length;
+static int hf_docsis_optreq_tlv_trigger_definition_trigger_type;
+static int hf_docsis_optreq_tlv_trigger_definition_measure_duration;
+static int hf_docsis_optreq_tlv_trigger_definition_triggering_sid;
+static int hf_docsis_optreq_tlv_trigger_definition_us_chan_id;
+static int hf_docsis_optreq_tlv_trigger_definition_sound_ambig_offset;
+static int hf_docsis_optreq_tlv_trigger_definition_rx_mer_to_report;
+static int hf_docsis_optreq_tlv_trigger_definition_start_time;
+
+static int hf_docsis_optrsp_tlv_unknown;
+static int hf_docsis_optrsp_prof_id;
+static int hf_docsis_optrsp_reserved;
+static int hf_docsis_optrsp_status;
+static int hf_docsis_optrsp_tlv_data;
+static int hf_docsis_optrsp_type;
+static int hf_docsis_optrsp_length;
+static int hf_docsis_optrsp_tlv_rxmer_snr_margin_data;
+static int hf_docsis_optrsp_xmer_snr_margin_type;
+static int hf_docsis_optrsp_xmer_snr_margin_length;
+static int hf_docsis_optrsp_tlv_rxmer_snr_margin_data_rxmer_subc;
+static int hf_docsis_optrsp_tlv_rxmer_snr_margin_data_snr_margin;
+
+static int hf_docsis_optack_prof_id;
+static int hf_docsis_optack_reserved;
+
+static int hf_docsis_rba_tg_id;
+static int hf_docsis_rba_ccc;
+static int hf_docsis_rba_dcid;
+static int hf_docsis_rba_control_byte_bitmask;
+static int hf_docsis_rba_resource_block_change_bit;
+static int hf_docsis_rba_expiration_time_valid_bit;
+static int hf_docsis_rba_control_byte_bitmask_rsvd;
+static int hf_docsis_rba_rba_time;
+static int hf_docsis_rba_rba_expiration_time;
+static int hf_docsis_rba_number_of_subbands;
+static int hf_docsis_rba_subband_direction;
+
+static int hf_docsis_mgt_upstream_chid;
+static int hf_docsis_mgt_down_chid;
+static int hf_docsis_mgt_tranid;
+static int hf_docsis_mgt_dst_addr;
+static int hf_docsis_mgt_src_addr;
+static int hf_docsis_mgt_msg_len;
+static int hf_docsis_mgt_dsap;
+static int hf_docsis_mgt_ssap;
+static int hf_docsis_mgt_30_transmit_power;
+static int hf_docsis_mgt_31_transmit_power;
+static int hf_docsis_mgt_40_transmit_power;
+static int hf_docsis_mgt_control;
+static int hf_docsis_mgt_version;
+static int hf_docsis_mgt_type;
+static int hf_docsis_mgt_rsvd;
+static int hf_docsis_mgt_multipart;
+static int hf_docsis_mgt_multipart_number_of_fragments;
+static int hf_docsis_mgt_multipart_fragment_sequence_number;
+
+static int hf_docsis_tlv_fragments;
+static int hf_docsis_tlv_fragment;
+static int hf_docsis_tlv_fragment_overlap;
+static int hf_docsis_tlv_fragment_overlap_conflict;
+static int hf_docsis_tlv_fragment_multiple_tails;
+static int hf_docsis_tlv_fragment_too_long_fragment;
+static int hf_docsis_tlv_fragment_error;
+static int hf_docsis_tlv_fragment_count;
+static int hf_docsis_tlv_reassembled_in;
+static int hf_docsis_tlv_reassembled_length;
+static int hf_docsis_tlv_reassembled_data;
+
+static int hf_docsis_tlv_reassembled;
+
+static gint ett_docsis_sync;
+
+static gint ett_docsis_ucd;
+static gint ett_docsis_tlv;
+static gint ett_docsis_burst_tlv;
+
+static gint ett_docsis_map;
+static gint ett_docsis_map_ie;
+static gint ett_docsis_map_probe_ie;
+
+
+static gint ett_docsis_rngreq;
+
+static gint ett_docsis_rngrsp;
+static gint ett_docsis_rngrsptlv;
+static gint ett_docsis_rngrsp_tlv_transmit_equalization_encodings;
+static gint ett_docsis_rngrsp_tlv_transmit_equalization_encodings_coef;
+static gint ett_docsis_rngrsp_tlv_commanded_power_subtlv;
+static gint ett_docsis_rngrsp_tlv_commanded_power;
+
+
+static gint ett_docsis_regreq;
+static gint ett_docsis_regrsp;
+
+static gint ett_docsis_emreq;
+static gint ett_docsis_emrsp;
+static gint ett_docsis_emrsp_tlv;
+static gint ett_docsis_emrsp_tlvtlv;
+
+static gint ett_docsis_uccreq;
+static gint ett_docsis_uccrsp;
+
+static gint ett_docsis_bpkmreq;
+static gint ett_docsis_bpkmrsp;
+static gint ett_docsis_bpkmattr;
+static gint ett_docsis_bpkmattr_cmid;
+static gint ett_docsis_bpkmattr_scap;
+static gint ett_docsis_bpkmattr_tekp;
+static gint ett_docsis_bpkmattr_sadsc;
+static gint ett_docsis_bpkmattr_saqry;
+static gint ett_docsis_bpkmattr_dnld;
+static gint ett_docsis_bpkmattrtlv;
+
+static gint ett_docsis_regack;
+
+static gint ett_docsis_dsareq;
+static gint ett_docsis_dsarsp;
+static gint ett_docsis_dsaack;
+
+static gint ett_docsis_dscreq;
+static gint ett_docsis_dscrsp;
+static gint ett_docsis_dscack;
+
+static gint ett_docsis_dsdreq;
+static gint ett_docsis_dsdrsp;
+
+static gint ett_docsis_dccreq;
+static gint ett_docsis_dccreq_tlv;
+static gint ett_docsis_dccreq_ds_params;
+static gint ett_docsis_dccreq_sf_sub;
+static gint ett_docsis_dccrsp;
+static gint ett_docsis_dccrsp_cm_jump_time;
+static gint ett_docsis_dccrsp_tlv;
+static gint ett_docsis_dccack;
+static gint ett_docsis_dccack_tlv;
+
+static gint ett_docsis_intrngreq;
+
+static gint ett_docsis_dcd;
+static gint ett_docsis_dcd_cfr;
+static gint ett_docsis_dcd_cfr_ip;
+static gint ett_docsis_dcd_rule;
+static gint ett_docsis_dcd_clid;
+static gint ett_docsis_dcd_cfg;
+static gint ett_docsis_dcd_tlv;
+
+static gint ett_docsis_mdd;
+static gint ett_tlv;
+static gint ett_sub_tlv;
+static gint ett_docsis_mdd_cm_status_ev_en_for_docsis31;
+static gint ett_docsis_mdd_ds_active_channel_list;
+static gint ett_docsis_mdd_ds_service_group;
+static gint ett_docsis_mdd_channel_profile_reporting_control;
+static gint ett_docsis_mdd_ip_init_param;
+static gint ett_docsis_mdd_up_active_channel_list;
+static gint ett_docsis_mdd_upstream_active_channel_list_dschids_maps_ucds_dschids;
+static gint ett_docsis_mdd_cm_status_event_control;
+static gint ett_docsis_mdd_dsg_da_to_dsid;
+static gint ett_docsis_mdd_diplexer_band_edge;
+static gint ett_docsis_mdd_full_duplex_descriptor;
+static gint ett_docsis_mdd_full_duplex_sub_band_descriptor;
+
+static gint ett_docsis_bintrngreq;
+
+static gint ett_docsis_dbcreq;
+static gint ett_docsis_dbcrsp;
+static gint ett_docsis_dbcack;
+
+static gint ett_docsis_dpvreq;
+static gint ett_docsis_dpvrsp;
+
+static gint ett_docsis_cmstatus;
+static gint ett_docsis_cmstatus_tlv;
+static gint ett_docsis_cmstatus_tlvtlv;
+static gint ett_docsis_cmstatus_status_event_tlv;
+static gint ett_docsis_cmstatus_status_event_tlvtlv;
+
+static gint ett_docsis_cmstatusack;
+
+static gint ett_docsis_cmctrlreq;
+static gint ett_docsis_cmctrlreq_tlv;
+static gint ett_docsis_cmctrlreq_tlvtlv;
+static gint ett_docsis_cmctrl_tlv_us_event;
+static gint ett_docsis_cmctrl_tlv_ds_event;
+static gint ett_docsis_cmctrlrsp;
+
+static gint ett_docsis_regreqmp;
+static gint ett_docsis_regrspmp;
+
+static gint ett_docsis_ocd;
+static gint ett_docsis_ocd_tlv;
+static gint ett_docsis_ocd_tlvtlv;
+
+static gint ett_docsis_dpd;
+static gint ett_docsis_dpd_tlv;
+static gint ett_docsis_dpd_tlvtlv;
+static gint ett_docsis_dpd_tlv_subcarrier_assignment;
+static gint ett_docsis_dpd_tlv_subcarrier_assignment_vector;
+
+static gint ett_docsis_optreq;
+static gint ett_docsis_optreq_tlv;
+static gint ett_docsis_optreq_tlvtlv;
+static gint ett_docsis_optreq_tlv_rxmer_thresh_params;
+static gint ett_docsis_optreq_tlv_rxmer_thresh_params_tlv;
+static gint ett_docsis_optreq_tlv_trigger_definition_params;
+static gint ett_docsis_optreq_tlv_trigger_definition_params_tlv;
+
+static gint ett_docsis_optrsp;
+static gint ett_docsis_optrsp_tlv;
+static gint ett_docsis_optrsp_tlvtlv;
+static gint ett_docsis_optrsp_tlv_rxmer_snr_margin_data;
+static gint ett_docsis_optrsp_tlv_rxmer_snr_margin_tlv;
+
+static gint ett_docsis_optack;
+
+static gint ett_docsis_rba;
+static gint ett_docsis_rba_control_byte;
+
+static gint ett_docsis_ext_rngreq;
+
+static gint ett_docsis_mgmt;
+static gint ett_mgmt_pay;
+
+static gint ett_docsis_tlv_fragments;
+static gint ett_docsis_tlv_fragment;
+static gint ett_docsis_tlv_reassembled;
+
+static expert_field ei_docsis_mgmt_tlvlen_bad;
+static expert_field ei_docsis_mgmt_tlvtype_unknown;
+static expert_field ei_docsis_mgmt_version_unknown;
+static expert_field ei_docsis_mgmt_opt_req_trigger_def_measure_duration;
 
 static dissector_table_t docsis_mgmt_dissector_table;
 static dissector_handle_t docsis_tlv_handle;
diff --git a/epan/dissectors/packet-docsis-tlv.c b/epan/dissectors/packet-docsis-tlv.c
index 9b18534922..ad58f046c3 100644
--- a/epan/dissectors/packet-docsis-tlv.c
+++ b/epan/dissectors/packet-docsis-tlv.c
@@ -35,565 +35,565 @@ static dissector_handle_t docsis_vsif_handle;
 static dissector_handle_t docsis_ucd_handle;
 static dissector_handle_t docsis_rba_handle;
 
-static int proto_docsis_tlv = -1;
-static int hf_docsis_tlv_down_freq = -1;
-static int hf_docsis_tlv_upstream_chid = -1;
-static int hf_docsis_tlv_net_access = -1;
-/* static int hf_docsis_tlv_cos = -1; */
-/* static int hf_docsis_tlv_mcap = -1; */
-static int hf_docsis_tlv_privacy_enable = -1;
-static int hf_docsis_tlv_max_cpe = -1;
-static int hf_docsis_tlv_max_classifiers = -1;
-static int hf_docsis_tlv_snmp_access = -1;
-static int hf_docsis_tlv_snmp_obj = -1;
-static int hf_docsis_tlv_svc_unavail = -1;
-static int hf_docsis_tlv_svc_unavail_classid = -1;
-static int hf_docsis_tlv_svc_unavail_type = -1;
-static int hf_docsis_tlv_svc_unavail_code = -1;
-static int hf_docsis_tlv_bpi = -1;
-/* static int hf_docsis_tlv_phs = -1; */
-static int hf_docsis_tlv_hmac_digest = -1;
-static int hf_docsis_tlv_tftp_server_timestamp = -1;
-static int hf_docsis_tlv_tftp_prov_modem_address = -1;
-/* static int hf_docsis_tlv_upclsfr = -1; */
-/* static int hf_docsis_tlv_downclsfr = -1; */
-/* static int hf_docsis_tlv_upsflow = -1; */
-/* static int hf_docsis_tlv_downsflow = -1; */
-/* static int hf_docsis_tlv_vendor_spec = -1; */
-static int hf_docsis_tlv_cm_mic = -1;
-static int hf_docsis_tlv_cmts_mic = -1;
-static int hf_docsis_tlv_auth_block = -1;
-static int hf_docsis_tlv_key_seq_num = -1;
-static int hf_docsis_tlv_snmpv3_kick = -1;
-static int hf_docsis_tlv_snmpv3_kick_name = -1;
-static int hf_docsis_tlv_snmpv3_kick_publicnum = -1;
-static int hf_docsis_tlv_mfgr_cvc = -1;
-static int hf_docsis_tlv_cosign_cvc = -1;
-static int hf_docsis_tlv_vendor_id = -1;
-static int hf_docsis_tlv_sw_file = -1;
-static int hf_docsis_tlv_sw_upg_srvr = -1;
-static int hf_docsis_tlv_cpe_ethernet = -1;
-static int hf_docsis_tlv_modem_addr = -1;
-static int hf_docsis_tlv_rng_tech = -1;
-static int hf_docsis_tlv_subs_mgmt_ctrl = -1;
-static int hf_docsis_tlv_subs_mgmt_ip_table = -1;
-static int hf_docsis_tlv_subs_mgmt_ip_entry = -1;
-static int hf_docsis_tlv_subs_mgmt_filter_grps = -1;
-static int hf_docsis_tlv_snmpv3_ntfy_rcvr = -1;
-static int hf_docsis_tlv_enable_20_mode = -1;
-static int hf_docsis_tlv_enable_test_modes = -1;
-/* static int hf_docsis_tlv_ds_ch_list = -1; */
-static int hf_docsis_tlv_mc_mac_address = -1;
-/* static int hf_docsis_tlv_dut_filter = -1; */
-/* static int hf_docsis_tlv_tcc = -1; */
-/* static int hf_docsis_tlv_sid_cl = -1; */
-/* static int hf_docsis_tlv_rcp = -1; */
-/* static int hf_docsis_tlv_rcc = -1; */
-/* static int hf_docsis_tlv_dsid = -1; */
-/* static int hf_docsis_tlv_sec_assoc = -1; */
-static int hf_docsis_tlv_init_ch_timeout = -1;
-/* static int hf_docsis_tlv_ch_asgn = -1; */
-static int hf_docsis_tlv_cm_init_reason = -1;
-static int hf_docsis_tlv_sw_upg_srvr_ipv6 = -1;
-static int hf_docsis_tlv_tftp_prov_cm_ipv6_addr = -1;
-static int hf_docsis_tlv_us_drop_clfy = -1;
-static int hf_docsis_tlv_subs_mgmt_ipv6_lst = -1;
-static int hf_docsis_tlv_us_drop_clfy_group_id = -1;
-static int hf_docsis_tlv_subs_mgmt_ctrl_max_cpe_ipv6 = -1;
-/* static int hf_docsis_tlv_cmts_mc_sess_enc = -1; */
-
-static int hf_docsis_tlv_cos_id = -1;
-static int hf_docsis_tlv_cos_sid = -1;
-static int hf_docsis_tlv_cos_max_down = -1;
-static int hf_docsis_tlv_cos_max_up = -1;
-static int hf_docsis_tlv_cos_up_chnl_pri = -1;
-static int hf_docsis_tlv_cos_min_grntd_up = -1;
-static int hf_docsis_tlv_cos_max_up_burst = -1;
-static int hf_docsis_tlv_cos_privacy_enable = -1;
-
-static int hf_docsis_tlv_mcap_concat = -1;
-static int hf_docsis_tlv_mcap_docs_ver = -1;
-static int hf_docsis_tlv_mcap_frag = -1;
-static int hf_docsis_tlv_mcap_phs = -1;
-static int hf_docsis_tlv_mcap_igmp = -1;
-static int hf_docsis_tlv_mcap_down_said = -1;
-static int hf_docsis_tlv_mcap_up_sid = -1;
-static int hf_docsis_tlv_mcap_privacy = -1;
-static int hf_docsis_tlv_mcap_8021P_filter = -1;
-static int hf_docsis_tlv_mcap_8021Q_filter = -1;
-static int hf_docsis_tlv_mcap_xmit_eq_taps_per_sym = -1;
-static int hf_docsis_tlv_mcap_xmit_eq_taps = -1;
-static int hf_docsis_tlv_mcap_dcc = -1;
-static int hf_docsis_tlv_mcap_ip_filters = -1;
-static int hf_docsis_tlv_mcap_llc_filters = -1;
-static int hf_docsis_tlv_mcap_exp_unicast_sid = -1;
-static int hf_docsis_tlv_mcap_rnghoff_cm = -1;
-static int hf_docsis_tlv_mcap_rnghoff_erouter = -1;
-static int hf_docsis_tlv_mcap_rnghoff_emta = -1;
-static int hf_docsis_tlv_mcap_rnghoff_estb = -1;
-static int hf_docsis_tlv_mcap_l2vpn = -1;
-static int hf_docsis_tlv_mcap_l2vpn_esafe = -1;
-static int hf_docsis_tlv_mcap_dut_filtering = -1;
-static int hf_docsis_tlv_mcap_us_freq_range = -1;
-static int hf_docsis_tlv_mcap_us_srate_160 = -1;
-static int hf_docsis_tlv_mcap_us_srate_320 = -1;
-static int hf_docsis_tlv_mcap_us_srate_640 = -1;
-static int hf_docsis_tlv_mcap_us_srate_1280 = -1;
-static int hf_docsis_tlv_mcap_us_srate_2560 = -1;
-static int hf_docsis_tlv_mcap_us_srate_5120 = -1;
-static int hf_docsis_tlv_mcap_sac = -1;
-static int hf_docsis_tlv_mcap_code_hop_mode2 = -1;
-static int hf_docsis_tlv_mcap_mtc = -1;
-static int hf_docsis_tlv_mcap_512_msps_utc = -1;
-static int hf_docsis_tlv_mcap_256_msps_utc = -1;
-static int hf_docsis_tlv_mcap_total_sid_cluster = -1;
-static int hf_docsis_tlv_mcap_sid_per_sf = -1;
-static int hf_docsis_tlv_mcap_mrc = -1;
-static int hf_docsis_tlv_mcap_total_dsid = -1;
-static int hf_docsis_tlv_mcap_reseq_dsid = -1;
-static int hf_docsis_tlv_mcap_mc_dsid = -1;
-static int hf_docsis_tlv_mcap_mc_dsid_fwd = -1;
-static int hf_docsis_tlv_mcap_fctype_fwd = -1;
-static int hf_docsis_tlv_mcap_dpv_path = -1;
-static int hf_docsis_tlv_mcap_dpv_packet = -1;
-static int hf_docsis_tlv_mcap_ugs = -1;
-static int hf_docsis_tlv_mcap_map_ucd = -1;
-static int hf_docsis_tlv_mcap_udc = -1;
-static int hf_docsis_tlv_mcap_ipv6 = -1;
-static int hf_docsis_tlv_mcap_ext_us_trans_power = -1;
-static int hf_docsis_tlv_mcap_em = -1;
-static int hf_docsis_tlv_mcap_em_1x1 = -1;
-static int hf_docsis_tlv_mcap_em_light_sleep = -1;
-static int hf_docsis_tlv_mcap_cm_status_ack = -1;
-static int hf_docsis_tlv_mcap_em_pref = -1;
-static int hf_docsis_tlv_mcap_em_pref_1x1 = -1;
-static int hf_docsis_tlv_mcap_em_pref_dls = -1;
-static int hf_docsis_tlv_mcap_ext_pkt_len_sup_cap = -1;
-static int hf_docsis_tlv_mcap_ofdm_mult_recv_chan_sup = -1;
-static int hf_docsis_tlv_mcap_ofdma_mult_trans_chan_sup = -1;
-static int hf_docsis_tlv_mcap_down_ofdm_prof_sup = -1;
-static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup = -1;
-static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_reserved = -1;
-static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_qpsk = -1;
-static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_16qam = -1;
-static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_64qam = -1;
-static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_128qam = -1;
-static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_256qam = -1;
-static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_512qam = -1;
-static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_1024qam = -1;
-static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_2048qam = -1;
-static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_4096qam = -1;
-static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_8192qam = -1;
-static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_16384qam = -1;
-static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup = -1;
-static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_reserved = -1;
-static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_qpsk = -1;
-static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_8qam = -1;
-static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_16qam = -1;
-static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_32qam = -1;
-static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_64qam = -1;
-static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_128qam = -1;
-static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_256qam = -1;
-static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_512qam = -1;
-static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_1024qam = -1;
-static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_2048qam = -1;
-static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_4096qam = -1;
-static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_8192qam = -1;
-static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_16384qam = -1;
-static int hf_docsis_tlv_mcap_down_lower_band_edge_conf = -1;
-static int hf_docsis_tlv_mcap_down_lower_band_edge_conf_108 = -1;
-static int hf_docsis_tlv_mcap_down_lower_band_edge_conf_258 = -1;
-static int hf_docsis_tlv_mcap_down_upper_band_edge_conf = -1;
-static int hf_docsis_tlv_mcap_down_upper_band_edge_conf_1218 = -1;
-static int hf_docsis_tlv_mcap_down_upper_band_edge_conf_1794 = -1;
-static int hf_docsis_tlv_mcap_down_upper_band_edge_conf_1002 = -1;
-static int hf_docsis_tlv_mcap_dipl_up_upper_band_edge_conf = -1;
-static int hf_docsis_tlv_mcap_docsis_time_prot_mode = -1;
-static int hf_docsis_tlv_mcap_docsis_time_prot_perf_sup = -1;
-static int hf_docsis_tlv_mcap_pmax = -1;
-static int hf_docsis_tlv_mcap_dipl_down_lower_band_edge = -1;
-static int hf_docsis_tlv_mcap_dipl_down_lower_band_edge_108 = -1;
-static int hf_docsis_tlv_mcap_dipl_down_lower_band_edge_258 = -1;
-static int hf_docsis_tlv_mcap_dipl_down_upper_band_edge = -1;
-static int hf_docsis_tlv_mcap_dipl_down_upper_band_edge_1218 = -1;
-static int hf_docsis_tlv_mcap_dipl_down_upper_band_edge_1794 = -1;
-static int hf_docsis_tlv_mcap_dipl_down_upper_band_edge_1002 = -1;
-static int hf_docsis_tlv_mcap_dipl_up_upper_band_edge = -1;
-static int hf_docsis_tlv_mcap_dipl_up_upper_band_edge_42 = -1;
-static int hf_docsis_tlv_mcap_dipl_up_upper_band_edge_65 = -1;
-static int hf_docsis_tlv_mcap_dipl_up_upper_band_edge_85 = -1;
-static int hf_docsis_tlv_mcap_dipl_up_upper_band_edge_117 = -1;
-static int hf_docsis_tlv_mcap_dipl_up_upper_band_edge_204 = -1;
-static int hf_docsis_tlv_mcap_advanced_band_plan = -1;
-static int hf_docsis_tlv_mcap_advanced_band_plan_fdx_l = -1;
-static int hf_docsis_tlv_mcap_advanced_band_plan_fdx = -1;
-static int hf_docsis_tlv_mcap_advanced_band_plan_fdd = -1;
-static int hf_docsis_tlv_mcap_advanced_band_plan_reserved = -1;
-static int hf_docsis_tlv_mcap_ext_sf_cluster_assign_sup = -1;
-static int hf_docsis_tlv_mcap_low_latency_sup = -1;
-static int hf_docsis_tlv_mcap_adv_down_lower_band_edge_conf = -1;
-static int hf_docsis_tlv_mcap_adv_down_upper_band_edge_conf = -1;
-static int hf_docsis_tlv_mcap_adv_up_upper_band_edge_conf = -1;
-static int hf_docsis_tlv_mcap_adv_down_lower_band_edge_option = -1;
-static int hf_docsis_tlv_mcap_adv_down_upper_band_edge_option = -1;
-static int hf_docsis_tlv_mcap_adv_up_upper_band_edge_option = -1;
-static int hf_docsis_tlv_mcap_extended_power_options = -1;
-
-static int hf_docsis_tlv_clsfr_ref = -1;
-static int hf_docsis_tlv_clsfr_id = -1;
-static int hf_docsis_tlv_clsfr_sflow_ref = -1;
-static int hf_docsis_tlv_clsfr_sflow_id = -1;
-static int hf_docsis_tlv_clsfr_rule_pri = -1;
-static int hf_docsis_tlv_clsfr_act_state = -1;
-static int hf_docsis_tlv_clsfr_dsc_act = -1;
-/* static int hf_docsis_tlv_clsfr_err = -1; */
-/* static int hf_docsis_tlv_ipclsfr = -1; */
-/* static int hf_docsis_tlv_ethclsfr = -1; */
-/* static int hf_docsis_tlv_dot1qclsfr = -1; */
-
-static int hf_docsis_tlv_clsfr_vendor_spc = -1;
-
-static int hf_docsis_tlv_clsfr_err_param = -1;
-static int hf_docsis_tlv_clsfr_err_code = -1;
-static int hf_docsis_tlv_clsfr_err_msg = -1;
-
-static int hf_docsis_tlv_ipclsfr_tosmask = -1;
-static int hf_docsis_tlv_ipclsfr_ipproto = -1;
-static int hf_docsis_tlv_ipclsfr_src = -1;
-static int hf_docsis_tlv_ipclsfr_dst = -1;
-static int hf_docsis_tlv_ipclsfr_srcmask = -1;
-static int hf_docsis_tlv_ipclsfr_dstmask = -1;
-static int hf_docsis_tlv_ipclsfr_sport_start = -1;
-static int hf_docsis_tlv_ipclsfr_sport_end = -1;
-static int hf_docsis_tlv_ipclsfr_dport_start = -1;
-static int hf_docsis_tlv_ipclsfr_dport_end = -1;
-
-static int hf_docsis_tlv_ip6clsfr_tc_low = -1;
-static int hf_docsis_tlv_ip6clsfr_tc_high = -1;
-static int hf_docsis_tlv_ip6clsfr_tc_mask = -1;
-static int hf_docsis_tlv_ip6clsfr_flow_label = -1;
-static int hf_docsis_tlv_ip6clsfr_next_header = -1;
-static int hf_docsis_tlv_ip6clsfr_src = -1;
-static int hf_docsis_tlv_ip6clsfr_src_prefix_length = -1;
-static int hf_docsis_tlv_ip6clsfr_dst = -1;
-static int hf_docsis_tlv_ip6clsfr_dst_prefix_length = -1;
-
-static int hf_docsis_tlv_ethclsfr_dmac = -1;
-static int hf_docsis_tlv_ethclsfr_smac = -1;
-static int hf_docsis_tlv_ethclsfr_ethertype = -1;
-
-static int hf_docsis_tlv_dot1qclsfr_user_pri = -1;
-static int hf_docsis_tlv_dot1qclsfr_vlanid = -1;
-static int hf_docsis_tlv_dot1qclsfr_vendorspec = -1;
-
-static int hf_docsis_tlv_sflow_ref = -1;
-static int hf_docsis_tlv_sflow_id = -1;
-static int hf_docsis_tlv_sflow_sid = -1;
-static int hf_docsis_tlv_sflow_classname = -1;
-static int hf_docsis_tlv_sflow_qos_param = -1;
-/* static int hf_docsis_tlv_sflow_err = -1; */
-static int hf_docsis_tlv_sflow_traf_pri = -1;
-static int hf_docsis_tlv_sflow_max_sus = -1;
-static int hf_docsis_tlv_sflow_max_burst = -1;
-static int hf_docsis_tlv_sflow_min_traf = -1;
-static int hf_docsis_tlv_sflow_ass_min_pkt_size = -1;
-static int hf_docsis_tlv_sflow_timeout_active = -1;
-static int hf_docsis_tlv_sflow_timeout_admitted = -1;
-static int hf_docsis_tlv_sflow_peak_traffic_rate = -1;
-static int hf_docsis_tlv_sflow_req_attr_mask = -1;
-static int hf_docsis_tlv_sflow_forb_attr_mask = -1;
-static int hf_docsis_tlv_sflow_attr_aggr_rule_mask = -1;
-static int hf_docsis_tlv_sflow_vendor_spec = -1;
-static int hf_docsis_tlv_sflow_max_concat_burst = -1;
-static int hf_docsis_tlv_sflow_sched_type = -1;
-static int hf_docsis_tlv_sflow_reqxmit_pol = -1;
-static int hf_docsis_tlv_sflow_reqxmit_all_cm_broadcast = -1;
-static int hf_docsis_tlv_sflow_reqxmit_priority_multicast = -1;
-static int hf_docsis_tlv_sflow_reqxmit_req_data_requests = -1;
-static int hf_docsis_tlv_sflow_reqxmit_req_data_data = -1;
-static int hf_docsis_tlv_sflow_reqxmit_piggy_back = -1;
-static int hf_docsis_tlv_sflow_reqxmit_concatenate_data = -1;
-static int hf_docsis_tlv_sflow_reqxmit_fragment = -1;
-static int hf_docsis_tlv_sflow_reqxmit_suppress_payload = -1;
-static int hf_docsis_tlv_sflow_reqxmit_drop_packets = -1;
-static int hf_docsis_tlv_sflow_nominal_polling = -1;
-static int hf_docsis_tlv_sflow_tolerated_jitter = -1;
-static int hf_docsis_tlv_sflow_ugs_size = -1;
-static int hf_docsis_tlv_sflow_nom_grant_intvl = -1;
-static int hf_docsis_tlv_sflow_tol_grant_jitter = -1;
-static int hf_docsis_tlv_sflow_grants_per_intvl = -1;
-static int hf_docsis_tlv_sflow_ip_tos_overwrite = -1;
-static int hf_docsis_tlv_sflow_ugs_timeref = -1;
-static int hf_docsis_tlv_sflow_cont_req_backoff_window_mult = -1;
-static int hf_docsis_tlv_sflow_num_of_bytes_requested_mult = -1;
-static int hf_docsis_tlv_sflow_max_down_latency = -1;
-static int hf_docsis_tlv_sflow_down_reseq = -1;
-
-static int hf_docsis_tlv_sflow_err_param = -1;
-static int hf_docsis_tlv_sflow_err_code = -1;
-static int hf_docsis_tlv_sflow_err_msg = -1;
-
-static int hf_docsis_tlv_phs_class_ref = -1;
-static int hf_docsis_tlv_phs_class_id = -1;
-static int hf_docsis_tlv_phs_sflow_ref = -1;
-static int hf_docsis_tlv_phs_sflow_id = -1;
-static int hf_docsis_tlv_phs_dsc_action = -1;
-/* static int hf_docsis_tlv_phs_err = -1; */
-static int hf_docsis_tlv_phs_phsf = -1;
-static int hf_docsis_tlv_phs_phsm = -1;
-/* static int hf_docsis_tlv_phs_phsv = -1; */
-static int hf_docsis_tlv_phs_phsi = -1;
-static int hf_docsis_tlv_phs_phss = -1;
-static int hf_docsis_tlv_phs_dbc_action = -1;
-static int hf_docsis_tlv_phs_vendorspec = -1;
-
-static int hf_docsis_tlv_phs_err_param = -1;
-static int hf_docsis_tlv_phs_err_code = -1;
-static int hf_docsis_tlv_phs_err_msg = -1;
-
-/* static int hf_docsis_tlv_ds_ch_list_single = -1; */
-/* static int hf_docsis_tlv_ds_ch_list_range = -1; */
-static int hf_docsis_tlv_ds_ch_list_default_timeout = -1;
-
-static int hf_docsis_tlv_single_ch_timeout = -1;
-static int hf_docsis_tlv_single_ch_freq = -1;
-
-static int hf_docsis_tlv_freq_rng_timeout = -1;
-static int hf_docsis_tlv_freq_rng_start = -1;
-static int hf_docsis_tlv_freq_rng_end = -1;
-static int hf_docsis_tlv_freq_rng_step = -1;
-
-static int hf_docsis_tlv_dut_filter_control = -1;
-static int hf_docsis_tlv_dut_filter_cmim = -1;
-
-static int hf_docsis_tlv_tcc_refid = -1;
-static int hf_docsis_tlv_tcc_us_ch_action= -1;
-static int hf_docsis_tlv_tcc_us_ch_id= -1;
-static int hf_docsis_tlv_tcc_new_us_ch_id= -1;
-static int hf_docsis_tlv_tcc_ucd = -1;
-static int hf_docsis_tlv_tcc_rng_sid= -1;
-static int hf_docsis_tlv_tcc_init_tech= -1;
-/* static int hf_docsis_tlv_tcc_rng_parms= -1; */
-static int hf_docsis_tlv_tcc_dyn_rng_win= -1;
-static int hf_docsis_tlv_tcc_p_16hi = -1;
-static int hf_docsis_tlv_tcc_oudp_iuc = -1;
-static int hf_docsis_tlv_tcc_extended_drw = -1;
-static int hf_docsis_tlv_tcc_extended_us_rng_pwr = -1;
-static int hf_docsis_tlv_tcc_oudp_sounding_sid = -1;
-/* static int hf_docsis_tlv_tcc_err = -1; */
-
-static int hf_docsis_rng_parms_us_ch_id = -1;
-static int hf_docsis_rng_parms_time_off_int = -1;
-static int hf_docsis_rng_parms_time_off_frac = -1;
-static int hf_docsis_rng_parms_power_off = -1;
-static int hf_docsis_rng_parms_freq_off = -1;
-
-static int hf_docsis_tcc_err_subtype = -1;
-static int hf_docsis_tcc_err_code = -1;
-static int hf_docsis_tcc_err_msg = -1;
-
-static int hf_docsis_sid_cl_sf_id = -1;
-/* static int hf_docsis_sid_cl_enc = -1; */
-/* static int hf_docsis_sid_cl_so_crit = -1; */
-
-static int hf_docsis_sid_cl_enc_id = -1;
-/* static int hf_docsis_sid_cl_enc_map = -1; */
-
-static int hf_docsis_sid_cl_map_us_ch_id = -1;
-static int hf_docsis_sid_cl_map_sid = -1;
-static int hf_docsis_sid_cl_map_action = -1;
-
-static int hf_docsis_sid_cl_so_max_req = -1;
-static int hf_docsis_sid_cl_so_max_out_bytes = -1;
-static int hf_docsis_sid_cl_so_max_req_bytes = -1;
-static int hf_docsis_sid_cl_so_max_time = -1;
-
-static int hf_docsis_tlv_rcp_id = -1;
-static int hf_docsis_tlv_rcp_name = -1;
-static int hf_docsis_tlv_rcp_freq_spc = -1;
-/* static int hf_docsis_tlv_rcp_rcv_mod_enc = -1; */
-/* static int hf_docsis_tlv_rcp_rcv_ch = -1; */
-/* static int hf_docsis_tlv_rcp_ven_spec = -1; */
-
-static int hf_docsis_rcv_mod_enc_idx = -1;
-static int hf_docsis_rcv_mod_enc_adj_ch = -1;
-/* static int hf_docsis_rcv_mod_enc_ch_bl_rng = -1; */
-static int hf_docsis_rcv_mod_enc_ctr_freq_asgn = -1;
-static int hf_docsis_rcv_mod_enc_rsq_ch_subs_cap = -1;
-static int hf_docsis_rcv_mod_enc_conn = -1;
-static int hf_docsis_rcv_mod_enc_phy_layr_parms = -1;
-
-static int hf_docsis_rcc_rcv_mod_enc_idx = -1;
-static int hf_docsis_rcc_rcv_mod_enc_ctr_freq_asgn = -1;
-static int hf_docsis_rcc_rcv_mod_enc_conn = -1;
-
-static int hf_docsis_ch_bl_rng_min_ctr_freq = -1;
-static int hf_docsis_ch_bl_rng_max_ctr_freq = -1;
-
-static int hf_docsis_rcv_ch_idx = -1;
-static int hf_docsis_rcv_ch_conn = -1;
-static int hf_docsis_rcv_ch_conn_off = -1;
-static int hf_docsis_rcv_ch_prim_ds_ch_ind = -1;
-
-static int hf_docsis_rcc_rcv_ch_idx = -1;
-static int hf_docsis_rcc_rcv_ch_conn = -1;
-static int hf_docsis_rcc_rcv_ch_ctr_freq_asgn = -1;
-static int hf_docsis_rcc_rcv_ch_prim_ds_ch_ind = -1;
-
-static int hf_docsis_tlv_rcc_id = -1;
-static int hf_docsis_tlv_rcc_partial_serv_down_chan_id = -1;
-static int hf_docsis_tlv_rcc_srcc_prim_ds_chan_assign_ds_ch_id = -1;
-static int hf_docsis_tlv_rcc_srcc_ds_chan_assign_ds_ch_id = -1;
-static int hf_docsis_tlv_rcc_srcc_ds_prof_assign_dcid = -1;
-static int hf_docsis_tlv_rcc_srcc_ds_prof_asssign_prof_list_prof_id = -1;
-static int hf_docsis_tlv_rcc_prim_down_chan = -1;
-/* static int hf_docsis_tlv_rcc_rcv_mod_enc = -1; */
-/* static int hf_docsis_tlv_rcc_rcv_ch = -1; */
-/* static int hf_docsis_tlv_rcc_part_serv_ds_ch = -1; */
-/* static int hf_docsis_tlv_rcc_ven_spec = -1; */
-/* static int hf_docsis_tlv_rcc_err = -1; */
-
-static int hf_docsis_tlv_rcc_err_mod_or_ch = -1;
-static int hf_docsis_tlv_rcc_err_idx = -1;
-static int hf_docsis_tlv_rcc_err_param = -1;
-static int hf_docsis_tlv_rcc_err_code = -1;
-static int hf_docsis_tlv_rcc_err_msg = -1;
-
-static int hf_docsis_tlv_dsid_id = -1;
-static int hf_docsis_tlv_dsid_action = -1;
-/* static int hf_docsis_tlv_dsid_ds_reseq = -1; */
-/* static int hf_docsis_tlv_dsid_mc = -1; */
-
-static int hf_docsis_ds_reseq_dsid = -1;
-static int hf_docsis_ds_reseq_ch_lst = -1;
-static int hf_docsis_ds_reseq_wait_time = -1;
-static int hf_docsis_ds_reseq_warn_thresh = -1;
-static int hf_docsis_ds_reseq_ho_timer = -1;
-
-/* static int hf_docsis_tlv_dsid_mc_addr = -1; */
-static int hf_docsis_tlv_dsid_mc_cmim = -1;
-static int hf_docsis_tlv_dsid_mc_group = -1;
-/* static int hf_docsis_tlv_dsid_mc_phs = -1; */
-
-static int hf_docsis_mc_addr_action = -1;
-static int hf_docsis_mc_addr_addr = -1;
-
-static int hf_docsis_tlv_sec_assoc_action = -1;
-static int hf_docsis_tlv_sec_assoc_desc = -1;
-
-static int hf_docsis_ch_asgn_us_ch_id = -1;
-static int hf_docsis_ch_asgn_rx_freq = -1;
-
-static int hf_docsis_cmts_mc_sess_enc_grp = -1;
-static int hf_docsis_cmts_mc_sess_enc_src = -1;
-static int hf_docsis_cmts_mc_sess_enc_cmim = -1;
-
-static int hf_docsis_tlv_em_mode_ind = -1;
-
-static int hf_docsis_tlv_em_id_list_for_cm_em_id = -1;
-
-static int hf_docsis_tlv_fdx_reset = -1;
-
-static int hf_docsis_tlv_fdx_tg_assignment_tg_id = -1;
-static int hf_docsis_tlv_fdx_tg_assignment_rba_type = -1;
-
-static int hf_docsis_tlv_unknown = -1;
-static int hf_docsis_tlv_unknown_type = -1;
-static int hf_docsis_tlv_unknown_length = -1;
-static int hf_docsis_tlv_unknown_value = -1;
-
-
-static int hf_docsis_ucd_fragments = -1;
-static int hf_docsis_ucd_fragment = -1;
-static int hf_docsis_ucd_fragment_overlap = -1;
-static int hf_docsis_ucd_fragment_overlap_conflict = -1;
-static int hf_docsis_ucd_fragment_multiple_tails = -1;
-static int hf_docsis_ucd_fragment_too_long_fragment = -1;
-static int hf_docsis_ucd_fragment_error = -1;
-static int hf_docsis_ucd_fragment_count = -1;
-static int hf_docsis_ucd_reassembled_in = -1;
-static int hf_docsis_ucd_reassembled_length = -1;
-static int hf_docsis_ucd_reassembled_data = -1;
-
-static int hf_docsis_ucd_reassembled = -1;
+static int proto_docsis_tlv;
+static int hf_docsis_tlv_down_freq;
+static int hf_docsis_tlv_upstream_chid;
+static int hf_docsis_tlv_net_access;
+/* static int hf_docsis_tlv_cos; */
+/* static int hf_docsis_tlv_mcap; */
+static int hf_docsis_tlv_privacy_enable;
+static int hf_docsis_tlv_max_cpe;
+static int hf_docsis_tlv_max_classifiers;
+static int hf_docsis_tlv_snmp_access;
+static int hf_docsis_tlv_snmp_obj;
+static int hf_docsis_tlv_svc_unavail;
+static int hf_docsis_tlv_svc_unavail_classid;
+static int hf_docsis_tlv_svc_unavail_type;
+static int hf_docsis_tlv_svc_unavail_code;
+static int hf_docsis_tlv_bpi;
+/* static int hf_docsis_tlv_phs; */
+static int hf_docsis_tlv_hmac_digest;
+static int hf_docsis_tlv_tftp_server_timestamp;
+static int hf_docsis_tlv_tftp_prov_modem_address;
+/* static int hf_docsis_tlv_upclsfr; */
+/* static int hf_docsis_tlv_downclsfr; */
+/* static int hf_docsis_tlv_upsflow; */
+/* static int hf_docsis_tlv_downsflow; */
+/* static int hf_docsis_tlv_vendor_spec; */
+static int hf_docsis_tlv_cm_mic;
+static int hf_docsis_tlv_cmts_mic;
+static int hf_docsis_tlv_auth_block;
+static int hf_docsis_tlv_key_seq_num;
+static int hf_docsis_tlv_snmpv3_kick;
+static int hf_docsis_tlv_snmpv3_kick_name;
+static int hf_docsis_tlv_snmpv3_kick_publicnum;
+static int hf_docsis_tlv_mfgr_cvc;
+static int hf_docsis_tlv_cosign_cvc;
+static int hf_docsis_tlv_vendor_id;
+static int hf_docsis_tlv_sw_file;
+static int hf_docsis_tlv_sw_upg_srvr;
+static int hf_docsis_tlv_cpe_ethernet;
+static int hf_docsis_tlv_modem_addr;
+static int hf_docsis_tlv_rng_tech;
+static int hf_docsis_tlv_subs_mgmt_ctrl;
+static int hf_docsis_tlv_subs_mgmt_ip_table;
+static int hf_docsis_tlv_subs_mgmt_ip_entry;
+static int hf_docsis_tlv_subs_mgmt_filter_grps;
+static int hf_docsis_tlv_snmpv3_ntfy_rcvr;
+static int hf_docsis_tlv_enable_20_mode;
+static int hf_docsis_tlv_enable_test_modes;
+/* static int hf_docsis_tlv_ds_ch_list; */
+static int hf_docsis_tlv_mc_mac_address;
+/* static int hf_docsis_tlv_dut_filter; */
+/* static int hf_docsis_tlv_tcc; */
+/* static int hf_docsis_tlv_sid_cl; */
+/* static int hf_docsis_tlv_rcp; */
+/* static int hf_docsis_tlv_rcc; */
+/* static int hf_docsis_tlv_dsid; */
+/* static int hf_docsis_tlv_sec_assoc; */
+static int hf_docsis_tlv_init_ch_timeout;
+/* static int hf_docsis_tlv_ch_asgn; */
+static int hf_docsis_tlv_cm_init_reason;
+static int hf_docsis_tlv_sw_upg_srvr_ipv6;
+static int hf_docsis_tlv_tftp_prov_cm_ipv6_addr;
+static int hf_docsis_tlv_us_drop_clfy;
+static int hf_docsis_tlv_subs_mgmt_ipv6_lst;
+static int hf_docsis_tlv_us_drop_clfy_group_id;
+static int hf_docsis_tlv_subs_mgmt_ctrl_max_cpe_ipv6;
+/* static int hf_docsis_tlv_cmts_mc_sess_enc; */
+
+static int hf_docsis_tlv_cos_id;
+static int hf_docsis_tlv_cos_sid;
+static int hf_docsis_tlv_cos_max_down;
+static int hf_docsis_tlv_cos_max_up;
+static int hf_docsis_tlv_cos_up_chnl_pri;
+static int hf_docsis_tlv_cos_min_grntd_up;
+static int hf_docsis_tlv_cos_max_up_burst;
+static int hf_docsis_tlv_cos_privacy_enable;
+
+static int hf_docsis_tlv_mcap_concat;
+static int hf_docsis_tlv_mcap_docs_ver;
+static int hf_docsis_tlv_mcap_frag;
+static int hf_docsis_tlv_mcap_phs;
+static int hf_docsis_tlv_mcap_igmp;
+static int hf_docsis_tlv_mcap_down_said;
+static int hf_docsis_tlv_mcap_up_sid;
+static int hf_docsis_tlv_mcap_privacy;
+static int hf_docsis_tlv_mcap_8021P_filter;
+static int hf_docsis_tlv_mcap_8021Q_filter;
+static int hf_docsis_tlv_mcap_xmit_eq_taps_per_sym;
+static int hf_docsis_tlv_mcap_xmit_eq_taps;
+static int hf_docsis_tlv_mcap_dcc;
+static int hf_docsis_tlv_mcap_ip_filters;
+static int hf_docsis_tlv_mcap_llc_filters;
+static int hf_docsis_tlv_mcap_exp_unicast_sid;
+static int hf_docsis_tlv_mcap_rnghoff_cm;
+static int hf_docsis_tlv_mcap_rnghoff_erouter;
+static int hf_docsis_tlv_mcap_rnghoff_emta;
+static int hf_docsis_tlv_mcap_rnghoff_estb;
+static int hf_docsis_tlv_mcap_l2vpn;
+static int hf_docsis_tlv_mcap_l2vpn_esafe;
+static int hf_docsis_tlv_mcap_dut_filtering;
+static int hf_docsis_tlv_mcap_us_freq_range;
+static int hf_docsis_tlv_mcap_us_srate_160;
+static int hf_docsis_tlv_mcap_us_srate_320;
+static int hf_docsis_tlv_mcap_us_srate_640;
+static int hf_docsis_tlv_mcap_us_srate_1280;
+static int hf_docsis_tlv_mcap_us_srate_2560;
+static int hf_docsis_tlv_mcap_us_srate_5120;
+static int hf_docsis_tlv_mcap_sac;
+static int hf_docsis_tlv_mcap_code_hop_mode2;
+static int hf_docsis_tlv_mcap_mtc;
+static int hf_docsis_tlv_mcap_512_msps_utc;
+static int hf_docsis_tlv_mcap_256_msps_utc;
+static int hf_docsis_tlv_mcap_total_sid_cluster;
+static int hf_docsis_tlv_mcap_sid_per_sf;
+static int hf_docsis_tlv_mcap_mrc;
+static int hf_docsis_tlv_mcap_total_dsid;
+static int hf_docsis_tlv_mcap_reseq_dsid;
+static int hf_docsis_tlv_mcap_mc_dsid;
+static int hf_docsis_tlv_mcap_mc_dsid_fwd;
+static int hf_docsis_tlv_mcap_fctype_fwd;
+static int hf_docsis_tlv_mcap_dpv_path;
+static int hf_docsis_tlv_mcap_dpv_packet;
+static int hf_docsis_tlv_mcap_ugs;
+static int hf_docsis_tlv_mcap_map_ucd;
+static int hf_docsis_tlv_mcap_udc;
+static int hf_docsis_tlv_mcap_ipv6;
+static int hf_docsis_tlv_mcap_ext_us_trans_power;
+static int hf_docsis_tlv_mcap_em;
+static int hf_docsis_tlv_mcap_em_1x1;
+static int hf_docsis_tlv_mcap_em_light_sleep;
+static int hf_docsis_tlv_mcap_cm_status_ack;
+static int hf_docsis_tlv_mcap_em_pref;
+static int hf_docsis_tlv_mcap_em_pref_1x1;
+static int hf_docsis_tlv_mcap_em_pref_dls;
+static int hf_docsis_tlv_mcap_ext_pkt_len_sup_cap;
+static int hf_docsis_tlv_mcap_ofdm_mult_recv_chan_sup;
+static int hf_docsis_tlv_mcap_ofdma_mult_trans_chan_sup;
+static int hf_docsis_tlv_mcap_down_ofdm_prof_sup;
+static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup;
+static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_reserved;
+static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_qpsk;
+static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_16qam;
+static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_64qam;
+static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_128qam;
+static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_256qam;
+static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_512qam;
+static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_1024qam;
+static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_2048qam;
+static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_4096qam;
+static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_8192qam;
+static int hf_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup_16384qam;
+static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup;
+static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_reserved;
+static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_qpsk;
+static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_8qam;
+static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_16qam;
+static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_32qam;
+static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_64qam;
+static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_128qam;
+static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_256qam;
+static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_512qam;
+static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_1024qam;
+static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_2048qam;
+static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_4096qam;
+static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_8192qam;
+static int hf_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup_16384qam;
+static int hf_docsis_tlv_mcap_down_lower_band_edge_conf;
+static int hf_docsis_tlv_mcap_down_lower_band_edge_conf_108;
+static int hf_docsis_tlv_mcap_down_lower_band_edge_conf_258;
+static int hf_docsis_tlv_mcap_down_upper_band_edge_conf;
+static int hf_docsis_tlv_mcap_down_upper_band_edge_conf_1218;
+static int hf_docsis_tlv_mcap_down_upper_band_edge_conf_1794;
+static int hf_docsis_tlv_mcap_down_upper_band_edge_conf_1002;
+static int hf_docsis_tlv_mcap_dipl_up_upper_band_edge_conf;
+static int hf_docsis_tlv_mcap_docsis_time_prot_mode;
+static int hf_docsis_tlv_mcap_docsis_time_prot_perf_sup;
+static int hf_docsis_tlv_mcap_pmax;
+static int hf_docsis_tlv_mcap_dipl_down_lower_band_edge;
+static int hf_docsis_tlv_mcap_dipl_down_lower_band_edge_108;
+static int hf_docsis_tlv_mcap_dipl_down_lower_band_edge_258;
+static int hf_docsis_tlv_mcap_dipl_down_upper_band_edge;
+static int hf_docsis_tlv_mcap_dipl_down_upper_band_edge_1218;
+static int hf_docsis_tlv_mcap_dipl_down_upper_band_edge_1794;
+static int hf_docsis_tlv_mcap_dipl_down_upper_band_edge_1002;
+static int hf_docsis_tlv_mcap_dipl_up_upper_band_edge;
+static int hf_docsis_tlv_mcap_dipl_up_upper_band_edge_42;
+static int hf_docsis_tlv_mcap_dipl_up_upper_band_edge_65;
+static int hf_docsis_tlv_mcap_dipl_up_upper_band_edge_85;
+static int hf_docsis_tlv_mcap_dipl_up_upper_band_edge_117;
+static int hf_docsis_tlv_mcap_dipl_up_upper_band_edge_204;
+static int hf_docsis_tlv_mcap_advanced_band_plan;
+static int hf_docsis_tlv_mcap_advanced_band_plan_fdx_l;
+static int hf_docsis_tlv_mcap_advanced_band_plan_fdx;
+static int hf_docsis_tlv_mcap_advanced_band_plan_fdd;
+static int hf_docsis_tlv_mcap_advanced_band_plan_reserved;
+static int hf_docsis_tlv_mcap_ext_sf_cluster_assign_sup;
+static int hf_docsis_tlv_mcap_low_latency_sup;
+static int hf_docsis_tlv_mcap_adv_down_lower_band_edge_conf;
+static int hf_docsis_tlv_mcap_adv_down_upper_band_edge_conf;
+static int hf_docsis_tlv_mcap_adv_up_upper_band_edge_conf;
+static int hf_docsis_tlv_mcap_adv_down_lower_band_edge_option;
+static int hf_docsis_tlv_mcap_adv_down_upper_band_edge_option;
+static int hf_docsis_tlv_mcap_adv_up_upper_band_edge_option;
+static int hf_docsis_tlv_mcap_extended_power_options;
+
+static int hf_docsis_tlv_clsfr_ref;
+static int hf_docsis_tlv_clsfr_id;
+static int hf_docsis_tlv_clsfr_sflow_ref;
+static int hf_docsis_tlv_clsfr_sflow_id;
+static int hf_docsis_tlv_clsfr_rule_pri;
+static int hf_docsis_tlv_clsfr_act_state;
+static int hf_docsis_tlv_clsfr_dsc_act;
+/* static int hf_docsis_tlv_clsfr_err; */
+/* static int hf_docsis_tlv_ipclsfr; */
+/* static int hf_docsis_tlv_ethclsfr; */
+/* static int hf_docsis_tlv_dot1qclsfr; */
+
+static int hf_docsis_tlv_clsfr_vendor_spc;
+
+static int hf_docsis_tlv_clsfr_err_param;
+static int hf_docsis_tlv_clsfr_err_code;
+static int hf_docsis_tlv_clsfr_err_msg;
+
+static int hf_docsis_tlv_ipclsfr_tosmask;
+static int hf_docsis_tlv_ipclsfr_ipproto;
+static int hf_docsis_tlv_ipclsfr_src;
+static int hf_docsis_tlv_ipclsfr_dst;
+static int hf_docsis_tlv_ipclsfr_srcmask;
+static int hf_docsis_tlv_ipclsfr_dstmask;
+static int hf_docsis_tlv_ipclsfr_sport_start;
+static int hf_docsis_tlv_ipclsfr_sport_end;
+static int hf_docsis_tlv_ipclsfr_dport_start;
+static int hf_docsis_tlv_ipclsfr_dport_end;
+
+static int hf_docsis_tlv_ip6clsfr_tc_low;
+static int hf_docsis_tlv_ip6clsfr_tc_high;
+static int hf_docsis_tlv_ip6clsfr_tc_mask;
+static int hf_docsis_tlv_ip6clsfr_flow_label;
+static int hf_docsis_tlv_ip6clsfr_next_header;
+static int hf_docsis_tlv_ip6clsfr_src;
+static int hf_docsis_tlv_ip6clsfr_src_prefix_length;
+static int hf_docsis_tlv_ip6clsfr_dst;
+static int hf_docsis_tlv_ip6clsfr_dst_prefix_length;
+
+static int hf_docsis_tlv_ethclsfr_dmac;
+static int hf_docsis_tlv_ethclsfr_smac;
+static int hf_docsis_tlv_ethclsfr_ethertype;
+
+static int hf_docsis_tlv_dot1qclsfr_user_pri;
+static int hf_docsis_tlv_dot1qclsfr_vlanid;
+static int hf_docsis_tlv_dot1qclsfr_vendorspec;
+
+static int hf_docsis_tlv_sflow_ref;
+static int hf_docsis_tlv_sflow_id;
+static int hf_docsis_tlv_sflow_sid;
+static int hf_docsis_tlv_sflow_classname;
+static int hf_docsis_tlv_sflow_qos_param;
+/* static int hf_docsis_tlv_sflow_err; */
+static int hf_docsis_tlv_sflow_traf_pri;
+static int hf_docsis_tlv_sflow_max_sus;
+static int hf_docsis_tlv_sflow_max_burst;
+static int hf_docsis_tlv_sflow_min_traf;
+static int hf_docsis_tlv_sflow_ass_min_pkt_size;
+static int hf_docsis_tlv_sflow_timeout_active;
+static int hf_docsis_tlv_sflow_timeout_admitted;
+static int hf_docsis_tlv_sflow_peak_traffic_rate;
+static int hf_docsis_tlv_sflow_req_attr_mask;
+static int hf_docsis_tlv_sflow_forb_attr_mask;
+static int hf_docsis_tlv_sflow_attr_aggr_rule_mask;
+static int hf_docsis_tlv_sflow_vendor_spec;
+static int hf_docsis_tlv_sflow_max_concat_burst;
+static int hf_docsis_tlv_sflow_sched_type;
+static int hf_docsis_tlv_sflow_reqxmit_pol;
+static int hf_docsis_tlv_sflow_reqxmit_all_cm_broadcast;
+static int hf_docsis_tlv_sflow_reqxmit_priority_multicast;
+static int hf_docsis_tlv_sflow_reqxmit_req_data_requests;
+static int hf_docsis_tlv_sflow_reqxmit_req_data_data;
+static int hf_docsis_tlv_sflow_reqxmit_piggy_back;
+static int hf_docsis_tlv_sflow_reqxmit_concatenate_data;
+static int hf_docsis_tlv_sflow_reqxmit_fragment;
+static int hf_docsis_tlv_sflow_reqxmit_suppress_payload;
+static int hf_docsis_tlv_sflow_reqxmit_drop_packets;
+static int hf_docsis_tlv_sflow_nominal_polling;
+static int hf_docsis_tlv_sflow_tolerated_jitter;
+static int hf_docsis_tlv_sflow_ugs_size;
+static int hf_docsis_tlv_sflow_nom_grant_intvl;
+static int hf_docsis_tlv_sflow_tol_grant_jitter;
+static int hf_docsis_tlv_sflow_grants_per_intvl;
+static int hf_docsis_tlv_sflow_ip_tos_overwrite;
+static int hf_docsis_tlv_sflow_ugs_timeref;
+static int hf_docsis_tlv_sflow_cont_req_backoff_window_mult;
+static int hf_docsis_tlv_sflow_num_of_bytes_requested_mult;
+static int hf_docsis_tlv_sflow_max_down_latency;
+static int hf_docsis_tlv_sflow_down_reseq;
+
+static int hf_docsis_tlv_sflow_err_param;
+static int hf_docsis_tlv_sflow_err_code;
+static int hf_docsis_tlv_sflow_err_msg;
+
+static int hf_docsis_tlv_phs_class_ref;
+static int hf_docsis_tlv_phs_class_id;
+static int hf_docsis_tlv_phs_sflow_ref;
+static int hf_docsis_tlv_phs_sflow_id;
+static int hf_docsis_tlv_phs_dsc_action;
+/* static int hf_docsis_tlv_phs_err; */
+static int hf_docsis_tlv_phs_phsf;
+static int hf_docsis_tlv_phs_phsm;
+/* static int hf_docsis_tlv_phs_phsv; */
+static int hf_docsis_tlv_phs_phsi;
+static int hf_docsis_tlv_phs_phss;
+static int hf_docsis_tlv_phs_dbc_action;
+static int hf_docsis_tlv_phs_vendorspec;
+
+static int hf_docsis_tlv_phs_err_param;
+static int hf_docsis_tlv_phs_err_code;
+static int hf_docsis_tlv_phs_err_msg;
+
+/* static int hf_docsis_tlv_ds_ch_list_single; */
+/* static int hf_docsis_tlv_ds_ch_list_range; */
+static int hf_docsis_tlv_ds_ch_list_default_timeout;
+
+static int hf_docsis_tlv_single_ch_timeout;
+static int hf_docsis_tlv_single_ch_freq;
+
+static int hf_docsis_tlv_freq_rng_timeout;
+static int hf_docsis_tlv_freq_rng_start;
+static int hf_docsis_tlv_freq_rng_end;
+static int hf_docsis_tlv_freq_rng_step;
+
+static int hf_docsis_tlv_dut_filter_control;
+static int hf_docsis_tlv_dut_filter_cmim;
+
+static int hf_docsis_tlv_tcc_refid;
+static int hf_docsis_tlv_tcc_us_ch_action;
+static int hf_docsis_tlv_tcc_us_ch_id;
+static int hf_docsis_tlv_tcc_new_us_ch_id;
+static int hf_docsis_tlv_tcc_ucd;
+static int hf_docsis_tlv_tcc_rng_sid;
+static int hf_docsis_tlv_tcc_init_tech;
+/* static int hf_docsis_tlv_tcc_rng_parms; */
+static int hf_docsis_tlv_tcc_dyn_rng_win;
+static int hf_docsis_tlv_tcc_p_16hi;
+static int hf_docsis_tlv_tcc_oudp_iuc;
+static int hf_docsis_tlv_tcc_extended_drw;
+static int hf_docsis_tlv_tcc_extended_us_rng_pwr;
+static int hf_docsis_tlv_tcc_oudp_sounding_sid;
+/* static int hf_docsis_tlv_tcc_err; */
+
+static int hf_docsis_rng_parms_us_ch_id;
+static int hf_docsis_rng_parms_time_off_int;
+static int hf_docsis_rng_parms_time_off_frac;
+static int hf_docsis_rng_parms_power_off;
+static int hf_docsis_rng_parms_freq_off;
+
+static int hf_docsis_tcc_err_subtype;
+static int hf_docsis_tcc_err_code;
+static int hf_docsis_tcc_err_msg;
+
+static int hf_docsis_sid_cl_sf_id;
+/* static int hf_docsis_sid_cl_enc; */
+/* static int hf_docsis_sid_cl_so_crit; */
+
+static int hf_docsis_sid_cl_enc_id;
+/* static int hf_docsis_sid_cl_enc_map; */
+
+static int hf_docsis_sid_cl_map_us_ch_id;
+static int hf_docsis_sid_cl_map_sid;
+static int hf_docsis_sid_cl_map_action;
+
+static int hf_docsis_sid_cl_so_max_req;
+static int hf_docsis_sid_cl_so_max_out_bytes;
+static int hf_docsis_sid_cl_so_max_req_bytes;
+static int hf_docsis_sid_cl_so_max_time;
+
+static int hf_docsis_tlv_rcp_id;
+static int hf_docsis_tlv_rcp_name;
+static int hf_docsis_tlv_rcp_freq_spc;
+/* static int hf_docsis_tlv_rcp_rcv_mod_enc; */
+/* static int hf_docsis_tlv_rcp_rcv_ch; */
+/* static int hf_docsis_tlv_rcp_ven_spec; */
+
+static int hf_docsis_rcv_mod_enc_idx;
+static int hf_docsis_rcv_mod_enc_adj_ch;
+/* static int hf_docsis_rcv_mod_enc_ch_bl_rng; */
+static int hf_docsis_rcv_mod_enc_ctr_freq_asgn;
+static int hf_docsis_rcv_mod_enc_rsq_ch_subs_cap;
+static int hf_docsis_rcv_mod_enc_conn;
+static int hf_docsis_rcv_mod_enc_phy_layr_parms;
+
+static int hf_docsis_rcc_rcv_mod_enc_idx;
+static int hf_docsis_rcc_rcv_mod_enc_ctr_freq_asgn;
+static int hf_docsis_rcc_rcv_mod_enc_conn;
+
+static int hf_docsis_ch_bl_rng_min_ctr_freq;
+static int hf_docsis_ch_bl_rng_max_ctr_freq;
+
+static int hf_docsis_rcv_ch_idx;
+static int hf_docsis_rcv_ch_conn;
+static int hf_docsis_rcv_ch_conn_off;
+static int hf_docsis_rcv_ch_prim_ds_ch_ind;
+
+static int hf_docsis_rcc_rcv_ch_idx;
+static int hf_docsis_rcc_rcv_ch_conn;
+static int hf_docsis_rcc_rcv_ch_ctr_freq_asgn;
+static int hf_docsis_rcc_rcv_ch_prim_ds_ch_ind;
+
+static int hf_docsis_tlv_rcc_id;
+static int hf_docsis_tlv_rcc_partial_serv_down_chan_id;
+static int hf_docsis_tlv_rcc_srcc_prim_ds_chan_assign_ds_ch_id;
+static int hf_docsis_tlv_rcc_srcc_ds_chan_assign_ds_ch_id;
+static int hf_docsis_tlv_rcc_srcc_ds_prof_assign_dcid;
+static int hf_docsis_tlv_rcc_srcc_ds_prof_asssign_prof_list_prof_id;
+static int hf_docsis_tlv_rcc_prim_down_chan;
+/* static int hf_docsis_tlv_rcc_rcv_mod_enc; */
+/* static int hf_docsis_tlv_rcc_rcv_ch; */
+/* static int hf_docsis_tlv_rcc_part_serv_ds_ch; */
+/* static int hf_docsis_tlv_rcc_ven_spec; */
+/* static int hf_docsis_tlv_rcc_err; */
+
+static int hf_docsis_tlv_rcc_err_mod_or_ch;
+static int hf_docsis_tlv_rcc_err_idx;
+static int hf_docsis_tlv_rcc_err_param;
+static int hf_docsis_tlv_rcc_err_code;
+static int hf_docsis_tlv_rcc_err_msg;
+
+static int hf_docsis_tlv_dsid_id;
+static int hf_docsis_tlv_dsid_action;
+/* static int hf_docsis_tlv_dsid_ds_reseq; */
+/* static int hf_docsis_tlv_dsid_mc; */
+
+static int hf_docsis_ds_reseq_dsid;
+static int hf_docsis_ds_reseq_ch_lst;
+static int hf_docsis_ds_reseq_wait_time;
+static int hf_docsis_ds_reseq_warn_thresh;
+static int hf_docsis_ds_reseq_ho_timer;
+
+/* static int hf_docsis_tlv_dsid_mc_addr; */
+static int hf_docsis_tlv_dsid_mc_cmim;
+static int hf_docsis_tlv_dsid_mc_group;
+/* static int hf_docsis_tlv_dsid_mc_phs; */
+
+static int hf_docsis_mc_addr_action;
+static int hf_docsis_mc_addr_addr;
+
+static int hf_docsis_tlv_sec_assoc_action;
+static int hf_docsis_tlv_sec_assoc_desc;
+
+static int hf_docsis_ch_asgn_us_ch_id;
+static int hf_docsis_ch_asgn_rx_freq;
+
+static int hf_docsis_cmts_mc_sess_enc_grp;
+static int hf_docsis_cmts_mc_sess_enc_src;
+static int hf_docsis_cmts_mc_sess_enc_cmim;
+
+static int hf_docsis_tlv_em_mode_ind;
+
+static int hf_docsis_tlv_em_id_list_for_cm_em_id;
+
+static int hf_docsis_tlv_fdx_reset;
+
+static int hf_docsis_tlv_fdx_tg_assignment_tg_id;
+static int hf_docsis_tlv_fdx_tg_assignment_rba_type;
+
+static int hf_docsis_tlv_unknown;
+static int hf_docsis_tlv_unknown_type;
+static int hf_docsis_tlv_unknown_length;
+static int hf_docsis_tlv_unknown_value;
+
+
+static int hf_docsis_ucd_fragments;
+static int hf_docsis_ucd_fragment;
+static int hf_docsis_ucd_fragment_overlap;
+static int hf_docsis_ucd_fragment_overlap_conflict;
+static int hf_docsis_ucd_fragment_multiple_tails;
+static int hf_docsis_ucd_fragment_too_long_fragment;
+static int hf_docsis_ucd_fragment_error;
+static int hf_docsis_ucd_fragment_count;
+static int hf_docsis_ucd_reassembled_in;
+static int hf_docsis_ucd_reassembled_length;
+static int hf_docsis_ucd_reassembled_data;
+
+static int hf_docsis_ucd_reassembled;
 
 
 /* Initialize the subtree pointers */
-static gint ett_docsis_tlv = -1;
-static gint ett_docsis_tlv_cos = -1;
-static gint ett_docsis_tlv_mcap = -1;
-static gint ett_docsis_tlv_mcap_em = -1;
-static gint ett_docsis_tlv_mcap_em_pref = -1;
-static gint ett_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup = -1;
-static gint ett_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup = -1;
-static gint ett_docsis_tlv_mcap_down_lower_band_edge_conf = -1;
-static gint ett_docsis_tlv_mcap_down_upper_band_edge_conf = -1;
-static gint ett_docsis_tlv_mcap_dipl_down_lower_band_edge = -1;
-static gint ett_docsis_tlv_mcap_dipl_down_upper_band_edge = -1;
-static gint ett_docsis_tlv_mcap_dipl_up_upper_band_edge = -1;
-static gint ett_docsis_tlv_mcap_advanced_band_plan = -1;
-static gint ett_docsis_tlv_mcap_dipl_down_lower_band_edge_options_list = -1;
-static gint ett_docsis_tlv_mcap_dipl_down_upper_band_edge_options_list = -1;
-static gint ett_docsis_tlv_mcap_dipl_up_upper_band_edge_options_list = -1;
-static gint ett_docsis_tlv_clsfr = -1;
-static gint ett_docsis_tlv_clsfr_ip = -1;
-static gint ett_docsis_tlv_clsfr_ip6 = -1;
-static gint ett_docsis_tlv_clsfr_ip6_tc = -1;
-static gint ett_docsis_tlv_clsfr_eth = -1;
-static gint ett_docsis_tlv_clsfr_err = -1;
-static gint ett_docsis_tlv_phs = -1;
-static gint ett_docsis_tlv_phs_err = -1;
-static gint ett_docsis_tlv_clsfr_dot1q = -1;
-static gint ett_docsis_tlv_reqxmitpol = -1;
-static gint ett_docsis_tlv_sflow_err = -1;
-static gint ett_docsis_tlv_svc_unavail = -1;
-static gint ett_docsis_tlv_snmpv3_kick = -1;
-static gint ett_docsis_tlv_ds_ch_list = -1;
-static gint ett_docsis_tlv_ds_ch_list_single = -1;
-static gint ett_docsis_tlv_ds_ch_list_range = -1;
-static gint ett_docsis_tlv_ext_field = -1;
-static gint ett_docsis_tlv_vendor_specific_cap = -1;
-static gint ett_docsis_tlv_dut_filter = -1;
-static gint ett_docsis_tlv_tcc = -1;
-static gint ett_docsis_tlv_tcc_ucd = -1;
-static gint ett_docsis_tlv_tcc_rng_parms = -1;
-static gint ett_docsis_tlv_tcc_oudp = -1;
-static gint ett_docsis_tlv_tcc_err = -1;
-static gint ett_docsis_tlv_sid_cl = -1;
-static gint ett_docsis_tlv_sid_cl_enc = -1;
-static gint ett_docsis_tlv_sid_cl_enc_map = -1;
-static gint ett_docsis_tlv_sid_cl_so = -1;
-static gint ett_docsis_tlv_rcp = -1;
-static gint ett_docsis_tlv_rcp_rcv_mod_enc = -1;
-static gint ett_docsis_tlv_rcp_ch_bl_rng = -1;
-static gint ett_docsis_tlv_rcp_rcv_ch = -1;
-static gint ett_docsis_tlv_rcc = -1;
-static gint ett_docsis_tlv_rcc_rcv_mod_enc = -1;
-static gint ett_docsis_tlv_rcc_rcv_ch = -1;
-static gint ett_docsis_tlv_rcc_partial_serv_down_chan = -1;
-static gint ett_docsis_tlv_rcc_srcc = -1;
-static gint ett_docsis_tlv_rcc_srcc_prim_ds_assign = -1;
-static gint ett_docsis_tlv_rcc_srcc_ds_assign = -1;
-static gint ett_docsis_tlv_rcc_srcc_ds_prof_assign = -1;
-static gint ett_docsis_tlv_rcc_srcc_ds_prof_assign_prof_list = -1;
-static gint ett_docsis_tlv_rcc_err = -1;
-static gint ett_docsis_tlv_dsid = -1;
-static gint ett_docsis_tlv_dsid_ds_reseq = -1;
-static gint ett_docsis_tlv_dsid_mc = -1;
-static gint ett_docsis_tlv_dsid_mc_addr = -1;
-static gint ett_docsis_tlv_sec_assoc = -1;
-static gint ett_docsis_tlv_ch_asgn = -1;
-static gint ett_docsis_cmts_mc_sess_enc = -1;
-static gint ett_docsis_em_id_list_for_cm = -1;
-static gint ett_docsis_tlv_tg_assignment = -1;
-static gint ett_docsis_tlv_unknown = -1;
-static gint ett_docsis_ucd_fragments = -1;
-static gint ett_docsis_ucd_fragment = -1;
-static gint ett_docsis_ucd_reassembled = -1;
-
-
-static expert_field ei_docsis_tlv_tlvlen_bad = EI_INIT;
-static expert_field ei_docsis_tlv_tlvval_bad = EI_INIT;
+static gint ett_docsis_tlv;
+static gint ett_docsis_tlv_cos;
+static gint ett_docsis_tlv_mcap;
+static gint ett_docsis_tlv_mcap_em;
+static gint ett_docsis_tlv_mcap_em_pref;
+static gint ett_docsis_tlv_mcap_ofdm_chan_subc_qam_mod_sup;
+static gint ett_docsis_tlv_mcap_ofdma_chan_subc_qam_mod_sup;
+static gint ett_docsis_tlv_mcap_down_lower_band_edge_conf;
+static gint ett_docsis_tlv_mcap_down_upper_band_edge_conf;
+static gint ett_docsis_tlv_mcap_dipl_down_lower_band_edge;
+static gint ett_docsis_tlv_mcap_dipl_down_upper_band_edge;
+static gint ett_docsis_tlv_mcap_dipl_up_upper_band_edge;
+static gint ett_docsis_tlv_mcap_advanced_band_plan;
+static gint ett_docsis_tlv_mcap_dipl_down_lower_band_edge_options_list;
+static gint ett_docsis_tlv_mcap_dipl_down_upper_band_edge_options_list;
+static gint ett_docsis_tlv_mcap_dipl_up_upper_band_edge_options_list;
+static gint ett_docsis_tlv_clsfr;
+static gint ett_docsis_tlv_clsfr_ip;
+static gint ett_docsis_tlv_clsfr_ip6;
+static gint ett_docsis_tlv_clsfr_ip6_tc;
+static gint ett_docsis_tlv_clsfr_eth;
+static gint ett_docsis_tlv_clsfr_err;
+static gint ett_docsis_tlv_phs;
+static gint ett_docsis_tlv_phs_err;
+static gint ett_docsis_tlv_clsfr_dot1q;
+static gint ett_docsis_tlv_reqxmitpol;
+static gint ett_docsis_tlv_sflow_err;
+static gint ett_docsis_tlv_svc_unavail;
+static gint ett_docsis_tlv_snmpv3_kick;
+static gint ett_docsis_tlv_ds_ch_list;
+static gint ett_docsis_tlv_ds_ch_list_single;
+static gint ett_docsis_tlv_ds_ch_list_range;
+static gint ett_docsis_tlv_ext_field;
+static gint ett_docsis_tlv_vendor_specific_cap;
+static gint ett_docsis_tlv_dut_filter;
+static gint ett_docsis_tlv_tcc;
+static gint ett_docsis_tlv_tcc_ucd;
+static gint ett_docsis_tlv_tcc_rng_parms;
+static gint ett_docsis_tlv_tcc_oudp;
+static gint ett_docsis_tlv_tcc_err;
+static gint ett_docsis_tlv_sid_cl;
+static gint ett_docsis_tlv_sid_cl_enc;
+static gint ett_docsis_tlv_sid_cl_enc_map;
+static gint ett_docsis_tlv_sid_cl_so;
+static gint ett_docsis_tlv_rcp;
+static gint ett_docsis_tlv_rcp_rcv_mod_enc;
+static gint ett_docsis_tlv_rcp_ch_bl_rng;
+static gint ett_docsis_tlv_rcp_rcv_ch;
+static gint ett_docsis_tlv_rcc;
+static gint ett_docsis_tlv_rcc_rcv_mod_enc;
+static gint ett_docsis_tlv_rcc_rcv_ch;
+static gint ett_docsis_tlv_rcc_partial_serv_down_chan;
+static gint ett_docsis_tlv_rcc_srcc;
+static gint ett_docsis_tlv_rcc_srcc_prim_ds_assign;
+static gint ett_docsis_tlv_rcc_srcc_ds_assign;
+static gint ett_docsis_tlv_rcc_srcc_ds_prof_assign;
+static gint ett_docsis_tlv_rcc_srcc_ds_prof_assign_prof_list;
+static gint ett_docsis_tlv_rcc_err;
+static gint ett_docsis_tlv_dsid;
+static gint ett_docsis_tlv_dsid_ds_reseq;
+static gint ett_docsis_tlv_dsid_mc;
+static gint ett_docsis_tlv_dsid_mc_addr;
+static gint ett_docsis_tlv_sec_assoc;
+static gint ett_docsis_tlv_ch_asgn;
+static gint ett_docsis_cmts_mc_sess_enc;
+static gint ett_docsis_em_id_list_for_cm;
+static gint ett_docsis_tlv_tg_assignment;
+static gint ett_docsis_tlv_unknown;
+static gint ett_docsis_ucd_fragments;
+static gint ett_docsis_ucd_fragment;
+static gint ett_docsis_ucd_reassembled;
+
+
+static expert_field ei_docsis_tlv_tlvlen_bad;
+static expert_field ei_docsis_tlv_tlvval_bad;
 
 
 static const true_false_string ena_dis_tfs = {
diff --git a/epan/dissectors/packet-docsis-vendor.c b/epan/dissectors/packet-docsis-vendor.c
index 52ca798d0d..243c1bfc29 100644
--- a/epan/dissectors/packet-docsis-vendor.c
+++ b/epan/dissectors/packet-docsis-vendor.c
@@ -40,71 +40,71 @@ void proto_register_docsis_vsif(void);
 void proto_reg_handoff_docsis_vsif(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_docsis_vsif = -1;
-static int hf_docsis_vsif_vendorid = -1;
-static int hf_docsis_vsif_vendor_unknown = -1;
-static int hf_docsis_vsif_cisco_numphones = -1;
-/* static int hf_docsis_vsif_cisco_ipprec = -1; */
-static int hf_docsis_vsif_cisco_ipprec_val = -1;
-static int hf_docsis_vsif_cisco_ipprec_bw = -1;
-static int hf_docsis_vsif_cisco_config_file = -1;
-
-static int hf_docsis_vsif_gex_loadbal_policy_id = -1;
-static int hf_docsis_vsif_gex_loadbal_priority = -1;
-static int hf_docsis_vsif_gex_loadbal_group_id = -1;
-static int hf_docsis_vsif_gex_ranging_class_id_extension = -1;
-static int hf_docsis_vsif_gex_l2vpn_encoding = -1;
-static int hf_docsis_vsif_gex_ecm = -1;
-static int hf_docsis_vsif_gex_sav = -1;
-static int hf_docsis_vsif_gex_cmam = -1;
-static int hf_docsis_vsif_gex_imja = -1;
-static int hf_docsis_vsif_gex_service_type_identifier = -1;
-
-static int hf_docsis_vsif_gex_ecm_extended_cmts_mic_hmac_type = -1;
-static int hf_docsis_vsif_gex_ecm_extended_cmts_mic_bitmap = -1;
-static int hf_docsis_vsif_gex_ecm_explicit_extended_cmts_mic_digest_subtype = -1;
-
-static int hf_docsis_vsif_gex_sav_group_name = -1;
-static int hf_docsis_vsif_gex_sav_static_prefix_rule = -1;
-
-static int hf_docsis_vsif_gex_sav_static_prefix_addressv4 = -1;
-static int hf_docsis_vsif_gex_sav_static_prefix_addressv6 = -1;
-static int hf_docsis_vsif_gex_sav_static_prefix_length = -1;
-
-static int hf_docsis_vsif_gex_cmam_cm_required_downstream_attribute_mask = -1;
-static int hf_docsis_vsif_gex_cmam_cm_forbidden_downstream_attribute_mask = -1;
-static int hf_docsis_vsif_gex_cmam_cm_required_upstream_attribute_mask = -1;
-static int hf_docsis_vsif_gex_cmam_cm_forbidden_upstream_attribute_mask = -1;
-
-static int hf_docsis_vsif_gex_imja_ip_multicast_profile_name = -1;
-static int hf_docsis_vsif_gex_imja_ssr = -1;
-static int hf_docsis_vsif_gex_imja_maximum_multicast_sessions = -1;
-
-static int hf_docsis_vsif_gex_imja_ssr_rule_priority = -1;
-static int hf_docsis_vsif_gex_imja_ssr_authorization_action = -1;
-static int hf_docsis_vsif_gex_imja_ssr_source_prefix_addressv4 = -1;
-static int hf_docsis_vsif_gex_imja_ssr_source_prefix_addressv6 = -1;
-static int hf_docsis_vsif_gex_imja_ssr_source_prefix_length = -1;
-static int hf_docsis_vsif_gex_imja_ssr_group_prefix_addressv4 = -1;
-static int hf_docsis_vsif_gex_imja_ssr_group_prefix_addressv6 = -1;
-static int hf_docsis_vsif_gex_imja_ssr_group_prefix_length = -1;
-
-static int hf_docsis_vsif_tlv_unknown = -1;
+static int proto_docsis_vsif;
+static int hf_docsis_vsif_vendorid;
+static int hf_docsis_vsif_vendor_unknown;
+static int hf_docsis_vsif_cisco_numphones;
+/* static int hf_docsis_vsif_cisco_ipprec; */
+static int hf_docsis_vsif_cisco_ipprec_val;
+static int hf_docsis_vsif_cisco_ipprec_bw;
+static int hf_docsis_vsif_cisco_config_file;
+
+static int hf_docsis_vsif_gex_loadbal_policy_id;
+static int hf_docsis_vsif_gex_loadbal_priority;
+static int hf_docsis_vsif_gex_loadbal_group_id;
+static int hf_docsis_vsif_gex_ranging_class_id_extension;
+static int hf_docsis_vsif_gex_l2vpn_encoding;
+static int hf_docsis_vsif_gex_ecm;
+static int hf_docsis_vsif_gex_sav;
+static int hf_docsis_vsif_gex_cmam;
+static int hf_docsis_vsif_gex_imja;
+static int hf_docsis_vsif_gex_service_type_identifier;
+
+static int hf_docsis_vsif_gex_ecm_extended_cmts_mic_hmac_type;
+static int hf_docsis_vsif_gex_ecm_extended_cmts_mic_bitmap;
+static int hf_docsis_vsif_gex_ecm_explicit_extended_cmts_mic_digest_subtype;
+
+static int hf_docsis_vsif_gex_sav_group_name;
+static int hf_docsis_vsif_gex_sav_static_prefix_rule;
+
+static int hf_docsis_vsif_gex_sav_static_prefix_addressv4;
+static int hf_docsis_vsif_gex_sav_static_prefix_addressv6;
+static int hf_docsis_vsif_gex_sav_static_prefix_length;
+
+static int hf_docsis_vsif_gex_cmam_cm_required_downstream_attribute_mask;
+static int hf_docsis_vsif_gex_cmam_cm_forbidden_downstream_attribute_mask;
+static int hf_docsis_vsif_gex_cmam_cm_required_upstream_attribute_mask;
+static int hf_docsis_vsif_gex_cmam_cm_forbidden_upstream_attribute_mask;
+
+static int hf_docsis_vsif_gex_imja_ip_multicast_profile_name;
+static int hf_docsis_vsif_gex_imja_ssr;
+static int hf_docsis_vsif_gex_imja_maximum_multicast_sessions;
+
+static int hf_docsis_vsif_gex_imja_ssr_rule_priority;
+static int hf_docsis_vsif_gex_imja_ssr_authorization_action;
+static int hf_docsis_vsif_gex_imja_ssr_source_prefix_addressv4;
+static int hf_docsis_vsif_gex_imja_ssr_source_prefix_addressv6;
+static int hf_docsis_vsif_gex_imja_ssr_source_prefix_length;
+static int hf_docsis_vsif_gex_imja_ssr_group_prefix_addressv4;
+static int hf_docsis_vsif_gex_imja_ssr_group_prefix_addressv6;
+static int hf_docsis_vsif_gex_imja_ssr_group_prefix_length;
+
+static int hf_docsis_vsif_tlv_unknown;
 
 
 /* Initialize the subtree pointers */
-static gint ett_docsis_vsif = -1;
-static gint ett_docsis_vsif_ipprec = -1;
-static gint ett_docsis_vsif_gex_ecm = -1;
-static gint ett_docsis_vsif_gex_sav = -1;
-static gint ett_docsis_vsif_gex_sav_spr = -1;
-static gint ett_docsis_vsif_gex_cmam = -1;
-static gint ett_docsis_vsif_gex_imja = -1;
-static gint ett_docsis_vsif_gex_imja_ssr = -1;
-
-
-static expert_field ei_docsis_vsif_tlvlen_bad = EI_INIT;
-static expert_field ei_docsis_vsif_tlvtype_unknown = EI_INIT;
+static gint ett_docsis_vsif;
+static gint ett_docsis_vsif_ipprec;
+static gint ett_docsis_vsif_gex_ecm;
+static gint ett_docsis_vsif_gex_sav;
+static gint ett_docsis_vsif_gex_sav_spr;
+static gint ett_docsis_vsif_gex_cmam;
+static gint ett_docsis_vsif_gex_imja;
+static gint ett_docsis_vsif_gex_imja_ssr;
+
+
+static expert_field ei_docsis_vsif_tlvlen_bad;
+static expert_field ei_docsis_vsif_tlvtype_unknown;
 
 static const value_string vendorid_vals[] = {
   {VENDOR_CISCO, "Cisco Systems, Inc."},
diff --git a/epan/dissectors/packet-docsis.c b/epan/dissectors/packet-docsis.c
index 64328b7641..7b50b84624 100644
--- a/epan/dissectors/packet-docsis.c
+++ b/epan/dissectors/packet-docsis.c
@@ -95,69 +95,69 @@ static gboolean docsis_dissect_encrypted_frames = FALSE;
 #define EH_EXTENDED         15
 
 /* Initialize the protocol and registered fields */
-static int proto_docsis = -1;
-static int hf_docsis_fctype = -1;
-static int hf_docsis_machdr_fcparm = -1;
-static int hf_docsis_fcparm = -1;
-static int hf_docsis_exthdr = -1;
-static int hf_docsis_concat_cnt = -1;
-static int hf_docsis_macparm = -1;
-static int hf_docsis_ehdrlen = -1;
-static int hf_docsis_len = -1;
-static int hf_docsis_eh_type = -1;
-static int hf_docsis_eh_len = -1;
-static int hf_docsis_eh_val = -1;
-static int hf_docsis_frag_rsvd = -1;
-static int hf_docsis_frag_first = -1;
-static int hf_docsis_frag_last = -1;
-static int hf_docsis_frag_seq = -1;
-static int hf_docsis_sid = -1;
-static int hf_docsis_mini_slots = -1;
-static int hf_docsis_requested_size = -1;
-static int hf_docsis_hcs = -1;
-static int hf_docsis_hcs_status = -1;
-static int hf_docsis_bpi_en = -1;
-static int hf_docsis_toggle_bit = -1;
-static int hf_docsis_key_seq = -1;
-static int hf_docsis_ehdr_ver = -1;
-static int hf_docsis_said = -1;
-static int hf_docsis_ehdr_phsi = -1;
-static int hf_docsis_ehdr_qind = -1;
-static int hf_docsis_ehdr_grants = -1;
-static int hf_docsis_reserved = -1;
-static int hf_docsis_ehdr_ds_traffic_pri = -1;
-static int hf_docsis_ehdr_ds_seq_chg_cnt = -1;
-static int hf_docsis_ehdr_ds_dsid = -1;
-static int hf_docsis_ehdr_ds_pkt_seq_num = -1;
-static int hf_docsis_ehdr_bpup2_bpi_en = -1;
-static int hf_docsis_ehdr_bpup2_toggle_bit = -1;
-static int hf_docsis_ehdr_bpup2_key_seq = -1;
-static int hf_docsis_ehdr_bpup2_ver = -1;
-static int hf_docsis_ehdr_bpup2_sid = -1;
-static int hf_docsis_ehdr_pv_st_refpt = -1;
-static int hf_docsis_ehdr_pv_timestamp = -1;
-
-static int hf_docsis_fragments = -1;
-static int hf_docsis_fragment = -1;
-static int hf_docsis_fragment_overlap = -1;
-static int hf_docsis_fragment_overlap_conflict = -1;
-static int hf_docsis_fragment_multiple_tails = -1;
-static int hf_docsis_fragment_too_long_fragment = -1;
-static int hf_docsis_fragment_error = -1;
-static int hf_docsis_fragment_count = -1;
-static int hf_docsis_reassembled_in = -1;
-static int hf_docsis_reassembled_length = -1;
-static int hf_docsis_reassembled_data = -1;
-static int hf_docsis_frag_fcs = -1;
-static int hf_docsis_frag_fcs_status = -1;
-
-static int hf_docsis_dst = -1;
-static int hf_docsis_dst_resolved = -1;
-static int hf_docsis_src = -1;
-static int hf_docsis_src_resolved = -1;
-static int hf_docsis_lg = -1;
-static int hf_docsis_ig = -1;
-static int hf_docsis_encrypted_payload = -1;
+static int proto_docsis;
+static int hf_docsis_fctype;
+static int hf_docsis_machdr_fcparm;
+static int hf_docsis_fcparm;
+static int hf_docsis_exthdr;
+static int hf_docsis_concat_cnt;
+static int hf_docsis_macparm;
+static int hf_docsis_ehdrlen;
+static int hf_docsis_len;
+static int hf_docsis_eh_type;
+static int hf_docsis_eh_len;
+static int hf_docsis_eh_val;
+static int hf_docsis_frag_rsvd;
+static int hf_docsis_frag_first;
+static int hf_docsis_frag_last;
+static int hf_docsis_frag_seq;
+static int hf_docsis_sid;
+static int hf_docsis_mini_slots;
+static int hf_docsis_requested_size;
+static int hf_docsis_hcs;
+static int hf_docsis_hcs_status;
+static int hf_docsis_bpi_en;
+static int hf_docsis_toggle_bit;
+static int hf_docsis_key_seq;
+static int hf_docsis_ehdr_ver;
+static int hf_docsis_said;
+static int hf_docsis_ehdr_phsi;
+static int hf_docsis_ehdr_qind;
+static int hf_docsis_ehdr_grants;
+static int hf_docsis_reserved;
+static int hf_docsis_ehdr_ds_traffic_pri;
+static int hf_docsis_ehdr_ds_seq_chg_cnt;
+static int hf_docsis_ehdr_ds_dsid;
+static int hf_docsis_ehdr_ds_pkt_seq_num;
+static int hf_docsis_ehdr_bpup2_bpi_en;
+static int hf_docsis_ehdr_bpup2_toggle_bit;
+static int hf_docsis_ehdr_bpup2_key_seq;
+static int hf_docsis_ehdr_bpup2_ver;
+static int hf_docsis_ehdr_bpup2_sid;
+static int hf_docsis_ehdr_pv_st_refpt;
+static int hf_docsis_ehdr_pv_timestamp;
+
+static int hf_docsis_fragments;
+static int hf_docsis_fragment;
+static int hf_docsis_fragment_overlap;
+static int hf_docsis_fragment_overlap_conflict;
+static int hf_docsis_fragment_multiple_tails;
+static int hf_docsis_fragment_too_long_fragment;
+static int hf_docsis_fragment_error;
+static int hf_docsis_fragment_count;
+static int hf_docsis_reassembled_in;
+static int hf_docsis_reassembled_length;
+static int hf_docsis_reassembled_data;
+static int hf_docsis_frag_fcs;
+static int hf_docsis_frag_fcs_status;
+
+static int hf_docsis_dst;
+static int hf_docsis_dst_resolved;
+static int hf_docsis_src;
+static int hf_docsis_src_resolved;
+static int hf_docsis_lg;
+static int hf_docsis_ig;
+static int hf_docsis_encrypted_payload;
 
 static dissector_handle_t docsis_handle;
 static dissector_handle_t eth_withoutfcs_handle;
@@ -166,17 +166,17 @@ static dissector_handle_t docsis_mgmt_handle;
 static dissector_table_t docsis_dissector_table;
 #endif
 
-static expert_field ei_docsis_hcs_bad = EI_INIT;
-static expert_field ei_docsis_len = EI_INIT;
-static expert_field ei_docsis_frag_fcs_bad = EI_INIT;
-static expert_field ei_docsis_eh_len = EI_INIT;
+static expert_field ei_docsis_hcs_bad;
+static expert_field ei_docsis_len;
+static expert_field ei_docsis_frag_fcs_bad;
+static expert_field ei_docsis_eh_len;
 
 /* Initialize the subtree pointers */
-static gint ett_docsis = -1;
-static gint ett_ehdr = -1;
-static gint ett_docsis_fragments = -1;
-static gint ett_docsis_fragment = -1;
-static gint ett_addr = -1;
+static gint ett_docsis;
+static gint ett_ehdr;
+static gint ett_docsis_fragments;
+static gint ett_docsis_fragment;
+static gint ett_addr;
 
 static const value_string fctype_vals[] = {
   {FCTYPE_PACKET,   "Packet PDU"},
diff --git a/epan/dissectors/packet-dof.c b/epan/dissectors/packet-dof.c
index 99871607c9..139ac113f9 100644
--- a/epan/dissectors/packet-dof.c
+++ b/epan/dissectors/packet-dof.c
@@ -865,18 +865,18 @@ static void* dof_packet_get_proto_data(dof_packet_data *packet, int proto);
 /* This is needed to register multicast sessions with the UDP handler. */
 static dissector_handle_t dof_udp_handle;
 
-static int proto_2008_1_dof = -1;
-static int proto_2008_1_dof_tcp = -1;
-static int proto_2008_1_dof_udp = -1;
+static int proto_2008_1_dof;
+static int proto_2008_1_dof_tcp;
+static int proto_2008_1_dof_udp;
 
-static int hf_2008_1_dof_session = -1;
-static int hf_2008_1_dof_is_2_node = -1;
-static int hf_2008_1_dof_is_streaming = -1;
-static int hf_2008_1_dof_is_from_client = -1;
-static int hf_2008_1_dof_frame = -1;
-static int hf_2008_1_dof_session_transport = -1;
+static int hf_2008_1_dof_session;
+static int hf_2008_1_dof_is_2_node;
+static int hf_2008_1_dof_is_streaming;
+static int hf_2008_1_dof_is_from_client;
+static int hf_2008_1_dof_frame;
+static int hf_2008_1_dof_session_transport;
 
-static int ett_2008_1_dof = -1;
+static int ett_2008_1_dof;
 
 /* DOF Tunnel Protocol */
 
@@ -887,12 +887,12 @@ static int ett_2008_1_dof = -1;
 static dissector_table_t dof_tun_app_dissectors;
 
 /***** TUNNEL *****/
-static int proto_2012_1_tunnel = -1;
+static int proto_2012_1_tunnel;
 
-static int ett_2012_1_tunnel = -1;
+static int ett_2012_1_tunnel;
 
-static int hf_2012_1_tunnel_1_version = -1;
-static int hf_2012_1_tunnel_1_length = -1;
+static int hf_2012_1_tunnel_1_version;
+static int hf_2012_1_tunnel_1_length;
 
 /* DOF NETWORK PROTOCOL */
 #define DNP_MAX_VERSION 1
@@ -901,33 +901,33 @@ static int hf_2012_1_tunnel_1_length = -1;
 static dissector_table_t dnp_dissectors;
 static dissector_table_t dnp_framing_dissectors;
 
-static int proto_2008_1_dnp = -1;
+static int proto_2008_1_dnp;
 
-static int hf_2008_1_dnp_1_version = -1;
-static int hf_2008_1_dnp_1_flag = -1;
+static int hf_2008_1_dnp_1_version;
+static int hf_2008_1_dnp_1_flag;
 
-static int ett_2008_1_dnp = -1;
-static int ett_2008_1_dnp_header = -1;
+static int ett_2008_1_dnp;
+static int ett_2008_1_dnp_header;
 
 /* DNP V0 */
-static int proto_2008_1_dnp_0 = -1;
+static int proto_2008_1_dnp_0;
 
-static int hf_2008_1_dnp_0_1_1_padding = -1;
-static int hf_2008_1_dnp_0_1_1_version = -1;
+static int hf_2008_1_dnp_0_1_1_padding;
+static int hf_2008_1_dnp_0_1_1_version;
 
 /* DNP V1 */
 #define DNP_V1_DEFAULT_FLAGS    (0)
-static int proto_2009_9_dnp_1 = -1;
+static int proto_2009_9_dnp_1;
 
-static int hf_2009_9_dnp_1_flags = -1;
-static int hf_2009_9_dnp_1_flag_length = -1;
-static int hf_2009_9_dnp_1_length = -1;
-static int hf_2009_9_dnp_1_flag_srcport = -1;
-static int hf_2009_9_dnp_1_srcport = -1;
-static int hf_2009_9_dnp_1_flag_dstport = -1;
-static int hf_2009_9_dnp_1_dstport = -1;
+static int hf_2009_9_dnp_1_flags;
+static int hf_2009_9_dnp_1_flag_length;
+static int hf_2009_9_dnp_1_length;
+static int hf_2009_9_dnp_1_flag_srcport;
+static int hf_2009_9_dnp_1_srcport;
+static int hf_2009_9_dnp_1_flag_dstport;
+static int hf_2009_9_dnp_1_dstport;
 
-static int ett_2009_9_dnp_1_flags = -1;
+static int ett_2009_9_dnp_1_flags;
 
 static int * const bitmask_2009_9_dnp_1_flags[] = {
     &hf_2009_9_dnp_1_flag_length,
@@ -941,27 +941,27 @@ static int * const bitmask_2009_9_dnp_1_flags[] = {
 
 static dissector_table_t dof_dpp_dissectors;
 
-static int proto_2008_1_dpp = -1;
+static int proto_2008_1_dpp;
 
-static int hf_2008_1_dpp_sid_num = -1;
-static int hf_2008_1_dpp_rid_num = -1;
-static int hf_2008_1_dpp_sid_str = -1;
-static int hf_2008_1_dpp_rid_str = -1;
-static int hf_2008_1_dpp_first_command = -1;
-static int hf_2008_1_dpp_last_command = -1;
-static int hf_2008_1_dpp_first_response = -1;
-static int hf_2008_1_dpp_last_response = -1;
-static int hf_2008_1_dpp_related_frame = -1;
-static int hf_2008_1_dpp_1_version = -1;
-static int hf_2008_1_dpp_1_flag = -1;
+static int hf_2008_1_dpp_sid_num;
+static int hf_2008_1_dpp_rid_num;
+static int hf_2008_1_dpp_sid_str;
+static int hf_2008_1_dpp_rid_str;
+static int hf_2008_1_dpp_first_command;
+static int hf_2008_1_dpp_last_command;
+static int hf_2008_1_dpp_first_response;
+static int hf_2008_1_dpp_last_response;
+static int hf_2008_1_dpp_related_frame;
+static int hf_2008_1_dpp_1_version;
+static int hf_2008_1_dpp_1_flag;
 
-static int ett_2008_1_dpp = -1;
-static int ett_2008_1_dpp_1_header = -1;
+static int ett_2008_1_dpp;
+static int ett_2008_1_dpp_1_header;
 
 /* DPP V0 */
-static int proto_2008_1_dpp_0 = -1;
+static int proto_2008_1_dpp_0;
 
-static int hf_2008_1_dpp_0_1_1_version = -1;
+static int hf_2008_1_dpp_0_1_1_version;
 
 /* DPP V1 - RESERVED, NOT SUPPORTED */
 
@@ -973,41 +973,41 @@ static int hf_2008_1_dpp_0_1_1_version = -1;
 #define DPP_V2_SEC_FLAG_A (0x02)
 #define DPP_V2_SEC_FLAG_S (0x01)
 
-static int proto_2009_12_dpp = -1;
-static int proto_2009_12_dpp_common = -1;
+static int proto_2009_12_dpp;
+static int proto_2009_12_dpp_common;
 
 /* TODO: The complete on final and final flags are not covered. */
-static int hf_2009_12_dpp_2_1_flags = -1;
-static int hf_2009_12_dpp_2_1_flag_security = -1;
-static int hf_2009_12_dpp_2_1_flag_opid = -1;
-static int hf_2009_12_dpp_2_1_flag_seq = -1;
-static int hf_2009_12_dpp_2_1_flag_retry = -1;
-static int hf_2009_12_dpp_2_1_flag_cmdrsp = -1;
-static int hf_2009_12_dpp_2_3_sec_flags = -1;
-static int hf_2009_12_dpp_2_3_sec_flag_secure = -1;
-static int hf_2009_12_dpp_2_3_sec_flag_rdid = -1;
-static int hf_2009_12_dpp_2_3_sec_flag_partition = -1;
-static int hf_2009_12_dpp_2_3_sec_flag_ssid = -1;
-static int hf_2009_12_dpp_2_3_sec_flag_as = -1;
-static int hf_2009_12_dpp_2_3_sec_ssid = -1;
-static int hf_2009_12_dpp_2_3_sec_rdid = -1;
-static int hf_2009_12_dpp_2_3_sec_remote_partition = -1;
-static int hf_2009_12_dpp_2_3_sec_partition = -1;
-static int hf_2009_12_dpp_2_1_opcnt = -1;
-static int hf_2009_12_dpp_2_1_seq = -1;
-static int hf_2009_12_dpp_2_1_retry = -1;
-static int hf_2009_12_dpp_2_1_delay = -1;
-static int hf_2009_12_dpp_2_14_opcode = -1;
-
-static int ett_2009_12_dpp_2_1_flags = -1;
-static int ett_2009_12_dpp_2_3_security = -1;
-static int ett_2009_12_dpp_2_3_sec_flags = -1;
-static int ett_2009_12_dpp_2_3_sec_remote_partition = -1;
-static int ett_2009_12_dpp_2_3_sec_partition = -1;
-static int ett_2009_12_dpp_2_opid = -1;
-static int ett_2009_12_dpp_2_opid_history = -1;
-
-static int ett_2009_12_dpp_common = -1;
+static int hf_2009_12_dpp_2_1_flags;
+static int hf_2009_12_dpp_2_1_flag_security;
+static int hf_2009_12_dpp_2_1_flag_opid;
+static int hf_2009_12_dpp_2_1_flag_seq;
+static int hf_2009_12_dpp_2_1_flag_retry;
+static int hf_2009_12_dpp_2_1_flag_cmdrsp;
+static int hf_2009_12_dpp_2_3_sec_flags;
+static int hf_2009_12_dpp_2_3_sec_flag_secure;
+static int hf_2009_12_dpp_2_3_sec_flag_rdid;
+static int hf_2009_12_dpp_2_3_sec_flag_partition;
+static int hf_2009_12_dpp_2_3_sec_flag_ssid;
+static int hf_2009_12_dpp_2_3_sec_flag_as;
+static int hf_2009_12_dpp_2_3_sec_ssid;
+static int hf_2009_12_dpp_2_3_sec_rdid;
+static int hf_2009_12_dpp_2_3_sec_remote_partition;
+static int hf_2009_12_dpp_2_3_sec_partition;
+static int hf_2009_12_dpp_2_1_opcnt;
+static int hf_2009_12_dpp_2_1_seq;
+static int hf_2009_12_dpp_2_1_retry;
+static int hf_2009_12_dpp_2_1_delay;
+static int hf_2009_12_dpp_2_14_opcode;
+
+static int ett_2009_12_dpp_2_1_flags;
+static int ett_2009_12_dpp_2_3_security;
+static int ett_2009_12_dpp_2_3_sec_flags;
+static int ett_2009_12_dpp_2_3_sec_remote_partition;
+static int ett_2009_12_dpp_2_3_sec_partition;
+static int ett_2009_12_dpp_2_opid;
+static int ett_2009_12_dpp_2_opid_history;
+
+static int ett_2009_12_dpp_common;
 
 static const value_string strings_2009_12_dpp_opid_types[] = {
     { 0, "Not Present" },
@@ -1060,19 +1060,19 @@ static const value_string strings_2009_12_dpp_common_opcodes[] = {
 
 static dissector_table_t app_dissectors;
 
-static int proto_2008_1_app = -1;
+static int proto_2008_1_app;
 
-static int hf_2008_1_app_version = -1;
+static int hf_2008_1_app_version;
 
 /* DAP V0 (DSP - DOF SESSION PROTOCOL) */
 /* Note that DSP is *always* appid 0 and so it violates the standard naming rule. */
 static dissector_table_t dsp_option_dissectors;
 
-static int hf_2008_1_dsp_12_opcode = -1;
-static int hf_2008_1_dsp_attribute_code = -1;
-static int hf_2008_1_dsp_attribute_data = -1;
-static int hf_2008_1_dsp_value_length = -1;
-static int hf_2008_1_dsp_value_data = -1;
+static int hf_2008_1_dsp_12_opcode;
+static int hf_2008_1_dsp_attribute_code;
+static int hf_2008_1_dsp_attribute_data;
+static int hf_2008_1_dsp_value_length;
+static int hf_2008_1_dsp_value_data;
 
 static const value_string strings_2008_1_dsp_attribute_codes[] = {
     { 0, "TEP Family" },
@@ -1086,7 +1086,7 @@ static const value_string strings_2008_1_dsp_attribute_codes[] = {
 #define DOF_PROTOCOL_DSP 0
 #define DSP_OAP_FAMILY 0x010000
 
-static int proto_2008_1_dsp = -1;
+static int proto_2008_1_dsp;
 
 #define OP_2008_1_RSP                   (0x80)
 #define OP_2008_1_QUERY_CMD             0
@@ -1133,75 +1133,75 @@ static const value_string strings_2008_1_dsp_values[] = {
 };
 #endif
 
-static int ett_2008_1_dsp_12 = -1;
-static int ett_2008_1_dsp_12_options = -1;
-static int ett_2008_1_dsp_12_option = -1;
+static int ett_2008_1_dsp_12;
+static int ett_2008_1_dsp_12_options;
+static int ett_2008_1_dsp_12_option;
 
 /* DAP V1 (OAP - OBJECT ACCESS PROTOCOL V1) */
 /* This is the defined protocol id for OAP. */
 #define DOF_PROTOCOL_OAP_1 1
 /* There are two "protocols", one hooks into DSP and the other to DOF. */
-static int proto_oap_1 = -1;
-static int proto_oap_1_dsp = -1;
+static int proto_oap_1;
+static int proto_oap_1_dsp;
 
 /* OAP DSP protocol items. */
-static int hf_oap_1_dsp_option = -1;
+static int hf_oap_1_dsp_option;
 
 /* OAP protocol items. */
-static int hf_oap_1_opcode = -1;
-
-static int hf_oap_1_alias_size = -1;
-static int hf_oap_1_flags = -1;
-static int hf_oap_1_exception_internal_flag = -1;
-static int hf_oap_1_exception_final_flag = -1;
-static int hf_oap_1_exception_provider_flag = -1;
-static int hf_oap_1_cmdcontrol = -1;
-static int hf_oap_1_cmdcontrol_cache_flag = -1;
-static int hf_oap_1_cmdcontrol_verbosity_flag = -1;
-static int hf_oap_1_cmdcontrol_noexecute_flag = -1;
-static int hf_oap_1_cmdcontrol_ack_flag = -1;
-static int hf_oap_1_cmdcontrol_delay_flag = -1;
-static int hf_oap_1_cmdcontrol_heuristic_flag = -1;
-static int hf_oap_1_cmdcontrol_heuristic = -1;
-static int hf_oap_1_cmdcontrol_cache = -1;
-static int hf_oap_1_cmdcontrol_ackcnt = -1;
-static int hf_oap_1_cmdcontrol_ack = -1;
+static int hf_oap_1_opcode;
+
+static int hf_oap_1_alias_size;
+static int hf_oap_1_flags;
+static int hf_oap_1_exception_internal_flag;
+static int hf_oap_1_exception_final_flag;
+static int hf_oap_1_exception_provider_flag;
+static int hf_oap_1_cmdcontrol;
+static int hf_oap_1_cmdcontrol_cache_flag;
+static int hf_oap_1_cmdcontrol_verbosity_flag;
+static int hf_oap_1_cmdcontrol_noexecute_flag;
+static int hf_oap_1_cmdcontrol_ack_flag;
+static int hf_oap_1_cmdcontrol_delay_flag;
+static int hf_oap_1_cmdcontrol_heuristic_flag;
+static int hf_oap_1_cmdcontrol_heuristic;
+static int hf_oap_1_cmdcontrol_cache;
+static int hf_oap_1_cmdcontrol_ackcnt;
+static int hf_oap_1_cmdcontrol_ack;
 
 #if 0 /* not used yet */
-static int hf_oap_1_opinfo_start_frame = -1;
-static int hf_oap_1_opinfo_end_frame = -1;
-static int hf_oap_1_opinfo_timeout = -1;
+static int hf_oap_1_opinfo_start_frame;
+static int hf_oap_1_opinfo_end_frame;
+static int hf_oap_1_opinfo_timeout;
 #endif
 
-static int hf_oap_1_providerid = -1;
-static int ett_oap_1_1_providerid = -1;
+static int hf_oap_1_providerid;
+static int ett_oap_1_1_providerid;
 
-static int hf_oap_1_objectid = -1;
-static int ett_oap_1_objectid = -1;
+static int hf_oap_1_objectid;
+static int ett_oap_1_objectid;
 
-static int hf_oap_1_interfaceid = -1;
-static int hf_oap_1_itemid = -1;
+static int hf_oap_1_interfaceid;
+static int hf_oap_1_itemid;
 
 #if 0 /* not used yet */
-static int hf_oap_1_distance = -1;
+static int hf_oap_1_distance;
 #endif
 
-static int hf_oap_1_alias = -1;
-static int hf_oap_1_alias_frame = -1;
+static int hf_oap_1_alias;
+static int hf_oap_1_alias_frame;
 
-static int hf_oap_1_subscription_delta = -1;
-static int hf_oap_1_update_sequence = -1;
-static int hf_oap_1_value_list = -1;
+static int hf_oap_1_subscription_delta;
+static int hf_oap_1_update_sequence;
+static int hf_oap_1_value_list;
 
-static int ett_oap_1_dsp = -1;
-static int ett_oap_1_dsp_options = -1;
+static int ett_oap_1_dsp;
+static int ett_oap_1_dsp_options;
 
-static int ett_oap_1 = -1;
-static int ett_oap_1_opinfo = -1;
-static int ett_oap_1_cmdcontrol = -1;
-static int ett_oap_1_cmdcontrol_flags = -1;
-static int ett_oap_1_cmdcontrol_ack = -1;
-static int ett_oap_1_alias = -1;
+static int ett_oap_1;
+static int ett_oap_1_opinfo;
+static int ett_oap_1_cmdcontrol;
+static int ett_oap_1_cmdcontrol_flags;
+static int ett_oap_1_cmdcontrol_ack;
+static int ett_oap_1_alias;
 
 static int * const bitmask_oap_1_cmdcontrol_flags[] = {
     &hf_oap_1_cmdcontrol_cache_flag,
@@ -1213,7 +1213,7 @@ static int * const bitmask_oap_1_cmdcontrol_flags[] = {
     NULL
 };
 
-static expert_field ei_oap_no_session = EI_INIT;
+static expert_field ei_oap_no_session;
 
 static GHashTable *oap_1_alias_to_binding = NULL;
 
@@ -1562,50 +1562,50 @@ static oap_1_binding* oap_1_resolve_alias(oap_1_alias_key *key)
 /* DAP V128 (TEP - TICKET EXCHANGE PROTOCOL V1) */
 #define DOF_PROTOCOL_TEP 128
 #define DSP_TEP_FAMILY 0x000000
-static int proto_tep = -1;
-static int proto_tep_dsp = -1;
+static int proto_tep;
+static int proto_tep_dsp;
 
-static int hf_dsp_option = -1;
+static int hf_dsp_option;
 
-static int ett_tep_operation = -1;
-static int hf_tep_operation = -1;
-static int hf_tep_operation_type = -1;
-static int hf_tep_opcode = -1;
-static int hf_tep_k = -1;
-static int hf_tep_c = -1;
-static int hf_tep_reject_code = -1;
-static int hf_tep_reject_data = -1;
+static int ett_tep_operation;
+static int hf_tep_operation;
+static int hf_tep_operation_type;
+static int hf_tep_opcode;
+static int hf_tep_k;
+static int hf_tep_c;
+static int hf_tep_reject_code;
+static int hf_tep_reject_data;
 
 static const true_false_string tep_optype_vals = { "DPP Response", "DPP Command" };
 
 /* TEP.2.1 */
-static int ett_tep_2_1_domain = -1;
-static int hf_tep_2_1_domain = -1;
-static int ett_tep_2_1_initiator_block = -1;
-static int hf_tep_2_1_initiator_block = -1;
-static int hf_tep_2_1_ticket_confirmation = -1;
+static int ett_tep_2_1_domain;
+static int hf_tep_2_1_domain;
+static int ett_tep_2_1_initiator_block;
+static int hf_tep_2_1_initiator_block;
+static int hf_tep_2_1_ticket_confirmation;
 
 /* TEP.2.2 */
-static int ett_tep_2_2_initiator_ticket = -1;
-static int hf_tep_2_2_initiator_ticket = -1;
-static int hf_tep_2_2_ticket_confirmation = -1;
-static int ett_tep_2_2_responder_initialization = -1;
-static int hf_tep_2_2_responder_initialization = -1;
-static int ett_tep_2_2_responder_block = -1;
-static int hf_tep_2_2_responder_block = -1;
-static int ett_tep_2_2_authenticator_initialization = -1;
-static int hf_tep_2_2_authenticator_initialization = -1;
+static int ett_tep_2_2_initiator_ticket;
+static int hf_tep_2_2_initiator_ticket;
+static int hf_tep_2_2_ticket_confirmation;
+static int ett_tep_2_2_responder_initialization;
+static int hf_tep_2_2_responder_initialization;
+static int ett_tep_2_2_responder_block;
+static int hf_tep_2_2_responder_block;
+static int ett_tep_2_2_authenticator_initialization;
+static int hf_tep_2_2_authenticator_initialization;
 
 /* TEP.2.2.1 */
-static int hf_tep_2_2_1_state_identifier = -1;
-static int ett_tep_2_2_1_initial_state = -1;
-static int hf_tep_2_2_1_initial_state = -1;
+static int hf_tep_2_2_1_state_identifier;
+static int ett_tep_2_2_1_initial_state;
+static int hf_tep_2_2_1_initial_state;
 
-static int hf_tep_session_key = -1;
+static int hf_tep_session_key;
 
-static int ett_tep_dsp = -1;
-static int ett_tep_dsp_options = -1;
-static int ett_tep = -1;
+static int ett_tep_dsp;
+static int ett_tep_dsp_options;
+static int ett_tep;
 
 #if 0 /* not used yet */
 static const value_string tep_filter_existing[] = {
@@ -1704,88 +1704,88 @@ typedef struct _trp_packet_data
 } trp_packet_data;
 
 
-static int proto_trp = -1;
-static int proto_trp_dsp = -1;
-
-static int hf_trp_dsp_option = -1;
-
-static int hf_trp_opcode = -1;
-static int hf_domain = -1;
-static int hf_identity_resolution = -1;
-static int hf_initiator_request = -1;
-static int hf_responder_request = -1;
-static int hf_initiator_ticket = -1;
-static int hf_responder_ticket = -1;
-static int hf_authentication_block = -1;
-static int hf_group_identifier = -1;
-static int hf_node_identifier = -1;
-static int hf_thb = -1;
-static int hf_tmin = -1;
-static int hf_tmax = -1;
-static int hf_trp_epoch = -1;
-static int hf_sidg = -1;
-static int hf_security_scope = -1;
-static int hf_security_mode = -1;
-static int hf_ssid = -1;
+static int proto_trp;
+static int proto_trp_dsp;
+
+static int hf_trp_dsp_option;
+
+static int hf_trp_opcode;
+static int hf_domain;
+static int hf_identity_resolution;
+static int hf_initiator_request;
+static int hf_responder_request;
+static int hf_initiator_ticket;
+static int hf_responder_ticket;
+static int hf_authentication_block;
+static int hf_group_identifier;
+static int hf_node_identifier;
+static int hf_thb;
+static int hf_tmin;
+static int hf_tmax;
+static int hf_trp_epoch;
+static int hf_sidg;
+static int hf_security_scope;
+static int hf_security_mode;
+static int hf_ssid;
 #if 0 /* not used yet */
-static int hf_initiator_pg = -1;
+static int hf_initiator_pg;
 #endif
-static int hf_initiator_validation = -1;
-static int hf_responder_pg = -1;
-static int hf_responder_validation = -1;
+static int hf_initiator_validation;
+static int hf_responder_pg;
+static int hf_responder_validation;
 
-static int hf_trp_errorcode = -1;
-static int hf_trp_duration = -1;
+static int hf_trp_errorcode;
+static int hf_trp_duration;
 #if 0 /* not used yet */
-static int hf_trp_rnonce = -1;
-static int hf_trp_pnonce = -1;
-static int hf_trp_reqid = -1;
-static int hf_trp_provid = -1;
-static int hf_trp_perm_count = -1;
-static int hf_trp_perm_type = -1;
-static int hf_trp_perm_rcache = -1;
-static int hf_trp_perm_rsrp = -1;
-static int hf_trp_perm_rsrp_a = -1;
-static int hf_trp_perm_rsrp_u = -1;
-static int hf_trp_perm_rflags = -1;
-static int hf_trp_perm_pcache = -1;
-static int hf_trp_perm_psrp = -1;
-static int hf_trp_perm_psrp_a = -1;
-static int hf_trp_perm_psrp_u = -1;
-static int hf_trp_perm_psrp_b = -1;
-static int hf_trp_perm_psrp_s = -1;
-static int hf_trp_perm_pflags = -1;
-static int hf_trp_confirmation = -1;
-static int hf_trp_perm_pke = -1;
-static int hf_trp_perm_pka = -1;
+static int hf_trp_rnonce;
+static int hf_trp_pnonce;
+static int hf_trp_reqid;
+static int hf_trp_provid;
+static int hf_trp_perm_count;
+static int hf_trp_perm_type;
+static int hf_trp_perm_rcache;
+static int hf_trp_perm_rsrp;
+static int hf_trp_perm_rsrp_a;
+static int hf_trp_perm_rsrp_u;
+static int hf_trp_perm_rflags;
+static int hf_trp_perm_pcache;
+static int hf_trp_perm_psrp;
+static int hf_trp_perm_psrp_a;
+static int hf_trp_perm_psrp_u;
+static int hf_trp_perm_psrp_b;
+static int hf_trp_perm_psrp_s;
+static int hf_trp_perm_pflags;
+static int hf_trp_confirmation;
+static int hf_trp_perm_pke;
+static int hf_trp_perm_pka;
 #endif
 
-static int ett_trp_dsp = -1;
-static int ett_trp = -1;
-static int ett_domain = -1;
-static int ett_identity_resolution = -1;
-static int ett_initiator_request = -1;
-static int ett_initiator_ticket = -1;
-static int ett_responder_request = -1;
-static int ett_responder_ticket = -1;
-static int ett_authentication_block = -1;
-static int ett_group_identifier = -1;
-static int ett_node_identifier = -1;
-static int ett_sidg = -1;
-static int ett_security_scope = -1;
-static int ett_security_mode = -1;
-static int ett_initiator_pg = -1;
-static int ett_initiator_validation = -1;
-static int ett_responder_pg = -1;
-static int ett_responder_validation = -1;
-
-
-static int ett_trp_permset = -1;
-static int ett_srp_flags = -1;
-static int ett_trp_ticket = -1;
-
-static expert_field ei_trp_initiator_id_known = EI_INIT;
-static expert_field ei_trp_kek_discovered = EI_INIT;
+static int ett_trp_dsp;
+static int ett_trp;
+static int ett_domain;
+static int ett_identity_resolution;
+static int ett_initiator_request;
+static int ett_initiator_ticket;
+static int ett_responder_request;
+static int ett_responder_ticket;
+static int ett_authentication_block;
+static int ett_group_identifier;
+static int ett_node_identifier;
+static int ett_sidg;
+static int ett_security_scope;
+static int ett_security_mode;
+static int ett_initiator_pg;
+static int ett_initiator_validation;
+static int ett_responder_pg;
+static int ett_responder_validation;
+
+
+static int ett_trp_permset;
+static int ett_srp_flags;
+static int ett_trp_ticket;
+
+static expert_field ei_trp_initiator_id_known;
+static expert_field ei_trp_kek_discovered;
 
 #define TRP_RESPONSE                    (0x80)
 
@@ -1874,28 +1874,28 @@ typedef struct _sgmp_packet_data
     dof_session_data *request_session;
 } sgmp_packet_data;
 
-static int proto_sgmp = -1;
-
-static int hf_opcode = -1;
-static int hf_sgmp_domain = -1;
-static int hf_sgmp_epoch = -1;
-static int hf_initiator_block = -1;
-static int hf_sgmp_security_scope = -1;
-static int hf_initial_state = -1;
-static int hf_latest_version = -1;
-static int hf_desire = -1;
-static int hf_ticket = -1;
-static int hf_sgmp_tmin = -1;
-static int hf_tie_breaker = -1;
-static int hf_delay = -1;
-static int hf_key = -1;
-
-static int ett_sgmp = -1;
-static int ett_sgmp_domain = -1;
-static int ett_initiator_block = -1;
-static int ett_sgmp_security_scope = -1;
-static int ett_initial_state = -1;
-static int ett_ticket = -1;
+static int proto_sgmp;
+
+static int hf_opcode;
+static int hf_sgmp_domain;
+static int hf_sgmp_epoch;
+static int hf_initiator_block;
+static int hf_sgmp_security_scope;
+static int hf_initial_state;
+static int hf_latest_version;
+static int hf_desire;
+static int hf_ticket;
+static int hf_sgmp_tmin;
+static int hf_tie_breaker;
+static int hf_delay;
+static int hf_key;
+
+static int ett_sgmp;
+static int ett_sgmp_domain;
+static int ett_initiator_block;
+static int ett_sgmp_security_scope;
+static int ett_initial_state;
+static int ett_ticket;
 
 #define SGMP_RESPONSE                                   (0x80)
 #define SGMP_CMD_HEARTBEAT                              (0)
@@ -1957,17 +1957,17 @@ static dissector_table_t dof_sec_dissectors;
 #define DOF_PROTOCOL_CCM 24577
 #define DSP_CCM_FAMILY 0x020000
 
-static int proto_ccm_app = -1;
-static int proto_ccm = -1;
-static int proto_ccm_dsp = -1;
+static int proto_ccm_app;
+static int proto_ccm;
+static int proto_ccm_dsp;
 
-static int hf_ccm_dsp_option = -1;
-static int hf_ccm_dsp_strength_count = -1;
-static int hf_ccm_dsp_strength = -1;
-static int hf_ccm_dsp_e_flag = -1;
-static int hf_ccm_dsp_m_flag = -1;
-static int hf_ccm_dsp_tmax = -1;
-static int hf_ccm_dsp_tmin = -1;
+static int hf_ccm_dsp_option;
+static int hf_ccm_dsp_strength_count;
+static int hf_ccm_dsp_strength;
+static int hf_ccm_dsp_e_flag;
+static int hf_ccm_dsp_m_flag;
+static int hf_ccm_dsp_tmax;
+static int hf_ccm_dsp_tmin;
 
 static const value_string ccm_strengths[] = {
     { 1, "256-bit" },
@@ -1975,28 +1975,28 @@ static const value_string ccm_strengths[] = {
     { 3, "128-bit" },
     { 0, NULL }
 };
-static int hf_ccm_opcode = -1;
+static int hf_ccm_opcode;
 
-static int hf_epp_v1_ccm_flags = -1;
-static int hf_epp_v1_ccm_flags_manager = -1;
-static int hf_epp_v1_ccm_flags_period = -1;
-static int hf_epp_v1_ccm_flags_target = -1;
-static int hf_epp_v1_ccm_flags_next_nid = -1;
-static int hf_epp_v1_ccm_flags_packet = -1;
-static int hf_epp_v1_ccm_tnid = -1;
-static int hf_epp_v1_ccm_nnid = -1;
-static int hf_epp_v1_ccm_nid = -1;
-static int hf_epp_v1_ccm_slot = -1;
-static int hf_epp_v1_ccm_pn = -1;
+static int hf_epp_v1_ccm_flags;
+static int hf_epp_v1_ccm_flags_manager;
+static int hf_epp_v1_ccm_flags_period;
+static int hf_epp_v1_ccm_flags_target;
+static int hf_epp_v1_ccm_flags_next_nid;
+static int hf_epp_v1_ccm_flags_packet;
+static int hf_epp_v1_ccm_tnid;
+static int hf_epp_v1_ccm_nnid;
+static int hf_epp_v1_ccm_nid;
+static int hf_epp_v1_ccm_slot;
+static int hf_epp_v1_ccm_pn;
 
-static int ett_header = -1;
-static int ett_epp_v1_ccm_flags = -1;
+static int ett_header;
+static int ett_epp_v1_ccm_flags;
 
-static int ett_ccm_dsp_option = -1;
-static int ett_ccm_dsp = -1;
-static int ett_ccm = -1;
+static int ett_ccm_dsp_option;
+static int ett_ccm_dsp;
+static int ett_ccm;
 
-static expert_field ei_decode_failure = EI_INIT;
+static expert_field ei_decode_failure;
 
 typedef struct _ccm_session_data
 {
@@ -2035,24 +2035,24 @@ static dissector_handle_t dof_oid_handle;
 
 static int oid_proto = -1;
 
-static int hf_oid_class = -1;
-static int hf_oid_header = -1;
-static int hf_oid_attribute = -1;
-static int hf_oid_length = -1;
-static int hf_oid_data = -1;
-static int hf_oid_all_attribute_data = -1;
-static int hf_oid_attribute_header = -1;
-static int hf_oid_attribute_attribute = -1;
-static int hf_oid_attribute_id = -1;
-static int hf_oid_attribute_length = -1;
-static int hf_oid_attribute_data = -1;
-static int hf_oid_attribute_oid = -1;
-
-static int ett_oid = -1;
-static int ett_oid_header = -1;
-static int ett_oid_attribute = -1;
-static int ett_oid_attribute_header = -1;
-static int ett_oid_attribute_oid = -1;
+static int hf_oid_class;
+static int hf_oid_header;
+static int hf_oid_attribute;
+static int hf_oid_length;
+static int hf_oid_data;
+static int hf_oid_all_attribute_data;
+static int hf_oid_attribute_header;
+static int hf_oid_attribute_attribute;
+static int hf_oid_attribute_id;
+static int hf_oid_attribute_length;
+static int hf_oid_attribute_data;
+static int hf_oid_attribute_oid;
+
+static int ett_oid;
+static int ett_oid_header;
+static int ett_oid_attribute;
+static int ett_oid_attribute_header;
+static int ett_oid_attribute_oid;
 
 /**
  * EXPERT INFOS
@@ -2060,27 +2060,27 @@ static int ett_oid_attribute_oid = -1;
  * they are listed separately.
  */
 #if 0
-static expert_field ei_undecoded = EI_INIT;
+static expert_field ei_undecoded;
 #endif
-static expert_field ei_malformed = EI_INIT;
-static expert_field ei_implicit_no_op = EI_INIT;
-static expert_field ei_c2_c3_c4_format = EI_INIT;
-static expert_field ei_type_4_header_zero = EI_INIT;
-static expert_field ei_dof_10_flags_zero = EI_INIT;
+static expert_field ei_malformed;
+static expert_field ei_implicit_no_op;
+static expert_field ei_c2_c3_c4_format;
+static expert_field ei_type_4_header_zero;
+static expert_field ei_dof_10_flags_zero;
 #if 0
-static expert_field ei_dof_13_length_specified = EI_INIT;
+static expert_field ei_dof_13_length_specified;
 #endif
 
-static expert_field ei_dpp2_dof_10_flags_zero = EI_INIT;
-static expert_field ei_dpp_default_flags = EI_INIT;
-static expert_field ei_dpp_explicit_sender_sid_included = EI_INIT;
-static expert_field ei_dpp_explicit_receiver_sid_included = EI_INIT;
-static expert_field ei_dpp_no_security_context = EI_INIT;
-static expert_field ei_dof_6_timeout = EI_INIT;
+static expert_field ei_dpp2_dof_10_flags_zero;
+static expert_field ei_dpp_default_flags;
+static expert_field ei_dpp_explicit_sender_sid_included;
+static expert_field ei_dpp_explicit_receiver_sid_included;
+static expert_field ei_dpp_no_security_context;
+static expert_field ei_dof_6_timeout;
 
-static expert_field ei_security_3_1_invalid_stage = EI_INIT;
-static expert_field ei_security_4_invalid_bit = EI_INIT;
-static expert_field ei_security_13_out_of_range = EI_INIT;
+static expert_field ei_security_3_1_invalid_stage;
+static expert_field ei_security_4_invalid_bit;
+static expert_field ei_security_13_out_of_range;
 
 /**
  * SOURCE IDENTIFIER (SID) SUPPORT
@@ -2308,9 +2308,9 @@ static void dof_ns_session_define(guint transport_session_id, guint client, guin
 /* COMMON PDU DISSECTORS */
 
 /* Security.1 */
-static int hf_security_1_permission_type = -1;
-static int hf_security_1_length = -1;
-static int hf_security_1_data = -1;
+static int hf_security_1_permission_type;
+static int hf_security_1_length;
+static int hf_security_1_data;
 
 static const value_string dof_2008_16_permission_type[] = {
     { 1, "Binding" },
@@ -2324,71 +2324,71 @@ static const value_string dof_2008_16_permission_type[] = {
 };
 
 /* Security.2 */
-static int hf_security_2_count = -1;
-static int ett_security_2_permission = -1;
-static int hf_security_2_permission = -1;
+static int hf_security_2_count;
+static int ett_security_2_permission;
+static int hf_security_2_permission;
 
 /* Security.3.1 */
-static int hf_security_3_1_credential_type = -1;
-static int hf_security_3_1_stage = -1;
-static int ett_security_3_1_security_node_identifier = -1;
-static int hf_security_3_1_security_node_identifier = -1;
+static int hf_security_3_1_credential_type;
+static int hf_security_3_1_stage;
+static int ett_security_3_1_security_node_identifier;
+static int hf_security_3_1_security_node_identifier;
 
 /* Security.3.2 */
-static int hf_security_3_2_credential_type = -1;
-static int hf_security_3_2_stage = -1;
-static int hf_security_3_2_length = -1;
-static int hf_security_3_2_public_data = -1;
+static int hf_security_3_2_credential_type;
+static int hf_security_3_2_stage;
+static int hf_security_3_2_length;
+static int hf_security_3_2_public_data;
 
 /* Security.4 */
-static int hf_security_4_l = -1;
-static int hf_security_4_f = -1;
-static int hf_security_4_ln = -1;
-static int ett_security_4_identity = -1;
-static int hf_security_4_identity = -1;
-static int hf_security_4_nonce = -1;
-static int ett_security_4_permission_set = -1;
-static int hf_security_4_permission_set = -1;
+static int hf_security_4_l;
+static int hf_security_4_f;
+static int hf_security_4_ln;
+static int ett_security_4_identity;
+static int hf_security_4_identity;
+static int hf_security_4_nonce;
+static int ett_security_4_permission_set;
+static int hf_security_4_permission_set;
 
 /* Security.5 */
-static int hf_security_5_mac = -1;
-static int hf_security_5_key = -1;
+static int hf_security_5_mac;
+static int hf_security_5_key;
 
 /* Security.6.1 */
-static int hf_security_6_1_desired_duration = -1;
-static int ett_security_6_1_desired_security_mode = -1;
-static int hf_security_6_1_desired_security_mode = -1;
-static int ett_security_6_1_initiator_request = -1;
-static int hf_security_6_1_initiator_request = -1;
+static int hf_security_6_1_desired_duration;
+static int ett_security_6_1_desired_security_mode;
+static int hf_security_6_1_desired_security_mode;
+static int ett_security_6_1_initiator_request;
+static int hf_security_6_1_initiator_request;
 
 /* Security.6.2 */
-static int ett_security_6_2_responder_request = -1;
-static int hf_security_6_2_responder_request = -1;
+static int ett_security_6_2_responder_request;
+static int hf_security_6_2_responder_request;
 
 /* Security.6.3 */
-static int hf_security_6_3_granted_duration = -1;
-static int ett_security_6_3_session_security_scope = -1;
-static int hf_security_6_3_session_security_scope = -1;
-static int ett_security_6_3_initiator_validation = -1;
-static int hf_security_6_3_initiator_validation = -1;
-static int ett_security_6_3_responder_validation = -1;
-static int hf_security_6_3_responder_validation = -1;
+static int hf_security_6_3_granted_duration;
+static int ett_security_6_3_session_security_scope;
+static int hf_security_6_3_session_security_scope;
+static int ett_security_6_3_initiator_validation;
+static int hf_security_6_3_initiator_validation;
+static int ett_security_6_3_responder_validation;
+static int hf_security_6_3_responder_validation;
 
 /* Security.9 */
-static int hf_security_9_length = -1;
-static int hf_security_9_initial_state = -1;
+static int hf_security_9_length;
+static int hf_security_9_initial_state;
 
 /* Security.10 */
-static int hf_security_10_count = -1;
-static int hf_security_10_permission_group_identifier = -1;
+static int hf_security_10_count;
+static int hf_security_10_permission_group_identifier;
 
 /* Security.11 */
-static int hf_security_11_count = -1;
-static int ett_security_11_permission_security_scope = -1;
-static int hf_security_11_permission_security_scope = -1;
+static int hf_security_11_count;
+static int ett_security_11_permission_security_scope;
+static int hf_security_11_permission_security_scope;
 
 /* Security.12 */
-static int hf_security_12_m = -1;
+static int hf_security_12_m;
 
 static const value_string dof_2008_16_security_12_m[] = {
     { 0, "Reference" },
@@ -2398,8 +2398,8 @@ static const value_string dof_2008_16_security_12_m[] = {
     { 0, NULL }
 };
 
-static int hf_security_12_count = -1;
-static int hf_security_12_permission_group_identifier = -1;
+static int hf_security_12_count;
+static int hf_security_12_permission_group_identifier;
 
 static bool
 dof_sessions_destroy_cb(wmem_allocator_t *allocator _U_, wmem_cb_event_t event _U_, void *user_data)
diff --git a/epan/dissectors/packet-doip.c b/epan/dissectors/packet-doip.c
index 86b1325fe9..1ad7531fb1 100644
--- a/epan/dissectors/packet-doip.c
+++ b/epan/dissectors/packet-doip.c
@@ -353,90 +353,90 @@ static gboolean doip_hide_address_names = TRUE;
  */
 
 /* DoIP header */
-static int hf_doip_version = -1;
-static int hf_doip_inv_version = -1;
-static int hf_doip_type = -1;
-static int hf_doip_length = -1;
+static int hf_doip_version;
+static int hf_doip_inv_version;
+static int hf_doip_type;
+static int hf_doip_length;
 
 
 /* Generic NACK */
-static int hf_generic_nack_code = -1;
+static int hf_generic_nack_code;
 
 
 /* Common */
-static int hf_reserved_iso = -1;
-static int hf_reserved_oem = -1;
+static int hf_reserved_iso;
+static int hf_reserved_oem;
 
 
 /* Routing activation request */
-static int hf_activation_type_v1 = -1;
-static int hf_activation_type_v2 = -1;
+static int hf_activation_type_v1;
+static int hf_activation_type_v2;
 
 
 /* Routing activation response */
-static int hf_tester_logical_address = -1;
-static int hf_tester_logical_address_name = -1;
-static int hf_response_code = -1;
+static int hf_tester_logical_address;
+static int hf_tester_logical_address_name;
+static int hf_response_code;
 
 
 /* Vehicle announcement message */
-static int hf_logical_address = -1;
-static int hf_logical_address_name = -1;
-static int hf_gid = -1;
-static int hf_futher_action = -1;
-static int hf_sync_status = -1;
+static int hf_logical_address;
+static int hf_logical_address_name;
+static int hf_gid;
+static int hf_futher_action;
+static int hf_sync_status;
 
 
 /* Diagnostic power mode information response */
-static int hf_power_mode = -1;
+static int hf_power_mode;
 
 
 /* Entity status response */
-static int hf_node_type = -1;
-static int hf_max_sockets = -1;
-static int hf_current_sockets = -1;
-static int hf_max_data_size = -1;
+static int hf_node_type;
+static int hf_max_sockets;
+static int hf_current_sockets;
+static int hf_max_data_size;
 
 
 /* Common */
-static int hf_vin = -1;
-static int hf_eid = -1;
-static int hf_source_address = -1;
-static int hf_source_address_name = -1;
-static int hf_target_address = -1;
-static int hf_target_address_name = -1;
-static int hf_previous = -1;
+static int hf_vin;
+static int hf_eid;
+static int hf_source_address;
+static int hf_source_address_name;
+static int hf_target_address;
+static int hf_target_address_name;
+static int hf_previous;
 
 
 /* Diagnostic message */
-static int hf_data = -1;
+static int hf_data;
 
 
 /* Diagnostic message ACK */
-static int hf_ack_code = -1;
+static int hf_ack_code;
 
 
 /* Diagnostic message NACK */
-static int hf_nack_code = -1;
+static int hf_nack_code;
 
 
 
 /*
  * Trees
  */
-static gint ett_doip = -1;
-static gint ett_header = -1;
-static gint ett_address = -1;
+static gint ett_doip;
+static gint ett_header;
+static gint ett_address;
 
 
 /* Misc */
 static dissector_handle_t doip_handle;
 static dissector_handle_t uds_handle;
-static gint proto_doip    = -1;
+static gint proto_doip;
 
 
 /* expert info items */
-static expert_field ei_doip_illegal_length_field = EI_INIT;
+static expert_field ei_doip_illegal_length_field;
 
 
 /*
diff --git a/epan/dissectors/packet-dpaux.c b/epan/dissectors/packet-dpaux.c
index e9461e2f8f..6b7fd15541 100644
--- a/epan/dissectors/packet-dpaux.c
+++ b/epan/dissectors/packet-dpaux.c
@@ -19,40 +19,40 @@
 
 void proto_register_dpaux(void);
 
-static int proto_dpaux = -1;
-
-static int hf_dpaux_transaction_type = -1;
-static int hf_dpaux_native_req_cmd = -1;
-static int hf_dpaux_i2c_req_cmd = -1;
-static int hf_dpaux_reply_cmd = -1;
-static int hf_dpaux_mot = -1;
-static int hf_dpaux_addr = -1;
-static int hf_dpaux_len = -1;
-static int hf_dpaux_data = -1;
-
-static int hf_dpaux_reg_addr = -1;
-
-static int hf_00000 = -1;
-static int hf_00000_MINOR = -1;
-static int hf_00000_MAJOR = -1;
+static int proto_dpaux;
+
+static int hf_dpaux_transaction_type;
+static int hf_dpaux_native_req_cmd;
+static int hf_dpaux_i2c_req_cmd;
+static int hf_dpaux_reply_cmd;
+static int hf_dpaux_mot;
+static int hf_dpaux_addr;
+static int hf_dpaux_len;
+static int hf_dpaux_data;
+
+static int hf_dpaux_reg_addr;
+
+static int hf_00000;
+static int hf_00000_MINOR;
+static int hf_00000_MAJOR;
 static int * const reg00000_fields[] = {
     &hf_00000_MAJOR,
     &hf_00000_MINOR,
     NULL
 };
 
-static int hf_00001 = -1;
-static int hf_00001_MAX_LINK_RATE = -1;
+static int hf_00001;
+static int hf_00001_MAX_LINK_RATE;
 static int * const reg00001_fields[] = {
     &hf_00001_MAX_LINK_RATE,
     NULL
 };
 
-static int hf_00002 = -1;
-static int hf_00002_MAX_LANE_COUNT = -1;
-static int hf_00002_POST_LT_ADJ_REQ_SUPPORTED = -1;
-static int hf_00002_TPS3_SUPPORTED = -1;
-static int hf_00002_ENHANCED_FRAME_CAP = -1;
+static int hf_00002;
+static int hf_00002_MAX_LANE_COUNT;
+static int hf_00002_POST_LT_ADJ_REQ_SUPPORTED;
+static int hf_00002_TPS3_SUPPORTED;
+static int hf_00002_ENHANCED_FRAME_CAP;
 static int * const reg00002_fields[] = {
     &hf_00002_MAX_LANE_COUNT,
     &hf_00002_POST_LT_ADJ_REQ_SUPPORTED,
@@ -61,10 +61,10 @@ static int * const reg00002_fields[] = {
     NULL
 };
 
-static int hf_00003 = -1;
-static int hf_00003_MAX_DOWNSPREAD = -1;
-static int hf_00003_NO_AUX_TRANSACTION_LINK_TRAINING = -1;
-static int hf_00003_TPS4_SUPPORTED = -1;
+static int hf_00003;
+static int hf_00003_MAX_DOWNSPREAD;
+static int hf_00003_NO_AUX_TRANSACTION_LINK_TRAINING;
+static int hf_00003_TPS4_SUPPORTED;
 static int * const reg00003_fields[] = {
     &hf_00003_MAX_DOWNSPREAD,
     &hf_00003_NO_AUX_TRANSACTION_LINK_TRAINING,
@@ -72,11 +72,11 @@ static int * const reg00003_fields[] = {
     NULL
 };
 
-static int hf_00004 = -1;
-static int hf_00004_NORP = -1;
-static int hf_00004_5V_DP_PWR_CAP = -1;
-static int hf_00004_12V_DP_PWR_CAP = -1;
-static int hf_00004_18V_DP_PWR_CAP = -1;
+static int hf_00004;
+static int hf_00004_NORP;
+static int hf_00004_5V_DP_PWR_CAP;
+static int hf_00004_12V_DP_PWR_CAP;
+static int hf_00004_18V_DP_PWR_CAP;
 static int * const reg00004_fields[] = {
     &hf_00004_NORP,
     &hf_00004_5V_DP_PWR_CAP,
@@ -86,8 +86,8 @@ static int * const reg00004_fields[] = {
 };
 
 /* Initialize the subtree pointers */
-static gint ett_dpaux = -1;
-static gint ett_register = -1;
+static gint ett_dpaux;
+static gint ett_register;
 
 struct dpaux_transaction {
     gboolean is_native;
diff --git a/epan/dissectors/packet-dpauxmon.c b/epan/dissectors/packet-dpauxmon.c
index d1f47c4950..0ac417fbd8 100644
--- a/epan/dissectors/packet-dpauxmon.c
+++ b/epan/dissectors/packet-dpauxmon.c
@@ -34,15 +34,15 @@ static dissector_handle_t dpaux_handle;
 static dissector_handle_t dpauxmon_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_dpauxmon = -1;
+static int proto_dpauxmon;
 
-static int hf_packet_type = -1;
-static int hf_origin = -1;
-static int hf_inputs = -1;
-static int hf_hpd = -1;
-static int hf_in0 = -1;
-static int hf_in1 = -1;
-static int hf_in2 = -1;
+static int hf_packet_type;
+static int hf_origin;
+static int hf_inputs;
+static int hf_hpd;
+static int hf_in0;
+static int hf_in1;
+static int hf_in2;
 
 static int * const input_fields[] = {
     &hf_hpd,
@@ -53,7 +53,7 @@ static int * const input_fields[] = {
 };
 
 /* Initialize the subtree pointers */
-static gint ett_dpauxmon = -1;
+static gint ett_dpauxmon;
 
 static const value_string packet_type_vals[] = {
     { DPAUXMON_DATA, "Data" },
diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c
index 99bfe58cb2..692fe45a12 100644
--- a/epan/dissectors/packet-dplay.c
+++ b/epan/dissectors/packet-dplay.c
@@ -23,47 +23,47 @@ void proto_reg_handoff_dplay(void);
 static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 static gint dissect_type1a_message(proto_tree *tree, tvbuff_t *tvb, gint offset);
 
-static int proto_dplay = -1;
+static int proto_dplay;
 
 /* Common data fields */
-static int hf_dplay_size = -1;              /* Size of the whole data */
-static int hf_dplay_token = -1;
-static int hf_dplay_saddr_af = -1;          /* WINSOCK_AF_INET, as this dissector does not handle IPX yet */
-static int hf_dplay_saddr_port = -1;        /* port to use for the reply to this packet */
-static int hf_dplay_saddr_ip = -1;          /* IP to use for the reply to this packet, or 0.0.0.0,
+static int hf_dplay_size;              /* Size of the whole data */
+static int hf_dplay_token;
+static int hf_dplay_saddr_af;          /* WINSOCK_AF_INET, as this dissector does not handle IPX yet */
+static int hf_dplay_saddr_port;        /* port to use for the reply to this packet */
+static int hf_dplay_saddr_ip;          /* IP to use for the reply to this packet, or 0.0.0.0,
                                                then use the same IP as this packet used. */
-static int hf_dplay_saddr_padding = -1;     /* null padding used in s_addr_in structures */
-static int hf_dplay_play_str = -1;          /* always "play" without a null terminator */
-static int hf_dplay_command = -1;           /* the dplay command this message contains*/
-static int hf_dplay_proto_dialect = -1;     /* 0x0b00 for dplay7, 0x0e00 for dplay9 */
-static int hf_dplay_play_str_2 = -1;        /* packet type 0x0015 encapsulates another packet */
-static int hf_dplay_command_2 = -1;         /* that also has a "play" string, a command and a */
-static int hf_dplay_proto_dialect_2 = -1;   /* protocol dialect, same as above */
+static int hf_dplay_saddr_padding;     /* null padding used in s_addr_in structures */
+static int hf_dplay_play_str;          /* always "play" without a null terminator */
+static int hf_dplay_command;           /* the dplay command this message contains*/
+static int hf_dplay_proto_dialect;     /* 0x0b00 for dplay7, 0x0e00 for dplay9 */
+static int hf_dplay_play_str_2;        /* packet type 0x0015 encapsulates another packet */
+static int hf_dplay_command_2;         /* that also has a "play" string, a command and a */
+static int hf_dplay_proto_dialect_2;   /* protocol dialect, same as above */
 static const int DPLAY_HEADER_OFFSET = 28;  /* The dplay header is 28 bytes in size */
-static int hf_dplay_player_msg = -1;
+static int hf_dplay_player_msg;
 
 /* The following fields are not part of the header, but hopefully have the same
  * meaning for all packets they show up in. */
 
-static int hf_dplay_sess_desc_flags = -1; /* This is a 32bit field with some sort of a flag */
-static int hf_dplay_flags_no_create_players = -1;
-static int hf_dplay_flags_0002 = -1;
-static int hf_dplay_flags_migrate_host = -1;
-static int hf_dplay_flags_short_player_msg = -1;
-static int hf_dplay_flags_ignored = -1;
-static int hf_dplay_flags_can_join = -1;
-static int hf_dplay_flags_use_ping = -1;
-static int hf_dplay_flags_no_player_updates = -1;
-static int hf_dplay_flags_use_auth = -1;
-static int hf_dplay_flags_private_session = -1;
-static int hf_dplay_flags_password_req = -1;
-static int hf_dplay_flags_route = -1;
-static int hf_dplay_flags_server_player_only = -1;
-static int hf_dplay_flags_reliable = -1;
-static int hf_dplay_flags_preserve_order = -1;
-static int hf_dplay_flags_optimize_latency = -1;
-static int hf_dplay_flags_acqire_voice = -1;
-static int hf_dplay_flags_no_sess_desc_changes = -1;
+static int hf_dplay_sess_desc_flags; /* This is a 32bit field with some sort of a flag */
+static int hf_dplay_flags_no_create_players;
+static int hf_dplay_flags_0002;
+static int hf_dplay_flags_migrate_host;
+static int hf_dplay_flags_short_player_msg;
+static int hf_dplay_flags_ignored;
+static int hf_dplay_flags_can_join;
+static int hf_dplay_flags_use_ping;
+static int hf_dplay_flags_no_player_updates;
+static int hf_dplay_flags_use_auth;
+static int hf_dplay_flags_private_session;
+static int hf_dplay_flags_password_req;
+static int hf_dplay_flags_route;
+static int hf_dplay_flags_server_player_only;
+static int hf_dplay_flags_reliable;
+static int hf_dplay_flags_preserve_order;
+static int hf_dplay_flags_optimize_latency;
+static int hf_dplay_flags_acqire_voice;
+static int hf_dplay_flags_no_sess_desc_changes;
 
 #define DPLAY_FLAG_NO_CREATE_PLAYERS 0x00000001
 #define DPLAY_FLAG_0002 0x00000002
@@ -85,113 +85,113 @@ static int hf_dplay_flags_no_sess_desc_changes = -1;
 #define DPLAY_FLAG_NO_SESS_DESC_CHANGES 0x00020000
 
 /* Session description structure fields */
-static int hf_dplay_sess_desc_length = -1;
-static int hf_dplay_game_guid = -1;
-static int hf_dplay_instance_guid = -1;
-static int hf_dplay_max_players = -1;
-static int hf_dplay_curr_players = -1;
-static int hf_dplay_sess_name_ptr = -1;
-static int hf_dplay_passwd_ptr = -1;
-static int hf_dplay_sess_desc_reserved_1 = -1;
-static int hf_dplay_sess_desc_reserved_2 = -1;
-static int hf_dplay_sess_desc_user_1 = -1;
-static int hf_dplay_sess_desc_user_2 = -1;
-static int hf_dplay_sess_desc_user_3 = -1;
-static int hf_dplay_sess_desc_user_4 = -1;
+static int hf_dplay_sess_desc_length;
+static int hf_dplay_game_guid;
+static int hf_dplay_instance_guid;
+static int hf_dplay_max_players;
+static int hf_dplay_curr_players;
+static int hf_dplay_sess_name_ptr;
+static int hf_dplay_passwd_ptr;
+static int hf_dplay_sess_desc_reserved_1;
+static int hf_dplay_sess_desc_reserved_2;
+static int hf_dplay_sess_desc_user_1;
+static int hf_dplay_sess_desc_user_2;
+static int hf_dplay_sess_desc_user_3;
+static int hf_dplay_sess_desc_user_4;
 
 /* PackedPlayer structure fields */
-static int hf_dplay_pp_size = -1;
-static int hf_dplay_pp_flags = -1;
-static int hf_dplay_pp_flag_sysplayer = -1;
-static int hf_dplay_pp_flag_nameserver = -1;
-static int hf_dplay_pp_flag_in_group = -1;
-static int hf_dplay_pp_flag_sending = -1;
-static int hf_dplay_pp_id = -1;
-static int hf_dplay_pp_short_name_len = -1;
-static int hf_dplay_pp_long_name_len = -1;
-static int hf_dplay_pp_sp_data_size = -1;
-static int hf_dplay_pp_player_data_size = -1;
-static int hf_dplay_pp_num_players = -1;
-static int hf_dplay_pp_system_player = -1;
-static int hf_dplay_pp_fixed_size = -1;
-static int hf_dplay_pp_dialect = -1;
-static int hf_dplay_pp_unknown_1 = -1;
-static int hf_dplay_pp_short_name = -1;
-static int hf_dplay_pp_long_name = -1;
-static int hf_dplay_pp_sp_data = -1;
-static int hf_dplay_pp_player_data = -1;
-static int hf_dplay_pp_player_id = -1;
-static int hf_dplay_pp_parent_id = -1;
+static int hf_dplay_pp_size;
+static int hf_dplay_pp_flags;
+static int hf_dplay_pp_flag_sysplayer;
+static int hf_dplay_pp_flag_nameserver;
+static int hf_dplay_pp_flag_in_group;
+static int hf_dplay_pp_flag_sending;
+static int hf_dplay_pp_id;
+static int hf_dplay_pp_short_name_len;
+static int hf_dplay_pp_long_name_len;
+static int hf_dplay_pp_sp_data_size;
+static int hf_dplay_pp_player_data_size;
+static int hf_dplay_pp_num_players;
+static int hf_dplay_pp_system_player;
+static int hf_dplay_pp_fixed_size;
+static int hf_dplay_pp_dialect;
+static int hf_dplay_pp_unknown_1;
+static int hf_dplay_pp_short_name;
+static int hf_dplay_pp_long_name;
+static int hf_dplay_pp_sp_data;
+static int hf_dplay_pp_player_data;
+static int hf_dplay_pp_player_id;
+static int hf_dplay_pp_parent_id;
 #define DPLAY_PP_FLAG_SYSPLAYER 0x00000001
 #define DPLAY_PP_FLAG_NAMESERVER 0x00000002
 #define DPLAY_PP_FLAG_IN_GROUP 0x00000004
 #define DPLAY_PP_FLAG_SENDING 0x00000008
 
 /* SuperPackedPlayer structure fields */
-static int hf_dplay_spp_size = -1;
-static int hf_dplay_spp_flags = -1;
-static int hf_dplay_spp_flags_sysplayer = -1;
-static int hf_dplay_spp_flags_nameserver = -1;
-static int hf_dplay_spp_flags_in_group = -1;
-static int hf_dplay_spp_flags_sending = -1;
-static int hf_dplay_spp_id = -1;
-static int hf_dplay_spp_player_info_mask = -1;
-static int hf_dplay_spp_have_short_name = -1;
-static int hf_dplay_spp_have_long_name = -1;
-static int hf_dplay_spp_sp_length_type = -1;
-static int hf_dplay_spp_pd_length_type = -1;
-static int hf_dplay_spp_player_count_type = -1;
-static int hf_dplay_spp_have_parent_id = -1;
-static int hf_dplay_spp_shortcut_count_type = -1;
-static int hf_dplay_spp_dialect = -1;
-static int hf_dplay_spp_sys_player_id = -1;
-static int hf_dplay_spp_short_name = -1;
-static int hf_dplay_spp_long_name = -1;
-static int hf_dplay_spp_player_data_length = -1;
-static int hf_dplay_spp_player_data = -1;
-static int hf_dplay_spp_sp_data_length = -1;
-static int hf_dplay_spp_sp_data = -1;
-static int hf_dplay_spp_player_count = -1;
-static int hf_dplay_spp_player_id = -1;
-static int hf_dplay_spp_parent_id = -1;
-static int hf_dplay_spp_shortcut_count = -1;
-static int hf_dplay_spp_shortcut_id = -1;
+static int hf_dplay_spp_size;
+static int hf_dplay_spp_flags;
+static int hf_dplay_spp_flags_sysplayer;
+static int hf_dplay_spp_flags_nameserver;
+static int hf_dplay_spp_flags_in_group;
+static int hf_dplay_spp_flags_sending;
+static int hf_dplay_spp_id;
+static int hf_dplay_spp_player_info_mask;
+static int hf_dplay_spp_have_short_name;
+static int hf_dplay_spp_have_long_name;
+static int hf_dplay_spp_sp_length_type;
+static int hf_dplay_spp_pd_length_type;
+static int hf_dplay_spp_player_count_type;
+static int hf_dplay_spp_have_parent_id;
+static int hf_dplay_spp_shortcut_count_type;
+static int hf_dplay_spp_dialect;
+static int hf_dplay_spp_sys_player_id;
+static int hf_dplay_spp_short_name;
+static int hf_dplay_spp_long_name;
+static int hf_dplay_spp_player_data_length;
+static int hf_dplay_spp_player_data;
+static int hf_dplay_spp_sp_data_length;
+static int hf_dplay_spp_sp_data;
+static int hf_dplay_spp_player_count;
+static int hf_dplay_spp_player_id;
+static int hf_dplay_spp_parent_id;
+static int hf_dplay_spp_shortcut_count;
+static int hf_dplay_spp_shortcut_id;
 #define DPLAY_SPP_FLAG_SYSPLAYER 0x00000001
 #define DPLAY_SPP_FLAG_NAMESERVER 0x00000002
 #define DPLAY_SPP_FLAG_IN_GROUP 0x00000004
 #define DPLAY_SPP_FLAG_SENDING 0x00000008
 
 /* SecurityDesc structure fields */
-static int hf_dplay_sd_size = -1;
-static int hf_dplay_sd_flags = -1;
-static int hf_dplay_sd_sspi = -1;
-static int hf_dplay_sd_capi = -1;
-static int hf_dplay_sd_capi_type = -1;
-static int hf_dplay_sd_enc_alg = -1;
+static int hf_dplay_sd_size;
+static int hf_dplay_sd_flags;
+static int hf_dplay_sd_sspi;
+static int hf_dplay_sd_capi;
+static int hf_dplay_sd_capi_type;
+static int hf_dplay_sd_enc_alg;
 
 /* Message Type 0x0001 data fields */
-static int hf_dplay_type_01_name_offset = -1;
-static int hf_dplay_type_01_game_name = -1;
+static int hf_dplay_type_01_name_offset;
+static int hf_dplay_type_01_game_name;
 
 /* Message Type 0x0002 data fields */
-static int hf_dplay_type_02_game_guid = -1;
-static int hf_dplay_type_02_password_offset = -1;
-static int hf_dplay_type_02_flags = -1;
-static int hf_dplay_type_02_password = -1;
-static int hf_enum_sess_flag_join = -1;
-static int hf_enum_sess_flag_all = -1;
-static int hf_enum_sess_flag_passwd = -1;
+static int hf_dplay_type_02_game_guid;
+static int hf_dplay_type_02_password_offset;
+static int hf_dplay_type_02_flags;
+static int hf_dplay_type_02_password;
+static int hf_enum_sess_flag_join;
+static int hf_enum_sess_flag_all;
+static int hf_enum_sess_flag_passwd;
 #define DPLAY_ENUM_SESS_FLAG_JOIN 0x00000001
 #define DPLAY_ENUM_SESS_FLAG_ALL 0x00000002
 #define DPLAY_ENUM_SESS_FLAG_PASSWD 0x00000040
 
 /* Message Type 0x0005 data fields */
-static int hf_dplay_type_05_flags = -1;
-static int hf_dplay_type_05_system_player = -1;
-static int hf_dplay_type_05_name_server = -1;
-static int hf_dplay_type_05_local = -1;
-static int hf_dplay_type_05_unknown = -1; /* unknown, but always set */
-static int hf_dplay_type_05_secure = -1;
+static int hf_dplay_type_05_flags;
+static int hf_dplay_type_05_system_player;
+static int hf_dplay_type_05_name_server;
+static int hf_dplay_type_05_local;
+static int hf_dplay_type_05_unknown; /* unknown, but always set */
+static int hf_dplay_type_05_secure;
 #define DPLAY_TYPE05_FLAG_SYSPLAYER 0x00000001
 #define DPLAY_TYPE05_FLAG_NAMESERVER 0x00000002
 #define DPLAY_TYPE05_FLAG_LOCAL 0x00000004
@@ -199,85 +199,85 @@ static int hf_dplay_type_05_secure = -1;
 #define DPLAY_TYPE05_FLAG_SECURE 0x00000200
 
 /* Message Type 0x0007 data fields */
-static int hf_dplay_type_07_dpid = -1;
-static int hf_dplay_type_07_sspi_offset = -1;
-static int hf_dplay_type_07_capi_offset = -1;
-static int hf_dplay_type_07_hresult = -1;
-static int hf_dplay_type_07_sspi = -1;
-static int hf_dplay_type_07_capi = -1;
+static int hf_dplay_type_07_dpid;
+static int hf_dplay_type_07_sspi_offset;
+static int hf_dplay_type_07_capi_offset;
+static int hf_dplay_type_07_hresult;
+static int hf_dplay_type_07_sspi;
+static int hf_dplay_type_07_capi;
 
 /* Data fields for message types 0x08, 0x09, 0x0b, 0x0c, 0x0d, 0x0e */
-static int hf_dplay_multi_id_to = -1;
-static int hf_dplay_multi_player_id = -1;
-static int hf_dplay_multi_group_id = -1;
-static int hf_dplay_multi_create_offset = -1;
-static int hf_dplay_multi_password_offset = -1;
-static int hf_dplay_multi_password = -1;
+static int hf_dplay_multi_id_to;
+static int hf_dplay_multi_player_id;
+static int hf_dplay_multi_group_id;
+static int hf_dplay_multi_create_offset;
+static int hf_dplay_multi_password_offset;
+static int hf_dplay_multi_password;
 
 /* Message Type 0x000f data fields */
-static int hf_dplay_type_0f_id_to = -1;
-static int hf_dplay_type_0f_id = -1;
-static int hf_dplay_type_0f_data_size = -1;
-static int hf_dplay_type_0f_data_offset = -1;
-static int hf_dplay_type_0f_data = -1;
+static int hf_dplay_type_0f_id_to;
+static int hf_dplay_type_0f_id;
+static int hf_dplay_type_0f_data_size;
+static int hf_dplay_type_0f_data_offset;
+static int hf_dplay_type_0f_data;
 
 /* Message Type 0x0013 data fields */
-static int hf_dplay_type_13_id_to = -1;
-static int hf_dplay_type_13_player_id = -1;
-static int hf_dplay_type_13_group_id = -1;
-static int hf_dplay_type_13_create_offset = -1;
-static int hf_dplay_type_13_password_offset = -1;
-static int hf_dplay_type_13_password = -1;
-static int hf_dplay_type_13_tick_count = -1;
+static int hf_dplay_type_13_id_to;
+static int hf_dplay_type_13_player_id;
+static int hf_dplay_type_13_group_id;
+static int hf_dplay_type_13_create_offset;
+static int hf_dplay_type_13_password_offset;
+static int hf_dplay_type_13_password;
+static int hf_dplay_type_13_tick_count;
 
 /* Message Type 0x0015 data fields */
-static int hf_dplay_message_guid = -1;
-static int hf_dplay_type_15_packet_idx = -1;
-static int hf_dplay_type_15_data_size = -1;
-static int hf_dplay_type_15_offset = -1;
-static int hf_dplay_type_15_total_packets = -1;
-static int hf_dplay_type_15_msg_size = -1;
-static int hf_dplay_type_15_packet_offset = -1;
+static int hf_dplay_message_guid;
+static int hf_dplay_type_15_packet_idx;
+static int hf_dplay_type_15_data_size;
+static int hf_dplay_type_15_offset;
+static int hf_dplay_type_15_total_packets;
+static int hf_dplay_type_15_msg_size;
+static int hf_dplay_type_15_packet_offset;
 
 /* Message Type 0x0016 and 0x0017 data fields */
-static int hf_dplay_ping_id_from = -1;
-static int hf_dplay_ping_tick_count = -1;
+static int hf_dplay_ping_id_from;
+static int hf_dplay_ping_tick_count;
 
 /* Message Type 0x001a data fields */
-static int hf_dplay_type_1a_id_to = -1;
-static int hf_dplay_type_1a_sess_name_ofs = -1;
-static int hf_dplay_type_1a_password_ofs = -1;
-static int hf_dplay_type_1a_session_name = -1;
-static int hf_dplay_type_1a_password = -1;
+static int hf_dplay_type_1a_id_to;
+static int hf_dplay_type_1a_sess_name_ofs;
+static int hf_dplay_type_1a_password_ofs;
+static int hf_dplay_type_1a_session_name;
+static int hf_dplay_type_1a_password;
 
 /* Message Type 0x0029 data fields */
-static int hf_dplay_type_29_player_count = -1;
-static int hf_dplay_type_29_group_count = -1;
-static int hf_dplay_type_29_packed_offset = -1;
-static int hf_dplay_type_29_shortcut_count = -1;
-static int hf_dplay_type_29_description_offset = -1;
-static int hf_dplay_type_29_name_offset = -1;
-static int hf_dplay_type_29_password_offset = -1;
-static int hf_dplay_type_29_game_name = -1;
-static int hf_dplay_type_29_password = -1;
+static int hf_dplay_type_29_player_count;
+static int hf_dplay_type_29_group_count;
+static int hf_dplay_type_29_packed_offset;
+static int hf_dplay_type_29_shortcut_count;
+static int hf_dplay_type_29_description_offset;
+static int hf_dplay_type_29_name_offset;
+static int hf_dplay_type_29_password_offset;
+static int hf_dplay_type_29_game_name;
+static int hf_dplay_type_29_password;
 
 /* Message Type 0x002f data fields */
-static int hf_dplay_type_2f_dpid = -1;
+static int hf_dplay_type_2f_dpid;
 
 /* various */
-static gint ett_dplay = -1;
-static gint ett_dplay_header = -1;
-static gint ett_dplay_sockaddr = -1;
-static gint ett_dplay_data = -1;
-static gint ett_dplay_enc_packet = -1;
-static gint ett_dplay_flags = -1;
-static gint ett_dplay_sess_desc_flags = -1;
-static gint ett_dplay_pp_flags = -1;
-static gint ett_dplay_spp_flags = -1;
-static gint ett_dplay_spp_info_mask = -1;
-static gint ett_dplay_type02_flags = -1;
-static gint ett_dplay_type05_flags = -1;
-static gint ett_dplay_type29_spp = -1;
+static gint ett_dplay;
+static gint ett_dplay_header;
+static gint ett_dplay_sockaddr;
+static gint ett_dplay_data;
+static gint ett_dplay_enc_packet;
+static gint ett_dplay_flags;
+static gint ett_dplay_sess_desc_flags;
+static gint ett_dplay_pp_flags;
+static gint ett_dplay_spp_flags;
+static gint ett_dplay_spp_info_mask;
+static gint ett_dplay_type02_flags;
+static gint ett_dplay_type05_flags;
+static gint ett_dplay_type29_spp;
 
 static const value_string dplay_command_val[] = {
     { 0x0001, "Enum Sessions Reply" },
diff --git a/epan/dissectors/packet-dpnet.c b/epan/dissectors/packet-dpnet.c
index 8bfc9892bb..8b72dda55a 100644
--- a/epan/dissectors/packet-dpnet.c
+++ b/epan/dissectors/packet-dpnet.c
@@ -22,74 +22,74 @@ static dissector_handle_t dpnet_handle;
 
 #define DPNET_PORT 6073
 
-static int proto_dpnet = -1;
-
-static int hf_dpnet_lead = -1;
-static int hf_dpnet_command = -1;
-static int hf_dpnet_payload = -1;
-static int hf_dpnet_type = -1;
-static int hf_dpnet_application = -1;
-static int hf_dpnet_data = -1;
-static int hf_dpnet_reply_offset = -1;
-static int hf_dpnet_response_size = -1;
-
-static int hf_dpnet_desc_size = -1;
-static int hf_dpnet_desc_flags = -1;
-static int hf_dpnet_max_players = -1;
-static int hf_dpnet_current_players = -1;
-static int hf_dpnet_session_offset = -1;
-static int hf_dpnet_session_size = -1;
-static int hf_dpnet_session_name = -1;
-static int hf_dpnet_password_offset = -1;
-static int hf_dpnet_password_size = -1;
-static int hf_dpnet_reserved_offset = -1;
-static int hf_dpnet_reserved_size = -1;
-static int hf_dpnet_application_offset = -1;
-static int hf_dpnet_application_size = -1;
-static int hf_dpnet_application_data = -1;
-static int hf_dpnet_instance = -1;
-static int hf_dpnet_data_cframe_control = -1;
-static int hf_dpnet_data_cframe_msgid = -1;
-static int hf_dpnet_data_cframe_rspid = -1;
-static int hf_dpnet_data_cframe_protocol = -1;
-static int hf_dpnet_data_cframe_session = -1;
-static int hf_dpnet_data_cframe_timestamp = -1;
-static int hf_dpnet_data_cframe_padding = -1;
-static int hf_dpnet_data_cframe_flags = -1;
-static int hf_dpnet_data_cframe_retry = -1;
-static int hf_dpnet_data_cframe_nseq = -1;
-static int hf_dpnet_data_cframe_nrcv = -1;
-static int hf_dpnet_data_cframe_sack_mask1 = -1;
-static int hf_dpnet_data_cframe_sack_mask2 = -1;
-static int hf_dpnet_data_cframe_send_mask1 = -1;
-static int hf_dpnet_data_cframe_send_mask2 = -1;
-static int hf_dpnet_data_cframe_signature = -1;
-static int hf_dpnet_data_cframe_send_secret = -1;
-static int hf_dpnet_data_cframe_recv_secret = -1;
-static int hf_dpnet_data_cframe_signing_opts = -1;
-static int hf_dpnet_data_cframe_echo_time = -1;
-static int hf_dpnet_data_seq        = -1;
-static int hf_dpnet_data_nseq       = -1;
-static int hf_dpnet_data_command = -1;
-static int hf_dpnet_command_data     = -1;
-static int hf_dpnet_command_reliable = -1;
-static int hf_dpnet_command_seq      = -1;
-static int hf_dpnet_command_poll     = -1;
-static int hf_dpnet_command_new_msg  = -1;
-static int hf_dpnet_command_end_msg  = -1;
-static int hf_dpnet_command_user1    = -1;
-static int hf_dpnet_command_user2    = -1;
-static int hf_dpnet_desc_client_server = -1;
-static int hf_dpnet_desc_migrate_host  = -1;
-static int hf_dpnet_desc_nodpnsvr      = -1;
-static int hf_dpnet_desc_req_password  = -1;
-static int hf_dpnet_desc_no_enums      = -1;
-static int hf_dpnet_desc_fast_signed   = -1;
-static int hf_dpnet_desc_full_signed   = -1;
-
-static gint ett_dpnet = -1;
-static gint ett_dpnet_command_flags = -1;
-static gint ett_dpnet_desc_flags = -1;
+static int proto_dpnet;
+
+static int hf_dpnet_lead;
+static int hf_dpnet_command;
+static int hf_dpnet_payload;
+static int hf_dpnet_type;
+static int hf_dpnet_application;
+static int hf_dpnet_data;
+static int hf_dpnet_reply_offset;
+static int hf_dpnet_response_size;
+
+static int hf_dpnet_desc_size;
+static int hf_dpnet_desc_flags;
+static int hf_dpnet_max_players;
+static int hf_dpnet_current_players;
+static int hf_dpnet_session_offset;
+static int hf_dpnet_session_size;
+static int hf_dpnet_session_name;
+static int hf_dpnet_password_offset;
+static int hf_dpnet_password_size;
+static int hf_dpnet_reserved_offset;
+static int hf_dpnet_reserved_size;
+static int hf_dpnet_application_offset;
+static int hf_dpnet_application_size;
+static int hf_dpnet_application_data;
+static int hf_dpnet_instance;
+static int hf_dpnet_data_cframe_control;
+static int hf_dpnet_data_cframe_msgid;
+static int hf_dpnet_data_cframe_rspid;
+static int hf_dpnet_data_cframe_protocol;
+static int hf_dpnet_data_cframe_session;
+static int hf_dpnet_data_cframe_timestamp;
+static int hf_dpnet_data_cframe_padding;
+static int hf_dpnet_data_cframe_flags;
+static int hf_dpnet_data_cframe_retry;
+static int hf_dpnet_data_cframe_nseq;
+static int hf_dpnet_data_cframe_nrcv;
+static int hf_dpnet_data_cframe_sack_mask1;
+static int hf_dpnet_data_cframe_sack_mask2;
+static int hf_dpnet_data_cframe_send_mask1;
+static int hf_dpnet_data_cframe_send_mask2;
+static int hf_dpnet_data_cframe_signature;
+static int hf_dpnet_data_cframe_send_secret;
+static int hf_dpnet_data_cframe_recv_secret;
+static int hf_dpnet_data_cframe_signing_opts;
+static int hf_dpnet_data_cframe_echo_time;
+static int hf_dpnet_data_seq;
+static int hf_dpnet_data_nseq;
+static int hf_dpnet_data_command;
+static int hf_dpnet_command_data;
+static int hf_dpnet_command_reliable;
+static int hf_dpnet_command_seq;
+static int hf_dpnet_command_poll;
+static int hf_dpnet_command_new_msg;
+static int hf_dpnet_command_end_msg;
+static int hf_dpnet_command_user1;
+static int hf_dpnet_command_user2;
+static int hf_dpnet_desc_client_server;
+static int hf_dpnet_desc_migrate_host;
+static int hf_dpnet_desc_nodpnsvr;
+static int hf_dpnet_desc_req_password;
+static int hf_dpnet_desc_no_enums;
+static int hf_dpnet_desc_fast_signed;
+static int hf_dpnet_desc_full_signed;
+
+static gint ett_dpnet;
+static gint ett_dpnet_command_flags;
+static gint ett_dpnet_desc_flags;
 
 #define DPNET_QUERY_GUID     0x01
 
diff --git a/epan/dissectors/packet-dpnss-link.c b/epan/dissectors/packet-dpnss-link.c
index 48daba733e..faf2e9a41a 100644
--- a/epan/dissectors/packet-dpnss-link.c
+++ b/epan/dissectors/packet-dpnss-link.c
@@ -24,16 +24,16 @@ void proto_reg_handoff_dpnss_link(void);
 static dissector_handle_t dpnss_handle; /* DPNSS UI frame dissector */
 #define LINK_HEADER_SIZE 3
 
-static int proto_dpnss_link = -1;
+static int proto_dpnss_link;
 
-static int hf_dpnss_link_address_framegroup = -1;
-static int hf_dpnss_link_address_crbit = -1;
-static int hf_dpnss_link_address_extension = -1;
-static int hf_dpnss_link_address2_reserved = -1;
-static int hf_dpnss_link_address2_dlcId = -1;
-static int hf_dpnss_link_address2_dlcIdNr = -1;
-static int hf_dpnss_link_address2_extension = -1;
-static int hf_dpnss_link_control_frameType = -1;
+static int hf_dpnss_link_address_framegroup;
+static int hf_dpnss_link_address_crbit;
+static int hf_dpnss_link_address_extension;
+static int hf_dpnss_link_address2_reserved;
+static int hf_dpnss_link_address2_dlcId;
+static int hf_dpnss_link_address2_dlcIdNr;
+static int hf_dpnss_link_address2_extension;
+static int hf_dpnss_link_control_frameType;
 
 static const value_string dpnss_link_framegroup_vals[] = {
 	{ 0x11, "Information Frame" },
@@ -78,7 +78,7 @@ static const value_string dpnss_link_frameType_vals[] = {
 	{ 0, NULL }
 };
 
-static int ett_dpnss_link = -1;
+static int ett_dpnss_link;
 
 static dissector_handle_t dpnss_link_handle;
 
diff --git a/epan/dissectors/packet-dpnss.c b/epan/dissectors/packet-dpnss.c
index d8431f28b2..be1021efc6 100644
--- a/epan/dissectors/packet-dpnss.c
+++ b/epan/dissectors/packet-dpnss.c
@@ -27,40 +27,40 @@
 void proto_register_dpnss(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_dpnss                        = -1;
-static int hf_dpnss_msg_grp_id                = -1;
-static int hf_dpnss_cc_msg_type               = -1;
-static int hf_dpnss_e2e_msg_type              = -1;
-static int hf_dpnss_LbL_msg_type              = -1;
-static int hf_dpnss_ext_bit                   = -1;
-static int hf_dpnss_ext_bit_notall            = -1;
-static int hf_dpnss_sic_type                  = -1;
-static int hf_dpnss_sic_details_for_speech    = -1;
-static int hf_dpnss_sic_details_for_data1     = -1;
-static int hf_dpnss_sic_details_for_data2     = -1;
-static int hf_dpnss_dest_addr                 = -1;
-static int hf_dpnss_sic_oct2_data_type        = -1;
-static int hf_dpnss_sic_oct2_duplex           = -1;
-static int hf_dpnss_sic_oct2_sync_data_format = -1;
-static int hf_dpnss_sic_oct2_sync_byte_timing = -1;
-static int hf_dpnss_sic_oct2_net_ind_clk      = -1;
-static int hf_dpnss_sic_oct2_async_data       = -1;
-static int hf_dpnss_sic_oct2_async_flow_ctrl  = -1;
-static int hf_dpnss_clearing_cause            = -1;
-static int hf_dpnss_rejection_cause           = -1;
-static int hf_dpnss_man_code                  = -1;
-static int hf_dpnss_subcode                   = -1;
-static int hf_dpnss_maintenance_action        = -1;
+static int proto_dpnss;
+static int hf_dpnss_msg_grp_id;
+static int hf_dpnss_cc_msg_type;
+static int hf_dpnss_e2e_msg_type;
+static int hf_dpnss_LbL_msg_type;
+static int hf_dpnss_ext_bit;
+static int hf_dpnss_ext_bit_notall;
+static int hf_dpnss_sic_type;
+static int hf_dpnss_sic_details_for_speech;
+static int hf_dpnss_sic_details_for_data1;
+static int hf_dpnss_sic_details_for_data2;
+static int hf_dpnss_dest_addr;
+static int hf_dpnss_sic_oct2_data_type;
+static int hf_dpnss_sic_oct2_duplex;
+static int hf_dpnss_sic_oct2_sync_data_format;
+static int hf_dpnss_sic_oct2_sync_byte_timing;
+static int hf_dpnss_sic_oct2_net_ind_clk;
+static int hf_dpnss_sic_oct2_async_data;
+static int hf_dpnss_sic_oct2_async_flow_ctrl;
+static int hf_dpnss_clearing_cause;
+static int hf_dpnss_rejection_cause;
+static int hf_dpnss_man_code;
+static int hf_dpnss_subcode;
+static int hf_dpnss_maintenance_action;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_dpnss_indication_field          = -1;
-static int hf_dpnss_user_information          = -1;
-static int hf_dpnss_selection_field           = -1;
-static int hf_dpnss_sup_str                   = -1;
-static int hf_dpnss_parameter                 = -1;
+static int hf_dpnss_indication_field;
+static int hf_dpnss_user_information;
+static int hf_dpnss_selection_field;
+static int hf_dpnss_sup_str;
+static int hf_dpnss_parameter;
 
 /* parameters */
-static int hf_dpnss_a_b_party_addr            = -1;
-static int hf_dpnss_call_idx                  = -1;
+static int hf_dpnss_a_b_party_addr;
+static int hf_dpnss_call_idx;
 
 #define DPNNS_MESSAGE_GROUP_CC           0
 #define DPNNS_MESSAGE_GROUP_E2E          2
@@ -81,14 +81,14 @@ static int hf_dpnss_call_idx                  = -1;
 #define DPNSS_CC_MSG_SSRM_C             12
 
 /* Initialize the subtree pointers */
-static int ett_dpnss            = -1;
-static int ett_dpnss_sel_field  = -1;
-static int ett_dpnss_sic_field  = -1;
-static int ett_dpnss_ind_field  = -1;
-static int ett_dpnss_sup_str    = -1;
-
-static expert_field ei_dpnss_not_supported_yet = EI_INIT;
-static expert_field ei_dpnss_msg_grp_id = EI_INIT;
+static int ett_dpnss;
+static int ett_dpnss_sel_field;
+static int ett_dpnss_sic_field;
+static int ett_dpnss_ind_field;
+static int ett_dpnss_sup_str;
+
+static expert_field ei_dpnss_not_supported_yet;
+static expert_field ei_dpnss_msg_grp_id;
 
 
 static const value_string dpnss_msg_grp_id_vals[] = {
diff --git a/epan/dissectors/packet-drb.c b/epan/dissectors/packet-drb.c
index f21311f5c5..59474a25d4 100644
--- a/epan/dissectors/packet-drb.c
+++ b/epan/dissectors/packet-drb.c
@@ -17,12 +17,12 @@
 
 static dissector_handle_t drb_handle;
 
-static int proto_drb = -1;
+static int proto_drb;
 
-static int hf_drb_len = -1;
+static int hf_drb_len;
 
-static gint ett_drb = -1;
-static gint ett_ref = -1;
+static gint ett_drb;
+static gint ett_ref;
 
 void proto_register_drb(void);
 void proto_reg_handoff_drb(void);
diff --git a/epan/dissectors/packet-drbd.c b/epan/dissectors/packet-drbd.c
index d89ec51a52..eded27bf3b 100644
--- a/epan/dissectors/packet-drbd.c
+++ b/epan/dissectors/packet-drbd.c
@@ -516,132 +516,132 @@ void proto_reg_handoff_drbd(void);
 
 static dissector_handle_t drbd_handle;
 
-static int proto_drbd = -1;
-
-static int hf_drbd_command = -1;
-static int hf_drbd_length = -1;
-static int hf_drbd_volume = -1;
-static int hf_drbd_auth_challenge_nonce = -1;
-static int hf_drbd_auth_response_hash = -1;
-static int hf_drbd_sector = -1;
-static int hf_drbd_block_id = -1;
-static int hf_drbd_seq_num = -1;
-static int hf_drbd_dp_flags = -1;
-static int hf_drbd_data = -1;
-static int hf_drbd_size = -1;
-static int hf_drbd_protocol_min = -1;
-static int hf_drbd_feature_flags = -1;
-static int hf_drbd_protocol_max = -1;
-static int hf_drbd_sender_node_id = -1;
-static int hf_drbd_receiver_node_id = -1;
-static int hf_drbd_barrier = -1;
-static int hf_drbd_set_size = -1;
-static int hf_drbd_oldest_block_id = -1;
-static int hf_drbd_youngest_block_id = -1;
-static int hf_drbd_resync_rate = -1;
-static int hf_drbd_verify_alg = -1;
-static int hf_drbd_csums_alg = -1;
-static int hf_drbd_c_plan_ahead = -1;
-static int hf_drbd_c_delay_target = -1;
-static int hf_drbd_c_fill_target = -1;
-static int hf_drbd_c_max_rate = -1;
-static int hf_drbd_protocol = -1;
-static int hf_drbd_after_sb_0p = -1;
-static int hf_drbd_after_sb_1p = -1;
-static int hf_drbd_after_sb_2p = -1;
-static int hf_drbd_conn_flags = -1;
-static int hf_drbd_two_primaries = -1;
-static int hf_drbd_integrity_alg = -1;
-static int hf_drbd_current_uuid = -1;
-static int hf_drbd_bitmap_uuid = -1;
-static int hf_drbd_history_uuid_list = -1;
-static int hf_drbd_history_uuid = -1;
-static int hf_drbd_dirty_bits = -1;
-static int hf_drbd_uuid_flags = -1;
-static int hf_drbd_node_mask = -1;
-static int hf_drbd_bitmap_uuids_mask = -1;
-static int hf_drbd_uuid = -1;
-static int hf_drbd_weak_nodes = -1;
-static int hf_drbd_physical_block_size = -1;
-static int hf_drbd_logical_block_size = -1;
-static int hf_drbd_alignment_offset = -1;
-static int hf_drbd_io_min = -1;
-static int hf_drbd_io_opt = -1;
-static int hf_drbd_discard_enabled = -1;
-static int hf_drbd_discard_zeroes_data = -1;
-static int hf_drbd_write_same_capable = -1;
-static int hf_drbd_d_size = -1;
-static int hf_drbd_u_size = -1;
-static int hf_drbd_c_size = -1;
-static int hf_drbd_max_bio_size = -1;
-static int hf_drbd_queue_order_type = -1;
-static int hf_drbd_dds_flags = -1;
-static int hf_drbd_state = -1;
-static int hf_drbd_retcode = -1;
-static int hf_drbd_twopc_prepare_in = -1;
-static int hf_drbd_tid = -1;
-static int hf_drbd_twopc_flags = -1;
-static int hf_drbd_initiator_node_id = -1;
-static int hf_drbd_target_node_id = -1;
-static int hf_drbd_nodes_to_reach = -1;
-static int hf_drbd_primary_nodes = -1;
-static int hf_drbd_user_size = -1;
-static int hf_drbd_diskful_primary_nodes = -1;
-static int hf_drbd_exposed_size = -1;
-static int hf_drbd_reachable_nodes = -1;
-static int hf_drbd_max_possible_size = -1;
-static int hf_drbd_offset = -1;
-static int hf_drbd_dagtag = -1;
-static int hf_drbd_dagtag_node_id = -1;
-static int hf_drbd_new_rx_descs_data = -1;
-static int hf_drbd_new_rx_descs_control = -1;
-static int hf_drbd_rx_desc_stolen_from = -1;
-
-static int hf_drbd_state_role = -1;
-static int hf_drbd_state_peer = -1;
-static int hf_drbd_state_conn = -1;
-static int hf_drbd_state_disk = -1;
-static int hf_drbd_state_pdsk = -1;
-static int hf_drbd_state_susp = -1;
-static int hf_drbd_state_aftr_isp = -1;
-static int hf_drbd_state_peer_isp = -1;
-static int hf_drbd_state_user_isp = -1;
-static int hf_drbd_state_susp_nod = -1;
-static int hf_drbd_state_susp_fen = -1;
-static int hf_drbd_state_quorum = -1;
-
-static int hf_drbd_twopc_flag_has_reachable = -1;
-
-static int hf_drbd_uuid_flag_discard_my_data = -1;
-static int hf_drbd_uuid_flag_crashed_primary = -1;
-static int hf_drbd_uuid_flag_inconsistent = -1;
-static int hf_drbd_uuid_flag_skip_initial_sync = -1;
-static int hf_drbd_uuid_flag_new_datagen = -1;
-static int hf_drbd_uuid_flag_stable = -1;
-static int hf_drbd_uuid_flag_got_stable = -1;
-static int hf_drbd_uuid_flag_resync = -1;
-static int hf_drbd_uuid_flag_reconnect = -1;
-static int hf_drbd_uuid_flag_diskless_primary = -1;
-static int hf_drbd_uuid_flag_primary_lost_quorum = -1;
-
-static int hf_drbd_dp_hardbarrier = -1;
-static int hf_drbd_dp_rw_sync = -1;
-static int hf_drbd_dp_may_set_in_sync = -1;
-static int hf_drbd_dp_unplug = -1;
-static int hf_drbd_dp_fua = -1;
-static int hf_drbd_dp_flush = -1;
-static int hf_drbd_dp_discard = -1;
-static int hf_drbd_dp_send_receive_ack = -1;
-static int hf_drbd_dp_send_write_ack = -1;
-static int hf_drbd_dp_wsame = -1;
-static int hf_drbd_dp_zeroes = -1;
-
-static gint ett_drbd = -1;
-static gint ett_drbd_state = -1;
-static gint ett_drbd_twopc_flags = -1;
-static gint ett_drbd_uuid_flags = -1;
-static gint ett_drbd_history_uuids = -1;
-static gint ett_drbd_data_flags = -1;
+static int proto_drbd;
+
+static int hf_drbd_command;
+static int hf_drbd_length;
+static int hf_drbd_volume;
+static int hf_drbd_auth_challenge_nonce;
+static int hf_drbd_auth_response_hash;
+static int hf_drbd_sector;
+static int hf_drbd_block_id;
+static int hf_drbd_seq_num;
+static int hf_drbd_dp_flags;
+static int hf_drbd_data;
+static int hf_drbd_size;
+static int hf_drbd_protocol_min;
+static int hf_drbd_feature_flags;
+static int hf_drbd_protocol_max;
+static int hf_drbd_sender_node_id;
+static int hf_drbd_receiver_node_id;
+static int hf_drbd_barrier;
+static int hf_drbd_set_size;
+static int hf_drbd_oldest_block_id;
+static int hf_drbd_youngest_block_id;
+static int hf_drbd_resync_rate;
+static int hf_drbd_verify_alg;
+static int hf_drbd_csums_alg;
+static int hf_drbd_c_plan_ahead;
+static int hf_drbd_c_delay_target;
+static int hf_drbd_c_fill_target;
+static int hf_drbd_c_max_rate;
+static int hf_drbd_protocol;
+static int hf_drbd_after_sb_0p;
+static int hf_drbd_after_sb_1p;
+static int hf_drbd_after_sb_2p;
+static int hf_drbd_conn_flags;
+static int hf_drbd_two_primaries;
+static int hf_drbd_integrity_alg;
+static int hf_drbd_current_uuid;
+static int hf_drbd_bitmap_uuid;
+static int hf_drbd_history_uuid_list;
+static int hf_drbd_history_uuid;
+static int hf_drbd_dirty_bits;
+static int hf_drbd_uuid_flags;
+static int hf_drbd_node_mask;
+static int hf_drbd_bitmap_uuids_mask;
+static int hf_drbd_uuid;
+static int hf_drbd_weak_nodes;
+static int hf_drbd_physical_block_size;
+static int hf_drbd_logical_block_size;
+static int hf_drbd_alignment_offset;
+static int hf_drbd_io_min;
+static int hf_drbd_io_opt;
+static int hf_drbd_discard_enabled;
+static int hf_drbd_discard_zeroes_data;
+static int hf_drbd_write_same_capable;
+static int hf_drbd_d_size;
+static int hf_drbd_u_size;
+static int hf_drbd_c_size;
+static int hf_drbd_max_bio_size;
+static int hf_drbd_queue_order_type;
+static int hf_drbd_dds_flags;
+static int hf_drbd_state;
+static int hf_drbd_retcode;
+static int hf_drbd_twopc_prepare_in;
+static int hf_drbd_tid;
+static int hf_drbd_twopc_flags;
+static int hf_drbd_initiator_node_id;
+static int hf_drbd_target_node_id;
+static int hf_drbd_nodes_to_reach;
+static int hf_drbd_primary_nodes;
+static int hf_drbd_user_size;
+static int hf_drbd_diskful_primary_nodes;
+static int hf_drbd_exposed_size;
+static int hf_drbd_reachable_nodes;
+static int hf_drbd_max_possible_size;
+static int hf_drbd_offset;
+static int hf_drbd_dagtag;
+static int hf_drbd_dagtag_node_id;
+static int hf_drbd_new_rx_descs_data;
+static int hf_drbd_new_rx_descs_control;
+static int hf_drbd_rx_desc_stolen_from;
+
+static int hf_drbd_state_role;
+static int hf_drbd_state_peer;
+static int hf_drbd_state_conn;
+static int hf_drbd_state_disk;
+static int hf_drbd_state_pdsk;
+static int hf_drbd_state_susp;
+static int hf_drbd_state_aftr_isp;
+static int hf_drbd_state_peer_isp;
+static int hf_drbd_state_user_isp;
+static int hf_drbd_state_susp_nod;
+static int hf_drbd_state_susp_fen;
+static int hf_drbd_state_quorum;
+
+static int hf_drbd_twopc_flag_has_reachable;
+
+static int hf_drbd_uuid_flag_discard_my_data;
+static int hf_drbd_uuid_flag_crashed_primary;
+static int hf_drbd_uuid_flag_inconsistent;
+static int hf_drbd_uuid_flag_skip_initial_sync;
+static int hf_drbd_uuid_flag_new_datagen;
+static int hf_drbd_uuid_flag_stable;
+static int hf_drbd_uuid_flag_got_stable;
+static int hf_drbd_uuid_flag_resync;
+static int hf_drbd_uuid_flag_reconnect;
+static int hf_drbd_uuid_flag_diskless_primary;
+static int hf_drbd_uuid_flag_primary_lost_quorum;
+
+static int hf_drbd_dp_hardbarrier;
+static int hf_drbd_dp_rw_sync;
+static int hf_drbd_dp_may_set_in_sync;
+static int hf_drbd_dp_unplug;
+static int hf_drbd_dp_fua;
+static int hf_drbd_dp_flush;
+static int hf_drbd_dp_discard;
+static int hf_drbd_dp_send_receive_ack;
+static int hf_drbd_dp_send_write_ack;
+static int hf_drbd_dp_wsame;
+static int hf_drbd_dp_zeroes;
+
+static gint ett_drbd;
+static gint ett_drbd_state;
+static gint ett_drbd_twopc_flags;
+static gint ett_drbd_uuid_flags;
+static gint ett_drbd_history_uuids;
+static gint ett_drbd_data_flags;
 
 static int * const state_fields[] = {
     &hf_drbd_state_role,
diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c
index b75a62a247..7964bc4b2f 100644
--- a/epan/dissectors/packet-drda.c
+++ b/epan/dissectors/packet-drda.c
@@ -65,157 +65,157 @@
 void proto_register_drda(void);
 void proto_reg_handoff_drda(void);
 
-static int proto_drda = -1;
-static int hf_drda_ddm_length = -1;
-static int hf_drda_ddm_magic = -1;
-static int hf_drda_ddm_format = -1;
-static int hf_drda_ddm_fmt_reserved = -1;
-static int hf_drda_ddm_fmt_chained = -1;
-static int hf_drda_ddm_fmt_errcont = -1;
-static int hf_drda_ddm_fmt_samecorr = -1;
-static int hf_drda_ddm_fmt_dsstyp = -1;
-static int hf_drda_ddm_rc = -1;
-static int hf_drda_ddm_length2 = -1;
-static int hf_drda_ddm_codepoint = -1;
-static int hf_drda_param_length = -1;
-static int hf_drda_param_codepoint = -1;
-static int hf_drda_param_data = -1;
-static int hf_drda_param_data_ebcdic = -1;
-static int hf_drda_null_ind = -1;
-static int hf_drda_typdefnam = -1;
-static int hf_drda_clob_length = -1;
-static int hf_drda_sqlstatement = -1;
-static int hf_drda_sqlcagrp = -1;
-static int hf_drda_sqlcode = -1;
-static int hf_drda_sqlstate = -1;
-static int hf_drda_sqlerrproc = -1;
-static int hf_drda_sqlcaxgrp = -1;
-static int hf_drda_sqlerrd1 = -1;
-static int hf_drda_sqlerrd2 = -1;
-static int hf_drda_sqlerrd3 = -1;
-static int hf_drda_sqlerrd4 = -1;
-static int hf_drda_sqlerrd5 = -1;
-static int hf_drda_sqlerrd6 = -1;
-static int hf_drda_sqlwarn0 = -1;
-static int hf_drda_sqlwarn1 = -1;
-static int hf_drda_sqlwarn2 = -1;
-static int hf_drda_sqlwarn3 = -1;
-static int hf_drda_sqlwarn4 = -1;
-static int hf_drda_sqlwarn5 = -1;
-static int hf_drda_sqlwarn6 = -1;
-static int hf_drda_sqlwarn7 = -1;
-static int hf_drda_sqlwarn8 = -1;
-static int hf_drda_sqlwarn9 = -1;
-static int hf_drda_sqlwarna = -1;
-static int hf_drda_sqlerrmsg = -1;
-static int hf_drda_sqldhgrp = -1;
-static int hf_drda_sqldhold = -1;
-static int hf_drda_sqldreturn = -1;
-static int hf_drda_sqldscroll = -1;
-static int hf_drda_sqldsensitive = -1;
-static int hf_drda_sqldfcode = -1;
-static int hf_drda_sqldkeytype = -1;
-static int hf_drda_sqldoptlck = -1;
-static int hf_drda_sqldschema = -1;
-static int hf_drda_sqldmodule = -1;
-static int hf_drda_sqldagrp = -1;
-static int hf_drda_sqlprecision = -1;
-static int hf_drda_sqlscale = -1;
-static int hf_drda_sqllength = -1;
-static int hf_drda_sqllength32 = -1;
-static int hf_drda_sqltype = -1;
-static int hf_drda_sqlarrextent = -1;
-static int hf_drda_sqldoptgrp = -1;
-static int hf_drda_sqlunnamed = -1;
-static int hf_drda_sqlname = -1;
-static int hf_drda_sqllabel = -1;
-static int hf_drda_sqlcomments = -1;
-static int hf_drda_sqludtgrp = -1;
-static int hf_drda_sqludtxtype = -1;
-static int hf_drda_sqludtschema = -1;
-static int hf_drda_sqludtname = -1;
-static int hf_drda_sqludtmodule = -1;
-static int hf_drda_sqldxgrp = -1;
-static int hf_drda_sqlxkeymem = -1;
-static int hf_drda_sqlxupdateable = -1;
-static int hf_drda_sqlxgenerated = -1;
-static int hf_drda_sqlxparmmode = -1;
-static int hf_drda_sqlxoptlck = -1;
-static int hf_drda_sqlxhidden = -1;
-static int hf_drda_sqlxcorname = -1;
-static int hf_drda_sqlxbasename = -1;
-static int hf_drda_sqlxschema = -1;
-static int hf_drda_sqlxname = -1;
-static int hf_drda_sqlxmodule = -1;
-static int hf_drda_sqldiaggrp = -1;
-static int hf_drda_sqlnum = -1;
-static int hf_drda_rlsconv = -1;
-static int hf_drda_secmec = -1;
-static int hf_drda_sectkn = -1;
-static int hf_drda_svrcod = -1;
-static int hf_drda_secchkcd = -1;
-static int hf_drda_ccsid = -1;
-static int hf_drda_mgrlvln = -1;
-static int hf_drda_monitor = -1;
-static int hf_drda_monitor_etime = -1;
-static int hf_drda_monitor_reserved = -1;
-static int hf_drda_etime = -1;
-static int hf_drda_respktsz = -1;
-static int hf_drda_rdbinttkn = -1;
-static int hf_drda_rdbcmtok = -1;
-static int hf_drda_rdbcolid = -1;
-static int hf_drda_rdbcolid_ebcdic = -1;
-static int hf_drda_pkgid = -1;
-static int hf_drda_pkgid_ebcdic = -1;
-static int hf_drda_pkgsn = -1;
-static int hf_drda_pkgcnstkn = -1;
-static int hf_drda_rtnsetstt = -1;
-static int hf_drda_rdbnam = -1;
-static int hf_drda_rdbnam_ebcdic = -1;
-static int hf_drda_outexp = -1;
-static int hf_drda_qryblksz = -1;
-static int hf_drda_uowdsp = -1;
-static int hf_drda_rdbalwupd = -1;
-static int hf_drda_sqlcsrhld = -1;
-static int hf_drda_qryextdtasz = -1;
-static int hf_drda_smldtasz = -1;
-static int hf_drda_meddtasz = -1;
-static int hf_drda_trgdftrt = -1;
-static int hf_drda_rtnsqlda = -1;
-static int hf_drda_qryattupd = -1;
-static int hf_drda_qryrowset = -1;
-static int hf_drda_qryinsid = -1;
-static int hf_drda_qryclsimp = -1;
-static int hf_drda_qryblkfct = -1;
-static int hf_drda_maxrslcnt = -1;
-static int hf_drda_maxblkext = -1;
-static int hf_drda_rslsetflg = -1;
-static int hf_drda_rslsetflg_unused = -1;
-static int hf_drda_rslsetflg_dsconly = -1;
-static int hf_drda_rslsetflg_extended = -1;
-static int hf_drda_rslsetflg_reserved = -1;
-static int hf_drda_typsqlda = -1;
-static int hf_drda_outovropt = -1;
-static int hf_drda_dyndtafmt = -1;
-static int hf_drda_pktobj = -1;
-
-static gint ett_drda = -1;
-static gint ett_drda_ddm = -1;
-static gint ett_drda_ddm_format = -1;
-static gint ett_drda_param = -1;
-static gint ett_drda_monitor = -1;
-static gint ett_drda_rslsetflg = -1;
-static gint ett_drda_sqlcagrp = -1;
-static gint ett_drda_sqlcaxgrp = -1;
-static gint ett_drda_sqldhgrp = -1;
-static gint ett_drda_sqldagrp = -1;
-static gint ett_drda_sqldoptgrp = -1;
-static gint ett_drda_sqludtgrp = -1;
-static gint ett_drda_sqldxgrp = -1;
-static gint ett_drda_sqldiaggrp = -1;
-
-static expert_field ei_drda_opcode_invalid_length = EI_INIT;
-static expert_field ei_drda_undecoded = EI_INIT;
+static int proto_drda;
+static int hf_drda_ddm_length;
+static int hf_drda_ddm_magic;
+static int hf_drda_ddm_format;
+static int hf_drda_ddm_fmt_reserved;
+static int hf_drda_ddm_fmt_chained;
+static int hf_drda_ddm_fmt_errcont;
+static int hf_drda_ddm_fmt_samecorr;
+static int hf_drda_ddm_fmt_dsstyp;
+static int hf_drda_ddm_rc;
+static int hf_drda_ddm_length2;
+static int hf_drda_ddm_codepoint;
+static int hf_drda_param_length;
+static int hf_drda_param_codepoint;
+static int hf_drda_param_data;
+static int hf_drda_param_data_ebcdic;
+static int hf_drda_null_ind;
+static int hf_drda_typdefnam;
+static int hf_drda_clob_length;
+static int hf_drda_sqlstatement;
+static int hf_drda_sqlcagrp;
+static int hf_drda_sqlcode;
+static int hf_drda_sqlstate;
+static int hf_drda_sqlerrproc;
+static int hf_drda_sqlcaxgrp;
+static int hf_drda_sqlerrd1;
+static int hf_drda_sqlerrd2;
+static int hf_drda_sqlerrd3;
+static int hf_drda_sqlerrd4;
+static int hf_drda_sqlerrd5;
+static int hf_drda_sqlerrd6;
+static int hf_drda_sqlwarn0;
+static int hf_drda_sqlwarn1;
+static int hf_drda_sqlwarn2;
+static int hf_drda_sqlwarn3;
+static int hf_drda_sqlwarn4;
+static int hf_drda_sqlwarn5;
+static int hf_drda_sqlwarn6;
+static int hf_drda_sqlwarn7;
+static int hf_drda_sqlwarn8;
+static int hf_drda_sqlwarn9;
+static int hf_drda_sqlwarna;
+static int hf_drda_sqlerrmsg;
+static int hf_drda_sqldhgrp;
+static int hf_drda_sqldhold;
+static int hf_drda_sqldreturn;
+static int hf_drda_sqldscroll;
+static int hf_drda_sqldsensitive;
+static int hf_drda_sqldfcode;
+static int hf_drda_sqldkeytype;
+static int hf_drda_sqldoptlck;
+static int hf_drda_sqldschema;
+static int hf_drda_sqldmodule;
+static int hf_drda_sqldagrp;
+static int hf_drda_sqlprecision;
+static int hf_drda_sqlscale;
+static int hf_drda_sqllength;
+static int hf_drda_sqllength32;
+static int hf_drda_sqltype;
+static int hf_drda_sqlarrextent;
+static int hf_drda_sqldoptgrp;
+static int hf_drda_sqlunnamed;
+static int hf_drda_sqlname;
+static int hf_drda_sqllabel;
+static int hf_drda_sqlcomments;
+static int hf_drda_sqludtgrp;
+static int hf_drda_sqludtxtype;
+static int hf_drda_sqludtschema;
+static int hf_drda_sqludtname;
+static int hf_drda_sqludtmodule;
+static int hf_drda_sqldxgrp;
+static int hf_drda_sqlxkeymem;
+static int hf_drda_sqlxupdateable;
+static int hf_drda_sqlxgenerated;
+static int hf_drda_sqlxparmmode;
+static int hf_drda_sqlxoptlck;
+static int hf_drda_sqlxhidden;
+static int hf_drda_sqlxcorname;
+static int hf_drda_sqlxbasename;
+static int hf_drda_sqlxschema;
+static int hf_drda_sqlxname;
+static int hf_drda_sqlxmodule;
+static int hf_drda_sqldiaggrp;
+static int hf_drda_sqlnum;
+static int hf_drda_rlsconv;
+static int hf_drda_secmec;
+static int hf_drda_sectkn;
+static int hf_drda_svrcod;
+static int hf_drda_secchkcd;
+static int hf_drda_ccsid;
+static int hf_drda_mgrlvln;
+static int hf_drda_monitor;
+static int hf_drda_monitor_etime;
+static int hf_drda_monitor_reserved;
+static int hf_drda_etime;
+static int hf_drda_respktsz;
+static int hf_drda_rdbinttkn;
+static int hf_drda_rdbcmtok;
+static int hf_drda_rdbcolid;
+static int hf_drda_rdbcolid_ebcdic;
+static int hf_drda_pkgid;
+static int hf_drda_pkgid_ebcdic;
+static int hf_drda_pkgsn;
+static int hf_drda_pkgcnstkn;
+static int hf_drda_rtnsetstt;
+static int hf_drda_rdbnam;
+static int hf_drda_rdbnam_ebcdic;
+static int hf_drda_outexp;
+static int hf_drda_qryblksz;
+static int hf_drda_uowdsp;
+static int hf_drda_rdbalwupd;
+static int hf_drda_sqlcsrhld;
+static int hf_drda_qryextdtasz;
+static int hf_drda_smldtasz;
+static int hf_drda_meddtasz;
+static int hf_drda_trgdftrt;
+static int hf_drda_rtnsqlda;
+static int hf_drda_qryattupd;
+static int hf_drda_qryrowset;
+static int hf_drda_qryinsid;
+static int hf_drda_qryclsimp;
+static int hf_drda_qryblkfct;
+static int hf_drda_maxrslcnt;
+static int hf_drda_maxblkext;
+static int hf_drda_rslsetflg;
+static int hf_drda_rslsetflg_unused;
+static int hf_drda_rslsetflg_dsconly;
+static int hf_drda_rslsetflg_extended;
+static int hf_drda_rslsetflg_reserved;
+static int hf_drda_typsqlda;
+static int hf_drda_outovropt;
+static int hf_drda_dyndtafmt;
+static int hf_drda_pktobj;
+
+static gint ett_drda;
+static gint ett_drda_ddm;
+static gint ett_drda_ddm_format;
+static gint ett_drda_param;
+static gint ett_drda_monitor;
+static gint ett_drda_rslsetflg;
+static gint ett_drda_sqlcagrp;
+static gint ett_drda_sqlcaxgrp;
+static gint ett_drda_sqldhgrp;
+static gint ett_drda_sqldagrp;
+static gint ett_drda_sqldoptgrp;
+static gint ett_drda_sqludtgrp;
+static gint ett_drda_sqldxgrp;
+static gint ett_drda_sqldiaggrp;
+
+static expert_field ei_drda_opcode_invalid_length;
+static expert_field ei_drda_undecoded;
 
 static dissector_handle_t drda_tcp_handle;
 
diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c
index 2009a13b51..5702da5c7e 100644
--- a/epan/dissectors/packet-dsi.c
+++ b/epan/dissectors/packet-dsi.c
@@ -59,34 +59,34 @@ void proto_reg_handoff_dsi(void);
 
 static dissector_handle_t dsi_handle;
 
-static int proto_dsi = -1;
-static int hf_dsi_flags = -1;
-static int hf_dsi_command = -1;
-static int hf_dsi_requestid = -1;
-static int hf_dsi_offset = -1;
-static int hf_dsi_error = -1;
-static int hf_dsi_length = -1;
-static int hf_dsi_reserved = -1;
-
-static gint ett_dsi = -1;
-
-static int hf_dsi_open_type     = -1;
-static int hf_dsi_open_len      = -1;
-static int hf_dsi_open_quantum  = -1;
-static int hf_dsi_replay_cache_size = -1;
-static int hf_dsi_open_option   = -1;
-
-static int hf_dsi_attn_flag             = -1;
-static int hf_dsi_attn_flag_shutdown    = -1;
-static int hf_dsi_attn_flag_crash       = -1;
-static int hf_dsi_attn_flag_msg         = -1;
-static int hf_dsi_attn_flag_reconnect   = -1;
-static int hf_dsi_attn_flag_time        = -1;
-static int hf_dsi_attn_flag_bitmap      = -1;
-
-static gint ett_dsi_open        = -1;
-static gint ett_dsi_attn        = -1;
-static gint ett_dsi_attn_flag   = -1;
+static int proto_dsi;
+static int hf_dsi_flags;
+static int hf_dsi_command;
+static int hf_dsi_requestid;
+static int hf_dsi_offset;
+static int hf_dsi_error;
+static int hf_dsi_length;
+static int hf_dsi_reserved;
+
+static gint ett_dsi;
+
+static int hf_dsi_open_type;
+static int hf_dsi_open_len;
+static int hf_dsi_open_quantum;
+static int hf_dsi_replay_cache_size;
+static int hf_dsi_open_option;
+
+static int hf_dsi_attn_flag;
+static int hf_dsi_attn_flag_shutdown;
+static int hf_dsi_attn_flag_crash;
+static int hf_dsi_attn_flag_msg;
+static int hf_dsi_attn_flag_reconnect;
+static int hf_dsi_attn_flag_time;
+static int hf_dsi_attn_flag_bitmap;
+
+static gint ett_dsi_open;
+static gint ett_dsi_attn;
+static gint ett_dsi_attn_flag;
 
 static const value_string dsi_attn_flag_vals[] = {
 	{0x0, "Reserved" },                                           /* 0000 */
diff --git a/epan/dissectors/packet-dsr.c b/epan/dissectors/packet-dsr.c
index 4bdedeb1c6..71cc22599f 100644
--- a/epan/dissectors/packet-dsr.c
+++ b/epan/dissectors/packet-dsr.c
@@ -30,75 +30,75 @@ static dissector_handle_t dsr_handle;
 static dissector_table_t ip_dissector_table;
 
 /* Initialize the protocol and registered fields */
-static int proto_dsr = -1;
+static int proto_dsr;
 /* DSR global fields */
-static int hf_dsr_nexthdr = -1;
-static int hf_dsr_flowstate = -1;
-static int hf_dsr_reserved = -1;
-static int hf_dsr_length = -1;
-static int hf_dsr_opttype = -1;
-static int hf_dsr_optlen = -1;
-static int hf_dsr_fs_hopcount = -1;
-static int hf_dsr_fs_id = -1;
+static int hf_dsr_nexthdr;
+static int hf_dsr_flowstate;
+static int hf_dsr_reserved;
+static int hf_dsr_length;
+static int hf_dsr_opttype;
+static int hf_dsr_optlen;
+static int hf_dsr_fs_hopcount;
+static int hf_dsr_fs_id;
 /* RREQ option fields */
-static int hf_dsr_opt_rreq_id = -1;
-static int hf_dsr_opt_rreq_targetaddress = -1;
-static int hf_dsr_opt_rreq_address = -1;
+static int hf_dsr_opt_rreq_id;
+static int hf_dsr_opt_rreq_targetaddress;
+static int hf_dsr_opt_rreq_address;
 /* RREP option fields */
-static int hf_dsr_opt_rrep_lasthopex = -1;
-static int hf_dsr_opt_rrep_reserved = -1;
-static int hf_dsr_opt_rrep_address = -1;
+static int hf_dsr_opt_rrep_lasthopex;
+static int hf_dsr_opt_rrep_reserved;
+static int hf_dsr_opt_rrep_address;
 /* RERR option fields */
-static int hf_dsr_opt_err_type = -1;
-static int hf_dsr_opt_err_reserved = -1;
-static int hf_dsr_opt_err_salvage = -1;
-static int hf_dsr_opt_err_src = -1;
-static int hf_dsr_opt_err_dest = -1;
-static int hf_dsr_opt_err_unreach_addr = -1;
-static int hf_dsr_opt_err_unsupportedoption = -1;
-static int hf_dsr_opt_err_unknownflow_dest = -1;
-static int hf_dsr_opt_err_unknownflow_id = -1;
-static int hf_dsr_opt_err_defaultflowunknown_dest = -1;
+static int hf_dsr_opt_err_type;
+static int hf_dsr_opt_err_reserved;
+static int hf_dsr_opt_err_salvage;
+static int hf_dsr_opt_err_src;
+static int hf_dsr_opt_err_dest;
+static int hf_dsr_opt_err_unreach_addr;
+static int hf_dsr_opt_err_unsupportedoption;
+static int hf_dsr_opt_err_unknownflow_dest;
+static int hf_dsr_opt_err_unknownflow_id;
+static int hf_dsr_opt_err_defaultflowunknown_dest;
 /* ACK REQuest option fields */
-static int hf_dsr_opt_ack_req_id = -1;
-static int hf_dsr_opt_ack_req_address = -1;
+static int hf_dsr_opt_ack_req_id;
+static int hf_dsr_opt_ack_req_address;
 /* ACK option fields */
-static int hf_dsr_opt_ack_id = -1;
-static int hf_dsr_opt_ack_src = -1;
-static int hf_dsr_opt_ack_dest = -1;
+static int hf_dsr_opt_ack_id;
+static int hf_dsr_opt_ack_src;
+static int hf_dsr_opt_ack_dest;
 /* SRCRT option fields */
-static int hf_dsr_opt_srcrt_firsthopext = -1;
-static int hf_dsr_opt_srcrt_lasthopext = -1;
-static int hf_dsr_opt_srcrt_reserved = -1;
-static int hf_dsr_opt_srcrt_salvage = -1;
-static int hf_dsr_opt_srcrt_segsleft = -1;
-static int hf_dsr_opt_srcrt_address = -1;
+static int hf_dsr_opt_srcrt_firsthopext;
+static int hf_dsr_opt_srcrt_lasthopext;
+static int hf_dsr_opt_srcrt_reserved;
+static int hf_dsr_opt_srcrt_salvage;
+static int hf_dsr_opt_srcrt_segsleft;
+static int hf_dsr_opt_srcrt_address;
 /* Flow State Extentions */
 /* Timout option fields */
-static int hf_dsr_fs_opt_timeout_timeout = -1;
+static int hf_dsr_fs_opt_timeout_timeout;
 /* Flow ID / destination option fields */
-static int hf_dsr_fs_opt_destflowid_id = -1;
-static int hf_dsr_fs_opt_destflowid_dest = -1;
+static int hf_dsr_fs_opt_destflowid_id;
+static int hf_dsr_fs_opt_destflowid_dest;
 
 /* Initialize the subtree pointers */
-static gint ett_dsr = -1;
+static gint ett_dsr;
 /* DSR options tree */
-static gint ett_dsr_options = -1;
-static gint ett_dsr_rreq_opt = -1;
-static gint ett_dsr_rrep_opt = -1;
-static gint ett_dsr_rerr_opt = -1;
-static gint ett_dsr_ackreq_opt = -1;
-static gint ett_dsr_ack_opt = -1;
-static gint ett_dsr_srcrt_opt = -1;
-static gint ett_dsr_padn_opt = -1;
-static gint ett_dsr_pad1_opt = -1;
-static gint ett_dsr_fs_timeout_opt = -1;
-static gint ett_dsr_fs_destflowid_opt = -1;
+static gint ett_dsr_options;
+static gint ett_dsr_rreq_opt;
+static gint ett_dsr_rrep_opt;
+static gint ett_dsr_rerr_opt;
+static gint ett_dsr_ackreq_opt;
+static gint ett_dsr_ack_opt;
+static gint ett_dsr_srcrt_opt;
+static gint ett_dsr_padn_opt;
+static gint ett_dsr_pad1_opt;
+static gint ett_dsr_fs_timeout_opt;
+static gint ett_dsr_fs_destflowid_opt;
 
 /* hoplist trees */
-static gint ett_dsr_rreq_hoplist = -1;
-static gint ett_dsr_rrep_hoplist = -1;
-static gint ett_dsr_srcrt_hoplist = -1;
+static gint ett_dsr_rreq_hoplist;
+static gint ett_dsr_rrep_hoplist;
+static gint ett_dsr_srcrt_hoplist;
 
 /* A sample #define of the minimum length (in bytes) of the protocol data.
  * If data is received with fewer than this many bytes it is rejected by
diff --git a/epan/dissectors/packet-dtcp-ip.c b/epan/dissectors/packet-dtcp-ip.c
index c5c545cc52..7ff0f81348 100644
--- a/epan/dissectors/packet-dtcp-ip.c
+++ b/epan/dissectors/packet-dtcp-ip.c
@@ -30,32 +30,32 @@
 
 #include <epan/packet.h>
 
-static int proto_dtcp_ip = -1;
+static int proto_dtcp_ip;
 
 void proto_register_dtcp_ip(void);
 void proto_reg_handoff_dtcp_ip(void);
 
 static dissector_handle_t dtcp_ip_handle;
 
-static gint ett_dtcp_ip = -1;
-static gint ett_dtcp_ip_ctrl = -1;
-static gint ett_dtcp_ip_ake_procedure = -1;
-
-static int hf_dtcp_ip_type = -1;
-static int hf_dtcp_ip_length = -1;
-static int hf_dtcp_ip_ctype = -1;
-static int hf_dtcp_ip_category = -1;
-static int hf_dtcp_ip_ake_id = -1;
-static int hf_dtcp_ip_subfct = -1;
-static int hf_dtcp_ip_ake_procedure = -1;
-static int hf_dtcp_ip_ake_proc_full = -1;
-static int hf_dtcp_ip_ake_proc_ex_full = -1;
-static int hf_dtcp_ip_ake_xchg_key = -1;
-static int hf_dtcp_ip_subfct_dep = -1;
-static int hf_dtcp_ip_ake_label = -1;
-static int hf_dtcp_ip_number = -1;
-static int hf_dtcp_ip_status = -1;
-static int hf_dtcp_ip_ake_info = -1;
+static gint ett_dtcp_ip;
+static gint ett_dtcp_ip_ctrl;
+static gint ett_dtcp_ip_ake_procedure;
+
+static int hf_dtcp_ip_type;
+static int hf_dtcp_ip_length;
+static int hf_dtcp_ip_ctype;
+static int hf_dtcp_ip_category;
+static int hf_dtcp_ip_ake_id;
+static int hf_dtcp_ip_subfct;
+static int hf_dtcp_ip_ake_procedure;
+static int hf_dtcp_ip_ake_proc_full;
+static int hf_dtcp_ip_ake_proc_ex_full;
+static int hf_dtcp_ip_ake_xchg_key;
+static int hf_dtcp_ip_subfct_dep;
+static int hf_dtcp_ip_ake_label;
+static int hf_dtcp_ip_number;
+static int hf_dtcp_ip_status;
+static int hf_dtcp_ip_ake_info;
 
 #define CTRL_LEN 8 /* control block is 8 bytes long */
 
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c
index 5f402a6b15..2f5f5b982a 100644
--- a/epan/dissectors/packet-dtls.c
+++ b/epan/dissectors/packet-dtls.c
@@ -98,73 +98,73 @@ static const value_string srtp_protection_profile_vals[] = {
 /* Initialize the protocol and registered fields */
 static gint dtls_tap                            = -1;
 static gint exported_pdu_tap                    = -1;
-static gint proto_dtls                          = -1;
-static gint hf_dtls_record                      = -1;
-static gint hf_dtls_record_content_type         = -1;
-static gint hf_dtls_record_special_type         = -1;
-static gint hf_dtls_record_version              = -1;
-static gint hf_dtls_record_epoch                = -1;
-static gint hf_dtls_record_sequence_number      = -1;
-static gint hf_dtls_record_connection_id        = -1;
-static gint hf_dtls_record_length               = -1;
-static gint hf_dtls_record_appdata              = -1;
-static gint hf_dtls_record_appdata_proto        = -1;
-static gint hf_dtls_record_encrypted_content    = -1;
-static gint hf_dtls_alert_message               = -1;
-static gint hf_dtls_alert_message_level         = -1;
-static gint hf_dtls_alert_message_description   = -1;
-static gint hf_dtls_handshake_protocol          = -1;
-static gint hf_dtls_handshake_type              = -1;
-static gint hf_dtls_handshake_length            = -1;
-static gint hf_dtls_handshake_message_seq       = -1;
-static gint hf_dtls_handshake_fragment_offset   = -1;
-static gint hf_dtls_handshake_fragment_length   = -1;
-
-static gint hf_dtls_heartbeat_message                 = -1;
-static gint hf_dtls_heartbeat_message_type            = -1;
-static gint hf_dtls_heartbeat_message_payload_length  = -1;
-static gint hf_dtls_heartbeat_message_payload         = -1;
-static gint hf_dtls_heartbeat_message_padding         = -1;
-
-static gint hf_dtls_fragments                   = -1;
-static gint hf_dtls_fragment                    = -1;
-static gint hf_dtls_fragment_overlap            = -1;
-static gint hf_dtls_fragment_overlap_conflicts  = -1;
-static gint hf_dtls_fragment_multiple_tails     = -1;
-static gint hf_dtls_fragment_too_long_fragment  = -1;
-static gint hf_dtls_fragment_error              = -1;
-static gint hf_dtls_fragment_count              = -1;
-static gint hf_dtls_reassembled_in              = -1;
-static gint hf_dtls_reassembled_length          = -1;
-
-static gint hf_dtls_hs_ext_use_srtp_protection_profiles_length  = -1;
-static gint hf_dtls_hs_ext_use_srtp_protection_profile          = -1;
-static gint hf_dtls_hs_ext_use_srtp_mki_length                  = -1;
-static gint hf_dtls_hs_ext_use_srtp_mki                         = -1;
+static gint proto_dtls;
+static gint hf_dtls_record;
+static gint hf_dtls_record_content_type;
+static gint hf_dtls_record_special_type;
+static gint hf_dtls_record_version;
+static gint hf_dtls_record_epoch;
+static gint hf_dtls_record_sequence_number;
+static gint hf_dtls_record_connection_id;
+static gint hf_dtls_record_length;
+static gint hf_dtls_record_appdata;
+static gint hf_dtls_record_appdata_proto;
+static gint hf_dtls_record_encrypted_content;
+static gint hf_dtls_alert_message;
+static gint hf_dtls_alert_message_level;
+static gint hf_dtls_alert_message_description;
+static gint hf_dtls_handshake_protocol;
+static gint hf_dtls_handshake_type;
+static gint hf_dtls_handshake_length;
+static gint hf_dtls_handshake_message_seq;
+static gint hf_dtls_handshake_fragment_offset;
+static gint hf_dtls_handshake_fragment_length;
+
+static gint hf_dtls_heartbeat_message;
+static gint hf_dtls_heartbeat_message_type;
+static gint hf_dtls_heartbeat_message_payload_length;
+static gint hf_dtls_heartbeat_message_payload;
+static gint hf_dtls_heartbeat_message_padding;
+
+static gint hf_dtls_fragments;
+static gint hf_dtls_fragment;
+static gint hf_dtls_fragment_overlap;
+static gint hf_dtls_fragment_overlap_conflicts;
+static gint hf_dtls_fragment_multiple_tails;
+static gint hf_dtls_fragment_too_long_fragment;
+static gint hf_dtls_fragment_error;
+static gint hf_dtls_fragment_count;
+static gint hf_dtls_reassembled_in;
+static gint hf_dtls_reassembled_length;
+
+static gint hf_dtls_hs_ext_use_srtp_protection_profiles_length;
+static gint hf_dtls_hs_ext_use_srtp_protection_profile;
+static gint hf_dtls_hs_ext_use_srtp_mki_length;
+static gint hf_dtls_hs_ext_use_srtp_mki;
 
 /* header fields used in ssl-utils, but defined here. */
 static dtls_hfs_t dtls_hfs;
 
 /* Initialize the subtree pointers */
-static gint ett_dtls                   = -1;
-static gint ett_dtls_record            = -1;
-static gint ett_dtls_alert             = -1;
-static gint ett_dtls_handshake         = -1;
-static gint ett_dtls_heartbeat         = -1;
-static gint ett_dtls_certs             = -1;
-
-static gint ett_dtls_fragment          = -1;
-static gint ett_dtls_fragments         = -1;
-
-static expert_field ei_dtls_handshake_fragment_length_too_long = EI_INIT;
-static expert_field ei_dtls_handshake_fragment_length_zero = EI_INIT;
-static expert_field ei_dtls_handshake_fragment_past_end_msg = EI_INIT;
-static expert_field ei_dtls_msg_len_diff_fragment = EI_INIT;
-static expert_field ei_dtls_heartbeat_payload_length = EI_INIT;
-static expert_field ei_dtls_cid_invalid_content_type = EI_INIT;
-static expert_field ei_dtls_use_srtp_profiles_length = EI_INIT;
+static gint ett_dtls;
+static gint ett_dtls_record;
+static gint ett_dtls_alert;
+static gint ett_dtls_handshake;
+static gint ett_dtls_heartbeat;
+static gint ett_dtls_certs;
+
+static gint ett_dtls_fragment;
+static gint ett_dtls_fragments;
+
+static expert_field ei_dtls_handshake_fragment_length_too_long;
+static expert_field ei_dtls_handshake_fragment_length_zero;
+static expert_field ei_dtls_handshake_fragment_past_end_msg;
+static expert_field ei_dtls_msg_len_diff_fragment;
+static expert_field ei_dtls_heartbeat_payload_length;
+static expert_field ei_dtls_cid_invalid_content_type;
+static expert_field ei_dtls_use_srtp_profiles_length;
 #if 0
-static expert_field ei_dtls_cid_invalid_enc_content = EI_INIT;
+static expert_field ei_dtls_cid_invalid_enc_content;
 #endif
 
 #ifdef HAVE_LIBGNUTLS
diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c
index 5d49c95f85..e9aa16f925 100644
--- a/epan/dissectors/packet-dtp.c
+++ b/epan/dissectors/packet-dtp.c
@@ -35,26 +35,26 @@ void proto_reg_handoff_dtp(void);
 
 static dissector_handle_t dtp_handle;
 
-static int proto_dtp = -1;
-static int hf_dtp_version = -1;
-static int hf_dtp_domain = -1;
-static int hf_dtp_tlvtype = -1;
-static int hf_dtp_tlvlength = -1;
-static int hf_dtp_senderid = -1;
-static int hf_dtp_tot = -1;
-static int hf_dtp_tat = -1;
-static int hf_dtp_tos = -1;
-static int hf_dtp_tas = -1;
-static int hf_dtp_data = -1;
-
-static gint ett_dtp = -1;
-static gint ett_dtp_tlv = -1;
-static gint ett_dtp_status = -1;
-static gint ett_dtp_type = -1;
-
-static expert_field ei_dtp_tlv_length_too_short = EI_INIT;
-static expert_field ei_dtp_tlv_length_invalid = EI_INIT;
-static expert_field ei_dtp_truncated = EI_INIT;
+static int proto_dtp;
+static int hf_dtp_version;
+static int hf_dtp_domain;
+static int hf_dtp_tlvtype;
+static int hf_dtp_tlvlength;
+static int hf_dtp_senderid;
+static int hf_dtp_tot;
+static int hf_dtp_tat;
+static int hf_dtp_tos;
+static int hf_dtp_tas;
+static int hf_dtp_data;
+
+static gint ett_dtp;
+static gint ett_dtp_tlv;
+static gint ett_dtp_status;
+static gint ett_dtp_type;
+
+static expert_field ei_dtp_tlv_length_too_short;
+static expert_field ei_dtp_tlv_length_invalid;
+static expert_field ei_dtp_truncated;
 
 static void
 dissect_dtp_tlv(packet_info *pinfo, tvbuff_t *tvb, int offset, int length,
diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c
index 469e3422c2..b0e05051f2 100644
--- a/epan/dissectors/packet-dtpt.c
+++ b/epan/dissectors/packet-dtpt.c
@@ -26,96 +26,96 @@
 
 void proto_register_dtpt(void);
 
-static int proto_dtpt = -1;
-
-static int hf_dtpt_version = -1;
-static int hf_dtpt_message_type = -1;
-static int hf_dtpt_flags = -1;
-static int hf_dtpt_flags_deep = -1;
-static int hf_dtpt_flags_containers = -1;
-static int hf_dtpt_flags_nocontainers = -1;
-static int hf_dtpt_flags_nearest = -1;
-static int hf_dtpt_flags_return_name = -1;
-static int hf_dtpt_flags_return_type = -1;
-static int hf_dtpt_flags_return_version = -1;
-static int hf_dtpt_flags_return_comment = -1;
-static int hf_dtpt_flags_return_addr = -1;
-static int hf_dtpt_flags_return_blob = -1;
-static int hf_dtpt_flags_return_aliases = -1;
-static int hf_dtpt_flags_return_query_string = -1;
-static int hf_dtpt_flags_flushcache = -1;
-static int hf_dtpt_flags_flushprevious = -1;
-static int hf_dtpt_flags_res_service = -1;
-static int hf_dtpt_payload_size = -1;
-static int hf_dtpt_handle = -1;
-static int hf_dtpt_error = -1;
-static int hf_dtpt_buffer_size = -1;
-static int hf_dtpt_data_size = -1;
-static int hf_dtpt_queryset_rawsize = -1;
-static int hf_dtpt_queryset_size = -1;
-static int hf_dtpt_queryset_service_instance_name_pointer = -1;
-static int hf_dtpt_queryset_service_class_id_pointer = -1;
-static int hf_dtpt_queryset_version = -1;
-static int hf_dtpt_queryset_comment_pointer = -1;
-static int hf_dtpt_queryset_namespace = -1;
-static int hf_dtpt_queryset_provider_id_pointer = -1;
-static int hf_dtpt_queryset_context_pointer = -1;
-static int hf_dtpt_queryset_protocols_number = -1;
-static int hf_dtpt_queryset_protocols_pointer = -1;
-static int hf_dtpt_queryset_query_string_pointer = -1;
-static int hf_dtpt_queryset_cs_addrs_number = -1;
-static int hf_dtpt_queryset_cs_addrs_pointer = -1;
-static int hf_dtpt_queryset_output_flags = -1;
-static int hf_dtpt_queryset_blob_pointer = -1;
-static int hf_dtpt_wstring_length = -1;
-static int hf_dtpt_wstring_data = -1;
-static int hf_dtpt_guid_length = -1;
-static int hf_dtpt_guid_data = -1;
-static int hf_dtpt_service_instance_name = -1;
-static int hf_dtpt_service_class_id = -1;
-static int hf_dtpt_comment = -1;
-static int hf_dtpt_ns_provider_id = -1;
-static int hf_dtpt_context = -1;
-static int hf_dtpt_protocols_number = -1;
-static int hf_dtpt_protocols_length = -1;
-static int hf_dtpt_protocol_family = -1;
-static int hf_dtpt_protocol_protocol = -1;
-static int hf_dtpt_query_string = -1;
-static int hf_dtpt_cs_addrs_number = -1;
-static int hf_dtpt_cs_addrs_length1 = -1;
-static int hf_dtpt_cs_addr_socket_type = -1;
-static int hf_dtpt_cs_addr_protocol = -1;
-static int hf_dtpt_cs_addr_local_pointer = -1;
-static int hf_dtpt_cs_addr_local_length = -1;
-static int hf_dtpt_cs_addr_local = -1;
-static int hf_dtpt_cs_addr_remote_pointer = -1;
-static int hf_dtpt_cs_addr_remote_length = -1;
-static int hf_dtpt_cs_addr_remote = -1;
-static int hf_dtpt_sockaddr_length = -1;
-static int hf_dtpt_sockaddr_family = -1;
-static int hf_dtpt_sockaddr_port = -1;
-static int hf_dtpt_sockaddr_address = -1;
-static int hf_dtpt_blob_rawsize = -1;
-static int hf_dtpt_blob_size = -1;
-static int hf_dtpt_blob_data_pointer = -1;
-static int hf_dtpt_blob_data_length = -1;
-static int hf_dtpt_blob_data = -1;
-static int hf_dtpt_connect_addr = -1;
-static int hf_dtpt_padding = -1;
-
-static gint ett_dtpt = -1;
-static gint ett_dtpt_flags = -1;
-static gint ett_dtpt_queryset = -1;
-static gint ett_dtpt_wstring = -1;
-static gint ett_dtpt_guid = -1;
-static gint ett_dtpt_protocols = -1;
-static gint ett_dtpt_protocol = -1;
-static gint ett_dtpt_cs_addrs = -1;
-static gint ett_dtpt_cs_addr1 = -1;
-static gint ett_dtpt_cs_addr2 = -1;
-static gint ett_dtpt_sockaddr = -1;
-static gint ett_dtpt_blobraw = -1;
-static gint ett_dtpt_blob = -1;
+static int proto_dtpt;
+
+static int hf_dtpt_version;
+static int hf_dtpt_message_type;
+static int hf_dtpt_flags;
+static int hf_dtpt_flags_deep;
+static int hf_dtpt_flags_containers;
+static int hf_dtpt_flags_nocontainers;
+static int hf_dtpt_flags_nearest;
+static int hf_dtpt_flags_return_name;
+static int hf_dtpt_flags_return_type;
+static int hf_dtpt_flags_return_version;
+static int hf_dtpt_flags_return_comment;
+static int hf_dtpt_flags_return_addr;
+static int hf_dtpt_flags_return_blob;
+static int hf_dtpt_flags_return_aliases;
+static int hf_dtpt_flags_return_query_string;
+static int hf_dtpt_flags_flushcache;
+static int hf_dtpt_flags_flushprevious;
+static int hf_dtpt_flags_res_service;
+static int hf_dtpt_payload_size;
+static int hf_dtpt_handle;
+static int hf_dtpt_error;
+static int hf_dtpt_buffer_size;
+static int hf_dtpt_data_size;
+static int hf_dtpt_queryset_rawsize;
+static int hf_dtpt_queryset_size;
+static int hf_dtpt_queryset_service_instance_name_pointer;
+static int hf_dtpt_queryset_service_class_id_pointer;
+static int hf_dtpt_queryset_version;
+static int hf_dtpt_queryset_comment_pointer;
+static int hf_dtpt_queryset_namespace;
+static int hf_dtpt_queryset_provider_id_pointer;
+static int hf_dtpt_queryset_context_pointer;
+static int hf_dtpt_queryset_protocols_number;
+static int hf_dtpt_queryset_protocols_pointer;
+static int hf_dtpt_queryset_query_string_pointer;
+static int hf_dtpt_queryset_cs_addrs_number;
+static int hf_dtpt_queryset_cs_addrs_pointer;
+static int hf_dtpt_queryset_output_flags;
+static int hf_dtpt_queryset_blob_pointer;
+static int hf_dtpt_wstring_length;
+static int hf_dtpt_wstring_data;
+static int hf_dtpt_guid_length;
+static int hf_dtpt_guid_data;
+static int hf_dtpt_service_instance_name;
+static int hf_dtpt_service_class_id;
+static int hf_dtpt_comment;
+static int hf_dtpt_ns_provider_id;
+static int hf_dtpt_context;
+static int hf_dtpt_protocols_number;
+static int hf_dtpt_protocols_length;
+static int hf_dtpt_protocol_family;
+static int hf_dtpt_protocol_protocol;
+static int hf_dtpt_query_string;
+static int hf_dtpt_cs_addrs_number;
+static int hf_dtpt_cs_addrs_length1;
+static int hf_dtpt_cs_addr_socket_type;
+static int hf_dtpt_cs_addr_protocol;
+static int hf_dtpt_cs_addr_local_pointer;
+static int hf_dtpt_cs_addr_local_length;
+static int hf_dtpt_cs_addr_local;
+static int hf_dtpt_cs_addr_remote_pointer;
+static int hf_dtpt_cs_addr_remote_length;
+static int hf_dtpt_cs_addr_remote;
+static int hf_dtpt_sockaddr_length;
+static int hf_dtpt_sockaddr_family;
+static int hf_dtpt_sockaddr_port;
+static int hf_dtpt_sockaddr_address;
+static int hf_dtpt_blob_rawsize;
+static int hf_dtpt_blob_size;
+static int hf_dtpt_blob_data_pointer;
+static int hf_dtpt_blob_data_length;
+static int hf_dtpt_blob_data;
+static int hf_dtpt_connect_addr;
+static int hf_dtpt_padding;
+
+static gint ett_dtpt;
+static gint ett_dtpt_flags;
+static gint ett_dtpt_queryset;
+static gint ett_dtpt_wstring;
+static gint ett_dtpt_guid;
+static gint ett_dtpt_protocols;
+static gint ett_dtpt_protocol;
+static gint ett_dtpt_cs_addrs;
+static gint ett_dtpt_cs_addr1;
+static gint ett_dtpt_cs_addr2;
+static gint ett_dtpt_sockaddr;
+static gint ett_dtpt_blobraw;
+static gint ett_dtpt_blob;
 
 
 
diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c
index d9e688ee77..c9461571f4 100644
--- a/epan/dissectors/packet-dua.c
+++ b/epan/dissectors/packet-dua.c
@@ -29,41 +29,41 @@ void proto_register_dua(void);
 void proto_reg_handoff_dua(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_dua                = -1;
-static int hf_int_interface_id      = -1;
-static int hf_text_interface_id     = -1;
-static int hf_info_string           = -1;
-static int hf_dlci_reserved         = -1;
-static int hf_dlci_v_bit            = -1;
-static int hf_dlci_zero_bit         = -1;
-static int hf_dlci_channel          = -1;
-static int hf_dlci_one_bit          = -1;
-static int hf_dlci_spare            = -1;
-static int hf_diag_info             = -1;
-static int hf_interface_range_start = -1;
-static int hf_interface_range_end   = -1;
-static int hf_heartbeat_data        = -1;
-static int hf_traffic_mode_type     = -1;
-static int hf_error_code            = -1;
-static int hf_status_type           = -1;
-static int hf_status_id             = -1;
-static int hf_release_reason        = -1;
-static int hf_tei_status            = -1;
-static int hf_asp_id                = -1;
-static int hf_states                = -1;
-static int hf_parameter_tag         = -1;
-static int hf_parameter_length      = -1;
-static int hf_parameter_value       = -1;
-static int hf_parameter_padding     = -1;
-static int hf_version               = -1;
-static int hf_reserved              = -1;
-static int hf_message_class         = -1;
-static int hf_message_type          = -1;
-static int hf_message_length        = -1;
+static int proto_dua;
+static int hf_int_interface_id;
+static int hf_text_interface_id;
+static int hf_info_string;
+static int hf_dlci_reserved;
+static int hf_dlci_v_bit;
+static int hf_dlci_zero_bit;
+static int hf_dlci_channel;
+static int hf_dlci_one_bit;
+static int hf_dlci_spare;
+static int hf_diag_info;
+static int hf_interface_range_start;
+static int hf_interface_range_end;
+static int hf_heartbeat_data;
+static int hf_traffic_mode_type;
+static int hf_error_code;
+static int hf_status_type;
+static int hf_status_id;
+static int hf_release_reason;
+static int hf_tei_status;
+static int hf_asp_id;
+static int hf_states;
+static int hf_parameter_tag;
+static int hf_parameter_length;
+static int hf_parameter_value;
+static int hf_parameter_padding;
+static int hf_version;
+static int hf_reserved;
+static int hf_message_class;
+static int hf_message_type;
+static int hf_message_length;
 
 /* Initialize the subtree pointers */
-static gint ett_dua                 = -1;
-static gint ett_dua_parameter       = -1;
+static gint ett_dua;
+static gint ett_dua_parameter;
 
 static dissector_handle_t dpnss_handle;
 static dissector_handle_t dua_handle;
diff --git a/epan/dissectors/packet-dvb-ait.c b/epan/dissectors/packet-dvb-ait.c
index 50542b6069..f0e66b932a 100644
--- a/epan/dissectors/packet-dvb-ait.c
+++ b/epan/dissectors/packet-dvb-ait.c
@@ -24,47 +24,47 @@ void proto_reg_handoff_dvb_ait(void);
 
 static dissector_handle_t dvb_ait_handle;
 
-static int proto_dvb_ait = -1;
-
-static gint ett_dvb_ait       = -1;
-static gint ett_dvb_ait_descr = -1;
-static gint ett_dvb_ait_app   = -1;
-
-static int hf_dvb_ait_test_app_flag = -1;
-static int hf_dvb_ait_app_type = -1;
-static int hf_dvb_ait_version_number = -1;
-static int hf_dvb_ait_current_next_indicator = -1;
-static int hf_dvb_ait_section_number = -1;
-static int hf_dvb_ait_last_section_number = -1;
-static int hf_dvb_ait_descr_loop_len = -1;
-static int hf_dvb_ait_descr_tag = -1;
-static int hf_dvb_ait_descr_len = -1;
-static int hf_dvb_ait_descr_data = -1;
-static int hf_dvb_ait_descr_app_prof_len = -1;
-static int hf_dvb_ait_descr_app_prof = -1;
-static int hf_dvb_ait_descr_app_ver = -1;
-static int hf_dvb_ait_descr_app_svc_bound = -1;
-static int hf_dvb_ait_descr_app_vis = -1;
-static int hf_dvb_ait_descr_app_prio = -1;
-static int hf_dvb_ait_descr_app_trpt_proto_label = -1;
-static int hf_dvb_ait_descr_app_name_lang = -1;
-static int hf_dvb_ait_descr_app_name_name = -1;
-static int hf_dvb_ait_descr_trpt_proto_id = -1;
-static int hf_dvb_ait_descr_trpt_proto_label = -1;
-static int hf_dvb_ait_descr_trpt_sel_remote = -1;
-static int hf_dvb_ait_descr_trpt_sel_onid = -1;
-static int hf_dvb_ait_descr_trpt_sel_tsid = -1;
-static int hf_dvb_ait_descr_trpt_sel_svcid = -1;
-static int hf_dvb_ait_descr_trpt_sel_comp = -1;
-static int hf_dvb_ait_descr_trpt_sel_url_base = -1;
-static int hf_dvb_ait_descr_trpt_sel_url_ext_cnt = -1;
-static int hf_dvb_ait_descr_trpt_sel_url_ext = -1;
-static int hf_dvb_ait_descr_trpt_sel_bytes = -1;
-static int hf_dvb_ait_descr_sal_init_path = -1;
-static int hf_dvb_ait_app_loop_len = -1;
-static int hf_dvb_ait_org_id = -1;
-static int hf_dvb_ait_app_id = -1;
-static int hf_dvb_ait_app_ctrl_code = -1;
+static int proto_dvb_ait;
+
+static gint ett_dvb_ait;
+static gint ett_dvb_ait_descr;
+static gint ett_dvb_ait_app;
+
+static int hf_dvb_ait_test_app_flag;
+static int hf_dvb_ait_app_type;
+static int hf_dvb_ait_version_number;
+static int hf_dvb_ait_current_next_indicator;
+static int hf_dvb_ait_section_number;
+static int hf_dvb_ait_last_section_number;
+static int hf_dvb_ait_descr_loop_len;
+static int hf_dvb_ait_descr_tag;
+static int hf_dvb_ait_descr_len;
+static int hf_dvb_ait_descr_data;
+static int hf_dvb_ait_descr_app_prof_len;
+static int hf_dvb_ait_descr_app_prof;
+static int hf_dvb_ait_descr_app_ver;
+static int hf_dvb_ait_descr_app_svc_bound;
+static int hf_dvb_ait_descr_app_vis;
+static int hf_dvb_ait_descr_app_prio;
+static int hf_dvb_ait_descr_app_trpt_proto_label;
+static int hf_dvb_ait_descr_app_name_lang;
+static int hf_dvb_ait_descr_app_name_name;
+static int hf_dvb_ait_descr_trpt_proto_id;
+static int hf_dvb_ait_descr_trpt_proto_label;
+static int hf_dvb_ait_descr_trpt_sel_remote;
+static int hf_dvb_ait_descr_trpt_sel_onid;
+static int hf_dvb_ait_descr_trpt_sel_tsid;
+static int hf_dvb_ait_descr_trpt_sel_svcid;
+static int hf_dvb_ait_descr_trpt_sel_comp;
+static int hf_dvb_ait_descr_trpt_sel_url_base;
+static int hf_dvb_ait_descr_trpt_sel_url_ext_cnt;
+static int hf_dvb_ait_descr_trpt_sel_url_ext;
+static int hf_dvb_ait_descr_trpt_sel_bytes;
+static int hf_dvb_ait_descr_sal_init_path;
+static int hf_dvb_ait_app_loop_len;
+static int hf_dvb_ait_org_id;
+static int hf_dvb_ait_app_id;
+static int hf_dvb_ait_app_ctrl_code;
 
 static const value_string app_ctrl_code[] = {
     { 0x01,  "Autostart" },
diff --git a/epan/dissectors/packet-dvb-bat.c b/epan/dissectors/packet-dvb-bat.c
index 44db1f08b4..0f88159f90 100644
--- a/epan/dissectors/packet-dvb-bat.c
+++ b/epan/dissectors/packet-dvb-bat.c
@@ -20,27 +20,27 @@ void proto_reg_handoff_dvb_bat(void);
 
 static dissector_handle_t dvb_bat_handle;
 
-static int proto_dvb_bat = -1;
-static int hf_dvb_bat_bouquet_id = -1;
-static int hf_dvb_bat_reserved1 = -1;
-static int hf_dvb_bat_version_number = -1;
-static int hf_dvb_bat_current_next_indicator = -1;
-static int hf_dvb_bat_section_number = -1;
-static int hf_dvb_bat_last_section_number = -1;
-
-static int hf_dvb_bat_reserved2 = -1;
-static int hf_dvb_bat_bouquet_descriptors_length = -1;
-
-static int hf_dvb_bat_reserved3 = -1;
-static int hf_dvb_bat_transport_stream_loop_length = -1;
-
-static int hf_dvb_bat_transport_stream_id = -1;
-static int hf_dvb_bat_original_network_id = -1;
-static int hf_dvb_bat_reserved4 = -1;
-static int hf_dvb_bat_transport_descriptors_length = -1;
-
-static gint ett_dvb_bat = -1;
-static gint ett_dvb_bat_transport_stream = -1;
+static int proto_dvb_bat;
+static int hf_dvb_bat_bouquet_id;
+static int hf_dvb_bat_reserved1;
+static int hf_dvb_bat_version_number;
+static int hf_dvb_bat_current_next_indicator;
+static int hf_dvb_bat_section_number;
+static int hf_dvb_bat_last_section_number;
+
+static int hf_dvb_bat_reserved2;
+static int hf_dvb_bat_bouquet_descriptors_length;
+
+static int hf_dvb_bat_reserved3;
+static int hf_dvb_bat_transport_stream_loop_length;
+
+static int hf_dvb_bat_transport_stream_id;
+static int hf_dvb_bat_original_network_id;
+static int hf_dvb_bat_reserved4;
+static int hf_dvb_bat_transport_descriptors_length;
+
+static gint ett_dvb_bat;
+static gint ett_dvb_bat_transport_stream;
 
 
 #define DVB_BAT_RESERVED1_MASK                      0xC0
diff --git a/epan/dissectors/packet-dvb-data-mpe.c b/epan/dissectors/packet-dvb-data-mpe.c
index 2f219093a6..e15d2b3f34 100644
--- a/epan/dissectors/packet-dvb-data-mpe.c
+++ b/epan/dissectors/packet-dvb-data-mpe.c
@@ -19,22 +19,22 @@
 void proto_register_dvb_data_mpe(void);
 void proto_reg_handoff_dvb_data_mpe(void);
 
-static int proto_dvb_data_mpe = -1;
-static int hf_dvb_data_mpe_reserved = -1;
-static int hf_dvb_data_mpe_payload_scrambling_control = -1;
-static int hf_dvb_data_mpe_address_scrambling_control = -1;
-static int hf_dvb_data_mpe_llc_snap_flag = -1;
-static int hf_dvb_data_mpe_current_next_indicator = -1;
-static int hf_dvb_data_mpe_section_number = -1;
-static int hf_dvb_data_mpe_last_section_number = -1;
-static int hf_dvb_data_mpe_dst_mac = -1;
-static int hf_dvb_data_mpe_dst_mac_scrambled = -1;
-
-static gint ett_dvb_data_mpe = -1;
-
-static expert_field ei_dvb_data_mpe_reserved_not_one = EI_INIT;
-static expert_field ei_dvb_data_mpe_payload_scrambled = EI_INIT;
-static expert_field ei_dvb_data_mpe_address_scrambled = EI_INIT;
+static int proto_dvb_data_mpe;
+static int hf_dvb_data_mpe_reserved;
+static int hf_dvb_data_mpe_payload_scrambling_control;
+static int hf_dvb_data_mpe_address_scrambling_control;
+static int hf_dvb_data_mpe_llc_snap_flag;
+static int hf_dvb_data_mpe_current_next_indicator;
+static int hf_dvb_data_mpe_section_number;
+static int hf_dvb_data_mpe_last_section_number;
+static int hf_dvb_data_mpe_dst_mac;
+static int hf_dvb_data_mpe_dst_mac_scrambled;
+
+static gint ett_dvb_data_mpe;
+
+static expert_field ei_dvb_data_mpe_reserved_not_one;
+static expert_field ei_dvb_data_mpe_payload_scrambled;
+static expert_field ei_dvb_data_mpe_address_scrambled;
 
 static dissector_handle_t dvb_data_mpe_handle;
 
diff --git a/epan/dissectors/packet-dvb-eit.c b/epan/dissectors/packet-dvb-eit.c
index 60493319c6..046805acaf 100644
--- a/epan/dissectors/packet-dvb-eit.c
+++ b/epan/dissectors/packet-dvb-eit.c
@@ -20,28 +20,28 @@ void proto_reg_handoff_dvb_eit(void);
 
 static dissector_handle_t dvb_eit_handle;
 
-static int proto_dvb_eit = -1;
-static int hf_dvb_eit_service_id = -1;
-static int hf_dvb_eit_reserved = -1;
-static int hf_dvb_eit_version_number = -1;
-static int hf_dvb_eit_current_next_indicator = -1;
-static int hf_dvb_eit_section_number = -1;
-static int hf_dvb_eit_last_section_number = -1;
-
-static int hf_dvb_eit_transport_stream_id = -1;
-static int hf_dvb_eit_original_network_id = -1;
-static int hf_dvb_eit_segment_last_section_number = -1;
-static int hf_dvb_eit_last_table_id = -1;
-
-static int hf_dvb_eit_event_id = -1;
-static int hf_dvb_eit_start_time = -1;
-static int hf_dvb_eit_duration = -1;
-static int hf_dvb_eit_running_status = -1;
-static int hf_dvb_eit_free_ca_mode = -1;
-static int hf_dvb_eit_descriptors_loop_length = -1;
-
-static gint ett_dvb_eit = -1;
-static gint ett_dvb_eit_event = -1;
+static int proto_dvb_eit;
+static int hf_dvb_eit_service_id;
+static int hf_dvb_eit_reserved;
+static int hf_dvb_eit_version_number;
+static int hf_dvb_eit_current_next_indicator;
+static int hf_dvb_eit_section_number;
+static int hf_dvb_eit_last_section_number;
+
+static int hf_dvb_eit_transport_stream_id;
+static int hf_dvb_eit_original_network_id;
+static int hf_dvb_eit_segment_last_section_number;
+static int hf_dvb_eit_last_table_id;
+
+static int hf_dvb_eit_event_id;
+static int hf_dvb_eit_start_time;
+static int hf_dvb_eit_duration;
+static int hf_dvb_eit_running_status;
+static int hf_dvb_eit_free_ca_mode;
+static int hf_dvb_eit_descriptors_loop_length;
+
+static gint ett_dvb_eit;
+static gint ett_dvb_eit_event;
 
 
 #define DVB_EIT_RESERVED_MASK                     0xC0
diff --git a/epan/dissectors/packet-dvb-ipdc.c b/epan/dissectors/packet-dvb-ipdc.c
index b83197e3b1..abf494a071 100644
--- a/epan/dissectors/packet-dvb-ipdc.c
+++ b/epan/dissectors/packet-dvb-ipdc.c
@@ -17,12 +17,12 @@ void proto_register_dvb_ipdc(void);
 void proto_reg_handoff_dvb_ipdc(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_ipdc = -1;
+static int proto_ipdc;
 
-/* static int hf_ipdc_esg_bootstrap_xml = -1; */
+/* static int hf_ipdc_esg_bootstrap_xml; */
 
 /* Initialize the subtree pointers */
-static gint ett_ipdc = -1;
+static gint ett_ipdc;
 
 
 enum {
diff --git a/epan/dissectors/packet-dvb-nit.c b/epan/dissectors/packet-dvb-nit.c
index b30f128b4f..44d294db57 100644
--- a/epan/dissectors/packet-dvb-nit.c
+++ b/epan/dissectors/packet-dvb-nit.c
@@ -18,26 +18,26 @@
 void proto_register_dvb_nit(void);
 void proto_reg_handoff_dvb_nit(void);
 
-static int proto_dvb_nit = -1;
-static int hf_dvb_nit_network_id = -1;
-static int hf_dvb_nit_reserved1 = -1;
-static int hf_dvb_nit_version_number = -1;
-static int hf_dvb_nit_current_next_indicator = -1;
-static int hf_dvb_nit_section_number = -1;
-static int hf_dvb_nit_last_section_number = -1;
-static int hf_dvb_nit_reserved2 = -1;
-
-static int hf_dvb_nit_network_descriptors_length = -1;
-static int hf_dvb_nit_reserved3 = -1;
-static int hf_dvb_nit_transport_stream_loop_length = -1;
-
-static int hf_dvb_nit_transport_stream_id = -1;
-static int hf_dvb_nit_original_network_id = -1;
-static int hf_dvb_nit_reserved4 = -1;
-static int hf_dvb_nit_transport_descriptors_length = -1;
-
-static gint ett_dvb_nit = -1;
-static gint ett_dvb_nit_ts = -1;
+static int proto_dvb_nit;
+static int hf_dvb_nit_network_id;
+static int hf_dvb_nit_reserved1;
+static int hf_dvb_nit_version_number;
+static int hf_dvb_nit_current_next_indicator;
+static int hf_dvb_nit_section_number;
+static int hf_dvb_nit_last_section_number;
+static int hf_dvb_nit_reserved2;
+
+static int hf_dvb_nit_network_descriptors_length;
+static int hf_dvb_nit_reserved3;
+static int hf_dvb_nit_transport_stream_loop_length;
+
+static int hf_dvb_nit_transport_stream_id;
+static int hf_dvb_nit_original_network_id;
+static int hf_dvb_nit_reserved4;
+static int hf_dvb_nit_transport_descriptors_length;
+
+static gint ett_dvb_nit;
+static gint ett_dvb_nit_ts;
 
 static dissector_handle_t dvb_nit_handle;
 
diff --git a/epan/dissectors/packet-dvb-s2-bb.c b/epan/dissectors/packet-dvb-s2-bb.c
index 3f603b2023..ce98dffe4b 100644
--- a/epan/dissectors/packet-dvb-s2-bb.c
+++ b/epan/dissectors/packet-dvb-s2-bb.c
@@ -130,89 +130,89 @@ static gint dvb_s2_default_modeadapt = DVB_S2_MODEADAPT_TYPE_L3;
 static gboolean dvb_s2_try_all_modeadapt = TRUE;
 
 /* Initialize the protocol and registered fields */
-static int proto_dvb_s2_modeadapt = -1;
-static int hf_dvb_s2_modeadapt_sync = -1;
-static int hf_dvb_s2_modeadapt_acm = -1;
-static int hf_dvb_s2_modeadapt_acm_fecframe = -1;
-static int hf_dvb_s2_modeadapt_acm_pilot = -1;
-static int hf_dvb_s2_modeadapt_acm_modcod = -1;
-static int hf_dvb_s2_modeadapt_acm_modcod_s2x = -1;
-static int hf_dvb_s2_modeadapt_cni = -1;
-static int hf_dvb_s2_modeadapt_frameno = -1;
-
-static int proto_dvb_s2_bb = -1;
-static int hf_dvb_s2_bb_matype1 = -1;
-static int hf_dvb_s2_bb_matype1_gs = -1;
-static int hf_dvb_s2_bb_matype1_mis = -1;
-static int hf_dvb_s2_bb_matype1_acm = -1;
-static int hf_dvb_s2_bb_matype1_issyi = -1;
-static int hf_dvb_s2_bb_matype1_npd = -1;
-static int hf_dvb_s2_bb_matype1_high_ro = -1;
-static int hf_dvb_s2_bb_matype1_low_ro = -1;
-static int hf_dvb_s2_bb_matype2 = -1;
-static int hf_dvb_s2_bb_upl = -1;
-static int hf_dvb_s2_bb_dfl = -1;
-static int hf_dvb_s2_bb_sync = -1;
-static int hf_dvb_s2_bb_syncd = -1;
-static int hf_dvb_s2_bb_crc = -1;
-static int hf_dvb_s2_bb_crc_status = -1;
-static int hf_dvb_s2_bb_df = -1;
-static int hf_dvb_s2_bb_eip_crc32 = -1;
-static int hf_dvb_s2_bb_eip_crc32_status = -1;
-static int hf_dvb_s2_bb_up_crc = -1;
-static int hf_dvb_s2_bb_up_crc_status = -1;
-static int hf_dvb_s2_bb_issy_short = -1;
-static int hf_dvb_s2_bb_issy_long = -1;
-static int hf_dvb_s2_bb_dnp = -1;
-
-static int hf_dvb_s2_bb_packetized = -1;
-static int hf_dvb_s2_bb_transport = -1;
-static int hf_dvb_s2_bb_reserved = -1;
-
-static int proto_dvb_s2_gse = -1;
-static int hf_dvb_s2_gse_hdr = -1;
-static int hf_dvb_s2_gse_hdr_start = -1;
-static int hf_dvb_s2_gse_hdr_stop = -1;
-static int hf_dvb_s2_gse_hdr_labeltype = -1;
-static int hf_dvb_s2_gse_hdr_length = -1;
-static int hf_dvb_s2_gse_padding = -1;
-static int hf_dvb_s2_gse_proto_next_header = -1;
-static int hf_dvb_s2_gse_proto_ethertype = -1;
-static int hf_dvb_s2_gse_label6 = -1;
-static int hf_dvb_s2_gse_label3 = -1;
-static int hf_dvb_s2_gse_fragid = -1;
-static int hf_dvb_s2_gse_totlength = -1;
-static int hf_dvb_s2_gse_exthdr = -1;
-static int hf_dvb_s2_gse_ncr = -1;
-static int hf_dvb_s2_gse_data = -1;
-static int hf_dvb_s2_gse_crc32 = -1;
-static int hf_dvb_s2_gse_crc32_status = -1;
+static int proto_dvb_s2_modeadapt;
+static int hf_dvb_s2_modeadapt_sync;
+static int hf_dvb_s2_modeadapt_acm;
+static int hf_dvb_s2_modeadapt_acm_fecframe;
+static int hf_dvb_s2_modeadapt_acm_pilot;
+static int hf_dvb_s2_modeadapt_acm_modcod;
+static int hf_dvb_s2_modeadapt_acm_modcod_s2x;
+static int hf_dvb_s2_modeadapt_cni;
+static int hf_dvb_s2_modeadapt_frameno;
+
+static int proto_dvb_s2_bb;
+static int hf_dvb_s2_bb_matype1;
+static int hf_dvb_s2_bb_matype1_gs;
+static int hf_dvb_s2_bb_matype1_mis;
+static int hf_dvb_s2_bb_matype1_acm;
+static int hf_dvb_s2_bb_matype1_issyi;
+static int hf_dvb_s2_bb_matype1_npd;
+static int hf_dvb_s2_bb_matype1_high_ro;
+static int hf_dvb_s2_bb_matype1_low_ro;
+static int hf_dvb_s2_bb_matype2;
+static int hf_dvb_s2_bb_upl;
+static int hf_dvb_s2_bb_dfl;
+static int hf_dvb_s2_bb_sync;
+static int hf_dvb_s2_bb_syncd;
+static int hf_dvb_s2_bb_crc;
+static int hf_dvb_s2_bb_crc_status;
+static int hf_dvb_s2_bb_df;
+static int hf_dvb_s2_bb_eip_crc32;
+static int hf_dvb_s2_bb_eip_crc32_status;
+static int hf_dvb_s2_bb_up_crc;
+static int hf_dvb_s2_bb_up_crc_status;
+static int hf_dvb_s2_bb_issy_short;
+static int hf_dvb_s2_bb_issy_long;
+static int hf_dvb_s2_bb_dnp;
+
+static int hf_dvb_s2_bb_packetized;
+static int hf_dvb_s2_bb_transport;
+static int hf_dvb_s2_bb_reserved;
+
+static int proto_dvb_s2_gse;
+static int hf_dvb_s2_gse_hdr;
+static int hf_dvb_s2_gse_hdr_start;
+static int hf_dvb_s2_gse_hdr_stop;
+static int hf_dvb_s2_gse_hdr_labeltype;
+static int hf_dvb_s2_gse_hdr_length;
+static int hf_dvb_s2_gse_padding;
+static int hf_dvb_s2_gse_proto_next_header;
+static int hf_dvb_s2_gse_proto_ethertype;
+static int hf_dvb_s2_gse_label6;
+static int hf_dvb_s2_gse_label3;
+static int hf_dvb_s2_gse_fragid;
+static int hf_dvb_s2_gse_totlength;
+static int hf_dvb_s2_gse_exthdr;
+static int hf_dvb_s2_gse_ncr;
+static int hf_dvb_s2_gse_data;
+static int hf_dvb_s2_gse_crc32;
+static int hf_dvb_s2_gse_crc32_status;
 
 /* Initialize the subtree pointers */
-static gint ett_dvb_s2_modeadapt = -1;
-static gint ett_dvb_s2_modeadapt_acm = -1;
-
-static gint ett_dvb_s2_bb = -1;
-static gint ett_dvb_s2_bb_matype1 = -1;
-
-static gint ett_dvb_s2_gse = -1;
-static gint ett_dvb_s2_gse_hdr = -1;
-static gint ett_dvb_s2_gse_ncr = -1;
-
-static expert_field ei_dvb_s2_bb_crc = EI_INIT;
-static expert_field ei_dvb_s2_bb_header_ambiguous = EI_INIT;
-static expert_field ei_dvb_s2_bb_issy_invalid = EI_INIT;
-static expert_field ei_dvb_s2_bb_npd_invalid = EI_INIT;
-static expert_field ei_dvb_s2_bb_upl_invalid = EI_INIT;
-static expert_field ei_dvb_s2_bb_dfl_invalid = EI_INIT;
-static expert_field ei_dvb_s2_bb_sync_invalid = EI_INIT;
-static expert_field ei_dvb_s2_bb_syncd_invalid = EI_INIT;
-static expert_field ei_dvb_s2_bb_up_reassembly_invalid = EI_INIT;
-static expert_field ei_dvb_s2_bb_reserved = EI_INIT;
-
-static expert_field ei_dvb_s2_gse_length_invalid = EI_INIT;
-static expert_field ei_dvb_s2_gse_totlength_invalid = EI_INIT;
-static expert_field ei_dvb_s2_gse_crc32 = EI_INIT;
+static gint ett_dvb_s2_modeadapt;
+static gint ett_dvb_s2_modeadapt_acm;
+
+static gint ett_dvb_s2_bb;
+static gint ett_dvb_s2_bb_matype1;
+
+static gint ett_dvb_s2_gse;
+static gint ett_dvb_s2_gse_hdr;
+static gint ett_dvb_s2_gse_ncr;
+
+static expert_field ei_dvb_s2_bb_crc;
+static expert_field ei_dvb_s2_bb_header_ambiguous;
+static expert_field ei_dvb_s2_bb_issy_invalid;
+static expert_field ei_dvb_s2_bb_npd_invalid;
+static expert_field ei_dvb_s2_bb_upl_invalid;
+static expert_field ei_dvb_s2_bb_dfl_invalid;
+static expert_field ei_dvb_s2_bb_sync_invalid;
+static expert_field ei_dvb_s2_bb_syncd_invalid;
+static expert_field ei_dvb_s2_bb_up_reassembly_invalid;
+static expert_field ei_dvb_s2_bb_reserved;
+
+static expert_field ei_dvb_s2_gse_length_invalid;
+static expert_field ei_dvb_s2_gse_totlength_invalid;
+static expert_field ei_dvb_s2_gse_crc32;
 
 /* Reassembly support */
 
@@ -238,19 +238,19 @@ static expert_field ei_dvb_s2_gse_crc32 = EI_INIT;
  * API.
  */
 
-static gint ett_dvbs2_fragments = -1;
-static gint ett_dvbs2_fragment  = -1;
-static int hf_dvbs2_fragments = -1;
-static int hf_dvbs2_fragment = -1;
-static int hf_dvbs2_fragment_overlap = -1;
-static int hf_dvbs2_fragment_overlap_conflict = -1;
-static int hf_dvbs2_fragment_multiple_tails = -1;
-static int hf_dvbs2_fragment_too_long_fragment = -1;
-static int hf_dvbs2_fragment_error = -1;
-static int hf_dvbs2_fragment_count = -1;
-static int hf_dvbs2_reassembled_in = -1;
-static int hf_dvbs2_reassembled_length = -1;
-static int hf_dvbs2_reassembled_data = -1;
+static gint ett_dvbs2_fragments;
+static gint ett_dvbs2_fragment;
+static int hf_dvbs2_fragments;
+static int hf_dvbs2_fragment;
+static int hf_dvbs2_fragment_overlap;
+static int hf_dvbs2_fragment_overlap_conflict;
+static int hf_dvbs2_fragment_multiple_tails;
+static int hf_dvbs2_fragment_too_long_fragment;
+static int hf_dvbs2_fragment_error;
+static int hf_dvbs2_fragment_count;
+static int hf_dvbs2_reassembled_in;
+static int hf_dvbs2_reassembled_length;
+static int hf_dvbs2_reassembled_data;
 
 static const fragment_items dvbs2_frag_items = {
   &ett_dvbs2_fragment,
@@ -278,19 +278,19 @@ dvb_s2_gse_defragment_init(void)
                         &addresses_reassembly_table_functions);
 }
 
-static gint ett_dvb_s2_gse_fragments = -1;
-static gint ett_dvb_s2_gse_fragment  = -1;
-static int hf_dvb_s2_gse_fragments = -1;
-static int hf_dvb_s2_gse_fragment = -1;
-static int hf_dvb_s2_gse_fragment_overlap = -1;
-static int hf_dvb_s2_gse_fragment_overlap_conflict = -1;
-static int hf_dvb_s2_gse_fragment_multiple_tails = -1;
-static int hf_dvb_s2_gse_fragment_too_long_fragment = -1;
-static int hf_dvb_s2_gse_fragment_error = -1;
-static int hf_dvb_s2_gse_fragment_count = -1;
-static int hf_dvb_s2_gse_reassembled_in = -1;
-static int hf_dvb_s2_gse_reassembled_length = -1;
-static int hf_dvb_s2_gse_reassembled_data = -1;
+static gint ett_dvb_s2_gse_fragments;
+static gint ett_dvb_s2_gse_fragment;
+static int hf_dvb_s2_gse_fragments;
+static int hf_dvb_s2_gse_fragment;
+static int hf_dvb_s2_gse_fragment_overlap;
+static int hf_dvb_s2_gse_fragment_overlap_conflict;
+static int hf_dvb_s2_gse_fragment_multiple_tails;
+static int hf_dvb_s2_gse_fragment_too_long_fragment;
+static int hf_dvb_s2_gse_fragment_error;
+static int hf_dvb_s2_gse_fragment_count;
+static int hf_dvb_s2_gse_reassembled_in;
+static int hf_dvb_s2_gse_reassembled_length;
+static int hf_dvb_s2_gse_reassembled_data;
 
 static const fragment_items dvb_s2_gse_frag_items = {
   &ett_dvb_s2_gse_fragment,
diff --git a/epan/dissectors/packet-dvb-s2-table.c b/epan/dissectors/packet-dvb-s2-table.c
index 330fa69986..cf224f3e07 100644
--- a/epan/dissectors/packet-dvb-s2-table.c
+++ b/epan/dissectors/packet-dvb-s2-table.c
@@ -41,479 +41,479 @@ void proto_reg_handoff_dvb_s2_table(void);
 static gint dvb_s2_rcs_version = DVB_S2_RCS2_TABLE_DECODING;
 
 /* Initialize the protocol and registered fields */
-static int proto_dvb_s2_table = -1;
-static int hf_dvb_s2_table_id = -1;
-static int hf_dvb_s2_table_section = -1;
-static int hf_dvb_s2_table_private = -1;
-static int hf_dvb_s2_table_reserved = -1;
-static int hf_dvb_s2_table_msb_len = -1;
-static int hf_dvb_s2_table_lsb_len = -1;
-static int hf_dvb_s2_table_network_interactive_id = -1;
-static int hf_dvb_s2_table_reserved2 = -1;
-static int hf_dvb_s2_table_version_number = -1;
-static int hf_dvb_s2_table_current_next_indicator = -1;
-static int hf_dvb_s2_table_section_number = -1;
-static int hf_dvb_s2_table_last_section_number = -1;
-
-static int hf_dvb_s2_table_smt_id = -1;
-static int hf_dvb_s2_table_smt_section_syntax_indicator = -1;
-static int hf_dvb_s2_table_smt_futur_use = -1;
-static int hf_dvb_s2_table_smt_reserved = -1;
-static int hf_dvb_s2_table_smt_section_length = -1;
-static int hf_dvb_s2_table_smt_esn0 = -1;
-static int hf_dvb_s2_table_smt_modcod = -1;
+static int proto_dvb_s2_table;
+static int hf_dvb_s2_table_id;
+static int hf_dvb_s2_table_section;
+static int hf_dvb_s2_table_private;
+static int hf_dvb_s2_table_reserved;
+static int hf_dvb_s2_table_msb_len;
+static int hf_dvb_s2_table_lsb_len;
+static int hf_dvb_s2_table_network_interactive_id;
+static int hf_dvb_s2_table_reserved2;
+static int hf_dvb_s2_table_version_number;
+static int hf_dvb_s2_table_current_next_indicator;
+static int hf_dvb_s2_table_section_number;
+static int hf_dvb_s2_table_last_section_number;
+
+static int hf_dvb_s2_table_smt_id;
+static int hf_dvb_s2_table_smt_section_syntax_indicator;
+static int hf_dvb_s2_table_smt_futur_use;
+static int hf_dvb_s2_table_smt_reserved;
+static int hf_dvb_s2_table_smt_section_length;
+static int hf_dvb_s2_table_smt_esn0;
+static int hf_dvb_s2_table_smt_modcod;
 
 /* DSM-CC header */
-static int hf_dvb_s2_section_syntax_indic = -1;
-static int hf_dvb_s2_private_indicator = -1;
-static int hf_dvb_s2_reserved_1 = -1;
-static int hf_dvb_s2_section_length = -1;
-static int hf_dvb_s2_mac_addres_6 = -1;
-static int hf_dvb_s2_mac_addres_5 = -1;
-static int hf_dvb_s2_mac_addres_4 = -1;
-static int hf_dvb_s2_mac_addres_3 = -1;
-static int hf_dvb_s2_mac_addres_2 = -1;
-static int hf_dvb_s2_mac_addres_1 = -1;
-static int hf_dvb_s2_reserved_2 = -1;
-static int hf_dvb_s2_payload_scrambling_control = -1;
-static int hf_dvb_s2_address_scrambling_control = -1;
-static int hf_dvb_s2_LLC_SNAP_flag = -1;
-static int hf_dvb_s2_current_next_indicator = -1;
-static int hf_dvb_s2_section_number = -1;
-static int hf_dvb_s2_last_section_number = -1;
+static int hf_dvb_s2_section_syntax_indic;
+static int hf_dvb_s2_private_indicator;
+static int hf_dvb_s2_reserved_1;
+static int hf_dvb_s2_section_length;
+static int hf_dvb_s2_mac_addres_6;
+static int hf_dvb_s2_mac_addres_5;
+static int hf_dvb_s2_mac_addres_4;
+static int hf_dvb_s2_mac_addres_3;
+static int hf_dvb_s2_mac_addres_2;
+static int hf_dvb_s2_mac_addres_1;
+static int hf_dvb_s2_reserved_2;
+static int hf_dvb_s2_payload_scrambling_control;
+static int hf_dvb_s2_address_scrambling_control;
+static int hf_dvb_s2_LLC_SNAP_flag;
+static int hf_dvb_s2_current_next_indicator;
+static int hf_dvb_s2_section_number;
+static int hf_dvb_s2_last_section_number;
 
 /* SCT */
-static int hf_dvb_s2_table_superframe_loop_count = -1;
-static int hf_dvb_s2_table_superframe = -1;
-static int hf_dvb_s2_table_sf_sequence = -1;
-static int hf_dvb_s2_table_sf_id = -1;
-static int hf_dvb_s2_table_sf_large_timing_uncertaintly_flag = -1;
-static int hf_dvb_s2_table_sf_uplink_polarization = -1;
-static int hf_dvb_s2_table_sf_absolute_time = -1;
-static int hf_dvb_s2_table_sf_duration = -1;
-static int hf_dvb_s2_table_sf_centre_frequency = -1;
-static int hf_dvb_s2_table_sf_count = -1;
-static int hf_dvb_s2_table_sf_frame_loop_count = -1;
-static int hf_dvb_s2_table_sf_frame = -1;
-static int hf_dvb_s2_table_sf_frame_type = -1;
-static int hf_dvb_s2_table_sf_frame_id = -1;
-static int hf_dvb_s2_table_sf_frame_start_time = -1;
-static int hf_dvb_s2_table_sf_frame_centre_frequency_offset = -1;
+static int hf_dvb_s2_table_superframe_loop_count;
+static int hf_dvb_s2_table_superframe;
+static int hf_dvb_s2_table_sf_sequence;
+static int hf_dvb_s2_table_sf_id;
+static int hf_dvb_s2_table_sf_large_timing_uncertaintly_flag;
+static int hf_dvb_s2_table_sf_uplink_polarization;
+static int hf_dvb_s2_table_sf_absolute_time;
+static int hf_dvb_s2_table_sf_duration;
+static int hf_dvb_s2_table_sf_centre_frequency;
+static int hf_dvb_s2_table_sf_count;
+static int hf_dvb_s2_table_sf_frame_loop_count;
+static int hf_dvb_s2_table_sf_frame;
+static int hf_dvb_s2_table_sf_frame_type;
+static int hf_dvb_s2_table_sf_frame_id;
+static int hf_dvb_s2_table_sf_frame_start_time;
+static int hf_dvb_s2_table_sf_frame_centre_frequency_offset;
 /* TIM */
-static int hf_dvb_s2_table_rcst_status = -1;
-static int hf_dvb_s2_table_network_status = -1;
-static int hf_dvb_s2_table_desc_loop_count = -1;
+static int hf_dvb_s2_table_rcst_status;
+static int hf_dvb_s2_table_network_status;
+static int hf_dvb_s2_table_desc_loop_count;
 /* TBTP */
-static int hf_dvb_s2_tbtp_group_id = -1;
-static int hf_dvb_s2_tbtp_superframe_count = -1;
-static int hf_dvb_s2_tbtp_frame_loop_count = -1;
-static int hf_dvb_s2_tbtp_sf_frame = -1;
-static int hf_dvb_s2_tbtp_frame_number = -1;
-static int hf_dvb_s2_tbtp_btb_loop_count = -1;
-static int hf_dvb_s2_tbtp_btp = -1;
-static int hf_dvb_s2_tbtp_multiple_channel_flag = -1;
-static int hf_dvb_s2_tbtp_assignment_type = -1;
-static int hf_dvb_s2_tbtp_frame_vbdc_queue_empty_flag = -1;
-static int hf_dvb_s2_tbtp_start_slot = -1;
-static int hf_dvb_s2_tbtp_channel_id = -1;
-static int hf_dvb_s2_tbtp_logon_id = -1;
-static int hf_dvb_s2_tbtp_assignment_count = -1;
+static int hf_dvb_s2_tbtp_group_id;
+static int hf_dvb_s2_tbtp_superframe_count;
+static int hf_dvb_s2_tbtp_frame_loop_count;
+static int hf_dvb_s2_tbtp_sf_frame;
+static int hf_dvb_s2_tbtp_frame_number;
+static int hf_dvb_s2_tbtp_btb_loop_count;
+static int hf_dvb_s2_tbtp_btp;
+static int hf_dvb_s2_tbtp_multiple_channel_flag;
+static int hf_dvb_s2_tbtp_assignment_type;
+static int hf_dvb_s2_tbtp_frame_vbdc_queue_empty_flag;
+static int hf_dvb_s2_tbtp_start_slot;
+static int hf_dvb_s2_tbtp_channel_id;
+static int hf_dvb_s2_tbtp_logon_id;
+static int hf_dvb_s2_tbtp_assignment_count;
 /* TBTP2 */
-static int hf_dvb_s2_table_group_id = -1;
-static int hf_dvb_s2_table_assign_context = -1;
-static int hf_dvb_s2_table_superframe_count = -1;
-static int hf_dvb_s2_table_assign_format = -1;
-static int hf_dvb_s2_table_frame_loop_count = -1;
-static int hf_dvb_s2_table_frame_number = -1;
-static int hf_dvb_s2_table_frame_assign_offset = -1;
-static int hf_dvb_s2_table_frame_assign_loop_count = -1;
-static int hf_dvb_s2_table_frame_assignment = -1;
-static int hf_dvb_s2_table_frame_assign_id48 = -1;
-static int hf_dvb_s2_table_frame_assign_id8 = -1;
-static int hf_dvb_s2_table_frame_assign_id16 = -1;
-static int hf_dvb_s2_table_frame_assign_id24 = -1;
-static int hf_dvb_s2_table_frame_dynamic_tx_type = -1;
+static int hf_dvb_s2_table_group_id;
+static int hf_dvb_s2_table_assign_context;
+static int hf_dvb_s2_table_superframe_count;
+static int hf_dvb_s2_table_assign_format;
+static int hf_dvb_s2_table_frame_loop_count;
+static int hf_dvb_s2_table_frame_number;
+static int hf_dvb_s2_table_frame_assign_offset;
+static int hf_dvb_s2_table_frame_assign_loop_count;
+static int hf_dvb_s2_table_frame_assignment;
+static int hf_dvb_s2_table_frame_assign_id48;
+static int hf_dvb_s2_table_frame_assign_id8;
+static int hf_dvb_s2_table_frame_assign_id16;
+static int hf_dvb_s2_table_frame_assign_id24;
+static int hf_dvb_s2_table_frame_dynamic_tx_type;
 /* CMT */
-static int hf_dvb_s2_table_entry_loop_count = -1;
-static int hf_dvb_s2_table_entry = -1;
-static int hf_dvb_s2_table_entry_login_id = -1;
+static int hf_dvb_s2_table_entry_loop_count;
+static int hf_dvb_s2_table_entry;
+static int hf_dvb_s2_table_entry_login_id;
 /* TMST2 */
-static int hf_dvb_s2_table_common_sytem_margin = -1;
-static int hf_dvb_s2_table_tx_mode_count = -1;
-static int hf_dvb_s2_table_tx_mode = -1;
-static int hf_dvb_s2_table_tx_mode_frame_length = -1;
-static int hf_dvb_s2_table_tx_mode_pilot_symbols = -1;
-static int hf_dvb_s2_table_tx_mode_modcod = -1;
-static int hf_dvb_s2_table_tx_mode_modcod_system_margin = -1;
-static int hf_dvb_s2_table_tx_mode_isi = -1;
+static int hf_dvb_s2_table_common_sytem_margin;
+static int hf_dvb_s2_table_tx_mode_count;
+static int hf_dvb_s2_table_tx_mode;
+static int hf_dvb_s2_table_tx_mode_frame_length;
+static int hf_dvb_s2_table_tx_mode_pilot_symbols;
+static int hf_dvb_s2_table_tx_mode_modcod;
+static int hf_dvb_s2_table_tx_mode_modcod_system_margin;
+static int hf_dvb_s2_table_tx_mode_isi;
 /* FCT2 */
-static int hf_dvb_s2_table_frame_type_loop_count = -1;
-static int hf_dvb_s2_table_frame_type_branch = -1;
-static int hf_dvb_s2_table_frame_type = -1;
-static int hf_dvb_s2_table_frame_type_frame_duration = -1;
-static int hf_dvb_s2_table_frame_type_tx_format_class = -1;
-static int hf_dvb_s2_table_frame_type_btu_duration = -1;
-static int hf_dvb_s2_table_frame_type_btu_carrier_bw = -1;
-static int hf_dvb_s2_table_frame_type_btu_symbol_rate = -1;
-static int hf_dvb_s2_table_frame_type_time_unit_count = -1;
-static int hf_dvb_s2_table_frame_type_grid_repeat_count = -1;
-static int hf_dvb_s2_table_frame_type_grid_frequency_offset = -1;
-static int hf_dvb_s2_table_frame_type_section_loop_count = -1;
-static int hf_dvb_s2_table_frame_type_section = -1;
-static int hf_dvb_s2_table_frame_type_section_default_tx_type = -1;
-static int hf_dvb_s2_table_frame_type_section_fix_acc_method = -1;
-static int hf_dvb_s2_table_frame_type_section_repeat_count= -1;
+static int hf_dvb_s2_table_frame_type_loop_count;
+static int hf_dvb_s2_table_frame_type_branch;
+static int hf_dvb_s2_table_frame_type;
+static int hf_dvb_s2_table_frame_type_frame_duration;
+static int hf_dvb_s2_table_frame_type_tx_format_class;
+static int hf_dvb_s2_table_frame_type_btu_duration;
+static int hf_dvb_s2_table_frame_type_btu_carrier_bw;
+static int hf_dvb_s2_table_frame_type_btu_symbol_rate;
+static int hf_dvb_s2_table_frame_type_time_unit_count;
+static int hf_dvb_s2_table_frame_type_grid_repeat_count;
+static int hf_dvb_s2_table_frame_type_grid_frequency_offset;
+static int hf_dvb_s2_table_frame_type_section_loop_count;
+static int hf_dvb_s2_table_frame_type_section;
+static int hf_dvb_s2_table_frame_type_section_default_tx_type;
+static int hf_dvb_s2_table_frame_type_section_fix_acc_method;
+static int hf_dvb_s2_table_frame_type_section_repeat_count;
 /* FCT */
-static int hf_dvb_s2_table_frame_ID_loop_count = -1;
-static int hf_dvb_s2_table_frame_ID_branch = -1;
-static int hf_dvb_s2_table_frame_ID = -1;
-static int hf_dvb_s2_table_frame_ID_frame_duration = -1;
-static int hf_dvb_s2_table_frame_ID_total_timeslot_count = -1;
-static int hf_dvb_s2_table_frame_ID_start_timeslot_number = -1;
-static int hf_dvb_s2_table_frame_ID_timeslot_loop_count = -1;
-static int hf_dvb_s2_table_frame_ID_timeslot = -1;
-static int hf_dvb_s2_table_frame_ID_timeslot_timeslot_frequency_offset = -1;
-static int hf_dvb_s2_table_frame_ID_timeslot_timeslot_time_offset = -1;
-static int hf_dvb_s2_table_frame_ID_timeslot_timeslot_id = -1;
-static int hf_dvb_s2_table_frame_ID_timeslot_repeat_count = -1;
+static int hf_dvb_s2_table_frame_ID_loop_count;
+static int hf_dvb_s2_table_frame_ID_branch;
+static int hf_dvb_s2_table_frame_ID;
+static int hf_dvb_s2_table_frame_ID_frame_duration;
+static int hf_dvb_s2_table_frame_ID_total_timeslot_count;
+static int hf_dvb_s2_table_frame_ID_start_timeslot_number;
+static int hf_dvb_s2_table_frame_ID_timeslot_loop_count;
+static int hf_dvb_s2_table_frame_ID_timeslot;
+static int hf_dvb_s2_table_frame_ID_timeslot_timeslot_frequency_offset;
+static int hf_dvb_s2_table_frame_ID_timeslot_timeslot_time_offset;
+static int hf_dvb_s2_table_frame_ID_timeslot_timeslot_id;
+static int hf_dvb_s2_table_frame_ID_timeslot_repeat_count;
 /* BCT */
-static int hf_dvb_s2_table_tx_type_loop_count = -1;
-static int hf_dvb_s2_table_tx_type_branch = -1;
-static int hf_dvb_s2_table_tx_type = -1;
-static int hf_dvb_s2_table_tx_type_tx_content_type = -1;
-static int hf_dvb_s2_table_tx_type_tx_format_class = -1;
-static int hf_dvb_s2_table_tx_type_tx_format_data_length = -1;
-static int hf_dvb_s2_table_tx_type_tx_format_data = -1;
+static int hf_dvb_s2_table_tx_type_loop_count;
+static int hf_dvb_s2_table_tx_type_branch;
+static int hf_dvb_s2_table_tx_type;
+static int hf_dvb_s2_table_tx_type_tx_content_type;
+static int hf_dvb_s2_table_tx_type_tx_format_class;
+static int hf_dvb_s2_table_tx_type_tx_format_data_length;
+static int hf_dvb_s2_table_tx_type_tx_format_data;
 /* BCT Common Tx */
-static int hf_dvb_s2_table_tx_type_tx_block_size = -1;
-static int hf_dvb_s2_table_tx_type_threshold_es_n0 = -1;
-static int hf_dvb_s2_table_tx_type_payload_size = -1;
-static int hf_dvb_s2_table_tx_type_modulation_scheme = -1;
-static int hf_dvb_s2_table_tx_type_p = -1;
-static int hf_dvb_s2_table_tx_type_q0 = -1;
-static int hf_dvb_s2_table_tx_type_q1 = -1;
-static int hf_dvb_s2_table_tx_type_q2 = -1;
-static int hf_dvb_s2_table_tx_type_q3 = -1;
-static int hf_dvb_s2_table_tx_type_y_period = -1;
-static int hf_dvb_s2_table_tx_type_w_period = -1;
-static int hf_dvb_s2_table_tx_type_y_pattern = -1;
-static int hf_dvb_s2_table_tx_type_y_pattern_bit = -1;
-static int hf_dvb_s2_table_tx_type_w_pattern = -1;
-static int hf_dvb_s2_table_tx_type_w_pattern_bit = -1;
-static int hf_dvb_s2_table_tx_type_preamble_len = -1;
-static int hf_dvb_s2_table_tx_type_postamble_len = -1;
-static int hf_dvb_s2_table_tx_type_pilot_period = -1;
-static int hf_dvb_s2_table_tx_type_pilot_block_len = -1;
-static int hf_dvb_s2_table_tx_type_pilot_sum = -1;
-static int hf_dvb_s2_table_tx_type_uw_symbol = -1;
-static int hf_dvb_s2_table_tx_type_uw_symbol_unit = -1;
-static int hf_dvb_s2_table_tx_type_uw_symbol_qpsk = -1;
-static int hf_dvb_s2_table_tx_type_uw_symbol_8psk = -1;
-static int hf_dvb_s2_table_tx_type_uw_symbol_16qam = -1;
-static int hf_dvb_s2_table_tx_type_waveform_id = -1;
-static int hf_dvb_s2_table_tx_type_tx_start_offset = -1;
+static int hf_dvb_s2_table_tx_type_tx_block_size;
+static int hf_dvb_s2_table_tx_type_threshold_es_n0;
+static int hf_dvb_s2_table_tx_type_payload_size;
+static int hf_dvb_s2_table_tx_type_modulation_scheme;
+static int hf_dvb_s2_table_tx_type_p;
+static int hf_dvb_s2_table_tx_type_q0;
+static int hf_dvb_s2_table_tx_type_q1;
+static int hf_dvb_s2_table_tx_type_q2;
+static int hf_dvb_s2_table_tx_type_q3;
+static int hf_dvb_s2_table_tx_type_y_period;
+static int hf_dvb_s2_table_tx_type_w_period;
+static int hf_dvb_s2_table_tx_type_y_pattern;
+static int hf_dvb_s2_table_tx_type_y_pattern_bit;
+static int hf_dvb_s2_table_tx_type_w_pattern;
+static int hf_dvb_s2_table_tx_type_w_pattern_bit;
+static int hf_dvb_s2_table_tx_type_preamble_len;
+static int hf_dvb_s2_table_tx_type_postamble_len;
+static int hf_dvb_s2_table_tx_type_pilot_period;
+static int hf_dvb_s2_table_tx_type_pilot_block_len;
+static int hf_dvb_s2_table_tx_type_pilot_sum;
+static int hf_dvb_s2_table_tx_type_uw_symbol;
+static int hf_dvb_s2_table_tx_type_uw_symbol_unit;
+static int hf_dvb_s2_table_tx_type_uw_symbol_qpsk;
+static int hf_dvb_s2_table_tx_type_uw_symbol_8psk;
+static int hf_dvb_s2_table_tx_type_uw_symbol_16qam;
+static int hf_dvb_s2_table_tx_type_waveform_id;
+static int hf_dvb_s2_table_tx_type_tx_start_offset;
 /* BCT LM Tx */
-static int hf_dvb_s2_table_tx_type_tx_start_offset_1 = -1;
-static int hf_dvb_s2_table_tx_type_tx_start_offset_2 = -1;
+static int hf_dvb_s2_table_tx_type_tx_start_offset_1;
+static int hf_dvb_s2_table_tx_type_tx_start_offset_2;
 /* BCT CPM Tx */
-static int hf_dvb_s2_table_tx_type_modulation_mh = -1;
-static int hf_dvb_s2_table_tx_type_modulation_ph = -1;
-static int hf_dvb_s2_table_tx_type_modulation_type = -1;
-static int hf_dvb_s2_table_tx_type_alpha_rc = -1;
-static int hf_dvb_s2_table_tx_type_code_rate = -1;
-static int hf_dvb_s2_table_tx_type_constraint_length_k = -1;
-static int hf_dvb_s2_table_tx_type_uw_length = -1;
-static int hf_dvb_s2_table_tx_type_nbr_uw_segments = -1;
-static int hf_dvb_s2_table_tx_type_uw_segment = -1;
-static int hf_dvb_s2_table_tx_type_uw_segment_start = -1;
-static int hf_dvb_s2_table_tx_type_uw_segment_length = -1;
-static int hf_dvb_s2_table_tx_type_param_interleaver = -1;
-static int hf_dvb_s2_table_tx_type_n = -1;
-static int hf_dvb_s2_table_tx_type_s = -1;
-static int hf_dvb_s2_table_tx_type_p_interleaver = -1;
-static int hf_dvb_s2_table_tx_type_n1_12 = -1;
-static int hf_dvb_s2_table_tx_type_k1_12 = -1;
-static int hf_dvb_s2_table_tx_type_K2_12 = -1;
-static int hf_dvb_s2_table_tx_type_K3_12 = -1;
-static int hf_dvb_s2_table_tx_type_pi_i = -1;
+static int hf_dvb_s2_table_tx_type_modulation_mh;
+static int hf_dvb_s2_table_tx_type_modulation_ph;
+static int hf_dvb_s2_table_tx_type_modulation_type;
+static int hf_dvb_s2_table_tx_type_alpha_rc;
+static int hf_dvb_s2_table_tx_type_code_rate;
+static int hf_dvb_s2_table_tx_type_constraint_length_k;
+static int hf_dvb_s2_table_tx_type_uw_length;
+static int hf_dvb_s2_table_tx_type_nbr_uw_segments;
+static int hf_dvb_s2_table_tx_type_uw_segment;
+static int hf_dvb_s2_table_tx_type_uw_segment_start;
+static int hf_dvb_s2_table_tx_type_uw_segment_length;
+static int hf_dvb_s2_table_tx_type_param_interleaver;
+static int hf_dvb_s2_table_tx_type_n;
+static int hf_dvb_s2_table_tx_type_s;
+static int hf_dvb_s2_table_tx_type_p_interleaver;
+static int hf_dvb_s2_table_tx_type_n1_12;
+static int hf_dvb_s2_table_tx_type_k1_12;
+static int hf_dvb_s2_table_tx_type_K2_12;
+static int hf_dvb_s2_table_tx_type_K3_12;
+static int hf_dvb_s2_table_tx_type_pi_i;
 /* SPT */
-static int hf_dvb_s2_table_satellite_loop_count = -1;
-static int hf_dvb_s2_table_satellite = -1;
-static int hf_dvb_s2_table_satellite_id = -1;
-static int hf_dvb_s2_table_satellite_x_coordinate = -1;
-static int hf_dvb_s2_table_satellite_y_coordinate = -1;
-static int hf_dvb_s2_table_satellite_z_coordinate = -1;
+static int hf_dvb_s2_table_satellite_loop_count;
+static int hf_dvb_s2_table_satellite;
+static int hf_dvb_s2_table_satellite_id;
+static int hf_dvb_s2_table_satellite_x_coordinate;
+static int hf_dvb_s2_table_satellite_y_coordinate;
+static int hf_dvb_s2_table_satellite_z_coordinate;
 /* NIT - RMT */
-static int hf_dvb_s2_table_network_descriptors_length = -1;
-static int hf_dvb_s2_table_multiplex_streams_spec_length = -1;
-static int hf_dvb_s2_table_multiplex = -1;
-static int hf_dvb_s2_table_multiplex_forward_multiplex = -1;
-static int hf_dvb_s2_table_multiplex_reward_multiplex = -1;
-static int hf_dvb_s2_table_multiplex_original_network_id = -1;
-static int hf_dvb_s2_table_multiplex_transport_descriptors_length = -1;
+static int hf_dvb_s2_table_network_descriptors_length;
+static int hf_dvb_s2_table_multiplex_streams_spec_length;
+static int hf_dvb_s2_table_multiplex;
+static int hf_dvb_s2_table_multiplex_forward_multiplex;
+static int hf_dvb_s2_table_multiplex_reward_multiplex;
+static int hf_dvb_s2_table_multiplex_original_network_id;
+static int hf_dvb_s2_table_multiplex_transport_descriptors_length;
 /* TDT */
-static int hf_dvb_s2_reserved_future_use = -1;
-static int hf_dvb_s2_reserved_tdt = -1;
-static int hf_dvb_s2_tdt_date = -1;
-static int hf_dvb_s2_tdt_hour = -1;
-static int hf_dvb_s2_tdt_minute = -1;
-static int hf_dvb_s2_tdt_second = -1;
+static int hf_dvb_s2_reserved_future_use;
+static int hf_dvb_s2_reserved_tdt;
+static int hf_dvb_s2_tdt_date;
+static int hf_dvb_s2_tdt_hour;
+static int hf_dvb_s2_tdt_minute;
+static int hf_dvb_s2_tdt_second;
 /* MMT2 */
-static int hf_dvb_s2_table_svn_number = -1;
-static int hf_dvb_s2_table_svn_prefix_size = -1;
-static int hf_dvb_s2_table_pt_count = -1;
-static int hf_dvb_s2_table_protocol = -1;
-static int hf_dvb_s2_table_pt_protocol_type = -1;
-static int hf_dvb_s2_table_pt_address_size = -1;
-static int hf_dvb_s2_table_pt_mapping_sections = -1;
-static int hf_dvb_s2_table_pt_mapping_section = -1;
-static int hf_dvb_s2_table_pt_ms_inclusion_start = -1;
-static int hf_dvb_s2_table_pt_ms_inclusion_end = -1;
-static int hf_dvb_s2_table_pt_ms_exclusions = -1;
-static int hf_dvb_s2_table_pt_ms_exclusion = -1;
-static int hf_dvb_s2_table_pt_ms_exclusion_start = -1;
-static int hf_dvb_s2_table_pt_ms_exclusion_end = -1;
-static int hf_dvb_s2_table_pt_ms_mac24_base = -1;
-static int hf_dvb_s2_table_pt_ms_mcast_prefix_size = -1;
+static int hf_dvb_s2_table_svn_number;
+static int hf_dvb_s2_table_svn_prefix_size;
+static int hf_dvb_s2_table_pt_count;
+static int hf_dvb_s2_table_protocol;
+static int hf_dvb_s2_table_pt_protocol_type;
+static int hf_dvb_s2_table_pt_address_size;
+static int hf_dvb_s2_table_pt_mapping_sections;
+static int hf_dvb_s2_table_pt_mapping_section;
+static int hf_dvb_s2_table_pt_ms_inclusion_start;
+static int hf_dvb_s2_table_pt_ms_inclusion_end;
+static int hf_dvb_s2_table_pt_ms_exclusions;
+static int hf_dvb_s2_table_pt_ms_exclusion;
+static int hf_dvb_s2_table_pt_ms_exclusion_start;
+static int hf_dvb_s2_table_pt_ms_exclusion_end;
+static int hf_dvb_s2_table_pt_ms_mac24_base;
+static int hf_dvb_s2_table_pt_ms_mcast_prefix_size;
 
 /* Descriptors */
-static int hf_dvb_s2_table_descriptor = -1;
-static int hf_dvb_s2_table_desc_tag = -1;
-static int hf_dvb_s2_table_desc_length = -1;
-static int hf_dvb_s2_table_nnd_char = -1;
+static int hf_dvb_s2_table_descriptor;
+static int hf_dvb_s2_table_desc_tag;
+static int hf_dvb_s2_table_desc_length;
+static int hf_dvb_s2_table_nnd_char;
 /* Linkage Descriptor */
-static int hf_dvb_s2_table_ld_fm_id = -1;
-static int hf_dvb_s2_table_ld_on_id = -1;
-static int hf_dvb_s2_table_ld_rm_id = -1;
-static int hf_dvb_s2_table_ld_service_id = -1;
-static int hf_dvb_s2_table_ld_linkage_type = -1;
-static int hf_dvb_s2_table_ld_ho_type = -1;
-static int hf_dvb_s2_table_ld_reserved_future_use = -1;
-static int hf_dvb_s2_table_ld_origin_type = -1;
-static int hf_dvb_s2_table_ld_network_id = -1;
-static int hf_dvb_s2_table_ld_initial_service_id = -1;
-static int hf_dvb_s2_table_ld_target_event_id = -1;
-static int hf_dvb_s2_table_ld_target_listed = -1;
-static int hf_dvb_s2_table_ld_event_simulcast = -1;
-static int hf_dvb_s2_table_ld_reserved = -1;
-static int hf_dvb_s2_table_ld_private_data = -1;
-static int hf_dvb_s2_table_ld_population_id_loop_count = -1;
-static int hf_dvb_s2_table_ld_population_id_base = -1;
-static int hf_dvb_s2_table_ld_population_id_mask = -1;
+static int hf_dvb_s2_table_ld_fm_id;
+static int hf_dvb_s2_table_ld_on_id;
+static int hf_dvb_s2_table_ld_rm_id;
+static int hf_dvb_s2_table_ld_service_id;
+static int hf_dvb_s2_table_ld_linkage_type;
+static int hf_dvb_s2_table_ld_ho_type;
+static int hf_dvb_s2_table_ld_reserved_future_use;
+static int hf_dvb_s2_table_ld_origin_type;
+static int hf_dvb_s2_table_ld_network_id;
+static int hf_dvb_s2_table_ld_initial_service_id;
+static int hf_dvb_s2_table_ld_target_event_id;
+static int hf_dvb_s2_table_ld_target_listed;
+static int hf_dvb_s2_table_ld_event_simulcast;
+static int hf_dvb_s2_table_ld_reserved;
+static int hf_dvb_s2_table_ld_private_data;
+static int hf_dvb_s2_table_ld_population_id_loop_count;
+static int hf_dvb_s2_table_ld_population_id_base;
+static int hf_dvb_s2_table_ld_population_id_mask;
 
 /* Satellite Return Link Descriptor */
-static int hf_dvb_s2_table_srld_satellite_id = -1;
-static int hf_dvb_s2_table_srld_beam_id = -1;
-static int hf_dvb_s2_table_srld_gateway_id = -1;
-static int hf_dvb_s2_table_srld_reserved = -1;
-static int hf_dvb_s2_table_srld_orbital_position = -1;
-static int hf_dvb_s2_table_srld_west_east_flag = -1;
-static int hf_dvb_s2_table_srld_superframe_sequence = -1;
-static int hf_dvb_s2_table_srld_tx_frequency_offset = -1;
-static int hf_dvb_s2_table_srld_zero_frequency_offset = -1;
-static int hf_dvb_s2_table_srld_private_data = -1;
+static int hf_dvb_s2_table_srld_satellite_id;
+static int hf_dvb_s2_table_srld_beam_id;
+static int hf_dvb_s2_table_srld_gateway_id;
+static int hf_dvb_s2_table_srld_reserved;
+static int hf_dvb_s2_table_srld_orbital_position;
+static int hf_dvb_s2_table_srld_west_east_flag;
+static int hf_dvb_s2_table_srld_superframe_sequence;
+static int hf_dvb_s2_table_srld_tx_frequency_offset;
+static int hf_dvb_s2_table_srld_zero_frequency_offset;
+static int hf_dvb_s2_table_srld_private_data;
 /* Logon Initialize Descriptor */
-static int hf_dvb_s2_table_lid_group_id = -1;
-static int hf_dvb_s2_table_lid_logon_id = -1;
-static int hf_dvb_s2_table_lid_continuous_carrier = -1;
-static int hf_dvb_s2_table_lid_security_handshake = -1;
-static int hf_dvb_s2_table_lid_prefix_flag = -1;
-static int hf_dvb_s2_table_lid_data_unit_label_flag = -1;
-static int hf_dvb_s2_table_lid_mini_slot_flag = -1;
-static int hf_dvb_s2_table_lid_contention_based_mini_slot_flag = -1;
-static int hf_dvb_s2_table_lid_capacity_type_flag = -1;
-static int hf_dvb_s2_table_lid_traffic_burst_type = -1;
-static int hf_dvb_s2_table_lid_connectivity = -1;
-static int hf_dvb_s2_table_lid_return_vpi = -1;
-static int hf_dvb_s2_table_lid_return_vci = -1;
-static int hf_dvb_s2_table_lid_return_signalling_vpi = -1;
-static int hf_dvb_s2_table_lid_return_signalling_vci = -1;
-static int hf_dvb_s2_table_lid_forward_signalling_vpi = -1;
-static int hf_dvb_s2_table_lid_forward_signalling_vci = -1;
-static int hf_dvb_s2_table_lid_return_trf_pid = -1;
-static int hf_dvb_s2_table_lid_return_ctrl_mngm_pid = -1;
-static int hf_dvb_s2_table_lid_cra_level = -1;
-static int hf_dvb_s2_table_lid_vbdc_max = -1;
-static int hf_dvb_s2_table_lid_rbdc_max = -1;
-static int hf_dvb_s2_table_lid_rbdc_timeout = -1;
+static int hf_dvb_s2_table_lid_group_id;
+static int hf_dvb_s2_table_lid_logon_id;
+static int hf_dvb_s2_table_lid_continuous_carrier;
+static int hf_dvb_s2_table_lid_security_handshake;
+static int hf_dvb_s2_table_lid_prefix_flag;
+static int hf_dvb_s2_table_lid_data_unit_label_flag;
+static int hf_dvb_s2_table_lid_mini_slot_flag;
+static int hf_dvb_s2_table_lid_contention_based_mini_slot_flag;
+static int hf_dvb_s2_table_lid_capacity_type_flag;
+static int hf_dvb_s2_table_lid_traffic_burst_type;
+static int hf_dvb_s2_table_lid_connectivity;
+static int hf_dvb_s2_table_lid_return_vpi;
+static int hf_dvb_s2_table_lid_return_vci;
+static int hf_dvb_s2_table_lid_return_signalling_vpi;
+static int hf_dvb_s2_table_lid_return_signalling_vci;
+static int hf_dvb_s2_table_lid_forward_signalling_vpi;
+static int hf_dvb_s2_table_lid_forward_signalling_vci;
+static int hf_dvb_s2_table_lid_return_trf_pid;
+static int hf_dvb_s2_table_lid_return_ctrl_mngm_pid;
+static int hf_dvb_s2_table_lid_cra_level;
+static int hf_dvb_s2_table_lid_vbdc_max;
+static int hf_dvb_s2_table_lid_rbdc_max;
+static int hf_dvb_s2_table_lid_rbdc_timeout;
 /* Forward Interaction Path Descriptor */
-static int hf_dvb_s2_table_fipd_original_network_id = -1;
-static int hf_dvb_s2_table_fipd_transport_stream_id = -1;
-static int hf_dvb_s2_table_fipd_pid_loop_count = -1;
-static int hf_dvb_s2_table_fipd_pid = -1;
+static int hf_dvb_s2_table_fipd_original_network_id;
+static int hf_dvb_s2_table_fipd_transport_stream_id;
+static int hf_dvb_s2_table_fipd_pid_loop_count;
+static int hf_dvb_s2_table_fipd_pid;
 /* Return Interaction Path Descriptor */
-static int hf_dvb_s2_table_ripd_continuous_carrier = -1;
-static int hf_dvb_s2_table_ripd_network_routing_label_loop_count = -1;
-static int hf_dvb_s2_table_ripd_allocation_desallocation_flag = -1;
-static int hf_dvb_s2_table_ripd_pid_flag = -1;
-static int hf_dvb_s2_table_ripd_pid_loop_count = -1;
-static int hf_dvb_s2_table_ripd_pid = -1;
-static int hf_dvb_s2_table_ripd_vpi_vci_flag = -1;
-static int hf_dvb_s2_table_ripd_vpi_vci_loop_count = -1;
-static int hf_dvb_s2_table_ripd_vpi = -1;
-static int hf_dvb_s2_table_ripd_vci = -1;
-static int hf_dvb_s2_table_ripd_route_id_flag = -1;
-static int hf_dvb_s2_table_ripd_route_id_loop_count = -1;
-static int hf_dvb_s2_table_ripd_route_id = -1;
-static int hf_dvb_s2_table_ripd_channel_id = -1;
-static int hf_dvb_s2_desc_network_routing = -1;
+static int hf_dvb_s2_table_ripd_continuous_carrier;
+static int hf_dvb_s2_table_ripd_network_routing_label_loop_count;
+static int hf_dvb_s2_table_ripd_allocation_desallocation_flag;
+static int hf_dvb_s2_table_ripd_pid_flag;
+static int hf_dvb_s2_table_ripd_pid_loop_count;
+static int hf_dvb_s2_table_ripd_pid;
+static int hf_dvb_s2_table_ripd_vpi_vci_flag;
+static int hf_dvb_s2_table_ripd_vpi_vci_loop_count;
+static int hf_dvb_s2_table_ripd_vpi;
+static int hf_dvb_s2_table_ripd_vci;
+static int hf_dvb_s2_table_ripd_route_id_flag;
+static int hf_dvb_s2_table_ripd_route_id_loop_count;
+static int hf_dvb_s2_table_ripd_route_id;
+static int hf_dvb_s2_table_ripd_channel_id;
+static int hf_dvb_s2_desc_network_routing;
 /* Correction Control Descriptor */
-static int hf_dvb_s2_table_corcd_acq_response_timeout = -1;
-static int hf_dvb_s2_table_corcd_sync_response_timeout = -1;
-static int hf_dvb_s2_table_corcd_acq_max_losses = -1;
-static int hf_dvb_s2_table_corcd_sync_max_losses = -1;
+static int hf_dvb_s2_table_corcd_acq_response_timeout;
+static int hf_dvb_s2_table_corcd_sync_response_timeout;
+static int hf_dvb_s2_table_corcd_acq_max_losses;
+static int hf_dvb_s2_table_corcd_sync_max_losses;
 /* Contention Control Descriptor */
-static int hf_dvb_s2_table_concd_superframe_id = -1;
-static int hf_dvb_s2_table_concd_csc_response_timeout = -1;
-static int hf_dvb_s2_table_concd_csc_max_losses = -1;
-static int hf_dvb_s2_table_concd_max_time_before_retry = -1;
+static int hf_dvb_s2_table_concd_superframe_id;
+static int hf_dvb_s2_table_concd_csc_response_timeout;
+static int hf_dvb_s2_table_concd_csc_max_losses;
+static int hf_dvb_s2_table_concd_max_time_before_retry;
 
 /* Control assign descriptor */
-static int hf_dvb_s2_table_desc_sync_achieved_time_threshold = -1;
-static int hf_dvb_s2_table_desc_max_sync_tries = -1;
-static int hf_dvb_s2_table_desc_sync_achieved_freq_threshold = -1;
-static int hf_dvb_s2_table_desc_ctrl_start_superframe_count = -1;
-static int hf_dvb_s2_table_desc_ctrl_frame_nbr = -1;
-static int hf_dvb_s2_table_desc_ctrl_repeat_period = -1;
-static int hf_dvb_s2_table_desc_ctrl_timeslot_nbr = -1;
-static int hf_dvb_s2_table_desc_sync_start_superframe = -1;
-static int hf_dvb_s2_table_desc_sync_frame_nbr = -1;
-static int hf_dvb_s2_table_desc_sync_repeat_period = -1;
-static int hf_dvb_s2_table_desc_sync_slot_nbr = -1;
+static int hf_dvb_s2_table_desc_sync_achieved_time_threshold;
+static int hf_dvb_s2_table_desc_max_sync_tries;
+static int hf_dvb_s2_table_desc_sync_achieved_freq_threshold;
+static int hf_dvb_s2_table_desc_ctrl_start_superframe_count;
+static int hf_dvb_s2_table_desc_ctrl_frame_nbr;
+static int hf_dvb_s2_table_desc_ctrl_repeat_period;
+static int hf_dvb_s2_table_desc_ctrl_timeslot_nbr;
+static int hf_dvb_s2_table_desc_sync_start_superframe;
+static int hf_dvb_s2_table_desc_sync_frame_nbr;
+static int hf_dvb_s2_table_desc_sync_repeat_period;
+static int hf_dvb_s2_table_desc_sync_slot_nbr;
 /* Correction message descriptor */
-static int hf_dvb_s2_table_desc_time_correct_flag = -1;
-static int hf_dvb_s2_table_desc_power_correct_flag = -1;
-static int hf_dvb_s2_table_desc_freq_correct_flag = -1;
-static int hf_dvb_s2_table_desc_slot_type = -1;
-static int hf_dvb_s2_table_desc_burst_time_scaling = -1;
-static int hf_dvb_s2_table_desc_burst_time_correct = -1;
-static int hf_dvb_s2_table_desc_power_ctrl_flag = -1;
-static int hf_dvb_s2_table_desc_power_correction = -1;
-static int hf_dvb_s2_table_desc_power_esn0 = -1;
-static int hf_dvb_s2_table_desc_freq_correction = -1;
+static int hf_dvb_s2_table_desc_time_correct_flag;
+static int hf_dvb_s2_table_desc_power_correct_flag;
+static int hf_dvb_s2_table_desc_freq_correct_flag;
+static int hf_dvb_s2_table_desc_slot_type;
+static int hf_dvb_s2_table_desc_burst_time_scaling;
+static int hf_dvb_s2_table_desc_burst_time_correct;
+static int hf_dvb_s2_table_desc_power_ctrl_flag;
+static int hf_dvb_s2_table_desc_power_correction;
+static int hf_dvb_s2_table_desc_power_esn0;
+static int hf_dvb_s2_table_desc_freq_correction;
 /* Correction message extension descriptor */
-static int hf_dvb_s2_table_desc_slot_nbr = -1;
-static int hf_dvb_s2_table_desc_sf_sequence = -1;
-static int hf_dvb_s2_table_desc_frame_number = -1;
+static int hf_dvb_s2_table_desc_slot_nbr;
+static int hf_dvb_s2_table_desc_sf_sequence;
+static int hf_dvb_s2_table_desc_frame_number;
 /* Logon response descriptor */
-static int hf_dvb_s2_table_desc_keep_id_after_logoff = -1;
-static int hf_dvb_s2_table_desc_power_ctrl_mode = -1;
-static int hf_dvb_s2_table_desc_rcst_access_status = -1;
-static int hf_dvb_s2_table_desc_logon_id = -1;
-static int hf_dvb_s2_table_desc_lowest_assign_id = -1;
-static int hf_dvb_s2_table_desc_assign_id_count = -1;
-static int hf_dvb_s2_table_desc_unicast_mac24_count = -1;
+static int hf_dvb_s2_table_desc_keep_id_after_logoff;
+static int hf_dvb_s2_table_desc_power_ctrl_mode;
+static int hf_dvb_s2_table_desc_rcst_access_status;
+static int hf_dvb_s2_table_desc_logon_id;
+static int hf_dvb_s2_table_desc_lowest_assign_id;
+static int hf_dvb_s2_table_desc_assign_id_count;
+static int hf_dvb_s2_table_desc_unicast_mac24_count;
 /* Satellite Forward Link Descriptor */
-static int hf_dvb_s2_table_sfld_satellite_id = -1;
-static int hf_dvb_s2_table_sfld_beam_id = -1;
-static int hf_dvb_s2_table_sfld_ncc_id = -1;
-static int hf_dvb_s2_table_sfld_multiplex_usage = -1;
-static int hf_dvb_s2_table_sfld_local_multiplex_id = -1;
-static int hf_dvb_s2_table_sfld_frequency = -1;
-static int hf_dvb_s2_table_sfld_orbital_position = -1;
-static int hf_dvb_s2_table_sfld_west_east_flag = -1;
-static int hf_dvb_s2_table_sfld_polarization = -1;
-static int hf_dvb_s2_table_sfld_transmission_standard = -1;
-static int hf_dvb_s2_table_sfld_scrambling_sequence_selector = -1;
-static int hf_dvb_s2_table_sfld_roll_off = -1;
-static int hf_dvb_s2_table_sfld_symbol_rate = -1;
-static int hf_dvb_s2_table_sfld_fec_inner = -1;
-static int hf_dvb_s2_table_sfld_input_stream_identifier = -1;
-static int hf_dvb_s2_table_sfld_reserved_for_forward_spreading = -1;
-static int hf_dvb_s2_table_sfld_scrambling_sequence_index = -1;
-static int hf_dvb_s2_table_sfld_private_data = -1;
-static int hf_dvb_s2_table_sfld_ncr_private_data = -1;
-static int hf_dvb_s2_table_sfld_ncr_base_private_data = -1;
-static int hf_dvb_s2_table_sfld_ncr_ext_private_data = -1;
-
-static int hf_dvb_s2_table_mac24 = -1;
-static int hf_dvb_s2_table_mac24_prefix_size = -1;
-static int hf_dvb_s2_table_mac24_unicast = -1;
-static int hf_dvb_s2_table_mac24_mcast_mapping_method = -1;
-static int hf_dvb_s2_table_mac24_mcast_ip_version_ind_pres = -1;
-static int hf_dvb_s2_table_mac24_mcast_synthesis_field_size = -1;
-static int hf_dvb_s2_table_desc_default_svn_number = -1;
-static int hf_dvb_s2_table_desc_reserved = -1;
+static int hf_dvb_s2_table_sfld_satellite_id;
+static int hf_dvb_s2_table_sfld_beam_id;
+static int hf_dvb_s2_table_sfld_ncc_id;
+static int hf_dvb_s2_table_sfld_multiplex_usage;
+static int hf_dvb_s2_table_sfld_local_multiplex_id;
+static int hf_dvb_s2_table_sfld_frequency;
+static int hf_dvb_s2_table_sfld_orbital_position;
+static int hf_dvb_s2_table_sfld_west_east_flag;
+static int hf_dvb_s2_table_sfld_polarization;
+static int hf_dvb_s2_table_sfld_transmission_standard;
+static int hf_dvb_s2_table_sfld_scrambling_sequence_selector;
+static int hf_dvb_s2_table_sfld_roll_off;
+static int hf_dvb_s2_table_sfld_symbol_rate;
+static int hf_dvb_s2_table_sfld_fec_inner;
+static int hf_dvb_s2_table_sfld_input_stream_identifier;
+static int hf_dvb_s2_table_sfld_reserved_for_forward_spreading;
+static int hf_dvb_s2_table_sfld_scrambling_sequence_index;
+static int hf_dvb_s2_table_sfld_private_data;
+static int hf_dvb_s2_table_sfld_ncr_private_data;
+static int hf_dvb_s2_table_sfld_ncr_base_private_data;
+static int hf_dvb_s2_table_sfld_ncr_ext_private_data;
+
+static int hf_dvb_s2_table_mac24;
+static int hf_dvb_s2_table_mac24_prefix_size;
+static int hf_dvb_s2_table_mac24_unicast;
+static int hf_dvb_s2_table_mac24_mcast_mapping_method;
+static int hf_dvb_s2_table_mac24_mcast_ip_version_ind_pres;
+static int hf_dvb_s2_table_mac24_mcast_synthesis_field_size;
+static int hf_dvb_s2_table_desc_default_svn_number;
+static int hf_dvb_s2_table_desc_reserved;
 /* Lower layer service descriptor */
-static int hf_dvb_s2_table_desc_default_ctrl_random_interval = -1;
-static int hf_dvb_s2_table_desc_dynamic_rate_persistence = -1;
-static int hf_dvb_s2_table_desc_volume_backlog_persistence = -1;
-static int hf_dvb_s2_table_desc_lls_count = -1;
-static int hf_dvb_s2_table_desc_rc_count = -1;
-static int hf_dvb_s2_table_desc_ra_ac_count = -1;
-
-static int hf_dvb_s2_table_lls = -1;
-static int hf_dvb_s2_table_lls_index = -1;
-static int hf_dvb_s2_table_lls_random_access = -1;
-static int hf_dvb_s2_table_lls_dedicated_access = -1;
-static int hf_dvb_s2_table_lls_nominal_rc_index = -1;
-static int hf_dvb_s2_table_lls_nominal_da_ac_index = -1;
-static int hf_dvb_s2_table_lls_conditional_demand_rc_map = -1;
-static int hf_dvb_s2_table_lls_conditional_scheduler_da_ac_map = -1;
-static int hf_dvb_s2_table_lls_nominal_ra_ac_index = -1;
-static int hf_dvb_s2_table_lls_conditional_scheduler_ra_ac_map = -1;
+static int hf_dvb_s2_table_desc_default_ctrl_random_interval;
+static int hf_dvb_s2_table_desc_dynamic_rate_persistence;
+static int hf_dvb_s2_table_desc_volume_backlog_persistence;
+static int hf_dvb_s2_table_desc_lls_count;
+static int hf_dvb_s2_table_desc_rc_count;
+static int hf_dvb_s2_table_desc_ra_ac_count;
+
+static int hf_dvb_s2_table_lls;
+static int hf_dvb_s2_table_lls_index;
+static int hf_dvb_s2_table_lls_random_access;
+static int hf_dvb_s2_table_lls_dedicated_access;
+static int hf_dvb_s2_table_lls_nominal_rc_index;
+static int hf_dvb_s2_table_lls_nominal_da_ac_index;
+static int hf_dvb_s2_table_lls_conditional_demand_rc_map;
+static int hf_dvb_s2_table_lls_conditional_scheduler_da_ac_map;
+static int hf_dvb_s2_table_lls_nominal_ra_ac_index;
+static int hf_dvb_s2_table_lls_conditional_scheduler_ra_ac_map;
 
 /* Mobility Control descriptor */
-static int hf_dvb_s2_table_mc_command_value = -1;
-static int hf_dvb_s2_table_mc_command_parameter = -1;
-
-static int hf_dvb_s2_table_lsvd_group_count = -1;
-static int hf_dvb_s2_table_lsvd_oui = -1;
-static int hf_dvb_s2_table_lsvd_mcast_address = -1;
-static int hf_dvb_s2_table_lsvd_mcast_port = -1;
-static int hf_dvb_s2_table_lsvd_version_field_length = -1;
-static int hf_dvb_s2_table_lsvd_version_bytes = -1;
-
-static int hf_dvb_s2_table_rc = -1;
-static int hf_dvb_s2_table_rc_index = -1;
-static int hf_dvb_s2_table_rc_constant_assignment_provided = -1;
-static int hf_dvb_s2_table_rc_volume_allowed = -1;
-static int hf_dvb_s2_table_rc_rbdc_allowed = -1;
-static int hf_dvb_s2_table_rc_maximum_service_rate = -1;
-static int hf_dvb_s2_table_rc_minimum_service_rate = -1;
-static int hf_dvb_s2_table_rc_constant_service_rate = -1;
-static int hf_dvb_s2_table_rc_maximum_backlog = -1;
-
-static int hf_dvb_s2_table_ra_ac = -1;
-static int hf_dvb_s2_table_ra_ac_index = -1;
-static int hf_dvb_s2_table_ra_ac_max_unique_payload_per_block = -1;
-static int hf_dvb_s2_table_ra_ac_max_consecutive_block_accessed = -1;
-static int hf_dvb_s2_table_ra_ac_min_idle_block = -1;
-static int hf_dvb_s2_table_ra_ac_defaults_field_size = -1;
-static int hf_dvb_s2_table_ra_ac_defaults_for_ra_load_control = -1;
-
-static int hf_dvb_s2_table_crc32 = -1;
+static int hf_dvb_s2_table_mc_command_value;
+static int hf_dvb_s2_table_mc_command_parameter;
+
+static int hf_dvb_s2_table_lsvd_group_count;
+static int hf_dvb_s2_table_lsvd_oui;
+static int hf_dvb_s2_table_lsvd_mcast_address;
+static int hf_dvb_s2_table_lsvd_mcast_port;
+static int hf_dvb_s2_table_lsvd_version_field_length;
+static int hf_dvb_s2_table_lsvd_version_bytes;
+
+static int hf_dvb_s2_table_rc;
+static int hf_dvb_s2_table_rc_index;
+static int hf_dvb_s2_table_rc_constant_assignment_provided;
+static int hf_dvb_s2_table_rc_volume_allowed;
+static int hf_dvb_s2_table_rc_rbdc_allowed;
+static int hf_dvb_s2_table_rc_maximum_service_rate;
+static int hf_dvb_s2_table_rc_minimum_service_rate;
+static int hf_dvb_s2_table_rc_constant_service_rate;
+static int hf_dvb_s2_table_rc_maximum_backlog;
+
+static int hf_dvb_s2_table_ra_ac;
+static int hf_dvb_s2_table_ra_ac_index;
+static int hf_dvb_s2_table_ra_ac_max_unique_payload_per_block;
+static int hf_dvb_s2_table_ra_ac_max_consecutive_block_accessed;
+static int hf_dvb_s2_table_ra_ac_min_idle_block;
+static int hf_dvb_s2_table_ra_ac_defaults_field_size;
+static int hf_dvb_s2_table_ra_ac_defaults_for_ra_load_control;
+
+static int hf_dvb_s2_table_crc32;
 
 /* Initialize the subtree pointers */
-static gint ett_dvb_s2_hdr_table_network_routing = -1;
-static gint ett_dvb_s2_hdr_table = -1;
-static gint ett_dvb_s2_hdr_table_sf = -1;
-static gint ett_dvb_s2_hdr_table_sf_frame = -1;
-static gint ett_dvb_s2_hdr_table_desc = -1;
-static gint ett_dvb_s2_hdr_table_frame = -1;
-static gint ett_dvb_s2_hdr_table_frame_assign = -1;
-static gint ett_dvb_s2_hdr_table_entry = -1;
-static gint ett_dvb_s2_hdr_table_mac24 = -1;
-static gint ett_dvb_s2_hdr_table_frametype = -1;
-static gint ett_dvb_s2_hdr_table_frame_ID = -1;
-static gint ett_dvb_s2_hdr_table_frame_ID_timeslot = -1;
-static gint ett_dvb_s2_hdr_table_frametype_section = -1;
-static gint ett_dvb_s2_hdr_table_lls = -1;
-static gint ett_dvb_s2_hdr_table_rc = -1;
-static gint ett_dvb_s2_hdr_table_raac = -1;
-static gint ett_dvb_s2_hdr_table_txmode = -1;
-static gint ett_dvb_s2_hdr_table_txtype = -1;
-static gint ett_dvb_s2_hdr_table_txtype_ypattern = -1;
-static gint ett_dvb_s2_hdr_table_txtype_wpattern = -1;
-static gint ett_dvb_s2_hdr_table_txtype_uwsymbol = -1;
-static gint ett_dvb_s2_hdr_table_txtype_uwsegment = -1;
-static gint ett_dvb_s2_hdr_table_satellite = -1;
-static gint ett_dvb_s2_hdr_table_multiplex = -1;
-static gint ett_dvb_s2_hdr_table_pt = -1;
-static gint ett_dvb_s2_hdr_table_pt_ms = -1;
-static gint ett_dvb_s2_hdr_table_pt_ms_exclusion = -1;
-static gint ett_dvb_s2_hdr_tbtp_frame = -1;
-static gint ett_dvb_s2_hdr_tbtp_frame_btp = -1;
+static gint ett_dvb_s2_hdr_table_network_routing;
+static gint ett_dvb_s2_hdr_table;
+static gint ett_dvb_s2_hdr_table_sf;
+static gint ett_dvb_s2_hdr_table_sf_frame;
+static gint ett_dvb_s2_hdr_table_desc;
+static gint ett_dvb_s2_hdr_table_frame;
+static gint ett_dvb_s2_hdr_table_frame_assign;
+static gint ett_dvb_s2_hdr_table_entry;
+static gint ett_dvb_s2_hdr_table_mac24;
+static gint ett_dvb_s2_hdr_table_frametype;
+static gint ett_dvb_s2_hdr_table_frame_ID;
+static gint ett_dvb_s2_hdr_table_frame_ID_timeslot;
+static gint ett_dvb_s2_hdr_table_frametype_section;
+static gint ett_dvb_s2_hdr_table_lls;
+static gint ett_dvb_s2_hdr_table_rc;
+static gint ett_dvb_s2_hdr_table_raac;
+static gint ett_dvb_s2_hdr_table_txmode;
+static gint ett_dvb_s2_hdr_table_txtype;
+static gint ett_dvb_s2_hdr_table_txtype_ypattern;
+static gint ett_dvb_s2_hdr_table_txtype_wpattern;
+static gint ett_dvb_s2_hdr_table_txtype_uwsymbol;
+static gint ett_dvb_s2_hdr_table_txtype_uwsegment;
+static gint ett_dvb_s2_hdr_table_satellite;
+static gint ett_dvb_s2_hdr_table_multiplex;
+static gint ett_dvb_s2_hdr_table_pt;
+static gint ett_dvb_s2_hdr_table_pt_ms;
+static gint ett_dvb_s2_hdr_table_pt_ms_exclusion;
+static gint ett_dvb_s2_hdr_tbtp_frame;
+static gint ett_dvb_s2_hdr_tbtp_frame_btp;
 
 static const value_string table_modcods[] = {
     { 0, "DUMMY PLFRAME"},
diff --git a/epan/dissectors/packet-dvb-sdt.c b/epan/dissectors/packet-dvb-sdt.c
index 586a5eab86..761cb963d4 100644
--- a/epan/dissectors/packet-dvb-sdt.c
+++ b/epan/dissectors/packet-dvb-sdt.c
@@ -20,27 +20,27 @@ void proto_reg_handoff_dvb_sdt(void);
 
 static dissector_handle_t dvb_sdt_handle;
 
-static int proto_dvb_sdt = -1;
-static int hf_dvb_sdt_transport_stream_id = -1;
-static int hf_dvb_sdt_reserved1 = -1;
-static int hf_dvb_sdt_version_number = -1;
-static int hf_dvb_sdt_current_next_indicator = -1;
-static int hf_dvb_sdt_section_number = -1;
-static int hf_dvb_sdt_last_section_number = -1;
-
-static int hf_dvb_sdt_original_network_id = -1;
-static int hf_dvb_sdt_reserved2 = -1;
-
-static int hf_dvb_sdt_service_id = -1;
-static int hf_dvb_sdt_reserved3 = -1;
-static int hf_dvb_sdt_eit_schedule_flag = -1;
-static int hf_dvb_sdt_eit_present_following_flag = -1;
-static int hf_dvb_sdt_running_status = -1;
-static int hf_dvb_sdt_free_ca_mode = -1;
-static int hf_dvb_sdt_descriptors_loop_length = -1;
-
-static gint ett_dvb_sdt = -1;
-static gint ett_dvb_sdt_service = -1;
+static int proto_dvb_sdt;
+static int hf_dvb_sdt_transport_stream_id;
+static int hf_dvb_sdt_reserved1;
+static int hf_dvb_sdt_version_number;
+static int hf_dvb_sdt_current_next_indicator;
+static int hf_dvb_sdt_section_number;
+static int hf_dvb_sdt_last_section_number;
+
+static int hf_dvb_sdt_original_network_id;
+static int hf_dvb_sdt_reserved2;
+
+static int hf_dvb_sdt_service_id;
+static int hf_dvb_sdt_reserved3;
+static int hf_dvb_sdt_eit_schedule_flag;
+static int hf_dvb_sdt_eit_present_following_flag;
+static int hf_dvb_sdt_running_status;
+static int hf_dvb_sdt_free_ca_mode;
+static int hf_dvb_sdt_descriptors_loop_length;
+
+static gint ett_dvb_sdt;
+static gint ett_dvb_sdt_service;
 
 #define DVB_SDT_RESERVED1_MASK                  0xC0
 #define DVB_SDT_VERSION_NUMBER_MASK             0x3E
diff --git a/epan/dissectors/packet-dvb-sit.c b/epan/dissectors/packet-dvb-sit.c
index 26b50ead6c..2d14761b6a 100644
--- a/epan/dissectors/packet-dvb-sit.c
+++ b/epan/dissectors/packet-dvb-sit.c
@@ -20,23 +20,23 @@ void proto_reg_handoff_dvb_sit(void);
 
 static dissector_handle_t dvb_sit_handle;
 
-static int proto_dvb_sit = -1;
-
-static int hf_dvb_sit_reserved_future_use1 = -1;
-static int hf_dvb_sit_reserved = -1;
-static int hf_dvb_sit_version_number = -1;
-static int hf_dvb_sit_current_next_indicator = -1;
-static int hf_dvb_sit_section_number = -1;
-static int hf_dvb_sit_last_section_number = -1;
-static int hf_dvb_sit_reserved_future_use2 = -1;
-static int hf_dvb_sit_transmission_info_len = -1;
-static int hf_dvb_sit_service_id = -1;
-static int hf_dvb_sit_reserved_future_use3 = -1;
-static int hf_dvb_sit_running_status = -1;
-static int hf_dvb_sit_service_descriptors_length = -1;
-
-static gint ett_dvb_sit = -1;
-static gint ett_dvb_sit_service = -1;
+static int proto_dvb_sit;
+
+static int hf_dvb_sit_reserved_future_use1;
+static int hf_dvb_sit_reserved;
+static int hf_dvb_sit_version_number;
+static int hf_dvb_sit_current_next_indicator;
+static int hf_dvb_sit_section_number;
+static int hf_dvb_sit_last_section_number;
+static int hf_dvb_sit_reserved_future_use2;
+static int hf_dvb_sit_transmission_info_len;
+static int hf_dvb_sit_service_id;
+static int hf_dvb_sit_reserved_future_use3;
+static int hf_dvb_sit_running_status;
+static int hf_dvb_sit_service_descriptors_length;
+
+static gint ett_dvb_sit;
+static gint ett_dvb_sit_service;
 
 #define DVB_SIT_RESERVED_MASK                   0xC0
 #define DVB_SIT_VERSION_NUMBER_MASK             0x3E
diff --git a/epan/dissectors/packet-dvb-tdt.c b/epan/dissectors/packet-dvb-tdt.c
index c6b8498e52..d1cc9c14db 100644
--- a/epan/dissectors/packet-dvb-tdt.c
+++ b/epan/dissectors/packet-dvb-tdt.c
@@ -19,10 +19,10 @@ void proto_reg_handoff_dvb_tdt(void);
 
 static dissector_handle_t dvb_tdt_handle;
 
-static int proto_dvb_tdt = -1;
-static int hf_dvb_tdt_utc_time = -1;
+static int proto_dvb_tdt;
+static int hf_dvb_tdt_utc_time;
 
-static gint ett_dvb_tdt = -1;
+static gint ett_dvb_tdt;
 
 static int
 dissect_dvb_tdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-dvb-tot.c b/epan/dissectors/packet-dvb-tot.c
index 1f4a2d4029..45ee76ae20 100644
--- a/epan/dissectors/packet-dvb-tot.c
+++ b/epan/dissectors/packet-dvb-tot.c
@@ -21,12 +21,12 @@ void proto_reg_handoff_dvb_tot(void);
 
 static dissector_handle_t dvb_tot_handle;
 
-static int proto_dvb_tot = -1;
-static int hf_dvb_tot_utc_time = -1;
-static int hf_dvb_tot_reserved = -1;
-static int hf_dvb_tot_descriptors_loop_length = -1;
+static int proto_dvb_tot;
+static int hf_dvb_tot_utc_time;
+static int hf_dvb_tot_reserved;
+static int hf_dvb_tot_descriptors_loop_length;
 
-static gint ett_dvb_tot = -1;
+static gint ett_dvb_tot;
 
 #define DVB_TOT_RESERVED_MASK                   0xF000
 #define DVB_TOT_DESCRIPTORS_LOOP_LENGTH_MASK    0x0FFF
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index 371e2b4096..3629db55aa 100644
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -835,7 +835,7 @@ WS_DLL_PUBLIC_DEF const value_string dvbci_event[] = {
     { 0, NULL }
 };
 
-static int proto_dvbci = -1;
+static int proto_dvbci;
 
 static dissector_handle_t dvbci_handle;
 
@@ -856,293 +856,293 @@ static dissector_table_t udp_dissector_table;
 
 static gint exported_pdu_tap = -1;
 
-static gint ett_dvbci = -1;
-static gint ett_dvbci_hdr = -1;
-static gint ett_dvbci_cis = -1;
-static gint ett_dvbci_cis_tpl = -1;
-static gint ett_dvbci_cis_subtpl = -1;
-static gint ett_dvbci_link = -1;
-static gint ett_dvbci_link_frag = -1;
-static gint ett_dvbci_link_frags = -1;
-static gint ett_dvbci_transport = -1;
-static gint ett_dvbci_transport_frag = -1;
-static gint ett_dvbci_transport_frags = -1;
-static gint ett_dvbci_session = -1;
-static gint ett_dvbci_res = -1;
-static gint ett_dvbci_application = -1;
-static gint ett_dvbci_es = -1;
-static gint ett_dvbci_ca_desc = -1;
-static gint ett_dvbci_text = -1;
-static gint ett_dvbci_cc_item = -1;
-static gint ett_dvbci_sac_msg_body = -1;
-static gint ett_dvbci_ami_req_types = -1;
-static gint ett_dvbci_lsc_conn_desc = -1;
-static gint ett_dvbci_opp_cap_loop = -1;
-static gint ett_dvbci_dlv_sys_hint = -1;
-
-
-static int hf_dvbci_hdr_ver = -1;
-static int hf_dvbci_event = -1;
-static int hf_dvbci_len = -1;
-static int hf_dvbci_hw_event = -1;
-static int hf_dvbci_cor_addr = -1;
-static int hf_dvbci_cor_val = -1;
-static int hf_dvbci_cis_tpl_code = -1;
-static int hf_dvbci_cis_tpl_len = -1;
-static int hf_dvbci_cis_tpl_data = -1;
-static int hf_dvbci_cis_tpll_v1_major = -1;
-static int hf_dvbci_cis_tpll_v1_minor = -1;
-static int hf_dvbci_cis_tpll_v1_info_manuf = -1;
-static int hf_dvbci_cis_tpll_v1_info_name = -1;
-static int hf_dvbci_cis_tpll_v1_info_additional = -1;
-static int hf_dvbci_cis_tpll_v1_end = -1;
-static int hf_dvbci_cis_tpcc_rfsz = -1;
-static int hf_dvbci_cis_tpcc_rmsz = -1;
-static int hf_dvbci_cis_tpcc_rasz = -1;
-static int hf_dvbci_cis_tpcc_last = -1;
-static int hf_dvbci_cis_tpcc_radr = -1;
-static int hf_dvbci_cis_tpcc_rmsk = -1;
-static int hf_dvbci_cis_st_code = -1;
-static int hf_dvbci_cis_st_len = -1;
-static int hf_dvbci_cis_stci_ifn_size = -1;
-static int hf_dvbci_cis_stci_ifn = -1;
-static int hf_dvbci_cis_stci_str = -1;
-static int hf_dvbci_cis_tpce_indx_intface = -1;
-static int hf_dvbci_cis_tpce_indx_default = -1;
-static int hf_dvbci_cis_tpce_indx_cnf_entry = -1;
-static int hf_dvbci_cis_tpce_if_type = -1;
-static int hf_dvbci_cis_tpce_fs_mem_space = -1;
-static int hf_dvbci_cis_tpce_fs_irq = -1;
-static int hf_dvbci_cis_tpce_fs_io = -1;
-static int hf_dvbci_cis_dev_vcc_used = -1;
-static int hf_dvbci_cis_dev_mwait = -1;
-static int hf_dvbci_cis_dev_oth_cond_info = -1;
-static int hf_dvbci_cis_tplmid_manf = -1;
-static int hf_dvbci_cis_tplmid_card = -1;
-static int hf_dvbci_buf_size = -1;
-static int hf_dvbci_tcid = -1;
-static int hf_dvbci_ml = -1;
-static int hf_dvbci_l_frags = -1;
-static int hf_dvbci_l_frag = -1;
-static int hf_dvbci_l_frag_overlap = -1;
-static int hf_dvbci_l_frag_overlap_conflicts = -1;
-static int hf_dvbci_l_frag_multiple_tails = -1;
-static int hf_dvbci_l_frag_too_long_frag = -1;
-static int hf_dvbci_l_frag_err = -1;
-static int hf_dvbci_l_frag_cnt = -1;
-static int hf_dvbci_l_reass_in = -1;
-static int hf_dvbci_l_reass_len = -1;
-static int hf_dvbci_c_tpdu_tag = -1;
-static int hf_dvbci_r_tpdu_tag = -1;
-static int hf_dvbci_t_c_id = -1;
-static int hf_dvbci_sb_tag = -1;
-static int hf_dvbci_sb_value = -1;
-static int hf_dvbci_t_frags = -1;
-static int hf_dvbci_t_frag = -1;
-static int hf_dvbci_t_frag_overlap = -1;
-static int hf_dvbci_t_frag_overlap_conflicts = -1;
-static int hf_dvbci_t_frag_multiple_tails = -1;
-static int hf_dvbci_t_frag_too_long_frag = -1;
-static int hf_dvbci_t_frag_err = -1;
-static int hf_dvbci_t_frag_cnt = -1;
-static int hf_dvbci_t_reass_in = -1;
-static int hf_dvbci_t_reass_len = -1;
-static int hf_dvbci_spdu_tag = -1;
-static int hf_dvbci_sess_status = -1;
-static int hf_dvbci_sess_nb = -1;
-static int hf_dvbci_close_sess_status = -1;
-static int hf_dvbci_res_id = -1;
-static int hf_dvbci_res_id_type = -1;
-static int hf_dvbci_res_class = -1;
-static int hf_dvbci_res_type = -1;
-static int hf_dvbci_res_ver = -1;
-static int hf_dvbci_apdu_tag = -1;
-static int hf_dvbci_app_type = -1;
-static int hf_dvbci_app_manf = -1;
-static int hf_dvbci_manf_code = -1;
-static int hf_dvbci_menu_str_len = -1;
-static int hf_dvbci_ap_char_tbl = -1;
-static int hf_dvbci_menu_str = -1;
-static int hf_dvbci_data_rate = -1;
-static int hf_dvbci_ca_sys_id = -1;
-static int hf_dvbci_ca_pmt_list_mgmt = -1;
-static int hf_dvbci_prog_num = -1;
-static int hf_dvbci_ca_ver = -1;
-static int hf_dvbci_curr_next = -1;
-static int hf_dvbci_prog_info_len = -1;
-static int hf_dvbci_stream_type = -1;
-static int hf_dvbci_es_pid = -1;
-static int hf_dvbci_es_info_len = -1;
-static int hf_dvbci_ca_pmt_cmd_id = -1;
-static int hf_dvbci_descr_len = -1;
-static int hf_dvbci_ca_pid = -1;
-static int hf_dvbci_ca_priv_data = -1;
-static int hf_dvbci_ca_enable_flag = -1;
-static int hf_dvbci_ca_enable = -1;
-static int hf_dvbci_auth_proto_id = -1;
-static int hf_dvbci_auth_req_bytes = -1;
-static int hf_dvbci_auth_resp_bytes = -1;
-static int hf_dvbci_network_id = -1;
-static int hf_dvbci_original_network_id = -1;
-static int hf_dvbci_transport_stream_id = -1;
-static int hf_dvbci_service_id = -1;
-static int hf_dvbci_replacement_ref = -1;
-static int hf_dvbci_replaced_pid = -1;
-static int hf_dvbci_replacement_pid = -1;
-static int hf_dvbci_pmt_flag = -1;
-static int hf_dvbci_hc_desc_loop_len = -1;
-static int hf_dvbci_hc_status = -1;
-static int hf_dvbci_hc_release_reply = -1;
-static int hf_dvbci_resp_intv = -1;
-static int hf_dvbci_utc_time = -1;
-static int hf_dvbci_local_offset = -1;
-static int hf_dvbci_close_mmi_cmd_id = -1;
-static int hf_dvbci_close_mmi_delay = -1;
-static int hf_dvbci_disp_ctl_cmd = -1;
-static int hf_dvbci_mmi_mode = -1;
-static int hf_dvbci_disp_rep_id = -1;
-static int hf_dvbci_mmi_char_tbl = -1;
-static int hf_dvbci_blind_ans = -1;
-static int hf_dvbci_ans_txt_len = -1;
-static int hf_dvbci_enq = -1;
-static int hf_dvbci_ans_id = -1;
-static int hf_dvbci_ans = -1;
-static int hf_dvbci_choice_nb = -1;
-static int hf_dvbci_choice_ref = -1;
-static int hf_dvbci_item_nb = -1;
-static int hf_dvbci_title = -1;
-static int hf_dvbci_subtitle = -1;
-static int hf_dvbci_bottom = -1;
-static int hf_dvbci_item = -1;
-static int hf_dvbci_host_country = -1;
-static int hf_dvbci_host_language = -1;
-static int hf_dvbci_cup_type = -1;
-static int hf_dvbci_cup_download_time = -1;
-static int hf_dvbci_cup_answer = -1;
-static int hf_dvbci_cup_progress = -1;
-static int hf_dvbci_cup_reset = -1;
-static int hf_dvbci_cc_sys_id_bitmask = -1;
-static int hf_dvbci_cc_snd_dat_nbr = -1;
-static int hf_dvbci_cc_req_dat_nbr = -1;
-static int hf_dvbci_cc_dat_id = -1;
-static int hf_dvbci_cc_dat_len = -1;
-static int hf_dvbci_brand_cert = -1;
-static int hf_dvbci_dev_cert = -1;
-static int hf_dvbci_uri_ver = -1;
-static int hf_dvbci_uri_aps = -1;
-static int hf_dvbci_uri_emi = -1;
-static int hf_dvbci_uri_ict = -1;
-static int hf_dvbci_uri_rct = -1;
-static int hf_dvbci_uri_dot = -1;
-static int hf_dvbci_uri_rl = -1;
-static int hf_dvbci_cc_key_register = -1;
-static int hf_dvbci_cc_status_field = -1;
-static int hf_dvbci_cc_op_mode = -1;
-static int hf_dvbci_cc_data = -1;
-static int hf_dvbci_sac_msg_ctr = -1;
-static int hf_dvbci_sac_proto_ver = -1;
-static int hf_dvbci_sac_auth_cip = -1;
-static int hf_dvbci_sac_payload_enc = -1;
-static int hf_dvbci_sac_enc_cip = -1;
-static int hf_dvbci_sac_payload_len = -1;
-static int hf_dvbci_sac_enc_body = -1;
-static int hf_dvbci_sac_padding = -1;
-static int hf_dvbci_sac_signature = -1;
-static int hf_dvbci_rating = -1;
-static int hf_dvbci_capability_field = -1;
-static int hf_dvbci_pin_chg_time = -1;
-static int hf_dvbci_pincode_status = -1;
-static int hf_dvbci_cc_prog_num = -1;
-static int hf_dvbci_pin_evt_time = -1;
-static int hf_dvbci_pin_evt_cent = -1;
-static int hf_dvbci_cc_priv_data = -1;
-static int hf_dvbci_pincode = -1;
-static int hf_dvbci_app_dom_id_len = -1;
-static int hf_dvbci_init_obj_len = -1;
-static int hf_dvbci_app_dom_id = -1;
-static int hf_dvbci_init_obj = -1;
-static int hf_dvbci_ack_code = -1;
-static int hf_dvbci_req_type = -1;
-static int hf_dvbci_file_hash = -1;
-static int hf_dvbci_file_name_len = -1;
-static int hf_dvbci_file_name = -1;
-static int hf_dvbci_file_data_len = -1;
-static int hf_dvbci_ami_priv_data = -1;
-static int hf_dvbci_req_ok = -1;
-static int hf_dvbci_file_ok = -1;
-static int hf_dvbci_abort_req_code = -1;
-static int hf_dvbci_abort_ack_code = -1;
-static int hf_dvbci_phase_id = -1;
-static int hf_dvbci_comms_rep_id = -1;
-static int hf_dvbci_lsc_buf_size = -1;
-static int hf_dvbci_lsc_ret_val = -1;
-static int hf_dvbci_comms_cmd_id = -1;
-static int hf_dvbci_conn_desc_type = -1;
-static int hf_dvbci_lsc_media_tag = -1;
-static int hf_dvbci_lsc_media_len = -1;
-static int hf_dvbci_lsc_media_data = -1;
-static int hf_dvbci_lsc_ip_ver = -1;
-static int hf_dvbci_lsc_ipv4_addr = -1;
-static int hf_dvbci_lsc_ipv6_addr = -1;
-static int hf_dvbci_lsc_dst_port = -1;
-static int hf_dvbci_lsc_proto = -1;
-static int hf_dvbci_lsc_hostname = -1;
-static int hf_dvbci_lsc_retry_count = -1;
-static int hf_dvbci_lsc_timeout = -1;
-static int hf_dvbci_lsc_conn_state = -1;
-static int hf_dvbci_lsc_phys_addr = -1;
-static int hf_dvbci_lsc_netmask = -1;
-static int hf_dvbci_lsc_gateway = -1;
-static int hf_dvbci_lsc_dhcp_srv = -1;
-static int hf_dvbci_lsc_num_dns_srv = -1;
-static int hf_dvbci_lsc_dns_srv = -1;
-static int hf_dvbci_afs_dom_id = -1;
-static int hf_dvbci_afs_ack_code = -1;
-static int hf_dvbci_info_ver_op_status = -1;
-static int hf_dvbci_nit_ver = -1;
-static int hf_dvbci_pro_typ = -1;
-static int hf_dvbci_init_flag = -1;
-static int hf_dvbci_ent_chg_flag = -1;
-static int hf_dvbci_ent_val_flag = -1;
-static int hf_dvbci_ref_req_flag = -1;
-static int hf_dvbci_err_flag = -1;
-static int hf_dvbci_dlv_sys_hint = -1;
-static int hf_dvbci_dlv_sys_hint_t = -1;
-static int hf_dvbci_dlv_sys_hint_s = -1;
-static int hf_dvbci_dlv_sys_hint_c = -1;
-static int hf_dvbci_refr_req_date = -1;
-static int hf_dvbci_refr_req_time = -1;
-static int hf_dvbci_nit_loop_len = -1;
-static int hf_dvbci_info_valid = -1;
-static int hf_dvbci_info_ver_op_info = -1;
-static int hf_dvbci_cicam_onid = -1;
-static int hf_dvbci_cicam_id = -1;
-static int hf_dvbci_opp_char_tbl = -1;
-static int hf_dvbci_sdt_rst_trusted = -1;
-static int hf_dvbci_eit_rst_trusted = -1;
-static int hf_dvbci_eit_pf_usage = -1;
-static int hf_dvbci_eit_sch_usage = -1;
-static int hf_dvbci_ext_evt_usage = -1;
-static int hf_dvbci_sdt_oth_trusted = -1;
-static int hf_dvbci_eit_evt_trigger = -1;
-static int hf_dvbci_opp_lang_code = -1;
-static int hf_dvbci_prof_name = -1;
-static int hf_dvbci_unattended = -1;
-static int hf_dvbci_opp_svc_type_loop_len = -1;
-static int hf_dvbci_opp_svc_type = -1;
-static int hf_dvbci_dlv_cap_loop_len = -1;
-static int hf_dvbci_dlv_cap_byte = -1;
-static int hf_dvbci_app_cap_loop_len = -1;
-static int hf_dvbci_app_cap_bytes = -1;
-static int hf_dvbci_desc_num = -1;
-static int hf_dvbci_sig_strength = -1;
-static int hf_dvbci_sig_qual = -1;
-static int hf_dvbci_opp_tune_status = -1;
-static int hf_dvbci_opp_desc_loop_len = -1;
-static int hf_dvbci_sas_app_id = -1;
-static int hf_dvbci_sas_sess_state = -1;
-static int hf_dvbci_sas_msg_nb = -1;
-static int hf_dvbci_sas_msg_len = -1;
+static gint ett_dvbci;
+static gint ett_dvbci_hdr;
+static gint ett_dvbci_cis;
+static gint ett_dvbci_cis_tpl;
+static gint ett_dvbci_cis_subtpl;
+static gint ett_dvbci_link;
+static gint ett_dvbci_link_frag;
+static gint ett_dvbci_link_frags;
+static gint ett_dvbci_transport;
+static gint ett_dvbci_transport_frag;
+static gint ett_dvbci_transport_frags;
+static gint ett_dvbci_session;
+static gint ett_dvbci_res;
+static gint ett_dvbci_application;
+static gint ett_dvbci_es;
+static gint ett_dvbci_ca_desc;
+static gint ett_dvbci_text;
+static gint ett_dvbci_cc_item;
+static gint ett_dvbci_sac_msg_body;
+static gint ett_dvbci_ami_req_types;
+static gint ett_dvbci_lsc_conn_desc;
+static gint ett_dvbci_opp_cap_loop;
+static gint ett_dvbci_dlv_sys_hint;
+
+
+static int hf_dvbci_hdr_ver;
+static int hf_dvbci_event;
+static int hf_dvbci_len;
+static int hf_dvbci_hw_event;
+static int hf_dvbci_cor_addr;
+static int hf_dvbci_cor_val;
+static int hf_dvbci_cis_tpl_code;
+static int hf_dvbci_cis_tpl_len;
+static int hf_dvbci_cis_tpl_data;
+static int hf_dvbci_cis_tpll_v1_major;
+static int hf_dvbci_cis_tpll_v1_minor;
+static int hf_dvbci_cis_tpll_v1_info_manuf;
+static int hf_dvbci_cis_tpll_v1_info_name;
+static int hf_dvbci_cis_tpll_v1_info_additional;
+static int hf_dvbci_cis_tpll_v1_end;
+static int hf_dvbci_cis_tpcc_rfsz;
+static int hf_dvbci_cis_tpcc_rmsz;
+static int hf_dvbci_cis_tpcc_rasz;
+static int hf_dvbci_cis_tpcc_last;
+static int hf_dvbci_cis_tpcc_radr;
+static int hf_dvbci_cis_tpcc_rmsk;
+static int hf_dvbci_cis_st_code;
+static int hf_dvbci_cis_st_len;
+static int hf_dvbci_cis_stci_ifn_size;
+static int hf_dvbci_cis_stci_ifn;
+static int hf_dvbci_cis_stci_str;
+static int hf_dvbci_cis_tpce_indx_intface;
+static int hf_dvbci_cis_tpce_indx_default;
+static int hf_dvbci_cis_tpce_indx_cnf_entry;
+static int hf_dvbci_cis_tpce_if_type;
+static int hf_dvbci_cis_tpce_fs_mem_space;
+static int hf_dvbci_cis_tpce_fs_irq;
+static int hf_dvbci_cis_tpce_fs_io;
+static int hf_dvbci_cis_dev_vcc_used;
+static int hf_dvbci_cis_dev_mwait;
+static int hf_dvbci_cis_dev_oth_cond_info;
+static int hf_dvbci_cis_tplmid_manf;
+static int hf_dvbci_cis_tplmid_card;
+static int hf_dvbci_buf_size;
+static int hf_dvbci_tcid;
+static int hf_dvbci_ml;
+static int hf_dvbci_l_frags;
+static int hf_dvbci_l_frag;
+static int hf_dvbci_l_frag_overlap;
+static int hf_dvbci_l_frag_overlap_conflicts;
+static int hf_dvbci_l_frag_multiple_tails;
+static int hf_dvbci_l_frag_too_long_frag;
+static int hf_dvbci_l_frag_err;
+static int hf_dvbci_l_frag_cnt;
+static int hf_dvbci_l_reass_in;
+static int hf_dvbci_l_reass_len;
+static int hf_dvbci_c_tpdu_tag;
+static int hf_dvbci_r_tpdu_tag;
+static int hf_dvbci_t_c_id;
+static int hf_dvbci_sb_tag;
+static int hf_dvbci_sb_value;
+static int hf_dvbci_t_frags;
+static int hf_dvbci_t_frag;
+static int hf_dvbci_t_frag_overlap;
+static int hf_dvbci_t_frag_overlap_conflicts;
+static int hf_dvbci_t_frag_multiple_tails;
+static int hf_dvbci_t_frag_too_long_frag;
+static int hf_dvbci_t_frag_err;
+static int hf_dvbci_t_frag_cnt;
+static int hf_dvbci_t_reass_in;
+static int hf_dvbci_t_reass_len;
+static int hf_dvbci_spdu_tag;
+static int hf_dvbci_sess_status;
+static int hf_dvbci_sess_nb;
+static int hf_dvbci_close_sess_status;
+static int hf_dvbci_res_id;
+static int hf_dvbci_res_id_type;
+static int hf_dvbci_res_class;
+static int hf_dvbci_res_type;
+static int hf_dvbci_res_ver;
+static int hf_dvbci_apdu_tag;
+static int hf_dvbci_app_type;
+static int hf_dvbci_app_manf;
+static int hf_dvbci_manf_code;
+static int hf_dvbci_menu_str_len;
+static int hf_dvbci_ap_char_tbl;
+static int hf_dvbci_menu_str;
+static int hf_dvbci_data_rate;
+static int hf_dvbci_ca_sys_id;
+static int hf_dvbci_ca_pmt_list_mgmt;
+static int hf_dvbci_prog_num;
+static int hf_dvbci_ca_ver;
+static int hf_dvbci_curr_next;
+static int hf_dvbci_prog_info_len;
+static int hf_dvbci_stream_type;
+static int hf_dvbci_es_pid;
+static int hf_dvbci_es_info_len;
+static int hf_dvbci_ca_pmt_cmd_id;
+static int hf_dvbci_descr_len;
+static int hf_dvbci_ca_pid;
+static int hf_dvbci_ca_priv_data;
+static int hf_dvbci_ca_enable_flag;
+static int hf_dvbci_ca_enable;
+static int hf_dvbci_auth_proto_id;
+static int hf_dvbci_auth_req_bytes;
+static int hf_dvbci_auth_resp_bytes;
+static int hf_dvbci_network_id;
+static int hf_dvbci_original_network_id;
+static int hf_dvbci_transport_stream_id;
+static int hf_dvbci_service_id;
+static int hf_dvbci_replacement_ref;
+static int hf_dvbci_replaced_pid;
+static int hf_dvbci_replacement_pid;
+static int hf_dvbci_pmt_flag;
+static int hf_dvbci_hc_desc_loop_len;
+static int hf_dvbci_hc_status;
+static int hf_dvbci_hc_release_reply;
+static int hf_dvbci_resp_intv;
+static int hf_dvbci_utc_time;
+static int hf_dvbci_local_offset;
+static int hf_dvbci_close_mmi_cmd_id;
+static int hf_dvbci_close_mmi_delay;
+static int hf_dvbci_disp_ctl_cmd;
+static int hf_dvbci_mmi_mode;
+static int hf_dvbci_disp_rep_id;
+static int hf_dvbci_mmi_char_tbl;
+static int hf_dvbci_blind_ans;
+static int hf_dvbci_ans_txt_len;
+static int hf_dvbci_enq;
+static int hf_dvbci_ans_id;
+static int hf_dvbci_ans;
+static int hf_dvbci_choice_nb;
+static int hf_dvbci_choice_ref;
+static int hf_dvbci_item_nb;
+static int hf_dvbci_title;
+static int hf_dvbci_subtitle;
+static int hf_dvbci_bottom;
+static int hf_dvbci_item;
+static int hf_dvbci_host_country;
+static int hf_dvbci_host_language;
+static int hf_dvbci_cup_type;
+static int hf_dvbci_cup_download_time;
+static int hf_dvbci_cup_answer;
+static int hf_dvbci_cup_progress;
+static int hf_dvbci_cup_reset;
+static int hf_dvbci_cc_sys_id_bitmask;
+static int hf_dvbci_cc_snd_dat_nbr;
+static int hf_dvbci_cc_req_dat_nbr;
+static int hf_dvbci_cc_dat_id;
+static int hf_dvbci_cc_dat_len;
+static int hf_dvbci_brand_cert;
+static int hf_dvbci_dev_cert;
+static int hf_dvbci_uri_ver;
+static int hf_dvbci_uri_aps;
+static int hf_dvbci_uri_emi;
+static int hf_dvbci_uri_ict;
+static int hf_dvbci_uri_rct;
+static int hf_dvbci_uri_dot;
+static int hf_dvbci_uri_rl;
+static int hf_dvbci_cc_key_register;
+static int hf_dvbci_cc_status_field;
+static int hf_dvbci_cc_op_mode;
+static int hf_dvbci_cc_data;
+static int hf_dvbci_sac_msg_ctr;
+static int hf_dvbci_sac_proto_ver;
+static int hf_dvbci_sac_auth_cip;
+static int hf_dvbci_sac_payload_enc;
+static int hf_dvbci_sac_enc_cip;
+static int hf_dvbci_sac_payload_len;
+static int hf_dvbci_sac_enc_body;
+static int hf_dvbci_sac_padding;
+static int hf_dvbci_sac_signature;
+static int hf_dvbci_rating;
+static int hf_dvbci_capability_field;
+static int hf_dvbci_pin_chg_time;
+static int hf_dvbci_pincode_status;
+static int hf_dvbci_cc_prog_num;
+static int hf_dvbci_pin_evt_time;
+static int hf_dvbci_pin_evt_cent;
+static int hf_dvbci_cc_priv_data;
+static int hf_dvbci_pincode;
+static int hf_dvbci_app_dom_id_len;
+static int hf_dvbci_init_obj_len;
+static int hf_dvbci_app_dom_id;
+static int hf_dvbci_init_obj;
+static int hf_dvbci_ack_code;
+static int hf_dvbci_req_type;
+static int hf_dvbci_file_hash;
+static int hf_dvbci_file_name_len;
+static int hf_dvbci_file_name;
+static int hf_dvbci_file_data_len;
+static int hf_dvbci_ami_priv_data;
+static int hf_dvbci_req_ok;
+static int hf_dvbci_file_ok;
+static int hf_dvbci_abort_req_code;
+static int hf_dvbci_abort_ack_code;
+static int hf_dvbci_phase_id;
+static int hf_dvbci_comms_rep_id;
+static int hf_dvbci_lsc_buf_size;
+static int hf_dvbci_lsc_ret_val;
+static int hf_dvbci_comms_cmd_id;
+static int hf_dvbci_conn_desc_type;
+static int hf_dvbci_lsc_media_tag;
+static int hf_dvbci_lsc_media_len;
+static int hf_dvbci_lsc_media_data;
+static int hf_dvbci_lsc_ip_ver;
+static int hf_dvbci_lsc_ipv4_addr;
+static int hf_dvbci_lsc_ipv6_addr;
+static int hf_dvbci_lsc_dst_port;
+static int hf_dvbci_lsc_proto;
+static int hf_dvbci_lsc_hostname;
+static int hf_dvbci_lsc_retry_count;
+static int hf_dvbci_lsc_timeout;
+static int hf_dvbci_lsc_conn_state;
+static int hf_dvbci_lsc_phys_addr;
+static int hf_dvbci_lsc_netmask;
+static int hf_dvbci_lsc_gateway;
+static int hf_dvbci_lsc_dhcp_srv;
+static int hf_dvbci_lsc_num_dns_srv;
+static int hf_dvbci_lsc_dns_srv;
+static int hf_dvbci_afs_dom_id;
+static int hf_dvbci_afs_ack_code;
+static int hf_dvbci_info_ver_op_status;
+static int hf_dvbci_nit_ver;
+static int hf_dvbci_pro_typ;
+static int hf_dvbci_init_flag;
+static int hf_dvbci_ent_chg_flag;
+static int hf_dvbci_ent_val_flag;
+static int hf_dvbci_ref_req_flag;
+static int hf_dvbci_err_flag;
+static int hf_dvbci_dlv_sys_hint;
+static int hf_dvbci_dlv_sys_hint_t;
+static int hf_dvbci_dlv_sys_hint_s;
+static int hf_dvbci_dlv_sys_hint_c;
+static int hf_dvbci_refr_req_date;
+static int hf_dvbci_refr_req_time;
+static int hf_dvbci_nit_loop_len;
+static int hf_dvbci_info_valid;
+static int hf_dvbci_info_ver_op_info;
+static int hf_dvbci_cicam_onid;
+static int hf_dvbci_cicam_id;
+static int hf_dvbci_opp_char_tbl;
+static int hf_dvbci_sdt_rst_trusted;
+static int hf_dvbci_eit_rst_trusted;
+static int hf_dvbci_eit_pf_usage;
+static int hf_dvbci_eit_sch_usage;
+static int hf_dvbci_ext_evt_usage;
+static int hf_dvbci_sdt_oth_trusted;
+static int hf_dvbci_eit_evt_trigger;
+static int hf_dvbci_opp_lang_code;
+static int hf_dvbci_prof_name;
+static int hf_dvbci_unattended;
+static int hf_dvbci_opp_svc_type_loop_len;
+static int hf_dvbci_opp_svc_type;
+static int hf_dvbci_dlv_cap_loop_len;
+static int hf_dvbci_dlv_cap_byte;
+static int hf_dvbci_app_cap_loop_len;
+static int hf_dvbci_app_cap_bytes;
+static int hf_dvbci_desc_num;
+static int hf_dvbci_sig_strength;
+static int hf_dvbci_sig_qual;
+static int hf_dvbci_opp_tune_status;
+static int hf_dvbci_opp_desc_loop_len;
+static int hf_dvbci_sas_app_id;
+static int hf_dvbci_sas_sess_state;
+static int hf_dvbci_sas_msg_nb;
+static int hf_dvbci_sas_msg_len;
 
 static int * const dvb_ci_res_id_fields[] = {
   &hf_dvbci_res_id_type,
@@ -1160,38 +1160,38 @@ static int * const dvbci_opp_dlv_sys_hint_fields[] = {
 };
 
 
-static expert_field ei_dvbci_cor_addr = EI_INIT;
-static expert_field ei_dvbci_buf_size = EI_INIT;
-static expert_field ei_dvbci_ml = EI_INIT;
-static expert_field ei_dvbci_c_tpdu_tag = EI_INIT;
-static expert_field ei_dvbci_r_tpdu_status_mandatory = EI_INIT;
-static expert_field ei_dvbci_r_tpdu_tag = EI_INIT;
-static expert_field ei_dvbci_sb_value = EI_INIT;
-static expert_field ei_dvbci_t_c_id = EI_INIT;
-static expert_field ei_dvbci_tpdu_status_tag = EI_INIT;
-static expert_field ei_dvbci_spdu_tag = EI_INIT;
-static expert_field ei_dvbci_spdu_cam_to_host = EI_INIT;
-static expert_field ei_dvbci_spdu_host_to_cam = EI_INIT;
-static expert_field ei_dvbci_apdu_tag = EI_INIT;
-static expert_field ei_dvbci_apu_cam_to_host = EI_INIT;
-static expert_field ei_dvbci_apu_host_to_cam = EI_INIT;
-static expert_field ei_dvbci_apdu_not_supported = EI_INIT;
-static expert_field ei_dvbci_res_ver = EI_INIT;
-static expert_field ei_dvbci_res_class = EI_INIT;
-static expert_field ei_dvbci_bad_length = EI_INIT;
-static expert_field ei_dvbci_invalid_char_tbl = EI_INIT;
-static expert_field ei_dvbci_no_ca_desc_es = EI_INIT;
-static expert_field ei_dvbci_no_ca_desc_prog = EI_INIT;
-static expert_field ei_dvbci_ca_pmt_cmd_id = EI_INIT;
-static expert_field ei_dvbci_time_offs_unknown = EI_INIT;
-static expert_field ei_dvbci_not_text_more_or_text_last = EI_INIT;
-static expert_field ei_dvbci_network_id = EI_INIT;
-static expert_field ei_dvbci_cc_pin_nvr_chg = EI_INIT;
-static expert_field ei_dvbci_pin_evt_cent = EI_INIT;
-static expert_field ei_dvbci_sac_payload_enc = EI_INIT;
-static expert_field ei_dvbci_sig_qual = EI_INIT;
-static expert_field ei_dvbci_cicam_nit_table_id = EI_INIT;
-static expert_field ei_dvbci_cup_progress = EI_INIT;
+static expert_field ei_dvbci_cor_addr;
+static expert_field ei_dvbci_buf_size;
+static expert_field ei_dvbci_ml;
+static expert_field ei_dvbci_c_tpdu_tag;
+static expert_field ei_dvbci_r_tpdu_status_mandatory;
+static expert_field ei_dvbci_r_tpdu_tag;
+static expert_field ei_dvbci_sb_value;
+static expert_field ei_dvbci_t_c_id;
+static expert_field ei_dvbci_tpdu_status_tag;
+static expert_field ei_dvbci_spdu_tag;
+static expert_field ei_dvbci_spdu_cam_to_host;
+static expert_field ei_dvbci_spdu_host_to_cam;
+static expert_field ei_dvbci_apdu_tag;
+static expert_field ei_dvbci_apu_cam_to_host;
+static expert_field ei_dvbci_apu_host_to_cam;
+static expert_field ei_dvbci_apdu_not_supported;
+static expert_field ei_dvbci_res_ver;
+static expert_field ei_dvbci_res_class;
+static expert_field ei_dvbci_bad_length;
+static expert_field ei_dvbci_invalid_char_tbl;
+static expert_field ei_dvbci_no_ca_desc_es;
+static expert_field ei_dvbci_no_ca_desc_prog;
+static expert_field ei_dvbci_ca_pmt_cmd_id;
+static expert_field ei_dvbci_time_offs_unknown;
+static expert_field ei_dvbci_not_text_more_or_text_last;
+static expert_field ei_dvbci_network_id;
+static expert_field ei_dvbci_cc_pin_nvr_chg;
+static expert_field ei_dvbci_pin_evt_cent;
+static expert_field ei_dvbci_sac_payload_enc;
+static expert_field ei_dvbci_sig_qual;
+static expert_field ei_dvbci_cicam_nit_table_id;
+static expert_field ei_dvbci_cup_progress;
 
 static dissector_table_t sas_msg_dissector_table;
 
diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c
index 0eb855e3d6..7e2d510c33 100644
--- a/epan/dissectors/packet-dvmrp.c
+++ b/epan/dissectors/packet-dvmrp.c
@@ -49,58 +49,58 @@ void proto_reg_handoff_dvmrp(void);
 
 static dissector_handle_t dvmrp_handle;
 
-static int proto_dvmrp = -1;
-static int hf_version = -1;
-static int hf_type = -1;
-static int hf_code_v1 = -1;
-static int hf_checksum = -1;
-static int hf_checksum_status = -1;
-static int hf_reserved = -1;
-static int hf_commands = -1;
-static int hf_command = -1;
-static int hf_count = -1;
-static int hf_afi = -1;
-static int hf_netmask = -1;
-static int hf_metric = -1;
-static int hf_dest_unr = -1;
-static int hf_split_horiz = -1;
-static int hf_infinity = -1;
-static int hf_daddr = -1;
-static int hf_maddr = -1;
-static int hf_hold = -1;
-static int hf_code_v3 = -1;
-static int hf_capabilities = -1;
-static int hf_cap_leaf = -1;
-static int hf_cap_prune = -1;
-static int hf_cap_genid = -1;
-static int hf_cap_mtrace = -1;
-static int hf_cap_snmp = -1;
-static int hf_cap_netmask = -1;
-static int hf_min_ver = -1;
-static int hf_maj_ver = -1;
-static int hf_genid = -1;
-static int hf_route = -1;
-static int hf_saddr = -1;
-static int hf_life = -1;
-static int hf_local = -1;
-static int hf_threshold = -1;
-static int hf_flags = -1;
-static int hf_flag_tunnel = -1;
-static int hf_flag_srcroute = -1;
-static int hf_flag_down = -1;
-static int hf_flag_disabled = -1;
-static int hf_flag_querier = -1;
-static int hf_flag_leaf = -1;
-static int hf_ncount = -1;
-static int hf_neighbor = -1;
-
-static int ett_dvmrp = -1;
-static int ett_commands = -1;
-static int ett_capabilities = -1;
-static int ett_flags = -1;
-static int ett_route = -1;
-
-static expert_field ei_checksum = EI_INIT;
+static int proto_dvmrp;
+static int hf_version;
+static int hf_type;
+static int hf_code_v1;
+static int hf_checksum;
+static int hf_checksum_status;
+static int hf_reserved;
+static int hf_commands;
+static int hf_command;
+static int hf_count;
+static int hf_afi;
+static int hf_netmask;
+static int hf_metric;
+static int hf_dest_unr;
+static int hf_split_horiz;
+static int hf_infinity;
+static int hf_daddr;
+static int hf_maddr;
+static int hf_hold;
+static int hf_code_v3;
+static int hf_capabilities;
+static int hf_cap_leaf;
+static int hf_cap_prune;
+static int hf_cap_genid;
+static int hf_cap_mtrace;
+static int hf_cap_snmp;
+static int hf_cap_netmask;
+static int hf_min_ver;
+static int hf_maj_ver;
+static int hf_genid;
+static int hf_route;
+static int hf_saddr;
+static int hf_life;
+static int hf_local;
+static int hf_threshold;
+static int hf_flags;
+static int hf_flag_tunnel;
+static int hf_flag_srcroute;
+static int hf_flag_down;
+static int hf_flag_disabled;
+static int hf_flag_querier;
+static int hf_flag_leaf;
+static int hf_ncount;
+static int hf_neighbor;
+
+static int ett_dvmrp;
+static int ett_commands;
+static int ett_capabilities;
+static int ett_flags;
+static int ett_route;
+
+static expert_field ei_checksum;
 
 static int strict_v3 = FALSE;
 
diff --git a/epan/dissectors/packet-dxl.c b/epan/dissectors/packet-dxl.c
index ac0753ca65..2c5202e61d 100644
--- a/epan/dissectors/packet-dxl.c
+++ b/epan/dissectors/packet-dxl.c
@@ -22,14 +22,14 @@
 void proto_register_dxl(void);
 void proto_reg_handoff_dxl(void);
 
-static int proto_dxl = -1;
+static int proto_dxl;
 
-static int hf_dxl_version = -1;
-static int hf_dxl_type = -1;
+static int hf_dxl_version;
+static int hf_dxl_type;
 
-static gint ett_dxl = -1;
+static gint ett_dxl;
 
-static expert_field ei_dxl_unsupported = EI_INIT;
+static expert_field ei_dxl_unsupported;
 
 static dissector_handle_t msgpack_handle;
 
diff --git a/epan/dissectors/packet-e100.c b/epan/dissectors/packet-e100.c
index 466ac2d037..0d9b02d7ed 100644
--- a/epan/dissectors/packet-e100.c
+++ b/epan/dissectors/packet-e100.c
@@ -17,21 +17,21 @@
 void proto_register_e100(void);
 void proto_reg_handoff_e100(void);
 
-static int proto_e100 = -1;
+static int proto_e100;
 
 static dissector_handle_t eth_handle;
 
 /* Dissector tree globals */
-static int hf_e100_header = -1;
-static int hf_e100_port = -1;
-static int hf_e100_seq = -1;
-static int hf_e100_ip = -1;
-static int hf_e100_mon_pkt_id = -1;
-static int hf_e100_pkt_ts = -1;
-static int hf_e100_bytes_cap = -1;
-static int hf_e100_bytes_orig = -1;
-
-static gint ett_e100 = -1;
+static int hf_e100_header;
+static int hf_e100_port;
+static int hf_e100_seq;
+static int hf_e100_ip;
+static int hf_e100_mon_pkt_id;
+static int hf_e100_pkt_ts;
+static int hf_e100_bytes_cap;
+static int hf_e100_bytes_orig;
+
+static gint ett_e100;
 
 /* E100 encapsulated packet offsets */
 typedef struct _e100_encap
diff --git a/epan/dissectors/packet-e164.c b/epan/dissectors/packet-e164.c
index 218d807fad..5a4c858949 100644
--- a/epan/dissectors/packet-e164.c
+++ b/epan/dissectors/packet-e164.c
@@ -458,18 +458,18 @@ static const value_string E164_International_Networks_883_vals[] = {
 	{ 0,	NULL }
 };
 
-static int proto_e164				= -1;
-static int hf_E164_calling_party_number		= -1;
-static int hf_E164_called_party_number		= -1;
-static int hf_E164_msisdn			= -1;
-static int hf_E164_isdn				= -1;
-static int hf_E164_identification_code		= -1;
-static int hf_E164_country_code			= -1;
-
-static int ett_e164_msisdn = -1;
-
-static expert_field ei_E164_country_code_non_decimal = EI_INIT;
-static expert_field ei_E164_identification_code_non_decimal = EI_INIT;
+static int proto_e164;
+static int hf_E164_calling_party_number;
+static int hf_E164_called_party_number;
+static int hf_E164_msisdn;
+static int hf_E164_isdn;
+static int hf_E164_identification_code;
+static int hf_E164_country_code;
+
+static int ett_e164_msisdn;
+
+static expert_field ei_E164_country_code_non_decimal;
+static expert_field ei_E164_identification_code_non_decimal;
 
 void
 dissect_e164_number(tvbuff_t *tvb, proto_tree *tree, int offset, int length, e164_info_t e164_info)
diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c
index a7bbd0fdc9..7662583a88 100644
--- a/epan/dissectors/packet-e212.c
+++ b/epan/dissectors/packet-e212.c
@@ -3034,39 +3034,39 @@ static const value_string mcc_mnc_3digits_codes[] = {
 
 value_string_ext mcc_mnc_3digits_codes_ext = VALUE_STRING_EXT_INIT(mcc_mnc_3digits_codes);
 
-static int proto_e212   = -1;
-static int hf_E212_imsi = -1;
-static int hf_e212_assoc_imsi = -1;
-static int hf_E212_mcc  = -1;
-static int hf_E212_mcc_lai = -1;
-static int hf_E212_mcc_sai = -1;
-static int hf_E212_mcc_rai = -1;
-static int hf_E212_mcc_cgi = -1;
-static int hf_E212_mcc_ecgi = -1;
-static int hf_E212_mcc_tai = -1;
-static int hf_E212_mcc_nrcgi = -1;
-static int hf_E212_mcc_5gstai = -1;
-static int hf_E212_mcc_gummei = -1;
-static int hf_E212_mcc_guami = -1;
-static int hf_E212_mnc  = -1;
-static int hf_E212_mnc_lai = -1;
-static int hf_E212_mnc_sai = -1;
-static int hf_E212_mnc_rai = -1;
-static int hf_E212_mnc_cgi = -1;
-static int hf_E212_mnc_ecgi = -1;
-static int hf_E212_mnc_tai = -1;
-static int hf_E212_mnc_nrcgi = -1;
-static int hf_E212_mnc_5gstai = -1;
-static int hf_E212_mnc_gummei = -1;
-static int hf_E212_mnc_guami = -1;
-
-static int ett_e212_imsi = -1;
-
-static expert_field ei_E212_mcc_non_decimal = EI_INIT;
-static expert_field ei_E212_mnc_non_decimal = EI_INIT;
-static expert_field ei_E212_imsi_malformed = EI_INIT;
-
-/* static int hf_E212_msin = -1; */
+static int proto_e212;
+static int hf_E212_imsi;
+static int hf_e212_assoc_imsi;
+static int hf_E212_mcc;
+static int hf_E212_mcc_lai;
+static int hf_E212_mcc_sai;
+static int hf_E212_mcc_rai;
+static int hf_E212_mcc_cgi;
+static int hf_E212_mcc_ecgi;
+static int hf_E212_mcc_tai;
+static int hf_E212_mcc_nrcgi;
+static int hf_E212_mcc_5gstai;
+static int hf_E212_mcc_gummei;
+static int hf_E212_mcc_guami;
+static int hf_E212_mnc;
+static int hf_E212_mnc_lai;
+static int hf_E212_mnc_sai;
+static int hf_E212_mnc_rai;
+static int hf_E212_mnc_cgi;
+static int hf_E212_mnc_ecgi;
+static int hf_E212_mnc_tai;
+static int hf_E212_mnc_nrcgi;
+static int hf_E212_mnc_5gstai;
+static int hf_E212_mnc_gummei;
+static int hf_E212_mnc_guami;
+
+static int ett_e212_imsi;
+
+static expert_field ei_E212_mcc_non_decimal;
+static expert_field ei_E212_mnc_non_decimal;
+static expert_field ei_E212_imsi_malformed;
+
+/* static int hf_E212_msin; */
 
 /*
  * MCC/MNC dissection - little endian MNC encoding
diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c
index d3417a53d8..a29345e183 100644
--- a/epan/dissectors/packet-eap.c
+++ b/epan/dissectors/packet-eap.c
@@ -29,162 +29,162 @@
 void proto_register_eap(void);
 void proto_reg_handoff_eap(void);
 
-static int proto_eap = -1;
-static int hf_eap_code = -1;
-static int hf_eap_identifier = -1;
-static int hf_eap_len = -1;
-static int hf_eap_type = -1;
-static int hf_eap_type_nak = -1;
-
-static int hf_eap_identity = -1;
-static int hf_eap_identity_full = -1;
-static int hf_eap_identity_actual_len = -1;
-static int hf_eap_identity_prefix = -1;
-static int hf_eap_identity_type = -1;
-static int hf_eap_identity_certificate_sn = -1;
-static int hf_eap_identity_mcc = -1;
-static int hf_eap_identity_mcc_mnc_2digits = -1;
-static int hf_eap_identity_mcc_mnc_3digits = -1;
-static int hf_eap_identity_padding = -1;
-
-static int hf_eap_notification = -1;
-
-static int hf_eap_md5_value_size = -1;
-static int hf_eap_md5_value = -1;
-static int hf_eap_md5_extra_data = -1;
-
-static int hf_eap_sim_subtype = -1;
-static int hf_eap_sim_reserved = -1;
-static int hf_eap_sim_subtype_attribute = -1;
-static int hf_eap_sim_subtype_type = -1;
-static int hf_eap_sim_subtype_length = -1;
-static int hf_eap_sim_notification_type = -1;
-static int hf_eap_sim_error_code_type = -1;
-static int hf_eap_sim_subtype_value = -1;
-
-static int hf_eap_aka_subtype = -1;
-static int hf_eap_aka_reserved = -1;
-static int hf_eap_aka_subtype_attribute = -1;
-static int hf_eap_aka_subtype_type = -1;
-static int hf_eap_aka_subtype_length = -1;
-static int hf_eap_aka_notification_type = -1;
-static int hf_eap_aka_error_code_type = -1;
-static int hf_eap_aka_subtype_value = -1;
-
-static int hf_eap_leap_version = -1;
-static int hf_eap_leap_reserved = -1;
-static int hf_eap_leap_count = -1;
-static int hf_eap_leap_peer_challenge = -1;
-static int hf_eap_leap_peer_response = -1;
-static int hf_eap_leap_ap_challenge = -1;
-static int hf_eap_leap_ap_response = -1;
-static int hf_eap_leap_data = -1;
-static int hf_eap_leap_name = -1;
-
-static int hf_eap_ms_chap_v2_opcode = -1;
-static int hf_eap_ms_chap_v2_id = -1;
-static int hf_eap_ms_chap_v2_length = -1;
-static int hf_eap_ms_chap_v2_value_size = -1;
-static int hf_eap_ms_chap_v2_challenge = -1;
-static int hf_eap_ms_chap_v2_name = -1;
-static int hf_eap_ms_chap_v2_peer_challenge = -1;
-static int hf_eap_ms_chap_v2_reserved = -1;
-static int hf_eap_ms_chap_v2_nt_response = -1;
-static int hf_eap_ms_chap_v2_flags = -1;
-static int hf_eap_ms_chap_v2_response = -1;
-static int hf_eap_ms_chap_v2_message = -1;
-static int hf_eap_ms_chap_v2_failure_request = -1;
-static int hf_eap_ms_chap_v2_data = -1;
-
-static int hf_eap_pax_opcode = -1;
-static int hf_eap_pax_flags = -1;
-static int hf_eap_pax_flags_mf = -1;
-static int hf_eap_pax_flags_ce = -1;
-static int hf_eap_pax_flags_ai = -1;
-static int hf_eap_pax_flags_reserved = -1;
-static int hf_eap_pax_mac_id = -1;
-static int hf_eap_pax_dh_group_id = -1;
-static int hf_eap_pax_public_key_id = -1;
-static int hf_eap_pax_a_len = -1;
-static int hf_eap_pax_a = -1;
-static int hf_eap_pax_b_len = -1;
-static int hf_eap_pax_b = -1;
-static int hf_eap_pax_cid_len = -1;
-static int hf_eap_pax_cid = -1;
-static int hf_eap_pax_mac_ck_len = -1;
-static int hf_eap_pax_mac_ck = -1;
-static int hf_eap_pax_ade_len = -1;
-static int hf_eap_pax_ade = -1;
-static int hf_eap_pax_mac_icv = -1;
-
-static int hf_eap_psk_flags = -1;
-static int hf_eap_psk_flags_t = -1;
-static int hf_eap_psk_flags_reserved = -1;
-static int hf_eap_psk_rand_p = -1;
-static int hf_eap_psk_rand_s = -1;
-static int hf_eap_psk_mac_p = -1;
-static int hf_eap_psk_mac_s = -1;
-static int hf_eap_psk_id_p = -1;
-static int hf_eap_psk_id_s = -1;
-static int hf_eap_psk_pchannel = -1;
-
-static int hf_eap_sake_version = -1;
-static int hf_eap_sake_session_id = -1;
-static int hf_eap_sake_subtype = -1;
-static int hf_eap_sake_attr_type = -1;
-static int hf_eap_sake_attr_len = -1;
-static int hf_eap_sake_attr_value = -1;
-static int hf_eap_sake_attr_value_str = -1;
-static int hf_eap_sake_attr_value_uint48 = -1;
-
-static int hf_eap_gpsk_opcode = -1;
-static int hf_eap_gpsk_id_server_len = -1;
-static int hf_eap_gpsk_id_server = -1;
-static int hf_eap_gpsk_id_peer_len = -1;
-static int hf_eap_gpsk_id_peer = -1;
-static int hf_eap_gpsk_rand_server = -1;
-static int hf_eap_gpsk_rand_peer = -1;
-static int hf_eap_gpsk_csuite_list_len = -1;
-static int hf_eap_gpsk_csuite_vendor = -1;
-static int hf_eap_gpsk_csuite_specifier = -1;
-static int hf_eap_gpsk_pd_payload_len = -1;
-static int hf_eap_gpsk_pd_payload = -1;
-static int hf_eap_gpsk_payload_mac = -1;
-static int hf_eap_gpsk_failure_code = -1;
-
-static int hf_eap_msauth_tlv_mandatory = -1;
-static int hf_eap_msauth_tlv_reserved = -1;
-static int hf_eap_msauth_tlv_type = -1;
-static int hf_eap_msauth_tlv_len = -1;
-static int hf_eap_msauth_tlv_val = -1;
-static int hf_eap_msauth_tlv_status = -1;
-static int hf_eap_msauth_tlv_crypto_reserved = -1;
-static int hf_eap_msauth_tlv_crypto_version = -1;
-static int hf_eap_msauth_tlv_crypto_rcv_version = -1;
-static int hf_eap_msauth_tlv_crypto_subtype = -1;
-static int hf_eap_msauth_tlv_crypto_nonce = -1;
-static int hf_eap_msauth_tlv_crypto_cmac = -1;
-
-static int hf_eap_data = -1;
-
-static gint ett_eap = -1;
-static gint ett_eap_pax_flags = -1;
-static gint ett_eap_psk_flags = -1;
-static gint ett_eap_sake_attr = -1;
-static gint ett_eap_gpsk_csuite_list = -1;
-static gint ett_eap_gpsk_csuite = -1;
-static gint ett_eap_gpsk_csuite_sel = -1;
-static gint ett_eap_msauth_tlv = -1;
-static gint ett_eap_msauth_tlv_tree = -1;
-
-static expert_field ei_eap_ms_chap_v2_length = EI_INIT;
-static expert_field ei_eap_mitm_attacks = EI_INIT;
-static expert_field ei_eap_md5_value_size_overflow = EI_INIT;
-static expert_field ei_eap_dictionary_attacks = EI_INIT;
-static expert_field ei_eap_identity_nonascii = EI_INIT;
-static expert_field ei_eap_identity_invalid = EI_INIT;
-static expert_field ei_eap_retransmission = EI_INIT;
-static expert_field ei_eap_bad_length = EI_INIT;
+static int proto_eap;
+static int hf_eap_code;
+static int hf_eap_identifier;
+static int hf_eap_len;
+static int hf_eap_type;
+static int hf_eap_type_nak;
+
+static int hf_eap_identity;
+static int hf_eap_identity_full;
+static int hf_eap_identity_actual_len;
+static int hf_eap_identity_prefix;
+static int hf_eap_identity_type;
+static int hf_eap_identity_certificate_sn;
+static int hf_eap_identity_mcc;
+static int hf_eap_identity_mcc_mnc_2digits;
+static int hf_eap_identity_mcc_mnc_3digits;
+static int hf_eap_identity_padding;
+
+static int hf_eap_notification;
+
+static int hf_eap_md5_value_size;
+static int hf_eap_md5_value;
+static int hf_eap_md5_extra_data;
+
+static int hf_eap_sim_subtype;
+static int hf_eap_sim_reserved;
+static int hf_eap_sim_subtype_attribute;
+static int hf_eap_sim_subtype_type;
+static int hf_eap_sim_subtype_length;
+static int hf_eap_sim_notification_type;
+static int hf_eap_sim_error_code_type;
+static int hf_eap_sim_subtype_value;
+
+static int hf_eap_aka_subtype;
+static int hf_eap_aka_reserved;
+static int hf_eap_aka_subtype_attribute;
+static int hf_eap_aka_subtype_type;
+static int hf_eap_aka_subtype_length;
+static int hf_eap_aka_notification_type;
+static int hf_eap_aka_error_code_type;
+static int hf_eap_aka_subtype_value;
+
+static int hf_eap_leap_version;
+static int hf_eap_leap_reserved;
+static int hf_eap_leap_count;
+static int hf_eap_leap_peer_challenge;
+static int hf_eap_leap_peer_response;
+static int hf_eap_leap_ap_challenge;
+static int hf_eap_leap_ap_response;
+static int hf_eap_leap_data;
+static int hf_eap_leap_name;
+
+static int hf_eap_ms_chap_v2_opcode;
+static int hf_eap_ms_chap_v2_id;
+static int hf_eap_ms_chap_v2_length;
+static int hf_eap_ms_chap_v2_value_size;
+static int hf_eap_ms_chap_v2_challenge;
+static int hf_eap_ms_chap_v2_name;
+static int hf_eap_ms_chap_v2_peer_challenge;
+static int hf_eap_ms_chap_v2_reserved;
+static int hf_eap_ms_chap_v2_nt_response;
+static int hf_eap_ms_chap_v2_flags;
+static int hf_eap_ms_chap_v2_response;
+static int hf_eap_ms_chap_v2_message;
+static int hf_eap_ms_chap_v2_failure_request;
+static int hf_eap_ms_chap_v2_data;
+
+static int hf_eap_pax_opcode;
+static int hf_eap_pax_flags;
+static int hf_eap_pax_flags_mf;
+static int hf_eap_pax_flags_ce;
+static int hf_eap_pax_flags_ai;
+static int hf_eap_pax_flags_reserved;
+static int hf_eap_pax_mac_id;
+static int hf_eap_pax_dh_group_id;
+static int hf_eap_pax_public_key_id;
+static int hf_eap_pax_a_len;
+static int hf_eap_pax_a;
+static int hf_eap_pax_b_len;
+static int hf_eap_pax_b;
+static int hf_eap_pax_cid_len;
+static int hf_eap_pax_cid;
+static int hf_eap_pax_mac_ck_len;
+static int hf_eap_pax_mac_ck;
+static int hf_eap_pax_ade_len;
+static int hf_eap_pax_ade;
+static int hf_eap_pax_mac_icv;
+
+static int hf_eap_psk_flags;
+static int hf_eap_psk_flags_t;
+static int hf_eap_psk_flags_reserved;
+static int hf_eap_psk_rand_p;
+static int hf_eap_psk_rand_s;
+static int hf_eap_psk_mac_p;
+static int hf_eap_psk_mac_s;
+static int hf_eap_psk_id_p;
+static int hf_eap_psk_id_s;
+static int hf_eap_psk_pchannel;
+
+static int hf_eap_sake_version;
+static int hf_eap_sake_session_id;
+static int hf_eap_sake_subtype;
+static int hf_eap_sake_attr_type;
+static int hf_eap_sake_attr_len;
+static int hf_eap_sake_attr_value;
+static int hf_eap_sake_attr_value_str;
+static int hf_eap_sake_attr_value_uint48;
+
+static int hf_eap_gpsk_opcode;
+static int hf_eap_gpsk_id_server_len;
+static int hf_eap_gpsk_id_server;
+static int hf_eap_gpsk_id_peer_len;
+static int hf_eap_gpsk_id_peer;
+static int hf_eap_gpsk_rand_server;
+static int hf_eap_gpsk_rand_peer;
+static int hf_eap_gpsk_csuite_list_len;
+static int hf_eap_gpsk_csuite_vendor;
+static int hf_eap_gpsk_csuite_specifier;
+static int hf_eap_gpsk_pd_payload_len;
+static int hf_eap_gpsk_pd_payload;
+static int hf_eap_gpsk_payload_mac;
+static int hf_eap_gpsk_failure_code;
+
+static int hf_eap_msauth_tlv_mandatory;
+static int hf_eap_msauth_tlv_reserved;
+static int hf_eap_msauth_tlv_type;
+static int hf_eap_msauth_tlv_len;
+static int hf_eap_msauth_tlv_val;
+static int hf_eap_msauth_tlv_status;
+static int hf_eap_msauth_tlv_crypto_reserved;
+static int hf_eap_msauth_tlv_crypto_version;
+static int hf_eap_msauth_tlv_crypto_rcv_version;
+static int hf_eap_msauth_tlv_crypto_subtype;
+static int hf_eap_msauth_tlv_crypto_nonce;
+static int hf_eap_msauth_tlv_crypto_cmac;
+
+static int hf_eap_data;
+
+static gint ett_eap;
+static gint ett_eap_pax_flags;
+static gint ett_eap_psk_flags;
+static gint ett_eap_sake_attr;
+static gint ett_eap_gpsk_csuite_list;
+static gint ett_eap_gpsk_csuite;
+static gint ett_eap_gpsk_csuite_sel;
+static gint ett_eap_msauth_tlv;
+static gint ett_eap_msauth_tlv_tree;
+
+static expert_field ei_eap_ms_chap_v2_length;
+static expert_field ei_eap_mitm_attacks;
+static expert_field ei_eap_md5_value_size_overflow;
+static expert_field ei_eap_dictionary_attacks;
+static expert_field ei_eap_identity_nonascii;
+static expert_field ei_eap_identity_invalid;
+static expert_field ei_eap_retransmission;
+static expert_field ei_eap_bad_length;
 
 static dissector_table_t eap_expanded_type_dissector_table;
 
@@ -654,35 +654,35 @@ from RFC5216, pg 21
  */
 static reassembly_table eap_tls_reassembly_table;
 
-static int hf_eap_tls_flags = -1;
-static int hf_eap_tls_flag_l = -1;
-static int hf_eap_tls_flag_m = -1;
-static int hf_eap_tls_flag_s = -1;
-static int hf_eap_tls_flag_o = -1;
-static int hf_eap_tls_flags_version = -1;
-static int hf_eap_tls_len = -1;
-static int hf_eap_tls_outer_tlvs_len = -1;
-static int hf_eap_tls_fragment  = -1;
-static int hf_eap_tls_fragments = -1;
-static int hf_eap_tls_fragment_overlap = -1;
-static int hf_eap_tls_fragment_overlap_conflict = -1;
-static int hf_eap_tls_fragment_multiple_tails = -1;
-static int hf_eap_tls_fragment_too_long_fragment = -1;
-static int hf_eap_tls_fragment_error = -1;
-static int hf_eap_tls_fragment_count = -1;
-static int hf_eap_tls_reassembled_in = -1;
-static int hf_eap_tls_reassembled_length = -1;
-static int hf_eap_fast_type = -1;
-static int hf_eap_fast_length = -1;
-static int hf_eap_fast_aidd = -1;
-static gint ett_eap_tls_fragment  = -1;
-static gint ett_eap_tls_fragments = -1;
-static gint ett_eap_sim_attr = -1;
-static gint ett_eap_aka_attr = -1;
-static gint ett_eap_exp_attr = -1;
-static gint ett_eap_tls_flags = -1;
-static gint ett_identity = -1;
-static gint ett_eap_ikev2_flags = -1;
+static int hf_eap_tls_flags;
+static int hf_eap_tls_flag_l;
+static int hf_eap_tls_flag_m;
+static int hf_eap_tls_flag_s;
+static int hf_eap_tls_flag_o;
+static int hf_eap_tls_flags_version;
+static int hf_eap_tls_len;
+static int hf_eap_tls_outer_tlvs_len;
+static int hf_eap_tls_fragment;
+static int hf_eap_tls_fragments;
+static int hf_eap_tls_fragment_overlap;
+static int hf_eap_tls_fragment_overlap_conflict;
+static int hf_eap_tls_fragment_multiple_tails;
+static int hf_eap_tls_fragment_too_long_fragment;
+static int hf_eap_tls_fragment_error;
+static int hf_eap_tls_fragment_count;
+static int hf_eap_tls_reassembled_in;
+static int hf_eap_tls_reassembled_length;
+static int hf_eap_fast_type;
+static int hf_eap_fast_length;
+static int hf_eap_fast_aidd;
+static gint ett_eap_tls_fragment;
+static gint ett_eap_tls_fragments;
+static gint ett_eap_sim_attr;
+static gint ett_eap_aka_attr;
+static gint ett_eap_exp_attr;
+static gint ett_eap_tls_flags;
+static gint ett_identity;
+static gint ett_eap_ikev2_flags;
 
 static const fragment_items eap_tls_frag_items = {
   &ett_eap_tls_fragment,
@@ -723,12 +723,12 @@ static const fragment_items eap_tls_frag_items = {
 #define EAP_IKEV2_FLAG_M 0x40 /* More fragments */
 #define EAP_IKEV2_FLAG_I 0x20 /* Integrity checksum data included */
 
-static int hf_eap_ikev2_flags = -1;
-static int hf_eap_ikev2_flag_l = -1;
-static int hf_eap_ikev2_flag_m = -1;
-static int hf_eap_ikev2_flag_i = -1;
-static int hf_eap_ikev2_len = -1;
-static int hf_eap_ikev2_int_chk_data = -1;
+static int hf_eap_ikev2_flags;
+static int hf_eap_ikev2_flag_l;
+static int hf_eap_ikev2_flag_m;
+static int hf_eap_ikev2_flag_i;
+static int hf_eap_ikev2_len;
+static int hf_eap_ikev2_int_chk_data;
 
 /**********************************************************************
  Support for EAP Expanded Type.
@@ -736,8 +736,8 @@ static int hf_eap_ikev2_int_chk_data = -1;
  Currently this is limited to WifiProtectedSetup. Maybe we need
  a generic method to support EAP extended types ?
 *********************************************************************/
-static int   hf_eap_ext_vendor_id   = -1;
-static int   hf_eap_ext_vendor_type = -1;
+static int   hf_eap_ext_vendor_id;
+static int   hf_eap_ext_vendor_type;
 
 static const value_string eap_ext_vendor_id_vals[] = {
   { WFA_VENDOR_ID, "WFA" },
diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c
index 2ca5c39315..1f508ef812 100644
--- a/epan/dissectors/packet-eapol.c
+++ b/epan/dissectors/packet-eapol.c
@@ -20,25 +20,25 @@
 void proto_register_eapol(void);
 void proto_reg_handoff_eapol(void);
 
-int proto_eapol = -1;
-static int hf_eapol_version = -1;
-static int hf_eapol_type = -1;
-static int hf_eapol_len = -1;
-static int hf_eapol_keydes_type = -1;
-static int hf_eapol_keydes_body = -1;
-static int hf_eapol_keydes_key_len = -1;
-static int hf_eapol_keydes_replay_counter = -1;
-static int hf_eapol_keydes_key_iv = -1;
-static int hf_eapol_keydes_key_index = -1;
-static int hf_eapol_keydes_key_index_type = -1;
-static int hf_eapol_keydes_key_index_number = -1;
-static int hf_eapol_keydes_key_signature = -1;
-static int hf_eapol_keydes_key = -1;
-static int hf_eapol_keydes_key_generated_locally = -1;
-
-static gint ett_eapol = -1;
-static gint ett_eapol_key_index = -1;
-static gint ett_keyinfo = -1;
+int proto_eapol;
+static int hf_eapol_version;
+static int hf_eapol_type;
+static int hf_eapol_len;
+static int hf_eapol_keydes_type;
+static int hf_eapol_keydes_body;
+static int hf_eapol_keydes_key_len;
+static int hf_eapol_keydes_replay_counter;
+static int hf_eapol_keydes_key_iv;
+static int hf_eapol_keydes_key_index;
+static int hf_eapol_keydes_key_index_type;
+static int hf_eapol_keydes_key_index_number;
+static int hf_eapol_keydes_key_signature;
+static int hf_eapol_keydes_key;
+static int hf_eapol_keydes_key_generated_locally;
+
+static gint ett_eapol;
+static gint ett_eapol_key_index;
+static gint ett_keyinfo;
 
 static dissector_table_t eapol_type_dissector_table;
 static dissector_table_t eapol_keydes_type_dissector_table;
diff --git a/epan/dissectors/packet-ebhscr.c b/epan/dissectors/packet-ebhscr.c
index e81536f2fb..ac9d2779a6 100644
--- a/epan/dissectors/packet-ebhscr.c
+++ b/epan/dissectors/packet-ebhscr.c
@@ -22,149 +22,149 @@
 void proto_reg_handoff_ebhscr(void);
 void proto_register_ebhscr(void);
 
-static int proto_ebhscr = -1;
-
-static int hf_ebhscr_packet_header = -1;
-static int hf_ebhscr_major_number = -1;
-static int hf_ebhscr_slot = -1;
-static int hf_ebhscr_channel = -1;
-static int hf_ebhscr_status = -1;
-static int hf_ebhscr_status_unused = -1;
-
-static int hf_can_proto_type = -1;
-static int hf_can_status_available = -1;
-static int hf_can_LEC = -1;
-static int hf_can_ERRP = -1;
-static int hf_can_ERRW = -1;
-static int hf_can_BOFF = -1;
-static int hf_can_DLEC = -1;
-static int hf_can_TEC = -1;
-static int hf_can_REC = -1;
-static int hf_can_CEL = -1;
-static int hf_can_reserved_bytes = -1;
-
-static int hf_eth_reserved_bytes = -1;
-static int hf_eth_tx_trunc = -1;
-static int hf_eth_trans_undrun = -1;
-static int hf_eth_retrans_limit = -1;
-static int hf_eth_late_collision = -1;
-static int hf_eth_link_up_down = -1;
-static int hf_eth_master_slave = -1;
-static int hf_eth_fcs_unavailable = -1;
-static int hf_eth_rsvd_bit = -1;
-static int hf_eth_speed = -1;
-
-static int hf_eth_crc_error = -1;
-static int hf_eth_mii_foe = -1;
-static int hf_eth_payload_foe = -1;
-static int hf_eth_hdr_foe = -1;
-static int hf_eth_rcv_dec_err = -1;
-static int hf_eth_sym_error = -1;
-static int hf_eth_jabber_event = -1;
-static int hf_eth_pol_ch_event = -1;
-static int hf_eth_fls_carrier_event = -1;
-static int hf_eth_rx_trunc = -1;
-static int hf_eth_transmission_disc_err = -1;
-static int hf_eth_wait_frame_sep_bit = -1;
-
-static int hf_ts_time_offset_valid = -1;
-static int hf_ts_last_offset_change_valid = -1;
-static int hf_ts_nano_seconds_last_jump_valid = -1;
-static int hf_ts_UTC_leap_seconds_valid = -1;
-static int hf_ts_sync_state_valid = -1;
-static int hf_ts_time_source = -1;
-
-static int hf_ts_time_offset_ns = -1;
-static int hf_ts_last_offset_ns = -1;
-static int hf_ts_last_jump_ns = -1;
-static int hf_ts_utc_leap_sec = -1;
-static int hf_ts_sync_state = -1;
-
-static int hf_lin_1_3_classic_chksum = -1;
-static int hf_lin_1_2_enhanced_chksum = -1;
-static int hf_lin_wakeup = -1;
-static int hf_lin_time_jump = -1;
-
-static int hf_lin_reserved_bytes = -1;
-static int hf_lin_wakeup_length = -1;
-static int hf_lin_sts_reserved = -1;
-static int hf_lin_sts_syn = -1;
-static int hf_lin_sts_par = -1;
-static int hf_lin_sts_res = -1;
-static int hf_lin_sts_dat = -1;
-static int hf_lin_sts_chk = -1;
-static int hf_lin_sts_sta = -1;
-static int hf_lin_sts_sto = -1;
-static int hf_lin_sts_emp = -1;
-static int hf_lin_payload = -1;
-static int hf_lin_payload_pid = -1;
-static int hf_lin_payload_id_parity_0 = -1;
-static int hf_lin_payload_id_parity_1 = -1;
-static int hf_lin_payload_id = -1;
-static int hf_lin_payload_data = -1;
-static int hf_lin_payload_checksum = -1;
-
-static int hf_dio_overflow_mon_unit = -1;
-static int hf_dio_jump_occurred = -1;
-static int hf_dio_value_type = -1;
-static int hf_dio_reserved_bytes = -1;
-
-static int hf_flexray_ch_a = -1;
-static int hf_flexray_ch_b = -1;
-static int hf_flexray_ctrl_id = -1;
-static int hf_flexray_monitoring_bit = -1;
-static int hf_flexray_sync_bit = -1;
-static int hf_flexray_packet_type = -1;
-static int hf_flexray_CODERR = -1;
-static int hf_flexray_TSSVIOL = -1;
-static int hf_flexray_HCRCERR = -1;
-static int hf_flexray_FCRCERR = -1;
-static int hf_flexray_FESERR = -1;
-static int hf_flexray_FSSERR = -1;
-static int hf_flexray_BSSERR = -1;
-static int hf_flexray_jump_occurred = -1;
-static int hf_flexray_slot_information = -1;
-static int hf_flexray_SBV = -1;
-static int hf_flexray_ACI = -1;
-static int hf_flexray_CED = -1;
-static int hf_flexray_SED = -1;
-static int hf_flexray_VFR = -1;
-static int hf_flexray_SID = -1;
-static int hf_flexray_frame_status = -1;
-static int hf_flexray_SPLERR = -1;
-static int hf_flexray_CCERR = -1;
-static int hf_flexray_FIDERR = -1;
-static int hf_flexray_SSERR = -1;
-static int hf_flexray_NERR = -1;
-static int hf_flexray_SOVERR = -1;
-static int hf_flexray_SWVIOL = -1;
-static int hf_flexray_NITVIOL = -1;
-static int hf_flexray_BVIOL = -1;
-static int hf_flexray_PCD = -1;
-static int hf_flexray_SYNCERR = -1;
-static int hf_flexray_CP = -1;
-static int hf_flexray_BRC = -1;
-static int hf_flexray_symbol_length_and_status = -1;
-static int hf_flexray_SYERR = -1;
-static int hf_flexray_SL = -1;
-static int hf_flexray_POC_state = -1;
-static int hf_flexray_following_cycle_counter = -1;
-static int hf_flexray_supercycle_counter = -1;
-
-static int hf_ebhscr_version = -1;
-static int hf_ebhscr_length = -1;
-static int hf_ebhscr_start_timestamp = -1;
-static int hf_ebhscr_stop_timestamp = -1;
-static int hf_ebhscr_mjr_hdr = -1;
-static int hf_ebhscr_mjr_hdr_unused = -1;
-
-static gint ett_ebhscr = -1;
-static gint ett_ebhscr_channel = -1;
-static gint ett_ebhscr_packet_header = -1;
-static gint ett_ebhscr_status = -1;
-static gint ett_ebhscr_mjr_hdr = -1;
-
-static gint ett_lin_payload = -1;
+static int proto_ebhscr;
+
+static int hf_ebhscr_packet_header;
+static int hf_ebhscr_major_number;
+static int hf_ebhscr_slot;
+static int hf_ebhscr_channel;
+static int hf_ebhscr_status;
+static int hf_ebhscr_status_unused;
+
+static int hf_can_proto_type;
+static int hf_can_status_available;
+static int hf_can_LEC;
+static int hf_can_ERRP;
+static int hf_can_ERRW;
+static int hf_can_BOFF;
+static int hf_can_DLEC;
+static int hf_can_TEC;
+static int hf_can_REC;
+static int hf_can_CEL;
+static int hf_can_reserved_bytes;
+
+static int hf_eth_reserved_bytes;
+static int hf_eth_tx_trunc;
+static int hf_eth_trans_undrun;
+static int hf_eth_retrans_limit;
+static int hf_eth_late_collision;
+static int hf_eth_link_up_down;
+static int hf_eth_master_slave;
+static int hf_eth_fcs_unavailable;
+static int hf_eth_rsvd_bit;
+static int hf_eth_speed;
+
+static int hf_eth_crc_error;
+static int hf_eth_mii_foe;
+static int hf_eth_payload_foe;
+static int hf_eth_hdr_foe;
+static int hf_eth_rcv_dec_err;
+static int hf_eth_sym_error;
+static int hf_eth_jabber_event;
+static int hf_eth_pol_ch_event;
+static int hf_eth_fls_carrier_event;
+static int hf_eth_rx_trunc;
+static int hf_eth_transmission_disc_err;
+static int hf_eth_wait_frame_sep_bit;
+
+static int hf_ts_time_offset_valid;
+static int hf_ts_last_offset_change_valid;
+static int hf_ts_nano_seconds_last_jump_valid;
+static int hf_ts_UTC_leap_seconds_valid;
+static int hf_ts_sync_state_valid;
+static int hf_ts_time_source;
+
+static int hf_ts_time_offset_ns;
+static int hf_ts_last_offset_ns;
+static int hf_ts_last_jump_ns;
+static int hf_ts_utc_leap_sec;
+static int hf_ts_sync_state;
+
+static int hf_lin_1_3_classic_chksum;
+static int hf_lin_1_2_enhanced_chksum;
+static int hf_lin_wakeup;
+static int hf_lin_time_jump;
+
+static int hf_lin_reserved_bytes;
+static int hf_lin_wakeup_length;
+static int hf_lin_sts_reserved;
+static int hf_lin_sts_syn;
+static int hf_lin_sts_par;
+static int hf_lin_sts_res;
+static int hf_lin_sts_dat;
+static int hf_lin_sts_chk;
+static int hf_lin_sts_sta;
+static int hf_lin_sts_sto;
+static int hf_lin_sts_emp;
+static int hf_lin_payload;
+static int hf_lin_payload_pid;
+static int hf_lin_payload_id_parity_0;
+static int hf_lin_payload_id_parity_1;
+static int hf_lin_payload_id;
+static int hf_lin_payload_data;
+static int hf_lin_payload_checksum;
+
+static int hf_dio_overflow_mon_unit;
+static int hf_dio_jump_occurred;
+static int hf_dio_value_type;
+static int hf_dio_reserved_bytes;
+
+static int hf_flexray_ch_a;
+static int hf_flexray_ch_b;
+static int hf_flexray_ctrl_id;
+static int hf_flexray_monitoring_bit;
+static int hf_flexray_sync_bit;
+static int hf_flexray_packet_type;
+static int hf_flexray_CODERR;
+static int hf_flexray_TSSVIOL;
+static int hf_flexray_HCRCERR;
+static int hf_flexray_FCRCERR;
+static int hf_flexray_FESERR;
+static int hf_flexray_FSSERR;
+static int hf_flexray_BSSERR;
+static int hf_flexray_jump_occurred;
+static int hf_flexray_slot_information;
+static int hf_flexray_SBV;
+static int hf_flexray_ACI;
+static int hf_flexray_CED;
+static int hf_flexray_SED;
+static int hf_flexray_VFR;
+static int hf_flexray_SID;
+static int hf_flexray_frame_status;
+static int hf_flexray_SPLERR;
+static int hf_flexray_CCERR;
+static int hf_flexray_FIDERR;
+static int hf_flexray_SSERR;
+static int hf_flexray_NERR;
+static int hf_flexray_SOVERR;
+static int hf_flexray_SWVIOL;
+static int hf_flexray_NITVIOL;
+static int hf_flexray_BVIOL;
+static int hf_flexray_PCD;
+static int hf_flexray_SYNCERR;
+static int hf_flexray_CP;
+static int hf_flexray_BRC;
+static int hf_flexray_symbol_length_and_status;
+static int hf_flexray_SYERR;
+static int hf_flexray_SL;
+static int hf_flexray_POC_state;
+static int hf_flexray_following_cycle_counter;
+static int hf_flexray_supercycle_counter;
+
+static int hf_ebhscr_version;
+static int hf_ebhscr_length;
+static int hf_ebhscr_start_timestamp;
+static int hf_ebhscr_stop_timestamp;
+static int hf_ebhscr_mjr_hdr;
+static int hf_ebhscr_mjr_hdr_unused;
+
+static gint ett_ebhscr;
+static gint ett_ebhscr_channel;
+static gint ett_ebhscr_packet_header;
+static gint ett_ebhscr_status;
+static gint ett_ebhscr_mjr_hdr;
+
+static gint ett_lin_payload;
 
 static int * const can_status_bits[] = {
 	&hf_can_proto_type,
@@ -496,9 +496,9 @@ static const value_string flexray_POC_state_strings[] = {
 };
 
 
-static expert_field ei_ebhscr_frame_header = EI_INIT;
-static expert_field ei_ebhscr_err_status_flag = EI_INIT;
-static expert_field ei_ebhscr_info_status_flag = EI_INIT;
+static expert_field ei_ebhscr_frame_header;
+static expert_field ei_ebhscr_err_status_flag;
+static expert_field ei_ebhscr_info_status_flag;
 
 static dissector_handle_t ebhscr_handle;
 
diff --git a/epan/dissectors/packet-echo.c b/epan/dissectors/packet-echo.c
index de0e236135..3ef50962bd 100644
--- a/epan/dissectors/packet-echo.c
+++ b/epan/dissectors/packet-echo.c
@@ -23,13 +23,13 @@ void proto_register_echo(void);
 void proto_reg_handoff_echo(void);
 
 static dissector_handle_t echo_handle;
-static int proto_echo = -1;
+static int proto_echo;
 
-static int hf_echo_data = -1;
-static int hf_echo_request = -1;
-static int hf_echo_response = -1;
+static int hf_echo_data;
+static int hf_echo_request;
+static int hf_echo_response;
 
-static gint ett_echo = -1;
+static gint ett_echo;
 
 static int dissect_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
diff --git a/epan/dissectors/packet-ecmp.c b/epan/dissectors/packet-ecmp.c
index 1a50edf373..fe9992f83c 100644
--- a/epan/dissectors/packet-ecmp.c
+++ b/epan/dissectors/packet-ecmp.c
@@ -32,10 +32,10 @@ void proto_register_ecmp (void);
 static dissector_handle_t ecmp_tcp_handle, ecmp_udp_handle;
 
 /* Wireshark ID of the ECMP protocol */
-static int proto_ecmp = -1;
+static int proto_ecmp;
 
 /* Used to set Modbus protocol data */
-static int proto_modbus = -1;
+static int proto_modbus;
 
 /* These are the handles of our subdissectors */
 static dissector_handle_t modbus_handle = NULL;
@@ -516,73 +516,73 @@ static const value_string item_type_vals[] = {
 * our header fields; they are filled out when we call
 * proto_register_field_array() in proto_register_ecmp()
 */
-static gint hf_ecmp_command = -1;
-static gint hf_ecmp_destination_address = -1;
-static gint hf_ecmp_source_address = -1;
-static gint hf_ecmp_diagnostic = -1;
-static gint hf_ecmp_type_rr = -1;
-static gint hf_ecmp_chunking = -1;
-static gint hf_ecmp_max_response_size = -1;
-static gint hf_ecmp_category = -1;
-static gint hf_ecmp_option = -1;
-static gint hf_ecmp_attribute = -1;
-static gint hf_ecmp_no_of_attributes = -1;
-static gint hf_ecmp_chunk_id = -1;
-static gint hf_ecmp_transaction_id = -1;
-static gint hf_ecmp_status = -1;
-static gint hf_ecmp_drive_type = -1;
-static gint hf_ecmp_drive_derivative = -1;
-static gint hf_ecmp_drive_factory_fit_category_id = -1;
-static gint hf_ecmp_category_id = -1;
-static gint hf_ecmp_attribute_string = -1;
-static gint hf_ecmp_file_name = -1;
-static gint hf_ecmp_info_command = -1;
-static gint hf_ecmp_directory = -1;
-static gint hf_ecmp_names_scheme = -1;
-static gint hf_ecmp_variable_name = -1;
-static gint hf_ecmp_unit_id_string = -1;
-static gint hf_ecmp_ecmp_string = -1;
-static gint hf_ecmp_process_time = -1;
-static gint hf_ecmp_cyclic_frame_time = -1;
-static gint hf_ecmp_grandmaster = -1;
-static gint hf_ecmp_data = -1;
-static gint hf_ecmp_response_data = -1;
-
-static gint hf_ecmp_cyclic_link_num = -1;
-static gint hf_ecmp_cyclic_align = -1;
-static gint hf_ecmp_cyclic_scheme = -1;
-static gint hf_ecmp_cyclic_link_number_display = -1;
+static gint hf_ecmp_command;
+static gint hf_ecmp_destination_address;
+static gint hf_ecmp_source_address;
+static gint hf_ecmp_diagnostic;
+static gint hf_ecmp_type_rr;
+static gint hf_ecmp_chunking;
+static gint hf_ecmp_max_response_size;
+static gint hf_ecmp_category;
+static gint hf_ecmp_option;
+static gint hf_ecmp_attribute;
+static gint hf_ecmp_no_of_attributes;
+static gint hf_ecmp_chunk_id;
+static gint hf_ecmp_transaction_id;
+static gint hf_ecmp_status;
+static gint hf_ecmp_drive_type;
+static gint hf_ecmp_drive_derivative;
+static gint hf_ecmp_drive_factory_fit_category_id;
+static gint hf_ecmp_category_id;
+static gint hf_ecmp_attribute_string;
+static gint hf_ecmp_file_name;
+static gint hf_ecmp_info_command;
+static gint hf_ecmp_directory;
+static gint hf_ecmp_names_scheme;
+static gint hf_ecmp_variable_name;
+static gint hf_ecmp_unit_id_string;
+static gint hf_ecmp_ecmp_string;
+static gint hf_ecmp_process_time;
+static gint hf_ecmp_cyclic_frame_time;
+static gint hf_ecmp_grandmaster;
+static gint hf_ecmp_data;
+static gint hf_ecmp_response_data;
+
+static gint hf_ecmp_cyclic_link_num;
+static gint hf_ecmp_cyclic_align;
+static gint hf_ecmp_cyclic_scheme;
+static gint hf_ecmp_cyclic_link_number_display;
 
 /* Cyclic setup */
-static gint hf_ecmp_cyclic_setup_mode = -1;
-static gint hf_ecmp_cyclic_setup_linkno = -1;
-static gint hf_ecmp_cyclic_setup_dir = -1;
-static gint hf_ecmp_cyclic_setup_attrib_count = -1;
-static gint hf_ecmp_cyclic_setup_rsp_status = -1;
-static gint hf_ecmp_cyclic_setup_rsp_err_idx = -1;
-static gint hf_ecmp_cyclic_setup_attrib = -1;
-static gint hf_ecmp_cyclic_setup_link_exists = -1;
-static gint hf_ecmp_cyclic_link_req_resp = -1;
+static gint hf_ecmp_cyclic_setup_mode;
+static gint hf_ecmp_cyclic_setup_linkno;
+static gint hf_ecmp_cyclic_setup_dir;
+static gint hf_ecmp_cyclic_setup_attrib_count;
+static gint hf_ecmp_cyclic_setup_rsp_status;
+static gint hf_ecmp_cyclic_setup_rsp_err_idx;
+static gint hf_ecmp_cyclic_setup_attrib;
+static gint hf_ecmp_cyclic_setup_link_exists;
+static gint hf_ecmp_cyclic_link_req_resp;
 
 /*for info command */
-static gint hf_ecmp_buffer_size = -1;
-static gint hf_ecmp_max_response = -1;
-static gint hf_ecmp_max_handle = -1;
-static gint hf_ecmp_info_address = -1;
+static gint hf_ecmp_buffer_size;
+static gint hf_ecmp_max_response;
+static gint hf_ecmp_max_handle;
+static gint hf_ecmp_info_address;
 
 /*for parameter access commands*/
-static gint hf_ecmp_parameter_address = -1;
-static gint hf_ecmp_number_of_parameter_definitions = -1;
-static gint hf_ecmp_number_of_parameter_responses = -1;
-static gint hf_ecmp_parameter_status = -1;
-static gint hf_ecmp_data_type = -1;
-static gint hf_ecmp_info_type = -1;
+static gint hf_ecmp_parameter_address;
+static gint hf_ecmp_number_of_parameter_definitions;
+static gint hf_ecmp_number_of_parameter_responses;
+static gint hf_ecmp_parameter_status;
+static gint hf_ecmp_data_type;
+static gint hf_ecmp_info_type;
 
 /* for file access commands */
-static gint hf_ecmp_file_status = -1;
-static gint hf_ecmp_file_handle = -1;
-static gint hf_ecmp_file_attributes = -1;
-static gint hf_ecmp_file_ref_point = -1;
+static gint hf_ecmp_file_status;
+static gint hf_ecmp_file_handle;
+static gint hf_ecmp_file_attributes;
+static gint hf_ecmp_file_ref_point;
 
 
 /* for tunnel frame command */
@@ -590,162 +590,162 @@ static gint hf_ecmp_file_ref_point = -1;
 #define TUNNEL_END_FLAG			0x02
 #define TUNNEL_CHECK_OUTPUT_FLAG	0x04
 
-static gint hf_ecmp_tunnel_control = -1;
-static gint hf_ecmp_tunnel_start_flag = -1;
-static gint hf_ecmp_tunnel_end_flag = -1;
-static gint hf_ecmp_tunnel_check_output_flag = -1;
-static gint hf_ecmp_tunnel_size = -1;
+static gint hf_ecmp_tunnel_control;
+static gint hf_ecmp_tunnel_start_flag;
+static gint hf_ecmp_tunnel_end_flag;
+static gint hf_ecmp_tunnel_check_output_flag;
+static gint hf_ecmp_tunnel_size;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_ecmp_physical_address = -1;
-static int hf_ecmp_logical_address = -1;
-static int hf_ecmp_primary_colour = -1;
-static int hf_ecmp_secondary_colour = -1;
-static int hf_ecmp_number_of_subsequent_object_requests = -1;
-static int hf_ecmp_number_of_decimal_places = -1;
-static int hf_ecmp_no_information_available = -1;
-static int hf_ecmp_param_format_bit_default_unipolar = -1;
-static int hf_ecmp_param_format_write_allowed = -1;
-static int hf_ecmp_param_format_read_not_allowed = -1;
-static int hf_ecmp_param_format_protected_from_destinations = -1;
-static int hf_ecmp_param_format_parameter_not_visible = -1;
-static int hf_ecmp_param_format_not_clonable = -1;
-static int hf_ecmp_param_format_voltage_or_current_rating_dependent = -1;
-static int hf_ecmp_param_format_parameter_has_no_default = -1;
-static int hf_ecmp_param_format_number_of_decimal_places = -1;
-static int hf_ecmp_param_format_variable_maximum_and_minimum = -1;
-static int hf_ecmp_param_format_string_parameter = -1;
-static int hf_ecmp_param_format_destination_set_up_parameter = -1;
-static int hf_ecmp_param_format_filtered_when_displayed = -1;
-static int hf_ecmp_param_format_pseudo_read_only = -1;
-static int hf_ecmp_param_format_display_format = -1;
-static int hf_ecmp_param_format_floating_point_value = -1;
-static int hf_ecmp_param_format_units = -1;
-static int hf_ecmp_string_id = -1;
-static int hf_ecmp_address_scheme_menu = -1;
-static int hf_ecmp_address_scheme_parameter = -1;
-static int hf_ecmp_address_scheme_slot = -1;
-static int hf_ecmp_address_scheme_null_byte_size = -1;
-static int hf_ecmp_display_unit_id = -1;
-static int hf_ecmp_data_boolean = -1;
-static int hf_ecmp_data_int8 = -1;
-static int hf_ecmp_data_uint8 = -1;
-static int hf_ecmp_data_int16 = -1;
-static int hf_ecmp_data_uint16 = -1;
-static int hf_ecmp_data_int32 = -1;
-static int hf_ecmp_data_uint32 = -1;
-static int hf_ecmp_data_int64 = -1;
-static int hf_ecmp_data_uint64 = -1;
-static int hf_ecmp_data_float = -1;
-static int hf_ecmp_data_double = -1;
-static int hf_ecmp_access_mode = -1;
-static int hf_ecmp_open_in_non_blocking_mode = -1;
-static int hf_ecmp_open_file_relative_to_specified_directory_handle = -1;
-static int hf_ecmp_file_access_mode = -1;
-static int hf_ecmp_additional_scheme = -1;
-static int hf_ecmp_scheme_data_length = -1;
-static int hf_ecmp_number_of_requested_bytes = -1;
-static int hf_ecmp_number_of_bytes_transferred = -1;
-static int hf_ecmp_crc = -1;
-static int hf_ecmp_ref_offset = -1;
-static int hf_ecmp_number_of_files_to_list = -1;
-static int hf_ecmp_file_hash = -1;
-static int hf_ecmp_item_type = -1;
-static int hf_ecmp_file_integrity = -1;
-static int hf_ecmp_display_attr_read_only = -1;
-static int hf_ecmp_display_attr_hidden = -1;
-static int hf_ecmp_display_attr_system = -1;
-static int hf_ecmp_display_attr_volume_label = -1;
-static int hf_ecmp_display_attr_subdirectory = -1;
-static int hf_ecmp_display_attr_archive = -1;
-static int hf_ecmp_display_creation = -1;
-static int hf_ecmp_display_modification = -1;
-static int hf_ecmp_interrogate_item_type = -1;
-static int hf_ecmp_interrogate_count = -1;
-static int hf_ecmp_modbus_pdu_size = -1;
-/* static int hf_ecmp_destination_scheme = -1; */
-static int hf_ecmp_program_control_target = -1;
-static int hf_ecmp_program_control_command = -1;
-static int hf_ecmp_program_control_sub_command = -1;
-static int hf_ecmp_program_control_status = -1;
-static int hf_ecmp_program_status_target = -1;
-static int hf_ecmp_program_status_status = -1;
-static int hf_ecmp_program_status_additional_items = -1;
-static int hf_ecmp_cyclic_setup_max_mappings = -1;
-static int hf_ecmp_cyclic_setup_start_offset = -1;
-static int hf_ecmp_cyclic_setup_tx_count = -1;
-static int hf_ecmp_cyclic_setup_rx_count = -1;
-static int hf_ecmp_udp_alignment = -1;
-static int hf_ecmp_udp_scheme = -1;
-static int hf_ecmp_cyclic_data = -1;
-static int hf_ecmp_version_summary = -1;
-static int hf_ecmp_min_param_menu = -1;
-static int hf_ecmp_max_param_menu = -1;
-static int hf_ecmp_file_length = -1;
-static int hf_ecmp_mec_offset = -1;
-static int hf_ecmp_sample_period = -1;
-static int hf_ecmp_rx_timeout = -1;
-static int hf_ecmp_rx_action = -1;
-static int hf_ecmp_rx_event_destination = -1;
-static int hf_ecmp_rx_event = -1;
-static int hf_ecmp_rx_late_handler_action = -1;
-static int hf_ecmp_rx_late_handler_event_destination = -1;
-static int hf_ecmp_rx_late_handler_event = -1;
-static int hf_ecmp_transport_addr_scheme = -1;
-static int hf_ecmp_transport_addr = -1;
-static int hf_ecmp_mapping_item_offset = -1;
-static int hf_ecmp_mapping_item_scheme = -1;
-static int hf_ecmp_setup_attribute = -1;
-static int hf_ecmp_mec_period = -1;
-static int hf_ecmp_interrogate_command = -1;
+static int hf_ecmp_physical_address;
+static int hf_ecmp_logical_address;
+static int hf_ecmp_primary_colour;
+static int hf_ecmp_secondary_colour;
+static int hf_ecmp_number_of_subsequent_object_requests;
+static int hf_ecmp_number_of_decimal_places;
+static int hf_ecmp_no_information_available;
+static int hf_ecmp_param_format_bit_default_unipolar;
+static int hf_ecmp_param_format_write_allowed;
+static int hf_ecmp_param_format_read_not_allowed;
+static int hf_ecmp_param_format_protected_from_destinations;
+static int hf_ecmp_param_format_parameter_not_visible;
+static int hf_ecmp_param_format_not_clonable;
+static int hf_ecmp_param_format_voltage_or_current_rating_dependent;
+static int hf_ecmp_param_format_parameter_has_no_default;
+static int hf_ecmp_param_format_number_of_decimal_places;
+static int hf_ecmp_param_format_variable_maximum_and_minimum;
+static int hf_ecmp_param_format_string_parameter;
+static int hf_ecmp_param_format_destination_set_up_parameter;
+static int hf_ecmp_param_format_filtered_when_displayed;
+static int hf_ecmp_param_format_pseudo_read_only;
+static int hf_ecmp_param_format_display_format;
+static int hf_ecmp_param_format_floating_point_value;
+static int hf_ecmp_param_format_units;
+static int hf_ecmp_string_id;
+static int hf_ecmp_address_scheme_menu;
+static int hf_ecmp_address_scheme_parameter;
+static int hf_ecmp_address_scheme_slot;
+static int hf_ecmp_address_scheme_null_byte_size;
+static int hf_ecmp_display_unit_id;
+static int hf_ecmp_data_boolean;
+static int hf_ecmp_data_int8;
+static int hf_ecmp_data_uint8;
+static int hf_ecmp_data_int16;
+static int hf_ecmp_data_uint16;
+static int hf_ecmp_data_int32;
+static int hf_ecmp_data_uint32;
+static int hf_ecmp_data_int64;
+static int hf_ecmp_data_uint64;
+static int hf_ecmp_data_float;
+static int hf_ecmp_data_double;
+static int hf_ecmp_access_mode;
+static int hf_ecmp_open_in_non_blocking_mode;
+static int hf_ecmp_open_file_relative_to_specified_directory_handle;
+static int hf_ecmp_file_access_mode;
+static int hf_ecmp_additional_scheme;
+static int hf_ecmp_scheme_data_length;
+static int hf_ecmp_number_of_requested_bytes;
+static int hf_ecmp_number_of_bytes_transferred;
+static int hf_ecmp_crc;
+static int hf_ecmp_ref_offset;
+static int hf_ecmp_number_of_files_to_list;
+static int hf_ecmp_file_hash;
+static int hf_ecmp_item_type;
+static int hf_ecmp_file_integrity;
+static int hf_ecmp_display_attr_read_only;
+static int hf_ecmp_display_attr_hidden;
+static int hf_ecmp_display_attr_system;
+static int hf_ecmp_display_attr_volume_label;
+static int hf_ecmp_display_attr_subdirectory;
+static int hf_ecmp_display_attr_archive;
+static int hf_ecmp_display_creation;
+static int hf_ecmp_display_modification;
+static int hf_ecmp_interrogate_item_type;
+static int hf_ecmp_interrogate_count;
+static int hf_ecmp_modbus_pdu_size;
+/* static int hf_ecmp_destination_scheme; */
+static int hf_ecmp_program_control_target;
+static int hf_ecmp_program_control_command;
+static int hf_ecmp_program_control_sub_command;
+static int hf_ecmp_program_control_status;
+static int hf_ecmp_program_status_target;
+static int hf_ecmp_program_status_status;
+static int hf_ecmp_program_status_additional_items;
+static int hf_ecmp_cyclic_setup_max_mappings;
+static int hf_ecmp_cyclic_setup_start_offset;
+static int hf_ecmp_cyclic_setup_tx_count;
+static int hf_ecmp_cyclic_setup_rx_count;
+static int hf_ecmp_udp_alignment;
+static int hf_ecmp_udp_scheme;
+static int hf_ecmp_cyclic_data;
+static int hf_ecmp_version_summary;
+static int hf_ecmp_min_param_menu;
+static int hf_ecmp_max_param_menu;
+static int hf_ecmp_file_length;
+static int hf_ecmp_mec_offset;
+static int hf_ecmp_sample_period;
+static int hf_ecmp_rx_timeout;
+static int hf_ecmp_rx_action;
+static int hf_ecmp_rx_event_destination;
+static int hf_ecmp_rx_event;
+static int hf_ecmp_rx_late_handler_action;
+static int hf_ecmp_rx_late_handler_event_destination;
+static int hf_ecmp_rx_late_handler_event;
+static int hf_ecmp_transport_addr_scheme;
+static int hf_ecmp_transport_addr;
+static int hf_ecmp_mapping_item_offset;
+static int hf_ecmp_mapping_item_scheme;
+static int hf_ecmp_setup_attribute;
+static int hf_ecmp_mec_period;
+static int hf_ecmp_interrogate_command;
 /************************************************************/
 
 /* These are the ids of the subtrees that we may be creating */
 
-static gint ett_ecmp = -1;
-static gint ett_ecmp_address= -1;
-static gint ett_ecmp_response_size = -1;
-static gint ett_ecmp_command = -1;
-static gint ett_ecmp_category = -1;
-static gint ett_ecmp_option = -1;
-static gint ett_ecmp_option_data = -1;
-static gint ett_ecmp_attribute = -1;
-static gint ett_ecmp_attribute_data = -1;
-static gint ett_ecmp_cyclic_scheme = -1;
-static gint ett_ecmp_info_type = -1;
-static gint ett_ecmp_info_count = -1;
-static gint ett_ecmp_interrogate_message = -1;
-static gint ett_ecmp_param_address = -1;
-static gint ett_ecmp_access_mode = -1;
-static gint ett_ecmp_access_file = -1;
-static gint ett_ecmp_file_read = -1;
-static gint ett_ecmp_file_write = -1;
-static gint ett_ecmp_file_info = -1;
-static gint ett_ecmp_file_info_att = -1;
-static gint ett_ecmp_file_position = -1;
-static gint ett_ecmp_file_list_no = -1;
-static gint ett_ecmp_file_list = -1;
-static gint ett_ecmp_tunnel_3s_goodframe = -1;
-static gint ett_ecmp_tunnel_3s_size = -1;
-static gint ett_ecmp_tunnel_3s_service = -1;
-static gint ett_cyclic_setup_attribs = -1;
-static gint ett_cyclic_setup_attrib_item = -1;
-static gint ett_cyclic_setup_transport_addr = -1;
-static gint ett_ecmp_cyclic_data_32_bit_display = -1;
-static gint ett_ecmp_cyclic_data_16_bit_display = -1;
-static gint ett_ecmp_cyclic_data_8_bit_display = -1;
-static gint ett_ecmp_modbus_pdu_message = -1;
-static gint ett_ecmp_program_control_message = -1;
-static gint ett_ecmp_program_status_message = -1;
-static expert_field ei_ecmp_unknown_command = EI_INIT;
-static expert_field ei_ecmp_color = EI_INIT;
-static expert_field ei_ecmp_option = EI_INIT;
-static expert_field ei_ecmp_item_type = EI_INIT;
-static expert_field ei_ecmp_options_not_implemented = EI_INIT;
-static expert_field ei_ecmp_info_type = EI_INIT;
-static expert_field ei_ecmp_attribute_type = EI_INIT;
-static expert_field ei_ecmp_parameter_addressing_scheme = EI_INIT;
-static expert_field ei_ecmp_data_type = EI_INIT;
+static gint ett_ecmp;
+static gint ett_ecmp_address;
+static gint ett_ecmp_response_size;
+static gint ett_ecmp_command;
+static gint ett_ecmp_category;
+static gint ett_ecmp_option;
+static gint ett_ecmp_option_data;
+static gint ett_ecmp_attribute;
+static gint ett_ecmp_attribute_data;
+static gint ett_ecmp_cyclic_scheme;
+static gint ett_ecmp_info_type;
+static gint ett_ecmp_info_count;
+static gint ett_ecmp_interrogate_message;
+static gint ett_ecmp_param_address;
+static gint ett_ecmp_access_mode;
+static gint ett_ecmp_access_file;
+static gint ett_ecmp_file_read;
+static gint ett_ecmp_file_write;
+static gint ett_ecmp_file_info;
+static gint ett_ecmp_file_info_att;
+static gint ett_ecmp_file_position;
+static gint ett_ecmp_file_list_no;
+static gint ett_ecmp_file_list;
+static gint ett_ecmp_tunnel_3s_goodframe;
+static gint ett_ecmp_tunnel_3s_size;
+static gint ett_ecmp_tunnel_3s_service;
+static gint ett_cyclic_setup_attribs;
+static gint ett_cyclic_setup_attrib_item;
+static gint ett_cyclic_setup_transport_addr;
+static gint ett_ecmp_cyclic_data_32_bit_display;
+static gint ett_ecmp_cyclic_data_16_bit_display;
+static gint ett_ecmp_cyclic_data_8_bit_display;
+static gint ett_ecmp_modbus_pdu_message;
+static gint ett_ecmp_program_control_message;
+static gint ett_ecmp_program_status_message;
+static expert_field ei_ecmp_unknown_command;
+static expert_field ei_ecmp_color;
+static expert_field ei_ecmp_option;
+static expert_field ei_ecmp_item_type;
+static expert_field ei_ecmp_options_not_implemented;
+static expert_field ei_ecmp_info_type;
+static expert_field ei_ecmp_attribute_type;
+static expert_field ei_ecmp_parameter_addressing_scheme;
+static expert_field ei_ecmp_data_type;
 
 
 /*--------------------------------------------------------------------*/
diff --git a/epan/dissectors/packet-ecp-oui.c b/epan/dissectors/packet-ecp-oui.c
index dd678a5066..8f1672cc8a 100644
--- a/epan/dissectors/packet-ecp-oui.c
+++ b/epan/dissectors/packet-ecp-oui.c
@@ -43,27 +43,27 @@ void proto_reg_handoff_ecp(void);
 #define TLV_INFO_LEN_MASK	0x01FF
 #define TLV_INFO_LEN(value)	((value) & TLV_INFO_LEN_MASK)
 
-static gint proto_ecp = -1;
-static gint hf_ecp_pid = -1;
-static gint hf_ecp_tlv_type = -1;
-static gint hf_ecp_tlv_len = -1;
-static gint hf_ecp_subtype = -1;
-static gint hf_ecp_mode = -1;
-static gint hf_ecp_sequence = -1;
-/* static gint hf_ecp_vdp_oui = -1; */
-static gint hf_ecp_vdp_mode = -1;
-static gint hf_ecp_vdp_response = -1;
-static gint hf_ecp_vdp_mgrid = -1;
-static gint hf_ecp_vdp_vsitypeid = -1;
-static gint hf_ecp_vdp_vsitypeidversion = -1;
-static gint hf_ecp_vdp_instanceid = -1;
-static gint hf_ecp_vdp_format = -1;
-static gint hf_ecp_vdp_mac = -1;
-static gint hf_ecp_vdp_vlan = -1;
-
-static gint ett_ecp = -1;
-static gint ett_end_of_vdpdu = -1;
-static gint ett_802_1qbg_capabilities_flags = -1;
+static gint proto_ecp;
+static gint hf_ecp_pid;
+static gint hf_ecp_tlv_type;
+static gint hf_ecp_tlv_len;
+static gint hf_ecp_subtype;
+static gint hf_ecp_mode;
+static gint hf_ecp_sequence;
+/* static gint hf_ecp_vdp_oui; */
+static gint hf_ecp_vdp_mode;
+static gint hf_ecp_vdp_response;
+static gint hf_ecp_vdp_mgrid;
+static gint hf_ecp_vdp_vsitypeid;
+static gint hf_ecp_vdp_vsitypeidversion;
+static gint hf_ecp_vdp_instanceid;
+static gint hf_ecp_vdp_format;
+static gint hf_ecp_vdp_mac;
+static gint hf_ecp_vdp_vlan;
+
+static gint ett_ecp;
+static gint ett_end_of_vdpdu;
+static gint ett_802_1qbg_capabilities_flags;
 
 static dissector_handle_t ecp_handle;
 
diff --git a/epan/dissectors/packet-ecp.c b/epan/dissectors/packet-ecp.c
index 2917bd1255..87c951103e 100644
--- a/epan/dissectors/packet-ecp.c
+++ b/epan/dissectors/packet-ecp.c
@@ -24,47 +24,47 @@ void proto_reg_handoff_vdp(void);
 static dissector_handle_t ecp_handle;
 static dissector_handle_t vdp_handle;
 
-static int proto_ecp = -1;
-static int hf_ecp_version = -1;
-static int hf_ecp_op = -1;
-static int hf_ecp_subtype = -1;
-static int hf_ecp_seqno = -1;
-
-static int proto_vdp = -1;
-static int hf_vdp_tlv_type = -1;
-static int hf_vdp_tlv_len = -1;
-static int hf_vdp_tlv_assoc_reason = -1;
-static int hf_vdp_vidstr_ps = -1;
-static int hf_vdp_vidstr_pcp = -1;
-static int hf_vdp_vidstr_vid = -1;
-static int hf_vdp_vsitypeid = -1;
-static int hf_vdp_vsiversion = -1;
-static int hf_vdp_vsiid_format = -1;
-static int hf_vdp_vsiid = -1;
-static int hf_vdp_filter_format = -1;
-static int hf_vdp_assoc_mac_id = -1;
-static int hf_vdp_manager_id = -1;
-static int hf_vdp_data = -1;
-static int hf_vdp_tlv_org_oui = -1;
-static int hf_vdp_tlv_oracle_subtype = -1;
-static int hf_vdp_tlv_assoc_flag_mbit = -1;
-static int hf_vdp_tlv_assoc_flag_sbit = -1;
-static int hf_vdp_tlv_assoc_flag_req_rsp = -1;
-static int hf_vdp_tlv_assoc_request_flags = -1;
-static int hf_vdp_tlv_assoc_flag_hard_error = -1;
-static int hf_vdp_tlv_assoc_flag_keep = -1;
-static int hf_vdp_tlv_assoc_error = -1;
-static int hf_vdp_tlv_assoc_response_flags = -1;
-
-static int hf_oui_oracle_encoding = -1;
-
-static gint ett_ecp = -1;
-static gint ett_vdp_tlv = -1;
-static gint ett_vdp_tlv_assoc = -1;
-static gint ett_vdp_tlv_org = -1;
-static gint ett_vdp_assoc_flags = -1;
-
-static expert_field ei_vdp_tlvlen_bad = EI_INIT;
+static int proto_ecp;
+static int hf_ecp_version;
+static int hf_ecp_op;
+static int hf_ecp_subtype;
+static int hf_ecp_seqno;
+
+static int proto_vdp;
+static int hf_vdp_tlv_type;
+static int hf_vdp_tlv_len;
+static int hf_vdp_tlv_assoc_reason;
+static int hf_vdp_vidstr_ps;
+static int hf_vdp_vidstr_pcp;
+static int hf_vdp_vidstr_vid;
+static int hf_vdp_vsitypeid;
+static int hf_vdp_vsiversion;
+static int hf_vdp_vsiid_format;
+static int hf_vdp_vsiid;
+static int hf_vdp_filter_format;
+static int hf_vdp_assoc_mac_id;
+static int hf_vdp_manager_id;
+static int hf_vdp_data;
+static int hf_vdp_tlv_org_oui;
+static int hf_vdp_tlv_oracle_subtype;
+static int hf_vdp_tlv_assoc_flag_mbit;
+static int hf_vdp_tlv_assoc_flag_sbit;
+static int hf_vdp_tlv_assoc_flag_req_rsp;
+static int hf_vdp_tlv_assoc_request_flags;
+static int hf_vdp_tlv_assoc_flag_hard_error;
+static int hf_vdp_tlv_assoc_flag_keep;
+static int hf_vdp_tlv_assoc_error;
+static int hf_vdp_tlv_assoc_response_flags;
+
+static int hf_oui_oracle_encoding;
+
+static gint ett_ecp;
+static gint ett_vdp_tlv;
+static gint ett_vdp_tlv_assoc;
+static gint ett_vdp_tlv_org;
+static gint ett_vdp_assoc_flags;
+
+static expert_field ei_vdp_tlvlen_bad;
 
 static dissector_table_t   ecp_subdissector_table;
 
diff --git a/epan/dissectors/packet-ecpri.c b/epan/dissectors/packet-ecpri.c
index a64ec7f076..59978e1003 100644
--- a/epan/dissectors/packet-ecpri.c
+++ b/epan/dissectors/packet-ecpri.c
@@ -78,66 +78,66 @@ void proto_reg_handoff_ecpri(void);
 /**************************************************************************************************/
 /* Initialize the subtree pointers                                                                */
 /**************************************************************************************************/
-static gint ett_ecpri                = -1;
-static gint ett_ecpri_header         = -1;
-static gint ett_ecpri_payload        = -1;
-static gint ett_ecpri_timestamp      = -1;
-static gint ett_ecpri_element        = -1;
+static gint ett_ecpri;
+static gint ett_ecpri_header;
+static gint ett_ecpri_payload;
+static gint ett_ecpri_timestamp;
+static gint ett_ecpri_element;
 
 /**************************************************************************************************/
 /* Initialize the protocol and registered fields                                                  */
 /**************************************************************************************************/
-static int proto_ecpri               = -1;
+static int proto_ecpri;
 /* Fields for Common Header */
-static int hf_header                 = -1;
-static int hf_proto_rev              = -1;
-static int hf_reserved               = -1;
-static int hf_c_bit                  = -1;
-static int hf_msg_type               = -1;
-static int hf_payload_size           = -1;
+static int hf_header;
+static int hf_proto_rev;
+static int hf_reserved;
+static int hf_c_bit;
+static int hf_msg_type;
+static int hf_payload_size;
 /* Fields for Payload */
-static int hf_payload                = -1;
+static int hf_payload;
 /* Fields for Payload of Message Type 0 and 1 */
-static int hf_pc_id                  = -1;
+static int hf_pc_id;
 /* Fields for Payload of Message Type 0, 1 and 2 */
-static int hf_seq_id                 = -1;
+static int hf_seq_id;
 /* Fields for Payload of Message Type 2 */
-static int hf_rtc_id                 = -1;
+static int hf_rtc_id;
 /* Fields for Payload of Message Type 3 */
-static int hf_pc_id2                 = -1;
-static int hf_seq_id2                = -1;
+static int hf_pc_id2;
+static int hf_seq_id2;
 /* Fields for Payload of Message Type 4 */
-static int hf_rma_id                 = -1;
-static int hf_read_write             = -1;
-static int hf_request_response       = -1;
-static int hf_element_id             = -1;
-static int hf_address                = -1;
-static int hf_data_length            = -1;
+static int hf_rma_id;
+static int hf_read_write;
+static int hf_request_response;
+static int hf_element_id;
+static int hf_address;
+static int hf_data_length;
 /* Fields for Payload of Message Type 5 */
-static int hf_measurement_id         = -1;
-static int hf_action_type            = -1;
-static int hf_timestamp              = -1;
-static int hf_timestamp_sec          = -1;
-static int hf_timestamp_nanosec      = -1;
-static int hf_compensation_value     = -1;
+static int hf_measurement_id;
+static int hf_action_type;
+static int hf_timestamp;
+static int hf_timestamp_sec;
+static int hf_timestamp_nanosec;
+static int hf_compensation_value;
 /* Fields for Payload of Message Type 6 */
-static int hf_reset_id               = -1;
-static int hf_reset_code             = -1;
+static int hf_reset_id;
+static int hf_reset_code;
 /* Fields for Payload of Message Type 7 */
-static int hf_event_id               = -1;
-static int hf_event_type             = -1;
-static int hf_sequence_num           = -1;
-static int hf_number_faults_notif    = -1;
-static int hf_element                = -1;
-static int hf_element_id2            = -1;
-static int hf_raise_cease            = -1;
-static int hf_fault_notif            = -1;
-static int hf_add_info               = -1;
+static int hf_event_id;
+static int hf_event_type;
+static int hf_sequence_num;
+static int hf_number_faults_notif;
+static int hf_element;
+static int hf_element_id2;
+static int hf_raise_cease;
+static int hf_fault_notif;
+static int hf_add_info;
 /* Fields for Payload - rest of data */
-static int hf_data                   = -1;
+static int hf_data;
 
 /* Overall length of eCPRI frame */
-static int hf_ecpri_length           = -1;
+static int hf_ecpri_length;
 
 /**************************************************************************************************/
 /* Preference to use the eCPRI Specification 1.2 encoding                                         */
@@ -152,15 +152,15 @@ static dissector_handle_t ecpri_handle;
 /**************************************************************************************************/
 /* Initialize expert info fields                                                                  */
 /**************************************************************************************************/
-static expert_field ei_ecpri_frame_length   = EI_INIT;
-static expert_field ei_payload_size         = EI_INIT;
-static expert_field ei_comp_val             = EI_INIT;
-static expert_field ei_time_stamp           = EI_INIT;
-static expert_field ei_data_length          = EI_INIT;
-static expert_field ei_c_bit                = EI_INIT;
-static expert_field ei_fault_notif          = EI_INIT;
-static expert_field ei_number_faults        = EI_INIT;
-static expert_field ei_ecpri_not_dis_yet    = EI_INIT;
+static expert_field ei_ecpri_frame_length;
+static expert_field ei_payload_size;
+static expert_field ei_comp_val;
+static expert_field ei_time_stamp;
+static expert_field ei_data_length;
+static expert_field ei_c_bit;
+static expert_field ei_fault_notif;
+static expert_field ei_number_faults;
+static expert_field ei_ecpri_not_dis_yet;
 
 /**************************************************************************************************/
 /* Field Encoding of Message Types                                                                */
diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c
index 5d86913802..9834d741a1 100644
--- a/epan/dissectors/packet-edonkey.c
+++ b/epan/dissectors/packet-edonkey.c
@@ -34,144 +34,144 @@ void proto_reg_handoff_edonkey(void);
 static dissector_handle_t edonkey_tcp_handle;
 static dissector_handle_t edonkey_udp_handle;
 
-static int proto_edonkey = -1;
-
-static int hf_edonkey_message  = -1;
-static int hf_edonkey_protocol = -1;
-static int hf_edonkey_message_length = -1;
-static int hf_edonkey_message_type = -1;
-static int hf_edonkey_client_hash = -1;
-static int hf_edonkey_server_hash = -1;
-static int hf_edonkey_file_hash = -1;
-static int hf_edonkey_client_id = -1;
-static int hf_edonkey_metatag_namesize = -1;
-static int hf_edonkey_metatag_type = -1;
-static int hf_edonkey_metatag = -1;
-static int hf_edonkey_metatag_name = -1;
-static int hf_edonkey_metatag_id = -1;
-static int hf_edonkey_ip = -1;
-static int hf_edonkey_port = -1;
-static int hf_edonkey_hash = -1;
-static int hf_edonkey_part_count = -1;
-static int hf_edonkey_file_status = -1;
-static int hf_edonkey_directory = -1;
-static int hf_edonkey_string = -1;
-static int hf_edonkey_string_length = -1;
-static int hf_edonkey_fileinfo = -1;
-static int hf_edonkey_clientinfo = -1;
-static int hf_edonkey_serverinfo = -1;
-static int hf_emule_aich_partnum = -1;
-static int hf_emule_aich_root_hash = -1;
-static int hf_emule_aich_hash_entry = -1;
-static int hf_emule_aich_hash_id = -1;
-static int hf_emule_aich_hash = -1;
-static int hf_emule_multipacket_entry = -1;
-static int hf_emule_multipacket_opcode = -1;
-static int hf_emule_source_count = -1;
-static int hf_emule_zlib = -1;
-static int hf_emule_public_key = -1;
-static int hf_emule_signature = -1;
-static int hf_emule_sourceOBFU = -1;
-static int hf_overnet_peer = -1;
-
-static int hf_edonkey_unparsed_data_length = -1;
-static int hf_kademlia = -1;
-static int hf_kademlia_search_condition = -1;
-static int hf_kademlia_search_condition_argument_uint32 = -1;
-static int hf_kademlia_search_condition_argument_uint64 = -1;
-/* static int hf_kademlia_unparsed_data_length = -1; */
-static int hf_kademlia_peer = -1;
-static int hf_kademlia_peer_id = -1;
-static int hf_kademlia_hash = -1;
-static int hf_kademlia_file_id = -1;
-static int hf_kademlia_keyword_hash = -1;
-static int hf_kademlia_recipients_id = -1;
-static int hf_kademlia_sender_id = -1;
-static int hf_kademlia_target_id = -1;
-static int hf_kademlia_distance = -1;
-static int hf_kademlia_version = -1;
-static int hf_kademlia_peertype = -1;
-static int hf_kademlia_tag_float = -1;
-static int hf_kademlia_tag_uint64 = -1;
-static int hf_kademlia_tag_uint32 = -1;
-static int hf_kademlia_tag_ipv4 = -1;
-static int hf_kademlia_tag_uint16 = -1;
-static int hf_kademlia_tag_uint8 = -1;
-static int hf_kademlia_tag_hash = -1;
-static int hf_kademlia_tag_bsob = -1;
-static int hf_kademlia_tag_string = -1;
-static int hf_kademlia_udp_port = -1;
-static int hf_kademlia_tcp_port = -1;
-static int hf_kademlia_ip = -1;
-static int hf_kademlia_tag_name = -1;
-static int hf_kademlia_tag_name_length = -1;
-static int hf_kademlia_tag_type = -1;
-static int hf_kademlia_request_type = -1;
-static int hf_kademlia_search_expression_type = -1;
-static int hf_kademlia_search_bool_op = -1;
+static int proto_edonkey;
+
+static int hf_edonkey_message;
+static int hf_edonkey_protocol;
+static int hf_edonkey_message_length;
+static int hf_edonkey_message_type;
+static int hf_edonkey_client_hash;
+static int hf_edonkey_server_hash;
+static int hf_edonkey_file_hash;
+static int hf_edonkey_client_id;
+static int hf_edonkey_metatag_namesize;
+static int hf_edonkey_metatag_type;
+static int hf_edonkey_metatag;
+static int hf_edonkey_metatag_name;
+static int hf_edonkey_metatag_id;
+static int hf_edonkey_ip;
+static int hf_edonkey_port;
+static int hf_edonkey_hash;
+static int hf_edonkey_part_count;
+static int hf_edonkey_file_status;
+static int hf_edonkey_directory;
+static int hf_edonkey_string;
+static int hf_edonkey_string_length;
+static int hf_edonkey_fileinfo;
+static int hf_edonkey_clientinfo;
+static int hf_edonkey_serverinfo;
+static int hf_emule_aich_partnum;
+static int hf_emule_aich_root_hash;
+static int hf_emule_aich_hash_entry;
+static int hf_emule_aich_hash_id;
+static int hf_emule_aich_hash;
+static int hf_emule_multipacket_entry;
+static int hf_emule_multipacket_opcode;
+static int hf_emule_source_count;
+static int hf_emule_zlib;
+static int hf_emule_public_key;
+static int hf_emule_signature;
+static int hf_emule_sourceOBFU;
+static int hf_overnet_peer;
+
+static int hf_edonkey_unparsed_data_length;
+static int hf_kademlia;
+static int hf_kademlia_search_condition;
+static int hf_kademlia_search_condition_argument_uint32;
+static int hf_kademlia_search_condition_argument_uint64;
+/* static int hf_kademlia_unparsed_data_length; */
+static int hf_kademlia_peer;
+static int hf_kademlia_peer_id;
+static int hf_kademlia_hash;
+static int hf_kademlia_file_id;
+static int hf_kademlia_keyword_hash;
+static int hf_kademlia_recipients_id;
+static int hf_kademlia_sender_id;
+static int hf_kademlia_target_id;
+static int hf_kademlia_distance;
+static int hf_kademlia_version;
+static int hf_kademlia_peertype;
+static int hf_kademlia_tag_float;
+static int hf_kademlia_tag_uint64;
+static int hf_kademlia_tag_uint32;
+static int hf_kademlia_tag_ipv4;
+static int hf_kademlia_tag_uint16;
+static int hf_kademlia_tag_uint8;
+static int hf_kademlia_tag_hash;
+static int hf_kademlia_tag_bsob;
+static int hf_kademlia_tag_string;
+static int hf_kademlia_udp_port;
+static int hf_kademlia_tcp_port;
+static int hf_kademlia_ip;
+static int hf_kademlia_tag_name;
+static int hf_kademlia_tag_name_length;
+static int hf_kademlia_tag_type;
+static int hf_kademlia_request_type;
+static int hf_kademlia_search_expression_type;
+static int hf_kademlia_search_bool_op;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_edonkey_list_size = -1;
-static int hf_edonkey_meta_tag_value_revision = -1;
-static int hf_edonkey_meta_tag_value_uint = -1;
-static int hf_edonkey_boolean_array_length = -1;
-static int hf_edonkey_blob_length = -1;
-static int hf_edonkey_kademlia_string = -1;
-static int hf_emule_public_key_length = -1;
-static int hf_emule_signature_length = -1;
-static int hf_edonkey_obfuscation_settings = -1;
-static int hf_edonkey_start_offset = -1;
-static int hf_edonkey_start_offset_64 = -1;
-static int hf_edonkey_end_offset = -1;
-static int hf_edonkey_end_offset_64 = -1;
-static int hf_edonkey_emule_file_length = -1;
-static int hf_edonkey_overnet_peer_type = -1;
-static int hf_edonkey_more_search_file_results = -1;
-static int hf_edonkey_file_size = -1;
-static int hf_edonkey_large_file_size = -1;
-static int hf_edonkey_number_of_users = -1;
-static int hf_edonkey_number_of_files = -1;
-static int hf_edonkey_message_data = -1;
-static int hf_edonkey_emule_version = -1;
-static int hf_edonkey_emule_queue_ranking = -1;
-static int hf_edonkey_emule_ident_state = -1;
-static int hf_edonkey_emule_rndchallenge = -1;
-static int hf_edonkey_emule_sig_ip_used = -1;
-static int hf_edonkey_packed_length = -1;
-static int hf_edonkey_compressed_message_data = -1;
-static int hf_edonkey_challenge = -1;
-static int hf_edonkey_max_number_of_users = -1;
-static int hf_edonkey_search_type = -1;
-static int hf_edonkey_search_range_min = -1;
-static int hf_edonkey_search_range_max = -1;
-static int hf_edonkey_kademlia_uload = -1;
-static int hf_edonkey_kademlia_start_position = -1;
-static int hf_edonkey_kademlia_filesize = -1;
-static int hf_edonkey_kademlia_restrictive = -1;
-static int hf_edonkey_broken_compressed_data = -1;
-static int hf_edonkey_search_limit = -1;
-static int hf_edonkey_search_limit_type = -1;
-static int hf_edonkey_search_ops = -1;
-static int hf_edonkey_user_hash_length = -1;
-
-static gint ett_kademlia_tag = -1;
-static gint ett_edonkey_listitem = -1;
-static gint ett_kademlia_search_expression = -1;
-static gint ett_edonkey = -1;
-static gint ett_edonkey_message = -1;
-static gint ett_edonkey_metatag = -1;
-static gint ett_edonkey_search = -1;
-static gint ett_edonkey_fileinfo = -1;
-static gint ett_edonkey_serverinfo = -1;
-static gint ett_edonkey_clientinfo = -1;
-static gint ett_emule_aichhash = -1;
-static gint ett_emule_multipacket = -1;
-static gint ett_emule_zlib = -1;
-static gint ett_overnet_peer = -1;
-static gint ett_emule_sourceOBFU = -1;
-
-static expert_field ei_kademlia_tag_type = EI_INIT;
-static expert_field ei_kademlia_search_expression_type = EI_INIT;
+static int hf_edonkey_list_size;
+static int hf_edonkey_meta_tag_value_revision;
+static int hf_edonkey_meta_tag_value_uint;
+static int hf_edonkey_boolean_array_length;
+static int hf_edonkey_blob_length;
+static int hf_edonkey_kademlia_string;
+static int hf_emule_public_key_length;
+static int hf_emule_signature_length;
+static int hf_edonkey_obfuscation_settings;
+static int hf_edonkey_start_offset;
+static int hf_edonkey_start_offset_64;
+static int hf_edonkey_end_offset;
+static int hf_edonkey_end_offset_64;
+static int hf_edonkey_emule_file_length;
+static int hf_edonkey_overnet_peer_type;
+static int hf_edonkey_more_search_file_results;
+static int hf_edonkey_file_size;
+static int hf_edonkey_large_file_size;
+static int hf_edonkey_number_of_users;
+static int hf_edonkey_number_of_files;
+static int hf_edonkey_message_data;
+static int hf_edonkey_emule_version;
+static int hf_edonkey_emule_queue_ranking;
+static int hf_edonkey_emule_ident_state;
+static int hf_edonkey_emule_rndchallenge;
+static int hf_edonkey_emule_sig_ip_used;
+static int hf_edonkey_packed_length;
+static int hf_edonkey_compressed_message_data;
+static int hf_edonkey_challenge;
+static int hf_edonkey_max_number_of_users;
+static int hf_edonkey_search_type;
+static int hf_edonkey_search_range_min;
+static int hf_edonkey_search_range_max;
+static int hf_edonkey_kademlia_uload;
+static int hf_edonkey_kademlia_start_position;
+static int hf_edonkey_kademlia_filesize;
+static int hf_edonkey_kademlia_restrictive;
+static int hf_edonkey_broken_compressed_data;
+static int hf_edonkey_search_limit;
+static int hf_edonkey_search_limit_type;
+static int hf_edonkey_search_ops;
+static int hf_edonkey_user_hash_length;
+
+static gint ett_kademlia_tag;
+static gint ett_edonkey_listitem;
+static gint ett_kademlia_search_expression;
+static gint ett_edonkey;
+static gint ett_edonkey_message;
+static gint ett_edonkey_metatag;
+static gint ett_edonkey_search;
+static gint ett_edonkey_fileinfo;
+static gint ett_edonkey_serverinfo;
+static gint ett_edonkey_clientinfo;
+static gint ett_emule_aichhash;
+static gint ett_emule_multipacket;
+static gint ett_emule_zlib;
+static gint ett_overnet_peer;
+static gint ett_emule_sourceOBFU;
+
+static expert_field ei_kademlia_tag_type;
+static expert_field ei_kademlia_search_expression_type;
 
 #define EDONKEY_TCP_PORT_RANGE "4661-4663" /* Not IANA registered */
 #define EDONKEY_UDP_PORT_RANGE "4665,4672" /* Not IANA registered */
diff --git a/epan/dissectors/packet-eero.c b/epan/dissectors/packet-eero.c
index 4963a56338..2de4229366 100644
--- a/epan/dissectors/packet-eero.c
+++ b/epan/dissectors/packet-eero.c
@@ -22,13 +22,13 @@
 void proto_register_eero(void);
 void proto_reg_handoff_eero(void);
 
-static int proto_eero = -1;
+static int proto_eero;
 
-static int hf_eero_type = -1;
-static int hf_eero_src_mac = -1;
-static int hf_eero_data = -1;
+static int hf_eero_type;
+static int hf_eero_src_mac;
+static int hf_eero_data;
 
-static gint ett_eero = -1;
+static gint ett_eero;
 
 static dissector_handle_t eero_handle;
 
diff --git a/epan/dissectors/packet-egd.c b/epan/dissectors/packet-egd.c
index 7aed5d76e2..93b4c6259f 100644
--- a/epan/dissectors/packet-egd.c
+++ b/epan/dissectors/packet-egd.c
@@ -63,21 +63,21 @@ static const value_string egd_stat_vals[] = {
   { 0,                             NULL }
 };
 
-static int proto_egd = -1;
-
-static int hf_egd_ver = -1;
-static int hf_egd_type = -1;
-static int hf_egd_rid = -1;
-static int hf_egd_pid = -1;
-static int hf_egd_exid = -1;
-static int hf_egd_time = -1;
-static int hf_egd_notime = -1;
-static int hf_egd_stat = -1;
-static int hf_egd_csig = -1;
-static int hf_egd_resv = -1;
-
-static gint ett_egd = -1;
-static gint ett_status_item = -1;
+static int proto_egd;
+
+static int hf_egd_ver;
+static int hf_egd_type;
+static int hf_egd_rid;
+static int hf_egd_pid;
+static int hf_egd_exid;
+static int hf_egd_time;
+static int hf_egd_notime;
+static int hf_egd_stat;
+static int hf_egd_csig;
+static int hf_egd_resv;
+
+static gint ett_egd;
+static gint ett_status_item;
 
 static int dissect_egd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
diff --git a/epan/dissectors/packet-ehdlc.c b/epan/dissectors/packet-ehdlc.c
index ece5fabd80..e9221776be 100644
--- a/epan/dissectors/packet-ehdlc.c
+++ b/epan/dissectors/packet-ehdlc.c
@@ -24,38 +24,38 @@ void proto_register_ehdlc(void);
 void proto_reg_handoff_ehdlc(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_ehdlc = -1;
-
-static int hf_ehdlc_data_len = -1;
-static int hf_ehdlc_csapi = -1;
-static int hf_ehdlc_ctei = -1;
-
-static int hf_ehdlc_sapi = -1;
-static int hf_ehdlc_tei = -1;
-static int hf_ehdlc_c_r = -1;
-
-static int hf_ehdlc_xid_payload = -1;
-static int hf_ehdlc_xid_win_tx = -1;
-static int hf_ehdlc_xid_win_rx = -1;
-static int hf_ehdlc_xid_ack_tmr_ms = -1;
-static int hf_ehdlc_xid_format_id = -1;
-static int hf_ehdlc_xid_group_id = -1;
-static int hf_ehdlc_xid_len = -1;
-static int hf_ehdlc_control = -1;
-
-static int hf_ehdlc_p = -1;
-static int hf_ehdlc_f = -1;
-static int hf_ehdlc_u_modifier_cmd = -1;
-static int hf_ehdlc_u_modifier_resp = -1;
-static int hf_ehdlc_ftype_s_u = -1;
-
-static int hf_ehdlc_n_r = -1;
-static int hf_ehdlc_n_s = -1;
-static int hf_ehdlc_p_ext = -1;
-static int hf_ehdlc_f_ext = -1;
-static int hf_ehdlc_s_ftype = -1;
-static int hf_ehdlc_ftype_i = -1;
-static int hf_ehdlc_ftype_s_u_ext = -1;
+static int proto_ehdlc;
+
+static int hf_ehdlc_data_len;
+static int hf_ehdlc_csapi;
+static int hf_ehdlc_ctei;
+
+static int hf_ehdlc_sapi;
+static int hf_ehdlc_tei;
+static int hf_ehdlc_c_r;
+
+static int hf_ehdlc_xid_payload;
+static int hf_ehdlc_xid_win_tx;
+static int hf_ehdlc_xid_win_rx;
+static int hf_ehdlc_xid_ack_tmr_ms;
+static int hf_ehdlc_xid_format_id;
+static int hf_ehdlc_xid_group_id;
+static int hf_ehdlc_xid_len;
+static int hf_ehdlc_control;
+
+static int hf_ehdlc_p;
+static int hf_ehdlc_f;
+static int hf_ehdlc_u_modifier_cmd;
+static int hf_ehdlc_u_modifier_resp;
+static int hf_ehdlc_ftype_s_u;
+
+static int hf_ehdlc_n_r;
+static int hf_ehdlc_n_s;
+static int hf_ehdlc_p_ext;
+static int hf_ehdlc_f_ext;
+static int hf_ehdlc_s_ftype;
+static int hf_ehdlc_ftype_i;
+static int hf_ehdlc_ftype_s_u_ext;
 
 static dissector_handle_t ehdlc_handle;
 
@@ -86,9 +86,9 @@ static const xdlc_cf_items ehdlc_cf_items_ext = {
 };
 
 /* Initialize the subtree pointers */
-static gint ett_ehdlc = -1;
-static gint ett_ehdlc_xid = -1;
-static gint ett_ehdlc_control = -1;
+static gint ett_ehdlc;
+static gint ett_ehdlc_xid;
+static gint ett_ehdlc_control;
 
 enum {
 	SUB_RSL,
diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c
index 16392e9d52..df83ee8d3f 100644
--- a/epan/dissectors/packet-ehs.c
+++ b/epan/dissectors/packet-ehs.c
@@ -18,174 +18,174 @@ void proto_register_ehs(void);
 void proto_reg_handoff_ehs(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_ehs = -1;
+static int proto_ehs;
 
-static int hf_ehs_ph_version = -1;
-static int hf_ehs_ph_project = -1;
-static int hf_ehs_ph_support_mode = -1;
-static int hf_ehs_ph_data_mode = -1;
-static int hf_ehs_ph_mission = -1;
-static int hf_ehs_ph_protocol = -1;
+static int hf_ehs_ph_version;
+static int hf_ehs_ph_project;
+static int hf_ehs_ph_support_mode;
+static int hf_ehs_ph_data_mode;
+static int hf_ehs_ph_mission;
+static int hf_ehs_ph_protocol;
 
-static int hf_ehs_ph_year = -1;            /* numeric year as years since 1900 */
-static int hf_ehs_ph_jday = -1;            /* julian day of year */
-static int hf_ehs_ph_hour = -1;
-static int hf_ehs_ph_minute = -1;
-static int hf_ehs_ph_second = -1;
-static int hf_ehs_ph_tenths = -1;
+static int hf_ehs_ph_year;            /* numeric year as years since 1900 */
+static int hf_ehs_ph_jday;            /* julian day of year */
+static int hf_ehs_ph_hour;
+static int hf_ehs_ph_minute;
+static int hf_ehs_ph_second;
+static int hf_ehs_ph_tenths;
 
-static int hf_ehs_ph_new_data_flag = -1;   /* indicates the time has changed */
-/* static int hf_ehs_ph_pad1 = -1; */
-static int hf_ehs_ph_hold_flag = -1;       /* indicates a hold condition */
-static int hf_ehs_ph_sign_flag = -1;       /* indicates pre-mission, i.e. countdown, time */
+static int hf_ehs_ph_new_data_flag;   /* indicates the time has changed */
+/* static int hf_ehs_ph_pad1; */
+static int hf_ehs_ph_hold_flag;       /* indicates a hold condition */
+static int hf_ehs_ph_sign_flag;       /* indicates pre-mission, i.e. countdown, time */
 
-/* static int hf_ehs_ph_pad2 = -1; */
-/* static int hf_ehs_ph_pad3 = -1; */
-/* static int hf_ehs_ph_pad4 = -1; */
+/* static int hf_ehs_ph_pad2; */
+/* static int hf_ehs_ph_pad3; */
+/* static int hf_ehs_ph_pad4; */
 
-static int hf_ehs_ph_hosc_packet_size = -1;
+static int hf_ehs_ph_hosc_packet_size;
 
 /* generic ehs secondary header values */
-static int hf_ehs_sh_version = -1;
-static int hf_ehs_sh_data_status_bit_5 = -1;
-static int hf_ehs_sh_data_status_bit_4 = -1;
-static int hf_ehs_sh_data_status_bit_3 = -1;
-static int hf_ehs_sh_data_status_bit_2 = -1;
-static int hf_ehs_sh_data_status_bit_1 = -1;
-static int hf_ehs_sh_data_status_bit_0 = -1;
+static int hf_ehs_sh_version;
+static int hf_ehs_sh_data_status_bit_5;
+static int hf_ehs_sh_data_status_bit_4;
+static int hf_ehs_sh_data_status_bit_3;
+static int hf_ehs_sh_data_status_bit_2;
+static int hf_ehs_sh_data_status_bit_1;
+static int hf_ehs_sh_data_status_bit_0;
 
 /* other common remappings of the data status bits specific to certain secondary ehs header values */
-static int hf_ehs_sh_parent_stream_error = -1;      /* data status bit 3 */
-static int hf_ehs_sh_vcdu_sequence_error = -1;      /* data status bit 2 */
-static int hf_ehs_sh_packet_sequence_error = -1;    /* data status bit 1 */
+static int hf_ehs_sh_parent_stream_error;      /* data status bit 3 */
+static int hf_ehs_sh_vcdu_sequence_error;      /* data status bit 2 */
+static int hf_ehs_sh_packet_sequence_error;    /* data status bit 1 */
 
 /* common ehs secondary header values */
-static int hf_ehs_sh_vcdu_sequence_number = -1;
-static int hf_ehs_sh_data_stream_id = -1;
-/* static int hf_ehs_sh_pdss_reserved_1 = -1; */
-/* static int hf_ehs_sh_pdss_reserved_2 = -1; */
-/* static int hf_ehs_sh_pdss_reserved_3 = -1; */
-static int hf_ehs_sh_gse_pkt_id = -1;
-static int hf_ehs_sh_payload_vs_core_id = -1;
-static int hf_ehs_sh_apid = -1;
-static int hf_ehs_sh_virtual_channel = -1;
-static int hf_ehs_sh_pdss_reserved_sync = -1;
+static int hf_ehs_sh_vcdu_sequence_number;
+static int hf_ehs_sh_data_stream_id;
+/* static int hf_ehs_sh_pdss_reserved_1; */
+/* static int hf_ehs_sh_pdss_reserved_2; */
+/* static int hf_ehs_sh_pdss_reserved_3; */
+static int hf_ehs_sh_gse_pkt_id;
+static int hf_ehs_sh_payload_vs_core_id;
+static int hf_ehs_sh_apid;
+static int hf_ehs_sh_virtual_channel;
+static int hf_ehs_sh_pdss_reserved_sync;
 
 /* tdm ehs secondary header values */
-static int hf_ehs_sh_tdm_secondary_header_length = -1;
-
-static int hf_ehs_sh_tdm_extra_data_packet = -1;
-static int hf_ehs_sh_tdm_backup_stream_id_number = -1;
-static int hf_ehs_sh_tdm_end_of_data_flag = -1;
-static int hf_ehs_sh_tdm_parent_frame_error = -1;
-static int hf_ehs_sh_tdm_checksum_error = -1;
-static int hf_ehs_sh_tdm_fixed_value_error = -1;
-
-static int hf_ehs_sh_tdm_minor_frame_counter_error = -1;
-static int hf_ehs_sh_tdm_format_id_error = -1;
-static int hf_ehs_sh_tdm_bit_slip_error = -1;
-static int hf_ehs_sh_tdm_sync_error = -1;
-static int hf_ehs_sh_tdm_aoslos_flag = -1;
-static int hf_ehs_sh_tdm_override_errors_flag = -1;
-static int hf_ehs_sh_tdm_data_status = -1;
-
-static int hf_ehs_sh_tdm_idq = -1;
-static int hf_ehs_sh_tdm_cdq = -1;
-static int hf_ehs_sh_tdm_adq = -1;
-static int hf_ehs_sh_tdm_data_dq = -1;
-/* static int hf_ehs_sh_tdm_unused = -1; */
-static int hf_ehs_sh_tdm_format_id = -1;
-
-static int hf_ehs_sh_tdm_major_frame_packet_index = -1;
-static int hf_ehs_sh_tdm_numpkts_per_major_frame = -1;
-static int hf_ehs_sh_tdm_num_minor_frames_per_packet = -1;
-
-static int hf_ehs_sh_tdm_cntmet_present = -1;
-static int hf_ehs_sh_tdm_obt_present = -1;
-static int hf_ehs_sh_tdm_major_frame_status_present = -1;
-/* static int hf_ehs_sh_tdm_reserved = -1; */
-
-static int hf_ehs_sh_tdm_cnt_year = -1;            /* numeric year as years since 1900 */
-static int hf_ehs_sh_tdm_cnt_jday = -1;            /* julian day of year */
-static int hf_ehs_sh_tdm_cnt_hour = -1;
-static int hf_ehs_sh_tdm_cnt_minute = -1;
-static int hf_ehs_sh_tdm_cnt_second = -1;
-static int hf_ehs_sh_tdm_cnt_tenths = -1;
-
-static int hf_ehs_sh_tdm_obt_year = -1;            /* numeric year as years since 1900 */
-static int hf_ehs_sh_tdm_obt_jday = -1;            /* julian day of year */
-static int hf_ehs_sh_tdm_obt_hour = -1;
-static int hf_ehs_sh_tdm_obt_minute = -1;
-static int hf_ehs_sh_tdm_obt_second = -1;
-static int hf_ehs_sh_tdm_obt_tenths = -1;
-
-static int hf_ehs_sh_tdm_obt_delta_time_flag = -1;
-static int hf_ehs_sh_tdm_obt_computed_flag = -1;
-static int hf_ehs_sh_tdm_obt_not_retrieved_flag = -1;
-/* static int hf_ehs_sh_tdm_obt_reserved = -1; */
-static int hf_ehs_sh_tdm_obt_source_apid = -1;
-
-static int hf_ehs_sh_tdm_num_major_frame_status_words = -1;
-
-/* static int hf_ehs_sh_tdm_mjfs_reserved = -1; */
-static int hf_ehs_sh_tdm_mjfs_parent_frame_error = -1;
-static int hf_ehs_sh_tdm_mjfs_checksum_error = -1;
-static int hf_ehs_sh_tdm_mjfs_fixed_value_error = -1;
-
-static int hf_ehs_sh_tdm_mnfs_parent_frame_error = -1;
-static int hf_ehs_sh_tdm_mnfs_data_not_available = -1;
-static int hf_ehs_sh_tdm_mnfs_checksum_error = -1;
-static int hf_ehs_sh_tdm_mnfs_fixed_value_error = -1;
-static int hf_ehs_sh_tdm_mnfs_counter_error = -1;
-static int hf_ehs_sh_tdm_mnfs_format_id_error = -1;
-static int hf_ehs_sh_tdm_mnfs_bit_slip_error = -1;
-static int hf_ehs_sh_tdm_mnfs_sync_error = -1;
+static int hf_ehs_sh_tdm_secondary_header_length;
+
+static int hf_ehs_sh_tdm_extra_data_packet;
+static int hf_ehs_sh_tdm_backup_stream_id_number;
+static int hf_ehs_sh_tdm_end_of_data_flag;
+static int hf_ehs_sh_tdm_parent_frame_error;
+static int hf_ehs_sh_tdm_checksum_error;
+static int hf_ehs_sh_tdm_fixed_value_error;
+
+static int hf_ehs_sh_tdm_minor_frame_counter_error;
+static int hf_ehs_sh_tdm_format_id_error;
+static int hf_ehs_sh_tdm_bit_slip_error;
+static int hf_ehs_sh_tdm_sync_error;
+static int hf_ehs_sh_tdm_aoslos_flag;
+static int hf_ehs_sh_tdm_override_errors_flag;
+static int hf_ehs_sh_tdm_data_status;
+
+static int hf_ehs_sh_tdm_idq;
+static int hf_ehs_sh_tdm_cdq;
+static int hf_ehs_sh_tdm_adq;
+static int hf_ehs_sh_tdm_data_dq;
+/* static int hf_ehs_sh_tdm_unused; */
+static int hf_ehs_sh_tdm_format_id;
+
+static int hf_ehs_sh_tdm_major_frame_packet_index;
+static int hf_ehs_sh_tdm_numpkts_per_major_frame;
+static int hf_ehs_sh_tdm_num_minor_frames_per_packet;
+
+static int hf_ehs_sh_tdm_cntmet_present;
+static int hf_ehs_sh_tdm_obt_present;
+static int hf_ehs_sh_tdm_major_frame_status_present;
+/* static int hf_ehs_sh_tdm_reserved; */
+
+static int hf_ehs_sh_tdm_cnt_year;            /* numeric year as years since 1900 */
+static int hf_ehs_sh_tdm_cnt_jday;            /* julian day of year */
+static int hf_ehs_sh_tdm_cnt_hour;
+static int hf_ehs_sh_tdm_cnt_minute;
+static int hf_ehs_sh_tdm_cnt_second;
+static int hf_ehs_sh_tdm_cnt_tenths;
+
+static int hf_ehs_sh_tdm_obt_year;            /* numeric year as years since 1900 */
+static int hf_ehs_sh_tdm_obt_jday;            /* julian day of year */
+static int hf_ehs_sh_tdm_obt_hour;
+static int hf_ehs_sh_tdm_obt_minute;
+static int hf_ehs_sh_tdm_obt_second;
+static int hf_ehs_sh_tdm_obt_tenths;
+
+static int hf_ehs_sh_tdm_obt_delta_time_flag;
+static int hf_ehs_sh_tdm_obt_computed_flag;
+static int hf_ehs_sh_tdm_obt_not_retrieved_flag;
+/* static int hf_ehs_sh_tdm_obt_reserved; */
+static int hf_ehs_sh_tdm_obt_source_apid;
+
+static int hf_ehs_sh_tdm_num_major_frame_status_words;
+
+/* static int hf_ehs_sh_tdm_mjfs_reserved; */
+static int hf_ehs_sh_tdm_mjfs_parent_frame_error;
+static int hf_ehs_sh_tdm_mjfs_checksum_error;
+static int hf_ehs_sh_tdm_mjfs_fixed_value_error;
+
+static int hf_ehs_sh_tdm_mnfs_parent_frame_error;
+static int hf_ehs_sh_tdm_mnfs_data_not_available;
+static int hf_ehs_sh_tdm_mnfs_checksum_error;
+static int hf_ehs_sh_tdm_mnfs_fixed_value_error;
+static int hf_ehs_sh_tdm_mnfs_counter_error;
+static int hf_ehs_sh_tdm_mnfs_format_id_error;
+static int hf_ehs_sh_tdm_mnfs_bit_slip_error;
+static int hf_ehs_sh_tdm_mnfs_sync_error;
 
 /* pseudo ehs secondary header values */
-/* static int hf_ehs_sh_pseudo_unused = -1; */
-static int hf_ehs_sh_pseudo_workstation_id = -1;
-static int hf_ehs_sh_pseudo_user_id = -1;
-static int hf_ehs_sh_pseudo_comp_id = -1;
+/* static int hf_ehs_sh_pseudo_unused; */
+static int hf_ehs_sh_pseudo_workstation_id;
+static int hf_ehs_sh_pseudo_user_id;
+static int hf_ehs_sh_pseudo_comp_id;
 
 /* data zone values for well known protocol AOS/LOS */
-static int hf_ehs_dz_aoslos_indicator = -1;
+static int hf_ehs_dz_aoslos_indicator;
 
 /* data zone values for well known protocol UDSM */
-static int hf_ehs_dz_udsm_ccsds_vs_bpdu = -1;
-/* static int hf_ehs_dz_udsm_unused1 = -1; */
+static int hf_ehs_dz_udsm_ccsds_vs_bpdu;
+/* static int hf_ehs_dz_udsm_unused1; */
 
-/* static int hf_ehs_dz_udsm_unused2 = -1; */
+/* static int hf_ehs_dz_udsm_unused2; */
 
-/* static int hf_ehs_dz_udsm_unused3 = -1; */
-static int hf_ehs_dz_udsm_gse_pkt_id = -1;
-static int hf_ehs_dz_udsm_payload_vs_core = -1;
-static int hf_ehs_dz_udsm_apid = -1;
+/* static int hf_ehs_dz_udsm_unused3; */
+static int hf_ehs_dz_udsm_gse_pkt_id;
+static int hf_ehs_dz_udsm_payload_vs_core;
+static int hf_ehs_dz_udsm_apid;
 
-static int hf_ehs_dz_udsm_start_time_year = -1;
-static int hf_ehs_dz_udsm_start_time_jday = -1;
-static int hf_ehs_dz_udsm_start_time_hour = -1;
-static int hf_ehs_dz_udsm_start_time_minute = -1;
-static int hf_ehs_dz_udsm_start_time_second = -1;
+static int hf_ehs_dz_udsm_start_time_year;
+static int hf_ehs_dz_udsm_start_time_jday;
+static int hf_ehs_dz_udsm_start_time_hour;
+static int hf_ehs_dz_udsm_start_time_minute;
+static int hf_ehs_dz_udsm_start_time_second;
 
-static int hf_ehs_dz_udsm_stop_time_year = -1;
-static int hf_ehs_dz_udsm_stop_time_jday = -1;
-static int hf_ehs_dz_udsm_stop_time_hour = -1;
-static int hf_ehs_dz_udsm_stop_time_minute = -1;
-static int hf_ehs_dz_udsm_stop_time_second = -1;
+static int hf_ehs_dz_udsm_stop_time_year;
+static int hf_ehs_dz_udsm_stop_time_jday;
+static int hf_ehs_dz_udsm_stop_time_hour;
+static int hf_ehs_dz_udsm_stop_time_minute;
+static int hf_ehs_dz_udsm_stop_time_second;
 
-/* static int hf_ehs_dz_udsm_unused4 = -1; */
+/* static int hf_ehs_dz_udsm_unused4; */
 
-static int hf_ehs_dz_udsm_num_pkts_xmtd = -1;
+static int hf_ehs_dz_udsm_num_pkts_xmtd;
 
-static int hf_ehs_dz_udsm_num_vcdu_seqerrs = -1;
+static int hf_ehs_dz_udsm_num_vcdu_seqerrs;
 
-static int hf_ehs_dz_udsm_num_pkt_seqerrs = -1;
+static int hf_ehs_dz_udsm_num_pkt_seqerrs;
 
-static int hf_ehs_dz_udsm_num_pktlen_errors = -1;
+static int hf_ehs_dz_udsm_num_pktlen_errors;
 
-static int hf_ehs_dz_udsm_event = -1;
+static int hf_ehs_dz_udsm_event;
 
-static int hf_ehs_dz_udsm_num_pkts_xmtd_rollover = -1;
+static int hf_ehs_dz_udsm_num_pkts_xmtd_rollover;
 
 
 static dissector_handle_t ehs_handle;
@@ -194,17 +194,17 @@ static dissector_handle_t ehs_handle;
 static dissector_handle_t ccsds_handle;
 
 /* Initialize the subtree pointers */
-static gint ett_ehs = -1;
-static gint ett_ehs_primary_header = -1;
-static gint ett_ehs_secondary_header = -1;
-static gint ett_ehs_data_zone = -1;
-static gint ett_ehs_cnt_time = -1;
-static gint ett_ehs_obt_time = -1;
-static gint ett_ehs_udsm_start_time = -1;
-static gint ett_ehs_udsm_stop_time = -1;
-static gint ett_ehs_ground_receipt_time = -1;
-static gint ett_ehs_major_frame = -1;
-static gint ett_ehs_minor_frame = -1;
+static gint ett_ehs;
+static gint ett_ehs_primary_header;
+static gint ett_ehs_secondary_header;
+static gint ett_ehs_data_zone;
+static gint ett_ehs_cnt_time;
+static gint ett_ehs_obt_time;
+static gint ett_ehs_udsm_start_time;
+static gint ett_ehs_udsm_stop_time;
+static gint ett_ehs_ground_receipt_time;
+static gint ett_ehs_major_frame;
+static gint ett_ehs_minor_frame;
 
 /* EHS protocol types */
 typedef enum EHS_Protocol_Type
diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c
index a2652b54e6..2728a30fc5 100644
--- a/epan/dissectors/packet-eigrp.c
+++ b/epan/dissectors/packet-eigrp.c
@@ -313,25 +313,25 @@ void proto_reg_handoff_eigrp(void);
 void proto_register_eigrp(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_eigrp = -1;
+static int proto_eigrp;
 
 /* header */
-static gint hf_eigrp_version = -1;
-static gint hf_eigrp_opcode = -1;
-static gint hf_eigrp_flags = -1;
-static gint hf_eigrp_sequence = -1;
-static gint hf_eigrp_acknowledge = -1;
-static gint hf_eigrp_vrid = -1;
-static gint hf_eigrp_as = -1;
-static gint ett_eigrp = -1;
+static gint hf_eigrp_version;
+static gint hf_eigrp_opcode;
+static gint hf_eigrp_flags;
+static gint hf_eigrp_sequence;
+static gint hf_eigrp_acknowledge;
+static gint hf_eigrp_vrid;
+static gint hf_eigrp_as;
+static gint ett_eigrp;
 
 /* packet header flags */
-static gint hf_eigrp_flags_init = -1;
-static gint hf_eigrp_flags_restart = -1;
-static gint hf_eigrp_flags_eot = -1;
-static gint hf_eigrp_flags_condrecv = -1;
+static gint hf_eigrp_flags_init;
+static gint hf_eigrp_flags_restart;
+static gint hf_eigrp_flags_eot;
+static gint hf_eigrp_flags_condrecv;
 
-static gint ett_eigrp_flags = -1;
+static gint ett_eigrp_flags;
 static int * const eigrp_flag_fields[] = {
     &hf_eigrp_flags_init,
     &hf_eigrp_flags_condrecv,
@@ -341,51 +341,51 @@ static int * const eigrp_flag_fields[] = {
 };
 
 /* tlv */
-static gint hf_eigrp_tlv_type = -1;
-static gint hf_eigrp_tlv_len = -1;
-static gint hf_eigrp_tid = -1;
-static gint hf_eigrp_afi = -1;
-static gint hf_eigrp_nullpad = -1;
+static gint hf_eigrp_tlv_type;
+static gint hf_eigrp_tlv_len;
+static gint hf_eigrp_tid;
+static gint hf_eigrp_afi;
+static gint hf_eigrp_nullpad;
 
-static gint ett_eigrp_tlv = -1;
-static gint ett_eigrp_tlv_metric = -1;
-static gint ett_eigrp_tlv_attr = -1;
-static gint ett_eigrp_tlv_extdata = -1;
+static gint ett_eigrp_tlv;
+static gint ett_eigrp_tlv_metric;
+static gint ett_eigrp_tlv_attr;
+static gint ett_eigrp_tlv_extdata;
 
 /* param */
-static gint hf_eigrp_par_k1 = -1;
-static gint hf_eigrp_par_k2 = -1;
-static gint hf_eigrp_par_k3 = -1;
-static gint hf_eigrp_par_k4 = -1;
-static gint hf_eigrp_par_k5 = -1;
-static gint hf_eigrp_par_k6 = -1;
-static gint hf_eigrp_par_holdtime = -1;
+static gint hf_eigrp_par_k1;
+static gint hf_eigrp_par_k2;
+static gint hf_eigrp_par_k3;
+static gint hf_eigrp_par_k4;
+static gint hf_eigrp_par_k5;
+static gint hf_eigrp_par_k6;
+static gint hf_eigrp_par_holdtime;
 
 /* auth */
-static gint hf_eigrp_auth_type = -1;
-static gint hf_eigrp_auth_len = -1;
-static gint hf_eigrp_auth_keyid = -1;
-static gint hf_eigrp_auth_keyseq = -1;
-static gint hf_eigrp_auth_digest = -1;
+static gint hf_eigrp_auth_type;
+static gint hf_eigrp_auth_len;
+static gint hf_eigrp_auth_keyid;
+static gint hf_eigrp_auth_keyseq;
+static gint hf_eigrp_auth_digest;
 
 /* seq */
-static gint hf_eigrp_seq_addrlen = -1;
-static gint hf_eigrp_seq_ipv4addr = -1;
-static gint hf_eigrp_seq_ipv6addr = -1;
+static gint hf_eigrp_seq_addrlen;
+static gint hf_eigrp_seq_ipv4addr;
+static gint hf_eigrp_seq_ipv6addr;
 
 /* multicast seq */
-static gint hf_eigrp_next_mcast_seq = -1;
+static gint hf_eigrp_next_mcast_seq;
 
 /* stub flags */
-static gint hf_eigrp_stub_flags = -1;
-static gint hf_eigrp_stub_flags_connected = -1;
-static gint hf_eigrp_stub_flags_static = -1;
-static gint hf_eigrp_stub_flags_summary = -1;
-static gint hf_eigrp_stub_flags_recvonly = -1;
-static gint hf_eigrp_stub_flags_redist = -1;
-static gint hf_eigrp_stub_flags_leakmap = -1;
-
-static gint ett_eigrp_stub_flags = -1;
+static gint hf_eigrp_stub_flags;
+static gint hf_eigrp_stub_flags_connected;
+static gint hf_eigrp_stub_flags_static;
+static gint hf_eigrp_stub_flags_summary;
+static gint hf_eigrp_stub_flags_recvonly;
+static gint hf_eigrp_stub_flags_redist;
+static gint hf_eigrp_stub_flags_leakmap;
+
+static gint ett_eigrp_stub_flags;
 static int * const eigrp_stub_flag_fields[] = {
     &hf_eigrp_stub_flags_connected,
     &hf_eigrp_stub_flags_static,
@@ -397,144 +397,144 @@ static int * const eigrp_stub_flag_fields[] = {
 };
 
 /* tid */
-static gint hf_eigrp_tidlist_tid = -1;
-static gint hf_eigrp_tidlist_flags = -1;
-static gint hf_eigrp_tidlist_len = -1;
-static gint ett_eigrp_tidlist = -1;
+static gint hf_eigrp_tidlist_tid;
+static gint hf_eigrp_tidlist_flags;
+static gint hf_eigrp_tidlist_len;
+static gint ett_eigrp_tidlist;
 
 /* 1.2 and 3.0 metric */
-static gint hf_eigrp_legacy_metric_delay = -1;
-static gint hf_eigrp_legacy_metric_bw = -1;
-static gint hf_eigrp_legacy_metric_mtu = -1;
-static gint hf_eigrp_legacy_metric_hopcount = -1;
-static gint hf_eigrp_legacy_metric_rel = -1;
-static gint hf_eigrp_legacy_metric_load = -1;
-static gint hf_eigrp_legacy_metric_intag = -1;
+static gint hf_eigrp_legacy_metric_delay;
+static gint hf_eigrp_legacy_metric_bw;
+static gint hf_eigrp_legacy_metric_mtu;
+static gint hf_eigrp_legacy_metric_hopcount;
+static gint hf_eigrp_legacy_metric_rel;
+static gint hf_eigrp_legacy_metric_load;
+static gint hf_eigrp_legacy_metric_intag;
 
 /* 3.0 metric */
-static gint hf_eigrp_legacy_metric_tag = -1;
+static gint hf_eigrp_legacy_metric_tag;
 
 /* 2.0 metric */
-static gint hf_eigrp_metric_offset = -1;
-static gint hf_eigrp_metric_priority = -1;
-static gint hf_eigrp_metric_rel = -1;
-static gint hf_eigrp_metric_load = -1;
-static gint hf_eigrp_metric_mtu = -1;
-static gint hf_eigrp_metric_hopcount = -1;
-static gint hf_eigrp_metric_reserved = -1;
+static gint hf_eigrp_metric_offset;
+static gint hf_eigrp_metric_priority;
+static gint hf_eigrp_metric_rel;
+static gint hf_eigrp_metric_load;
+static gint hf_eigrp_metric_mtu;
+static gint hf_eigrp_metric_hopcount;
+static gint hf_eigrp_metric_reserved;
 
 /* router id*/
-static gint hf_eigrp_routerid = -1;
+static gint hf_eigrp_routerid;
 
 /* protocol dependent module route flags */
-static gint hf_eigrp_metric_flags_srcwd = -1;
-static gint hf_eigrp_metric_flags_cd = -1;
-static gint hf_eigrp_metric_flags_active = -1;
-static gint hf_eigrp_metric_flags_repl = -1;
-static gint ett_eigrp_metric_flags = -1;
+static gint hf_eigrp_metric_flags_srcwd;
+static gint hf_eigrp_metric_flags_cd;
+static gint hf_eigrp_metric_flags_active;
+static gint hf_eigrp_metric_flags_repl;
+static gint ett_eigrp_metric_flags;
 
 /* extended metrics */
-static gint hf_eigrp_attr_opcode = -1;
-static gint hf_eigrp_attr_offset = -1;
-static gint hf_eigrp_attr_scaled = -1;
-static gint hf_eigrp_attr_tag = -1;
-static gint hf_eigrp_attr_jitter = -1;
-static gint hf_eigrp_attr_qenergy = -1;
-static gint hf_eigrp_attr_energy = -1;
+static gint hf_eigrp_attr_opcode;
+static gint hf_eigrp_attr_offset;
+static gint hf_eigrp_attr_scaled;
+static gint hf_eigrp_attr_tag;
+static gint hf_eigrp_attr_jitter;
+static gint hf_eigrp_attr_qenergy;
+static gint hf_eigrp_attr_energy;
 
 /* route external data */
-static gint hf_eigrp_extdata_origrid = -1;
-static gint hf_eigrp_extdata_as = -1;
-static gint hf_eigrp_extdata_tag = -1;
-static gint hf_eigrp_extdata_metric = -1;
-static gint hf_eigrp_extdata_reserved = -1;
-static gint hf_eigrp_extdata_proto = -1;
+static gint hf_eigrp_extdata_origrid;
+static gint hf_eigrp_extdata_as;
+static gint hf_eigrp_extdata_tag;
+static gint hf_eigrp_extdata_metric;
+static gint hf_eigrp_extdata_reserved;
+static gint hf_eigrp_extdata_proto;
 
-static gint hf_eigrp_extdata_flag_ext = -1;
-static gint hf_eigrp_extdata_flag_cd = -1;
-static gint ett_eigrp_extdata_flags = -1;
+static gint hf_eigrp_extdata_flag_ext;
+static gint hf_eigrp_extdata_flag_cd;
+static gint ett_eigrp_extdata_flags;
 
 /* ipv4 address */
-static gint hf_eigrp_ipv4_nexthop = -1;
-static gint hf_eigrp_ipv4_prefixlen = -1;
+static gint hf_eigrp_ipv4_nexthop;
+static gint hf_eigrp_ipv4_prefixlen;
 
 /* ipv6 address */
-static gint hf_eigrp_ipv6_nexthop = -1;
-static gint hf_eigrp_ipv6_prefixlen = -1;
+static gint hf_eigrp_ipv6_nexthop;
+static gint hf_eigrp_ipv6_prefixlen;
 
 /* ipx address */
-static gint hf_eigrp_ipx_nexthop_net = -1;
-static gint hf_eigrp_ipx_nexthop_host = -1;
-static gint hf_eigrp_ipx_extdata_routerid = -1;
-static gint hf_eigrp_ipx_extdata_delay = -1;
-static gint hf_eigrp_ipx_extdata_metric = -1;
-static gint hf_eigrp_ipx_dest = -1;
+static gint hf_eigrp_ipx_nexthop_net;
+static gint hf_eigrp_ipx_nexthop_host;
+static gint hf_eigrp_ipx_extdata_routerid;
+static gint hf_eigrp_ipx_extdata_delay;
+static gint hf_eigrp_ipx_extdata_metric;
+static gint hf_eigrp_ipx_dest;
 
 /* appletalk address */
-static gint hf_eigrp_atalk_routerid = -1;
+static gint hf_eigrp_atalk_routerid;
 
 /* SAF services */
-static gint hf_eigrp_saf_service = -1;
-static gint hf_eigrp_saf_subservice = -1;
-static gint hf_eigrp_saf_guid = -1;
-
-static gint hf_eigrp_saf_reachability_afi = -1;
-static gint hf_eigrp_saf_reachability_port = -1;
-static gint hf_eigrp_saf_reachability_protocol = -1;
-static gint hf_eigrp_saf_reachability_addr_ipv4 = -1;
-static gint hf_eigrp_saf_reachability_addr_ipv6 = -1;
-static gint hf_eigrp_saf_reachability_addr_hex = -1;
-static gint ett_eigrp_saf_reachability = -1;
-
-static gint hf_eigrp_saf_data_length = -1;
-static gint hf_eigrp_saf_data_sequence = -1;
-static gint hf_eigrp_saf_data_type = -1;
+static gint hf_eigrp_saf_service;
+static gint hf_eigrp_saf_subservice;
+static gint hf_eigrp_saf_guid;
+
+static gint hf_eigrp_saf_reachability_afi;
+static gint hf_eigrp_saf_reachability_port;
+static gint hf_eigrp_saf_reachability_protocol;
+static gint hf_eigrp_saf_reachability_addr_ipv4;
+static gint hf_eigrp_saf_reachability_addr_ipv6;
+static gint hf_eigrp_saf_reachability_addr_hex;
+static gint ett_eigrp_saf_reachability;
+
+static gint hf_eigrp_saf_data_length;
+static gint hf_eigrp_saf_data_sequence;
+static gint hf_eigrp_saf_data_type;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_eigrp_ipx_address = -1;
-static int hf_eigrp_release = -1;
-static int hf_eigrp_tlv_version = -1;
-static int hf_eigrp_ipv4_destination = -1;
-static int hf_eigrp_ipv6_destination = -1;
-static int hf_eigrp_appletalk_cable_range = -1;
-static int hf_eigrp_nexthop_address = -1;
-static int hf_eigrp_cable_range = -1;
-static int hf_eigrp_metric_delay = -1;
-static int hf_eigrp_metric_bandwidth = -1;
-static int hf_eigrp_checksum = -1;
-static int hf_eigrp_checksum_status = -1;
-static int hf_eigrp_metric_comm_type = -1;
-static int ett_metric_comm_type = -1;
-static int hf_eigrp_extcomm_eigrp_flag = -1;
-static int hf_eigrp_extcomm_eigrp_tag = -1;
-static int hf_eigrp_extcomm_eigrp_res = -1;
-static int hf_eigrp_extcomm_eigrp_rid = -1;
-static int hf_eigrp_extcomm_eigrp_as = -1;
-static int hf_eigrp_extcomm_eigrp_sdly = -1;
-static int hf_eigrp_extcomm_eigrp_rel = -1;
-static int hf_eigrp_extcomm_eigrp_hop = -1;
-static int hf_eigrp_extcomm_eigrp_sbw = -1;
-static int hf_eigrp_extcomm_eigrp_load = -1;
-static int hf_eigrp_extcomm_eigrp_mtu = -1;
-static int hf_eigrp_extcomm_eigrp_xas = -1;
-static int hf_eigrp_extcomm_eigrp_xrid = -1;
-static int hf_eigrp_extcomm_eigrp_xproto = -1;
-static int hf_eigrp_extcomm_eigrp_xmetric = -1;
-
-
-
-static expert_field ei_eigrp_checksum_bad = EI_INIT;
-static expert_field ei_eigrp_unreachable = EI_INIT;
-static expert_field ei_eigrp_seq_addrlen = EI_INIT;
-static expert_field ei_eigrp_peer_termination = EI_INIT;
-static expert_field ei_eigrp_tlv_type = EI_INIT;
-static expert_field ei_eigrp_auth_type = EI_INIT;
-static expert_field ei_eigrp_peer_termination_graceful = EI_INIT;
-static expert_field ei_eigrp_auth_len = EI_INIT;
-static expert_field ei_eigrp_tlv_len = EI_INIT;
-static expert_field ei_eigrp_afi = EI_INIT;
-static expert_field ei_eigrp_prefixlen = EI_INIT;
-static expert_field ei_eigrp_tlv_trunc = EI_INIT;
+static int hf_eigrp_ipx_address;
+static int hf_eigrp_release;
+static int hf_eigrp_tlv_version;
+static int hf_eigrp_ipv4_destination;
+static int hf_eigrp_ipv6_destination;
+static int hf_eigrp_appletalk_cable_range;
+static int hf_eigrp_nexthop_address;
+static int hf_eigrp_cable_range;
+static int hf_eigrp_metric_delay;
+static int hf_eigrp_metric_bandwidth;
+static int hf_eigrp_checksum;
+static int hf_eigrp_checksum_status;
+static int hf_eigrp_metric_comm_type;
+static int ett_metric_comm_type;
+static int hf_eigrp_extcomm_eigrp_flag;
+static int hf_eigrp_extcomm_eigrp_tag;
+static int hf_eigrp_extcomm_eigrp_res;
+static int hf_eigrp_extcomm_eigrp_rid;
+static int hf_eigrp_extcomm_eigrp_as;
+static int hf_eigrp_extcomm_eigrp_sdly;
+static int hf_eigrp_extcomm_eigrp_rel;
+static int hf_eigrp_extcomm_eigrp_hop;
+static int hf_eigrp_extcomm_eigrp_sbw;
+static int hf_eigrp_extcomm_eigrp_load;
+static int hf_eigrp_extcomm_eigrp_mtu;
+static int hf_eigrp_extcomm_eigrp_xas;
+static int hf_eigrp_extcomm_eigrp_xrid;
+static int hf_eigrp_extcomm_eigrp_xproto;
+static int hf_eigrp_extcomm_eigrp_xmetric;
+
+
+
+static expert_field ei_eigrp_checksum_bad;
+static expert_field ei_eigrp_unreachable;
+static expert_field ei_eigrp_seq_addrlen;
+static expert_field ei_eigrp_peer_termination;
+static expert_field ei_eigrp_tlv_type;
+static expert_field ei_eigrp_auth_type;
+static expert_field ei_eigrp_peer_termination_graceful;
+static expert_field ei_eigrp_auth_len;
+static expert_field ei_eigrp_tlv_len;
+static expert_field ei_eigrp_afi;
+static expert_field ei_eigrp_prefixlen;
+static expert_field ei_eigrp_tlv_trunc;
 
 /* some extra handle that might be needed */
 static dissector_handle_t ipxsap_handle = NULL;
diff --git a/epan/dissectors/packet-eiss.c b/epan/dissectors/packet-eiss.c
index 55d9a385c2..20db6c3539 100644
--- a/epan/dissectors/packet-eiss.c
+++ b/epan/dissectors/packet-eiss.c
@@ -21,68 +21,68 @@ void proto_reg_handoff_eiss(void);
 
 static dissector_handle_t eiss_handle;
 
-static int proto_eiss = -1;
+static int proto_eiss;
 
-static int hf_eiss_reserved2 = -1;
-static int hf_eiss_section_number = -1;
-static int hf_eiss_last_section_number = -1;
-static int hf_eiss_protocol_version_major = -1;
-static int hf_eiss_protocol_version_minor = -1;
-static int hf_eiss_application_type = -1;
+static int hf_eiss_reserved2;
+static int hf_eiss_section_number;
+static int hf_eiss_last_section_number;
+static int hf_eiss_protocol_version_major;
+static int hf_eiss_protocol_version_minor;
+static int hf_eiss_application_type;
 
 /* application_identifier() */
-static int hf_eiss_organisation_id = -1;
-static int hf_eiss_application_id = -1;
+static int hf_eiss_organisation_id;
+static int hf_eiss_application_id;
 
-static int hf_eiss_platform_id_length = -1;
+static int hf_eiss_platform_id_length;
 
 /* platform id information */
-static int hf_pdtHWManufacturer = -1;
-static int hf_pdtHWModel = -1;
-static int hf_pdtHWVersionMajor = -1;
-static int hf_pdtHWVersionMinor = -1;
-static int hf_pdtSWManufacturer = -1;
-static int hf_pdtSWModel = -1;
-static int hf_pdtSWVersionMajor = -1;
-static int hf_pdtSWVersionMinor = -1;
-static int hf_pdtProfile = -1;
+static int hf_pdtHWManufacturer;
+static int hf_pdtHWModel;
+static int hf_pdtHWVersionMajor;
+static int hf_pdtHWVersionMinor;
+static int hf_pdtSWManufacturer;
+static int hf_pdtSWModel;
+static int hf_pdtSWVersionMajor;
+static int hf_pdtSWVersionMinor;
+static int hf_pdtProfile;
 
 /* common to all eiss descriptors */
-static int hf_eiss_descriptor_tag = -1;
-static int hf_eiss_descriptor_length = -1;
+static int hf_eiss_descriptor_tag;
+static int hf_eiss_descriptor_length;
 
 /* application info descriptor */
-static int hf_eiss_aid_app_control_code = -1;
-static int hf_eiss_aid_app_version_major = -1;
-static int hf_eiss_aid_app_version_minor = -1;
-static int hf_eiss_aid_max_proto_version_major = -1;
-static int hf_eiss_aid_max_proto_version_minor = -1;
-static int hf_eiss_aid_test_flag = -1;
-static int hf_eiss_aid_reserved = -1;
-static int hf_eiss_aid_priority = -1;
-static int hf_eiss_irl_type = -1;
-static int hf_eiss_irl_length = -1;
-static int hf_eiss_irl_string = -1;
+static int hf_eiss_aid_app_control_code;
+static int hf_eiss_aid_app_version_major;
+static int hf_eiss_aid_app_version_minor;
+static int hf_eiss_aid_max_proto_version_major;
+static int hf_eiss_aid_max_proto_version_minor;
+static int hf_eiss_aid_test_flag;
+static int hf_eiss_aid_reserved;
+static int hf_eiss_aid_priority;
+static int hf_eiss_irl_type;
+static int hf_eiss_irl_length;
+static int hf_eiss_irl_string;
 
 /* media time descriptor */
-static int hf_eiss_mtd_time_value = -1;
+static int hf_eiss_mtd_time_value;
 
 /* stream event descriptor */
-static int hf_eiss_sed_time_value = -1;
-static int hf_eiss_sed_reserved = -1;
-static int hf_eiss_sed_descriptor_length = -1;
-
-static gint ett_eiss = -1;
-static gint ett_eiss_platform_id = -1;
-static gint ett_eiss_desc = -1;
-
-static expert_field ei_eiss_platform_id_length = EI_INIT;
-static expert_field ei_eiss_invalid_section_length = EI_INIT;
-static expert_field ei_eiss_invalid_section_syntax_indicator = EI_INIT;
-static expert_field ei_eiss_unknown_descriptor = EI_INIT;
-static expert_field ei_eiss_section_number = EI_INIT;
-static expert_field ei_eiss_application_type = EI_INIT;
-static expert_field ei_eiss_invalid_reserved_bits = EI_INIT;
+static int hf_eiss_sed_time_value;
+static int hf_eiss_sed_reserved;
+static int hf_eiss_sed_descriptor_length;
+
+static gint ett_eiss;
+static gint ett_eiss_platform_id;
+static gint ett_eiss_desc;
+
+static expert_field ei_eiss_platform_id_length;
+static expert_field ei_eiss_invalid_section_length;
+static expert_field ei_eiss_invalid_section_syntax_indicator;
+static expert_field ei_eiss_unknown_descriptor;
+static expert_field ei_eiss_section_number;
+static expert_field ei_eiss_application_type;
+static expert_field ei_eiss_invalid_reserved_bits;
 
 #define MPEG_SECT_SYNTAX_INDICATOR_MASK	0x8000
 #define MPEG_SECT_RESERVED_MASK		0x7000
diff --git a/epan/dissectors/packet-elasticsearch.c b/epan/dissectors/packet-elasticsearch.c
index 35f1ad4e85..686b281d02 100644
--- a/epan/dissectors/packet-elasticsearch.c
+++ b/epan/dissectors/packet-elasticsearch.c
@@ -55,56 +55,56 @@ void proto_reg_handoff_elasticsearch(void);
 static dissector_handle_t elasticsearch_handle_binary;
 static dissector_handle_t elasticsearch_zen_handle;
 
-static int proto_elasticsearch = -1;
+static int proto_elasticsearch;
 
 /* Fields */
-static int hf_elasticsearch_internal_header = -1;
-static int hf_elasticsearch_version = -1;
-static int hf_elasticsearch_ping_request_id = -1;
-static int hf_elasticsearch_cluster_name= -1;
-static int hf_elasticsearch_node_name = -1;
-static int hf_elasticsearch_node_id = -1;
-static int hf_elasticsearch_host_name = -1;
-static int hf_elasticsearch_host_address = -1;
-static int hf_elasticsearch_address_type = -1;
-static int hf_elasticsearch_address_format = -1;
-static int hf_elasticsearch_address_name = -1;
-static int hf_elasticsearch_address_length = -1;
-static int hf_elasticsearch_address_ipv4 = -1;
-static int hf_elasticsearch_address_ipv6 = -1;
-static int hf_elasticsearch_address_ipv6_scope_id = -1;
-static int hf_elasticsearch_attributes_length = -1;
-static int hf_elasticsearch_address_port = -1;
-static int hf_elasticsearch_header_token = -1;
-static int hf_elasticsearch_header_message_length = -1;
-static int hf_elasticsearch_header_request_id = -1;
-static int hf_elasticsearch_header_status_flags = -1;
-static int hf_elasticsearch_header_status_flags_message_type = -1;
-static int hf_elasticsearch_header_status_flags_error = -1;
-static int hf_elasticsearch_header_status_flags_compression = -1;
-static int hf_elasticsearch_header_size = -1;
-static int hf_elasticsearch_header_request = -1;
-static int hf_elasticsearch_header_response = -1;
-static int hf_elasticsearch_header_key = -1;
-static int hf_elasticsearch_header_value = -1;
-
-static int hf_elasticsearch_feature = -1;
-static int hf_elasticsearch_action = -1;
-static int hf_elasticsearch_data = -1;
-static int hf_elasticsearch_data_compressed = -1;
+static int hf_elasticsearch_internal_header;
+static int hf_elasticsearch_version;
+static int hf_elasticsearch_ping_request_id;
+static int hf_elasticsearch_cluster_name;
+static int hf_elasticsearch_node_name;
+static int hf_elasticsearch_node_id;
+static int hf_elasticsearch_host_name;
+static int hf_elasticsearch_host_address;
+static int hf_elasticsearch_address_type;
+static int hf_elasticsearch_address_format;
+static int hf_elasticsearch_address_name;
+static int hf_elasticsearch_address_length;
+static int hf_elasticsearch_address_ipv4;
+static int hf_elasticsearch_address_ipv6;
+static int hf_elasticsearch_address_ipv6_scope_id;
+static int hf_elasticsearch_attributes_length;
+static int hf_elasticsearch_address_port;
+static int hf_elasticsearch_header_token;
+static int hf_elasticsearch_header_message_length;
+static int hf_elasticsearch_header_request_id;
+static int hf_elasticsearch_header_status_flags;
+static int hf_elasticsearch_header_status_flags_message_type;
+static int hf_elasticsearch_header_status_flags_error;
+static int hf_elasticsearch_header_status_flags_compression;
+static int hf_elasticsearch_header_size;
+static int hf_elasticsearch_header_request;
+static int hf_elasticsearch_header_response;
+static int hf_elasticsearch_header_key;
+static int hf_elasticsearch_header_value;
+
+static int hf_elasticsearch_feature;
+static int hf_elasticsearch_action;
+static int hf_elasticsearch_data;
+static int hf_elasticsearch_data_compressed;
 
 /* Expert info */
-static expert_field ei_elasticsearch_unsupported_version = EI_INIT;
-static expert_field ei_elasticsearch_unsupported_address_format = EI_INIT;
-static expert_field ei_elasticsearch_unsupported_address_type = EI_INIT;
+static expert_field ei_elasticsearch_unsupported_version;
+static expert_field ei_elasticsearch_unsupported_address_format;
+static expert_field ei_elasticsearch_unsupported_address_type;
 
 
 /* Trees */
-static gint ett_elasticsearch = -1;
-static gint ett_elasticsearch_address = -1;
-static gint ett_elasticsearch_discovery_node = -1;
-static gint ett_elasticsearch_status_flags = -1;
-static gint ett_elasticsearch_header = -1;
+static gint ett_elasticsearch;
+static gint ett_elasticsearch_address;
+static gint ett_elasticsearch_discovery_node;
+static gint ett_elasticsearch_status_flags;
+static gint ett_elasticsearch_header;
 
 /* Forward declarations */
 static int dissect_elasticsearch_zen_ping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data);
diff --git a/epan/dissectors/packet-elcom.c b/epan/dissectors/packet-elcom.c
index 864619268d..0ead6432dc 100644
--- a/epan/dissectors/packet-elcom.c
+++ b/epan/dissectors/packet-elcom.c
@@ -49,53 +49,53 @@ void proto_reg_handoff_elcom(void);
 
 static dissector_handle_t elcom_handle;
 
-static int proto_elcom = -1;
-static int hf_elcom_response = -1;
-static int hf_elcom_request = -1;
-
-static int hf_elcom_length = -1;
-static int hf_elcom_type = -1;
-
-static int hf_elcom_initiator = -1;
-static int hf_elcom_initiator_endian = -1;
-static int hf_elcom_initiator_ip = -1;
-static int hf_elcom_initiator_port = -1;
-static int hf_elcom_initiator_suff = -1;
-
-static int hf_elcom_responder = -1;
-static int hf_elcom_responder_endian = -1;
-static int hf_elcom_responder_ip = -1;
-static int hf_elcom_responder_port = -1;
-static int hf_elcom_responder_suff = -1;
-
-static int hf_elcom_userdata = -1;
-static int hf_elcom_userdata_length = -1;
-static int hf_elcom_userdata_pduid = -1;
-static int hf_elcom_userdata_version = -1;
-static int hf_elcom_userdata_result = -1;
-static int hf_elcom_userdata_restmark = -1;
-static int hf_elcom_userdata_cf = -1;
-
-static int hf_elcom_datarequest = -1;
-static int hf_elcom_datarequest_grouptype = -1;
-static int hf_elcom_datarequest_result = -1;
-static int hf_elcom_datarequest_groupnumber = -1;
-static int hf_elcom_datarequest_grouppriority = -1;
-static int hf_elcom_datarequest_groupsize = -1;
-static int hf_elcom_datarequest_groupindex1 = -1;
-static int hf_elcom_datarequest_groupindex2 = -1;
-static int hf_elcom_datarequest_oid = -1;
-
-static int hf_elcom_release_reason = -1;
-static int hf_elcom_release_result = -1;
-
-static int hf_elcom_strangeleftover = -1;
-
-static gint ett_elcom = -1;
-static gint ett_elcom_initiator = -1;
-static gint ett_elcom_responder = -1;
-static gint ett_elcom_userdata = -1;
-static gint ett_elcom_datarequest = -1;
+static int proto_elcom;
+static int hf_elcom_response;
+static int hf_elcom_request;
+
+static int hf_elcom_length;
+static int hf_elcom_type;
+
+static int hf_elcom_initiator;
+static int hf_elcom_initiator_endian;
+static int hf_elcom_initiator_ip;
+static int hf_elcom_initiator_port;
+static int hf_elcom_initiator_suff;
+
+static int hf_elcom_responder;
+static int hf_elcom_responder_endian;
+static int hf_elcom_responder_ip;
+static int hf_elcom_responder_port;
+static int hf_elcom_responder_suff;
+
+static int hf_elcom_userdata;
+static int hf_elcom_userdata_length;
+static int hf_elcom_userdata_pduid;
+static int hf_elcom_userdata_version;
+static int hf_elcom_userdata_result;
+static int hf_elcom_userdata_restmark;
+static int hf_elcom_userdata_cf;
+
+static int hf_elcom_datarequest;
+static int hf_elcom_datarequest_grouptype;
+static int hf_elcom_datarequest_result;
+static int hf_elcom_datarequest_groupnumber;
+static int hf_elcom_datarequest_grouppriority;
+static int hf_elcom_datarequest_groupsize;
+static int hf_elcom_datarequest_groupindex1;
+static int hf_elcom_datarequest_groupindex2;
+static int hf_elcom_datarequest_oid;
+
+static int hf_elcom_release_reason;
+static int hf_elcom_release_result;
+
+static int hf_elcom_strangeleftover;
+
+static gint ett_elcom;
+static gint ett_elcom_initiator;
+static gint ett_elcom_responder;
+static gint ett_elcom_userdata;
+static gint ett_elcom_datarequest;
 
 static gboolean elcom_show_hex = TRUE;
 
diff --git a/epan/dissectors/packet-elmi.c b/epan/dissectors/packet-elmi.c
index 6b6ae84b30..2e8bfdef3f 100644
--- a/epan/dissectors/packet-elmi.c
+++ b/epan/dissectors/packet-elmi.c
@@ -21,58 +21,58 @@
 #include <epan/etypes.h>
 
 
-static int proto_elmi = -1;
+static int proto_elmi;
 
 void proto_register_elmi(void);
 void proto_reg_handoff_elmi(void);
 
 static dissector_handle_t elmi_handle;
 
-static gint ett_elmi = -1;
-static gint ett_elmi_info_elem = -1;
-static gint ett_elmi_sub_info_elem = -1;
-
-static int hf_elmi_ver = -1;
-static int hf_elmi_msg_type = -1;
-static int hf_elmi_info_elem = -1;
-static int hf_elmi_info_elem_len = -1;
-static int hf_elmi_report_type = -1;
-static int hf_elmi_snd_seq_num = -1;
-static int hf_elmi_rcv_seq_num = -1;
-static int hf_elmi_dat_inst = -1;
-static int hf_elmi_reserved = -1;
-static int hf_elmi_uni_status = -1;
-static int hf_elmi_evc_refid = -1;
-static int hf_elmi_evc_status = -1;
-static int hf_last_ie = -1;
-static int hf_map_seq = -1;
-static int hf_priority = -1;
-static int hf_default_evc = -1;
-static int hf_elmi_sub_info_elem = -1;
-static int hf_elmi_sub_info_elem_len = -1;
-static int hf_elmi_uni_id = -1;
-static int hf_elmi_evc_type = -1;
-static int hf_elmi_evc_id = -1;
-static int hf_elmi_ce_vlan_id = -1;
-static int hf_elmi_sub_info_color_mode_flag = -1;
-static int hf_elmi_sub_info_coupling_flag = -1;
-static int hf_elmi_sub_info_per_cos_bit = -1;
-static int hf_elmi_sub_cir_magnitude = -1;
-static int hf_elmi_sub_cir_multiplier = -1;
-static int hf_elmi_sub_cbs_magnitude = -1;
-static int hf_elmi_sub_cbs_multiplier = -1;
-static int hf_elmi_sub_eir_magnitude = -1;
-static int hf_elmi_sub_eir_multiplier = -1;
-static int hf_elmi_sub_ebs_magnitude = -1;
-static int hf_elmi_sub_ebs_multiplier = -1;
-static int hf_elmi_sub_user_prio_0 = -1;
-static int hf_elmi_sub_user_prio_1 = -1;
-static int hf_elmi_sub_user_prio_2 = -1;
-static int hf_elmi_sub_user_prio_3 = -1;
-static int hf_elmi_sub_user_prio_4 = -1;
-static int hf_elmi_sub_user_prio_5 = -1;
-static int hf_elmi_sub_user_prio_6 = -1;
-static int hf_elmi_sub_user_prio_7 = -1;
+static gint ett_elmi;
+static gint ett_elmi_info_elem;
+static gint ett_elmi_sub_info_elem;
+
+static int hf_elmi_ver;
+static int hf_elmi_msg_type;
+static int hf_elmi_info_elem;
+static int hf_elmi_info_elem_len;
+static int hf_elmi_report_type;
+static int hf_elmi_snd_seq_num;
+static int hf_elmi_rcv_seq_num;
+static int hf_elmi_dat_inst;
+static int hf_elmi_reserved;
+static int hf_elmi_uni_status;
+static int hf_elmi_evc_refid;
+static int hf_elmi_evc_status;
+static int hf_last_ie;
+static int hf_map_seq;
+static int hf_priority;
+static int hf_default_evc;
+static int hf_elmi_sub_info_elem;
+static int hf_elmi_sub_info_elem_len;
+static int hf_elmi_uni_id;
+static int hf_elmi_evc_type;
+static int hf_elmi_evc_id;
+static int hf_elmi_ce_vlan_id;
+static int hf_elmi_sub_info_color_mode_flag;
+static int hf_elmi_sub_info_coupling_flag;
+static int hf_elmi_sub_info_per_cos_bit;
+static int hf_elmi_sub_cir_magnitude;
+static int hf_elmi_sub_cir_multiplier;
+static int hf_elmi_sub_cbs_magnitude;
+static int hf_elmi_sub_cbs_multiplier;
+static int hf_elmi_sub_eir_magnitude;
+static int hf_elmi_sub_eir_multiplier;
+static int hf_elmi_sub_ebs_magnitude;
+static int hf_elmi_sub_ebs_multiplier;
+static int hf_elmi_sub_user_prio_0;
+static int hf_elmi_sub_user_prio_1;
+static int hf_elmi_sub_user_prio_2;
+static int hf_elmi_sub_user_prio_3;
+static int hf_elmi_sub_user_prio_4;
+static int hf_elmi_sub_user_prio_5;
+static int hf_elmi_sub_user_prio_6;
+static int hf_elmi_sub_user_prio_7;
 
 static const value_string elmi_msg_type[] = {
     { 0x75, "Status enquiry" },
diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c
index 9268a4d711..08d6dc5b25 100644
--- a/epan/dissectors/packet-enc.c
+++ b/epan/dissectors/packet-enc.c
@@ -38,18 +38,18 @@ struct enchdr {
 static dissector_table_t enc_dissector_table;
 
 /* header fields */
-static int proto_enc = -1;
-static int hf_enc_af = -1;
-static int hf_enc_spi = -1;
-static int hf_enc_flags = -1;
-static int hf_enc_flags_payload_enc = -1;
-static int hf_enc_flags_payload_auth = -1;
-static int hf_enc_flags_payload_compress = -1;
-static int hf_enc_flags_header_auth = -1;
-static int hf_enc_flags_reserved = -1;
-
-static gint ett_enc = -1;
-static gint ett_enc_flag = -1;
+static int proto_enc;
+static int hf_enc_af;
+static int hf_enc_spi;
+static int hf_enc_flags;
+static int hf_enc_flags_payload_enc;
+static int hf_enc_flags_payload_auth;
+static int hf_enc_flags_payload_compress;
+static int hf_enc_flags_header_auth;
+static int hf_enc_flags_reserved;
+
+static gint ett_enc;
+static gint ett_enc_flag;
 
 static gboolean
 capture_enc(const guchar *pd, int offset _U_, int len, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header)
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index 11e5e37dc3..7f27d6b6b5 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -90,347 +90,347 @@ void proto_reg_handoff_enip(void);
 #define CPF_ITEM_UNCONNECTED_MSG_DTLS 0x8003
 
 /* Initialize the protocol and registered fields */
-static int proto_enip = -1;
-static int proto_cipio = -1;
-static int proto_cip_class1 = -1;
-
-static int hf_enip_command = -1;
-static int hf_enip_length = -1;
-static int hf_enip_options = -1;
-static int hf_enip_sendercontex = -1;
-static int hf_enip_listid_delay = -1;
-static int hf_enip_status = -1;
-static int hf_enip_session = -1;
-static int hf_enip_encapver = -1;
-static int hf_enip_sinfamily = -1;
-static int hf_enip_sinport = -1;
-static int hf_enip_sinaddr = -1;
-static int hf_enip_sinzero = -1;
-static int hf_enip_timeout = -1;
-static int hf_enip_encap_data = -1;
-
-static int hf_enip_lir_vendor = -1;
-static int hf_enip_lir_devtype = -1;
-static int hf_enip_lir_prodcode = -1;
-static int hf_enip_lir_revision = -1;
-static int hf_enip_lir_status = -1;
-static int hf_enip_lir_serial = -1;
-static int hf_enip_lir_namelen = -1;
-static int hf_enip_lir_name = -1;
-static int hf_enip_lir_state = -1;
-
-static int hf_enip_lsr_capaflags = -1;
-static int hf_enip_lsr_tcp = -1;
-static int hf_enip_lsr_udp = -1;
-static int hf_enip_lsr_servicename = -1;
-
-static int hf_enip_rs_version = -1;
-static int hf_enip_rs_optionflags = -1;
-
-static int hf_enip_security_profiles = -1;
-static int hf_enip_security_profiles_eip_integrity = -1;
-static int hf_enip_security_profiles_eip_confidentiality = -1;
-static int hf_enip_security_profiles_cip_authorization = -1;
-static int hf_enip_security_profiles_cip_user_authentication = -1;
-static int hf_enip_security_profiles_resource_constrained = -1;
-static int hf_enip_security_profiles_reserved = -1;
-static int hf_enip_cip_security_state = -1;
-static int hf_enip_eip_security_state = -1;
-static int hf_enip_iana_port_state_flags = -1;
-static int hf_enip_iana_port_state_flags_tcp_44818 = -1;
-static int hf_enip_iana_port_state_flags_udp_44818 = -1;
-static int hf_enip_iana_port_state_flags_udp_2222 = -1;
-static int hf_enip_iana_port_state_flags_tcp_2221 = -1;
-static int hf_enip_iana_port_state_flags_udp_2221 = -1;
-static int hf_enip_iana_port_state_flags_reserved = -1;
-
-static int hf_enip_srrd_ifacehnd = -1;
-
-static int hf_enip_sud_ifacehnd = -1;
-
-static int hf_enip_cpf_itemcount = -1;
-static int hf_enip_cpf_typeid = -1;
-static int hf_enip_cpf_length = -1;
-static int hf_cip_sequence_count = -1;
-static int hf_cip_cm_ot_api = -1;
-static int hf_cip_cm_to_api = -1;
-static int hf_enip_cpf_cai_connid = -1;
-static int hf_enip_cpf_sai_connid = -1;
-static int hf_cip_connid = -1;
-static int hf_enip_cpf_sai_seqnum = -1;
-static int hf_enip_cpf_ucmm_request = -1;
-static int hf_enip_cpf_ucmm_msg_type = -1;
-static int hf_enip_cpf_ucmm_trans_id = -1;
-static int hf_enip_cpf_ucmm_status = -1;
-
-static int hf_enip_cpf_data = -1;
-
-static int hf_enip_response_in = -1;
-static int hf_enip_response_to = -1;
-static int hf_enip_time = -1;
-static int hf_enip_fwd_open_in = -1;
-static int hf_cip_connection = -1;
-static int hf_cip_io_data = -1;
+static int proto_enip;
+static int proto_cipio;
+static int proto_cip_class1;
+
+static int hf_enip_command;
+static int hf_enip_length;
+static int hf_enip_options;
+static int hf_enip_sendercontex;
+static int hf_enip_listid_delay;
+static int hf_enip_status;
+static int hf_enip_session;
+static int hf_enip_encapver;
+static int hf_enip_sinfamily;
+static int hf_enip_sinport;
+static int hf_enip_sinaddr;
+static int hf_enip_sinzero;
+static int hf_enip_timeout;
+static int hf_enip_encap_data;
+
+static int hf_enip_lir_vendor;
+static int hf_enip_lir_devtype;
+static int hf_enip_lir_prodcode;
+static int hf_enip_lir_revision;
+static int hf_enip_lir_status;
+static int hf_enip_lir_serial;
+static int hf_enip_lir_namelen;
+static int hf_enip_lir_name;
+static int hf_enip_lir_state;
+
+static int hf_enip_lsr_capaflags;
+static int hf_enip_lsr_tcp;
+static int hf_enip_lsr_udp;
+static int hf_enip_lsr_servicename;
+
+static int hf_enip_rs_version;
+static int hf_enip_rs_optionflags;
+
+static int hf_enip_security_profiles;
+static int hf_enip_security_profiles_eip_integrity;
+static int hf_enip_security_profiles_eip_confidentiality;
+static int hf_enip_security_profiles_cip_authorization;
+static int hf_enip_security_profiles_cip_user_authentication;
+static int hf_enip_security_profiles_resource_constrained;
+static int hf_enip_security_profiles_reserved;
+static int hf_enip_cip_security_state;
+static int hf_enip_eip_security_state;
+static int hf_enip_iana_port_state_flags;
+static int hf_enip_iana_port_state_flags_tcp_44818;
+static int hf_enip_iana_port_state_flags_udp_44818;
+static int hf_enip_iana_port_state_flags_udp_2222;
+static int hf_enip_iana_port_state_flags_tcp_2221;
+static int hf_enip_iana_port_state_flags_udp_2221;
+static int hf_enip_iana_port_state_flags_reserved;
+
+static int hf_enip_srrd_ifacehnd;
+
+static int hf_enip_sud_ifacehnd;
+
+static int hf_enip_cpf_itemcount;
+static int hf_enip_cpf_typeid;
+static int hf_enip_cpf_length;
+static int hf_cip_sequence_count;
+static int hf_cip_cm_ot_api;
+static int hf_cip_cm_to_api;
+static int hf_enip_cpf_cai_connid;
+static int hf_enip_cpf_sai_connid;
+static int hf_cip_connid;
+static int hf_enip_cpf_sai_seqnum;
+static int hf_enip_cpf_ucmm_request;
+static int hf_enip_cpf_ucmm_msg_type;
+static int hf_enip_cpf_ucmm_trans_id;
+static int hf_enip_cpf_ucmm_status;
+
+static int hf_enip_cpf_data;
+
+static int hf_enip_response_in;
+static int hf_enip_response_to;
+static int hf_enip_time;
+static int hf_enip_fwd_open_in;
+static int hf_cip_connection;
+static int hf_cip_io_data;
 
 /* Parsed Attributes */
-static int hf_tcpip_status = -1;
-static int hf_tcpip_status_interface_config = -1;
-static int hf_tcpip_status_mcast_pending = -1;
-static int hf_tcpip_status_interface_config_pending = -1;
-static int hf_tcpip_status_acd = -1;
-static int hf_tcpip_acd_fault = -1;
-static int hf_tcpip_status_iana_port_admin_change = -1;
-static int hf_tcpip_status_iana_protocol_admin_change = -1;
-static int hf_tcpip_status_reserved = -1;
-static int hf_tcpip_config_cap = -1;
-static int hf_tcpip_config_cap_bootp = -1;
-static int hf_tcpip_config_cap_dns = -1;
-static int hf_tcpip_config_cap_dhcp = -1;
-static int hf_tcpip_config_cap_dhcp_dns_update = -1;
-static int hf_tcpip_config_cap_config_settable = -1;
-static int hf_tcpip_config_cap_hardware_config = -1;
-static int hf_tcpip_config_cap_interface_reset = -1;
-static int hf_tcpip_config_cap_acd = -1;
-static int hf_tcpip_config_cap_reserved = -1;
-static int hf_tcpip_config_control = -1;
-static int hf_tcpip_config_control_config = -1;
-static int hf_tcpip_config_control_dns = -1;
-static int hf_tcpip_config_control_reserved = -1;
-static int hf_tcpip_ic_ip_addr = -1;
-static int hf_tcpip_ic_subnet_mask = -1;
-static int hf_tcpip_ic_gateway = -1;
-static int hf_tcpip_ic_name_server = -1;
-static int hf_tcpip_ic_name_server2 = -1;
-static int hf_tcpip_ic_domain_name = -1;
-static int hf_tcpip_hostname = -1;
-static int hf_tcpip_snn_timestamp = -1;
-static int hf_tcpip_snn_date = -1;
-static int hf_tcpip_snn_time = -1;
-static int hf_tcpip_ttl_value = -1;
-static int hf_tcpip_mcast_alloc = -1;
-static int hf_tcpip_mcast_reserved = -1;
-static int hf_tcpip_mcast_num_mcast = -1;
-static int hf_tcpip_mcast_addr_start = -1;
-static int hf_tcpip_lcd_acd_activity = -1;
-static int hf_tcpip_lcd_remote_mac = -1;
-static int hf_tcpip_lcd_arp_pdu = -1;
-static int hf_tcpip_select_acd = -1;
-static int hf_tcpip_quick_connect = -1;
-static int hf_tcpip_encap_inactivity = -1;
-
-static int hf_tcpip_port_count = -1;
-static int hf_tcpip_port_name = -1;
-static int hf_tcpip_port_number = -1;
-static int hf_tcpip_port_protocol = -1;
-static int hf_tcpip_port_admin_state = -1;
-static int hf_tcpip_port_admin_capability = -1;
-static int hf_tcpip_admin_capability_configurable = -1;
-static int hf_tcpip_admin_capability_reset_required = -1;
-static int hf_tcpip_admin_capability_reserved = -1;
-
-static int hf_elink_interface_flags = -1;
-static int hf_elink_iflags_link_status = -1;
-static int hf_elink_iflags_duplex = -1;
-static int hf_elink_iflags_neg_status = -1;
-static int hf_elink_iflags_manual_reset = -1;
-static int hf_elink_iflags_local_hw_fault = -1;
-static int hf_elink_iflags_reserved = -1;
-static int hf_elink_interface_speed = -1;
-static int hf_elink_physical_address = -1;
-static int hf_elink_icount_in_octets = -1;
-static int hf_elink_icount_in_ucast = -1;
-static int hf_elink_icount_in_nucast = -1;
-static int hf_elink_icount_in_discards = -1;
-static int hf_elink_icount_in_errors = -1;
-static int hf_elink_icount_in_unknown_protos = -1;
-static int hf_elink_icount_out_octets = -1;
-static int hf_elink_icount_out_ucast = -1;
-static int hf_elink_icount_out_nucast = -1;
-static int hf_elink_icount_out_discards = -1;
-static int hf_elink_icount_out_errors = -1;
-static int hf_elink_mcount_alignment_errors = -1;
-static int hf_elink_mcount_fcs_errors = -1;
-static int hf_elink_mcount_single_collisions = -1;
-static int hf_elink_mcount_multiple_collisions = -1;
-static int hf_elink_mcount_sqe_test_errors = -1;
-static int hf_elink_mcount_deferred_transmission = -1;
-static int hf_elink_mcount_late_collisions = -1;
-static int hf_elink_mcount_excessive_collisions = -1;
-static int hf_elink_mcount_mac_transmit_errors = -1;
-static int hf_elink_mcount_carrier_sense_errors = -1;
-static int hf_elink_mcount_frame_too_long = -1;
-static int hf_elink_mcount_mac_receive_errors = -1;
-static int hf_elink_icontrol_control_bits = -1;
-static int hf_elink_icontrol_control_bits_auto_neg = -1;
-static int hf_elink_icontrol_control_bits_forced_duplex = -1;
-static int hf_elink_icontrol_control_bits_reserved = -1;
-static int hf_elink_icontrol_forced_speed = -1;
-static int hf_elink_icapability_capability_bits = -1;
-static int hf_elink_icapability_capability_bits_manual = -1;
-static int hf_elink_icapability_capability_bits_auto_neg = -1;
-static int hf_elink_icapability_capability_bits_auto_mdix = -1;
-static int hf_elink_icapability_capability_bits_manual_speed = -1;
-static int hf_elink_icapability_capability_speed_duplex_array_count = -1;
-static int hf_elink_icapability_capability_speed = -1;
-static int hf_elink_icapability_capability_duplex = -1;
-static int hf_elink_interface_type = -1;
-static int hf_elink_interface_state = -1;
-static int hf_elink_admin_state = -1;
-static int hf_elink_interface_label = -1;
-static int hf_elink_hc_icount_in_octets = -1;
-static int hf_elink_hc_icount_in_ucast = -1;
-static int hf_elink_hc_icount_in_mcast = -1;
-static int hf_elink_hc_icount_in_broadcast = -1;
-static int hf_elink_hc_icount_out_octets = -1;
-static int hf_elink_hc_icount_out_ucast = -1;
-static int hf_elink_hc_icount_out_mcast = -1;
-static int hf_elink_hc_icount_out_broadcast = -1;
-
-static int hf_elink_hc_mcount_stats_align_errors = -1;
-static int hf_elink_hc_mcount_stats_fcs_errors = -1;
-static int hf_elink_hc_mcount_stats_internal_mac_transmit_errors = -1;
-static int hf_elink_hc_mcount_stats_frame_too_long = -1;
-static int hf_elink_hc_mcount_stats_internal_mac_receive_errors = -1;
-static int hf_elink_hc_mcount_stats_symbol_errors = -1;
-
-static int hf_qos_8021q_enable = -1;
-static int hf_qos_dscp_ptp_event = -1;
-static int hf_qos_dscp_ptp_general = -1;
-static int hf_qos_dscp_urgent = -1;
-static int hf_qos_dscp_scheduled = -1;
-static int hf_qos_dscp_high = -1;
-static int hf_qos_dscp_low = -1;
-static int hf_qos_dscp_explicit = -1;
-
-static int hf_dlr_network_topology = -1;
-static int hf_dlr_network_status = -1;
-static int hf_dlr_ring_supervisor_status = -1;
-static int hf_dlr_rsc_ring_supervisor_enable = -1;
-static int hf_dlr_rsc_ring_supervisor_precedence = -1;
-static int hf_dlr_rsc_beacon_interval = -1;
-static int hf_dlr_rsc_beacon_timeout = -1;
-static int hf_dlr_rsc_dlr_vlan_id = -1;
-static int hf_dlr_ring_faults_count = -1;
-static int hf_dlr_lanp1_dev_ip_addr = -1;
-static int hf_dlr_lanp1_dev_physical_address = -1;
-static int hf_dlr_lanp2_dev_ip_addr = -1;
-static int hf_dlr_lanp2_dev_physical_address = -1;
-static int hf_dlr_ring_protocol_participants_count = -1;
-static int hf_dlr_rppl_dev_ip_addr = -1;
-static int hf_dlr_rppl_dev_physical_address = -1;
-static int hf_dlr_asa_supervisor_ip_addr = -1;
-static int hf_dlr_asa_supervisor_physical_address = -1;
-static int hf_dlr_active_supervisor_precedence = -1;
-static int hf_dlr_capability_flags = -1;
-static int hf_dlr_capflags_announce_base_node = -1;
-static int hf_dlr_capflags_beacon_base_node = -1;
-static int hf_dlr_capflags_reserved1 = -1;
-static int hf_dlr_capflags_supervisor_capable = -1;
-static int hf_dlr_capflags_reserved2 = -1;
-static int hf_dlr_capflags_redundant_gateway_capable = -1;
-static int hf_dlr_capflags_flush_frame_capable = -1;
-static int hf_dlr_rgc_red_gateway_enable = -1;
-static int hf_dlr_rgc_gateway_precedence = -1;
-static int hf_dlr_rgc_advertise_interval = -1;
-static int hf_dlr_rgc_advertise_timeout = -1;
-static int hf_dlr_rgc_learning_update_enable = -1;
-static int hf_dlr_redundant_gateway_status = -1;
-static int hf_dlr_aga_ip_addr = -1;
-static int hf_dlr_aga_physical_address = -1;
-static int hf_dlr_active_gateway_precedence = -1;
-
-static int hf_cip_security_state = -1;
-static int hf_eip_security_state = -1;
-static int hf_eip_security_verify_client_cert = -1;
-static int hf_eip_security_send_cert_chain = -1;
-static int hf_eip_security_check_expiration = -1;
-static int hf_eip_security_capability_flags = -1;
-static int hf_eip_security_capflags_secure_renegotiation = -1;
-static int hf_eip_security_capflags_reserved = -1;
-static int hf_eip_security_num_avail_cipher_suites = -1;
-static int hf_eip_security_avail_cipher_suite = -1;
-static int hf_eip_security_num_allow_cipher_suites = -1;
-static int hf_eip_security_allow_cipher_suite = -1;
-static int hf_eip_security_num_psk = -1;
-static int hf_eip_security_psk_identity_size = -1;
-static int hf_eip_security_psk_identity = -1;
-static int hf_eip_security_psk_size = -1;
-static int hf_eip_security_psk = -1;
-static int hf_eip_security_num_active_certs = -1;
-static int hf_eip_security_num_trusted_auths = -1;
-static int hf_eip_cert_name = -1;
-static int hf_eip_cert_state = -1;
-static int hf_eip_cert_encoding = -1;
-static int hf_eip_cert_device_cert_status = -1;
-static int hf_eip_cert_ca_cert_status = -1;
-static int hf_eip_cert_capflags_push = -1;
-static int hf_eip_cert_capflags_reserved = -1;
-static int hf_eip_cert_capability_flags = -1;
-static int hf_eip_cert_num_certs = -1;
-static int hf_eip_cert_cert_name = -1;
-static int hf_eip_cert_verify_certificate = -1;
-static int hf_lldp_subtype = -1;
-static int hf_lldp_mac_address = -1;
+static int hf_tcpip_status;
+static int hf_tcpip_status_interface_config;
+static int hf_tcpip_status_mcast_pending;
+static int hf_tcpip_status_interface_config_pending;
+static int hf_tcpip_status_acd;
+static int hf_tcpip_acd_fault;
+static int hf_tcpip_status_iana_port_admin_change;
+static int hf_tcpip_status_iana_protocol_admin_change;
+static int hf_tcpip_status_reserved;
+static int hf_tcpip_config_cap;
+static int hf_tcpip_config_cap_bootp;
+static int hf_tcpip_config_cap_dns;
+static int hf_tcpip_config_cap_dhcp;
+static int hf_tcpip_config_cap_dhcp_dns_update;
+static int hf_tcpip_config_cap_config_settable;
+static int hf_tcpip_config_cap_hardware_config;
+static int hf_tcpip_config_cap_interface_reset;
+static int hf_tcpip_config_cap_acd;
+static int hf_tcpip_config_cap_reserved;
+static int hf_tcpip_config_control;
+static int hf_tcpip_config_control_config;
+static int hf_tcpip_config_control_dns;
+static int hf_tcpip_config_control_reserved;
+static int hf_tcpip_ic_ip_addr;
+static int hf_tcpip_ic_subnet_mask;
+static int hf_tcpip_ic_gateway;
+static int hf_tcpip_ic_name_server;
+static int hf_tcpip_ic_name_server2;
+static int hf_tcpip_ic_domain_name;
+static int hf_tcpip_hostname;
+static int hf_tcpip_snn_timestamp;
+static int hf_tcpip_snn_date;
+static int hf_tcpip_snn_time;
+static int hf_tcpip_ttl_value;
+static int hf_tcpip_mcast_alloc;
+static int hf_tcpip_mcast_reserved;
+static int hf_tcpip_mcast_num_mcast;
+static int hf_tcpip_mcast_addr_start;
+static int hf_tcpip_lcd_acd_activity;
+static int hf_tcpip_lcd_remote_mac;
+static int hf_tcpip_lcd_arp_pdu;
+static int hf_tcpip_select_acd;
+static int hf_tcpip_quick_connect;
+static int hf_tcpip_encap_inactivity;
+
+static int hf_tcpip_port_count;
+static int hf_tcpip_port_name;
+static int hf_tcpip_port_number;
+static int hf_tcpip_port_protocol;
+static int hf_tcpip_port_admin_state;
+static int hf_tcpip_port_admin_capability;
+static int hf_tcpip_admin_capability_configurable;
+static int hf_tcpip_admin_capability_reset_required;
+static int hf_tcpip_admin_capability_reserved;
+
+static int hf_elink_interface_flags;
+static int hf_elink_iflags_link_status;
+static int hf_elink_iflags_duplex;
+static int hf_elink_iflags_neg_status;
+static int hf_elink_iflags_manual_reset;
+static int hf_elink_iflags_local_hw_fault;
+static int hf_elink_iflags_reserved;
+static int hf_elink_interface_speed;
+static int hf_elink_physical_address;
+static int hf_elink_icount_in_octets;
+static int hf_elink_icount_in_ucast;
+static int hf_elink_icount_in_nucast;
+static int hf_elink_icount_in_discards;
+static int hf_elink_icount_in_errors;
+static int hf_elink_icount_in_unknown_protos;
+static int hf_elink_icount_out_octets;
+static int hf_elink_icount_out_ucast;
+static int hf_elink_icount_out_nucast;
+static int hf_elink_icount_out_discards;
+static int hf_elink_icount_out_errors;
+static int hf_elink_mcount_alignment_errors;
+static int hf_elink_mcount_fcs_errors;
+static int hf_elink_mcount_single_collisions;
+static int hf_elink_mcount_multiple_collisions;
+static int hf_elink_mcount_sqe_test_errors;
+static int hf_elink_mcount_deferred_transmission;
+static int hf_elink_mcount_late_collisions;
+static int hf_elink_mcount_excessive_collisions;
+static int hf_elink_mcount_mac_transmit_errors;
+static int hf_elink_mcount_carrier_sense_errors;
+static int hf_elink_mcount_frame_too_long;
+static int hf_elink_mcount_mac_receive_errors;
+static int hf_elink_icontrol_control_bits;
+static int hf_elink_icontrol_control_bits_auto_neg;
+static int hf_elink_icontrol_control_bits_forced_duplex;
+static int hf_elink_icontrol_control_bits_reserved;
+static int hf_elink_icontrol_forced_speed;
+static int hf_elink_icapability_capability_bits;
+static int hf_elink_icapability_capability_bits_manual;
+static int hf_elink_icapability_capability_bits_auto_neg;
+static int hf_elink_icapability_capability_bits_auto_mdix;
+static int hf_elink_icapability_capability_bits_manual_speed;
+static int hf_elink_icapability_capability_speed_duplex_array_count;
+static int hf_elink_icapability_capability_speed;
+static int hf_elink_icapability_capability_duplex;
+static int hf_elink_interface_type;
+static int hf_elink_interface_state;
+static int hf_elink_admin_state;
+static int hf_elink_interface_label;
+static int hf_elink_hc_icount_in_octets;
+static int hf_elink_hc_icount_in_ucast;
+static int hf_elink_hc_icount_in_mcast;
+static int hf_elink_hc_icount_in_broadcast;
+static int hf_elink_hc_icount_out_octets;
+static int hf_elink_hc_icount_out_ucast;
+static int hf_elink_hc_icount_out_mcast;
+static int hf_elink_hc_icount_out_broadcast;
+
+static int hf_elink_hc_mcount_stats_align_errors;
+static int hf_elink_hc_mcount_stats_fcs_errors;
+static int hf_elink_hc_mcount_stats_internal_mac_transmit_errors;
+static int hf_elink_hc_mcount_stats_frame_too_long;
+static int hf_elink_hc_mcount_stats_internal_mac_receive_errors;
+static int hf_elink_hc_mcount_stats_symbol_errors;
+
+static int hf_qos_8021q_enable;
+static int hf_qos_dscp_ptp_event;
+static int hf_qos_dscp_ptp_general;
+static int hf_qos_dscp_urgent;
+static int hf_qos_dscp_scheduled;
+static int hf_qos_dscp_high;
+static int hf_qos_dscp_low;
+static int hf_qos_dscp_explicit;
+
+static int hf_dlr_network_topology;
+static int hf_dlr_network_status;
+static int hf_dlr_ring_supervisor_status;
+static int hf_dlr_rsc_ring_supervisor_enable;
+static int hf_dlr_rsc_ring_supervisor_precedence;
+static int hf_dlr_rsc_beacon_interval;
+static int hf_dlr_rsc_beacon_timeout;
+static int hf_dlr_rsc_dlr_vlan_id;
+static int hf_dlr_ring_faults_count;
+static int hf_dlr_lanp1_dev_ip_addr;
+static int hf_dlr_lanp1_dev_physical_address;
+static int hf_dlr_lanp2_dev_ip_addr;
+static int hf_dlr_lanp2_dev_physical_address;
+static int hf_dlr_ring_protocol_participants_count;
+static int hf_dlr_rppl_dev_ip_addr;
+static int hf_dlr_rppl_dev_physical_address;
+static int hf_dlr_asa_supervisor_ip_addr;
+static int hf_dlr_asa_supervisor_physical_address;
+static int hf_dlr_active_supervisor_precedence;
+static int hf_dlr_capability_flags;
+static int hf_dlr_capflags_announce_base_node;
+static int hf_dlr_capflags_beacon_base_node;
+static int hf_dlr_capflags_reserved1;
+static int hf_dlr_capflags_supervisor_capable;
+static int hf_dlr_capflags_reserved2;
+static int hf_dlr_capflags_redundant_gateway_capable;
+static int hf_dlr_capflags_flush_frame_capable;
+static int hf_dlr_rgc_red_gateway_enable;
+static int hf_dlr_rgc_gateway_precedence;
+static int hf_dlr_rgc_advertise_interval;
+static int hf_dlr_rgc_advertise_timeout;
+static int hf_dlr_rgc_learning_update_enable;
+static int hf_dlr_redundant_gateway_status;
+static int hf_dlr_aga_ip_addr;
+static int hf_dlr_aga_physical_address;
+static int hf_dlr_active_gateway_precedence;
+
+static int hf_cip_security_state;
+static int hf_eip_security_state;
+static int hf_eip_security_verify_client_cert;
+static int hf_eip_security_send_cert_chain;
+static int hf_eip_security_check_expiration;
+static int hf_eip_security_capability_flags;
+static int hf_eip_security_capflags_secure_renegotiation;
+static int hf_eip_security_capflags_reserved;
+static int hf_eip_security_num_avail_cipher_suites;
+static int hf_eip_security_avail_cipher_suite;
+static int hf_eip_security_num_allow_cipher_suites;
+static int hf_eip_security_allow_cipher_suite;
+static int hf_eip_security_num_psk;
+static int hf_eip_security_psk_identity_size;
+static int hf_eip_security_psk_identity;
+static int hf_eip_security_psk_size;
+static int hf_eip_security_psk;
+static int hf_eip_security_num_active_certs;
+static int hf_eip_security_num_trusted_auths;
+static int hf_eip_cert_name;
+static int hf_eip_cert_state;
+static int hf_eip_cert_encoding;
+static int hf_eip_cert_device_cert_status;
+static int hf_eip_cert_ca_cert_status;
+static int hf_eip_cert_capflags_push;
+static int hf_eip_cert_capflags_reserved;
+static int hf_eip_cert_capability_flags;
+static int hf_eip_cert_num_certs;
+static int hf_eip_cert_cert_name;
+static int hf_eip_cert_verify_certificate;
+static int hf_lldp_subtype;
+static int hf_lldp_mac_address;
 
 /* Initialize the subtree pointers */
-static gint ett_enip = -1;
-static gint ett_cip_io_generic = -1;
-static gint ett_path = -1;
-static gint ett_count_tree = -1;
-static gint ett_type_tree = -1;
-static gint ett_command_tree = -1;
-static gint ett_sockadd = -1;
-static gint ett_lsrcf = -1;
-static gint ett_tcpip_status = -1;
-static gint ett_tcpip_admin_capability = -1;
-static gint ett_tcpip_config_cap = -1;
-static gint ett_tcpip_config_control = -1;
-static gint ett_elink_interface_flags = -1;
-static gint ett_elink_icontrol_bits = -1;
-static gint ett_elink_icapability_bits = -1;
-static gint ett_dlr_capability_flags = -1;
-static gint ett_dlr_lnknbrstatus_flags = -1;
-static gint ett_eip_security_capability_flags = -1;
-static gint ett_eip_security_psk = -1;
-static gint ett_eip_security_active_certs = -1;
-static gint ett_eip_security_trusted_auths = -1;
-static gint ett_eip_cert_capability_flags = -1;
-static gint ett_eip_cert_num_certs = -1;
-static gint ett_security_profiles = -1;
-static gint ett_iana_port_state_flags = -1;
-static gint ett_connection_info = -1;
-static gint ett_connection_path_info = -1;
-static gint ett_cmd_data = -1;
-
-static expert_field ei_mal_tcpip_status = EI_INIT;
-static expert_field ei_mal_tcpip_config_cap = EI_INIT;
-static expert_field ei_mal_tcpip_config_control = EI_INIT;
-static expert_field ei_mal_tcpip_interface_config = EI_INIT;
-static expert_field ei_mal_tcpip_mcast_config = EI_INIT;
-static expert_field ei_mal_tcpip_last_conflict = EI_INIT;
-static expert_field ei_mal_tcpip_snn = EI_INIT;
-static expert_field ei_mal_elink_interface_flags = EI_INIT;
-static expert_field ei_mal_elink_physical_address = EI_INIT;
-static expert_field ei_mal_elink_interface_counters = EI_INIT;
-static expert_field ei_mal_elink_media_counters = EI_INIT;
-static expert_field ei_mal_elink_interface_control = EI_INIT;
-static expert_field ei_mal_dlr_ring_supervisor_config = EI_INIT;
-static expert_field ei_mal_dlr_last_active_node_on_port_1 = EI_INIT;
-static expert_field ei_mal_dlr_last_active_node_on_port_2 = EI_INIT;
-static expert_field ei_mal_dlr_ring_protocol_participants_list = EI_INIT;
-static expert_field ei_mal_dlr_active_supervisor_address = EI_INIT;
-static expert_field ei_mal_dlr_capability_flags = EI_INIT;
-static expert_field ei_mal_dlr_redundant_gateway_config = EI_INIT;
-static expert_field ei_mal_dlr_active_gateway_address = EI_INIT;
-static expert_field ei_mal_eip_security_capability_flags = EI_INIT;
-static expert_field ei_mal_eip_security_avail_cipher_suites = EI_INIT;
-static expert_field ei_mal_eip_security_allow_cipher_suites = EI_INIT;
-static expert_field ei_mal_eip_security_preshared_keys = EI_INIT;
-static expert_field ei_mal_eip_security_active_certs = EI_INIT;
-static expert_field ei_mal_eip_security_trusted_auths = EI_INIT;
-static expert_field ei_mal_eip_cert_capability_flags = EI_INIT;
-static expert_field ei_mal_cpf_item_length_mismatch = EI_INIT;
-static expert_field ei_mal_cpf_item_minimum_size = EI_INIT;
+static gint ett_enip;
+static gint ett_cip_io_generic;
+static gint ett_path;
+static gint ett_count_tree;
+static gint ett_type_tree;
+static gint ett_command_tree;
+static gint ett_sockadd;
+static gint ett_lsrcf;
+static gint ett_tcpip_status;
+static gint ett_tcpip_admin_capability;
+static gint ett_tcpip_config_cap;
+static gint ett_tcpip_config_control;
+static gint ett_elink_interface_flags;
+static gint ett_elink_icontrol_bits;
+static gint ett_elink_icapability_bits;
+static gint ett_dlr_capability_flags;
+static gint ett_dlr_lnknbrstatus_flags;
+static gint ett_eip_security_capability_flags;
+static gint ett_eip_security_psk;
+static gint ett_eip_security_active_certs;
+static gint ett_eip_security_trusted_auths;
+static gint ett_eip_cert_capability_flags;
+static gint ett_eip_cert_num_certs;
+static gint ett_security_profiles;
+static gint ett_iana_port_state_flags;
+static gint ett_connection_info;
+static gint ett_connection_path_info;
+static gint ett_cmd_data;
+
+static expert_field ei_mal_tcpip_status;
+static expert_field ei_mal_tcpip_config_cap;
+static expert_field ei_mal_tcpip_config_control;
+static expert_field ei_mal_tcpip_interface_config;
+static expert_field ei_mal_tcpip_mcast_config;
+static expert_field ei_mal_tcpip_last_conflict;
+static expert_field ei_mal_tcpip_snn;
+static expert_field ei_mal_elink_interface_flags;
+static expert_field ei_mal_elink_physical_address;
+static expert_field ei_mal_elink_interface_counters;
+static expert_field ei_mal_elink_media_counters;
+static expert_field ei_mal_elink_interface_control;
+static expert_field ei_mal_dlr_ring_supervisor_config;
+static expert_field ei_mal_dlr_last_active_node_on_port_1;
+static expert_field ei_mal_dlr_last_active_node_on_port_2;
+static expert_field ei_mal_dlr_ring_protocol_participants_list;
+static expert_field ei_mal_dlr_active_supervisor_address;
+static expert_field ei_mal_dlr_capability_flags;
+static expert_field ei_mal_dlr_redundant_gateway_config;
+static expert_field ei_mal_dlr_active_gateway_address;
+static expert_field ei_mal_eip_security_capability_flags;
+static expert_field ei_mal_eip_security_avail_cipher_suites;
+static expert_field ei_mal_eip_security_allow_cipher_suites;
+static expert_field ei_mal_eip_security_preshared_keys;
+static expert_field ei_mal_eip_security_active_certs;
+static expert_field ei_mal_eip_security_trusted_auths;
+static expert_field ei_mal_eip_cert_capability_flags;
+static expert_field ei_mal_cpf_item_length_mismatch;
+static expert_field ei_mal_cpf_item_minimum_size;
 
 static dissector_table_t   subdissector_srrd_table;
 static dissector_table_t   subdissector_io_table;
@@ -455,55 +455,55 @@ static gboolean enip_desegment  = TRUE;
 static gboolean enip_OTrun_idle = TRUE;
 static gboolean enip_TOrun_idle = FALSE;
 
-static int proto_dlr = -1;
+static int proto_dlr;
 
-static int hf_dlr_ringsubtype = -1;
-static int hf_dlr_ringprotoversion = -1;
-static int hf_dlr_frametype = -1;
-static int hf_dlr_sourceport = -1;
-static int hf_dlr_sourceip = -1;
-static int hf_dlr_sequenceid = -1;
+static int hf_dlr_ringsubtype;
+static int hf_dlr_ringprotoversion;
+static int hf_dlr_frametype;
+static int hf_dlr_sourceport;
+static int hf_dlr_sourceip;
+static int hf_dlr_sequenceid;
 
-static int hf_dlr_ringstate = -1;
-static int hf_dlr_supervisorprecedence = -1;
-static int hf_dlr_beaconinterval = -1;
-static int hf_dlr_beacontimeout = -1;
-static int hf_dlr_beaconreserved = -1;
+static int hf_dlr_ringstate;
+static int hf_dlr_supervisorprecedence;
+static int hf_dlr_beaconinterval;
+static int hf_dlr_beacontimeout;
+static int hf_dlr_beaconreserved;
 
-static int hf_dlr_nreqreserved = -1;
+static int hf_dlr_nreqreserved;
 
-static int hf_dlr_nressourceport = -1;
-static int hf_dlr_nresreserved = -1;
+static int hf_dlr_nressourceport;
+static int hf_dlr_nresreserved;
 
-static int hf_dlr_lnknbrstatus = -1;
-static int hf_dlr_lnknbrstatus_port1 = -1;
-static int hf_dlr_lnknbrstatus_port2 = -1;
-static int hf_dlr_lnknbrstatus_reserved = -1;
-static int hf_dlr_lnknbrstatus_frame_type = -1;
-static int hf_dlr_lnknbrreserved = -1;
+static int hf_dlr_lnknbrstatus;
+static int hf_dlr_lnknbrstatus_port1;
+static int hf_dlr_lnknbrstatus_port2;
+static int hf_dlr_lnknbrstatus_reserved;
+static int hf_dlr_lnknbrstatus_frame_type;
+static int hf_dlr_lnknbrreserved;
 
-static int hf_dlr_lfreserved = -1;
+static int hf_dlr_lfreserved;
 
-static int hf_dlr_anreserved = -1;
+static int hf_dlr_anreserved;
 
-static int hf_dlr_sonumnodes = -1;
-static int hf_dlr_somac = -1;
-static int hf_dlr_soip = -1;
-static int hf_dlr_soreserved = -1;
+static int hf_dlr_sonumnodes;
+static int hf_dlr_somac;
+static int hf_dlr_soip;
+static int hf_dlr_soreserved;
 
-static int hf_dlr_advgatewaystate = -1;
-static int hf_dlr_advgatewayprecedence = -1;
-static int hf_dlr_advadvertiseinterval = -1;
-static int hf_dlr_advadvertisetimeout = -1;
-static int hf_dlr_advlearningupdateenable = -1;
-static int hf_dlr_advreserved = -1;
+static int hf_dlr_advgatewaystate;
+static int hf_dlr_advgatewayprecedence;
+static int hf_dlr_advadvertiseinterval;
+static int hf_dlr_advadvertisetimeout;
+static int hf_dlr_advlearningupdateenable;
+static int hf_dlr_advreserved;
 
-static int hf_dlr_flushlearningupdateenable = -1;
-static int hf_dlr_flushreserved = -1;
+static int hf_dlr_flushlearningupdateenable;
+static int hf_dlr_flushreserved;
 
-static int hf_dlr_learnreserved  = -1;
+static int hf_dlr_learnreserved;
 
-static gint ett_dlr = -1;
+static gint ett_dlr;
 
 /* Translate function to string - Encapsulation commands */
 static const value_string encap_cmd_vals[] = {
diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c
index 2611e12abe..98dc4eb76e 100644
--- a/epan/dissectors/packet-enrp.c
+++ b/epan/dissectors/packet-enrp.c
@@ -39,69 +39,69 @@ static dissector_handle_t enrp_handle;
 
 /* Initialize the protocol and registered fields */
 static int enrp_tap = -1;
-static int proto_enrp = -1;
-static int hf_cause_code = -1;
-static int hf_cause_length = -1;
-static int hf_cause_info = -1;
-static int hf_cause_padding = -1;
-static int hf_message_type = -1;
-static int hf_message_flags = -1;
-static int hf_message_length = -1;
-static int hf_message_value = -1;
-static int hf_parameter_type = -1;
-static int hf_parameter_length = -1;
-static int hf_parameter_value = -1;
-static int hf_parameter_padding = -1;
-static int hf_parameter_ipv4_address = -1;
-static int hf_parameter_ipv6_address = -1;
-static int hf_dccp_port = -1;
-static int hf_dccp_reserved = -1;
-static int hf_dccp_service_code = -1;
-static int hf_sctp_port = -1;
-static int hf_transport_use = -1;
-static int hf_tcp_port = -1;
-static int hf_udp_port = -1;
-static int hf_udp_reserved = -1;
-static int hf_udp_lite_port = -1;
-static int hf_udp_lite_reserved = -1;
-static int hf_policy_type = -1;
-static int hf_policy_value = -1;
-static int hf_policy_weight = -1;
-static int hf_policy_priority = -1;
-static int hf_policy_load = -1;
-static int hf_policy_degradation = -1;
-static int hf_policy_loaddpf = -1;
-static int hf_policy_weightdpf = -1;
-static int hf_policy_distance = -1;
-static int hf_pool_handle = -1;
-static int hf_pe_pe_identifier = -1;
-static int hf_home_enrp_id = -1;
-static int hf_reg_life = -1;
-static int hf_server_identifier = -1;
-static int hf_cookie = -1;
-static int hf_pe_identifier = -1;
-static int hf_pe_checksum = -1;
-static int hf_sender_servers_id = -1;
-static int hf_receiver_servers_id = -1;
-static int hf_target_servers_id = -1;
-static int hf_update_action = -1;
-static int hf_pmu_reserved = -1;
-static int hf_reply_required_bit = -1;
-static int hf_own_children_only_bit = -1;
-static int hf_more_to_send_bit = -1;
-static int hf_reject_bit = -1;
-static int hf_tos_bit = -1;
+static int proto_enrp;
+static int hf_cause_code;
+static int hf_cause_length;
+static int hf_cause_info;
+static int hf_cause_padding;
+static int hf_message_type;
+static int hf_message_flags;
+static int hf_message_length;
+static int hf_message_value;
+static int hf_parameter_type;
+static int hf_parameter_length;
+static int hf_parameter_value;
+static int hf_parameter_padding;
+static int hf_parameter_ipv4_address;
+static int hf_parameter_ipv6_address;
+static int hf_dccp_port;
+static int hf_dccp_reserved;
+static int hf_dccp_service_code;
+static int hf_sctp_port;
+static int hf_transport_use;
+static int hf_tcp_port;
+static int hf_udp_port;
+static int hf_udp_reserved;
+static int hf_udp_lite_port;
+static int hf_udp_lite_reserved;
+static int hf_policy_type;
+static int hf_policy_value;
+static int hf_policy_weight;
+static int hf_policy_priority;
+static int hf_policy_load;
+static int hf_policy_degradation;
+static int hf_policy_loaddpf;
+static int hf_policy_weightdpf;
+static int hf_policy_distance;
+static int hf_pool_handle;
+static int hf_pe_pe_identifier;
+static int hf_home_enrp_id;
+static int hf_reg_life;
+static int hf_server_identifier;
+static int hf_cookie;
+static int hf_pe_identifier;
+static int hf_pe_checksum;
+static int hf_sender_servers_id;
+static int hf_receiver_servers_id;
+static int hf_target_servers_id;
+static int hf_update_action;
+static int hf_pmu_reserved;
+static int hf_reply_required_bit;
+static int hf_own_children_only_bit;
+static int hf_more_to_send_bit;
+static int hf_reject_bit;
+static int hf_tos_bit;
 
 /* Initialize the subtree pointers */
-static gint ett_enrp = -1;
-static gint ett_enrp_parameter = -1;
-static gint ett_enrp_cause = -1;
-static gint ett_enrp_flags = -1;
+static gint ett_enrp;
+static gint ett_enrp_parameter;
+static gint ett_enrp_cause;
+static gint ett_enrp_flags;
 
 static guint64 enrp_total_msgs = 0;
 static guint64 enrp_total_bytes = 0;
 
-static expert_field ei_enrp_max_recursion_depth_reached = EI_INIT;
+static expert_field ei_enrp_max_recursion_depth_reached;
 
 static void
 dissect_parameters(tvbuff_t *, packet_info *, proto_tree *);
diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c
index b60c7437f1..411536d79a 100644
--- a/epan/dissectors/packet-enttec.c
+++ b/epan/dissectors/packet-enttec.c
@@ -62,35 +62,35 @@ void proto_reg_handoff_enttec(void);
 static dissector_handle_t enttec_udp_handle, enttec_tcp_handle;
 
 /* Define the enttec proto */
-static int proto_enttec = -1;
+static int proto_enttec;
 
 /* general */
-static int hf_enttec_head = -1;
+static int hf_enttec_head;
 
 /* poll */
-static int hf_enttec_poll_type = -1;
+static int hf_enttec_poll_type;
 
 /* poll reply */
-static int hf_enttec_poll_reply_mac = -1;
-static int hf_enttec_poll_reply_node_type = -1;
-static int hf_enttec_poll_reply_version = -1;
-static int hf_enttec_poll_reply_switch = -1;
-static int hf_enttec_poll_reply_name = -1;
-static int hf_enttec_poll_reply_option = -1;
-static int hf_enttec_poll_reply_tos = -1;
-static int hf_enttec_poll_reply_ttl = -1;
+static int hf_enttec_poll_reply_mac;
+static int hf_enttec_poll_reply_node_type;
+static int hf_enttec_poll_reply_version;
+static int hf_enttec_poll_reply_switch;
+static int hf_enttec_poll_reply_name;
+static int hf_enttec_poll_reply_option;
+static int hf_enttec_poll_reply_tos;
+static int hf_enttec_poll_reply_ttl;
 
 /* dmx data */
-static int hf_enttec_dmx_data_universe = -1;
-static int hf_enttec_dmx_data_start_code = -1;
-static int hf_enttec_dmx_data_type = -1;
-static int hf_enttec_dmx_data_size = -1;
-static int hf_enttec_dmx_data_data = -1;
-static int hf_enttec_dmx_data_data_filter = -1;
-static int hf_enttec_dmx_data_dmx_data = -1;
+static int hf_enttec_dmx_data_universe;
+static int hf_enttec_dmx_data_start_code;
+static int hf_enttec_dmx_data_type;
+static int hf_enttec_dmx_data_size;
+static int hf_enttec_dmx_data_data;
+static int hf_enttec_dmx_data_data_filter;
+static int hf_enttec_dmx_data_dmx_data;
 
 /* Define the tree for enttec */
-static int ett_enttec = -1;
+static int ett_enttec;
 
 /*
  * Here are the global variables associated with the preferences
diff --git a/epan/dissectors/packet-eobi.c b/epan/dissectors/packet-eobi.c
index dabeaedacd..97f8595892 100644
--- a/epan/dissectors/packet-eobi.c
+++ b/epan/dissectors/packet-eobi.c
@@ -43,17 +43,17 @@ void proto_register_eobi(void);
 
 static dissector_handle_t eobi_handle;
 
-static int proto_eobi = -1;
-static expert_field ei_eobi_counter_overflow = EI_INIT;
-static expert_field ei_eobi_invalid_template = EI_INIT;
-static expert_field ei_eobi_invalid_length = EI_INIT;
-static expert_field ei_eobi_missing = EI_INIT;
-static expert_field ei_eobi_overused = EI_INIT;
+static int proto_eobi;
+static expert_field ei_eobi_counter_overflow;
+static expert_field ei_eobi_invalid_template;
+static expert_field ei_eobi_invalid_length;
+static expert_field ei_eobi_missing;
+static expert_field ei_eobi_overused;
 
 static int hf_eobi[83];
-static int hf_eobi_dscp_exec_summary = -1;
-static int hf_eobi_dscp_improved = -1;
-static int hf_eobi_dscp_widened = -1;
+static int hf_eobi_dscp_exec_summary;
+static int hf_eobi_dscp_improved;
+static int hf_eobi_dscp_widened;
 enum Field_Handle_Index {
       AGGRESSORSIDE_FH_IDX
     , AGGRESSORTIME_FH_IDX
@@ -997,7 +997,7 @@ struct ETI_Field {
 };
 
 static gint ett_eobi[7];
-static gint ett_eobi_dscp = -1;
+static gint ett_eobi_dscp;
 /* This method dissects fully reassembled messages */
 static int
 dissect_eobi_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c
index 4dbc5156a8..dad0cd59b0 100644
--- a/epan/dissectors/packet-epl.c
+++ b/epan/dissectors/packet-epl.c
@@ -1418,290 +1418,290 @@ static gint dissect_object_mapping(struct profile *profile, wmem_array_t *mappin
 static const gchar* decode_epl_address(guchar adr);
 
 /* Initialize the protocol and registered fields */
-static gint proto_epl            = -1;
+static gint proto_epl;
 
-static gint hf_epl_mtyp          = -1;
-static gint hf_epl_node          = -1;
-static gint hf_epl_dest          = -1;
-static gint hf_epl_src           = -1;
-static gint hf_epl_payload_real  = -1;
+static gint hf_epl_mtyp;
+static gint hf_epl_node;
+static gint hf_epl_dest;
+static gint hf_epl_src;
+static gint hf_epl_payload_real;
 
 /* available epl message types */
-static gint hf_epl_soc           = -1;
-static gint hf_epl_preq          = -1;
-static gint hf_epl_pres          = -1;
-static gint hf_epl_soa           = -1;
-static gint hf_epl_asnd          = -1;
-static gint hf_epl_amni          = -1;
-static gint hf_epl_ainv          = -1;
-
-static gint hf_epl_soc_flags     = -1;
-static gint hf_epl_soc_mc        = -1;
-static gint hf_epl_soc_ps        = -1;
-static gint hf_epl_soc_dna_an    = -1;
-static gint hf_epl_soc_nettime   = -1;
-static gint hf_epl_soc_relativetime = -1;
-
-static gint hf_epl_preq_flags    = -1;
-static gint hf_epl_preq_ms       = -1;
-static gint hf_epl_preq_ea       = -1;
-static gint hf_epl_preq_rd       = -1;
-static gint hf_epl_preq_sls      = -1;
-static gint hf_epl_preq_fls      = -1;
-static gint hf_epl_preq_pdov     = -1;
-static gint hf_epl_preq_size     = -1;
-
-static gint hf_epl_pres_stat_ms  = -1;
-static gint hf_epl_pres_stat_cs  = -1;
-static gint hf_epl_pres_flags    = -1;
-static gint hf_epl_pres_ms       = -1;
-static gint hf_epl_pres_en       = -1;
-static gint hf_epl_pres_rd       = -1;
-static gint hf_epl_pres_pr       = -1;
-static gint hf_epl_pres_rs       = -1;
-static gint hf_epl_pres_sls      = -1;
-static gint hf_epl_pres_fls      = -1;
-static gint hf_epl_pres_pdov     = -1;
-static gint hf_epl_pres_size     = -1;
-
-static gint hf_epl_soa_stat_ms   = -1;
-static gint hf_epl_soa_stat_cs   = -1;
-static gint hf_epl_soa_ea        = -1;
-static gint hf_epl_soa_er        = -1;
-static gint hf_epl_soa_svid      = -1;
-static gint hf_epl_soa_svtg      = -1;
-static gint hf_epl_soa_eplv      = -1;
-static gint hf_epl_soa_rrflags          = -1;
-static gint hf_epl_soa_rrflags_mnred    = -1;
-static gint hf_epl_soa_rrflags_cblred   = -1;
-static gint hf_epl_soa_rrflags_ringred  = -1;
-static gint hf_epl_soa_rrflags_ringstat = -1;
+static gint hf_epl_soc;
+static gint hf_epl_preq;
+static gint hf_epl_pres;
+static gint hf_epl_soa;
+static gint hf_epl_asnd;
+static gint hf_epl_amni;
+static gint hf_epl_ainv;
+
+static gint hf_epl_soc_flags;
+static gint hf_epl_soc_mc;
+static gint hf_epl_soc_ps;
+static gint hf_epl_soc_dna_an;
+static gint hf_epl_soc_nettime;
+static gint hf_epl_soc_relativetime;
+
+static gint hf_epl_preq_flags;
+static gint hf_epl_preq_ms;
+static gint hf_epl_preq_ea;
+static gint hf_epl_preq_rd;
+static gint hf_epl_preq_sls;
+static gint hf_epl_preq_fls;
+static gint hf_epl_preq_pdov;
+static gint hf_epl_preq_size;
+
+static gint hf_epl_pres_stat_ms;
+static gint hf_epl_pres_stat_cs;
+static gint hf_epl_pres_flags;
+static gint hf_epl_pres_ms;
+static gint hf_epl_pres_en;
+static gint hf_epl_pres_rd;
+static gint hf_epl_pres_pr;
+static gint hf_epl_pres_rs;
+static gint hf_epl_pres_sls;
+static gint hf_epl_pres_fls;
+static gint hf_epl_pres_pdov;
+static gint hf_epl_pres_size;
+
+static gint hf_epl_soa_stat_ms;
+static gint hf_epl_soa_stat_cs;
+static gint hf_epl_soa_ea;
+static gint hf_epl_soa_er;
+static gint hf_epl_soa_svid;
+static gint hf_epl_soa_svtg;
+static gint hf_epl_soa_eplv;
+static gint hf_epl_soa_rrflags;
+static gint hf_epl_soa_rrflags_mnred;
+static gint hf_epl_soa_rrflags_cblred;
+static gint hf_epl_soa_rrflags_ringred;
+static gint hf_epl_soa_rrflags_ringstat;
 
 /*SyncRequest*/
-static gint hf_epl_soa_sync      = -1;
-static gint hf_epl_soa_mac       = -1;
-static gint hf_epl_soa_pre_fst   = -1;
-static gint hf_epl_soa_pre_sec   = -1;
-static gint hf_epl_soa_mnd_fst   = -1;
-static gint hf_epl_soa_mnd_sec   = -1;
-static gint hf_epl_soa_pre_tm    = -1;
-static gint hf_epl_soa_pre_set   = -1;
-static gint hf_epl_soa_pre_res   = -1;
-static gint hf_epl_soa_mac_end   = -1;
-static gint hf_epl_soa_pre_fst_end   = -1;
-static gint hf_epl_soa_pre_sec_end   = -1;
-static gint hf_epl_soa_mnd_fst_end   = -1;
-static gint hf_epl_soa_mnd_sec_end   = -1;
-static gint hf_epl_soa_pre_tm_end    = -1;
-static gint hf_epl_soa_dna_an_glb    = -1;
-static gint hf_epl_soa_dna_an_lcl    = -1;
+static gint hf_epl_soa_sync;
+static gint hf_epl_soa_mac;
+static gint hf_epl_soa_pre_fst;
+static gint hf_epl_soa_pre_sec;
+static gint hf_epl_soa_mnd_fst;
+static gint hf_epl_soa_mnd_sec;
+static gint hf_epl_soa_pre_tm;
+static gint hf_epl_soa_pre_set;
+static gint hf_epl_soa_pre_res;
+static gint hf_epl_soa_mac_end;
+static gint hf_epl_soa_pre_fst_end;
+static gint hf_epl_soa_pre_sec_end;
+static gint hf_epl_soa_mnd_fst_end;
+static gint hf_epl_soa_mnd_sec_end;
+static gint hf_epl_soa_pre_tm_end;
+static gint hf_epl_soa_dna_an_glb;
+static gint hf_epl_soa_dna_an_lcl;
 
 /*SyncResponse*/
-static gint hf_epl_asnd_syncResponse_sync           = -1;
-static gint hf_epl_asnd_syncResponse_latency        = -1;
-static gint hf_epl_asnd_syncResponse_node           = -1;
-static gint hf_epl_asnd_syncResponse_delay          = -1;
-static gint hf_epl_asnd_syncResponse_pre_fst        = -1;
-static gint hf_epl_asnd_syncResponse_pre_sec        = -1;
-static gint hf_epl_asnd_syncResponse_fst_val        = -1;
-static gint hf_epl_asnd_syncResponse_sec_val        = -1;
-static gint hf_epl_asnd_syncResponse_mode           = -1;
-
-static gint hf_epl_asnd_svid      = -1;
-static gint hf_epl_asnd_svtg      = -1;
-/* static gint hf_epl_asnd_data     = -1; */
+static gint hf_epl_asnd_syncResponse_sync;
+static gint hf_epl_asnd_syncResponse_latency;
+static gint hf_epl_asnd_syncResponse_node;
+static gint hf_epl_asnd_syncResponse_delay;
+static gint hf_epl_asnd_syncResponse_pre_fst;
+static gint hf_epl_asnd_syncResponse_pre_sec;
+static gint hf_epl_asnd_syncResponse_fst_val;
+static gint hf_epl_asnd_syncResponse_sec_val;
+static gint hf_epl_asnd_syncResponse_mode;
+
+static gint hf_epl_asnd_svid;
+static gint hf_epl_asnd_svtg;
+/* static gint hf_epl_asnd_data; */
 
 /*IdentResponse*/
-static gint hf_epl_asnd_identresponse_en             = -1;
-static gint hf_epl_asnd_identresponse_ec             = -1;
-static gint hf_epl_asnd_identresponse_pr             = -1;
-static gint hf_epl_asnd_identresponse_rs             = -1;
-static gint hf_epl_asnd_identresponse_sls            = -1;
-static gint hf_epl_asnd_identresponse_fls            = -1;
-static gint hf_epl_asnd_identresponse_stat_ms        = -1;
-static gint hf_epl_asnd_identresponse_stat_cs        = -1;
-static gint hf_epl_asnd_identresponse_ever           = -1;
-static gint hf_epl_asnd_identresponse_feat           = -1;
-static gint hf_epl_asnd_identresponse_feat_bit0      = -1;
-static gint hf_epl_asnd_identresponse_feat_bit1      = -1;
-static gint hf_epl_asnd_identresponse_feat_bit2      = -1;
-static gint hf_epl_asnd_identresponse_feat_bit3      = -1;
-static gint hf_epl_asnd_identresponse_feat_bit4      = -1;
-static gint hf_epl_asnd_identresponse_feat_bit5      = -1;
-static gint hf_epl_asnd_identresponse_feat_bit6      = -1;
-static gint hf_epl_asnd_identresponse_feat_bit7      = -1;
-static gint hf_epl_asnd_identresponse_feat_bit8      = -1;
-static gint hf_epl_asnd_identresponse_feat_bit9      = -1;
-static gint hf_epl_asnd_identresponse_feat_bitA      = -1;
-static gint hf_epl_asnd_identresponse_feat_bitB      = -1;
-static gint hf_epl_asnd_identresponse_feat_bitC      = -1;
-static gint hf_epl_asnd_identresponse_feat_bitD      = -1;
-static gint hf_epl_asnd_identresponse_feat_bitE      = -1;
-static gint hf_epl_asnd_identresponse_feat_bitF      = -1;
-static gint hf_epl_asnd_identresponse_feat_bit10     = -1;
-static gint hf_epl_asnd_identresponse_feat_bit11     = -1;
-static gint hf_epl_asnd_identresponse_feat_bit12     = -1;
-static gint hf_epl_asnd_identresponse_feat_bit13     = -1;
-static gint hf_epl_asnd_identresponse_feat_bit14     = -1;
-static gint hf_epl_asnd_identresponse_feat_bit21     = -1;
-static gint hf_epl_asnd_identresponse_mtu            = -1;
-static gint hf_epl_asnd_identresponse_pis            = -1;
-static gint hf_epl_asnd_identresponse_pos            = -1;
-static gint hf_epl_asnd_identresponse_rst            = -1;
-static gint hf_epl_asnd_identresponse_dt             = -1;
-static gint hf_epl_asnd_identresponse_dt_add         = -1;
-static gint hf_epl_asnd_identresponse_vid            = -1;
-static gint hf_epl_asnd_identresponse_productcode    = -1;
-static gint hf_epl_asnd_identresponse_rno            = -1;
-static gint hf_epl_asnd_identresponse_sno            = -1;
-static gint hf_epl_asnd_identresponse_vex1           = -1;
-static gint hf_epl_asnd_identresponse_vcd            = -1;
-static gint hf_epl_asnd_identresponse_vct            = -1;
-static gint hf_epl_asnd_identresponse_ad             = -1;
-static gint hf_epl_asnd_identresponse_at             = -1;
-static gint hf_epl_asnd_identresponse_ipa            = -1;
-static gint hf_epl_asnd_identresponse_snm            = -1;
-static gint hf_epl_asnd_identresponse_gtw            = -1;
-static gint hf_epl_asnd_identresponse_hn             = -1;
-static gint hf_epl_asnd_identresponse_vex2           = -1;
+static gint hf_epl_asnd_identresponse_en;
+static gint hf_epl_asnd_identresponse_ec;
+static gint hf_epl_asnd_identresponse_pr;
+static gint hf_epl_asnd_identresponse_rs;
+static gint hf_epl_asnd_identresponse_sls;
+static gint hf_epl_asnd_identresponse_fls;
+static gint hf_epl_asnd_identresponse_stat_ms;
+static gint hf_epl_asnd_identresponse_stat_cs;
+static gint hf_epl_asnd_identresponse_ever;
+static gint hf_epl_asnd_identresponse_feat;
+static gint hf_epl_asnd_identresponse_feat_bit0;
+static gint hf_epl_asnd_identresponse_feat_bit1;
+static gint hf_epl_asnd_identresponse_feat_bit2;
+static gint hf_epl_asnd_identresponse_feat_bit3;
+static gint hf_epl_asnd_identresponse_feat_bit4;
+static gint hf_epl_asnd_identresponse_feat_bit5;
+static gint hf_epl_asnd_identresponse_feat_bit6;
+static gint hf_epl_asnd_identresponse_feat_bit7;
+static gint hf_epl_asnd_identresponse_feat_bit8;
+static gint hf_epl_asnd_identresponse_feat_bit9;
+static gint hf_epl_asnd_identresponse_feat_bitA;
+static gint hf_epl_asnd_identresponse_feat_bitB;
+static gint hf_epl_asnd_identresponse_feat_bitC;
+static gint hf_epl_asnd_identresponse_feat_bitD;
+static gint hf_epl_asnd_identresponse_feat_bitE;
+static gint hf_epl_asnd_identresponse_feat_bitF;
+static gint hf_epl_asnd_identresponse_feat_bit10;
+static gint hf_epl_asnd_identresponse_feat_bit11;
+static gint hf_epl_asnd_identresponse_feat_bit12;
+static gint hf_epl_asnd_identresponse_feat_bit13;
+static gint hf_epl_asnd_identresponse_feat_bit14;
+static gint hf_epl_asnd_identresponse_feat_bit21;
+static gint hf_epl_asnd_identresponse_mtu;
+static gint hf_epl_asnd_identresponse_pis;
+static gint hf_epl_asnd_identresponse_pos;
+static gint hf_epl_asnd_identresponse_rst;
+static gint hf_epl_asnd_identresponse_dt;
+static gint hf_epl_asnd_identresponse_dt_add;
+static gint hf_epl_asnd_identresponse_vid;
+static gint hf_epl_asnd_identresponse_productcode;
+static gint hf_epl_asnd_identresponse_rno;
+static gint hf_epl_asnd_identresponse_sno;
+static gint hf_epl_asnd_identresponse_vex1;
+static gint hf_epl_asnd_identresponse_vcd;
+static gint hf_epl_asnd_identresponse_vct;
+static gint hf_epl_asnd_identresponse_ad;
+static gint hf_epl_asnd_identresponse_at;
+static gint hf_epl_asnd_identresponse_ipa;
+static gint hf_epl_asnd_identresponse_snm;
+static gint hf_epl_asnd_identresponse_gtw;
+static gint hf_epl_asnd_identresponse_hn;
+static gint hf_epl_asnd_identresponse_vex2;
 
 /*StatusResponse*/
-static gint hf_epl_asnd_statusresponse_en            = -1;
-static gint hf_epl_asnd_statusresponse_ec            = -1;
-static gint hf_epl_asnd_statusresponse_pr            = -1;
-static gint hf_epl_asnd_statusresponse_rs            = -1;
-static gint hf_epl_asnd_statusresponse_sls           = -1;
-static gint hf_epl_asnd_statusresponse_fls           = -1;
-static gint hf_epl_asnd_statusresponse_stat_ms       = -1;
-static gint hf_epl_asnd_statusresponse_stat_cs       = -1;
-/* static gint hf_epl_asnd_statusresponse_seb           = -1; */
+static gint hf_epl_asnd_statusresponse_en;
+static gint hf_epl_asnd_statusresponse_ec;
+static gint hf_epl_asnd_statusresponse_pr;
+static gint hf_epl_asnd_statusresponse_rs;
+static gint hf_epl_asnd_statusresponse_sls;
+static gint hf_epl_asnd_statusresponse_fls;
+static gint hf_epl_asnd_statusresponse_stat_ms;
+static gint hf_epl_asnd_statusresponse_stat_cs;
+/* static gint hf_epl_asnd_statusresponse_seb; */
 
 /*StaticErrorBitField */
-static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit0 = -1;
-static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit1 = -1;
-static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit2 = -1;
-static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit3 = -1;
-static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit4 = -1;
-static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit5 = -1;
-static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit7 = -1;
-static gint hf_epl_asnd_statusresponse_seb_devicespecific_err        = -1;
+static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit0;
+static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit1;
+static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit2;
+static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit3;
+static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit4;
+static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit5;
+static gint hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit7;
+static gint hf_epl_asnd_statusresponse_seb_devicespecific_err;
 
 /*List of Errors/Events*/
-/* static gint hf_epl_asnd_statusresponse_el                    = -1; */
-/* static gint hf_epl_asnd_statusresponse_el_entry              = -1; */
-static gint hf_epl_asnd_statusresponse_el_entry_type         = -1;
-static gint hf_epl_asnd_statusresponse_el_entry_type_profile = -1;
-static gint hf_epl_asnd_statusresponse_el_entry_type_mode    = -1;
-static gint hf_epl_asnd_statusresponse_el_entry_type_bit14   = -1;
-static gint hf_epl_asnd_statusresponse_el_entry_type_bit15   = -1;
-static gint hf_epl_asnd_statusresponse_el_entry_code         = -1;
-static gint hf_epl_asnd_statusresponse_el_entry_time         = -1;
-static gint hf_epl_asnd_statusresponse_el_entry_add          = -1;
+/* static gint hf_epl_asnd_statusresponse_el; */
+/* static gint hf_epl_asnd_statusresponse_el_entry; */
+static gint hf_epl_asnd_statusresponse_el_entry_type;
+static gint hf_epl_asnd_statusresponse_el_entry_type_profile;
+static gint hf_epl_asnd_statusresponse_el_entry_type_mode;
+static gint hf_epl_asnd_statusresponse_el_entry_type_bit14;
+static gint hf_epl_asnd_statusresponse_el_entry_type_bit15;
+static gint hf_epl_asnd_statusresponse_el_entry_code;
+static gint hf_epl_asnd_statusresponse_el_entry_time;
+static gint hf_epl_asnd_statusresponse_el_entry_add;
 
 /*NMTRequest*/
-static gint hf_epl_asnd_nmtrequest_rcid                      = -1;
-static gint hf_epl_asnd_nmtrequest_rct                       = -1;
-static gint hf_epl_asnd_nmtrequest_rcd                       = -1;
+static gint hf_epl_asnd_nmtrequest_rcid;
+static gint hf_epl_asnd_nmtrequest_rct;
+static gint hf_epl_asnd_nmtrequest_rcd;
 
 /*NMTCommand*/
-static gint hf_epl_asnd_nmtcommand_cid                       = -1;
-static gint hf_epl_asnd_nmtcommand_cdat                      = -1;
-static gint hf_epl_asnd_nmtcommand_resetnode_reason           = -1;
-/*static gint hf_epl_asnd_nmtcommand_nmtnetparameterset_mtu    = -1;*/
-static gint hf_epl_asnd_nmtcommand_nmtnethostnameset_hn      = -1;
-static gint hf_epl_asnd_nmtcommand_nmtflusharpentry_nid      = -1;
-static gint hf_epl_asnd_nmtcommand_nmtpublishtime_dt         = -1;
-static gint hf_epl_asnd_nmtcommand_nmtdna                    = -1;
-static gint hf_epl_asnd_nmtcommand_nmtdna_flags              = -1;
-static gint hf_epl_asnd_nmtcommand_nmtdna_ltv                = -1;
-static gint hf_epl_asnd_nmtcommand_nmtdna_hpm                = -1;
-static gint hf_epl_asnd_nmtcommand_nmtdna_nnn                = -1;
-static gint hf_epl_asnd_nmtcommand_nmtdna_mac                = -1;
-static gint hf_epl_asnd_nmtcommand_nmtdna_cnn                = -1;
-static gint hf_epl_asnd_nmtcommand_nmtdna_currmac            = -1;
-static gint hf_epl_asnd_nmtcommand_nmtdna_hubenmsk           = -1;
-static gint hf_epl_asnd_nmtcommand_nmtdna_currnn             = -1;
-static gint hf_epl_asnd_nmtcommand_nmtdna_newnn              = -1;
-static gint hf_epl_asnd_nmtcommand_nmtdna_leasetime          = -1;
+static gint hf_epl_asnd_nmtcommand_cid;
+static gint hf_epl_asnd_nmtcommand_cdat;
+static gint hf_epl_asnd_nmtcommand_resetnode_reason;
+/*static gint hf_epl_asnd_nmtcommand_nmtnetparameterset_mtu;*/
+static gint hf_epl_asnd_nmtcommand_nmtnethostnameset_hn;
+static gint hf_epl_asnd_nmtcommand_nmtflusharpentry_nid;
+static gint hf_epl_asnd_nmtcommand_nmtpublishtime_dt;
+static gint hf_epl_asnd_nmtcommand_nmtdna;
+static gint hf_epl_asnd_nmtcommand_nmtdna_flags;
+static gint hf_epl_asnd_nmtcommand_nmtdna_ltv;
+static gint hf_epl_asnd_nmtcommand_nmtdna_hpm;
+static gint hf_epl_asnd_nmtcommand_nmtdna_nnn;
+static gint hf_epl_asnd_nmtcommand_nmtdna_mac;
+static gint hf_epl_asnd_nmtcommand_nmtdna_cnn;
+static gint hf_epl_asnd_nmtcommand_nmtdna_currmac;
+static gint hf_epl_asnd_nmtcommand_nmtdna_hubenmsk;
+static gint hf_epl_asnd_nmtcommand_nmtdna_currnn;
+static gint hf_epl_asnd_nmtcommand_nmtdna_newnn;
+static gint hf_epl_asnd_nmtcommand_nmtdna_leasetime;
 
 
 /*Asynchronuous SDO Sequence Layer*/
-static gint hf_epl_asnd_sdo_seq                              = -1;
-static gint hf_epl_asnd_sdo_seq_receive_sequence_number      = -1;
-static gint hf_epl_asnd_sdo_seq_receive_con                  = -1;
-static gint hf_epl_asnd_sdo_seq_send_sequence_number         = -1;
-static gint hf_epl_asnd_sdo_seq_send_con                     = -1;
+static gint hf_epl_asnd_sdo_seq;
+static gint hf_epl_asnd_sdo_seq_receive_sequence_number;
+static gint hf_epl_asnd_sdo_seq_receive_con;
+static gint hf_epl_asnd_sdo_seq_send_sequence_number;
+static gint hf_epl_asnd_sdo_seq_send_con;
 
 /*Asynchronuous SDO Command Layer*/
-static gint hf_epl_asnd_sdo_cmd                              = -1;
-static gint hf_epl_asnd_sdo_cmd_transaction_id               = -1;
-static gint hf_epl_asnd_sdo_cmd_response                     = -1;
+static gint hf_epl_asnd_sdo_cmd;
+static gint hf_epl_asnd_sdo_cmd_transaction_id;
+static gint hf_epl_asnd_sdo_cmd_response;
 
 #if 0
-static gint hf_epl_asnd_sdo_resp_in                          = -1;
-static gint hf_epl_asnd_sdo_no_resp                          = -1;
-static gint hf_epl_asnd_sdo_resp_to                          = -1;
+static gint hf_epl_asnd_sdo_resp_in;
+static gint hf_epl_asnd_sdo_no_resp;
+static gint hf_epl_asnd_sdo_resp_to;
 #endif
 
-static gint hf_epl_asnd_sdo_cmd_abort                        = -1;
-static gint hf_epl_asnd_sdo_cmd_sub_abort                    = -1;
-static gint hf_epl_asnd_sdo_cmd_segmentation                 = -1;
-static gint hf_epl_asnd_sdo_cmd_command_id                   = -1;
-static gint hf_epl_asnd_sdo_cmd_segment_size                 = -1;
-
-static gint hf_epl_asnd_sdo_cmd_data_size                    = -1;
-static gint hf_epl_asnd_sdo_cmd_data_padding                 = -1;
-static gint hf_epl_asnd_sdo_cmd_data_index                   = -1;
-static gint hf_epl_asnd_sdo_cmd_data_subindex                = -1;
-static gint hf_epl_asnd_sdo_cmd_data_mapping                 = -1;
-static gint hf_epl_asnd_sdo_cmd_data_mapping_index           = -1;
-static gint hf_epl_asnd_sdo_cmd_data_mapping_subindex        = -1;
-static gint hf_epl_asnd_sdo_cmd_data_mapping_offset          = -1;
-static gint hf_epl_asnd_sdo_cmd_data_mapping_length          = -1;
-/*static gint hf_epl_asnd_sdo_cmd_data_response      = -1;*/
-
-static gint hf_epl_asnd_sdo_cmd_reassembled                  = -1;
-static gint hf_epl_fragments                                 = -1;
-static gint hf_epl_fragment                                  = -1;
-static gint hf_epl_fragment_overlap                          = -1;
-static gint hf_epl_fragment_overlap_conflicts                = -1;
-static gint hf_epl_fragment_multiple_tails                   = -1;
-static gint hf_epl_fragment_too_long_fragment                = -1;
-static gint hf_epl_fragment_error                            = -1;
-static gint hf_epl_fragment_count                            = -1;
-static gint hf_epl_reassembled_in                            = -1;
-static gint hf_epl_reassembled_length                        = -1;
-static gint hf_epl_reassembled_data                          = -1;
-static gint hf_epl_sdo_multi_param_sub_abort                 = -1;
-
-static gint hf_epl_asnd_identresponse_profile_path = -1;
+static gint hf_epl_asnd_sdo_cmd_abort;
+static gint hf_epl_asnd_sdo_cmd_sub_abort;
+static gint hf_epl_asnd_sdo_cmd_segmentation;
+static gint hf_epl_asnd_sdo_cmd_command_id;
+static gint hf_epl_asnd_sdo_cmd_segment_size;
+
+static gint hf_epl_asnd_sdo_cmd_data_size;
+static gint hf_epl_asnd_sdo_cmd_data_padding;
+static gint hf_epl_asnd_sdo_cmd_data_index;
+static gint hf_epl_asnd_sdo_cmd_data_subindex;
+static gint hf_epl_asnd_sdo_cmd_data_mapping;
+static gint hf_epl_asnd_sdo_cmd_data_mapping_index;
+static gint hf_epl_asnd_sdo_cmd_data_mapping_subindex;
+static gint hf_epl_asnd_sdo_cmd_data_mapping_offset;
+static gint hf_epl_asnd_sdo_cmd_data_mapping_length;
+/*static gint hf_epl_asnd_sdo_cmd_data_response;*/
+
+static gint hf_epl_asnd_sdo_cmd_reassembled;
+static gint hf_epl_fragments;
+static gint hf_epl_fragment;
+static gint hf_epl_fragment_overlap;
+static gint hf_epl_fragment_overlap_conflicts;
+static gint hf_epl_fragment_multiple_tails;
+static gint hf_epl_fragment_too_long_fragment;
+static gint hf_epl_fragment_error;
+static gint hf_epl_fragment_count;
+static gint hf_epl_reassembled_in;
+static gint hf_epl_reassembled_length;
+static gint hf_epl_reassembled_data;
+static gint hf_epl_sdo_multi_param_sub_abort;
+
+static gint hf_epl_asnd_identresponse_profile_path;
 
 /* EPL OD Data Types */
-static gint hf_epl_pdo                = -1;
-static gint hf_epl_pdo_index          = -1;
-static gint hf_epl_pdo_subindex       = -1;
-
-static gint hf_epl_od_meta                  = -1;
-static gint hf_epl_od_meta_mapping_index    = -1;
-static gint hf_epl_od_meta_mapping_subindex = -1;
-static gint hf_epl_od_meta_lifetime_start   = -1;
-static gint hf_epl_od_meta_lifetime_end     = -1;
-static gint hf_epl_od_meta_offset           = -1;
-static gint hf_epl_od_meta_length           = -1;
-
-static gint hf_epl_od_boolean      = -1;
-static gint hf_epl_od_int          = -1;
-static gint hf_epl_od_uint         = -1;
-static gint hf_epl_od_real         = -1;
-static gint hf_epl_od_string       = -1;
-static gint hf_epl_od_octet_string = -1;
-static gint hf_epl_od_time         = -1;
+static gint hf_epl_pdo;
+static gint hf_epl_pdo_index;
+static gint hf_epl_pdo_subindex;
+
+static gint hf_epl_od_meta;
+static gint hf_epl_od_meta_mapping_index;
+static gint hf_epl_od_meta_mapping_subindex;
+static gint hf_epl_od_meta_lifetime_start;
+static gint hf_epl_od_meta_lifetime_end;
+static gint hf_epl_od_meta_offset;
+static gint hf_epl_od_meta_length;
+
+static gint hf_epl_od_boolean;
+static gint hf_epl_od_int;
+static gint hf_epl_od_uint;
+static gint hf_epl_od_real;
+static gint hf_epl_od_string;
+static gint hf_epl_od_octet_string;
+static gint hf_epl_od_time;
 #if 0
-static gint hf_epl_od_time_difference = -1;
-static gint hf_epl_od_domain     = -1;
+static gint hf_epl_od_time_difference;
+static gint hf_epl_od_domain;
 #endif
-static gint hf_epl_od_mac        = -1;
-static gint hf_epl_od_ipv4       = -1;
+static gint hf_epl_od_mac;
+static gint hf_epl_od_ipv4;
 
 #define EPL_PDO_TYPE_COUNT 8
 
@@ -1752,8 +1752,8 @@ static const struct epl_datatype {
 };
 
 
-static gint ett_epl_fragment                                 = -1;
-static gint ett_epl_fragments                                = -1;
+static gint ett_epl_fragment;
+static gint ett_epl_fragments;
 
 static const fragment_items epl_frag_items = {
 	/* Fragment subtrees */
@@ -1778,45 +1778,45 @@ static const fragment_items epl_frag_items = {
 	"Message fragments"
 };
 
-static gint hf_epl_asnd_sdo_cmd_abort_code                   = -1;
+static gint hf_epl_asnd_sdo_cmd_abort_code;
 #if 0
-static gint hf_epl_asnd_sdo_cmd_abort_flag                   = -1;
-static gint hf_epl_asnd_sdo_cmd_segmentation_flag            = -1;
-static gint hf_epl_asnd_sdo_cmd_cmd_valid_test               = -1;
+static gint hf_epl_asnd_sdo_cmd_abort_flag;
+static gint hf_epl_asnd_sdo_cmd_segmentation_flag;
+static gint hf_epl_asnd_sdo_cmd_cmd_valid_test;
 
-static gint hf_epl_asnd_sdo_actual_command_id                = -1;
+static gint hf_epl_asnd_sdo_actual_command_id;
 
-static gint hf_epl_asnd_sdo_actual_segment_size              = -1;
-static gint hf_epl_asnd_sdo_actual_payload_size_read         = -1;
+static gint hf_epl_asnd_sdo_actual_segment_size;
+static gint hf_epl_asnd_sdo_actual_payload_size_read;
 #endif
 
 /* Initialize the subtree pointers */
-static gint ett_epl                 = -1;
-static gint ett_epl_soc             = -1;
-static gint ett_epl_preq            = -1;
-static gint ett_epl_pres            = -1;
-static gint ett_epl_feat            = -1;
-static gint ett_epl_seb             = -1;
-static gint ett_epl_el              = -1;
-static gint ett_epl_el_entry        = -1;
-static gint ett_epl_el_entry_type   = -1;
-static gint ett_epl_sdo_entry_type  = -1;
-static gint ett_epl_asnd_nmt_dna    = -1;
-
-static gint ett_epl_sdo                       = -1;
-static gint ett_epl_sdo_sequence_layer        = -1;
-static gint ett_epl_sdo_command_layer         = -1;
-static gint ett_epl_sdo_data                  = -1;
-static gint ett_epl_asnd_sdo_cmd_data_mapping = -1;
-static gint ett_epl_soa_sync                  = -1;
-static gint ett_epl_asnd_sync                 = -1;
-
-static gint ett_epl_pdo_meta                  = -1;
-
-static expert_field ei_duplicated_frame       = EI_INIT;
-static expert_field ei_recvseq_value          = EI_INIT;
-static expert_field ei_sendseq_value          = EI_INIT;
-static expert_field ei_real_length_differs    = EI_INIT;
+static gint ett_epl;
+static gint ett_epl_soc;
+static gint ett_epl_preq;
+static gint ett_epl_pres;
+static gint ett_epl_feat;
+static gint ett_epl_seb;
+static gint ett_epl_el;
+static gint ett_epl_el_entry;
+static gint ett_epl_el_entry_type;
+static gint ett_epl_sdo_entry_type;
+static gint ett_epl_asnd_nmt_dna;
+
+static gint ett_epl_sdo;
+static gint ett_epl_sdo_sequence_layer;
+static gint ett_epl_sdo_command_layer;
+static gint ett_epl_sdo_data;
+static gint ett_epl_asnd_sdo_cmd_data_mapping;
+static gint ett_epl_soa_sync;
+static gint ett_epl_asnd_sync;
+
+static gint ett_epl_pdo_meta;
+
+static expert_field ei_duplicated_frame;
+static expert_field ei_recvseq_value;
+static expert_field ei_sendseq_value;
+static expert_field ei_real_length_differs;
 
 static dissector_handle_t epl_handle;
 static dissector_handle_t epl_udp_handle;
@@ -1827,7 +1827,7 @@ static gboolean use_xdc_mappings = TRUE;
 static gboolean interpret_untyped_as_le = TRUE;
 static gboolean use_sdo_mappings = TRUE;
 
-static gint ett_epl_asnd_sdo_data_reassembled = -1;
+static gint ett_epl_asnd_sdo_data_reassembled;
 
 static reassembly_table epl_reassembly_table;
 static GHashTable *epl_duplication_table = NULL;
diff --git a/epan/dissectors/packet-epl_v1.c b/epan/dissectors/packet-epl_v1.c
index 5c81dd75a0..0e95d1efcb 100644
--- a/epan/dissectors/packet-epl_v1.c
+++ b/epan/dissectors/packet-epl_v1.c
@@ -133,48 +133,48 @@ static const value_string eoc_net_command_vals[] = {
 
 
 /* Initialize the protocol and registered fields */
-static int proto_epl_v1                           = -1;
-static int hf_epl_v1_service                      = -1;
-static int hf_epl_v1_dest                         = -1;
-static int hf_epl_v1_src                          = -1;
-
-static int hf_epl_v1_soc_ms                       = -1;
-static int hf_epl_v1_soc_ps                       = -1;
-static int hf_epl_v1_soc_net_command              = -1;
-static int hf_epl_v1_soc_net_time                 = -1;
-static int hf_epl_v1_soc_powerlink_cycle_time     = -1;
-static int hf_epl_v1_soc_net_command_parameter    = -1;
-
-static int hf_epl_v1_preq_ms                      = -1;
-static int hf_epl_v1_preq_rd                      = -1;
-static int hf_epl_v1_preq_poll_size_out           = -1;
-static int hf_epl_v1_preq_out_data                = -1;
-
-static int hf_epl_v1_pres_ms                      = -1;
-static int hf_epl_v1_pres_ex                      = -1;
-static int hf_epl_v1_pres_rs                      = -1;
-static int hf_epl_v1_pres_wa                      = -1;
-static int hf_epl_v1_pres_er                      = -1;
-static int hf_epl_v1_pres_rd                      = -1;
-static int hf_epl_v1_pres_poll_size_in            = -1;
-static int hf_epl_v1_pres_in_data                 = -1;
-
-static int hf_epl_v1_eoc_net_command              = -1;
-static int hf_epl_v1_eoc_net_command_parameter    = -1;
-
-static int hf_epl_v1_ainv_channel                 = -1;
-
-static int hf_epl_v1_asnd_channel                 = -1;
-static int hf_epl_v1_asnd_size                    = -1;
-static int hf_epl_v1_asnd_data                    = -1;
-static int hf_epl_v1_asnd_node_id                 = -1;
-static int hf_epl_v1_asnd_hardware_revision       = -1;
-static int hf_epl_v1_asnd_firmware_version        = -1;
-static int hf_epl_v1_asnd_device_variant          = -1;
-static int hf_epl_v1_asnd_poll_in_size            = -1;
-static int hf_epl_v1_asnd_poll_out_size           = -1;
-
-static gint ett_epl_v1 = -1;
+static int proto_epl_v1;
+static int hf_epl_v1_service;
+static int hf_epl_v1_dest;
+static int hf_epl_v1_src;
+
+static int hf_epl_v1_soc_ms;
+static int hf_epl_v1_soc_ps;
+static int hf_epl_v1_soc_net_command;
+static int hf_epl_v1_soc_net_time;
+static int hf_epl_v1_soc_powerlink_cycle_time;
+static int hf_epl_v1_soc_net_command_parameter;
+
+static int hf_epl_v1_preq_ms;
+static int hf_epl_v1_preq_rd;
+static int hf_epl_v1_preq_poll_size_out;
+static int hf_epl_v1_preq_out_data;
+
+static int hf_epl_v1_pres_ms;
+static int hf_epl_v1_pres_ex;
+static int hf_epl_v1_pres_rs;
+static int hf_epl_v1_pres_wa;
+static int hf_epl_v1_pres_er;
+static int hf_epl_v1_pres_rd;
+static int hf_epl_v1_pres_poll_size_in;
+static int hf_epl_v1_pres_in_data;
+
+static int hf_epl_v1_eoc_net_command;
+static int hf_epl_v1_eoc_net_command_parameter;
+
+static int hf_epl_v1_ainv_channel;
+
+static int hf_epl_v1_asnd_channel;
+static int hf_epl_v1_asnd_size;
+static int hf_epl_v1_asnd_data;
+static int hf_epl_v1_asnd_node_id;
+static int hf_epl_v1_asnd_hardware_revision;
+static int hf_epl_v1_asnd_firmware_version;
+static int hf_epl_v1_asnd_device_variant;
+static int hf_epl_v1_asnd_poll_in_size;
+static int hf_epl_v1_asnd_poll_out_size;
+
+static gint ett_epl_v1;
 
 
 static gint
diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c
index 9a23695b8d..092a2732cf 100644
--- a/epan/dissectors/packet-epmd.c
+++ b/epan/dissectors/packet-epmd.c
@@ -29,23 +29,23 @@
 void proto_register_epmd(void);
 void proto_reg_handoff_epmd(void);
 
-static int proto_epmd = -1;
-static int hf_epmd_len = -1;
-static int hf_epmd_type = -1;
-static int hf_epmd_port_no = -1;
-static int hf_epmd_node_type = -1;
-static int hf_epmd_protocol = -1;
-static int hf_epmd_dist_high = -1;
-static int hf_epmd_dist_low = -1;
-static int hf_epmd_name_len = -1;
-static int hf_epmd_name = -1;
-static int hf_epmd_elen = -1;
-static int hf_epmd_edata = -1;
-static int hf_epmd_names = -1;
-static int hf_epmd_result = -1;
-static int hf_epmd_creation = -1;
-
-static gint ett_epmd = -1;
+static int proto_epmd;
+static int hf_epmd_len;
+static int hf_epmd_type;
+static int hf_epmd_port_no;
+static int hf_epmd_node_type;
+static int hf_epmd_protocol;
+static int hf_epmd_dist_high;
+static int hf_epmd_dist_low;
+static int hf_epmd_name_len;
+static int hf_epmd_name;
+static int hf_epmd_elen;
+static int hf_epmd_edata;
+static int hf_epmd_names;
+static int hf_epmd_result;
+static int hf_epmd_creation;
+
+static gint ett_epmd;
 
 static dissector_handle_t epmd_handle = NULL;
 
diff --git a/epan/dissectors/packet-epon.c b/epan/dissectors/packet-epon.c
index 0ace6ab073..718f80c9eb 100644
--- a/epan/dissectors/packet-epon.c
+++ b/epan/dissectors/packet-epon.c
@@ -28,28 +28,28 @@ void proto_reg_handoff_epon(void);
 
 static dissector_handle_t epon_handle;
 
-static int proto_epon = -1;
-static int hf_epon_dpoe_security = -1;
-static int hf_epon_dpoe_encrypted = -1;
-static int hf_epon_dpoe_reserved = -1;
-static int hf_epon_dpoe_encrypted_data = -1;
-static int hf_epon_dpoe_keyid = -1;
-static int hf_epon_mode = -1;
-static int hf_epon_llid = -1;
-static int hf_epon_checksum = -1;
-static int hf_epon_checksum_status = -1;
-
-static expert_field ei_epon_sld_bad = EI_INIT;
-static expert_field ei_epon_dpoe_reserved_bad = EI_INIT;
-static expert_field ei_epon_dpoe_bad = EI_INIT;
-static expert_field ei_epon_dpoe_encrypted_data = EI_INIT;
-static expert_field ei_epon_checksum_bad = EI_INIT;
+static int proto_epon;
+static int hf_epon_dpoe_security;
+static int hf_epon_dpoe_encrypted;
+static int hf_epon_dpoe_reserved;
+static int hf_epon_dpoe_encrypted_data;
+static int hf_epon_dpoe_keyid;
+static int hf_epon_mode;
+static int hf_epon_llid;
+static int hf_epon_checksum;
+static int hf_epon_checksum_status;
+
+static expert_field ei_epon_sld_bad;
+static expert_field ei_epon_dpoe_reserved_bad;
+static expert_field ei_epon_dpoe_bad;
+static expert_field ei_epon_dpoe_encrypted_data;
+static expert_field ei_epon_checksum_bad;
 
 static dissector_handle_t eth_maybefcs_handle;
 
-static gint ett_epon = -1;
-static gint ett_epon_sec = -1;
-static gint ett_epon_checksum = -1;
+static gint ett_epon;
+static gint ett_epon_sec;
+static gint ett_epon_checksum;
 
 static const true_false_string epon_mode_tfs = {
   "Broadcast/Multicast",
diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c
index c72479706b..738dbe755d 100644
--- a/epan/dissectors/packet-erf.c
+++ b/epan/dissectors/packet-erf.c
@@ -47,226 +47,226 @@ static dissector_handle_t erf_handle;
 static dissector_table_t erf_dissector_table;
 
 /* Initialize the protocol and registered fields */
-static int proto_erf = -1;
-
-static int hf_erf_ts          = -1;
-static int hf_erf_rectype     = -1;
-static int hf_erf_type        = -1;
-static int hf_erf_ehdr        = -1;
-static int hf_erf_ehdr_t      = -1;
-static int hf_erf_flags       = -1;
-static int hf_erf_flags_cap   = -1;
-static int hf_erf_flags_vlen  = -1;
-static int hf_erf_flags_trunc = -1;
-static int hf_erf_flags_rxe   = -1;
-static int hf_erf_flags_dse   = -1;
-static int hf_erf_flags_res   = -1;
-
-static int hf_erf_rlen = -1;
-static int hf_erf_lctr = -1;
-static int hf_erf_color = -1;
-static int hf_erf_wlen = -1;
+static int proto_erf;
+
+static int hf_erf_ts;
+static int hf_erf_rectype;
+static int hf_erf_type;
+static int hf_erf_ehdr;
+static int hf_erf_ehdr_t;
+static int hf_erf_flags;
+static int hf_erf_flags_cap;
+static int hf_erf_flags_vlen;
+static int hf_erf_flags_trunc;
+static int hf_erf_flags_rxe;
+static int hf_erf_flags_dse;
+static int hf_erf_flags_res;
+
+static int hf_erf_rlen;
+static int hf_erf_lctr;
+static int hf_erf_color;
+static int hf_erf_wlen;
 
 /* Classification extension header */
 
 /* InterceptID extension header */
-static int hf_erf_ehdr_int_res1 = -1;
-static int hf_erf_ehdr_int_id   = -1;
-static int hf_erf_ehdr_int_res2 = -1;
+static int hf_erf_ehdr_int_res1;
+static int hf_erf_ehdr_int_id;
+static int hf_erf_ehdr_int_res2;
 
 /* Raw Link extension header */
-static int hf_erf_ehdr_raw_link_res    = -1;
-static int hf_erf_ehdr_raw_link_seqnum = -1;
-static int hf_erf_ehdr_raw_link_rate   = -1;
-static int hf_erf_ehdr_raw_link_type   = -1;
+static int hf_erf_ehdr_raw_link_res;
+static int hf_erf_ehdr_raw_link_seqnum;
+static int hf_erf_ehdr_raw_link_rate;
+static int hf_erf_ehdr_raw_link_type;
 
 /* Classification extension header */
-static int hf_erf_ehdr_class_flags      = -1;
-static int hf_erf_ehdr_class_flags_sh   = -1;
-static int hf_erf_ehdr_class_flags_shm  = -1;
-static int hf_erf_ehdr_class_flags_res1 = -1;
-static int hf_erf_ehdr_class_flags_user = -1;
-static int hf_erf_ehdr_class_flags_res2 = -1;
-static int hf_erf_ehdr_class_flags_drop = -1;
-static int hf_erf_ehdr_class_flags_str  = -1;
-static int hf_erf_ehdr_class_seqnum     = -1;
+static int hf_erf_ehdr_class_flags;
+static int hf_erf_ehdr_class_flags_sh;
+static int hf_erf_ehdr_class_flags_shm;
+static int hf_erf_ehdr_class_flags_res1;
+static int hf_erf_ehdr_class_flags_user;
+static int hf_erf_ehdr_class_flags_res2;
+static int hf_erf_ehdr_class_flags_drop;
+static int hf_erf_ehdr_class_flags_str;
+static int hf_erf_ehdr_class_seqnum;
 
 /* BFS extension header */
-static int hf_erf_ehdr_bfs_hash     = -1;
-static int hf_erf_ehdr_bfs_color    = -1;
-static int hf_erf_ehdr_bfs_raw_hash = -1;
+static int hf_erf_ehdr_bfs_hash;
+static int hf_erf_ehdr_bfs_color;
+static int hf_erf_ehdr_bfs_raw_hash;
 
 /* Channelised extension header */
-static int hf_erf_ehdr_chan_morebits                  = -1;
-static int hf_erf_ehdr_chan_morefrag                  = -1;
-static int hf_erf_ehdr_chan_seqnum                    = -1;
-static int hf_erf_ehdr_chan_res                       = -1;
-static int hf_erf_ehdr_chan_virt_container_id         = -1;
-static int hf_erf_ehdr_chan_assoc_virt_container_size = -1;
-static int hf_erf_ehdr_chan_rate                      = -1;
-static int hf_erf_ehdr_chan_type                      = -1;
+static int hf_erf_ehdr_chan_morebits;
+static int hf_erf_ehdr_chan_morefrag;
+static int hf_erf_ehdr_chan_seqnum;
+static int hf_erf_ehdr_chan_res;
+static int hf_erf_ehdr_chan_virt_container_id;
+static int hf_erf_ehdr_chan_assoc_virt_container_size;
+static int hf_erf_ehdr_chan_rate;
+static int hf_erf_ehdr_chan_type;
 
 /* Filter Hash extension header */
-static int hf_erf_ehdr_signature_payload_hash = -1;
-static int hf_erf_ehdr_signature_color = -1;
-static int hf_erf_ehdr_signature_flow_hash = -1;
+static int hf_erf_ehdr_signature_payload_hash;
+static int hf_erf_ehdr_signature_color;
+static int hf_erf_ehdr_signature_flow_hash;
 
 /* Flow ID extension header */
-static int hf_erf_ehdr_flow_id_source_id = -1;
-static int hf_erf_ehdr_flow_id_hash_type = -1;
-static int hf_erf_ehdr_flow_id_hash_type_type = -1;
-static int hf_erf_ehdr_flow_id_hash_type_inner = -1;
-static int hf_erf_ehdr_flow_id_stack_type = -1;
-static int hf_erf_ehdr_flow_id_flow_hash = -1;
+static int hf_erf_ehdr_flow_id_source_id;
+static int hf_erf_ehdr_flow_id_hash_type;
+static int hf_erf_ehdr_flow_id_hash_type_type;
+static int hf_erf_ehdr_flow_id_hash_type_inner;
+static int hf_erf_ehdr_flow_id_stack_type;
+static int hf_erf_ehdr_flow_id_flow_hash;
 
 /* Host ID extension header */
-static int hf_erf_ehdr_host_id_sourceid          = -1;
-static int hf_erf_ehdr_host_id_hostid            = -1;
+static int hf_erf_ehdr_host_id_sourceid;
+static int hf_erf_ehdr_host_id_hostid;
 
 /* Anchor ID extension header */
-static int hf_erf_ehdr_anchor_id_definition    = -1;
-static int hf_erf_ehdr_anchor_id_reserved    = -1;
-static int hf_erf_ehdr_anchor_id_anchorid   = -1;
-static int hf_erf_ehdr_anchor_id_flags   = -1;
+static int hf_erf_ehdr_anchor_id_definition;
+static int hf_erf_ehdr_anchor_id_reserved;
+static int hf_erf_ehdr_anchor_id_anchorid;
+static int hf_erf_ehdr_anchor_id_flags;
 
-static int hf_erf_anchor_linked            = -1;
-static int hf_erf_anchor_anchorid          = -1;
-static int hf_erf_anchor_hostid            = -1;
+static int hf_erf_anchor_linked;
+static int hf_erf_anchor_anchorid;
+static int hf_erf_anchor_hostid;
 
 /* Generated Host ID/Source ID */
-static int hf_erf_sourceid       = -1;
-static int hf_erf_hostid         = -1;
-static int hf_erf_source_current = -1;
-static int hf_erf_source_next    = -1;
-static int hf_erf_source_prev    = -1;
+static int hf_erf_sourceid;
+static int hf_erf_hostid;
+static int hf_erf_source_current;
+static int hf_erf_source_next;
+static int hf_erf_source_prev;
 
 /* Entropy extension header */
-static int hf_erf_ehdr_entropy_entropy = -1;
-static int hf_erf_ehdr_entropy_entropy_raw = -1;
-static int hf_erf_ehdr_entropy_reserved = -1;
+static int hf_erf_ehdr_entropy_entropy;
+static int hf_erf_ehdr_entropy_entropy_raw;
+static int hf_erf_ehdr_entropy_reserved;
 
 /* Unknown extension header */
-static int hf_erf_ehdr_unk = -1;
+static int hf_erf_ehdr_unk;
 
 /* MC HDLC Header */
-static int hf_erf_mc_hdlc        = -1;
-static int hf_erf_mc_hdlc_cn     = -1;
-static int hf_erf_mc_hdlc_res1   = -1;
-static int hf_erf_mc_hdlc_res2   = -1;
-static int hf_erf_mc_hdlc_fcse   = -1;
-static int hf_erf_mc_hdlc_sre    = -1;
-static int hf_erf_mc_hdlc_lre    = -1;
-static int hf_erf_mc_hdlc_afe    = -1;
-static int hf_erf_mc_hdlc_oe     = -1;
-static int hf_erf_mc_hdlc_lbe    = -1;
-static int hf_erf_mc_hdlc_first  = -1;
-static int hf_erf_mc_hdlc_res3   = -1;
+static int hf_erf_mc_hdlc;
+static int hf_erf_mc_hdlc_cn;
+static int hf_erf_mc_hdlc_res1;
+static int hf_erf_mc_hdlc_res2;
+static int hf_erf_mc_hdlc_fcse;
+static int hf_erf_mc_hdlc_sre;
+static int hf_erf_mc_hdlc_lre;
+static int hf_erf_mc_hdlc_afe;
+static int hf_erf_mc_hdlc_oe;
+static int hf_erf_mc_hdlc_lbe;
+static int hf_erf_mc_hdlc_first;
+static int hf_erf_mc_hdlc_res3;
 
 /* MC RAW Header */
-static int hf_erf_mc_raw       = -1;
-static int hf_erf_mc_raw_int   = -1;
-static int hf_erf_mc_raw_res1  = -1;
-static int hf_erf_mc_raw_sre   = -1;
-static int hf_erf_mc_raw_lre   = -1;
-static int hf_erf_mc_raw_res2  = -1;
-static int hf_erf_mc_raw_lbe   = -1;
-static int hf_erf_mc_raw_first = -1;
-static int hf_erf_mc_raw_res3  = -1;
+static int hf_erf_mc_raw;
+static int hf_erf_mc_raw_int;
+static int hf_erf_mc_raw_res1;
+static int hf_erf_mc_raw_sre;
+static int hf_erf_mc_raw_lre;
+static int hf_erf_mc_raw_res2;
+static int hf_erf_mc_raw_lbe;
+static int hf_erf_mc_raw_first;
+static int hf_erf_mc_raw_res3;
 
 /* MC ATM Header */
-static int hf_erf_mc_atm         = -1;
-static int hf_erf_mc_atm_cn      = -1;
-static int hf_erf_mc_atm_res1    = -1;
-static int hf_erf_mc_atm_mul     = -1;
-static int hf_erf_mc_atm_port    = -1;
-static int hf_erf_mc_atm_res2    = -1;
-static int hf_erf_mc_atm_lbe     = -1;
-static int hf_erf_mc_atm_hec     = -1;
-static int hf_erf_mc_atm_crc10   = -1;
-static int hf_erf_mc_atm_oamcell = -1;
-static int hf_erf_mc_atm_first   = -1;
-static int hf_erf_mc_atm_res3    = -1;
+static int hf_erf_mc_atm;
+static int hf_erf_mc_atm_cn;
+static int hf_erf_mc_atm_res1;
+static int hf_erf_mc_atm_mul;
+static int hf_erf_mc_atm_port;
+static int hf_erf_mc_atm_res2;
+static int hf_erf_mc_atm_lbe;
+static int hf_erf_mc_atm_hec;
+static int hf_erf_mc_atm_crc10;
+static int hf_erf_mc_atm_oamcell;
+static int hf_erf_mc_atm_first;
+static int hf_erf_mc_atm_res3;
 
 /* MC Raw link Header */
-static int hf_erf_mc_rawl       = -1;
-static int hf_erf_mc_rawl_cn    = -1;
-static int hf_erf_mc_rawl_res1  = -1;
-static int hf_erf_mc_rawl_lbe   = -1;
-static int hf_erf_mc_rawl_first = -1;
-static int hf_erf_mc_rawl_res2  = -1;
+static int hf_erf_mc_rawl;
+static int hf_erf_mc_rawl_cn;
+static int hf_erf_mc_rawl_res1;
+static int hf_erf_mc_rawl_lbe;
+static int hf_erf_mc_rawl_first;
+static int hf_erf_mc_rawl_res2;
 
 /* MC AAL5 Header */
-static int hf_erf_mc_aal5       = -1;
-static int hf_erf_mc_aal5_cn    = -1;
-static int hf_erf_mc_aal5_res1  = -1;
-static int hf_erf_mc_aal5_port  = -1;
-static int hf_erf_mc_aal5_crcck = -1;
-static int hf_erf_mc_aal5_crce  = -1;
-static int hf_erf_mc_aal5_lenck = -1;
-static int hf_erf_mc_aal5_lene  = -1;
-static int hf_erf_mc_aal5_res2  = -1;
-static int hf_erf_mc_aal5_first = -1;
-static int hf_erf_mc_aal5_res3  = -1;
+static int hf_erf_mc_aal5;
+static int hf_erf_mc_aal5_cn;
+static int hf_erf_mc_aal5_res1;
+static int hf_erf_mc_aal5_port;
+static int hf_erf_mc_aal5_crcck;
+static int hf_erf_mc_aal5_crce;
+static int hf_erf_mc_aal5_lenck;
+static int hf_erf_mc_aal5_lene;
+static int hf_erf_mc_aal5_res2;
+static int hf_erf_mc_aal5_first;
+static int hf_erf_mc_aal5_res3;
 
 /* MC AAL2 Header */
-static int hf_erf_mc_aal2       = -1;
-static int hf_erf_mc_aal2_cn    = -1;
-static int hf_erf_mc_aal2_res1  = -1;
-static int hf_erf_mc_aal2_res2  = -1;
-static int hf_erf_mc_aal2_port  = -1;
-static int hf_erf_mc_aal2_res3  = -1;
-static int hf_erf_mc_aal2_first = -1;
-static int hf_erf_mc_aal2_maale = -1;
-static int hf_erf_mc_aal2_lene  = -1;
-static int hf_erf_mc_aal2_cid   = -1;
+static int hf_erf_mc_aal2;
+static int hf_erf_mc_aal2_cn;
+static int hf_erf_mc_aal2_res1;
+static int hf_erf_mc_aal2_res2;
+static int hf_erf_mc_aal2_port;
+static int hf_erf_mc_aal2_res3;
+static int hf_erf_mc_aal2_first;
+static int hf_erf_mc_aal2_maale;
+static int hf_erf_mc_aal2_lene;
+static int hf_erf_mc_aal2_cid;
 
 /* AAL2 Header */
-static int hf_erf_aal2        = -1;
-static int hf_erf_aal2_cid    = -1;
-static int hf_erf_aal2_maale  = -1;
-static int hf_erf_aal2_maalei = -1;
-static int hf_erf_aal2_first  = -1;
-static int hf_erf_aal2_res1   = -1;
+static int hf_erf_aal2;
+static int hf_erf_aal2_cid;
+static int hf_erf_aal2_maale;
+static int hf_erf_aal2_maalei;
+static int hf_erf_aal2_first;
+static int hf_erf_aal2_res1;
 
 /* ERF Ethernet header/pad */
-static int hf_erf_eth      = -1;
-static int hf_erf_eth_off  = -1;
-static int hf_erf_eth_pad  = -1;
+static int hf_erf_eth;
+static int hf_erf_eth_off;
+static int hf_erf_eth_pad;
 
 /* ERF Meta record tag */
-static int hf_erf_meta_tag_type   = -1;
-static int hf_erf_meta_tag_len  = -1;
-static int hf_erf_meta_tag_unknown  = -1;
+static int hf_erf_meta_tag_type;
+static int hf_erf_meta_tag_len;
+static int hf_erf_meta_tag_unknown;
 
 /* Initialize the subtree pointers */
-static gint ett_erf            = -1;
-static gint ett_erf_pseudo_hdr = -1;
-static gint ett_erf_rectype    = -1;
-static gint ett_erf_hash_type  = -1;
-static gint ett_erf_flags      = -1;
-static gint ett_erf_mc_hdlc    = -1;
-static gint ett_erf_mc_raw     = -1;
-static gint ett_erf_mc_atm     = -1;
-static gint ett_erf_mc_rawlink = -1;
-static gint ett_erf_mc_aal5    = -1;
-static gint ett_erf_mc_aal2    = -1;
-static gint ett_erf_aal2       = -1;
-static gint ett_erf_eth        = -1;
-static gint ett_erf_meta       = -1;
-static gint ett_erf_meta_tag   = -1;
-static gint ett_erf_source     = -1;
-static gint ett_erf_anchor     = -1;
-static gint ett_erf_anchor_flags = -1;
-static gint ett_erf_entropy_value = -1;
-
-static expert_field ei_erf_extension_headers_not_shown = EI_INIT;
-static expert_field ei_erf_packet_loss = EI_INIT;
-static expert_field ei_erf_checksum_error = EI_INIT;
-static expert_field ei_erf_meta_section_len_error = EI_INIT;
-static expert_field ei_erf_meta_truncated_record = EI_INIT;
-static expert_field ei_erf_meta_truncated_tag = EI_INIT;
-static expert_field ei_erf_meta_zero_len_tag = EI_INIT;
-static expert_field ei_erf_meta_reset = EI_INIT;
+static gint ett_erf;
+static gint ett_erf_pseudo_hdr;
+static gint ett_erf_rectype;
+static gint ett_erf_hash_type;
+static gint ett_erf_flags;
+static gint ett_erf_mc_hdlc;
+static gint ett_erf_mc_raw;
+static gint ett_erf_mc_atm;
+static gint ett_erf_mc_rawlink;
+static gint ett_erf_mc_aal5;
+static gint ett_erf_mc_aal2;
+static gint ett_erf_aal2;
+static gint ett_erf_eth;
+static gint ett_erf_meta;
+static gint ett_erf_meta_tag;
+static gint ett_erf_source;
+static gint ett_erf_anchor;
+static gint ett_erf_anchor_flags;
+static gint ett_erf_entropy_value;
+
+static expert_field ei_erf_extension_headers_not_shown;
+static expert_field ei_erf_packet_loss;
+static expert_field ei_erf_checksum_error;
+static expert_field ei_erf_meta_section_len_error;
+static expert_field ei_erf_meta_truncated_record;
+static expert_field ei_erf_meta_truncated_tag;
+static expert_field ei_erf_meta_zero_len_tag;
+static expert_field ei_erf_meta_reset;
 
 typedef enum {
   ERF_HDLC_CHDLC  = 0,
diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c
index d7712e5091..76fedc42c6 100644
--- a/epan/dissectors/packet-erldp.c
+++ b/epan/dissectors/packet-erldp.c
@@ -138,123 +138,123 @@ static const value_string erldp_ctlmsg_vals[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_erldp = -1;
-static int hf_erldp_length_2 = -1;
-static int hf_erldp_length_4 = -1;
-static int hf_etf_version_magic = -1;
-static int hf_erldp_tag = -1;
-static int hf_erldp_type = -1;
-static int hf_erldp_version = -1;
-static int hf_erldp_flags_v5 = -1;
-static int hf_erldp_flags_v6 = -1;
-static int hf_erldp_flags_published = -1;
-static int hf_erldp_flags_atom_cache = -1;
-static int hf_erldp_flags_extended_references = -1;
-static int hf_erldp_flags_dist_monitor = -1;
-static int hf_erldp_flags_fun_tags = -1;
-static int hf_erldp_flags_dist_monitor_name = -1;
-static int hf_erldp_flags_hidden_atom_cache = -1;
-static int hf_erldp_flags_new_fun_tags = -1;
-static int hf_erldp_flags_extended_pids_ports = -1;
-static int hf_erldp_flags_export_ptr_tag = -1;
-static int hf_erldp_flags_bit_binaries = -1;
-static int hf_erldp_flags_new_floats = -1;
-static int hf_erldp_flags_unicode_io = -1;
-static int hf_erldp_flags_dist_hdr_atom_cache = -1;
-static int hf_erldp_flags_small_atom_tags = -1;
-static int hf_erldp_flags_ets_compressed = -1;
-static int hf_erldp_flags_utf8_atoms = -1;
-static int hf_erldp_flags_map_tag = -1;
-static int hf_erldp_flags_big_creation = -1;
-static int hf_erldp_flags_send_sender = -1;
-static int hf_erldp_flags_big_seqtrace_labels = -1;
-static int hf_erldp_flags_pending_connect = -1;
-static int hf_erldp_flags_exit_payload = -1;
-static int hf_erldp_flags_fragments = -1;
-static int hf_erldp_flags_handshake_23 = -1;
-static int hf_erldp_flags_unlink_id = -1;
-static int hf_erldp_flags_reserved = -1;
-static int hf_erldp_flags_spawn = -1;
-static int hf_erldp_flags_name_me = -1;
-static int hf_erldp_flags_v4_nc = -1;
-static int hf_erldp_flags_alias = -1;
-static int hf_erldp_flags_spare = -1;
-static int hf_erldp_creation = -1;
-static int hf_erldp_challenge = -1;
-static int hf_erldp_digest = -1;
-static int hf_erldp_nlen = -1;
-static int hf_erldp_name = -1;
-static int hf_erldp_status = -1;
-static int hf_erldp_sequence_id = -1;
-static int hf_erldp_fragment_id = -1;
-static int hf_erldp_num_atom_cache_refs = -1;
-static int hf_erldp_etf_flags = -1;
-static int hf_erldp_internal_segment_index = -1;
-static int hf_erldp_atom_length = -1;
-static int hf_erldp_atom_length2 = -1;
-static int hf_erldp_atom_text = -1;
-static int hf_erldp_atom_cache_ref = -1;
-static int hf_erldp_small_int_ext = -1;
-static int hf_erldp_int_ext = -1;
-static int hf_erldp_small_big_ext_len = -1;
-static int hf_erldp_large_big_ext_len = -1;
-static int hf_erldp_big_ext_int = -1;
-static int hf_erldp_big_ext_str = -1;
-static int hf_erldp_big_ext_bytes = -1;
-static int hf_erldp_float_ext = -1;
-static int hf_erldp_new_float_ext = -1;
-static int hf_erldp_port_ext_id = -1;
-static int hf_erldp_port_ext_creation = -1;
-static int hf_erldp_pid_ext_id = -1;
-static int hf_erldp_pid_ext_serial = -1;
-static int hf_erldp_pid_ext_creation = -1;
-static int hf_erldp_list_ext_len = -1;
-static int hf_erldp_binary_ext_len = -1;
-static int hf_erldp_binary_ext = -1;
-static int hf_erldp_new_ref_ext_len = -1;
-static int hf_erldp_new_ref_ext_creation = -1;
-static int hf_erldp_new_ref_ext_id = -1;
-static int hf_erldp_fun_ext_num_free = -1;
-static int hf_erldp_new_fun_ext_size = -1;
-static int hf_erldp_new_fun_ext_arity = -1;
-static int hf_erldp_new_fun_ext_uniq = -1;
-static int hf_erldp_new_fun_ext_index = -1;
-static int hf_erldp_new_fun_ext_num_free = -1;
-
-static int hf_etf_tag = -1;
-static int hf_etf_dist_header_tag = -1;
-static int hf_etf_dist_header_new_cache = -1;
-static int hf_etf_dist_header_segment_index = -1;
-static int hf_etf_dist_header_long_atoms = -1;
-static int hf_etf_arity4 = -1;
-static int hf_etf_arity = -1;
-
-static int hf_etf_fragments = -1;
-static int hf_etf_fragment = -1;
-static int hf_etf_fragment_overlap = -1;
-static int hf_etf_fragment_overlap_conflicts = -1;
-static int hf_etf_fragment_multiple_tails = -1;
-static int hf_etf_fragment_too_long_fragment = -1;
-static int hf_etf_fragment_error = -1;
-static int hf_etf_fragment_count = -1;
-static int hf_etf_reassembled_in = -1;
-static int hf_etf_reassembled_length = -1;
-static int hf_etf_reassembled_data = -1;
+static int proto_erldp;
+static int hf_erldp_length_2;
+static int hf_erldp_length_4;
+static int hf_etf_version_magic;
+static int hf_erldp_tag;
+static int hf_erldp_type;
+static int hf_erldp_version;
+static int hf_erldp_flags_v5;
+static int hf_erldp_flags_v6;
+static int hf_erldp_flags_published;
+static int hf_erldp_flags_atom_cache;
+static int hf_erldp_flags_extended_references;
+static int hf_erldp_flags_dist_monitor;
+static int hf_erldp_flags_fun_tags;
+static int hf_erldp_flags_dist_monitor_name;
+static int hf_erldp_flags_hidden_atom_cache;
+static int hf_erldp_flags_new_fun_tags;
+static int hf_erldp_flags_extended_pids_ports;
+static int hf_erldp_flags_export_ptr_tag;
+static int hf_erldp_flags_bit_binaries;
+static int hf_erldp_flags_new_floats;
+static int hf_erldp_flags_unicode_io;
+static int hf_erldp_flags_dist_hdr_atom_cache;
+static int hf_erldp_flags_small_atom_tags;
+static int hf_erldp_flags_ets_compressed;
+static int hf_erldp_flags_utf8_atoms;
+static int hf_erldp_flags_map_tag;
+static int hf_erldp_flags_big_creation;
+static int hf_erldp_flags_send_sender;
+static int hf_erldp_flags_big_seqtrace_labels;
+static int hf_erldp_flags_pending_connect;
+static int hf_erldp_flags_exit_payload;
+static int hf_erldp_flags_fragments;
+static int hf_erldp_flags_handshake_23;
+static int hf_erldp_flags_unlink_id;
+static int hf_erldp_flags_reserved;
+static int hf_erldp_flags_spawn;
+static int hf_erldp_flags_name_me;
+static int hf_erldp_flags_v4_nc;
+static int hf_erldp_flags_alias;
+static int hf_erldp_flags_spare;
+static int hf_erldp_creation;
+static int hf_erldp_challenge;
+static int hf_erldp_digest;
+static int hf_erldp_nlen;
+static int hf_erldp_name;
+static int hf_erldp_status;
+static int hf_erldp_sequence_id;
+static int hf_erldp_fragment_id;
+static int hf_erldp_num_atom_cache_refs;
+static int hf_erldp_etf_flags;
+static int hf_erldp_internal_segment_index;
+static int hf_erldp_atom_length;
+static int hf_erldp_atom_length2;
+static int hf_erldp_atom_text;
+static int hf_erldp_atom_cache_ref;
+static int hf_erldp_small_int_ext;
+static int hf_erldp_int_ext;
+static int hf_erldp_small_big_ext_len;
+static int hf_erldp_large_big_ext_len;
+static int hf_erldp_big_ext_int;
+static int hf_erldp_big_ext_str;
+static int hf_erldp_big_ext_bytes;
+static int hf_erldp_float_ext;
+static int hf_erldp_new_float_ext;
+static int hf_erldp_port_ext_id;
+static int hf_erldp_port_ext_creation;
+static int hf_erldp_pid_ext_id;
+static int hf_erldp_pid_ext_serial;
+static int hf_erldp_pid_ext_creation;
+static int hf_erldp_list_ext_len;
+static int hf_erldp_binary_ext_len;
+static int hf_erldp_binary_ext;
+static int hf_erldp_new_ref_ext_len;
+static int hf_erldp_new_ref_ext_creation;
+static int hf_erldp_new_ref_ext_id;
+static int hf_erldp_fun_ext_num_free;
+static int hf_erldp_new_fun_ext_size;
+static int hf_erldp_new_fun_ext_arity;
+static int hf_erldp_new_fun_ext_uniq;
+static int hf_erldp_new_fun_ext_index;
+static int hf_erldp_new_fun_ext_num_free;
+
+static int hf_etf_tag;
+static int hf_etf_dist_header_tag;
+static int hf_etf_dist_header_new_cache;
+static int hf_etf_dist_header_segment_index;
+static int hf_etf_dist_header_long_atoms;
+static int hf_etf_arity4;
+static int hf_etf_arity;
+
+static int hf_etf_fragments;
+static int hf_etf_fragment;
+static int hf_etf_fragment_overlap;
+static int hf_etf_fragment_overlap_conflicts;
+static int hf_etf_fragment_multiple_tails;
+static int hf_etf_fragment_too_long_fragment;
+static int hf_etf_fragment_error;
+static int hf_etf_fragment_count;
+static int hf_etf_reassembled_in;
+static int hf_etf_reassembled_length;
+static int hf_etf_reassembled_data;
 
 static reassembly_table erldp_reassembly_table;
 
 /* Initialize the subtree pointers */
-static gint ett_erldp = -1;
-static gint ett_erldp_flags = -1;
+static gint ett_erldp;
+static gint ett_erldp_flags;
 
-static gint ett_etf = -1;
-static gint ett_etf_flags = -1;
-static gint ett_etf_acrs = -1;
-static gint ett_etf_acr = -1;
-static gint ett_etf_tmp = -1;
+static gint ett_etf;
+static gint ett_etf_flags;
+static gint ett_etf_acrs;
+static gint ett_etf_acr;
+static gint ett_etf_tmp;
 
-static gint ett_etf_fragment = -1;
-static gint ett_etf_fragments = -1;
+static gint ett_etf_fragment;
+static gint ett_etf_fragments;
 
 /* Preferences */
 static gboolean erldp_desegment = TRUE;
diff --git a/epan/dissectors/packet-esio.c b/epan/dissectors/packet-esio.c
index fbb40672f5..c2b1784e19 100644
--- a/epan/dissectors/packet-esio.c
+++ b/epan/dissectors/packet-esio.c
@@ -26,34 +26,34 @@ static dissector_handle_t esio_handle;
 #define ESIO_UDP_PORT       6060 /* Not IANA registered */
 
 /* Initialize the protocol and registered fields */
-static int proto_esio = -1;
-static int hf_esio_type = -1;
-static int hf_esio_version = -1;
-static int hf_esio_length = -1;
-static int hf_esio_transaction_id = -1;
-static int hf_esio_tlg_id = -1;
-static int hf_esio_src_stn_id = -1;
-static int hf_esio_data_nbr = -1;
-static int hf_esio_data_flags = -1;
-static int hf_esio_data_transfer_id = -1;
-static int hf_esio_data_dest_id = -1;
-static int hf_esio_data_length = -1;
-static int hf_esio_data = -1;
-static int hf_esio_sts_type = -1;
-static int hf_esio_sts_size = -1;
-static int hf_esio_rio_sts = -1;
-static int hf_esio_rio_tlgs_lost = -1;
-static int hf_esio_rio_diag = -1;
-static int hf_esio_rio_flags = -1;
+static int proto_esio;
+static int hf_esio_type;
+static int hf_esio_version;
+static int hf_esio_length;
+static int hf_esio_transaction_id;
+static int hf_esio_tlg_id;
+static int hf_esio_src_stn_id;
+static int hf_esio_data_nbr;
+static int hf_esio_data_flags;
+static int hf_esio_data_transfer_id;
+static int hf_esio_data_dest_id;
+static int hf_esio_data_length;
+static int hf_esio_data;
+static int hf_esio_sts_type;
+static int hf_esio_sts_size;
+static int hf_esio_rio_sts;
+static int hf_esio_rio_tlgs_lost;
+static int hf_esio_rio_diag;
+static int hf_esio_rio_flags;
 
 /* Initialize the subtree pointers */
-static gint ett_esio = -1;
-static gint ett_esio_header = -1;
-static gint ett_esio_transfer_header = -1;
-static gint ett_esio_transfer_data = -1;
-static gint ett_esio_data = -1;
+static gint ett_esio;
+static gint ett_esio_header;
+static gint ett_esio_transfer_header;
+static gint ett_esio_transfer_data;
+static gint ett_esio_data;
 
-static expert_field ei_esio_telegram_lost = EI_INIT;
+static expert_field ei_esio_telegram_lost;
 
 /* value to string definitions*/
 /* Ether-S-I/O telegram types*/
diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c
index 9713aa3b63..9c5b968def 100644
--- a/epan/dissectors/packet-esis.c
+++ b/epan/dissectors/packet-esis.c
@@ -34,38 +34,38 @@ void proto_register_esis(void);
 void proto_reg_handoff_esis(void);
 
 /* esis base header */
-static int  proto_esis        = -1;
-
-static int  hf_esis_nlpi      = -1;
-static int  hf_esis_length    = -1;
-static int  hf_esis_version   = -1;
-static int  hf_esis_reserved  = -1;
-static int  hf_esis_type      = -1;
-static int  hf_esis_holdtime  = -1;
-static int  hf_esis_checksum  = -1;
-static int  hf_esis_checksum_status  = -1;
+static int  proto_esis;
+
+static int  hf_esis_nlpi;
+static int  hf_esis_length;
+static int  hf_esis_version;
+static int  hf_esis_reserved;
+static int  hf_esis_type;
+static int  hf_esis_holdtime;
+static int  hf_esis_checksum;
+static int  hf_esis_checksum_status;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_esis_dal = -1;
-static int hf_esis_number_of_source_addresses = -1;
-static int hf_esis_netl = -1;
-static int hf_esis_sal = -1;
-static int hf_esis_sa = -1;
-static int hf_esis_bsnpal = -1;
-static int hf_esis_net = -1;
-static int hf_esis_da = -1;
-static int hf_esis_bsnpa = -1;
-
-static gint ett_esis              = -1;
-static gint ett_esis_area_addr    = -1;
-static gint ett_esis_network      = -1;
-static gint ett_esis_dest_addr    = -1;
-static gint ett_esis_subnetwork   = -1;
-
-
-static expert_field ei_esis_version = EI_INIT;
-static expert_field ei_esis_length = EI_INIT;
-static expert_field ei_esis_type = EI_INIT;
-static expert_field ei_esis_checksum = EI_INIT;
+static int hf_esis_dal;
+static int hf_esis_number_of_source_addresses;
+static int hf_esis_netl;
+static int hf_esis_sal;
+static int hf_esis_sa;
+static int hf_esis_bsnpal;
+static int hf_esis_net;
+static int hf_esis_da;
+static int hf_esis_bsnpa;
+
+static gint ett_esis;
+static gint ett_esis_area_addr;
+static gint ett_esis_network;
+static gint ett_esis_dest_addr;
+static gint ett_esis_subnetwork;
+
+
+static expert_field ei_esis_version;
+static expert_field ei_esis_length;
+static expert_field ei_esis_type;
+static expert_field ei_esis_checksum;
 
 static dissector_handle_t esis_handle;
 
diff --git a/epan/dissectors/packet-etag.c b/epan/dissectors/packet-etag.c
index 7ddb9b7ebf..0588638ba1 100644
--- a/epan/dissectors/packet-etag.c
+++ b/epan/dissectors/packet-etag.c
@@ -26,23 +26,23 @@ void proto_reg_handoff_etag(void);
 static dissector_handle_t etag_handle;
 static dissector_handle_t ethertype_handle;
 
-static int proto_etag = -1;
+static int proto_etag;
 
 static gboolean etag_summary_in_tree = TRUE;
 
-static int hf_etag_etype = -1;
-static int hf_etag_pcp = -1;
-static int hf_etag_dei = -1;
-static int hf_etag_res = -1;
-static int hf_etag_grp = -1;
-static int hf_etag_iecid_base = -1;
-static int hf_etag_iecid_ext = -1;
-static int hf_etag_ecid_base = -1;
-static int hf_etag_ecid_ext = -1;
+static int hf_etag_etype;
+static int hf_etag_pcp;
+static int hf_etag_dei;
+static int hf_etag_res;
+static int hf_etag_grp;
+static int hf_etag_iecid_base;
+static int hf_etag_iecid_ext;
+static int hf_etag_ecid_base;
+static int hf_etag_ecid_ext;
 
-static int hf_etag_trailer = -1;
+static int hf_etag_trailer;
 
-static gint ett_etag = -1;
+static gint ett_etag;
 
 #define IEEE8021BR_LEN 8    /* length including ethertype */
 
diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c
index 427ea1e572..4739d65640 100644
--- a/epan/dissectors/packet-etch.c
+++ b/epan/dissectors/packet-etch.c
@@ -90,32 +90,32 @@ static const value_string tc_lookup_table[] = {
 /*
  * Wireshark internal fields
  */
-static int proto_etch = -1;
-static gint ett_etch = -1;
-static gint ett_etch_struct = -1;
-static gint ett_etch_keyvalue = -1;
-static gint ett_etch_key = -1;
-static gint ett_etch_value = -1;
-static int hf_etch_sig = -1;
-static int hf_etch_length = -1;
-static int hf_etch_version = -1;
-static int hf_etch_typecode = -1;
-static int hf_etch_value = -1;
-static int hf_etch_bytes = -1;
-static int hf_etch_byte = -1;
-static int hf_etch_short = -1;
-static int hf_etch_int = -1;
-static int hf_etch_long = -1;
-static int hf_etch_float = -1;
-static int hf_etch_double = -1;
-/* static int hf_etch_key = -1; */
-static int hf_etch_valuename = -1;
-static int hf_etch_keyname = -1;
-static int hf_etch_string = -1;
-static int hf_etch_keyvalue = -1;
-static int hf_etch_struct = -1;
-static int hf_etch_dim = -1;
-static int hf_etch_symbol = -1;
+static int proto_etch;
+static gint ett_etch;
+static gint ett_etch_struct;
+static gint ett_etch_keyvalue;
+static gint ett_etch_key;
+static gint ett_etch_value;
+static int hf_etch_sig;
+static int hf_etch_length;
+static int hf_etch_version;
+static int hf_etch_typecode;
+static int hf_etch_value;
+static int hf_etch_bytes;
+static int hf_etch_byte;
+static int hf_etch_short;
+static int hf_etch_int;
+static int hf_etch_long;
+static int hf_etch_float;
+static int hf_etch_double;
+/* static int hf_etch_key; */
+static int hf_etch_valuename;
+static int hf_etch_keyname;
+static int hf_etch_string;
+static int hf_etch_keyvalue;
+static int hf_etch_struct;
+static int hf_etch_dim;
+static int hf_etch_symbol;
 
 static dissector_handle_t etch_handle;
 
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index 3add185fbc..24ad050b57 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -62,43 +62,43 @@ static gboolean ccsds_heuristic_header = FALSE;
 static gboolean ccsds_heuristic_bit = FALSE;
 
 /* protocols and header fields */
-static int proto_eth = -1;
-static int hf_eth_dst = -1;
-static int hf_eth_dst_resolved = -1;
-static int hf_eth_dst_oui = -1;
-static int hf_eth_dst_oui_resolved = -1;
-static int hf_eth_src = -1;
-static int hf_eth_src_resolved = -1;
-static int hf_eth_src_oui = -1;
-static int hf_eth_src_oui_resolved = -1;
-static int hf_eth_len = -1;
-static int hf_eth_type = -1;
-static int hf_eth_invalid_lentype = -1;
-static int hf_eth_addr = -1;
-static int hf_eth_addr_resolved = -1;
-static int hf_eth_addr_oui = -1;
-static int hf_eth_addr_oui_resolved = -1;
-static int hf_eth_dst_lg = -1;
-static int hf_eth_dst_ig = -1;
-static int hf_eth_src_lg = -1;
-static int hf_eth_src_ig = -1;
-static int hf_eth_lg = -1;
-static int hf_eth_ig = -1;
-static int hf_eth_padding = -1;
-static int hf_eth_trailer = -1;
-static int hf_eth_fcs = -1;
-static int hf_eth_fcs_status = -1;
-
-static gint ett_ieee8023 = -1;
-static gint ett_ether2 = -1;
-static gint ett_ether = -1;
-static gint ett_addr = -1;
-
-static expert_field ei_eth_invalid_lentype = EI_INIT;
-static expert_field ei_eth_src_not_group = EI_INIT;
-static expert_field ei_eth_fcs_bad = EI_INIT;
-static expert_field ei_eth_len = EI_INIT;
-static expert_field ei_eth_padding_bad = EI_INIT;
+static int proto_eth;
+static int hf_eth_dst;
+static int hf_eth_dst_resolved;
+static int hf_eth_dst_oui;
+static int hf_eth_dst_oui_resolved;
+static int hf_eth_src;
+static int hf_eth_src_resolved;
+static int hf_eth_src_oui;
+static int hf_eth_src_oui_resolved;
+static int hf_eth_len;
+static int hf_eth_type;
+static int hf_eth_invalid_lentype;
+static int hf_eth_addr;
+static int hf_eth_addr_resolved;
+static int hf_eth_addr_oui;
+static int hf_eth_addr_oui_resolved;
+static int hf_eth_dst_lg;
+static int hf_eth_dst_ig;
+static int hf_eth_src_lg;
+static int hf_eth_src_ig;
+static int hf_eth_lg;
+static int hf_eth_ig;
+static int hf_eth_padding;
+static int hf_eth_trailer;
+static int hf_eth_fcs;
+static int hf_eth_fcs_status;
+
+static gint ett_ieee8023;
+static gint ett_ether2;
+static gint ett_ether;
+static gint ett_addr;
+
+static expert_field ei_eth_invalid_lentype;
+static expert_field ei_eth_src_not_group;
+static expert_field ei_eth_fcs_bad;
+static expert_field ei_eth_len;
+static expert_field ei_eth_padding_bad;
 
 static dissector_handle_t fw1_handle;
 static dissector_handle_t ethertype_handle;
diff --git a/epan/dissectors/packet-etherip.c b/epan/dissectors/packet-etherip.c
index 94f169cfe7..617f9a2c2b 100644
--- a/epan/dissectors/packet-etherip.c
+++ b/epan/dissectors/packet-etherip.c
@@ -13,14 +13,14 @@
 void proto_register_etherip(void);
 void proto_reg_handoff_etherip(void);
 
-static int proto_etherip = -1;
-static int hf_etherip_ver = -1;
-static int hf_etherip_reserved = -1;
+static int proto_etherip;
+static int hf_etherip_ver;
+static int hf_etherip_reserved;
 
-static gint ett_etherip = -1;
+static gint ett_etherip;
 
-static expert_field ei_etherip_ver_3 = EI_INIT;
-static expert_field ei_etherip_reserved_0 = EI_INIT;
+static expert_field ei_etherip_ver_3;
+static expert_field ei_etherip_reserved_0;
 
 static dissector_handle_t eth_withoutfcs_handle;
 static dissector_handle_t etherip_handle;
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c
index 2e66acc2ea..0a02aa8720 100644
--- a/epan/dissectors/packet-ethertype.c
+++ b/epan/dissectors/packet-ethertype.c
@@ -28,7 +28,7 @@ void proto_register_ethertype(void);
 
 static dissector_table_t ethertype_dissector_table;
 
-static int proto_ethertype = -1;
+static int proto_ethertype;
 
 const value_string etype_vals[] = {
 	{ ETHERTYPE_IP,                   "IPv4" },
diff --git a/epan/dissectors/packet-eti.c b/epan/dissectors/packet-eti.c
index 57a0b90346..880f401c51 100644
--- a/epan/dissectors/packet-eti.c
+++ b/epan/dissectors/packet-eti.c
@@ -43,18 +43,18 @@ void proto_register_eti(void);
 
 static dissector_handle_t eti_handle;
 
-static int proto_eti = -1;
-static expert_field ei_eti_counter_overflow = EI_INIT;
-static expert_field ei_eti_invalid_template = EI_INIT;
-static expert_field ei_eti_invalid_length = EI_INIT;
-static expert_field ei_eti_unaligned = EI_INIT;
-static expert_field ei_eti_missing = EI_INIT;
-static expert_field ei_eti_overused = EI_INIT;
+static int proto_eti;
+static expert_field ei_eti_counter_overflow;
+static expert_field ei_eti_invalid_template;
+static expert_field ei_eti_invalid_length;
+static expert_field ei_eti_unaligned;
+static expert_field ei_eti_missing;
+static expert_field ei_eti_overused;
 
 static int hf_eti[444];
-static int hf_eti_dscp_exec_summary = -1;
-static int hf_eti_dscp_improved = -1;
-static int hf_eti_dscp_widened = -1;
+static int hf_eti_dscp_exec_summary;
+static int hf_eti_dscp_improved;
+static int hf_eti_dscp_widened;
 enum Field_Handle_Index {
       ACCOUNT_FH_IDX
     , AFFECTEDORDERREQUESTID_FH_IDX
@@ -2202,7 +2202,7 @@ struct ETI_Field {
 };
 
 static gint ett_eti[53];
-static gint ett_eti_dscp = -1;
+static gint ett_eti_dscp;
 /* This method dissects fully reassembled messages */
 static int
 dissect_eti_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
diff --git a/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c
index b55e8b7612..2d103ed4c6 100644
--- a/epan/dissectors/packet-etsi_card_app_toolkit.c
+++ b/epan/dissectors/packet-etsi_card_app_toolkit.c
@@ -27,115 +27,115 @@
 void proto_register_card_app_toolkit(void);
 void proto_reg_handoff_card_app_toolkit(void);
 
-static int proto_cat = -1;
+static int proto_cat;
 
 static dissector_handle_t gsm_sms_handle;	/* SMS TPDU */
 
-static int hf_cat_tlv = -1;
-
-static int hf_ctlv_devid_src = -1;
-static int hf_ctlv_devid_dst = -1;
-static int hf_ctlv_cmd_nr = -1;
-static int hf_ctlv_cmd_type = -1;
-static int hf_ctlv_cmd_qual_refresh = -1;
-static int hf_ctlv_cmd_qual_send_short_msg = -1;
-static int hf_ctlv_cmd_qual_loci = -1;
-static int hf_ctlv_cmd_qual_timer_mgmt = -1;
-static int hf_ctlv_cmd_qual_send_data = -1;
-static int hf_ctlv_cmd_qual = -1;
-static int hf_ctlv_dur_time_unit = -1;
-static int hf_ctlv_dur_time_intv = -1;
-static int hf_ctlv_alpha_id_string = -1;
-static int hf_ctlv_address_ton = -1;
-static int hf_ctlv_address_npi = -1;
-static int hf_ctlv_address_string = -1;
-static int hf_ctlv_subaddress_string = -1;
-static int hf_ctlv_result_gen = -1;
-static int hf_ctlv_result_term = -1;
-static int hf_ctlv_result_launch_browser = -1;
-static int hf_ctlv_result_multiplecard = -1;
-static int hf_ctlv_result_cc_ctrl_mo_sm_ctrl = -1;
-static int hf_ctlv_result_bip = -1;
-static int hf_ctlv_result_frames_cmd = -1;
-static int hf_ctlv_text_string_enc = -1;
-static int hf_ctlv_text_string = -1;
-static int hf_ctlv_event = -1;
-static int hf_ctlv_tone = -1;
-static int hf_ctlv_item_id = -1;
-static int hf_ctlv_item_string = -1;
-static int hf_ctlv_loc_status = -1;
-static int hf_ctlv_timer_val_hr = -1;
-static int hf_ctlv_timer_val_min = -1;
-static int hf_ctlv_timer_val_sec = -1;
-static int hf_ctlv_date_time_yr = -1;
-static int hf_ctlv_date_time_mo = -1;
-static int hf_ctlv_date_time_day = -1;
-static int hf_ctlv_date_time_hr = -1;
-static int hf_ctlv_date_time_min = -1;
-static int hf_ctlv_date_time_sec = -1;
-static int hf_ctlv_date_time_tz = -1;
-static int hf_ctlv_at_cmd = -1;
-static int hf_ctlv_at_rsp = -1;
-static int hf_ctlv_dtmf_string = -1;
-static int hf_ctlv_language = -1;
-static int hf_ctlv_me_status = -1;
-static int hf_ctlv_timing_adv = -1;
-static int hf_ctlv_aid_rid = -1;
-static int hf_ctlv_aid_pix_app_code_etsi = -1;
-static int hf_ctlv_aid_pix_app_code_3gpp = -1;
-static int hf_ctlv_aid_pix_app_code_3gpp2 = -1;
-static int hf_ctlv_aid_pix_app_code = -1;
-static int hf_ctlv_aid_pix_country_code = -1;
-static int hf_ctlv_aid_pix_app_prov_code = -1;
-static int hf_ctlv_aid_pix_app_prov_field = -1;
-static int hf_ctlv_bearer = -1;
-static int hf_ctlv_bearer_descr = -1;
-static int hf_ctlv_bearer_csd_data_rate = -1;
-static int hf_ctlv_bearer_csd_bearer_serv = -1;
-static int hf_ctlv_bearer_csd_conn_elem = -1;
-static int hf_ctlv_bearer_gprs_precedence = -1;
-static int hf_ctlv_bearer_gprs_delay = -1;
-static int hf_ctlv_bearer_gprs_reliability = -1;
-static int hf_ctlv_bearer_gprs_peak = -1;
-static int hf_ctlv_bearer_gprs_mean = -1;
-static int hf_ctlv_bearer_gprs_prot_type = -1;
-static int hf_ctlv_bearer_utran_traffic_class = -1;
-static int hf_ctlv_bearer_utran_max_bitrate_ul = -1;
-static int hf_ctlv_bearer_utran_max_bitrate_dl = -1;
-static int hf_ctlv_bearer_utran_guaranteed_bitrate_ul = -1;
-static int hf_ctlv_bearer_utran_guaranteed_bitrate_dl = -1;
-static int hf_ctlv_bearer_utran_delivery_order = -1;
-static int hf_ctlv_bearer_utran_max_sdu_size = -1;
-static int hf_ctlv_bearer_utran_sdu_error_ratio = -1;
-static int hf_ctlv_bearer_utran_residual_bit_error_ratio = -1;
-static int hf_ctlv_bearer_utran_delivery_erroneous_sdus = -1;
-static int hf_ctlv_bearer_utran_transfer_delay = -1;
-static int hf_ctlv_bearer_utran_traffic_handling_prio = -1;
-static int hf_ctlv_bearer_utran_pdp_type = -1;
-static int hf_ctlv_bearer_params = -1;
-static int hf_ctlv_buffers_size = -1;
-static int hf_ctlv_transport_ptype = -1;
-static int hf_ctlv_transport_port = -1;
-static int hf_ctlv_other_address_coding = -1;
-static int hf_ctlv_other_address_ipv4 = -1;
-static int hf_ctlv_other_address_ipv6 = -1;
-static int hf_ctlv_access_tech = -1;
-static int hf_ctlv_dns_server_address_coding = -1;
-static int hf_ctlv_dns_server_address_ipv4 = -1;
-static int hf_ctlv_dns_server_address_ipv6 = -1;
-static int hf_ctlv_utran_eutran_meas_qual = -1;
-static int hf_ctlv_upd_attach_type = -1;
-static int hf_ctlv_loci_lac = -1;
-static int hf_ctlv_loci_cell_id = -1;
-static int hf_ctlv_loci_ext_cell_id = -1;
-static int hf_ctlv_iari = -1;
-static int hf_ctlv_impu = -1;
-static int hf_ctlv_ims_status_code = -1;
-static int hf_ctlv_broadcast_nw_tech = -1;
-static int hf_ctlv_broadcast_nw_loc_info = -1;
-
-static int ett_cat = -1;
-static int ett_elem = -1;
+static int hf_cat_tlv;
+
+static int hf_ctlv_devid_src;
+static int hf_ctlv_devid_dst;
+static int hf_ctlv_cmd_nr;
+static int hf_ctlv_cmd_type;
+static int hf_ctlv_cmd_qual_refresh;
+static int hf_ctlv_cmd_qual_send_short_msg;
+static int hf_ctlv_cmd_qual_loci;
+static int hf_ctlv_cmd_qual_timer_mgmt;
+static int hf_ctlv_cmd_qual_send_data;
+static int hf_ctlv_cmd_qual;
+static int hf_ctlv_dur_time_unit;
+static int hf_ctlv_dur_time_intv;
+static int hf_ctlv_alpha_id_string;
+static int hf_ctlv_address_ton;
+static int hf_ctlv_address_npi;
+static int hf_ctlv_address_string;
+static int hf_ctlv_subaddress_string;
+static int hf_ctlv_result_gen;
+static int hf_ctlv_result_term;
+static int hf_ctlv_result_launch_browser;
+static int hf_ctlv_result_multiplecard;
+static int hf_ctlv_result_cc_ctrl_mo_sm_ctrl;
+static int hf_ctlv_result_bip;
+static int hf_ctlv_result_frames_cmd;
+static int hf_ctlv_text_string_enc;
+static int hf_ctlv_text_string;
+static int hf_ctlv_event;
+static int hf_ctlv_tone;
+static int hf_ctlv_item_id;
+static int hf_ctlv_item_string;
+static int hf_ctlv_loc_status;
+static int hf_ctlv_timer_val_hr;
+static int hf_ctlv_timer_val_min;
+static int hf_ctlv_timer_val_sec;
+static int hf_ctlv_date_time_yr;
+static int hf_ctlv_date_time_mo;
+static int hf_ctlv_date_time_day;
+static int hf_ctlv_date_time_hr;
+static int hf_ctlv_date_time_min;
+static int hf_ctlv_date_time_sec;
+static int hf_ctlv_date_time_tz;
+static int hf_ctlv_at_cmd;
+static int hf_ctlv_at_rsp;
+static int hf_ctlv_dtmf_string;
+static int hf_ctlv_language;
+static int hf_ctlv_me_status;
+static int hf_ctlv_timing_adv;
+static int hf_ctlv_aid_rid;
+static int hf_ctlv_aid_pix_app_code_etsi;
+static int hf_ctlv_aid_pix_app_code_3gpp;
+static int hf_ctlv_aid_pix_app_code_3gpp2;
+static int hf_ctlv_aid_pix_app_code;
+static int hf_ctlv_aid_pix_country_code;
+static int hf_ctlv_aid_pix_app_prov_code;
+static int hf_ctlv_aid_pix_app_prov_field;
+static int hf_ctlv_bearer;
+static int hf_ctlv_bearer_descr;
+static int hf_ctlv_bearer_csd_data_rate;
+static int hf_ctlv_bearer_csd_bearer_serv;
+static int hf_ctlv_bearer_csd_conn_elem;
+static int hf_ctlv_bearer_gprs_precedence;
+static int hf_ctlv_bearer_gprs_delay;
+static int hf_ctlv_bearer_gprs_reliability;
+static int hf_ctlv_bearer_gprs_peak;
+static int hf_ctlv_bearer_gprs_mean;
+static int hf_ctlv_bearer_gprs_prot_type;
+static int hf_ctlv_bearer_utran_traffic_class;
+static int hf_ctlv_bearer_utran_max_bitrate_ul;
+static int hf_ctlv_bearer_utran_max_bitrate_dl;
+static int hf_ctlv_bearer_utran_guaranteed_bitrate_ul;
+static int hf_ctlv_bearer_utran_guaranteed_bitrate_dl;
+static int hf_ctlv_bearer_utran_delivery_order;
+static int hf_ctlv_bearer_utran_max_sdu_size;
+static int hf_ctlv_bearer_utran_sdu_error_ratio;
+static int hf_ctlv_bearer_utran_residual_bit_error_ratio;
+static int hf_ctlv_bearer_utran_delivery_erroneous_sdus;
+static int hf_ctlv_bearer_utran_transfer_delay;
+static int hf_ctlv_bearer_utran_traffic_handling_prio;
+static int hf_ctlv_bearer_utran_pdp_type;
+static int hf_ctlv_bearer_params;
+static int hf_ctlv_buffers_size;
+static int hf_ctlv_transport_ptype;
+static int hf_ctlv_transport_port;
+static int hf_ctlv_other_address_coding;
+static int hf_ctlv_other_address_ipv4;
+static int hf_ctlv_other_address_ipv6;
+static int hf_ctlv_access_tech;
+static int hf_ctlv_dns_server_address_coding;
+static int hf_ctlv_dns_server_address_ipv4;
+static int hf_ctlv_dns_server_address_ipv6;
+static int hf_ctlv_utran_eutran_meas_qual;
+static int hf_ctlv_upd_attach_type;
+static int hf_ctlv_loci_lac;
+static int hf_ctlv_loci_cell_id;
+static int hf_ctlv_loci_ext_cell_id;
+static int hf_ctlv_iari;
+static int hf_ctlv_impu;
+static int hf_ctlv_ims_status_code;
+static int hf_ctlv_broadcast_nw_tech;
+static int hf_ctlv_broadcast_nw_loc_info;
+
+static int ett_cat;
+static int ett_elem;
 
 
 /* According to Section 7.2 of ETSI TS 101 220 / Chapter 7.2 */
diff --git a/epan/dissectors/packet-etv.c b/epan/dissectors/packet-etv.c
index 22fbfa4aec..2721b5cdc2 100644
--- a/epan/dissectors/packet-etv.c
+++ b/epan/dissectors/packet-etv.c
@@ -22,29 +22,29 @@ void proto_reg_handoff_etv(void);
 static dissector_handle_t etv_dii_handle;
 static dissector_handle_t etv_ddb_handle;
 
-static int proto_etv_dii = -1;
-static int proto_etv_ddb = -1;
+static int proto_etv_dii;
+static int proto_etv_ddb;
 
 static dissector_handle_t dsmcc_handle;
 
-static int hf_etv_dii_filter_info = -1;
-static int hf_etv_dii_reserved = -1;
+static int hf_etv_dii_filter_info;
+static int hf_etv_dii_reserved;
 
-static expert_field ei_etv_dii_invalid_section_syntax_indicator = EI_INIT;
-static expert_field ei_etv_dii_invalid_section_length = EI_INIT;
-static expert_field ei_etv_dii_invalid_reserved_bits = EI_INIT;
-static expert_field ei_etv_dii_filter_info = EI_INIT;
+static expert_field ei_etv_dii_invalid_section_syntax_indicator;
+static expert_field ei_etv_dii_invalid_section_length;
+static expert_field ei_etv_dii_invalid_reserved_bits;
+static expert_field ei_etv_dii_filter_info;
 
-static int hf_etv_ddb_filter_info = -1;
-static int hf_etv_ddb_reserved = -1;
+static int hf_etv_ddb_filter_info;
+static int hf_etv_ddb_reserved;
 
-static expert_field ei_etv_ddb_invalid_section_syntax_indicator = EI_INIT;
-static expert_field ei_etv_ddb_invalid_section_length = EI_INIT;
-static expert_field ei_etv_ddb_invalid_reserved_bits = EI_INIT;
-static expert_field ei_etv_ddb_filter_info = EI_INIT;
+static expert_field ei_etv_ddb_invalid_section_syntax_indicator;
+static expert_field ei_etv_ddb_invalid_section_length;
+static expert_field ei_etv_ddb_invalid_reserved_bits;
+static expert_field ei_etv_ddb_filter_info;
 
-static gint ett_etv = -1;
-static gint ett_etv_payload = -1;
+static gint ett_etv;
+static gint ett_etv_payload;
 
 static void
 dissect_etv_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int proto,
diff --git a/epan/dissectors/packet-etw.c b/epan/dissectors/packet-etw.c
index cb0518a09c..342b6358b4 100644
--- a/epan/dissectors/packet-etw.c
+++ b/epan/dissectors/packet-etw.c
@@ -24,36 +24,36 @@ void proto_reg_handoff_etw(void);
 
 static dissector_handle_t etw_handle;
 
-static int proto_etw = -1;
-static int hf_etw_size = -1;
-static int hf_etw_header_type = -1;
-static int hf_etw_flags = -1;
-static int hf_etw_event_property = -1;
-static int hf_etw_thread_id = -1;
-static int hf_etw_process_id = -1;
-static int hf_etw_time_stamp = -1;
-static int hf_etw_provider_id = -1;
-static int hf_etw_buffer_context_processor_number = -1;
-static int hf_etw_buffer_context_alignment = -1;
-static int hf_etw_buffer_context_logger_id = -1;
-static int hf_etw_message_length = -1;
-static int hf_etw_provider_name_length = -1;
-static int hf_etw_provider_name = -1;
-static int hf_etw_message = -1;
-static int hf_etw_user_data_length = -1;
-static int hf_etw_descriptor_id = -1;
-static int hf_etw_descriptor_version = -1;
-static int hf_etw_descriptor_channel = -1;
-static int hf_etw_descriptor_level = -1;
-static int hf_etw_descriptor_opcode = -1;
-static int hf_etw_descriptor_task = -1;
-static int hf_etw_descriptor_keywords = -1;
-static int hf_etw_processor_time = -1;
-static int hf_etw_activity_id = -1;
+static int proto_etw;
+static int hf_etw_size;
+static int hf_etw_header_type;
+static int hf_etw_flags;
+static int hf_etw_event_property;
+static int hf_etw_thread_id;
+static int hf_etw_process_id;
+static int hf_etw_time_stamp;
+static int hf_etw_provider_id;
+static int hf_etw_buffer_context_processor_number;
+static int hf_etw_buffer_context_alignment;
+static int hf_etw_buffer_context_logger_id;
+static int hf_etw_message_length;
+static int hf_etw_provider_name_length;
+static int hf_etw_provider_name;
+static int hf_etw_message;
+static int hf_etw_user_data_length;
+static int hf_etw_descriptor_id;
+static int hf_etw_descriptor_version;
+static int hf_etw_descriptor_channel;
+static int hf_etw_descriptor_level;
+static int hf_etw_descriptor_opcode;
+static int hf_etw_descriptor_task;
+static int hf_etw_descriptor_keywords;
+static int hf_etw_processor_time;
+static int hf_etw_activity_id;
 
-static gint ett_etw_header = -1;
-static gint ett_etw_descriptor = -1;
-static gint ett_etw_buffer_context = -1;
+static gint ett_etw_header;
+static gint ett_etw_descriptor;
+static gint ett_etw_buffer_context;
 
 static dissector_handle_t mbim_dissector;
 
diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c
index 982d7c9f14..bc54d84803 100644
--- a/epan/dissectors/packet-evrc.c
+++ b/epan/dissectors/packet-evrc.c
@@ -153,39 +153,39 @@ evrc_variant_t;
 
 
 /* Initialize the protocol and registered fields */
-static int proto_evrc = -1;
-static int proto_evrcb = -1;
-static int proto_evrcwb = -1;
-static int proto_evrcnw = -1;
-static int proto_evrcnw2k = -1;
-static int proto_evrc_legacy = -1;
-
-static int hf_evrc_reserved = -1;
-static int hf_evrc_reserved_2k = -1;
-static int hf_evrc_enc_capability_2k = -1;
-static int hf_evrc_interleave_length = -1;
-static int hf_evrc_interleave_index = -1;
-static int hf_evrc_mode_request = -1;
-static int hf_evrc_b_mode_request = -1;
-static int hf_evrc_wb_mode_request = -1;
-static int hf_evrc_nw_mode_request = -1;
-static int hf_evrc_nw2k_mode_request = -1;
-static int hf_evrc_frame_count = -1;
-static int hf_evrc_toc_frame_type_high = -1;
-static int hf_evrc_toc_frame_type_low = -1;
-static int hf_evrc_b_toc_frame_type_high = -1;
-static int hf_evrc_b_toc_frame_type_low = -1;
-static int hf_evrc_padding = -1;
-static int hf_evrc_speech_data = -1;
-static int hf_evrc_legacy_toc_fe_ind = -1;
-static int hf_evrc_legacy_toc_reduc_rate = -1;
-static int hf_evrc_legacy_toc_frame_type = -1;
+static int proto_evrc;
+static int proto_evrcb;
+static int proto_evrcwb;
+static int proto_evrcnw;
+static int proto_evrcnw2k;
+static int proto_evrc_legacy;
+
+static int hf_evrc_reserved;
+static int hf_evrc_reserved_2k;
+static int hf_evrc_enc_capability_2k;
+static int hf_evrc_interleave_length;
+static int hf_evrc_interleave_index;
+static int hf_evrc_mode_request;
+static int hf_evrc_b_mode_request;
+static int hf_evrc_wb_mode_request;
+static int hf_evrc_nw_mode_request;
+static int hf_evrc_nw2k_mode_request;
+static int hf_evrc_frame_count;
+static int hf_evrc_toc_frame_type_high;
+static int hf_evrc_toc_frame_type_low;
+static int hf_evrc_b_toc_frame_type_high;
+static int hf_evrc_b_toc_frame_type_low;
+static int hf_evrc_padding;
+static int hf_evrc_speech_data;
+static int hf_evrc_legacy_toc_fe_ind;
+static int hf_evrc_legacy_toc_reduc_rate;
+static int hf_evrc_legacy_toc_frame_type;
 
 /* Initialize the subtree pointers */
-static gint ett_evrc = -1;
-static gint ett_toc = -1;
+static gint ett_evrc;
+static gint ett_toc;
 
-static expert_field ei_evrc_unknown_variant = EI_INIT;
+static expert_field ei_evrc_unknown_variant;
 
 /*
  * Variables to allow for proper deletion of dissector registration when
diff --git a/epan/dissectors/packet-evs.c b/epan/dissectors/packet-evs.c
index 2715efbbcf..ac78b63b26 100644
--- a/epan/dissectors/packet-evs.c
+++ b/epan/dissectors/packet-evs.c
@@ -29,47 +29,47 @@ static dissector_handle_t evs_handle;
 static gboolean evs_hf_only = FALSE;
 
 /* Initialize the protocol and registered fields */
-static int proto_evs = -1;
-static int proto_rtp = -1;
-
-static int hf_evs_packet_length = -1;
-static int hf_evs_voice_data = -1;
-static int hf_evs_h_bit = -1;
-static int hf_evs_cmr_t = -1;
-static int hf_evs_cmr_t0_d = -1;
-static int hf_evs_cmr_t1_d = -1;
-static int hf_evs_cmr_t2_d = -1;
-static int hf_evs_cmr_t3_d = -1;
-static int hf_evs_cmr_t4_d = -1;
-static int hf_evs_cmr_t5_d = -1;
-static int hf_evs_cmr_t6_d = -1;
-static int hf_evs_cmr_t7_d = -1;
-static int hf_evs_f_bit = -1;
-static int hf_evs_mode_bit = -1;
-static int hf_evs_toc_spare = -1;
-static int hf_evs_amr_wb_q_bit = -1;
-static int hf_evs_bit_rate_mode_0 = -1;
-static int hf_evs_bit_rate_mode_1 = -1;
-static int hf_evs_cmr_amr_io = -1;
-static int hf_evs_bw = -1;
-static int hf_evs_reserved_1bit = -1;
-static int hf_evs_celp_switch_to_mdct_core = -1;
-static int hf_evs_celp_mdct_core = -1;
-static int hf_evs_tcx_or_hq_mdct_core = -1;
-static int hf_evs_sid_cng = -1;
-static int hf_evs_celp_sample_rate = -1;
-static int hf_evs_core_sample_rate = -1;
-static int hf_evs_132_bwctrf_idx = -1;
-static int hf_evs_28_frame_type = -1;
-static int hf_evs_28_bw_ppp_nelp = -1;
-static int hf_evs_72_80_bwct_idx = -1;
-static int hf_evs_320_bwct_idx = -1;
-static int hf_evs_640_bwct_idx = -1;
-
-static int ett_evs = -1;
-static int ett_evs_header = -1;
-static int ett_evs_speech = -1;
-static int ett_evs_voice_data = -1;
+static int proto_evs;
+static int proto_rtp;
+
+static int hf_evs_packet_length;
+static int hf_evs_voice_data;
+static int hf_evs_h_bit;
+static int hf_evs_cmr_t;
+static int hf_evs_cmr_t0_d;
+static int hf_evs_cmr_t1_d;
+static int hf_evs_cmr_t2_d;
+static int hf_evs_cmr_t3_d;
+static int hf_evs_cmr_t4_d;
+static int hf_evs_cmr_t5_d;
+static int hf_evs_cmr_t6_d;
+static int hf_evs_cmr_t7_d;
+static int hf_evs_f_bit;
+static int hf_evs_mode_bit;
+static int hf_evs_toc_spare;
+static int hf_evs_amr_wb_q_bit;
+static int hf_evs_bit_rate_mode_0;
+static int hf_evs_bit_rate_mode_1;
+static int hf_evs_cmr_amr_io;
+static int hf_evs_bw;
+static int hf_evs_reserved_1bit;
+static int hf_evs_celp_switch_to_mdct_core;
+static int hf_evs_celp_mdct_core;
+static int hf_evs_tcx_or_hq_mdct_core;
+static int hf_evs_sid_cng;
+static int hf_evs_celp_sample_rate;
+static int hf_evs_core_sample_rate;
+static int hf_evs_132_bwctrf_idx;
+static int hf_evs_28_frame_type;
+static int hf_evs_28_bw_ppp_nelp;
+static int hf_evs_72_80_bwct_idx;
+static int hf_evs_320_bwct_idx;
+static int hf_evs_640_bwct_idx;
+
+static int ett_evs;
+static int ett_evs_header;
+static int ett_evs_speech;
+static int ett_evs_voice_data;
 
 static const value_string evs_protected_payload_sizes_value[] = {
     {    48, "EVS Primary SID 2.4" },
diff --git a/epan/dissectors/packet-exablaze.c b/epan/dissectors/packet-exablaze.c
index e2aa3ee3c8..6c20992b24 100644
--- a/epan/dissectors/packet-exablaze.c
+++ b/epan/dissectors/packet-exablaze.c
@@ -18,17 +18,17 @@
 void proto_register_exablaze(void);
 void proto_reg_handoff_exablaze(void);
 
-static int proto_exablaze = -1;
+static int proto_exablaze;
 
-static int hf_exablaze_original_fcs = -1;
-static int hf_exablaze_device = -1;
-static int hf_exablaze_port = -1;
-static int hf_exablaze_timestamp = -1;
-static int hf_exablaze_timestamp_integer = -1;
-static int hf_exablaze_timestamp_fractional = -1;
+static int hf_exablaze_original_fcs;
+static int hf_exablaze_device;
+static int hf_exablaze_port;
+static int hf_exablaze_timestamp;
+static int hf_exablaze_timestamp_integer;
+static int hf_exablaze_timestamp_fractional;
 
-static gint ett_exablaze = -1;
-static gint ett_exablaze_timestamp = -1;
+static gint ett_exablaze;
+static gint ett_exablaze_timestamp;
 
 static int
 dissect_exablaze(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
diff --git a/epan/dissectors/packet-exec.c b/epan/dissectors/packet-exec.c
index 4f06619160..6c1437d49c 100644
--- a/epan/dissectors/packet-exec.c
+++ b/epan/dissectors/packet-exec.c
@@ -29,17 +29,17 @@ void proto_register_exec(void);
 void proto_reg_handoff_exec(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_exec = -1;
+static int proto_exec;
 
-static int hf_exec_stderr_port = -1;
-static int hf_exec_username    = -1;
-static int hf_exec_password    = -1;
-static int hf_exec_command     = -1;
-static int hf_exec_client_server_data = -1;
-static int hf_exec_server_client_data = -1;
+static int hf_exec_stderr_port;
+static int hf_exec_username;
+static int hf_exec_password;
+static int hf_exec_command;
+static int hf_exec_client_server_data;
+static int hf_exec_server_client_data;
 
 /* Initialize the subtree pointers */
-static gint ett_exec = -1;
+static gint ett_exec;
 
 #define EXEC_STDERR_PORT_LEN 5
 #define EXEC_USERNAME_LEN 16
diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c
index 3af2bbf1b8..ecb3195dcb 100644
--- a/epan/dissectors/packet-exported_pdu.c
+++ b/epan/dissectors/packet-exported_pdu.c
@@ -24,56 +24,56 @@
 void proto_register_exported_pdu(void);
 void proto_reg_handoff_exported_pdu(void);
 
-static int hf_ip_addr = -1;
-static int hf_ip_dst = -1;
-static int hf_ip_src = -1;
-static int hf_ipv6_addr = -1;
-static int hf_ipv6_dst = -1;
-static int hf_ipv6_src = -1;
-
-static int proto_exported_pdu = -1;
-static int hf_exported_pdu_tag = -1;
-static int hf_exported_pdu_tag_len = -1;
-static int hf_exported_pdu_unknown_tag_val = -1;
-static int hf_exported_pdu_prot_name = -1;
-static int hf_exported_pdu_heur_prot_name = -1;
-static int hf_exported_pdu_dis_table_name = -1;
-static int hf_exported_pdu_p2p_dir = -1;
-static int hf_exported_pdu_dissector_data = -1;
-static int hf_exported_pdu_ddata_version = -1;
-static int hf_exported_pdu_ddata_seq = -1;
-static int hf_exported_pdu_ddata_nxtseq = -1;
-static int hf_exported_pdu_ddata_lastackseq = -1;
-static int hf_exported_pdu_ddata_is_reassembled = -1;
-static int hf_exported_pdu_ddata_flags = -1;
-static int hf_exported_pdu_ddata_urgent_pointer = -1;
-static int hf_exported_pdu_ipv4_src = -1;
-static int hf_exported_pdu_ipv4_dst = -1;
-static int hf_exported_pdu_ipv6_src = -1;
-static int hf_exported_pdu_ipv6_dst = -1;
-static int hf_exported_pdu_port_type = -1;
-static int hf_exported_pdu_src_port = -1;
-static int hf_exported_pdu_dst_port = -1;
-/** static int hf_exported_pdu_sctp_ppid = -1; **/
-static int hf_exported_pdu_ss7_opc = -1;
-static int hf_exported_pdu_ss7_dpc = -1;
-static int hf_exported_pdu_orig_fno = -1;
-static int hf_exported_pdu_dvbci_evt = -1;
-static int hf_exported_pdu_exported_pdu = -1;
-static int hf_exported_pdu_dis_table_val = -1;
-static int hf_exported_pdu_col_proto_str = -1;
-static int hf_exported_pdu_col_info_str = -1;
+static int hf_ip_addr;
+static int hf_ip_dst;
+static int hf_ip_src;
+static int hf_ipv6_addr;
+static int hf_ipv6_dst;
+static int hf_ipv6_src;
+
+static int proto_exported_pdu;
+static int hf_exported_pdu_tag;
+static int hf_exported_pdu_tag_len;
+static int hf_exported_pdu_unknown_tag_val;
+static int hf_exported_pdu_prot_name;
+static int hf_exported_pdu_heur_prot_name;
+static int hf_exported_pdu_dis_table_name;
+static int hf_exported_pdu_p2p_dir;
+static int hf_exported_pdu_dissector_data;
+static int hf_exported_pdu_ddata_version;
+static int hf_exported_pdu_ddata_seq;
+static int hf_exported_pdu_ddata_nxtseq;
+static int hf_exported_pdu_ddata_lastackseq;
+static int hf_exported_pdu_ddata_is_reassembled;
+static int hf_exported_pdu_ddata_flags;
+static int hf_exported_pdu_ddata_urgent_pointer;
+static int hf_exported_pdu_ipv4_src;
+static int hf_exported_pdu_ipv4_dst;
+static int hf_exported_pdu_ipv6_src;
+static int hf_exported_pdu_ipv6_dst;
+static int hf_exported_pdu_port_type;
+static int hf_exported_pdu_src_port;
+static int hf_exported_pdu_dst_port;
+/** static int hf_exported_pdu_sctp_ppid; **/
+static int hf_exported_pdu_ss7_opc;
+static int hf_exported_pdu_ss7_dpc;
+static int hf_exported_pdu_orig_fno;
+static int hf_exported_pdu_dvbci_evt;
+static int hf_exported_pdu_exported_pdu;
+static int hf_exported_pdu_dis_table_val;
+static int hf_exported_pdu_col_proto_str;
+static int hf_exported_pdu_col_info_str;
 
 /* Initialize the subtree pointers */
-static gint ett_exported_pdu = -1;
-static gint ett_exported_pdu_tag = -1;
+static gint ett_exported_pdu;
+static gint ett_exported_pdu_tag;
 
 static int ss7pc_address_type = -1;
 
 static dissector_handle_t exported_pdu_handle;
 
-static expert_field ei_exported_pdu_unsupported_version = EI_INIT;
-static expert_field ei_exported_pdu_unknown_tag = EI_INIT;
+static expert_field ei_exported_pdu_unsupported_version;
+static expert_field ei_exported_pdu_unknown_tag;
 
 static const gchar *user_data_pdu = "data";
 
diff --git a/epan/dissectors/packet-extreme-exeh.c b/epan/dissectors/packet-extreme-exeh.c
index 0ea9f8ef0d..27c73bbe3a 100644
--- a/epan/dissectors/packet-extreme-exeh.c
+++ b/epan/dissectors/packet-extreme-exeh.c
@@ -54,34 +54,34 @@ static dissector_handle_t exeh_handle;
 
 static dissector_handle_t ethnofcs_handle;
 
-static int proto_exeh = -1;
+static int proto_exeh;
 /* EXEH data */
-static int hf_exeh_unknown_00_01 = -1;
-static int hf_exeh_module1 = -1;
-static int hf_exeh_port1 = -1;
-static int hf_exeh_module2 = -1; /* m2 + p2 always zero for outgoing(?) */
-static int hf_exeh_port2 = -1;
-static int hf_exeh_unknown_10_16 = -1;
-static int hf_exeh_unknown_17_0xfd = -1;
-static int hf_exeh_unknown_17_0x02 = -1;
-static int hf_exeh_unknown_18_21 = -1;
-static int hf_exeh_unknown_22_23 = -1;
-static int hf_exeh_incoming_framesource = -1;
-static int hf_exeh_outgoing_framesource = -1;
-static int hf_exeh_vlan = -1;
-static int hf_exeh_unknown_28_29 = -1;
-static int hf_exeh_dir = -1;
-static int hf_exeh_unknown_32_33 = -1;
-static int hf_exeh_etype = -1;
-static int hf_exeh_etypelen = -1;
-static int hf_exeh_etypedata = -1;
-
-static expert_field ei_exeh_unexpected_value = EI_INIT;
-static expert_field ei_exeh_unequal_ports = EI_INIT;
-static expert_field ei_exeh_incoming_framesource = EI_INIT;
-static expert_field ei_exeh_outgoing_framesource = EI_INIT;
-
-static gint ett_exeh = -1;
+static int hf_exeh_unknown_00_01;
+static int hf_exeh_module1;
+static int hf_exeh_port1;
+static int hf_exeh_module2; /* m2 + p2 always zero for outgoing(?) */
+static int hf_exeh_port2;
+static int hf_exeh_unknown_10_16;
+static int hf_exeh_unknown_17_0xfd;
+static int hf_exeh_unknown_17_0x02;
+static int hf_exeh_unknown_18_21;
+static int hf_exeh_unknown_22_23;
+static int hf_exeh_incoming_framesource;
+static int hf_exeh_outgoing_framesource;
+static int hf_exeh_vlan;
+static int hf_exeh_unknown_28_29;
+static int hf_exeh_dir;
+static int hf_exeh_unknown_32_33;
+static int hf_exeh_etype;
+static int hf_exeh_etypelen;
+static int hf_exeh_etypedata;
+
+static expert_field ei_exeh_unexpected_value;
+static expert_field ei_exeh_unequal_ports;
+static expert_field ei_exeh_incoming_framesource;
+static expert_field ei_exeh_outgoing_framesource;
+
+static gint ett_exeh;
 
 #define PROTO_SHORT_NAME "EXEH"
 #define PROTO_LONG_NAME "EXtreme extra Eth Header"
diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c
index dd2f99c69e..79eac549ca 100644
--- a/epan/dissectors/packet-extreme.c
+++ b/epan/dissectors/packet-extreme.c
@@ -139,137 +139,137 @@ These are the structures you will see most often in EDP frames.
 void proto_register_edp(void);
 void proto_reg_handoff_edp(void);
 
-static int hf_llc_extreme_pid = -1;
+static int hf_llc_extreme_pid;
 
 static dissector_handle_t edp_handle;
 
-static int proto_edp = -1;
+static int proto_edp;
 /* EDP header */
-static int hf_edp_version = -1;
-static int hf_edp_reserved = -1;
-static int hf_edp_length = -1;
-static int hf_edp_checksum = -1;
-static int hf_edp_checksum_status = -1;
-
-static int hf_edp_seqno = -1;
-static int hf_edp_midtype = -1;
-static int hf_edp_midmac = -1;
+static int hf_edp_version;
+static int hf_edp_reserved;
+static int hf_edp_length;
+static int hf_edp_checksum;
+static int hf_edp_checksum_status;
+
+static int hf_edp_seqno;
+static int hf_edp_midtype;
+static int hf_edp_midmac;
 /* TLV header */
-static int hf_edp_tlv_marker = -1;
-static int hf_edp_tlv_type = -1;
-static int hf_edp_tlv_length = -1;
+static int hf_edp_tlv_marker;
+static int hf_edp_tlv_type;
+static int hf_edp_tlv_length;
 /* Display string */
-static int hf_edp_display = -1;
-static int hf_edp_display_string = -1;
+static int hf_edp_display;
+static int hf_edp_display_string;
 /* Info element */
-static int hf_edp_info = -1;
-static int hf_edp_info_slot = -1;
-static int hf_edp_info_port = -1;
-static int hf_edp_info_vchassid = -1;
-static int hf_edp_info_reserved = -1;
-static int hf_edp_info_version = -1;
-static int hf_edp_info_version_major1 = -1;
-static int hf_edp_info_version_major2 = -1;
-static int hf_edp_info_version_sustaining = -1;
-static int hf_edp_info_version_internal = -1;
-static int hf_edp_info_vchassconn = -1;
+static int hf_edp_info;
+static int hf_edp_info_slot;
+static int hf_edp_info_port;
+static int hf_edp_info_vchassid;
+static int hf_edp_info_reserved;
+static int hf_edp_info_version;
+static int hf_edp_info_version_major1;
+static int hf_edp_info_version_major2;
+static int hf_edp_info_version_sustaining;
+static int hf_edp_info_version_internal;
+static int hf_edp_info_vchassconn;
 /* Vlan element */
-static int hf_edp_vlan = -1;
-static int hf_edp_vlan_flags = -1;
-static int hf_edp_vlan_flags_ip = -1;
-static int hf_edp_vlan_flags_reserved = -1;
-static int hf_edp_vlan_flags_unknown = -1;
-static int hf_edp_vlan_reserved1 = -1;
-static int hf_edp_vlan_id = -1;
-static int hf_edp_vlan_reserved2 = -1;
-static int hf_edp_vlan_ip = -1;
-static int hf_edp_vlan_name = -1;
+static int hf_edp_vlan;
+static int hf_edp_vlan_flags;
+static int hf_edp_vlan_flags_ip;
+static int hf_edp_vlan_flags_reserved;
+static int hf_edp_vlan_flags_unknown;
+static int hf_edp_vlan_reserved1;
+static int hf_edp_vlan_id;
+static int hf_edp_vlan_reserved2;
+static int hf_edp_vlan_ip;
+static int hf_edp_vlan_name;
 /* ESRP element */
-static int hf_edp_esrp = -1;
-static int hf_edp_esrp_proto = -1;
-static int hf_edp_esrp_group = -1;
-static int hf_edp_esrp_prio = -1;
-static int hf_edp_esrp_state = -1;
-static int hf_edp_esrp_ports = -1;
-static int hf_edp_esrp_virtip = -1;
-static int hf_edp_esrp_sysmac = -1;
-static int hf_edp_esrp_hello = -1;
-static int hf_edp_esrp_reserved = -1;
+static int hf_edp_esrp;
+static int hf_edp_esrp_proto;
+static int hf_edp_esrp_group;
+static int hf_edp_esrp_prio;
+static int hf_edp_esrp_state;
+static int hf_edp_esrp_ports;
+static int hf_edp_esrp_virtip;
+static int hf_edp_esrp_sysmac;
+static int hf_edp_esrp_hello;
+static int hf_edp_esrp_reserved;
 /* EAPS element */
-static int hf_edp_eaps = -1;
-static int hf_edp_eaps_ver = -1;
-static int hf_edp_eaps_type = -1;
-static int hf_edp_eaps_ctrlvlanid = -1;
-static int hf_edp_eaps_reserved0 = -1;
-static int hf_edp_eaps_sysmac = -1;
-static int hf_edp_eaps_hello = -1;
-static int hf_edp_eaps_fail = -1;
-static int hf_edp_eaps_state = -1;
-static int hf_edp_eaps_reserved1 = -1;
-static int hf_edp_eaps_helloseq = -1;
-static int hf_edp_eaps_reserved2 = -1;
+static int hf_edp_eaps;
+static int hf_edp_eaps_ver;
+static int hf_edp_eaps_type;
+static int hf_edp_eaps_ctrlvlanid;
+static int hf_edp_eaps_reserved0;
+static int hf_edp_eaps_sysmac;
+static int hf_edp_eaps_hello;
+static int hf_edp_eaps_fail;
+static int hf_edp_eaps_state;
+static int hf_edp_eaps_reserved1;
+static int hf_edp_eaps_helloseq;
+static int hf_edp_eaps_reserved2;
 /* ESL element */
-static int hf_edp_esl = -1;
-static int hf_edp_esl_ver = -1;
-static int hf_edp_esl_type = -1;
-static int hf_edp_esl_ctrlvlanid = -1;
-static int hf_edp_esl_reserved0 = -1;
-static int hf_edp_esl_sysmac = -1;
-static int hf_edp_esl_reserved1 = -1;
-static int hf_edp_esl_state = -1;
-static int hf_edp_esl_linkrole = -1;
-static int hf_edp_esl_linkid1 = -1;
-static int hf_edp_esl_failed1 = -1;
-static int hf_edp_esl_failed2 = -1;
-static int hf_edp_esl_reserved4 = -1;
-static int hf_edp_esl_linkid2 = -1;
-static int hf_edp_esl_reserved5 = -1;
-static int hf_edp_esl_numlinks = -1;
-static int hf_edp_esl_linklist = -1;
-static int hf_edp_esl_rest = -1;
+static int hf_edp_esl;
+static int hf_edp_esl_ver;
+static int hf_edp_esl_type;
+static int hf_edp_esl_ctrlvlanid;
+static int hf_edp_esl_reserved0;
+static int hf_edp_esl_sysmac;
+static int hf_edp_esl_reserved1;
+static int hf_edp_esl_state;
+static int hf_edp_esl_linkrole;
+static int hf_edp_esl_linkid1;
+static int hf_edp_esl_failed1;
+static int hf_edp_esl_failed2;
+static int hf_edp_esl_reserved4;
+static int hf_edp_esl_linkid2;
+static int hf_edp_esl_reserved5;
+static int hf_edp_esl_numlinks;
+static int hf_edp_esl_linklist;
+static int hf_edp_esl_rest;
 /* ELSM (Extreme Link Status Monitoring) */
-static int hf_edp_elsm = -1;
-static int hf_edp_elsm_type = -1;
-static int hf_edp_elsm_subtype = -1;
-static int hf_edp_elsm_magic = -1;
+static int hf_edp_elsm;
+static int hf_edp_elsm_type;
+static int hf_edp_elsm_subtype;
+static int hf_edp_elsm_magic;
 /* ELRP (Extreme Loop Recognition Protocol)*/
-static int hf_edp_elrp = -1;
-static int hf_edp_elrp_unknown = -1;
+static int hf_edp_elrp;
+static int hf_edp_elrp_unknown;
 /* Link properties */
-static int hf_edp_link = -1;
-static int hf_edp_link_flags = -1;
-static int hf_edp_link_flags_autoneg = -1;
-static int hf_edp_link_flags_flowcontrol = -1;
-static int hf_edp_link_flags_unknown = -1;
-static int hf_edp_link_conf = -1;
-static int hf_edp_link_actual = -1;
-static int hf_edp_link_zero = -1;
-static int hf_edp_link_unknown = -1;
+static int hf_edp_link;
+static int hf_edp_link_flags;
+static int hf_edp_link_flags_autoneg;
+static int hf_edp_link_flags_flowcontrol;
+static int hf_edp_link_flags_unknown;
+static int hf_edp_link_conf;
+static int hf_edp_link_actual;
+static int hf_edp_link_zero;
+static int hf_edp_link_unknown;
 /* Unknown element */
-static int hf_edp_unknown = -1;
-static int hf_edp_unknown_data = -1;
+static int hf_edp_unknown;
+static int hf_edp_unknown_data;
 /* Null element */
-static int hf_edp_null = -1;
-
-static expert_field ei_edp_short_tlv = EI_INIT;
-static expert_field ei_edp_checksum = EI_INIT;
-
-static gint ett_edp = -1;
-static gint ett_edp_tlv_header = -1;
-static gint ett_edp_display = -1;
-static gint ett_edp_info = -1;
-static gint ett_edp_info_version = -1;
-static gint ett_edp_vlan = -1;
-static gint ett_edp_vlan_flags = -1;
-static gint ett_edp_esrp = -1;
-static gint ett_edp_eaps = -1;
-static gint ett_edp_esl = -1;
-static gint ett_edp_elsm = -1;
-static gint ett_edp_elrp = -1;
-static gint ett_edp_link = -1;
-static gint ett_edp_link_flags = -1;
-static gint ett_edp_unknown = -1;
-static gint ett_edp_null = -1;
+static int hf_edp_null;
+
+static expert_field ei_edp_short_tlv;
+static expert_field ei_edp_checksum;
+
+static gint ett_edp;
+static gint ett_edp_tlv_header;
+static gint ett_edp_display;
+static gint ett_edp_info;
+static gint ett_edp_info_version;
+static gint ett_edp_vlan;
+static gint ett_edp_vlan_flags;
+static gint ett_edp_esrp;
+static gint ett_edp_eaps;
+static gint ett_edp_esl;
+static gint ett_edp_elsm;
+static gint ett_edp_elrp;
+static gint ett_edp_link;
+static gint ett_edp_link_flags;
+static gint ett_edp_unknown;
+static gint ett_edp_null;
 
 #define PROTO_SHORT_NAME "EDP"
 #define PROTO_LONG_NAME "Extreme Discovery Protocol"
diff --git a/epan/dissectors/packet-extrememesh.c b/epan/dissectors/packet-extrememesh.c
index ca97fa9d7c..df67aca565 100644
--- a/epan/dissectors/packet-extrememesh.c
+++ b/epan/dissectors/packet-extrememesh.c
@@ -66,337 +66,337 @@ void proto_reg_handoff_extrememesh(void);
 static dissector_handle_t extrememesh_handle;
 
 /* Mesh pkt types */
-static int proto_extrememesh = -1;
-static int proto_extrememesh_mch = -1;
-static int proto_extrememesh_ps_areq = -1;
-static int proto_extrememesh_ps_arep = -1;
-static int proto_extrememesh_ps_breq = -1;
-static int proto_extrememesh_ps_brep = -1;
-static int proto_extrememesh_ps_bann = -1;
-static int proto_extrememesh_ps_bred = -1;
-static int proto_extrememesh_ps_sreq = -1;
-static int proto_extrememesh_ps_srep = -1;
-static int proto_extrememesh_ps_preq = -1;
-static int proto_extrememesh_ps_prep = -1;
-static int proto_extrememesh_ps_perr = -1;
-static int proto_extrememesh_ps_prst = -1;
-static int proto_extrememesh_ps_prem = -1;
-static int proto_extrememesh_ps_trace = -1;
-static int proto_extrememesh_ps_prer = -1;
-//static int proto_extrememesh_hello = -1;
-//static int proto_extrememesh_security = -1;
-//static int proto_extrememesh_cfpu = -1;
-//static int proto_extrememesh_eapom = -1;
-static int proto_extrememesh_l2upd = -1;
-static int proto_extrememesh_probe = -1;
+static int proto_extrememesh;
+static int proto_extrememesh_mch;
+static int proto_extrememesh_ps_areq;
+static int proto_extrememesh_ps_arep;
+static int proto_extrememesh_ps_breq;
+static int proto_extrememesh_ps_brep;
+static int proto_extrememesh_ps_bann;
+static int proto_extrememesh_ps_bred;
+static int proto_extrememesh_ps_sreq;
+static int proto_extrememesh_ps_srep;
+static int proto_extrememesh_ps_preq;
+static int proto_extrememesh_ps_prep;
+static int proto_extrememesh_ps_perr;
+static int proto_extrememesh_ps_prst;
+static int proto_extrememesh_ps_prem;
+static int proto_extrememesh_ps_trace;
+static int proto_extrememesh_ps_prer;
+//static int proto_extrememesh_hello;
+//static int proto_extrememesh_security;
+//static int proto_extrememesh_cfpu;
+//static int proto_extrememesh_eapom;
+static int proto_extrememesh_l2upd;
+static int proto_extrememesh_probe;
 
 
 /*MESH fields*/
-static int hf_extrememesh_version = -1;
-static int hf_extrememesh_nextproto = -1;
+static int hf_extrememesh_version;
+static int hf_extrememesh_nextproto;
 
 /*MCH fields*/
-static int hf_extrememesh_mch_version = -1;
-static int hf_extrememesh_mch_next_proto = -1;
-static int hf_extrememesh_mch_lq = -1;
-static int hf_extrememesh_mch_htl = -1;
-static int hf_extrememesh_mch_priority = -1;
-static int hf_extrememesh_mch_usr_pri_flags = -1;
-static int hf_extrememesh_mch_usr_pri_flags_user_priority = -1;
-static int hf_extrememesh_mch_usr_pri_flags_reserved = -1;
-static int hf_extrememesh_mch_usr_pri_flags_from_wan = -1;
-static int hf_extrememesh_mch_usr_pri_flags_to_wan = -1;
-static int hf_extrememesh_mch_usr_pri_flags_forward = -1;
-static int hf_extrememesh_mch_sequence = -1;
-static int hf_extrememesh_mch_dest = -1;
-static int hf_extrememesh_mch_src = -1;
+static int hf_extrememesh_mch_version;
+static int hf_extrememesh_mch_next_proto;
+static int hf_extrememesh_mch_lq;
+static int hf_extrememesh_mch_htl;
+static int hf_extrememesh_mch_priority;
+static int hf_extrememesh_mch_usr_pri_flags;
+static int hf_extrememesh_mch_usr_pri_flags_user_priority;
+static int hf_extrememesh_mch_usr_pri_flags_reserved;
+static int hf_extrememesh_mch_usr_pri_flags_from_wan;
+static int hf_extrememesh_mch_usr_pri_flags_to_wan;
+static int hf_extrememesh_mch_usr_pri_flags_forward;
+static int hf_extrememesh_mch_sequence;
+static int hf_extrememesh_mch_dest;
+static int hf_extrememesh_mch_src;
 
 #if 0
 /*ENCAP_ETH fields*/
 /*Hello fields*/
-static int hf_extrememesh_hello_services = -1;
-static int hf_extrememesh_hello_HTR = -1;
-static int hf_extrememesh_hello_MTR = -1;
-static int hf_extrememesh_hello_root_id = -1;
-static int hf_extrememesh_hello_next_hop_id = -1;
+static int hf_extrememesh_hello_services;
+static int hf_extrememesh_hello_HTR;
+static int hf_extrememesh_hello_MTR;
+static int hf_extrememesh_hello_root_id;
+static int hf_extrememesh_hello_next_hop_id;
 
 /*Security fields*/
-static int hf_extrememesh_security_version = -1;
-static int hf_extrememesh_security_nextproto = -1;
-static int hf_extrememesh_security_flags = -1;
-static int hf_extrememesh_security_packet_num = -1;
-static int hf_extrememesh_security_mic = -1;
+static int hf_extrememesh_security_version;
+static int hf_extrememesh_security_nextproto;
+static int hf_extrememesh_security_flags;
+static int hf_extrememesh_security_packet_num;
+static int hf_extrememesh_security_mic;
 
 /*Cfpu fields*/
-static int hf_extrememesh_cfpu_version = -1;
-static int hf_extrememesh_cfpu_window = -1;
-static int hf_extrememesh_cfpu_cycle = -1;
+static int hf_extrememesh_cfpu_version;
+static int hf_extrememesh_cfpu_window;
+static int hf_extrememesh_cfpu_cycle;
 
 /*EAPOM fields*/
-static int hf_extrememesh_eapom_version = -1;
-static int hf_extrememesh_eapom_header_type = -1;
-static int hf_extrememesh_eapom_supplicant_addr = -1;
-static int hf_extrememesh_eapom_meshid_len = -1;
-static int hf_extrememesh_eapom_meshid = -1;
-static int hf_extrememesh_eapom_body_len = -1;
+static int hf_extrememesh_eapom_version;
+static int hf_extrememesh_eapom_header_type;
+static int hf_extrememesh_eapom_supplicant_addr;
+static int hf_extrememesh_eapom_meshid_len;
+static int hf_extrememesh_eapom_meshid;
+static int hf_extrememesh_eapom_body_len;
 #endif
 
 /*Mesh L2 Update fields*/
-static int hf_extrememesh_l2upd_proxy_owner = -1;
-static int hf_extrememesh_l2upd_ballast = -1;
+static int hf_extrememesh_l2upd_proxy_owner;
+static int hf_extrememesh_l2upd_ballast;
 
 /*Probe fields*/
-static int hf_extrememesh_probe_version = -1;
-static int hf_extrememesh_probe_op_code = -1;
-static int hf_extrememesh_probe_flags = -1;
-static int hf_extrememesh_probe_flags_reserved = -1;
-static int hf_extrememesh_probe_flags_reply = -1;
-static int hf_extrememesh_probe_priority = -1;
-static int hf_extrememesh_probe_job_id = -1;
-static int hf_extrememesh_probe_sequence = -1;
-static int hf_extrememesh_probe_ballast_len = -1;
-static int hf_extrememesh_probe_ballast = -1;
+static int hf_extrememesh_probe_version;
+static int hf_extrememesh_probe_op_code;
+static int hf_extrememesh_probe_flags;
+static int hf_extrememesh_probe_flags_reserved;
+static int hf_extrememesh_probe_flags_reply;
+static int hf_extrememesh_probe_priority;
+static int hf_extrememesh_probe_job_id;
+static int hf_extrememesh_probe_sequence;
+static int hf_extrememesh_probe_ballast_len;
+static int hf_extrememesh_probe_ballast;
 
 /*Path Selection fields*/
 /*PS AREQ fields*/
-static int hf_extrememesh_ps_areq_version = -1;
-static int hf_extrememesh_ps_areq_frame_type = -1;
-static int hf_extrememesh_ps_areq_mpr_addr = -1;
-static int hf_extrememesh_ps_areq_orig_addr = -1;
-static int hf_extrememesh_ps_areq_opt_tot_len = -1;
-static int hf_extrememesh_ps_areq_option = -1;
-static int hf_extrememesh_ps_areq_option_len = -1;
-static int hf_extrememesh_ps_areq_old_mpr = -1;
-static int hf_extrememesh_ps_areq_proxies = -1;
+static int hf_extrememesh_ps_areq_version;
+static int hf_extrememesh_ps_areq_frame_type;
+static int hf_extrememesh_ps_areq_mpr_addr;
+static int hf_extrememesh_ps_areq_orig_addr;
+static int hf_extrememesh_ps_areq_opt_tot_len;
+static int hf_extrememesh_ps_areq_option;
+static int hf_extrememesh_ps_areq_option_len;
+static int hf_extrememesh_ps_areq_old_mpr;
+static int hf_extrememesh_ps_areq_proxies;
 
 /*PS AREP fields*/
-static int hf_extrememesh_ps_arep_version = -1;
-static int hf_extrememesh_ps_arep_frame_type = -1;
-static int hf_extrememesh_ps_arep_mpr_addr = -1;
-static int hf_extrememesh_ps_arep_orig_addr = -1;
-static int hf_extrememesh_ps_arep_opt_tot_len = -1;
-static int hf_extrememesh_ps_arep_option = -1;
-static int hf_extrememesh_ps_arep_option_len = -1;
-static int hf_extrememesh_ps_arep_result = -1;
-static int hf_extrememesh_ps_arep_timeout = -1;
+static int hf_extrememesh_ps_arep_version;
+static int hf_extrememesh_ps_arep_frame_type;
+static int hf_extrememesh_ps_arep_mpr_addr;
+static int hf_extrememesh_ps_arep_orig_addr;
+static int hf_extrememesh_ps_arep_opt_tot_len;
+static int hf_extrememesh_ps_arep_option;
+static int hf_extrememesh_ps_arep_option_len;
+static int hf_extrememesh_ps_arep_result;
+static int hf_extrememesh_ps_arep_timeout;
 
 /*PS BREQ fields*/
-static int hf_extrememesh_ps_breq_version = -1;
-static int hf_extrememesh_ps_breq_frame_type = -1;
-static int hf_extrememesh_ps_breq_mpr_addr = -1;
-static int hf_extrememesh_ps_breq_orig_addr = -1;
-static int hf_extrememesh_ps_breq_opt_tot_len = -1;
-static int hf_extrememesh_ps_breq_option = -1;
-static int hf_extrememesh_ps_breq_option_len = -1;
-static int hf_extrememesh_ps_breq_proxy_addr = -1;
-static int hf_extrememesh_ps_breq_old_mpr = -1;
-static int hf_extrememesh_ps_breq_orig_pri = -1;
-static int hf_extrememesh_ps_breq_proxy_pri = -1;
-static int hf_extrememesh_ps_breq_vlan_id = -1;
-static int hf_extrememesh_ps_breq_proxy_vlan_id = -1;
-static int hf_extrememesh_ps_breq_seq = -1;
+static int hf_extrememesh_ps_breq_version;
+static int hf_extrememesh_ps_breq_frame_type;
+static int hf_extrememesh_ps_breq_mpr_addr;
+static int hf_extrememesh_ps_breq_orig_addr;
+static int hf_extrememesh_ps_breq_opt_tot_len;
+static int hf_extrememesh_ps_breq_option;
+static int hf_extrememesh_ps_breq_option_len;
+static int hf_extrememesh_ps_breq_proxy_addr;
+static int hf_extrememesh_ps_breq_old_mpr;
+static int hf_extrememesh_ps_breq_orig_pri;
+static int hf_extrememesh_ps_breq_proxy_pri;
+static int hf_extrememesh_ps_breq_vlan_id;
+static int hf_extrememesh_ps_breq_proxy_vlan_id;
+static int hf_extrememesh_ps_breq_seq;
 
 /*PS BREP fields*/
-static int hf_extrememesh_ps_brep_version = -1;
-static int hf_extrememesh_ps_brep_frame_type = -1;
-static int hf_extrememesh_ps_brep_mpr_addr = -1;
-static int hf_extrememesh_ps_brep_orig_addr = -1;
-static int hf_extrememesh_ps_brep_opt_tot_len = -1;
-static int hf_extrememesh_ps_brep_option = -1;
-static int hf_extrememesh_ps_brep_option_len = -1;
-static int hf_extrememesh_ps_brep_seq = -1;
+static int hf_extrememesh_ps_brep_version;
+static int hf_extrememesh_ps_brep_frame_type;
+static int hf_extrememesh_ps_brep_mpr_addr;
+static int hf_extrememesh_ps_brep_orig_addr;
+static int hf_extrememesh_ps_brep_opt_tot_len;
+static int hf_extrememesh_ps_brep_option;
+static int hf_extrememesh_ps_brep_option_len;
+static int hf_extrememesh_ps_brep_seq;
 
 /*PS BANN fields*/
-static int hf_extrememesh_ps_bann_version = -1;
-static int hf_extrememesh_ps_bann_frame_type = -1;
-static int hf_extrememesh_ps_bann_mpr_addr = -1;
-static int hf_extrememesh_ps_bann_orig_addr = -1;
-static int hf_extrememesh_ps_bann_opt_tot_len = -1;
-static int hf_extrememesh_ps_bann_option = -1;
-static int hf_extrememesh_ps_bann_option_len = -1;
-static int hf_extrememesh_ps_bann_proxy_addr = -1;
-static int hf_extrememesh_ps_bann_old_root = -1;
-static int hf_extrememesh_ps_bann_vlan_id = -1;
-static int hf_extrememesh_ps_bann_seq = -1;
+static int hf_extrememesh_ps_bann_version;
+static int hf_extrememesh_ps_bann_frame_type;
+static int hf_extrememesh_ps_bann_mpr_addr;
+static int hf_extrememesh_ps_bann_orig_addr;
+static int hf_extrememesh_ps_bann_opt_tot_len;
+static int hf_extrememesh_ps_bann_option;
+static int hf_extrememesh_ps_bann_option_len;
+static int hf_extrememesh_ps_bann_proxy_addr;
+static int hf_extrememesh_ps_bann_old_root;
+static int hf_extrememesh_ps_bann_vlan_id;
+static int hf_extrememesh_ps_bann_seq;
 
 /*PS BRED fields*/
-static int hf_extrememesh_ps_bred_version = -1;
-static int hf_extrememesh_ps_bred_frame_type = -1;
-static int hf_extrememesh_ps_bred_mpr_addr = -1;
-static int hf_extrememesh_ps_bred_orig_addr = -1;
-static int hf_extrememesh_ps_bred_opt_tot_len = -1;
-static int hf_extrememesh_ps_bred_option = -1;
-static int hf_extrememesh_ps_bred_option_len = -1;
-static int hf_extrememesh_ps_bred_seq = -1;
+static int hf_extrememesh_ps_bred_version;
+static int hf_extrememesh_ps_bred_frame_type;
+static int hf_extrememesh_ps_bred_mpr_addr;
+static int hf_extrememesh_ps_bred_orig_addr;
+static int hf_extrememesh_ps_bred_opt_tot_len;
+static int hf_extrememesh_ps_bred_option;
+static int hf_extrememesh_ps_bred_option_len;
+static int hf_extrememesh_ps_bred_seq;
 
 /*PS SREQ fields*/
-static int hf_extrememesh_ps_sreq_version = -1;
-static int hf_extrememesh_ps_sreq_frame_type = -1;
-static int hf_extrememesh_ps_sreq_reserved = -1;
-static int hf_extrememesh_ps_sreq_orig_addr = -1;
-static int hf_extrememesh_ps_sreq_term_addr = -1;
-static int hf_extrememesh_ps_sreq_opt_tot_len = -1;
-static int hf_extrememesh_ps_sreq_option = -1;
-static int hf_extrememesh_ps_sreq_option_len = -1;
-static int hf_extrememesh_ps_sreq_vlan_id = -1;
+static int hf_extrememesh_ps_sreq_version;
+static int hf_extrememesh_ps_sreq_frame_type;
+static int hf_extrememesh_ps_sreq_reserved;
+static int hf_extrememesh_ps_sreq_orig_addr;
+static int hf_extrememesh_ps_sreq_term_addr;
+static int hf_extrememesh_ps_sreq_opt_tot_len;
+static int hf_extrememesh_ps_sreq_option;
+static int hf_extrememesh_ps_sreq_option_len;
+static int hf_extrememesh_ps_sreq_vlan_id;
 
 /*PS SREP fields*/
-static int hf_extrememesh_ps_srep_version = -1;
-static int hf_extrememesh_ps_srep_frame_type = -1;
-static int hf_extrememesh_ps_srep_flags = -1;
-static int hf_extrememesh_ps_srep_flags_reserved = -1;
-static int hf_extrememesh_ps_srep_flags_status = -1;
-static int hf_extrememesh_ps_srep_hop_count = -1;
-static int hf_extrememesh_ps_srep_orig_addr = -1;
-static int hf_extrememesh_ps_srep_dest_addr = -1;
-static int hf_extrememesh_ps_srep_term_addr = -1;
-static int hf_extrememesh_ps_srep_opt_tot_len = -1;
-static int hf_extrememesh_ps_srep_option = -1;
-static int hf_extrememesh_ps_srep_option_len = -1;
-static int hf_extrememesh_ps_srep_vlan_id = -1;
+static int hf_extrememesh_ps_srep_version;
+static int hf_extrememesh_ps_srep_frame_type;
+static int hf_extrememesh_ps_srep_flags;
+static int hf_extrememesh_ps_srep_flags_reserved;
+static int hf_extrememesh_ps_srep_flags_status;
+static int hf_extrememesh_ps_srep_hop_count;
+static int hf_extrememesh_ps_srep_orig_addr;
+static int hf_extrememesh_ps_srep_dest_addr;
+static int hf_extrememesh_ps_srep_term_addr;
+static int hf_extrememesh_ps_srep_opt_tot_len;
+static int hf_extrememesh_ps_srep_option;
+static int hf_extrememesh_ps_srep_option_len;
+static int hf_extrememesh_ps_srep_vlan_id;
 
 /*PS PREQ fields*/
-static int hf_extrememesh_ps_preq_version = -1;
-static int hf_extrememesh_ps_preq_frame_type = -1;
-static int hf_extrememesh_ps_preq_flags = -1;
-static int hf_extrememesh_ps_preq_flags_broadcast = -1;
-static int hf_extrememesh_ps_preq_flags_periodic = -1;
-static int hf_extrememesh_ps_preq_flags_state = -1;
-static int hf_extrememesh_ps_preq_flags_reserved = -1;
-static int hf_extrememesh_ps_preq_flags_gratuitous = -1;
-static int hf_extrememesh_ps_preq_flags_destination = -1;
-static int hf_extrememesh_ps_preq_flags_unknown = -1;
-static int hf_extrememesh_ps_preq_hop_count = -1;
-static int hf_extrememesh_ps_preq_ttl = -1;
-static int hf_extrememesh_ps_preq_path_metrics = -1;
-static int hf_extrememesh_ps_preq_services = -1;
-static int hf_extrememesh_ps_preq_services_reserved = -1;
-static int hf_extrememesh_ps_preq_services_mobile = -1;
-static int hf_extrememesh_ps_preq_services_path_pref = -1;
-static int hf_extrememesh_ps_preq_services_geo = -1;
-static int hf_extrememesh_ps_preq_services_proxy = -1;
-static int hf_extrememesh_ps_preq_services_root = -1;
-static int hf_extrememesh_ps_preq_reserved = -1;
-static int hf_extrememesh_ps_preq_id = -1;
-static int hf_extrememesh_ps_preq_term_addr = -1;
-static int hf_extrememesh_ps_preq_dest_addr = -1;
-static int hf_extrememesh_ps_preq_dest_seq = -1;
-static int hf_extrememesh_ps_preq_orig_addr = -1;
-static int hf_extrememesh_ps_preq_orig_seq = -1;
-static int hf_extrememesh_ps_preq_opt_tot_len = -1;
-static int hf_extrememesh_ps_preq_option = -1;
-static int hf_extrememesh_ps_preq_option_len = -1;
-static int hf_extrememesh_ps_preq_mcast_sub = -1;
-static int hf_extrememesh_ps_preq_vlan_id = -1;
-static int hf_extrememesh_ps_preq_mint_id = -1;
+static int hf_extrememesh_ps_preq_version;
+static int hf_extrememesh_ps_preq_frame_type;
+static int hf_extrememesh_ps_preq_flags;
+static int hf_extrememesh_ps_preq_flags_broadcast;
+static int hf_extrememesh_ps_preq_flags_periodic;
+static int hf_extrememesh_ps_preq_flags_state;
+static int hf_extrememesh_ps_preq_flags_reserved;
+static int hf_extrememesh_ps_preq_flags_gratuitous;
+static int hf_extrememesh_ps_preq_flags_destination;
+static int hf_extrememesh_ps_preq_flags_unknown;
+static int hf_extrememesh_ps_preq_hop_count;
+static int hf_extrememesh_ps_preq_ttl;
+static int hf_extrememesh_ps_preq_path_metrics;
+static int hf_extrememesh_ps_preq_services;
+static int hf_extrememesh_ps_preq_services_reserved;
+static int hf_extrememesh_ps_preq_services_mobile;
+static int hf_extrememesh_ps_preq_services_path_pref;
+static int hf_extrememesh_ps_preq_services_geo;
+static int hf_extrememesh_ps_preq_services_proxy;
+static int hf_extrememesh_ps_preq_services_root;
+static int hf_extrememesh_ps_preq_reserved;
+static int hf_extrememesh_ps_preq_id;
+static int hf_extrememesh_ps_preq_term_addr;
+static int hf_extrememesh_ps_preq_dest_addr;
+static int hf_extrememesh_ps_preq_dest_seq;
+static int hf_extrememesh_ps_preq_orig_addr;
+static int hf_extrememesh_ps_preq_orig_seq;
+static int hf_extrememesh_ps_preq_opt_tot_len;
+static int hf_extrememesh_ps_preq_option;
+static int hf_extrememesh_ps_preq_option_len;
+static int hf_extrememesh_ps_preq_mcast_sub;
+static int hf_extrememesh_ps_preq_vlan_id;
+static int hf_extrememesh_ps_preq_mint_id;
 
 /*PS PREP fields*/
-static int hf_extrememesh_ps_prep_version = -1;
-static int hf_extrememesh_ps_prep_frame_type = -1;
-static int hf_extrememesh_ps_prep_flags = -1;
-static int hf_extrememesh_ps_prep_flags_reserved = -1;
-static int hf_extrememesh_ps_prep_flags_new_route = -1;
-static int hf_extrememesh_ps_prep_flags_repair = -1;
-static int hf_extrememesh_ps_prep_flags_ack = -1;
-static int hf_extrememesh_ps_prep_hop_count = -1;
-static int hf_extrememesh_ps_prep_path_metrics = -1;
-static int hf_extrememesh_ps_prep_services = -1;
-static int hf_extrememesh_ps_prep_services_reserved = -1;
-static int hf_extrememesh_ps_prep_services_mobile = -1;
-static int hf_extrememesh_ps_prep_services_path_pref = -1;
-static int hf_extrememesh_ps_prep_services_geo = -1;
-static int hf_extrememesh_ps_prep_services_proxy = -1;
-static int hf_extrememesh_ps_prep_services_root = -1;
-static int hf_extrememesh_ps_prep_reserved = -1;
-static int hf_extrememesh_ps_prep_term_addr = -1;
-static int hf_extrememesh_ps_prep_dest_addr = -1;
-static int hf_extrememesh_ps_prep_dest_seq = -1;
-static int hf_extrememesh_ps_prep_orig_addr = -1;
-static int hf_extrememesh_ps_prep_orig_seq = -1;
-static int hf_extrememesh_ps_prep_lifetime = -1;
-static int hf_extrememesh_ps_prep_opt_tot_len = -1;
-static int hf_extrememesh_ps_prep_option = -1;
-static int hf_extrememesh_ps_prep_option_len = -1;
-static int hf_extrememesh_ps_prep_mcast_sub = -1;
-static int hf_extrememesh_ps_prep_vlan_id = -1;
-static int hf_extrememesh_ps_prep_mint_id = -1;
+static int hf_extrememesh_ps_prep_version;
+static int hf_extrememesh_ps_prep_frame_type;
+static int hf_extrememesh_ps_prep_flags;
+static int hf_extrememesh_ps_prep_flags_reserved;
+static int hf_extrememesh_ps_prep_flags_new_route;
+static int hf_extrememesh_ps_prep_flags_repair;
+static int hf_extrememesh_ps_prep_flags_ack;
+static int hf_extrememesh_ps_prep_hop_count;
+static int hf_extrememesh_ps_prep_path_metrics;
+static int hf_extrememesh_ps_prep_services;
+static int hf_extrememesh_ps_prep_services_reserved;
+static int hf_extrememesh_ps_prep_services_mobile;
+static int hf_extrememesh_ps_prep_services_path_pref;
+static int hf_extrememesh_ps_prep_services_geo;
+static int hf_extrememesh_ps_prep_services_proxy;
+static int hf_extrememesh_ps_prep_services_root;
+static int hf_extrememesh_ps_prep_reserved;
+static int hf_extrememesh_ps_prep_term_addr;
+static int hf_extrememesh_ps_prep_dest_addr;
+static int hf_extrememesh_ps_prep_dest_seq;
+static int hf_extrememesh_ps_prep_orig_addr;
+static int hf_extrememesh_ps_prep_orig_seq;
+static int hf_extrememesh_ps_prep_lifetime;
+static int hf_extrememesh_ps_prep_opt_tot_len;
+static int hf_extrememesh_ps_prep_option;
+static int hf_extrememesh_ps_prep_option_len;
+static int hf_extrememesh_ps_prep_mcast_sub;
+static int hf_extrememesh_ps_prep_vlan_id;
+static int hf_extrememesh_ps_prep_mint_id;
 
 /*PS PERR fields*/
-static int hf_extrememesh_ps_perr_version = -1;
-static int hf_extrememesh_ps_perr_frame_type = -1;
-static int hf_extrememesh_ps_perr_flags = -1;
-static int hf_extrememesh_ps_perr_flags_reserved = -1;
-static int hf_extrememesh_ps_perr_flags_warning = -1;
-static int hf_extrememesh_ps_perr_flags_no_delete = -1;
-static int hf_extrememesh_ps_perr_dest_count = -1;
-static int hf_extrememesh_ps_perr_unrch_dest = -1;
-static int hf_extrememesh_ps_perr_unrch_dest_seq = -1;
+static int hf_extrememesh_ps_perr_version;
+static int hf_extrememesh_ps_perr_frame_type;
+static int hf_extrememesh_ps_perr_flags;
+static int hf_extrememesh_ps_perr_flags_reserved;
+static int hf_extrememesh_ps_perr_flags_warning;
+static int hf_extrememesh_ps_perr_flags_no_delete;
+static int hf_extrememesh_ps_perr_dest_count;
+static int hf_extrememesh_ps_perr_unrch_dest;
+static int hf_extrememesh_ps_perr_unrch_dest_seq;
 
 /*PS PRST fields*/
-static int hf_extrememesh_ps_prst_version = -1;
-static int hf_extrememesh_ps_prst_frame_type = -1;
-static int hf_extrememesh_ps_prst_hops_to_live = -1;
-static int hf_extrememesh_ps_prst_reserved = -1;
-static int hf_extrememesh_ps_prst_id = -1;
-static int hf_extrememesh_ps_prst_orig_addr = -1;
-static int hf_extrememesh_ps_prst_dest_addr = -1;
+static int hf_extrememesh_ps_prst_version;
+static int hf_extrememesh_ps_prst_frame_type;
+static int hf_extrememesh_ps_prst_hops_to_live;
+static int hf_extrememesh_ps_prst_reserved;
+static int hf_extrememesh_ps_prst_id;
+static int hf_extrememesh_ps_prst_orig_addr;
+static int hf_extrememesh_ps_prst_dest_addr;
 
 /*PS PREM fields*/
-static int hf_extrememesh_ps_prem_version = -1;
-static int hf_extrememesh_ps_prem_frame_type = -1;
-static int hf_extrememesh_ps_prem_mpr_addr = -1;
-static int hf_extrememesh_ps_prem_orig_addr = -1;
-static int hf_extrememesh_ps_prem_opt_tot_len = -1;
-static int hf_extrememesh_ps_prem_option = -1;
-static int hf_extrememesh_ps_prem_option_len = -1;
-static int hf_extrememesh_ps_prem_proxy_addr = -1;
-static int hf_extrememesh_ps_prem_proxy_vlan_id = -1;
+static int hf_extrememesh_ps_prem_version;
+static int hf_extrememesh_ps_prem_frame_type;
+static int hf_extrememesh_ps_prem_mpr_addr;
+static int hf_extrememesh_ps_prem_orig_addr;
+static int hf_extrememesh_ps_prem_opt_tot_len;
+static int hf_extrememesh_ps_prem_option;
+static int hf_extrememesh_ps_prem_option_len;
+static int hf_extrememesh_ps_prem_proxy_addr;
+static int hf_extrememesh_ps_prem_proxy_vlan_id;
 
 /*PS TRACE fields*/
-static int hf_extrememesh_ps_trace_version = -1;
-static int hf_extrememesh_ps_trace_frame_type = -1;
-static int hf_extrememesh_ps_trace_flags = -1;
-static int hf_extrememesh_ps_trace_flags_reserved = -1;
-static int hf_extrememesh_ps_trace_flags_reply = -1;
-static int hf_extrememesh_ps_trace_flags_no_path = -1;
-static int hf_extrememesh_ps_trace_dest_addr = -1;
-static int hf_extrememesh_ps_trace_orig_addr = -1;
-static int hf_extrememesh_ps_trace_hop_count = -1;
-static int hf_extrememesh_ps_trace_addl_path = -1;
+static int hf_extrememesh_ps_trace_version;
+static int hf_extrememesh_ps_trace_frame_type;
+static int hf_extrememesh_ps_trace_flags;
+static int hf_extrememesh_ps_trace_flags_reserved;
+static int hf_extrememesh_ps_trace_flags_reply;
+static int hf_extrememesh_ps_trace_flags_no_path;
+static int hf_extrememesh_ps_trace_dest_addr;
+static int hf_extrememesh_ps_trace_orig_addr;
+static int hf_extrememesh_ps_trace_hop_count;
+static int hf_extrememesh_ps_trace_addl_path;
 
 /*PS PRER fields*/
-static int hf_extrememesh_ps_prer_version = -1;
-static int hf_extrememesh_ps_prer_frame_type = -1;
-static int hf_extrememesh_ps_prer_dest_count = -1;
-static int hf_extrememesh_ps_prer_reserved = -1;
-static int hf_extrememesh_ps_prer_orig_addr = -1;
-static int hf_extrememesh_ps_prer_dest_addr = -1;
-static int hf_extrememesh_ps_prer_unrch_addr = -1;
-static int hf_extrememesh_ps_prer_opt_tot_len = -1;
-static int hf_extrememesh_ps_prer_option = -1;
-static int hf_extrememesh_ps_prer_option_len = -1;
-static int hf_extrememesh_ps_prer_vlan_id = -1;
+static int hf_extrememesh_ps_prer_version;
+static int hf_extrememesh_ps_prer_frame_type;
+static int hf_extrememesh_ps_prer_dest_count;
+static int hf_extrememesh_ps_prer_reserved;
+static int hf_extrememesh_ps_prer_orig_addr;
+static int hf_extrememesh_ps_prer_dest_addr;
+static int hf_extrememesh_ps_prer_unrch_addr;
+static int hf_extrememesh_ps_prer_opt_tot_len;
+static int hf_extrememesh_ps_prer_option;
+static int hf_extrememesh_ps_prer_option_len;
+static int hf_extrememesh_ps_prer_vlan_id;
 
 /*ETT for above fields...*/
-static int ett_extrememesh = -1;
+static int ett_extrememesh;
 
 /*MCH fields*/
-static int ett_extrememesh_mch = -1;
+static int ett_extrememesh_mch;
 
 /*Hello fields*/
-static int ett_extrememesh_hello = -1;
+static int ett_extrememesh_hello;
 
 /*Security fields*/
-static int ett_extrememesh_security = -1;
+static int ett_extrememesh_security;
 
 /*Cfpu fields*/
-static int ett_extrememesh_cfpu = -1;
+static int ett_extrememesh_cfpu;
 
 /*EAPOM fields*/
-static int ett_extrememesh_eapom = -1;
+static int ett_extrememesh_eapom;
 
 /*PS fields*/
-static int ett_extrememesh_ps = -1;
+static int ett_extrememesh_ps;
 
 /*Ethernet without FCS Dissector handle*/
 static dissector_handle_t eth_withoutfcs_handle;
diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c
index 91559a74ee..2463df0996 100644
--- a/epan/dissectors/packet-f5ethtrailer.c
+++ b/epan/dissectors/packet-f5ethtrailer.c
@@ -207,12 +207,12 @@ Notes:
 #include <wsutil/wslog.h>
 
 /* Wireshark ID of the F5ETHTRAILER protocol */
-static int proto_f5ethtrailer = -1;
+static int proto_f5ethtrailer;
 static int tap_f5ethtrailer   = -1;
-static int proto_f5fileinfo   = -1;
+static int proto_f5fileinfo;
 static int tap_f5fileinfo     = -1;
 /** Helper dissector for DPT format noise */
-static int proto_f5ethtrailer_dpt_noise = -1;
+static int proto_f5ethtrailer_dpt_noise;
 
 void proto_reg_handoff_f5ethtrailer(void);
 void proto_register_f5ethtrailer(void);
@@ -225,105 +225,105 @@ static dissector_handle_t f5dpt_tls_handle;
 
 
 /* Common Fields */
-static gint hf_provider    = -1;
-static gint hf_type        = -1;
-static gint hf_length      = -1;
-static gint hf_version     = -1;
-static gint hf_data        = -1;
-static gint hf_data_str    = -1;
-static gint hf_dpt_unknown = -1;
-static gint hf_trailer_hdr = -1;
-static gint hf_orig_fcs    = -1;
+static gint hf_provider;
+static gint hf_type;
+static gint hf_length;
+static gint hf_version;
+static gint hf_data;
+static gint hf_data_str;
+static gint hf_dpt_unknown;
+static gint hf_trailer_hdr;
+static gint hf_orig_fcs;
 /* Low */
-static gint hf_low_id         = -1;
-static gint hf_flags          = -1;
-static gint hf_flags_ingress  = -1;
-static gint hf_flags_hwaction = -1;
-static gint hf_ingress        = -1;
-static gint hf_slot0          = -1;
-static gint hf_slot1          = -1;
-static gint hf_tmm            = -1;
-static gint hf_obj_name_type  = -1;
-static gint hf_obj_data_len   = -1;
-static gint hf_vipnamelen     = -1;
-static gint hf_vip            = -1;
-static gint hf_portnamelen    = -1;
-static gint hf_phys_port      = -1;
-static gint hf_trunknamelen   = -1;
-static gint hf_trunk          = -1;
+static gint hf_low_id;
+static gint hf_flags;
+static gint hf_flags_ingress;
+static gint hf_flags_hwaction;
+static gint hf_ingress;
+static gint hf_slot0;
+static gint hf_slot1;
+static gint hf_tmm;
+static gint hf_obj_name_type;
+static gint hf_obj_data_len;
+static gint hf_vipnamelen;
+static gint hf_vip;
+static gint hf_portnamelen;
+static gint hf_phys_port;
+static gint hf_trunknamelen;
+static gint hf_trunk;
 /* Med */
-static gint hf_med_id        = -1;
-static gint hf_flow_id       = -1;
-static gint hf_peer_id       = -1;
-static gint hf_any_flow      = -1;
-static gint hf_cf_flags      = -1;
-static gint hf_cf_flags2     = -1;
-static gint hf_flow_type     = -1;
-static gint hf_ha_unit       = -1;
-static gint hf_reserved      = -1;
-static gint hf_priority      = -1;
-static gint hf_rstcause      = -1;
-static gint hf_rstcause_len  = -1;
-static gint hf_rstcause_ver  = -1;
-static gint hf_rstcause_peer = -1;
-static gint hf_rstcause_val  = -1;
-static gint hf_rstcause_line = -1;
-static gint hf_rstcause_txt  = -1;
+static gint hf_med_id;
+static gint hf_flow_id;
+static gint hf_peer_id;
+static gint hf_any_flow;
+static gint hf_cf_flags;
+static gint hf_cf_flags2;
+static gint hf_flow_type;
+static gint hf_ha_unit;
+static gint hf_reserved;
+static gint hf_priority;
+static gint hf_rstcause;
+static gint hf_rstcause_len;
+static gint hf_rstcause_ver;
+static gint hf_rstcause_peer;
+static gint hf_rstcause_val;
+static gint hf_rstcause_line;
+static gint hf_rstcause_txt;
 /* High */
-static gint hf_high_id             = -1;
-static gint hf_peer_ipproto        = -1;
-static gint hf_peer_vlan           = -1;
-static gint hf_peer_remote_addr    = -1;
-static gint hf_peer_remote_ip6addr = -1;
-static gint hf_peer_remote_rtdom   = -1;
-static gint hf_peer_local_addr     = -1;
-static gint hf_peer_local_ip6addr  = -1;
-static gint hf_peer_local_rtdom    = -1;
-static gint hf_peer_ipaddr         = -1;
-static gint hf_peer_ip6addr        = -1;
-static gint hf_peer_rtdom          = -1;
-static gint hf_peer_remote_port    = -1;
-static gint hf_peer_local_port     = -1;
-static gint hf_peer_port           = -1;
-static gint hf_peer_nopeer         = -1;
+static gint hf_high_id;
+static gint hf_peer_ipproto;
+static gint hf_peer_vlan;
+static gint hf_peer_remote_addr;
+static gint hf_peer_remote_ip6addr;
+static gint hf_peer_remote_rtdom;
+static gint hf_peer_local_addr;
+static gint hf_peer_local_ip6addr;
+static gint hf_peer_local_rtdom;
+static gint hf_peer_ipaddr;
+static gint hf_peer_ip6addr;
+static gint hf_peer_rtdom;
+static gint hf_peer_remote_port;
+static gint hf_peer_local_port;
+static gint hf_peer_port;
+static gint hf_peer_nopeer;
 /* Analysis */
-static gint hf_analysis = -1;
+static gint hf_analysis;
 
 /* These fields will be used if pref_pop_other_fields is enabled.
    They will be populated with data from the "high" trailer so that filtering on ip.addr, tcp.port, etc...
    can find peer side flows of the specific flow you're searching for. */
-static gint hf_ip_ipaddr   = -1;
-static gint hf_ip6_ip6addr = -1;
-static gint hf_tcp_tcpport = -1;
-static gint hf_udp_udpport = -1;
+static gint hf_ip_ipaddr;
+static gint hf_ip6_ip6addr;
+static gint hf_tcp_tcpport;
+static gint hf_udp_udpport;
 
-static gint hf_dpt_magic = -1;
-static gint hf_dpt_ver   = -1;
-static gint hf_dpt_len   = -1;
+static gint hf_dpt_magic;
+static gint hf_dpt_ver;
+static gint hf_dpt_len;
 
-static expert_field ei_f5eth_flowlost  = EI_INIT;
-static expert_field ei_f5eth_flowreuse = EI_INIT;
-static expert_field ei_f5eth_badlen    = EI_INIT;
-static expert_field ei_f5eth_undecoded = EI_INIT;
+static expert_field ei_f5eth_flowlost;
+static expert_field ei_f5eth_flowreuse;
+static expert_field ei_f5eth_badlen;
+static expert_field ei_f5eth_undecoded;
 
 /* These are the ids of the subtrees that we may be creating */
-static gint ett_f5ethtrailer             = -1;
-static gint ett_f5ethtrailer_unknown     = -1;
-static gint ett_f5ethtrailer_low         = -1;
-static gint ett_f5ethtrailer_low_flags   = -1;
-static gint ett_f5ethtrailer_med         = -1;
-static gint ett_f5ethtrailer_high        = -1;
-static gint ett_f5ethtrailer_rstcause    = -1;
-static gint ett_f5ethtrailer_trailer_hdr = -1;
-static gint ett_f5ethtrailer_obj_names   = -1;
+static gint ett_f5ethtrailer;
+static gint ett_f5ethtrailer_unknown;
+static gint ett_f5ethtrailer_low;
+static gint ett_f5ethtrailer_low_flags;
+static gint ett_f5ethtrailer_med;
+static gint ett_f5ethtrailer_high;
+static gint ett_f5ethtrailer_rstcause;
+static gint ett_f5ethtrailer_trailer_hdr;
+static gint ett_f5ethtrailer_obj_names;
 
 /* For fileinformation */
-static gint hf_fi_command      = -1;
-static gint hf_fi_version      = -1;
-static gint hf_fi_hostname     = -1;
-static gint hf_fi_platform     = -1;
-static gint hf_fi_platformname = -1;
-static gint hf_fi_product      = -1;
+static gint hf_fi_command;
+static gint hf_fi_version;
+static gint hf_fi_hostname;
+static gint hf_fi_platform;
+static gint hf_fi_platformname;
+static gint hf_fi_product;
 
 /* Wireshark preference to show RST cause in info column */
 static gboolean rstcause_in_info = TRUE;
@@ -3087,27 +3087,27 @@ typedef struct _F5TLS_DATA {
     f5tls_packet_data_t *pkt;
 } f5tls_data_t;
 
-static int proto_f5ethtrailer_dpt_tls = -1;
+static int proto_f5ethtrailer_dpt_tls;
 
-static gint hf_f5tls_tls = -1;
+static gint hf_f5tls_tls;
 
 /* TLS 1.x fields */
-static gint hf_f5tls_secret_len = -1;
-static gint hf_f5tls_mstr_sec   = -1;
-static gint hf_f5tls_clnt_rand  = -1;
-static gint hf_f5tls_srvr_rand  = -1;
+static gint hf_f5tls_secret_len;
+static gint hf_f5tls_mstr_sec;
+static gint hf_f5tls_clnt_rand;
+static gint hf_f5tls_srvr_rand;
 
 /* TLS 1.3 fields */
-static gint hf_f5tls_early_traffic_sec  = -1;
-static gint hf_f5tls_clnt_hs_sec  = -1;
-static gint hf_f5tls_srvr_hs_sec  = -1;
-static gint hf_f5tls_clnt_app_sec = -1;
-static gint hf_f5tls_srvr_app_sec = -1;
-static gint hf_f5tls_keylog       = -1;
-
-static gint ett_f5tls     = -1;
-static gint ett_f5tls_std = -1;
-static gint ett_f5tls_ext = -1;
+static gint hf_f5tls_early_traffic_sec;
+static gint hf_f5tls_clnt_hs_sec;
+static gint hf_f5tls_srvr_hs_sec;
+static gint hf_f5tls_clnt_app_sec;
+static gint hf_f5tls_srvr_app_sec;
+static gint hf_f5tls_keylog;
+
+static gint ett_f5tls;
+static gint ett_f5tls_std;
+static gint ett_f5tls_ext;
 
 static dissector_table_t tls_subdissector_table;
 
diff --git a/epan/dissectors/packet-fbzero.c b/epan/dissectors/packet-fbzero.c
index 08c11c4e06..339c34d0bb 100644
--- a/epan/dissectors/packet-fbzero.c
+++ b/epan/dissectors/packet-fbzero.c
@@ -31,49 +31,49 @@
 void proto_register_fb_zero(void);
 void proto_reg_handoff_fb_zero(void);
 
-static int proto_fb_zero = -1;
+static int proto_fb_zero;
 
 static dissector_handle_t fb_zero_handle;
 
-static int hf_fb_zero_puflags = -1;
-static int hf_fb_zero_puflags_vrsn = -1;
-static int hf_fb_zero_puflags_unknown = -1;
-static int hf_fb_zero_version = -1;
-static int hf_fb_zero_length = -1;
-static int hf_fb_zero_tag = -1;
-static int hf_fb_zero_tags = -1;
-static int hf_fb_zero_tag_number = -1;
-static int hf_fb_zero_tag_value = -1;
-static int hf_fb_zero_tag_type = -1;
-static int hf_fb_zero_tag_offset_end = -1;
-static int hf_fb_zero_tag_length = -1;
-static int hf_fb_zero_tag_sni = -1;
-static int hf_fb_zero_tag_vers = -1;
-static int hf_fb_zero_tag_sno = -1;
-static int hf_fb_zero_tag_aead = -1;
-static int hf_fb_zero_tag_scid = -1;
-static int hf_fb_zero_tag_time = -1;
-static int hf_fb_zero_tag_alpn = -1;
-static int hf_fb_zero_tag_pubs = -1;
-static int hf_fb_zero_tag_kexs = -1;
-static int hf_fb_zero_tag_nonc = -1;
-
-static int hf_fb_zero_tag_unknown = -1;
-
-static int hf_fb_zero_padding = -1;
-static int hf_fb_zero_payload = -1;
-static int hf_fb_zero_unknown = -1;
-
-static gint ett_fb_zero = -1;
-static gint ett_fb_zero_puflags = -1;
-static gint ett_fb_zero_prflags = -1;
-static gint ett_fb_zero_ft = -1;
-static gint ett_fb_zero_ftflags = -1;
-static gint ett_fb_zero_tag_value = -1;
-
-static expert_field ei_fb_zero_tag_undecoded = EI_INIT;
-static expert_field ei_fb_zero_tag_offset_end_invalid = EI_INIT;
-static expert_field ei_fb_zero_length_invalid = EI_INIT;
+static int hf_fb_zero_puflags;
+static int hf_fb_zero_puflags_vrsn;
+static int hf_fb_zero_puflags_unknown;
+static int hf_fb_zero_version;
+static int hf_fb_zero_length;
+static int hf_fb_zero_tag;
+static int hf_fb_zero_tags;
+static int hf_fb_zero_tag_number;
+static int hf_fb_zero_tag_value;
+static int hf_fb_zero_tag_type;
+static int hf_fb_zero_tag_offset_end;
+static int hf_fb_zero_tag_length;
+static int hf_fb_zero_tag_sni;
+static int hf_fb_zero_tag_vers;
+static int hf_fb_zero_tag_sno;
+static int hf_fb_zero_tag_aead;
+static int hf_fb_zero_tag_scid;
+static int hf_fb_zero_tag_time;
+static int hf_fb_zero_tag_alpn;
+static int hf_fb_zero_tag_pubs;
+static int hf_fb_zero_tag_kexs;
+static int hf_fb_zero_tag_nonc;
+
+static int hf_fb_zero_tag_unknown;
+
+static int hf_fb_zero_padding;
+static int hf_fb_zero_payload;
+static int hf_fb_zero_unknown;
+
+static gint ett_fb_zero;
+static gint ett_fb_zero_puflags;
+static gint ett_fb_zero_prflags;
+static gint ett_fb_zero_ft;
+static gint ett_fb_zero_ftflags;
+static gint ett_fb_zero_tag_value;
+
+static expert_field ei_fb_zero_tag_undecoded;
+static expert_field ei_fb_zero_tag_offset_end_invalid;
+static expert_field ei_fb_zero_length_invalid;
 
 #define FBZERO_MIN_LENGTH 3
 
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index 3975914555..c75db6d4b7 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -49,86 +49,86 @@ void proto_reg_handoff_fc(void);
 #define FC_PARAM_SIZE          4
 
 /* Initialize the protocol and registered fields */
-static int proto_fc = -1;
-static int hf_fc_time = -1;
-static int hf_fc_exchange_first_frame = -1;
-static int hf_fc_exchange_last_frame = -1;
-static int hf_fc_rctl = -1;
-static int hf_fc_did = -1;
-static int hf_fc_csctl = -1;
-static int hf_fc_sid = -1;
-static int hf_fc_id = -1;
-static int hf_fc_type = -1;
-static int hf_fc_fctl = -1;
-static int hf_fc_fctl_exchange_responder = -1;
-static int hf_fc_fctl_seq_recipient = -1;
-static int hf_fc_fctl_exchange_first = -1;
-static int hf_fc_fctl_exchange_last = -1;
-static int hf_fc_fctl_seq_last = -1;
-static int hf_fc_fctl_priority = -1;
-static int hf_fc_fctl_transfer_seq_initiative = -1;
-static int hf_fc_fctl_rexmitted_seq = -1;
-static int hf_fc_fctl_rel_offset = -1;
-static int hf_fc_fctl_abts_ack = -1;
-/* static int hf_fc_fctl_abts_not_ack = -1; */
-static int hf_fc_fctl_last_data_frame = -1;
-static int hf_fc_fctl_ack_0_1 = -1;
-static int hf_fc_seqid = -1;
-static int hf_fc_dfctl = -1;
-static int hf_fc_seqcnt = -1;
-static int hf_fc_oxid = -1;
-static int hf_fc_rxid = -1;
-static int hf_fc_param = -1;
-static int hf_fc_ftype = -1;    /* Derived field, non-existent in FC hdr */
-static int hf_fc_reassembled = -1;
-static int hf_fc_relative_offset = -1;
+static int proto_fc;
+static int hf_fc_time;
+static int hf_fc_exchange_first_frame;
+static int hf_fc_exchange_last_frame;
+static int hf_fc_rctl;
+static int hf_fc_did;
+static int hf_fc_csctl;
+static int hf_fc_sid;
+static int hf_fc_id;
+static int hf_fc_type;
+static int hf_fc_fctl;
+static int hf_fc_fctl_exchange_responder;
+static int hf_fc_fctl_seq_recipient;
+static int hf_fc_fctl_exchange_first;
+static int hf_fc_fctl_exchange_last;
+static int hf_fc_fctl_seq_last;
+static int hf_fc_fctl_priority;
+static int hf_fc_fctl_transfer_seq_initiative;
+static int hf_fc_fctl_rexmitted_seq;
+static int hf_fc_fctl_rel_offset;
+static int hf_fc_fctl_abts_ack;
+/* static int hf_fc_fctl_abts_not_ack; */
+static int hf_fc_fctl_last_data_frame;
+static int hf_fc_fctl_ack_0_1;
+static int hf_fc_seqid;
+static int hf_fc_dfctl;
+static int hf_fc_seqcnt;
+static int hf_fc_oxid;
+static int hf_fc_rxid;
+static int hf_fc_param;
+static int hf_fc_ftype;    /* Derived field, non-existent in FC hdr */
+static int hf_fc_reassembled;
+static int hf_fc_relative_offset;
 
 /* VFT fields */
-static int hf_fc_vft = -1;
-static int hf_fc_vft_rctl = -1;
-static int hf_fc_vft_ver = -1;
-static int hf_fc_vft_type = -1;
-static int hf_fc_vft_pri = -1;
-static int hf_fc_vft_vf_id = -1;
-static int hf_fc_vft_hop_ct = -1;
+static int hf_fc_vft;
+static int hf_fc_vft_rctl;
+static int hf_fc_vft_ver;
+static int hf_fc_vft_type;
+static int hf_fc_vft_pri;
+static int hf_fc_vft_vf_id;
+static int hf_fc_vft_hop_ct;
 
 /* Network_Header fields */
-static int hf_fc_nh_da = -1;
-static int hf_fc_nh_sa = -1;
+static int hf_fc_nh_da;
+static int hf_fc_nh_sa;
 
 /* For Basic Link Svc */
-static int hf_fc_bls_seqid_vld = -1;
-static int hf_fc_bls_lastvld_seqid = -1;
-static int hf_fc_bls_oxid = -1;
-static int hf_fc_bls_rxid = -1;
-static int hf_fc_bls_lowseqcnt = -1;
-static int hf_fc_bls_hiseqcnt = -1;
-static int hf_fc_bls_rjtcode = -1;
-static int hf_fc_bls_rjtdetail = -1;
-static int hf_fc_bls_vendor = -1;
+static int hf_fc_bls_seqid_vld;
+static int hf_fc_bls_lastvld_seqid;
+static int hf_fc_bls_oxid;
+static int hf_fc_bls_rxid;
+static int hf_fc_bls_lowseqcnt;
+static int hf_fc_bls_hiseqcnt;
+static int hf_fc_bls_rjtcode;
+static int hf_fc_bls_rjtdetail;
+static int hf_fc_bls_vendor;
 
 /* For FC SOF */
-static int proto_fcsof = -1;
+static int proto_fcsof;
 
-static int hf_fcsof = -1;
-static int hf_fceof = -1;
-static int hf_fccrc = -1;
-static int hf_fccrc_status = -1;
+static int hf_fcsof;
+static int hf_fceof;
+static int hf_fccrc;
+static int hf_fccrc_status;
 
-static int ett_fcsof = -1;
-static int ett_fceof = -1;
-static int ett_fccrc = -1;
+static int ett_fcsof;
+static int ett_fceof;
+static int ett_fccrc;
 
 
 /* Initialize the subtree pointers */
-static gint ett_fc = -1;
-static gint ett_fctl = -1;
-static gint ett_fcbls = -1;
-static gint ett_fc_vft = -1;
-
-static expert_field ei_fccrc = EI_INIT;
-static expert_field ei_short_hdr = EI_INIT;
-/* static expert_field ei_frag_size = EI_INIT; */
+static gint ett_fc;
+static gint ett_fctl;
+static gint ett_fcbls;
+static gint ett_fc_vft;
+
+static expert_field ei_fccrc;
+static expert_field ei_short_hdr;
+/* static expert_field ei_frag_size; */
 
 static dissector_handle_t fc_handle, fcsof_handle;
 static dissector_table_t fcftype_dissector_table;
diff --git a/epan/dissectors/packet-fc00.c b/epan/dissectors/packet-fc00.c
index f2b1952efd..2b7aaa9e31 100644
--- a/epan/dissectors/packet-fc00.c
+++ b/epan/dissectors/packet-fc00.c
@@ -27,21 +27,21 @@ void proto_register_fc00(void);
 static dissector_handle_t fc00_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_fc00 = -1;
-static int hf_fc00_session_state    = -1;
-static int hf_fc00_session_nonce    = -1;
-static int hf_fc00_auth_challenge   = -1;
-static int hf_fc00_auth_type        = -1;
-static int hf_fc00_auth_hash_code   = -1;
-static int hf_fc00_auth_poly        = -1;
-static int hf_fc00_auth_derivations = -1;
-static int hf_fc00_auth_additional  = -1;
-static int hf_fc00_random_nonce     = -1;
-static int hf_fc00_public_key       = -1;
-static int hf_fc00_ip_address       = -1;
-static int hf_fc00_authenticator    = -1;
-static int hf_fc00_temp_publicy_key = -1;
-static int hf_fc00_payload          = -1;
+static int proto_fc00;
+static int hf_fc00_session_state;
+static int hf_fc00_session_nonce;
+static int hf_fc00_auth_challenge;
+static int hf_fc00_auth_type;
+static int hf_fc00_auth_hash_code;
+static int hf_fc00_auth_poly;
+static int hf_fc00_auth_derivations;
+static int hf_fc00_auth_additional;
+static int hf_fc00_random_nonce;
+static int hf_fc00_public_key;
+static int hf_fc00_ip_address;
+static int hf_fc00_authenticator;
+static int hf_fc00_temp_publicy_key;
+static int hf_fc00_payload;
 
 /* Cjdns constants */
 #define SESSION_STATE_OFF 0
@@ -59,9 +59,9 @@ static int hf_fc00_payload          = -1;
 #define CRYPTO_HEADER_LEN 120
 
 /* Initialize the subtree pointers */
-static gint ett_fc00      = -1;
-static gint ett_fc00_auth = -1;
-static gint ett_fc00_key  = -1;
+static gint ett_fc00;
+static gint ett_fc00_auth;
+static gint ett_fc00_key;
 
 static const value_string session_states[] = {
     { G_MAXUINT32, "Connect To Me" },
diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c
index 21499a26eb..81da57fdad 100644
--- a/epan/dissectors/packet-fcct.c
+++ b/epan/dissectors/packet-fcct.c
@@ -22,26 +22,26 @@ void proto_reg_handoff_fcct(void);
 static dissector_handle_t fcct_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_fcct           = -1;
-static int hf_fcct_revision     = -1;
-static int hf_fcct_inid         = -1;
-static int hf_fcct_gstype       = -1;
-static int hf_fcct_gssubtype    = -1;
-static int hf_fcct_options      = -1;
-static int hf_fcct_server       = -1; /* derived field */
+static int proto_fcct;
+static int hf_fcct_revision;
+static int hf_fcct_inid;
+static int hf_fcct_gstype;
+static int hf_fcct_gssubtype;
+static int hf_fcct_options;
+static int hf_fcct_server; /* derived field */
 
 /* Extended preamble fields */
 #if 0
-static int hf_fcct_ext_said     = -1;
-static int hf_fcct_ext_tid      = -1;
-static int hf_fcct_ext_reqname  = -1;
-static int hf_fcct_ext_tstamp   = -1;
-static int hf_fcct_ext_authblk  = -1;
+static int hf_fcct_ext_said;
+static int hf_fcct_ext_tid;
+static int hf_fcct_ext_reqname;
+static int hf_fcct_ext_tstamp;
+static int hf_fcct_ext_authblk;
 #endif
 
 /* Initialize the subtree pointers */
-static gint ett_fcct = -1;
-static gint ett_fcct_ext = -1;  /* for the extended header */
+static gint ett_fcct;
+static gint ett_fcct_ext;  /* for the extended header */
 
 const value_string fc_ct_rjt_code_vals [] = {
     {FCCT_RJT_INVCMDCODE, "Invalid Cmd Code"},
diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c
index 7e2acb6b3d..8cd0f07e11 100644
--- a/epan/dissectors/packet-fcdns.c
+++ b/epan/dissectors/packet-fcdns.c
@@ -224,87 +224,87 @@ static const value_string fc_dns_rjt_det_code_val [] = {
 #define FCDNS_GSSUBTYPE_DNS  0x02
 #define FCDNS_GSSUBTYPE_IP   0x03
 
-static int proto_fcdns = -1;
-
-static int hf_fcdns_cos_1 = -1;
-static int hf_fcdns_cos_2 = -1;
-static int hf_fcdns_cos_3 = -1;
-static int hf_fcdns_cos_4 = -1;
-static int hf_fcdns_cos_6 = -1;
-static int hf_fcdns_cos_f = -1;
-static int hf_fcdns_fc4features = -1;
-static int hf_fcdns_fc4features_i = -1;
-static int hf_fcdns_fc4features_t = -1;
-static int hf_fcdns_fc4type = -1;
-static int hf_fcdns_fc4type_fcp = -1;
-static int hf_fcdns_fc4type_gs3 = -1;
-static int hf_fcdns_fc4type_ip = -1;
-static int hf_fcdns_fc4type_llcsnap = -1;
-static int hf_fcdns_fc4type_snmp = -1;
-static int hf_fcdns_fc4type_swils = -1;
-static int hf_fcdns_fc4type_vi = -1;
-static int hf_fcdns_id_length = -1;
-static int hf_fcdns_maxres_size = -1;
-static int hf_fcdns_num_entries = -1;
-static int hf_fcdns_num_fc4desc = -1;
-static int hf_fcdns_opcode = -1;
-static int hf_fcdns_portip = -1;
-static int hf_fcdns_reason = -1;
-static int hf_fcdns_reply_cos = -1;
-static int hf_fcdns_req_areascope = -1;
-static int hf_fcdns_req_cos = -1;
-static int hf_fcdns_req_domainscope = -1;
-static int hf_fcdns_req_fc4type = -1;
-static int hf_fcdns_req_fc4types = -1;
-static int hf_fcdns_req_fdesc = -1;
-static int hf_fcdns_req_fdesclen = -1;
-static int hf_fcdns_req_ip = -1;
-static int hf_fcdns_req_nname = -1;
-static int hf_fcdns_req_pname = -1;
-static int hf_fcdns_req_portid = -1;
-static int hf_fcdns_req_ptype = -1;
-static int hf_fcdns_req_sname = -1;
-static int hf_fcdns_req_snamelen = -1;
-static int hf_fcdns_req_spname = -1;
-static int hf_fcdns_req_spnamelen = -1;
-static int hf_fcdns_rjtdetail = -1;
-static int hf_fcdns_rply_fc4desc = -1;
-static int hf_fcdns_rply_fc4desclen = -1;
-static int hf_fcdns_rply_fc4type = -1;
-static int hf_fcdns_rply_fpname = -1;
-static int hf_fcdns_rply_gft = -1;
-static int hf_fcdns_rply_hrdaddr = -1;
-static int hf_fcdns_rply_ipa = -1;
-static int hf_fcdns_rply_ipnode = -1;
-static int hf_fcdns_rply_ipport = -1;
-static int hf_fcdns_rply_nname = -1;
-static int hf_fcdns_rply_ownerid = -1;
-static int hf_fcdns_rply_pname = -1;
-static int hf_fcdns_rply_portid = -1;
-static int hf_fcdns_rply_ptype = -1;
-static int hf_fcdns_rply_sname = -1;
-static int hf_fcdns_rply_snamelen = -1;
-static int hf_fcdns_rply_spname = -1;
-static int hf_fcdns_rply_spnamelen = -1;
-static int hf_fcdns_sw2_objfmt = -1;
-static int hf_fcdns_vendor = -1;
-static int hf_fcdns_zone_flags = -1;
-static int hf_fcdns_zone_mbrid = -1;
-static int hf_fcdns_zone_mbrid_fc = -1;
-static int hf_fcdns_zone_mbrid_uint = -1;
-static int hf_fcdns_zone_mbrid_wwn = -1;
-static int hf_fcdns_zone_mbrtype = -1;
-static int hf_fcdns_zonelen = -1;
-static int hf_fcdns_zonenm = -1;
+static int proto_fcdns;
+
+static int hf_fcdns_cos_1;
+static int hf_fcdns_cos_2;
+static int hf_fcdns_cos_3;
+static int hf_fcdns_cos_4;
+static int hf_fcdns_cos_6;
+static int hf_fcdns_cos_f;
+static int hf_fcdns_fc4features;
+static int hf_fcdns_fc4features_i;
+static int hf_fcdns_fc4features_t;
+static int hf_fcdns_fc4type;
+static int hf_fcdns_fc4type_fcp;
+static int hf_fcdns_fc4type_gs3;
+static int hf_fcdns_fc4type_ip;
+static int hf_fcdns_fc4type_llcsnap;
+static int hf_fcdns_fc4type_snmp;
+static int hf_fcdns_fc4type_swils;
+static int hf_fcdns_fc4type_vi;
+static int hf_fcdns_id_length;
+static int hf_fcdns_maxres_size;
+static int hf_fcdns_num_entries;
+static int hf_fcdns_num_fc4desc;
+static int hf_fcdns_opcode;
+static int hf_fcdns_portip;
+static int hf_fcdns_reason;
+static int hf_fcdns_reply_cos;
+static int hf_fcdns_req_areascope;
+static int hf_fcdns_req_cos;
+static int hf_fcdns_req_domainscope;
+static int hf_fcdns_req_fc4type;
+static int hf_fcdns_req_fc4types;
+static int hf_fcdns_req_fdesc;
+static int hf_fcdns_req_fdesclen;
+static int hf_fcdns_req_ip;
+static int hf_fcdns_req_nname;
+static int hf_fcdns_req_pname;
+static int hf_fcdns_req_portid;
+static int hf_fcdns_req_ptype;
+static int hf_fcdns_req_sname;
+static int hf_fcdns_req_snamelen;
+static int hf_fcdns_req_spname;
+static int hf_fcdns_req_spnamelen;
+static int hf_fcdns_rjtdetail;
+static int hf_fcdns_rply_fc4desc;
+static int hf_fcdns_rply_fc4desclen;
+static int hf_fcdns_rply_fc4type;
+static int hf_fcdns_rply_fpname;
+static int hf_fcdns_rply_gft;
+static int hf_fcdns_rply_hrdaddr;
+static int hf_fcdns_rply_ipa;
+static int hf_fcdns_rply_ipnode;
+static int hf_fcdns_rply_ipport;
+static int hf_fcdns_rply_nname;
+static int hf_fcdns_rply_ownerid;
+static int hf_fcdns_rply_pname;
+static int hf_fcdns_rply_portid;
+static int hf_fcdns_rply_ptype;
+static int hf_fcdns_rply_sname;
+static int hf_fcdns_rply_snamelen;
+static int hf_fcdns_rply_spname;
+static int hf_fcdns_rply_spnamelen;
+static int hf_fcdns_sw2_objfmt;
+static int hf_fcdns_vendor;
+static int hf_fcdns_zone_flags;
+static int hf_fcdns_zone_mbrid;
+static int hf_fcdns_zone_mbrid_fc;
+static int hf_fcdns_zone_mbrid_uint;
+static int hf_fcdns_zone_mbrid_wwn;
+static int hf_fcdns_zone_mbrtype;
+static int hf_fcdns_zonelen;
+static int hf_fcdns_zonenm;
 
 /* Initialize the subtree pointers */
-static gint ett_fcdns = -1;
-static gint ett_cos_flags = -1;
-static gint ett_fc4flags = -1;
-static gint ett_fc4features = -1;
+static gint ett_fcdns;
+static gint ett_cos_flags;
+static gint ett_fc4flags;
+static gint ett_fc4features;
 
-static expert_field ei_fcdns_no_record_of_exchange = EI_INIT;
-static expert_field ei_fcdns_zone_mbrid = EI_INIT;
+static expert_field ei_fcdns_no_record_of_exchange;
+static expert_field ei_fcdns_zone_mbrid;
 
 typedef struct _fcdns_conv_key {
     guint32 conv_idx;
diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c
index cde67885ec..6f6120a9c3 100644
--- a/epan/dissectors/packet-fcels.c
+++ b/epan/dissectors/packet-fcels.c
@@ -31,233 +31,233 @@ static dissector_handle_t els_handle;
 #define FC_ELS_REQ  1
 
 /* Initialize the protocol and registered fields */
-static int proto_fcels                  = -1;
-static int hf_fcels_opcode              = -1;
-static int hf_fcels_rjtcode             = -1;
-static int hf_fcels_rjtdetcode          = -1;
-static int hf_fcels_vnduniq             = -1;
-static int hf_fcels_b2b                 = -1;
-static int hf_fcels_cmnfeatures         = -1;
-static int hf_fcels_bbscnum             = -1;
-static int hf_fcels_rcvsize             = -1;
-static int hf_fcels_maxconseq           = -1;
-static int hf_fcels_reloffset           = -1;
-static int hf_fcels_edtov               = -1;
-static int hf_fcels_npname              = -1;
-static int hf_fcels_fnname              = -1;
+static int proto_fcels;
+static int hf_fcels_opcode;
+static int hf_fcels_rjtcode;
+static int hf_fcels_rjtdetcode;
+static int hf_fcels_vnduniq;
+static int hf_fcels_b2b;
+static int hf_fcels_cmnfeatures;
+static int hf_fcels_bbscnum;
+static int hf_fcels_rcvsize;
+static int hf_fcels_maxconseq;
+static int hf_fcels_reloffset;
+static int hf_fcels_edtov;
+static int hf_fcels_npname;
+static int hf_fcels_fnname;
 #if 0
-static int hf_fcels_cls1param           = -1;
-static int hf_fcels_cls2param           = -1;
-static int hf_fcels_cls3param           = -1;
-static int hf_fcels_cls4param           = -1;
+static int hf_fcels_cls1param;
+static int hf_fcels_cls2param;
+static int hf_fcels_cls3param;
+static int hf_fcels_cls4param;
 #endif
-static int hf_fcels_vendorvers          = -1;
-static int hf_fcels_svcavail            = -1;
-static int hf_fcels_clsflags            = -1;
-static int hf_fcels_clsrcvsize          = -1;
-static int hf_fcels_conseq              = -1;
-static int hf_fcels_e2e                 = -1;
-static int hf_fcels_openseq             = -1;
-static int hf_fcels_nportid             = -1;
-static int hf_fcels_oxid                = -1;
-static int hf_fcels_rxid                = -1;
-static int hf_fcels_recovqual           = -1;
-static int hf_fcels_fabricaddr          = -1;
-static int hf_fcels_fabricpname         = -1;
-static int hf_fcels_failedrcvr          = -1;
-static int hf_fcels_flacompliance       = -1;
-static int hf_fcels_loopstate           = -1;
-static int hf_fcels_publicloop_bmap     = -1;
-static int hf_fcels_pvtloop_bmap        = -1;
-static int hf_fcels_alpa_map            = -1;
-static int hf_fcels_scrregn             = -1;
-static int hf_fcels_farp_matchcodept    = -1;
-static int hf_fcels_farp_respaction     = -1;
-static int hf_fcels_resportid           = -1;
-static int hf_fcels_respname            = -1;
-static int hf_fcels_respnname           = -1;
-static int hf_fcels_reqipaddr           = -1;
-static int hf_fcels_respipaddr          = -1;
-static int hf_fcels_hardaddr            = -1;
-static int hf_fcels_rps_flag            = -1;
-static int hf_fcels_rps_portnum         = -1;
-static int hf_fcels_rps_portstatus      = -1;
-static int hf_fcels_rnft_fc4type        = -1;
-static int hf_fcels_rscn_evqual         = -1;
-static int hf_fcels_rscn_addrfmt        = -1;
-static int hf_fcels_rscn_domain         = -1;
-static int hf_fcels_rscn_area           = -1;
-static int hf_fcels_rscn_port           = -1;
-static int hf_fcels_rec_fc4             = -1;
-static int hf_fcels_estat               = -1;
-static int hf_fcels_estat_resp          = -1;
-static int hf_fcels_estat_seq_init      = -1;
-static int hf_fcels_estat_compl         = -1;
-static int hf_fcels_nodeidfmt           = -1;
-static int hf_fcels_spidlen             = -1;
-static int hf_fcels_vendoruniq          = -1;
-static int hf_fcels_vendorsp            = -1;
-static int hf_fcels_asstype             = -1;
-static int hf_fcels_physport            = -1;
-static int hf_fcels_attnodes            = -1;
-static int hf_fcels_nodemgmt            = -1;
-static int hf_fcels_ipvers              = -1;
-static int hf_fcels_tcpport             = -1;
-static int hf_fcels_ip                  = -1;
-static int hf_fcels_cbind_liveness      = -1;
-static int hf_fcels_cbind_addr_mode     = -1;
-static int hf_fcels_cbind_ifcp_version  = -1;
-static int hf_fcels_cbind_userinfo      = -1;
-static int hf_fcels_cbind_snpname       = -1;
-static int hf_fcels_cbind_dnpname       = -1;
-static int hf_fcels_cbind_status        = -1;
-static int hf_fcels_chandle             = -1;
-static int hf_fcels_unbind_status       = -1;
-static int hf_fcels_cmn_cios            = -1;
-static int hf_fcels_cmn_rro             = -1;
-static int hf_fcels_cmn_vvv             = -1;
-static int hf_fcels_cmn_b2b             = -1;
-static int hf_fcels_cmn_e_d_tov         = -1;
-static int hf_fcels_cmn_simplex         = -1;
-static int hf_fcels_cmn_multicast       = -1;
-static int hf_fcels_cmn_broadcast       = -1;
-static int hf_fcels_cmn_security        = -1;
-static int hf_fcels_cmn_clk             = -1;
-static int hf_fcels_cmn_dhd             = -1;
-static int hf_fcels_cmn_seqcnt          = -1;
-static int hf_fcels_cmn_payload         = -1;
-static int hf_fcels_cls_cns             = -1;
-static int hf_fcels_cls_sdr             = -1;
-static int hf_fcels_cls_prio            = -1;
-static int hf_fcels_cls_nzctl           = -1;
-static int hf_fcels_initctl             = -1;
-static int hf_fcels_initctl_initial_pa  = -1;
-static int hf_fcels_initctl_ack0        = -1;
-static int hf_fcels_initctl_ackgaa      = -1;
-static int hf_fcels_initctl_sync        = -1;
-static int hf_fcels_rcptctl             = -1;
-static int hf_fcels_rcptctl_ack0        = -1;
-static int hf_fcels_rcptctl_interlock   = -1;
-static int hf_fcels_rcptctl_policy      = -1;
-static int hf_fcels_rcptctl_category    = -1;
-static int hf_fcels_rcptctl_sync        = -1;
-static int hf_fcels_fcpflags            = -1;
-static int hf_fcels_fcpflags_trireq     = -1;
-static int hf_fcels_fcpflags_trirep     = -1;
-static int hf_fcels_fcpflags_retry      = -1;
-static int hf_fcels_fcpflags_ccomp      = -1;
-static int hf_fcels_fcpflags_datao      = -1;
-static int hf_fcels_fcpflags_initiator  = -1;
-static int hf_fcels_fcpflags_target     = -1;
-static int hf_fcels_fcpflags_rdxr       = -1;
-static int hf_fcels_fcpflags_wrxr       = -1;
-static int hf_fcels_prliloflags         = -1;
-static int hf_fcels_tprloflags_opav     = -1;
-static int hf_fcels_tprloflags_rpav     = -1;
-static int hf_fcels_tprloflags_npv      = -1;
-static int hf_fcels_tprloflags_gprlo    = -1;
-static int hf_fcels_speedflags          = -1;
-static int hf_fcels_speedflags_1gb      = -1;
-static int hf_fcels_speedflags_2gb      = -1;
-static int hf_fcels_speedflags_4gb      = -1;
-static int hf_fcels_speedflags_10gb     = -1;
-static int hf_fcels_prliloflags_opav    = -1;
-static int hf_fcels_prliloflags_ipe     = -1;
-static int hf_fcels_prliloflags_eip     = -1;
+static int hf_fcels_vendorvers;
+static int hf_fcels_svcavail;
+static int hf_fcels_clsflags;
+static int hf_fcels_clsrcvsize;
+static int hf_fcels_conseq;
+static int hf_fcels_e2e;
+static int hf_fcels_openseq;
+static int hf_fcels_nportid;
+static int hf_fcels_oxid;
+static int hf_fcels_rxid;
+static int hf_fcels_recovqual;
+static int hf_fcels_fabricaddr;
+static int hf_fcels_fabricpname;
+static int hf_fcels_failedrcvr;
+static int hf_fcels_flacompliance;
+static int hf_fcels_loopstate;
+static int hf_fcels_publicloop_bmap;
+static int hf_fcels_pvtloop_bmap;
+static int hf_fcels_alpa_map;
+static int hf_fcels_scrregn;
+static int hf_fcels_farp_matchcodept;
+static int hf_fcels_farp_respaction;
+static int hf_fcels_resportid;
+static int hf_fcels_respname;
+static int hf_fcels_respnname;
+static int hf_fcels_reqipaddr;
+static int hf_fcels_respipaddr;
+static int hf_fcels_hardaddr;
+static int hf_fcels_rps_flag;
+static int hf_fcels_rps_portnum;
+static int hf_fcels_rps_portstatus;
+static int hf_fcels_rnft_fc4type;
+static int hf_fcels_rscn_evqual;
+static int hf_fcels_rscn_addrfmt;
+static int hf_fcels_rscn_domain;
+static int hf_fcels_rscn_area;
+static int hf_fcels_rscn_port;
+static int hf_fcels_rec_fc4;
+static int hf_fcels_estat;
+static int hf_fcels_estat_resp;
+static int hf_fcels_estat_seq_init;
+static int hf_fcels_estat_compl;
+static int hf_fcels_nodeidfmt;
+static int hf_fcels_spidlen;
+static int hf_fcels_vendoruniq;
+static int hf_fcels_vendorsp;
+static int hf_fcels_asstype;
+static int hf_fcels_physport;
+static int hf_fcels_attnodes;
+static int hf_fcels_nodemgmt;
+static int hf_fcels_ipvers;
+static int hf_fcels_tcpport;
+static int hf_fcels_ip;
+static int hf_fcels_cbind_liveness;
+static int hf_fcels_cbind_addr_mode;
+static int hf_fcels_cbind_ifcp_version;
+static int hf_fcels_cbind_userinfo;
+static int hf_fcels_cbind_snpname;
+static int hf_fcels_cbind_dnpname;
+static int hf_fcels_cbind_status;
+static int hf_fcels_chandle;
+static int hf_fcels_unbind_status;
+static int hf_fcels_cmn_cios;
+static int hf_fcels_cmn_rro;
+static int hf_fcels_cmn_vvv;
+static int hf_fcels_cmn_b2b;
+static int hf_fcels_cmn_e_d_tov;
+static int hf_fcels_cmn_simplex;
+static int hf_fcels_cmn_multicast;
+static int hf_fcels_cmn_broadcast;
+static int hf_fcels_cmn_security;
+static int hf_fcels_cmn_clk;
+static int hf_fcels_cmn_dhd;
+static int hf_fcels_cmn_seqcnt;
+static int hf_fcels_cmn_payload;
+static int hf_fcels_cls_cns;
+static int hf_fcels_cls_sdr;
+static int hf_fcels_cls_prio;
+static int hf_fcels_cls_nzctl;
+static int hf_fcels_initctl;
+static int hf_fcels_initctl_initial_pa;
+static int hf_fcels_initctl_ack0;
+static int hf_fcels_initctl_ackgaa;
+static int hf_fcels_initctl_sync;
+static int hf_fcels_rcptctl;
+static int hf_fcels_rcptctl_ack0;
+static int hf_fcels_rcptctl_interlock;
+static int hf_fcels_rcptctl_policy;
+static int hf_fcels_rcptctl_category;
+static int hf_fcels_rcptctl_sync;
+static int hf_fcels_fcpflags;
+static int hf_fcels_fcpflags_trireq;
+static int hf_fcels_fcpflags_trirep;
+static int hf_fcels_fcpflags_retry;
+static int hf_fcels_fcpflags_ccomp;
+static int hf_fcels_fcpflags_datao;
+static int hf_fcels_fcpflags_initiator;
+static int hf_fcels_fcpflags_target;
+static int hf_fcels_fcpflags_rdxr;
+static int hf_fcels_fcpflags_wrxr;
+static int hf_fcels_prliloflags;
+static int hf_fcels_tprloflags_opav;
+static int hf_fcels_tprloflags_rpav;
+static int hf_fcels_tprloflags_npv;
+static int hf_fcels_tprloflags_gprlo;
+static int hf_fcels_speedflags;
+static int hf_fcels_speedflags_1gb;
+static int hf_fcels_speedflags_2gb;
+static int hf_fcels_speedflags_4gb;
+static int hf_fcels_speedflags_10gb;
+static int hf_fcels_prliloflags_opav;
+static int hf_fcels_prliloflags_ipe;
+static int hf_fcels_prliloflags_eip;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_fcels_rnft_index_of_first_rec_in_list = -1;
-static int hf_fcels_lip_f7_received_count = -1;
-static int hf_fcels_recovery_qualifier_status = -1;
-static int hf_fcels_rpl_port_identifier = -1;
-static int hf_fcels_rpl_index_of_i_port_block = -1;
-static int hf_fcels_lip_f7_initiated_count = -1;
-static int hf_fcels_srl_fl_port_addr = -1;
-static int hf_fcels_loss_of_signal_count = -1;
-static int hf_fcels_lirr_regn_function = -1;
-static int hf_fcels_rscn_page_len = -1;
-static int hf_fcels_prlilo_service_parameter_response = -1;
-static int hf_fcels_prlilo_type_code_extension = -1;
-static int hf_fcels_rnft_list_length = -1;
-static int hf_fcels_rpl_index = -1;
-static int hf_fcels_rpl_physical_port = -1;
-static int hf_fcels_prlilo_originator_pa = -1;
-static int hf_fcels_rpl_list_length = -1;
-static int hf_fcels_common_identification_data_length = -1;
-static int hf_fcels_loss_of_sync_count = -1;
-static int hf_fcels_lip_reset_received_count = -1;
-static int hf_fcels_rpl_max_size = -1;
-static int hf_fcels_prlilo_response_code = -1;
-static int hf_fcels_invalid_crc_count = -1;
-static int hf_fcels_rscn_payload_len = -1;
-static int hf_fcels_link_failure_count = -1;
-static int hf_fcels_prlilo_3rd_party_n_port_id = -1;
-static int hf_fcels_lip_al_ps = -1;
-static int hf_fcels_prlilo_type = -1;
-static int hf_fcels_lirr_regn_format = -1;
-static int hf_fcels_srl_flag = -1;
-static int hf_fcels_prlilo_page_length = -1;
-static int hf_fcels_rpl_payload_length = -1;
-static int hf_fcels_rpsc_port_oper_speed = -1;
-static int hf_fcels_lip_reset_initiated_count = -1;
-static int hf_fcels_l_port_status = -1;
-static int hf_fcels_primitive_seq_protocol_err = -1;
-static int hf_fcels_rnft_max_size = -1;
-static int hf_fcels_lip_f8_received_count = -1;
-static int hf_fcels_rnft_index = -1;
-static int hf_fcels_rnft_payload_len = -1;
-static int hf_fcels_prlilo_payload_length = -1;
-static int hf_fcels_prlilo_responder_pa = -1;
-static int hf_fcels_rpsc_number_of_entries = -1;
-static int hf_fcels_prlilo_3rd_party_originator_pa = -1;
-static int hf_fcels_invalid_xmission_word = -1;
-static int hf_fcels_rnft_fc4_qualifier = -1;
-static int hf_fcels_lip_f8_initiated_count = -1;
-static int hf_fcels_rpl_port_name = -1;
-
-static gint ett_fcels                   = -1;
-static gint ett_fcels_lsrjt             = -1;
-static gint ett_fcels_acc               = -1;
-static gint ett_fcels_logi              = -1;
-static gint ett_fcels_logi_cmnsvc       = -1;
-static gint ett_fcels_logi_clssvc       = -1;
-static gint ett_fcels_logo              = -1;
-static gint ett_fcels_abtx              = -1;
-static gint ett_fcels_rsi               = -1;
-static gint ett_fcels_rrq               = -1;
-static gint ett_fcels_rec               = -1;
-static gint ett_fcels_prli              = -1;
-static gint ett_fcels_prli_svcpg        = -1;
-static gint ett_fcels_adisc             = -1;
-static gint ett_fcels_farp              = -1;
-static gint ett_fcels_rps               = -1;
-static gint ett_fcels_rpl               = -1;
-static gint ett_fcels_rplpb             = -1;
-static gint ett_fcels_fan               = -1;
-static gint ett_fcels_rscn              = -1;
-static gint ett_fcels_rscn_rec          = -1;
-static gint ett_fcels_estat             = -1;
-static gint ett_fcels_scr               = -1;
-static gint ett_fcels_rnft              = -1;
-static gint ett_fcels_rnft_fc4          = -1;
-static gint ett_fcels_lsts              = -1;
-static gint ett_fcels_rnid              = -1;
-static gint ett_fcels_rlir              = -1;
-static gint ett_fcels_lirr              = -1;
-static gint ett_fcels_srl               = -1;
-static gint ett_fcels_rpsc              = -1;
-static gint ett_fcels_cbind             = -1;
-static gint ett_fcels_cmnfeatures       = -1;
-static gint ett_fcels_clsflags          = -1;
-static gint ett_fcels_initctl           = -1;
-static gint ett_fcels_rcptctl           = -1;
-static gint ett_fcels_fcpflags          = -1;
-static gint ett_fcels_prliloflags       = -1;
-static gint ett_fcels_speedflags        = -1;
-
-static expert_field ei_fcels_src_unknown = EI_INIT;
-static expert_field ei_fcels_dst_unknown = EI_INIT;
-static expert_field ei_fcels_no_record_of_els_req = EI_INIT;
-static expert_field ei_fcels_no_record_of_exchange = EI_INIT;
+static int hf_fcels_rnft_index_of_first_rec_in_list;
+static int hf_fcels_lip_f7_received_count;
+static int hf_fcels_recovery_qualifier_status;
+static int hf_fcels_rpl_port_identifier;
+static int hf_fcels_rpl_index_of_i_port_block;
+static int hf_fcels_lip_f7_initiated_count;
+static int hf_fcels_srl_fl_port_addr;
+static int hf_fcels_loss_of_signal_count;
+static int hf_fcels_lirr_regn_function;
+static int hf_fcels_rscn_page_len;
+static int hf_fcels_prlilo_service_parameter_response;
+static int hf_fcels_prlilo_type_code_extension;
+static int hf_fcels_rnft_list_length;
+static int hf_fcels_rpl_index;
+static int hf_fcels_rpl_physical_port;
+static int hf_fcels_prlilo_originator_pa;
+static int hf_fcels_rpl_list_length;
+static int hf_fcels_common_identification_data_length;
+static int hf_fcels_loss_of_sync_count;
+static int hf_fcels_lip_reset_received_count;
+static int hf_fcels_rpl_max_size;
+static int hf_fcels_prlilo_response_code;
+static int hf_fcels_invalid_crc_count;
+static int hf_fcels_rscn_payload_len;
+static int hf_fcels_link_failure_count;
+static int hf_fcels_prlilo_3rd_party_n_port_id;
+static int hf_fcels_lip_al_ps;
+static int hf_fcels_prlilo_type;
+static int hf_fcels_lirr_regn_format;
+static int hf_fcels_srl_flag;
+static int hf_fcels_prlilo_page_length;
+static int hf_fcels_rpl_payload_length;
+static int hf_fcels_rpsc_port_oper_speed;
+static int hf_fcels_lip_reset_initiated_count;
+static int hf_fcels_l_port_status;
+static int hf_fcels_primitive_seq_protocol_err;
+static int hf_fcels_rnft_max_size;
+static int hf_fcels_lip_f8_received_count;
+static int hf_fcels_rnft_index;
+static int hf_fcels_rnft_payload_len;
+static int hf_fcels_prlilo_payload_length;
+static int hf_fcels_prlilo_responder_pa;
+static int hf_fcels_rpsc_number_of_entries;
+static int hf_fcels_prlilo_3rd_party_originator_pa;
+static int hf_fcels_invalid_xmission_word;
+static int hf_fcels_rnft_fc4_qualifier;
+static int hf_fcels_lip_f8_initiated_count;
+static int hf_fcels_rpl_port_name;
+
+static gint ett_fcels;
+static gint ett_fcels_lsrjt;
+static gint ett_fcels_acc;
+static gint ett_fcels_logi;
+static gint ett_fcels_logi_cmnsvc;
+static gint ett_fcels_logi_clssvc;
+static gint ett_fcels_logo;
+static gint ett_fcels_abtx;
+static gint ett_fcels_rsi;
+static gint ett_fcels_rrq;
+static gint ett_fcels_rec;
+static gint ett_fcels_prli;
+static gint ett_fcels_prli_svcpg;
+static gint ett_fcels_adisc;
+static gint ett_fcels_farp;
+static gint ett_fcels_rps;
+static gint ett_fcels_rpl;
+static gint ett_fcels_rplpb;
+static gint ett_fcels_fan;
+static gint ett_fcels_rscn;
+static gint ett_fcels_rscn_rec;
+static gint ett_fcels_estat;
+static gint ett_fcels_scr;
+static gint ett_fcels_rnft;
+static gint ett_fcels_rnft_fc4;
+static gint ett_fcels_lsts;
+static gint ett_fcels_rnid;
+static gint ett_fcels_rlir;
+static gint ett_fcels_lirr;
+static gint ett_fcels_srl;
+static gint ett_fcels_rpsc;
+static gint ett_fcels_cbind;
+static gint ett_fcels_cmnfeatures;
+static gint ett_fcels_clsflags;
+static gint ett_fcels_initctl;
+static gint ett_fcels_rcptctl;
+static gint ett_fcels_fcpflags;
+static gint ett_fcels_prliloflags;
+static gint ett_fcels_speedflags;
+
+static expert_field ei_fcels_src_unknown;
+static expert_field ei_fcels_dst_unknown;
+static expert_field ei_fcels_no_record_of_els_req;
+static expert_field ei_fcels_no_record_of_exchange;
 
 static int * const hf_fcels_estat_fields[] = {
     &hf_fcels_estat_resp,
diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c
index 96dd05f5e3..3f8457ca3f 100644
--- a/epan/dissectors/packet-fcfcs.c
+++ b/epan/dissectors/packet-fcfcs.c
@@ -28,56 +28,56 @@ static dissector_handle_t fcs_handle;
  */
 
 /* Initialize the protocol and registered fields */
-static int proto_fcfcs          = -1;
-static int hf_fcs_opcode        = -1;
-static int hf_fcs_iename        = -1;
-static int hf_fcs_ietype        = -1;
-static int hf_fcs_iedomainid    = -1;
-static int hf_fcs_mgmtid        = -1;
-static int hf_fcs_fabricname    = -1;
-static int hf_fcs_mgmtaddr      = -1;
-static int hf_fcs_lname         = -1;
-static int hf_fcs_vendorname    = -1;
-static int hf_fcs_modelname     = -1;
-static int hf_fcs_portname      = -1;
-static int hf_fcs_portmodtype   = -1;
-static int hf_fcs_porttxtype    = -1;
-static int hf_fcs_porttype      = -1;
-static int hf_fcs_physportnum   = -1;
-static int hf_fcs_portflags     = -1;
-static int hf_fcs_portstate     = -1;
-static int hf_fcs_platformname_len  = -1;
-static int hf_fcs_platformname  = -1;
-static int hf_fcs_platformnname = -1;
-static int hf_fcs_platformtype  = -1;
-static int hf_fcs_platformaddr  = -1;
-static int hf_fcs_reason        = -1;
-static int hf_fcs_rjtdetail     = -1;
-static int hf_fcs_vendor        = -1;
-static int hf_fcs_numcap        = -1;
-static int hf_fcs_mgmt_subtype  = -1;
-static int hf_fcs_unsmask       = -1;
-static int hf_fcs_vnd_capmask   = -1;
-static int hf_fcs_fcsmask       = -1;
-static int hf_fcs_maxres_size   = -1;
-static int hf_fcs_releasecode   = -1;
+static int proto_fcfcs;
+static int hf_fcs_opcode;
+static int hf_fcs_iename;
+static int hf_fcs_ietype;
+static int hf_fcs_iedomainid;
+static int hf_fcs_mgmtid;
+static int hf_fcs_fabricname;
+static int hf_fcs_mgmtaddr;
+static int hf_fcs_lname;
+static int hf_fcs_vendorname;
+static int hf_fcs_modelname;
+static int hf_fcs_portname;
+static int hf_fcs_portmodtype;
+static int hf_fcs_porttxtype;
+static int hf_fcs_porttype;
+static int hf_fcs_physportnum;
+static int hf_fcs_portflags;
+static int hf_fcs_portstate;
+static int hf_fcs_platformname_len;
+static int hf_fcs_platformname;
+static int hf_fcs_platformnname;
+static int hf_fcs_platformtype;
+static int hf_fcs_platformaddr;
+static int hf_fcs_reason;
+static int hf_fcs_rjtdetail;
+static int hf_fcs_vendor;
+static int hf_fcs_numcap;
+static int hf_fcs_mgmt_subtype;
+static int hf_fcs_unsmask;
+static int hf_fcs_vnd_capmask;
+static int hf_fcs_fcsmask;
+static int hf_fcs_maxres_size;
+static int hf_fcs_releasecode;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_fcfcs_num_ie_entries = -1;
-static int hf_fcfcs_num_mgmt_addresses = -1;
-static int hf_fcfcs_list_length = -1;
-static int hf_fcfcs_vendor_specific_information = -1;
-static int hf_fcfcs_num_port_entries = -1;
-static int hf_fcfcs_num_attached_port_entries = -1;
-static int hf_fcfcs_num_platform_node_name_entries = -1;
-static int hf_fcfcs_num_mgmt_address_entries = -1;
-static int hf_fcfcs_num_platform_name_entries = -1;
+static int hf_fcfcs_num_ie_entries;
+static int hf_fcfcs_num_mgmt_addresses;
+static int hf_fcfcs_list_length;
+static int hf_fcfcs_vendor_specific_information;
+static int hf_fcfcs_num_port_entries;
+static int hf_fcfcs_num_attached_port_entries;
+static int hf_fcfcs_num_platform_node_name_entries;
+static int hf_fcfcs_num_mgmt_address_entries;
+static int hf_fcfcs_num_platform_name_entries;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_fcfcs_no_record_of_exchange = EI_INIT;
+static expert_field ei_fcfcs_no_record_of_exchange;
 
 /* Initialize the subtree pointers */
-static gint ett_fcfcs = -1;
+static gint ett_fcfcs;
 
 typedef struct _fcfcs_conv_key {
     guint32 conv_idx;
diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c
index 4cbf519318..1f1cf3ffdf 100644
--- a/epan/dissectors/packet-fcfzs.c
+++ b/epan/dissectors/packet-fcfzs.c
@@ -24,44 +24,44 @@ void proto_reg_handoff_fcfzs(void);
 static dissector_handle_t fzs_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_fcfzs                     = -1;
-static int hf_fcfzs_opcode                 = -1;
-static int hf_fcfzs_gzc_vendor             = -1;
-static int hf_fcfzs_gest_vendor            = -1;
-static int hf_fcfzs_numzoneattrs           = -1;
-static int hf_fcfzs_zonesetnmlen           = -1;
-static int hf_fcfzs_zonesetname            = -1;
-static int hf_fcfzs_numzones               = -1;
-static int hf_fcfzs_numzonesetattrs        = -1;
-static int hf_fcfzs_zonenmlen              = -1;
-static int hf_fcfzs_zonename               = -1;
-static int hf_fcfzs_nummbrs                = -1;
-static int hf_fcfzs_nummbrentries          = -1;
-static int hf_fcfzs_mbrid_fcwwn            = -1;
-static int hf_fcfzs_mbrid_fc               = -1;
-static int hf_fcfzs_mbrid_uint             = -1;
-/* static int hf_fcfzs_mbridlen               = -1; */
-static int hf_fcfzs_mbrtype                = -1;
-static int hf_fcfzs_reason                 = -1;
-static int hf_fcfzs_rjtdetail              = -1;
-static int hf_fcfzs_rjtvendor              = -1;
-static int hf_fcfzs_maxres_size            = -1;
-static int hf_fcfzs_mbrid_lun              = -1;
-static int hf_fcfzs_gzc_flags              = -1;
-static int hf_fcfzs_gzc_flags_hard_zones   = -1;
-static int hf_fcfzs_gzc_flags_soft_zones   = -1;
-static int hf_fcfzs_gzc_flags_zoneset_db   = -1;
-static int hf_fcfzs_zone_state             = -1;
-static int hf_fcfzs_soft_zone_set_enforced = -1;
-static int hf_fcfzs_hard_zone_set_enforced = -1;
+static int proto_fcfzs;
+static int hf_fcfzs_opcode;
+static int hf_fcfzs_gzc_vendor;
+static int hf_fcfzs_gest_vendor;
+static int hf_fcfzs_numzoneattrs;
+static int hf_fcfzs_zonesetnmlen;
+static int hf_fcfzs_zonesetname;
+static int hf_fcfzs_numzones;
+static int hf_fcfzs_numzonesetattrs;
+static int hf_fcfzs_zonenmlen;
+static int hf_fcfzs_zonename;
+static int hf_fcfzs_nummbrs;
+static int hf_fcfzs_nummbrentries;
+static int hf_fcfzs_mbrid_fcwwn;
+static int hf_fcfzs_mbrid_fc;
+static int hf_fcfzs_mbrid_uint;
+/* static int hf_fcfzs_mbridlen; */
+static int hf_fcfzs_mbrtype;
+static int hf_fcfzs_reason;
+static int hf_fcfzs_rjtdetail;
+static int hf_fcfzs_rjtvendor;
+static int hf_fcfzs_maxres_size;
+static int hf_fcfzs_mbrid_lun;
+static int hf_fcfzs_gzc_flags;
+static int hf_fcfzs_gzc_flags_hard_zones;
+static int hf_fcfzs_gzc_flags_soft_zones;
+static int hf_fcfzs_gzc_flags_zoneset_db;
+static int hf_fcfzs_zone_state;
+static int hf_fcfzs_soft_zone_set_enforced;
+static int hf_fcfzs_hard_zone_set_enforced;
 
 /* Initialize the subtree pointers */
-static gint ett_fcfzs = -1;
-static gint ett_fcfzs_gzc_flags = -1;
-static gint ett_fcfzs_zone_state = -1;
+static gint ett_fcfzs;
+static gint ett_fcfzs_gzc_flags;
+static gint ett_fcfzs_zone_state;
 
-static expert_field ei_fcfzs_no_exchange = EI_INIT;
-static expert_field ei_fcfzs_mbrid = EI_INIT;
+static expert_field ei_fcfzs_no_exchange;
+static expert_field ei_fcfzs_mbrid;
 
 typedef struct _fcfzs_conv_key {
     guint32 conv_idx;
diff --git a/epan/dissectors/packet-fcgi.c b/epan/dissectors/packet-fcgi.c
index cd43dd1135..51f62d7d37 100644
--- a/epan/dissectors/packet-fcgi.c
+++ b/epan/dissectors/packet-fcgi.c
@@ -17,27 +17,27 @@
 void proto_register_fcgi(void);
 void proto_reg_handoff_fcgi(void);
 
-static int proto_fcgi = -1;
-
-static int hf_fcgi_version = -1;
-static int hf_fcgi_type = -1;
-static int hf_fcgi_id = -1;
-static int hf_fcgi_content_length = -1;
-static int hf_fcgi_padding_length = -1;
-static int hf_fcgi_content_data = -1;
-static int hf_fcgi_padding_data = -1;
-static int hf_fcgi_begin_request_role = -1;
-static int hf_fcgi_begin_request_flags = -1;
-static int hf_fcgi_begin_request_keep_conn = -1;
-static int hf_fcgi_end_request_app_status = -1;
-static int hf_fcgi_end_request_protocol_status = -1;
-static int hf_fcgi_nv_name = -1;
-
-static int ett_fcgi = -1;
-static int ett_fcgi_begin_request = -1;
-static int ett_fcgi_abort_request = -1;
-static int ett_fcgi_end_request = -1;
-static int ett_fcgi_params = -1;
+static int proto_fcgi;
+
+static int hf_fcgi_version;
+static int hf_fcgi_type;
+static int hf_fcgi_id;
+static int hf_fcgi_content_length;
+static int hf_fcgi_padding_length;
+static int hf_fcgi_content_data;
+static int hf_fcgi_padding_data;
+static int hf_fcgi_begin_request_role;
+static int hf_fcgi_begin_request_flags;
+static int hf_fcgi_begin_request_keep_conn;
+static int hf_fcgi_end_request_app_status;
+static int hf_fcgi_end_request_protocol_status;
+static int hf_fcgi_nv_name;
+
+static int ett_fcgi;
+static int ett_fcgi_begin_request;
+static int ett_fcgi_abort_request;
+static int ett_fcgi_end_request;
+static int ett_fcgi_params;
 
 static dissector_handle_t fcgi_handle;
 
diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c
index 7232af4b60..6065fc4666 100644
--- a/epan/dissectors/packet-fcip.c
+++ b/epan/dissectors/packet-fcip.c
@@ -87,36 +87,36 @@ static const guint8 fcip_header_8_bytes[8] = {
     0x01, 0x01, 0xFE, 0xFE
 };
 
-static int proto_fcip          = -1;
-
-static int hf_fcip_protocol       = -1;
-static int hf_fcip_protocol_c     = -1;
-static int hf_fcip_version        = -1;
-static int hf_fcip_version_c      = -1;
-static int hf_fcip_encap_word1    = -1;
-static int hf_fcip_flags          = -1;
-static int hf_fcip_flags_c        = -1;
-static int hf_fcip_framelen       = -1;
-static int hf_fcip_framelen_c     = -1;
-static int hf_fcip_tsec           = -1;
-static int hf_fcip_tusec          = -1;
-static int hf_fcip_encap_crc      = -1;
-static int hf_fcip_sof            = -1;
-static int hf_fcip_sof_c          = -1;
-static int hf_fcip_eof            = -1;
-static int hf_fcip_eof_c          = -1;
-static int hf_fcip_pflags_changed = -1;
-static int hf_fcip_pflags_special = -1;
-static int hf_fcip_pflags_c       = -1;
-static int hf_fcip_src_wwn        = -1;
-static int hf_fcip_dst_wwn        = -1;
-static int hf_fcip_conn_code      = -1;
-static int hf_fcip_katov          = -1;
-static int hf_fcip_src_entity_id  = -1;
-static int hf_fcip_conn_nonce     = -1;
-static int hf_fcip_conn_flags     = -1;
-
-static int ett_fcip            = -1;
+static int proto_fcip;
+
+static int hf_fcip_protocol;
+static int hf_fcip_protocol_c;
+static int hf_fcip_version;
+static int hf_fcip_version_c;
+static int hf_fcip_encap_word1;
+static int hf_fcip_flags;
+static int hf_fcip_flags_c;
+static int hf_fcip_framelen;
+static int hf_fcip_framelen_c;
+static int hf_fcip_tsec;
+static int hf_fcip_tusec;
+static int hf_fcip_encap_crc;
+static int hf_fcip_sof;
+static int hf_fcip_sof_c;
+static int hf_fcip_eof;
+static int hf_fcip_eof_c;
+static int hf_fcip_pflags_changed;
+static int hf_fcip_pflags_special;
+static int hf_fcip_pflags_c;
+static int hf_fcip_src_wwn;
+static int hf_fcip_dst_wwn;
+static int hf_fcip_conn_code;
+static int hf_fcip_katov;
+static int hf_fcip_src_entity_id;
+static int hf_fcip_conn_nonce;
+static int hf_fcip_conn_flags;
+
+static int ett_fcip;
 
 static guint fcip_port         = 3225;
 static gboolean fcip_desegment = TRUE;
diff --git a/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c
index 0b4c9cac07..8d0cf6ea5e 100644
--- a/epan/dissectors/packet-fcoe.c
+++ b/epan/dissectors/packet-fcoe.c
@@ -76,17 +76,17 @@ static const value_string fcoe_sof_vals[] = {
     {0, NULL}
 };
 
-static int proto_fcoe          = -1;
-static int hf_fcoe_ver         = -1;
-static int hf_fcoe_len         = -1;
-static int hf_fcoe_sof         = -1;
-static int hf_fcoe_eof         = -1;
-static int hf_fcoe_crc         = -1;
-static int hf_fcoe_crc_status  = -1;
+static int proto_fcoe;
+static int hf_fcoe_ver;
+static int hf_fcoe_len;
+static int hf_fcoe_sof;
+static int hf_fcoe_eof;
+static int hf_fcoe_crc;
+static int hf_fcoe_crc_status;
 
-static int ett_fcoe            = -1;
+static int ett_fcoe;
 
-static expert_field ei_fcoe_crc = EI_INIT;
+static expert_field ei_fcoe_crc;
 
 static dissector_handle_t fc_handle;
 static dissector_handle_t fcoe_handle;
diff --git a/epan/dissectors/packet-fcoib.c b/epan/dissectors/packet-fcoib.c
index ee6f88b392..28db40a157 100644
--- a/epan/dissectors/packet-fcoib.c
+++ b/epan/dissectors/packet-fcoib.c
@@ -76,17 +76,17 @@ static const value_string fcoib_sof_vals[] = {
     {0, NULL}
 };
 
-static int proto_fcoib          = -1;
-static int hf_fcoib_ver         = -1;
-static int hf_fcoib_sig         = -1;
-static int hf_fcoib_sof         = -1;
-static int hf_fcoib_eof         = -1;
-static int hf_fcoib_crc         = -1;
-static int hf_fcoib_crc_status  = -1;
+static int proto_fcoib;
+static int hf_fcoib_ver;
+static int hf_fcoib_sig;
+static int hf_fcoib_sof;
+static int hf_fcoib_eof;
+static int hf_fcoib_crc;
+static int hf_fcoib_crc_status;
 
-static int ett_fcoib            = -1;
+static int ett_fcoib;
 
-static expert_field ei_fcoib_crc = EI_INIT;
+static expert_field ei_fcoib_crc;
 
 static dissector_handle_t fc_handle;
 
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c
index 74c4939383..d81de6d170 100644
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@@ -28,54 +28,54 @@ typedef struct _fcp_proto_data_t {
 } fcp_proto_data_t;
 
 /* Initialize the protocol and registered fields */
-static int proto_fcp = -1;
-static int hf_fcp_multilun = -1;
-static int hf_fcp_singlelun = -1;
-static int hf_fcp_crn = -1;
-static int hf_fcp_taskattr = -1;
-static int hf_fcp_taskmgmt = -1;
-static int hf_fcp_addlcdblen = -1;
-static int hf_fcp_rddata = -1;
-static int hf_fcp_wrdata = -1;
-static int hf_fcp_dl = -1;
-static int hf_fcp_bidir_dl = -1;
-static int hf_fcp_data_ro = -1;
-static int hf_fcp_r_ctl = -1;
-static int hf_fcp_burstlen = -1;
-static int hf_fcp_rspflags = -1;
-static int hf_fcp_retry_delay_timer = -1;
-static int hf_fcp_resid = -1;
-static int hf_fcp_bidir_resid = -1;
-static int hf_fcp_snslen = -1;
-static int hf_fcp_rsplen = -1;
-static int hf_fcp_rspcode = -1;
-static int hf_fcp_scsistatus = -1;
-static int hf_fcp_mgmt_flags_obsolete = -1;
-static int hf_fcp_mgmt_flags_clear_aca = -1;
-static int hf_fcp_mgmt_flags_target_reset = -1;
-static int hf_fcp_mgmt_flags_lu_reset = -1;
-static int hf_fcp_mgmt_flags_rsvd = -1;
-static int hf_fcp_mgmt_flags_clear_task_set = -1;
-static int hf_fcp_mgmt_flags_abort_task_set = -1;
-static int hf_fcp_rsp_flags_bidi = -1;
-static int hf_fcp_rsp_flags_bidi_rru = -1;
-static int hf_fcp_rsp_flags_bidi_rro = -1;
-static int hf_fcp_rsp_flags_conf_req = -1;
-static int hf_fcp_rsp_flags_resid_under = -1;
-static int hf_fcp_rsp_flags_resid_over = -1;
-static int hf_fcp_rsp_flags_sns_vld = -1;
-static int hf_fcp_rsp_flags_res_vld = -1;
-static int hf_fcp_request_in = -1;
-static int hf_fcp_response_in = -1;
-static int hf_fcp_time = -1;
-static int hf_fcp_els_op = -1;
-static int hf_fcp_srr_ox_id = -1;
-static int hf_fcp_srr_rx_id = -1;
+static int proto_fcp;
+static int hf_fcp_multilun;
+static int hf_fcp_singlelun;
+static int hf_fcp_crn;
+static int hf_fcp_taskattr;
+static int hf_fcp_taskmgmt;
+static int hf_fcp_addlcdblen;
+static int hf_fcp_rddata;
+static int hf_fcp_wrdata;
+static int hf_fcp_dl;
+static int hf_fcp_bidir_dl;
+static int hf_fcp_data_ro;
+static int hf_fcp_r_ctl;
+static int hf_fcp_burstlen;
+static int hf_fcp_rspflags;
+static int hf_fcp_retry_delay_timer;
+static int hf_fcp_resid;
+static int hf_fcp_bidir_resid;
+static int hf_fcp_snslen;
+static int hf_fcp_rsplen;
+static int hf_fcp_rspcode;
+static int hf_fcp_scsistatus;
+static int hf_fcp_mgmt_flags_obsolete;
+static int hf_fcp_mgmt_flags_clear_aca;
+static int hf_fcp_mgmt_flags_target_reset;
+static int hf_fcp_mgmt_flags_lu_reset;
+static int hf_fcp_mgmt_flags_rsvd;
+static int hf_fcp_mgmt_flags_clear_task_set;
+static int hf_fcp_mgmt_flags_abort_task_set;
+static int hf_fcp_rsp_flags_bidi;
+static int hf_fcp_rsp_flags_bidi_rru;
+static int hf_fcp_rsp_flags_bidi_rro;
+static int hf_fcp_rsp_flags_conf_req;
+static int hf_fcp_rsp_flags_resid_under;
+static int hf_fcp_rsp_flags_resid_over;
+static int hf_fcp_rsp_flags_sns_vld;
+static int hf_fcp_rsp_flags_res_vld;
+static int hf_fcp_request_in;
+static int hf_fcp_response_in;
+static int hf_fcp_time;
+static int hf_fcp_els_op;
+static int hf_fcp_srr_ox_id;
+static int hf_fcp_srr_rx_id;
 
 /* Initialize the subtree pointers */
-static gint ett_fcp = -1;
-static gint ett_fcp_taskmgmt = -1;
-static gint ett_fcp_rsp_flags = -1;
+static gint ett_fcp;
+static gint ett_fcp_taskmgmt;
+static gint ett_fcp_rsp_flags;
 
 typedef struct _fcp_conv_data_t {
     wmem_map_t *luns;
diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c
index d520f4e72a..3d26ef0c80 100644
--- a/epan/dissectors/packet-fcsb3.c
+++ b/epan/dissectors/packet-fcsb3.c
@@ -22,87 +22,87 @@ void proto_reg_handoff_fcsbccs(void);
 static dissector_handle_t fc_sbccs_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_fc_sbccs = -1;
-static int hf_sbccs_chid = -1;
-static int hf_sbccs_cuid = -1;
-static int hf_sbccs_devaddr = -1;
-static int hf_sbccs_ccw = -1;
-static int hf_sbccs_token = -1;
-static int hf_sbccs_dib_iucnt = -1;
-static int hf_sbccs_dib_datacnt = -1;
-static int hf_sbccs_dib_ccw_cmd = -1;
-static int hf_sbccs_dib_ccw_cnt = -1;
-static int hf_sbccs_dib_residualcnt = -1;
-static int hf_sbccs_dib_qtuf = -1;
-static int hf_sbccs_dib_qtu = -1;
-static int hf_sbccs_dib_dtuf = -1;
-static int hf_sbccs_dib_dtu = -1;
-static int hf_sbccs_dib_ctlfn = -1;
-static int hf_sbccs_lrc = -1;
-static int hf_sbccs_dib_iupacing = -1;
-static int hf_sbccs_dev_xcp_code = -1;
-static int hf_sbccs_prg_pth_errcode = -1;
-static int hf_sbccs_prg_rsp_errcode = -1;
-static int hf_sbccs_dib_ctccntr = -1;
-static int hf_sbccs_dib_lprcode = -1;
-static int hf_sbccs_dib_tin_imgid_cnt = -1;
-static int hf_sbccs_dib_lrjcode = -1;
-static int hf_sbccs_dib_ioprio = -1;
-static int hf_sbccs_dib_linkctlfn = -1;
-static int hf_sbccs_iui = -1;
-static int hf_sbccs_iui_as = -1;
-static int hf_sbccs_iui_es = -1;
-static int hf_sbccs_iui_val = -1;
-static int hf_sbccs_dhflags = -1;
-static int hf_sbccs_dhflags_end = -1;
-static int hf_sbccs_dhflags_chaining = -1;
-static int hf_sbccs_dhflags_earlyend = -1;
-static int hf_sbccs_dhflags_nocrc = -1;
-static int hf_sbccs_dib_ccw_flags = -1;
-static int hf_sbccs_dib_ccw_flags_cd = -1;
-static int hf_sbccs_dib_ccw_flags_cc = -1;
-static int hf_sbccs_dib_ccw_flags_sli = -1;
-static int hf_sbccs_dib_ccw_flags_crr = -1;
-static int hf_sbccs_dib_cmdflags = -1;
-static int hf_sbccs_dib_cmdflags_du = -1;
-static int hf_sbccs_dib_cmdflags_coc = -1;
-static int hf_sbccs_dib_cmdflags_syr = -1;
-static int hf_sbccs_dib_cmdflags_rex = -1;
-static int hf_sbccs_dib_cmdflags_sss = -1;
-static int hf_sbccs_dib_statusflags = -1;
-static int hf_sbccs_dib_statusflags_ffc = -1;
-static int hf_sbccs_dib_statusflags_ci = -1;
-static int hf_sbccs_dib_statusflags_cr = -1;
-static int hf_sbccs_dib_statusflags_lri = -1;
-static int hf_sbccs_dib_statusflags_rv = -1;
-static int hf_sbccs_dib_status = -1;
-static int hf_sbccs_dib_status_attention = -1;
-static int hf_sbccs_dib_status_modifier = -1;
-static int hf_sbccs_dib_status_cue = -1;
-static int hf_sbccs_dib_status_busy = -1;
-static int hf_sbccs_dib_status_channelend = -1;
-static int hf_sbccs_dib_status_deviceend = -1;
-static int hf_sbccs_dib_status_unit_check = -1;
-static int hf_sbccs_dib_status_unit_exception = -1;
-static int hf_sbccs_dib_ctlparam = -1;
-static int hf_sbccs_dib_ctlparam_rc = -1;
-static int hf_sbccs_dib_ctlparam_ru = -1;
-static int hf_sbccs_dib_ctlparam_ro = -1;
-static int hf_sbccs_dib_linkctlinfo = -1;
-static int hf_sbccs_dib_linkctlinfo_ctcconn = -1;
-static int hf_sbccs_dib_linkctlinfo_ecrcg = -1;
-static int hf_sbccs_logical_path = -1;
+static int proto_fc_sbccs;
+static int hf_sbccs_chid;
+static int hf_sbccs_cuid;
+static int hf_sbccs_devaddr;
+static int hf_sbccs_ccw;
+static int hf_sbccs_token;
+static int hf_sbccs_dib_iucnt;
+static int hf_sbccs_dib_datacnt;
+static int hf_sbccs_dib_ccw_cmd;
+static int hf_sbccs_dib_ccw_cnt;
+static int hf_sbccs_dib_residualcnt;
+static int hf_sbccs_dib_qtuf;
+static int hf_sbccs_dib_qtu;
+static int hf_sbccs_dib_dtuf;
+static int hf_sbccs_dib_dtu;
+static int hf_sbccs_dib_ctlfn;
+static int hf_sbccs_lrc;
+static int hf_sbccs_dib_iupacing;
+static int hf_sbccs_dev_xcp_code;
+static int hf_sbccs_prg_pth_errcode;
+static int hf_sbccs_prg_rsp_errcode;
+static int hf_sbccs_dib_ctccntr;
+static int hf_sbccs_dib_lprcode;
+static int hf_sbccs_dib_tin_imgid_cnt;
+static int hf_sbccs_dib_lrjcode;
+static int hf_sbccs_dib_ioprio;
+static int hf_sbccs_dib_linkctlfn;
+static int hf_sbccs_iui;
+static int hf_sbccs_iui_as;
+static int hf_sbccs_iui_es;
+static int hf_sbccs_iui_val;
+static int hf_sbccs_dhflags;
+static int hf_sbccs_dhflags_end;
+static int hf_sbccs_dhflags_chaining;
+static int hf_sbccs_dhflags_earlyend;
+static int hf_sbccs_dhflags_nocrc;
+static int hf_sbccs_dib_ccw_flags;
+static int hf_sbccs_dib_ccw_flags_cd;
+static int hf_sbccs_dib_ccw_flags_cc;
+static int hf_sbccs_dib_ccw_flags_sli;
+static int hf_sbccs_dib_ccw_flags_crr;
+static int hf_sbccs_dib_cmdflags;
+static int hf_sbccs_dib_cmdflags_du;
+static int hf_sbccs_dib_cmdflags_coc;
+static int hf_sbccs_dib_cmdflags_syr;
+static int hf_sbccs_dib_cmdflags_rex;
+static int hf_sbccs_dib_cmdflags_sss;
+static int hf_sbccs_dib_statusflags;
+static int hf_sbccs_dib_statusflags_ffc;
+static int hf_sbccs_dib_statusflags_ci;
+static int hf_sbccs_dib_statusflags_cr;
+static int hf_sbccs_dib_statusflags_lri;
+static int hf_sbccs_dib_statusflags_rv;
+static int hf_sbccs_dib_status;
+static int hf_sbccs_dib_status_attention;
+static int hf_sbccs_dib_status_modifier;
+static int hf_sbccs_dib_status_cue;
+static int hf_sbccs_dib_status_busy;
+static int hf_sbccs_dib_status_channelend;
+static int hf_sbccs_dib_status_deviceend;
+static int hf_sbccs_dib_status_unit_check;
+static int hf_sbccs_dib_status_unit_exception;
+static int hf_sbccs_dib_ctlparam;
+static int hf_sbccs_dib_ctlparam_rc;
+static int hf_sbccs_dib_ctlparam_ru;
+static int hf_sbccs_dib_ctlparam_ro;
+static int hf_sbccs_dib_linkctlinfo;
+static int hf_sbccs_dib_linkctlinfo_ctcconn;
+static int hf_sbccs_dib_linkctlinfo_ecrcg;
+static int hf_sbccs_logical_path;
 
 /* Initialize the subtree pointers */
-static gint ett_fc_sbccs = -1;
-static gint ett_sbccs_iui = -1;
-static gint ett_sbccs_dhflags = -1;
-static gint ett_sbccs_dib_ccw_flags = -1;
-static gint ett_sbccs_dib_cmdflags = -1;
-static gint ett_sbccs_dib_statusflags = -1;
-static gint ett_sbccs_dib_status = -1;
-static gint ett_sbccs_dib_ctlparam = -1;
-static gint ett_sbccs_dib_linkctlinfo = -1;
+static gint ett_fc_sbccs;
+static gint ett_sbccs_iui;
+static gint ett_sbccs_dhflags;
+static gint ett_sbccs_dib_ccw_flags;
+static gint ett_sbccs_dib_cmdflags;
+static gint ett_sbccs_dib_statusflags;
+static gint ett_sbccs_dib_status;
+static gint ett_sbccs_dib_ctlparam;
+static gint ett_sbccs_dib_linkctlinfo;
 
 #if 0
 typedef struct {
diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c
index 9cbee52fc5..a5b6e8cbc0 100644
--- a/epan/dissectors/packet-fcsp.c
+++ b/epan/dissectors/packet-fcsp.c
@@ -44,42 +44,42 @@ void proto_register_fcsp(void);
 #define FC_AUTH_DHCHAP_PARAM_DHgIDLIST 0x2
 
 /* Initialize the protocol and registered fields */
-static int proto_fcsp = -1;
-static int hf_auth_proto_ver = -1;
-static int hf_auth_msg_code = -1;
-static int hf_auth_flags = -1;
-static int hf_auth_len = -1;
-static int hf_auth_tid = -1;
-static int hf_auth_initiator_wwn = -1;
-static int hf_auth_initiator_name = -1;
-static int hf_auth_usable_proto = -1;
-static int hf_auth_rjt_code = -1;
-static int hf_auth_rjt_codedet = -1;
-static int hf_auth_responder_wwn = -1;
-static int hf_auth_responder_name = -1;
-/* static int hf_auth_dhchap_groupid = -1; */
-/* static int hf_auth_dhchap_hashid = -1; */
-static int hf_auth_dhchap_chal_len = -1;
-static int hf_auth_dhchap_val_len = -1;
-static int hf_auth_dhchap_rsp_len  = -1;
-static int hf_auth_initiator_name_type = -1;
-static int hf_auth_initiator_name_len = -1;
-static int hf_auth_responder_name_len = -1;
-static int hf_auth_responder_name_type = -1;
-static int hf_auth_proto_type = -1;
-static int hf_auth_proto_param_len = -1;
-static int hf_auth_dhchap_param_tag = -1;
-static int hf_auth_dhchap_param_len = -1;
-static int hf_auth_dhchap_hash_type = -1;
-static int hf_auth_dhchap_group_type = -1;
-static int hf_auth_dhchap_dhvalue = -1;
-static int hf_auth_dhchap_chal_value = -1;
-static int hf_auth_dhchap_rsp_value = -1;
+static int proto_fcsp;
+static int hf_auth_proto_ver;
+static int hf_auth_msg_code;
+static int hf_auth_flags;
+static int hf_auth_len;
+static int hf_auth_tid;
+static int hf_auth_initiator_wwn;
+static int hf_auth_initiator_name;
+static int hf_auth_usable_proto;
+static int hf_auth_rjt_code;
+static int hf_auth_rjt_codedet;
+static int hf_auth_responder_wwn;
+static int hf_auth_responder_name;
+/* static int hf_auth_dhchap_groupid; */
+/* static int hf_auth_dhchap_hashid; */
+static int hf_auth_dhchap_chal_len;
+static int hf_auth_dhchap_val_len;
+static int hf_auth_dhchap_rsp_len;
+static int hf_auth_initiator_name_type;
+static int hf_auth_initiator_name_len;
+static int hf_auth_responder_name_len;
+static int hf_auth_responder_name_type;
+static int hf_auth_proto_type;
+static int hf_auth_proto_param_len;
+static int hf_auth_dhchap_param_tag;
+static int hf_auth_dhchap_param_len;
+static int hf_auth_dhchap_hash_type;
+static int hf_auth_dhchap_group_type;
+static int hf_auth_dhchap_dhvalue;
+static int hf_auth_dhchap_chal_value;
+static int hf_auth_dhchap_rsp_value;
 
 /* Initialize the subtree pointers */
-static gint ett_fcsp = -1;
+static gint ett_fcsp;
 
-static expert_field ei_auth_fcap_undecoded = EI_INIT;
+static expert_field ei_auth_fcap_undecoded;
 
 static const value_string fcauth_msgcode_vals[] = {
     {FC_AUTH_MSG_AUTH_REJECT,    "AUTH_Reject"},
diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c
index 04ff223fb9..15945be0ab 100644
--- a/epan/dissectors/packet-fcswils.c
+++ b/epan/dissectors/packet-fcswils.c
@@ -38,198 +38,198 @@ static dissector_handle_t swils_handle;
 #define ZONENAME_LEN(x, y)  (tvb_get_guint8(x, y)+4)
 
 /* Initialize the protocol and registered fields */
-static int proto_fcswils                  = -1;
-static int hf_swils_opcode                = -1;
-static int hf_swils_elp_rev               = -1;
-static int hf_swils_elp_flags             = -1;
-static int hf_swils_elp_r_a_tov           = -1;
-static int hf_swils_elp_e_d_tov           = -1;
-static int hf_swils_elp_req_epn           = -1;
-static int hf_swils_elp_req_esn           = -1;
-static int hf_swils_elp_clsf_svcp         = -1;
-static int hf_swils_elp_clsf_rcvsz        = -1;
-static int hf_swils_elp_clsf_conseq       = -1;
-static int hf_swils_elp_clsf_e2e          = -1;
-static int hf_swils_elp_clsf_openseq      = -1;
-static int hf_swils_elp_cls1_svcp         = -1;
-static int hf_swils_elp_cls1_rcvsz        = -1;
-static int hf_swils_elp_cls2_svcp         = -1;
-static int hf_swils_elp_cls2_rcvsz        = -1;
-static int hf_swils_elp_cls3_svcp         = -1;
-static int hf_swils_elp_cls3_rcvsz        = -1;
-static int hf_swils_elp_isl_fc_mode       = -1;
-static int hf_swils_elp_fcplen            = -1;
-static int hf_swils_elp_b2bcredit         = -1;
-static int hf_swils_elp_compat1           = -1;
-static int hf_swils_elp_compat2           = -1;
-static int hf_swils_elp_compat3           = -1;
-static int hf_swils_elp_compat4           = -1;
-static int hf_swils_efp_rec_type          = -1;
-static int hf_swils_efp_dom_id            = -1;
-static int hf_swils_efp_switch_name       = -1;
-static int hf_swils_efp_mcast_grpno       = -1;
-/* static int hf_swils_efp_alias_token       = -1; */
-static int hf_swils_efp_record_len        = -1;
-static int hf_swils_efp_payload_len       = -1;
-static int hf_swils_efp_pswitch_pri       = -1;
-static int hf_swils_efp_pswitch_name      = -1;
-static int hf_swils_dia_switch_name       = -1;
-static int hf_swils_rdi_payload_len       = -1;
-static int hf_swils_rdi_req_sname         = -1;
-/* static int hf_swils_fspfh_cmd             = -1; */
-static int hf_swils_fspfh_rev             = -1;
-static int hf_swils_fspfh_ar_num          = -1;
-static int hf_swils_fspfh_auth_type       = -1;
-static int hf_swils_fspfh_dom_id          = -1;
-static int hf_swils_fspfh_auth            = -1;
-static int hf_swils_hlo_options           = -1;
-static int hf_swils_hlo_hloint            = -1;
-static int hf_swils_hlo_deadint           = -1;
-static int hf_swils_hlo_rcv_domid         = -1;
-static int hf_swils_hlo_orig_pidx         = -1;
-static int hf_swils_ldrec_linkid          = -1;
-static int hf_swils_ldrec_out_pidx        = -1;
-static int hf_swils_ldrec_nbr_pidx        = -1;
-static int hf_swils_ldrec_link_type       = -1;
-static int hf_swils_ldrec_link_cost       = -1;
-static int hf_swils_lsrh_lsr_type         = -1;
-static int hf_swils_lsrh_lsid             = -1;
-static int hf_swils_lsrh_adv_domid        = -1;
-static int hf_swils_lsrh_ls_incid         = -1;
-static int hf_swils_esc_pdesc_vendorid    = -1;
-static int hf_swils_esc_swvendorid        = -1;
-static int hf_swils_esc_protocolid        = -1;
-static int hf_swils_rscn_evtype           = -1;
-static int hf_swils_rscn_addrfmt          = -1;
-static int hf_swils_rscn_detectfn         = -1;
-static int hf_swils_rscn_affectedport     = -1;
-static int hf_swils_rscn_portstate        = -1;
-static int hf_swils_rscn_portid           = -1;
-static int hf_swils_rscn_pwwn             = -1;
-static int hf_swils_rscn_nwwn             = -1;
-static int hf_swils_zone_activezonenm     = -1;
-static int hf_swils_zone_objname          = -1;
-static int hf_swils_zone_objtype          = -1;
-static int hf_swils_zone_mbrtype          = -1;
-static int hf_swils_zone_protocol         = -1;
-static int hf_swils_zone_mbrid            = -1;
-static int hf_swils_zone_mbrid_fcwwn      = -1;
-static int hf_swils_zone_mbrid_fc         = -1;
-static int hf_swils_zone_mbrid_uint       = -1;
-static int hf_swils_zone_status           = -1;
-static int hf_swils_zone_reason           = -1;
-static int hf_swils_aca_domainid          = -1;
-static int hf_swils_sfc_opcode            = -1;
-static int hf_swils_sfc_zonenm            = -1;
-static int hf_swils_rjt                   = -1;
-static int hf_swils_rjtdet                = -1;
-static int hf_swils_rjtvendor             = -1;
-static int hf_swils_zone_mbrid_lun        = -1;
-static int hf_swils_ess_rev               = -1;
-static int hf_swils_ess_len               = -1;
-static int hf_swils_ess_numobj            = -1;
-static int hf_swils_interconnect_list_len = -1;
-static int hf_swils_ess_vendorname        = -1;
-static int hf_swils_ess_modelname         = -1;
-static int hf_swils_ess_relcode           = -1;
-static int hf_swils_ess_vendorspecific    = -1;
-static int hf_swils_ess_cap_type          = -1;
-static int hf_swils_ess_cap_subtype       = -1;
-static int hf_swils_ess_cap_numentries    = -1;
-static int hf_swils_ess_cap_svc           = -1;
-static int hf_swils_ess_dns_obj0h         = -1;
-static int hf_swils_ess_dns_obj1h         = -1;
-static int hf_swils_ess_dns_obj2h         = -1;
-static int hf_swils_ess_dns_obj3h         = -1;
-static int hf_swils_ess_dns_zlacc         = -1;
-static int hf_swils_ess_dns_vendor        = -1;
-static int hf_swils_ess_fctlr_rscn        = -1;
-static int hf_swils_ess_fctlr_vendor      = -1;
-static int hf_swils_ess_fcs_basic         = -1;
-static int hf_swils_ess_fcs_platform      = -1;
-static int hf_swils_ess_fcs_topology      = -1;
-static int hf_swils_ess_fcs_enhanced      = -1;
-static int hf_swils_ess_fzs_enh_supp      = -1;
-static int hf_swils_ess_fzs_enh_ena       = -1;
-static int hf_swils_ess_fzs_mr            = -1;
-static int hf_swils_ess_fzs_zsdb_supp     = -1;
-static int hf_swils_ess_fzs_zsdb_ena      = -1;
-static int hf_swils_ess_fzs_adc_supp      = -1;
-static int hf_swils_ess_fzs_hardzone      = -1;
-static int hf_swils_mrra_rev              = -1;
-static int hf_swils_mrra_size             = -1;
-static int hf_swils_mrra_vendorid         = -1;
-static int hf_swils_mrra_reply            = -1;
-static int hf_swils_mrra_reply_size       = -1;
-static int hf_swils_mrra_waittime         = -1;
-static int hf_swils_ess_cap_t10           = -1;
-static int hf_swils_ess_cap_vendorobj     = -1;
-static int hf_swils_ess_fzs_defzone       = -1;
-static int hf_swils_ess_cap_len           = -1;
-static int hf_swils_mrra_vendorinfo       = -1;
+static int proto_fcswils;
+static int hf_swils_opcode;
+static int hf_swils_elp_rev;
+static int hf_swils_elp_flags;
+static int hf_swils_elp_r_a_tov;
+static int hf_swils_elp_e_d_tov;
+static int hf_swils_elp_req_epn;
+static int hf_swils_elp_req_esn;
+static int hf_swils_elp_clsf_svcp;
+static int hf_swils_elp_clsf_rcvsz;
+static int hf_swils_elp_clsf_conseq;
+static int hf_swils_elp_clsf_e2e;
+static int hf_swils_elp_clsf_openseq;
+static int hf_swils_elp_cls1_svcp;
+static int hf_swils_elp_cls1_rcvsz;
+static int hf_swils_elp_cls2_svcp;
+static int hf_swils_elp_cls2_rcvsz;
+static int hf_swils_elp_cls3_svcp;
+static int hf_swils_elp_cls3_rcvsz;
+static int hf_swils_elp_isl_fc_mode;
+static int hf_swils_elp_fcplen;
+static int hf_swils_elp_b2bcredit;
+static int hf_swils_elp_compat1;
+static int hf_swils_elp_compat2;
+static int hf_swils_elp_compat3;
+static int hf_swils_elp_compat4;
+static int hf_swils_efp_rec_type;
+static int hf_swils_efp_dom_id;
+static int hf_swils_efp_switch_name;
+static int hf_swils_efp_mcast_grpno;
+/* static int hf_swils_efp_alias_token; */
+static int hf_swils_efp_record_len;
+static int hf_swils_efp_payload_len;
+static int hf_swils_efp_pswitch_pri;
+static int hf_swils_efp_pswitch_name;
+static int hf_swils_dia_switch_name;
+static int hf_swils_rdi_payload_len;
+static int hf_swils_rdi_req_sname;
+/* static int hf_swils_fspfh_cmd; */
+static int hf_swils_fspfh_rev;
+static int hf_swils_fspfh_ar_num;
+static int hf_swils_fspfh_auth_type;
+static int hf_swils_fspfh_dom_id;
+static int hf_swils_fspfh_auth;
+static int hf_swils_hlo_options;
+static int hf_swils_hlo_hloint;
+static int hf_swils_hlo_deadint;
+static int hf_swils_hlo_rcv_domid;
+static int hf_swils_hlo_orig_pidx;
+static int hf_swils_ldrec_linkid;
+static int hf_swils_ldrec_out_pidx;
+static int hf_swils_ldrec_nbr_pidx;
+static int hf_swils_ldrec_link_type;
+static int hf_swils_ldrec_link_cost;
+static int hf_swils_lsrh_lsr_type;
+static int hf_swils_lsrh_lsid;
+static int hf_swils_lsrh_adv_domid;
+static int hf_swils_lsrh_ls_incid;
+static int hf_swils_esc_pdesc_vendorid;
+static int hf_swils_esc_swvendorid;
+static int hf_swils_esc_protocolid;
+static int hf_swils_rscn_evtype;
+static int hf_swils_rscn_addrfmt;
+static int hf_swils_rscn_detectfn;
+static int hf_swils_rscn_affectedport;
+static int hf_swils_rscn_portstate;
+static int hf_swils_rscn_portid;
+static int hf_swils_rscn_pwwn;
+static int hf_swils_rscn_nwwn;
+static int hf_swils_zone_activezonenm;
+static int hf_swils_zone_objname;
+static int hf_swils_zone_objtype;
+static int hf_swils_zone_mbrtype;
+static int hf_swils_zone_protocol;
+static int hf_swils_zone_mbrid;
+static int hf_swils_zone_mbrid_fcwwn;
+static int hf_swils_zone_mbrid_fc;
+static int hf_swils_zone_mbrid_uint;
+static int hf_swils_zone_status;
+static int hf_swils_zone_reason;
+static int hf_swils_aca_domainid;
+static int hf_swils_sfc_opcode;
+static int hf_swils_sfc_zonenm;
+static int hf_swils_rjt;
+static int hf_swils_rjtdet;
+static int hf_swils_rjtvendor;
+static int hf_swils_zone_mbrid_lun;
+static int hf_swils_ess_rev;
+static int hf_swils_ess_len;
+static int hf_swils_ess_numobj;
+static int hf_swils_interconnect_list_len;
+static int hf_swils_ess_vendorname;
+static int hf_swils_ess_modelname;
+static int hf_swils_ess_relcode;
+static int hf_swils_ess_vendorspecific;
+static int hf_swils_ess_cap_type;
+static int hf_swils_ess_cap_subtype;
+static int hf_swils_ess_cap_numentries;
+static int hf_swils_ess_cap_svc;
+static int hf_swils_ess_dns_obj0h;
+static int hf_swils_ess_dns_obj1h;
+static int hf_swils_ess_dns_obj2h;
+static int hf_swils_ess_dns_obj3h;
+static int hf_swils_ess_dns_zlacc;
+static int hf_swils_ess_dns_vendor;
+static int hf_swils_ess_fctlr_rscn;
+static int hf_swils_ess_fctlr_vendor;
+static int hf_swils_ess_fcs_basic;
+static int hf_swils_ess_fcs_platform;
+static int hf_swils_ess_fcs_topology;
+static int hf_swils_ess_fcs_enhanced;
+static int hf_swils_ess_fzs_enh_supp;
+static int hf_swils_ess_fzs_enh_ena;
+static int hf_swils_ess_fzs_mr;
+static int hf_swils_ess_fzs_zsdb_supp;
+static int hf_swils_ess_fzs_zsdb_ena;
+static int hf_swils_ess_fzs_adc_supp;
+static int hf_swils_ess_fzs_hardzone;
+static int hf_swils_mrra_rev;
+static int hf_swils_mrra_size;
+static int hf_swils_mrra_vendorid;
+static int hf_swils_mrra_reply;
+static int hf_swils_mrra_reply_size;
+static int hf_swils_mrra_waittime;
+static int hf_swils_ess_cap_t10;
+static int hf_swils_ess_cap_vendorobj;
+static int hf_swils_ess_fzs_defzone;
+static int hf_swils_ess_cap_len;
+static int hf_swils_mrra_vendorinfo;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_swils_lsrh_lsr_age = -1;
-static int hf_swils_zone_full_zone_set_length = -1;
-static int hf_swils_zone_num_zoning_objects = -1;
-static int hf_swils_lsrec_number_of_links = -1;
-static int hf_swils_sfc_zoneset_length = -1;
-static int hf_swils_zone_vendor_unique = -1;
-static int hf_swils_zone_num_members = -1;
-static int hf_swils_zone_active_zoneset_length = -1;
-static int hf_swils_lsack_num_of_lsr_headers = -1;
-static int hf_swils_lsrh_lsr_length = -1;
-static int hf_swils_esc_payload_length = -1;
-static int hf_swils_lsupdate_num_of_lsrs = -1;
-static int hf_swils_zone_mbr_identifier_length = -1;
-static int hf_swils_zone_mbrflags = -1;
-static int hf_swils_lsrh_options = -1;
-static int hf_swils_domain_id_list_length = -1;
-static int hf_swils_lsack_flags = -1;
-static int hf_swils_rscn_num_entries = -1;
-static int hf_swils_requested_domain_id = -1;
-static int hf_swils_lsrh_checksum = -1;
-static int hf_swils_granted_domain_id = -1;
-static int hf_swils_lsupdate_flags = -1;
-
-
-static expert_field ei_swils_efp_record_len = EI_INIT;
-static expert_field ei_swils_no_exchange = EI_INIT;
-static expert_field ei_swils_zone_mbrid = EI_INIT;
+static int hf_swils_lsrh_lsr_age;
+static int hf_swils_zone_full_zone_set_length;
+static int hf_swils_zone_num_zoning_objects;
+static int hf_swils_lsrec_number_of_links;
+static int hf_swils_sfc_zoneset_length;
+static int hf_swils_zone_vendor_unique;
+static int hf_swils_zone_num_members;
+static int hf_swils_zone_active_zoneset_length;
+static int hf_swils_lsack_num_of_lsr_headers;
+static int hf_swils_lsrh_lsr_length;
+static int hf_swils_esc_payload_length;
+static int hf_swils_lsupdate_num_of_lsrs;
+static int hf_swils_zone_mbr_identifier_length;
+static int hf_swils_zone_mbrflags;
+static int hf_swils_lsrh_options;
+static int hf_swils_domain_id_list_length;
+static int hf_swils_lsack_flags;
+static int hf_swils_rscn_num_entries;
+static int hf_swils_requested_domain_id;
+static int hf_swils_lsrh_checksum;
+static int hf_swils_granted_domain_id;
+static int hf_swils_lsupdate_flags;
+
+
+static expert_field ei_swils_efp_record_len;
+static expert_field ei_swils_no_exchange;
+static expert_field ei_swils_zone_mbrid;
 
 /* Initialize the subtree pointers */
-static gint ett_fcswils             = -1;
-static gint ett_fcswils_swacc       = -1;
-static gint ett_fcswils_swrjt       = -1;
-static gint ett_fcswils_elp         = -1;
-static gint ett_fcswils_efp         = -1;
-static gint ett_fcswils_efplist     = -1;
-static gint ett_fcswils_dia         = -1;
-static gint ett_fcswils_rdi         = -1;
-static gint ett_fcswils_fspfhdr     = -1;
-static gint ett_fcswils_hlo         = -1;
-static gint ett_fcswils_lsrec       = -1;
-static gint ett_fcswils_lsrechdr    = -1;
-static gint ett_fcswils_ldrec       = -1;
-static gint ett_fcswils_lsu         = -1;
-static gint ett_fcswils_lsa         = -1;
-static gint ett_fcswils_bf          = -1;
-static gint ett_fcswils_rcf         = -1;
-static gint ett_fcswils_rscn        = -1;
-static gint ett_fcswils_rscn_dev    = -1;
-static gint ett_fcswils_drlir       = -1;
-static gint ett_fcswils_mr          = -1;
-static gint ett_fcswils_zoneobjlist = -1;
-static gint ett_fcswils_zoneobj     = -1;
-static gint ett_fcswils_zonembr     = -1;
-static gint ett_fcswils_aca         = -1;
-static gint ett_fcswils_rca         = -1;
-static gint ett_fcswils_sfc         = -1;
-static gint ett_fcswils_ufc         = -1;
-static gint ett_fcswils_esc         = -1;
-static gint ett_fcswils_esc_pdesc   = -1;
-static gint ett_fcswils_ieinfo      = -1;
-static gint ett_fcswils_capinfo     = -1;
+static gint ett_fcswils;
+static gint ett_fcswils_swacc;
+static gint ett_fcswils_swrjt;
+static gint ett_fcswils_elp;
+static gint ett_fcswils_efp;
+static gint ett_fcswils_efplist;
+static gint ett_fcswils_dia;
+static gint ett_fcswils_rdi;
+static gint ett_fcswils_fspfhdr;
+static gint ett_fcswils_hlo;
+static gint ett_fcswils_lsrec;
+static gint ett_fcswils_lsrechdr;
+static gint ett_fcswils_ldrec;
+static gint ett_fcswils_lsu;
+static gint ett_fcswils_lsa;
+static gint ett_fcswils_bf;
+static gint ett_fcswils_rcf;
+static gint ett_fcswils_rscn;
+static gint ett_fcswils_rscn_dev;
+static gint ett_fcswils_drlir;
+static gint ett_fcswils_mr;
+static gint ett_fcswils_zoneobjlist;
+static gint ett_fcswils_zoneobj;
+static gint ett_fcswils_zonembr;
+static gint ett_fcswils_aca;
+static gint ett_fcswils_rca;
+static gint ett_fcswils_sfc;
+static gint ett_fcswils_ufc;
+static gint ett_fcswils_esc;
+static gint ett_fcswils_esc_pdesc;
+static gint ett_fcswils_ieinfo;
+static gint ett_fcswils_capinfo;
 
 static const value_string fc_swils_opcode_key_val[] = {
     {FC_SWILS_SWRJT   , "SW_RJT"},
diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c
index 8fec793657..c6e85a7236 100644
--- a/epan/dissectors/packet-fddi.c
+++ b/epan/dissectors/packet-fddi.c
@@ -29,18 +29,18 @@
 void proto_register_fddi(void);
 void proto_reg_handoff_fddi(void);
 
-static int proto_fddi = -1;
-static int hf_fddi_fc = -1;
-static int hf_fddi_fc_clf = -1;
-static int hf_fddi_fc_prio = -1;
-static int hf_fddi_fc_smt_subtype = -1;
-static int hf_fddi_fc_mac_subtype = -1;
-static int hf_fddi_dst = -1;
-static int hf_fddi_src = -1;
-static int hf_fddi_addr = -1;
-
-static gint ett_fddi = -1;
-static gint ett_fddi_fc = -1;
+static int proto_fddi;
+static int hf_fddi_fc;
+static int hf_fddi_fc_clf;
+static int hf_fddi_fc_prio;
+static int hf_fddi_fc_smt_subtype;
+static int hf_fddi_fc_mac_subtype;
+static int hf_fddi_dst;
+static int hf_fddi_src;
+static int hf_fddi_addr;
+
+static gint ett_fddi;
+static gint ett_fddi_fc;
 
 static int fddi_tap = -1;
 
diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c
index d77c146e71..2f6ffbf998 100644
--- a/epan/dissectors/packet-fefd.c
+++ b/epan/dissectors/packet-fefd.c
@@ -24,22 +24,22 @@ static dissector_handle_t fefd_handle;
 #define TLV_TYPE        0
 #define TLV_LENGTH      2
 
-static int proto_fefd = -1;
-static int hf_fefd_version = -1;
-static int hf_fefd_opcode = -1;
-static int hf_fefd_flags = -1;
-static int hf_fefd_flags_rt = -1;
-static int hf_fefd_flags_rsy = -1;
-static int hf_fefd_checksum = -1;
-static int hf_fefd_tlvtype = -1;
-static int hf_fefd_tlvlength = -1;
-static int hf_fefd_device_id = -1;
-static int hf_fefd_sent_through_interface = -1;
-static int hf_fefd_data = -1;
-
-static gint ett_fefd = -1;
-static gint ett_fefd_flags = -1;
-static gint ett_fefd_tlv = -1;
+static int proto_fefd;
+static int hf_fefd_version;
+static int hf_fefd_opcode;
+static int hf_fefd_flags;
+static int hf_fefd_flags_rt;
+static int hf_fefd_flags_rsy;
+static int hf_fefd_checksum;
+static int hf_fefd_tlvtype;
+static int hf_fefd_tlvlength;
+static int hf_fefd_device_id;
+static int hf_fefd_sent_through_interface;
+static int hf_fefd_data;
+
+static gint ett_fefd;
+static gint ett_fefd_flags;
+static gint ett_fefd_tlv;
 
 #define TYPE_DEVICE_ID        0x0001
 #define TYPE_PORT_ID          0x0002
diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c
index 6d7ae3d509..451ca3b773 100644
--- a/epan/dissectors/packet-ff.c
+++ b/epan/dissectors/packet-ff.c
@@ -38,8 +38,8 @@
 void proto_register_ff(void);
 void proto_reg_handoff_ff(void);
 
-static int proto_ff = -1;
-static gint ett_ff  = -1;
+static int proto_ff;
+static gint ett_ff;
 
 static gboolean ff_desegment    = TRUE; /* desegmentation of FF over TCP */
 
@@ -51,1171 +51,1171 @@ static dissector_handle_t ff_tcp_handle;
 /*
  * 6.3. Message Header
  */
-static int hf_ff_fda_msg_hdr = -1;
+static int hf_ff_fda_msg_hdr;
 
-static int hf_ff_fda_msg_hdr_ver = -1;
-static int hf_ff_fda_msg_hdr_fda_addr = -1;
-static int hf_ff_fda_msg_hdr_len = -1;
-static int hf_ff_unknown_data = -1;
-static int hf_ff_data = -1;
-static int hf_ff_reserved24 = -1;
-static int hf_ff_unknown_service = -1;
+static int hf_ff_fda_msg_hdr_ver;
+static int hf_ff_fda_msg_hdr_fda_addr;
+static int hf_ff_fda_msg_hdr_len;
+static int hf_ff_unknown_data;
+static int hf_ff_data;
+static int hf_ff_reserved24;
+static int hf_ff_unknown_service;
 
-static gint ett_ff_fda_msg_hdr = -1;
-static gint ett_ff_fda_msg_hdr_proto_and_type = -1;
-static gint ett_ff_fda_msg_hdr_opts = -1;
-static gint ett_ff_fda_msg_hdr_srv = -1;
+static gint ett_ff_fda_msg_hdr;
+static gint ett_ff_fda_msg_hdr_proto_and_type;
+static gint ett_ff_fda_msg_hdr_opts;
+static gint ett_ff_fda_msg_hdr_srv;
 
 
 
 /*
  * 6.4. Message Trailer
  */
-static int hf_ff_fda_msg_trailer = -1;
+static int hf_ff_fda_msg_trailer;
 
-static int hf_ff_fda_msg_trailer_msg_num = -1;
-static int hf_ff_fda_msg_trailer_invoke_id = -1;
-static int hf_ff_fda_msg_trailer_time_stamp = -1;
-static int hf_ff_fda_msg_trailer_extended_control_field = -1;
+static int hf_ff_fda_msg_trailer_msg_num;
+static int hf_ff_fda_msg_trailer_invoke_id;
+static int hf_ff_fda_msg_trailer_time_stamp;
+static int hf_ff_fda_msg_trailer_extended_control_field;
 
-static gint ett_ff_fda_msg_trailer = -1;
+static gint ett_ff_fda_msg_trailer;
 
 
 
 /*
  * 6.5.1 FDA Session Management Services
  */
-static int hf_ff_fda = -1;
-static int hf_ff_hdr_srv = -1;
-static int hf_ff_hdr_srv_confirm_flag = -1;
-static int hf_ff_hdr_srv_service_id = -1;
-static int hf_ff_hdr_srv_fda_service_id_confirm = -1;
-static int hf_ff_hdr_srv_fda_service_id_unconfirm = -1;
-static int hf_ff_hdr_srv_sm_service_id_confirm = -1;
-static int hf_ff_hdr_srv_sm_service_id_unconfirm = -1;
-static int hf_ff_hdr_srv_fms_service_id_confirm = -1;
-static int hf_ff_hdr_srv_fms_service_id_unconfirm = -1;
-static int hf_ff_hdr_srv_lan_service_id_confirm = -1;
-static int hf_ff_hdr_srv_lan_service_id_unconfirm = -1;
-static int hf_ff_hdr_proto_id = -1;
-static int hf_ff_hdr_confirm_msg_type = -1;
-static int hf_ff_hdr_proto_confirm = -1;
-static int hf_ff_hdr_opts_msg_num = -1;
-static int hf_ff_hdr_opts_invoke_id = -1;
-static int hf_ff_hdr_opts_timestamp = -1;
-static int hf_ff_hdr_opts_reserved = -1;
-static int hf_ff_hdr_opts_ext_ctrl = -1;
-static int hf_ff_hdr_opts_pad = -1;
-static int hf_ff_hdr_opts = -1;
+static int hf_ff_fda;
+static int hf_ff_hdr_srv;
+static int hf_ff_hdr_srv_confirm_flag;
+static int hf_ff_hdr_srv_service_id;
+static int hf_ff_hdr_srv_fda_service_id_confirm;
+static int hf_ff_hdr_srv_fda_service_id_unconfirm;
+static int hf_ff_hdr_srv_sm_service_id_confirm;
+static int hf_ff_hdr_srv_sm_service_id_unconfirm;
+static int hf_ff_hdr_srv_fms_service_id_confirm;
+static int hf_ff_hdr_srv_fms_service_id_unconfirm;
+static int hf_ff_hdr_srv_lan_service_id_confirm;
+static int hf_ff_hdr_srv_lan_service_id_unconfirm;
+static int hf_ff_hdr_proto_id;
+static int hf_ff_hdr_confirm_msg_type;
+static int hf_ff_hdr_proto_confirm;
+static int hf_ff_hdr_opts_msg_num;
+static int hf_ff_hdr_opts_invoke_id;
+static int hf_ff_hdr_opts_timestamp;
+static int hf_ff_hdr_opts_reserved;
+static int hf_ff_hdr_opts_ext_ctrl;
+static int hf_ff_hdr_opts_pad;
+static int hf_ff_hdr_opts;
 
 /*
  * 6.5.1.1. FDA Open Session (Confirmed Service Id = 1)
  */
-static int hf_ff_fda_open_sess = -1;
+static int hf_ff_fda_open_sess;
 
-static int hf_ff_fda_open_sess_req = -1;
-static int hf_ff_fda_open_sess_req_sess_idx = -1;
-static int hf_ff_fda_open_sess_req_max_buf_siz = -1;
-static int hf_ff_fda_open_sess_req_max_msg_len = -1;
-static int hf_ff_fda_open_sess_req_reserved = -1;
-static int hf_ff_fda_open_sess_req_nma_conf_use = -1;
-static int hf_ff_fda_open_sess_req_inactivity_close_time = -1;
-static int hf_ff_fda_open_sess_req_transmit_delay_time = -1;
-static int hf_ff_fda_open_sess_req_pd_tag = -1;
+static int hf_ff_fda_open_sess_req;
+static int hf_ff_fda_open_sess_req_sess_idx;
+static int hf_ff_fda_open_sess_req_max_buf_siz;
+static int hf_ff_fda_open_sess_req_max_msg_len;
+static int hf_ff_fda_open_sess_req_reserved;
+static int hf_ff_fda_open_sess_req_nma_conf_use;
+static int hf_ff_fda_open_sess_req_inactivity_close_time;
+static int hf_ff_fda_open_sess_req_transmit_delay_time;
+static int hf_ff_fda_open_sess_req_pd_tag;
 
-static int hf_ff_fda_open_sess_rsp = -1;
-static int hf_ff_fda_open_sess_rsp_sess_idx = -1;
-static int hf_ff_fda_open_sess_rsp_max_buf_siz = -1;
-static int hf_ff_fda_open_sess_rsp_max_msg_len = -1;
-static int hf_ff_fda_open_sess_rsp_reserved = -1;
-static int hf_ff_fda_open_sess_rsp_nma_conf_use = -1;
-static int hf_ff_fda_open_sess_rsp_inactivity_close_time = -1;
-static int hf_ff_fda_open_sess_rsp_transmit_delay_time = -1;
-static int hf_ff_fda_open_sess_rsp_pd_tag = -1;
+static int hf_ff_fda_open_sess_rsp;
+static int hf_ff_fda_open_sess_rsp_sess_idx;
+static int hf_ff_fda_open_sess_rsp_max_buf_siz;
+static int hf_ff_fda_open_sess_rsp_max_msg_len;
+static int hf_ff_fda_open_sess_rsp_reserved;
+static int hf_ff_fda_open_sess_rsp_nma_conf_use;
+static int hf_ff_fda_open_sess_rsp_inactivity_close_time;
+static int hf_ff_fda_open_sess_rsp_transmit_delay_time;
+static int hf_ff_fda_open_sess_rsp_pd_tag;
 
-static int hf_ff_fda_open_sess_err = -1;
-static int hf_ff_fda_open_sess_err_err_class = -1;
-static int hf_ff_fda_open_sess_err_err_code = -1;
-static int hf_ff_fda_open_sess_err_additional_code = -1;
-static int hf_ff_fda_open_sess_err_additional_desc = -1;
+static int hf_ff_fda_open_sess_err;
+static int hf_ff_fda_open_sess_err_err_class;
+static int hf_ff_fda_open_sess_err_err_code;
+static int hf_ff_fda_open_sess_err_additional_code;
+static int hf_ff_fda_open_sess_err_additional_desc;
 
-static gint ett_ff_fda_open_sess_req = -1;
-static gint ett_ff_fda_open_sess_rsp = -1;
-static gint ett_ff_fda_open_sess_err = -1;
+static gint ett_ff_fda_open_sess_req;
+static gint ett_ff_fda_open_sess_rsp;
+static gint ett_ff_fda_open_sess_err;
 
 
 
 /*
  * 6.5.1.2. FDA Idle (Confirmed Service Id = 3)
  */
-static int hf_ff_fda_idle = -1;
+static int hf_ff_fda_idle;
 
-static int hf_ff_fda_idle_req = -1;
+static int hf_ff_fda_idle_req;
 
-static int hf_ff_fda_idle_rsp = -1;
+static int hf_ff_fda_idle_rsp;
 
-static int hf_ff_fda_idle_err = -1;
-static int hf_ff_fda_idle_err_err_class = -1;
-static int hf_ff_fda_idle_err_err_code = -1;
-static int hf_ff_fda_idle_err_additional_code = -1;
-static int hf_ff_fda_idle_err_additional_desc = -1;
+static int hf_ff_fda_idle_err;
+static int hf_ff_fda_idle_err_err_class;
+static int hf_ff_fda_idle_err_err_code;
+static int hf_ff_fda_idle_err_additional_code;
+static int hf_ff_fda_idle_err_additional_desc;
 
-static gint ett_ff_fda_idle_req = -1;
-static gint ett_ff_fda_idle_rsp = -1;
-static gint ett_ff_fda_idle_err = -1;
+static gint ett_ff_fda_idle_req;
+static gint ett_ff_fda_idle_rsp;
+static gint ett_ff_fda_idle_err;
 
 
 
 /*
  * 6.5.2. SM Services
  */
-static int hf_ff_sm = -1;
+static int hf_ff_sm;
 
 
 
 /*
  * 6.5.2.1. SM Find Tag Query (Unconfirmed Service Id = 1)
  */
-static int hf_ff_sm_find_tag_query = -1;
+static int hf_ff_sm_find_tag_query;
 
-static int hf_ff_sm_find_tag_query_req = -1;
-static int hf_ff_sm_find_tag_query_req_query_type = -1;
-static int hf_ff_sm_find_tag_query_req_idx = -1;
-static int hf_ff_sm_find_tag_query_req_tag = -1;
-static int hf_ff_sm_find_tag_query_req_vfd_tag = -1;
+static int hf_ff_sm_find_tag_query_req;
+static int hf_ff_sm_find_tag_query_req_query_type;
+static int hf_ff_sm_find_tag_query_req_idx;
+static int hf_ff_sm_find_tag_query_req_tag;
+static int hf_ff_sm_find_tag_query_req_vfd_tag;
 
-static gint ett_ff_sm_find_tag_query_req = -1;
+static gint ett_ff_sm_find_tag_query_req;
 
 
 
 /*
  * 6.5.2.2. SM Find Tag Reply (Unconfirmed Service Id = 2)
  */
-static int hf_ff_sm_find_tag_reply = -1;
+static int hf_ff_sm_find_tag_reply;
 
-static int hf_ff_sm_find_tag_reply_req = -1;
-static int hf_ff_sm_find_tag_reply_req_query_type = -1;
-static int hf_ff_sm_find_tag_reply_req_h1_node_addr = -1;
-static int hf_ff_sm_find_tag_reply_req_fda_addr_link_id = -1;
-static int hf_ff_sm_find_tag_reply_req_vfd_ref = -1;
-static int hf_ff_sm_find_tag_reply_req_od_idx = -1;
-static int hf_ff_sm_find_tag_reply_req_ip_addr = -1;
-static int hf_ff_sm_find_tag_reply_req_od_ver = -1;
-static int hf_ff_sm_find_tag_reply_req_dev_id = -1;
-static int hf_ff_sm_find_tag_reply_req_pd_tag = -1;
-static int hf_ff_sm_find_tag_reply_req_reserved = -1;
-static int hf_ff_sm_find_tag_reply_req_num_of_fda_addr_selectors = -1;
-static int hf_ff_sm_find_tag_reply_req_fda_addr_selector = -1;
-static int hf_ff_sm_find_tag_reply_dup_reserved = -1;
-static int hf_ff_sm_find_tag_reply_dup_pd_tag = -1;
-static int hf_ff_sm_find_tag_reply_dup_device = -1;
-static int hf_ff_sm_find_tag_reply_dup = -1;
+static int hf_ff_sm_find_tag_reply_req;
+static int hf_ff_sm_find_tag_reply_req_query_type;
+static int hf_ff_sm_find_tag_reply_req_h1_node_addr;
+static int hf_ff_sm_find_tag_reply_req_fda_addr_link_id;
+static int hf_ff_sm_find_tag_reply_req_vfd_ref;
+static int hf_ff_sm_find_tag_reply_req_od_idx;
+static int hf_ff_sm_find_tag_reply_req_ip_addr;
+static int hf_ff_sm_find_tag_reply_req_od_ver;
+static int hf_ff_sm_find_tag_reply_req_dev_id;
+static int hf_ff_sm_find_tag_reply_req_pd_tag;
+static int hf_ff_sm_find_tag_reply_req_reserved;
+static int hf_ff_sm_find_tag_reply_req_num_of_fda_addr_selectors;
+static int hf_ff_sm_find_tag_reply_req_fda_addr_selector;
+static int hf_ff_sm_find_tag_reply_dup_reserved;
+static int hf_ff_sm_find_tag_reply_dup_pd_tag;
+static int hf_ff_sm_find_tag_reply_dup_device;
+static int hf_ff_sm_find_tag_reply_dup;
 
-static gint ett_ff_sm_find_tag_reply_req = -1;
-static gint ett_ff_sm_find_tag_reply_req_dup_detection_state = -1;
-static gint ett_ff_sm_find_tag_reply_req_list_of_fda_addr_selectors = -1;
+static gint ett_ff_sm_find_tag_reply_req;
+static gint ett_ff_sm_find_tag_reply_req_dup_detection_state;
+static gint ett_ff_sm_find_tag_reply_req_list_of_fda_addr_selectors;
 
 
 
 /*
  * 6.5.2.3. SM Identify (Confirmed Service Id = 3)
  */
-static int hf_ff_sm_id = -1;
-
-static int hf_ff_sm_id_req = -1;
-
-static int hf_ff_sm_id_rsp = -1;
-static int hf_ff_sm_id_rsp_dev_idx = -1;
-static int hf_ff_sm_id_rsp_max_dev_idx = -1;
-static int hf_ff_sm_id_rsp_operational_ip_addr = -1;
-static int hf_ff_sm_id_rsp_dev_id = -1;
-static int hf_ff_sm_id_rsp_pd_tag = -1;
-static int hf_ff_sm_id_rsp_hse_repeat_time = -1;
-static int hf_ff_sm_id_rsp_lr_port = -1;
-static int hf_ff_sm_id_rsp_reserved = -1;
-static int hf_ff_sm_id_rsp_annunc_ver_num = -1;
-static int hf_ff_sm_id_rsp_hse_dev_ver_num = -1;
-static int hf_ff_sm_id_rsp_num_of_entries = -1;
-static int hf_ff_sm_id_rsp_h1_live_list_h1_link_id = -1;
-static int hf_ff_sm_id_rsp_h1_live_list_reserved = -1;
-static int hf_ff_sm_id_rsp_h1_live_list_ver_num = -1;
-static int hf_ff_sm_id_rsp_h1_node_addr_ver_num_h1_node_addr = -1;
-static int hf_ff_sm_id_rsp_h1_node_addr_ver_num_ver_num = -1;
-static int hf_ff_sm_id_rsp_smk_state_name = -1;
-static int hf_ff_sm_id_rsp_smk_state_sync = -1;
-static int hf_ff_sm_id_rsp_smk_state = -1;
-static int hf_ff_sm_id_rsp_dev_type_link = -1;
-static int hf_ff_sm_id_rsp_dev_type_iogateway = -1;
-static int hf_ff_sm_id_rsp_dev_type_hse = -1;
-static int hf_ff_sm_id_rsp_dev_type_h1 = -1;
-static int hf_ff_sm_id_rsp_dev_type_reserved = -1;
-static int hf_ff_sm_id_rsp_dev_type_redundant_caps = -1;
-static int hf_ff_sm_id_rsp_dev_type = -1;
-static int hf_ff_sm_id_rsp_dev_redundancy_state_reserved = -1;
-static int hf_ff_sm_id_rsp_dev_redundancy_state_role = -1;
-static int hf_ff_sm_id_rsp_dev_redundancy_state_type = -1;
-static int hf_ff_sm_id_rsp_dev_redundancy_state = -1;
-static int hf_ff_sm_id_rsp_dup_detection_state_reserved = -1;
-static int hf_ff_sm_id_rsp_dup_detection_state_pd_tag = -1;
-static int hf_ff_sm_id_rsp_dup_detection_state_device = -1;
-static int hf_ff_sm_id_rsp_dup_detection_state = -1;
-
-static int hf_ff_sm_id_err = -1;
-static int hf_ff_sm_id_err_err_class = -1;
-static int hf_ff_sm_id_err_err_code = -1;
-static int hf_ff_sm_id_err_additional_code = -1;
-static int hf_ff_sm_id_err_additional_desc = -1;
-
-static gint ett_ff_sm_id_req = -1;
-static gint ett_ff_sm_id_rsp = -1;
-static gint ett_ff_sm_id_rsp_smk_state = -1;
-static gint ett_ff_sm_id_rsp_dev_type = -1;
-static gint ett_ff_sm_id_rsp_dev_redundancy_state = -1;
-static gint ett_ff_sm_id_rsp_dup_detection_state = -1;
-static gint ett_ff_sm_id_rsp_entries_h1_live_list = -1;
-static gint ett_ff_sm_id_rsp_h1_live_list = -1;
-static gint ett_ff_sm_id_rsp_entries_node_addr = -1;
-static gint ett_ff_sm_id_rsp_h1_node_addr = -1;
-static gint ett_ff_sm_id_err = -1;
+static int hf_ff_sm_id;
+
+static int hf_ff_sm_id_req;
+
+static int hf_ff_sm_id_rsp;
+static int hf_ff_sm_id_rsp_dev_idx;
+static int hf_ff_sm_id_rsp_max_dev_idx;
+static int hf_ff_sm_id_rsp_operational_ip_addr;
+static int hf_ff_sm_id_rsp_dev_id;
+static int hf_ff_sm_id_rsp_pd_tag;
+static int hf_ff_sm_id_rsp_hse_repeat_time;
+static int hf_ff_sm_id_rsp_lr_port;
+static int hf_ff_sm_id_rsp_reserved;
+static int hf_ff_sm_id_rsp_annunc_ver_num;
+static int hf_ff_sm_id_rsp_hse_dev_ver_num;
+static int hf_ff_sm_id_rsp_num_of_entries;
+static int hf_ff_sm_id_rsp_h1_live_list_h1_link_id;
+static int hf_ff_sm_id_rsp_h1_live_list_reserved;
+static int hf_ff_sm_id_rsp_h1_live_list_ver_num;
+static int hf_ff_sm_id_rsp_h1_node_addr_ver_num_h1_node_addr;
+static int hf_ff_sm_id_rsp_h1_node_addr_ver_num_ver_num;
+static int hf_ff_sm_id_rsp_smk_state_name;
+static int hf_ff_sm_id_rsp_smk_state_sync;
+static int hf_ff_sm_id_rsp_smk_state;
+static int hf_ff_sm_id_rsp_dev_type_link;
+static int hf_ff_sm_id_rsp_dev_type_iogateway;
+static int hf_ff_sm_id_rsp_dev_type_hse;
+static int hf_ff_sm_id_rsp_dev_type_h1;
+static int hf_ff_sm_id_rsp_dev_type_reserved;
+static int hf_ff_sm_id_rsp_dev_type_redundant_caps;
+static int hf_ff_sm_id_rsp_dev_type;
+static int hf_ff_sm_id_rsp_dev_redundancy_state_reserved;
+static int hf_ff_sm_id_rsp_dev_redundancy_state_role;
+static int hf_ff_sm_id_rsp_dev_redundancy_state_type;
+static int hf_ff_sm_id_rsp_dev_redundancy_state;
+static int hf_ff_sm_id_rsp_dup_detection_state_reserved;
+static int hf_ff_sm_id_rsp_dup_detection_state_pd_tag;
+static int hf_ff_sm_id_rsp_dup_detection_state_device;
+static int hf_ff_sm_id_rsp_dup_detection_state;
+
+static int hf_ff_sm_id_err;
+static int hf_ff_sm_id_err_err_class;
+static int hf_ff_sm_id_err_err_code;
+static int hf_ff_sm_id_err_additional_code;
+static int hf_ff_sm_id_err_additional_desc;
+
+static gint ett_ff_sm_id_req;
+static gint ett_ff_sm_id_rsp;
+static gint ett_ff_sm_id_rsp_smk_state;
+static gint ett_ff_sm_id_rsp_dev_type;
+static gint ett_ff_sm_id_rsp_dev_redundancy_state;
+static gint ett_ff_sm_id_rsp_dup_detection_state;
+static gint ett_ff_sm_id_rsp_entries_h1_live_list;
+static gint ett_ff_sm_id_rsp_h1_live_list;
+static gint ett_ff_sm_id_rsp_entries_node_addr;
+static gint ett_ff_sm_id_rsp_h1_node_addr;
+static gint ett_ff_sm_id_err;
 
 
 
 /*
  * 6.5.2.4. SM Clear Address (Confirmed Service Id = 12)
  */
-static int hf_ff_sm_clear_addr = -1;
+static int hf_ff_sm_clear_addr;
 
-static int hf_ff_sm_clear_addr_req = -1;
-static int hf_ff_sm_clear_addr_req_dev_id = -1;
-static int hf_ff_sm_clear_addr_req_pd_tag = -1;
-static int hf_ff_sm_clear_addr_req_interface_to_clear = -1;
+static int hf_ff_sm_clear_addr_req;
+static int hf_ff_sm_clear_addr_req_dev_id;
+static int hf_ff_sm_clear_addr_req_pd_tag;
+static int hf_ff_sm_clear_addr_req_interface_to_clear;
 
-static int hf_ff_sm_clear_addr_rsp = -1;
+static int hf_ff_sm_clear_addr_rsp;
 
-static int hf_ff_sm_clear_addr_err = -1;
-static int hf_ff_sm_clear_addr_err_err_class = -1;
-static int hf_ff_sm_clear_addr_err_err_code = -1;
-static int hf_ff_sm_clear_addr_err_additional_code = -1;
-static int hf_ff_sm_clear_addr_err_additional_desc = -1;
+static int hf_ff_sm_clear_addr_err;
+static int hf_ff_sm_clear_addr_err_err_class;
+static int hf_ff_sm_clear_addr_err_err_code;
+static int hf_ff_sm_clear_addr_err_additional_code;
+static int hf_ff_sm_clear_addr_err_additional_desc;
 
-static gint ett_ff_sm_clear_addr_req = -1;
-static gint ett_ff_sm_clear_addr_rsp = -1;
-static gint ett_ff_sm_clear_addr_err = -1;
+static gint ett_ff_sm_clear_addr_req;
+static gint ett_ff_sm_clear_addr_rsp;
+static gint ett_ff_sm_clear_addr_err;
 
 
 
 /*
  * 6.5.2.5. SM Set Assignment Info (Confirmed Service Id = 14)
  */
-static int hf_ff_sm_set_assign_info = -1;
+static int hf_ff_sm_set_assign_info;
 
-static int hf_ff_sm_set_assign_info_req_dev_redundancy_state_reserved = -1;
-static int hf_ff_sm_set_assign_info_req_dev_redundancy_state_role = -1;
-static int hf_ff_sm_set_assign_info_req_dev_redundancy_state_type = -1;
-static int hf_ff_sm_set_assign_info_req_dev_redundancy_state = -1;
-static int hf_ff_sm_set_assign_info_req_clear_dup_detection_state_reserved = -1;
-static int hf_ff_sm_set_assign_info_req_clear_dup_detection_state_pd_tag = -1;
-static int hf_ff_sm_set_assign_info_req_clear_dup_detection_state_device_index = -1;
-static int hf_ff_sm_set_assign_info_req_clear_dup_detection_state = -1;
+static int hf_ff_sm_set_assign_info_req_dev_redundancy_state_reserved;
+static int hf_ff_sm_set_assign_info_req_dev_redundancy_state_role;
+static int hf_ff_sm_set_assign_info_req_dev_redundancy_state_type;
+static int hf_ff_sm_set_assign_info_req_dev_redundancy_state;
+static int hf_ff_sm_set_assign_info_req_clear_dup_detection_state_reserved;
+static int hf_ff_sm_set_assign_info_req_clear_dup_detection_state_pd_tag;
+static int hf_ff_sm_set_assign_info_req_clear_dup_detection_state_device_index;
+static int hf_ff_sm_set_assign_info_req_clear_dup_detection_state;
 
-static int hf_ff_sm_set_assign_info_req = -1;
-static int hf_ff_sm_set_assign_info_req_dev_id = -1;
-static int hf_ff_sm_set_assign_info_req_pd_tag = -1;
-static int hf_ff_sm_set_assign_info_req_h1_new_addr = -1;
-static int hf_ff_sm_set_assign_info_req_lr_port = -1;
-static int hf_ff_sm_set_assign_info_req_hse_repeat_time = -1;
-static int hf_ff_sm_set_assign_info_req_dev_idx = -1;
-static int hf_ff_sm_set_assign_info_req_max_dev_idx = -1;
-static int hf_ff_sm_set_assign_info_req_operational_ip_addr = -1;
+static int hf_ff_sm_set_assign_info_req;
+static int hf_ff_sm_set_assign_info_req_dev_id;
+static int hf_ff_sm_set_assign_info_req_pd_tag;
+static int hf_ff_sm_set_assign_info_req_h1_new_addr;
+static int hf_ff_sm_set_assign_info_req_lr_port;
+static int hf_ff_sm_set_assign_info_req_hse_repeat_time;
+static int hf_ff_sm_set_assign_info_req_dev_idx;
+static int hf_ff_sm_set_assign_info_req_max_dev_idx;
+static int hf_ff_sm_set_assign_info_req_operational_ip_addr;
 
-static int hf_ff_sm_set_assign_info_rsp = -1;
-static int hf_ff_sm_set_assign_info_rsp_reserved = -1;
-static int hf_ff_sm_set_assign_info_rsp_max_dev_idx = -1;
-static int hf_ff_sm_set_assign_info_rsp_hse_repeat_time = -1;
+static int hf_ff_sm_set_assign_info_rsp;
+static int hf_ff_sm_set_assign_info_rsp_reserved;
+static int hf_ff_sm_set_assign_info_rsp_max_dev_idx;
+static int hf_ff_sm_set_assign_info_rsp_hse_repeat_time;
 
-static int hf_ff_sm_set_assign_info_err = -1;
-static int hf_ff_sm_set_assign_info_err_err_class = -1;
-static int hf_ff_sm_set_assign_info_err_err_code = -1;
-static int hf_ff_sm_set_assign_info_err_additional_code = -1;
-static int hf_ff_sm_set_assign_info_err_additional_desc = -1;
+static int hf_ff_sm_set_assign_info_err;
+static int hf_ff_sm_set_assign_info_err_err_class;
+static int hf_ff_sm_set_assign_info_err_err_code;
+static int hf_ff_sm_set_assign_info_err_additional_code;
+static int hf_ff_sm_set_assign_info_err_additional_desc;
 
-static gint ett_ff_sm_set_assign_info_req = -1;
-static gint ett_ff_sm_set_assign_info_req_dev_redundancy_state = -1;
-static gint ett_ff_sm_set_assign_info_req_clear_dup_detection_state = -1;
-static gint ett_ff_sm_set_assign_info_rsp = -1;
-static gint ett_ff_sm_set_assign_info_err = -1;
+static gint ett_ff_sm_set_assign_info_req;
+static gint ett_ff_sm_set_assign_info_req_dev_redundancy_state;
+static gint ett_ff_sm_set_assign_info_req_clear_dup_detection_state;
+static gint ett_ff_sm_set_assign_info_rsp;
+static gint ett_ff_sm_set_assign_info_err;
 
 
 
 /*
  * 6.5.2.6. SM Clear Assignment Info (Confirmed Service Id = 15)
  */
-static int hf_ff_sm_clear_assign_info = -1;
+static int hf_ff_sm_clear_assign_info;
 
-static int hf_ff_sm_clear_assign_info_req = -1;
-static int hf_ff_sm_clear_assign_info_req_dev_id = -1;
-static int hf_ff_sm_clear_assign_info_req_pd_tag = -1;
+static int hf_ff_sm_clear_assign_info_req;
+static int hf_ff_sm_clear_assign_info_req_dev_id;
+static int hf_ff_sm_clear_assign_info_req_pd_tag;
 
-static int hf_ff_sm_clear_assign_info_rsp = -1;
+static int hf_ff_sm_clear_assign_info_rsp;
 
-static int hf_ff_sm_clear_assign_info_err = -1;
-static int hf_ff_sm_clear_assign_info_err_err_class = -1;
-static int hf_ff_sm_clear_assign_info_err_err_code = -1;
-static int hf_ff_sm_clear_assign_info_err_additional_code = -1;
-static int hf_ff_sm_clear_assign_info_err_additional_desc = -1;
+static int hf_ff_sm_clear_assign_info_err;
+static int hf_ff_sm_clear_assign_info_err_err_class;
+static int hf_ff_sm_clear_assign_info_err_err_code;
+static int hf_ff_sm_clear_assign_info_err_additional_code;
+static int hf_ff_sm_clear_assign_info_err_additional_desc;
 
-static gint ett_ff_sm_clear_assign_info_req = -1;
-static gint ett_ff_sm_clear_assign_info_rsp = -1;
-static gint ett_ff_sm_clear_assign_info_err = -1;
+static gint ett_ff_sm_clear_assign_info_req;
+static gint ett_ff_sm_clear_assign_info_rsp;
+static gint ett_ff_sm_clear_assign_info_err;
 
 
 
 /*
  * 6.5.2.7. SM Device Annunciation (Unconfirmed Service Id = 16)
  */
-static int hf_ff_sm_dev_annunc = -1;
-
-static int hf_ff_sm_dev_annunc_req = -1;
-static int hf_ff_sm_dev_annunc_req_dev_idx = -1;
-static int hf_ff_sm_dev_annunc_req_max_dev_idx = -1;
-static int hf_ff_sm_dev_annunc_req_operational_ip_addr = -1;
-static int hf_ff_sm_dev_annunc_req_dev_id = -1;
-static int hf_ff_sm_dev_annunc_req_pd_tag = -1;
-static int hf_ff_sm_dev_annunc_req_hse_repeat_time = -1;
-static int hf_ff_sm_dev_annunc_req_lr_port = -1;
-static int hf_ff_sm_dev_annunc_req_reserved = -1;
-static int hf_ff_sm_dev_annunc_req_annunc_ver_num = -1;
-static int hf_ff_sm_dev_annunc_req_hse_dev_ver_num = -1;
-static int hf_ff_sm_dev_annunc_req_num_of_entries = -1;
-static int hf_ff_sm_dev_annunc_req_h1_live_list_h1_link_id = -1;
-static int hf_ff_sm_dev_annunc_req_h1_live_list_reserved = -1;
-static int hf_ff_sm_dev_annunc_req_h1_live_list_ver_num = -1;
-static int hf_ff_sm_dev_annunc_req_h1_node_addr_ver_num_h1_node_addr = -1;
-static int hf_ff_sm_dev_annunc_req_h1_node_addr_ver_num_ver_num = -1;
-static int hf_ff_sm_dev_annunc_req_smk_state_name = -1;
-static int hf_ff_sm_dev_annunc_req_smk_state_sync = -1;
-static int hf_ff_sm_dev_annunc_req_smk_state = -1;
-static int hf_ff_sm_dev_annunc_req_dev_type_link = -1;
-static int hf_ff_sm_dev_annunc_req_dev_type_iogateway = -1;
-static int hf_ff_sm_dev_annunc_req_dev_type_hse = -1;
-static int hf_ff_sm_dev_annunc_req_dev_type_h1 = -1;
-static int hf_ff_sm_dev_annunc_req_dev_type_reserved = -1;
-static int hf_ff_sm_dev_annunc_req_dev_type_redundant_caps = -1;
-static int hf_ff_sm_dev_annunc_req_dev_type = -1;
-static int hf_ff_sm_dev_annunc_req_dev_redundancy_state_reserved = -1;
-static int hf_ff_sm_dev_annunc_req_dev_redundancy_state_role = -1;
-static int hf_ff_sm_dev_annunc_req_dev_redundancy_state_type = -1;
-static int hf_ff_sm_dev_annunc_req_dev_redundancy_state = -1;
-static int hf_ff_sm_dev_annunc_req_dup_detection_state_reserved = -1;
-static int hf_ff_sm_dev_annunc_req_dup_detection_state_pd_tag = -1;
-static int hf_ff_sm_dev_annunc_req_dup_detection_state_device = -1;
-static int hf_ff_sm_dev_annunc_req_dup_detection_state = -1;
-
-static gint ett_ff_sm_dev_annunc_req = -1;
-static gint ett_ff_sm_dev_annunc_req_smk_state = -1;
-static gint ett_ff_sm_dev_annunc_req_dev_type = -1;
-static gint ett_ff_sm_dev_annunc_req_dev_redundancy_state = -1;
-static gint ett_ff_sm_dev_annunc_req_dup_detection_state = -1;
-static gint ett_ff_sm_dev_annunc_req_entries_h1_live_list = -1;
-static gint ett_ff_sm_dev_annunc_req_h1_live_list = -1;
-static gint ett_ff_sm_dev_annunc_req_entries_node_addr = -1;
-static gint ett_ff_sm_dev_annunc_req_h1_node_addr = -1;
+static int hf_ff_sm_dev_annunc;
+
+static int hf_ff_sm_dev_annunc_req;
+static int hf_ff_sm_dev_annunc_req_dev_idx;
+static int hf_ff_sm_dev_annunc_req_max_dev_idx;
+static int hf_ff_sm_dev_annunc_req_operational_ip_addr;
+static int hf_ff_sm_dev_annunc_req_dev_id;
+static int hf_ff_sm_dev_annunc_req_pd_tag;
+static int hf_ff_sm_dev_annunc_req_hse_repeat_time;
+static int hf_ff_sm_dev_annunc_req_lr_port;
+static int hf_ff_sm_dev_annunc_req_reserved;
+static int hf_ff_sm_dev_annunc_req_annunc_ver_num;
+static int hf_ff_sm_dev_annunc_req_hse_dev_ver_num;
+static int hf_ff_sm_dev_annunc_req_num_of_entries;
+static int hf_ff_sm_dev_annunc_req_h1_live_list_h1_link_id;
+static int hf_ff_sm_dev_annunc_req_h1_live_list_reserved;
+static int hf_ff_sm_dev_annunc_req_h1_live_list_ver_num;
+static int hf_ff_sm_dev_annunc_req_h1_node_addr_ver_num_h1_node_addr;
+static int hf_ff_sm_dev_annunc_req_h1_node_addr_ver_num_ver_num;
+static int hf_ff_sm_dev_annunc_req_smk_state_name;
+static int hf_ff_sm_dev_annunc_req_smk_state_sync;
+static int hf_ff_sm_dev_annunc_req_smk_state;
+static int hf_ff_sm_dev_annunc_req_dev_type_link;
+static int hf_ff_sm_dev_annunc_req_dev_type_iogateway;
+static int hf_ff_sm_dev_annunc_req_dev_type_hse;
+static int hf_ff_sm_dev_annunc_req_dev_type_h1;
+static int hf_ff_sm_dev_annunc_req_dev_type_reserved;
+static int hf_ff_sm_dev_annunc_req_dev_type_redundant_caps;
+static int hf_ff_sm_dev_annunc_req_dev_type;
+static int hf_ff_sm_dev_annunc_req_dev_redundancy_state_reserved;
+static int hf_ff_sm_dev_annunc_req_dev_redundancy_state_role;
+static int hf_ff_sm_dev_annunc_req_dev_redundancy_state_type;
+static int hf_ff_sm_dev_annunc_req_dev_redundancy_state;
+static int hf_ff_sm_dev_annunc_req_dup_detection_state_reserved;
+static int hf_ff_sm_dev_annunc_req_dup_detection_state_pd_tag;
+static int hf_ff_sm_dev_annunc_req_dup_detection_state_device;
+static int hf_ff_sm_dev_annunc_req_dup_detection_state;
+
+static gint ett_ff_sm_dev_annunc_req;
+static gint ett_ff_sm_dev_annunc_req_smk_state;
+static gint ett_ff_sm_dev_annunc_req_dev_type;
+static gint ett_ff_sm_dev_annunc_req_dev_redundancy_state;
+static gint ett_ff_sm_dev_annunc_req_dup_detection_state;
+static gint ett_ff_sm_dev_annunc_req_entries_h1_live_list;
+static gint ett_ff_sm_dev_annunc_req_h1_live_list;
+static gint ett_ff_sm_dev_annunc_req_entries_node_addr;
+static gint ett_ff_sm_dev_annunc_req_h1_node_addr;
 
 
 
 /*
  * 6.5.3. FMS Services
  */
-static int hf_ff_fms = -1;
+static int hf_ff_fms;
 
 
 
 /*
  * 6.5.3.2. FMS Initiate (Confirmed Service Id = 96)
  */
-static int hf_ff_fms_init = -1;
+static int hf_ff_fms_init;
 
-static int hf_ff_fms_init_req = -1;
-static int hf_ff_fms_init_req_conn_opt = -1;
-static int hf_ff_fms_init_req_access_protection_supported_calling = -1;
-static int hf_ff_fms_init_req_passwd_and_access_grps_calling = -1;
-static int hf_ff_fms_init_req_ver_od_calling = -1;
-static int hf_ff_fms_init_req_prof_num_calling = -1;
-static int hf_ff_fms_init_req_pd_tag = -1;
+static int hf_ff_fms_init_req;
+static int hf_ff_fms_init_req_conn_opt;
+static int hf_ff_fms_init_req_access_protection_supported_calling;
+static int hf_ff_fms_init_req_passwd_and_access_grps_calling;
+static int hf_ff_fms_init_req_ver_od_calling;
+static int hf_ff_fms_init_req_prof_num_calling;
+static int hf_ff_fms_init_req_pd_tag;
 
-static int hf_ff_fms_init_rsp = -1;
-static int hf_ff_fms_init_rsp_ver_od_called = -1;
-static int hf_ff_fms_init_rsp_prof_num_called = -1;
+static int hf_ff_fms_init_rsp;
+static int hf_ff_fms_init_rsp_ver_od_called;
+static int hf_ff_fms_init_rsp_prof_num_called;
 
-static int hf_ff_fms_init_err = -1;
-static int hf_ff_fms_init_err_err_class = -1;
-static int hf_ff_fms_init_err_err_code = -1;
-static int hf_ff_fms_init_err_additional_code = -1;
-static int hf_ff_fms_init_err_additional_desc = -1;
+static int hf_ff_fms_init_err;
+static int hf_ff_fms_init_err_err_class;
+static int hf_ff_fms_init_err_err_code;
+static int hf_ff_fms_init_err_additional_code;
+static int hf_ff_fms_init_err_additional_desc;
 
-static gint ett_ff_fms_init_req = -1;
-static gint ett_ff_fms_init_rep = -1;
-static gint ett_ff_fms_init_err = -1;
+static gint ett_ff_fms_init_req;
+static gint ett_ff_fms_init_rep;
+static gint ett_ff_fms_init_err;
 
 
 
 /*
  * 6.5.3.3. FMS Abort (Unconfirmed Service Id = 112)
  */
-static int hf_ff_fms_abort = -1;
+static int hf_ff_fms_abort;
 
-static int hf_ff_fms_abort_req = -1;
-static int hf_ff_fms_abort_req_detail = -1;
-static int hf_ff_fms_abort_req_abort_id = -1;
-static int hf_ff_fms_abort_req_reason_code = -1;
-static int hf_ff_fms_abort_req_reserved = -1;
+static int hf_ff_fms_abort_req;
+static int hf_ff_fms_abort_req_detail;
+static int hf_ff_fms_abort_req_abort_id;
+static int hf_ff_fms_abort_req_reason_code;
+static int hf_ff_fms_abort_req_reserved;
 
-static gint ett_ff_fms_abort_req = -1;
+static gint ett_ff_fms_abort_req;
 
 
 
 /*
  * 6.5.3.4. FMS Status (Confirmed Service Id = 0)
  */
-static int hf_ff_fms_status = -1;
+static int hf_ff_fms_status;
 
-static int hf_ff_fms_status_req = -1;
+static int hf_ff_fms_status_req;
 
-static int hf_ff_fms_status_rsp = -1;
-static int hf_ff_fms_status_rsp_logical_status = -1;
-static int hf_ff_fms_status_rsp_physical_status = -1;
-static int hf_ff_fms_status_rsp_reserved = -1;
-static int hf_ff_fms_status_rsp_local_detail = -1;
+static int hf_ff_fms_status_rsp;
+static int hf_ff_fms_status_rsp_logical_status;
+static int hf_ff_fms_status_rsp_physical_status;
+static int hf_ff_fms_status_rsp_reserved;
+static int hf_ff_fms_status_rsp_local_detail;
 
-static int hf_ff_fms_status_err = -1;
-static int hf_ff_fms_status_err_err_class = -1;
-static int hf_ff_fms_status_err_err_code = -1;
-static int hf_ff_fms_status_err_additional_code = -1;
-static int hf_ff_fms_status_err_additional_desc = -1;
+static int hf_ff_fms_status_err;
+static int hf_ff_fms_status_err_err_class;
+static int hf_ff_fms_status_err_err_code;
+static int hf_ff_fms_status_err_additional_code;
+static int hf_ff_fms_status_err_additional_desc;
 
-static gint ett_ff_fms_status_req = -1;
-static gint ett_ff_fms_status_rsp = -1;
-static gint ett_ff_fms_status_err = -1;
+static gint ett_ff_fms_status_req;
+static gint ett_ff_fms_status_rsp;
+static gint ett_ff_fms_status_err;
 
 
 
 /*
  * 6.5.3.5. FMS Unsolicited Status (Unconfirmed Service Id = 1)
  */
-static int hf_ff_fms_unsolicited_status = -1;
+static int hf_ff_fms_unsolicited_status;
 
-static int hf_ff_fms_unsolicited_status_req = -1;
-static int hf_ff_fms_unsolicited_status_req_logical_status = -1;
-static int hf_ff_fms_unsolicited_status_req_physical_status = -1;
-static int hf_ff_fms_unsolicited_status_req_reserved = -1;
-static int hf_ff_fms_unsolicited_status_req_local_detail = -1;
+static int hf_ff_fms_unsolicited_status_req;
+static int hf_ff_fms_unsolicited_status_req_logical_status;
+static int hf_ff_fms_unsolicited_status_req_physical_status;
+static int hf_ff_fms_unsolicited_status_req_reserved;
+static int hf_ff_fms_unsolicited_status_req_local_detail;
 
-static gint ett_ff_fms_unsolicited_status_req = -1;
+static gint ett_ff_fms_unsolicited_status_req;
 
 
 
 /*
  * 6.5.3.6. FMS Identify (Confirmed Service Id = 1)
  */
-static int hf_ff_fms_id = -1;
+static int hf_ff_fms_id;
 
-static int hf_ff_fms_id_req = -1;
+static int hf_ff_fms_id_req;
 
-static int hf_ff_fms_id_rsp = -1;
-static int hf_ff_fms_id_rsp_vendor_name = -1;
-static int hf_ff_fms_id_rsp_model_name = -1;
-static int hf_ff_fms_id_rsp_revision = -1;
+static int hf_ff_fms_id_rsp;
+static int hf_ff_fms_id_rsp_vendor_name;
+static int hf_ff_fms_id_rsp_model_name;
+static int hf_ff_fms_id_rsp_revision;
 
-static int hf_ff_fms_id_err = -1;
-static int hf_ff_fms_id_err_err_class = -1;
-static int hf_ff_fms_id_err_err_code = -1;
-static int hf_ff_fms_id_err_additional_code = -1;
-static int hf_ff_fms_id_err_additional_desc = -1;
+static int hf_ff_fms_id_err;
+static int hf_ff_fms_id_err_err_class;
+static int hf_ff_fms_id_err_err_code;
+static int hf_ff_fms_id_err_additional_code;
+static int hf_ff_fms_id_err_additional_desc;
 
-static gint ett_ff_fms_id_req = -1;
-static gint ett_ff_fms_id_rsp = -1;
-static gint ett_ff_fms_id_err = -1;
+static gint ett_ff_fms_id_req;
+static gint ett_ff_fms_id_rsp;
+static gint ett_ff_fms_id_err;
 
 
 
 /*
  * 6.5.3.7. FMS Get OD (Confirmed Service Id = 4)
  */
-static int hf_ff_fms_get_od = -1;
+static int hf_ff_fms_get_od;
 
-static int hf_ff_fms_get_od_req = -1;
-static int hf_ff_fms_get_od_req_all_attrs = -1;
-static int hf_ff_fms_get_od_req_start_idx_flag = -1;
-static int hf_ff_fms_get_od_req_reserved = -1;
-static int hf_ff_fms_get_od_req_idx = -1;
+static int hf_ff_fms_get_od_req;
+static int hf_ff_fms_get_od_req_all_attrs;
+static int hf_ff_fms_get_od_req_start_idx_flag;
+static int hf_ff_fms_get_od_req_reserved;
+static int hf_ff_fms_get_od_req_idx;
 
-static int hf_ff_fms_get_od_rsp = -1;
-static int hf_ff_fms_get_od_rsp_more_follows = -1;
-static int hf_ff_fms_get_od_rsp_num_of_obj_desc = -1;
-static int hf_ff_fms_get_od_rsp_reserved = -1;
-static int hf_ff_fms_get_od_rsp_object_descriptions = -1;
+static int hf_ff_fms_get_od_rsp;
+static int hf_ff_fms_get_od_rsp_more_follows;
+static int hf_ff_fms_get_od_rsp_num_of_obj_desc;
+static int hf_ff_fms_get_od_rsp_reserved;
+static int hf_ff_fms_get_od_rsp_object_descriptions;
 
-static int hf_ff_fms_get_od_err = -1;
-static int hf_ff_fms_get_od_err_err_class = -1;
-static int hf_ff_fms_get_od_err_err_code = -1;
-static int hf_ff_fms_get_od_err_additional_code = -1;
-static int hf_ff_fms_get_od_err_additional_desc = -1;
+static int hf_ff_fms_get_od_err;
+static int hf_ff_fms_get_od_err_err_class;
+static int hf_ff_fms_get_od_err_err_code;
+static int hf_ff_fms_get_od_err_additional_code;
+static int hf_ff_fms_get_od_err_additional_desc;
 
-static gint ett_ff_fms_get_od_req = -1;
-static gint ett_ff_fms_get_od_rsp = -1;
-static gint ett_ff_fms_get_od_err = -1;
+static gint ett_ff_fms_get_od_req;
+static gint ett_ff_fms_get_od_rsp;
+static gint ett_ff_fms_get_od_err;
 
 
 
 /*
  * 6.5.3.8. FMS Initiate Put OD (Confirmed Service Id = 28)
  */
-static int hf_ff_fms_init_put_od = -1;
+static int hf_ff_fms_init_put_od;
 
-static int hf_ff_fms_init_put_od_req = -1;
-static int hf_ff_fms_init_put_od_req_reserved = -1;
-static int hf_ff_fms_init_put_od_req_consequence = -1;
+static int hf_ff_fms_init_put_od_req;
+static int hf_ff_fms_init_put_od_req_reserved;
+static int hf_ff_fms_init_put_od_req_consequence;
 
-static int hf_ff_fms_init_put_od_rsp = -1;
+static int hf_ff_fms_init_put_od_rsp;
 
-static int hf_ff_fms_init_put_od_err = -1;
-static int hf_ff_fms_init_put_od_err_err_class = -1;
-static int hf_ff_fms_init_put_od_err_err_code = -1;
-static int hf_ff_fms_init_put_od_err_additional_code = -1;
-static int hf_ff_fms_init_put_od_err_additional_desc = -1;
+static int hf_ff_fms_init_put_od_err;
+static int hf_ff_fms_init_put_od_err_err_class;
+static int hf_ff_fms_init_put_od_err_err_code;
+static int hf_ff_fms_init_put_od_err_additional_code;
+static int hf_ff_fms_init_put_od_err_additional_desc;
 
-static gint ett_ff_fms_init_put_od_req = -1;
-static gint ett_ff_fms_init_put_od_rsp = -1;
-static gint ett_ff_fms_init_put_od_err = -1;
+static gint ett_ff_fms_init_put_od_req;
+static gint ett_ff_fms_init_put_od_rsp;
+static gint ett_ff_fms_init_put_od_err;
 
 
 
 /*
  * 6.5.3.9. FMS Put OD (Confirmed Service Id = 29)
  */
-static int hf_ff_fms_put_od = -1;
+static int hf_ff_fms_put_od;
 
-static int hf_ff_fms_put_od_req = -1;
-static int hf_ff_fms_put_od_req_num_of_obj_desc = -1;
-static int hf_ff_fms_put_od_req_object_descriptions = -1;
+static int hf_ff_fms_put_od_req;
+static int hf_ff_fms_put_od_req_num_of_obj_desc;
+static int hf_ff_fms_put_od_req_object_descriptions;
 
-static int hf_ff_fms_put_od_rsp = -1;
+static int hf_ff_fms_put_od_rsp;
 
-static int hf_ff_fms_put_od_err = -1;
-static int hf_ff_fms_put_od_err_err_class = -1;
-static int hf_ff_fms_put_od_err_err_code = -1;
-static int hf_ff_fms_put_od_err_additional_code = -1;
-static int hf_ff_fms_put_od_err_additional_desc = -1;
+static int hf_ff_fms_put_od_err;
+static int hf_ff_fms_put_od_err_err_class;
+static int hf_ff_fms_put_od_err_err_code;
+static int hf_ff_fms_put_od_err_additional_code;
+static int hf_ff_fms_put_od_err_additional_desc;
 
-static gint ett_ff_fms_put_od_req = -1;
-static gint ett_ff_fms_put_od_rsp = -1;
-static gint ett_ff_fms_put_od_err = -1;
+static gint ett_ff_fms_put_od_req;
+static gint ett_ff_fms_put_od_rsp;
+static gint ett_ff_fms_put_od_err;
 
 
 
 /*
  * 6.5.3.10. FMS Terminate Put OD (Confirmed Service Id = 30)
  */
-static int hf_ff_fms_terminate_put_od = -1;
+static int hf_ff_fms_terminate_put_od;
 
-static int hf_ff_fms_terminate_put_od_req = -1;
+static int hf_ff_fms_terminate_put_od_req;
 
-static int hf_ff_fms_terminate_put_od_rsp = -1;
+static int hf_ff_fms_terminate_put_od_rsp;
 
-static int hf_ff_fms_terminate_put_od_err = -1;
-static int hf_ff_fms_terminate_put_od_err_index = -1;
-static int hf_ff_fms_terminate_put_od_err_err_class = -1;
-static int hf_ff_fms_terminate_put_od_err_err_code = -1;
-static int hf_ff_fms_terminate_put_od_err_additional_code = -1;
-static int hf_ff_fms_terminate_put_od_err_additional_desc = -1;
+static int hf_ff_fms_terminate_put_od_err;
+static int hf_ff_fms_terminate_put_od_err_index;
+static int hf_ff_fms_terminate_put_od_err_err_class;
+static int hf_ff_fms_terminate_put_od_err_err_code;
+static int hf_ff_fms_terminate_put_od_err_additional_code;
+static int hf_ff_fms_terminate_put_od_err_additional_desc;
 
-static gint ett_ff_fms_terminate_put_od_req = -1;
-static gint ett_ff_fms_terminate_put_od_rsp = -1;
-static gint ett_ff_fms_terminate_put_od_err = -1;
+static gint ett_ff_fms_terminate_put_od_req;
+static gint ett_ff_fms_terminate_put_od_rsp;
+static gint ett_ff_fms_terminate_put_od_err;
 
 
 
 /*
  * 6.5.3.11. FMS Generic Initiate Download Sequence (Confirmed Service Id = 31)
  */
-static int hf_ff_fms_gen_init_download_seq = -1;
+static int hf_ff_fms_gen_init_download_seq;
 
-static int hf_ff_fms_gen_init_download_seq_req = -1;
-static int hf_ff_fms_gen_init_download_seq_req_idx = -1;
+static int hf_ff_fms_gen_init_download_seq_req;
+static int hf_ff_fms_gen_init_download_seq_req_idx;
 
-static int hf_ff_fms_gen_init_download_seq_rsp = -1;
+static int hf_ff_fms_gen_init_download_seq_rsp;
 
-static int hf_ff_fms_gen_init_download_seq_err = -1;
-static int hf_ff_fms_gen_init_download_seq_err_err_class = -1;
-static int hf_ff_fms_gen_init_download_seq_err_err_code = -1;
-static int hf_ff_fms_gen_init_download_seq_err_additional_code = -1;
-static int hf_ff_fms_gen_init_download_seq_err_additional_desc = -1;
+static int hf_ff_fms_gen_init_download_seq_err;
+static int hf_ff_fms_gen_init_download_seq_err_err_class;
+static int hf_ff_fms_gen_init_download_seq_err_err_code;
+static int hf_ff_fms_gen_init_download_seq_err_additional_code;
+static int hf_ff_fms_gen_init_download_seq_err_additional_desc;
 
-static gint ett_ff_fms_gen_init_download_seq_req = -1;
-static gint ett_ff_fms_gen_init_download_seq_rep = -1;
-static gint ett_ff_fms_gen_init_download_seq_err = -1;
+static gint ett_ff_fms_gen_init_download_seq_req;
+static gint ett_ff_fms_gen_init_download_seq_rep;
+static gint ett_ff_fms_gen_init_download_seq_err;
 
 
 
 /*
  * 6.5.3.12. FMS Generic Download Segment (Confirmed Service Id = 32)
  */
-static int hf_ff_fms_gen_download_seg = -1;
+static int hf_ff_fms_gen_download_seg;
 
-static int hf_ff_fms_gen_download_seg_req = -1;
-static int hf_ff_fms_gen_download_seg_req_idx = -1;
-static int hf_ff_fms_gen_download_seg_req_more_follows = -1;
-static int hf_ff_fms_gen_download_seg_req_load_data = -1;
+static int hf_ff_fms_gen_download_seg_req;
+static int hf_ff_fms_gen_download_seg_req_idx;
+static int hf_ff_fms_gen_download_seg_req_more_follows;
+static int hf_ff_fms_gen_download_seg_req_load_data;
 
-static int hf_ff_fms_gen_download_seg_rsp = -1;
+static int hf_ff_fms_gen_download_seg_rsp;
 
-static int hf_ff_fms_gen_download_seg_err = -1;
-static int hf_ff_fms_gen_download_seg_err_err_class = -1;
-static int hf_ff_fms_gen_download_seg_err_err_code = -1;
-static int hf_ff_fms_gen_download_seg_err_additional_code = -1;
-static int hf_ff_fms_gen_download_seg_err_additional_desc = -1;
+static int hf_ff_fms_gen_download_seg_err;
+static int hf_ff_fms_gen_download_seg_err_err_class;
+static int hf_ff_fms_gen_download_seg_err_err_code;
+static int hf_ff_fms_gen_download_seg_err_additional_code;
+static int hf_ff_fms_gen_download_seg_err_additional_desc;
 
-static gint ett_ff_fms_gen_download_seg_req = -1;
-static gint ett_ff_fms_gen_download_seg_rsp = -1;
-static gint ett_ff_fms_gen_download_seg_err = -1;
+static gint ett_ff_fms_gen_download_seg_req;
+static gint ett_ff_fms_gen_download_seg_rsp;
+static gint ett_ff_fms_gen_download_seg_err;
 
 
 
 /*
  * 6.5.3.13. FMS Generic Terminate Download Sequence (Confirmed Service Id = 33)
  */
-static int hf_ff_fms_gen_terminate_download_seq = -1;
+static int hf_ff_fms_gen_terminate_download_seq;
 
-static int hf_ff_fms_gen_terminate_download_seq_req = -1;
-static int hf_ff_fms_gen_terminate_download_seq_req_idx = -1;
+static int hf_ff_fms_gen_terminate_download_seq_req;
+static int hf_ff_fms_gen_terminate_download_seq_req_idx;
 
-static int hf_ff_fms_gen_terminate_download_seq_rsp = -1;
-static int hf_ff_fms_gen_terminate_download_seq_rsp_final_result = -1;
+static int hf_ff_fms_gen_terminate_download_seq_rsp;
+static int hf_ff_fms_gen_terminate_download_seq_rsp_final_result;
 
-static int hf_ff_fms_gen_terminate_download_seq_err = -1;
-static int hf_ff_fms_gen_terminate_download_seq_err_err_class = -1;
-static int hf_ff_fms_gen_terminate_download_seq_err_err_code = -1;
-static int hf_ff_fms_gen_terminate_download_seq_err_additional_code = -1;
-static int hf_ff_fms_gen_terminate_download_seq_err_additional_desc = -1;
+static int hf_ff_fms_gen_terminate_download_seq_err;
+static int hf_ff_fms_gen_terminate_download_seq_err_err_class;
+static int hf_ff_fms_gen_terminate_download_seq_err_err_code;
+static int hf_ff_fms_gen_terminate_download_seq_err_additional_code;
+static int hf_ff_fms_gen_terminate_download_seq_err_additional_desc;
 
-static gint ett_ff_fms_gen_terminate_download_seq_req = -1;
-static gint ett_ff_fms_gen_terminate_download_seq_rsp = -1;
-static gint ett_ff_fms_gen_terminate_download_seq_err = -1;
+static gint ett_ff_fms_gen_terminate_download_seq_req;
+static gint ett_ff_fms_gen_terminate_download_seq_rsp;
+static gint ett_ff_fms_gen_terminate_download_seq_err;
 
 
 
 /*
  * 6.5.3.14. FMS Initiate Download Sequence (Confirmed Service Id = 9)
  */
-static int hf_ff_fms_init_download_seq = -1;
+static int hf_ff_fms_init_download_seq;
 
-static int hf_ff_fms_init_download_seq_req = -1;
-static int hf_ff_fms_init_download_seq_req_idx = -1;
+static int hf_ff_fms_init_download_seq_req;
+static int hf_ff_fms_init_download_seq_req_idx;
 
-static int hf_ff_fms_init_download_seq_rsp = -1;
+static int hf_ff_fms_init_download_seq_rsp;
 
-static int hf_ff_fms_init_download_seq_err = -1;
-static int hf_ff_fms_init_download_seq_err_err_class = -1;
-static int hf_ff_fms_init_download_seq_err_err_code = -1;
-static int hf_ff_fms_init_download_seq_err_additional_code = -1;
-static int hf_ff_fms_init_download_seq_err_additional_desc = -1;
+static int hf_ff_fms_init_download_seq_err;
+static int hf_ff_fms_init_download_seq_err_err_class;
+static int hf_ff_fms_init_download_seq_err_err_code;
+static int hf_ff_fms_init_download_seq_err_additional_code;
+static int hf_ff_fms_init_download_seq_err_additional_desc;
 
-static gint ett_ff_fms_init_download_seq_req = -1;
-static gint ett_ff_fms_init_download_seq_rsp = -1;
-static gint ett_ff_fms_init_download_seq_err = -1;
+static gint ett_ff_fms_init_download_seq_req;
+static gint ett_ff_fms_init_download_seq_rsp;
+static gint ett_ff_fms_init_download_seq_err;
 
 
 
 /*
  * 6.5.3.15. FMS Download Segment (Confirmed Service Id = 10)
  */
-static int hf_ff_fms_download_seg = -1;
-static int hf_ff_fms_download_seg_req = -1;
-static int hf_ff_fms_download_seg_req_idx = -1;
+static int hf_ff_fms_download_seg;
+static int hf_ff_fms_download_seg_req;
+static int hf_ff_fms_download_seg_req_idx;
 
-static int hf_ff_fms_download_seg_rsp = -1;
-static int hf_ff_fms_download_seg_rsp_more_follows = -1;
-static int hf_ff_fms_download_seg_rsp_load_data = -1;
+static int hf_ff_fms_download_seg_rsp;
+static int hf_ff_fms_download_seg_rsp_more_follows;
+static int hf_ff_fms_download_seg_rsp_load_data;
 
-static int hf_ff_fms_download_seg_err = -1;
-static int hf_ff_fms_download_seg_err_err_class = -1;
-static int hf_ff_fms_download_seg_err_err_code = -1;
-static int hf_ff_fms_download_seg_err_additional_code = -1;
-static int hf_ff_fms_download_seg_err_additional_desc = -1;
+static int hf_ff_fms_download_seg_err;
+static int hf_ff_fms_download_seg_err_err_class;
+static int hf_ff_fms_download_seg_err_err_code;
+static int hf_ff_fms_download_seg_err_additional_code;
+static int hf_ff_fms_download_seg_err_additional_desc;
 
-static gint ett_ff_fms_download_seg_req = -1;
-static gint ett_ff_fms_download_seg_rsp = -1;
-static gint ett_ff_fms_download_seg_err = -1;
+static gint ett_ff_fms_download_seg_req;
+static gint ett_ff_fms_download_seg_rsp;
+static gint ett_ff_fms_download_seg_err;
 
 
 
 /*
  * 6.5.3.16. FMS Terminate Download Sequence (Confirmed Service Id = 11)
  */
-static int hf_ff_fms_terminate_download_seq = -1;
+static int hf_ff_fms_terminate_download_seq;
 
-static int hf_ff_fms_terminate_download_seq_req = -1;
-static int hf_ff_fms_terminate_download_seq_req_idx = -1;
-static int hf_ff_fms_terminate_download_seq_req_final_result = -1;
+static int hf_ff_fms_terminate_download_seq_req;
+static int hf_ff_fms_terminate_download_seq_req_idx;
+static int hf_ff_fms_terminate_download_seq_req_final_result;
 
-static int hf_ff_fms_terminate_download_seq_rsp = -1;
+static int hf_ff_fms_terminate_download_seq_rsp;
 
-static int hf_ff_fms_terminate_download_seq_err = -1;
-static int hf_ff_fms_terminate_download_seq_err_err_class = -1;
-static int hf_ff_fms_terminate_download_seq_err_err_code = -1;
-static int hf_ff_fms_terminate_download_seq_err_additional_code = -1;
-static int hf_ff_fms_terminate_download_seq_err_additional_desc = -1;
+static int hf_ff_fms_terminate_download_seq_err;
+static int hf_ff_fms_terminate_download_seq_err_err_class;
+static int hf_ff_fms_terminate_download_seq_err_err_code;
+static int hf_ff_fms_terminate_download_seq_err_additional_code;
+static int hf_ff_fms_terminate_download_seq_err_additional_desc;
 
-static gint ett_ff_fms_terminate_download_seq_req = -1;
-static gint ett_ff_fms_terminate_download_seq_rsp = -1;
-static gint ett_ff_fms_terminate_download_seq_err = -1;
+static gint ett_ff_fms_terminate_download_seq_req;
+static gint ett_ff_fms_terminate_download_seq_rsp;
+static gint ett_ff_fms_terminate_download_seq_err;
 
 
 
 /*
  * 6.5.3.17. FMS Initiate Upload Sequence (Confirmed Service Id = 12)
  */
-static int hf_ff_fms_init_upload_seq = -1;
+static int hf_ff_fms_init_upload_seq;
 
-static int hf_ff_fms_init_upload_seq_req = -1;
-static int hf_ff_fms_init_upload_seq_req_idx = -1;
+static int hf_ff_fms_init_upload_seq_req;
+static int hf_ff_fms_init_upload_seq_req_idx;
 
-static int hf_ff_fms_init_upload_seq_rsp = -1;
+static int hf_ff_fms_init_upload_seq_rsp;
 
-static int hf_ff_fms_init_upload_seq_err = -1;
-static int hf_ff_fms_init_upload_seq_err_err_class = -1;
-static int hf_ff_fms_init_upload_seq_err_err_code = -1;
-static int hf_ff_fms_init_upload_seq_err_additional_code = -1;
-static int hf_ff_fms_init_upload_seq_err_additional_desc = -1;
+static int hf_ff_fms_init_upload_seq_err;
+static int hf_ff_fms_init_upload_seq_err_err_class;
+static int hf_ff_fms_init_upload_seq_err_err_code;
+static int hf_ff_fms_init_upload_seq_err_additional_code;
+static int hf_ff_fms_init_upload_seq_err_additional_desc;
 
-static gint ett_ff_fms_init_upload_seq_req = -1;
-static gint ett_ff_fms_init_upload_seq_rsp = -1;
-static gint ett_ff_fms_init_upload_seq_err = -1;
+static gint ett_ff_fms_init_upload_seq_req;
+static gint ett_ff_fms_init_upload_seq_rsp;
+static gint ett_ff_fms_init_upload_seq_err;
 
 
 
 /*
  * 6.5.3.18. FMS Upload Segment (Confirmed Service Id = 13)
  */
-static int hf_ff_fms_upload_seg = -1;
+static int hf_ff_fms_upload_seg;
 
-static int hf_ff_fms_upload_seg_req = -1;
-static int hf_ff_fms_upload_seg_req_idx = -1;
+static int hf_ff_fms_upload_seg_req;
+static int hf_ff_fms_upload_seg_req_idx;
 
-static int hf_ff_fms_upload_seg_rsp = -1;
-static int hf_ff_fms_upload_seg_rsp_more_follows = -1;
-static int hf_ff_fms_upload_seg_rsp_final_result = -1;
+static int hf_ff_fms_upload_seg_rsp;
+static int hf_ff_fms_upload_seg_rsp_more_follows;
+static int hf_ff_fms_upload_seg_rsp_final_result;
 
-static int hf_ff_fms_upload_seg_err = -1;
-static int hf_ff_fms_upload_seg_err_err_class = -1;
-static int hf_ff_fms_upload_seg_err_err_code = -1;
-static int hf_ff_fms_upload_seg_err_additional_code = -1;
-static int hf_ff_fms_upload_seg_err_additional_desc = -1;
+static int hf_ff_fms_upload_seg_err;
+static int hf_ff_fms_upload_seg_err_err_class;
+static int hf_ff_fms_upload_seg_err_err_code;
+static int hf_ff_fms_upload_seg_err_additional_code;
+static int hf_ff_fms_upload_seg_err_additional_desc;
 
-static gint ett_ff_fms_upload_seg_req = -1;
-static gint ett_ff_fms_upload_seg_rsp = -1;
-static gint ett_ff_fms_upload_seg_err = -1;
+static gint ett_ff_fms_upload_seg_req;
+static gint ett_ff_fms_upload_seg_rsp;
+static gint ett_ff_fms_upload_seg_err;
 
 
 
 /*
  * 6.5.3.19. FMS Terminate Upload Sequence (Confirmed Service Id = 14)
  */
-static int hf_ff_fms_terminate_upload_seq = -1;
+static int hf_ff_fms_terminate_upload_seq;
 
-static int hf_ff_fms_terminate_upload_seq_req = -1;
-static int hf_ff_fms_terminate_upload_seq_req_idx = -1;
+static int hf_ff_fms_terminate_upload_seq_req;
+static int hf_ff_fms_terminate_upload_seq_req_idx;
 
-static int hf_ff_fms_terminate_upload_seq_rsp = -1;
+static int hf_ff_fms_terminate_upload_seq_rsp;
 
-static int hf_ff_fms_terminate_upload_seq_err = -1;
-static int hf_ff_fms_terminate_upload_seq_err_err_class = -1;
-static int hf_ff_fms_terminate_upload_seq_err_err_code = -1;
-static int hf_ff_fms_terminate_upload_seq_err_additional_code = -1;
-static int hf_ff_fms_terminate_upload_seq_err_additional_desc = -1;
+static int hf_ff_fms_terminate_upload_seq_err;
+static int hf_ff_fms_terminate_upload_seq_err_err_class;
+static int hf_ff_fms_terminate_upload_seq_err_err_code;
+static int hf_ff_fms_terminate_upload_seq_err_additional_code;
+static int hf_ff_fms_terminate_upload_seq_err_additional_desc;
 
-static gint ett_ff_fms_terminate_upload_seq_req = -1;
-static gint ett_ff_fms_terminate_upload_seq_rsp = -1;
-static gint ett_ff_fms_terminate_upload_seq_err = -1;
+static gint ett_ff_fms_terminate_upload_seq_req;
+static gint ett_ff_fms_terminate_upload_seq_rsp;
+static gint ett_ff_fms_terminate_upload_seq_err;
 
 
 
 /*
  * 6.5.3.20. FMS Request Domain Download (Confirmed Service Id = 15)
  */
-static int hf_ff_fms_req_dom_download = -1;
+static int hf_ff_fms_req_dom_download;
 
-static int hf_ff_fms_req_dom_download_req = -1;
-static int hf_ff_fms_req_dom_download_req_idx = -1;
-static int hf_ff_fms_req_dom_download_req_additional_info = -1;
+static int hf_ff_fms_req_dom_download_req;
+static int hf_ff_fms_req_dom_download_req_idx;
+static int hf_ff_fms_req_dom_download_req_additional_info;
 
-static int hf_ff_fms_req_dom_download_rsp = -1;
+static int hf_ff_fms_req_dom_download_rsp;
 
-static int hf_ff_fms_req_dom_download_err = -1;
-static int hf_ff_fms_req_dom_download_err_err_class = -1;
-static int hf_ff_fms_req_dom_download_err_err_code = -1;
-static int hf_ff_fms_req_dom_download_err_additional_code = -1;
-static int hf_ff_fms_req_dom_download_err_additional_desc = -1;
+static int hf_ff_fms_req_dom_download_err;
+static int hf_ff_fms_req_dom_download_err_err_class;
+static int hf_ff_fms_req_dom_download_err_err_code;
+static int hf_ff_fms_req_dom_download_err_additional_code;
+static int hf_ff_fms_req_dom_download_err_additional_desc;
 
-static gint ett_ff_fms_req_dom_download_req = -1;
-static gint ett_ff_fms_req_dom_download_rsp = -1;
-static gint ett_ff_fms_req_dom_download_err = -1;
+static gint ett_ff_fms_req_dom_download_req;
+static gint ett_ff_fms_req_dom_download_rsp;
+static gint ett_ff_fms_req_dom_download_err;
 
 
 
 /*
  * 6.5.3.21. FMS Request Domain Upload (Confirmed Service Id = 16)
  */
-static int hf_ff_fms_req_dom_upload = -1;
+static int hf_ff_fms_req_dom_upload;
 
-static int hf_ff_fms_req_dom_upload_req = -1;
-static int hf_ff_fms_req_dom_upload_req_idx = -1;
-static int hf_ff_fms_req_dom_upload_req_additional_info = -1;
+static int hf_ff_fms_req_dom_upload_req;
+static int hf_ff_fms_req_dom_upload_req_idx;
+static int hf_ff_fms_req_dom_upload_req_additional_info;
 
-static int hf_ff_fms_req_dom_upload_rsp = -1;
+static int hf_ff_fms_req_dom_upload_rsp;
 
-static int hf_ff_fms_req_dom_upload_err = -1;
-static int hf_ff_fms_req_dom_upload_err_err_class = -1;
-static int hf_ff_fms_req_dom_upload_err_err_code = -1;
-static int hf_ff_fms_req_dom_upload_err_additional_code = -1;
-static int hf_ff_fms_req_dom_upload_err_additional_desc = -1;
+static int hf_ff_fms_req_dom_upload_err;
+static int hf_ff_fms_req_dom_upload_err_err_class;
+static int hf_ff_fms_req_dom_upload_err_err_code;
+static int hf_ff_fms_req_dom_upload_err_additional_code;
+static int hf_ff_fms_req_dom_upload_err_additional_desc;
 
-static gint ett_ff_fms_req_dom_upload_req = -1;
-static gint ett_ff_fms_req_dom_upload_rsp = -1;
-static gint ett_ff_fms_req_dom_upload_err = -1;
+static gint ett_ff_fms_req_dom_upload_req;
+static gint ett_ff_fms_req_dom_upload_rsp;
+static gint ett_ff_fms_req_dom_upload_err;
 
 
 
 /*
  * 6.5.3.22. FMS Create Program Invocation (Confirmed Service Id = 17)
  */
-static int hf_ff_fms_create_pi = -1;
+static int hf_ff_fms_create_pi;
 
-static int hf_ff_fms_create_pi_req = -1;
-static int hf_ff_fms_create_pi_req_reusable = -1;
-static int hf_ff_fms_create_pi_req_reserved = -1;
-static int hf_ff_fms_create_pi_req_num_of_dom_idxes = -1;
-static int hf_ff_fms_create_pi_req_dom_idx = -1;
+static int hf_ff_fms_create_pi_req;
+static int hf_ff_fms_create_pi_req_reusable;
+static int hf_ff_fms_create_pi_req_reserved;
+static int hf_ff_fms_create_pi_req_num_of_dom_idxes;
+static int hf_ff_fms_create_pi_req_dom_idx;
 
-static int hf_ff_fms_create_pi_rsp = -1;
-static int hf_ff_fms_create_pi_rsp_idx = -1;
+static int hf_ff_fms_create_pi_rsp;
+static int hf_ff_fms_create_pi_rsp_idx;
 
-static int hf_ff_fms_create_pi_err = -1;
-static int hf_ff_fms_create_pi_err_err_class = -1;
-static int hf_ff_fms_create_pi_err_err_code = -1;
-static int hf_ff_fms_create_pi_err_additional_code = -1;
-static int hf_ff_fms_create_pi_err_additional_desc = -1;
+static int hf_ff_fms_create_pi_err;
+static int hf_ff_fms_create_pi_err_err_class;
+static int hf_ff_fms_create_pi_err_err_code;
+static int hf_ff_fms_create_pi_err_additional_code;
+static int hf_ff_fms_create_pi_err_additional_desc;
 
-static gint ett_ff_fms_create_pi_req = -1;
-static gint ett_ff_fms_create_pi_req_list_of_dom_idxes = -1;
-static gint ett_ff_fms_create_pi_rsp = -1;
-static gint ett_ff_fms_create_pi_err = -1;
+static gint ett_ff_fms_create_pi_req;
+static gint ett_ff_fms_create_pi_req_list_of_dom_idxes;
+static gint ett_ff_fms_create_pi_rsp;
+static gint ett_ff_fms_create_pi_err;
 
 
 
 /*
  * 6.5.3.23. FMS Delete Program Invocation (Confirmed Service Id = 18)
  */
-static int hf_ff_fms_del_pi = -1;
-static int hf_ff_fms_del_pi_req = -1;
-static int hf_ff_fms_del_pi_req_idx = -1;
+static int hf_ff_fms_del_pi;
+static int hf_ff_fms_del_pi_req;
+static int hf_ff_fms_del_pi_req_idx;
 
-static int hf_ff_fms_del_pi_rsp = -1;
+static int hf_ff_fms_del_pi_rsp;
 
-static int hf_ff_fms_del_pi_err = -1;
-static int hf_ff_fms_del_pi_err_err_class = -1;
-static int hf_ff_fms_del_pi_err_err_code = -1;
-static int hf_ff_fms_del_pi_err_additional_code = -1;
-static int hf_ff_fms_del_pi_err_additional_desc = -1;
+static int hf_ff_fms_del_pi_err;
+static int hf_ff_fms_del_pi_err_err_class;
+static int hf_ff_fms_del_pi_err_err_code;
+static int hf_ff_fms_del_pi_err_additional_code;
+static int hf_ff_fms_del_pi_err_additional_desc;
 
-static gint ett_ff_fms_del_pi_req = -1;
-static gint ett_ff_fms_del_pi_rsp = -1;
-static gint ett_ff_fms_del_pi_err = -1;
+static gint ett_ff_fms_del_pi_req;
+static gint ett_ff_fms_del_pi_rsp;
+static gint ett_ff_fms_del_pi_err;
 
 
 
 /*
  * 6.5.3.24. FMS Start (Confirmed Service Id = 19)
  */
-static int hf_ff_fms_start = -1;
-static int hf_ff_fms_start_req = -1;
-static int hf_ff_fms_start_req_idx = -1;
-static int hf_ff_fms_start_req_execution_argument = -1;
+static int hf_ff_fms_start;
+static int hf_ff_fms_start_req;
+static int hf_ff_fms_start_req_idx;
+static int hf_ff_fms_start_req_execution_argument;
 
-static int hf_ff_fms_start_rsp = -1;
+static int hf_ff_fms_start_rsp;
 
-static int hf_ff_fms_start_err = -1;
-static int hf_ff_fms_start_err_pi_state = -1;
-static int hf_ff_fms_start_err_err_class = -1;
-static int hf_ff_fms_start_err_err_code = -1;
-static int hf_ff_fms_start_err_additional_code = -1;
-static int hf_ff_fms_start_err_additional_desc = -1;
+static int hf_ff_fms_start_err;
+static int hf_ff_fms_start_err_pi_state;
+static int hf_ff_fms_start_err_err_class;
+static int hf_ff_fms_start_err_err_code;
+static int hf_ff_fms_start_err_additional_code;
+static int hf_ff_fms_start_err_additional_desc;
 
-static gint ett_ff_fms_start_req = -1;
-static gint ett_ff_fms_start_rsp = -1;
-static gint ett_ff_fms_start_err = -1;
+static gint ett_ff_fms_start_req;
+static gint ett_ff_fms_start_rsp;
+static gint ett_ff_fms_start_err;
 
 
 
 /*
  * 6.5.3.25. FMS Stop (Confirmed Service Id = 20)
  */
-static int hf_ff_fms_stop = -1;
+static int hf_ff_fms_stop;
 
-static int hf_ff_fms_stop_req = -1;
-static int hf_ff_fms_stop_req_idx = -1;
+static int hf_ff_fms_stop_req;
+static int hf_ff_fms_stop_req_idx;
 
-static int hf_ff_fms_stop_rsp = -1;
+static int hf_ff_fms_stop_rsp;
 
-static int hf_ff_fms_stop_err = -1;
-static int hf_ff_fms_stop_err_pi_state = -1;
-static int hf_ff_fms_stop_err_err_class = -1;
-static int hf_ff_fms_stop_err_err_code = -1;
-static int hf_ff_fms_stop_err_additional_code = -1;
-static int hf_ff_fms_stop_err_additional_desc = -1;
+static int hf_ff_fms_stop_err;
+static int hf_ff_fms_stop_err_pi_state;
+static int hf_ff_fms_stop_err_err_class;
+static int hf_ff_fms_stop_err_err_code;
+static int hf_ff_fms_stop_err_additional_code;
+static int hf_ff_fms_stop_err_additional_desc;
 
-static gint ett_ff_fms_stop_req = -1;
-static gint ett_ff_fms_stop_rsp = -1;
-static gint ett_ff_fms_stop_err = -1;
+static gint ett_ff_fms_stop_req;
+static gint ett_ff_fms_stop_rsp;
+static gint ett_ff_fms_stop_err;
 
 
 
 /*
  * 6.5.3.26. FMS Resume (Confirmed Service Id = 21)
  */
-static int hf_ff_fms_resume = -1;
-static int hf_ff_fms_resume_req = -1;
-static int hf_ff_fms_resume_req_idx = -1;
-static int hf_ff_fms_resume_req_execution_argument = -1;
+static int hf_ff_fms_resume;
+static int hf_ff_fms_resume_req;
+static int hf_ff_fms_resume_req_idx;
+static int hf_ff_fms_resume_req_execution_argument;
 
-static int hf_ff_fms_resume_rsp = -1;
+static int hf_ff_fms_resume_rsp;
 
-static int hf_ff_fms_resume_err = -1;
-static int hf_ff_fms_resume_err_pi_state = -1;
-static int hf_ff_fms_resume_err_err_class = -1;
-static int hf_ff_fms_resume_err_err_code = -1;
-static int hf_ff_fms_resume_err_additional_code = -1;
-static int hf_ff_fms_resume_err_additional_desc = -1;
+static int hf_ff_fms_resume_err;
+static int hf_ff_fms_resume_err_pi_state;
+static int hf_ff_fms_resume_err_err_class;
+static int hf_ff_fms_resume_err_err_code;
+static int hf_ff_fms_resume_err_additional_code;
+static int hf_ff_fms_resume_err_additional_desc;
 
-static gint ett_ff_fms_resume_req = -1;
-static gint ett_ff_fms_resume_rsp = -1;
-static gint ett_ff_fms_resume_err = -1;
+static gint ett_ff_fms_resume_req;
+static gint ett_ff_fms_resume_rsp;
+static gint ett_ff_fms_resume_err;
 
 
 
 /*
  * 6.5.3.27. FMS Reset (Confirmed Service Id = 22)
  */
-static int hf_ff_fms_reset = -1;
-static int hf_ff_fms_reset_req = -1;
-static int hf_ff_fms_reset_req_idx = -1;
+static int hf_ff_fms_reset;
+static int hf_ff_fms_reset_req;
+static int hf_ff_fms_reset_req_idx;
 
-static int hf_ff_fms_reset_rsp = -1;
+static int hf_ff_fms_reset_rsp;
 
-static int hf_ff_fms_reset_err = -1;
-static int hf_ff_fms_reset_err_pi_state = -1;
-static int hf_ff_fms_reset_err_err_class = -1;
-static int hf_ff_fms_reset_err_err_code = -1;
-static int hf_ff_fms_reset_err_additional_code = -1;
-static int hf_ff_fms_reset_err_additional_desc = -1;
+static int hf_ff_fms_reset_err;
+static int hf_ff_fms_reset_err_pi_state;
+static int hf_ff_fms_reset_err_err_class;
+static int hf_ff_fms_reset_err_err_code;
+static int hf_ff_fms_reset_err_additional_code;
+static int hf_ff_fms_reset_err_additional_desc;
 
-static gint ett_ff_fms_reset_req = -1;
-static gint ett_ff_fms_reset_rsp = -1;
-static gint ett_ff_fms_reset_err = -1;
+static gint ett_ff_fms_reset_req;
+static gint ett_ff_fms_reset_rsp;
+static gint ett_ff_fms_reset_err;
 
 
 
 /*
  * 6.5.3.28. FMS Kill (Confirmed Service Id = 23)
  */
-static int hf_ff_fms_kill = -1;
-static int hf_ff_fms_kill_req = -1;
-static int hf_ff_fms_kill_req_idx = -1;
+static int hf_ff_fms_kill;
+static int hf_ff_fms_kill_req;
+static int hf_ff_fms_kill_req_idx;
 
-static int hf_ff_fms_kill_rsp = -1;
+static int hf_ff_fms_kill_rsp;
 
-static int hf_ff_fms_kill_err = -1;
-static int hf_ff_fms_kill_err_err_class = -1;
-static int hf_ff_fms_kill_err_err_code = -1;
-static int hf_ff_fms_kill_err_additional_code = -1;
-static int hf_ff_fms_kill_err_additional_desc = -1;
+static int hf_ff_fms_kill_err;
+static int hf_ff_fms_kill_err_err_class;
+static int hf_ff_fms_kill_err_err_code;
+static int hf_ff_fms_kill_err_additional_code;
+static int hf_ff_fms_kill_err_additional_desc;
 
-static gint ett_ff_fms_kill_req = -1;
-static gint ett_ff_fms_kill_rsp = -1;
-static gint ett_ff_fms_kill_err = -1;
+static gint ett_ff_fms_kill_req;
+static gint ett_ff_fms_kill_rsp;
+static gint ett_ff_fms_kill_err;
 
 
 
 /*
  * 6.5.3.29. FMS Read (Confirmed Service Id = 2)
  */
-static int hf_ff_fms_read = -1;
+static int hf_ff_fms_read;
 
-static int hf_ff_fms_read_req = -1;
-static int hf_ff_fms_read_req_idx = -1;
+static int hf_ff_fms_read_req;
+static int hf_ff_fms_read_req_idx;
 
-static int hf_ff_fms_read_rsp = -1;
+static int hf_ff_fms_read_rsp;
 
-static int hf_ff_fms_read_err = -1;
-static int hf_ff_fms_read_err_err_class = -1;
-static int hf_ff_fms_read_err_err_code = -1;
-static int hf_ff_fms_read_err_additional_code = -1;
-static int hf_ff_fms_read_err_additional_desc = -1;
+static int hf_ff_fms_read_err;
+static int hf_ff_fms_read_err_err_class;
+static int hf_ff_fms_read_err_err_code;
+static int hf_ff_fms_read_err_additional_code;
+static int hf_ff_fms_read_err_additional_desc;
 
-static gint ett_ff_fms_read_req = -1;
-static gint ett_ff_fms_read_rsp = -1;
-static gint ett_ff_fms_read_err = -1;
+static gint ett_ff_fms_read_req;
+static gint ett_ff_fms_read_rsp;
+static gint ett_ff_fms_read_err;
 
 
 
 /*
  * 6.5.3.30. FMS Read with Subindex (Confirmed Service Id = 82)
  */
-static int hf_ff_fms_read_with_subidx = -1;
+static int hf_ff_fms_read_with_subidx;
 
-static int hf_ff_fms_read_with_subidx_req = -1;
-static int hf_ff_fms_read_with_subidx_req_idx = -1;
-static int hf_ff_fms_read_with_subidx_req_subidx = -1;
+static int hf_ff_fms_read_with_subidx_req;
+static int hf_ff_fms_read_with_subidx_req_idx;
+static int hf_ff_fms_read_with_subidx_req_subidx;
 
-static int hf_ff_fms_read_with_subidx_rsp = -1;
+static int hf_ff_fms_read_with_subidx_rsp;
 
-static int hf_ff_fms_read_with_subidx_err = -1;
-static int hf_ff_fms_read_with_subidx_err_err_class = -1;
-static int hf_ff_fms_read_with_subidx_err_err_code = -1;
-static int hf_ff_fms_read_with_subidx_err_additional_code = -1;
-static int hf_ff_fms_read_with_subidx_err_additional_desc = -1;
+static int hf_ff_fms_read_with_subidx_err;
+static int hf_ff_fms_read_with_subidx_err_err_class;
+static int hf_ff_fms_read_with_subidx_err_err_code;
+static int hf_ff_fms_read_with_subidx_err_additional_code;
+static int hf_ff_fms_read_with_subidx_err_additional_desc;
 
-static gint ett_ff_fms_read_with_subidx_req = -1;
-static gint ett_ff_fms_read_with_subidx_rsp = -1;
-static gint ett_ff_fms_read_with_subidx_err = -1;
+static gint ett_ff_fms_read_with_subidx_req;
+static gint ett_ff_fms_read_with_subidx_rsp;
+static gint ett_ff_fms_read_with_subidx_err;
 
 
 
 /*
  * 6.5.3.31. FMS Write (Confirmed Service Id = 3)
  */
-static int hf_ff_fms_write = -1;
-static int hf_ff_fms_write_req = -1;
-static int hf_ff_fms_write_req_idx = -1;
+static int hf_ff_fms_write;
+static int hf_ff_fms_write_req;
+static int hf_ff_fms_write_req_idx;
 
-static int hf_ff_fms_write_rsp = -1;
+static int hf_ff_fms_write_rsp;
 
-static int hf_ff_fms_write_err = -1;
-static int hf_ff_fms_write_err_err_class = -1;
-static int hf_ff_fms_write_err_err_code = -1;
-static int hf_ff_fms_write_err_additional_code = -1;
-static int hf_ff_fms_write_err_additional_desc = -1;
+static int hf_ff_fms_write_err;
+static int hf_ff_fms_write_err_err_class;
+static int hf_ff_fms_write_err_err_code;
+static int hf_ff_fms_write_err_additional_code;
+static int hf_ff_fms_write_err_additional_desc;
 
-static gint ett_ff_fms_write_req = -1;
-static gint ett_ff_fms_write_rsp = -1;
-static gint ett_ff_fms_write_err = -1;
+static gint ett_ff_fms_write_req;
+static gint ett_ff_fms_write_rsp;
+static gint ett_ff_fms_write_err;
 
 
 
 /*
  * 6.5.3.32. FMS Write with Subindex (Confirmed Service Id = 83)
  */
-static int hf_ff_fms_write_with_subidx = -1;
+static int hf_ff_fms_write_with_subidx;
 
-static int hf_ff_fms_write_with_subidx_req = -1;
-static int hf_ff_fms_write_with_subidx_req_idx = -1;
-static int hf_ff_fms_write_with_subidx_req_subidx = -1;
+static int hf_ff_fms_write_with_subidx_req;
+static int hf_ff_fms_write_with_subidx_req_idx;
+static int hf_ff_fms_write_with_subidx_req_subidx;
 
-static int hf_ff_fms_write_with_subidx_rsp = -1;
+static int hf_ff_fms_write_with_subidx_rsp;
 
-static int hf_ff_fms_write_with_subidx_err = -1;
-static int hf_ff_fms_write_with_subidx_err_err_class = -1;
-static int hf_ff_fms_write_with_subidx_err_err_code = -1;
-static int hf_ff_fms_write_with_subidx_err_additional_code = -1;
-static int hf_ff_fms_write_with_subidx_err_additional_desc = -1;
+static int hf_ff_fms_write_with_subidx_err;
+static int hf_ff_fms_write_with_subidx_err_err_class;
+static int hf_ff_fms_write_with_subidx_err_err_code;
+static int hf_ff_fms_write_with_subidx_err_additional_code;
+static int hf_ff_fms_write_with_subidx_err_additional_desc;
 
-static gint ett_ff_fms_write_with_subidx_req = -1;
-static gint ett_ff_fms_write_with_subidx_rsp = -1;
-static gint ett_ff_fms_write_with_subidx_err = -1;
+static gint ett_ff_fms_write_with_subidx_req;
+static gint ett_ff_fms_write_with_subidx_rsp;
+static gint ett_ff_fms_write_with_subidx_err;
 
 
 
 /*
  * 6.5.3.33. FMS Define Variable List (Confirmed Service Id = 7)
  */
-static int hf_ff_fms_def_variable_list = -1;
+static int hf_ff_fms_def_variable_list;
 
-static int hf_ff_fms_def_variable_list_req = -1;
-static int hf_ff_fms_def_variable_list_req_num_of_idxes = -1;
-static int hf_ff_fms_def_variable_list_req_idx = -1;
+static int hf_ff_fms_def_variable_list_req;
+static int hf_ff_fms_def_variable_list_req_num_of_idxes;
+static int hf_ff_fms_def_variable_list_req_idx;
 
-static int hf_ff_fms_def_variable_list_rsp = -1;
-static int hf_ff_fms_def_variable_list_rsp_idx = -1;
+static int hf_ff_fms_def_variable_list_rsp;
+static int hf_ff_fms_def_variable_list_rsp_idx;
 
-static int hf_ff_fms_def_variable_list_err = -1;
-static int hf_ff_fms_def_variable_list_err_err_class = -1;
-static int hf_ff_fms_def_variable_list_err_err_code = -1;
-static int hf_ff_fms_def_variable_list_err_additional_code = -1;
-static int hf_ff_fms_def_variable_list_err_additional_desc = -1;
+static int hf_ff_fms_def_variable_list_err;
+static int hf_ff_fms_def_variable_list_err_err_class;
+static int hf_ff_fms_def_variable_list_err_err_code;
+static int hf_ff_fms_def_variable_list_err_additional_code;
+static int hf_ff_fms_def_variable_list_err_additional_desc;
 
-static gint ett_ff_fms_def_variable_list_req = -1;
-static gint ett_ff_fms_def_variable_list_req_list_of_idxes = -1;
-static gint ett_ff_fms_def_variable_list_rsp = -1;
-static gint ett_ff_fms_def_variable_list_err = -1;
+static gint ett_ff_fms_def_variable_list_req;
+static gint ett_ff_fms_def_variable_list_req_list_of_idxes;
+static gint ett_ff_fms_def_variable_list_rsp;
+static gint ett_ff_fms_def_variable_list_err;
 
 
 
 /*
  * 6.5.3.34. FMS Delete Variable List (Confirmed Service Id = 8)
  */
-static int hf_ff_fms_del_variable_list = -1;
+static int hf_ff_fms_del_variable_list;
 
-static int hf_ff_fms_del_variable_list_req = -1;
-static int hf_ff_fms_del_variable_list_req_idx = -1;
+static int hf_ff_fms_del_variable_list_req;
+static int hf_ff_fms_del_variable_list_req_idx;
 
-static int hf_ff_fms_del_variable_list_rsp = -1;
+static int hf_ff_fms_del_variable_list_rsp;
 
-static int hf_ff_fms_del_variable_list_err = -1;
-static int hf_ff_fms_del_variable_list_err_err_class = -1;
-static int hf_ff_fms_del_variable_list_err_err_code = -1;
-static int hf_ff_fms_del_variable_list_err_additional_code = -1;
-static int hf_ff_fms_del_variable_list_err_additional_desc = -1;
+static int hf_ff_fms_del_variable_list_err;
+static int hf_ff_fms_del_variable_list_err_err_class;
+static int hf_ff_fms_del_variable_list_err_err_code;
+static int hf_ff_fms_del_variable_list_err_additional_code;
+static int hf_ff_fms_del_variable_list_err_additional_desc;
 
-static gint ett_ff_fms_del_variable_list_req = -1;
-static gint ett_ff_fms_del_variable_list_rsp = -1;
-static gint ett_ff_fms_del_variable_list_err = -1;
+static gint ett_ff_fms_del_variable_list_req;
+static gint ett_ff_fms_del_variable_list_rsp;
+static gint ett_ff_fms_del_variable_list_err;
 
 
 
 /*
  * 6.5.3.35. FMS Information Report (Unconfirmed Service Id = 0)
  */
-static int hf_ff_fms_info_report = -1;
+static int hf_ff_fms_info_report;
 
-static int hf_ff_fms_info_report_req = -1;
-static int hf_ff_fms_info_report_req_idx = -1;
+static int hf_ff_fms_info_report_req;
+static int hf_ff_fms_info_report_req_idx;
 
-static gint ett_ff_fms_info_report_req = -1;
+static gint ett_ff_fms_info_report_req;
 
 
 
 /*
  * 6.5.3.36. FMS Information Report with Subindex (Unconfirmed Service Id = 16)
  */
-static int hf_ff_fms_info_report_with_subidx = -1;
+static int hf_ff_fms_info_report_with_subidx;
 
-static int hf_ff_fms_info_report_with_subidx_req = -1;
-static int hf_ff_fms_info_report_with_subidx_req_idx = -1;
-static int hf_ff_fms_info_report_with_subidx_req_subidx = -1;
+static int hf_ff_fms_info_report_with_subidx_req;
+static int hf_ff_fms_info_report_with_subidx_req_idx;
+static int hf_ff_fms_info_report_with_subidx_req_subidx;
 
-static gint ett_ff_fms_info_report_with_subidx_req = -1;
+static gint ett_ff_fms_info_report_with_subidx_req;
 
 
 
 /*
  * 6.5.3.37. FMS Information Report On Change (Unconfirmed Service Id = 17)
  */
-static int hf_ff_fms_info_report_on_change = -1;
+static int hf_ff_fms_info_report_on_change;
 
-static int hf_ff_fms_info_report_on_change_req = -1;
-static int hf_ff_fms_info_report_on_change_req_idx = -1;
+static int hf_ff_fms_info_report_on_change_req;
+static int hf_ff_fms_info_report_on_change_req_idx;
 
-static gint ett_ff_fms_info_report_on_change_req = -1;
+static gint ett_ff_fms_info_report_on_change_req;
 
 
 
@@ -1223,233 +1223,233 @@ static gint ett_ff_fms_info_report_on_change_req = -1;
  * 6.5.3.38. FMS Information Report On Change with Subindex
  *           (Unconfirmed Service Id = 18)
  */
-static int hf_ff_fms_info_report_on_change_with_subidx = -1;
+static int hf_ff_fms_info_report_on_change_with_subidx;
 
-static int hf_ff_fms_info_report_on_change_with_subidx_req = -1;
-static int hf_ff_fms_info_report_on_change_with_subidx_req_idx = -1;
-static int hf_ff_fms_info_report_on_change_with_subidx_req_subidx = -1;
+static int hf_ff_fms_info_report_on_change_with_subidx_req;
+static int hf_ff_fms_info_report_on_change_with_subidx_req_idx;
+static int hf_ff_fms_info_report_on_change_with_subidx_req_subidx;
 
-static gint ett_ff_fms_info_report_on_change_with_subidx_req = -1;
+static gint ett_ff_fms_info_report_on_change_with_subidx_req;
 
 
 
 /*
  * 6.5.3.39. FMS Event Notification (Unconfirmed Service Id = 2)
  */
-static int hf_ff_fms_ev_notification = -1;
+static int hf_ff_fms_ev_notification;
 
-static int hf_ff_fms_ev_notification_req = -1;
-static int hf_ff_fms_ev_notification_req_idx = -1;
-static int hf_ff_fms_ev_notification_req_ev_num = -1;
+static int hf_ff_fms_ev_notification_req;
+static int hf_ff_fms_ev_notification_req_idx;
+static int hf_ff_fms_ev_notification_req_ev_num;
 
-static gint ett_ff_fms_ev_notification_req = -1;
+static gint ett_ff_fms_ev_notification_req;
 
 
 
 /*
  * 6.5.3.40. FMS Alter Event Condition Monitoring (Confirmed Service Id = 24)
  */
-static int hf_ff_fms_alter_ev_condition_monitoring = -1;
+static int hf_ff_fms_alter_ev_condition_monitoring;
 
-static int hf_ff_fms_alter_ev_condition_monitoring_req = -1;
-static int hf_ff_fms_alter_ev_condition_monitoring_req_idx = -1;
-static int hf_ff_fms_alter_ev_condition_monitoring_req_enabled = -1;
+static int hf_ff_fms_alter_ev_condition_monitoring_req;
+static int hf_ff_fms_alter_ev_condition_monitoring_req_idx;
+static int hf_ff_fms_alter_ev_condition_monitoring_req_enabled;
 
-static int hf_ff_fms_alter_ev_condition_monitoring_rsp = -1;
+static int hf_ff_fms_alter_ev_condition_monitoring_rsp;
 
-static int hf_ff_fms_alter_ev_condition_monitoring_err = -1;
-static int hf_ff_fms_alter_ev_condition_monitoring_err_err_class = -1;
-static int hf_ff_fms_alter_ev_condition_monitoring_err_err_code = -1;
-static int hf_ff_fms_alter_ev_condition_monitoring_err_additional_code = -1;
-static int hf_ff_fms_alter_ev_condition_monitoring_err_additional_desc = -1;
+static int hf_ff_fms_alter_ev_condition_monitoring_err;
+static int hf_ff_fms_alter_ev_condition_monitoring_err_err_class;
+static int hf_ff_fms_alter_ev_condition_monitoring_err_err_code;
+static int hf_ff_fms_alter_ev_condition_monitoring_err_additional_code;
+static int hf_ff_fms_alter_ev_condition_monitoring_err_additional_desc;
 
-static gint ett_ff_fms_alter_ev_condition_monitoring_req = -1;
-static gint ett_ff_fms_alter_ev_condition_monitoring_rsp = -1;
-static gint ett_ff_fms_alter_ev_condition_monitoring_err = -1;
+static gint ett_ff_fms_alter_ev_condition_monitoring_req;
+static gint ett_ff_fms_alter_ev_condition_monitoring_rsp;
+static gint ett_ff_fms_alter_ev_condition_monitoring_err;
 
 
 
 /*
  * 6.5.3.41. FMS Acknowledge Event Notification (Confirmed Service Id = 25)
  */
-static int hf_ff_fms_ack_ev_notification = -1;
+static int hf_ff_fms_ack_ev_notification;
 
-static int hf_ff_fms_ack_ev_notification_req = -1;
-static int hf_ff_fms_ack_ev_notification_req_idx = -1;
-static int hf_ff_fms_ack_ev_notification_req_ev_num = -1;
+static int hf_ff_fms_ack_ev_notification_req;
+static int hf_ff_fms_ack_ev_notification_req_idx;
+static int hf_ff_fms_ack_ev_notification_req_ev_num;
 
-static int hf_ff_fms_ack_ev_notification_rsp = -1;
+static int hf_ff_fms_ack_ev_notification_rsp;
 
-static int hf_ff_fms_ack_ev_notification_err = -1;
-static int hf_ff_fms_ack_ev_notification_err_err_class = -1;
-static int hf_ff_fms_ack_ev_notification_err_err_code = -1;
-static int hf_ff_fms_ack_ev_notification_err_additional_code = -1;
-static int hf_ff_fms_ack_ev_notification_err_additional_desc = -1;
+static int hf_ff_fms_ack_ev_notification_err;
+static int hf_ff_fms_ack_ev_notification_err_err_class;
+static int hf_ff_fms_ack_ev_notification_err_err_code;
+static int hf_ff_fms_ack_ev_notification_err_additional_code;
+static int hf_ff_fms_ack_ev_notification_err_additional_desc;
 
-static gint ett_ff_fms_ack_ev_notification_req = -1;
-static gint ett_ff_fms_ack_ev_notification_rsp = -1;
-static gint ett_ff_fms_ack_ev_notification_err = -1;
+static gint ett_ff_fms_ack_ev_notification_req;
+static gint ett_ff_fms_ack_ev_notification_rsp;
+static gint ett_ff_fms_ack_ev_notification_err;
 
 
 
 /*
  * 6.5.4. LAN Redundancy Services
  */
-static int hf_ff_lr = -1;
+static int hf_ff_lr;
 
 
 
 /*
  * 6.5.4.1. LAN Redundancy Get Information (Confirmed Service Id = 1)
  */
-static int hf_ff_lr_get_info = -1;
+static int hf_ff_lr_get_info;
 
-static int hf_ff_lr_get_info_req = -1;
+static int hf_ff_lr_get_info_req;
 
-static int hf_ff_lr_get_info_rsp = -1;
-static int hf_ff_lr_get_info_rsp_lr_attrs_ver = -1;
-static int hf_ff_lr_get_info_rsp_lr_max_msg_num_diff = -1;
-static int hf_ff_lr_get_info_rsp_reserved = -1;
-static int hf_ff_lr_get_info_rsp_diagnostic_msg_intvl = -1;
-static int hf_ff_lr_get_info_rsp_aging_time = -1;
-static int hf_ff_lr_get_info_rsp_diagnostic_msg_if_a_send_addr = -1;
-static int hf_ff_lr_get_info_rsp_diagnostic_msg_if_a_recv_addr = -1;
-static int hf_ff_lr_get_info_rsp_diagnostic_msg_if_b_send_addr = -1;
-static int hf_ff_lr_get_info_rsp_diagnostic_msg_if_b_recv_addr = -1;
-static int hf_ff_lr_get_info_rsp_lr_flags_reserved = -1;
-static int hf_ff_lr_get_info_rsp_lr_flags_load_balance = -1;
-static int hf_ff_lr_get_info_rsp_lr_flags_diag = -1;
-static int hf_ff_lr_get_info_rsp_lr_flags_multi_recv = -1;
-static int hf_ff_lr_get_info_rsp_lr_flags_cross_cable = -1;
-static int hf_ff_lr_get_info_rsp_lr_flags_multi_trans = -1;
-static int hf_ff_lr_get_info_rsp_lr_flags = -1;
+static int hf_ff_lr_get_info_rsp;
+static int hf_ff_lr_get_info_rsp_lr_attrs_ver;
+static int hf_ff_lr_get_info_rsp_lr_max_msg_num_diff;
+static int hf_ff_lr_get_info_rsp_reserved;
+static int hf_ff_lr_get_info_rsp_diagnostic_msg_intvl;
+static int hf_ff_lr_get_info_rsp_aging_time;
+static int hf_ff_lr_get_info_rsp_diagnostic_msg_if_a_send_addr;
+static int hf_ff_lr_get_info_rsp_diagnostic_msg_if_a_recv_addr;
+static int hf_ff_lr_get_info_rsp_diagnostic_msg_if_b_send_addr;
+static int hf_ff_lr_get_info_rsp_diagnostic_msg_if_b_recv_addr;
+static int hf_ff_lr_get_info_rsp_lr_flags_reserved;
+static int hf_ff_lr_get_info_rsp_lr_flags_load_balance;
+static int hf_ff_lr_get_info_rsp_lr_flags_diag;
+static int hf_ff_lr_get_info_rsp_lr_flags_multi_recv;
+static int hf_ff_lr_get_info_rsp_lr_flags_cross_cable;
+static int hf_ff_lr_get_info_rsp_lr_flags_multi_trans;
+static int hf_ff_lr_get_info_rsp_lr_flags;
 
-static int hf_ff_lr_get_info_err = -1;
-static int hf_ff_lr_get_info_err_err_class = -1;
-static int hf_ff_lr_get_info_err_err_code = -1;
-static int hf_ff_lr_get_info_err_additional_code = -1;
-static int hf_ff_lr_get_info_err_additional_desc = -1;
+static int hf_ff_lr_get_info_err;
+static int hf_ff_lr_get_info_err_err_class;
+static int hf_ff_lr_get_info_err_err_code;
+static int hf_ff_lr_get_info_err_additional_code;
+static int hf_ff_lr_get_info_err_additional_desc;
 
-static gint ett_ff_lr_get_info_req = -1;
-static gint ett_ff_lr_get_info_rsp = -1;
-static gint ett_ff_lr_get_info_rsp_lr_flags = -1;
-static gint ett_ff_lr_get_info_err = -1;
+static gint ett_ff_lr_get_info_req;
+static gint ett_ff_lr_get_info_rsp;
+static gint ett_ff_lr_get_info_rsp_lr_flags;
+static gint ett_ff_lr_get_info_err;
 
 
 
 /*
  * 6.5.4.2. LAN Redundancy Put Information (Confirmed Service Id = 2)
  */
-static int hf_ff_lr_put_info = -1;
-
-static int hf_ff_lr_put_info_req = -1;
-static int hf_ff_lr_put_info_req_lr_attrs_ver = -1;
-static int hf_ff_lr_put_info_req_lr_max_msg_num_diff = -1;
-static int hf_ff_lr_put_info_req_reserved = -1;
-static int hf_ff_lr_put_info_req_diagnostic_msg_intvl = -1;
-static int hf_ff_lr_put_info_req_aging_time = -1;
-static int hf_ff_lr_put_info_req_diagnostic_msg_if_a_send_addr = -1;
-static int hf_ff_lr_put_info_req_diagnostic_msg_if_a_recv_addr = -1;
-static int hf_ff_lr_put_info_req_diagnostic_msg_if_b_send_addr = -1;
-static int hf_ff_lr_put_info_req_diagnostic_msg_if_b_recv_addr = -1;
-static int hf_ff_lr_put_info_req_lr_flags_reserved = -1;
-static int hf_ff_lr_put_info_req_lr_flags_load_balance = -1;
-static int hf_ff_lr_put_info_req_lr_flags_diag = -1;
-static int hf_ff_lr_put_info_req_lr_flags_multi_recv = -1;
-static int hf_ff_lr_put_info_req_lr_flags_cross_cable = -1;
-static int hf_ff_lr_put_info_req_lr_flags_multi_trans = -1;
-static int hf_ff_lr_put_info_req_lr_flags = -1;
-
-static int hf_ff_lr_put_info_rsp = -1;
-static int hf_ff_lr_put_info_rsp_lr_attrs_ver = -1;
-static int hf_ff_lr_put_info_rsp_lr_max_msg_num_diff = -1;
-static int hf_ff_lr_put_info_rsp_reserved = -1;
-static int hf_ff_lr_put_info_rsp_diagnostic_msg_intvl = -1;
-static int hf_ff_lr_put_info_rsp_aging_time = -1;
-static int hf_ff_lr_put_info_rsp_diagnostic_msg_if_a_send_addr = -1;
-static int hf_ff_lr_put_info_rsp_diagnostic_msg_if_a_recv_addr = -1;
-static int hf_ff_lr_put_info_rsp_diagnostic_msg_if_b_send_addr = -1;
-static int hf_ff_lr_put_info_rsp_diagnostic_msg_if_b_recv_addr = -1;
-static int hf_ff_lr_put_info_rsp_lr_flags_reserved = -1;
-static int hf_ff_lr_put_info_rsp_lr_flags_load_balance = -1;
-static int hf_ff_lr_put_info_rsp_lr_flags_diag = -1;
-static int hf_ff_lr_put_info_rsp_lr_flags_multi_recv = -1;
-static int hf_ff_lr_put_info_rsp_lr_flags_cross_cable = -1;
-static int hf_ff_lr_put_info_rsp_lr_flags_multi_trans = -1;
-static int hf_ff_lr_put_info_rsp_lr_flags = -1;
-
-static int hf_ff_lr_put_info_err = -1;
-static int hf_ff_lr_put_info_err_err_class = -1;
-static int hf_ff_lr_put_info_err_err_code = -1;
-static int hf_ff_lr_put_info_err_additional_code = -1;
-static int hf_ff_lr_put_info_err_additional_desc = -1;
-
-static gint ett_ff_lr_put_info_req = -1;
-static gint ett_ff_lr_put_info_req_lr_flags = -1;
-static gint ett_ff_lr_put_info_rsp = -1;
-static gint ett_ff_lr_put_info_rsp_lr_flags = -1;
-static gint ett_ff_lr_put_info_err = -1;
+static int hf_ff_lr_put_info;
+
+static int hf_ff_lr_put_info_req;
+static int hf_ff_lr_put_info_req_lr_attrs_ver;
+static int hf_ff_lr_put_info_req_lr_max_msg_num_diff;
+static int hf_ff_lr_put_info_req_reserved;
+static int hf_ff_lr_put_info_req_diagnostic_msg_intvl;
+static int hf_ff_lr_put_info_req_aging_time;
+static int hf_ff_lr_put_info_req_diagnostic_msg_if_a_send_addr;
+static int hf_ff_lr_put_info_req_diagnostic_msg_if_a_recv_addr;
+static int hf_ff_lr_put_info_req_diagnostic_msg_if_b_send_addr;
+static int hf_ff_lr_put_info_req_diagnostic_msg_if_b_recv_addr;
+static int hf_ff_lr_put_info_req_lr_flags_reserved;
+static int hf_ff_lr_put_info_req_lr_flags_load_balance;
+static int hf_ff_lr_put_info_req_lr_flags_diag;
+static int hf_ff_lr_put_info_req_lr_flags_multi_recv;
+static int hf_ff_lr_put_info_req_lr_flags_cross_cable;
+static int hf_ff_lr_put_info_req_lr_flags_multi_trans;
+static int hf_ff_lr_put_info_req_lr_flags;
+
+static int hf_ff_lr_put_info_rsp;
+static int hf_ff_lr_put_info_rsp_lr_attrs_ver;
+static int hf_ff_lr_put_info_rsp_lr_max_msg_num_diff;
+static int hf_ff_lr_put_info_rsp_reserved;
+static int hf_ff_lr_put_info_rsp_diagnostic_msg_intvl;
+static int hf_ff_lr_put_info_rsp_aging_time;
+static int hf_ff_lr_put_info_rsp_diagnostic_msg_if_a_send_addr;
+static int hf_ff_lr_put_info_rsp_diagnostic_msg_if_a_recv_addr;
+static int hf_ff_lr_put_info_rsp_diagnostic_msg_if_b_send_addr;
+static int hf_ff_lr_put_info_rsp_diagnostic_msg_if_b_recv_addr;
+static int hf_ff_lr_put_info_rsp_lr_flags_reserved;
+static int hf_ff_lr_put_info_rsp_lr_flags_load_balance;
+static int hf_ff_lr_put_info_rsp_lr_flags_diag;
+static int hf_ff_lr_put_info_rsp_lr_flags_multi_recv;
+static int hf_ff_lr_put_info_rsp_lr_flags_cross_cable;
+static int hf_ff_lr_put_info_rsp_lr_flags_multi_trans;
+static int hf_ff_lr_put_info_rsp_lr_flags;
+
+static int hf_ff_lr_put_info_err;
+static int hf_ff_lr_put_info_err_err_class;
+static int hf_ff_lr_put_info_err_err_code;
+static int hf_ff_lr_put_info_err_additional_code;
+static int hf_ff_lr_put_info_err_additional_desc;
+
+static gint ett_ff_lr_put_info_req;
+static gint ett_ff_lr_put_info_req_lr_flags;
+static gint ett_ff_lr_put_info_rsp;
+static gint ett_ff_lr_put_info_rsp_lr_flags;
+static gint ett_ff_lr_put_info_err;
 
 
 
 /*
  * 6.5.4.3. LAN Redundancy Get Statistics (Confirmed Service Id = 3)
  */
-static int hf_ff_lr_get_statistics = -1;
+static int hf_ff_lr_get_statistics;
 
-static int hf_ff_lr_get_statistics_req = -1;
+static int hf_ff_lr_get_statistics_req;
 
-static int hf_ff_lr_get_statistics_rsp = -1;
-static int hf_ff_lr_get_statistics_rsp_num_diag_svr_ind_recv_a = -1;
-static int hf_ff_lr_get_statistics_rsp_num_diag_svr_ind_miss_a = -1;
-static int hf_ff_lr_get_statistics_rsp_num_rem_dev_diag_recv_fault_a = -1;
-static int hf_ff_lr_get_statistics_rsp_num_diag_svr_ind_recv_b = -1;
-static int hf_ff_lr_get_statistics_rsp_num_diag_svr_ind_miss_b = -1;
-static int hf_ff_lr_get_statistics_rsp_num_rem_dev_diag_recv_fault_b = -1;
-static int hf_ff_lr_get_statistics_rsp_num_x_cable_stat = -1;
-static int hf_ff_lr_get_statistics_rsp_x_cable_stat = -1;
+static int hf_ff_lr_get_statistics_rsp;
+static int hf_ff_lr_get_statistics_rsp_num_diag_svr_ind_recv_a;
+static int hf_ff_lr_get_statistics_rsp_num_diag_svr_ind_miss_a;
+static int hf_ff_lr_get_statistics_rsp_num_rem_dev_diag_recv_fault_a;
+static int hf_ff_lr_get_statistics_rsp_num_diag_svr_ind_recv_b;
+static int hf_ff_lr_get_statistics_rsp_num_diag_svr_ind_miss_b;
+static int hf_ff_lr_get_statistics_rsp_num_rem_dev_diag_recv_fault_b;
+static int hf_ff_lr_get_statistics_rsp_num_x_cable_stat;
+static int hf_ff_lr_get_statistics_rsp_x_cable_stat;
 
-static int hf_ff_lr_get_statistics_err = -1;
-static int hf_ff_lr_get_statistics_err_err_class = -1;
-static int hf_ff_lr_get_statistics_err_err_code = -1;
-static int hf_ff_lr_get_statistics_err_additional_code = -1;
-static int hf_ff_lr_get_statistics_err_additional_desc = -1;
+static int hf_ff_lr_get_statistics_err;
+static int hf_ff_lr_get_statistics_err_err_class;
+static int hf_ff_lr_get_statistics_err_err_code;
+static int hf_ff_lr_get_statistics_err_additional_code;
+static int hf_ff_lr_get_statistics_err_additional_desc;
 
-static gint ett_ff_lr_get_statistics_req = -1;
-static gint ett_ff_lr_get_statistics_rsp = -1;
-static gint ett_ff_lr_get_statistics_rsp_list_of_x_cable_stat = -1;
-static gint ett_ff_lr_get_statistics_err = -1;
+static gint ett_ff_lr_get_statistics_req;
+static gint ett_ff_lr_get_statistics_rsp;
+static gint ett_ff_lr_get_statistics_rsp_list_of_x_cable_stat;
+static gint ett_ff_lr_get_statistics_err;
 
 
 
 /*
  * 6.5.4.4. Diagnostic Message (Unconfirmed Service Id = 1)
  */
-static int hf_ff_lr_diagnostic_msg = -1;
-
-static int hf_ff_lr_diagnostic_msg_req = -1;
-static int hf_ff_lr_diagnostic_msg_req_dev_idx = -1;
-static int hf_ff_lr_diagnostic_msg_req_num_of_network_ifs = -1;
-static int hf_ff_lr_diagnostic_msg_req_transmission_if = -1;
-static int hf_ff_lr_diagnostic_msg_req_diagnostic_msg_intvl = -1;
-static int hf_ff_lr_diagnostic_msg_req_pd_tag = -1;
-static int hf_ff_lr_diagnostic_msg_req_reserved = -1;
-static int hf_ff_lr_diagnostic_msg_req_num_of_if_statuses = -1;
-static int hf_ff_lr_diagnostic_msg_req_if_a_to_a_status = -1;
-static int hf_ff_lr_diagnostic_msg_req_if_b_to_a_status = -1;
-static int hf_ff_lr_diagnostic_msg_req_if_a_to_b_status = -1;
-static int hf_ff_lr_diagnostic_msg_req_if_b_to_b_status = -1;
-static int hf_ff_lr_diagnostic_msg_req_dup_detection_state_reserved = -1;
-static int hf_ff_lr_diagnostic_msg_req_dup_detection_state_pd_tag = -1;
-static int hf_ff_lr_diagnostic_msg_req_dup_detection_state_device = -1;
-static int hf_ff_lr_diagnostic_msg_req_dup_detection_state = -1;
-
-static gint ett_ff_lr_diagnostic_msg_req = -1;
-static gint ett_ff_lr_diagnostic_msg_req_dup_detection_stat = -1;
-static gint ett_ff_lr_diagnostic_msg_req_a_to_a_status = -1;
-static gint ett_ff_lr_diagnostic_msg_req_b_to_a_status = -1;
-static gint ett_ff_lr_diagnostic_msg_req_a_to_b_status = -1;
-static gint ett_ff_lr_diagnostic_msg_req_b_to_b_status = -1;
+static int hf_ff_lr_diagnostic_msg;
+
+static int hf_ff_lr_diagnostic_msg_req;
+static int hf_ff_lr_diagnostic_msg_req_dev_idx;
+static int hf_ff_lr_diagnostic_msg_req_num_of_network_ifs;
+static int hf_ff_lr_diagnostic_msg_req_transmission_if;
+static int hf_ff_lr_diagnostic_msg_req_diagnostic_msg_intvl;
+static int hf_ff_lr_diagnostic_msg_req_pd_tag;
+static int hf_ff_lr_diagnostic_msg_req_reserved;
+static int hf_ff_lr_diagnostic_msg_req_num_of_if_statuses;
+static int hf_ff_lr_diagnostic_msg_req_if_a_to_a_status;
+static int hf_ff_lr_diagnostic_msg_req_if_b_to_a_status;
+static int hf_ff_lr_diagnostic_msg_req_if_a_to_b_status;
+static int hf_ff_lr_diagnostic_msg_req_if_b_to_b_status;
+static int hf_ff_lr_diagnostic_msg_req_dup_detection_state_reserved;
+static int hf_ff_lr_diagnostic_msg_req_dup_detection_state_pd_tag;
+static int hf_ff_lr_diagnostic_msg_req_dup_detection_state_device;
+static int hf_ff_lr_diagnostic_msg_req_dup_detection_state;
+
+static gint ett_ff_lr_diagnostic_msg_req;
+static gint ett_ff_lr_diagnostic_msg_req_dup_detection_stat;
+static gint ett_ff_lr_diagnostic_msg_req_a_to_a_status;
+static gint ett_ff_lr_diagnostic_msg_req_b_to_a_status;
+static gint ett_ff_lr_diagnostic_msg_req_a_to_b_status;
+static gint ett_ff_lr_diagnostic_msg_req_b_to_b_status;
 
 
 
diff --git a/epan/dissectors/packet-finger.c b/epan/dissectors/packet-finger.c
index c6e7e25722..17d45fa8d6 100644
--- a/epan/dissectors/packet-finger.c
+++ b/epan/dissectors/packet-finger.c
@@ -23,16 +23,16 @@ static dissector_handle_t finger_handle;
 
 #define FINGER_PORT     79  /* This is the registered IANA port */
 
-static int proto_finger = -1;
-static int hf_finger_query = -1;
-static int hf_finger_response = -1;
-static int hf_finger_response_in = -1;
-static int hf_finger_response_to = -1;
-static int hf_finger_response_time = -1;
+static int proto_finger;
+static int hf_finger_query;
+static int hf_finger_response;
+static int hf_finger_response_in;
+static int hf_finger_response_to;
+static int hf_finger_response_time;
 
-static expert_field ei_finger_nocrlf = EI_INIT;
+static expert_field ei_finger_nocrlf;
 
-static gint ett_finger = -1;
+static gint ett_finger;
 
 typedef struct _finger_transaction_t {
     guint32  req_frame;
diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c
index b8c5cc1fa1..a8a95fa401 100644
--- a/epan/dissectors/packet-fip.c
+++ b/epan/dissectors/packet-fip.c
@@ -182,26 +182,26 @@ enum fip_flag {
     FIP_FL_FPORT   = 0x0001          /* sent from an F port */
 };
 
-static int proto_fip            = -1;
-static int hf_fip_ver           = -1;
-static int hf_fip_reserved12    = -1;
-static int hf_fip_op            = -1;
-static int hf_fip_reserved8     = -1;
-static int hf_fip_disc_subcode  = -1;
-static int hf_fip_ls_subcode    = -1;
-static int hf_fip_ctrl_subcode  = -1;
-static int hf_fip_vlan_subcode  = -1;
-static int hf_fip_vn2vn_subcode = -1;
-static int hf_fip_hex_subcode   = -1;
-static int hf_fip_dlen          = -1;
-static int hf_fip_flags         = -1;
-static int hf_fip_flag_fpma     = -1;
-static int hf_fip_flag_spma     = -1;
-static int hf_fip_flag_rec_p2p  = -1;
-static int hf_fip_flag_avail    = -1;
-static int hf_fip_flag_sol      = -1;
-static int hf_fip_flag_fport    = -1;
-static int hf_fip_descriptors   = -1;
+static int proto_fip;
+static int hf_fip_ver;
+static int hf_fip_reserved12;
+static int hf_fip_op;
+static int hf_fip_reserved8;
+static int hf_fip_disc_subcode;
+static int hf_fip_ls_subcode;
+static int hf_fip_ctrl_subcode;
+static int hf_fip_vlan_subcode;
+static int hf_fip_vn2vn_subcode;
+static int hf_fip_hex_subcode;
+static int hf_fip_dlen;
+static int hf_fip_flags;
+static int hf_fip_flag_fpma;
+static int hf_fip_flag_spma;
+static int hf_fip_flag_rec_p2p;
+static int hf_fip_flag_avail;
+static int hf_fip_flag_sol;
+static int hf_fip_flag_fport;
+static int hf_fip_descriptors;
 
 static int * const hf_fip_flags_fields[] = {
     &hf_fip_flag_fpma,
@@ -213,51 +213,51 @@ static int * const hf_fip_flags_fields[] = {
     NULL
 };
 
-static int hf_fip_desc_type       = -1;
-static int hf_fip_desc_len        = -1;
-static int hf_fip_desc_pri        = -1;
-static int hf_fip_desc_mac        = -1;
-static int hf_fip_desc_map        = -1;
-static int hf_fip_desc_name       = -1;
-static int hf_fip_desc_fab_vfid   = -1;
-static int hf_fip_desc_fab_map    = -1;
-static int hf_fip_desc_fab_name   = -1;
-static int hf_fip_desc_fcoe_size  = -1;
-static int hf_fip_desc_vn_mac     = -1;
-static int hf_fip_desc_vn_fid     = -1;
-static int hf_fip_desc_vn_wwpn    = -1;
-static int hf_fip_desc_fka        = -1;
-static int hf_fip_desc_vend       = -1;
-static int hf_fip_desc_vend_data  = -1;
-static int hf_fip_desc_vlan       = -1;
-static int hf_fip_desc_unk        = -1;
-static int hf_fip_desc_fc4f_types = -1;
-static int hf_fip_desc_fcp_feat   = -1;
-static int hf_fip_type_ip         = -1;
-static int hf_fip_type_fcp        = -1;
-static int hf_fip_type_gs3        = -1;
-static int hf_fip_fcp_feat_i      = -1;
-static int hf_fip_fcp_feat_t      = -1;
-
-static int ett_fip                = -1;
-static int ett_fip_flags          = -1;
-static int ett_fip_dt_pri         = -1;
-static int ett_fip_dt_mac         = -1;
-static int ett_fip_dt_map         = -1;
-static int ett_fip_dt_name        = -1;
-static int ett_fip_dt_fab         = -1;
-static int ett_fip_dt_mdl         = -1;
-static int ett_fip_dt_caps        = -1;
-static int ett_fip_dt_vn          = -1;
-static int ett_fip_dt_fka         = -1;
-static int ett_fip_dt_vend        = -1;
-static int ett_fip_dt_vlan        = -1;
-static int ett_fip_dt_unk         = -1;
-static int ett_fip_dt_fc4f        = -1;
-static int ett_fip_dt_fc4f_types  = -1;
-static int ett_fip_dt_fcp_feat    = -1;
-
-static expert_field ei_fip_descriptors = EI_INIT;
+static int hf_fip_desc_type;
+static int hf_fip_desc_len;
+static int hf_fip_desc_pri;
+static int hf_fip_desc_mac;
+static int hf_fip_desc_map;
+static int hf_fip_desc_name;
+static int hf_fip_desc_fab_vfid;
+static int hf_fip_desc_fab_map;
+static int hf_fip_desc_fab_name;
+static int hf_fip_desc_fcoe_size;
+static int hf_fip_desc_vn_mac;
+static int hf_fip_desc_vn_fid;
+static int hf_fip_desc_vn_wwpn;
+static int hf_fip_desc_fka;
+static int hf_fip_desc_vend;
+static int hf_fip_desc_vend_data;
+static int hf_fip_desc_vlan;
+static int hf_fip_desc_unk;
+static int hf_fip_desc_fc4f_types;
+static int hf_fip_desc_fcp_feat;
+static int hf_fip_type_ip;
+static int hf_fip_type_fcp;
+static int hf_fip_type_gs3;
+static int hf_fip_fcp_feat_i;
+static int hf_fip_fcp_feat_t;
+
+static int ett_fip;
+static int ett_fip_flags;
+static int ett_fip_dt_pri;
+static int ett_fip_dt_mac;
+static int ett_fip_dt_map;
+static int ett_fip_dt_name;
+static int ett_fip_dt_fab;
+static int ett_fip_dt_mdl;
+static int ett_fip_dt_caps;
+static int ett_fip_dt_vn;
+static int ett_fip_dt_fka;
+static int ett_fip_dt_vend;
+static int ett_fip_dt_vlan;
+static int ett_fip_dt_unk;
+static int ett_fip_dt_fc4f;
+static int ett_fip_dt_fc4f_types;
+static int ett_fip_dt_fcp_feat;
+
+static expert_field ei_fip_descriptors;
 
 static dissector_handle_t fc_handle;
 
diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index 605148c3b3..04b965271c 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -38,27 +38,27 @@ typedef struct _fix_parameter {
 } fix_parameter;
 
 /* Initialize the protocol and registered fields */
-static int proto_fix = -1;
+static int proto_fix;
 
 /* desegmentation of fix */
 static gboolean fix_desegment = TRUE;
 
 /* Initialize the subtree pointers */
-static gint ett_fix = -1;
-static gint ett_unknown = -1;
-static gint ett_badfield = -1;
-static gint ett_checksum = -1;
-
-static expert_field ei_fix_checksum_bad = EI_INIT;
-static expert_field ei_fix_missing_field = EI_INIT;
-static expert_field ei_fix_tag_invalid = EI_INIT;
-static expert_field ei_fix_field_invalid = EI_INIT;
-
-static int hf_fix_data = -1; /* continuation data */
-static int hf_fix_checksum_good = -1;
-static int hf_fix_checksum_bad = -1;
-static int hf_fix_field_value = -1;
-static int hf_fix_field_tag = -1;
+static gint ett_fix;
+static gint ett_unknown;
+static gint ett_badfield;
+static gint ett_checksum;
+
+static expert_field ei_fix_checksum_bad;
+static expert_field ei_fix_missing_field;
+static expert_field ei_fix_tag_invalid;
+static expert_field ei_fix_field_invalid;
+
+static int hf_fix_data; /* continuation data */
+static int hf_fix_checksum_good;
+static int hf_fix_checksum_bad;
+static int hf_fix_field_value;
+static int hf_fix_field_tag;
 
 static dissector_handle_t fix_handle;
 
diff --git a/epan/dissectors/packet-flexnet.c b/epan/dissectors/packet-flexnet.c
index 2f52bbad54..1c27e67b6f 100644
--- a/epan/dissectors/packet-flexnet.c
+++ b/epan/dissectors/packet-flexnet.c
@@ -36,13 +36,13 @@ static dissector_handle_t flexnet_handle;
 #define FLEXNET_CTLLEN  15
 #define FLEXNET_HDRLEN  (FLEXNET_ADRLEN + FLEXNET_ADRLEN + FLEXNET_CTLLEN)
 
-static int proto_flexnet	= -1;
-static int hf_flexnet_dst	= -1;
-static int hf_flexnet_src	= -1;
-static int hf_flexnet_ctl	= -1;
+static int proto_flexnet;
+static int hf_flexnet_dst;
+static int hf_flexnet_src;
+static int hf_flexnet_ctl;
 
-static gint ett_flexnet = -1;
-static gint ett_flexnet_ctl = -1;
+static gint ett_flexnet;
+static gint ett_flexnet_ctl;
 
 static int
 dissect_flexnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* data _U_)
diff --git a/epan/dissectors/packet-flexray.c b/epan/dissectors/packet-flexray.c
index ff2a754ee0..2f8497b87b 100644
--- a/epan/dissectors/packet-flexray.c
+++ b/epan/dissectors/packet-flexray.c
@@ -34,34 +34,34 @@ static dissector_table_t flexrayid_subdissector_table;
 static heur_dissector_list_t heur_subdissector_list;
 static heur_dtbl_entry_t *heur_dtbl_entry;
 
-static int proto_flexray = -1;
-static int hf_flexray_measurement_header_field = -1;
-static int hf_flexray_error_flags_field = -1;
-static int hf_flexray_frame_header = -1;
-
-static int hf_flexray_ti = -1;
-static int hf_flexray_ch = -1;
-static int hf_flexray_fcrc_err = -1;
-static int hf_flexray_hcrc_err = -1;
-static int hf_flexray_fes_err = -1;
-static int hf_flexray_cod_err = -1;
-static int hf_flexray_tss_viol = -1;
-static int hf_flexray_res = -1;
-static int hf_flexray_ppi = -1;
-static int hf_flexray_nfi = -1;
-static int hf_flexray_sfi = -1;
-static int hf_flexray_stfi = -1;
-static int hf_flexray_fid = -1;
-static int hf_flexray_pl = -1;
-static int hf_flexray_hcrc = -1;
-static int hf_flexray_cc = -1;
-static int hf_flexray_sl = -1;
-static int hf_flexray_flexray_id = -1;
-
-static gint ett_flexray = -1;
-static gint ett_flexray_measurement_header = -1;
-static gint ett_flexray_error_flags = -1;
-static gint ett_flexray_frame = -1;
+static int proto_flexray;
+static int hf_flexray_measurement_header_field;
+static int hf_flexray_error_flags_field;
+static int hf_flexray_frame_header;
+
+static int hf_flexray_ti;
+static int hf_flexray_ch;
+static int hf_flexray_fcrc_err;
+static int hf_flexray_hcrc_err;
+static int hf_flexray_fes_err;
+static int hf_flexray_cod_err;
+static int hf_flexray_tss_viol;
+static int hf_flexray_res;
+static int hf_flexray_ppi;
+static int hf_flexray_nfi;
+static int hf_flexray_sfi;
+static int hf_flexray_stfi;
+static int hf_flexray_fid;
+static int hf_flexray_pl;
+static int hf_flexray_hcrc;
+static int hf_flexray_cc;
+static int hf_flexray_sl;
+static int hf_flexray_flexray_id;
+
+static gint ett_flexray;
+static gint ett_flexray_measurement_header;
+static gint ett_flexray_error_flags;
+static gint ett_flexray_frame;
 
 static int * const error_fields[] = {
     &hf_flexray_fcrc_err,
@@ -72,10 +72,10 @@ static int * const error_fields[] = {
     NULL
 };
 
-static expert_field ei_flexray_frame_payload_truncated = EI_INIT;
-static expert_field ei_flexray_symbol_frame = EI_INIT;
-static expert_field ei_flexray_error_flag = EI_INIT;
-static expert_field ei_flexray_stfi_flag = EI_INIT;
+static expert_field ei_flexray_frame_payload_truncated;
+static expert_field ei_flexray_symbol_frame;
+static expert_field ei_flexray_error_flag;
+static expert_field ei_flexray_stfi_flag;
 
 #define FLEXRAY_FRAME 0x01
 #define FLEXRAY_SYMBOL 0x02
diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c
index 5df55d2045..1884e69b06 100644
--- a/epan/dissectors/packet-flip.c
+++ b/epan/dissectors/packet-flip.c
@@ -47,20 +47,20 @@ void proto_reg_handoff_flip(void);
 
 static dissector_handle_t flip_handle;
 
-static int proto_flip = -1;
+static int proto_flip;
 
 /* BASIC */
-static int hf_flip_basic_e         = -1;
-static int hf_flip_basic_reserved  = -1;
-static int hf_flip_basic_flowid    = -1;
-static int hf_flip_basic_seqnum    = -1;
-static int hf_flip_basic_len       = -1;
+static int hf_flip_basic_e;
+static int hf_flip_basic_reserved;
+static int hf_flip_basic_flowid;
+static int hf_flip_basic_seqnum;
+static int hf_flip_basic_len;
 
 /* CHECKSUM */
-static int hf_flip_chksum_etype  = -1;
-static int hf_flip_chksum_spare  = -1;
-static int hf_flip_chksum_e      = -1;
-static int hf_flip_chksum_chksum = -1;
+static int hf_flip_chksum_etype;
+static int hf_flip_chksum_spare;
+static int hf_flip_chksum_e;
+static int hf_flip_chksum_chksum;
 
 #define FLIP_BASIC            (0)
 #define FLIP_CHKSUM           (1)
@@ -76,10 +76,10 @@ static const value_string flip_etype[] = {
 
 static dissector_table_t subdissector_table;
 
-static gint ett_flip         = -1;
-static gint ett_flip_basic   = -1;
-static gint ett_flip_chksum  = -1;
-static gint ett_flip_payload = -1;
+static gint ett_flip;
+static gint ett_flip_basic;
+static gint ett_flip_chksum;
+static gint ett_flip_payload;
 
 static void flip_prompt(packet_info *pinfo _U_, gchar* result)
 {
diff --git a/epan/dissectors/packet-fmp.c b/epan/dissectors/packet-fmp.c
index 0c4348c412..e804ecfdff 100644
--- a/epan/dissectors/packet-fmp.c
+++ b/epan/dissectors/packet-fmp.c
@@ -18,103 +18,103 @@
 void proto_register_fmp(void);
 void proto_reg_handoff_fmp(void);
 
-static int hf_fmp_procedure = -1;
-static int hf_fmp_fsID = -1;
-static int hf_fmp_fsBlkSz = -1;
-static int hf_fmp_sessionHandle = -1;
-static int hf_fmp_fmpFHandle = -1;
-static int hf_fmp_msgNum = -1;
-static int hf_fmp_fileSize = -1;
-static int hf_fmp_cookie = -1;
-static int hf_fmp_firstLogBlk = -1;
-static int hf_fmp_numBlksReq = -1;
-
-static int proto_fmp = -1;
-static int hf_fmp_hostID = -1;
-static int hf_fmp_status = -1;
-static int hf_fmp_btime = -1;
-static int hf_fmp_time_sec = -1;
-static int hf_fmp_time_nsec = -1;
-static int hf_fmp_notifyPort = -1;
-static int hf_fmp_minBlks = -1;
-static int hf_fmp_eof = -1;
-static int hf_fmp_path = -1;
-static int hf_fmp_plugInID = -1;
-static int hf_fmp_plugInBuf = -1;
-static int hf_fmp_nfsFHandle = -1;
-static int hf_fmp_extentList_len = -1;
-static int hf_fmp_extent_state = -1;
-static int hf_fmp_numBlks = -1;
-static int hf_fmp_volID = -1;
-static int hf_fmp_startOffset = -1;
-static int hf_fmp_volHandle = -1;
-static int hf_fmp_devSignature = -1;
-static int hf_fmp_dskSigEnt_val = -1;
-static int hf_fmp_mount_path = -1;
-static int hf_fmp_sig_offset = -1;
-static int hf_fmp_os_major = -1;
-static int hf_fmp_os_minor = -1;
-static int hf_fmp_os_name = -1;
-static int hf_fmp_os_patch = -1;
-static int hf_fmp_os_build = -1;
-static int hf_fmp_server_version_string = -1;
-static int hf_fmp_description = -1;
-static int hf_fmp_nfsv3Attr_type = -1;
-static int hf_fmp_nfsv3Attr_mode = -1;
-static int hf_fmp_nfsv3Attr_nlink = -1;
-static int hf_fmp_nfsv3Attr_uid = -1;
-static int hf_fmp_nfsv3Attr_gid = -1;
-static int hf_fmp_nfsv3Attr_used = -1;
-static int hf_fmp_nfsv3Attr_rdev = -1;
-static int hf_fmp_nfsv3Attr_fsid = -1;
-static int hf_fmp_nfsv3Attr_fileid = -1;
-static int hf_fmp_cmd = -1;
-static int hf_fmp_topVolumeId = -1;
-static int hf_fmp_cursor = -1;
-static int hf_fmp_offset64 = -1;
-static int hf_fmp_start_offset64 = -1;
-static int hf_fmp_slice_size = -1;
-static int hf_fmp_volume = -1;
-static int hf_fmp_stripeSize = -1;
-static int hf_fmp_firstLogBlk64 =-1;
-static int hf_fmp_native_protocol = -1;
-static int hf_fmp_encoding_mode = -1;
-static int hf_fmp_capability = -1;
-static int hf_fmp_devSerial_query_cmd = -1;
-static int hf_fmp_volume_desc = -1;
-static int hf_fmp_disk_identifier = -1;
-static int hf_fmp_volume_mgmt_type = -1;
-static int hf_fmp_notify_protocol = -1;
-static int hf_fmp_client_error_number = -1;
+static int hf_fmp_procedure;
+static int hf_fmp_fsID;
+static int hf_fmp_fsBlkSz;
+static int hf_fmp_sessionHandle;
+static int hf_fmp_fmpFHandle;
+static int hf_fmp_msgNum;
+static int hf_fmp_fileSize;
+static int hf_fmp_cookie;
+static int hf_fmp_firstLogBlk;
+static int hf_fmp_numBlksReq;
+
+static int proto_fmp;
+static int hf_fmp_hostID;
+static int hf_fmp_status;
+static int hf_fmp_btime;
+static int hf_fmp_time_sec;
+static int hf_fmp_time_nsec;
+static int hf_fmp_notifyPort;
+static int hf_fmp_minBlks;
+static int hf_fmp_eof;
+static int hf_fmp_path;
+static int hf_fmp_plugInID;
+static int hf_fmp_plugInBuf;
+static int hf_fmp_nfsFHandle;
+static int hf_fmp_extentList_len;
+static int hf_fmp_extent_state;
+static int hf_fmp_numBlks;
+static int hf_fmp_volID;
+static int hf_fmp_startOffset;
+static int hf_fmp_volHandle;
+static int hf_fmp_devSignature;
+static int hf_fmp_dskSigEnt_val;
+static int hf_fmp_mount_path;
+static int hf_fmp_sig_offset;
+static int hf_fmp_os_major;
+static int hf_fmp_os_minor;
+static int hf_fmp_os_name;
+static int hf_fmp_os_patch;
+static int hf_fmp_os_build;
+static int hf_fmp_server_version_string;
+static int hf_fmp_description;
+static int hf_fmp_nfsv3Attr_type;
+static int hf_fmp_nfsv3Attr_mode;
+static int hf_fmp_nfsv3Attr_nlink;
+static int hf_fmp_nfsv3Attr_uid;
+static int hf_fmp_nfsv3Attr_gid;
+static int hf_fmp_nfsv3Attr_used;
+static int hf_fmp_nfsv3Attr_rdev;
+static int hf_fmp_nfsv3Attr_fsid;
+static int hf_fmp_nfsv3Attr_fileid;
+static int hf_fmp_cmd;
+static int hf_fmp_topVolumeId;
+static int hf_fmp_cursor;
+static int hf_fmp_offset64;
+static int hf_fmp_start_offset64;
+static int hf_fmp_slice_size;
+static int hf_fmp_volume;
+static int hf_fmp_stripeSize;
+static int hf_fmp_firstLogBlk64;
+static int hf_fmp_native_protocol;
+static int hf_fmp_encoding_mode;
+static int hf_fmp_capability;
+static int hf_fmp_devSerial_query_cmd;
+static int hf_fmp_volume_desc;
+static int hf_fmp_disk_identifier;
+static int hf_fmp_volume_mgmt_type;
+static int hf_fmp_notify_protocol;
+static int hf_fmp_client_error_number;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_fmp_cap = -1;
-static int hf_fmp_cap_revoke_handle_list = -1;
-static int hf_fmp_length_of_volume_list = -1;
-static int hf_fmp_cap_unc_names = -1;
-static int hf_fmp_length_of_list = -1;
-static int hf_fmp_sigoffset = -1;
-static int hf_fmp_uid = -1;
-static int hf_fmp_fid = -1;
-static int hf_fmp_fsid = -1;
-static int hf_fmp_tid = -1;
-static int hf_fmp_cifsport = -1;
-static int hf_fmp_blockindex = -1;
-static int hf_fmp_number_of_disk = -1;
-static int hf_fmp_cap_cifsv2 = -1;
-static int hf_fmp_mtime = -1;
-static int hf_fmp_atime = -1;
-static int hf_fmp_ctime = -1;
-static int hf_fmp_heartbeat_interval = -1;
-static int hf_fmp_volindex = -1;
-
-static gint ett_fmp = -1;
-static gint ett_fmp_timeval = -1;
-static gint ett_fmp_extList = -1;
-static gint ett_fmp_ext = -1;
-static gint ett_fmp_fileHandle = -1;
-static gint ett_capabilities = -1;
-static gint ett_HierVolumeDescription = -1;
-static gint ett_attrs = -1;
+static int hf_fmp_cap;
+static int hf_fmp_cap_revoke_handle_list;
+static int hf_fmp_length_of_volume_list;
+static int hf_fmp_cap_unc_names;
+static int hf_fmp_length_of_list;
+static int hf_fmp_sigoffset;
+static int hf_fmp_uid;
+static int hf_fmp_fid;
+static int hf_fmp_fsid;
+static int hf_fmp_tid;
+static int hf_fmp_cifsport;
+static int hf_fmp_blockindex;
+static int hf_fmp_number_of_disk;
+static int hf_fmp_cap_cifsv2;
+static int hf_fmp_mtime;
+static int hf_fmp_atime;
+static int hf_fmp_ctime;
+static int hf_fmp_heartbeat_interval;
+static int hf_fmp_volindex;
+
+static gint ett_fmp;
+static gint ett_fmp_timeval;
+static gint ett_fmp_extList;
+static gint ett_fmp_ext;
+static gint ett_fmp_fileHandle;
+static gint ett_capabilities;
+static gint ett_HierVolumeDescription;
+static gint ett_attrs;
 
 static const value_string fmp_encoding_mode_vals[] = {
     {FMP_ASCII, "ASCII"},
diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c
index 87b3406965..eff4b8e116 100644
--- a/epan/dissectors/packet-fmp_notify.c
+++ b/epan/dissectors/packet-fmp_notify.c
@@ -38,30 +38,30 @@ typedef enum {
 	FMP_LIST_SERVER_RESOURCE_LOW  = 2
 } revokeHandleListReason;
 
-static int proto_fmp_notify = -1;
-static int hf_fmp_handleListLen = -1;
-static int hf_fmp_notify_procedure = -1;
-static int hf_fmp_fsID = -1;
-/* static int hf_fmp_fsBlkSz = -1; */
-static int hf_fmp_sessionHandle = -1;
-static int hf_fmp_fmpFHandle = -1;
-static int hf_fmp_msgNum = -1;
-static int hf_fmp_fileSize = -1;
-static int hf_fmp_cookie = -1;
-static int hf_fmp_firstLogBlk = -1;
-static int hf_fmp_numBlksReq = -1;
-static int hf_fmp_status = -1;
-static int hf_fmp_extentList_len = -1;
-static int hf_fmp_numBlks = -1;
-static int hf_fmp_volID = -1;
-static int hf_fmp_startOffset = -1;
-static int hf_fmp_extent_state = -1;
-static int hf_fmp_revokeHandleListReason = -1;
-
-static gint ett_fmp_notify = -1;
-static gint ett_fmp_notify_hlist = -1;
-static gint ett_fmp_extList = -1;
-static gint ett_fmp_ext = -1;
+static int proto_fmp_notify;
+static int hf_fmp_handleListLen;
+static int hf_fmp_notify_procedure;
+static int hf_fmp_fsID;
+/* static int hf_fmp_fsBlkSz; */
+static int hf_fmp_sessionHandle;
+static int hf_fmp_fmpFHandle;
+static int hf_fmp_msgNum;
+static int hf_fmp_fileSize;
+static int hf_fmp_cookie;
+static int hf_fmp_firstLogBlk;
+static int hf_fmp_numBlksReq;
+static int hf_fmp_status;
+static int hf_fmp_extentList_len;
+static int hf_fmp_numBlks;
+static int hf_fmp_volID;
+static int hf_fmp_startOffset;
+static int hf_fmp_extent_state;
+static int hf_fmp_revokeHandleListReason;
+
+static gint ett_fmp_notify;
+static gint ett_fmp_notify_hlist;
+static gint ett_fmp_extList;
+static gint ett_fmp_ext;
 
 
 static int dissect_fmp_notify_extentList(tvbuff_t *, int, packet_info *, proto_tree *);
diff --git a/epan/dissectors/packet-fmtp.c b/epan/dissectors/packet-fmtp.c
index 2d6fdb0339..b46c71024e 100644
--- a/epan/dissectors/packet-fmtp.c
+++ b/epan/dissectors/packet-fmtp.c
@@ -22,12 +22,12 @@
 void proto_register_fmtp(void);
 void proto_reg_handoff_fmtp(void);
 
-static int proto_fmtp = -1;
-static int hf_fmtp_pdu_version = -1;
-static int hf_fmtp_pdu_reserved = -1;
-static int hf_fmtp_pdu_type = -1;
-static int hf_fmtp_pdu_length = -1;
-static gint ett_fmtp = -1;
+static int proto_fmtp;
+static int hf_fmtp_pdu_version;
+static int hf_fmtp_pdu_reserved;
+static int hf_fmtp_pdu_type;
+static int hf_fmtp_pdu_length;
+static gint ett_fmtp;
 
 /* #define TCP_PORT_FMTP       8500 */
 #define FMTP_HEADER_LEN     5
diff --git a/epan/dissectors/packet-force10-oui.c b/epan/dissectors/packet-force10-oui.c
index a0e865ea31..4da08f1f20 100644
--- a/epan/dissectors/packet-force10-oui.c
+++ b/epan/dissectors/packet-force10-oui.c
@@ -15,7 +15,7 @@
 
 void proto_register_force10_oui(void);
 
-static int hf_llc_force10_pid = -1;
+static int hf_llc_force10_pid;
 
 static const value_string force10_pid_vals[] = {
 	{ 0x0111,	"FEFD" },	/* Far End Failure Detection */
diff --git a/epan/dissectors/packet-forces.c b/epan/dissectors/packet-forces.c
index 6f725664e8..191b3c6d7e 100644
--- a/epan/dissectors/packet-forces.c
+++ b/epan/dissectors/packet-forces.c
@@ -24,62 +24,62 @@ static dissector_handle_t  forces_handle_tcp, forces_handle;
 static dissector_handle_t ip_handle;
 
 /* Initialize the ForCES protocol and registered fields */
-static int proto_forces = -1;
+static int proto_forces;
 
 /*Main header*/
-static int hf_forces_version = -1;
-static int hf_forces_rsvd = -1;
-static int hf_forces_messagetype = -1;
-static int hf_forces_sid = -1;
-static int hf_forces_did = -1;
-static int hf_forces_correlator = -1;
-static int hf_forces_length = -1;
+static int hf_forces_version;
+static int hf_forces_rsvd;
+static int hf_forces_messagetype;
+static int hf_forces_sid;
+static int hf_forces_did;
+static int hf_forces_correlator;
+static int hf_forces_length;
 /*Flags*/
-static int hf_forces_flags= -1;
-static int hf_forces_flags_ack= -1;
-static int hf_forces_flags_pri= -1;
-static int hf_forces_flags_rsrvd= -1;
-static int hf_forces_flags_em= -1;
-static int hf_forces_flags_at= -1;
-static int hf_forces_flags_tp= -1;
-static int hf_forces_flags_reserved = -1;
-
-static int hf_forces_tlv_type = -1;
-static int hf_forces_tlv_length = -1;
+static int hf_forces_flags;
+static int hf_forces_flags_ack;
+static int hf_forces_flags_pri;
+static int hf_forces_flags_rsrvd;
+static int hf_forces_flags_em;
+static int hf_forces_flags_at;
+static int hf_forces_flags_tp;
+static int hf_forces_flags_reserved;
+
+static int hf_forces_tlv_type;
+static int hf_forces_tlv_length;
 
 /*Initiation of LFBSelect TLV*/
-static int hf_forces_lfbselect_tlv_type_lfb_classid = -1;
-static int hf_forces_lfbselect_tlv_type_lfb_instanceid = -1;
+static int hf_forces_lfbselect_tlv_type_lfb_classid;
+static int hf_forces_lfbselect_tlv_type_lfb_instanceid;
 
 /*Initiation of Operation TLV*/
-static int hf_forces_lfbselect_tlv_type_operation_type = -1;
-static int hf_forces_lfbselect_tlv_type_operation_length = -1;
-static int hf_forces_lfbselect_tlv_type_operation_path_type = -1;
-static int hf_forces_lfbselect_tlv_type_operation_path_length = -1;
-static int hf_forces_lfbselect_tlv_type_operation_path_flags = -1;
-static int hf_forces_lfbselect_tlv_type_operation_path_flags_selector = -1;
-static int hf_forces_lfbselect_tlv_type_operation_path_flags_reserved = -1;
-static int hf_forces_lfbselect_tlv_type_operation_path_IDcount = -1;
-static int hf_forces_lfbselect_tlv_type_operation_path_IDs = -1;
-static int hf_forces_lfbselect_tlv_type_operation_path_data = -1;
+static int hf_forces_lfbselect_tlv_type_operation_type;
+static int hf_forces_lfbselect_tlv_type_operation_length;
+static int hf_forces_lfbselect_tlv_type_operation_path_type;
+static int hf_forces_lfbselect_tlv_type_operation_path_length;
+static int hf_forces_lfbselect_tlv_type_operation_path_flags;
+static int hf_forces_lfbselect_tlv_type_operation_path_flags_selector;
+static int hf_forces_lfbselect_tlv_type_operation_path_flags_reserved;
+static int hf_forces_lfbselect_tlv_type_operation_path_IDcount;
+static int hf_forces_lfbselect_tlv_type_operation_path_IDs;
+static int hf_forces_lfbselect_tlv_type_operation_path_data;
 
 /*Initiation of Redirect TLV*/
-static int hf_forces_redirect_tlv_meta_data_tlv_type = -1;
-static int hf_forces_redirect_tlv_meta_data_tlv_length = -1;
-static int hf_forces_redirect_tlv_meta_data_tlv_meta_data_ilv = -1;
-static int hf_forces_redirect_tlv_meta_data_tlv_meta_data_ilv_id = -1;
-static int hf_forces_redirect_tlv_meta_data_tlv_meta_data_ilv_length = -1;
-static int hf_forces_redirect_tlv_redirect_data_tlv_type = -1;
-static int hf_forces_redirect_tlv_redirect_data_tlv_length = -1;
+static int hf_forces_redirect_tlv_meta_data_tlv_type;
+static int hf_forces_redirect_tlv_meta_data_tlv_length;
+static int hf_forces_redirect_tlv_meta_data_tlv_meta_data_ilv;
+static int hf_forces_redirect_tlv_meta_data_tlv_meta_data_ilv_id;
+static int hf_forces_redirect_tlv_meta_data_tlv_meta_data_ilv_length;
+static int hf_forces_redirect_tlv_redirect_data_tlv_type;
+static int hf_forces_redirect_tlv_redirect_data_tlv_length;
 
 /*Initiation of ASResult TLV*/
-static int hf_forces_asresult_association_setup_result = -1;
+static int hf_forces_asresult_association_setup_result;
 
 /*Initiation of ASTreason TLV*/
-static int hf_forces_astreason_tlv_teardown_reason = -1;
+static int hf_forces_astreason_tlv_teardown_reason;
 
 /*Main TLV may be unknown*/
-static int hf_forces_unknown_tlv = -1;
+static int hf_forces_unknown_tlv;
 
 /*Message Types */
 #define AssociationSetup            0x01
@@ -140,45 +140,45 @@ static guint forces_alternate_sctp_med_prio_channel_port  = 0;
 static guint forces_alternate_sctp_low_prio_channel_port  = 0;
 
 /*Initialize the subtree pointers*/
-static gint  ett_forces = -1;
-static gint  ett_forces_main_header = -1;
-static gint  ett_forces_flags = -1;
-static gint  ett_forces_tlv = -1;
-static gint  ett_forces_lfbselect_tlv_type = -1;
+static gint  ett_forces;
+static gint  ett_forces_main_header;
+static gint  ett_forces_flags;
+static gint  ett_forces_tlv;
+static gint  ett_forces_lfbselect_tlv_type;
 
 /*Operation TLV subtree*/
-static gint  ett_forces_lfbselect_tlv_type_operation = -1;
-static gint  ett_forces_lfbselect_tlv_type_operation_path = -1;
-static gint  ett_forces_lfbselect_tlv_type_operation_path_data = -1;
-static gint  ett_forces_lfbselect_tlv_type_operation_path_data_path = -1;
-static gint  ett_forces_path_data_tlv = -1;
-static gint  ett_forces_path_data_tlv_flags = -1;
+static gint  ett_forces_lfbselect_tlv_type_operation;
+static gint  ett_forces_lfbselect_tlv_type_operation_path;
+static gint  ett_forces_lfbselect_tlv_type_operation_path_data;
+static gint  ett_forces_lfbselect_tlv_type_operation_path_data_path;
+static gint  ett_forces_path_data_tlv;
+static gint  ett_forces_path_data_tlv_flags;
 
 /*Selector subtree*/
-static gint  ett_forces_lfbselect_tlv_type_operation_path_selector = -1;
+static gint  ett_forces_lfbselect_tlv_type_operation_path_selector;
 
 /*Redirect TLV subtree*/
-static gint  ett_forces_redirect_tlv_type = -1;
-static gint  ett_forces_redirect_tlv_meta_data_tlv = -1;
-static gint  ett_forces_redirect_tlv_meta_data_tlv_meta_data_ilv = -1;
-static gint  ett_forces_redirect_tlv_redirect_data_tlv = -1;
+static gint  ett_forces_redirect_tlv_type;
+static gint  ett_forces_redirect_tlv_meta_data_tlv;
+static gint  ett_forces_redirect_tlv_meta_data_tlv_meta_data_ilv;
+static gint  ett_forces_redirect_tlv_redirect_data_tlv;
 
 /*ASResult TLV subtree*/
-static gint  ett_forces_asresult_tlv = -1;
+static gint  ett_forces_asresult_tlv;
 
 /*ASReason subtree*/
-static gint  ett_forces_astreason_tlv = -1;
+static gint  ett_forces_astreason_tlv;
 
 /*Main_TLV unknown subtree*/
-static gint  ett_forces_unknown_tlv = -1;
+static gint  ett_forces_unknown_tlv;
 
 
-static expert_field ei_forces_length = EI_INIT;
-static expert_field ei_forces_tlv_type = EI_INIT;
-static expert_field ei_forces_tlv_length = EI_INIT;
-static expert_field ei_forces_lfbselect_tlv_type_operation_path_length = EI_INIT;
-static expert_field ei_forces_lfbselect_tlv_type_operation_type = EI_INIT;
-static expert_field ei_forces_redirect_tlv_redirect_data_tlv_length = EI_INIT;
+static expert_field ei_forces_length;
+static expert_field ei_forces_tlv_type;
+static expert_field ei_forces_tlv_length;
+static expert_field ei_forces_lfbselect_tlv_type_operation_path_length;
+static expert_field ei_forces_lfbselect_tlv_type_operation_type;
+static expert_field ei_forces_redirect_tlv_redirect_data_tlv_length;
 
 /*ACK values and the strings to be displayed*/
 static const value_string main_header_flags_ack_vals[] = {
diff --git a/epan/dissectors/packet-fortinet-fgcp.c b/epan/dissectors/packet-fortinet-fgcp.c
index 0992fa76f5..d308545725 100644
--- a/epan/dissectors/packet-fortinet-fgcp.c
+++ b/epan/dissectors/packet-fortinet-fgcp.c
@@ -24,39 +24,39 @@
 void proto_reg_handoff_fortinet_fgcp(void);
 void proto_register_fortinet_fgcp(void);
 
-static int proto_fortinet_fgcp_hb = -1;
-static int hf_fortinet_fgcp_hb_magic = -1;
-static int hf_fortinet_fgcp_hb_flag = -1;
-static int hf_fortinet_fgcp_hb_flag_b74 = -1;
-static int hf_fortinet_fgcp_hb_flag_b3 = -1;
-static int hf_fortinet_fgcp_hb_flag_b2 = -1;
-static int hf_fortinet_fgcp_hb_flag_authentication = -1;
-static int hf_fortinet_fgcp_hb_flag_encryption = -1;
-static int hf_fortinet_fgcp_hb_mode = -1;
-static int hf_fortinet_fgcp_hb_gn = -1;
-static int hf_fortinet_fgcp_hb_group_id = -1;
-static int hf_fortinet_fgcp_hb_port = -1;
-static int hf_fortinet_fgcp_hb_revision = -1;
-static int hf_fortinet_fgcp_hb_sn = -1;
-static int hf_fortinet_fgcp_hb_payload_encrypted = -1;
-static int hf_fortinet_fgcp_hb_authentication = -1;
-
-static int hf_fortinet_fgcp_hb_tlv = -1;
-static int hf_fortinet_fgcp_hb_tlv_type = -1;
-static int hf_fortinet_fgcp_hb_tlv_length = -1;
-static int hf_fortinet_fgcp_hb_tlv_value = -1;
-static int hf_fortinet_fgcp_hb_tlv_vcluster_id = -1;
-static int hf_fortinet_fgcp_hb_tlv_priority = -1;
-static int hf_fortinet_fgcp_hb_tlv_override = -1;
-
-//static int hf_fortinet_fgcp_hb_unknown = -1;
-static int hf_fortinet_fgcp_hb_unknown_uint16 = -1;
+static int proto_fortinet_fgcp_hb;
+static int hf_fortinet_fgcp_hb_magic;
+static int hf_fortinet_fgcp_hb_flag;
+static int hf_fortinet_fgcp_hb_flag_b74;
+static int hf_fortinet_fgcp_hb_flag_b3;
+static int hf_fortinet_fgcp_hb_flag_b2;
+static int hf_fortinet_fgcp_hb_flag_authentication;
+static int hf_fortinet_fgcp_hb_flag_encryption;
+static int hf_fortinet_fgcp_hb_mode;
+static int hf_fortinet_fgcp_hb_gn;
+static int hf_fortinet_fgcp_hb_group_id;
+static int hf_fortinet_fgcp_hb_port;
+static int hf_fortinet_fgcp_hb_revision;
+static int hf_fortinet_fgcp_hb_sn;
+static int hf_fortinet_fgcp_hb_payload_encrypted;
+static int hf_fortinet_fgcp_hb_authentication;
+
+static int hf_fortinet_fgcp_hb_tlv;
+static int hf_fortinet_fgcp_hb_tlv_type;
+static int hf_fortinet_fgcp_hb_tlv_length;
+static int hf_fortinet_fgcp_hb_tlv_value;
+static int hf_fortinet_fgcp_hb_tlv_vcluster_id;
+static int hf_fortinet_fgcp_hb_tlv_priority;
+static int hf_fortinet_fgcp_hb_tlv_override;
+
+//static int hf_fortinet_fgcp_hb_unknown;
+static int hf_fortinet_fgcp_hb_unknown_uint16;
 
 static dissector_handle_t fortinet_fgcp_hb_handle;
 
-static gint ett_fortinet_fgcp_hb = -1;
-static gint ett_fortinet_fgcp_hb_flag = -1;
-static gint ett_fortinet_fgcp_hb_tlv = -1;
+static gint ett_fortinet_fgcp_hb;
+static gint ett_fortinet_fgcp_hb_flag;
+static gint ett_fortinet_fgcp_hb_tlv;
 
 static const value_string fortinet_fgcp_hb_mode_vals[] = {
     { 0x1,            "A/A (Active/Active)"},
diff --git a/epan/dissectors/packet-fortinet-sso.c b/epan/dissectors/packet-fortinet-sso.c
index 22d61124ef..d907e95082 100644
--- a/epan/dissectors/packet-fortinet-sso.c
+++ b/epan/dissectors/packet-fortinet-sso.c
@@ -21,23 +21,23 @@
 void proto_register_fortinet_sso(void);
 void proto_reg_handoff_fortinet_sso(void);
 
-static int proto_fortinet_sso = -1;
-static gint ett_fortinet_sso  = -1;
-
-static int hf_fsso_length = -1;
-static int hf_fsso_timestamp = -1;
-static int hf_fsso_client_ip = -1;
-static int hf_fsso_payload_length = -1;
-static int hf_fsso_string = -1;
-static int hf_fsso_domain = -1;
-static int hf_fsso_user = -1;
-static int hf_fsso_host = -1;
-static int hf_fsso_version = -1;
-static int hf_fsso_tsagent_number_port_range = -1;
-static int hf_fsso_tsagent_port_range_min = -1;
-static int hf_fsso_tsagent_port_range_max = -1;
-static int hf_fsso_unknown = -1;
-static int hf_fsso_unknown_ipv4 = -1;
+static int proto_fortinet_sso;
+static gint ett_fortinet_sso;
+
+static int hf_fsso_length;
+static int hf_fsso_timestamp;
+static int hf_fsso_client_ip;
+static int hf_fsso_payload_length;
+static int hf_fsso_string;
+static int hf_fsso_domain;
+static int hf_fsso_user;
+static int hf_fsso_host;
+static int hf_fsso_version;
+static int hf_fsso_tsagent_number_port_range;
+static int hf_fsso_tsagent_port_range_min;
+static int hf_fsso_tsagent_port_range_max;
+static int hf_fsso_unknown;
+static int hf_fsso_unknown_ipv4;
 
 static dissector_handle_t fortinet_sso_handle;
 
diff --git a/epan/dissectors/packet-foundry.c b/epan/dissectors/packet-foundry.c
index c1e28b14de..97142d729d 100644
--- a/epan/dissectors/packet-foundry.c
+++ b/epan/dissectors/packet-foundry.c
@@ -24,46 +24,46 @@ void proto_reg_handoff_fdp(void);
 
 static dissector_handle_t fdp_handle;
 
-static int hf_llc_foundry_pid = -1;
+static int hf_llc_foundry_pid;
 
-static int proto_fdp = -1;
+static int proto_fdp;
 /* FDP header */
-static int hf_fdp_version = -1;
-static int hf_fdp_holdtime = -1;
-static int hf_fdp_checksum = -1;
+static int hf_fdp_version;
+static int hf_fdp_holdtime;
+static int hf_fdp_checksum;
 /* TLV header */
-static int hf_fdp_tlv_type = -1;
-static int hf_fdp_tlv_length = -1;
+static int hf_fdp_tlv_type;
+static int hf_fdp_tlv_length;
 /* Unknown element */
-static int hf_fdp_unknown = -1;
-static int hf_fdp_unknown_data = -1;
+static int hf_fdp_unknown;
+static int hf_fdp_unknown_data;
 /* Port Tag element */
-static int hf_fdp_tag = -1;
-static int hf_fdp_tag_native = -1;
-static int hf_fdp_tag_type = -1;
-static int hf_fdp_tag_unknown = -1;
+static int hf_fdp_tag;
+static int hf_fdp_tag_native;
+static int hf_fdp_tag_type;
+static int hf_fdp_tag_unknown;
 /* VLAN Bitmap */
-static int hf_fdp_vlanmap = -1;
-static int hf_fdp_vlanmap_vlan = -1;
+static int hf_fdp_vlanmap;
+static int hf_fdp_vlanmap_vlan;
 /* String element */
-static int hf_fdp_string = -1;
-static int hf_fdp_string_data = -1;
-static int hf_fdp_string_text = -1;
+static int hf_fdp_string;
+static int hf_fdp_string_data;
+static int hf_fdp_string_text;
 /* Net? element */
-static int hf_fdp_net = -1;
-static int hf_fdp_net_unknown = -1;
-static int hf_fdp_net_ip = -1;
-static int hf_fdp_net_iplength = -1;
-
-static gint ett_fdp = -1;
-static gint ett_fdp_tlv_header = -1;
-static gint ett_fdp_unknown = -1;
-static gint ett_fdp_string = -1;
-static gint ett_fdp_net = -1;
-static gint ett_fdp_tag = -1;
-static gint ett_fdp_vlanmap = -1;
-
-static expert_field ei_fdp_tlv_length = EI_INIT;
+static int hf_fdp_net;
+static int hf_fdp_net_unknown;
+static int hf_fdp_net_ip;
+static int hf_fdp_net_iplength;
+
+static gint ett_fdp;
+static gint ett_fdp_tlv_header;
+static gint ett_fdp_unknown;
+static gint ett_fdp_string;
+static gint ett_fdp_net;
+static gint ett_fdp_tag;
+static gint ett_fdp_vlanmap;
+
+static expert_field ei_fdp_tlv_length;
 
 #define PROTO_SHORT_NAME "FDP"
 #define PROTO_LONG_NAME "Foundry Discovery Protocol"
diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c
index 49ecd22824..633bf3ae04 100644
--- a/epan/dissectors/packet-fp_hint.c
+++ b/epan/dissectors/packet-fp_hint.c
@@ -22,41 +22,41 @@
 void proto_register_fp_hint(void);
 void proto_reg_handoff_fp_hint(void);
 
-static int proto_fp_hint = -1;
+static int proto_fp_hint;
 extern int proto_fp;
 extern int proto_umts_mac;
 extern int proto_umts_rlc;
 
-static int ett_fph = -1;
-static int ett_fph_rb = -1;
-static int ett_fph_ddi_entry = -1;
-static int ett_fph_tf = -1;
-
-static int hf_fph_frametype = -1;
-static int hf_fph_channeltype = -1;
-static int hf_fph_chcnt = -1;
-static int hf_fph_dchid = -1;
-static int hf_fph_urnti = -1;
-static int hf_fph_rlcmode = -1;
-static int hf_fph_content = -1;
-static int hf_fph_rbid = -1;
-static int hf_fph_ctmux = -1;
-static int hf_fph_ciphered = -1;
-static int hf_fph_deciphered = -1;
-static int hf_fph_macdflowid = -1;
-static int hf_fph_macehs = -1;
-static int hf_fph_rb = -1;
-static int hf_fph_ddi_entry = -1;
-static int hf_fph_ddi_size = -1;
-static int hf_fph_ddi_logical = -1;
-static int hf_fph_ddi_value = -1;
-static int hf_fph_tf = -1;
-static int hf_fph_tf_n = -1;
-static int hf_fph_tf_size = -1;
-
-static expert_field ei_fph_radio_bearers = EI_INIT;
-static expert_field ei_fph_mac_frames = EI_INIT;
-static expert_field ei_fph_fp_channels = EI_INIT;
+static int ett_fph;
+static int ett_fph_rb;
+static int ett_fph_ddi_entry;
+static int ett_fph_tf;
+
+static int hf_fph_frametype;
+static int hf_fph_channeltype;
+static int hf_fph_chcnt;
+static int hf_fph_dchid;
+static int hf_fph_urnti;
+static int hf_fph_rlcmode;
+static int hf_fph_content;
+static int hf_fph_rbid;
+static int hf_fph_ctmux;
+static int hf_fph_ciphered;
+static int hf_fph_deciphered;
+static int hf_fph_macdflowid;
+static int hf_fph_macehs;
+static int hf_fph_rb;
+static int hf_fph_ddi_entry;
+static int hf_fph_ddi_size;
+static int hf_fph_ddi_logical;
+static int hf_fph_ddi_value;
+static int hf_fph_tf;
+static int hf_fph_tf_n;
+static int hf_fph_tf_size;
+
+static expert_field ei_fph_radio_bearers;
+static expert_field ei_fph_mac_frames;
+static expert_field ei_fph_fp_channels;
 
 static dissector_handle_t data_handle;
 static dissector_handle_t ethwithfcs_handle;
diff --git a/epan/dissectors/packet-fp_mux.c b/epan/dissectors/packet-fp_mux.c
index 5660dabd81..01d101cc0f 100644
--- a/epan/dissectors/packet-fp_mux.c
+++ b/epan/dissectors/packet-fp_mux.c
@@ -27,7 +27,7 @@ extern int proto_umts_rlc;
 void proto_register_fp_mux(void);
 void proto_reg_handoff_fp_mux(void);
 
-static int proto_fp_mux = -1;
+static int proto_fp_mux;
 static dissector_handle_t fp_mux_handle;
 static heur_dissector_list_t heur_subdissector_list;
 
@@ -35,17 +35,17 @@ static heur_dissector_list_t heur_subdissector_list;
 #define MAX_PAYLOADS 64
 
 /* Trees */
-static int ett_fpmux = -1;
+static int ett_fpmux;
 
 /* Fields */
-static int hf_fpmux_uid = -1;
-static int hf_fpmux_extension_flag = -1;
-static int hf_fpmux_length = -1;
+static int hf_fpmux_uid;
+static int hf_fpmux_extension_flag;
+static int hf_fpmux_length;
 
 /* Expert Fields */
-static expert_field ei_fpm_length_needlessly_extended = EI_INIT;
-static expert_field ei_fpm_too_many_payloads = EI_INIT;
-static expert_field ei_fpm_bad_length = EI_INIT;
+static expert_field ei_fpm_length_needlessly_extended;
+static expert_field ei_fpm_too_many_payloads;
+static expert_field ei_fpm_bad_length;
 
 /* Preferences */
 /* Place UID in proto tree */
diff --git a/epan/dissectors/packet-fpp.c b/epan/dissectors/packet-fpp.c
index 2f7a82a547..679190aff2 100644
--- a/epan/dissectors/packet-fpp.c
+++ b/epan/dissectors/packet-fpp.c
@@ -25,43 +25,43 @@
 void proto_register_fpp(void);
 void proto_reg_handoff_fpp(void);
 
-static int proto_fpp = -1;
+static int proto_fpp;
 
 static dissector_handle_t fpp_handle;
 
-static int hf_fpp_preamble = -1;
-static int hf_fpp_preamble_pad = -1;
-static int hf_fpp_preamble_smd = -1;
-static int hf_fpp_preamble_frag_count = -1;
-static int hf_fpp_mdata = -1;
-static int hf_fpp_crc32 = -1;
-static int hf_fpp_crc32_status = -1;
-static int hf_fpp_mcrc32 = -1;
-static int hf_fpp_mcrc32_status = -1;
+static int hf_fpp_preamble;
+static int hf_fpp_preamble_pad;
+static int hf_fpp_preamble_smd;
+static int hf_fpp_preamble_frag_count;
+static int hf_fpp_mdata;
+static int hf_fpp_crc32;
+static int hf_fpp_crc32_status;
+static int hf_fpp_mcrc32;
+static int hf_fpp_mcrc32_status;
 
-static expert_field ei_fpp_crc32 = EI_INIT;
-static expert_field ei_fpp_mcrc32 = EI_INIT;
+static expert_field ei_fpp_crc32;
+static expert_field ei_fpp_mcrc32;
 
-static gint ett_fpp = -1;
-static gint ett_fpp_preamble = -1;
+static gint ett_fpp;
+static gint ett_fpp_preamble;
 
 static reassembly_table fpp_reassembly_table;
 
 static dissector_handle_t ethl2_handle;
 
 /* Reassembly Data */
-static int hf_fpp_fragments = -1;
-static int hf_fpp_fragment = -1;
-static int hf_fpp_fragment_overlap = -1;
-static int hf_fpp_fragment_overlap_conflicts = -1;
-static int hf_fpp_fragment_multiple_tails = -1;
-static int hf_fpp_fragment_too_long_fragment = -1;
-static int hf_fpp_fragment_error = -1;
-static int hf_fpp_fragment_count = -1;
-static int hf_fpp_reassembled_in = -1;
-static int hf_fpp_reassembled_length = -1;
-static gint ett_fpp_fragment = -1;
-static gint ett_fpp_fragments = -1;
+static int hf_fpp_fragments;
+static int hf_fpp_fragment;
+static int hf_fpp_fragment_overlap;
+static int hf_fpp_fragment_overlap_conflicts;
+static int hf_fpp_fragment_multiple_tails;
+static int hf_fpp_fragment_too_long_fragment;
+static int hf_fpp_fragment_error;
+static int hf_fpp_fragment_count;
+static int hf_fpp_reassembled_in;
+static int hf_fpp_reassembled_length;
+static gint ett_fpp_fragment;
+static gint ett_fpp_fragments;
 
 static const fragment_items fpp_frag_items = {
     /* Fragment subtrees */
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index 7cfb34a754..685678c373 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -64,47 +64,47 @@ void proto_reg_handoff_fr(void);
 
 #define FROM_DCE                0x80    /* for direction setting */
 
-static gint proto_fr              = -1;
-static gint ett_fr                = -1;
-static gint ett_fr_address        = -1;
-static gint ett_fr_control        = -1;
-static gint hf_fr_ea              = -1;
-static gint hf_fr_upper_dlci      = -1;
-static gint hf_fr_cr              = -1;
-static gint hf_fr_second_dlci     = -1;
-static gint hf_fr_fecn            = -1;
-static gint hf_fr_becn            = -1;
-static gint hf_fr_de              = -1;
-static gint hf_fr_third_dlci      = -1;
-static gint hf_fr_dlcore_control  = -1;
-static gint hf_fr_lower_dlci      = -1;
-static gint hf_fr_dc              = -1;
-static gint hf_fr_dlci            = -1;
-static gint hf_fr_control         = -1;
-static gint hf_fr_n_r             = -1;
-static gint hf_fr_n_s             = -1;
-static gint hf_fr_p               = -1;
-static gint hf_fr_p_ext           = -1;
-static gint hf_fr_f               = -1;
-static gint hf_fr_f_ext           = -1;
-static gint hf_fr_s_ftype         = -1;
-static gint hf_fr_u_modifier_cmd  = -1;
-static gint hf_fr_u_modifier_resp = -1;
-static gint hf_fr_ftype_i         = -1;
-static gint hf_fr_ftype_s_u       = -1;
-static gint hf_fr_ftype_s_u_ext   = -1;
-static gint hf_fr_nlpid           = -1;
-static gint hf_fr_oui             = -1;
-static gint hf_fr_pid             = -1;
-static gint hf_fr_snaptype        = -1;
-static gint hf_fr_chdlctype       = -1;
-static gint hf_fr_first_addr_octet  = -1;
-static gint hf_fr_second_addr_octet  = -1;
-static gint hf_fr_third_addr_octet  = -1;
-
-static expert_field ei_fr_bogus_address = EI_INIT;
-static expert_field ei_fr_frame_relay_lapf = EI_INIT;
-static expert_field ei_fr_frame_relay_xid = EI_INIT;
+static gint proto_fr;
+static gint ett_fr;
+static gint ett_fr_address;
+static gint ett_fr_control;
+static gint hf_fr_ea;
+static gint hf_fr_upper_dlci;
+static gint hf_fr_cr;
+static gint hf_fr_second_dlci;
+static gint hf_fr_fecn;
+static gint hf_fr_becn;
+static gint hf_fr_de;
+static gint hf_fr_third_dlci;
+static gint hf_fr_dlcore_control;
+static gint hf_fr_lower_dlci;
+static gint hf_fr_dc;
+static gint hf_fr_dlci;
+static gint hf_fr_control;
+static gint hf_fr_n_r;
+static gint hf_fr_n_s;
+static gint hf_fr_p;
+static gint hf_fr_p_ext;
+static gint hf_fr_f;
+static gint hf_fr_f_ext;
+static gint hf_fr_s_ftype;
+static gint hf_fr_u_modifier_cmd;
+static gint hf_fr_u_modifier_resp;
+static gint hf_fr_ftype_i;
+static gint hf_fr_ftype_s_u;
+static gint hf_fr_ftype_s_u_ext;
+static gint hf_fr_nlpid;
+static gint hf_fr_oui;
+static gint hf_fr_pid;
+static gint hf_fr_snaptype;
+static gint hf_fr_chdlctype;
+static gint hf_fr_first_addr_octet;
+static gint hf_fr_second_addr_octet;
+static gint hf_fr_third_addr_octet;
+
+static expert_field ei_fr_bogus_address;
+static expert_field ei_fr_frame_relay_lapf;
+static expert_field ei_fr_frame_relay_xid;
 
 static dissector_handle_t eth_withfcs_handle;
 static dissector_handle_t gprs_ns_handle;
diff --git a/epan/dissectors/packet-fractalgeneratorprotocol.c b/epan/dissectors/packet-fractalgeneratorprotocol.c
index 244ae8365d..a35dbceaaa 100644
--- a/epan/dissectors/packet-fractalgeneratorprotocol.c
+++ b/epan/dissectors/packet-fractalgeneratorprotocol.c
@@ -30,30 +30,30 @@ static dissector_handle_t fgp_handle;
 
 
 /* Initialize the protocol and registered fields */
-static int proto_fractalgeneratorprotocol = -1;
+static int proto_fractalgeneratorprotocol;
 static int tap_fractalgeneratorprotocol   = -1;
-static int hf_message_type                = -1;
-static int hf_message_flags               = -1;
-static int hf_message_length              = -1;
-static int hf_data_start_x                = -1;
-static int hf_data_start_y                = -1;
-static int hf_data_points                 = -1;
-static int hf_parameter_width             = -1;
-static int hf_parameter_height            = -1;
-static int hf_parameter_maxiterations     = -1;
-static int hf_parameter_algorithmid       = -1;
-static int hf_parameter_c1real            = -1;
-static int hf_parameter_c1imag            = -1;
-static int hf_parameter_c2real            = -1;
-static int hf_parameter_c2imag            = -1;
-static int hf_parameter_n                 = -1;
-static int hf_buffer                      = -1;
+static int hf_message_type;
+static int hf_message_flags;
+static int hf_message_length;
+static int hf_data_start_x;
+static int hf_data_start_y;
+static int hf_data_points;
+static int hf_parameter_width;
+static int hf_parameter_height;
+static int hf_parameter_maxiterations;
+static int hf_parameter_algorithmid;
+static int hf_parameter_c1real;
+static int hf_parameter_c1imag;
+static int hf_parameter_c2real;
+static int hf_parameter_c2imag;
+static int hf_parameter_n;
+static int hf_buffer;
 
 static guint64 fgp_total_msgs     = 0;
 static guint64 fgp_total_bytes    = 0;
 
 /* Initialize the subtree pointers */
-static gint ett_fractalgeneratorprotocol = -1;
+static gint ett_fractalgeneratorprotocol;
 
 /* Dissectors for messages. This is specific to FractalGeneratorProtocol */
 #define MESSAGE_TYPE_LENGTH    1
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index ca61f69841..3a7a165c6f 100644
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -44,169 +44,169 @@
 void proto_register_frame(void);
 void proto_reg_handoff_frame(void);
 
-static int proto_frame = -1;
-static int proto_pkt_comment = -1;
-static int proto_syscall = -1;
-static int proto_bblog = -1;
-
-static int hf_frame_arrival_time_local = -1;
-static int hf_frame_arrival_time_utc = -1;
-static int hf_frame_arrival_time_epoch = -1;
-static int hf_frame_shift_offset = -1;
-static int hf_frame_time_delta = -1;
-static int hf_frame_time_delta_displayed = -1;
-static int hf_frame_time_relative = -1;
-static int hf_frame_time_relative_cap = -1;
-static int hf_frame_time_reference = -1;
-static int hf_frame_number = -1;
-static int hf_frame_len = -1;
-static int hf_frame_capture_len = -1;
-static int hf_frame_p2p_dir = -1;
-static int hf_frame_file_off = -1;
-static int hf_frame_md5_hash = -1;
-static int hf_frame_marked = -1;
-static int hf_frame_ignored = -1;
-static int hf_link_number = -1;
-static int hf_frame_packet_id = -1;
-static int hf_frame_hash = -1;
-static int hf_frame_hash_bytes = -1;
-static int hf_frame_verdict = -1;
-static int hf_frame_verdict_hardware = -1;
-static int hf_frame_verdict_tc = -1;
-static int hf_frame_verdict_xdp = -1;
-static int hf_frame_verdict_unknown = -1;
-static int hf_frame_drop_count = -1;
-static int hf_frame_protocols = -1;
-static int hf_frame_color_filter_name = -1;
-static int hf_frame_color_filter_text = -1;
-static int hf_frame_section_number = -1;
-static int hf_frame_interface_id = -1;
-static int hf_frame_interface_name = -1;
-static int hf_frame_interface_description = -1;
-static int hf_frame_interface_queue = -1;
-static int hf_frame_pack_flags = -1;
-static int hf_frame_pack_direction = -1;
-static int hf_frame_pack_reception_type = -1;
-static int hf_frame_pack_fcs_length = -1;
-static int hf_frame_pack_reserved = -1;
-static int hf_frame_pack_crc_error = -1;
-static int hf_frame_pack_wrong_packet_too_long_error = -1;
-static int hf_frame_pack_wrong_packet_too_short_error = -1;
-static int hf_frame_pack_wrong_inter_frame_gap_error = -1;
-static int hf_frame_pack_unaligned_frame_error = -1;
-static int hf_frame_pack_start_frame_delimiter_error = -1;
-static int hf_frame_pack_preamble_error = -1;
-static int hf_frame_pack_symbol_error = -1;
-static int hf_frame_wtap_encap = -1;
-static int hf_frame_cb_pen = -1;
-static int hf_frame_cb_copy_allowed = -1;
-static int hf_frame_bblog = -1;
-static int hf_frame_bblog_ticks = -1;
-static int hf_frame_bblog_serial_nr = -1;
-static int hf_frame_bblog_event_id = -1;
-static int hf_frame_bblog_event_flags = -1;
-static int hf_frame_bblog_event_flags_rxbuf = -1;
-static int hf_frame_bblog_event_flags_txbuf = -1;
-static int hf_frame_bblog_event_flags_hdr = -1;
-static int hf_frame_bblog_event_flags_verbose = -1;
-static int hf_frame_bblog_event_flags_stack = -1;
-static int hf_frame_bblog_errno = -1;
-static int hf_frame_bblog_rxb_acc = -1;
-static int hf_frame_bblog_rxb_ccc = -1;
-static int hf_frame_bblog_rxb_spare = -1;
-static int hf_frame_bblog_txb_acc = -1;
-static int hf_frame_bblog_txb_ccc = -1;
-static int hf_frame_bblog_txb_spare = -1;
-static int hf_frame_bblog_state = -1;
-static int hf_frame_bblog_starttime = -1;
-static int hf_frame_bblog_iss = -1;
-static int hf_frame_bblog_t_flags = -1;
-static int hf_frame_bblog_t_flags_ack_now = -1;
-static int hf_frame_bblog_t_flags_delayed_ack = -1;
-static int hf_frame_bblog_t_flags_no_delay = -1;
-static int hf_frame_bblog_t_flags_no_opt = -1;
-static int hf_frame_bblog_t_flags_sent_fin = -1;
-static int hf_frame_bblog_t_flags_request_window_scale = -1;
-static int hf_frame_bblog_t_flags_received_window_scale = -1;
-static int hf_frame_bblog_t_flags_request_timestamp = -1;
-static int hf_frame_bblog_t_flags_received_timestamp = -1;
-static int hf_frame_bblog_t_flags_sack_permitted = -1;
-static int hf_frame_bblog_t_flags_need_syn = -1;
-static int hf_frame_bblog_t_flags_need_fin = -1;
-static int hf_frame_bblog_t_flags_no_push = -1;
-static int hf_frame_bblog_t_flags_prev_valid = -1;
-static int hf_frame_bblog_t_flags_wake_socket_receive = -1;
-static int hf_frame_bblog_t_flags_goodput_in_progress = -1;
-static int hf_frame_bblog_t_flags_more_to_come = -1;
-static int hf_frame_bblog_t_flags_listen_queue_overflow = -1;
-static int hf_frame_bblog_t_flags_last_idle = -1;
-static int hf_frame_bblog_t_flags_zero_recv_window_sent = -1;
-static int hf_frame_bblog_t_flags_be_in_fast_recovery = -1;
-static int hf_frame_bblog_t_flags_was_in_fast_recovery = -1;
-static int hf_frame_bblog_t_flags_signature = -1;
-static int hf_frame_bblog_t_flags_force_data = -1;
-static int hf_frame_bblog_t_flags_tso = -1;
-static int hf_frame_bblog_t_flags_toe = -1;
-static int hf_frame_bblog_t_flags_unused_0 = -1;
-static int hf_frame_bblog_t_flags_unused_1 = -1;
-static int hf_frame_bblog_t_flags_lost_rtx_detection = -1;
-static int hf_frame_bblog_t_flags_be_in_cong_recovery = -1;
-static int hf_frame_bblog_t_flags_was_in_cong_recovery = -1;
-static int hf_frame_bblog_t_flags_fast_open = -1;
-static int hf_frame_bblog_snd_una = -1;
-static int hf_frame_bblog_snd_max = -1;
-static int hf_frame_bblog_snd_cwnd = -1;
-static int hf_frame_bblog_snd_nxt = -1;
-static int hf_frame_bblog_snd_recover = -1;
-static int hf_frame_bblog_snd_wnd = -1;
-static int hf_frame_bblog_snd_ssthresh = -1;
-static int hf_frame_bblog_srtt = -1;
-static int hf_frame_bblog_rttvar = -1;
-static int hf_frame_bblog_rcv_up = -1;
-static int hf_frame_bblog_rcv_adv = -1;
-static int hf_frame_bblog_t_flags2 = -1;
-static int hf_frame_bblog_t_flags2_plpmtu_blackhole = -1;
-static int hf_frame_bblog_t_flags2_plpmtu_pmtud = -1;
-static int hf_frame_bblog_t_flags2_plpmtu_maxsegsnt = -1;
-static int hf_frame_bblog_t_flags2_log_auto = -1;
-static int hf_frame_bblog_t_flags2_drop_after_data = -1;
-static int hf_frame_bblog_t_flags2_ecn_permit = -1;
-static int hf_frame_bblog_t_flags2_ecn_snd_cwr = -1;
-static int hf_frame_bblog_t_flags2_ecn_snd_ece = -1;
-static int hf_frame_bblog_t_flags2_ace_permit = -1;
-static int hf_frame_bblog_t_flags2_first_bytes_complete = -1;
-static int hf_frame_bblog_rcv_nxt = -1;
-static int hf_frame_bblog_rcv_wnd = -1;
-static int hf_frame_bblog_dupacks = -1;
-static int hf_frame_bblog_seg_qlen = -1;
-static int hf_frame_bblog_snd_num_holes = -1;
-static int hf_frame_bblog_flex_1 = -1;
-static int hf_frame_bblog_flex_2 = -1;
-static int hf_frame_bblog_first_byte_in = -1;
-static int hf_frame_bblog_first_byte_out = -1;
-static int hf_frame_bblog_snd_scale = -1;
-static int hf_frame_bblog_rcv_scale = -1;
-static int hf_frame_bblog_pad_1 = -1;
-static int hf_frame_bblog_pad_2 = -1;
-static int hf_frame_bblog_pad_3 = -1;
-static int hf_frame_bblog_payload_len = -1;
-static int hf_comments_text = -1;
-
-static gint ett_frame = -1;
-static gint ett_ifname = -1;
-static gint ett_flags = -1;
-static gint ett_comments = -1;
-static gint ett_hash = -1;
-static gint ett_verdict = -1;
-static gint ett_bblog = -1;
-static gint ett_bblog_event_flags = -1;
-static gint ett_bblog_t_flags = -1;
-static gint ett_bblog_t_flags2 = -1;
-
-static expert_field ei_comments_text = EI_INIT;
-static expert_field ei_arrive_time_out_of_range = EI_INIT;
-static expert_field ei_incomplete = EI_INIT;
-static expert_field ei_len_lt_caplen = EI_INIT;
+static int proto_frame;
+static int proto_pkt_comment;
+static int proto_syscall;
+static int proto_bblog;
+
+static int hf_frame_arrival_time_local;
+static int hf_frame_arrival_time_utc;
+static int hf_frame_arrival_time_epoch;
+static int hf_frame_shift_offset;
+static int hf_frame_time_delta;
+static int hf_frame_time_delta_displayed;
+static int hf_frame_time_relative;
+static int hf_frame_time_relative_cap;
+static int hf_frame_time_reference;
+static int hf_frame_number;
+static int hf_frame_len;
+static int hf_frame_capture_len;
+static int hf_frame_p2p_dir;
+static int hf_frame_file_off;
+static int hf_frame_md5_hash;
+static int hf_frame_marked;
+static int hf_frame_ignored;
+static int hf_link_number;
+static int hf_frame_packet_id;
+static int hf_frame_hash;
+static int hf_frame_hash_bytes;
+static int hf_frame_verdict;
+static int hf_frame_verdict_hardware;
+static int hf_frame_verdict_tc;
+static int hf_frame_verdict_xdp;
+static int hf_frame_verdict_unknown;
+static int hf_frame_drop_count;
+static int hf_frame_protocols;
+static int hf_frame_color_filter_name;
+static int hf_frame_color_filter_text;
+static int hf_frame_section_number;
+static int hf_frame_interface_id;
+static int hf_frame_interface_name;
+static int hf_frame_interface_description;
+static int hf_frame_interface_queue;
+static int hf_frame_pack_flags;
+static int hf_frame_pack_direction;
+static int hf_frame_pack_reception_type;
+static int hf_frame_pack_fcs_length;
+static int hf_frame_pack_reserved;
+static int hf_frame_pack_crc_error;
+static int hf_frame_pack_wrong_packet_too_long_error;
+static int hf_frame_pack_wrong_packet_too_short_error;
+static int hf_frame_pack_wrong_inter_frame_gap_error;
+static int hf_frame_pack_unaligned_frame_error;
+static int hf_frame_pack_start_frame_delimiter_error;
+static int hf_frame_pack_preamble_error;
+static int hf_frame_pack_symbol_error;
+static int hf_frame_wtap_encap;
+static int hf_frame_cb_pen;
+static int hf_frame_cb_copy_allowed;
+static int hf_frame_bblog;
+static int hf_frame_bblog_ticks;
+static int hf_frame_bblog_serial_nr;
+static int hf_frame_bblog_event_id;
+static int hf_frame_bblog_event_flags;
+static int hf_frame_bblog_event_flags_rxbuf;
+static int hf_frame_bblog_event_flags_txbuf;
+static int hf_frame_bblog_event_flags_hdr;
+static int hf_frame_bblog_event_flags_verbose;
+static int hf_frame_bblog_event_flags_stack;
+static int hf_frame_bblog_errno;
+static int hf_frame_bblog_rxb_acc;
+static int hf_frame_bblog_rxb_ccc;
+static int hf_frame_bblog_rxb_spare;
+static int hf_frame_bblog_txb_acc;
+static int hf_frame_bblog_txb_ccc;
+static int hf_frame_bblog_txb_spare;
+static int hf_frame_bblog_state;
+static int hf_frame_bblog_starttime;
+static int hf_frame_bblog_iss;
+static int hf_frame_bblog_t_flags;
+static int hf_frame_bblog_t_flags_ack_now;
+static int hf_frame_bblog_t_flags_delayed_ack;
+static int hf_frame_bblog_t_flags_no_delay;
+static int hf_frame_bblog_t_flags_no_opt;
+static int hf_frame_bblog_t_flags_sent_fin;
+static int hf_frame_bblog_t_flags_request_window_scale;
+static int hf_frame_bblog_t_flags_received_window_scale;
+static int hf_frame_bblog_t_flags_request_timestamp;
+static int hf_frame_bblog_t_flags_received_timestamp;
+static int hf_frame_bblog_t_flags_sack_permitted;
+static int hf_frame_bblog_t_flags_need_syn;
+static int hf_frame_bblog_t_flags_need_fin;
+static int hf_frame_bblog_t_flags_no_push;
+static int hf_frame_bblog_t_flags_prev_valid;
+static int hf_frame_bblog_t_flags_wake_socket_receive;
+static int hf_frame_bblog_t_flags_goodput_in_progress;
+static int hf_frame_bblog_t_flags_more_to_come;
+static int hf_frame_bblog_t_flags_listen_queue_overflow;
+static int hf_frame_bblog_t_flags_last_idle;
+static int hf_frame_bblog_t_flags_zero_recv_window_sent;
+static int hf_frame_bblog_t_flags_be_in_fast_recovery;
+static int hf_frame_bblog_t_flags_was_in_fast_recovery;
+static int hf_frame_bblog_t_flags_signature;
+static int hf_frame_bblog_t_flags_force_data;
+static int hf_frame_bblog_t_flags_tso;
+static int hf_frame_bblog_t_flags_toe;
+static int hf_frame_bblog_t_flags_unused_0;
+static int hf_frame_bblog_t_flags_unused_1;
+static int hf_frame_bblog_t_flags_lost_rtx_detection;
+static int hf_frame_bblog_t_flags_be_in_cong_recovery;
+static int hf_frame_bblog_t_flags_was_in_cong_recovery;
+static int hf_frame_bblog_t_flags_fast_open;
+static int hf_frame_bblog_snd_una;
+static int hf_frame_bblog_snd_max;
+static int hf_frame_bblog_snd_cwnd;
+static int hf_frame_bblog_snd_nxt;
+static int hf_frame_bblog_snd_recover;
+static int hf_frame_bblog_snd_wnd;
+static int hf_frame_bblog_snd_ssthresh;
+static int hf_frame_bblog_srtt;
+static int hf_frame_bblog_rttvar;
+static int hf_frame_bblog_rcv_up;
+static int hf_frame_bblog_rcv_adv;
+static int hf_frame_bblog_t_flags2;
+static int hf_frame_bblog_t_flags2_plpmtu_blackhole;
+static int hf_frame_bblog_t_flags2_plpmtu_pmtud;
+static int hf_frame_bblog_t_flags2_plpmtu_maxsegsnt;
+static int hf_frame_bblog_t_flags2_log_auto;
+static int hf_frame_bblog_t_flags2_drop_after_data;
+static int hf_frame_bblog_t_flags2_ecn_permit;
+static int hf_frame_bblog_t_flags2_ecn_snd_cwr;
+static int hf_frame_bblog_t_flags2_ecn_snd_ece;
+static int hf_frame_bblog_t_flags2_ace_permit;
+static int hf_frame_bblog_t_flags2_first_bytes_complete;
+static int hf_frame_bblog_rcv_nxt;
+static int hf_frame_bblog_rcv_wnd;
+static int hf_frame_bblog_dupacks;
+static int hf_frame_bblog_seg_qlen;
+static int hf_frame_bblog_snd_num_holes;
+static int hf_frame_bblog_flex_1;
+static int hf_frame_bblog_flex_2;
+static int hf_frame_bblog_first_byte_in;
+static int hf_frame_bblog_first_byte_out;
+static int hf_frame_bblog_snd_scale;
+static int hf_frame_bblog_rcv_scale;
+static int hf_frame_bblog_pad_1;
+static int hf_frame_bblog_pad_2;
+static int hf_frame_bblog_pad_3;
+static int hf_frame_bblog_payload_len;
+static int hf_comments_text;
+
+static gint ett_frame;
+static gint ett_ifname;
+static gint ett_flags;
+static gint ett_comments;
+static gint ett_hash;
+static gint ett_verdict;
+static gint ett_bblog;
+static gint ett_bblog_event_flags;
+static gint ett_bblog_t_flags;
+static gint ett_bblog_t_flags2;
+
+static expert_field ei_comments_text;
+static expert_field ei_arrive_time_out_of_range;
+static expert_field ei_incomplete;
+static expert_field ei_len_lt_caplen;
 
 static int frame_tap = -1;
 
diff --git a/epan/dissectors/packet-ftdi-ft.c b/epan/dissectors/packet-ftdi-ft.c
index b80ff0c750..4aa5fd2895 100644
--- a/epan/dissectors/packet-ftdi-ft.c
+++ b/epan/dissectors/packet-ftdi-ft.c
@@ -19,87 +19,87 @@
 #include "packet-usb.h"
 #include "packet-ftdi-ft.h"
 
-static int proto_ftdi_ft = -1;
-
-static gint hf_setup_brequest = -1;
-static gint hf_setup_lvalue = -1;
-static gint hf_setup_lvalue_purge = -1;
-static gint hf_setup_lvalue_dtr = -1;
-static gint hf_setup_lvalue_rts = -1;
-static gint hf_setup_lvalue_xon_char = -1;
-static gint hf_setup_lvalue_baud_low = -1;
-static gint hf_setup_lvalue_data_size = -1;
-static gint hf_setup_lvalue_event_char = -1;
-static gint hf_setup_lvalue_error_char = -1;
-static gint hf_setup_lvalue_latency_time = -1;
-static gint hf_setup_lvalue_bitmask = -1;
-static gint hf_setup_hvalue = -1;
-static gint hf_setup_hvalue_dtr = -1;
-static gint hf_setup_hvalue_rts = -1;
-static gint hf_setup_hvalue_xoff_char = -1;
-static gint hf_setup_hvalue_baud_mid = -1;
-static gint hf_setup_hvalue_parity = -1;
-static gint hf_setup_hvalue_stop_bits = -1;
-static gint hf_setup_hvalue_break_bit = -1;
-static gint hf_setup_hvalue_trigger = -1;
-static gint hf_setup_hvalue_error_replacement = -1;
-static gint hf_setup_hvalue_bitmode = -1;
-static gint hf_setup_lindex = -1;
-static gint hf_setup_lindex_port_ab = -1;
-static gint hf_setup_lindex_port_abcd = -1;
-static gint hf_setup_lindex_baud_high = -1;
-static gint hf_setup_hindex = -1;
-static gint hf_setup_hindex_rts_cts = -1;
-static gint hf_setup_hindex_dtr_dsr = -1;
-static gint hf_setup_hindex_xon_xoff = -1;
-static gint hf_setup_hindex_baud_high = -1;
-static gint hf_setup_hindex_baud_clock_divide = -1;
-static gint hf_setup_wlength = -1;
-static gint hf_response_lat_timer = -1;
-static gint hf_modem_status = -1;
-static gint hf_modem_status_fs_max_packet = -1;
-static gint hf_modem_status_hs_max_packet = -1;
-static gint hf_modem_status_cts = -1;
-static gint hf_modem_status_dsr = -1;
-static gint hf_modem_status_ri = -1;
-static gint hf_modem_status_dcd = -1;
-static gint hf_line_status = -1;
-static gint hf_line_status_receive_overflow = -1;
-static gint hf_line_status_parity_error = -1;
-static gint hf_line_status_framing_error = -1;
-static gint hf_line_status_break_received = -1;
-static gint hf_line_status_tx_holding_reg_empty = -1;
-static gint hf_line_status_tx_empty = -1;
-static gint hf_if_a_rx_payload = -1;
-static gint hf_if_a_tx_payload = -1;
-static gint hf_if_b_rx_payload = -1;
-static gint hf_if_b_tx_payload = -1;
-static gint hf_if_c_rx_payload = -1;
-static gint hf_if_c_tx_payload = -1;
-static gint hf_if_d_rx_payload = -1;
-static gint hf_if_d_tx_payload = -1;
-static gint hf_ftdi_fragments = -1;
-static gint hf_ftdi_fragment = -1;
-static gint hf_ftdi_fragment_overlap = -1;
-static gint hf_ftdi_fragment_overlap_conflicts = -1;
-static gint hf_ftdi_fragment_multiple_tails = -1;
-static gint hf_ftdi_fragment_too_long_fragment = -1;
-static gint hf_ftdi_fragment_error = -1;
-static gint hf_ftdi_fragment_count = -1;
-static gint hf_ftdi_reassembled_in = -1;
-static gint hf_ftdi_reassembled_length = -1;
-
-static gint ett_ftdi_ft = -1;
-static gint ett_modem_ctrl_lvalue = -1;
-static gint ett_modem_ctrl_hvalue = -1;
-static gint ett_flow_ctrl_hindex = -1;
-static gint ett_baudrate_lindex = -1;
-static gint ett_baudrate_hindex = -1;
-static gint ett_setdata_hvalue = -1;
-static gint ett_modem_status = -1;
-static gint ett_line_status = -1;
-static gint ett_ftdi_fragment = -1;
-static gint ett_ftdi_fragments = -1;
+static int proto_ftdi_ft;
+
+static gint hf_setup_brequest;
+static gint hf_setup_lvalue;
+static gint hf_setup_lvalue_purge;
+static gint hf_setup_lvalue_dtr;
+static gint hf_setup_lvalue_rts;
+static gint hf_setup_lvalue_xon_char;
+static gint hf_setup_lvalue_baud_low;
+static gint hf_setup_lvalue_data_size;
+static gint hf_setup_lvalue_event_char;
+static gint hf_setup_lvalue_error_char;
+static gint hf_setup_lvalue_latency_time;
+static gint hf_setup_lvalue_bitmask;
+static gint hf_setup_hvalue;
+static gint hf_setup_hvalue_dtr;
+static gint hf_setup_hvalue_rts;
+static gint hf_setup_hvalue_xoff_char;
+static gint hf_setup_hvalue_baud_mid;
+static gint hf_setup_hvalue_parity;
+static gint hf_setup_hvalue_stop_bits;
+static gint hf_setup_hvalue_break_bit;
+static gint hf_setup_hvalue_trigger;
+static gint hf_setup_hvalue_error_replacement;
+static gint hf_setup_hvalue_bitmode;
+static gint hf_setup_lindex;
+static gint hf_setup_lindex_port_ab;
+static gint hf_setup_lindex_port_abcd;
+static gint hf_setup_lindex_baud_high;
+static gint hf_setup_hindex;
+static gint hf_setup_hindex_rts_cts;
+static gint hf_setup_hindex_dtr_dsr;
+static gint hf_setup_hindex_xon_xoff;
+static gint hf_setup_hindex_baud_high;
+static gint hf_setup_hindex_baud_clock_divide;
+static gint hf_setup_wlength;
+static gint hf_response_lat_timer;
+static gint hf_modem_status;
+static gint hf_modem_status_fs_max_packet;
+static gint hf_modem_status_hs_max_packet;
+static gint hf_modem_status_cts;
+static gint hf_modem_status_dsr;
+static gint hf_modem_status_ri;
+static gint hf_modem_status_dcd;
+static gint hf_line_status;
+static gint hf_line_status_receive_overflow;
+static gint hf_line_status_parity_error;
+static gint hf_line_status_framing_error;
+static gint hf_line_status_break_received;
+static gint hf_line_status_tx_holding_reg_empty;
+static gint hf_line_status_tx_empty;
+static gint hf_if_a_rx_payload;
+static gint hf_if_a_tx_payload;
+static gint hf_if_b_rx_payload;
+static gint hf_if_b_tx_payload;
+static gint hf_if_c_rx_payload;
+static gint hf_if_c_tx_payload;
+static gint hf_if_d_rx_payload;
+static gint hf_if_d_tx_payload;
+static gint hf_ftdi_fragments;
+static gint hf_ftdi_fragment;
+static gint hf_ftdi_fragment_overlap;
+static gint hf_ftdi_fragment_overlap_conflicts;
+static gint hf_ftdi_fragment_multiple_tails;
+static gint hf_ftdi_fragment_too_long_fragment;
+static gint hf_ftdi_fragment_error;
+static gint hf_ftdi_fragment_count;
+static gint hf_ftdi_reassembled_in;
+static gint hf_ftdi_reassembled_length;
+
+static gint ett_ftdi_ft;
+static gint ett_modem_ctrl_lvalue;
+static gint ett_modem_ctrl_hvalue;
+static gint ett_flow_ctrl_hindex;
+static gint ett_baudrate_lindex;
+static gint ett_baudrate_hindex;
+static gint ett_setdata_hvalue;
+static gint ett_modem_status;
+static gint ett_line_status;
+static gint ett_ftdi_fragment;
+static gint ett_ftdi_fragments;
 
 static const fragment_items ftdi_frag_items = {
     /* Fragment subtrees */
@@ -126,7 +126,7 @@ static const fragment_items ftdi_frag_items = {
 
 static dissector_handle_t ftdi_mpsse_handle;
 
-static expert_field ei_undecoded = EI_INIT;
+static expert_field ei_undecoded;
 
 static dissector_handle_t ftdi_ft_handle;
 
diff --git a/epan/dissectors/packet-ftdi-mpsse.c b/epan/dissectors/packet-ftdi-mpsse.c
index f303e0e206..49b89aefd0 100644
--- a/epan/dissectors/packet-ftdi-mpsse.c
+++ b/epan/dissectors/packet-ftdi-mpsse.c
@@ -17,84 +17,84 @@
 #include <wsutil/str_util.h>
 #include "packet-ftdi-ft.h"
 
-static int proto_ftdi_mpsse = -1;
+static int proto_ftdi_mpsse;
 
-static gint hf_mpsse_command = -1;
+static gint hf_mpsse_command;
 /* Data Shifting commands bits (b0-b6 are relevant only if b7 is 0) */
-static gint hf_mpsse_command_b0 = -1;
-static gint hf_mpsse_command_b1 = -1;
-static gint hf_mpsse_command_b2 = -1;
-static gint hf_mpsse_command_b3 = -1;
-static gint hf_mpsse_command_b4 = -1;
-static gint hf_mpsse_command_b5 = -1;
-static gint hf_mpsse_command_b6 = -1;
-static gint hf_mpsse_command_b7 = -1;
-static gint hf_mpsse_command_with_parameters = -1;
-static gint hf_mpsse_bad_command_error = -1;
-static gint hf_mpsse_bad_command_code = -1;
-static gint hf_mpsse_response = -1;
-static gint hf_mpsse_command_in = -1;
-static gint hf_mpsse_response_in = -1;
-static gint hf_mpsse_length_uint8 = -1;
-static gint hf_mpsse_length_uint16 = -1;
-static gint hf_mpsse_bytes_out = -1;
-static gint hf_mpsse_bytes_in = -1;
-static gint hf_mpsse_bits_out = -1;
-static gint hf_mpsse_bits_in = -1;
-static gint hf_mpsse_value = -1;
-static gint hf_mpsse_value_b0 = -1;
-static gint hf_mpsse_value_b1 = -1;
-static gint hf_mpsse_value_b2 = -1;
-static gint hf_mpsse_value_b3 = -1;
-static gint hf_mpsse_value_b4 = -1;
-static gint hf_mpsse_value_b5 = -1;
-static gint hf_mpsse_value_b6 = -1;
-static gint hf_mpsse_value_b7 = -1;
-static gint hf_mpsse_direction = -1;
-static gint hf_mpsse_direction_b0 = -1;
-static gint hf_mpsse_direction_b1 = -1;
-static gint hf_mpsse_direction_b2 = -1;
-static gint hf_mpsse_direction_b3 = -1;
-static gint hf_mpsse_direction_b4 = -1;
-static gint hf_mpsse_direction_b5 = -1;
-static gint hf_mpsse_direction_b6 = -1;
-static gint hf_mpsse_direction_b7 = -1;
-static gint hf_mpsse_cpumode_address_short = -1;
-static gint hf_mpsse_cpumode_address_extended = -1;
-static gint hf_mpsse_cpumode_data = -1;
-static gint hf_mpsse_clk_divisor = -1;
-static gint hf_mpsse_open_drain_enable_low = -1;
-static gint hf_mpsse_open_drain_enable_low_b0 = -1;
-static gint hf_mpsse_open_drain_enable_low_b1 = -1;
-static gint hf_mpsse_open_drain_enable_low_b2 = -1;
-static gint hf_mpsse_open_drain_enable_low_b3 = -1;
-static gint hf_mpsse_open_drain_enable_low_b4 = -1;
-static gint hf_mpsse_open_drain_enable_low_b5 = -1;
-static gint hf_mpsse_open_drain_enable_low_b6 = -1;
-static gint hf_mpsse_open_drain_enable_low_b7 = -1;
-static gint hf_mpsse_open_drain_enable_high = -1;
-static gint hf_mpsse_open_drain_enable_high_b0 = -1;
-static gint hf_mpsse_open_drain_enable_high_b1 = -1;
-static gint hf_mpsse_open_drain_enable_high_b2 = -1;
-static gint hf_mpsse_open_drain_enable_high_b3 = -1;
-static gint hf_mpsse_open_drain_enable_high_b4 = -1;
-static gint hf_mpsse_open_drain_enable_high_b5 = -1;
-static gint hf_mpsse_open_drain_enable_high_b6 = -1;
-static gint hf_mpsse_open_drain_enable_high_b7 = -1;
-
-static gint ett_ftdi_mpsse = -1;
-static gint ett_mpsse_command = -1;
-static gint ett_mpsse_command_with_parameters = -1;
-static gint ett_mpsse_response_data = -1;
-static gint ett_mpsse_value = -1;
-static gint ett_mpsse_direction = -1;
-static gint ett_mpsse_open_drain_enable = -1;
-static gint ett_mpsse_skipped_response_data = -1;
-
-static expert_field ei_undecoded = EI_INIT;
-static expert_field ei_response_without_command = EI_INIT;
-static expert_field ei_skipped_response_data = EI_INIT;
-static expert_field ei_reassembly_unavailable = EI_INIT;
+static gint hf_mpsse_command_b0;
+static gint hf_mpsse_command_b1;
+static gint hf_mpsse_command_b2;
+static gint hf_mpsse_command_b3;
+static gint hf_mpsse_command_b4;
+static gint hf_mpsse_command_b5;
+static gint hf_mpsse_command_b6;
+static gint hf_mpsse_command_b7;
+static gint hf_mpsse_command_with_parameters;
+static gint hf_mpsse_bad_command_error;
+static gint hf_mpsse_bad_command_code;
+static gint hf_mpsse_response;
+static gint hf_mpsse_command_in;
+static gint hf_mpsse_response_in;
+static gint hf_mpsse_length_uint8;
+static gint hf_mpsse_length_uint16;
+static gint hf_mpsse_bytes_out;
+static gint hf_mpsse_bytes_in;
+static gint hf_mpsse_bits_out;
+static gint hf_mpsse_bits_in;
+static gint hf_mpsse_value;
+static gint hf_mpsse_value_b0;
+static gint hf_mpsse_value_b1;
+static gint hf_mpsse_value_b2;
+static gint hf_mpsse_value_b3;
+static gint hf_mpsse_value_b4;
+static gint hf_mpsse_value_b5;
+static gint hf_mpsse_value_b6;
+static gint hf_mpsse_value_b7;
+static gint hf_mpsse_direction;
+static gint hf_mpsse_direction_b0;
+static gint hf_mpsse_direction_b1;
+static gint hf_mpsse_direction_b2;
+static gint hf_mpsse_direction_b3;
+static gint hf_mpsse_direction_b4;
+static gint hf_mpsse_direction_b5;
+static gint hf_mpsse_direction_b6;
+static gint hf_mpsse_direction_b7;
+static gint hf_mpsse_cpumode_address_short;
+static gint hf_mpsse_cpumode_address_extended;
+static gint hf_mpsse_cpumode_data;
+static gint hf_mpsse_clk_divisor;
+static gint hf_mpsse_open_drain_enable_low;
+static gint hf_mpsse_open_drain_enable_low_b0;
+static gint hf_mpsse_open_drain_enable_low_b1;
+static gint hf_mpsse_open_drain_enable_low_b2;
+static gint hf_mpsse_open_drain_enable_low_b3;
+static gint hf_mpsse_open_drain_enable_low_b4;
+static gint hf_mpsse_open_drain_enable_low_b5;
+static gint hf_mpsse_open_drain_enable_low_b6;
+static gint hf_mpsse_open_drain_enable_low_b7;
+static gint hf_mpsse_open_drain_enable_high;
+static gint hf_mpsse_open_drain_enable_high_b0;
+static gint hf_mpsse_open_drain_enable_high_b1;
+static gint hf_mpsse_open_drain_enable_high_b2;
+static gint hf_mpsse_open_drain_enable_high_b3;
+static gint hf_mpsse_open_drain_enable_high_b4;
+static gint hf_mpsse_open_drain_enable_high_b5;
+static gint hf_mpsse_open_drain_enable_high_b6;
+static gint hf_mpsse_open_drain_enable_high_b7;
+
+static gint ett_ftdi_mpsse;
+static gint ett_mpsse_command;
+static gint ett_mpsse_command_with_parameters;
+static gint ett_mpsse_response_data;
+static gint ett_mpsse_value;
+static gint ett_mpsse_direction;
+static gint ett_mpsse_open_drain_enable;
+static gint ett_mpsse_skipped_response_data;
+
+static expert_field ei_undecoded;
+static expert_field ei_response_without_command;
+static expert_field ei_skipped_response_data;
+static expert_field ei_reassembly_unavailable;
 
 static dissector_handle_t ftdi_mpsse_handle;
 
diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c
index c53781a9ee..cc21b4dd47 100644
--- a/epan/dissectors/packet-ftp.c
+++ b/epan/dissectors/packet-ftp.c
@@ -37,51 +37,51 @@ void proto_reg_handoff_ftp(void);
 
 static int credentials_tap = -1;
 
-static int proto_ftp = -1;
-static int proto_ftp_data = -1;
-static int hf_ftp_current_working_directory = -1;
-static int hf_ftp_response = -1;
-static int hf_ftp_request = -1;
-static int hf_ftp_request_command = -1;
-static int hf_ftp_request_arg = -1;
-static int hf_ftp_response_code = -1;
-static int hf_ftp_response_arg = -1;
-static int hf_ftp_pasv_ip = -1 ;
-static int hf_ftp_pasv_port = -1;
-static int hf_ftp_pasv_nat = -1;
-static int hf_ftp_active_ip = -1;
-static int hf_ftp_active_port = -1;
-static int hf_ftp_active_nat = -1;
-static int hf_ftp_eprt_af = -1;
-static int hf_ftp_eprt_ip = -1;
-static int hf_ftp_eprt_ipv6 = -1;
-static int hf_ftp_eprt_port = -1;
-static int hf_ftp_epsv_ip = -1;
-static int hf_ftp_epsv_ipv6 = -1;
-static int hf_ftp_epsv_port = -1;
-static int hf_ftp_command_response_frames = -1;
-static int hf_ftp_command_response_bytes = -1;
-static int hf_ftp_command_response_first_frame_num = -1;
-static int hf_ftp_command_response_last_frame_num = -1;
-static int hf_ftp_command_response_duration = -1;
-static int hf_ftp_command_response_kbps = -1;
-static int hf_ftp_command_setup_frame = -1;
-static int hf_ftp_command_command_frame = -1;
-static int hf_ftp_command_command = -1;
-
-static int hf_ftp_data_setup_frame = -1;
-static int hf_ftp_data_setup_method = -1;
-static int hf_ftp_data_command = -1;
-static int hf_ftp_data_command_frame = -1;
-static int hf_ftp_data_current_working_directory = -1;
-
-static gint ett_ftp = -1;
-static gint ett_ftp_reqresp = -1;
-
-static expert_field ei_ftp_eprt_args_invalid = EI_INIT;
-static expert_field ei_ftp_epsv_args_invalid = EI_INIT;
-static expert_field ei_ftp_response_code_invalid = EI_INIT;
-static expert_field ei_ftp_pwd_response_invalid = EI_INIT;
+static int proto_ftp;
+static int proto_ftp_data;
+static int hf_ftp_current_working_directory;
+static int hf_ftp_response;
+static int hf_ftp_request;
+static int hf_ftp_request_command;
+static int hf_ftp_request_arg;
+static int hf_ftp_response_code;
+static int hf_ftp_response_arg;
+static int hf_ftp_pasv_ip;
+static int hf_ftp_pasv_port;
+static int hf_ftp_pasv_nat;
+static int hf_ftp_active_ip;
+static int hf_ftp_active_port;
+static int hf_ftp_active_nat;
+static int hf_ftp_eprt_af;
+static int hf_ftp_eprt_ip;
+static int hf_ftp_eprt_ipv6;
+static int hf_ftp_eprt_port;
+static int hf_ftp_epsv_ip;
+static int hf_ftp_epsv_ipv6;
+static int hf_ftp_epsv_port;
+static int hf_ftp_command_response_frames;
+static int hf_ftp_command_response_bytes;
+static int hf_ftp_command_response_first_frame_num;
+static int hf_ftp_command_response_last_frame_num;
+static int hf_ftp_command_response_duration;
+static int hf_ftp_command_response_kbps;
+static int hf_ftp_command_setup_frame;
+static int hf_ftp_command_command_frame;
+static int hf_ftp_command_command;
+
+static int hf_ftp_data_setup_frame;
+static int hf_ftp_data_setup_method;
+static int hf_ftp_data_command;
+static int hf_ftp_data_command_frame;
+static int hf_ftp_data_current_working_directory;
+
+static gint ett_ftp;
+static gint ett_ftp_reqresp;
+
+static expert_field ei_ftp_eprt_args_invalid;
+static expert_field ei_ftp_epsv_args_invalid;
+static expert_field ei_ftp_response_code_invalid;
+static expert_field ei_ftp_pwd_response_invalid;
 
 static int ftp_eo_tap = -1;
 
diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c
index a9e42ebad5..0e8e65668f 100644
--- a/epan/dissectors/packet-fw1.c
+++ b/epan/dissectors/packet-fw1.c
@@ -93,16 +93,16 @@ static gboolean fw1_iflist_with_chain = FALSE;
 static dissector_handle_t ethertype_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_fw1 = -1;
-static int hf_fw1_direction = -1;
-static int hf_fw1_chain = -1;
-static int hf_fw1_interface = -1;
-static int hf_fw1_uuid = -1;
-static int hf_fw1_type = -1;
-static int hf_fw1_trailer = -1;
+static int proto_fw1;
+static int hf_fw1_direction;
+static int hf_fw1_chain;
+static int hf_fw1_interface;
+static int hf_fw1_uuid;
+static int hf_fw1_type;
+static int hf_fw1_trailer;
 
 /* Initialize the subtree pointers */
-static gint ett_fw1 = -1;
+static gint ett_fw1;
 
 #define ETH_HEADER_SIZE 14
 
diff --git a/epan/dissectors/packet-g723.c b/epan/dissectors/packet-g723.c
index ceb90206c0..c0e94d489c 100644
--- a/epan/dissectors/packet-g723.c
+++ b/epan/dissectors/packet-g723.c
@@ -22,12 +22,12 @@ void proto_register_g723(void);
 static dissector_handle_t g723_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_g723					= -1;
-static int hf_g723_frame_size_and_codec	= -1;
-static int hf_g723_lpc_B5_B0			= -1;
+static int proto_g723;
+static int hf_g723_frame_size_and_codec;
+static int hf_g723_lpc_B5_B0;
 
 /* Initialize the subtree pointers */
-static int ett_g723 = -1;
+static int ett_g723;
 
 
 /*		 RFC 3551
diff --git a/epan/dissectors/packet-gadu-gadu.c b/epan/dissectors/packet-gadu-gadu.c
index e315f7ca88..c857727b40 100644
--- a/epan/dissectors/packet-gadu-gadu.c
+++ b/epan/dissectors/packet-gadu-gadu.c
@@ -26,71 +26,71 @@ static gboolean gadu_gadu_desegment = TRUE;
 
 static dissector_handle_t gadu_gadu_handle;
 
-static int proto_gadu_gadu = -1;
-
-static int hf_dcc_filename = -1;
-static int hf_dcc_id = -1;
-static int hf_dcc_type = -1;
-static int hf_dcc_uin_from = -1;
-static int hf_dcc_uin_to = -1;
-static int hf_gadu_gadu_contact_type = -1;
-static int hf_gadu_gadu_contact_uin = -1;
-static int hf_gadu_gadu_contact_uin_str = -1;
-static int hf_gadu_gadu_data = -1;
-static int hf_gadu_gadu_header_length = -1;
-static int hf_gadu_gadu_header_type_recv = -1;
-static int hf_gadu_gadu_header_type_send = -1;
-static int hf_gadu_gadu_login80_lang = -1;
-static int hf_gadu_gadu_login_hash = -1;
-static int hf_gadu_gadu_login_hash_type = -1;
-static int hf_gadu_gadu_login_local_ip = -1;
-static int hf_gadu_gadu_login_local_port = -1;
-static int hf_gadu_gadu_login_protocol = -1;
-static int hf_gadu_gadu_login_status = -1;
-static int hf_gadu_gadu_login_uin = -1;
-static int hf_gadu_gadu_login_version = -1;
-static int hf_gadu_gadu_msg80_offset_attr = -1;
-static int hf_gadu_gadu_msg80_offset_plain = -1;
-static int hf_gadu_gadu_msg_ack_recipient = -1;
-static int hf_gadu_gadu_msg_ack_seq = -1;
-static int hf_gadu_gadu_msg_ack_status = -1;
-static int hf_gadu_gadu_msg_class = -1;
-static int hf_gadu_gadu_msg_recipient = -1;
-static int hf_gadu_gadu_msg_sender = -1;
-static int hf_gadu_gadu_msg_seq = -1;
-static int hf_gadu_gadu_msg_text = -1;
-static int hf_gadu_gadu_msg_time = -1;
-static int hf_gadu_gadu_msg_uin = -1;
-static int hf_gadu_gadu_new_status_desc = -1;
-static int hf_gadu_gadu_new_status_status = -1;
-static int hf_gadu_gadu_pubdir_reply_seq = -1;
-static int hf_gadu_gadu_pubdir_reply_str = -1;
-static int hf_gadu_gadu_pubdir_reply_type = -1;
-static int hf_gadu_gadu_pubdir_request_seq = -1;
-static int hf_gadu_gadu_pubdir_request_str = -1;
-static int hf_gadu_gadu_pubdir_request_type = -1;
-static int hf_gadu_gadu_status_descr = -1;
-static int hf_gadu_gadu_status_img_size = -1;
-static int hf_gadu_gadu_status_ip = -1;
-static int hf_gadu_gadu_status_port = -1;
-static int hf_gadu_gadu_status_status = -1;
-static int hf_gadu_gadu_status_uin = -1;
-static int hf_gadu_gadu_status_version = -1;
-static int hf_gadu_gadu_typing_notify_type = -1;
-static int hf_gadu_gadu_typing_notify_uin = -1;
-static int hf_gadu_gadu_userdata_attr_name = -1;
-static int hf_gadu_gadu_userdata_attr_type = -1;
-static int hf_gadu_gadu_userdata_attr_value = -1;
-static int hf_gadu_gadu_userdata_uin = -1;
-static int hf_gadu_gadu_userlist = -1;
-static int hf_gadu_gadu_userlist_format = -1;
-static int hf_gadu_gadu_userlist_reply_type = -1;
-static int hf_gadu_gadu_userlist_request_type = -1;
-static int hf_gadu_gadu_userlist_version = -1;
-static int hf_gadu_gadu_welcome_seed = -1;
-
-static int ett_gadu_gadu = -1;
-static int ett_gadu_gadu_contact = -1;
+static int proto_gadu_gadu;
+
+static int hf_dcc_filename;
+static int hf_dcc_id;
+static int hf_dcc_type;
+static int hf_dcc_uin_from;
+static int hf_dcc_uin_to;
+static int hf_gadu_gadu_contact_type;
+static int hf_gadu_gadu_contact_uin;
+static int hf_gadu_gadu_contact_uin_str;
+static int hf_gadu_gadu_data;
+static int hf_gadu_gadu_header_length;
+static int hf_gadu_gadu_header_type_recv;
+static int hf_gadu_gadu_header_type_send;
+static int hf_gadu_gadu_login80_lang;
+static int hf_gadu_gadu_login_hash;
+static int hf_gadu_gadu_login_hash_type;
+static int hf_gadu_gadu_login_local_ip;
+static int hf_gadu_gadu_login_local_port;
+static int hf_gadu_gadu_login_protocol;
+static int hf_gadu_gadu_login_status;
+static int hf_gadu_gadu_login_uin;
+static int hf_gadu_gadu_login_version;
+static int hf_gadu_gadu_msg80_offset_attr;
+static int hf_gadu_gadu_msg80_offset_plain;
+static int hf_gadu_gadu_msg_ack_recipient;
+static int hf_gadu_gadu_msg_ack_seq;
+static int hf_gadu_gadu_msg_ack_status;
+static int hf_gadu_gadu_msg_class;
+static int hf_gadu_gadu_msg_recipient;
+static int hf_gadu_gadu_msg_sender;
+static int hf_gadu_gadu_msg_seq;
+static int hf_gadu_gadu_msg_text;
+static int hf_gadu_gadu_msg_time;
+static int hf_gadu_gadu_msg_uin;
+static int hf_gadu_gadu_new_status_desc;
+static int hf_gadu_gadu_new_status_status;
+static int hf_gadu_gadu_pubdir_reply_seq;
+static int hf_gadu_gadu_pubdir_reply_str;
+static int hf_gadu_gadu_pubdir_reply_type;
+static int hf_gadu_gadu_pubdir_request_seq;
+static int hf_gadu_gadu_pubdir_request_str;
+static int hf_gadu_gadu_pubdir_request_type;
+static int hf_gadu_gadu_status_descr;
+static int hf_gadu_gadu_status_img_size;
+static int hf_gadu_gadu_status_ip;
+static int hf_gadu_gadu_status_port;
+static int hf_gadu_gadu_status_status;
+static int hf_gadu_gadu_status_uin;
+static int hf_gadu_gadu_status_version;
+static int hf_gadu_gadu_typing_notify_type;
+static int hf_gadu_gadu_typing_notify_uin;
+static int hf_gadu_gadu_userdata_attr_name;
+static int hf_gadu_gadu_userdata_attr_type;
+static int hf_gadu_gadu_userdata_attr_value;
+static int hf_gadu_gadu_userdata_uin;
+static int hf_gadu_gadu_userlist;
+static int hf_gadu_gadu_userlist_format;
+static int hf_gadu_gadu_userlist_reply_type;
+static int hf_gadu_gadu_userlist_request_type;
+static int hf_gadu_gadu_userlist_version;
+static int hf_gadu_gadu_welcome_seed;
+
+static int ett_gadu_gadu;
+static int ett_gadu_gadu_contact;
 
 #define GG_ERA_OMNIX_MASK 0x04000000
 #define GG_HAS_AUDIO_MASK 0x40000000
diff --git a/epan/dissectors/packet-gbcs.c b/epan/dissectors/packet-gbcs.c
index ec87e60359..7f4ff13f3b 100644
--- a/epan/dissectors/packet-gbcs.c
+++ b/epan/dissectors/packet-gbcs.c
@@ -515,37 +515,37 @@ VALUE_STRING_ARRAY(gbcs_gbz_integrity_issue_warning_names);
 
 static dissector_handle_t zcl_handle;
 
-static int proto_gbcs_gbz = -1;
-
-static int hf_gbcs_gbz_profile_id = -1;
-static int hf_gbcs_gbz_components = -1;
-static int hf_gbcs_gbz_extended_header_control = -1;
-static int hf_gbcs_gbz_extended_header_cluster = -1;
-static int hf_gbcs_gbz_extended_header_length = -1;
-static int hf_gbcs_gbz_alert_code = -1;
-static int hf_gbcs_gbz_timestamp = -1;
-static int hf_gbcs_gbz_firmware_alert_start = -1;
-static int hf_gbcs_gbz_firmware_hash = -1;
-static int hf_gbcs_gbz_future_alert_start = -1;
-static int hf_gbcs_gbz_message_code = -1;
-static int hf_gbcs_gbz_originator_counter = -1;
-static int hf_gbcs_gbz_frame_control = -1;
-static int hf_gbcs_gbz_command_id = -1;
-static int hf_gbcs_gbz_integrity_issue_warning = -1;
-static int hf_gbcs_gbz_from_date_time = -1;
-static int hf_gbcs_gbz_additional_header_control = -1;
-static int hf_gbcs_gbz_additional_frame_counter = -1;
-static int hf_gbcs_gbz_transaction = -1;
-static int hf_gbcs_gbz_length_of_ciphered_information = -1;
-static int hf_gbcs_gbz_security_control = -1;
-static int hf_gbcs_gbz_invocation_counter = -1;
-static int hf_gbcs_gbz_encrypted_payload = -1;
-static int hf_gbcs_gbz_mac = -1;
-
-static gint ett_gbcs_gbz = -1;
+static int proto_gbcs_gbz;
+
+static int hf_gbcs_gbz_profile_id;
+static int hf_gbcs_gbz_components;
+static int hf_gbcs_gbz_extended_header_control;
+static int hf_gbcs_gbz_extended_header_cluster;
+static int hf_gbcs_gbz_extended_header_length;
+static int hf_gbcs_gbz_alert_code;
+static int hf_gbcs_gbz_timestamp;
+static int hf_gbcs_gbz_firmware_alert_start;
+static int hf_gbcs_gbz_firmware_hash;
+static int hf_gbcs_gbz_future_alert_start;
+static int hf_gbcs_gbz_message_code;
+static int hf_gbcs_gbz_originator_counter;
+static int hf_gbcs_gbz_frame_control;
+static int hf_gbcs_gbz_command_id;
+static int hf_gbcs_gbz_integrity_issue_warning;
+static int hf_gbcs_gbz_from_date_time;
+static int hf_gbcs_gbz_additional_header_control;
+static int hf_gbcs_gbz_additional_frame_counter;
+static int hf_gbcs_gbz_transaction;
+static int hf_gbcs_gbz_length_of_ciphered_information;
+static int hf_gbcs_gbz_security_control;
+static int hf_gbcs_gbz_invocation_counter;
+static int hf_gbcs_gbz_encrypted_payload;
+static int hf_gbcs_gbz_mac;
+
+static gint ett_gbcs_gbz;
 static gint ett_gbcs_gbz_components[GBCS_GBZ_MAX_COMPONENTS];
 
-static expert_field ei_gbcs_gbz_invalid_length = EI_INIT;
+static expert_field ei_gbcs_gbz_invalid_length;
 
 void proto_register_gbcs_gbz(void);
 void proto_reg_handoff_gbcs_gbz(void);
@@ -882,12 +882,12 @@ VALUE_STRING_ARRAY(gbcs_tunnel_command_names);
 
 static dissector_handle_t gbcs_message_handle;
 
-static int proto_gbcs_tunnel = -1;
+static int proto_gbcs_tunnel;
 
-static int hf_gbcs_tunnel_command = -1;
-static int hf_gbcs_tunnel_remaining = -1;
+static int hf_gbcs_tunnel_command;
+static int hf_gbcs_tunnel_remaining;
 
-static gint ett_gbcs_tunnel = -1;
+static gint ett_gbcs_tunnel;
 
 void proto_register_gbcs_tunnel(void);
 void proto_reg_handoff_gbcs_tunnel(void);
@@ -1011,73 +1011,73 @@ static dissector_handle_t gbcs_gbcs_handle;
 static dissector_handle_t gbcs_gbz_handle;
 static dissector_handle_t gbcs_ber_handle;
 
-static int proto_gbcs_message = -1;
-
-static int hf_gbcs_message_element_length = -1;
-static int hf_gbcs_message_mac_header_general_ciphering = -1;
-static int hf_gbcs_message_mac_header_cra_flag = -1;
-static int hf_gbcs_message_mac_header_originator_counter = -1;
-static int hf_gbcs_message_mac_header_business_originator_id = -1;
-static int hf_gbcs_message_mac_header_business_target_id = -1;
-static int hf_gbcs_message_mac_header_date_time = -1;
-static int hf_gbcs_message_mac_header_other_info = -1;
-static int hf_gbcs_message_mac_header_key_info = -1;
-static int hf_gbcs_message_mac_header_security_control_byte = -1;
-static int hf_gbcs_message_mac_header_invocation_counter = -1;
-static int hf_gbcs_message_grouping_header_general_signing = -1;
-static int hf_gbcs_message_grouping_header_cra_flag = -1;
-static int hf_gbcs_message_grouping_header_originator_counter = -1;
-static int hf_gbcs_message_grouping_header_business_originator_id = -1;
-static int hf_gbcs_message_grouping_header_business_target_id = -1;
-static int hf_gbcs_message_grouping_header_date_time = -1;
-static int hf_gbcs_message_grouping_header_message_code = -1;
-static int hf_gbcs_message_grouping_header_supplementary_remote_party_id = -1;
-static int hf_gbcs_message_grouping_header_supplementary_remote_party_counter = -1;
-static int hf_gbcs_message_grouping_header_supplementary_originator_counter = -1;
-static int hf_gbcs_message_grouping_header_supplementary_remote_party_ka_certificate = -1;
-static int hf_gbcs_message_krp = -1;
-static int hf_gbcs_message_mac = -1;
-static int hf_gbcs_message_routing_header_general_ciphering = -1;
-static int hf_gbcs_message_routing_header_cra_flag = -1;
-static int hf_gbcs_message_routing_header_originator_counter = -1;
-static int hf_gbcs_message_routing_header_business_originator_id = -1;
-static int hf_gbcs_message_routing_header_business_target_id = -1;
-static int hf_gbcs_message_routing_header_date_time = -1;
-static int hf_gbcs_message_routing_header_message_code = -1;
-static int hf_gbcs_message_routing_header_key_info = -1;
-static int hf_gbcs_message_routing_header_security_control_byte = -1;
-static int hf_gbcs_message_routing_header_invocation_counter = -1;
-static int hf_gbcs_message_gbt_header_general_block_transfer = -1;
-static int hf_gbcs_message_gbt_header_block_control = -1;
-static int hf_gbcs_message_gbt_header_block_control_last_block = -1;
-static int hf_gbcs_message_gbt_header_block_control_streaming = -1;
-static int hf_gbcs_message_gbt_header_block_control_window = -1;
-static int hf_gbcs_message_gbt_header_block_number = -1;
-static int hf_gbcs_message_gbt_header_block_number_ack = -1;
-static int hf_gbcs_message_gbt_blocks = -1;
-static int hf_gbcs_message_gbt_block = -1;
-static int hf_gbcs_message_gbt_block_overlap = -1;
-static int hf_gbcs_message_gbt_block_overlap_conflicts = -1;
-static int hf_gbcs_message_gbt_block_multiple_tails = -1;
-static int hf_gbcs_message_gbt_block_too_long_fragment = -1;
-static int hf_gbcs_message_gbt_block_error = -1;
-static int hf_gbcs_message_gbt_block_count = -1;
-static int hf_gbcs_message_gbt_reassembled_in = -1;
-static int hf_gbcs_message_gbt_reassembled_length = -1;
-
-static gint ett_gbcs_message = -1;
-static gint ett_gbcs_message_element = -1;
-static gint ett_gbcs_message_mac_header = -1;
-static gint ett_gbcs_message_grouping_header = -1;
-static gint ett_gbcs_message_grouping_header_other_info = -1;
-static gint ett_gbcs_message_routing_header = -1;
-static gint ett_gbcs_message_routing_header_other_info = -1;
-static gint ett_gbcs_message_gbt_header = -1;
-static gint ett_gbcs_message_gbt_header_block_control = -1;
-static gint ett_gbcs_message_gbt_fragment = -1;
-static gint ett_gbcs_message_gbt_fragments = -1;
-static gint ett_gbcs_message_asn1 = -1;
-static gint ett_gbcs_message_dlms = -1;
+static int proto_gbcs_message;
+
+static int hf_gbcs_message_element_length;
+static int hf_gbcs_message_mac_header_general_ciphering;
+static int hf_gbcs_message_mac_header_cra_flag;
+static int hf_gbcs_message_mac_header_originator_counter;
+static int hf_gbcs_message_mac_header_business_originator_id;
+static int hf_gbcs_message_mac_header_business_target_id;
+static int hf_gbcs_message_mac_header_date_time;
+static int hf_gbcs_message_mac_header_other_info;
+static int hf_gbcs_message_mac_header_key_info;
+static int hf_gbcs_message_mac_header_security_control_byte;
+static int hf_gbcs_message_mac_header_invocation_counter;
+static int hf_gbcs_message_grouping_header_general_signing;
+static int hf_gbcs_message_grouping_header_cra_flag;
+static int hf_gbcs_message_grouping_header_originator_counter;
+static int hf_gbcs_message_grouping_header_business_originator_id;
+static int hf_gbcs_message_grouping_header_business_target_id;
+static int hf_gbcs_message_grouping_header_date_time;
+static int hf_gbcs_message_grouping_header_message_code;
+static int hf_gbcs_message_grouping_header_supplementary_remote_party_id;
+static int hf_gbcs_message_grouping_header_supplementary_remote_party_counter;
+static int hf_gbcs_message_grouping_header_supplementary_originator_counter;
+static int hf_gbcs_message_grouping_header_supplementary_remote_party_ka_certificate;
+static int hf_gbcs_message_krp;
+static int hf_gbcs_message_mac;
+static int hf_gbcs_message_routing_header_general_ciphering;
+static int hf_gbcs_message_routing_header_cra_flag;
+static int hf_gbcs_message_routing_header_originator_counter;
+static int hf_gbcs_message_routing_header_business_originator_id;
+static int hf_gbcs_message_routing_header_business_target_id;
+static int hf_gbcs_message_routing_header_date_time;
+static int hf_gbcs_message_routing_header_message_code;
+static int hf_gbcs_message_routing_header_key_info;
+static int hf_gbcs_message_routing_header_security_control_byte;
+static int hf_gbcs_message_routing_header_invocation_counter;
+static int hf_gbcs_message_gbt_header_general_block_transfer;
+static int hf_gbcs_message_gbt_header_block_control;
+static int hf_gbcs_message_gbt_header_block_control_last_block;
+static int hf_gbcs_message_gbt_header_block_control_streaming;
+static int hf_gbcs_message_gbt_header_block_control_window;
+static int hf_gbcs_message_gbt_header_block_number;
+static int hf_gbcs_message_gbt_header_block_number_ack;
+static int hf_gbcs_message_gbt_blocks;
+static int hf_gbcs_message_gbt_block;
+static int hf_gbcs_message_gbt_block_overlap;
+static int hf_gbcs_message_gbt_block_overlap_conflicts;
+static int hf_gbcs_message_gbt_block_multiple_tails;
+static int hf_gbcs_message_gbt_block_too_long_fragment;
+static int hf_gbcs_message_gbt_block_error;
+static int hf_gbcs_message_gbt_block_count;
+static int hf_gbcs_message_gbt_reassembled_in;
+static int hf_gbcs_message_gbt_reassembled_length;
+
+static gint ett_gbcs_message;
+static gint ett_gbcs_message_element;
+static gint ett_gbcs_message_mac_header;
+static gint ett_gbcs_message_grouping_header;
+static gint ett_gbcs_message_grouping_header_other_info;
+static gint ett_gbcs_message_routing_header;
+static gint ett_gbcs_message_routing_header_other_info;
+static gint ett_gbcs_message_gbt_header;
+static gint ett_gbcs_message_gbt_header_block_control;
+static gint ett_gbcs_message_gbt_fragment;
+static gint ett_gbcs_message_gbt_fragments;
+static gint ett_gbcs_message_asn1;
+static gint ett_gbcs_message_dlms;
 
 static reassembly_table gbcs_message_gbt_reassembly_table;
 
diff --git a/epan/dissectors/packet-gcsna.c b/epan/dissectors/packet-gcsna.c
index e26830b8b0..c42fc0f400 100644
--- a/epan/dissectors/packet-gcsna.c
+++ b/epan/dissectors/packet-gcsna.c
@@ -29,39 +29,39 @@ static void gcsna_message_GCSNAL2Ack(proto_item *item, tvbuff_t *tvb, proto_tree
 static void gcsna_message_GCSNAServiceReject(proto_item *item, tvbuff_t *tvb, proto_tree *tree, guint *offset);
 
 /*Initialize all the header parameters that are to be displayed*/
-static int proto_gcsna = -1;
-static int hf_gcsna_msghdr = -1;
-static int hf_gcsna_msgid = -1;
-static int hf_gcsna_rejSequence = -1;
-static int hf_gcsna_cause = -1;
-static int hf_gcsna_ackSequence = -1;
-static int hf_gcsna_recordType = -1;
-static int hf_gcsna_1xProtocolRevision = -1;
-static int hf_gcsna_invalidMessageId = -1;
-static int hf_gcsna_l2ack = -1;
-static int hf_gcsna_servicereject = -1;
-static int hf_gcsna_gcsna_option = -1;
-static int hf_gcsna_gcsnaClass = -1;
-static int hf_gcsna_gcsnaClassRev = -1;
-static int hf_gcsna_altGCSNAOption = -1;
-static int hf_gcsna_altGCSNAOptionIncluded = -1;
-static int hf_gcsna_NumaltGCSNAOption = -1;
-static int hf_gcsna_ackRequired = -1;
-static int hf_gcsna_stopDupDetect = -1;
-static int hf_gcsna_msgSequence = -1;
-static int hf_gcsna_tlacEncapsulated = -1;
-static int hf_gcsna_NumTLACEncapsulated1xL3PDU = -1;
-static int hf_gcsna_tlacReserved = -1;
-static int hf_gcsna_iwsidIncluded = -1;
-static int hf_gcsna_iwsidValue = -1;
-static int hf_gcsna_unsupported_reject_seq = -1;
+static int proto_gcsna;
+static int hf_gcsna_msghdr;
+static int hf_gcsna_msgid;
+static int hf_gcsna_rejSequence;
+static int hf_gcsna_cause;
+static int hf_gcsna_ackSequence;
+static int hf_gcsna_recordType;
+static int hf_gcsna_1xProtocolRevision;
+static int hf_gcsna_invalidMessageId;
+static int hf_gcsna_l2ack;
+static int hf_gcsna_servicereject;
+static int hf_gcsna_gcsna_option;
+static int hf_gcsna_gcsnaClass;
+static int hf_gcsna_gcsnaClassRev;
+static int hf_gcsna_altGCSNAOption;
+static int hf_gcsna_altGCSNAOptionIncluded;
+static int hf_gcsna_NumaltGCSNAOption;
+static int hf_gcsna_ackRequired;
+static int hf_gcsna_stopDupDetect;
+static int hf_gcsna_msgSequence;
+static int hf_gcsna_tlacEncapsulated;
+static int hf_gcsna_NumTLACEncapsulated1xL3PDU;
+static int hf_gcsna_tlacReserved;
+static int hf_gcsna_iwsidIncluded;
+static int hf_gcsna_iwsidValue;
+static int hf_gcsna_unsupported_reject_seq;
 
 /* Toggle sub-tree items */
-static gint ett_gcsna_msghdr = -1;
-static gint ett_gcsna_subtree = -1;
-static gint ett_gcsna_option = -1;
+static gint ett_gcsna_msghdr;
+static gint ett_gcsna_subtree;
+static gint ett_gcsna_option;
 
-static expert_field ei_gcsna_error = EI_INIT;
+static expert_field ei_gcsna_error;
 
 #define GCSNA1XCIRCUITSERVICE 0x01
 #define GCSNAL2ACK       0x02
diff --git a/epan/dissectors/packet-gdb.c b/epan/dissectors/packet-gdb.c
index 253269fd30..c5c30b0fa8 100644
--- a/epan/dissectors/packet-gdb.c
+++ b/epan/dissectors/packet-gdb.c
@@ -45,15 +45,15 @@ void proto_reg_handoff_gdb(void);
 
 static dissector_handle_t gdb_handle;
 
-static int proto_gdb = -1;
+static int proto_gdb;
 
-static gint ett_gdb = -1;
+static gint ett_gdb;
 
-static int hf_gdb_ack = -1;
-static int hf_gdb_start = -1;
-static int hf_gdb_payload = -1;
-static int hf_gdb_end = -1;
-static int hf_gdb_chksum = -1;
+static int hf_gdb_ack;
+static int hf_gdb_start;
+static int hf_gdb_payload;
+static int hf_gdb_end;
+static int hf_gdb_chksum;
 
 static tvbparse_wanted_t *want;
 
diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c
index ac9d4f03ce..c6200c4b45 100644
--- a/epan/dissectors/packet-gdsdb.c
+++ b/epan/dissectors/packet-gdsdb.c
@@ -23,168 +23,168 @@ void proto_reg_handoff_gdsdb(void);
 static dissector_handle_t gdsdb_handle;
 #define TCP_PORT	3050
 
-static int proto_gdsdb = -1;
-static gint ett_gdsdb = -1;
-static int hf_gdsdb_opcode = -1;
-/* static gint ett_gdsdb_opcode = -1; */
+static int proto_gdsdb;
+static gint ett_gdsdb;
+static int hf_gdsdb_opcode;
+/* static gint ett_gdsdb_opcode; */
 
 /* gdsdb_dummy */
 /* gdsdb_connect */
-static int hf_gdsdb_connect_operation = -1;
-static int hf_gdsdb_connect_version = -1;
-static int hf_gdsdb_connect_client = -1;
-static int hf_gdsdb_connect_filename = -1;
-static int hf_gdsdb_connect_count = -1;
-static int hf_gdsdb_connect_userid = -1;
-static int hf_gdsdb_connect_pref = -1;
-static gint ett_gdsdb_connect_pref = -1;
-static int hf_gdsdb_connect_pref_version = -1;
-static int hf_gdsdb_connect_pref_architecture = -1;
-static int hf_gdsdb_connect_pref_mintype = -1;
-static int hf_gdsdb_connect_pref_maxtype = -1;
-static int hf_gdsdb_connect_pref_weight = -1;
+static int hf_gdsdb_connect_operation;
+static int hf_gdsdb_connect_version;
+static int hf_gdsdb_connect_client;
+static int hf_gdsdb_connect_filename;
+static int hf_gdsdb_connect_count;
+static int hf_gdsdb_connect_userid;
+static int hf_gdsdb_connect_pref;
+static gint ett_gdsdb_connect_pref;
+static int hf_gdsdb_connect_pref_version;
+static int hf_gdsdb_connect_pref_architecture;
+static int hf_gdsdb_connect_pref_mintype;
+static int hf_gdsdb_connect_pref_maxtype;
+static int hf_gdsdb_connect_pref_weight;
 /* gdsdb_accept */
-static int hf_gdsdb_accept_version = -1;
-static int hf_gdsdb_accept_architecture = -1;
-static int hf_gdsdb_accept_proto_min_type = -1;
+static int hf_gdsdb_accept_version;
+static int hf_gdsdb_accept_architecture;
+static int hf_gdsdb_accept_proto_min_type;
 /* gdsdb_request */
-static int hf_gdsdb_request_type = -1;
-static int hf_gdsdb_request_object = -1;
-static int hf_gdsdb_request_partner = -1;
+static int hf_gdsdb_request_type;
+static int hf_gdsdb_request_object;
+static int hf_gdsdb_request_partner;
 /* gdsdb_attach */
-static int hf_gdsdb_attach_database_object_id = -1;
-static int hf_gdsdb_attach_database_path = -1;
-static int hf_gdsdb_attach_database_param_buf = -1;
+static int hf_gdsdb_attach_database_object_id;
+static int hf_gdsdb_attach_database_path;
+static int hf_gdsdb_attach_database_param_buf;
 /* gdsdb_compile */
-static int hf_gdsdb_compile_database = -1;
-static int hf_gdsdb_compile_blr = -1;
+static int hf_gdsdb_compile_database;
+static int hf_gdsdb_compile_blr;
 /* gdsdb_receive */
-static int hf_gdsdb_receive_request = -1;
-static int hf_gdsdb_receive_incarnation = -1;
-static int hf_gdsdb_receive_transaction = -1;
-static int hf_gdsdb_receive_msgnr = -1;
-static int hf_gdsdb_receive_messages = -1;
-static int hf_gdsdb_receive_direction = -1;
-static int hf_gdsdb_receive_offset = -1;
+static int hf_gdsdb_receive_request;
+static int hf_gdsdb_receive_incarnation;
+static int hf_gdsdb_receive_transaction;
+static int hf_gdsdb_receive_msgnr;
+static int hf_gdsdb_receive_messages;
+static int hf_gdsdb_receive_direction;
+static int hf_gdsdb_receive_offset;
 /* gdsdb_send */
-static int hf_gdsdb_send_request = -1;
-static int hf_gdsdb_send_incarnation = -1;
-static int hf_gdsdb_send_transaction = -1;
-static int hf_gdsdb_send_msgnr = -1;
-static int hf_gdsdb_send_messages = -1;
+static int hf_gdsdb_send_request;
+static int hf_gdsdb_send_incarnation;
+static int hf_gdsdb_send_transaction;
+static int hf_gdsdb_send_msgnr;
+static int hf_gdsdb_send_messages;
 /* gdsdb_response */
-static int hf_gdsdb_response_object = -1;
-static int hf_gdsdb_response_blobid = -1;
-static int hf_gdsdb_response_datasize = -1;
-static int hf_gdsdb_response_data = -1;
+static int hf_gdsdb_response_object;
+static int hf_gdsdb_response_blobid;
+static int hf_gdsdb_response_datasize;
+static int hf_gdsdb_response_data;
 /* gdsdb_status_vector */
-static int hf_gdsdb_status_vector_arg = -1;
-static int hf_gdsdb_status_vector_error_code = -1;
-static int hf_gdsdb_status_vector_number = -1;
-static int hf_gdsdb_status_vector_string = -1;
-static int hf_gdsdb_status_vector_sql_state = -1;
+static int hf_gdsdb_status_vector_arg;
+static int hf_gdsdb_status_vector_error_code;
+static int hf_gdsdb_status_vector_number;
+static int hf_gdsdb_status_vector_string;
+static int hf_gdsdb_status_vector_sql_state;
 /* gdsdb_transact */
-static int hf_gdsdb_transact_database = -1;
-static int hf_gdsdb_transact_transaction = -1;
+static int hf_gdsdb_transact_database;
+static int hf_gdsdb_transact_transaction;
 #if 0
-static int hf_gdsdb_transact_messages = -1;
+static int hf_gdsdb_transact_messages;
 #endif
 /* gdsdb_transact_response */
-static int hf_gdsdb_transactresponse_messages = -1;
+static int hf_gdsdb_transactresponse_messages;
 /* gdsdb_open_blob2 */
-static int hf_gdsdb_openblob2_bpb = -1;
+static int hf_gdsdb_openblob2_bpb;
 /* gdsdb_open_blob */
-static int hf_gdsdb_openblob_transaction = -1;
-static int hf_gdsdb_openblob_id = -1;
+static int hf_gdsdb_openblob_transaction;
+static int hf_gdsdb_openblob_id;
 #if 0
 /* gdsdb_segment */
-static int hf_gdsdb_segment_blob = -1;
-static int hf_gdsdb_segment_length = -1;
-static int hf_gdsdb_segment_segment = -1;
+static int hf_gdsdb_segment_blob;
+static int hf_gdsdb_segment_length;
+static int hf_gdsdb_segment_segment;
 /* gdsdb_seek_blob */
-static int hf_gdsdb_seekblob_blob = -1;
-static int hf_gdsdb_seekblob_mode = -1;
+static int hf_gdsdb_seekblob_blob;
+static int hf_gdsdb_seekblob_mode;
 #endif
 /* gdsdb_reconnect */
-static int hf_gdsdb_reconnect_handle = -1;
-static int hf_gdsdb_reconnect_database_size = -1;
-static int hf_gdsdb_reconnect_database = -1;
+static int hf_gdsdb_reconnect_handle;
+static int hf_gdsdb_reconnect_database_size;
+static int hf_gdsdb_reconnect_database;
 /* gdsdb_info & gdsdb_service_start */
-static int hf_gdsdb_info_object = -1;
-static int hf_gdsdb_info_incarnation = -1;
-static int hf_gdsdb_info_items = -1;
-static int hf_gdsdb_info_recv_items = -1;
-static int hf_gdsdb_info_buffer_length = -1;
+static int hf_gdsdb_info_object;
+static int hf_gdsdb_info_incarnation;
+static int hf_gdsdb_info_items;
+static int hf_gdsdb_info_recv_items;
+static int hf_gdsdb_info_buffer_length;
 /* gdsdb_release */
-static int hf_gdsdb_release_object = -1;
+static int hf_gdsdb_release_object;
 #if 0
 /* gdsdb_prepare2 */
-static int hf_gdsdb_prepare2_transaction = -1;
+static int hf_gdsdb_prepare2_transaction;
 /* gdsdb_event & gdsdb_cancel_events */
-static int hf_gdsdb_event_database = -1;
-static int hf_gdsdb_event_items = -1;
-static int hf_gdsdb_event_ast = -1;
-static int hf_gdsdb_event_arg = -1;
-static int hf_gdsdb_event_rid = -1;
+static int hf_gdsdb_event_database;
+static int hf_gdsdb_event_items;
+static int hf_gdsdb_event_ast;
+static int hf_gdsdb_event_arg;
+static int hf_gdsdb_event_rid;
 /* gdsdb_ddl */
-static int hf_gdsdb_ddl_database = -1;
-static int hf_gdsdb_ddl_transaction = -1;
-static int hf_gdsdb_ddl_blr = -1;
+static int hf_gdsdb_ddl_database;
+static int hf_gdsdb_ddl_transaction;
+static int hf_gdsdb_ddl_blr;
 /* gdsdb_slice */
-static int hf_gdsdb_slice_transaction = -1;
-static int hf_gdsdb_slice_id = -1;
-static int hf_gdsdb_slice_sdl = -1;
-static int hf_gdsdb_slice_parameters = -1;
+static int hf_gdsdb_slice_transaction;
+static int hf_gdsdb_slice_id;
+static int hf_gdsdb_slice_sdl;
+static int hf_gdsdb_slice_parameters;
 /* gdsdb_slice_response */
-static int hf_gdsdb_sliceresponse_length = -1;
+static int hf_gdsdb_sliceresponse_length;
 #endif
 /* gdsdb_execute */
-static int hf_gdsdb_execute_statement = -1;
-static int hf_gdsdb_execute_transaction = -1;
-static int hf_gdsdb_execute_message_number = -1;
-static int hf_gdsdb_execute_messages = -1;
+static int hf_gdsdb_execute_statement;
+static int hf_gdsdb_execute_transaction;
+static int hf_gdsdb_execute_message_number;
+static int hf_gdsdb_execute_messages;
 #if 0
 /* gdsdb_execute2 */
-static int hf_gdsdb_execute_outblr = -1;
-static int hf_gdsdb_execute_outmsgnr = -1;
+static int hf_gdsdb_execute_outblr;
+static int hf_gdsdb_execute_outmsgnr;
 /* gdsdb_exec_immediate2 */
-static int hf_gdsdb_prepare2_blr = -1;
-static int hf_gdsdb_prepare2_number = -1;
-static int hf_gdsdb_prepare2_messages = -1;
-static int hf_gdsdb_prepare2_outblr = -1;
-static int hf_gdsdb_prepare2_outmsgnr = -1;
+static int hf_gdsdb_prepare2_blr;
+static int hf_gdsdb_prepare2_number;
+static int hf_gdsdb_prepare2_messages;
+static int hf_gdsdb_prepare2_outblr;
+static int hf_gdsdb_prepare2_outmsgnr;
 #endif
 /* gdsdb_prepare */
-static int hf_gdsdb_prepare_transaction = -1;
-static int hf_gdsdb_prepare_statement = -1;
-static int hf_gdsdb_prepare_dialect = -1;
-static int hf_gdsdb_prepare_querystr = -1;
-static int hf_gdsdb_prepare_bufferlength = -1;
+static int hf_gdsdb_prepare_transaction;
+static int hf_gdsdb_prepare_statement;
+static int hf_gdsdb_prepare_dialect;
+static int hf_gdsdb_prepare_querystr;
+static int hf_gdsdb_prepare_bufferlength;
 #if 0
 /* gdsdb_fetch */
-static int hf_gdsdb_fetch_statement = -1;
-static int hf_gdsdb_fetch_message_number = -1;
-static int hf_gdsdb_fetch_messages = -1;
+static int hf_gdsdb_fetch_statement;
+static int hf_gdsdb_fetch_message_number;
+static int hf_gdsdb_fetch_messages;
 /* gdsdb_fetch_response */
-static int hf_gdsdb_fetchresponse_status = -1;
-static int hf_gdsdb_fetchresponse_messages = -1;
+static int hf_gdsdb_fetchresponse_status;
+static int hf_gdsdb_fetchresponse_messages;
 #endif
 /* gdsdb_free_statement */
-static int hf_gdsdb_free_statement = -1;
-static int hf_gdsdb_free_option = -1;
+static int hf_gdsdb_free_statement;
+static int hf_gdsdb_free_option;
 #if 0
 /* gdsdb_insert */
-static int hf_gdsdb_insert_statement = -1;
-static int hf_gdsdb_insert_message_number = -1;
-static int hf_gdsdb_insert_messages = -1;
+static int hf_gdsdb_insert_statement;
+static int hf_gdsdb_insert_message_number;
+static int hf_gdsdb_insert_messages;
 /* gdsdb_cursor */
-static int hf_gdsdb_cursor_statement = -1;
-static int hf_gdsdb_cursor_type = -1;
+static int hf_gdsdb_cursor_statement;
+static int hf_gdsdb_cursor_type;
 /* gdsdb_sql_response */
-static int hf_gdsdb_sqlresponse_messages = -1;
+static int hf_gdsdb_sqlresponse_messages;
 #endif
 
-static expert_field ei_gdsdb_invalid_length = EI_INIT;
+static expert_field ei_gdsdb_invalid_length;
 
 enum
 {
diff --git a/epan/dissectors/packet-gearman.c b/epan/dissectors/packet-gearman.c
index 4d185fb723..752b71e5f5 100644
--- a/epan/dissectors/packet-gearman.c
+++ b/epan/dissectors/packet-gearman.c
@@ -26,45 +26,45 @@ void proto_reg_handoff_gearman(void);
 
 static dissector_handle_t gearman_handle;
 
-static int proto_gearman = -1;
-
-static int hf_gearman_mgr_cmd = -1;
-static int hf_gearman_magic_code = -1;
-static int hf_gearman_pkt_type = -1;
-static int hf_gearman_data_size = -1;
-static int hf_gearman_data_content = -1;
-static int hf_gearman_option_name = -1;
-static int hf_gearman_func_name = -1;
-static int hf_gearman_func_namez = -1;
-static int hf_gearman_client_id = -1;
-static int hf_gearman_client_count = -1;
-static int hf_gearman_uniq_id = -1;
-static int hf_gearman_uniq_idz = -1;
-static int hf_gearman_argument = -1;
-static int hf_gearman_job_handle = -1;
-static int hf_gearman_job_handlez = -1;
-static int hf_gearman_complete_numerator = -1;
-static int hf_gearman_complete_denominator = -1;
-static int hf_gearman_submit_job_sched_minute = -1;
-static int hf_gearman_submit_job_sched_hour = -1;
-static int hf_gearman_submit_job_sched_day_of_month = -1;
-static int hf_gearman_submit_job_sched_month = -1;
-static int hf_gearman_submit_job_sched_day_of_week = -1;
-static int hf_gearman_submit_job_epoch_time = -1;
-static int hf_gearman_reducer = -1;
-static int hf_gearman_result = -1;
-static int hf_gearman_known_status = -1;
-static int hf_gearman_running_status = -1;
-static int hf_gearman_timeout_value = -1;
-static int hf_gearman_echo_text = -1;
-static int hf_gearman_err_code = -1;
-static int hf_gearman_err_text = -1;
-
-static gint ett_gearman = -1;
-static gint ett_gearman_command = -1;
-static gint ett_gearman_content = -1;
-
-static expert_field ei_gearman_pkt_type_unknown = EI_INIT;
+static int proto_gearman;
+
+static int hf_gearman_mgr_cmd;
+static int hf_gearman_magic_code;
+static int hf_gearman_pkt_type;
+static int hf_gearman_data_size;
+static int hf_gearman_data_content;
+static int hf_gearman_option_name;
+static int hf_gearman_func_name;
+static int hf_gearman_func_namez;
+static int hf_gearman_client_id;
+static int hf_gearman_client_count;
+static int hf_gearman_uniq_id;
+static int hf_gearman_uniq_idz;
+static int hf_gearman_argument;
+static int hf_gearman_job_handle;
+static int hf_gearman_job_handlez;
+static int hf_gearman_complete_numerator;
+static int hf_gearman_complete_denominator;
+static int hf_gearman_submit_job_sched_minute;
+static int hf_gearman_submit_job_sched_hour;
+static int hf_gearman_submit_job_sched_day_of_month;
+static int hf_gearman_submit_job_sched_month;
+static int hf_gearman_submit_job_sched_day_of_week;
+static int hf_gearman_submit_job_epoch_time;
+static int hf_gearman_reducer;
+static int hf_gearman_result;
+static int hf_gearman_known_status;
+static int hf_gearman_running_status;
+static int hf_gearman_timeout_value;
+static int hf_gearman_echo_text;
+static int hf_gearman_err_code;
+static int hf_gearman_err_text;
+
+static gint ett_gearman;
+static gint ett_gearman_command;
+static gint ett_gearman_content;
+
+static expert_field ei_gearman_pkt_type_unknown;
 
 static gboolean gearman_desegment  = TRUE;
 
diff --git a/epan/dissectors/packet-ged125.c b/epan/dissectors/packet-ged125.c
index aed1a0c68a..ce2aeceff1 100644
--- a/epan/dissectors/packet-ged125.c
+++ b/epan/dissectors/packet-ged125.c
@@ -36,109 +36,109 @@
 void proto_register_ged125(void);
 void proto_reg_handoff_ged125(void);
 
-static int proto_ged125 = -1;
-
-static gint hf_ged125_length = -1;
-static gint hf_ged125_value = -1;
-static gint hf_ged125_service_control_value = -1;
-static gint hf_ged125_DialogueID_num = -1;
-static gint hf_ged125_SendSeqNo_num = -1;
-static gint hf_ged125_CurrentTime_num = -1;
-static gint hf_ged125_TimeZoneDelta = -1;
-static gint hf_ged125_OperationalStatus = -1;
-static gint hf_ged125_StatusVariable = -1;
-static gint hf_ged125_InvokeID = -1;
-static gint hf_ged125_Status = -1;
-static gint hf_ged125_VersionNumber = -1;
-static gint hf_ged125_IdleTimeout = -1;
-static gint hf_ged125_UseEventFeed = -1;
-static gint hf_ged125_UsePolledFeed = -1;
-static gint hf_ged125_UseCallRouting = -1;
-static gint hf_ged125_UseTimeSynch = -1;
-static gint hf_ged125_UseServiceControl = -1;
-static gint hf_ged125_TrunkGroupID = -1;
-static gint hf_ged125_TrunkCount = -1;
-static gint hf_ged125_CallsInToday = -1;
-static gint hf_ged125_CallsOutToday = -1;
-static gint hf_ged125_InServiceTimeToday = -1;
-static gint hf_ged125_InUseInboundTimeToday = -1;
-static gint hf_ged125_InUseOutboundTimeToday = -1;
-static gint hf_ged125_AllTrunksInUseTimeToday = -1;
-static gint hf_ged125_TrunkNumber = -1;
-static gint hf_ged125_TrunkStatus = -1;
-static gint hf_ged125_ServiceID = -1;
-static gint hf_ged125_AvailableNow = -1;
-static gint hf_ged125_CallsInNow = -1;
-static gint hf_ged125_CallsOutNow = -1;
-static gint hf_ged125_CallsHandledToday = -1;
-static gint hf_ged125_HandleTimeToday = -1;
-static gint hf_ged125_DivertedInToday = -1;
-static gint hf_ged125_DivertedOutToday = -1;
-static gint hf_ged125_StartOfDay = -1;
-static gint hf_ged125_InitDataTime = -1;
-static gint hf_ged125_CallID = -1;
-static gint hf_ged125_floating = -1;
-static gint hf_ged125_floating_CauseCode = -1;
-static gint hf_ged125_ServiceFeatures = -1;
-static gint hf_ged125_floating_payload_strg = -1;
-static gint hf_ged125_floating_payload_uint = -1;
-static gint hf_ged125_floating_payload_bool = -1;
-static gint hf_ged125_floating_payload_ECC_tag = -1;
-static gint hf_ged125_ResultCode = -1;
-static gint hf_ged125_LabelType = -1;
-static gint hf_ged125_Cause_just_for_release_message = -1;
-static gint hf_ged125_EventID = -1;
-static gint hf_ged125_ErrorCode = -1;
-static gint hf_ged125_InService = -1;
-static gint hf_ged125_ServiceAvailable = -1;
-static gint hf_ged125_RequestID = -1;
-static gint hf_ged125_ToBeContinued = -1;
-static gint hf_ged125_Barge_In_Allowed = -1;
-static gint hf_ged125_floating_cause_code = -1;
-static gint hf_ged125_DTMF_Termination_Key = -1;
-static gint hf_ged125_No_Entry_Timeout = -1;
-static gint hf_ged125_Interdigit_Timeout = -1;
-static gint hf_ged125_Number_of_No_Entry_Tries = -1;
-static gint hf_ged125_Number_of_Invalid_Entry_Tries = -1;
-static gint hf_ged125_Min_Length = -1;
-static gint hf_ged125_Max_Length = -1;
-static gint hf_ged125_ASR_Allowed = -1;
-static gint hf_ged125_DTMF_Menu_Keys = -1;
-static gint hf_ged125_Microapp_Error_Code = -1;
-static gint hf_ged125_ConferenceCallID = -1;
-static gint hf_ged125_PrimaryCallID = -1;
-static gint hf_ged125_SecondaryCallID = -1;
-static gint hf_ged125_NewServiceID = -1;
-static gint hf_ged125_NewCallID = -1;
-static gint hf_ged125_simulator_reset_event = -1;
-static gint hf_ged125_CrossRefID = -1;
-static gint hf_ged125_VRUTimeLag = -1;
-static gint hf_ged125_CallVarsMask = -1;
-static gint hf_ged125_floating_payload_unspec = -1;
-static gint hf_ged125_floating_uchar_array_index = -1;
-static gint hf_ged125_floating_media_protocol = -1;
-static gint hf_ged125_floating_library_designator = -1;
-static gint hf_ged125_Data_Playback_Type = -1;
-static gint hf_ged125_Data_Playback_Formats = -1;
-
-static gint ett_ged125 = -1;
-static gint ett_ged125_header = -1;
-static gint ett_ged125_message = -1;
-static gint ett_ged125_floating = -1;
-static gint ett_ged125_float_field = -1;
-static gint ett_ged125_service_control_header = -1;
-static gint ett_ged125_service_control_data = -1;
-
-static expert_field ei_ged125_OperationalStatus_normal = EI_INIT;
-static expert_field ei_ged125_OperationalStatus_loss_redundant_component = EI_INIT;
-static expert_field ei_ged125_OperationalStatus_degraded_call_processing = EI_INIT;
-static expert_field ei_ged125_OperationalStatus_conditions_prevent_call = EI_INIT;
-static expert_field ei_ged125_OperationalStatus_invalid_message = EI_INIT;
-static expert_field ei_ged125_length_bad = EI_INIT;
-static expert_field ei_ged125_sendseqno_and_dialogueid = EI_INIT;
-static expert_field ei_ged125_service_control_value_unknown = EI_INIT;
-static expert_field ei_ged125_trunk_group_id = EI_INIT;
-static expert_field ei_ged125_TrunkCount_invalid = EI_INIT;
+static int proto_ged125;
+
+static gint hf_ged125_length;
+static gint hf_ged125_value;
+static gint hf_ged125_service_control_value;
+static gint hf_ged125_DialogueID_num;
+static gint hf_ged125_SendSeqNo_num;
+static gint hf_ged125_CurrentTime_num;
+static gint hf_ged125_TimeZoneDelta;
+static gint hf_ged125_OperationalStatus;
+static gint hf_ged125_StatusVariable;
+static gint hf_ged125_InvokeID;
+static gint hf_ged125_Status;
+static gint hf_ged125_VersionNumber;
+static gint hf_ged125_IdleTimeout;
+static gint hf_ged125_UseEventFeed;
+static gint hf_ged125_UsePolledFeed;
+static gint hf_ged125_UseCallRouting;
+static gint hf_ged125_UseTimeSynch;
+static gint hf_ged125_UseServiceControl;
+static gint hf_ged125_TrunkGroupID;
+static gint hf_ged125_TrunkCount;
+static gint hf_ged125_CallsInToday;
+static gint hf_ged125_CallsOutToday;
+static gint hf_ged125_InServiceTimeToday;
+static gint hf_ged125_InUseInboundTimeToday;
+static gint hf_ged125_InUseOutboundTimeToday;
+static gint hf_ged125_AllTrunksInUseTimeToday;
+static gint hf_ged125_TrunkNumber;
+static gint hf_ged125_TrunkStatus;
+static gint hf_ged125_ServiceID;
+static gint hf_ged125_AvailableNow;
+static gint hf_ged125_CallsInNow;
+static gint hf_ged125_CallsOutNow;
+static gint hf_ged125_CallsHandledToday;
+static gint hf_ged125_HandleTimeToday;
+static gint hf_ged125_DivertedInToday;
+static gint hf_ged125_DivertedOutToday;
+static gint hf_ged125_StartOfDay;
+static gint hf_ged125_InitDataTime;
+static gint hf_ged125_CallID;
+static gint hf_ged125_floating;
+static gint hf_ged125_floating_CauseCode;
+static gint hf_ged125_ServiceFeatures;
+static gint hf_ged125_floating_payload_strg;
+static gint hf_ged125_floating_payload_uint;
+static gint hf_ged125_floating_payload_bool;
+static gint hf_ged125_floating_payload_ECC_tag;
+static gint hf_ged125_ResultCode;
+static gint hf_ged125_LabelType;
+static gint hf_ged125_Cause_just_for_release_message;
+static gint hf_ged125_EventID;
+static gint hf_ged125_ErrorCode;
+static gint hf_ged125_InService;
+static gint hf_ged125_ServiceAvailable;
+static gint hf_ged125_RequestID;
+static gint hf_ged125_ToBeContinued;
+static gint hf_ged125_Barge_In_Allowed;
+static gint hf_ged125_floating_cause_code;
+static gint hf_ged125_DTMF_Termination_Key;
+static gint hf_ged125_No_Entry_Timeout;
+static gint hf_ged125_Interdigit_Timeout;
+static gint hf_ged125_Number_of_No_Entry_Tries;
+static gint hf_ged125_Number_of_Invalid_Entry_Tries;
+static gint hf_ged125_Min_Length;
+static gint hf_ged125_Max_Length;
+static gint hf_ged125_ASR_Allowed;
+static gint hf_ged125_DTMF_Menu_Keys;
+static gint hf_ged125_Microapp_Error_Code;
+static gint hf_ged125_ConferenceCallID;
+static gint hf_ged125_PrimaryCallID;
+static gint hf_ged125_SecondaryCallID;
+static gint hf_ged125_NewServiceID;
+static gint hf_ged125_NewCallID;
+static gint hf_ged125_simulator_reset_event;
+static gint hf_ged125_CrossRefID;
+static gint hf_ged125_VRUTimeLag;
+static gint hf_ged125_CallVarsMask;
+static gint hf_ged125_floating_payload_unspec;
+static gint hf_ged125_floating_uchar_array_index;
+static gint hf_ged125_floating_media_protocol;
+static gint hf_ged125_floating_library_designator;
+static gint hf_ged125_Data_Playback_Type;
+static gint hf_ged125_Data_Playback_Formats;
+
+static gint ett_ged125;
+static gint ett_ged125_header;
+static gint ett_ged125_message;
+static gint ett_ged125_floating;
+static gint ett_ged125_float_field;
+static gint ett_ged125_service_control_header;
+static gint ett_ged125_service_control_data;
+
+static expert_field ei_ged125_OperationalStatus_normal;
+static expert_field ei_ged125_OperationalStatus_loss_redundant_component;
+static expert_field ei_ged125_OperationalStatus_degraded_call_processing;
+static expert_field ei_ged125_OperationalStatus_conditions_prevent_call;
+static expert_field ei_ged125_OperationalStatus_invalid_message;
+static expert_field ei_ged125_length_bad;
+static expert_field ei_ged125_sendseqno_and_dialogueid;
+static expert_field ei_ged125_service_control_value_unknown;
+static expert_field ei_ged125_trunk_group_id;
+static expert_field ei_ged125_TrunkCount_invalid;
 
 static dissector_handle_t ged125_handle;
 
diff --git a/epan/dissectors/packet-gelf.c b/epan/dissectors/packet-gelf.c
index e1331df70c..fa600c8fa1 100644
--- a/epan/dissectors/packet-gelf.c
+++ b/epan/dissectors/packet-gelf.c
@@ -37,15 +37,15 @@ void proto_register_gelf(void);
 void proto_reg_handoff_gelf(void);
 
 static dissector_handle_t json_handle;
-static int proto_gelf = -1;
+static int proto_gelf;
 static dissector_handle_t gelf_udp_handle;
 
-static gint ett_gelf = -1;
-static gint hf_gelf_pdu_type = -1;
-static gint hf_gelf_pdu_message_id = -1;
-static gint hf_gelf_pdu_chunk_number = -1;
-static gint hf_gelf_pdu_chunk_count = -1;
-static gint hf_gelf_pdu_chunked = -1;
+static gint ett_gelf;
+static gint hf_gelf_pdu_type;
+static gint hf_gelf_pdu_message_id;
+static gint hf_gelf_pdu_chunk_number;
+static gint hf_gelf_pdu_chunk_count;
+static gint hf_gelf_pdu_chunked;
 
 static const value_string gelf_udp_types[] = {
     { HEADER_GZIP, "gzip" },
@@ -61,19 +61,19 @@ static const value_string gelf_udp_types[] = {
 
 static reassembly_table gelf_udp_reassembly_table;
 
-static gint ett_gelf_fragment = -1;
-static gint ett_gelf_fragments = -1;
+static gint ett_gelf_fragment;
+static gint ett_gelf_fragments;
 
-static int hf_gelf_fragments = -1;
-static int hf_gelf_fragment = -1;
-static int hf_gelf_fragment_overlap = -1;
-static int hf_gelf_fragment_overlap_conflict = -1;
-static int hf_gelf_fragment_multiple_tails = -1;
-static int hf_gelf_fragment_too_long_fragment = -1;
-static int hf_gelf_fragment_error = -1;
-static int hf_gelf_fragment_count = -1;
-static int hf_gelf_reassembled_in = -1;
-static int hf_gelf_reassembled_length = -1;
+static int hf_gelf_fragments;
+static int hf_gelf_fragment;
+static int hf_gelf_fragment_overlap;
+static int hf_gelf_fragment_overlap_conflict;
+static int hf_gelf_fragment_multiple_tails;
+static int hf_gelf_fragment_too_long_fragment;
+static int hf_gelf_fragment_error;
+static int hf_gelf_fragment_count;
+static int hf_gelf_reassembled_in;
+static int hf_gelf_reassembled_length;
 
 static const fragment_items gelf_fragment_items = {
     &ett_gelf_fragment,
@@ -92,8 +92,8 @@ static const fragment_items gelf_fragment_items = {
     "GELF fragments"
 };
 
-static expert_field ei_gelf_invalid_header = EI_INIT;
-static expert_field ei_gelf_broken_compression = EI_INIT;
+static expert_field ei_gelf_invalid_header;
+static expert_field ei_gelf_broken_compression;
 
 static inline gboolean
 is_simple_zlib(guint16 header) {
diff --git a/epan/dissectors/packet-geneve.c b/epan/dissectors/packet-geneve.c
index 819965d491..0a7802ea8b 100644
--- a/epan/dissectors/packet-geneve.c
+++ b/epan/dissectors/packet-geneve.c
@@ -72,39 +72,39 @@ void proto_reg_handoff_geneve(void);
 
 static dissector_handle_t geneve_handle;
 
-static int proto_geneve = -1;
-
-static int hf_geneve_version = -1;
-static int hf_geneve_flags = -1;
-static int hf_geneve_flag_oam = -1;
-static int hf_geneve_flag_critical = -1;
-static int hf_geneve_flag_reserved = -1;
-static int hf_geneve_proto_type = -1;
-static int hf_geneve_vni = -1;
-static int hf_geneve_reserved = -1;
-static int hf_geneve_options = -1;
-static int hf_geneve_option_class = -1;
-static int hf_geneve_option_type = -1;
-static int hf_geneve_option_type_critical = -1;
-static int hf_geneve_option_flags = -1;
-static int hf_geneve_option_flags_reserved = -1;
-static int hf_geneve_option_length = -1;
-static int hf_geneve_option = -1;
-static int hf_geneve_opt_gcp_vnid = -1;
-static int hf_geneve_opt_gcp_reserved = -1;
-static int hf_geneve_opt_gcp_direction = -1;
-static int hf_geneve_opt_gcp_endpoint = -1;
-static int hf_geneve_opt_gcp_profile = -1;
-static int hf_geneve_opt_unknown_data = -1;
-
-static int ett_geneve = -1;
-static int ett_geneve_flags = -1;
-static int ett_geneve_opt_flags = -1;
-static int ett_geneve_options = -1;
-static int ett_geneve_opt_data = -1;
-
-static expert_field ei_geneve_ver_unknown = EI_INIT;
-static expert_field ei_geneve_opt_len_invalid = EI_INIT;
+static int proto_geneve;
+
+static int hf_geneve_version;
+static int hf_geneve_flags;
+static int hf_geneve_flag_oam;
+static int hf_geneve_flag_critical;
+static int hf_geneve_flag_reserved;
+static int hf_geneve_proto_type;
+static int hf_geneve_vni;
+static int hf_geneve_reserved;
+static int hf_geneve_options;
+static int hf_geneve_option_class;
+static int hf_geneve_option_type;
+static int hf_geneve_option_type_critical;
+static int hf_geneve_option_flags;
+static int hf_geneve_option_flags_reserved;
+static int hf_geneve_option_length;
+static int hf_geneve_option;
+static int hf_geneve_opt_gcp_vnid;
+static int hf_geneve_opt_gcp_reserved;
+static int hf_geneve_opt_gcp_direction;
+static int hf_geneve_opt_gcp_endpoint;
+static int hf_geneve_opt_gcp_profile;
+static int hf_geneve_opt_unknown_data;
+
+static int ett_geneve;
+static int ett_geneve_flags;
+static int ett_geneve_opt_flags;
+static int ett_geneve_options;
+static int ett_geneve_opt_data;
+
+static expert_field ei_geneve_ver_unknown;
+static expert_field ei_geneve_opt_len_invalid;
 
 static dissector_table_t ethertype_dissector_table;
 
diff --git a/epan/dissectors/packet-geonw.c b/epan/dissectors/packet-geonw.c
index 34059574d2..d92d9b6e3c 100644
--- a/epan/dissectors/packet-geonw.c
+++ b/epan/dissectors/packet-geonw.c
@@ -154,9 +154,9 @@ void proto_register_geonw(void);
  */
 static wmem_map_t *geonw_hashtable = NULL;
 
-static int proto_geonw = -1;
-static int proto_btpa = -1;
-static int proto_btpb = -1;
+static int proto_geonw;
+static int proto_btpa;
+static int proto_btpb;
 
 static int geonw_tap = -1;
 static int btpa_tap = -1;
@@ -164,125 +164,125 @@ static int btpa_follow_tap = -1;
 static int btpb_tap = -1;
 static int btpb_follow_tap = -1;
 
-static int hf_geonw_bh = -1;
-static int hf_geonw_bh_version = -1;
-static int hf_geonw_bh_next_header = -1;
-static int hf_geonw_bh_reserved = -1;
-static int hf_geonw_bh_life_time = -1;
-static int hf_geonw_bh_lt_mult = -1;
-static int hf_geonw_bh_lt_base = -1;
-static int hf_geonw_bh_remain_hop_limit = -1;
-
-static int hf_geonw_ch = -1;
-static int hf_geonw_ch_next_header = -1;
-static int hf_geonw_ch_reserved1 = -1;
-static int hf_geonw_ch_header_type = -1;
-//static int hf_geonw_ch_header_subtype = -1;
-static int hf_geonw_ch_traffic_class = -1;
-static int hf_geonw_ch_tc_scf = -1;
-static int hf_geonw_ch_tc_offload = -1;
-static int hf_geonw_ch_tc_id = -1;
-static int hf_geonw_ch_flags = -1;
-static int hf_geonw_ch_flags_mob = -1;
-static int hf_geonw_ch_flags_reserved = -1;
-static int hf_geonw_ch_payload_length = -1;
-static int hf_geonw_ch_max_hop_limit = -1;
-static int hf_geonw_ch_reserved2 = -1;
-
-static int hf_geonw_seq_num = -1;
-static int hf_geonw_reserved = -1;
-static int hf_geonw_so_pv = -1;
-static int hf_geonw_so_pv_addr = -1;
-static int hf_geonw_so_pv_addr_manual = -1;
-static int hf_geonw_so_pv_addr_type = -1;
-static int hf_geonw_so_pv_addr_country = -1;
-static int hf_geonw_so_pv_addr_mid = -1;
-static int hf_geonw_so_pv_time = -1;
-static int hf_geonw_so_pv_lat = -1;
-static int hf_geonw_so_pv_lon = -1;
-static int hf_geonw_so_pv_pai = -1;
-static int hf_geonw_so_pv_speed = -1;
-static int hf_geonw_so_pv_heading = -1;
-static int hf_geonw_de_pv = -1;
-static int hf_geonw_de_pv_addr = -1;
-static int hf_geonw_de_pv_addr_manual = -1;
-static int hf_geonw_de_pv_addr_type = -1;
-static int hf_geonw_de_pv_addr_country = -1;
-static int hf_geonw_de_pv_addr_mid = -1;
-static int hf_geonw_de_pv_time = -1;
-static int hf_geonw_de_pv_lat = -1;
-static int hf_geonw_de_pv_lon = -1;
-
-static int hf_geonw_gxc_latitude = -1;
-static int hf_geonw_gxc_longitude = -1;
-static int hf_geonw_gxc_radius = -1;
-static int hf_geonw_gxc_distancea = -1;
-static int hf_geonw_gxc_distanceb = -1;
-static int hf_geonw_gxc_angle = -1;
-static int hf_geonw_gxc_reserved = -1;
-
-static int hf_geonw_shb_reserved = -1;
-
-static int hf_geonw_lsrq_addr = -1;
-static int hf_geonw_lsrq_addr_manual = -1;
-static int hf_geonw_lsrq_addr_type = -1;
-static int hf_geonw_lsrq_addr_country = -1;
-static int hf_geonw_lsrq_addr_mid = -1;
-
-static int hf_geonw_beacon = -1;
-static int hf_geonw_guc = -1;
-static int hf_geonw_gac = -1;
-static int hf_geonw_gbc = -1;
-static int hf_geonw_tsb = -1;
-static int hf_geonw_ls = -1;
-static int hf_geonw_analysis_flags = -1;
-
-static int hf_btpa_dstport = -1;
-static int hf_btpa_srcport = -1;
-static int hf_btpa_port = -1;
-static int hf_btpb_dstport = -1;
-static int hf_btpb_dstport_info = -1;
-
-static int hf_geonw_resp_in = -1;
-static int hf_geonw_resp_to = -1;
-static int hf_geonw_no_resp = -1;
-static int hf_geonw_resptime = -1;
-
-static int hf_geonw_dccmco = -1;
-static int hf_geonw_dccmco_cbr_l_0_hop = -1;
-static int hf_geonw_dccmco_cbr_l_1_hop = -1;
-static int hf_geonw_dccmco_output_power = -1;
-static int hf_geonw_dccmco_reserved = -1;
-
-static gint ett_geonw = -1;
-static gint ett_geonw_bh = -1;
-static gint ett_geonw_bh_lt = -1;
-static gint ett_geonw_ch = -1;
-static gint ett_geonw_ch_tc = -1;
-static gint ett_geonw_sh = -1;
-static gint ett_geonw_so = -1;
-static gint ett_geonw_so_add = -1;
-static gint ett_geonw_de = -1;
-static gint ett_geonw_de_add = -1;
-static gint ett_geonw_lsrq_add = -1;
-static gint ett_geonw_analysis = -1;
-static gint ett_geonw_dccmco = -1;
-static gint ett_btpa = -1;
-static gint ett_btpb = -1;
+static int hf_geonw_bh;
+static int hf_geonw_bh_version;
+static int hf_geonw_bh_next_header;
+static int hf_geonw_bh_reserved;
+static int hf_geonw_bh_life_time;
+static int hf_geonw_bh_lt_mult;
+static int hf_geonw_bh_lt_base;
+static int hf_geonw_bh_remain_hop_limit;
+
+static int hf_geonw_ch;
+static int hf_geonw_ch_next_header;
+static int hf_geonw_ch_reserved1;
+static int hf_geonw_ch_header_type;
+//static int hf_geonw_ch_header_subtype;
+static int hf_geonw_ch_traffic_class;
+static int hf_geonw_ch_tc_scf;
+static int hf_geonw_ch_tc_offload;
+static int hf_geonw_ch_tc_id;
+static int hf_geonw_ch_flags;
+static int hf_geonw_ch_flags_mob;
+static int hf_geonw_ch_flags_reserved;
+static int hf_geonw_ch_payload_length;
+static int hf_geonw_ch_max_hop_limit;
+static int hf_geonw_ch_reserved2;
+
+static int hf_geonw_seq_num;
+static int hf_geonw_reserved;
+static int hf_geonw_so_pv;
+static int hf_geonw_so_pv_addr;
+static int hf_geonw_so_pv_addr_manual;
+static int hf_geonw_so_pv_addr_type;
+static int hf_geonw_so_pv_addr_country;
+static int hf_geonw_so_pv_addr_mid;
+static int hf_geonw_so_pv_time;
+static int hf_geonw_so_pv_lat;
+static int hf_geonw_so_pv_lon;
+static int hf_geonw_so_pv_pai;
+static int hf_geonw_so_pv_speed;
+static int hf_geonw_so_pv_heading;
+static int hf_geonw_de_pv;
+static int hf_geonw_de_pv_addr;
+static int hf_geonw_de_pv_addr_manual;
+static int hf_geonw_de_pv_addr_type;
+static int hf_geonw_de_pv_addr_country;
+static int hf_geonw_de_pv_addr_mid;
+static int hf_geonw_de_pv_time;
+static int hf_geonw_de_pv_lat;
+static int hf_geonw_de_pv_lon;
+
+static int hf_geonw_gxc_latitude;
+static int hf_geonw_gxc_longitude;
+static int hf_geonw_gxc_radius;
+static int hf_geonw_gxc_distancea;
+static int hf_geonw_gxc_distanceb;
+static int hf_geonw_gxc_angle;
+static int hf_geonw_gxc_reserved;
+
+static int hf_geonw_shb_reserved;
+
+static int hf_geonw_lsrq_addr;
+static int hf_geonw_lsrq_addr_manual;
+static int hf_geonw_lsrq_addr_type;
+static int hf_geonw_lsrq_addr_country;
+static int hf_geonw_lsrq_addr_mid;
+
+static int hf_geonw_beacon;
+static int hf_geonw_guc;
+static int hf_geonw_gac;
+static int hf_geonw_gbc;
+static int hf_geonw_tsb;
+static int hf_geonw_ls;
+static int hf_geonw_analysis_flags;
+
+static int hf_btpa_dstport;
+static int hf_btpa_srcport;
+static int hf_btpa_port;
+static int hf_btpb_dstport;
+static int hf_btpb_dstport_info;
+
+static int hf_geonw_resp_in;
+static int hf_geonw_resp_to;
+static int hf_geonw_no_resp;
+static int hf_geonw_resptime;
+
+static int hf_geonw_dccmco;
+static int hf_geonw_dccmco_cbr_l_0_hop;
+static int hf_geonw_dccmco_cbr_l_1_hop;
+static int hf_geonw_dccmco_output_power;
+static int hf_geonw_dccmco_reserved;
+
+static gint ett_geonw;
+static gint ett_geonw_bh;
+static gint ett_geonw_bh_lt;
+static gint ett_geonw_ch;
+static gint ett_geonw_ch_tc;
+static gint ett_geonw_sh;
+static gint ett_geonw_so;
+static gint ett_geonw_so_add;
+static gint ett_geonw_de;
+static gint ett_geonw_de_add;
+static gint ett_geonw_lsrq_add;
+static gint ett_geonw_analysis;
+static gint ett_geonw_dccmco;
+static gint ett_btpa;
+static gint ett_btpb;
 
 static int geonw_address_type = -1;
 
-static expert_field ei_geonw_nz_reserved        = EI_INIT;
-static expert_field ei_geonw_version_err        = EI_INIT;
-static expert_field ei_geonw_rhl_lncb           = EI_INIT;
-static expert_field ei_geonw_rhl_too_low        = EI_INIT;
-static expert_field ei_geonw_mhl_lt_rhl         = EI_INIT;
-static expert_field ei_geonw_scc_too_big        = EI_INIT;
-static expert_field ei_geonw_analysis_duplicate = EI_INIT;
-static expert_field ei_geonw_resp_not_found     = EI_INIT;
-static expert_field ei_geonw_out_of_range       = EI_INIT;
-static expert_field ei_geonw_payload_len        = EI_INIT;
-static expert_field ei_geonw_intx_too_big       = EI_INIT;
+static expert_field ei_geonw_nz_reserved;
+static expert_field ei_geonw_version_err;
+static expert_field ei_geonw_rhl_lncb;
+static expert_field ei_geonw_rhl_too_low;
+static expert_field ei_geonw_mhl_lt_rhl;
+static expert_field ei_geonw_scc_too_big;
+static expert_field ei_geonw_analysis_duplicate;
+static expert_field ei_geonw_resp_not_found;
+static expert_field ei_geonw_out_of_range;
+static expert_field ei_geonw_payload_len;
+static expert_field ei_geonw_intx_too_big;
 
 static dissector_table_t geonw_subdissector_table;
 static dissector_table_t ssp_subdissector_table;
@@ -846,66 +846,66 @@ struct geonw_analysis {
  * Secured geonetworking
  */
 
-static int hf_geonw_sec = -1;
-static int hf_sgeonw_version = -1;
-static int hf_sgeonw_profile = -1;
-static int hf_sgeonw_hdr = -1;
-static int hf_sgeonw_pl = -1;
-static int hf_sgeonw_trl = -1;
-static int hf_sgeonw_var_len = -1;
-static int hf_sgeonw_var_len_det = -1;
-static int hf_sgeonw_var_len_val = -1;
-static int hf_sgeonw_header_field = -1;
-static int hf_sgeonw_header_field_type_v1 = -1;
-static int hf_sgeonw_header_field_type_v2 = -1;
-static int hf_sgeonw_opaque = -1;
-
-static int hf_sgeonw_payload_field = -1;
-static int hf_sgeonw_payload_field_type = -1;
-
-static int hf_sgeonw_trailer_field = -1;
-static int hf_sgeonw_trailer_field_type = -1;
-
-static int hf_sgeonw_certificate = -1;
-static int hf_sgeonw_encryption_parameter = -1;
-static int hf_sgeonw_signature = -1;
-static int hf_sgeonw_subject_info = -1;
-static int hf_sgeonw_subject_attribute = -1;
-
-static int hf_sgeonw_intx = -1;
-static int hf_sgeonw_time64 = -1;
-static int hf_sgeonw_conf = -1;
-static int hf_sgeonw_time32 = -1;
-static int hf_sgeonw_lat = -1;
-static int hf_sgeonw_lon = -1;
-static int hf_sgeonw_elev = -1;
-static int hf_sgeonw_hashedid3 = -1;
-static int hf_sgeonw_hashedid8 = -1;
-static int hf_sgeonw_duration = -1;
-static int hf_sgeonw_duration_unit = -1;
-static int hf_sgeonw_duration_value = -1;
-static int hf_sgeonw_encryption_parameter_nonce = -1;
-
-static int hf_sgeonw_msg_id = -1;
-static int hf_sgeonw_app_id = -1;
-
-static int ett_geonw_sec = -1;
-static int ett_sgeonw_hdr = -1;
-static int ett_sgeonw_field = -1;
-static int ett_sgeonw_var_len = -1;
-static int ett_sgeonw_intx = -1;
-static int ett_sgeonw_duration = -1;
-static int ett_sgeonw_encryption_parameter = -1;
-static int ett_sgeonw_signature = -1;
-static int ett_sgeonw_subject_info = -1;
-static int ett_sgeonw_subject_attribute = -1;
-static int ett_sgeonw_ssp = -1;
-
-static expert_field ei_sgeonw_len_unsupported     = EI_INIT;
-static expert_field ei_sgeonw_len_too_long        = EI_INIT;
-static expert_field ei_sgeonw_subj_info_too_long  = EI_INIT;
-static expert_field ei_sgeonw_ssp_too_long        = EI_INIT;
-static expert_field ei_sgeonw_bogus               = EI_INIT;
+static int hf_geonw_sec;
+static int hf_sgeonw_version;
+static int hf_sgeonw_profile;
+static int hf_sgeonw_hdr;
+static int hf_sgeonw_pl;
+static int hf_sgeonw_trl;
+static int hf_sgeonw_var_len;
+static int hf_sgeonw_var_len_det;
+static int hf_sgeonw_var_len_val;
+static int hf_sgeonw_header_field;
+static int hf_sgeonw_header_field_type_v1;
+static int hf_sgeonw_header_field_type_v2;
+static int hf_sgeonw_opaque;
+
+static int hf_sgeonw_payload_field;
+static int hf_sgeonw_payload_field_type;
+
+static int hf_sgeonw_trailer_field;
+static int hf_sgeonw_trailer_field_type;
+
+static int hf_sgeonw_certificate;
+static int hf_sgeonw_encryption_parameter;
+static int hf_sgeonw_signature;
+static int hf_sgeonw_subject_info;
+static int hf_sgeonw_subject_attribute;
+
+static int hf_sgeonw_intx;
+static int hf_sgeonw_time64;
+static int hf_sgeonw_conf;
+static int hf_sgeonw_time32;
+static int hf_sgeonw_lat;
+static int hf_sgeonw_lon;
+static int hf_sgeonw_elev;
+static int hf_sgeonw_hashedid3;
+static int hf_sgeonw_hashedid8;
+static int hf_sgeonw_duration;
+static int hf_sgeonw_duration_unit;
+static int hf_sgeonw_duration_value;
+static int hf_sgeonw_encryption_parameter_nonce;
+
+static int hf_sgeonw_msg_id;
+static int hf_sgeonw_app_id;
+
+static int ett_geonw_sec;
+static int ett_sgeonw_hdr;
+static int ett_sgeonw_field;
+static int ett_sgeonw_var_len;
+static int ett_sgeonw_intx;
+static int ett_sgeonw_duration;
+static int ett_sgeonw_encryption_parameter;
+static int ett_sgeonw_signature;
+static int ett_sgeonw_subject_info;
+static int ett_sgeonw_subject_attribute;
+static int ett_sgeonw_ssp;
+
+static expert_field ei_sgeonw_len_unsupported;
+static expert_field ei_sgeonw_len_too_long;
+static expert_field ei_sgeonw_subj_info_too_long;
+static expert_field ei_sgeonw_ssp_too_long;
+static expert_field ei_sgeonw_bogus;
 
 typedef enum {
     generation_time = 0,
@@ -977,8 +977,8 @@ static const value_string trailer_field_type_names[] = {
     { 0, NULL },
 };
 
-static int hf_sgeonw_signer_info = -1;
-static int hf_sgeonw_signer_info_type = -1;
+static int hf_sgeonw_signer_info;
+static int hf_sgeonw_signer_info_type;
 
 typedef enum {
     self = 0,
@@ -1001,10 +1001,10 @@ static const value_string signer_info_type_names[] = {
     { 0, NULL },
 };
 
-static int hf_sgeonw_public_key = -1;
-static int ett_sgeonw_public_key = -1;
-static int hf_sgeonw_public_key_algorithm = -1;
-static int hf_sgeonw_ecdsasignature_s = -1;
+static int hf_sgeonw_public_key;
+static int ett_sgeonw_public_key;
+static int hf_sgeonw_public_key_algorithm;
+static int hf_sgeonw_ecdsasignature_s;
 
 typedef enum {
     ecdsa_nistp256_with_sha256 = 0,
@@ -1026,7 +1026,7 @@ static const int etsits103097_table_2[] = {
     32 // ecies_nistp256(1)
 };
 
-static int hf_sgeonw_symmetric_algorithm = -1;
+static int hf_sgeonw_symmetric_algorithm;
 
 typedef enum {
     aes_128_ccm = 0,
@@ -1043,8 +1043,8 @@ static const int etsits103097_table_4[] = {
     16 // aes_128_ccm(0)
 };
 
-static int hf_sgeonw_region_type = -1;
-static int hf_sgeonw_radius = -1;
+static int hf_sgeonw_region_type;
+static int hf_sgeonw_radius;
 
 typedef enum {
     none = 0,
@@ -1067,9 +1067,9 @@ static const value_string region_type_names[] = {
     { 0, NULL },
 };
 
-static int hf_sgeonw_region_dictionary = -1;
-static int hf_sgeonw_region_identifier = -1;
-static int hf_sgeonw_local_region = -1;
+static int hf_sgeonw_region_dictionary;
+static int hf_sgeonw_region_identifier;
+static int hf_sgeonw_local_region;
 
 typedef enum {
     iso_3166_1 = 0,
@@ -1084,7 +1084,7 @@ static const value_string region_dictionary_names[] = {
     { 0, NULL },
 };
 
-static int hf_sgeonw_subject_type = -1;
+static int hf_sgeonw_subject_type;
 
 typedef enum {
     enrollment_credential = 0,
@@ -1108,8 +1108,8 @@ static const value_string subject_type_names[] = {
     { 0, NULL },
 };
 
-static int hf_sgeonw_subject_attribute_type_v1 = -1;
-static int hf_sgeonw_subject_attribute_type_v2 = -1;
+static int hf_sgeonw_subject_attribute_type_v1;
+static int hf_sgeonw_subject_attribute_type_v2;
 
 typedef enum {
     verification_key = 0,
@@ -1146,7 +1146,7 @@ static const value_string subject_attribute_type_v2_names[] = {
     { 0, NULL },
 };
 
-static int hf_sgeonw_validity_restriction_type = -1;
+static int hf_sgeonw_validity_restriction_type;
 
 typedef enum {
     time_end = 0,
@@ -1166,11 +1166,11 @@ static const value_string validity_restriction_type_names[] = {
     { 0, NULL },
 };
 
-static int hf_sgeonw_eccpoint = -1;
-static int ett_sgeonw_eccpoint = -1;
-static int hf_sgeonw_eccpoint_type = -1;
-static int hf_sgeonw_eccpoint_x = -1;
-static int hf_sgeonw_eccpoint_y = -1;
+static int hf_sgeonw_eccpoint;
+static int ett_sgeonw_eccpoint;
+static int hf_sgeonw_eccpoint_type;
+static int hf_sgeonw_eccpoint_x;
+static int hf_sgeonw_eccpoint_y;
 
 typedef enum {
     x_coordinate_only = 0,
@@ -1470,7 +1470,7 @@ dissect_sec_itsaidssp(tvbuff_t *tvb, gint *offset, packet_info *pinfo, proto_tre
     return (*offset) - start;
 }
 
-static int hf_sgeonw_priority = -1;
+static int hf_sgeonw_priority;
 
 static int
 dissect_sec_itsaidpriority(tvbuff_t *tvb, gint *offset, packet_info *pinfo, proto_tree *tree)
@@ -1504,11 +1504,11 @@ dissect_sec_itsaidpriorityssp(tvbuff_t *tvb, gint *offset, packet_info *pinfo, p
     return (*offset) - start;
 }
 
-static int hf_sgeonw_subject_assurance = -1;
-static int ett_sgeonw_subject_assurance = -1;
-static int hf_sgeonw_subject_assurance_assurance = -1;
-static int hf_sgeonw_subject_assurance_reserved = -1;
-static int hf_sgeonw_subject_assurance_confidence = -1;
+static int hf_sgeonw_subject_assurance;
+static int ett_sgeonw_subject_assurance;
+static int hf_sgeonw_subject_assurance_assurance;
+static int hf_sgeonw_subject_assurance_reserved;
+static int hf_sgeonw_subject_assurance_confidence;
 
 static int
 dissect_sec_subject_attributes(tvbuff_t *tvb, gint *offset, packet_info *pinfo, proto_tree *tree, guint8 version)
@@ -1739,7 +1739,7 @@ dissect_sec_validity_restrictions(tvbuff_t *tvb, gint *offset, packet_info *pinf
 
 static int dissect_sec_signer_info(tvbuff_t *tvb, gint *offset, packet_info *pinfo, proto_tree *tree, guint8 version);
 
-static int hf_sgeonw_certification_version = -1;
+static int hf_sgeonw_certification_version;
 
 static int
 dissect_sec_certificate(tvbuff_t *tvb, gint *offset, packet_info *pinfo, proto_tree *tree, guint8 version)
@@ -1840,8 +1840,8 @@ dissect_sec_signer_info(tvbuff_t *tvb, gint *offset, packet_info *pinfo, proto_t
 }
 
 
-static int hf_sgeonw_encrypted_key = -1;
-static int hf_sgeonw_auth_tag = -1;
+static int hf_sgeonw_encrypted_key;
+static int hf_sgeonw_auth_tag;
 
 // This structure defines how to transmit an EciesNistP256-encrypted symmetric key as defined in IEEE
 // Std 1363a-2004.
diff --git a/epan/dissectors/packet-gfp.c b/epan/dissectors/packet-gfp.c
index ec6a0f5c77..78eb3c4166 100644
--- a/epan/dissectors/packet-gfp.c
+++ b/epan/dissectors/packet-gfp.c
@@ -41,35 +41,35 @@ void proto_register_gfp(void);
 static dissector_handle_t gfp_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_gfp = -1;
-static int hf_gfp_pli = -1;
-static int hf_gfp_chec = -1;
-static int hf_gfp_chec_status = -1;
-static int hf_gfp_type = -1;
-static int hf_gfp_pti = -1;
-static int hf_gfp_pfi = -1;
-static int hf_gfp_exi = -1;
-static int hf_gfp_upi_data = -1;
-static int hf_gfp_upi_management = -1;
-static int hf_gfp_thec = -1;
-static int hf_gfp_thec_status = -1;
-static int hf_gfp_cid = -1;
-static int hf_gfp_ehec = -1;
-static int hf_gfp_ehec_status = -1;
-static int hf_gfp_fcs = -1;
-static int hf_gfp_fcs_good = -1;
-static int hf_gfp_fcs_bad = -1;
-
-static expert_field ei_gfp_pli_idle_nonempty = EI_INIT;
-static expert_field ei_gfp_pli_unknown = EI_INIT;
-static expert_field ei_gfp_pli_invalid = EI_INIT;
-static expert_field ei_gfp_chec_bad = EI_INIT;
-static expert_field ei_gfp_thec_bad = EI_INIT;
-static expert_field ei_gfp_ehec_bad = EI_INIT;
-static expert_field ei_gfp_exi_short = EI_INIT;
-static expert_field ei_gfp_pfi_short = EI_INIT;
-static expert_field ei_gfp_payload_undecoded = EI_INIT;
-static expert_field ei_gfp_fcs_bad = EI_INIT;
+static int proto_gfp;
+static int hf_gfp_pli;
+static int hf_gfp_chec;
+static int hf_gfp_chec_status;
+static int hf_gfp_type;
+static int hf_gfp_pti;
+static int hf_gfp_pfi;
+static int hf_gfp_exi;
+static int hf_gfp_upi_data;
+static int hf_gfp_upi_management;
+static int hf_gfp_thec;
+static int hf_gfp_thec_status;
+static int hf_gfp_cid;
+static int hf_gfp_ehec;
+static int hf_gfp_ehec_status;
+static int hf_gfp_fcs;
+static int hf_gfp_fcs_good;
+static int hf_gfp_fcs_bad;
+
+static expert_field ei_gfp_pli_idle_nonempty;
+static expert_field ei_gfp_pli_unknown;
+static expert_field ei_gfp_pli_invalid;
+static expert_field ei_gfp_chec_bad;
+static expert_field ei_gfp_thec_bad;
+static expert_field ei_gfp_ehec_bad;
+static expert_field ei_gfp_exi_short;
+static expert_field ei_gfp_pfi_short;
+static expert_field ei_gfp_payload_undecoded;
+static expert_field ei_gfp_fcs_bad;
 
 #define GFP_USER_DATA 0
 #define GFP_CLIENT_MANAGEMENT 4
@@ -80,9 +80,9 @@ static expert_field ei_gfp_fcs_bad = EI_INIT;
 #define GFP_EXT_RING 2
 
 /* Initialize the subtree pointers */
-static gint ett_gfp = -1;
-static gint ett_gfp_type = -1;
-static gint ett_gfp_fcs = -1;
+static gint ett_gfp;
+static gint ett_gfp_type;
+static gint ett_gfp_fcs;
 
 static dissector_table_t gfp_dissector_table;
 
diff --git a/epan/dissectors/packet-gias.c b/epan/dissectors/packet-gias.c
index 9922ce7a4a..ba25570986 100644
--- a/epan/dissectors/packet-gias.c
+++ b/epan/dissectors/packet-gias.c
@@ -45,344 +45,344 @@ void proto_register_giop_gias(void);
 void proto_reg_handoff_giop_gias(void);
 
 /* Initialise the protocol and subtree pointers */
-static int proto_gias = -1;
-static gint ett_gias = -1;
+static int proto_gias;
+static gint ett_gias;
 
 
 /* Initialise the initial Alignment */
 static guint32  boundary = GIOP_HEADER_SIZE;  /* initial value */
 
-static int hf_operationrequest = -1;/* Request_Operation field */
+static int hf_operationrequest;/* Request_Operation field */
 
         /* Operation filters */
-static int hf_CB_Callback_notify_theState = -1;
-static int hf_GIAS_Library_get_manager_types_return_loop = -1;
-static int hf_GIAS_Library_get_manager_types_return = -1;
-static int hf_GIAS_Library_get_manager_manager_type = -1;
-static int hf_GIAS_Library_get_other_libraries_return_loop = -1;
-static int hf_GIAS_LibraryManager_get_property_names_return_loop = -1;
-static int hf_GIAS_LibraryManager_get_property_names_return = -1;
-static int hf_GIAS_LibraryManager_get_property_values_return_loop = -1;
-static int hf_GIAS_LibraryManager_get_property_values_desired_properties_loop = -1;
-static int hf_GIAS_LibraryManager_get_property_values_desired_properties = -1;
-static int hf_GIAS_LibraryManager_get_libraries_return_loop = -1;
-static int hf_GIAS_RequestManager_get_active_requests_return_loop = -1;
-static int hf_GIAS_RequestManager_get_default_timeout_return = -1;
-static int hf_GIAS_RequestManager_set_default_timeout_new_default = -1;
-static int hf_GIAS_RequestManager_get_timeout_return = -1;
-static int hf_GIAS_RequestManager_set_timeout_new_lifetime = -1;
-static int hf_GIAS_AccessManager_get_use_modes_return_loop = -1;
-static int hf_GIAS_AccessManager_get_use_modes_return = -1;
-static int hf_GIAS_AccessManager_is_available_return = -1;
-static int hf_GIAS_AccessManager_is_available_use_mode = -1;
-static int hf_GIAS_AccessManager_query_availability_delay_return = -1;
-static int hf_GIAS_AccessManager_query_availability_delay_availability_requirement = -1;
-static int hf_GIAS_AccessManager_query_availability_delay_use_mode = -1;
-static int hf_GIAS_AccessManager_get_number_of_priorities_return = -1;
-static int hf_GIAS_AccessManager_set_availability_products_loop = -1;
-static int hf_GIAS_AccessManager_set_availability_availability_requirement = -1;
-static int hf_GIAS_AccessManager_set_availability_use_mode = -1;
-static int hf_GIAS_AccessManager_set_availability_priority = -1;
-static int hf_GIAS_QueryOrderMgr_get_event_descriptions_return_loop = -1;
-static int hf_GIAS_QueryOrderMgr_submit_query_order_o_type = -1;
-static int hf_GIAS_QueryOrderMgr_submit_query_order_properties_loop = -1;
-static int hf_GIAS_OrderMgr_get_package_specifications_return_loop = -1;
-static int hf_GIAS_OrderMgr_get_package_specifications_return = -1;
-static int hf_GIAS_OrderMgr_validate_order_properties_loop = -1;
-static int hf_GIAS_OrderMgr_order_properties_loop = -1;
-static int hf_GIAS_DataModelMgr_get_data_model_date_properties_loop = -1;
-static int hf_GIAS_DataModelMgr_get_alias_categories_return_loop = -1;
-static int hf_GIAS_DataModelMgr_get_alias_categories_return = -1;
-static int hf_GIAS_DataModelMgr_get_alias_categories_properties_loop = -1;
-static int hf_GIAS_DataModelMgr_get_logical_aliases_return_loop = -1;
-static int hf_GIAS_DataModelMgr_get_logical_aliases_category = -1;
-static int hf_GIAS_DataModelMgr_get_logical_aliases_properties_loop = -1;
-static int hf_GIAS_DataModelMgr_get_logical_attribute_name_return = -1;
-static int hf_GIAS_DataModelMgr_get_logical_attribute_name_view_name = -1;
-static int hf_GIAS_DataModelMgr_get_logical_attribute_name_attribute_type = -1;
-static int hf_GIAS_DataModelMgr_get_logical_attribute_name_properties_loop = -1;
-static int hf_GIAS_DataModelMgr_get_view_names_return_loop = -1;
-static int hf_GIAS_DataModelMgr_get_view_names_properties_loop = -1;
-static int hf_GIAS_DataModelMgr_get_attributes_return_loop = -1;
-static int hf_GIAS_DataModelMgr_get_attributes_view_name = -1;
-static int hf_GIAS_DataModelMgr_get_attributes_properties_loop = -1;
-static int hf_GIAS_DataModelMgr_get_queryable_attributes_return_loop = -1;
-static int hf_GIAS_DataModelMgr_get_queryable_attributes_view_name = -1;
-static int hf_GIAS_DataModelMgr_get_queryable_attributes_properties_loop = -1;
-static int hf_GIAS_DataModelMgr_get_entities_view_name = -1;
-static int hf_GIAS_DataModelMgr_get_entities_properties_loop = -1;
-static int hf_GIAS_DataModelMgr_get_entity_attributes_return_loop = -1;
-static int hf_GIAS_DataModelMgr_get_entity_attributes_aEntity = -1;
-static int hf_GIAS_DataModelMgr_get_entity_attributes_properties_loop = -1;
-static int hf_GIAS_DataModelMgr_get_associations_return_loop = -1;
-static int hf_GIAS_DataModelMgr_get_associations_properties_loop = -1;
-static int hf_GIAS_DataModelMgr_get_max_vertices_return = -1;
-static int hf_GIAS_DataModelMgr_get_max_vertices_properties_loop = -1;
-static int hf_GIAS_CreationMgr_create_new_product_loop = -1;
-static int hf_GIAS_CreationMgr_create_related_files_loop = -1;
-static int hf_GIAS_CreationMgr_create_properties_loop = -1;
-static int hf_GIAS_CreationMgr_create_metadata_view_name = -1;
-static int hf_GIAS_CreationMgr_create_metadata_related_files_loop = -1;
-static int hf_GIAS_CreationMgr_create_metadata_properties_loop = -1;
-static int hf_GIAS_CreationMgr_create_association_assoc_name = -1;
-static int hf_GIAS_CreationMgr_create_association_view_b_objects_loop = -1;
-static int hf_GIAS_CreationMgr_create_association_assoc_info_loop = -1;
-static int hf_GIAS_UpdateMgr_update_view = -1;
-static int hf_GIAS_UpdateMgr_update_changes_loop = -1;
-static int hf_GIAS_UpdateMgr_update_relfiles_loop = -1;
-static int hf_GIAS_UpdateMgr_update_properties_loop = -1;
-static int hf_GIAS_UpdateMgr_update_by_query_properties_loop = -1;
-static int hf_GIAS_CatalogMgr_submit_query_result_attributes_loop = -1;
-static int hf_GIAS_CatalogMgr_submit_query_result_attributes = -1;
-static int hf_GIAS_CatalogMgr_submit_query_sort_attributes_loop = -1;
-static int hf_GIAS_CatalogMgr_submit_query_properties_loop = -1;
-static int hf_GIAS_CatalogMgr_hit_count_properties_loop = -1;
-static int hf_GIAS_StandingQueryMgr_get_event_descriptions_return_loop = -1;
-static int hf_GIAS_StandingQueryMgr_submit_standing_query_result_attributes_loop = -1;
-static int hf_GIAS_StandingQueryMgr_submit_standing_query_result_attributes = -1;
-static int hf_GIAS_StandingQueryMgr_submit_standing_query_sort_attributes_loop = -1;
-static int hf_GIAS_StandingQueryMgr_submit_standing_query_properties_loop = -1;
-static int hf_GIAS_ProductMgr_get_parameters_desired_parameters_loop = -1;
-static int hf_GIAS_ProductMgr_get_parameters_desired_parameters = -1;
-static int hf_GIAS_ProductMgr_get_parameters_properties_loop = -1;
-static int hf_GIAS_ProductMgr_get_related_file_types_return_loop = -1;
-static int hf_GIAS_ProductMgr_get_related_file_types_return = -1;
-static int hf_GIAS_ProductMgr_get_related_files_products_loop = -1;
-static int hf_GIAS_ProductMgr_get_related_files_type = -1;
-static int hf_GIAS_ProductMgr_get_related_files_properties_loop = -1;
-static int hf_GIAS_IngestMgr_bulk_pull_property_list_loop = -1;
-static int hf_GIAS_IngestMgr_bulk_push_property_list_loop = -1;
-static int hf_GIAS_Request_set_user_info_message = -1;
-static int hf_GIAS_Request_register_callback_return = -1;
-static int hf_GIAS_Request_free_callback_id = -1;
-static int hf_GIAS_OrderRequest_complete_return = -1;
-static int hf_GIAS_SubmitQueryOrderRequest_complete_list_return = -1;
-static int hf_GIAS_SubmitQueryOrderRequest_complete_list_prods_loop = -1;
-static int hf_GIAS_SubmitQueryOrderRequest_complete_return = -1;
-static int hf_GIAS_CreateRequest_complete_return = -1;
-static int hf_GIAS_CreateRequest_complete_new_products_loop = -1;
-static int hf_GIAS_CreateMetaDataRequest_complete_return = -1;
-static int hf_GIAS_UpdateRequest_complete_return = -1;
-static int hf_GIAS_SubmitQueryRequest_set_number_of_hits_hits = -1;
-static int hf_GIAS_SubmitQueryRequest_complete_DAG_results_return = -1;
-static int hf_GIAS_SubmitQueryRequest_complete_DAG_results_results_loop = -1;
-static int hf_GIAS_SubmitQueryRequest_complete_stringDAG_results_return = -1;
-static int hf_GIAS_SubmitQueryRequest_complete_stringDAG_results_results_loop = -1;
-static int hf_GIAS_SubmitQueryRequest_complete_XML_results_return = -1;
-static int hf_GIAS_SubmitQueryRequest_complete_XML_results_results = -1;
-static int hf_GIAS_SubmitStandingQueryRequest_set_number_of_hits_hits = -1;
-static int hf_GIAS_SubmitStandingQueryRequest_get_number_of_hits_return = -1;
-static int hf_GIAS_SubmitStandingQueryRequest_get_number_of_hits_in_interval_return = -1;
-static int hf_GIAS_SubmitStandingQueryRequest_get_number_of_hits_in_interval_interval = -1;
-static int hf_GIAS_SubmitStandingQueryRequest_get_number_of_intervals_return = -1;
-static int hf_GIAS_SubmitStandingQueryRequest_clear_intervals_num_intervals = -1;
-static int hf_GIAS_SubmitStandingQueryRequest_complete_DAG_results_return = -1;
-static int hf_GIAS_SubmitStandingQueryRequest_complete_DAG_results_results_loop = -1;
-static int hf_GIAS_SubmitStandingQueryRequest_complete_stringDAG_results_return = -1;
-static int hf_GIAS_SubmitStandingQueryRequest_complete_stringDAG_results_results_loop = -1;
-static int hf_GIAS_SubmitStandingQueryRequest_complete_XML_results_return = -1;
-static int hf_GIAS_SubmitStandingQueryRequest_complete_XML_results_results = -1;
-static int hf_GIAS_SetAvailabilityRequest_complete_return = -1;
-static int hf_GIAS_HitCountRequest_complete_return = -1;
-static int hf_GIAS_HitCountRequest_complete_number_of_hits = -1;
-static int hf_GIAS_GetParametersRequest_complete_return = -1;
-static int hf_GIAS_GetParametersRequest_complete_StringDAG_return = -1;
-static int hf_GIAS_IngestRequest_complete_return = -1;
-static int hf_GIAS_GetRelatedFilesRequest_complete_return = -1;
-static int hf_GIAS_GetRelatedFilesRequest_complete_locations_loop = -1;
-static int hf_GIAS_GetRelatedFilesRequest_complete_locations = -1;
-static int hf_GIAS_CreateAssociationRequest_complete_return = -1;
-static int hf_GIAS_UpdateByQueryRequest_complete_return = -1;
+static int hf_CB_Callback_notify_theState;
+static int hf_GIAS_Library_get_manager_types_return_loop;
+static int hf_GIAS_Library_get_manager_types_return;
+static int hf_GIAS_Library_get_manager_manager_type;
+static int hf_GIAS_Library_get_other_libraries_return_loop;
+static int hf_GIAS_LibraryManager_get_property_names_return_loop;
+static int hf_GIAS_LibraryManager_get_property_names_return;
+static int hf_GIAS_LibraryManager_get_property_values_return_loop;
+static int hf_GIAS_LibraryManager_get_property_values_desired_properties_loop;
+static int hf_GIAS_LibraryManager_get_property_values_desired_properties;
+static int hf_GIAS_LibraryManager_get_libraries_return_loop;
+static int hf_GIAS_RequestManager_get_active_requests_return_loop;
+static int hf_GIAS_RequestManager_get_default_timeout_return;
+static int hf_GIAS_RequestManager_set_default_timeout_new_default;
+static int hf_GIAS_RequestManager_get_timeout_return;
+static int hf_GIAS_RequestManager_set_timeout_new_lifetime;
+static int hf_GIAS_AccessManager_get_use_modes_return_loop;
+static int hf_GIAS_AccessManager_get_use_modes_return;
+static int hf_GIAS_AccessManager_is_available_return;
+static int hf_GIAS_AccessManager_is_available_use_mode;
+static int hf_GIAS_AccessManager_query_availability_delay_return;
+static int hf_GIAS_AccessManager_query_availability_delay_availability_requirement;
+static int hf_GIAS_AccessManager_query_availability_delay_use_mode;
+static int hf_GIAS_AccessManager_get_number_of_priorities_return;
+static int hf_GIAS_AccessManager_set_availability_products_loop;
+static int hf_GIAS_AccessManager_set_availability_availability_requirement;
+static int hf_GIAS_AccessManager_set_availability_use_mode;
+static int hf_GIAS_AccessManager_set_availability_priority;
+static int hf_GIAS_QueryOrderMgr_get_event_descriptions_return_loop;
+static int hf_GIAS_QueryOrderMgr_submit_query_order_o_type;
+static int hf_GIAS_QueryOrderMgr_submit_query_order_properties_loop;
+static int hf_GIAS_OrderMgr_get_package_specifications_return_loop;
+static int hf_GIAS_OrderMgr_get_package_specifications_return;
+static int hf_GIAS_OrderMgr_validate_order_properties_loop;
+static int hf_GIAS_OrderMgr_order_properties_loop;
+static int hf_GIAS_DataModelMgr_get_data_model_date_properties_loop;
+static int hf_GIAS_DataModelMgr_get_alias_categories_return_loop;
+static int hf_GIAS_DataModelMgr_get_alias_categories_return;
+static int hf_GIAS_DataModelMgr_get_alias_categories_properties_loop;
+static int hf_GIAS_DataModelMgr_get_logical_aliases_return_loop;
+static int hf_GIAS_DataModelMgr_get_logical_aliases_category;
+static int hf_GIAS_DataModelMgr_get_logical_aliases_properties_loop;
+static int hf_GIAS_DataModelMgr_get_logical_attribute_name_return;
+static int hf_GIAS_DataModelMgr_get_logical_attribute_name_view_name;
+static int hf_GIAS_DataModelMgr_get_logical_attribute_name_attribute_type;
+static int hf_GIAS_DataModelMgr_get_logical_attribute_name_properties_loop;
+static int hf_GIAS_DataModelMgr_get_view_names_return_loop;
+static int hf_GIAS_DataModelMgr_get_view_names_properties_loop;
+static int hf_GIAS_DataModelMgr_get_attributes_return_loop;
+static int hf_GIAS_DataModelMgr_get_attributes_view_name;
+static int hf_GIAS_DataModelMgr_get_attributes_properties_loop;
+static int hf_GIAS_DataModelMgr_get_queryable_attributes_return_loop;
+static int hf_GIAS_DataModelMgr_get_queryable_attributes_view_name;
+static int hf_GIAS_DataModelMgr_get_queryable_attributes_properties_loop;
+static int hf_GIAS_DataModelMgr_get_entities_view_name;
+static int hf_GIAS_DataModelMgr_get_entities_properties_loop;
+static int hf_GIAS_DataModelMgr_get_entity_attributes_return_loop;
+static int hf_GIAS_DataModelMgr_get_entity_attributes_aEntity;
+static int hf_GIAS_DataModelMgr_get_entity_attributes_properties_loop;
+static int hf_GIAS_DataModelMgr_get_associations_return_loop;
+static int hf_GIAS_DataModelMgr_get_associations_properties_loop;
+static int hf_GIAS_DataModelMgr_get_max_vertices_return;
+static int hf_GIAS_DataModelMgr_get_max_vertices_properties_loop;
+static int hf_GIAS_CreationMgr_create_new_product_loop;
+static int hf_GIAS_CreationMgr_create_related_files_loop;
+static int hf_GIAS_CreationMgr_create_properties_loop;
+static int hf_GIAS_CreationMgr_create_metadata_view_name;
+static int hf_GIAS_CreationMgr_create_metadata_related_files_loop;
+static int hf_GIAS_CreationMgr_create_metadata_properties_loop;
+static int hf_GIAS_CreationMgr_create_association_assoc_name;
+static int hf_GIAS_CreationMgr_create_association_view_b_objects_loop;
+static int hf_GIAS_CreationMgr_create_association_assoc_info_loop;
+static int hf_GIAS_UpdateMgr_update_view;
+static int hf_GIAS_UpdateMgr_update_changes_loop;
+static int hf_GIAS_UpdateMgr_update_relfiles_loop;
+static int hf_GIAS_UpdateMgr_update_properties_loop;
+static int hf_GIAS_UpdateMgr_update_by_query_properties_loop;
+static int hf_GIAS_CatalogMgr_submit_query_result_attributes_loop;
+static int hf_GIAS_CatalogMgr_submit_query_result_attributes;
+static int hf_GIAS_CatalogMgr_submit_query_sort_attributes_loop;
+static int hf_GIAS_CatalogMgr_submit_query_properties_loop;
+static int hf_GIAS_CatalogMgr_hit_count_properties_loop;
+static int hf_GIAS_StandingQueryMgr_get_event_descriptions_return_loop;
+static int hf_GIAS_StandingQueryMgr_submit_standing_query_result_attributes_loop;
+static int hf_GIAS_StandingQueryMgr_submit_standing_query_result_attributes;
+static int hf_GIAS_StandingQueryMgr_submit_standing_query_sort_attributes_loop;
+static int hf_GIAS_StandingQueryMgr_submit_standing_query_properties_loop;
+static int hf_GIAS_ProductMgr_get_parameters_desired_parameters_loop;
+static int hf_GIAS_ProductMgr_get_parameters_desired_parameters;
+static int hf_GIAS_ProductMgr_get_parameters_properties_loop;
+static int hf_GIAS_ProductMgr_get_related_file_types_return_loop;
+static int hf_GIAS_ProductMgr_get_related_file_types_return;
+static int hf_GIAS_ProductMgr_get_related_files_products_loop;
+static int hf_GIAS_ProductMgr_get_related_files_type;
+static int hf_GIAS_ProductMgr_get_related_files_properties_loop;
+static int hf_GIAS_IngestMgr_bulk_pull_property_list_loop;
+static int hf_GIAS_IngestMgr_bulk_push_property_list_loop;
+static int hf_GIAS_Request_set_user_info_message;
+static int hf_GIAS_Request_register_callback_return;
+static int hf_GIAS_Request_free_callback_id;
+static int hf_GIAS_OrderRequest_complete_return;
+static int hf_GIAS_SubmitQueryOrderRequest_complete_list_return;
+static int hf_GIAS_SubmitQueryOrderRequest_complete_list_prods_loop;
+static int hf_GIAS_SubmitQueryOrderRequest_complete_return;
+static int hf_GIAS_CreateRequest_complete_return;
+static int hf_GIAS_CreateRequest_complete_new_products_loop;
+static int hf_GIAS_CreateMetaDataRequest_complete_return;
+static int hf_GIAS_UpdateRequest_complete_return;
+static int hf_GIAS_SubmitQueryRequest_set_number_of_hits_hits;
+static int hf_GIAS_SubmitQueryRequest_complete_DAG_results_return;
+static int hf_GIAS_SubmitQueryRequest_complete_DAG_results_results_loop;
+static int hf_GIAS_SubmitQueryRequest_complete_stringDAG_results_return;
+static int hf_GIAS_SubmitQueryRequest_complete_stringDAG_results_results_loop;
+static int hf_GIAS_SubmitQueryRequest_complete_XML_results_return;
+static int hf_GIAS_SubmitQueryRequest_complete_XML_results_results;
+static int hf_GIAS_SubmitStandingQueryRequest_set_number_of_hits_hits;
+static int hf_GIAS_SubmitStandingQueryRequest_get_number_of_hits_return;
+static int hf_GIAS_SubmitStandingQueryRequest_get_number_of_hits_in_interval_return;
+static int hf_GIAS_SubmitStandingQueryRequest_get_number_of_hits_in_interval_interval;
+static int hf_GIAS_SubmitStandingQueryRequest_get_number_of_intervals_return;
+static int hf_GIAS_SubmitStandingQueryRequest_clear_intervals_num_intervals;
+static int hf_GIAS_SubmitStandingQueryRequest_complete_DAG_results_return;
+static int hf_GIAS_SubmitStandingQueryRequest_complete_DAG_results_results_loop;
+static int hf_GIAS_SubmitStandingQueryRequest_complete_stringDAG_results_return;
+static int hf_GIAS_SubmitStandingQueryRequest_complete_stringDAG_results_results_loop;
+static int hf_GIAS_SubmitStandingQueryRequest_complete_XML_results_return;
+static int hf_GIAS_SubmitStandingQueryRequest_complete_XML_results_results;
+static int hf_GIAS_SetAvailabilityRequest_complete_return;
+static int hf_GIAS_HitCountRequest_complete_return;
+static int hf_GIAS_HitCountRequest_complete_number_of_hits;
+static int hf_GIAS_GetParametersRequest_complete_return;
+static int hf_GIAS_GetParametersRequest_complete_StringDAG_return;
+static int hf_GIAS_IngestRequest_complete_return;
+static int hf_GIAS_GetRelatedFilesRequest_complete_return;
+static int hf_GIAS_GetRelatedFilesRequest_complete_locations_loop;
+static int hf_GIAS_GetRelatedFilesRequest_complete_locations;
+static int hf_GIAS_CreateAssociationRequest_complete_return;
+static int hf_GIAS_UpdateByQueryRequest_complete_return;
         /* Struct filters */
-static int hf_UCO_NameName_name1 = -1;
-static int hf_UCO_NameName_name2 = -1;
-static int hf_UCO_NameValue_aname = -1;
-static int hf_UCO_Ratio_numerator = -1;
-static int hf_UCO_Ratio_denominator = -1;
-static int hf_UCO_FileLocation_user_name = -1;
-static int hf_UCO_FileLocation_password = -1;
-static int hf_UCO_FileLocation_host_name = -1;
-static int hf_UCO_FileLocation_path_name = -1;
-static int hf_UCO_FileLocation_file_name = -1;
-static int hf_UCO_DirectAccessLocation_access_protocol = -1;
-static int hf_UCO_Date_year = -1;
-static int hf_UCO_Date_month = -1;
-static int hf_UCO_Date_day = -1;
-static int hf_UCO_Time_hour = -1;
-static int hf_UCO_Time_minute = -1;
-static int hf_UCO_Time_second = -1;
-static int hf_UCO_Node_id = -1;
-static int hf_UCO_Node_node_type = -1;
-static int hf_UCO_Node_attribute_name = -1;
-static int hf_UCO_Edge_start_node = -1;
-static int hf_UCO_Edge_end_node = -1;
-static int hf_UCO_Edge_relationship_type = -1;
-static int hf_UCO_DAG_nodes_loop = -1;
-static int hf_UCO_DAG_edges_loop = -1;
-static int hf_UCO_StringNode_id = -1;
-static int hf_UCO_StringNode_node_type = -1;
-static int hf_UCO_StringNode_attribute_name = -1;
-static int hf_UCO_StringNode_value = -1;
-static int hf_UCO_StringDAG_nodes_loop = -1;
-static int hf_UCO_StringDAG_edges_loop = -1;
-static int hf_UCO_Change_changed_node = -1;
-static int hf_UCO_Change_change_type = -1;
-static int hf_UCO_UpdateDAG_changes_loop = -1;
-static int hf_UCO_RequestDescription_user_info = -1;
-static int hf_UCO_RequestDescription_request_type = -1;
-static int hf_UCO_RequestDescription_request_info = -1;
-static int hf_UCO_RequestDescription_request_details_loop = -1;
-static int hf_UCO_Coordinate2d_x = -1;
-static int hf_UCO_Coordinate2d_y = -1;
-static int hf_UCO_Coordinate3d_x = -1;
-static int hf_UCO_Coordinate3d_y = -1;
-static int hf_UCO_Coordinate3d_z = -1;
-static int hf_UCO_LinearDimension_dimension = -1;
-static int hf_UCO_LinearDimension_reference_system = -1;
-static int hf_UCO_Ellipse_north_angle = -1;
-static int hf_UCO_SimpleGSImage_width = -1;
-static int hf_UCO_SimpleGSImage_height = -1;
-static int hf_UCO_SimpleCImage_width = -1;
-static int hf_UCO_SimpleCImage_height = -1;
-static int hf_UCO_CompressedImage_width = -1;
-static int hf_UCO_CompressedImage_height = -1;
-static int hf_UCO_CompressedImage_compression_form = -1;
-static int hf_UCO_CompressedImage_data_loop = -1;
-static int hf_UCO_CompressedImage_data = -1;
-static int hf_UCO_Status_completion_state = -1;
-static int hf_UCO_Status_warning = -1;
-static int hf_UCO_Status_status_message = -1;
-static int hf_UCO_EntityNode_id = -1;
-static int hf_UCO_EntityNode_entity_name = -1;
-static int hf_UCO_EntityRelationship_start_node = -1;
-static int hf_UCO_EntityRelationship_end_node = -1;
-static int hf_UCO_EntityRelationship_start_to_end_card = -1;
-static int hf_UCO_EntityRelationship_end_to_start_card = -1;
-static int hf_UCO_EntityGraph_nodes_loop = -1;
-static int hf_UCO_EntityGraph_relationship_loop = -1;
-static int hf_UCO_exception_details_exception_name = -1;
-static int hf_UCO_exception_details_standard_exception_name = -1;
-static int hf_UCO_exception_details_exception_desc = -1;
-static int hf_GIAS_ImageSpec_imgform = -1;
-static int hf_GIAS_ImageSpec_imageid = -1;
-static int hf_GIAS_ImageSpec_comp = -1;
-static int hf_GIAS_ImageSpec_bpp = -1;
-static int hf_GIAS_ImageSpec_algo = -1;
-static int hf_GIAS_ImageSpec_rrds_loop = -1;
-static int hf_GIAS_ImageSpec_rrds = -1;
-static int hf_GIAS_ImageSpec_geo_region_type = -1;
-static int hf_GIAS_ImageSpec_encoding = -1;
-static int hf_GIAS_AlterationSpec_pf = -1;
-static int hf_GIAS_AlterationSpec_geo_region_type = -1;
-static int hf_GIAS_PackagingSpec_package_identifier = -1;
-static int hf_GIAS_PackagingSpec_packaging_format_and_compression = -1;
-static int hf_GIAS_TailoringSpec_specs_loop = -1;
-static int hf_GIAS_MediaType_media_type = -1;
-static int hf_GIAS_MediaType_quantity = -1;
-static int hf_GIAS_PhysicalDelivery_address = -1;
-static int hf_GIAS_ValidationResults_valid = -1;
-static int hf_GIAS_ValidationResults_warning = -1;
-static int hf_GIAS_ValidationResults_details = -1;
-static int hf_GIAS_RelatedFile_file_type = -1;
-static int hf_GIAS_View_view_name = -1;
-static int hf_GIAS_View_orderable = -1;
-static int hf_GIAS_View_sub_views_loop = -1;
-static int hf_GIAS_View_sub_views = -1;
-static int hf_GIAS_IntegerRange_lower_bound = -1;
-static int hf_GIAS_IntegerRange_upper_bound = -1;
-static int hf_GIAS_FloatingPointRange_lower_bound = -1;
-static int hf_GIAS_FloatingPointRange_upper_bound = -1;
-static int hf_GIAS_AttributeInformation_attribute_name = -1;
-static int hf_GIAS_AttributeInformation_attribute_type = -1;
-static int hf_GIAS_AttributeInformation_attribute_units = -1;
-static int hf_GIAS_AttributeInformation_attribute_reference = -1;
-static int hf_GIAS_AttributeInformation_mode = -1;
-static int hf_GIAS_AttributeInformation_description = -1;
-static int hf_GIAS_AttributeInformation_sortable = -1;
-static int hf_GIAS_AttributeInformation_updateable = -1;
-static int hf_GIAS_Association_name = -1;
-static int hf_GIAS_Association_view_a = -1;
-static int hf_GIAS_Association_view_b = -1;
-static int hf_GIAS_Association_description = -1;
-static int hf_GIAS_Association_card = -1;
-static int hf_GIAS_Association_attribute_info_loop = -1;
-static int hf_GIAS_LibraryDescription_library_name = -1;
-static int hf_GIAS_LibraryDescription_library_description = -1;
-static int hf_GIAS_LibraryDescription_library_version_number = -1;
-static int hf_GIAS_Query_view = -1;
-static int hf_GIAS_Query_bqs_query = -1;
-static int hf_GIAS_Event_event_name = -1;
-static int hf_GIAS_Event_event_type = -1;
-static int hf_GIAS_Event_event_description = -1;
-static int hf_GIAS_DayEventTime_day_event = -1;
-static int hf_GIAS_QueryLifeSpan_frequency_loop = -1;
-static int hf_GIAS_SortAttribute_attribute_name = -1;
-static int hf_GIAS_SortAttribute_sort_polarity = -1;
-static int hf_GIAS_DelayEstimate_time_delay = -1;
-static int hf_GIAS_DelayEstimate_valid_time_delay = -1;
-static int hf_GIAS_ProductDetails_mTypes_loop = -1;
-static int hf_GIAS_ProductDetails_benums_loop = -1;
-static int hf_GIAS_ProductDetails_benums = -1;
-static int hf_GIAS_ProductDetails_info_system_name = -1;
-static int hf_GIAS_DeliveryDetails_receiver = -1;
-static int hf_GIAS_DeliveryDetails_shipmentMode = -1;
-static int hf_GIAS_OrderContents_originator = -1;
-static int hf_GIAS_OrderContents_operatorNote = -1;
-static int hf_GIAS_OrderContents_orderPriority = -1;
-static int hf_GIAS_OrderContents_prod_list_loop = -1;
-static int hf_GIAS_OrderContents_del_list_loop = -1;
-static int hf_GIAS_QueryOrderContents_originator = -1;
-static int hf_GIAS_QueryOrderContents_operatorNote = -1;
-static int hf_GIAS_QueryOrderContents_orderPriority = -1;
-static int hf_GIAS_QueryOrderContents_del_list_loop = -1;
-static int hf_GIAS_AccessCriteria_userID = -1;
-static int hf_GIAS_AccessCriteria_password = -1;
-static int hf_GIAS_AccessCriteria_licenseKey = -1;
-static int hf_GIAS_PackageElement_files_loop = -1;
-static int hf_GIAS_PackageElement_files = -1;
-static int hf_GIAS_DeliveryManifest_package_name = -1;
-static int hf_GIAS_DeliveryManifest_elements_loop = -1;
+static int hf_UCO_NameName_name1;
+static int hf_UCO_NameName_name2;
+static int hf_UCO_NameValue_aname;
+static int hf_UCO_Ratio_numerator;
+static int hf_UCO_Ratio_denominator;
+static int hf_UCO_FileLocation_user_name;
+static int hf_UCO_FileLocation_password;
+static int hf_UCO_FileLocation_host_name;
+static int hf_UCO_FileLocation_path_name;
+static int hf_UCO_FileLocation_file_name;
+static int hf_UCO_DirectAccessLocation_access_protocol;
+static int hf_UCO_Date_year;
+static int hf_UCO_Date_month;
+static int hf_UCO_Date_day;
+static int hf_UCO_Time_hour;
+static int hf_UCO_Time_minute;
+static int hf_UCO_Time_second;
+static int hf_UCO_Node_id;
+static int hf_UCO_Node_node_type;
+static int hf_UCO_Node_attribute_name;
+static int hf_UCO_Edge_start_node;
+static int hf_UCO_Edge_end_node;
+static int hf_UCO_Edge_relationship_type;
+static int hf_UCO_DAG_nodes_loop;
+static int hf_UCO_DAG_edges_loop;
+static int hf_UCO_StringNode_id;
+static int hf_UCO_StringNode_node_type;
+static int hf_UCO_StringNode_attribute_name;
+static int hf_UCO_StringNode_value;
+static int hf_UCO_StringDAG_nodes_loop;
+static int hf_UCO_StringDAG_edges_loop;
+static int hf_UCO_Change_changed_node;
+static int hf_UCO_Change_change_type;
+static int hf_UCO_UpdateDAG_changes_loop;
+static int hf_UCO_RequestDescription_user_info;
+static int hf_UCO_RequestDescription_request_type;
+static int hf_UCO_RequestDescription_request_info;
+static int hf_UCO_RequestDescription_request_details_loop;
+static int hf_UCO_Coordinate2d_x;
+static int hf_UCO_Coordinate2d_y;
+static int hf_UCO_Coordinate3d_x;
+static int hf_UCO_Coordinate3d_y;
+static int hf_UCO_Coordinate3d_z;
+static int hf_UCO_LinearDimension_dimension;
+static int hf_UCO_LinearDimension_reference_system;
+static int hf_UCO_Ellipse_north_angle;
+static int hf_UCO_SimpleGSImage_width;
+static int hf_UCO_SimpleGSImage_height;
+static int hf_UCO_SimpleCImage_width;
+static int hf_UCO_SimpleCImage_height;
+static int hf_UCO_CompressedImage_width;
+static int hf_UCO_CompressedImage_height;
+static int hf_UCO_CompressedImage_compression_form;
+static int hf_UCO_CompressedImage_data_loop;
+static int hf_UCO_CompressedImage_data;
+static int hf_UCO_Status_completion_state;
+static int hf_UCO_Status_warning;
+static int hf_UCO_Status_status_message;
+static int hf_UCO_EntityNode_id;
+static int hf_UCO_EntityNode_entity_name;
+static int hf_UCO_EntityRelationship_start_node;
+static int hf_UCO_EntityRelationship_end_node;
+static int hf_UCO_EntityRelationship_start_to_end_card;
+static int hf_UCO_EntityRelationship_end_to_start_card;
+static int hf_UCO_EntityGraph_nodes_loop;
+static int hf_UCO_EntityGraph_relationship_loop;
+static int hf_UCO_exception_details_exception_name;
+static int hf_UCO_exception_details_standard_exception_name;
+static int hf_UCO_exception_details_exception_desc;
+static int hf_GIAS_ImageSpec_imgform;
+static int hf_GIAS_ImageSpec_imageid;
+static int hf_GIAS_ImageSpec_comp;
+static int hf_GIAS_ImageSpec_bpp;
+static int hf_GIAS_ImageSpec_algo;
+static int hf_GIAS_ImageSpec_rrds_loop;
+static int hf_GIAS_ImageSpec_rrds;
+static int hf_GIAS_ImageSpec_geo_region_type;
+static int hf_GIAS_ImageSpec_encoding;
+static int hf_GIAS_AlterationSpec_pf;
+static int hf_GIAS_AlterationSpec_geo_region_type;
+static int hf_GIAS_PackagingSpec_package_identifier;
+static int hf_GIAS_PackagingSpec_packaging_format_and_compression;
+static int hf_GIAS_TailoringSpec_specs_loop;
+static int hf_GIAS_MediaType_media_type;
+static int hf_GIAS_MediaType_quantity;
+static int hf_GIAS_PhysicalDelivery_address;
+static int hf_GIAS_ValidationResults_valid;
+static int hf_GIAS_ValidationResults_warning;
+static int hf_GIAS_ValidationResults_details;
+static int hf_GIAS_RelatedFile_file_type;
+static int hf_GIAS_View_view_name;
+static int hf_GIAS_View_orderable;
+static int hf_GIAS_View_sub_views_loop;
+static int hf_GIAS_View_sub_views;
+static int hf_GIAS_IntegerRange_lower_bound;
+static int hf_GIAS_IntegerRange_upper_bound;
+static int hf_GIAS_FloatingPointRange_lower_bound;
+static int hf_GIAS_FloatingPointRange_upper_bound;
+static int hf_GIAS_AttributeInformation_attribute_name;
+static int hf_GIAS_AttributeInformation_attribute_type;
+static int hf_GIAS_AttributeInformation_attribute_units;
+static int hf_GIAS_AttributeInformation_attribute_reference;
+static int hf_GIAS_AttributeInformation_mode;
+static int hf_GIAS_AttributeInformation_description;
+static int hf_GIAS_AttributeInformation_sortable;
+static int hf_GIAS_AttributeInformation_updateable;
+static int hf_GIAS_Association_name;
+static int hf_GIAS_Association_view_a;
+static int hf_GIAS_Association_view_b;
+static int hf_GIAS_Association_description;
+static int hf_GIAS_Association_card;
+static int hf_GIAS_Association_attribute_info_loop;
+static int hf_GIAS_LibraryDescription_library_name;
+static int hf_GIAS_LibraryDescription_library_description;
+static int hf_GIAS_LibraryDescription_library_version_number;
+static int hf_GIAS_Query_view;
+static int hf_GIAS_Query_bqs_query;
+static int hf_GIAS_Event_event_name;
+static int hf_GIAS_Event_event_type;
+static int hf_GIAS_Event_event_description;
+static int hf_GIAS_DayEventTime_day_event;
+static int hf_GIAS_QueryLifeSpan_frequency_loop;
+static int hf_GIAS_SortAttribute_attribute_name;
+static int hf_GIAS_SortAttribute_sort_polarity;
+static int hf_GIAS_DelayEstimate_time_delay;
+static int hf_GIAS_DelayEstimate_valid_time_delay;
+static int hf_GIAS_ProductDetails_mTypes_loop;
+static int hf_GIAS_ProductDetails_benums_loop;
+static int hf_GIAS_ProductDetails_benums;
+static int hf_GIAS_ProductDetails_info_system_name;
+static int hf_GIAS_DeliveryDetails_receiver;
+static int hf_GIAS_DeliveryDetails_shipmentMode;
+static int hf_GIAS_OrderContents_originator;
+static int hf_GIAS_OrderContents_operatorNote;
+static int hf_GIAS_OrderContents_orderPriority;
+static int hf_GIAS_OrderContents_prod_list_loop;
+static int hf_GIAS_OrderContents_del_list_loop;
+static int hf_GIAS_QueryOrderContents_originator;
+static int hf_GIAS_QueryOrderContents_operatorNote;
+static int hf_GIAS_QueryOrderContents_orderPriority;
+static int hf_GIAS_QueryOrderContents_del_list_loop;
+static int hf_GIAS_AccessCriteria_userID;
+static int hf_GIAS_AccessCriteria_password;
+static int hf_GIAS_AccessCriteria_licenseKey;
+static int hf_GIAS_PackageElement_files_loop;
+static int hf_GIAS_PackageElement_files;
+static int hf_GIAS_DeliveryManifest_package_name;
+static int hf_GIAS_DeliveryManifest_elements_loop;
         /* User exception filters */
-static int hf_UCO_InvalidInputParameter_badInputParameters = -1;
-static int hf_UCO_InvalidInputParameter_badInputParameters_loop = -1;
+static int hf_UCO_InvalidInputParameter_badInputParameters;
+static int hf_UCO_InvalidInputParameter_badInputParameters_loop;
         /* Union filters */
-static int hf_UCO_Buffer_Buffer = -1;
-static int hf_UCO_Buffer_octet_buffer_loop = -1;
-static int hf_UCO_Buffer_octet_buffer = -1;
-static int hf_UCO_Buffer_char_buffer_loop = -1;
-static int hf_UCO_Buffer_char_buffer = -1;
-static int hf_UCO_Buffer_ushort_buffer_loop = -1;
-static int hf_UCO_Buffer_ushort_buffer = -1;
-static int hf_UCO_Buffer_short_buffer_loop = -1;
-static int hf_UCO_Buffer_short_buffer = -1;
-static int hf_UCO_Buffer_ulong_buffer_loop = -1;
-static int hf_UCO_Buffer_ulong_buffer = -1;
-static int hf_UCO_Buffer_long_buffer_loop = -1;
-static int hf_UCO_Buffer_long_buffer = -1;
-static int hf_UCO_Buffer_float_buffer_loop = -1;
-static int hf_UCO_Buffer_float_buffer = -1;
-static int hf_UCO_Buffer_double_buffer_loop = -1;
-static int hf_UCO_Buffer_double_buffer = -1;
-static int hf_GIAS_Destination_Destination = -1;
-static int hf_GIAS_Destination_e_dest = -1;
-static int hf_GIAS_Domain_Domain = -1;
-static int hf_GIAS_Domain_t = -1;
-static int hf_GIAS_Domain_is_loop = -1;
-static int hf_GIAS_Domain_fps_loop = -1;
-static int hf_GIAS_Domain_l_loop = -1;
-static int hf_GIAS_Domain_l = -1;
-static int hf_GIAS_Domain_ol_loop = -1;
-static int hf_GIAS_Domain_ol = -1;
-static int hf_GIAS_Domain_gs_loop = -1;
-static int hf_GIAS_Domain_bd_loop = -1;
-static int hf_GIAS_Domain_bd = -1;
-static int hf_GIAS_Domain_bv = -1;
-static int hf_GIAS_LifeEvent_LifeEvent = -1;
-static int hf_GIAS_LifeEvent_ev = -1;
+static int hf_UCO_Buffer_Buffer;
+static int hf_UCO_Buffer_octet_buffer_loop;
+static int hf_UCO_Buffer_octet_buffer;
+static int hf_UCO_Buffer_char_buffer_loop;
+static int hf_UCO_Buffer_char_buffer;
+static int hf_UCO_Buffer_ushort_buffer_loop;
+static int hf_UCO_Buffer_ushort_buffer;
+static int hf_UCO_Buffer_short_buffer_loop;
+static int hf_UCO_Buffer_short_buffer;
+static int hf_UCO_Buffer_ulong_buffer_loop;
+static int hf_UCO_Buffer_ulong_buffer;
+static int hf_UCO_Buffer_long_buffer_loop;
+static int hf_UCO_Buffer_long_buffer;
+static int hf_UCO_Buffer_float_buffer_loop;
+static int hf_UCO_Buffer_float_buffer;
+static int hf_UCO_Buffer_double_buffer_loop;
+static int hf_UCO_Buffer_double_buffer;
+static int hf_GIAS_Destination_Destination;
+static int hf_GIAS_Destination_e_dest;
+static int hf_GIAS_Domain_Domain;
+static int hf_GIAS_Domain_t;
+static int hf_GIAS_Domain_is_loop;
+static int hf_GIAS_Domain_fps_loop;
+static int hf_GIAS_Domain_l_loop;
+static int hf_GIAS_Domain_l;
+static int hf_GIAS_Domain_ol_loop;
+static int hf_GIAS_Domain_ol;
+static int hf_GIAS_Domain_gs_loop;
+static int hf_GIAS_Domain_bd_loop;
+static int hf_GIAS_Domain_bd;
+static int hf_GIAS_Domain_bv;
+static int hf_GIAS_LifeEvent_LifeEvent;
+static int hf_GIAS_LifeEvent_ev;
         /* Expert info filters */
-static expert_field ei_gias_unknown_giop_msg = EI_INIT;
-static expert_field ei_gias_unknown_exception = EI_INIT;
-static expert_field ei_gias_unknown_reply_status = EI_INIT;
+static expert_field ei_gias_unknown_giop_msg;
+static expert_field ei_gias_unknown_exception;
+static expert_field ei_gias_unknown_reply_status;
 
 
 static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset);
diff --git a/epan/dissectors/packet-gift.c b/epan/dissectors/packet-gift.c
index e007970271..e5c696a39b 100644
--- a/epan/dissectors/packet-gift.c
+++ b/epan/dissectors/packet-gift.c
@@ -23,16 +23,16 @@ static dissector_handle_t gift_handle;
 
 #define TCP_PORT_GIFT 1213 /* Not IANA registered */
 
-static int proto_gift = -1;
-static int hf_gift_response = -1;
-static int hf_gift_request = -1;
-static int hf_gift_response_cmd = -1;
-static int hf_gift_response_arg = -1;
-static int hf_gift_request_cmd = -1;
-static int hf_gift_request_arg = -1;
-
-static gint ett_gift = -1;
-static gint ett_gift_cmd = -1;
+static int proto_gift;
+static int hf_gift_response;
+static int hf_gift_request;
+static int hf_gift_response_cmd;
+static int hf_gift_response_arg;
+static int hf_gift_request_cmd;
+static int hf_gift_request_arg;
+
+static gint ett_gift;
+static gint ett_gift_cmd;
 
 static int
 dissect_gift(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index cf70ccae92..f61946bc75 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -349,134 +349,134 @@ static guint32 get_CDR_typeCode_with_params(tvbuff_t *tvb, packet_info* pinfo, p
  */
 
 static int giop_tap = -1;
-static int proto_giop = -1;
-static int hf_giop_message_magic = -1;
-static int hf_giop_message_major_version = -1;
-static int hf_giop_message_minor_version = -1;
-static int hf_giop_message_flags = -1;
-static int hf_giop_message_flags_ziop_enabled = -1;
-static int hf_giop_message_flags_ziop_supported = -1;
-static int hf_giop_message_flags_fragment = -1;
-static int hf_giop_message_flags_little_endian = -1;
-static int hf_giop_message_type = -1;
-static int hf_giop_message_size = -1;
-static int hf_giop_repoid = -1;
-static int hf_giop_req_id = -1;
-static int hf_giop_req_operation_len = -1;
-static int hf_giop_req_operation = -1;
-static int hf_giop_req_principal_len = -1;
-static int hf_giop_req_principal = -1;
-static int hf_giop_string_length = -1;
-static int hf_giop_sequence_length = -1;
-static int hf_giop_profile_id = -1;
-static int hf_giop_type_id = -1;
-static int hf_giop_type_id_match = -1;
-static int hf_giop_iiop_v_maj = -1;
-static int hf_giop_iiop_v_min = -1;
-static int hf_giop_endianness = -1; /* esp encapsulations */
-/* static int hf_giop_compressed = -1; */
-/* static int hf_giop_IOR_tag = -1; */
-static int hf_giop_IIOP_tag = -1;
-static int hf_giop_locale_status = -1;
-static int hf_giop_addressing_disposition = -1;
-static int hf_giop_profile_data = -1;
-static int hf_giop_component_data = -1;
-static int hf_giop_char_data = -1;
-static int hf_giop_wchar_data = -1;
-static int hf_giop_rt_corba_priority = -1;
-static int hf_giop_context_data = -1;
-static int hf_giop_target_address_discriminant = -1;
-static int hf_giop_target_address_key_addr_len = -1;
-static int hf_giop_target_address_key_addr = -1;
-static int hf_giop_target_address_ref_addr_len = -1;
-
-static int hf_giop_TCKind = -1;
-static int hf_giop_typecode_count = -1;
-static int hf_giop_typecode_default_used = -1;
-static int hf_giop_typecode_digits = -1;
-static int hf_giop_typecode_length = -1;
-static int hf_giop_typecode_max_length = -1;
-static int hf_giop_typecode_member_name = -1;
-static int hf_giop_typecode_name = -1;
-static int hf_giop_typecode_scale = -1;
-static int hf_giop_typecode_ValueModifier = -1;
-static int hf_giop_typecode_Visibility = -1;
-
-static int hf_giop_type_boolean = -1;
-static int hf_giop_type_char = -1;
-static int hf_giop_type_double = -1;
-static int hf_giop_type_enum = -1;
-static int hf_giop_type_float = -1;
-static int hf_giop_type_long = -1;
-static int hf_giop_type_longlong = -1;
-static int hf_giop_type_ulonglong = -1;
-static int hf_giop_type_octet = -1;
-static int hf_giop_type_short = -1;
-static int hf_giop_type_string = -1;
-static int hf_giop_type_ulong = -1;
-static int hf_giop_type_ushort = -1;
-
-static int hf_giop_iiop_host = -1;
-static int hf_giop_iiop_port = -1;
-static int hf_giop_iiop_sc = -1;
-static int hf_giop_iiop_sc_vscid = -1;
-static int hf_giop_iiop_sc_omg_scid = -1;
-static int hf_giop_iiop_sc_vendor_scid = -1;
-
-static int hf_giop_reply_status = -1;
-static int hf_giop_exception_id = -1;
-static int hf_giop_exception_len = -1;
-static int hf_giop_objekt_key = -1;
-static int hf_giop_rsp_expected = -1;
-static int hf_giop_response_flag = -1;
-static int hf_giop_reserved = -1;
-static int hf_giop_objekt_key_len = -1;
-static int hf_giop_type_id_len = -1;
-static int hf_giop_stub_data = -1;
-static int hf_giop_address_disp = -1;
-static int hf_giop_reply_body = -1;
-static int hf_giop_minor_code_value = -1;
-static int hf_giop_completion_status = -1;
+static int proto_giop;
+static int hf_giop_message_magic;
+static int hf_giop_message_major_version;
+static int hf_giop_message_minor_version;
+static int hf_giop_message_flags;
+static int hf_giop_message_flags_ziop_enabled;
+static int hf_giop_message_flags_ziop_supported;
+static int hf_giop_message_flags_fragment;
+static int hf_giop_message_flags_little_endian;
+static int hf_giop_message_type;
+static int hf_giop_message_size;
+static int hf_giop_repoid;
+static int hf_giop_req_id;
+static int hf_giop_req_operation_len;
+static int hf_giop_req_operation;
+static int hf_giop_req_principal_len;
+static int hf_giop_req_principal;
+static int hf_giop_string_length;
+static int hf_giop_sequence_length;
+static int hf_giop_profile_id;
+static int hf_giop_type_id;
+static int hf_giop_type_id_match;
+static int hf_giop_iiop_v_maj;
+static int hf_giop_iiop_v_min;
+static int hf_giop_endianness; /* esp encapsulations */
+/* static int hf_giop_compressed; */
+/* static int hf_giop_IOR_tag; */
+static int hf_giop_IIOP_tag;
+static int hf_giop_locale_status;
+static int hf_giop_addressing_disposition;
+static int hf_giop_profile_data;
+static int hf_giop_component_data;
+static int hf_giop_char_data;
+static int hf_giop_wchar_data;
+static int hf_giop_rt_corba_priority;
+static int hf_giop_context_data;
+static int hf_giop_target_address_discriminant;
+static int hf_giop_target_address_key_addr_len;
+static int hf_giop_target_address_key_addr;
+static int hf_giop_target_address_ref_addr_len;
+
+static int hf_giop_TCKind;
+static int hf_giop_typecode_count;
+static int hf_giop_typecode_default_used;
+static int hf_giop_typecode_digits;
+static int hf_giop_typecode_length;
+static int hf_giop_typecode_max_length;
+static int hf_giop_typecode_member_name;
+static int hf_giop_typecode_name;
+static int hf_giop_typecode_scale;
+static int hf_giop_typecode_ValueModifier;
+static int hf_giop_typecode_Visibility;
+
+static int hf_giop_type_boolean;
+static int hf_giop_type_char;
+static int hf_giop_type_double;
+static int hf_giop_type_enum;
+static int hf_giop_type_float;
+static int hf_giop_type_long;
+static int hf_giop_type_longlong;
+static int hf_giop_type_ulonglong;
+static int hf_giop_type_octet;
+static int hf_giop_type_short;
+static int hf_giop_type_string;
+static int hf_giop_type_ulong;
+static int hf_giop_type_ushort;
+
+static int hf_giop_iiop_host;
+static int hf_giop_iiop_port;
+static int hf_giop_iiop_sc;
+static int hf_giop_iiop_sc_vscid;
+static int hf_giop_iiop_sc_omg_scid;
+static int hf_giop_iiop_sc_vendor_scid;
+
+static int hf_giop_reply_status;
+static int hf_giop_exception_id;
+static int hf_giop_exception_len;
+static int hf_giop_objekt_key;
+static int hf_giop_rsp_expected;
+static int hf_giop_response_flag;
+static int hf_giop_reserved;
+static int hf_giop_objekt_key_len;
+static int hf_giop_type_id_len;
+static int hf_giop_stub_data;
+static int hf_giop_address_disp;
+static int hf_giop_reply_body;
+static int hf_giop_minor_code_value;
+static int hf_giop_completion_status;
 
 /*
  * (sub)Tree declares
  */
 
-static gint ett_giop = -1;
-static gint ett_giop_header = -1;
-static gint ett_giop_header_version = -1;
-static gint ett_giop_message_flags = -1;
-static gint ett_giop_reply = -1;
-static gint ett_giop_request = -1;
-static gint ett_giop_cancel_request = -1;
-static gint ett_giop_locate_request = -1;
-static gint ett_giop_locate_reply = -1;
-static gint ett_giop_fragment = -1;
-
-static gint ett_giop_scl = -1;  /* ServiceContextList */
-static gint ett_giop_sc = -1;   /* ServiceContext */
-static gint ett_giop_ior = -1;  /* IOR  */
+static gint ett_giop;
+static gint ett_giop_header;
+static gint ett_giop_header_version;
+static gint ett_giop_message_flags;
+static gint ett_giop_reply;
+static gint ett_giop_request;
+static gint ett_giop_cancel_request;
+static gint ett_giop_locate_request;
+static gint ett_giop_locate_reply;
+static gint ett_giop_fragment;
+
+static gint ett_giop_scl;  /* ServiceContextList */
+static gint ett_giop_sc;   /* ServiceContext */
+static gint ett_giop_ior;  /* IOR  */
 
 // for complex data types like arrays, structs, sequences
-static gint ett_giop_array               = -1;
-static gint ett_giop_sequence            = -1;
-static gint ett_giop_struct              = -1;
-static gint ett_giop_typecode_parameters = -1;
+static gint ett_giop_array;
+static gint ett_giop_sequence;
+static gint ett_giop_struct;
+static gint ett_giop_typecode_parameters;
 
-static gint ett_giop_fragments  = -1;
-static gint ett_giop_fragment_  = -1;
+static gint ett_giop_fragments;
+static gint ett_giop_fragment_;
 
 
-static int hf_giop_fragments    = -1;
-static int hf_giop_fragment     = -1;
-static int hf_giop_fragment_overlap          = -1;
-static int hf_giop_fragment_overlap_conflict = -1;
-static int hf_giop_fragment_multiple_tails   = -1;
-static int hf_giop_fragment_too_long_fragment = -1;
-static int hf_giop_fragment_error            = -1;
-static int hf_giop_fragment_count            = -1;
-static int hf_giop_reassembled_in           = -1;
-static int hf_giop_reassembled_length       = -1;
+static int hf_giop_fragments;
+static int hf_giop_fragment;
+static int hf_giop_fragment_overlap;
+static int hf_giop_fragment_overlap_conflict;
+static int hf_giop_fragment_multiple_tails;
+static int hf_giop_fragment_too_long_fragment;
+static int hf_giop_fragment_error;
+static int hf_giop_fragment_count;
+static int hf_giop_reassembled_in;
+static int hf_giop_reassembled_length;
 
 
 static const fragment_items giop_frag_items = {
@@ -503,15 +503,15 @@ static const fragment_items giop_frag_items = {
 static reassembly_table giop_reassembly_table;
 
 
-static expert_field ei_giop_unknown_typecode_datatype = EI_INIT;
-static expert_field ei_giop_unknown_sign_value = EI_INIT;
-static expert_field ei_giop_unknown_tckind = EI_INIT;
-static expert_field ei_giop_length_too_big = EI_INIT;
-static expert_field ei_giop_version_not_supported = EI_INIT;
-static expert_field ei_giop_message_size_too_big = EI_INIT;
-static expert_field ei_giop_invalid_v_minor = EI_INIT;
-static expert_field ei_giop_max_recursion_depth_reached = EI_INIT;
-static expert_field ei_giop_offset_error = EI_INIT;
+static expert_field ei_giop_unknown_typecode_datatype;
+static expert_field ei_giop_unknown_sign_value;
+static expert_field ei_giop_unknown_tckind;
+static expert_field ei_giop_length_too_big;
+static expert_field ei_giop_version_not_supported;
+static expert_field ei_giop_message_size_too_big;
+static expert_field ei_giop_invalid_v_minor;
+static expert_field ei_giop_max_recursion_depth_reached;
+static expert_field ei_giop_offset_error;
 
 
 static int * const giop_message_flags[] = {
diff --git a/epan/dissectors/packet-git.c b/epan/dissectors/packet-git.c
index a9644ac1e6..9b9f5d41c3 100644
--- a/epan/dissectors/packet-git.c
+++ b/epan/dissectors/packet-git.c
@@ -28,20 +28,20 @@ void proto_reg_handoff_git(void);
 
 static dissector_handle_t git_handle;
 
-static int proto_git = -1;
-static expert_field ei_git_bad_pkt_len = EI_INIT;
-static expert_field ei_git_malformed = EI_INIT;
-
-static gint ett_git = -1;
-
-static gint hf_git_protocol_version = -1;
-static gint hf_git_packet_type = -1;
-static gint hf_git_packet_len = -1;
-static gint hf_git_packet_data = -1;
-static gint hf_git_sideband_control_code = -1;
-static gint hf_git_upload_pack_adv = -1;
-static gint hf_git_upload_pack_req = -1;
-static gint hf_git_upload_pack_res = -1;
+static int proto_git;
+static expert_field ei_git_bad_pkt_len;
+static expert_field ei_git_malformed;
+
+static gint ett_git;
+
+static gint hf_git_protocol_version;
+static gint hf_git_packet_type;
+static gint hf_git_packet_len;
+static gint hf_git_packet_data;
+static gint hf_git_sideband_control_code;
+static gint hf_git_upload_pack_adv;
+static gint hf_git_upload_pack_req;
+static gint hf_git_upload_pack_res;
 
 #define PNAME  "Git Smart Protocol"
 #define PSNAME "Git"
diff --git a/epan/dissectors/packet-glbp.c b/epan/dissectors/packet-glbp.c
index 909a7a2687..4695420a1d 100644
--- a/epan/dissectors/packet-glbp.c
+++ b/epan/dissectors/packet-glbp.c
@@ -36,59 +36,59 @@ static dissector_handle_t glbp_handle;
 
 #define GLBP_UDP_PORT 3222
 
-static int proto_glbp = -1;
+static int proto_glbp;
 /* glbp header? */
-static gint hf_glbp_version = -1;
-static gint hf_glbp_unknown1 = -1;
-static gint hf_glbp_group = -1;
-static gint hf_glbp_unknown2 = -1;
-static gint hf_glbp_ownerid = -1;
-static gint hf_glbp_tlv = -1;
-static gint hf_glbp_type = -1;
-static gint hf_glbp_length = -1;
+static gint hf_glbp_version;
+static gint hf_glbp_unknown1;
+static gint hf_glbp_group;
+static gint hf_glbp_unknown2;
+static gint hf_glbp_ownerid;
+static gint hf_glbp_tlv;
+static gint hf_glbp_type;
+static gint hf_glbp_length;
 /* glbp type = 1 - hello */
-static gint hf_glbp_hello_unknown10 = -1;
-static gint hf_glbp_hello_vgstate = -1;
-static gint hf_glbp_hello_unknown11 = -1;
-static gint hf_glbp_hello_priority = -1;
-static gint hf_glbp_hello_unknown12 = -1;
-static gint hf_glbp_hello_helloint = -1;
-static gint hf_glbp_hello_holdint = -1;
-static gint hf_glbp_hello_redirect = -1;
-static gint hf_glbp_hello_timeout = -1;
-static gint hf_glbp_hello_unknown13 = -1;
-static gint hf_glbp_hello_addrtype = -1;
-static gint hf_glbp_hello_addrlen = -1;
-static gint hf_glbp_hello_virtualipv4 = -1;
-static gint hf_glbp_hello_virtualipv6 = -1;
-static gint hf_glbp_hello_virtualunk = -1;
+static gint hf_glbp_hello_unknown10;
+static gint hf_glbp_hello_vgstate;
+static gint hf_glbp_hello_unknown11;
+static gint hf_glbp_hello_priority;
+static gint hf_glbp_hello_unknown12;
+static gint hf_glbp_hello_helloint;
+static gint hf_glbp_hello_holdint;
+static gint hf_glbp_hello_redirect;
+static gint hf_glbp_hello_timeout;
+static gint hf_glbp_hello_unknown13;
+static gint hf_glbp_hello_addrtype;
+static gint hf_glbp_hello_addrlen;
+static gint hf_glbp_hello_virtualipv4;
+static gint hf_glbp_hello_virtualipv6;
+static gint hf_glbp_hello_virtualunk;
 /* glbp type = 2 - Request/Response??? */
-static gint hf_glbp_reqresp_forwarder = -1;
-static gint hf_glbp_reqresp_vfstate = -1;
-static gint hf_glbp_reqresp_unknown21 = -1;
-static gint hf_glbp_reqresp_priority = -1;
-static gint hf_glbp_reqresp_weight = -1;
-static gint hf_glbp_reqresp_unknown22 = -1;
-static gint hf_glbp_reqresp_virtualmac = -1;
+static gint hf_glbp_reqresp_forwarder;
+static gint hf_glbp_reqresp_vfstate;
+static gint hf_glbp_reqresp_unknown21;
+static gint hf_glbp_reqresp_priority;
+static gint hf_glbp_reqresp_weight;
+static gint hf_glbp_reqresp_unknown22;
+static gint hf_glbp_reqresp_virtualmac;
 /* glbp type = 3 - Auth */
-static gint hf_glbp_auth_authtype = -1;
-static gint hf_glbp_auth_authlength = -1;
-static gint hf_glbp_auth_plainpass = -1;
-static gint hf_glbp_auth_md5hash = -1;
-static gint hf_glbp_auth_md5chainindex = -1;
-static gint hf_glbp_auth_md5chainhash = -1;
-static gint hf_glbp_auth_authunknown = -1;
+static gint hf_glbp_auth_authtype;
+static gint hf_glbp_auth_authlength;
+static gint hf_glbp_auth_plainpass;
+static gint hf_glbp_auth_md5hash;
+static gint hf_glbp_auth_md5chainindex;
+static gint hf_glbp_auth_md5chainhash;
+static gint hf_glbp_auth_authunknown;
 /* unknown type */
-static gint hf_glbp_unknown_data = -1;
+static gint hf_glbp_unknown_data;
 
-static gint ett_glbp = -1;
-static gint ett_glbp_tlv = -1;
+static gint ett_glbp;
+static gint ett_glbp_tlv;
 
 /* filterable expert infos */
-static expert_field ei_glbp_ipv4_wrong_length = EI_INIT;
-static expert_field ei_glbp_ipv6_wrong_length = EI_INIT;
-static expert_field ei_glbp_tlv_length_too_small = EI_INIT;
-static expert_field ei_glbp_tlv_invalid_bytes_used = EI_INIT;
+static expert_field ei_glbp_ipv4_wrong_length;
+static expert_field ei_glbp_ipv6_wrong_length;
+static expert_field ei_glbp_tlv_length_too_small;
+static expert_field ei_glbp_tlv_invalid_bytes_used;
 
 static const value_string glbp_type_vals[] = {
   { 1,  "Hello" },
diff --git a/epan/dissectors/packet-gluster_cli.c b/epan/dissectors/packet-gluster_cli.c
index 5323ba7e23..bf04a705f6 100644
--- a/epan/dissectors/packet-gluster_cli.c
+++ b/epan/dissectors/packet-gluster_cli.c
@@ -30,24 +30,24 @@ void proto_register_gluster_cli(void);
 void proto_reg_handoff_gluster_cli(void);
 
 /* Initialize the protocol and registered fields */
-static gint proto_gluster_cli = -1;
+static gint proto_gluster_cli;
 
 /* programs and procedures */
-static gint hf_gluster_cli_proc = -1;
-static gint hf_gluster_cli_2_proc = -1;
-static gint hf_gluster_dict = -1;
-static gint hf_gluster_path = -1;
-static gint hf_gluster_lazy = -1;
-static gint hf_gluster_label = -1;
-static gint hf_gluster_unused = -1;
-static gint hf_gluster_wd= -1;
-static gint hf_gluster_op_errstr= -1;
-static gint hf_gluster_hostname = -1;
-static gint hf_gluster_port = -1;
-static gint hf_gluster_flags = -1;
+static gint hf_gluster_cli_proc;
+static gint hf_gluster_cli_2_proc;
+static gint hf_gluster_dict;
+static gint hf_gluster_path;
+static gint hf_gluster_lazy;
+static gint hf_gluster_label;
+static gint hf_gluster_unused;
+static gint hf_gluster_wd;
+static gint hf_gluster_op_errstr;
+static gint hf_gluster_hostname;
+static gint hf_gluster_port;
+static gint hf_gluster_flags;
 
 /* Initialize the subtree pointers */
-static gint ett_gluster_cli = -1;
+static gint ett_gluster_cli;
 
 /* CLI Operations */
 static int
diff --git a/epan/dissectors/packet-gluster_pmap.c b/epan/dissectors/packet-gluster_pmap.c
index 1dde06dd9d..1b86f2883b 100644
--- a/epan/dissectors/packet-gluster_pmap.c
+++ b/epan/dissectors/packet-gluster_pmap.c
@@ -32,26 +32,26 @@ void proto_register_gluster_dump(void);
 void proto_reg_handoff_gluster_dump(void);
 
 /* Initialize the protocol and registered fields */
-static gint proto_gluster_pmap = -1;
-static gint proto_gluster_dump = -1;
+static gint proto_gluster_pmap;
+static gint proto_gluster_dump;
 
 /* programs and procedures */
-static gint hf_gluster_pmap_proc = -1;
-static gint hf_gluster_dump_proc = -1;
+static gint hf_gluster_pmap_proc;
+static gint hf_gluster_dump_proc;
 
 /* fields used by multiple programs/procedures */
-static gint hf_gluster_brick = -1;
-static gint hf_gluster_brick_status = -1;
-static gint hf_gluster_brick_port = -1;
-static gint hf_gluster_gfsid = -1;
-static gint hf_gluster_progname = -1;
-static gint hf_gluster_prognum = -1;
-static gint hf_gluster_progver = -1;
+static gint hf_gluster_brick;
+static gint hf_gluster_brick_status;
+static gint hf_gluster_brick_port;
+static gint hf_gluster_gfsid;
+static gint hf_gluster_progname;
+static gint hf_gluster_prognum;
+static gint hf_gluster_progver;
 
 /* Initialize the subtree pointers */
-static gint ett_gluster_pmap = -1;
-static gint ett_gluster_dump = -1;
-static gint ett_gluster_dump_detail = -1;
+static gint ett_gluster_pmap;
+static gint ett_gluster_dump;
+static gint ett_gluster_dump_detail;
 
 /* PMAP PORTBYBRICK */
 static int
diff --git a/epan/dissectors/packet-glusterd.c b/epan/dissectors/packet-glusterd.c
index a4778af5a1..a227a21303 100644
--- a/epan/dissectors/packet-glusterd.c
+++ b/epan/dissectors/packet-glusterd.c
@@ -31,35 +31,35 @@ void proto_register_gluster_gd_mgmt(void);
 void proto_reg_handoff_gluster_gd_mgmt(void);
 
 /* Initialize the protocol and registered fields */
-static gint proto_glusterd = -1;
-static gint proto_gd_mgmt = -1;
-static gint proto_gd_brick = -1;
-static gint proto_gd_friend = -1;
+static gint proto_glusterd;
+static gint proto_gd_mgmt;
+static gint proto_gd_brick;
+static gint proto_gd_friend;
 
 /* programs and procedures */
-static gint hf_gd_mgmt_proc = -1;
-static gint hf_gd_mgmt_2_proc = -1;
-static gint hf_gd_mgmt_3_proc = -1;
-static gint hf_gd_mgmt_brick_2_proc = -1;
-static gint hf_glusterd_friend_proc = -1;
+static gint hf_gd_mgmt_proc;
+static gint hf_gd_mgmt_2_proc;
+static gint hf_gd_mgmt_3_proc;
+static gint hf_gd_mgmt_brick_2_proc;
+static gint hf_glusterd_friend_proc;
 
 /* fields used by multiple programs/procedures */
-static gint hf_glusterd_dict = -1;
-static gint hf_glusterd_op = -1;
-static gint hf_glusterd_op_ret = -1;
-static gint hf_glusterd_op_errstr = -1;
-static gint hf_glusterd_uuid = -1;
-static gint hf_glusterd_tnx_id = -1;
-static gint hf_glusterd_hostname = -1;
-static gint hf_glusterd_port = -1;
-static gint hf_glusterd_vols = -1;
-static gint hf_glusterd_buf = -1;
-static gint hf_glusterd_name = -1;
+static gint hf_glusterd_dict;
+static gint hf_glusterd_op;
+static gint hf_glusterd_op_ret;
+static gint hf_glusterd_op_errstr;
+static gint hf_glusterd_uuid;
+static gint hf_glusterd_tnx_id;
+static gint hf_glusterd_hostname;
+static gint hf_glusterd_port;
+static gint hf_glusterd_vols;
+static gint hf_glusterd_buf;
+static gint hf_glusterd_name;
 
 /* Initialize the subtree pointers */
-static gint ett_gd_mgmt = -1;
-static gint ett_gd_brick = -1;
-static gint ett_gd_friend = -1;
+static gint ett_gd_mgmt;
+static gint ett_gd_brick;
+static gint ett_gd_friend;
 
 /* the UUID is the same as a GlusterFS GFID, except it's encoded per byte */
 static int
diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c
index 20ab07e9f0..533d3b39fd 100644
--- a/epan/dissectors/packet-glusterfs.c
+++ b/epan/dissectors/packet-glusterfs.c
@@ -30,199 +30,199 @@ void proto_register_glusterfs(void);
 void proto_reg_handoff_glusterfs(void);
 
 /* Initialize the protocol and registered fields */
-static gint proto_glusterfs = -1;
+static gint proto_glusterfs;
 
 /* programs and procedures */
-static gint hf_glusterfs_proc = -1;
+static gint hf_glusterfs_proc;
 
 /* fields used by multiple programs/procedures */
-static gint hf_gluster_op_ret = -1;
-static gint hf_gluster_op_errno = -1;
+static gint hf_gluster_op_ret;
+static gint hf_gluster_op_errno;
 
 /* GlusterFS specific */
-static gint hf_glusterfs_gfid = -1;
-static gint hf_glusterfs_pargfid = -1;
-static gint hf_glusterfs_oldgfid = -1;
-static gint hf_glusterfs_newgfid = -1;
-static gint hf_glusterfs_path = -1;
-static gint hf_glusterfs_bname = -1;
-static gint hf_glusterfs_dict = -1;
-static gint hf_glusterfs_fd = -1;
-static gint hf_glusterfs_offset = -1;
-static gint hf_glusterfs_size = -1;
-static gint hf_glusterfs_size64 = -1;
-static gint hf_glusterfs_volume = -1;
-static gint hf_glusterfs_cmd = -1;
-static gint hf_glusterfs_type = -1;
-static gint hf_glusterfs_entries = -1;
-static gint hf_glusterfs_xflags = -1;
-static gint hf_glusterfs_linkname = -1;
-static gint hf_glusterfs_umask = -1;
-static gint hf_glusterfs_mask = -1;
-static gint hf_glusterfs_name = -1;
-static gint hf_glusterfs_namelen = -1;
-static gint hf_glusterfs_whence = -1;
+static gint hf_glusterfs_gfid;
+static gint hf_glusterfs_pargfid;
+static gint hf_glusterfs_oldgfid;
+static gint hf_glusterfs_newgfid;
+static gint hf_glusterfs_path;
+static gint hf_glusterfs_bname;
+static gint hf_glusterfs_dict;
+static gint hf_glusterfs_fd;
+static gint hf_glusterfs_offset;
+static gint hf_glusterfs_size;
+static gint hf_glusterfs_size64;
+static gint hf_glusterfs_volume;
+static gint hf_glusterfs_cmd;
+static gint hf_glusterfs_type;
+static gint hf_glusterfs_entries;
+static gint hf_glusterfs_xflags;
+static gint hf_glusterfs_linkname;
+static gint hf_glusterfs_umask;
+static gint hf_glusterfs_mask;
+static gint hf_glusterfs_name;
+static gint hf_glusterfs_namelen;
+static gint hf_glusterfs_whence;
 
 /* flags passed on to OPEN, CREATE etc.*/
-static gint hf_glusterfs_flags = -1;
-static gint hf_glusterfs_flags_rdonly = -1;
-static gint hf_glusterfs_flags_wronly = -1;
-static gint hf_glusterfs_flags_rdwr = -1;
-static gint hf_glusterfs_flags_accmode = -1;
-static gint hf_glusterfs_flags_append = -1;
-static gint hf_glusterfs_flags_async = -1;
-static gint hf_glusterfs_flags_cloexec = -1;
-static gint hf_glusterfs_flags_creat = -1;
-static gint hf_glusterfs_flags_direct = -1;
-static gint hf_glusterfs_flags_directory = -1;
-static gint hf_glusterfs_flags_excl = -1;
-static gint hf_glusterfs_flags_largefile = -1;
-static gint hf_glusterfs_flags_noatime = -1;
-static gint hf_glusterfs_flags_noctty = -1;
-static gint hf_glusterfs_flags_nofollow = -1;
-static gint hf_glusterfs_flags_nonblock = -1;
-static gint hf_glusterfs_flags_ndelay = -1;
-static gint hf_glusterfs_flags_sync = -1;
-static gint hf_glusterfs_flags_trunc = -1;
-static gint hf_glusterfs_flags_reserved = -1;
+static gint hf_glusterfs_flags;
+static gint hf_glusterfs_flags_rdonly;
+static gint hf_glusterfs_flags_wronly;
+static gint hf_glusterfs_flags_rdwr;
+static gint hf_glusterfs_flags_accmode;
+static gint hf_glusterfs_flags_append;
+static gint hf_glusterfs_flags_async;
+static gint hf_glusterfs_flags_cloexec;
+static gint hf_glusterfs_flags_creat;
+static gint hf_glusterfs_flags_direct;
+static gint hf_glusterfs_flags_directory;
+static gint hf_glusterfs_flags_excl;
+static gint hf_glusterfs_flags_largefile;
+static gint hf_glusterfs_flags_noatime;
+static gint hf_glusterfs_flags_noctty;
+static gint hf_glusterfs_flags_nofollow;
+static gint hf_glusterfs_flags_nonblock;
+static gint hf_glusterfs_flags_ndelay;
+static gint hf_glusterfs_flags_sync;
+static gint hf_glusterfs_flags_trunc;
+static gint hf_glusterfs_flags_reserved;
 
 /* access modes  */
-static gint hf_glusterfs_mode = -1;
-static gint hf_glusterfs_mode_suid = -1;
-static gint hf_glusterfs_mode_sgid = -1;
-static gint hf_glusterfs_mode_svtx = -1;
-static gint hf_glusterfs_mode_rusr = -1;
-static gint hf_glusterfs_mode_wusr = -1;
-static gint hf_glusterfs_mode_xusr = -1;
-static gint hf_glusterfs_mode_rgrp = -1;
-static gint hf_glusterfs_mode_wgrp = -1;
-static gint hf_glusterfs_mode_xgrp = -1;
-static gint hf_glusterfs_mode_roth = -1;
-static gint hf_glusterfs_mode_woth = -1;
-static gint hf_glusterfs_mode_xoth = -1;
-static gint hf_glusterfs_mode_reserved = -1;
+static gint hf_glusterfs_mode;
+static gint hf_glusterfs_mode_suid;
+static gint hf_glusterfs_mode_sgid;
+static gint hf_glusterfs_mode_svtx;
+static gint hf_glusterfs_mode_rusr;
+static gint hf_glusterfs_mode_wusr;
+static gint hf_glusterfs_mode_xusr;
+static gint hf_glusterfs_mode_rgrp;
+static gint hf_glusterfs_mode_wgrp;
+static gint hf_glusterfs_mode_xgrp;
+static gint hf_glusterfs_mode_roth;
+static gint hf_glusterfs_mode_woth;
+static gint hf_glusterfs_mode_xoth;
+static gint hf_glusterfs_mode_reserved;
 
 /* dir-entry */
-static gint hf_glusterfs_entry_ino = -1;
-static gint hf_glusterfs_entry_off = -1;
-static gint hf_glusterfs_entry_len = -1;
-static gint hf_glusterfs_entry_type = -1;
-static gint hf_glusterfs_entry_path = -1;
+static gint hf_glusterfs_entry_ino;
+static gint hf_glusterfs_entry_off;
+static gint hf_glusterfs_entry_len;
+static gint hf_glusterfs_entry_type;
+static gint hf_glusterfs_entry_path;
 
 /* gf_iatt */
-static gint hf_glusterfs_iatt = -1;
-static gint hf_glusterfs_preparent_iatt = -1;
-static gint hf_glusterfs_postparent_iatt = -1;
-static gint hf_glusterfs_preop_iatt = -1;
-static gint hf_glusterfs_postop_iatt = -1;
-static gint hf_glusterfs_ia_ino = -1;
-static gint hf_glusterfs_ia_dev = -1;
-static gint hf_glusterfs_ia_mode = -1;
-static gint hf_glusterfs_ia_nlink = -1;
-static gint hf_glusterfs_ia_uid = -1;
-static gint hf_glusterfs_ia_gid = -1;
-static gint hf_glusterfs_ia_rdev = -1;
-static gint hf_glusterfs_ia_size = -1;
-static gint hf_glusterfs_ia_blksize = -1;
-static gint hf_glusterfs_ia_blocks = -1;
-static gint hf_glusterfs_ia_atime = -1;
-static gint hf_glusterfs_ia_mtime = -1;
-static gint hf_glusterfs_ia_ctime = -1;
-
-static gint hf_glusterfs_iattx = -1;
-static gint hf_glusterfs_preparent_iattx = -1;
-static gint hf_glusterfs_postparent_iattx = -1;
-static gint hf_glusterfs_preop_iattx = -1;
-static gint hf_glusterfs_postop_iattx = -1;
-static gint hf_glusterfs_iax_flags = -1;
-static gint hf_glusterfs_iax_attributes = -1;
-static gint hf_glusterfs_iax_attributes_mask = -1;
-static gint hf_glusterfs_iax_atime = -1;
-static gint hf_glusterfs_iax_mtime = -1;
-static gint hf_glusterfs_iax_ctime = -1;
-static gint hf_glusterfs_iax_btime = -1;
-static gint hf_glusterfs_iax_atime_nsec = -1;
-static gint hf_glusterfs_iax_mtime_nsec = -1;
-static gint hf_glusterfs_iax_ctime_nsec = -1;
-static gint hf_glusterfs_iax_btime_nsec = -1;
+static gint hf_glusterfs_iatt;
+static gint hf_glusterfs_preparent_iatt;
+static gint hf_glusterfs_postparent_iatt;
+static gint hf_glusterfs_preop_iatt;
+static gint hf_glusterfs_postop_iatt;
+static gint hf_glusterfs_ia_ino;
+static gint hf_glusterfs_ia_dev;
+static gint hf_glusterfs_ia_mode;
+static gint hf_glusterfs_ia_nlink;
+static gint hf_glusterfs_ia_uid;
+static gint hf_glusterfs_ia_gid;
+static gint hf_glusterfs_ia_rdev;
+static gint hf_glusterfs_ia_size;
+static gint hf_glusterfs_ia_blksize;
+static gint hf_glusterfs_ia_blocks;
+static gint hf_glusterfs_ia_atime;
+static gint hf_glusterfs_ia_mtime;
+static gint hf_glusterfs_ia_ctime;
+
+static gint hf_glusterfs_iattx;
+static gint hf_glusterfs_preparent_iattx;
+static gint hf_glusterfs_postparent_iattx;
+static gint hf_glusterfs_preop_iattx;
+static gint hf_glusterfs_postop_iattx;
+static gint hf_glusterfs_iax_flags;
+static gint hf_glusterfs_iax_attributes;
+static gint hf_glusterfs_iax_attributes_mask;
+static gint hf_glusterfs_iax_atime;
+static gint hf_glusterfs_iax_mtime;
+static gint hf_glusterfs_iax_ctime;
+static gint hf_glusterfs_iax_btime;
+static gint hf_glusterfs_iax_atime_nsec;
+static gint hf_glusterfs_iax_mtime_nsec;
+static gint hf_glusterfs_iax_ctime_nsec;
+static gint hf_glusterfs_iax_btime_nsec;
 
 
 /* gf_flock */
-static gint hf_glusterfs_flock_type = -1;
-static gint hf_glusterfs_flock_whence = -1;
-static gint hf_glusterfs_flock_start = -1;
-static gint hf_glusterfs_flock_len = -1;
-static gint hf_glusterfs_flock_pid = -1;
-static gint hf_glusterfs_flock_owner = -1;
+static gint hf_glusterfs_flock_type;
+static gint hf_glusterfs_flock_whence;
+static gint hf_glusterfs_flock_start;
+static gint hf_glusterfs_flock_len;
+static gint hf_glusterfs_flock_pid;
+static gint hf_glusterfs_flock_owner;
 
 /* statfs */
-static gint hf_glusterfs_bsize = -1;
-static gint hf_glusterfs_frsize = -1;
-static gint hf_glusterfs_blocks = -1;
-static gint hf_glusterfs_bfree = -1;
-static gint hf_glusterfs_bavail = -1;
-static gint hf_glusterfs_files = -1;
-static gint hf_glusterfs_ffree = -1;
-static gint hf_glusterfs_favail = -1;
-static gint hf_glusterfs_id = -1;
-static gint hf_glusterfs_mnt_flags = -1;
-static gint hf_glusterfs_mnt_flag_rdonly = -1;
-static gint hf_glusterfs_mnt_flag_nosuid = -1;
-static gint hf_glusterfs_mnt_flag_nodev = -1;
-static gint hf_glusterfs_mnt_flag_noexec = -1;
-static gint hf_glusterfs_mnt_flag_synchronous = -1;
-static gint hf_glusterfs_mnt_flag_mandlock = -1;
-static gint hf_glusterfs_mnt_flag_write = -1;
-static gint hf_glusterfs_mnt_flag_append = -1;
-static gint hf_glusterfs_mnt_flag_immutable = -1;
-static gint hf_glusterfs_mnt_flag_noatime = -1;
-static gint hf_glusterfs_mnt_flag_nodiratime = -1;
-static gint hf_glusterfs_mnt_flag_relatime = -1;
-static gint hf_glusterfs_namemax = -1;
-
-static gint hf_glusterfs_setattr_valid = -1;
+static gint hf_glusterfs_bsize;
+static gint hf_glusterfs_frsize;
+static gint hf_glusterfs_blocks;
+static gint hf_glusterfs_bfree;
+static gint hf_glusterfs_bavail;
+static gint hf_glusterfs_files;
+static gint hf_glusterfs_ffree;
+static gint hf_glusterfs_favail;
+static gint hf_glusterfs_id;
+static gint hf_glusterfs_mnt_flags;
+static gint hf_glusterfs_mnt_flag_rdonly;
+static gint hf_glusterfs_mnt_flag_nosuid;
+static gint hf_glusterfs_mnt_flag_nodev;
+static gint hf_glusterfs_mnt_flag_noexec;
+static gint hf_glusterfs_mnt_flag_synchronous;
+static gint hf_glusterfs_mnt_flag_mandlock;
+static gint hf_glusterfs_mnt_flag_write;
+static gint hf_glusterfs_mnt_flag_append;
+static gint hf_glusterfs_mnt_flag_immutable;
+static gint hf_glusterfs_mnt_flag_noatime;
+static gint hf_glusterfs_mnt_flag_nodiratime;
+static gint hf_glusterfs_mnt_flag_relatime;
+static gint hf_glusterfs_namemax;
+
+static gint hf_glusterfs_setattr_valid;
 /* flags for setattr.valid */
-static gint hf_glusterfs_setattr_set_mode = -1;
-static gint hf_glusterfs_setattr_set_uid = -1;
-static gint hf_glusterfs_setattr_set_gid = -1;
-static gint hf_glusterfs_setattr_set_size = -1;
-static gint hf_glusterfs_setattr_set_atime = -1;
-static gint hf_glusterfs_setattr_set_mtime = -1;
-static gint hf_glusterfs_setattr_set_reserved = -1;
+static gint hf_glusterfs_setattr_set_mode;
+static gint hf_glusterfs_setattr_set_uid;
+static gint hf_glusterfs_setattr_set_gid;
+static gint hf_glusterfs_setattr_set_size;
+static gint hf_glusterfs_setattr_set_atime;
+static gint hf_glusterfs_setattr_set_mtime;
+static gint hf_glusterfs_setattr_set_reserved;
 
 /* Rename */
-static gint hf_glusterfs_oldbname = -1;
-static gint hf_glusterfs_newbname = -1;
+static gint hf_glusterfs_oldbname;
+static gint hf_glusterfs_newbname;
 
 /* for FSYNC/FSYNCDIR */
-static gint hf_glusterfs_fsync_flags = -1;
-static gint hf_glusterfs_fsync_flag_datasync = -1;
-static gint hf_glusterfs_fsync_flag_unknown = -1;
+static gint hf_glusterfs_fsync_flags;
+static gint hf_glusterfs_fsync_flag_datasync;
+static gint hf_glusterfs_fsync_flag_unknown;
 
 /* for entrylk */
-static gint hf_glusterfs_entrylk_namelen = -1;
+static gint hf_glusterfs_entrylk_namelen;
 
-static gint hf_gluster_dict_xdr_size = -1;
-static gint hf_gluster_dict_size = -1;
-static gint hf_gluster_num_dict_items = -1;
-static gint hf_gluster_rpc_roundup_bytes = -1;
-static gint hf_gluster_trusted_afr_key = -1;
-static gint hf_gluster_dict_value = -1;
+static gint hf_gluster_dict_xdr_size;
+static gint hf_gluster_dict_size;
+static gint hf_gluster_num_dict_items;
+static gint hf_gluster_rpc_roundup_bytes;
+static gint hf_gluster_trusted_afr_key;
+static gint hf_gluster_dict_value;
 
 
 /* Initialize the subtree pointers */
-static gint ett_glusterfs = -1;
-static gint ett_glusterfs_flags = -1;
-static gint ett_glusterfs_mnt_flags = -1;
-static gint ett_glusterfs_mode = -1;
-static gint ett_glusterfs_setattr_valid = -1;
-static gint ett_glusterfs_parent_iatt = -1;
-static gint ett_glusterfs_iatt = -1;
-static gint ett_glusterfs_entry = -1;
-static gint ett_glusterfs_flock = -1;
-static gint ett_glusterfs_fsync_flags = -1;
-static gint ett_gluster_dict = -1;
-static gint ett_gluster_dict_items = -1;
+static gint ett_glusterfs;
+static gint ett_glusterfs_flags;
+static gint ett_glusterfs_mnt_flags;
+static gint ett_glusterfs_mode;
+static gint ett_glusterfs_setattr_valid;
+static gint ett_glusterfs_parent_iatt;
+static gint ett_glusterfs_iatt;
+static gint ett_glusterfs_entry;
+static gint ett_glusterfs_flock;
+static gint ett_glusterfs_fsync_flags;
+static gint ett_gluster_dict;
+static gint ett_gluster_dict_items;
 
 static int
 glusterfs_rpc_dissect_gfid(proto_tree *tree, tvbuff_t *tvb, int hfindex, int offset)
diff --git a/epan/dissectors/packet-glusterfs_hndsk.c b/epan/dissectors/packet-glusterfs_hndsk.c
index 973eb71e29..6425197d43 100644
--- a/epan/dissectors/packet-glusterfs_hndsk.c
+++ b/epan/dissectors/packet-glusterfs_hndsk.c
@@ -32,49 +32,49 @@ void proto_register_gluster_cbk(void);
 void proto_reg_handoff_gluster_cbk(void);
 
 /* Initialize the protocol and registered fields */
-static gint proto_gluster_cbk = -1;
-static gint proto_gluster_hndsk = -1;
+static gint proto_gluster_cbk;
+static gint proto_gluster_hndsk;
 
 /* programs and procedures */
-static int hf_gluster_cbk_proc = -1;
-static int hf_gluster_hndsk_proc = -1;
-static int hf_gluster_hndsk_dict = -1;
-static int hf_gluster_hndsk_spec = -1;		/* GETSPEC Reply */
-static int hf_gluster_hndsk_key = -1;		/* GETSPEC Call */
-static int hf_gluster_hndsk_event_op = -1;	/* EVENT NOTIFY call */
-static int hf_gluster_hndsk_uid = -1;		/* LOCK VERSION*/
-static int hf_gluster_hndsk_op_errstr = -1;	/* GETVOLUMEINFO */
-static int hf_gluster_hndsk_lk_ver= -1;
-static int hf_gluster_hndsk_flags = -1;
+static int hf_gluster_cbk_proc;
+static int hf_gluster_hndsk_proc;
+static int hf_gluster_hndsk_dict;
+static int hf_gluster_hndsk_spec;		/* GETSPEC Reply */
+static int hf_gluster_hndsk_key;		/* GETSPEC Call */
+static int hf_gluster_hndsk_event_op;	/* EVENT NOTIFY call */
+static int hf_gluster_hndsk_uid;		/* LOCK VERSION*/
+static int hf_gluster_hndsk_op_errstr;	/* GETVOLUMEINFO */
+static int hf_gluster_hndsk_lk_ver;
+static int hf_gluster_hndsk_flags;
 
 /* Initialize the subtree pointers */
-static gint ett_gluster_cbk = -1;
-static gint ett_gluster_cbk_flags = -1;
-static gint ett_gluster_hndsk = -1;
+static gint ett_gluster_cbk;
+static gint ett_gluster_cbk_flags;
+static gint ett_gluster_hndsk;
 
 /* upcall, used for cache-invalidation etc. */
-static int hf_gluster_cbk_gfid = -1;
-static int hf_gluster_cbk_upcall_event_type = -1;
-static int hf_gluster_cbk_ci_flags = -1;
-static int hf_gluster_cbk_ci_expire_time_attr = -1;
-static int hf_gluster_cbk_ci_stat = -1;
-static int hf_gluster_cbk_ci_parent_stat = -1;
-static int hf_gluster_cbk_ci_oldparent_stat = -1;
-static int hf_gluster_cbk_xdata = -1;
+static int hf_gluster_cbk_gfid;
+static int hf_gluster_cbk_upcall_event_type;
+static int hf_gluster_cbk_ci_flags;
+static int hf_gluster_cbk_ci_expire_time_attr;
+static int hf_gluster_cbk_ci_stat;
+static int hf_gluster_cbk_ci_parent_stat;
+static int hf_gluster_cbk_ci_oldparent_stat;
+static int hf_gluster_cbk_xdata;
 
 /* flags for upcall */
-static int hf_gluster_cbk_upcall_flag_nlink = -1;
-static int hf_gluster_cbk_upcall_flag_mode = -1;
-static int hf_gluster_cbk_upcall_flag_own = -1;
-static int hf_gluster_cbk_upcall_flag_size = -1;
-static int hf_gluster_cbk_upcall_flag_times = -1;
-static int hf_gluster_cbk_upcall_flag_atime = -1;
-static int hf_gluster_cbk_upcall_flag_perm = -1;
-static int hf_gluster_cbk_upcall_flag_rename = -1;
-static int hf_gluster_cbk_upcall_flag_forget = -1;
-static int hf_gluster_cbk_upcall_flag_parent_times = -1;
-static int hf_gluster_cbk_upcall_flag_xattr = -1;
-static int hf_gluster_cbk_upcall_flag_xattr_rm = -1;
+static int hf_gluster_cbk_upcall_flag_nlink;
+static int hf_gluster_cbk_upcall_flag_mode;
+static int hf_gluster_cbk_upcall_flag_own;
+static int hf_gluster_cbk_upcall_flag_size;
+static int hf_gluster_cbk_upcall_flag_times;
+static int hf_gluster_cbk_upcall_flag_atime;
+static int hf_gluster_cbk_upcall_flag_perm;
+static int hf_gluster_cbk_upcall_flag_rename;
+static int hf_gluster_cbk_upcall_flag_forget;
+static int hf_gluster_cbk_upcall_flag_parent_times;
+static int hf_gluster_cbk_upcall_flag_xattr;
+static int hf_gluster_cbk_upcall_flag_xattr_rm;
 
 /* procedures for GLUSTER_HNDSK_PROGRAM */
 static int
diff --git a/epan/dissectors/packet-gmhdr.c b/epan/dissectors/packet-gmhdr.c
index 6ff0eb39f1..1aa9385f9d 100644
--- a/epan/dissectors/packet-gmhdr.c
+++ b/epan/dissectors/packet-gmhdr.c
@@ -93,37 +93,37 @@ static gboolean gmhdr_summary_in_tree = TRUE;
 static gboolean gmtrailer_summary_in_tree = TRUE;
 static gboolean gmhdr_decode_timestamp_trailer = TRUE;
 
-static int proto_gmhdr = -1;
-static int proto_gmtrailer = -1;
-static int hf_gmhdr_srcport_g = -1;
-static int hf_gmhdr_srcport_g_plfm = -1;
-static int hf_gmhdr_srcport_g_gid = -1;
-static int hf_gmhdr_srcport_g_bid = -1;
-static int hf_gmhdr_srcport_g_pid = -1;
-static int hf_gmhdr_pktsize = -1;
-static int hf_gmhdr_timestamp = -1;
-static int hf_gmhdr_generic = -1;
-static int hf_gmhdr_etype = -1;
-static int hf_gmhdr_len = -1;
-static int hf_gmhdr_trailer = -1;
-static int hf_gmhdr_origcrc = -1;
-static int hf_gmhdr_srcport_h = -1;
-static int hf_gmhdr_srcport_h_plfm = -1;
-static int hf_gmhdr_srcport_h_gid = -1;
-static int hf_gmhdr_srcport_h_bid = -1;
-static int hf_gmhdr_srcport_h_sid = -1;
-static int hf_gmhdr_srcport_h_pid = -1;
-
-static int hf_gmtrailer_origcrc = -1;
-static int hf_gmtrailer_portid = -1;
-static int hf_gmtrailer_timestamp = -1;
-
-static gint ett_gmhdr = -1;
-static gint ett_srcport = -1;
-static gint ett_gmtrailer = -1;
-
-static expert_field ei_gmhdr_field_length_invalid = EI_INIT;
-static expert_field ei_gmhdr_len = EI_INIT;
+static int proto_gmhdr;
+static int proto_gmtrailer;
+static int hf_gmhdr_srcport_g;
+static int hf_gmhdr_srcport_g_plfm;
+static int hf_gmhdr_srcport_g_gid;
+static int hf_gmhdr_srcport_g_bid;
+static int hf_gmhdr_srcport_g_pid;
+static int hf_gmhdr_pktsize;
+static int hf_gmhdr_timestamp;
+static int hf_gmhdr_generic;
+static int hf_gmhdr_etype;
+static int hf_gmhdr_len;
+static int hf_gmhdr_trailer;
+static int hf_gmhdr_origcrc;
+static int hf_gmhdr_srcport_h;
+static int hf_gmhdr_srcport_h_plfm;
+static int hf_gmhdr_srcport_h_gid;
+static int hf_gmhdr_srcport_h_bid;
+static int hf_gmhdr_srcport_h_sid;
+static int hf_gmhdr_srcport_h_pid;
+
+static int hf_gmtrailer_origcrc;
+static int hf_gmtrailer_portid;
+static int hf_gmtrailer_timestamp;
+
+static gint ett_gmhdr;
+static gint ett_srcport;
+static gint ett_gmtrailer;
+
+static expert_field ei_gmhdr_field_length_invalid;
+static expert_field ei_gmhdr_len;
 
 static void
 dissect_gmtlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *gmhdr_tree, guint offset, guint16 length)
diff --git a/epan/dissectors/packet-gmr1_bcch.c b/epan/dissectors/packet-gmr1_bcch.c
index 57d463291e..ae154ed8a8 100644
--- a/epan/dissectors/packet-gmr1_bcch.c
+++ b/epan/dissectors/packet-gmr1_bcch.c
@@ -24,121 +24,121 @@
 void proto_register_gmr1_bcch(void);
 
 /* GMR-1 BCCH proto */
-static int proto_gmr1_bcch = -1;
+static int proto_gmr1_bcch;
 
 /* GMR-1 BCCH sub tree */
-static gint ett_gmr1_bcch = -1;
+static gint ett_gmr1_bcch;
 
-static expert_field ei_unknown_segment = EI_INIT;
+static expert_field ei_unknown_segment;
 
 /* ------------------------------------------------------------------------ */
 /* CSN1 fields                                                              */
 /* ------------------------------------------------------------------------ */
 
 /* Segment 1A fields - [3] 11.5.2.66 */
-static int hf_seg1a_class_2_version = -1;
-static int hf_seg1a_class_3_version = -1;
+static int hf_seg1a_class_2_version;
+static int hf_seg1a_class_3_version;
 
-static int hf_seg1a_syncinfo_sb_frame_ts_offset = -1;
-static int hf_seg1a_syncinfo_sb_symbol_offset = -1;
-static int hf_seg1a_syncinfo_sa_freq_offset = -1;
+static int hf_seg1a_syncinfo_sb_frame_ts_offset;
+static int hf_seg1a_syncinfo_sb_symbol_offset;
+static int hf_seg1a_syncinfo_sa_freq_offset;
 
-static int hf_seg1a_rachctrl_max_retrans = -1;
+static int hf_seg1a_rachctrl_max_retrans;
 static int hf_seg1a_rachctrl_acc[16];
-static int hf_seg1a_rachctrl_cell_bar_access = -1;
+static int hf_seg1a_rachctrl_cell_bar_access;
 
-static int hf_seg1a_miscinfo_sb_reselection_hysteresis = -1;
-static int hf_seg1a_miscinfo_spare = -1;
-static int hf_seg1a_miscinfo_priority_access_ind = -1;
+static int hf_seg1a_miscinfo_sb_reselection_hysteresis;
+static int hf_seg1a_miscinfo_spare;
+static int hf_seg1a_miscinfo_priority_access_ind;
 
-static int hf_seg1a_gbch_present = -1;
-static int hf_seg1a_test_gs = -1;
-static int hf_seg1a_test_gs2 = -1;
-static int hf_seg1a_spare1 = -1;
-static int hf_seg1a_cell_bar_access_extension2 = -1;
-static int hf_seg1a_spare2 = -1;
-static int hf_seg1a_cell_bar_access_extension = -1;
+static int hf_seg1a_gbch_present;
+static int hf_seg1a_test_gs;
+static int hf_seg1a_test_gs2;
+static int hf_seg1a_spare1;
+static int hf_seg1a_cell_bar_access_extension2;
+static int hf_seg1a_spare2;
+static int hf_seg1a_cell_bar_access_extension;
 
 /* Segment 2A & 2Abis fields - [3] 11.5.2.67 / 11.5.2.68 */
-static int hf_seg2a_class_4_version = -1;
+static int hf_seg2a_class_4_version;
 
-static int hf_seg2a_syncinfo_sa_sirfn_delay = -1;
-static int hf_seg2a_syncinfo_sa_bcch_stn = -1;
-static int hf_seg2a_syncinfo_superframe_num = -1;
-static int hf_seg2a_syncinfo_multiframe_num = -1;
-static int hf_seg2a_syncinfo_mffn_high_bit = -1;
+static int hf_seg2a_syncinfo_sa_sirfn_delay;
+static int hf_seg2a_syncinfo_sa_bcch_stn;
+static int hf_seg2a_syncinfo_superframe_num;
+static int hf_seg2a_syncinfo_multiframe_num;
+static int hf_seg2a_syncinfo_mffn_high_bit;
 
-static int hf_seg2a_selcrit_rxlev_select_min = -1;
+static int hf_seg2a_selcrit_rxlev_select_min;
 
-static int hf_seg2a_miscinfo_sb_selection_power = -1;
+static int hf_seg2a_miscinfo_sb_selection_power;
 
-static int hf_seg2a_lainfo_sa_pch_config = -1;
-static int hf_seg2a_lainfo_sa_bach_config = -1;
-static int hf_seg2a_lainfo_rach_ts_offset = -1;
-static int hf_seg2a_lainfo_n_page_occurrences = -1;
-static int hf_seg2a_lainfo_imsi_attach_detach_ind = -1;
-static int hf_seg2a_lainfo_ecsc_indication = -1;
-static int hf_seg2a_lainfo_si_update_ind = -1;
+static int hf_seg2a_lainfo_sa_pch_config;
+static int hf_seg2a_lainfo_sa_bach_config;
+static int hf_seg2a_lainfo_rach_ts_offset;
+static int hf_seg2a_lainfo_n_page_occurrences;
+static int hf_seg2a_lainfo_imsi_attach_detach_ind;
+static int hf_seg2a_lainfo_ecsc_indication;
+static int hf_seg2a_lainfo_si_update_ind;
 
-static int hf_seg2a_class_type = -1;
-static int hf_seg2a_segment_type_a = -1;
-static int hf_seg2a_segment_type_abis = -1;
+static int hf_seg2a_class_type;
+static int hf_seg2a_segment_type_a;
+static int hf_seg2a_segment_type_abis;
 
 /* Segment 2B fields */
-static int hf_seg2b_segment_type_b = -1;
+static int hf_seg2b_segment_type_b;
 /* Segment 2Bbis fields */
-static int hf_seg2b_segment_type_bbis = -1;
+static int hf_seg2b_segment_type_bbis;
 
 /* Segment 3A fields - [1] 11.5.2.71 */
-static int hf_seg3a_class_type = -1;
-static int hf_seg3a_segment_type_a = -1;
-static int hf_seg3a_lai_dissector = -1;
-static int hf_seg3a_lai_mcc = -1;
-static int hf_seg3a_lai_mnc = -1;
-static int hf_seg3a_lai_lac = -1;
-static int hf_seg3a_lai_msc_id = -1;
-static int hf_seg3a_lai_spot_beam_id = -1;
-
-static int hf_seg3a_system_sat_id = -1;
-static int hf_seg3a_system_sys_id = -1;
-
-static int hf_seg3a_satpos_latitude = -1;
-static int hf_seg3a_satpos_longitude = -1;
-static int hf_seg3a_satpos_radius = -1;
-
-static int hf_seg3a_beam_latitude = -1;
-static int hf_seg3a_beam_longitude = -1;
-
-static int hf_seg3a_miscinfo_sb_reselection_timer = -1;
-
-static int hf_seg3a_spare = -1;
-
-static int hf_seg3b_segment_type_b = -1;
-static int hf_seg3b_segment_type_bbis = -1;
-static int hf_seg3c_segment_type_c = -1;
-static int hf_seg3d_segment_type_d = -1;
-static int hf_seg3e_segment_type_e = -1;
-static int hf_seg3e_segment_type_ebis = -1;
-static int hf_seg3f_segment_type_f = -1;
-static int hf_seg3g_segment_type_g = -1;
-static int hf_seg3g_segment_type_gbis = -1;
-static int hf_seg3h_segment_type_h = -1;
-static int hf_seg3i_segment_type_i = -1;
-static int hf_seg3j_segment_type_j = -1;
-static int hf_seg3j_segment_type_jbis = -1;
-static int hf_seg3k_segment_type_kbis = -1;
-static int hf_seg4a_class_type = -1;
-static int hf_seg4a_segment_type_a = -1;
-static int hf_seg4b_segment_type_b = -1;
-static int hf_seg4c_segment_type_c = -1;
-static int hf_seg4d_segment_type_d = -1;
-static int hf_seg4e_segment_type_e = -1;
-static int hf_seg4f_segment_type_f = -1;
-static int hf_seg4g_segment_type_g = -1;
-static int hf_seg4h_segment_type_h = -1;
-static int hf_seg4i_segment_type_i = -1;
-static int hf_seg4j_segment_type_j = -1;
-static int hf_seg4k_segment_type_k = -1;
+static int hf_seg3a_class_type;
+static int hf_seg3a_segment_type_a;
+static int hf_seg3a_lai_dissector;
+static int hf_seg3a_lai_mcc;
+static int hf_seg3a_lai_mnc;
+static int hf_seg3a_lai_lac;
+static int hf_seg3a_lai_msc_id;
+static int hf_seg3a_lai_spot_beam_id;
+
+static int hf_seg3a_system_sat_id;
+static int hf_seg3a_system_sys_id;
+
+static int hf_seg3a_satpos_latitude;
+static int hf_seg3a_satpos_longitude;
+static int hf_seg3a_satpos_radius;
+
+static int hf_seg3a_beam_latitude;
+static int hf_seg3a_beam_longitude;
+
+static int hf_seg3a_miscinfo_sb_reselection_timer;
+
+static int hf_seg3a_spare;
+
+static int hf_seg3b_segment_type_b;
+static int hf_seg3b_segment_type_bbis;
+static int hf_seg3c_segment_type_c;
+static int hf_seg3d_segment_type_d;
+static int hf_seg3e_segment_type_e;
+static int hf_seg3e_segment_type_ebis;
+static int hf_seg3f_segment_type_f;
+static int hf_seg3g_segment_type_g;
+static int hf_seg3g_segment_type_gbis;
+static int hf_seg3h_segment_type_h;
+static int hf_seg3i_segment_type_i;
+static int hf_seg3j_segment_type_j;
+static int hf_seg3j_segment_type_jbis;
+static int hf_seg3k_segment_type_kbis;
+static int hf_seg4a_class_type;
+static int hf_seg4a_segment_type_a;
+static int hf_seg4b_segment_type_b;
+static int hf_seg4c_segment_type_c;
+static int hf_seg4d_segment_type_d;
+static int hf_seg4e_segment_type_e;
+static int hf_seg4f_segment_type_f;
+static int hf_seg4g_segment_type_g;
+static int hf_seg4h_segment_type_h;
+static int hf_seg4i_segment_type_i;
+static int hf_seg4j_segment_type_j;
+static int hf_seg4k_segment_type_k;
 
 /* Segment 3B fields */
 /* Segment 3Bbis fields */
@@ -169,12 +169,12 @@ static int hf_seg4k_segment_type_k = -1;
 /* Segment 4K fields */
 
 /* System Information fields [1] 10.1.31 & 10.1.32 */
-static int hf_si1_segment_choice = -1;
-static int hf_si_protocol_version = -1;
-static int hf_si_block_type = -1;
-static int hf_si_spare = -1;
+static int hf_si1_segment_choice;
+static int hf_si_protocol_version;
+static int hf_si_block_type;
+static int hf_si_spare;
 
-static int hf_si1_randomization_period = -1;
+static int hf_si1_randomization_period;
 
 
 /* ------------------------------------------------------------------------ */
diff --git a/epan/dissectors/packet-gmr1_common.c b/epan/dissectors/packet-gmr1_common.c
index ff122afcb3..f110af69f9 100644
--- a/epan/dissectors/packet-gmr1_common.c
+++ b/epan/dissectors/packet-gmr1_common.c
@@ -29,7 +29,7 @@
 void proto_register_gmr1_common(void);
 
 /* GMR-1 Common proto */
-static int proto_gmr1_common = -1;
+static int proto_gmr1_common;
 
 
 /* ------------------------------------------------------------------------ */
@@ -73,26 +73,26 @@ value_string_ext gmr1_ie_common_strings_ext = VALUE_STRING_EXT_INIT(gmr1_ie_comm
 gint ett_gmr1_ie_common[NUM_GMR1_IE_COMMON];
 
 /* Fields */
-int hf_gmr1_skip_ind = -1;
-int hf_gmr1_l3_pd = -1;
-int hf_gmr1_elem_id = -1;
-int hf_gmr1_len = -1;
-
-static int hf_com_cm2_spare1 = -1;
-static int hf_com_cm2_revision = -1;
-static int hf_com_cm2_early_send = -1;
-static int hf_com_cm2_a5_1 = -1;
-static int hf_com_cm2_mes_type = -1;
-static int hf_com_cm2_spare2 = -1;
-static int hf_com_cm2_ss_screen_ind = -1;
-static int hf_com_cm2_sms_cap = -1;
-static int hf_com_cm2_spare3 = -1;
-static int hf_com_cm2_freq_cap = -1;
-static int hf_com_cm2_cm3_presence = -1;
-static int hf_com_cm2_spare4 = -1;
-static int hf_com_cm2_a5_3 = -1;
-static int hf_com_cm2_a5_2_gmr1 = -1;
-static int hf_com_spare_nibble = -1;
+int hf_gmr1_skip_ind;
+int hf_gmr1_l3_pd;
+int hf_gmr1_elem_id;
+int hf_gmr1_len;
+
+static int hf_com_cm2_spare1;
+static int hf_com_cm2_revision;
+static int hf_com_cm2_early_send;
+static int hf_com_cm2_a5_1;
+static int hf_com_cm2_mes_type;
+static int hf_com_cm2_spare2;
+static int hf_com_cm2_ss_screen_ind;
+static int hf_com_cm2_sms_cap;
+static int hf_com_cm2_spare3;
+static int hf_com_cm2_freq_cap;
+static int hf_com_cm2_cm3_presence;
+static int hf_com_cm2_spare4;
+static int hf_com_cm2_a5_3;
+static int hf_com_cm2_a5_2_gmr1;
+static int hf_com_spare_nibble;
 
 /* [1] 11.5.1.6 - Mobile Earth Station Classmark 2 */
 static const value_string com_cm2_revision_vals[] = {
diff --git a/epan/dissectors/packet-gmr1_dtap.c b/epan/dissectors/packet-gmr1_dtap.c
index 914f7c3583..4a99eb5ae1 100644
--- a/epan/dissectors/packet-gmr1_dtap.c
+++ b/epan/dissectors/packet-gmr1_dtap.c
@@ -25,14 +25,14 @@ void proto_register_gmr1_dtap(void);
 void proto_reg_handoff_gmr1_dtap(void);
 
 /* GMR-1 DTAP proto */
-static int proto_gmr1_dtap = -1;
+static int proto_gmr1_dtap;
 
-static int hf_gmr1_dtap_protocol_discriminator = -1;
-static int hf_gmr1_dtap_message_elements = -1;
+static int hf_gmr1_dtap_protocol_discriminator;
+static int hf_gmr1_dtap_message_elements;
 
 /* GMR-1 DTAP sub tree */
-static gint ett_gmr1_dtap = -1;
-static gint ett_gmr1_pd = -1;
+static gint ett_gmr1_dtap;
+static gint ett_gmr1_pd;
 
 /* Handoffs */
 static dissector_handle_t gsm_dtap_handle;
diff --git a/epan/dissectors/packet-gmr1_rach.c b/epan/dissectors/packet-gmr1_rach.c
index 5d0dff10c9..61561141c4 100644
--- a/epan/dissectors/packet-gmr1_rach.c
+++ b/epan/dissectors/packet-gmr1_rach.c
@@ -27,68 +27,68 @@
 void proto_register_gmr1_rach(void);
 
 /* GMR-1 RACH proto */
-static int proto_gmr1_rach = -1;
+static int proto_gmr1_rach;
 
 /* GMR-1 RACH subtrees */
-static gint ett_rach_msg = -1;
-static gint ett_rach_kls1 = -1;
-static gint ett_rach_kls2 = -1;
-static gint ett_rach_gmprs_type1_kls2 = -1;
-static gint ett_rach_gmprs_type2_kls2 = -1;
-static gint ett_rach_est_cause = -1;
-static gint ett_rach_dialed_num = -1;
-static gint ett_rach_gps_pos = -1;
-static gint ett_rach_gmprs_req_type = -1;
+static gint ett_rach_msg;
+static gint ett_rach_kls1;
+static gint ett_rach_kls2;
+static gint ett_rach_gmprs_type1_kls2;
+static gint ett_rach_gmprs_type2_kls2;
+static gint ett_rach_est_cause;
+static gint ett_rach_dialed_num;
+static gint ett_rach_gps_pos;
+static gint ett_rach_gmprs_req_type;
 
 /* Fields */
-static int hf_rach_prio = -1;
-static int hf_rach_est_cause = -1;
-static int hf_rach_est_cause_moc = -1;
-static int hf_rach_est_cause_pag_resp = -1;
-static int hf_rach_num_plan = -1;
-static int hf_rach_chan_needed = -1;
-static int hf_rach_retry_cnt = -1;
-static int hf_rach_precorr = -1;
-static int hf_rach_rand_ref = -1;
-
-static int hf_rach_gps_pos_cpi = -1;
-static int hf_rach_gps_pos_lat = -1;
-static int hf_rach_gps_pos_long = -1;
-
-static int hf_rach_mes_pwr_class = -1;
-static int hf_rach_sp_hplmn_id = -1;
-static int hf_rach_pd = -1;
-static int hf_rach_number = -1;
-static int hf_rach_number_grp1 = -1;
-static int hf_rach_number_grp2 = -1;
-static int hf_rach_number_grp3 = -1;
-static int hf_rach_number_grp4 = -1;
-static int hf_rach_number_grp5 = -1;
-static int hf_rach_msc_id = -1;
-static int hf_rach_gps_timestamp = -1;
-static int hf_rach_software_version = -1;
-static int hf_rach_spare = -1;
-static int hf_rach_gci = -1;
-static int hf_rach_r = -1;
-static int hf_rach_o = -1;
-static int hf_rach_number_type = -1;
-
-static int hf_rach_gmprs_term_type = -1;
-static int hf_rach_gmprs_radio_prio = -1;
-static int hf_rach_gmprs_tlli = -1;
-static int hf_rach_gmprs_num_rlc_blks = -1;
-static int hf_rach_gmprs_peak_tput = -1;
-static int hf_rach_gmprs_dl_peak_tput = -1;
-static int hf_rach_gmprs_ul_peak_tput = -1;
-static int hf_rach_gmprs_rlc_mode = -1;
-static int hf_rach_gmprs_llc_mode = -1;
-static int hf_rach_gmprs_spare1 = -1;
-static int hf_rach_gmprs_spare2 = -1;
-static int hf_rach_gmprs_spare3 = -1;
-static int hf_rach_gmprs_reserved1 = -1;
-static int hf_rach_gmprs_req_type = -1;
-static int hf_rach_gmprs_req_type_pag_resp = -1;
-static int hf_rach_gmprs_chan_needed = -1;
+static int hf_rach_prio;
+static int hf_rach_est_cause;
+static int hf_rach_est_cause_moc;
+static int hf_rach_est_cause_pag_resp;
+static int hf_rach_num_plan;
+static int hf_rach_chan_needed;
+static int hf_rach_retry_cnt;
+static int hf_rach_precorr;
+static int hf_rach_rand_ref;
+
+static int hf_rach_gps_pos_cpi;
+static int hf_rach_gps_pos_lat;
+static int hf_rach_gps_pos_long;
+
+static int hf_rach_mes_pwr_class;
+static int hf_rach_sp_hplmn_id;
+static int hf_rach_pd;
+static int hf_rach_number;
+static int hf_rach_number_grp1;
+static int hf_rach_number_grp2;
+static int hf_rach_number_grp3;
+static int hf_rach_number_grp4;
+static int hf_rach_number_grp5;
+static int hf_rach_msc_id;
+static int hf_rach_gps_timestamp;
+static int hf_rach_software_version;
+static int hf_rach_spare;
+static int hf_rach_gci;
+static int hf_rach_r;
+static int hf_rach_o;
+static int hf_rach_number_type;
+
+static int hf_rach_gmprs_term_type;
+static int hf_rach_gmprs_radio_prio;
+static int hf_rach_gmprs_tlli;
+static int hf_rach_gmprs_num_rlc_blks;
+static int hf_rach_gmprs_peak_tput;
+static int hf_rach_gmprs_dl_peak_tput;
+static int hf_rach_gmprs_ul_peak_tput;
+static int hf_rach_gmprs_rlc_mode;
+static int hf_rach_gmprs_llc_mode;
+static int hf_rach_gmprs_spare1;
+static int hf_rach_gmprs_spare2;
+static int hf_rach_gmprs_spare3;
+static int hf_rach_gmprs_reserved1;
+static int hf_rach_gmprs_req_type;
+static int hf_rach_gmprs_req_type_pag_resp;
+static int hf_rach_gmprs_chan_needed;
 
 
 static const true_false_string rach_prio_tfs = {
diff --git a/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c
index 5923cf3e9a..3d4a512c54 100644
--- a/epan/dissectors/packet-gmr1_rr.c
+++ b/epan/dissectors/packet-gmr1_rr.c
@@ -30,15 +30,15 @@
 void proto_register_gmr1_rr(void);
 
 /* GMR-1 RR and CCCH proto */
-static int proto_gmr1_rr = -1;
-static int proto_gmr1_ccch = -1;
+static int proto_gmr1_rr;
+static int proto_gmr1_ccch;
 
 /* Fallback CCCH sub tree */
-static gint ett_msg_ccch = -1;
+static gint ett_msg_ccch;
 
-static gint ett_rr_pd = -1;
+static gint ett_rr_pd;
 
-static expert_field ei_gmr1_missing_mandatory_element = EI_INIT;
+static expert_field ei_gmr1_missing_mandatory_element;
 
 
 /* ------------------------------------------------------------------------ */
@@ -154,103 +154,103 @@ gint ett_gmr1_ie_rr[NUM_GMR1_IE_RR];
 
 
 /* Fields */
-static int hf_rr_msg_type = -1;
-static int hf_rr_chan_desc_kab_loc = -1;
-static int hf_rr_chan_desc_rx_tn = -1;
-static int hf_rr_chan_desc_arfcn = -1;
-static int hf_rr_chan_desc_tx_tn = -1;
-static int hf_rr_chan_desc_chan_type = -1;
-static int hf_rr_chan_mode = -1;
-static int hf_rr_ciph_mode_setting_sc = -1;
-static int hf_rr_ciph_mode_setting_algo = -1;
-static int hf_rr_ciph_resp_cr = -1;
-static int hf_rr_ciph_resp_spare = -1;
-static int hf_rr_l2_pseudo_len = -1;
-static int hf_rr_page_mode = -1;
-static int hf_rr_page_mode_spare = -1;
-static int hf_rr_req_ref_est_cause = -1;
-static int hf_rr_req_ref_ra = -1;
-static int hf_rr_req_ref_fn = -1;
-static int hf_rr_cause = -1;
-static int hf_rr_timing_ofs_ti = -1;
-static int hf_rr_timing_ofs_value = -1;
-static int hf_rr_tmsi_ptmsi = -1;
-static int hf_rr_wait_ind_timeout = -1;
-static int hf_rr_mif_mes1_ab = -1;
-static int hf_rr_mif_mes1_i = -1;
-static int hf_rr_mif_mes1_d = -1;
-static int hf_rr_mif_mes2 = -1;
-static int hf_rr_mif_mes3 = -1;
-static int hf_rr_mif_mes4 = -1;
-static int hf_rr_mif_pv = -1;
-static int hf_rr_freq_ofs_fi = -1;
-static int hf_rr_freq_ofs_value = -1;
-static int hf_rr_freq_ofs_spare = -1;
-static int hf_rr_page_info_msc_id = -1;
-static int hf_rr_page_info_chan_needed = -1;
-static int hf_rr_pos_display_flag = -1;
-static int hf_rr_pos_display_text = -1;
-static int hf_rr_pos_upd_info_v = -1;
-static int hf_rr_pos_upd_info_dist = -1;
-static int hf_rr_pos_upd_info_time = -1;
-static int hf_rr_bcch_carrier_arfcn = -1;
-static int hf_rr_bcch_carrier_si = -1;
-static int hf_rr_bcch_carrier_ri = -1;
-static int hf_rr_bcch_carrier_spare = -1;
-static int hf_rr_reject_cause = -1;
-static int hf_rr_reject_cause_b = -1;
-static int hf_rr_gps_timestamp = -1;
-static int hf_rr_gps_power_control_params = -1;
+static int hf_rr_msg_type;
+static int hf_rr_chan_desc_kab_loc;
+static int hf_rr_chan_desc_rx_tn;
+static int hf_rr_chan_desc_arfcn;
+static int hf_rr_chan_desc_tx_tn;
+static int hf_rr_chan_desc_chan_type;
+static int hf_rr_chan_mode;
+static int hf_rr_ciph_mode_setting_sc;
+static int hf_rr_ciph_mode_setting_algo;
+static int hf_rr_ciph_resp_cr;
+static int hf_rr_ciph_resp_spare;
+static int hf_rr_l2_pseudo_len;
+static int hf_rr_page_mode;
+static int hf_rr_page_mode_spare;
+static int hf_rr_req_ref_est_cause;
+static int hf_rr_req_ref_ra;
+static int hf_rr_req_ref_fn;
+static int hf_rr_cause;
+static int hf_rr_timing_ofs_ti;
+static int hf_rr_timing_ofs_value;
+static int hf_rr_tmsi_ptmsi;
+static int hf_rr_wait_ind_timeout;
+static int hf_rr_mif_mes1_ab;
+static int hf_rr_mif_mes1_i;
+static int hf_rr_mif_mes1_d;
+static int hf_rr_mif_mes2;
+static int hf_rr_mif_mes3;
+static int hf_rr_mif_mes4;
+static int hf_rr_mif_pv;
+static int hf_rr_freq_ofs_fi;
+static int hf_rr_freq_ofs_value;
+static int hf_rr_freq_ofs_spare;
+static int hf_rr_page_info_msc_id;
+static int hf_rr_page_info_chan_needed;
+static int hf_rr_pos_display_flag;
+static int hf_rr_pos_display_text;
+static int hf_rr_pos_upd_info_v;
+static int hf_rr_pos_upd_info_dist;
+static int hf_rr_pos_upd_info_time;
+static int hf_rr_bcch_carrier_arfcn;
+static int hf_rr_bcch_carrier_si;
+static int hf_rr_bcch_carrier_ri;
+static int hf_rr_bcch_carrier_spare;
+static int hf_rr_reject_cause;
+static int hf_rr_reject_cause_b;
+static int hf_rr_gps_timestamp;
+static int hf_rr_gps_power_control_params;
 static int hf_rr_tmsi_avail_msk_tmsi[4];
-static int hf_rr_gps_almanac_pn = -1;
-static int hf_rr_gps_almanac_wn = -1;
-static int hf_rr_gps_almanac_word = -1;
-static int hf_rr_gps_almanac_sfn = -1;
-static int hf_rr_gps_almanac_co = -1;
-static int hf_rr_gps_almanac_spare = -1;
-static int hf_rr_msc_id = -1;
-static int hf_rr_msc_id_spare = -1;
-static int hf_rr_gps_discr = -1;
-static int hf_rr_pkt_imm_ass_3_prm_rlc_mode = -1;
-static int hf_rr_pkt_imm_ass_3_prm_spare = -1;
-static int hf_rr_pkt_imm_ass_3_prm_dl_tfi = -1;
-static int hf_rr_pkt_imm_ass_3_prm_start_fn = -1;
-static int hf_rr_pkt_imm_ass_3_prm_mac_slot_alloc = -1;
-static int hf_rr_pkt_freq_prm_arfcn = -1;
-static int hf_rr_pkt_freq_prm_dl_freq_plan_id = -1;
-static int hf_rr_pkt_freq_prm_dl_bw = -1;
-static int hf_rr_pkt_freq_prm_ul_freq_dist = -1;
-static int hf_rr_pkt_freq_prm_ul_bw = -1;
-static int hf_rr_pkt_freq_prm_spare = -1;
-static int hf_rr_pkt_imm_ass_2_prm_ac_spare1 = -1;
-static int hf_rr_pkt_imm_ass_2_prm_ac_final_alloc = -1;
-static int hf_rr_pkt_imm_ass_2_prm_ac_usf_granularity = -1;
-static int hf_rr_pkt_imm_ass_2_prm_ac_dl_ctl_mac_slot = -1;
-static int hf_rr_pkt_imm_ass_2_prm_ac_mac_mode = -1;
-static int hf_rr_pkt_imm_ass_2_prm_ac_start_fn = -1;
-static int hf_rr_pkt_imm_ass_2_prm_ac_rlc_dblk_gnt = -1;
-static int hf_rr_pkt_imm_ass_2_prm_ac_mcs = -1;
-static int hf_rr_pkt_imm_ass_2_prm_ac_tfi = -1;
-static int hf_rr_pkt_imm_ass_2_prm_ac_spare2 = -1;
-static int hf_rr_pkt_imm_ass_2_prm_ac_mac_slot_alloc = -1;
-static int hf_rr_pkt_imm_ass_2_prm_d_chan_mcs_cmd = -1;
-static int hf_rr_pkt_imm_ass_2_prm_d_chan_mcs_cmd_pnb512 = -1;
-static int hf_rr_pkt_imm_ass_2_prm_d_spare1 = -1;
-static int hf_rr_pkt_imm_ass_2_prm_d_rlc_dblk_gnt = -1;
-static int hf_rr_pkt_imm_ass_2_prm_d_spare2 = -1;
-static int hf_rr_pkt_imm_ass_2_prm_d_tfi = -1;
-static int hf_rr_pkt_imm_ass_2_prm_d_usf_granularity = -1;
-static int hf_rr_pkt_imm_ass_2_prm_d_mac_slot_alloc = -1;
-static int hf_rr_usf_value = -1;
-static int hf_rr_usf_spare = -1;
-static int hf_rr_timing_adv_idx_value = -1;
-static int hf_rr_timing_adv_idx_spare = -1;
-static int hf_rr_tlli = -1;
-static int hf_rr_pkt_pwr_ctrl_prm_par = -1;
-static int hf_rr_pkt_pwr_ctrl_prm_spare = -1;
+static int hf_rr_gps_almanac_pn;
+static int hf_rr_gps_almanac_wn;
+static int hf_rr_gps_almanac_word;
+static int hf_rr_gps_almanac_sfn;
+static int hf_rr_gps_almanac_co;
+static int hf_rr_gps_almanac_spare;
+static int hf_rr_msc_id;
+static int hf_rr_msc_id_spare;
+static int hf_rr_gps_discr;
+static int hf_rr_pkt_imm_ass_3_prm_rlc_mode;
+static int hf_rr_pkt_imm_ass_3_prm_spare;
+static int hf_rr_pkt_imm_ass_3_prm_dl_tfi;
+static int hf_rr_pkt_imm_ass_3_prm_start_fn;
+static int hf_rr_pkt_imm_ass_3_prm_mac_slot_alloc;
+static int hf_rr_pkt_freq_prm_arfcn;
+static int hf_rr_pkt_freq_prm_dl_freq_plan_id;
+static int hf_rr_pkt_freq_prm_dl_bw;
+static int hf_rr_pkt_freq_prm_ul_freq_dist;
+static int hf_rr_pkt_freq_prm_ul_bw;
+static int hf_rr_pkt_freq_prm_spare;
+static int hf_rr_pkt_imm_ass_2_prm_ac_spare1;
+static int hf_rr_pkt_imm_ass_2_prm_ac_final_alloc;
+static int hf_rr_pkt_imm_ass_2_prm_ac_usf_granularity;
+static int hf_rr_pkt_imm_ass_2_prm_ac_dl_ctl_mac_slot;
+static int hf_rr_pkt_imm_ass_2_prm_ac_mac_mode;
+static int hf_rr_pkt_imm_ass_2_prm_ac_start_fn;
+static int hf_rr_pkt_imm_ass_2_prm_ac_rlc_dblk_gnt;
+static int hf_rr_pkt_imm_ass_2_prm_ac_mcs;
+static int hf_rr_pkt_imm_ass_2_prm_ac_tfi;
+static int hf_rr_pkt_imm_ass_2_prm_ac_spare2;
+static int hf_rr_pkt_imm_ass_2_prm_ac_mac_slot_alloc;
+static int hf_rr_pkt_imm_ass_2_prm_d_chan_mcs_cmd;
+static int hf_rr_pkt_imm_ass_2_prm_d_chan_mcs_cmd_pnb512;
+static int hf_rr_pkt_imm_ass_2_prm_d_spare1;
+static int hf_rr_pkt_imm_ass_2_prm_d_rlc_dblk_gnt;
+static int hf_rr_pkt_imm_ass_2_prm_d_spare2;
+static int hf_rr_pkt_imm_ass_2_prm_d_tfi;
+static int hf_rr_pkt_imm_ass_2_prm_d_usf_granularity;
+static int hf_rr_pkt_imm_ass_2_prm_d_mac_slot_alloc;
+static int hf_rr_usf_value;
+static int hf_rr_usf_spare;
+static int hf_rr_timing_adv_idx_value;
+static int hf_rr_timing_adv_idx_spare;
+static int hf_rr_tlli;
+static int hf_rr_pkt_pwr_ctrl_prm_par;
+static int hf_rr_pkt_pwr_ctrl_prm_spare;
 static int hf_rr_persistence_lvl[4];
-static int hf_rr_protocol_discriminator = -1;
-static int hf_rr_message_elements = -1;
+static int hf_rr_protocol_discriminator;
+static int hf_rr_message_elements;
 
 /* Generic display vals/func */
 static const value_string rr_gen_ie_presence_vals[] = {
diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c
index 6c61817f70..96d77a5f2e 100644
--- a/epan/dissectors/packet-gmrp.c
+++ b/epan/dissectors/packet-gmrp.c
@@ -21,22 +21,22 @@
 void proto_register_gmrp(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_gmrp = -1;
-static int hf_gmrp_proto_id = -1;
-static int hf_gmrp_attribute_type = -1;
-static int hf_gmrp_attribute_length = -1;
-static int hf_gmrp_attribute_event = -1;
-static int hf_gmrp_attribute_value_group_membership = -1;
-static int hf_gmrp_attribute_value_service_requirement = -1;
-static int hf_gmrp_end_of_mark = -1;
+static int proto_gmrp;
+static int hf_gmrp_proto_id;
+static int hf_gmrp_attribute_type;
+static int hf_gmrp_attribute_length;
+static int hf_gmrp_attribute_event;
+static int hf_gmrp_attribute_value_group_membership;
+static int hf_gmrp_attribute_value_service_requirement;
+static int hf_gmrp_end_of_mark;
 
 /* Initialize the subtree pointers */
-static gint ett_gmrp = -1;
-static gint ett_gmrp_message = -1;
-static gint ett_gmrp_attribute_list = -1;
-/*static gint ett_gmrp_attribute = -1;*/
+static gint ett_gmrp;
+static gint ett_gmrp_message;
+static gint ett_gmrp_attribute_list;
+/*static gint ett_gmrp_attribute;*/
 
-static expert_field ei_gmrp_proto_id = EI_INIT;
+static expert_field ei_gmrp_proto_id;
 
 
 /* Constant definitions */
diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c
index c060d38ac8..25cd162d91 100644
--- a/epan/dissectors/packet-gnutella.c
+++ b/epan/dissectors/packet-gnutella.c
@@ -25,48 +25,48 @@ static dissector_handle_t gnutella_handle;
  *	http://rfc-gnutella.sourceforge.net/developer/index.html
  */
 
-static int proto_gnutella = -1;
-
-static int hf_gnutella_stream = -1;
-
-static int hf_gnutella_header = -1;
-static int hf_gnutella_header_id = -1;
-static int hf_gnutella_header_payload = -1;
-static int hf_gnutella_header_ttl = -1;
-static int hf_gnutella_header_hops = -1;
-static int hf_gnutella_header_size = -1;
-
-static int hf_gnutella_pong_payload = -1;
-static int hf_gnutella_pong_port = -1;
-static int hf_gnutella_pong_ip = -1;
-static int hf_gnutella_pong_files = -1;
-static int hf_gnutella_pong_kbytes = -1;
-
-static int hf_gnutella_query_payload = -1;
-static int hf_gnutella_query_min_speed = -1;
-static int hf_gnutella_query_search = -1;
-
-static int hf_gnutella_queryhit_payload = -1;
-static int hf_gnutella_queryhit_count = -1;
-static int hf_gnutella_queryhit_port = -1;
-static int hf_gnutella_queryhit_ip = -1;
-static int hf_gnutella_queryhit_speed = -1;
-static int hf_gnutella_queryhit_extra = -1;
-static int hf_gnutella_queryhit_servent_id = -1;
-
-static int hf_gnutella_queryhit_hit = -1;
-static int hf_gnutella_queryhit_hit_index = -1;
-static int hf_gnutella_queryhit_hit_size = -1;
-static int hf_gnutella_queryhit_hit_name = -1;
-static int hf_gnutella_queryhit_hit_extra = -1;
-
-static int hf_gnutella_push_payload = -1;
-static int hf_gnutella_push_servent_id = -1;
-static int hf_gnutella_push_index = -1;
-static int hf_gnutella_push_ip = -1;
-static int hf_gnutella_push_port = -1;
-
-static gint ett_gnutella = -1;
+static int proto_gnutella;
+
+static int hf_gnutella_stream;
+
+static int hf_gnutella_header;
+static int hf_gnutella_header_id;
+static int hf_gnutella_header_payload;
+static int hf_gnutella_header_ttl;
+static int hf_gnutella_header_hops;
+static int hf_gnutella_header_size;
+
+static int hf_gnutella_pong_payload;
+static int hf_gnutella_pong_port;
+static int hf_gnutella_pong_ip;
+static int hf_gnutella_pong_files;
+static int hf_gnutella_pong_kbytes;
+
+static int hf_gnutella_query_payload;
+static int hf_gnutella_query_min_speed;
+static int hf_gnutella_query_search;
+
+static int hf_gnutella_queryhit_payload;
+static int hf_gnutella_queryhit_count;
+static int hf_gnutella_queryhit_port;
+static int hf_gnutella_queryhit_ip;
+static int hf_gnutella_queryhit_speed;
+static int hf_gnutella_queryhit_extra;
+static int hf_gnutella_queryhit_servent_id;
+
+static int hf_gnutella_queryhit_hit;
+static int hf_gnutella_queryhit_hit_index;
+static int hf_gnutella_queryhit_hit_size;
+static int hf_gnutella_queryhit_hit_name;
+static int hf_gnutella_queryhit_hit_extra;
+
+static int hf_gnutella_push_payload;
+static int hf_gnutella_push_servent_id;
+static int hf_gnutella_push_index;
+static int hf_gnutella_push_ip;
+static int hf_gnutella_push_port;
+
+static gint ett_gnutella;
 
 #define GNUTELLA_TCP_PORT	6346
 
diff --git a/epan/dissectors/packet-gopher.c b/epan/dissectors/packet-gopher.c
index 116c130d90..c53ecfe8f2 100644
--- a/epan/dissectors/packet-gopher.c
+++ b/epan/dissectors/packet-gopher.c
@@ -25,19 +25,19 @@ void proto_register_gopher(void);
 void proto_reg_handoff_gopher(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_gopher = -1;
-static int hf_gopher_request = -1;
-static int hf_gopher_dir_item = -1;
-static int hf_gopher_di_type = -1;
-static int hf_gopher_di_name = -1;
-static int hf_gopher_di_selector = -1;
-static int hf_gopher_di_host = -1;
-static int hf_gopher_di_port = -1;
-static int hf_gopher_unknown = -1;
+static int proto_gopher;
+static int hf_gopher_request;
+static int hf_gopher_dir_item;
+static int hf_gopher_di_type;
+static int hf_gopher_di_name;
+static int hf_gopher_di_selector;
+static int hf_gopher_di_host;
+static int hf_gopher_di_port;
+static int hf_gopher_unknown;
 
 /* Initialize the subtree pointers */
-static gint ett_gopher = -1;
-static gint ett_dir_item = -1;
+static gint ett_gopher;
+static gint ett_dir_item;
 
 static dissector_handle_t gopher_handle;
 
diff --git a/epan/dissectors/packet-gpef.c b/epan/dissectors/packet-gpef.c
index e92e73a29e..154408d6c1 100644
--- a/epan/dissectors/packet-gpef.c
+++ b/epan/dissectors/packet-gpef.c
@@ -19,18 +19,18 @@
 
 void proto_register_gpef(void);
 
-static int proto_gpef = -1;
-static int hf_gpef_keycount = -1;
-static int hf_gpef_efskey = -1;
-static int hf_gpef_efskey_length1 = -1;
-static int hf_gpef_efskey_length2 = -1;
-static int hf_gpef_efskey_sid_offset = -1;
-static int hf_gpef_efskey_cert_offset = -1;
-static int hf_gpef_efskey_cert_length = -1;
-static int hf_gpef_efskey_certificate = -1;
-
-static gint ett_gpef = -1;
-static gint ett_gpef_efskey = -1;
+static int proto_gpef;
+static int hf_gpef_keycount;
+static int hf_gpef_efskey;
+static int hf_gpef_efskey_length1;
+static int hf_gpef_efskey_length2;
+static int hf_gpef_efskey_sid_offset;
+static int hf_gpef_efskey_cert_offset;
+static int hf_gpef_efskey_cert_length;
+static int hf_gpef_efskey_certificate;
+
+static gint ett_gpef;
+static gint ett_gpef_efskey;
 
 
 /* MS-GPEF section 2.2.1.2.2 EfsKey*/
diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c
index cdc616b8b3..73778eee3f 100644
--- a/epan/dissectors/packet-gprs-llc.c
+++ b/epan/dissectors/packet-gprs-llc.c
@@ -36,54 +36,54 @@ void proto_reg_handoff_llcgprs(void);
 #define UI_HDR_LENGTH  3U
 
 /* Initialize the protocol and registered fields */
-static int proto_llcgprs       	  = -1;
-static int hf_llcgprs_pd       	  = -1;
-static int hf_llcgprs_fcs         = -1;
-static int hf_llcgprs_cr       	  = -1;
-static int hf_llcgprs_sapi     	  = -1;
-static int hf_llcgprs_sapib    	  = -1;
-static int hf_llcgprs_U_fmt    	  = -1; /* 3 upper bits in controlfield (UI format) */
-static int hf_llcgprs_sp_bits  	  = -1; /* Spare bits in control field */
-static int hf_llcgprs_NU       	  = -1; /* Transmited unconfirmed sequence number */
-static int hf_llcgprs_E_bit    	  = -1; /* Encryption mode bit */
-static int hf_llcgprs_PM_bit   	  = -1;
-static int hf_llcgprs_Un       	  = -1;
-static int hf_llcgprs_As      	  = -1;
-static int hf_llcgprs_ucom     	  = -1;
-static int hf_llcgprs_PF          = -1;
-static int hf_llcgprs_S_fmt       = -1;
-static int hf_llcgprs_NR          = -1;
-static int hf_llcgprs_sjsd        = -1;
-static int hf_llcgprs_k 	  = -1;
-static int hf_llcgprs_isack_ns 	  = -1;
-static int hf_llcgprs_isack_nr 	  = -1;
-static int hf_llcgprs_isack_sfb   = -1;
-static int hf_llcgprs_rbyte 	  = -1;
-static int hf_llcgprs_kmask 	  = -1;
-static int hf_llcgprs_ifmt 	  = -1;
-static int hf_llcgprs_Ai 	  = -1;
-static int hf_llcgprs_izerobit 	  = -1;
-static int hf_llcgprs_sspare 	  = -1;
-static int hf_llcgprs_xid_xl 	  = -1;
-static int hf_llcgprs_xid_type 	  = -1;
-static int hf_llcgprs_xid_len1 	  = -1;
-static int hf_llcgprs_xid_len2 	  = -1;
-static int hf_llcgprs_xid_spare   = -1;
-static int hf_llcgprs_xid_byte 	  = -1;
-static int hf_llcgprs_frmr_cf 	  = -1;
-static int hf_llcgprs_frmr_spare  = -1;
-static int hf_llcgprs_frmr_vs 	  = -1;
-static int hf_llcgprs_frmr_vr 	  = -1;
-static int hf_llcgprs_frmr_cr 	  = -1;
-static int hf_llcgprs_frmr_w4 	  = -1;
-static int hf_llcgprs_frmr_w3 	  = -1;
-static int hf_llcgprs_frmr_w2 	  = -1;
-static int hf_llcgprs_frmr_w1 	  = -1;
-static int hf_llcgprs_tom_rl 	  = -1;
-static int hf_llcgprs_tom_pd 	  = -1;
-static int hf_llcgprs_tom_header  = -1;
-static int hf_llcgprs_tom_data 	  = -1;
-static int hf_llcgprs_dummy_ui 	  = -1;
+static int proto_llcgprs;
+static int hf_llcgprs_pd;
+static int hf_llcgprs_fcs;
+static int hf_llcgprs_cr;
+static int hf_llcgprs_sapi;
+static int hf_llcgprs_sapib;
+static int hf_llcgprs_U_fmt; /* 3 upper bits in controlfield (UI format) */
+static int hf_llcgprs_sp_bits; /* Spare bits in control field */
+static int hf_llcgprs_NU; /* Transmited unconfirmed sequence number */
+static int hf_llcgprs_E_bit; /* Encryption mode bit */
+static int hf_llcgprs_PM_bit;
+static int hf_llcgprs_Un;
+static int hf_llcgprs_As;
+static int hf_llcgprs_ucom;
+static int hf_llcgprs_PF;
+static int hf_llcgprs_S_fmt;
+static int hf_llcgprs_NR;
+static int hf_llcgprs_sjsd;
+static int hf_llcgprs_k;
+static int hf_llcgprs_isack_ns;
+static int hf_llcgprs_isack_nr;
+static int hf_llcgprs_isack_sfb;
+static int hf_llcgprs_rbyte;
+static int hf_llcgprs_kmask;
+static int hf_llcgprs_ifmt;
+static int hf_llcgprs_Ai;
+static int hf_llcgprs_izerobit;
+static int hf_llcgprs_sspare;
+static int hf_llcgprs_xid_xl;
+static int hf_llcgprs_xid_type;
+static int hf_llcgprs_xid_len1;
+static int hf_llcgprs_xid_len2;
+static int hf_llcgprs_xid_spare;
+static int hf_llcgprs_xid_byte;
+static int hf_llcgprs_frmr_cf;
+static int hf_llcgprs_frmr_spare;
+static int hf_llcgprs_frmr_vs;
+static int hf_llcgprs_frmr_vr;
+static int hf_llcgprs_frmr_cr;
+static int hf_llcgprs_frmr_w4;
+static int hf_llcgprs_frmr_w3;
+static int hf_llcgprs_frmr_w2;
+static int hf_llcgprs_frmr_w1;
+static int hf_llcgprs_tom_rl;
+static int hf_llcgprs_tom_pd;
+static int hf_llcgprs_tom_header;
+static int hf_llcgprs_tom_data;
+static int hf_llcgprs_dummy_ui;
 
 /* Unnumbered Commands and Responses (U Frames) */
 #define U_DM	0x01
@@ -105,13 +105,13 @@ static int hf_llcgprs_dummy_ui 	  = -1;
 #define SAPI_LL11	0x0B
 
 /* Initialize the subtree pointers */
-static gint ett_llcgprs = -1;
-static gint ett_llcgprs_adf = -1;
-static gint ett_llcgprs_ctrlf = -1;
-static gint ett_llcgprs_ui = -1;
-static gint ett_llcgprs_sframe = -1;
+static gint ett_llcgprs;
+static gint ett_llcgprs_adf;
+static gint ett_llcgprs_ctrlf;
+static gint ett_llcgprs_ui;
+static gint ett_llcgprs_sframe;
 
-static expert_field ei_llcgprs_no_info_field = EI_INIT;
+static expert_field ei_llcgprs_no_info_field;
 
 static dissector_handle_t sndcp_xid_handle;
 static dissector_handle_t gprs_llc_handle;
diff --git a/epan/dissectors/packet-gquic.c b/epan/dissectors/packet-gquic.c
index 36053c01db..57da192286 100644
--- a/epan/dissectors/packet-gquic.c
+++ b/epan/dissectors/packet-gquic.c
@@ -34,177 +34,177 @@ static dissector_handle_t gquic_handle;
 static dissector_handle_t tls13_handshake_handle;
 static dissector_handle_t quic_handle;
 
-static int proto_gquic = -1;
-static int hf_gquic_header_form = -1;
-static int hf_gquic_fixed_bit = -1;
-static int hf_gquic_long_packet_type = -1;
-static int hf_gquic_long_reserved = -1;
-static int hf_gquic_packet_number_length = -1;
-static int hf_gquic_dcil = -1;
-static int hf_gquic_scil = -1;
-static int hf_gquic_puflags = -1;
-static int hf_gquic_puflags_vrsn = -1;
-static int hf_gquic_puflags_rst = -1;
-static int hf_gquic_puflags_dnonce = -1;
-static int hf_gquic_puflags_cid = -1;
-static int hf_gquic_puflags_cid_old = -1;
-static int hf_gquic_puflags_pkn = -1;
-static int hf_gquic_puflags_mpth = -1;
-static int hf_gquic_puflags_rsv = -1;
-static int hf_gquic_cid = -1;
-static int hf_gquic_version = -1;
-static int hf_gquic_diversification_nonce = -1;
-static int hf_gquic_packet_number = -1;
-static int hf_gquic_prflags = -1;
-static int hf_gquic_prflags_entropy = -1;
-static int hf_gquic_prflags_fecg = -1;
-static int hf_gquic_prflags_fec = -1;
-static int hf_gquic_prflags_rsv = -1;
-static int hf_gquic_message_authentication_hash = -1;
-static int hf_gquic_frame = -1;
-static int hf_gquic_frame_type = -1;
-static int hf_gquic_frame_type_padding_length = -1;
-static int hf_gquic_frame_type_padding = -1;
-static int hf_gquic_frame_type_rsts_stream_id = -1;
-static int hf_gquic_frame_type_rsts_byte_offset = -1;
-static int hf_gquic_frame_type_rsts_error_code = -1;
-static int hf_gquic_frame_type_cc_error_code = -1;
-static int hf_gquic_frame_type_cc_reason_phrase_length = -1;
-static int hf_gquic_frame_type_cc_reason_phrase = -1;
-static int hf_gquic_frame_type_goaway_error_code = -1;
-static int hf_gquic_frame_type_goaway_last_good_stream_id = -1;
-static int hf_gquic_frame_type_goaway_reason_phrase_length = -1;
-static int hf_gquic_frame_type_goaway_reason_phrase = -1;
-static int hf_gquic_frame_type_wu_stream_id = -1;
-static int hf_gquic_frame_type_wu_byte_offset = -1;
-static int hf_gquic_frame_type_blocked_stream_id = -1;
-static int hf_gquic_frame_type_sw_send_entropy = -1;
-static int hf_gquic_frame_type_sw_least_unacked_delta = -1;
-static int hf_gquic_crypto_offset = -1;
-static int hf_gquic_crypto_length = -1;
-static int hf_gquic_crypto_crypto_data = -1;
-static int hf_gquic_frame_type_stream = -1;
-static int hf_gquic_frame_type_stream_f = -1;
-static int hf_gquic_frame_type_stream_d = -1;
-static int hf_gquic_frame_type_stream_ooo = -1;
-static int hf_gquic_frame_type_stream_ss = -1;
+static int proto_gquic;
+static int hf_gquic_header_form;
+static int hf_gquic_fixed_bit;
+static int hf_gquic_long_packet_type;
+static int hf_gquic_long_reserved;
+static int hf_gquic_packet_number_length;
+static int hf_gquic_dcil;
+static int hf_gquic_scil;
+static int hf_gquic_puflags;
+static int hf_gquic_puflags_vrsn;
+static int hf_gquic_puflags_rst;
+static int hf_gquic_puflags_dnonce;
+static int hf_gquic_puflags_cid;
+static int hf_gquic_puflags_cid_old;
+static int hf_gquic_puflags_pkn;
+static int hf_gquic_puflags_mpth;
+static int hf_gquic_puflags_rsv;
+static int hf_gquic_cid;
+static int hf_gquic_version;
+static int hf_gquic_diversification_nonce;
+static int hf_gquic_packet_number;
+static int hf_gquic_prflags;
+static int hf_gquic_prflags_entropy;
+static int hf_gquic_prflags_fecg;
+static int hf_gquic_prflags_fec;
+static int hf_gquic_prflags_rsv;
+static int hf_gquic_message_authentication_hash;
+static int hf_gquic_frame;
+static int hf_gquic_frame_type;
+static int hf_gquic_frame_type_padding_length;
+static int hf_gquic_frame_type_padding;
+static int hf_gquic_frame_type_rsts_stream_id;
+static int hf_gquic_frame_type_rsts_byte_offset;
+static int hf_gquic_frame_type_rsts_error_code;
+static int hf_gquic_frame_type_cc_error_code;
+static int hf_gquic_frame_type_cc_reason_phrase_length;
+static int hf_gquic_frame_type_cc_reason_phrase;
+static int hf_gquic_frame_type_goaway_error_code;
+static int hf_gquic_frame_type_goaway_last_good_stream_id;
+static int hf_gquic_frame_type_goaway_reason_phrase_length;
+static int hf_gquic_frame_type_goaway_reason_phrase;
+static int hf_gquic_frame_type_wu_stream_id;
+static int hf_gquic_frame_type_wu_byte_offset;
+static int hf_gquic_frame_type_blocked_stream_id;
+static int hf_gquic_frame_type_sw_send_entropy;
+static int hf_gquic_frame_type_sw_least_unacked_delta;
+static int hf_gquic_crypto_offset;
+static int hf_gquic_crypto_length;
+static int hf_gquic_crypto_crypto_data;
+static int hf_gquic_frame_type_stream;
+static int hf_gquic_frame_type_stream_f;
+static int hf_gquic_frame_type_stream_d;
+static int hf_gquic_frame_type_stream_ooo;
+static int hf_gquic_frame_type_stream_ss;
 /* ACK */
-static int hf_gquic_frame_type_ack = -1;
-static int hf_gquic_frame_type_ack_n = -1;
-static int hf_gquic_frame_type_ack_u = -1;
-static int hf_gquic_frame_type_ack_t = -1;
-static int hf_gquic_frame_type_ack_ll = -1;
-static int hf_gquic_frame_type_ack_mm = -1;
+static int hf_gquic_frame_type_ack;
+static int hf_gquic_frame_type_ack_n;
+static int hf_gquic_frame_type_ack_u;
+static int hf_gquic_frame_type_ack_t;
+static int hf_gquic_frame_type_ack_ll;
+static int hf_gquic_frame_type_ack_mm;
 /* ACK Before Q034 */
-static int hf_gquic_frame_type_ack_received_entropy = -1;
-static int hf_gquic_frame_type_ack_largest_observed = -1;
-static int hf_gquic_frame_type_ack_ack_delay_time = -1;
-static int hf_gquic_frame_type_ack_num_timestamp = -1;
-static int hf_gquic_frame_type_ack_delta_largest_observed = -1;
-static int hf_gquic_frame_type_ack_first_timestamp = -1;
-static int hf_gquic_frame_type_ack_time_since_previous_timestamp = -1;
-static int hf_gquic_frame_type_ack_num_ranges = -1;
-static int hf_gquic_frame_type_ack_missing_packet = -1;
-static int hf_gquic_frame_type_ack_range_length = -1;
-static int hf_gquic_frame_type_ack_num_revived = -1;
-static int hf_gquic_frame_type_ack_revived_packet = -1;
+static int hf_gquic_frame_type_ack_received_entropy;
+static int hf_gquic_frame_type_ack_largest_observed;
+static int hf_gquic_frame_type_ack_ack_delay_time;
+static int hf_gquic_frame_type_ack_num_timestamp;
+static int hf_gquic_frame_type_ack_delta_largest_observed;
+static int hf_gquic_frame_type_ack_first_timestamp;
+static int hf_gquic_frame_type_ack_time_since_previous_timestamp;
+static int hf_gquic_frame_type_ack_num_ranges;
+static int hf_gquic_frame_type_ack_missing_packet;
+static int hf_gquic_frame_type_ack_range_length;
+static int hf_gquic_frame_type_ack_num_revived;
+static int hf_gquic_frame_type_ack_revived_packet;
 /* ACK After Q034 */
-static int hf_gquic_frame_type_ack_largest_acked = -1;
-static int hf_gquic_frame_type_ack_largest_acked_delta_time = -1;
-static int hf_gquic_frame_type_ack_num_blocks = -1;
-static int hf_gquic_frame_type_ack_first_ack_block_length = -1;
-static int hf_gquic_frame_type_ack_gap_to_next_block = -1;
-static int hf_gquic_frame_type_ack_ack_block_length = -1;
-static int hf_gquic_frame_type_ack_delta_largest_acked = -1;
-static int hf_gquic_frame_type_ack_time_since_largest_acked = -1;
-static int hf_gquic_stream_id = -1;
-static int hf_gquic_offset = -1;
-static int hf_gquic_data_len = -1;
-static int hf_gquic_tag = -1;
-static int hf_gquic_tags = -1;
-static int hf_gquic_tag_number = -1;
-static int hf_gquic_tag_value = -1;
-static int hf_gquic_tag_type = -1;
-static int hf_gquic_tag_offset_end = -1;
-static int hf_gquic_tag_length = -1;
-static int hf_gquic_tag_sni = -1;
-static int hf_gquic_tag_pad = -1;
-static int hf_gquic_tag_ver = -1;
-static int hf_gquic_tag_ccs = -1;
-static int hf_gquic_tag_pdmd = -1;
-static int hf_gquic_tag_uaid = -1;
-static int hf_gquic_tag_stk = -1;
-static int hf_gquic_tag_sno = -1;
-static int hf_gquic_tag_prof = -1;
-static int hf_gquic_tag_scfg = -1;
-static int hf_gquic_tag_scfg_number = -1;
-static int hf_gquic_tag_rrej = -1;
-static int hf_gquic_tag_crt = -1;
-static int hf_gquic_tag_aead = -1;
-static int hf_gquic_tag_scid = -1;
-static int hf_gquic_tag_pubs = -1;
-static int hf_gquic_tag_kexs = -1;
-static int hf_gquic_tag_obit = -1;
-static int hf_gquic_tag_expy = -1;
-static int hf_gquic_tag_nonc = -1;
-static int hf_gquic_tag_mspc = -1;
-static int hf_gquic_tag_tcid = -1;
-static int hf_gquic_tag_srbf = -1;
-static int hf_gquic_tag_icsl = -1;
-static int hf_gquic_tag_scls = -1;
-static int hf_gquic_tag_copt = -1;
-static int hf_gquic_tag_ccrt = -1;
-static int hf_gquic_tag_irtt = -1;
-static int hf_gquic_tag_cfcw = -1;
-static int hf_gquic_tag_sfcw = -1;
-static int hf_gquic_tag_cetv = -1;
-static int hf_gquic_tag_xlct = -1;
-static int hf_gquic_tag_nonp = -1;
-static int hf_gquic_tag_csct = -1;
-static int hf_gquic_tag_ctim = -1;
-static int hf_gquic_tag_mids = -1;
-static int hf_gquic_tag_fhol = -1;
-static int hf_gquic_tag_sttl = -1;
-static int hf_gquic_tag_smhl = -1;
-static int hf_gquic_tag_tbkp = -1;
-static int hf_gquic_tag_mad0 = -1;
-static int hf_gquic_tag_qlve = -1;
-static int hf_gquic_tag_cgst = -1;
-static int hf_gquic_tag_epid = -1;
-static int hf_gquic_tag_srst = -1;
+static int hf_gquic_frame_type_ack_largest_acked;
+static int hf_gquic_frame_type_ack_largest_acked_delta_time;
+static int hf_gquic_frame_type_ack_num_blocks;
+static int hf_gquic_frame_type_ack_first_ack_block_length;
+static int hf_gquic_frame_type_ack_gap_to_next_block;
+static int hf_gquic_frame_type_ack_ack_block_length;
+static int hf_gquic_frame_type_ack_delta_largest_acked;
+static int hf_gquic_frame_type_ack_time_since_largest_acked;
+static int hf_gquic_stream_id;
+static int hf_gquic_offset;
+static int hf_gquic_data_len;
+static int hf_gquic_tag;
+static int hf_gquic_tags;
+static int hf_gquic_tag_number;
+static int hf_gquic_tag_value;
+static int hf_gquic_tag_type;
+static int hf_gquic_tag_offset_end;
+static int hf_gquic_tag_length;
+static int hf_gquic_tag_sni;
+static int hf_gquic_tag_pad;
+static int hf_gquic_tag_ver;
+static int hf_gquic_tag_ccs;
+static int hf_gquic_tag_pdmd;
+static int hf_gquic_tag_uaid;
+static int hf_gquic_tag_stk;
+static int hf_gquic_tag_sno;
+static int hf_gquic_tag_prof;
+static int hf_gquic_tag_scfg;
+static int hf_gquic_tag_scfg_number;
+static int hf_gquic_tag_rrej;
+static int hf_gquic_tag_crt;
+static int hf_gquic_tag_aead;
+static int hf_gquic_tag_scid;
+static int hf_gquic_tag_pubs;
+static int hf_gquic_tag_kexs;
+static int hf_gquic_tag_obit;
+static int hf_gquic_tag_expy;
+static int hf_gquic_tag_nonc;
+static int hf_gquic_tag_mspc;
+static int hf_gquic_tag_tcid;
+static int hf_gquic_tag_srbf;
+static int hf_gquic_tag_icsl;
+static int hf_gquic_tag_scls;
+static int hf_gquic_tag_copt;
+static int hf_gquic_tag_ccrt;
+static int hf_gquic_tag_irtt;
+static int hf_gquic_tag_cfcw;
+static int hf_gquic_tag_sfcw;
+static int hf_gquic_tag_cetv;
+static int hf_gquic_tag_xlct;
+static int hf_gquic_tag_nonp;
+static int hf_gquic_tag_csct;
+static int hf_gquic_tag_ctim;
+static int hf_gquic_tag_mids;
+static int hf_gquic_tag_fhol;
+static int hf_gquic_tag_sttl;
+static int hf_gquic_tag_smhl;
+static int hf_gquic_tag_tbkp;
+static int hf_gquic_tag_mad0;
+static int hf_gquic_tag_qlve;
+static int hf_gquic_tag_cgst;
+static int hf_gquic_tag_epid;
+static int hf_gquic_tag_srst;
 
 /* Public Reset Tags */
-static int hf_gquic_tag_rnon = -1;
-static int hf_gquic_tag_rseq = -1;
-static int hf_gquic_tag_cadr_addr_type = -1;
-static int hf_gquic_tag_cadr_addr_ipv4 = -1;
-static int hf_gquic_tag_cadr_addr_ipv6 = -1;
-static int hf_gquic_tag_cadr_addr = -1;
-static int hf_gquic_tag_cadr_port = -1;
+static int hf_gquic_tag_rnon;
+static int hf_gquic_tag_rseq;
+static int hf_gquic_tag_cadr_addr_type;
+static int hf_gquic_tag_cadr_addr_ipv4;
+static int hf_gquic_tag_cadr_addr_ipv6;
+static int hf_gquic_tag_cadr_addr;
+static int hf_gquic_tag_cadr_port;
 
-static int hf_gquic_tag_unknown = -1;
+static int hf_gquic_tag_unknown;
 
-static int hf_gquic_padding = -1;
-static int hf_gquic_stream_data = -1;
-static int hf_gquic_payload = -1;
+static int hf_gquic_padding;
+static int hf_gquic_stream_data;
+static int hf_gquic_payload;
 
 #define QUIC_PORT_RANGE "80,443"
 static gboolean g_gquic_debug = FALSE;
 
-static gint ett_gquic = -1;
-static gint ett_gquic_puflags = -1;
-static gint ett_gquic_prflags = -1;
-static gint ett_gquic_ft = -1;
-static gint ett_gquic_ftflags = -1;
-static gint ett_gquic_tag_value = -1;
-
-static expert_field ei_gquic_tag_undecoded = EI_INIT;
-static expert_field ei_gquic_tag_length = EI_INIT;
-static expert_field ei_gquic_tag_unknown = EI_INIT;
-static expert_field ei_gquic_version_invalid = EI_INIT;
-static expert_field ei_gquic_invalid_parameter = EI_INIT;
-static expert_field ei_gquic_length_invalid = EI_INIT;
-static expert_field ei_gquic_data_invalid = EI_INIT;
+static gint ett_gquic;
+static gint ett_gquic_puflags;
+static gint ett_gquic_prflags;
+static gint ett_gquic_ft;
+static gint ett_gquic_ftflags;
+static gint ett_gquic_tag_value;
+
+static expert_field ei_gquic_tag_undecoded;
+static expert_field ei_gquic_tag_length;
+static expert_field ei_gquic_tag_unknown;
+static expert_field ei_gquic_version_invalid;
+static expert_field ei_gquic_invalid_parameter;
+static expert_field ei_gquic_length_invalid;
+static expert_field ei_gquic_data_invalid;
 
 static const value_string gquic_short_long_header_vals[] = {
     { 0, "Short Header" },
diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c
index f566f70a0a..4f9b08e9a5 100644
--- a/epan/dissectors/packet-gre.c
+++ b/epan/dissectors/packet-gre.c
@@ -41,59 +41,59 @@ static capture_dissector_handle_t gre_cap_handle;
  * "Encapsulating MPLS in IP or Generic Routing Encapsulation (GRE)".
  */
 
-static int proto_gre = -1;
-static int hf_gre_proto = -1;
-static int hf_gre_flags_and_version = -1;
-static int hf_gre_flags_checksum = -1;
-static int hf_gre_flags_routing = -1;
-static int hf_gre_flags_key = -1;
-static int hf_gre_flags_sequence_number = -1;
-static int hf_gre_flags_strict_source_route = -1;
-static int hf_gre_flags_recursion_control = -1;
-static int hf_gre_flags_ack = -1;
-static int hf_gre_flags_reserved_ppp = -1;
-static int hf_gre_flags_reserved = -1;
-static int hf_gre_flags_version = -1;
-static int hf_gre_checksum = -1;
-static int hf_gre_checksum_status = -1;
-static int hf_gre_offset = -1;
-static int hf_gre_key = -1;
-static int hf_gre_key_payload_length = -1;
-static int hf_gre_key_call_id = -1;
-static int hf_gre_sequence_number = -1;
-static int hf_gre_ack_number = -1;
-static int hf_gre_routing = -1;
-static int hf_gre_routing_address_family = -1;
-static int hf_gre_routing_sre_length = -1;
-static int hf_gre_routing_sre_offset = -1;
-static int hf_gre_routing_information = -1;
+static int proto_gre;
+static int hf_gre_proto;
+static int hf_gre_flags_and_version;
+static int hf_gre_flags_checksum;
+static int hf_gre_flags_routing;
+static int hf_gre_flags_key;
+static int hf_gre_flags_sequence_number;
+static int hf_gre_flags_strict_source_route;
+static int hf_gre_flags_recursion_control;
+static int hf_gre_flags_ack;
+static int hf_gre_flags_reserved_ppp;
+static int hf_gre_flags_reserved;
+static int hf_gre_flags_version;
+static int hf_gre_checksum;
+static int hf_gre_checksum_status;
+static int hf_gre_offset;
+static int hf_gre_key;
+static int hf_gre_key_payload_length;
+static int hf_gre_key_call_id;
+static int hf_gre_sequence_number;
+static int hf_gre_ack_number;
+static int hf_gre_routing;
+static int hf_gre_routing_address_family;
+static int hf_gre_routing_sre_length;
+static int hf_gre_routing_sre_offset;
+static int hf_gre_routing_information;
 
 /* Ref 3GPP2 A.S0012-C v2.0 and A.S0008-A v1.0 */
-static int hf_gre_3gpp2_attrib = -1;
-static int hf_gre_3gpp2_attrib_id = -1;
-static int hf_gre_3gpp2_attrib_length = -1;
-static int hf_gre_3gpp2_sdi = -1;
-static int hf_gre_3gpp2_fci = -1;
-static int hf_gre_3gpp2_di = -1;
-static int hf_gre_3gpp2_flow_disc = -1;
-static int hf_gre_3gpp2_seg = -1;
-
-static int hf_gre_wccp_redirect_header = -1;
-static int hf_gre_wccp_dynamic_service = -1;
-static int hf_gre_wccp_alternative_bucket_used = -1;
-static int hf_gre_wccp_redirect_header_valid = -1;
-static int hf_gre_wccp_service_id = -1;
-static int hf_gre_wccp_alternative_bucket = -1;
-static int hf_gre_wccp_primary_bucket = -1;
-
-static gint ett_gre = -1;
-static gint ett_gre_flags = -1;
-static gint ett_gre_routing = -1;
-static gint ett_gre_wccp2_redirect_header = -1;
-static gint ett_3gpp2_attribs = -1;
-static gint ett_3gpp2_attr = -1;
-
-static expert_field ei_gre_checksum_incorrect = EI_INIT;
+static int hf_gre_3gpp2_attrib;
+static int hf_gre_3gpp2_attrib_id;
+static int hf_gre_3gpp2_attrib_length;
+static int hf_gre_3gpp2_sdi;
+static int hf_gre_3gpp2_fci;
+static int hf_gre_3gpp2_di;
+static int hf_gre_3gpp2_flow_disc;
+static int hf_gre_3gpp2_seg;
+
+static int hf_gre_wccp_redirect_header;
+static int hf_gre_wccp_dynamic_service;
+static int hf_gre_wccp_alternative_bucket_used;
+static int hf_gre_wccp_redirect_header_valid;
+static int hf_gre_wccp_service_id;
+static int hf_gre_wccp_alternative_bucket;
+static int hf_gre_wccp_primary_bucket;
+
+static gint ett_gre;
+static gint ett_gre_flags;
+static gint ett_gre_routing;
+static gint ett_gre_wccp2_redirect_header;
+static gint ett_3gpp2_attribs;
+static gint ett_3gpp2_attr;
+
+static expert_field ei_gre_checksum_incorrect;
 
 static dissector_table_t gre_dissector_table;
 
diff --git a/epan/dissectors/packet-grebonding.c b/epan/dissectors/packet-grebonding.c
index f9ce971647..32af2da1c4 100644
--- a/epan/dissectors/packet-grebonding.c
+++ b/epan/dissectors/packet-grebonding.c
@@ -30,42 +30,42 @@ void proto_register_greb(void);
 
 static dissector_handle_t greb_handle;
 
-static int proto_greb = -1;
-
-static int hf_greb_message_type = -1;
-static int hf_greb_tunnel_type = -1;
-
-static int hf_greb_attr = -1;
-static int hf_greb_attr_type = -1;
-static int hf_greb_attr_length = -1;
-static int hf_greb_attr_val_uint64 = -1;
-static int hf_greb_attr_val_none = -1;
-static int hf_greb_attr_val_ipv6 = -1;
-static int hf_greb_attr_val_ipv4 = -1;
-static int hf_greb_attr_val_time = -1;
-static int hf_greb_attr_val_string = -1;
-static int hf_greb_attr_DSL_prot = -1;
-static int hf_greb_attr_dt_bras_name = -1;
-
-static int hf_greb_attr_filter_commit = -1;
-static int hf_greb_attr_filter_ack = -1;
-static int hf_greb_attr_filter_packetsum = -1;
-static int hf_greb_attr_filter_packetid = -1;
-static int hf_greb_attr_filter_item_type = -1;
-static int hf_greb_attr_filter_item_length = -1;
-static int hf_greb_attr_filter_item_enabled = -1;
-static int hf_greb_attr_filter_item_desc_length = -1;
-static int hf_greb_attr_filter_item_desc_val = -1;
-static int hf_greb_attr_filter_item_val = -1;
-
-static int hf_greb_attr_error = -1;
+static int proto_greb;
+
+static int hf_greb_message_type;
+static int hf_greb_tunnel_type;
+
+static int hf_greb_attr;
+static int hf_greb_attr_type;
+static int hf_greb_attr_length;
+static int hf_greb_attr_val_uint64;
+static int hf_greb_attr_val_none;
+static int hf_greb_attr_val_ipv6;
+static int hf_greb_attr_val_ipv4;
+static int hf_greb_attr_val_time;
+static int hf_greb_attr_val_string;
+static int hf_greb_attr_DSL_prot;
+static int hf_greb_attr_dt_bras_name;
+
+static int hf_greb_attr_filter_commit;
+static int hf_greb_attr_filter_ack;
+static int hf_greb_attr_filter_packetsum;
+static int hf_greb_attr_filter_packetid;
+static int hf_greb_attr_filter_item_type;
+static int hf_greb_attr_filter_item_length;
+static int hf_greb_attr_filter_item_enabled;
+static int hf_greb_attr_filter_item_desc_length;
+static int hf_greb_attr_filter_item_desc_val;
+static int hf_greb_attr_filter_item_val;
+
+static int hf_greb_attr_error;
 
 /* Initialize the subtree pointers */
-static gint ett_grebonding = -1;
-static gint ett_grebonding_attrb = -1;
-static gint ett_grebonding_filter_list = -1;
-static gint ett_grebonding_filter_item = -1;
-static gint ett_grebonding_ipv6_prefix = -1;
+static gint ett_grebonding;
+static gint ett_grebonding_attrb;
+static gint ett_grebonding_filter_list;
+static gint ett_grebonding_filter_item;
+static gint ett_grebonding_ipv6_prefix;
 
 static gint *ett[] = {
     &ett_grebonding,
diff --git a/epan/dissectors/packet-grpc.c b/epan/dissectors/packet-grpc.c
index a459fde251..942c5d6d4f 100644
--- a/epan/dissectors/packet-grpc.c
+++ b/epan/dissectors/packet-grpc.c
@@ -91,15 +91,15 @@ static gboolean grpc_embedded_under_http2 = FALSE;
 void proto_register_grpc(void);
 void proto_reg_handoff_grpc(void);
 
-static int proto_grpc = -1;
-static int proto_http = -1;
+static int proto_grpc;
+static int proto_http;
 
 /* message header */
-static int hf_grpc_frame_type = -1;
-static int hf_grpc_compressed_flag = -1;
-static int hf_grpc_message_length = -1;
+static int hf_grpc_frame_type;
+static int hf_grpc_compressed_flag;
+static int hf_grpc_message_length;
 /* message body */
-static int hf_grpc_message_data = -1;
+static int hf_grpc_message_data;
 
 /* grpc protocol type */
 #define grpc_protocol_type_vals_VALUE_STRING_LIST(XXX)    \
@@ -127,13 +127,13 @@ VALUE_STRING_ENUM(grpc_compressed_flag_vals);
 VALUE_STRING_ARRAY(grpc_compressed_flag_vals);
 
 /* expert */
-static expert_field ei_grpc_body_decompression_failed = EI_INIT;
-static expert_field ei_grpc_body_malformed = EI_INIT;
+static expert_field ei_grpc_body_decompression_failed;
+static expert_field ei_grpc_body_malformed;
 
 /* trees */
-static int ett_grpc = -1;
-static int ett_grpc_message = -1;
-static int ett_grpc_encoded_entity = -1;
+static int ett_grpc;
+static int ett_grpc_message;
+static int ett_grpc_encoded_entity;
 
 static dissector_handle_t grpc_handle;
 static dissector_handle_t data_text_lines_handle;
diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index 3b067a20b0..0493b1419a 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -588,213 +588,213 @@ static const value_string fe_cur_chan_type2_chan_field_vals[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_a_bssmap = -1;
-
-static int hf_gsm_a_bssmap_msg_type = -1;
-int hf_gsm_a_bssmap_elem_id = -1;
-static int hf_gsm_a_bssmap_field_elem_id = -1;
-static int hf_gsm_a_bssmap_field_elem_id_len = -1;
-static int hf_gsm_a_bssmap_cell_ci = -1;
-static int hf_gsm_a_bssmap_cell_lac = -1;
-static int hf_gsm_a_bssmap_sac = -1;
-static int hf_gsm_a_bssmap_dlci_cc = -1;
-static int hf_gsm_a_bssmap_dlci_spare = -1;
-static int hf_gsm_a_bssmap_dlci_sapi = -1;
-static int hf_gsm_a_bssmap_cause = -1;
-static int hf_gsm_a_bssmap_be_cell_id_disc = -1;
-static int hf_gsm_a_bssmap_pci = -1;
-static int hf_gsm_a_bssmap_qa = -1;
-static int hf_gsm_a_bssmap_pvi = -1;
-static int hf_gsm_a_bssmap_interference_bands = -1;
-static int hf_gsm_a_bssmap_lsa_only = -1;
-static int hf_gsm_a_bssmap_act = -1;
-static int hf_gsm_a_bssmap_pref = -1;
-static int hf_gsm_a_bssmap_lsa_inf_prio = -1;
-static int hf_gsm_a_bssmap_seq_len = -1;
-static int hf_gsm_a_bssmap_seq_no = -1;
-static int hf_gsm_a_bssap_cell_id_list_seg_cell_id_disc = -1;
-static int hf_gsm_a_bssap_res_ind_method = -1;
-static int hf_gsm_a_bssap_cic_list_range = -1;
-static int hf_gsm_a_bssap_cic_list_status = -1;
-static int hf_gsm_a_bssap_diag_error_pointer = -1;
-static int hf_gsm_a_bssap_diag_msg_rcv = -1;
-static int hf_gsm_a_bssmap_ch_mode = -1;
-static int hf_gsm_a_bssmap_cur_ch_mode = -1;
-static int hf_gsm_a_bssmap_channel = -1;
-static int hf_gsm_a_bssmap_trace_trigger_id = -1;
-static int hf_gsm_a_bssmap_trace_priority_indication = -1;
-static int hf_gsm_a_bssmap_trace_bss_record_type = -1;
-static int hf_gsm_a_bssmap_trace_msc_record_type = -1;
-static int hf_gsm_a_bssmap_trace_invoking_event = -1;
-static int hf_gsm_a_bssmap_trace_reference = -1;
-static int hf_gsm_a_bssmap_trace_omc_id = -1;
-static int hf_gsm_a_bssmap_be_rnc_id = -1;
-static int hf_gsm_a_bssmap_apdu_protocol_id = -1;
-static int hf_gsm_a_bssmap_periodicity = -1;
-static int hf_gsm_a_bssmap_sm = -1;
-static int hf_gsm_a_bssmap_tarr = -1;
-static int hf_gsm_a_bssmap_tot_no_of_fullr_ch = -1;
-static int hf_gsm_a_bssmap_tot_no_of_hr_ch = -1;
-static int hf_gsm_a_bssmap_smi = -1;
-static int hf_gsm_a_bssmap_lsa_id = -1;
-static int hf_gsm_a_bssmap_ep = -1;
-static int hf_gsm_a_bssmap_lcs_pri = -1;
-static int hf_gsm_a_bssmap_num_ms = -1;
-static int hf_gsm_a_bssmap_talker_pri = -1;
-static int hf_gsm_a_bssmap_rr_mode = -1;
-static int hf_gsm_a_bssmap_group_cipher_key_nb = -1;
-static int hf_gsm_a_bssmap_vgcs_vbs_cell_status = -1;
-static int hf_gsm_a_bssmap_paging_cause = -1;
-static int hf_gsm_a_bssmap_paging_inf_flg = -1;
-static int hf_gsm_a_bssmap_serv_ho_inf = -1;
-static int hf_gsm_a_bssmap_max_nb_traffic_chan = -1;
-static int hf_gsm_a_bssmap_acceptable_chan_coding_bit5 = -1;
-static int hf_gsm_a_bssmap_acceptable_chan_coding_bit4 = -1;
-static int hf_gsm_a_bssmap_acceptable_chan_coding_bit3 = -1;
-static int hf_gsm_a_bssmap_acceptable_chan_coding_bit2 = -1;
-static int hf_gsm_a_bssmap_acceptable_chan_coding_bit1 = -1;
-static int hf_gsm_a_bssmap_allowed_data_rate_bit8 = -1;
-static int hf_gsm_a_bssmap_allowed_data_rate_bit7 = -1;
-static int hf_gsm_a_bssmap_allowed_data_rate_bit6 = -1;
-static int hf_gsm_a_bssmap_allowed_data_rate_bit5 = -1;
-static int hf_gsm_a_bssmap_allowed_data_rate_bit4 = -1;
-static int hf_gsm_a_bssmap_vstk_rand = -1;
-static int hf_gsm_a_bssmap_vstk = -1;
-static int hf_gsm_a_bssmap_spare_bits = -1;
-static int hf_gsm_a_bssmap_tpind = -1;
-static int hf_gsm_a_bssmap_asind_b2 = -1;
-static int hf_gsm_a_bssmap_asind_b3 = -1;
-static int hf_gsm_a_bssmap_bss_res = -1;
-static int hf_gsm_a_bssmap_tcp = -1;
-static int hf_gsm_a_bssmap_filler_bits = -1;
-static int hf_gsm_a_bssmap_method = -1;
-static int hf_gsm_a_bssmap_ganss_id = -1;
-static int hf_gsm_a_bssmap_usage = -1;
-static int hf_gsm_a_bssmap_data_id = -1;
-static int hf_gsm_a_bssmap_bt_ind = -1;
-static int hf_gsm_a_bssmap_aoip_trans_ipv4 = -1;
-static int hf_gsm_a_bssmap_aoip_trans_ipv6 = -1;
-static int hf_gsm_a_bssmap_aoip_trans_port = -1;
-static int hf_gsm_a_bssmap_fi = -1;
-static int hf_gsm_a_bssmap_tf = -1;
-static int hf_gsm_a_bssmap_pi = -1;
-static int hf_gsm_a_bssmap_pt = -1;
-static int hf_gsm_a_bssap_speech_codec = -1;
-static int hf_gsm_a_bssap_extended_codec = -1;
-static int hf_gsm_a_bssap_extended_codec_r2 = -1;
-static int hf_gsm_a_bssap_extended_codec_r3 = -1;
-static int hf_gsm_a_bssmap_fi2 = -1;
-static int hf_gsm_a_bssmap_tf2 = -1;
-static int hf_gsm_a_bssmap_pi2 = -1;
-static int hf_gsm_a_bssmap_pt2 = -1;
-static int hf_gsm_a_bssmap_call_id = -1;
-static int hf_gsm_a_bssmap_spare = -1;
-static int hf_gsm_a_bssmap_positioning_data_discriminator = -1;
-static int hf_gsm_a_bssmap_positioning_method = -1;
-static int hf_gsm_a_bssmap_positioning_method_usage = -1;
-static int hf_gsm_a_bssmap_location_type_location_information = -1;
-static int hf_gsm_a_bssmap_location_type_positioning_method = -1;
-static int hf_gsm_a_bssmap_chan_type_extension = -1;
-static int hf_gsm_a_bssmap_cause_extension = -1;
-static int hf_gsm_a_bssmap_ass_req = -1;
-static int hf_gsm_a_bssmap_emlpp_prio = -1;
-static int hf_gsm_a_bssmap_rip = -1;
-static int hf_gsm_a_bssmap_rtd = -1;
-static int hf_gsm_a_bssmap_kc128 = -1;
-static int hf_gsm_a_bssmap_csg_id = -1;
-static int hf_gsm_a_bssmap_cell_access_mode = -1;
-static int hf_fe_extra_info_prec = -1;
-static int hf_fe_extra_info_lcs = -1;
-static int hf_fe_extra_info_ue_prob = -1;
-static int hf_fe_extra_info_spare = -1;
-static int hf_fe_cur_chan_type2_chan_mode = -1;
-static int hf_fe_cur_chan_type2_chan_mode_spare = -1;
-static int hf_fe_cur_chan_type2_chan_field = -1;
-static int hf_fe_cur_chan_type2_chan_field_spare = -1;
-static int hf_fe_target_radio_cell_info_rxlev_ncell = -1;
-static int hf_fe_target_radio_cell_info_rxlev_ncell_spare = -1;
-static int hf_fe_dtm_info_dtm_ind = -1;
-static int hf_fe_dtm_info_sto_ind = -1;
-static int hf_fe_dtm_info_egprs_ind = -1;
-static int hf_fe_dtm_info_spare_bits = -1;
-static int hf_fe_cell_load_info_cell_capacity_class = -1;
-static int hf_fe_cell_load_info_load_value = -1;
-static int hf_fe_cell_load_info_rt_load_value = -1;
-static int hf_fe_cell_load_info_nrt_load_information_value = -1;
-static int hf_fe_ps_indication = -1;
-static int hf_fe_dtm_ho_command_ind_spare = -1;
-static int hf_gsm_a_bssmap_speech_data_ind = -1;
-static int hf_gsm_a_bssmap_channel_rate_and_type = -1;
-static int hf_gsm_a_bssmap_perm_speech_v_ind = -1;
-static int hf_gsm_a_bssmap_reroute_rej_cause = -1;
-static int hf_gsm_a_bssmap_send_seqn = -1;
-static int hf_gsm_a_bssmap_reroute_outcome = -1;
-static int hf_gsm_a_bssmap_lcls_conf = -1;
-static int hf_gsm_a_bssmap_lcls_con_status_control = -1;
-static int hf_gsm_a_bssmap_lcls_bss_status = -1;
-static int hf_gsm_a_bssmap_osmocom_osmux_cid = -1;
+static int proto_a_bssmap;
+
+static int hf_gsm_a_bssmap_msg_type;
+int hf_gsm_a_bssmap_elem_id;
+static int hf_gsm_a_bssmap_field_elem_id;
+static int hf_gsm_a_bssmap_field_elem_id_len;
+static int hf_gsm_a_bssmap_cell_ci;
+static int hf_gsm_a_bssmap_cell_lac;
+static int hf_gsm_a_bssmap_sac;
+static int hf_gsm_a_bssmap_dlci_cc;
+static int hf_gsm_a_bssmap_dlci_spare;
+static int hf_gsm_a_bssmap_dlci_sapi;
+static int hf_gsm_a_bssmap_cause;
+static int hf_gsm_a_bssmap_be_cell_id_disc;
+static int hf_gsm_a_bssmap_pci;
+static int hf_gsm_a_bssmap_qa;
+static int hf_gsm_a_bssmap_pvi;
+static int hf_gsm_a_bssmap_interference_bands;
+static int hf_gsm_a_bssmap_lsa_only;
+static int hf_gsm_a_bssmap_act;
+static int hf_gsm_a_bssmap_pref;
+static int hf_gsm_a_bssmap_lsa_inf_prio;
+static int hf_gsm_a_bssmap_seq_len;
+static int hf_gsm_a_bssmap_seq_no;
+static int hf_gsm_a_bssap_cell_id_list_seg_cell_id_disc;
+static int hf_gsm_a_bssap_res_ind_method;
+static int hf_gsm_a_bssap_cic_list_range;
+static int hf_gsm_a_bssap_cic_list_status;
+static int hf_gsm_a_bssap_diag_error_pointer;
+static int hf_gsm_a_bssap_diag_msg_rcv;
+static int hf_gsm_a_bssmap_ch_mode;
+static int hf_gsm_a_bssmap_cur_ch_mode;
+static int hf_gsm_a_bssmap_channel;
+static int hf_gsm_a_bssmap_trace_trigger_id;
+static int hf_gsm_a_bssmap_trace_priority_indication;
+static int hf_gsm_a_bssmap_trace_bss_record_type;
+static int hf_gsm_a_bssmap_trace_msc_record_type;
+static int hf_gsm_a_bssmap_trace_invoking_event;
+static int hf_gsm_a_bssmap_trace_reference;
+static int hf_gsm_a_bssmap_trace_omc_id;
+static int hf_gsm_a_bssmap_be_rnc_id;
+static int hf_gsm_a_bssmap_apdu_protocol_id;
+static int hf_gsm_a_bssmap_periodicity;
+static int hf_gsm_a_bssmap_sm;
+static int hf_gsm_a_bssmap_tarr;
+static int hf_gsm_a_bssmap_tot_no_of_fullr_ch;
+static int hf_gsm_a_bssmap_tot_no_of_hr_ch;
+static int hf_gsm_a_bssmap_smi;
+static int hf_gsm_a_bssmap_lsa_id;
+static int hf_gsm_a_bssmap_ep;
+static int hf_gsm_a_bssmap_lcs_pri;
+static int hf_gsm_a_bssmap_num_ms;
+static int hf_gsm_a_bssmap_talker_pri;
+static int hf_gsm_a_bssmap_rr_mode;
+static int hf_gsm_a_bssmap_group_cipher_key_nb;
+static int hf_gsm_a_bssmap_vgcs_vbs_cell_status;
+static int hf_gsm_a_bssmap_paging_cause;
+static int hf_gsm_a_bssmap_paging_inf_flg;
+static int hf_gsm_a_bssmap_serv_ho_inf;
+static int hf_gsm_a_bssmap_max_nb_traffic_chan;
+static int hf_gsm_a_bssmap_acceptable_chan_coding_bit5;
+static int hf_gsm_a_bssmap_acceptable_chan_coding_bit4;
+static int hf_gsm_a_bssmap_acceptable_chan_coding_bit3;
+static int hf_gsm_a_bssmap_acceptable_chan_coding_bit2;
+static int hf_gsm_a_bssmap_acceptable_chan_coding_bit1;
+static int hf_gsm_a_bssmap_allowed_data_rate_bit8;
+static int hf_gsm_a_bssmap_allowed_data_rate_bit7;
+static int hf_gsm_a_bssmap_allowed_data_rate_bit6;
+static int hf_gsm_a_bssmap_allowed_data_rate_bit5;
+static int hf_gsm_a_bssmap_allowed_data_rate_bit4;
+static int hf_gsm_a_bssmap_vstk_rand;
+static int hf_gsm_a_bssmap_vstk;
+static int hf_gsm_a_bssmap_spare_bits;
+static int hf_gsm_a_bssmap_tpind;
+static int hf_gsm_a_bssmap_asind_b2;
+static int hf_gsm_a_bssmap_asind_b3;
+static int hf_gsm_a_bssmap_bss_res;
+static int hf_gsm_a_bssmap_tcp;
+static int hf_gsm_a_bssmap_filler_bits;
+static int hf_gsm_a_bssmap_method;
+static int hf_gsm_a_bssmap_ganss_id;
+static int hf_gsm_a_bssmap_usage;
+static int hf_gsm_a_bssmap_data_id;
+static int hf_gsm_a_bssmap_bt_ind;
+static int hf_gsm_a_bssmap_aoip_trans_ipv4;
+static int hf_gsm_a_bssmap_aoip_trans_ipv6;
+static int hf_gsm_a_bssmap_aoip_trans_port;
+static int hf_gsm_a_bssmap_fi;
+static int hf_gsm_a_bssmap_tf;
+static int hf_gsm_a_bssmap_pi;
+static int hf_gsm_a_bssmap_pt;
+static int hf_gsm_a_bssap_speech_codec;
+static int hf_gsm_a_bssap_extended_codec;
+static int hf_gsm_a_bssap_extended_codec_r2;
+static int hf_gsm_a_bssap_extended_codec_r3;
+static int hf_gsm_a_bssmap_fi2;
+static int hf_gsm_a_bssmap_tf2;
+static int hf_gsm_a_bssmap_pi2;
+static int hf_gsm_a_bssmap_pt2;
+static int hf_gsm_a_bssmap_call_id;
+static int hf_gsm_a_bssmap_spare;
+static int hf_gsm_a_bssmap_positioning_data_discriminator;
+static int hf_gsm_a_bssmap_positioning_method;
+static int hf_gsm_a_bssmap_positioning_method_usage;
+static int hf_gsm_a_bssmap_location_type_location_information;
+static int hf_gsm_a_bssmap_location_type_positioning_method;
+static int hf_gsm_a_bssmap_chan_type_extension;
+static int hf_gsm_a_bssmap_cause_extension;
+static int hf_gsm_a_bssmap_ass_req;
+static int hf_gsm_a_bssmap_emlpp_prio;
+static int hf_gsm_a_bssmap_rip;
+static int hf_gsm_a_bssmap_rtd;
+static int hf_gsm_a_bssmap_kc128;
+static int hf_gsm_a_bssmap_csg_id;
+static int hf_gsm_a_bssmap_cell_access_mode;
+static int hf_fe_extra_info_prec;
+static int hf_fe_extra_info_lcs;
+static int hf_fe_extra_info_ue_prob;
+static int hf_fe_extra_info_spare;
+static int hf_fe_cur_chan_type2_chan_mode;
+static int hf_fe_cur_chan_type2_chan_mode_spare;
+static int hf_fe_cur_chan_type2_chan_field;
+static int hf_fe_cur_chan_type2_chan_field_spare;
+static int hf_fe_target_radio_cell_info_rxlev_ncell;
+static int hf_fe_target_radio_cell_info_rxlev_ncell_spare;
+static int hf_fe_dtm_info_dtm_ind;
+static int hf_fe_dtm_info_sto_ind;
+static int hf_fe_dtm_info_egprs_ind;
+static int hf_fe_dtm_info_spare_bits;
+static int hf_fe_cell_load_info_cell_capacity_class;
+static int hf_fe_cell_load_info_load_value;
+static int hf_fe_cell_load_info_rt_load_value;
+static int hf_fe_cell_load_info_nrt_load_information_value;
+static int hf_fe_ps_indication;
+static int hf_fe_dtm_ho_command_ind_spare;
+static int hf_gsm_a_bssmap_speech_data_ind;
+static int hf_gsm_a_bssmap_channel_rate_and_type;
+static int hf_gsm_a_bssmap_perm_speech_v_ind;
+static int hf_gsm_a_bssmap_reroute_rej_cause;
+static int hf_gsm_a_bssmap_send_seqn;
+static int hf_gsm_a_bssmap_reroute_outcome;
+static int hf_gsm_a_bssmap_lcls_conf;
+static int hf_gsm_a_bssmap_lcls_con_status_control;
+static int hf_gsm_a_bssmap_lcls_bss_status;
+static int hf_gsm_a_bssmap_osmocom_osmux_cid;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_gsm_a_bssmap_message_elements = -1;
-static int hf_gsm_a_bssmap_full_rate_channels_available = -1;
-static int hf_gsm_a_bssmap_tch_6_4_8kb = -1;
-static int hf_gsm_a_bssmap_speech_version_id = -1;
-static int hf_gsm_a_bssmap_cell_id_unknown_format = -1;
-static int hf_gsm_a_bssmap_tch_12kb = -1;
-static int hf_gsm_a_bssmap_all_call_identifiers_resources_released = -1;
-static int hf_gsm_a_bssmap_pcm_multiplexer = -1;
-static int hf_gsm_a_bssmap_talker_identity_field = -1;
-static int hf_gsm_a_bssmap_qri = -1;
-static int hf_gsm_a_bssmap_cause_value = -1;
-static int hf_gsm_a_bssmap_algorithm_identifier = -1;
-static int hf_gsm_a_bssmap_tch_14_5_14_4kb = -1;
-static int hf_gsm_a_bssmap_national_cause = -1;
-static int hf_gsm_a_bssmap_cause_class = -1;
-static int hf_gsm_a_bssmap_rate = -1;
-static int hf_gsm_a_bssmap_tch_14_5kb = -1;
-static int hf_gsm_a_bssmap_tch_12_9kb = -1;
-static int hf_gsm_a_bssmap_s0_s7 = -1;
-static int hf_gsm_a_bssmap_tio = -1;
-static int hf_gsm_a_bssmap_priority_level = -1;
-static int hf_gsm_a_bssmap_cause16 = -1;
-static int hf_gsm_a_bssmap_enc_info_key = -1;
-static int hf_gsm_a_bssmap_unknown_format = -1;
-static int hf_gsm_a_bssmap_timeslot = -1;
-static int hf_gsm_a_bssmap_transparent_service = -1;
-static int hf_gsm_a_bssmap_tch_6kb = -1;
-static int hf_gsm_a_bssmap_circuit_pool_number = -1;
-static int hf_gsm_a_bssmap_ti_flag = -1;
-static int hf_gsm_a_bssmap_half_rate_channels_available = -1;
-static int hf_gsm_a_bssmap_imeisv_included = -1;
-static int hf_gsm_a_bssmap_bss_activate_downlink = -1;
-static int hf_gsm_a_bssmap_apdu = -1;
-static int hf_gsm_a_bssmap_s0_s15 = -1;
-static int hf_gsm_a_bssmap_layer_3_information_value = -1;
-static int hf_gsm_a_bssmap_gsm_a5_1 = -1;
-static int hf_gsm_a_bssmap_gsm_a5_2 = -1;
-static int hf_gsm_a_bssmap_gsm_a5_3 = -1;
-static int hf_gsm_a_bssmap_gsm_a5_4 = -1;
-static int hf_gsm_a_bssmap_gsm_a5_5 = -1;
-static int hf_gsm_a_bssmap_gsm_a5_6 = -1;
-static int hf_gsm_a_bssmap_gsm_a5_7 = -1;
-static int hf_gsm_a_bssmap_no_encryption = -1;
-static int hf_gsm_a_bssmap_data_channel_rate_and_type = -1;
-static int hf_gsm_a_bssmap_cell_discriminator = -1;
-static int hf_gsm_a_bssmap_layer3_message_contents = -1;
-static int hf_gsm_a_bssmap_forward_indicator = -1;
-
-static expert_field ei_gsm_a_bssmap_extraneous_data = EI_INIT;
-static expert_field ei_gsm_a_bssmap_not_decoded_yet = EI_INIT;
-static expert_field ei_gsm_a_bssap_unknown_codec = EI_INIT;
-static expert_field ei_gsm_a_bssmap_bogus_length = EI_INIT;
-static expert_field ei_gsm_a_bssmap_missing_mandatory_element = EI_INIT;
+static int hf_gsm_a_bssmap_message_elements;
+static int hf_gsm_a_bssmap_full_rate_channels_available;
+static int hf_gsm_a_bssmap_tch_6_4_8kb;
+static int hf_gsm_a_bssmap_speech_version_id;
+static int hf_gsm_a_bssmap_cell_id_unknown_format;
+static int hf_gsm_a_bssmap_tch_12kb;
+static int hf_gsm_a_bssmap_all_call_identifiers_resources_released;
+static int hf_gsm_a_bssmap_pcm_multiplexer;
+static int hf_gsm_a_bssmap_talker_identity_field;
+static int hf_gsm_a_bssmap_qri;
+static int hf_gsm_a_bssmap_cause_value;
+static int hf_gsm_a_bssmap_algorithm_identifier;
+static int hf_gsm_a_bssmap_tch_14_5_14_4kb;
+static int hf_gsm_a_bssmap_national_cause;
+static int hf_gsm_a_bssmap_cause_class;
+static int hf_gsm_a_bssmap_rate;
+static int hf_gsm_a_bssmap_tch_14_5kb;
+static int hf_gsm_a_bssmap_tch_12_9kb;
+static int hf_gsm_a_bssmap_s0_s7;
+static int hf_gsm_a_bssmap_tio;
+static int hf_gsm_a_bssmap_priority_level;
+static int hf_gsm_a_bssmap_cause16;
+static int hf_gsm_a_bssmap_enc_info_key;
+static int hf_gsm_a_bssmap_unknown_format;
+static int hf_gsm_a_bssmap_timeslot;
+static int hf_gsm_a_bssmap_transparent_service;
+static int hf_gsm_a_bssmap_tch_6kb;
+static int hf_gsm_a_bssmap_circuit_pool_number;
+static int hf_gsm_a_bssmap_ti_flag;
+static int hf_gsm_a_bssmap_half_rate_channels_available;
+static int hf_gsm_a_bssmap_imeisv_included;
+static int hf_gsm_a_bssmap_bss_activate_downlink;
+static int hf_gsm_a_bssmap_apdu;
+static int hf_gsm_a_bssmap_s0_s15;
+static int hf_gsm_a_bssmap_layer_3_information_value;
+static int hf_gsm_a_bssmap_gsm_a5_1;
+static int hf_gsm_a_bssmap_gsm_a5_2;
+static int hf_gsm_a_bssmap_gsm_a5_3;
+static int hf_gsm_a_bssmap_gsm_a5_4;
+static int hf_gsm_a_bssmap_gsm_a5_5;
+static int hf_gsm_a_bssmap_gsm_a5_6;
+static int hf_gsm_a_bssmap_gsm_a5_7;
+static int hf_gsm_a_bssmap_no_encryption;
+static int hf_gsm_a_bssmap_data_channel_rate_and_type;
+static int hf_gsm_a_bssmap_cell_discriminator;
+static int hf_gsm_a_bssmap_layer3_message_contents;
+static int hf_gsm_a_bssmap_forward_indicator;
+
+static expert_field ei_gsm_a_bssmap_extraneous_data;
+static expert_field ei_gsm_a_bssmap_not_decoded_yet;
+static expert_field ei_gsm_a_bssap_unknown_codec;
+static expert_field ei_gsm_a_bssmap_bogus_length;
+static expert_field ei_gsm_a_bssmap_missing_mandatory_element;
 
 /* Initialize the subtree pointers */
-static gint ett_bssmap_msg = -1;
-static gint ett_cell_list = -1;
-static gint ett_dlci = -1;
-static gint ett_codec_lst = -1;
-static gint ett_bss_to_bss_info = -1;
+static gint ett_bssmap_msg;
+static gint ett_cell_list;
+static gint ett_dlci;
+static gint ett_codec_lst;
+static gint ett_bss_to_bss_info;
 
 static dissector_handle_t gsm_bsslap_handle = NULL;
 static dissector_handle_t dtap_handle;
diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c
index d22f2075c6..7889e3f039 100644
--- a/epan/dissectors/packet-gsm_a_common.c
+++ b/epan/dissectors/packet-gsm_a_common.c
@@ -544,231 +544,231 @@ const value_string gsm_a_rr_rxqual_vals[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_a_common = -1;
-static int proto_3gpp = -1;
+static int proto_a_common;
+static int proto_3gpp;
 
 int gsm_a_tap = -1;
 
-int hf_gsm_a_common_elem_id = -1;
-static int hf_gsm_a_common_elem_id_f0 = -1;
-static int hf_gsm_a_l_ext = -1;
-int hf_gsm_a_tmsi = -1;
-static int hf_gsm_a_imei = -1;
-static int hf_gsm_a_imeisv = -1;
-
-static int hf_gsm_a_MSC_rev = -1;
-static int hf_gsm_a_ES_IND = -1;
-static int hf_gsm_a_A5_1_algorithm_sup = -1;
-static int hf_gsm_a_RF_power_capability = -1;
-static int hf_gsm_a_ps_sup_cap = -1;
-static int hf_gsm_a_SS_screening_indicator = -1;
-static int hf_gsm_a_SM_capability = -1;
-static int hf_gsm_a_VBS_notification_rec = -1;
-static int hf_gsm_a_VGCS_notification_rec = -1;
-static int hf_gsm_a_FC_frequency_cap = -1;
-static int hf_gsm_a_CM3 = -1;
-static int hf_gsm_a_LCS_VA_cap = -1;
-static int hf_gsm_a_UCS2_treatment = -1;
-static int hf_gsm_a_SoLSA = -1;
-static int hf_gsm_a_CMSP = -1;
-static int hf_gsm_a_A5_7_algorithm_sup = -1;
-static int hf_gsm_a_A5_6_algorithm_sup = -1;
-static int hf_gsm_a_A5_5_algorithm_sup = -1;
-static int hf_gsm_a_A5_4_algorithm_sup = -1;
-static int hf_gsm_a_A5_3_algorithm_sup = -1;
-static int hf_gsm_a_A5_2_algorithm_sup = -1;
-
-static int hf_gsm_a_odd_even_ind = -1;
-static int hf_gsm_a_id_dig_1 = -1;
-static int hf_gsm_a_unused = -1;
-static int hf_gsm_a_mobile_identity_type = -1;
-static int hf_gsm_a_tmgi_mcc_mnc_ind = -1;
-static int hf_gsm_a_mbs_ses_id_ind = -1;
-static int hf_gsm_a_mbs_service_id = -1;
-static int hf_gsm_a_mbs_session_id = -1;
-static int hf_gsm_a_length = -1;
-static int hf_gsm_a_element_value = -1;
-int hf_gsm_a_extension = -1;
-int hf_gsm_a_L3_protocol_discriminator = -1;
-int hf_gsm_a_call_prio = -1;
-int hf_gsm_a_skip_ind = -1;
-int hf_gsm_a_spare_bits = -1;
-int hf_gsm_a_lac = -1;
-
-static int hf_gsm_a_spare_nibble = -1;
-static int hf_gsm_a_type_of_ciph_alg = -1;
-static int hf_gsm_a_att = -1;
-static int hf_gsm_a_nmo_1 = -1;
-static int hf_gsm_a_nmo = -1;
-static int hf_gsm_a_old_xid = -1;
-static int hf_gsm_a_iov_ui = -1;
-static int hf_gsm_a_ext_periodic_timers = -1;
-static int hf_gsm_a_b7spare = -1;
-int hf_gsm_a_b8spare = -1;
-static int hf_gsm_a_multi_bnd_sup_fields = -1;
-static int hf_gsm_a_pgsm_supported = -1;
-static int hf_gsm_a_egsm_supported = -1;
-static int hf_gsm_a_gsm1800_supported = -1;
-static int hf_gsm_a_ass_radio_cap1 = -1;
-static int hf_gsm_a_ass_radio_cap2 = -1;
-static int hf_gsm_a_rsupport = -1;
-static int hf_gsm_a_r_capabilities = -1;
-static int hf_gsm_a_multislot_capabilities = -1;
-static int hf_gsm_a_multislot_class = -1;
-static int hf_gsm_a_ucs2_treatment = -1;
-static int hf_gsm_a_extended_measurement_cap = -1;
-static int hf_gsm_a_ms_measurement_capability = -1;
-static int hf_gsm_a_sms_value =-1;
-static int hf_gsm_a_sm_value =-1;
-static int hf_gsm_a_key_seq = -1;
-static int hf_gsm_a_ms_pos_method_cap_present = -1;
-static int hf_gsm_a_ms_pos_method = -1;
-static int hf_gsm_a_ms_assisted_e_otd = -1;
-static int hf_gsm_a_ms_based_e_otd = -1;
-static int hf_gsm_a_ms_assisted_gps = -1;
-static int hf_gsm_a_ms_based_gps = -1;
-static int hf_gsm_a_ms_conventional_gps = -1;
-static int hf_gsm_a_ecsd_multi_slot_capability = -1;
-static int hf_gsm_a_ecsd_multi_slot_class = -1;
-static int hf_gsm_a_8_psk_struct_present = -1;
-static int hf_gsm_a_8_psk_struct = -1;
-static int hf_gsm_a_modulation_capability = -1;
-static int hf_gsm_a_8_psk_rf_power_capability_1_present = -1;
-static int hf_gsm_a_8_psk_rf_power_capability_1 = -1;
-static int hf_gsm_a_8_psk_rf_power_capability_2_present = -1;
-static int hf_gsm_a_8_psk_rf_power_capability_2 = -1;
-static int hf_gsm_a_gsm_400_band_info_present = -1;
-static int hf_gsm_a_gsm_400_bands_supported = -1;
-static int hf_gsm_a_gsm_400_assoc_radio_cap = -1;
-static int hf_gsm_a_gsm_850_assoc_radio_cap_present = -1;
-static int hf_gsm_a_gsm_850_assoc_radio_cap = -1;
-static int hf_gsm_a_gsm_1900_assoc_radio_cap_present = -1;
-static int hf_gsm_a_gsm_1900_assoc_radio_cap = -1;
-static int hf_gsm_a_cm3_A5_bits = -1;
-static int hf_gsm_a_umts_fdd_rat_cap = -1;
-static int hf_gsm_a_umts_384_mcps_tdd_rat_cap = -1;
-static int hf_gsm_a_cdma_2000_rat_cap = -1;
-static int hf_gsm_a_dtm_e_gprs_multi_slot_info_present = -1;
-static int hf_gsm_a_dtm_gprs_multi_slot_class = -1;
-static int hf_gsm_a_single_slot_dtm = -1;
-static int hf_gsm_a_dtm_egprs_multi_slot_class_present = -1;
-static int hf_gsm_a_dtm_egprs_multi_slot_class = -1;
-static int hf_gsm_a_single_band_support = -1;
-static int hf_gsm_a_gsm_band = -1;
-static int hf_gsm_a_gsm_750_assoc_radio_cap_present = -1;
-static int hf_gsm_a_gsm_750_assoc_radio_cap = -1;
-static int hf_gsm_a_umts_128_mcps_tdd_rat_cap = -1;
-static int hf_gsm_a_geran_feature_package_1 = -1;
-static int hf_gsm_a_ext_dtm_e_gprs_multi_slot_info_present = -1;
-static int hf_gsm_a_ext_dtm_gprs_multi_slot_class = -1;
-static int hf_gsm_a_ext_dtm_egprs_multi_slot_class = -1;
-static int hf_gsm_a_high_multislot_cap_present = -1;
-static int hf_gsm_a_high_multislot_cap = -1;
-static int hf_gsm_a_geran_iu_mode_support = -1;
-static int hf_gsm_a_geran_iu_mode_cap = -1;
-static int hf_gsm_a_geran_iu_mode_cap_length = -1;
-static int hf_gsm_a_flo_iu_cap = -1;
-static int hf_gsm_a_geran_feature_package_2 = -1;
-static int hf_gsm_a_gmsk_multislot_power_prof = -1;
-static int hf_gsm_a_8_psk_multislot_power_prof = -1;
-static int hf_gsm_a_t_gsm_400_band_info_present = -1;
-static int hf_gsm_a_t_gsm_400_bands_supported = -1;
-static int hf_gsm_a_t_gsm_400_assoc_radio_cap = -1;
-static int hf_gsm_a_t_gsm_900_assoc_radio_cap_present = -1;
-static int hf_gsm_a_t_gsm_900_assoc_radio_cap = -1;
-static int hf_gsm_a_downlink_adv_receiver_perf = -1;
-static int hf_gsm_a_dtm_enhancements_cap = -1;
-static int hf_gsm_a_dtm_e_gprs_high_multi_slot_info_present = -1;
-static int hf_gsm_a_dtm_gprs_high_multi_slot_class = -1;
-static int hf_gsm_a_offset_required = -1;
-static int hf_gsm_a_dtm_egprs_high_multi_slot_class_present = -1;
-static int hf_gsm_a_dtm_egprs_high_multi_slot_class = -1;
-static int hf_gsm_a_repeated_acch_cap = -1;
-static int hf_gsm_a_gsm_710_assoc_radio_cap_present = -1;
-static int hf_gsm_a_gsm_710_assoc_radio_cap = -1;
-static int hf_gsm_a_t_gsm_810_assoc_radio_cap_present = -1;
-static int hf_gsm_a_t_gsm_810_assoc_radio_cap = -1;
-static int hf_gsm_a_ciphering_mode_setting_cap = -1;
-static int hf_gsm_a_additional_positioning_caps = -1;
-static int hf_gsm_a_e_utra_fdd_support = -1;
-static int hf_gsm_a_e_utra_tdd_support = -1;
-static int hf_gsm_a_e_utra_meas_and_report_support = -1;
-static int hf_gsm_a_prio_based_resel_support = -1;
-static int hf_gsm_a_utra_csg_cells_reporting = -1;
-static int hf_gsm_a_vamos_level = -1;
-static int hf_gsm_a_tighter_cap = -1;
-static int hf_gsm_a_selective_ciph_down_sacch = -1;
-static int hf_gsm_a_cs_to_ps_srvcc_geran_to_utra = -1;
-static int hf_gsm_a_cs_to_ps_srvcc_geran_to_eutra = -1;
-static int hf_gsm_a_geran_network_sharing_support = -1;
-static int hf_gsm_a_eutra_wb_rsrq_support = -1;
-static int hf_gsm_a_er_band_support = -1;
-static int hf_gsm_a_utra_mfbi_support = -1;
-static int hf_gsm_a_eutra_mfbi_support = -1;
-static int hf_gsm_a_ext_tsc_set_cap_support = -1;
-static int hf_gsm_a_ext_earfcn_value_range = -1;
-
-static int hf_gsm_a_geo_loc_type_of_shape = -1;
-static int hf_gsm_a_geo_loc_sign_of_lat = -1;
-static int hf_gsm_a_geo_loc_deg_of_lat =-1;
-static int hf_gsm_a_geo_loc_deg_of_long =-1;
-static int hf_gsm_a_geo_loc_osm_uri =-1;
-static int hf_gsm_a_geo_loc_uncertainty_code = -1;
-static int hf_gsm_a_geo_loc_uncertainty_semi_major = -1;
-static int hf_gsm_a_geo_loc_uncertainty_semi_minor = -1;
-static int hf_gsm_a_geo_loc_orientation_of_major_axis = -1;
-static int hf_gsm_a_geo_loc_uncertainty_altitude = -1;
-static int hf_gsm_a_geo_loc_confidence = -1;
-static int hf_gsm_a_geo_loc_uncertainty_range = -1;
-static int hf_gsm_a_geo_loc_horizontal_confidence = -1;
-static int hf_gsm_a_geo_loc_horizontal_uncertainty_range = -1;
-static int hf_gsm_a_geo_loc_vertical_confidence = -1;
-static int hf_gsm_a_geo_loc_vertical_uncertainty_range = -1;
-static int hf_gsm_a_geo_loc_high_acc_uncertainty_alt = -1;
-static int hf_gsm_a_geo_loc_no_of_points = -1;
-static int hf_gsm_a_geo_loc_high_acc_deg_of_lat = -1;
-static int hf_gsm_a_geo_loc_high_acc_deg_of_long = -1;
-static int hf_gsm_a_geo_loc_high_acc_uncertainty_semi_major = -1;
-static int hf_gsm_a_geo_loc_high_acc_uncertainty_semi_minor = -1;
-static int hf_gsm_a_geo_loc_high_acc_alt = -1;
-static int hf_gsm_a_velocity_type = -1;
-static int hf_gsm_a_bearing = -1;
-static int hf_gsm_a_horizontal_speed = -1;
-static int hf_gsm_a_uncertainty_speed = -1;
-static int hf_gsm_a_h_uncertainty_speed = -1;
-static int hf_gsm_a_v_uncertainty_speed = -1;
-static int hf_gsm_a_vertical_speed = -1;
-static int hf_gsm_a_d = -1;
-static int hf_gsm_a_geo_loc_D = -1;
-static int hf_gsm_a_geo_loc_altitude = -1;
-static int hf_gsm_a_geo_loc_inner_radius = -1;
-static int hf_gsm_a_geo_loc_uncertainty_radius = -1;
-static int hf_gsm_a_geo_loc_offset_angle = -1;
-static int hf_gsm_a_geo_loc_included_angle = -1;
+int hf_gsm_a_common_elem_id;
+static int hf_gsm_a_common_elem_id_f0;
+static int hf_gsm_a_l_ext;
+int hf_gsm_a_tmsi;
+static int hf_gsm_a_imei;
+static int hf_gsm_a_imeisv;
+
+static int hf_gsm_a_MSC_rev;
+static int hf_gsm_a_ES_IND;
+static int hf_gsm_a_A5_1_algorithm_sup;
+static int hf_gsm_a_RF_power_capability;
+static int hf_gsm_a_ps_sup_cap;
+static int hf_gsm_a_SS_screening_indicator;
+static int hf_gsm_a_SM_capability;
+static int hf_gsm_a_VBS_notification_rec;
+static int hf_gsm_a_VGCS_notification_rec;
+static int hf_gsm_a_FC_frequency_cap;
+static int hf_gsm_a_CM3;
+static int hf_gsm_a_LCS_VA_cap;
+static int hf_gsm_a_UCS2_treatment;
+static int hf_gsm_a_SoLSA;
+static int hf_gsm_a_CMSP;
+static int hf_gsm_a_A5_7_algorithm_sup;
+static int hf_gsm_a_A5_6_algorithm_sup;
+static int hf_gsm_a_A5_5_algorithm_sup;
+static int hf_gsm_a_A5_4_algorithm_sup;
+static int hf_gsm_a_A5_3_algorithm_sup;
+static int hf_gsm_a_A5_2_algorithm_sup;
+
+static int hf_gsm_a_odd_even_ind;
+static int hf_gsm_a_id_dig_1;
+static int hf_gsm_a_unused;
+static int hf_gsm_a_mobile_identity_type;
+static int hf_gsm_a_tmgi_mcc_mnc_ind;
+static int hf_gsm_a_mbs_ses_id_ind;
+static int hf_gsm_a_mbs_service_id;
+static int hf_gsm_a_mbs_session_id;
+static int hf_gsm_a_length;
+static int hf_gsm_a_element_value;
+int hf_gsm_a_extension;
+int hf_gsm_a_L3_protocol_discriminator;
+int hf_gsm_a_call_prio;
+int hf_gsm_a_skip_ind;
+int hf_gsm_a_spare_bits;
+int hf_gsm_a_lac;
+
+static int hf_gsm_a_spare_nibble;
+static int hf_gsm_a_type_of_ciph_alg;
+static int hf_gsm_a_att;
+static int hf_gsm_a_nmo_1;
+static int hf_gsm_a_nmo;
+static int hf_gsm_a_old_xid;
+static int hf_gsm_a_iov_ui;
+static int hf_gsm_a_ext_periodic_timers;
+static int hf_gsm_a_b7spare;
+int hf_gsm_a_b8spare;
+static int hf_gsm_a_multi_bnd_sup_fields;
+static int hf_gsm_a_pgsm_supported;
+static int hf_gsm_a_egsm_supported;
+static int hf_gsm_a_gsm1800_supported;
+static int hf_gsm_a_ass_radio_cap1;
+static int hf_gsm_a_ass_radio_cap2;
+static int hf_gsm_a_rsupport;
+static int hf_gsm_a_r_capabilities;
+static int hf_gsm_a_multislot_capabilities;
+static int hf_gsm_a_multislot_class;
+static int hf_gsm_a_ucs2_treatment;
+static int hf_gsm_a_extended_measurement_cap;
+static int hf_gsm_a_ms_measurement_capability;
+static int hf_gsm_a_sms_value;
+static int hf_gsm_a_sm_value;
+static int hf_gsm_a_key_seq;
+static int hf_gsm_a_ms_pos_method_cap_present;
+static int hf_gsm_a_ms_pos_method;
+static int hf_gsm_a_ms_assisted_e_otd;
+static int hf_gsm_a_ms_based_e_otd;
+static int hf_gsm_a_ms_assisted_gps;
+static int hf_gsm_a_ms_based_gps;
+static int hf_gsm_a_ms_conventional_gps;
+static int hf_gsm_a_ecsd_multi_slot_capability;
+static int hf_gsm_a_ecsd_multi_slot_class;
+static int hf_gsm_a_8_psk_struct_present;
+static int hf_gsm_a_8_psk_struct;
+static int hf_gsm_a_modulation_capability;
+static int hf_gsm_a_8_psk_rf_power_capability_1_present;
+static int hf_gsm_a_8_psk_rf_power_capability_1;
+static int hf_gsm_a_8_psk_rf_power_capability_2_present;
+static int hf_gsm_a_8_psk_rf_power_capability_2;
+static int hf_gsm_a_gsm_400_band_info_present;
+static int hf_gsm_a_gsm_400_bands_supported;
+static int hf_gsm_a_gsm_400_assoc_radio_cap;
+static int hf_gsm_a_gsm_850_assoc_radio_cap_present;
+static int hf_gsm_a_gsm_850_assoc_radio_cap;
+static int hf_gsm_a_gsm_1900_assoc_radio_cap_present;
+static int hf_gsm_a_gsm_1900_assoc_radio_cap;
+static int hf_gsm_a_cm3_A5_bits;
+static int hf_gsm_a_umts_fdd_rat_cap;
+static int hf_gsm_a_umts_384_mcps_tdd_rat_cap;
+static int hf_gsm_a_cdma_2000_rat_cap;
+static int hf_gsm_a_dtm_e_gprs_multi_slot_info_present;
+static int hf_gsm_a_dtm_gprs_multi_slot_class;
+static int hf_gsm_a_single_slot_dtm;
+static int hf_gsm_a_dtm_egprs_multi_slot_class_present;
+static int hf_gsm_a_dtm_egprs_multi_slot_class;
+static int hf_gsm_a_single_band_support;
+static int hf_gsm_a_gsm_band;
+static int hf_gsm_a_gsm_750_assoc_radio_cap_present;
+static int hf_gsm_a_gsm_750_assoc_radio_cap;
+static int hf_gsm_a_umts_128_mcps_tdd_rat_cap;
+static int hf_gsm_a_geran_feature_package_1;
+static int hf_gsm_a_ext_dtm_e_gprs_multi_slot_info_present;
+static int hf_gsm_a_ext_dtm_gprs_multi_slot_class;
+static int hf_gsm_a_ext_dtm_egprs_multi_slot_class;
+static int hf_gsm_a_high_multislot_cap_present;
+static int hf_gsm_a_high_multislot_cap;
+static int hf_gsm_a_geran_iu_mode_support;
+static int hf_gsm_a_geran_iu_mode_cap;
+static int hf_gsm_a_geran_iu_mode_cap_length;
+static int hf_gsm_a_flo_iu_cap;
+static int hf_gsm_a_geran_feature_package_2;
+static int hf_gsm_a_gmsk_multislot_power_prof;
+static int hf_gsm_a_8_psk_multislot_power_prof;
+static int hf_gsm_a_t_gsm_400_band_info_present;
+static int hf_gsm_a_t_gsm_400_bands_supported;
+static int hf_gsm_a_t_gsm_400_assoc_radio_cap;
+static int hf_gsm_a_t_gsm_900_assoc_radio_cap_present;
+static int hf_gsm_a_t_gsm_900_assoc_radio_cap;
+static int hf_gsm_a_downlink_adv_receiver_perf;
+static int hf_gsm_a_dtm_enhancements_cap;
+static int hf_gsm_a_dtm_e_gprs_high_multi_slot_info_present;
+static int hf_gsm_a_dtm_gprs_high_multi_slot_class;
+static int hf_gsm_a_offset_required;
+static int hf_gsm_a_dtm_egprs_high_multi_slot_class_present;
+static int hf_gsm_a_dtm_egprs_high_multi_slot_class;
+static int hf_gsm_a_repeated_acch_cap;
+static int hf_gsm_a_gsm_710_assoc_radio_cap_present;
+static int hf_gsm_a_gsm_710_assoc_radio_cap;
+static int hf_gsm_a_t_gsm_810_assoc_radio_cap_present;
+static int hf_gsm_a_t_gsm_810_assoc_radio_cap;
+static int hf_gsm_a_ciphering_mode_setting_cap;
+static int hf_gsm_a_additional_positioning_caps;
+static int hf_gsm_a_e_utra_fdd_support;
+static int hf_gsm_a_e_utra_tdd_support;
+static int hf_gsm_a_e_utra_meas_and_report_support;
+static int hf_gsm_a_prio_based_resel_support;
+static int hf_gsm_a_utra_csg_cells_reporting;
+static int hf_gsm_a_vamos_level;
+static int hf_gsm_a_tighter_cap;
+static int hf_gsm_a_selective_ciph_down_sacch;
+static int hf_gsm_a_cs_to_ps_srvcc_geran_to_utra;
+static int hf_gsm_a_cs_to_ps_srvcc_geran_to_eutra;
+static int hf_gsm_a_geran_network_sharing_support;
+static int hf_gsm_a_eutra_wb_rsrq_support;
+static int hf_gsm_a_er_band_support;
+static int hf_gsm_a_utra_mfbi_support;
+static int hf_gsm_a_eutra_mfbi_support;
+static int hf_gsm_a_ext_tsc_set_cap_support;
+static int hf_gsm_a_ext_earfcn_value_range;
+
+static int hf_gsm_a_geo_loc_type_of_shape;
+static int hf_gsm_a_geo_loc_sign_of_lat;
+static int hf_gsm_a_geo_loc_deg_of_lat;
+static int hf_gsm_a_geo_loc_deg_of_long;
+static int hf_gsm_a_geo_loc_osm_uri;
+static int hf_gsm_a_geo_loc_uncertainty_code;
+static int hf_gsm_a_geo_loc_uncertainty_semi_major;
+static int hf_gsm_a_geo_loc_uncertainty_semi_minor;
+static int hf_gsm_a_geo_loc_orientation_of_major_axis;
+static int hf_gsm_a_geo_loc_uncertainty_altitude;
+static int hf_gsm_a_geo_loc_confidence;
+static int hf_gsm_a_geo_loc_uncertainty_range;
+static int hf_gsm_a_geo_loc_horizontal_confidence;
+static int hf_gsm_a_geo_loc_horizontal_uncertainty_range;
+static int hf_gsm_a_geo_loc_vertical_confidence;
+static int hf_gsm_a_geo_loc_vertical_uncertainty_range;
+static int hf_gsm_a_geo_loc_high_acc_uncertainty_alt;
+static int hf_gsm_a_geo_loc_no_of_points;
+static int hf_gsm_a_geo_loc_high_acc_deg_of_lat;
+static int hf_gsm_a_geo_loc_high_acc_deg_of_long;
+static int hf_gsm_a_geo_loc_high_acc_uncertainty_semi_major;
+static int hf_gsm_a_geo_loc_high_acc_uncertainty_semi_minor;
+static int hf_gsm_a_geo_loc_high_acc_alt;
+static int hf_gsm_a_velocity_type;
+static int hf_gsm_a_bearing;
+static int hf_gsm_a_horizontal_speed;
+static int hf_gsm_a_uncertainty_speed;
+static int hf_gsm_a_h_uncertainty_speed;
+static int hf_gsm_a_v_uncertainty_speed;
+static int hf_gsm_a_vertical_speed;
+static int hf_gsm_a_d;
+static int hf_gsm_a_geo_loc_D;
+static int hf_gsm_a_geo_loc_altitude;
+static int hf_gsm_a_geo_loc_inner_radius;
+static int hf_gsm_a_geo_loc_uncertainty_radius;
+static int hf_gsm_a_geo_loc_offset_angle;
+static int hf_gsm_a_geo_loc_included_angle;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_gsm_a_filler = -1;
-static int hf_gsm_a_identity_digit1 = -1;
-static int hf_gsm_a_group_call_reference = -1;
-static int hf_gsm_a_service_flag = -1;
-static int hf_gsm_a_af_acknowledgement = -1;
-static int hf_gsm_a_call_priority = -1;
-static int hf_gsm_a_ciphering_info = -1;
-static int hf_gsm_a_sapi = -1;
+static int hf_gsm_a_filler;
+static int hf_gsm_a_identity_digit1;
+static int hf_gsm_a_group_call_reference;
+static int hf_gsm_a_service_flag;
+static int hf_gsm_a_af_acknowledgement;
+static int hf_gsm_a_call_priority;
+static int hf_gsm_a_ciphering_info;
+static int hf_gsm_a_sapi;
 
 /* Inter protocol hf */
-int hf_3gpp_tmsi = -1;
-
-static int ett_gsm_a_plmn = -1;
-static int ett_gsm_a_poly_pnt = -1;
-
-static expert_field ei_gsm_a_extraneous_data = EI_INIT;
-static expert_field ei_gsm_a_unknown_element = EI_INIT;
-static expert_field ei_gsm_a_unknown_pdu_type = EI_INIT;
-static expert_field ei_gsm_a_no_element_dissector = EI_INIT;
-static expert_field ei_gsm_a_format_not_supported = EI_INIT;
-static expert_field ei_gsm_a_mobile_identity_type = EI_INIT;
-static expert_field ei_gsm_a_ie_length_too_short = EI_INIT;
+int hf_3gpp_tmsi;
+
+static int ett_gsm_a_plmn;
+static int ett_gsm_a_poly_pnt;
+
+static expert_field ei_gsm_a_extraneous_data;
+static expert_field ei_gsm_a_unknown_element;
+static expert_field ei_gsm_a_unknown_pdu_type;
+static expert_field ei_gsm_a_no_element_dissector;
+static expert_field ei_gsm_a_format_not_supported;
+static expert_field ei_gsm_a_mobile_identity_type;
+static expert_field ei_gsm_a_ie_length_too_short;
 
 sccp_assoc_info_t* sccp_assoc = NULL;
 
diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c
index badec74f0e..44520741be 100644
--- a/epan/dissectors/packet-gsm_a_dtap.c
+++ b/epan/dissectors/packet-gsm_a_dtap.c
@@ -456,309 +456,309 @@ static const true_false_string tfs_acceptable_not_acceptable = { "Acceptable", "
 #define DTAP_TP_IEI_MASK    0xff
 
 /* Initialize the protocol and registered fields */
-static int proto_a_dtap = -1;
-
-static int hf_gsm_a_dtap_msg_gcc_type = -1;
-static int hf_gsm_a_dtap_msg_bcc_type = -1;
-static int hf_gsm_a_dtap_msg_mm_type = -1;
-static int hf_gsm_a_dtap_msg_cc_type = -1;
-static int hf_gsm_a_seq_no = -1;
-static int hf_gsm_a_dtap_msg_sms_type = -1;
-static int hf_gsm_a_dtap_msg_ss_type = -1;
-static int hf_gsm_a_dtap_msg_tp_type = -1;
-int hf_gsm_a_dtap_elem_id = -1;
-static int hf_gsm_a_dtap_cld_party_bcd_num = -1;
-static int hf_gsm_a_dtap_clg_party_bcd_num = -1;
-static int hf_gsm_a_dtap_conn_num   = -1;
-static int hf_gsm_a_dtap_red_party_bcd_num = -1;
-static int hf_gsm_a_dtap_present_ind = -1;
-static int hf_gsm_a_dtap_screening_ind = -1;
-static int hf_gsm_a_dtap_type_of_sub_addr   = -1;
-static int hf_gsm_a_dtap_odd_even_ind   = -1;
-
-static int hf_gsm_a_dtap_cause = -1;
-static int hf_gsm_a_dtap_cause_ss_diagnostics   = -1;
-static int hf_gsm_a_dtap_emergency_bcd_num  = -1;
-static int hf_gsm_a_dtap_emerg_num_info_length = -1;
-
-static int hf_gsm_a_dtap_type_of_number = -1;
-static int hf_gsm_a_dtap_numbering_plan_id = -1;
-
-static int hf_gsm_a_dtap_lsa_id = -1;
-static int hf_gsm_a_dtap_speech_vers_ind = -1;
-static int hf_gsm_a_dtap_itc = -1;
-static int hf_gsm_a_dtap_sysid = -1;
-static int hf_gsm_a_dtap_bitmap_length = -1;
-static int hf_gsm_a_dtap_serv_cat_b7 = -1;
-static int hf_gsm_a_dtap_serv_cat_b6 = -1;
-static int hf_gsm_a_dtap_serv_cat_b5 = -1;
-static int hf_gsm_a_dtap_serv_cat_b4 = -1;
-static int hf_gsm_a_dtap_serv_cat_b3 = -1;
-static int hf_gsm_a_dtap_serv_cat_b2 = -1;
-static int hf_gsm_a_dtap_serv_cat_b1 = -1;
-static int hf_gsm_a_dtap_drvcc = -1;
-static int hf_gsm_a_dtap_csmo = -1;
-static int hf_gsm_a_dtap_csmt = -1;
-static int hf_gsm_a_dtap_mm_timer_unit = -1;
-static int hf_gsm_a_dtap_mm_timer_value = -1;
-static int hf_gsm_a_dtap_alerting_pattern = -1;
-static int hf_gsm_a_dtap_ccbs_activation = -1;
-static int hf_gsm_a_dtap_stream_identifier = -1;
-static int hf_gsm_a_dtap_mcs = -1;
-static int hf_gsm_a_dtap_cause_of_no_cli = -1;
-static int hf_gsm_a_dtap_signal_value = -1;
-
-static int hf_gsm_a_dtap_codec_tdma_efr = -1;
-static int hf_gsm_a_dtap_codec_umts_amr_2 = -1;
-static int hf_gsm_a_dtap_codec_umts_amr = -1;
-static int hf_gsm_a_dtap_codec_hr_amr = -1;
-static int hf_gsm_a_dtap_codec_fr_amr = -1;
-static int hf_gsm_a_dtap_codec_gsm_efr = -1;
-static int hf_gsm_a_dtap_codec_gsm_hr = -1;
-static int hf_gsm_a_dtap_codec_gsm_fr = -1;
-static int hf_gsm_a_dtap_codec_umts_evs = -1;
-static int hf_gsm_a_dtap_codec_ohr_amr_wb = -1;
-static int hf_gsm_a_dtap_codec_ofr_amr_wb = -1;
-static int hf_gsm_a_dtap_codec_ohr_amr = -1;
-static int hf_gsm_a_dtap_codec_umts_amr_wb = -1;
-static int hf_gsm_a_dtap_codec_fr_amr_wb = -1;
-static int hf_gsm_a_dtap_codec_pdc_efr = -1;
-
-static int hf_gsm_a_dtap_notification_description = -1;
-static int hf_gsm_a_dtap_recall_type    = -1;
-static int hf_gsm_a_dtap_coding_standard    = -1;
-static int hf_gsm_a_dtap_call_state = -1;
-static int hf_gsm_a_dtap_prog_coding_standard    = -1;
-static int hf_gsm_a_dtap_location   = -1;
-static int hf_gsm_a_dtap_progress_description   = -1;
-static int hf_gsm_a_dtap_afi    = -1;
-static int hf_gsm_a_dtap_rej_cause  = -1;
-static int hf_gsm_a_dtap_timezone  = -1;
-static int hf_gsm_a_dtap_u2u_prot_discr = -1;
-static int hf_gsm_a_dtap_mcat   = -1;
-static int hf_gsm_a_dtap_enicm  = -1;
-static int hf_gsm_a_dtap_rand   = -1;
-static int hf_gsm_a_dtap_autn   = -1;
-static int hf_gsm_a_dtap_xres   = -1;
-static int hf_gsm_a_dtap_sres   = -1;
-static int hf_gsm_a_dtap_auts   = -1;
-static int hf_gsm_a_dtap_autn_sqn_xor_ak = -1;
-static int hf_gsm_a_dtap_autn_amf   = -1;
-static int hf_gsm_a_dtap_autn_mac   = -1;
-static int hf_gsm_a_dtap_auts_sqn_ms_xor_ak  = -1;
-static int hf_gsm_a_dtap_auts_mac_s = -1;
-
-static int hf_gsm_a_dtap_epc_ue_tl_mode = -1;
-static int hf_gsm_a_dtap_epc_ue_tl_a_ul_sdu_size = -1;
-static int hf_gsm_a_dtap_epc_ue_tl_a_drb = -1;
-static int hf_gsm_a_dtap_epc_ue_tl_b_ip_pdu_delay = -1;
-static int hf_gsm_a_dtap_epc_ue_tl_c_mbsfn_area_id = -1;
-static int hf_gsm_a_dtap_epc_ue_tl_c_mch_id = -1;
-static int hf_gsm_a_dtap_epc_ue_tl_c_lcid = -1;
-static int hf_gsm_a_dtap_epc_ue_tl_d_discovery = -1;
-static int hf_gsm_a_dtap_epc_ue_tl_d_prose_app_code = -1;
-static int hf_gsm_a_dtap_epc_ue_tl_e_communication = -1;
-static int hf_gsm_a_dtap_epc_ue_tl_e_group_destination_id = -1;
-static int hf_gsm_a_dtap_epc_ue_tl_f_sc_mtch_id = -1;
-static int hf_gsm_a_dtap_epc_ue_tl_gh_ul_loopback_op_mode = -1;
-static int hf_gsm_a_dtap_epc_ue_tl_gh_repetitions = -1;
-static int hf_gsm_a_dtap_epc_ue_tl_gh_ul_data_delay = -1;
-static int hf_gsm_a_dtap_epc_ue_positioning_technology = -1;
-static int hf_gsm_a_dtap_epc_mbms_packet_counter_value = -1;
-static int hf_gsm_a_dtap_epc_latitude_sign = -1;
-static int hf_gsm_a_dtap_epc_degrees_latitude = -1;
-static int hf_gsm_a_dtap_epc_degrees_longitude = -1;
-static int hf_gsm_a_dtap_epc_altitude_dir = -1;
-static int hf_gsm_a_dtap_epc_altitude = -1;
-static int hf_gsm_a_dtap_epc_bearing = -1;
-static int hf_gsm_a_dtap_epc_horizontal_speed = -1;
-static int hf_gsm_a_dtap_epc_gnss_tod_msec = -1;
+static int proto_a_dtap;
+
+static int hf_gsm_a_dtap_msg_gcc_type;
+static int hf_gsm_a_dtap_msg_bcc_type;
+static int hf_gsm_a_dtap_msg_mm_type;
+static int hf_gsm_a_dtap_msg_cc_type;
+static int hf_gsm_a_seq_no;
+static int hf_gsm_a_dtap_msg_sms_type;
+static int hf_gsm_a_dtap_msg_ss_type;
+static int hf_gsm_a_dtap_msg_tp_type;
+int hf_gsm_a_dtap_elem_id;
+static int hf_gsm_a_dtap_cld_party_bcd_num;
+static int hf_gsm_a_dtap_clg_party_bcd_num;
+static int hf_gsm_a_dtap_conn_num;
+static int hf_gsm_a_dtap_red_party_bcd_num;
+static int hf_gsm_a_dtap_present_ind;
+static int hf_gsm_a_dtap_screening_ind;
+static int hf_gsm_a_dtap_type_of_sub_addr;
+static int hf_gsm_a_dtap_odd_even_ind;
+
+static int hf_gsm_a_dtap_cause;
+static int hf_gsm_a_dtap_cause_ss_diagnostics;
+static int hf_gsm_a_dtap_emergency_bcd_num;
+static int hf_gsm_a_dtap_emerg_num_info_length;
+
+static int hf_gsm_a_dtap_type_of_number;
+static int hf_gsm_a_dtap_numbering_plan_id;
+
+static int hf_gsm_a_dtap_lsa_id;
+static int hf_gsm_a_dtap_speech_vers_ind;
+static int hf_gsm_a_dtap_itc;
+static int hf_gsm_a_dtap_sysid;
+static int hf_gsm_a_dtap_bitmap_length;
+static int hf_gsm_a_dtap_serv_cat_b7;
+static int hf_gsm_a_dtap_serv_cat_b6;
+static int hf_gsm_a_dtap_serv_cat_b5;
+static int hf_gsm_a_dtap_serv_cat_b4;
+static int hf_gsm_a_dtap_serv_cat_b3;
+static int hf_gsm_a_dtap_serv_cat_b2;
+static int hf_gsm_a_dtap_serv_cat_b1;
+static int hf_gsm_a_dtap_drvcc;
+static int hf_gsm_a_dtap_csmo;
+static int hf_gsm_a_dtap_csmt;
+static int hf_gsm_a_dtap_mm_timer_unit;
+static int hf_gsm_a_dtap_mm_timer_value;
+static int hf_gsm_a_dtap_alerting_pattern;
+static int hf_gsm_a_dtap_ccbs_activation;
+static int hf_gsm_a_dtap_stream_identifier;
+static int hf_gsm_a_dtap_mcs;
+static int hf_gsm_a_dtap_cause_of_no_cli;
+static int hf_gsm_a_dtap_signal_value;
+
+static int hf_gsm_a_dtap_codec_tdma_efr;
+static int hf_gsm_a_dtap_codec_umts_amr_2;
+static int hf_gsm_a_dtap_codec_umts_amr;
+static int hf_gsm_a_dtap_codec_hr_amr;
+static int hf_gsm_a_dtap_codec_fr_amr;
+static int hf_gsm_a_dtap_codec_gsm_efr;
+static int hf_gsm_a_dtap_codec_gsm_hr;
+static int hf_gsm_a_dtap_codec_gsm_fr;
+static int hf_gsm_a_dtap_codec_umts_evs;
+static int hf_gsm_a_dtap_codec_ohr_amr_wb;
+static int hf_gsm_a_dtap_codec_ofr_amr_wb;
+static int hf_gsm_a_dtap_codec_ohr_amr;
+static int hf_gsm_a_dtap_codec_umts_amr_wb;
+static int hf_gsm_a_dtap_codec_fr_amr_wb;
+static int hf_gsm_a_dtap_codec_pdc_efr;
+
+static int hf_gsm_a_dtap_notification_description;
+static int hf_gsm_a_dtap_recall_type;
+static int hf_gsm_a_dtap_coding_standard;
+static int hf_gsm_a_dtap_call_state;
+static int hf_gsm_a_dtap_prog_coding_standard;
+static int hf_gsm_a_dtap_location;
+static int hf_gsm_a_dtap_progress_description;
+static int hf_gsm_a_dtap_afi;
+static int hf_gsm_a_dtap_rej_cause;
+static int hf_gsm_a_dtap_timezone;
+static int hf_gsm_a_dtap_u2u_prot_discr;
+static int hf_gsm_a_dtap_mcat;
+static int hf_gsm_a_dtap_enicm;
+static int hf_gsm_a_dtap_rand;
+static int hf_gsm_a_dtap_autn;
+static int hf_gsm_a_dtap_xres;
+static int hf_gsm_a_dtap_sres;
+static int hf_gsm_a_dtap_auts;
+static int hf_gsm_a_dtap_autn_sqn_xor_ak;
+static int hf_gsm_a_dtap_autn_amf;
+static int hf_gsm_a_dtap_autn_mac;
+static int hf_gsm_a_dtap_auts_sqn_ms_xor_ak;
+static int hf_gsm_a_dtap_auts_mac_s;
+
+static int hf_gsm_a_dtap_epc_ue_tl_mode;
+static int hf_gsm_a_dtap_epc_ue_tl_a_ul_sdu_size;
+static int hf_gsm_a_dtap_epc_ue_tl_a_drb;
+static int hf_gsm_a_dtap_epc_ue_tl_b_ip_pdu_delay;
+static int hf_gsm_a_dtap_epc_ue_tl_c_mbsfn_area_id;
+static int hf_gsm_a_dtap_epc_ue_tl_c_mch_id;
+static int hf_gsm_a_dtap_epc_ue_tl_c_lcid;
+static int hf_gsm_a_dtap_epc_ue_tl_d_discovery;
+static int hf_gsm_a_dtap_epc_ue_tl_d_prose_app_code;
+static int hf_gsm_a_dtap_epc_ue_tl_e_communication;
+static int hf_gsm_a_dtap_epc_ue_tl_e_group_destination_id;
+static int hf_gsm_a_dtap_epc_ue_tl_f_sc_mtch_id;
+static int hf_gsm_a_dtap_epc_ue_tl_gh_ul_loopback_op_mode;
+static int hf_gsm_a_dtap_epc_ue_tl_gh_repetitions;
+static int hf_gsm_a_dtap_epc_ue_tl_gh_ul_data_delay;
+static int hf_gsm_a_dtap_epc_ue_positioning_technology;
+static int hf_gsm_a_dtap_epc_mbms_packet_counter_value;
+static int hf_gsm_a_dtap_epc_latitude_sign;
+static int hf_gsm_a_dtap_epc_degrees_latitude;
+static int hf_gsm_a_dtap_epc_degrees_longitude;
+static int hf_gsm_a_dtap_epc_altitude_dir;
+static int hf_gsm_a_dtap_epc_altitude;
+static int hf_gsm_a_dtap_epc_bearing;
+static int hf_gsm_a_dtap_epc_horizontal_speed;
+static int hf_gsm_a_dtap_epc_gnss_tod_msec;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_gsm_a_dtap_maximum_number_of_supported_bearers = -1;
-static int hf_gsm_a_dtap_edge_channel_codings = -1;
-static int hf_gsm_a_dtap_acceptable_channel_codings_TCH_F9_6 = -1;
-static int hf_gsm_a_dtap_assignor_assignee = -1;
-static int hf_gsm_a_dtap_configuration = -1;
-static int hf_gsm_a_dtap_de_cause_coding_standard = -1;
-static int hf_gsm_a_dtap_ss_version_indicator = -1;
-static int hf_gsm_a_dtap_mode_of_operation = -1;
-static int hf_gsm_a_dtap_bearer_cap_coding_standard = -1;
-static int hf_gsm_a_dtap_nirr = -1;
-static int hf_gsm_a_dtap_other_rate_adaption = -1;
-static int hf_gsm_a_dtap_connection_element = -1;
-static int hf_gsm_a_dtap_nic_on_tx = -1;
-static int hf_gsm_a_dtap_user_rate = -1;
-static int hf_gsm_a_dtap_protocol_discriminator = -1;
-static int hf_gsm_a_dtap_cp_cause = -1;
-static int hf_gsm_a_dtap_rate_adaption_header = -1;
-static int hf_gsm_a_dtap_synchronous = -1;
-static int hf_gsm_a_dtap_logical_link_identifier_negotiation = -1;
-static int hf_gsm_a_dtap_multi_party_auxiliary_state = -1;
-static int hf_gsm_a_dtap_parity_information = -1;
-static int hf_gsm_a_dtap_channel_coding03 = -1;
-static int hf_gsm_a_dtap_channel_coding30 = -1;
-static int hf_gsm_a_dtap_loop_mechanism0E = -1;
-static int hf_gsm_a_dtap_loop_mechanism1C = -1;
-static int hf_gsm_a_dtap_multislot_tch = -1;
-static int hf_gsm_a_dtap_acceptable_channel_codings_ext_TCH_F43_2 = -1;
-static int hf_gsm_a_dtap_ue_positioning_technology = -1;
-static int hf_gsm_a_dtap_acceptable_channel_codings_TCH_F4_8 = -1;
-static int hf_gsm_a_dtap_number_of_spare_bits = -1;
-static int hf_gsm_a_dtap_tie = -1;
-static int hf_gsm_a_dtap_updating_type = -1;
-static int hf_gsm_a_dtap_multiple_frame_establishment_support = -1;
-static int hf_gsm_a_dtap_maximum_number_of_traffic_channels = -1;
-static int hf_gsm_a_dtap_compression = -1;
-static int hf_gsm_a_dtap_compression_up = -1;
-static int hf_gsm_a_dtap_downlink_timeslot_offset = -1;
-static int hf_gsm_a_dtap_acceptable_channel_codings_ext_TCH_F32_0 = -1;
-static int hf_gsm_a_dtap_tio = -1;
-static int hf_gsm_a_dtap_other_modem_type = -1;
-static int hf_gsm_a_dtap_other_itc = -1;
-static int hf_gsm_a_dtap_negotiation = -1;
-static int hf_gsm_a_dtap_rate_adaption = -1;
-static int hf_gsm_a_dtap_ms_positioning_technology = -1;
-static int hf_gsm_a_dtap_ue_test_loop_mode = -1;
-static int hf_gsm_a_dtap_number_of_data_bits = -1;
-static int hf_gsm_a_dtap_follow_on_request = -1;
-static int hf_gsm_a_dtap_repeat_indicator = -1;
-static int hf_gsm_a_dtap_dst_adjustment = -1;
-static int hf_gsm_a_dtap_pcp = -1;
-static int hf_gsm_a_dtap_user_information_layer_2_protocol = -1;
-static int hf_gsm_a_dtap_structure = -1;
-static int hf_gsm_a_dtap_congestion_level = -1;
-static int hf_gsm_a_dtap_access_identity = -1;
-static int hf_gsm_a_dtap_modem_type = -1;
-static int hf_gsm_a_dtap_test_loop = -1;
-static int hf_gsm_a_dtap_subchannel = -1;
-static int hf_gsm_a_dtap_ack_element = -1;
-static int hf_gsm_a_dtap_layer_1_identity = -1;
-static int hf_gsm_a_dtap_ciphering_key_sequence_number70 = -1;
-static int hf_gsm_a_dtap_tp_pdu_description = -1;
-static int hf_gsm_a_dtap_mode_flag = -1;
-static int hf_gsm_a_dtap_egprs_mode_flag = -1;
-static int hf_gsm_a_dtap_dtmf = -1;
-static int hf_gsm_a_dtap_coding = -1;
-static int hf_gsm_a_dtap_nic_on_rx = -1;
-static int hf_gsm_a_dtap_emergency_number_information = -1;
-static int hf_gsm_a_dtap_uimi = -1;
-static int hf_gsm_a_dtap_number_of_stop_bits = -1;
-static int hf_gsm_a_dtap_acceptable_channel_codings_spare78 = -1;
-static int hf_gsm_a_dtap_type_of_identity = -1;
-static int hf_gsm_a_dtap_ciphering_key_sequence_number = -1;
-static int hf_gsm_a_dtap_recommendation = -1;
-static int hf_gsm_a_dtap_max_num_of_speech_bearers = -1;
-static int hf_gsm_a_dtap_keypad_information = -1;
-static int hf_gsm_a_dtap_signalling_access_protocol = -1;
-static int hf_gsm_a_dtap_user_information_layer_1_protocol = -1;
-static int hf_gsm_a_dtap_wanted_air_interface_user_rate = -1;
-static int hf_gsm_a_dtap_hold_auxiliary_state = -1;
-static int hf_gsm_a_dtap_radio_channel_requirement = -1;
-static int hf_gsm_a_dtap_channel_coding_asymmetry_indication = -1;
-static int hf_gsm_a_dtap_service_type = -1;
-static int hf_gsm_a_dtap_text_string = -1;
-static int hf_gsm_a_dtap_tp_tested_device = -1;
-static int hf_gsm_a_dtap_fixed_network_user_rate = -1;
-static int hf_gsm_a_dtap_coding_scheme = -1;
-static int hf_gsm_a_dtap_acceptable_channel_codings_ext_TCH_F28_8 = -1;
-static int hf_gsm_a_dtap_v110_x30_rate_adaptation = -1;
-static int hf_gsm_a_dtap_transfer_mode = -1;
-static int hf_gsm_a_dtap_layer_2_identity = -1;
-static int hf_gsm_a_dtap_add_ci = -1;
-static int hf_gsm_a_dtap_mm_timer = -1;
-static int hf_gsm_a_dtap_in_out_band = -1;
-static int hf_gsm_a_dtap_data = -1;
-static int hf_gsm_a_dtap_acceptable_channel_codings_TCH_F14_4 = -1;
-static int hf_gsm_a_dtap_ti_flag = -1;
-static int hf_gsm_a_dtap_time_zone_time = -1;
-static int hf_gsm_a_dtap_acceptable_channel_codings_spare20 = -1;
-static int hf_gsm_a_dtap_establishment = -1;
-static int hf_gsm_a_dtap_duplex_mode = -1;
-static int hf_gsm_a_dtap_subaddress = -1;
-static int hf_gsm_a_dtap_subaddress_information = -1;
-static int hf_gsm_a_dtap_message_elements = -1;
-static int hf_gsm_a_dtap_rpdu = -1;
-static int hf_gsm_a_dtap_timeslot_number = -1;
-static int hf_gsm_a_dtap_uplink_rlc_sdu_size = -1;
-static int hf_gsm_a_dtap_radio_bearer = -1;
-static int hf_gsm_a_dtap_mbms_short_transmission_identity = -1;
-static int hf_gsm_a_dtap_ue_received_rlc_sdu_counter_value = -1;
-static int hf_gsm_a_dtap_num_lb_entities = -1;
-
-
-static int hf_gsm_a_dtap_gcc_call_ref              = -1;
-static int hf_gsm_a_dtap_gcc_call_ref_has_priority = -1;
-static int hf_gsm_a_dtap_gcc_call_priority         = -1;
-static int hf_gsm_a_dtap_gcc_call_state            = -1;
-static int hf_gsm_a_dtap_gcc_cause                 = -1;
-static int hf_gsm_a_dtap_gcc_cause_structure       = -1;
-static int hf_gsm_a_dtap_gcc_orig_ind              = -1;
-static int hf_gsm_a_dtap_gcc_state_attr            = -1;
-static int hf_gsm_a_dtap_gcc_state_attr_da         = -1;
-static int hf_gsm_a_dtap_gcc_state_attr_ua         = -1;
-static int hf_gsm_a_dtap_gcc_state_attr_comm       = -1;
-static int hf_gsm_a_dtap_gcc_state_attr_oi         = -1;
-
-static int hf_gsm_a_dtap_gcc_spare_1 = -1;
-static int hf_gsm_a_dtap_gcc_spare_3 = -1;
-static int hf_gsm_a_dtap_gcc_spare_4 = -1;
-
-static int hf_gsm_a_dtap_bcc_call_ref              = -1;
-static int hf_gsm_a_dtap_bcc_call_ref_has_priority = -1;
-static int hf_gsm_a_dtap_bcc_call_priority         = -1;
-static int hf_gsm_a_dtap_bcc_call_state            = -1;
-static int hf_gsm_a_dtap_bcc_cause                 = -1;
-static int hf_gsm_a_dtap_bcc_cause_structure       = -1;
-static int hf_gsm_a_dtap_bcc_orig_ind              = -1;
-static int hf_gsm_a_dtap_bcc_state_attr            = -1;
-static int hf_gsm_a_dtap_bcc_state_attr_da         = -1;
-static int hf_gsm_a_dtap_bcc_state_attr_ua         = -1;
-static int hf_gsm_a_dtap_bcc_state_attr_comm       = -1;
-static int hf_gsm_a_dtap_bcc_state_attr_oi         = -1;
-static int hf_gsm_a_dtap_bcc_compr_otdi            = -1;
-
-static int hf_gsm_a_dtap_bcc_spare_1 = -1;
-static int hf_gsm_a_dtap_bcc_spare_3 = -1;
-static int hf_gsm_a_dtap_bcc_spare_4 = -1;
+static int hf_gsm_a_dtap_maximum_number_of_supported_bearers;
+static int hf_gsm_a_dtap_edge_channel_codings;
+static int hf_gsm_a_dtap_acceptable_channel_codings_TCH_F9_6;
+static int hf_gsm_a_dtap_assignor_assignee;
+static int hf_gsm_a_dtap_configuration;
+static int hf_gsm_a_dtap_de_cause_coding_standard;
+static int hf_gsm_a_dtap_ss_version_indicator;
+static int hf_gsm_a_dtap_mode_of_operation;
+static int hf_gsm_a_dtap_bearer_cap_coding_standard;
+static int hf_gsm_a_dtap_nirr;
+static int hf_gsm_a_dtap_other_rate_adaption;
+static int hf_gsm_a_dtap_connection_element;
+static int hf_gsm_a_dtap_nic_on_tx;
+static int hf_gsm_a_dtap_user_rate;
+static int hf_gsm_a_dtap_protocol_discriminator;
+static int hf_gsm_a_dtap_cp_cause;
+static int hf_gsm_a_dtap_rate_adaption_header;
+static int hf_gsm_a_dtap_synchronous;
+static int hf_gsm_a_dtap_logical_link_identifier_negotiation;
+static int hf_gsm_a_dtap_multi_party_auxiliary_state;
+static int hf_gsm_a_dtap_parity_information;
+static int hf_gsm_a_dtap_channel_coding03;
+static int hf_gsm_a_dtap_channel_coding30;
+static int hf_gsm_a_dtap_loop_mechanism0E;
+static int hf_gsm_a_dtap_loop_mechanism1C;
+static int hf_gsm_a_dtap_multislot_tch;
+static int hf_gsm_a_dtap_acceptable_channel_codings_ext_TCH_F43_2;
+static int hf_gsm_a_dtap_ue_positioning_technology;
+static int hf_gsm_a_dtap_acceptable_channel_codings_TCH_F4_8;
+static int hf_gsm_a_dtap_number_of_spare_bits;
+static int hf_gsm_a_dtap_tie;
+static int hf_gsm_a_dtap_updating_type;
+static int hf_gsm_a_dtap_multiple_frame_establishment_support;
+static int hf_gsm_a_dtap_maximum_number_of_traffic_channels;
+static int hf_gsm_a_dtap_compression;
+static int hf_gsm_a_dtap_compression_up;
+static int hf_gsm_a_dtap_downlink_timeslot_offset;
+static int hf_gsm_a_dtap_acceptable_channel_codings_ext_TCH_F32_0;
+static int hf_gsm_a_dtap_tio;
+static int hf_gsm_a_dtap_other_modem_type;
+static int hf_gsm_a_dtap_other_itc;
+static int hf_gsm_a_dtap_negotiation;
+static int hf_gsm_a_dtap_rate_adaption;
+static int hf_gsm_a_dtap_ms_positioning_technology;
+static int hf_gsm_a_dtap_ue_test_loop_mode;
+static int hf_gsm_a_dtap_number_of_data_bits;
+static int hf_gsm_a_dtap_follow_on_request;
+static int hf_gsm_a_dtap_repeat_indicator;
+static int hf_gsm_a_dtap_dst_adjustment;
+static int hf_gsm_a_dtap_pcp;
+static int hf_gsm_a_dtap_user_information_layer_2_protocol;
+static int hf_gsm_a_dtap_structure;
+static int hf_gsm_a_dtap_congestion_level;
+static int hf_gsm_a_dtap_access_identity;
+static int hf_gsm_a_dtap_modem_type;
+static int hf_gsm_a_dtap_test_loop;
+static int hf_gsm_a_dtap_subchannel;
+static int hf_gsm_a_dtap_ack_element;
+static int hf_gsm_a_dtap_layer_1_identity;
+static int hf_gsm_a_dtap_ciphering_key_sequence_number70;
+static int hf_gsm_a_dtap_tp_pdu_description;
+static int hf_gsm_a_dtap_mode_flag;
+static int hf_gsm_a_dtap_egprs_mode_flag;
+static int hf_gsm_a_dtap_dtmf;
+static int hf_gsm_a_dtap_coding;
+static int hf_gsm_a_dtap_nic_on_rx;
+static int hf_gsm_a_dtap_emergency_number_information;
+static int hf_gsm_a_dtap_uimi;
+static int hf_gsm_a_dtap_number_of_stop_bits;
+static int hf_gsm_a_dtap_acceptable_channel_codings_spare78;
+static int hf_gsm_a_dtap_type_of_identity;
+static int hf_gsm_a_dtap_ciphering_key_sequence_number;
+static int hf_gsm_a_dtap_recommendation;
+static int hf_gsm_a_dtap_max_num_of_speech_bearers;
+static int hf_gsm_a_dtap_keypad_information;
+static int hf_gsm_a_dtap_signalling_access_protocol;
+static int hf_gsm_a_dtap_user_information_layer_1_protocol;
+static int hf_gsm_a_dtap_wanted_air_interface_user_rate;
+static int hf_gsm_a_dtap_hold_auxiliary_state;
+static int hf_gsm_a_dtap_radio_channel_requirement;
+static int hf_gsm_a_dtap_channel_coding_asymmetry_indication;
+static int hf_gsm_a_dtap_service_type;
+static int hf_gsm_a_dtap_text_string;
+static int hf_gsm_a_dtap_tp_tested_device;
+static int hf_gsm_a_dtap_fixed_network_user_rate;
+static int hf_gsm_a_dtap_coding_scheme;
+static int hf_gsm_a_dtap_acceptable_channel_codings_ext_TCH_F28_8;
+static int hf_gsm_a_dtap_v110_x30_rate_adaptation;
+static int hf_gsm_a_dtap_transfer_mode;
+static int hf_gsm_a_dtap_layer_2_identity;
+static int hf_gsm_a_dtap_add_ci;
+static int hf_gsm_a_dtap_mm_timer;
+static int hf_gsm_a_dtap_in_out_band;
+static int hf_gsm_a_dtap_data;
+static int hf_gsm_a_dtap_acceptable_channel_codings_TCH_F14_4;
+static int hf_gsm_a_dtap_ti_flag;
+static int hf_gsm_a_dtap_time_zone_time;
+static int hf_gsm_a_dtap_acceptable_channel_codings_spare20;
+static int hf_gsm_a_dtap_establishment;
+static int hf_gsm_a_dtap_duplex_mode;
+static int hf_gsm_a_dtap_subaddress;
+static int hf_gsm_a_dtap_subaddress_information;
+static int hf_gsm_a_dtap_message_elements;
+static int hf_gsm_a_dtap_rpdu;
+static int hf_gsm_a_dtap_timeslot_number;
+static int hf_gsm_a_dtap_uplink_rlc_sdu_size;
+static int hf_gsm_a_dtap_radio_bearer;
+static int hf_gsm_a_dtap_mbms_short_transmission_identity;
+static int hf_gsm_a_dtap_ue_received_rlc_sdu_counter_value;
+static int hf_gsm_a_dtap_num_lb_entities;
+
+
+static int hf_gsm_a_dtap_gcc_call_ref;
+static int hf_gsm_a_dtap_gcc_call_ref_has_priority;
+static int hf_gsm_a_dtap_gcc_call_priority;
+static int hf_gsm_a_dtap_gcc_call_state;
+static int hf_gsm_a_dtap_gcc_cause;
+static int hf_gsm_a_dtap_gcc_cause_structure;
+static int hf_gsm_a_dtap_gcc_orig_ind;
+static int hf_gsm_a_dtap_gcc_state_attr;
+static int hf_gsm_a_dtap_gcc_state_attr_da;
+static int hf_gsm_a_dtap_gcc_state_attr_ua;
+static int hf_gsm_a_dtap_gcc_state_attr_comm;
+static int hf_gsm_a_dtap_gcc_state_attr_oi;
+
+static int hf_gsm_a_dtap_gcc_spare_1;
+static int hf_gsm_a_dtap_gcc_spare_3;
+static int hf_gsm_a_dtap_gcc_spare_4;
+
+static int hf_gsm_a_dtap_bcc_call_ref;
+static int hf_gsm_a_dtap_bcc_call_ref_has_priority;
+static int hf_gsm_a_dtap_bcc_call_priority;
+static int hf_gsm_a_dtap_bcc_call_state;
+static int hf_gsm_a_dtap_bcc_cause;
+static int hf_gsm_a_dtap_bcc_cause_structure;
+static int hf_gsm_a_dtap_bcc_orig_ind;
+static int hf_gsm_a_dtap_bcc_state_attr;
+static int hf_gsm_a_dtap_bcc_state_attr_da;
+static int hf_gsm_a_dtap_bcc_state_attr_ua;
+static int hf_gsm_a_dtap_bcc_state_attr_comm;
+static int hf_gsm_a_dtap_bcc_state_attr_oi;
+static int hf_gsm_a_dtap_bcc_compr_otdi;
+
+static int hf_gsm_a_dtap_bcc_spare_1;
+static int hf_gsm_a_dtap_bcc_spare_3;
+static int hf_gsm_a_dtap_bcc_spare_4;
 
 
 
 /* Initialize the subtree pointers */
-static gint ett_dtap_msg = -1;
-static gint ett_dtap_oct_1 = -1;
-static gint ett_cm_srvc_type = -1;
-static gint ett_gsm_enc_info = -1;
-static gint ett_bc_oct_3 = -1;
-static gint ett_bc_oct_3a = -1;
-static gint ett_bc_oct_4 = -1;
-static gint ett_bc_oct_5 = -1;
-static gint ett_bc_oct_5a = -1;
-static gint ett_bc_oct_5b = -1;
-static gint ett_bc_oct_6 = -1;
-static gint ett_bc_oct_6a = -1;
-static gint ett_bc_oct_6b = -1;
-static gint ett_bc_oct_6c = -1;
-static gint ett_bc_oct_6d = -1;
-static gint ett_bc_oct_6e = -1;
-static gint ett_bc_oct_6f = -1;
-static gint ett_bc_oct_6g = -1;
-static gint ett_bc_oct_7 = -1;
-static gint ett_epc_ue_tl_a_lb_setup = -1;
-static gint ett_mm_timer = -1;
-static gint ett_ue_test_loop_mode = -1;
-
-static expert_field ei_gsm_a_dtap_keypad_info_not_dtmf_digit = EI_INIT;
-static expert_field ei_gsm_a_dtap_text_string_not_multiple_of_7 = EI_INIT;
-static expert_field ei_gsm_a_dtap_autn = EI_INIT;
-static expert_field ei_gsm_a_dtap_invalid_ia5_character = EI_INIT;
-static expert_field ei_gsm_a_dtap_auts = EI_INIT;
-static expert_field ei_gsm_a_dtap_not_digit = EI_INIT;
-static expert_field ei_gsm_a_dtap_end_mark_unexpected = EI_INIT;
-static expert_field ei_gsm_a_dtap_extraneous_data = EI_INIT;
-static expert_field ei_gsm_a_dtap_missing_mandatory_element = EI_INIT;
-static expert_field ei_gsm_a_dtap_coding_scheme = EI_INIT;
-static expert_field ei_gsm_a_dtap_ti_not_valid = EI_INIT;
+static gint ett_dtap_msg;
+static gint ett_dtap_oct_1;
+static gint ett_cm_srvc_type;
+static gint ett_gsm_enc_info;
+static gint ett_bc_oct_3;
+static gint ett_bc_oct_3a;
+static gint ett_bc_oct_4;
+static gint ett_bc_oct_5;
+static gint ett_bc_oct_5a;
+static gint ett_bc_oct_5b;
+static gint ett_bc_oct_6;
+static gint ett_bc_oct_6a;
+static gint ett_bc_oct_6b;
+static gint ett_bc_oct_6c;
+static gint ett_bc_oct_6d;
+static gint ett_bc_oct_6e;
+static gint ett_bc_oct_6f;
+static gint ett_bc_oct_6g;
+static gint ett_bc_oct_7;
+static gint ett_epc_ue_tl_a_lb_setup;
+static gint ett_mm_timer;
+static gint ett_ue_test_loop_mode;
+
+static expert_field ei_gsm_a_dtap_keypad_info_not_dtmf_digit;
+static expert_field ei_gsm_a_dtap_text_string_not_multiple_of_7;
+static expert_field ei_gsm_a_dtap_autn;
+static expert_field ei_gsm_a_dtap_invalid_ia5_character;
+static expert_field ei_gsm_a_dtap_auts;
+static expert_field ei_gsm_a_dtap_not_digit;
+static expert_field ei_gsm_a_dtap_end_mark_unexpected;
+static expert_field ei_gsm_a_dtap_extraneous_data;
+static expert_field ei_gsm_a_dtap_missing_mandatory_element;
+static expert_field ei_gsm_a_dtap_coding_scheme;
+static expert_field ei_gsm_a_dtap_ti_not_valid;
 
 
 static dissector_table_t u2u_dissector_table;
diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c
index 18de140200..274801cad0 100644
--- a/epan/dissectors/packet-gsm_a_gm.c
+++ b/epan/dissectors/packet-gsm_a_gm.c
@@ -260,383 +260,383 @@ value_string_ext gsm_gm_elem_strings_ext = VALUE_STRING_EXT_INIT(gsm_gm_elem_str
 #define	DTAP_SM_IEI_MASK	0xff
 
 /* Initialize the protocol and registered fields */
-static int proto_a_gm = -1;
-
-static int hf_gsm_a_dtap_msg_gmm_type = -1;
-static int hf_gsm_a_dtap_msg_sm_type = -1;
-int hf_gsm_a_gm_elem_id = -1;
-static int hf_gsm_a_sm_qos_delay_cls	= -1;
-static int hf_gsm_a_sm_qos_reliability_cls = -1;
-static int hf_gsm_a_sm_qos_traffic_cls = -1;
-static int hf_gsm_a_sm_qos_del_order = -1;
-static int hf_gsm_a_sm_qos_del_of_err_sdu = -1;
-static int hf_gsm_a_sm_qos_ber = -1;
-static int hf_gsm_a_sm_qos_sdu_err_rat = -1;
-static int hf_gsm_a_sm_qos_traff_hdl_pri = -1;
-
-static int hf_gsm_a_gmm_split_pg_cycle_code = -1;
-static int hf_gsm_a_gmm_split_on_ccch = -1;
-static int hf_gsm_a_gmm_non_drx_timer = -1;
-static int hf_gsm_a_gmm_cn_spec_drx_cycle_len_coef = -1;
-
-static int hf_gsm_a_gmm_ptmsi_sig =-1;
-static int hf_gsm_a_gmm_ptmsi_sig2 =-1;
-
-static int hf_gsm_a_sm_tft_op_code = -1;
-static int hf_gsm_a_sm_tft_e_bit = -1;
-static int hf_gsm_a_sm_tft_pkt_flt = -1;
-static int hf_gsm_a_sm_tft_pkt_flt_id = -1;
-static int hf_gsm_a_sm_tft_pkt_flt_dir = -1;
-static int hf_gsm_a_sm_ip4_address = -1;
-static int hf_gsm_a_sm_ip4_mask = -1;
-static int hf_gsm_a_sm_ip6_address = -1;
-static int hf_gsm_a_sm_ip6_mask = -1;
-static int hf_gsm_a_sm_ip6_prefix_length = -1;
-static int hf_gsm_a_sm_tft_protocol_header = -1;
-static int hf_gsm_a_sm_tft_port = -1;
-static int hf_gsm_a_sm_tft_port_low = -1;
-static int hf_gsm_a_sm_tft_port_high = -1;
-static int hf_gsm_a_sm_tft_security = -1;
-static int hf_gsm_a_sm_tft_traffic_class = -1;
-static int hf_gsm_a_sm_tft_traffic_mask = -1;
-static int hf_gsm_a_sm_tft_flow_label_type = -1;
-static int hf_gsm_a_sm_tft_param_id = -1;
-static int hf_gsm_a_sm_tft_packet_filter = -1;
-static int hf_gsm_a_sm_tft_packet_evaluation_precedence = -1;
-static int hf_gsm_a_sm_tft_packet_filter_length = -1;
-static int hf_gsm_a_sm_tft_authorization_token_value = -1;
-static int hf_gsm_a_sm_tft_media_component_number_value = -1;
-static int hf_gsm_a_sm_tft_ip_flow_number = -1;
-static int hf_gsm_a_sm_tft_packet_filter_identifier = -1;
-static int hf_gsm_a_sm_tft_parameter_content = -1;
-static int hf_gsm_a_sm_tft_packet_filter_component_type_id = -1;
-static int hf_gsm_a_sm_tft_mac_addr = -1;
-static int hf_gsm_a_sm_tft_vlan_tag_vid = -1;
-static int hf_gsm_a_sm_tft_vlan_tag_pcp = -1;
-static int hf_gsm_a_sm_tft_vlan_tag_dei = -1;
-static int hf_gsm_a_sm_tft_ethertype = -1;
-static int hf_gsm_a_gm_acc_tech_type = -1;
-static int hf_gsm_a_gm_acc_cap_struct_len = -1;
-static int hf_gsm_a_gm_sms_value = -1;
-static int hf_gsm_a_gm_sm_value = -1;
-static int hf_gsm_a_gm_link_dir = -1;
-static int hf_gsm_a_gm_cause = -1;
-
-static int hf_gsm_a_gm_add_upd_type = -1;
-static int hf_gsm_a_gm_fop = -1;
-static int hf_gsm_a_gm_res_of_attach = -1;
-static int hf_gsm_a_gm_type_of_ciph_alg = -1;
-static int hf_gsm_a_gm_type_of_integ_alg = -1;
-static int hf_gsm_a_gm_imeisv_req = -1;
-static int hf_gsm_a_gm_nsapi = -1;
-static int hf_gsm_a_gm_ac_ref_nr = -1;
-static int hf_gsm_a_gm_force_to_standby = -1;
-static int hf_gsm_a_gm_serv_type = -1;
-static int hf_gsm_a_gm_for = -1;
-static int hf_gsm_a_gm_type_of_attach = -1;
-static int hf_gsm_a_gm_tmsi_flag = -1;
-static int hf_gsm_a_gm_power_off = -1;
-static int hf_gsm_a_gm_type_of_detach_mo = -1;
-static int hf_gsm_a_gm_type_of_detach_mt = -1;
-static int hf_gsm_a_gm_update_type = -1;
-static int hf_gsm_a_gm_gprs_timer = -1;
-static int hf_gsm_a_gm_gprs_timer_unit = -1;
-static int hf_gsm_a_gm_gprs_timer_value = -1;
-static int hf_gsm_a_gm_gprs_timer2 = -1;
-static int hf_gsm_a_gm_gprs_timer2_unit = -1;
-static int hf_gsm_a_gm_gprs_timer2_value = -1;
-static int hf_gsm_a_gm_gprs_timer3 = -1;
-static int hf_gsm_a_gm_gprs_timer3_unit = -1;
-static int hf_gsm_a_gm_gprs_timer3_value = -1;
-static int hf_gsm_a_gm_nsapi_5_ul_stat = -1;
-static int hf_gsm_a_gm_nsapi_6_ul_stat = -1;
-static int hf_gsm_a_gm_nsapi_7_ul_stat = -1;
-static int hf_gsm_a_gm_nsapi_8_ul_stat = -1;
-static int hf_gsm_a_gm_nsapi_9_ul_stat = -1;
-static int hf_gsm_a_gm_nsapi_10_ul_stat = -1;
-static int hf_gsm_a_gm_nsapi_11_ul_stat = -1;
-static int hf_gsm_a_gm_nsapi_12_ul_stat = -1;
-static int hf_gsm_a_gm_nsapi_13_ul_stat = -1;
-static int hf_gsm_a_gm_nsapi_14_ul_stat = -1;
-static int hf_gsm_a_gm_nsapi_15_ul_stat = -1;
-static int hf_gsm_a_gm_device_prop_low_prio = -1;
-static int hf_gsm_a_gm_apn = -1;
-static int hf_gsm_a_gm_pco_pid = -1;
-static int hf_gsm_a_gm_pco_app_spec_info = -1;
-static int hf_gsm_a_gm_type_of_identity = -1;
-int hf_gsm_a_gm_rac = -1;
-static int hf_gsm_a_gm_mta_e = -1;
-static int hf_gsm_a_gm_mta_r = -1;
-static int hf_gsm_a_gm_apc = -1;
-static int hf_gsm_a_gm_otd_a = -1;
-static int hf_gsm_a_gm_otd_b = -1;
-static int hf_gsm_a_gm_gps_a = -1;
-static int hf_gsm_a_gm_gps_b = -1;
-static int hf_gsm_a_gm_gps_c = -1;
-static int hf_gsm_a_gm_motd = -1;
-static int hf_gsm_a_gm_mta_a = -1;
-static int hf_gsm_a_gm_lcs_molr = -1;
-static int hf_gsm_a_gm_mbms = -1;
-static int hf_gsm_a_gm_ims_vops = -1;
-static int hf_gsm_a_gm_emc_bs = -1;
-static int hf_gsm_a_gm_epco = -1;
-static int hf_gsm_a_gm_restrict_ec = -1;
-static int hf_gsm_a_gm_gprs_sms = -1;
-static int hf_gsm_a_gm_req_ms_info_irat = -1;
-static int hf_gsm_a_gm_req_ms_info_irat2 = -1;
-static int hf_gsm_a_gm_ue_usage_setting = -1;
-static int hf_gsm_a_gm_voice_domain_pref_for_eutran = -1;
-static int hf_gsm_a_gm_ptmsi_type = -1;
-static int hf_gsm_a_gm_nri_cont = -1;
-static int hf_gsm_a_gm_paging_time_window = -1;
-static int hf_gsm_a_gm_edrx_value = -1;
-static int hf_gsm_a_gm_ext_paging_time_window = -1;
-static int hf_gsm_a_gm_mac = -1;
-static int hf_gsm_a_gm_up_integ_ind = -1;
-static int hf_gsm_a_gm_dcn_id = -1;
-static int hf_gsm_a_gm_n3en_ind = -1;
-static int hf_gsm_a_sm_pdp_type_org = -1;
-static int hf_gsm_a_sm_qos_mean_thr = -1;
-static int hf_gsm_a_sm_qos_peak_thr = -1;
-static int hf_gsm_a_sm_qos_prec_class = -1;
-static int hf_gsm_a_sm_qos_trans_delay = -1;
-static int hf_gsm_a_sm_qos_signalling_ind = -1;
-static int hf_gsm_a_sm_qos_source_stat_desc = -1;
-static int hf_gsm_a_sm_qos_max_bitrate_upl = -1;
-static int hf_gsm_a_sm_qos_max_bitrate_downl = -1;
-static int hf_gsm_a_sm_qos_guar_bitrate_upl = -1;
-static int hf_gsm_a_sm_qos_guar_bitrate_downl = -1;
-static int hf_gsm_a_sm_qos_max_bitrate_upl_ext = -1;
-static int hf_gsm_a_sm_qos_max_bitrate_downl_ext = -1;
-static int hf_gsm_a_sm_qos_guar_bitrate_upl_ext = -1;
-static int hf_gsm_a_sm_qos_guar_bitrate_downl_ext = -1;
-static int hf_gsm_a_sm_qos_max_bitrate_upl_ext2 = -1;
-static int hf_gsm_a_sm_qos_max_bitrate_downl_ext2 = -1;
-static int hf_gsm_a_sm_qos_guar_bitrate_upl_ext2 = -1;
-static int hf_gsm_a_sm_qos_guar_bitrate_downl_ext2 = -1;
-static int hf_gsm_a_sm_qos_maximum_sdu_size = -1;
-static int hf_gsm_a_sm_eplmnc = -1;
-static int hf_gsm_a_sm_ratc = -1;
-static int hf_gsm_a_sm_cause = -1;
-static int hf_gsm_a_sm_cause_2 = -1;
-static int hf_gsm_a_sm_llc_sapi = -1;
-static int hf_gsm_a_sm_tdi = -1;
-static int hf_gsm_a_sm_packet_flow_id = -1;
-static int hf_gsm_a_sm_tmgi = -1;
-static int hf_gsm_a_sm_enh_nsapi = -1;
-static int hf_gsm_a_sm_req_type = -1;
-static int hf_gsm_a_sm_notif_ind = -1;
-static int hf_gsm_a_sm_connectivity_type = -1;
-static int hf_gsm_a_sm_wlan_utran_offload_accept = -1;
-static int hf_gsm_a_sm_wlan_eutran_offload_accept = -1;
-static int hf_gsm_a_sm_nbifom_cont = -1;
-static int hf_gsm_a_gm_rac_ctrled_early_cm_sending = -1;
-static int hf_gsm_a_gm_rac_pseudo_sync = -1;
-static int hf_gsm_a_gm_rac_vgcs = -1;
-static int hf_gsm_a_gm_rac_vbs = -1;
-static int hf_gsm_a_gm_rac_multislot_capability = -1;
-static int hf_gsm_a_gm_rac_hscsd_multi_slot_class = -1;
-static int hf_gsm_a_gm_rac_gprs_multi_slot_class = -1;
-static int hf_gsm_a_gm_rac_gprs_ext_dyn_alloc_cap = -1;
-static int hf_gsm_a_gm_rac_ecsd_multi_slot_class = -1;
-static int hf_gsm_a_gm_rac_egprs_multi_slot_class = -1;
-static int hf_gsm_a_gm_rac_egprs_ext_dyn_alloc_cap = -1;
-static int hf_gsm_a_gm_rac_dtm_gprs_multi_slot_class = -1;
-static int hf_gsm_a_gm_rac_single_slt_dtm = -1;
-static int hf_gsm_a_gm_rac_dtm_egprs_multi_slot_cls_pres = -1;
-static int hf_gsm_a_gm_rac_dtm_egprs_multi_slot_class = -1;
-static int hf_gsm_a_gm_rac_8psk_pow_cap_pres = -1;
-static int hf_gsm_a_gm_rac_comp_int_meas_cap = -1;
-static int hf_gsm_a_gm_rel_lev_ind = -1;
-static int hf_gsm_a_gm_rac_geran_feat_pkg = -1;
-static int hf_gsm_a_gm_rac_umts_fdd_cap = -1;
-static int hf_gsm_a_gm_rac_umts_384_tdd_ra_cap = -1;
-static int hf_gsm_a_gm_rac_cdma2000_cap = -1;
-static int hf_gsm_a_gm_rac_umts_128_tdd_ra_cap = -1;
-static int hf_gsm_a_gm_rac_mod_based_multi_slot_class_support = -1;
-static int hf_gsm_a_gm_rac_geran_iu_mode_cap = -1;
-static int hf_gsm_a_gm_rac_flo_iu_cap = -1;
-static int hf_gsm_a_gm_rac_mult_tbf_cap = -1;
-static int hf_gsm_a_gm_rac_down_adv_rec_perf = -1;
-static int hf_gsm_a_gm_rac_ext_rlc_mac_ctrl_msg_seg_cap = -1;
-static int hf_gsm_a_gm_rac_dtm_enh_cap = -1;
-static int hf_gsm_a_gm_rac_dtm_gprs_high_multi_slot_class = -1;
-static int hf_gsm_a_gm_rac_dtm_egprs_high_multi_slot_class = -1;
-static int hf_gsm_a_gm_rac_ps_ho_cap = -1;
-static int hf_gsm_a_gm_rac_dtm_ho_cap = -1;
-static int hf_gsm_a_gm_rac_multi_slot_cap_red_down_dual_carrier = -1;
-static int hf_gsm_a_gm_rac_down_dual_carrier_dtm_cap = -1;
-static int hf_gsm_a_gm_rac_flex_ts_assign = -1;
-static int hf_gsm_a_gm_rac_gan_ps_ho_cap = -1;
-static int hf_gsm_a_gm_rac_rlc_non_pers_mode = -1;
-static int hf_gsm_a_gm_rac_reduced_lat_cap = -1;
-static int hf_gsm_a_gm_rac_ul_egprs2 = -1;
-static int hf_gsm_a_gm_rac_dl_egprs2 = -1;
-static int hf_gsm_a_gm_rac_eutra_fdd_support = -1;
-static int hf_gsm_a_gm_rac_eutra_tdd_support = -1;
-static int hf_gsm_a_gm_rac_geran_to_eutra_support_in_geran_ptm = -1;
-static int hf_gsm_a_gm_rac_prio_based_resel_support = -1;
-static int hf_gsm_a_gm_rac_alt_efta_multi_slot_class = -1;
-static int hf_gsm_a_gm_rac_efta_multi_slot_cap_red_down_dual_carrier = -1;
-static int hf_gsm_a_gm_rac_ind_up_layer_pdu_start_cap_for_rlc_um = -1;
-static int hf_gsm_a_gm_rac_emst_cap = -1;
-static int hf_gsm_a_gm_rac_mtti_cap = -1;
-static int hf_gsm_a_gm_rac_utra_csg_cell_report = -1;
-static int hf_gsm_a_gm_rac_eutra_csg_cell_report = -1;
-static int hf_gsm_a_gm_rac_dtr_cap = -1;
-static int hf_gsm_a_gm_rac_emsr_cap = -1;
-static int hf_gsm_a_gm_rac_fast_down_freq_switch_cap = -1;
-static int hf_gsm_a_gm_rac_tighter_cap = -1;
-static int hf_gsm_a_gm_rac_fanr_cap = -1;
-static int hf_gsm_a_gm_rac_ipa_cap = -1;
-static int hf_gsm_a_gm_rac_geran_nw_sharing_support = -1;
-static int hf_gsm_a_gm_rac_eutra_wb_rsrq_support = -1;
-static int hf_gsm_a_gm_rac_utra_mfbi_support = -1;
-static int hf_gsm_a_gm_rac_eutra_mfbi_support = -1;
-static int hf_gsm_a_gm_rac_dlmc_non_contig_intra_band_recep = -1;
-static int hf_gsm_a_gm_rac_dlmc_inter_band_recep = -1;
-static int hf_gsm_a_gm_rac_dlmc_max_bandwidth = -1;
-static int hf_gsm_a_gm_rac_dlmc_max_nb_dl_ts = -1;
-static int hf_gsm_a_gm_rac_dlmc_max_nb_dl_carriers = -1;
-static int hf_gsm_a_gm_rac_ext_tsc_set_cap_support = -1;
-static int hf_gsm_a_gm_rac_ext_earfcn_value_range = -1;
-static int hf_gsm_a_gm_rac_ec_pch_mon_support = -1;
-static int hf_gsm_a_gm_rac_ms_sync_accuracy = -1;
-static int hf_gsm_a_gm_rac_ec_ul_cov_enh_support = -1;
-static int hf_gsm_a_gm_rac_mta_access_sec_support = -1;
-static int hf_gsm_a_gm_rac_ec_paging_ind_chan_mon_support = -1;
-static int hf_gsm_a_sm_ti_flag = -1;
-static int hf_gsm_a_sm_ext = -1;
-
-static int hf_gsm_a_gmm_net_cap_gea1 = -1;
-static int hf_gsm_a_gmm_net_cap_smdch = -1;
-static int hf_gsm_a_gmm_net_cap_smgprs = -1;
-static int hf_gsm_a_gmm_net_cap_ucs2 = -1;
-static int hf_gsm_a_gmm_net_cap_ss_scr_ind = -1;
-static int hf_gsm_a_gmm_net_cap_solsa = -1;
-static int hf_gsm_a_gmm_net_cap_rev = -1;
-static int hf_gsm_a_gmm_net_cap_pfc = -1;
-static int hf_gsm_a_gmm_net_cap_ext_gea_bits = -1;
-static int hf_gsm_a_gmm_net_cap_gea2 = -1;
-static int hf_gsm_a_gmm_net_cap_gea3 = -1;
-static int hf_gsm_a_gmm_net_cap_gea4 = -1;
-static int hf_gsm_a_gmm_net_cap_gea5 = -1;
-static int hf_gsm_a_gmm_net_cap_gea6 = -1;
-static int hf_gsm_a_gmm_net_cap_gea7 = -1;
-static int hf_gsm_a_gmm_net_cap_lcs = -1;
-static int hf_gsm_a_gmm_net_cap_ps_irat_iu = -1;
-static int hf_gsm_a_gmm_net_cap_ps_irat_s1 = -1;
-static int hf_gsm_a_gmm_net_cap_comb_proc = -1;
-static int hf_gsm_a_gmm_net_cap_isr = -1;
-static int hf_gsm_a_gmm_net_cap_srvcc_to_geran = -1;
-static int hf_gsm_a_gmm_net_cap_epc = -1;
-static int hf_gsm_a_gmm_net_cap_nf = -1;
-static int hf_gsm_a_gmm_net_geran_net_sharing = -1;
-static int hf_gsm_a_gmm_net_cap_up_int_prot = -1;
-static int hf_gsm_a_gmm_net_cap_up_gia4 = -1;
-static int hf_gsm_a_gmm_net_cap_up_gia5 = -1;
-static int hf_gsm_a_gmm_net_cap_up_gia6 = -1;
-static int hf_gsm_a_gmm_net_cap_up_gia7 = -1;
-static int hf_gsm_a_gmm_net_cap_epco_ie_ind = -1;
-static int hf_gsm_a_gmm_net_cap_restrict_use_enh_cov = -1;
-static int hf_gsm_a_gmm_net_cap_dc_eutra_nr_cap = -1;
+static int proto_a_gm;
+
+static int hf_gsm_a_dtap_msg_gmm_type;
+static int hf_gsm_a_dtap_msg_sm_type;
+int hf_gsm_a_gm_elem_id;
+static int hf_gsm_a_sm_qos_delay_cls;
+static int hf_gsm_a_sm_qos_reliability_cls;
+static int hf_gsm_a_sm_qos_traffic_cls;
+static int hf_gsm_a_sm_qos_del_order;
+static int hf_gsm_a_sm_qos_del_of_err_sdu;
+static int hf_gsm_a_sm_qos_ber;
+static int hf_gsm_a_sm_qos_sdu_err_rat;
+static int hf_gsm_a_sm_qos_traff_hdl_pri;
+
+static int hf_gsm_a_gmm_split_pg_cycle_code;
+static int hf_gsm_a_gmm_split_on_ccch;
+static int hf_gsm_a_gmm_non_drx_timer;
+static int hf_gsm_a_gmm_cn_spec_drx_cycle_len_coef;
+
+static int hf_gsm_a_gmm_ptmsi_sig;
+static int hf_gsm_a_gmm_ptmsi_sig2;
+
+static int hf_gsm_a_sm_tft_op_code;
+static int hf_gsm_a_sm_tft_e_bit;
+static int hf_gsm_a_sm_tft_pkt_flt;
+static int hf_gsm_a_sm_tft_pkt_flt_id;
+static int hf_gsm_a_sm_tft_pkt_flt_dir;
+static int hf_gsm_a_sm_ip4_address;
+static int hf_gsm_a_sm_ip4_mask;
+static int hf_gsm_a_sm_ip6_address;
+static int hf_gsm_a_sm_ip6_mask;
+static int hf_gsm_a_sm_ip6_prefix_length;
+static int hf_gsm_a_sm_tft_protocol_header;
+static int hf_gsm_a_sm_tft_port;
+static int hf_gsm_a_sm_tft_port_low;
+static int hf_gsm_a_sm_tft_port_high;
+static int hf_gsm_a_sm_tft_security;
+static int hf_gsm_a_sm_tft_traffic_class;
+static int hf_gsm_a_sm_tft_traffic_mask;
+static int hf_gsm_a_sm_tft_flow_label_type;
+static int hf_gsm_a_sm_tft_param_id;
+static int hf_gsm_a_sm_tft_packet_filter;
+static int hf_gsm_a_sm_tft_packet_evaluation_precedence;
+static int hf_gsm_a_sm_tft_packet_filter_length;
+static int hf_gsm_a_sm_tft_authorization_token_value;
+static int hf_gsm_a_sm_tft_media_component_number_value;
+static int hf_gsm_a_sm_tft_ip_flow_number;
+static int hf_gsm_a_sm_tft_packet_filter_identifier;
+static int hf_gsm_a_sm_tft_parameter_content;
+static int hf_gsm_a_sm_tft_packet_filter_component_type_id;
+static int hf_gsm_a_sm_tft_mac_addr;
+static int hf_gsm_a_sm_tft_vlan_tag_vid;
+static int hf_gsm_a_sm_tft_vlan_tag_pcp;
+static int hf_gsm_a_sm_tft_vlan_tag_dei;
+static int hf_gsm_a_sm_tft_ethertype;
+static int hf_gsm_a_gm_acc_tech_type;
+static int hf_gsm_a_gm_acc_cap_struct_len;
+static int hf_gsm_a_gm_sms_value;
+static int hf_gsm_a_gm_sm_value;
+static int hf_gsm_a_gm_link_dir;
+static int hf_gsm_a_gm_cause;
+
+static int hf_gsm_a_gm_add_upd_type;
+static int hf_gsm_a_gm_fop;
+static int hf_gsm_a_gm_res_of_attach;
+static int hf_gsm_a_gm_type_of_ciph_alg;
+static int hf_gsm_a_gm_type_of_integ_alg;
+static int hf_gsm_a_gm_imeisv_req;
+static int hf_gsm_a_gm_nsapi;
+static int hf_gsm_a_gm_ac_ref_nr;
+static int hf_gsm_a_gm_force_to_standby;
+static int hf_gsm_a_gm_serv_type;
+static int hf_gsm_a_gm_for;
+static int hf_gsm_a_gm_type_of_attach;
+static int hf_gsm_a_gm_tmsi_flag;
+static int hf_gsm_a_gm_power_off;
+static int hf_gsm_a_gm_type_of_detach_mo;
+static int hf_gsm_a_gm_type_of_detach_mt;
+static int hf_gsm_a_gm_update_type;
+static int hf_gsm_a_gm_gprs_timer;
+static int hf_gsm_a_gm_gprs_timer_unit;
+static int hf_gsm_a_gm_gprs_timer_value;
+static int hf_gsm_a_gm_gprs_timer2;
+static int hf_gsm_a_gm_gprs_timer2_unit;
+static int hf_gsm_a_gm_gprs_timer2_value;
+static int hf_gsm_a_gm_gprs_timer3;
+static int hf_gsm_a_gm_gprs_timer3_unit;
+static int hf_gsm_a_gm_gprs_timer3_value;
+static int hf_gsm_a_gm_nsapi_5_ul_stat;
+static int hf_gsm_a_gm_nsapi_6_ul_stat;
+static int hf_gsm_a_gm_nsapi_7_ul_stat;
+static int hf_gsm_a_gm_nsapi_8_ul_stat;
+static int hf_gsm_a_gm_nsapi_9_ul_stat;
+static int hf_gsm_a_gm_nsapi_10_ul_stat;
+static int hf_gsm_a_gm_nsapi_11_ul_stat;
+static int hf_gsm_a_gm_nsapi_12_ul_stat;
+static int hf_gsm_a_gm_nsapi_13_ul_stat;
+static int hf_gsm_a_gm_nsapi_14_ul_stat;
+static int hf_gsm_a_gm_nsapi_15_ul_stat;
+static int hf_gsm_a_gm_device_prop_low_prio;
+static int hf_gsm_a_gm_apn;
+static int hf_gsm_a_gm_pco_pid;
+static int hf_gsm_a_gm_pco_app_spec_info;
+static int hf_gsm_a_gm_type_of_identity;
+int hf_gsm_a_gm_rac;
+static int hf_gsm_a_gm_mta_e;
+static int hf_gsm_a_gm_mta_r;
+static int hf_gsm_a_gm_apc;
+static int hf_gsm_a_gm_otd_a;
+static int hf_gsm_a_gm_otd_b;
+static int hf_gsm_a_gm_gps_a;
+static int hf_gsm_a_gm_gps_b;
+static int hf_gsm_a_gm_gps_c;
+static int hf_gsm_a_gm_motd;
+static int hf_gsm_a_gm_mta_a;
+static int hf_gsm_a_gm_lcs_molr;
+static int hf_gsm_a_gm_mbms;
+static int hf_gsm_a_gm_ims_vops;
+static int hf_gsm_a_gm_emc_bs;
+static int hf_gsm_a_gm_epco;
+static int hf_gsm_a_gm_restrict_ec;
+static int hf_gsm_a_gm_gprs_sms;
+static int hf_gsm_a_gm_req_ms_info_irat;
+static int hf_gsm_a_gm_req_ms_info_irat2;
+static int hf_gsm_a_gm_ue_usage_setting;
+static int hf_gsm_a_gm_voice_domain_pref_for_eutran;
+static int hf_gsm_a_gm_ptmsi_type;
+static int hf_gsm_a_gm_nri_cont;
+static int hf_gsm_a_gm_paging_time_window;
+static int hf_gsm_a_gm_edrx_value;
+static int hf_gsm_a_gm_ext_paging_time_window;
+static int hf_gsm_a_gm_mac;
+static int hf_gsm_a_gm_up_integ_ind;
+static int hf_gsm_a_gm_dcn_id;
+static int hf_gsm_a_gm_n3en_ind;
+static int hf_gsm_a_sm_pdp_type_org;
+static int hf_gsm_a_sm_qos_mean_thr;
+static int hf_gsm_a_sm_qos_peak_thr;
+static int hf_gsm_a_sm_qos_prec_class;
+static int hf_gsm_a_sm_qos_trans_delay;
+static int hf_gsm_a_sm_qos_signalling_ind;
+static int hf_gsm_a_sm_qos_source_stat_desc;
+static int hf_gsm_a_sm_qos_max_bitrate_upl;
+static int hf_gsm_a_sm_qos_max_bitrate_downl;
+static int hf_gsm_a_sm_qos_guar_bitrate_upl;
+static int hf_gsm_a_sm_qos_guar_bitrate_downl;
+static int hf_gsm_a_sm_qos_max_bitrate_upl_ext;
+static int hf_gsm_a_sm_qos_max_bitrate_downl_ext;
+static int hf_gsm_a_sm_qos_guar_bitrate_upl_ext;
+static int hf_gsm_a_sm_qos_guar_bitrate_downl_ext;
+static int hf_gsm_a_sm_qos_max_bitrate_upl_ext2;
+static int hf_gsm_a_sm_qos_max_bitrate_downl_ext2;
+static int hf_gsm_a_sm_qos_guar_bitrate_upl_ext2;
+static int hf_gsm_a_sm_qos_guar_bitrate_downl_ext2;
+static int hf_gsm_a_sm_qos_maximum_sdu_size;
+static int hf_gsm_a_sm_eplmnc;
+static int hf_gsm_a_sm_ratc;
+static int hf_gsm_a_sm_cause;
+static int hf_gsm_a_sm_cause_2;
+static int hf_gsm_a_sm_llc_sapi;
+static int hf_gsm_a_sm_tdi;
+static int hf_gsm_a_sm_packet_flow_id;
+static int hf_gsm_a_sm_tmgi;
+static int hf_gsm_a_sm_enh_nsapi;
+static int hf_gsm_a_sm_req_type;
+static int hf_gsm_a_sm_notif_ind;
+static int hf_gsm_a_sm_connectivity_type;
+static int hf_gsm_a_sm_wlan_utran_offload_accept;
+static int hf_gsm_a_sm_wlan_eutran_offload_accept;
+static int hf_gsm_a_sm_nbifom_cont;
+static int hf_gsm_a_gm_rac_ctrled_early_cm_sending;
+static int hf_gsm_a_gm_rac_pseudo_sync;
+static int hf_gsm_a_gm_rac_vgcs;
+static int hf_gsm_a_gm_rac_vbs;
+static int hf_gsm_a_gm_rac_multislot_capability;
+static int hf_gsm_a_gm_rac_hscsd_multi_slot_class;
+static int hf_gsm_a_gm_rac_gprs_multi_slot_class;
+static int hf_gsm_a_gm_rac_gprs_ext_dyn_alloc_cap;
+static int hf_gsm_a_gm_rac_ecsd_multi_slot_class;
+static int hf_gsm_a_gm_rac_egprs_multi_slot_class;
+static int hf_gsm_a_gm_rac_egprs_ext_dyn_alloc_cap;
+static int hf_gsm_a_gm_rac_dtm_gprs_multi_slot_class;
+static int hf_gsm_a_gm_rac_single_slt_dtm;
+static int hf_gsm_a_gm_rac_dtm_egprs_multi_slot_cls_pres;
+static int hf_gsm_a_gm_rac_dtm_egprs_multi_slot_class;
+static int hf_gsm_a_gm_rac_8psk_pow_cap_pres;
+static int hf_gsm_a_gm_rac_comp_int_meas_cap;
+static int hf_gsm_a_gm_rel_lev_ind;
+static int hf_gsm_a_gm_rac_geran_feat_pkg;
+static int hf_gsm_a_gm_rac_umts_fdd_cap;
+static int hf_gsm_a_gm_rac_umts_384_tdd_ra_cap;
+static int hf_gsm_a_gm_rac_cdma2000_cap;
+static int hf_gsm_a_gm_rac_umts_128_tdd_ra_cap;
+static int hf_gsm_a_gm_rac_mod_based_multi_slot_class_support;
+static int hf_gsm_a_gm_rac_geran_iu_mode_cap;
+static int hf_gsm_a_gm_rac_flo_iu_cap;
+static int hf_gsm_a_gm_rac_mult_tbf_cap;
+static int hf_gsm_a_gm_rac_down_adv_rec_perf;
+static int hf_gsm_a_gm_rac_ext_rlc_mac_ctrl_msg_seg_cap;
+static int hf_gsm_a_gm_rac_dtm_enh_cap;
+static int hf_gsm_a_gm_rac_dtm_gprs_high_multi_slot_class;
+static int hf_gsm_a_gm_rac_dtm_egprs_high_multi_slot_class;
+static int hf_gsm_a_gm_rac_ps_ho_cap;
+static int hf_gsm_a_gm_rac_dtm_ho_cap;
+static int hf_gsm_a_gm_rac_multi_slot_cap_red_down_dual_carrier;
+static int hf_gsm_a_gm_rac_down_dual_carrier_dtm_cap;
+static int hf_gsm_a_gm_rac_flex_ts_assign;
+static int hf_gsm_a_gm_rac_gan_ps_ho_cap;
+static int hf_gsm_a_gm_rac_rlc_non_pers_mode;
+static int hf_gsm_a_gm_rac_reduced_lat_cap;
+static int hf_gsm_a_gm_rac_ul_egprs2;
+static int hf_gsm_a_gm_rac_dl_egprs2;
+static int hf_gsm_a_gm_rac_eutra_fdd_support;
+static int hf_gsm_a_gm_rac_eutra_tdd_support;
+static int hf_gsm_a_gm_rac_geran_to_eutra_support_in_geran_ptm;
+static int hf_gsm_a_gm_rac_prio_based_resel_support;
+static int hf_gsm_a_gm_rac_alt_efta_multi_slot_class;
+static int hf_gsm_a_gm_rac_efta_multi_slot_cap_red_down_dual_carrier;
+static int hf_gsm_a_gm_rac_ind_up_layer_pdu_start_cap_for_rlc_um;
+static int hf_gsm_a_gm_rac_emst_cap;
+static int hf_gsm_a_gm_rac_mtti_cap;
+static int hf_gsm_a_gm_rac_utra_csg_cell_report;
+static int hf_gsm_a_gm_rac_eutra_csg_cell_report;
+static int hf_gsm_a_gm_rac_dtr_cap;
+static int hf_gsm_a_gm_rac_emsr_cap;
+static int hf_gsm_a_gm_rac_fast_down_freq_switch_cap;
+static int hf_gsm_a_gm_rac_tighter_cap;
+static int hf_gsm_a_gm_rac_fanr_cap;
+static int hf_gsm_a_gm_rac_ipa_cap;
+static int hf_gsm_a_gm_rac_geran_nw_sharing_support;
+static int hf_gsm_a_gm_rac_eutra_wb_rsrq_support;
+static int hf_gsm_a_gm_rac_utra_mfbi_support;
+static int hf_gsm_a_gm_rac_eutra_mfbi_support;
+static int hf_gsm_a_gm_rac_dlmc_non_contig_intra_band_recep;
+static int hf_gsm_a_gm_rac_dlmc_inter_band_recep;
+static int hf_gsm_a_gm_rac_dlmc_max_bandwidth;
+static int hf_gsm_a_gm_rac_dlmc_max_nb_dl_ts;
+static int hf_gsm_a_gm_rac_dlmc_max_nb_dl_carriers;
+static int hf_gsm_a_gm_rac_ext_tsc_set_cap_support;
+static int hf_gsm_a_gm_rac_ext_earfcn_value_range;
+static int hf_gsm_a_gm_rac_ec_pch_mon_support;
+static int hf_gsm_a_gm_rac_ms_sync_accuracy;
+static int hf_gsm_a_gm_rac_ec_ul_cov_enh_support;
+static int hf_gsm_a_gm_rac_mta_access_sec_support;
+static int hf_gsm_a_gm_rac_ec_paging_ind_chan_mon_support;
+static int hf_gsm_a_sm_ti_flag;
+static int hf_gsm_a_sm_ext;
+
+static int hf_gsm_a_gmm_net_cap_gea1;
+static int hf_gsm_a_gmm_net_cap_smdch;
+static int hf_gsm_a_gmm_net_cap_smgprs;
+static int hf_gsm_a_gmm_net_cap_ucs2;
+static int hf_gsm_a_gmm_net_cap_ss_scr_ind;
+static int hf_gsm_a_gmm_net_cap_solsa;
+static int hf_gsm_a_gmm_net_cap_rev;
+static int hf_gsm_a_gmm_net_cap_pfc;
+static int hf_gsm_a_gmm_net_cap_ext_gea_bits;
+static int hf_gsm_a_gmm_net_cap_gea2;
+static int hf_gsm_a_gmm_net_cap_gea3;
+static int hf_gsm_a_gmm_net_cap_gea4;
+static int hf_gsm_a_gmm_net_cap_gea5;
+static int hf_gsm_a_gmm_net_cap_gea6;
+static int hf_gsm_a_gmm_net_cap_gea7;
+static int hf_gsm_a_gmm_net_cap_lcs;
+static int hf_gsm_a_gmm_net_cap_ps_irat_iu;
+static int hf_gsm_a_gmm_net_cap_ps_irat_s1;
+static int hf_gsm_a_gmm_net_cap_comb_proc;
+static int hf_gsm_a_gmm_net_cap_isr;
+static int hf_gsm_a_gmm_net_cap_srvcc_to_geran;
+static int hf_gsm_a_gmm_net_cap_epc;
+static int hf_gsm_a_gmm_net_cap_nf;
+static int hf_gsm_a_gmm_net_geran_net_sharing;
+static int hf_gsm_a_gmm_net_cap_up_int_prot;
+static int hf_gsm_a_gmm_net_cap_up_gia4;
+static int hf_gsm_a_gmm_net_cap_up_gia5;
+static int hf_gsm_a_gmm_net_cap_up_gia6;
+static int hf_gsm_a_gmm_net_cap_up_gia7;
+static int hf_gsm_a_gmm_net_cap_epco_ie_ind;
+static int hf_gsm_a_gmm_net_cap_restrict_use_enh_cov;
+static int hf_gsm_a_gmm_net_cap_dc_eutra_nr_cap;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_gsm_a_gm_presence = -1;
-static int hf_gsm_a_gm_8psk_power_class = -1;
-static int hf_gsm_a_gm_rf_power_capability = -1;
-static int hf_gsm_a_gm_a5_bits = -1;
-static int hf_gsm_a_gm_8psk_power_capability = -1;
-static int hf_gsm_a_gm_extended_dtm_gprs_multi_slot_class = -1;
-static int hf_gsm_a_gm_extended_dtm_egprs_multi_slot_class = -1;
-static int hf_gsm_a_gm_high_multislot_capability = -1;
-static int hf_gsm_a_gm_gmsk_multislot_power_profile = -1;
-static int hf_gsm_a_gm_8psk_multislot_power_profile = -1;
-static int hf_gsm_a_gm_update_result = -1;
-static int hf_gsm_a_gm_radio_priority_pdp = -1;
-static int hf_gsm_a_gm_radio_priority_tom8 = -1;
-static int hf_gsm_a_gm_configuration_protocol = -1;
-static int hf_gsm_a_gm_sm_pco_length = -1;
-static int hf_gsm_a_gm_sm_pco_length2 = -1;
-static int hf_gsm_a_gm_sm_pco_pcscf_ipv6 = -1;
-static int hf_gsm_a_gm_sm_pco_dns_ipv6 = -1;
-static int hf_gsm_a_gm_sm_pco_dsmipv6_home_agent_ipv6 = -1;
-static int hf_gsm_a_gm_sm_pco_dsmipv6_home_network_ipv6 = -1;
-static int hf_gsm_a_gm_sm_pco_reject_code = -1;
-static int hf_gsm_a_gm_sm_pco_dsmipv6_home_network_prefix_length = -1;
-static int hf_gsm_a_gm_sm_pco_dsmipv6_home_agent_ipv4 = -1;
-static int hf_gsm_a_gm_sm_pco_pcscf_ipv4 = -1;
-static int hf_gsm_a_gm_sm_pco_dns_ipv4 = -1;
-static int hf_gsm_a_gm_sm_pco_ipv4_link_mtu_size = -1;
-static int hf_gsm_a_gm_sm_pco_nbifom_mode = -1;
-static int hf_gsm_a_gm_sm_pco_non_ip_link_mtu_size = -1;
-static int hf_gsm_a_gm_sm_pco_apn_rate_ctrl_params_aer = -1;
-static int hf_gsm_a_gm_sm_pco_apn_rate_ctrl_params_ul_time_unit = -1;
-static int hf_gsm_a_gm_sm_pco_apn_rate_ctrl_params_max_ul_rate = -1;
-static int hf_gsm_a_gm_sm_pco_3gpp_data_off_ue_status = -1;
-static int hf_gsm_a_gm_sm_pco_sel_bearer_ctrl_mode = -1;
-static int hf_gsm_a_gm_sm_pco_add_apn_rate_ctrl_params_ul_time_unit = -1;
-static int hf_gsm_a_gm_sm_pco_add_apn_rate_ctrl_params_max_ul_rate = -1;
-static int hf_gsm_a_gm_sm_pco_pdu_session_id = -1;
-static int hf_gsm_a_gm_sm_pco_pdu_session_address_lifetime = -1;
-static int hf_gsm_a_gm_sm_pco_eth_frame_payload_mtu = -1;
-static int hf_gsm_a_gm_sm_pco_unstruct_link_mtu = -1;
-static int hf_gsm_a_gm_sm_pco_5gsm_cause = -1;
-static int hf_gsm_a_gm_sm_pco_acs_info = -1;
-static int hf_gsm_a_gm_sm_pco_init_small_data_rate_ctrl_params_max_ul_rate_allowed = -1;
-static int hf_gsm_a_gm_sm_pco_init_small_data_rate_ctrl_params_termination_timestamp = -1;
-static int hf_gsm_a_gm_sm_pco_atsss_response = -1;
-static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_type = -1;
-static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_sec_proto_type = -1;
-static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_port_number = -1;
-static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_auth_domain_name = -1;
-static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_spki_pin_set = -1;
-static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_root_certificate = -1;
-static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_raw_public_key = -1;
-static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_value_part = -1;
-static int hf_gsm_a_gm_sm_pco_ecs_addr_type = -1;
-static int hf_gsm_a_gm_sm_pco_ecs_addr_spatial_valid_cond_type = -1;
-static int hf_gsm_a_gm_sm_pco_ecs_addr_ipv4 = -1;
-static int hf_gsm_a_gm_sm_pco_ecs_addr_ipv6 = -1;
-static int hf_gsm_a_gm_sm_pco_ecs_addr_fqdn_len = -1;
-static int hf_gsm_a_gm_sm_pco_ecs_addr_fqdn = -1;
-static int hf_gsm_a_gm_sm_pco_ecs_addr_spatial_valid_cond_cont = -1;
-static int hf_gsm_a_gm_sm_pco_ecsp_id = -1;
-static int hf_gsm_a_gm_sm_pco_pvs_ipv4 = -1;
-static int hf_gsm_a_gm_sm_pco_pvs_ipv6 = -1;
-static int hf_gsm_a_gm_sm_pco_pvs_name_len = -1;
-static int hf_gsm_a_gm_sm_pco_pvs_name = -1;
-static int hf_gsm_a_gm_sm_pco_pvs_s_nssai_ind = -1;
-static int hf_gsm_a_gm_sm_pco_pvs_dnn_ind = -1;
-static int hf_gsm_a_gm_sm_pco_pvs_dnn_len = -1;
-static int hf_gsm_a_gm_sm_pco_pvs_s_nssai_len = -1;
-static int hf_gsm_a_gm_sm_pco_dns_serv_sec_prot_support = -1;
-static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_fqdn = -1;
-static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_ipv6 = -1;
-static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_ipv4 = -1;
-static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_with_impacted_eas_ipv4_range_low = -1;
-static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_with_impacted_eas_ipv4_range_high = -1;
-static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_with_impacted_eas_ipv6_range_low = -1;
-static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_with_impacted_eas_ipv6_range_high = -1;
-static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_with_impacted_eas_fqdn = -1;
-static int hf_gsm_a_sm_pdp_type_number = -1;
-static int hf_gsm_a_sm_pdp_address = -1;
-static int hf_gsm_a_gm_ti_value = -1;
+static int hf_gsm_a_gm_presence;
+static int hf_gsm_a_gm_8psk_power_class;
+static int hf_gsm_a_gm_rf_power_capability;
+static int hf_gsm_a_gm_a5_bits;
+static int hf_gsm_a_gm_8psk_power_capability;
+static int hf_gsm_a_gm_extended_dtm_gprs_multi_slot_class;
+static int hf_gsm_a_gm_extended_dtm_egprs_multi_slot_class;
+static int hf_gsm_a_gm_high_multislot_capability;
+static int hf_gsm_a_gm_gmsk_multislot_power_profile;
+static int hf_gsm_a_gm_8psk_multislot_power_profile;
+static int hf_gsm_a_gm_update_result;
+static int hf_gsm_a_gm_radio_priority_pdp;
+static int hf_gsm_a_gm_radio_priority_tom8;
+static int hf_gsm_a_gm_configuration_protocol;
+static int hf_gsm_a_gm_sm_pco_length;
+static int hf_gsm_a_gm_sm_pco_length2;
+static int hf_gsm_a_gm_sm_pco_pcscf_ipv6;
+static int hf_gsm_a_gm_sm_pco_dns_ipv6;
+static int hf_gsm_a_gm_sm_pco_dsmipv6_home_agent_ipv6;
+static int hf_gsm_a_gm_sm_pco_dsmipv6_home_network_ipv6;
+static int hf_gsm_a_gm_sm_pco_reject_code;
+static int hf_gsm_a_gm_sm_pco_dsmipv6_home_network_prefix_length;
+static int hf_gsm_a_gm_sm_pco_dsmipv6_home_agent_ipv4;
+static int hf_gsm_a_gm_sm_pco_pcscf_ipv4;
+static int hf_gsm_a_gm_sm_pco_dns_ipv4;
+static int hf_gsm_a_gm_sm_pco_ipv4_link_mtu_size;
+static int hf_gsm_a_gm_sm_pco_nbifom_mode;
+static int hf_gsm_a_gm_sm_pco_non_ip_link_mtu_size;
+static int hf_gsm_a_gm_sm_pco_apn_rate_ctrl_params_aer;
+static int hf_gsm_a_gm_sm_pco_apn_rate_ctrl_params_ul_time_unit;
+static int hf_gsm_a_gm_sm_pco_apn_rate_ctrl_params_max_ul_rate;
+static int hf_gsm_a_gm_sm_pco_3gpp_data_off_ue_status;
+static int hf_gsm_a_gm_sm_pco_sel_bearer_ctrl_mode;
+static int hf_gsm_a_gm_sm_pco_add_apn_rate_ctrl_params_ul_time_unit;
+static int hf_gsm_a_gm_sm_pco_add_apn_rate_ctrl_params_max_ul_rate;
+static int hf_gsm_a_gm_sm_pco_pdu_session_id;
+static int hf_gsm_a_gm_sm_pco_pdu_session_address_lifetime;
+static int hf_gsm_a_gm_sm_pco_eth_frame_payload_mtu;
+static int hf_gsm_a_gm_sm_pco_unstruct_link_mtu;
+static int hf_gsm_a_gm_sm_pco_5gsm_cause;
+static int hf_gsm_a_gm_sm_pco_acs_info;
+static int hf_gsm_a_gm_sm_pco_init_small_data_rate_ctrl_params_max_ul_rate_allowed;
+static int hf_gsm_a_gm_sm_pco_init_small_data_rate_ctrl_params_termination_timestamp;
+static int hf_gsm_a_gm_sm_pco_atsss_response;
+static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_type;
+static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_sec_proto_type;
+static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_port_number;
+static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_auth_domain_name;
+static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_spki_pin_set;
+static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_root_certificate;
+static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_raw_public_key;
+static int hf_gsm_a_gm_sm_pco_dns_serv_sec_info_value_part;
+static int hf_gsm_a_gm_sm_pco_ecs_addr_type;
+static int hf_gsm_a_gm_sm_pco_ecs_addr_spatial_valid_cond_type;
+static int hf_gsm_a_gm_sm_pco_ecs_addr_ipv4;
+static int hf_gsm_a_gm_sm_pco_ecs_addr_ipv6;
+static int hf_gsm_a_gm_sm_pco_ecs_addr_fqdn_len;
+static int hf_gsm_a_gm_sm_pco_ecs_addr_fqdn;
+static int hf_gsm_a_gm_sm_pco_ecs_addr_spatial_valid_cond_cont;
+static int hf_gsm_a_gm_sm_pco_ecsp_id;
+static int hf_gsm_a_gm_sm_pco_pvs_ipv4;
+static int hf_gsm_a_gm_sm_pco_pvs_ipv6;
+static int hf_gsm_a_gm_sm_pco_pvs_name_len;
+static int hf_gsm_a_gm_sm_pco_pvs_name;
+static int hf_gsm_a_gm_sm_pco_pvs_s_nssai_ind;
+static int hf_gsm_a_gm_sm_pco_pvs_dnn_ind;
+static int hf_gsm_a_gm_sm_pco_pvs_dnn_len;
+static int hf_gsm_a_gm_sm_pco_pvs_s_nssai_len;
+static int hf_gsm_a_gm_sm_pco_dns_serv_sec_prot_support;
+static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_fqdn;
+static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_ipv6;
+static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_ipv4;
+static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_with_impacted_eas_ipv4_range_low;
+static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_with_impacted_eas_ipv4_range_high;
+static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_with_impacted_eas_ipv6_range_low;
+static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_with_impacted_eas_ipv6_range_high;
+static int hf_gsm_a_gm_sm_pco_eas_rediscovery_support_ind_with_impacted_eas_fqdn;
+static int hf_gsm_a_sm_pdp_type_number;
+static int hf_gsm_a_sm_pdp_address;
+static int hf_gsm_a_gm_ti_value;
 
 /* Initialize the subtree pointers */
-static gint ett_gmm_radio_cap = -1;
-static gint ett_gmm_network_cap = -1;
-static gint ett_gsm_a_gm_msrac_multislot_capability = -1;
-static gint ett_gmm_rai = -1;
-static gint ett_gmm_gprs_timer = -1;
-
-static gint ett_sm_tft = -1;
-static gint ett_sm_pco = -1;
-
-static expert_field ei_gsm_a_gm_extraneous_data = EI_INIT;
-static expert_field ei_gsm_a_gm_not_enough_data = EI_INIT;
-static expert_field ei_gsm_a_gm_undecoded = EI_INIT;
-static expert_field ei_gsm_a_gm_missing_mandatory_element = EI_INIT;
+static gint ett_gmm_radio_cap;
+static gint ett_gmm_network_cap;
+static gint ett_gsm_a_gm_msrac_multislot_capability;
+static gint ett_gmm_rai;
+static gint ett_gmm_gprs_timer;
+
+static gint ett_sm_tft;
+static gint ett_sm_pco;
+
+static expert_field ei_gsm_a_gm_extraneous_data;
+static expert_field ei_gsm_a_gm_not_enough_data;
+static expert_field ei_gsm_a_gm_undecoded;
+static expert_field ei_gsm_a_gm_missing_mandatory_element;
 
 static dissector_handle_t rrc_irat_ho_info_handle;
 static dissector_handle_t lte_rrc_ue_eutra_cap_handle;
diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c
index 74be52dd06..10dd1f0610 100644
--- a/epan/dissectors/packet-gsm_a_rp.c
+++ b/epan/dissectors/packet-gsm_a_rp.c
@@ -67,28 +67,28 @@ static const value_string gsm_rp_elem_strings[] = {
 value_string_ext gsm_rp_elem_strings_ext = VALUE_STRING_EXT_INIT(gsm_rp_elem_strings);
 
 /* Initialize the protocol and registered fields */
-static int proto_a_rp = -1;
+static int proto_a_rp;
 
-static int hf_gsm_a_rp_msg_type = -1;
-int hf_gsm_a_rp_elem_id = -1;
+static int hf_gsm_a_rp_msg_type;
+int hf_gsm_a_rp_elem_id;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_gsm_a_rp_tpdu = -1;
-static int hf_gsm_a_rp_extension = -1;
-static int hf_gsm_a_rp_diagnostic_field = -1;
-static int hf_gsm_a_rp_cause = -1;
-static int hf_gsm_a_rp_message_elements = -1;
-static int hf_gsm_a_rp_rp_message_reference = -1;
+static int hf_gsm_a_rp_tpdu;
+static int hf_gsm_a_rp_extension;
+static int hf_gsm_a_rp_diagnostic_field;
+static int hf_gsm_a_rp_cause;
+static int hf_gsm_a_rp_message_elements;
+static int hf_gsm_a_rp_rp_message_reference;
 
 /* Initialize the subtree pointers */
-static gint ett_rp_msg = -1;
+static gint ett_rp_msg;
 
-static expert_field ei_gsm_a_rp_extraneous_data = EI_INIT;
-static expert_field ei_gsm_a_rp_missing_mandatory_element = EI_INIT;
+static expert_field ei_gsm_a_rp_extraneous_data;
+static expert_field ei_gsm_a_rp_missing_mandatory_element;
 
 static dissector_handle_t gsm_sms_handle;	/* SMS TPDU */
 static dissector_handle_t gsm_a_dtap_handle;
 
-static int proto_json = -1;
+static int proto_json;
 
 static proto_tree *g_tree;
 
diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c
index 9a60325cc3..70fd4460f7 100644
--- a/epan/dissectors/packet-gsm_a_rr.c
+++ b/epan/dissectors/packet-gsm_a_rr.c
@@ -458,796 +458,796 @@ static const value_string gsm_a_rr_ec_cc_vals[] = {
 #define DTAP_RR_IEI_MASK        0xff
 
 /* Initialize the protocol and registered fields */
-static int proto_a_rr = -1;
-static int proto_a_ccch = -1;
-static int proto_a_ec_ccch = -1;
-static int proto_a_sacch = -1;
-static int proto_a_rach = -1;
-
-static int hf_gsm_a_dtap_msg_rr_type = -1;
-static int hf_gsm_a_dtap_msg_rr_ec_ccch_type = -1;
-
-int hf_gsm_a_rr_elem_id = -1;
-
-static int hf_gsm_a_rr_short_pd_msg_type = -1;
-static int hf_gsm_a_rr_short_pd = -1;
-static int hf_gsm_a_rr_short_l2_header = -1;
-
-
-static int hf_gsm_a_rr_bcc = -1;
-static int hf_gsm_a_rr_ncc = -1;
-static int hf_gsm_a_rr_bcch_arfcn = -1;
-static int hf_gsm_a_rr_range_nb = -1;
-static int hf_gsm_a_rr_range_lower = -1;
-static int hf_gsm_a_rr_range_higher = -1;
-static int hf_gsm_a_rr_ba_freq = -1;
-static int hf_gsm_a_rr_ho_ref_val = -1;
-static int hf_gsm_a_rr_L2_pseudo_len = -1;
-static int hf_gsm_a_rr_ba_used = -1;
-static int hf_gsm_a_rr_dtx_used = -1;
-static int hf_gsm_a_rr_3g_ba_used = -1;
-static int hf_gsm_a_rr_meas_valid = -1;
-static int hf_gsm_a_rr_rxlev_full_serv_cell = -1;
-static int hf_gsm_a_rr_rxlev_sub_serv_cell = -1;
-static int hf_gsm_a_rr_si23_ba_used = -1;
-static int hf_gsm_a_rr_rxqual_full_serv_cell = -1;
-static int hf_gsm_a_rr_rxqual_sub_serv_cell = -1;
-static int hf_gsm_a_rr_no_ncell_m = -1;
-static int hf_gsm_a_rr_rxlev_ncell = -1;
-static int hf_gsm_a_rr_bcch_freq_ncell = -1;
-static int hf_gsm_a_rr_bsic_ncell = -1;
-static int hf_gsm_a_rr_mobile_time_difference = -1;
-static int hf_gsm_a_rr_pow_cmd_atc = -1;
-static int hf_gsm_a_rr_pow_cmd_epc = -1;
-static int hf_gsm_a_rr_page_mode = -1;
-static int hf_gsm_a_rr_dedicated_mode_or_tbf = -1;
-static int hf_gsm_a_rr_pow_cmd_fpcepc = -1;
-static int hf_gsm_a_rr_pow_cmd_powlev = -1;
-static int hf_gsm_a_rr_sync_ind_nci = -1;
-static int hf_gsm_a_rr_sync_ind_rot = -1;
-static int hf_gsm_a_rr_sync_ind_si = -1;
-static int hf_gsm_a_rr_format_id = -1;
-static int hf_gsm_a_rr_format_id2 = -1;
-static int hf_gsm_a_rr_channel_mode = -1;
-static int hf_gsm_a_rr_channel_mode2 = -1;
-static int hf_gsm_a_rr_sc = -1;
-static int hf_gsm_a_rr_algorithm_id = -1;
-static int hf_gsm_a_rr_cr = -1;
-static int hf_gsm_a_rr_multirate_speech_ver = -1;
-static int hf_gsm_a_rr_NCSB = -1;
-static int hf_gsm_a_rr_ICMI = -1;
-static int hf_gsm_a_rr_start_mode = -1;
-static int hf_gsm_a_rr_timing_adv = -1;
-static int hf_gsm_a_rr_time_diff = -1;
-static int hf_gsm_a_rr_tlli = -1;
-static int hf_gsm_a_rr_nri = -1;
-static int hf_gsm_a_rr_target_mode = -1;
-static int hf_gsm_a_rr_wait_indication = -1;
-static int hf_gsm_a_rr_seq_code = -1;
-static int hf_gsm_a_rr_group_cipher_key_number = -1;
-static int hf_gsm_a_rr_MBMS_multicast = -1;
-static int hf_gsm_a_rr_MBMS_broadcast = -1;
-static int hf_gsm_a_rr_last_segment = -1;
-static int hf_gsm_a_rr_carrier_ind = -1;
-static int hf_gsm_a_rr_ra = -1;
-static int hf_gsm_a_rr_T1prim = -1;
-static int hf_gsm_a_rr_T3 = -1;
-static int hf_gsm_a_rr_T2 = -1;
-static int hf_gsm_a_rr_tbf_T1prim = -1;
-static int hf_gsm_a_rr_tbf_T3 = -1;
-static int hf_gsm_a_rr_tbf_T2 = -1;
-static int hf_gsm_a_rr_rfn = -1;
-static int hf_gsm_a_rr_RR_cause = -1;
-static int hf_gsm_a_rr_cm_cng_msg_req = -1;
-static int hf_gsm_a_rr_utran_cm_cng_msg_req = -1;
-static int hf_gsm_a_rr_cdma2000_cm_cng_msg_req = -1;
-static int hf_gsm_a_rr_geran_iu_cm_cng_msg_req = -1;
-int hf_gsm_a_rr_chnl_needed_ch1 = -1;
-static int hf_gsm_a_rr_chnl_needed_ch2 = -1;
-static int hf_gsm_a_rr_chnl_needed_ch3 = -1;
-static int hf_gsm_a_rr_chnl_needed_ch4 = -1;
-static int hf_gsm_a_rr_pkt_estab_cause = -1;
-static int hf_gsm_a_rr_peak_throughput_class = -1;
-static int hf_gsm_a_rr_radio_priority = -1;
-static int hf_gsm_a_rr_llc_pdu_type = -1;
-static int hf_gsm_a_rr_rlc_octet_count = -1;
-static int hf_gsm_a_rr_rlc_non_pers_mode_cap = -1;
-static int hf_gsm_a_rr_reduced_latency_cap = -1;
-static int hf_gsm_a_rr_ul_egprs2 = -1;
-static int hf_gsm_a_rr_dl_egprs2 = -1;
-static int hf_gsm_a_rr_emst_ms_cap = -1;
-static int hf_gsm_a_rr_suspension_cause = -1;
-static int hf_gsm_a_rr_apdu_id = -1;
-static int hf_gsm_a_rr_apdu_flags_cr = -1;
-static int hf_gsm_a_rr_apdu_flags_fs = -1;
-static int hf_gsm_a_rr_apdu_flags_ls = -1;
-static int hf_gsm_a_rr_apdu_data = -1;
-static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b8 = -1;
-static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b7 = -1;
-static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b6 = -1;
-static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b5 = -1;
-static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b4 = -1;
-static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b3 = -1;
-static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b2 = -1;
-static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b1 = -1;
-static int hf_gsm_a_rr_set_of_amr_codec_modes_v2_b5 = -1;
-static int hf_gsm_a_rr_set_of_amr_codec_modes_v2_b4 = -1;
-static int hf_gsm_a_rr_set_of_amr_codec_modes_v2_b3 = -1;
-static int hf_gsm_a_rr_set_of_amr_codec_modes_v2_b2 = -1;
-static int hf_gsm_a_rr_set_of_amr_codec_modes_v2_b1 = -1;
-static int hf_gsm_a_rr_amr_threshold = -1;
-static int hf_gsm_a_rr_amr_hysteresis = -1;
-static int hf_gsm_a_rr_pwrc = -1;
-static int hf_gsm_a_rr_dtx_bcch = -1;
-static int hf_gsm_a_rr_dtx_sacch = -1;
-static int hf_gsm_a_rr_radio_link_timeout = -1;
-static int hf_gsm_a_rr_cell_reselect_hyst = -1;
-static int hf_gsm_a_rr_ms_txpwr_max_cch = -1;
-static int hf_gsm_a_rr_acs = -1;
-static int hf_gsm_a_rr_neci = -1;
-static int hf_gsm_a_rr_rxlev_access_min = -1;
-static int hf_gsm_a_rr_mscr = -1;
-static int hf_gsm_a_rr_att = -1;
-static int hf_gsm_a_rr_ccch_conf = -1;
-static int hf_gsm_a_rr_cbq3 = -1;
-static int hf_gsm_a_rr_bs_pa_mfrms = -1;
-static int hf_gsm_a_rr_bs_ag_blks_res = -1;
-int hf_gsm_a_rr_t3212 = -1;
-static int hf_gsm_a_rr_gsm_band = -1;
-static int hf_gsm_a_rr_arfcn_first = -1;
-static int hf_gsm_a_rr_band_offset = -1;
-static int hf_gsm_a_rr_arfcn_range = -1;
-static int hf_gsm_a_rr_lowest_arfcn = -1;
-static int hf_gsm_a_rr_inc_skip_arfcn = -1;
-static int hf_gsm_a_rr_gprs_resumption_ack = -1;
-static int hf_gsm_a_rr_ext_ind = -1;
-static int hf_gsm_a_rr_ba_ind = -1;
-static int hf_gsm_a_rr_multiband_reporting = -1;
-static int hf_gsm_a_rr_ncc_permitted = -1;
-static int hf_gsm_a_rr_max_retrans = -1;
-static int hf_gsm_a_rr_tx_integer = -1;
-static int hf_gsm_a_rr_cell_barr_access = -1;
-static int hf_gsm_a_rr_re = -1;
-static int hf_gsm_a_rr_acc = -1;
-static int hf_gsm_a_rr_nch_position = -1;
-static int hf_gsm_a_rr_si2ter_mp_change_mark = -1;
-static int hf_gsm_a_rr_si2ter_3g_change_mark = -1;
-static int hf_gsm_a_rr_si2ter_index = -1;
-static int hf_gsm_a_rr_si2ter_count = -1;
-static int hf_gsm_a_rr_fdd_uarfcn = -1;
-static int hf_gsm_a_rr_bandwidth_fdd = -1;
-static int hf_gsm_a_rr_tdd_uarfcn = -1;
-static int hf_gsm_a_rr_bandwidth_tdd = -1;
-static int hf_gsm_a_rr_arfcn = -1;
-static int hf_gsm_a_rr_bsic = -1;
-static int hf_gsm_a_rr_qsearch_i = -1;
-static int hf_gsm_a_rr_fdd_qoffset = -1;
-static int hf_gsm_a_rr_fdd_qmin = -1;
-static int hf_gsm_a_rr_tdd_qoffset = -1;
-static int hf_gsm_a_rr_fdd_qmin_offset = -1;
-static int hf_gsm_a_rr_fdd_rscpmin = -1;
-static int hf_gsm_a_rr_3g_ba_ind = -1;
-static int hf_gsm_a_rr_mp_change_mark = -1;
-static int hf_gsm_a_rr_si2quater_index = -1;
-static int hf_gsm_a_rr_si2quater_count = -1;
-static int hf_gsm_a_rr_si21_change_mark = -1;
-static int hf_gsm_a_rr_si21_index = -1;
-static int hf_gsm_a_rr_si21_count = -1;
-static int hf_gsm_a_rr_gsm_report_type = -1;
-static int hf_gsm_a_rr_serving_band_reporting = -1;
-static int hf_gsm_a_rr_frequency_scrolling = -1;
-static int hf_gsm_a_rr_rep_priority = -1;
-static int hf_gsm_a_rr_report_type = -1;
-static int hf_gsm_a_rr_reporting_rate = -1;
-static int hf_gsm_a_rr_invalid_bsic_reporting = -1;
-static int hf_gsm_a_rr_scale_ord = -1;
-static int hf_gsm_a_rr_900_reporting_offset = -1;
-static int hf_gsm_a_rr_900_reporting_threshold = -1;
-static int hf_gsm_a_rr_1800_reporting_offset = -1;
-static int hf_gsm_a_rr_1800_reporting_threshold = -1;
-static int hf_gsm_a_rr_400_reporting_offset = -1;
-static int hf_gsm_a_rr_400_reporting_threshold = -1;
-static int hf_gsm_a_rr_1900_reporting_offset = -1;
-static int hf_gsm_a_rr_1900_reporting_threshold = -1;
-static int hf_gsm_a_rr_850_reporting_offset = -1;
-static int hf_gsm_a_rr_850_reporting_threshold = -1;
-static int hf_gsm_a_rr_network_control_order = -1;
-static int hf_gsm_a_rr_nc_non_drx_period = -1;
-static int hf_gsm_a_rr_nc_reporting_period_i = -1;
-static int hf_gsm_a_rr_nc_reporting_period_t = -1;
-static int hf_gsm_a_rr_index_start_3g = -1;
-static int hf_gsm_a_rr_absolute_index_start_emr = -1;
-static int hf_gsm_a_rr_qsearch_c_initial = -1;
-static int hf_gsm_a_rr_fdd_rep_quant = -1;
-static int hf_gsm_a_rr_fdd_multirat_reporting = -1;
-static int hf_gsm_a_rr_tdd_multirat_reporting = -1;
-static int hf_gsm_a_rr_qsearch_p = -1;
-static int hf_gsm_a_rr_3g_search_prio = -1;
-static int hf_gsm_a_rr_fdd_reporting_offset = -1;
-static int hf_gsm_a_rr_fdd_reporting_threshold_rscp = -1;
-static int hf_gsm_a_rr_fdd_reporting_threshold_ecn0 = -1;
-static int hf_gsm_a_rr_tdd_reporting_offset = -1;
-static int hf_gsm_a_rr_tdd_reporting_threshold_rscp = -1;
-static int hf_gsm_a_rr_tdd_reporting_threshold_ecn0 = -1;
-static int hf_gsm_a_rr_fdd_reporting_threshold_2 = -1;
-static int hf_gsm_a_rr_3g_ccn_active = -1;
-static int hf_gsm_a_rr_700_reporting_offset = -1;
-static int hf_gsm_a_rr_700_reporting_threshold = -1;
-static int hf_gsm_a_rr_810_reporting_offset = -1;
-static int hf_gsm_a_rr_810_reporting_threshold = -1;
-static int hf_gsm_a_rr_cbq = -1;
-static int hf_gsm_a_rr_cell_reselect_offset = -1;
-static int hf_gsm_a_rr_temporary_offset = -1;
-static int hf_gsm_a_rr_penalty_time = -1;
-static int hf_gsm_a_rr_gprs_ra_colour = -1;
-static int hf_gsm_a_rr_si13_position = -1;
-static int hf_gsm_a_rr_power_offset = -1;
-static int hf_gsm_a_rr_si2quater_position = -1;
-static int hf_gsm_a_rr_si13alt_position = -1;
-static int hf_gsm_a_rr_si21_position = -1;
-static int hf_gsm_a_rr_prio_thr = -1;
-static int hf_gsm_a_rr_lsa_offset = -1;
-static int hf_gsm_a_rr_cell_id = -1;
-static int hf_gsm_a_rr_paging_channel_restructuring = -1;
-static int hf_gsm_a_rr_nln_sacch = -1;
-static int hf_gsm_a_rr_nln_status_sacch = -1;
-static int hf_gsm_a_rr_nln_pch = -1;
-static int hf_gsm_a_rr_nln_status_pch = -1;
-static int hf_gsm_a_rr_vbs_vgcs_inband_notifications = -1;
-static int hf_gsm_a_rr_vbs_vgcs_inband_pagings = -1;
-static int hf_gsm_a_rr_rac = -1;
-static int hf_gsm_a_rr_max_lapdm = -1;
-static int hf_gsm_a_rr_gprs_ms_txpwr_max_ccch = -1;
-static int hf_gsm_a_rr_dedicated_mode_mbms_notification_support = -1;
-static int hf_gsm_a_rr_mnci_support = -1;
-static int hf_gsm_a_rr_amr_config = -1;
-static int hf_gsm_a_rr_bcch_change_mark = -1;
-static int hf_gsm_a_rr_si_change_field = -1;
-static int hf_gsm_a_rr_si13_change_mark = -1;
-static int hf_gsm_a_rr_hsn = -1;
-static int hf_gsm_a_rr_rfl_number = -1;
-static int hf_gsm_a_rr_arfcn_index = -1;
-static int hf_gsm_a_rr_ma_length = -1;
-static int hf_gsm_a_rr_psi1_repeat_period = -1;
-static int hf_gsm_a_rr_pbcch_pb = -1;
-static int hf_gsm_a_rr_pbcch_tsc = -1;
-static int hf_gsm_a_rr_pbcch_tn = -1;
-static int hf_gsm_a_rr_spgc_ccch_sup = -1;
-static int hf_gsm_a_rr_priority_access_thr = -1;
-static int hf_gsm_a_rr_nmo = -1;
-static int hf_gsm_a_rr_t3168 = -1;
-static int hf_gsm_a_rr_t3192 = -1;
-static int hf_gsm_a_rr_drx_timer_max = -1;
-static int hf_gsm_a_rr_access_burst_type = -1;
-static int hf_gsm_a_rr_control_ack_type = -1;
-static int hf_gsm_a_rr_bs_cv_max = -1;
-static int hf_gsm_a_rr_pan_dec = -1;
-static int hf_gsm_a_rr_pan_inc = -1;
-static int hf_gsm_a_rr_pan_max = -1;
-static int hf_gsm_a_rr_egprs_packet_channel_request = -1;
-static int hf_gsm_a_rr_bep_period = -1;
-static int hf_gsm_a_rr_pfc_feature_mode = -1;
-static int hf_gsm_a_rr_dtm_support = -1;
-static int hf_gsm_a_rr_bss_paging_coordination = -1;
-static int hf_gsm_a_rr_ccn_active = -1;
-static int hf_gsm_a_rr_nw_ext_utbf = -1;
-static int hf_gsm_a_rr_multiple_tbf_capability = -1;
-static int hf_gsm_a_rr_ext_utbf_no_data = -1;
-static int hf_gsm_a_rr_dtm_enhancements_capability = -1;
-static int hf_gsm_a_rr_reduced_latency_access = -1;
-static int hf_gsm_a_rr_alpha = -1;
-static int hf_gsm_a_rr_t_avg_w = -1;
-static int hf_gsm_a_rr_t_avg_t = -1;
-static int hf_gsm_a_rr_pc_meas_chan = -1;
-static int hf_gsm_a_rr_n_avg_i = -1;
-static int hf_gsm_a_rr_sgsnr = -1;
-static int hf_gsm_a_rr_si_status_ind = -1;
-static int hf_gsm_a_rr_lb_ms_txpwr_max_cch = -1;
-static int hf_gsm_a_rr_si2n_support = -1;
-static int hf_gsm_a_rr_mi_index = -1;
-static int hf_gsm_a_rr_mi_count = -1;
-static int hf_gsm_a_rr_3g_wait = -1;
-static int hf_gsm_a_rr_qsearch_c = -1;
-static int hf_gsm_a_rr_bsic_seen = -1;
-static int hf_gsm_a_rr_scale = -1;
-static int hf_gsm_a_rr_mean_bep_gmsk = -1;
-static int hf_gsm_a_rr_mean_cv_bep = -1;
-static int hf_gsm_a_rr_nbr_rcvd_blocks = -1;
-static int hf_gsm_a_rr_reporting_quantity = -1;
-static int hf_gsm_a_rr_extended_ra = -1;
-static int hf_gsm_a_rr_access_tech_type = -1;
-static int hf_gsm_a_rr_tfi_assignment = -1;
-static int hf_gsm_a_rr_polling = -1;
-static int hf_gsm_a_rr_usf = -1;
-static int hf_gsm_a_rr_usf_granularity = -1;
-static int hf_gsm_a_rr_p0 = -1;
-static int hf_gsm_a_rr_pr_mode = -1;
-static int hf_gsm_a_rr_egprs_mcs = -1;
-static int hf_gsm_a_rr_tlli_block_channel_coding = -1;
-static int hf_gsm_a_rr_bep_period2 = -1;
-static int hf_gsm_a_rr_resegment = -1;
-static int hf_gsm_a_rr_egprs_window_size = -1;
-static int hf_gsm_a_rr_gamma = -1;
-static int hf_gsm_a_rr_timing_adv_index = -1;
-static int hf_gsm_a_rr_timing_adv_timeslot_num = -1;
-static int hf_gsm_a_rr_tbf_starting_time = -1;
-static int hf_gsm_a_rr_num_of_radio_block_allocated = -1;
-static int hf_gsm_a_rr_pfi = -1;
-static int hf_gsm_a_rr_mbms_service_id = -1;
-static int hf_gsm_a_rr_ms_id = -1;
-static int hf_gsm_a_rr_gprs_cs = -1;
-static int hf_gsm_a_rr_rlc_mode = -1;
-static int hf_gsm_a_rr_ta_valid = -1;
-static int hf_gsm_a_rr_link_quality_meas_mode = -1;
-static int hf_gsm_a_rr_emr_bitmap_length = -1;
-static int hf_gsm_a_rr_eutran_mr_n_eutran = -1;
-static int hf_gsm_a_rr_eutran_mr_freq_idx = -1;
-static int hf_gsm_a_rr_eutran_mr_cell_id = -1;
-static int hf_gsm_a_rr_eutran_mr_rpt_quantity = -1;
-static int hf_gsm_a_rr_ma_channel_set = -1;
-static int hf_n_range_orig_arfcn = -1;
-static int hf_gsm_a_rr_reported_timeslots = -1;
-static int hf_gsm_a_rr_tsh = -1;
-static int hf_gsm_a_rr_rtti_usf_mode = -1;
-static int hf_gsm_a_rr_pdch_pair_indic = -1;
-static int hf_gsm_a_rr_additional_usf = -1;
-static int hf_gsm_a_rr_usf_2 = -1;
-static int hf_gsm_a_rr_additional_usf_2 = -1;
-static int hf_gsm_a_rr_npm_transfer_time = -1;
-static int hf_gsm_a_rr_event_based_fanr = -1;
-static int hf_gsm_a_rr_dl_egprs_level = -1;
-static int hf_gsm_a_rr_eab_auth_mask = -1;
-static int hf_gsm_a_eab_subcategory = -1;
+static int proto_a_rr;
+static int proto_a_ccch;
+static int proto_a_ec_ccch;
+static int proto_a_sacch;
+static int proto_a_rach;
+
+static int hf_gsm_a_dtap_msg_rr_type;
+static int hf_gsm_a_dtap_msg_rr_ec_ccch_type;
+
+int hf_gsm_a_rr_elem_id;
+
+static int hf_gsm_a_rr_short_pd_msg_type;
+static int hf_gsm_a_rr_short_pd;
+static int hf_gsm_a_rr_short_l2_header;
+
+
+static int hf_gsm_a_rr_bcc;
+static int hf_gsm_a_rr_ncc;
+static int hf_gsm_a_rr_bcch_arfcn;
+static int hf_gsm_a_rr_range_nb;
+static int hf_gsm_a_rr_range_lower;
+static int hf_gsm_a_rr_range_higher;
+static int hf_gsm_a_rr_ba_freq;
+static int hf_gsm_a_rr_ho_ref_val;
+static int hf_gsm_a_rr_L2_pseudo_len;
+static int hf_gsm_a_rr_ba_used;
+static int hf_gsm_a_rr_dtx_used;
+static int hf_gsm_a_rr_3g_ba_used;
+static int hf_gsm_a_rr_meas_valid;
+static int hf_gsm_a_rr_rxlev_full_serv_cell;
+static int hf_gsm_a_rr_rxlev_sub_serv_cell;
+static int hf_gsm_a_rr_si23_ba_used;
+static int hf_gsm_a_rr_rxqual_full_serv_cell;
+static int hf_gsm_a_rr_rxqual_sub_serv_cell;
+static int hf_gsm_a_rr_no_ncell_m;
+static int hf_gsm_a_rr_rxlev_ncell;
+static int hf_gsm_a_rr_bcch_freq_ncell;
+static int hf_gsm_a_rr_bsic_ncell;
+static int hf_gsm_a_rr_mobile_time_difference;
+static int hf_gsm_a_rr_pow_cmd_atc;
+static int hf_gsm_a_rr_pow_cmd_epc;
+static int hf_gsm_a_rr_page_mode;
+static int hf_gsm_a_rr_dedicated_mode_or_tbf;
+static int hf_gsm_a_rr_pow_cmd_fpcepc;
+static int hf_gsm_a_rr_pow_cmd_powlev;
+static int hf_gsm_a_rr_sync_ind_nci;
+static int hf_gsm_a_rr_sync_ind_rot;
+static int hf_gsm_a_rr_sync_ind_si;
+static int hf_gsm_a_rr_format_id;
+static int hf_gsm_a_rr_format_id2;
+static int hf_gsm_a_rr_channel_mode;
+static int hf_gsm_a_rr_channel_mode2;
+static int hf_gsm_a_rr_sc;
+static int hf_gsm_a_rr_algorithm_id;
+static int hf_gsm_a_rr_cr;
+static int hf_gsm_a_rr_multirate_speech_ver;
+static int hf_gsm_a_rr_NCSB;
+static int hf_gsm_a_rr_ICMI;
+static int hf_gsm_a_rr_start_mode;
+static int hf_gsm_a_rr_timing_adv;
+static int hf_gsm_a_rr_time_diff;
+static int hf_gsm_a_rr_tlli;
+static int hf_gsm_a_rr_nri;
+static int hf_gsm_a_rr_target_mode;
+static int hf_gsm_a_rr_wait_indication;
+static int hf_gsm_a_rr_seq_code;
+static int hf_gsm_a_rr_group_cipher_key_number;
+static int hf_gsm_a_rr_MBMS_multicast;
+static int hf_gsm_a_rr_MBMS_broadcast;
+static int hf_gsm_a_rr_last_segment;
+static int hf_gsm_a_rr_carrier_ind;
+static int hf_gsm_a_rr_ra;
+static int hf_gsm_a_rr_T1prim;
+static int hf_gsm_a_rr_T3;
+static int hf_gsm_a_rr_T2;
+static int hf_gsm_a_rr_tbf_T1prim;
+static int hf_gsm_a_rr_tbf_T3;
+static int hf_gsm_a_rr_tbf_T2;
+static int hf_gsm_a_rr_rfn;
+static int hf_gsm_a_rr_RR_cause;
+static int hf_gsm_a_rr_cm_cng_msg_req;
+static int hf_gsm_a_rr_utran_cm_cng_msg_req;
+static int hf_gsm_a_rr_cdma2000_cm_cng_msg_req;
+static int hf_gsm_a_rr_geran_iu_cm_cng_msg_req;
+int hf_gsm_a_rr_chnl_needed_ch1;
+static int hf_gsm_a_rr_chnl_needed_ch2;
+static int hf_gsm_a_rr_chnl_needed_ch3;
+static int hf_gsm_a_rr_chnl_needed_ch4;
+static int hf_gsm_a_rr_pkt_estab_cause;
+static int hf_gsm_a_rr_peak_throughput_class;
+static int hf_gsm_a_rr_radio_priority;
+static int hf_gsm_a_rr_llc_pdu_type;
+static int hf_gsm_a_rr_rlc_octet_count;
+static int hf_gsm_a_rr_rlc_non_pers_mode_cap;
+static int hf_gsm_a_rr_reduced_latency_cap;
+static int hf_gsm_a_rr_ul_egprs2;
+static int hf_gsm_a_rr_dl_egprs2;
+static int hf_gsm_a_rr_emst_ms_cap;
+static int hf_gsm_a_rr_suspension_cause;
+static int hf_gsm_a_rr_apdu_id;
+static int hf_gsm_a_rr_apdu_flags_cr;
+static int hf_gsm_a_rr_apdu_flags_fs;
+static int hf_gsm_a_rr_apdu_flags_ls;
+static int hf_gsm_a_rr_apdu_data;
+static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b8;
+static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b7;
+static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b6;
+static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b5;
+static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b4;
+static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b3;
+static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b2;
+static int hf_gsm_a_rr_set_of_amr_codec_modes_v1_b1;
+static int hf_gsm_a_rr_set_of_amr_codec_modes_v2_b5;
+static int hf_gsm_a_rr_set_of_amr_codec_modes_v2_b4;
+static int hf_gsm_a_rr_set_of_amr_codec_modes_v2_b3;
+static int hf_gsm_a_rr_set_of_amr_codec_modes_v2_b2;
+static int hf_gsm_a_rr_set_of_amr_codec_modes_v2_b1;
+static int hf_gsm_a_rr_amr_threshold;
+static int hf_gsm_a_rr_amr_hysteresis;
+static int hf_gsm_a_rr_pwrc;
+static int hf_gsm_a_rr_dtx_bcch;
+static int hf_gsm_a_rr_dtx_sacch;
+static int hf_gsm_a_rr_radio_link_timeout;
+static int hf_gsm_a_rr_cell_reselect_hyst;
+static int hf_gsm_a_rr_ms_txpwr_max_cch;
+static int hf_gsm_a_rr_acs;
+static int hf_gsm_a_rr_neci;
+static int hf_gsm_a_rr_rxlev_access_min;
+static int hf_gsm_a_rr_mscr;
+static int hf_gsm_a_rr_att;
+static int hf_gsm_a_rr_ccch_conf;
+static int hf_gsm_a_rr_cbq3;
+static int hf_gsm_a_rr_bs_pa_mfrms;
+static int hf_gsm_a_rr_bs_ag_blks_res;
+int hf_gsm_a_rr_t3212;
+static int hf_gsm_a_rr_gsm_band;
+static int hf_gsm_a_rr_arfcn_first;
+static int hf_gsm_a_rr_band_offset;
+static int hf_gsm_a_rr_arfcn_range;
+static int hf_gsm_a_rr_lowest_arfcn;
+static int hf_gsm_a_rr_inc_skip_arfcn;
+static int hf_gsm_a_rr_gprs_resumption_ack;
+static int hf_gsm_a_rr_ext_ind;
+static int hf_gsm_a_rr_ba_ind;
+static int hf_gsm_a_rr_multiband_reporting;
+static int hf_gsm_a_rr_ncc_permitted;
+static int hf_gsm_a_rr_max_retrans;
+static int hf_gsm_a_rr_tx_integer;
+static int hf_gsm_a_rr_cell_barr_access;
+static int hf_gsm_a_rr_re;
+static int hf_gsm_a_rr_acc;
+static int hf_gsm_a_rr_nch_position;
+static int hf_gsm_a_rr_si2ter_mp_change_mark;
+static int hf_gsm_a_rr_si2ter_3g_change_mark;
+static int hf_gsm_a_rr_si2ter_index;
+static int hf_gsm_a_rr_si2ter_count;
+static int hf_gsm_a_rr_fdd_uarfcn;
+static int hf_gsm_a_rr_bandwidth_fdd;
+static int hf_gsm_a_rr_tdd_uarfcn;
+static int hf_gsm_a_rr_bandwidth_tdd;
+static int hf_gsm_a_rr_arfcn;
+static int hf_gsm_a_rr_bsic;
+static int hf_gsm_a_rr_qsearch_i;
+static int hf_gsm_a_rr_fdd_qoffset;
+static int hf_gsm_a_rr_fdd_qmin;
+static int hf_gsm_a_rr_tdd_qoffset;
+static int hf_gsm_a_rr_fdd_qmin_offset;
+static int hf_gsm_a_rr_fdd_rscpmin;
+static int hf_gsm_a_rr_3g_ba_ind;
+static int hf_gsm_a_rr_mp_change_mark;
+static int hf_gsm_a_rr_si2quater_index;
+static int hf_gsm_a_rr_si2quater_count;
+static int hf_gsm_a_rr_si21_change_mark;
+static int hf_gsm_a_rr_si21_index;
+static int hf_gsm_a_rr_si21_count;
+static int hf_gsm_a_rr_gsm_report_type;
+static int hf_gsm_a_rr_serving_band_reporting;
+static int hf_gsm_a_rr_frequency_scrolling;
+static int hf_gsm_a_rr_rep_priority;
+static int hf_gsm_a_rr_report_type;
+static int hf_gsm_a_rr_reporting_rate;
+static int hf_gsm_a_rr_invalid_bsic_reporting;
+static int hf_gsm_a_rr_scale_ord;
+static int hf_gsm_a_rr_900_reporting_offset;
+static int hf_gsm_a_rr_900_reporting_threshold;
+static int hf_gsm_a_rr_1800_reporting_offset;
+static int hf_gsm_a_rr_1800_reporting_threshold;
+static int hf_gsm_a_rr_400_reporting_offset;
+static int hf_gsm_a_rr_400_reporting_threshold;
+static int hf_gsm_a_rr_1900_reporting_offset;
+static int hf_gsm_a_rr_1900_reporting_threshold;
+static int hf_gsm_a_rr_850_reporting_offset;
+static int hf_gsm_a_rr_850_reporting_threshold;
+static int hf_gsm_a_rr_network_control_order;
+static int hf_gsm_a_rr_nc_non_drx_period;
+static int hf_gsm_a_rr_nc_reporting_period_i;
+static int hf_gsm_a_rr_nc_reporting_period_t;
+static int hf_gsm_a_rr_index_start_3g;
+static int hf_gsm_a_rr_absolute_index_start_emr;
+static int hf_gsm_a_rr_qsearch_c_initial;
+static int hf_gsm_a_rr_fdd_rep_quant;
+static int hf_gsm_a_rr_fdd_multirat_reporting;
+static int hf_gsm_a_rr_tdd_multirat_reporting;
+static int hf_gsm_a_rr_qsearch_p;
+static int hf_gsm_a_rr_3g_search_prio;
+static int hf_gsm_a_rr_fdd_reporting_offset;
+static int hf_gsm_a_rr_fdd_reporting_threshold_rscp;
+static int hf_gsm_a_rr_fdd_reporting_threshold_ecn0;
+static int hf_gsm_a_rr_tdd_reporting_offset;
+static int hf_gsm_a_rr_tdd_reporting_threshold_rscp;
+static int hf_gsm_a_rr_tdd_reporting_threshold_ecn0;
+static int hf_gsm_a_rr_fdd_reporting_threshold_2;
+static int hf_gsm_a_rr_3g_ccn_active;
+static int hf_gsm_a_rr_700_reporting_offset;
+static int hf_gsm_a_rr_700_reporting_threshold;
+static int hf_gsm_a_rr_810_reporting_offset;
+static int hf_gsm_a_rr_810_reporting_threshold;
+static int hf_gsm_a_rr_cbq;
+static int hf_gsm_a_rr_cell_reselect_offset;
+static int hf_gsm_a_rr_temporary_offset;
+static int hf_gsm_a_rr_penalty_time;
+static int hf_gsm_a_rr_gprs_ra_colour;
+static int hf_gsm_a_rr_si13_position;
+static int hf_gsm_a_rr_power_offset;
+static int hf_gsm_a_rr_si2quater_position;
+static int hf_gsm_a_rr_si13alt_position;
+static int hf_gsm_a_rr_si21_position;
+static int hf_gsm_a_rr_prio_thr;
+static int hf_gsm_a_rr_lsa_offset;
+static int hf_gsm_a_rr_cell_id;
+static int hf_gsm_a_rr_paging_channel_restructuring;
+static int hf_gsm_a_rr_nln_sacch;
+static int hf_gsm_a_rr_nln_status_sacch;
+static int hf_gsm_a_rr_nln_pch;
+static int hf_gsm_a_rr_nln_status_pch;
+static int hf_gsm_a_rr_vbs_vgcs_inband_notifications;
+static int hf_gsm_a_rr_vbs_vgcs_inband_pagings;
+static int hf_gsm_a_rr_rac;
+static int hf_gsm_a_rr_max_lapdm;
+static int hf_gsm_a_rr_gprs_ms_txpwr_max_ccch;
+static int hf_gsm_a_rr_dedicated_mode_mbms_notification_support;
+static int hf_gsm_a_rr_mnci_support;
+static int hf_gsm_a_rr_amr_config;
+static int hf_gsm_a_rr_bcch_change_mark;
+static int hf_gsm_a_rr_si_change_field;
+static int hf_gsm_a_rr_si13_change_mark;
+static int hf_gsm_a_rr_hsn;
+static int hf_gsm_a_rr_rfl_number;
+static int hf_gsm_a_rr_arfcn_index;
+static int hf_gsm_a_rr_ma_length;
+static int hf_gsm_a_rr_psi1_repeat_period;
+static int hf_gsm_a_rr_pbcch_pb;
+static int hf_gsm_a_rr_pbcch_tsc;
+static int hf_gsm_a_rr_pbcch_tn;
+static int hf_gsm_a_rr_spgc_ccch_sup;
+static int hf_gsm_a_rr_priority_access_thr;
+static int hf_gsm_a_rr_nmo;
+static int hf_gsm_a_rr_t3168;
+static int hf_gsm_a_rr_t3192;
+static int hf_gsm_a_rr_drx_timer_max;
+static int hf_gsm_a_rr_access_burst_type;
+static int hf_gsm_a_rr_control_ack_type;
+static int hf_gsm_a_rr_bs_cv_max;
+static int hf_gsm_a_rr_pan_dec;
+static int hf_gsm_a_rr_pan_inc;
+static int hf_gsm_a_rr_pan_max;
+static int hf_gsm_a_rr_egprs_packet_channel_request;
+static int hf_gsm_a_rr_bep_period;
+static int hf_gsm_a_rr_pfc_feature_mode;
+static int hf_gsm_a_rr_dtm_support;
+static int hf_gsm_a_rr_bss_paging_coordination;
+static int hf_gsm_a_rr_ccn_active;
+static int hf_gsm_a_rr_nw_ext_utbf;
+static int hf_gsm_a_rr_multiple_tbf_capability;
+static int hf_gsm_a_rr_ext_utbf_no_data;
+static int hf_gsm_a_rr_dtm_enhancements_capability;
+static int hf_gsm_a_rr_reduced_latency_access;
+static int hf_gsm_a_rr_alpha;
+static int hf_gsm_a_rr_t_avg_w;
+static int hf_gsm_a_rr_t_avg_t;
+static int hf_gsm_a_rr_pc_meas_chan;
+static int hf_gsm_a_rr_n_avg_i;
+static int hf_gsm_a_rr_sgsnr;
+static int hf_gsm_a_rr_si_status_ind;
+static int hf_gsm_a_rr_lb_ms_txpwr_max_cch;
+static int hf_gsm_a_rr_si2n_support;
+static int hf_gsm_a_rr_mi_index;
+static int hf_gsm_a_rr_mi_count;
+static int hf_gsm_a_rr_3g_wait;
+static int hf_gsm_a_rr_qsearch_c;
+static int hf_gsm_a_rr_bsic_seen;
+static int hf_gsm_a_rr_scale;
+static int hf_gsm_a_rr_mean_bep_gmsk;
+static int hf_gsm_a_rr_mean_cv_bep;
+static int hf_gsm_a_rr_nbr_rcvd_blocks;
+static int hf_gsm_a_rr_reporting_quantity;
+static int hf_gsm_a_rr_extended_ra;
+static int hf_gsm_a_rr_access_tech_type;
+static int hf_gsm_a_rr_tfi_assignment;
+static int hf_gsm_a_rr_polling;
+static int hf_gsm_a_rr_usf;
+static int hf_gsm_a_rr_usf_granularity;
+static int hf_gsm_a_rr_p0;
+static int hf_gsm_a_rr_pr_mode;
+static int hf_gsm_a_rr_egprs_mcs;
+static int hf_gsm_a_rr_tlli_block_channel_coding;
+static int hf_gsm_a_rr_bep_period2;
+static int hf_gsm_a_rr_resegment;
+static int hf_gsm_a_rr_egprs_window_size;
+static int hf_gsm_a_rr_gamma;
+static int hf_gsm_a_rr_timing_adv_index;
+static int hf_gsm_a_rr_timing_adv_timeslot_num;
+static int hf_gsm_a_rr_tbf_starting_time;
+static int hf_gsm_a_rr_num_of_radio_block_allocated;
+static int hf_gsm_a_rr_pfi;
+static int hf_gsm_a_rr_mbms_service_id;
+static int hf_gsm_a_rr_ms_id;
+static int hf_gsm_a_rr_gprs_cs;
+static int hf_gsm_a_rr_rlc_mode;
+static int hf_gsm_a_rr_ta_valid;
+static int hf_gsm_a_rr_link_quality_meas_mode;
+static int hf_gsm_a_rr_emr_bitmap_length;
+static int hf_gsm_a_rr_eutran_mr_n_eutran;
+static int hf_gsm_a_rr_eutran_mr_freq_idx;
+static int hf_gsm_a_rr_eutran_mr_cell_id;
+static int hf_gsm_a_rr_eutran_mr_rpt_quantity;
+static int hf_gsm_a_rr_ma_channel_set;
+static int hf_n_range_orig_arfcn;
+static int hf_gsm_a_rr_reported_timeslots;
+static int hf_gsm_a_rr_tsh;
+static int hf_gsm_a_rr_rtti_usf_mode;
+static int hf_gsm_a_rr_pdch_pair_indic;
+static int hf_gsm_a_rr_additional_usf;
+static int hf_gsm_a_rr_usf_2;
+static int hf_gsm_a_rr_additional_usf_2;
+static int hf_gsm_a_rr_npm_transfer_time;
+static int hf_gsm_a_rr_event_based_fanr;
+static int hf_gsm_a_rr_dl_egprs_level;
+static int hf_gsm_a_rr_eab_auth_mask;
+static int hf_gsm_a_eab_subcategory;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_gsm_a_rr_cell_parameter = -1;
-static int hf_gsm_a_rr_len_indicator_ms_id = -1;
-static int hf_gsm_a_rr_neighbour_cell_list_index = -1;
-static int hf_gsm_a_rr_mcc = -1;
-static int hf_gsm_a_rr_pcid_pattern = -1;
-static int hf_gsm_a_rr_where = -1;
-static int hf_gsm_a_rr_ba_index_start_bsic = -1;
-static int hf_gsm_a_rr_bitmap = -1;
-static int hf_gsm_a_rr_extension_length = -1;
-static int hf_gsm_a_rr_scrambling_code = -1;
-static int hf_gsm_a_rr_mnc = -1;
-static int hf_gsm_a_rr_nr_of_fdd_cells = -1;
-static int hf_gsm_a_rr_ba_index_start_rtd_present = -1;
-static int hf_gsm_a_rr_sync_case_tstd = -1;
-static int hf_gsm_a_rr_hopping_channel_maio = -1;
-static int hf_gsm_a_rr_hopping_channel_ma_num_ind = -1;
-static int hf_gsm_a_rr_hopping_channel_change_mark_1 = -1;
-static int hf_gsm_a_rr_hopping_channel = -1;
-static int hf_gsm_a_rr_rxlev_carrier = -1;
-static int hf_gsm_a_rr_mobile_network_code = -1;
-static int hf_gsm_a_rr_packet_channel_type = -1;
-static int hf_gsm_a_rr_timeslot = -1;
-static int hf_gsm_a_rr_lsa_id = -1;
-static int hf_gsm_a_rr_ciphering_key_seq_num = -1;
-static int hf_gsm_a_rr_diversity = -1;
-static int hf_gsm_a_rr_maio = -1;
-static int hf_gsm_a_rr_mobile_country_code = -1;
-static int hf_gsm_a_rr_short_lsa_id = -1;
-static int hf_gsm_a_rr_number_remaining_bsic = -1;
-static int hf_gsm_a_rr_number_cells = -1;
-static int hf_gsm_a_rr_padding = -1;
-static int hf_gsm_a_rr_training_sequence = -1;
-static int hf_gsm_a_rr_psc_pattern_present = -1;
-static int hf_gsm_a_rr_nr_of_tdd_cells = -1;
-static int hf_gsm_a_rr_message_elements = -1;
-static int hf_gsm_a_rr_bitmap_length = -1;
-static int hf_gsm_a_rr_diversity_tdd = -1;
-static int hf_gsm_a_rr_spare = -1;
-static int hf_gsm_a_rr_single_channel_arfcn = -1;
-static int hf_gsm_a_rr_rtd_index = -1;
-static int hf_gsm_a_rr_arfcn_list = -1;
-static int hf_gsm_a_rr_da_list = -1;
-static int hf_gsm_a_rr_ua_list = -1;
-static int hf_gsm_a_rr_field_bit_long = -1;
-static int hf_gsm_a_rr_ma_bitmap = -1;
-static int hf_gsm_a_rr_inc_arfcn_bitmap = -1;
-static int hf_gsm_a_rr_ccn_supported = -1;
-static int hf_gsm_a_rr_pbcch_use_bcch = -1;
-static int hf_gsm_a_rr_ia_rest_oct_reserved = -1;
-static int hf_gsm_a_rr_tch_facch_sacchm = -1;
-static int hf_gsm_a_rr_tch_facch_sacchf = -1;
-static int hf_gsm_a_rr_tch_facch_sacchm_bi = -1;
-static int hf_gsm_a_rr_tch_acch = -1;
-static int hf_gsm_a_rr_sdcch4_sdcchc4_cbch = -1;
-static int hf_gsm_a_rr_sdcch8_sdcchc8_cbch = -1;
-static int hf_gsm_a_rr_tch_facchf_sacchm_bi = -1;
-static int hf_gsm_a_rr_tch_facchf_sacchm_uni = -1;
-static int hf_gsm_a_rr_tchf_acchs = -1;
-static int hf_gsm_a_rr_unknown_channel_info = -1;
-static int hf_gsm_a_rr_subchannel = -1;
-static int hf_gsm_a_rr_w_elements = -1;
-static int hf_gsm_a_rr_ra_est_cause = -1;
-static int hf_gsm_a_rr_ra_rand_ref = -1;
+static int hf_gsm_a_rr_cell_parameter;
+static int hf_gsm_a_rr_len_indicator_ms_id;
+static int hf_gsm_a_rr_neighbour_cell_list_index;
+static int hf_gsm_a_rr_mcc;
+static int hf_gsm_a_rr_pcid_pattern;
+static int hf_gsm_a_rr_where;
+static int hf_gsm_a_rr_ba_index_start_bsic;
+static int hf_gsm_a_rr_bitmap;
+static int hf_gsm_a_rr_extension_length;
+static int hf_gsm_a_rr_scrambling_code;
+static int hf_gsm_a_rr_mnc;
+static int hf_gsm_a_rr_nr_of_fdd_cells;
+static int hf_gsm_a_rr_ba_index_start_rtd_present;
+static int hf_gsm_a_rr_sync_case_tstd;
+static int hf_gsm_a_rr_hopping_channel_maio;
+static int hf_gsm_a_rr_hopping_channel_ma_num_ind;
+static int hf_gsm_a_rr_hopping_channel_change_mark_1;
+static int hf_gsm_a_rr_hopping_channel;
+static int hf_gsm_a_rr_rxlev_carrier;
+static int hf_gsm_a_rr_mobile_network_code;
+static int hf_gsm_a_rr_packet_channel_type;
+static int hf_gsm_a_rr_timeslot;
+static int hf_gsm_a_rr_lsa_id;
+static int hf_gsm_a_rr_ciphering_key_seq_num;
+static int hf_gsm_a_rr_diversity;
+static int hf_gsm_a_rr_maio;
+static int hf_gsm_a_rr_mobile_country_code;
+static int hf_gsm_a_rr_short_lsa_id;
+static int hf_gsm_a_rr_number_remaining_bsic;
+static int hf_gsm_a_rr_number_cells;
+static int hf_gsm_a_rr_padding;
+static int hf_gsm_a_rr_training_sequence;
+static int hf_gsm_a_rr_psc_pattern_present;
+static int hf_gsm_a_rr_nr_of_tdd_cells;
+static int hf_gsm_a_rr_message_elements;
+static int hf_gsm_a_rr_bitmap_length;
+static int hf_gsm_a_rr_diversity_tdd;
+static int hf_gsm_a_rr_spare;
+static int hf_gsm_a_rr_single_channel_arfcn;
+static int hf_gsm_a_rr_rtd_index;
+static int hf_gsm_a_rr_arfcn_list;
+static int hf_gsm_a_rr_da_list;
+static int hf_gsm_a_rr_ua_list;
+static int hf_gsm_a_rr_field_bit_long;
+static int hf_gsm_a_rr_ma_bitmap;
+static int hf_gsm_a_rr_inc_arfcn_bitmap;
+static int hf_gsm_a_rr_ccn_supported;
+static int hf_gsm_a_rr_pbcch_use_bcch;
+static int hf_gsm_a_rr_ia_rest_oct_reserved;
+static int hf_gsm_a_rr_tch_facch_sacchm;
+static int hf_gsm_a_rr_tch_facch_sacchf;
+static int hf_gsm_a_rr_tch_facch_sacchm_bi;
+static int hf_gsm_a_rr_tch_acch;
+static int hf_gsm_a_rr_sdcch4_sdcchc4_cbch;
+static int hf_gsm_a_rr_sdcch8_sdcchc8_cbch;
+static int hf_gsm_a_rr_tch_facchf_sacchm_bi;
+static int hf_gsm_a_rr_tch_facchf_sacchm_uni;
+static int hf_gsm_a_rr_tchf_acchs;
+static int hf_gsm_a_rr_unknown_channel_info;
+static int hf_gsm_a_rr_subchannel;
+static int hf_gsm_a_rr_w_elements;
+static int hf_gsm_a_rr_ra_est_cause;
+static int hf_gsm_a_rr_ra_rand_ref;
 
 
 /* gsm_rr_csn_flag() fields */
-static int hf_gsm_a_rr_fdd_repeat_freq = -1;
-static int hf_gsm_a_rr_tdd_repeat_freq = -1;
-static int hf_gsm_a_rr_repeat_range_limit = -1;
-static int hf_gsm_a_rr_repeat_ba_frequency = -1;
-static int hf_gsm_a_rr_repeat_gsm_desc = -1;
-static int hf_gsm_a_rr_band_indicator = -1;
-static int hf_gsm_a_rr_repeat_utran_fdd_desc = -1;
-static int hf_gsm_a_rr_bandwidth_fdd_present = -1;
-static int hf_gsm_a_rr_fdd_cell_info_present = -1;
-static int hf_gsm_a_rr_fdd_indic0 = -1;
-static int hf_gsm_a_rr_repeat_utran_tdd_desc = -1;
-static int hf_gsm_a_rr_bandwidth_tdd_present = -1;
-static int hf_gsm_a_rr_tdd_cell_info_present = -1;
-static int hf_gsm_a_rr_tdd_indic0 = -1;
-static int hf_gsm_a_rr_pfi_present = -1;
-static int hf_gsm_a_rr_msms_procedures = -1;
-static int hf_gsm_a_rr_repeat_dynamic_arfcn_mapping = -1;
-static int hf_gsm_a_rr_pan_bits_present = -1;
-static int hf_gsm_a_rr_optional_extensions_present = -1;
-static int hf_gsm_a_rr_egprs_supported = -1;
-static int hf_gsm_a_rr_access_tech_req = -1;
-static int hf_gsm_a_rr_repeated_umts_tdd_neighbour_cells = -1;
-static int hf_gsm_a_rr_cdma2000_reporting_threshold = -1;
-static int hf_gsm_a_rr_ccn_support_description = -1;
-static int hf_gsm_a_rr_eutran_tdd_measurement_report_offset_present = -1;
-static int hf_gsm_a_rr_3g_wait_present = -1;
-static int hf_gsm_a_rr_packet_discriminator_bit = -1;
-static int hf_gsm_a_rr_3g_measurement_control_parameters_description = -1;
-static int hf_gsm_a_rr_bts_power_control_mode = -1;
-static int hf_gsm_a_rr_fdd_reporting_threshold_2_present = -1;
-static int hf_gsm_a_rr_gprs_measurement_parameters_description = -1;
-static int hf_gsm_a_rr_repeated_earfcn = -1;
-static int hf_gsm_a_rr_repeated_pcid_group = -1;
-static int hf_gsm_a_rr_repeating_pcid_group = -1;
-static int hf_gsm_a_rr_tfi_allocation_type = -1;
-static int hf_gsm_a_rr_fdd_cell_info_param_value0 = -1;
-static int hf_gsm_a_rr_bsic_description = -1;
-static int hf_gsm_a_rr_maio_present = -1;
-static int hf_gsm_a_rr_eutran_pcid_bitmap_group_present = -1;
-static int hf_gsm_a_rr_repeated_utran_frequency_index = -1;
-static int hf_gsm_a_rr_timing_adv_present = -1;
-static int hf_gsm_a_rr_eutran_tdd_reporting = -1;
-static int hf_gsm_a_rr_eutran_reporting = -1;
-static int hf_gsm_a_rr_eutran_csg_description = -1;
-static int hf_gsm_a_rr_pcid_pattern_present = -1;
-static int hf_gsm_a_rr_later_r97_version_reserved_bit = -1;
-static int hf_gsm_a_rr_utran_fdd_description_earlier_version_bit_reserved1 = -1;
-static int hf_gsm_a_rr_3g_priority_parameters_description = -1;
-static int hf_gsm_a_rr_serving_cell_priority_parameters_description = -1;
-static int hf_gsm_a_rr_850_reporting_present = -1;
-static int hf_gsm_a_rr_tfi_assignment_present = -1;
-static int hf_gsm_a_rr_p0_present = -1;
-static int hf_gsm_a_rr_early_r97_version_reserved_bit = -1;
-static int hf_gsm_a_rr_tdd_reporting_parameters = -1;
-static int hf_gsm_a_rr_eutran_tdd_reporting_present = -1;
-static int hf_gsm_a_rr_repeated_eutran_neighbour_cells = -1;
-static int hf_gsm_a_rr_eutran_tdd_reporting_offset_present = -1;
-static int hf_gsm_a_rr_bitmap_type_reporting = -1;
-static int hf_gsm_a_rr_gprs_mobile_allocation = -1;
-static int hf_gsm_a_rr_default_utran_priority_parameters = -1;
-static int hf_gsm_a_rr_tfi_multiblock = -1;
-static int hf_gsm_a_rr_hopping_case = -1;
-static int hf_gsm_a_rr_repeated_umts_tdd_neighbour_cells_earlier_version_bit_reserved = -1;
-static int hf_gsm_a_rr_gprs_3g_measurement_parameters_description = -1;
-static int hf_gsm_a_rr_nc_measurement_parameters = -1;
-static int hf_gsm_a_rr_lb_ms_txpwr_max_cch_present = -1;
-static int hf_gsm_a_rr_810_reporting = -1;
-static int hf_gsm_a_rr_thresh_utran_low_present = -1;
-static int hf_gsm_a_rr_pbcch = -1;
-static int hf_gsm_a_rr_packet_downlink_assignment = -1;
-static int hf_gsm_a_rr_repeated_csg_pci_split = -1;
-static int hf_gsm_a_rr_700_reporting = -1;
-static int hf_gsm_a_rr_fdd_reporting_parameters = -1;
-static int hf_gsm_a_rr_compressed_inter_rat_handover_info = -1;
-static int hf_gsm_a_rr_rtd12 = -1;
-static int hf_gsm_a_rr_utran_tdd_description = -1;
-static int hf_gsm_a_rr_3g_csg_desc_technology = -1;
-static int hf_gsm_a_rr_reporting_quantity_present = -1;
-static int hf_gsm_a_rr_absolute_index_start_emr_present = -1;
-static int hf_gsm_a_rr_downlink_uplink = -1;
-static int hf_gsm_a_rr_extended_ra_present = -1;
-static int hf_gsm_a_rr_downlink_uplink_discriminator_bit = -1;
-static int hf_gsm_a_rr_timing_advance_index_timeslot = -1;
-static int hf_gsm_a_rr_3g_reporting_quantity = -1;
-static int hf_gsm_a_rr_additional_rtd = -1;
-static int hf_gsm_a_rr_repeated_umts_fdd_neighbour_cells = -1;
-static int hf_gsm_a_rr_1800_reporting_present = -1;
-static int hf_gsm_a_rr_repeated_eutran_pcid_ta_mapping = -1;
-static int hf_gsm_a_rr_arfcn_index_list = -1;
-static int hf_gsm_a_rr_tdd_multirat_reporting_present = -1;
-static int hf_gsm_a_rr_eutran_reporting_quantity = -1;
-static int hf_gsm_a_rr_repeated_eutran_not_allowed_cells = -1;
-static int hf_gsm_a_rr_si13_change_mark_present = -1;
-static int hf_gsm_a_rr_eutran_fdd_reporting_present = -1;
-static int hf_gsm_a_rr_hopping_flag = -1;
-static int hf_gsm_a_call_prio_present = -1;
-static int hf_gsm_a_rr_repeated_umts_fdd_neighbour_cells_earlier_version_bit_reserved = -1;
-static int hf_gsm_a_rr_fdd_multirat_reporting_present = -1;
-static int hf_gsm_a_rr_repeated_eutran_measurement_control_parameters = -1;
-static int hf_gsm_a_rr_timing_adv_index_present = -1;
-static int hf_gsm_a_rr_real_time_difference_description = -1;
-static int hf_gsm_a_rr_tdd_cell_info_param_value0 = -1;
-static int hf_gsm_a_rr_gprs_report_priority_description = -1;
-static int hf_gsm_a_rr_eutran_fdd_reporting_threshold_2_present = -1;
-static int hf_gsm_a_rr_timing_advance_index = -1;
-static int hf_gsm_a_rr_utran_fdd_description = -1;
-static int hf_gsm_a_rr_repeated_rtd = -1;
-static int hf_gsm_a_rr_fdd_reporting_offset_present = -1;
-static int hf_gsm_a_rr_mcc_mnc_parameters = -1;
-static int hf_gsm_a_rr_packet_uplink_assignment = -1;
-static int hf_gsm_a_rr_utran_frequency_index_present = -1;
-static int hf_gsm_a_rr_earlier_version_reserved_bit = -1;
-static int hf_gsm_a_rr_psc_present = -1;
-static int hf_gsm_a_rr_serving_cell_data = -1;
-static int hf_gsm_a_rr_utran_tdd_description_earlier_version_bit_reserved2 = -1;
-static int hf_gsm_a_rr_repeated_rtd_frequency = -1;
-static int hf_gsm_a_rr_pr_mode_present = -1;
-static int hf_gsm_a_rr_eutran_default_measurement_control_eutran_present = -1;
-static int hf_gsm_a_rr_3g_additional_measurement_parameters_description_2 = -1;
-static int hf_gsm_a_rr_e_utran_measurement_report = -1;
-static int hf_gsm_a_rr_3g_neighbour_cell_description = -1;
-static int hf_gsm_a_rr_400_reporting_present = -1;
-static int hf_gsm_a_rr_gamma_present = -1;
-static int hf_gsm_a_rr_additional_lsa_id = -1;
-static int hf_gsm_a_rr_tdd_information = -1;
-static int hf_gsm_a_rr_utran_priority_present = -1;
-static int hf_gsm_a_rr_utran_qrxlevmin_present = -1;
-static int hf_gsm_a_rr_repeated_csg_fdd_uarfcn = -1;
-static int hf_gsm_a_rr_arfcn_present = -1;
-static int hf_gsm_a_rr_cdma2000_multirat_reporting = -1;
-static int hf_gsm_a_rr_si13alt_position_present = -1;
-static int hf_gsm_a_rr_3g_csg_description = -1;
-static int hf_gsm_a_rr_rtd = -1;
-static int hf_gsm_a_rr_tbf_starting_time_present = -1;
-static int hf_gsm_a_rr_eutran_fdd_reporting = -1;
-static int hf_gsm_a_rr_nc_periods = -1;
-static int hf_gsm_a_rr_index_start_3g_present = -1;
-static int hf_gsm_a_rr_repeated_pcid = -1;
-static int hf_gsm_a_rr_repeated_invalid_bsic_information = -1;
-static int hf_gsm_a_rr_repeated_utran_measurement_control_parameters_struct = -1;
-static int hf_gsm_a_rr_repeated_utran_priority_parameters = -1;
-static int hf_gsm_a_rr_measurement_parameters_description = -1;
-static int hf_gsm_a_rr_bep_period2_present = -1;
-static int hf_gsm_a_rr_serving_reporting_present = -1;
-static int hf_gsm_a_rr_alpha_present = -1;
-static int hf_gsm_a_rr_psc_pattern = -1;
-static int hf_gsm_a_rr_second_packet_assignment_discriminator_bit = -1;
-static int hf_gsm_a_rr_lsa_id_type = -1;
-static int hf_gsm_a_rr_fdd_parameters = -1;
-static int hf_gsm_a_rr_gprs_real_time_difference_description = -1;
-static int hf_gsm_a_rr_repeated_eutran_frequency_index = -1;
-static int hf_gsm_a_rr_3g_additional_measurement_parameters_description = -1;
-static int hf_gsm_a_rr_eutran_measurement_parameters_description = -1;
-static int hf_gsm_a_rr_mbms_assignment = -1;
-static int hf_gsm_a_rr_ms_parameters = -1;
-static int hf_gsm_a_rr_utran_fdd_description_earlier_version_bit_reserved2 = -1;
-static int hf_gsm_a_rr_3g_measurement_parameters_description = -1;
-static int hf_gsm_a_rr_eutran_priority_present = -1;
-static int hf_gsm_a_rr_1900_reporting_present = -1;
-static int hf_gsm_a_rr_3g_measurement_control_parameters_description_struct = -1;
-static int hf_gsm_a_rr_eutran_parameters_description = -1;
-static int hf_gsm_a_rr_rtd6 = -1;
-static int hf_gsm_a_rr_thresh_eutran_low_present = -1;
-static int hf_gsm_a_rr_allocation_type = -1;
-static int hf_gsm_a_rr_additional_rtd_struct = -1;
-static int hf_gsm_a_rr_additional_information_for_3x_auxiliary_pilot = -1;
-static int hf_gsm_a_rr_fdd_information = -1;
-static int hf_gsm_a_rr_future_extensions_of_the_2g_parameters = -1;
-static int hf_gsm_a_rr_ba_index_start_rtd = -1;
-static int hf_gsm_a_rr_utran_tdd_description_earlier_version_bit_reserved1 = -1;
-static int hf_gsm_a_rr_eutran_fdd_reporting_threshold = -1;
-static int hf_gsm_a_rr_measurement_control_parameters_description = -1;
-static int hf_gsm_a_rr_eutran_measurement_bandwidth_present = -1;
-static int hf_gsm_a_rr_eutran_tdd_reporting_threshold_2_present = -1;
-static int hf_gsm_a_rr_eutran_earfcn_present = -1;
-static int hf_gsm_a_rr_eutran_qrxlevmin_present = -1;
-static int hf_gsm_a_rr_ba_index_start_bsic_present = -1;
-static int hf_gsm_a_rr_gprs_bsic_description = -1;
-static int hf_gsm_a_rr_group_channel_description = -1;
-static int hf_gsm_a_rr_cdma2000_description = -1;
-static int hf_gsm_a_rr_si_2quater_extension_information = -1;
-static int hf_gsm_a_rr_3g_supplementary_parameters_description = -1;
-static int hf_gsm_a_rr_priority_and_eutran_param_description = -1;
-static int hf_gsm_a_rr_multiband_reporting_present = -1;
-static int hf_gsm_a_rr_report_priority_description = -1;
-static int hf_gsm_a_rr_tdd_reporting_offset_present = -1;
-static int hf_gsm_a_rr_amr_config_present = -1;
-static int hf_gsm_a_rr_rand_bit_stream_ind = -1;
-static int hf_gsm_a_rr_900_reporting_present = -1;
-static int hf_gsm_a_rr_rfl_number_present = -1;
-static int hf_gsm_a_rr_eutran_fdd_reporting_offset_present = -1;
-static int hf_gsm_a_rr_repeated_csg_psc_split_struct = -1;
-static int hf_gsm_a_rr_gprs_eutran_measurement_parameters_description = -1;
-static int hf_gsm_a_rr_tdd_parameters = -1;
-static int hf_gsm_a_rr_repeat_eutran_desc = -1;
-static int hf_gsm_a_rr_peo_dsc_and_rcc_present = -1;
-static int hf_gsm_a_rr_c1_delta_present = -1;
-static int hf_gsm_a_rr_ul_xtti_tbf_assignment = -1;
-static int hf_gsm_a_rr_dl_xtti_tbf_assignment = -1;
-static int hf_gsm_a_rr_fanr_act_state = -1;
-static int hf_gsm_a_rr_encoding_selection = -1;
-static int hf_gsm_a_rr_nof_pdch_pairs = -1;
-static int hf_gsm_a_rr_npm_transfer_time_present = -1;
-static int hf_gsm_a_rr_eab_parameters = -1;
+static int hf_gsm_a_rr_fdd_repeat_freq;
+static int hf_gsm_a_rr_tdd_repeat_freq;
+static int hf_gsm_a_rr_repeat_range_limit;
+static int hf_gsm_a_rr_repeat_ba_frequency;
+static int hf_gsm_a_rr_repeat_gsm_desc;
+static int hf_gsm_a_rr_band_indicator;
+static int hf_gsm_a_rr_repeat_utran_fdd_desc;
+static int hf_gsm_a_rr_bandwidth_fdd_present;
+static int hf_gsm_a_rr_fdd_cell_info_present;
+static int hf_gsm_a_rr_fdd_indic0;
+static int hf_gsm_a_rr_repeat_utran_tdd_desc;
+static int hf_gsm_a_rr_bandwidth_tdd_present;
+static int hf_gsm_a_rr_tdd_cell_info_present;
+static int hf_gsm_a_rr_tdd_indic0;
+static int hf_gsm_a_rr_pfi_present;
+static int hf_gsm_a_rr_msms_procedures;
+static int hf_gsm_a_rr_repeat_dynamic_arfcn_mapping;
+static int hf_gsm_a_rr_pan_bits_present;
+static int hf_gsm_a_rr_optional_extensions_present;
+static int hf_gsm_a_rr_egprs_supported;
+static int hf_gsm_a_rr_access_tech_req;
+static int hf_gsm_a_rr_repeated_umts_tdd_neighbour_cells;
+static int hf_gsm_a_rr_cdma2000_reporting_threshold;
+static int hf_gsm_a_rr_ccn_support_description;
+static int hf_gsm_a_rr_eutran_tdd_measurement_report_offset_present;
+static int hf_gsm_a_rr_3g_wait_present;
+static int hf_gsm_a_rr_packet_discriminator_bit;
+static int hf_gsm_a_rr_3g_measurement_control_parameters_description;
+static int hf_gsm_a_rr_bts_power_control_mode;
+static int hf_gsm_a_rr_fdd_reporting_threshold_2_present;
+static int hf_gsm_a_rr_gprs_measurement_parameters_description;
+static int hf_gsm_a_rr_repeated_earfcn;
+static int hf_gsm_a_rr_repeated_pcid_group;
+static int hf_gsm_a_rr_repeating_pcid_group;
+static int hf_gsm_a_rr_tfi_allocation_type;
+static int hf_gsm_a_rr_fdd_cell_info_param_value0;
+static int hf_gsm_a_rr_bsic_description;
+static int hf_gsm_a_rr_maio_present;
+static int hf_gsm_a_rr_eutran_pcid_bitmap_group_present;
+static int hf_gsm_a_rr_repeated_utran_frequency_index;
+static int hf_gsm_a_rr_timing_adv_present;
+static int hf_gsm_a_rr_eutran_tdd_reporting;
+static int hf_gsm_a_rr_eutran_reporting;
+static int hf_gsm_a_rr_eutran_csg_description;
+static int hf_gsm_a_rr_pcid_pattern_present;
+static int hf_gsm_a_rr_later_r97_version_reserved_bit;
+static int hf_gsm_a_rr_utran_fdd_description_earlier_version_bit_reserved1;
+static int hf_gsm_a_rr_3g_priority_parameters_description;
+static int hf_gsm_a_rr_serving_cell_priority_parameters_description;
+static int hf_gsm_a_rr_850_reporting_present;
+static int hf_gsm_a_rr_tfi_assignment_present;
+static int hf_gsm_a_rr_p0_present;
+static int hf_gsm_a_rr_early_r97_version_reserved_bit;
+static int hf_gsm_a_rr_tdd_reporting_parameters;
+static int hf_gsm_a_rr_eutran_tdd_reporting_present;
+static int hf_gsm_a_rr_repeated_eutran_neighbour_cells;
+static int hf_gsm_a_rr_eutran_tdd_reporting_offset_present;
+static int hf_gsm_a_rr_bitmap_type_reporting;
+static int hf_gsm_a_rr_gprs_mobile_allocation;
+static int hf_gsm_a_rr_default_utran_priority_parameters;
+static int hf_gsm_a_rr_tfi_multiblock;
+static int hf_gsm_a_rr_hopping_case;
+static int hf_gsm_a_rr_repeated_umts_tdd_neighbour_cells_earlier_version_bit_reserved;
+static int hf_gsm_a_rr_gprs_3g_measurement_parameters_description;
+static int hf_gsm_a_rr_nc_measurement_parameters;
+static int hf_gsm_a_rr_lb_ms_txpwr_max_cch_present;
+static int hf_gsm_a_rr_810_reporting;
+static int hf_gsm_a_rr_thresh_utran_low_present;
+static int hf_gsm_a_rr_pbcch;
+static int hf_gsm_a_rr_packet_downlink_assignment;
+static int hf_gsm_a_rr_repeated_csg_pci_split;
+static int hf_gsm_a_rr_700_reporting;
+static int hf_gsm_a_rr_fdd_reporting_parameters;
+static int hf_gsm_a_rr_compressed_inter_rat_handover_info;
+static int hf_gsm_a_rr_rtd12;
+static int hf_gsm_a_rr_utran_tdd_description;
+static int hf_gsm_a_rr_3g_csg_desc_technology;
+static int hf_gsm_a_rr_reporting_quantity_present;
+static int hf_gsm_a_rr_absolute_index_start_emr_present;
+static int hf_gsm_a_rr_downlink_uplink;
+static int hf_gsm_a_rr_extended_ra_present;
+static int hf_gsm_a_rr_downlink_uplink_discriminator_bit;
+static int hf_gsm_a_rr_timing_advance_index_timeslot;
+static int hf_gsm_a_rr_3g_reporting_quantity;
+static int hf_gsm_a_rr_additional_rtd;
+static int hf_gsm_a_rr_repeated_umts_fdd_neighbour_cells;
+static int hf_gsm_a_rr_1800_reporting_present;
+static int hf_gsm_a_rr_repeated_eutran_pcid_ta_mapping;
+static int hf_gsm_a_rr_arfcn_index_list;
+static int hf_gsm_a_rr_tdd_multirat_reporting_present;
+static int hf_gsm_a_rr_eutran_reporting_quantity;
+static int hf_gsm_a_rr_repeated_eutran_not_allowed_cells;
+static int hf_gsm_a_rr_si13_change_mark_present;
+static int hf_gsm_a_rr_eutran_fdd_reporting_present;
+static int hf_gsm_a_rr_hopping_flag;
+static int hf_gsm_a_call_prio_present;
+static int hf_gsm_a_rr_repeated_umts_fdd_neighbour_cells_earlier_version_bit_reserved;
+static int hf_gsm_a_rr_fdd_multirat_reporting_present;
+static int hf_gsm_a_rr_repeated_eutran_measurement_control_parameters;
+static int hf_gsm_a_rr_timing_adv_index_present;
+static int hf_gsm_a_rr_real_time_difference_description;
+static int hf_gsm_a_rr_tdd_cell_info_param_value0;
+static int hf_gsm_a_rr_gprs_report_priority_description;
+static int hf_gsm_a_rr_eutran_fdd_reporting_threshold_2_present;
+static int hf_gsm_a_rr_timing_advance_index;
+static int hf_gsm_a_rr_utran_fdd_description;
+static int hf_gsm_a_rr_repeated_rtd;
+static int hf_gsm_a_rr_fdd_reporting_offset_present;
+static int hf_gsm_a_rr_mcc_mnc_parameters;
+static int hf_gsm_a_rr_packet_uplink_assignment;
+static int hf_gsm_a_rr_utran_frequency_index_present;
+static int hf_gsm_a_rr_earlier_version_reserved_bit;
+static int hf_gsm_a_rr_psc_present;
+static int hf_gsm_a_rr_serving_cell_data;
+static int hf_gsm_a_rr_utran_tdd_description_earlier_version_bit_reserved2;
+static int hf_gsm_a_rr_repeated_rtd_frequency;
+static int hf_gsm_a_rr_pr_mode_present;
+static int hf_gsm_a_rr_eutran_default_measurement_control_eutran_present;
+static int hf_gsm_a_rr_3g_additional_measurement_parameters_description_2;
+static int hf_gsm_a_rr_e_utran_measurement_report;
+static int hf_gsm_a_rr_3g_neighbour_cell_description;
+static int hf_gsm_a_rr_400_reporting_present;
+static int hf_gsm_a_rr_gamma_present;
+static int hf_gsm_a_rr_additional_lsa_id;
+static int hf_gsm_a_rr_tdd_information;
+static int hf_gsm_a_rr_utran_priority_present;
+static int hf_gsm_a_rr_utran_qrxlevmin_present;
+static int hf_gsm_a_rr_repeated_csg_fdd_uarfcn;
+static int hf_gsm_a_rr_arfcn_present;
+static int hf_gsm_a_rr_cdma2000_multirat_reporting;
+static int hf_gsm_a_rr_si13alt_position_present;
+static int hf_gsm_a_rr_3g_csg_description;
+static int hf_gsm_a_rr_rtd;
+static int hf_gsm_a_rr_tbf_starting_time_present;
+static int hf_gsm_a_rr_eutran_fdd_reporting;
+static int hf_gsm_a_rr_nc_periods;
+static int hf_gsm_a_rr_index_start_3g_present;
+static int hf_gsm_a_rr_repeated_pcid;
+static int hf_gsm_a_rr_repeated_invalid_bsic_information;
+static int hf_gsm_a_rr_repeated_utran_measurement_control_parameters_struct;
+static int hf_gsm_a_rr_repeated_utran_priority_parameters;
+static int hf_gsm_a_rr_measurement_parameters_description;
+static int hf_gsm_a_rr_bep_period2_present;
+static int hf_gsm_a_rr_serving_reporting_present;
+static int hf_gsm_a_rr_alpha_present;
+static int hf_gsm_a_rr_psc_pattern;
+static int hf_gsm_a_rr_second_packet_assignment_discriminator_bit;
+static int hf_gsm_a_rr_lsa_id_type;
+static int hf_gsm_a_rr_fdd_parameters;
+static int hf_gsm_a_rr_gprs_real_time_difference_description;
+static int hf_gsm_a_rr_repeated_eutran_frequency_index;
+static int hf_gsm_a_rr_3g_additional_measurement_parameters_description;
+static int hf_gsm_a_rr_eutran_measurement_parameters_description;
+static int hf_gsm_a_rr_mbms_assignment;
+static int hf_gsm_a_rr_ms_parameters;
+static int hf_gsm_a_rr_utran_fdd_description_earlier_version_bit_reserved2;
+static int hf_gsm_a_rr_3g_measurement_parameters_description;
+static int hf_gsm_a_rr_eutran_priority_present;
+static int hf_gsm_a_rr_1900_reporting_present;
+static int hf_gsm_a_rr_3g_measurement_control_parameters_description_struct;
+static int hf_gsm_a_rr_eutran_parameters_description;
+static int hf_gsm_a_rr_rtd6;
+static int hf_gsm_a_rr_thresh_eutran_low_present;
+static int hf_gsm_a_rr_allocation_type;
+static int hf_gsm_a_rr_additional_rtd_struct;
+static int hf_gsm_a_rr_additional_information_for_3x_auxiliary_pilot;
+static int hf_gsm_a_rr_fdd_information;
+static int hf_gsm_a_rr_future_extensions_of_the_2g_parameters;
+static int hf_gsm_a_rr_ba_index_start_rtd;
+static int hf_gsm_a_rr_utran_tdd_description_earlier_version_bit_reserved1;
+static int hf_gsm_a_rr_eutran_fdd_reporting_threshold;
+static int hf_gsm_a_rr_measurement_control_parameters_description;
+static int hf_gsm_a_rr_eutran_measurement_bandwidth_present;
+static int hf_gsm_a_rr_eutran_tdd_reporting_threshold_2_present;
+static int hf_gsm_a_rr_eutran_earfcn_present;
+static int hf_gsm_a_rr_eutran_qrxlevmin_present;
+static int hf_gsm_a_rr_ba_index_start_bsic_present;
+static int hf_gsm_a_rr_gprs_bsic_description;
+static int hf_gsm_a_rr_group_channel_description;
+static int hf_gsm_a_rr_cdma2000_description;
+static int hf_gsm_a_rr_si_2quater_extension_information;
+static int hf_gsm_a_rr_3g_supplementary_parameters_description;
+static int hf_gsm_a_rr_priority_and_eutran_param_description;
+static int hf_gsm_a_rr_multiband_reporting_present;
+static int hf_gsm_a_rr_report_priority_description;
+static int hf_gsm_a_rr_tdd_reporting_offset_present;
+static int hf_gsm_a_rr_amr_config_present;
+static int hf_gsm_a_rr_rand_bit_stream_ind;
+static int hf_gsm_a_rr_900_reporting_present;
+static int hf_gsm_a_rr_rfl_number_present;
+static int hf_gsm_a_rr_eutran_fdd_reporting_offset_present;
+static int hf_gsm_a_rr_repeated_csg_psc_split_struct;
+static int hf_gsm_a_rr_gprs_eutran_measurement_parameters_description;
+static int hf_gsm_a_rr_tdd_parameters;
+static int hf_gsm_a_rr_repeat_eutran_desc;
+static int hf_gsm_a_rr_peo_dsc_and_rcc_present;
+static int hf_gsm_a_rr_c1_delta_present;
+static int hf_gsm_a_rr_ul_xtti_tbf_assignment;
+static int hf_gsm_a_rr_dl_xtti_tbf_assignment;
+static int hf_gsm_a_rr_fanr_act_state;
+static int hf_gsm_a_rr_encoding_selection;
+static int hf_gsm_a_rr_nof_pdch_pairs;
+static int hf_gsm_a_rr_npm_transfer_time_present;
+static int hf_gsm_a_rr_eab_parameters;
 
 /* gsm_rr_csn_HL_flag() fields */
-static int hf_gsm_a_rr_selection_parameters = -1;
-static int hf_gsm_a_rr_break_indicator = -1;
-static int hf_gsm_a_rr_si13_contents = -1;
-static int hf_gsm_a_rr_additions_in_rel_9 = -1;
-static int hf_gsm_a_rr_lsa_id_information = -1;
-static int hf_gsm_a_rr_si2quater_indicator = -1;
-static int hf_gsm_a_rr_si21_indicator = -1;
-static int hf_gsm_a_rr_additions_in_rel_4 = -1;
-static int hf_gsm_a_call_prio4 = -1;
-static int hf_gsm_a_rr_gprs_ms_txpwr_max_ccch_present = -1;
-static int hf_gsm_a_rr_vbs_vgcs_options = -1;
-static int hf_gsm_a_rr_si4_rest_octets_s = -1;
-static int hf_gsm_a_call_prio1 = -1;
-static int hf_gsm_a_rr_si2ter_mp_change_mark_present = -1;
-static int hf_gsm_a_rr_gprs_indicator = -1;
-static int hf_gsm_a_rr_nln_pch_present = -1;
-static int hf_gsm_a_rr_early_classmark_sending = -1;
-static int hf_gsm_a_rr_chnl_needed_ch3and4 = -1;
-static int hf_gsm_a_rr_additions_in_rel_5 = -1;
-static int hf_gsm_a_rr_group_call_information = -1;
-static int hf_gsm_a_rr_lsa_parameters = -1;
-static int hf_gsm_a_rr_first_discriminator_bit = -1;
-static int hf_gsm_a_rr_packet_paging_procedure_3 = -1;
-static int hf_gsm_a_rr_packet_paging_procedure_1 = -1;
-static int hf_gsm_a_rr_chnl_needed_ch3_present = -1;
-static int hf_gsm_a_rr_power_offset_present = -1;
-static int hf_gsm_a_call_prio2 = -1;
-static int hf_gsm_a_rr_additions_in_rel_6 = -1;
-static int hf_gsm_a_rr_packet_paging_procedure_2 = -1;
-static int hf_gsm_a_rr_3g_early_classmark_sending_restriction = -1;
-static int hf_gsm_a_rr_scheduling_if_and_where = -1;
-static int hf_gsm_a_rr_packet_page_indication_1 = -1;
-static int hf_gsm_a_rr_cbq3_present = -1;
-static int hf_gsm_a_rr_second_discriminator_bit = -1;
-static int hf_gsm_a_call_prio3 = -1;
-static int hf_gsm_a_rr_additions_in_release_6_present = -1;
-static int hf_gsm_a_rr_system_information_type_2ter = -1;
-static int hf_gsm_a_rr_a_compressed_inter_rat_handover_info = -1;
-static int hf_gsm_a_rr_additions_in_rel_8 = -1;
-static int hf_gsm_a_rr_dtm = -1;
-static int hf_gsm_a_rr_pch_and_nch_info = -1;
-static int hf_gsm_a_rr_cell_id_present = -1;
-static int hf_gsm_a_rr_additions_in_r99 = -1;
-static int hf_gsm_a_rr_mbms_procedures = -1;
-static int hf_gsm_a_rr_nch_position_present = -1;
-static int hf_gsm_a_rr_additions_in_rel_7 = -1;
-static int hf_gsm_a_rr_packet_page_indication_2 = -1;
-static int hf_gsm_a_rr_multiple_tbf_procedures = -1;
-static int hf_gsm_a_rr_additions_in_rel_10 = -1;
-static int hf_gsm_a_rr_additions_in_rel_13 = -1;
-static int hf_gsm_a_rr_si_change_alt = -1;
+static int hf_gsm_a_rr_selection_parameters;
+static int hf_gsm_a_rr_break_indicator;
+static int hf_gsm_a_rr_si13_contents;
+static int hf_gsm_a_rr_additions_in_rel_9;
+static int hf_gsm_a_rr_lsa_id_information;
+static int hf_gsm_a_rr_si2quater_indicator;
+static int hf_gsm_a_rr_si21_indicator;
+static int hf_gsm_a_rr_additions_in_rel_4;
+static int hf_gsm_a_call_prio4;
+static int hf_gsm_a_rr_gprs_ms_txpwr_max_ccch_present;
+static int hf_gsm_a_rr_vbs_vgcs_options;
+static int hf_gsm_a_rr_si4_rest_octets_s;
+static int hf_gsm_a_call_prio1;
+static int hf_gsm_a_rr_si2ter_mp_change_mark_present;
+static int hf_gsm_a_rr_gprs_indicator;
+static int hf_gsm_a_rr_nln_pch_present;
+static int hf_gsm_a_rr_early_classmark_sending;
+static int hf_gsm_a_rr_chnl_needed_ch3and4;
+static int hf_gsm_a_rr_additions_in_rel_5;
+static int hf_gsm_a_rr_group_call_information;
+static int hf_gsm_a_rr_lsa_parameters;
+static int hf_gsm_a_rr_first_discriminator_bit;
+static int hf_gsm_a_rr_packet_paging_procedure_3;
+static int hf_gsm_a_rr_packet_paging_procedure_1;
+static int hf_gsm_a_rr_chnl_needed_ch3_present;
+static int hf_gsm_a_rr_power_offset_present;
+static int hf_gsm_a_call_prio2;
+static int hf_gsm_a_rr_additions_in_rel_6;
+static int hf_gsm_a_rr_packet_paging_procedure_2;
+static int hf_gsm_a_rr_3g_early_classmark_sending_restriction;
+static int hf_gsm_a_rr_scheduling_if_and_where;
+static int hf_gsm_a_rr_packet_page_indication_1;
+static int hf_gsm_a_rr_cbq3_present;
+static int hf_gsm_a_rr_second_discriminator_bit;
+static int hf_gsm_a_call_prio3;
+static int hf_gsm_a_rr_additions_in_release_6_present;
+static int hf_gsm_a_rr_system_information_type_2ter;
+static int hf_gsm_a_rr_a_compressed_inter_rat_handover_info;
+static int hf_gsm_a_rr_additions_in_rel_8;
+static int hf_gsm_a_rr_dtm;
+static int hf_gsm_a_rr_pch_and_nch_info;
+static int hf_gsm_a_rr_cell_id_present;
+static int hf_gsm_a_rr_additions_in_r99;
+static int hf_gsm_a_rr_mbms_procedures;
+static int hf_gsm_a_rr_nch_position_present;
+static int hf_gsm_a_rr_additions_in_rel_7;
+static int hf_gsm_a_rr_packet_page_indication_2;
+static int hf_gsm_a_rr_multiple_tbf_procedures;
+static int hf_gsm_a_rr_additions_in_rel_10;
+static int hf_gsm_a_rr_additions_in_rel_13;
+static int hf_gsm_a_rr_si_change_alt;
 
 /* Additions in Rel-8 */
-static int hf_gsm_a_rr_3g_priority_param_desc_utran_start = -1;
-static int hf_gsm_a_rr_3g_priority_param_desc_utran_stop = -1;
-static int hf_gsm_a_rr_3g_priority_param_desc_default_utran_prio = -1;
-static int hf_gsm_a_rr_3g_priority_param_desc_default_threshold_utran = -1;
-static int hf_gsm_a_rr_3g_priority_param_desc_default_utran_qrxlevmin = -1;
-static int hf_gsm_a_rr_utran_frequency_index = -1;
-static int hf_gsm_a_rr_utran_priority = -1;
-static int hf_gsm_a_rr_thresh_utran_high = -1;
-static int hf_gsm_a_rr_thresh_utran_low = -1;
-static int hf_gsm_a_rr_utran_qrxlevmin = -1;
-static int hf_gsm_a_rr_eutran_ccn_active = -1;
-static int hf_gsm_a_rr_eutran_start = -1;
-static int hf_gsm_a_rr_eutran_stop = -1;
-static int hf_gsm_a_rr_qsearch_c_eutran_initial = -1;
-static int hf_gsm_a_rr_eutran_multirat_reporting = -1;
-static int hf_gsm_a_rr_eutran_fdd_reporting_threshold_rsrp = -1;
-static int hf_gsm_a_rr_eutran_fdd_reporting_threshold_rsrq = -1;
-static int hf_gsm_a_rr_eutran_fdd_reporting_threshold_2 = -1;
-static int hf_gsm_a_rr_eutran_fdd_reporting_offset = -1;
-static int hf_gsm_a_rr_eutran_tdd_reporting_threshold_rsrp = -1;
-static int hf_gsm_a_rr_eutran_tdd_reporting_threshold_rsrq = -1;
-static int hf_gsm_a_rr_eutran_tdd_reporting_threshold_2 = -1;
-static int hf_gsm_a_rr_eutran_tdd_reporting_offset = -1;
-static int hf_gsm_a_rr_eutran_fdd_measurement_report_offset = -1;
-static int hf_gsm_a_rr_eutran_tdd_measurement_report_offset = -1;
-static int hf_gsm_a_rr_reporting_granularity = -1;
-static int hf_gsm_a_rr_eutran_default_measurement_control_eutran = -1;
-static int hf_gsm_a_rr_eutran_measurement_control_eutran = -1;
-static int hf_gsm_a_rr_qsearch_p_eutran = -1;
-static int hf_gsm_a_rr_serving_cell_priority_param_geran_priority = -1;
-static int hf_gsm_a_rr_serving_cell_priority_param_thresh_prio_search = -1;
-static int hf_gsm_a_rr_serving_cell_priority_param_thresh_gsm_low = -1;
-static int hf_gsm_a_rr_serving_cell_priority_param_h_prio = -1;
-static int hf_gsm_a_rr_serving_cell_priority_param_t_reselection = -1;
-static int hf_gsm_a_rr_eutran_earfcn = -1;
-static int hf_gsm_a_rr_eutran_measurement_bandwidth = -1;
-static int hf_gsm_a_rr_eutran_priority = -1;
-static int hf_gsm_a_rr_thresh_eutran_high = -1;
-static int hf_gsm_a_rr_thresh_eutran_low = -1;
-static int hf_gsm_a_rr_eutran_qrxlevmin = -1;
-static int hf_gsm_a_rr_eutran_pcid_present = -1;
-static int hf_gsm_a_rr_eutran_pcid = -1;
-static int hf_gsm_a_rr_eutran_pcid_bitmap_group = -1;
-static int hf_gsm_a_rr_eutran_pcid_pattern_length = -1;
-/* static int hf_gsm_a_rr_eutran_pcid_pattern = -1; */
-static int hf_gsm_a_rr_eutran_pcid_pattern_sense = -1;
-static int hf_gsm_a_rr_eutran_frequency_index = -1;
-static int hf_gsm_a_rr_psc = -1;
-static int hf_gsm_a_rr_utran_psc_pattern_length = -1;
-static int hf_gsm_a_rr_utran_psc_pattern_sense = -1;
-static int hf_gsm_a_rr_utran_csg_fdd_uarfcn = -1;
-static int hf_gsm_a_rr_utran_csg_tdd_uarfcn = -1;
-static int hf_gsm_a_rr_csg_earfcn = -1;
-static int hf_gsm_a_rr_3g_control_param_desc_meas_ctrl_utran = -1;
-static int hf_gsm_a_rr_peo_bcch_change_mark = -1;
-static int hf_gsm_a_rr_feat_ind_cs_ir = -1;
-static int hf_gsm_a_rr_feat_ind_ps_ir = -1;
+static int hf_gsm_a_rr_3g_priority_param_desc_utran_start;
+static int hf_gsm_a_rr_3g_priority_param_desc_utran_stop;
+static int hf_gsm_a_rr_3g_priority_param_desc_default_utran_prio;
+static int hf_gsm_a_rr_3g_priority_param_desc_default_threshold_utran;
+static int hf_gsm_a_rr_3g_priority_param_desc_default_utran_qrxlevmin;
+static int hf_gsm_a_rr_utran_frequency_index;
+static int hf_gsm_a_rr_utran_priority;
+static int hf_gsm_a_rr_thresh_utran_high;
+static int hf_gsm_a_rr_thresh_utran_low;
+static int hf_gsm_a_rr_utran_qrxlevmin;
+static int hf_gsm_a_rr_eutran_ccn_active;
+static int hf_gsm_a_rr_eutran_start;
+static int hf_gsm_a_rr_eutran_stop;
+static int hf_gsm_a_rr_qsearch_c_eutran_initial;
+static int hf_gsm_a_rr_eutran_multirat_reporting;
+static int hf_gsm_a_rr_eutran_fdd_reporting_threshold_rsrp;
+static int hf_gsm_a_rr_eutran_fdd_reporting_threshold_rsrq;
+static int hf_gsm_a_rr_eutran_fdd_reporting_threshold_2;
+static int hf_gsm_a_rr_eutran_fdd_reporting_offset;
+static int hf_gsm_a_rr_eutran_tdd_reporting_threshold_rsrp;
+static int hf_gsm_a_rr_eutran_tdd_reporting_threshold_rsrq;
+static int hf_gsm_a_rr_eutran_tdd_reporting_threshold_2;
+static int hf_gsm_a_rr_eutran_tdd_reporting_offset;
+static int hf_gsm_a_rr_eutran_fdd_measurement_report_offset;
+static int hf_gsm_a_rr_eutran_tdd_measurement_report_offset;
+static int hf_gsm_a_rr_reporting_granularity;
+static int hf_gsm_a_rr_eutran_default_measurement_control_eutran;
+static int hf_gsm_a_rr_eutran_measurement_control_eutran;
+static int hf_gsm_a_rr_qsearch_p_eutran;
+static int hf_gsm_a_rr_serving_cell_priority_param_geran_priority;
+static int hf_gsm_a_rr_serving_cell_priority_param_thresh_prio_search;
+static int hf_gsm_a_rr_serving_cell_priority_param_thresh_gsm_low;
+static int hf_gsm_a_rr_serving_cell_priority_param_h_prio;
+static int hf_gsm_a_rr_serving_cell_priority_param_t_reselection;
+static int hf_gsm_a_rr_eutran_earfcn;
+static int hf_gsm_a_rr_eutran_measurement_bandwidth;
+static int hf_gsm_a_rr_eutran_priority;
+static int hf_gsm_a_rr_thresh_eutran_high;
+static int hf_gsm_a_rr_thresh_eutran_low;
+static int hf_gsm_a_rr_eutran_qrxlevmin;
+static int hf_gsm_a_rr_eutran_pcid_present;
+static int hf_gsm_a_rr_eutran_pcid;
+static int hf_gsm_a_rr_eutran_pcid_bitmap_group;
+static int hf_gsm_a_rr_eutran_pcid_pattern_length;
+/* static int hf_gsm_a_rr_eutran_pcid_pattern; */
+static int hf_gsm_a_rr_eutran_pcid_pattern_sense;
+static int hf_gsm_a_rr_eutran_frequency_index;
+static int hf_gsm_a_rr_psc;
+static int hf_gsm_a_rr_utran_psc_pattern_length;
+static int hf_gsm_a_rr_utran_psc_pattern_sense;
+static int hf_gsm_a_rr_utran_csg_fdd_uarfcn;
+static int hf_gsm_a_rr_utran_csg_tdd_uarfcn;
+static int hf_gsm_a_rr_csg_earfcn;
+static int hf_gsm_a_rr_3g_control_param_desc_meas_ctrl_utran;
+static int hf_gsm_a_rr_peo_bcch_change_mark;
+static int hf_gsm_a_rr_feat_ind_cs_ir;
+static int hf_gsm_a_rr_feat_ind_ps_ir;
 
 /* Additions for EC-GSM-IoT rel. 13 */
-static int hf_gsm_a_rr_ec_qhfi = -1;
-static int hf_gsm_a_rr_ec_dl_cc = -1;
-static int hf_gsm_a_rr_ec_ul_cc = -1;
-static int hf_gsm_a_rr_tsc_set = -1;
-static int hf_gsm_a_rr_ec_tsc = -1;
-static int hf_gsm_a_rr_ec_ma_number = -1;
-
-static int hf_gsm_a_rr_ec_enhanced_access_burst = -1;
-static int hf_gsm_a_rr_ec_starting_ul_timeslot = -1;
-static int hf_gsm_a_rr_ec_starting_dl_timeslot = -1;
-static int hf_gsm_a_rr_ec_starting_dl_timeslot_offset = -1;
-static int hf_gsm_a_rr_ec_starting_ul_timeslot_offset = -1;
-static int hf_gsm_a_rr_ec_overlaid_cdma_code = -1;
-static int hf_gsm_a_rr_ec_mcs_exist = -1;
-static int hf_gsm_a_rr_ec_start_first_ul_data_block = -1;
-static int hf_gsm_a_rr_ec_fua_gap_list = -1;
-static int hf_gsm_a_rr_ec_start_fn_next_data_block_exist = -1;
-static int hf_gsm_a_rr_ec_start_fn_next_data_block = -1;
-
-static int hf_gsm_a_rr_ec_used_dl_cc = -1;
-static int hf_gsm_a_rr_ec_page_extension_exist = -1;
-static int hf_gsm_a_rr_ec_page_extension = -1;
-static int hf_gsm_a_rr_ec_last_tdma_frame = -1;
-static int hf_gsm_a_rr_ec_echoed_random_bits = -1;
-
-static int hf_gsm_a_rr_ec_wait_timer = -1;
-static int hf_gsm_a_rr_ec_req_ref_2_present = -1;
-static int hf_gsm_a_rr_ec_req_ref_3_present = -1;
-
-static int hf_gsm_a_rr_ec_ptmsi_imsi_select = -1;
-static int hf_gsm_a_rr_ec_imsi_digits = -1;
-static int hf_gsm_a_rr_ec_imsi = -1;
-static int hf_gsm_a_rr_ec_mobile_identity_2_exist = -1;
-
-static int hf_gsm_a_rr_ec_cc1_timeslot_multiplier = -1;
-static int hf_gsm_a_rr_ec_alpha_enable = -1;
-
-static int hf_gsm_a_rr_rcc = -1;
-static int hf_gsm_a_rr_implicit_reject_cs = -1;
-static int hf_gsm_a_rr_implicit_reject_ps = -1;
-static int hf_gsm_a_rr_peo_dsc = -1;
-static int hf_gsm_a_rr_c1_delta_min = -1;
-static int hf_gsm_a_rr_c1_delta_max = -1;
-
-static int hf_gsm_a_rr_cs_tsc_set = -1;
-static int hf_gsm_a_rr_ps_sd_tsc_ass = -1;
-static int hf_gsm_a_rr_ps_pd_tsc_set = -1;
-static int hf_gsm_a_rr_ps_sd_tsc_set = -1;
-static int hf_gsm_a_rr_ps_sd_tsc_val = -1;
+static int hf_gsm_a_rr_ec_qhfi;
+static int hf_gsm_a_rr_ec_dl_cc;
+static int hf_gsm_a_rr_ec_ul_cc;
+static int hf_gsm_a_rr_tsc_set;
+static int hf_gsm_a_rr_ec_tsc;
+static int hf_gsm_a_rr_ec_ma_number;
+
+static int hf_gsm_a_rr_ec_enhanced_access_burst;
+static int hf_gsm_a_rr_ec_starting_ul_timeslot;
+static int hf_gsm_a_rr_ec_starting_dl_timeslot;
+static int hf_gsm_a_rr_ec_starting_dl_timeslot_offset;
+static int hf_gsm_a_rr_ec_starting_ul_timeslot_offset;
+static int hf_gsm_a_rr_ec_overlaid_cdma_code;
+static int hf_gsm_a_rr_ec_mcs_exist;
+static int hf_gsm_a_rr_ec_start_first_ul_data_block;
+static int hf_gsm_a_rr_ec_fua_gap_list;
+static int hf_gsm_a_rr_ec_start_fn_next_data_block_exist;
+static int hf_gsm_a_rr_ec_start_fn_next_data_block;
+
+static int hf_gsm_a_rr_ec_used_dl_cc;
+static int hf_gsm_a_rr_ec_page_extension_exist;
+static int hf_gsm_a_rr_ec_page_extension;
+static int hf_gsm_a_rr_ec_last_tdma_frame;
+static int hf_gsm_a_rr_ec_echoed_random_bits;
+
+static int hf_gsm_a_rr_ec_wait_timer;
+static int hf_gsm_a_rr_ec_req_ref_2_present;
+static int hf_gsm_a_rr_ec_req_ref_3_present;
+
+static int hf_gsm_a_rr_ec_ptmsi_imsi_select;
+static int hf_gsm_a_rr_ec_imsi_digits;
+static int hf_gsm_a_rr_ec_imsi;
+static int hf_gsm_a_rr_ec_mobile_identity_2_exist;
+
+static int hf_gsm_a_rr_ec_cc1_timeslot_multiplier;
+static int hf_gsm_a_rr_ec_alpha_enable;
+
+static int hf_gsm_a_rr_rcc;
+static int hf_gsm_a_rr_implicit_reject_cs;
+static int hf_gsm_a_rr_implicit_reject_ps;
+static int hf_gsm_a_rr_peo_dsc;
+static int hf_gsm_a_rr_c1_delta_min;
+static int hf_gsm_a_rr_c1_delta_max;
+
+static int hf_gsm_a_rr_cs_tsc_set;
+static int hf_gsm_a_rr_ps_sd_tsc_ass;
+static int hf_gsm_a_rr_ps_pd_tsc_set;
+static int hf_gsm_a_rr_ps_sd_tsc_set;
+static int hf_gsm_a_rr_ps_sd_tsc_val;
 
 /* Initialize the subtree pointers */
-static gint ett_ccch_msg = -1;
-static gint ett_rach_msg = -1;
-static gint ett_ec_ccch_msg = -1;
-static gint ett_ccch_oct_1 = -1;
-static gint ett_sacch_msg = -1;
-static gint ett_apdu = -1;
-
-static expert_field ei_gsm_a_rr_ie_overrun = EI_INIT;
-static expert_field ei_gsm_a_rr_ie_underrun = EI_INIT;
-static expert_field ei_gsm_a_rr_data_not_dissected = EI_INIT;
-static expert_field ei_gsm_a_rr_unknown_version = EI_INIT;
-static expert_field ei_gsm_a_rr_extraneous_data = EI_INIT;
-static expert_field ei_gsm_a_rr_missing_mandatory_element = EI_INIT;
+static gint ett_ccch_msg;
+static gint ett_rach_msg;
+static gint ett_ec_ccch_msg;
+static gint ett_ccch_oct_1;
+static gint ett_sacch_msg;
+static gint ett_apdu;
+
+static expert_field ei_gsm_a_rr_ie_overrun;
+static expert_field ei_gsm_a_rr_ie_underrun;
+static expert_field ei_gsm_a_rr_data_not_dissected;
+static expert_field ei_gsm_a_rr_unknown_version;
+static expert_field ei_gsm_a_rr_extraneous_data;
+static expert_field ei_gsm_a_rr_missing_mandatory_element;
 
 static dissector_handle_t rrlp_dissector;
 
diff --git a/epan/dissectors/packet-gsm_abis_om2000.c b/epan/dissectors/packet-gsm_abis_om2000.c
index 37f8d25c8f..978f56f047 100644
--- a/epan/dissectors/packet-gsm_abis_om2000.c
+++ b/epan/dissectors/packet-gsm_abis_om2000.c
@@ -22,109 +22,109 @@
 void proto_register_abis_om2000(void);
 
 /* initialize the protocol and registered fields */
-static int proto_abis_om2000 = -1;
-
-static int hf_om2k_msg_code = -1;
-static int hf_om2k_mo_if = -1;
-static int hf_om2k_mo_class = -1;
-static int hf_om2k_mo_sub1 = -1;
-static int hf_om2k_mo_sub2 = -1;
-static int hf_om2k_mo_instance = -1;
-
-static int hf_om2k_aip = -1;
-static int hf_om2k_oip = -1;
-static int hf_om2k_comb = -1;
-static int hf_om2k_ts = -1;
-static int hf_om2k_hsn = -1;
-static int hf_om2k_maio = -1;
-static int hf_om2k_bsic = -1;
-static int hf_om2k_diversity = -1;
-static int hf_om2k_fn_offs = -1;
-static int hf_om2k_ext_range = -1;
-static int hf_om2k_irc = -1;
-static int hf_om2k_bs_pa_mfrms = -1;
-static int hf_om2k_bs_ag_blks_res= -1;
-static int hf_om2k_drx_dev_max = -1;
-static int hf_om2k_cr = -1;
-static int hf_om2k_ipt3 = -1;
-static int hf_om2k_aop = -1;
-static int hf_om2k_t3105 = -1;
-static int hf_om2k_ny1 = -1;
-static int hf_om2k_cbi = -1;
-static int hf_om2k_tsc = -1;
-static int hf_om2k_icm = -1;
-static int hf_om2k_tta = -1;
-static int hf_om2k_icm_cr = -1;
-static int hf_om2k_lsc_fm = -1;
-static int hf_om2k_lsc_lsi = -1;
-static int hf_om2k_lsc_lsa = -1;
-static int hf_om2k_ls_ft = -1;
-static int hf_om2k_cst = -1;
-static int hf_om2k_ea = -1;
-static int hf_om2k_unknown_tag = -1;
-static int hf_om2k_unknown_val = -1;
-static int hf_om2k_nom_pwr = -1;
-static int hf_om2k_fill_mark = -1;
-static int hf_om2k_bcc = -1;
-static int hf_om2k_mo_state = -1;
-static int hf_om2k_la_state = -1;
-static int hf_om2k_tsn_state = -1;
-static int hf_om2k_bts_manuf = -1;
-static int hf_om2k_bts_gen = -1;
-static int hf_om2k_bts_rev = -1;
-static int hf_om2k_bts_var = -1;
-static int hf_om2k_brr = -1;
-static int hf_om2k_bfr = -1;
-static int hf_om2k_hwinfo_sig = -1;
-static int hf_om2k_capa_sig = -1;
-static int hf_om2k_file_rev = -1;
-static int hf_om2k_filerel_ilr = -1;
-static int hf_om2k_filerel_cur = -1;
-static int hf_om2k_filerel_other = -1;
-static int hf_om2k_cal_time = -1;
-static int hf_om2k_list_nr = -1;
-static int hf_om2k_list_nr_end = -1;
-static int hf_om2k_isl = -1;
-static int hf_om2k_isl_icp1 = -1;
-static int hf_om2k_isl_icp2 = -1;
-static int hf_om2k_isl_ci = -1;
-static int hf_om2k_conl = -1;
-static int hf_om2k_conl_nr_cgs = -1;
-static int hf_om2k_conl_nr_cps_cg = -1;
-static int hf_om2k_conl_ccp = -1;
-static int hf_om2k_conl_ci = -1;
-static int hf_om2k_conl_tag = -1;
-static int hf_om2k_conl_tei = -1;
-static int hf_om2k_tf_mode = -1;
-static int hf_om2k_tf_fs_offset = -1;
-static int hf_om2k_attr_id = -1;
-static int hf_om2k_attr_index = -1;
-static int hf_om2k_result_code = -1;
-static int hf_om2k_reason_code = -1;
-static int hf_om2k_iwd_type = -1;
-static int hf_om2k_iwd_gen_rev = -1;
-static int hf_om2k_trxc_list = -1;
-static int hf_om2k_max_allowed_power = -1;
-static int hf_om2k_max_allowed_num_trxcs = -1;
-static int hf_om2k_mctr_feat_sts_bitmap = -1;
-static int hf_om2k_config_type = -1;
-static int hf_om2k_jitter_size = -1;
-static int hf_om2k_packing_algo = -1;
-static int hf_om2k_power_bo_ctype_map = -1;
-static int hf_om2k_power_bo_priority = -1;
-static int hf_om2k_power_bo_value = -1;
+static int proto_abis_om2000;
+
+static int hf_om2k_msg_code;
+static int hf_om2k_mo_if;
+static int hf_om2k_mo_class;
+static int hf_om2k_mo_sub1;
+static int hf_om2k_mo_sub2;
+static int hf_om2k_mo_instance;
+
+static int hf_om2k_aip;
+static int hf_om2k_oip;
+static int hf_om2k_comb;
+static int hf_om2k_ts;
+static int hf_om2k_hsn;
+static int hf_om2k_maio;
+static int hf_om2k_bsic;
+static int hf_om2k_diversity;
+static int hf_om2k_fn_offs;
+static int hf_om2k_ext_range;
+static int hf_om2k_irc;
+static int hf_om2k_bs_pa_mfrms;
+static int hf_om2k_bs_ag_blks_res;
+static int hf_om2k_drx_dev_max;
+static int hf_om2k_cr;
+static int hf_om2k_ipt3;
+static int hf_om2k_aop;
+static int hf_om2k_t3105;
+static int hf_om2k_ny1;
+static int hf_om2k_cbi;
+static int hf_om2k_tsc;
+static int hf_om2k_icm;
+static int hf_om2k_tta;
+static int hf_om2k_icm_cr;
+static int hf_om2k_lsc_fm;
+static int hf_om2k_lsc_lsi;
+static int hf_om2k_lsc_lsa;
+static int hf_om2k_ls_ft;
+static int hf_om2k_cst;
+static int hf_om2k_ea;
+static int hf_om2k_unknown_tag;
+static int hf_om2k_unknown_val;
+static int hf_om2k_nom_pwr;
+static int hf_om2k_fill_mark;
+static int hf_om2k_bcc;
+static int hf_om2k_mo_state;
+static int hf_om2k_la_state;
+static int hf_om2k_tsn_state;
+static int hf_om2k_bts_manuf;
+static int hf_om2k_bts_gen;
+static int hf_om2k_bts_rev;
+static int hf_om2k_bts_var;
+static int hf_om2k_brr;
+static int hf_om2k_bfr;
+static int hf_om2k_hwinfo_sig;
+static int hf_om2k_capa_sig;
+static int hf_om2k_file_rev;
+static int hf_om2k_filerel_ilr;
+static int hf_om2k_filerel_cur;
+static int hf_om2k_filerel_other;
+static int hf_om2k_cal_time;
+static int hf_om2k_list_nr;
+static int hf_om2k_list_nr_end;
+static int hf_om2k_isl;
+static int hf_om2k_isl_icp1;
+static int hf_om2k_isl_icp2;
+static int hf_om2k_isl_ci;
+static int hf_om2k_conl;
+static int hf_om2k_conl_nr_cgs;
+static int hf_om2k_conl_nr_cps_cg;
+static int hf_om2k_conl_ccp;
+static int hf_om2k_conl_ci;
+static int hf_om2k_conl_tag;
+static int hf_om2k_conl_tei;
+static int hf_om2k_tf_mode;
+static int hf_om2k_tf_fs_offset;
+static int hf_om2k_attr_id;
+static int hf_om2k_attr_index;
+static int hf_om2k_result_code;
+static int hf_om2k_reason_code;
+static int hf_om2k_iwd_type;
+static int hf_om2k_iwd_gen_rev;
+static int hf_om2k_trxc_list;
+static int hf_om2k_max_allowed_power;
+static int hf_om2k_max_allowed_num_trxcs;
+static int hf_om2k_mctr_feat_sts_bitmap;
+static int hf_om2k_config_type;
+static int hf_om2k_jitter_size;
+static int hf_om2k_packing_algo;
+static int hf_om2k_power_bo_ctype_map;
+static int hf_om2k_power_bo_priority;
+static int hf_om2k_power_bo_value;
 
 /* initialize the subtree pointers */
-static int ett_om2000 = -1;
-static int ett_om2k_mo = -1;
-static int ett_om2k_isl = -1;
-static int ett_om2k_conl = -1;
-static int ett_om2k_iwd = -1;
-
-static expert_field ei_om2k_not_performed = EI_INIT;
-static expert_field ei_om2k_reject = EI_INIT;
-static expert_field ei_om2k_nack = EI_INIT;
-static expert_field ei_om2k_ena_res_disabled = EI_INIT;
+static int ett_om2000;
+static int ett_om2k_mo;
+static int ett_om2k_isl;
+static int ett_om2k_conl;
+static int ett_om2k_iwd;
+
+static expert_field ei_om2k_not_performed;
+static expert_field ei_om2k_reject;
+static expert_field ei_om2k_nack;
+static expert_field ei_om2k_ena_res_disabled;
 
 static const value_string om2k_msgcode_vals[] = {
 	{ 0x0000, "Abort SP Command" },
diff --git a/epan/dissectors/packet-gsm_abis_oml.c b/epan/dissectors/packet-gsm_abis_oml.c
index 593a7df859..f72fb48c77 100644
--- a/epan/dissectors/packet-gsm_abis_oml.c
+++ b/epan/dissectors/packet-gsm_abis_oml.c
@@ -638,121 +638,121 @@ enum abis_nm_ipacc_testres_ie {
 };
 
 /* initialize the protocol and registered fields */
-static int proto_abis_oml = -1;
+static int proto_abis_oml;
 
 /* OML header */
-static int hf_oml_msg_disc = -1;
-static int hf_oml_placement = -1;
-static int hf_oml_sequence = -1;
-static int hf_oml_length = -1;
-static int hf_oml_manuf_id_len = -1;
-static int hf_oml_manuf_id_val = -1;
+static int hf_oml_msg_disc;
+static int hf_oml_placement;
+static int hf_oml_sequence;
+static int hf_oml_length;
+static int hf_oml_manuf_id_len;
+static int hf_oml_manuf_id_val;
 /* FOM header */
-static int hf_oml_fom_msgtype = -1;
-static int hf_oml_fom_objclass = -1;
-static int hf_oml_fom_inst_bts = -1;
-static int hf_oml_fom_inst_trx = -1;
-static int hf_oml_fom_inst_ts = -1;
-static int hf_oml_fom_attr_tag = -1;
-static int hf_oml_fom_attr_len = -1;
-static int hf_oml_fom_attr_val = -1;
+static int hf_oml_fom_msgtype;
+static int hf_oml_fom_objclass;
+static int hf_oml_fom_inst_bts;
+static int hf_oml_fom_inst_trx;
+static int hf_oml_fom_inst_ts;
+static int hf_oml_fom_attr_tag;
+static int hf_oml_fom_attr_len;
+static int hf_oml_fom_attr_val;
 /* FOM attributes */
-static int hf_attr_adm_state = -1;
-static int hf_attr_arfcn = -1;
-static int hf_attr_oper_state = -1;
-static int hf_attr_avail_state = -1;
-static int hf_attr_event_type = -1;
-static int hf_attr_severity = -1;
-static int hf_attr_nack_causes = -1;
-static int hf_attr_bcch_arfcn = -1;
-static int hf_attr_bsic = -1;
-static int hf_attr_test_no = -1;
-static int hf_attr_tsc = -1;
-static int hf_attr_tei = -1;
-static int hf_attr_ach_btsp = -1;
-static int hf_attr_ach_tslot = -1;
-static int hf_attr_ach_sslot = -1;
-static int hf_attr_gsm_time = -1;
-static int hf_attr_chan_comb = -1;
-static int hf_attr_hsn = -1;
-static int hf_attr_maio = -1;
-static int hf_attr_list_req_attr = -1;
-static int hf_attr_ari_not_reported_cnt = -1;
-static int hf_attr_ari_not_reported_attr = -1;
-static int hf_attr_rf_max_pwr_red = -1;
-static int hf_attr_interf_bound0 = -1;
-static int hf_attr_interf_bound1 = -1;
-static int hf_attr_interf_bound2 = -1;
-static int hf_attr_interf_bound3 = -1;
-static int hf_attr_interf_bound4 = -1;
-static int hf_attr_interf_bound5 = -1;
+static int hf_attr_adm_state;
+static int hf_attr_arfcn;
+static int hf_attr_oper_state;
+static int hf_attr_avail_state;
+static int hf_attr_event_type;
+static int hf_attr_severity;
+static int hf_attr_nack_causes;
+static int hf_attr_bcch_arfcn;
+static int hf_attr_bsic;
+static int hf_attr_test_no;
+static int hf_attr_tsc;
+static int hf_attr_tei;
+static int hf_attr_ach_btsp;
+static int hf_attr_ach_tslot;
+static int hf_attr_ach_sslot;
+static int hf_attr_gsm_time;
+static int hf_attr_chan_comb;
+static int hf_attr_hsn;
+static int hf_attr_maio;
+static int hf_attr_list_req_attr;
+static int hf_attr_ari_not_reported_cnt;
+static int hf_attr_ari_not_reported_attr;
+static int hf_attr_rf_max_pwr_red;
+static int hf_attr_interf_bound0;
+static int hf_attr_interf_bound1;
+static int hf_attr_interf_bound2;
+static int hf_attr_interf_bound3;
+static int hf_attr_interf_bound4;
+static int hf_attr_interf_bound5;
 /* Ipaccess */
-static int hf_oml_ipa_tres_attr_tag = -1;
-static int hf_oml_ipa_tres_attr_len = -1;
-static int hf_attr_ipa_test_res = -1;
-static int hf_attr_ipa_tr_rxlev = -1;
-static int hf_attr_ipa_tr_b_rxlev = -1;
-static int hf_attr_ipa_tr_arfcn = -1;
-static int hf_attr_ipa_tr_f_qual = -1;
-static int hf_attr_ipa_tr_f_err = -1;
-static int hf_attr_ipa_tr_rxqual = -1;
-static int hf_attr_ipa_tr_frame_offs = -1;
-static int hf_attr_ipa_tr_framenr_offs = -1;
-static int hf_attr_ipa_tr_bsic = -1;
-static int hf_attr_ipa_tr_cell_id = -1;
-static int hf_attr_ipa_tr_si2 = -1;
-static int hf_attr_ipa_tr_si2bis = -1;
-static int hf_attr_ipa_tr_si2ter = -1;
-static int hf_attr_ipa_tr_chan_desc = -1;
-static int hf_attr_ipa_rsl_ip = -1;
-static int hf_attr_ipa_rsl_port = -1;
-static int hf_attr_ipa_prim_oml_ip = -1;
-static int hf_attr_ipa_prim_oml_port = -1;
-static int hf_attr_ipa_location_name = -1;
-static int hf_attr_ipa_unit_id = -1;
-static int hf_attr_ipa_unit_name = -1;
-static int hf_attr_ipa_nv_flags = -1;
-static int hf_attr_ipa_nv_mask = -1;
-static int hf_attr_ipa_nsl_sport = -1;
-static int hf_attr_ipa_nsl_daddr = -1;
-static int hf_attr_ipa_nsl_dport = -1;
-static int hf_attr_ipa_nsei = -1;
-static int hf_attr_ipa_nsvci = -1;
-static int hf_attr_ipa_bvci = -1;
-static int hf_attr_ipa_rac = -1;
-static int hf_attr_ipa_ns_cfg_unblock_timer = -1;
-static int hf_attr_ipa_ns_cfg_unblock_retries = -1;
-static int hf_attr_ipa_ns_cfg_reset_timer = -1;
-static int hf_attr_ipa_ns_cfg_reset_retries = -1;
-static int hf_attr_ipa_ns_cfg_test_timer = -1;
-static int hf_attr_ipa_ns_cfg_alive_timer = -1;
-static int hf_attr_ipa_ns_cfg_alive_retries = -1;
-static int hf_attr_ipa_gprs_paging_rep_time = -1;
-static int hf_attr_ipa_gprs_paging_rep_count = -1;
-static int hf_attr_ipa_rlc_cfg_t3142 = -1;
-static int hf_attr_ipa_rlc_cfg_t3169 = -1;
-static int hf_attr_ipa_rlc_cfg_t3191 = -1;
-static int hf_attr_ipa_rlc_cfg_t3193 = -1;
-static int hf_attr_ipa_rlc_cfg_t3195 = -1;
-static int hf_attr_ipa_rlc_cfg_t3101 = -1;
-static int hf_attr_ipa_rlc_cfg_t3103 = -1;
-static int hf_attr_ipa_rlc_cfg_t3105 = -1;
-static int hf_attr_ipa_rlc_cfg_countdown = -1;
-static int hf_attr_ipa_rlc_cfg2_t_dl_tbf_ext = -1;
-static int hf_attr_ipa_rlc_cfg2_t_ul_tbf_ext = -1;
-static int hf_attr_ipa_rlc_cfg2_init_cs = -1;
-static int hf_attr_ipa_rlc_cfg2_init_mcs = -1;
+static int hf_oml_ipa_tres_attr_tag;
+static int hf_oml_ipa_tres_attr_len;
+static int hf_attr_ipa_test_res;
+static int hf_attr_ipa_tr_rxlev;
+static int hf_attr_ipa_tr_b_rxlev;
+static int hf_attr_ipa_tr_arfcn;
+static int hf_attr_ipa_tr_f_qual;
+static int hf_attr_ipa_tr_f_err;
+static int hf_attr_ipa_tr_rxqual;
+static int hf_attr_ipa_tr_frame_offs;
+static int hf_attr_ipa_tr_framenr_offs;
+static int hf_attr_ipa_tr_bsic;
+static int hf_attr_ipa_tr_cell_id;
+static int hf_attr_ipa_tr_si2;
+static int hf_attr_ipa_tr_si2bis;
+static int hf_attr_ipa_tr_si2ter;
+static int hf_attr_ipa_tr_chan_desc;
+static int hf_attr_ipa_rsl_ip;
+static int hf_attr_ipa_rsl_port;
+static int hf_attr_ipa_prim_oml_ip;
+static int hf_attr_ipa_prim_oml_port;
+static int hf_attr_ipa_location_name;
+static int hf_attr_ipa_unit_id;
+static int hf_attr_ipa_unit_name;
+static int hf_attr_ipa_nv_flags;
+static int hf_attr_ipa_nv_mask;
+static int hf_attr_ipa_nsl_sport;
+static int hf_attr_ipa_nsl_daddr;
+static int hf_attr_ipa_nsl_dport;
+static int hf_attr_ipa_nsei;
+static int hf_attr_ipa_nsvci;
+static int hf_attr_ipa_bvci;
+static int hf_attr_ipa_rac;
+static int hf_attr_ipa_ns_cfg_unblock_timer;
+static int hf_attr_ipa_ns_cfg_unblock_retries;
+static int hf_attr_ipa_ns_cfg_reset_timer;
+static int hf_attr_ipa_ns_cfg_reset_retries;
+static int hf_attr_ipa_ns_cfg_test_timer;
+static int hf_attr_ipa_ns_cfg_alive_timer;
+static int hf_attr_ipa_ns_cfg_alive_retries;
+static int hf_attr_ipa_gprs_paging_rep_time;
+static int hf_attr_ipa_gprs_paging_rep_count;
+static int hf_attr_ipa_rlc_cfg_t3142;
+static int hf_attr_ipa_rlc_cfg_t3169;
+static int hf_attr_ipa_rlc_cfg_t3191;
+static int hf_attr_ipa_rlc_cfg_t3193;
+static int hf_attr_ipa_rlc_cfg_t3195;
+static int hf_attr_ipa_rlc_cfg_t3101;
+static int hf_attr_ipa_rlc_cfg_t3103;
+static int hf_attr_ipa_rlc_cfg_t3105;
+static int hf_attr_ipa_rlc_cfg_countdown;
+static int hf_attr_ipa_rlc_cfg2_t_dl_tbf_ext;
+static int hf_attr_ipa_rlc_cfg2_t_ul_tbf_ext;
+static int hf_attr_ipa_rlc_cfg2_init_cs;
+static int hf_attr_ipa_rlc_cfg2_init_mcs;
 static int hf_attr_ipa_cs[4];
 static int hf_attr_ipa_mcs[9];
 
 /* initialize the subtree pointers */
-static int ett_oml = -1;
-static int ett_oml_fom = -1;
-static int ett_oml_fom_att = -1;
+static int ett_oml;
+static int ett_oml_fom;
+static int ett_oml_fom_att;
 
-static expert_field ei_unknown_type = EI_INIT;
-static expert_field ei_unknown_manuf = EI_INIT;
-static expert_field ei_length_mismatch = EI_INIT;
+static expert_field ei_unknown_type;
+static expert_field ei_unknown_manuf;
+static expert_field ei_length_mismatch;
 
 enum {
 	OML_DIALECT_ETSI,
diff --git a/epan/dissectors/packet-gsm_abis_pgsl.c b/epan/dissectors/packet-gsm_abis_pgsl.c
index dd2d092e5f..45740eddfd 100644
--- a/epan/dissectors/packet-gsm_abis_pgsl.c
+++ b/epan/dissectors/packet-gsm_abis_pgsl.c
@@ -36,49 +36,49 @@ static dissector_handle_t pgsl_handle;
 static dissector_handle_t sub_handles[SUB_MAX];
 
 /* initialize the protocol and registered fields */
-static int proto_abis_pgsl = -1;
+static int proto_abis_pgsl;
 
 /* P-GSL header */
-static int hf_pgsl_version = -1;
-static int hf_pgsl_msg_disc = -1;
-static int hf_pgsl_tn_bitmap = -1;
-static int hf_pgsl_trx_seqno = -1;
-static int hf_pgsl_afnd = -1;
-static int hf_pgsl_afnu = -1;
-static int hf_pgsl_ccu_ta = -1;
-static int hf_pgsl_ack_req = -1;
-static int hf_pgsl_tn_resource = -1;
-static int hf_pgsl_tn_seqno = -1;
-static int hf_pgsl_data_len = -1;
-static int hf_pgsl_cause = -1;
-static int hf_pgsl_addl_info = -1;
-static int hf_pgsl_ack_ind = -1;
-static int hf_pgsl_data_ind = -1;
-static int hf_pgsl_ucm = -1;
-static int hf_pgsl_cs = -1;
-static int hf_pgsl_timing_offset = -1;
-static int hf_pgsl_power_control = -1;
-static int hf_pgsl_ir_tfi = -1;
-static int hf_pgsl_ir_sign_type = -1;
-static int hf_pgsl_codec_delay = -1;
-static int hf_pgsl_codec_cs = -1;
-static int hf_pgsl_codec_rxlev = -1;
-static int hf_pgsl_codec_parity = -1;
-static int hf_pgsl_codec_bqm = -1;
-static int hf_pgsl_codec_mean_bep = -1;
-static int hf_pgsl_codec_cv_bep = -1;
-static int hf_pgsl_codec_q = -1;
-static int hf_pgsl_codec_q1 = -1;
-static int hf_pgsl_codec_q2 = -1;
-static int hf_pgsl_pacch = -1;
-static int hf_pgsl_ab_rxlev = -1;
-static int hf_pgsl_ab_acc_delay = -1;
-static int hf_pgsl_ab_abi = -1;
-static int hf_pgsl_ab_ab_type = -1;
+static int hf_pgsl_version;
+static int hf_pgsl_msg_disc;
+static int hf_pgsl_tn_bitmap;
+static int hf_pgsl_trx_seqno;
+static int hf_pgsl_afnd;
+static int hf_pgsl_afnu;
+static int hf_pgsl_ccu_ta;
+static int hf_pgsl_ack_req;
+static int hf_pgsl_tn_resource;
+static int hf_pgsl_tn_seqno;
+static int hf_pgsl_data_len;
+static int hf_pgsl_cause;
+static int hf_pgsl_addl_info;
+static int hf_pgsl_ack_ind;
+static int hf_pgsl_data_ind;
+static int hf_pgsl_ucm;
+static int hf_pgsl_cs;
+static int hf_pgsl_timing_offset;
+static int hf_pgsl_power_control;
+static int hf_pgsl_ir_tfi;
+static int hf_pgsl_ir_sign_type;
+static int hf_pgsl_codec_delay;
+static int hf_pgsl_codec_cs;
+static int hf_pgsl_codec_rxlev;
+static int hf_pgsl_codec_parity;
+static int hf_pgsl_codec_bqm;
+static int hf_pgsl_codec_mean_bep;
+static int hf_pgsl_codec_cv_bep;
+static int hf_pgsl_codec_q;
+static int hf_pgsl_codec_q1;
+static int hf_pgsl_codec_q2;
+static int hf_pgsl_pacch;
+static int hf_pgsl_ab_rxlev;
+static int hf_pgsl_ab_acc_delay;
+static int hf_pgsl_ab_abi;
+static int hf_pgsl_ab_ab_type;
 
 /* initialize the subtree pointers */
-static int ett_pgsl = -1;
-static int ett_pacch = -1;
+static int ett_pgsl;
+static int ett_pacch;
 
 static gboolean abis_pgsl_ir = FALSE;
 
diff --git a/epan/dissectors/packet-gsm_abis_tfp.c b/epan/dissectors/packet-gsm_abis_tfp.c
index f82724c9b5..93c9089ac3 100644
--- a/epan/dissectors/packet-gsm_abis_tfp.c
+++ b/epan/dissectors/packet-gsm_abis_tfp.c
@@ -33,21 +33,21 @@ static dissector_handle_t tfp_handle;
 static dissector_handle_t sub_handles[SUB_MAX];
 
 /* initialize the protocol and registered fields */
-static int proto_abis_tfp = -1;
+static int proto_abis_tfp;
 
 /* TFP header */
-static int hf_tfp_hdr_atsr = -1;
-static int hf_tfp_hdr_slot_rate = -1;
-static int hf_tfp_hdr_seq_nr = -1;
-static int hf_tfp_hdr_delay_info = -1;
-static int hf_tfp_hdr_p = -1;
-static int hf_tfp_hdr_s = -1;
-static int hf_tfp_hdr_m = -1;
-static int hf_tfp_hdr_frame_type = -1;
-static int hf_tfp_amr_rate = -1;
+static int hf_tfp_hdr_atsr;
+static int hf_tfp_hdr_slot_rate;
+static int hf_tfp_hdr_seq_nr;
+static int hf_tfp_hdr_delay_info;
+static int hf_tfp_hdr_p;
+static int hf_tfp_hdr_s;
+static int hf_tfp_hdr_m;
+static int hf_tfp_hdr_frame_type;
+static int hf_tfp_amr_rate;
 
 /* initialize the subtree pointers */
-static int ett_tfp = -1;
+static int ett_tfp;
 
 static const value_string tfp_slot_rate_vals[] = {
 	{ 0,	"Full Rate (16kbps)" },
diff --git a/epan/dissectors/packet-gsm_bsslap.c b/epan/dissectors/packet-gsm_bsslap.c
index bf8df4f1c4..b5a359cf47 100644
--- a/epan/dissectors/packet-gsm_bsslap.c
+++ b/epan/dissectors/packet-gsm_bsslap.c
@@ -24,26 +24,26 @@ void proto_register_gsm_bsslap(void);
 static dissector_handle_t bsslap_rrlp_handle = NULL;
 
 /* Initialize the protocol and registered fields */
-static int proto_gsm_bsslap = -1;
-static int hf_gsm_bsslap_msg_type = -1;
-int hf_gsm_a_bsslap_elem_id = -1;
-static int hf_gsm_bsslap_ta = -1;
-static int hf_gsm_bsslap_timer_value = -1;
-static int hf_gsm_bsslap_ms_pow = -1;
-static int hf_gsm_bsslap_cause = -1;
-static int hf_gsm_bsslap_rrlp_flg = -1;
-static int hf_gsm_bsslap_tfi = -1;
-static int hf_gsm_bsslap_poll_rep = -1;
-static int hf_gsm_bsslap_lac = -1;
-static int hf_gsm_bsslap_cell_id_disc = -1;
-static int hf_gsm_bsslap_encryption_key = -1;
+static int proto_gsm_bsslap;
+static int hf_gsm_bsslap_msg_type;
+int hf_gsm_a_bsslap_elem_id;
+static int hf_gsm_bsslap_ta;
+static int hf_gsm_bsslap_timer_value;
+static int hf_gsm_bsslap_ms_pow;
+static int hf_gsm_bsslap_cause;
+static int hf_gsm_bsslap_rrlp_flg;
+static int hf_gsm_bsslap_tfi;
+static int hf_gsm_bsslap_poll_rep;
+static int hf_gsm_bsslap_lac;
+static int hf_gsm_bsslap_cell_id_disc;
+static int hf_gsm_bsslap_encryption_key;
 
 /* Initialize the subtree pointers */
-static int ett_gsm_bsslap = -1;
-static int ett_bsslap_cell_list = -1;
+static int ett_gsm_bsslap;
+static int ett_bsslap_cell_list;
 
-static expert_field ei_gsm_bsslap_missing_mandatory_element = EI_INIT;
-static expert_field ei_gsm_bsslap_not_decoded_yet = EI_INIT;
+static expert_field ei_gsm_bsslap_missing_mandatory_element;
+static expert_field ei_gsm_bsslap_not_decoded_yet;
 
 /* Table 5.1: Element Indentifier codes */
 #define BSSLAP_PARAM_TIMING_ADVANCE                  0x01
diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c
index 6262a74a4e..9c883adf86 100644
--- a/epan/dissectors/packet-gsm_bssmap_le.c
+++ b/epan/dissectors/packet-gsm_bssmap_le.c
@@ -208,56 +208,56 @@ static const value_string bssmap_le_pos_data_usage_vals[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_bssmap_le = -1;
-int hf_gsm_bssmap_le_elem_id = -1;
+static int proto_bssmap_le;
+int hf_gsm_bssmap_le_elem_id;
 
 /* The following hf_* variables are used to hold the Wireshark IDs of
 * our header fields; they are filled out when we call
 * proto_register_field_array() in proto_register_bssmap_le()
 */
-static int hf_gsm_bssmap_le_msg_type = -1;
-static int hf_gsm_bssmap_le_apdu_protocol_id = -1;
-static int hf_gsm_bssmap_le_spare = -1;
-static int hf_gsm_bssmap_le_ciphering_key_flag = -1;
-static int hf_gsm_bssmap_le_current_deciphering_key_value = -1;
-static int hf_gsm_bssmap_le_next_deciphering_key_value = -1;
-static int hf_gsm_bssmap_le_acq_ass = -1;
-static int hf_gsm_bssmap_le_ref_time = -1;
-static int hf_gsm_bssmap_le_ref_loc = -1;
-static int hf_gsm_bssmap_le_dgps_corr = -1;
-static int hf_gsm_bssmap_le_nav_mod = -1;
-static int hf_gsm_bssmap_le_iono_mod = -1;
-static int hf_gsm_bssmap_le_utc_mod = -1;
-static int hf_gsm_bssmap_le_almanac = -1;
-static int hf_gsm_bssmap_le_ephemeris_ext_chk = -1;
-static int hf_gsm_bssmap_le_ephemeris_ext = -1;
-static int hf_gsm_bssmap_le_real_time_int = -1;
-static int hf_gsm_bssmap_le_lcs_cause_value =-1;
-static int hf_gsm_bssmap_le_diagnostic_value = -1;
-static int hf_gsm_bssmap_le_client_category = -1;
-static int hf_gsm_bssmap_le_client_subtype = -1;
-static int hf_gsm_bssmap_le_velocity_requested = -1;
-static int hf_gsm_bssmap_le_vertical_coordinate_indicator = -1;
-static int hf_gsm_bssmap_le_horizontal_accuracy_indicator = -1;
-static int hf_gsm_bssmap_le_horizontal_accuracy = -1;
-static int hf_gsm_bssmap_le_vertical_accuracy_indicator = -1;
-static int hf_gsm_bssmap_le_vertical_accuracy = -1;
-static int hf_gsm_bssmap_le_response_time_category = -1;
-static int hf_gsm_bssmap_le_apdu = -1;
-static int hf_gsm_bssmap_le_message_elements = -1;
-static int hf_gsm_bssmap_le_location_inf = -1;
-static int hf_gsm_bssmap_le_pos_method = -1;
-static int hf_gsm_bssmap_le_pos_data_disc = -1;
-static int hf_gsm_bssmap_le_pos_data_pos_method = -1;
-static int hf_gsm_bssmap_le_pos_data_usage = -1;
+static int hf_gsm_bssmap_le_msg_type;
+static int hf_gsm_bssmap_le_apdu_protocol_id;
+static int hf_gsm_bssmap_le_spare;
+static int hf_gsm_bssmap_le_ciphering_key_flag;
+static int hf_gsm_bssmap_le_current_deciphering_key_value;
+static int hf_gsm_bssmap_le_next_deciphering_key_value;
+static int hf_gsm_bssmap_le_acq_ass;
+static int hf_gsm_bssmap_le_ref_time;
+static int hf_gsm_bssmap_le_ref_loc;
+static int hf_gsm_bssmap_le_dgps_corr;
+static int hf_gsm_bssmap_le_nav_mod;
+static int hf_gsm_bssmap_le_iono_mod;
+static int hf_gsm_bssmap_le_utc_mod;
+static int hf_gsm_bssmap_le_almanac;
+static int hf_gsm_bssmap_le_ephemeris_ext_chk;
+static int hf_gsm_bssmap_le_ephemeris_ext;
+static int hf_gsm_bssmap_le_real_time_int;
+static int hf_gsm_bssmap_le_lcs_cause_value;
+static int hf_gsm_bssmap_le_diagnostic_value;
+static int hf_gsm_bssmap_le_client_category;
+static int hf_gsm_bssmap_le_client_subtype;
+static int hf_gsm_bssmap_le_velocity_requested;
+static int hf_gsm_bssmap_le_vertical_coordinate_indicator;
+static int hf_gsm_bssmap_le_horizontal_accuracy_indicator;
+static int hf_gsm_bssmap_le_horizontal_accuracy;
+static int hf_gsm_bssmap_le_vertical_accuracy_indicator;
+static int hf_gsm_bssmap_le_vertical_accuracy;
+static int hf_gsm_bssmap_le_response_time_category;
+static int hf_gsm_bssmap_le_apdu;
+static int hf_gsm_bssmap_le_message_elements;
+static int hf_gsm_bssmap_le_location_inf;
+static int hf_gsm_bssmap_le_pos_method;
+static int hf_gsm_bssmap_le_pos_data_disc;
+static int hf_gsm_bssmap_le_pos_data_pos_method;
+static int hf_gsm_bssmap_le_pos_data_usage;
 
 
 /* Initialize the subtree pointers */
-static gint ett_bssmap_le_msg = -1;
+static gint ett_bssmap_le_msg;
 
-static expert_field ei_gsm_a_bssmap_le_not_decoded_yet = EI_INIT;
-static expert_field ei_gsm_a_bssmap_le_extraneous_data = EI_INIT;
-static expert_field ei_gsm_a_bssmap_le_missing_mandatory_element = EI_INIT;
+static expert_field ei_gsm_a_bssmap_le_not_decoded_yet;
+static expert_field ei_gsm_a_bssmap_le_extraneous_data;
+static expert_field ei_gsm_a_bssmap_le_missing_mandatory_element;
 
 static dissector_handle_t gsm_bsslap_handle = NULL;
 static dissector_handle_t bssmap_le_handle;
diff --git a/epan/dissectors/packet-gsm_cbch.c b/epan/dissectors/packet-gsm_cbch.c
index 46d16ec529..4d99a5c49f 100644
--- a/epan/dissectors/packet-gsm_cbch.c
+++ b/epan/dissectors/packet-gsm_cbch.c
@@ -45,45 +45,45 @@ static const value_string sched_type_values[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_cbch = -1;
-
-static int hf_gsm_cbch_spare_bit = -1;
-static int hf_gsm_cbch_lpd = -1;
-static int hf_gsm_cbch_lb = -1;
-static int hf_gsm_cbch_seq_num = -1;
-static int hf_gsm_cbch_sched_type = -1;
-static int hf_gsm_cbch_sched_begin_slot = -1;
-static int hf_gsm_cbch_sched_spare = -1;
-static int hf_gsm_cbch_sched_end_slot = -1;
-static int hf_gsm_cbch_slot = -1;
-/* static int hf_gsm_cbch_sched_msg_id = -1; */
-static int hf_gsm_cbch_padding = -1;
-static int hf_gsm_cbch_block = -1;
+static int proto_cbch;
+
+static int hf_gsm_cbch_spare_bit;
+static int hf_gsm_cbch_lpd;
+static int hf_gsm_cbch_lb;
+static int hf_gsm_cbch_seq_num;
+static int hf_gsm_cbch_sched_type;
+static int hf_gsm_cbch_sched_begin_slot;
+static int hf_gsm_cbch_sched_spare;
+static int hf_gsm_cbch_sched_end_slot;
+static int hf_gsm_cbch_slot;
+/* static int hf_gsm_cbch_sched_msg_id; */
+static int hf_gsm_cbch_padding;
+static int hf_gsm_cbch_block;
 
 /* These fields are used when reassembling cbch fragments
  */
-static int hf_cbch_fragments = -1;
-static int hf_cbch_fragment = -1;
-static int hf_cbch_fragment_overlap = -1;
-static int hf_cbch_fragment_overlap_conflict = -1;
-static int hf_cbch_fragment_multiple_tails = -1;
-static int hf_cbch_fragment_too_long_fragment = -1;
-static int hf_cbch_fragment_error = -1;
-static int hf_cbch_fragment_count = -1;
-static int hf_cbch_reassembled_in = -1;
-static int hf_cbch_reassembled_length = -1;
+static int hf_cbch_fragments;
+static int hf_cbch_fragment;
+static int hf_cbch_fragment_overlap;
+static int hf_cbch_fragment_overlap_conflict;
+static int hf_cbch_fragment_multiple_tails;
+static int hf_cbch_fragment_too_long_fragment;
+static int hf_cbch_fragment_error;
+static int hf_cbch_fragment_count;
+static int hf_cbch_reassembled_in;
+static int hf_cbch_reassembled_length;
 
 /* Initialize the subtree pointers */
-static gint ett_cbch_msg = -1;
-static gint ett_schedule_msg = -1;
-static gint ett_schedule_new_msg = -1;
-static gint ett_cbch_fragment = -1;
-static gint ett_cbch_fragments = -1;
-
-static expert_field ei_gsm_cbch_sched_end_slot = EI_INIT;
-static expert_field ei_gsm_cbch_seq_num_null = EI_INIT;
-static expert_field ei_gsm_cbch_seq_num_reserved = EI_INIT;
-static expert_field ei_gsm_cbch_lpd = EI_INIT;
+static gint ett_cbch_msg;
+static gint ett_schedule_msg;
+static gint ett_schedule_new_msg;
+static gint ett_cbch_fragment;
+static gint ett_cbch_fragments;
+
+static expert_field ei_gsm_cbch_sched_end_slot;
+static expert_field ei_gsm_cbch_seq_num_null;
+static expert_field ei_gsm_cbch_seq_num_reserved;
+static expert_field ei_gsm_cbch_lpd;
 
 static dissector_handle_t cbs_handle;
 
diff --git a/epan/dissectors/packet-gsm_cbsp.c b/epan/dissectors/packet-gsm_cbsp.c
index 4f430c7708..f22eae204d 100644
--- a/epan/dissectors/packet-gsm_cbsp.c
+++ b/epan/dissectors/packet-gsm_cbsp.c
@@ -348,51 +348,51 @@ void proto_reg_handoff_cbsp(void);
 
 static dissector_handle_t cbsp_handle;
 
-static int proto_cbsp = -1;
-
-static int hf_cbsp_msg_type = -1;
-static int hf_cbsp_msg_len = -1;
-static int hf_cbsp_iei = -1;
-static int hf_cbsp_ie_len = -1;
-static int hf_cbsp_ie_payload = -1;
-
-static int hf_cbsp_old_serial_nr = -1;
-static int hf_cbsp_new_serial_nr = -1;
-static int hf_cbsp_category = -1;
-static int hf_cbsp_rep_period = -1;
-static int hf_cbsp_num_bcast_req = -1;
-static int hf_cbsp_cause = -1;
-static int hf_cbsp_dcs = -1;
-static int hf_cbsp_recovery_ind = -1;
-static int hf_cbsp_msg_id = -1;
-static int hf_cbsp_emerg_ind = -1;
-static int hf_cbsp_warn_type = -1;
-static int hf_cbsp_channel_ind = -1;
-static int hf_cbsp_num_of_pages = -1;
-static int hf_cbsp_cb_msg_page = -1;
-static int hf_cbsp_cbs_page_content = -1;
-static int hf_cbsp_sched_period = -1;
-static int hf_cbsp_num_of_res_slots = -1;
-static int hf_cbsp_bcast_msg_type = -1;
-static int hf_cbsp_warning_period = -1;
-static int hf_cbsp_keepalive_period = -1;
-static int hf_cbsp_user_info_length = -1;
-static int hf_cbsp_cell_id_disc = -1;
-static int hf_cbsp_cell_load1 = -1;
-static int hf_cbsp_cell_load2 = -1;
-static int hf_cbsp_num_bcast_compl = -1;
-static int hf_cbsp_num_bcast_info = -1;
-static int hf_cbsp_lac = -1;
-static int hf_cbsp_ci = -1;
-
-static gint ett_cbsp = -1;
-static gint ett_cbsp_ie = -1;
-static gint ett_cbsp_cbs_data_coding = -1;
-static gint ett_cbsp_cbs_page_content = -1;
-static gint ett_cbsp_cell_list = -1;
-static gint ett_cbsp_fail_list = -1;
-static gint ett_cbsp_load_list = -1;
-static gint ett_cbsp_num_bcast_compl_list = -1;
+static int proto_cbsp;
+
+static int hf_cbsp_msg_type;
+static int hf_cbsp_msg_len;
+static int hf_cbsp_iei;
+static int hf_cbsp_ie_len;
+static int hf_cbsp_ie_payload;
+
+static int hf_cbsp_old_serial_nr;
+static int hf_cbsp_new_serial_nr;
+static int hf_cbsp_category;
+static int hf_cbsp_rep_period;
+static int hf_cbsp_num_bcast_req;
+static int hf_cbsp_cause;
+static int hf_cbsp_dcs;
+static int hf_cbsp_recovery_ind;
+static int hf_cbsp_msg_id;
+static int hf_cbsp_emerg_ind;
+static int hf_cbsp_warn_type;
+static int hf_cbsp_channel_ind;
+static int hf_cbsp_num_of_pages;
+static int hf_cbsp_cb_msg_page;
+static int hf_cbsp_cbs_page_content;
+static int hf_cbsp_sched_period;
+static int hf_cbsp_num_of_res_slots;
+static int hf_cbsp_bcast_msg_type;
+static int hf_cbsp_warning_period;
+static int hf_cbsp_keepalive_period;
+static int hf_cbsp_user_info_length;
+static int hf_cbsp_cell_id_disc;
+static int hf_cbsp_cell_load1;
+static int hf_cbsp_cell_load2;
+static int hf_cbsp_num_bcast_compl;
+static int hf_cbsp_num_bcast_info;
+static int hf_cbsp_lac;
+static int hf_cbsp_ci;
+
+static gint ett_cbsp;
+static gint ett_cbsp_ie;
+static gint ett_cbsp_cbs_data_coding;
+static gint ett_cbsp_cbs_page_content;
+static gint ett_cbsp_cell_list;
+static gint ett_cbsp_fail_list;
+static gint ett_cbsp_load_list;
+static gint ett_cbsp_num_bcast_compl_list;
 
 static void
 dissect_cbsp_content_ie(tvbuff_t *tvb, packet_info *pinfo, guint offset, gint len, proto_tree *tree,
diff --git a/epan/dissectors/packet-gsm_gsup.c b/epan/dissectors/packet-gsm_gsup.c
index 6e36e00b08..64ba6687eb 100644
--- a/epan/dissectors/packet-gsm_gsup.c
+++ b/epan/dissectors/packet-gsm_gsup.c
@@ -263,56 +263,56 @@ enum osmo_gsup_an_type {
 void proto_register_gsup(void);
 void proto_reg_handoff_gsup(void);
 
-static int proto_gsup = -1;
+static int proto_gsup;
 
 /* show GSUP source/destination names as text (true) or only binary (false) */
 static gboolean show_name_as_text = TRUE;
 
-static int hf_gsup_msg_type = -1;
-static int hf_gsup_iei = -1;
-static int hf_gsup_ie_len = -1;
-static int hf_gsup_ie_payload = -1;
-static int hf_gsup_cause = -1;
-static int hf_gsup_pdp_info_compl = -1;
-static int hf_gsup_cancel_type = -1;
-static int hf_gsup_freeze_ptmsi = -1;
-static int hf_gsup_pdp_context_id = -1;
-static int hf_gsup_charg_char = -1;
-static int hf_gsup_apn = -1;
-static int hf_gsup_cn_domain = -1;
-static int hf_gsup_rand = -1;
-static int hf_gsup_sres = -1;
-static int hf_gsup_kc = -1;
-static int hf_gsup_ik = -1;
-static int hf_gsup_ck = -1;
-static int hf_gsup_autn = -1;
-static int hf_gsup_auts = -1;
-static int hf_gsup_res = -1;
-static int hf_gsup_session_id = -1;
-static int hf_gsup_session_state = -1;
-static int hf_gsup_sm_rp_mr = -1;
-static int hf_gsup_sm_rp_da_id_type = -1;
-static int hf_gsup_sm_rp_oa_id_type = -1;
-static int hf_gsup_sm_rp_cause = -1;
-static int hf_gsup_sm_rp_mms = -1;
-static int hf_gsup_sm_alert_rsn = -1;
-static int hf_gsup_imei_result = -1;
-static int hf_gsup_num_vectors_req = -1;
-static int hf_gsup_msg_class = -1;
-static int hf_gsup_an_type = -1;
-static int hf_gsup_source_name = -1;
-static int hf_gsup_source_name_text = -1;
-static int hf_gsup_destination_name = -1;
-static int hf_gsup_destination_name_text = -1;
-static int hf_gsup_supported_rat_type = -1;
-static int hf_gsup_current_rat_type = -1;
-
-static gint ett_gsup = -1;
-static gint ett_gsup_ie = -1;
-
-static expert_field ei_sm_rp_da_invalid = EI_INIT;
-static expert_field ei_sm_rp_oa_invalid = EI_INIT;
-static expert_field ei_gsup_ie_len_invalid = EI_INIT;
+static int hf_gsup_msg_type;
+static int hf_gsup_iei;
+static int hf_gsup_ie_len;
+static int hf_gsup_ie_payload;
+static int hf_gsup_cause;
+static int hf_gsup_pdp_info_compl;
+static int hf_gsup_cancel_type;
+static int hf_gsup_freeze_ptmsi;
+static int hf_gsup_pdp_context_id;
+static int hf_gsup_charg_char;
+static int hf_gsup_apn;
+static int hf_gsup_cn_domain;
+static int hf_gsup_rand;
+static int hf_gsup_sres;
+static int hf_gsup_kc;
+static int hf_gsup_ik;
+static int hf_gsup_ck;
+static int hf_gsup_autn;
+static int hf_gsup_auts;
+static int hf_gsup_res;
+static int hf_gsup_session_id;
+static int hf_gsup_session_state;
+static int hf_gsup_sm_rp_mr;
+static int hf_gsup_sm_rp_da_id_type;
+static int hf_gsup_sm_rp_oa_id_type;
+static int hf_gsup_sm_rp_cause;
+static int hf_gsup_sm_rp_mms;
+static int hf_gsup_sm_alert_rsn;
+static int hf_gsup_imei_result;
+static int hf_gsup_num_vectors_req;
+static int hf_gsup_msg_class;
+static int hf_gsup_an_type;
+static int hf_gsup_source_name;
+static int hf_gsup_source_name_text;
+static int hf_gsup_destination_name;
+static int hf_gsup_destination_name_text;
+static int hf_gsup_supported_rat_type;
+static int hf_gsup_current_rat_type;
+
+static gint ett_gsup;
+static gint ett_gsup_ie;
+
+static expert_field ei_sm_rp_da_invalid;
+static expert_field ei_sm_rp_oa_invalid;
+static expert_field ei_gsup_ie_len_invalid;
 
 static dissector_handle_t gsm_map_handle;
 static dissector_handle_t gsup_handle;
diff --git a/epan/dissectors/packet-gsm_ipa.c b/epan/dissectors/packet-gsm_ipa.c
index 53d323c545..c3b9424f1c 100644
--- a/epan/dissectors/packet-gsm_ipa.c
+++ b/epan/dissectors/packet-gsm_ipa.c
@@ -67,23 +67,23 @@ static gboolean global_ipa_in_root = FALSE;
 static gboolean global_ipa_in_info = FALSE;
 
 /* Initialize the protocol and registered fields */
-static int proto_ipa = -1;
-static int proto_ipaccess = -1;
+static int proto_ipa;
+static int proto_ipaccess;
 
-static int hf_ipa_data_len = -1;
-static int hf_ipa_protocol = -1;
-static int hf_ipa_hsl_debug = -1;
-static int hf_ipa_osmo_proto = -1;
-static int hf_ipa_osmo_ctrl_data = -1;
+static int hf_ipa_data_len;
+static int hf_ipa_protocol;
+static int hf_ipa_hsl_debug;
+static int hf_ipa_osmo_proto;
+static int hf_ipa_osmo_ctrl_data;
 
-static int hf_ipaccess_msgtype = -1;
-static int hf_ipaccess_attr_tag = -1;
-static int hf_ipaccess_attr_string = -1;
-static int hf_ipaccess_attribute_unk = -1;
+static int hf_ipaccess_msgtype;
+static int hf_ipaccess_attr_tag;
+static int hf_ipaccess_attr_string;
+static int hf_ipaccess_attribute_unk;
 
 /* Initialize the subtree pointers */
-static gint ett_ipa = -1;
-static gint ett_ipaccess = -1;
+static gint ett_ipa;
+static gint ett_ipaccess;
 
 enum {
 	SUB_OML,
diff --git a/epan/dissectors/packet-gsm_l2rcop.c b/epan/dissectors/packet-gsm_l2rcop.c
index b9c6fcce3b..e300575ce1 100644
--- a/epan/dissectors/packet-gsm_l2rcop.c
+++ b/epan/dissectors/packet-gsm_l2rcop.c
@@ -19,16 +19,16 @@
 
 void proto_register_gsm_l2rcop(void);
 
-static int proto_l2rcop = -1;
+static int proto_l2rcop;
 
-static int hf_l2rcop_sa = -1;
-static int hf_l2rcop_sb = -1;
-static int hf_l2rcop_x = -1;
-static int hf_l2rcop_addr = -1;
-static int hf_l2rcop_break = -1;
-static int hf_l2rcop_break_ack = -1;
+static int hf_l2rcop_sa;
+static int hf_l2rcop_sb;
+static int hf_l2rcop_x;
+static int hf_l2rcop_addr;
+static int hf_l2rcop_break;
+static int hf_l2rcop_break_ack;
 
-static int ett_l2rcop = -1;
+static int ett_l2rcop;
 
 static const value_string addr_vals[] = {
 	{ 31, "last status change, remainder empty" },
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 7c7935531d..5cc18c19a2 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -138,7 +138,7 @@ static int hf_gsm_map_ericsson_locationInformation_sac;
 static int hf_gsm_map_ussd_string;
 static int hf_gsm_map_spare_bits;
 static int hf_gsm_map_qos_signalling_ind;
-static int hf_gsm_map_qos_source_stat_desc = - 1;
+static int hf_gsm_map_qos_source_stat_desc;
 static int hf_gsm_map_qos_max_bitrate_upl_ext;
 static int hf_gsm_map_qos_max_bitrate_downl_ext;
 static int hf_gsm_map_qos_guar_bitrate_upl_ext;
diff --git a/epan/dissectors/packet-gsm_osmux.c b/epan/dissectors/packet-gsm_osmux.c
index c0d8c2c165..a30582a3a5 100644
--- a/epan/dissectors/packet-gsm_osmux.c
+++ b/epan/dissectors/packet-gsm_osmux.c
@@ -72,27 +72,27 @@ static guint8 amr_ft_bytes[AMR_FT_MAX] = {12, 13, 15, 17, 19, 20, 26, 31, 5};
 
 /* Initialize the protocol and registered fields */
 static dissector_handle_t osmux_handle;
-static int proto_osmux = -1;
+static int proto_osmux;
 static int osmux_tap = -1;
 
-static int hf_osmux_stream_id = -1;
-static int hf_osmux_ft_ctr = -1;
-static int hf_osmux_rtp_m = -1;
-static int hf_osmux_ft = -1;
-static int hf_osmux_ctr = -1;
-static int hf_osmux_amr_f = -1;
-static int hf_osmux_amr_q = -1;
-static int hf_osmux_seq = -1;
-static int hf_osmux_circuit_id = -1;
-static int hf_osmux_amr_ft_cmr = -1;
-static int hf_osmux_amr_ft = -1;
-static int hf_osmux_amr_cmr = -1;
-static int hf_osmux_amr_data = -1;
+static int hf_osmux_stream_id;
+static int hf_osmux_ft_ctr;
+static int hf_osmux_rtp_m;
+static int hf_osmux_ft;
+static int hf_osmux_ctr;
+static int hf_osmux_amr_f;
+static int hf_osmux_amr_q;
+static int hf_osmux_seq;
+static int hf_osmux_circuit_id;
+static int hf_osmux_amr_ft_cmr;
+static int hf_osmux_amr_ft;
+static int hf_osmux_amr_cmr;
+static int hf_osmux_amr_data;
 
 /* Initialize the subtree pointers */
-static gint ett_osmux = -1;
-static gint ett_osmux_ft_ctr = -1;
-static gint ett_osmux_amr_ft_cmr = -1;
+static gint ett_osmux;
+static gint ett_osmux_ft_ctr;
+static gint ett_osmux_amr_ft_cmr;
 
 /* Stream handling */
 static wmem_map_t *osmux_stream_hash;
diff --git a/epan/dissectors/packet-gsm_r_uus1.c b/epan/dissectors/packet-gsm_r_uus1.c
index e46dbf5465..2d4410c82c 100644
--- a/epan/dissectors/packet-gsm_r_uus1.c
+++ b/epan/dissectors/packet-gsm_r_uus1.c
@@ -38,76 +38,76 @@ void proto_reg_handoff_gsm_r_uus1(void);
 
 
 /* Initialize the protocol and registered fields */
-static int proto_gsm_r_uus1 = -1;
+static int proto_gsm_r_uus1;
 
-static int hf_gsm_r_uus1_elem_tag                    = -1;
-static int hf_gsm_r_uus1_elem_len                    = -1;
-static int hf_gsm_r_uus1_pfn                         = -1;
-static int hf_gsm_r_uus1_pfn_digits                  = -1;
+static int hf_gsm_r_uus1_elem_tag;
+static int hf_gsm_r_uus1_elem_len;
+static int hf_gsm_r_uus1_pfn;
+static int hf_gsm_r_uus1_pfn_digits;
 
 /* 5.2 and 5.3 */
-static int hf_gsm_r_uus1_chpc                        = -1;
-static int hf_gsm_r_uus1_chpc_t_dur                  = -1;
-static int hf_gsm_r_uus1_chpc_t_rel                  = -1;
-static int hf_gsm_r_uus1_chpc_pl_call                = -1;
-static int hf_gsm_r_uus1_chpc_cause                  = -1;
-static int hf_gsm_r_uus1_chpc_cause_power            = -1;
-static int hf_gsm_r_uus1_chpc_cause_radio            = -1;
-static int hf_gsm_r_uus1_chpc_cause_reserved3        = -1;
-static int hf_gsm_r_uus1_chpc_cause_reserved4        = -1;
-static int hf_gsm_r_uus1_chpc_cause_user_command     = -1;
-static int hf_gsm_r_uus1_chpc_cause_reserved6        = -1;
-static int hf_gsm_r_uus1_chpc_cause_reserved7        = -1;
-static int hf_gsm_r_uus1_chpc_cause_reserved8        = -1;
-static int hf_gsm_r_uus1_chpc_gref                   = -1;
-static int hf_gsm_r_uus1_chpc_ack_cause              = -1;
+static int hf_gsm_r_uus1_chpc;
+static int hf_gsm_r_uus1_chpc_t_dur;
+static int hf_gsm_r_uus1_chpc_t_rel;
+static int hf_gsm_r_uus1_chpc_pl_call;
+static int hf_gsm_r_uus1_chpc_cause;
+static int hf_gsm_r_uus1_chpc_cause_power;
+static int hf_gsm_r_uus1_chpc_cause_radio;
+static int hf_gsm_r_uus1_chpc_cause_reserved3;
+static int hf_gsm_r_uus1_chpc_cause_reserved4;
+static int hf_gsm_r_uus1_chpc_cause_user_command;
+static int hf_gsm_r_uus1_chpc_cause_reserved6;
+static int hf_gsm_r_uus1_chpc_cause_reserved7;
+static int hf_gsm_r_uus1_chpc_cause_reserved8;
+static int hf_gsm_r_uus1_chpc_gref;
+static int hf_gsm_r_uus1_chpc_ack_cause;
 
 /* 5.4 */
-static int hf_gsm_r_uus1_epfn                        = -1;
+static int hf_gsm_r_uus1_epfn;
 
 /* 5.5 */
-static int hf_gsm_r_uus1_present_text_str            = -1;
+static int hf_gsm_r_uus1_present_text_str;
 
 /* 5.6 */
-static int hf_gsm_r_uus1_elda          = -1;
-static int hf_gsm_r_uus1_elda_lat      = -1;
-static int hf_gsm_r_uus1_elda_lat_deg  = -1;
-static int hf_gsm_r_uus1_elda_lat_min  = -1;
-static int hf_gsm_r_uus1_elda_lat_sec  = -1;
-static int hf_gsm_r_uus1_elda_lat_hem  = -1;
-static int hf_gsm_r_uus1_elda_long     = -1;
-static int hf_gsm_r_uus1_elda_long_deg = -1;
-static int hf_gsm_r_uus1_elda_long_min = -1;
-static int hf_gsm_r_uus1_elda_long_sec = -1;
-static int hf_gsm_r_uus1_elda_long_hem = -1;
-static int hf_gsm_r_uus1_elda_height   = -1;
-static int hf_gsm_r_uus1_elda_speed    = -1;
-static int hf_gsm_r_uus1_elda_heading  = -1;
-static int hf_gsm_r_uus1_elda_e_time   = -1;
-static int hf_gsm_r_uus1_elda_distance = -1;
-static int hf_gsm_r_uus1_elda_scale    = -1;
-static int hf_gsm_r_uus1_elda_spare    = -1;
+static int hf_gsm_r_uus1_elda;
+static int hf_gsm_r_uus1_elda_lat;
+static int hf_gsm_r_uus1_elda_lat_deg;
+static int hf_gsm_r_uus1_elda_lat_min;
+static int hf_gsm_r_uus1_elda_lat_sec;
+static int hf_gsm_r_uus1_elda_lat_hem;
+static int hf_gsm_r_uus1_elda_long;
+static int hf_gsm_r_uus1_elda_long_deg;
+static int hf_gsm_r_uus1_elda_long_min;
+static int hf_gsm_r_uus1_elda_long_sec;
+static int hf_gsm_r_uus1_elda_long_hem;
+static int hf_gsm_r_uus1_elda_height;
+static int hf_gsm_r_uus1_elda_speed;
+static int hf_gsm_r_uus1_elda_heading;
+static int hf_gsm_r_uus1_elda_e_time;
+static int hf_gsm_r_uus1_elda_distance;
+static int hf_gsm_r_uus1_elda_scale;
+static int hf_gsm_r_uus1_elda_spare;
 
 /* 5.7 */
-static int hf_gsm_r_uus1_present_dsd_alarm               = -1;
-static int hf_gsm_r_uus1_present_dsd_alarm_loco_number   = -1;
+static int hf_gsm_r_uus1_present_dsd_alarm;
+static int hf_gsm_r_uus1_present_dsd_alarm_loco_number;
 
 /* 5.8 */
-static int hf_gsm_r_uus1_alert_controller        = -1;
-static int hf_gsm_r_uus1_alert_controller_gref   = -1;
+static int hf_gsm_r_uus1_alert_controller;
+static int hf_gsm_r_uus1_alert_controller_gref;
 
 /* Initialize the subtree pointers */
-static gint ett_gsm_r_uus1                   = -1;
-static gint ett_gsm_r_uus1_pfn               = -1;
-static gint ett_gsm_r_uus1_chpc              = -1;
-static gint ett_gsm_r_uus1_chpc_cause        = -1;
-static gint ett_gsm_r_uus1_epfn              = -1;
-static gint ett_gsm_r_uus1_present_text_str  = -1;
-static gint ett_gsm_r_uus1_elda              = -1;
-static gint ett_gsm_r_uus1_elda_lat          = -1;
-static gint ett_gsm_r_uus1_elda_long         = -1;
-static gint ett_gsm_r_uus1_present_dsd_alarm = -1;
-static gint ett_gsm_r_uus1_alert_controller  = -1;
+static gint ett_gsm_r_uus1;
+static gint ett_gsm_r_uus1_pfn;
+static gint ett_gsm_r_uus1_chpc;
+static gint ett_gsm_r_uus1_chpc_cause;
+static gint ett_gsm_r_uus1_epfn;
+static gint ett_gsm_r_uus1_present_text_str;
+static gint ett_gsm_r_uus1_elda;
+static gint ett_gsm_r_uus1_elda_lat;
+static gint ett_gsm_r_uus1_elda_long;
+static gint ett_gsm_r_uus1_present_dsd_alarm;
+static gint ett_gsm_r_uus1_alert_controller;
 
 
 /* Preferences */
@@ -115,7 +115,7 @@ static gboolean q931_u2u  = FALSE;
 static gboolean gsm_a_u2u = TRUE;
 
 
-static expert_field ei_gsm_r_uus1_not_implemented_yet = EI_INIT;
+static expert_field ei_gsm_r_uus1_not_implemented_yet;
 
 static const value_string gsm_r_uus1_tags[] = {
     { 2,  "Acknowledgement by Receiver of a HPC and response from device accepting the acknowledgement" },
diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c
index 95c6ed6679..c5b6a4c0b5 100644
--- a/epan/dissectors/packet-gsm_rlcmac.c
+++ b/epan/dissectors/packet-gsm_rlcmac.c
@@ -94,566 +94,566 @@ const guint8 gsm_rlcmac_egprs_mcs_to_data_block_length[] = {
 
 /* Initialize the protocol and registered fields
 */
-static int proto_gsm_rlcmac = -1;
-static int ett_gsm_rlcmac  = -1;
-static int ett_gsm_rlcmac_data  = -1;
-static int ett_data_segments  = -1;
-static int ett_gsm_rlcmac_container = -1;
+static int proto_gsm_rlcmac;
+static int ett_gsm_rlcmac;
+static int ett_gsm_rlcmac_data;
+static int ett_data_segments;
+static int ett_gsm_rlcmac_container;
 
 /* common MAC header IEs */
-static int hf_usf = -1;
-static int hf_ul_payload_type = -1;
-static int hf_dl_payload_type = -1;
-static int hf_dl_ec_payload_type = -1;
-static int hf_rrbp = -1;
-static int hf_ec_rrbp = -1;
-static int hf_s_p = -1;
-static int hf_es_p = -1;
-static int hf_fbi = -1;
+static int hf_usf;
+static int hf_ul_payload_type;
+static int hf_dl_payload_type;
+static int hf_dl_ec_payload_type;
+static int hf_rrbp;
+static int hf_ec_rrbp;
+static int hf_s_p;
+static int hf_es_p;
+static int hf_fbi;
 
 /* common RLC IEs*/
-static int hf_prach8_message_type_3 = -1;
-static int hf_prach8_message_type_6 = -1;
-static int hf_prach11_message_type_6 = -1;
-static int hf_prach11_message_type_9 = -1;
-static int hf_tlli = -1;
-static int hf_global_tfi = -1;
-static int hf_uplink_tfi = -1;
-static int hf_downlink_tfi = -1;
-static int hf_page_mode = -1;
-static int hf_dl_persistent_level_exist = -1;
-static int hf_dl_persistent_level = -1;
-static int hf_bsn = -1;
-static int hf_bsn2_offset = -1;
-static int hf_e = -1;
-static int hf_li= -1;
-static int hf_pi= -1;
-static int hf_ti= -1;
-static int hf_rsb= -1;
-static int hf_dl_spb= -1;
-static int hf_ul_spb= -1;
-static int hf_cps1= -1;
-static int hf_cps2= -1;
-static int hf_cps3= -1;
-static int hf_me = -1;
-
-static int hf_countdown_value = -1;
-static int hf_ul_data_si = -1;
-
-static int hf_dl_data_spare = -1;
-static int hf_ul_data_spare = -1;
-static int hf_pfi = -1;
+static int hf_prach8_message_type_3;
+static int hf_prach8_message_type_6;
+static int hf_prach11_message_type_6;
+static int hf_prach11_message_type_9;
+static int hf_tlli;
+static int hf_global_tfi;
+static int hf_uplink_tfi;
+static int hf_downlink_tfi;
+static int hf_page_mode;
+static int hf_dl_persistent_level_exist;
+static int hf_dl_persistent_level;
+static int hf_bsn;
+static int hf_bsn2_offset;
+static int hf_e;
+static int hf_li;
+static int hf_pi;
+static int hf_ti;
+static int hf_rsb;
+static int hf_dl_spb;
+static int hf_ul_spb;
+static int hf_cps1;
+static int hf_cps2;
+static int hf_cps3;
+static int hf_me;
+
+static int hf_countdown_value;
+static int hf_ul_data_si;
+
+static int hf_dl_data_spare;
+static int hf_ul_data_spare;
+static int hf_pfi;
 
 /* RLC/MAC Downlink control block header */
-static int hf_dl_ctrl_rbsn = -1;
-static int hf_dl_ctrl_rti = -1;
-static int hf_dl_ctrl_fs = -1;
-static int hf_dl_ctrl_ac = -1;
-static int hf_dl_ctrl_pr = -1;
-static int hf_dl_ec_ctrl_pr = -1;
-static int hf_dl_ec_ctrl_pre = -1;
-static int hf_dl_ctrl_d = -1;
-
-static int hf_dl_ctrl_rbsn_e = -1;
-static int hf_dl_ctrl_fs_e = -1;
-static int hf_dl_ctrl_spare = -1;
-static int hf_startingtime_n32 = -1;
-static int hf_startingtime_n51 = -1;
-static int hf_startingtime_n26 = -1;
+static int hf_dl_ctrl_rbsn;
+static int hf_dl_ctrl_rti;
+static int hf_dl_ctrl_fs;
+static int hf_dl_ctrl_ac;
+static int hf_dl_ctrl_pr;
+static int hf_dl_ec_ctrl_pr;
+static int hf_dl_ec_ctrl_pre;
+static int hf_dl_ctrl_d;
+
+static int hf_dl_ctrl_rbsn_e;
+static int hf_dl_ctrl_fs_e;
+static int hf_dl_ctrl_spare;
+static int hf_startingtime_n32;
+static int hf_startingtime_n51;
+static int hf_startingtime_n26;
 
 /* common uplink ies */
-static int hf_ul_message_type = -1;
-static int hf_ul_mac_header_spare = -1;
-static int hf_ul_retry = -1;
-static int hf_additional_ms_rad_access_cap_id_choice = -1;
+static int hf_ul_message_type;
+static int hf_ul_mac_header_spare;
+static int hf_ul_retry;
+static int hf_additional_ms_rad_access_cap_id_choice;
 
 /* < Global TFI IE > */
 
 /* < Starting Frame Number Description IE > */
-static int hf_starting_frame_number = -1;
-static int hf_starting_frame_number_k = -1;
+static int hf_starting_frame_number;
+static int hf_starting_frame_number_k;
 
 /* < Ack/Nack Description IE > */
-static int hf_final_ack_indication = -1;
-static int hf_starting_sequence_number = -1;
-static int hf_received_block_bitmap = -1;
+static int hf_final_ack_indication;
+static int hf_starting_sequence_number;
+static int hf_received_block_bitmap;
 
 /* < Packet Timing Advance IE > */
-static int hf_timing_advance_value = -1;
-static int hf_timing_advance_value_exist = -1;
-static int hf_timing_advance_index = -1;
-static int hf_timing_advance_index_exist = -1;
-static int hf_timing_advance_timeslot_number = -1;
-static int hf_ul_timing_advance_index_exist = -1;
-static int hf_ul_timing_advance_index = -1;
-static int hf_ul_timing_advance_timeslot_number = -1;
-static int hf_dl_timing_advance_index_exist = -1;
-static int hf_dl_timing_advance_index = -1;
-static int hf_dl_timing_advance_timeslot_number = -1;
+static int hf_timing_advance_value;
+static int hf_timing_advance_value_exist;
+static int hf_timing_advance_index;
+static int hf_timing_advance_index_exist;
+static int hf_timing_advance_timeslot_number;
+static int hf_ul_timing_advance_index_exist;
+static int hf_ul_timing_advance_index;
+static int hf_ul_timing_advance_timeslot_number;
+static int hf_dl_timing_advance_index_exist;
+static int hf_dl_timing_advance_index;
+static int hf_dl_timing_advance_timeslot_number;
 
 /* < Power Control Parameters IE > */
-static int hf_alpha = -1;
-static int hf_gamma = -1;
-static int hf_t_avg_w = -1;
-static int hf_t_avg_t = -1;
-static int hf_pc_meas_chan = -1;
-static int hf_n_avg_i = -1;
+static int hf_alpha;
+static int hf_gamma;
+static int hf_t_avg_w;
+static int hf_t_avg_t;
+static int hf_pc_meas_chan;
+static int hf_n_avg_i;
 
 /* < Global Power Control Parameters IE > */
-static int hf_global_power_control_parameters_pb = -1;
-static int hf_global_power_control_parameters_int_meas_channel_list_avail = -1;
+static int hf_global_power_control_parameters_pb;
+static int hf_global_power_control_parameters_int_meas_channel_list_avail;
 
 /* < Global Packet Timing Advance IE > */
 
 /* < Channel Quality Report struct > */
-static int hf_channel_quality_report_c_value = -1;
-static int hf_channel_quality_report_rxqual = -1;
-static int hf_channel_quality_report_sign_var = -1;
-static int hf_channel_quality_report_slot0_i_level_tn = -1;
-static int hf_channel_quality_report_slot1_i_level_tn = -1;
-static int hf_channel_quality_report_slot2_i_level_tn = -1;
-static int hf_channel_quality_report_slot3_i_level_tn = -1;
-static int hf_channel_quality_report_slot4_i_level_tn = -1;
-static int hf_channel_quality_report_slot5_i_level_tn = -1;
-static int hf_channel_quality_report_slot6_i_level_tn = -1;
-static int hf_channel_quality_report_slot7_i_level_tn = -1;
-static int hf_channel_quality_report_slot0_i_level_tn_exist = -1;
-static int hf_channel_quality_report_slot1_i_level_tn_exist = -1;
-static int hf_channel_quality_report_slot2_i_level_tn_exist = -1;
-static int hf_channel_quality_report_slot3_i_level_tn_exist = -1;
-static int hf_channel_quality_report_slot4_i_level_tn_exist = -1;
-static int hf_channel_quality_report_slot5_i_level_tn_exist = -1;
-static int hf_channel_quality_report_slot6_i_level_tn_exist = -1;
-static int hf_channel_quality_report_slot7_i_level_tn_exist = -1;
+static int hf_channel_quality_report_c_value;
+static int hf_channel_quality_report_rxqual;
+static int hf_channel_quality_report_sign_var;
+static int hf_channel_quality_report_slot0_i_level_tn;
+static int hf_channel_quality_report_slot1_i_level_tn;
+static int hf_channel_quality_report_slot2_i_level_tn;
+static int hf_channel_quality_report_slot3_i_level_tn;
+static int hf_channel_quality_report_slot4_i_level_tn;
+static int hf_channel_quality_report_slot5_i_level_tn;
+static int hf_channel_quality_report_slot6_i_level_tn;
+static int hf_channel_quality_report_slot7_i_level_tn;
+static int hf_channel_quality_report_slot0_i_level_tn_exist;
+static int hf_channel_quality_report_slot1_i_level_tn_exist;
+static int hf_channel_quality_report_slot2_i_level_tn_exist;
+static int hf_channel_quality_report_slot3_i_level_tn_exist;
+static int hf_channel_quality_report_slot4_i_level_tn_exist;
+static int hf_channel_quality_report_slot5_i_level_tn_exist;
+static int hf_channel_quality_report_slot6_i_level_tn_exist;
+static int hf_channel_quality_report_slot7_i_level_tn_exist;
 
 
 /* < EGPRS Ack/Nack Description > */
-static int hf_egprs_acknack_beginning_of_window = -1;
-static int hf_egprs_acknack_end_of_window = -1;
-static int hf_egprs_acknack_crbb_length = -1;
-static int hf_egprs_acknack_crbb_exist = -1;
-static int hf_egprs_acknack_crbb_starting_color_code = -1;
-static int hf_egprs_acknack_crbb_bitmap = -1;
-static int hf_egprs_acknack_urbb_bitmap = -1;
-static int hf_egprs_acknack_dissector = -1;
-static int hf_egprs_acknack = -1;
+static int hf_egprs_acknack_beginning_of_window;
+static int hf_egprs_acknack_end_of_window;
+static int hf_egprs_acknack_crbb_length;
+static int hf_egprs_acknack_crbb_exist;
+static int hf_egprs_acknack_crbb_starting_color_code;
+static int hf_egprs_acknack_crbb_bitmap;
+static int hf_egprs_acknack_urbb_bitmap;
+static int hf_egprs_acknack_dissector;
+static int hf_egprs_acknack;
 
 /* <P1 Rest Octets> */
 
 /* <P2 Rest Octets> */
-/* static int hf_mobileallocationie_length = -1; */
-/* static int hf_single_rf_channel_spare = -1; */
-static int hf_arfcn = -1;
-static int hf_maio = -1;
-static int hf_hsn = -1;
+/* static int hf_mobileallocationie_length; */
+/* static int hf_single_rf_channel_spare; */
+static int hf_arfcn;
+static int hf_maio;
+static int hf_hsn;
 #if 0
-static int hf_channel_description_channel_type_and_tdma_offset = -1;
-static int hf_channel_description_tn = -1;
-static int hf_group_call_reference_value = -1;
-static int hf_group_call_reference_sf = -1;
-static int hf_group_call_reference_af = -1;
-static int hf_group_call_reference_call_priority = -1;
-static int hf_group_call_reference_ciphering_information = -1;
-static int hf_nln_pch = -1;
-static int hf_nln_status = -1;
-static int hf_priority = -1;
-static int hf_p1_rest_octets_packet_page_indication_1 = -1;
-static int hf_p1_rest_octets_packet_page_indication_2 = -1;
-static int hf_p2_rest_octets_cn3 = -1;
+static int hf_channel_description_channel_type_and_tdma_offset;
+static int hf_channel_description_tn;
+static int hf_group_call_reference_value;
+static int hf_group_call_reference_sf;
+static int hf_group_call_reference_af;
+static int hf_group_call_reference_call_priority;
+static int hf_group_call_reference_ciphering_information;
+static int hf_nln_pch;
+static int hf_nln_status;
+static int hf_priority;
+static int hf_p1_rest_octets_packet_page_indication_1;
+static int hf_p1_rest_octets_packet_page_indication_2;
+static int hf_p2_rest_octets_cn3;
 #endif
-static int hf_nln = -1;
-/* static int hf_p2_rest_octets_packet_page_indication_3 = -1; */
+static int hf_nln;
+/* static int hf_p2_rest_octets_packet_page_indication_3; */
 
 /* <IA Rest Octets> */
-static int hf_usf_bitmap = -1;
-static int hf_usf_granularity = -1;
-static int hf_p0 = -1;
-static int hf_pr_mode = -1;
-static int hf_nr_of_radio_blocks_allocated = -1;
-static int hf_bts_pwr_ctrl_mode = -1;
-/* static int hf_polling = -1; */
-static int hf_egprs_channel_coding_command = -1;
-static int hf_tlli_block_channel_coding = -1;
-static int hf_bep_period2 = -1;
-static int hf_resegment = -1;
-static int hf_egprs_windowsize = -1;
-/* static int hf_extendedra = -1; */
-/* static int hf_ia_egprs_uniontype  = -1; */
-/* static int hf_ia_freqparamsbeforetime_length = -1; */
-static int hf_gprs_channel_coding_command = -1;
-static int hf_link_quality_measurement_mode = -1;
-static int hf_rlc_mode = -1;
-/* static int hf_ta_valid = -1; */
-static int hf_tqi = -1;
-static int hf_packet_polling_id_choice = -1;
-static int hf_mobile_bitlength = -1;
-static int hf_mobile_bitmap = -1;
-static int hf_mobile_union = -1;
-static int hf_arfcn_index = -1;
-static int hf_arfcn_index_exist = -1;
-static int hf_gprs_mobile_allocation_rfl_number = -1;
-static int hf_gprs_mobile_allocation_rfl_number_exist = -1;
+static int hf_usf_bitmap;
+static int hf_usf_granularity;
+static int hf_p0;
+static int hf_pr_mode;
+static int hf_nr_of_radio_blocks_allocated;
+static int hf_bts_pwr_ctrl_mode;
+/* static int hf_polling; */
+static int hf_egprs_channel_coding_command;
+static int hf_tlli_block_channel_coding;
+static int hf_bep_period2;
+static int hf_resegment;
+static int hf_egprs_windowsize;
+/* static int hf_extendedra; */
+/* static int hf_ia_egprs_uniontype; */
+/* static int hf_ia_freqparamsbeforetime_length; */
+static int hf_gprs_channel_coding_command;
+static int hf_link_quality_measurement_mode;
+static int hf_rlc_mode;
+/* static int hf_ta_valid; */
+static int hf_tqi;
+static int hf_packet_polling_id_choice;
+static int hf_mobile_bitlength;
+static int hf_mobile_bitmap;
+static int hf_mobile_union;
+static int hf_arfcn_index;
+static int hf_arfcn_index_exist;
+static int hf_gprs_mobile_allocation_rfl_number;
+static int hf_gprs_mobile_allocation_rfl_number_exist;
 
 /* <Packet Polling Request> */
-static int hf_dl_message_type = -1;
-static int hf_dl_message_type_exist = -1;
+static int hf_dl_message_type;
+static int hf_dl_message_type_exist;
 
 /* < SI 13 Rest Octets > */
-static int hf_si_rest_bitmap = -1;
-static int hf_si_length = -1;
-static int hf_gprs_cell_options_nmo = -1;
-static int hf_gprs_cell_options_t3168 = -1;
-static int hf_gprs_cell_options_t3192 = -1;
-static int hf_gprs_cell_options_drx_timer_max = -1;
-static int hf_gprs_cell_options_access_burst_type = -1;
-static int hf_ack_type = -1;
-static int hf_padding = -1;
-static int hf_gprs_cell_options_bs_cv_max = -1;
-static int hf_gprs_cell_options_pan_dec = -1;
-static int hf_gprs_cell_options_pan_inc = -1;
-static int hf_gprs_cell_options_pan_max = -1;
-static int hf_gprs_cell_options_pan_exist = -1;
-static int hf_gprs_cell_options_extension_exist = -1;
-static int hf_rac = -1;
-static int hf_pbcch_not_present_spgc_ccch_sup = -1;
-static int hf_pbcch_not_present_priority_access_thr = -1;
-static int hf_pbcch_not_present_network_control_order = -1;
-static int hf_pbcch_description_pb = -1;
-static int hf_pbcch_description_tn = -1;
-static int hf_pbcch_description_choice = -1;
-static int hf_pbcch_present_psi1_repeat_period = -1;
-static int hf_bcch_change_mark = -1;
-static int hf_si_change_field = -1;
-static int hf_si13_change_mark = -1;
-static int hf_sgsnr = -1;
-static int hf_si_status_ind = -1;
+static int hf_si_rest_bitmap;
+static int hf_si_length;
+static int hf_gprs_cell_options_nmo;
+static int hf_gprs_cell_options_t3168;
+static int hf_gprs_cell_options_t3192;
+static int hf_gprs_cell_options_drx_timer_max;
+static int hf_gprs_cell_options_access_burst_type;
+static int hf_ack_type;
+static int hf_padding;
+static int hf_gprs_cell_options_bs_cv_max;
+static int hf_gprs_cell_options_pan_dec;
+static int hf_gprs_cell_options_pan_inc;
+static int hf_gprs_cell_options_pan_max;
+static int hf_gprs_cell_options_pan_exist;
+static int hf_gprs_cell_options_extension_exist;
+static int hf_rac;
+static int hf_pbcch_not_present_spgc_ccch_sup;
+static int hf_pbcch_not_present_priority_access_thr;
+static int hf_pbcch_not_present_network_control_order;
+static int hf_pbcch_description_pb;
+static int hf_pbcch_description_tn;
+static int hf_pbcch_description_choice;
+static int hf_pbcch_present_psi1_repeat_period;
+static int hf_bcch_change_mark;
+static int hf_si_change_field;
+static int hf_si13_change_mark;
+static int hf_sgsnr;
+static int hf_si_status_ind;
 
 /* < Packet TBF Release message content > */
-static int hf_packetbf_release = -1;
-static int hf_packetbf_padding = -1;
-static int hf_packetbf_release_uplink_release = -1;
-static int hf_packetbf_release_downlink_release = -1;
-static int hf_packetbf_release_tbf_release_cause = -1;
+static int hf_packetbf_release;
+static int hf_packetbf_padding;
+static int hf_packetbf_release_uplink_release;
+static int hf_packetbf_release_downlink_release;
+static int hf_packetbf_release_tbf_release_cause;
 
 /* < Packet Control Acknowledgement message content > */
-static int hf_packet_control_acknowledgement_additionsr6_ctrl_ack_extension = -1;
-static int hf_packet_control_acknowledgement_additionsr5_tn_rrbp = -1;
-static int hf_packet_control_acknowledgement_additionsr5_g_rnti_extension = -1;
-static int hf_packet_control_acknowledgement_ctrl_ack = -1;
-static int hf_packet_control_acknowledgement_ctrl_ack_exist = -1;
-static int hf_packet_control_acknowledgement_additionsr6_ctrl_ack_exist = -1;
-static int hf_packet_control_acknowledgement_additionsr5_tn_rrbp_exist = -1;
-static int hf_packet_control_acknowledgement_additionsr5_g_rnti_extension_exist = -1;
-static int hf_packet_control_acknowledgement_additionsr6_exist = -1;
+static int hf_packet_control_acknowledgement_additionsr6_ctrl_ack_extension;
+static int hf_packet_control_acknowledgement_additionsr5_tn_rrbp;
+static int hf_packet_control_acknowledgement_additionsr5_g_rnti_extension;
+static int hf_packet_control_acknowledgement_ctrl_ack;
+static int hf_packet_control_acknowledgement_ctrl_ack_exist;
+static int hf_packet_control_acknowledgement_additionsr6_ctrl_ack_exist;
+static int hf_packet_control_acknowledgement_additionsr5_tn_rrbp_exist;
+static int hf_packet_control_acknowledgement_additionsr5_g_rnti_extension_exist;
+static int hf_packet_control_acknowledgement_additionsr6_exist;
 
 /* < Packet Downlink Dummy Control Block message content > */
 
 /* < Packet Uplink Dummy Control Block message content > */
 #if 0
-static int hf_receive_n_pdu_number_nsapi = -1;
-static int hf_receive_n_pdu_number_value = -1;
+static int hf_receive_n_pdu_number_nsapi;
+static int hf_receive_n_pdu_number_value;
 #endif
 
 /* < MS Radio Access capability IE > */
-static int hf_dtm_egprs_dtm_egprs_multislot_class = -1;
-static int hf_dtm_egprs_highmultislotclass_dtm_egprs_highmultislotclass = -1;
-static int hf_multislot_capability_hscsd_multislot_class = -1;
-static int hf_multislot_capability_gprs_multislot_class = -1;
-static int hf_multislot_capability_gprs_extended_dynamic_allocation_capability = -1;
-static int hf_multislot_capability_sms_value = -1;
-static int hf_multislot_capability_sm_value = -1;
-static int hf_multislot_capability_ecsd_multislot_class = -1;
-static int hf_multislot_capability_egprs_multislot_class = -1;
-static int hf_multislot_capability_egprs_extended_dynamic_allocation_capability = -1;
-static int hf_multislot_capability_dtm_gprs_multislot_class = -1;
-static int hf_multislot_capability_single_slot_dtm = -1;
-static int hf_dtm_egprs_dtm_egprs_multislot_class_exist = -1;
-static int hf_dtm_egprs_highmultislotclass_dtm_egprs_highmultislotclass_exist = -1;
-static int hf_multislot_capability_hscsd_multislot_class_exist = -1;
-static int hf_multislot_capability_gprs_multislot_class_exist = -1;
-static int hf_multislot_capability_sms_exist = -1;
-static int hf_multislot_capability_ecsd_multislot_class_exist = -1;
-static int hf_multislot_capability_egprs_multislot_class_exist = -1;
-static int hf_multislot_capability_dtm_gprs_multislot_class_exist = -1;
-
-static int hf_content_rf_power_capability = -1;
-static int hf_content_a5_bits = -1;
-static int hf_content_es_ind = -1;
-static int hf_content_ps = -1;
-static int hf_content_vgcs = -1;
-static int hf_content_vbs = -1;
-static int hf_content_eight_psk_power_capability = -1;
-static int hf_content_compact_interference_measurement_capability = -1;
-static int hf_content_revision_level_indicator = -1;
-static int hf_content_umts_fdd_radio_access_technology_capability = -1;
-static int hf_content_umts_384_tdd_radio_access_technology_capability = -1;
-static int hf_content_cdma2000_radio_access_technology_capability = -1;
-static int hf_content_umts_128_tdd_radio_access_technology_capability = -1;
-static int hf_a5_bits_exist = -1;
-static int hf_multislot_capability_exist = -1;
-static int hf_content_eight_psk_power_capability_exist = -1;
-static int hf_content_extended_dtm_gprs_multislot_class_exist = -1;
-static int hf_content_highmultislotcapability_exist = -1;
-static int hf_content_geran_lu_modecapability_exist = -1;
-static int hf_content_dtm_gprs_highmultislotclass_exist = -1;
-static int hf_content_geran_feature_package_1 = -1;
-static int hf_content_extended_dtm_gprs_multislot_class = -1;
-static int hf_content_extended_dtm_egprs_multislot_class = -1;
-static int hf_content_modulation_based_multislot_class_support = -1;
-static int hf_content_highmultislotcapability = -1;
-static int hf_content_geran_lu_modecapability = -1;
-static int hf_content_gmsk_multislotpowerprofile = -1;
-static int hf_content_eightpsk_multislotprofile = -1;
-static int hf_content_multipletbf_capability = -1;
-static int hf_content_downlinkadvancedreceiverperformance = -1;
-static int hf_content_extendedrlc_mac_controlmessagesegmentionscapability = -1;
-static int hf_content_dtm_enhancementscapability = -1;
-static int hf_content_dtm_gprs_highmultislotclass = -1;
-static int hf_content_ps_handovercapability = -1;
-static int hf_content_dtm_handover_capability = -1;
-static int hf_content_multislot_capability_reduction_for_dl_dual_carrier_exist = -1;
-static int hf_content_multislot_capability_reduction_for_dl_dual_carrier = -1;
-static int hf_content_dual_carrier_for_dtm = -1;
-static int hf_content_flexible_timeslot_assignment = -1;
-static int hf_content_gan_ps_handover_capability = -1;
-static int hf_content_rlc_non_persistent_mode = -1;
-static int hf_content_reduced_latency_capability = -1;
-static int hf_content_uplink_egprs2 = -1;
-static int hf_content_downlink_egprs2 = -1;
-static int hf_content_eutra_fdd_support = -1;
-static int hf_content_eutra_tdd_support = -1;
-static int hf_content_geran_to_eutran_support_in_geran_ptm = -1;
-static int hf_content_priority_based_reselection_support = -1;
-static int hf_additional_accessechnologies_struct_t_access_technology_type = -1;
-static int hf_additional_accessechnologies_struct_t_gmsk_power_class = -1;
-static int hf_additional_accessechnologies_struct_t_eight_psk_power_class = -1;
-static int hf_additional_access_technology_exist = -1;
-/* static int hf_ms_radio_access_capability_iei = -1; */
-/* static int hf_ms_radio_access_capability_length = -1; */
-static int hf_content_dissector = -1;
-static int hf_additional_access_dissector = -1;
-static int hf_ms_ra_capability_value_choice = -1;
-static int hf_ms_ra_capability_value = -1;
+static int hf_dtm_egprs_dtm_egprs_multislot_class;
+static int hf_dtm_egprs_highmultislotclass_dtm_egprs_highmultislotclass;
+static int hf_multislot_capability_hscsd_multislot_class;
+static int hf_multislot_capability_gprs_multislot_class;
+static int hf_multislot_capability_gprs_extended_dynamic_allocation_capability;
+static int hf_multislot_capability_sms_value;
+static int hf_multislot_capability_sm_value;
+static int hf_multislot_capability_ecsd_multislot_class;
+static int hf_multislot_capability_egprs_multislot_class;
+static int hf_multislot_capability_egprs_extended_dynamic_allocation_capability;
+static int hf_multislot_capability_dtm_gprs_multislot_class;
+static int hf_multislot_capability_single_slot_dtm;
+static int hf_dtm_egprs_dtm_egprs_multislot_class_exist;
+static int hf_dtm_egprs_highmultislotclass_dtm_egprs_highmultislotclass_exist;
+static int hf_multislot_capability_hscsd_multislot_class_exist;
+static int hf_multislot_capability_gprs_multislot_class_exist;
+static int hf_multislot_capability_sms_exist;
+static int hf_multislot_capability_ecsd_multislot_class_exist;
+static int hf_multislot_capability_egprs_multislot_class_exist;
+static int hf_multislot_capability_dtm_gprs_multislot_class_exist;
+
+static int hf_content_rf_power_capability;
+static int hf_content_a5_bits;
+static int hf_content_es_ind;
+static int hf_content_ps;
+static int hf_content_vgcs;
+static int hf_content_vbs;
+static int hf_content_eight_psk_power_capability;
+static int hf_content_compact_interference_measurement_capability;
+static int hf_content_revision_level_indicator;
+static int hf_content_umts_fdd_radio_access_technology_capability;
+static int hf_content_umts_384_tdd_radio_access_technology_capability;
+static int hf_content_cdma2000_radio_access_technology_capability;
+static int hf_content_umts_128_tdd_radio_access_technology_capability;
+static int hf_a5_bits_exist;
+static int hf_multislot_capability_exist;
+static int hf_content_eight_psk_power_capability_exist;
+static int hf_content_extended_dtm_gprs_multislot_class_exist;
+static int hf_content_highmultislotcapability_exist;
+static int hf_content_geran_lu_modecapability_exist;
+static int hf_content_dtm_gprs_highmultislotclass_exist;
+static int hf_content_geran_feature_package_1;
+static int hf_content_extended_dtm_gprs_multislot_class;
+static int hf_content_extended_dtm_egprs_multislot_class;
+static int hf_content_modulation_based_multislot_class_support;
+static int hf_content_highmultislotcapability;
+static int hf_content_geran_lu_modecapability;
+static int hf_content_gmsk_multislotpowerprofile;
+static int hf_content_eightpsk_multislotprofile;
+static int hf_content_multipletbf_capability;
+static int hf_content_downlinkadvancedreceiverperformance;
+static int hf_content_extendedrlc_mac_controlmessagesegmentionscapability;
+static int hf_content_dtm_enhancementscapability;
+static int hf_content_dtm_gprs_highmultislotclass;
+static int hf_content_ps_handovercapability;
+static int hf_content_dtm_handover_capability;
+static int hf_content_multislot_capability_reduction_for_dl_dual_carrier_exist;
+static int hf_content_multislot_capability_reduction_for_dl_dual_carrier;
+static int hf_content_dual_carrier_for_dtm;
+static int hf_content_flexible_timeslot_assignment;
+static int hf_content_gan_ps_handover_capability;
+static int hf_content_rlc_non_persistent_mode;
+static int hf_content_reduced_latency_capability;
+static int hf_content_uplink_egprs2;
+static int hf_content_downlink_egprs2;
+static int hf_content_eutra_fdd_support;
+static int hf_content_eutra_tdd_support;
+static int hf_content_geran_to_eutran_support_in_geran_ptm;
+static int hf_content_priority_based_reselection_support;
+static int hf_additional_accessechnologies_struct_t_access_technology_type;
+static int hf_additional_accessechnologies_struct_t_gmsk_power_class;
+static int hf_additional_accessechnologies_struct_t_eight_psk_power_class;
+static int hf_additional_access_technology_exist;
+/* static int hf_ms_radio_access_capability_iei; */
+/* static int hf_ms_radio_access_capability_length; */
+static int hf_content_dissector;
+static int hf_additional_access_dissector;
+static int hf_ms_ra_capability_value_choice;
+static int hf_ms_ra_capability_value;
 
 /* < MS Classmark 3 IE > */
 #if 0
-static int hf_arc_a5_bits = -1;
-static int hf_multiband_a5_bits = -1;
-static int hf_arc_arc2_spare = -1;
-static int hf_arc_arc1 = -1;
-static int hf_edge_rf_pwr_edge_rf_pwrcap1 = -1;
-static int hf_edge_rf_pwr_edge_rf_pwrcap2 = -1;
-static int hf_ms_class3_unpacked_spare1 = -1;
-static int hf_ms_class3_unpacked_r_gsm_arc = -1;
-static int hf_ms_class3_unpacked_multislotclass = -1;
-static int hf_ms_class3_unpacked_ucs2 = -1;
-static int hf_ms_class3_unpacked_extendedmeasurementcapability = -1;
-static int hf_ms_class3_unpacked_sms_value = -1;
-static int hf_ms_class3_unpacked_sm_value = -1;
-static int hf_ms_class3_unpacked_ms_positioningmethod = -1;
-static int hf_ms_class3_unpacked_edge_multislotclass = -1;
-static int hf_ms_class3_unpacked_modulationcapability = -1;
-static int hf_ms_class3_unpacked_gsm400_bands = -1;
-static int hf_ms_class3_unpacked_gsm400_arc = -1;
-static int hf_ms_class3_unpacked_gsm850_arc = -1;
-static int hf_ms_class3_unpacked_pcs1900_arc = -1;
-static int hf_ms_class3_unpacked_umts_fdd_radio_access_technology_capability = -1;
-static int hf_ms_class3_unpacked_umts_384_tdd_radio_access_technology_capability = -1;
-static int hf_ms_class3_unpacked_cdma2000_radio_access_technology_capability = -1;
-static int hf_ms_class3_unpacked_dtm_gprs_multislot_class = -1;
-static int hf_ms_class3_unpacked_single_slot_dtm = -1;
-static int hf_ms_class3_unpacked_gsm_band = -1;
-static int hf_ms_class3_unpacked_gsm_700_associated_radio_capability = -1;
-static int hf_ms_class3_unpacked_umts_128_tdd_radio_access_technology_capability = -1;
-static int hf_ms_class3_unpacked_geran_feature_package_1 = -1;
-static int hf_ms_class3_unpacked_extended_dtm_gprs_multislot_class = -1;
-static int hf_ms_class3_unpacked_extended_dtm_egprs_multislot_class = -1;
-static int hf_ms_class3_unpacked_highmultislotcapability = -1;
-static int hf_ms_class3_unpacked_geran_lu_modecapability = -1;
-static int hf_ms_class3_unpacked_geran_featurepackage_2 = -1;
-static int hf_ms_class3_unpacked_gmsk_multislotpowerprofile = -1;
-static int hf_ms_class3_unpacked_eightpsk_multislotprofile = -1;
-static int hf_ms_class3_unpacked_tgsm_400_bandssupported = -1;
-static int hf_ms_class3_unpacked_tgsm_400_associatedradiocapability = -1;
-static int hf_ms_class3_unpacked_tgsm_900_associatedradiocapability = -1;
-static int hf_ms_class3_unpacked_downlinkadvancedreceiverperformance = -1;
-static int hf_ms_class3_unpacked_dtm_enhancementscapability = -1;
-static int hf_ms_class3_unpacked_dtm_gprs_highmultislotclass = -1;
-static int hf_ms_class3_unpacked_offsetrequired = -1;
-static int hf_ms_class3_unpacked_repeatedsacch_capability = -1;
-static int hf_ms_class3_unpacked_spare2 = -1;
+static int hf_arc_a5_bits;
+static int hf_multiband_a5_bits;
+static int hf_arc_arc2_spare;
+static int hf_arc_arc1;
+static int hf_edge_rf_pwr_edge_rf_pwrcap1;
+static int hf_edge_rf_pwr_edge_rf_pwrcap2;
+static int hf_ms_class3_unpacked_spare1;
+static int hf_ms_class3_unpacked_r_gsm_arc;
+static int hf_ms_class3_unpacked_multislotclass;
+static int hf_ms_class3_unpacked_ucs2;
+static int hf_ms_class3_unpacked_extendedmeasurementcapability;
+static int hf_ms_class3_unpacked_sms_value;
+static int hf_ms_class3_unpacked_sm_value;
+static int hf_ms_class3_unpacked_ms_positioningmethod;
+static int hf_ms_class3_unpacked_edge_multislotclass;
+static int hf_ms_class3_unpacked_modulationcapability;
+static int hf_ms_class3_unpacked_gsm400_bands;
+static int hf_ms_class3_unpacked_gsm400_arc;
+static int hf_ms_class3_unpacked_gsm850_arc;
+static int hf_ms_class3_unpacked_pcs1900_arc;
+static int hf_ms_class3_unpacked_umts_fdd_radio_access_technology_capability;
+static int hf_ms_class3_unpacked_umts_384_tdd_radio_access_technology_capability;
+static int hf_ms_class3_unpacked_cdma2000_radio_access_technology_capability;
+static int hf_ms_class3_unpacked_dtm_gprs_multislot_class;
+static int hf_ms_class3_unpacked_single_slot_dtm;
+static int hf_ms_class3_unpacked_gsm_band;
+static int hf_ms_class3_unpacked_gsm_700_associated_radio_capability;
+static int hf_ms_class3_unpacked_umts_128_tdd_radio_access_technology_capability;
+static int hf_ms_class3_unpacked_geran_feature_package_1;
+static int hf_ms_class3_unpacked_extended_dtm_gprs_multislot_class;
+static int hf_ms_class3_unpacked_extended_dtm_egprs_multislot_class;
+static int hf_ms_class3_unpacked_highmultislotcapability;
+static int hf_ms_class3_unpacked_geran_lu_modecapability;
+static int hf_ms_class3_unpacked_geran_featurepackage_2;
+static int hf_ms_class3_unpacked_gmsk_multislotpowerprofile;
+static int hf_ms_class3_unpacked_eightpsk_multislotprofile;
+static int hf_ms_class3_unpacked_tgsm_400_bandssupported;
+static int hf_ms_class3_unpacked_tgsm_400_associatedradiocapability;
+static int hf_ms_class3_unpacked_tgsm_900_associatedradiocapability;
+static int hf_ms_class3_unpacked_downlinkadvancedreceiverperformance;
+static int hf_ms_class3_unpacked_dtm_enhancementscapability;
+static int hf_ms_class3_unpacked_dtm_gprs_highmultislotclass;
+static int hf_ms_class3_unpacked_offsetrequired;
+static int hf_ms_class3_unpacked_repeatedsacch_capability;
+static int hf_ms_class3_unpacked_spare2;
 #endif
-static int hf_channel_request_description_peak_throughput_class = -1;
-static int hf_channel_request_description_radio_priority = -1;
-static int hf_channel_request_description_llc_pdu_type = -1;
-static int hf_channel_request_description_rlc_octet_count = -1;
-static int hf_packet_resource_request_id_choice = -1;
-static int hf_bep_measurementreport_mean_bep_exist = -1;
-static int hf_bep_measurementreport_mean_bep_union = -1;
-static int hf_interferencemeasurementreport_i_level_exist = -1;
-static int hf_bep_measurements_exist = -1;
-static int hf_interference_measurements_exist = -1;
-static int hf_egprs_bep_linkqualitymeasurements_mean_bep_gmsk_exist = -1;
-static int hf_egprs_bep_linkqualitymeasurements_mean_bep_8psk_exist = -1;
-static int hf_egprs_bep_measurements_exist = -1;
-static int hf_egprs_timeslotlinkquality_measurements_exist = -1;
-static int hf_pfi_exist = -1;
+static int hf_channel_request_description_peak_throughput_class;
+static int hf_channel_request_description_radio_priority;
+static int hf_channel_request_description_llc_pdu_type;
+static int hf_channel_request_description_rlc_octet_count;
+static int hf_packet_resource_request_id_choice;
+static int hf_bep_measurementreport_mean_bep_exist;
+static int hf_bep_measurementreport_mean_bep_union;
+static int hf_interferencemeasurementreport_i_level_exist;
+static int hf_bep_measurements_exist;
+static int hf_interference_measurements_exist;
+static int hf_egprs_bep_linkqualitymeasurements_mean_bep_gmsk_exist;
+static int hf_egprs_bep_linkqualitymeasurements_mean_bep_8psk_exist;
+static int hf_egprs_bep_measurements_exist;
+static int hf_egprs_timeslotlinkquality_measurements_exist;
+static int hf_pfi_exist;
 
 /* < Packet Resource Request message content > */
-static int hf_bep_measurementreport_mean_bep_gmsk = -1;
-static int hf_bep_measurementreport_mean_bep_8psk = -1;
-static int hf_interferencemeasurementreport_i_level = -1;
-static int hf_egprs_bep_linkqualitymeasurements_mean_bep_gmsk = -1;
-static int hf_egprs_bep_linkqualitymeasurements_cv_bep_gmsk = -1;
-static int hf_egprs_bep_linkqualitymeasurements_mean_bep_8psk = -1;
-static int hf_egprs_bep_linkqualitymeasurements_cv_bep_8psk = -1;
-static int hf_prr_additionsr99_ms_rac_additionalinformationavailable = -1;
-static int hf_prr_additionsr99_retransmissionofprr = -1;
-static int hf_packet_resource_request_access_type = -1;
-static int hf_packet_resource_request_change_mark = -1;
-static int hf_packet_resource_request_c_value = -1;
-static int hf_packet_resource_request_sign_var = -1;
-static int hf_packet_resource_request_access_type_exist = -1;
-static int hf_ms_radio_access_capability_exist = -1;
-static int hf_packet_resource_request_change_mark_exist = -1;
-static int hf_packet_resource_request_sign_var_exist = -1;
-static int hf_additionsr99_exist = -1;
-static int hf_egprs_prr_additionsr5_g_rnti_exist = -1;
-static int hf_egprs_prr_additionsr5_g_rnti_extension = -1;
-static int hf_egprs_prr_additionsr5_rb_id = -1;
-static int hf_egprs_prr_additionsr5_radio_priority = -1;
-static int hf_egprs_prr_additionsr5_rlc_block_count_exist = -1;
-static int hf_egprs_prr_additionsr5_rlc_block_count = -1;
-static int hf_iu_mode_chrequest_exist = -1;
-static int hf_egprs_prr_additionsr6_lcc_pdu_exist = -1;
-static int hf_egprs_prr_additionsr6_lcc_pdu = -1;
-static int hf_Ext_Channel_Request_desc_exist = -1;
-static int hf_egprs_prr_additionsr7_gmsk_mean_bep_exist = -1;
-static int hf_egprs_prr_additionsr7_gmsk_mean_bep = -1;
-static int hf_egprs_prr_additionsr7_gmsk_cv_bep = -1;
-static int hf_egprs_prr_additionsr7_8psk_mean_bep_exist = -1;
-static int hf_egprs_prr_additionsr7_8psk_mean_bep = -1;
-static int hf_egprs_prr_additionsr7_8psk_cv_bep = -1;
-static int hf_egprs_prr_additionsr7_qpsk_mean_bep_exist = -1;
-static int hf_egprs_prr_additionsr7_qpsk_mean_bep = -1;
-static int hf_egprs_prr_additionsr7_qpsk_cv_bep = -1;
-static int hf_egprs_prr_additionsr7_16qam_nsr_mean_bep_exist = -1;
-static int hf_egprs_prr_additionsr7_16qam_nsr_mean_bep = -1;
-static int hf_egprs_prr_additionsr7_16qam_nsr_cv_bep = -1;
-static int hf_egprs_prr_additionsr7_32qam_nsr_mean_bep_exist = -1;
-static int hf_egprs_prr_additionsr7_32qam_nsr_mean_bep = -1;
-static int hf_egprs_prr_additionsr7_32qam_nsr_cv_bep = -1;
-static int hf_egprs_prr_additionsr7_16qam_hsr_mean_bep_exist = -1;
-static int hf_egprs_prr_additionsr7_16qam_hsr_mean_bep = -1;
-static int hf_egprs_prr_additionsr7_16qam_hsr_cv_bep = -1;
-static int hf_egprs_prr_additionsr7_32qam_hsr_mean_bep_exist = -1;
-static int hf_egprs_prr_additionsr7_32qam_hsr_mean_bep = -1;
-static int hf_egprs_prr_additionsr7_32qam_hsr_cv_bep = -1;
-static int hf_bep_measurementreport_reported_modulation = -1;
-static int hf_bep_measurementreport_mean_bep_tn = -1;
-static int hf_prr_additionsr99_additionsr5_exist = -1;
-static int hf_egprs_prr_additionsr5_hfn_lsb_exist = -1;
-static int hf_egprs_prr_additionsr5_hfn_lsb = -1;
-static int hf_prr_additionsr5_additionsr6_exist = -1;
-static int hf_prr_additionsr6_additionsr7_exist = -1;
-static int hf_prr_additionsr7_early_tbf_establishment = -1;
-static int hf_egprs_bep_measurements_type2_exist = -1;
-static int hf_egprs_timeslotlinkquality_measurements_type2_exist = -1;
-static int hf_prr_additionsr7_additionsr10_exist = -1;
-static int hf_prr_additionsr10_low_access_priority_signalling = -1;
-static int hf_prr_additionsr10_additionsr12_exist = -1;
-static int hf_egprs_downlink_etfi_exist = -1;
-static int hf_prr_additionsr12_downlink_etfi = -1;
+static int hf_bep_measurementreport_mean_bep_gmsk;
+static int hf_bep_measurementreport_mean_bep_8psk;
+static int hf_interferencemeasurementreport_i_level;
+static int hf_egprs_bep_linkqualitymeasurements_mean_bep_gmsk;
+static int hf_egprs_bep_linkqualitymeasurements_cv_bep_gmsk;
+static int hf_egprs_bep_linkqualitymeasurements_mean_bep_8psk;
+static int hf_egprs_bep_linkqualitymeasurements_cv_bep_8psk;
+static int hf_prr_additionsr99_ms_rac_additionalinformationavailable;
+static int hf_prr_additionsr99_retransmissionofprr;
+static int hf_packet_resource_request_access_type;
+static int hf_packet_resource_request_change_mark;
+static int hf_packet_resource_request_c_value;
+static int hf_packet_resource_request_sign_var;
+static int hf_packet_resource_request_access_type_exist;
+static int hf_ms_radio_access_capability_exist;
+static int hf_packet_resource_request_change_mark_exist;
+static int hf_packet_resource_request_sign_var_exist;
+static int hf_additionsr99_exist;
+static int hf_egprs_prr_additionsr5_g_rnti_exist;
+static int hf_egprs_prr_additionsr5_g_rnti_extension;
+static int hf_egprs_prr_additionsr5_rb_id;
+static int hf_egprs_prr_additionsr5_radio_priority;
+static int hf_egprs_prr_additionsr5_rlc_block_count_exist;
+static int hf_egprs_prr_additionsr5_rlc_block_count;
+static int hf_iu_mode_chrequest_exist;
+static int hf_egprs_prr_additionsr6_lcc_pdu_exist;
+static int hf_egprs_prr_additionsr6_lcc_pdu;
+static int hf_Ext_Channel_Request_desc_exist;
+static int hf_egprs_prr_additionsr7_gmsk_mean_bep_exist;
+static int hf_egprs_prr_additionsr7_gmsk_mean_bep;
+static int hf_egprs_prr_additionsr7_gmsk_cv_bep;
+static int hf_egprs_prr_additionsr7_8psk_mean_bep_exist;
+static int hf_egprs_prr_additionsr7_8psk_mean_bep;
+static int hf_egprs_prr_additionsr7_8psk_cv_bep;
+static int hf_egprs_prr_additionsr7_qpsk_mean_bep_exist;
+static int hf_egprs_prr_additionsr7_qpsk_mean_bep;
+static int hf_egprs_prr_additionsr7_qpsk_cv_bep;
+static int hf_egprs_prr_additionsr7_16qam_nsr_mean_bep_exist;
+static int hf_egprs_prr_additionsr7_16qam_nsr_mean_bep;
+static int hf_egprs_prr_additionsr7_16qam_nsr_cv_bep;
+static int hf_egprs_prr_additionsr7_32qam_nsr_mean_bep_exist;
+static int hf_egprs_prr_additionsr7_32qam_nsr_mean_bep;
+static int hf_egprs_prr_additionsr7_32qam_nsr_cv_bep;
+static int hf_egprs_prr_additionsr7_16qam_hsr_mean_bep_exist;
+static int hf_egprs_prr_additionsr7_16qam_hsr_mean_bep;
+static int hf_egprs_prr_additionsr7_16qam_hsr_cv_bep;
+static int hf_egprs_prr_additionsr7_32qam_hsr_mean_bep_exist;
+static int hf_egprs_prr_additionsr7_32qam_hsr_mean_bep;
+static int hf_egprs_prr_additionsr7_32qam_hsr_cv_bep;
+static int hf_bep_measurementreport_reported_modulation;
+static int hf_bep_measurementreport_mean_bep_tn;
+static int hf_prr_additionsr99_additionsr5_exist;
+static int hf_egprs_prr_additionsr5_hfn_lsb_exist;
+static int hf_egprs_prr_additionsr5_hfn_lsb;
+static int hf_prr_additionsr5_additionsr6_exist;
+static int hf_prr_additionsr6_additionsr7_exist;
+static int hf_prr_additionsr7_early_tbf_establishment;
+static int hf_egprs_bep_measurements_type2_exist;
+static int hf_egprs_timeslotlinkquality_measurements_type2_exist;
+static int hf_prr_additionsr7_additionsr10_exist;
+static int hf_prr_additionsr10_low_access_priority_signalling;
+static int hf_prr_additionsr10_additionsr12_exist;
+static int hf_egprs_downlink_etfi_exist;
+static int hf_prr_additionsr12_downlink_etfi;
 
 /* < Packet Mobile TBF Status message content > */
-static int hf_packet_mobile_tbf_status_tbf_cause = -1;
+static int hf_packet_mobile_tbf_status_tbf_cause;
 
 /* < Packet PSI Status message content > */
-static int hf_psi_message_psix_change_mark = -1;
-static int hf_additional_msg_type = -1;
-static int hf_packet_psi_status_pbcch_change_mark = -1;
-static int hf_psi_message_psix_count_instance_bitmap_exist = -1;
-static int hf_psi_message_psix_count = -1;
-static int hf_psi_message_instance_bitmap = -1;
-static int hf_psi_message_exist = -1;
-static int hf_psi_message_list = -1;
+static int hf_psi_message_psix_change_mark;
+static int hf_additional_msg_type;
+static int hf_packet_psi_status_pbcch_change_mark;
+static int hf_psi_message_psix_count_instance_bitmap_exist;
+static int hf_psi_message_psix_count;
+static int hf_psi_message_instance_bitmap;
+static int hf_psi_message_exist;
+static int hf_psi_message_list;
 
 /* < Packet SI Status message content > */
-static int hf_si_message_type = -1;
-static int hf_si_message_mess_rec = -1;
-static int hf_si_message_list_exist = -1;
-static int hf_si_message_list = -1;
+static int hf_si_message_type;
+static int hf_si_message_mess_rec;
+static int hf_si_message_list_exist;
+static int hf_si_message_list;
 
 /* < Packet Downlink Ack/Nack message content > */
 
 /* < EGPRS Packet Downlink Ack/Nack message content > */
-static int hf_egprs_channelqualityreport_c_value = -1;
-static int hf_egprs_pd_acknack_ms_out_of_memory = -1;
-static int hf_fddarget_cell_t_fdd_arfcn = -1;
-static int hf_fddarget_cell_t_diversity = -1;
-static int hf_fddarget_cell_t_bandwith_fdd = -1;
-static int hf_fddarget_cell_t_scrambling_code = -1;
-static int hf_tddarget_cell_t_tdd_arfcn = -1;
-static int hf_tddarget_cell_t_diversity = -1;
-static int hf_tddarget_cell_t_bandwith_tdd = -1;
-static int hf_tddarget_cell_t_cell_parameter = -1;
-static int hf_tddarget_cell_t_sync_case_tstd = -1;
+static int hf_egprs_channelqualityreport_c_value;
+static int hf_egprs_pd_acknack_ms_out_of_memory;
+static int hf_fddarget_cell_t_fdd_arfcn;
+static int hf_fddarget_cell_t_diversity;
+static int hf_fddarget_cell_t_bandwith_fdd;
+static int hf_fddarget_cell_t_scrambling_code;
+static int hf_tddarget_cell_t_tdd_arfcn;
+static int hf_tddarget_cell_t_diversity;
+static int hf_tddarget_cell_t_bandwith_tdd;
+static int hf_tddarget_cell_t_cell_parameter;
+static int hf_tddarget_cell_t_sync_case_tstd;
 
 
 /* < Packet Cell Change Failure message content > */
-static int hf_packet_cell_change_failure_bsic = -1;
-static int hf_packet_cell_change_failure_cause = -1;
-static int hf_utran_csg_target_cell_ci = -1;
-static int hf_eutran_csg_target_cell_ci = -1;
-static int hf_eutran_csg_target_cell_tac = -1;
+static int hf_packet_cell_change_failure_bsic;
+static int hf_packet_cell_change_failure_cause;
+static int hf_utran_csg_target_cell_ci;
+static int hf_eutran_csg_target_cell_ci;
+static int hf_eutran_csg_target_cell_tac;
 
 
 /* < Packet Uplink Ack/Nack message content > */
-static int hf_pu_acknack_gprs_additionsr99_tbf_est = -1;
-static int hf_pu_acknack_gprs_fixedallocationdummy = -1;
-static int hf_pu_acknack_egprs_00_pre_emptive_transmission = -1;
-static int hf_pu_acknack_egprs_00_prr_retransmission_request = -1;
-static int hf_pu_acknack_egprs_00_arac_retransmission_request = -1;
-static int hf_pu_acknack_egprs_00_tbf_est = -1;
-static int hf_packet_uplink_id_choice = -1;
-static int hf_packet_extended_timing_advance = -1;
+static int hf_pu_acknack_gprs_additionsr99_tbf_est;
+static int hf_pu_acknack_gprs_fixedallocationdummy;
+static int hf_pu_acknack_egprs_00_pre_emptive_transmission;
+static int hf_pu_acknack_egprs_00_prr_retransmission_request;
+static int hf_pu_acknack_egprs_00_arac_retransmission_request;
+static int hf_pu_acknack_egprs_00_tbf_est;
+static int hf_packet_uplink_id_choice;
+static int hf_packet_extended_timing_advance;
 
 /* < Packet Uplink Assignment message content > */
-static int hf_change_mark_change_mark_1 = -1;
-static int hf_change_mark_change_mark_2 = -1;
-static int hf_indirect_encoding_ma_number = -1;
-static int hf_ma_frequency_list_length = -1;
-static int hf_ma_frequency_list = -1;
-static int hf_packet_request_reference_random_access_information = -1;
-static int hf_packet_request_reference_frame_number = -1;
-static int hf_extended_dynamic_allocation = -1;
-static int hf_ppc_timing_advance_id_choice = -1;
-static int hf_rlc_data_blocks_granted = -1;
-static int hf_single_block_allocation_timeslot_number = -1;
-/* static int hf_dtm_single_block_allocation_timeslot_number = -1; */
-static int hf_compact_reducedma_bitmaplength = -1;
-static int hf_compact_reducedma_bitmap = -1;
-static int hf_multiblock_allocation_timeslot_number = -1;
-static int hf_pua_egprs_00_arac_retransmission_request = -1;
-static int hf_pua_egprs_00_access_tech_type = -1;
-static int hf_pua_egprs_00_access_tech_type_exist = -1;
+static int hf_change_mark_change_mark_1;
+static int hf_change_mark_change_mark_2;
+static int hf_indirect_encoding_ma_number;
+static int hf_ma_frequency_list_length;
+static int hf_ma_frequency_list;
+static int hf_packet_request_reference_random_access_information;
+static int hf_packet_request_reference_frame_number;
+static int hf_extended_dynamic_allocation;
+static int hf_ppc_timing_advance_id_choice;
+static int hf_rlc_data_blocks_granted;
+static int hf_single_block_allocation_timeslot_number;
+/* static int hf_dtm_single_block_allocation_timeslot_number; */
+static int hf_compact_reducedma_bitmaplength;
+static int hf_compact_reducedma_bitmap;
+static int hf_multiblock_allocation_timeslot_number;
+static int hf_pua_egprs_00_arac_retransmission_request;
+static int hf_pua_egprs_00_access_tech_type;
+static int hf_pua_egprs_00_access_tech_type_exist;
 
 /* < Packet Downlink Assignment message content > */
-static int hf_measurement_mapping_struct_measurement_interval = -1;
-static int hf_measurement_mapping_struct_measurement_bitmap = -1;
-static int hf_packet_downlink_id_choice = -1;
-static int hf_mac_mode = -1;
-static int hf_control_ack = -1;
-static int hf_dl_timeslot_allocation = -1;
-/* static int hf_dtm_channel_request_description_dtm_pkt_est_cause = -1; */
+static int hf_measurement_mapping_struct_measurement_interval;
+static int hf_measurement_mapping_struct_measurement_bitmap;
+static int hf_packet_downlink_id_choice;
+static int hf_mac_mode;
+static int hf_control_ack;
+static int hf_dl_timeslot_allocation;
+/* static int hf_dtm_channel_request_description_dtm_pkt_est_cause; */
 
 /* < Packet Paging Request message content > */
-static int hf_mobile_identity_length_of_mobile_identity_contents = -1;
-static int hf_page_request_for_rr_conn_channel_needed = -1;
-static int hf_page_request_for_rr_conn_emlpp_priority = -1;
-static int hf_page_request_ptmsi = -1;
-static int hf_page_request_for_rr_conn_tmsi = -1;
-static int hf_packet_pdch_release_timeslots_available = -1;
+static int hf_mobile_identity_length_of_mobile_identity_contents;
+static int hf_page_request_for_rr_conn_channel_needed;
+static int hf_page_request_for_rr_conn_emlpp_priority;
+static int hf_page_request_ptmsi;
+static int hf_page_request_for_rr_conn_tmsi;
+static int hf_packet_pdch_release_timeslots_available;
 
 /* < Packet Power Control/Timing Advance message content > */
 
@@ -662,389 +662,389 @@ static int hf_packet_pdch_release_timeslots_available = -1;
 /* < Packet Timeslot Reconfigure message content > */
 
 /* < Packet PRACH Parameters message content > */
-static int hf_prach_acc_contr_class = -1;
-static int hf_prach_max_retrans = -1;
-static int hf_prach_control_s = -1;
-static int hf_prach_control_tx_int = -1;
-static int hf_cell_allocation_rfl_number = -1;
-static int hf_cell_allocation_rfl_number_exist = -1;
-static int hf_hcs_priority_class = -1;
-static int hf_hcs_hcs_thr = -1;
-static int hf_location_repeat_pbcch_location = -1;
-static int hf_location_repeat_psi1_repeat_period = -1;
-static int hf_si13_pbcch_location_si13_location = -1;
-static int hf_cell_selection_bsic = -1;
-static int hf_cell_bar_access_2 = -1;
-static int hf_cell_selection_same_ra_as_serving_cell = -1;
-static int hf_cell_selection_gprs_rxlev_access_min = -1;
-static int hf_cell_selection_gprs_ms_txpwr_max_cch = -1;
-static int hf_cell_selection_gprs_temporary_offset = -1;
-static int hf_cell_selection_gprs_penalty_time = -1;
-static int hf_cell_selection_gprs_reselect_offset = -1;
-static int hf_cell_selection_param_with_freqdiff = -1;
-static int hf_neighbourcellparameters_start_frequency = -1;
-static int hf_neighbourcellparameters_nr_of_remaining_cells = -1;
-static int hf_neighbourcellparameters_freq_diff_length = -1;
-static int hf_cell_selection_2_same_ra_as_serving_cell = -1;
-static int hf_cell_selection_2_gprs_rxlev_access_min = -1;
-static int hf_cell_selection_2_gprs_ms_txpwr_max_cch = -1;
-static int hf_cell_selection_2_gprs_temporary_offset = -1;
-static int hf_cell_selection_2_gprs_penalty_time = -1;
-static int hf_cell_selection_2_gprs_reselect_offset = -1;
+static int hf_prach_acc_contr_class;
+static int hf_prach_max_retrans;
+static int hf_prach_control_s;
+static int hf_prach_control_tx_int;
+static int hf_cell_allocation_rfl_number;
+static int hf_cell_allocation_rfl_number_exist;
+static int hf_hcs_priority_class;
+static int hf_hcs_hcs_thr;
+static int hf_location_repeat_pbcch_location;
+static int hf_location_repeat_psi1_repeat_period;
+static int hf_si13_pbcch_location_si13_location;
+static int hf_cell_selection_bsic;
+static int hf_cell_bar_access_2;
+static int hf_cell_selection_same_ra_as_serving_cell;
+static int hf_cell_selection_gprs_rxlev_access_min;
+static int hf_cell_selection_gprs_ms_txpwr_max_cch;
+static int hf_cell_selection_gprs_temporary_offset;
+static int hf_cell_selection_gprs_penalty_time;
+static int hf_cell_selection_gprs_reselect_offset;
+static int hf_cell_selection_param_with_freqdiff;
+static int hf_neighbourcellparameters_start_frequency;
+static int hf_neighbourcellparameters_nr_of_remaining_cells;
+static int hf_neighbourcellparameters_freq_diff_length;
+static int hf_cell_selection_2_same_ra_as_serving_cell;
+static int hf_cell_selection_2_gprs_rxlev_access_min;
+static int hf_cell_selection_2_gprs_ms_txpwr_max_cch;
+static int hf_cell_selection_2_gprs_temporary_offset;
+static int hf_cell_selection_2_gprs_penalty_time;
+static int hf_cell_selection_2_gprs_reselect_offset;
 
 /* < Packet Access Reject message content > */
-static int hf_reject_id_choice = -1;
-static int hf_reject_wait_indication = -1;
-static int hf_reject_wait_indication_size = -1;
-static int hf_packet_cell_change_order_id_choice = -1;
+static int hf_reject_id_choice;
+static int hf_reject_wait_indication;
+static int hf_reject_wait_indication_size;
+static int hf_packet_cell_change_order_id_choice;
 
 /* < Packet Cell Change Order message content > */
-/* static int hf_h_freqbsiccell_bsic = -1; */
-static int hf_cellselectionparamswithfreqdiff_bsic = -1;
-static int hf_add_frequency_list_start_frequency = -1;
-static int hf_add_frequency_list_bsic = -1;
-static int hf_add_frequency_list_nr_of_frequencies = -1;
-static int hf_add_frequency_list_freq_diff_length = -1;
-static int hf_nc_frequency_list_nr_of_removed_freq = -1;
-static int hf_removed_freq_index_removed_freq_index = -1;
-static int hf_nc_measurement_parameters_network_control_order = -1;
-static int hf_nc_measurement_parameters_nc_non_drx_period = -1;
-static int hf_nc_measurement_parameters_nc_reporting_period_i = -1;
-static int hf_nc_measurement_parameters_nc_reporting_period_t = -1;
-static int hf_nc_measurement_parameters_with_frequency_list_network_control_order = -1;
-static int hf_nc_measurement_parameters_with_frequency_list_nc_non_drx_period = -1;
-static int hf_nc_measurement_parameters_with_frequency_list_nc_reporting_period_i = -1;
-static int hf_nc_measurement_parameters_with_frequency_list_nc_reporting_period_t = -1;
+/* static int hf_h_freqbsiccell_bsic; */
+static int hf_cellselectionparamswithfreqdiff_bsic;
+static int hf_add_frequency_list_start_frequency;
+static int hf_add_frequency_list_bsic;
+static int hf_add_frequency_list_nr_of_frequencies;
+static int hf_add_frequency_list_freq_diff_length;
+static int hf_nc_frequency_list_nr_of_removed_freq;
+static int hf_removed_freq_index_removed_freq_index;
+static int hf_nc_measurement_parameters_network_control_order;
+static int hf_nc_measurement_parameters_nc_non_drx_period;
+static int hf_nc_measurement_parameters_nc_reporting_period_i;
+static int hf_nc_measurement_parameters_nc_reporting_period_t;
+static int hf_nc_measurement_parameters_with_frequency_list_network_control_order;
+static int hf_nc_measurement_parameters_with_frequency_list_nc_non_drx_period;
+static int hf_nc_measurement_parameters_with_frequency_list_nc_reporting_period_i;
+static int hf_nc_measurement_parameters_with_frequency_list_nc_reporting_period_t;
 
 /* < Packet Cell Change Order message contents > */
-static int hf_ba_ind_ba_ind = -1;
-static int hf_ba_ind_ba_ind_3g = -1;
-static int hf_gprsreportpriority_number_cells = -1;
-static int hf_gprsreportpriority_report_priority = -1;
-static int hf_offsetthreshold_reporting_offset = -1;
-static int hf_offsetthreshold_reporting_threshold = -1;
-static int hf_gprsmeasurementparams_pmo_pcco_multi_band_reporting = -1;
-static int hf_gprsmeasurementparams_pmo_pcco_serving_band_reporting = -1;
-static int hf_gprsmeasurementparams_pmo_pcco_scale_ord = -1;
+static int hf_ba_ind_ba_ind;
+static int hf_ba_ind_ba_ind_3g;
+static int hf_gprsreportpriority_number_cells;
+static int hf_gprsreportpriority_report_priority;
+static int hf_offsetthreshold_reporting_offset;
+static int hf_offsetthreshold_reporting_threshold;
+static int hf_gprsmeasurementparams_pmo_pcco_multi_band_reporting;
+static int hf_gprsmeasurementparams_pmo_pcco_serving_band_reporting;
+static int hf_gprsmeasurementparams_pmo_pcco_scale_ord;
 #if 0
-static int hf_gprsmeasurementparams3g_qsearch_p = -1;
-static int hf_gprsmeasurementparams3g_searchprio3g = -1;
-static int hf_gprsmeasurementparams3g_repquantfdd = -1;
-static int hf_gprsmeasurementparams3g_multiratreportingfdd = -1;
-static int hf_gprsmeasurementparams3g_reportingoffsetfdd = -1;
-static int hf_gprsmeasurementparams3g_reportingthresholdfdd = -1;
-static int hf_gprsmeasurementparams3g_multiratreportingtdd = -1;
-static int hf_gprsmeasurementparams3g_reportingoffsettdd = -1;
-static int hf_gprsmeasurementparams3g_reportingthresholdtdd = -1;
+static int hf_gprsmeasurementparams3g_qsearch_p;
+static int hf_gprsmeasurementparams3g_searchprio3g;
+static int hf_gprsmeasurementparams3g_repquantfdd;
+static int hf_gprsmeasurementparams3g_multiratreportingfdd;
+static int hf_gprsmeasurementparams3g_reportingoffsetfdd;
+static int hf_gprsmeasurementparams3g_reportingthresholdfdd;
+static int hf_gprsmeasurementparams3g_multiratreportingtdd;
+static int hf_gprsmeasurementparams3g_reportingoffsettdd;
+static int hf_gprsmeasurementparams3g_reportingthresholdtdd;
 #endif
-static int hf_multiratparams3g_multiratreporting = -1;
-static int hf_enh_gprsmeasurementparams3g_pmo_qsearch_p = -1;
-static int hf_enh_gprsmeasurementparams3g_pmo_searchprio3g = -1;
-static int hf_enh_gprsmeasurementparams3g_pmo_repquantfdd = -1;
-static int hf_enh_gprsmeasurementparams3g_pmo_multiratreportingfdd = -1;
-static int hf_enh_gprsmeasurementparams3g_pcco_qsearch_p = -1;
-static int hf_enh_gprsmeasurementparams3g_pcco_searchprio3g = -1;
-static int hf_enh_gprsmeasurementparams3g_pcco_repquantfdd = -1;
-static int hf_enh_gprsmeasurementparams3g_pcco_multiratreportingfdd = -1;
-static int hf_n2_removed_3gcell_index = -1;
-static int hf_n2_cell_diff_length_3g = -1;
-static int hf_n2_cell_diff = -1;
-static int hf_n2_count = -1;
-static int hf_n1_count = -1;
-static int hf_cdma2000_description_complete_this = -1;
-static int hf_utran_fdd_neighbourcells_zero = -1;
-static int hf_utran_fdd_neighbourcells_uarfcn = -1;
-static int hf_utran_fdd_neighbourcells_indic0 = -1;
-static int hf_utran_fdd_neighbourcells_nrofcells = -1;
-static int hf_utran_fdd_neighbourcells_cellinfo = -1;
-static int hf_utran_fdd_description_bandwidth = -1;
-static int hf_utran_tdd_neighbourcells_zero = -1;
-static int hf_utran_tdd_neighbourcells_uarfcn = -1;
-static int hf_utran_tdd_neighbourcells_indic0 = -1;
-static int hf_utran_tdd_neighbourcells_nrofcells = -1;
-static int hf_utran_tdd_description_bandwidth = -1;
-static int hf_index_start_3g = -1;
-static int hf_absolute_index_start_emr = -1;
-static int hf_psi3_change_mark = -1;
-static int hf_enh_measurement_parameters_pmo_pmo_ind = -1;
-static int hf_enh_measurement_parameters_pmo_report_type = -1;
-static int hf_enh_measurement_parameters_pmo_reporting_rate = -1;
-static int hf_enh_measurement_parameters_pmo_invalid_bsic_reporting = -1;
-static int hf_enh_measurement_parameters_pcco_pmo_ind = -1;
-static int hf_enh_measurement_parameters_pcco_report_type = -1;
-static int hf_enh_measurement_parameters_pcco_reporting_rate = -1;
-static int hf_enh_measurement_parameters_pcco_invalid_bsic_reporting = -1;
-static int hf_ccn_support_description_number_cells = -1;
-static int hf_ccn_supported = -1;
-static int hf_lu_modecellselectionparameters_cell_bar_qualify_3 = -1;
-static int hf_lu_modeneighbourcellparams_nr_of_frequencies = -1;
-static int hf_lu_modeonlycellselection_cell_bar_qualify_3 = -1;
-static int hf_lu_modeonlycellselection_same_ra_as_serving_cell = -1;
-static int hf_lu_modeonlycellselection_gprs_rxlev_access_min = -1;
-static int hf_lu_modeonlycellselection_gprs_ms_txpwr_max_cch = -1;
-static int hf_lu_modeonlycellselection_gprs_temporary_offset = -1;
-static int hf_lu_modeonlycellselection_gprs_penalty_time = -1;
-static int hf_lu_modeonlycellselection_gprs_reselect_offset = -1;
-static int hf_lu_modeonlycellselectionparamswithfreqdiff = -1;
-static int hf_lu_modeonlycellselectionparamswithfreqdiff_bsic = -1;
-static int hf_add_lu_modeonlyfrequencylist_start_frequency = -1;
-static int hf_add_lu_modeonlyfrequencylist_bsic = -1;
-static int hf_add_lu_modeonlyfrequencylist_nr_of_frequencies = -1;
-static int hf_add_lu_modeonlyfrequencylist_freq_diff_length = -1;
-static int hf_gprs_additionalmeasurementparams3g_fdd_reporting_threshold_2 = -1;
-static int hf_servingcellpriorityparametersdescription_geran_priority = -1;
-static int hf_servingcellpriorityparametersdescription_thresh_priority_search = -1;
-static int hf_servingcellpriorityparametersdescription_thresh_gsm_low = -1;
-static int hf_servingcellpriorityparametersdescription_h_prio = -1;
-static int hf_servingcellpriorityparametersdescription_t_reselection = -1;
-static int hf_repeatedutran_priorityparameters_utran_freq_index = -1;
-static int hf_repeatedutran_priorityparameters_utran_freq_index_exist = -1;
-static int hf_repeatedutran_priorityparameters_utran_priority = -1;
-static int hf_repeatedutran_priorityparameters_thresh_utran_high = -1;
-static int hf_repeatedutran_priorityparameters_thresh_utran_low = -1;
-static int hf_repeatedutran_priorityparameters_utran_qrxlevmin = -1;
-static int hf_priorityparametersdescription3g_pmo_default_utran_priority = -1;
-static int hf_priorityparametersdescription3g_pmo_default_thresh_utran = -1;
-static int hf_priorityparametersdescription3g_pmo_default_utran_qrxlevmin = -1;
-static int hf_eutran_reportinghreshold_offset_t_eutran_fdd_reporting_threshold = -1;
-static int hf_eutran_reportinghreshold_offset_t_eutran_fdd_reporting_threshold_2 = -1;
-static int hf_eutran_reportinghreshold_offset_t_eutran_fdd_reporting_offset = -1;
-static int hf_eutran_reportinghreshold_offset_t_eutran_tdd_reporting_threshold = -1;
-static int hf_eutran_reportinghreshold_offset_t_eutran_tdd_reporting_threshold_2 = -1;
-static int hf_eutran_reportinghreshold_offset_t_eutran_tdd_reporting_offset = -1;
-static int hf_gprs_eutran_measurementparametersdescription_qsearch_p_eutran = -1;
-static int hf_gprs_eutran_measurementparametersdescription_eutran_rep_quant = -1;
-static int hf_gprs_eutran_measurementparametersdescription_eutran_multirat_reporting = -1;
-static int hf_repeatedeutran_cells_earfcn = -1;
-static int hf_repeatedeutran_cells_measurementbandwidth = -1;
-static int hf_repeatedeutran_neighbourcells_eutran_priority = -1;
-static int hf_repeatedeutran_neighbourcells_thresh_eutran_high = -1;
-static int hf_repeatedeutran_neighbourcells_thresh_eutran_low = -1;
-static int hf_repeatedeutran_neighbourcells_eutran_qrxlevmin = -1;
-static int hf_pcid_pattern_pcid_pattern_length = -1;
-static int hf_pcid_pattern_pcid_pattern = -1;
-static int hf_pcid_pattern_pcid_pattern_sense = -1;
-static int hf_pcid_group_ie_pcid_bitmap_group = -1;
-static int hf_pcid_group_ie_pcid = -1;
-static int hf_pcid_group_ie_pcid_exist = -1;
-static int hf_eutran_frequency_index_eutran_frequency_index = -1;
-static int hf_eutran_parametersdescription_pmo_eutran_ccn_active = -1;
-static int hf_psc_pattern_sense = -1;
-static int hf_psc_pattern_length = -1;
-static int hf_psc_pattern = -1;
-static int hf_psc_group_psc = -1;
-static int hf_psc_group_psc_exist = -1;
-static int hf_three3_csg_description_body_utran_freq_index = -1;
-static int hf_three3_csg_description_body_utran_freq_index_exist = -1;
-static int hf_eutran_csg_description_body_eutran_freq_index = -1;
-static int hf_eutran_csg_description_body_eutran_freq_index_exist = -1;
-static int hf_meas_ctrl_param_meas_ctrl_eutran = -1;
-static int hf_meas_ctrl_param_eutran_freq_idx = -1;
-static int hf_meas_ctrl_param_eutran_freq_idx_exist = -1;
-static int hf_meas_ctrl_param_meas_ctrl_utran = -1;
-static int hf_meas_ctrl_param_utran_freq_idx = -1;
-static int hf_meas_ctrl_param_utran_freq_idx_exist = -1;
-static int hf_rept_eutran_enh_cell_resel_param_eutran_qmin = -1;
-static int hf_rept_eutran_enh_cell_resel_param_eutran_freq_index = -1;
-static int hf_rept_eutran_enh_cell_resel_param_eutran_freq_index_exist = -1;
-static int hf_rept_eutran_enh_cell_resel_param_thresh_eutran_high_q = -1;
-static int hf_rept_eutran_enh_cell_resel_param_thresh_eutran_low_q = -1;
-static int hf_rept_eutran_enh_cell_resel_param_thresh_eutran_qqualmin = -1;
-static int hf_rept_eutran_enh_cell_resel_param_thresh_eutran_rsrpmin = -1;
-
-static int hf_utran_csg_fdd_reporting_threshold = -1;
-static int hf_utran_csg_fdd_reporting_threshold2 = -1;
-static int hf_utran_csg_tdd_reporting_threshold = -1;
-static int hf_eutran_csg_fdd_reporting_threshold = -1;
-static int hf_eutran_csg_fdd_reporting_threshold2 = -1;
-static int hf_eutran_csg_tdd_reporting_threshold = -1;
-static int hf_eutran_csg_tdd_reporting_threshold2 = -1;
-
-
-static int hf_pmo_additionsr8_ba_ind_3g = -1;
-static int hf_pmo_additionsr8_pmo_ind = -1;
-static int hf_pmo_additionsr7_reporting_offset_700 = -1;
-static int hf_pmo_additionsr7_reporting_threshold_700 = -1;
-static int hf_pmo_additionsr7_reporting_offset_810 = -1;
-static int hf_pmo_additionsr7_reporting_threshold_810 = -1;
-static int hf_pmo_additionsr6_ccn_active_3g = -1;
-static int hf_pcco_additionsr6_ccn_active_3g = -1;
-static int hf_pmo_additionsr5_grnti = -1;
-static int hf_pcco_additionsr5_grnti = -1;
-static int hf_pmo_additionsr4_ccn_active = -1;
-static int hf_pcco_additionsr4_ccn_active = -1;
-static int hf_pcco_additionsr4_container_id = -1;
-static int hf_lsa_id_info_element_lsa_id = -1;
-static int hf_lsa_id_info_element_shortlsa_id = -1;
-static int hf_lsa_parameters_nr_of_freq_or_cells = -1;
-static int hf_target_cell_gsm_immediate_rel = -1;
-static int hf_target_cell_gsm_bsic = -1;
-static int hf_target_cell_3g_immediate_rel = -1;
-static int hf_target_cell_eutran_earfcn = -1;
-static int hf_target_cell_eutran_measurement_bandwidth = -1;
-static int hf_target_cell_eutran_pl_cell_id = -1;
-static int hf_idvd_utran_priority_fdd_arfcn = -1;
-static int hf_idvd_utran_priority_fdd_arfcn_exist = -1;
-static int hf_idvd_utran_priority_tdd_arfcn = -1;
-static int hf_idvd_utran_priority_tdd_arfcn_exist = -1;
-static int hf_idvd_default_utran_priority = -1;
-static int hf_idvd_utran_priority = -1;
-static int hf_idvd_default_eutran_priority = -1;
-static int hf_idvd_eutran_priority = -1;
-static int hf_idvd_eutran_priority_earfcn = -1;
-static int hf_idvd_eutran_priority_earfcn_exist = -1;
-static int hf_idvd_prio_geran_priority = -1;
-static int hf_idvd_prio_t3230_timeout_value = -1;
-static int hf_target_cell_g_rnti_ext = -1;
+static int hf_multiratparams3g_multiratreporting;
+static int hf_enh_gprsmeasurementparams3g_pmo_qsearch_p;
+static int hf_enh_gprsmeasurementparams3g_pmo_searchprio3g;
+static int hf_enh_gprsmeasurementparams3g_pmo_repquantfdd;
+static int hf_enh_gprsmeasurementparams3g_pmo_multiratreportingfdd;
+static int hf_enh_gprsmeasurementparams3g_pcco_qsearch_p;
+static int hf_enh_gprsmeasurementparams3g_pcco_searchprio3g;
+static int hf_enh_gprsmeasurementparams3g_pcco_repquantfdd;
+static int hf_enh_gprsmeasurementparams3g_pcco_multiratreportingfdd;
+static int hf_n2_removed_3gcell_index;
+static int hf_n2_cell_diff_length_3g;
+static int hf_n2_cell_diff;
+static int hf_n2_count;
+static int hf_n1_count;
+static int hf_cdma2000_description_complete_this;
+static int hf_utran_fdd_neighbourcells_zero;
+static int hf_utran_fdd_neighbourcells_uarfcn;
+static int hf_utran_fdd_neighbourcells_indic0;
+static int hf_utran_fdd_neighbourcells_nrofcells;
+static int hf_utran_fdd_neighbourcells_cellinfo;
+static int hf_utran_fdd_description_bandwidth;
+static int hf_utran_tdd_neighbourcells_zero;
+static int hf_utran_tdd_neighbourcells_uarfcn;
+static int hf_utran_tdd_neighbourcells_indic0;
+static int hf_utran_tdd_neighbourcells_nrofcells;
+static int hf_utran_tdd_description_bandwidth;
+static int hf_index_start_3g;
+static int hf_absolute_index_start_emr;
+static int hf_psi3_change_mark;
+static int hf_enh_measurement_parameters_pmo_pmo_ind;
+static int hf_enh_measurement_parameters_pmo_report_type;
+static int hf_enh_measurement_parameters_pmo_reporting_rate;
+static int hf_enh_measurement_parameters_pmo_invalid_bsic_reporting;
+static int hf_enh_measurement_parameters_pcco_pmo_ind;
+static int hf_enh_measurement_parameters_pcco_report_type;
+static int hf_enh_measurement_parameters_pcco_reporting_rate;
+static int hf_enh_measurement_parameters_pcco_invalid_bsic_reporting;
+static int hf_ccn_support_description_number_cells;
+static int hf_ccn_supported;
+static int hf_lu_modecellselectionparameters_cell_bar_qualify_3;
+static int hf_lu_modeneighbourcellparams_nr_of_frequencies;
+static int hf_lu_modeonlycellselection_cell_bar_qualify_3;
+static int hf_lu_modeonlycellselection_same_ra_as_serving_cell;
+static int hf_lu_modeonlycellselection_gprs_rxlev_access_min;
+static int hf_lu_modeonlycellselection_gprs_ms_txpwr_max_cch;
+static int hf_lu_modeonlycellselection_gprs_temporary_offset;
+static int hf_lu_modeonlycellselection_gprs_penalty_time;
+static int hf_lu_modeonlycellselection_gprs_reselect_offset;
+static int hf_lu_modeonlycellselectionparamswithfreqdiff;
+static int hf_lu_modeonlycellselectionparamswithfreqdiff_bsic;
+static int hf_add_lu_modeonlyfrequencylist_start_frequency;
+static int hf_add_lu_modeonlyfrequencylist_bsic;
+static int hf_add_lu_modeonlyfrequencylist_nr_of_frequencies;
+static int hf_add_lu_modeonlyfrequencylist_freq_diff_length;
+static int hf_gprs_additionalmeasurementparams3g_fdd_reporting_threshold_2;
+static int hf_servingcellpriorityparametersdescription_geran_priority;
+static int hf_servingcellpriorityparametersdescription_thresh_priority_search;
+static int hf_servingcellpriorityparametersdescription_thresh_gsm_low;
+static int hf_servingcellpriorityparametersdescription_h_prio;
+static int hf_servingcellpriorityparametersdescription_t_reselection;
+static int hf_repeatedutran_priorityparameters_utran_freq_index;
+static int hf_repeatedutran_priorityparameters_utran_freq_index_exist;
+static int hf_repeatedutran_priorityparameters_utran_priority;
+static int hf_repeatedutran_priorityparameters_thresh_utran_high;
+static int hf_repeatedutran_priorityparameters_thresh_utran_low;
+static int hf_repeatedutran_priorityparameters_utran_qrxlevmin;
+static int hf_priorityparametersdescription3g_pmo_default_utran_priority;
+static int hf_priorityparametersdescription3g_pmo_default_thresh_utran;
+static int hf_priorityparametersdescription3g_pmo_default_utran_qrxlevmin;
+static int hf_eutran_reportinghreshold_offset_t_eutran_fdd_reporting_threshold;
+static int hf_eutran_reportinghreshold_offset_t_eutran_fdd_reporting_threshold_2;
+static int hf_eutran_reportinghreshold_offset_t_eutran_fdd_reporting_offset;
+static int hf_eutran_reportinghreshold_offset_t_eutran_tdd_reporting_threshold;
+static int hf_eutran_reportinghreshold_offset_t_eutran_tdd_reporting_threshold_2;
+static int hf_eutran_reportinghreshold_offset_t_eutran_tdd_reporting_offset;
+static int hf_gprs_eutran_measurementparametersdescription_qsearch_p_eutran;
+static int hf_gprs_eutran_measurementparametersdescription_eutran_rep_quant;
+static int hf_gprs_eutran_measurementparametersdescription_eutran_multirat_reporting;
+static int hf_repeatedeutran_cells_earfcn;
+static int hf_repeatedeutran_cells_measurementbandwidth;
+static int hf_repeatedeutran_neighbourcells_eutran_priority;
+static int hf_repeatedeutran_neighbourcells_thresh_eutran_high;
+static int hf_repeatedeutran_neighbourcells_thresh_eutran_low;
+static int hf_repeatedeutran_neighbourcells_eutran_qrxlevmin;
+static int hf_pcid_pattern_pcid_pattern_length;
+static int hf_pcid_pattern_pcid_pattern;
+static int hf_pcid_pattern_pcid_pattern_sense;
+static int hf_pcid_group_ie_pcid_bitmap_group;
+static int hf_pcid_group_ie_pcid;
+static int hf_pcid_group_ie_pcid_exist;
+static int hf_eutran_frequency_index_eutran_frequency_index;
+static int hf_eutran_parametersdescription_pmo_eutran_ccn_active;
+static int hf_psc_pattern_sense;
+static int hf_psc_pattern_length;
+static int hf_psc_pattern;
+static int hf_psc_group_psc;
+static int hf_psc_group_psc_exist;
+static int hf_three3_csg_description_body_utran_freq_index;
+static int hf_three3_csg_description_body_utran_freq_index_exist;
+static int hf_eutran_csg_description_body_eutran_freq_index;
+static int hf_eutran_csg_description_body_eutran_freq_index_exist;
+static int hf_meas_ctrl_param_meas_ctrl_eutran;
+static int hf_meas_ctrl_param_eutran_freq_idx;
+static int hf_meas_ctrl_param_eutran_freq_idx_exist;
+static int hf_meas_ctrl_param_meas_ctrl_utran;
+static int hf_meas_ctrl_param_utran_freq_idx;
+static int hf_meas_ctrl_param_utran_freq_idx_exist;
+static int hf_rept_eutran_enh_cell_resel_param_eutran_qmin;
+static int hf_rept_eutran_enh_cell_resel_param_eutran_freq_index;
+static int hf_rept_eutran_enh_cell_resel_param_eutran_freq_index_exist;
+static int hf_rept_eutran_enh_cell_resel_param_thresh_eutran_high_q;
+static int hf_rept_eutran_enh_cell_resel_param_thresh_eutran_low_q;
+static int hf_rept_eutran_enh_cell_resel_param_thresh_eutran_qqualmin;
+static int hf_rept_eutran_enh_cell_resel_param_thresh_eutran_rsrpmin;
+
+static int hf_utran_csg_fdd_reporting_threshold;
+static int hf_utran_csg_fdd_reporting_threshold2;
+static int hf_utran_csg_tdd_reporting_threshold;
+static int hf_eutran_csg_fdd_reporting_threshold;
+static int hf_eutran_csg_fdd_reporting_threshold2;
+static int hf_eutran_csg_tdd_reporting_threshold;
+static int hf_eutran_csg_tdd_reporting_threshold2;
+
+
+static int hf_pmo_additionsr8_ba_ind_3g;
+static int hf_pmo_additionsr8_pmo_ind;
+static int hf_pmo_additionsr7_reporting_offset_700;
+static int hf_pmo_additionsr7_reporting_threshold_700;
+static int hf_pmo_additionsr7_reporting_offset_810;
+static int hf_pmo_additionsr7_reporting_threshold_810;
+static int hf_pmo_additionsr6_ccn_active_3g;
+static int hf_pcco_additionsr6_ccn_active_3g;
+static int hf_pmo_additionsr5_grnti;
+static int hf_pcco_additionsr5_grnti;
+static int hf_pmo_additionsr4_ccn_active;
+static int hf_pcco_additionsr4_ccn_active;
+static int hf_pcco_additionsr4_container_id;
+static int hf_lsa_id_info_element_lsa_id;
+static int hf_lsa_id_info_element_shortlsa_id;
+static int hf_lsa_parameters_nr_of_freq_or_cells;
+static int hf_target_cell_gsm_immediate_rel;
+static int hf_target_cell_gsm_bsic;
+static int hf_target_cell_3g_immediate_rel;
+static int hf_target_cell_eutran_earfcn;
+static int hf_target_cell_eutran_measurement_bandwidth;
+static int hf_target_cell_eutran_pl_cell_id;
+static int hf_idvd_utran_priority_fdd_arfcn;
+static int hf_idvd_utran_priority_fdd_arfcn_exist;
+static int hf_idvd_utran_priority_tdd_arfcn;
+static int hf_idvd_utran_priority_tdd_arfcn_exist;
+static int hf_idvd_default_utran_priority;
+static int hf_idvd_utran_priority;
+static int hf_idvd_default_eutran_priority;
+static int hf_idvd_eutran_priority;
+static int hf_idvd_eutran_priority_earfcn;
+static int hf_idvd_eutran_priority_earfcn_exist;
+static int hf_idvd_prio_geran_priority;
+static int hf_idvd_prio_t3230_timeout_value;
+static int hf_target_cell_g_rnti_ext;
 
 
 
 /* < Packet (Enhanced) Measurement Report message contents > */
-static int hf_ba_used_ba_used = -1;
-static int hf_ba_used_ba_used_3g = -1;
-static int hf_serving_cell_data_rxlev_serving_cell = -1;
-static int hf_nc_measurements_frequency_n = -1;
-static int hf_nc_measurements_bsic_n = -1;
-static int hf_nc_measurements_rxlev_n = -1;
-static int hf_repeatedinvalid_bsic_info_bcch_freq_n = -1;
-static int hf_repeatedinvalid_bsic_info_bsic_n = -1;
-static int hf_repeatedinvalid_bsic_info_rxlev_n = -1;
-static int hf_reporting_quantity_instance_reporting_quantity = -1;
-static int hf_pemr_additionsr8_bitmap_length = -1;
-static int hf_nc_measurement_report_nc_mode = -1;
-static int hf_nc_measurement_report_number_of_nc_measurements = -1;
-static int hf_enh_nc_measurement_report_nc_mode = -1;
-static int hf_enh_nc_measurement_report_pmo_used = -1;
-static int hf_enh_nc_measurement_report_bsic_seen = -1;
-static int hf_enh_nc_measurement_report_scale = -1;
-static int hf_ext_measurement_report_ext_reporting_type = -1;
-static int hf_ext_measurement_report_slot0_i_level = -1;
-static int hf_ext_measurement_report_slot1_i_level = -1;
-static int hf_ext_measurement_report_slot2_i_level = -1;
-static int hf_ext_measurement_report_slot3_i_level = -1;
-static int hf_ext_measurement_report_slot4_i_level = -1;
-static int hf_ext_measurement_report_slot5_i_level = -1;
-static int hf_ext_measurement_report_slot6_i_level = -1;
-static int hf_ext_measurement_report_slot7_i_level = -1;
-static int hf_ext_measurement_report_number_of_ext_measurements = -1;
-static int hf_measurements_3g_cell_list_index_3g = -1;
-static int hf_measurements_3g_reporting_quantity = -1;
-static int hf_pmr_additionsr99_pmo_used = -1;
-static int hf_pmr_additionsr99_n_3g = -1;
-static int hf_pmr_eutran_meas_rpt_freq_idx = -1;
-static int hf_pmr_eutran_meas_rpt_cell_id = -1;
-static int hf_pmr_eutran_meas_rpt_quantity = -1;
-static int hf_eutran_measurement_report_num_eutran = -1;
+static int hf_ba_used_ba_used;
+static int hf_ba_used_ba_used_3g;
+static int hf_serving_cell_data_rxlev_serving_cell;
+static int hf_nc_measurements_frequency_n;
+static int hf_nc_measurements_bsic_n;
+static int hf_nc_measurements_rxlev_n;
+static int hf_repeatedinvalid_bsic_info_bcch_freq_n;
+static int hf_repeatedinvalid_bsic_info_bsic_n;
+static int hf_repeatedinvalid_bsic_info_rxlev_n;
+static int hf_reporting_quantity_instance_reporting_quantity;
+static int hf_pemr_additionsr8_bitmap_length;
+static int hf_nc_measurement_report_nc_mode;
+static int hf_nc_measurement_report_number_of_nc_measurements;
+static int hf_enh_nc_measurement_report_nc_mode;
+static int hf_enh_nc_measurement_report_pmo_used;
+static int hf_enh_nc_measurement_report_bsic_seen;
+static int hf_enh_nc_measurement_report_scale;
+static int hf_ext_measurement_report_ext_reporting_type;
+static int hf_ext_measurement_report_slot0_i_level;
+static int hf_ext_measurement_report_slot1_i_level;
+static int hf_ext_measurement_report_slot2_i_level;
+static int hf_ext_measurement_report_slot3_i_level;
+static int hf_ext_measurement_report_slot4_i_level;
+static int hf_ext_measurement_report_slot5_i_level;
+static int hf_ext_measurement_report_slot6_i_level;
+static int hf_ext_measurement_report_slot7_i_level;
+static int hf_ext_measurement_report_number_of_ext_measurements;
+static int hf_measurements_3g_cell_list_index_3g;
+static int hf_measurements_3g_reporting_quantity;
+static int hf_pmr_additionsr99_pmo_used;
+static int hf_pmr_additionsr99_n_3g;
+static int hf_pmr_eutran_meas_rpt_freq_idx;
+static int hf_pmr_eutran_meas_rpt_cell_id;
+static int hf_pmr_eutran_meas_rpt_quantity;
+static int hf_eutran_measurement_report_num_eutran;
 #if 0
-static int hf_emr_servingcell_dtx_used = -1;
-static int hf_emr_servingcell_rxlev_val = -1;
-static int hf_emr_servingcell_rx_qual_full = -1;
-static int hf_emr_servingcell_mean_bep = -1;
-static int hf_emr_servingcell_cv_bep = -1;
-static int hf_emr_servingcell_nbr_rcvd_blocks = -1;
+static int hf_emr_servingcell_dtx_used;
+static int hf_emr_servingcell_rxlev_val;
+static int hf_emr_servingcell_rx_qual_full;
+static int hf_emr_servingcell_mean_bep;
+static int hf_emr_servingcell_cv_bep;
+static int hf_emr_servingcell_nbr_rcvd_blocks;
 #endif
 #if 0
-static int hf_enhancedmeasurementreport_rr_short_pd = -1;
-static int hf_enhancedmeasurementreport_message_type = -1;
-static int hf_enhancedmeasurementreport_shortlayer2_header = -1;
-static int hf_enhancedmeasurementreport_bsic_seen = -1;
-static int hf_enhancedmeasurementreport_scale = -1;
+static int hf_enhancedmeasurementreport_rr_short_pd;
+static int hf_enhancedmeasurementreport_message_type;
+static int hf_enhancedmeasurementreport_shortlayer2_header;
+static int hf_enhancedmeasurementreport_bsic_seen;
+static int hf_enhancedmeasurementreport_scale;
 #endif
-static int hf_packet_measurement_report_psi5_change_mark = -1;
+static int hf_packet_measurement_report_psi5_change_mark;
 
 /* < Packet Measurement Order message contents > */
 #if 0
-static int hf_ext_frequency_list_start_frequency = -1;
-static int hf_ext_frequency_list_nr_of_frequencies = -1;
-static int hf_ext_frequency_list_freq_diff_length = -1;
+static int hf_ext_frequency_list_start_frequency;
+static int hf_ext_frequency_list_nr_of_frequencies;
+static int hf_ext_frequency_list_freq_diff_length;
 #endif
-static int hf_packet_measurement_order_pmo_index = -1;
-static int hf_packet_measurement_order_pmo_count = -1;
-static int hf_ccn_measurement_report_rxlev_serving_cell = -1;
-static int hf_ccn_measurement_report_number_of_nc_measurements = -1;
-static int hf_target_cell_gsm_notif_bsic = -1;
-static int hf_fdd_target_cell_notif_fdd_arfcn = -1;
-static int hf_fdd_target_cell_notif_bandwith_fdd = -1;
-static int hf_fdd_target_cell_notif_scrambling_code = -1;
-static int hf_target_cell_3g_notif_reporting_quantity = -1;
-static int hf_pccn_additionsr6_ba_used_3g = -1;
-static int hf_pccn_additionsr6_n_3g = -1;
+static int hf_packet_measurement_order_pmo_index;
+static int hf_packet_measurement_order_pmo_count;
+static int hf_ccn_measurement_report_rxlev_serving_cell;
+static int hf_ccn_measurement_report_number_of_nc_measurements;
+static int hf_target_cell_gsm_notif_bsic;
+static int hf_fdd_target_cell_notif_fdd_arfcn;
+static int hf_fdd_target_cell_notif_bandwith_fdd;
+static int hf_fdd_target_cell_notif_scrambling_code;
+static int hf_target_cell_3g_notif_reporting_quantity;
+static int hf_pccn_additionsr6_ba_used_3g;
+static int hf_pccn_additionsr6_n_3g;
 
 /* < Packet Cell Change Notification message contents > */
-static int hf_packet_cell_change_notification_ba_ind = -1;
-static int hf_packet_cell_change_notification_pmo_used = -1;
-static int hf_packet_cell_change_notification_pccn_sending = -1;
-static int hf_packet_cell_change_notification_lte_reporting_quantity = -1;
-static int hf_eutran_ccn_meas_rpt_3g_ba_used = -1;
-static int hf_eutran_ccn_meas_rpt_num_eutran = -1;
-static int hf_eutran_ccn_meas_rpt_freq_idx = -1;
-static int hf_eutran_ccn_meas_cell_id = -1;
-static int hf_eutran_ccn_meas_rpt_quantity = -1;
-static int hf_utran_csg_meas_rpt_cgi = -1;
-static int hf_utran_csg_meas_rpt_csg_id = -1;
-static int hf_utran_csg_meas_rpt_access_mode = -1;
-static int hf_utran_csg_meas_rpt_quantity = -1;
-static int hf_eutran_csg_meas_rpt_cgi = -1;
-static int hf_eutran_csg_meas_rpt_ta = -1;
-static int hf_eutran_csg_meas_rpt_csg_id = -1;
-static int hf_eutran_csg_meas_rpt_access_mode = -1;
-static int hf_eutran_csg_meas_rpt_quantity = -1;
+static int hf_packet_cell_change_notification_ba_ind;
+static int hf_packet_cell_change_notification_pmo_used;
+static int hf_packet_cell_change_notification_pccn_sending;
+static int hf_packet_cell_change_notification_lte_reporting_quantity;
+static int hf_eutran_ccn_meas_rpt_3g_ba_used;
+static int hf_eutran_ccn_meas_rpt_num_eutran;
+static int hf_eutran_ccn_meas_rpt_freq_idx;
+static int hf_eutran_ccn_meas_cell_id;
+static int hf_eutran_ccn_meas_rpt_quantity;
+static int hf_utran_csg_meas_rpt_cgi;
+static int hf_utran_csg_meas_rpt_csg_id;
+static int hf_utran_csg_meas_rpt_access_mode;
+static int hf_utran_csg_meas_rpt_quantity;
+static int hf_eutran_csg_meas_rpt_cgi;
+static int hf_eutran_csg_meas_rpt_ta;
+static int hf_eutran_csg_meas_rpt_csg_id;
+static int hf_eutran_csg_meas_rpt_access_mode;
+static int hf_eutran_csg_meas_rpt_quantity;
 
 
 
 /* < Packet Cell Change Continue message contents > */
-static int hf_packet_cell_change_continue_arfcn = -1;
-static int hf_packet_cell_change_continue_bsic = -1;
-static int hf_packet_cell_change_continue_container_id = -1;
+static int hf_packet_cell_change_continue_arfcn;
+static int hf_packet_cell_change_continue_bsic;
+static int hf_packet_cell_change_continue_container_id;
 
 /* < Packet Neighbour Cell Data message contents > */
-static int hf_pncd_container_with_id_bsic = -1;
-static int hf_pncd_container_choice = -1;
-static int hf_pncd_container_with_id_container = -1;
-static int hf_pncd_container_without_id_container = -1;
-static int hf_packet_neighbour_cell_data_container_id = -1;
-static int hf_packet_neighbour_cell_data_spare = -1;
-static int hf_packet_neighbour_cell_data_container_index = -1;
+static int hf_pncd_container_with_id_bsic;
+static int hf_pncd_container_choice;
+static int hf_pncd_container_with_id_container;
+static int hf_pncd_container_without_id_container;
+static int hf_packet_neighbour_cell_data_container_id;
+static int hf_packet_neighbour_cell_data_spare;
+static int hf_packet_neighbour_cell_data_container_index;
 
 /* < Packet Serving Cell Data message contents > */
-static int hf_packet_serving_cell_data_spare = -1;
-static int hf_packet_serving_cell_data_container_index = -1;
-static int hf_packet_serving_cell_data_container = -1;
+static int hf_packet_serving_cell_data_spare;
+static int hf_packet_serving_cell_data_container_index;
+static int hf_packet_serving_cell_data_container;
 #if 0
-static int hf_servingcelldata_rxlev_serving_cell = -1;
-static int hf_repeated_invalid_bsic_info_bcch_freq_ncell = -1;
-static int hf_repeated_invalid_bsic_info_bsic = -1;
-static int hf_repeated_invalid_bsic_info_rxlev_ncell = -1;
-static int hf_reporting_quantity_reporting_quantity = -1;
-static int hf_nc_measurementreport_nc_mode = -1;
-static int hf_nc_measurementreport_pmo_used = -1;
-static int hf_nc_measurementreport_scale = -1;
+static int hf_servingcelldata_rxlev_serving_cell;
+static int hf_repeated_invalid_bsic_info_bcch_freq_ncell;
+static int hf_repeated_invalid_bsic_info_bsic;
+static int hf_repeated_invalid_bsic_info_rxlev_ncell;
+static int hf_reporting_quantity_reporting_quantity;
+static int hf_nc_measurementreport_nc_mode;
+static int hf_nc_measurementreport_pmo_used;
+static int hf_nc_measurementreport_scale;
 #endif
 
 /* < Packet Handover Command message content > */
-static int hf_globaltimeslotdescription_ms_timeslotallocation = -1;
-static int hf_pho_usf_1_7_usf = -1;
-static int hf_usf_allocationarray_usf_0 = -1;
-static int hf_egprs_description_linkqualitymeasurementmode = -1;
-static int hf_nas_container_for_ps_ho_containerlength = -1;
-static int hf_nas_container_for_ps_ho_spare = -1;
-static int hf_nas_container_for_ps_ho_old_xid = -1;
-static int hf_nas_container_for_ps_ho_type_of_ciphering = -1;
-static int hf_nas_container_for_ps_ho_iov_ui_value = -1;
-static int hf_ps_handoverto_utran_payload_rrc_containerlength = -1;
-static int hf_ps_handoverto_utran_payload_rrc_container = -1;
-static int hf_ps_handoverto_eutran_payload_rrc_containerlength = -1;
-static int hf_ps_handoverto_eutran_payload_rrc_container = -1;
-static int hf_pho_radioresources_handoverreference = -1;
-static int hf_pho_radioresources_si = -1;
-static int hf_pho_radioresources_nci = -1;
-static int hf_pho_radioresources_bsic = -1;
-static int hf_pho_radioresources_ccn_active = -1;
-static int hf_pho_radioresources_ccn_active_3g = -1;
-static int hf_pho_radioresources_networkcontrolorder = -1;
-static int hf_pho_radioresources_rlc_reset = -1;
-static int hf_pho_radioresources_uplinkcontroltimeslot = -1;
-static int hf_packet_handover_command_containerid = -1;
+static int hf_globaltimeslotdescription_ms_timeslotallocation;
+static int hf_pho_usf_1_7_usf;
+static int hf_usf_allocationarray_usf_0;
+static int hf_egprs_description_linkqualitymeasurementmode;
+static int hf_nas_container_for_ps_ho_containerlength;
+static int hf_nas_container_for_ps_ho_spare;
+static int hf_nas_container_for_ps_ho_old_xid;
+static int hf_nas_container_for_ps_ho_type_of_ciphering;
+static int hf_nas_container_for_ps_ho_iov_ui_value;
+static int hf_ps_handoverto_utran_payload_rrc_containerlength;
+static int hf_ps_handoverto_utran_payload_rrc_container;
+static int hf_ps_handoverto_eutran_payload_rrc_containerlength;
+static int hf_ps_handoverto_eutran_payload_rrc_container;
+static int hf_pho_radioresources_handoverreference;
+static int hf_pho_radioresources_si;
+static int hf_pho_radioresources_nci;
+static int hf_pho_radioresources_bsic;
+static int hf_pho_radioresources_ccn_active;
+static int hf_pho_radioresources_ccn_active_3g;
+static int hf_pho_radioresources_networkcontrolorder;
+static int hf_pho_radioresources_rlc_reset;
+static int hf_pho_radioresources_uplinkcontroltimeslot;
+static int hf_packet_handover_command_containerid;
 
 /* < End Packet Handover Command > */
 
@@ -1060,656 +1060,656 @@ static int hf_packet_handover_command_containerid = -1;
 /* < End Packet Pause > */
 
 /* < Packet System Information Type 1 > */
-static int hf_packet_system_info_type1_pbcch_change_mark = -1;
-static int hf_packet_system_info_type1_psi_change_field = -1;
-static int hf_packet_system_info_type1_psi1_repeat_period = -1;
-static int hf_packet_system_info_type1_psi_count_lr = -1;
-static int hf_packet_system_info_type1_psi_count_hr = -1;
-static int hf_packet_system_info_type1_measurement_order = -1;
-static int hf_packet_system_info_type1_psi_status_ind = -1;
-static int hf_packet_system_info_type1_mscr = -1;
-static int hf_packet_system_info_type1_band_indicator = -1;
-static int hf_packet_system_info_type1_lb_ms_txpwr_max_ccch = -1;
-static int hf_rai = -1;
-static int hf_pccch_org_bs_pcc_rel = -1;
-static int hf_pccch_org_pbcch_blks = -1;
-static int hf_pccch_org_pag_blks_res = -1;
-static int hf_pccch_org_prach_blks = -1;
+static int hf_packet_system_info_type1_pbcch_change_mark;
+static int hf_packet_system_info_type1_psi_change_field;
+static int hf_packet_system_info_type1_psi1_repeat_period;
+static int hf_packet_system_info_type1_psi_count_lr;
+static int hf_packet_system_info_type1_psi_count_hr;
+static int hf_packet_system_info_type1_measurement_order;
+static int hf_packet_system_info_type1_psi_status_ind;
+static int hf_packet_system_info_type1_mscr;
+static int hf_packet_system_info_type1_band_indicator;
+static int hf_packet_system_info_type1_lb_ms_txpwr_max_ccch;
+static int hf_rai;
+static int hf_pccch_org_bs_pcc_rel;
+static int hf_pccch_org_pbcch_blks;
+static int hf_pccch_org_pag_blks_res;
+static int hf_pccch_org_prach_blks;
 /* <End Packet System Information Type 1> */
 
 /* <Packet System Information Type 2> */
-static int hf_packet_system_info_type2_change_mark = -1;
-static int hf_packet_system_info_type2_index = -1;
-static int hf_packet_system_info_type2_count = -1;
-static int hf_packet_system_info_type2_ref_freq_num = -1;
-static int hf_packet_system_info_type2_ref_freq_length = -1;
-static int hf_packet_system_info_type2_ref_freq = -1;
-static int hf_packet_system_info_type2_ma_number = -1;
-static int hf_tsc = -1;
-static int hf_packet_system_info_type2_non_hopping_timeslot = -1;
-static int hf_packet_system_info_type2_hopping_ma_num = -1;
-static int hf_packet_system_info_type2_hopping_timeslot = -1;
-
-static int hf_packet_cell_id_cell_identity = -1;
-static int hf_packet_lai_lac = -1;
-static int hf_packet_plmn_mcc1 = -1;
-static int hf_packet_plmn_mcc2 = -1;
-static int hf_packet_plmn_mcc3 = -1;
-static int hf_packet_plmn_mnc1 = -1;
-static int hf_packet_plmn_mnc2 = -1;
-static int hf_packet_plmn_mnc3 = -1;
-static int hf_packet_non_gprs_cell_opt_att = -1;
-static int hf_packet_non_gprs_cell_opt_t3212 = -1;
-static int hf_packet_non_gprs_cell_opt_neci = -1;
-static int hf_packet_non_gprs_cell_opt_pwrc = -1;
-static int hf_packet_non_gprs_cell_opt_dtx = -1;
-static int hf_packet_non_gprs_cell_opt_radio_link_timeout = -1;
-static int hf_packet_non_gprs_cell_opt_bs_ag_blks_res = -1;
-static int hf_packet_non_gprs_cell_opt_ccch_conf = -1;
-static int hf_packet_non_gprs_cell_opt_bs_pa_mfrms = -1;
-static int hf_packet_non_gprs_cell_opt_max_retrans = -1;
-static int hf_packet_non_gprs_cell_opt_tx_int = -1;
-static int hf_packet_non_gprs_cell_opt_ec = -1;
-static int hf_packet_non_gprs_cell_opt_ms_txpwr_max_ccch = -1;
-/* static int hf_packet_non_gprs_cell_opt_ext_len = -1; */
+static int hf_packet_system_info_type2_change_mark;
+static int hf_packet_system_info_type2_index;
+static int hf_packet_system_info_type2_count;
+static int hf_packet_system_info_type2_ref_freq_num;
+static int hf_packet_system_info_type2_ref_freq_length;
+static int hf_packet_system_info_type2_ref_freq;
+static int hf_packet_system_info_type2_ma_number;
+static int hf_tsc;
+static int hf_packet_system_info_type2_non_hopping_timeslot;
+static int hf_packet_system_info_type2_hopping_ma_num;
+static int hf_packet_system_info_type2_hopping_timeslot;
+
+static int hf_packet_cell_id_cell_identity;
+static int hf_packet_lai_lac;
+static int hf_packet_plmn_mcc1;
+static int hf_packet_plmn_mcc2;
+static int hf_packet_plmn_mcc3;
+static int hf_packet_plmn_mnc1;
+static int hf_packet_plmn_mnc2;
+static int hf_packet_plmn_mnc3;
+static int hf_packet_non_gprs_cell_opt_att;
+static int hf_packet_non_gprs_cell_opt_t3212;
+static int hf_packet_non_gprs_cell_opt_neci;
+static int hf_packet_non_gprs_cell_opt_pwrc;
+static int hf_packet_non_gprs_cell_opt_dtx;
+static int hf_packet_non_gprs_cell_opt_radio_link_timeout;
+static int hf_packet_non_gprs_cell_opt_bs_ag_blks_res;
+static int hf_packet_non_gprs_cell_opt_ccch_conf;
+static int hf_packet_non_gprs_cell_opt_bs_pa_mfrms;
+static int hf_packet_non_gprs_cell_opt_max_retrans;
+static int hf_packet_non_gprs_cell_opt_tx_int;
+static int hf_packet_non_gprs_cell_opt_ec;
+static int hf_packet_non_gprs_cell_opt_ms_txpwr_max_ccch;
+/* static int hf_packet_non_gprs_cell_opt_ext_len; */
 /* <End Packet System Information Type 2> */
 
 
 /* <Packet System Information Type 3> */
-static int hf_packet_system_info_type3_change_mark = -1;
-static int hf_packet_system_info_type3_bis_count = -1;
-
-static int hf_exc_acc = -1;
-static int hf_packet_scell_param_gprs_rxlev_access_min = -1;
-static int hf_packet_scell_param_gprs_ms_txpwr_max_cch = -1;
-static int hf_packet_scell_param_multiband_reporting = -1;
-
-static int hf_packet_gen_cell_sel_gprs_cell_resl_hyst = -1;
-static int hf_packet_gen_cell_sel_c31_hyst = -1;
-static int hf_packet_gen_cell_sel_c32_qual = -1;
-static int hf_packet_gen_cell_sel_t_resel = -1;
-static int hf_packet_gen_cell_sel_ra_resel_hyst = -1;
-
-static int hf_packet_compact_cell_sel_bsic = -1;
-static int hf_packet_compact_cell_sel_same_as_scell = -1;
-static int hf_packet_compact_cell_sel_gprs_rxlev_access_min = -1;
-static int hf_packet_compact_cell_sel_gprs_ms_txpwr_max_cch = -1;
-static int hf_packet_compact_cell_sel_gprs_temp_offset = -1;
-static int hf_packet_compact_cell_sel_gprs_penalty_time = -1;
-static int hf_packet_compact_cell_sel_gprs_resel_offset = -1;
-static int hf_packet_compact_cell_sel_time_group = -1;
-static int hf_packet_compact_cell_sel_guar_const_pwr_blks = -1;
-static int hf_packet_compact_neighbour_cell_param_freq_diff = -1;
-static int hf_packet_compact_ncell_param_start_freq = -1;
-static int hf_packet_compact_ncell_param_nr_of_remaining_cells = -1;
-static int hf_packet_compact_ncell_param_freq_diff_length = -1;
+static int hf_packet_system_info_type3_change_mark;
+static int hf_packet_system_info_type3_bis_count;
+
+static int hf_exc_acc;
+static int hf_packet_scell_param_gprs_rxlev_access_min;
+static int hf_packet_scell_param_gprs_ms_txpwr_max_cch;
+static int hf_packet_scell_param_multiband_reporting;
+
+static int hf_packet_gen_cell_sel_gprs_cell_resl_hyst;
+static int hf_packet_gen_cell_sel_c31_hyst;
+static int hf_packet_gen_cell_sel_c32_qual;
+static int hf_packet_gen_cell_sel_t_resel;
+static int hf_packet_gen_cell_sel_ra_resel_hyst;
+
+static int hf_packet_compact_cell_sel_bsic;
+static int hf_packet_compact_cell_sel_same_as_scell;
+static int hf_packet_compact_cell_sel_gprs_rxlev_access_min;
+static int hf_packet_compact_cell_sel_gprs_ms_txpwr_max_cch;
+static int hf_packet_compact_cell_sel_gprs_temp_offset;
+static int hf_packet_compact_cell_sel_gprs_penalty_time;
+static int hf_packet_compact_cell_sel_gprs_resel_offset;
+static int hf_packet_compact_cell_sel_time_group;
+static int hf_packet_compact_cell_sel_guar_const_pwr_blks;
+static int hf_packet_compact_neighbour_cell_param_freq_diff;
+static int hf_packet_compact_ncell_param_start_freq;
+static int hf_packet_compact_ncell_param_nr_of_remaining_cells;
+static int hf_packet_compact_ncell_param_freq_diff_length;
 /* <End Packet System Information Type 3> */
 
 /* <Packet System Information Type 5> */
-static int hf_gprsmeasurementparams3g_psi5_repquantfdd = -1;
-static int hf_gprsmeasurementparams3g_psi5_multiratreportingfdd = -1;
-static int hf_gprsmeasurementparams3g_psi5_reportingoffsetfdd = -1;
-static int hf_gprsmeasurementparams3g_psi5_reportingthresholdfdd = -1;
-static int hf_gprsmeasurementparams3g_psi5_multiratreportingtdd = -1;
-static int hf_gprsmeasurementparams3g_psi5_reportingoffsettdd = -1;
-static int hf_gprsmeasurementparams3g_psi5_reportingthresholdtdd = -1;
-static int hf_enh_reporting_parameters_report_type = -1;
-static int hf_enh_reporting_parameters_reporting_rate = -1;
-static int hf_enh_reporting_parameters_invalid_bsic_reporting = -1;
-static int hf_enh_reporting_parameters_ncc_permitted = -1;
-static int hf_packet_system_info_type5_change_mark = -1;
-static int hf_packet_system_info_type5_index = -1;
-static int hf_packet_system_info_type5_count = -1;
+static int hf_gprsmeasurementparams3g_psi5_repquantfdd;
+static int hf_gprsmeasurementparams3g_psi5_multiratreportingfdd;
+static int hf_gprsmeasurementparams3g_psi5_reportingoffsetfdd;
+static int hf_gprsmeasurementparams3g_psi5_reportingthresholdfdd;
+static int hf_gprsmeasurementparams3g_psi5_multiratreportingtdd;
+static int hf_gprsmeasurementparams3g_psi5_reportingoffsettdd;
+static int hf_gprsmeasurementparams3g_psi5_reportingthresholdtdd;
+static int hf_enh_reporting_parameters_report_type;
+static int hf_enh_reporting_parameters_reporting_rate;
+static int hf_enh_reporting_parameters_invalid_bsic_reporting;
+static int hf_enh_reporting_parameters_ncc_permitted;
+static int hf_packet_system_info_type5_change_mark;
+static int hf_packet_system_info_type5_index;
+static int hf_packet_system_info_type5_count;
 /* <End Packet System Information Type 5> */
 
 
 /* <Packet System Information Type 13> */
-static int hf_packet_system_info_type13_lb_ms_mxpwr_max_cch = -1;
-static int hf_packet_system_info_type13_si2n_support = -1;
+static int hf_packet_system_info_type13_lb_ms_mxpwr_max_cch;
+static int hf_packet_system_info_type13_si2n_support;
 /* <End Packet System Information Type 13> */
 
 
 
 #if 0
-static int hf_si1_restoctet_nch_position = -1;
-static int hf_si1_restoctet_bandindicator = -1;
-static int hf_selection_parameters_cbq = -1;
-static int hf_selection_parameters_cell_reselect_offset = -1;
-static int hf_selection_parameters_temporary_offset = -1;
-static int hf_selection_parameters_penalty_time = -1;
-static int hf_si3_rest_octet_power_offset = -1;
-static int hf_si3_rest_octet_system_information_2ter_indicator = -1;
-static int hf_si3_rest_octet_early_classmark_sending_control = -1;
-static int hf_si3_rest_octet_where = -1;
-static int hf_si3_rest_octet_ra_colour = -1;
-static int hf_si13_position = -1;
-static int hf_si3_rest_octet_ecs_restriction3g = -1;
-static int hf_si3_rest_octet_si2quaterindicator = -1;
-static int hf_si4_rest_octet_power_offset = -1;
-static int hf_si4_rest_octet_ra_colour = -1;
-static int hf_pch_and_nch_info_pagingchannelrestructuring = -1;
-static int hf_pch_and_nch_info_nln_sacch = -1;
-static int hf_pch_and_nch_info_callpriority = -1;
-static int hf_si6_restoctet_vbs_vgcs_options = -1;
-static int hf_si6_restoctet_max_lapdm = -1;
-static int hf_si6_restoctet_bandindicator = -1;
+static int hf_si1_restoctet_nch_position;
+static int hf_si1_restoctet_bandindicator;
+static int hf_selection_parameters_cbq;
+static int hf_selection_parameters_cell_reselect_offset;
+static int hf_selection_parameters_temporary_offset;
+static int hf_selection_parameters_penalty_time;
+static int hf_si3_rest_octet_power_offset;
+static int hf_si3_rest_octet_system_information_2ter_indicator;
+static int hf_si3_rest_octet_early_classmark_sending_control;
+static int hf_si3_rest_octet_where;
+static int hf_si3_rest_octet_ra_colour;
+static int hf_si13_position;
+static int hf_si3_rest_octet_ecs_restriction3g;
+static int hf_si3_rest_octet_si2quaterindicator;
+static int hf_si4_rest_octet_power_offset;
+static int hf_si4_rest_octet_ra_colour;
+static int hf_pch_and_nch_info_pagingchannelrestructuring;
+static int hf_pch_and_nch_info_nln_sacch;
+static int hf_pch_and_nch_info_callpriority;
+static int hf_si6_restoctet_vbs_vgcs_options;
+static int hf_si6_restoctet_max_lapdm;
+static int hf_si6_restoctet_bandindicator;
 #endif
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_gsm_rlcmac_sync_case_tstd = -1;
+static int hf_gsm_rlcmac_sync_case_tstd;
 #if 0
-static int hf_gsm_rlcmac_diversity = -1;
-static int hf_gsm_rlcmac_scrambling_code = -1;
+static int hf_gsm_rlcmac_diversity;
+static int hf_gsm_rlcmac_scrambling_code;
 #endif
-static int hf_gsm_rlcmac_cell_parameter = -1;
-static int hf_gsm_rlcmac_diversity_tdd = -1;
+static int hf_gsm_rlcmac_cell_parameter;
+static int hf_gsm_rlcmac_diversity_tdd;
 
 /* Unsorted FIXED and UNION fields */
-static int hf_pu_acknack_egrps = -1;
-static int hf_pu_acknack = -1;
-static int hf_frequency_parameters = -1;
-static int hf_dynamic_allocation = -1;
-static int hf_pua_grps = -1;
-static int hf_pua_egprs = -1;
-static int hf_pua_assignment = -1;
-static int hf_packet_downlink_assignment = -1;
-static int hf_page_request_tfb_establishment = -1;
-static int hf_page_request_rr_conn = -1;
-static int hf_repeated_page_info = -1;
-static int hf_packet_pdch_release = -1;
-static int hf_global_timing_or_power = -1;
-static int hf_ppc_timing_advance = -1;
-static int hf_packet_queueing_notif = -1;
-static int hf_ptr_egprs = -1;
-static int hf_packet_timeslot_reconfigure = -1;
-static int hf_si_pbcch_location = -1;
-static int hf_enh_measurement_parameters_pmo = -1;
-static int hf_enh_measurement_parameters_pcco = -1;
-static int hf_rept_eutran_enh_cell_resel_param = -1;
-static int hf_idvd_utran_priority_param = -1;
-static int hf_idvd_priorities = -1;
-static int hf_lsa_id_info_element = -1;
-static int hf_target_cell_3g = -1;
-static int hf_packet_cell_change_order = -1;
-static int hf_serving_cell_data = -1;
-static int hf_enh_nc_measurement_report = -1;
-static int hf_pmr_additionsr99 = -1;
-static int hf_packet_measurement_report = -1;
-static int hf_packet_measurement_order = -1;
-static int hf_ccn_measurement_report = -1;
-static int hf_target_cell_csg_notif = -1;
-static int hf_target_other_rat2_notif = -1;
-static int hf_target_other_rat_notif = -1;
-static int hf_target_cell = -1;
-static int hf_packet_cell_change_notification = -1;
-static int hf_packet_cell_change_continue = -1;
-static int hf_packet_neighbour_cell_data = -1;
-static int hf_packet_serving_cell_data = -1;
-static int hf_pho_uplinkassignment = -1;
-static int hf_global_timeslot_description = -1;
-static int hf_pho_gprs = -1;
-static int hf_downlink_tbf = -1;
-static int hf_pho_radio_resources = -1;
-static int hf_ps_handoverto_a_gb_modepayload = -1;
-static int hf_packet_handover_command = -1;
-static int hf_pccch_description = -1;
-static int hf_gen_cell_sel = -1;
-static int hf_psi3_additionr99 = -1;
-static int hf_psi5 = -1;
-static int hf_psi13 = -1;
+static int hf_pu_acknack_egrps;
+static int hf_pu_acknack;
+static int hf_frequency_parameters;
+static int hf_dynamic_allocation;
+static int hf_pua_grps;
+static int hf_pua_egprs;
+static int hf_pua_assignment;
+static int hf_packet_downlink_assignment;
+static int hf_page_request_tfb_establishment;
+static int hf_page_request_rr_conn;
+static int hf_repeated_page_info;
+static int hf_packet_pdch_release;
+static int hf_global_timing_or_power;
+static int hf_ppc_timing_advance;
+static int hf_packet_queueing_notif;
+static int hf_ptr_egprs;
+static int hf_packet_timeslot_reconfigure;
+static int hf_si_pbcch_location;
+static int hf_enh_measurement_parameters_pmo;
+static int hf_enh_measurement_parameters_pcco;
+static int hf_rept_eutran_enh_cell_resel_param;
+static int hf_idvd_utran_priority_param;
+static int hf_idvd_priorities;
+static int hf_lsa_id_info_element;
+static int hf_target_cell_3g;
+static int hf_packet_cell_change_order;
+static int hf_serving_cell_data;
+static int hf_enh_nc_measurement_report;
+static int hf_pmr_additionsr99;
+static int hf_packet_measurement_report;
+static int hf_packet_measurement_order;
+static int hf_ccn_measurement_report;
+static int hf_target_cell_csg_notif;
+static int hf_target_other_rat2_notif;
+static int hf_target_other_rat_notif;
+static int hf_target_cell;
+static int hf_packet_cell_change_notification;
+static int hf_packet_cell_change_continue;
+static int hf_packet_neighbour_cell_data;
+static int hf_packet_serving_cell_data;
+static int hf_pho_uplinkassignment;
+static int hf_global_timeslot_description;
+static int hf_pho_gprs;
+static int hf_downlink_tbf;
+static int hf_pho_radio_resources;
+static int hf_ps_handoverto_a_gb_modepayload;
+static int hf_packet_handover_command;
+static int hf_pccch_description;
+static int hf_gen_cell_sel;
+static int hf_psi3_additionr99;
+static int hf_psi5;
+static int hf_psi13;
 
 /* Fields unique to EC messages (reuse legacy where possible) */
 /*TODO: split exists per message??!? */
-static int hf_ec_dl_message_type = -1;
-static int hf_used_dl_coverage_class = -1;
-static int hf_ec_frequency_parameters_exist = -1;
-static int hf_ec_ma_number = -1;
-static int hf_primary_tsc_set = -1;
-static int hf_dl_coverage_class = -1;
-static int hf_starting_dl_timeslot = -1;
-static int hf_timeslot_multiplicator = -1;
-static int hf_ul_coverage_class = -1;
-static int hf_starting_ul_timeslot_offset = -1;
-static int hf_ec_packet_timing_advance_exist = -1;
-static int hf_ec_p0_and_pr_mode_exist = -1;
-static int hf_ec_gamma_exist = -1;
-static int hf_ec_alpha_enable = -1;
-
-static int hf_ec_acknack_description = -1;
-static int hf_ec_delay_next_ul_rlc_data_block = -1;
-static int hf_ec_delay_next_ul_rlc_data_block_exist = -1;
-
-static int hf_ec_bsn_offset_exist = -1;
-static int hf_ec_bsn_offset = -1;
-static int hf_ec_start_first_ul_rlc_data_block = -1;
-static int hf_ec_egprs_channel_coding_command_exist = -1;
-static int hf_ec_puan_cc_ts_exist = -1;
-static int hf_starting_ul_timeslot = -1;
-static int hf_starting_dl_timeslot_offset = -1;
-static int hf_ec_puan_exist_contres_tlli = -1;
-static int hf_ec_puan_monitor_ec_pacch = -1;
-static int hf_t3238 = -1;
-static int hf_ec_initial_waiting_time = -1;
-static int hf_ec_pacch_monitoring_pattern = -1;
-static int hf_ec_puan_fua_delay_exist = -1;
-
-static int hf_ec_reject_wait_exist = -1;
-static int hf_ec_packet_access_reject_count = -1;
-
-static int hf_ec_t_avg_t_exist = -1;
-
-static int hf_ec_uplink_tfi_exist = -1;
-static int hf_ec_overlaid_cdma_code = -1;
-
-static int hf_ec_ul_message_type = -1;
-static int hf_ec_dl_cc_est = -1;
-
-static int hf_ec_channel_request_description_exist = -1;
-static int hf_ec_priority = -1;
-static int hf_ec_number_of_ul_data_blocks = -1;
-
-static int hf_ec_channel_quality_report_exist = -1;
-static int hf_ec_qual_gmsk_exist = -1;
-static int hf_ec_qual_8psk_exist = -1;
-
-static int hf_ecs_p = -1;
-static int hf_cc = -1;
-static int hf_ec_cps3 = -1;
-static int hf_ul_foi = -1;
-static int hf_ul_ri = -1;
-static int hf_rtlli = -1;
+static int hf_ec_dl_message_type;
+static int hf_used_dl_coverage_class;
+static int hf_ec_frequency_parameters_exist;
+static int hf_ec_ma_number;
+static int hf_primary_tsc_set;
+static int hf_dl_coverage_class;
+static int hf_starting_dl_timeslot;
+static int hf_timeslot_multiplicator;
+static int hf_ul_coverage_class;
+static int hf_starting_ul_timeslot_offset;
+static int hf_ec_packet_timing_advance_exist;
+static int hf_ec_p0_and_pr_mode_exist;
+static int hf_ec_gamma_exist;
+static int hf_ec_alpha_enable;
+
+static int hf_ec_acknack_description;
+static int hf_ec_delay_next_ul_rlc_data_block;
+static int hf_ec_delay_next_ul_rlc_data_block_exist;
+
+static int hf_ec_bsn_offset_exist;
+static int hf_ec_bsn_offset;
+static int hf_ec_start_first_ul_rlc_data_block;
+static int hf_ec_egprs_channel_coding_command_exist;
+static int hf_ec_puan_cc_ts_exist;
+static int hf_starting_ul_timeslot;
+static int hf_starting_dl_timeslot_offset;
+static int hf_ec_puan_exist_contres_tlli;
+static int hf_ec_puan_monitor_ec_pacch;
+static int hf_t3238;
+static int hf_ec_initial_waiting_time;
+static int hf_ec_pacch_monitoring_pattern;
+static int hf_ec_puan_fua_delay_exist;
+
+static int hf_ec_reject_wait_exist;
+static int hf_ec_packet_access_reject_count;
+
+static int hf_ec_t_avg_t_exist;
+
+static int hf_ec_uplink_tfi_exist;
+static int hf_ec_overlaid_cdma_code;
+
+static int hf_ec_ul_message_type;
+static int hf_ec_dl_cc_est;
+
+static int hf_ec_channel_request_description_exist;
+static int hf_ec_priority;
+static int hf_ec_number_of_ul_data_blocks;
+
+static int hf_ec_channel_quality_report_exist;
+static int hf_ec_qual_gmsk_exist;
+static int hf_ec_qual_8psk_exist;
+
+static int hf_ecs_p;
+static int hf_cc;
+static int hf_ec_cps3;
+static int hf_ul_foi;
+static int hf_ul_ri;
+static int hf_rtlli;
 
 /* XXX - "exist" fields generated from perl script.  If humans think changes are necessary, feel free */
-static int hf_packet_downlink_ack_nack_channel_request_description_exist = -1;
-static int hf_egprs_pd_acknack_egprs_channelqualityreport_exist = -1;
-static int hf_egprs_pd_acknack_channelrequestdescription_exist = -1;
-static int hf_egprs_pd_acknack_extensionbits_exist = -1;
-static int hf_fdd_target_cell_bandwith_fdd_exist = -1;
-static int hf_tdd_target_cell_bandwith_tdd_exist = -1;
-static int hf_eutran_target_cell_measurement_bandwidth_exist = -1;
-static int hf_utran_csg_target_cell_plmn_id_exist = -1;
-static int hf_eutran_csg_target_cell_plmn_id_exist = -1;
-static int hf_pccf_additionsr9_utran_csg_target_cell_exist = -1;
-static int hf_pccf_additionsr9_eutran_csg_target_cell_exist = -1;
-static int hf_pccf_additionsr8_eutran_target_cell_exist = -1;
-static int hf_pccf_additionsr5_g_rnti_extention_exist = -1;
-static int hf_pccf_additionsr99_fdd_description_exist = -1;
-static int hf_pccf_additionsr99_tdd_description_exist = -1;
-static int hf_power_control_parameters_slot0_exist = -1;
-static int hf_power_control_parameters_slot1_exist = -1;
-static int hf_power_control_parameters_slot2_exist = -1;
-static int hf_power_control_parameters_slot3_exist = -1;
-static int hf_power_control_parameters_slot4_exist = -1;
-static int hf_power_control_parameters_slot5_exist = -1;
-static int hf_power_control_parameters_slot6_exist = -1;
-static int hf_power_control_parameters_slot7_exist = -1;
-static int hf_pu_acknack_gprs_additionsr99_packetextendedtimingadvance_exist = -1;
-static int hf_pu_acknack_gprs_common_uplink_ack_nack_data_exist_contention_resolution_tlli_exist = -1;
-static int hf_pu_acknack_gprs_common_uplink_ack_nack_data_exist_packet_timing_advance_exist = -1;
-static int hf_pu_acknack_gprs_common_uplink_ack_nack_data_exist_power_control_parameters_exist = -1;
-static int hf_pu_acknack_gprs_common_uplink_ack_nack_data_exist_extension_bits_exist = -1;
-static int hf_pu_acknack_egprs_00_common_uplink_ack_nack_data_exist_contention_resolution_tlli_exist = -1;
-static int hf_pu_acknack_egprs_00_common_uplink_ack_nack_data_exist_packet_timing_advance_exist = -1;
-static int hf_pu_acknack_egprs_00_packet_extended_timing_advance_exist = -1;
-static int hf_pu_acknack_egprs_00_common_uplink_ack_nack_data_exist_power_control_parameters_exist = -1;
-static int hf_pu_acknack_egprs_00_common_uplink_ack_nack_data_exist_extension_bits_exist = -1;
-static int hf_change_mark_change_mark_2_exist = -1;
-static int hf_indirect_encoding_change_mark_exist = -1;
-static int hf_timeslot_allocation_exist_exist = -1;
-static int hf_timeslot_allocation_power_ctrl_param_slot0_exist = -1;
-static int hf_timeslot_allocation_power_ctrl_param_slot1_exist = -1;
-static int hf_timeslot_allocation_power_ctrl_param_slot2_exist = -1;
-static int hf_timeslot_allocation_power_ctrl_param_slot3_exist = -1;
-static int hf_timeslot_allocation_power_ctrl_param_slot4_exist = -1;
-static int hf_timeslot_allocation_power_ctrl_param_slot5_exist = -1;
-static int hf_timeslot_allocation_power_ctrl_param_slot6_exist = -1;
-static int hf_timeslot_allocation_power_ctrl_param_slot7_exist = -1;
-static int hf_dynamic_allocation_p0_exist = -1;
-static int hf_dynamic_allocation_uplink_tfi_assignment_exist = -1;
-static int hf_dynamic_allocation_rlc_data_blocks_granted_exist = -1;
-static int hf_dynamic_allocation_tbf_starting_time_exist = -1;
-static int hf_single_block_allocation_alpha_and_gamma_tn_exist = -1;
-static int hf_single_block_allocation_p0_exist = -1;
-static int hf_pua_gprs_additionsr99_packet_extended_timing_advance_exist = -1;
-static int hf_pua_gprs_frequency_parameters_exist = -1;
-static int hf_compact_reducedma_maio_2_exist = -1;
-static int hf_multiblock_allocation_alpha_gamma_tn_exist = -1;
-static int hf_multiblock_allocation_p0_bts_pwr_ctrl_pr_mode_exist = -1;
-static int hf_pua_egprs_00_contention_resolution_tlli_exist = -1;
-static int hf_pua_egprs_00_compact_reducedma_exist = -1;
-static int hf_pua_egprs_00_bep_period2_exist = -1;
-static int hf_pua_egprs_00_packet_extended_timing_advance_exist = -1;
-static int hf_pua_egprs_00_frequency_parameters_exist = -1;
-static int hf_pda_additionsr99_egprs_params_exist = -1;
-static int hf_pda_additionsr99_bep_period2_exist = -1;
-static int hf_pda_additionsr99_packet_extended_timing_advance_exist = -1;
-static int hf_pda_additionsr99_compact_reducedma_exist = -1;
-static int hf_packet_downlink_assignment_p0_and_bts_pwr_ctrl_mode_exist = -1;
-static int hf_packet_downlink_assignment_frequency_parameters_exist = -1;
-static int hf_packet_downlink_assignment_downlink_tfi_assignment_exist = -1;
-static int hf_packet_downlink_assignment_power_control_parameters_exist = -1;
-static int hf_packet_downlink_assignment_tbf_starting_time_exist = -1;
-static int hf_packet_downlink_assignment_measurement_mapping_exist = -1;
-static int hf_page_request_for_rr_conn_emlpp_priority_exist = -1;
-static int hf_packet_paging_request_nln_exist = -1;
-static int hf_packet_power_control_timing_advance_global_power_control_parameters_exist = -1;
-static int hf_trdynamic_allocation_p0_exist = -1;
-static int hf_trdynamic_allocation_rlc_data_blocks_granted_exist = -1;
-static int hf_trdynamic_allocation_tbf_starting_time_exist = -1;
-static int hf_ptr_gprs_additionsr99_packet_extended_timing_advance_exist = -1;
-static int hf_ptr_gprs_common_timeslot_reconfigure_data_exist_downlink_tfi_assignment_exist = -1;
-static int hf_ptr_gprs_common_timeslot_reconfigure_data_exist_uplink_tfi_assignment_exist = -1;
-static int hf_ptr_gprs_common_timeslot_reconfigure_data_exist_frequency_parameters_exist = -1;
-static int hf_ptr_egprs_00_compact_reducedma_exist = -1;
-static int hf_ptr_egprs_00_downlink_egprs_windowsize_exist = -1;
-static int hf_ptr_egprs_00_uplink_egprs_windowsize_exist = -1;
-static int hf_ptr_egprs_00_packet_extended_timing_advance_exist = -1;
-static int hf_ptr_egprs_00_common_timeslot_reconfigure_data_exist_downlink_tfi_assignment_exist = -1;
-static int hf_ptr_egprs_00_common_timeslot_reconfigure_data_exist_uplink_tfi_assignment_exist = -1;
-static int hf_ptr_egprs_00_common_timeslot_reconfigure_data_exist_frequency_parameters_exist = -1;
-static int hf_cell_selection_rxlev_and_txpwr_exist = -1;
-static int hf_cell_selection_offset_and_time_exist = -1;
-static int hf_cell_selection_gprs_reselect_offset_exist = -1;
-static int hf_cell_selection_hcs_exist = -1;
-static int hf_cell_selection_si13_pbcch_location_exist = -1;
-static int hf_cell_selection_2_rxlev_and_txpwr_exist = -1;
-static int hf_cell_selection_2_offset_and_time_exist = -1;
-static int hf_cell_selection_2_gprs_reselect_offset_exist = -1;
-static int hf_cell_selection_2_hcs_exist = -1;
-static int hf_cell_selection_2_si13_pbcch_location_exist = -1;
-static int hf_reject_wait_exist = -1;
-static int hf_cellselectionparamswithfreqdiff_cellselectionparams_exist = -1;
-static int hf_add_frequency_list_cell_selection_exist = -1;
-static int hf_nc_frequency_list_removed_freq_exist = -1;
-static int hf_nc_measurement_parameters_nc_exist = -1;
-static int hf_nc_measurement_parameters_with_frequency_list_nc_exist = -1;
-static int hf_nc_measurement_parameters_with_frequency_list_nc_frequency_list_exist = -1;
-static int hf_gprsmeasurementparams_pmo_pcco_multi_band_reporting_exist = -1;
-static int hf_gprsmeasurementparams_pmo_pcco_serving_band_reporting_exist = -1;
-static int hf_gprsmeasurementparams_pmo_pcco_offsetthreshold900_exist = -1;
-static int hf_gprsmeasurementparams_pmo_pcco_offsetthreshold1800_exist = -1;
-static int hf_gprsmeasurementparams_pmo_pcco_offsetthreshold400_exist = -1;
-static int hf_gprsmeasurementparams_pmo_pcco_offsetthreshold1900_exist = -1;
-static int hf_gprsmeasurementparams_pmo_pcco_offsetthreshold850_exist = -1;
-static int hf_multiratparams3g_existmultiratreporting_exist = -1;
-static int hf_multiratparams3g_existoffsetthreshold_exist = -1;
-static int hf_enh_gprsmeasurementparams3g_pmo_existrepparamsfdd_exist = -1;
-static int hf_enh_gprsmeasurementparams3g_pmo_existoffsetthreshold_exist = -1;
-static int hf_enh_gprsmeasurementparams3g_pcco_existrepparamsfdd_exist = -1;
-static int hf_enh_gprsmeasurementparams3g_pcco_existoffsetthreshold_exist = -1;
-static int hf_utran_fdd_description_existbandwidth_exist = -1;
-static int hf_utran_tdd_description_existbandwidth_exist = -1;
-static int hf_neighbourcelldescription3g_pmo_index_start_3g_exist = -1;
-static int hf_neighbourcelldescription3g_pmo_absolute_index_start_emr_exist = -1;
-static int hf_neighbourcelldescription3g_pmo_utran_fdd_description_exist = -1;
-static int hf_neighbourcelldescription3g_pmo_utran_tdd_description_exist = -1;
-static int hf_neighbourcelldescription3g_pmo_cdma2000_description_exist = -1;
-static int hf_neighbourcelldescription3g_pmo_removed3gcelldescription_exist = -1;
-static int hf_neighbourcelldescription3g_pcco_index_start_3g_exist = -1;
-static int hf_neighbourcelldescription3g_pcco_absolute_index_start_emr_exist = -1;
-static int hf_neighbourcelldescription3g_pcco_utran_fdd_description_exist = -1;
-static int hf_neighbourcelldescription3g_pcco_utran_tdd_description_exist = -1;
-static int hf_neighbourcelldescription3g_pcco_removed3gcelldescription_exist = -1;
-static int hf_enh_measurement_parameters_pmo_neighbourcelldescription3g_exist = -1;
-static int hf_enh_measurement_parameters_pmo_gprsreportpriority_exist = -1;
-static int hf_enh_measurement_parameters_pmo_gprsmeasurementparams_exist = -1;
-static int hf_enh_measurement_parameters_pmo_gprsmeasurementparams3g_exist = -1;
-static int hf_enh_measurement_parameters_pcco_neighbourcelldescription3g_exist = -1;
-static int hf_enh_measurement_parameters_pcco_gprsreportpriority_exist = -1;
-static int hf_enh_measurement_parameters_pcco_gprsmeasurementparams_exist = -1;
-static int hf_enh_measurement_parameters_pcco_gprsmeasurementparams3g_exist = -1;
-static int hf_lu_modecellselectionparameters_si13_alt_pbcch_location_exist = -1;
-static int hf_lu_modecellselectionparams_lu_modecellselectionparams_exist = -1;
-static int hf_lu_modeonlycellselection_rxlev_and_txpwr_exist = -1;
-static int hf_lu_modeonlycellselection_offset_and_time_exist = -1;
-static int hf_lu_modeonlycellselection_gprs_reselect_offset_exist = -1;
-static int hf_lu_modeonlycellselection_hcs_exist = -1;
-static int hf_lu_modeonlycellselection_si13_alt_pbcch_location_exist = -1;
-static int hf_lu_modeonlycellselectionparamswithfreqdiff_lu_modeonlycellselectionparams_exist = -1;
-static int hf_add_lu_modeonlyfrequencylist_lu_modecellselection_exist = -1;
-static int hf_gprs_additionalmeasurementparams3g_fdd_reporting_threshold_2_exist = -1;
-static int hf_repeatedutran_priorityparameters_existutran_priority_exist = -1;
-static int hf_repeatedutran_priorityparameters_existthresh_utran_low_exist = -1;
-static int hf_repeatedutran_priorityparameters_existutran_qrxlevmin_exist = -1;
-static int hf_priorityparametersdescription3g_pmo_existdefault_utran_parameters_exist = -1;
-static int hf_eutran_reporting_threshold_offset_existeutran_fdd_reporting_threshold_offset_exist = -1;
-static int hf_eutran_reporting_threshold_offset_existeutran_fdd_reporting_threshold_2_exist = -1;
-static int hf_eutran_reporting_threshold_offset_existeutran_fdd_reporting_offset_exist = -1;
-static int hf_eutran_reporting_threshold_offset_existeutran_tdd_reporting_threshold_offset_exist = -1;
-static int hf_eutran_reporting_threshold_offset_existeutran_tdd_reporting_threshold_2_exist = -1;
-static int hf_eutran_reporting_threshold_offset_existeutran_tdd_reporting_offset_exist = -1;
-static int hf_repeatedeutran_cells_existmeasurementbandwidth_exist = -1;
-static int hf_repeatedeutran_neighbourcells_existeutran_priority_exist = -1;
-static int hf_repeatedeutran_neighbourcells_existthresh_eutran_low_exist = -1;
-static int hf_repeatedeutran_neighbourcells_existeutran_qrxlevmin_exist = -1;
-static int hf_pcid_group_ie_existpcid_bitmap_group_exist = -1;
-static int hf_eutran_parametersdescription_pmo_existgprs_eutran_measurementparametersdescription_exist = -1;
-static int hf_meas_ctrl_param_desp_existmeasurement_control_eutran_exist = -1;
-static int hf_meas_ctrl_param_desp_existmeasurement_control_utran_exist = -1;
-static int hf_reselection_based_on_rsrq_existthresh_eutran_low_q_exist = -1;
-static int hf_reselection_based_on_rsrq_existeutran_qqualmin_exist = -1;
-static int hf_reselection_based_on_rsrq_existeutran_rsrpmin_exist = -1;
-static int hf_utran_csg_cells_reporting_desp_existutran_csg_fdd_reporting_threshold_exist = -1;
-static int hf_utran_csg_cells_reporting_desp_existutran_csg_tdd_reporting_threshold_exist = -1;
-static int hf_eutran_csg_cells_reporting_desp_existeutran_csg_fdd_reporting_threshold_exist = -1;
-static int hf_eutran_csg_cells_reporting_desp_existeutran_csg_tdd_reporting_threshold_exist = -1;
-static int hf_csg_cells_reporting_desp_existutran_csg_cells_reporting_description_exist = -1;
-static int hf_csg_cells_reporting_desp_existeutran_csg_cells_reporting_description_exist = -1;
-static int hf_priorityandeutran_parametersdescription_pmo_existservingcellpriorityparametersdescription_exist = -1;
-static int hf_priorityandeutran_parametersdescription_pmo_existpriorityparametersdescription3g_pmo_exist = -1;
-static int hf_priorityandeutran_parametersdescription_pmo_existeutran_parametersdescription_pmo_exist = -1;
-static int hf_threeg_individual_priority_parameters_description_default_utran_priority_exist = -1;
-static int hf_eutran_individual_priority_parameters_description_default_eutran_priority_exist = -1;
-static int hf_provide_individual_priorities_3g_individual_priority_parameters_description_exist = -1;
-static int hf_provide_individual_priorities_eutran_individual_priority_parameters_description_exist = -1;
-static int hf_provide_individual_priorities_t3230_timeout_value_exist = -1;
-static int hf_pmo_additionsr9_existenhanced_cell_reselection_parameters_description_exist = -1;
-static int hf_pmo_additionsr9_existcsg_cells_reporting_description_exist = -1;
-static int hf_pmo_additionsr8_existba_ind_3g_pmo_ind_exist = -1;
-static int hf_pmo_additionsr8_existpriorityandeutran_parametersdescription_pmo_exist = -1;
-static int hf_pmo_additionsr8_existindividualpriorities_pmo_exist = -1;
-static int hf_pmo_additionsr8_existthreeg_csg_description_exist = -1;
-static int hf_pmo_additionsr8_existeutran_csg_description_exist = -1;
-static int hf_pmo_additionsr8_existmeasurement_control_parameters_description_exist = -1;
-static int hf_pmo_additionsr7_existreporting_offset_threshold_700_exist = -1;
-static int hf_pmo_additionsr7_existreporting_offset_threshold_810_exist = -1;
-static int hf_pmo_additionsr5_existgrnti_extension_exist = -1;
-static int hf_pmo_additionsr5_lu_modeneighbourcellparams_exist = -1;
-static int hf_pmo_additionsr5_existnc_lu_modeonlycapablecelllist_exist = -1;
-static int hf_pmo_additionsr5_existgprs_additionalmeasurementparams3g_exist = -1;
-static int hf_pcco_additionsr5_existgrnti_extension_exist = -1;
-static int hf_pcco_additionsr5_lu_modeneighbourcellparams_exist = -1;
-static int hf_pcco_additionsr5_existnc_lu_modeonlycapablecelllist_exist = -1;
-static int hf_pcco_additionsr5_existgprs_additionalmeasurementparams3g_exist = -1;
-static int hf_pmo_additionsr4_ccn_support_description_id_exist = -1;
-static int hf_pmo_additionsr99_enh_measurement_parameters_exist = -1;
-static int hf_pcco_additionsr4_container_id_exist = -1;
-static int hf_pcco_additionsr4_ccn_support_description_id_exist = -1;
-static int hf_pmo_additionsr98_lsa_parameters_exist = -1;
-static int hf_pcco_additionsr98_lsa_parameters_exist = -1;
-static int hf_target_cell_3g_additionsr8_eutran_target_cell_exist = -1;
-static int hf_target_cell_3g_additionsr8_individual_priorities_exist = -1;
-static int hf_target_cell_3g_additionsr5_g_rnti_extention_exist = -1;
-static int hf_target_cell_3g_fdd_description_exist = -1;
-static int hf_target_cell_3g_tdd_description_exist = -1;
-static int hf_nc_measurements_bsic_n_exist = -1;
-static int hf_reporting_quantity_instance_reporting_quantity_exist = -1;
-static int hf_enh_nc_measurement_report_serving_cell_data_exist = -1;
-static int hf_enh_nc_measurement_report_reportbitmap_exist = -1;
-static int hf_ext_measurement_report_slot0_exist = -1;
-static int hf_ext_measurement_report_slot1_exist = -1;
-static int hf_ext_measurement_report_slot2_exist = -1;
-static int hf_ext_measurement_report_slot3_exist = -1;
-static int hf_ext_measurement_report_slot4_exist = -1;
-static int hf_ext_measurement_report_slot5_exist = -1;
-static int hf_ext_measurement_report_slot6_exist = -1;
-static int hf_ext_measurement_report_slot7_exist = -1;
-static int hf_ext_measurement_report_i_level_exist = -1;
-static int hf_utran_csg_measurement_report_plmn_id_exist = -1;
-static int hf_eutran_csg_measurement_report_plmn_id_exist = -1;
-static int hf_pmr_additionsr9_utran_csg_meas_rpt_exist = -1;
-static int hf_pmr_additionsr9_eutran_csg_meas_rpt_exist = -1;
-static int hf_pmr_additionsr8_eutran_meas_rpt_exist = -1;
-static int hf_pmr_additionsr5_grnti_exist = -1;
-static int hf_pmr_additionsr99_info3g_exist = -1;
-static int hf_pmr_additionsr99_measurementreport3g_exist = -1;
-static int hf_packet_measurement_report_psi5_change_mark_exist = -1;
-static int hf_pemr_additionsr9_utran_csg_target_cell_exist = -1;
-static int hf_pemr_additionsr9_eutran_csg_target_cell_exist = -1;
-static int hf_bitmap_report_quantity_reporting_quantity_exist = -1;
-static int hf_pemr_additionsr8_eutran_meas_rpt_exist = -1;
-static int hf_pemr_additionsr5_grnti_ext_exist = -1;
-static int hf_packet_measurement_order_nc_measurement_parameters_exist = -1;
-static int hf_packet_measurement_order_ext_measurement_parameters_exist = -1;
-static int hf_fdd_target_cell_notif_bandwith_fdd_exist = -1;
-static int hf_tdd_target_cell_notif_bandwith_tdd_exist = -1;
-static int hf_target_cell_3g_notif_fdd_description_exist = -1;
-static int hf_target_cell_3g_notif_tdd_description_exist = -1;
-static int hf_target_eutran_cell_notif_measurement_bandwidth_exist = -1;
-static int hf_target_cell_4g_notif_arfcn_exist = -1;
-static int hf_target_cell_4g_notif_3g_target_cell_exist = -1;
-static int hf_target_cell_4g_notif_eutran_target_cell_exist = -1;
-static int hf_target_cell_4g_notif_eutran_ccn_measurement_report_exist = -1;
-static int hf_target_cell_csg_notif_eutran_ccn_measurement_report_exist = -1;
-static int hf_pccn_additionsr6_ba_used_3g_exist = -1;
-static int hf_packet_cell_change_continue_id_exist = -1;
-static int hf_pho_downlinkassignment_egprs_windowsize_exist = -1;
-static int hf_pho_usf_1_7_usf_exist = -1;
-static int hf_pho_uplinkassignment_channelcodingcommand_exist = -1;
-static int hf_pho_uplinkassignment_egprs_channelcodingcommand_exist = -1;
-static int hf_pho_uplinkassignment_egprs_windowsize_exist = -1;
-static int hf_pho_uplinkassignment_tbf_timeslotallocation_exist = -1;
-static int hf_globaltimeslotdescription_ua_pho_ua_exist = -1;
-static int hf_pho_gprs_channelcodingcommand_exist = -1;
-static int hf_pho_gprs_globaltimeslotdescription_ua_exist = -1;
-static int hf_pho_gprs_downlinkassignment_exist = -1;
-static int hf_egprs_description_egprs_windowsize_exist = -1;
-static int hf_egprs_description_bep_period2_exist = -1;
-static int hf_downlinktbf_egprs_description_exist = -1;
-static int hf_downlinktbf_downlinkassignment_exist = -1;
-static int hf_pho_egprs_egprs_windowsize_exist = -1;
-static int hf_pho_egprs_egprs_channelcodingcommand_exist = -1;
-static int hf_pho_egprs_bep_period2_exist = -1;
-static int hf_pho_egprs_globaltimeslotdescription_ua_exist = -1;
-static int hf_pho_egprs_downlinktbf_exist = -1;
-static int hf_pho_timingadvance_packetextendedtimingadvance_exist = -1;
-static int hf_pho_radioresources_handoverreference_exist = -1;
-static int hf_pho_radioresources_ccn_active_exist = -1;
-static int hf_pho_radioresources_ccn_active_3g_exist = -1;
-static int hf_pho_radioresources_ccn_support_description_exist = -1;
-static int hf_pho_radioresources_pho_timingadvance_exist = -1;
-static int hf_pho_radioresources_po_pr_exist = -1;
-static int hf_pho_radioresources_uplinkcontroltimeslot_exist = -1;
-static int hf_ps_handoverto_a_gb_modepayload_nas_container_exist = -1;
-static int hf_psi1_psi_count_hr_exist = -1;
-static int hf_non_gprs_cell_options_t3212_exist = -1;
-static int hf_non_gprs_cell_options_extension_bits_exist = -1;
-static int hf_psi2_cell_identification_exist = -1;
-static int hf_psi2_non_gprs_cell_options_exist = -1;
-static int hf_serving_cell_params_hcs_exist = -1;
-static int hf_gen_cell_sel_t_resel_exist = -1;
-static int hf_gen_cell_sel_ra_reselect_hysteresis_exist = -1;
-static int hf_compact_cell_sel_gprs_rxlev_access_min_exist = -1;
-static int hf_compact_cell_sel_gprs_temporary_offset_exist = -1;
-static int hf_compact_cell_sel_gprs_reselect_offset_exist = -1;
-static int hf_compact_cell_sel_hcs_parm_exist = -1;
-static int hf_compact_cell_sel_time_group_exist = -1;
-static int hf_compact_cell_sel_guar_constant_pwr_blks_exist = -1;
-static int hf_psi3_additionr4_ccn_support_desc_exist = -1;
-static int hf_psi3_additionr99_compact_info_exist = -1;
-static int hf_psi3_additionr99_additionr4_exist = -1;
-static int hf_psi3_additionr98_lsa_parameters_exist = -1;
-static int hf_psi3_additionr98_additionr99_exist = -1;
-static int hf_psi3_additionr98_exist = -1;
-static int hf_measurementparams_multi_band_reporting_exist = -1;
-static int hf_measurementparams_serving_band_reporting_exist = -1;
-static int hf_measurementparams_scale_ord_exist = -1;
-static int hf_measurementparams_offsetthreshold900_exist = -1;
-static int hf_measurementparams_offsetthreshold1800_exist = -1;
-static int hf_measurementparams_offsetthreshold400_exist = -1;
-static int hf_measurementparams_offsetthreshold1900_exist = -1;
-static int hf_measurementparams_offsetthreshold850_exist = -1;
-static int hf_gprsmeasurementparams3g_psi5_existrepparamsfdd_exist = -1;
-static int hf_gprsmeasurementparams3g_psi5_existreportingparamsfdd_exist = -1;
-static int hf_gprsmeasurementparams3g_psi5_existmultiratreportingtdd_exist = -1;
-static int hf_gprsmeasurementparams3g_psi5_existoffsetthresholdtdd_exist = -1;
-static int hf_enh_reporting_parameters_ncc_permitted_exist = -1;
-static int hf_enh_reporting_parameters_gprsmeasurementparams_exist = -1;
-static int hf_enh_reporting_parameters_gprsmeasurementparams3g_exist = -1;
-static int hf_psi5_additions_offsetthreshold_700_exist = -1;
-static int hf_psi5_additions_offsetthreshold_810_exist = -1;
-static int hf_psi5_additions_gprs_additionalmeasurementparams3g_exist = -1;
-static int hf_psi5_additions_additionsr7_exist = -1;
-static int hf_psi5_additionsr_enh_reporting_param_exist = -1;
-static int hf_psi5_additionsr_additionsr5_exist = -1;
-static int hf_psi5_eixst_nc_meas_param_exist = -1;
-static int hf_psi13_additions_lb_ms_txpwr_max_cch_exist = -1;
-static int hf_psi13_additions_additionsr6_exist = -1;
-static int hf_psi13_additionr_additionsr4_exist = -1;
-static int hf_psi13_ma_exist = -1;
-static int hf_pccf_additionsr8_additionsr9_exist = -1;
-static int hf_pccf_additionsr5_additionsr8_exist = -1;
-static int hf_pccf_additionsr99_additionsr5_exist = -1;
-static int hf_pmo_additionsr8_existadditionsr9_exist = -1;
-static int hf_pmo_additionsr7_existadditionsr8_exist = -1;
-static int hf_pmo_additionsr6_existadditionsr7_exist = -1;
-static int hf_pmo_additionsr5_existadditionsr6_exist = -1;
-static int hf_pcco_additionsr5_existadditionsr6_exist = -1;
-static int hf_pmo_additionsr4_additionsr5_exist = -1;
-static int hf_pmo_additionsr99_additionsr4_exist = -1;
-static int hf_pcco_additionsr4_additionsr5_exist = -1;
-static int hf_target_cell_gsm_additionsr98_exist = -1;
-static int hf_target_cell_3g_additionsr5_additionsr8_exist = -1;
-static int hf_target_cell_3g_additionsr5_exist = -1;
-static int hf_pmr_additionsr8_additionsr9_exist = -1;
-static int hf_pmr_additionsr5_additionsr8_exist = -1;
-static int hf_pmr_additionsr99_additionsr5_exist = -1;
-static int hf_pemr_additionsr8_additionsr9_exist = -1;
-static int hf_pemr_additionsr5_additionsr8_exist = -1;
-static int hf_packet_enh_measurement_report_additionsr5_exist = -1;
-static int hf_packet_measurement_order_additionsr98_exist = -1;
-static int hf_packet_cell_change_notification_additionsr6_exist = -1;
-static int hf_psi1_additionsr99_additionsr6_exist = -1;
-static int hf_packet_paging_request_repeated_page_info_exist = -1;
-static int hf_neighbourcelllist_parameters_exist = -1;
-static int hf_nc_frequency_list_add_frequency_exist = -1;
-static int hf_utran_fdd_description_cellparams_exist = -1;
-static int hf_utran_tdd_description_cellparams_exist = -1;
-static int hf_nc_lu_modeonlycapablecelllist_add_lu_modeonlyfrequencylist_exist = -1;
-static int hf_priorityparametersdescription3g_pmo_repeatedutran_priorityparameters_a_exist = -1;
-static int hf_repeatedeutran_neighbourcells_eutran_cells_a_exist = -1;
-static int hf_pcid_group_ie_pcid_pattern_a_exist = -1;
-static int hf_repeatedeutran_notallowedcells_eutran_frequency_index_a_exist = -1;
-static int hf_repeatedeutran_pcid_to_ta_mapping_pcid_tota_mapping_a_exist = -1;
-static int hf_repeatedeutran_pcid_to_ta_mapping_eutran_frequency_index_a_exist = -1;
-static int hf_eutran_parametersdescription_pmo_repeatedeutran_neighbourcells_a_exist = -1;
-static int hf_eutran_parametersdescription_pmo_repeatedeutran_notallowedcells_a_exist = -1;
-static int hf_eutran_parametersdescription_pmo_repeatedeutran_pcid_to_ta_mapping_a_exist = -1;
-static int hf_psc_group_psc_pattern_exist = -1;
-static int hf_threeg_csg_description_threeg_csg_description_body_exist = -1;
-static int hf_eutran_csg_description_eutran_csg_description_body_exist = -1;
-static int hf_enh_cell_reselect_param_desp_repeated_eutran_enhanced_cell_reselection_parameters_exist = -1;
-static int hf_threeg_individual_priority_parameters_description_repeated_individual_utran_priority_parameters_exist = -1;
-static int hf_eutran_individual_priority_parameters_description_repeated_individual_eutran_priority_parameters_exist = -1;
-static int hf_lsa_id_info_lsa_id_info_elements_exist = -1;
-static int hf_compact_info_compact_neighbour_cell_param_exist = -1;
-static int hf_packet_access_reject_reject_exist = -1;
-static int hf_enh_nc_measurement_report_repeatedinvalid_bsic_info_exist = -1;
-static int hf_nonhoppingpccch_carriers_exist = -1;
-static int hf_psi2_reference_frequency_exist = -1;
-static int hf_psi2_gprs_ma_exist = -1;
-static int hf_psi2_pccch_description_exist = -1;
-
-
-static expert_field ei_li = EI_INIT;
+static int hf_packet_downlink_ack_nack_channel_request_description_exist;
+static int hf_egprs_pd_acknack_egprs_channelqualityreport_exist;
+static int hf_egprs_pd_acknack_channelrequestdescription_exist;
+static int hf_egprs_pd_acknack_extensionbits_exist;
+static int hf_fdd_target_cell_bandwith_fdd_exist;
+static int hf_tdd_target_cell_bandwith_tdd_exist;
+static int hf_eutran_target_cell_measurement_bandwidth_exist;
+static int hf_utran_csg_target_cell_plmn_id_exist;
+static int hf_eutran_csg_target_cell_plmn_id_exist;
+static int hf_pccf_additionsr9_utran_csg_target_cell_exist;
+static int hf_pccf_additionsr9_eutran_csg_target_cell_exist;
+static int hf_pccf_additionsr8_eutran_target_cell_exist;
+static int hf_pccf_additionsr5_g_rnti_extention_exist;
+static int hf_pccf_additionsr99_fdd_description_exist;
+static int hf_pccf_additionsr99_tdd_description_exist;
+static int hf_power_control_parameters_slot0_exist;
+static int hf_power_control_parameters_slot1_exist;
+static int hf_power_control_parameters_slot2_exist;
+static int hf_power_control_parameters_slot3_exist;
+static int hf_power_control_parameters_slot4_exist;
+static int hf_power_control_parameters_slot5_exist;
+static int hf_power_control_parameters_slot6_exist;
+static int hf_power_control_parameters_slot7_exist;
+static int hf_pu_acknack_gprs_additionsr99_packetextendedtimingadvance_exist;
+static int hf_pu_acknack_gprs_common_uplink_ack_nack_data_exist_contention_resolution_tlli_exist;
+static int hf_pu_acknack_gprs_common_uplink_ack_nack_data_exist_packet_timing_advance_exist;
+static int hf_pu_acknack_gprs_common_uplink_ack_nack_data_exist_power_control_parameters_exist;
+static int hf_pu_acknack_gprs_common_uplink_ack_nack_data_exist_extension_bits_exist;
+static int hf_pu_acknack_egprs_00_common_uplink_ack_nack_data_exist_contention_resolution_tlli_exist;
+static int hf_pu_acknack_egprs_00_common_uplink_ack_nack_data_exist_packet_timing_advance_exist;
+static int hf_pu_acknack_egprs_00_packet_extended_timing_advance_exist;
+static int hf_pu_acknack_egprs_00_common_uplink_ack_nack_data_exist_power_control_parameters_exist;
+static int hf_pu_acknack_egprs_00_common_uplink_ack_nack_data_exist_extension_bits_exist;
+static int hf_change_mark_change_mark_2_exist;
+static int hf_indirect_encoding_change_mark_exist;
+static int hf_timeslot_allocation_exist_exist;
+static int hf_timeslot_allocation_power_ctrl_param_slot0_exist;
+static int hf_timeslot_allocation_power_ctrl_param_slot1_exist;
+static int hf_timeslot_allocation_power_ctrl_param_slot2_exist;
+static int hf_timeslot_allocation_power_ctrl_param_slot3_exist;
+static int hf_timeslot_allocation_power_ctrl_param_slot4_exist;
+static int hf_timeslot_allocation_power_ctrl_param_slot5_exist;
+static int hf_timeslot_allocation_power_ctrl_param_slot6_exist;
+static int hf_timeslot_allocation_power_ctrl_param_slot7_exist;
+static int hf_dynamic_allocation_p0_exist;
+static int hf_dynamic_allocation_uplink_tfi_assignment_exist;
+static int hf_dynamic_allocation_rlc_data_blocks_granted_exist;
+static int hf_dynamic_allocation_tbf_starting_time_exist;
+static int hf_single_block_allocation_alpha_and_gamma_tn_exist;
+static int hf_single_block_allocation_p0_exist;
+static int hf_pua_gprs_additionsr99_packet_extended_timing_advance_exist;
+static int hf_pua_gprs_frequency_parameters_exist;
+static int hf_compact_reducedma_maio_2_exist;
+static int hf_multiblock_allocation_alpha_gamma_tn_exist;
+static int hf_multiblock_allocation_p0_bts_pwr_ctrl_pr_mode_exist;
+static int hf_pua_egprs_00_contention_resolution_tlli_exist;
+static int hf_pua_egprs_00_compact_reducedma_exist;
+static int hf_pua_egprs_00_bep_period2_exist;
+static int hf_pua_egprs_00_packet_extended_timing_advance_exist;
+static int hf_pua_egprs_00_frequency_parameters_exist;
+static int hf_pda_additionsr99_egprs_params_exist;
+static int hf_pda_additionsr99_bep_period2_exist;
+static int hf_pda_additionsr99_packet_extended_timing_advance_exist;
+static int hf_pda_additionsr99_compact_reducedma_exist;
+static int hf_packet_downlink_assignment_p0_and_bts_pwr_ctrl_mode_exist;
+static int hf_packet_downlink_assignment_frequency_parameters_exist;
+static int hf_packet_downlink_assignment_downlink_tfi_assignment_exist;
+static int hf_packet_downlink_assignment_power_control_parameters_exist;
+static int hf_packet_downlink_assignment_tbf_starting_time_exist;
+static int hf_packet_downlink_assignment_measurement_mapping_exist;
+static int hf_page_request_for_rr_conn_emlpp_priority_exist;
+static int hf_packet_paging_request_nln_exist;
+static int hf_packet_power_control_timing_advance_global_power_control_parameters_exist;
+static int hf_trdynamic_allocation_p0_exist;
+static int hf_trdynamic_allocation_rlc_data_blocks_granted_exist;
+static int hf_trdynamic_allocation_tbf_starting_time_exist;
+static int hf_ptr_gprs_additionsr99_packet_extended_timing_advance_exist;
+static int hf_ptr_gprs_common_timeslot_reconfigure_data_exist_downlink_tfi_assignment_exist;
+static int hf_ptr_gprs_common_timeslot_reconfigure_data_exist_uplink_tfi_assignment_exist;
+static int hf_ptr_gprs_common_timeslot_reconfigure_data_exist_frequency_parameters_exist;
+static int hf_ptr_egprs_00_compact_reducedma_exist;
+static int hf_ptr_egprs_00_downlink_egprs_windowsize_exist;
+static int hf_ptr_egprs_00_uplink_egprs_windowsize_exist;
+static int hf_ptr_egprs_00_packet_extended_timing_advance_exist;
+static int hf_ptr_egprs_00_common_timeslot_reconfigure_data_exist_downlink_tfi_assignment_exist;
+static int hf_ptr_egprs_00_common_timeslot_reconfigure_data_exist_uplink_tfi_assignment_exist;
+static int hf_ptr_egprs_00_common_timeslot_reconfigure_data_exist_frequency_parameters_exist;
+static int hf_cell_selection_rxlev_and_txpwr_exist;
+static int hf_cell_selection_offset_and_time_exist;
+static int hf_cell_selection_gprs_reselect_offset_exist;
+static int hf_cell_selection_hcs_exist;
+static int hf_cell_selection_si13_pbcch_location_exist;
+static int hf_cell_selection_2_rxlev_and_txpwr_exist;
+static int hf_cell_selection_2_offset_and_time_exist;
+static int hf_cell_selection_2_gprs_reselect_offset_exist;
+static int hf_cell_selection_2_hcs_exist;
+static int hf_cell_selection_2_si13_pbcch_location_exist;
+static int hf_reject_wait_exist;
+static int hf_cellselectionparamswithfreqdiff_cellselectionparams_exist;
+static int hf_add_frequency_list_cell_selection_exist;
+static int hf_nc_frequency_list_removed_freq_exist;
+static int hf_nc_measurement_parameters_nc_exist;
+static int hf_nc_measurement_parameters_with_frequency_list_nc_exist;
+static int hf_nc_measurement_parameters_with_frequency_list_nc_frequency_list_exist;
+static int hf_gprsmeasurementparams_pmo_pcco_multi_band_reporting_exist;
+static int hf_gprsmeasurementparams_pmo_pcco_serving_band_reporting_exist;
+static int hf_gprsmeasurementparams_pmo_pcco_offsetthreshold900_exist;
+static int hf_gprsmeasurementparams_pmo_pcco_offsetthreshold1800_exist;
+static int hf_gprsmeasurementparams_pmo_pcco_offsetthreshold400_exist;
+static int hf_gprsmeasurementparams_pmo_pcco_offsetthreshold1900_exist;
+static int hf_gprsmeasurementparams_pmo_pcco_offsetthreshold850_exist;
+static int hf_multiratparams3g_existmultiratreporting_exist;
+static int hf_multiratparams3g_existoffsetthreshold_exist;
+static int hf_enh_gprsmeasurementparams3g_pmo_existrepparamsfdd_exist;
+static int hf_enh_gprsmeasurementparams3g_pmo_existoffsetthreshold_exist;
+static int hf_enh_gprsmeasurementparams3g_pcco_existrepparamsfdd_exist;
+static int hf_enh_gprsmeasurementparams3g_pcco_existoffsetthreshold_exist;
+static int hf_utran_fdd_description_existbandwidth_exist;
+static int hf_utran_tdd_description_existbandwidth_exist;
+static int hf_neighbourcelldescription3g_pmo_index_start_3g_exist;
+static int hf_neighbourcelldescription3g_pmo_absolute_index_start_emr_exist;
+static int hf_neighbourcelldescription3g_pmo_utran_fdd_description_exist;
+static int hf_neighbourcelldescription3g_pmo_utran_tdd_description_exist;
+static int hf_neighbourcelldescription3g_pmo_cdma2000_description_exist;
+static int hf_neighbourcelldescription3g_pmo_removed3gcelldescription_exist;
+static int hf_neighbourcelldescription3g_pcco_index_start_3g_exist;
+static int hf_neighbourcelldescription3g_pcco_absolute_index_start_emr_exist;
+static int hf_neighbourcelldescription3g_pcco_utran_fdd_description_exist;
+static int hf_neighbourcelldescription3g_pcco_utran_tdd_description_exist;
+static int hf_neighbourcelldescription3g_pcco_removed3gcelldescription_exist;
+static int hf_enh_measurement_parameters_pmo_neighbourcelldescription3g_exist;
+static int hf_enh_measurement_parameters_pmo_gprsreportpriority_exist;
+static int hf_enh_measurement_parameters_pmo_gprsmeasurementparams_exist;
+static int hf_enh_measurement_parameters_pmo_gprsmeasurementparams3g_exist;
+static int hf_enh_measurement_parameters_pcco_neighbourcelldescription3g_exist;
+static int hf_enh_measurement_parameters_pcco_gprsreportpriority_exist;
+static int hf_enh_measurement_parameters_pcco_gprsmeasurementparams_exist;
+static int hf_enh_measurement_parameters_pcco_gprsmeasurementparams3g_exist;
+static int hf_lu_modecellselectionparameters_si13_alt_pbcch_location_exist;
+static int hf_lu_modecellselectionparams_lu_modecellselectionparams_exist;
+static int hf_lu_modeonlycellselection_rxlev_and_txpwr_exist;
+static int hf_lu_modeonlycellselection_offset_and_time_exist;
+static int hf_lu_modeonlycellselection_gprs_reselect_offset_exist;
+static int hf_lu_modeonlycellselection_hcs_exist;
+static int hf_lu_modeonlycellselection_si13_alt_pbcch_location_exist;
+static int hf_lu_modeonlycellselectionparamswithfreqdiff_lu_modeonlycellselectionparams_exist;
+static int hf_add_lu_modeonlyfrequencylist_lu_modecellselection_exist;
+static int hf_gprs_additionalmeasurementparams3g_fdd_reporting_threshold_2_exist;
+static int hf_repeatedutran_priorityparameters_existutran_priority_exist;
+static int hf_repeatedutran_priorityparameters_existthresh_utran_low_exist;
+static int hf_repeatedutran_priorityparameters_existutran_qrxlevmin_exist;
+static int hf_priorityparametersdescription3g_pmo_existdefault_utran_parameters_exist;
+static int hf_eutran_reporting_threshold_offset_existeutran_fdd_reporting_threshold_offset_exist;
+static int hf_eutran_reporting_threshold_offset_existeutran_fdd_reporting_threshold_2_exist;
+static int hf_eutran_reporting_threshold_offset_existeutran_fdd_reporting_offset_exist;
+static int hf_eutran_reporting_threshold_offset_existeutran_tdd_reporting_threshold_offset_exist;
+static int hf_eutran_reporting_threshold_offset_existeutran_tdd_reporting_threshold_2_exist;
+static int hf_eutran_reporting_threshold_offset_existeutran_tdd_reporting_offset_exist;
+static int hf_repeatedeutran_cells_existmeasurementbandwidth_exist;
+static int hf_repeatedeutran_neighbourcells_existeutran_priority_exist;
+static int hf_repeatedeutran_neighbourcells_existthresh_eutran_low_exist;
+static int hf_repeatedeutran_neighbourcells_existeutran_qrxlevmin_exist;
+static int hf_pcid_group_ie_existpcid_bitmap_group_exist;
+static int hf_eutran_parametersdescription_pmo_existgprs_eutran_measurementparametersdescription_exist;
+static int hf_meas_ctrl_param_desp_existmeasurement_control_eutran_exist;
+static int hf_meas_ctrl_param_desp_existmeasurement_control_utran_exist;
+static int hf_reselection_based_on_rsrq_existthresh_eutran_low_q_exist;
+static int hf_reselection_based_on_rsrq_existeutran_qqualmin_exist;
+static int hf_reselection_based_on_rsrq_existeutran_rsrpmin_exist;
+static int hf_utran_csg_cells_reporting_desp_existutran_csg_fdd_reporting_threshold_exist;
+static int hf_utran_csg_cells_reporting_desp_existutran_csg_tdd_reporting_threshold_exist;
+static int hf_eutran_csg_cells_reporting_desp_existeutran_csg_fdd_reporting_threshold_exist;
+static int hf_eutran_csg_cells_reporting_desp_existeutran_csg_tdd_reporting_threshold_exist;
+static int hf_csg_cells_reporting_desp_existutran_csg_cells_reporting_description_exist;
+static int hf_csg_cells_reporting_desp_existeutran_csg_cells_reporting_description_exist;
+static int hf_priorityandeutran_parametersdescription_pmo_existservingcellpriorityparametersdescription_exist;
+static int hf_priorityandeutran_parametersdescription_pmo_existpriorityparametersdescription3g_pmo_exist;
+static int hf_priorityandeutran_parametersdescription_pmo_existeutran_parametersdescription_pmo_exist;
+static int hf_threeg_individual_priority_parameters_description_default_utran_priority_exist;
+static int hf_eutran_individual_priority_parameters_description_default_eutran_priority_exist;
+static int hf_provide_individual_priorities_3g_individual_priority_parameters_description_exist;
+static int hf_provide_individual_priorities_eutran_individual_priority_parameters_description_exist;
+static int hf_provide_individual_priorities_t3230_timeout_value_exist;
+static int hf_pmo_additionsr9_existenhanced_cell_reselection_parameters_description_exist;
+static int hf_pmo_additionsr9_existcsg_cells_reporting_description_exist;
+static int hf_pmo_additionsr8_existba_ind_3g_pmo_ind_exist;
+static int hf_pmo_additionsr8_existpriorityandeutran_parametersdescription_pmo_exist;
+static int hf_pmo_additionsr8_existindividualpriorities_pmo_exist;
+static int hf_pmo_additionsr8_existthreeg_csg_description_exist;
+static int hf_pmo_additionsr8_existeutran_csg_description_exist;
+static int hf_pmo_additionsr8_existmeasurement_control_parameters_description_exist;
+static int hf_pmo_additionsr7_existreporting_offset_threshold_700_exist;
+static int hf_pmo_additionsr7_existreporting_offset_threshold_810_exist;
+static int hf_pmo_additionsr5_existgrnti_extension_exist;
+static int hf_pmo_additionsr5_lu_modeneighbourcellparams_exist;
+static int hf_pmo_additionsr5_existnc_lu_modeonlycapablecelllist_exist;
+static int hf_pmo_additionsr5_existgprs_additionalmeasurementparams3g_exist;
+static int hf_pcco_additionsr5_existgrnti_extension_exist;
+static int hf_pcco_additionsr5_lu_modeneighbourcellparams_exist;
+static int hf_pcco_additionsr5_existnc_lu_modeonlycapablecelllist_exist;
+static int hf_pcco_additionsr5_existgprs_additionalmeasurementparams3g_exist;
+static int hf_pmo_additionsr4_ccn_support_description_id_exist;
+static int hf_pmo_additionsr99_enh_measurement_parameters_exist;
+static int hf_pcco_additionsr4_container_id_exist;
+static int hf_pcco_additionsr4_ccn_support_description_id_exist;
+static int hf_pmo_additionsr98_lsa_parameters_exist;
+static int hf_pcco_additionsr98_lsa_parameters_exist;
+static int hf_target_cell_3g_additionsr8_eutran_target_cell_exist;
+static int hf_target_cell_3g_additionsr8_individual_priorities_exist;
+static int hf_target_cell_3g_additionsr5_g_rnti_extention_exist;
+static int hf_target_cell_3g_fdd_description_exist;
+static int hf_target_cell_3g_tdd_description_exist;
+static int hf_nc_measurements_bsic_n_exist;
+static int hf_reporting_quantity_instance_reporting_quantity_exist;
+static int hf_enh_nc_measurement_report_serving_cell_data_exist;
+static int hf_enh_nc_measurement_report_reportbitmap_exist;
+static int hf_ext_measurement_report_slot0_exist;
+static int hf_ext_measurement_report_slot1_exist;
+static int hf_ext_measurement_report_slot2_exist;
+static int hf_ext_measurement_report_slot3_exist;
+static int hf_ext_measurement_report_slot4_exist;
+static int hf_ext_measurement_report_slot5_exist;
+static int hf_ext_measurement_report_slot6_exist;
+static int hf_ext_measurement_report_slot7_exist;
+static int hf_ext_measurement_report_i_level_exist;
+static int hf_utran_csg_measurement_report_plmn_id_exist;
+static int hf_eutran_csg_measurement_report_plmn_id_exist;
+static int hf_pmr_additionsr9_utran_csg_meas_rpt_exist;
+static int hf_pmr_additionsr9_eutran_csg_meas_rpt_exist;
+static int hf_pmr_additionsr8_eutran_meas_rpt_exist;
+static int hf_pmr_additionsr5_grnti_exist;
+static int hf_pmr_additionsr99_info3g_exist;
+static int hf_pmr_additionsr99_measurementreport3g_exist;
+static int hf_packet_measurement_report_psi5_change_mark_exist;
+static int hf_pemr_additionsr9_utran_csg_target_cell_exist;
+static int hf_pemr_additionsr9_eutran_csg_target_cell_exist;
+static int hf_bitmap_report_quantity_reporting_quantity_exist;
+static int hf_pemr_additionsr8_eutran_meas_rpt_exist;
+static int hf_pemr_additionsr5_grnti_ext_exist;
+static int hf_packet_measurement_order_nc_measurement_parameters_exist;
+static int hf_packet_measurement_order_ext_measurement_parameters_exist;
+static int hf_fdd_target_cell_notif_bandwith_fdd_exist;
+static int hf_tdd_target_cell_notif_bandwith_tdd_exist;
+static int hf_target_cell_3g_notif_fdd_description_exist;
+static int hf_target_cell_3g_notif_tdd_description_exist;
+static int hf_target_eutran_cell_notif_measurement_bandwidth_exist;
+static int hf_target_cell_4g_notif_arfcn_exist;
+static int hf_target_cell_4g_notif_3g_target_cell_exist;
+static int hf_target_cell_4g_notif_eutran_target_cell_exist;
+static int hf_target_cell_4g_notif_eutran_ccn_measurement_report_exist;
+static int hf_target_cell_csg_notif_eutran_ccn_measurement_report_exist;
+static int hf_pccn_additionsr6_ba_used_3g_exist;
+static int hf_packet_cell_change_continue_id_exist;
+static int hf_pho_downlinkassignment_egprs_windowsize_exist;
+static int hf_pho_usf_1_7_usf_exist;
+static int hf_pho_uplinkassignment_channelcodingcommand_exist;
+static int hf_pho_uplinkassignment_egprs_channelcodingcommand_exist;
+static int hf_pho_uplinkassignment_egprs_windowsize_exist;
+static int hf_pho_uplinkassignment_tbf_timeslotallocation_exist;
+static int hf_globaltimeslotdescription_ua_pho_ua_exist;
+static int hf_pho_gprs_channelcodingcommand_exist;
+static int hf_pho_gprs_globaltimeslotdescription_ua_exist;
+static int hf_pho_gprs_downlinkassignment_exist;
+static int hf_egprs_description_egprs_windowsize_exist;
+static int hf_egprs_description_bep_period2_exist;
+static int hf_downlinktbf_egprs_description_exist;
+static int hf_downlinktbf_downlinkassignment_exist;
+static int hf_pho_egprs_egprs_windowsize_exist;
+static int hf_pho_egprs_egprs_channelcodingcommand_exist;
+static int hf_pho_egprs_bep_period2_exist;
+static int hf_pho_egprs_globaltimeslotdescription_ua_exist;
+static int hf_pho_egprs_downlinktbf_exist;
+static int hf_pho_timingadvance_packetextendedtimingadvance_exist;
+static int hf_pho_radioresources_handoverreference_exist;
+static int hf_pho_radioresources_ccn_active_exist;
+static int hf_pho_radioresources_ccn_active_3g_exist;
+static int hf_pho_radioresources_ccn_support_description_exist;
+static int hf_pho_radioresources_pho_timingadvance_exist;
+static int hf_pho_radioresources_po_pr_exist;
+static int hf_pho_radioresources_uplinkcontroltimeslot_exist;
+static int hf_ps_handoverto_a_gb_modepayload_nas_container_exist;
+static int hf_psi1_psi_count_hr_exist;
+static int hf_non_gprs_cell_options_t3212_exist;
+static int hf_non_gprs_cell_options_extension_bits_exist;
+static int hf_psi2_cell_identification_exist;
+static int hf_psi2_non_gprs_cell_options_exist;
+static int hf_serving_cell_params_hcs_exist;
+static int hf_gen_cell_sel_t_resel_exist;
+static int hf_gen_cell_sel_ra_reselect_hysteresis_exist;
+static int hf_compact_cell_sel_gprs_rxlev_access_min_exist;
+static int hf_compact_cell_sel_gprs_temporary_offset_exist;
+static int hf_compact_cell_sel_gprs_reselect_offset_exist;
+static int hf_compact_cell_sel_hcs_parm_exist;
+static int hf_compact_cell_sel_time_group_exist;
+static int hf_compact_cell_sel_guar_constant_pwr_blks_exist;
+static int hf_psi3_additionr4_ccn_support_desc_exist;
+static int hf_psi3_additionr99_compact_info_exist;
+static int hf_psi3_additionr99_additionr4_exist;
+static int hf_psi3_additionr98_lsa_parameters_exist;
+static int hf_psi3_additionr98_additionr99_exist;
+static int hf_psi3_additionr98_exist;
+static int hf_measurementparams_multi_band_reporting_exist;
+static int hf_measurementparams_serving_band_reporting_exist;
+static int hf_measurementparams_scale_ord_exist;
+static int hf_measurementparams_offsetthreshold900_exist;
+static int hf_measurementparams_offsetthreshold1800_exist;
+static int hf_measurementparams_offsetthreshold400_exist;
+static int hf_measurementparams_offsetthreshold1900_exist;
+static int hf_measurementparams_offsetthreshold850_exist;
+static int hf_gprsmeasurementparams3g_psi5_existrepparamsfdd_exist;
+static int hf_gprsmeasurementparams3g_psi5_existreportingparamsfdd_exist;
+static int hf_gprsmeasurementparams3g_psi5_existmultiratreportingtdd_exist;
+static int hf_gprsmeasurementparams3g_psi5_existoffsetthresholdtdd_exist;
+static int hf_enh_reporting_parameters_ncc_permitted_exist;
+static int hf_enh_reporting_parameters_gprsmeasurementparams_exist;
+static int hf_enh_reporting_parameters_gprsmeasurementparams3g_exist;
+static int hf_psi5_additions_offsetthreshold_700_exist;
+static int hf_psi5_additions_offsetthreshold_810_exist;
+static int hf_psi5_additions_gprs_additionalmeasurementparams3g_exist;
+static int hf_psi5_additions_additionsr7_exist;
+static int hf_psi5_additionsr_enh_reporting_param_exist;
+static int hf_psi5_additionsr_additionsr5_exist;
+static int hf_psi5_eixst_nc_meas_param_exist;
+static int hf_psi13_additions_lb_ms_txpwr_max_cch_exist;
+static int hf_psi13_additions_additionsr6_exist;
+static int hf_psi13_additionr_additionsr4_exist;
+static int hf_psi13_ma_exist;
+static int hf_pccf_additionsr8_additionsr9_exist;
+static int hf_pccf_additionsr5_additionsr8_exist;
+static int hf_pccf_additionsr99_additionsr5_exist;
+static int hf_pmo_additionsr8_existadditionsr9_exist;
+static int hf_pmo_additionsr7_existadditionsr8_exist;
+static int hf_pmo_additionsr6_existadditionsr7_exist;
+static int hf_pmo_additionsr5_existadditionsr6_exist;
+static int hf_pcco_additionsr5_existadditionsr6_exist;
+static int hf_pmo_additionsr4_additionsr5_exist;
+static int hf_pmo_additionsr99_additionsr4_exist;
+static int hf_pcco_additionsr4_additionsr5_exist;
+static int hf_target_cell_gsm_additionsr98_exist;
+static int hf_target_cell_3g_additionsr5_additionsr8_exist;
+static int hf_target_cell_3g_additionsr5_exist;
+static int hf_pmr_additionsr8_additionsr9_exist;
+static int hf_pmr_additionsr5_additionsr8_exist;
+static int hf_pmr_additionsr99_additionsr5_exist;
+static int hf_pemr_additionsr8_additionsr9_exist;
+static int hf_pemr_additionsr5_additionsr8_exist;
+static int hf_packet_enh_measurement_report_additionsr5_exist;
+static int hf_packet_measurement_order_additionsr98_exist;
+static int hf_packet_cell_change_notification_additionsr6_exist;
+static int hf_psi1_additionsr99_additionsr6_exist;
+static int hf_packet_paging_request_repeated_page_info_exist;
+static int hf_neighbourcelllist_parameters_exist;
+static int hf_nc_frequency_list_add_frequency_exist;
+static int hf_utran_fdd_description_cellparams_exist;
+static int hf_utran_tdd_description_cellparams_exist;
+static int hf_nc_lu_modeonlycapablecelllist_add_lu_modeonlyfrequencylist_exist;
+static int hf_priorityparametersdescription3g_pmo_repeatedutran_priorityparameters_a_exist;
+static int hf_repeatedeutran_neighbourcells_eutran_cells_a_exist;
+static int hf_pcid_group_ie_pcid_pattern_a_exist;
+static int hf_repeatedeutran_notallowedcells_eutran_frequency_index_a_exist;
+static int hf_repeatedeutran_pcid_to_ta_mapping_pcid_tota_mapping_a_exist;
+static int hf_repeatedeutran_pcid_to_ta_mapping_eutran_frequency_index_a_exist;
+static int hf_eutran_parametersdescription_pmo_repeatedeutran_neighbourcells_a_exist;
+static int hf_eutran_parametersdescription_pmo_repeatedeutran_notallowedcells_a_exist;
+static int hf_eutran_parametersdescription_pmo_repeatedeutran_pcid_to_ta_mapping_a_exist;
+static int hf_psc_group_psc_pattern_exist;
+static int hf_threeg_csg_description_threeg_csg_description_body_exist;
+static int hf_eutran_csg_description_eutran_csg_description_body_exist;
+static int hf_enh_cell_reselect_param_desp_repeated_eutran_enhanced_cell_reselection_parameters_exist;
+static int hf_threeg_individual_priority_parameters_description_repeated_individual_utran_priority_parameters_exist;
+static int hf_eutran_individual_priority_parameters_description_repeated_individual_eutran_priority_parameters_exist;
+static int hf_lsa_id_info_lsa_id_info_elements_exist;
+static int hf_compact_info_compact_neighbour_cell_param_exist;
+static int hf_packet_access_reject_reject_exist;
+static int hf_enh_nc_measurement_report_repeatedinvalid_bsic_info_exist;
+static int hf_nonhoppingpccch_carriers_exist;
+static int hf_psi2_reference_frequency_exist;
+static int hf_psi2_gprs_ma_exist;
+static int hf_psi2_pccch_description_exist;
+
+
+static expert_field ei_li;
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_gsm_rlcmac_coding_scheme_invalid = EI_INIT;
-static expert_field ei_gsm_rlcmac_gprs_fanr_header_dissection_not_supported = EI_INIT;
-static expert_field ei_gsm_rlcmac_coding_scheme_unknown = EI_INIT;
-static expert_field ei_gsm_rlcmac_egprs_header_type_not_handled = EI_INIT;
-static expert_field ei_gsm_rlcmac_unexpected_header_extension = EI_INIT;
-static expert_field ei_gsm_rlcmac_unknown_pacch_access_burst = EI_INIT;
-static expert_field ei_gsm_rlcmac_stream_not_supported = EI_INIT;
+static expert_field ei_gsm_rlcmac_coding_scheme_invalid;
+static expert_field ei_gsm_rlcmac_gprs_fanr_header_dissection_not_supported;
+static expert_field ei_gsm_rlcmac_coding_scheme_unknown;
+static expert_field ei_gsm_rlcmac_egprs_header_type_not_handled;
+static expert_field ei_gsm_rlcmac_unexpected_header_extension;
+static expert_field ei_gsm_rlcmac_unknown_pacch_access_burst;
+static expert_field ei_gsm_rlcmac_stream_not_supported;
 
 /* Payload type as defined in TS 44.060 / 10.4.7 */
 #define PAYLOAD_TYPE_DATA              0
diff --git a/epan/dissectors/packet-gsm_rlp.c b/epan/dissectors/packet-gsm_rlp.c
index c13cde9856..d940a8b971 100644
--- a/epan/dissectors/packet-gsm_rlp.c
+++ b/epan/dissectors/packet-gsm_rlp.c
@@ -19,26 +19,26 @@
 
 void proto_register_gsmrlp(void);
 
-static int proto_gsmrlp = -1;
-
-static int hf_gsmrlp_cr = -1;
-static int hf_gsmrlp_pf = -1;
-static int hf_gsmrlp_n_r = -1;
-static int hf_gsmrlp_n_s = -1;
-static int hf_gsmrlp_ftype = -1;
-static int hf_gsmrlp_s_ftype = -1;
-static int hf_gsmrlp_u_ftype = -1;
-static int hf_gsmrlp_fcs = -1;
-static int hf_gsmrlp_fcs_status = -1;
-
-static int hf_gsmrlp_xid_p_type = -1;
-static int hf_gsmrlp_xid_p_len = -1;
-static int hf_gsmrlp_xid_p_val = -1;
-
-static int ett_gsmrlp = -1;
-static int ett_gsmrlp_xid = -1;
-
-static expert_field ei_gsmrlp_fcs_bad = EI_INIT;
+static int proto_gsmrlp;
+
+static int hf_gsmrlp_cr;
+static int hf_gsmrlp_pf;
+static int hf_gsmrlp_n_r;
+static int hf_gsmrlp_n_s;
+static int hf_gsmrlp_ftype;
+static int hf_gsmrlp_s_ftype;
+static int hf_gsmrlp_u_ftype;
+static int hf_gsmrlp_fcs;
+static int hf_gsmrlp_fcs_status;
+
+static int hf_gsmrlp_xid_p_type;
+static int hf_gsmrlp_xid_p_len;
+static int hf_gsmrlp_xid_p_val;
+
+static int ett_gsmrlp;
+static int ett_gsmrlp_xid;
+
+static expert_field ei_gsmrlp_fcs_bad;
 
 static dissector_handle_t l2rcop_handle;
 static gboolean decode_as_l2rcop = true;
diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c
index b026b9d22d..31355c10c8 100644
--- a/epan/dissectors/packet-gsm_sim.c
+++ b/epan/dissectors/packet-gsm_sim.c
@@ -21,340 +21,340 @@
 void proto_register_gsm_sim(void);
 void proto_reg_handoff_gsm_sim(void);
 
-static int proto_gsm_sim = -1;
+static int proto_gsm_sim;
 
 /* ISO 7816-4 APDU */
-static int hf_apdu_cla_coding = -1;
-static int hf_apdu_cla_coding_ext = -1;
-static int hf_apdu_cla_secure_messaging_ind = -1;
-static int hf_apdu_cla_secure_messaging_ind_ext = -1;
-static int hf_apdu_cla_log_chan = -1;
-static int hf_apdu_cla_log_chan_ext = -1;
-static int hf_apdu_ins = -1;
-static int hf_apdu_p1 = -1;
-static int hf_apdu_p2 = -1;
-static int hf_apdu_p3 = -1;
-static int hf_apdu_data = -1;
-static int hf_apdu_sw = -1;
-
-static int hf_file_id = -1;
-static int hf_aid = -1;
-static int hf_bin_offset = -1;
-static int hf_sfi = -1;
-static int hf_record_nr = -1;
-static int hf_auth_rand = -1;
-static int hf_auth_sres = -1;
-static int hf_auth_kc = -1;
-static int hf_chan_op = -1;
-static int hf_chan_nr = -1;
-static int hf_le = -1;
+static int hf_apdu_cla_coding;
+static int hf_apdu_cla_coding_ext;
+static int hf_apdu_cla_secure_messaging_ind;
+static int hf_apdu_cla_secure_messaging_ind_ext;
+static int hf_apdu_cla_log_chan;
+static int hf_apdu_cla_log_chan_ext;
+static int hf_apdu_ins;
+static int hf_apdu_p1;
+static int hf_apdu_p2;
+static int hf_apdu_p3;
+static int hf_apdu_data;
+static int hf_apdu_sw;
+
+static int hf_file_id;
+static int hf_aid;
+static int hf_bin_offset;
+static int hf_sfi;
+static int hf_record_nr;
+static int hf_auth_rand;
+static int hf_auth_sres;
+static int hf_auth_kc;
+static int hf_chan_op;
+static int hf_chan_nr;
+static int hf_le;
 
 /* Chapter 5.2 TS 11.14 and TS 31.111 */
-static int hf_tprof_b1 = -1;
-static int hf_tprof_b2 = -1;
-static int hf_tprof_b3 = -1;
-static int hf_tprof_b4 = -1;
-static int hf_tprof_b5 = -1;
-static int hf_tprof_b6 = -1;
-static int hf_tprof_b7 = -1;
-static int hf_tprof_b8 = -1;
-static int hf_tprof_b9 = -1;
-static int hf_tprof_b10 = -1;
-static int hf_tprof_b11 = -1;
-static int hf_tprof_b12 = -1;
-static int hf_tprof_b13 = -1;
-static int hf_tprof_b14 = -1;
-static int hf_tprof_b15 = -1;
-static int hf_tprof_b16 = -1;
-static int hf_tprof_b17 = -1;
-static int hf_tprof_b18 = -1;
-static int hf_tprof_b19 = -1;
-static int hf_tprof_b20 = -1;
-static int hf_tprof_b21 = -1;
-static int hf_tprof_b22 = -1;
-static int hf_tprof_b23 = -1;
-static int hf_tprof_b24 = -1;
-static int hf_tprof_b25 = -1;
-static int hf_tprof_b26 = -1;
-static int hf_tprof_b27 = -1;
-static int hf_tprof_b28 = -1;
-static int hf_tprof_b29 = -1;
-static int hf_tprof_b30 = -1;
-static int hf_tprof_b31 = -1;
-static int hf_tprof_b32 = -1;
-static int hf_tprof_b33 = -1;
-static int hf_tprof_unknown_byte = -1;
+static int hf_tprof_b1;
+static int hf_tprof_b2;
+static int hf_tprof_b3;
+static int hf_tprof_b4;
+static int hf_tprof_b5;
+static int hf_tprof_b6;
+static int hf_tprof_b7;
+static int hf_tprof_b8;
+static int hf_tprof_b9;
+static int hf_tprof_b10;
+static int hf_tprof_b11;
+static int hf_tprof_b12;
+static int hf_tprof_b13;
+static int hf_tprof_b14;
+static int hf_tprof_b15;
+static int hf_tprof_b16;
+static int hf_tprof_b17;
+static int hf_tprof_b18;
+static int hf_tprof_b19;
+static int hf_tprof_b20;
+static int hf_tprof_b21;
+static int hf_tprof_b22;
+static int hf_tprof_b23;
+static int hf_tprof_b24;
+static int hf_tprof_b25;
+static int hf_tprof_b26;
+static int hf_tprof_b27;
+static int hf_tprof_b28;
+static int hf_tprof_b29;
+static int hf_tprof_b30;
+static int hf_tprof_b31;
+static int hf_tprof_b32;
+static int hf_tprof_b33;
+static int hf_tprof_unknown_byte;
 /* First byte */
-static int hf_tp_prof_dld = -1;
-static int hf_tp_sms_data_dld = -1;
-static int hf_tp_cb_data_dld = -1;
-static int hf_tp_menu_sel = -1;
-static int hf_tp_sms_data_dld_support = -1;
-static int hf_tp_timer_exp = -1;
-static int hf_tp_cc_sim_support = -1;
-static int hf_tp_cc_sim_support2 = -1;
+static int hf_tp_prof_dld;
+static int hf_tp_sms_data_dld;
+static int hf_tp_cb_data_dld;
+static int hf_tp_menu_sel;
+static int hf_tp_sms_data_dld_support;
+static int hf_tp_timer_exp;
+static int hf_tp_cc_sim_support;
+static int hf_tp_cc_sim_support2;
 /* Second byte (Other) */
-static int hf_tp_cmd_res = -1;
-static int hf_tp_cc_sim = -1;
-static int hf_tp_cc_sim_support3 = -1;
-static int hf_tp_mo_sms_sim = -1;
-static int hf_tp_cc_sim_support4 = -1;
-static int hf_tp_ucs2_entry = -1;
-static int hf_tp_ucs2_display = -1;
-static int hf_tp_display_ext = -1;
+static int hf_tp_cmd_res;
+static int hf_tp_cc_sim;
+static int hf_tp_cc_sim_support3;
+static int hf_tp_mo_sms_sim;
+static int hf_tp_cc_sim_support4;
+static int hf_tp_ucs2_entry;
+static int hf_tp_ucs2_display;
+static int hf_tp_display_ext;
 /* 3rd byte (Proactive SIM) */
-static int hf_tp_pa_display_text = -1;
-static int hf_tp_pa_get_inkey = -1;
-static int hf_tp_pa_get_input = -1;
-static int hf_tp_pa_more_time = -1;
-static int hf_tp_pa_play_tone = -1;
-static int hf_tp_pa_poll_intv = -1;
-static int hf_tp_pa_polling_off = -1;
-static int hf_tp_pa_refresh = -1;
+static int hf_tp_pa_display_text;
+static int hf_tp_pa_get_inkey;
+static int hf_tp_pa_get_input;
+static int hf_tp_pa_more_time;
+static int hf_tp_pa_play_tone;
+static int hf_tp_pa_poll_intv;
+static int hf_tp_pa_polling_off;
+static int hf_tp_pa_refresh;
 /* 4th byte (Proactive SIM) */
-static int hf_tp_pa_select_item = -1;
-static int hf_tp_pa_send_sms = -1;
-static int hf_tp_pa_send_ss = -1;
-static int hf_tp_pa_send_ussd = -1;
-static int hf_tp_pa_set_up_call = -1;
-static int hf_tp_pa_set_up_menu = -1;
-static int hf_tp_pa_prov_loci = -1;
-static int hf_tp_pa_prov_loci_nmr = -1;
+static int hf_tp_pa_select_item;
+static int hf_tp_pa_send_sms;
+static int hf_tp_pa_send_ss;
+static int hf_tp_pa_send_ussd;
+static int hf_tp_pa_set_up_call;
+static int hf_tp_pa_set_up_menu;
+static int hf_tp_pa_prov_loci;
+static int hf_tp_pa_prov_loci_nmr;
 /* 5th byte (Event drive information) */
-static int hf_tp_pa_evt_list = -1;
-static int hf_tp_ev_mt_call = -1;
-static int hf_tp_ev_call_connected = -1;
-static int hf_tp_ev_call_disconnected = -1;
-static int hf_tp_ev_location_status = -1;
-static int hf_tp_ev_user_activity = -1;
-static int hf_tp_ev_idle_screen = -1;
-static int hf_tp_ev_cardreader_status = -1;
+static int hf_tp_pa_evt_list;
+static int hf_tp_ev_mt_call;
+static int hf_tp_ev_call_connected;
+static int hf_tp_ev_call_disconnected;
+static int hf_tp_ev_location_status;
+static int hf_tp_ev_user_activity;
+static int hf_tp_ev_idle_screen;
+static int hf_tp_ev_cardreader_status;
 /* 6th byte (Event drive information extension) */
-static int hf_tp_ev_lang_sel = -1;
-static int hf_tp_ev_brows_term = -1;
-static int hf_tp_ev_data_avail = -1;
-static int hf_tp_ev_chan_status = -1;
-static int hf_tp_ev_access_techno_change = -1;
-static int hf_tp_ev_disp_params_changed = -1;
-static int hf_tp_ev_local_conn = -1;
-static int hf_tp_ev_nwk_search_mode_change = -1;
+static int hf_tp_ev_lang_sel;
+static int hf_tp_ev_brows_term;
+static int hf_tp_ev_data_avail;
+static int hf_tp_ev_chan_status;
+static int hf_tp_ev_access_techno_change;
+static int hf_tp_ev_disp_params_changed;
+static int hf_tp_ev_local_conn;
+static int hf_tp_ev_nwk_search_mode_change;
 /* 7th byte (Multiple card proactive commands) */
-static int hf_tp_pa_power_on = -1;
-static int hf_tp_pa_power_off = -1;
-static int hf_tp_pa_perform_card_apdu = -1;
-static int hf_tp_pa_get_reader_status = -1;
-static int hf_tp_pa_get_reader_status_id = -1;
-static int hf_tp_rfu = -1;
+static int hf_tp_pa_power_on;
+static int hf_tp_pa_power_off;
+static int hf_tp_pa_perform_card_apdu;
+static int hf_tp_pa_get_reader_status;
+static int hf_tp_pa_get_reader_status_id;
+static int hf_tp_rfu;
 /* 8th byte (Proactive SIM) */
-static int hf_tp_pa_timer_start_stop = -1;
-static int hf_tp_pa_timer_get_current = -1;
-static int hf_tp_pa_prov_loci_date_tz = -1;
-static int hf_tp_pa_get_inkey_binary = -1;
-static int hf_tp_pa_set_up_idle_mode_text = -1;
-static int hf_tp_pa_run_at_command = -1;
-static int hf_tp_pa_2nd_alpha_setup_call = -1;
-static int hf_tp_pa_2nd_cc_sim_support = -1;
+static int hf_tp_pa_timer_start_stop;
+static int hf_tp_pa_timer_get_current;
+static int hf_tp_pa_prov_loci_date_tz;
+static int hf_tp_pa_get_inkey_binary;
+static int hf_tp_pa_set_up_idle_mode_text;
+static int hf_tp_pa_run_at_command;
+static int hf_tp_pa_2nd_alpha_setup_call;
+static int hf_tp_pa_2nd_cc_sim_support;
 /* 9th byte */
-static int hf_tp_display_text = -1;
-static int hf_tp_send_dtmf_cmd = -1;
-static int hf_tp_pa_prov_loci_nmr2 = -1;
-static int hf_tp_pa_prov_loci_lang = -1;
-static int hf_tp_pa_prov_loci_ta = -1;
-static int hf_tp_pa_lang_notif = -1;
-static int hf_tp_pa_launch_browser = -1;
-static int hf_tp_pa_prov_loci_access_techno = -1;
+static int hf_tp_display_text;
+static int hf_tp_send_dtmf_cmd;
+static int hf_tp_pa_prov_loci_nmr2;
+static int hf_tp_pa_prov_loci_lang;
+static int hf_tp_pa_prov_loci_ta;
+static int hf_tp_pa_lang_notif;
+static int hf_tp_pa_launch_browser;
+static int hf_tp_pa_prov_loci_access_techno;
 /* 10th byte */
-static int hf_tp_soft_key_support_select_item = -1;
-static int hf_tp_soft_key_support_set_up_menu = -1;
-static int hf_tp_rfu2 = -1;
+static int hf_tp_soft_key_support_select_item;
+static int hf_tp_soft_key_support_set_up_menu;
+static int hf_tp_rfu2;
 /* 11th byte */
-static int hf_tp_soft_key_info_max_nb = -1;
+static int hf_tp_soft_key_info_max_nb;
 /* 12th byte (Proactive SIM) */
-static int hf_tp_pa_open_chan = -1;
-static int hf_tp_pa_close_chan = -1;
-static int hf_tp_pa_recv_data = -1;
-static int hf_tp_pa_send_data = -1;
-static int hf_tp_pa_get_chan_status = -1;
-static int hf_tp_pa_serv_search = -1;
-static int hf_tp_pa_get_serv_info = -1;
-static int hf_tp_pa_decl_serv = -1;
+static int hf_tp_pa_open_chan;
+static int hf_tp_pa_close_chan;
+static int hf_tp_pa_recv_data;
+static int hf_tp_pa_send_data;
+static int hf_tp_pa_get_chan_status;
+static int hf_tp_pa_serv_search;
+static int hf_tp_pa_get_serv_info;
+static int hf_tp_pa_decl_serv;
 /* 13th byte (Proactive SIM) */
-static int hf_tp_bip_csd = -1;
-static int hf_tp_bip_gprs = -1;
-static int hf_tp_bip_bluetooth = -1;
-static int hf_tp_bip_irda = -1;
-static int hf_tp_bip_rs232 = -1;
-static int hf_tp_num_chans = -1;
+static int hf_tp_bip_csd;
+static int hf_tp_bip_gprs;
+static int hf_tp_bip_bluetooth;
+static int hf_tp_bip_irda;
+static int hf_tp_bip_rs232;
+static int hf_tp_num_chans;
 /* 14th byte (Screen height) */
-static int hf_tp_char_height = -1;
-static int hf_tp_nd = -1;
-static int hf_tp_nk = -1;
-static int hf_tp_sizing_supp = -1;
+static int hf_tp_char_height;
+static int hf_tp_nd;
+static int hf_tp_nk;
+static int hf_tp_sizing_supp;
 /* 15th byte (Screen width) */
-static int hf_tp_char_width = -1;
-static int hf_tp_var_fonts = -1;
+static int hf_tp_char_width;
+static int hf_tp_var_fonts;
 /* 16th byte (Screen effects) */
-static int hf_tp_display_resize = -1;
-static int hf_tp_text_wrapping = -1;
-static int hf_tp_text_scrolling = -1;
-static int hf_tp_text_attributes = -1;
-static int hf_tp_rfu3 = -1;
-static int hf_tp_width_red_menu = -1;
+static int hf_tp_display_resize;
+static int hf_tp_text_wrapping;
+static int hf_tp_text_scrolling;
+static int hf_tp_text_attributes;
+static int hf_tp_rfu3;
+static int hf_tp_width_red_menu;
 /* 17th byte (Proactive SIM) */
-static int hf_tp_bip_tcp_remote = -1;
-static int hf_tp_bip_udp_remote = -1;
-static int hf_tp_bip_tcp_server = -1;
-static int hf_tp_bip_tcp_local = -1;
-static int hf_tp_bip_udp_local = -1;
-static int hf_tp_bip_direct_com = -1;
-static int hf_tp_bip_eutran = -1;
-static int hf_tp_bip_hsdpa = -1;
+static int hf_tp_bip_tcp_remote;
+static int hf_tp_bip_udp_remote;
+static int hf_tp_bip_tcp_server;
+static int hf_tp_bip_tcp_local;
+static int hf_tp_bip_udp_local;
+static int hf_tp_bip_direct_com;
+static int hf_tp_bip_eutran;
+static int hf_tp_bip_hsdpa;
 /* 18th byte */
-static int hf_tp_pa_display_text_var_time_out = -1;
-static int hf_tp_pa_get_inkey_help = -1;
-static int hf_tp_bip_usb = -1;
-static int hf_tp_pa_get_inkey_var_time_out = -1;
-static int hf_tp_pa_prov_loci_esn = -1;
-static int hf_tp_cc_gprs = -1;
-static int hf_tp_pa_prov_loci_imeisv = -1;
-static int hf_tp_pa_prov_loci_search_mode_change = -1;
+static int hf_tp_pa_display_text_var_time_out;
+static int hf_tp_pa_get_inkey_help;
+static int hf_tp_bip_usb;
+static int hf_tp_pa_get_inkey_var_time_out;
+static int hf_tp_pa_prov_loci_esn;
+static int hf_tp_cc_gprs;
+static int hf_tp_pa_prov_loci_imeisv;
+static int hf_tp_pa_prov_loci_search_mode_change;
 /* 19th byte (TIA/EIA-136) */
-static int hf_tp_tia_eia_version = -1;
-static int hf_tp_rfu4 = -1;
+static int hf_tp_tia_eia_version;
+static int hf_tp_rfu4;
 /* 20th byte (TIA/EIA/IS-820-A) */
-static int hf_tp_tia_iea_is820a_reserved = -1;
+static int hf_tp_tia_iea_is820a_reserved;
 /* 21th byte (Extended Launch Browser Capability) */
-static int hf_tp_ext_launch_browser_wml = -1;
-static int hf_tp_ext_launch_browser_xhtml = -1;
-static int hf_tp_ext_launch_browser_html = -1;
-static int hf_tp_ext_launch_browser_chtml = -1;
-static int hf_tp_rfu5 = -1;
+static int hf_tp_ext_launch_browser_wml;
+static int hf_tp_ext_launch_browser_xhtml;
+static int hf_tp_ext_launch_browser_html;
+static int hf_tp_ext_launch_browser_chtml;
+static int hf_tp_rfu5;
 /* 22th byte */
-static int hf_tp_utran_ps_ext_params = -1;
-static int hf_tp_pa_prov_loci_batt_state = -1;
-static int hf_tp_pa_play_tone_melody = -1;
-static int hf_tp_mm_call_set_up_call = -1;
-static int hf_tp_toolkit_initiated_gba = -1;
-static int hf_tp_pa_retrieve_mm_msg = -1;
-static int hf_tp_pa_submit_mm_msg = -1;
-static int hf_tp_pa_display_mm_msg = -1;
+static int hf_tp_utran_ps_ext_params;
+static int hf_tp_pa_prov_loci_batt_state;
+static int hf_tp_pa_play_tone_melody;
+static int hf_tp_mm_call_set_up_call;
+static int hf_tp_toolkit_initiated_gba;
+static int hf_tp_pa_retrieve_mm_msg;
+static int hf_tp_pa_submit_mm_msg;
+static int hf_tp_pa_display_mm_msg;
 /* 23th byte */
-static int hf_tp_pa_set_frames = -1;
-static int hf_tp_pa_get_frames_status = -1;
-static int hf_tp_mms_notif_download = -1;
-static int hf_tp_alpha_id_refresh_cmd = -1;
-static int hf_tp_geo_loc_report = -1;
-static int hf_tp_pa_prov_loci_meid = -1;
-static int hf_tp_pa_prov_loci_nmr_utran_eutran = -1;
-static int hf_tp_ussd_data_download = -1;
+static int hf_tp_pa_set_frames;
+static int hf_tp_pa_get_frames_status;
+static int hf_tp_mms_notif_download;
+static int hf_tp_alpha_id_refresh_cmd;
+static int hf_tp_geo_loc_report;
+static int hf_tp_pa_prov_loci_meid;
+static int hf_tp_pa_prov_loci_nmr_utran_eutran;
+static int hf_tp_ussd_data_download;
 /* 24th byte (Class "i") */
-static int hf_tp_class_i_max_nb_frames = -1;
-static int hf_tp_rfu6 = -1;
+static int hf_tp_class_i_max_nb_frames;
+static int hf_tp_rfu6;
 /* 25th byte (Event driven information extensions) */
-static int hf_tp_evt_browsing_status = -1;
-static int hf_tp_evt_mms_transfer_status = -1;
-static int hf_tp_evt_frame_info_changed = -1;
-static int hf_tp_evt_iwlan_access_status = -1;
-static int hf_tp_evt_nw_reject_geran_utran = -1;
-static int hf_tp_evt_hci_connectivity = -1;
-static int hf_tp_evt_nw_reject_eutran = -1;
-static int hf_tp_evt_mult_access_techno_change = -1;
+static int hf_tp_evt_browsing_status;
+static int hf_tp_evt_mms_transfer_status;
+static int hf_tp_evt_frame_info_changed;
+static int hf_tp_evt_iwlan_access_status;
+static int hf_tp_evt_nw_reject_geran_utran;
+static int hf_tp_evt_hci_connectivity;
+static int hf_tp_evt_nw_reject_eutran;
+static int hf_tp_evt_mult_access_techno_change;
 /* 26th byte (Event driven information extensions) */
-static int hf_tp_evt_csg_cell_select = -1;
-static int hf_tp_evt_contactless_state_req = -1;
-static int hf_tp_rfu7 = -1;
+static int hf_tp_evt_csg_cell_select;
+static int hf_tp_evt_contactless_state_req;
+static int hf_tp_rfu7;
 /* 27th byte (Event driven information extensions) */
-static int hf_tp_rfu8 = -1;
+static int hf_tp_rfu8;
 /* 28th byte (Text attributes) */
-static int hf_tp_text_align_left = -1;
-static int hf_tp_text_align_centre = -1;
-static int hf_tp_text_align_right = -1;
-static int hf_tp_text_font_size_normal = -1;
-static int hf_tp_text_font_size_large = -1;
-static int hf_tp_text_font_size_small = -1;
-static int hf_tp_rfu9 = -1;
+static int hf_tp_text_align_left;
+static int hf_tp_text_align_centre;
+static int hf_tp_text_align_right;
+static int hf_tp_text_font_size_normal;
+static int hf_tp_text_font_size_large;
+static int hf_tp_text_font_size_small;
+static int hf_tp_rfu9;
 /* 29th byte (Text attributes) */
-static int hf_tp_text_style_normal = -1;
-static int hf_tp_text_style_bold = -1;
-static int hf_tp_text_style_italic = -1;
-static int hf_tp_text_style_underlined = -1;
-static int hf_tp_text_style_strikethrough = -1;
-static int hf_tp_text_style_text_fg_colour = -1;
-static int hf_tp_text_style_text_bg_colour = -1;
-static int hf_tp_rfu10 = -1;
+static int hf_tp_text_style_normal;
+static int hf_tp_text_style_bold;
+static int hf_tp_text_style_italic;
+static int hf_tp_text_style_underlined;
+static int hf_tp_text_style_strikethrough;
+static int hf_tp_text_style_text_fg_colour;
+static int hf_tp_text_style_text_bg_colour;
+static int hf_tp_rfu10;
 /* 30th byte */
-static int hf_tp_bip_iwlan = -1;
-static int hf_tp_pa_prov_loci_wsid = -1;
-static int hf_tp_term_app = -1;
-static int hf_tp_steering_roaming_refresh = -1;
-static int hf_tp_pa_activate = -1;
-static int hf_tp_pa_geo_loc_req = -1;
-static int hf_tp_pa_prov_loci_broadcast_nw_info = -1;
-static int hf_tp_steering_roaming_iwlan_refresh = -1;
+static int hf_tp_bip_iwlan;
+static int hf_tp_pa_prov_loci_wsid;
+static int hf_tp_term_app;
+static int hf_tp_steering_roaming_refresh;
+static int hf_tp_pa_activate;
+static int hf_tp_pa_geo_loc_req;
+static int hf_tp_pa_prov_loci_broadcast_nw_info;
+static int hf_tp_steering_roaming_iwlan_refresh;
 /* 31th byte */
-static int hf_tp_pa_contactless_state_changed = -1;
-static int hf_tp_csg_cell_discovery = -1;
-static int hf_tp_cnf_params_support_open_chan_server_mode = -1;
-static int hf_tp_com_ctrl_ims = -1;
-static int hf_tp_cat_over_modem_itf = -1;
-static int hf_tp_evt_incoming_data_ims = -1;
-static int hf_tp_evt_ims_registration = -1;
-static int hf_tp_pa_prof_env_cont = -1;
+static int hf_tp_pa_contactless_state_changed;
+static int hf_tp_csg_cell_discovery;
+static int hf_tp_cnf_params_support_open_chan_server_mode;
+static int hf_tp_com_ctrl_ims;
+static int hf_tp_cat_over_modem_itf;
+static int hf_tp_evt_incoming_data_ims;
+static int hf_tp_evt_ims_registration;
+static int hf_tp_pa_prof_env_cont;
 /* 32th byte */
-static int hf_tp_bip_ims = -1;
-static int hf_tp_pa_prov_loci_henb_ip_addr = -1;
-static int hf_tp_pa_prov_loci_henb_surround_macro = -1;
-static int hf_tp_launch_params_support_open_chan_server_mode = -1;
-static int hf_tp_direct_com_support_open_chan_server_mode = -1;
-static int hf_tp_pa_sec_prof_env_cont = -1;
-static int hf_tp_cat_serv_list_ecat_client = -1;
-static int hf_tp_support_refresh_enforcement_policy = -1;
+static int hf_tp_bip_ims;
+static int hf_tp_pa_prov_loci_henb_ip_addr;
+static int hf_tp_pa_prov_loci_henb_surround_macro;
+static int hf_tp_launch_params_support_open_chan_server_mode;
+static int hf_tp_direct_com_support_open_chan_server_mode;
+static int hf_tp_pa_sec_prof_env_cont;
+static int hf_tp_cat_serv_list_ecat_client;
+static int hf_tp_support_refresh_enforcement_policy;
 /* 33th byte */
-static int hf_tp_support_dns_addr_req = -1;
-static int hf_tp_support_nw_access_name_reuse = -1;
-static int hf_tp_ev_poll_intv_nego = -1;
-static int hf_tp_rfu11 = -1;
-
-static int hf_cat_ber_tag = -1;
-
-static int hf_seek_mode = -1;
-static int hf_seek_type = -1;
-static int hf_seek_rec_nr = -1;
-
-static int ett_sim = -1;
-static int ett_tprof_b1 = -1;
-static int ett_tprof_b2 = -1;
-static int ett_tprof_b3 = -1;
-static int ett_tprof_b4 = -1;
-static int ett_tprof_b5 = -1;
-static int ett_tprof_b6 = -1;
-static int ett_tprof_b7 = -1;
-static int ett_tprof_b8 = -1;
-static int ett_tprof_b9 = -1;
-static int ett_tprof_b10 = -1;
-static int ett_tprof_b11 = -1;
-static int ett_tprof_b12 = -1;
-static int ett_tprof_b13 = -1;
-static int ett_tprof_b14 = -1;
-static int ett_tprof_b15 = -1;
-static int ett_tprof_b16 = -1;
-static int ett_tprof_b17 = -1;
-static int ett_tprof_b18 = -1;
-static int ett_tprof_b19 = -1;
-static int ett_tprof_b20 = -1;
-static int ett_tprof_b21 = -1;
-static int ett_tprof_b22 = -1;
-static int ett_tprof_b23 = -1;
-static int ett_tprof_b24 = -1;
-static int ett_tprof_b25 = -1;
-static int ett_tprof_b26 = -1;
-static int ett_tprof_b27 = -1;
-static int ett_tprof_b28 = -1;
-static int ett_tprof_b29 = -1;
-static int ett_tprof_b30 = -1;
-static int ett_tprof_b31 = -1;
-static int ett_tprof_b32 = -1;
-static int ett_tprof_b33 = -1;
+static int hf_tp_support_dns_addr_req;
+static int hf_tp_support_nw_access_name_reuse;
+static int hf_tp_ev_poll_intv_nego;
+static int hf_tp_rfu11;
+
+static int hf_cat_ber_tag;
+
+static int hf_seek_mode;
+static int hf_seek_type;
+static int hf_seek_rec_nr;
+
+static int ett_sim;
+static int ett_tprof_b1;
+static int ett_tprof_b2;
+static int ett_tprof_b3;
+static int ett_tprof_b4;
+static int ett_tprof_b5;
+static int ett_tprof_b6;
+static int ett_tprof_b7;
+static int ett_tprof_b8;
+static int ett_tprof_b9;
+static int ett_tprof_b10;
+static int ett_tprof_b11;
+static int ett_tprof_b12;
+static int ett_tprof_b13;
+static int ett_tprof_b14;
+static int ett_tprof_b15;
+static int ett_tprof_b16;
+static int ett_tprof_b17;
+static int ett_tprof_b18;
+static int ett_tprof_b19;
+static int ett_tprof_b20;
+static int ett_tprof_b21;
+static int ett_tprof_b22;
+static int ett_tprof_b23;
+static int ett_tprof_b24;
+static int ett_tprof_b25;
+static int ett_tprof_b26;
+static int ett_tprof_b27;
+static int ett_tprof_b28;
+static int ett_tprof_b29;
+static int ett_tprof_b30;
+static int ett_tprof_b31;
+static int ett_tprof_b32;
+static int ett_tprof_b33;
 
 static dissector_handle_t sub_handle_cap;
 static dissector_handle_t sim_handle, sim_part_handle;
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index a2811f7a48..68314bd32e 100644
--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@@ -36,8 +36,8 @@
 #include "packet-gsm_map.h"
 #include "packet-sip.h"
 
-static gint proto_gsm_map = -1;
-static gint proto_sip     = -1;
+static gint proto_gsm_map;
+static gint proto_sip;
 
 void proto_register_gsm_sms(void);
 void proto_reg_handoff_gsm_sms(void);
@@ -65,192 +65,192 @@ static const char *gsm_sms_proto_name = "GSM SMS TPDU (GSM 03.40)";
 static const char *gsm_sms_proto_name_short = "GSM SMS";
 
 /* Initialize the subtree pointers */
-static gint ett_gsm_sms = -1;
-static gint ett_pid = -1;
-static gint ett_pi = -1;
-static gint ett_fcs = -1;
-static gint ett_vp = -1;
-static gint ett_scts = -1;
-static gint ett_dt = -1;
-static gint ett_st = -1;
-static gint ett_addr = -1;
-static gint ett_dcs = -1;
-static gint ett_ud = -1;
-static gint ett_udh = -1;
-
-static gint ett_udh_tfm = -1;
-static gint ett_udh_tfc = -1;
+static gint ett_gsm_sms;
+static gint ett_pid;
+static gint ett_pi;
+static gint ett_fcs;
+static gint ett_vp;
+static gint ett_scts;
+static gint ett_dt;
+static gint ett_st;
+static gint ett_addr;
+static gint ett_dcs;
+static gint ett_ud;
+static gint ett_udh;
+
+static gint ett_udh_tfm;
+static gint ett_udh_tfc;
 
 /* Initialize the protocol and registered fields */
-static int proto_gsm_sms = -1;
+static int proto_gsm_sms;
 
-static gint hf_gsm_sms_coding_group_bits2 = -1;
-static gint hf_gsm_sms_coding_group_bits4 = -1;
-static gint hf_gsm_sms_ud_multiple_messages_msg_id = -1;
-static gint hf_gsm_sms_ud_multiple_messages_msg_parts = -1;
-static gint hf_gsm_sms_ud_multiple_messages_msg_part = -1;
+static gint hf_gsm_sms_coding_group_bits2;
+static gint hf_gsm_sms_coding_group_bits4;
+static gint hf_gsm_sms_ud_multiple_messages_msg_id;
+static gint hf_gsm_sms_ud_multiple_messages_msg_parts;
+static gint hf_gsm_sms_ud_multiple_messages_msg_part;
 
 /* TPDU Parameters */
-static gint hf_gsm_sms_tp_mti_up = -1;
-static gint hf_gsm_sms_tp_mti_down = -1;
-static gint hf_gsm_sms_tp_mms = -1;
-static gint hf_gsm_sms_tp_lp = -1;
-static gint hf_gsm_sms_tp_vpf = -1;
-static gint hf_gsm_sms_tp_sri = -1;
-static gint hf_gsm_sms_tp_srr = -1;
-static gint hf_gsm_sms_tp_mr = -1;
-static gint hf_gsm_sms_tp_oa = -1;
-static gint hf_gsm_sms_tp_da = -1;
-static gint hf_gsm_sms_tp_pid = -1;
-static gint hf_gsm_sms_tp_dcs = -1;
-static gint hf_gsm_sms_tp_ra = -1;
-static gint hf_gsm_sms_tp_digits = -1;
-static gint hf_gsm_sms_tp_rp = -1;
-static gint hf_gsm_sms_tp_udhi = -1;
-static gint hf_gsm_sms_tp_rd = -1;
-static gint hf_gsm_sms_tp_srq = -1;
-static gint hf_gsm_sms_text = -1;
-static gint hf_gsm_sms_body = -1;
-static gint hf_gsm_sms_tp_fail_cause = -1;
+static gint hf_gsm_sms_tp_mti_up;
+static gint hf_gsm_sms_tp_mti_down;
+static gint hf_gsm_sms_tp_mms;
+static gint hf_gsm_sms_tp_lp;
+static gint hf_gsm_sms_tp_vpf;
+static gint hf_gsm_sms_tp_sri;
+static gint hf_gsm_sms_tp_srr;
+static gint hf_gsm_sms_tp_mr;
+static gint hf_gsm_sms_tp_oa;
+static gint hf_gsm_sms_tp_da;
+static gint hf_gsm_sms_tp_pid;
+static gint hf_gsm_sms_tp_dcs;
+static gint hf_gsm_sms_tp_ra;
+static gint hf_gsm_sms_tp_digits;
+static gint hf_gsm_sms_tp_rp;
+static gint hf_gsm_sms_tp_udhi;
+static gint hf_gsm_sms_tp_rd;
+static gint hf_gsm_sms_tp_srq;
+static gint hf_gsm_sms_text;
+static gint hf_gsm_sms_body;
+static gint hf_gsm_sms_tp_fail_cause;
 #if 0
-static gint hf_gsm_sms_tp_scts = -1;
-static gint hf_gsm_sms_tp_vp = -1;
-static gint hf_gsm_sms_tp_dt = -1;
-static gint hf_gsm_sms_tp_st = -1;
-static gint hf_gsm_sms_tp_mn = -1;
-static gint hf_gsm_sms_tp_ct = -1;
-static gint hf_gsm_sms_tp_cdl = -1;
-static gint hf_gsm_sms_tp_cd = -1;
-static gint hf_gsm_sms_tp_ud = -1;
+static gint hf_gsm_sms_tp_scts;
+static gint hf_gsm_sms_tp_vp;
+static gint hf_gsm_sms_tp_dt;
+static gint hf_gsm_sms_tp_st;
+static gint hf_gsm_sms_tp_mn;
+static gint hf_gsm_sms_tp_ct;
+static gint hf_gsm_sms_tp_cdl;
+static gint hf_gsm_sms_tp_cd;
+static gint hf_gsm_sms_tp_ud;
 #endif
-static gint hf_gsm_sms_tp_parameter_indicator = -1;
-static gint hf_gsm_sms_tp_extension = -1;
-static gint hf_gsm_sms_tp_reserved = -1;
-static gint hf_gsm_sms_tp_udl_present = -1;
-static gint hf_gsm_sms_tp_dcs_present = -1;
-static gint hf_gsm_sms_tp_pid_present = -1;
-static gint hf_gsm_sms_dis_field_addr_extension = -1;
-static gint hf_gsm_sms_dis_field_addr_num_type = -1;
-static gint hf_gsm_sms_dis_field_addr_num_plan = -1;
-static gint hf_gsm_sms_tp_pid_format_subsequent_bits = -1;
-static gint hf_gsm_sms_tp_pid_telematic_interworking = -1;
-static gint hf_gsm_sms_tp_pid_device_type = -1;
-static gint hf_gsm_sms_tp_pid_sm_al_proto = -1;
-static gint hf_gsm_sms_tp_pid_message_type = -1;
-static gint hf_gsm_sms_tp_pid_reserved = -1;
-static gint hf_gsm_sms_tp_pid_undefined = -1;
-static gint hf_gsm_sms_tp_pid_sc_specific_use = -1;
-static gint hf_gsm_sms_tp_pid_sc_specific = -1;
-static gint hf_gsm_sms_dcs_text_compressed = -1;
-static gint hf_gsm_sms_dcs_message_class_defined = -1;
-static gint hf_gsm_sms_dcs_character_set = -1;
-static gint hf_gsm_sms_dcs_message_class = -1;
-static gint hf_gsm_sms_dcs_indication_sense = -1;
-static gint hf_gsm_sms_dcs_reserved04 = -1;
-static gint hf_gsm_sms_dcs_message_waiting = -1;
-static gint hf_gsm_sms_dcs_reserved08 = -1;
-static gint hf_gsm_sms_dcs_message_coding = -1;
-static gint hf_gsm_sms_vp_extension = -1;
-static gint hf_gsm_sms_vp_extension_ignored = -1;
-static gint hf_gsm_sms_vp_single_shot_sm = -1;
-static gint hf_gsm_sms_vp_reserved = -1;
-static gint hf_gsm_sms_vp_validity_period_format = -1;
-static gint hf_gsm_sms_vp_validity_period = -1;
-static gint hf_gsm_sms_dis_field_definition = -1;
-static gint hf_gsm_sms_dis_field_st_error = -1;
+static gint hf_gsm_sms_tp_parameter_indicator;
+static gint hf_gsm_sms_tp_extension;
+static gint hf_gsm_sms_tp_reserved;
+static gint hf_gsm_sms_tp_udl_present;
+static gint hf_gsm_sms_tp_dcs_present;
+static gint hf_gsm_sms_tp_pid_present;
+static gint hf_gsm_sms_dis_field_addr_extension;
+static gint hf_gsm_sms_dis_field_addr_num_type;
+static gint hf_gsm_sms_dis_field_addr_num_plan;
+static gint hf_gsm_sms_tp_pid_format_subsequent_bits;
+static gint hf_gsm_sms_tp_pid_telematic_interworking;
+static gint hf_gsm_sms_tp_pid_device_type;
+static gint hf_gsm_sms_tp_pid_sm_al_proto;
+static gint hf_gsm_sms_tp_pid_message_type;
+static gint hf_gsm_sms_tp_pid_reserved;
+static gint hf_gsm_sms_tp_pid_undefined;
+static gint hf_gsm_sms_tp_pid_sc_specific_use;
+static gint hf_gsm_sms_tp_pid_sc_specific;
+static gint hf_gsm_sms_dcs_text_compressed;
+static gint hf_gsm_sms_dcs_message_class_defined;
+static gint hf_gsm_sms_dcs_character_set;
+static gint hf_gsm_sms_dcs_message_class;
+static gint hf_gsm_sms_dcs_indication_sense;
+static gint hf_gsm_sms_dcs_reserved04;
+static gint hf_gsm_sms_dcs_message_waiting;
+static gint hf_gsm_sms_dcs_reserved08;
+static gint hf_gsm_sms_dcs_message_coding;
+static gint hf_gsm_sms_vp_extension;
+static gint hf_gsm_sms_vp_extension_ignored;
+static gint hf_gsm_sms_vp_single_shot_sm;
+static gint hf_gsm_sms_vp_reserved;
+static gint hf_gsm_sms_vp_validity_period_format;
+static gint hf_gsm_sms_vp_validity_period;
+static gint hf_gsm_sms_dis_field_definition;
+static gint hf_gsm_sms_dis_field_st_error;
 static gint hf_gsm_sms_dis_field_st_reason[4];
-static gint hf_gsm_sms_tp_user_data_length = -1;
-static gint hf_gsm_sms_tp_command_type = -1;
-static gint hf_gsm_sms_tp_message_number = -1;
-static gint hf_gsm_sms_tp_command_data = -1;
-static gint hf_gsm_sms_tp_command_data_length = -1;
-static gint hf_gsm_sms_msg_ind_type_and_stor = -1;
-static gint hf_gsm_sms_msg_profile_id = -1;
-static gint hf_gsm_sms_ext_msg_ind_type = -1;
-static gint hf_gsm_sms_msg_ind_type = -1;
-static gint hf_gsm_sms_msg_count = -1;
-static gint hf_gsm_sms_destination_port8 = -1;
-static gint hf_gsm_sms_originator_port8 = -1;
-static gint hf_gsm_sms_destination_port16 = -1;
-static gint hf_gsm_sms_originator_port16 = -1;
-static gint hf_gsm_sms_status_report = -1;
-static gint hf_gsm_sms_status_report_short_msg = -1;
-static gint hf_gsm_sms_status_report_permanent_error = -1;
-static gint hf_gsm_sms_status_report_temp_error_no_attempt = -1;
-static gint hf_gsm_sms_status_report_temp_error_transfer = -1;
-static gint hf_gsm_sms_status_report_active = -1;
-static gint hf_gsm_sms_status_report_original_udh = -1;
-static gint hf_gsm_sms_udh_created = -1;
-static gint hf_gsm_sms_formatting_mode = -1;
-static gint hf_gsm_sms_formatting_mode_alignment = -1;
-static gint hf_gsm_sms_formatting_mode_font_size = -1;
-static gint hf_gsm_sms_formatting_mode_style_bold = -1;
-static gint hf_gsm_sms_formatting_mode_style_italic = -1;
-static gint hf_gsm_sms_formatting_mode_style_underlined = -1;
-static gint hf_gsm_sms_formatting_mode_style_strikethrough = -1;
-static gint hf_gsm_sms_ie_identifier = -1;
-static gint hf_gsm_sms_scts_year = -1;
-static gint hf_gsm_sms_scts_month = -1;
-static gint hf_gsm_sms_scts_day = -1;
-static gint hf_gsm_sms_scts_hour = -1;
-static gint hf_gsm_sms_scts_minutes = -1;
-static gint hf_gsm_sms_scts_seconds = -1;
-static gint hf_gsm_sms_scts_timezone = -1;
-static gint hf_gsm_sms_vp_validity_period_hour = -1;
-static gint hf_gsm_sms_vp_validity_period_minutes = -1;
-static gint hf_gsm_sms_vp_validity_period_seconds = -1;
+static gint hf_gsm_sms_tp_user_data_length;
+static gint hf_gsm_sms_tp_command_type;
+static gint hf_gsm_sms_tp_message_number;
+static gint hf_gsm_sms_tp_command_data;
+static gint hf_gsm_sms_tp_command_data_length;
+static gint hf_gsm_sms_msg_ind_type_and_stor;
+static gint hf_gsm_sms_msg_profile_id;
+static gint hf_gsm_sms_ext_msg_ind_type;
+static gint hf_gsm_sms_msg_ind_type;
+static gint hf_gsm_sms_msg_count;
+static gint hf_gsm_sms_destination_port8;
+static gint hf_gsm_sms_originator_port8;
+static gint hf_gsm_sms_destination_port16;
+static gint hf_gsm_sms_originator_port16;
+static gint hf_gsm_sms_status_report;
+static gint hf_gsm_sms_status_report_short_msg;
+static gint hf_gsm_sms_status_report_permanent_error;
+static gint hf_gsm_sms_status_report_temp_error_no_attempt;
+static gint hf_gsm_sms_status_report_temp_error_transfer;
+static gint hf_gsm_sms_status_report_active;
+static gint hf_gsm_sms_status_report_original_udh;
+static gint hf_gsm_sms_udh_created;
+static gint hf_gsm_sms_formatting_mode;
+static gint hf_gsm_sms_formatting_mode_alignment;
+static gint hf_gsm_sms_formatting_mode_font_size;
+static gint hf_gsm_sms_formatting_mode_style_bold;
+static gint hf_gsm_sms_formatting_mode_style_italic;
+static gint hf_gsm_sms_formatting_mode_style_underlined;
+static gint hf_gsm_sms_formatting_mode_style_strikethrough;
+static gint hf_gsm_sms_ie_identifier;
+static gint hf_gsm_sms_scts_year;
+static gint hf_gsm_sms_scts_month;
+static gint hf_gsm_sms_scts_day;
+static gint hf_gsm_sms_scts_hour;
+static gint hf_gsm_sms_scts_minutes;
+static gint hf_gsm_sms_scts_seconds;
+static gint hf_gsm_sms_scts_timezone;
+static gint hf_gsm_sms_vp_validity_period_hour;
+static gint hf_gsm_sms_vp_validity_period_minutes;
+static gint hf_gsm_sms_vp_validity_period_seconds;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_gsm_sms_dis_field_udh_user_data_header_length = -1;
-static int hf_gsm_sms_compressed_data = -1;
-static int hf_gsm_sms_dis_iei_la_large_animation = -1;
-static int hf_gsm_sms_dis_iei_vp_variable_picture = -1;
-static int hf_gsm_sms_dis_iei_vp_horizontal_dimension = -1;
-static int hf_gsm_sms_dis_iei_vp_position = -1;
-static int hf_gsm_sms_dis_iei_sp_small_picture = -1;
-static int hf_gsm_sms_dis_iei_tf_background_colour = -1;
-static int hf_gsm_sms_dis_iei_pa_position = -1;
-static int hf_gsm_sms_dis_iei_sa_position = -1;
-static int hf_gsm_sms_dis_iei_ps_position = -1;
-static int hf_gsm_sms_dis_field_ud_iei_length = -1;
-static int hf_gsm_sms_dis_iei_upi_num_corresponding_objects = -1;
-static int hf_gsm_sms_dis_iei_lp_large_picture = -1;
-static int hf_gsm_sms_dis_iei_la_position = -1;
-static int hf_gsm_sms_dis_iei_sa_small_animation = -1;
-static int hf_gsm_sms_dis_iei_tf_start_position = -1;
-static int hf_gsm_sms_dis_iei_lp_position = -1;
-static int hf_gsm_sms_gsm_7_bit_default_alphabet = -1;
-static int hf_gsm_sms_dis_iei_ps_sound_number = -1;
-static int hf_gsm_sms_ie_data = -1;
-static int hf_gsm_sms_dis_iei_vp_vertical_dimension = -1;
-static int hf_gsm_sms_dis_iei_tf_foreground_colour = -1;
-static int hf_gsm_sms_dis_iei_uds_user_defined_sound = -1;
-static int hf_gsm_sms_dis_iei_sp_position = -1;
-static int hf_gsm_sms_dis_field_addr_length = -1;
-static int hf_gsm_sms_dis_iei_uds_position = -1;
-static int hf_gsm_sms_dis_iei_tf_length = -1;
-static int hf_gsm_sms_dis_iei_pa_animation_number = -1;
-static int hf_gsm_sms_dis_iei_lang_single_shift = -1;
-static int hf_gsm_sms_dis_iei_lang_locking_shift = -1;
-static gint hf_gsm_sms_dis_field_udh_gsm_mask00 = -1;
-static gint hf_gsm_sms_dis_field_udh_gsm_mask01 = -1;
-static gint hf_gsm_sms_dis_field_udh_gsm_mask03 = -1;
-static gint hf_gsm_sms_dis_field_udh_gsm_mask07 = -1;
-static gint hf_gsm_sms_dis_field_udh_gsm_mask0f = -1;
-static gint hf_gsm_sms_dis_field_udh_gsm_mask1f = -1;
-static gint hf_gsm_sms_dis_field_udh_gsm_mask3f = -1;
-static gint hf_gsm_sms_dis_field_udh_ascii_mask00 = -1;
-static gint hf_gsm_sms_dis_field_udh_ascii_mask80 = -1;
-static gint hf_gsm_sms_dis_field_udh_ascii_maskc0 = -1;
-static gint hf_gsm_sms_dis_field_udh_ascii_maske0 = -1;
-static gint hf_gsm_sms_dis_field_udh_ascii_maskf0 = -1;
-static gint hf_gsm_sms_dis_field_udh_ascii_maskf8 = -1;
-static gint hf_gsm_sms_dis_field_udh_ascii_maskfc = -1;
-
-
-static expert_field ei_gsm_sms_short_data = EI_INIT;
-static expert_field ei_gsm_sms_unexpected_data_length = EI_INIT;
-static expert_field ei_gsm_sms_message_dissector_not_implemented = EI_INIT;
+static int hf_gsm_sms_dis_field_udh_user_data_header_length;
+static int hf_gsm_sms_compressed_data;
+static int hf_gsm_sms_dis_iei_la_large_animation;
+static int hf_gsm_sms_dis_iei_vp_variable_picture;
+static int hf_gsm_sms_dis_iei_vp_horizontal_dimension;
+static int hf_gsm_sms_dis_iei_vp_position;
+static int hf_gsm_sms_dis_iei_sp_small_picture;
+static int hf_gsm_sms_dis_iei_tf_background_colour;
+static int hf_gsm_sms_dis_iei_pa_position;
+static int hf_gsm_sms_dis_iei_sa_position;
+static int hf_gsm_sms_dis_iei_ps_position;
+static int hf_gsm_sms_dis_field_ud_iei_length;
+static int hf_gsm_sms_dis_iei_upi_num_corresponding_objects;
+static int hf_gsm_sms_dis_iei_lp_large_picture;
+static int hf_gsm_sms_dis_iei_la_position;
+static int hf_gsm_sms_dis_iei_sa_small_animation;
+static int hf_gsm_sms_dis_iei_tf_start_position;
+static int hf_gsm_sms_dis_iei_lp_position;
+static int hf_gsm_sms_gsm_7_bit_default_alphabet;
+static int hf_gsm_sms_dis_iei_ps_sound_number;
+static int hf_gsm_sms_ie_data;
+static int hf_gsm_sms_dis_iei_vp_vertical_dimension;
+static int hf_gsm_sms_dis_iei_tf_foreground_colour;
+static int hf_gsm_sms_dis_iei_uds_user_defined_sound;
+static int hf_gsm_sms_dis_iei_sp_position;
+static int hf_gsm_sms_dis_field_addr_length;
+static int hf_gsm_sms_dis_iei_uds_position;
+static int hf_gsm_sms_dis_iei_tf_length;
+static int hf_gsm_sms_dis_iei_pa_animation_number;
+static int hf_gsm_sms_dis_iei_lang_single_shift;
+static int hf_gsm_sms_dis_iei_lang_locking_shift;
+static gint hf_gsm_sms_dis_field_udh_gsm_mask00;
+static gint hf_gsm_sms_dis_field_udh_gsm_mask01;
+static gint hf_gsm_sms_dis_field_udh_gsm_mask03;
+static gint hf_gsm_sms_dis_field_udh_gsm_mask07;
+static gint hf_gsm_sms_dis_field_udh_gsm_mask0f;
+static gint hf_gsm_sms_dis_field_udh_gsm_mask1f;
+static gint hf_gsm_sms_dis_field_udh_gsm_mask3f;
+static gint hf_gsm_sms_dis_field_udh_ascii_mask00;
+static gint hf_gsm_sms_dis_field_udh_ascii_mask80;
+static gint hf_gsm_sms_dis_field_udh_ascii_maskc0;
+static gint hf_gsm_sms_dis_field_udh_ascii_maske0;
+static gint hf_gsm_sms_dis_field_udh_ascii_maskf0;
+static gint hf_gsm_sms_dis_field_udh_ascii_maskf8;
+static gint hf_gsm_sms_dis_field_udh_ascii_maskfc;
+
+
+static expert_field ei_gsm_sms_short_data;
+static expert_field ei_gsm_sms_unexpected_data_length;
+static expert_field ei_gsm_sms_message_dissector_not_implemented;
 
 static gboolean reassemble_sms = TRUE;
 static gboolean reassemble_sms_with_lower_layers_info = TRUE;
@@ -290,21 +290,21 @@ static dissector_table_t gsm_sms_dissector_tbl;
 /* Short Message reassembly */
 static reassembly_table g_sm_reassembly_table;
 static wmem_multimap_t *g_sm_fragment_params_table = NULL;
-static gint ett_gsm_sms_ud_fragment = -1;
-static gint ett_gsm_sms_ud_fragments = -1;
+static gint ett_gsm_sms_ud_fragment;
+static gint ett_gsm_sms_ud_fragments;
  /*
  * Short Message fragment handling
  */
-static int hf_gsm_sms_ud_fragments = -1;
-static int hf_gsm_sms_ud_fragment = -1;
-static int hf_gsm_sms_ud_fragment_overlap = -1;
-static int hf_gsm_sms_ud_fragment_overlap_conflicts = -1;
-static int hf_gsm_sms_ud_fragment_multiple_tails = -1;
-static int hf_gsm_sms_ud_fragment_too_long_fragment = -1;
-static int hf_gsm_sms_ud_fragment_error = -1;
-static int hf_gsm_sms_ud_fragment_count = -1;
-static int hf_gsm_sms_ud_reassembled_in = -1;
-static int hf_gsm_sms_ud_reassembled_length = -1;
+static int hf_gsm_sms_ud_fragments;
+static int hf_gsm_sms_ud_fragment;
+static int hf_gsm_sms_ud_fragment_overlap;
+static int hf_gsm_sms_ud_fragment_overlap_conflicts;
+static int hf_gsm_sms_ud_fragment_multiple_tails;
+static int hf_gsm_sms_ud_fragment_too_long_fragment;
+static int hf_gsm_sms_ud_fragment_error;
+static int hf_gsm_sms_ud_fragment_count;
+static int hf_gsm_sms_ud_reassembled_in;
+static int hf_gsm_sms_ud_reassembled_length;
 
 static const fragment_items sm_frag_items = {
     /* Fragment subtrees */
diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c
index f1b25630ba..b61ba58bde 100644
--- a/epan/dissectors/packet-gsm_sms_ud.c
+++ b/epan/dissectors/packet-gsm_sms_ud.c
@@ -54,26 +54,26 @@
 void proto_register_gsm_sms_ud(void);
 void proto_reg_handoff_gsm_sms_ud(void);
 
-static int proto_gsm_sms_ud = -1;
+static int proto_gsm_sms_ud;
 
 /*
  * Short Message fragment handling
  */
-static int hf_gsm_sms_ud_fragments = -1;
-static int hf_gsm_sms_ud_fragment = -1;
-static int hf_gsm_sms_ud_fragment_overlap = -1;
-static int hf_gsm_sms_ud_fragment_overlap_conflicts = -1;
-static int hf_gsm_sms_ud_fragment_multiple_tails = -1;
-static int hf_gsm_sms_ud_fragment_too_long_fragment = -1;
-static int hf_gsm_sms_ud_fragment_error = -1;
-static int hf_gsm_sms_ud_fragment_count = -1;
-static int hf_gsm_sms_ud_reassembled_in = -1;
-static int hf_gsm_sms_ud_reassembled_length = -1;
-static int hf_gsm_sms_ud_short_msg = -1;
-
-static gint ett_gsm_sms = -1;
-static gint ett_gsm_sms_ud_fragment = -1;
-static gint ett_gsm_sms_ud_fragments = -1;
+static int hf_gsm_sms_ud_fragments;
+static int hf_gsm_sms_ud_fragment;
+static int hf_gsm_sms_ud_fragment_overlap;
+static int hf_gsm_sms_ud_fragment_overlap_conflicts;
+static int hf_gsm_sms_ud_fragment_multiple_tails;
+static int hf_gsm_sms_ud_fragment_too_long_fragment;
+static int hf_gsm_sms_ud_fragment_error;
+static int hf_gsm_sms_ud_fragment_count;
+static int hf_gsm_sms_ud_reassembled_in;
+static int hf_gsm_sms_ud_reassembled_length;
+static int hf_gsm_sms_ud_short_msg;
+
+static gint ett_gsm_sms;
+static gint ett_gsm_sms_ud_fragment;
+static gint ett_gsm_sms_ud_fragments;
 
 /* Subdissector declarations */
 static dissector_table_t gsm_sms_dissector_table;
diff --git a/epan/dissectors/packet-gsm_um.c b/epan/dissectors/packet-gsm_um.c
index a8064f9679..0d794bc93c 100644
--- a/epan/dissectors/packet-gsm_um.c
+++ b/epan/dissectors/packet-gsm_um.c
@@ -19,19 +19,19 @@
 void proto_register_gsm_um(void);
 void proto_reg_handoff_gsm_um(void);
 
-static int proto_gsm_um = -1;
-static int hf_gsm_um_direction = -1;
-static int hf_gsm_um_channel = -1;
-static int hf_gsm_um_bsic = -1;
-static int hf_gsm_um_arfcn = -1;
-static int hf_gsm_um_band = -1;
-static int hf_gsm_um_frequency = -1;
-static int hf_gsm_um_frame = -1;
-static int hf_gsm_um_error = -1;
-static int hf_gsm_um_timeshift = -1;
-static int hf_gsm_um_l2_pseudo_len = -1;
-
-static gint ett_gsm_um = -1;
+static int proto_gsm_um;
+static int hf_gsm_um_direction;
+static int hf_gsm_um_channel;
+static int hf_gsm_um_bsic;
+static int hf_gsm_um_arfcn;
+static int hf_gsm_um_band;
+static int hf_gsm_um_frequency;
+static int hf_gsm_um_frame;
+static int hf_gsm_um_error;
+static int hf_gsm_um_timeshift;
+static int hf_gsm_um_l2_pseudo_len;
+
+static gint ett_gsm_um;
 
 static dissector_handle_t gsm_um_handle;
 
diff --git a/epan/dissectors/packet-gsmtap.c b/epan/dissectors/packet-gsmtap.c
index 7845f0022e..3fa6d212bc 100644
--- a/epan/dissectors/packet-gsmtap.c
+++ b/epan/dissectors/packet-gsmtap.c
@@ -47,40 +47,40 @@ void proto_reg_handoff_gsmtap(void);
 
 static dissector_handle_t gsmtap_handle;
 
-static int proto_gsmtap = -1;
-
-static int hf_gsmtap_version = -1;
-static int hf_gsmtap_hdrlen = -1;
-static int hf_gsmtap_type = -1;
-static int hf_gsmtap_timeslot = -1;
-static int hf_gsmtap_subslot = -1;
-static int hf_gsmtap_arfcn = -1;
-static int hf_gsmtap_uplink = -1;
-static int hf_gsmtap_pcs = -1;
-static int hf_gsmtap_signal_dbm = -1;
-static int hf_gsmtap_snr_db = -1;
-static int hf_gsmtap_frame_nr = -1;
-static int hf_gsmtap_burst_type = -1;
-static int hf_gsmtap_channel_type = -1;
-static int hf_gsmtap_tetra_channel_type = -1;
-static int hf_gsmtap_gmr1_channel_type = -1;
-static int hf_gsmtap_rrc_sub_type = -1;
-static int hf_gsmtap_e1t1_sub_type = -1;
-static int hf_gsmtap_antenna = -1;
-
-static int hf_sacch_l1h_power_lev = -1;
-static int hf_sacch_l1h_fpc = -1;
-static int hf_sacch_l1h_sro_srr = -1;
-static int hf_sacch_l1h_ta = -1;
-
-static int hf_ptcch_spare = -1;
-static int hf_ptcch_ta_idx = -1;
-static int hf_ptcch_ta_val = -1;
-static int hf_ptcch_padding = -1;
-
-static int hf_um_voice_type = -1;
-
-static gint ett_gsmtap = -1;
+static int proto_gsmtap;
+
+static int hf_gsmtap_version;
+static int hf_gsmtap_hdrlen;
+static int hf_gsmtap_type;
+static int hf_gsmtap_timeslot;
+static int hf_gsmtap_subslot;
+static int hf_gsmtap_arfcn;
+static int hf_gsmtap_uplink;
+static int hf_gsmtap_pcs;
+static int hf_gsmtap_signal_dbm;
+static int hf_gsmtap_snr_db;
+static int hf_gsmtap_frame_nr;
+static int hf_gsmtap_burst_type;
+static int hf_gsmtap_channel_type;
+static int hf_gsmtap_tetra_channel_type;
+static int hf_gsmtap_gmr1_channel_type;
+static int hf_gsmtap_rrc_sub_type;
+static int hf_gsmtap_e1t1_sub_type;
+static int hf_gsmtap_antenna;
+
+static int hf_sacch_l1h_power_lev;
+static int hf_sacch_l1h_fpc;
+static int hf_sacch_l1h_sro_srr;
+static int hf_sacch_l1h_ta;
+
+static int hf_ptcch_spare;
+static int hf_ptcch_ta_idx;
+static int hf_ptcch_ta_val;
+static int hf_ptcch_padding;
+
+static int hf_um_voice_type;
+
+static gint ett_gsmtap;
 
 enum {
 	GSMTAP_SUB_DATA = 0,
diff --git a/epan/dissectors/packet-gsmtap_log.c b/epan/dissectors/packet-gsmtap_log.c
index 92e984a817..a570ad38d3 100644
--- a/epan/dissectors/packet-gsmtap_log.c
+++ b/epan/dissectors/packet-gsmtap_log.c
@@ -20,18 +20,18 @@ void proto_reg_handoff_gsmtap_log(void);
 
 static dissector_handle_t gsmtap_log_handle;
 
-static int proto_gsmtap_log = -1;
-
-static int hf_log_ident = -1;
-static int hf_log_subsys = -1;
-static int hf_log_file_name = -1;
-static int hf_log_file_line = -1;
-static int hf_log_ts = -1;
-static int hf_log_pid = -1;
-static int hf_log_level = -1;
-static int hf_log_string = -1;
-
-static int ett_gsmtap_log = -1;
+static int proto_gsmtap_log;
+
+static int hf_log_ident;
+static int hf_log_subsys;
+static int hf_log_file_name;
+static int hf_log_file_line;
+static int hf_log_ts;
+static int hf_log_pid;
+static int hf_log_level;
+static int hf_log_string;
+
+static int ett_gsmtap_log;
 
 /* from libosmocore include/osmocom/core/logging.h */
 static const value_string gsmtap_log_levels[] = {
diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c
index 65390e60cb..affea6cf67 100644
--- a/epan/dissectors/packet-gssapi.c
+++ b/epan/dissectors/packet-gssapi.c
@@ -29,28 +29,28 @@
 void proto_register_gssapi(void);
 void proto_reg_handoff_gssapi(void);
 
-static int proto_gssapi = -1;
-
-static int hf_gssapi_token_object = -1;
-static int hf_gssapi_auth_verifier = -1;
-static int hf_gssapi_auth_credentials = -1;
-static int hf_gssapi_oid = -1;
-static int hf_gssapi_segments = -1;
-static int hf_gssapi_segment = -1;
-static int hf_gssapi_segment_overlap = -1;
-static int hf_gssapi_segment_overlap_conflict = -1;
-static int hf_gssapi_segment_multiple_tails = -1;
-static int hf_gssapi_segment_too_long_fragment = -1;
-static int hf_gssapi_segment_error = -1;
-static int hf_gssapi_segment_count = -1;
-static int hf_gssapi_reassembled_in = -1;
-static int hf_gssapi_reassembled_length = -1;
-
-static gint ett_gssapi = -1;
-static gint ett_gssapi_segment = -1;
-static gint ett_gssapi_segments = -1;
-
-static expert_field ei_gssapi_unknown_header = EI_INIT;
+static int proto_gssapi;
+
+static int hf_gssapi_token_object;
+static int hf_gssapi_auth_verifier;
+static int hf_gssapi_auth_credentials;
+static int hf_gssapi_oid;
+static int hf_gssapi_segments;
+static int hf_gssapi_segment;
+static int hf_gssapi_segment_overlap;
+static int hf_gssapi_segment_overlap_conflict;
+static int hf_gssapi_segment_multiple_tails;
+static int hf_gssapi_segment_too_long_fragment;
+static int hf_gssapi_segment_error;
+static int hf_gssapi_segment_count;
+static int hf_gssapi_reassembled_in;
+static int hf_gssapi_reassembled_length;
+
+static gint ett_gssapi;
+static gint ett_gssapi_segment;
+static gint ett_gssapi_segments;
+
+static expert_field ei_gssapi_unknown_header;
 
 static gboolean gssapi_reassembly = TRUE;
 
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index 322a3e94d6..13d195aa17 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -111,415 +111,415 @@ static guint g_gtpv0_port  = GTPv0_PORT;
 static guint g_gtpv1c_port = GTPv1C_PORT;
 static guint g_gtpv1u_port = GTPv1U_PORT;
 
-static int proto_gtp = -1;
-static int proto_gtpprime = -1;
+static int proto_gtp;
+static int proto_gtpprime;
 
 /*KTi*/
-static int hf_gtp_ie_id = -1;
-static int hf_gtp_response_in = -1;
-static int hf_gtp_response_to = -1;
-static int hf_gtp_time = -1;
-static int hf_gtp_apn = -1;
-static int hf_gtp_cause = -1;
-static int hf_gtp_chrg_char = -1;
-static int hf_gtp_chrg_char_s = -1;
-static int hf_gtp_chrg_char_n = -1;
-static int hf_gtp_chrg_char_p = -1;
-static int hf_gtp_chrg_char_f = -1;
-static int hf_gtp_chrg_char_h = -1;
-static int hf_gtp_chrg_char_r = -1;
-static int hf_gtp_chrg_id = -1;
-static int hf_gtp_chrg_ipv4 = -1;
-static int hf_gtp_chrg_ipv6 = -1;
-static int hf_gtp_ext_flow_label = -1;
-static int hf_gtp_ext_id = -1;
-static int hf_gtp_ext_val = -1;
-static int hf_gtp_ext_hdr = -1;
-static int hf_gtp_ext_hdr_next = -1;
-static int hf_gtp_ext_hdr_length = -1;
-static int hf_gtp_ext_hdr_ran_cont = -1;
-static int hf_gtp_ext_hdr_spare_bits = -1;
-static int hf_gtp_ext_hdr_spare_bytes = -1;
-static int hf_gtp_ext_hdr_long_pdcp_sn = -1;
-static int hf_gtp_ext_hdr_xw_ran_cont = -1;
-static int hf_gtp_ext_hdr_pdcpsn = -1;
-static int hf_gtp_ext_hdr_udp_port = -1;
-static int hf_gtp_flags = -1;
-static int hf_gtp_flags_ver = -1;
-static int hf_gtp_prime_flags_ver = -1;
-static int hf_gtp_flags_pt = -1;
-static int hf_gtp_flags_spare1 = -1;
-static int hf_gtp_flags_hdr_length = -1;
-static int hf_gtp_flags_snn = -1;
-static int hf_gtp_flags_spare2 = -1;
-static int hf_gtp_flags_e = -1;
-static int hf_gtp_flags_s = -1;
-static int hf_gtp_flags_pn = -1;
-static int hf_gtp_flow_ii = -1;
-static int hf_gtp_flow_label = -1;
-static int hf_gtp_flow_sig = -1;
-static int hf_gtp_gsn_addr_len = -1;
-static int hf_gtp_gsn_addr_type = -1;
-static int hf_gtp_gsn_ipv4 = -1;
-static int hf_gtp_gsn_ipv6 = -1;
-static int hf_gtp_length = -1;
-static int hf_gtp_map_cause = -1;
-static int hf_gtp_message_type = -1;
-static int hf_gtp_ms_reason = -1;
-static int hf_gtp_ms_valid = -1;
-static int hf_gtp_npdu_number = -1;
-static int hf_gtp_node_ipv4 = -1;
-static int hf_gtp_node_ipv6 = -1;
-static int hf_gtp_node_name = -1;
-static int hf_gtp_node_realm = -1;
-static int hf_gtp_nsapi = -1;
-static int hf_gtp_ptmsi = -1;
-static int hf_gtp_ptmsi_sig = -1;
-static int hf_gtp_qos_version = -1;
-static int hf_gtp_qos_spare1 = -1;
-static int hf_gtp_qos_delay = -1;
-static int hf_gtp_qos_mean = -1;
-static int hf_gtp_qos_peak = -1;
-static int hf_gtp_qos_spare2 = -1;
-static int hf_gtp_qos_precedence = -1;
-static int hf_gtp_qos_spare3 = -1;
-static int hf_gtp_qos_reliability = -1;
-static int hf_gtp_qos_al_ret_priority = -1;
-static int hf_gtp_qos_traf_class = -1;
-static int hf_gtp_qos_del_order = -1;
-static int hf_gtp_qos_del_err_sdu = -1;
-static int hf_gtp_qos_max_sdu_size = -1;
-static int hf_gtp_qos_max_ul = -1;
-static int hf_gtp_qos_max_dl = -1;
-static int hf_gtp_qos_res_ber = -1;
-static int hf_gtp_qos_sdu_err_ratio = -1;
-static int hf_gtp_qos_trans_delay = -1;
-static int hf_gtp_qos_traf_handl_prio = -1;
-static int hf_gtp_qos_guar_ul = -1;
-static int hf_gtp_qos_guar_dl = -1;
-static int hf_gtp_qos_spare4 = -1;
-static int hf_gtp_qos_sig_ind = -1;
-static int hf_gtp_qos_src_stat_desc = -1;
-static int hf_gtp_qos_arp = -1;
-static int hf_gtp_qos_arp_pvi = -1;
-static int hf_gtp_qos_arp_pl = -1;
-static int hf_gtp_qos_arp_pci = -1;
-static int hf_gtp_qos_qci = -1;
-static int hf_gtp_qos_ul_mbr = -1;
-static int hf_gtp_qos_dl_mbr = -1;
-static int hf_gtp_qos_ul_gbr = -1;
-static int hf_gtp_qos_dl_gbr = -1;
-static int hf_gtp_qos_ul_apn_ambr = -1;
-static int hf_gtp_qos_dl_apn_ambr = -1;
-static int hf_gtp_pkt_flow_id = -1;
-static int hf_gtp_rab_gtpu_dn = -1;
-static int hf_gtp_rab_gtpu_up = -1;
-static int hf_gtp_rab_pdu_dn = -1;
-static int hf_gtp_rab_pdu_up = -1;
-static int hf_gtp_uli_geo_loc_type = -1;
-static int hf_gtp_cgi_ci = -1;
-static int hf_gtp_sai_sac = -1;
-static int hf_gtp_rai_rac = -1;
-static int hf_gtp_lac = -1;
-static int hf_gtp_tac = -1;
-static int hf_gtp_ranap_cause = -1;
-static int hf_gtp_recovery = -1;
-static int hf_gtp_reorder = -1;
-static int hf_gtp_rnc_ipv4 = -1;
-static int hf_gtp_rnc_ipv6 = -1;
-static int hf_gtp_rp = -1;
-static int hf_gtp_rp_nsapi = -1;
-static int hf_gtp_rp_sms = -1;
-static int hf_gtp_rp_spare = -1;
-static int hf_gtp_sel_mode = -1;
-static int hf_gtp_seq_number = -1;
-static int hf_gtp_session = -1;
-static int hf_gtp_sndcp_number = -1;
-static int hf_gtp_tear_ind = -1;
-static int hf_gtp_teid = -1;
-static int hf_gtp_teid_cp = -1;
-static int hf_gtp_uplink_teid_cp = -1;
-static int hf_gtp_teid_data = -1;
-static int hf_gtp_uplink_teid_data = -1;
-static int hf_gtp_teid_ii = -1;
-static int hf_gtp_tid = -1;
-static int hf_gtp_tlli = -1;
-static int hf_gtp_tr_comm = -1;
-static int hf_gtp_trace_ref = -1;
-static int hf_gtp_trace_type = -1;
-static int hf_gtp_user_addr_pdp_org = -1;
-static int hf_gtp_user_addr_pdp_type = -1;
-static int hf_gtp_user_ipv4 = -1;
-static int hf_gtp_user_ipv6 = -1;
-static int hf_gtp_security_mode = -1;
-static int hf_gtp_no_of_vectors = -1;
-static int hf_gtp_cipher_algorithm = -1;
-static int hf_gtp_cksn_ksi = -1;
-static int hf_gtp_cksn = -1;
-static int hf_gtp_ksi = -1;
-static int hf_gtp_ext_length = -1;
-static int hf_gtp_utran_field = -1;
-static int hf_gtp_ext_apn_res = -1;
-static int hf_gtp_ext_rat_type = -1;
-static int hf_gtp_ext_imeisv = -1;
-static int hf_gtp_target_rnc_id = -1;
-static int hf_gtp_target_ext_rnc_id = -1;
-static int hf_gtp_bssgp_cause = -1;
-static int hf_gtp_bssgp_ra_discriminator = -1;
-static int hf_gtp_sapi = -1;
-static int hf_gtp_xid_par_len = -1;
-static int hf_gtp_rep_act_type = -1;
-static int hf_gtp_correlation_id = -1;
-static int hf_gtp_earp_pci = -1;
-static int hf_gtp_earp_pl = -1;
-static int hf_gtp_earp_pvi = -1;
-static int hf_gtp_ext_comm_flags_uasi = -1;
-static int hf_gtp_ext_comm_flags_bdwi = -1;
-static int hf_gtp_ext_comm_flags_pcri = -1;
-static int hf_gtp_ext_comm_flags_vb = -1;
-static int hf_gtp_ext_comm_flags_retloc = -1;
-static int hf_gtp_ext_comm_flags_cpsr = -1;
-static int hf_gtp_ext_comm_flags_ccrsi = -1;
-static int hf_gtp_ext_comm_flags_unauthenticated_imsi = -1;
-static int hf_gtp_csg_id = -1;
-static int hf_gtp_access_mode = -1;
-static int hf_gtp_cmi = -1;
-static int hf_gtp_csg_inf_rep_act_ucicsg = -1;
-static int hf_gtp_csg_inf_rep_act_ucishc = -1;
-static int hf_gtp_csg_inf_rep_act_uciuhc = -1;
-static int hf_gtp_ext_comm_flags_II_pnsi = -1;
-static int hf_gtp_ext_comm_flags_II_dtci = -1;
-static int hf_gtp_ext_comm_flags_II_pmtsmi = -1;
-static int hf_gtp_ext_comm_flags_II_spare = -1;
-static int hf_gtp_ciot_opt_sup_ind_sgni_pdn = -1;
-static int hf_gtp_ciot_opt_sup_ind_scni_pdn = -1;
-static int hf_gtp_ciot_opt_sup_ind_spare = -1;
-static int hf_gtp_up_fun_sel_ind_flags_dcnr = -1;
-static int hf_gtp_up_fun_sel_ind_flags_spare = -1;
-static int hf_gtp_cdr_app = -1;
-static int hf_gtp_cdr_rel = -1;
-static int hf_gtp_cdr_ver = -1;
-static int hf_gtp_cdr_rel_ext = -1;
-static int hf_gtp_cdr_length = -1;
-static int hf_gtp_cdr_context = -1;
-static int hf_gtp_cmn_flg_ppc = -1;
-static int hf_gtp_cmn_flg_mbs_srv_type = -1;
-static int hf_gtp_cmn_flg_mbs_ran_pcd_rdy = -1;
-static int hf_gtp_cmn_flg_mbs_cnt_inf = -1;
-static int hf_gtp_cmn_flg_nrsn = -1;
-static int hf_gtp_cmn_flg_no_qos_neg = -1;
-static int hf_gtp_cmn_flg_upgrd_qos_sup = -1;
-static int hf_gtp_cmn_flg_dual_addr_bearer_flg = -1;
-static int hf_gtp_linked_nsapi = -1;
-static int hf_gtp_enh_nsapi = -1;
-static int hf_gtp_tmgi = -1;
-static int hf_gtp_mbms_ses_dur_days = -1;
-static int hf_gtp_mbms_ses_dur_s = -1;
-static int hf_gtp_no_of_mbms_sa_codes = -1;
-static int hf_gtp_mbms_sa_code = -1;
-static int hf_gtp_trace_ref2 = -1;
-static int hf_gtp_trace_rec_session_ref = -1;
-static int hf_gtp_trace_triggers_ggsn_pdp = -1;
-static int hf_gtp_trace_triggers_ggsn_mbms = -1;
-static int hf_gtp_trace_triggers_ggsn = -1;
-static int hf_gtp_trace_depth = -1;
-static int hf_gtp_trace_loi_ggsn_gmb = -1;
-static int hf_gtp_trace_loi_ggsn_gi = -1;
-static int hf_gtp_trace_loi_ggsn_gn = -1;
-static int hf_gtp_trace_loi_ggsn = -1;
-static int hf_gtp_trace_activity_control = -1;
-static int hf_gtp_hop_count = -1;
-static int hf_gtp_mbs_2g_3g_ind = -1;
-static int hf_gtp_trace_triggers_bm_sc_mbms = -1;
-static int hf_gtp_trace_triggers_bm_sc = -1;
-static int hf_gtp_trace_loi_bm_sc_gmb = -1;
-static int hf_gtp_trace_loi_bm_sc = -1;
-static int hf_gtp_time_2_dta_tr = -1;
-static int hf_gtp_target_lac = -1;
-static int hf_gtp_target_rac = -1;
-static int hf_gtp_target_ci = -1;
-static int hf_gtp_source_type = -1;
-static int hf_gtp_source_lac = -1;
-static int hf_gtp_source_rac = -1;
-static int hf_gtp_source_ci = -1;
-static int hf_gtp_source_rnc_id = -1;
-static int hf_gtp_ext_ei = -1;
-static int hf_gtp_ext_gcsi = -1;
-static int hf_gtp_ext_dti = -1;
-static int hf_gtp_ra_prio_lcs = -1;
-static int hf_gtp_bcm = -1;
-static int hf_gtp_fqdn = -1;
-static int hf_gtp_rim_routing_addr = -1;
-static int hf_gtp_mbms_flow_id = -1;
-static int hf_gtp_mbms_dist_indic = -1;
-static int hf_gtp_ext_apn_ambr_ul = -1;
-static int hf_gtp_ext_apn_ambr_dl = -1;
-static int hf_gtp_ext_sub_ue_ambr_ul = -1;
-static int hf_gtp_ext_sub_ue_ambr_dl = -1;
-static int hf_gtp_ext_auth_ue_ambr_ul = -1;
-static int hf_gtp_ext_auth_ue_ambr_dl = -1;
-static int hf_gtp_ext_auth_apn_ambr_ul = -1;
-static int hf_gtp_ext_auth_apn_ambr_dl = -1;
-static int hf_gtp_ext_ggsn_back_off_time_units = -1;
-static int hf_gtp_ext_ggsn_back_off_timer = -1;
-static int hf_gtp_lapi = -1;
-static int hf_gtp_higher_br_16mb_flg = -1;
-static int hf_gtp_max_mbr_apn_ambr_ul = -1;
-static int hf_gtp_max_mbr_apn_ambr_dl = -1;
-static int hf_gtp_ext_enb_type = -1;
-static int hf_gtp_macro_enodeb_id = -1;
-static int hf_gtp_home_enodeb_id = -1;
-static int hf_gtp_dummy_octets = -1;
-
-static int hf_pdcp_cont = -1;
-
-static int hf_gtp_ext_hdr_pdu_ses_cont_pdu_type = -1;
-static int hf_gtp_ext_hdr_pdu_ses_cont_ppp = -1;
-static int hf_gtp_ext_hdr_pdu_ses_cont_rqi = -1;
-static int hf_gtp_ext_hdr_pdu_ses_cont_qos_flow_id = -1;
-static int hf_gtp_ext_hdr_pdu_ses_cont_ppi = -1;
-
-static int hf_gtp_spare_b4b0 = -1;
-static int hf_gtp_spare_b7b6 = -1;
-static int hf_gtp_spare_h1 = -1;
-static int hf_gtp_rnc_ip_addr_v4 = -1;
-static int hf_gtp_rnc_ip_addr_v6 = -1;
-static int hf_gtp_ms_cm_2_len = -1;
-static int hf_gtp_ms_cm_3_len = -1;
-static int hf_gtp_sup_codec_lst_len = -1;
-static int hf_gtp_add_flg_for_srvcc_ics = -1;
-static int hf_gtp_sel_mode_val = -1;
-static int hf_gtp_uli_timestamp = -1;
-static int hf_gtp_lhn_id = -1;
-static int hf_gtp_sel_entity = -1;
-static int hf_gtp_ue_usage_type_value = -1;
-static int hf_gtp_scef_id_length = -1;
-static int hf_gtp_scef_id = -1;
-static int hf_gtp_iov_updates_counter = -1;
-static int hf_gtp_mapped_ue_usage_type = -1;
+static int hf_gtp_ie_id;
+static int hf_gtp_response_in;
+static int hf_gtp_response_to;
+static int hf_gtp_time;
+static int hf_gtp_apn;
+static int hf_gtp_cause;
+static int hf_gtp_chrg_char;
+static int hf_gtp_chrg_char_s;
+static int hf_gtp_chrg_char_n;
+static int hf_gtp_chrg_char_p;
+static int hf_gtp_chrg_char_f;
+static int hf_gtp_chrg_char_h;
+static int hf_gtp_chrg_char_r;
+static int hf_gtp_chrg_id;
+static int hf_gtp_chrg_ipv4;
+static int hf_gtp_chrg_ipv6;
+static int hf_gtp_ext_flow_label;
+static int hf_gtp_ext_id;
+static int hf_gtp_ext_val;
+static int hf_gtp_ext_hdr;
+static int hf_gtp_ext_hdr_next;
+static int hf_gtp_ext_hdr_length;
+static int hf_gtp_ext_hdr_ran_cont;
+static int hf_gtp_ext_hdr_spare_bits;
+static int hf_gtp_ext_hdr_spare_bytes;
+static int hf_gtp_ext_hdr_long_pdcp_sn;
+static int hf_gtp_ext_hdr_xw_ran_cont;
+static int hf_gtp_ext_hdr_pdcpsn;
+static int hf_gtp_ext_hdr_udp_port;
+static int hf_gtp_flags;
+static int hf_gtp_flags_ver;
+static int hf_gtp_prime_flags_ver;
+static int hf_gtp_flags_pt;
+static int hf_gtp_flags_spare1;
+static int hf_gtp_flags_hdr_length;
+static int hf_gtp_flags_snn;
+static int hf_gtp_flags_spare2;
+static int hf_gtp_flags_e;
+static int hf_gtp_flags_s;
+static int hf_gtp_flags_pn;
+static int hf_gtp_flow_ii;
+static int hf_gtp_flow_label;
+static int hf_gtp_flow_sig;
+static int hf_gtp_gsn_addr_len;
+static int hf_gtp_gsn_addr_type;
+static int hf_gtp_gsn_ipv4;
+static int hf_gtp_gsn_ipv6;
+static int hf_gtp_length;
+static int hf_gtp_map_cause;
+static int hf_gtp_message_type;
+static int hf_gtp_ms_reason;
+static int hf_gtp_ms_valid;
+static int hf_gtp_npdu_number;
+static int hf_gtp_node_ipv4;
+static int hf_gtp_node_ipv6;
+static int hf_gtp_node_name;
+static int hf_gtp_node_realm;
+static int hf_gtp_nsapi;
+static int hf_gtp_ptmsi;
+static int hf_gtp_ptmsi_sig;
+static int hf_gtp_qos_version;
+static int hf_gtp_qos_spare1;
+static int hf_gtp_qos_delay;
+static int hf_gtp_qos_mean;
+static int hf_gtp_qos_peak;
+static int hf_gtp_qos_spare2;
+static int hf_gtp_qos_precedence;
+static int hf_gtp_qos_spare3;
+static int hf_gtp_qos_reliability;
+static int hf_gtp_qos_al_ret_priority;
+static int hf_gtp_qos_traf_class;
+static int hf_gtp_qos_del_order;
+static int hf_gtp_qos_del_err_sdu;
+static int hf_gtp_qos_max_sdu_size;
+static int hf_gtp_qos_max_ul;
+static int hf_gtp_qos_max_dl;
+static int hf_gtp_qos_res_ber;
+static int hf_gtp_qos_sdu_err_ratio;
+static int hf_gtp_qos_trans_delay;
+static int hf_gtp_qos_traf_handl_prio;
+static int hf_gtp_qos_guar_ul;
+static int hf_gtp_qos_guar_dl;
+static int hf_gtp_qos_spare4;
+static int hf_gtp_qos_sig_ind;
+static int hf_gtp_qos_src_stat_desc;
+static int hf_gtp_qos_arp;
+static int hf_gtp_qos_arp_pvi;
+static int hf_gtp_qos_arp_pl;
+static int hf_gtp_qos_arp_pci;
+static int hf_gtp_qos_qci;
+static int hf_gtp_qos_ul_mbr;
+static int hf_gtp_qos_dl_mbr;
+static int hf_gtp_qos_ul_gbr;
+static int hf_gtp_qos_dl_gbr;
+static int hf_gtp_qos_ul_apn_ambr;
+static int hf_gtp_qos_dl_apn_ambr;
+static int hf_gtp_pkt_flow_id;
+static int hf_gtp_rab_gtpu_dn;
+static int hf_gtp_rab_gtpu_up;
+static int hf_gtp_rab_pdu_dn;
+static int hf_gtp_rab_pdu_up;
+static int hf_gtp_uli_geo_loc_type;
+static int hf_gtp_cgi_ci;
+static int hf_gtp_sai_sac;
+static int hf_gtp_rai_rac;
+static int hf_gtp_lac;
+static int hf_gtp_tac;
+static int hf_gtp_ranap_cause;
+static int hf_gtp_recovery;
+static int hf_gtp_reorder;
+static int hf_gtp_rnc_ipv4;
+static int hf_gtp_rnc_ipv6;
+static int hf_gtp_rp;
+static int hf_gtp_rp_nsapi;
+static int hf_gtp_rp_sms;
+static int hf_gtp_rp_spare;
+static int hf_gtp_sel_mode;
+static int hf_gtp_seq_number;
+static int hf_gtp_session;
+static int hf_gtp_sndcp_number;
+static int hf_gtp_tear_ind;
+static int hf_gtp_teid;
+static int hf_gtp_teid_cp;
+static int hf_gtp_uplink_teid_cp;
+static int hf_gtp_teid_data;
+static int hf_gtp_uplink_teid_data;
+static int hf_gtp_teid_ii;
+static int hf_gtp_tid;
+static int hf_gtp_tlli;
+static int hf_gtp_tr_comm;
+static int hf_gtp_trace_ref;
+static int hf_gtp_trace_type;
+static int hf_gtp_user_addr_pdp_org;
+static int hf_gtp_user_addr_pdp_type;
+static int hf_gtp_user_ipv4;
+static int hf_gtp_user_ipv6;
+static int hf_gtp_security_mode;
+static int hf_gtp_no_of_vectors;
+static int hf_gtp_cipher_algorithm;
+static int hf_gtp_cksn_ksi;
+static int hf_gtp_cksn;
+static int hf_gtp_ksi;
+static int hf_gtp_ext_length;
+static int hf_gtp_utran_field;
+static int hf_gtp_ext_apn_res;
+static int hf_gtp_ext_rat_type;
+static int hf_gtp_ext_imeisv;
+static int hf_gtp_target_rnc_id;
+static int hf_gtp_target_ext_rnc_id;
+static int hf_gtp_bssgp_cause;
+static int hf_gtp_bssgp_ra_discriminator;
+static int hf_gtp_sapi;
+static int hf_gtp_xid_par_len;
+static int hf_gtp_rep_act_type;
+static int hf_gtp_correlation_id;
+static int hf_gtp_earp_pci;
+static int hf_gtp_earp_pl;
+static int hf_gtp_earp_pvi;
+static int hf_gtp_ext_comm_flags_uasi;
+static int hf_gtp_ext_comm_flags_bdwi;
+static int hf_gtp_ext_comm_flags_pcri;
+static int hf_gtp_ext_comm_flags_vb;
+static int hf_gtp_ext_comm_flags_retloc;
+static int hf_gtp_ext_comm_flags_cpsr;
+static int hf_gtp_ext_comm_flags_ccrsi;
+static int hf_gtp_ext_comm_flags_unauthenticated_imsi;
+static int hf_gtp_csg_id;
+static int hf_gtp_access_mode;
+static int hf_gtp_cmi;
+static int hf_gtp_csg_inf_rep_act_ucicsg;
+static int hf_gtp_csg_inf_rep_act_ucishc;
+static int hf_gtp_csg_inf_rep_act_uciuhc;
+static int hf_gtp_ext_comm_flags_II_pnsi;
+static int hf_gtp_ext_comm_flags_II_dtci;
+static int hf_gtp_ext_comm_flags_II_pmtsmi;
+static int hf_gtp_ext_comm_flags_II_spare;
+static int hf_gtp_ciot_opt_sup_ind_sgni_pdn;
+static int hf_gtp_ciot_opt_sup_ind_scni_pdn;
+static int hf_gtp_ciot_opt_sup_ind_spare;
+static int hf_gtp_up_fun_sel_ind_flags_dcnr;
+static int hf_gtp_up_fun_sel_ind_flags_spare;
+static int hf_gtp_cdr_app;
+static int hf_gtp_cdr_rel;
+static int hf_gtp_cdr_ver;
+static int hf_gtp_cdr_rel_ext;
+static int hf_gtp_cdr_length;
+static int hf_gtp_cdr_context;
+static int hf_gtp_cmn_flg_ppc;
+static int hf_gtp_cmn_flg_mbs_srv_type;
+static int hf_gtp_cmn_flg_mbs_ran_pcd_rdy;
+static int hf_gtp_cmn_flg_mbs_cnt_inf;
+static int hf_gtp_cmn_flg_nrsn;
+static int hf_gtp_cmn_flg_no_qos_neg;
+static int hf_gtp_cmn_flg_upgrd_qos_sup;
+static int hf_gtp_cmn_flg_dual_addr_bearer_flg;
+static int hf_gtp_linked_nsapi;
+static int hf_gtp_enh_nsapi;
+static int hf_gtp_tmgi;
+static int hf_gtp_mbms_ses_dur_days;
+static int hf_gtp_mbms_ses_dur_s;
+static int hf_gtp_no_of_mbms_sa_codes;
+static int hf_gtp_mbms_sa_code;
+static int hf_gtp_trace_ref2;
+static int hf_gtp_trace_rec_session_ref;
+static int hf_gtp_trace_triggers_ggsn_pdp;
+static int hf_gtp_trace_triggers_ggsn_mbms;
+static int hf_gtp_trace_triggers_ggsn;
+static int hf_gtp_trace_depth;
+static int hf_gtp_trace_loi_ggsn_gmb;
+static int hf_gtp_trace_loi_ggsn_gi;
+static int hf_gtp_trace_loi_ggsn_gn;
+static int hf_gtp_trace_loi_ggsn;
+static int hf_gtp_trace_activity_control;
+static int hf_gtp_hop_count;
+static int hf_gtp_mbs_2g_3g_ind;
+static int hf_gtp_trace_triggers_bm_sc_mbms;
+static int hf_gtp_trace_triggers_bm_sc;
+static int hf_gtp_trace_loi_bm_sc_gmb;
+static int hf_gtp_trace_loi_bm_sc;
+static int hf_gtp_time_2_dta_tr;
+static int hf_gtp_target_lac;
+static int hf_gtp_target_rac;
+static int hf_gtp_target_ci;
+static int hf_gtp_source_type;
+static int hf_gtp_source_lac;
+static int hf_gtp_source_rac;
+static int hf_gtp_source_ci;
+static int hf_gtp_source_rnc_id;
+static int hf_gtp_ext_ei;
+static int hf_gtp_ext_gcsi;
+static int hf_gtp_ext_dti;
+static int hf_gtp_ra_prio_lcs;
+static int hf_gtp_bcm;
+static int hf_gtp_fqdn;
+static int hf_gtp_rim_routing_addr;
+static int hf_gtp_mbms_flow_id;
+static int hf_gtp_mbms_dist_indic;
+static int hf_gtp_ext_apn_ambr_ul;
+static int hf_gtp_ext_apn_ambr_dl;
+static int hf_gtp_ext_sub_ue_ambr_ul;
+static int hf_gtp_ext_sub_ue_ambr_dl;
+static int hf_gtp_ext_auth_ue_ambr_ul;
+static int hf_gtp_ext_auth_ue_ambr_dl;
+static int hf_gtp_ext_auth_apn_ambr_ul;
+static int hf_gtp_ext_auth_apn_ambr_dl;
+static int hf_gtp_ext_ggsn_back_off_time_units;
+static int hf_gtp_ext_ggsn_back_off_timer;
+static int hf_gtp_lapi;
+static int hf_gtp_higher_br_16mb_flg;
+static int hf_gtp_max_mbr_apn_ambr_ul;
+static int hf_gtp_max_mbr_apn_ambr_dl;
+static int hf_gtp_ext_enb_type;
+static int hf_gtp_macro_enodeb_id;
+static int hf_gtp_home_enodeb_id;
+static int hf_gtp_dummy_octets;
+
+static int hf_pdcp_cont;
+
+static int hf_gtp_ext_hdr_pdu_ses_cont_pdu_type;
+static int hf_gtp_ext_hdr_pdu_ses_cont_ppp;
+static int hf_gtp_ext_hdr_pdu_ses_cont_rqi;
+static int hf_gtp_ext_hdr_pdu_ses_cont_qos_flow_id;
+static int hf_gtp_ext_hdr_pdu_ses_cont_ppi;
+
+static int hf_gtp_spare_b4b0;
+static int hf_gtp_spare_b7b6;
+static int hf_gtp_spare_h1;
+static int hf_gtp_rnc_ip_addr_v4;
+static int hf_gtp_rnc_ip_addr_v6;
+static int hf_gtp_ms_cm_2_len;
+static int hf_gtp_ms_cm_3_len;
+static int hf_gtp_sup_codec_lst_len;
+static int hf_gtp_add_flg_for_srvcc_ics;
+static int hf_gtp_sel_mode_val;
+static int hf_gtp_uli_timestamp;
+static int hf_gtp_lhn_id;
+static int hf_gtp_sel_entity;
+static int hf_gtp_ue_usage_type_value;
+static int hf_gtp_scef_id_length;
+static int hf_gtp_scef_id;
+static int hf_gtp_iov_updates_counter;
+static int hf_gtp_mapped_ue_usage_type;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_gtp_rfsp_index = -1;
-static int hf_gtp_quintuplet_ciphering_key = -1;
-static int hf_gtp_kc = -1;
-static int hf_gtp_rand = -1;
-static int hf_gtp_pdp_context_identifier = -1;
-static int hf_gtp_receive_n_pdu_number = -1;
-static int hf_gtp_container_length = -1;
-static int hf_gtp_quintuplets_length = -1;
-static int hf_gtp_auth = -1;
-static int hf_gtp_tft_length = -1;
-static int hf_gtp_ggsn_address_for_control_plane_ipv4 = -1;
-static int hf_gtp_ggsn_address_for_control_plane_ipv6 = -1;
-static int hf_gtp_ggsn_address_for_user_traffic_ipv4 = -1;
-static int hf_gtp_ggsn_address_for_user_traffic_ipv6 = -1;
-static int hf_gtp_integrity_key_ik = -1;
-static int hf_gtp_gsn_address_information_element_length = -1;
-static int hf_gtp_reordering_required = -1;
-static int hf_gtp_sres = -1;
-static int hf_gtp_data_record_format = -1;
-static int hf_gtp_timezone = -1;
-static int hf_gtp_timezone_dst = -1;
-static int hf_gtp_authentication_length = -1;
-static int hf_gtp_send_n_pdu_number = -1;
-static int hf_gtp_sequence_number_up = -1;
-static int hf_gtp_pdp_address_length = -1;
-static int hf_gtp_transaction_identifier = -1;
-static int hf_gtp_xres_length = -1;
-static int hf_gtp_ggsn_address_length = -1;
-static int hf_gtp_apn_length = -1;
-static int hf_gtp_sequence_number_down = -1;
-static int hf_gtp_pdp_address_ipv4 = -1;
-static int hf_gtp_activity_status_indicator = -1;
-static int hf_gtp_pdp_type = -1;
-static int hf_gtp_quintuplet_integrity_key = -1;
-static int hf_gtp_pdp_address_ipv6 = -1;
-static int hf_gtp_rab_setup_length = -1;
-static int hf_gtp_number_of_data_records = -1;
-static int hf_gtp_ciphering_key_kc = -1;
-static int hf_gtp_pdp_cntxt_sapi = -1;
-static int hf_gtp_xres = -1;
-static int hf_gtp_pdp_organization = -1;
-static int hf_gtp_node_address_length = -1;
-static int hf_gtp_gsn_address_length = -1;
-static int hf_gtp_vplmn_address_allowed = -1;
-static int hf_gtp_uplink_flow_label_signalling = -1;
-static int hf_gtp_extended_end_user_address = -1;
-static int hf_gtp_ciphering_key_ck = -1;
-static int hf_gtp_fqdn_length = -1;
-static int hf_gtp_seq_num_released = -1;
-static int hf_gtp_seq_num_canceled = -1;
-static int hf_gtp_requests_responded = -1;
-static int hf_gtp_hyphen_separator = -1;
-static int hf_gtp_ms_network_cap_content_len = -1;
-static int hf_gtp_iei = -1;
-static int hf_gtp_iei_mobile_id_len = -1;
-static int hf_gtp_qos_umts_length = -1;
-static int hf_gtp_num_ext_hdr_types = -1;
-static int hf_gtp_ext_hdr_type = -1;
-static int hf_gtp_tpdu_data = -1;
-
-static int hf_gtp_sgsn_address_for_control_plane_ipv4 = -1;
-static int hf_gtp_sgsn_address_for_control_plane_ipv6 = -1;
-static int hf_gtp_sgsn_address_for_user_traffic_ipv4 = -1;
-static int hf_gtp_sgsn_address_for_user_traffic_ipv6 = -1;
+static int hf_gtp_rfsp_index;
+static int hf_gtp_quintuplet_ciphering_key;
+static int hf_gtp_kc;
+static int hf_gtp_rand;
+static int hf_gtp_pdp_context_identifier;
+static int hf_gtp_receive_n_pdu_number;
+static int hf_gtp_container_length;
+static int hf_gtp_quintuplets_length;
+static int hf_gtp_auth;
+static int hf_gtp_tft_length;
+static int hf_gtp_ggsn_address_for_control_plane_ipv4;
+static int hf_gtp_ggsn_address_for_control_plane_ipv6;
+static int hf_gtp_ggsn_address_for_user_traffic_ipv4;
+static int hf_gtp_ggsn_address_for_user_traffic_ipv6;
+static int hf_gtp_integrity_key_ik;
+static int hf_gtp_gsn_address_information_element_length;
+static int hf_gtp_reordering_required;
+static int hf_gtp_sres;
+static int hf_gtp_data_record_format;
+static int hf_gtp_timezone;
+static int hf_gtp_timezone_dst;
+static int hf_gtp_authentication_length;
+static int hf_gtp_send_n_pdu_number;
+static int hf_gtp_sequence_number_up;
+static int hf_gtp_pdp_address_length;
+static int hf_gtp_transaction_identifier;
+static int hf_gtp_xres_length;
+static int hf_gtp_ggsn_address_length;
+static int hf_gtp_apn_length;
+static int hf_gtp_sequence_number_down;
+static int hf_gtp_pdp_address_ipv4;
+static int hf_gtp_activity_status_indicator;
+static int hf_gtp_pdp_type;
+static int hf_gtp_quintuplet_integrity_key;
+static int hf_gtp_pdp_address_ipv6;
+static int hf_gtp_rab_setup_length;
+static int hf_gtp_number_of_data_records;
+static int hf_gtp_ciphering_key_kc;
+static int hf_gtp_pdp_cntxt_sapi;
+static int hf_gtp_xres;
+static int hf_gtp_pdp_organization;
+static int hf_gtp_node_address_length;
+static int hf_gtp_gsn_address_length;
+static int hf_gtp_vplmn_address_allowed;
+static int hf_gtp_uplink_flow_label_signalling;
+static int hf_gtp_extended_end_user_address;
+static int hf_gtp_ciphering_key_ck;
+static int hf_gtp_fqdn_length;
+static int hf_gtp_seq_num_released;
+static int hf_gtp_seq_num_canceled;
+static int hf_gtp_requests_responded;
+static int hf_gtp_hyphen_separator;
+static int hf_gtp_ms_network_cap_content_len;
+static int hf_gtp_iei;
+static int hf_gtp_iei_mobile_id_len;
+static int hf_gtp_qos_umts_length;
+static int hf_gtp_num_ext_hdr_types;
+static int hf_gtp_ext_hdr_type;
+static int hf_gtp_tpdu_data;
+
+static int hf_gtp_sgsn_address_for_control_plane_ipv4;
+static int hf_gtp_sgsn_address_for_control_plane_ipv6;
+static int hf_gtp_sgsn_address_for_user_traffic_ipv4;
+static int hf_gtp_sgsn_address_for_user_traffic_ipv6;
 
 /* Initialize the subtree pointers */
-static gint ett_gtp = -1;
-static gint ett_gtp_flags = -1;
-static gint ett_gtp_ext = -1;
-static gint ett_gtp_ext_hdr = -1;
-static gint ett_gtp_qos = -1;
-static gint ett_gtp_qos_arp = -1;
-static gint ett_gtp_flow_ii = -1;
-static gint ett_gtp_rp = -1;
-static gint ett_gtp_pkt_flow_id = -1;
-static gint ett_gtp_trip = -1;
-static gint ett_gtp_quint = -1;
-static gint ett_gtp_proto = -1;
-static gint ett_gtp_gsn_addr = -1;
-static gint ett_gtp_tft = -1;
-static gint ett_gtp_rab_setup = -1;
-static gint ett_gtp_hdr_list = -1;
-static gint ett_gtp_node_addr = -1;
-static gint ett_gtp_rel_pack = -1;
-static gint ett_gtp_can_pack = -1;
-static gint ett_gtp_data_resp = -1;
-static gint ett_gtp_drx = -1;
-static gint ett_gtp_net_cap = -1;
-static gint ett_gtp_tmgi = -1;
-static gint ett_gtp_cdr_ver = -1;
-static gint ett_gtp_cdr_dr = -1;
-static gint ett_gtp_mm_cntxt = -1;
-static gint ett_gtp_utran_cont = -1;
-static gint ett_gtp_nr_ran_cont = -1;
-static gint ett_gtp_pdcp_no_conf = -1;
-static gint ett_pdu_session_cont = -1;
-static gint ett_gtp_trace_triggers_ggsn = -1;
-static gint ett_gtp_trace_loi_ggsn = -1;
-static gint ett_gtp_trace_triggers_bm_sc = -1;
-static gint ett_gtp_trace_loi_bm_sc = -1;
-static gint ett_gtp_bss_cont = -1;
-static gint ett_gtp_lst_set_up_pfc = -1;
-static gint ett_gtp_rrc_cont = -1;
-static gint ett_gtp_rim_routing_adr = -1;
-
-static expert_field ei_gtp_ext_hdr_pdcpsn = EI_INIT;
-static expert_field ei_gtp_ext_length_mal = EI_INIT;
-static expert_field ei_gtp_ext_length_warn = EI_INIT;
-static expert_field ei_gtp_undecoded = EI_INIT;
-static expert_field ei_gtp_message_not_found = EI_INIT;
-static expert_field ei_gtp_field_not_present = EI_INIT;
-static expert_field ei_gtp_wrong_next_field = EI_INIT;
-static expert_field ei_gtp_field_not_support_in_version = EI_INIT;
-static expert_field ei_gtp_guaranteed_bit_rate_value = EI_INIT;
-static expert_field ei_gtp_max_bit_rate_value = EI_INIT;
-static expert_field ei_gtp_ext_geo_loc_type = EI_INIT;
-static expert_field ei_gtp_iei = EI_INIT;
-static expert_field ei_gtp_unknown_extension_header = EI_INIT;
-static expert_field ei_gtp_unknown_pdu_type = EI_INIT;
-static expert_field ei_gtp_source_type_unknown = EI_INIT;
-static expert_field ei_gtp_cdr_rel_ext_invalid = EI_INIT;
+static gint ett_gtp;
+static gint ett_gtp_flags;
+static gint ett_gtp_ext;
+static gint ett_gtp_ext_hdr;
+static gint ett_gtp_qos;
+static gint ett_gtp_qos_arp;
+static gint ett_gtp_flow_ii;
+static gint ett_gtp_rp;
+static gint ett_gtp_pkt_flow_id;
+static gint ett_gtp_trip;
+static gint ett_gtp_quint;
+static gint ett_gtp_proto;
+static gint ett_gtp_gsn_addr;
+static gint ett_gtp_tft;
+static gint ett_gtp_rab_setup;
+static gint ett_gtp_hdr_list;
+static gint ett_gtp_node_addr;
+static gint ett_gtp_rel_pack;
+static gint ett_gtp_can_pack;
+static gint ett_gtp_data_resp;
+static gint ett_gtp_drx;
+static gint ett_gtp_net_cap;
+static gint ett_gtp_tmgi;
+static gint ett_gtp_cdr_ver;
+static gint ett_gtp_cdr_dr;
+static gint ett_gtp_mm_cntxt;
+static gint ett_gtp_utran_cont;
+static gint ett_gtp_nr_ran_cont;
+static gint ett_gtp_pdcp_no_conf;
+static gint ett_pdu_session_cont;
+static gint ett_gtp_trace_triggers_ggsn;
+static gint ett_gtp_trace_loi_ggsn;
+static gint ett_gtp_trace_triggers_bm_sc;
+static gint ett_gtp_trace_loi_bm_sc;
+static gint ett_gtp_bss_cont;
+static gint ett_gtp_lst_set_up_pfc;
+static gint ett_gtp_rrc_cont;
+static gint ett_gtp_rim_routing_adr;
+
+static expert_field ei_gtp_ext_hdr_pdcpsn;
+static expert_field ei_gtp_ext_length_mal;
+static expert_field ei_gtp_ext_length_warn;
+static expert_field ei_gtp_undecoded;
+static expert_field ei_gtp_message_not_found;
+static expert_field ei_gtp_field_not_present;
+static expert_field ei_gtp_wrong_next_field;
+static expert_field ei_gtp_field_not_support_in_version;
+static expert_field ei_gtp_guaranteed_bit_rate_value;
+static expert_field ei_gtp_max_bit_rate_value;
+static expert_field ei_gtp_ext_geo_loc_type;
+static expert_field ei_gtp_iei;
+static expert_field ei_gtp_unknown_extension_header;
+static expert_field ei_gtp_unknown_pdu_type;
+static expert_field ei_gtp_source_type_unknown;
+static expert_field ei_gtp_cdr_rel_ext_invalid;
 
 static const range_string assistance_info_type[] = {
     { 0,   0,   "UNKNOWN" },
@@ -537,57 +537,57 @@ static const range_string assistance_info_type[] = {
 
 /* NRUP - TS 38.425 */
 /* NR-U RAN Container */
-static int proto_nrup = -1;
-static int hf_nrup_pdu_type = -1;
-static int hf_nrup_spr_bit_extnd_flag = -1;
-static int hf_nrup_dl_discrd_blks = -1;
-static int hf_nrup_dl_flush = -1;
-static int hf_nrup_rpt_poll = -1;
-static int hf_nrup_retransmission_flag = -1;
-static int hf_nrup_ass_inf_rep_poll_flag = -1;
-static int hf_nrup_spare = -1;
-static int hf_nrup_request_out_of_seq_report = -1;
-static int hf_nrup_report_delivered = -1;
-static int hf_nrup_user_data_existence_flag = -1;
-static int hf_nrup_nr_u_seq_num = -1;
-static int hf_nrup_dl_disc_nr_pdcp_pdu_sn = -1;
-static int hf_nrup_dl_disc_num_blks = -1;
-static int hf_nrup_dl_disc_nr_pdcp_pdu_sn_start = -1;
-static int hf_nrup_dl_disc_blk_sz = -1;
-static int hf_nrup_dl_report_nr_pdcp_pdu_sn = -1;
-static int hf_nrup_high_tx_nr_pdcp_sn_ind = -1;
-static int hf_nrup_high_delivered_nr_pdcp_sn_ind = -1;
-static int hf_nrup_final_frame_ind = -1;
-static int hf_nrup_lost_pkt_rpt = -1;
-static int hf_nrup_high_retx_nr_pdcp_sn_ind = -1;
-static int hf_nrup_high_delivered_retx_nr_pdcp_sn_ind = -1;
-static int hf_nrup_cause_rpt = -1;
-static int hf_nrup_delivered_nr_pdcp_sn_range_ind = -1;
-static int hf_nrup_data_rate_ind = -1;
-static int hf_nrup_desrd_buff_sz_data_radio_bearer = -1;
-static int hf_nrup_desrd_data_rate = -1;
-static int hf_nrup_num_lost_nru_seq_num = -1;
-static int hf_nrup_start_lost_nru_seq_num = -1;
-static int hf_nrup_end_lost_nru_seq_num = -1;
-static int hf_nrup_high_success_delivered_nr_pdcp_sn = -1;
-static int hf_nrup_high_tx_nr_pdcp_sn = -1;
-static int hf_nrup_cause_val = -1;
-static int hf_nrup_high_success_delivered_retx_nr_pdcp_sn = -1;
-static int hf_nrup_high_retx_nr_pdcp_sn = -1;
-static int hf_nrup_pdcp_duplication_ind = -1;
-static int hf_nrup_assistance_information_ind = -1;
-static int hf_nrup_ul_delay_ind = -1;
-static int hf_nrup_dl_delay_ind = -1;
-static int hf_nrup_spare_2 = -1;
-static int hf_nrup_pdcp_duplication_activation_suggestion = -1;
-static int hf_nrup_num_assistance_info_fields = -1;
-static int hf_nrup_assistance_information_type = -1;
-static int hf_nrup_num_octets_radio_qa_info = -1;
-static int hf_nrup_radio_qa_info = -1;
-static int hf_nrup_ul_delay_du_result = -1;
-static int hf_nrup_dl_delay_du_result = -1;
-
-static gint ett_nrup = -1;
+static int proto_nrup;
+static int hf_nrup_pdu_type;
+static int hf_nrup_spr_bit_extnd_flag;
+static int hf_nrup_dl_discrd_blks;
+static int hf_nrup_dl_flush;
+static int hf_nrup_rpt_poll;
+static int hf_nrup_retransmission_flag;
+static int hf_nrup_ass_inf_rep_poll_flag;
+static int hf_nrup_spare;
+static int hf_nrup_request_out_of_seq_report;
+static int hf_nrup_report_delivered;
+static int hf_nrup_user_data_existence_flag;
+static int hf_nrup_nr_u_seq_num;
+static int hf_nrup_dl_disc_nr_pdcp_pdu_sn;
+static int hf_nrup_dl_disc_num_blks;
+static int hf_nrup_dl_disc_nr_pdcp_pdu_sn_start;
+static int hf_nrup_dl_disc_blk_sz;
+static int hf_nrup_dl_report_nr_pdcp_pdu_sn;
+static int hf_nrup_high_tx_nr_pdcp_sn_ind;
+static int hf_nrup_high_delivered_nr_pdcp_sn_ind;
+static int hf_nrup_final_frame_ind;
+static int hf_nrup_lost_pkt_rpt;
+static int hf_nrup_high_retx_nr_pdcp_sn_ind;
+static int hf_nrup_high_delivered_retx_nr_pdcp_sn_ind;
+static int hf_nrup_cause_rpt;
+static int hf_nrup_delivered_nr_pdcp_sn_range_ind;
+static int hf_nrup_data_rate_ind;
+static int hf_nrup_desrd_buff_sz_data_radio_bearer;
+static int hf_nrup_desrd_data_rate;
+static int hf_nrup_num_lost_nru_seq_num;
+static int hf_nrup_start_lost_nru_seq_num;
+static int hf_nrup_end_lost_nru_seq_num;
+static int hf_nrup_high_success_delivered_nr_pdcp_sn;
+static int hf_nrup_high_tx_nr_pdcp_sn;
+static int hf_nrup_cause_val;
+static int hf_nrup_high_success_delivered_retx_nr_pdcp_sn;
+static int hf_nrup_high_retx_nr_pdcp_sn;
+static int hf_nrup_pdcp_duplication_ind;
+static int hf_nrup_assistance_information_ind;
+static int hf_nrup_ul_delay_ind;
+static int hf_nrup_dl_delay_ind;
+static int hf_nrup_spare_2;
+static int hf_nrup_pdcp_duplication_activation_suggestion;
+static int hf_nrup_num_assistance_info_fields;
+static int hf_nrup_assistance_information_type;
+static int hf_nrup_num_octets_radio_qa_info;
+static int hf_nrup_radio_qa_info;
+static int hf_nrup_ul_delay_du_result;
+static int hf_nrup_dl_delay_du_result;
+
+static gint ett_nrup;
 
 typedef struct {
     int8_t rim_routing_addr_disc;
@@ -2492,7 +2492,7 @@ static dissector_handle_t pdcp_lte_handle;
 static dissector_handle_t gtp_tpdu_custom_handle;
 static dissector_table_t bssap_pdu_type_table;
 
-static int proto_pdcp_lte = -1;
+static int proto_pdcp_lte;
 
 guint32 gtp_session_count;
 
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c
index 4b8c2e91cf..b06bc2c0d8 100644
--- a/epan/dissectors/packet-gtpv2.c
+++ b/epan/dissectors/packet-gtpv2.c
@@ -49,876 +49,876 @@ static dissector_table_t gtpv2_priv_ext_dissector_table;
 
 
 /*GTPv2 Message->GTP Header(SB)*/
-static int proto_gtpv2 = -1;
-
-static int hf_gtpv2_response_in = -1;
-static int hf_gtpv2_response_to = -1;
-static int hf_gtpv2_response_time = -1;
-static int hf_gtpv2_spare_half_octet = -1;
-//static int hf_gtpv2_spare_b7_b1 = -1;
-static int hf_gtpv2_spare_b7_b2 = -1;
-static int hf_gtpv2_spare_b7_b3 = -1;
-//static int hf_gtpv2_spare_b7_b4 = -1;
-static int hf_gtpv2_spare_b7_b5 = -1;
-
-static int hf_gtpv2_spare_bits = -1;
-static int hf_gtpv2_flags = -1;
-static int hf_gtpv2_version = -1;
-static int hf_gtpv2_p = -1;
-static int hf_gtpv2_t = -1;
-static int hf_gtpv2_mp = -1;
-static int hf_gtpv2_message_type = -1;
-static int hf_gtpv2_msg_length = -1;
-static int hf_gtpv2_teid = -1;
-static int hf_gtpv2_seq = -1;
-static int hf_gtpv2_msg_prio = -1;
-static int hf_gtpv2_spare = -1;
-static int hf_gtpv2_spare_w0 = -1;
-
-static int hf_gtpv2_ie = -1;
-static int hf_gtpv2_ie_len = -1;
-static int hf_gtpv2_cr = -1;
-static int hf_gtpv2_instance = -1;
-static int hf_gtpv2_cause = -1;
-static int hf_gtpv2_cause_cs = -1;
-static int hf_gtpv2_cause_bce = -1;
-static int hf_gtpv2_cause_pce = -1;
-static int hf_gtpv2_cause_off_ie_t = -1;
-static int hf_gtpv2_rec = -1;
+static int proto_gtpv2;
+
+static int hf_gtpv2_response_in;
+static int hf_gtpv2_response_to;
+static int hf_gtpv2_response_time;
+static int hf_gtpv2_spare_half_octet;
+//static int hf_gtpv2_spare_b7_b1;
+static int hf_gtpv2_spare_b7_b2;
+static int hf_gtpv2_spare_b7_b3;
+//static int hf_gtpv2_spare_b7_b4;
+static int hf_gtpv2_spare_b7_b5;
+
+static int hf_gtpv2_spare_bits;
+static int hf_gtpv2_flags;
+static int hf_gtpv2_version;
+static int hf_gtpv2_p;
+static int hf_gtpv2_t;
+static int hf_gtpv2_mp;
+static int hf_gtpv2_message_type;
+static int hf_gtpv2_msg_length;
+static int hf_gtpv2_teid;
+static int hf_gtpv2_seq;
+static int hf_gtpv2_msg_prio;
+static int hf_gtpv2_spare;
+static int hf_gtpv2_spare_w0;
+
+static int hf_gtpv2_ie;
+static int hf_gtpv2_ie_len;
+static int hf_gtpv2_cr;
+static int hf_gtpv2_instance;
+static int hf_gtpv2_cause;
+static int hf_gtpv2_cause_cs;
+static int hf_gtpv2_cause_bce;
+static int hf_gtpv2_cause_pce;
+static int hf_gtpv2_cause_off_ie_t;
+static int hf_gtpv2_rec;
 /*Start SRVCC Messages*/
-static int hf_gtpv2_stn_sr = -1;
-static int hf_gtpv2_len_trans_con = -1;
-static int hf_gtpv2_eksi = -1;
-static int hf_gtpv2_ck = -1;
-static int hf_gtpv2_ik = -1;
-static int hf_gtpv2_len_ms_classmark2 = -1;
-static int hf_gtpv2_len_ms_classmark3 = -1;
-static int hf_gtpv2_len_supp_codec_list = -1;
-static int hf_gtpv2_ksi = -1;
-/*static int hf_gtpv2_kc = -1; */
-static int hf_gtpv2_cksn = -1;
-static int hf_gtpv2_srvcc_cause = -1;
-static int hf_gtpv2_rac = -1;
-static int hf_gtpv2_rnc_id = -1;
-static int hf_gtpv2_ext_rnc_id = -1;
-static int hf_gtpv2_lac = -1;
-static int hf_gtpv2_sac = -1;
-static int hf_gtpv2_tgt_g_cell_id = -1;
-static int hf_gtpv2_teid_c = -1;
-static int hf_gtpv2_sv_sti = -1;
-static int hf_gtpv2_sv_ics = -1;
-static int hf_gtpv2_sv_emind = -1;
+static int hf_gtpv2_stn_sr;
+static int hf_gtpv2_len_trans_con;
+static int hf_gtpv2_eksi;
+static int hf_gtpv2_ck;
+static int hf_gtpv2_ik;
+static int hf_gtpv2_len_ms_classmark2;
+static int hf_gtpv2_len_ms_classmark3;
+static int hf_gtpv2_len_supp_codec_list;
+static int hf_gtpv2_ksi;
+/*static int hf_gtpv2_kc; */
+static int hf_gtpv2_cksn;
+static int hf_gtpv2_srvcc_cause;
+static int hf_gtpv2_rac;
+static int hf_gtpv2_rnc_id;
+static int hf_gtpv2_ext_rnc_id;
+static int hf_gtpv2_lac;
+static int hf_gtpv2_sac;
+static int hf_gtpv2_tgt_g_cell_id;
+static int hf_gtpv2_teid_c;
+static int hf_gtpv2_sv_sti;
+static int hf_gtpv2_sv_ics;
+static int hf_gtpv2_sv_emind;
 /*End SRVCC Messages*/
-static int hf_gtpv2_apn = -1;
-static int hf_gtpv2_ebi = -1;
-static int hf_gtpv2_daf = -1;
-static int hf_gtpv2_dtf = -1;
-static int hf_gtpv2_hi = -1;
-static int hf_gtpv2_dfi = -1;
-static int hf_gtpv2_oi = -1;
-static int hf_gtpv2_isrsi = -1;
-static int hf_gtpv2_israi = -1;
-static int hf_gtpv2_sgwci = -1;
-static int hf_gtpv2_sqci = -1;
-static int hf_gtpv2_uimsi = -1;
-static int hf_gtpv2_cfsi = -1;
-static int hf_gtpv2_crsi = -1;
-static int hf_gtpv2_pt = -1;
-static int hf_gtpv2_ps = -1;
-static int hf_gtpv2_si = -1;
-static int hf_gtpv2_msv = -1;
-static int hf_gtpv2_retloc = -1;
-static int hf_gtpv2_pbic = -1;
-static int hf_gtpv2_srni = -1;
-static int hf_gtpv2_s6af = -1;
-static int hf_gtpv2_s4af = -1;
-static int hf_gtpv2_mbmdt = -1;
-static int hf_gtpv2_israu = -1;
-static int hf_gtpv2_ccrsi = -1;
-static int hf_gtpv2_cprai = -1;
-static int hf_gtpv2_arrl = -1;
-static int hf_gtpv2_ppof = -1;
-static int hf_gtpv2_ppon_ppei = -1;
-static int hf_gtpv2_ppsi = -1;
-static int hf_gtpv2_csfbi = -1;
-static int hf_gtpv2_clii = -1;
-static int hf_gtpv2_cpsr = -1;
-static int hf_gtpv2_nsi = -1;
-static int hf_gtpv2_uasi = -1;
-static int hf_gtpv2_dtci = -1;
-static int hf_gtpv2_bdwi = -1;
-static int hf_gtpv2_psci = -1;
-static int hf_gtpv2_pcri = -1;
-static int hf_gtpv2_aosi = -1;
-static int hf_gtpv2_aopi = -1;
-static int hf_gtpv2_roaai = -1;
-static int hf_gtpv2_epcosi = -1;
-static int hf_gtpv2_cpopci = -1;
-static int hf_gtpv2_pmtsmi = -1;
-static int hf_gtpv2_s11tf = -1;
-static int hf_gtpv2_pnsi = -1;
-static int hf_gtpv2_unaccsi = -1;
-static int hf_gtpv2_wpmsi = -1;
-
-static int hf_gtpv2_5gsnn26 = -1;
-static int hf_gtpv2_reprefi = -1;
-static int hf_gtpv2_5gsiwk = -1;
-static int hf_gtpv2_eevrsi = -1;
-static int hf_gtpv2_ltemui = -1;
-static int hf_gtpv2_ltempi = -1;
-static int hf_gtpv2_enbcrsi = -1;
-static int hf_gtpv2_tspcmi = -1;
-static int hf_gtpv2_ethpdn = -1;
-
-static int hf_gtpv2_csrmfi = -1;
-static int hf_gtpv2_mtedtn = -1;
-static int hf_gtpv2_mtedta = -1;
-static int hf_gtpv2_n5gnmi = -1;
-static int hf_gtpv2_5gcnrs = -1;
-static int hf_gtpv2_5gcnri = -1;
-static int hf_gtpv2_5srhoi = -1;
-
-static int hf_gtpv2_nspusi = -1;
-static int hf_gtpv2_pgwrnsi = -1;
-static int hf_gtpv2_rppcsi = -1;
-static int hf_gtpv2_pgwchi= -1;
-static int hf_gtpv2_sissme = -1;
-static int hf_gtpv2_nsenbi = -1;
-static int hf_gtpv2_idfupf = -1;
-static int hf_gtpv2_emci = -1;
-
-static int hf_gtpv2_ltemsai = -1;
-static int hf_gtpv2_srtpi = -1;
-static int hf_gtpv2_upipsi = -1;
-
-static int hf_gtpv2_pdn_type = -1;
-static int hf_gtpv2_pdn_ipv4 = -1;
-static int hf_gtpv2_pdn_ipv6_len = -1;
-static int hf_gtpv2_pdn_ipv6 = -1;
-static int hf_gtpv2_pdn_numbers_nsapi = -1;
-static int hf_gtpv2_p_tmsi = -1;
-static int hf_gtpv2_p_tmsi_sig = -1;
-static int hf_gtpv2_mmbr_ul = -1;
-static int hf_gtpv2_mmbr_dl = -1;
-
-static int hf_gtpv2_rat_type = -1;
-static int hf_gtpv2_uli_ext_macro_enb_id_flg = -1;
-static int hf_gtpv2_uli_macro_enb_id_flg = -1;
-static int hf_gtpv2_uli_lai_flg = -1;
-static int hf_gtpv2_uli_ecgi_flg = -1;
-static int hf_gtpv2_uli_tai_flg = -1;
-static int hf_gtpv2_uli_rai_flg = -1;
-static int hf_gtpv2_uli_sai_flg = -1;
-static int hf_gtpv2_uli_cgi_flg = -1;
-static int hf_gtpv2_glt = -1;
-static int hf_gtpv2_cng_rep_act = -1;
-
-static int hf_gtpv2_selec_mode = -1;
-static int hf_gtpv2_source_type = -1;
-static int hf_gtpv2_f_teid_v4 = -1;
-static int hf_gtpv2_f_teid_v6 = -1;
-static int hf_gtpv2_f_teid_interface_type= -1;
-static int hf_gtpv2_f_teid_gre_key= -1;
-static int hf_gtpv2_f_teid_ipv4= -1;
-static int hf_gtpv2_f_teid_ipv6= -1;
-static int hf_gtpv2_tmsi = -1;
-static int hf_gtpv2_hsgw_addr_f_len = -1;
-static int hf_gtpv2_hsgw_addr_ipv4 = -1;
-static int hf_gtpv2_hsgw_addr_ipv6 = -1;
-static int hf_gtpv2_gre_key = -1;
-static int hf_gtpv2_sgw_addr_ipv4 = -1;
-static int hf_gtpv2_sgw_addr_ipv6 = -1;
-static int hf_gtpv2_sgw_s1u_teid = -1;
-static int hf_gtpv2_ipv4_addr = -1;
-
-
-static int hf_gtpv2_ambr_up= -1;
-static int hf_gtpv2_ambr_down= -1;
-static int hf_gtpv2_ip_address_ipv4= -1;
-static int hf_gtpv2_ip_address_ipv6= -1;
-static int hf_gtpv2_mei= -1;
+static int hf_gtpv2_apn;
+static int hf_gtpv2_ebi;
+static int hf_gtpv2_daf;
+static int hf_gtpv2_dtf;
+static int hf_gtpv2_hi;
+static int hf_gtpv2_dfi;
+static int hf_gtpv2_oi;
+static int hf_gtpv2_isrsi;
+static int hf_gtpv2_israi;
+static int hf_gtpv2_sgwci;
+static int hf_gtpv2_sqci;
+static int hf_gtpv2_uimsi;
+static int hf_gtpv2_cfsi;
+static int hf_gtpv2_crsi;
+static int hf_gtpv2_pt;
+static int hf_gtpv2_ps;
+static int hf_gtpv2_si;
+static int hf_gtpv2_msv;
+static int hf_gtpv2_retloc;
+static int hf_gtpv2_pbic;
+static int hf_gtpv2_srni;
+static int hf_gtpv2_s6af;
+static int hf_gtpv2_s4af;
+static int hf_gtpv2_mbmdt;
+static int hf_gtpv2_israu;
+static int hf_gtpv2_ccrsi;
+static int hf_gtpv2_cprai;
+static int hf_gtpv2_arrl;
+static int hf_gtpv2_ppof;
+static int hf_gtpv2_ppon_ppei;
+static int hf_gtpv2_ppsi;
+static int hf_gtpv2_csfbi;
+static int hf_gtpv2_clii;
+static int hf_gtpv2_cpsr;
+static int hf_gtpv2_nsi;
+static int hf_gtpv2_uasi;
+static int hf_gtpv2_dtci;
+static int hf_gtpv2_bdwi;
+static int hf_gtpv2_psci;
+static int hf_gtpv2_pcri;
+static int hf_gtpv2_aosi;
+static int hf_gtpv2_aopi;
+static int hf_gtpv2_roaai;
+static int hf_gtpv2_epcosi;
+static int hf_gtpv2_cpopci;
+static int hf_gtpv2_pmtsmi;
+static int hf_gtpv2_s11tf;
+static int hf_gtpv2_pnsi;
+static int hf_gtpv2_unaccsi;
+static int hf_gtpv2_wpmsi;
+
+static int hf_gtpv2_5gsnn26;
+static int hf_gtpv2_reprefi;
+static int hf_gtpv2_5gsiwk;
+static int hf_gtpv2_eevrsi;
+static int hf_gtpv2_ltemui;
+static int hf_gtpv2_ltempi;
+static int hf_gtpv2_enbcrsi;
+static int hf_gtpv2_tspcmi;
+static int hf_gtpv2_ethpdn;
+
+static int hf_gtpv2_csrmfi;
+static int hf_gtpv2_mtedtn;
+static int hf_gtpv2_mtedta;
+static int hf_gtpv2_n5gnmi;
+static int hf_gtpv2_5gcnrs;
+static int hf_gtpv2_5gcnri;
+static int hf_gtpv2_5srhoi;
+
+static int hf_gtpv2_nspusi;
+static int hf_gtpv2_pgwrnsi;
+static int hf_gtpv2_rppcsi;
+static int hf_gtpv2_pgwchi;
+static int hf_gtpv2_sissme;
+static int hf_gtpv2_nsenbi;
+static int hf_gtpv2_idfupf;
+static int hf_gtpv2_emci;
+
+static int hf_gtpv2_ltemsai;
+static int hf_gtpv2_srtpi;
+static int hf_gtpv2_upipsi;
+
+static int hf_gtpv2_pdn_type;
+static int hf_gtpv2_pdn_ipv4;
+static int hf_gtpv2_pdn_ipv6_len;
+static int hf_gtpv2_pdn_ipv6;
+static int hf_gtpv2_pdn_numbers_nsapi;
+static int hf_gtpv2_p_tmsi;
+static int hf_gtpv2_p_tmsi_sig;
+static int hf_gtpv2_mmbr_ul;
+static int hf_gtpv2_mmbr_dl;
+
+static int hf_gtpv2_rat_type;
+static int hf_gtpv2_uli_ext_macro_enb_id_flg;
+static int hf_gtpv2_uli_macro_enb_id_flg;
+static int hf_gtpv2_uli_lai_flg;
+static int hf_gtpv2_uli_ecgi_flg;
+static int hf_gtpv2_uli_tai_flg;
+static int hf_gtpv2_uli_rai_flg;
+static int hf_gtpv2_uli_sai_flg;
+static int hf_gtpv2_uli_cgi_flg;
+static int hf_gtpv2_glt;
+static int hf_gtpv2_cng_rep_act;
+
+static int hf_gtpv2_selec_mode;
+static int hf_gtpv2_source_type;
+static int hf_gtpv2_f_teid_v4;
+static int hf_gtpv2_f_teid_v6;
+static int hf_gtpv2_f_teid_interface_type;
+static int hf_gtpv2_f_teid_gre_key;
+static int hf_gtpv2_f_teid_ipv4;
+static int hf_gtpv2_f_teid_ipv6;
+static int hf_gtpv2_tmsi;
+static int hf_gtpv2_hsgw_addr_f_len;
+static int hf_gtpv2_hsgw_addr_ipv4;
+static int hf_gtpv2_hsgw_addr_ipv6;
+static int hf_gtpv2_gre_key;
+static int hf_gtpv2_sgw_addr_ipv4;
+static int hf_gtpv2_sgw_addr_ipv6;
+static int hf_gtpv2_sgw_s1u_teid;
+static int hf_gtpv2_ipv4_addr;
+
+
+static int hf_gtpv2_ambr_up;
+static int hf_gtpv2_ambr_down;
+static int hf_gtpv2_ip_address_ipv4;
+static int hf_gtpv2_ip_address_ipv6;
+static int hf_gtpv2_mei;
 
 /* Trace Information */
-/* static int hf_gtpv2_tra_info = -1; */
-static int hf_gtpv2_tra_info_msc_momt_calls = -1;
-static int hf_gtpv2_tra_info_msc_momt_sms = -1;
-static int hf_gtpv2_tra_info_msc_lu_imsi_ad = -1;
-static int hf_gtpv2_tra_info_msc_handovers = -1;
-static int hf_gtpv2_tra_info_msc_ss = -1;
-static int hf_gtpv2_tra_info_mgw_context = -1;
-static int hf_gtpv2_tra_info_sgsn_pdp_context = -1;
-static int hf_gtpv2_tra_info_sgsn_momt_sms = -1;
-static int hf_gtpv2_tra_info_sgsn_rau_gprs_ad = -1;
-static int hf_gtpv2_tra_info_sgsn_mbms = -1;
-static int hf_gtpv2_tra_info_sgsn_reserved = -1;
-static int hf_gtpv2_tra_info_ggsn_pdp = -1;
-static int hf_gtpv2_tra_info_ggsn_mbms = -1;
-static int hf_gtpv2_tra_info_bm_sc = -1;
-static int hf_gtpv2_tra_info_mme_sgw_ss = -1;
-static int hf_gtpv2_tra_info_mme_sgw_sr = -1;
-static int hf_gtpv2_tra_info_mme_sgw_iataud = -1;
-static int hf_gtpv2_tra_info_mme_sgw_ue_init_pdn_disc = -1;
-static int hf_gtpv2_tra_info_mme_sgw_bearer_act_mod_del = -1;
-static int hf_gtpv2_tra_info_mme_sgw_ho = -1;
-static int hf_gtpv2_tra_info_sgw_pdn_con_creat = -1;
-static int hf_gtpv2_tra_info_sgw_pdn_con_term = -1;
-static int hf_gtpv2_tra_info_sgw_bearer_act_mod_del = -1;
-static int hf_gtpv2_tra_info_pgw_pdn_con_creat = -1;
-static int hf_gtpv2_tra_info_pgw_pdn_con_term = -1;
-static int hf_gtpv2_tra_info_pgw_bearer_act_mod_del = -1;
-static int hf_gtpv2_tra_info_lne_msc_s = -1;
-static int hf_gtpv2_tra_info_lne_mgw = -1;
-static int hf_gtpv2_tra_info_lne_sgsn = -1;
-static int hf_gtpv2_tra_info_lne_ggsn = -1;
-static int hf_gtpv2_tra_info_lne_rnc = -1;
-static int hf_gtpv2_tra_info_lne_bm_sc = -1;
-static int hf_gtpv2_tra_info_lne_mme = -1;
-static int hf_gtpv2_tra_info_lne_sgw = -1;
-static int hf_gtpv2_tra_info_lne_pdn_gw = -1;
-static int hf_gtpv2_tra_info_lne_enb = -1;
-static int hf_gtpv2_tra_info_lne_amf = -1;
-static int hf_gtpv2_tra_info_lne_smf = -1;
-static int hf_gtpv2_tra_info_lne_pcf = -1;
-static int hf_gtpv2_tra_info_lne_upf = -1;
-static int hf_gtpv2_tra_info_tra_info_ng_ran_node = -1;
-static int hf_gtpv2_tra_info_tdl = -1;
-static int hf_gtpv2_tra_info_lmsc_a = -1;
-static int hf_gtpv2_tra_info_lmsc_lu = -1;
-static int hf_gtpv2_tra_info_lmsc_mc = -1;
-static int hf_gtpv2_tra_info_lmsc_map_g = -1;
-static int hf_gtpv2_tra_info_lmsc_map_b = -1;
-static int hf_gtpv2_tra_info_lmsc_map_e = -1;
-static int hf_gtpv2_tra_info_lmsc_map_f = -1;
-static int hf_gtpv2_tra_info_lmsc_cap = -1;
-static int hf_gtpv2_tra_info_lmsc_map_d = -1;
-static int hf_gtpv2_tra_info_lmsc_map_c = -1;
-static int hf_gtpv2_tra_info_lmgw_mc = -1;
-static int hf_gtpv2_tra_info_lmgw_nb_up = -1;
-static int hf_gtpv2_tra_info_lmgw_lu_up = -1;
-static int hf_gtpv2_tra_info_lsgsn_gb = -1;
-static int hf_gtpv2_tra_info_lsgsn_lu = -1;
-static int hf_gtpv2_tra_info_lsgsn_gn = -1;
-static int hf_gtpv2_tra_info_lsgsn_map_gr = -1;
-static int hf_gtpv2_tra_info_lsgsn_map_gd = -1;
-static int hf_gtpv2_tra_info_lsgsn_map_gf = -1;
-static int hf_gtpv2_tra_info_lsgsn_gs = -1;
-static int hf_gtpv2_tra_info_lsgsn_ge = -1;
-static int hf_gtpv2_tra_info_lggsn_gn = -1;
-static int hf_gtpv2_tra_info_lggsn_gi = -1;
-static int hf_gtpv2_tra_info_lggsn_gmb = -1;
-static int hf_gtpv2_tra_info_lrnc_lu = -1;
-static int hf_gtpv2_tra_info_lrnc_lur = -1;
-static int hf_gtpv2_tra_info_lrnc_lub = -1;
-static int hf_gtpv2_tra_info_lrnc_uu = -1;
-static int hf_gtpv2_tra_info_lbm_sc_gmb = -1;
-static int hf_gtpv2_tra_info_lmme_s1_mme = -1;
-static int hf_gtpv2_tra_info_lmme_s3 = -1;
-static int hf_gtpv2_tra_info_lmme_s6a = -1;
-static int hf_gtpv2_tra_info_lmme_s10 = -1;
-static int hf_gtpv2_tra_info_lmme_s11 = -1;
-static int hf_gtpv2_tra_info_lsgw_s4 = -1;
-static int hf_gtpv2_tra_info_lsgw_s5 = -1;
-static int hf_gtpv2_tra_info_lsgw_s8b = -1;
-static int hf_gtpv2_tra_info_lsgw_s11 = -1;
-static int hf_gtpv2_tra_info_lpdn_gw_s2a = -1;
-static int hf_gtpv2_tra_info_lpdn_gw_s2b = -1;
-static int hf_gtpv2_tra_info_lpdn_gw_s2c = -1;
-static int hf_gtpv2_tra_info_lpdn_gw_s5 = -1;
-static int hf_gtpv2_tra_info_lpdn_gw_s6c = -1;
-static int hf_gtpv2_tra_info_lpdn_gw_gx = -1;
-static int hf_gtpv2_tra_info_lpdn_gw_s8b = -1;
-static int hf_gtpv2_tra_info_lpdn_gw_sgi = -1;
-static int hf_gtpv2_tra_info_lenb_s1_mme = -1;
-static int hf_gtpv2_tra_info_lenb_x2 = -1;
-static int hf_gtpv2_tra_info_lenb_uu = -1;
-
-static int hf_gtpv2_ti = -1;
-
-static int hf_gtpv2_bearer_qos_pci= -1;
-static int hf_gtpv2_bearer_qos_pl= -1;
-static int hf_gtpv2_bearer_qos_pvi= -1;
-static int hf_gtpv2_bearer_qos_label_qci = -1;
-static int hf_gtpv2_bearer_qos_mbr_up = -1;
-static int hf_gtpv2_bearer_qos_mbr_down = -1;
-static int hf_gtpv2_bearer_qos_gbr_up = -1;
-static int hf_gtpv2_bearer_qos_gbr_down = -1;
-static int hf_gtpv2_flow_qos_label_qci = -1;
-static int hf_gtpv2_flow_qos_mbr_up = -1;
-static int hf_gtpv2_flow_qos_mbr_down = -1;
-static int hf_gtpv2_flow_qos_gbr_up = -1;
-static int hf_gtpv2_flow_qos_gbr_down = -1;
-
-static int hf_gtpv2_delay_value = -1;
-static int hf_gtpv2_charging_id = -1;
-static int hf_gtpv2_charging_characteristic = -1;
-static int hf_gtpv2_bearer_flag_ppc = -1;
-static int hf_gtpv2_bearer_flag_vb = -1;
-static int hf_gtpv2_ue_time_zone_dst = -1;
-static int hf_gtpv2_fq_csid_type = -1;
-static int hf_gtpv2_fq_csid_nr = -1;
-static int hf_gtpv2_fq_csid_ipv4 = -1;
-static int hf_gtpv2_fq_csid_ipv6 = -1;
-static int hf_gtpv2_fq_csid_id = -1;
-static int hf_gtpv2_complete_req_msg_type = -1;
-static int hf_gtpv2_mme_grp_id = -1;
-static int hf_gtpv2_mme_code = -1;
-static int hf_gtpv2_m_tmsi = -1;
-static int hf_gtpv2_container_type = -1;
-static int hf_gtpv2_cause_type = -1;
-static int hf_gtpv2_CauseRadioNetwork = -1;
-static int hf_gtpv2_CauseTransport = -1;
-static int hf_gtpv2_CauseNas = -1;
-static int hf_gtpv2_CauseProtocol = -1;
-static int hf_gtpv2_CauseMisc = -1;
-static int hf_gtpv2_target_type = -1;
-static int hf_gtpv2_macro_enodeb_id = -1;
-static int hf_gtpv2_smenb = -1;
-static int hf_gtpv2_ext_macro_enodeb_id = -1;
-static int hf_gtpv2_ext_macro_ng_enodeb_id = -1;
-static int hf_gtpv2_enodebid = -1;
-static int hf_gtpv2_cellid = -1;
-
-static int hf_gtpv2_node_type= -1;
-static int hf_gtpv2_fqdn = -1;
-static int hf_gtpv2_enterprise_id = -1;
-static int hf_gtpv2_apn_rest= -1;
-static int hf_gtpv2_pti= -1;
-static int hf_gtpv2_mm_context_sm = -1;
-static int hf_gtpv2_mm_context_nhi = -1;
-static int hf_gtpv2_mm_context_drxi = -1;
-static int hf_gtpv2_mm_context_cksn = -1;
-static int hf_gtpv2_mm_context_cksn_ksi = -1;
-static int hf_gtpv2_mm_context_kasme = -1;
-static int hf_gtpv2_mm_context_rand = -1;
-static int hf_gtpv2_mm_context_xres_len = -1;
-static int hf_gtpv2_mm_context_xres = -1;
-static int hf_gtpv2_mm_context_autn_len = -1;
-static int hf_gtpv2_mm_context_autn = -1;
-static int hf_gtpv2_mm_context_drx = -1;
-static int hf_gtpv2_mm_context_ue_net_cap_len = -1;
-static int hf_gtpv2_mm_context_ms_net_cap_len = -1;
-static int hf_gtpv2_mm_context_mei_len = -1;
-static int hf_gtpv2_mm_context_vdp_len = -1;
-static int hf_gtpv2_mm_contex_nhi_old = -1;
-static int hf_gtpv2_mm_context_old_ksiasme = -1;
-static int hf_gtpv2_mm_context_old_ncc = -1;
-static int hf_gtpv2_mm_context_old_kasme = -1;
-static int hf_gtpv2_mm_context_old_nh = -1;
-static int hf_gtpv2_mm_context_higher_br_16mb_flg_len = -1;
-static int hf_gtpv2_mm_context_higher_br_16mb_flg = -1;
-static int hf_gtpv2_vdp_length = -1;
-static int hf_gtpv2_mm_context_paging_len = -1;
-static int hf_gtpv2_mm_context_ex_access_res_data_len = -1;
-static int hf_gtpv2_mm_context_ue_add_sec_cap_len = -1;
-static int hf_gtpv2_mm_context_ue_nr_sec_cap_len = -1;
-static int hf_gtpv2_mm_context_apn_rte_ctrl_sts_len = -1;
-static int hf_gtpv2_mm_context_cnr_len = -1;
-static int hf_gtpv2_mm_context_ue_radio_cap_len = -1;
-static int hf_gtpv2_uci_csg_id = -1;
-static int hf_gtpv2_uci_csg_id_spare = -1;
-static int hf_gtpv2_uci_access_mode = -1;
-static int hf_gtpv2_uci_lcsg = -1;
-static int hf_gtpv2_uci_csg_membership = -1;
-
-static int hf_gtpv2_una = -1;
-static int hf_gtpv2_gena = -1;
-static int hf_gtpv2_gana = -1;
-static int hf_gtpv2_ina = -1;
-static int hf_gtpv2_ena = -1;
-static int hf_gtpv2_hnna = -1;
-static int hf_gtpv2_hbna = -1;
-static int hf_gtpv2_mm_context_ksi_a= -1;
-static int hf_gtpv2_mm_context_ksi = -1;
-static int hf_gtpv2_mm_context_nr_tri = -1;
-static int hf_gtpv2_mm_context_used_cipher = -1;
-static int hf_gtpv2_mm_context_nr_qui = -1;
-static int hf_gtpv2_mm_context_nr_qua = -1;
-static int hf_gtpv2_mm_context_uamb_ri = -1;
-static int hf_gtpv2_mm_context_osci = -1;
-static int hf_gtpv2_mm_context_nruna = -1;
-static int hf_gtpv2_mm_context_nrusrna = -1;
-static int hf_gtpv2_mm_context_nrna = -1;
-static int hf_gtpv2_mm_context_ussrna = -1;
-static int hf_gtpv2_mm_context_nrsrna = -1;
-static int hf_gtpv2_mm_context_ensct = -1;
-
-static int hf_gtpv2_mm_context_samb_ri = -1;
-static int hf_gtpv2_mm_context_unipa = -1;
-static int hf_gtpv2_mm_context_unc = -1;
-static int hf_gtpv2_mm_context_nas_dl_cnt = -1;
-static int hf_gtpv2_mm_context_nas_ul_cnt = -1;
-
-static int hf_gtpv2_uli_cgi_lac= -1;
-static int hf_gtpv2_uli_cgi_ci= -1;
-static int hf_gtpv2_sai_lac= -1;
-static int hf_gtpv2_sai_sac= -1;
-static int hf_gtpv2_rai_lac= -1;
-static int hf_gtpv2_rai_rac= -1;
-static int hf_gtpv2_tai_tac= -1;
-static int hf_gtpv2_5gs_tai_tac = -1;
-static int hf_gtpv2_ecgi_eci= -1;
-static int hf_gtpv2_ncgi_nrci= -1;
-static int hf_gtpv2_uli_lai_lac = -1;
-static int hf_gtpv2_ecgi_eci_spare= -1;
-static int hf_gtpv2_nsapi = -1;
-static int hf_gtpv2_bearer_control_mode= -1;
-
-static int hf_gtpv2_bss_container_phx = -1;
-static int hf_gtpv2_bss_con_sapi_flg = -1;
-static int hf_gtpv2_bss_con_rp_flg = -1;
-static int hf_gtpv2_bss_con_pfi_flg = -1;
-static int hf_gtpv2_bss_con_pfi = -1;
-static int hf_gtpv2_bss_con_rp = -1;
-static int hf_gtpv2_bss_con_sapi = -1;
-static int hf_gtpv2_bss_con_xid_len = -1;
-static int hf_gtpv2_bss_con_xid = -1;
-static int hf_gtpv2_home_enodeb_id = -1;
-static int hf_gtpv2_tac = -1;
+/* static int hf_gtpv2_tra_info; */
+static int hf_gtpv2_tra_info_msc_momt_calls;
+static int hf_gtpv2_tra_info_msc_momt_sms;
+static int hf_gtpv2_tra_info_msc_lu_imsi_ad;
+static int hf_gtpv2_tra_info_msc_handovers;
+static int hf_gtpv2_tra_info_msc_ss;
+static int hf_gtpv2_tra_info_mgw_context;
+static int hf_gtpv2_tra_info_sgsn_pdp_context;
+static int hf_gtpv2_tra_info_sgsn_momt_sms;
+static int hf_gtpv2_tra_info_sgsn_rau_gprs_ad;
+static int hf_gtpv2_tra_info_sgsn_mbms;
+static int hf_gtpv2_tra_info_sgsn_reserved;
+static int hf_gtpv2_tra_info_ggsn_pdp;
+static int hf_gtpv2_tra_info_ggsn_mbms;
+static int hf_gtpv2_tra_info_bm_sc;
+static int hf_gtpv2_tra_info_mme_sgw_ss;
+static int hf_gtpv2_tra_info_mme_sgw_sr;
+static int hf_gtpv2_tra_info_mme_sgw_iataud;
+static int hf_gtpv2_tra_info_mme_sgw_ue_init_pdn_disc;
+static int hf_gtpv2_tra_info_mme_sgw_bearer_act_mod_del;
+static int hf_gtpv2_tra_info_mme_sgw_ho;
+static int hf_gtpv2_tra_info_sgw_pdn_con_creat;
+static int hf_gtpv2_tra_info_sgw_pdn_con_term;
+static int hf_gtpv2_tra_info_sgw_bearer_act_mod_del;
+static int hf_gtpv2_tra_info_pgw_pdn_con_creat;
+static int hf_gtpv2_tra_info_pgw_pdn_con_term;
+static int hf_gtpv2_tra_info_pgw_bearer_act_mod_del;
+static int hf_gtpv2_tra_info_lne_msc_s;
+static int hf_gtpv2_tra_info_lne_mgw;
+static int hf_gtpv2_tra_info_lne_sgsn;
+static int hf_gtpv2_tra_info_lne_ggsn;
+static int hf_gtpv2_tra_info_lne_rnc;
+static int hf_gtpv2_tra_info_lne_bm_sc;
+static int hf_gtpv2_tra_info_lne_mme;
+static int hf_gtpv2_tra_info_lne_sgw;
+static int hf_gtpv2_tra_info_lne_pdn_gw;
+static int hf_gtpv2_tra_info_lne_enb;
+static int hf_gtpv2_tra_info_lne_amf;
+static int hf_gtpv2_tra_info_lne_smf;
+static int hf_gtpv2_tra_info_lne_pcf;
+static int hf_gtpv2_tra_info_lne_upf;
+static int hf_gtpv2_tra_info_tra_info_ng_ran_node;
+static int hf_gtpv2_tra_info_tdl;
+static int hf_gtpv2_tra_info_lmsc_a;
+static int hf_gtpv2_tra_info_lmsc_lu;
+static int hf_gtpv2_tra_info_lmsc_mc;
+static int hf_gtpv2_tra_info_lmsc_map_g;
+static int hf_gtpv2_tra_info_lmsc_map_b;
+static int hf_gtpv2_tra_info_lmsc_map_e;
+static int hf_gtpv2_tra_info_lmsc_map_f;
+static int hf_gtpv2_tra_info_lmsc_cap;
+static int hf_gtpv2_tra_info_lmsc_map_d;
+static int hf_gtpv2_tra_info_lmsc_map_c;
+static int hf_gtpv2_tra_info_lmgw_mc;
+static int hf_gtpv2_tra_info_lmgw_nb_up;
+static int hf_gtpv2_tra_info_lmgw_lu_up;
+static int hf_gtpv2_tra_info_lsgsn_gb;
+static int hf_gtpv2_tra_info_lsgsn_lu;
+static int hf_gtpv2_tra_info_lsgsn_gn;
+static int hf_gtpv2_tra_info_lsgsn_map_gr;
+static int hf_gtpv2_tra_info_lsgsn_map_gd;
+static int hf_gtpv2_tra_info_lsgsn_map_gf;
+static int hf_gtpv2_tra_info_lsgsn_gs;
+static int hf_gtpv2_tra_info_lsgsn_ge;
+static int hf_gtpv2_tra_info_lggsn_gn;
+static int hf_gtpv2_tra_info_lggsn_gi;
+static int hf_gtpv2_tra_info_lggsn_gmb;
+static int hf_gtpv2_tra_info_lrnc_lu;
+static int hf_gtpv2_tra_info_lrnc_lur;
+static int hf_gtpv2_tra_info_lrnc_lub;
+static int hf_gtpv2_tra_info_lrnc_uu;
+static int hf_gtpv2_tra_info_lbm_sc_gmb;
+static int hf_gtpv2_tra_info_lmme_s1_mme;
+static int hf_gtpv2_tra_info_lmme_s3;
+static int hf_gtpv2_tra_info_lmme_s6a;
+static int hf_gtpv2_tra_info_lmme_s10;
+static int hf_gtpv2_tra_info_lmme_s11;
+static int hf_gtpv2_tra_info_lsgw_s4;
+static int hf_gtpv2_tra_info_lsgw_s5;
+static int hf_gtpv2_tra_info_lsgw_s8b;
+static int hf_gtpv2_tra_info_lsgw_s11;
+static int hf_gtpv2_tra_info_lpdn_gw_s2a;
+static int hf_gtpv2_tra_info_lpdn_gw_s2b;
+static int hf_gtpv2_tra_info_lpdn_gw_s2c;
+static int hf_gtpv2_tra_info_lpdn_gw_s5;
+static int hf_gtpv2_tra_info_lpdn_gw_s6c;
+static int hf_gtpv2_tra_info_lpdn_gw_gx;
+static int hf_gtpv2_tra_info_lpdn_gw_s8b;
+static int hf_gtpv2_tra_info_lpdn_gw_sgi;
+static int hf_gtpv2_tra_info_lenb_s1_mme;
+static int hf_gtpv2_tra_info_lenb_x2;
+static int hf_gtpv2_tra_info_lenb_uu;
+
+static int hf_gtpv2_ti;
+
+static int hf_gtpv2_bearer_qos_pci;
+static int hf_gtpv2_bearer_qos_pl;
+static int hf_gtpv2_bearer_qos_pvi;
+static int hf_gtpv2_bearer_qos_label_qci;
+static int hf_gtpv2_bearer_qos_mbr_up;
+static int hf_gtpv2_bearer_qos_mbr_down;
+static int hf_gtpv2_bearer_qos_gbr_up;
+static int hf_gtpv2_bearer_qos_gbr_down;
+static int hf_gtpv2_flow_qos_label_qci;
+static int hf_gtpv2_flow_qos_mbr_up;
+static int hf_gtpv2_flow_qos_mbr_down;
+static int hf_gtpv2_flow_qos_gbr_up;
+static int hf_gtpv2_flow_qos_gbr_down;
+
+static int hf_gtpv2_delay_value;
+static int hf_gtpv2_charging_id;
+static int hf_gtpv2_charging_characteristic;
+static int hf_gtpv2_bearer_flag_ppc;
+static int hf_gtpv2_bearer_flag_vb;
+static int hf_gtpv2_ue_time_zone_dst;
+static int hf_gtpv2_fq_csid_type;
+static int hf_gtpv2_fq_csid_nr;
+static int hf_gtpv2_fq_csid_ipv4;
+static int hf_gtpv2_fq_csid_ipv6;
+static int hf_gtpv2_fq_csid_id;
+static int hf_gtpv2_complete_req_msg_type;
+static int hf_gtpv2_mme_grp_id;
+static int hf_gtpv2_mme_code;
+static int hf_gtpv2_m_tmsi;
+static int hf_gtpv2_container_type;
+static int hf_gtpv2_cause_type;
+static int hf_gtpv2_CauseRadioNetwork;
+static int hf_gtpv2_CauseTransport;
+static int hf_gtpv2_CauseNas;
+static int hf_gtpv2_CauseProtocol;
+static int hf_gtpv2_CauseMisc;
+static int hf_gtpv2_target_type;
+static int hf_gtpv2_macro_enodeb_id;
+static int hf_gtpv2_smenb;
+static int hf_gtpv2_ext_macro_enodeb_id;
+static int hf_gtpv2_ext_macro_ng_enodeb_id;
+static int hf_gtpv2_enodebid;
+static int hf_gtpv2_cellid;
+
+static int hf_gtpv2_node_type;
+static int hf_gtpv2_fqdn;
+static int hf_gtpv2_enterprise_id;
+static int hf_gtpv2_apn_rest;
+static int hf_gtpv2_pti;
+static int hf_gtpv2_mm_context_sm;
+static int hf_gtpv2_mm_context_nhi;
+static int hf_gtpv2_mm_context_drxi;
+static int hf_gtpv2_mm_context_cksn;
+static int hf_gtpv2_mm_context_cksn_ksi;
+static int hf_gtpv2_mm_context_kasme;
+static int hf_gtpv2_mm_context_rand;
+static int hf_gtpv2_mm_context_xres_len;
+static int hf_gtpv2_mm_context_xres;
+static int hf_gtpv2_mm_context_autn_len;
+static int hf_gtpv2_mm_context_autn;
+static int hf_gtpv2_mm_context_drx;
+static int hf_gtpv2_mm_context_ue_net_cap_len;
+static int hf_gtpv2_mm_context_ms_net_cap_len;
+static int hf_gtpv2_mm_context_mei_len;
+static int hf_gtpv2_mm_context_vdp_len;
+static int hf_gtpv2_mm_contex_nhi_old;
+static int hf_gtpv2_mm_context_old_ksiasme;
+static int hf_gtpv2_mm_context_old_ncc;
+static int hf_gtpv2_mm_context_old_kasme;
+static int hf_gtpv2_mm_context_old_nh;
+static int hf_gtpv2_mm_context_higher_br_16mb_flg_len;
+static int hf_gtpv2_mm_context_higher_br_16mb_flg;
+static int hf_gtpv2_vdp_length;
+static int hf_gtpv2_mm_context_paging_len;
+static int hf_gtpv2_mm_context_ex_access_res_data_len;
+static int hf_gtpv2_mm_context_ue_add_sec_cap_len;
+static int hf_gtpv2_mm_context_ue_nr_sec_cap_len;
+static int hf_gtpv2_mm_context_apn_rte_ctrl_sts_len;
+static int hf_gtpv2_mm_context_cnr_len;
+static int hf_gtpv2_mm_context_ue_radio_cap_len;
+static int hf_gtpv2_uci_csg_id;
+static int hf_gtpv2_uci_csg_id_spare;
+static int hf_gtpv2_uci_access_mode;
+static int hf_gtpv2_uci_lcsg;
+static int hf_gtpv2_uci_csg_membership;
+
+static int hf_gtpv2_una;
+static int hf_gtpv2_gena;
+static int hf_gtpv2_gana;
+static int hf_gtpv2_ina;
+static int hf_gtpv2_ena;
+static int hf_gtpv2_hnna;
+static int hf_gtpv2_hbna;
+static int hf_gtpv2_mm_context_ksi_a;
+static int hf_gtpv2_mm_context_ksi;
+static int hf_gtpv2_mm_context_nr_tri;
+static int hf_gtpv2_mm_context_used_cipher;
+static int hf_gtpv2_mm_context_nr_qui;
+static int hf_gtpv2_mm_context_nr_qua;
+static int hf_gtpv2_mm_context_uamb_ri;
+static int hf_gtpv2_mm_context_osci;
+static int hf_gtpv2_mm_context_nruna;
+static int hf_gtpv2_mm_context_nrusrna;
+static int hf_gtpv2_mm_context_nrna;
+static int hf_gtpv2_mm_context_ussrna;
+static int hf_gtpv2_mm_context_nrsrna;
+static int hf_gtpv2_mm_context_ensct;
+
+static int hf_gtpv2_mm_context_samb_ri;
+static int hf_gtpv2_mm_context_unipa;
+static int hf_gtpv2_mm_context_unc;
+static int hf_gtpv2_mm_context_nas_dl_cnt;
+static int hf_gtpv2_mm_context_nas_ul_cnt;
+
+static int hf_gtpv2_uli_cgi_lac;
+static int hf_gtpv2_uli_cgi_ci;
+static int hf_gtpv2_sai_lac;
+static int hf_gtpv2_sai_sac;
+static int hf_gtpv2_rai_lac;
+static int hf_gtpv2_rai_rac;
+static int hf_gtpv2_tai_tac;
+static int hf_gtpv2_5gs_tai_tac;
+static int hf_gtpv2_ecgi_eci;
+static int hf_gtpv2_ncgi_nrci;
+static int hf_gtpv2_uli_lai_lac;
+static int hf_gtpv2_ecgi_eci_spare;
+static int hf_gtpv2_nsapi;
+static int hf_gtpv2_bearer_control_mode;
+
+static int hf_gtpv2_bss_container_phx;
+static int hf_gtpv2_bss_con_sapi_flg;
+static int hf_gtpv2_bss_con_rp_flg;
+static int hf_gtpv2_bss_con_pfi_flg;
+static int hf_gtpv2_bss_con_pfi;
+static int hf_gtpv2_bss_con_rp;
+static int hf_gtpv2_bss_con_sapi;
+static int hf_gtpv2_bss_con_xid_len;
+static int hf_gtpv2_bss_con_xid;
+static int hf_gtpv2_home_enodeb_id;
+static int hf_gtpv2_tac;
 
 /* MBMS */
-static int hf_gtpv2_mbms_service_area_nr = -1;
-static int hf_gtpv2_mbms_service_area_id = -1;
-static int hf_gtpv2_mbms_session_id = -1;
-static int hf_gtpv2_mbms_flow_id = -1;
-static int hf_gtpv2_cteid = -1;
-static int hf_gtpv2_ip_addr_type = -1;
-static int hf_gtpv2_ip_addr_len = -1;
-static int hf_gtpv2_mbms_ip_mc_dist_addrv4 = -1;
-static int hf_gtpv2_mbms_ip_mc_dist_addrv6 = -1;
-static int hf_gtpv2_mbms_ip_mc_src_addrv4 = -1;
-static int hf_gtpv2_mbms_ip_mc_src_addrv6 = -1;
-static int hf_gtpv2_mbms_hc_indicator = -1;
-static int hf_gtpv2_mbms_dist_indication = -1;
-static int hf_gtpv2_subscriber_rfsp = -1;
-static int hf_gtpv2_rfsp_inuse = -1;
-static int hf_gtpv2_mbms_service_id = -1;
-static int hf_gtpv2_add_flags_for_srvcc_ics = -1;
-static int hf_gtpv2_vsrvcc_flag = -1;
-static int hf_gtpv2_abs_time_mbms_data = -1;
-static int hf_gtpv2_henb_info_report_fti = -1;
-static int hf_gtpv2_ip4cp_subnet_prefix_len = -1;
-static int hf_gtpv2_ip4cp_ipv4 = -1;
-static int hf_gtpv2_change_report_flags_sncr = -1;
-static int hf_gtpv2_change_report_flags_tzcr = -1;
-static int hf_gtpv2_action_indication_val = -1;
-static int hf_gtpv2_uli_timestamp = -1;
-static int hf_gtpv2_mbms_session_duration_days = -1;
-static int hf_gtpv2_mbms_session_duration_secs = -1;
-static int hf_gtpv2_csg_id = -1;
-static int hf_gtpv2_cmi = -1;
-static int hf_gtpv2_service_indicator = -1;
-static int hf_gtpv2_detach_type = -1;
-static int hf_gtpv2_ldn = -1;
-static int hf_gtpv2_node_features_prn = -1;
-static int hf_gtpv2_node_features_mabr =-1;
-static int hf_gtpv2_node_features_ntsr = -1;
-static int hf_gtpv2_node_features_ciot = -1;
-static int hf_gtpv2_time_to_data_xfer = -1;
-static int hf_gtpv2_arp_pvi = -1;
-static int hf_gtpv2_arp_pl = -1;
-static int hf_gtpv2_arp_pci = -1;
-static int hf_gtpv2_timer_unit = -1;
-static int hf_gtpv2_throttling_delay_unit = -1;
-static int hf_gtpv2_throttling_delay_value = -1;
-static int hf_gtpv2_timer_value = -1;
-static int hf_gtpv2_lapi = -1;
-
-static int hf_gtpv2_pres_rep_area_act_inapra = -1;
-static int hf_gtpv2_pres_rep_area_action = -1;
-static int hf_gtpv2_pres_rep_area_id = -1;
-static int hf_gtpv2_pres_rep_area_act_no_tai = -1;
-static int hf_gtpv2_pres_rep_area_act_no_rai = -1;
-static int hf_gtpv2_pres_rep_area_act_no_m_enodeb = -1;
-static int hf_gtpv2_pres_rep_area_act_no_h_enodeb = -1;
-static int hf_gtpv2_pres_rep_area_act_no_ecgi = -1;
-static int hf_gtpv2_pres_rep_area_act_no_sai = -1;
-static int hf_gtpv2_pres_rep_area_act_no_cgi = -1;
-static int hf_gtpv2_pres_rep_area_act_no_ext_m_enodeb = -1;
-static int hf_gtpv2_ksi_ps = -1;
-static int hf_gtpv2_ck_ps = -1;
-static int hf_gtpv2_ik_ps = -1;
-static int hf_gtpv2_kc_ps = -1;
-static int hf_gtpv2_cksn_ps = -1;
-
-static int hf_gtpv2_pres_rep_area_info_id = -1;
-static int hf_gtpv2_pres_rep_area_info_additional_id = -1;
-static int hf_gtpv2_pres_rep_area_info_flags = -1;
-static int hf_gtpv2_pres_rep_area_info_flags_no_inapra = -1;
-static int hf_gtpv2_pres_rep_area_info_flags_b4_b7_spare = -1;
-static int hf_gtpv2_pres_rep_area_info_flags_b3_b7_spare = -1;
-static int hf_gtpv2_pres_rep_area_info_flags_b3_inapra = -1;
-static int hf_gtpv2_pres_rep_area_info_flags_b2_apra = -1;
-static int hf_gtpv2_pres_rep_area_info_flags_b1_opra = -1;
-static int hf_gtpv2_pres_rep_area_info_flags_b0_ipra = -1;
+static int hf_gtpv2_mbms_service_area_nr;
+static int hf_gtpv2_mbms_service_area_id;
+static int hf_gtpv2_mbms_session_id;
+static int hf_gtpv2_mbms_flow_id;
+static int hf_gtpv2_cteid;
+static int hf_gtpv2_ip_addr_type;
+static int hf_gtpv2_ip_addr_len;
+static int hf_gtpv2_mbms_ip_mc_dist_addrv4;
+static int hf_gtpv2_mbms_ip_mc_dist_addrv6;
+static int hf_gtpv2_mbms_ip_mc_src_addrv4;
+static int hf_gtpv2_mbms_ip_mc_src_addrv6;
+static int hf_gtpv2_mbms_hc_indicator;
+static int hf_gtpv2_mbms_dist_indication;
+static int hf_gtpv2_subscriber_rfsp;
+static int hf_gtpv2_rfsp_inuse;
+static int hf_gtpv2_mbms_service_id;
+static int hf_gtpv2_add_flags_for_srvcc_ics;
+static int hf_gtpv2_vsrvcc_flag;
+static int hf_gtpv2_abs_time_mbms_data;
+static int hf_gtpv2_henb_info_report_fti;
+static int hf_gtpv2_ip4cp_subnet_prefix_len;
+static int hf_gtpv2_ip4cp_ipv4;
+static int hf_gtpv2_change_report_flags_sncr;
+static int hf_gtpv2_change_report_flags_tzcr;
+static int hf_gtpv2_action_indication_val;
+static int hf_gtpv2_uli_timestamp;
+static int hf_gtpv2_mbms_session_duration_days;
+static int hf_gtpv2_mbms_session_duration_secs;
+static int hf_gtpv2_csg_id;
+static int hf_gtpv2_cmi;
+static int hf_gtpv2_service_indicator;
+static int hf_gtpv2_detach_type;
+static int hf_gtpv2_ldn;
+static int hf_gtpv2_node_features_prn;
+static int hf_gtpv2_node_features_mabr;
+static int hf_gtpv2_node_features_ntsr;
+static int hf_gtpv2_node_features_ciot;
+static int hf_gtpv2_time_to_data_xfer;
+static int hf_gtpv2_arp_pvi;
+static int hf_gtpv2_arp_pl;
+static int hf_gtpv2_arp_pci;
+static int hf_gtpv2_timer_unit;
+static int hf_gtpv2_throttling_delay_unit;
+static int hf_gtpv2_throttling_delay_value;
+static int hf_gtpv2_timer_value;
+static int hf_gtpv2_lapi;
+
+static int hf_gtpv2_pres_rep_area_act_inapra;
+static int hf_gtpv2_pres_rep_area_action;
+static int hf_gtpv2_pres_rep_area_id;
+static int hf_gtpv2_pres_rep_area_act_no_tai;
+static int hf_gtpv2_pres_rep_area_act_no_rai;
+static int hf_gtpv2_pres_rep_area_act_no_m_enodeb;
+static int hf_gtpv2_pres_rep_area_act_no_h_enodeb;
+static int hf_gtpv2_pres_rep_area_act_no_ecgi;
+static int hf_gtpv2_pres_rep_area_act_no_sai;
+static int hf_gtpv2_pres_rep_area_act_no_cgi;
+static int hf_gtpv2_pres_rep_area_act_no_ext_m_enodeb;
+static int hf_gtpv2_ksi_ps;
+static int hf_gtpv2_ck_ps;
+static int hf_gtpv2_ik_ps;
+static int hf_gtpv2_kc_ps;
+static int hf_gtpv2_cksn_ps;
+
+static int hf_gtpv2_pres_rep_area_info_id;
+static int hf_gtpv2_pres_rep_area_info_additional_id;
+static int hf_gtpv2_pres_rep_area_info_flags;
+static int hf_gtpv2_pres_rep_area_info_flags_no_inapra;
+static int hf_gtpv2_pres_rep_area_info_flags_b4_b7_spare;
+static int hf_gtpv2_pres_rep_area_info_flags_b3_b7_spare;
+static int hf_gtpv2_pres_rep_area_info_flags_b3_inapra;
+static int hf_gtpv2_pres_rep_area_info_flags_b2_apra;
+static int hf_gtpv2_pres_rep_area_info_flags_b1_opra;
+static int hf_gtpv2_pres_rep_area_info_flags_b0_ipra;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_gtpv2_downlink_subscribed_ue_ambr = -1;
-static int hf_gtpv2_mm_context_sres = -1;
-static int hf_gtpv2_iksrvcc = -1;
-static int hf_gtpv2_nsapi08 = -1;
-static int hf_gtpv2_voice_domain_and_ue_usage_setting = -1;
-static int hf_gtpv2_ue_radio_capability_for_paging_information = -1;
-static int hf_gtpv2_upd_source_port_number = -1;
-static int hf_gtpv2_uplink_used_ue_ambr = -1;
-static int hf_gtpv2_tmsi_bytes = -1;
-static int hf_gtpv2_dl_gtp_u_sequence_number = -1;
-static int hf_gtpv2_mm_context_nh = -1;
-static int hf_gtpv2_teid_c_spare = -1;
-static int hf_gtpv2_uplink_subscribed_ue_ambr = -1;
-static int hf_gtpv2_transparent_container = -1;
-static int hf_gtpv2_packet_flow_id = -1;
-static int hf_gtpv2_utran_srvcc_ik_cs = -1;
-static int hf_gtpv2_downlink_used_ue_ambr = -1;
-static int hf_gtpv2_hop_counter = -1;
-static int hf_gtpv2_ul_gtp_u_sequence_number = -1;
-static int hf_gtpv2_authentication_quadruplets = -1;
-static int hf_gtpv2_utran_srvcc_kc = -1;
-static int hf_gtpv2_spare_bytes = -1;
-static int hf_gtpv2_metric = -1;
-static int hf_gtpv2_throttling_factor = -1;
-static int hf_gtpv2_relative_capacity = -1;
-static int hf_gtpv2_apn_length = -1;
-static int hf_gtpv2_sequence_number = -1;
-static int hf_gtpv2_receive_n_pdu_number = -1;
-static int hf_gtpv2_trace_id = -1;
-static int hf_gtpv2_drx_parameter = -1;
-static int hf_gtpv2_charging_characteristic_remaining_octets = -1;
-static int hf_gtpv2_mm_context_ncc = -1;
-static int hf_gtpv2_proprietary_value = -1;
-static int hf_gtpv2_mobile_station_classmark2 = -1;
-static int hf_gtpv2_rrc_container = -1;
-static int hf_gtpv2_send_n_pdu_number = -1;
-static int hf_gtpv2_mobile_station_classmark3 = -1;
-static int hf_gtpv2_eps_bearer_id_number = -1;
-static int hf_gtpv2_geographic_location = -1;
-static int hf_gtpv2_cn_id = -1;
-static int hf_gtpv2_utran_srvcc_ck_cs = -1;
-static int hf_gtpv2_authentication_quintuplets = -1;
-static int hf_gtpv2_serving_gw_address_length = -1;
-static int hf_gtpv2_supported_codec_list = -1;
-static int hf_gtpv2_cksrvcc = -1;
-static int hf_gtpv2_mm_context_kc = -1;
-static int hf_gtpv2_dl_pdcp_sequence_number = -1;
-static int hf_gtpv2_ul_pdcp_sequence_number = -1;
-static int hf_gtpv2_fq_csid_node_id = -1;
-static int hf_gtpv2_fq_csid_mcc_mnc = -1;
-static int hf_gtpv2_ppi_value = -1;
-static int hf_gtpv2_ppi_flag = -1;
-static int hf_gtpv2_session = -1;
-static int hf_gtpv2_twan_id_ts = -1;
-static int hf_gtpv2_twan_flags = -1;
-static int hf_gtpv2_twan_bssidi = -1;
-static int hf_gtpv2_twan_civai = -1;
-static int hf_gtpv2_twan_plmni = -1;
-static int hf_gtpv2_twan_opnai = -1;
-static int hf_gtpv2_twan_laii = -1;
-static int hf_gtpv2_twan_ssid_len = -1;
-static int hf_gtpv2_twan_ssid = -1;
-static int hf_gtpv2_twan_bssid = -1;
-static int hf_gtpv2_twan_civa_len = -1;
-static int hf_gtpv2_twan_civa = -1;
-static int hf_gtpv2_twan_plmnid = -1;
-static int hf_gtpv2_twan_op_name_len = -1;
-static int hf_gtpv2_twan_op_name = -1;
-static int hf_gtpv2_twan_relay_id_type = -1;
-static int hf_gtpv2_twan_relay_id_len = -1;
-static int hf_gtpv2_twan_relay_id = -1;
-static int hf_gtpv2_twan_relay_id_ipv4 = -1;
-static int hf_gtpv2_twan_relay_id_ipv6 = -1;
-static int hf_gtpv2_twan_circuit_id_len = -1;
-static int hf_gtpv2_twan_circuit_id = -1;
-static int hf_gtpv2_integer_number_val = -1;
-static int hf_gtpv2_maximum_wait_time = -1;
-static int hf_gtpv2_dl_buf_sug_pkt_cnt = -1;
-static int hf_gtpv2_ue_usage_type = -1;
-static int hf_gtpv2_rem_run_serv_gap_t = -1;
-static int hf_gtpv2_ran_nas_protocol_type = -1;
-static int hf_gtpv2_ran_nas_cause_type = -1;
-static int hf_gtpv2_ran_nas_cause_value = -1;
-static int hf_gtpv2_emm_cause = -1;
-static int hf_gtpv2_esm_cause = -1;
-static int hf_gtpv2_diameter_cause = -1;
-static int hf_gtpv2_ikev2_cause = -1;
-
-static int hf_gtpv2_ciot_support_ind = -1;
-static int hf_gtpv2_ciot_support_ind_spare_bits = -1;
-static int hf_gtpv2_ciot_support_ind_bit4 = -1;
-static int hf_gtpv2_ciot_support_ind_bit3 = -1;
-static int hf_gtpv2_ciot_support_ind_bit2 = -1;
-static int hf_gtpv2_ciot_support_ind_bit1 = -1;
-
-static int hf_gtpv2_length_of_node_name = -1;
-static int hf_gtpv2_node_name = -1;
-static int hf_gtpv2_length_of_node_realm = -1;
-static int hf_gtpv2_node_realm = -1;
-static int hf_gtpv2_ms_ts = -1;
-static int hf_gtpv2_origination_ts = -1;
-static int hf_gtpv2_mon_event_inf_nsur = -1;
-static int hf_gtpv2_mon_event_inf_nsui = -1;
-static int hf_gtpv2_mon_event_inf_nscf = -1;
-static int hf_gtpv2_mon_event_inf_srie = -1;
-static int hf_gtpv2_mon_event_inf_scef_reference_id = -1;
-static int hf_gtpv2_mon_event_inf_scef_reference_id_ext = -1;
-static int hf_gtpv2_mon_event_inf_scef_id_length = -1;
-static int hf_gtpv2_mon_event_inf_scef_id = -1;
-static int hf_gtpv2_mon_event_inf_remaining_number_of_reports = -1;
-static int hf_gtpv2_mon_event_ext_inf_lrtp = -1;
-static int hf_gtpv2_mon_event_ext_inf_srie = -1;
-static int hf_gtpv2_mon_event_ext_inf_scef_reference_id = -1;
-static int hf_gtpv2_mon_event_ext_inf_scef_id_length = -1;
-static int hf_gtpv2_mon_event_ext_inf_scef_id = -1;
-static int hf_gtpv2_mon_event_ext_inf_remain_min_period_loc_report_type = -1;
-static int hf_gtpv2_mon_event_ext_inf_scef_reference_id_ext = -1;
-static int hf_gtpv2_rohc_profiles_bit0 = -1;
-static int hf_gtpv2_rohc_profiles_bit1 = -1;
-static int hf_gtpv2_rohc_profiles_bit2 = -1;
-static int hf_gtpv2_rohc_profiles_bit3 = -1;
-static int hf_gtpv2_rohc_profiles_bit4 = -1;
-static int hf_gtpv2_rohc_profiles_bit5 = -1;
-static int hf_gtpv2_rohc_profiles_bit6 = -1;
-static int hf_gtpv2_rohc_profiles_bit7 = -1;
-static int hf_gtpv2_max_cid = -1;
-static int hf_gtpv2_uplink_rate_limit = -1;
-static int hf_gtpv2_downlink_rate_limit = -1;
-static int hf_gtpv2_timestamp_value = -1;
-static int hf_gtpv2_counter_value = -1;
-static int hf_gtpv2_mapped_ue_usage_type = -1;
-static int hf_gtpv2_uli_flags = -1;
-static int hf_gtpv2_rohc_profile_flags = -1;
-static int hf_gtpv2_dcnr = -1;
-
-static int hf_gtpv2_secondary_rat_usage_data_report = -1;
-static int hf_gtpv2_secondary_rat_usage_data_report_spare_bits = -1;
-static int hf_gtpv2_secondary_rat_usage_data_report_bit3 = -1;
-static int hf_gtpv2_secondary_rat_usage_data_report_bit2 = -1;
-static int hf_gtpv2_secondary_rat_usage_data_report_bit1 = -1;
-static int hf_gtpv2_secondary_rat_usage_data_report_rat_type = -1;
-static int hf_gtpv2_secondary_rat_usage_data_report_start_timestamp = -1;
-static int hf_gtpv2_secondary_rat_usage_data_report_end_timestamp = -1;
-static int hf_gtpv2_secondary_rat_usage_data_report_usage_data_dl = -1;
-static int hf_gtpv2_secondary_rat_usage_data_report_usage_data_ul = -1;
-static int hf_gtpv2_secondary_rat_usage_data_report_srudn_length = -1;
-static int hf_gtpv2_secondary_rat_usage_data_report_srudn_value = -1;
-static int hf_gtpv2_csg_info_rep_action_b0 = -1;
-static int hf_gtpv2_csg_info_rep_action_b1 = -1;
-static int hf_gtpv2_csg_info_rep_action_b2 = -1;
-static int hf_gtpv2_gnodeb_id_len = -1;
-static int hf_gtpv2_gnodeb_id = -1;
-static int hf_gtpv2_macro_ng_enodeb_id = -1;
-static int hf_gtpv2_5gs_tac = -1;
-static int hf_gtpv2_en_gnb_id_len = -1;
+static int hf_gtpv2_downlink_subscribed_ue_ambr;
+static int hf_gtpv2_mm_context_sres;
+static int hf_gtpv2_iksrvcc;
+static int hf_gtpv2_nsapi08;
+static int hf_gtpv2_voice_domain_and_ue_usage_setting;
+static int hf_gtpv2_ue_radio_capability_for_paging_information;
+static int hf_gtpv2_upd_source_port_number;
+static int hf_gtpv2_uplink_used_ue_ambr;
+static int hf_gtpv2_tmsi_bytes;
+static int hf_gtpv2_dl_gtp_u_sequence_number;
+static int hf_gtpv2_mm_context_nh;
+static int hf_gtpv2_teid_c_spare;
+static int hf_gtpv2_uplink_subscribed_ue_ambr;
+static int hf_gtpv2_transparent_container;
+static int hf_gtpv2_packet_flow_id;
+static int hf_gtpv2_utran_srvcc_ik_cs;
+static int hf_gtpv2_downlink_used_ue_ambr;
+static int hf_gtpv2_hop_counter;
+static int hf_gtpv2_ul_gtp_u_sequence_number;
+static int hf_gtpv2_authentication_quadruplets;
+static int hf_gtpv2_utran_srvcc_kc;
+static int hf_gtpv2_spare_bytes;
+static int hf_gtpv2_metric;
+static int hf_gtpv2_throttling_factor;
+static int hf_gtpv2_relative_capacity;
+static int hf_gtpv2_apn_length;
+static int hf_gtpv2_sequence_number;
+static int hf_gtpv2_receive_n_pdu_number;
+static int hf_gtpv2_trace_id;
+static int hf_gtpv2_drx_parameter;
+static int hf_gtpv2_charging_characteristic_remaining_octets;
+static int hf_gtpv2_mm_context_ncc;
+static int hf_gtpv2_proprietary_value;
+static int hf_gtpv2_mobile_station_classmark2;
+static int hf_gtpv2_rrc_container;
+static int hf_gtpv2_send_n_pdu_number;
+static int hf_gtpv2_mobile_station_classmark3;
+static int hf_gtpv2_eps_bearer_id_number;
+static int hf_gtpv2_geographic_location;
+static int hf_gtpv2_cn_id;
+static int hf_gtpv2_utran_srvcc_ck_cs;
+static int hf_gtpv2_authentication_quintuplets;
+static int hf_gtpv2_serving_gw_address_length;
+static int hf_gtpv2_supported_codec_list;
+static int hf_gtpv2_cksrvcc;
+static int hf_gtpv2_mm_context_kc;
+static int hf_gtpv2_dl_pdcp_sequence_number;
+static int hf_gtpv2_ul_pdcp_sequence_number;
+static int hf_gtpv2_fq_csid_node_id;
+static int hf_gtpv2_fq_csid_mcc_mnc;
+static int hf_gtpv2_ppi_value;
+static int hf_gtpv2_ppi_flag;
+static int hf_gtpv2_session;
+static int hf_gtpv2_twan_id_ts;
+static int hf_gtpv2_twan_flags;
+static int hf_gtpv2_twan_bssidi;
+static int hf_gtpv2_twan_civai;
+static int hf_gtpv2_twan_plmni;
+static int hf_gtpv2_twan_opnai;
+static int hf_gtpv2_twan_laii;
+static int hf_gtpv2_twan_ssid_len;
+static int hf_gtpv2_twan_ssid;
+static int hf_gtpv2_twan_bssid;
+static int hf_gtpv2_twan_civa_len;
+static int hf_gtpv2_twan_civa;
+static int hf_gtpv2_twan_plmnid;
+static int hf_gtpv2_twan_op_name_len;
+static int hf_gtpv2_twan_op_name;
+static int hf_gtpv2_twan_relay_id_type;
+static int hf_gtpv2_twan_relay_id_len;
+static int hf_gtpv2_twan_relay_id;
+static int hf_gtpv2_twan_relay_id_ipv4;
+static int hf_gtpv2_twan_relay_id_ipv6;
+static int hf_gtpv2_twan_circuit_id_len;
+static int hf_gtpv2_twan_circuit_id;
+static int hf_gtpv2_integer_number_val;
+static int hf_gtpv2_maximum_wait_time;
+static int hf_gtpv2_dl_buf_sug_pkt_cnt;
+static int hf_gtpv2_ue_usage_type;
+static int hf_gtpv2_rem_run_serv_gap_t;
+static int hf_gtpv2_ran_nas_protocol_type;
+static int hf_gtpv2_ran_nas_cause_type;
+static int hf_gtpv2_ran_nas_cause_value;
+static int hf_gtpv2_emm_cause;
+static int hf_gtpv2_esm_cause;
+static int hf_gtpv2_diameter_cause;
+static int hf_gtpv2_ikev2_cause;
+
+static int hf_gtpv2_ciot_support_ind;
+static int hf_gtpv2_ciot_support_ind_spare_bits;
+static int hf_gtpv2_ciot_support_ind_bit4;
+static int hf_gtpv2_ciot_support_ind_bit3;
+static int hf_gtpv2_ciot_support_ind_bit2;
+static int hf_gtpv2_ciot_support_ind_bit1;
+
+static int hf_gtpv2_length_of_node_name;
+static int hf_gtpv2_node_name;
+static int hf_gtpv2_length_of_node_realm;
+static int hf_gtpv2_node_realm;
+static int hf_gtpv2_ms_ts;
+static int hf_gtpv2_origination_ts;
+static int hf_gtpv2_mon_event_inf_nsur;
+static int hf_gtpv2_mon_event_inf_nsui;
+static int hf_gtpv2_mon_event_inf_nscf;
+static int hf_gtpv2_mon_event_inf_srie;
+static int hf_gtpv2_mon_event_inf_scef_reference_id;
+static int hf_gtpv2_mon_event_inf_scef_reference_id_ext;
+static int hf_gtpv2_mon_event_inf_scef_id_length;
+static int hf_gtpv2_mon_event_inf_scef_id;
+static int hf_gtpv2_mon_event_inf_remaining_number_of_reports;
+static int hf_gtpv2_mon_event_ext_inf_lrtp;
+static int hf_gtpv2_mon_event_ext_inf_srie;
+static int hf_gtpv2_mon_event_ext_inf_scef_reference_id;
+static int hf_gtpv2_mon_event_ext_inf_scef_id_length;
+static int hf_gtpv2_mon_event_ext_inf_scef_id;
+static int hf_gtpv2_mon_event_ext_inf_remain_min_period_loc_report_type;
+static int hf_gtpv2_mon_event_ext_inf_scef_reference_id_ext;
+static int hf_gtpv2_rohc_profiles_bit0;
+static int hf_gtpv2_rohc_profiles_bit1;
+static int hf_gtpv2_rohc_profiles_bit2;
+static int hf_gtpv2_rohc_profiles_bit3;
+static int hf_gtpv2_rohc_profiles_bit4;
+static int hf_gtpv2_rohc_profiles_bit5;
+static int hf_gtpv2_rohc_profiles_bit6;
+static int hf_gtpv2_rohc_profiles_bit7;
+static int hf_gtpv2_max_cid;
+static int hf_gtpv2_uplink_rate_limit;
+static int hf_gtpv2_downlink_rate_limit;
+static int hf_gtpv2_timestamp_value;
+static int hf_gtpv2_counter_value;
+static int hf_gtpv2_mapped_ue_usage_type;
+static int hf_gtpv2_uli_flags;
+static int hf_gtpv2_rohc_profile_flags;
+static int hf_gtpv2_dcnr;
+
+static int hf_gtpv2_secondary_rat_usage_data_report;
+static int hf_gtpv2_secondary_rat_usage_data_report_spare_bits;
+static int hf_gtpv2_secondary_rat_usage_data_report_bit3;
+static int hf_gtpv2_secondary_rat_usage_data_report_bit2;
+static int hf_gtpv2_secondary_rat_usage_data_report_bit1;
+static int hf_gtpv2_secondary_rat_usage_data_report_rat_type;
+static int hf_gtpv2_secondary_rat_usage_data_report_start_timestamp;
+static int hf_gtpv2_secondary_rat_usage_data_report_end_timestamp;
+static int hf_gtpv2_secondary_rat_usage_data_report_usage_data_dl;
+static int hf_gtpv2_secondary_rat_usage_data_report_usage_data_ul;
+static int hf_gtpv2_secondary_rat_usage_data_report_srudn_length;
+static int hf_gtpv2_secondary_rat_usage_data_report_srudn_value;
+static int hf_gtpv2_csg_info_rep_action_b0;
+static int hf_gtpv2_csg_info_rep_action_b1;
+static int hf_gtpv2_csg_info_rep_action_b2;
+static int hf_gtpv2_gnodeb_id_len;
+static int hf_gtpv2_gnodeb_id;
+static int hf_gtpv2_macro_ng_enodeb_id;
+static int hf_gtpv2_5gs_tac;
+static int hf_gtpv2_en_gnb_id_len;
 static int hf_gtpv2_5tac;
 static int hf_gtpv2_etac;
-static int hf_gtpv2_en_gnb_id = -1;
-static int hf_gtpv2_trig_event_len = -1;
-static int hf_gtpv2_ne_list_len = -1;
-static int hf_gtpv2_ses_trs_depth = -1;
-static int hf_gtpv2_list_of_if_len = -1;
-static int hf_gtpv2_trs_coll_ip_addr_len = -1;
-static int hf_gtpv2_trs_coll_ipv4_addr =-1;
-static int hf_gtpv2_trs_coll_ipv6_addr =-1;
-
-static int hf_gtpv2_ext_tra_info_loi_mscs_cap =-1;
-static int hf_gtpv2_ext_tra_info_loi_mscs_map_f = -1;
-static int hf_gtpv2_ext_tra_info_loi_mscs_map_e = -1;
-static int hf_gtpv2_ext_tra_info_loi_mscs_map_b = -1;
-static int hf_gtpv2_ext_tra_info_loi_mscs_map_g = -1;
-static int hf_gtpv2_ext_tra_info_loi_mscs_mc = -1;
-static int hf_gtpv2_ext_tra_info_loi_mscs_iu = -1;
-static int hf_gtpv2_ext_tra_info_loi_mscs_a = -1;
-static int hf_gtpv2_ext_tra_info_loi_mscs_map_c = -1;
-static int hf_gtpv2_ext_tra_info_loi_mscs_map_d = -1;
-static int hf_gtpv2_ext_tra_info_loi_mgw_iuup = -1;
-static int hf_gtpv2_ext_tra_info_loi_mgw_nbup = -1;
-static int hf_gtpv2_ext_tra_info_loi_mgw_mc = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgsn_ge = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgsn_gs = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgsn_map_gf = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgsn_map_gd = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgsn_map_gr = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgsn_gn = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgsn_iu = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgsn_gb = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgsn_s13 = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgsn_s3 = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgsn_s4 = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgsn_s6d = -1;
-static int hf_gtpv2_ext_tra_info_loi_ggsn_gmb = -1;
-static int hf_gtpv2_ext_tra_info_loi_ggsn_gi = -1;
-static int hf_gtpv2_ext_tra_info_loi_ggsn_gn = -1;
-static int hf_gtpv2_ext_tra_info_loi_rnc_uu = -1;
-static int hf_gtpv2_ext_tra_info_loi_rnc_iub = -1;
-static int hf_gtpv2_ext_tra_info_loi_rnc_iur = -1;
-static int hf_gtpv2_ext_tra_info_loi_rnc_iu = -1;
-static int hf_gtpv2_ext_tra_info_loi_bm_sc_gmb = -1;
-static int hf_gtpv2_ext_tra_info_loi_mme_s13 = -1;
-static int hf_gtpv2_ext_tra_info_loi_mme_s11 = -1;
-static int hf_gtpv2_ext_tra_info_loi_mme_s10 = -1;
-static int hf_gtpv2_ext_tra_info_loi_mme_s6a = -1;
-static int hf_gtpv2_ext_tra_info_loi_mme_s3 = -1;
-static int hf_gtpv2_ext_tra_info_loi_mme_s1_mme = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgw_gxc = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgw_s11 = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgw_s8b = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgw_s5 = -1;
-static int hf_gtpv2_ext_tra_info_loi_sgw_s4 = -1;
-static int hf_gtpv2_ext_tra_info_loi_pdn_gw_sgi = -1;
-static int hf_gtpv2_ext_tra_info_loi_pdn_gw_s8b = -1;
-static int hf_gtpv2_ext_tra_info_loi_pdn_gw_gx = -1;
-static int hf_gtpv2_ext_tra_info_loi_pdn_gw_s6b = -1;
-static int hf_gtpv2_ext_tra_info_loi_pdn_gw_s5 = -1;
-static int hf_gtpv2_ext_tra_info_loi_pdn_gw_s2c = -1;
-static int hf_gtpv2_ext_tra_info_loi_pdn_gw_s2b = -1;
-static int hf_gtpv2_ext_tra_info_loi_pdn_gw_s2a = -1;
-static int hf_gtpv2_ext_tra_info_loi_enb_uu = -1;
-static int hf_gtpv2_ext_tra_info_loi_enb_x2 = -1;
-static int hf_gtpv2_ext_tra_info_loi_enb_s1_mme = -1;
-static int hf_gtpv2_ext_tra_info_loi_hss_sh = -1;
-static int hf_gtpv2_ext_tra_info_loi_hss_s6a = -1;
-static int hf_gtpv2_ext_tra_info_loi_hss_s6d = -1;
-static int hf_gtpv2_ext_tra_info_loi_hss_cx = -1;
-static int hf_gtpv2_ext_tra_info_loi_hss_map_gr = -1;
-static int hf_gtpv2_ext_tra_info_loi_hss_map_gc = -1;
-static int hf_gtpv2_ext_tra_info_loi_hss_map_d = -1;
-static int hf_gtpv2_ext_tra_info_loi_hss_map_c = -1;
-static int hf_gtpv2_ext_tra_info_loi_eir_map_gf = -1;
-static int hf_gtpv2_ext_tra_info_loi_eir_s13p = -1;
-static int hf_gtpv2_ext_tra_info_loi_eir_s13 = -1;
-static int hf_gtpv2_ext_tra_info_loi_eir_map_f = -1;
-static int hf_gtpv2_ext_tra_info_loi_amf_n20 = -1;
-static int hf_gtpv2_ext_tra_info_loi_amf_n15 = -1;
-static int hf_gtpv2_ext_tra_info_loi_amf_n14 = -1;
-static int hf_gtpv2_ext_tra_info_loi_amf_n12 = -1;
-static int hf_gtpv2_ext_tra_info_loi_amf_n11 = -1;
-static int hf_gtpv2_ext_tra_info_loi_amf_n8 = -1;
-static int hf_gtpv2_ext_tra_info_loi_amf_n2 = -1;
-static int hf_gtpv2_ext_tra_info_loi_amf_n1 = -1;
-static int hf_gtpv2_ext_tra_info_loi_amf_n22 = -1;
-static int hf_gtpv2_ext_tra_info_loi_amf_n26 = -1;
-static int hf_gtpv2_ext_tra_info_loi_pcf_n15 = -1;
-static int hf_gtpv2_ext_tra_info_loi_pcf_n7 = -1;
-static int hf_gtpv2_ext_tra_info_loi_pcf_n5 = -1;
-static int hf_gtpv2_ext_tra_info_loi_smf_s5_c = -1;
-static int hf_gtpv2_ext_tra_info_loi_smf_n11 = -1;
-static int hf_gtpv2_ext_tra_info_loi_smf_n10 = -1;
-static int hf_gtpv2_ext_tra_info_loi_smf_n7 = -1;
-static int hf_gtpv2_ext_tra_info_loi_smf_n4 = -1;
-static int hf_gtpv2_ext_tra_info_loi_upf_n4 = -1;
-static int hf_gtpv2_ext_tra_info_loi_ng_ran_node_e1_c = -1;
-static int hf_gtpv2_ext_tra_info_loi_ng_ran_node_f1_c = -1;
-static int hf_gtpv2_ext_tra_info_loi_ng_ran_node_Uu = -1;
-static int hf_gtpv2_ext_tra_info_loi_ng_ran_node_xn_c = -1;
-static int hf_gtpv2_ext_tra_info_loi_ng_ran_node_ng_c = -1;
-
-static int hf_gtpv2_nr_dl_pkts_all = -1;
-static int hf_gtpv2_nr_ul_pkts_all = -1;
-static int hf_gtpv2_nr_add_exception_rpts = -1;
-static int hf_apn_rte_cntrl_status_val_time = -1;
-static int hf_gtpv2_max_pkt_loss_rte_ul_flg = -1;
-static int hf_gtpv2_max_pkt_loss_rte_dl_flg = -1;
-static int hf_gtpv2_max_pkt_loss_rte_ul = -1;
-static int hf_gtpv2_max_pkt_loss_rte_dl = -1;
-
-static int hf_gtpv2_mm_context_iov_updates_counter = -1;
-static int hf_gtpv2_mm_context_ear_len = -1;
-static int hf_gtpv2_node_number_len = -1;
-static int hf_gtpv2_additional_rrm_policy_index = -1;
-
-static gint ett_gtpv2 = -1;
-static gint ett_gtpv2_flags = -1;
-static gint ett_gtpv2_uli_flags = -1;
-static gint ett_gtpv2_uli_field = -1;
-static gint ett_gtpv2_bearer_ctx = -1;
-static gint ett_gtpv2_PDN_conn = -1;
-static gint ett_gtpv2_overload_control_information = -1;
-static gint ett_gtpv2_mm_context_flag = -1;
-static gint ett_gtpv2_pdn_numbers_nsapi = -1;
-static gint ett_gtpv2_tra_info_trigg = -1;
-static gint ett_gtpv2_tra_info_trigg_msc_server = -1;
-static gint ett_gtpv2_tra_info_trigg_mgw = -1;
-static gint ett_gtpv2_tra_info_trigg_sgsn = -1;
-static gint ett_gtpv2_tra_info_trigg_ggsn = -1;
-static gint ett_gtpv2_tra_info_trigg_bm_sc = -1;
-static gint ett_gtpv2_tra_info_trigg_sgw_mme = -1;
-static gint ett_gtpv2_tra_info_trigg_sgw = -1;
-static gint ett_gtpv2_tra_info_trigg_pgw = -1;
-static gint ett_gtpv2_tra_info_interfaces = -1;
-static gint ett_gtpv2_tra_info_interfaces_imsc_server = -1;
-static gint ett_gtpv2_tra_info_interfaces_lmgw = -1;
-static gint ett_gtpv2_tra_info_interfaces_lsgsn = -1;
-static gint ett_gtpv2_tra_info_interfaces_lggsn = -1;
-static gint ett_gtpv2_tra_info_interfaces_lrnc = -1;
-static gint ett_gtpv2_tra_info_interfaces_lbm_sc = -1;
-static gint ett_gtpv2_tra_info_interfaces_lmme = -1;
-static gint ett_gtpv2_tra_info_interfaces_lsgw = -1;
-static gint ett_gtpv2_tra_info_interfaces_lpdn_gw = -1;
-static gint ett_gtpv2_tra_info_interfaces_lpdn_lenb = -1;
-static gint ett_gtpv2_tra_info_ne_types = -1;
-static gint ett_gtpv2_rai = -1;
-static gint ett_gtpv2_ms_mark = -1;
-static gint ett_gtpv2_stn_sr = -1;
-static gint ett_gtpv2_supp_codec_list = -1;
-static gint ett_gtpv2_bss_con = -1;
-static gint ett_gtpv2_utran_con = -1;
-static gint ett_gtpv2_eutran_con = -1;
-static gint ett_gtpv2_son_con = -1;
-static gint ett_gtpv2_endc_son_con = -1;
-static gint ett_gtpv2_intersys_son_con = -1;
-static gint ett_gtpv2_mm_context_auth_qua = -1;
-static gint ett_gtpv2_mm_context_auth_qui = -1;
-static gint ett_gtpv2_mm_context_auth_tri = -1;
-static gint ett_gtpv2_mm_context_net_cap = -1;
-static gint ett_gtpv2_ms_network_capability = -1;
-static gint ett_gtpv2_mm_context_sc = -1;
-static gint ett_gtpv2_vd_pref = -1;
-static gint ett_gtpv2_access_rest_data = -1;
-static gint ett_gtpv2_qua = -1;
-static gint ett_gtpv2_qui = -1;
-static gint ett_gtpv2_preaa_tais = -1;
-static gint ett_gtpv2_preaa_menbs = -1;
-static gint ett_gtpv2_preaa_henbs = -1;
-static gint ett_gtpv2_preaa_ecgis = -1;
-static gint ett_gtpv2_preaa_rais = -1;
-static gint ett_gtpv2_preaa_sais = -1;
-static gint ett_gtpv2_preaa_cgis = -1;
-static gint ett_gtpv2_load_control_inf = -1;
-static gint ett_gtpv2_eci = -1;
-static gint ett_gtpv2_twan_flags = -1;
-static gint ett_gtpv2_ciot_support_ind = -1;
-static gint ett_gtpv2_rohc_profile_flags = -1;
-static gint ett_gtpv2_secondary_rat_usage_data_report = -1;
-static gint ett_gtpv2_pres_rep_area_info = -1;
-static gint ett_gtpv2_preaa_ext_menbs = -1;
-static gint ett_gtpv2_ue_nr_sec_cap_len = -1;
-static gint ett_gtpv2_apn_rte_ctrl_sts_len = -1;
-static gint ett_gtpv2_if_mgcs = -1;
-static gint ett_gtpv2_if_mgw = -1;
-static gint ett_gtpv2_if_sgsn = -1;
-static gint ett_gtpv2_if_ggsn = -1;
-static gint ett_gtpv2_if_rnc = -1;
-static gint ett_gtpv2_if_bm_sc = -1;
-static gint ett_gtpv2_if_mme = -1;
-static gint ett_gtpv2_if_sgw = -1;
-static gint ett_gtpv2_if_pdn_gw = -1;
-static gint ett_gtpv2_if_enb = -1;
-static gint ett_gtpv2_if_hss = -1;
-static gint ett_gtpv2_if_eir = -1;
-static gint ett_gtpv2_if_amf = -1;
-static gint ett_gtpv2_if_pcf = -1;
-static gint ett_gtpv2_if_smf = -1;
-static gint ett_gtpv2_if_upf = -1;
-static gint ett_gtpv2_if_ng_ran_node = -1;
-
-
-static expert_field ei_gtpv2_ie_data_not_dissected = EI_INIT;
-static expert_field ei_gtpv2_ie_len_invalid = EI_INIT;
-static expert_field ei_gtpv2_source_type_unknown = EI_INIT;
-static expert_field ei_gtpv2_fq_csid_type_bad = EI_INIT;
-static expert_field ei_gtpv2_mbms_session_duration_days = EI_INIT;
-static expert_field ei_gtpv2_mbms_session_duration_secs = EI_INIT;
-static expert_field ei_gtpv2_ie = EI_INIT;
-static expert_field ei_gtpv2_int_size_not_handled = EI_INIT;
-static expert_field ei_gtpv2_apn_too_long = EI_INIT;
+static int hf_gtpv2_en_gnb_id;
+static int hf_gtpv2_trig_event_len;
+static int hf_gtpv2_ne_list_len;
+static int hf_gtpv2_ses_trs_depth;
+static int hf_gtpv2_list_of_if_len;
+static int hf_gtpv2_trs_coll_ip_addr_len;
+static int hf_gtpv2_trs_coll_ipv4_addr;
+static int hf_gtpv2_trs_coll_ipv6_addr;
+
+static int hf_gtpv2_ext_tra_info_loi_mscs_cap;
+static int hf_gtpv2_ext_tra_info_loi_mscs_map_f;
+static int hf_gtpv2_ext_tra_info_loi_mscs_map_e;
+static int hf_gtpv2_ext_tra_info_loi_mscs_map_b;
+static int hf_gtpv2_ext_tra_info_loi_mscs_map_g;
+static int hf_gtpv2_ext_tra_info_loi_mscs_mc;
+static int hf_gtpv2_ext_tra_info_loi_mscs_iu;
+static int hf_gtpv2_ext_tra_info_loi_mscs_a;
+static int hf_gtpv2_ext_tra_info_loi_mscs_map_c;
+static int hf_gtpv2_ext_tra_info_loi_mscs_map_d;
+static int hf_gtpv2_ext_tra_info_loi_mgw_iuup;
+static int hf_gtpv2_ext_tra_info_loi_mgw_nbup;
+static int hf_gtpv2_ext_tra_info_loi_mgw_mc;
+static int hf_gtpv2_ext_tra_info_loi_sgsn_ge;
+static int hf_gtpv2_ext_tra_info_loi_sgsn_gs;
+static int hf_gtpv2_ext_tra_info_loi_sgsn_map_gf;
+static int hf_gtpv2_ext_tra_info_loi_sgsn_map_gd;
+static int hf_gtpv2_ext_tra_info_loi_sgsn_map_gr;
+static int hf_gtpv2_ext_tra_info_loi_sgsn_gn;
+static int hf_gtpv2_ext_tra_info_loi_sgsn_iu;
+static int hf_gtpv2_ext_tra_info_loi_sgsn_gb;
+static int hf_gtpv2_ext_tra_info_loi_sgsn_s13;
+static int hf_gtpv2_ext_tra_info_loi_sgsn_s3;
+static int hf_gtpv2_ext_tra_info_loi_sgsn_s4;
+static int hf_gtpv2_ext_tra_info_loi_sgsn_s6d;
+static int hf_gtpv2_ext_tra_info_loi_ggsn_gmb;
+static int hf_gtpv2_ext_tra_info_loi_ggsn_gi;
+static int hf_gtpv2_ext_tra_info_loi_ggsn_gn;
+static int hf_gtpv2_ext_tra_info_loi_rnc_uu;
+static int hf_gtpv2_ext_tra_info_loi_rnc_iub;
+static int hf_gtpv2_ext_tra_info_loi_rnc_iur;
+static int hf_gtpv2_ext_tra_info_loi_rnc_iu;
+static int hf_gtpv2_ext_tra_info_loi_bm_sc_gmb;
+static int hf_gtpv2_ext_tra_info_loi_mme_s13;
+static int hf_gtpv2_ext_tra_info_loi_mme_s11;
+static int hf_gtpv2_ext_tra_info_loi_mme_s10;
+static int hf_gtpv2_ext_tra_info_loi_mme_s6a;
+static int hf_gtpv2_ext_tra_info_loi_mme_s3;
+static int hf_gtpv2_ext_tra_info_loi_mme_s1_mme;
+static int hf_gtpv2_ext_tra_info_loi_sgw_gxc;
+static int hf_gtpv2_ext_tra_info_loi_sgw_s11;
+static int hf_gtpv2_ext_tra_info_loi_sgw_s8b;
+static int hf_gtpv2_ext_tra_info_loi_sgw_s5;
+static int hf_gtpv2_ext_tra_info_loi_sgw_s4;
+static int hf_gtpv2_ext_tra_info_loi_pdn_gw_sgi;
+static int hf_gtpv2_ext_tra_info_loi_pdn_gw_s8b;
+static int hf_gtpv2_ext_tra_info_loi_pdn_gw_gx;
+static int hf_gtpv2_ext_tra_info_loi_pdn_gw_s6b;
+static int hf_gtpv2_ext_tra_info_loi_pdn_gw_s5;
+static int hf_gtpv2_ext_tra_info_loi_pdn_gw_s2c;
+static int hf_gtpv2_ext_tra_info_loi_pdn_gw_s2b;
+static int hf_gtpv2_ext_tra_info_loi_pdn_gw_s2a;
+static int hf_gtpv2_ext_tra_info_loi_enb_uu;
+static int hf_gtpv2_ext_tra_info_loi_enb_x2;
+static int hf_gtpv2_ext_tra_info_loi_enb_s1_mme;
+static int hf_gtpv2_ext_tra_info_loi_hss_sh;
+static int hf_gtpv2_ext_tra_info_loi_hss_s6a;
+static int hf_gtpv2_ext_tra_info_loi_hss_s6d;
+static int hf_gtpv2_ext_tra_info_loi_hss_cx;
+static int hf_gtpv2_ext_tra_info_loi_hss_map_gr;
+static int hf_gtpv2_ext_tra_info_loi_hss_map_gc;
+static int hf_gtpv2_ext_tra_info_loi_hss_map_d;
+static int hf_gtpv2_ext_tra_info_loi_hss_map_c;
+static int hf_gtpv2_ext_tra_info_loi_eir_map_gf;
+static int hf_gtpv2_ext_tra_info_loi_eir_s13p;
+static int hf_gtpv2_ext_tra_info_loi_eir_s13;
+static int hf_gtpv2_ext_tra_info_loi_eir_map_f;
+static int hf_gtpv2_ext_tra_info_loi_amf_n20;
+static int hf_gtpv2_ext_tra_info_loi_amf_n15;
+static int hf_gtpv2_ext_tra_info_loi_amf_n14;
+static int hf_gtpv2_ext_tra_info_loi_amf_n12;
+static int hf_gtpv2_ext_tra_info_loi_amf_n11;
+static int hf_gtpv2_ext_tra_info_loi_amf_n8;
+static int hf_gtpv2_ext_tra_info_loi_amf_n2;
+static int hf_gtpv2_ext_tra_info_loi_amf_n1;
+static int hf_gtpv2_ext_tra_info_loi_amf_n22;
+static int hf_gtpv2_ext_tra_info_loi_amf_n26;
+static int hf_gtpv2_ext_tra_info_loi_pcf_n15;
+static int hf_gtpv2_ext_tra_info_loi_pcf_n7;
+static int hf_gtpv2_ext_tra_info_loi_pcf_n5;
+static int hf_gtpv2_ext_tra_info_loi_smf_s5_c;
+static int hf_gtpv2_ext_tra_info_loi_smf_n11;
+static int hf_gtpv2_ext_tra_info_loi_smf_n10;
+static int hf_gtpv2_ext_tra_info_loi_smf_n7;
+static int hf_gtpv2_ext_tra_info_loi_smf_n4;
+static int hf_gtpv2_ext_tra_info_loi_upf_n4;
+static int hf_gtpv2_ext_tra_info_loi_ng_ran_node_e1_c;
+static int hf_gtpv2_ext_tra_info_loi_ng_ran_node_f1_c;
+static int hf_gtpv2_ext_tra_info_loi_ng_ran_node_Uu;
+static int hf_gtpv2_ext_tra_info_loi_ng_ran_node_xn_c;
+static int hf_gtpv2_ext_tra_info_loi_ng_ran_node_ng_c;
+
+static int hf_gtpv2_nr_dl_pkts_all;
+static int hf_gtpv2_nr_ul_pkts_all;
+static int hf_gtpv2_nr_add_exception_rpts;
+static int hf_apn_rte_cntrl_status_val_time;
+static int hf_gtpv2_max_pkt_loss_rte_ul_flg;
+static int hf_gtpv2_max_pkt_loss_rte_dl_flg;
+static int hf_gtpv2_max_pkt_loss_rte_ul;
+static int hf_gtpv2_max_pkt_loss_rte_dl;
+
+static int hf_gtpv2_mm_context_iov_updates_counter;
+static int hf_gtpv2_mm_context_ear_len;
+static int hf_gtpv2_node_number_len;
+static int hf_gtpv2_additional_rrm_policy_index;
+
+static gint ett_gtpv2;
+static gint ett_gtpv2_flags;
+static gint ett_gtpv2_uli_flags;
+static gint ett_gtpv2_uli_field;
+static gint ett_gtpv2_bearer_ctx;
+static gint ett_gtpv2_PDN_conn;
+static gint ett_gtpv2_overload_control_information;
+static gint ett_gtpv2_mm_context_flag;
+static gint ett_gtpv2_pdn_numbers_nsapi;
+static gint ett_gtpv2_tra_info_trigg;
+static gint ett_gtpv2_tra_info_trigg_msc_server;
+static gint ett_gtpv2_tra_info_trigg_mgw;
+static gint ett_gtpv2_tra_info_trigg_sgsn;
+static gint ett_gtpv2_tra_info_trigg_ggsn;
+static gint ett_gtpv2_tra_info_trigg_bm_sc;
+static gint ett_gtpv2_tra_info_trigg_sgw_mme;
+static gint ett_gtpv2_tra_info_trigg_sgw;
+static gint ett_gtpv2_tra_info_trigg_pgw;
+static gint ett_gtpv2_tra_info_interfaces;
+static gint ett_gtpv2_tra_info_interfaces_imsc_server;
+static gint ett_gtpv2_tra_info_interfaces_lmgw;
+static gint ett_gtpv2_tra_info_interfaces_lsgsn;
+static gint ett_gtpv2_tra_info_interfaces_lggsn;
+static gint ett_gtpv2_tra_info_interfaces_lrnc;
+static gint ett_gtpv2_tra_info_interfaces_lbm_sc;
+static gint ett_gtpv2_tra_info_interfaces_lmme;
+static gint ett_gtpv2_tra_info_interfaces_lsgw;
+static gint ett_gtpv2_tra_info_interfaces_lpdn_gw;
+static gint ett_gtpv2_tra_info_interfaces_lpdn_lenb;
+static gint ett_gtpv2_tra_info_ne_types;
+static gint ett_gtpv2_rai;
+static gint ett_gtpv2_ms_mark;
+static gint ett_gtpv2_stn_sr;
+static gint ett_gtpv2_supp_codec_list;
+static gint ett_gtpv2_bss_con;
+static gint ett_gtpv2_utran_con;
+static gint ett_gtpv2_eutran_con;
+static gint ett_gtpv2_son_con;
+static gint ett_gtpv2_endc_son_con;
+static gint ett_gtpv2_intersys_son_con;
+static gint ett_gtpv2_mm_context_auth_qua;
+static gint ett_gtpv2_mm_context_auth_qui;
+static gint ett_gtpv2_mm_context_auth_tri;
+static gint ett_gtpv2_mm_context_net_cap;
+static gint ett_gtpv2_ms_network_capability;
+static gint ett_gtpv2_mm_context_sc;
+static gint ett_gtpv2_vd_pref;
+static gint ett_gtpv2_access_rest_data;
+static gint ett_gtpv2_qua;
+static gint ett_gtpv2_qui;
+static gint ett_gtpv2_preaa_tais;
+static gint ett_gtpv2_preaa_menbs;
+static gint ett_gtpv2_preaa_henbs;
+static gint ett_gtpv2_preaa_ecgis;
+static gint ett_gtpv2_preaa_rais;
+static gint ett_gtpv2_preaa_sais;
+static gint ett_gtpv2_preaa_cgis;
+static gint ett_gtpv2_load_control_inf;
+static gint ett_gtpv2_eci;
+static gint ett_gtpv2_twan_flags;
+static gint ett_gtpv2_ciot_support_ind;
+static gint ett_gtpv2_rohc_profile_flags;
+static gint ett_gtpv2_secondary_rat_usage_data_report;
+static gint ett_gtpv2_pres_rep_area_info;
+static gint ett_gtpv2_preaa_ext_menbs;
+static gint ett_gtpv2_ue_nr_sec_cap_len;
+static gint ett_gtpv2_apn_rte_ctrl_sts_len;
+static gint ett_gtpv2_if_mgcs;
+static gint ett_gtpv2_if_mgw;
+static gint ett_gtpv2_if_sgsn;
+static gint ett_gtpv2_if_ggsn;
+static gint ett_gtpv2_if_rnc;
+static gint ett_gtpv2_if_bm_sc;
+static gint ett_gtpv2_if_mme;
+static gint ett_gtpv2_if_sgw;
+static gint ett_gtpv2_if_pdn_gw;
+static gint ett_gtpv2_if_enb;
+static gint ett_gtpv2_if_hss;
+static gint ett_gtpv2_if_eir;
+static gint ett_gtpv2_if_amf;
+static gint ett_gtpv2_if_pcf;
+static gint ett_gtpv2_if_smf;
+static gint ett_gtpv2_if_upf;
+static gint ett_gtpv2_if_ng_ran_node;
+
+
+static expert_field ei_gtpv2_ie_data_not_dissected;
+static expert_field ei_gtpv2_ie_len_invalid;
+static expert_field ei_gtpv2_source_type_unknown;
+static expert_field ei_gtpv2_fq_csid_type_bad;
+static expert_field ei_gtpv2_mbms_session_duration_days;
+static expert_field ei_gtpv2_mbms_session_duration_secs;
+static expert_field ei_gtpv2_ie;
+static expert_field ei_gtpv2_int_size_not_handled;
+static expert_field ei_gtpv2_apn_too_long;
 
 static int gtpv2_tap = -1;
 
diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c
index 27f2d41c44..2fb834466e 100644
--- a/epan/dissectors/packet-gvcp.c
+++ b/epan/dissectors/packet-gvcp.c
@@ -25,8 +25,8 @@
    header fields to show the relations between
    request and response as well as the response time
 */
-static int hf_gvcp_response_in = -1;
-static int hf_gvcp_response_to = -1;
+static int hf_gvcp_response_in;
+static int hf_gvcp_response_to;
 
 /*
    structure to hold info to remember between the requests and responses
@@ -267,268 +267,268 @@ void proto_register_gvcp(void);
 void proto_reg_handoff_gvcp(void);
 
 /* Define the gvcp proto */
-static int proto_gvcp = -1;
+static int proto_gvcp;
 static int global_gvcp_port = 3956;
 
-static int hf_gvcp_custom_register_addr = -1;
-static int hf_gvcp_custom_memory_addr = -1;
+static int hf_gvcp_custom_register_addr;
+static int hf_gvcp_custom_memory_addr;
 
 /*
 \brief IDs used for bootstrap dissection
 */
 
-static int hf_gvcp_message_key_code = -1;
-static int hf_gvcp_flag = -1;
-static int hf_gvcp_acknowledge_required_flag = -1;
-static int hf_gvcp_allow_broadcast_acknowledge_flag = -1;
-static int hf_gvcp_command = -1;
-static int hf_gvcp_length = -1;
-static int hf_gvcp_request_id = -1;
-static int hf_gvcp_status = -1;
-static int hf_gvcp_acknowledge = -1;
-static int hf_gvcp_spec_version_major = -1;
-static int hf_gvcp_spec_version_minor = -1;
-static int hf_gvcp_devicemodediscovery = -1;
-static int hf_gvcp_device_mac_address = -1;
-static int hf_gvcp_ip_config_persistent_ip = -1;
-static int hf_gvcp_ip_config_dhcp = -1;
-static int hf_gvcp_ip_config_lla = -1;
-static int hf_gvcp_current_IP = -1;
-static int hf_gvcp_current_subnet_mask = -1;
-static int hf_gvcp_current_default_gateway = -1;
-static int hf_gvcp_manufacturer_name = -1;
-static int hf_gvcp_model_name = -1;
-static int hf_gvcp_device_version = -1;
-static int hf_gvcp_manufacturer_specific_info = -1;
-static int hf_gvcp_serial_number = -1;
-static int hf_gvcp_user_defined_name = -1;
-static int hf_gvcp_first_xml_device_description_file = -1;
-static int hf_gvcp_second_xml_device_description_file = -1;
-static int hf_gvcp_readregcmd_bootstrap_register = -1;
-static int hf_gvcp_writeregcmd_bootstrap_register = -1;
-static int hf_gvcp_writeregcmd_data = -1;
-static int hf_gvcp_writeregcmd_data_index = -1;
-static int hf_gvcp_readmemcmd_address = -1;
-static int hf_gvcp_readmemcmd_bootstrap_register = -1;
-static int hf_gvcp_readmemcmd_count = -1;
-static int hf_gvcp_writememcmd_data = -1;
-static int hf_gvcp_writememcmd_data_index = -1;
-static int hf_gvcp_forceip_mac_address = -1;
-static int hf_gvcp_forceip_static_IP = -1;
-static int hf_gvcp_forceip_static_subnet_mask = -1;
-static int hf_gvcp_forceip_static_default_gateway = -1;
-static int hf_gvcp_resendcmd_stream_channel_index = -1;
-static int hf_gvcp_resendcmd_block_id = -1;
-static int hf_gvcp_resendcmd_first_packet_id = -1;
-static int hf_gvcp_resendcmd_last_packet_id = -1;
-static int hf_gvcp_eventcmd_id = -1;
-static int hf_gvcp_eventcmd_error_id = -1;
-static int hf_gvcp_eventcmd_extid_length = -1;
-static int hf_gvcp_eventcmd_device_specific_id = -1;
-static int hf_gvcp_eventcmd_stream_channel_index = -1;
-static int hf_gvcp_eventcmd_block_id = -1;
-static int hf_gvcp_eventcmd_timestamp = -1;
-static int hf_gvcp_eventcmd_data = -1;
-static int hf_gvcp_actioncmd_device_key = -1;
-static int hf_gvcp_actioncmd_group_key = -1;
-static int hf_gvcp_actioncmd_group_mask = -1;
-static int hf_gvcp_time_to_completion = -1;
-static int hf_gvcp_devicemode_endianness = -1;
-static int hf_gvcp_devicemode_deviceclass = -1;
-static int hf_gvcp_devicemode_characterset = -1;
-static int hf_gvcp_machigh = -1;
-static int hf_gvcp_maclow = -1;
-static int hf_gvcp_persistent_ip = -1;
-static int hf_gvcp_persistent_subnet = -1;
-static int hf_gvcp_persistent_gateway = -1;
-static int hf_gvcp_link_speed = -1;
-static int hf_gvcp_number_message_channels = -1;
-static int hf_gvcp_number_stream_channels = -1;
-static int hf_gvcp_number_action_signals = -1;
-static int hf_gvcp_capability_user_defined = -1;
-static int hf_gvcp_capability_serial_number = -1;
-static int hf_gvcp_capability_heartbeat_disable = -1;
-static int hf_gvcp_capability_link_speed = -1;
-static int hf_gvcp_capability_extended_status_code_v1_1 = -1;
-static int hf_gvcp_capability_ccp_application_portip = -1;
-static int hf_gvcp_capability_manifest_table = -1;
-static int hf_gvcp_capability_test_data = -1;
-static int hf_gvcp_capability_discovery_ACK_delay = -1;
-static int hf_gvcp_capability_writable_discovery_ACK_delay = -1;
-static int hf_gvcp_capability_primary_application_switchover = -1;
-static int hf_gvcp_capability_unconditional_action_command = -1;
-static int hf_gvcp_capability_pending = -1;
-static int hf_gvcp_capability_evendata = -1;
-static int hf_gvcp_capability_event = -1;
-static int hf_gvcp_capability_packetresend = -1;
-static int hf_gvcp_capability_writemem = -1;
-static int hf_gvcp_capability_concatenation = -1;
-static int hf_gvcp_heartbeat = -1;
-static int hf_gvcp_high_timestamp_frequency = -1;
-static int hf_gvcp_low_timestamp_frequency = -1;
-static int hf_gvcp_high_timestamp_value = -1;
-static int hf_gvcp_low_timestamp_value = -1;
-static int hf_gvcp_discovery_ACK_delay = -1;
-static int hf_gvcp_configuration_pending_ack_enable = -1;
-static int hf_gvcp_configuration_heartbeat_disable = -1;
-static int hf_gvcp_pending_timeout_max_execution = -1;
-static int hf_gvcp_control_switchover_key_register = -1;
-static int hf_gvcp_control_switchover_key = -1;
-static int hf_gvcp_control_switchover_en = -1;
-static int hf_gvcp_control_access = -1;
-static int hf_gvcp_exclusive_access = -1;
-static int hf_gvcp_primary_application_host_port = -1;
-static int hf_gvcp_primary_application_ip_address = -1;
-static int hf_gvcp_network_interface_index = -1;
-static int hf_gvcp_host_port = -1;
-static int hf_gvcp_channel_destination_ip = -1;
-static int hf_gvcp_message_channel_transmission_timeout = -1;
-static int hf_gvcp_message_channel_retry_count = -1;
-static int hf_gvcp_message_channel_source_port = -1;
-static int hf_gvcp_sc_host_port = -1;
-static int hf_gvcp_sc_ni_index = -1;
-static int hf_gvcp_sc_direction = -1;
-static int hf_gvcp_sc_fire_test_packet = -1;
-static int hf_gvcp_sc_do_not_fragment = -1;
-static int hf_gvcp_sc_pixel_endianness = -1;
-static int hf_gvcp_sc_packet_size = -1;
-static int hf_gvcp_sc_packet_delay = -1;
-static int hf_gvcp_sc_destination_ip = -1;
-static int hf_gvcp_sc_source_port = -1;
-static int hf_gvcp_sc_big_little_endian_supported = -1;
-static int hf_gvcp_sc_ip_reassembly_supported = -1;
-static int hf_gvcp_sc_unconditional_streaming_supported = -1;
-static int hf_gvcp_sc_extended_chunk_data_supported = -1;
-static int hf_gvcp_sc_unconditional_streaming_enabled = -1;
-static int hf_gvcp_configuration_extended_status_codes_enable_v1_1 = -1;
-static int hf_gvcp_sc_extended_chunk_data_enabled = -1;
-static int hf_gvcp_action_group_key = -1;
-static int hf_gvcp_action_group_mask = -1;
-static int hf_gvcp_timestamp_control_latch = -1;
-static int hf_gvcp_timestamp_control_reset = -1;
-static int hf_gvcp_payloaddata = -1;
-static int hf_gvcp_number_interfaces = -1;
-static int hf_gvcp_supportedipconfig = -1;
-static int hf_gvcp_currentipconfig = -1;
-static int hf_gvcp_spec_version = -1;
+static int hf_gvcp_message_key_code;
+static int hf_gvcp_flag;
+static int hf_gvcp_acknowledge_required_flag;
+static int hf_gvcp_allow_broadcast_acknowledge_flag;
+static int hf_gvcp_command;
+static int hf_gvcp_length;
+static int hf_gvcp_request_id;
+static int hf_gvcp_status;
+static int hf_gvcp_acknowledge;
+static int hf_gvcp_spec_version_major;
+static int hf_gvcp_spec_version_minor;
+static int hf_gvcp_devicemodediscovery;
+static int hf_gvcp_device_mac_address;
+static int hf_gvcp_ip_config_persistent_ip;
+static int hf_gvcp_ip_config_dhcp;
+static int hf_gvcp_ip_config_lla;
+static int hf_gvcp_current_IP;
+static int hf_gvcp_current_subnet_mask;
+static int hf_gvcp_current_default_gateway;
+static int hf_gvcp_manufacturer_name;
+static int hf_gvcp_model_name;
+static int hf_gvcp_device_version;
+static int hf_gvcp_manufacturer_specific_info;
+static int hf_gvcp_serial_number;
+static int hf_gvcp_user_defined_name;
+static int hf_gvcp_first_xml_device_description_file;
+static int hf_gvcp_second_xml_device_description_file;
+static int hf_gvcp_readregcmd_bootstrap_register;
+static int hf_gvcp_writeregcmd_bootstrap_register;
+static int hf_gvcp_writeregcmd_data;
+static int hf_gvcp_writeregcmd_data_index;
+static int hf_gvcp_readmemcmd_address;
+static int hf_gvcp_readmemcmd_bootstrap_register;
+static int hf_gvcp_readmemcmd_count;
+static int hf_gvcp_writememcmd_data;
+static int hf_gvcp_writememcmd_data_index;
+static int hf_gvcp_forceip_mac_address;
+static int hf_gvcp_forceip_static_IP;
+static int hf_gvcp_forceip_static_subnet_mask;
+static int hf_gvcp_forceip_static_default_gateway;
+static int hf_gvcp_resendcmd_stream_channel_index;
+static int hf_gvcp_resendcmd_block_id;
+static int hf_gvcp_resendcmd_first_packet_id;
+static int hf_gvcp_resendcmd_last_packet_id;
+static int hf_gvcp_eventcmd_id;
+static int hf_gvcp_eventcmd_error_id;
+static int hf_gvcp_eventcmd_extid_length;
+static int hf_gvcp_eventcmd_device_specific_id;
+static int hf_gvcp_eventcmd_stream_channel_index;
+static int hf_gvcp_eventcmd_block_id;
+static int hf_gvcp_eventcmd_timestamp;
+static int hf_gvcp_eventcmd_data;
+static int hf_gvcp_actioncmd_device_key;
+static int hf_gvcp_actioncmd_group_key;
+static int hf_gvcp_actioncmd_group_mask;
+static int hf_gvcp_time_to_completion;
+static int hf_gvcp_devicemode_endianness;
+static int hf_gvcp_devicemode_deviceclass;
+static int hf_gvcp_devicemode_characterset;
+static int hf_gvcp_machigh;
+static int hf_gvcp_maclow;
+static int hf_gvcp_persistent_ip;
+static int hf_gvcp_persistent_subnet;
+static int hf_gvcp_persistent_gateway;
+static int hf_gvcp_link_speed;
+static int hf_gvcp_number_message_channels;
+static int hf_gvcp_number_stream_channels;
+static int hf_gvcp_number_action_signals;
+static int hf_gvcp_capability_user_defined;
+static int hf_gvcp_capability_serial_number;
+static int hf_gvcp_capability_heartbeat_disable;
+static int hf_gvcp_capability_link_speed;
+static int hf_gvcp_capability_extended_status_code_v1_1;
+static int hf_gvcp_capability_ccp_application_portip;
+static int hf_gvcp_capability_manifest_table;
+static int hf_gvcp_capability_test_data;
+static int hf_gvcp_capability_discovery_ACK_delay;
+static int hf_gvcp_capability_writable_discovery_ACK_delay;
+static int hf_gvcp_capability_primary_application_switchover;
+static int hf_gvcp_capability_unconditional_action_command;
+static int hf_gvcp_capability_pending;
+static int hf_gvcp_capability_evendata;
+static int hf_gvcp_capability_event;
+static int hf_gvcp_capability_packetresend;
+static int hf_gvcp_capability_writemem;
+static int hf_gvcp_capability_concatenation;
+static int hf_gvcp_heartbeat;
+static int hf_gvcp_high_timestamp_frequency;
+static int hf_gvcp_low_timestamp_frequency;
+static int hf_gvcp_high_timestamp_value;
+static int hf_gvcp_low_timestamp_value;
+static int hf_gvcp_discovery_ACK_delay;
+static int hf_gvcp_configuration_pending_ack_enable;
+static int hf_gvcp_configuration_heartbeat_disable;
+static int hf_gvcp_pending_timeout_max_execution;
+static int hf_gvcp_control_switchover_key_register;
+static int hf_gvcp_control_switchover_key;
+static int hf_gvcp_control_switchover_en;
+static int hf_gvcp_control_access;
+static int hf_gvcp_exclusive_access;
+static int hf_gvcp_primary_application_host_port;
+static int hf_gvcp_primary_application_ip_address;
+static int hf_gvcp_network_interface_index;
+static int hf_gvcp_host_port;
+static int hf_gvcp_channel_destination_ip;
+static int hf_gvcp_message_channel_transmission_timeout;
+static int hf_gvcp_message_channel_retry_count;
+static int hf_gvcp_message_channel_source_port;
+static int hf_gvcp_sc_host_port;
+static int hf_gvcp_sc_ni_index;
+static int hf_gvcp_sc_direction;
+static int hf_gvcp_sc_fire_test_packet;
+static int hf_gvcp_sc_do_not_fragment;
+static int hf_gvcp_sc_pixel_endianness;
+static int hf_gvcp_sc_packet_size;
+static int hf_gvcp_sc_packet_delay;
+static int hf_gvcp_sc_destination_ip;
+static int hf_gvcp_sc_source_port;
+static int hf_gvcp_sc_big_little_endian_supported;
+static int hf_gvcp_sc_ip_reassembly_supported;
+static int hf_gvcp_sc_unconditional_streaming_supported;
+static int hf_gvcp_sc_extended_chunk_data_supported;
+static int hf_gvcp_sc_unconditional_streaming_enabled;
+static int hf_gvcp_configuration_extended_status_codes_enable_v1_1;
+static int hf_gvcp_sc_extended_chunk_data_enabled;
+static int hf_gvcp_action_group_key;
+static int hf_gvcp_action_group_mask;
+static int hf_gvcp_timestamp_control_latch;
+static int hf_gvcp_timestamp_control_reset;
+static int hf_gvcp_payloaddata;
+static int hf_gvcp_number_interfaces;
+static int hf_gvcp_supportedipconfig;
+static int hf_gvcp_currentipconfig;
+static int hf_gvcp_spec_version;
 
 /* Added for 2.0 support */
-static int hf_gvcp_devicemode_current_link_configuration_v2_0 = -1;
-static int hf_gvcp_ip_config_can_handle_pause_frames_v2_0 = -1;
-static int hf_gvcp_ip_config_can_generate_pause_frames_v2_0 = -1;
-static int hf_gvcp_number_of_active_links_v2_0 = -1;
-static int hf_gvcp_sccaps_scspx_register_supported = -1;
-static int hf_gvcp_sccaps_legacy_16bit_blockid_supported_v2_0 = -1;
-static int hf_gvcp_mcsp_supported = -1;
-static int hf_gvcp_capability_1588_v2_0 = -1;
-static int hf_gvcp_capability_extended_status_code_v2_0 = -1;
-static int hf_gvcp_capability_scheduled_action_command_v2_0 = -1;
-static int hf_gvcp_capability_action_command = -1;
-static int hf_gvcp_configuration_1588_enable_v2_0 = -1;
-static int hf_gvcp_configuration_extended_status_codes_enable_v2_0 = -1;
-static int hf_gvcp_configuration_unconditional_action_command_enable_v2_0 = -1;
-static int hf_gvcp_gvsp_configuration_64bit_blockid_enable_v2_0 = -1;
-static int hf_gvcp_link_dlag_v2_0 = -1;
-static int hf_gvcp_link_slag_v2_0 = -1;
-static int hf_gvcp_link_ml_v2_0 = -1;
-static int hf_gvcp_link_sl_v2_0 = -1;
-static int hf_gvcp_ieee1588_clock_status_v2_0 = -1;
-static int hf_gvcp_scheduled_action_command_queue_size_v2_0 = -1;
-static int hf_gvcp_sc_multizone_supported_v2_0 = -1;
-static int hf_gvcp_sc_packet_resend_destination_option_supported_v2_0 = -1;
-static int hf_gvcp_sc_packet_resend_all_in_transmission_supported_v2_0 = -1;
-static int hf_gvcp_sc_packet_resend_destination_option_enabled_v2_0 = -1;
-static int hf_gvcp_sc_packet_resend_all_in_transmission_enabled_v2_0 = -1;
-static int hf_gvcp_sc_additional_zones_v2_0 = -1;
-static int hf_gvcp_sc_zone0_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone1_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone2_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone3_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone4_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone5_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone6_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone7_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone8_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone9_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone10_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone11_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone12_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone13_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone14_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone15_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone16_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone17_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone18_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone19_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone20_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone21_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone22_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone23_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone24_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone25_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone26_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone27_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone28_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone29_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone30_direction_v2_0 = -1;
-static int hf_gvcp_sc_zone31_direction_v2_0 = -1;
-static int hf_gvcp_scheduledactioncommand_flag_v2_0 = -1;
-static int hf_gvcp_64bitid_flag_v2_0 = -1;
-static int hf_gvcp_resendcmd_extended_block_id_v2_0 = -1;
-static int hf_gvcp_resendcmd_extended_first_packet_id_v2_0 = -1;
-static int hf_gvcp_resendcmd_extended_last_packet_id_v2_0 = -1;
-static int hf_gvcp_actioncmd_time_v2_0 = -1;
-static int hf_gvcp_eventcmd_block_id_64bit_v2_0 = -1;
+static int hf_gvcp_devicemode_current_link_configuration_v2_0;
+static int hf_gvcp_ip_config_can_handle_pause_frames_v2_0;
+static int hf_gvcp_ip_config_can_generate_pause_frames_v2_0;
+static int hf_gvcp_number_of_active_links_v2_0;
+static int hf_gvcp_sccaps_scspx_register_supported;
+static int hf_gvcp_sccaps_legacy_16bit_blockid_supported_v2_0;
+static int hf_gvcp_mcsp_supported;
+static int hf_gvcp_capability_1588_v2_0;
+static int hf_gvcp_capability_extended_status_code_v2_0;
+static int hf_gvcp_capability_scheduled_action_command_v2_0;
+static int hf_gvcp_capability_action_command;
+static int hf_gvcp_configuration_1588_enable_v2_0;
+static int hf_gvcp_configuration_extended_status_codes_enable_v2_0;
+static int hf_gvcp_configuration_unconditional_action_command_enable_v2_0;
+static int hf_gvcp_gvsp_configuration_64bit_blockid_enable_v2_0;
+static int hf_gvcp_link_dlag_v2_0;
+static int hf_gvcp_link_slag_v2_0;
+static int hf_gvcp_link_ml_v2_0;
+static int hf_gvcp_link_sl_v2_0;
+static int hf_gvcp_ieee1588_clock_status_v2_0;
+static int hf_gvcp_scheduled_action_command_queue_size_v2_0;
+static int hf_gvcp_sc_multizone_supported_v2_0;
+static int hf_gvcp_sc_packet_resend_destination_option_supported_v2_0;
+static int hf_gvcp_sc_packet_resend_all_in_transmission_supported_v2_0;
+static int hf_gvcp_sc_packet_resend_destination_option_enabled_v2_0;
+static int hf_gvcp_sc_packet_resend_all_in_transmission_enabled_v2_0;
+static int hf_gvcp_sc_additional_zones_v2_0;
+static int hf_gvcp_sc_zone0_direction_v2_0;
+static int hf_gvcp_sc_zone1_direction_v2_0;
+static int hf_gvcp_sc_zone2_direction_v2_0;
+static int hf_gvcp_sc_zone3_direction_v2_0;
+static int hf_gvcp_sc_zone4_direction_v2_0;
+static int hf_gvcp_sc_zone5_direction_v2_0;
+static int hf_gvcp_sc_zone6_direction_v2_0;
+static int hf_gvcp_sc_zone7_direction_v2_0;
+static int hf_gvcp_sc_zone8_direction_v2_0;
+static int hf_gvcp_sc_zone9_direction_v2_0;
+static int hf_gvcp_sc_zone10_direction_v2_0;
+static int hf_gvcp_sc_zone11_direction_v2_0;
+static int hf_gvcp_sc_zone12_direction_v2_0;
+static int hf_gvcp_sc_zone13_direction_v2_0;
+static int hf_gvcp_sc_zone14_direction_v2_0;
+static int hf_gvcp_sc_zone15_direction_v2_0;
+static int hf_gvcp_sc_zone16_direction_v2_0;
+static int hf_gvcp_sc_zone17_direction_v2_0;
+static int hf_gvcp_sc_zone18_direction_v2_0;
+static int hf_gvcp_sc_zone19_direction_v2_0;
+static int hf_gvcp_sc_zone20_direction_v2_0;
+static int hf_gvcp_sc_zone21_direction_v2_0;
+static int hf_gvcp_sc_zone22_direction_v2_0;
+static int hf_gvcp_sc_zone23_direction_v2_0;
+static int hf_gvcp_sc_zone24_direction_v2_0;
+static int hf_gvcp_sc_zone25_direction_v2_0;
+static int hf_gvcp_sc_zone26_direction_v2_0;
+static int hf_gvcp_sc_zone27_direction_v2_0;
+static int hf_gvcp_sc_zone28_direction_v2_0;
+static int hf_gvcp_sc_zone29_direction_v2_0;
+static int hf_gvcp_sc_zone30_direction_v2_0;
+static int hf_gvcp_sc_zone31_direction_v2_0;
+static int hf_gvcp_scheduledactioncommand_flag_v2_0;
+static int hf_gvcp_64bitid_flag_v2_0;
+static int hf_gvcp_resendcmd_extended_block_id_v2_0;
+static int hf_gvcp_resendcmd_extended_first_packet_id_v2_0;
+static int hf_gvcp_resendcmd_extended_last_packet_id_v2_0;
+static int hf_gvcp_actioncmd_time_v2_0;
+static int hf_gvcp_eventcmd_block_id_64bit_v2_0;
 
 /* Added for 2.1 support */
-static int hf_gvcp_selected_ieee1588_profile_v2_1 = -1;
-static int hf_gvcp_capability_ieee1588_extended_capabilities_v2_1 = -1;
-static int hf_gvcp_ieee1588_profile_registers_present_v2_1 = -1;
-static int hf_gvcp_ieee1588_ptp_profile_supported_v2_1 = -1;
-static int hf_gvcp_ieee1588_802dot1as_profile_supported_v2_1 = -1;
-static int hf_gvcp_sc_multi_part_supported_v2_1 = -1;
-static int hf_gvcp_sc_large_leader_trailer_supported_v2_1 = -1;
-static int hf_gvcp_sc_multi_part_enabled_v2_1 = -1;
-static int hf_gvcp_sc_large_leader_trailer_enabled_v2_1 = -1;
+static int hf_gvcp_selected_ieee1588_profile_v2_1;
+static int hf_gvcp_capability_ieee1588_extended_capabilities_v2_1;
+static int hf_gvcp_ieee1588_profile_registers_present_v2_1;
+static int hf_gvcp_ieee1588_ptp_profile_supported_v2_1;
+static int hf_gvcp_ieee1588_802dot1as_profile_supported_v2_1;
+static int hf_gvcp_sc_multi_part_supported_v2_1;
+static int hf_gvcp_sc_large_leader_trailer_supported_v2_1;
+static int hf_gvcp_sc_multi_part_enabled_v2_1;
+static int hf_gvcp_sc_large_leader_trailer_enabled_v2_1;
 
 /* Added for 2.2 support */
-static int hf_gvcp_sccaps_scmbsx_supported_v2_2 = -1;
-static int hf_gvcp_sccaps_scebax_supported_v2_2 = -1;
-static int hf_gvcp_mccfg_supported_v2_2 = -1;
-static int hf_gvcp_mcec_supported_v2_2 = -1;
-static int hf_gvcp_mcec_enabled_v2_2 = -1;
-static int hf_gvcp_sc_scmpcx_supported_v2_2 = -1;
-static int hf_gvcp_sc_gendc_supported_v2_2 = -1;
-static int hf_gvcp_sc_gendc_enabled_v2_2 = -1;
-static int hf_gvcp_sc_max_packet_count_v2_2 = -1;
-static int hf_gvcp_sc_max_block_size_high_v2_2 = -1;
-static int hf_gvcp_sc_max_block_size_low_v2_2 = -1;
-static int hf_gvcp_sc_extended_registers_address_v2_2 = -1;
-static int hf_gvcp_sc_gendc_descriptor_address_v2_2 = -1;
-static int hf_gvcp_sc_gendc_descriptor_size_v2_2 = -1;
-static int hf_gvcp_sc_gendc_flow_mapping_table_address_v2_2 = -1;
-static int hf_gvcp_sc_gendc_flow_mapping_table_size_v2_2 = -1;
-static int hf_gvcp_readregcmd_extended_bootstrap_register = -1;
-static int hf_gvcp_writeregcmd_extended_bootstrap_register = -1;
+static int hf_gvcp_sccaps_scmbsx_supported_v2_2;
+static int hf_gvcp_sccaps_scebax_supported_v2_2;
+static int hf_gvcp_mccfg_supported_v2_2;
+static int hf_gvcp_mcec_supported_v2_2;
+static int hf_gvcp_mcec_enabled_v2_2;
+static int hf_gvcp_sc_scmpcx_supported_v2_2;
+static int hf_gvcp_sc_gendc_supported_v2_2;
+static int hf_gvcp_sc_gendc_enabled_v2_2;
+static int hf_gvcp_sc_max_packet_count_v2_2;
+static int hf_gvcp_sc_max_block_size_high_v2_2;
+static int hf_gvcp_sc_max_block_size_low_v2_2;
+static int hf_gvcp_sc_extended_registers_address_v2_2;
+static int hf_gvcp_sc_gendc_descriptor_address_v2_2;
+static int hf_gvcp_sc_gendc_descriptor_size_v2_2;
+static int hf_gvcp_sc_gendc_flow_mapping_table_address_v2_2;
+static int hf_gvcp_sc_gendc_flow_mapping_table_size_v2_2;
+static int hf_gvcp_readregcmd_extended_bootstrap_register;
+static int hf_gvcp_writeregcmd_extended_bootstrap_register;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_gvcp_custom_register_value = -1;
-static int hf_gvcp_custom_read_register_addr = -1;
-static int hf_gvcp_readmemcmd_data_read = -1;
-static int hf_gvcp_custom_read_register_value = -1;
-static int hf_gvcp_manifest_table = -1;
-static int hf_gvcp_reserved_bit = -1;
+static int hf_gvcp_custom_register_value;
+static int hf_gvcp_custom_read_register_addr;
+static int hf_gvcp_readmemcmd_data_read;
+static int hf_gvcp_custom_read_register_value;
+static int hf_gvcp_manifest_table;
+static int hf_gvcp_reserved_bit;
 
 /*Define the tree for gvcp*/
-static int ett_gvcp = -1;
-static int ett_gvcp_cmd = -1;
-static int ett_gvcp_flags = -1;
-static int ett_gvcp_ack = -1;
-static int ett_gvcp_payload_cmd = -1;
-static int ett_gvcp_payload_ack = -1;
-static int ett_gvcp_payload_cmd_subtree = -1;
-static int ett_gvcp_payload_ack_subtree = -1;
-static int ett_gvcp_bootstrap_fields = -1;
+static int ett_gvcp;
+static int ett_gvcp_cmd;
+static int ett_gvcp_flags;
+static int ett_gvcp_ack;
+static int ett_gvcp_payload_cmd;
+static int ett_gvcp_payload_ack;
+static int ett_gvcp_payload_cmd_subtree;
+static int ett_gvcp_payload_ack_subtree;
+static int ett_gvcp_bootstrap_fields;
 
 static dissector_handle_t gvcp_handle;
 static dissector_handle_t gvsp_handle;
diff --git a/epan/dissectors/packet-gvrp.c b/epan/dissectors/packet-gvrp.c
index e00022a003..9a6eb30fa3 100644
--- a/epan/dissectors/packet-gvrp.c
+++ b/epan/dissectors/packet-gvrp.c
@@ -17,20 +17,20 @@
 void proto_register_gvrp(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_gvrp = -1;
-static int hf_gvrp_proto_id = -1;
-static int hf_gvrp_attribute_type = -1;
-static int hf_gvrp_attribute_length = -1;
-static int hf_gvrp_attribute_event = -1;
-static int hf_gvrp_attribute_value = -1;
-static int hf_gvrp_end_of_mark = -1;
+static int proto_gvrp;
+static int hf_gvrp_proto_id;
+static int hf_gvrp_attribute_type;
+static int hf_gvrp_attribute_length;
+static int hf_gvrp_attribute_event;
+static int hf_gvrp_attribute_value;
+static int hf_gvrp_end_of_mark;
 
 /* Initialize the subtree pointers */
-static gint ett_gvrp = -1;
-static gint ett_gvrp_message = -1;
-static gint ett_gvrp_attribute = -1;
+static gint ett_gvrp;
+static gint ett_gvrp_message;
+static gint ett_gvrp_attribute;
 
-static expert_field ei_gvrp_proto_id = EI_INIT;
+static expert_field ei_gvrp_proto_id;
 
 /* Constant definitions */
 #define GARP_DEFAULT_PROTOCOL_ID        0x0001
diff --git a/epan/dissectors/packet-gvsp.c b/epan/dissectors/packet-gvsp.c
index e9a0d5e26a..614dc9f93a 100644
--- a/epan/dissectors/packet-gvsp.c
+++ b/epan/dissectors/packet-gvsp.c
@@ -462,37 +462,37 @@ typedef struct _gvsp_packet_info
 
 
 /*Define the gvsp proto */
-static int proto_gvsp = -1;
+static int proto_gvsp;
 /*static int global_gvsp_port = 20202;*/
 static dissector_handle_t gvsp_handle;
 
 
 /* Define the tree for gvsp */
-static int ett_gvsp = -1;
-static int ett_gvsp_flags = -1;
-static int ett_gvsp_header = -1;
-static int ett_gvsp_payload = -1;
-static int ett_gvsp_trailer = -1;
-static int ett_gvsp_pixelformat = -1;
-static int ett_gvsp_fieldinfo = -1;
-static int ett_gvsp_cs = -1;
-static int ett_gvsp_sc_zone_direction = -1;
-static int ett_gvsp_zoneinfo = -1;
-static int ett_gvsp_zoneinfo_multipart = -1;
-static int ett_gvsp_partinfo_leader = -1;
-static int ett_gvsp_partinfo_trailer = -1;
-static int ett_gvsp_gendc_leader_flags = -1;
-static int ett_gvsp_gendc_payload_data_flags = -1;
-static int ett_gvsp_gendc_payload_flow_flags = -1;
-static int ett_gvsp_gendc_container_descriptor = -1;
-static int ett_gvsp_gendc_container_header_flags = -1;
-static int ett_gvsp_gendc_container_header_variable_fields = -1;
-static int ett_gvsp_gendc_container_header_component_offsets = -1;
-static int ett_gvsp_gendc_component_header = -1;
-static int ett_gvsp_gendc_part_offsets = -1;
-static int ett_gvsp_gendc_part_header = -1;
-static int ett_gvsp_gendc_component_header_flags = -1;
-static int ett_gvsp_gendc_part_header_flags = -1;
+static int ett_gvsp;
+static int ett_gvsp_flags;
+static int ett_gvsp_header;
+static int ett_gvsp_payload;
+static int ett_gvsp_trailer;
+static int ett_gvsp_pixelformat;
+static int ett_gvsp_fieldinfo;
+static int ett_gvsp_cs;
+static int ett_gvsp_sc_zone_direction;
+static int ett_gvsp_zoneinfo;
+static int ett_gvsp_zoneinfo_multipart;
+static int ett_gvsp_partinfo_leader;
+static int ett_gvsp_partinfo_trailer;
+static int ett_gvsp_gendc_leader_flags;
+static int ett_gvsp_gendc_payload_data_flags;
+static int ett_gvsp_gendc_payload_flow_flags;
+static int ett_gvsp_gendc_container_descriptor;
+static int ett_gvsp_gendc_container_header_flags;
+static int ett_gvsp_gendc_container_header_variable_fields;
+static int ett_gvsp_gendc_container_header_component_offsets;
+static int ett_gvsp_gendc_component_header;
+static int ett_gvsp_gendc_part_offsets;
+static int ett_gvsp_gendc_part_header;
+static int ett_gvsp_gendc_component_header_flags;
+static int ett_gvsp_gendc_part_header_flags;
 
 static const value_string statusnames[] = {
     { GEV_STATUS_SUCCESS,                             "GEV_STATUS_SUCCESS" },
@@ -927,174 +927,174 @@ static const val64_string gendc_component_typeid_values[] = {
     { 0, NULL }
 };
 
-static int hf_gvsp_status = -1;
-static int hf_gvsp_blockid16 = -1;
-static int hf_gvsp_flags = -1;
-static int hf_gvsp_flagdevicespecific0 = -1;
-static int hf_gvsp_flagdevicespecific1 = -1;
-static int hf_gvsp_flagdevicespecific2 = -1;
-static int hf_gvsp_flagdevicespecific3 = -1;
-static int hf_gvsp_flagdevicespecific4 = -1;
-static int hf_gvsp_flagdevicespecific5 = -1;
-static int hf_gvsp_flagdevicespecific6 = -1;
-static int hf_gvsp_flagdevicespecific7 = -1;
-static int hf_gvsp_flagresendrangeerror = -1;
-static int hf_gvsp_flagpreviousblockdropped = -1;
-static int hf_gvsp_flagpacketresend = -1;
-static int hf_gvsp_format = -1;
-static int hf_gvsp_packetid24 = -1;
-static int hf_gvsp_blockid64 = -1;
-static int hf_gvsp_packetid32 = -1;
-static int hf_gvsp_payloadtype = -1;
-static int hf_gvsp_payloaddata = -1;
-static int hf_gvsp_timestamp = -1;
-static int hf_gvsp_pixelformat = -1;
-static int hf_gvsp_sizex = -1;
-static int hf_gvsp_sizey = -1;
-static int hf_gvsp_offsetx = -1;
-static int hf_gvsp_offsety = -1;
-static int hf_gvsp_paddingx = -1;
-static int hf_gvsp_paddingy = -1;
-static int hf_gvsp_payloaddatasize = -1;
-static int hf_gvsp_pixelcolor = -1;
-static int hf_gvsp_pixeloccupy = -1;
-static int hf_gvsp_pixelid = -1;
-static int hf_gvsp_filename = -1;
-static int hf_gvsp_payloadlength = -1;
-static int hf_gvsp_fieldinfo = -1;
-static int hf_gvsp_fieldid = -1;
-static int hf_gvsp_fieldcount = -1;
-static int hf_gvsp_genericflags = -1;
-static int hf_gvsp_timestamptickfrequency = -1;
-static int hf_gvsp_dataformat = -1;
-static int hf_gvsp_packetizationmode = -1;
-static int hf_gvsp_packetsize = -1;
-static int hf_gvsp_profileidc = -1;
-static int hf_gvsp_cs = -1;
-static int hf_gvsp_cs0 = -1;
-static int hf_gvsp_cs1 = -1;
-static int hf_gvsp_cs2 = -1;
-static int hf_gvsp_cs3 = -1;
-static int hf_gvsp_levelidc = -1;
-static int hf_gvsp_sropinterleavingdepth = -1;
-static int hf_gvsp_sropmaxdondiff = -1;
-static int hf_gvsp_sropdeintbufreq = -1;
-static int hf_gvsp_sropinitbuftime = -1;
-static int hf_gvsp_add_zones = -1;
-static int hf_gvsp_zoneinfo = -1;
-static int hf_gvsp_zoneid = -1;
-static int hf_gvsp_endofzone = -1;
-static int hf_gvsp_addressoffset = -1;
-static int hf_gvsp_sc_zone_direction = -1;
-static int hf_gvsp_sc_zone0_direction = -1;
-static int hf_gvsp_sc_zone1_direction = -1;
-static int hf_gvsp_sc_zone2_direction = -1;
-static int hf_gvsp_sc_zone3_direction = -1;
-static int hf_gvsp_sc_zone4_direction = -1;
-static int hf_gvsp_sc_zone5_direction = -1;
-static int hf_gvsp_sc_zone6_direction = -1;
-static int hf_gvsp_sc_zone7_direction = -1;
-static int hf_gvsp_sc_zone8_direction = -1;
-static int hf_gvsp_sc_zone9_direction = -1;
-static int hf_gvsp_sc_zone10_direction = -1;
-static int hf_gvsp_sc_zone11_direction = -1;
-static int hf_gvsp_sc_zone12_direction = -1;
-static int hf_gvsp_sc_zone13_direction = -1;
-static int hf_gvsp_sc_zone14_direction = -1;
-static int hf_gvsp_sc_zone15_direction = -1;
-static int hf_gvsp_sc_zone16_direction = -1;
-static int hf_gvsp_sc_zone17_direction = -1;
-static int hf_gvsp_sc_zone18_direction = -1;
-static int hf_gvsp_sc_zone19_direction = -1;
-static int hf_gvsp_sc_zone20_direction = -1;
-static int hf_gvsp_sc_zone21_direction = -1;
-static int hf_gvsp_sc_zone22_direction = -1;
-static int hf_gvsp_sc_zone23_direction = -1;
-static int hf_gvsp_sc_zone24_direction = -1;
-static int hf_gvsp_sc_zone25_direction = -1;
-static int hf_gvsp_sc_zone26_direction = -1;
-static int hf_gvsp_sc_zone27_direction = -1;
-static int hf_gvsp_sc_zone28_direction = -1;
-static int hf_gvsp_sc_zone29_direction = -1;
-static int hf_gvsp_sc_zone30_direction = -1;
-static int hf_gvsp_sc_zone31_direction = -1;
-static int hf_gvsp_numparts = -1;
-static int hf_gvsp_multipart_data_type = -1;
-static int hf_gvsp_partlength = -1;
-static int hf_gvsp_multi_part_source_id = -1;
-static int hf_gvsp_data_purpose_id = -1;
-static int hf_gvsp_region_id = -1;
-static int hf_gvsp_endofpart = -1;
-static int hf_gvsp_add_zones_multipart = -1;
-static int hf_gvsp_zoneinfo_multipart = -1;
-static int hf_gvsp_multi_part_part_id = -1;
-static int hf_gvsp_data_type_specific = -1;
-static int hf_gvsp_chunk_data_payload_length_hex = -1;
-static int hf_gvsp_chunk_layout_id_hex = -1;
+static int hf_gvsp_status;
+static int hf_gvsp_blockid16;
+static int hf_gvsp_flags;
+static int hf_gvsp_flagdevicespecific0;
+static int hf_gvsp_flagdevicespecific1;
+static int hf_gvsp_flagdevicespecific2;
+static int hf_gvsp_flagdevicespecific3;
+static int hf_gvsp_flagdevicespecific4;
+static int hf_gvsp_flagdevicespecific5;
+static int hf_gvsp_flagdevicespecific6;
+static int hf_gvsp_flagdevicespecific7;
+static int hf_gvsp_flagresendrangeerror;
+static int hf_gvsp_flagpreviousblockdropped;
+static int hf_gvsp_flagpacketresend;
+static int hf_gvsp_format;
+static int hf_gvsp_packetid24;
+static int hf_gvsp_blockid64;
+static int hf_gvsp_packetid32;
+static int hf_gvsp_payloadtype;
+static int hf_gvsp_payloaddata;
+static int hf_gvsp_timestamp;
+static int hf_gvsp_pixelformat;
+static int hf_gvsp_sizex;
+static int hf_gvsp_sizey;
+static int hf_gvsp_offsetx;
+static int hf_gvsp_offsety;
+static int hf_gvsp_paddingx;
+static int hf_gvsp_paddingy;
+static int hf_gvsp_payloaddatasize;
+static int hf_gvsp_pixelcolor;
+static int hf_gvsp_pixeloccupy;
+static int hf_gvsp_pixelid;
+static int hf_gvsp_filename;
+static int hf_gvsp_payloadlength;
+static int hf_gvsp_fieldinfo;
+static int hf_gvsp_fieldid;
+static int hf_gvsp_fieldcount;
+static int hf_gvsp_genericflags;
+static int hf_gvsp_timestamptickfrequency;
+static int hf_gvsp_dataformat;
+static int hf_gvsp_packetizationmode;
+static int hf_gvsp_packetsize;
+static int hf_gvsp_profileidc;
+static int hf_gvsp_cs;
+static int hf_gvsp_cs0;
+static int hf_gvsp_cs1;
+static int hf_gvsp_cs2;
+static int hf_gvsp_cs3;
+static int hf_gvsp_levelidc;
+static int hf_gvsp_sropinterleavingdepth;
+static int hf_gvsp_sropmaxdondiff;
+static int hf_gvsp_sropdeintbufreq;
+static int hf_gvsp_sropinitbuftime;
+static int hf_gvsp_add_zones;
+static int hf_gvsp_zoneinfo;
+static int hf_gvsp_zoneid;
+static int hf_gvsp_endofzone;
+static int hf_gvsp_addressoffset;
+static int hf_gvsp_sc_zone_direction;
+static int hf_gvsp_sc_zone0_direction;
+static int hf_gvsp_sc_zone1_direction;
+static int hf_gvsp_sc_zone2_direction;
+static int hf_gvsp_sc_zone3_direction;
+static int hf_gvsp_sc_zone4_direction;
+static int hf_gvsp_sc_zone5_direction;
+static int hf_gvsp_sc_zone6_direction;
+static int hf_gvsp_sc_zone7_direction;
+static int hf_gvsp_sc_zone8_direction;
+static int hf_gvsp_sc_zone9_direction;
+static int hf_gvsp_sc_zone10_direction;
+static int hf_gvsp_sc_zone11_direction;
+static int hf_gvsp_sc_zone12_direction;
+static int hf_gvsp_sc_zone13_direction;
+static int hf_gvsp_sc_zone14_direction;
+static int hf_gvsp_sc_zone15_direction;
+static int hf_gvsp_sc_zone16_direction;
+static int hf_gvsp_sc_zone17_direction;
+static int hf_gvsp_sc_zone18_direction;
+static int hf_gvsp_sc_zone19_direction;
+static int hf_gvsp_sc_zone20_direction;
+static int hf_gvsp_sc_zone21_direction;
+static int hf_gvsp_sc_zone22_direction;
+static int hf_gvsp_sc_zone23_direction;
+static int hf_gvsp_sc_zone24_direction;
+static int hf_gvsp_sc_zone25_direction;
+static int hf_gvsp_sc_zone26_direction;
+static int hf_gvsp_sc_zone27_direction;
+static int hf_gvsp_sc_zone28_direction;
+static int hf_gvsp_sc_zone29_direction;
+static int hf_gvsp_sc_zone30_direction;
+static int hf_gvsp_sc_zone31_direction;
+static int hf_gvsp_numparts;
+static int hf_gvsp_multipart_data_type;
+static int hf_gvsp_partlength;
+static int hf_gvsp_multi_part_source_id;
+static int hf_gvsp_data_purpose_id;
+static int hf_gvsp_region_id;
+static int hf_gvsp_endofpart;
+static int hf_gvsp_add_zones_multipart;
+static int hf_gvsp_zoneinfo_multipart;
+static int hf_gvsp_multi_part_part_id;
+static int hf_gvsp_data_type_specific;
+static int hf_gvsp_chunk_data_payload_length_hex;
+static int hf_gvsp_chunk_layout_id_hex;
 
 /* Added for 2.2 support */
-static int hf_gvsp_gendc_leader_descriptor_size_v2_2 = -1;
-static int hf_gvsp_gendc_leader_flags_v2_2 = -1;
-static int hf_gvsp_gendc_leader_flags_preliminary_descriptor_v2_2 = -1;
-static int hf_gvsp_gendc_leader_flags_reserved_v2_2 = -1;
-static int hf_gvsp_gendc_payload_data_size_v2_2 = -1;
-static int hf_gvsp_gendc_payload_data_destination_offset_v2_2 = -1;
-static int hf_gvsp_gendc_payload_data_flags_v2_2 = -1;
-static int hf_gvsp_gendc_payload_data_flag_descriptor_flags_v2_2 = -1;
-static int hf_gvsp_gendc_payload_data_flag_start_of_descriptor_data_v2_2 = -1;
-static int hf_gvsp_gendc_payload_data_flag_end_of_descriptor_data_v2_2 = -1;
-static int hf_gvsp_gendc_payload_data_flags_reserved_v2_2 = -1;
-static int hf_gvsp_gendc_payload_flow_flags_v2_2 = -1;
-static int hf_gvsp_gendc_payload_flow_flag_first_packet_v2_2 = -1;
-static int hf_gvsp_gendc_payload_flow_flag_last_packet_v2_2 = -1;
-static int hf_gvsp_gendc_payload_flow_id_v2_2 = -1;
-static int hf_gvsp_gendc_header_size_v2_2 = -1;
-static int hf_gvsp_gendc_header_type_v2_2 = -1;
-static int hf_gvsp_gendc_header_reserved_1_byte_v2_2 = -1;
-static int hf_gvsp_gendc_header_reserved_2_bytes_v2_2 = -1;
-static int hf_gvsp_gendc_header_reserved_4_bytes_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_signature_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_version_major_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_version_minor_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_version_sub_minor_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_flags_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_flags_timestamp_ptp_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_flags_component_invalid_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_flags_reserved_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_id_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_variable_fields_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_variable_fields_data_size_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_variable_fields_size_x_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_variable_fields_size_y_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_variable_fields_region_offset_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_variable_fields_format_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_variable_fields_timestamp_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_variable_fields_component_count_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_variable_fields_component_invalid_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_variable_fields_reserved_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_data_size_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_data_offset_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_descriptor_size_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_component_count_v2_2 = -1;
-static int hf_gvsp_gendc_container_header_component_offset_v2_2 = -1;
-static int hf_gvsp_gendc_component_header_flags_v2_2 = -1;
-static int hf_gvsp_gendc_component_header_flags_invalid_v2_2 = -1;
-static int hf_gvsp_gendc_component_header_flags_reserved_v2_2 = -1;
-static int hf_gvsp_gendc_component_header_group_id_v2_2 = -1;
-static int hf_gvsp_gendc_component_header_source_id_v2_2 = -1;
-static int hf_gvsp_gendc_component_header_region_id_v2_2 = -1;
-static int hf_gvsp_gendc_component_header_type_id_v2_2 = -1;
-static int hf_gvsp_gendc_component_header_part_count_v2_2 = -1;
-static int hf_gvsp_gendc_component_header_part_offset_v2_2 = -1;
-static int hf_gvsp_gendc_part_header_flags_xml_reserved1_v2_2 = -1;
-static int hf_gvsp_gendc_part_header_flags_xml_zip_v2_2 = -1;
-static int hf_gvsp_gendc_part_header_flags_xml_chunk_v2_2 = -1;
-static int hf_gvsp_gendc_part_header_flags_xml_reserved2_v2_2 = -1;
-static int hf_gvsp_gendc_part_header_flags_v2_2 = -1;
-static int hf_gvsp_gendc_part_header_flow_offset_v2_2 = -1;
-static int hf_gvsp_gendc_part_header_type_specific_info_v2_2 = -1;
-static int hf_gvsp_gendc_part_header_1D_size_v2_2 = -1;
-static int hf_gvsp_gendc_part_header_1D_padding_v2_2 = -1;
+static int hf_gvsp_gendc_leader_descriptor_size_v2_2;
+static int hf_gvsp_gendc_leader_flags_v2_2;
+static int hf_gvsp_gendc_leader_flags_preliminary_descriptor_v2_2;
+static int hf_gvsp_gendc_leader_flags_reserved_v2_2;
+static int hf_gvsp_gendc_payload_data_size_v2_2;
+static int hf_gvsp_gendc_payload_data_destination_offset_v2_2;
+static int hf_gvsp_gendc_payload_data_flags_v2_2;
+static int hf_gvsp_gendc_payload_data_flag_descriptor_flags_v2_2;
+static int hf_gvsp_gendc_payload_data_flag_start_of_descriptor_data_v2_2;
+static int hf_gvsp_gendc_payload_data_flag_end_of_descriptor_data_v2_2;
+static int hf_gvsp_gendc_payload_data_flags_reserved_v2_2;
+static int hf_gvsp_gendc_payload_flow_flags_v2_2;
+static int hf_gvsp_gendc_payload_flow_flag_first_packet_v2_2;
+static int hf_gvsp_gendc_payload_flow_flag_last_packet_v2_2;
+static int hf_gvsp_gendc_payload_flow_id_v2_2;
+static int hf_gvsp_gendc_header_size_v2_2;
+static int hf_gvsp_gendc_header_type_v2_2;
+static int hf_gvsp_gendc_header_reserved_1_byte_v2_2;
+static int hf_gvsp_gendc_header_reserved_2_bytes_v2_2;
+static int hf_gvsp_gendc_header_reserved_4_bytes_v2_2;
+static int hf_gvsp_gendc_container_header_signature_v2_2;
+static int hf_gvsp_gendc_container_header_version_major_v2_2;
+static int hf_gvsp_gendc_container_header_version_minor_v2_2;
+static int hf_gvsp_gendc_container_header_version_sub_minor_v2_2;
+static int hf_gvsp_gendc_container_header_flags_v2_2;
+static int hf_gvsp_gendc_container_header_flags_timestamp_ptp_v2_2;
+static int hf_gvsp_gendc_container_header_flags_component_invalid_v2_2;
+static int hf_gvsp_gendc_container_header_flags_reserved_v2_2;
+static int hf_gvsp_gendc_container_header_id_v2_2;
+static int hf_gvsp_gendc_container_header_variable_fields_v2_2;
+static int hf_gvsp_gendc_container_header_variable_fields_data_size_v2_2;
+static int hf_gvsp_gendc_container_header_variable_fields_size_x_v2_2;
+static int hf_gvsp_gendc_container_header_variable_fields_size_y_v2_2;
+static int hf_gvsp_gendc_container_header_variable_fields_region_offset_v2_2;
+static int hf_gvsp_gendc_container_header_variable_fields_format_v2_2;
+static int hf_gvsp_gendc_container_header_variable_fields_timestamp_v2_2;
+static int hf_gvsp_gendc_container_header_variable_fields_component_count_v2_2;
+static int hf_gvsp_gendc_container_header_variable_fields_component_invalid_v2_2;
+static int hf_gvsp_gendc_container_header_variable_fields_reserved_v2_2;
+static int hf_gvsp_gendc_container_header_data_size_v2_2;
+static int hf_gvsp_gendc_container_header_data_offset_v2_2;
+static int hf_gvsp_gendc_container_header_descriptor_size_v2_2;
+static int hf_gvsp_gendc_container_header_component_count_v2_2;
+static int hf_gvsp_gendc_container_header_component_offset_v2_2;
+static int hf_gvsp_gendc_component_header_flags_v2_2;
+static int hf_gvsp_gendc_component_header_flags_invalid_v2_2;
+static int hf_gvsp_gendc_component_header_flags_reserved_v2_2;
+static int hf_gvsp_gendc_component_header_group_id_v2_2;
+static int hf_gvsp_gendc_component_header_source_id_v2_2;
+static int hf_gvsp_gendc_component_header_region_id_v2_2;
+static int hf_gvsp_gendc_component_header_type_id_v2_2;
+static int hf_gvsp_gendc_component_header_part_count_v2_2;
+static int hf_gvsp_gendc_component_header_part_offset_v2_2;
+static int hf_gvsp_gendc_part_header_flags_xml_reserved1_v2_2;
+static int hf_gvsp_gendc_part_header_flags_xml_zip_v2_2;
+static int hf_gvsp_gendc_part_header_flags_xml_chunk_v2_2;
+static int hf_gvsp_gendc_part_header_flags_xml_reserved2_v2_2;
+static int hf_gvsp_gendc_part_header_flags_v2_2;
+static int hf_gvsp_gendc_part_header_flow_offset_v2_2;
+static int hf_gvsp_gendc_part_header_type_specific_info_v2_2;
+static int hf_gvsp_gendc_part_header_1D_size_v2_2;
+static int hf_gvsp_gendc_part_header_1D_padding_v2_2;
 
 static int * const pixelformat_fields[] = {
     &hf_gvsp_pixelcolor,
diff --git a/epan/dissectors/packet-h1.c b/epan/dissectors/packet-h1.c
index 430e6385fe..2b75cac42c 100644
--- a/epan/dissectors/packet-h1.c
+++ b/epan/dissectors/packet-h1.c
@@ -17,17 +17,17 @@
 void proto_register_h1(void);
 void proto_reg_handoff_h1(void);
 
-static int proto_h1 = -1;
-static int hf_h1_header = -1;
-static int hf_h1_len = -1;
-static int hf_h1_block_type = -1;
-static int hf_h1_block_len = -1;
-static int hf_h1_opcode = -1;
-static int hf_h1_dbnr = -1;
-static int hf_h1_dwnr = -1;
-static int hf_h1_dlen = -1;
-static int hf_h1_org = -1;
-static int hf_h1_response_value = -1;
+static int proto_h1;
+static int hf_h1_header;
+static int hf_h1_len;
+static int hf_h1_block_type;
+static int hf_h1_block_len;
+static int hf_h1_opcode;
+static int hf_h1_dbnr;
+static int hf_h1_dwnr;
+static int hf_h1_dlen;
+static int hf_h1_org;
+static int hf_h1_response_value;
 
 
 #define EMPTY_BLOCK     0xFF
@@ -76,8 +76,8 @@ static const value_string returncode_vals[] = {
     {0, NULL}
 };
 
-static gint ett_h1 = -1;
-static gint ett_block = -1;
+static gint ett_h1;
+static gint ett_block;
 
 static gboolean dissect_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
diff --git a/epan/dissectors/packet-h221_nonstd.c b/epan/dissectors/packet-h221_nonstd.c
index 8136c88128..cb69372486 100644
--- a/epan/dissectors/packet-h221_nonstd.c
+++ b/epan/dissectors/packet-h221_nonstd.c
@@ -18,16 +18,16 @@ void proto_reg_handoff_nonstd(void);
 static dissector_handle_t ms_nonstd_handle;
 
 /* Define the nonstd proto */
-static int proto_nonstd = -1;
+static int proto_nonstd;
 
-static int hf_h221_nonstd_netmeeting_codec = -1;
-static int hf_h221_nonstd_netmeeting_non_standard = -1;
+static int hf_h221_nonstd_netmeeting_codec;
+static int hf_h221_nonstd_netmeeting_non_standard;
 
 /*
  * Define the trees for nonstd
  * We need one for nonstd itself and one for the nonstd paramters
  */
-static int ett_nonstd = -1;
+static int ett_nonstd;
 
 static const value_string ms_codec_vals[] = {
     {  0x0111, "L&H CELP 4.8k" },
diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c
index f6b451db44..d51d871285 100644
--- a/epan/dissectors/packet-h223.c
+++ b/epan/dissectors/packet-h223.c
@@ -36,76 +36,76 @@
 #define PROTO_TAG_H223 "H.223"
 
 /* Wireshark ID of the H.223 protocol */
-static int proto_h223 = -1;
-static int proto_h223_bitswapped = -1;
+static int proto_h223;
+static int proto_h223_bitswapped;
 
 /* The following hf_* variables are used to hold the Wireshark IDs of
  * our header fields; they are filled out when we call
  * proto_register_field_array() in proto_register_h223()
  */
-/* static int hf_h223_non_h223_data = -1; */
-static int hf_h223_mux_stuffing_pdu = -1;
-static int hf_h223_mux_pdu = -1;
-static int hf_h223_mux_header = -1;
-static int hf_h223_mux_rawhdr = -1;
-static int hf_h223_mux_correctedhdr = -1;
-static int hf_h223_mux_mc = -1;
-static int hf_h223_mux_mpl = -1;
-static int hf_h223_mux_deact = -1;
-static int hf_h223_mux_vc = -1;
-static int hf_h223_mux_extra = -1;
-static int hf_h223_mux_hdlc2 = -1;
-static int hf_h223_mux_fragments = -1;
-static int hf_h223_mux_fragment = -1;
-static int hf_h223_mux_fragment_overlap = -1;
-static int hf_h223_mux_fragment_overlap_conflict = -1;
-static int hf_h223_mux_fragment_multiple_tails = -1;
-static int hf_h223_mux_fragment_too_long_fragment = -1;
-static int hf_h223_mux_fragment_error = -1;
-static int hf_h223_mux_fragment_count = -1;
-static int hf_h223_mux_reassembled_in = -1;
-static int hf_h223_mux_reassembled_length = -1;
-
-static int hf_h223_al_fragments = -1;
-static int hf_h223_al_fragment = -1;
-static int hf_h223_al_fragment_overlap = -1;
-static int hf_h223_al_fragment_overlap_conflict = -1;
-static int hf_h223_al_fragment_multiple_tails = -1;
-static int hf_h223_al_fragment_too_long_fragment = -1;
-static int hf_h223_al_fragment_error = -1;
-static int hf_h223_al_fragment_count = -1;
-static int hf_h223_al_reassembled_in = -1;
-static int hf_h223_al_reassembled_length = -1;
-
-static int hf_h223_al1 = -1;
-static int hf_h223_al1_framed = -1;
-static int hf_h223_al2 = -1;
-static int hf_h223_al2_sequenced = -1;
-static int hf_h223_al2_unsequenced = -1;
-static int hf_h223_al2_seqno = -1;
-static int hf_h223_al2_crc = -1;
-static int hf_h223_al2_crc_status = -1;
-
-static int hf_h223_al_payload = -1;
+/* static int hf_h223_non_h223_data; */
+static int hf_h223_mux_stuffing_pdu;
+static int hf_h223_mux_pdu;
+static int hf_h223_mux_header;
+static int hf_h223_mux_rawhdr;
+static int hf_h223_mux_correctedhdr;
+static int hf_h223_mux_mc;
+static int hf_h223_mux_mpl;
+static int hf_h223_mux_deact;
+static int hf_h223_mux_vc;
+static int hf_h223_mux_extra;
+static int hf_h223_mux_hdlc2;
+static int hf_h223_mux_fragments;
+static int hf_h223_mux_fragment;
+static int hf_h223_mux_fragment_overlap;
+static int hf_h223_mux_fragment_overlap_conflict;
+static int hf_h223_mux_fragment_multiple_tails;
+static int hf_h223_mux_fragment_too_long_fragment;
+static int hf_h223_mux_fragment_error;
+static int hf_h223_mux_fragment_count;
+static int hf_h223_mux_reassembled_in;
+static int hf_h223_mux_reassembled_length;
+
+static int hf_h223_al_fragments;
+static int hf_h223_al_fragment;
+static int hf_h223_al_fragment_overlap;
+static int hf_h223_al_fragment_overlap_conflict;
+static int hf_h223_al_fragment_multiple_tails;
+static int hf_h223_al_fragment_too_long_fragment;
+static int hf_h223_al_fragment_error;
+static int hf_h223_al_fragment_count;
+static int hf_h223_al_reassembled_in;
+static int hf_h223_al_reassembled_length;
+
+static int hf_h223_al1;
+static int hf_h223_al1_framed;
+static int hf_h223_al2;
+static int hf_h223_al2_sequenced;
+static int hf_h223_al2_unsequenced;
+static int hf_h223_al2_seqno;
+static int hf_h223_al2_crc;
+static int hf_h223_al2_crc_status;
+
+static int hf_h223_al_payload;
 
 /* These are the ids of the subtrees that we may be creating */
-static gint ett_h223 = -1;
-static gint ett_h223_non_h223_data = -1;
-static gint ett_h223_mux_stuffing_pdu = -1;
-static gint ett_h223_mux_pdu = -1;
-static gint ett_h223_mux_header = -1;
-static gint ett_h223_mux_deact = -1;
-static gint ett_h223_mux_vc = -1;
-static gint ett_h223_mux_extra = -1;
-static gint ett_h223_mux_fragments = -1;
-static gint ett_h223_mux_fragment  = -1;
-static gint ett_h223_al_fragments = -1;
-static gint ett_h223_al_fragment  = -1;
-static gint ett_h223_al1 = -1;
-static gint ett_h223_al2 = -1;
-static gint ett_h223_al_payload = -1;
-
-static expert_field ei_h223_al2_crc = EI_INIT;
+static gint ett_h223;
+static gint ett_h223_non_h223_data;
+static gint ett_h223_mux_stuffing_pdu;
+static gint ett_h223_mux_pdu;
+static gint ett_h223_mux_header;
+static gint ett_h223_mux_deact;
+static gint ett_h223_mux_vc;
+static gint ett_h223_mux_extra;
+static gint ett_h223_mux_fragments;
+static gint ett_h223_mux_fragment;
+static gint ett_h223_al_fragments;
+static gint ett_h223_al_fragment;
+static gint ett_h223_al1;
+static gint ett_h223_al2;
+static gint ett_h223_al_payload;
+
+static expert_field ei_h223_al2_crc;
 
 /* These are the handles of our subdissectors */
 static dissector_handle_t data_handle;
diff --git a/epan/dissectors/packet-h224.c b/epan/dissectors/packet-h224.c
index 0a956874fa..73e3b65ed0 100644
--- a/epan/dissectors/packet-h224.c
+++ b/epan/dissectors/packet-h224.c
@@ -31,71 +31,71 @@ void proto_reg_handoff_h224(void);
 void proto_register_h224(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_h224 = -1;
-static int hf_h224_q922_dlci_priority = -1;
-static int hf_h224_q922_ctl = -1;
-static int hf_h224_dta = -1;
-static int hf_h224_sta = -1;
-static int hf_h224_reserved = -1;
-static int hf_h224_standard_client_id = -1;
-static int hf_h224_extended_client_id_list = -1;
-static int hf_h224_non_standard_client = -1;
-static int hf_h224_extended_client_id = -1;
-static int hf_h224_country_code = -1;
-static int hf_h224_extension = -1;
-static int hf_h224_manufacturer_code = -1;
-static int hf_h224_client_id_manufacturer = -1;
-
-static int hf_h224_es_b7 = -1;
-static int hf_h224_bs_b6 = -1;
-static int hf_h224_c1_b5 = -1;
-static int hf_h224_c2_b4 = -1;
-static int hf_h224_seg_b3b0 = -1;
-static int hf_h224_other_client_data = -1;
-
-static int hf_h224_client_list_code = -1;
-static int hf_h224_extra_caps_code = -1;
-static int hf_h224_response_code = -1;
-static int hf_h224_number_of_clients = -1;
-static int hf_h224_ex_caps_bit = -1;
-static int hf_h224_caps_reserved = -1;
-static int hf_h224_brd_svs = -1;
-static int hf_h224_number_of_presets = -1;
-static int hf_h224_vs_id = -1;
-static int hf_h224_vs_reserved_b3 = -1;
-static int hf_h224_vs_reserved_b3b0 = -1;
-static int hf_h224_motion_video = -1;
-static int hf_h224_norm_res_si = -1;
-static int hf_h224_dbl_res_si = -1;
-static int hf_h224_pan_cap = -1;
-static int hf_h224_tilt_cap = -1;
-static int hf_h224_zoom_cap = -1;
-static int hf_h224_focus_cap = -1;
-static int hf_h224_encoded_characters = -1;
-static int hf_h224_end_octet = -1;
-static int hf_h224_command_code = -1;
-static int hf_h224_message_pan = -1;
-static int hf_h224_message_pan_dir = -1;
-static int hf_h224_message_tilt = -1;
-static int hf_h224_message_tilt_dir = -1;
-static int hf_h224_message_zoom = -1;
-static int hf_h224_message_zoom_dir = -1;
-static int hf_h224_message_focus = -1;
-static int hf_h224_message_focus_dir = -1;
-static int hf_h224_message_reserved_b7b4 = -1;
-static int hf_h224_message_reserved_b3b2 = -1;
-static int hf_h224_message_reserved_b3b0 = -1;
-static int hf_h224_message_vs_m1 = -1;
-static int hf_h224_message_vs_m0 = -1;
-static int hf_h224_message_timeout = -1;
-static int hf_h224_message_preset_number = -1;
-
-//static expert_field ei_h224_EXPERTABBREV = EI_INIT;
+static int proto_h224;
+static int hf_h224_q922_dlci_priority;
+static int hf_h224_q922_ctl;
+static int hf_h224_dta;
+static int hf_h224_sta;
+static int hf_h224_reserved;
+static int hf_h224_standard_client_id;
+static int hf_h224_extended_client_id_list;
+static int hf_h224_non_standard_client;
+static int hf_h224_extended_client_id;
+static int hf_h224_country_code;
+static int hf_h224_extension;
+static int hf_h224_manufacturer_code;
+static int hf_h224_client_id_manufacturer;
+
+static int hf_h224_es_b7;
+static int hf_h224_bs_b6;
+static int hf_h224_c1_b5;
+static int hf_h224_c2_b4;
+static int hf_h224_seg_b3b0;
+static int hf_h224_other_client_data;
+
+static int hf_h224_client_list_code;
+static int hf_h224_extra_caps_code;
+static int hf_h224_response_code;
+static int hf_h224_number_of_clients;
+static int hf_h224_ex_caps_bit;
+static int hf_h224_caps_reserved;
+static int hf_h224_brd_svs;
+static int hf_h224_number_of_presets;
+static int hf_h224_vs_id;
+static int hf_h224_vs_reserved_b3;
+static int hf_h224_vs_reserved_b3b0;
+static int hf_h224_motion_video;
+static int hf_h224_norm_res_si;
+static int hf_h224_dbl_res_si;
+static int hf_h224_pan_cap;
+static int hf_h224_tilt_cap;
+static int hf_h224_zoom_cap;
+static int hf_h224_focus_cap;
+static int hf_h224_encoded_characters;
+static int hf_h224_end_octet;
+static int hf_h224_command_code;
+static int hf_h224_message_pan;
+static int hf_h224_message_pan_dir;
+static int hf_h224_message_tilt;
+static int hf_h224_message_tilt_dir;
+static int hf_h224_message_zoom;
+static int hf_h224_message_zoom_dir;
+static int hf_h224_message_focus;
+static int hf_h224_message_focus_dir;
+static int hf_h224_message_reserved_b7b4;
+static int hf_h224_message_reserved_b3b2;
+static int hf_h224_message_reserved_b3b0;
+static int hf_h224_message_vs_m1;
+static int hf_h224_message_vs_m0;
+static int hf_h224_message_timeout;
+static int hf_h224_message_preset_number;
+
+//static expert_field ei_h224_EXPERTABBREV;
 
 static dissector_handle_t h224_handle;
 
 /* Initialize the subtree pointers */
-static gint ett_h224 = -1;
+static gint ett_h224;
 
 /* Definition of DLCI data priority's masks */
 #define H224_DATA_PRI_MASK      0xFCF0
diff --git a/epan/dissectors/packet-h248_10.c b/epan/dissectors/packet-h248_10.c
index b58c4cba33..e570f994b5 100644
--- a/epan/dissectors/packet-h248_10.c
+++ b/epan/dissectors/packet-h248_10.c
@@ -25,13 +25,13 @@ void proto_register_h248_dot10(void);
 #define PSNAME "H248CHP"
 #define PFNAME "h248.chp"
 
-static int proto_h248_CHP = -1;
+static int proto_h248_CHP;
 
-static int hf_h248_CHP_mgcon = -1;
-static int hf_h248_CHP_mgcon_reduction = -1;
+static int hf_h248_CHP_mgcon;
+static int hf_h248_CHP_mgcon_reduction;
 
-static gint ett_h248_CHP = -1;
-static gint ett_h248_CHP_mgcon = -1;
+static gint ett_h248_CHP;
+static gint ett_h248_CHP_mgcon;
 
 static const value_string h248_CHP_prop_vals[] = {
 	{ 0, "chp (MG Congestion Handling)" },
diff --git a/epan/dissectors/packet-h248_2.c b/epan/dissectors/packet-h248_2.c
index 00a03f2544..3a9751b561 100644
--- a/epan/dissectors/packet-h248_2.c
+++ b/epan/dissectors/packet-h248_2.c
@@ -24,14 +24,14 @@ void proto_register_h248_dot2(void);
 #define PSNAME "H248_2"
 #define PFNAME "h248.2"
 
-static int proto_h248_2 = -1;
+static int proto_h248_2;
 
-/* static int hf_h248_2_dtone_evt = -1; */
-static int hf_h248_2_dtone_dtt_obs_evt = -1;
-static int hf_h248_2_dtone_dtt_obs_evt_val = -1;
+/* static int hf_h248_2_dtone_evt; */
+static int hf_h248_2_dtone_dtt_obs_evt;
+static int hf_h248_2_dtone_dtt_obs_evt_val;
 
-static gint ett_h248_2 = -1;
-static gint ett_h248_2_dtone_dtt_obs_evt = -1;
+static gint ett_h248_2;
+static gint ett_h248_2_dtone_dtt_obs_evt;
 
 
 static const value_string hf_h248_2_dtone_dtt_obs_evt_val_values[] = {
diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c
index 4c503712bf..4d79171c71 100644
--- a/epan/dissectors/packet-h248_3gpp.c
+++ b/epan/dissectors/packet-h248_3gpp.c
@@ -32,15 +32,15 @@ void proto_register_h248_3gpp(void);
  * 3GUP Package
  * 3GPP TS 29.232 -- 15.1.1
  */
-static int proto_h248_package_3GUP = -1;
+static int proto_h248_package_3GUP;
 
-static int hf_h248_package_3GUP_Mode = -1;
-static int hf_h248_package_3GUP_UPversions = -1;
-static int hf_h248_package_3GUP_delerrsdu = -1;
-static int hf_h248_package_3GUP_interface = -1;
-static int hf_h248_package_3GUP_initdir = -1;
+static int hf_h248_package_3GUP_Mode;
+static int hf_h248_package_3GUP_UPversions;
+static int hf_h248_package_3GUP_delerrsdu;
+static int hf_h248_package_3GUP_interface;
+static int hf_h248_package_3GUP_initdir;
 
-static gint ett_h248_package_3GUP = -1;
+static gint ett_h248_package_3GUP;
 
 static gboolean implicit = FALSE;
 
@@ -137,22 +137,22 @@ static h248_package_t h248_package_3GUP = {
  * 3GPP TS 29.232 -- 15.2.1
  */
 
-static int hf_h248_package_3GCSD = -1;
+static int hf_h248_package_3GCSD;
 
-static int hf_h248_package_3GCSD_plmnbc = -1;
-static int hf_h248_package_3GCSD_gsmchancod = -1;
-static int hf_h248_pkg_3GCSD_evt_protres = -1;
-static int hf_h248_pkg_3GCSD_evt_protres_result = -1;
-static int hf_h248_pkg_3GCSD_evt_protres_cause = -1;
-static int hf_h248_pkg_3GCSD_evt_ratechg = -1;
-static int hf_h248_pkg_3GCSD_evt_ratechg_rate = -1;
-static int hf_h248_pkg_3GCSD_sig_actprot = -1;
-static int hf_h248_pkg_3GCSD_actprot_sig_localpeer = -1;
+static int hf_h248_package_3GCSD_plmnbc;
+static int hf_h248_package_3GCSD_gsmchancod;
+static int hf_h248_pkg_3GCSD_evt_protres;
+static int hf_h248_pkg_3GCSD_evt_protres_result;
+static int hf_h248_pkg_3GCSD_evt_protres_cause;
+static int hf_h248_pkg_3GCSD_evt_ratechg;
+static int hf_h248_pkg_3GCSD_evt_ratechg_rate;
+static int hf_h248_pkg_3GCSD_sig_actprot;
+static int hf_h248_pkg_3GCSD_actprot_sig_localpeer;
 
-static gint ett_h248_package_3GCSD = -1;
-static gint ett_h248_3GCSD_evt_protres = -1;
-static gint ett_h248_3GCSD_evt_ratechg = -1;
-static gint ett_pkg_3GCSD_sig_actprot = -1;
+static gint ett_h248_package_3GCSD;
+static gint ett_h248_3GCSD_evt_protres;
+static gint ett_h248_3GCSD_evt_ratechg;
+static gint ett_pkg_3GCSD_sig_actprot;
 
 static void dissect_3gcsd_plmnbc(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* cu _U_, void* implicit_param) {
 	asn1_ctx_t asn1_ctx;
@@ -266,23 +266,23 @@ static h248_package_t h248_package_3GCSD = {
  * TFO package
  * 3GPP TS 29.232 -- 15.2.2
  */
-static int hf_h248_package_3GTFO = -1;
+static int hf_h248_package_3GTFO;
 
-static int hf_h248_pkg_3GTFO_evt_codec_modify = -1;
-static int hf_h248_pkg_3GTFO_evt_distant_codec_list = -1;
-static int hf_h248_pkg_3GTFO_evt_status = -1;
-static int hf_h248_pkg_3GTFO_enable = -1;
-static int hf_h248_pkg_3GTFO_codeclist = -1;
-static int hf_h248_pkg_3GTFO_evt_codec_modify_optimalcodec = -1;
-static int hf_h248_pkg_3GTFO_evt_distant_codec_list_distlist = -1;
-static int hf_h248_pkg_3GTFO_evt_status_tfostatus = -1;
+static int hf_h248_pkg_3GTFO_evt_codec_modify;
+static int hf_h248_pkg_3GTFO_evt_distant_codec_list;
+static int hf_h248_pkg_3GTFO_evt_status;
+static int hf_h248_pkg_3GTFO_enable;
+static int hf_h248_pkg_3GTFO_codeclist;
+static int hf_h248_pkg_3GTFO_evt_codec_modify_optimalcodec;
+static int hf_h248_pkg_3GTFO_evt_distant_codec_list_distlist;
+static int hf_h248_pkg_3GTFO_evt_status_tfostatus;
 
-static gint ett_h248_package_3GTFO = -1;
-static gint ett_h248_3GTFO_evt_status = -1;
-static gint ett_h248_3GTFO_evt_distant_codec_list = -1;
-static gint ett_h248_3GTFO_evt_codec_modify = -1;
-static gint ett_h248_3GTFO_codec_list = -1;
-static gint ett_h248_3GTFO_codec = -1;
+static gint ett_h248_package_3GTFO;
+static gint ett_h248_3GTFO_evt_status;
+static gint ett_h248_3GTFO_evt_distant_codec_list;
+static gint ett_h248_3GTFO_evt_codec_modify;
+static gint ett_h248_3GTFO_codec_list;
+static gint ett_h248_3GTFO_codec;
 
 
 static void dissect_3GTFO_codec_mode(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* cu _U_, void* ignored _U_) {
@@ -438,12 +438,12 @@ static h248_package_t h248_package_3GTFO = {
  * IP transport package
  * 3GPP TS 29.232 -- 15.2.7
  */
-static int hf_h248_package_threegiptra = -1;
-static int hf_h248_package_threegiptra_ipv4trans = -1;
-static int hf_h248_package_threegiptra_ipv6trans = -1;
-static int hf_h248_package_threegiptra_UDport = -1;
+static int hf_h248_package_threegiptra;
+static int hf_h248_package_threegiptra_ipv4trans;
+static int hf_h248_package_threegiptra_ipv6trans;
+static int hf_h248_package_threegiptra_UDport;
 
-static int ett_h248_package_threegiptra = -1;
+static int ett_h248_package_threegiptra;
 
 static const value_string h248_threegiptra_properties_vals[] = {
 	{ 0x0000, "threegiptra (3G IP transport)" },
@@ -490,10 +490,10 @@ static h248_package_t h248_package_threegiptra = {
  * 3G Interface Type package
  * 3GPP TS 29.232 -- 15.2.11
  */
-static int hf_h248_package_threegint = -1;
-static int hf_h248_package_threegint_ipint = -1;
+static int hf_h248_package_threegint;
+static int hf_h248_package_threegint_ipint;
 
-static int ett_h248_package_threegint = -1;
+static int ett_h248_package_threegint;
 
 static const value_string h248_threegint_properties_vals[] = {
 	{0000,  "3G Interface Type"},
diff --git a/epan/dissectors/packet-h248_7.c b/epan/dissectors/packet-h248_7.c
index 7d46fa24f8..cd03ea85cf 100644
--- a/epan/dissectors/packet-h248_7.c
+++ b/epan/dissectors/packet-h248_7.c
@@ -22,26 +22,26 @@ void proto_register_h248_7(void);
 #define PSNAME "H248AN"
 #define PFNAME "h248.an"
 
-static int proto_h248_an = -1;
-
-static int hf_h248_an_apf = -1;
-static int hf_h248_an_apf_an = -1;
-static int hf_h248_an_apf_noc = -1;
-static int hf_h248_an_apf_av = -1;
-static int hf_h248_an_apf_di = -1;
-
-static int hf_h248_an_apv = -1;
-static int hf_h248_an_apv_an = -1;
-static int hf_h248_an_apv_noc = -1;
-static int hf_h248_an_apv_av = -1;
-static int hf_h248_an_apv_num = -1;
-static int hf_h248_an_apv_spi = -1;
-static int hf_h248_an_apv_sp = -1;
-static int hf_h248_an_apv_di = -1;
-
-static gint ett_h248_an = -1;
-static gint ett_h248_an_apf = -1;
-static gint ett_h248_an_apv = -1;
+static int proto_h248_an;
+
+static int hf_h248_an_apf;
+static int hf_h248_an_apf_an;
+static int hf_h248_an_apf_noc;
+static int hf_h248_an_apf_av;
+static int hf_h248_an_apf_di;
+
+static int hf_h248_an_apv;
+static int hf_h248_an_apv_an;
+static int hf_h248_an_apv_noc;
+static int hf_h248_an_apv_av;
+static int hf_h248_an_apv_num;
+static int hf_h248_an_apv_spi;
+static int hf_h248_an_apv_sp;
+static int hf_h248_an_apv_di;
+
+static gint ett_h248_an;
+static gint ett_h248_an_apf;
+static gint ett_h248_an_apv;
 
 static const value_string h248_an_prop_vals[] = {
 	{ 0, "Generic Announcement Package (an) (H.248.7)" },
diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c
index 0d8a2b145b..af1591afc7 100644
--- a/epan/dissectors/packet-h248_annex_c.c
+++ b/epan/dissectors/packet-h248_annex_c.c
@@ -33,152 +33,152 @@ void proto_reg_handoff_h248_annex_c(void);
 #define PFNAME "h248.annexc"
 
 /* H.248 Annex C */
-static int proto_h248_pkg_annexc = -1;
-
-static int hf_h248_sdp_connection_info = -1;
-static int hf_h248_sdp_media_port = -1;
-
-static int hf_h248_pkg_annexc_media = -1;
-static int hf_h248_pkg_annexc_ACodec = -1;
-static int hf_h248_pkg_annexc_Mediatx = -1;
-static int hf_h248_pkg_annexc_NSAP = -1;
-static int hf_h248_pkg_annexc_BIR = -1;
-static int hf_h248_pkg_annexc_transmission_mode = -1;
-static int hf_h248_pkg_annexc_num_of_channels = -1;
-static int hf_h248_pkg_annexc_sampling_rate = -1;
-static int hf_h248_pkg_annexc_bit_rate = -1;
-static int hf_h248_pkg_annexc_samplepp = -1;
-static int hf_h248_pkg_annexc_silence_supp = -1;
-static int hf_h248_pkg_annexc_encrypt_type = -1;
-static int hf_h248_pkg_annexc_encrypt_key = -1;
-static int hf_h248_pkg_annexc_gain = -1;
-static int hf_h248_pkg_annexc_jitterbuf = -1;
-static int hf_h248_pkg_annexc_propdelay = -1;
-static int hf_h248_pkg_annexc_rtp_payload = -1;
-
-static int hf_h248_pkg_annexc_h222 = -1;
-static int hf_h248_pkg_annexc_h223 = -1;
-static int hf_h248_pkg_annexc_v76 = -1;
-static int hf_h248_pkg_annexc_h2250 = -1;
-
-static int hf_h248_pkg_annexc_aesa = -1;
-static int hf_h248_pkg_annexc_vp = -1;
-static int hf_h248_pkg_annexc_vc = -1;
-static int hf_h248_pkg_annexc_sc = -1;
-static int hf_h248_pkg_annexc_bcob = -1;
-static int hf_h248_pkg_annexc_bbtc = -1;
-static int hf_h248_pkg_annexc_atc = -1;
-static int hf_h248_pkg_annexc_stc = -1;
-static int hf_h248_pkg_annexc_uppc = -1;
-static int hf_h248_pkg_annexc_pcr0 = -1;
-static int hf_h248_pkg_annexc_scr0 = -1;
-static int hf_h248_pkg_annexc_mbs0 = -1;
-static int hf_h248_pkg_annexc_pcr1 = -1;
-static int hf_h248_pkg_annexc_scr1 = -1;
-static int hf_h248_pkg_annexc_mbs1 = -1;
-static int hf_h248_pkg_annexc_bei = -1;
-static int hf_h248_pkg_annexc_ti = -1;
-static int hf_h248_pkg_annexc_fd = -1;
-static int hf_h248_pkg_annexc_a2pcdv = -1;
-static int hf_h248_pkg_annexc_c2pcdv = -1;
-static int hf_h248_pkg_annexc_appcdv = -1;
-static int hf_h248_pkg_annexc_cppcdv = -1;
-static int hf_h248_pkg_annexc_aclr = -1;
-static int hf_h248_pkg_annexc_meetd = -1;
-static int hf_h248_pkg_annexc_ceetd = -1;
-static int hf_h248_pkg_annexc_QosClass = -1;
-static int hf_h248_pkg_annexc_AALtype = -1;
-
-static int hf_h248_pkg_annexc_dlci = -1;
-static int hf_h248_pkg_annexc_cid = -1;
-static int hf_h248_pkg_annexc_sid = -1;
-static int hf_h248_pkg_annexc_ppt = -1;
-
-static int hf_h248_pkg_annexc_ipv4 = -1;
-static int hf_h248_pkg_annexc_ipv6 = -1;
-static int hf_h248_pkg_annexc_port = -1;
-static int hf_h248_pkg_annexc_porttype = -1;
-
-static int hf_h248_pkg_annexc_alc = -1;
-static int hf_h248_pkg_annexc_sut = -1;
-static int hf_h248_pkg_annexc_tci = -1;
-static int hf_h248_pkg_annexc_timer_cu = -1;
-static int hf_h248_pkg_annexc_maxcpssdu = -1;
-
-static int hf_h248_pkg_annexc_aal1st = -1;
-static int hf_h248_pkg_annexc_cbrr = -1;
-static int hf_h248_pkg_annexc_scri = -1;
-static int hf_h248_pkg_annexc_ecm = -1;
-static int hf_h248_pkg_annexc_sdbt = -1;
-static int hf_h248_pkg_annexc_pfci = -1;
-
-static int hf_h248_pkg_annexc_tmr = -1;
-static int hf_h248_pkg_annexc_tmrsr = -1;
-static int hf_h248_pkg_annexc_contcheck = -1;
-static int hf_h248_pkg_annexc_itc = -1;
-static int hf_h248_pkg_annexc_transmode = -1;
-static int hf_h248_pkg_annexc_transrate = -1;
-static int hf_h248_pkg_annexc_mult = -1;
-static int hf_h248_pkg_annexc_syncasync = -1;
-static int hf_h248_pkg_annexc_negotiation = -1;
-static int hf_h248_pkg_annexc_userrate = -1;
-static int hf_h248_pkg_annexc_intrate = -1;
-static int hf_h248_pkg_annexc_nictx = -1;
-static int hf_h248_pkg_annexc_nicrx = -1;
-static int hf_h248_pkg_annexc_flowconttx = -1;
-static int hf_h248_pkg_annexc_flowcontrx = -1;
-static int hf_h248_pkg_annexc_rateadapthdr = -1;
-static int hf_h248_pkg_annexc_multiframe = -1;
-static int hf_h248_pkg_annexc_opmode = -1;
-static int hf_h248_pkg_annexc_llidnegot = -1;
-static int hf_h248_pkg_annexc_assign = -1;
-static int hf_h248_pkg_annexc_inbandneg = -1;
-static int hf_h248_pkg_annexc_stopbits = -1;
-static int hf_h248_pkg_annexc_databits = -1;
-static int hf_h248_pkg_annexc_parity = -1;
-static int hf_h248_pkg_annexc_duplexmode = -1;
-static int hf_h248_pkg_annexc_modem = -1;
-static int hf_h248_pkg_annexc_layer2prot = -1;
-static int hf_h248_pkg_annexc_layer3prot = -1;
-static int hf_h248_pkg_annexc_addlayer3prot = -1;
-static int hf_h248_pkg_annexc_dialedn = -1;
-static int hf_h248_pkg_annexc_dialingn = -1;
-static int hf_h248_pkg_annexc_echoci = -1;
-static int hf_h248_pkg_annexc_nci = -1;
-static int hf_h248_pkg_annexc_USI = -1;
-
-static int hf_h248_pkg_annexc_fmsdu = -1;
-static int hf_h248_pkg_annexc_bmsdu = -1;
-static int hf_h248_pkg_annexc_sscs = -1;
-
-static int hf_h248_pkg_annexc_sdp_v = -1;
-static int hf_h248_pkg_annexc_sdp_o = -1;
-static int hf_h248_pkg_annexc_sdp_s = -1;
-static int hf_h248_pkg_annexc_sdp_i = -1;
-static int hf_h248_pkg_annexc_sdp_u = -1;
-static int hf_h248_pkg_annexc_sdp_e = -1;
-static int hf_h248_pkg_annexc_sdp_p = -1;
-static int hf_h248_pkg_annexc_sdp_c = -1;
-static int hf_h248_pkg_annexc_sdp_b = -1;
-static int hf_h248_pkg_annexc_sdp_z = -1;
-static int hf_h248_pkg_annexc_sdp_k = -1;
-static int hf_h248_pkg_annexc_sdp_a = -1;
-static int hf_h248_pkg_annexc_sdp_t = -1;
-static int hf_h248_pkg_annexc_sdp_r = -1;
-static int hf_h248_pkg_annexc_sdp_m = -1;
-
-static int hf_h248_pkg_annexc_olc = -1;
-static int hf_h248_pkg_annexc_olcack = -1;
-static int hf_h248_pkg_annexc_olccnf = -1;
-static int hf_h248_pkg_annexc_olcrej = -1;
-static int hf_h248_pkg_annexc_clc = -1;
-static int hf_h248_pkg_annexc_clcack = -1;
-
-static expert_field ei_h248_sdp_media_port_invalid = EI_INIT;
-
-static gint ett_annexc = -1;
-static gint ett_vpvc = -1;
-static gint ett_codec = -1;
+static int proto_h248_pkg_annexc;
+
+static int hf_h248_sdp_connection_info;
+static int hf_h248_sdp_media_port;
+
+static int hf_h248_pkg_annexc_media;
+static int hf_h248_pkg_annexc_ACodec;
+static int hf_h248_pkg_annexc_Mediatx;
+static int hf_h248_pkg_annexc_NSAP;
+static int hf_h248_pkg_annexc_BIR;
+static int hf_h248_pkg_annexc_transmission_mode;
+static int hf_h248_pkg_annexc_num_of_channels;
+static int hf_h248_pkg_annexc_sampling_rate;
+static int hf_h248_pkg_annexc_bit_rate;
+static int hf_h248_pkg_annexc_samplepp;
+static int hf_h248_pkg_annexc_silence_supp;
+static int hf_h248_pkg_annexc_encrypt_type;
+static int hf_h248_pkg_annexc_encrypt_key;
+static int hf_h248_pkg_annexc_gain;
+static int hf_h248_pkg_annexc_jitterbuf;
+static int hf_h248_pkg_annexc_propdelay;
+static int hf_h248_pkg_annexc_rtp_payload;
+
+static int hf_h248_pkg_annexc_h222;
+static int hf_h248_pkg_annexc_h223;
+static int hf_h248_pkg_annexc_v76;
+static int hf_h248_pkg_annexc_h2250;
+
+static int hf_h248_pkg_annexc_aesa;
+static int hf_h248_pkg_annexc_vp;
+static int hf_h248_pkg_annexc_vc;
+static int hf_h248_pkg_annexc_sc;
+static int hf_h248_pkg_annexc_bcob;
+static int hf_h248_pkg_annexc_bbtc;
+static int hf_h248_pkg_annexc_atc;
+static int hf_h248_pkg_annexc_stc;
+static int hf_h248_pkg_annexc_uppc;
+static int hf_h248_pkg_annexc_pcr0;
+static int hf_h248_pkg_annexc_scr0;
+static int hf_h248_pkg_annexc_mbs0;
+static int hf_h248_pkg_annexc_pcr1;
+static int hf_h248_pkg_annexc_scr1;
+static int hf_h248_pkg_annexc_mbs1;
+static int hf_h248_pkg_annexc_bei;
+static int hf_h248_pkg_annexc_ti;
+static int hf_h248_pkg_annexc_fd;
+static int hf_h248_pkg_annexc_a2pcdv;
+static int hf_h248_pkg_annexc_c2pcdv;
+static int hf_h248_pkg_annexc_appcdv;
+static int hf_h248_pkg_annexc_cppcdv;
+static int hf_h248_pkg_annexc_aclr;
+static int hf_h248_pkg_annexc_meetd;
+static int hf_h248_pkg_annexc_ceetd;
+static int hf_h248_pkg_annexc_QosClass;
+static int hf_h248_pkg_annexc_AALtype;
+
+static int hf_h248_pkg_annexc_dlci;
+static int hf_h248_pkg_annexc_cid;
+static int hf_h248_pkg_annexc_sid;
+static int hf_h248_pkg_annexc_ppt;
+
+static int hf_h248_pkg_annexc_ipv4;
+static int hf_h248_pkg_annexc_ipv6;
+static int hf_h248_pkg_annexc_port;
+static int hf_h248_pkg_annexc_porttype;
+
+static int hf_h248_pkg_annexc_alc;
+static int hf_h248_pkg_annexc_sut;
+static int hf_h248_pkg_annexc_tci;
+static int hf_h248_pkg_annexc_timer_cu;
+static int hf_h248_pkg_annexc_maxcpssdu;
+
+static int hf_h248_pkg_annexc_aal1st;
+static int hf_h248_pkg_annexc_cbrr;
+static int hf_h248_pkg_annexc_scri;
+static int hf_h248_pkg_annexc_ecm;
+static int hf_h248_pkg_annexc_sdbt;
+static int hf_h248_pkg_annexc_pfci;
+
+static int hf_h248_pkg_annexc_tmr;
+static int hf_h248_pkg_annexc_tmrsr;
+static int hf_h248_pkg_annexc_contcheck;
+static int hf_h248_pkg_annexc_itc;
+static int hf_h248_pkg_annexc_transmode;
+static int hf_h248_pkg_annexc_transrate;
+static int hf_h248_pkg_annexc_mult;
+static int hf_h248_pkg_annexc_syncasync;
+static int hf_h248_pkg_annexc_negotiation;
+static int hf_h248_pkg_annexc_userrate;
+static int hf_h248_pkg_annexc_intrate;
+static int hf_h248_pkg_annexc_nictx;
+static int hf_h248_pkg_annexc_nicrx;
+static int hf_h248_pkg_annexc_flowconttx;
+static int hf_h248_pkg_annexc_flowcontrx;
+static int hf_h248_pkg_annexc_rateadapthdr;
+static int hf_h248_pkg_annexc_multiframe;
+static int hf_h248_pkg_annexc_opmode;
+static int hf_h248_pkg_annexc_llidnegot;
+static int hf_h248_pkg_annexc_assign;
+static int hf_h248_pkg_annexc_inbandneg;
+static int hf_h248_pkg_annexc_stopbits;
+static int hf_h248_pkg_annexc_databits;
+static int hf_h248_pkg_annexc_parity;
+static int hf_h248_pkg_annexc_duplexmode;
+static int hf_h248_pkg_annexc_modem;
+static int hf_h248_pkg_annexc_layer2prot;
+static int hf_h248_pkg_annexc_layer3prot;
+static int hf_h248_pkg_annexc_addlayer3prot;
+static int hf_h248_pkg_annexc_dialedn;
+static int hf_h248_pkg_annexc_dialingn;
+static int hf_h248_pkg_annexc_echoci;
+static int hf_h248_pkg_annexc_nci;
+static int hf_h248_pkg_annexc_USI;
+
+static int hf_h248_pkg_annexc_fmsdu;
+static int hf_h248_pkg_annexc_bmsdu;
+static int hf_h248_pkg_annexc_sscs;
+
+static int hf_h248_pkg_annexc_sdp_v;
+static int hf_h248_pkg_annexc_sdp_o;
+static int hf_h248_pkg_annexc_sdp_s;
+static int hf_h248_pkg_annexc_sdp_i;
+static int hf_h248_pkg_annexc_sdp_u;
+static int hf_h248_pkg_annexc_sdp_e;
+static int hf_h248_pkg_annexc_sdp_p;
+static int hf_h248_pkg_annexc_sdp_c;
+static int hf_h248_pkg_annexc_sdp_b;
+static int hf_h248_pkg_annexc_sdp_z;
+static int hf_h248_pkg_annexc_sdp_k;
+static int hf_h248_pkg_annexc_sdp_a;
+static int hf_h248_pkg_annexc_sdp_t;
+static int hf_h248_pkg_annexc_sdp_r;
+static int hf_h248_pkg_annexc_sdp_m;
+
+static int hf_h248_pkg_annexc_olc;
+static int hf_h248_pkg_annexc_olcack;
+static int hf_h248_pkg_annexc_olccnf;
+static int hf_h248_pkg_annexc_olcrej;
+static int hf_h248_pkg_annexc_clc;
+static int hf_h248_pkg_annexc_clcack;
+
+static expert_field ei_h248_sdp_media_port_invalid;
+
+static gint ett_annexc;
+static gint ett_vpvc;
+static gint ett_codec;
 
 static const value_string h248_annexc_package_properties_vals[] = {
 	{ 0x0000, "Media stream properties H.248.1 Annex C" },
diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c
index cedf9657df..569c3dbabf 100644
--- a/epan/dissectors/packet-h248_annex_e.c
+++ b/epan/dissectors/packet-h248_annex_e.c
@@ -27,25 +27,25 @@ void proto_register_h248_annex_e(void);
 #define PFNAME "h248e"
 /*
 */
-static int proto_h248_annex_E = -1;
+static int proto_h248_annex_E;
 
 static gboolean h248_e_implicit = FALSE;
 static gboolean implicit = FALSE;
 
 /* H.248.1 E.1  Generic Package */
-static int hf_h248_pkg_generic = -1;
-static int hf_h248_pkg_generic_cause_evt = -1;
-static int hf_h248_pkg_generic_cause_gencause = -1;
-static int hf_h248_pkg_generic_cause_failurecause = -1;
-static int hf_h248_pkg_generic_sc_evt = -1;
-static int hf_h248_pkg_generic_sc_sig_id = -1;
-static int hf_h248_pkg_generic_sc_meth = -1;
-static int hf_h248_pkg_generic_sc_slid = -1;
-static int hf_h248_pkg_generic_sc_rid = -1;
-
-static gint ett_h248_pkg_generic_cause_evt = -1;
-static gint ett_h248_pkg_generic = -1;
-static gint ett_h248_pkg_generic_sc_evt = -1;
+static int hf_h248_pkg_generic;
+static int hf_h248_pkg_generic_cause_evt;
+static int hf_h248_pkg_generic_cause_gencause;
+static int hf_h248_pkg_generic_cause_failurecause;
+static int hf_h248_pkg_generic_sc_evt;
+static int hf_h248_pkg_generic_sc_sig_id;
+static int hf_h248_pkg_generic_sc_meth;
+static int hf_h248_pkg_generic_sc_slid;
+static int hf_h248_pkg_generic_sc_rid;
+
+static gint ett_h248_pkg_generic_cause_evt;
+static gint ett_h248_pkg_generic;
+static gint ett_h248_pkg_generic_sc_evt;
 
 static const value_string h248_pkg_generic_props_vals[] = {
 	{ 0,"Generic Package - Annex E (g)" },
@@ -124,17 +124,17 @@ static h248_package_t h248_pkg_generic = {
 
 /* H.248.1 E.2  Base Root Package */
 #if 0 /* XXX: All of the following hf_... vars  have no hf[] entry; package commented out */
-static int hf_h248_pkg_root = -1;
-static int hf_h248_pkg_root_maxnrofctx = -1;
-static int hf_h248_pkg_root_maxtermsperctx = -1;
-static int hf_h248_pkg_root_normalmgexectime = -1;
-static int hf_h248_pkg_root_normalmgcexecutiontime = -1;
-static int hf_h248_pkg_root_mg_provisionalresponsetimervalue = -1;
-static int hf_h248_pkg_root_mgc_provisionalresponsetimervalue = -1;
-static int hf_h248_pkg_root_mgc_orginalpendinglimit = -1;
-static int hf_h248_pkg_root_mg_orginalpendinglimit = -1;
-
-static gint ett_h248_pkg_root_params		= -1;
+static int hf_h248_pkg_root;
+static int hf_h248_pkg_root_maxnrofctx;
+static int hf_h248_pkg_root_maxtermsperctx;
+static int hf_h248_pkg_root_normalmgexectime;
+static int hf_h248_pkg_root_normalmgcexecutiontime;
+static int hf_h248_pkg_root_mg_provisionalresponsetimervalue;
+static int hf_h248_pkg_root_mgc_provisionalresponsetimervalue;
+static int hf_h248_pkg_root_mgc_orginalpendinglimit;
+static int hf_h248_pkg_root_mg_orginalpendinglimit;
+
+static gint ett_h248_pkg_root_params;
 
 static const value_string h248_pkg_root_props_vals[] = {
 	{ 0x0000, "Base Root Package - Annex E (root)" },
@@ -177,14 +177,14 @@ static h248_package_t h248_pkg_root = {
 #endif
 
 /* H.248.1 E.3  Tone Generator Package */
-static int hf_h248_pkg_tonegen				= -1;
-static int hf_h248_pkg_tonegen_sig_pt		= -1;
-static int hf_h248_pkg_tonegen_sig_pt_tl	= -1;
-static int hf_h248_pkg_tonegen_sig_pt_ind	= -1;
-static int hf_h248_pkg_tonegen_sig_pg_btd	= -1;
+static int hf_h248_pkg_tonegen;
+static int hf_h248_pkg_tonegen_sig_pt;
+static int hf_h248_pkg_tonegen_sig_pt_tl;
+static int hf_h248_pkg_tonegen_sig_pt_ind;
+static int hf_h248_pkg_tonegen_sig_pg_btd;
 
-static gint ett_h248_pkg_tonegen_params		= -1;
-static gint ett_h248_pkg_tonegen_sig_pt		= -1;
+static gint ett_h248_pkg_tonegen_params;
+static gint ett_h248_pkg_tonegen_sig_pt;
 
 static const value_string h248_pkg_tonegen_props_vals[] = {
 	{ 0x0000, "Tone Generator - Annex E (tonegen)" },
@@ -236,19 +236,19 @@ static h248_package_t h248_pkg_tonegen = {
 
 
 /*  H.248.1 E.4  Tone Detector Package */
-static int hf_h248_pkg_tonedet = -1;
-static int hf_h248_pkg_tonedet_evt_std = -1;
-static int hf_h248_pkg_tonedet_evt_etd = -1;
-static int hf_h248_pkg_tonedet_evt_ltd = -1;
+static int hf_h248_pkg_tonedet;
+static int hf_h248_pkg_tonedet_evt_std;
+static int hf_h248_pkg_tonedet_evt_etd;
+static int hf_h248_pkg_tonedet_evt_ltd;
 
-static int hf_h248_pkg_tonedet_evt_tl_param = -1;
-static int hf_h248_pkg_tonedet_evt_dur_param = -1;
-static int hf_h248_pkg_tonedet_evt_tid_param = -1;
+static int hf_h248_pkg_tonedet_evt_tl_param;
+static int hf_h248_pkg_tonedet_evt_dur_param;
+static int hf_h248_pkg_tonedet_evt_tid_param;
 
-static gint ett_h248_pkg_tonedet = -1;
-static gint ett_h248_pkg_tonedet_evt_std = -1;
-static gint ett_h248_pkg_tonedet_evt_etd = -1;
-static gint ett_h248_pkg_tonedet_evt_ltd = -1;
+static gint ett_h248_pkg_tonedet;
+static gint ett_h248_pkg_tonedet_evt_std;
+static gint ett_h248_pkg_tonedet_evt_etd;
+static gint ett_h248_pkg_tonedet_evt_ltd;
 
 static const value_string h248_pkg_tonedet_props_vals[] = {
 	{ 0x0000, "Tone Detection Package - Annex E  (tonedet)" },
@@ -304,44 +304,44 @@ static h248_package_t h248_pkg_tonedet = {
 
 
 /* E.5 Basic DTMF Generator Package */
-static int hf_h248_pkg_dg			= -1;
-static int hf_h248_pkg_dg_sig_pt	= -1;
-static int hf_h248_pkg_dg_sig_d0	= -1;
-static int hf_h248_pkg_dg_sig_d1	= -1;
-static int hf_h248_pkg_dg_sig_d2	= -1;
-static int hf_h248_pkg_dg_sig_d3	= -1;
-static int hf_h248_pkg_dg_sig_d4	= -1;
-static int hf_h248_pkg_dg_sig_d5	= -1;
-static int hf_h248_pkg_dg_sig_d6	= -1;
-static int hf_h248_pkg_dg_sig_d7	= -1;
-static int hf_h248_pkg_dg_sig_d8	= -1;
-static int hf_h248_pkg_dg_sig_d9	= -1;
-static int hf_h248_pkg_dg_sig_da	= -1;
-static int hf_h248_pkg_dg_sig_db	= -1;
-static int hf_h248_pkg_dg_sig_dc	= -1;
-static int hf_h248_pkg_dg_sig_dd	= -1;
-static int hf_h248_pkg_dg_sig_ds	= -1;
-static int hf_h248_pkg_dg_sig_do	= -1;
-static int hf_h248_pkg_dg_sig_params	= -1;
-
-static gint ett_h248_pkg_dg			= -1;
-static gint ett_h248_pkg_dg_sig_pt	= -1;
-static gint ett_h248_pkg_dg_sig_d0	= -1;
-static gint ett_h248_pkg_dg_sig_d1	= -1;
-static gint ett_h248_pkg_dg_sig_d2	= -1;
-static gint ett_h248_pkg_dg_sig_d3	= -1;
-static gint ett_h248_pkg_dg_sig_d4	= -1;
-static gint ett_h248_pkg_dg_sig_d5	= -1;
-static gint ett_h248_pkg_dg_sig_d6	= -1;
-static gint ett_h248_pkg_dg_sig_d7	= -1;
-static gint ett_h248_pkg_dg_sig_d8	= -1;
-static gint ett_h248_pkg_dg_sig_d9	= -1;
-static gint ett_h248_pkg_dg_sig_da	= -1;
-static gint ett_h248_pkg_dg_sig_db	= -1;
-static gint ett_h248_pkg_dg_sig_dc	= -1;
-static gint ett_h248_pkg_dg_sig_dd	= -1;
-static gint ett_h248_pkg_dg_sig_ds	= -1;
-static gint ett_h248_pkg_dg_sig_do	= -1;
+static int hf_h248_pkg_dg;
+static int hf_h248_pkg_dg_sig_pt;
+static int hf_h248_pkg_dg_sig_d0;
+static int hf_h248_pkg_dg_sig_d1;
+static int hf_h248_pkg_dg_sig_d2;
+static int hf_h248_pkg_dg_sig_d3;
+static int hf_h248_pkg_dg_sig_d4;
+static int hf_h248_pkg_dg_sig_d5;
+static int hf_h248_pkg_dg_sig_d6;
+static int hf_h248_pkg_dg_sig_d7;
+static int hf_h248_pkg_dg_sig_d8;
+static int hf_h248_pkg_dg_sig_d9;
+static int hf_h248_pkg_dg_sig_da;
+static int hf_h248_pkg_dg_sig_db;
+static int hf_h248_pkg_dg_sig_dc;
+static int hf_h248_pkg_dg_sig_dd;
+static int hf_h248_pkg_dg_sig_ds;
+static int hf_h248_pkg_dg_sig_do;
+static int hf_h248_pkg_dg_sig_params;
+
+static gint ett_h248_pkg_dg;
+static gint ett_h248_pkg_dg_sig_pt;
+static gint ett_h248_pkg_dg_sig_d0;
+static gint ett_h248_pkg_dg_sig_d1;
+static gint ett_h248_pkg_dg_sig_d2;
+static gint ett_h248_pkg_dg_sig_d3;
+static gint ett_h248_pkg_dg_sig_d4;
+static gint ett_h248_pkg_dg_sig_d5;
+static gint ett_h248_pkg_dg_sig_d6;
+static gint ett_h248_pkg_dg_sig_d7;
+static gint ett_h248_pkg_dg_sig_d8;
+static gint ett_h248_pkg_dg_sig_d9;
+static gint ett_h248_pkg_dg_sig_da;
+static gint ett_h248_pkg_dg_sig_db;
+static gint ett_h248_pkg_dg_sig_dc;
+static gint ett_h248_pkg_dg_sig_dd;
+static gint ett_h248_pkg_dg_sig_ds;
+static gint ett_h248_pkg_dg_sig_do;
 
 static const value_string h248_pkg_dg_props_vals[] = {
 	{ 0x0000, "Basic DTMF Generator Package - Annex E (dg)" },
@@ -446,42 +446,42 @@ static h248_package_t h248_pkg_dg = {
 /* H248.1 E.6 DTMF Detection Package (dd) */
 
 #if 0 /* XXX: The following 5 hf_... vars have no hf[] entry: package commented out */
-static int hf_h248_pkg_dd		= -1;
-static int hf_h248_pkg_dd_evt_std	= -1;
-static int hf_h248_pkg_dd_evt_etd	= -1;
-static int hf_h248_pkg_dd_evt_ltd	= -1;
-static int hf_h248_pkg_dd_evt_ce	= -1;
+static int hf_h248_pkg_dd;
+static int hf_h248_pkg_dd_evt_std;
+static int hf_h248_pkg_dd_evt_etd;
+static int hf_h248_pkg_dd_evt_ltd;
+static int hf_h248_pkg_dd_evt_ce;
 #endif
 #if 0
-static int hf_h248_pkg_dd_evt_d0	= -1;
-static int hf_h248_pkg_dd_evt_d1	= -1;
-static int hf_h248_pkg_dd_evt_d2	= -1;
-static int hf_h248_pkg_dd_evt_d3	= -1;
-static int hf_h248_pkg_dd_evt_d4	= -1;
-static int hf_h248_pkg_dd_evt_d5	= -1;
-static int hf_h248_pkg_dd_evt_d6	= -1;
-static int hf_h248_pkg_dd_evt_d7	= -1;
-static int hf_h248_pkg_dd_evt_d8	= -1;
-static int hf_h248_pkg_dd_evt_d9	= -1;
-static int hf_h248_pkg_dd_evt_da	= -1;
-static int hf_h248_pkg_dd_evt_db	= -1;
-static int hf_h248_pkg_dd_evt_dc	= -1;
-static int hf_h248_pkg_dd_evt_dd	= -1;
-static int hf_h248_pkg_dd_evt_ds	= -1;
-static int hf_h248_pkg_dd_evt_do	= -1;
-static int hf_h248_pkg_dd_evt_ce_ds	= -1;
-static int hf_h248_pkg_dd_evt_ce_meth	= -1;
-static int hf_h248_pkg_dd_evt_tl_param	= -1;
-static int hf_h248_pkg_dd_evt_dur_param	= -1;
-static int hf_h248_pkg_dd_evt_tid_param	= -1;
+static int hf_h248_pkg_dd_evt_d0;
+static int hf_h248_pkg_dd_evt_d1;
+static int hf_h248_pkg_dd_evt_d2;
+static int hf_h248_pkg_dd_evt_d3;
+static int hf_h248_pkg_dd_evt_d4;
+static int hf_h248_pkg_dd_evt_d5;
+static int hf_h248_pkg_dd_evt_d6;
+static int hf_h248_pkg_dd_evt_d7;
+static int hf_h248_pkg_dd_evt_d8;
+static int hf_h248_pkg_dd_evt_d9;
+static int hf_h248_pkg_dd_evt_da;
+static int hf_h248_pkg_dd_evt_db;
+static int hf_h248_pkg_dd_evt_dc;
+static int hf_h248_pkg_dd_evt_dd;
+static int hf_h248_pkg_dd_evt_ds;
+static int hf_h248_pkg_dd_evt_do;
+static int hf_h248_pkg_dd_evt_ce_ds;
+static int hf_h248_pkg_dd_evt_ce_meth;
+static int hf_h248_pkg_dd_evt_tl_param;
+static int hf_h248_pkg_dd_evt_dur_param;
+static int hf_h248_pkg_dd_evt_tid_param;
 #endif
 
 #if 0
-static gint ett_h248_pkg_dd			= -1;
-static gint ett_h248_pkg_dd_evt_ce		= -1;
-static gint ett_h248_pkg_dd_evt_std		= -1;
-static gint ett_h248_pkg_dd_evt_etd		= -1;
-static gint ett_h248_pkg_dd_evt_ltd		= -1;
+static gint ett_h248_pkg_dd;
+static gint ett_h248_pkg_dd_evt_ce;
+static gint ett_h248_pkg_dd_evt_std;
+static gint ett_h248_pkg_dd_evt_etd;
+static gint ett_h248_pkg_dd_evt_ltd;
 
 static const value_string h248_pkg_dd_props_vals[] = {
 	{ 0x0000, "DTMF Detection Package - Annex E (dd)" },
@@ -566,32 +566,32 @@ static h248_package_t h248_pkg_dd = {
 #endif
 
 /* H.248.1.E.7 Call Progress Tones Generator package */
-static int hf_h248_pkg_cg			= -1;
-static int hf_h248_pkg_cg_sig_pt		= -1;
-static int hf_h248_pkg_cg_sig_pt_tl		= -1;
-static int hf_h248_pkg_cg_sig_pt_ind		= -1;
-static int hf_h248_pkg_cg_sig_pt_btd		= -1;
-static int hf_h248_pkg_cg_sig_dt		= -1;
-static int hf_h248_pkg_cg_sig_rt		= -1;
-static int hf_h248_pkg_cg_sig_bt		= -1;
-static int hf_h248_pkg_cg_sig_ct		= -1;
-static int hf_h248_pkg_cg_sig_sit		= -1;
-static int hf_h248_pkg_cg_sig_wt		= -1;
-static int hf_h248_pkg_cg_sig_prt		= -1;
-static int hf_h248_pkg_cg_sig_cw		= -1;
-static int hf_h248_pkg_cg_sig_cr		= -1;
-
-static gint ett_h248_pkg_cg_params			= -1;
-static gint ett_h248_pkg_cg_sig_pt			= -1;
-static gint ett_h248_pkg_cg_sig_dt			= -1;
-static gint ett_h248_pkg_cg_sig_rt			= -1;
-static gint ett_h248_pkg_cg_sig_bt			= -1;
-static gint ett_h248_pkg_cg_sig_ct			= -1;
-static gint ett_h248_pkg_cg_sig_sit			= -1;
-static gint ett_h248_pkg_cg_sig_wt			= -1;
-static gint ett_h248_pkg_cg_sig_prt			= -1;
-static gint ett_h248_pkg_cg_sig_cw			= -1;
-static gint ett_h248_pkg_cg_sig_cr			= -1;
+static int hf_h248_pkg_cg;
+static int hf_h248_pkg_cg_sig_pt;
+static int hf_h248_pkg_cg_sig_pt_tl;
+static int hf_h248_pkg_cg_sig_pt_ind;
+static int hf_h248_pkg_cg_sig_pt_btd;
+static int hf_h248_pkg_cg_sig_dt;
+static int hf_h248_pkg_cg_sig_rt;
+static int hf_h248_pkg_cg_sig_bt;
+static int hf_h248_pkg_cg_sig_ct;
+static int hf_h248_pkg_cg_sig_sit;
+static int hf_h248_pkg_cg_sig_wt;
+static int hf_h248_pkg_cg_sig_prt;
+static int hf_h248_pkg_cg_sig_cw;
+static int hf_h248_pkg_cg_sig_cr;
+
+static gint ett_h248_pkg_cg_params;
+static gint ett_h248_pkg_cg_sig_pt;
+static gint ett_h248_pkg_cg_sig_dt;
+static gint ett_h248_pkg_cg_sig_rt;
+static gint ett_h248_pkg_cg_sig_bt;
+static gint ett_h248_pkg_cg_sig_ct;
+static gint ett_h248_pkg_cg_sig_sit;
+static gint ett_h248_pkg_cg_sig_wt;
+static gint ett_h248_pkg_cg_sig_prt;
+static gint ett_h248_pkg_cg_sig_cw;
+static gint ett_h248_pkg_cg_sig_cr;
 
 static const value_string h248_pkg_cg_props_vals[] = {
 	{ 0x0000, "Call Progress Tones Generator - Annex E (cg)" },
@@ -661,9 +661,9 @@ static h248_package_t h248_pkg_cg = {
 };
 
 /* H.248.1 E.8 - Call Tones Detection Package */
-static int hf_h248_pkg_cd		= -1;
+static int hf_h248_pkg_cd;
 
-static gint ett_h248_pkg_cd		= -1;
+static gint ett_h248_pkg_cd;
 
 static const value_string h248_pkg_cd_params_vals[] = {
 	{ 0x0000, "Call Progress Tones Detection Package (cd)" },
@@ -684,25 +684,25 @@ static h248_package_t h248_pkg_cd = {
 };
 
 /* H.248.1 E.9 Analog Line Supervision Package */
-static int hf_h248_pkg_al = -1;
-static int hf_h248_pkg_al_sig_cadence = -1;
-static int hf_h248_pkg_al_sig_cadence_on_off = -1;
-/* static int hf_h248_pkg_al_sig_freq = -1; */
-static int hf_h248_pkg_al_evt_onhook = -1;
-static int hf_h248_pkg_al_evt_offhook = -1;
-static int hf_h248_pkg_al_evt_flashhook = -1;
-static int hf_h248_pkg_al_evt_onhook_par_strict = -1;
-static int hf_h248_pkg_al_evt_offhook_par_strict = -1;
-static int hf_h248_pkg_al_evt_onhook_par_init = -1;
-static int hf_h248_pkg_al_evt_offhook_par_init = -1;
-static int hf_h248_pkg_al_evt_flashhook_par_mindur = -1;
-
-static gint ett_h248_pkg_al = -1;
-static gint ett_h248_pkg_al_sig_cadence = -1;
-static gint ett_h248_pkg_al_sig_freq = -1;
-static gint ett_h248_pkg_al_evt_onhook = -1;
-static gint ett_h248_pkg_al_evt_offhook = -1;
-static gint ett_h248_pkg_al_evt_flashhook = -1;
+static int hf_h248_pkg_al;
+static int hf_h248_pkg_al_sig_cadence;
+static int hf_h248_pkg_al_sig_cadence_on_off;
+/* static int hf_h248_pkg_al_sig_freq; */
+static int hf_h248_pkg_al_evt_onhook;
+static int hf_h248_pkg_al_evt_offhook;
+static int hf_h248_pkg_al_evt_flashhook;
+static int hf_h248_pkg_al_evt_onhook_par_strict;
+static int hf_h248_pkg_al_evt_offhook_par_strict;
+static int hf_h248_pkg_al_evt_onhook_par_init;
+static int hf_h248_pkg_al_evt_offhook_par_init;
+static int hf_h248_pkg_al_evt_flashhook_par_mindur;
+
+static gint ett_h248_pkg_al;
+static gint ett_h248_pkg_al_sig_cadence;
+static gint ett_h248_pkg_al_sig_freq;
+static gint ett_h248_pkg_al_evt_onhook;
+static gint ett_h248_pkg_al_evt_offhook;
+static gint ett_h248_pkg_al_evt_flashhook;
 
 static const value_string h248_pkg_al_props_vals[] = {
 	{ 0x0000, "Analog Line Supervision Package - Annex E (al)" },
@@ -809,8 +809,8 @@ static h248_package_t h248_pkg_al = {
 
 
 /* H.248.1 E.10 - Basic Continuity Package */
-static int hf_h248_pkg_ct		= -1;
-static gint ett_h248_pkg_ct		= -1;
+static int hf_h248_pkg_ct;
+static gint ett_h248_pkg_ct;
 
 static const value_string h248_pkg_ct_props_vals[] = {
 	{ 0x0000, "Basic Continuity Package (ct)" },
@@ -836,8 +836,8 @@ static h248_package_t h248_pkg_ct = {
 };
 
 /* H.248.1 E.11 Network Package */
-static int hf_h248_pkg_nt		= -1;
-static gint ett_h248_pkg_nt		= -1;
+static int hf_h248_pkg_nt;
+static gint ett_h248_pkg_nt;
 
 static const value_string h248_pkg_nt_props_evt_stats_vals[] = {
 	{ 0x0000, "Network Package (nt)" },
@@ -862,10 +862,10 @@ static h248_package_t h248_pkg_nt = {
 };
 
 /* H.248.1 E.12 RTP package */
-static int hf_h248_pkg_rtp = -1;
-static int hf_h248_pkg_rtp_stat_ps = -1;
+static int hf_h248_pkg_rtp;
+static int hf_h248_pkg_rtp_stat_ps;
 
-static gint ett_h248_pkg_rtp = -1;
+static gint ett_h248_pkg_rtp;
 
 #if 0
 static const value_string h248_pkg_rtp_stat_vals[] _U_ = {
@@ -905,11 +905,11 @@ static h248_package_t h248_pkg_rtp = {
 };
 
 /* H.248.1 E.13 TDM Circuit Package */
-static int hf_h248_pkg_tdmc = -1;
-static int hf_h248_pkg_tdmc_ec = -1;
-static int hf_h248_pkg_tdmc_gain = -1;
+static int hf_h248_pkg_tdmc;
+static int hf_h248_pkg_tdmc_ec;
+static int hf_h248_pkg_tdmc_gain;
 
-static gint ett_h248_pkg_tdmc = -1;
+static gint ett_h248_pkg_tdmc;
 
 static const value_string h248_pkg_tdmc_props_vals[] = {
 	{ 0x0000, "TDM Circuit Package - Annex E (tdmc)" },
diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c
index d6672f818d..a290197126 100644
--- a/epan/dissectors/packet-h248_q1950.c
+++ b/epan/dissectors/packet-h248_q1950.c
@@ -29,14 +29,14 @@ void proto_register_q1950(void);
 #define PSNAME "H248Q1950"
 #define PFNAME "h248q1950"
 
-static int proto_q1950 = -1;
+static int proto_q1950;
 static bool implicit = FALSE;
 
 /* A.3 Bearer characteristics package */
-static int hf_h248_pkg_BCP = -1;
-static int hf_h248_pkg_BCP_BNCChar = -1;
+static int hf_h248_pkg_BCP;
+static int hf_h248_pkg_BCP_BNCChar;
 
-static gint ett_h248_pkg_BCP = -1;
+static gint ett_h248_pkg_BCP;
 
 static const value_string h248_pkg_BCP_parameters[] _U_ = {
     {   0x0001, "BNCChar (BNC Characteristics)" },
@@ -71,11 +71,11 @@ static h248_package_t h248_pkg_BCP = {
 };
 
 /* A.4 Bearer Network connection cut-through package */
-static int hf_h248_pkg_BNCCT = -1;
+static int hf_h248_pkg_BNCCT;
 
-static int hf_h248_pkg_BNCCT_prop = -1;
+static int hf_h248_pkg_BNCCT_prop;
 
-static gint ett_h248_pkg_BNCCT = -1;
+static gint ett_h248_pkg_BNCCT;
 
 #if 0
 static const value_string h248_pkg_BNCCT_parameters[] _U_ = {
@@ -118,11 +118,11 @@ static h248_package_t h248_pkg_BNCCT = {
 };
 
 /* A.5 Bearer Reuse Idle Package  */
-static int hf_h248_pkg_RI = -1;
+static int hf_h248_pkg_RI;
 
-static int hf_h248_pkg_RII= -1;
+static int hf_h248_pkg_RII;
 
-static gint ett_h248_pkg_RI= -1;
+static gint ett_h248_pkg_RI;
 
 static const value_string h248_pkg_RI_parameters[] = {
     { 0x0000, "Reuse Idle Q.1950 Annex A" },
@@ -165,21 +165,21 @@ static h248_package_t h248_pkg_RI = {
     Package ID: 0x0021
  */
 
-static int hf_h248_pkg_GB= -1;
-static int hf_h248_pkg_GB_BNCChange= -1;
-static int hf_h248_pkg_GB_BNCChange_type= -1;
-static int hf_h248_pkg_GB_EstBNC= -1;
-static int hf_h248_pkg_GB_ModBNC= -1;
-static int hf_h248_pkg_GB_RelBNC = -1;
-static int hf_h248_pkg_GB_RelBNC_Generalcause = -1;
-static int hf_h248_pkg_GB_RelBNC_Failurecause = -1;
-static int hf_h248_pkg_GB_RelBNC_Reset = -1;
-
-static gint ett_h248_pkg_GB= -1;
-static gint ett_h248_pkg_GB_EstBNC= -1;
-static gint ett_h248_pkg_GB_ModBNC= -1;
-static gint ett_h248_pkg_GB_RelBNC= -1;
-static gint ett_h248_pkg_GB_BNCChange= -1;
+static int hf_h248_pkg_GB;
+static int hf_h248_pkg_GB_BNCChange;
+static int hf_h248_pkg_GB_BNCChange_type;
+static int hf_h248_pkg_GB_EstBNC;
+static int hf_h248_pkg_GB_ModBNC;
+static int hf_h248_pkg_GB_RelBNC;
+static int hf_h248_pkg_GB_RelBNC_Generalcause;
+static int hf_h248_pkg_GB_RelBNC_Failurecause;
+static int hf_h248_pkg_GB_RelBNC_Reset;
+
+static gint ett_h248_pkg_GB;
+static gint ett_h248_pkg_GB_EstBNC;
+static gint ett_h248_pkg_GB_ModBNC;
+static gint ett_h248_pkg_GB_RelBNC;
+static gint ett_h248_pkg_GB_BNCChange;
 
 static const value_string h248_pkg_GB_events_vals[] = {
     { 0x0001, "BNCChange" },
@@ -271,14 +271,14 @@ static h248_package_t h248_pkg_GB = {
 /* A.7 Bearer control tunnelling package */
 static dissector_handle_t bctp_dissector = NULL;
 
-static int hf_h248_pkg_bt = -1;
-static int hf_h248_pkg_bt_tind = -1;
-static int hf_h248_pkg_bt_tunopt = -1;
-static int hf_h248_pkg_bt_bit = -1;
+static int hf_h248_pkg_bt;
+static int hf_h248_pkg_bt_tind;
+static int hf_h248_pkg_bt_tunopt;
+static int hf_h248_pkg_bt_bit;
 
-static gint ett_h248_pkg_bt = -1;
-static gint ett_h248_pkg_bt_tind = -1;
-static gint ett_h248_pkg_bt_bit= -1;
+static gint ett_h248_pkg_bt;
+static gint ett_h248_pkg_bt_tind;
+static gint ett_h248_pkg_bt_bit;
 
 static void dissect_bt_tunneled_proto(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* i _U_, void* d _U_) {
     tvbuff_t* bctp_tvb = NULL;
@@ -371,21 +371,21 @@ static h248_package_t h248_pkg_bct = {
 };
 
 /* A.8 Basic call progress tones generator with directionality */
-static int hf_h248_pkg_bcg = -1;
-static int hf_h248_pkg_bcg_sig_bdt_par_btd = -1;
-static int hf_h248_pkg_bcg_sig_bdt = -1;
-static int hf_h248_pkg_bcg_sig_brt = -1;
-static int hf_h248_pkg_bcg_sig_bbt = -1;
-static int hf_h248_pkg_bcg_sig_bct = -1;
-static int hf_h248_pkg_bcg_sig_bsit = -1;
-static int hf_h248_pkg_bcg_sig_bwt = -1;
-static int hf_h248_pkg_bcg_sig_bpt = -1;
-static int hf_h248_pkg_bcg_sig_bcw = -1;
-static int hf_h248_pkg_bcg_sig_bcr = -1;
-static int hf_h248_pkg_bcg_sig_bpy = -1;
-
-static gint ett_h248_pkg_bcg = -1;
-static gint ett_h248_pkg_bcg_sig_bdt = -1;
+static int hf_h248_pkg_bcg;
+static int hf_h248_pkg_bcg_sig_bdt_par_btd;
+static int hf_h248_pkg_bcg_sig_bdt;
+static int hf_h248_pkg_bcg_sig_brt;
+static int hf_h248_pkg_bcg_sig_bbt;
+static int hf_h248_pkg_bcg_sig_bct;
+static int hf_h248_pkg_bcg_sig_bsit;
+static int hf_h248_pkg_bcg_sig_bwt;
+static int hf_h248_pkg_bcg_sig_bpt;
+static int hf_h248_pkg_bcg_sig_bcw;
+static int hf_h248_pkg_bcg_sig_bcr;
+static int hf_h248_pkg_bcg_sig_bpy;
+
+static gint ett_h248_pkg_bcg;
+static gint ett_h248_pkg_bcg_sig_bdt;
 
 static const value_string h248_pkg_bcg_sig_bdt_par_btd_vals[] = {
     {   0x0001, "ext (External)" },
diff --git a/epan/dissectors/packet-h261.c b/epan/dissectors/packet-h261.c
index cfd1f4107d..efb170c1ec 100644
--- a/epan/dissectors/packet-h261.c
+++ b/epan/dissectors/packet-h261.c
@@ -31,20 +31,20 @@ void proto_reg_handoff_h261(void);
 static dissector_handle_t h261_handle;
 
 /* H.261 header fields             */
-static int proto_h261          = -1;
-static int hf_h261_sbit        = -1;
-static int hf_h261_ebit        = -1;
-static int hf_h261_ibit        = -1;
-static int hf_h261_vbit        = -1;
-static int hf_h261_gobn        = -1;
-static int hf_h261_mbap        = -1;
-static int hf_h261_quant       = -1;
-static int hf_h261_hmvd        = -1; /* Mislabeled in a figure in section C.3.1 as HMDV */
-static int hf_h261_vmvd        = -1;
-static int hf_h261_data        = -1;
+static int proto_h261;
+static int hf_h261_sbit;
+static int hf_h261_ebit;
+static int hf_h261_ibit;
+static int hf_h261_vbit;
+static int hf_h261_gobn;
+static int hf_h261_mbap;
+static int hf_h261_quant;
+static int hf_h261_hmvd; /* Mislabeled in a figure in section C.3.1 as HMDV */
+static int hf_h261_vmvd;
+static int hf_h261_data;
 
 /* H.261 fields defining a sub tree */
-static gint ett_h261           = -1;
+static gint ett_h261;
 
 static int
 dissect_h261( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ )
diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c
index a68b4aaf08..75f34ba40f 100644
--- a/epan/dissectors/packet-h263.c
+++ b/epan/dissectors/packet-h263.c
@@ -26,39 +26,39 @@
 
 void proto_register_h263_data(void);
 
-static int proto_h263_data		= -1;
+static int proto_h263_data;
 
 /* Fields for the data section */
-static int hf_h263_psc = -1;
-static int hf_h263_gbsc = -1;
-static int hf_h263_TR =-1;
-static int hf_h263_split_screen_indicator = -1;
-static int hf_h263_document_camera_indicator = -1;
-static int hf_h263_full_picture_freeze_release = -1;
-static int hf_h263_source_format = -1;
-static int hf_h263_payload_picture_coding_type = -1;
-static int hf_h263_opt_unres_motion_vector_mode = -1;
-static int hf_h263_syntax_based_arithmetic_coding_mode = -1;
-static int hf_h263_optional_advanced_prediction_mode = -1;
-static int hf_h263_PB_frames_mode = -1;
-static int hf_h263_data			= -1;
-static int hf_h263_GN			= -1;
-static int hf_h263_UFEP			= -1;
-static int hf_h263_opptype		= -1;
-static int hf_h263_pquant		= -1;
-static int hf_h263_cpm			= -1;
-static int hf_h263_psbi			= -1;
-static int hf_h263_picture_type_code = -1;
-static int hf_h263_ext_source_format = -1;
-static int hf_h263_custom_pcf	= -1;
-static int hf_h263_pei			= -1;
-static int hf_h263_psupp		= -1;
-static int hf_h263_trb = -1;
-static int hf_h263_not_dissected = -1;
+static int hf_h263_psc;
+static int hf_h263_gbsc;
+static int hf_h263_TR;
+static int hf_h263_split_screen_indicator;
+static int hf_h263_document_camera_indicator;
+static int hf_h263_full_picture_freeze_release;
+static int hf_h263_source_format;
+static int hf_h263_payload_picture_coding_type;
+static int hf_h263_opt_unres_motion_vector_mode;
+static int hf_h263_syntax_based_arithmetic_coding_mode;
+static int hf_h263_optional_advanced_prediction_mode;
+static int hf_h263_PB_frames_mode;
+static int hf_h263_data;
+static int hf_h263_GN;
+static int hf_h263_UFEP;
+static int hf_h263_opptype;
+static int hf_h263_pquant;
+static int hf_h263_cpm;
+static int hf_h263_psbi;
+static int hf_h263_picture_type_code;
+static int hf_h263_ext_source_format;
+static int hf_h263_custom_pcf;
+static int hf_h263_pei;
+static int hf_h263_psupp;
+static int hf_h263_trb;
+static int hf_h263_not_dissected;
 
 /* H.263 fields defining a sub tree */
-static gint ett_h263_payload	= -1;
-static gint ett_h263_optype		= -1;
+static gint ett_h263_payload;
+static gint ett_h263_optype;
 
 
 /* Source format types */
diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c
index 64b0fa849f..7992234c1d 100644
--- a/epan/dissectors/packet-h263p.c
+++ b/epan/dissectors/packet-h263p.c
@@ -26,28 +26,28 @@
 void proto_reg_handoff_h263P(void);
 void proto_register_h263P(void);
 
-static int proto_h263P = -1;
+static int proto_h263P;
 
 /* H.263 RFC 4629 fields */
-static int hf_h263P_payload = -1;
-static int hf_h263P_rr = -1;
-static int hf_h263P_pbit = -1;
-static int hf_h263P_vbit = -1;
-static int hf_h263P_plen = -1;
-static int hf_h263P_pebit = -1;
-static int hf_h263P_tid = -1;
-static int hf_h263P_trun = -1;
-static int hf_h263P_s = -1;
-static int hf_h263P_extra_hdr = -1;
-/* static int hf_h263P_PSC = -1; */
-/* static int hf_h263P_TR = -1; */
+static int hf_h263P_payload;
+static int hf_h263P_rr;
+static int hf_h263P_pbit;
+static int hf_h263P_vbit;
+static int hf_h263P_plen;
+static int hf_h263P_pebit;
+static int hf_h263P_tid;
+static int hf_h263P_trun;
+static int hf_h263P_s;
+static int hf_h263P_extra_hdr;
+/* static int hf_h263P_PSC; */
+/* static int hf_h263P_TR; */
 
 
 /* H.263-1998 fields defining a sub tree */
-static gint ett_h263P = -1;
-static gint ett_h263P_extra_hdr = -1;
-static gint ett_h263P_payload   = -1;
-static gint ett_h263P_data = -1;
+static gint ett_h263P;
+static gint ett_h263P_extra_hdr;
+static gint ett_h263P_payload;
+static gint ett_h263P_data;
 
 static dissector_handle_t h263P_handle;
 
diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c
index b1e1d72c6c..8b8ac395c8 100644
--- a/epan/dissectors/packet-h264.c
+++ b/epan/dissectors/packet-h264.c
@@ -29,228 +29,228 @@ void proto_register_h264(void);
 void proto_reg_handoff_h264(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_h264                                      = -1;
-static int hf_h264_type                                    = -1;
-static int hf_h264_nal_f_bit                               = -1;
-static int hf_h264_nal_nri                                 = -1;
-static int hf_h264_start_bit                               = -1;
-static int hf_h264_forbidden_bit                           = -1;
-static int hf_h264_end_bit                                 = -1;
-static int hf_h264_profile                                 = -1;
-static int hf_h264_profile_idc                             = -1;
-static int hf_h264_rbsp_stop_bit                           = -1;
-static int hf_h264_rbsp_trailing_bits                      = -1;
-static int hf_h264_constraint_set0_flag                    = -1;
-static int hf_h264_constraint_set1_flag                    = -1;
-static int hf_h264_constraint_set2_flag                    = -1;
-static int hf_h264_constraint_set3_flag                    = -1;
-static int hf_h264_constraint_set4_flag                    = -1;
-static int hf_h264_constraint_set5_flag                    = -1;
-static int hf_h264_reserved_zero_2bits                     = -1;
-static int hf_h264_level_idc                               = -1;
-static int hf_h264_nal_unit                                = -1;
-static int hf_h264_forbidden_zero_bit                      = -1;
-static int hf_h264_nal_ref_idc                             = -1;
-static int hf_h264_nal_unit_type                           = -1;
-static int hf_h264_seq_parameter_set_id                    = -1;
-static int hf_h264_chroma_format_idc                       = -1;
-static int hf_h264_residual_colour_transform_flag          = -1;
-static int hf_h264_bit_depth_luma_minus8                   = -1;
-static int hf_h264_bit_depth_chroma_minus8                 = -1;
-static int hf_h264_qpprime_y_zero_transform_bypass_flag    = -1;
-static int hf_h264_seq_scaling_matrix_present_flag         = -1;
-static int hf_h264_seq_scaling_list_present_flag           = -1;
-static int hf_h264_delta_scale                             = -1;
-static int hf_h264_log2_max_frame_num_minus4               = -1;
-static int hf_h264_pic_order_cnt_type                      = -1;
-static int hf_h264_log2_max_pic_order_cnt_lsb_minus4       = -1;
-static int hf_h264_delta_pic_order_always_zero_flag        = -1;
-static int hf_h264_offset_for_non_ref_pic                  = -1;
-static int hf_h264_offset_for_top_to_bottom_field          = -1;
-static int hf_h264_num_ref_frames_in_pic_order_cnt_cycle   = -1;
-static int hf_h264_offset_for_ref_frame                    = -1;
-static int hf_h264_num_ref_frames                          = -1;
-static int hf_h264_gaps_in_frame_num_value_allowed_flag    = -1;
-static int hf_h264_pic_width_in_mbs_minus1                 = -1;
-static int hf_h264_pic_height_in_map_units_minus1          = -1;
-static int hf_h264_frame_mbs_only_flag                     = -1;
-static int hf_h264_mb_adaptive_frame_field_flag            = -1;
-static int hf_h264_direct_8x8_inference_flag               = -1;
-static int hf_h264_frame_cropping_flag                     = -1;
-static int hf_h264_frame_crop_left_offset                  = -1;
-static int hf_h264_frame_crop_right_offset                 = -1;
-static int hf_h264_frame_crop_top_offset                   = -1;
-static int hf_h264_frame_crop_bottom_offset                = -1;
-static int hf_h264_vui_parameters_present_flag             = -1;
-static int hf_h264_pic_parameter_set_id                    = -1;
-static int hf_h264_entropy_coding_mode_flag                = -1;
-static int hf_h264_pic_order_present_flag                  = -1;
-static int hf_h264_num_slice_groups_minus1                 = -1;
-static int hf_h264_slice_group_map_type                    = -1;
-static int hf_h264_num_ref_idx_l0_active_minus1            = -1;
-static int hf_h264_num_ref_idx_l1_active_minus1            = -1;
-static int hf_h264_weighted_pred_flag                      = -1;
-static int hf_h264_weighted_bipred_idc                     = -1;
-static int hf_h264_pic_init_qp_minus26                     = -1;
-static int hf_h264_pic_init_qs_minus26                     = -1;
-static int hf_h264_chroma_qp_index_offset                  = -1;
-static int hf_h264_deblocking_filter_control_present_flag  = -1;
-static int hf_h264_constrained_intra_pred_flag             = -1;
-static int hf_h264_redundant_pic_cnt_present_flag          = -1;
-static int hf_h264_transform_8x8_mode_flag                 = -1;
-static int hf_h264_pic_scaling_matrix_present_flag         = -1;
-static int hf_h264_second_chroma_qp_index_offset           = -1;
-static int hf_h264_primary_pic_type                        = -1;
-static int hf_h264_par_profile                             = -1;
-static int hf_h264_par_profile_b                           = -1;
-static int hf_h264_par_profile_m                           = -1;
-static int hf_h264_par_profile_e                           = -1;
-static int hf_h264_par_profile_h                           = -1;
-static int hf_h264_par_profile_h10                         = -1;
-static int hf_h264_par_profile_h4_2_2                      = -1;
-static int hf_h264_par_profile_h4_4_4                      = -1;
-/* static int hf_h264_par_add_mode_sup                        = -1; */
-static int hf_h264_par_AdditionalModesSupported            = -1;
-static int hf_h264_par_add_mode_sup_rcdo                   = -1;
-static int hf_h264_par_ProfileIOP                          = -1;
-static int hf_h264_par_constraint_set0_flag                = -1;
-static int hf_h264_par_constraint_set1_flag                = -1;
-static int hf_h264_par_constraint_set2_flag                = -1;
+static int proto_h264;
+static int hf_h264_type;
+static int hf_h264_nal_f_bit;
+static int hf_h264_nal_nri;
+static int hf_h264_start_bit;
+static int hf_h264_forbidden_bit;
+static int hf_h264_end_bit;
+static int hf_h264_profile;
+static int hf_h264_profile_idc;
+static int hf_h264_rbsp_stop_bit;
+static int hf_h264_rbsp_trailing_bits;
+static int hf_h264_constraint_set0_flag;
+static int hf_h264_constraint_set1_flag;
+static int hf_h264_constraint_set2_flag;
+static int hf_h264_constraint_set3_flag;
+static int hf_h264_constraint_set4_flag;
+static int hf_h264_constraint_set5_flag;
+static int hf_h264_reserved_zero_2bits;
+static int hf_h264_level_idc;
+static int hf_h264_nal_unit;
+static int hf_h264_forbidden_zero_bit;
+static int hf_h264_nal_ref_idc;
+static int hf_h264_nal_unit_type;
+static int hf_h264_seq_parameter_set_id;
+static int hf_h264_chroma_format_idc;
+static int hf_h264_residual_colour_transform_flag;
+static int hf_h264_bit_depth_luma_minus8;
+static int hf_h264_bit_depth_chroma_minus8;
+static int hf_h264_qpprime_y_zero_transform_bypass_flag;
+static int hf_h264_seq_scaling_matrix_present_flag;
+static int hf_h264_seq_scaling_list_present_flag;
+static int hf_h264_delta_scale;
+static int hf_h264_log2_max_frame_num_minus4;
+static int hf_h264_pic_order_cnt_type;
+static int hf_h264_log2_max_pic_order_cnt_lsb_minus4;
+static int hf_h264_delta_pic_order_always_zero_flag;
+static int hf_h264_offset_for_non_ref_pic;
+static int hf_h264_offset_for_top_to_bottom_field;
+static int hf_h264_num_ref_frames_in_pic_order_cnt_cycle;
+static int hf_h264_offset_for_ref_frame;
+static int hf_h264_num_ref_frames;
+static int hf_h264_gaps_in_frame_num_value_allowed_flag;
+static int hf_h264_pic_width_in_mbs_minus1;
+static int hf_h264_pic_height_in_map_units_minus1;
+static int hf_h264_frame_mbs_only_flag;
+static int hf_h264_mb_adaptive_frame_field_flag;
+static int hf_h264_direct_8x8_inference_flag;
+static int hf_h264_frame_cropping_flag;
+static int hf_h264_frame_crop_left_offset;
+static int hf_h264_frame_crop_right_offset;
+static int hf_h264_frame_crop_top_offset;
+static int hf_h264_frame_crop_bottom_offset;
+static int hf_h264_vui_parameters_present_flag;
+static int hf_h264_pic_parameter_set_id;
+static int hf_h264_entropy_coding_mode_flag;
+static int hf_h264_pic_order_present_flag;
+static int hf_h264_num_slice_groups_minus1;
+static int hf_h264_slice_group_map_type;
+static int hf_h264_num_ref_idx_l0_active_minus1;
+static int hf_h264_num_ref_idx_l1_active_minus1;
+static int hf_h264_weighted_pred_flag;
+static int hf_h264_weighted_bipred_idc;
+static int hf_h264_pic_init_qp_minus26;
+static int hf_h264_pic_init_qs_minus26;
+static int hf_h264_chroma_qp_index_offset;
+static int hf_h264_deblocking_filter_control_present_flag;
+static int hf_h264_constrained_intra_pred_flag;
+static int hf_h264_redundant_pic_cnt_present_flag;
+static int hf_h264_transform_8x8_mode_flag;
+static int hf_h264_pic_scaling_matrix_present_flag;
+static int hf_h264_second_chroma_qp_index_offset;
+static int hf_h264_primary_pic_type;
+static int hf_h264_par_profile;
+static int hf_h264_par_profile_b;
+static int hf_h264_par_profile_m;
+static int hf_h264_par_profile_e;
+static int hf_h264_par_profile_h;
+static int hf_h264_par_profile_h10;
+static int hf_h264_par_profile_h4_2_2;
+static int hf_h264_par_profile_h4_4_4;
+/* static int hf_h264_par_add_mode_sup; */
+static int hf_h264_par_AdditionalModesSupported;
+static int hf_h264_par_add_mode_sup_rcdo;
+static int hf_h264_par_ProfileIOP;
+static int hf_h264_par_constraint_set0_flag;
+static int hf_h264_par_constraint_set1_flag;
+static int hf_h264_par_constraint_set2_flag;
 /* Packetization Values */
-static int hf_h264_nalu_size                               = -1;
-static int hf_h264_don                                     = -1;
-static int hf_h264_dond                                    = -1;
-static int hf_h264_ts_offset16                             = -1;
-static int hf_h264_ts_offset24                             = -1;
+static int hf_h264_nalu_size;
+static int hf_h264_don;
+static int hf_h264_dond;
+static int hf_h264_ts_offset16;
+static int hf_h264_ts_offset24;
 /* Extension Header */
-static int hf_h264_nal_extension_subtype                   = -1;
-static int hf_h264_nal_extension_j                         = -1;
-static int hf_h264_nal_extension_k                         = -1;
-static int hf_h264_nal_extension_l                         = -1;
+static int hf_h264_nal_extension_subtype;
+static int hf_h264_nal_extension_j;
+static int hf_h264_nal_extension_k;
+static int hf_h264_nal_extension_l;
 
 /* SEI Decoding Information */
-static int hf_h264_sei_uuid                                = -1;
+static int hf_h264_sei_uuid;
 /* Microsoft Layout SEI */
-static int hf_h264_sei_ms_lpb                              = -1;
-static int hf_h264_sei_ms_layout_p                         = -1;
-static int hf_h264_sei_ms_layout_ldsize                    = -1;
-static int hf_h264_sei_ms_layer_desc_coded_width           = -1;
-static int hf_h264_sei_ms_layer_desc_coded_height          = -1;
-static int hf_h264_sei_ms_layer_desc_display_width         = -1;
-static int hf_h264_sei_ms_layer_desc_display_height        = -1;
-static int hf_h264_sei_ms_layer_desc_bitrate               = -1;
-static int hf_h264_sei_ms_layer_desc_frame_rate            = -1;
-static int hf_h264_sei_ms_layer_desc_layer_type            = -1;
-static int hf_h264_sei_ms_layer_desc_prid                  = -1;
-static int hf_h264_sei_ms_layer_desc_cb                    = -1;
+static int hf_h264_sei_ms_lpb;
+static int hf_h264_sei_ms_layout_p;
+static int hf_h264_sei_ms_layout_ldsize;
+static int hf_h264_sei_ms_layer_desc_coded_width;
+static int hf_h264_sei_ms_layer_desc_coded_height;
+static int hf_h264_sei_ms_layer_desc_display_width;
+static int hf_h264_sei_ms_layer_desc_display_height;
+static int hf_h264_sei_ms_layer_desc_bitrate;
+static int hf_h264_sei_ms_layer_desc_frame_rate;
+static int hf_h264_sei_ms_layer_desc_layer_type;
+static int hf_h264_sei_ms_layer_desc_prid;
+static int hf_h264_sei_ms_layer_desc_cb;
 /* Microsoft Bitstream SEI */
-static int hf_h264_sei_ms_bitstream_ref_frame_cnt          = -1;
-static int hf_h264_sei_ms_bitstream_num_nalus              = -1;
-static int hf_h264_sei_iso_sec_info                        = -1;
+static int hf_h264_sei_ms_bitstream_ref_frame_cnt;
+static int hf_h264_sei_ms_bitstream_num_nalus;
+static int hf_h264_sei_iso_sec_info;
 /* Microsoft Crop SEI */
-static int hf_h264_sei_ms_crop_num_data                    = -1;
-static int hf_h264_sei_ms_crop_info_type                   = -1;
-static int hf_h264_sei_ms_crop_confidence_level            = -1;
-static int hf_h264_sei_ms_crop_frame_left_offset           = -1;
-static int hf_h264_sei_ms_crop_frame_right_offset          = -1;
-static int hf_h264_sei_ms_crop_frame_top_offset            = -1;
-static int hf_h264_sei_ms_crop_frame_bottom_offset         = -1;
+static int hf_h264_sei_ms_crop_num_data;
+static int hf_h264_sei_ms_crop_info_type;
+static int hf_h264_sei_ms_crop_confidence_level;
+static int hf_h264_sei_ms_crop_frame_left_offset;
+static int hf_h264_sei_ms_crop_frame_right_offset;
+static int hf_h264_sei_ms_crop_frame_top_offset;
+static int hf_h264_sei_ms_crop_frame_bottom_offset;
 /* SVC NAL Header Extension Values Annex G.7.3.1.1 */
-static int hf_h264_nal_hdr_ext_svc                         = -1;
-static int hf_h264_nal_hdr_ext_i                           = -1;
-static int hf_h264_nal_hdr_ext_prid                        = -1;
-static int hf_h264_nal_hdr_ext_n                           = -1;
-static int hf_h264_nal_hdr_ext_did                         = -1;
-static int hf_h264_nal_hdr_ext_qid                         = -1;
-static int hf_h264_nal_hdr_ext_tid                         = -1;
-static int hf_h264_nal_hdr_ext_u                           = -1;
-static int hf_h264_nal_hdr_ext_d                           = -1;
-static int hf_h264_nal_hdr_ext_o                           = -1;
-static int hf_h264_nal_hdr_ext_rr                          = -1;
+static int hf_h264_nal_hdr_ext_svc;
+static int hf_h264_nal_hdr_ext_i;
+static int hf_h264_nal_hdr_ext_prid;
+static int hf_h264_nal_hdr_ext_n;
+static int hf_h264_nal_hdr_ext_did;
+static int hf_h264_nal_hdr_ext_qid;
+static int hf_h264_nal_hdr_ext_tid;
+static int hf_h264_nal_hdr_ext_u;
+static int hf_h264_nal_hdr_ext_d;
+static int hf_h264_nal_hdr_ext_o;
+static int hf_h264_nal_hdr_ext_rr;
 /* PACSI Values */
-static int hf_h264_pacsi_x                                 = -1;
-static int hf_h264_pacsi_y                                 = -1;
-static int hf_h264_pacsi_t                                 = -1;
-static int hf_h264_pacsi_a                                 = -1;
-static int hf_h264_pacsi_p                                 = -1;
-static int hf_h264_pacsi_c                                 = -1;
-static int hf_h264_pacsi_s                                 = -1;
-static int hf_h264_pacsi_e                                 = -1;
-static int hf_h264_pacsi_tl0picidx                         = -1;
-static int hf_h264_pacsi_idrpicid                          = -1;
-static int hf_h264_pacsi_donc                              = -1;
+static int hf_h264_pacsi_x;
+static int hf_h264_pacsi_y;
+static int hf_h264_pacsi_t;
+static int hf_h264_pacsi_a;
+static int hf_h264_pacsi_p;
+static int hf_h264_pacsi_c;
+static int hf_h264_pacsi_s;
+static int hf_h264_pacsi_e;
+static int hf_h264_pacsi_tl0picidx;
+static int hf_h264_pacsi_idrpicid;
+static int hf_h264_pacsi_donc;
 
 /* VUI parameters */
-static int hf_h264_aspect_ratio_info_present_flag          = -1;
-static int hf_h264_aspect_ratio_idc                        = -1;
-static int hf_h264_sar_width                               = -1;
-static int hf_h264_sar_height                              = -1;
-static int hf_h264_overscan_info_present_flag              = -1;
-static int hf_h264_overscan_appropriate_flag               = -1;
-static int hf_h264_video_signal_type_present_flag          = -1;
-static int hf_h264_video_format                            = -1;
-static int hf_h264_video_full_range_flag                   = -1;
-static int hf_h264_colour_description_present_flag         = -1;
-static int hf_h264_colour_primaries                        = -1;
-static int hf_h264_transfer_characteristics                = -1;
-static int hf_h264_matrix_coefficients                     = -1;
-static int hf_h264_chroma_loc_info_present_flag            = -1;
-static int hf_h264_chroma_sample_loc_type_top_field        = -1;
-static int hf_h264_chroma_sample_loc_type_bottom_field     = -1;
-static int hf_h264_timing_info_present_flag                = -1;
-static int hf_h264_num_units_in_tick                       = -1;
-static int hf_h264_time_scale                              = -1;
-static int hf_h264_fixed_frame_rate_flag                   = -1;
-static int hf_h264_nal_hrd_parameters_present_flag         = -1;
-static int hf_h264_vcl_hrd_parameters_present_flag         = -1;
-static int hf_h264_low_delay_hrd_flag                      = -1;
-static int hf_h264_pic_struct_present_flag                 = -1;
-static int hf_h264_bitstream_restriction_flag              = -1;
-static int hf_h264_motion_vectors_over_pic_boundaries_flag = -1;
-static int hf_h264_max_bytes_per_pic_denom                 = -1;
-static int hf_h264_max_bits_per_mb_denom                   = -1;
-static int hf_h264_log2_max_mv_length_horizontal           = -1;
-static int hf_h264_log2_max_mv_length_vertical             = -1;
-static int hf_h264_num_reorder_frames                      = -1;
-static int hf_h264_max_dec_frame_buffering                 = -1;
-static int hf_h264_cpb_cnt_minus1                          = -1;
-static int hf_h264_bit_rate_scale                          = -1;
-static int hf_h264_cpb_size_scale                          = -1;
-static int hf_h264_bit_rate_value_minus1                   = -1;
-static int hf_h264_cpb_size_value_minus1                   = -1;
-static int hf_h264_cbr_flag                                = -1;
-static int hf_h264_initial_cpb_removal_delay_length_minus1 = -1;
-static int hf_h264_cpb_removal_delay_length_minus1         = -1;
-static int hf_h264_dpb_output_delay_length_minus11         = -1;
-static int hf_h264_time_offset_length                      = -1;
-
-static int hf_h264_first_mb_in_slice                       = -1;
-static int hf_h264_slice_type                              = -1;
-static int hf_h264_slice_id                                = -1;
-static int hf_h264_payloadsize                             = -1;
-static int hf_h264_payloadtype                             = -1;
-/* static int hf_h264_frame_num                               = -1; */
+static int hf_h264_aspect_ratio_info_present_flag;
+static int hf_h264_aspect_ratio_idc;
+static int hf_h264_sar_width;
+static int hf_h264_sar_height;
+static int hf_h264_overscan_info_present_flag;
+static int hf_h264_overscan_appropriate_flag;
+static int hf_h264_video_signal_type_present_flag;
+static int hf_h264_video_format;
+static int hf_h264_video_full_range_flag;
+static int hf_h264_colour_description_present_flag;
+static int hf_h264_colour_primaries;
+static int hf_h264_transfer_characteristics;
+static int hf_h264_matrix_coefficients;
+static int hf_h264_chroma_loc_info_present_flag;
+static int hf_h264_chroma_sample_loc_type_top_field;
+static int hf_h264_chroma_sample_loc_type_bottom_field;
+static int hf_h264_timing_info_present_flag;
+static int hf_h264_num_units_in_tick;
+static int hf_h264_time_scale;
+static int hf_h264_fixed_frame_rate_flag;
+static int hf_h264_nal_hrd_parameters_present_flag;
+static int hf_h264_vcl_hrd_parameters_present_flag;
+static int hf_h264_low_delay_hrd_flag;
+static int hf_h264_pic_struct_present_flag;
+static int hf_h264_bitstream_restriction_flag;
+static int hf_h264_motion_vectors_over_pic_boundaries_flag;
+static int hf_h264_max_bytes_per_pic_denom;
+static int hf_h264_max_bits_per_mb_denom;
+static int hf_h264_log2_max_mv_length_horizontal;
+static int hf_h264_log2_max_mv_length_vertical;
+static int hf_h264_num_reorder_frames;
+static int hf_h264_max_dec_frame_buffering;
+static int hf_h264_cpb_cnt_minus1;
+static int hf_h264_bit_rate_scale;
+static int hf_h264_cpb_size_scale;
+static int hf_h264_bit_rate_value_minus1;
+static int hf_h264_cpb_size_value_minus1;
+static int hf_h264_cbr_flag;
+static int hf_h264_initial_cpb_removal_delay_length_minus1;
+static int hf_h264_cpb_removal_delay_length_minus1;
+static int hf_h264_dpb_output_delay_length_minus11;
+static int hf_h264_time_offset_length;
+
+static int hf_h264_first_mb_in_slice;
+static int hf_h264_slice_type;
+static int hf_h264_slice_id;
+static int hf_h264_payloadsize;
+static int hf_h264_payloadtype;
+/* static int hf_h264_frame_num; */
 
 /* Initialize the subtree pointers */
-static int ett_h264                                        = -1;
-static int ett_h264_profile                                = -1;
-static int ett_h264_nal                                    = -1;
-static int ett_h264_fua                                    = -1;
-static int ett_h264_stream                                 = -1;
-static int ett_h264_nal_unit                               = -1;
-static int ett_h264_par_profile                            = -1;
-static int ett_h264_par_AdditionalModesSupported           = -1;
-static int ett_h264_par_ProfileIOP                         = -1;
-static int ett_h264_ms_layer_description                   = -1;
-static int ett_h264_ms_crop_data                           = -1;
-static int ett_h264_ni_mtap                                = -1;
-
-static expert_field ei_h264_undecoded = EI_INIT;
-static expert_field ei_h264_ms_layout_wrong_length = EI_INIT;
-static expert_field ei_h264_oversized_exp_golomb_code = EI_INIT;
-static expert_field ei_h264_bad_nal_length = EI_INIT;
-static expert_field ei_h264_nal_unit_type_reserved = EI_INIT;
-static expert_field ei_h264_nal_unit_type_unspecified = EI_INIT;
+static int ett_h264;
+static int ett_h264_profile;
+static int ett_h264_nal;
+static int ett_h264_fua;
+static int ett_h264_stream;
+static int ett_h264_nal_unit;
+static int ett_h264_par_profile;
+static int ett_h264_par_AdditionalModesSupported;
+static int ett_h264_par_ProfileIOP;
+static int ett_h264_ms_layer_description;
+static int ett_h264_ms_crop_data;
+static int ett_h264_ni_mtap;
+
+static expert_field ei_h264_undecoded;
+static expert_field ei_h264_ms_layout_wrong_length;
+static expert_field ei_h264_oversized_exp_golomb_code;
+static expert_field ei_h264_bad_nal_length;
+static expert_field ei_h264_nal_unit_type_reserved;
+static expert_field ei_h264_nal_unit_type_unspecified;
 
 static dissector_handle_t h264_name_handle;
 
diff --git a/epan/dissectors/packet-h265.c b/epan/dissectors/packet-h265.c
index 008f24f732..d311aee469 100644
--- a/epan/dissectors/packet-h265.c
+++ b/epan/dissectors/packet-h265.c
@@ -28,371 +28,371 @@ void proto_register_h265(void);
 void proto_reg_handoff_h265(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_h265 = -1;
-static int hf_h265_type = -1;
-static int hf_h265_nal_unit_type = -1;
-static int hf_h265_nuh_layer_id = -1;
-static int hf_h265_nuh_temporal_id_plus1 = -1;
-static int hf_h265_nal_f_bit = -1;
-static int hf_h265_start_bit = -1;
-static int hf_h265_end_bit = -1;
-static int hf_h265_rbsp_stop_bit = -1;
-static int hf_h265_rbsp_trailing_bits = -1;
+static int proto_h265;
+static int hf_h265_type;
+static int hf_h265_nal_unit_type;
+static int hf_h265_nuh_layer_id;
+static int hf_h265_nuh_temporal_id_plus1;
+static int hf_h265_nal_f_bit;
+static int hf_h265_start_bit;
+static int hf_h265_end_bit;
+static int hf_h265_rbsp_stop_bit;
+static int hf_h265_rbsp_trailing_bits;
 
 /* SDP */
-static int hf_h265_sdp_parameter_sprop_vps = -1;
-static int hf_h265_sdp_parameter_sprop_sps = -1;
-static int hf_h265_sdp_parameter_sprop_pps = -1;
+static int hf_h265_sdp_parameter_sprop_vps;
+static int hf_h265_sdp_parameter_sprop_sps;
+static int hf_h265_sdp_parameter_sprop_pps;
 
 /*vps*/
-static int hf_h265_vps_video_parameter_set_id = -1;
-static int hf_h265_vps_base_layer_internal_flag = -1;
-static int hf_h265_vps_base_layer_available_flag = -1;
-static int hf_h265_vps_max_layers_minus1 = -1;
-static int hf_h265_vps_max_sub_layers_minus1 = -1;
-static int hf_h265_vps_temporal_id_nesting_flag = -1;
-static int hf_h265_vps_reserved_0xffff_16bits = -1;
-static int hf_h265_vps_sub_layer_ordering_info_present_flag = -1;
-static int hf_h265_vps_max_dec_pic_buffering_minus1 = -1;
-static int hf_h265_vps_max_num_reorder_pics = -1;
-static int hf_h265_vps_max_latency_increase_plus1 = -1;
-static int hf_h265_vps_max_layer_id = -1;
-static int hf_h265_vps_num_layer_sets_minus1 = -1;
-static int hf_h265_layer_id_included_flag = -1;
-static int hf_h265_vps_timing_info_present_flag = -1;
-static int hf_h265_vps_num_units_in_tick = -1;
-static int hf_h265_vps_time_scale = -1;
-static int hf_h265_vps_poc_proportional_to_timing_flag = -1;
-static int hf_h265_vps_num_ticks_poc_diff_one_minus1 = -1;
-static int hf_h265_vps_num_hrd_parameters = -1;
-static int hf_h265_hrd_layer_set_idx = -1;
-static int hf_h265_cprms_present_flag = -1;
-static int hf_h265_vps_extension_flag = -1;
-static int hf_h265_vps_extension_data_flag = -1;
+static int hf_h265_vps_video_parameter_set_id;
+static int hf_h265_vps_base_layer_internal_flag;
+static int hf_h265_vps_base_layer_available_flag;
+static int hf_h265_vps_max_layers_minus1;
+static int hf_h265_vps_max_sub_layers_minus1;
+static int hf_h265_vps_temporal_id_nesting_flag;
+static int hf_h265_vps_reserved_0xffff_16bits;
+static int hf_h265_vps_sub_layer_ordering_info_present_flag;
+static int hf_h265_vps_max_dec_pic_buffering_minus1;
+static int hf_h265_vps_max_num_reorder_pics;
+static int hf_h265_vps_max_latency_increase_plus1;
+static int hf_h265_vps_max_layer_id;
+static int hf_h265_vps_num_layer_sets_minus1;
+static int hf_h265_layer_id_included_flag;
+static int hf_h265_vps_timing_info_present_flag;
+static int hf_h265_vps_num_units_in_tick;
+static int hf_h265_vps_time_scale;
+static int hf_h265_vps_poc_proportional_to_timing_flag;
+static int hf_h265_vps_num_ticks_poc_diff_one_minus1;
+static int hf_h265_vps_num_hrd_parameters;
+static int hf_h265_hrd_layer_set_idx;
+static int hf_h265_cprms_present_flag;
+static int hf_h265_vps_extension_flag;
+static int hf_h265_vps_extension_data_flag;
 
 /* profile_tier_level  */
-static int hf_h265_general_profile_space = -1;
-static int hf_h265_general_tier_flag = -1;
-static int hf_h265_general_profile_idc = -1;
-static int hf_h265_general_profile_compatibility_flags = -1;
-static int hf_h265_general_progressive_source_flag = -1;
-static int hf_h265_general_interlaced_source_flag = -1;
-static int hf_h265_general_non_packed_constraint_flag = -1;
-static int hf_h265_general_frame_only_constraint_flag = -1;
-static int hf_h265_general_max_12bit_constraint_flag = -1;
-static int hf_h265_general_max_10bit_constraint_flag = -1;
-static int hf_h265_general_max_8bit_constraint_flag = -1;
-static int hf_h265_general_max_422chroma_constraint_flag = -1;
-static int hf_h265_general_max_420chroma_constraint_flag = -1;
-static int hf_h265_general_max_monochrome_constraint_flag = -1;
-static int hf_h265_general_intra_constraint_flag = -1;
-static int hf_h265_general_one_picture_only_constraint_flag = -1;
-static int hf_h265_general_lower_bit_rate_constraint_flag = -1;
-static int hf_h265_general_max_14bit_constraint_flag = -1;
-static int hf_h265_general_reserved_zero_33bits = -1;
-static int hf_h265_general_reserved_zero_34bits = -1;
-static int hf_h265_general_reserved_zero_7bits = -1;
-static int hf_h265_general_reserved_zero_35bits = -1;
-static int hf_h265_general_reserved_zero_43bits = -1;
-static int hf_h265_general_inbld_flag = -1;
-static int hf_h265_general_reserved_zero_bit = -1;
-static int hf_h265_general_level_idc = -1;
-static int hf_h265_sub_layer_profile_present_flag = -1;
-static int hf_h265_sub_layer_level_present_flag = -1;
-static int hf_h265_reserved_zero_2bits = -1;
-static int hf_h265_sub_layer_profile_space = -1;
-static int hf_h265_sub_layer_tier_flag = -1;
-static int hf_h265_sub_layer_profile_idc = -1;
-static int hf_h265_sub_layer_profile_compatibility_flag = -1;
-static int hf_h265_sub_layer_progressive_source_flag = -1;
-static int hf_h265_sub_layer_interlaced_source_flag = -1;
-static int hf_h265_sub_layer_non_packed_constraint_flag = -1;
-static int hf_h265_sub_layer_frame_only_constraint_flag = -1;
-static int hf_h265_sub_layer_max_12bit_constraint_flag = -1;
-static int hf_h265_sub_layer_max_10bit_constraint_flag = -1;
-static int hf_h265_sub_layer_max_8bit_constraint_flag = -1;
-static int hf_h265_sub_layer_max_422chroma_constraint_flag = -1;
-static int hf_h265_sub_layer_max_420chroma_constraint_flag = -1;
-static int hf_h265_sub_layer_max_monochrome_constraint_flag = -1;
-static int hf_h265_sub_layer_intra_constraint_flag = -1;
-static int hf_h265_sub_layer_one_picture_only_constraint_flag = -1;
-static int hf_h265_sub_layer_lower_bit_rate_constraint_flag = -1;
-static int hf_h265_sub_layer_max_14bit_constraint_flag = -1;
-static int hf_h265_sub_layer_reserved_zero_33bits = -1;
-static int hf_h265_sub_layer_reserved_zero_34bits = -1;
-static int hf_h265_sub_layer_reserved_zero_7bits = -1;
-static int hf_h265_sub_layer_reserved_zero_35bits = -1;
-static int hf_h265_sub_layer_reserved_zero_43bits = -1;
-static int hf_h265_sub_layer_inbld_flag = -1;
-static int hf_h265_sub_layer_reserved_zero_bit = -1;
-static int hf_h265_sub_layer_level_idc = -1;
+static int hf_h265_general_profile_space;
+static int hf_h265_general_tier_flag;
+static int hf_h265_general_profile_idc;
+static int hf_h265_general_profile_compatibility_flags;
+static int hf_h265_general_progressive_source_flag;
+static int hf_h265_general_interlaced_source_flag;
+static int hf_h265_general_non_packed_constraint_flag;
+static int hf_h265_general_frame_only_constraint_flag;
+static int hf_h265_general_max_12bit_constraint_flag;
+static int hf_h265_general_max_10bit_constraint_flag;
+static int hf_h265_general_max_8bit_constraint_flag;
+static int hf_h265_general_max_422chroma_constraint_flag;
+static int hf_h265_general_max_420chroma_constraint_flag;
+static int hf_h265_general_max_monochrome_constraint_flag;
+static int hf_h265_general_intra_constraint_flag;
+static int hf_h265_general_one_picture_only_constraint_flag;
+static int hf_h265_general_lower_bit_rate_constraint_flag;
+static int hf_h265_general_max_14bit_constraint_flag;
+static int hf_h265_general_reserved_zero_33bits;
+static int hf_h265_general_reserved_zero_34bits;
+static int hf_h265_general_reserved_zero_7bits;
+static int hf_h265_general_reserved_zero_35bits;
+static int hf_h265_general_reserved_zero_43bits;
+static int hf_h265_general_inbld_flag;
+static int hf_h265_general_reserved_zero_bit;
+static int hf_h265_general_level_idc;
+static int hf_h265_sub_layer_profile_present_flag;
+static int hf_h265_sub_layer_level_present_flag;
+static int hf_h265_reserved_zero_2bits;
+static int hf_h265_sub_layer_profile_space;
+static int hf_h265_sub_layer_tier_flag;
+static int hf_h265_sub_layer_profile_idc;
+static int hf_h265_sub_layer_profile_compatibility_flag;
+static int hf_h265_sub_layer_progressive_source_flag;
+static int hf_h265_sub_layer_interlaced_source_flag;
+static int hf_h265_sub_layer_non_packed_constraint_flag;
+static int hf_h265_sub_layer_frame_only_constraint_flag;
+static int hf_h265_sub_layer_max_12bit_constraint_flag;
+static int hf_h265_sub_layer_max_10bit_constraint_flag;
+static int hf_h265_sub_layer_max_8bit_constraint_flag;
+static int hf_h265_sub_layer_max_422chroma_constraint_flag;
+static int hf_h265_sub_layer_max_420chroma_constraint_flag;
+static int hf_h265_sub_layer_max_monochrome_constraint_flag;
+static int hf_h265_sub_layer_intra_constraint_flag;
+static int hf_h265_sub_layer_one_picture_only_constraint_flag;
+static int hf_h265_sub_layer_lower_bit_rate_constraint_flag;
+static int hf_h265_sub_layer_max_14bit_constraint_flag;
+static int hf_h265_sub_layer_reserved_zero_33bits;
+static int hf_h265_sub_layer_reserved_zero_34bits;
+static int hf_h265_sub_layer_reserved_zero_7bits;
+static int hf_h265_sub_layer_reserved_zero_35bits;
+static int hf_h265_sub_layer_reserved_zero_43bits;
+static int hf_h265_sub_layer_inbld_flag;
+static int hf_h265_sub_layer_reserved_zero_bit;
+static int hf_h265_sub_layer_level_idc;
 
 /* hrd_parameters */
-static int hf_h265_nal_hrd_parameters_present_flag = -1;
-static int hf_h265_vcl_hrd_parameters_present_flag = -1;
-static int hf_h265_sub_pic_hrd_params_present_flag = -1;
-static int hf_h265_tick_divisor_minus2 = -1;
-static int hf_h265_du_cpb_removal_delay_increment_length_minus1 = -1;
-static int hf_h265_sub_pic_cpb_params_in_pic_timing_sei_flag = -1;
-static int hf_h265_dpb_output_delay_du_length_minus1 = -1;
-static int hf_h265_bit_rate_scale = -1;
-static int hf_h265_cpb_size_scale = -1;
-static int hf_h265_cpb_size_du_scale = -1;
-static int hf_h265_initial_cpb_removal_delay_length_minus1 = -1;
-static int hf_h265_au_cpb_removal_delay_length_minus1 = -1;
-static int hf_h265_dpb_output_delay_length_minus1 = -1;
-static int hf_h265_fixed_pic_rate_general_flag = -1;
-static int hf_h265_fixed_pic_rate_within_cvs_flag = -1;
-static int hf_h265_elemental_duration_in_tc_minus1 = -1;
-static int hf_h265_low_delay_hrd_flag = -1;
-static int hf_h265_cpb_cnt_minus1 = -1;
+static int hf_h265_nal_hrd_parameters_present_flag;
+static int hf_h265_vcl_hrd_parameters_present_flag;
+static int hf_h265_sub_pic_hrd_params_present_flag;
+static int hf_h265_tick_divisor_minus2;
+static int hf_h265_du_cpb_removal_delay_increment_length_minus1;
+static int hf_h265_sub_pic_cpb_params_in_pic_timing_sei_flag;
+static int hf_h265_dpb_output_delay_du_length_minus1;
+static int hf_h265_bit_rate_scale;
+static int hf_h265_cpb_size_scale;
+static int hf_h265_cpb_size_du_scale;
+static int hf_h265_initial_cpb_removal_delay_length_minus1;
+static int hf_h265_au_cpb_removal_delay_length_minus1;
+static int hf_h265_dpb_output_delay_length_minus1;
+static int hf_h265_fixed_pic_rate_general_flag;
+static int hf_h265_fixed_pic_rate_within_cvs_flag;
+static int hf_h265_elemental_duration_in_tc_minus1;
+static int hf_h265_low_delay_hrd_flag;
+static int hf_h265_cpb_cnt_minus1;
 /* sub-layer hrd_parameters */
-static int hf_h265_bit_rate_value_minus1 = -1;
-static int hf_h265_cpb_size_value_minus1 = -1;
-static int hf_h265_cpb_size_du_value_minus1 = -1;
-static int hf_h265_bit_rate_du_value_minus1 = -1;
-static int hf_h265_cbr_flag = -1;
+static int hf_h265_bit_rate_value_minus1;
+static int hf_h265_cpb_size_value_minus1;
+static int hf_h265_cpb_size_du_value_minus1;
+static int hf_h265_bit_rate_du_value_minus1;
+static int hf_h265_cbr_flag;
 
 /*sps*/
-static int hf_h265_sps_video_parameter_set_id = -1;
-static int hf_h265_sps_max_sub_layers_minus1 = -1;
-static int hf_h265_sps_temporal_id_nesting_flag = -1;
-static int hf_h265_sps_seq_parameter_set_id = -1;
-static int hf_h265_chroma_format_idc = -1;
-static int hf_h265_separate_colour_plane_flag = -1;
-static int hf_h265_pic_width_in_luma_samples = -1;
-static int hf_h265_pic_height_in_luma_samples = -1;
-static int hf_h265_conformance_window_flag = -1;
-static int hf_h265_conf_win_left_offset = -1;
-static int hf_h265_conf_win_right_offset = -1;
-static int hf_h265_conf_win_top_offset = -1;
-static int hf_h265_conf_win_bottom_offset = -1;
-static int hf_h265_bit_depth_luma_minus8 = -1;
-static int hf_h265_bit_depth_chroma_minus8 = -1;
-static int hf_h265_log2_max_pic_order_cnt_lsb_minus4 = -1;
-static int hf_h265_sps_sub_layer_ordering_info_present_flag = -1;
-static int hf_h265_sps_max_dec_pic_buffering_minus1 = -1;
-static int hf_h265_sps_max_num_reorder_pics = -1;
-static int hf_h265_sps_max_latency_increase_plus1 = -1;
-static int hf_h265_log2_min_luma_coding_block_size_minus3 = -1;
-static int hf_h265_log2_diff_max_min_luma_coding_block_size = -1;
-static int hf_h265_log2_min_luma_transform_block_size_minus2 = -1;
-static int hf_h265_log2_diff_max_min_luma_transform_block_size = -1;
-static int hf_h265_max_transform_hierarchy_depth_inter = -1;
-static int hf_h265_max_transform_hierarchy_depth_intra = -1;
-static int hf_h265_scaling_list_enabled_flag = -1;
-static int hf_h265_sps_scaling_list_data_present_flag = -1;
-static int hf_h265_amp_enabled_flag = -1;
-static int hf_h265_sample_adaptive_offset_enabled_flag = -1;
-static int hf_h265_pcm_enabled_flag = -1;
-static int hf_h265_pcm_sample_bit_depth_luma_minus1 = -1;
-static int hf_h265_pcm_sample_bit_depth_chroma_minus1 = -1;
-static int hf_h265_log2_min_pcm_luma_coding_block_size_minus3 = -1;
-static int hf_h265_log2_diff_max_min_pcm_luma_coding_block_size = -1;
-static int hf_h265_pcm_loop_filter_disabled_flag = -1;
-static int hf_h265_num_short_term_ref_pic_sets = -1;
-static int hf_h265_long_term_ref_pics_present_flag = -1;
-static int hf_h265_num_long_term_ref_pics_sps = -1;
-static int hf_h265_lt_ref_pic_poc_lsb_sps = -1;
-static int hf_h265_used_by_curr_pic_lt_sps_flag = -1;
-static int hf_h265_sps_temporal_mvp_enabled_flag = -1;
-static int hf_h265_strong_intra_smoothing_enabled_flag = -1;
-static int hf_h265_vui_parameters_present_flag = -1;
-static int hf_h265_sps_extension_present_flag = -1;
-static int hf_h265_sps_range_extension_flag = -1;
-static int hf_h265_sps_multilayer_extension_flag = -1;
-static int hf_h265_sps_3d_extension_flag = -1;
-static int hf_h265_sps_scc_extension_flag = -1;
-static int hf_h265_sps_extension_4bits = -1;
-static int hf_h265_sps_extension_data_flag = -1;
+static int hf_h265_sps_video_parameter_set_id;
+static int hf_h265_sps_max_sub_layers_minus1;
+static int hf_h265_sps_temporal_id_nesting_flag;
+static int hf_h265_sps_seq_parameter_set_id;
+static int hf_h265_chroma_format_idc;
+static int hf_h265_separate_colour_plane_flag;
+static int hf_h265_pic_width_in_luma_samples;
+static int hf_h265_pic_height_in_luma_samples;
+static int hf_h265_conformance_window_flag;
+static int hf_h265_conf_win_left_offset;
+static int hf_h265_conf_win_right_offset;
+static int hf_h265_conf_win_top_offset;
+static int hf_h265_conf_win_bottom_offset;
+static int hf_h265_bit_depth_luma_minus8;
+static int hf_h265_bit_depth_chroma_minus8;
+static int hf_h265_log2_max_pic_order_cnt_lsb_minus4;
+static int hf_h265_sps_sub_layer_ordering_info_present_flag;
+static int hf_h265_sps_max_dec_pic_buffering_minus1;
+static int hf_h265_sps_max_num_reorder_pics;
+static int hf_h265_sps_max_latency_increase_plus1;
+static int hf_h265_log2_min_luma_coding_block_size_minus3;
+static int hf_h265_log2_diff_max_min_luma_coding_block_size;
+static int hf_h265_log2_min_luma_transform_block_size_minus2;
+static int hf_h265_log2_diff_max_min_luma_transform_block_size;
+static int hf_h265_max_transform_hierarchy_depth_inter;
+static int hf_h265_max_transform_hierarchy_depth_intra;
+static int hf_h265_scaling_list_enabled_flag;
+static int hf_h265_sps_scaling_list_data_present_flag;
+static int hf_h265_amp_enabled_flag;
+static int hf_h265_sample_adaptive_offset_enabled_flag;
+static int hf_h265_pcm_enabled_flag;
+static int hf_h265_pcm_sample_bit_depth_luma_minus1;
+static int hf_h265_pcm_sample_bit_depth_chroma_minus1;
+static int hf_h265_log2_min_pcm_luma_coding_block_size_minus3;
+static int hf_h265_log2_diff_max_min_pcm_luma_coding_block_size;
+static int hf_h265_pcm_loop_filter_disabled_flag;
+static int hf_h265_num_short_term_ref_pic_sets;
+static int hf_h265_long_term_ref_pics_present_flag;
+static int hf_h265_num_long_term_ref_pics_sps;
+static int hf_h265_lt_ref_pic_poc_lsb_sps;
+static int hf_h265_used_by_curr_pic_lt_sps_flag;
+static int hf_h265_sps_temporal_mvp_enabled_flag;
+static int hf_h265_strong_intra_smoothing_enabled_flag;
+static int hf_h265_vui_parameters_present_flag;
+static int hf_h265_sps_extension_present_flag;
+static int hf_h265_sps_range_extension_flag;
+static int hf_h265_sps_multilayer_extension_flag;
+static int hf_h265_sps_3d_extension_flag;
+static int hf_h265_sps_scc_extension_flag;
+static int hf_h265_sps_extension_4bits;
+static int hf_h265_sps_extension_data_flag;
 /* scaling_list_data */
-static int hf_h265_scaling_list_pred_mode_flag = -1;
-static int hf_h265_scaling_list_pred_matrix_id_delta = -1;
-static int hf_h265_scaling_list_dc_coef_minus8 = -1;
-static int hf_h265_scaling_list_delta_coef = -1;
+static int hf_h265_scaling_list_pred_mode_flag;
+static int hf_h265_scaling_list_pred_matrix_id_delta;
+static int hf_h265_scaling_list_dc_coef_minus8;
+static int hf_h265_scaling_list_delta_coef;
 /* st_ref_pic_set */
-static int hf_h265_inter_ref_pic_set_prediction_flag = -1;
-static int hf_h265_delta_idx_minus1 = -1;
-static int hf_h265_delta_rps_sign = -1;
-static int hf_h265_abs_delta_rps_minus1 = -1;
-static int hf_h265_used_by_curr_pic_flag = -1;
-static int hf_h265_use_delta_flag = -1;
-static int hf_h265_num_negative_pics = -1;
-static int hf_h265_num_positive_pics = -1;
-static int hf_h265_delta_poc_s0_minus1 = -1;
-static int hf_h265_used_by_curr_pic_s0_flag = -1;
-static int hf_h265_delta_poc_s1_minus1 = -1;
-static int hf_h265_used_by_curr_pic_s1_flag = -1;
+static int hf_h265_inter_ref_pic_set_prediction_flag;
+static int hf_h265_delta_idx_minus1;
+static int hf_h265_delta_rps_sign;
+static int hf_h265_abs_delta_rps_minus1;
+static int hf_h265_used_by_curr_pic_flag;
+static int hf_h265_use_delta_flag;
+static int hf_h265_num_negative_pics;
+static int hf_h265_num_positive_pics;
+static int hf_h265_delta_poc_s0_minus1;
+static int hf_h265_used_by_curr_pic_s0_flag;
+static int hf_h265_delta_poc_s1_minus1;
+static int hf_h265_used_by_curr_pic_s1_flag;
 /* sps_range_extension */
-static int hf_h265_transform_skip_rotation_enabled_flag = -1;
-static int hf_h265_transform_skip_context_enabled_flag = -1;
-static int hf_h265_implicit_rdpcm_enabled_flag = -1;
-static int hf_h265_explicit_rdpcm_enabled_flag = -1;
-static int hf_h265_extended_precision_processing_flag = -1;
-static int hf_h265_intra_smoothing_disabled_flag = -1;
-static int hf_h265_high_precision_offsets_enabled_flag = -1;
-static int hf_h265_persistent_rice_adaptation_enabled_flag = -1;
-static int hf_h265_cabac_bypass_alignment_enabled_flag = -1;
+static int hf_h265_transform_skip_rotation_enabled_flag;
+static int hf_h265_transform_skip_context_enabled_flag;
+static int hf_h265_implicit_rdpcm_enabled_flag;
+static int hf_h265_explicit_rdpcm_enabled_flag;
+static int hf_h265_extended_precision_processing_flag;
+static int hf_h265_intra_smoothing_disabled_flag;
+static int hf_h265_high_precision_offsets_enabled_flag;
+static int hf_h265_persistent_rice_adaptation_enabled_flag;
+static int hf_h265_cabac_bypass_alignment_enabled_flag;
 /* sps_scc_extension */
-static int hf_h265_sps_curr_pic_ref_enabled_flag = -1;
-static int hf_h265_palette_mode_enabled_flag = -1;
-static int hf_h265_palette_max_size = -1;
-static int hf_h265_delta_palette_max_predictor_size = -1;
-static int hf_h265_sps_palette_predictor_initializers_present_flag = -1;
-static int hf_h265_sps_num_palette_predictor_initializers_minus1 = -1;
-static int hf_h265_sps_palette_predictor_initializer = -1;
-static int hf_h265_motion_vector_resolution_control_idc = -1;
-static int hf_h265_intra_boundary_filtering_disabled_flag = -1;
+static int hf_h265_sps_curr_pic_ref_enabled_flag;
+static int hf_h265_palette_mode_enabled_flag;
+static int hf_h265_palette_max_size;
+static int hf_h265_delta_palette_max_predictor_size;
+static int hf_h265_sps_palette_predictor_initializers_present_flag;
+static int hf_h265_sps_num_palette_predictor_initializers_minus1;
+static int hf_h265_sps_palette_predictor_initializer;
+static int hf_h265_motion_vector_resolution_control_idc;
+static int hf_h265_intra_boundary_filtering_disabled_flag;
 
 /* PPS */
-static int hf_h265_pps_pic_parameter_set_id = -1;
-static int hf_h265_pps_seq_parameter_set_id = -1;
-static int hf_h265_dependent_slice_segments_enabled_flag = -1;
-static int hf_h265_output_flag_present_flag = -1;
-static int hf_h265_num_extra_slice_header_bits = -1;
-static int hf_h265_sign_data_hiding_enabled_flag = -1;
-static int hf_h265_cabac_init_present_flag = -1;
-static int hf_h265_num_ref_idx_l0_default_active_minus1 = -1;
-static int hf_h265_num_ref_idx_l1_default_active_minus1 = -1;
-static int hf_h265_init_qp_minus26 = -1;
-static int hf_h265_constrained_intra_pred_flag = -1;
-static int hf_h265_transform_skip_enabled_flag = -1;
-static int hf_h265_cu_qp_delta_enabled_flag = -1;
-static int hf_h265_diff_cu_qp_delta_depth = -1;
-static int hf_h265_pps_cb_qp_offset = -1;
-static int hf_h265_pps_cr_qp_offset = -1;
-static int hf_h265_pps_slice_chroma_qp_offsets_present_flag = -1;
-static int hf_h265_weighted_pred_flag = -1;
-static int hf_h265_weighted_bipred_flag = -1;
-static int hf_h265_transquant_bypass_enabled_flag = -1;
-static int hf_h265_tiles_enabled_flag = -1;
-static int hf_h265_entropy_coding_sync_enabled_flag = -1;
-static int hf_h265_num_tile_columns_minus1 = -1;
-static int hf_h265_num_tile_rows_minus1 = -1;
-static int hf_h265_uniform_spacing_flag = -1;
-static int hf_h265_column_width_minus1 = -1;
-static int hf_h265_row_height_minus1 = -1;
-static int hf_h265_loop_filter_across_tiles_enabled_flag = -1;
-static int hf_h265_pps_loop_filter_across_slices_enabled_flag = -1;
-static int hf_h265_deblocking_filter_control_present_flag = -1;
-static int hf_h265_deblocking_filter_override_enabled_flag = -1;
-static int hf_h265_pps_deblocking_filter_disabled_flag = -1;
-static int hf_h265_pps_beta_offset_div2 = -1;
-static int hf_h265_pps_tc_offset_div2 = -1;
-static int hf_h265_pps_scaling_list_data_present_flag = -1;
-static int hf_h265_lists_modification_present_flag = -1;
-static int hf_h265_log2_parallel_merge_level_minus2 = -1;
-static int hf_h265_slice_segment_header_extension_present_flag = -1;
-static int hf_h265_pps_extension_present_flag = -1;
-static int hf_h265_pps_range_extension_flag = -1;
-static int hf_h265_pps_multilayer_extension_flag = -1;
-static int hf_h265_pps_3d_extension_flag = -1;
-static int hf_h265_pps_scc_extension_flag = -1;
-static int hf_h265_pps_extension_4bits = -1;
-static int hf_h265_pps_extension_data_flag = -1;
+static int hf_h265_pps_pic_parameter_set_id;
+static int hf_h265_pps_seq_parameter_set_id;
+static int hf_h265_dependent_slice_segments_enabled_flag;
+static int hf_h265_output_flag_present_flag;
+static int hf_h265_num_extra_slice_header_bits;
+static int hf_h265_sign_data_hiding_enabled_flag;
+static int hf_h265_cabac_init_present_flag;
+static int hf_h265_num_ref_idx_l0_default_active_minus1;
+static int hf_h265_num_ref_idx_l1_default_active_minus1;
+static int hf_h265_init_qp_minus26;
+static int hf_h265_constrained_intra_pred_flag;
+static int hf_h265_transform_skip_enabled_flag;
+static int hf_h265_cu_qp_delta_enabled_flag;
+static int hf_h265_diff_cu_qp_delta_depth;
+static int hf_h265_pps_cb_qp_offset;
+static int hf_h265_pps_cr_qp_offset;
+static int hf_h265_pps_slice_chroma_qp_offsets_present_flag;
+static int hf_h265_weighted_pred_flag;
+static int hf_h265_weighted_bipred_flag;
+static int hf_h265_transquant_bypass_enabled_flag;
+static int hf_h265_tiles_enabled_flag;
+static int hf_h265_entropy_coding_sync_enabled_flag;
+static int hf_h265_num_tile_columns_minus1;
+static int hf_h265_num_tile_rows_minus1;
+static int hf_h265_uniform_spacing_flag;
+static int hf_h265_column_width_minus1;
+static int hf_h265_row_height_minus1;
+static int hf_h265_loop_filter_across_tiles_enabled_flag;
+static int hf_h265_pps_loop_filter_across_slices_enabled_flag;
+static int hf_h265_deblocking_filter_control_present_flag;
+static int hf_h265_deblocking_filter_override_enabled_flag;
+static int hf_h265_pps_deblocking_filter_disabled_flag;
+static int hf_h265_pps_beta_offset_div2;
+static int hf_h265_pps_tc_offset_div2;
+static int hf_h265_pps_scaling_list_data_present_flag;
+static int hf_h265_lists_modification_present_flag;
+static int hf_h265_log2_parallel_merge_level_minus2;
+static int hf_h265_slice_segment_header_extension_present_flag;
+static int hf_h265_pps_extension_present_flag;
+static int hf_h265_pps_range_extension_flag;
+static int hf_h265_pps_multilayer_extension_flag;
+static int hf_h265_pps_3d_extension_flag;
+static int hf_h265_pps_scc_extension_flag;
+static int hf_h265_pps_extension_4bits;
+static int hf_h265_pps_extension_data_flag;
 /*pps_range_extension*/
-static int hf_h265_log2_max_transform_skip_block_size_minus2 = -1;
-static int hf_h265_cross_component_prediction_enabled_flag = -1;
-static int hf_h265_chroma_qp_offset_list_enabled_flag = -1;
-static int hf_h265_diff_cu_chroma_qp_offset_depth = -1;
-static int hf_h265_chroma_qp_offset_list_len_minus1 = -1;
-static int hf_h265_cb_qp_offset_list = -1;
-static int hf_h265_cr_qp_offset_list = -1;
-static int hf_h265_log2_sao_offset_scale_luma = -1;
-static int hf_h265_log2_sao_offset_scale_chroma = -1;
+static int hf_h265_log2_max_transform_skip_block_size_minus2;
+static int hf_h265_cross_component_prediction_enabled_flag;
+static int hf_h265_chroma_qp_offset_list_enabled_flag;
+static int hf_h265_diff_cu_chroma_qp_offset_depth;
+static int hf_h265_chroma_qp_offset_list_len_minus1;
+static int hf_h265_cb_qp_offset_list;
+static int hf_h265_cr_qp_offset_list;
+static int hf_h265_log2_sao_offset_scale_luma;
+static int hf_h265_log2_sao_offset_scale_chroma;
 /*pps_scc_extension*/
-static int hf_h265_pps_curr_pic_ref_enabled_flag = -1;
-static int hf_h265_residual_adaptive_colour_transform_enabled_flag = -1;
-static int hf_h265_pps_slice_act_qp_offsets_present_flag = -1;
-static int hf_h265_pps_act_y_qp_offset_plus5 = -1;
-static int hf_h265_pps_act_cb_qp_offset_plus5 = -1;
-static int hf_h265_pps_act_cr_qp_offset_plus3 = -1;
-static int hf_h265_pps_palette_predictor_initializers_present_flag = -1;
-static int hf_h265_pps_num_palette_predictor_initializers = -1;
-static int hf_h265_monochrome_palette_flag = -1;
-static int hf_h265_luma_bit_depth_entry_minus8 = -1;
-static int hf_h265_chroma_bit_depth_entry_minus8 = -1;
-static int hf_h265_pps_palette_predictor_initializer = -1;
+static int hf_h265_pps_curr_pic_ref_enabled_flag;
+static int hf_h265_residual_adaptive_colour_transform_enabled_flag;
+static int hf_h265_pps_slice_act_qp_offsets_present_flag;
+static int hf_h265_pps_act_y_qp_offset_plus5;
+static int hf_h265_pps_act_cb_qp_offset_plus5;
+static int hf_h265_pps_act_cr_qp_offset_plus3;
+static int hf_h265_pps_palette_predictor_initializers_present_flag;
+static int hf_h265_pps_num_palette_predictor_initializers;
+static int hf_h265_monochrome_palette_flag;
+static int hf_h265_luma_bit_depth_entry_minus8;
+static int hf_h265_chroma_bit_depth_entry_minus8;
+static int hf_h265_pps_palette_predictor_initializer;
 
 /* VUI parameters */
-static int hf_h265_aspect_ratio_info_present_flag = -1;
-static int hf_h265_aspect_ratio_idc = -1;
-static int hf_h265_sar_width = -1;
-static int hf_h265_sar_height = -1;
-static int hf_h265_overscan_info_present_flag = -1;
-static int hf_h265_overscan_appropriate_flag = -1;
-static int hf_h265_video_signal_type_present_flag = -1;
-static int hf_h265_video_format = -1;
-static int hf_h265_video_full_range_flag = -1;
-static int hf_h265_colour_description_present_flag = -1;
-static int hf_h265_colour_primaries = -1;
-static int hf_h265_transfer_characteristics = -1;
-static int hf_h265_matrix_coeffs = -1;
-static int hf_h265_chroma_loc_info_present_flag = -1;
-static int hf_h265_chroma_sample_loc_type_top_field = -1;
-static int hf_h265_chroma_sample_loc_type_bottom_field = -1;
-static int hf_h265_neutral_chroma_indication_flag = -1;
-static int hf_h265_field_seq_flag = -1;
-static int hf_h265_frame_field_info_present_flag = -1;
-static int hf_h265_default_display_window_flag = -1;
-static int hf_h265_def_disp_win_left_offset = -1;
-static int hf_h265_def_disp_win_right_offset = -1;
-static int hf_h265_def_disp_win_top_offset = -1;
-static int hf_h265_def_disp_win_bottom_offset = -1;
-static int hf_h265_vui_timing_info_present_flag = -1;
-static int hf_h265_vui_num_units_in_tick = -1;
-static int hf_h265_vui_time_scale = -1;
-static int hf_h265_vui_poc_proportional_to_timing_flag = -1;
-static int hf_h265_vui_num_ticks_poc_diff_one_minus1 = -1;
-static int hf_h265_vui_hrd_parameters_present_flag = -1;
-static int hf_h265_bitstream_restriction_flag = -1;
-static int hf_h265_tiles_fixed_structure_flag = -1;
-static int hf_h265_motion_vectors_over_pic_boundaries_flag = -1;
-static int hf_h265_restricted_ref_pic_lists_flag = -1;
-static int hf_h265_min_spatial_segmentation_idc = -1;
-static int hf_h265_max_bytes_per_pic_denom = -1;
-static int hf_h265_max_bits_per_min_cu_denom = -1;
-static int hf_h265_log2_max_mv_length_horizontal = -1;
-static int hf_h265_log2_max_mv_length_vertical = -1;
+static int hf_h265_aspect_ratio_info_present_flag;
+static int hf_h265_aspect_ratio_idc;
+static int hf_h265_sar_width;
+static int hf_h265_sar_height;
+static int hf_h265_overscan_info_present_flag;
+static int hf_h265_overscan_appropriate_flag;
+static int hf_h265_video_signal_type_present_flag;
+static int hf_h265_video_format;
+static int hf_h265_video_full_range_flag;
+static int hf_h265_colour_description_present_flag;
+static int hf_h265_colour_primaries;
+static int hf_h265_transfer_characteristics;
+static int hf_h265_matrix_coeffs;
+static int hf_h265_chroma_loc_info_present_flag;
+static int hf_h265_chroma_sample_loc_type_top_field;
+static int hf_h265_chroma_sample_loc_type_bottom_field;
+static int hf_h265_neutral_chroma_indication_flag;
+static int hf_h265_field_seq_flag;
+static int hf_h265_frame_field_info_present_flag;
+static int hf_h265_default_display_window_flag;
+static int hf_h265_def_disp_win_left_offset;
+static int hf_h265_def_disp_win_right_offset;
+static int hf_h265_def_disp_win_top_offset;
+static int hf_h265_def_disp_win_bottom_offset;
+static int hf_h265_vui_timing_info_present_flag;
+static int hf_h265_vui_num_units_in_tick;
+static int hf_h265_vui_time_scale;
+static int hf_h265_vui_poc_proportional_to_timing_flag;
+static int hf_h265_vui_num_ticks_poc_diff_one_minus1;
+static int hf_h265_vui_hrd_parameters_present_flag;
+static int hf_h265_bitstream_restriction_flag;
+static int hf_h265_tiles_fixed_structure_flag;
+static int hf_h265_motion_vectors_over_pic_boundaries_flag;
+static int hf_h265_restricted_ref_pic_lists_flag;
+static int hf_h265_min_spatial_segmentation_idc;
+static int hf_h265_max_bytes_per_pic_denom;
+static int hf_h265_max_bits_per_min_cu_denom;
+static int hf_h265_log2_max_mv_length_horizontal;
+static int hf_h265_log2_max_mv_length_vertical;
 
 /* slice_segment_header */
-static int hf_h265_slice_pic_parameter_set_id = -1;
-static int hf_h265_slice_segment_address = -1;
-static int hf_h265_slice_type = -1;
+static int hf_h265_slice_pic_parameter_set_id;
+static int hf_h265_slice_segment_address;
+static int hf_h265_slice_type;
 
 /* SEI */
-static int hf_h265_payloadsize = -1;
-static int hf_h265_payloadtype = -1;
+static int hf_h265_payloadsize;
+static int hf_h265_payloadtype;
 
 /* access unit delimiter */
-static int hf_h265_pic_type = -1;
+static int hf_h265_pic_type;
 
 /* Initialize the subtree pointers */
-static int ett_h265 = -1;
-static int ett_h265_profile = -1;
-static int ett_h265_nal = -1;
-static int ett_h265_fu = -1;
-static int ett_h265_stream = -1;
-
-static int ett_h265_sps_multilayer_extension = -1;
-static int ett_h265_sps_3d_extension = -1;
-static int ett_h265_pps_multilayer_extension = -1;
-static int ett_h265_pps_3d_extension = -1;
-static int ett_h265_access_unit_delimiter_rbsp = -1;
-static int ett_h265_sei_rbsp = -1;
-static int ett_h265_filler_data_rbsp = -1;
-static int ett_h265_end_of_seq_rbsp = -1;
-static int ett_h265_end_of_bitstream_rbsp = -1;
-static int ett_h265_profile_tier_level = -1;
-static int ett_h265_ref_pic_set = -1;
-static int ett_h265_vui_parameters = -1;
-static int ett_h265_hrd_parameters = -1;
-static int ett_h265_sprop_parameters = -1;
-
-static expert_field ei_h265_undecoded = EI_INIT;
-static expert_field ei_h265_format_specific_parameter = EI_INIT;
-static expert_field ei_h265_oversized_exp_golomb_code = EI_INIT;
-static expert_field ei_h265_value_to_large = EI_INIT;
+static int ett_h265;
+static int ett_h265_profile;
+static int ett_h265_nal;
+static int ett_h265_fu;
+static int ett_h265_stream;
+
+static int ett_h265_sps_multilayer_extension;
+static int ett_h265_sps_3d_extension;
+static int ett_h265_pps_multilayer_extension;
+static int ett_h265_pps_3d_extension;
+static int ett_h265_access_unit_delimiter_rbsp;
+static int ett_h265_sei_rbsp;
+static int ett_h265_filler_data_rbsp;
+static int ett_h265_end_of_seq_rbsp;
+static int ett_h265_end_of_bitstream_rbsp;
+static int ett_h265_profile_tier_level;
+static int ett_h265_ref_pic_set;
+static int ett_h265_vui_parameters;
+static int ett_h265_hrd_parameters;
+static int ett_h265_sprop_parameters;
+
+static expert_field ei_h265_undecoded;
+static expert_field ei_h265_format_specific_parameter;
+static expert_field ei_h265_oversized_exp_golomb_code;
+static expert_field ei_h265_value_to_large;
 
 static dissector_handle_t h265_handle;
 
diff --git a/epan/dissectors/packet-hartip.c b/epan/dissectors/packet-hartip.c
index faef1f81db..1f0a048172 100644
--- a/epan/dissectors/packet-hartip.c
+++ b/epan/dissectors/packet-hartip.c
@@ -27,217 +27,217 @@ static dissector_handle_t hartip_udp_handle;
 
 static gboolean hartip_desegment  = TRUE;
 
-static int proto_hartip = -1;
-static int hf_hartip_hdr_version = -1;
-static int hf_hartip_hdr_message_id = -1;
-static int hf_hartip_hdr_message_type = -1;
-static int hf_hartip_hdr_status = -1;
-static int hf_hartip_hdr_transaction_id = -1;
-static int hf_hartip_hdr_msg_length = -1;
-
-static int hf_hartip_data = -1;
-static int hf_hartip_master_type = -1;
-static int hf_hartip_inactivity_close_timer = -1;
-static int hf_hartip_error_code = -1;
-
-static int hf_hartip_pt_preambles = -1;
-static int hf_hartip_pt_delimiter = -1;
-static int hf_hartip_pt_delimiter_frame_type = -1;
-static int hf_hartip_pt_delimiter_physical_layer_type = -1;
-static int hf_hartip_pt_delimiter_number_of_expansion_bytes = -1;
-static int hf_hartip_pt_delimiter_address_type = -1;
-static int hf_hartip_pt_short_addr = -1;
-static int hf_hartip_pt_long_addr = -1;
-static int hf_hartip_pt_expansion_bytes = -1;
-static int hf_hartip_pt_command = -1;
-static int hf_hartip_pt_length = -1;
-static int hf_hartip_pt_response_code = -1;
-static int hf_hartip_pt_device_status = -1;
-static int hf_hartip_pt_payload = -1;
-static int hf_hartip_pt_checksum = -1;
-
-static gint ett_hartip = -1;
-static gint ett_hartip_hdr = -1;
-static gint ett_hartip_body = -1;
-static gint ett_hartip_pt_delimiter = -1;
-
-static expert_field ei_hartip_data_none = EI_INIT;
-static expert_field ei_hartip_data_unexpected = EI_INIT;
+static int proto_hartip;
+static int hf_hartip_hdr_version;
+static int hf_hartip_hdr_message_id;
+static int hf_hartip_hdr_message_type;
+static int hf_hartip_hdr_status;
+static int hf_hartip_hdr_transaction_id;
+static int hf_hartip_hdr_msg_length;
+
+static int hf_hartip_data;
+static int hf_hartip_master_type;
+static int hf_hartip_inactivity_close_timer;
+static int hf_hartip_error_code;
+
+static int hf_hartip_pt_preambles;
+static int hf_hartip_pt_delimiter;
+static int hf_hartip_pt_delimiter_frame_type;
+static int hf_hartip_pt_delimiter_physical_layer_type;
+static int hf_hartip_pt_delimiter_number_of_expansion_bytes;
+static int hf_hartip_pt_delimiter_address_type;
+static int hf_hartip_pt_short_addr;
+static int hf_hartip_pt_long_addr;
+static int hf_hartip_pt_expansion_bytes;
+static int hf_hartip_pt_command;
+static int hf_hartip_pt_length;
+static int hf_hartip_pt_response_code;
+static int hf_hartip_pt_device_status;
+static int hf_hartip_pt_payload;
+static int hf_hartip_pt_checksum;
+
+static gint ett_hartip;
+static gint ett_hartip_hdr;
+static gint ett_hartip_body;
+static gint ett_hartip_pt_delimiter;
+
+static expert_field ei_hartip_data_none;
+static expert_field ei_hartip_data_unexpected;
 
 /* Command 0 response */
-static int hf_hartip_pt_rsp_expansion_code = -1;
-static int hf_hartip_pt_rsp_expanded_device_type = -1;
-static int hf_hartip_pt_rsp_req_min_preambles = -1;
-static int hf_hartip_pt_rsp_hart_protocol_major_rev = -1;
-static int hf_hartip_pt_rsp_device_rev = -1;
-static int hf_hartip_pt_rsp_software_rev = -1;
-static int hf_hartip_pt_rsp_hardware_rev_physical_signal = -1;
-static int hf_hartip_pt_rsp_flage = -1;
-static int hf_hartip_pt_rsp_device_id = -1;
-static int hf_hartip_pt_rsp_rsp_min_preambles = -1;
-static int hf_hartip_pt_rsp_max_device_variables = -1;
-static int hf_hartip_pt_rsp_configuration_change_counter = -1;
-static int hf_hartip_pt_rsp_extended_device_status = -1;
-static int hf_hartip_pt_rsp_manufacturer_Identification_code = -1;
-static int hf_hartip_pt_rsp_private_label = -1;
-static int hf_hartip_pt_rsp_device_profile = -1;
+static int hf_hartip_pt_rsp_expansion_code;
+static int hf_hartip_pt_rsp_expanded_device_type;
+static int hf_hartip_pt_rsp_req_min_preambles;
+static int hf_hartip_pt_rsp_hart_protocol_major_rev;
+static int hf_hartip_pt_rsp_device_rev;
+static int hf_hartip_pt_rsp_software_rev;
+static int hf_hartip_pt_rsp_hardware_rev_physical_signal;
+static int hf_hartip_pt_rsp_flage;
+static int hf_hartip_pt_rsp_device_id;
+static int hf_hartip_pt_rsp_rsp_min_preambles;
+static int hf_hartip_pt_rsp_max_device_variables;
+static int hf_hartip_pt_rsp_configuration_change_counter;
+static int hf_hartip_pt_rsp_extended_device_status;
+static int hf_hartip_pt_rsp_manufacturer_Identification_code;
+static int hf_hartip_pt_rsp_private_label;
+static int hf_hartip_pt_rsp_device_profile;
 
 /* Command 2 response */
-static int hf_hartip_pt_rsp_pv_percent_range = -1;
+static int hf_hartip_pt_rsp_pv_percent_range;
 
 /* Command 3 response */
-static int hf_hartip_pt_rsp_pv_loop_current = -1;
-static int hf_hartip_pt_rsp_pv_units = -1;
-static int hf_hartip_pt_rsp_pv = -1;
-static int hf_hartip_pt_rsp_sv_units = -1;
-static int hf_hartip_pt_rsp_sv = -1;
-static int hf_hartip_pt_rsp_tv_units = -1;
-static int hf_hartip_pt_rsp_tv = -1;
-static int hf_hartip_pt_rsp_qv_units = -1;
-static int hf_hartip_pt_rsp_qv = -1;
+static int hf_hartip_pt_rsp_pv_loop_current;
+static int hf_hartip_pt_rsp_pv_units;
+static int hf_hartip_pt_rsp_pv;
+static int hf_hartip_pt_rsp_sv_units;
+static int hf_hartip_pt_rsp_sv;
+static int hf_hartip_pt_rsp_tv_units;
+static int hf_hartip_pt_rsp_tv;
+static int hf_hartip_pt_rsp_qv_units;
+static int hf_hartip_pt_rsp_qv;
 
 /* Command 7 response*/
-static int hf_hartip_pt_rsp_loop_current_mode = -1;
+static int hf_hartip_pt_rsp_loop_current_mode;
 
 /* Command 8 response*/
-static int hf_hartip_pt_rsp_primary_var_classify = -1;
-static int hf_hartip_pt_rsp_secondary_var_classify = -1;
-static int hf_hartip_pt_rsp_tertiary_var_classify = -1;
-static int hf_hartip_pt_rsp_quaternary_var_classify = -1;
+static int hf_hartip_pt_rsp_primary_var_classify;
+static int hf_hartip_pt_rsp_secondary_var_classify;
+static int hf_hartip_pt_rsp_tertiary_var_classify;
+static int hf_hartip_pt_rsp_quaternary_var_classify;
 
 /* Command 9 response */
-static int hf_hartip_pt_rsp_slot0_device_var = -1;
-static int hf_hartip_pt_rsp_slot0_device_var_classify = -1;
-static int hf_hartip_pt_rsp_slot0_units = -1;
-static int hf_hartip_pt_rsp_slot0_device_var_value = -1;
-static int hf_hartip_pt_rsp_slot0_device_var_status = -1;
-
-static int hf_hartip_pt_rsp_slot1_device_var = -1;
-static int hf_hartip_pt_rsp_slot1_device_var_classify = -1;
-static int hf_hartip_pt_rsp_slot1_units = -1;
-static int hf_hartip_pt_rsp_slot1_device_var_value = -1;
-static int hf_hartip_pt_rsp_slot1_device_var_status = -1;
-
-static int hf_hartip_pt_rsp_slot2_device_var = -1;
-static int hf_hartip_pt_rsp_slot2_device_var_classify = -1;
-static int hf_hartip_pt_rsp_slot2_units = -1;
-static int hf_hartip_pt_rsp_slot2_device_var_value = -1;
-static int hf_hartip_pt_rsp_slot2_device_var_status = -1;
-
-static int hf_hartip_pt_rsp_slot3_device_var = -1;
-static int hf_hartip_pt_rsp_slot3_device_var_classify = -1;
-static int hf_hartip_pt_rsp_slot3_units = -1;
-static int hf_hartip_pt_rsp_slot3_device_var_value = -1;
-static int hf_hartip_pt_rsp_slot3_device_var_status = -1;
-
-static int hf_hartip_pt_rsp_slot4_device_var = -1;
-static int hf_hartip_pt_rsp_slot4_device_var_classify = -1;
-static int hf_hartip_pt_rsp_slot4_units = -1;
-static int hf_hartip_pt_rsp_slot4_device_var_value = -1;
-static int hf_hartip_pt_rsp_slot4_device_var_status = -1;
-
-static int hf_hartip_pt_rsp_slot5_device_var = -1;
-static int hf_hartip_pt_rsp_slot5_device_var_classify = -1;
-static int hf_hartip_pt_rsp_slot5_units = -1;
-static int hf_hartip_pt_rsp_slot5_device_var_value = -1;
-static int hf_hartip_pt_rsp_slot5_device_var_status = -1;
-
-static int hf_hartip_pt_rsp_slot6_device_var = -1;
-static int hf_hartip_pt_rsp_slot6_device_var_classify = -1;
-static int hf_hartip_pt_rsp_slot6_units = -1;
-static int hf_hartip_pt_rsp_slot6_device_var_value = -1;
-static int hf_hartip_pt_rsp_slot6_device_var_status = -1;
-
-static int hf_hartip_pt_rsp_slot7_device_var = -1;
-static int hf_hartip_pt_rsp_slot7_device_var_classify = -1;
-static int hf_hartip_pt_rsp_slot7_units = -1;
-static int hf_hartip_pt_rsp_slot7_device_var_value = -1;
-static int hf_hartip_pt_rsp_slot7_device_var_status = -1;
-
-static int hf_hartip_pt_rsp_slot0_timestamp = -1;
+static int hf_hartip_pt_rsp_slot0_device_var;
+static int hf_hartip_pt_rsp_slot0_device_var_classify;
+static int hf_hartip_pt_rsp_slot0_units;
+static int hf_hartip_pt_rsp_slot0_device_var_value;
+static int hf_hartip_pt_rsp_slot0_device_var_status;
+
+static int hf_hartip_pt_rsp_slot1_device_var;
+static int hf_hartip_pt_rsp_slot1_device_var_classify;
+static int hf_hartip_pt_rsp_slot1_units;
+static int hf_hartip_pt_rsp_slot1_device_var_value;
+static int hf_hartip_pt_rsp_slot1_device_var_status;
+
+static int hf_hartip_pt_rsp_slot2_device_var;
+static int hf_hartip_pt_rsp_slot2_device_var_classify;
+static int hf_hartip_pt_rsp_slot2_units;
+static int hf_hartip_pt_rsp_slot2_device_var_value;
+static int hf_hartip_pt_rsp_slot2_device_var_status;
+
+static int hf_hartip_pt_rsp_slot3_device_var;
+static int hf_hartip_pt_rsp_slot3_device_var_classify;
+static int hf_hartip_pt_rsp_slot3_units;
+static int hf_hartip_pt_rsp_slot3_device_var_value;
+static int hf_hartip_pt_rsp_slot3_device_var_status;
+
+static int hf_hartip_pt_rsp_slot4_device_var;
+static int hf_hartip_pt_rsp_slot4_device_var_classify;
+static int hf_hartip_pt_rsp_slot4_units;
+static int hf_hartip_pt_rsp_slot4_device_var_value;
+static int hf_hartip_pt_rsp_slot4_device_var_status;
+
+static int hf_hartip_pt_rsp_slot5_device_var;
+static int hf_hartip_pt_rsp_slot5_device_var_classify;
+static int hf_hartip_pt_rsp_slot5_units;
+static int hf_hartip_pt_rsp_slot5_device_var_value;
+static int hf_hartip_pt_rsp_slot5_device_var_status;
+
+static int hf_hartip_pt_rsp_slot6_device_var;
+static int hf_hartip_pt_rsp_slot6_device_var_classify;
+static int hf_hartip_pt_rsp_slot6_units;
+static int hf_hartip_pt_rsp_slot6_device_var_value;
+static int hf_hartip_pt_rsp_slot6_device_var_status;
+
+static int hf_hartip_pt_rsp_slot7_device_var;
+static int hf_hartip_pt_rsp_slot7_device_var_classify;
+static int hf_hartip_pt_rsp_slot7_units;
+static int hf_hartip_pt_rsp_slot7_device_var_value;
+static int hf_hartip_pt_rsp_slot7_device_var_status;
+
+static int hf_hartip_pt_rsp_slot0_timestamp;
 
 /* Command 13 response */
-static int hf_hartip_pt_rsp_packed_descriptor = -1;
-static int hf_hartip_pt_rsp_day = -1;
-static int hf_hartip_pt_rsp_month = -1;
-static int hf_hartip_pt_rsp_year = -1;
+static int hf_hartip_pt_rsp_packed_descriptor;
+static int hf_hartip_pt_rsp_day;
+static int hf_hartip_pt_rsp_month;
+static int hf_hartip_pt_rsp_year;
 
 /* Command 14 response */
-static int hf_hartip_pt_rsp_transducer_serial_number = -1;
-static int hf_hartip_pt_rsp_transducer_limit_min_span_units = -1;
-static int hf_hartip_pt_rsp_upper_transducer_limit = -1;
-static int hf_hartip_pt_rsp_lower_transducer_limit = -1;
-static int hf_hartip_pt_rsp_minimum_span = -1;
+static int hf_hartip_pt_rsp_transducer_serial_number;
+static int hf_hartip_pt_rsp_transducer_limit_min_span_units;
+static int hf_hartip_pt_rsp_upper_transducer_limit;
+static int hf_hartip_pt_rsp_lower_transducer_limit;
+static int hf_hartip_pt_rsp_minimum_span;
 
 /* Command 15 response */
-static int hf_hartip_pt_rsp_pv_alarm_selection_code = -1;
-static int hf_hartip_pt_rsp_pv_transfer_function_code = -1;
-static int hf_hartip_pt_rsp_pv_upper_and_lower_range_values_units = -1;
-static int hf_hartip_pt_rsp_pv_upper_range_value = -1;
-static int hf_hartip_pt_rsp_pv_lower_range_value = -1;
-static int hf_hartip_pt_rsp_pv_damping_value = -1;
-static int hf_hartip_pt_rsp_write_protect_code = -1;
-static int hf_hartip_pt_rsp_reserved = -1;
-static int hf_hartip_pt_rsp_pv_analog_channel_flags = -1;
+static int hf_hartip_pt_rsp_pv_alarm_selection_code;
+static int hf_hartip_pt_rsp_pv_transfer_function_code;
+static int hf_hartip_pt_rsp_pv_upper_and_lower_range_values_units;
+static int hf_hartip_pt_rsp_pv_upper_range_value;
+static int hf_hartip_pt_rsp_pv_lower_range_value;
+static int hf_hartip_pt_rsp_pv_damping_value;
+static int hf_hartip_pt_rsp_write_protect_code;
+static int hf_hartip_pt_rsp_reserved;
+static int hf_hartip_pt_rsp_pv_analog_channel_flags;
 
 /* Command 16 and 19 response */
-static int hf_hartip_pt_rsp_final_assembly_number = -1;
+static int hf_hartip_pt_rsp_final_assembly_number;
 
 /* response Tag */
-static int hf_hartip_pt_rsp_tag = -1;
+static int hf_hartip_pt_rsp_tag;
 
 /* response Message */
-static int hf_hartip_pt_rsp_message = -1;
+static int hf_hartip_pt_rsp_message;
 
 /* Command 48 response */
-static int hf_hartip_pt_rsp_device_sp_status = -1;
-static int hf_hartip_pt_rsp_device_op_mode = -1;
-static int hf_hartip_pt_rsp_standardized_status_0 = -1;
-static int hf_hartip_pt_rsp_standardized_status_1 = -1;
-static int hf_hartip_pt_rsp_analog_channel_saturated = -1;
-static int hf_hartip_pt_rsp_standardized_status_2 = -1;
-static int hf_hartip_pt_rsp_standardized_status_3 = -1;
-static int hf_hartip_pt_rsp_analog_channel_fixed = -1;
+static int hf_hartip_pt_rsp_device_sp_status;
+static int hf_hartip_pt_rsp_device_op_mode;
+static int hf_hartip_pt_rsp_standardized_status_0;
+static int hf_hartip_pt_rsp_standardized_status_1;
+static int hf_hartip_pt_rsp_analog_channel_saturated;
+static int hf_hartip_pt_rsp_standardized_status_2;
+static int hf_hartip_pt_rsp_standardized_status_3;
+static int hf_hartip_pt_rsp_analog_channel_fixed;
 
 /* Command 77 response */
-static int hf_hartip_pt_rsp_io_card = -1;
-static int hf_hartip_pt_rsp_channel = -1;
-static int hf_hartip_pt_req_tx_preamble_count = -1;
-static int hf_hartip_pt_rsp_embedded_cmd_delimiter = -1;
-static int hf_hartip_pt_rsp_poll_address = -1;
-static int hf_hartip_pt_rsp_unique_id = -1;
-static int hf_hartip_pt_rsp_embedded_cmd = -1;
+static int hf_hartip_pt_rsp_io_card;
+static int hf_hartip_pt_rsp_channel;
+static int hf_hartip_pt_req_tx_preamble_count;
+static int hf_hartip_pt_rsp_embedded_cmd_delimiter;
+static int hf_hartip_pt_rsp_poll_address;
+static int hf_hartip_pt_rsp_unique_id;
+static int hf_hartip_pt_rsp_embedded_cmd;
 
 /* Command 31 and 178 response */
-static int hf_hartip_pt_rsp_number_of_commands = -1;
-static int hf_hartip_pt_rsp_command_number = -1;
-static int hf_hartip_pt_rsp_command_byte_count = -1;
+static int hf_hartip_pt_rsp_number_of_commands;
+static int hf_hartip_pt_rsp_command_number;
+static int hf_hartip_pt_rsp_command_byte_count;
 
 /* Command 31, 77 and 178 response */
-static int hf_hartip_pt_rsp_data = -1;
+static int hf_hartip_pt_rsp_data;
 
 /*Command 203 response*/
-static int hf_hartip_pt_rsp_index_of_first_discrete_var = -1;
-static int hf_hartip_pt_rsp_number_of_discrete_vars = -1;
-static int hf_hartip_pt_rsp_timestamp_for_most_recent_discrete_change = -1;
+static int hf_hartip_pt_rsp_index_of_first_discrete_var;
+static int hf_hartip_pt_rsp_number_of_discrete_vars;
+static int hf_hartip_pt_rsp_timestamp_for_most_recent_discrete_change;
 
-static int hf_hartip_pt_rsp_slot0_discrete_var_state = -1;
-static int hf_hartip_pt_rsp_slot0_discrete_var_status = -1;
+static int hf_hartip_pt_rsp_slot0_discrete_var_state;
+static int hf_hartip_pt_rsp_slot0_discrete_var_status;
 
-static int hf_hartip_pt_rsp_slot1_discrete_var_state = -1;
-static int hf_hartip_pt_rsp_slot1_discrete_var_status = -1;
+static int hf_hartip_pt_rsp_slot1_discrete_var_state;
+static int hf_hartip_pt_rsp_slot1_discrete_var_status;
 
-static int hf_hartip_pt_rsp_slot2_discrete_var_state = -1;
-static int hf_hartip_pt_rsp_slot2_discrete_var_status = -1;
+static int hf_hartip_pt_rsp_slot2_discrete_var_state;
+static int hf_hartip_pt_rsp_slot2_discrete_var_status;
 
-static int hf_hartip_pt_rsp_slot3_discrete_var_state = -1;
-static int hf_hartip_pt_rsp_slot3_discrete_var_status = -1;
+static int hf_hartip_pt_rsp_slot3_discrete_var_state;
+static int hf_hartip_pt_rsp_slot3_discrete_var_status;
 
-static int hf_hartip_pt_rsp_slot4_discrete_var_state = -1;
-static int hf_hartip_pt_rsp_slot4_discrete_var_status = -1;
+static int hf_hartip_pt_rsp_slot4_discrete_var_state;
+static int hf_hartip_pt_rsp_slot4_discrete_var_status;
 
-static int hf_hartip_pt_rsp_slot5_discrete_var_state = -1;
-static int hf_hartip_pt_rsp_slot5_discrete_var_status = -1;
+static int hf_hartip_pt_rsp_slot5_discrete_var_state;
+static int hf_hartip_pt_rsp_slot5_discrete_var_status;
 
 #define HARTIP_HEADER_LENGTH     8
 #define HARTIP_PORT           5094
diff --git a/epan/dissectors/packet-hazelcast.c b/epan/dissectors/packet-hazelcast.c
index fae29803a0..e087d89714 100644
--- a/epan/dissectors/packet-hazelcast.c
+++ b/epan/dissectors/packet-hazelcast.c
@@ -29,37 +29,37 @@ void proto_reg_handoff_hazelcast(void);
 
 static dissector_handle_t hazelcast_handle;
 
-static int proto_hazelcast = -1;
+static int proto_hazelcast;
 static int hazelcast_tap = -1;
 
-static int hf_hazelcast_headerLength = -1;
-static int hf_hazelcast_headerKeyLength = -1;
-static int hf_hazelcast_headerValueLength = -1;
-static int hf_hazelcast_headerVersion = -1;
-
-static int hf_hazelcast_operation = -1;
-static int hf_hazelcast_blockID = -1;
-static int hf_hazelcast_threadID = -1;
-static int hf_hazelcast_timeout = -1;
-static int hf_hazelcast_ttl = -1;
-static int hf_hazelcast_txnID = -1;
-static int hf_hazelcast_longValue = -1;
-static int hf_hazelcast_version = -1;
-static int hf_hazelcast_lockCount = -1;
-static int hf_hazelcast_lockAddrIP = -1;
-static int hf_hazelcast_lockAddrPort = -1;
-static int hf_hazelcast_callID = -1;
-static int hf_hazelcast_responseType = -1;
-static int hf_hazelcast_nameLength = -1;
-static int hf_hazelcast_name = -1;
-static int hf_hazelcast_indexCount = -1;
-static int hf_hazelcast_keyPartitionHash = -1;
-static int hf_hazelcast_valuePartitionHash = -1;
-static int hf_hazelcast_keys = -1;
-static int hf_hazelcast_values = -1;
+static int hf_hazelcast_headerLength;
+static int hf_hazelcast_headerKeyLength;
+static int hf_hazelcast_headerValueLength;
+static int hf_hazelcast_headerVersion;
+
+static int hf_hazelcast_operation;
+static int hf_hazelcast_blockID;
+static int hf_hazelcast_threadID;
+static int hf_hazelcast_timeout;
+static int hf_hazelcast_ttl;
+static int hf_hazelcast_txnID;
+static int hf_hazelcast_longValue;
+static int hf_hazelcast_version;
+static int hf_hazelcast_lockCount;
+static int hf_hazelcast_lockAddrIP;
+static int hf_hazelcast_lockAddrPort;
+static int hf_hazelcast_callID;
+static int hf_hazelcast_responseType;
+static int hf_hazelcast_nameLength;
+static int hf_hazelcast_name;
+static int hf_hazelcast_indexCount;
+static int hf_hazelcast_keyPartitionHash;
+static int hf_hazelcast_valuePartitionHash;
+static int hf_hazelcast_keys;
+static int hf_hazelcast_values;
 
 /* flags */
-static int hf_hazelcast_flags = -1;
+static int hf_hazelcast_flags;
 
 #define HAZELCAST_LOCKCOUNT_FLAG        (1 << 0)
 #define HAZELCAST_TIMEOUT_FLAG          (1 << 1)
@@ -70,18 +70,18 @@ static int hf_hazelcast_flags = -1;
 #define HAZELCAST_CLIENT_FLAG           (1 << 6)
 #define HAZELCAST_LOCKADDRNULL_FLAG     (1 << 7)
 
-static int hf_hazelcast_flags_lockCount = -1;
-static int hf_hazelcast_flags_timeout = -1;
-static int hf_hazelcast_flags_ttl = -1;
-static int hf_hazelcast_flags_txn = -1;
-static int hf_hazelcast_flags_longValue = -1;
-static int hf_hazelcast_flags_version = -1;
-static int hf_hazelcast_flags_client = -1;
-static int hf_hazelcast_flags_lockAddrNull = -1;
+static int hf_hazelcast_flags_lockCount;
+static int hf_hazelcast_flags_timeout;
+static int hf_hazelcast_flags_ttl;
+static int hf_hazelcast_flags_txn;
+static int hf_hazelcast_flags_longValue;
+static int hf_hazelcast_flags_version;
+static int hf_hazelcast_flags_client;
+static int hf_hazelcast_flags_lockAddrNull;
 
 
-static gint ett_hazelcast = -1;
-static gint ett_hazelcast_flags = -1;
+static gint ett_hazelcast;
+static gint ett_hazelcast_flags;
 
 /* prefs */
 static gboolean hazelcast_desegment = TRUE;
diff --git a/epan/dissectors/packet-hci_h1.c b/epan/dissectors/packet-hci_h1.c
index f0cd09eea1..acfc5810f1 100644
--- a/epan/dissectors/packet-hci_h1.c
+++ b/epan/dissectors/packet-hci_h1.c
@@ -15,11 +15,11 @@
 
 #include "packet-bluetooth.h"
 
-static int proto_hci_h1 = -1;
+static int proto_hci_h1;
 
-static int hf_hci_h1_direction = -1;
+static int hf_hci_h1_direction;
 
-static gint ett_hci_h1 = -1;
+static gint ett_hci_h1;
 
 static dissector_table_t hci_h1_table;
 
diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c
index c35e08b3ec..5fda59cdda 100644
--- a/epan/dissectors/packet-hci_h4.c
+++ b/epan/dissectors/packet-hci_h4.c
@@ -20,11 +20,11 @@
 #include <wiretap/wtap.h>
 #include "packet-bluetooth.h"
 
-static int proto_hci_h4 = -1;
-static int hf_hci_h4_type = -1;
-static int hf_hci_h4_direction = -1;
+static int proto_hci_h4;
+static int hf_hci_h4_type;
+static int hf_hci_h4_direction;
 
-static gint ett_hci_h4 = -1;
+static gint ett_hci_h4;
 
 static dissector_handle_t hci_h4_handle;
 
diff --git a/epan/dissectors/packet-hci_mon.c b/epan/dissectors/packet-hci_mon.c
index 1f5d239439..0fb54e7953 100644
--- a/epan/dissectors/packet-hci_mon.c
+++ b/epan/dissectors/packet-hci_mon.c
@@ -19,34 +19,34 @@
 
 #include "packet-bluetooth.h"
 
-static int proto_hci_mon = -1;
-
-static int hf_adapter_id = -1;
-static int hf_opcode = -1;
-static int hf_type = -1;
-static int hf_bus = -1;
-static int hf_bd_addr = -1;
-static int hf_name = -1;
-static int hf_manufacturer = -1;
-static int hf_system_note = -1;
-static int hf_priority = -1;
-static int hf_ident_length = -1;
-static int hf_ident = -1;
-static int hf_message = -1;
-static int hf_cookie = -1;
-static int hf_format = -1;
-static int hf_version = -1;
-static int hf_revision = -1;
-static int hf_flags = -1;
-static int hf_flags_trusted_socket = -1;
-static int hf_command_length = -1;
-static int hf_command = -1;
-static int hf_event = -1;
-
-static gint ett_hci_mon = -1;
-static gint ett_flags = -1;
-
-static expert_field ei_unknown_data = EI_INIT;
+static int proto_hci_mon;
+
+static int hf_adapter_id;
+static int hf_opcode;
+static int hf_type;
+static int hf_bus;
+static int hf_bd_addr;
+static int hf_name;
+static int hf_manufacturer;
+static int hf_system_note;
+static int hf_priority;
+static int hf_ident_length;
+static int hf_ident;
+static int hf_message;
+static int hf_cookie;
+static int hf_format;
+static int hf_version;
+static int hf_revision;
+static int hf_flags;
+static int hf_flags_trusted_socket;
+static int hf_command_length;
+static int hf_command;
+static int hf_event;
+
+static gint ett_hci_mon;
+static gint ett_flags;
+
+static expert_field ei_unknown_data;
 
 static wmem_tree_t *adapter_to_disconnect_in_frame = NULL;
 
diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c
index e36ad35ad5..2b25560ab9 100644
--- a/epan/dissectors/packet-hci_usb.c
+++ b/epan/dissectors/packet-hci_usb.c
@@ -19,30 +19,30 @@
 #include "packet-bluetooth.h"
 #include "packet-usb.h"
 
-static int proto_hci_usb = -1;
-static int hf_bthci_usb_data = -1;
-static int hf_bthci_usb_packet_fragment = -1;
-static int hf_bthci_usb_packet_complete = -1;
-static int hf_bthci_usb_packet_unknown_fragment = -1;
-static int hf_bthci_usb_setup_request = -1;
-static int hf_bthci_usb_setup_value = -1;
-static int hf_bthci_usb_setup_adapter_id = -1;
-static int hf_bthci_usb_setup_length = -1;
-
-static gint ett_hci_usb = -1;
-static gint ett_hci_usb_msg_fragment = -1;
-static gint ett_hci_usb_msg_fragments = -1;
-
-static int hf_msg_fragments = -1;
-static int hf_msg_fragment = -1;
-static int hf_msg_fragment_overlap = -1;
-static int hf_msg_fragment_overlap_conflicts = -1;
-static int hf_msg_fragment_multiple_tails = -1;
-static int hf_msg_fragment_too_long_fragment = -1;
-static int hf_msg_fragment_error = -1;
-static int hf_msg_fragment_count = -1;
-static int hf_msg_reassembled_in = -1;
-static int hf_msg_reassembled_length = -1;
+static int proto_hci_usb;
+static int hf_bthci_usb_data;
+static int hf_bthci_usb_packet_fragment;
+static int hf_bthci_usb_packet_complete;
+static int hf_bthci_usb_packet_unknown_fragment;
+static int hf_bthci_usb_setup_request;
+static int hf_bthci_usb_setup_value;
+static int hf_bthci_usb_setup_adapter_id;
+static int hf_bthci_usb_setup_length;
+
+static gint ett_hci_usb;
+static gint ett_hci_usb_msg_fragment;
+static gint ett_hci_usb_msg_fragments;
+
+static int hf_msg_fragments;
+static int hf_msg_fragment;
+static int hf_msg_fragment_overlap;
+static int hf_msg_fragment_overlap_conflicts;
+static int hf_msg_fragment_multiple_tails;
+static int hf_msg_fragment_too_long_fragment;
+static int hf_msg_fragment_error;
+static int hf_msg_fragment_count;
+static int hf_msg_reassembled_in;
+static int hf_msg_reassembled_length;
 
 static wmem_tree_t *fragment_info_table = NULL;
 
diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c
index 088ba85e2f..da64335fe1 100644
--- a/epan/dissectors/packet-hclnfsd.c
+++ b/epan/dissectors/packet-hclnfsd.c
@@ -41,60 +41,60 @@ void proto_reg_handoff_hclnfsd(void);
 #define HCLNFSDPROC_CANCEL_PRJOB      32
 #define HCLNFSDPROC_ZAP_LOCKS	     105
 
-static int proto_hclnfsd = -1;
-static int hf_hclnfsd_procedure_v1 = -1;
-static int hf_hclnfsd_request_type = -1;
-static int hf_hclnfsd_device = -1;
-/* static int hf_hclnfsd_login = -1; */
-static int hf_hclnfsd_lockname = -1;
-static int hf_hclnfsd_unknown_data = -1;
-static int hf_hclnfsd_lockowner = -1;
-static int hf_hclnfsd_printername = -1;
-static int hf_hclnfsd_filename = -1;
-static int hf_hclnfsd_fileext = -1;
-static int hf_hclnfsd_grpname = -1;
-static int hf_hclnfsd_hostname = -1;
-static int hf_hclnfsd_username = -1;
-static int hf_hclnfsd_queuename = -1;
-static int hf_hclnfsd_queuecomment = -1;
-static int hf_hclnfsd_queuestatus = -1;
-static int hf_hclnfsd_numphysicalprinters = -1;
-static int hf_hclnfsd_printqueuenumber = -1;
-static int hf_hclnfsd_printparams = -1;
-static int hf_hclnfsd_status = -1;
-static int hf_hclnfsd_sequence = -1;
-static int hf_hclnfsd_server_ip = -1;
-static int hf_hclnfsd_host_ip = -1;
-static int hf_hclnfsd_gid = -1;
-static int hf_hclnfsd_uid = -1;
-static int hf_hclnfsd_cookie = -1;
-static int hf_hclnfsd_mode = -1;
-static int hf_hclnfsd_access = -1;
-static int hf_hclnfsd_exclusive = -1;
-static int hf_hclnfsd_offset = -1;
-static int hf_hclnfsd_length = -1;
-static int hf_hclnfsd_jobstatus = -1;
-static int hf_hclnfsd_timesubmitted = -1;
-static int hf_hclnfsd_size = -1;
-static int hf_hclnfsd_copies = -1;
-static int hf_hclnfsd_auth_ident_obscure = -1;
+static int proto_hclnfsd;
+static int hf_hclnfsd_procedure_v1;
+static int hf_hclnfsd_request_type;
+static int hf_hclnfsd_device;
+/* static int hf_hclnfsd_login; */
+static int hf_hclnfsd_lockname;
+static int hf_hclnfsd_unknown_data;
+static int hf_hclnfsd_lockowner;
+static int hf_hclnfsd_printername;
+static int hf_hclnfsd_filename;
+static int hf_hclnfsd_fileext;
+static int hf_hclnfsd_grpname;
+static int hf_hclnfsd_hostname;
+static int hf_hclnfsd_username;
+static int hf_hclnfsd_queuename;
+static int hf_hclnfsd_queuecomment;
+static int hf_hclnfsd_queuestatus;
+static int hf_hclnfsd_numphysicalprinters;
+static int hf_hclnfsd_printqueuenumber;
+static int hf_hclnfsd_printparams;
+static int hf_hclnfsd_status;
+static int hf_hclnfsd_sequence;
+static int hf_hclnfsd_server_ip;
+static int hf_hclnfsd_host_ip;
+static int hf_hclnfsd_gid;
+static int hf_hclnfsd_uid;
+static int hf_hclnfsd_cookie;
+static int hf_hclnfsd_mode;
+static int hf_hclnfsd_access;
+static int hf_hclnfsd_exclusive;
+static int hf_hclnfsd_offset;
+static int hf_hclnfsd_length;
+static int hf_hclnfsd_jobstatus;
+static int hf_hclnfsd_timesubmitted;
+static int hf_hclnfsd_size;
+static int hf_hclnfsd_copies;
+static int hf_hclnfsd_auth_ident_obscure;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_hclnfsd_job_id = -1;
-static int hf_hclnfsd_print_queues = -1;
-static int hf_hclnfsd_print_jobs = -1;
-static int hf_hclnfsd_gids = -1;
-static int hf_hclnfsd_uids = -1;
-static int hf_hclnfsd_password = -1;
-
-static gint ett_hclnfsd = -1;
-static gint ett_hclnfsd_gids = -1;
-static gint ett_hclnfsd_groups = -1;
-static gint ett_hclnfsd_uids = -1;
-static gint ett_hclnfsd_usernames = -1;
-static gint ett_hclnfsd_printqueues = -1;
-static gint ett_hclnfsd_printjob = -1;
-static gint ett_hclnfsd_auth_ident = -1;
+static int hf_hclnfsd_job_id;
+static int hf_hclnfsd_print_queues;
+static int hf_hclnfsd_print_jobs;
+static int hf_hclnfsd_gids;
+static int hf_hclnfsd_uids;
+static int hf_hclnfsd_password;
+
+static gint ett_hclnfsd;
+static gint ett_hclnfsd_gids;
+static gint ett_hclnfsd_groups;
+static gint ett_hclnfsd_uids;
+static gint ett_hclnfsd_usernames;
+static gint ett_hclnfsd_printqueues;
+static gint ett_hclnfsd_printjob;
+static gint ett_hclnfsd_auth_ident;
 
 static int
 dissect_hclnfsd_gids(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
diff --git a/epan/dissectors/packet-hcrt.c b/epan/dissectors/packet-hcrt.c
index 238ab3b2e1..e72b2462e8 100644
--- a/epan/dissectors/packet-hcrt.c
+++ b/epan/dissectors/packet-hcrt.c
@@ -18,35 +18,35 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 
-static int proto_hcrt = -1;
+static int proto_hcrt;
 
 #define HCRT_UDP_PORTS_DEFAULT "47000"
 
 static guint ethertype_pref = 0xf052;
 
-static int hf_hcrt_header = -1;
-static int hf_hcrt_message_tag = -1;
-static int hf_hcrt_message_type = -1;
-static int hf_hcrt_am = -1;
-static int hf_hcrt_do = -1;
-static int hf_hcrt_1st_dword_enable = -1;
-static int hf_hcrt_last_dword_enable = -1;
-static int hf_hcrt_resp_code = -1;
-static int hf_hcrt_adl = -1;
-static int hf_hcrt_last = -1;
-static int hf_hcrt_body = -1;
-static int hf_hcrt_addr_32 = -1;
-static int hf_hcrt_addr_64 = -1;
-static int hf_hcrt_data_32 = -1;
-static int hf_hcrt_data_64 = -1;
-static int hf_hcrt_command_nop = -1;
-
-static gint ett_hcrt = -1;
-static gint ett_hcrt_msg = -1;
-static gint ett_hcrt_hdr = -1;
-static gint ett_hcrt_body = -1;
-
-static expert_field ei_hcrt_error = EI_INIT;
+static int hf_hcrt_header;
+static int hf_hcrt_message_tag;
+static int hf_hcrt_message_type;
+static int hf_hcrt_am;
+static int hf_hcrt_do;
+static int hf_hcrt_1st_dword_enable;
+static int hf_hcrt_last_dword_enable;
+static int hf_hcrt_resp_code;
+static int hf_hcrt_adl;
+static int hf_hcrt_last;
+static int hf_hcrt_body;
+static int hf_hcrt_addr_32;
+static int hf_hcrt_addr_64;
+static int hf_hcrt_data_32;
+static int hf_hcrt_data_64;
+static int hf_hcrt_command_nop;
+
+static gint ett_hcrt;
+static gint ett_hcrt_msg;
+static gint ett_hcrt_hdr;
+static gint ett_hcrt_body;
+
+static expert_field ei_hcrt_error;
 
 void proto_reg_handoff_hcrt(void);
 void proto_register_hcrt(void);
diff --git a/epan/dissectors/packet-hdcp.c b/epan/dissectors/packet-hdcp.c
index 2b04890ad4..afc7bd67aa 100644
--- a/epan/dissectors/packet-hdcp.c
+++ b/epan/dissectors/packet-hdcp.c
@@ -23,30 +23,30 @@
 #include <epan/ptvcursor.h>
 void proto_register_hdcp(void);
 
-static int proto_hdcp  = -1;
+static int proto_hdcp;
 
 static wmem_tree_t *transactions;
 
-static gint ett_hdcp = -1;
-
-static int hf_hdcp_reg = -1;
-static int hf_hdcp_resp_in = -1;
-static int hf_hdcp_resp_to = -1;
-static int hf_hdcp_a_ksv = -1;
-static int hf_hdcp_b_ksv = -1;
-static int hf_hdcp_an = -1;
-static int hf_hdcp_hdmi_reserved = -1;
-static int hf_hdcp_repeater = -1;
-static int hf_hdcp_ksv_fifo = -1;
-static int hf_hdcp_fast_trans = -1;
-static int hf_hdcp_features = -1;
-static int hf_hdcp_fast_reauth = -1;
-static int hf_hdcp_hdmi_mode = -1;
-static int hf_hdcp_max_casc_exc = -1;
-static int hf_hdcp_depth = -1;
-static int hf_hdcp_max_devs_exc = -1;
-static int hf_hdcp_downstream = -1;
-static int hf_hdcp_link_vfy = -1;
+static gint ett_hdcp;
+
+static int hf_hdcp_reg;
+static int hf_hdcp_resp_in;
+static int hf_hdcp_resp_to;
+static int hf_hdcp_a_ksv;
+static int hf_hdcp_b_ksv;
+static int hf_hdcp_an;
+static int hf_hdcp_hdmi_reserved;
+static int hf_hdcp_repeater;
+static int hf_hdcp_ksv_fifo;
+static int hf_hdcp_fast_trans;
+static int hf_hdcp_features;
+static int hf_hdcp_fast_reauth;
+static int hf_hdcp_hdmi_mode;
+static int hf_hdcp_max_casc_exc;
+static int hf_hdcp_depth;
+static int hf_hdcp_max_devs_exc;
+static int hf_hdcp_downstream;
+static int hf_hdcp_link_vfy;
 
 #define REG_BKSV    0x0
 #define REG_AKSV    0x10
diff --git a/epan/dissectors/packet-hdcp2.c b/epan/dissectors/packet-hdcp2.c
index 2905a26b69..9a36fef114 100644
--- a/epan/dissectors/packet-hdcp2.c
+++ b/epan/dissectors/packet-hdcp2.c
@@ -27,38 +27,38 @@
 void proto_register_hdcp2(void);
 void proto_reg_handoff_hdcp2(void);
 
-static int proto_hdcp2 = -1;
-
-static gint ett_hdcp2 = -1;
-static gint ett_hdcp2_cert = -1;
-
-static int hf_hdcp2_msg_id = -1;
-static int hf_hdcp2_r_tx = -1;
-static int hf_hdcp2_repeater = -1;
-static int hf_hdcp2_cert_rcv_id = -1;
-static int hf_hdcp2_cert_n = -1;
-static int hf_hdcp2_cert_e = -1;
-static int hf_hdcp2_cert_rcv_sig = -1;
-static int hf_hdcp2_e_kpub_km = -1;
-static int hf_hdcp2_e_kh_km = -1;
-static int hf_hdcp2_m = -1;
-static int hf_hdcp2_r_rx = -1;
-static int hf_hdcp2_h_prime = -1;
-static int hf_hdcp2_r_n = -1;
-static int hf_hdcp2_l_prime = -1;
-static int hf_hdcp2_e_dkey_ks = -1;
-static int hf_hdcp2_r_iv = -1;
-static int hf_hdcp2_reserved = -1;
-static int hf_hdcp2_tx_length = -1;
-static int hf_hdcp2_tx_version = -1;
-static int hf_hdcp2_tx_loc_precompute = -1;
-static int hf_hdcp2_rx_length = -1;
-static int hf_hdcp2_rx_version = -1;
-static int hf_hdcp2_rx_loc_precompute = -1;
-
-static expert_field ei_hdcp2_reserved_0 = EI_INIT;
-static expert_field ei_hdcp2_version_not_2 = EI_INIT;
-static expert_field ei_hdcp2_length = EI_INIT;
+static int proto_hdcp2;
+
+static gint ett_hdcp2;
+static gint ett_hdcp2_cert;
+
+static int hf_hdcp2_msg_id;
+static int hf_hdcp2_r_tx;
+static int hf_hdcp2_repeater;
+static int hf_hdcp2_cert_rcv_id;
+static int hf_hdcp2_cert_n;
+static int hf_hdcp2_cert_e;
+static int hf_hdcp2_cert_rcv_sig;
+static int hf_hdcp2_e_kpub_km;
+static int hf_hdcp2_e_kh_km;
+static int hf_hdcp2_m;
+static int hf_hdcp2_r_rx;
+static int hf_hdcp2_h_prime;
+static int hf_hdcp2_r_n;
+static int hf_hdcp2_l_prime;
+static int hf_hdcp2_e_dkey_ks;
+static int hf_hdcp2_r_iv;
+static int hf_hdcp2_reserved;
+static int hf_hdcp2_tx_length;
+static int hf_hdcp2_tx_version;
+static int hf_hdcp2_tx_loc_precompute;
+static int hf_hdcp2_rx_length;
+static int hf_hdcp2_rx_version;
+static int hf_hdcp2_rx_loc_precompute;
+
+static expert_field ei_hdcp2_reserved_0;
+static expert_field ei_hdcp2_version_not_2;
+static expert_field ei_hdcp2_length;
 
 
 #define ID_AKE_INIT              2
diff --git a/epan/dissectors/packet-hdfs.c b/epan/dissectors/packet-hdfs.c
index 70ab71f966..c51364b754 100644
--- a/epan/dissectors/packet-hdfs.c
+++ b/epan/dissectors/packet-hdfs.c
@@ -49,61 +49,61 @@ static const int DATA = 2;
 
 static range_t *tcp_ports = NULL;
 
-static int proto_hdfs = -1;
-static int hf_hdfs_pdu_type = -1;
-static int hf_hdfs_flags = -1;
-static int hf_hdfs_sequenceno = -1;
-static int hf_hdfs_packetno = -1;
-static int hf_hdfs_authlen = -1;
-static int hf_hdfs_success = -1;
-static int hf_hdfs_auth = -1;
-static int hf_hdfs_len = -1;
-static int hf_hdfs_strcall = -1;
-static int hf_hdfs_params = -1;
-static int hf_hdfs_paramtype = -1;
-static int hf_hdfs_paramval = -1;
-static int hf_hdfs_paramvalnum = -1;
-/* static int hf_hdfs_rest = -1; */
-static int hf_hdfs_fileperm = -1;
-static int hf_hdfs_blockloc = -1;
-static int hf_hdfs_endblockloc = -1;
-static int hf_hdfs_blockgen = -1;
-static int hf_hdfs_prover = -1;
-static int hf_hdfs_objname = -1;
-static int hf_hdfs_filename = -1;
-static int hf_hdfs_blockcount = -1;
-static int hf_hdfs_ownername = -1;
-static int hf_hdfs_groupname = -1;
-static int hf_hdfs_namelenone = -1;
-static int hf_hdfs_namelentwo = -1;
-static int hf_hdfs_accesstime = -1;
-static int hf_hdfs_modtime = -1;
-static int hf_hdfs_blockrep = -1;
-static int hf_hdfs_isdir = -1;
-static int hf_hdfs_blocksize = -1;
-static int hf_hdfs_filelen = -1;
-static int hf_hdfs_construct = -1;
-static int hf_hdfs_hostname = -1;
-static int hf_hdfs_rackloc = -1;
-static int hf_hdfs_adminstate = -1;
-static int hf_hdfs_activecon = -1;
-static int hf_hdfs_lastupdate = -1;
-static int hf_hdfs_remaining = -1;
-static int hf_hdfs_dfsused = -1;
-static int hf_hdfs_capacity = -1;
-static int hf_hdfs_ipcport = -1;
-static int hf_hdfs_infoport = -1;
-static int hf_hdfs_storageid = -1;
-static int hf_hdfs_datanodeid = -1;
-static int hf_hdfs_locations = -1;
-static int hf_hdfs_offset = -1;
-static int hf_hdfs_corrupt = -1;
-static int hf_hdfs_identifier = -1;
-static int hf_hdfs_password = -1;
-static int hf_hdfs_kind = -1;
-static int hf_hdfs_service = -1;
-
-static gint ett_hdfs = -1;
+static int proto_hdfs;
+static int hf_hdfs_pdu_type;
+static int hf_hdfs_flags;
+static int hf_hdfs_sequenceno;
+static int hf_hdfs_packetno;
+static int hf_hdfs_authlen;
+static int hf_hdfs_success;
+static int hf_hdfs_auth;
+static int hf_hdfs_len;
+static int hf_hdfs_strcall;
+static int hf_hdfs_params;
+static int hf_hdfs_paramtype;
+static int hf_hdfs_paramval;
+static int hf_hdfs_paramvalnum;
+/* static int hf_hdfs_rest; */
+static int hf_hdfs_fileperm;
+static int hf_hdfs_blockloc;
+static int hf_hdfs_endblockloc;
+static int hf_hdfs_blockgen;
+static int hf_hdfs_prover;
+static int hf_hdfs_objname;
+static int hf_hdfs_filename;
+static int hf_hdfs_blockcount;
+static int hf_hdfs_ownername;
+static int hf_hdfs_groupname;
+static int hf_hdfs_namelenone;
+static int hf_hdfs_namelentwo;
+static int hf_hdfs_accesstime;
+static int hf_hdfs_modtime;
+static int hf_hdfs_blockrep;
+static int hf_hdfs_isdir;
+static int hf_hdfs_blocksize;
+static int hf_hdfs_filelen;
+static int hf_hdfs_construct;
+static int hf_hdfs_hostname;
+static int hf_hdfs_rackloc;
+static int hf_hdfs_adminstate;
+static int hf_hdfs_activecon;
+static int hf_hdfs_lastupdate;
+static int hf_hdfs_remaining;
+static int hf_hdfs_dfsused;
+static int hf_hdfs_capacity;
+static int hf_hdfs_ipcport;
+static int hf_hdfs_infoport;
+static int hf_hdfs_storageid;
+static int hf_hdfs_datanodeid;
+static int hf_hdfs_locations;
+static int hf_hdfs_offset;
+static int hf_hdfs_corrupt;
+static int hf_hdfs_identifier;
+static int hf_hdfs_password;
+static int hf_hdfs_kind;
+static int hf_hdfs_service;
+
+static gint ett_hdfs;
 
 static dissector_handle_t hdfs_handle;
 
diff --git a/epan/dissectors/packet-hdfsdata.c b/epan/dissectors/packet-hdfsdata.c
index a2e6f6bed9..1c55350a7a 100644
--- a/epan/dissectors/packet-hdfsdata.c
+++ b/epan/dissectors/packet-hdfsdata.c
@@ -54,44 +54,44 @@ static const int RESPONSE_METADATA = 2;
 static const int RESPONSE_DATA = 3;
 #endif
 
-static int proto_hdfsdata = -1;
-static int hf_hdfsdata_version = -1;
-static int hf_hdfsdata_cmd = -1;
-static int hf_hdfsdata_blockid = -1;
-static int hf_hdfsdata_timestamp = -1;
-static int hf_hdfsdata_startoffset = -1;
-static int hf_hdfsdata_blocklen = -1;
-static int hf_hdfsdata_clientlen = -1;
-static int hf_hdfsdata_clientid = -1;
-static int hf_hdfsdata_tokenlen = -1;
-static int hf_hdfsdata_tokenid = -1;
-static int hf_hdfsdata_tokenpassword = -1;
-static int hf_hdfsdata_tokentype = -1;
-static int hf_hdfsdata_tokenservice = -1;
-static int hf_hdfsdata_status = -1;
-static int hf_hdfsdata_checksumtype = -1;
-static int hf_hdfsdata_chunksize = -1;
-static int hf_hdfsdata_chunkoffset = -1;
-static int hf_hdfsdata_datalength = -1;
-static int hf_hdfsdata_inblockoffset = -1;
-static int hf_hdfsdata_seqnum = -1;
-static int hf_hdfsdata_last = -1;
-static int hf_hdfsdata_crc32 = -1;
-static int hf_hdfsdata_datalen = -1;
-static int hf_hdfsdata_rest = -1;
-static int hf_hdfsdata_end = -1;
-static int hf_hdfsdata_packetsize = -1;
-static int hf_hdfsdata_chunklength = -1;
-static int hf_hdfsdata_crc64 = -1;
-static int hf_hdfsdata_pipelinestatus = -1;
-
-static int hf_hdfsdata_pipelinenum = -1;
-static int hf_hdfsdata_recovery = -1;
-static int hf_hdfsdata_sourcenode = -1;
-static int hf_hdfsdata_currentpipeline = -1;
-static int hf_hdfsdata_node = -1;
-
-static gint ett_hdfsdata = -1;
+static int proto_hdfsdata;
+static int hf_hdfsdata_version;
+static int hf_hdfsdata_cmd;
+static int hf_hdfsdata_blockid;
+static int hf_hdfsdata_timestamp;
+static int hf_hdfsdata_startoffset;
+static int hf_hdfsdata_blocklen;
+static int hf_hdfsdata_clientlen;
+static int hf_hdfsdata_clientid;
+static int hf_hdfsdata_tokenlen;
+static int hf_hdfsdata_tokenid;
+static int hf_hdfsdata_tokenpassword;
+static int hf_hdfsdata_tokentype;
+static int hf_hdfsdata_tokenservice;
+static int hf_hdfsdata_status;
+static int hf_hdfsdata_checksumtype;
+static int hf_hdfsdata_chunksize;
+static int hf_hdfsdata_chunkoffset;
+static int hf_hdfsdata_datalength;
+static int hf_hdfsdata_inblockoffset;
+static int hf_hdfsdata_seqnum;
+static int hf_hdfsdata_last;
+static int hf_hdfsdata_crc32;
+static int hf_hdfsdata_datalen;
+static int hf_hdfsdata_rest;
+static int hf_hdfsdata_end;
+static int hf_hdfsdata_packetsize;
+static int hf_hdfsdata_chunklength;
+static int hf_hdfsdata_crc64;
+static int hf_hdfsdata_pipelinestatus;
+
+static int hf_hdfsdata_pipelinenum;
+static int hf_hdfsdata_recovery;
+static int hf_hdfsdata_sourcenode;
+static int hf_hdfsdata_currentpipeline;
+static int hf_hdfsdata_node;
+
+static gint ett_hdfsdata;
 
 static dissector_handle_t hdfsdata_handle;
 
diff --git a/epan/dissectors/packet-hdmi.c b/epan/dissectors/packet-hdmi.c
index 366e798ff8..57cb298ea4 100644
--- a/epan/dissectors/packet-hdmi.c
+++ b/epan/dissectors/packet-hdmi.c
@@ -22,24 +22,24 @@
 void proto_register_hdmi(void);
 void proto_reg_handoff_hdmi(void);
 
-static int proto_hdmi  = -1;
+static int proto_hdmi;
 
 static dissector_handle_t hdmi_handle;
 static dissector_handle_t hdcp_handle;
 
-static gint ett_hdmi = -1;
-static gint ett_hdmi_edid = -1;
-
-static int hf_hdmi_addr = -1;
-static int hf_hdmi_edid_offset = -1;
-static int hf_hdmi_edid_hdr = -1;
-static int hf_hdmi_edid_manf_id = -1;
-static int hf_hdmi_edid_manf_prod_code = -1;
-static int hf_hdmi_edid_manf_serial = -1;
-static int hf_hdmi_edid_manf_week = -1;
-static int hf_hdmi_edid_mod_year = -1;
-static int hf_hdmi_edid_manf_year = -1;
-static int hf_hdmi_edid_version = -1;
+static gint ett_hdmi;
+static gint ett_hdmi_edid;
+
+static int hf_hdmi_addr;
+static int hf_hdmi_edid_offset;
+static int hf_hdmi_edid_hdr;
+static int hf_hdmi_edid_manf_id;
+static int hf_hdmi_edid_manf_prod_code;
+static int hf_hdmi_edid_manf_serial;
+static int hf_hdmi_edid_manf_week;
+static int hf_hdmi_edid_mod_year;
+static int hf_hdmi_edid_manf_year;
+static int hf_hdmi_edid_version;
 
 
 /* also called Source and Sink in the HDMI spec */
diff --git a/epan/dissectors/packet-hicp.c b/epan/dissectors/packet-hicp.c
index fc4387f157..56a40cc69f 100644
--- a/epan/dissectors/packet-hicp.c
+++ b/epan/dissectors/packet-hicp.c
@@ -21,32 +21,32 @@ void proto_register_hicp(void);
 static dissector_handle_t hicp_handle;
 
 /* Protocols and header fields. */
-static int proto_hicp = -1;
-static int hf_hicp_cmd = -1;
-static int hf_hicp_proto_version = -1;
-static int hf_hicp_fb_type = -1;
-static int hf_hicp_module_version = -1;
-static int hf_hicp_mac = -1;
-static int hf_hicp_ip = -1;
-static int hf_hicp_sn = -1;
-static int hf_hicp_gw = -1;
-static int hf_hicp_dhcp = -1;
-static int hf_hicp_pswd_required = -1;
-static int hf_hicp_hn = -1;
-static int hf_hicp_dns1 = -1;
-static int hf_hicp_dns2 = -1;
-static int hf_hicp_ext = -1;
-static int hf_hicp_pswd = -1;
-static int hf_hicp_new_pswd = -1;
-static int hf_hicp_new_mac = -1;
-static int hf_hicp_status = -1;
-static int hf_hicp_error = -1;
-static int hf_hicp_target = -1;
-static int hf_hicp_src = -1;
+static int proto_hicp;
+static int hf_hicp_cmd;
+static int hf_hicp_proto_version;
+static int hf_hicp_fb_type;
+static int hf_hicp_module_version;
+static int hf_hicp_mac;
+static int hf_hicp_ip;
+static int hf_hicp_sn;
+static int hf_hicp_gw;
+static int hf_hicp_dhcp;
+static int hf_hicp_pswd_required;
+static int hf_hicp_hn;
+static int hf_hicp_dns1;
+static int hf_hicp_dns2;
+static int hf_hicp_ext;
+static int hf_hicp_pswd;
+static int hf_hicp_new_pswd;
+static int hf_hicp_new_mac;
+static int hf_hicp_status;
+static int hf_hicp_error;
+static int hf_hicp_target;
+static int hf_hicp_src;
 
-static expert_field ei_hicp_error = EI_INIT;
+static expert_field ei_hicp_error;
 
-static gint ett_hicp = -1;
+static gint ett_hicp;
 
 #define HICP_PORT 3250
 #define HICP_MIN_LENGTH 2
diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c
index 6f19c9a0b1..0c7d7c9532 100644
--- a/epan/dissectors/packet-hip.c
+++ b/epan/dissectors/packet-hip.c
@@ -291,123 +291,123 @@ static const value_string hit_suite_vals[] = {
 /* functions */
 static int dissect_hip_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_item *ti, int type, int tlv_len);
 
-static int proto_hip = -1;
-static int hf_hip_proto = -1;
-static int hf_hip_hdr_len = -1;
-static int hf_hip_shim6_fixed_bit_p = -1;
-static int hf_hip_packet_type = -1;
-static int hf_hip_version = -1;
-static int hf_hip_shim6_fixed_bit_s = -1;
-static int hf_hip_controls = -1;
-static int hf_hip_controls_anon = -1;
-static int hf_hip_checksum = -1;
-static int hf_hip_checksum_status = -1;
-static int hf_hip_hit_sndr = -1;
-static int hf_hip_hit_rcvr = -1;
-
-static int hf_hip_type = -1;
-static int hf_hip_tlv_ei_res = -1;
-static int hf_hip_tlv_ei_keyidx = -1;
-static int hf_hip_tlv_ei_oldspi = -1;
-static int hf_hip_tlv_ei_newspi = -1;
-static int hf_hip_tlv_r1_res = -1;
-static int hf_hip_tlv_r1count = -1;
-static int hf_hip_tlv_puzzle_k = -1;
-static int hf_hip_tlv_puzzle_life = -1;
-static int hf_hip_tlv_puzzle_o = -1;
-static int hf_hip_tlv_puzzle_i = -1;
-static int hf_hip_tlv_solution_k = -1;
-static int hf_hip_tlv_solution_reserved = -1;
-static int hf_hip_tlv_solution_o = -1;
-static int hf_hip_tlv_solution_i = -1;
-static int hf_hip_tlv_solution_j = -1;
-static int hf_hip_tlv_seq_updid = -1;
-static int hf_hip_tlv_ack_updid = -1;
-static int hf_hip_tlv_dh_group_id = -1;
-static int hf_hip_tlv_dh_pub = -1;
-static int hf_hip_tlv_dh_pv_length = -1;
-static int hf_hip_tlv_trans_id = -1;
-static int hf_hip_tlv_esp_reserved = -1;
-static int hf_hip_tlv_cipher_id = -1;
-static int hf_hip_tlv_hit_suite_id = -1;
-static int hf_hip_tlv_host_id_len = -1;
-static int hf_hip_tlv_host_di_type = -1;
-static int hf_hip_tlv_host_di_len = -1;
-static int hf_hip_tlv_host_id_hdr = -1;
-static int hf_hip_tlv_host_id_hdr_flags = -1;
-static int hf_hip_tlv_host_id_hdr_proto = -1;
-static int hf_hip_tlv_host_id_hdr_alg = -1;
-static int hf_hip_tlv_host_id_t = -1;
-static int hf_hip_tlv_host_id_q = -1;
-static int hf_hip_tlv_host_id_p = -1;
-static int hf_hip_tlv_host_id_g = -1;
-static int hf_hip_tlv_host_id_y = -1;
-static int hf_hip_tlv_host_id_e_len = -1;
-static int hf_hip_tlv_host_id_e = -1;
-static int hf_hip_tlv_host_id_n = -1;
-static int hf_hip_tlv_notification_res = -1;
-static int hf_hip_tlv_notification_type = -1;
-static int hf_hip_tlv_notification_data = -1;
-static int hf_hip_tlv_opaque_data = -1;
-static int hf_hip_tlv_reg_ltmin = -1;
-static int hf_hip_tlv_reg_ltmax = -1;
-static int hf_hip_tlv_reg_lt = -1;
-static int hf_hip_tlv_reg_type = -1;
-static int hf_hip_tlv_reg_failtype = -1;
-static int hf_hip_tlv_hmac = -1;
-static int hf_hip_tlv_sig_alg = -1;
-static int hf_hip_tlv_sig = -1;
-static int hf_hip_tlv_enc_reserved = -1;
-static int hf_hip_tlv_locator_traffic_type = -1;
-static int hf_hip_tlv_locator_type = -1;
-static int hf_hip_tlv_locator_len = -1;
-static int hf_hip_tlv_locator_reserved = -1;
-static int hf_hip_tlv_locator_lifetime = -1;
-static int hf_hip_tlv_locator_port = -1;
-static int hf_hip_tlv_locator_transport_protocol = -1;
-static int hf_hip_tlv_locator_kind = -1;
-static int hf_hip_tlv_locator_priority = -1;
-static int hf_hip_tlv_locator_spi = -1;
-static int hf_hip_tlv_locator_address = -1;
-
-static int hf_hip_tlv_cert_group = -1;
-static int hf_hip_tlv_cert_count = -1;
-static int hf_hip_tlv_cert_id = -1;
-static int hf_hip_tlv_cert_type = -1;
-static int hf_hip_tlv_certificate = -1;
-
-static int hf_hip_tlv_from_address = -1;
-static int hf_hip_tlv_rvs_address = -1;
-
-static int hf_hip_tlv_nat_traversal_mode_id = -1;
-static int hf_hip_tlv_transaction_minta = -1;
-static int hf_hip_tlv_relay_from_port = -1;
-static int hf_hip_tlv_relay_from_protocol = -1;
-static int hf_hip_tlv_relay_from_reserved = -1;
-static int hf_hip_tlv_relay_from_address = -1;
-static int hf_hip_tlv_relay_to_port = -1;
-static int hf_hip_tlv_relay_to_protocol = -1;
-static int hf_hip_tlv_relay_to_reserved = -1;
-static int hf_hip_tlv_relay_to_address = -1;
-static int hf_hip_tlv_reg_from_port = -1;
-static int hf_hip_tlv_reg_from_protocol = -1;
-static int hf_hip_tlv_reg_from_reserved = -1;
-static int hf_hip_tlv_reg_from_address = -1;
-static int hf_hip_encrypted_parameter_data = -1;
-static int hf_hip_fqdn = -1;
-static int hf_hip_nai = -1;
-
-static gint ett_hip = -1;
-static gint ett_hip_controls = -1;
-static gint ett_hip_tlv = -1;
-static gint ett_hip_tlv_data = -1;
-static gint ett_hip_tlv_host_id_hdr = -1;
-static gint ett_hip_locator_data = -1;
-
-static expert_field ei_hip_tlv_host_id_len = EI_INIT;
-/* static expert_field ei_hip_tlv_host_id_e_len = EI_INIT; */
-static expert_field ei_hip_tlv_host_id_hdr_alg = EI_INIT;
-static expert_field ei_hip_checksum = EI_INIT;
+static int proto_hip;
+static int hf_hip_proto;
+static int hf_hip_hdr_len;
+static int hf_hip_shim6_fixed_bit_p;
+static int hf_hip_packet_type;
+static int hf_hip_version;
+static int hf_hip_shim6_fixed_bit_s;
+static int hf_hip_controls;
+static int hf_hip_controls_anon;
+static int hf_hip_checksum;
+static int hf_hip_checksum_status;
+static int hf_hip_hit_sndr;
+static int hf_hip_hit_rcvr;
+
+static int hf_hip_type;
+static int hf_hip_tlv_ei_res;
+static int hf_hip_tlv_ei_keyidx;
+static int hf_hip_tlv_ei_oldspi;
+static int hf_hip_tlv_ei_newspi;
+static int hf_hip_tlv_r1_res;
+static int hf_hip_tlv_r1count;
+static int hf_hip_tlv_puzzle_k;
+static int hf_hip_tlv_puzzle_life;
+static int hf_hip_tlv_puzzle_o;
+static int hf_hip_tlv_puzzle_i;
+static int hf_hip_tlv_solution_k;
+static int hf_hip_tlv_solution_reserved;
+static int hf_hip_tlv_solution_o;
+static int hf_hip_tlv_solution_i;
+static int hf_hip_tlv_solution_j;
+static int hf_hip_tlv_seq_updid;
+static int hf_hip_tlv_ack_updid;
+static int hf_hip_tlv_dh_group_id;
+static int hf_hip_tlv_dh_pub;
+static int hf_hip_tlv_dh_pv_length;
+static int hf_hip_tlv_trans_id;
+static int hf_hip_tlv_esp_reserved;
+static int hf_hip_tlv_cipher_id;
+static int hf_hip_tlv_hit_suite_id;
+static int hf_hip_tlv_host_id_len;
+static int hf_hip_tlv_host_di_type;
+static int hf_hip_tlv_host_di_len;
+static int hf_hip_tlv_host_id_hdr;
+static int hf_hip_tlv_host_id_hdr_flags;
+static int hf_hip_tlv_host_id_hdr_proto;
+static int hf_hip_tlv_host_id_hdr_alg;
+static int hf_hip_tlv_host_id_t;
+static int hf_hip_tlv_host_id_q;
+static int hf_hip_tlv_host_id_p;
+static int hf_hip_tlv_host_id_g;
+static int hf_hip_tlv_host_id_y;
+static int hf_hip_tlv_host_id_e_len;
+static int hf_hip_tlv_host_id_e;
+static int hf_hip_tlv_host_id_n;
+static int hf_hip_tlv_notification_res;
+static int hf_hip_tlv_notification_type;
+static int hf_hip_tlv_notification_data;
+static int hf_hip_tlv_opaque_data;
+static int hf_hip_tlv_reg_ltmin;
+static int hf_hip_tlv_reg_ltmax;
+static int hf_hip_tlv_reg_lt;
+static int hf_hip_tlv_reg_type;
+static int hf_hip_tlv_reg_failtype;
+static int hf_hip_tlv_hmac;
+static int hf_hip_tlv_sig_alg;
+static int hf_hip_tlv_sig;
+static int hf_hip_tlv_enc_reserved;
+static int hf_hip_tlv_locator_traffic_type;
+static int hf_hip_tlv_locator_type;
+static int hf_hip_tlv_locator_len;
+static int hf_hip_tlv_locator_reserved;
+static int hf_hip_tlv_locator_lifetime;
+static int hf_hip_tlv_locator_port;
+static int hf_hip_tlv_locator_transport_protocol;
+static int hf_hip_tlv_locator_kind;
+static int hf_hip_tlv_locator_priority;
+static int hf_hip_tlv_locator_spi;
+static int hf_hip_tlv_locator_address;
+
+static int hf_hip_tlv_cert_group;
+static int hf_hip_tlv_cert_count;
+static int hf_hip_tlv_cert_id;
+static int hf_hip_tlv_cert_type;
+static int hf_hip_tlv_certificate;
+
+static int hf_hip_tlv_from_address;
+static int hf_hip_tlv_rvs_address;
+
+static int hf_hip_tlv_nat_traversal_mode_id;
+static int hf_hip_tlv_transaction_minta;
+static int hf_hip_tlv_relay_from_port;
+static int hf_hip_tlv_relay_from_protocol;
+static int hf_hip_tlv_relay_from_reserved;
+static int hf_hip_tlv_relay_from_address;
+static int hf_hip_tlv_relay_to_port;
+static int hf_hip_tlv_relay_to_protocol;
+static int hf_hip_tlv_relay_to_reserved;
+static int hf_hip_tlv_relay_to_address;
+static int hf_hip_tlv_reg_from_port;
+static int hf_hip_tlv_reg_from_protocol;
+static int hf_hip_tlv_reg_from_reserved;
+static int hf_hip_tlv_reg_from_address;
+static int hf_hip_encrypted_parameter_data;
+static int hf_hip_fqdn;
+static int hf_hip_nai;
+
+static gint ett_hip;
+static gint ett_hip_controls;
+static gint ett_hip_tlv;
+static gint ett_hip_tlv_data;
+static gint ett_hip_tlv_host_id_hdr;
+static gint ett_hip_locator_data;
+
+static expert_field ei_hip_tlv_host_id_len;
+/* static expert_field ei_hip_tlv_host_id_e_len; */
+static expert_field ei_hip_tlv_host_id_hdr_alg;
+static expert_field ei_hip_checksum;
 
 /* Dissect the HIP packet */
 static void
diff --git a/epan/dissectors/packet-hipercontracer.c b/epan/dissectors/packet-hipercontracer.c
index c767d3c445..edd95fc614 100644
--- a/epan/dissectors/packet-hipercontracer.c
+++ b/epan/dissectors/packet-hipercontracer.c
@@ -25,17 +25,17 @@ void proto_register_hipercontracer(void);
 void proto_reg_handoff_hipercontracer(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_hipercontracer = -1;
+static int proto_hipercontracer;
 
 /* Initialize the subtree pointers */
-static gint ett_hipercontracer = -1;
-
-static gint hf_magic_number   = -1;
-static gint hf_send_ttl       = -1;
-static gint hf_round          = -1;
-static gint hf_checksum_tweak = -1;
-static gint hf_seq_number     = -1;
-static gint hf_send_timestamp = -1;
+static gint ett_hipercontracer;
+
+static gint hf_magic_number;
+static gint hf_send_ttl;
+static gint hf_round;
+static gint hf_checksum_tweak;
+static gint hf_seq_number;
+static gint hf_send_timestamp;
 
 /* Setup list of header fields */
 static hf_register_info hf[] = {
diff --git a/epan/dissectors/packet-hiqnet.c b/epan/dissectors/packet-hiqnet.c
index a1c2ff4f55..f1e870e9b7 100644
--- a/epan/dissectors/packet-hiqnet.c
+++ b/epan/dissectors/packet-hiqnet.c
@@ -281,123 +281,123 @@ static const value_string flowcontrolnames[] = {
     { 0, NULL }
 };
 
-static int proto_hiqnet = -1;
-
-static int hf_hiqnet_version = -1;
-
-static gint ett_hiqnet = -1;
-static gint ett_hiqnet_flags = -1;
-static gint ett_hiqnet_cats = -1;
-
-static int hf_hiqnet_headerlen = -1;
-static int hf_hiqnet_messagelen = -1;
-static int hf_hiqnet_sourcedev = -1;
-static int hf_hiqnet_sourceaddr = -1;
-static int hf_hiqnet_destdev = -1;
-static int hf_hiqnet_destaddr = -1;
-static int hf_hiqnet_messageid = -1;
-static int hf_hiqnet_flags = -1;
-static int hf_hiqnet_reqack_flag = -1;
-static int hf_hiqnet_ack_flag = -1;
-static int hf_hiqnet_info_flag = -1;
-static int hf_hiqnet_error_flag = -1;
-static int hf_hiqnet_guaranteed_flag = -1;
-static int hf_hiqnet_multipart_flag = -1;
-static int hf_hiqnet_session_number_flag = -1;
-static int hf_hiqnet_hopcnt = -1;
-static int hf_hiqnet_seqnum = -1;
-static int hf_hiqnet_errcode = -1;
-static int hf_hiqnet_errstr = -1;
-static int hf_hiqnet_startseqno = -1;
-static int hf_hiqnet_rembytes = -1;
-static int hf_hiqnet_sessnum = -1;
-static int hf_hiqnet_cost = -1;
-static int hf_hiqnet_sernumlen = -1;
-static int hf_hiqnet_sernum = -1;
-static int hf_hiqnet_maxmsgsize = -1;
-static int hf_hiqnet_keepaliveperiod = -1;
-static int hf_hiqnet_netid = -1;
-static int hf_hiqnet_macaddr = -1;
-static int hf_hiqnet_dhcp = -1;
-static int hf_hiqnet_ipaddr = -1;
-static int hf_hiqnet_subnetmsk = -1;
-static int hf_hiqnet_gateway = -1;
-static int hf_hiqnet_flagmask = -1;
-static int hf_hiqnet_paramcount = -1;
-static int hf_hiqnet_paramid = -1;
-static int hf_hiqnet_vdobject = -1;
-static int hf_hiqnet_subtype = -1;
-static int hf_hiqnet_sensrate = -1;
-static int hf_hiqnet_subflags = -1;
-static int hf_hiqnet_subcount = -1;
-static int hf_hiqnet_pubparmid = -1;
-static int hf_hiqnet_subaddr = -1;
-static int hf_hiqnet_subparmid = -1;
-static int hf_hiqnet_reserved0 = -1;
-static int hf_hiqnet_reserved1 = -1;
-static int hf_hiqnet_attrcount = -1;
-static int hf_hiqnet_attrid = -1;
-static int hf_hiqnet_datatype = -1;
-static int hf_hiqnet_datalen = -1;
-static int hf_hiqnet_byte_value = -1;
-static int hf_hiqnet_ubyte_value = -1;
-static int hf_hiqnet_word_value = -1;
-static int hf_hiqnet_uword_value = -1;
-static int hf_hiqnet_long_value = -1;
-static int hf_hiqnet_ulong_value = -1;
-static int hf_hiqnet_float32_value = -1;
-static int hf_hiqnet_float64_value = -1;
-static int hf_hiqnet_block_value = -1;
-static int hf_hiqnet_string_value = -1;
-static int hf_hiqnet_long64_value = -1;
-static int hf_hiqnet_ulong64_value = -1;
-static int hf_hiqnet_wrkgrppath = -1;
-static int hf_hiqnet_numvds = -1;
-static int hf_hiqnet_vdaddr = -1;
-static int hf_hiqnet_vdclassid = -1;
-static int hf_hiqnet_stract = -1;
-static int hf_hiqnet_strnum = -1;
-static int hf_hiqnet_scope = -1;
-static int hf_hiqnet_recact = -1;
-static int hf_hiqnet_recnum = -1;
-static int hf_hiqnet_strlen = -1;
-static int hf_hiqnet_time = -1;
-static int hf_hiqnet_maxdatasize = -1;
-static int hf_hiqnet_catfilter = -1;
-static int hf_hiqnet_app_cat = -1;
-static int hf_hiqnet_conf_cat = -1;
-static int hf_hiqnet_audionet_cat = -1;
-static int hf_hiqnet_ctrlnet_cat = -1;
-static int hf_hiqnet_vendnet_cat = -1;
-static int hf_hiqnet_startup_cat = -1;
-static int hf_hiqnet_dsp_cat = -1;
-static int hf_hiqnet_misc_cat = -1;
-static int hf_hiqnet_ctrlog_cat = -1;
-static int hf_hiqnet_foreignproto_cat = -1;
-static int hf_hiqnet_digio_cat = -1;
-static int hf_hiqnet_ctrlsurf_cat = -1;
-static int hf_hiqnet_entrieslen = -1;
-static int hf_hiqnet_category = -1;
-static int hf_hiqnet_eventid = -1;
-static int hf_hiqnet_priority = -1;
-static int hf_hiqnet_eventseqnum = -1;
-static int hf_hiqnet_eventtime = -1;
-static int hf_hiqnet_eventdate = -1;
-static int hf_hiqnet_eventinfo = -1;
-static int hf_hiqnet_eventadddata = -1;
-static int hf_hiqnet_objcount = -1;
-static int hf_hiqnet_paramval = -1;
-static int hf_hiqnet_ifacecount = -1;
-static int hf_hiqnet_comid = -1;
-static int hf_hiqnet_baudrate = -1;
-static int hf_hiqnet_parity = -1;
-static int hf_hiqnet_stopbits = -1;
-static int hf_hiqnet_databits = -1;
-static int hf_hiqnet_flowcontrol = -1;
-static int hf_hiqnet_devaddr = -1;
-static int hf_hiqnet_newdevaddr = -1;
-
-static expert_field ei_hiqnet_datatype = EI_INIT;
+static int proto_hiqnet;
+
+static int hf_hiqnet_version;
+
+static gint ett_hiqnet;
+static gint ett_hiqnet_flags;
+static gint ett_hiqnet_cats;
+
+static int hf_hiqnet_headerlen;
+static int hf_hiqnet_messagelen;
+static int hf_hiqnet_sourcedev;
+static int hf_hiqnet_sourceaddr;
+static int hf_hiqnet_destdev;
+static int hf_hiqnet_destaddr;
+static int hf_hiqnet_messageid;
+static int hf_hiqnet_flags;
+static int hf_hiqnet_reqack_flag;
+static int hf_hiqnet_ack_flag;
+static int hf_hiqnet_info_flag;
+static int hf_hiqnet_error_flag;
+static int hf_hiqnet_guaranteed_flag;
+static int hf_hiqnet_multipart_flag;
+static int hf_hiqnet_session_number_flag;
+static int hf_hiqnet_hopcnt;
+static int hf_hiqnet_seqnum;
+static int hf_hiqnet_errcode;
+static int hf_hiqnet_errstr;
+static int hf_hiqnet_startseqno;
+static int hf_hiqnet_rembytes;
+static int hf_hiqnet_sessnum;
+static int hf_hiqnet_cost;
+static int hf_hiqnet_sernumlen;
+static int hf_hiqnet_sernum;
+static int hf_hiqnet_maxmsgsize;
+static int hf_hiqnet_keepaliveperiod;
+static int hf_hiqnet_netid;
+static int hf_hiqnet_macaddr;
+static int hf_hiqnet_dhcp;
+static int hf_hiqnet_ipaddr;
+static int hf_hiqnet_subnetmsk;
+static int hf_hiqnet_gateway;
+static int hf_hiqnet_flagmask;
+static int hf_hiqnet_paramcount;
+static int hf_hiqnet_paramid;
+static int hf_hiqnet_vdobject;
+static int hf_hiqnet_subtype;
+static int hf_hiqnet_sensrate;
+static int hf_hiqnet_subflags;
+static int hf_hiqnet_subcount;
+static int hf_hiqnet_pubparmid;
+static int hf_hiqnet_subaddr;
+static int hf_hiqnet_subparmid;
+static int hf_hiqnet_reserved0;
+static int hf_hiqnet_reserved1;
+static int hf_hiqnet_attrcount;
+static int hf_hiqnet_attrid;
+static int hf_hiqnet_datatype;
+static int hf_hiqnet_datalen;
+static int hf_hiqnet_byte_value;
+static int hf_hiqnet_ubyte_value;
+static int hf_hiqnet_word_value;
+static int hf_hiqnet_uword_value;
+static int hf_hiqnet_long_value;
+static int hf_hiqnet_ulong_value;
+static int hf_hiqnet_float32_value;
+static int hf_hiqnet_float64_value;
+static int hf_hiqnet_block_value;
+static int hf_hiqnet_string_value;
+static int hf_hiqnet_long64_value;
+static int hf_hiqnet_ulong64_value;
+static int hf_hiqnet_wrkgrppath;
+static int hf_hiqnet_numvds;
+static int hf_hiqnet_vdaddr;
+static int hf_hiqnet_vdclassid;
+static int hf_hiqnet_stract;
+static int hf_hiqnet_strnum;
+static int hf_hiqnet_scope;
+static int hf_hiqnet_recact;
+static int hf_hiqnet_recnum;
+static int hf_hiqnet_strlen;
+static int hf_hiqnet_time;
+static int hf_hiqnet_maxdatasize;
+static int hf_hiqnet_catfilter;
+static int hf_hiqnet_app_cat;
+static int hf_hiqnet_conf_cat;
+static int hf_hiqnet_audionet_cat;
+static int hf_hiqnet_ctrlnet_cat;
+static int hf_hiqnet_vendnet_cat;
+static int hf_hiqnet_startup_cat;
+static int hf_hiqnet_dsp_cat;
+static int hf_hiqnet_misc_cat;
+static int hf_hiqnet_ctrlog_cat;
+static int hf_hiqnet_foreignproto_cat;
+static int hf_hiqnet_digio_cat;
+static int hf_hiqnet_ctrlsurf_cat;
+static int hf_hiqnet_entrieslen;
+static int hf_hiqnet_category;
+static int hf_hiqnet_eventid;
+static int hf_hiqnet_priority;
+static int hf_hiqnet_eventseqnum;
+static int hf_hiqnet_eventtime;
+static int hf_hiqnet_eventdate;
+static int hf_hiqnet_eventinfo;
+static int hf_hiqnet_eventadddata;
+static int hf_hiqnet_objcount;
+static int hf_hiqnet_paramval;
+static int hf_hiqnet_ifacecount;
+static int hf_hiqnet_comid;
+static int hf_hiqnet_baudrate;
+static int hf_hiqnet_parity;
+static int hf_hiqnet_stopbits;
+static int hf_hiqnet_databits;
+static int hf_hiqnet_flowcontrol;
+static int hf_hiqnet_devaddr;
+static int hf_hiqnet_newdevaddr;
+
+static expert_field ei_hiqnet_datatype;
 
 static int * const hiqnet_flag_fields[] = {
     &hf_hiqnet_reqack_flag,
diff --git a/epan/dissectors/packet-hislip.c b/epan/dissectors/packet-hislip.c
index eccee2f5a5..f6e693b169 100644
--- a/epan/dissectors/packet-hislip.c
+++ b/epan/dissectors/packet-hislip.c
@@ -56,7 +56,7 @@
 
 
 
-static gint proto_hislip = -1;
+static gint proto_hislip;
 
 static dissector_handle_t hislip_handle;
 
@@ -95,44 +95,44 @@ void proto_reg_handoff_hislip(void);
 #define HISLIP_PORT     4880
 
 /*Field indexs*/
-static gint hf_hislip_prologue = -1;
-static gint hf_hislip_messagetype = -1;
-static gint hf_hislip_controlcode = -1;
-static gint hf_hislip_controlcode_rmt = -1;
-static gint hf_hislip_controlcode_overlap = -1;
-static gint hf_hislip_controlcode_asynclock_code = -1;
-static gint hf_hislip_controlcode_asynclockresponse_code_request = -1;
-static gint hf_hislip_controlcode_asynclockresponse_code_release = -1;
-static gint hf_hislip_controlcode_asynclockinforesponse_code = -1;
-static gint hf_hislip_controlcode_feature_negotiation = -1;
-static gint hf_hislip_controlcode_asyncremotelocalcontrol_code = -1;
-static gint hf_hislip_controlcode_stb = -1;
-static gint hf_hislip_messageparameter = -1;
-static gint hf_hislip_payloadlength = -1;
-static gint hf_hislip_data = -1;
-static gint hf_hislip_msgpara_messageid = -1;
-static gint hf_hislip_msgpara_sessionid = -1;
-static gint hf_hislip_msgpara_serverproto = -1;
-static gint hf_hislip_msgpara_vendorID = -1;
-static gint hf_hislip_msgpara_clientproto = -1;
-static gint hf_hislip_msgpara_clients = -1;
-static gint hf_hislip_msgpara_timeout = -1;
-static gint hf_hislip_fatalerrcode = -1;
-static gint hf_hislip_nonfatalerrorcode = -1;
-static gint hf_hislip_syn = -1;
-static gint hf_hislip_asyn = -1;
-static gint hf_hislip_retransmission = -1;
-static gint hf_hislip_request = -1;
-static gint hf_hislip_maxmessagesize = -1;
-static gint hf_hislip_response = -1;
+static gint hf_hislip_prologue;
+static gint hf_hislip_messagetype;
+static gint hf_hislip_controlcode;
+static gint hf_hislip_controlcode_rmt;
+static gint hf_hislip_controlcode_overlap;
+static gint hf_hislip_controlcode_asynclock_code;
+static gint hf_hislip_controlcode_asynclockresponse_code_request;
+static gint hf_hislip_controlcode_asynclockresponse_code_release;
+static gint hf_hislip_controlcode_asynclockinforesponse_code;
+static gint hf_hislip_controlcode_feature_negotiation;
+static gint hf_hislip_controlcode_asyncremotelocalcontrol_code;
+static gint hf_hislip_controlcode_stb;
+static gint hf_hislip_messageparameter;
+static gint hf_hislip_payloadlength;
+static gint hf_hislip_data;
+static gint hf_hislip_msgpara_messageid;
+static gint hf_hislip_msgpara_sessionid;
+static gint hf_hislip_msgpara_serverproto;
+static gint hf_hislip_msgpara_vendorID;
+static gint hf_hislip_msgpara_clientproto;
+static gint hf_hislip_msgpara_clients;
+static gint hf_hislip_msgpara_timeout;
+static gint hf_hislip_fatalerrcode;
+static gint hf_hislip_nonfatalerrorcode;
+static gint hf_hislip_syn;
+static gint hf_hislip_asyn;
+static gint hf_hislip_retransmission;
+static gint hf_hislip_request;
+static gint hf_hislip_maxmessagesize;
+static gint hf_hislip_response;
 
 /*Subtree index*/
-static gint ett_hislip = -1;
-static gint ett_hislip_msgpara = -1;
+static gint ett_hislip;
+static gint ett_hislip_msgpara;
 
 
-static expert_field ei_wrong_prologue = EI_INIT;
-static expert_field ei_msg_not_null = EI_INIT;
+static expert_field ei_wrong_prologue;
+static expert_field ei_msg_not_null;
 
 static const range_string messagetypestring[] =
 {
diff --git a/epan/dissectors/packet-hl7.c b/epan/dissectors/packet-hl7.c
index ed8d49a4cb..498007b6af 100644
--- a/epan/dissectors/packet-hl7.c
+++ b/epan/dissectors/packet-hl7.c
@@ -53,21 +53,21 @@ struct msh {                    // typical/default values
 
 dissector_handle_t hl7_handle;
 
-static int proto_hl7 = -1;
+static int proto_hl7;
 
-static gint hf_hl7_raw = -1;
-static gint hf_hl7_raw_segment = -1;
-static gint hf_hl7_llp_sob = -1;
-static gint hf_hl7_llp_eob = -1;
-static gint hf_hl7_message_type = -1;
-static gint hf_hl7_event_type = -1;
-static gint hf_hl7_segment = -1;
-static gint hf_hl7_field = -1;
+static gint hf_hl7_raw;
+static gint hf_hl7_raw_segment;
+static gint hf_hl7_llp_sob;
+static gint hf_hl7_llp_eob;
+static gint hf_hl7_message_type;
+static gint hf_hl7_event_type;
+static gint hf_hl7_segment;
+static gint hf_hl7_field;
 
-static gint ett_hl7 = -1;
-static gint ett_hl7_segment = -1;
+static gint ett_hl7;
+static gint ett_hl7_segment;
 
-static expert_field ei_hl7_malformed = EI_INIT;
+static expert_field ei_hl7_malformed;
 
 /* FF: global_hl7_raw determines whether we are going to display
  * the raw text of the HL7 message (like SIP and MEGACO dissectors) */
diff --git a/epan/dissectors/packet-homeplug-av.c b/epan/dissectors/packet-homeplug-av.c
index f6712b10fe..a32d2882e5 100644
--- a/epan/dissectors/packet-homeplug-av.c
+++ b/epan/dissectors/packet-homeplug-av.c
@@ -23,792 +23,792 @@ void proto_reg_handoff_homeplug_av(void);
 
 static dissector_handle_t homeplug_av_handle;
 
-static int proto_homeplug_av                     = -1;
-
-static int hf_homeplug_av_mmhdr                  = -1;
-static int hf_homeplug_av_mmhdr_mmver            = -1;
-static int hf_homeplug_av_mmhdr_mmtype_general   = -1;
-static int hf_homeplug_av_mmhdr_mmtype_qualcomm  = -1;
-static int hf_homeplug_av_mmhdr_mmtype_st        = -1;
-static int hf_homeplug_av_mmhdr_mmtype_lsb       = -1;
-static int hf_homeplug_av_mmhdr_mmtype_msb       = -1;
-static int hf_homeplug_av_mmhdr_fmi              = -1;
-static int hf_homeplug_av_vendor                 = -1;
-static int hf_homeplug_av_vendor_oui             = -1;
-static int hf_homeplug_av_reserved               = -1;
+static int proto_homeplug_av;
+
+static int hf_homeplug_av_mmhdr;
+static int hf_homeplug_av_mmhdr_mmver;
+static int hf_homeplug_av_mmhdr_mmtype_general;
+static int hf_homeplug_av_mmhdr_mmtype_qualcomm;
+static int hf_homeplug_av_mmhdr_mmtype_st;
+static int hf_homeplug_av_mmhdr_mmtype_lsb;
+static int hf_homeplug_av_mmhdr_mmtype_msb;
+static int hf_homeplug_av_mmhdr_fmi;
+static int hf_homeplug_av_vendor;
+static int hf_homeplug_av_vendor_oui;
+static int hf_homeplug_av_reserved;
 
 /* Frame Control fields (for sniffer data) */
-static int hf_homeplug_av_fc                     = -1;
-static int hf_homeplug_av_fc_del_type            = -1;
-static int hf_homeplug_av_fc_access              = -1;
-static int hf_homeplug_av_fc_snid                = -1;
-static int hf_homeplug_av_fc_fccs_av             = -1;
+static int hf_homeplug_av_fc;
+static int hf_homeplug_av_fc_del_type;
+static int hf_homeplug_av_fc_access;
+static int hf_homeplug_av_fc_snid;
+static int hf_homeplug_av_fc_fccs_av;
 
 /* Variant fields used by multiple MPDU types */
-static int hf_homeplug_av_dtei                   = -1;
-static int hf_homeplug_av_stei                   = -1;
-static int hf_homeplug_av_lid                    = -1;
-static int hf_homeplug_av_cfs                    = -1;
-static int hf_homeplug_av_bdf                    = -1;
-static int hf_homeplug_av_hp10df                 = -1;
-static int hf_homeplug_av_hp11df                 = -1;
-static int hf_homeplug_av_svn                    = -1;
-static int hf_homeplug_av_rrtf                   = -1;
-static int hf_homeplug_av_fl_av                  = -1;
-static int hf_homeplug_av_ppb                    = -1;
-static int hf_homeplug_av_mfs_rsp_data           = -1;
-static int hf_homeplug_av_mfs_rsp_mgmt           = -1;
+static int hf_homeplug_av_dtei;
+static int hf_homeplug_av_stei;
+static int hf_homeplug_av_lid;
+static int hf_homeplug_av_cfs;
+static int hf_homeplug_av_bdf;
+static int hf_homeplug_av_hp10df;
+static int hf_homeplug_av_hp11df;
+static int hf_homeplug_av_svn;
+static int hf_homeplug_av_rrtf;
+static int hf_homeplug_av_fl_av;
+static int hf_homeplug_av_ppb;
+static int hf_homeplug_av_mfs_rsp_data;
+static int hf_homeplug_av_mfs_rsp_mgmt;
 
 /* Beacon */
-static int hf_homeplug_av_bcn                    = -1;
-static int hf_homeplug_av_bcn_bts                = -1;
-static int hf_homeplug_av_bcn_bto_0              = -1;
-static int hf_homeplug_av_bcn_bto_1              = -1;
-static int hf_homeplug_av_bcn_bto_2              = -1;
-static int hf_homeplug_av_bcn_bto_3              = -1;
+static int hf_homeplug_av_bcn;
+static int hf_homeplug_av_bcn_bts;
+static int hf_homeplug_av_bcn_bto_0;
+static int hf_homeplug_av_bcn_bto_1;
+static int hf_homeplug_av_bcn_bto_2;
+static int hf_homeplug_av_bcn_bto_3;
 
 /* Beacon MPDU Payload */
-static int hf_homeplug_av_bcn_payload            = -1;
-static int hf_homeplug_av_bcn_type               = -1;
-static int hf_homeplug_av_bcn_nid                = -1;
-static int hf_homeplug_av_bcn_stei               = -1;
-static int hf_homeplug_av_bcn_ncnr               = -1;
-static int hf_homeplug_av_bcn_num_slots          = -1;
-static int hf_homeplug_av_bcn_slot_use           = -1;
-static int hf_homeplug_av_bcn_slot_id            = -1;
-static int hf_homeplug_av_bcn_aclss              = -1;
-static int hf_homeplug_av_bcn_hm                 = -1;
-static int hf_homeplug_av_bcn_nm                 = -1;
-static int hf_homeplug_av_bcn_npsm               = -1;
-static int hf_homeplug_av_bcn_cco_cap            = -1;
-static int hf_homeplug_av_bcn_rtsbf              = -1;
-static int hf_homeplug_av_bcn_hoip               = -1;
-static int hf_homeplug_av_bcn_rsf                = -1;
-static int hf_homeplug_av_bcn_plevel             = -1;
-static int hf_homeplug_av_bcn_bentries           = -1;
-static int hf_homeplug_av_bcn_bpcs               = -1;
+static int hf_homeplug_av_bcn_payload;
+static int hf_homeplug_av_bcn_type;
+static int hf_homeplug_av_bcn_nid;
+static int hf_homeplug_av_bcn_stei;
+static int hf_homeplug_av_bcn_ncnr;
+static int hf_homeplug_av_bcn_num_slots;
+static int hf_homeplug_av_bcn_slot_use;
+static int hf_homeplug_av_bcn_slot_id;
+static int hf_homeplug_av_bcn_aclss;
+static int hf_homeplug_av_bcn_hm;
+static int hf_homeplug_av_bcn_nm;
+static int hf_homeplug_av_bcn_npsm;
+static int hf_homeplug_av_bcn_cco_cap;
+static int hf_homeplug_av_bcn_rtsbf;
+static int hf_homeplug_av_bcn_hoip;
+static int hf_homeplug_av_bcn_rsf;
+static int hf_homeplug_av_bcn_plevel;
+static int hf_homeplug_av_bcn_bentries;
+static int hf_homeplug_av_bcn_bpcs;
 
 /* Start of Frame */
-static int hf_homeplug_av_sof                    = -1;
-static int hf_homeplug_av_sof_peks               = -1;
-static int hf_homeplug_av_sof_ble                = -1;
-static int hf_homeplug_av_sof_pbsz               = -1;
-static int hf_homeplug_av_sof_num_sym            = -1;
-static int hf_homeplug_av_sof_tmi_av             = -1;
-static int hf_homeplug_av_sof_mpdu_cnt           = -1;
-static int hf_homeplug_av_sof_burst_cnt          = -1;
-static int hf_homeplug_av_sof_bbf                = -1;
-static int hf_homeplug_av_sof_mrtfl              = -1;
-static int hf_homeplug_av_sof_clst               = -1;
-static int hf_homeplug_av_sof_mfs_cmd_mgmt       = -1;
-static int hf_homeplug_av_sof_mfs_cmd_data       = -1;
-static int hf_homeplug_av_sof_rsr                = -1;
-static int hf_homeplug_av_sof_mcf                = -1;
-static int hf_homeplug_av_sof_dccpcf             = -1;
-static int hf_homeplug_av_sof_mnbf               = -1;
-static int hf_homeplug_av_sof_mfs_rsp_mgmt       = -1;
-static int hf_homeplug_av_sof_mfs_rsp_data       = -1;
-static int hf_homeplug_av_sof_bm_sack            = -1;
+static int hf_homeplug_av_sof;
+static int hf_homeplug_av_sof_peks;
+static int hf_homeplug_av_sof_ble;
+static int hf_homeplug_av_sof_pbsz;
+static int hf_homeplug_av_sof_num_sym;
+static int hf_homeplug_av_sof_tmi_av;
+static int hf_homeplug_av_sof_mpdu_cnt;
+static int hf_homeplug_av_sof_burst_cnt;
+static int hf_homeplug_av_sof_bbf;
+static int hf_homeplug_av_sof_mrtfl;
+static int hf_homeplug_av_sof_clst;
+static int hf_homeplug_av_sof_mfs_cmd_mgmt;
+static int hf_homeplug_av_sof_mfs_cmd_data;
+static int hf_homeplug_av_sof_rsr;
+static int hf_homeplug_av_sof_mcf;
+static int hf_homeplug_av_sof_dccpcf;
+static int hf_homeplug_av_sof_mnbf;
+static int hf_homeplug_av_sof_mfs_rsp_mgmt;
+static int hf_homeplug_av_sof_mfs_rsp_data;
+static int hf_homeplug_av_sof_bm_sack;
 
 /* Selective Acknowledgement */
-static int hf_homeplug_av_sack                   = -1;
+static int hf_homeplug_av_sack;
 
 /* Request to Send/Clear to Send */
-static int hf_homeplug_av_rtscts                 = -1;
-static int hf_homeplug_av_rtscts_rtsf            = -1;
-static int hf_homeplug_av_rtscts_igf             = -1;
-static int hf_homeplug_av_rtscts_mnbf            = -1;
-static int hf_homeplug_av_rtscts_mcf             = -1;
-static int hf_homeplug_av_rtscts_dur             = -1;
+static int hf_homeplug_av_rtscts;
+static int hf_homeplug_av_rtscts_rtsf;
+static int hf_homeplug_av_rtscts_igf;
+static int hf_homeplug_av_rtscts_mnbf;
+static int hf_homeplug_av_rtscts_mcf;
+static int hf_homeplug_av_rtscts_dur;
 
 /* Sound */
-static int hf_homeplug_av_sound                  = -1;
-static int hf_homeplug_av_sound_pbsz             = -1;
-static int hf_homeplug_av_sound_bdf              = -1;
-static int hf_homeplug_av_sound_saf              = -1;
-static int hf_homeplug_av_sound_scf              = -1;
-static int hf_homeplug_av_sound_req_tm           = -1;
-static int hf_homeplug_av_sound_mpdu_cnt         = -1;
-static int hf_homeplug_av_sound_src              = -1;
-static int hf_homeplug_av_sound_add_req_tm       = -1;
-static int hf_homeplug_av_sound_max_pb_sym       = -1;
-static int hf_homeplug_av_sound_ecsf             = -1;
-static int hf_homeplug_av_sound_ecuf             = -1;
-static int hf_homeplug_av_sound_ems              = -1;
-static int hf_homeplug_av_sound_esgisf           = -1;
-static int hf_homeplug_av_sound_elgisf           = -1;
-static int hf_homeplug_av_sound_efrs             = -1;
+static int hf_homeplug_av_sound;
+static int hf_homeplug_av_sound_pbsz;
+static int hf_homeplug_av_sound_bdf;
+static int hf_homeplug_av_sound_saf;
+static int hf_homeplug_av_sound_scf;
+static int hf_homeplug_av_sound_req_tm;
+static int hf_homeplug_av_sound_mpdu_cnt;
+static int hf_homeplug_av_sound_src;
+static int hf_homeplug_av_sound_add_req_tm;
+static int hf_homeplug_av_sound_max_pb_sym;
+static int hf_homeplug_av_sound_ecsf;
+static int hf_homeplug_av_sound_ecuf;
+static int hf_homeplug_av_sound_ems;
+static int hf_homeplug_av_sound_esgisf;
+static int hf_homeplug_av_sound_elgisf;
+static int hf_homeplug_av_sound_efrs;
 
 /* Reverse Start of Frame */
-static int hf_homeplug_av_rsof                   = -1;
-static int hf_homeplug_av_rsof_fl                = -1;
-static int hf_homeplug_av_rsof_tmi               = -1;
-static int hf_homeplug_av_rsof_pbsz              = -1;
-static int hf_homeplug_av_rsof_num_sym           = -1;
-static int hf_homeplug_av_rsof_mfs_cmd_mgmt      = -1;
-static int hf_homeplug_av_rsof_mfs_cmd_data      = -1;
+static int hf_homeplug_av_rsof;
+static int hf_homeplug_av_rsof_fl;
+static int hf_homeplug_av_rsof_tmi;
+static int hf_homeplug_av_rsof_pbsz;
+static int hf_homeplug_av_rsof_num_sym;
+static int hf_homeplug_av_rsof_mfs_cmd_mgmt;
+static int hf_homeplug_av_rsof_mfs_cmd_data;
 
 /* Public MMEs */
-static int hf_homeplug_av_public                 = -1;
-static int hf_homeplug_av_public_frag_count      = -1;
-static int hf_homeplug_av_public_frag_index      = -1;
-static int hf_homeplug_av_public_frag_seqnum     = -1;
-
-static int hf_homeplug_av_cc_disc_list_cnf       = -1;
-
-static int hf_homeplug_av_cc_disc_list_sta_cnt   = -1;
-static int hf_homeplug_av_cc_sta_info            = -1;
-static int hf_homeplug_av_cc_sta_info_mac        = -1;
-static int hf_homeplug_av_cc_sta_info_tei        = -1;
-static int hf_homeplug_av_cc_sta_info_same_net   = -1;
-static int hf_homeplug_av_cc_sta_info_sig_level  = -1;
-static int hf_homeplug_av_cc_sta_info_avg_ble    = -1;
-
-static int hf_homeplug_av_cc_disc_list_net_cnt   = -1;
-static int hf_homeplug_av_cc_net_info            = -1;
-static int hf_homeplug_av_cc_net_info_hyb_mode   = -1;
-static int hf_homeplug_av_cc_net_info_bcn_slots  = -1;
-static int hf_homeplug_av_cc_net_info_cco_sts    = -1;
-static int hf_homeplug_av_cc_net_info_bcn_ofs    = -1;
-
-static int hf_homeplug_av_brg_infos_cnf          = -1;
-static int hf_homeplug_av_brg_infos_cnf_brd      = -1;
-static int hf_homeplug_av_brg_infos_cnf_btei     = -1;
-static int hf_homeplug_av_brg_infos_cnf_num_stas = -1;
-static int hf_homeplug_av_brg_infos_cnf_mac      = -1;
-
-static int hf_homeplug_av_cm_nw_infos_cnf        = -1;
-
-static int hf_homeplug_av_nw_stats_cnf           = -1;
+static int hf_homeplug_av_public;
+static int hf_homeplug_av_public_frag_count;
+static int hf_homeplug_av_public_frag_index;
+static int hf_homeplug_av_public_frag_seqnum;
+
+static int hf_homeplug_av_cc_disc_list_cnf;
+
+static int hf_homeplug_av_cc_disc_list_sta_cnt;
+static int hf_homeplug_av_cc_sta_info;
+static int hf_homeplug_av_cc_sta_info_mac;
+static int hf_homeplug_av_cc_sta_info_tei;
+static int hf_homeplug_av_cc_sta_info_same_net;
+static int hf_homeplug_av_cc_sta_info_sig_level;
+static int hf_homeplug_av_cc_sta_info_avg_ble;
+
+static int hf_homeplug_av_cc_disc_list_net_cnt;
+static int hf_homeplug_av_cc_net_info;
+static int hf_homeplug_av_cc_net_info_hyb_mode;
+static int hf_homeplug_av_cc_net_info_bcn_slots;
+static int hf_homeplug_av_cc_net_info_cco_sts;
+static int hf_homeplug_av_cc_net_info_bcn_ofs;
+
+static int hf_homeplug_av_brg_infos_cnf;
+static int hf_homeplug_av_brg_infos_cnf_brd;
+static int hf_homeplug_av_brg_infos_cnf_btei;
+static int hf_homeplug_av_brg_infos_cnf_num_stas;
+static int hf_homeplug_av_brg_infos_cnf_mac;
+
+static int hf_homeplug_av_cm_nw_infos_cnf;
+
+static int hf_homeplug_av_nw_stats_cnf;
 
 /* Shared network informations fields */
-static int hf_homeplug_av_nw_info_peks           = -1;
-static int hf_homeplug_av_nw_info_pid            = -1;
-static int hf_homeplug_av_nw_info_prn            = -1;
-static int hf_homeplug_av_nw_info_pmn            = -1;
-static int hf_homeplug_av_nw_info_my_nonce       = -1;
-static int hf_homeplug_av_nw_info_your_nonce     = -1;
-static int hf_homeplug_av_nw_info_key_type       = -1;
-static int hf_homeplug_av_nw_info_cco_cap        = -1;
-static int hf_homeplug_av_nw_info_num_avlns      = -1;
-static int hf_homeplug_av_nw_info_nid            = -1;
-static int hf_homeplug_av_nw_info_snid           = -1;
-static int hf_homeplug_av_nw_info_tei            = -1;
-static int hf_homeplug_av_nw_info_sta_role       = -1;
-static int hf_homeplug_av_nw_info_cco_mac        = -1;
-static int hf_homeplug_av_nw_info_cco_tei        = -1;
-static int hf_homeplug_av_nw_info_num_stas       = -1;
-static int hf_homeplug_av_nw_info_access         = -1;
-static int hf_homeplug_av_nw_info_num_coord      = -1;
-
-
-static int hf_homeplug_av_cm_enc_pld_ind         = -1;
-static int hf_homeplug_av_cm_enc_pld_ind_avlns   = -1;
-static int hf_homeplug_av_cm_enc_pld_ind_iv      = -1;
-static int hf_homeplug_av_cm_enc_pld_ind_uuid    = -1;
-static int hf_homeplug_av_cm_enc_pld_ind_len     = -1;
-static int hf_homeplug_av_cm_enc_pld_ind_pld     = -1;
-
-static int hf_homeplug_av_cm_enc_pld_rsp         = -1;
-static int hf_homeplug_av_cm_enc_pld_rsp_result  = -1;
-
-static int hf_homeplug_av_cm_set_key_req         = -1;
-static int hf_homeplug_av_cm_set_key_req_nw_key  = -1;
-
-static int hf_homeplug_av_cm_set_key_cnf         = -1;
-static int hf_homeplug_av_cm_set_key_cnf_result  = -1;
-
-static int hf_homeplug_av_cm_get_key_req         = -1;
-static int hf_homeplug_av_cm_get_key_req_type    = -1;
-static int hf_homeplug_av_cm_get_key_req_has_key = -1;
-
-static int hf_homeplug_av_cm_get_key_cnf         = -1;
-static int hf_homeplug_av_cm_get_key_cnf_result  = -1;
-static int hf_homeplug_av_cm_get_key_cnf_rtype   = -1;
-static int hf_homeplug_av_cm_get_key_cnf_key     = -1;
+static int hf_homeplug_av_nw_info_peks;
+static int hf_homeplug_av_nw_info_pid;
+static int hf_homeplug_av_nw_info_prn;
+static int hf_homeplug_av_nw_info_pmn;
+static int hf_homeplug_av_nw_info_my_nonce;
+static int hf_homeplug_av_nw_info_your_nonce;
+static int hf_homeplug_av_nw_info_key_type;
+static int hf_homeplug_av_nw_info_cco_cap;
+static int hf_homeplug_av_nw_info_num_avlns;
+static int hf_homeplug_av_nw_info_nid;
+static int hf_homeplug_av_nw_info_snid;
+static int hf_homeplug_av_nw_info_tei;
+static int hf_homeplug_av_nw_info_sta_role;
+static int hf_homeplug_av_nw_info_cco_mac;
+static int hf_homeplug_av_nw_info_cco_tei;
+static int hf_homeplug_av_nw_info_num_stas;
+static int hf_homeplug_av_nw_info_access;
+static int hf_homeplug_av_nw_info_num_coord;
+
+
+static int hf_homeplug_av_cm_enc_pld_ind;
+static int hf_homeplug_av_cm_enc_pld_ind_avlns;
+static int hf_homeplug_av_cm_enc_pld_ind_iv;
+static int hf_homeplug_av_cm_enc_pld_ind_uuid;
+static int hf_homeplug_av_cm_enc_pld_ind_len;
+static int hf_homeplug_av_cm_enc_pld_ind_pld;
+
+static int hf_homeplug_av_cm_enc_pld_rsp;
+static int hf_homeplug_av_cm_enc_pld_rsp_result;
+
+static int hf_homeplug_av_cm_set_key_req;
+static int hf_homeplug_av_cm_set_key_req_nw_key;
+
+static int hf_homeplug_av_cm_set_key_cnf;
+static int hf_homeplug_av_cm_set_key_cnf_result;
+
+static int hf_homeplug_av_cm_get_key_req;
+static int hf_homeplug_av_cm_get_key_req_type;
+static int hf_homeplug_av_cm_get_key_req_has_key;
+
+static int hf_homeplug_av_cm_get_key_cnf;
+static int hf_homeplug_av_cm_get_key_cnf_result;
+static int hf_homeplug_av_cm_get_key_cnf_rtype;
+static int hf_homeplug_av_cm_get_key_cnf_key;
 
 
 /* Intellon specific vendor MMEs */
-static int hf_homeplug_av_get_sw_cnf             = -1;
-static int hf_homeplug_av_get_sw_cnf_status      = -1;
-static int hf_homeplug_av_get_sw_cnf_dev_id      = -1;
-static int hf_homeplug_av_get_sw_cnf_ver_len     = -1;
-static int hf_homeplug_av_get_sw_cnf_ver_str     = -1;
-static int hf_homeplug_av_get_sw_cnf_upg         = -1;
+static int hf_homeplug_av_get_sw_cnf;
+static int hf_homeplug_av_get_sw_cnf_status;
+static int hf_homeplug_av_get_sw_cnf_dev_id;
+static int hf_homeplug_av_get_sw_cnf_ver_len;
+static int hf_homeplug_av_get_sw_cnf_ver_str;
+static int hf_homeplug_av_get_sw_cnf_upg;
 
 /* Shared memory related fields */
-static int hf_homeplug_av_mem_len_16bits         = -1;
-static int hf_homeplug_av_mem_len_32bits         = -1;
-static int hf_homeplug_av_mem_offset             = -1;
-static int hf_homeplug_av_mem_checksum           = -1;
-static int hf_homeplug_av_mem_data               = -1;
-static int hf_homeplug_av_mem_addr               = -1;
-static int hf_homeplug_av_mem_status             = -1;
-
-static int hf_homeplug_av_wr_mem_req             = -1;
-static int hf_homeplug_av_wr_mem_cnf             = -1;
-
-static int hf_homeplug_av_rd_mem_req             = -1;
-static int hf_homeplug_av_rd_mem_cnf             = -1;
-
-static int hf_homeplug_av_mac_module_id          = -1;
-
-static int hf_homeplug_av_st_mac_req             = -1;
-static int hf_homeplug_av_st_mac_req_img_load    = -1;
-static int hf_homeplug_av_st_mac_req_img_len     = -1;
-static int hf_homeplug_av_st_mac_req_img_chksum  = -1;
-static int hf_homeplug_av_st_mac_req_img_start   = -1;
-
-static int hf_homeplug_av_st_mac_cnf             = -1;
-static int hf_homeplug_av_st_mac_cnf_status      = -1;
-
-static int hf_homeplug_av_get_nvm_cnf            = -1;
-static int hf_homeplug_av_get_nvm_cnf_status     = -1;
-static int hf_homeplug_av_get_nvm_cnf_nvm_type   = -1;
-static int hf_homeplug_av_get_nvm_cnf_nvm_page   = -1;
-static int hf_homeplug_av_get_nvm_cnf_nvm_block  = -1;
-static int hf_homeplug_av_get_nvm_cnf_nvm_size   = -1;
-
-static int hf_homeplug_av_rs_dev_cnf             = -1;
-static int hf_homeplug_av_rs_dev_cnf_status      = -1;
-
-static int hf_homeplug_av_wr_mod_req             = -1;
-
-static int hf_homeplug_av_wr_mod_cnf             = -1;
-static int hf_homeplug_av_wr_mod_cnf_status      = -1;
-
-static int hf_homeplug_av_wr_mod_ind             = -1;
-static int hf_homeplug_av_wr_mod_ind_status      = -1;
-
-static int hf_homeplug_av_rd_mod_req             = -1;
-
-static int hf_homeplug_av_rd_mod_cnf             = -1;
-static int hf_homeplug_av_rd_mod_cnf_status      = -1;
-
-static int hf_homeplug_av_mod_nvm_req            = -1;
-
-static int hf_homeplug_av_mod_nvm_cnf            = -1;
-static int hf_homeplug_av_mod_nvm_cnf_status     = -1;
-
-static int hf_homeplug_av_wd_rpt_req             = -1;
-static int hf_homeplug_av_wd_rpt_req_session_id  = -1;
-static int hf_homeplug_av_wd_rpt_req_clr         = -1;
-
-static int hf_homeplug_av_wd_rpt_ind             = -1;
-static int hf_homeplug_av_wd_rpt_ind_status      = -1;
-static int hf_homeplug_av_wd_rpt_ind_session_id  = -1;
-static int hf_homeplug_av_wd_rpt_ind_num_parts   = -1;
-static int hf_homeplug_av_wd_rpt_ind_curr_part   = -1;
-static int hf_homeplug_av_wd_rpt_ind_rdata_len   = -1;
-static int hf_homeplug_av_wd_rpt_ind_rdata_ofs   = -1;
-static int hf_homeplug_av_wd_rpt_ind_rdata       = -1;
-
-static int hf_homeplug_av_lnk_stats_req          = -1;
-static int hf_homeplug_av_lnk_stats_req_mcontrol = -1;
-static int hf_homeplug_av_lnk_stats_req_dir      = -1;
-static int hf_homeplug_av_lnk_stats_req_lid      = -1;
-static int hf_homeplug_av_lnk_stats_req_macaddr  = -1;
-
-static int hf_homeplug_av_lnk_stats_cnf          = -1;
-static int hf_homeplug_av_lnk_stats_cnf_status   = -1;
-static int hf_homeplug_av_lnk_stats_cnf_dir      = -1;
-static int hf_homeplug_av_lnk_stats_cnf_lid      = -1;
-static int hf_homeplug_av_lnk_stats_cnf_tei      = -1;
-static int hf_homeplug_av_lnk_stats_cnf_lstats   = -1;
-
-static int hf_homeplug_av_lnk_stats_tx           = -1;
-static int hf_homeplug_av_lnk_stats_tx_mpdu_ack  = -1;
-static int hf_homeplug_av_lnk_stats_tx_mpdu_col  = -1;
-static int hf_homeplug_av_lnk_stats_tx_mpdu_fai  = -1;
-static int hf_homeplug_av_lnk_stats_tx_pbs_pass  = -1;
-static int hf_homeplug_av_lnk_stats_tx_pbs_fail  = -1;
-
-static int hf_homeplug_av_lnk_stats_rx           = -1;
-static int hf_homeplug_av_lnk_stats_rx_mpdu_ack  = -1;
-static int hf_homeplug_av_lnk_stats_rx_mpdu_fai  = -1;
-static int hf_homeplug_av_lnk_stats_rx_pbs_pass  = -1;
-static int hf_homeplug_av_lnk_stats_rx_pbs_fail  = -1;
-static int hf_homeplug_av_lnk_stats_rx_tb_pass   = -1;
-static int hf_homeplug_av_lnk_stats_rx_tb_fail   = -1;
-static int hf_homeplug_av_lnk_stats_rx_num_int   = -1;
-
-static int hf_homeplug_av_rx_inv_stats           = -1;
-static int hf_homeplug_av_rx_inv_phy_rate        = -1;
-static int hf_homeplug_av_rx_inv_pbs_pass        = -1;
-static int hf_homeplug_av_rx_inv_pbs_fail        = -1;
-static int hf_homeplug_av_rx_inv_tb_pass         = -1;
-static int hf_homeplug_av_rx_inv_tb_fail         = -1;
-
-static int hf_homeplug_av_sniffer_req            = -1;
-static int hf_homeplug_av_sniffer_req_ctrl       = -1;
-
-static int hf_homeplug_av_sniffer_cnf            = -1;
-static int hf_homeplug_av_sniffer_cnf_status     = -1;
-static int hf_homeplug_av_sniffer_cnf_state      = -1;
-static int hf_homeplug_av_sniffer_cnf_da         = -1;
-
-static int hf_homeplug_av_sniffer_ind            = -1;
-static int hf_homeplug_av_sniffer_ind_type       = -1;
-static int hf_homeplug_av_sniffer_ind_data       = -1;
-static int hf_homeplug_av_sniffer_data_dir       = -1;
-static int hf_homeplug_av_sniffer_data_systime   = -1;
-static int hf_homeplug_av_sniffer_data_bc_time   = -1;
-
-static int hf_homeplug_av_nw_info_cnf            = -1;
-
-static int hf_homeplug_av_nw_info_sta_info       = -1;
-static int hf_homeplug_av_nw_info_net_info       = -1;
-
-static int hf_homeplug_av_nw_info_sta_da         = -1;
-static int hf_homeplug_av_nw_info_sta_tei        = -1;
-static int hf_homeplug_av_nw_info_sta_bda        = -1;
-static int hf_homeplug_av10_nw_info_sta_phy_dr_tx= -1;
-static int hf_homeplug_av10_nw_info_sta_phy_dr_rx= -1;
-static int hf_homeplug_av11_nw_info_sta_phy_dr_tx= -1;
-static int hf_homeplug_av11_nw_info_sta_cpling_tx = -1;
-static int hf_homeplug_av11_nw_info_sta_phy_dr_rx= -1;
-static int hf_homeplug_av11_nw_info_sta_cpling_rx = -1;
-
-static int hf_homeplug_av_cp_rpt_req             = -1;
-static int hf_homeplug_av_cp_rpt_req_session_id  = -1;
-static int hf_homeplug_av_cp_rpt_req_clr         = -1;
-
-static int hf_homeplug_av_cp_rpt_ind             = -1;
-static int hf_homeplug_av_cp_rpt_ind_status      = -1;
-static int hf_homeplug_av_cp_rpt_ind_major_ver   = -1;
-static int hf_homeplug_av_cp_rpt_ind_minor_ver   = -1;
-static int hf_homeplug_av_cp_rpt_ind_session_id  = -1;
-static int hf_homeplug_av_cp_rpt_ind_total_size  = -1;
-static int hf_homeplug_av_cp_rpt_ind_blk_offset  = -1;
-static int hf_homeplug_av_cp_rpt_ind_byte_index  = -1;
-static int hf_homeplug_av_cp_rpt_ind_num_parts   = -1;
-static int hf_homeplug_av_cp_rpt_ind_curr_part   = -1;
-static int hf_homeplug_av_cp_rpt_ind_data_len    = -1;
-static int hf_homeplug_av_cp_rpt_ind_data_ofs    = -1;
-static int hf_homeplug_av_cp_rpt_ind_data        = -1;
-
-static int hf_homeplug_av_fr_lbk_duration        = -1;
-static int hf_homeplug_av_fr_lbk_len             = -1;
-
-static int hf_homeplug_av_fr_lbk_req             = -1;
-static int hf_homeplug_av_fr_lbk_req_data        = -1;
-
-static int hf_homeplug_av_fr_lbk_cnf             = -1;
-static int hf_homeplug_av_fr_lbk_cnf_status      = -1;
-
-static int hf_homeplug_av_lbk_stat_cnf           = -1;
-static int hf_homeplug_av_lbk_stat_cnf_status    = -1;
-static int hf_homeplug_av_lbk_stat_cnf_lbk_stat  = -1;
-
-static int hf_homeplug_av_set_key_req            = -1;
-static int hf_homeplug_av_set_key_req_eks        = -1;
-static int hf_homeplug_av_set_key_req_nmk        = -1;
-static int hf_homeplug_av_set_key_req_rda        = -1;
-static int hf_homeplug_av_set_key_req_dak        = -1;
-
-static int hf_homeplug_av_set_key_cnf            = -1;
-static int hf_homeplug_av_set_key_cnf_status     = -1;
-
-static int hf_homeplug_av_mfg_string_cnf         = -1;
-static int hf_homeplug_av_mfg_string_cnf_status  = -1;
-static int hf_homeplug_av_mfg_string_cnf_len     = -1;
-static int hf_homeplug_av_mfg_string_cnf_string  = -1;
-
-static int hf_homeplug_av_rd_cblock_cnf          = -1;
-static int hf_homeplug_av_rd_cblock_cnf_status   = -1;
-static int hf_homeplug_av_rd_cblock_cnf_len      = -1;
-
-static int hf_homeplug_av_cblock_hdr             = -1;
-static int hf_homeplug_av_cblock_hdr_ver         = -1;
-static int hf_homeplug_av_cblock_img_rom_addr    = -1;
-static int hf_homeplug_av_cblock_img_addr        = -1;
-static int hf_homeplug_av_cblock_img_len         = -1;
-static int hf_homeplug_av_cblock_img_chksum      = -1;
-static int hf_homeplug_av_cblock_entry_point     = -1;
-static int hf_homeplug_av_cblock_hdr_minor       = -1;
-static int hf_homeplug_av_cblock_hdr_img_type    = -1;
-static int hf_homeplug_av_cblock_hdr_ignore_mask = -1;
-static int hf_homeplug_av_cblock_hdr_module_id   = -1;
-static int hf_homeplug_av_cblock_hdr_module_subid= -1;
-static int hf_homeplug_av_cblock_next_hdr        = -1;
-static int hf_homeplug_av_cblock_hdr_chksum      = -1;
-
-static int hf_homeplug_av_cblock                 = -1;
-static int hf_homeplug_av_cblock_sdram_size      = -1;
-static int hf_homeplug_av_cblock_sdram_conf      = -1;
-static int hf_homeplug_av_cblock_sdram_tim0      = -1;
-static int hf_homeplug_av_cblock_sdram_tim1      = -1;
-static int hf_homeplug_av_cblock_sdram_cntrl     = -1;
-static int hf_homeplug_av_cblock_sdram_refresh   = -1;
-static int hf_homeplug_av_cblock_mac_clock       = -1;
-
-static int hf_homeplug_av_set_sdram_req          = -1;
-static int hf_homeplug_av_set_sdram_req_chksum   = -1;
-
-static int hf_homeplug_av_set_sdram_cnf          = -1;
-static int hf_homeplug_av_set_sdram_cnf_status   = -1;
-
-static int hf_homeplug_av_host_action_ind        = -1;
-static int hf_homeplug_av_host_action_ind_act    = -1;
-
-static int hf_homeplug_av_host_action_rsp        = -1;
-static int hf_homeplug_av_host_action_rsp_sts    = -1;
-
-static int hf_homeplug_av_op_attr_cookie         = -1;
-static int hf_homeplug_av_op_attr_rep_type       = -1;
-
-static int hf_homeplug_av_op_attr_req            = -1;
-
-static int hf_homeplug_av_op_attr_cnf            = -1;
-static int hf_homeplug_av_op_attr_cnf_status     = -1;
-static int hf_homeplug_av_op_attr_cnf_size       = -1;
-static int hf_homeplug_av_op_attr_cnf_data       = -1;
-
-static int hf_homeplug_av_op_attr_data_hw        = -1;
-static int hf_homeplug_av_op_attr_data_sw        = -1;
-static int hf_homeplug_av_op_attr_data_sw_major  = -1;
-static int hf_homeplug_av_op_attr_data_sw_minor  = -1;
-static int hf_homeplug_av_op_attr_data_sw_sub    = -1;
-static int hf_homeplug_av_op_attr_data_sw_num    = -1;
-static int hf_homeplug_av_op_attr_data_sw_date   = -1;
-static int hf_homeplug_av_op_attr_data_sw_rel    = -1;
-static int hf_homeplug_av_op_attr_data_sw_sdram_type = -1;
-static int hf_homeplug_av_op_attr_data_sw_linefreq = -1;
-static int hf_homeplug_av_op_attr_data_sw_zerocross = -1;
-static int hf_homeplug_av_op_attr_data_sw_sdram_size = -1;
-static int hf_homeplug_av_op_attr_data_sw_auth_mode = -1;
-
-static int hf_homeplug_av_enet_phy_req           = -1;
-static int hf_homeplug_av_enet_phy_req_mcontrol  = -1;
-static int hf_homeplug_av_enet_phy_req_addcaps   = -1;
-
-static int hf_homeplug_av_enet_phy_cnf           = -1;
-static int hf_homeplug_av_enet_phy_cnf_status    = -1;
-static int hf_homeplug_av_enet_phy_cnf_speed     = -1;
-static int hf_homeplug_av_enet_phy_cnf_duplex    = -1;
-
-static int hf_homeplug_av_tone_map_tx_req          = -1;
-static int hf_homeplug_av_tone_map_tx_req_mac      = -1;
-static int hf_homeplug_av_tone_map_tx_req_slot     = -1;
-static int hf_homeplug_av_tone_map_tx_req_coupling = -1;
-
-static int hf_homeplug_av_tone_map_rx_req          = -1;
-static int hf_homeplug_av_tone_map_rx_req_mac      = -1;
-static int hf_homeplug_av_tone_map_rx_req_slot     = -1;
-static int hf_homeplug_av_tone_map_rx_req_coupling = -1;
-
-static int hf_homeplug_av_tone_map_tx_cnf          = -1;
-static int hf_homeplug_av_tone_map_tx_cnf_status   = -1;
-static int hf_homeplug_av_tone_map_tx_cnf_len      = -1;
-static int hf_homeplug_av_tone_map_tx_cnf_mac      = -1;
-static int hf_homeplug_av_tone_map_tx_cnf_slot     = -1;
-static int hf_homeplug_av_tone_map_tx_cnf_num_tms  = -1;
-static int hf_homeplug_av_tone_map_tx_cnf_num_act  = -1;
-
-static int hf_homeplug_av_tone_map_rx_cnf          = -1;
-static int hf_homeplug_av_tone_map_rx_cnf_status   = -1;
-static int hf_homeplug_av_tone_map_rx_cnf_len      = -1;
-static int hf_homeplug_av_tone_map_rx_cnf_subver   = -1;
-static int hf_homeplug_av_tone_map_rx_cnf_coupling = -1;
-static int hf_homeplug_av_tone_map_rx_cnf_mac      = -1;
-static int hf_homeplug_av_tone_map_rx_cnf_slot     = -1;
-static int hf_homeplug_av_tone_map_rx_cnf_num_tms  = -1;
-static int hf_homeplug_av_tone_map_rx_cnf_num_act  = -1;
-static int hf_homeplug_av_tone_map_rx_cnf_agc      = -1;
-static int hf_homeplug_av_tone_map_rx_cnf_gil      = -1;
-
-static int hf_homeplug_av_tone_map_carriers        = -1;
-static int hf_homeplug_av_tone_map_carrier       = -1;
-static int hf_homeplug_av_tone_map_carrier_lo    = -1;
-static int hf_homeplug_av_tone_map_carrier_hi    = -1;
-
-static int hf_homeplug_av_cc_assoc_reqtype       = -1;
-static int hf_homeplug_av_cc_assoc_cco_cap       = -1;
-static int hf_homeplug_av_cc_assoc_proxy_net_cap = -1;
-static int hf_homeplug_av_cc_assoc_result        = -1;
-static int hf_homeplug_av_cc_assoc_nid           = -1;
-static int hf_homeplug_av_cc_assoc_snid          = -1;
-static int hf_homeplug_av_cc_assoc_tei           = -1;
-static int hf_homeplug_av_cc_assoc_lease_time    = -1;
-
-static int hf_homeplug_av_cc_set_tei_map_ind_mode    = -1;
-static int hf_homeplug_av_cc_set_tei_map_ind_num     = -1;
-static int hf_homeplug_av_cc_set_tei_map_ind_tei     = -1;
-static int hf_homeplug_av_cc_set_tei_map_ind_mac     = -1;
-static int hf_homeplug_av_cc_set_tei_map_ind_status  = -1;
-
-static int hf_homeplug_av_cm_unassoc_sta_nid     = -1;
-static int hf_homeplug_av_cm_unassoc_sta_cco_cap = -1;
+static int hf_homeplug_av_mem_len_16bits;
+static int hf_homeplug_av_mem_len_32bits;
+static int hf_homeplug_av_mem_offset;
+static int hf_homeplug_av_mem_checksum;
+static int hf_homeplug_av_mem_data;
+static int hf_homeplug_av_mem_addr;
+static int hf_homeplug_av_mem_status;
+
+static int hf_homeplug_av_wr_mem_req;
+static int hf_homeplug_av_wr_mem_cnf;
+
+static int hf_homeplug_av_rd_mem_req;
+static int hf_homeplug_av_rd_mem_cnf;
+
+static int hf_homeplug_av_mac_module_id;
+
+static int hf_homeplug_av_st_mac_req;
+static int hf_homeplug_av_st_mac_req_img_load;
+static int hf_homeplug_av_st_mac_req_img_len;
+static int hf_homeplug_av_st_mac_req_img_chksum;
+static int hf_homeplug_av_st_mac_req_img_start;
+
+static int hf_homeplug_av_st_mac_cnf;
+static int hf_homeplug_av_st_mac_cnf_status;
+
+static int hf_homeplug_av_get_nvm_cnf;
+static int hf_homeplug_av_get_nvm_cnf_status;
+static int hf_homeplug_av_get_nvm_cnf_nvm_type;
+static int hf_homeplug_av_get_nvm_cnf_nvm_page;
+static int hf_homeplug_av_get_nvm_cnf_nvm_block;
+static int hf_homeplug_av_get_nvm_cnf_nvm_size;
+
+static int hf_homeplug_av_rs_dev_cnf;
+static int hf_homeplug_av_rs_dev_cnf_status;
+
+static int hf_homeplug_av_wr_mod_req;
+
+static int hf_homeplug_av_wr_mod_cnf;
+static int hf_homeplug_av_wr_mod_cnf_status;
+
+static int hf_homeplug_av_wr_mod_ind;
+static int hf_homeplug_av_wr_mod_ind_status;
+
+static int hf_homeplug_av_rd_mod_req;
+
+static int hf_homeplug_av_rd_mod_cnf;
+static int hf_homeplug_av_rd_mod_cnf_status;
+
+static int hf_homeplug_av_mod_nvm_req;
+
+static int hf_homeplug_av_mod_nvm_cnf;
+static int hf_homeplug_av_mod_nvm_cnf_status;
+
+static int hf_homeplug_av_wd_rpt_req;
+static int hf_homeplug_av_wd_rpt_req_session_id;
+static int hf_homeplug_av_wd_rpt_req_clr;
+
+static int hf_homeplug_av_wd_rpt_ind;
+static int hf_homeplug_av_wd_rpt_ind_status;
+static int hf_homeplug_av_wd_rpt_ind_session_id;
+static int hf_homeplug_av_wd_rpt_ind_num_parts;
+static int hf_homeplug_av_wd_rpt_ind_curr_part;
+static int hf_homeplug_av_wd_rpt_ind_rdata_len;
+static int hf_homeplug_av_wd_rpt_ind_rdata_ofs;
+static int hf_homeplug_av_wd_rpt_ind_rdata;
+
+static int hf_homeplug_av_lnk_stats_req;
+static int hf_homeplug_av_lnk_stats_req_mcontrol;
+static int hf_homeplug_av_lnk_stats_req_dir;
+static int hf_homeplug_av_lnk_stats_req_lid;
+static int hf_homeplug_av_lnk_stats_req_macaddr;
+
+static int hf_homeplug_av_lnk_stats_cnf;
+static int hf_homeplug_av_lnk_stats_cnf_status;
+static int hf_homeplug_av_lnk_stats_cnf_dir;
+static int hf_homeplug_av_lnk_stats_cnf_lid;
+static int hf_homeplug_av_lnk_stats_cnf_tei;
+static int hf_homeplug_av_lnk_stats_cnf_lstats;
+
+static int hf_homeplug_av_lnk_stats_tx;
+static int hf_homeplug_av_lnk_stats_tx_mpdu_ack;
+static int hf_homeplug_av_lnk_stats_tx_mpdu_col;
+static int hf_homeplug_av_lnk_stats_tx_mpdu_fai;
+static int hf_homeplug_av_lnk_stats_tx_pbs_pass;
+static int hf_homeplug_av_lnk_stats_tx_pbs_fail;
+
+static int hf_homeplug_av_lnk_stats_rx;
+static int hf_homeplug_av_lnk_stats_rx_mpdu_ack;
+static int hf_homeplug_av_lnk_stats_rx_mpdu_fai;
+static int hf_homeplug_av_lnk_stats_rx_pbs_pass;
+static int hf_homeplug_av_lnk_stats_rx_pbs_fail;
+static int hf_homeplug_av_lnk_stats_rx_tb_pass;
+static int hf_homeplug_av_lnk_stats_rx_tb_fail;
+static int hf_homeplug_av_lnk_stats_rx_num_int;
+
+static int hf_homeplug_av_rx_inv_stats;
+static int hf_homeplug_av_rx_inv_phy_rate;
+static int hf_homeplug_av_rx_inv_pbs_pass;
+static int hf_homeplug_av_rx_inv_pbs_fail;
+static int hf_homeplug_av_rx_inv_tb_pass;
+static int hf_homeplug_av_rx_inv_tb_fail;
+
+static int hf_homeplug_av_sniffer_req;
+static int hf_homeplug_av_sniffer_req_ctrl;
+
+static int hf_homeplug_av_sniffer_cnf;
+static int hf_homeplug_av_sniffer_cnf_status;
+static int hf_homeplug_av_sniffer_cnf_state;
+static int hf_homeplug_av_sniffer_cnf_da;
+
+static int hf_homeplug_av_sniffer_ind;
+static int hf_homeplug_av_sniffer_ind_type;
+static int hf_homeplug_av_sniffer_ind_data;
+static int hf_homeplug_av_sniffer_data_dir;
+static int hf_homeplug_av_sniffer_data_systime;
+static int hf_homeplug_av_sniffer_data_bc_time;
+
+static int hf_homeplug_av_nw_info_cnf;
+
+static int hf_homeplug_av_nw_info_sta_info;
+static int hf_homeplug_av_nw_info_net_info;
+
+static int hf_homeplug_av_nw_info_sta_da;
+static int hf_homeplug_av_nw_info_sta_tei;
+static int hf_homeplug_av_nw_info_sta_bda;
+static int hf_homeplug_av10_nw_info_sta_phy_dr_tx;
+static int hf_homeplug_av10_nw_info_sta_phy_dr_rx;
+static int hf_homeplug_av11_nw_info_sta_phy_dr_tx;
+static int hf_homeplug_av11_nw_info_sta_cpling_tx;
+static int hf_homeplug_av11_nw_info_sta_phy_dr_rx;
+static int hf_homeplug_av11_nw_info_sta_cpling_rx;
+
+static int hf_homeplug_av_cp_rpt_req;
+static int hf_homeplug_av_cp_rpt_req_session_id;
+static int hf_homeplug_av_cp_rpt_req_clr;
+
+static int hf_homeplug_av_cp_rpt_ind;
+static int hf_homeplug_av_cp_rpt_ind_status;
+static int hf_homeplug_av_cp_rpt_ind_major_ver;
+static int hf_homeplug_av_cp_rpt_ind_minor_ver;
+static int hf_homeplug_av_cp_rpt_ind_session_id;
+static int hf_homeplug_av_cp_rpt_ind_total_size;
+static int hf_homeplug_av_cp_rpt_ind_blk_offset;
+static int hf_homeplug_av_cp_rpt_ind_byte_index;
+static int hf_homeplug_av_cp_rpt_ind_num_parts;
+static int hf_homeplug_av_cp_rpt_ind_curr_part;
+static int hf_homeplug_av_cp_rpt_ind_data_len;
+static int hf_homeplug_av_cp_rpt_ind_data_ofs;
+static int hf_homeplug_av_cp_rpt_ind_data;
+
+static int hf_homeplug_av_fr_lbk_duration;
+static int hf_homeplug_av_fr_lbk_len;
+
+static int hf_homeplug_av_fr_lbk_req;
+static int hf_homeplug_av_fr_lbk_req_data;
+
+static int hf_homeplug_av_fr_lbk_cnf;
+static int hf_homeplug_av_fr_lbk_cnf_status;
+
+static int hf_homeplug_av_lbk_stat_cnf;
+static int hf_homeplug_av_lbk_stat_cnf_status;
+static int hf_homeplug_av_lbk_stat_cnf_lbk_stat;
+
+static int hf_homeplug_av_set_key_req;
+static int hf_homeplug_av_set_key_req_eks;
+static int hf_homeplug_av_set_key_req_nmk;
+static int hf_homeplug_av_set_key_req_rda;
+static int hf_homeplug_av_set_key_req_dak;
+
+static int hf_homeplug_av_set_key_cnf;
+static int hf_homeplug_av_set_key_cnf_status;
+
+static int hf_homeplug_av_mfg_string_cnf;
+static int hf_homeplug_av_mfg_string_cnf_status;
+static int hf_homeplug_av_mfg_string_cnf_len;
+static int hf_homeplug_av_mfg_string_cnf_string;
+
+static int hf_homeplug_av_rd_cblock_cnf;
+static int hf_homeplug_av_rd_cblock_cnf_status;
+static int hf_homeplug_av_rd_cblock_cnf_len;
+
+static int hf_homeplug_av_cblock_hdr;
+static int hf_homeplug_av_cblock_hdr_ver;
+static int hf_homeplug_av_cblock_img_rom_addr;
+static int hf_homeplug_av_cblock_img_addr;
+static int hf_homeplug_av_cblock_img_len;
+static int hf_homeplug_av_cblock_img_chksum;
+static int hf_homeplug_av_cblock_entry_point;
+static int hf_homeplug_av_cblock_hdr_minor;
+static int hf_homeplug_av_cblock_hdr_img_type;
+static int hf_homeplug_av_cblock_hdr_ignore_mask;
+static int hf_homeplug_av_cblock_hdr_module_id;
+static int hf_homeplug_av_cblock_hdr_module_subid;
+static int hf_homeplug_av_cblock_next_hdr;
+static int hf_homeplug_av_cblock_hdr_chksum;
+
+static int hf_homeplug_av_cblock;
+static int hf_homeplug_av_cblock_sdram_size;
+static int hf_homeplug_av_cblock_sdram_conf;
+static int hf_homeplug_av_cblock_sdram_tim0;
+static int hf_homeplug_av_cblock_sdram_tim1;
+static int hf_homeplug_av_cblock_sdram_cntrl;
+static int hf_homeplug_av_cblock_sdram_refresh;
+static int hf_homeplug_av_cblock_mac_clock;
+
+static int hf_homeplug_av_set_sdram_req;
+static int hf_homeplug_av_set_sdram_req_chksum;
+
+static int hf_homeplug_av_set_sdram_cnf;
+static int hf_homeplug_av_set_sdram_cnf_status;
+
+static int hf_homeplug_av_host_action_ind;
+static int hf_homeplug_av_host_action_ind_act;
+
+static int hf_homeplug_av_host_action_rsp;
+static int hf_homeplug_av_host_action_rsp_sts;
+
+static int hf_homeplug_av_op_attr_cookie;
+static int hf_homeplug_av_op_attr_rep_type;
+
+static int hf_homeplug_av_op_attr_req;
+
+static int hf_homeplug_av_op_attr_cnf;
+static int hf_homeplug_av_op_attr_cnf_status;
+static int hf_homeplug_av_op_attr_cnf_size;
+static int hf_homeplug_av_op_attr_cnf_data;
+
+static int hf_homeplug_av_op_attr_data_hw;
+static int hf_homeplug_av_op_attr_data_sw;
+static int hf_homeplug_av_op_attr_data_sw_major;
+static int hf_homeplug_av_op_attr_data_sw_minor;
+static int hf_homeplug_av_op_attr_data_sw_sub;
+static int hf_homeplug_av_op_attr_data_sw_num;
+static int hf_homeplug_av_op_attr_data_sw_date;
+static int hf_homeplug_av_op_attr_data_sw_rel;
+static int hf_homeplug_av_op_attr_data_sw_sdram_type;
+static int hf_homeplug_av_op_attr_data_sw_linefreq;
+static int hf_homeplug_av_op_attr_data_sw_zerocross;
+static int hf_homeplug_av_op_attr_data_sw_sdram_size;
+static int hf_homeplug_av_op_attr_data_sw_auth_mode;
+
+static int hf_homeplug_av_enet_phy_req;
+static int hf_homeplug_av_enet_phy_req_mcontrol;
+static int hf_homeplug_av_enet_phy_req_addcaps;
+
+static int hf_homeplug_av_enet_phy_cnf;
+static int hf_homeplug_av_enet_phy_cnf_status;
+static int hf_homeplug_av_enet_phy_cnf_speed;
+static int hf_homeplug_av_enet_phy_cnf_duplex;
+
+static int hf_homeplug_av_tone_map_tx_req;
+static int hf_homeplug_av_tone_map_tx_req_mac;
+static int hf_homeplug_av_tone_map_tx_req_slot;
+static int hf_homeplug_av_tone_map_tx_req_coupling;
+
+static int hf_homeplug_av_tone_map_rx_req;
+static int hf_homeplug_av_tone_map_rx_req_mac;
+static int hf_homeplug_av_tone_map_rx_req_slot;
+static int hf_homeplug_av_tone_map_rx_req_coupling;
+
+static int hf_homeplug_av_tone_map_tx_cnf;
+static int hf_homeplug_av_tone_map_tx_cnf_status;
+static int hf_homeplug_av_tone_map_tx_cnf_len;
+static int hf_homeplug_av_tone_map_tx_cnf_mac;
+static int hf_homeplug_av_tone_map_tx_cnf_slot;
+static int hf_homeplug_av_tone_map_tx_cnf_num_tms;
+static int hf_homeplug_av_tone_map_tx_cnf_num_act;
+
+static int hf_homeplug_av_tone_map_rx_cnf;
+static int hf_homeplug_av_tone_map_rx_cnf_status;
+static int hf_homeplug_av_tone_map_rx_cnf_len;
+static int hf_homeplug_av_tone_map_rx_cnf_subver;
+static int hf_homeplug_av_tone_map_rx_cnf_coupling;
+static int hf_homeplug_av_tone_map_rx_cnf_mac;
+static int hf_homeplug_av_tone_map_rx_cnf_slot;
+static int hf_homeplug_av_tone_map_rx_cnf_num_tms;
+static int hf_homeplug_av_tone_map_rx_cnf_num_act;
+static int hf_homeplug_av_tone_map_rx_cnf_agc;
+static int hf_homeplug_av_tone_map_rx_cnf_gil;
+
+static int hf_homeplug_av_tone_map_carriers;
+static int hf_homeplug_av_tone_map_carrier;
+static int hf_homeplug_av_tone_map_carrier_lo;
+static int hf_homeplug_av_tone_map_carrier_hi;
+
+static int hf_homeplug_av_cc_assoc_reqtype;
+static int hf_homeplug_av_cc_assoc_cco_cap;
+static int hf_homeplug_av_cc_assoc_proxy_net_cap;
+static int hf_homeplug_av_cc_assoc_result;
+static int hf_homeplug_av_cc_assoc_nid;
+static int hf_homeplug_av_cc_assoc_snid;
+static int hf_homeplug_av_cc_assoc_tei;
+static int hf_homeplug_av_cc_assoc_lease_time;
+
+static int hf_homeplug_av_cc_set_tei_map_ind_mode;
+static int hf_homeplug_av_cc_set_tei_map_ind_num;
+static int hf_homeplug_av_cc_set_tei_map_ind_tei;
+static int hf_homeplug_av_cc_set_tei_map_ind_mac;
+static int hf_homeplug_av_cc_set_tei_map_ind_status;
+
+static int hf_homeplug_av_cm_unassoc_sta_nid;
+static int hf_homeplug_av_cm_unassoc_sta_cco_cap;
 
 /* HPAV/GP fields*/
-static int hf_homeplug_av_gp_cm_slac_parm_apptype       = -1;
-static int hf_homeplug_av_gp_cm_slac_parm_sectype       = -1;
-static int hf_homeplug_av_gp_cm_slac_parm_runid         = -1;
-static int hf_homeplug_av_gp_cm_slac_parm_cipher_size   = -1;
-static int hf_homeplug_av_gp_cm_slac_parm_cipher        = -1;
-static int hf_homeplug_av_gp_cm_slac_parm_sound_target  = -1;
-static int hf_homeplug_av_gp_cm_slac_parm_sound_count   = -1;
-static int hf_homeplug_av_gp_cm_slac_parm_time_out      = -1;
-static int hf_homeplug_av_gp_cm_slac_parm_resptype      = -1;
-static int hf_homeplug_av_gp_cm_slac_parm_forwarding_sta= -1;
-
-static int hf_homeplug_av_gp_cm_atten_profile_ind_pev_mac    = -1;
-static int hf_homeplug_av_gp_cm_atten_profile_ind_num_groups = -1;
-static int hf_homeplug_av_gp_cm_atten_profile_ind_aag        = -1;
-
-static int hf_homeplug_av_gp_cm_atten_char_apptype       = -1;
-static int hf_homeplug_av_gp_cm_atten_char_sectype       = -1;
-static int hf_homeplug_av_gp_cm_atten_char_source_mac    = -1;
-static int hf_homeplug_av_gp_cm_atten_char_runid         = -1;
-static int hf_homeplug_av_gp_cm_atten_char_source_id     = -1;
-static int hf_homeplug_av_gp_cm_atten_char_resp_id       = -1;
-static int hf_homeplug_av_gp_cm_atten_char_numsounds     = -1;
-static int hf_homeplug_av_gp_cm_atten_char_numgroups     = -1;
-static int hf_homeplug_av_gp_cm_atten_char_aag           = -1;
-static int hf_homeplug_av_gp_cm_atten_char_profile       = -1;
-static int hf_homeplug_av_gp_cm_atten_char_cms_data      = -1;
-static int hf_homeplug_av_gp_cm_atten_char_result        = -1;
-
-static int hf_homeplug_av_gp_cm_start_atten_char_time_out      = -1;
-static int hf_homeplug_av_gp_cm_start_atten_char_resptype      = -1;
-static int hf_homeplug_av_gp_cm_start_atten_char_forwarding_sta= -1;
-static int hf_homeplug_av_gp_cm_start_atten_char_runid         = -1;
-static int hf_homeplug_av_gp_cm_start_atten_char_numsounds     = -1;
-
-static int hf_homeplug_av_gp_cm_mnbc_sound_apptype       = -1;
-static int hf_homeplug_av_gp_cm_mnbc_sound_sectype       = -1;
-static int hf_homeplug_av_gp_cm_mnbc_sound_sender_id     = -1;
-static int hf_homeplug_av_gp_cm_mnbc_sound_countdown     = -1;
-static int hf_homeplug_av_gp_cm_mnbc_sound_runid         = -1;
-static int hf_homeplug_av_gp_cm_mnbc_sound_rsvd          = -1;
-static int hf_homeplug_av_gp_cm_mnbc_sound_rnd           = -1;
-
-static int hf_homeplug_av_gp_cm_validate_signaltype       = -1;
-static int hf_homeplug_av_gp_cm_validate_timer            = -1;
-static int hf_homeplug_av_gp_cm_validate_result           = -1;
-static int hf_homeplug_av_gp_cm_validate_togglenum        = -1;
-
-static int hf_homeplug_av_gp_cm_slac_match_apptype       = -1;
-static int hf_homeplug_av_gp_cm_slac_match_sectype       = -1;
-static int hf_homeplug_av_gp_cm_slac_match_length        = -1;
-static int hf_homeplug_av_gp_cm_slac_match_pev_id        = -1;
-static int hf_homeplug_av_gp_cm_slac_match_pev_mac       = -1;
-static int hf_homeplug_av_gp_cm_slac_match_evse_id       = -1;
-static int hf_homeplug_av_gp_cm_slac_match_evse_mac      = -1;
-static int hf_homeplug_av_gp_cm_slac_match_runid         = -1;
-static int hf_homeplug_av_gp_cm_slac_match_rsvd          = -1;
-static int hf_homeplug_av_gp_cm_slac_match_nid           = -1;
-static int hf_homeplug_av_gp_cm_slac_match_nmk           = -1;
-
-static int hf_homeplug_av_gp_cm_slac_user_data_broadcast_tlv_type  = -1;
-static int hf_homeplug_av_gp_cm_slac_user_data_tlv                 = -1;
-static int hf_homeplug_av_gp_cm_slac_user_data_tlv_type            = -1;
-static int hf_homeplug_av_gp_cm_slac_user_data_tlv_length          = -1;
-static int hf_homeplug_av_gp_cm_slac_user_data_tlv_str_bytes       = -1;
-static int hf_homeplug_av_gp_cm_slac_user_data_tlv_oui             = -1;
-static int hf_homeplug_av_gp_cm_slac_user_data_tlv_subtype         = -1;
-static int hf_homeplug_av_gp_cm_slac_user_data_tlv_info_str        = -1;
+static int hf_homeplug_av_gp_cm_slac_parm_apptype;
+static int hf_homeplug_av_gp_cm_slac_parm_sectype;
+static int hf_homeplug_av_gp_cm_slac_parm_runid;
+static int hf_homeplug_av_gp_cm_slac_parm_cipher_size;
+static int hf_homeplug_av_gp_cm_slac_parm_cipher;
+static int hf_homeplug_av_gp_cm_slac_parm_sound_target;
+static int hf_homeplug_av_gp_cm_slac_parm_sound_count;
+static int hf_homeplug_av_gp_cm_slac_parm_time_out;
+static int hf_homeplug_av_gp_cm_slac_parm_resptype;
+static int hf_homeplug_av_gp_cm_slac_parm_forwarding_sta;
+
+static int hf_homeplug_av_gp_cm_atten_profile_ind_pev_mac;
+static int hf_homeplug_av_gp_cm_atten_profile_ind_num_groups;
+static int hf_homeplug_av_gp_cm_atten_profile_ind_aag;
+
+static int hf_homeplug_av_gp_cm_atten_char_apptype;
+static int hf_homeplug_av_gp_cm_atten_char_sectype;
+static int hf_homeplug_av_gp_cm_atten_char_source_mac;
+static int hf_homeplug_av_gp_cm_atten_char_runid;
+static int hf_homeplug_av_gp_cm_atten_char_source_id;
+static int hf_homeplug_av_gp_cm_atten_char_resp_id;
+static int hf_homeplug_av_gp_cm_atten_char_numsounds;
+static int hf_homeplug_av_gp_cm_atten_char_numgroups;
+static int hf_homeplug_av_gp_cm_atten_char_aag;
+static int hf_homeplug_av_gp_cm_atten_char_profile;
+static int hf_homeplug_av_gp_cm_atten_char_cms_data;
+static int hf_homeplug_av_gp_cm_atten_char_result;
+
+static int hf_homeplug_av_gp_cm_start_atten_char_time_out;
+static int hf_homeplug_av_gp_cm_start_atten_char_resptype;
+static int hf_homeplug_av_gp_cm_start_atten_char_forwarding_sta;
+static int hf_homeplug_av_gp_cm_start_atten_char_runid;
+static int hf_homeplug_av_gp_cm_start_atten_char_numsounds;
+
+static int hf_homeplug_av_gp_cm_mnbc_sound_apptype;
+static int hf_homeplug_av_gp_cm_mnbc_sound_sectype;
+static int hf_homeplug_av_gp_cm_mnbc_sound_sender_id;
+static int hf_homeplug_av_gp_cm_mnbc_sound_countdown;
+static int hf_homeplug_av_gp_cm_mnbc_sound_runid;
+static int hf_homeplug_av_gp_cm_mnbc_sound_rsvd;
+static int hf_homeplug_av_gp_cm_mnbc_sound_rnd;
+
+static int hf_homeplug_av_gp_cm_validate_signaltype;
+static int hf_homeplug_av_gp_cm_validate_timer;
+static int hf_homeplug_av_gp_cm_validate_result;
+static int hf_homeplug_av_gp_cm_validate_togglenum;
+
+static int hf_homeplug_av_gp_cm_slac_match_apptype;
+static int hf_homeplug_av_gp_cm_slac_match_sectype;
+static int hf_homeplug_av_gp_cm_slac_match_length;
+static int hf_homeplug_av_gp_cm_slac_match_pev_id;
+static int hf_homeplug_av_gp_cm_slac_match_pev_mac;
+static int hf_homeplug_av_gp_cm_slac_match_evse_id;
+static int hf_homeplug_av_gp_cm_slac_match_evse_mac;
+static int hf_homeplug_av_gp_cm_slac_match_runid;
+static int hf_homeplug_av_gp_cm_slac_match_rsvd;
+static int hf_homeplug_av_gp_cm_slac_match_nid;
+static int hf_homeplug_av_gp_cm_slac_match_nmk;
+
+static int hf_homeplug_av_gp_cm_slac_user_data_broadcast_tlv_type;
+static int hf_homeplug_av_gp_cm_slac_user_data_tlv;
+static int hf_homeplug_av_gp_cm_slac_user_data_tlv_type;
+static int hf_homeplug_av_gp_cm_slac_user_data_tlv_length;
+static int hf_homeplug_av_gp_cm_slac_user_data_tlv_str_bytes;
+static int hf_homeplug_av_gp_cm_slac_user_data_tlv_oui;
+static int hf_homeplug_av_gp_cm_slac_user_data_tlv_subtype;
+static int hf_homeplug_av_gp_cm_slac_user_data_tlv_info_str;
 /* End of HPAV/GP fields*/
 
 /* ST/IoTecha fields */
-static int hf_homeplug_av_st_iotecha_header_rsvd       = -1;
-static int hf_homeplug_av_st_iotecha_header_mmever     = -1;
-static int hf_homeplug_av_st_iotecha_header_mver       = -1;
-
-static int hf_homeplug_av_st_iotecha_auth_nmk          = -1;
-static int hf_homeplug_av_st_iotecha_status_byte       = -1;
-
-static int hf_homeplug_av_st_iotecha_linkstatus_status  = -1;
-static int hf_homeplug_av_st_iotecha_linkstatus_devmode = -1;
-
-static int hf_homeplug_av_st_iotecha_stp_discover_tlv                = -1;
-static int hf_homeplug_av_st_iotecha_stp_discover_tlv_type           = -1;
-static int hf_homeplug_av_st_iotecha_stp_discover_tlv_length         = -1;
-static int hf_homeplug_av_st_iotecha_stp_discover_tlv_value_bytes    = -1;
-static int hf_homeplug_av_st_iotecha_stp_discover_tlv_value_string   = -1;
-
-static int hf_homeplug_av_st_iotecha_gain_ask           = -1;
-static int hf_homeplug_av_st_iotecha_gain_new           = -1;
-static int hf_homeplug_av_st_iotecha_gain_prev          = -1;
-
-static int hf_homeplug_av_st_iotecha_mac_address        = -1;
-
-static int hf_homeplug_av_st_iotecha_tei_count          = -1;
-static int hf_homeplug_av_st_iotecha_tei                = -1;
-
-static int hf_homeplug_av_st_iotecha_tei_snap_tei                = -1;
-static int hf_homeplug_av_st_iotecha_tei_snap_addr_count         = -1;
-static int hf_homeplug_av_st_iotecha_tei_snap_mac_address_flag   = -1;
-
-static int hf_homeplug_av_st_iotecha_bss_list_count      = -1;
-static int hf_homeplug_av_st_iotecha_bss_entry           = -1;
-static int hf_homeplug_av_st_iotecha_bss_type            = -1;
-static int hf_homeplug_av_st_iotecha_bss_value_bytes     = -1;
-
-static int hf_homeplug_av_st_iotecha_chanqual_req_type            = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_substatus           = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_mac_local           = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_mac_remote          = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_source              = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_response_type       = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_tmi_count           = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_tmi                 = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_int                 = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_int_count           = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_int_et              = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_int_tmi             = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_tmi_attached        = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_fec_type            = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_cbld                = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_cbld_data_low       = -1;
-static int hf_homeplug_av_st_iotecha_chanqual_cbld_data_high      = -1;
-
-static int hf_homeplug_av_st_iotecha_mfct_crc                 = -1;
-static int hf_homeplug_av_st_iotecha_mfct_total_length        = -1;
-static int hf_homeplug_av_st_iotecha_mfct_offset              = -1;
-static int hf_homeplug_av_st_iotecha_mfct_length              = -1;
-static int hf_homeplug_av_st_iotecha_mfct_data                = -1;
-static int hf_homeplug_av_st_iotecha_mfct_timeout             = -1;
-static int hf_homeplug_av_st_iotecha_mfct_request_type        = -1;
-static int hf_homeplug_av_st_iotecha_mfct_reboot              = -1;
-static int hf_homeplug_av_st_iotecha_mfct_item_offset         = -1;
-static int hf_homeplug_av_st_iotecha_mfct_item_total_length   = -1;
-static int hf_homeplug_av_st_iotecha_mfct_name                = -1;
-static int hf_homeplug_av_st_iotecha_mfct_value               = -1;
-static int hf_homeplug_av_st_iotecha_mfct_result              = -1;
-
-static int hf_homeplug_av_st_iotecha_stp_fup_mac_da = -1;
-static int hf_homeplug_av_st_iotecha_stp_fup_mac_sa = -1;
-static int hf_homeplug_av_st_iotecha_stp_fup_mtype  = -1;
-
-static int hf_homeplug_av_st_iotecha_cpstate_state         = -1;
-static int hf_homeplug_av_st_iotecha_cpstate_pwm_duty      = -1;
-static int hf_homeplug_av_st_iotecha_cpstate_pwm_freq      = -1;
-static int hf_homeplug_av_st_iotecha_cpstate_volatge       = -1;
-static int hf_homeplug_av_st_iotecha_cpstate_adc_bitmask   = -1;
-static int hf_homeplug_av_st_iotecha_cpstate_adc_voltage_1 = -1;
-static int hf_homeplug_av_st_iotecha_cpstate_adc_voltage_2 = -1;
-static int hf_homeplug_av_st_iotecha_cpstate_adc_voltage_3 = -1;
-
-static int hf_homeplug_av_st_iotecha_user_message_info     = -1;
-static int hf_homeplug_av_st_iotecha_user_message_details  = -1;
-
-static int hf_homeplug_av_st_iotecha_test_type      = -1;
-static int hf_homeplug_av_st_iotecha_num_sound      = -1;
-static int hf_homeplug_av_st_iotecha_data_ind_addr  = -1;
-static int hf_homeplug_av_st_iotecha_agc_lock       = -1;
-static int hf_homeplug_av_st_iotecha_db_agc_val     = -1;
-
-static int hf_homeplug_av_st_iotecha_test_status    = -1;
-static int hf_homeplug_av_st_iotecha_suppress_data  = -1;
+static int hf_homeplug_av_st_iotecha_header_rsvd;
+static int hf_homeplug_av_st_iotecha_header_mmever;
+static int hf_homeplug_av_st_iotecha_header_mver;
+
+static int hf_homeplug_av_st_iotecha_auth_nmk;
+static int hf_homeplug_av_st_iotecha_status_byte;
+
+static int hf_homeplug_av_st_iotecha_linkstatus_status;
+static int hf_homeplug_av_st_iotecha_linkstatus_devmode;
+
+static int hf_homeplug_av_st_iotecha_stp_discover_tlv;
+static int hf_homeplug_av_st_iotecha_stp_discover_tlv_type;
+static int hf_homeplug_av_st_iotecha_stp_discover_tlv_length;
+static int hf_homeplug_av_st_iotecha_stp_discover_tlv_value_bytes;
+static int hf_homeplug_av_st_iotecha_stp_discover_tlv_value_string;
+
+static int hf_homeplug_av_st_iotecha_gain_ask;
+static int hf_homeplug_av_st_iotecha_gain_new;
+static int hf_homeplug_av_st_iotecha_gain_prev;
+
+static int hf_homeplug_av_st_iotecha_mac_address;
+
+static int hf_homeplug_av_st_iotecha_tei_count;
+static int hf_homeplug_av_st_iotecha_tei;
+
+static int hf_homeplug_av_st_iotecha_tei_snap_tei;
+static int hf_homeplug_av_st_iotecha_tei_snap_addr_count;
+static int hf_homeplug_av_st_iotecha_tei_snap_mac_address_flag;
+
+static int hf_homeplug_av_st_iotecha_bss_list_count;
+static int hf_homeplug_av_st_iotecha_bss_entry;
+static int hf_homeplug_av_st_iotecha_bss_type;
+static int hf_homeplug_av_st_iotecha_bss_value_bytes;
+
+static int hf_homeplug_av_st_iotecha_chanqual_req_type;
+static int hf_homeplug_av_st_iotecha_chanqual_substatus;
+static int hf_homeplug_av_st_iotecha_chanqual_mac_local;
+static int hf_homeplug_av_st_iotecha_chanqual_mac_remote;
+static int hf_homeplug_av_st_iotecha_chanqual_source;
+static int hf_homeplug_av_st_iotecha_chanqual_response_type;
+static int hf_homeplug_av_st_iotecha_chanqual_tmi_count;
+static int hf_homeplug_av_st_iotecha_chanqual_tmi;
+static int hf_homeplug_av_st_iotecha_chanqual_int;
+static int hf_homeplug_av_st_iotecha_chanqual_int_count;
+static int hf_homeplug_av_st_iotecha_chanqual_int_et;
+static int hf_homeplug_av_st_iotecha_chanqual_int_tmi;
+static int hf_homeplug_av_st_iotecha_chanqual_tmi_attached;
+static int hf_homeplug_av_st_iotecha_chanqual_fec_type;
+static int hf_homeplug_av_st_iotecha_chanqual_cbld;
+static int hf_homeplug_av_st_iotecha_chanqual_cbld_data_low;
+static int hf_homeplug_av_st_iotecha_chanqual_cbld_data_high;
+
+static int hf_homeplug_av_st_iotecha_mfct_crc;
+static int hf_homeplug_av_st_iotecha_mfct_total_length;
+static int hf_homeplug_av_st_iotecha_mfct_offset;
+static int hf_homeplug_av_st_iotecha_mfct_length;
+static int hf_homeplug_av_st_iotecha_mfct_data;
+static int hf_homeplug_av_st_iotecha_mfct_timeout;
+static int hf_homeplug_av_st_iotecha_mfct_request_type;
+static int hf_homeplug_av_st_iotecha_mfct_reboot;
+static int hf_homeplug_av_st_iotecha_mfct_item_offset;
+static int hf_homeplug_av_st_iotecha_mfct_item_total_length;
+static int hf_homeplug_av_st_iotecha_mfct_name;
+static int hf_homeplug_av_st_iotecha_mfct_value;
+static int hf_homeplug_av_st_iotecha_mfct_result;
+
+static int hf_homeplug_av_st_iotecha_stp_fup_mac_da;
+static int hf_homeplug_av_st_iotecha_stp_fup_mac_sa;
+static int hf_homeplug_av_st_iotecha_stp_fup_mtype;
+
+static int hf_homeplug_av_st_iotecha_cpstate_state;
+static int hf_homeplug_av_st_iotecha_cpstate_pwm_duty;
+static int hf_homeplug_av_st_iotecha_cpstate_pwm_freq;
+static int hf_homeplug_av_st_iotecha_cpstate_volatge;
+static int hf_homeplug_av_st_iotecha_cpstate_adc_bitmask;
+static int hf_homeplug_av_st_iotecha_cpstate_adc_voltage_1;
+static int hf_homeplug_av_st_iotecha_cpstate_adc_voltage_2;
+static int hf_homeplug_av_st_iotecha_cpstate_adc_voltage_3;
+
+static int hf_homeplug_av_st_iotecha_user_message_info;
+static int hf_homeplug_av_st_iotecha_user_message_details;
+
+static int hf_homeplug_av_st_iotecha_test_type;
+static int hf_homeplug_av_st_iotecha_num_sound;
+static int hf_homeplug_av_st_iotecha_data_ind_addr;
+static int hf_homeplug_av_st_iotecha_agc_lock;
+static int hf_homeplug_av_st_iotecha_db_agc_val;
+
+static int hf_homeplug_av_st_iotecha_test_status;
+static int hf_homeplug_av_st_iotecha_suppress_data;
 
 // STP_TEST_CHAN_ATTEN_DATA
-static int hf_homeplug_av_st_iotecha_sound_remain  = -1;
-static int hf_homeplug_av_st_iotecha_ntb_time      = -1;
-static int hf_homeplug_av_st_iotecha_rsvd1         = -1;
-static int hf_homeplug_av_st_iotecha_rsvd2         = -1;
-static int hf_homeplug_av_st_iotecha_num_segments  = -1;
-static int hf_homeplug_av_st_iotecha_segment       = -1;
-static int hf_homeplug_av_st_iotecha_num_chan      = -1;
-static int hf_homeplug_av_st_iotecha_chan_start    = -1;
+static int hf_homeplug_av_st_iotecha_sound_remain;
+static int hf_homeplug_av_st_iotecha_ntb_time;
+static int hf_homeplug_av_st_iotecha_rsvd1;
+static int hf_homeplug_av_st_iotecha_rsvd2;
+static int hf_homeplug_av_st_iotecha_num_segments;
+static int hf_homeplug_av_st_iotecha_segment;
+static int hf_homeplug_av_st_iotecha_num_chan;
+static int hf_homeplug_av_st_iotecha_chan_start;
 
 /* End of ST/IoTecha fields */
 
 /* Subtrees ett */
-static gint ett_homeplug_av                      = -1;
-static gint ett_homeplug_av_mmhdr                = -1;
-static gint ett_homeplug_av_mmtype               = -1;
-static gint ett_homeplug_av_fmi                  = -1;
-static gint ett_homeplug_av_vendor               = -1;
-static gint ett_homeplug_av_public               = -1;
-
-static gint ett_homeplug_av_fc                   = -1;
-static gint ett_homeplug_av_sof                  = -1;
-static gint ett_homeplug_av_sack                 = -1;
-static gint ett_homeplug_av_rtscts               = -1;
-static gint ett_homeplug_av_sound                = -1;
-static gint ett_homeplug_av_rsof                 = -1;
-static gint ett_homeplug_av_bcn                  = -1;
-static gint ett_homeplug_av_bcn_payload          = -1;
-static gint ett_homeplug_av_cc_disc_list_cnf     = -1;
-static gint ett_homeplug_av_cc_sta_info          = -1;
-static gint ett_homeplug_av_cc_net_info          = -1;
-static gint ett_homeplug_av_cm_enc_pld_ind       = -1;
-static gint ett_homeplug_av_cm_enc_pld_rsp       = -1;
-static gint ett_homeplug_av_cm_set_key_req       = -1;
-static gint ett_homeplug_av_cm_set_key_cnf       = -1;
-static gint ett_homeplug_av_cm_get_key_req       = -1;
-static gint ett_homeplug_av_cm_get_key_cnf       = -1;
-static gint ett_homeplug_av_brg_infos_cnf        = -1;
-static gint ett_homeplug_av_cm_nw_infos_cnf      = -1;
-static gint ett_homeplug_av_nw_stats_cnf         = -1;
-
-static gint ett_homeplug_av_get_sw_cnf           = -1;
-static gint ett_homeplug_av_wr_mem_req           = -1;
-static gint ett_homeplug_av_wr_mem_cnf           = -1;
-static gint ett_homeplug_av_rd_mem_req           = -1;
-static gint ett_homeplug_av_st_mac_req           = -1;
-static gint ett_homeplug_av_st_mac_cnf           = -1;
-static gint ett_homeplug_av_rd_mem_cnf           = -1;
-static gint ett_homeplug_av_get_nvm_cnf          = -1;
-static gint ett_homeplug_av_rs_dev_cnf           = -1;
-static gint ett_homeplug_av_wr_mod_req           = -1;
-static gint ett_homeplug_av_wr_mod_cnf           = -1;
-static gint ett_homeplug_av_wr_mod_ind           = -1;
-static gint ett_homeplug_av_rd_mod_req           = -1;
-static gint ett_homeplug_av_rd_mod_cnf           = -1;
-static gint ett_homeplug_av_mod_nvm_req          = -1;
-static gint ett_homeplug_av_mod_nvm_cnf          = -1;
-static gint ett_homeplug_av_wd_rpt_req           = -1;
-static gint ett_homeplug_av_wd_rpt_ind           = -1;
-static gint ett_homeplug_av_lnk_stats_req        = -1;
-static gint ett_homeplug_av_lnk_stats_cnf        = -1;
-static gint ett_homeplug_av_lnk_stats_tx         = -1;
-static gint ett_homeplug_av_lnk_stats_rx         = -1;
-static gint ett_homeplug_av_lnk_stats_rx_inv     = -1;
-static gint ett_homeplug_av_sniffer_req          = -1;
-static gint ett_homeplug_av_sniffer_cnf          = -1;
-static gint ett_homeplug_av_sniffer_ind          = -1;
-static gint ett_homeplug_av_sniffer_ind_data     = -1;
-static gint ett_homeplug_av_nw_info_cnf          = -1;
-static gint ett_homeplug_av_nw_info_sta_info     = -1;
-static gint ett_homeplug_av_nw_info_net_info     = -1;
-static gint ett_homeplug_av_cp_rpt_req           = -1;
-static gint ett_homeplug_av_cp_rpt_ind           = -1;
-static gint ett_homeplug_av_fr_lbk_req           = -1;
-static gint ett_homeplug_av_fr_lbk_cnf           = -1;
-static gint ett_homeplug_av_lbk_stat_cnf         = -1;
-static gint ett_homeplug_av_set_key_req          = -1;
-static gint ett_homeplug_av_set_key_cnf          = -1;
-static gint ett_homeplug_av_mfg_string_cnf       = -1;
-static gint ett_homeplug_av_rd_cblock_cnf        = -1;
-static gint ett_homeplug_av_cblock_hdr           = -1;
-static gint ett_homeplug_av_cblock               = -1;
-static gint ett_homeplug_av_set_sdram_req        = -1;
-static gint ett_homeplug_av_set_sdram_cnf        = -1;
-static gint ett_homeplug_av_host_action_ind      = -1;
-static gint ett_homeplug_av_host_action_rsp      = -1;
-static gint ett_homeplug_av_op_attr_req          = -1;
-static gint ett_homeplug_av_op_attr_cnf          = -1;
-static gint ett_homeplug_av_op_attr_data         = -1;
-static gint ett_homeplug_av_enet_phy_req         = -1;
-static gint ett_homeplug_av_enet_phy_cnf         = -1;
-static gint ett_homeplug_av_tone_map_tx_req      = -1;
-static gint ett_homeplug_av_tone_map_rx_req      = -1;
-static gint ett_homeplug_av_tone_map_tx_cnf      = -1;
-static gint ett_homeplug_av_tone_map_rx_cnf      = -1;
-static gint ett_homeplug_av_tone_map_carriers    = -1;
-static gint ett_homeplug_av_tone_map_carrier     = -1;
+static gint ett_homeplug_av;
+static gint ett_homeplug_av_mmhdr;
+static gint ett_homeplug_av_mmtype;
+static gint ett_homeplug_av_fmi;
+static gint ett_homeplug_av_vendor;
+static gint ett_homeplug_av_public;
+
+static gint ett_homeplug_av_fc;
+static gint ett_homeplug_av_sof;
+static gint ett_homeplug_av_sack;
+static gint ett_homeplug_av_rtscts;
+static gint ett_homeplug_av_sound;
+static gint ett_homeplug_av_rsof;
+static gint ett_homeplug_av_bcn;
+static gint ett_homeplug_av_bcn_payload;
+static gint ett_homeplug_av_cc_disc_list_cnf;
+static gint ett_homeplug_av_cc_sta_info;
+static gint ett_homeplug_av_cc_net_info;
+static gint ett_homeplug_av_cm_enc_pld_ind;
+static gint ett_homeplug_av_cm_enc_pld_rsp;
+static gint ett_homeplug_av_cm_set_key_req;
+static gint ett_homeplug_av_cm_set_key_cnf;
+static gint ett_homeplug_av_cm_get_key_req;
+static gint ett_homeplug_av_cm_get_key_cnf;
+static gint ett_homeplug_av_brg_infos_cnf;
+static gint ett_homeplug_av_cm_nw_infos_cnf;
+static gint ett_homeplug_av_nw_stats_cnf;
+
+static gint ett_homeplug_av_get_sw_cnf;
+static gint ett_homeplug_av_wr_mem_req;
+static gint ett_homeplug_av_wr_mem_cnf;
+static gint ett_homeplug_av_rd_mem_req;
+static gint ett_homeplug_av_st_mac_req;
+static gint ett_homeplug_av_st_mac_cnf;
+static gint ett_homeplug_av_rd_mem_cnf;
+static gint ett_homeplug_av_get_nvm_cnf;
+static gint ett_homeplug_av_rs_dev_cnf;
+static gint ett_homeplug_av_wr_mod_req;
+static gint ett_homeplug_av_wr_mod_cnf;
+static gint ett_homeplug_av_wr_mod_ind;
+static gint ett_homeplug_av_rd_mod_req;
+static gint ett_homeplug_av_rd_mod_cnf;
+static gint ett_homeplug_av_mod_nvm_req;
+static gint ett_homeplug_av_mod_nvm_cnf;
+static gint ett_homeplug_av_wd_rpt_req;
+static gint ett_homeplug_av_wd_rpt_ind;
+static gint ett_homeplug_av_lnk_stats_req;
+static gint ett_homeplug_av_lnk_stats_cnf;
+static gint ett_homeplug_av_lnk_stats_tx;
+static gint ett_homeplug_av_lnk_stats_rx;
+static gint ett_homeplug_av_lnk_stats_rx_inv;
+static gint ett_homeplug_av_sniffer_req;
+static gint ett_homeplug_av_sniffer_cnf;
+static gint ett_homeplug_av_sniffer_ind;
+static gint ett_homeplug_av_sniffer_ind_data;
+static gint ett_homeplug_av_nw_info_cnf;
+static gint ett_homeplug_av_nw_info_sta_info;
+static gint ett_homeplug_av_nw_info_net_info;
+static gint ett_homeplug_av_cp_rpt_req;
+static gint ett_homeplug_av_cp_rpt_ind;
+static gint ett_homeplug_av_fr_lbk_req;
+static gint ett_homeplug_av_fr_lbk_cnf;
+static gint ett_homeplug_av_lbk_stat_cnf;
+static gint ett_homeplug_av_set_key_req;
+static gint ett_homeplug_av_set_key_cnf;
+static gint ett_homeplug_av_mfg_string_cnf;
+static gint ett_homeplug_av_rd_cblock_cnf;
+static gint ett_homeplug_av_cblock_hdr;
+static gint ett_homeplug_av_cblock;
+static gint ett_homeplug_av_set_sdram_req;
+static gint ett_homeplug_av_set_sdram_cnf;
+static gint ett_homeplug_av_host_action_ind;
+static gint ett_homeplug_av_host_action_rsp;
+static gint ett_homeplug_av_op_attr_req;
+static gint ett_homeplug_av_op_attr_cnf;
+static gint ett_homeplug_av_op_attr_data;
+static gint ett_homeplug_av_enet_phy_req;
+static gint ett_homeplug_av_enet_phy_cnf;
+static gint ett_homeplug_av_tone_map_tx_req;
+static gint ett_homeplug_av_tone_map_rx_req;
+static gint ett_homeplug_av_tone_map_tx_cnf;
+static gint ett_homeplug_av_tone_map_rx_cnf;
+static gint ett_homeplug_av_tone_map_carriers;
+static gint ett_homeplug_av_tone_map_carrier;
 /* HPGP */
-static gint ett_homeplug_av_gp_cm_atten_char_profile = -1;
-static gint ett_homeplug_av_gp_cm_slac_user_data_tlv = -1;
+static gint ett_homeplug_av_gp_cm_atten_char_profile;
+static gint ett_homeplug_av_gp_cm_slac_user_data_tlv;
 
 /* ST/IoTecha specific subtrees */
-static gint ett_homeplug_av_st_iotecha_header            = -1;
-static gint ett_homeplug_av_st_iotecha_type_length_value = -1;
-static gint ett_homeplug_av_st_iotecha_chanqual_int      = -1;
-static gint ett_homeplug_av_st_iotecha_chanqual_cbld     = -1;
-static gint ett_homeplug_av_st_iotecha_bss_entry         = -1;
+static gint ett_homeplug_av_st_iotecha_header;
+static gint ett_homeplug_av_st_iotecha_type_length_value;
+static gint ett_homeplug_av_st_iotecha_chanqual_int;
+static gint ett_homeplug_av_st_iotecha_chanqual_cbld;
+static gint ett_homeplug_av_st_iotecha_bss_entry;
 /* End of ST/IoTecha specific subtrees */
 
 /* Saving vendor specific subtree */
diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c
index 056f980ff8..c5cd33170a 100644
--- a/epan/dissectors/packet-homeplug.c
+++ b/epan/dissectors/packet-homeplug.c
@@ -25,200 +25,200 @@ void proto_register_homeplug(void);
 
 static dissector_handle_t homeplug_handle;
 
-static int proto_homeplug                     = -1;
-
-static int hf_homeplug_mctrl                  = -1;
-static int hf_homeplug_mctrl_reserved         = -1;
-static int hf_homeplug_mctrl_ne               = -1;
-static int hf_homeplug_mehdr                  = -1;
-static int hf_homeplug_mehdr_mev              = -1;
-static int hf_homeplug_mehdr_metype           = -1;
-static int hf_homeplug_melen                  = -1;
-/* static int hf_homeplug_mme                    = -1; */
+static int proto_homeplug;
+
+static int hf_homeplug_mctrl;
+static int hf_homeplug_mctrl_reserved;
+static int hf_homeplug_mctrl_ne;
+static int hf_homeplug_mehdr;
+static int hf_homeplug_mehdr_mev;
+static int hf_homeplug_mehdr_metype;
+static int hf_homeplug_melen;
+/* static int hf_homeplug_mme; */
   /* Request Channel Estimation */
-static int hf_homeplug_rce                    = -1;
-static int hf_homeplug_rce_cev                = -1;
-static int hf_homeplug_rce_rsvd               = -1;
+static int hf_homeplug_rce;
+static int hf_homeplug_rce_cev;
+static int hf_homeplug_rce_rsvd;
   /* Channel Estimation Response */
-static int hf_homeplug_cer                    = -1;
-static int hf_homeplug_cer_cerv               = -1;
-static int hf_homeplug_cer_rsvd1              = -1;
-static int hf_homeplug_cer_rxtmi              = -1;
-static int hf_homeplug_cer_vt                 = -1;
-static int hf_homeplug_cer_rate               = -1;
-static int hf_homeplug_cer_bp                 = -1;
-static int hf_homeplug_cer_mod                = -1;
-static int hf_homeplug_cer_vt11               = -1;
-static int hf_homeplug_cer_rsvd2              = -1;
-static int hf_homeplug_cer_nbdas              = -1;
-static int hf_homeplug_cer_bda                = -1;
+static int hf_homeplug_cer;
+static int hf_homeplug_cer_cerv;
+static int hf_homeplug_cer_rsvd1;
+static int hf_homeplug_cer_rxtmi;
+static int hf_homeplug_cer_vt;
+static int hf_homeplug_cer_rate;
+static int hf_homeplug_cer_bp;
+static int hf_homeplug_cer_mod;
+static int hf_homeplug_cer_vt11;
+static int hf_homeplug_cer_rsvd2;
+static int hf_homeplug_cer_nbdas;
+static int hf_homeplug_cer_bda;
   /* Replace Bridge Address */
-static int hf_homeplug_rba                    = -1;
+static int hf_homeplug_rba;
   /* Vendor Specific */
-static int hf_homeplug_vs                     = -1;
-static int hf_homeplug_vs_oui                 = -1;
-static int hf_homeplug_vs_dir                 = -1;
-static int hf_homeplug_vs_mid                 = -1;
+static int hf_homeplug_vs;
+static int hf_homeplug_vs_oui;
+static int hf_homeplug_vs_dir;
+static int hf_homeplug_vs_mid;
   /* Set Network Encryption Key */
-static int hf_homeplug_snk                    = -1;
-static int hf_homeplug_snk_eks                = -1;
-static int hf_homeplug_snk_nek                = -1;
+static int hf_homeplug_snk;
+static int hf_homeplug_snk_eks;
+static int hf_homeplug_snk_nek;
   /* Multicast With Response */
-static int hf_homeplug_mwr                    = -1;
+static int hf_homeplug_mwr;
   /* Confirm Network Encryption Key */
-static int hf_homeplug_cnk                    = -1;
+static int hf_homeplug_cnk;
   /* Host Tag */
-static int hf_homeplug_htag                   = -1;
+static int hf_homeplug_htag;
   /* Request Parameters and Statistics */
-static int hf_homeplug_rps                    = -1;
+static int hf_homeplug_rps;
   /* Parameters and Statistics Response */
-static int hf_homeplug_psr                    = -1;
-static int hf_homeplug_psr_txack              = -1;
-static int hf_homeplug_psr_txnack             = -1;
-static int hf_homeplug_psr_txfail             = -1;
-static int hf_homeplug_psr_txcloss            = -1;
-static int hf_homeplug_psr_txcoll             = -1;
-static int hf_homeplug_psr_txca3lat           = -1;
-static int hf_homeplug_psr_txca2lat           = -1;
-static int hf_homeplug_psr_txca1lat           = -1;
-static int hf_homeplug_psr_txca0lat           = -1;
-static int hf_homeplug_psr_rxbp40             = -1;
+static int hf_homeplug_psr;
+static int hf_homeplug_psr_txack;
+static int hf_homeplug_psr_txnack;
+static int hf_homeplug_psr_txfail;
+static int hf_homeplug_psr_txcloss;
+static int hf_homeplug_psr_txcoll;
+static int hf_homeplug_psr_txca3lat;
+static int hf_homeplug_psr_txca2lat;
+static int hf_homeplug_psr_txca1lat;
+static int hf_homeplug_psr_txca0lat;
+static int hf_homeplug_psr_rxbp40;
   /* Set Local Parameters */
-static int hf_homeplug_slp                    = -1;
-static int hf_homeplug_slp_ma                 = -1;
+static int hf_homeplug_slp;
+static int hf_homeplug_slp_ma;
   /* Loader */
-static int hf_homeplug_loader                 = -1;
-static int hf_homeplug_loader_mid             = -1;
-static int hf_homeplug_loader_length          = -1;
-static int hf_homeplug_loader_status          = -1;
-static int hf_homeplug_loader_version         = -1;
-static int hf_homeplug_loader_gdfv            = -1;
-static int hf_homeplug_loader_lsf             = -1;
-static int hf_homeplug_loader_lwm             = -1;
-static int hf_homeplug_loader_lrm             = -1;
-static int hf_homeplug_loader_lrnvm           = -1;
-static int hf_homeplug_loader_lwnvm           = -1;
-static int hf_homeplug_loader_lreset          = -1;
-static int hf_homeplug_loader_gmd             = -1;
-static int hf_homeplug_loader_smd             = -1;
-static int hf_homeplug_loader_module_id       = -1;
-static int hf_homeplug_loader_module_offset   = -1;
-static int hf_homeplug_loader_module_size     = -1;
-static int hf_homeplug_loader_data_length     = -1;
-static int hf_homeplug_loader_data_address    = -1;
-static int hf_homeplug_loader_data            = -1;
-static int hf_homeplug_loader_cm              = -1;
-static int hf_homeplug_loader_lemd            = -1;
-static int hf_homeplug_loader_lenvms          = -1;
-static int hf_homeplug_loader_gnvmp           = -1;
-static int hf_homeplug_loader_snvmp           = -1;
-static int hf_homeplug_loader_nvmp_type       = -1;
-static int hf_homeplug_loader_nvmp_pagesize   = -1;
-static int hf_homeplug_loader_nvmp_blocksize  = -1;
-static int hf_homeplug_loader_nvmp_memorysize = -1;
+static int hf_homeplug_loader;
+static int hf_homeplug_loader_mid;
+static int hf_homeplug_loader_length;
+static int hf_homeplug_loader_status;
+static int hf_homeplug_loader_version;
+static int hf_homeplug_loader_gdfv;
+static int hf_homeplug_loader_lsf;
+static int hf_homeplug_loader_lwm;
+static int hf_homeplug_loader_lrm;
+static int hf_homeplug_loader_lrnvm;
+static int hf_homeplug_loader_lwnvm;
+static int hf_homeplug_loader_lreset;
+static int hf_homeplug_loader_gmd;
+static int hf_homeplug_loader_smd;
+static int hf_homeplug_loader_module_id;
+static int hf_homeplug_loader_module_offset;
+static int hf_homeplug_loader_module_size;
+static int hf_homeplug_loader_data_length;
+static int hf_homeplug_loader_data_address;
+static int hf_homeplug_loader_data;
+static int hf_homeplug_loader_cm;
+static int hf_homeplug_loader_lemd;
+static int hf_homeplug_loader_lenvms;
+static int hf_homeplug_loader_gnvmp;
+static int hf_homeplug_loader_snvmp;
+static int hf_homeplug_loader_nvmp_type;
+static int hf_homeplug_loader_nvmp_pagesize;
+static int hf_homeplug_loader_nvmp_blocksize;
+static int hf_homeplug_loader_nvmp_memorysize;
   /* Host Request */
-static int hf_homeplug_hreq                   = -1;
-static int hf_homeplug_hreq_mid               = -1;
-static int hf_homeplug_hreq_gdv               = -1;
-static int hf_homeplug_hreq_gfv               = -1;
-static int hf_homeplug_hreq_gnek              = -1;
-static int hf_homeplug_hreq_gclbpl            = -1;
-static int hf_homeplug_hreq_nvds              = -1;
-static int hf_homeplug_hreq_grbt              = -1;
-static int hf_homeplug_hreq_gslnm             = -1;
-static int hf_homeplug_hreq_gsss              = -1;
-static int hf_homeplug_hreq_rsl               = -1;
-static int hf_homeplug_hreq_reset             = -1;
-static int hf_homeplug_hreq_reset_type        = -1;
-static int hf_homeplug_hreq_reset_delay       = -1;
+static int hf_homeplug_hreq;
+static int hf_homeplug_hreq_mid;
+static int hf_homeplug_hreq_gdv;
+static int hf_homeplug_hreq_gfv;
+static int hf_homeplug_hreq_gnek;
+static int hf_homeplug_hreq_gclbpl;
+static int hf_homeplug_hreq_nvds;
+static int hf_homeplug_hreq_grbt;
+static int hf_homeplug_hreq_gslnm;
+static int hf_homeplug_hreq_gsss;
+static int hf_homeplug_hreq_rsl;
+static int hf_homeplug_hreq_reset;
+static int hf_homeplug_hreq_reset_type;
+static int hf_homeplug_hreq_reset_delay;
   /* Host Response */
-static int hf_homeplug_hrsp                   = -1;
-static int hf_homeplug_hrsp_mid               = -1;
-static int hf_homeplug_hrsp_gdvr              = -1;
-static int hf_homeplug_hrsp_gfvr              = -1;
-static int hf_homeplug_hrsp_gnekr             = -1;
-static int hf_homeplug_hrsp_gnekr_select      = -1;
-static int hf_homeplug_hrsp_gnekr_key         = -1;
-static int hf_homeplug_hrsp_invalid           = -1;
-static int hf_homeplug_hrsp_version           = -1;
+static int hf_homeplug_hrsp;
+static int hf_homeplug_hrsp_mid;
+static int hf_homeplug_hrsp_gdvr;
+static int hf_homeplug_hrsp_gfvr;
+static int hf_homeplug_hrsp_gnekr;
+static int hf_homeplug_hrsp_gnekr_select;
+static int hf_homeplug_hrsp_gnekr_key;
+static int hf_homeplug_hrsp_invalid;
+static int hf_homeplug_hrsp_version;
   /* Network Statistics */
-static int hf_homeplug_ns                     = -1;
-static int hf_homeplug_ns_extended            = -1;
+static int hf_homeplug_ns;
+static int hf_homeplug_ns_extended;
     /* Basic */
-static int hf_homeplug_ns_netw_ctrl_ac        = -1;
-static int hf_homeplug_ns_netw_ctrl_icid      = -1;
-static int hf_homeplug_ns_bytes40_robo        = -1;
-static int hf_homeplug_ns_mhz                 = -1;
-static int hf_homeplug_ns_fails_robo          = -1;
-static int hf_homeplug_ns_drops_robo          = -1;
-static int hf_homeplug_ns_netw_da             = -1;
-static int hf_homeplug_ns_bytes40             = -1;
-static int hf_homeplug_ns_fails               = -1;
-static int hf_homeplug_ns_drops               = -1;
+static int hf_homeplug_ns_netw_ctrl_ac;
+static int hf_homeplug_ns_netw_ctrl_icid;
+static int hf_homeplug_ns_bytes40_robo;
+static int hf_homeplug_ns_mhz;
+static int hf_homeplug_ns_fails_robo;
+static int hf_homeplug_ns_drops_robo;
+static int hf_homeplug_ns_netw_da;
+static int hf_homeplug_ns_bytes40;
+static int hf_homeplug_ns_fails;
+static int hf_homeplug_ns_drops;
     /* Extended */
-/* static int hf_homeplug_ns_tx_bfr_state        = -1; */
-static int hf_homeplug_ns_buf_in_use          = -1;
-static int hf_homeplug_ns_prio                = -1;
-static int hf_homeplug_ns_msdu_len            = -1;
-static int hf_homeplug_ns_seqn                = -1;
-static int hf_homeplug_ns_toneidx             = -1;
+/* static int hf_homeplug_ns_tx_bfr_state; */
+static int hf_homeplug_ns_buf_in_use;
+static int hf_homeplug_ns_prio;
+static int hf_homeplug_ns_msdu_len;
+static int hf_homeplug_ns_seqn;
+static int hf_homeplug_ns_toneidx;
   /* Bridging Characteristics Network */
-static int hf_homeplug_bcn                    = -1;
-static int hf_homeplug_bcn_network            = -1;
-static int hf_homeplug_bcn_return             = -1;
-static int hf_homeplug_bcn_rsvd               = -1;
-static int hf_homeplug_bcn_fbn                = -1;
-static int hf_homeplug_bcn_brda               = -1;
-static int hf_homeplug_bcn_bp_das             = -1;
-static int hf_homeplug_bcn_bp_da              = -1;
+static int hf_homeplug_bcn;
+static int hf_homeplug_bcn_network;
+static int hf_homeplug_bcn_return;
+static int hf_homeplug_bcn_rsvd;
+static int hf_homeplug_bcn_fbn;
+static int hf_homeplug_bcn_brda;
+static int hf_homeplug_bcn_bp_das;
+static int hf_homeplug_bcn_bp_da;
   /* Bridging Characteristics Local */
-static int hf_homeplug_bcl                    = -1;
-static int hf_homeplug_bcl_network            = -1;
-static int hf_homeplug_bcl_return             = -1;
-static int hf_homeplug_bcl_rsvd               = -1;
-static int hf_homeplug_bcl_hprox_das          = -1;
-static int hf_homeplug_bcl_hpbda              = -1;
+static int hf_homeplug_bcl;
+static int hf_homeplug_bcl_network;
+static int hf_homeplug_bcl_return;
+static int hf_homeplug_bcl_rsvd;
+static int hf_homeplug_bcl_hprox_das;
+static int hf_homeplug_bcl_hpbda;
   /* Set Transmit Characteristics */
-static int hf_homeplug_stc                    = -1;
-static int hf_homeplug_stc_lco                = -1;
-static int hf_homeplug_stc_encf               = -1;
-static int hf_homeplug_stc_txprio             = -1;
-static int hf_homeplug_stc_rexp               = -1;
-static int hf_homeplug_stc_txcf               = -1;
-static int hf_homeplug_stc_cftop              = -1;
-static int hf_homeplug_stc_rsvd1              = -1;
-static int hf_homeplug_stc_retry              = -1;
-static int hf_homeplug_stc_rsvd2              = -1;
-static int hf_homeplug_stc_dder               = -1;
-static int hf_homeplug_stc_dur                = -1;
-static int hf_homeplug_stc_ebp                = -1;
-static int hf_homeplug_stc_dees               = -1;
-static int hf_homeplug_stc_txeks              = -1;
-static int hf_homeplug_data                   = -1;
-
-static gint ett_homeplug                      = -1;
-static gint ett_homeplug_mctrl                = -1;
-static gint ett_homeplug_mehdr                = -1;
-static gint ett_homeplug_vs_mid               = -1;
-static gint ett_homeplug_rce                  = -1;
-static gint ett_homeplug_cer                  = -1;
-static gint ett_homeplug_vs                   = -1;
-static gint ett_homeplug_snk                  = -1;
-static gint ett_homeplug_rps                  = -1;
-static gint ett_homeplug_psr                  = -1;
-static gint ett_homeplug_slp                  = -1;
-static gint ett_homeplug_loader               = -1;
-static gint ett_homeplug_hreq                 = -1;
-static gint ett_homeplug_hrsp                 = -1;
-static gint ett_homeplug_ns                   = -1;
-static gint ett_homeplug_tone                 = -1;
-static gint ett_homeplug_tx_bfr_state         = -1;
-static gint ett_homeplug_bridge               = -1;
-static gint ett_homeplug_bcn                  = -1;
-static gint ett_homeplug_bcl                  = -1;
-static gint ett_homeplug_stc                  = -1;
-
-static expert_field ei_homeplug_tone_map_not_exist = EI_INIT;
+static int hf_homeplug_stc;
+static int hf_homeplug_stc_lco;
+static int hf_homeplug_stc_encf;
+static int hf_homeplug_stc_txprio;
+static int hf_homeplug_stc_rexp;
+static int hf_homeplug_stc_txcf;
+static int hf_homeplug_stc_cftop;
+static int hf_homeplug_stc_rsvd1;
+static int hf_homeplug_stc_retry;
+static int hf_homeplug_stc_rsvd2;
+static int hf_homeplug_stc_dder;
+static int hf_homeplug_stc_dur;
+static int hf_homeplug_stc_ebp;
+static int hf_homeplug_stc_dees;
+static int hf_homeplug_stc_txeks;
+static int hf_homeplug_data;
+
+static gint ett_homeplug;
+static gint ett_homeplug_mctrl;
+static gint ett_homeplug_mehdr;
+static gint ett_homeplug_vs_mid;
+static gint ett_homeplug_rce;
+static gint ett_homeplug_cer;
+static gint ett_homeplug_vs;
+static gint ett_homeplug_snk;
+static gint ett_homeplug_rps;
+static gint ett_homeplug_psr;
+static gint ett_homeplug_slp;
+static gint ett_homeplug_loader;
+static gint ett_homeplug_hreq;
+static gint ett_homeplug_hrsp;
+static gint ett_homeplug_ns;
+static gint ett_homeplug_tone;
+static gint ett_homeplug_tx_bfr_state;
+static gint ett_homeplug_bridge;
+static gint ett_homeplug_bcn;
+static gint ett_homeplug_bcl;
+static gint ett_homeplug_stc;
+
+static expert_field ei_homeplug_tone_map_not_exist;
 
 static guint8  homeplug_ne     = 0;
 static guint8  homeplug_melen  = 0;
diff --git a/epan/dissectors/packet-homepna.c b/epan/dissectors/packet-homepna.c
index 8d525450f0..907fd7c969 100644
--- a/epan/dissectors/packet-homepna.c
+++ b/epan/dissectors/packet-homepna.c
@@ -20,16 +20,16 @@ void proto_reg_handoff_homepna(void);
 
 static dissector_handle_t homepna_handle;
 
-static int proto_homepna = -1;
+static int proto_homepna;
 
-static int hf_homepna_type   = -1;
-static int hf_homepna_length = -1;
-static int hf_homepna_version = -1;
-static int hf_homepna_data = -1;
-static int hf_homepna_etype = -1;
-static int hf_homepna_trailer = -1;
+static int hf_homepna_type;
+static int hf_homepna_length;
+static int hf_homepna_version;
+static int hf_homepna_data;
+static int hf_homepna_etype;
+static int hf_homepna_trailer;
 
-static gint ett_homepna  = -1;
+static gint ett_homepna;
 
 static dissector_handle_t ethertype_handle;
 
diff --git a/epan/dissectors/packet-hp-erm.c b/epan/dissectors/packet-hp-erm.c
index 209e1a67dc..155adae4c7 100644
--- a/epan/dissectors/packet-hp-erm.c
+++ b/epan/dissectors/packet-hp-erm.c
@@ -43,15 +43,15 @@ static dissector_handle_t hp_erm_handle;
 #define PROTO_SHORT_NAME "HP_ERM"
 #define PROTO_LONG_NAME  "HP encapsulated remote mirroring"
 
-static int  proto_hp_erm        = -1;
-static gint ett_hp_erm          = -1;
-static int  hf_hp_erm_unknown1  = -1;
-static int  hf_hp_erm_unknown2  = -1;
-static int  hf_hp_erm_unknown3  = -1;
-static int  hf_hp_erm_priority  = -1;
-static int  hf_hp_erm_cfi       = -1;
-static int  hf_hp_erm_vlan      = -1;
-static int  hf_hp_erm_is_tagged = -1;
+static int  proto_hp_erm;
+static gint ett_hp_erm;
+static int  hf_hp_erm_unknown1;
+static int  hf_hp_erm_unknown2;
+static int  hf_hp_erm_unknown3;
+static int  hf_hp_erm_priority;
+static int  hf_hp_erm_cfi;
+static int  hf_hp_erm_vlan;
+static int  hf_hp_erm_is_tagged;
 
 static const value_string hp_erm_pri_vals[] = {
   { 0, "Background"                        },
diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c
index d018912cbb..79a2fd371f 100644
--- a/epan/dissectors/packet-hpext.c
+++ b/epan/dissectors/packet-hpext.c
@@ -29,13 +29,13 @@ static const value_string xsap_vals[] = {
 	{ 0x00,         NULL }
 };
 
-static int proto_hpext = -1;
+static int proto_hpext;
 
-static int hf_hpext_dxsap = -1;
-static int hf_hpext_reserved = -1;
-static int hf_hpext_sxsap = -1;
+static int hf_hpext_dxsap;
+static int hf_hpext_reserved;
+static int hf_hpext_sxsap;
 
-static gint ett_hpext = -1;
+static gint ett_hpext;
 
 static int
 dissect_hpext(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-hpfeeds.c b/epan/dissectors/packet-hpfeeds.c
index 4148d1f460..dbc2a30f20 100644
--- a/epan/dissectors/packet-hpfeeds.c
+++ b/epan/dissectors/packet-hpfeeds.c
@@ -58,24 +58,24 @@ static heur_dissector_list_t heur_subdissector_list;
 static gboolean hpfeeds_desegment = TRUE;
 static gboolean try_heuristic = TRUE;
 
-static int proto_hpfeeds = -1;
-
-static int hf_hpfeeds_opcode = -1;
-static int hf_hpfeeds_msg_length = -1;
-static int hf_hpfeeds_nonce = -1;
-static int hf_hpfeeds_secret = -1;
-static int hf_hpfeeds_payload = -1;
-static int hf_hpfeeds_server_len = -1;
-static int hf_hpfeeds_server = -1;
-static int hf_hpfeeds_ident_len = -1;
-static int hf_hpfeeds_ident = -1;
-static int hf_hpfeeds_channel = -1;
-static int hf_hpfeeds_chan_len = -1;
-static int hf_hpfeeds_errmsg = -1;
-
-static gint ett_hpfeeds = -1;
-
-static expert_field ei_hpfeeds_opcode_unknown = EI_INIT;
+static int proto_hpfeeds;
+
+static int hf_hpfeeds_opcode;
+static int hf_hpfeeds_msg_length;
+static int hf_hpfeeds_nonce;
+static int hf_hpfeeds_secret;
+static int hf_hpfeeds_payload;
+static int hf_hpfeeds_server_len;
+static int hf_hpfeeds_server;
+static int hf_hpfeeds_ident_len;
+static int hf_hpfeeds_ident;
+static int hf_hpfeeds_channel;
+static int hf_hpfeeds_chan_len;
+static int hf_hpfeeds_errmsg;
+
+static gint ett_hpfeeds;
+
+static expert_field ei_hpfeeds_opcode_unknown;
 
 /* OPCODE */
 #define OP_ERROR       0         /* error message*/
diff --git a/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c
index c06bcad8d7..9c5cf3ab5a 100644
--- a/epan/dissectors/packet-hpsw.c
+++ b/epan/dissectors/packet-hpsw.c
@@ -19,34 +19,34 @@
 void proto_register_hpsw(void);
 void proto_reg_handoff_hpsw(void);
 
-static int proto_hpsw = -1;
-
-static int hf_hpsw_version = -1;
-static int hf_hpsw_type = -1;
-static int hf_hpsw_tlvtype = -1;
-static int hf_hpsw_tlvlength = -1;
-static int hf_hpsw_field_10 = -1;
-static int hf_hpsw_own_mac_addr = -1;
-static int hf_hpsw_neighbor_mac_addr = -1;
-static int hf_hpsw_field_6 = -1;
-static int hf_hpsw_field_9 = -1;
-static int hf_hpsw_device_version = -1;
-static int hf_hpsw_device_name = -1;
-static int hf_hpsw_ip_addr = -1;
-static int hf_hpsw_field_8 = -1;
-static int hf_hpsw_domain = -1;
-static int hf_hpsw_field_12 = -1;
-static int hf_hpsw_config_name = -1;
-static int hf_hpsw_root_mac_addr = -1;
-static int hf_hpsw_device_id = -1;
-static int hf_hpsw_device_id_data = -1;
-static int hf_hpsw_data = -1;
-
-
-static gint ett_hpsw = -1;
-static gint ett_hpsw_tlv = -1;
-
-static expert_field ei_hpsw_tlvlength_bad = EI_INIT;
+static int proto_hpsw;
+
+static int hf_hpsw_version;
+static int hf_hpsw_type;
+static int hf_hpsw_tlvtype;
+static int hf_hpsw_tlvlength;
+static int hf_hpsw_field_10;
+static int hf_hpsw_own_mac_addr;
+static int hf_hpsw_neighbor_mac_addr;
+static int hf_hpsw_field_6;
+static int hf_hpsw_field_9;
+static int hf_hpsw_device_version;
+static int hf_hpsw_device_name;
+static int hf_hpsw_ip_addr;
+static int hf_hpsw_field_8;
+static int hf_hpsw_domain;
+static int hf_hpsw_field_12;
+static int hf_hpsw_config_name;
+static int hf_hpsw_root_mac_addr;
+static int hf_hpsw_device_id;
+static int hf_hpsw_device_id_data;
+static int hf_hpsw_data;
+
+
+static gint ett_hpsw;
+static gint ett_hpsw_tlv;
+
+static expert_field ei_hpsw_tlvlength_bad;
 
 static dissector_handle_t hpsw_handle;
 
diff --git a/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c
index d2f93717bd..2c3c7d3807 100644
--- a/epan/dissectors/packet-hpteam.c
+++ b/epan/dissectors/packet-hpteam.c
@@ -19,7 +19,7 @@
 void proto_register_hpteam(void);
 void proto_reg_handoff_hpteam(void);
 
-static int proto_hpteam = -1;
+static int proto_hpteam;
 
 /* Known HP NIC teaming PID values */
 static const value_string hpteam_pid_vals[] = {
@@ -27,11 +27,11 @@ static const value_string hpteam_pid_vals[] = {
 	{ 0,		NULL }
 };
 
-static gint hf_hpteam = -1;
-static gint hf_llc_hpteam_pid = -1;
+static gint hf_hpteam;
+static gint hf_llc_hpteam_pid;
 
 /* These are the ids of the subtrees that we may be creating */
-static gint ett_hpteam = -1;
+static gint ett_hpteam;
 
 static dissector_handle_t hpteam_handle;
 
diff --git a/epan/dissectors/packet-hsfz.c b/epan/dissectors/packet-hsfz.c
index f1bbeb96ff..c39aaf2888 100644
--- a/epan/dissectors/packet-hsfz.c
+++ b/epan/dissectors/packet-hsfz.c
@@ -35,19 +35,19 @@ dissector_handle_t uds_handle;
 void proto_register_hsfz(void);
 void proto_reg_handoff_hsfz(void);
 
-static int proto_hsfz = -1;
+static int proto_hsfz;
 
 /*** header fields ***/
-static int hf_hsfz_length = -1;
-static int hf_hsfz_ctrlword = -1;
-static int hf_hsfz_source_address = -1;
-static int hf_hsfz_target_address = -1;
-static int hf_hsfz_address = -1;
-static int hf_hsfz_ident_string = -1;
-static int hf_hsfz_data = -1;
+static int hf_hsfz_length;
+static int hf_hsfz_ctrlword;
+static int hf_hsfz_source_address;
+static int hf_hsfz_target_address;
+static int hf_hsfz_address;
+static int hf_hsfz_ident_string;
+static int hf_hsfz_data;
 
 /*** protocol tree items ***/
-static gint ett_hsfz = -1;
+static gint ett_hsfz;
 
 /* Control Words */
 #define	HSFZ_CTRLWORD_DIAGNOSTIC_REQ_RES        0x0001
diff --git a/epan/dissectors/packet-hsms.c b/epan/dissectors/packet-hsms.c
index 361012aafd..a95733b30e 100644
--- a/epan/dissectors/packet-hsms.c
+++ b/epan/dissectors/packet-hsms.c
@@ -62,36 +62,36 @@ void proto_register_hsms(void);
 static dissector_handle_t hsms_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_hsms = -1;
-
-static int hf_hsms_packet_length = -1;
-static int hf_hsms_header_sessionid = -1;
-static int hf_hsms_header_statusbyte2 = -1;
-static int hf_hsms_header_wbit = -1;
-static int hf_hsms_header_stream = -1;
-static int hf_hsms_header_statusbyte3 = -1;
-static int hf_hsms_header_function = -1;
-static int hf_hsms_header_ptype = -1;
-static int hf_hsms_header_stype = -1;
-static int hf_hsms_header_system = -1;
-static int hf_hsms_data_item_format = -1;
-static int hf_hsms_data_item_length_bytes = -1;
-static int hf_hsms_data_item_length = -1;
-static int hf_hsms_data_item_value_binary = -1;
-static int hf_hsms_data_item_value_boolean = -1;
-static int hf_hsms_data_item_value_string = -1;
-static int hf_hsms_data_item_value_i8 = -1;
-static int hf_hsms_data_item_value_i1 = -1;
-static int hf_hsms_data_item_value_i2 = -1;
-static int hf_hsms_data_item_value_i4 = -1;
-static int hf_hsms_data_item_value_f8 = -1;
-static int hf_hsms_data_item_value_f4 = -1;
-static int hf_hsms_data_item_value_u8 = -1;
-static int hf_hsms_data_item_value_u1 = -1;
-static int hf_hsms_data_item_value_u2 = -1;
-static int hf_hsms_data_item_value_u4 = -1;
-
-static expert_field ei_hsms_ptype = EI_INIT;
+static int proto_hsms;
+
+static int hf_hsms_packet_length;
+static int hf_hsms_header_sessionid;
+static int hf_hsms_header_statusbyte2;
+static int hf_hsms_header_wbit;
+static int hf_hsms_header_stream;
+static int hf_hsms_header_statusbyte3;
+static int hf_hsms_header_function;
+static int hf_hsms_header_ptype;
+static int hf_hsms_header_stype;
+static int hf_hsms_header_system;
+static int hf_hsms_data_item_format;
+static int hf_hsms_data_item_length_bytes;
+static int hf_hsms_data_item_length;
+static int hf_hsms_data_item_value_binary;
+static int hf_hsms_data_item_value_boolean;
+static int hf_hsms_data_item_value_string;
+static int hf_hsms_data_item_value_i8;
+static int hf_hsms_data_item_value_i1;
+static int hf_hsms_data_item_value_i2;
+static int hf_hsms_data_item_value_i4;
+static int hf_hsms_data_item_value_f8;
+static int hf_hsms_data_item_value_f4;
+static int hf_hsms_data_item_value_u8;
+static int hf_hsms_data_item_value_u1;
+static int hf_hsms_data_item_value_u2;
+static int hf_hsms_data_item_value_u4;
+
+static expert_field ei_hsms_ptype;
 
 static wmem_map_t *value_lengths;
 
@@ -163,10 +163,10 @@ static const value_string item_format_names[] = {
 #define HSMS_TCP_PORT 0
 
 /* Initialize the subtree pointers */
-static gint ett_hsms = -1;
-static gint ett_hsms_header = -1;
-static gint ett_hsms_data = -1;
-static gint ett_hsms_data_item = -1;
+static gint ett_hsms;
+static gint ett_hsms_header;
+static gint ett_hsms_data;
+static gint ett_hsms_data_item;
 
 /* A sample #define of the minimum length (in bytes) of the protocol data.
  * If data is received with fewer than this many bytes it is rejected by
diff --git a/epan/dissectors/packet-hsr-prp-supervision.c b/epan/dissectors/packet-hsr-prp-supervision.c
index 139b60d907..b7f0279ebd 100644
--- a/epan/dissectors/packet-hsr-prp-supervision.c
+++ b/epan/dissectors/packet-hsr-prp-supervision.c
@@ -39,22 +39,22 @@ static const value_string type_vals[] = {
 /* Initialize the protocol and registered fields          */
 /**********************************************************/
 
-static int proto_hsr_prp_supervision = -1;
+static int proto_hsr_prp_supervision;
 
 /* Initialize supervision frame fields */
-static int hf_hsr_prp_supervision_path = -1;
-static int hf_hsr_prp_supervision_version = -1;
-static int hf_hsr_prp_supervision_seqno = -1;
-static int hf_hsr_prp_supervision_tlv_type = -1;
-static int hf_hsr_prp_supervision_tlv_length = -1;
-static int hf_hsr_prp_supervision_source_mac_address_A = -1;
-static int hf_hsr_prp_supervision_source_mac_address_B = -1;
-static int hf_hsr_prp_supervision_source_mac_address = -1;
-static int hf_hsr_prp_supervision_red_box_mac_address = -1;
-static int hf_hsr_prp_supervision_vdan_mac_address = -1;
+static int hf_hsr_prp_supervision_path;
+static int hf_hsr_prp_supervision_version;
+static int hf_hsr_prp_supervision_seqno;
+static int hf_hsr_prp_supervision_tlv_type;
+static int hf_hsr_prp_supervision_tlv_length;
+static int hf_hsr_prp_supervision_source_mac_address_A;
+static int hf_hsr_prp_supervision_source_mac_address_B;
+static int hf_hsr_prp_supervision_source_mac_address;
+static int hf_hsr_prp_supervision_red_box_mac_address;
+static int hf_hsr_prp_supervision_vdan_mac_address;
 
 /* Initialize the subtree pointers */
-static gint ett_hsr_prp_supervision = -1;
+static gint ett_hsr_prp_supervision;
 
 /* Code to actually dissect the packets */
 static int
diff --git a/epan/dissectors/packet-hsr.c b/epan/dissectors/packet-hsr.c
index d52c703596..806a444fc2 100644
--- a/epan/dissectors/packet-hsr.c
+++ b/epan/dissectors/packet-hsr.c
@@ -43,21 +43,21 @@ static const value_string hsr_laneid_vals[] = {
 /* Initialize the protocol and registered fields          */
 /**********************************************************/
 
-static int proto_hsr = -1;
+static int proto_hsr;
 
 /* Initialize supervision frame fields */
 
 
-static int hf_hsr_path = -1;
-static int hf_hsr_netid = -1;
-static int hf_hsr_laneid = -1;
-static int hf_hsr_lsdu_size = -1;
-static int hf_hsr_sequence_nr = -1;
-static int hf_type= -1;
+static int hf_hsr_path;
+static int hf_hsr_netid;
+static int hf_hsr_laneid;
+static int hf_hsr_lsdu_size;
+static int hf_hsr_sequence_nr;
+static int hf_type;
 
 static dissector_table_t ethertype_subdissector_table;
 /* Initialize the subtree pointers */
-static gint ett_hsr_frame = -1;
+static gint ett_hsr_frame;
 
 /* Code to actually dissect the packets */
 static int
diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c
index 5c26754e8e..1bf64030ff 100644
--- a/epan/dissectors/packet-hsrp.c
+++ b/epan/dissectors/packet-hsrp.c
@@ -131,62 +131,62 @@ void proto_reg_handoff_hsrp(void);
 
 static dissector_handle_t hsrp_handle;
 
-static gint proto_hsrp = -1;
+static gint proto_hsrp;
 
-static gint hf_hsrp_version = -1;
-static gint hf_hsrp_opcode = -1;
+static gint hf_hsrp_version;
+static gint hf_hsrp_opcode;
 /* Opcode 0-2 */
-static gint hf_hsrp_state = -1;
-static gint hf_hsrp_hellotime = -1;
-static gint hf_hsrp_holdtime = -1;
-static gint hf_hsrp_priority = -1;
-static gint hf_hsrp_group = -1;
-static gint hf_hsrp_reserved = -1;
-static gint hf_hsrp_auth_data = -1;
-static gint hf_hsrp_virt_ip_addr = -1;
+static gint hf_hsrp_state;
+static gint hf_hsrp_hellotime;
+static gint hf_hsrp_holdtime;
+static gint hf_hsrp_priority;
+static gint hf_hsrp_group;
+static gint hf_hsrp_reserved;
+static gint hf_hsrp_auth_data;
+static gint hf_hsrp_virt_ip_addr;
 /* Advertise (3) */
-static gint hf_hsrp_adv_type = -1;
-static gint hf_hsrp_adv_length = -1;
-static gint hf_hsrp_adv_state = -1;
-static gint hf_hsrp_adv_reserved1 = -1;
-static gint hf_hsrp_adv_activegrp = -1;
-static gint hf_hsrp_adv_passivegrp = -1;
-static gint hf_hsrp_adv_reserved2 = -1;
+static gint hf_hsrp_adv_type;
+static gint hf_hsrp_adv_length;
+static gint hf_hsrp_adv_state;
+static gint hf_hsrp_adv_reserved1;
+static gint hf_hsrp_adv_activegrp;
+static gint hf_hsrp_adv_passivegrp;
+static gint hf_hsrp_adv_reserved2;
 
-static gint ett_hsrp = -1;
+static gint ett_hsrp;
 
 /* HSRPv2 */
-static gint hf_hsrp2_version = -1;
-static gint hf_hsrp2_opcode = -1;
-static gint hf_hsrp2_state = -1;
-static gint hf_hsrp2_group_state_tlv = -1;
-static gint hf_hsrp2_interface_state_tlv = -1;
-static gint hf_hsrp2_text_auth_tlv = -1;
-static gint hf_hsrp2_md5_auth_tlv = -1;
-static gint hf_hsrp2_ipversion = -1;
-static gint hf_hsrp2_hellotime = -1;
-static gint hf_hsrp2_holdtime = -1;
-static gint hf_hsrp2_priority = -1;
-static gint hf_hsrp2_identifier = -1;
-static gint hf_hsrp2_group = -1;
-static gint hf_hsrp2_virt_ip_addr = -1;
-static gint hf_hsrp2_virt_ip_addr_v6 = -1;
-static gint hf_hsrp2_auth_data = -1;
-static gint hf_hsrp2_active_group = -1;
-static gint hf_hsrp2_passive_group = -1;
-static gint hf_hsrp2_md5_algorithm = -1;
-static gint hf_hsrp2_md5_padding = -1;
-static gint hf_hsrp2_md5_flags = -1;
-static gint hf_hsrp2_md5_ip_address= -1;
-static gint hf_hsrp2_md5_key_id= -1;
-static gint hf_hsrp2_md5_auth_data= -1;
-
-static gint ett_hsrp2_group_state_tlv = -1;
-static gint ett_hsrp2_interface_state_tlv = -1;
-static gint ett_hsrp2_text_auth_tlv = -1;
-static gint ett_hsrp2_md5_auth_tlv = -1;
-
-static expert_field ei_hsrp_unknown_tlv = EI_INIT;
+static gint hf_hsrp2_version;
+static gint hf_hsrp2_opcode;
+static gint hf_hsrp2_state;
+static gint hf_hsrp2_group_state_tlv;
+static gint hf_hsrp2_interface_state_tlv;
+static gint hf_hsrp2_text_auth_tlv;
+static gint hf_hsrp2_md5_auth_tlv;
+static gint hf_hsrp2_ipversion;
+static gint hf_hsrp2_hellotime;
+static gint hf_hsrp2_holdtime;
+static gint hf_hsrp2_priority;
+static gint hf_hsrp2_identifier;
+static gint hf_hsrp2_group;
+static gint hf_hsrp2_virt_ip_addr;
+static gint hf_hsrp2_virt_ip_addr_v6;
+static gint hf_hsrp2_auth_data;
+static gint hf_hsrp2_active_group;
+static gint hf_hsrp2_passive_group;
+static gint hf_hsrp2_md5_algorithm;
+static gint hf_hsrp2_md5_padding;
+static gint hf_hsrp2_md5_flags;
+static gint hf_hsrp2_md5_ip_address;
+static gint hf_hsrp2_md5_key_id;
+static gint hf_hsrp2_md5_auth_data;
+
+static gint ett_hsrp2_group_state_tlv;
+static gint ett_hsrp2_interface_state_tlv;
+static gint ett_hsrp2_text_auth_tlv;
+static gint ett_hsrp2_md5_auth_tlv;
+
+static expert_field ei_hsrp_unknown_tlv;
 
 #define UDP_PORT_HSRP   1985
 #define UDP_PORT_HSRP2_V6   2029
diff --git a/epan/dissectors/packet-http-urlencoded.c b/epan/dissectors/packet-http-urlencoded.c
index 71108cd3c4..88783313a8 100644
--- a/epan/dissectors/packet-http-urlencoded.c
+++ b/epan/dissectors/packet-http-urlencoded.c
@@ -21,13 +21,13 @@ void proto_reg_handoff_http_urlencoded(void);
 
 static dissector_handle_t form_urlencoded_handle;
 
-static int proto_urlencoded = -1;
+static int proto_urlencoded;
 
-static int hf_form_key = -1;
-static int hf_form_value = -1;
+static int hf_form_key;
+static int hf_form_value;
 
-static gint ett_form_urlencoded = -1;
-static gint ett_form_keyvalue = -1;
+static gint ett_form_urlencoded;
+static gint ett_form_keyvalue;
 
 static ws_mempbrk_pattern pbrk_key;
 static ws_mempbrk_pattern pbrk_value;
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index cdd6bb5d85..91d09296b5 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -59,109 +59,109 @@ static int http_eo_tap = -1;
 static int http_follow_tap = -1;
 static int credentials_tap = -1;
 
-static int proto_http = -1;
-static int proto_http2 = -1;
-static int proto_ssdp = -1;
-static int hf_http_notification = -1;
-static int hf_http_response = -1;
-static int hf_http_request = -1;
-static int hf_http_response_number = -1;
-static int hf_http_request_number = -1;
-static int hf_http_response_line = -1;
-static int hf_http_request_line = -1;
-static int hf_http_basic = -1;
-static int hf_http_citrix = -1;
-static int hf_http_citrix_user = -1;
-static int hf_http_citrix_domain = -1;
-static int hf_http_citrix_passwd = -1;
-static int hf_http_citrix_session = -1;
-static int hf_http_request_method = -1;
-static int hf_http_request_uri = -1;
-static int hf_http_request_full_uri = -1;
-static int hf_http_request_path = -1;
-static int hf_http_request_path_segment = -1;
-static int hf_http_request_query = -1;
-static int hf_http_request_query_parameter = -1;
-static int hf_http_request_version = -1;
-static int hf_http_response_version = -1;
-static int hf_http_response_code = -1;
-static int hf_http_response_code_desc = -1;
-static int hf_http_response_for_uri = -1;
-static int hf_http_response_phrase = -1;
-static int hf_http_authorization = -1;
-static int hf_http_proxy_authenticate = -1;
-static int hf_http_proxy_authorization = -1;
-static int hf_http_proxy_connect_host = -1;
-static int hf_http_proxy_connect_port = -1;
-static int hf_http_www_authenticate = -1;
-static int hf_http_content_type = -1;
-static int hf_http_content_length_header = -1;
-static int hf_http_content_length = -1;
-static int hf_http_content_encoding = -1;
-static int hf_http_transfer_encoding = -1;
-static int hf_http_upgrade = -1;
-static int hf_http_user_agent = -1;
-static int hf_http_host = -1;
-static int hf_http_range = -1;
-static int hf_http_content_range = -1;
-static int hf_http_connection = -1;
-static int hf_http_cookie = -1;
-static int hf_http_cookie_pair = -1;
-static int hf_http_accept = -1;
-static int hf_http_referer = -1;
-static int hf_http_accept_language = -1;
-static int hf_http_accept_encoding = -1;
-static int hf_http_date = -1;
-static int hf_http_cache_control = -1;
-static int hf_http_server = -1;
-static int hf_http_location = -1;
-static int hf_http_sec_websocket_accept = -1;
-static int hf_http_sec_websocket_extensions = -1;
-static int hf_http_sec_websocket_key = -1;
-static int hf_http_sec_websocket_protocol = -1;
-static int hf_http_sec_websocket_version = -1;
-static int hf_http_set_cookie = -1;
-static int hf_http_last_modified = -1;
-static int hf_http_x_forwarded_for = -1;
-static int hf_http_http2_settings = -1;
-static int hf_http_request_in = -1;
-static int hf_http_response_in = -1;
-static int hf_http_next_request_in = -1;
-static int hf_http_next_response_in = -1;
-static int hf_http_prev_request_in = -1;
-static int hf_http_prev_response_in = -1;
-static int hf_http_time = -1;
-static int hf_http_chunk_size = -1;
-static int hf_http_chunk_data = -1;
-static int hf_http_chunk_boundary = -1;
-static int hf_http_chunked_trailer_part = -1;
-static int hf_http_file_data = -1;
-static int hf_http_unknown_header = -1;
-static int hf_http_http2_settings_uri = -1;
-
-static gint ett_http = -1;
-static gint ett_http_ntlmssp = -1;
-static gint ett_http_kerberos = -1;
-static gint ett_http_request = -1;
-static gint ett_http_request_uri = -1;
-static gint ett_http_request_path = -1;
-static gint ett_http_request_query = -1;
-static gint ett_http_chunked_response = -1;
-static gint ett_http_chunk_data = -1;
-static gint ett_http_encoded_entity = -1;
-static gint ett_http_header_item = -1;
-static gint ett_http_http2_settings_item = -1;
-
-static expert_field ei_http_chat = EI_INIT;
-static expert_field ei_http_te_and_length = EI_INIT;
-static expert_field ei_http_te_unknown = EI_INIT;
-static expert_field ei_http_subdissector_failed = EI_INIT;
-static expert_field ei_http_tls_port = EI_INIT;
-static expert_field ei_http_leading_crlf = EI_INIT;
-static expert_field ei_http_excess_data = EI_INIT;
-static expert_field ei_http_bad_header_name = EI_INIT;
-static expert_field ei_http_decompression_failed = EI_INIT;
-static expert_field ei_http_decompression_disabled = EI_INIT;
+static int proto_http;
+static int proto_http2;
+static int proto_ssdp;
+static int hf_http_notification;
+static int hf_http_response;
+static int hf_http_request;
+static int hf_http_response_number;
+static int hf_http_request_number;
+static int hf_http_response_line;
+static int hf_http_request_line;
+static int hf_http_basic;
+static int hf_http_citrix;
+static int hf_http_citrix_user;
+static int hf_http_citrix_domain;
+static int hf_http_citrix_passwd;
+static int hf_http_citrix_session;
+static int hf_http_request_method;
+static int hf_http_request_uri;
+static int hf_http_request_full_uri;
+static int hf_http_request_path;
+static int hf_http_request_path_segment;
+static int hf_http_request_query;
+static int hf_http_request_query_parameter;
+static int hf_http_request_version;
+static int hf_http_response_version;
+static int hf_http_response_code;
+static int hf_http_response_code_desc;
+static int hf_http_response_for_uri;
+static int hf_http_response_phrase;
+static int hf_http_authorization;
+static int hf_http_proxy_authenticate;
+static int hf_http_proxy_authorization;
+static int hf_http_proxy_connect_host;
+static int hf_http_proxy_connect_port;
+static int hf_http_www_authenticate;
+static int hf_http_content_type;
+static int hf_http_content_length_header;
+static int hf_http_content_length;
+static int hf_http_content_encoding;
+static int hf_http_transfer_encoding;
+static int hf_http_upgrade;
+static int hf_http_user_agent;
+static int hf_http_host;
+static int hf_http_range;
+static int hf_http_content_range;
+static int hf_http_connection;
+static int hf_http_cookie;
+static int hf_http_cookie_pair;
+static int hf_http_accept;
+static int hf_http_referer;
+static int hf_http_accept_language;
+static int hf_http_accept_encoding;
+static int hf_http_date;
+static int hf_http_cache_control;
+static int hf_http_server;
+static int hf_http_location;
+static int hf_http_sec_websocket_accept;
+static int hf_http_sec_websocket_extensions;
+static int hf_http_sec_websocket_key;
+static int hf_http_sec_websocket_protocol;
+static int hf_http_sec_websocket_version;
+static int hf_http_set_cookie;
+static int hf_http_last_modified;
+static int hf_http_x_forwarded_for;
+static int hf_http_http2_settings;
+static int hf_http_request_in;
+static int hf_http_response_in;
+static int hf_http_next_request_in;
+static int hf_http_next_response_in;
+static int hf_http_prev_request_in;
+static int hf_http_prev_response_in;
+static int hf_http_time;
+static int hf_http_chunk_size;
+static int hf_http_chunk_data;
+static int hf_http_chunk_boundary;
+static int hf_http_chunked_trailer_part;
+static int hf_http_file_data;
+static int hf_http_unknown_header;
+static int hf_http_http2_settings_uri;
+
+static gint ett_http;
+static gint ett_http_ntlmssp;
+static gint ett_http_kerberos;
+static gint ett_http_request;
+static gint ett_http_request_uri;
+static gint ett_http_request_path;
+static gint ett_http_request_query;
+static gint ett_http_chunked_response;
+static gint ett_http_chunk_data;
+static gint ett_http_encoded_entity;
+static gint ett_http_header_item;
+static gint ett_http_http2_settings_item;
+
+static expert_field ei_http_chat;
+static expert_field ei_http_te_and_length;
+static expert_field ei_http_te_unknown;
+static expert_field ei_http_subdissector_failed;
+static expert_field ei_http_tls_port;
+static expert_field ei_http_leading_crlf;
+static expert_field ei_http_excess_data;
+static expert_field ei_http_bad_header_name;
+static expert_field ei_http_decompression_failed;
+static expert_field ei_http_decompression_disabled;
 
 static dissector_handle_t http_handle;
 static dissector_handle_t http_tcp_handle;
@@ -4694,8 +4694,8 @@ proto_reg_handoff_http(void)
  * Content-Type: message/http
  */
 
-static gint proto_message_http = -1;
-static gint ett_message_http = -1;
+static gint proto_message_http;
+static gint ett_message_http;
 
 static int
 dissect_message_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c
index 7d9cac0188..8053c5e000 100644
--- a/epan/dissectors/packet-http2.c
+++ b/epan/dissectors/packet-http2.c
@@ -322,178 +322,178 @@ static int st_node_http2_type = -1;
 #define PROTO_DATA_KEY_WINDOW_SIZE_STREAM_BEFORE 2
 
 /* Packet Header */
-static int proto_http2 = -1;
-static int hf_http2_stream = -1;
-static int hf_http2_length = -1;
-static int hf_http2_type = -1;
-static int hf_http2_r = -1;
-static int hf_http2_streamid = -1;
-static int hf_http2_magic    = -1;
-static int hf_http2_unknown = -1;
+static int proto_http2;
+static int hf_http2_stream;
+static int hf_http2_length;
+static int hf_http2_type;
+static int hf_http2_r;
+static int hf_http2_streamid;
+static int hf_http2_magic;
+static int hf_http2_unknown;
 /* Flags */
-static int hf_http2_flags = -1;
-static int hf_http2_flags_end_stream = -1;
-static int hf_http2_flags_end_headers = -1;
-static int hf_http2_flags_padded = -1;
-static int hf_http2_flags_priority = -1;
-static int hf_http2_flags_settings_ack = -1;
-static int hf_http2_flags_ping_ack = -1;
-static int hf_http2_flags_unused = -1;
-static int hf_http2_flags_unused_settings = -1;
-static int hf_http2_flags_unused_ping = -1;
-static int hf_http2_flags_unused_continuation = -1;
-static int hf_http2_flags_unused_push_promise = -1;
-static int hf_http2_flags_unused_data = -1;
-static int hf_http2_flags_unused_headers = -1;
+static int hf_http2_flags;
+static int hf_http2_flags_end_stream;
+static int hf_http2_flags_end_headers;
+static int hf_http2_flags_padded;
+static int hf_http2_flags_priority;
+static int hf_http2_flags_settings_ack;
+static int hf_http2_flags_ping_ack;
+static int hf_http2_flags_unused;
+static int hf_http2_flags_unused_settings;
+static int hf_http2_flags_unused_ping;
+static int hf_http2_flags_unused_continuation;
+static int hf_http2_flags_unused_push_promise;
+static int hf_http2_flags_unused_data;
+static int hf_http2_flags_unused_headers;
 
 /* generic */
-static int hf_http2_padding = -1;
-static int hf_http2_pad_length = -1;
+static int hf_http2_padding;
+static int hf_http2_pad_length;
 
-static int hf_http2_weight = -1;
-static int hf_http2_weight_real = -1;
-static int hf_http2_stream_dependency = -1;
-static int hf_http2_excl_dependency = -1;
+static int hf_http2_weight;
+static int hf_http2_weight_real;
+static int hf_http2_stream_dependency;
+static int hf_http2_excl_dependency;
 /* Data */
-static int hf_http2_data_segment = -1;
-static int hf_http2_data_data = -1;
-static int hf_http2_data_padding = -1;
-static int hf_http2_body_fragments = -1;
-static int hf_http2_body_fragment = -1;
-static int hf_http2_body_fragment_overlap = -1;
-static int hf_http2_body_fragment_overlap_conflicts = -1;
-static int hf_http2_body_fragment_multiple_tails = -1;
-static int hf_http2_body_fragment_too_long_fragment = -1;
-static int hf_http2_body_fragment_error = -1;
-static int hf_http2_body_fragment_count = -1;
-static int hf_http2_body_reassembled_in = -1;
-static int hf_http2_body_reassembled_length = -1;
-static int hf_http2_body_reassembled_data = -1;
+static int hf_http2_data_segment;
+static int hf_http2_data_data;
+static int hf_http2_data_padding;
+static int hf_http2_body_fragments;
+static int hf_http2_body_fragment;
+static int hf_http2_body_fragment_overlap;
+static int hf_http2_body_fragment_overlap_conflicts;
+static int hf_http2_body_fragment_multiple_tails;
+static int hf_http2_body_fragment_too_long_fragment;
+static int hf_http2_body_fragment_error;
+static int hf_http2_body_fragment_count;
+static int hf_http2_body_reassembled_in;
+static int hf_http2_body_reassembled_length;
+static int hf_http2_body_reassembled_data;
 /* Headers */
-static int hf_http2_headers = -1;
-static int hf_http2_headers_padding = -1;
-static int hf_http2_header = -1;
-static int hf_http2_header_length = -1;
-static int hf_http2_header_count = -1;
-static int hf_http2_header_name_length = -1;
-static int hf_http2_header_name = -1;
-static int hf_http2_header_value_length = -1;
-static int hf_http2_header_value = -1;
-static int hf_http2_header_unescaped = -1;
-static int hf_http2_header_repr = -1;
-static int hf_http2_header_index = -1;
-static int hf_http2_header_table_size_update = -1;
-static int hf_http2_header_table_size = -1;
-static int hf_http2_fake_header_count = -1;
-static int hf_http2_fake_header = -1;
-static int hf_http2_header_request_full_uri = -1;
+static int hf_http2_headers;
+static int hf_http2_headers_padding;
+static int hf_http2_header;
+static int hf_http2_header_length;
+static int hf_http2_header_count;
+static int hf_http2_header_name_length;
+static int hf_http2_header_name;
+static int hf_http2_header_value_length;
+static int hf_http2_header_value;
+static int hf_http2_header_unescaped;
+static int hf_http2_header_repr;
+static int hf_http2_header_index;
+static int hf_http2_header_table_size_update;
+static int hf_http2_header_table_size;
+static int hf_http2_fake_header_count;
+static int hf_http2_fake_header;
+static int hf_http2_header_request_full_uri;
 /* RST Stream */
-static int hf_http2_rst_stream_error = -1;
+static int hf_http2_rst_stream_error;
 /* Settings */
-static int hf_http2_settings = -1;
-static int hf_http2_settings_identifier = -1;
-static int hf_http2_settings_header_table_size = -1;
-static int hf_http2_settings_enable_push = -1;
-static int hf_http2_settings_max_concurrent_streams = -1;
-static int hf_http2_settings_initial_window_size = -1;
-static int hf_http2_settings_max_frame_size = -1;
-static int hf_http2_settings_max_header_list_size = -1;
-static int hf_http2_settings_extended_connect = -1;
-static int hf_http2_settings_no_rfc7540_priorities = -1;
-static int hf_http2_settings_unknown = -1;
+static int hf_http2_settings;
+static int hf_http2_settings_identifier;
+static int hf_http2_settings_header_table_size;
+static int hf_http2_settings_enable_push;
+static int hf_http2_settings_max_concurrent_streams;
+static int hf_http2_settings_initial_window_size;
+static int hf_http2_settings_max_frame_size;
+static int hf_http2_settings_max_header_list_size;
+static int hf_http2_settings_extended_connect;
+static int hf_http2_settings_no_rfc7540_priorities;
+static int hf_http2_settings_unknown;
 /* Push Promise */
-static int hf_http2_push_promise_r = -1;
-static int hf_http2_push_promise_promised_stream_id = -1;
-static int hf_http2_push_promise_header = -1;
-static int hf_http2_push_promise_padding = -1;
+static int hf_http2_push_promise_r;
+static int hf_http2_push_promise_promised_stream_id;
+static int hf_http2_push_promise_header;
+static int hf_http2_push_promise_padding;
 /* Ping */
-static int hf_http2_ping = -1;
-static int hf_http2_pong = -1;
+static int hf_http2_ping;
+static int hf_http2_pong;
 /* Goaway */
-static int hf_http2_goaway_r = -1;
-static int hf_http2_goaway_last_stream_id = -1;
-static int hf_http2_goaway_error = -1;
-static int hf_http2_goaway_addata = -1;
+static int hf_http2_goaway_r;
+static int hf_http2_goaway_last_stream_id;
+static int hf_http2_goaway_error;
+static int hf_http2_goaway_addata;
 /* Window Update */
-static int hf_http2_window_update_r = -1;
-static int hf_http2_window_update_window_size_increment = -1;
+static int hf_http2_window_update_r;
+static int hf_http2_window_update_window_size_increment;
 /* Continuation */
-static int hf_http2_continuation_header = -1;
-static int hf_http2_continuation_padding = -1;
+static int hf_http2_continuation_header;
+static int hf_http2_continuation_padding;
 /* Altsvc */
-static int hf_http2_altsvc_origin_len = -1;
-static int hf_http2_altsvc_origin = -1;
-static int hf_http2_altsvc_field_value = -1;
+static int hf_http2_altsvc_origin_len;
+static int hf_http2_altsvc_origin;
+static int hf_http2_altsvc_field_value;
 /* Calculated */
-static int hf_http2_calculated_window_size_connection_before = -1;
-static int hf_http2_calculated_window_size_connection_after = -1;
-static int hf_http2_calculated_window_size_stream_before = -1;
-static int hf_http2_calculated_window_size_stream_after = -1;
+static int hf_http2_calculated_window_size_connection_before;
+static int hf_http2_calculated_window_size_connection_after;
+static int hf_http2_calculated_window_size_stream_before;
+static int hf_http2_calculated_window_size_stream_after;
 #if HAVE_NGHTTP2
 /* HTTP2 header static fields */
-static int hf_http2_headers_status = -1;
-static int hf_http2_headers_path = -1;
-static int hf_http2_headers_method = -1;
-static int hf_http2_headers_scheme = -1;
-static int hf_http2_headers_accept = -1;
-static int hf_http2_headers_accept_charset = -1;
-static int hf_http2_headers_accept_encoding = -1;
-static int hf_http2_headers_accept_language = -1;
-static int hf_http2_headers_accept_ranges = -1;
-static int hf_http2_headers_access_control_allow_origin = -1;
-static int hf_http2_headers_age = -1;
-static int hf_http2_headers_allow = -1;
-static int hf_http2_headers_authorization = -1;
-static int hf_http2_headers_authority = -1;
-static int hf_http2_headers_cache_control = -1;
-static int hf_http2_headers_content_disposition = -1;
-static int hf_http2_headers_content_encoding = -1;
-static int hf_http2_headers_content_language = -1;
-static int hf_http2_headers_content_length = -1;
-static int hf_http2_headers_content_location = -1;
-static int hf_http2_headers_content_range = -1;
-static int hf_http2_headers_content_type = -1;
-static int hf_http2_headers_cookie = -1;
-static int hf_http2_headers_date = -1;
-static int hf_http2_headers_etag = -1;
-static int hf_http2_headers_expect = -1;
-static int hf_http2_headers_expires = -1;
-static int hf_http2_headers_from = -1;
-static int hf_http2_headers_if_match = -1;
-static int hf_http2_headers_if_modified_since = -1;
-static int hf_http2_headers_if_none_match = -1;
-static int hf_http2_headers_if_range = -1;
-static int hf_http2_headers_if_unmodified_since = -1;
-static int hf_http2_headers_last_modified = -1;
-static int hf_http2_headers_link = -1;
-static int hf_http2_headers_location = -1;
-static int hf_http2_headers_max_forwards = -1;
-static int hf_http2_headers_proxy_authenticate = -1;
-static int hf_http2_headers_proxy_authorization = -1;
-static int hf_http2_headers_range = -1;
-static int hf_http2_headers_referer = -1;
-static int hf_http2_headers_refresh = -1;
-static int hf_http2_headers_retry_after = -1;
-static int hf_http2_headers_server = -1;
-static int hf_http2_headers_set_cookie = -1;
-static int hf_http2_headers_strict_transport_security = -1;
-static int hf_http2_headers_user_agent = -1;
-static int hf_http2_headers_vary = -1;
-static int hf_http2_headers_via = -1;
-static int hf_http2_headers_www_authenticate = -1;
+static int hf_http2_headers_status;
+static int hf_http2_headers_path;
+static int hf_http2_headers_method;
+static int hf_http2_headers_scheme;
+static int hf_http2_headers_accept;
+static int hf_http2_headers_accept_charset;
+static int hf_http2_headers_accept_encoding;
+static int hf_http2_headers_accept_language;
+static int hf_http2_headers_accept_ranges;
+static int hf_http2_headers_access_control_allow_origin;
+static int hf_http2_headers_age;
+static int hf_http2_headers_allow;
+static int hf_http2_headers_authorization;
+static int hf_http2_headers_authority;
+static int hf_http2_headers_cache_control;
+static int hf_http2_headers_content_disposition;
+static int hf_http2_headers_content_encoding;
+static int hf_http2_headers_content_language;
+static int hf_http2_headers_content_length;
+static int hf_http2_headers_content_location;
+static int hf_http2_headers_content_range;
+static int hf_http2_headers_content_type;
+static int hf_http2_headers_cookie;
+static int hf_http2_headers_date;
+static int hf_http2_headers_etag;
+static int hf_http2_headers_expect;
+static int hf_http2_headers_expires;
+static int hf_http2_headers_from;
+static int hf_http2_headers_if_match;
+static int hf_http2_headers_if_modified_since;
+static int hf_http2_headers_if_none_match;
+static int hf_http2_headers_if_range;
+static int hf_http2_headers_if_unmodified_since;
+static int hf_http2_headers_last_modified;
+static int hf_http2_headers_link;
+static int hf_http2_headers_location;
+static int hf_http2_headers_max_forwards;
+static int hf_http2_headers_proxy_authenticate;
+static int hf_http2_headers_proxy_authorization;
+static int hf_http2_headers_range;
+static int hf_http2_headers_referer;
+static int hf_http2_headers_refresh;
+static int hf_http2_headers_retry_after;
+static int hf_http2_headers_server;
+static int hf_http2_headers_set_cookie;
+static int hf_http2_headers_strict_transport_security;
+static int hf_http2_headers_user_agent;
+static int hf_http2_headers_vary;
+static int hf_http2_headers_via;
+static int hf_http2_headers_www_authenticate;
 #endif
 /* Blocked */
 /* Origin */
-static int hf_http2_origin = -1;
-static int hf_http2_origin_origin_len = -1;
-static int hf_http2_origin_origin = -1;
+static int hf_http2_origin;
+static int hf_http2_origin_origin_len;
+static int hf_http2_origin_origin;
 /* Priority Update */
-static int hf_http2_priority_update_stream_id = -1;
-static int hf_http2_priority_update_field_value = -1;
+static int hf_http2_priority_update_stream_id;
+static int hf_http2_priority_update_field_value;
 /* Generated fields */
-static int hf_http2_time = -1;
-static int hf_http2_request_in = -1;
-static int hf_http2_response_in = -1;
+static int hf_http2_time;
+static int hf_http2_request_in;
+static int hf_http2_response_in;
 
 /*
  * These values *should* be large enough to handle most use cases while
@@ -511,20 +511,20 @@ static int hf_http2_response_in = -1;
  */
 #define MAX_HTTP2_HEADER_SIZE (256 * 1024)
 #define MAX_HTTP2_HEADER_LINES 200
-static expert_field ei_http2_header_size = EI_INIT;
-static expert_field ei_http2_header_lines = EI_INIT;
-static expert_field ei_http2_body_decompression_failed = EI_INIT;
-static expert_field ei_http2_reassembly_error = EI_INIT;
-
-static gint ett_http2 = -1;
-static gint ett_http2_header = -1;
-static gint ett_http2_headers = -1;
-static gint ett_http2_flags = -1;
-static gint ett_http2_settings = -1;
-static gint ett_http2_encoded_entity = -1;
-static gint ett_http2_body_fragment = -1;
-static gint ett_http2_body_fragments = -1;
-static gint ett_http2_origin = -1;
+static expert_field ei_http2_header_size;
+static expert_field ei_http2_header_lines;
+static expert_field ei_http2_body_decompression_failed;
+static expert_field ei_http2_reassembly_error;
+
+static gint ett_http2;
+static gint ett_http2_header;
+static gint ett_http2_headers;
+static gint ett_http2_flags;
+static gint ett_http2_settings;
+static gint ett_http2_encoded_entity;
+static gint ett_http2_body_fragment;
+static gint ett_http2_body_fragments;
+static gint ett_http2_origin;
 
 #ifdef HAVE_NGHTTP2
 static const fragment_items http2_body_fragment_items = {
diff --git a/epan/dissectors/packet-http3.c b/epan/dissectors/packet-http3.c
index d2ff4514e4..73ac7bfb3c 100644
--- a/epan/dissectors/packet-http3.c
+++ b/epan/dissectors/packet-http3.c
@@ -62,143 +62,143 @@ void proto_register_http3(void);
 
 static dissector_handle_t http3_handle;
 
-static int proto_http3                = -1;
-static int hf_http3_stream_uni        = -1;
-static int hf_http3_stream_uni_type   = -1;
-static int hf_http3_stream_bidi       = -1;
-static int hf_http3_push_id           = -1;
-static int hf_http3_frame             = -1;
-static int hf_http3_frame_type        = -1;
-static int hf_http3_frame_length      = -1;
-static int hf_http3_frame_payload     = -1;
-
-static int hf_http3_data = -1;
-
-//static int hf_http3_headers                 = -1;
-static int hf_http3_headers_count           = -1;
-static int hf_http3_header                  = -1;
-static int hf_http3_header_length           = -1;
-static int hf_http3_header_name_length      = -1;
-static int hf_http3_header_name             = -1;
-static int hf_http3_header_value_length     = -1;
-static int hf_http3_header_value            = -1;
-static int hf_http3_header_request_full_uri = -1;
-
-static int hf_http3_header_qpack_blocked               = -1;
-static int hf_http3_header_qpack_blocked_stream_rcint  = -1;
-static int hf_http3_header_qpack_blocked_decoder_wicnt = -1;
-//static int hf_http3_header_qpack_fatal                 = -1;
+static int proto_http3;
+static int hf_http3_stream_uni;
+static int hf_http3_stream_uni_type;
+static int hf_http3_stream_bidi;
+static int hf_http3_push_id;
+static int hf_http3_frame;
+static int hf_http3_frame_type;
+static int hf_http3_frame_length;
+static int hf_http3_frame_payload;
+
+static int hf_http3_data;
+
+//static int hf_http3_headers;
+static int hf_http3_headers_count;
+static int hf_http3_header;
+static int hf_http3_header_length;
+static int hf_http3_header_name_length;
+static int hf_http3_header_name;
+static int hf_http3_header_value_length;
+static int hf_http3_header_value;
+static int hf_http3_header_request_full_uri;
+
+static int hf_http3_header_qpack_blocked;
+static int hf_http3_header_qpack_blocked_stream_rcint;
+static int hf_http3_header_qpack_blocked_decoder_wicnt;
+//static int hf_http3_header_qpack_fatal;
 
 #ifdef HAVE_NGHTTP3
 /* Static HTTP3 headers */
-static int hf_http3_headers_status                      = -1;
-static int hf_http3_headers_path                        = -1;
-static int hf_http3_headers_method                      = -1;
-static int hf_http3_headers_scheme                      = -1;
-static int hf_http3_headers_accept                      = -1;
-static int hf_http3_headers_accept_charset              = -1;
-static int hf_http3_headers_accept_encoding             = -1;
-static int hf_http3_headers_accept_language             = -1;
-static int hf_http3_headers_accept_ranges               = -1;
-static int hf_http3_headers_access_control_allow_origin = -1;
-static int hf_http3_headers_age                         = -1;
-static int hf_http3_headers_allow                       = -1;
-static int hf_http3_headers_authorization               = -1;
-static int hf_http3_headers_authority                   = -1;
-static int hf_http3_headers_cache_control               = -1;
-static int hf_http3_headers_content_disposition         = -1;
-static int hf_http3_headers_content_encoding            = -1;
-static int hf_http3_headers_content_language            = -1;
-static int hf_http3_headers_content_length              = -1;
-static int hf_http3_headers_content_location            = -1;
-static int hf_http3_headers_content_range               = -1;
-static int hf_http3_headers_content_type                = -1;
-static int hf_http3_headers_cookie                      = -1;
-static int hf_http3_headers_date                        = -1;
-static int hf_http3_headers_etag                        = -1;
-static int hf_http3_headers_expect                      = -1;
-static int hf_http3_headers_expires                     = -1;
-static int hf_http3_headers_from                        = -1;
-static int hf_http3_headers_if_match                    = -1;
-static int hf_http3_headers_if_modified_since           = -1;
-static int hf_http3_headers_if_none_match               = -1;
-static int hf_http3_headers_if_range                    = -1;
-static int hf_http3_headers_if_unmodified_since         = -1;
-static int hf_http3_headers_last_modified               = -1;
-static int hf_http3_headers_link                        = -1;
-static int hf_http3_headers_location                    = -1;
-static int hf_http3_headers_max_forwards                = -1;
-static int hf_http3_headers_proxy_authenticate          = -1;
-static int hf_http3_headers_proxy_authorization         = -1;
-static int hf_http3_headers_range                       = -1;
-static int hf_http3_headers_referer                     = -1;
-static int hf_http3_headers_refresh                     = -1;
-static int hf_http3_headers_retry_after                 = -1;
-static int hf_http3_headers_server                      = -1;
-static int hf_http3_headers_set_cookie                  = -1;
-static int hf_http3_headers_strict_transport_security   = -1;
-static int hf_http3_headers_user_agent                  = -1;
-static int hf_http3_headers_vary                        = -1;
-static int hf_http3_headers_via                         = -1;
-static int hf_http3_headers_www_authenticate            = -1;
+static int hf_http3_headers_status;
+static int hf_http3_headers_path;
+static int hf_http3_headers_method;
+static int hf_http3_headers_scheme;
+static int hf_http3_headers_accept;
+static int hf_http3_headers_accept_charset;
+static int hf_http3_headers_accept_encoding;
+static int hf_http3_headers_accept_language;
+static int hf_http3_headers_accept_ranges;
+static int hf_http3_headers_access_control_allow_origin;
+static int hf_http3_headers_age;
+static int hf_http3_headers_allow;
+static int hf_http3_headers_authorization;
+static int hf_http3_headers_authority;
+static int hf_http3_headers_cache_control;
+static int hf_http3_headers_content_disposition;
+static int hf_http3_headers_content_encoding;
+static int hf_http3_headers_content_language;
+static int hf_http3_headers_content_length;
+static int hf_http3_headers_content_location;
+static int hf_http3_headers_content_range;
+static int hf_http3_headers_content_type;
+static int hf_http3_headers_cookie;
+static int hf_http3_headers_date;
+static int hf_http3_headers_etag;
+static int hf_http3_headers_expect;
+static int hf_http3_headers_expires;
+static int hf_http3_headers_from;
+static int hf_http3_headers_if_match;
+static int hf_http3_headers_if_modified_since;
+static int hf_http3_headers_if_none_match;
+static int hf_http3_headers_if_range;
+static int hf_http3_headers_if_unmodified_since;
+static int hf_http3_headers_last_modified;
+static int hf_http3_headers_link;
+static int hf_http3_headers_location;
+static int hf_http3_headers_max_forwards;
+static int hf_http3_headers_proxy_authenticate;
+static int hf_http3_headers_proxy_authorization;
+static int hf_http3_headers_range;
+static int hf_http3_headers_referer;
+static int hf_http3_headers_refresh;
+static int hf_http3_headers_retry_after;
+static int hf_http3_headers_server;
+static int hf_http3_headers_set_cookie;
+static int hf_http3_headers_strict_transport_security;
+static int hf_http3_headers_user_agent;
+static int hf_http3_headers_vary;
+static int hf_http3_headers_via;
+static int hf_http3_headers_www_authenticate;
 #endif
 
-//static int hf_http3_qpack                                    = -1;
-static int hf_http3_qpack_encoder                            = -1;
-//static int hf_http3_qpack_encoder_length                     = -1;
-static int hf_http3_qpack_encoder_icnt                       = -1;
-static int hf_http3_qpack_encoder_icnt_inc                   = -1;
-//static int hf_http3_qpack_encoder_opcode                     = -1;
-static int hf_http3_qpack_encoder_opcode_insert_indexed      = -1;
-static int hf_http3_qpack_encoder_opcode_insert_indexed_ref  = -1;
-static int hf_http3_qpack_encoder_opcode_insert_indexed_val  = -1;
-static int hf_http3_qpack_encoder_opcode_insert_indexed_hval = -1;
-static int hf_http3_qpack_encoder_opcode_insert              = -1;
-static int hf_http3_qpack_encoder_opcode_insert_name         = -1;
-static int hf_http3_qpack_encoder_opcode_insert_hname        = -1;
-static int hf_http3_qpack_encoder_opcode_insert_val          = -1;
-static int hf_http3_qpack_encoder_opcode_insert_hval         = -1;
-static int hf_http3_qpack_encoder_opcode_duplicate           = -1;
-//static int hf_http3_qpack_encoder_opcode_duplicate_val       = -1;
-static int hf_http3_qpack_encoder_opcode_dtable_cap          = -1;
-static int hf_http3_qpack_encoder_opcode_dtable_cap_val      = -1;
-
-static int hf_http3_settings                          = -1;
-static int hf_http3_settings_identifier               = -1;
-static int hf_http3_settings_value                    = -1;
-static int hf_http3_settings_qpack_max_table_capacity = -1;
-static int hf_http3_settings_max_field_section_size   = -1;
-static int hf_http3_settings_qpack_blocked_streams    = -1;
-static int hf_http3_settings_extended_connect         = -1;
-static int hf_http3_settings_webtransport             = -1;
-static int hf_http3_settings_h3_datagram              = -1;
-static int hf_http3_settings_h3_datagram_draft04      = -1;
-static int hf_http3_priority_update_element_id        = -1;
-static int hf_http3_priority_update_field_value       = -1;
+//static int hf_http3_qpack;
+static int hf_http3_qpack_encoder;
+//static int hf_http3_qpack_encoder_length;
+static int hf_http3_qpack_encoder_icnt;
+static int hf_http3_qpack_encoder_icnt_inc;
+//static int hf_http3_qpack_encoder_opcode;
+static int hf_http3_qpack_encoder_opcode_insert_indexed;
+static int hf_http3_qpack_encoder_opcode_insert_indexed_ref;
+static int hf_http3_qpack_encoder_opcode_insert_indexed_val;
+static int hf_http3_qpack_encoder_opcode_insert_indexed_hval;
+static int hf_http3_qpack_encoder_opcode_insert;
+static int hf_http3_qpack_encoder_opcode_insert_name;
+static int hf_http3_qpack_encoder_opcode_insert_hname;
+static int hf_http3_qpack_encoder_opcode_insert_val;
+static int hf_http3_qpack_encoder_opcode_insert_hval;
+static int hf_http3_qpack_encoder_opcode_duplicate;
+//static int hf_http3_qpack_encoder_opcode_duplicate_val;
+static int hf_http3_qpack_encoder_opcode_dtable_cap;
+static int hf_http3_qpack_encoder_opcode_dtable_cap_val;
+
+static int hf_http3_settings;
+static int hf_http3_settings_identifier;
+static int hf_http3_settings_value;
+static int hf_http3_settings_qpack_max_table_capacity;
+static int hf_http3_settings_max_field_section_size;
+static int hf_http3_settings_qpack_blocked_streams;
+static int hf_http3_settings_extended_connect;
+static int hf_http3_settings_webtransport;
+static int hf_http3_settings_h3_datagram;
+static int hf_http3_settings_h3_datagram_draft04;
+static int hf_http3_priority_update_element_id;
+static int hf_http3_priority_update_field_value;
 
 /* QPACK dissection EIs */
-//static expert_field ei_http3_qpack_enc_update = EI_INIT;
-static expert_field ei_http3_qpack_failed     = EI_INIT;
+//static expert_field ei_http3_qpack_enc_update;
+static expert_field ei_http3_qpack_failed;
 /* HTTP3 dissection EIs */
-static expert_field ei_http3_unknown_stream_type = EI_INIT;
-//static expert_field ei_http3_data_not_decoded    = EI_INIT;
+static expert_field ei_http3_unknown_stream_type;
+//static expert_field ei_http3_data_not_decoded;
 /* Encoded data EIs */
-static expert_field ei_http3_header_encoded_state = EI_INIT;
+static expert_field ei_http3_header_encoded_state;
 /* HTTP3 header decoding EIs */
-static expert_field ei_http3_header_decoding_failed    = EI_INIT;
-static expert_field ei_http3_header_decoding_blocked   = EI_INIT;
-static expert_field ei_http3_header_decoding_no_output = EI_INIT;
+static expert_field ei_http3_header_decoding_failed;
+static expert_field ei_http3_header_decoding_blocked;
+static expert_field ei_http3_header_decoding_no_output;
 
 /* Initialize the subtree pointers */
-static gint ett_http3                       = -1;
-static gint ett_http3_stream_uni            = -1;
-static gint ett_http3_stream_bidi           = -1;
-static gint ett_http3_frame                 = -1;
-static gint ett_http3_settings              = -1;
-static gint ett_http3_headers               = -1;
-static gint ett_http3_headers_qpack_blocked = -1;
-static gint ett_http3_qpack_update          = -1;
-static gint ett_http3_qpack_opcode          = -1;
+static gint ett_http3;
+static gint ett_http3_stream_uni;
+static gint ett_http3_stream_bidi;
+static gint ett_http3_frame;
+static gint ett_http3_settings;
+static gint ett_http3_headers;
+static gint ett_http3_headers_qpack_blocked;
+static gint ett_http3_qpack_update;
+static gint ett_http3_qpack_opcode;
 
 /**
  * HTTP3 header constants.
diff --git a/epan/dissectors/packet-hyperscsi.c b/epan/dissectors/packet-hyperscsi.c
index be340eb45c..be2acbd72c 100644
--- a/epan/dissectors/packet-hyperscsi.c
+++ b/epan/dissectors/packet-hyperscsi.c
@@ -18,16 +18,16 @@ void proto_reg_handoff_hyperscsi(void);
 
 static int proto_hyperscsi;
 
-static int hf_hs_cmd = -1;
-static int hf_hs_ver = -1;
-static int hf_hs_res = -1;
-static int hf_hs_tagno = -1;
-static int hf_hs_lastfrag = -1;
-static int hf_hs_fragno = -1;
-
-static gint ett_hyperscsi = -1;
-static gint ett_hs_hdr = -1;
-static gint ett_hs_pdu = -1;
+static int hf_hs_cmd;
+static int hf_hs_ver;
+static int hf_hs_res;
+static int hf_hs_tagno;
+static int hf_hs_lastfrag;
+static int hf_hs_fragno;
+
+static gint ett_hyperscsi;
+static gint ett_hs_hdr;
+static gint ett_hs_pdu;
 
 static dissector_handle_t hs_handle;
 
diff --git a/epan/dissectors/packet-i2c.c b/epan/dissectors/packet-i2c.c
index f16f2ddb0c..ec71deeea9 100644
--- a/epan/dissectors/packet-i2c.c
+++ b/epan/dissectors/packet-i2c.c
@@ -24,17 +24,17 @@ static dissector_handle_t i2c_linux_handle;
 static capture_dissector_handle_t i2c_linux_cap_handle;
 static dissector_handle_t i2c_kontron_handle;
 
-static int proto_i2c = -1;
-static int proto_i2c_event = -1;
-static int proto_i2c_data = -1;
+static int proto_i2c;
+static int proto_i2c_event;
+static int proto_i2c_data;
 
 
-static int hf_i2c_bus = -1;
-static int hf_i2c_event = -1;
-static int hf_i2c_flags = -1;
-static int hf_i2c_addr = -1;
+static int hf_i2c_bus;
+static int hf_i2c_event;
+static int hf_i2c_flags;
+static int hf_i2c_addr;
 
-static gint ett_i2c = -1;
+static gint ett_i2c;
 
 static dissector_table_t subdissector_table;
 
diff --git a/epan/dissectors/packet-iana-oui.c b/epan/dissectors/packet-iana-oui.c
index 14af9ed90e..40072e9999 100644
--- a/epan/dissectors/packet-iana-oui.c
+++ b/epan/dissectors/packet-iana-oui.c
@@ -17,7 +17,7 @@
 
 void proto_register_iana_oui(void);
 
-static int hf_llc_iana_pid = -1;
+static int hf_llc_iana_pid;
 
 static const value_string iana_pid_vals[] = {
 	{ IANA_PID_MARS_DATA_SHORT,	"MARS Data Messages (short form)" },
diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c
index 786d3cb04d..feda52fd8a 100644
--- a/epan/dissectors/packet-iapp.c
+++ b/epan/dissectors/packet-iapp.c
@@ -20,32 +20,32 @@ void proto_reg_handoff_iapp(void);
 static dissector_handle_t iapp_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_iapp = -1;
-static int hf_iapp_version = -1;
-static int hf_iapp_type = -1;
-static int hf_iapp_cap_forwarding = -1;
-static int hf_iapp_cap_wep = -1;
-static int hf_iapp_auth_status = -1;
-static int hf_iapp_auth_string = -1;
-static int hf_iapp_auth_uint = -1;
-static int hf_iapp_auth_ipaddr = -1;
-static int hf_iapp_auth_trailer = -1;
-static int hf_iapp_pdu_ssid = -1;
-static int hf_iapp_pdu_bytes = -1;
-static int hf_iapp_pdu_uint = -1;
-static int hf_iapp_pdu_phytype = -1;
-static int hf_iapp_pdu_regdomain = -1;
-static int hf_iapp_pdu_oui_ident = -1;
+static int proto_iapp;
+static int hf_iapp_version;
+static int hf_iapp_type;
+static int hf_iapp_cap_forwarding;
+static int hf_iapp_cap_wep;
+static int hf_iapp_auth_status;
+static int hf_iapp_auth_string;
+static int hf_iapp_auth_uint;
+static int hf_iapp_auth_ipaddr;
+static int hf_iapp_auth_trailer;
+static int hf_iapp_pdu_ssid;
+static int hf_iapp_pdu_bytes;
+static int hf_iapp_pdu_uint;
+static int hf_iapp_pdu_phytype;
+static int hf_iapp_pdu_regdomain;
+static int hf_iapp_pdu_oui_ident;
 
 /* Initialize the subtree pointers */
-static gint ett_iapp = -1;
-static gint ett_iapp_pdu = -1;
-static gint ett_iapp_subpdu = -1;
-static gint ett_iapp_cap = -1;
-static gint ett_iapp_auth = -1;
-static gint ett_iapp_authinfo = -1;
-
-static expert_field ei_iapp_no_pdus = EI_INIT;
+static gint ett_iapp;
+static gint ett_iapp_pdu;
+static gint ett_iapp_subpdu;
+static gint ett_iapp_cap;
+static gint ett_iapp_auth;
+static gint ett_iapp_authinfo;
+
+static expert_field ei_iapp_no_pdus;
 
 #define UDP_PORT_IAPP     2313
 
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index 7da65be25f..bdf54890e3 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -51,7 +51,7 @@ void proto_reg_handoff_iax2(void);
 /* #define DEBUG_DESEGMENT */
 
 /* Wireshark ID of the IAX2 protocol */
-static int proto_iax2 = -1;
+static int proto_iax2;
 
 /* tap register id */
 static int iax2_tap = -1;
@@ -64,77 +64,77 @@ static iax2_info_t *iax2_info = ii_arr;
  * our header fields; they are filled out when we call
  * proto_register_field_array() in proto_register_iax2()
  */
-static int hf_iax2_packet_type = -1;
-static int hf_iax2_retransmission = -1;
-static int hf_iax2_callno = -1;
-static int hf_iax2_scallno = -1;
-static int hf_iax2_dcallno = -1;
-static int hf_iax2_ts = -1;
-static int hf_iax2_minits = -1;
-static int hf_iax2_minividts = -1;
-static int hf_iax2_absts = -1;
-static int hf_iax2_lateness = -1;
-static int hf_iax2_minividmarker = -1;
-static int hf_iax2_oseqno = -1;
-static int hf_iax2_iseqno = -1;
-static int hf_iax2_type = -1;
-static int hf_iax2_csub = -1;
-static int hf_iax2_dtmf_csub = -1;
-static int hf_iax2_cmd_csub = -1;
-static int hf_iax2_iax_csub = -1;
-static int hf_iax2_voice_csub = -1;
-static int hf_iax2_voice_codec = -1;
-static int hf_iax2_video_csub = -1;
-static int hf_iax2_video_codec = -1;
-static int hf_iax2_marker = -1;
-static int hf_iax2_modem_csub = -1;
-static int hf_iax2_text_csub = -1;
-static int hf_iax2_text_text = -1;
-static int hf_iax2_html_csub = -1;
-static int hf_iax2_html_url = -1;
-static int hf_iax2_trunk_metacmd = -1;
-static int hf_iax2_trunk_cmddata = -1;
-static int hf_iax2_trunk_cmddata_ts = -1;
-static int hf_iax2_trunk_ts = -1;
-static int hf_iax2_trunk_ncalls = -1;
-static int hf_iax2_trunk_call_len = -1;
-static int hf_iax2_trunk_call_scallno = -1;
-static int hf_iax2_trunk_call_ts = -1;
-static int hf_iax2_trunk_call_data = -1;
-
-static int hf_iax2_ie_id = -1;
-static int hf_iax2_length = -1;
-static int hf_iax2_version = -1;
-static int hf_iax2_cap_g723_1 = -1;
-static int hf_iax2_cap_gsm = -1;
-static int hf_iax2_cap_ulaw = -1;
-static int hf_iax2_cap_alaw = -1;
-static int hf_iax2_cap_g726_aal2 = -1;
-static int hf_iax2_cap_adpcm = -1;
-static int hf_iax2_cap_slinear = -1;
-static int hf_iax2_cap_lpc10 = -1;
-static int hf_iax2_cap_g729a = -1;
-static int hf_iax2_cap_speex = -1;
-static int hf_iax2_cap_ilbc = -1;
-static int hf_iax2_cap_g726 = -1;
-static int hf_iax2_cap_g722 = -1;
-static int hf_iax2_cap_siren7 = -1;
-static int hf_iax2_cap_siren14 = -1;
-static int hf_iax2_cap_slinear16 = -1;
-static int hf_iax2_cap_jpeg = -1;
-static int hf_iax2_cap_png = -1;
-static int hf_iax2_cap_h261 = -1;
-static int hf_iax2_cap_h263 = -1;
-static int hf_iax2_cap_h263_plus = -1;
-static int hf_iax2_cap_h264 = -1;
-static int hf_iax2_cap_mpeg4 = -1;
-static int hf_iax2_cap_vp8 = -1;
-static int hf_iax2_cap_t140_red = -1;
-static int hf_iax2_cap_t140 = -1;
-static int hf_iax2_cap_g719 = -1;
-static int hf_iax2_cap_speex16 = -1;
-static int hf_iax2_cap_opus = -1;
-static int hf_iax2_cap_testlaw = -1;
+static int hf_iax2_packet_type;
+static int hf_iax2_retransmission;
+static int hf_iax2_callno;
+static int hf_iax2_scallno;
+static int hf_iax2_dcallno;
+static int hf_iax2_ts;
+static int hf_iax2_minits;
+static int hf_iax2_minividts;
+static int hf_iax2_absts;
+static int hf_iax2_lateness;
+static int hf_iax2_minividmarker;
+static int hf_iax2_oseqno;
+static int hf_iax2_iseqno;
+static int hf_iax2_type;
+static int hf_iax2_csub;
+static int hf_iax2_dtmf_csub;
+static int hf_iax2_cmd_csub;
+static int hf_iax2_iax_csub;
+static int hf_iax2_voice_csub;
+static int hf_iax2_voice_codec;
+static int hf_iax2_video_csub;
+static int hf_iax2_video_codec;
+static int hf_iax2_marker;
+static int hf_iax2_modem_csub;
+static int hf_iax2_text_csub;
+static int hf_iax2_text_text;
+static int hf_iax2_html_csub;
+static int hf_iax2_html_url;
+static int hf_iax2_trunk_metacmd;
+static int hf_iax2_trunk_cmddata;
+static int hf_iax2_trunk_cmddata_ts;
+static int hf_iax2_trunk_ts;
+static int hf_iax2_trunk_ncalls;
+static int hf_iax2_trunk_call_len;
+static int hf_iax2_trunk_call_scallno;
+static int hf_iax2_trunk_call_ts;
+static int hf_iax2_trunk_call_data;
+
+static int hf_iax2_ie_id;
+static int hf_iax2_length;
+static int hf_iax2_version;
+static int hf_iax2_cap_g723_1;
+static int hf_iax2_cap_gsm;
+static int hf_iax2_cap_ulaw;
+static int hf_iax2_cap_alaw;
+static int hf_iax2_cap_g726_aal2;
+static int hf_iax2_cap_adpcm;
+static int hf_iax2_cap_slinear;
+static int hf_iax2_cap_lpc10;
+static int hf_iax2_cap_g729a;
+static int hf_iax2_cap_speex;
+static int hf_iax2_cap_ilbc;
+static int hf_iax2_cap_g726;
+static int hf_iax2_cap_g722;
+static int hf_iax2_cap_siren7;
+static int hf_iax2_cap_siren14;
+static int hf_iax2_cap_slinear16;
+static int hf_iax2_cap_jpeg;
+static int hf_iax2_cap_png;
+static int hf_iax2_cap_h261;
+static int hf_iax2_cap_h263;
+static int hf_iax2_cap_h263_plus;
+static int hf_iax2_cap_h264;
+static int hf_iax2_cap_mpeg4;
+static int hf_iax2_cap_vp8;
+static int hf_iax2_cap_t140_red;
+static int hf_iax2_cap_t140;
+static int hf_iax2_cap_g719;
+static int hf_iax2_cap_speex16;
+static int hf_iax2_cap_opus;
+static int hf_iax2_cap_testlaw;
 
 static int * const hf_iax2_caps[] = {
   &hf_iax2_cap_g723_1,
@@ -170,18 +170,18 @@ static int * const hf_iax2_caps[] = {
   NULL
 };
 
-static int hf_iax2_fragment_unfinished = -1;
-static int hf_iax2_payload_data = -1;
-static int hf_iax2_fragments = -1;
-static int hf_iax2_fragment = -1;
-static int hf_iax2_fragment_overlap = -1;
-static int hf_iax2_fragment_overlap_conflict = -1;
-static int hf_iax2_fragment_multiple_tails = -1;
-static int hf_iax2_fragment_too_long_fragment = -1;
-static int hf_iax2_fragment_error = -1;
-static int hf_iax2_fragment_count = -1;
-static int hf_iax2_reassembled_in = -1;
-static int hf_iax2_reassembled_length = -1;
+static int hf_iax2_fragment_unfinished;
+static int hf_iax2_payload_data;
+static int hf_iax2_fragments;
+static int hf_iax2_fragment;
+static int hf_iax2_fragment_overlap;
+static int hf_iax2_fragment_overlap_conflict;
+static int hf_iax2_fragment_multiple_tails;
+static int hf_iax2_fragment_too_long_fragment;
+static int hf_iax2_fragment_error;
+static int hf_iax2_fragment_count;
+static int hf_iax2_reassembled_in;
+static int hf_iax2_reassembled_length;
 
 
 /* hf_iax2_ies is an array of header fields, one per potential Information
@@ -195,31 +195,31 @@ static int hf_iax2_reassembled_length = -1;
  */
 #define NUM_HF_IAX2_IES 256
 static int hf_iax2_ies[NUM_HF_IAX2_IES];
-static int hf_iax2_ie_datetime = -1;
-static int hf_IAX_IE_APPARENTADDR_SINFAMILY = -1;
-static int hf_IAX_IE_APPARENTADDR_SINPORT = -1;
-static int hf_IAX_IE_APPARENTADDR_SINADDR = -1;
-static int hf_IAX_IE_UNKNOWN_BYTE = -1;
-static int hf_IAX_IE_UNKNOWN_I16 = -1;
-static int hf_IAX_IE_UNKNOWN_I32 = -1;
-static int hf_IAX_IE_UNKNOWN_BYTES = -1;
+static int hf_iax2_ie_datetime;
+static int hf_IAX_IE_APPARENTADDR_SINFAMILY;
+static int hf_IAX_IE_APPARENTADDR_SINPORT;
+static int hf_IAX_IE_APPARENTADDR_SINADDR;
+static int hf_IAX_IE_UNKNOWN_BYTE;
+static int hf_IAX_IE_UNKNOWN_I16;
+static int hf_IAX_IE_UNKNOWN_I32;
+static int hf_IAX_IE_UNKNOWN_BYTES;
 
 /* These are the ids of the subtrees that we may be creating */
-static gint ett_iax2 = -1;
-static gint ett_iax2_full_mini_subtree = -1;
-static gint ett_iax2_type = -1;              /* Frame-type specific subtree */
-static gint ett_iax2_ie = -1;                /* single IE */
-static gint ett_iax2_codecs = -1;            /* capabilities IE */
-static gint ett_iax2_ies_apparent_addr = -1; /* apparent address IE */
-static gint ett_iax2_fragment = -1;
-static gint ett_iax2_fragments = -1;
-static gint ett_iax2_trunk_cmddata = -1;
-static gint ett_iax2_trunk_call = -1;
-
-static expert_field ei_iax_too_many_transfers = EI_INIT;
-static expert_field ei_iax_circuit_id_conflict = EI_INIT;
-static expert_field ei_iax_peer_address_unsupported = EI_INIT;
-static expert_field ei_iax_invalid_len = EI_INIT;
+static gint ett_iax2;
+static gint ett_iax2_full_mini_subtree;
+static gint ett_iax2_type;              /* Frame-type specific subtree */
+static gint ett_iax2_ie;                /* single IE */
+static gint ett_iax2_codecs;            /* capabilities IE */
+static gint ett_iax2_ies_apparent_addr; /* apparent address IE */
+static gint ett_iax2_fragment;
+static gint ett_iax2_fragments;
+static gint ett_iax2_trunk_cmddata;
+static gint ett_iax2_trunk_call;
+
+static expert_field ei_iax_too_many_transfers;
+static expert_field ei_iax_circuit_id_conflict;
+static expert_field ei_iax_peer_address_unsupported;
+static expert_field ei_iax_invalid_len;
 
 static dissector_handle_t iax2_handle;
 
diff --git a/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c
index b1d5e2999f..92a1c987cc 100644
--- a/epan/dissectors/packet-icap.c
+++ b/epan/dissectors/packet-icap.c
@@ -29,14 +29,14 @@ typedef enum _icap_type {
     ICAP_OTHER
 } icap_type_t;
 
-static int proto_icap = -1;
-static int hf_icap_response = -1;
-static int hf_icap_reqmod = -1;
-static int hf_icap_respmod = -1;
-static int hf_icap_options = -1;
-/* static int hf_icap_other = -1; */
-
-static gint ett_icap = -1;
+static int proto_icap;
+static int hf_icap_response;
+static int hf_icap_reqmod;
+static int hf_icap_respmod;
+static int hf_icap_options;
+/* static int hf_icap_other; */
+
+static gint ett_icap;
 
 static dissector_handle_t http_handle;
 
diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c
index e64342edaf..27c2bcf2d3 100644
--- a/epan/dissectors/packet-icep.c
+++ b/epan/dissectors/packet-icep.c
@@ -58,57 +58,57 @@ static const guint8 icep_magic[] = { 'I', 'c', 'e', 'P' };
 #define ICEP_MIN_COMMON_REQ_HEADER_SIZE 13
 
 /* Initialize the protocol and registered fields */
-static int proto_icep = -1;
+static int proto_icep;
 
 /* Message Header */
-static int hf_icep_protocol_major = -1;
-static int hf_icep_protocol_minor = -1;
-static int hf_icep_encoding_major = -1;
-static int hf_icep_encoding_minor = -1;
-static int hf_icep_message_type = -1;
-static int hf_icep_compression_status = -1;
-static int hf_icep_message_size = -1;
-static int hf_icep_magic_number = -1;
+static int hf_icep_protocol_major;
+static int hf_icep_protocol_minor;
+static int hf_icep_encoding_major;
+static int hf_icep_encoding_minor;
+static int hf_icep_message_type;
+static int hf_icep_compression_status;
+static int hf_icep_message_size;
+static int hf_icep_magic_number;
 
 /* [Batch] Request Message Body */
-static int hf_icep_request_id = -1;
-static int hf_icep_id_name = -1;
-static int hf_icep_id_category = -1;
-static int hf_icep_facet = -1;
-static int hf_icep_operation = -1;
-static int hf_icep_mode = -1;
-static int hf_icep_context = -1;
-static int hf_icep_params_size = -1;
-static int hf_icep_params_major = -1;
-static int hf_icep_params_minor = -1;
-static int hf_icep_params_encapsulated = -1;
-static int hf_icep_reply_data = -1;
-static int hf_icep_invocation_key = -1;
-static int hf_icep_invocation_value = -1;
+static int hf_icep_request_id;
+static int hf_icep_id_name;
+static int hf_icep_id_category;
+static int hf_icep_facet;
+static int hf_icep_operation;
+static int hf_icep_mode;
+static int hf_icep_context;
+static int hf_icep_params_size;
+static int hf_icep_params_major;
+static int hf_icep_params_minor;
+static int hf_icep_params_encapsulated;
+static int hf_icep_reply_data;
+static int hf_icep_invocation_key;
+static int hf_icep_invocation_value;
 
 /* Reply Message Body */
-static int hf_icep_reply_status = -1;
+static int hf_icep_reply_status;
 
 /* Initialize the subtree pointers */
-static gint ett_icep = -1;
-static gint ett_icep_msg = -1;
-static gint ett_icep_invocation_context = -1;
-
-static expert_field ei_icep_params_size = EI_INIT;
-static expert_field ei_icep_context_missing = EI_INIT;
-static expert_field ei_icep_reply_data = EI_INIT;
-static expert_field ei_icep_length = EI_INIT;
-static expert_field ei_icep_facet_max_one_element = EI_INIT;
-static expert_field ei_icep_string_too_long = EI_INIT;
-static expert_field ei_icep_string_malformed = EI_INIT;
-static expert_field ei_icep_message_type = EI_INIT;
-static expert_field ei_icep_mode_missing = EI_INIT;
-static expert_field ei_icep_params_encapsulated = EI_INIT;
-static expert_field ei_icep_params_missing = EI_INIT;
-static expert_field ei_icep_batch_requests = EI_INIT;
-static expert_field ei_icep_empty_batch = EI_INIT;
-static expert_field ei_icep_facet_missing = EI_INIT;
-static expert_field ei_icep_context_too_long = EI_INIT;
+static gint ett_icep;
+static gint ett_icep_msg;
+static gint ett_icep_invocation_context;
+
+static expert_field ei_icep_params_size;
+static expert_field ei_icep_context_missing;
+static expert_field ei_icep_reply_data;
+static expert_field ei_icep_length;
+static expert_field ei_icep_facet_max_one_element;
+static expert_field ei_icep_string_too_long;
+static expert_field ei_icep_string_malformed;
+static expert_field ei_icep_message_type;
+static expert_field ei_icep_mode_missing;
+static expert_field ei_icep_params_encapsulated;
+static expert_field ei_icep_params_missing;
+static expert_field ei_icep_batch_requests;
+static expert_field ei_icep_empty_batch;
+static expert_field ei_icep_facet_missing;
+static expert_field ei_icep_context_too_long;
 
 /* Preferences */
 static guint icep_max_batch_requests    = 64;
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c
index 77d12b8ee0..530df7171e 100644
--- a/epan/dissectors/packet-icmp.c
+++ b/epan/dissectors/packet-icmp.c
@@ -47,12 +47,12 @@ static heur_dissector_list_t icmp_heur_subdissector_list;
 static int icmp_tap = -1;
 
 /* Conversation related data */
-static int hf_icmp_resp_in = -1;
-static int hf_icmp_resp_to = -1;
-static int hf_icmp_no_resp = -1;
-static int hf_icmp_resptime = -1;
-static int hf_icmp_data_time = -1;
-static int hf_icmp_data_time_relative = -1;
+static int hf_icmp_resp_in;
+static int hf_icmp_resp_to;
+static int hf_icmp_no_resp;
+static int hf_icmp_resptime;
+static int hf_icmp_data_time;
+static int hf_icmp_data_time_relative;
 
 typedef struct _icmp_conv_info_t {
 	wmem_tree_t *unmatched_pdus;
@@ -70,123 +70,123 @@ static icmp_transaction_t *transaction_end(packet_info * pinfo,
 if the packet in the payload has more than 128 bytes */
 static gboolean favor_icmp_mpls_ext = FALSE;
 
-static int proto_icmp = -1;
-
-static int hf_icmp_type = -1;
-static int hf_icmp_code = -1;
-static int hf_icmp_checksum = -1;
-static int hf_icmp_checksum_status = -1;
-static int hf_icmp_unused = -1;
-static int hf_icmp_reserved = -1;
-static int hf_icmp_ident = -1;
-static int hf_icmp_ident_le = -1;
-static int hf_icmp_seq_num = -1;
-static int hf_icmp_seq_num_le = -1;
-static int hf_icmp_mtu = -1;
-static int hf_icmp_num_addrs = -1;
-static int hf_icmp_addr_entry_size = -1;
-static int hf_icmp_lifetime = -1;
-static int hf_icmp_pointer = -1;
-static int hf_icmp_router_address = -1;
-static int hf_icmp_pref_level = -1;
-static int hf_icmp_redir_gw = -1;
-static int hf_icmp_originate_timestamp = -1;
-static int hf_icmp_receive_timestamp = -1;
-static int hf_icmp_transmit_timestamp = -1;
-static int hf_icmp_address_mask = -1;
-static int hf_icmp_length = -1;
-static int hf_icmp_length_original_datagram = -1;
+static int proto_icmp;
+
+static int hf_icmp_type;
+static int hf_icmp_code;
+static int hf_icmp_checksum;
+static int hf_icmp_checksum_status;
+static int hf_icmp_unused;
+static int hf_icmp_reserved;
+static int hf_icmp_ident;
+static int hf_icmp_ident_le;
+static int hf_icmp_seq_num;
+static int hf_icmp_seq_num_le;
+static int hf_icmp_mtu;
+static int hf_icmp_num_addrs;
+static int hf_icmp_addr_entry_size;
+static int hf_icmp_lifetime;
+static int hf_icmp_pointer;
+static int hf_icmp_router_address;
+static int hf_icmp_pref_level;
+static int hf_icmp_redir_gw;
+static int hf_icmp_originate_timestamp;
+static int hf_icmp_receive_timestamp;
+static int hf_icmp_transmit_timestamp;
+static int hf_icmp_address_mask;
+static int hf_icmp_length;
+static int hf_icmp_length_original_datagram;
 
 /* Mobile ip */
-static int hf_icmp_mip_type = -1;
-static int hf_icmp_mip_length = -1;
-static int hf_icmp_mip_prefix_length = -1;
-static int hf_icmp_mip_seq = -1;
-static int hf_icmp_mip_life = -1;
-static int hf_icmp_mip_flags = -1;
-static int hf_icmp_mip_r = -1;
-static int hf_icmp_mip_b = -1;
-static int hf_icmp_mip_h = -1;
-static int hf_icmp_mip_f = -1;
-static int hf_icmp_mip_m = -1;
-static int hf_icmp_mip_g = -1;
-static int hf_icmp_mip_v = -1;
-static int hf_icmp_mip_rt = -1;
-static int hf_icmp_mip_u = -1;
-static int hf_icmp_mip_x = -1;
-static int hf_icmp_mip_reserved = -1;
-static int hf_icmp_mip_coa = -1;
-static int hf_icmp_mip_challenge = -1;
-static int hf_icmp_mip_content = -1;
+static int hf_icmp_mip_type;
+static int hf_icmp_mip_length;
+static int hf_icmp_mip_prefix_length;
+static int hf_icmp_mip_seq;
+static int hf_icmp_mip_life;
+static int hf_icmp_mip_flags;
+static int hf_icmp_mip_r;
+static int hf_icmp_mip_b;
+static int hf_icmp_mip_h;
+static int hf_icmp_mip_f;
+static int hf_icmp_mip_m;
+static int hf_icmp_mip_g;
+static int hf_icmp_mip_v;
+static int hf_icmp_mip_rt;
+static int hf_icmp_mip_u;
+static int hf_icmp_mip_x;
+static int hf_icmp_mip_reserved;
+static int hf_icmp_mip_coa;
+static int hf_icmp_mip_challenge;
+static int hf_icmp_mip_content;
 
 /* extensions RFC 4884*/
-static int hf_icmp_ext = -1;
-static int hf_icmp_ext_version = -1;
-static int hf_icmp_ext_reserved = -1;
-static int hf_icmp_ext_checksum = -1;
-static int hf_icmp_ext_checksum_status = -1;
-static int hf_icmp_ext_length = -1;
-static int hf_icmp_ext_class = -1;
-static int hf_icmp_ext_c_type = -1;
-static int hf_icmp_ext_data = -1;
+static int hf_icmp_ext;
+static int hf_icmp_ext_version;
+static int hf_icmp_ext_reserved;
+static int hf_icmp_ext_checksum;
+static int hf_icmp_ext_checksum_status;
+static int hf_icmp_ext_length;
+static int hf_icmp_ext_class;
+static int hf_icmp_ext_c_type;
+static int hf_icmp_ext_data;
 
 /* Interface information extension RFC 5837 */
-static int hf_icmp_int_info_ifindex = -1;
-static int hf_icmp_int_info_ipaddr = -1;
-static int hf_icmp_int_info_name = -1;
-static int hf_icmp_int_info_mtu_present = -1;
-static int hf_icmp_int_info_mtu = -1;
-static int hf_icmp_int_info_index = -1;
-static int hf_icmp_int_info_afi = -1;
-static int hf_icmp_int_info_ipv4 = -1;
-static int hf_icmp_int_info_ipv6 = -1;
-static int hf_icmp_int_info_ipunknown = -1;
-static int hf_icmp_int_info_name_length = -1;
-static int hf_icmp_int_info_name_string = -1;
-static int hf_icmp_int_info_role = -1;
-static int hf_icmp_int_info_reserved = -1;
-static gint ett_icmp_interface_info_object = -1;
-static gint ett_icmp_interface_ipaddr = -1;
-static gint ett_icmp_interface_name = -1;
+static int hf_icmp_int_info_ifindex;
+static int hf_icmp_int_info_ipaddr;
+static int hf_icmp_int_info_name;
+static int hf_icmp_int_info_mtu_present;
+static int hf_icmp_int_info_mtu;
+static int hf_icmp_int_info_index;
+static int hf_icmp_int_info_afi;
+static int hf_icmp_int_info_ipv4;
+static int hf_icmp_int_info_ipv6;
+static int hf_icmp_int_info_ipunknown;
+static int hf_icmp_int_info_name_length;
+static int hf_icmp_int_info_name_string;
+static int hf_icmp_int_info_role;
+static int hf_icmp_int_info_reserved;
+static gint ett_icmp_interface_info_object;
+static gint ett_icmp_interface_ipaddr;
+static gint ett_icmp_interface_name;
 /* MPLS extension object*/
-static int hf_icmp_mpls_label = -1;
-static int hf_icmp_mpls_exp = -1;
-static int hf_icmp_mpls_s = -1;
-static int hf_icmp_mpls_ttl = -1;
-static int hf_icmp_mpls_data = -1;
+static int hf_icmp_mpls_label;
+static int hf_icmp_mpls_exp;
+static int hf_icmp_mpls_s;
+static int hf_icmp_mpls_ttl;
+static int hf_icmp_mpls_data;
 
-static gint ett_icmp = -1;
-static gint ett_icmp_mip = -1;
-static gint ett_icmp_mip_flags = -1;
+static gint ett_icmp;
+static gint ett_icmp_mip;
+static gint ett_icmp_mip_flags;
 
 /* extensions */
-static gint ett_icmp_ext = -1;
-static gint ett_icmp_ext_object = -1;
+static gint ett_icmp_ext;
+static gint ett_icmp_ext_object;
 
 /* MPLS extensions */
-static gint ett_icmp_mpls_stack_object = -1;
+static gint ett_icmp_mpls_stack_object;
 
-static expert_field ei_icmp_resp_not_found = EI_INIT;
-static expert_field ei_icmp_checksum = EI_INIT;
-static expert_field ei_icmp_ext_checksum = EI_INIT;
+static expert_field ei_icmp_resp_not_found;
+static expert_field ei_icmp_checksum;
+static expert_field ei_icmp_ext_checksum;
 
 /* Extended Echo - Probe */
-static int hf_icmp_ext_echo_seq_num = -1;
-static int hf_icmp_ext_echo_req_reserved = -1;
-static int hf_icmp_ext_echo_req_local = -1;
-static int hf_icmp_ext_echo_rsp_state = -1;
-static int hf_icmp_ext_echo_rsp_reserved = -1;
-static int hf_icmp_ext_echo_rsp_active = -1;
-static int hf_icmp_ext_echo_rsp_ipv4 = -1;
-static int hf_icmp_ext_echo_rsp_ipv6 = -1;
-static int hf_icmp_int_ident_name_string = -1;
-static int hf_icmp_int_ident_index = -1;
-static int hf_icmp_int_ident_afi = -1;
-static int hf_icmp_int_ident_addr_length = -1;
-static int hf_icmp_int_ident_reserved = -1;
-static int hf_icmp_int_ident_ipv4 = -1;
-static int hf_icmp_int_ident_ipv6 = -1;
-static int hf_icmp_int_ident_address = -1;
+static int hf_icmp_ext_echo_seq_num;
+static int hf_icmp_ext_echo_req_reserved;
+static int hf_icmp_ext_echo_req_local;
+static int hf_icmp_ext_echo_rsp_state;
+static int hf_icmp_ext_echo_rsp_reserved;
+static int hf_icmp_ext_echo_rsp_active;
+static int hf_icmp_ext_echo_rsp_ipv4;
+static int hf_icmp_ext_echo_rsp_ipv6;
+static int hf_icmp_int_ident_name_string;
+static int hf_icmp_int_ident_index;
+static int hf_icmp_int_ident_afi;
+static int hf_icmp_int_ident_addr_length;
+static int hf_icmp_int_ident_reserved;
+static int hf_icmp_int_ident_ipv4;
+static int hf_icmp_int_ident_ipv6;
+static int hf_icmp_int_ident_address;
 
 static dissector_handle_t icmp_handle;
 
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index 862d152092..adebc65f08 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -87,497 +87,497 @@ void proto_reg_handoff_icmpv6(void);
  * http://www.iana.org/assignments/icmpv6-parameters (last updated 2016-02-24)
  */
 
-static int proto_icmpv6 = -1;
-static int hf_icmpv6_type = -1;
-static int hf_icmpv6_code = -1;
-static int hf_icmpv6_checksum = -1;
-static int hf_icmpv6_checksum_status = -1;
-static int hf_icmpv6_reserved = -1;
-static int hf_icmpv6_data = -1;
-static int hf_icmpv6_unknown_data = -1;
-static int hf_icmpv6_mtu = -1;
-static int hf_icmpv6_pointer = -1;
-static int hf_icmpv6_echo_identifier = -1;
-static int hf_icmpv6_echo_sequence_number = -1;
-static int hf_icmpv6_nonce = -1;
-static int hf_icmpv6_data_time = -1;
-static int hf_icmpv6_data_time_relative = -1;
+static int proto_icmpv6;
+static int hf_icmpv6_type;
+static int hf_icmpv6_code;
+static int hf_icmpv6_checksum;
+static int hf_icmpv6_checksum_status;
+static int hf_icmpv6_reserved;
+static int hf_icmpv6_data;
+static int hf_icmpv6_unknown_data;
+static int hf_icmpv6_mtu;
+static int hf_icmpv6_pointer;
+static int hf_icmpv6_echo_identifier;
+static int hf_icmpv6_echo_sequence_number;
+static int hf_icmpv6_nonce;
+static int hf_icmpv6_data_time;
+static int hf_icmpv6_data_time_relative;
 
 /* RFC 2461/4861 : Neighbor Discovery for IP version 6 (IPv6) */
-static int hf_icmpv6_nd_ra_cur_hop_limit = -1;
-static int hf_icmpv6_nd_ra_flag = -1;
-static int hf_icmpv6_nd_ra_flag_m = -1;
-static int hf_icmpv6_nd_ra_flag_o = -1;
-static int hf_icmpv6_nd_ra_flag_h = -1;
-static int hf_icmpv6_nd_ra_flag_prf = -1;
-static int hf_icmpv6_nd_ra_flag_p = -1;
-static int hf_icmpv6_nd_ra_flag_rsv = -1;
-static int hf_icmpv6_nd_ra_router_lifetime = -1;
-static int hf_icmpv6_nd_ra_reachable_time = -1;
-static int hf_icmpv6_nd_ra_retrans_timer = -1;
-static int hf_icmpv6_nd_ns_target_address = -1;
-static int hf_icmpv6_nd_na_flag = -1;
-static int hf_icmpv6_nd_na_flag_r = -1;
-static int hf_icmpv6_nd_na_flag_s = -1;
-static int hf_icmpv6_nd_na_flag_o = -1;
-static int hf_icmpv6_nd_na_flag_rsv = -1;
-static int hf_icmpv6_nd_na_target_address = -1;
-static int hf_icmpv6_nd_rd_target_address = -1;
-static int hf_icmpv6_nd_rd_destination_address = -1;
+static int hf_icmpv6_nd_ra_cur_hop_limit;
+static int hf_icmpv6_nd_ra_flag;
+static int hf_icmpv6_nd_ra_flag_m;
+static int hf_icmpv6_nd_ra_flag_o;
+static int hf_icmpv6_nd_ra_flag_h;
+static int hf_icmpv6_nd_ra_flag_prf;
+static int hf_icmpv6_nd_ra_flag_p;
+static int hf_icmpv6_nd_ra_flag_rsv;
+static int hf_icmpv6_nd_ra_router_lifetime;
+static int hf_icmpv6_nd_ra_reachable_time;
+static int hf_icmpv6_nd_ra_retrans_timer;
+static int hf_icmpv6_nd_ns_target_address;
+static int hf_icmpv6_nd_na_flag;
+static int hf_icmpv6_nd_na_flag_r;
+static int hf_icmpv6_nd_na_flag_s;
+static int hf_icmpv6_nd_na_flag_o;
+static int hf_icmpv6_nd_na_flag_rsv;
+static int hf_icmpv6_nd_na_target_address;
+static int hf_icmpv6_nd_rd_target_address;
+static int hf_icmpv6_nd_rd_destination_address;
 
 /* ND Options */
-static int hf_icmpv6_opt = -1;
-static int hf_icmpv6_opt_type = -1;
-static int hf_icmpv6_opt_length = -1;
-static int hf_icmpv6_opt_linkaddr_mac = -1;
-static int hf_icmpv6_opt_src_linkaddr_mac = -1;
-static int hf_icmpv6_opt_target_linkaddr_mac = -1;
-static int hf_icmpv6_opt_linkaddr = -1;
-static int hf_icmpv6_opt_src_linkaddr = -1;
-static int hf_icmpv6_opt_target_linkaddr = -1;
-static int hf_icmpv6_opt_linkaddr_eui64 = -1;
-static int hf_icmpv6_opt_src_linkaddr_eui64 = -1;
-static int hf_icmpv6_opt_target_linkaddr_eui64 = -1;
-static int hf_icmpv6_opt_prefix_len = -1;
-static int hf_icmpv6_opt_prefix_flag = -1;
-static int hf_icmpv6_opt_prefix_flag_l = -1;
-static int hf_icmpv6_opt_prefix_flag_a = -1;
-static int hf_icmpv6_opt_prefix_flag_r = -1;
-static int hf_icmpv6_opt_prefix_flag_reserved = -1;
-static int hf_icmpv6_opt_prefix_valid_lifetime = -1;
-static int hf_icmpv6_opt_prefix_preferred_lifetime = -1;
-static int hf_icmpv6_opt_prefix = -1;
-static int hf_icmpv6_opt_naack_option_code = -1;
-static int hf_icmpv6_opt_naack_status = -1;
-static int hf_icmpv6_opt_naack_supplied_ncoa = -1;
-static int hf_icmpv6_opt_cga_pad_len = -1;
-static int hf_icmpv6_opt_cga = -1;
-static int hf_icmpv6_opt_cga_modifier = -1;
-static int hf_icmpv6_opt_cga_subnet_prefix = -1;
-static int hf_icmpv6_opt_cga_count = -1;
-static int hf_icmpv6_opt_cga_subject_public_key_info = -1;
-static int hf_icmpv6_opt_cga_ext_type = -1;
-static int hf_icmpv6_opt_cga_ext_length = -1;
-static int hf_icmpv6_opt_cga_ext_data = -1;
-static int hf_icmpv6_opt_rsa_key_hash = -1;
-static int hf_icmpv6_opt_digital_signature_padding = -1;
-static int hf_icmpv6_opt_ps_key_hash = -1;
-static int hf_icmpv6_opt_timestamp = -1;
-static int hf_icmpv6_opt_nonce = -1;
-static int hf_icmpv6_opt_certificate_padding = -1;
-static int hf_icmpv6_opt_ipa_option_code = -1;
-static int hf_icmpv6_opt_ipa_prefix_len = -1;
-static int hf_icmpv6_opt_ipa_ipv6_address = -1;
-static int hf_icmpv6_opt_nrpi_option_code = -1;
-static int hf_icmpv6_opt_nrpi_prefix_len = -1;
-static int hf_icmpv6_opt_nrpi_prefix = -1;
-static int hf_icmpv6_opt_lla_option_code = -1;
-static int hf_icmpv6_opt_lla_bytes = -1;
-static int hf_icmpv6_opt_pvd_id_flags = -1;
-static int hf_icmpv6_opt_pvd_id_flags_h = -1;
-static int hf_icmpv6_opt_pvd_id_flags_l = -1;
-static int hf_icmpv6_opt_pvd_id_flags_r = -1;
-static int hf_icmpv6_opt_pvd_id_flags_reserved = -1;
-static int hf_icmpv6_opt_pvd_id_delay = -1;
-static int hf_icmpv6_opt_pvd_id_sequence_number = -1;
-static int hf_icmpv6_opt_pvd_id_fqdn = -1;
-static int hf_icmpv6_opt_map_dist = -1;
-static int hf_icmpv6_opt_map_pref = -1;
-static int hf_icmpv6_opt_map_flag = -1;
-static int hf_icmpv6_opt_map_flag_r = -1;
-static int hf_icmpv6_opt_map_flag_reserved = -1;
-static int hf_icmpv6_opt_map_valid_lifetime = -1;
-static int hf_icmpv6_opt_map_global_address = -1;
-static int hf_icmpv6_opt_route_info_flag = -1;
-static int hf_icmpv6_opt_route_info_flag_route_preference = -1;
-static int hf_icmpv6_opt_route_info_flag_reserved = -1;
-static int hf_icmpv6_opt_route_lifetime = -1;
-static int hf_icmpv6_opt_name_type = -1;
-static int hf_icmpv6_opt_name_x501 = -1;
-static int hf_icmpv6_opt_name_fqdn = -1;
-static int hf_icmpv6_opt_cert_type = -1;
-static int hf_icmpv6_x509if_Name = -1;
-static int hf_icmpv6_x509af_Certificate = -1;
-static int hf_icmpv6_opt_redirected_packet = -1;
-static int hf_icmpv6_opt_mtu = -1;
-static int hf_icmpv6_opt_nbma_shortcut_limit = -1;
-static int hf_icmpv6_opt_advertisement_interval = -1;
-static int hf_icmpv6_opt_home_agent_preference = -1;
-static int hf_icmpv6_opt_home_agent_lifetime = -1;
-static int hf_icmpv6_opt_ipv6_address = -1;
-static int hf_icmpv6_opt_reserved = -1;
-static int hf_icmpv6_opt_padding = -1;
-static int hf_icmpv6_opt_rdnss_lifetime = -1;
-static int hf_icmpv6_opt_rdnss = -1;
-static int hf_icmpv6_opt_efo = -1;
-static int hf_icmpv6_opt_efo_m = -1;
-static int hf_icmpv6_opt_efo_o = -1;
-static int hf_icmpv6_opt_efo_h = -1;
-static int hf_icmpv6_opt_efo_prf = -1;
-static int hf_icmpv6_opt_efo_p = -1;
-static int hf_icmpv6_opt_efo_rsv = -1;
-static int hf_icmpv6_opt_hkr_pad_length = -1;
-static int hf_icmpv6_opt_hkr_at = -1;
-static int hf_icmpv6_opt_hkr_reserved = -1;
-static int hf_icmpv6_opt_hkr_encryption_public_key = -1;
-static int hf_icmpv6_opt_hkr_padding = -1;
-static int hf_icmpv6_opt_hkr_lifetime = -1;
-static int hf_icmpv6_opt_hkr_encrypted_handover_key = -1;
-static int hf_icmpv6_opt_hai_option_code = -1;
-static int hf_icmpv6_opt_hai_length = -1;
-static int hf_icmpv6_opt_hai_value = -1;
-static int hf_icmpv6_opt_mn_option_code = -1;
-static int hf_icmpv6_opt_mn_length = -1;
-static int hf_icmpv6_opt_mn_value = -1;
-static int hf_icmpv6_opt_dnssl_lifetime = -1;
-static int hf_icmpv6_opt_dnssl = -1;
-
-static int hf_icmpv6_opt_aro_status = -1;
-static int hf_icmpv6_opt_earo_opaque = -1;
-static int hf_icmpv6_opt_earo_flag = -1;
-static int hf_icmpv6_opt_earo_flag_i = -1;
-static int hf_icmpv6_opt_earo_flag_t = -1;
-static int hf_icmpv6_opt_earo_flag_r = -1;
-static int hf_icmpv6_opt_earo_tid = -1;
-static int hf_icmpv6_opt_aro_registration_lifetime = -1;
-static int hf_icmpv6_opt_aro_eui64 = -1;
-static int hf_icmpv6_opt_6co_context_length = -1;
-static int hf_icmpv6_opt_6co_flag = -1;
-static int hf_icmpv6_opt_6co_flag_c = -1;
-static int hf_icmpv6_opt_6co_flag_cid = -1;
-static int hf_icmpv6_opt_6co_flag_reserved = -1;
-static int hf_icmpv6_opt_6co_valid_lifetime = -1;
-static int hf_icmpv6_opt_6co_context_prefix  = -1;
-static int hf_icmpv6_opt_abro_version_low = -1;
-static int hf_icmpv6_opt_abro_version_high = -1;
-static int hf_icmpv6_opt_abro_valid_lifetime = -1;
-static int hf_icmpv6_opt_abro_6lbr_address = -1;
-static int hf_icmpv6_opt_6cio_unassigned1 = -1;
-static int hf_icmpv6_opt_6cio_flag_g = -1;
-static int hf_icmpv6_opt_6cio_unassigned2 = -1;
-
-static int hf_icmpv6_opt_captive_portal = -1;
-
-static int hf_icmpv6_opt_pref64_scaled_lifetime = -1;
-static int hf_icmpv6_opt_pref64_plc = -1;
-static int hf_icmpv6_opt_pref64_prefix = -1;
+static int hf_icmpv6_opt;
+static int hf_icmpv6_opt_type;
+static int hf_icmpv6_opt_length;
+static int hf_icmpv6_opt_linkaddr_mac;
+static int hf_icmpv6_opt_src_linkaddr_mac;
+static int hf_icmpv6_opt_target_linkaddr_mac;
+static int hf_icmpv6_opt_linkaddr;
+static int hf_icmpv6_opt_src_linkaddr;
+static int hf_icmpv6_opt_target_linkaddr;
+static int hf_icmpv6_opt_linkaddr_eui64;
+static int hf_icmpv6_opt_src_linkaddr_eui64;
+static int hf_icmpv6_opt_target_linkaddr_eui64;
+static int hf_icmpv6_opt_prefix_len;
+static int hf_icmpv6_opt_prefix_flag;
+static int hf_icmpv6_opt_prefix_flag_l;
+static int hf_icmpv6_opt_prefix_flag_a;
+static int hf_icmpv6_opt_prefix_flag_r;
+static int hf_icmpv6_opt_prefix_flag_reserved;
+static int hf_icmpv6_opt_prefix_valid_lifetime;
+static int hf_icmpv6_opt_prefix_preferred_lifetime;
+static int hf_icmpv6_opt_prefix;
+static int hf_icmpv6_opt_naack_option_code;
+static int hf_icmpv6_opt_naack_status;
+static int hf_icmpv6_opt_naack_supplied_ncoa;
+static int hf_icmpv6_opt_cga_pad_len;
+static int hf_icmpv6_opt_cga;
+static int hf_icmpv6_opt_cga_modifier;
+static int hf_icmpv6_opt_cga_subnet_prefix;
+static int hf_icmpv6_opt_cga_count;
+static int hf_icmpv6_opt_cga_subject_public_key_info;
+static int hf_icmpv6_opt_cga_ext_type;
+static int hf_icmpv6_opt_cga_ext_length;
+static int hf_icmpv6_opt_cga_ext_data;
+static int hf_icmpv6_opt_rsa_key_hash;
+static int hf_icmpv6_opt_digital_signature_padding;
+static int hf_icmpv6_opt_ps_key_hash;
+static int hf_icmpv6_opt_timestamp;
+static int hf_icmpv6_opt_nonce;
+static int hf_icmpv6_opt_certificate_padding;
+static int hf_icmpv6_opt_ipa_option_code;
+static int hf_icmpv6_opt_ipa_prefix_len;
+static int hf_icmpv6_opt_ipa_ipv6_address;
+static int hf_icmpv6_opt_nrpi_option_code;
+static int hf_icmpv6_opt_nrpi_prefix_len;
+static int hf_icmpv6_opt_nrpi_prefix;
+static int hf_icmpv6_opt_lla_option_code;
+static int hf_icmpv6_opt_lla_bytes;
+static int hf_icmpv6_opt_pvd_id_flags;
+static int hf_icmpv6_opt_pvd_id_flags_h;
+static int hf_icmpv6_opt_pvd_id_flags_l;
+static int hf_icmpv6_opt_pvd_id_flags_r;
+static int hf_icmpv6_opt_pvd_id_flags_reserved;
+static int hf_icmpv6_opt_pvd_id_delay;
+static int hf_icmpv6_opt_pvd_id_sequence_number;
+static int hf_icmpv6_opt_pvd_id_fqdn;
+static int hf_icmpv6_opt_map_dist;
+static int hf_icmpv6_opt_map_pref;
+static int hf_icmpv6_opt_map_flag;
+static int hf_icmpv6_opt_map_flag_r;
+static int hf_icmpv6_opt_map_flag_reserved;
+static int hf_icmpv6_opt_map_valid_lifetime;
+static int hf_icmpv6_opt_map_global_address;
+static int hf_icmpv6_opt_route_info_flag;
+static int hf_icmpv6_opt_route_info_flag_route_preference;
+static int hf_icmpv6_opt_route_info_flag_reserved;
+static int hf_icmpv6_opt_route_lifetime;
+static int hf_icmpv6_opt_name_type;
+static int hf_icmpv6_opt_name_x501;
+static int hf_icmpv6_opt_name_fqdn;
+static int hf_icmpv6_opt_cert_type;
+static int hf_icmpv6_x509if_Name;
+static int hf_icmpv6_x509af_Certificate;
+static int hf_icmpv6_opt_redirected_packet;
+static int hf_icmpv6_opt_mtu;
+static int hf_icmpv6_opt_nbma_shortcut_limit;
+static int hf_icmpv6_opt_advertisement_interval;
+static int hf_icmpv6_opt_home_agent_preference;
+static int hf_icmpv6_opt_home_agent_lifetime;
+static int hf_icmpv6_opt_ipv6_address;
+static int hf_icmpv6_opt_reserved;
+static int hf_icmpv6_opt_padding;
+static int hf_icmpv6_opt_rdnss_lifetime;
+static int hf_icmpv6_opt_rdnss;
+static int hf_icmpv6_opt_efo;
+static int hf_icmpv6_opt_efo_m;
+static int hf_icmpv6_opt_efo_o;
+static int hf_icmpv6_opt_efo_h;
+static int hf_icmpv6_opt_efo_prf;
+static int hf_icmpv6_opt_efo_p;
+static int hf_icmpv6_opt_efo_rsv;
+static int hf_icmpv6_opt_hkr_pad_length;
+static int hf_icmpv6_opt_hkr_at;
+static int hf_icmpv6_opt_hkr_reserved;
+static int hf_icmpv6_opt_hkr_encryption_public_key;
+static int hf_icmpv6_opt_hkr_padding;
+static int hf_icmpv6_opt_hkr_lifetime;
+static int hf_icmpv6_opt_hkr_encrypted_handover_key;
+static int hf_icmpv6_opt_hai_option_code;
+static int hf_icmpv6_opt_hai_length;
+static int hf_icmpv6_opt_hai_value;
+static int hf_icmpv6_opt_mn_option_code;
+static int hf_icmpv6_opt_mn_length;
+static int hf_icmpv6_opt_mn_value;
+static int hf_icmpv6_opt_dnssl_lifetime;
+static int hf_icmpv6_opt_dnssl;
+
+static int hf_icmpv6_opt_aro_status;
+static int hf_icmpv6_opt_earo_opaque;
+static int hf_icmpv6_opt_earo_flag;
+static int hf_icmpv6_opt_earo_flag_i;
+static int hf_icmpv6_opt_earo_flag_t;
+static int hf_icmpv6_opt_earo_flag_r;
+static int hf_icmpv6_opt_earo_tid;
+static int hf_icmpv6_opt_aro_registration_lifetime;
+static int hf_icmpv6_opt_aro_eui64;
+static int hf_icmpv6_opt_6co_context_length;
+static int hf_icmpv6_opt_6co_flag;
+static int hf_icmpv6_opt_6co_flag_c;
+static int hf_icmpv6_opt_6co_flag_cid;
+static int hf_icmpv6_opt_6co_flag_reserved;
+static int hf_icmpv6_opt_6co_valid_lifetime;
+static int hf_icmpv6_opt_6co_context_prefix;
+static int hf_icmpv6_opt_abro_version_low;
+static int hf_icmpv6_opt_abro_version_high;
+static int hf_icmpv6_opt_abro_valid_lifetime;
+static int hf_icmpv6_opt_abro_6lbr_address;
+static int hf_icmpv6_opt_6cio_unassigned1;
+static int hf_icmpv6_opt_6cio_flag_g;
+static int hf_icmpv6_opt_6cio_unassigned2;
+
+static int hf_icmpv6_opt_captive_portal;
+
+static int hf_icmpv6_opt_pref64_scaled_lifetime;
+static int hf_icmpv6_opt_pref64_plc;
+static int hf_icmpv6_opt_pref64_prefix;
 /* RFC 2710: Multicast Listener Discovery for IPv6 */
-static int hf_icmpv6_mld_mrd = -1;
-static int hf_icmpv6_mld_multicast_address = -1;
+static int hf_icmpv6_mld_mrd;
+static int hf_icmpv6_mld_multicast_address;
 
 /* RFC 2894: Router Renumbering for IPv6 */
-static int hf_icmpv6_rr_sequencenumber = -1;
-static int hf_icmpv6_rr_segmentnumber = -1;
-static int hf_icmpv6_rr_flag = -1;
-static int hf_icmpv6_rr_flag_t = -1;
-static int hf_icmpv6_rr_flag_r = -1;
-static int hf_icmpv6_rr_flag_a = -1;
-static int hf_icmpv6_rr_flag_s = -1;
-static int hf_icmpv6_rr_flag_p = -1;
-static int hf_icmpv6_rr_flag_rsv = -1;
-static int hf_icmpv6_rr_maxdelay = -1;
-static int hf_icmpv6_rr_pco_mp_part = -1;
-static int hf_icmpv6_rr_pco_mp_opcode = -1;
-static int hf_icmpv6_rr_pco_mp_oplength = -1;
-static int hf_icmpv6_rr_pco_mp_ordinal = -1;
-static int hf_icmpv6_rr_pco_mp_matchlen = -1;
-static int hf_icmpv6_rr_pco_mp_minlen = -1;
-static int hf_icmpv6_rr_pco_mp_maxlen = -1;
-static int hf_icmpv6_rr_pco_mp_matchprefix = -1;
-static int hf_icmpv6_rr_pco_up_part = -1;
-static int hf_icmpv6_rr_pco_up_uselen = -1;
-static int hf_icmpv6_rr_pco_up_keeplen = -1;
-static int hf_icmpv6_rr_pco_up_flagmask = -1;
-static int hf_icmpv6_rr_pco_up_flagmask_l = -1;
-static int hf_icmpv6_rr_pco_up_flagmask_a = -1;
-static int hf_icmpv6_rr_pco_up_flagmask_reserved = -1;
-static int hf_icmpv6_rr_pco_up_raflags = -1;
-static int hf_icmpv6_rr_pco_up_raflags_l = -1;
-static int hf_icmpv6_rr_pco_up_raflags_a = -1;
-static int hf_icmpv6_rr_pco_up_raflags_reserved = -1;
-static int hf_icmpv6_rr_pco_up_validlifetime = -1;
-static int hf_icmpv6_rr_pco_up_preferredlifetime = -1;
-static int hf_icmpv6_rr_pco_up_flag = -1;
-static int hf_icmpv6_rr_pco_up_flag_v = -1;
-static int hf_icmpv6_rr_pco_up_flag_p = -1;
-static int hf_icmpv6_rr_pco_up_flag_reserved = -1;
-static int hf_icmpv6_rr_pco_up_useprefix = -1;
-static int hf_icmpv6_rr_rm = -1;
-static int hf_icmpv6_rr_rm_flag = -1;
-static int hf_icmpv6_rr_rm_flag_b = -1;
-static int hf_icmpv6_rr_rm_flag_f = -1;
-static int hf_icmpv6_rr_rm_flag_reserved = -1;
-static int hf_icmpv6_rr_rm_ordinal = -1;
-static int hf_icmpv6_rr_rm_matchedlen = -1;
-static int hf_icmpv6_rr_rm_interfaceindex = -1;
-static int hf_icmpv6_rr_rm_matchedprefix = -1;
+static int hf_icmpv6_rr_sequencenumber;
+static int hf_icmpv6_rr_segmentnumber;
+static int hf_icmpv6_rr_flag;
+static int hf_icmpv6_rr_flag_t;
+static int hf_icmpv6_rr_flag_r;
+static int hf_icmpv6_rr_flag_a;
+static int hf_icmpv6_rr_flag_s;
+static int hf_icmpv6_rr_flag_p;
+static int hf_icmpv6_rr_flag_rsv;
+static int hf_icmpv6_rr_maxdelay;
+static int hf_icmpv6_rr_pco_mp_part;
+static int hf_icmpv6_rr_pco_mp_opcode;
+static int hf_icmpv6_rr_pco_mp_oplength;
+static int hf_icmpv6_rr_pco_mp_ordinal;
+static int hf_icmpv6_rr_pco_mp_matchlen;
+static int hf_icmpv6_rr_pco_mp_minlen;
+static int hf_icmpv6_rr_pco_mp_maxlen;
+static int hf_icmpv6_rr_pco_mp_matchprefix;
+static int hf_icmpv6_rr_pco_up_part;
+static int hf_icmpv6_rr_pco_up_uselen;
+static int hf_icmpv6_rr_pco_up_keeplen;
+static int hf_icmpv6_rr_pco_up_flagmask;
+static int hf_icmpv6_rr_pco_up_flagmask_l;
+static int hf_icmpv6_rr_pco_up_flagmask_a;
+static int hf_icmpv6_rr_pco_up_flagmask_reserved;
+static int hf_icmpv6_rr_pco_up_raflags;
+static int hf_icmpv6_rr_pco_up_raflags_l;
+static int hf_icmpv6_rr_pco_up_raflags_a;
+static int hf_icmpv6_rr_pco_up_raflags_reserved;
+static int hf_icmpv6_rr_pco_up_validlifetime;
+static int hf_icmpv6_rr_pco_up_preferredlifetime;
+static int hf_icmpv6_rr_pco_up_flag;
+static int hf_icmpv6_rr_pco_up_flag_v;
+static int hf_icmpv6_rr_pco_up_flag_p;
+static int hf_icmpv6_rr_pco_up_flag_reserved;
+static int hf_icmpv6_rr_pco_up_useprefix;
+static int hf_icmpv6_rr_rm;
+static int hf_icmpv6_rr_rm_flag;
+static int hf_icmpv6_rr_rm_flag_b;
+static int hf_icmpv6_rr_rm_flag_f;
+static int hf_icmpv6_rr_rm_flag_reserved;
+static int hf_icmpv6_rr_rm_ordinal;
+static int hf_icmpv6_rr_rm_matchedlen;
+static int hf_icmpv6_rr_rm_interfaceindex;
+static int hf_icmpv6_rr_rm_matchedprefix;
 
 /* RFC 3810: Multicast Listener Discovery Version 2 (MLDv2) for IPv6 */
-static int hf_icmpv6_mld_mrc = -1;
-static int hf_icmpv6_mld_flag = -1;
-static int hf_icmpv6_mld_flag_s = -1;
-static int hf_icmpv6_mld_flag_qrv = -1;
-static int hf_icmpv6_mld_flag_rsv = -1;
-static int hf_icmpv6_mld_qqi = -1;
-static int hf_icmpv6_mld_nb_sources = -1;
-static int hf_icmpv6_mld_source_address = -1;
-static int hf_icmpv6_mldr_nb_mcast_records = -1;
-static int hf_icmpv6_mldr_mar = -1;
-static int hf_icmpv6_mldr_mar_record_type = -1;
-static int hf_icmpv6_mldr_mar_aux_data_len = -1;
-static int hf_icmpv6_mldr_mar_nb_sources = -1;
-static int hf_icmpv6_mldr_mar_multicast_address = -1;
-static int hf_icmpv6_mldr_mar_source_address = -1;
-static int hf_icmpv6_mldr_mar_auxiliary_data = -1;
+static int hf_icmpv6_mld_mrc;
+static int hf_icmpv6_mld_flag;
+static int hf_icmpv6_mld_flag_s;
+static int hf_icmpv6_mld_flag_qrv;
+static int hf_icmpv6_mld_flag_rsv;
+static int hf_icmpv6_mld_qqi;
+static int hf_icmpv6_mld_nb_sources;
+static int hf_icmpv6_mld_source_address;
+static int hf_icmpv6_mldr_nb_mcast_records;
+static int hf_icmpv6_mldr_mar;
+static int hf_icmpv6_mldr_mar_record_type;
+static int hf_icmpv6_mldr_mar_aux_data_len;
+static int hf_icmpv6_mldr_mar_nb_sources;
+static int hf_icmpv6_mldr_mar_multicast_address;
+static int hf_icmpv6_mldr_mar_source_address;
+static int hf_icmpv6_mldr_mar_auxiliary_data;
 
 /* RFC3775/6275: Mobility Support in IPv6 */
-static int hf_icmpv6_mip6_identifier = -1;
-static int hf_icmpv6_mip6_home_agent_address = -1;
-static int hf_icmpv6_mip6_flag = -1;
-static int hf_icmpv6_mip6_flag_m = -1;
-static int hf_icmpv6_mip6_flag_o = -1;
-static int hf_icmpv6_mip6_flag_rsv = -1;
+static int hf_icmpv6_mip6_identifier;
+static int hf_icmpv6_mip6_home_agent_address;
+static int hf_icmpv6_mip6_flag;
+static int hf_icmpv6_mip6_flag_m;
+static int hf_icmpv6_mip6_flag_o;
+static int hf_icmpv6_mip6_flag_rsv;
 
 /* RFC3971: SEcure Neighbor Discovery (SEND) */
-static int hf_icmpv6_send_identifier = -1;
-static int hf_icmpv6_send_all_components = -1;
-static int hf_icmpv6_send_component = -1;
+static int hf_icmpv6_send_identifier;
+static int hf_icmpv6_send_all_components;
+static int hf_icmpv6_send_component;
 
 /* RFC 4068/5268/5568: Fast Handovers for Mobile IPv6 ( Mobile IPv6 Fast Handovers ) */
-static int hf_icmpv6_fmip6_subtype = -1;
-static int hf_icmpv6_fmip6_hi_flag = -1;
-static int hf_icmpv6_fmip6_hi_flag_s = -1;
-static int hf_icmpv6_fmip6_hi_flag_u = -1;
-static int hf_icmpv6_fmip6_hi_flag_reserved = -1;
-static int hf_icmpv6_fmip6_identifier = -1;
+static int hf_icmpv6_fmip6_subtype;
+static int hf_icmpv6_fmip6_hi_flag;
+static int hf_icmpv6_fmip6_hi_flag_s;
+static int hf_icmpv6_fmip6_hi_flag_u;
+static int hf_icmpv6_fmip6_hi_flag_reserved;
+static int hf_icmpv6_fmip6_identifier;
 
 /* RFC 4286: Multicast Router Discovery */
-static int hf_icmpv6_mcast_ra_query_interval = -1;
-static int hf_icmpv6_mcast_ra_robustness_variable = -1;
+static int hf_icmpv6_mcast_ra_query_interval;
+static int hf_icmpv6_mcast_ra_robustness_variable;
 
 /* RFC 4620: IPv6 Node Information Queries */
-static int hf_icmpv6_ni_qtype = -1;
-static int hf_icmpv6_ni_flag = -1;
-static int hf_icmpv6_ni_flag_g = -1;
-static int hf_icmpv6_ni_flag_s = -1;
-static int hf_icmpv6_ni_flag_l = -1;
-static int hf_icmpv6_ni_flag_c = -1;
-static int hf_icmpv6_ni_flag_a = -1;
-static int hf_icmpv6_ni_flag_t = -1;
-static int hf_icmpv6_ni_flag_rsv = -1;
-static int hf_icmpv6_ni_nonce = -1;
-static int hf_icmpv6_ni_query_subject_ipv6 = -1;
-static int hf_icmpv6_ni_query_subject_fqdn = -1;
-static int hf_icmpv6_ni_query_subject_ipv4 = -1;
-static int hf_icmpv6_ni_reply_node_ttl = -1;
-static int hf_icmpv6_ni_reply_node_name = -1;
-static int hf_icmpv6_ni_reply_node_address = -1;
-static int hf_icmpv6_ni_reply_ipv4_address = -1;
+static int hf_icmpv6_ni_qtype;
+static int hf_icmpv6_ni_flag;
+static int hf_icmpv6_ni_flag_g;
+static int hf_icmpv6_ni_flag_s;
+static int hf_icmpv6_ni_flag_l;
+static int hf_icmpv6_ni_flag_c;
+static int hf_icmpv6_ni_flag_a;
+static int hf_icmpv6_ni_flag_t;
+static int hf_icmpv6_ni_flag_rsv;
+static int hf_icmpv6_ni_nonce;
+static int hf_icmpv6_ni_query_subject_ipv6;
+static int hf_icmpv6_ni_query_subject_fqdn;
+static int hf_icmpv6_ni_query_subject_ipv4;
+static int hf_icmpv6_ni_reply_node_ttl;
+static int hf_icmpv6_ni_reply_node_name;
+static int hf_icmpv6_ni_reply_node_address;
+static int hf_icmpv6_ni_reply_ipv4_address;
 
 /* RFC 4884: Extended ICMP */
-static int hf_icmpv6_length = -1;
+static int hf_icmpv6_length;
 
 /* RPL: RFC 6550/6997 : Routing and Discovery of P2P Routes in Low-Power and Lossy Networks. */
-static int hf_icmpv6_rpl_dis_flag = -1;
-static int hf_icmpv6_rpl_dio_instance = -1;
-static int hf_icmpv6_rpl_dio_version = -1;
-static int hf_icmpv6_rpl_dio_rank = -1;
-static int hf_icmpv6_rpl_dio_flag = -1;
-static int hf_icmpv6_rpl_dio_flag_g = -1;
-static int hf_icmpv6_rpl_dio_flag_0 = -1;
-static int hf_icmpv6_rpl_dio_flag_mop = -1;
-static int hf_icmpv6_rpl_dio_flag_prf = -1;
-static int hf_icmpv6_rpl_dio_dtsn = -1;
-static int hf_icmpv6_rpl_dio_dagid = -1;
-static int hf_icmpv6_rpl_dao_instance = -1;
-static int hf_icmpv6_rpl_dao_flag = -1;
-static int hf_icmpv6_rpl_dao_flag_k = -1;
-static int hf_icmpv6_rpl_dao_flag_d = -1;
-static int hf_icmpv6_rpl_dao_flag_rsv = -1;
-static int hf_icmpv6_rpl_dao_sequence = -1;
-static int hf_icmpv6_rpl_dao_dodagid = -1;
-static int hf_icmpv6_rpl_daoack_instance = -1;
-static int hf_icmpv6_rpl_daoack_flag = -1;
-static int hf_icmpv6_rpl_daoack_flag_d = -1;
-static int hf_icmpv6_rpl_daoack_flag_rsv = -1;
-static int hf_icmpv6_rpl_daoack_sequence = -1;
-static int hf_icmpv6_rpl_daoack_status = -1;
-static int hf_icmpv6_rpl_daoack_dodagid = -1;
-static int hf_icmpv6_rpl_cc_instance = -1;
-static int hf_icmpv6_rpl_cc_flag = -1;
-static int hf_icmpv6_rpl_cc_flag_r = -1;
-static int hf_icmpv6_rpl_cc_flag_rsv = -1;
-static int hf_icmpv6_rpl_cc_nonce = -1;
-static int hf_icmpv6_rpl_cc_dodagid = -1;
-static int hf_icmpv6_rpl_cc_destination_counter = -1;
-static int hf_icmpv6_rpl_secure_flag = -1;
-static int hf_icmpv6_rpl_secure_flag_t = -1;
-static int hf_icmpv6_rpl_secure_flag_rsv = -1;
-static int hf_icmpv6_rpl_secure_algorithm = -1;
-static int hf_icmpv6_rpl_secure_kim = -1;
-static int hf_icmpv6_rpl_secure_lvl = -1;
-static int hf_icmpv6_rpl_secure_rsv = -1;
-static int hf_icmpv6_rpl_secure_counter = -1;
-static int hf_icmpv6_rpl_secure_key_source = -1;
-static int hf_icmpv6_rpl_secure_key_index = -1;
-static int hf_icmpv6_rpl_opt = -1;
-static int hf_icmpv6_rpl_opt_type = -1;
-static int hf_icmpv6_rpl_opt_length = -1;
-static int hf_icmpv6_rpl_opt_reserved = -1;
-static int hf_icmpv6_rpl_opt_padn = -1;
-static int hf_icmpv6_rpl_opt_metric_type = -1;
-static int hf_icmpv6_rpl_opt_metric_flags = -1;
-static int hf_icmpv6_rpl_opt_metric_reserved = -1;
-static int hf_icmpv6_rpl_opt_metric_flag_p = -1;
-static int hf_icmpv6_rpl_opt_metric_flag_c = -1;
-static int hf_icmpv6_rpl_opt_metric_flag_o = -1;
-static int hf_icmpv6_rpl_opt_metric_flag_r = -1;
-static int hf_icmpv6_rpl_opt_metric_a = -1;
-static int hf_icmpv6_rpl_opt_metric_prec = -1;
-static int hf_icmpv6_rpl_opt_metric_len = -1;
-static int hf_icmpv6_rpl_opt_metric_nsa_object = -1;
-static int hf_icmpv6_rpl_opt_metric_nsa_object_reserved = -1;
-static int hf_icmpv6_rpl_opt_metric_nsa_object_flags = -1;
-static int hf_icmpv6_rpl_opt_metric_nsa_object_flag_a = -1;
-static int hf_icmpv6_rpl_opt_metric_nsa_object_flag_o = -1;
-static int hf_icmpv6_rpl_opt_metric_nsa_object_opttlv_object = -1;
-static int hf_icmpv6_rpl_opt_metric_nsa_object_opttlv_object_type = -1;
-static int hf_icmpv6_rpl_opt_metric_nsa_object_opttlv_object_length = -1;
-static int hf_icmpv6_rpl_opt_metric_nsa_object_opttlv_object_data = -1;
-static int hf_icmpv6_rpl_opt_metric_ne_object = -1;
-static int hf_icmpv6_rpl_opt_metric_ne_object_flags = -1;
-static int hf_icmpv6_rpl_opt_metric_ne_object_flag_i = -1;
-static int hf_icmpv6_rpl_opt_metric_ne_object_type = -1;
-static int hf_icmpv6_rpl_opt_metric_ne_object_flag_e = -1;
-static int hf_icmpv6_rpl_opt_metric_ne_object_energy = -1;
-static int hf_icmpv6_rpl_opt_metric_hp_object = -1;
-static int hf_icmpv6_rpl_opt_metric_hp_object_reserved = -1;
-static int hf_icmpv6_rpl_opt_metric_hp_object_flags = -1;
-static int hf_icmpv6_rpl_opt_metric_hp_object_hp = -1;
-static int hf_icmpv6_rpl_opt_metric_lt_object_lt = -1;
-static int hf_icmpv6_rpl_opt_metric_ll_object_ll = -1;
-static int hf_icmpv6_rpl_opt_metric_lql_object = -1;
-static int hf_icmpv6_rpl_opt_metric_lql_object_res = -1;
-static int hf_icmpv6_rpl_opt_metric_lql_object_val = -1;
-static int hf_icmpv6_rpl_opt_metric_lql_object_counter = -1;
-static int hf_icmpv6_rpl_opt_metric_etx_object_etx = -1;
-static int hf_icmpv6_rpl_opt_metric_lc_object = -1;
-static int hf_icmpv6_rpl_opt_metric_lc_object_res = -1;
-static int hf_icmpv6_rpl_opt_metric_lc_object_lc = -1;
-static int hf_icmpv6_rpl_opt_metric_lc_object_counter = -1;
-static int hf_icmpv6_rpl_opt_metric_lc_object_reserved = -1;
-static int hf_icmpv6_rpl_opt_metric_lc_object_flag_i = -1;
-static int hf_icmpv6_rpl_opt_route_prefix_length = -1;
-static int hf_icmpv6_rpl_opt_route_flag = -1;
-static int hf_icmpv6_rpl_opt_route_pref = -1;
-static int hf_icmpv6_rpl_opt_route_reserved = -1;
-static int hf_icmpv6_rpl_opt_route_lifetime = -1;
-static int hf_icmpv6_rpl_opt_route_prefix = -1;
-static int hf_icmpv6_rpl_opt_config_flag = -1;
-static int hf_icmpv6_rpl_opt_config_reserved = -1;
-static int hf_icmpv6_rpl_opt_config_auth = -1;
-static int hf_icmpv6_rpl_opt_config_pcs = -1;
-static int hf_icmpv6_rpl_opt_config_doublings = -1;
-static int hf_icmpv6_rpl_opt_config_min_interval = -1;
-static int hf_icmpv6_rpl_opt_config_redundancy = -1;
-static int hf_icmpv6_rpl_opt_config_rank_incr = -1;
-static int hf_icmpv6_rpl_opt_config_hop_rank_inc = -1;
-static int hf_icmpv6_rpl_opt_config_ocp = -1;
-static int hf_icmpv6_rpl_opt_config_rsv = -1;
-static int hf_icmpv6_rpl_opt_config_def_lifetime = -1;
-static int hf_icmpv6_rpl_opt_config_lifetime_unit = -1;
-static int hf_icmpv6_rpl_opt_target_flag = -1;
-static int hf_icmpv6_rpl_opt_target_prefix_length = -1;
-static int hf_icmpv6_rpl_opt_target_prefix = -1;
-static int hf_icmpv6_rpl_opt_transit_flag = -1;
-static int hf_icmpv6_rpl_opt_transit_flag_e = -1;
-static int hf_icmpv6_rpl_opt_transit_flag_rsv = -1;
-static int hf_icmpv6_rpl_opt_transit_pathseq = -1;
-static int hf_icmpv6_rpl_opt_transit_pathctl = -1;
-static int hf_icmpv6_rpl_opt_transit_pathctl_pc1 = -1;
-static int hf_icmpv6_rpl_opt_transit_pathctl_pc2 = -1;
-static int hf_icmpv6_rpl_opt_transit_pathctl_pc3 = -1;
-static int hf_icmpv6_rpl_opt_transit_pathctl_pc4 = -1;
-static int hf_icmpv6_rpl_opt_transit_pathlifetime = -1;
-static int hf_icmpv6_rpl_opt_transit_parent = -1;
-static int hf_icmpv6_rpl_opt_solicited_instance = -1;
-static int hf_icmpv6_rpl_opt_solicited_flag = -1;
-static int hf_icmpv6_rpl_opt_solicited_flag_v = -1;
-static int hf_icmpv6_rpl_opt_solicited_flag_i = -1;
-static int hf_icmpv6_rpl_opt_solicited_flag_d = -1;
-static int hf_icmpv6_rpl_opt_solicited_flag_rsv = -1;
-static int hf_icmpv6_rpl_opt_solicited_dodagid = -1;
-static int hf_icmpv6_rpl_opt_solicited_version = -1;
-static int hf_icmpv6_rpl_opt_prefix = -1;
-static int hf_icmpv6_rpl_opt_prefix_flag = -1;
-static int hf_icmpv6_rpl_opt_prefix_flag_l = -1;
-static int hf_icmpv6_rpl_opt_prefix_flag_a = -1;
-static int hf_icmpv6_rpl_opt_prefix_flag_r = -1;
-static int hf_icmpv6_rpl_opt_prefix_flag_rsv = -1;
-static int hf_icmpv6_rpl_opt_prefix_vlifetime = -1;
-static int hf_icmpv6_rpl_opt_prefix_plifetime = -1;
-static int hf_icmpv6_rpl_opt_prefix_length = -1;
-static int hf_icmpv6_rpl_opt_targetdesc = -1;
-static int hf_icmpv6_rpl_opt_route_discovery_flag = -1;
-static int hf_icmpv6_rpl_opt_route_discovery_reply = -1;
-static int hf_icmpv6_rpl_opt_route_discovery_hop_by_hop = -1;
-static int hf_icmpv6_rpl_opt_route_discovery_num_of_routes = -1;
-static int hf_icmpv6_rpl_opt_route_discovery_compr = -1;
-static int hf_icmpv6_rpl_opt_route_discovery_lifetime = -1;
-static int hf_icmpv6_rpl_opt_route_discovery_nh = -1;
-static int hf_icmpv6_rpl_opt_route_discovery_maxrank = -1;
-static int hf_icmpv6_rpl_opt_route_discovery_target_addr = -1;
-static int hf_icmpv6_rpl_opt_route_discovery_addr_vec = -1;
-static int hf_icmpv6_rpl_opt_route_discovery_addr_vec_addr = -1;
-static int hf_icmpv6_rpl_p2p_dro_instance = -1;
-static int hf_icmpv6_rpl_p2p_dro_version = -1;
-static int hf_icmpv6_rpl_p2p_dro_flag = -1;
-static int hf_icmpv6_rpl_p2p_dro_flag_stop = -1;
-static int hf_icmpv6_rpl_p2p_dro_flag_ack = -1;
-static int hf_icmpv6_rpl_p2p_dro_flag_seq = -1;
-static int hf_icmpv6_rpl_p2p_dro_flag_reserved = -1;
-static int hf_icmpv6_rpl_p2p_dro_dagid = -1;
-static int hf_icmpv6_rpl_p2p_droack_flag = -1;
-static int hf_icmpv6_rpl_p2p_droack_flag_seq = -1;
-static int hf_icmpv6_rpl_p2p_droack_flag_reserved = -1;
+static int hf_icmpv6_rpl_dis_flag;
+static int hf_icmpv6_rpl_dio_instance;
+static int hf_icmpv6_rpl_dio_version;
+static int hf_icmpv6_rpl_dio_rank;
+static int hf_icmpv6_rpl_dio_flag;
+static int hf_icmpv6_rpl_dio_flag_g;
+static int hf_icmpv6_rpl_dio_flag_0;
+static int hf_icmpv6_rpl_dio_flag_mop;
+static int hf_icmpv6_rpl_dio_flag_prf;
+static int hf_icmpv6_rpl_dio_dtsn;
+static int hf_icmpv6_rpl_dio_dagid;
+static int hf_icmpv6_rpl_dao_instance;
+static int hf_icmpv6_rpl_dao_flag;
+static int hf_icmpv6_rpl_dao_flag_k;
+static int hf_icmpv6_rpl_dao_flag_d;
+static int hf_icmpv6_rpl_dao_flag_rsv;
+static int hf_icmpv6_rpl_dao_sequence;
+static int hf_icmpv6_rpl_dao_dodagid;
+static int hf_icmpv6_rpl_daoack_instance;
+static int hf_icmpv6_rpl_daoack_flag;
+static int hf_icmpv6_rpl_daoack_flag_d;
+static int hf_icmpv6_rpl_daoack_flag_rsv;
+static int hf_icmpv6_rpl_daoack_sequence;
+static int hf_icmpv6_rpl_daoack_status;
+static int hf_icmpv6_rpl_daoack_dodagid;
+static int hf_icmpv6_rpl_cc_instance;
+static int hf_icmpv6_rpl_cc_flag;
+static int hf_icmpv6_rpl_cc_flag_r;
+static int hf_icmpv6_rpl_cc_flag_rsv;
+static int hf_icmpv6_rpl_cc_nonce;
+static int hf_icmpv6_rpl_cc_dodagid;
+static int hf_icmpv6_rpl_cc_destination_counter;
+static int hf_icmpv6_rpl_secure_flag;
+static int hf_icmpv6_rpl_secure_flag_t;
+static int hf_icmpv6_rpl_secure_flag_rsv;
+static int hf_icmpv6_rpl_secure_algorithm;
+static int hf_icmpv6_rpl_secure_kim;
+static int hf_icmpv6_rpl_secure_lvl;
+static int hf_icmpv6_rpl_secure_rsv;
+static int hf_icmpv6_rpl_secure_counter;
+static int hf_icmpv6_rpl_secure_key_source;
+static int hf_icmpv6_rpl_secure_key_index;
+static int hf_icmpv6_rpl_opt;
+static int hf_icmpv6_rpl_opt_type;
+static int hf_icmpv6_rpl_opt_length;
+static int hf_icmpv6_rpl_opt_reserved;
+static int hf_icmpv6_rpl_opt_padn;
+static int hf_icmpv6_rpl_opt_metric_type;
+static int hf_icmpv6_rpl_opt_metric_flags;
+static int hf_icmpv6_rpl_opt_metric_reserved;
+static int hf_icmpv6_rpl_opt_metric_flag_p;
+static int hf_icmpv6_rpl_opt_metric_flag_c;
+static int hf_icmpv6_rpl_opt_metric_flag_o;
+static int hf_icmpv6_rpl_opt_metric_flag_r;
+static int hf_icmpv6_rpl_opt_metric_a;
+static int hf_icmpv6_rpl_opt_metric_prec;
+static int hf_icmpv6_rpl_opt_metric_len;
+static int hf_icmpv6_rpl_opt_metric_nsa_object;
+static int hf_icmpv6_rpl_opt_metric_nsa_object_reserved;
+static int hf_icmpv6_rpl_opt_metric_nsa_object_flags;
+static int hf_icmpv6_rpl_opt_metric_nsa_object_flag_a;
+static int hf_icmpv6_rpl_opt_metric_nsa_object_flag_o;
+static int hf_icmpv6_rpl_opt_metric_nsa_object_opttlv_object;
+static int hf_icmpv6_rpl_opt_metric_nsa_object_opttlv_object_type;
+static int hf_icmpv6_rpl_opt_metric_nsa_object_opttlv_object_length;
+static int hf_icmpv6_rpl_opt_metric_nsa_object_opttlv_object_data;
+static int hf_icmpv6_rpl_opt_metric_ne_object;
+static int hf_icmpv6_rpl_opt_metric_ne_object_flags;
+static int hf_icmpv6_rpl_opt_metric_ne_object_flag_i;
+static int hf_icmpv6_rpl_opt_metric_ne_object_type;
+static int hf_icmpv6_rpl_opt_metric_ne_object_flag_e;
+static int hf_icmpv6_rpl_opt_metric_ne_object_energy;
+static int hf_icmpv6_rpl_opt_metric_hp_object;
+static int hf_icmpv6_rpl_opt_metric_hp_object_reserved;
+static int hf_icmpv6_rpl_opt_metric_hp_object_flags;
+static int hf_icmpv6_rpl_opt_metric_hp_object_hp;
+static int hf_icmpv6_rpl_opt_metric_lt_object_lt;
+static int hf_icmpv6_rpl_opt_metric_ll_object_ll;
+static int hf_icmpv6_rpl_opt_metric_lql_object;
+static int hf_icmpv6_rpl_opt_metric_lql_object_res;
+static int hf_icmpv6_rpl_opt_metric_lql_object_val;
+static int hf_icmpv6_rpl_opt_metric_lql_object_counter;
+static int hf_icmpv6_rpl_opt_metric_etx_object_etx;
+static int hf_icmpv6_rpl_opt_metric_lc_object;
+static int hf_icmpv6_rpl_opt_metric_lc_object_res;
+static int hf_icmpv6_rpl_opt_metric_lc_object_lc;
+static int hf_icmpv6_rpl_opt_metric_lc_object_counter;
+static int hf_icmpv6_rpl_opt_metric_lc_object_reserved;
+static int hf_icmpv6_rpl_opt_metric_lc_object_flag_i;
+static int hf_icmpv6_rpl_opt_route_prefix_length;
+static int hf_icmpv6_rpl_opt_route_flag;
+static int hf_icmpv6_rpl_opt_route_pref;
+static int hf_icmpv6_rpl_opt_route_reserved;
+static int hf_icmpv6_rpl_opt_route_lifetime;
+static int hf_icmpv6_rpl_opt_route_prefix;
+static int hf_icmpv6_rpl_opt_config_flag;
+static int hf_icmpv6_rpl_opt_config_reserved;
+static int hf_icmpv6_rpl_opt_config_auth;
+static int hf_icmpv6_rpl_opt_config_pcs;
+static int hf_icmpv6_rpl_opt_config_doublings;
+static int hf_icmpv6_rpl_opt_config_min_interval;
+static int hf_icmpv6_rpl_opt_config_redundancy;
+static int hf_icmpv6_rpl_opt_config_rank_incr;
+static int hf_icmpv6_rpl_opt_config_hop_rank_inc;
+static int hf_icmpv6_rpl_opt_config_ocp;
+static int hf_icmpv6_rpl_opt_config_rsv;
+static int hf_icmpv6_rpl_opt_config_def_lifetime;
+static int hf_icmpv6_rpl_opt_config_lifetime_unit;
+static int hf_icmpv6_rpl_opt_target_flag;
+static int hf_icmpv6_rpl_opt_target_prefix_length;
+static int hf_icmpv6_rpl_opt_target_prefix;
+static int hf_icmpv6_rpl_opt_transit_flag;
+static int hf_icmpv6_rpl_opt_transit_flag_e;
+static int hf_icmpv6_rpl_opt_transit_flag_rsv;
+static int hf_icmpv6_rpl_opt_transit_pathseq;
+static int hf_icmpv6_rpl_opt_transit_pathctl;
+static int hf_icmpv6_rpl_opt_transit_pathctl_pc1;
+static int hf_icmpv6_rpl_opt_transit_pathctl_pc2;
+static int hf_icmpv6_rpl_opt_transit_pathctl_pc3;
+static int hf_icmpv6_rpl_opt_transit_pathctl_pc4;
+static int hf_icmpv6_rpl_opt_transit_pathlifetime;
+static int hf_icmpv6_rpl_opt_transit_parent;
+static int hf_icmpv6_rpl_opt_solicited_instance;
+static int hf_icmpv6_rpl_opt_solicited_flag;
+static int hf_icmpv6_rpl_opt_solicited_flag_v;
+static int hf_icmpv6_rpl_opt_solicited_flag_i;
+static int hf_icmpv6_rpl_opt_solicited_flag_d;
+static int hf_icmpv6_rpl_opt_solicited_flag_rsv;
+static int hf_icmpv6_rpl_opt_solicited_dodagid;
+static int hf_icmpv6_rpl_opt_solicited_version;
+static int hf_icmpv6_rpl_opt_prefix;
+static int hf_icmpv6_rpl_opt_prefix_flag;
+static int hf_icmpv6_rpl_opt_prefix_flag_l;
+static int hf_icmpv6_rpl_opt_prefix_flag_a;
+static int hf_icmpv6_rpl_opt_prefix_flag_r;
+static int hf_icmpv6_rpl_opt_prefix_flag_rsv;
+static int hf_icmpv6_rpl_opt_prefix_vlifetime;
+static int hf_icmpv6_rpl_opt_prefix_plifetime;
+static int hf_icmpv6_rpl_opt_prefix_length;
+static int hf_icmpv6_rpl_opt_targetdesc;
+static int hf_icmpv6_rpl_opt_route_discovery_flag;
+static int hf_icmpv6_rpl_opt_route_discovery_reply;
+static int hf_icmpv6_rpl_opt_route_discovery_hop_by_hop;
+static int hf_icmpv6_rpl_opt_route_discovery_num_of_routes;
+static int hf_icmpv6_rpl_opt_route_discovery_compr;
+static int hf_icmpv6_rpl_opt_route_discovery_lifetime;
+static int hf_icmpv6_rpl_opt_route_discovery_nh;
+static int hf_icmpv6_rpl_opt_route_discovery_maxrank;
+static int hf_icmpv6_rpl_opt_route_discovery_target_addr;
+static int hf_icmpv6_rpl_opt_route_discovery_addr_vec;
+static int hf_icmpv6_rpl_opt_route_discovery_addr_vec_addr;
+static int hf_icmpv6_rpl_p2p_dro_instance;
+static int hf_icmpv6_rpl_p2p_dro_version;
+static int hf_icmpv6_rpl_p2p_dro_flag;
+static int hf_icmpv6_rpl_p2p_dro_flag_stop;
+static int hf_icmpv6_rpl_p2p_dro_flag_ack;
+static int hf_icmpv6_rpl_p2p_dro_flag_seq;
+static int hf_icmpv6_rpl_p2p_dro_flag_reserved;
+static int hf_icmpv6_rpl_p2p_dro_dagid;
+static int hf_icmpv6_rpl_p2p_droack_flag;
+static int hf_icmpv6_rpl_p2p_droack_flag_seq;
+static int hf_icmpv6_rpl_p2p_droack_flag_reserved;
 
 /* RFC6743 Locator Update (156) */
-static int hf_icmpv6_ilnp_nb_locs = -1;
-static int hf_icmpv6_ilnp_locator = -1;
-static int hf_icmpv6_ilnp_preference = -1;
-static int hf_icmpv6_ilnp_lifetime = -1;
+static int hf_icmpv6_ilnp_nb_locs;
+static int hf_icmpv6_ilnp_locator;
+static int hf_icmpv6_ilnp_preference;
+static int hf_icmpv6_ilnp_lifetime;
 
-static int hf_icmpv6_da_status = -1;
-static int hf_icmpv6_da_rsv = -1;
-static int hf_icmpv6_da_lifetime = -1;
-static int hf_icmpv6_da_eui64 = -1;
-static int hf_icmpv6_da_raddr = -1;
+static int hf_icmpv6_da_status;
+static int hf_icmpv6_da_rsv;
+static int hf_icmpv6_da_lifetime;
+static int hf_icmpv6_da_eui64;
+static int hf_icmpv6_da_raddr;
 
 static heur_dissector_list_t icmpv6_heur_subdissector_list;
 static int icmpv6_tap = -1;
 
 /* RFC 7731 MPL (159) */
-static int hf_icmpv6_mpl_seed_info_min_sequence = -1;
-static int hf_icmpv6_mpl_seed_info_bm_len = -1;
-static int hf_icmpv6_mpl_seed_info_s = -1;
-static int hf_icmpv6_mpl_seed_info_seed_id = -1;
-static int hf_icmpv6_mpl_seed_info_sequence = -1;
+static int hf_icmpv6_mpl_seed_info_min_sequence;
+static int hf_icmpv6_mpl_seed_info_bm_len;
+static int hf_icmpv6_mpl_seed_info_s;
+static int hf_icmpv6_mpl_seed_info_seed_id;
+static int hf_icmpv6_mpl_seed_info_sequence;
 
 /* Extended Echo - Probe  (RFC8335)*/
-static int hf_icmpv6_ext_echo_seq_num = -1;
-static int hf_icmpv6_ext_echo_req_reserved = -1;
-static int hf_icmpv6_ext_echo_req_local = -1;
-static int hf_icmpv6_ext_echo_rsp_state = -1;
-static int hf_icmpv6_ext_echo_rsp_reserved = -1;
-static int hf_icmpv6_ext_echo_rsp_active = -1;
-static int hf_icmpv6_ext_echo_rsp_ipv4 = -1;
-static int hf_icmpv6_ext_echo_rsp_ipv6 = -1;
+static int hf_icmpv6_ext_echo_seq_num;
+static int hf_icmpv6_ext_echo_req_reserved;
+static int hf_icmpv6_ext_echo_req_local;
+static int hf_icmpv6_ext_echo_rsp_state;
+static int hf_icmpv6_ext_echo_rsp_reserved;
+static int hf_icmpv6_ext_echo_rsp_active;
+static int hf_icmpv6_ext_echo_rsp_ipv4;
+static int hf_icmpv6_ext_echo_rsp_ipv6;
 
 /* Conversation related data */
-static int hf_icmpv6_resp_in = -1;
-static int hf_icmpv6_resp_to = -1;
-static int hf_icmpv6_no_resp = -1;
-static int hf_icmpv6_resptime = -1;
+static int hf_icmpv6_resp_in;
+static int hf_icmpv6_resp_to;
+static int hf_icmpv6_no_resp;
+static int hf_icmpv6_resptime;
 
 typedef struct _icmpv6_conv_info_t {
     wmem_tree_t *unmatched_pdus;
@@ -587,73 +587,73 @@ typedef struct _icmpv6_conv_info_t {
 static icmp_transaction_t *transaction_start(packet_info *pinfo, proto_tree *tree, guint32 *key);
 static icmp_transaction_t *transaction_end(packet_info *pinfo, proto_tree *tree, guint32 *key);
 
-static gint ett_icmpv6 = -1;
-static gint ett_icmpv6_opt = -1;
-static gint ett_icmpv6_mar = -1;
-static gint ett_icmpv6_flag_prefix = -1;
-static gint ett_icmpv6_flag_map = -1;
-static gint ett_icmpv6_flag_pvd_id = -1;
-static gint ett_icmpv6_flag_route_info = -1;
-static gint ett_icmpv6_flag_6lowpan = -1;
-static gint ett_icmpv6_flag_efo = -1;
-static gint ett_icmpv6_flag_earo = -1;
-static gint ett_icmpv6_rpl_opt = -1;
-static gint ett_icmpv6_rpl_metric_type = -1;
-static gint ett_icmpv6_rpl_metric_flags = -1;
-static gint ett_icmpv6_rpl_metric_nsa_object = -1;
-static gint ett_icmpv6_rpl_metric_nsa_object_tlv_type = -1;
-static gint ett_icmpv6_rpl_metric_ne_object = -1;
-static gint ett_icmpv6_rpl_metric_hp_object = -1;
-static gint ett_icmpv6_rpl_metric_lql_object = -1;
-static gint ett_icmpv6_rpl_metric_lc_object = -1;
-static gint ett_icmpv6_rpl_flag_routing = -1;
-static gint ett_icmpv6_rpl_flag_config = -1;
-static gint ett_icmpv6_rpl_flag_transit = -1;
-static gint ett_icmpv6_rpl_flag_solicited = -1;
-static gint ett_icmpv6_rpl_flag_prefix = -1;
-static gint ett_icmpv6_rpl_route_discovery_flag = -1;
-static gint ett_icmpv6_rpl_route_discovery_addr_vec = -1;
-static gint ett_icmpv6_rpl_transit_pathctl = -1;
-static gint ett_icmpv6_rpl_p2p_dro_flag = -1;
-static gint ett_icmpv6_rpl_p2p_droack_flag = -1;
-static gint ett_icmpv6_flag_ni = -1;
-static gint ett_icmpv6_flag_rr = -1;
-static gint ett_icmpv6_rr_mp = -1;
-static gint ett_icmpv6_rr_up = -1;
-static gint ett_icmpv6_rr_up_flag_mask = -1;
-static gint ett_icmpv6_rr_up_flag_ra = -1;
-static gint ett_icmpv6_rr_up_flag = -1;
-static gint ett_icmpv6_rr_rm = -1;
-static gint ett_icmpv6_rr_rm_flag = -1;
-static gint ett_icmpv6_flag_mld = -1;
-static gint ett_icmpv6_flag_ra = -1;
-static gint ett_icmpv6_flag_na = -1;
-static gint ett_icmpv6_flag_mip6 = -1;
-static gint ett_icmpv6_flag_fmip6 = -1;
-static gint ett_icmpv6_flag_secure = -1;
-static gint ett_icmpv6_flag_rpl_dio = -1;
-static gint ett_icmpv6_flag_rpl_dao = -1;
-static gint ett_icmpv6_flag_rpl_daoack = -1;
-static gint ett_icmpv6_flag_rpl_cc = -1;
-static gint ett_icmpv6_opt_name = -1;
-static gint ett_icmpv6_cga_param_name = -1;
-static gint ett_icmpv6_mpl_seed_info = -1;
-static gint ett_icmpv6_mpl_seed_info_bm = -1;
-
-static expert_field ei_icmpv6_invalid_option_length = EI_INIT;
-static expert_field ei_icmpv6_undecoded_option = EI_INIT;
-static expert_field ei_icmpv6_unknown_data = EI_INIT;
-static expert_field ei_icmpv6_undecoded_rpl_option = EI_INIT;
-static expert_field ei_icmpv6_undecoded_type = EI_INIT;
-static expert_field ei_icmpv6_rr_pco_mp_matchlen = EI_INIT;
-static expert_field ei_icmpv6_rr_pco_mp_matchedlen = EI_INIT;
-static expert_field ei_icmpv6_checksum = EI_INIT;
-static expert_field ei_icmpv6_resp_not_found = EI_INIT;
-static expert_field ei_icmpv6_rpl_unknown_metric = EI_INIT;
-static expert_field ei_icmpv6_rpl_p2p_hop_by_hop = EI_INIT;
-static expert_field ei_icmpv6_rpl_p2p_num_of_routes = EI_INIT;
-static expert_field ei_icmpv6_rpl_p2p_dro_rdo_zero = EI_INIT;
-static expert_field ei_icmpv6_rpl_p2p_dro_zero = EI_INIT;
+static gint ett_icmpv6;
+static gint ett_icmpv6_opt;
+static gint ett_icmpv6_mar;
+static gint ett_icmpv6_flag_prefix;
+static gint ett_icmpv6_flag_map;
+static gint ett_icmpv6_flag_pvd_id;
+static gint ett_icmpv6_flag_route_info;
+static gint ett_icmpv6_flag_6lowpan;
+static gint ett_icmpv6_flag_efo;
+static gint ett_icmpv6_flag_earo;
+static gint ett_icmpv6_rpl_opt;
+static gint ett_icmpv6_rpl_metric_type;
+static gint ett_icmpv6_rpl_metric_flags;
+static gint ett_icmpv6_rpl_metric_nsa_object;
+static gint ett_icmpv6_rpl_metric_nsa_object_tlv_type;
+static gint ett_icmpv6_rpl_metric_ne_object;
+static gint ett_icmpv6_rpl_metric_hp_object;
+static gint ett_icmpv6_rpl_metric_lql_object;
+static gint ett_icmpv6_rpl_metric_lc_object;
+static gint ett_icmpv6_rpl_flag_routing;
+static gint ett_icmpv6_rpl_flag_config;
+static gint ett_icmpv6_rpl_flag_transit;
+static gint ett_icmpv6_rpl_flag_solicited;
+static gint ett_icmpv6_rpl_flag_prefix;
+static gint ett_icmpv6_rpl_route_discovery_flag;
+static gint ett_icmpv6_rpl_route_discovery_addr_vec;
+static gint ett_icmpv6_rpl_transit_pathctl;
+static gint ett_icmpv6_rpl_p2p_dro_flag;
+static gint ett_icmpv6_rpl_p2p_droack_flag;
+static gint ett_icmpv6_flag_ni;
+static gint ett_icmpv6_flag_rr;
+static gint ett_icmpv6_rr_mp;
+static gint ett_icmpv6_rr_up;
+static gint ett_icmpv6_rr_up_flag_mask;
+static gint ett_icmpv6_rr_up_flag_ra;
+static gint ett_icmpv6_rr_up_flag;
+static gint ett_icmpv6_rr_rm;
+static gint ett_icmpv6_rr_rm_flag;
+static gint ett_icmpv6_flag_mld;
+static gint ett_icmpv6_flag_ra;
+static gint ett_icmpv6_flag_na;
+static gint ett_icmpv6_flag_mip6;
+static gint ett_icmpv6_flag_fmip6;
+static gint ett_icmpv6_flag_secure;
+static gint ett_icmpv6_flag_rpl_dio;
+static gint ett_icmpv6_flag_rpl_dao;
+static gint ett_icmpv6_flag_rpl_daoack;
+static gint ett_icmpv6_flag_rpl_cc;
+static gint ett_icmpv6_opt_name;
+static gint ett_icmpv6_cga_param_name;
+static gint ett_icmpv6_mpl_seed_info;
+static gint ett_icmpv6_mpl_seed_info_bm;
+
+static expert_field ei_icmpv6_invalid_option_length;
+static expert_field ei_icmpv6_undecoded_option;
+static expert_field ei_icmpv6_unknown_data;
+static expert_field ei_icmpv6_undecoded_rpl_option;
+static expert_field ei_icmpv6_undecoded_type;
+static expert_field ei_icmpv6_rr_pco_mp_matchlen;
+static expert_field ei_icmpv6_rr_pco_mp_matchedlen;
+static expert_field ei_icmpv6_checksum;
+static expert_field ei_icmpv6_resp_not_found;
+static expert_field ei_icmpv6_rpl_unknown_metric;
+static expert_field ei_icmpv6_rpl_p2p_hop_by_hop;
+static expert_field ei_icmpv6_rpl_p2p_num_of_routes;
+static expert_field ei_icmpv6_rpl_p2p_dro_rdo_zero;
+static expert_field ei_icmpv6_rpl_p2p_dro_zero;
 
 static dissector_handle_t icmpv6_handle;
 
diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c
index 84fc35f391..b9a87c4ce2 100644
--- a/epan/dissectors/packet-icp.c
+++ b/epan/dissectors/packet-icp.c
@@ -21,27 +21,27 @@ void proto_reg_handoff_icp(void);
 
 static dissector_handle_t icp_handle;
 
-static int proto_icp = -1;
-static int hf_icp_length = -1;
-static int hf_icp_opcode = -1;
-static int hf_icp_version = -1;
-static int hf_icp_request_nr = -1;
+static int proto_icp;
+static int hf_icp_length;
+static int hf_icp_opcode;
+static int hf_icp_version;
+static int hf_icp_request_nr;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_icp_url = -1;
-static int hf_icp_rtt = -1;
-static int hf_icp_object_data = -1;
-static int hf_icp_requester_host_address = -1;
-static int hf_icp_sender_host_ip_address = -1;
-static int hf_icp_option_src_rtt = -1;
-static int hf_icp_object_length = -1;
-static int hf_icp_option_hit_obj = -1;
-
-static gint ett_icp = -1;
-static gint ett_icp_payload = -1;
+static int hf_icp_url;
+static int hf_icp_rtt;
+static int hf_icp_object_data;
+static int hf_icp_requester_host_address;
+static int hf_icp_sender_host_ip_address;
+static int hf_icp_option_src_rtt;
+static int hf_icp_object_length;
+static int hf_icp_option_hit_obj;
+
+static gint ett_icp;
+static gint ett_icp_payload;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_icp_fragmented_packet = EI_INIT;
+static expert_field ei_icp_fragmented_packet;
 
 #define UDP_PORT_ICP    3130
 
diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c
index 93e55bd138..72897961ad 100644
--- a/epan/dissectors/packet-icq.c
+++ b/epan/dissectors/packet-icq.c
@@ -26,93 +26,93 @@ void proto_reg_handoff_icq(void);
 
 static dissector_handle_t icq_handle;
 
-static int proto_icq = -1;
-static int hf_icq_version = -1;
-static int hf_icq_uin = -1;
-static int hf_icq_client_cmd = -1;
-static int hf_icq_server_cmd = -1;
-static int hf_icq_sessionid = -1;
-static int hf_icq_checkcode = -1;
-static int hf_icq_type = -1;
-static int hf_icq_msg_type = -1;
-static int hf_icq_seqnum1 = -1;
-static int hf_icq_seqnum2 = -1;
-static int hf_icq_checkcode_key = -1;
-static int hf_icq_group = -1;
-static int hf_icq_ack_random = -1;
-static int hf_icq_keep_alive_random = -1;
-static int hf_icq_status = -1;
-static int hf_icq_meta_user_subcmd = -1;
+static int proto_icq;
+static int hf_icq_version;
+static int hf_icq_uin;
+static int hf_icq_client_cmd;
+static int hf_icq_server_cmd;
+static int hf_icq_sessionid;
+static int hf_icq_checkcode;
+static int hf_icq_type;
+static int hf_icq_msg_type;
+static int hf_icq_seqnum1;
+static int hf_icq_seqnum2;
+static int hf_icq_checkcode_key;
+static int hf_icq_group;
+static int hf_icq_ack_random;
+static int hf_icq_keep_alive_random;
+static int hf_icq_status;
+static int hf_icq_meta_user_subcmd;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_icq_rand_user_tcpversion = -1;
-static int hf_icq_meta_user_x3 = -1;
-static int hf_icq_user_online_realip = -1;
-static int hf_icq_rand_user_realip = -1;
-static int hf_icq_meta_user_hideip = -1;
-static int hf_icq_user_online_port = -1;
-static int hf_icq_user_online_ip = -1;
-static int hf_icq_num_uin_pairs = -1;
-static int hf_icq_x1 = -1;
-static int hf_icq_meta_user_timezone = -1;
-static int hf_icq_user_online_version = -1;
-static int hf_icq_receiver_uin = -1;
-static int hf_icq_text_code = -1;
-static int hf_icq_login_reply_ip = -1;
-static int hf_icq_rand_user_ip = -1;
-static int hf_icq_multi_num_packets = -1;
-static int hf_icq_number_of_uins = -1;
-static int hf_icq_meta_user_length = -1;
-static int hf_icq_text_code_length = -1;
-static int hf_icq_login_password = -1;
-static int hf_icq_meta_user_x2 = -1;
-static int hf_icq_login_time = -1;
-static int hf_icq_meta_user_countrycode = -1;
-static int hf_icq_msg_length = -1;
-static int hf_icq_meta_user_about = -1;
-static int hf_icq_meta_user_webaware = -1;
-static int hf_icq_rand_user_class = -1;
-static int hf_icq_rand_user_port = -1;
-static int hf_icq_meta_user_found_authorization = -1;
-static int hf_icq_meta_user_info_authorization = -1;
-static int hf_icq_no_parameters = -1;
-static int hf_icq_login_port = -1;
-static int hf_icq_meta_user_result = -1;
-static int hf_icq_login_ip = -1;
-static int hf_icq_msg_authorization = -1;
-static int hf_icq_msg = -1;
-static int hf_icq_nickname = -1;
-static int hf_icq_first_name = -1;
-static int hf_icq_last_name = -1;
-static int hf_icq_email = -1;
-static int hf_icq_nickname_uint_string = -1;
-static int hf_icq_first_name_uint_string = -1;
-static int hf_icq_last_name_uint_string = -1;
-static int hf_icq_email_uint_string = -1;
-static int hf_icq_primary_email = -1;
-static int hf_icq_secondary_email = -1;
-static int hf_icq_old_email = -1;
-static int hf_icq_city = -1;
-static int hf_icq_state = -1;
-static int hf_icq_phone = -1;
-static int hf_icq_fax = -1;
-static int hf_icq_street = -1;
-static int hf_icq_cellphone = -1;
-static int hf_icq_zip = -1;
-static int hf_icq_description = -1;
-static int hf_icq_url = -1;
-static int hf_icq_text = -1;
-static int hf_icq_unknown = -1;
-static int hf_icq_reason = -1;
-static int hf_icq_msg_contact = -1;
-static int hf_icq_recv_time = -1;
-
-static gint ett_icq = -1;
-static gint ett_icq_header = -1;
-static gint ett_icq_body = -1;
-static gint ett_icq_body_parts = -1;
-
-static expert_field ei_icq_unknown_meta_subcmd = EI_INIT;
-static expert_field ei_icq_unknown_command = EI_INIT;
+static int hf_icq_rand_user_tcpversion;
+static int hf_icq_meta_user_x3;
+static int hf_icq_user_online_realip;
+static int hf_icq_rand_user_realip;
+static int hf_icq_meta_user_hideip;
+static int hf_icq_user_online_port;
+static int hf_icq_user_online_ip;
+static int hf_icq_num_uin_pairs;
+static int hf_icq_x1;
+static int hf_icq_meta_user_timezone;
+static int hf_icq_user_online_version;
+static int hf_icq_receiver_uin;
+static int hf_icq_text_code;
+static int hf_icq_login_reply_ip;
+static int hf_icq_rand_user_ip;
+static int hf_icq_multi_num_packets;
+static int hf_icq_number_of_uins;
+static int hf_icq_meta_user_length;
+static int hf_icq_text_code_length;
+static int hf_icq_login_password;
+static int hf_icq_meta_user_x2;
+static int hf_icq_login_time;
+static int hf_icq_meta_user_countrycode;
+static int hf_icq_msg_length;
+static int hf_icq_meta_user_about;
+static int hf_icq_meta_user_webaware;
+static int hf_icq_rand_user_class;
+static int hf_icq_rand_user_port;
+static int hf_icq_meta_user_found_authorization;
+static int hf_icq_meta_user_info_authorization;
+static int hf_icq_no_parameters;
+static int hf_icq_login_port;
+static int hf_icq_meta_user_result;
+static int hf_icq_login_ip;
+static int hf_icq_msg_authorization;
+static int hf_icq_msg;
+static int hf_icq_nickname;
+static int hf_icq_first_name;
+static int hf_icq_last_name;
+static int hf_icq_email;
+static int hf_icq_nickname_uint_string;
+static int hf_icq_first_name_uint_string;
+static int hf_icq_last_name_uint_string;
+static int hf_icq_email_uint_string;
+static int hf_icq_primary_email;
+static int hf_icq_secondary_email;
+static int hf_icq_old_email;
+static int hf_icq_city;
+static int hf_icq_state;
+static int hf_icq_phone;
+static int hf_icq_fax;
+static int hf_icq_street;
+static int hf_icq_cellphone;
+static int hf_icq_zip;
+static int hf_icq_description;
+static int hf_icq_url;
+static int hf_icq_text;
+static int hf_icq_unknown;
+static int hf_icq_reason;
+static int hf_icq_msg_contact;
+static int hf_icq_recv_time;
+
+static gint ett_icq;
+static gint ett_icq_header;
+static gint ett_icq_body;
+static gint ett_icq_body_parts;
+
+static expert_field ei_icq_unknown_meta_subcmd;
+static expert_field ei_icq_unknown_command;
 
 /* This is not IANA registered */
 #define UDP_PORT_ICQ    4000
diff --git a/epan/dissectors/packet-id3v2.c b/epan/dissectors/packet-id3v2.c
index a0ec663823..3a7e87e5c9 100644
--- a/epan/dissectors/packet-id3v2.c
+++ b/epan/dissectors/packet-id3v2.c
@@ -30,35 +30,35 @@ void proto_register_id3v2(void);
 
 static dissector_table_t media_type_dissector_table;
 
-static int proto_id3v2 = -1;
-static int hf_id3v2 = -1;
-static int hf_id3v2_file_id = -1;
-static int hf_id3v2_version = -1;
-static int hf_id3v2_flags = -1;
-static int hf_id3v2_size = -1;
-static int hf_id3v2_frame = -1;
-static int hf_id3v2_frame_id = -1;
-static int hf_id3v2_frame_size = -1;
-static int hf_id3v2_frame_flags = -1;
-static int hf_id3v2_frame_text_encoding = -1;
-static int hf_id3v2_frame_text_description = -1;
-static int hf_id3v2_frame_text_value = -1;
-static int hf_id3v2_frame_ufi_owner = -1;
-static int hf_id3v2_frame_ufi_id = -1;
-static int hf_id3v2_frame_apic_mime_type = -1;
-static int hf_id3v2_frame_apic_picture_type = -1;
-static int hf_id3v2_frame_apic_description = -1;
-static int hf_id3v2_frame_private = -1;
-static int hf_id3v2_frame_comment_language = -1;
-static int hf_id3v2_frame_comment_description = -1;
-static int hf_id3v2_frame_comment_text = -1;
-static int hf_id3v2_undecoded = -1;
-static int hf_id3v2_padding = -1;
-
-static gint ett_id3v2 = -1;
-static gint ett_id3v2_frame = -1;
-
-static expert_field ei_id3v2_undecoded = EI_INIT;
+static int proto_id3v2;
+static int hf_id3v2;
+static int hf_id3v2_file_id;
+static int hf_id3v2_version;
+static int hf_id3v2_flags;
+static int hf_id3v2_size;
+static int hf_id3v2_frame;
+static int hf_id3v2_frame_id;
+static int hf_id3v2_frame_size;
+static int hf_id3v2_frame_flags;
+static int hf_id3v2_frame_text_encoding;
+static int hf_id3v2_frame_text_description;
+static int hf_id3v2_frame_text_value;
+static int hf_id3v2_frame_ufi_owner;
+static int hf_id3v2_frame_ufi_id;
+static int hf_id3v2_frame_apic_mime_type;
+static int hf_id3v2_frame_apic_picture_type;
+static int hf_id3v2_frame_apic_description;
+static int hf_id3v2_frame_private;
+static int hf_id3v2_frame_comment_language;
+static int hf_id3v2_frame_comment_description;
+static int hf_id3v2_frame_comment_text;
+static int hf_id3v2_undecoded;
+static int hf_id3v2_padding;
+
+static gint ett_id3v2;
+static gint ett_id3v2_frame;
+
+static expert_field ei_id3v2_undecoded;
 
 #define ID3V2_MIN_LENGTH 10
 
diff --git a/epan/dissectors/packet-idmp.c b/epan/dissectors/packet-idmp.c
index 1b1b1c0145..c00db2f283 100644
--- a/epan/dissectors/packet-idmp.c
+++ b/epan/dissectors/packet-idmp.c
@@ -53,7 +53,7 @@ static const char *saved_protocolID = NULL;
 static guint32     opcode           = -1;
 
 /* Initialize the protocol and registered fields */
-int proto_idmp = -1;
+int proto_idmp;
 
 static int hf_idmp_version;
 static int hf_idmp_final;
diff --git a/epan/dissectors/packet-idn.c b/epan/dissectors/packet-idn.c
index e22e65315c..b107cc5c29 100644
--- a/epan/dissectors/packet-idn.c
+++ b/epan/dissectors/packet-idn.c
@@ -115,126 +115,126 @@ void proto_reg_handoff_idn(void);
 
 static dissector_handle_t idn_handle;
 
-static int proto_idn = -1;
-
-static gint ett_idn = -1;
-static gint ett_idn_header_tree = -1;
-static gint ett_idn_scanreply_header_tree = -1;
-static gint ett_idn_channel_message_header_tree = -1;
-static gint ett_protocol_version = -1;
-static gint ett_status = -1;
-static gint ett_idn_cnl = -1;
-static gint ett_configuration_header = -1;
-static gint ett_chunk_header_tree = -1;
-static gint ett_chunk_header_flags = -1;
-static gint ett_cfl = -1;
-static gint ett_dic = -1;
-static gint ett_dic_tree = -1;
-static gint ett_data = -1;
-static gint ett_subdata = -1;
-static gint ett_dmx_subtree = -1;
+static int proto_idn;
+
+static gint ett_idn;
+static gint ett_idn_header_tree;
+static gint ett_idn_scanreply_header_tree;
+static gint ett_idn_channel_message_header_tree;
+static gint ett_protocol_version;
+static gint ett_status;
+static gint ett_idn_cnl;
+static gint ett_configuration_header;
+static gint ett_chunk_header_tree;
+static gint ett_chunk_header_flags;
+static gint ett_cfl;
+static gint ett_dic;
+static gint ett_dic_tree;
+static gint ett_data;
+static gint ett_subdata;
+static gint ett_dmx_subtree;
 
 /* IDN-Header */
-static int hf_idn_command = -1;
-static int hf_idn_flags = -1;
-static int hf_idn_sequence = -1;
-static int hf_idn_total_size = -1;
+static int hf_idn_command;
+static int hf_idn_flags;
+static int hf_idn_sequence;
+static int hf_idn_total_size;
 
 /* Scanreply Header */
-static int hf_idn_struct_size = -1;
-static int hf_idn_protocol_version = -1;
-static int hf_idn_protocol_version_major = -1;
-static int hf_idn_protocol_version_minor = -1;
-static int hf_idn_status = -1;
-static int hf_idn_malfn = -1;
-static int hf_idn_offline = -1;
-static int hf_idn_xcld = -1;
-static int hf_idn_ocpd = -1;
-static int hf_idn_rt = -1;
-static int hf_idn_reserved8 = -1;
-static int hf_idn_unit_id = -1;
-static int hf_idn_name = -1;
+static int hf_idn_struct_size;
+static int hf_idn_protocol_version;
+static int hf_idn_protocol_version_major;
+static int hf_idn_protocol_version_minor;
+static int hf_idn_status;
+static int hf_idn_malfn;
+static int hf_idn_offline;
+static int hf_idn_xcld;
+static int hf_idn_ocpd;
+static int hf_idn_rt;
+static int hf_idn_reserved8;
+static int hf_idn_unit_id;
+static int hf_idn_name;
 
 /* Service Map Response */
-static int hf_idn_entry_size = -1;
-static int hf_idn_relay_count = -1;
-static int hf_idn_service_count = -1;
-static int hf_idn_relay_number = -1;
+static int hf_idn_entry_size;
+static int hf_idn_relay_count;
+static int hf_idn_service_count;
+static int hf_idn_relay_number;
 
 /* Channel Message Header */
-static int hf_idn_cnl = -1;
-static int hf_idn_most_significant_bit_cnl = -1;
-static int hf_idn_cclf = -1;
-static int hf_idn_channel_id = -1;
-static int hf_idn_chunk_type = -1;
-static int hf_idn_timestamp = -1;
+static int hf_idn_cnl;
+static int hf_idn_most_significant_bit_cnl;
+static int hf_idn_cclf;
+static int hf_idn_channel_id;
+static int hf_idn_chunk_type;
+static int hf_idn_timestamp;
 
 /* Configuration Header */
-static int hf_idn_scwc = -1;
-static int hf_idn_cfl = -1;
-static int hf_idn_sdm = -1;
-static int hf_idn_close = -1;
-static int hf_idn_routing = -1;
-static int hf_idn_service_id = -1;
-static int hf_idn_service_mode = -1;
+static int hf_idn_scwc;
+static int hf_idn_cfl;
+static int hf_idn_sdm;
+static int hf_idn_close;
+static int hf_idn_routing;
+static int hf_idn_service_id;
+static int hf_idn_service_mode;
 
 /* Chunk Header */
-static int hf_idn_chunk_header_flags = -1;
-static int hf_idn_two_bits_reserved_1 = -1;
-static int hf_idn_two_bits_reserved_2 = -1;
-static int hf_idn_three_bits_reserved = -1;
-static int hf_idn_four_bits_reserved = -1;
-static int hf_idn_scm = -1;
-static int hf_idn_once = -1;
-static int hf_idn_duration = -1;
-static int hf_idn_chunk_data_sequence = -1;
-static int hf_idn_offset = -1;
-static int hf_idn_dlim = -1;
-static int hf_idn_reserved = -1;
+static int hf_idn_chunk_header_flags;
+static int hf_idn_two_bits_reserved_1;
+static int hf_idn_two_bits_reserved_2;
+static int hf_idn_three_bits_reserved;
+static int hf_idn_four_bits_reserved;
+static int hf_idn_scm;
+static int hf_idn_once;
+static int hf_idn_duration;
+static int hf_idn_chunk_data_sequence;
+static int hf_idn_offset;
+static int hf_idn_dlim;
+static int hf_idn_reserved;
 
 /* Tags */
-static int hf_idn_gts = -1;
-static int hf_idn_gts_void = -1;
-static int hf_idn_boundary = -1;
-static int hf_idn_gts_word = -1;
-static int hf_idn_gts_break = -1;
-static int hf_idn_gts_space_modifier = -1;
-static int hf_idn_gts_hint = -1;
-static int hf_idn_gts_category = -1;
-static int hf_idn_gts_subcategory = -1;
-static int hf_idn_gts_identifier = -1;
-static int hf_idn_gts_parameter = -1;
-static int hf_idn_gts_glin = -1;
-static int hf_idn_gts_clin = -1;
-static int hf_idn_gts_cbal = -1;
-static int hf_idn_gts_ctim = -1;
-static int hf_idn_gts_nop = -1;
-static int hf_idn_gts_precision = -1;
-static int hf_idn_gts_cscl = -1;
-static int hf_idn_gts_iscl = -1;
-static int hf_idn_gts_sht = -1;
-static int hf_idn_gts_u4 = -1;
-static int hf_idn_gts_x = -1;
-static int hf_idn_gts_y = -1;
-static int hf_idn_gts_z = -1;
-static int hf_idn_gts_color = -1;
-static int hf_idn_gts_wavelength_prefix = -1;
-static int hf_idn_gts_intensity = -1;
-static int hf_idn_gts_beam_brush = -1;
-static int hf_idn_gts_sample = -1;
-static int hf_idn_dmx_octet = -1;
-static int hf_idn_dmx_identifier = -1;
-static int hf_idn_dmx_parameter = -1;
-static int hf_idn_dmx_void = -1;
-static int hf_idn_octet = -1;
-static int hf_idn_dmx_base = -1;
-static int hf_idn_dmx_count = -1;
-static int hf_idn_dmx_dls = -1;
-static int hf_idn_dmx_unknown = -1;
+static int hf_idn_gts;
+static int hf_idn_gts_void;
+static int hf_idn_boundary;
+static int hf_idn_gts_word;
+static int hf_idn_gts_break;
+static int hf_idn_gts_space_modifier;
+static int hf_idn_gts_hint;
+static int hf_idn_gts_category;
+static int hf_idn_gts_subcategory;
+static int hf_idn_gts_identifier;
+static int hf_idn_gts_parameter;
+static int hf_idn_gts_glin;
+static int hf_idn_gts_clin;
+static int hf_idn_gts_cbal;
+static int hf_idn_gts_ctim;
+static int hf_idn_gts_nop;
+static int hf_idn_gts_precision;
+static int hf_idn_gts_cscl;
+static int hf_idn_gts_iscl;
+static int hf_idn_gts_sht;
+static int hf_idn_gts_u4;
+static int hf_idn_gts_x;
+static int hf_idn_gts_y;
+static int hf_idn_gts_z;
+static int hf_idn_gts_color;
+static int hf_idn_gts_wavelength_prefix;
+static int hf_idn_gts_intensity;
+static int hf_idn_gts_beam_brush;
+static int hf_idn_gts_sample;
+static int hf_idn_dmx_octet;
+static int hf_idn_dmx_identifier;
+static int hf_idn_dmx_parameter;
+static int hf_idn_dmx_void;
+static int hf_idn_octet;
+static int hf_idn_dmx_base;
+static int hf_idn_dmx_count;
+static int hf_idn_dmx_dls;
+static int hf_idn_dmx_unknown;
 
 /* Acknowledgement */
-static int hf_idn_result_code = -1;
-static int hf_idn_event_flags = -1;
+static int hf_idn_result_code;
+static int hf_idn_event_flags;
 
 static const value_string command_code[] = {
 	{ IDNCMD_VOID, "VOID" },
diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c
index 0418e2b96a..3971021762 100644
--- a/epan/dissectors/packet-idp.c
+++ b/epan/dissectors/packet-idp.c
@@ -20,21 +20,21 @@ void proto_reg_handoff_idp(void);
 
 static dissector_handle_t idp_handle;
 
-static int proto_idp = -1;
-static int hf_idp_checksum = -1;
-static int hf_idp_len = -1;
-/* static int hf_idp_src = -1; */
-/* static int hf_idp_dst = -1; */
-static int hf_idp_hops = -1;
-static int hf_idp_packet_type = -1;
-static int hf_idp_dnet = -1;
-static int hf_idp_dnode = -1;
-static int hf_idp_dsocket = -1;
-static int hf_idp_snet = -1;
-static int hf_idp_snode = -1;
-static int hf_idp_ssocket = -1;
-
-static gint ett_idp = -1;
+static int proto_idp;
+static int hf_idp_checksum;
+static int hf_idp_len;
+/* static int hf_idp_src; */
+/* static int hf_idp_dst; */
+static int hf_idp_hops;
+static int hf_idp_packet_type;
+static int hf_idp_dnet;
+static int hf_idp_dnode;
+static int hf_idp_dsocket;
+static int hf_idp_snet;
+static int hf_idp_snode;
+static int hf_idp_ssocket;
+
+static gint ett_idp;
 
 static dissector_table_t idp_type_dissector_table;
 
diff --git a/epan/dissectors/packet-idrp.c b/epan/dissectors/packet-idrp.c
index 87241b7368..2ea13523cc 100644
--- a/epan/dissectors/packet-idrp.c
+++ b/epan/dissectors/packet-idrp.c
@@ -28,89 +28,89 @@
 
 void proto_register_idrp(void);
 
-static int proto_idrp = -1;
-static gint ett_idrp = -1;
-static gint ett_idrp_sub = -1;
+static int proto_idrp;
+static gint ett_idrp;
+static gint ett_idrp_sub;
 
 /* static header */
-static int hf_idrp_li = -1;
-static int hf_idrp_type = -1;
-static int hf_idrp_sequence = -1;
-static int hf_idrp_ack = -1;
-static int hf_idrp_credit_offered = -1;
-static int hf_idrp_credit_avail = -1;
-static int hf_idrp_validation_pattern = -1;
+static int hf_idrp_li;
+static int hf_idrp_type;
+static int hf_idrp_sequence;
+static int hf_idrp_ack;
+static int hf_idrp_credit_offered;
+static int hf_idrp_credit_avail;
+static int hf_idrp_validation_pattern;
 /* OPEN BISPDU */
-static int hf_idrp_open_version = -1;
-static int hf_idrp_open_hold_time = -1;
-static int hf_idrp_open_max_pdu_size = -1;
-static int hf_idrp_open_src_rdi = -1;
-static int hf_idrp_open_rib_attr_locally_defined_qos_nsap = -1;
-static int hf_idrp_open_rib_attr_locally_defined_qos_value = -1;
-static int hf_idrp_open_rib_attr_locally_defined_qos_metric = -1;
-static int hf_idrp_open_rib_attr_security_reg_id = -1;
-static int hf_idrp_open_rib_attr_security_info = -1;
-static int hf_idrp_open_number_of_confederations = -1;
-static int hf_idrp_open_confederation = -1;
-static int hf_idrp_open_authentication_code = -1;
-static int hf_idrp_open_authentication_data = -1;
+static int hf_idrp_open_version;
+static int hf_idrp_open_hold_time;
+static int hf_idrp_open_max_pdu_size;
+static int hf_idrp_open_src_rdi;
+static int hf_idrp_open_rib_attr_locally_defined_qos_nsap;
+static int hf_idrp_open_rib_attr_locally_defined_qos_value;
+static int hf_idrp_open_rib_attr_locally_defined_qos_metric;
+static int hf_idrp_open_rib_attr_security_reg_id;
+static int hf_idrp_open_rib_attr_security_info;
+static int hf_idrp_open_number_of_confederations;
+static int hf_idrp_open_confederation;
+static int hf_idrp_open_authentication_code;
+static int hf_idrp_open_authentication_data;
 /* UPDATE BISPDU */
-static int hf_idrp_update_number_of_unfeasible_routes = -1;
-static int hf_idrp_update_withdrawn_route = -1;
-static int hf_idrp_update_path_attr_flag = -1;
-static int hf_idrp_update_path_attr_type = -1;
-static int hf_idrp_update_path_attr_length = -1;
-static int hf_idrp_update_path_attr_route_separator_id = -1;
-static int hf_idrp_update_path_attr_route_separator_localpref = -1;
-static int hf_idrp_update_path_attr_ext_info = -1;
-static int hf_idrp_update_path_attr_rd_path_type = -1;
-static int hf_idrp_update_path_attr_rd_path_segment_length = -1;
-static int hf_idrp_update_path_attr_rd_path_rdi = -1;
-static int hf_idrp_update_path_attr_next_hop_idrp_server = -1;
-static int hf_idrp_update_path_attr_next_hop_proto_type = -1;
-static int hf_idrp_update_path_attr_next_hop_proto = -1;
-static int hf_idrp_update_path_attr_next_hop_rdi = -1;
-static int hf_idrp_update_path_attr_next_hop_nb_snpa = -1;
-static int hf_idrp_update_path_attr_next_hop_snpa = -1;
-static int hf_idrp_update_path_attr_dist_list_incl_nb_rdi = -1;
-static int hf_idrp_update_path_attr_dist_list_incl_rdi = -1;
-static int hf_idrp_update_path_attr_dist_list_excl_nb_rdi = -1;
-static int hf_idrp_update_path_attr_dist_list_excl_rdi = -1;
-static int hf_idrp_update_path_attr_multi_exit_disc = -1;
-static int hf_idrp_update_path_attr_transit_delay = -1;
-static int hf_idrp_update_path_attr_residual_error = -1;
-static int hf_idrp_update_path_attr_expense = -1;
-static int hf_idrp_update_path_attr_locally_defined_qos_nsap = -1;
-static int hf_idrp_update_path_attr_locally_defined_qos_value = -1;
-static int hf_idrp_update_path_attr_locally_defined_qos_metric = -1;
-static int hf_idrp_update_path_attr_hierarchicaldecoding = -1;
-static int hf_idrp_update_path_attr_rd_hop_count = -1;
-static int hf_idrp_update_path_attr_security_reg_id = -1;
-static int hf_idrp_update_path_attr_security_info = -1;
-static int hf_idrp_update_path_attr_capacity = -1;
-static int hf_idrp_update_path_attr_priority = -1;
-static int hf_idrp_update_nlri_proto_type = -1;
-static int hf_idrp_update_nlri_proto_id = -1;
-static int hf_idrp_update_nlri_addr_length = -1;
-static int hf_idrp_update_nlri_addr_info_nb_bits = -1;
-static int hf_idrp_update_nlri_addr_info = -1;
+static int hf_idrp_update_number_of_unfeasible_routes;
+static int hf_idrp_update_withdrawn_route;
+static int hf_idrp_update_path_attr_flag;
+static int hf_idrp_update_path_attr_type;
+static int hf_idrp_update_path_attr_length;
+static int hf_idrp_update_path_attr_route_separator_id;
+static int hf_idrp_update_path_attr_route_separator_localpref;
+static int hf_idrp_update_path_attr_ext_info;
+static int hf_idrp_update_path_attr_rd_path_type;
+static int hf_idrp_update_path_attr_rd_path_segment_length;
+static int hf_idrp_update_path_attr_rd_path_rdi;
+static int hf_idrp_update_path_attr_next_hop_idrp_server;
+static int hf_idrp_update_path_attr_next_hop_proto_type;
+static int hf_idrp_update_path_attr_next_hop_proto;
+static int hf_idrp_update_path_attr_next_hop_rdi;
+static int hf_idrp_update_path_attr_next_hop_nb_snpa;
+static int hf_idrp_update_path_attr_next_hop_snpa;
+static int hf_idrp_update_path_attr_dist_list_incl_nb_rdi;
+static int hf_idrp_update_path_attr_dist_list_incl_rdi;
+static int hf_idrp_update_path_attr_dist_list_excl_nb_rdi;
+static int hf_idrp_update_path_attr_dist_list_excl_rdi;
+static int hf_idrp_update_path_attr_multi_exit_disc;
+static int hf_idrp_update_path_attr_transit_delay;
+static int hf_idrp_update_path_attr_residual_error;
+static int hf_idrp_update_path_attr_expense;
+static int hf_idrp_update_path_attr_locally_defined_qos_nsap;
+static int hf_idrp_update_path_attr_locally_defined_qos_value;
+static int hf_idrp_update_path_attr_locally_defined_qos_metric;
+static int hf_idrp_update_path_attr_hierarchicaldecoding;
+static int hf_idrp_update_path_attr_rd_hop_count;
+static int hf_idrp_update_path_attr_security_reg_id;
+static int hf_idrp_update_path_attr_security_info;
+static int hf_idrp_update_path_attr_capacity;
+static int hf_idrp_update_path_attr_priority;
+static int hf_idrp_update_nlri_proto_type;
+static int hf_idrp_update_nlri_proto_id;
+static int hf_idrp_update_nlri_addr_length;
+static int hf_idrp_update_nlri_addr_info_nb_bits;
+static int hf_idrp_update_nlri_addr_info;
 /* ERROR BISPDU */
-static int hf_idrp_error_code = -1;
-static int hf_idrp_error_open_subcode = -1;
-static int hf_idrp_error_update_subcode = -1;
-static int hf_idrp_error_hold_timer_subcode = -1;
-static int hf_idrp_error_fsm_subcode = -1;
-static int hf_idrp_error_rib_refresh_subcode = -1;
-static int hf_idrp_error_data = -1;
+static int hf_idrp_error_code;
+static int hf_idrp_error_open_subcode;
+static int hf_idrp_error_update_subcode;
+static int hf_idrp_error_hold_timer_subcode;
+static int hf_idrp_error_fsm_subcode;
+static int hf_idrp_error_rib_refresh_subcode;
+static int hf_idrp_error_data;
 /* RIB-REFRESH BISPDU */
-static int hf_idrp_rib_refresh_opcode = -1;
-static int hf_idrp_rib_refresh_rib_attr_locally_defined_qos_nsap = -1;
-static int hf_idrp_rib_refresh_rib_attr_locally_defined_qos_value = -1;
-static int hf_idrp_rib_refresh_rib_attr_locally_defined_qos_metric = -1;
-static int hf_idrp_rib_refresh_rib_attr_security_reg_id = -1;
-static int hf_idrp_rib_refresh_rib_attr_security_info = -1;
-
-static expert_field ei_idrp_no_path_attributes = EI_INIT;
+static int hf_idrp_rib_refresh_opcode;
+static int hf_idrp_rib_refresh_rib_attr_locally_defined_qos_nsap;
+static int hf_idrp_rib_refresh_rib_attr_locally_defined_qos_value;
+static int hf_idrp_rib_refresh_rib_attr_locally_defined_qos_metric;
+static int hf_idrp_rib_refresh_rib_attr_security_reg_id;
+static int hf_idrp_rib_refresh_rib_attr_security_info;
+
+static expert_field ei_idrp_no_path_attributes;
 
 /* flags */
 #define IDRP_UPDATE_PATH_FLAG_OPTIONAL                    0x80
diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c
index 23e3be953f..a900dc9e1c 100644
--- a/epan/dissectors/packet-iec104.c
+++ b/epan/dissectors/packet-iec104.c
@@ -79,10 +79,10 @@ typedef struct {
 #define IEC104_PORT     2404
 
 /* Define the iec101/103/104 protos */
-static int proto_iec60870_101  = -1;
-static int proto_iec60870_5_103 = -1;
-static int proto_iec60870_104  = -1;
-static int proto_iec60870_asdu = -1;
+static int proto_iec60870_101;
+static int proto_iec60870_5_103;
+static int proto_iec60870_104;
+static int proto_iec60870_asdu;
 
 /* Protocol constants */
 #define APCI_START	0x68
@@ -665,140 +665,140 @@ static guint global_iec60870_asdu_addr_len = 1;
 static guint global_iec60870_ioa_len = 2;
 
 /* Protocol fields to be filtered */
-static int hf_apdulen = -1;
-static int hf_apcitype_i = -1;
-static int hf_apcitype_s_u = -1;
-static int hf_apciutype = -1;
-static int hf_apcitx = -1;
-static int hf_apcirx = -1;
-static int hf_apcidata = -1;
-
-static int hf_addr    = -1;
-static int hf_oa  = -1;
-static int hf_typeid   = -1;
-static int hf_causetx  = -1;
-static int hf_nega  = -1;
-static int hf_test  = -1;
-static int hf_ioa    = -1;
-static int hf_numix  = -1;
-static int hf_sq  = -1;
-static int hf_cp24time  = -1;
-static int hf_cp24time_ms  = -1;
-static int hf_cp24time_min  = -1;
-static int hf_cp24time_iv  = -1;
-static int hf_cp56time  = -1;
-static int hf_cp56time_ms  = -1;
-static int hf_cp56time_min  = -1;
-static int hf_cp56time_gen  = -1;
-static int hf_cp56time_iv  = -1;
-static int hf_cp56time_hour  = -1;
-static int hf_cp56time_su  = -1;
-static int hf_cp56time_day  = -1;
-static int hf_cp56time_dow  = -1;
-static int hf_cp56time_month  = -1;
-static int hf_cp56time_year  = -1;
-static int hf_siq  = -1;
-static int hf_siq_spi  = -1;
-static int hf_siq_bl  = -1;
-static int hf_siq_sb  = -1;
-static int hf_siq_nt  = -1;
-static int hf_siq_iv  = -1;
-static int hf_diq  = -1;
-static int hf_diq_dpi  = -1;
-static int hf_diq_bl  = -1;
-static int hf_diq_sb  = -1;
-static int hf_diq_nt  = -1;
-static int hf_diq_iv  = -1;
-static int hf_qds  = -1;
-static int hf_qds_ov  = -1;
-static int hf_qds_bl  = -1;
-static int hf_qds_sb  = -1;
-static int hf_qds_nt  = -1;
-static int hf_qds_iv  = -1;
-static int hf_vti  = -1;
-static int hf_vti_v  = -1;
-static int hf_vti_t  = -1;
-static int hf_qos  = -1;
-static int hf_qos_ql  = -1;
-static int hf_qos_se  = -1;
-static int hf_sco  = -1;
-static int hf_sco_on  = -1;
-static int hf_sco_qu  = -1;
-static int hf_sco_se  = -1;
-static int hf_dco  = -1;
-static int hf_dco_on  = -1;
-static int hf_dco_qu  = -1;
-static int hf_dco_se  = -1;
-static int hf_rco  = -1;
-static int hf_rco_up  = -1;
-static int hf_rco_qu  = -1;
-static int hf_rco_se  = -1;
-static int hf_qpm = -1;
-static int hf_qpm_kpa = -1;
-static int hf_qpm_lpc = -1;
-static int hf_qpm_pop = -1;
-static int hf_coi  = -1;
-static int hf_coi_r  = -1;
-static int hf_coi_i  = -1;
-static int hf_qoi  = -1;
-static int hf_qcc = -1;
-static int hf_qcc_rqt = -1;
-static int hf_qcc_frz = -1;
-static int hf_qrp  = -1;
-static int hf_bcr = -1;
-static int hf_bcr_count = -1;
-static int hf_bcr_sq = -1;
-static int hf_bcr_cy = -1;
-static int hf_bcr_ca = -1;
-static int hf_bcr_iv = -1;
-static int hf_start = -1;
-
-static int hf_asdu_bitstring = -1;
-static int hf_asdu_float = -1;
-static int hf_asdu_normval = -1;
-static int hf_asdu_scalval = -1;
-static int hf_asdu_raw_data = -1;
-
-static gint ett_apci = -1;
-static gint ett_asdu = -1;
-static gint ett_asdu_objects = -1;
-static gint ett_siq = -1;
-static gint ett_diq = -1;
-static gint ett_vti = -1;
-static gint ett_qds = -1;
-static gint ett_qos = -1;
-static gint ett_sco = -1;
-static gint ett_dco = -1;
-static gint ett_rco = -1;
-static gint ett_qpm = -1;
-static gint ett_coi = -1;
-static gint ett_qcc = -1;
-static gint ett_cp24time = -1;
-static gint ett_cp56time = -1;
-
-static expert_field ei_iec104_short_asdu = EI_INIT;
-static expert_field ei_iec104_apdu_min_len = EI_INIT;
-static expert_field ei_iec104_apdu_invalid_len = EI_INIT;
+static int hf_apdulen;
+static int hf_apcitype_i;
+static int hf_apcitype_s_u;
+static int hf_apciutype;
+static int hf_apcitx;
+static int hf_apcirx;
+static int hf_apcidata;
+
+static int hf_addr;
+static int hf_oa;
+static int hf_typeid;
+static int hf_causetx;
+static int hf_nega;
+static int hf_test;
+static int hf_ioa;
+static int hf_numix;
+static int hf_sq;
+static int hf_cp24time;
+static int hf_cp24time_ms;
+static int hf_cp24time_min;
+static int hf_cp24time_iv;
+static int hf_cp56time;
+static int hf_cp56time_ms;
+static int hf_cp56time_min;
+static int hf_cp56time_gen;
+static int hf_cp56time_iv;
+static int hf_cp56time_hour;
+static int hf_cp56time_su;
+static int hf_cp56time_day;
+static int hf_cp56time_dow;
+static int hf_cp56time_month;
+static int hf_cp56time_year;
+static int hf_siq;
+static int hf_siq_spi;
+static int hf_siq_bl;
+static int hf_siq_sb;
+static int hf_siq_nt;
+static int hf_siq_iv;
+static int hf_diq;
+static int hf_diq_dpi;
+static int hf_diq_bl;
+static int hf_diq_sb;
+static int hf_diq_nt;
+static int hf_diq_iv;
+static int hf_qds;
+static int hf_qds_ov;
+static int hf_qds_bl;
+static int hf_qds_sb;
+static int hf_qds_nt;
+static int hf_qds_iv;
+static int hf_vti;
+static int hf_vti_v;
+static int hf_vti_t;
+static int hf_qos;
+static int hf_qos_ql;
+static int hf_qos_se;
+static int hf_sco;
+static int hf_sco_on;
+static int hf_sco_qu;
+static int hf_sco_se;
+static int hf_dco;
+static int hf_dco_on;
+static int hf_dco_qu;
+static int hf_dco_se;
+static int hf_rco;
+static int hf_rco_up;
+static int hf_rco_qu;
+static int hf_rco_se;
+static int hf_qpm;
+static int hf_qpm_kpa;
+static int hf_qpm_lpc;
+static int hf_qpm_pop;
+static int hf_coi;
+static int hf_coi_r;
+static int hf_coi_i;
+static int hf_qoi;
+static int hf_qcc;
+static int hf_qcc_rqt;
+static int hf_qcc_frz;
+static int hf_qrp;
+static int hf_bcr;
+static int hf_bcr_count;
+static int hf_bcr_sq;
+static int hf_bcr_cy;
+static int hf_bcr_ca;
+static int hf_bcr_iv;
+static int hf_start;
+
+static int hf_asdu_bitstring;
+static int hf_asdu_float;
+static int hf_asdu_normval;
+static int hf_asdu_scalval;
+static int hf_asdu_raw_data;
+
+static gint ett_apci;
+static gint ett_asdu;
+static gint ett_asdu_objects;
+static gint ett_siq;
+static gint ett_diq;
+static gint ett_vti;
+static gint ett_qds;
+static gint ett_qos;
+static gint ett_sco;
+static gint ett_dco;
+static gint ett_rco;
+static gint ett_qpm;
+static gint ett_coi;
+static gint ett_qcc;
+static gint ett_cp24time;
+static gint ett_cp56time;
+
+static expert_field ei_iec104_short_asdu;
+static expert_field ei_iec104_apdu_min_len;
+static expert_field ei_iec104_apdu_invalid_len;
 
 /* IEC 101 stuff */
 /* Initialize the protocol and registered fields */
-static int hf_iec60870_101_frame                 = -1;
-static int hf_iec60870_101_length                = -1;
-static int hf_iec60870_101_num_user_octets       = -1;
-static int hf_iec60870_101_ctrlfield             = -1;
-static int hf_iec60870_101_ctrl_prm              = -1;
-static int hf_iec60870_101_ctrl_fcb              = -1;
-static int hf_iec60870_101_ctrl_fcv              = -1;
-static int hf_iec60870_101_ctrl_dfc              = -1;
-static int hf_iec60870_101_ctrl_func_pri_to_sec  = -1;
-static int hf_iec60870_101_ctrl_func_sec_to_pri  = -1;
-static int hf_iec60870_101_linkaddr              = -1;
-static int hf_iec60870_101_checksum              = -1;
-static int hf_iec60870_101_stopchar              = -1;
+static int hf_iec60870_101_frame;
+static int hf_iec60870_101_length;
+static int hf_iec60870_101_num_user_octets;
+static int hf_iec60870_101_ctrlfield;
+static int hf_iec60870_101_ctrl_prm;
+static int hf_iec60870_101_ctrl_fcb;
+static int hf_iec60870_101_ctrl_fcv;
+static int hf_iec60870_101_ctrl_dfc;
+static int hf_iec60870_101_ctrl_func_pri_to_sec;
+static int hf_iec60870_101_ctrl_func_sec_to_pri;
+static int hf_iec60870_101_linkaddr;
+static int hf_iec60870_101_checksum;
+static int hf_iec60870_101_stopchar;
 
 /* Initialize the subtree pointers */
-static gint ett_iec60870_101                     = -1;
-static gint ett_iec60870_101_ctrlfield           = -1;
+static gint ett_iec60870_101;
+static gint ett_iec60870_101_ctrlfield;
 
 /* Frame Format */
 #define IEC101_VAR_LEN        0x68
@@ -860,53 +860,53 @@ static const value_string iec60870_101_ctrl_func_sec_to_pri_values[] = {
 
 /* IEC 60870-5-103 Variables */
 /* Initialize the protocol and registered fields */
-static int hf_iec60870_5_103_areva_cmd             = -1;
-static int hf_iec60870_5_103_asdu_address          = -1;
-static int hf_iec60870_5_103_asdu_typeid_mon       = -1;
-static int hf_iec60870_5_103_asdu_typeid_ctrl      = -1;
-static int hf_iec60870_5_103_asdu205_ms            = -1;
-static int hf_iec60870_5_103_asdu205_min           = -1;
-static int hf_iec60870_5_103_asdu205_h             = -1;
-static int hf_iec60870_5_103_asdu205_value         = -1;
-static int hf_iec60870_5_103_checksum              = -1;
-static int hf_iec60870_5_103_col				   = -1;
-static int hf_iec60870_5_103_cot_mon               = -1;
-static int hf_iec60870_5_103_cot_ctrl              = -1;
-static int hf_iec60870_5_103_cp32time2a  		   = -1;
-static int hf_iec60870_5_103_cp32time2a_ms         = -1;
-static int hf_iec60870_5_103_cp32time2a_min        = -1;
-static int hf_iec60870_5_103_cp32time2a_res1       = -1;
-static int hf_iec60870_5_103_cp32time2a_iv         = -1;
-static int hf_iec60870_5_103_cp32time2a_hr         = -1;
-static int hf_iec60870_5_103_cp32time2a_res2       = -1;
-static int hf_iec60870_5_103_cp32time2a_sum        = -1;
-static int hf_iec60870_5_103_ctrlfield             = -1;
-static int hf_iec60870_5_103_ctrl_prm              = -1;
-static int hf_iec60870_5_103_ctrl_fcb              = -1;
-static int hf_iec60870_5_103_ctrl_fcv              = -1;
-static int hf_iec60870_5_103_ctrl_dfc              = -1;
-static int hf_iec60870_5_103_ctrl_func_pri_to_sec  = -1;
-static int hf_iec60870_5_103_ctrl_func_sec_to_pri  = -1;
-static int hf_iec60870_5_103_dco                   = -1;
-static int hf_iec60870_5_103_dpi                   = -1;
-static int hf_iec60870_5_103_frame                 = -1;
-static int hf_iec60870_5_103_func_type             = -1;
-static int hf_iec60870_5_103_info_num              = -1;
-static int hf_iec60870_5_103_length                = -1;
-static int hf_iec60870_5_103_linkaddr              = -1;
-static int hf_iec60870_5_103_mfg				   = -1;
-static int hf_iec60870_5_103_mfg_sw				   = -1;
-static int hf_iec60870_5_103_num_user_octets       = -1;
-static int hf_iec60870_5_103_rii                   = -1;
-static int hf_iec60870_5_103_scn				   = -1;
-static int hf_iec60870_5_103_sin				   = -1;
-static int hf_iec60870_5_103_sq		               = -1;
-static int hf_iec60870_5_103_stopchar              = -1;
+static int hf_iec60870_5_103_areva_cmd;
+static int hf_iec60870_5_103_asdu_address;
+static int hf_iec60870_5_103_asdu_typeid_mon;
+static int hf_iec60870_5_103_asdu_typeid_ctrl;
+static int hf_iec60870_5_103_asdu205_ms;
+static int hf_iec60870_5_103_asdu205_min;
+static int hf_iec60870_5_103_asdu205_h;
+static int hf_iec60870_5_103_asdu205_value;
+static int hf_iec60870_5_103_checksum;
+static int hf_iec60870_5_103_col;
+static int hf_iec60870_5_103_cot_mon;
+static int hf_iec60870_5_103_cot_ctrl;
+static int hf_iec60870_5_103_cp32time2a;
+static int hf_iec60870_5_103_cp32time2a_ms;
+static int hf_iec60870_5_103_cp32time2a_min;
+static int hf_iec60870_5_103_cp32time2a_res1;
+static int hf_iec60870_5_103_cp32time2a_iv;
+static int hf_iec60870_5_103_cp32time2a_hr;
+static int hf_iec60870_5_103_cp32time2a_res2;
+static int hf_iec60870_5_103_cp32time2a_sum;
+static int hf_iec60870_5_103_ctrlfield;
+static int hf_iec60870_5_103_ctrl_prm;
+static int hf_iec60870_5_103_ctrl_fcb;
+static int hf_iec60870_5_103_ctrl_fcv;
+static int hf_iec60870_5_103_ctrl_dfc;
+static int hf_iec60870_5_103_ctrl_func_pri_to_sec;
+static int hf_iec60870_5_103_ctrl_func_sec_to_pri;
+static int hf_iec60870_5_103_dco;
+static int hf_iec60870_5_103_dpi;
+static int hf_iec60870_5_103_frame;
+static int hf_iec60870_5_103_func_type;
+static int hf_iec60870_5_103_info_num;
+static int hf_iec60870_5_103_length;
+static int hf_iec60870_5_103_linkaddr;
+static int hf_iec60870_5_103_mfg;
+static int hf_iec60870_5_103_mfg_sw;
+static int hf_iec60870_5_103_num_user_octets;
+static int hf_iec60870_5_103_rii;
+static int hf_iec60870_5_103_scn;
+static int hf_iec60870_5_103_sin;
+static int hf_iec60870_5_103_sq;
+static int hf_iec60870_5_103_stopchar;
 
 /* Initialize the subtree pointers */
-static gint ett_iec60870_5_103                     = -1;
-static gint ett_iec60870_5_103_ctrlfield           = -1;
-static gint ett_iec60870_5_103_cp32time2a          = -1;
+static gint ett_iec60870_5_103;
+static gint ett_iec60870_5_103_ctrlfield;
+static gint ett_iec60870_5_103_cp32time2a;
 
 /* Frame Format */
 #define IEC103_VAR_LEN        0x68
diff --git a/epan/dissectors/packet-ieee1609dot2.c b/epan/dissectors/packet-ieee1609dot2.c
index 1e08e5fefe..8ef20371e0 100644
--- a/epan/dissectors/packet-ieee1609dot2.c
+++ b/epan/dissectors/packet-ieee1609dot2.c
@@ -40,7 +40,7 @@ void proto_register_ieee1609dot2(void);
 void proto_reg_handoff_ieee1609dot2(void);
 
 /* Initialize the protocol and registered fields */
-int proto_ieee1609dot2 = -1;
+int proto_ieee1609dot2;
 dissector_handle_t proto_ieee1609dot2_handle = NULL;
 static int hf_ieee1609dot2_SecuredCrl_PDU;        /* SecuredCrl */
 static int hf_ieee1609dot2_Ieee1609Dot2Data_PDU;  /* Ieee1609Dot2Data */
diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c
index e7a9b5f1b5..9f73a45f46 100644
--- a/epan/dissectors/packet-ieee1722.c
+++ b/epan/dissectors/packet-ieee1722.c
@@ -344,17 +344,17 @@ static const range_string subtype_range_rvals[] = {
 };
 
 /* Initialize the protocol and registered fields          */
-static int proto_1722 = -1;
-static int hf_1722_encap_seqnum = -1;
-static int hf_1722_subtype = -1;
-static int hf_1722_svfield = -1;
-static int hf_1722_verfield = -1;
+static int proto_1722;
+static int hf_1722_encap_seqnum;
+static int hf_1722_subtype;
+static int hf_1722_svfield;
+static int hf_1722_verfield;
 
 /* Initialize the subtree pointers */
-static int ett_1722 = -1;
+static int ett_1722;
 
-static expert_field ei_1722_encap_seqnum_dup = EI_INIT;
-static expert_field ei_1722_encap_seqnum_ooo = EI_INIT;
+static expert_field ei_1722_encap_seqnum_dup;
+static expert_field ei_1722_encap_seqnum_ooo;
 
 static dissector_table_t avb_dissector_table;
 
@@ -445,60 +445,60 @@ static const range_string syt_rvals [] = {
 };
 
 /* Initialize the protocol and registered fields          */
-static int proto_1722_61883 = -1;
-static int hf_1722_61883_mrfield = -1;
-static int hf_1722_61883_gvfield = -1;
-static int hf_1722_61883_tvfield = -1;
-static int hf_1722_61883_seqnum = -1;
-static int hf_1722_61883_tufield = -1;
-static int hf_1722_61883_stream_id = -1;
-static int hf_1722_61883_avtp_timestamp = -1;
-static int hf_1722_61883_gateway_info = -1;
-static int hf_1722_61883_stream_data_length = -1;
-static int hf_1722_61883_tag = -1;
-static int hf_1722_61883_channel = -1;
-static int hf_1722_61883_tcode = -1;
-static int hf_1722_61883_sy = -1;
-static int hf_1722_61883_cip_qi1 = -1;
-static int hf_1722_61883_cip_sid = -1;
-static int hf_1722_61883_cip_dbs = -1;
-static int hf_1722_61883_cip_fn = -1;
-static int hf_1722_61883_cip_qpc = -1;
-static int hf_1722_61883_cip_sph = -1;
-static int hf_1722_61883_cip_dbc = -1;
-static int hf_1722_61883_cip_qi2 = -1;
-static int hf_1722_61883_cip_fmt = -1;
-static int hf_1722_61883_cip_fdf_no_syt = -1;
-static int hf_1722_61883_cip_fdf_tsf = -1;
-static int hf_1722_61883_cip_fdf = -1;
-static int hf_1722_61883_cip_syt = -1;
-static int hf_1722_61883_audio_data = -1;
-static int hf_1722_61883_label = -1;
-static int hf_1722_61883_sample = -1;
-static int hf_1722_61883_video_data = -1;
-static int hf_1722_61883_source_packet_header_timestamp = -1;
+static int proto_1722_61883;
+static int hf_1722_61883_mrfield;
+static int hf_1722_61883_gvfield;
+static int hf_1722_61883_tvfield;
+static int hf_1722_61883_seqnum;
+static int hf_1722_61883_tufield;
+static int hf_1722_61883_stream_id;
+static int hf_1722_61883_avtp_timestamp;
+static int hf_1722_61883_gateway_info;
+static int hf_1722_61883_stream_data_length;
+static int hf_1722_61883_tag;
+static int hf_1722_61883_channel;
+static int hf_1722_61883_tcode;
+static int hf_1722_61883_sy;
+static int hf_1722_61883_cip_qi1;
+static int hf_1722_61883_cip_sid;
+static int hf_1722_61883_cip_dbs;
+static int hf_1722_61883_cip_fn;
+static int hf_1722_61883_cip_qpc;
+static int hf_1722_61883_cip_sph;
+static int hf_1722_61883_cip_dbc;
+static int hf_1722_61883_cip_qi2;
+static int hf_1722_61883_cip_fmt;
+static int hf_1722_61883_cip_fdf_no_syt;
+static int hf_1722_61883_cip_fdf_tsf;
+static int hf_1722_61883_cip_fdf;
+static int hf_1722_61883_cip_syt;
+static int hf_1722_61883_audio_data;
+static int hf_1722_61883_label;
+static int hf_1722_61883_sample;
+static int hf_1722_61883_video_data;
+static int hf_1722_61883_source_packet_header_timestamp;
 
 /* Initialize the subtree pointers */
-static int ett_1722_61883 = -1;
-static int ett_1722_61883_audio = -1;
-static int ett_1722_61883_sample = -1;
-static int ett_1722_61883_video = -1;
+static int ett_1722_61883;
+static int ett_1722_61883_audio;
+static int ett_1722_61883_sample;
+static int ett_1722_61883_video;
 
 /* Initialize expert fields */
-static expert_field ei_1722_61883_incorrect_tag = EI_INIT;
-static expert_field ei_1722_61883_incorrect_tcode = EI_INIT;
-static expert_field ei_1722_61883_incorrect_qi1 = EI_INIT;
-static expert_field ei_1722_61883_incorrect_qpc = EI_INIT;
-static expert_field ei_1722_61883_incorrect_qi2 = EI_INIT;
-static expert_field ei_1722_61883_unknown_format = EI_INIT;
-static expert_field ei_1722_61883_incorrect_channel_sid = EI_INIT;
-static expert_field ei_1722_61883_incorrect_datalen = EI_INIT;
-static expert_field ei_1722_61883_4_incorrect_cip_fn = EI_INIT;
-static expert_field ei_1722_61883_4_incorrect_cip_dbs = EI_INIT;
-static expert_field ei_1722_61883_4_incorrect_cip_sph = EI_INIT;
-static expert_field ei_1722_61883_6_incorrect_cip_fn = EI_INIT;
-static expert_field ei_1722_61883_6_incorrect_cip_sph = EI_INIT;
-static expert_field ei_1722_61883_incorrect_cip_fdf = EI_INIT;
+static expert_field ei_1722_61883_incorrect_tag;
+static expert_field ei_1722_61883_incorrect_tcode;
+static expert_field ei_1722_61883_incorrect_qi1;
+static expert_field ei_1722_61883_incorrect_qpc;
+static expert_field ei_1722_61883_incorrect_qi2;
+static expert_field ei_1722_61883_unknown_format;
+static expert_field ei_1722_61883_incorrect_channel_sid;
+static expert_field ei_1722_61883_incorrect_datalen;
+static expert_field ei_1722_61883_4_incorrect_cip_fn;
+static expert_field ei_1722_61883_4_incorrect_cip_dbs;
+static expert_field ei_1722_61883_4_incorrect_cip_sph;
+static expert_field ei_1722_61883_6_incorrect_cip_fn;
+static expert_field ei_1722_61883_6_incorrect_cip_sph;
+static expert_field ei_1722_61883_incorrect_cip_fdf;
 
 /**************************************************************************************************/
 /* subtype AAF                                                                                    */
@@ -538,35 +538,35 @@ static const value_string aaf_sparse_timestamp_vals [] = {
 };
 
 /* Initialize the protocol and registered fields          */
-static int proto_1722_aaf = -1;
-static int hf_1722_aaf_mrfield = -1;
-static int hf_1722_aaf_tvfield = -1;
-static int hf_1722_aaf_seqnum = -1;
-static int hf_1722_aaf_tufield = -1;
-static int hf_1722_aaf_stream_id = -1;
-static int hf_1722_aaf_avtp_timestamp = -1;
-static int hf_1722_aaf_format = -1;
-static int hf_1722_aaf_nominal_sample_rate = -1;
-static int hf_1722_aaf_bit_depth = -1;
-static int hf_1722_aaf_stream_data_length = -1;
-static int hf_1722_aaf_sparse_timestamp = -1;
-static int hf_1722_aaf_evtfield = -1;
-static int hf_1722_aaf_reserved = -1;
-static int hf_1722_aaf_channels_per_frame = -1;
-static int hf_1722_aaf_data = -1;
-static int hf_1722_aaf_sample = -1;
+static int proto_1722_aaf;
+static int hf_1722_aaf_mrfield;
+static int hf_1722_aaf_tvfield;
+static int hf_1722_aaf_seqnum;
+static int hf_1722_aaf_tufield;
+static int hf_1722_aaf_stream_id;
+static int hf_1722_aaf_avtp_timestamp;
+static int hf_1722_aaf_format;
+static int hf_1722_aaf_nominal_sample_rate;
+static int hf_1722_aaf_bit_depth;
+static int hf_1722_aaf_stream_data_length;
+static int hf_1722_aaf_sparse_timestamp;
+static int hf_1722_aaf_evtfield;
+static int hf_1722_aaf_reserved;
+static int hf_1722_aaf_channels_per_frame;
+static int hf_1722_aaf_data;
+static int hf_1722_aaf_sample;
 
 /* Initialize the subtree pointers */
-static int ett_1722_aaf = -1;
-static int ett_1722_aaf_audio = -1;
-static int ett_1722_aaf_sample = -1;
+static int ett_1722_aaf;
+static int ett_1722_aaf_audio;
+static int ett_1722_aaf_sample;
 
 /* Initialize expert fields */
-static expert_field ei_aaf_sample_width = EI_INIT;
-static expert_field ei_aaf_reserved_format = EI_INIT;
-static expert_field ei_aaf_aes3_format = EI_INIT;
-static expert_field ei_aaf_channels_per_frame = EI_INIT;
-static expert_field ei_aaf_incorrect_bit_depth = EI_INIT;
+static expert_field ei_aaf_sample_width;
+static expert_field ei_aaf_reserved_format;
+static expert_field ei_aaf_aes3_format;
+static expert_field ei_aaf_channels_per_frame;
+static expert_field ei_aaf_incorrect_bit_depth;
 
 /**************************************************************************************************/
 /* subtype CRF                                                                                    */
@@ -594,26 +594,26 @@ static const range_string crf_type_range_rvals [] = {
 };
 
 /* Initialize the protocol and registered fields          */
-static int proto_1722_crf = -1;
-static int hf_1722_crf_mrfield = -1;
-static int hf_1722_crf_fsfield = -1;
-static int hf_1722_crf_tufield = -1;
-static int hf_1722_crf_seqnum = -1;
-static int hf_1722_crf_type = -1;
-static int hf_1722_crf_stream_id = -1;
-static int hf_1722_crf_pull = -1;
-static int hf_1722_crf_base_frequency = -1;
-static int hf_1722_crf_data_length = -1;
-static int hf_1722_crf_timestamp_interval = -1;
-static int hf_1722_crf_timestamp_data = -1;
-static int hf_1722_crf_timestamp = -1;
+static int proto_1722_crf;
+static int hf_1722_crf_mrfield;
+static int hf_1722_crf_fsfield;
+static int hf_1722_crf_tufield;
+static int hf_1722_crf_seqnum;
+static int hf_1722_crf_type;
+static int hf_1722_crf_stream_id;
+static int hf_1722_crf_pull;
+static int hf_1722_crf_base_frequency;
+static int hf_1722_crf_data_length;
+static int hf_1722_crf_timestamp_interval;
+static int hf_1722_crf_timestamp_data;
+static int hf_1722_crf_timestamp;
 
 /* Initialize the subtree pointers */
-static int ett_1722_crf = -1;
-static int ett_1722_crf_timestamp = -1;
+static int ett_1722_crf;
+static int ett_1722_crf_timestamp;
 
 /* Initialize expert fields */
-static expert_field ei_crf_datalen = EI_INIT;
+static expert_field ei_crf_datalen;
 
 /**************************************************************************************************/
 /* subtype CVF                                                                                    */
@@ -636,28 +636,28 @@ static const range_string cvf_format_subtype_range_rvals [] = {
 
 /* Initialize the protocol and registered fields          */
 
-static int proto_1722_cvf = -1;
-static int hf_1722_cvf_mrfield = -1;
-static int hf_1722_cvf_tvfield = -1;
-static int hf_1722_cvf_seqnum = -1;
-static int hf_1722_cvf_tufield = -1;
-static int hf_1722_cvf_stream_id = -1;
-static int hf_1722_cvf_avtp_timestamp = -1;
-static int hf_1722_cvf_format = -1;
-static int hf_1722_cvf_format_subtype = -1;
-static int hf_1722_cvf_stream_data_length = -1;
-static int hf_1722_cvf_evtfield = -1;
-static int hf_1722_cvf_marker_bit = -1;
-static int hf_1722_cvf_h264_ptvfield = -1;
-static int hf_1722_cvf_h264_timestamp = -1;
+static int proto_1722_cvf;
+static int hf_1722_cvf_mrfield;
+static int hf_1722_cvf_tvfield;
+static int hf_1722_cvf_seqnum;
+static int hf_1722_cvf_tufield;
+static int hf_1722_cvf_stream_id;
+static int hf_1722_cvf_avtp_timestamp;
+static int hf_1722_cvf_format;
+static int hf_1722_cvf_format_subtype;
+static int hf_1722_cvf_stream_data_length;
+static int hf_1722_cvf_evtfield;
+static int hf_1722_cvf_marker_bit;
+static int hf_1722_cvf_h264_ptvfield;
+static int hf_1722_cvf_h264_timestamp;
 
 /* Initialize the subtree pointers */
-static int ett_1722_cvf = -1;
+static int ett_1722_cvf;
 
 /* Initialize expert fields */
-static expert_field ei_cvf_jpeg2000_format = EI_INIT;
-static expert_field ei_cvf_reserved_format = EI_INIT;
-static expert_field ei_cvf_invalid_data_length = EI_INIT;
+static expert_field ei_cvf_jpeg2000_format;
+static expert_field ei_cvf_reserved_format;
+static expert_field ei_cvf_invalid_data_length;
 
 /**************************************************************************************************/
 /* subtype NTSCF                                                                                  */
@@ -665,18 +665,18 @@ static expert_field ei_cvf_invalid_data_length = EI_INIT;
 /**************************************************************************************************/
 
 /* Initialize the protocol and registered fields          */
-static int proto_1722_ntscf = -1;
-static int hf_1722_ntscf_rfield = -1;
-static int hf_1722_ntscf_data_length = -1;
-static int hf_1722_ntscf_seqnum = -1;
-static int hf_1722_ntscf_stream_id = -1;
+static int proto_1722_ntscf;
+static int hf_1722_ntscf_rfield;
+static int hf_1722_ntscf_data_length;
+static int hf_1722_ntscf_seqnum;
+static int hf_1722_ntscf_stream_id;
 
 /* Initialize the subtree pointers */
-static int ett_1722_ntscf = -1;
+static int ett_1722_ntscf;
 
 /* Initialize expert fields */
-static expert_field ei_1722_ntscf_no_space_for_header = EI_INIT;
-static expert_field ei_1722_ntscf_invalid_data_length = EI_INIT;
+static expert_field ei_1722_ntscf_no_space_for_header;
+static expert_field ei_1722_ntscf_invalid_data_length;
 
 /**************************************************************************************************/
 /* subtype TSCF                                                                                   */
@@ -684,27 +684,27 @@ static expert_field ei_1722_ntscf_invalid_data_length = EI_INIT;
 /**************************************************************************************************/
 
 /* Initialize the protocol and registered fields          */
-static int proto_1722_tscf = -1;
-static int hf_1722_tscf_mr = -1;
-static int hf_1722_tscf_rsv1 = -1;
-static int hf_1722_tscf_tv = -1;
-static int hf_1722_tscf_seqnum = -1;
-static int hf_1722_tscf_rsv2 = -1;
-static int hf_1722_tscf_tu = -1;
-static int hf_1722_tscf_stream_id = -1;
-static int hf_1722_tscf_avtp_timestamp = -1;
-static int hf_1722_tscf_rsv3 = -1;
-static int hf_1722_tscf_data_length = -1;
-static int hf_1722_tscf_rsv4 = -1;
+static int proto_1722_tscf;
+static int hf_1722_tscf_mr;
+static int hf_1722_tscf_rsv1;
+static int hf_1722_tscf_tv;
+static int hf_1722_tscf_seqnum;
+static int hf_1722_tscf_rsv2;
+static int hf_1722_tscf_tu;
+static int hf_1722_tscf_stream_id;
+static int hf_1722_tscf_avtp_timestamp;
+static int hf_1722_tscf_rsv3;
+static int hf_1722_tscf_data_length;
+static int hf_1722_tscf_rsv4;
 
 /* Initialize the subtree pointers */
-static int ett_1722_tscf = -1;
-static int ett_1722_tscf_flags = -1;
-static int ett_1722_tscf_tu = -1;
+static int ett_1722_tscf;
+static int ett_1722_tscf_flags;
+static int ett_1722_tscf_tu;
 
 /* Initialize expert fields */
-static expert_field ei_1722_tscf_no_space_for_header = EI_INIT;
-static expert_field ei_1722_tscf_invalid_data_length = EI_INIT;
+static expert_field ei_1722_tscf_no_space_for_header;
+static expert_field ei_1722_tscf_invalid_data_length;
 
 
 /**************************************************************************************************/
@@ -731,17 +731,17 @@ static const range_string acf_msg_type_range_rvals [] = {
 };
 
 /* Initialize the protocol and registered fields          */
-static int proto_1722_acf = -1;
-static int hf_1722_acf_msg_type = -1;
-static int hf_1722_acf_msg_length = -1;
+static int proto_1722_acf;
+static int hf_1722_acf_msg_type;
+static int hf_1722_acf_msg_length;
 
 /* Initialize the subtree pointers */
-static int ett_1722_acf = -1;
-static int ett_1722_acf_header = -1;
+static int ett_1722_acf;
+static int ett_1722_acf_header;
 
 /* Initialize expert fields */
-static expert_field ei_1722_acf_invalid_msg_length = EI_INIT;
-static expert_field ei_1722_acf_message_is_cropped = EI_INIT;
+static expert_field ei_1722_acf_invalid_msg_length;
+static expert_field ei_1722_acf_message_is_cropped;
 
 /* Dissector handles */
 static dissector_handle_t  avb1722_acf_handle;
@@ -764,42 +764,42 @@ typedef struct {
 } acf_can_t;
 
 /* Initialize the protocol and registered fields          */
-static int proto_1722_acf_can = -1;
-static int hf_1722_can_flags = -1;
-static int hf_1722_can_pad = -1;
-static int hf_1722_can_len = -1;
-static int hf_1722_can_mtvfield = -1;
-static int hf_1722_can_rtrfield = -1;
-static int hf_1722_can_efffield = -1;
-static int hf_1722_can_brsfield = -1;
-static int hf_1722_can_fdffield = -1;
-static int hf_1722_can_esifield = -1;
-static int hf_1722_can_rsv1 = -1;
-static int hf_1722_can_bus_id = -1;
-static int hf_1722_can_message_timestamp = -1;
-static int hf_1722_can_rsv2 = -1;
-static int hf_1722_can_identifier = -1;
-static int hf_1722_can_padding = -1;
+static int proto_1722_acf_can;
+static int hf_1722_can_flags;
+static int hf_1722_can_pad;
+static int hf_1722_can_len;
+static int hf_1722_can_mtvfield;
+static int hf_1722_can_rtrfield;
+static int hf_1722_can_efffield;
+static int hf_1722_can_brsfield;
+static int hf_1722_can_fdffield;
+static int hf_1722_can_esifield;
+static int hf_1722_can_rsv1;
+static int hf_1722_can_bus_id;
+static int hf_1722_can_message_timestamp;
+static int hf_1722_can_rsv2;
+static int hf_1722_can_identifier;
+static int hf_1722_can_padding;
 
 /* Initialize the subtree pointers */
-static int ett_can = -1;
-static int ett_1722_can = -1;
-static int ett_1722_can_flags = -1;
-static int ett_1722_can_bus_id = -1;
-static int ett_1722_can_msg_id = -1;
+static int ett_can;
+static int ett_1722_can;
+static int ett_1722_can_flags;
+static int ett_1722_can_bus_id;
+static int ett_1722_can_msg_id;
 
 /* Initialize expert fields */
-static expert_field ei_1722_can_header_cropped = EI_INIT;
-static expert_field ei_1722_can_invalid_message_id = EI_INIT;
-static expert_field ei_1722_can_invalid_payload_length = EI_INIT;
-static expert_field ei_1722_canfd_invalid_payload_length = EI_INIT;
+static expert_field ei_1722_can_header_cropped;
+static expert_field ei_1722_can_invalid_message_id;
+static expert_field ei_1722_can_invalid_payload_length;
+static expert_field ei_1722_canfd_invalid_payload_length;
 
 /* Dissector handles */
 static dissector_handle_t avb1722_can_brief_handle;
 static dissector_handle_t avb1722_can_handle;
 
-static int                      proto_can = -1;
-static int                      proto_canfd = -1;
+static int                      proto_can;
+static int                      proto_canfd;
 static gboolean                 can_heuristic_first = FALSE;
 
 /**************************************************************************************************/
@@ -808,21 +808,21 @@ static gboolean                 can_heuristic_first = FALSE;
 /**************************************************************************************************/
 
 /* Initialize the protocol and registered fields          */
-static int proto_1722_acf_lin = -1;
-static int hf_1722_lin_pad = -1;
-static int hf_1722_lin_mtv = -1;
-static int hf_1722_lin_bus_id = -1;
-static int hf_1722_lin_identifier = -1;
-static int hf_1722_lin_message_timestamp = -1;
-static int hf_1722_lin_padding = -1;
+static int proto_1722_acf_lin;
+static int hf_1722_lin_pad;
+static int hf_1722_lin_mtv;
+static int hf_1722_lin_bus_id;
+static int hf_1722_lin_identifier;
+static int hf_1722_lin_message_timestamp;
+static int hf_1722_lin_padding;
 
 /* Initialize the subtree pointers */
-static int ett_1722_lin = -1;
-static int ett_1722_lin_flags = -1;
+static int ett_1722_lin;
+static int ett_1722_lin_flags;
 
 /* Initialize expert fields */
-static expert_field ei_1722_lin_header_cropped = EI_INIT;
-static expert_field ei_1722_lin_invalid_payload_length = EI_INIT;
+static expert_field ei_1722_lin_header_cropped;
+static expert_field ei_1722_lin_invalid_payload_length;
 
 static dissector_table_t avb1722_acf_lin_dissector_table;
 
diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c
index 207f348222..078b06da7e 100644
--- a/epan/dissectors/packet-ieee17221.c
+++ b/epan/dissectors/packet-ieee17221.c
@@ -1867,97 +1867,97 @@ static const value_string aecp_sampling_rate_pull_field_vals[] = {
 /**********************************************************/
 /* Initialize the protocol and registered fields          */
 /**********************************************************/
-static int proto_17221 = -1;
+static int proto_17221;
 
 /* AVDECC Discovery Protocol Data Unit (ADPDU) */
-static int hf_adp_message_type = -1;
-static int hf_adp_valid_time = -1;
-static int hf_adp_cd_length = -1;
-static int hf_adp_entity_id = -1;
-static int hf_adp_entity_model_id = -1;
-static int hf_adp_entity_cap = -1;
-static int hf_adp_talker_stream_srcs = -1;
-static int hf_adp_talker_cap = -1;
-static int hf_adp_listener_stream_sinks = -1;
-static int hf_adp_listener_cap = -1;
-static int hf_adp_controller_cap = -1;
-static int hf_adp_avail_index = -1;
-static int hf_adp_gptp_gm_id = -1;
-/* static int hf_adp_def_aud_format = -1; */
-/* static int hf_adp_def_vid_format = -1; */
-static int hf_adp_assoc_id = -1;
-/* static int hf_adp_entity_type = -1; */
+static int hf_adp_message_type;
+static int hf_adp_valid_time;
+static int hf_adp_cd_length;
+static int hf_adp_entity_id;
+static int hf_adp_entity_model_id;
+static int hf_adp_entity_cap;
+static int hf_adp_talker_stream_srcs;
+static int hf_adp_talker_cap;
+static int hf_adp_listener_stream_sinks;
+static int hf_adp_listener_cap;
+static int hf_adp_controller_cap;
+static int hf_adp_avail_index;
+static int hf_adp_gptp_gm_id;
+/* static int hf_adp_def_aud_format; */
+/* static int hf_adp_def_vid_format; */
+static int hf_adp_assoc_id;
+/* static int hf_adp_entity_type; */
 
 /* Entity Capabilties Flags */
-static int hf_adp_entity_cap_efu_mode = -1;
-static int hf_adp_entity_cap_address_access_supported = -1;
-static int hf_adp_entity_cap_gateway_entity = -1;
-static int hf_adp_entity_cap_aem_supported = -1;
-static int hf_adp_entity_cap_legacy_avc = -1;
-static int hf_adp_entity_cap_assoc_id_support = -1;
-static int hf_adp_entity_cap_assoc_id_valid = -1;
-static int hf_adp_entity_cap_vendor_unique = -1;
-static int hf_adp_entity_cap_class_a_supported = -1;
-static int hf_adp_entity_cap_class_b_supported = -1;
-static int hf_adp_entity_cap_gptp_supported = -1;
+static int hf_adp_entity_cap_efu_mode;
+static int hf_adp_entity_cap_address_access_supported;
+static int hf_adp_entity_cap_gateway_entity;
+static int hf_adp_entity_cap_aem_supported;
+static int hf_adp_entity_cap_legacy_avc;
+static int hf_adp_entity_cap_assoc_id_support;
+static int hf_adp_entity_cap_assoc_id_valid;
+static int hf_adp_entity_cap_vendor_unique;
+static int hf_adp_entity_cap_class_a_supported;
+static int hf_adp_entity_cap_class_b_supported;
+static int hf_adp_entity_cap_gptp_supported;
 
 /* Talker Capabilities Flags */
-static int hf_adp_talk_cap_implement = -1;
-static int hf_adp_talk_cap_other_src = -1;
-static int hf_adp_talk_cap_control_src = -1;
-static int hf_adp_talk_cap_media_clk_src = -1;
-static int hf_adp_talk_cap_smpte_src = -1;
-static int hf_adp_talk_cap_midi_src = -1;
-static int hf_adp_talk_cap_audio_src = -1;
-static int hf_adp_talk_cap_video_src = -1;
+static int hf_adp_talk_cap_implement;
+static int hf_adp_talk_cap_other_src;
+static int hf_adp_talk_cap_control_src;
+static int hf_adp_talk_cap_media_clk_src;
+static int hf_adp_talk_cap_smpte_src;
+static int hf_adp_talk_cap_midi_src;
+static int hf_adp_talk_cap_audio_src;
+static int hf_adp_talk_cap_video_src;
 
 /* Listener Capabilities Flags */
-static int hf_adp_list_cap_implement = -1;
-static int hf_adp_list_cap_other_sink = -1;
-static int hf_adp_list_cap_control_sink = -1;
-static int hf_adp_list_cap_media_clk_sink = -1;
-static int hf_adp_list_cap_smpte_sink = -1;
-static int hf_adp_list_cap_midi_sink = -1;
-static int hf_adp_list_cap_audio_sink = -1;
-static int hf_adp_list_cap_video_sink = -1;
+static int hf_adp_list_cap_implement;
+static int hf_adp_list_cap_other_sink;
+static int hf_adp_list_cap_control_sink;
+static int hf_adp_list_cap_media_clk_sink;
+static int hf_adp_list_cap_smpte_sink;
+static int hf_adp_list_cap_midi_sink;
+static int hf_adp_list_cap_audio_sink;
+static int hf_adp_list_cap_video_sink;
 
 /* Controller Capabilities Flags */
-static int hf_adp_cont_cap_implement = -1;
-static int hf_adp_cont_cap_layer3_proxy = -1;
+static int hf_adp_cont_cap_implement;
+static int hf_adp_cont_cap_layer3_proxy;
 
 #if 0
 /* Default Audio Format */
-static int hf_adp_def_aud_sample_rates = -1;
-static int hf_adp_def_aud_max_chan = -1;
-static int hf_adp_def_aud_saf_flag = -1;
-static int hf_adp_def_aud_float_flag = -1;
-static int hf_adp_def_aud_chan_formats = -1;
+static int hf_adp_def_aud_sample_rates;
+static int hf_adp_def_aud_max_chan;
+static int hf_adp_def_aud_saf_flag;
+static int hf_adp_def_aud_float_flag;
+static int hf_adp_def_aud_chan_formats;
 
 /* Default Audio Sample Rates */
-static int hf_adp_samp_rate_44k1 = -1;
-static int hf_adp_samp_rate_48k = -1;
-static int hf_adp_samp_rate_88k2 = -1;
-static int hf_adp_samp_rate_96k = -1;
-static int hf_adp_samp_rate_176k4 = -1;
-static int hf_adp_samp_rate_192k = -1;
+static int hf_adp_samp_rate_44k1;
+static int hf_adp_samp_rate_48k;
+static int hf_adp_samp_rate_88k2;
+static int hf_adp_samp_rate_96k;
+static int hf_adp_samp_rate_176k4;
+static int hf_adp_samp_rate_192k;
 
 /* Audio Channel Formats */
-static int hf_adp_chan_format_mono = -1;
-static int hf_adp_chan_format_2ch = -1;
-static int hf_adp_chan_format_3ch = -1;
-static int hf_adp_chan_format_4ch = -1;
-static int hf_adp_chan_format_5ch = -1;
-static int hf_adp_chan_format_6ch = -1;
-static int hf_adp_chan_format_7ch = -1;
-static int hf_adp_chan_format_8ch = -1;
-static int hf_adp_chan_format_10ch = -1;
-static int hf_adp_chan_format_12ch = -1;
-static int hf_adp_chan_format_14ch = -1;
-static int hf_adp_chan_format_16ch = -1;
-static int hf_adp_chan_format_18ch = -1;
-static int hf_adp_chan_format_20ch = -1;
-static int hf_adp_chan_format_22ch = -1;
-static int hf_adp_chan_format_24ch = -1;
+static int hf_adp_chan_format_mono;
+static int hf_adp_chan_format_2ch;
+static int hf_adp_chan_format_3ch;
+static int hf_adp_chan_format_4ch;
+static int hf_adp_chan_format_5ch;
+static int hf_adp_chan_format_6ch;
+static int hf_adp_chan_format_7ch;
+static int hf_adp_chan_format_8ch;
+static int hf_adp_chan_format_10ch;
+static int hf_adp_chan_format_12ch;
+static int hf_adp_chan_format_14ch;
+static int hf_adp_chan_format_16ch;
+static int hf_adp_chan_format_18ch;
+static int hf_adp_chan_format_20ch;
+static int hf_adp_chan_format_22ch;
+static int hf_adp_chan_format_24ch;
 #endif
 
 /* AECP Vendor Unique Protocol Dissector table */
@@ -1967,471 +1967,471 @@ static dissector_table_t vendor_unique_protocol_dissector_table;
 /*     AVDECC Enumeration and Control Protocol Data Unit (AECPDU)    */
 /* ***************************************************************** */
 
-static int hf_aecp_aa_count = -1;
-static int hf_aecp_aa_tlv_mode = -1;
-static int hf_aecp_aa_tlv_length = -1;
-static int hf_aecp_aa_tlv_address = -1;
-
-/* static int hf_aecp_address_type = -1; */
-static int hf_aecp_association_id = -1;
-static int hf_aecp_as_path_count = -1;
-static int hf_aecp_as_path_sequences = -1;
-static int ett_aecp_get_as_path_sequences = -1;
-static int hf_aecp_get_as_info_clock_id = -1;
-static int hf_aecp_auth_token = -1;
-static int hf_aecp_avb_interface_gptp_gm_changed_valid = -1;
-static int hf_aecp_avb_interface_gptp_gm_changed = -1;
-static int hf_aecp_avb_interface_link_up_valid = -1;
-static int hf_aecp_avb_interface_link_up = -1;
-static int hf_aecp_avb_interface_link_down_valid = -1;
-static int hf_aecp_avb_interface_link_down = -1;
-static int hf_aecp_avb_interface_packets_tx_valid = -1;
-static int hf_aecp_avb_interface_packets_tx = -1;
-static int hf_aecp_avb_interface_packets_rx_valid = -1;
-static int hf_aecp_avb_interface_packets_rx = -1;
-static int hf_aecp_avb_interface_rx_crc_error_valid = -1;
-static int hf_aecp_avb_interface_rx_crc_error = -1;
-static int hf_aecp_cd_length = -1;
-static int hf_aecp_clock_domain_locked_valid = -1;
-static int hf_aecp_clock_domain_locked = -1;
-static int hf_aecp_clock_domain_unlocked_valid = -1;
-static int hf_aecp_clock_domain_unlocked = -1;
-static int hf_aecp_clock_source_id = -1;
-static int hf_aecp_command_type = -1;
-static int hf_aecp_configuration = -1;
-static int hf_aecp_configuration_index = -1;
-static int hf_aecp_connected_flag = -1;
-/* static int hf_aecp_continued_flag = -1; */
-/* static int hf_aecp_control_admin_flag = -1; */
-/* static int hf_aecp_control_user_l1 = -1; */
-/* static int hf_aecp_control_user_l2 = -1; */
-/* static int hf_aecp_control_user_l3 = -1; */
-/* static int hf_aecp_control_user_l4 = -1; */
-static int hf_aecp_controller_guid = -1;
-/* static int hf_aecp_count = -1; */
-static int hf_aecp_descriptor_index = -1;
-static int hf_aecp_descriptor_type = -1;
-/* static int hf_aecp_descriptors = -1; */
-static int hf_aecp_dest_mac_valid_flag = -1;
-static int hf_aecp_entity_specific1 = -1;
-static int hf_aecp_entity_specific1_valid = -1;
-static int hf_aecp_entity_specific2 = -1;
-static int hf_aecp_entity_specific2_valid = -1;
-static int hf_aecp_entity_specific3 = -1;
-static int hf_aecp_entity_specific3_valid = -1;
-static int hf_aecp_entity_specific4 = -1;
-static int hf_aecp_entity_specific4_valid = -1;
-static int hf_aecp_entity_specific5 = -1;
-static int hf_aecp_entity_specific5_valid = -1;
-static int hf_aecp_entity_specific6 = -1;
-static int hf_aecp_entity_specific6_valid = -1;
-static int hf_aecp_entity_specific7 = -1;
-static int hf_aecp_entity_specific7_valid = -1;
-static int hf_aecp_entity_specific8 = -1;
-static int hf_aecp_entity_specific8_valid = -1;
-static int hf_aecp_flags_32 = -1;
-/* static int hf_aecp_ipv4_address = -1; */
-/* static int hf_aecp_ipv6_address = -1; */
-static int hf_aecp_key = -1;
-static int hf_aecp_key_eui = -1;
-static int hf_aecp_key_length = -1;
-/* static int hf_aecp_key_number = -1; */
-/* static int hf_aecp_key_part = -1; */
-static int hf_aecp_keychain_id = -1;
-static int hf_aecp_keychain_id_small = -1;
-static int hf_aecp_keychain_list_index = -1;
-static int hf_aecp_keychain_number_of_keys = -1;
-static int hf_aecp_keychain_number_of_lists = -1;
-static int hf_aecp_key_signature = -1;
-static int hf_aecp_key_type = -1;
-static int hf_aecp_locked_guid = -1;
-static int hf_aecp_mac_address = -1;
-static int hf_aecp_map_index = -1;
-/* static int hf_aecp_matrix_affected_item_count = -1; */
-static int hf_aecp_matrix_column = -1;
-static int hf_aecp_matrix_direction = -1;
-static int hf_aecp_matrix_item_offset = -1;
-static int hf_aecp_matrix_region_height = -1;
-static int hf_aecp_matrix_region_width = -1;
-static int hf_aecp_matrix_rep = -1;
-static int hf_aecp_matrix_row = -1;
-static int hf_aecp_matrix_value_count = -1;
-/* static int hf_aecp_media_format = -1; */
-/* static int hf_aecp_mem_obj_admin_flag = -1; */
-/* static int hf_aecp_mem_obj_settings_flag = -1; */
-static int hf_aecp_message_type = -1;
-static int hf_aecp_msrp_acc_lat_valid_flag = -1;
-static int hf_aecp_msrp_accumulated_latency = -1;
-static int hf_aecp_msrp_failure_bridge_id = -1;
-static int hf_aecp_msrp_failure_code = -1;
-static int hf_aecp_msrp_failure_valid_flag = -1;
-/* static int hf_aecp_stream_vlan_id = -1; */
-static int hf_aecp_name = -1;
-static int hf_aecp_name_index = -1;
-static int hf_aecp_number_of_maps = -1;
-static int hf_aecp_operation_id = -1;
-static int hf_aecp_operation_type = -1;
-static int hf_aecp_owner_guid = -1;
-static int hf_aecp_percent_complete = -1;
-static int hf_aecp_persistent_flag = -1;
-/* static int hf_aecp_private_key_read_flag = -1; */
-/* static int hf_aecp_private_key_write_flag = -1; */
-/* static int hf_aecp_public_key_write_flag = -1; */
-/* static int hf_aecp_query_id = -1; */
-/* static int hf_aecp_query_limit = -1; */
-/* static int hf_aecp_query_period = -1; */
-/* static int hf_aecp_query_type = -1; */
-static int hf_aecp_release_flag = -1;
-static int hf_aecp_sampling_rate_base_frequency = -1;
-static int hf_aecp_sampling_rate_pull = -1;
-static int hf_aecp_sequence_id = -1;
-static int hf_aecp_signal_index = -1;
-static int hf_aecp_signal_type = -1;
-static int hf_aecp_signal_output = -1;
-static int hf_aecp_stream_format = -1;
-static int hf_aecp_stream_format_valid_flag = -1;
-static int hf_aecp_stream_id_valid_flag = -1;
-static int hf_aecp_stream_input_early_timestamp_valid = -1;
-static int hf_aecp_stream_input_early_timestamp = -1;
-static int hf_aecp_stream_input_late_timestamp_valid = -1;
-static int hf_aecp_stream_input_late_timestamp = -1;
-static int hf_aecp_stream_input_media_locked_valid = -1;
-static int hf_aecp_stream_input_media_locked = -1;
-static int hf_aecp_stream_input_media_unlocked_valid = -1;
-static int hf_aecp_stream_input_media_unlocked = -1;
-static int hf_aecp_stream_input_media_reset_valid = -1;
-static int hf_aecp_stream_input_media_reset = -1;
-static int hf_aecp_stream_input_packets_rx_valid = -1;
-static int hf_aecp_stream_input_packets_rx = -1;
-static int hf_aecp_stream_input_packets_tx_valid = -1;
-static int hf_aecp_stream_input_packets_tx = -1;
-static int hf_aecp_stream_input_seq_num_mismatch_valid = -1;
-static int hf_aecp_stream_input_seq_num_mismatch = -1;
-static int hf_aecp_stream_input_stream_reset_valid = -1;
-static int hf_aecp_stream_input_stream_reset = -1;
-static int hf_aecp_stream_input_timestamp_uncertain_valid = -1;
-static int hf_aecp_stream_input_timestamp_uncertain = -1;
-static int hf_aecp_stream_input_timestamp_valid_valid = -1;
-static int hf_aecp_stream_input_timestamp_valid = -1;
-static int hf_aecp_stream_input_timestamp_not_valid_valid = -1;
-static int hf_aecp_stream_input_timestamp_not_valid = -1;
-static int hf_aecp_stream_input_unsupported_format_valid = -1;
-static int hf_aecp_stream_input_unsupported_format = -1;
-static int hf_aecp_stream_vlan_id_valid_flag = -1;
-static int hf_aecp_target_guid  = -1;
-static int hf_aecp_token_length = -1;
-static int hf_aecp_u_flag = -1;
-static int hf_aecp_unlock_flag = -1;
-/* static int hf_aecp_values = -1; */
-/* static int hf_aecp_values_count = -1; */
-static int hf_aecp_vendor_unique_protocol_id = -1;
-static int hf_aecp_video_format = -1;
-static int hf_aecp_status_code = -1;
-static int hf_aecp_backup_talker_entity_id_0 = -1;
-static int hf_aecp_backup_talker_entity_id_1 = -1;
-static int hf_aecp_backup_talker_entity_id_2 = -1;
-static int hf_aecp_backup_talker_unique_id_0 = -1;
-static int hf_aecp_backup_talker_unique_id_1 = -1;
-static int hf_aecp_backup_talker_unique_id_2 = -1;
-static int hf_aecp_backedup_talker_entity_id = -1;
-static int hf_aecp_backedup_talker_unique_id = -1;
-static int hf_aecp_avb_info_ptp_grandmaster_id = -1;
-static int hf_aecp_avb_info_propegation_delay = -1;
-static int hf_aecp_avb_info_gptp_domain_number = -1;
-/* static int hf_aecp_avb_info_flags = -1; */
-static int hf_aecp_as_capable_flag = -1;
-static int hf_aecp_gptp_enabled_flag = -1;
-static int hf_aecp_srp_enabled_flag = -1;
-static int hf_aecp_avb_info_msrp_mappings_count = -1;
-static int hf_aecp_avb_info_msrp_mappings = -1;
-static int hf_aecp_avb_info_msrp_mapping_traffic_class = -1;
-static int hf_aecp_avb_info_msrp_mapping_priority = -1;
-
-static int hf_aecp_get_avb_info_msrp_vlan_id = -1;
+static int hf_aecp_aa_count;
+static int hf_aecp_aa_tlv_mode;
+static int hf_aecp_aa_tlv_length;
+static int hf_aecp_aa_tlv_address;
+
+/* static int hf_aecp_address_type; */
+static int hf_aecp_association_id;
+static int hf_aecp_as_path_count;
+static int hf_aecp_as_path_sequences;
+static int ett_aecp_get_as_path_sequences;
+static int hf_aecp_get_as_info_clock_id;
+static int hf_aecp_auth_token;
+static int hf_aecp_avb_interface_gptp_gm_changed_valid;
+static int hf_aecp_avb_interface_gptp_gm_changed;
+static int hf_aecp_avb_interface_link_up_valid;
+static int hf_aecp_avb_interface_link_up;
+static int hf_aecp_avb_interface_link_down_valid;
+static int hf_aecp_avb_interface_link_down;
+static int hf_aecp_avb_interface_packets_tx_valid;
+static int hf_aecp_avb_interface_packets_tx;
+static int hf_aecp_avb_interface_packets_rx_valid;
+static int hf_aecp_avb_interface_packets_rx;
+static int hf_aecp_avb_interface_rx_crc_error_valid;
+static int hf_aecp_avb_interface_rx_crc_error;
+static int hf_aecp_cd_length;
+static int hf_aecp_clock_domain_locked_valid;
+static int hf_aecp_clock_domain_locked;
+static int hf_aecp_clock_domain_unlocked_valid;
+static int hf_aecp_clock_domain_unlocked;
+static int hf_aecp_clock_source_id;
+static int hf_aecp_command_type;
+static int hf_aecp_configuration;
+static int hf_aecp_configuration_index;
+static int hf_aecp_connected_flag;
+/* static int hf_aecp_continued_flag; */
+/* static int hf_aecp_control_admin_flag; */
+/* static int hf_aecp_control_user_l1; */
+/* static int hf_aecp_control_user_l2; */
+/* static int hf_aecp_control_user_l3; */
+/* static int hf_aecp_control_user_l4; */
+static int hf_aecp_controller_guid;
+/* static int hf_aecp_count; */
+static int hf_aecp_descriptor_index;
+static int hf_aecp_descriptor_type;
+/* static int hf_aecp_descriptors; */
+static int hf_aecp_dest_mac_valid_flag;
+static int hf_aecp_entity_specific1;
+static int hf_aecp_entity_specific1_valid;
+static int hf_aecp_entity_specific2;
+static int hf_aecp_entity_specific2_valid;
+static int hf_aecp_entity_specific3;
+static int hf_aecp_entity_specific3_valid;
+static int hf_aecp_entity_specific4;
+static int hf_aecp_entity_specific4_valid;
+static int hf_aecp_entity_specific5;
+static int hf_aecp_entity_specific5_valid;
+static int hf_aecp_entity_specific6;
+static int hf_aecp_entity_specific6_valid;
+static int hf_aecp_entity_specific7;
+static int hf_aecp_entity_specific7_valid;
+static int hf_aecp_entity_specific8;
+static int hf_aecp_entity_specific8_valid;
+static int hf_aecp_flags_32;
+/* static int hf_aecp_ipv4_address; */
+/* static int hf_aecp_ipv6_address; */
+static int hf_aecp_key;
+static int hf_aecp_key_eui;
+static int hf_aecp_key_length;
+/* static int hf_aecp_key_number; */
+/* static int hf_aecp_key_part; */
+static int hf_aecp_keychain_id;
+static int hf_aecp_keychain_id_small;
+static int hf_aecp_keychain_list_index;
+static int hf_aecp_keychain_number_of_keys;
+static int hf_aecp_keychain_number_of_lists;
+static int hf_aecp_key_signature;
+static int hf_aecp_key_type;
+static int hf_aecp_locked_guid;
+static int hf_aecp_mac_address;
+static int hf_aecp_map_index;
+/* static int hf_aecp_matrix_affected_item_count; */
+static int hf_aecp_matrix_column;
+static int hf_aecp_matrix_direction;
+static int hf_aecp_matrix_item_offset;
+static int hf_aecp_matrix_region_height;
+static int hf_aecp_matrix_region_width;
+static int hf_aecp_matrix_rep;
+static int hf_aecp_matrix_row;
+static int hf_aecp_matrix_value_count;
+/* static int hf_aecp_media_format; */
+/* static int hf_aecp_mem_obj_admin_flag; */
+/* static int hf_aecp_mem_obj_settings_flag; */
+static int hf_aecp_message_type;
+static int hf_aecp_msrp_acc_lat_valid_flag;
+static int hf_aecp_msrp_accumulated_latency;
+static int hf_aecp_msrp_failure_bridge_id;
+static int hf_aecp_msrp_failure_code;
+static int hf_aecp_msrp_failure_valid_flag;
+/* static int hf_aecp_stream_vlan_id; */
+static int hf_aecp_name;
+static int hf_aecp_name_index;
+static int hf_aecp_number_of_maps;
+static int hf_aecp_operation_id;
+static int hf_aecp_operation_type;
+static int hf_aecp_owner_guid;
+static int hf_aecp_percent_complete;
+static int hf_aecp_persistent_flag;
+/* static int hf_aecp_private_key_read_flag; */
+/* static int hf_aecp_private_key_write_flag; */
+/* static int hf_aecp_public_key_write_flag; */
+/* static int hf_aecp_query_id; */
+/* static int hf_aecp_query_limit; */
+/* static int hf_aecp_query_period; */
+/* static int hf_aecp_query_type; */
+static int hf_aecp_release_flag;
+static int hf_aecp_sampling_rate_base_frequency;
+static int hf_aecp_sampling_rate_pull;
+static int hf_aecp_sequence_id;
+static int hf_aecp_signal_index;
+static int hf_aecp_signal_type;
+static int hf_aecp_signal_output;
+static int hf_aecp_stream_format;
+static int hf_aecp_stream_format_valid_flag;
+static int hf_aecp_stream_id_valid_flag;
+static int hf_aecp_stream_input_early_timestamp_valid;
+static int hf_aecp_stream_input_early_timestamp;
+static int hf_aecp_stream_input_late_timestamp_valid;
+static int hf_aecp_stream_input_late_timestamp;
+static int hf_aecp_stream_input_media_locked_valid;
+static int hf_aecp_stream_input_media_locked;
+static int hf_aecp_stream_input_media_unlocked_valid;
+static int hf_aecp_stream_input_media_unlocked;
+static int hf_aecp_stream_input_media_reset_valid;
+static int hf_aecp_stream_input_media_reset;
+static int hf_aecp_stream_input_packets_rx_valid;
+static int hf_aecp_stream_input_packets_rx;
+static int hf_aecp_stream_input_packets_tx_valid;
+static int hf_aecp_stream_input_packets_tx;
+static int hf_aecp_stream_input_seq_num_mismatch_valid;
+static int hf_aecp_stream_input_seq_num_mismatch;
+static int hf_aecp_stream_input_stream_reset_valid;
+static int hf_aecp_stream_input_stream_reset;
+static int hf_aecp_stream_input_timestamp_uncertain_valid;
+static int hf_aecp_stream_input_timestamp_uncertain;
+static int hf_aecp_stream_input_timestamp_valid_valid;
+static int hf_aecp_stream_input_timestamp_valid;
+static int hf_aecp_stream_input_timestamp_not_valid_valid;
+static int hf_aecp_stream_input_timestamp_not_valid;
+static int hf_aecp_stream_input_unsupported_format_valid;
+static int hf_aecp_stream_input_unsupported_format;
+static int hf_aecp_stream_vlan_id_valid_flag;
+static int hf_aecp_target_guid;
+static int hf_aecp_token_length;
+static int hf_aecp_u_flag;
+static int hf_aecp_unlock_flag;
+/* static int hf_aecp_values; */
+/* static int hf_aecp_values_count; */
+static int hf_aecp_vendor_unique_protocol_id;
+static int hf_aecp_video_format;
+static int hf_aecp_status_code;
+static int hf_aecp_backup_talker_entity_id_0;
+static int hf_aecp_backup_talker_entity_id_1;
+static int hf_aecp_backup_talker_entity_id_2;
+static int hf_aecp_backup_talker_unique_id_0;
+static int hf_aecp_backup_talker_unique_id_1;
+static int hf_aecp_backup_talker_unique_id_2;
+static int hf_aecp_backedup_talker_entity_id;
+static int hf_aecp_backedup_talker_unique_id;
+static int hf_aecp_avb_info_ptp_grandmaster_id;
+static int hf_aecp_avb_info_propegation_delay;
+static int hf_aecp_avb_info_gptp_domain_number;
+/* static int hf_aecp_avb_info_flags; */
+static int hf_aecp_as_capable_flag;
+static int hf_aecp_gptp_enabled_flag;
+static int hf_aecp_srp_enabled_flag;
+static int hf_aecp_avb_info_msrp_mappings_count;
+static int hf_aecp_avb_info_msrp_mappings;
+static int hf_aecp_avb_info_msrp_mapping_traffic_class;
+static int hf_aecp_avb_info_msrp_mapping_priority;
+
+static int hf_aecp_get_avb_info_msrp_vlan_id;
 
 /* ***************************************************************** */
 /*                   AVDECC Entity Model (AEM)                       */
 /* ***************************************************************** */
-static int hf_aem_am824_label = -1;
-/* static int hf_aem_aspect_x = -1; */
-/* static int hf_aem_aspect_y = -1; */
-/* static int hf_aem_audio_channels = -1; */
-static int hf_aem_avb_interface_id = -1;
-static int hf_aem_buffer_length = -1;
-static int hf_aem_b_flag = -1;
-static int hf_aem_backedup_talker_guid = -1;
-static int hf_aem_backedup_talker_unique = -1;
-static int hf_aem_backup_talker_guid_0 = -1;
-static int hf_aem_backup_talker_guid_1 = -1;
-static int hf_aem_backup_talker_guid_2 = -1;
-static int hf_aem_backup_talker_unique_0 = -1;
-static int hf_aem_backup_talker_unique_1 = -1;
-static int hf_aem_backup_talker_unique_2 = -1;
-static int hf_aem_base_audio_map = -1;
-static int hf_aem_base_cluster = -1;
-static int hf_aem_base_control = -1;
-static int hf_aem_base_control_block = -1;
-/* static int hf_aem_base_destination = -1; */
-static int hf_aem_base_external_input_port = -1;
-static int hf_aem_base_external_output_port = -1;
-static int hf_aem_base_frequency = -1;
-static int hf_aem_base_internal_input_port = -1;
-static int hf_aem_base_internal_output_port = -1;
-static int hf_aem_base_matrix = -1;
-static int hf_aem_base_mixer = -1;
-static int hf_aem_base_signal_selector = -1;
-/* static int hf_aem_base_source = -1; */
-static int hf_aem_number_splitters = -1;
-static int hf_aem_base_splitter = -1;
-static int hf_aem_number_combiners = -1;
-static int hf_aem_base_combiner = -1;
-static int hf_aem_number_demultiplexers = -1;
-static int hf_aem_base_demultiplexer = -1;
-static int hf_aem_number_multiplexers = -1;
-static int hf_aem_base_multiplexer = -1;
-static int hf_aem_number_transcoders = -1;
-static int hf_aem_base_transcoder = -1;
-static int hf_aem_base_stream_input_port = -1;
-static int hf_aem_base_stream_output_port = -1;
-static int hf_aem_base_strings = -1;
-static int hf_aem_binary_blob = -1;
-static int hf_aem_blob_size = -1;
-static int hf_aem_block_latency = -1;
-static int hf_aem_reset_time = -1;
-/* static int hf_aem_bpp = -1; */
-static int hf_aem_channel_count = -1;
-/* static int hf_aem_channels = -1; */
-static int hf_aem_clock_source_flags = -1;
-static int hf_aem_clock_source_id = -1;
-static int hf_aem_clock_domain_id = -1;
-static int hf_aem_clock_sources_offset = -1;
-static int hf_aem_clock_source_index = -1;
-static int hf_aem_clock_sources_count = -1;
-static int hf_aem_clock_sources = -1;
-static int hf_aem_clock_sources_array = -1;
-static int hf_aem_clock_source_location_id = -1;
-static int hf_aem_clock_source_location_type = -1;
-static int hf_aem_clock_source_name = -1;
-static int hf_aem_clock_source_name_string = -1;
-static int hf_aem_clock_source_type = -1;
-/* static int hf_aem_cluster_name = -1; */
-/* static int hf_aem_cluster_name_string = -1; */
-/* static int hf_aem_color_format = -1; */
-static int hf_aem_color_space = -1;
-/* static int hf_aem_comp1 = -1; */
-/* static int hf_aem_comp2 = -1; */
-/* static int hf_aem_comp3 = -1; */
-/* static int hf_aem_comp4 = -1; */
-static int hf_aem_compress_mode = -1;
-static int hf_aem_configuration_name = -1;
-static int hf_aem_configuration_name_string = -1;
-static int hf_aem_configurations_count = -1;
-static int hf_aem_control_domain = -1;
-static int hf_aem_control_latency = -1;
-/* static int hf_aem_control_location_id = -1; */
-/* static int hf_aem_control_location_type = -1; */
-static int hf_aem_control_type = -1;
-static int hf_aem_control_value_type = -1;
-static int hf_aem_count = -1;
-/* static int hf_aem_cs_eui64 = -1; */
-static int hf_aem_ctrl_double = -1;
-static int hf_aem_ctrl_float = -1;
-static int hf_aem_ctrl_int16 = -1;
-static int hf_aem_ctrl_int32 = -1;
-static int hf_aem_ctrl_int64 = -1;
-static int hf_aem_ctrl_int8 = -1;
-static int hf_aem_ctrl_uint16 = -1;
-static int hf_aem_ctrl_uint32 = -1;
-static int hf_aem_ctrl_uint64 = -1;
-static int hf_aem_ctrl_uint8 = -1;
-static int hf_aem_ctrl_vals = -1;
-static int hf_aem_current_configuration = -1;
-static int hf_aem_current_sample_rate = -1;
-/* static int hf_aem_current_signal_id = -1; */
-/* static int hf_aem_current_signal_type = -1; */
-static int hf_aem_dbs = -1;
-/* static int hf_aem_default_signal_id = -1; */
-/* static int hf_aem_default_signal_type = -1; */
-static int hf_aem_descriptor_counts_count = -1;
-static int hf_aem_descriptor_counts_offset = -1;
-/* static int hf_aem_div = -1; */
-static int hf_aem_entity_id = -1;
-static int hf_aem_entity_model_id = -1;
-static int hf_aem_entity_name = -1;
-static int hf_aem_fdf_evt = -1;
-static int hf_aem_fdf_sfc = -1;
-static int hf_aem_firmware_version = -1;
-static int hf_aem_flags_async_sample_rate_conv = -1;
-static int hf_aem_flags_captive = -1;
-static int hf_aem_flags_class_a = -1;
-static int hf_aem_flags_class_b = -1;
-static int hf_aem_flags_clock_sync_source = -1;
-static int hf_aem_flags_sync_sample_rate_conv = -1;
-static int hf_aem_fmt = -1;
-/* static int hf_aem_formats_count = -1; */
-static int hf_aem_formats_offset = -1;
-/* static int hf_aem_frame_rate = -1; */
-static int hf_aem_frequency = -1;
-static int hf_aem_group_name = -1;
-static int hf_aem_guid = -1;
-/* static int hf_aem_height = -1; */
-static int hf_aem_iidc_format = -1;
-static int hf_aem_iidc_mode = -1;
-static int hf_aem_iidc_rate = -1;
-static int hf_aem_interface_name = -1;
-static int hf_aem_interface_name_string = -1;
-/* static int hf_aem_interlace = -1; */
-/* static int hf_aem_internal_id = -1; */
-static int hf_aem_jack_flags = -1;
-static int hf_aem_jack_id = -1;
-static int hf_aem_jack_name = -1;
-static int hf_aem_jack_name_string = -1;
-static int hf_aem_jack_type = -1;
-static int hf_aem_label_iec_60958_cnt = -1;
-static int hf_aem_label_mbla_cnt = -1;
-static int hf_aem_label_midi_cnt = -1;
-static int hf_aem_label_smpte_cnt = -1;
-static int hf_aem_length = -1;
-static int hf_aem_locale_identifier = -1;
-static int hf_aem_mapping_cluster_offset = -1;
-static int hf_aem_mapping_cluster_channel = -1;
-static int hf_aem_mapping_stream_channel = -1;
-static int hf_aem_mapping_stream_index = -1;
-static int hf_aem_mappings = -1;
-static int hf_aem_mappings_offset = -1;
-static int hf_aem_memory_object_type = -1;
-/* static int hf_aem_mf_height = -1; */
-/* static int hf_aem_mf_width = -1; */
-/* static int hf_aem_mfd_type = -1; */
-static int hf_aem_model_name_string = -1;
-static int hf_aem_avb_interface_flags = -1;
-static int hf_aem_avb_clock_identity = -1;
-static int hf_aem_avb_priority1 = -1;
-static int hf_aem_avb_clock_class = -1;
-static int hf_aem_avb_offset_scaled_log_variance = -1;
-static int hf_aem_avb_clock_accuracy = -1;
-static int hf_aem_avb_priority2 = -1;
-static int hf_aem_avb_domain_number = -1;
-static int hf_aem_avb_log_sync_interval = -1;
-/* static int hf_aem_avb_propagation_delay = -1; */
-static int hf_aem_nb_flag = -1;
-static int hf_aem_number_audio_maps = -1;
-/* static int hf_aem_number_destinations = -1; */
-static int hf_aem_number_matrices = -1;
-static int hf_aem_number_mixers = -1;
-static int hf_aem_number_of_clusters = -1;
-static int hf_aem_number_of_controls = -1;
-static int hf_aem_number_control_blocks = -1;
-static int hf_aem_number_of_external_input_ports = -1;
-static int hf_aem_number_of_external_output_ports = -1;
-static int hf_aem_number_of_formats = -1;
-static int hf_aem_number_of_internal_input_ports = -1;
-static int hf_aem_number_of_internal_output_ports = -1;
-static int hf_aem_number_of_mappings = -1;
-/* static int hf_aem_number_of_sources = -1; */
-static int hf_aem_number_of_stream_input_ports = -1;
-static int hf_aem_number_of_stream_output_ports = -1;
-static int hf_aem_number_of_strings = -1;
-static int hf_aem_number_of_values = -1;
-static int hf_aem_number_signal_selectors = -1;
-static int hf_aem_object_name = -1;
-static int hf_aem_localized_description = -1;
-/* static int hf_aem_oui24 = -1; */
-static int hf_aem_path_latency = -1;
-static int hf_aem_port_flags = -1;
-static int hf_aem_pull_field = -1;
-static int hf_aem_sample_rates = -1;
-static int hf_aem_sample_rates_count = -1;
-static int hf_aem_sample_rates_offset = -1;
-static int hf_aem_serial_number = -1;
-static int hf_aem_sf = -1;
-static int hf_aem_sf_version = -1;
-static int hf_aem_sf_subtype = -1;
-static int hf_aem_signal_index = -1;
-static int hf_aem_signal_output = -1;
-static int hf_aem_signal_type = -1;
-static int hf_aem_signals_count = -1;
-static int hf_aem_signals_offset = -1;
-static int hf_aem_sources = -1;
-/* static int hf_aem_sources_offset = -1; */
-static int hf_aem_start_address = -1;
-/* static int hf_aem_stream_channels = -1; */
-static int hf_aem_stream_flags = -1;
-static int hf_aem_stream_format = -1;
-static int hf_aem_stream_formats = -1;
-/* static int hf_aem_stream_id = -1; */
-static int hf_aem_stream_name = -1;
-static int hf_aem_stream_name_string = -1;
-static int hf_aem_string = -1;
-static int hf_aem_string_ref = -1;
-static int hf_aem_target_descriptor_id = -1;
-static int hf_aem_target_descriptor_type = -1;
-static int hf_aem_unit = -1;
-static int hf_aem_unknown_descriptor = -1;
-/* static int hf_aem_value_offset = -1; */
-static int hf_aem_values_offset = -1;
-static int hf_aem_vendor_name_string = -1;
-static int hf_aem_video_mode = -1;
-/* static int hf_aem_width = -1; */
+static int hf_aem_am824_label;
+/* static int hf_aem_aspect_x; */
+/* static int hf_aem_aspect_y; */
+/* static int hf_aem_audio_channels; */
+static int hf_aem_avb_interface_id;
+static int hf_aem_buffer_length;
+static int hf_aem_b_flag;
+static int hf_aem_backedup_talker_guid;
+static int hf_aem_backedup_talker_unique;
+static int hf_aem_backup_talker_guid_0;
+static int hf_aem_backup_talker_guid_1;
+static int hf_aem_backup_talker_guid_2;
+static int hf_aem_backup_talker_unique_0;
+static int hf_aem_backup_talker_unique_1;
+static int hf_aem_backup_talker_unique_2;
+static int hf_aem_base_audio_map;
+static int hf_aem_base_cluster;
+static int hf_aem_base_control;
+static int hf_aem_base_control_block;
+/* static int hf_aem_base_destination; */
+static int hf_aem_base_external_input_port;
+static int hf_aem_base_external_output_port;
+static int hf_aem_base_frequency;
+static int hf_aem_base_internal_input_port;
+static int hf_aem_base_internal_output_port;
+static int hf_aem_base_matrix;
+static int hf_aem_base_mixer;
+static int hf_aem_base_signal_selector;
+/* static int hf_aem_base_source; */
+static int hf_aem_number_splitters;
+static int hf_aem_base_splitter;
+static int hf_aem_number_combiners;
+static int hf_aem_base_combiner;
+static int hf_aem_number_demultiplexers;
+static int hf_aem_base_demultiplexer;
+static int hf_aem_number_multiplexers;
+static int hf_aem_base_multiplexer;
+static int hf_aem_number_transcoders;
+static int hf_aem_base_transcoder;
+static int hf_aem_base_stream_input_port;
+static int hf_aem_base_stream_output_port;
+static int hf_aem_base_strings;
+static int hf_aem_binary_blob;
+static int hf_aem_blob_size;
+static int hf_aem_block_latency;
+static int hf_aem_reset_time;
+/* static int hf_aem_bpp; */
+static int hf_aem_channel_count;
+/* static int hf_aem_channels; */
+static int hf_aem_clock_source_flags;
+static int hf_aem_clock_source_id;
+static int hf_aem_clock_domain_id;
+static int hf_aem_clock_sources_offset;
+static int hf_aem_clock_source_index;
+static int hf_aem_clock_sources_count;
+static int hf_aem_clock_sources;
+static int hf_aem_clock_sources_array;
+static int hf_aem_clock_source_location_id;
+static int hf_aem_clock_source_location_type;
+static int hf_aem_clock_source_name;
+static int hf_aem_clock_source_name_string;
+static int hf_aem_clock_source_type;
+/* static int hf_aem_cluster_name; */
+/* static int hf_aem_cluster_name_string; */
+/* static int hf_aem_color_format; */
+static int hf_aem_color_space;
+/* static int hf_aem_comp1; */
+/* static int hf_aem_comp2; */
+/* static int hf_aem_comp3; */
+/* static int hf_aem_comp4; */
+static int hf_aem_compress_mode;
+static int hf_aem_configuration_name;
+static int hf_aem_configuration_name_string;
+static int hf_aem_configurations_count;
+static int hf_aem_control_domain;
+static int hf_aem_control_latency;
+/* static int hf_aem_control_location_id; */
+/* static int hf_aem_control_location_type; */
+static int hf_aem_control_type;
+static int hf_aem_control_value_type;
+static int hf_aem_count;
+/* static int hf_aem_cs_eui64; */
+static int hf_aem_ctrl_double;
+static int hf_aem_ctrl_float;
+static int hf_aem_ctrl_int16;
+static int hf_aem_ctrl_int32;
+static int hf_aem_ctrl_int64;
+static int hf_aem_ctrl_int8;
+static int hf_aem_ctrl_uint16;
+static int hf_aem_ctrl_uint32;
+static int hf_aem_ctrl_uint64;
+static int hf_aem_ctrl_uint8;
+static int hf_aem_ctrl_vals;
+static int hf_aem_current_configuration;
+static int hf_aem_current_sample_rate;
+/* static int hf_aem_current_signal_id; */
+/* static int hf_aem_current_signal_type; */
+static int hf_aem_dbs;
+/* static int hf_aem_default_signal_id; */
+/* static int hf_aem_default_signal_type; */
+static int hf_aem_descriptor_counts_count;
+static int hf_aem_descriptor_counts_offset;
+/* static int hf_aem_div; */
+static int hf_aem_entity_id;
+static int hf_aem_entity_model_id;
+static int hf_aem_entity_name;
+static int hf_aem_fdf_evt;
+static int hf_aem_fdf_sfc;
+static int hf_aem_firmware_version;
+static int hf_aem_flags_async_sample_rate_conv;
+static int hf_aem_flags_captive;
+static int hf_aem_flags_class_a;
+static int hf_aem_flags_class_b;
+static int hf_aem_flags_clock_sync_source;
+static int hf_aem_flags_sync_sample_rate_conv;
+static int hf_aem_fmt;
+/* static int hf_aem_formats_count; */
+static int hf_aem_formats_offset;
+/* static int hf_aem_frame_rate; */
+static int hf_aem_frequency;
+static int hf_aem_group_name;
+static int hf_aem_guid;
+/* static int hf_aem_height; */
+static int hf_aem_iidc_format;
+static int hf_aem_iidc_mode;
+static int hf_aem_iidc_rate;
+static int hf_aem_interface_name;
+static int hf_aem_interface_name_string;
+/* static int hf_aem_interlace; */
+/* static int hf_aem_internal_id; */
+static int hf_aem_jack_flags;
+static int hf_aem_jack_id;
+static int hf_aem_jack_name;
+static int hf_aem_jack_name_string;
+static int hf_aem_jack_type;
+static int hf_aem_label_iec_60958_cnt;
+static int hf_aem_label_mbla_cnt;
+static int hf_aem_label_midi_cnt;
+static int hf_aem_label_smpte_cnt;
+static int hf_aem_length;
+static int hf_aem_locale_identifier;
+static int hf_aem_mapping_cluster_offset;
+static int hf_aem_mapping_cluster_channel;
+static int hf_aem_mapping_stream_channel;
+static int hf_aem_mapping_stream_index;
+static int hf_aem_mappings;
+static int hf_aem_mappings_offset;
+static int hf_aem_memory_object_type;
+/* static int hf_aem_mf_height; */
+/* static int hf_aem_mf_width; */
+/* static int hf_aem_mfd_type; */
+static int hf_aem_model_name_string;
+static int hf_aem_avb_interface_flags;
+static int hf_aem_avb_clock_identity;
+static int hf_aem_avb_priority1;
+static int hf_aem_avb_clock_class;
+static int hf_aem_avb_offset_scaled_log_variance;
+static int hf_aem_avb_clock_accuracy;
+static int hf_aem_avb_priority2;
+static int hf_aem_avb_domain_number;
+static int hf_aem_avb_log_sync_interval;
+/* static int hf_aem_avb_propagation_delay; */
+static int hf_aem_nb_flag;
+static int hf_aem_number_audio_maps;
+/* static int hf_aem_number_destinations; */
+static int hf_aem_number_matrices;
+static int hf_aem_number_mixers;
+static int hf_aem_number_of_clusters;
+static int hf_aem_number_of_controls;
+static int hf_aem_number_control_blocks;
+static int hf_aem_number_of_external_input_ports;
+static int hf_aem_number_of_external_output_ports;
+static int hf_aem_number_of_formats;
+static int hf_aem_number_of_internal_input_ports;
+static int hf_aem_number_of_internal_output_ports;
+static int hf_aem_number_of_mappings;
+/* static int hf_aem_number_of_sources; */
+static int hf_aem_number_of_stream_input_ports;
+static int hf_aem_number_of_stream_output_ports;
+static int hf_aem_number_of_strings;
+static int hf_aem_number_of_values;
+static int hf_aem_number_signal_selectors;
+static int hf_aem_object_name;
+static int hf_aem_localized_description;
+/* static int hf_aem_oui24; */
+static int hf_aem_path_latency;
+static int hf_aem_port_flags;
+static int hf_aem_pull_field;
+static int hf_aem_sample_rates;
+static int hf_aem_sample_rates_count;
+static int hf_aem_sample_rates_offset;
+static int hf_aem_serial_number;
+static int hf_aem_sf;
+static int hf_aem_sf_version;
+static int hf_aem_sf_subtype;
+static int hf_aem_signal_index;
+static int hf_aem_signal_output;
+static int hf_aem_signal_type;
+static int hf_aem_signals_count;
+static int hf_aem_signals_offset;
+static int hf_aem_sources;
+/* static int hf_aem_sources_offset; */
+static int hf_aem_start_address;
+/* static int hf_aem_stream_channels; */
+static int hf_aem_stream_flags;
+static int hf_aem_stream_format;
+static int hf_aem_stream_formats;
+/* static int hf_aem_stream_id; */
+static int hf_aem_stream_name;
+static int hf_aem_stream_name_string;
+static int hf_aem_string;
+static int hf_aem_string_ref;
+static int hf_aem_target_descriptor_id;
+static int hf_aem_target_descriptor_type;
+static int hf_aem_unit;
+static int hf_aem_unknown_descriptor;
+/* static int hf_aem_value_offset; */
+static int hf_aem_values_offset;
+static int hf_aem_vendor_name_string;
+static int hf_aem_video_mode;
+/* static int hf_aem_width; */
 
 /****************************************************************** */
 /*     AVDECC Connection Management Protocol Data Unit (ACMPDU)     */
 /* **************************************************************** */
-static int hf_acmp_message_type = -1;
-static int hf_acmp_status_field = -1;
-static int hf_acmp_cd_length = -1;
-static int hf_acmp_stream_id = -1;
-static int hf_acmp_controller_guid = -1;
-static int hf_acmp_talker_guid = -1;
-static int hf_acmp_listener_guid = -1;
-static int hf_acmp_talker_unique_id = -1;
-static int hf_acmp_listener_unique_id = -1;
-static int hf_acmp_stream_dest_mac = -1;
-static int hf_acmp_connection_count = -1;
-static int hf_acmp_sequence_id = -1;
-static int hf_acmp_flags = -1;
-static int hf_acmp_vlan_id = -1;
+static int hf_acmp_message_type;
+static int hf_acmp_status_field;
+static int hf_acmp_cd_length;
+static int hf_acmp_stream_id;
+static int hf_acmp_controller_guid;
+static int hf_acmp_talker_guid;
+static int hf_acmp_listener_guid;
+static int hf_acmp_talker_unique_id;
+static int hf_acmp_listener_unique_id;
+static int hf_acmp_stream_dest_mac;
+static int hf_acmp_connection_count;
+static int hf_acmp_sequence_id;
+static int hf_acmp_flags;
+static int hf_acmp_vlan_id;
 
 /* ACMP Flags (8.2.1.17) */
-static int hf_acmp_flags_class_b = -1;
-static int hf_acmp_flags_fast_connect = -1;
-static int hf_acmp_flags_saved_state = -1;
-static int hf_acmp_flags_streaming_wait = -1;
-static int hf_acmp_flags_supports_encrypted = -1;
-static int hf_acmp_flags_encrypted_pdu = -1;
-static int hf_acmp_flags_talker_failed = -1;
+static int hf_acmp_flags_class_b;
+static int hf_acmp_flags_fast_connect;
+static int hf_acmp_flags_saved_state;
+static int hf_acmp_flags_streaming_wait;
+static int hf_acmp_flags_supports_encrypted;
+static int hf_acmp_flags_encrypted_pdu;
+static int hf_acmp_flags_talker_failed;
 
 /* Initialize the subtree pointers */
-static int ett_17221 = -1;
+static int ett_17221;
 /* ADP */
-static int ett_adp_ent_cap = -1;
-static int ett_adp_talk_cap = -1;
-static int ett_adp_list_cap = -1;
-static int ett_adp_cont_cap = -1;
-/* static int ett_adp_aud_format = -1; */
-static int ett_adp_samp_rates = -1;
-static int ett_adp_chan_format = -1;
+static int ett_adp_ent_cap;
+static int ett_adp_talk_cap;
+static int ett_adp_list_cap;
+static int ett_adp_cont_cap;
+/* static int ett_adp_aud_format; */
+static int ett_adp_samp_rates;
+static int ett_adp_chan_format;
 /* ACMP */
-static int ett_acmp_flags = -1;
+static int ett_acmp_flags;
 /* AEM */
-static int ett_aem_descriptor = -1;
-static int ett_aem_desc_counts = -1;
-static int ett_aem_sample_rates = -1;
-static int ett_aem_stream_flags = -1;
-static int ett_aem_clock_sources = -1;
-static int ett_aem_stream_formats = -1;
-static int ett_aem_jack_flags = -1;
-static int ett_aem_port_flags = -1;
-static int ett_aecp_get_avb_info_msrp_mappings = -1;
-static int ett_aem_clock_source_flags = -1;
-static int ett_aem_mappings = -1;
-static int ett_aem_ctrl_vals = -1;
-static int ett_aem_sources = -1;
-/* static int ett_aem_media_format = -1; */
-static int ett_aem_stream_format = -1;
-
-static int ett_aecp_descriptors = -1;
-static int ett_aecp_flags_32 = -1;
+static int ett_aem_descriptor;
+static int ett_aem_desc_counts;
+static int ett_aem_sample_rates;
+static int ett_aem_stream_flags;
+static int ett_aem_clock_sources;
+static int ett_aem_stream_formats;
+static int ett_aem_jack_flags;
+static int ett_aem_port_flags;
+static int ett_aecp_get_avb_info_msrp_mappings;
+static int ett_aem_clock_source_flags;
+static int ett_aem_mappings;
+static int ett_aem_ctrl_vals;
+static int ett_aem_sources;
+/* static int ett_aem_media_format; */
+static int ett_aem_stream_format;
+
+static int ett_aecp_descriptors;
+static int ett_aecp_flags_32;
 
 typedef struct {
    int hf;
diff --git a/epan/dissectors/packet-ieee1905.c b/epan/dissectors/packet-ieee1905.c
index a12099e9dc..c521b7c72a 100644
--- a/epan/dissectors/packet-ieee1905.c
+++ b/epan/dissectors/packet-ieee1905.c
@@ -45,883 +45,883 @@ void proto_reg_handoff_ieee1905(void);
 void proto_register_ieee1905(void);
 
 /* Reassembly header fields */
-static int hf_ieee1905_fragments = -1;
-static int hf_ieee1905_fragment = -1;
-static int hf_ieee1905_fragment_overlap = -1;
-static int hf_ieee1905_fragment_overlap_conflicts = -1;
-static int hf_ieee1905_fragment_multiple_tails = -1;
-static int hf_ieee1905_fragment_too_long_fragment = -1;
-static int hf_ieee1905_fragment_error = -1;
-static int hf_ieee1905_fragment_count = -1;
-static int hf_ieee1905_fragment_reassembled_in = -1;
-static int hf_ieee1905_fragment_reassembled_length = -1;
+static int hf_ieee1905_fragments;
+static int hf_ieee1905_fragment;
+static int hf_ieee1905_fragment_overlap;
+static int hf_ieee1905_fragment_overlap_conflicts;
+static int hf_ieee1905_fragment_multiple_tails;
+static int hf_ieee1905_fragment_too_long_fragment;
+static int hf_ieee1905_fragment_error;
+static int hf_ieee1905_fragment_count;
+static int hf_ieee1905_fragment_reassembled_in;
+static int hf_ieee1905_fragment_reassembled_length;
 
 /* Normal header fields */
-static int proto_ieee1905 = -1;
-static int hf_ieee1905_fragment_data = -1;
-static int hf_ieee1905_message_version = -1;
-static int hf_ieee1905_message_reserved = -1;
-static int hf_ieee1905_message_type = -1;
-static int hf_ieee1905_message_id = -1;
-static int hf_ieee1905_fragment_id = -1;
-static int hf_ieee1905_flags = -1;
-static int hf_ieee1905_last_fragment = -1;
-static int hf_ieee1905_relay_indicator = -1;
-static int hf_ieee1905_tlv_types = -1;
-static int hf_ieee1905_tlv_len = -1;
-static int hf_ieee1905_tlv_len_reserved = -1;
-static int hf_ieee1905_tlv_len_length = -1;
-static int hf_ieee1905_tlv_data = -1;
-static int hf_ieee1905_al_mac_address_type = -1;
-static int hf_ieee1905_mac_address_type = -1;
-static int hf_ieee1905_link_metric_query_type = -1;
-static int hf_ieee1905_link_metrics_requested = -1;
-static int hf_ieee1905_responder_al_mac_addr = -1;
-static int hf_ieee1905_neighbor_al_mac_addr = -1;
-static int hf_ieee1905_receiving_al_mac_addr = -1;
-static int hf_ieee1905_bridge_flag = -1;
-static int hf_ieee1905_packet_errors = -1;
-static int hf_ieee1905_transmitted_packets = -1;
-static int hf_ieee1905_mac_throughput_capacity = -1;
-static int hf_ieee1905_link_availability = -1;
-static int hf_ieee1905_phy_rate = -1;
-static int hf_ieee1905_packets_received = -1;
-static int hf_ieee1905_rssi = -1;
-static int hf_ieee1905_extra_tlv_data = -1;
-static int hf_ieee1905_local_interface_count = -1;
-static int hf_ieee1905_media_type = -1;
-static int hf_ieee1905_media_spec_info_len = -1;
-static int hf_ieee1905_media_spec_info = -1;
-static int hf_ieee1905_media_type_high = -1;
-static int hf_ieee1905_media_type_low = -1;
-static int hf_ieee1905_bridging_tuples_cnt = -1;
-static int hf_ieee1905_bridging_mac_address_cnt = -1;
-static int hf_ieee1905_bridging_mac_address = -1;
-static int hf_ieee1905_local_interface_mac = -1;
-static int hf_ieee1905_non_1905_neighbor_mac = -1;
-static int hf_ieee1905_neighbor_flags = -1;
-static int hf_ieee1905_bridges_flag = -1;
-static int hf_ieee1905_link_metric_result_code = -1;
-static int hf_ieee1905_vendor_specific_oui = -1;
-static int hf_ieee1905_vendor_specific_info = -1;
-static int hf_ieee1905_searched_role = -1;
-static int hf_ieee1905_supported_role = -1;
-static int hf_ieee1905_auto_config_freq_band = -1;
-static int hf_ieee1905_supported_freq_band = -1;
-static int hf_ieee1905_event_notification_media_types = -1;
-static int hf_ieee1905_sender_al_id = -1;
-static int hf_ieee1905_push_button_event_msg_id = -1;
-static int hf_ieee1905_sender_joining_interface = -1;
-static int hf_ieee1905_new_device_interface = -1;
-static int hf_ieee1905_device_al_mac = -1;
-static int hf_ieee1905_local_intf_oui = -1;
-static int hf_ieee1905_local_intf_variant = -1;
-static int hf_ieee1905_local_intf_variant_name = -1;
-static int hf_ieee1905_local_intf_url_count = -1;
-static int hf_ieee1905_local_intf_spec_count = -1;
-static int hf_ieee1905_local_intf_url = -1;
-static int hf_ieee1905_local_intf_spec = -1;
-static int hf_ieee1905_dev_id_friendly_name = -1;
-static int hf_ieee1905_dev_id_manuf_name = -1;
-static int hf_ieee1905_dev_id_manuf_model = -1;
-static int hf_ieee1905_control_url = -1;
-static int hf_ieee1905_ipv4_type_count = -1;
-static int hf_ieee1905_mac_address = -1;
-static int hf_ieee1905_ipv4_addr_count = -1;
-static int hf_ieee1905_addr_type = -1;
-static int hf_ieee1905_ipv4_addr = -1;
-static int hf_ieee1905_dhcp_server = -1;
-static int hf_ieee1905_ipv6_mac_address = -1;
-static int hf_ieee1905_ipv6_linklocal = -1;
-static int hf_ieee1905_ipv6_type_count = -1;
-static int hf_ieee1905_ipv6_addr_count = -1;
-static int hf_ieee1905_ipv6_addr_type = -1;
-static int hf_ieee1905_ipv6_addr = -1;
-static int hf_ieee1905_ipv6_dhcp_server = -1;
-static int hf_ieee1905_generic_phy_media_types = -1;
-static int hf_ieee1905_profile_version = -1;
-static int hf_ieee1905_power_off_intf_count = -1;
-static int hf_ieee1905_power_change_intf_count = -1;
-static int hf_ieee1905_power_change_mac_addr = -1;
-static int hf_ieee1905_power_change_state = -1;
-static int hf_ieee1905_power_status_intf_count = -1;
-static int hf_ieee1905_power_status_mac_addr = -1;
-static int hf_ieee1905_power_status_state = -1;
-static int hf_ieee1905_l2_neighbor_intf_count = -1;
-static int hf_ieee1905_l2_local_intf_mac_addr = -1;
-static int hf_ieee1905_l2_neighbor_dev_count = -1;
-static int hf_ieee1905_l2_neighbor_mac_addr = -1;
-static int hf_ieee1905_l2_behind_mac_addr_count = -1;
-static int hf_ieee1905_l2_behind_mac_addr = -1;
-static int hf_ieee1905_supported_service_count = -1;
-static int hf_ieee1905_supported_service = -1;
-static int hf_ieee1905_searched_service_count = -1;
-static int hf_ieee1905_searched_service = -1;
-static int hf_ieee1905_ap_radio_identifier = -1;
-static int hf_ieee1905_operatonal_bss_radio_count = -1;
-static int hf_ieee1905_ap_operational_intf_count = -1;
-static int hf_ieee1905_ap_local_intf_mac_addr = -1;
-static int hf_ieee1905_ap_local_intf_ssid_len = -1;
-static int hf_ieee1905_ap_local_intf_ssid = -1;
-static int hf_ieee1905_ap_capabilities_flags = -1;
-static int hf_ieee1905_rpt_unsuccessful_associations = -1;
-static int hf_ieee1905_unassoc_sta_metrics_oper_flag = -1;
-static int hf_ieee1905_unassoc_sta_metrics_non_oper_flag = -1;
-static int hf_ieee1905_agent_init_steering = -1;
-static int hf_ieee1905_rpt_unsuccessful_assoc_report = -1;
-static int hf_ieee1905_higher_layer_protocol = -1;
-static int hf_ieee1905_higher_layer_data = -1;
-static int hf_ieee1905_assoc_backhaul_station_mac = -1;
-static int hf_ieee1905_backhaul_target_bssid = -1;
-static int hf_ieee1905_backhaul_steering_status = -1;
-static int hf_ieee1905_backhaul_operating_class = -1;
-static int hf_ieee1905_backhaul_channel_number = -1;
-static int hf_ieee1905_client_assoc_bssid = -1;
-static int hf_ieee1905_association_control = -1;
-static int hf_ieee1905_association_control_validity = -1;
-static int hf_ieee1905_client_assoc_sta_count = -1;
-static int hf_ieee1905_client_assoc_mac_addr = -1;
-static int hf_ieee1905_btm_reporter_bssid = -1;
-static int hf_ieee1905_btm_sta_mac_addr = -1;
-static int hf_ieee1905_btm_report_status = -1;
-static int hf_ieee1905_btm_report_bssid = -1;
-static int hf_ieee1905_source_bss_bssid = -1;
-static int hf_ieee1905_steering_request_flags = -1;
-static int hf_ieee1905_steering_req_op_window = -1;
-static int hf_ieee1905_steering_request_mode_flag = -1;
-static int hf_ieee1905_btm_disassoc_imminent_flag = -1;
-static int hf_ieee1905_btm_abridged_flag = -1;
-static int hf_ieee1905_steering_req_reserved = -1;
-static int hf_ieee1905_steering_btm_disass_timer = -1;
-static int hf_ieee1905_steering_req_sta_count = -1;
-static int hf_ieee1905_steering_req_sta_mac = -1;
-static int hf_ieee1905_steering_req_target_bssid_count = -1;
-static int hf_ieee1905_steering_req_target_bssid = -1;
-static int hf_ieee1905_steering_req_oper_class = -1;
-static int hf_ieee1905_steering_req_target_channel = -1;
-static int hf_ieee1905_client_bssid = -1;
-static int hf_ieee1905_client_mac_addr = -1;
-static int hf_ieee1905_client_capability_result = -1;
-static int hf_ieee1905_client_capability_frame = -1;
-static int hf_ieee1905_association_flag = -1;
-static int hf_ieee1905_association_client_mac_addr = -1;
-static int hf_ieee1905_association_agent_bssid = -1;
-static int hf_ieee1905_association_event_flags = -1;
-static int hf_ieee1905_ap_radio_max_bss = -1;
-static int hf_ieee1905_ap_radio_classes = -1;
-static int hf_ieee1905_ap_radio_class = -1;
-static int hf_ieee1905_ap_radio_eirp = -1;
-static int hf_ieee1905_ap_radio_non_op_count = -1;
-static int hf_ieee1905_radio_basic_non_op_channel = -1;
-static int hf_ieee1905_max_supported_tx_streams = -1;
-static int hf_ieee1905_max_supported_rx_streams = -1;
-static int hf_ieee1905_short_gi_20mhz_flag = -1;
-static int hf_ieee1905_short_gi_40mhz_flag = -1;
-static int hf_ieee1905_ht_support_40mhz_flag = -1;
-static int hf_ieee1905_ap_ht_capabilities_radio_id = -1;
-static int hf_ieee1905_ht_cap_flags = -1;
-static int hf_ieee1905_vht_max_supported_tx_streams = -1;
-static int hf_ieee1905_vht_max_supported_rx_streams = -1;
-static int hf_ieee1905_short_gi_80mhz_flag = -1;
-static int hf_ieee1905_short_gi_160mhz_flag = -1;
-static int hf_ieee1905_vht_support_80plus_mhz_flag = -1;
-static int hf_ieee1905_vht_support_160_mhz_flag = -1;
-static int hf_ieee1905_su_beamformer_capable_flag = -1;
-static int hf_ieee1905_mu_beamformer_capable_flag = -1;
-static int hf_ieee1905_ap_vht_capabilities_radio_id = -1;
-static int hf_ieee1905_vht_cap_flags = -1;
-static int hf_ieee1905_assoc_clients_bss_count = -1;
-static int hf_ieee1905_assoc_bssid = -1;
-static int hf_ieee1905_bss_client_count = -1;
-static int hf_ieee1905_bss_client_mac = -1;
-static int hf_ieee1905_bss_client_last_assoc = -1;
-static int hf_ieee1905_ap_vht_supported_vht_tx_mcs = -1;
-static int hf_ieee1905_ap_vht_supported_vht_rx_mcs = -1;
-static int hf_ieee1905_channel_pref_preference = -1;
-static int hf_ieee1905_channel_pref_reason = -1;
-static int hf_ieee1905_channel_preference_radio_id = -1;
-static int hf_ieee1905_channel_preference_class_count = -1;
-static int hf_ieee1905_channel_pref_class = -1;
-static int hf_ieee1905_channel_pref_channel_count = -1;
-static int hf_ieee1905_channel_pref_channel = -1;
-static int hf_ieee1905_channel_prefs_flags = -1;
-static int hf_ieee1905_trans_power_limit_radio_id = -1;
-static int hf_ieee1905_trans_power_limit_eirp = -1;
-static int hf_ieee1905_channel_select_resp_radio_id = -1;
-static int hf_ieee1905_radio_metrics_radio_id = -1;
-static int hf_ieee1905_channel_select_resp_code = -1;
-static int hf_ieee1905_op_channel_report_radio_id = -1;
-static int hf_ieee1905_op_channel_report_classes = -1;
-static int hf_ieee1905_op_channel_class = -1;
-static int hf_ieee1905_op_channel_number = -1;
-static int hf_ieee1905_op_channel_eirp = -1;
-static int hf_ieee1905_ap_he_cap_radio_id = -1;
-static int hf_ieee1905_ap_he_cap_mcs_length = -1;
-static int hf_ieee1905_ap_he_cap_tx_mcs_le_80_mhz = -1;
-static int hf_ieee1905_ap_he_tx_mcs_map_1ss = -1;
-static int hf_ieee1905_ap_he_tx_mcs_map_2ss = -1;
-static int hf_ieee1905_ap_he_tx_mcs_map_3ss = -1;
-static int hf_ieee1905_ap_he_tx_mcs_map_4ss = -1;
-static int hf_ieee1905_ap_he_tx_mcs_map_5ss = -1;
-static int hf_ieee1905_ap_he_tx_mcs_map_6ss = -1;
-static int hf_ieee1905_ap_he_tx_mcs_map_7ss = -1;
-static int hf_ieee1905_ap_he_tx_mcs_map_8ss = -1;
-static int hf_ieee1905_ap_he_cap_rx_mcs_le_80_mhz = -1;
-static int hf_ieee1905_ap_he_rx_mcs_map_1ss = -1;
-static int hf_ieee1905_ap_he_rx_mcs_map_2ss = -1;
-static int hf_ieee1905_ap_he_rx_mcs_map_3ss = -1;
-static int hf_ieee1905_ap_he_rx_mcs_map_4ss = -1;
-static int hf_ieee1905_ap_he_rx_mcs_map_5ss = -1;
-static int hf_ieee1905_ap_he_rx_mcs_map_6ss = -1;
-static int hf_ieee1905_ap_he_rx_mcs_map_7ss = -1;
-static int hf_ieee1905_ap_he_rx_mcs_map_8ss = -1;
-static int hf_ieee1905_ap_he_cap_tx_mcs_160_mhz = -1;
-static int hf_ieee1905_ap_he_cap_rx_mcs_160_mhz = -1;
-static int hf_ieee1905_ap_he_cap_tx_mcs_80p80_mhz = -1;
-static int hf_ieee1905_ap_he_cap_rx_mcs_80p80_mhz = -1;
-static int hf_ieee1905_unassoc_link_metrics_query_mac = -1;
-static int hf_ieee1905_unassoc_sta_link_metrics_class = -1;
-static int hf_ieee1905_ap_metrics_reporting_interval = -1;
-static int hf_ieee1905_metric_reporting_policy_radio_id = -1;
-static int hf_ieee1905_metric_reporting_radio_count = -1;
-static int hf_ieee1905_metric_rcpi_threshold = -1;
-static int hf_ieee1905_metric_reporting_rcpi_hysteresis = -1;
-static int hf_ieee1905_metrics_policy_flags = -1;
-static int hf_ieee1905_metrics_channel_util_threshold = -1;
-static int hf_ieee1905_assoc_sta_traffic_stats_inclusion = -1;
-static int hf_ieee1905_assoc_sta_link_metrics_inclusion = -1;
-static int hf_ieee1905_assoc_wf6_status_policy_inclusion = -1;
-static int hf_ieee1905_reporting_policy_flags_reserved = -1;
-static int hf_ieee1905_ap_metric_query_bssid_cnt = -1;
-static int hf_ieee1905_ap_metric_query_bssid = -1;
-static int hf_ieee1905_sta_mac_address_type = -1;
-static int hf_ieee1905_assoc_sta_mac_addr = -1;
-static int hf_ieee1905_assoc_sta_bssid_count = -1;
-static int hf_ieee1905_assoc_sta_link_metrics_bssid = -1;
-static int hf_ieee1905_assoc_sta_link_metrics_time_delta = -1;
-static int hf_ieee1905_assoc_sta_link_metrics_dwn_rate = -1;
-static int hf_ieee1905_assoc_sta_link_metrics_up_rate = -1;
-static int hf_ieee1905_assoc_sta_link_metrics_rcpi = -1;
-static int hf_ieee1905_assoc_wf6_sta_mac_addr = -1;
-static int hf_ieee1905_assoc_wf6_sta_tid_count = -1;
-static int hf_ieee1905_assoc_wf6_sta_tid = -1;
-static int hf_ieee1905_assoc_wf6_sta_queue_size = -1;
-static int hf_ieee1905_assoc_sta_ext_link_metrics_mac_addr = -1;
-static int hf_ieee1905_assoc_sta_ext_link_metrics_count = -1;
-static int hf_ieee1905_assoc_sta_extended_metrics_bssid = -1;
-static int hf_ieee1905_assoc_sta_extended_metrics_lddlr = -1;
-static int hf_ieee1905_assoc_sta_extended_metrics_ldulr = -1;
-static int hf_ieee1905_assoc_sta_extended_metrics_ur = -1;
-static int hf_ieee1905_assoc_sta_extended_metrics_tr = -1;
-static int hf_ieee1905_unassoc_sta_link_channel_count = -1;
-static int hf_ieee1905_unassoc_metrics_channel = -1;
-static int hf_ieee1905_unassoc_metrics_mac_count = -1;
-static int hf_ieee1905_he_max_supported_tx_streams = -1;
-static int hf_ieee1905_he_max_supported_rx_streams = -1;
-static int hf_ieee1905_he_support_80plus_mhz_flag = -1;
-static int hf_ieee1905_he_support_160mhz_flag = -1;
-static int hf_ieee1905_he_su_beamformer_capable_flag = -1;
-static int hf_ieee1905_he_mu_beamformer_capable_flag = -1;
-static int hf_ieee1905_ul_mu_mimo_capable_flag = -1;
-static int hf_ieee1905_ul_mu_mimo_ofdma_capable_flag = -1;
-static int hf_ieee1905_dl_mu_mimo_ofdma_capable_flag = -1;
-static int hf_ieee1905_ul_ofdma_capable = -1;
-static int hf_ieee1905_dl_ofdma_capable = -1;
-static int hf_ieee1905_he_cap_flags = -1;
-static int hf_ieee1905_steering_policy_local_disallowed_count = -1;
-static int hf_ieee1905_steering_disallowed_mac_addr = -1;
-static int hf_ieee1905_btm_steering_disallowed_count = -1;
-static int hf_ieee1905_btm_steering_disallowed_mac_addr = -1;
-static int hf_ieee1905_steering_policy_radio_count = -1;
-static int hf_ieee1905_steering_policy_radio_id = -1;
-static int hf_ieee1905_steering_policy_policy = -1;
-static int hf_ieee1905_steering_policy_util = -1;
-static int hf_ieee1905_steering_policy_rcpi_threshold = -1;
-static int hf_ieee1905_radio_restriction_radio_id = -1;
-static int hf_ieee1905_radio_restriction_op_class_count = -1;
-static int hf_ieee1905_radio_restriction_op_class = -1;
-static int hf_ieee1905_radio_restriction_chan_count = -1;
-static int hf_ieee1905_radio_restriction_channel = -1;
-static int hf_ieee1905_radio_restriction_min_separation = -1;
-static int hf_ieee1905_ap_metrics_agent_bssid = -1;
-static int hf_ieee1905_include_estimated_spi_ac_eq_be = -1;
-static int hf_ieee1905_include_estimated_spi_ac_eq_bk = -1;
-static int hf_ieee1905_include_estimated_spi_ac_eq_vo = -1;
-static int hf_ieee1905_include_estimated_spi_ac_eq_vi = -1;
-static int hf_ieee1905_ap_metrics_channel_utilization = -1;
-static int hf_ieee1905_ap_metrics_sta_count = -1;
-static int hf_ieee1905_ap_metrics_flags = -1;
-static int hf_ieee1905_ap_metrics_service_params_be = -1;
-static int hf_ieee1905_ap_metrics_service_params_bk = -1;
-static int hf_ieee1905_ap_metrics_service_params_vo = -1;
-static int hf_ieee1905_ap_metrics_service_params_vi = -1;
-static int hf_ieee1905_unassoc_sta_link_metric_op_class = -1;
-static int hf_ieee1905_unassoc_sta_link_metric_sta_count = -1;
-static int hf_ieee1905_unassoc_link_metric_mac_addr = -1;
-static int hf_ieee1905_unassoc_link_metric_channel = -1;
-static int hf_ieee1905_unassoc_link_metric_delta = -1;
-static int hf_ieee1905_unassoc_link_metric_uplink_rcpi = -1;
-static int hf_ieee1905_beacon_metrics_query_mac_addr = -1;
-static int hf_ieee1905_beacon_metrics_query_op_class = -1;
-static int hf_ieee1905_beacon_metrics_query_channel = -1;
-static int hf_ieee1905_beacon_metrics_query_bssid = -1;
-static int hf_ieee1905_beacon_metrics_query_detail = -1;
-static int hf_ieee1905_beacon_metrics_query_ssid_len = -1;
-static int hf_ieee1905_beacon_metrics_query_ssid = -1;
-static int hf_ieee1905_beacon_metrics_channel_count = -1;
-static int hf_ieee1905_beacon_metrics_report_len = -1;
-static int hf_ieee1905_beacon_metrics_report_op_class = -1;
-static int hf_ieee1905_beacon_metrics_report_channel_id = -1;
-static int hf_ieee1905_measurement_report = -1;
-static int hf_ieee1905_beacon_metrics_response_mac_addr = -1;
-static int hf_ieee1905_beacon_metrics_response_reserved = -1;
-static int hf_ieee1905_beacon_metrics_response_meas_num = -1;
-static int hf_ieee1905_assoc_sta_traffic_stats_mac_addr = -1;
-static int hf_ieee1905_assoc_sta_traffic_stats_bytes_sent = -1;
-static int hf_ieee1905_assoc_sta_traffic_stats_bytes_rcvd = -1;
-static int hf_ieee1905_assoc_sta_traffic_stats_packets_sent = -1;
-static int hf_ieee1905_assoc_sta_traffic_stats_packets_rcvd = -1;
-static int hf_ieee1905_assoc_sta_traffic_stats_tx_pkt_errs = -1;
-static int hf_ieee1905_assoc_sta_traffic_stats_rx_pkt_errs = -1;
-static int hf_ieee1905_assoc_sta_traffic_stats_retrans_count = -1;
-static int hf_ieee1905_error_code_value = -1;
-static int hf_ieee1905_error_code_mac_addr = -1;
-static int hf_ieee1905_channel_scan_rep_policy = -1;
-static int hf_ieee1905_channel_scan_pol_report = -1;
-static int hf_ieee1905_channel_scan_pol_reserved = -1;
-static int hf_ieee1905_channel_scan_capabilities_radio_num = -1;
-static int hf_ieee1905_channel_scan_capa_radio_id = -1;
-static int hf_ieee1905_channel_scan_capa_flags = -1;
-static int hf_ieee1905_channel_scan_capa_flags_on_boot_only = -1;
-static int hf_ieee1905_channel_scan_capa_flags_scan_impact = -1;
-static int hf_ieee1905_channel_scan_capa_flags_reserved = -1;
-static int hf_ieee1905_channel_scan_capa_min_scan_interval = -1;
-static int hf_ieee1905_channel_scan_capa_class_num = -1;
-static int hf_ieee1905_channel_scan_capa_oper_class = -1;
-static int hf_ieee1905_channel_scan_capa_oper_class_chan_cnt = -1;
-static int hf_ieee1905_channel_scan_capa_channel = -1;
-static int hf_ieee1905_channel_scan_request_flags = -1;
-static int hf_ieee1905_channel_scan_request_flags_fresh_scan = -1;
-static int hf_ieee1905_channel_scan_request_flags_reserved = -1;
-static int hf_ieee1905_channel_scan_request_radio_num = -1;
-static int hf_ieee1905_channel_scan_request_radio_id = -1;
-static int hf_ieee1905_channel_scan_request_class_num = -1;
-static int hf_ieee1905_channel_scan_request_oper_class = -1;
-static int hf_ieee1905_channel_scan_request_oper_class_chan_cnt = -1;
-static int hf_ieee1905_channel_scan_request_channel = -1;
-static int hf_ieee1905_channel_scan_result_radio_id = -1;
-static int hf_ieee1905_channel_scan_result_oper_class = -1;
-static int hf_ieee1905_channel_scan_result_channel = -1;
-static int hf_ieee1905_channel_scan_result_status = -1;
-static int hf_ieee1905_channel_scan_result_timestamp_len = -1;
-static int hf_ieee1905_channel_scan_result_timestamp_string = -1;
-static int hf_ieee1905_channel_scan_result_utilization = -1;
-static int hf_ieee1905_channel_scan_result_noise = -1;
-static int hf_ieee1905_radio_metrics_noise = -1;
-static int hf_ieee1905_radio_metrics_transmit = -1;
-static int hf_ieee1905_radio_metrics_receive_self = -1;
-static int hf_ieee1905_radio_metrics_receive_other = -1;
-static int hf_ieee1905_ap_extended_metrics_bssid = -1;
-static int hf_ieee1905_ap_extended_metrics_unicast_sent = -1;
-static int hf_ieee1905_ap_extended_metrics_unicast_rcvd = -1;
-static int hf_ieee1905_ap_extended_metrics_multicast_sent = -1;
-static int hf_ieee1905_ap_extended_metrics_multicast_rcvd = -1;
-static int hf_ieee1905_ap_extended_metrics_bcast_sent = -1;
-static int hf_ieee1905_ap_extended_metrics_bcast_rcvd = -1;
-static int hf_ieee1905_channel_scan_result_neigh_num = -1;
-static int hf_ieee1905_channel_scan_result_bssid = -1;
-static int hf_ieee1905_channel_scan_result_ssid_len = -1;
-static int hf_ieee1905_channel_scan_result_ssid = -1;
-static int hf_ieee1905_channel_scan_result_sig_level = -1;
-static int hf_ieee1905_channel_scan_result_bw_len = -1;
-static int hf_ieee1905_channel_scan_result_bw = -1;
-static int hf_ieee1905_channel_scan_result_neigh_flags = -1;
-static int hf_ieee1905_channel_scan_result_load_element_present = -1;
-static int hf_ieee1905_channel_scan_result_neigh_reserved = -1;
-static int hf_ieee1905_channel_scan_result_util = -1;
-static int hf_ieee1905_channel_scan_result_sta_count = -1;
-static int hf_ieee1905_channel_scan_result_scan_duration = -1;
-static int hf_ieee1905_channel_scan_result_flags = -1;
-static int hf_ieee1905_channel_scan_result_scan_type = -1;
-static int hf_ieee1905_channel_scan_result_scan_flags_reserved = -1;
-static int hf_ieee1905_timestamp_length = -1;
-static int hf_ieee1905_timestamp_string = -1;
-static int hf_ieee1905_1905_layer_sec_capa_onboarding = -1;
-static int hf_ieee1905_1905_layer_sec_capa_mic_sup = -1;
-static int hf_ieee1905_1905_layer_sec_capa_enc_alg_sup = -1;
-static int hf_ieee1905_ap_wf6_capa_radio_id = -1;
-static int hf_ieee1905_ap_wf6_role_count = -1;
-static int hf_ieee1905_ap_wf6_agent_role_flags = -1;
-static int hf_ieee1905_ap_wf6_capa_agents_role = -1;
-static int hf_ieee1905_ap_wf6_capa_he_160_support = -1;
-static int hf_ieee1905_ap_wf6_capa_he_80p80_support = -1;
-static int hf_ieee1905_ap_wf6_capa_reserved = -1;
-static int hf_ieee1905_ap_wf6_he_supported_flags = -1;
-static int hf_ieee1905_ap_wf6_su_beamformer = -1;
-static int hf_ieee1905_ap_wf6_su_beamformee = -1;
-static int hf_ieee1905_ap_wf6_mu_beamformer_status = -1;
-static int hf_ieee1905_ap_wf6_beamformee_sts_le_80mhz = -1;
-static int hf_ieee1905_ap_wf6_beamformee_sts_gt_80mhz = -1;
-static int hf_ieee1905_ap_wf6_ul_mu_mimo = -1;
-static int hf_ieee1905_ap_wf6_ul_ofdma = -1;
-static int hf_ieee1905_ap_wf6_dl_ofdma = -1;
-static int hf_ieee1905_ap_wf6_mimo_max_flags = -1;
-static int hf_ieee1905_ap_wf6_max_ap_dl_mu_mimo_tx = -1;
-static int hf_ieee1905_ap_wf6_max_ap_ul_mu_mimi_rx = -1;
-static int hf_ieee1905_ap_wf6_dl_ofdma_max_tx = -1;
-static int hf_ieee1905_ap_wf6_ul_ofdma_max_rx = -1;
-static int hf_ieee1905_ap_wf6_gen_flags = -1;
-static int hf_ieee1905_ap_wf6_gen_rts = -1;
-static int hf_ieee1905_ap_wf6_gen_mu_rts = -1;
-static int hf_ieee1905_ap_wf6_gen_multi_bssid = -1;
-static int hf_ieee1905_ap_wf6_gen_mu_edca = -1;
-static int hf_ieee1905_ap_wf6_gen_twt_requester = -1;
-static int hf_ieee1905_ap_wf6_gen_twt_responder = -1;
-static int hf_ieee1905_ap_wf6_gen_reserved = -1;
-static int hf_ieee1905_agent_list_bytes = -1;
-static int hf_ieee1905_mic_group_temporal_key_id = -1;
-static int hf_ieee1905_mic_integrity_transmission_counter = -1;
-static int hf_ieee1905_mic_source_la_mac_id = -1;
-static int hf_ieee1905_mic_length = -1;
-static int hf_ieee1905_mic_bytes = -1;
-static int hf_ieee1905_1905_gtk_key_id = -1;
-static int hf_ieee1905_mic_version = -1;
-static int hf_ieee1905_mic_reserved = -1;
-static int hf_ieee1905_encrypted_dest_al_mac_addr = -1;
-static int hf_ieee1905_encrypted_enc_transmission_count = -1;
-static int hf_ieee1905_encrypted_source_la_mac_id = -1;
-static int hf_ieee1905_encrypted_enc_output_field_len = -1;
-static int hf_ieee1905_encrypted_enc_output_field = -1;
-static int hf_ieee1905_cac_request_radio_count = -1;
-static int hf_ieee1905_cac_request_radio_id = -1;
-static int hf_ieee1905_cac_request_op_class = -1;
-static int hf_ieee1905_cac_request_channel = -1;
-static int hf_ieee1905_cac_request_flags = -1;
-static int hf_ieee1905_cac_request_method = -1;
-static int hf_ieee1905_cac_request_completion_action = -1;
-static int hf_ieee1905_cac_request_completion_unsuccess = -1;
-static int hf_ieee1905_cac_request_reserved = -1;
-static int hf_ieee1905_cac_termination_radio_count = -1;
-static int hf_ieee1905_cac_terminate_radio_id = -1;
-static int hf_ieee1905_cac_terminate_op_class = -1;
-static int hf_ieee1905_cac_terminate_channel = -1;
-static int hf_ieee1905_cac_completion_rep_radio_count = -1;
-static int hf_ieee1905_cac_completion_radio_id = -1;
-static int hf_ieee1905_cac_completion_op_class = -1;
-static int hf_ieee1905_cac_completion_channel = -1;
-static int hf_ieee1905_cac_completion_status = -1;
-static int hf_ieee1905_cac_completion_radar_count = -1;
-static int hf_ieee1905_cac_comp_radar_op_class = -1;
-static int hf_ieee1905_cac_comp_radar_channel = -1;
-static int hf_ieee1905_cac_status_rpt_active_chan = -1;
-static int hf_ieee1905_cac_status_rpt_avail_op_class = -1;
-static int hf_ieee1905_cac_status_rpt_avail_channel = -1;
-static int hf_ieee1905_cac_status_rpt_avail_minutes = -1;
-static int hf_ieee1905_cac_status_rpt_non_occ_cnt = -1;
-static int hf_ieee1905_cac_status_rpt_non_occ_op_class = -1;
-static int hf_ieee1905_cac_status_rpt_non_occ_channel = -1;
-static int hf_ieee1905_cac_status_rpt_non_occ_seconds = -1;
-static int hf_ieee1905_cac_status_rpt_active_cac_cnt = -1;
-static int hf_ieee1905_cac_status_rpt_active_cac_op_class = -1;
-static int hf_ieee1905_cac_status_rpt_active_cac_channel = -1;
-static int hf_ieee1905_cac_status_rpt_active_cac_seconds = -1;
-static int hf_ieee1905_cac_capa_country_code = -1;
-static int hf_ieee1905_cac_capa_radio_cnt = -1;
-static int hf_ieee1905_cac_capabilities_radio_id = -1;
-static int hf_ieee1905_cac_capabilities_types_num = -1;
-static int hf_ieee1905_cac_capabilities_cac_mode = -1;
-static int hf_ieee1905_cac_capabilities_cac_seconds = -1;
-static int hf_ieee1905_cac_capabilities_op_class_num = -1;
-static int hf_ieee1905_cac_capabilities_op_class = -1;
-static int hf_ieee1905_cac_capabilities_channel_cnt = -1;
-static int hf_ieee1905_cac_capabillity_channel = -1;
-static int hf_ieee1905_multi_ap_version = -1;
-static int hf_ieee1905_max_total_serv_prio_rules = -1;
-static int hf_ieee1905_r2_ap_capa_reserved = -1;
-static int hf_ieee1905_r2_ap_capa_flags = -1;
-static int hf_ieee1905_byte_counter_units = -1;
-static int hf_ieee1905_ctag_service_prio_flag = -1;
-static int hf_ieee1905_dpp_onboarding_flag = -1;
-static int hf_ieee1905_traffic_separation_flag = -1;
-static int hf_ieee1905_r2_ap_capa_flags_reserved = -1;
-static int hf_ieee1905_max_vid_count = -1;
-static int hf_ieee1905_default_802_1q_settings_primary_vlan = -1;
-static int hf_ieee1905_default_802_1q_settings_flags = -1;
-static int hf_ieee1905_default_802_1q_settings_default_pcp = -1;
-static int hf_ieee1905_default_802_1q_settings_reserved = -1;
-static int hf_ieee1905_ap_radio_advanced_capa_radio_id = -1;
-static int hf_ieee1905_radio_advanced_capa_flags = -1;
-static int hf_ieee1905_traffic_separation_policy_num_ssids = -1;
-static int hf_ieee1905_traffic_separation_policy_ssid_len = -1;
-static int hf_ieee1905_traffic_separation_policy_ssid = -1;
-static int hf_ieee1905_traffic_separation_policy_vlanid = -1;
-static int hf_ieee1905_bss_config_report_radio_count = -1;
-static int hf_ieee1905_bss_config_report_radio_id = -1;
-static int hf_ieee1905_bss_config_report_flags = -1;
-static int hf_ieee1905_bss_config_report_backhaul_bss = -1;
-static int hf_ieee1905_bss_config_report_fronthaul_bss = -1;
-static int hf_ieee1905_bss_config_report_r1_disallowed_status = -1;
-static int hf_ieee1905_bss_config_report_r2_disallowed_status = -1;
-static int hf_ieee1905_bss_config_report_multiple_bssid_set = -1;
-static int hf_ieee1905_bss_config_report_transmitted_bssid = -1;
-static int hf_ieee1905_bss_config_report_reserved = -1;
-static int hf_ieee1905_bss_config_report_res = -1;
-static int hf_ieee1905_bss_config_report_bss_cnt = -1;
-static int hf_ieee1902_bss_config_report_mac = -1;
-static int hf_ieee1902_bss_config_report_ssid_len = -1;
-static int hf_ieee1905_bss_config_report_ssid = -1;
-static int hf_ieee1905_bssid_tlv_bssid = -1;
-static int hf_ieee1905_service_prio_rule_id = -1;
-static int hf_ieee1905_service_prio_rule_flags = -1;
-static int hf_ieee1905_service_prio_rule_add_remove_filter_bit = -1;
-static int hf_ieee1905_service_prio_rule_flags_reserved = -1;
-static int hf_ieee1905_service_prio_match_flags = -1;
-static int hf_ieee1905_service_prio_rule_precedence = -1;
-static int hf_ieee1905_service_prio_rule_output = -1;
-static int hf_ieee1905_service_prio_rule_match_always = -1;
-static int hf_ieee1905_service_prio_rule_match_reserved = -1;
-static int hf_ieee1905_service_prio_rule_match_up_in_qos = -1;
-static int hf_ieee1905_service_prio_rule_match_up_control_match = -1;
-static int hf_ieee1905_service_prio_rule_match_source_mac = -1;
-static int hf_ieee1905_service_prio_rule_match_source_mac_sense = -1;
-static int hf_ieee1905_service_prio_rule_match_dest_mac = -1;
-static int hf_ieee1905_service_prio_rule_match_dest_mac_sense = -1;
-static int hf_ieee1905_service_prio_rule_up_control = -1;
-static int hf_ieee1905_service_prio_rule_source_mac = -1;
-static int hf_ieee1905_service_prio_rule_dest_mac = -1;
-static int hf_ieee1905_dscp_mapping_table_val = -1;
-static int hf_ieee1905_r2_error_reason_code = -1;
-static int hf_ieee1905_r2_error_bssid = -1;
-static int hf_ieee1905_ap_radio_advance_capa_backhaul_bss_traffic_sep = -1;
-static int hf_ieee1905_ap_radio_advance_capa_combined_r1_r2_backhaul = -1;
-static int hf_ieee1905_ap_radio_advance_capa_reserved = -1;
-static int hf_ieee1905_assoc_status_notif_num_bssid = -1;
-static int hf_ieee1905_assoc_status_notif_bssid = -1;
-static int hf_ieee1905_assoc_status_notif_status = -1;
-static int hf_ieee1905_source_info_mac_addr = -1;
-static int hf_ieee1905_tunneled_message_type = -1;
-static int hf_ieee1905_tunneled_data = -1;
-static int hf_ieee1905_status_code_status = -1;
-static int hf_ieee1905_disassociation_reason_code = -1;
-static int hf_ieee1905_backhaul_sta_radio_id = -1;
-static int hf_ieee1905_backhaul_sta_radio_capabilities = -1;
-static int hf_ieee1905_backhaul_sta_radio_capa_mac_included = -1;
-static int hf_ieee1905_backhaul_sta_radio_capa_reserved = -1;
-static int hf_ieee1905_backhaul_sta_addr = -1;
-static int hf_ieee1905_backhaul_akm_suite_capa_count = -1;
-static int hf_ieee1905_akm_backhaul_suite_oui = -1;
-static int hf_ieee1905_akm_backhaul_suite_type = -1;
-static int hf_ieee1905_fronthaul_akm_suite_capa_count = -1;
-static int hf_ieee1905_akm_fronthaul_suite_oui = -1;
-static int hf_ieee1905_akm_fronthaul_suite_type = -1;
-static int hf_ieee1905_encap_dpp_flags = -1;
-static int hf_ieee1905_dpp_encap_enrollee_mac_present = -1;
-static int hf_ieee1905_dpp_encap_reserved = -1;
-static int hf_ieee1905_dpp_encap_frame_type_flag = -1;
-static int hf_ieee1905_dpp_encap_reserved2 = -1;
-static int hf_ieee1905_encap_dpp_sta_mac = -1;
-static int hf_ieee1905_dpp_encap_frame_type = -1;
-static int hf_ieee1905_dpp_encap_frame_length = -1;
-static int hf_ieee1905_dpp_encap_dpp_oui = -1;
-static int hf_ieee1905_dpp_encap_category = -1;
-static int hf_ieee1905_dpp_encap_public_action = -1;
-static int hf_ieee1905_dpp_encap_dpp_subtype = -1;
-static int hf_ieee1905_dpp_bootstrapping_uri_radio_id = -1;
-static int hf_ieee1905_dpp_bootstrapping_uri_local_mac_addr = -1;
-static int hf_ieee1905_dpp_bootstrapping_uri_bsta_mac_addr = -1;
-static int hf_ieee1905_dpp_bootstrapping_uri_received = -1;
-static int hf_ieee1905_dpp_advertise_cce_flag = -1;
-static int hf_ieee1905_dpp_chirp_value_flags = -1;
-static int hf_ieee1905_dpp_chirp_enrollee_mac_addr_present = -1;
-static int hf_ieee1905_dpp_chirp_hash_validity = -1;
-static int hf_ieee1905_dpp_chirp_reserved = -1;
-static int hf_ieee1905_dpp_chirp_enrollee_mac_addr = -1;
-static int hf_ieee1905_dpp_chirp_value_hash_length = -1;
-static int hf_ieee1905_dpp_chirp_value_hash_value = -1;
-static int hf_ieee1905_dev_inventory_lsn = -1;
-static int hf_ieee1905_dev_inventory_serial = -1;
-static int hf_ieee1905_dev_inventory_lsv = -1;
-static int hf_ieee1905_dev_inventory_sw_vers = -1;
-static int hf_ieee1905_dev_inventory_lee = -1;
-static int hf_ieee1905_dev_inventory_exec_env = -1;
-static int hf_ieee1905_dev_inventory_num_radios = -1;
-static int hf_ieee1905_dev_inventory_radio_id = -1;
-static int hf_ieee1905_dev_inventory_lcv = -1;
-static int hf_ieee1905_dev_inventory_chp_ven = -1;
-static int hf_ieee1905_r2_steering_req_src_bssid = -1;
-static int hf_ieee1905_r2_steering_req_flags = -1;
-static int hf_ieee1905_r2_steering_request_mode_flag = -1;
-static int hf_ieee1905_r2_btm_disassoc_imminent_flag = -1;
-static int hf_ieee1905_r2_btm_abridged_flag = -1;
-static int hf_ieee1905_r2_steering_req_reserved = -1;
-static int hf_ieee1905_r2_steering_op_window = -1;
-static int hf_ieee1905_r2_steering_btm_dissasoc_tmr = -1;
-static int hf_ieee1905_r2_steering_sta_count = -1;
-static int hf_ieee1905_r2_steering_sta_mac = -1;
-static int hf_ieee1905_r2_steering_target_count = -1;
-static int hf_ieee1905_r2_steering_target_bssid = -1;
-static int hf_ieee1905_r2_steering_target_op_class = -1;
-static int hf_ieee1905_r2_steering_target_channel = -1;
-static int hf_ieee1905_r2_steering_reason = -1;
-static int hf_ieee1905_metric_collection_interval = -1;
-static int hf_ieee1905_max_reporting_rate = -1;
-static int hf_ieee1905_bss_configuration_request = -1;
-static int hf_ieee1905_bss_configuration_response = -1;
-static int hf_ieee1905_dpp_message_category = -1;
-static int hf_ieee1905_dpp_message_public_action = -1;
-static int hf_ieee1905_spatial_reuse_req_radio_id = -1;
-static int hf_ieee1905_spatial_reuse_color_flags = -1;
-static int hf_ieee1905_spatial_reuse_reserved = -1;
-static int hf_ieee1905_spatial_reuse_bss_color = -1;
-static int hf_ieee1905_spatial_reuse_hesiga_flags = -1;
-static int hf_ieee1905_spatial_reuse_reserved2 = -1;
-static int hf_ieee1905_spatial_reuse_hesiga_value15_allowed = -1;
-static int hf_ieee1905_spatial_reuse_srg_info_valid = -1;
-static int hf_ieee1905_spatial_reuse_non_srg_offset_valid = -1;
-static int hf_ieee1905_spatial_reuse_reserved3 = -1;
-static int hf_ieee1905_spatial_reuse_psr_disallowed = -1;
-static int hf_ieee1905_spatial_reuse_non_srg_obsspd_max_offset = -1;
-static int hf_ieee1905_spatial_reuse_not_valid1 = -1;
-static int hf_ieee1905_spatial_reuse_srg_obsspd_min_offset = -1;
-static int hf_ieee1905_spatial_reuse_srg_obsspd_max_offset = -1;
-static int hf_ieee1905_spatial_reuse_srg_bss_color_bitmap = -1;
-static int hf_ieee1905_spatial_reuse_srg_partial_bssid_bitmap = -1;
-static int hf_ieee1905_spatial_reuse_not_valid2 = -1;
-static int hf_ieee1905_spatial_reuse_not_valid3 = -1;
-static int hf_ieee1905_spatial_reuse_not_valid4 = -1;
-static int hf_ieee1905_spatial_reuse_not_valid5 = -1;
-static int hf_ieee1905_spatial_reuse_reserved4 = -1;
-static int hf_ieee1905_spatial_reuse_rep_radio_id = -1;
-static int hf_ieee1905_spatial_reuse_rep_color_flags = -1;
-static int hf_ieee1905_spatial_reuse_rep_reserved = -1;
-static int hf_ieee1905_spatial_reuse_rep_partial_bss_color = -1;
-static int hf_ieee1905_spatial_reuse_rep_bss_color = -1;
-static int hf_ieee1905_spatial_reuse_rep_hesiga_flags = -1;
-static int hf_ieee1905_spatial_reuse_rep_reserved2 = -1;
-static int hf_ieee1905_spatial_reuse_rep_hesiga_value15_allowed = -1;
-static int hf_ieee1905_spatial_reuse_rep_srg_info_valid = -1;
-static int hf_ieee1905_spatial_reuse_rep_non_srg_offset_valid = -1;
-static int hf_ieee1905_spatial_reuse_rep_reserved3 = -1;
-static int hf_ieee1905_spatial_reuse_rep_psr_disallowed = -1;
-static int hf_ieee1905_spatial_reuse_rep_non_srg_obsspd_max_offset = -1;
-static int hf_ieee1905_spatial_reuse_rep_not_valid1 = -1;
-static int hf_ieee1905_spatial_reuse_rep_srg_obsspd_min_offset = -1;
-static int hf_ieee1905_spatial_reuse_rep_srg_obsspd_max_offset = -1;
-static int hf_ieee1905_spatial_reuse_rep_srg_bss_color_bitmap = -1;
-static int hf_ieee1905_spatial_reuse_rep_srg_partial_bssid_bitmap = -1;
-static int hf_ieee1905_spatial_reuse_rep_not_valid2 = -1;
-static int hf_ieee1905_spatial_reuse_rep_not_valid3 = -1;
-static int hf_ieee1905_spatial_reuse_rep_not_valid4 = -1;
-static int hf_ieee1905_spatial_reuse_rep_not_valid5 = -1;
-static int hf_ieee1905_spatial_reuse_rep_nbor_bss_color_bitmap = -1;
-static int hf_ieee1905_spatial_reuse_rep_reserved4 = -1;
-static int hf_ieee1905_spatial_reuse_config_radio_id = -1;
-static int hf_ieee1905_spatial_reuse_config_response = -1;
-static int hf_ieee1905_qos_mgmt_policy_mscs_disallowed = -1;
-static int hf_ieee1905_qos_mgmt_mscs_disallow_sta = -1;
-static int hf_ieee1905_qos_mgmt_policy_scs_disallowed = -1;
-static int hf_ieee1905_qos_mgmt_scs_disallow_sta = -1;
-static int hf_ieee1905_qos_mgmt_desc_qmid = -1;
-static int hf_ieee1905_qos_mgmt_desc_bssid = -1;
-static int hf_ieee1905_qos_mgmt_desc_client_mac = -1;
-static int hf_ieee1905_controller_capa_flags = -1;
-static int hf_ieee1905_controller_capa_reserved = -1;
-static int hf_ieee1905_controller_capa_early_ap_capa = -1;
-static int hf_ieee1905_controller_capa_kbmb_counter = -1;
-
-static gint ett_ieee1905 = -1;
-static gint ett_ieee1905_flags = -1;
-static gint ett_ieee1905_tlv_len = -1;
-static gint ett_tlv = -1;
-static gint ett_device_information_list = -1;
-static gint ett_device_information_tree = -1;
-static gint ett_media_type = -1;
-static gint ett_bridging_tuples_list = -1;
-static gint ett_bridging_mac_list = -1;
-static gint ett_non_1905_neighbor_list = -1;
-static gint ett_1905_neighbor_list = -1;
-static gint ett_ieee1905_neighbor_flags = -1;
-static gint ett_media_type_list = -1;
-static gint ett_media_item = -1;
-static gint ett_local_interface_list = -1;
-static gint ett_local_interface_info = -1;
-static gint ett_ipv4_list = -1;
-static gint ett_ipv4_info = -1;
-static gint ett_ipv4_type_addr_list = -1;
-static gint ett_ipv4_addr_info = -1;
-static gint ett_ipv6_list = -1;
-static gint ett_ipv6_info = -1;
-static gint ett_ipv6_type_addr_list = -1;
-static gint ett_ipv6_addr_info = -1;
-static gint ett_push_button_phy_list = -1;
-static gint ett_push_button_phy_info = -1;
-static gint ett_power_off_info = -1;
-static gint ett_power_change_list = -1;
-static gint ett_power_change_info = -1;
-static gint ett_power_status_list = -1;
-static gint ett_power_status_info = -1;
-static gint ett_l2_local_intf_list = -1;
-static gint ett_l2_neighbor_device_info = -1;
-static gint ett_l2_neighbor_dev_list = -1;
-static gint ett_l2_neighbor_dev_tree = -1;
-static gint ett_supported_service_list = -1;
-static gint ett_searched_service_list = -1;
-static gint ett_ap_operational_bss_list = -1;
-static gint ett_ap_operational_bss_tree = -1;
-static gint ett_ap_operational_bss_intf = -1;
-static gint ett_ap_operational_bss_intf_list = -1;
-static gint ett_ap_operational_bss_intf_tree = -1;
-static gint ett_ieee1905_capabilities_flags = -1;
-static gint ett_ieee1905_unsuccessful_associations = -1;
-static gint ett_assoc_control_list = -1;
-static gint ett_ieee1905_steering_request_flags = -1;
-static gint ett_ieee1905_association_event_flags = -1;
-static gint ett_radio_basic_class_list = -1;
-static gint ett_ap_radio_basic_cap_class_tree = -1;
-static gint ett_radio_basic_non_op_list = -1;
-static gint ett_ht_cap_flags = -1;
-static gint ett_vht_cap_flags = -1;
-static gint ett_assoc_clients_bss_list = -1;
-static gint ett_assoc_client_bss_tree = -1;
-static gint ett_assoc_client_list = -1;
-static gint ett_assoc_client_tree = -1;
-static gint ett_channel_preference_class_list = -1;
-static gint ett_ap_channel_preference_class_tree = -1;
-static gint ett_channel_pref_channel_list = -1;
-static gint ett_ieee1905_channel_prefs_flags = -1;
-static gint ett_op_channel_report_class_tree = -1;
-static gint ett_op_channel_report_class_list = -1;
-static gint ett_sta_link_metrics_query_channel_list = -1;
-static gint ett_sta_link_link_mac_addr_list = -1;
-static gint ett_metric_reporting_policy_list = -1;
-static gint ett_metric_reporting_policy_tree = -1;
-static gint ett_metric_policy_flags = -1;
-static gint ett_ap_metric_query_bssid_list = -1;
-static gint ett_ieee1905_ap_metrics_flags = -1;
-static gint ett_sta_list_metrics_bss_list = -1;
-static gint ett_sta_list_metrics_bss_tree = -1;
-static gint ett_sta_wf6_status_report_tid_list = -1;
-static gint ett_sta_wf6_status_report_tid_tree = -1;
-static gint ett_sta_extended_link_metrics_list = -1;
-static gint ett_sta_extended_link_metrics_tree = -1;
-static gint ett_ap_he_mcs_set = -1;
-static gint ett_ap_he_cap_flags = -1;
-static gint ett_ieee1905_ap_he_tx_mcs_set = -1;
-static gint ett_ieee1905_ap_he_rx_mcs_set = -1;
-static gint ett_steering_policy_disallowed_list = -1;
-static gint ett_btm_steering_policy_disallowed_list = -1;
-static gint ett_btm_steering_radio_list = -1;
-static gint ett_radio_restriction_op_class_list = -1;
-static gint ett_radio_restriction_op_class_tree = -1;
-static gint ett_radio_restriction_channel_list = -1;
-static gint ett_radio_restriction_channel_tree = -1;
-static gint ett_unassoc_sta_link_metric_list = -1;
-static gint ett_unassoc_sta_link_metric_tree = -1;
-static gint ett_beacon_metrics_query_list = -1;
-static gint ett_beacon_metrics_query_tree = -1;
-static gint ett_beacon_metrics_query_channel_list = -1;
-static gint ett_beacon_report_subelement_list = -1;
-static gint ett_beacon_report_sub_element_tree = -1;
-static gint ett_beacon_metrics_response_report_list = -1;
-static gint ett_beacon_metrics_response_report_tree = -1;
-static gint ett_ieee1905_beacon_reported_flags = -1;
-static gint ett_channel_scan_rep_policy = -1;
-static gint ett_channel_scan_capa_radio_list = -1;
-static gint ett_channel_scan_capa_radio = -1;
-static gint ett_channel_scan_capa_flags = -1;
-static gint ett_channel_scan_capa_class_list = -1;
-static gint ett_channel_scan_capa_class = -1;
-static gint ett_channel_scan_capa_channels = -1;
-static gint ett_channel_scan_request_flags = -1;
-static gint ett_channel_scan_request_radio_list = -1;
-static gint ett_channel_scan_request_radio = -1;
-static gint ett_channel_scan_request_class_list = -1;
-static gint ett_channel_scan_request_class = -1;
-static gint ett_channel_scan_request_channels = -1;
-static gint ett_channel_scan_result_neigh_list = -1;
-static gint ett_channel_scan_result_neigh_flags = -1;
-static gint ett_channel_scan_result_neigh = -1;
-static gint ett_channel_scan_result_flags = -1;
-static gint ett_ap_wf6_role_list = -1;
-static gint ett_ap_wf6_role_tree = -1;
-static gint ett_ap_wf6_agent_role_flags = -1;
-static gint ett_ap_wf6_supported_flags = -1;
-static gint ett_ap_wf6_mimo_max_flags = -1;
-static gint ett_ap_wf6_gen_flags = -1;
-static gint ett_cac_request_flags = -1;
-static gint ett_cac_request_radio_list = -1;
-static gint ett_cac_request_radio = -1;
-static gint ett_cac_terminate_radio_list = -1;
-static gint ett_cac_terminate_radio = -1;
-static gint ett_cac_completion_radio_list = -1;
-static gint ett_cac_completion_radio = -1;
-static gint ett_cac_completion_radar_list = -1;
-static gint ett_cac_completion_radar = -1;
-static gint ett_cac_status_rpt_avail_list = -1;
-static gint ett_cac_status_rpt_avail_chan = -1;
-static gint ett_cac_status_rpt_non_occupy_list = -1;
-static gint ett_cac_status_rpt_unocc_chan = -1;
-static gint ett_cac_status_rpt_active_cac_list = -1;
-static gint ett_cac_status_rpt_active_cac_tree = -1;
-static gint ett_cac_capabilities_radio_list = -1;
-static gint ett_cac_capabilities_radio_tree = -1;
-static gint ett_cac_capabilities_type_list = -1;
-static gint ett_cac_capabilities_type_tree = -1;
-static gint ett_cac_capabilities_class_list = -1;
-static gint ett_cac_capabilities_class_tree = -1;
-static gint ett_cac_capabilities_channel_list = -1;
-static gint ett_cac_capabilities_channel = -1;
-static gint ett_r2_ap_capa_flags = -1;
-static gint ett_edge_interface_list = -1;
-static gint ett_radio_advanced_capa_flags = -1;
-static gint ett_ap_operational_backhaul_bss_tree = -1;
-static gint ett_ap_operational_backhaul_bss_intf_list = -1;
-static gint ett_default_802_1q_settings_flags = -1;
-static gint ett_traffic_separation_ssid_list = -1;
-static gint ett_traffic_separation_ssid = -1;
-static gint ett_bss_config_report_list = -1;
-static gint ett_bss_config_report_tree = -1;
-static gint ett_bss_config_report_bss_list = -1;
-static gint ett_bss_config_report_bss_tree = -1;
-static gint ett_bss_config_report_flags = -1;
-static gint ett_ethernet_config_policy_list = -1;
-static gint ett_ethernet_config_policy = -1;
-static gint ett_ethernet_config_policy_flags = -1;
-static gint ett_ieee1905_service_prio_rule_flags = -1;
-static gint ett_ieee1905_service_prio_rule_match_flags = -1;
-static gint ett_backhaul_sta_radio_capa_flags = -1;
-static gint ett_assoc_status_notif_bssid_list = -1;
-static gint ett_assoc_status_notif_bssid_tree = -1;
-static gint ett_akm_suite_list = -1;
-static gint ett_akm_suite = -1;
-static gint ett_backhaul_akm_suite_list = -1;
-static gint ett_backhaul_akm_suite = -1;
-static gint ett_fronthaul_akm_suite_list = -1;
-static gint ett_fronthaul_akm_suite = -1;
-static gint ett_1905_encap_dpp_flags = -1;
-static gint ett_1905_encap_dpp_classes = -1;
-static gint ett_1905_encap_dpp_op_class_tree = -1;
-static gint ett_1905_encap_dpp_channel_list = -1;
-static gint ett_ieee1905_dpp_chirp = -1;
-static gint ett_device_inventory_radio_list = -1;
-static gint ett_device_inventory_radio_tree = -1;
-static gint ett_r2_steering_sta_list = -1;
-static gint ett_r2_steering_target_list = -1;
-static gint ett_r2_steering_target = -1;
-static gint ett_mic_group_temporal_key = -1;
-static gint ett_ieee1905_spatial_reuse_color = -1;
-static gint ett_ieee1905_spatial_reuse_hesiga = -1;
-static gint ett_ieee1905_spatial_reuse_rep_color = -1;
-static gint ett_ieee1905_spatial_reuse_rep_hesiga = -1;
-static gint ett_qos_mgmt_policy_mscs_list = -1;
-static gint ett_qos_mgmt_policy_scs_list = -1;
-static gint ett_ieee1905_controller_capa = -1;
-
-static gint ett_ieee1905_fragment = -1;
-static gint ett_ieee1905_fragments = -1;
-
-static expert_field ei_ieee1905_malformed_tlv = EI_INIT;
-static expert_field ei_ieee1905_extraneous_tlv_data = EI_INIT;
+static int proto_ieee1905;
+static int hf_ieee1905_fragment_data;
+static int hf_ieee1905_message_version;
+static int hf_ieee1905_message_reserved;
+static int hf_ieee1905_message_type;
+static int hf_ieee1905_message_id;
+static int hf_ieee1905_fragment_id;
+static int hf_ieee1905_flags;
+static int hf_ieee1905_last_fragment;
+static int hf_ieee1905_relay_indicator;
+static int hf_ieee1905_tlv_types;
+static int hf_ieee1905_tlv_len;
+static int hf_ieee1905_tlv_len_reserved;
+static int hf_ieee1905_tlv_len_length;
+static int hf_ieee1905_tlv_data;
+static int hf_ieee1905_al_mac_address_type;
+static int hf_ieee1905_mac_address_type;
+static int hf_ieee1905_link_metric_query_type;
+static int hf_ieee1905_link_metrics_requested;
+static int hf_ieee1905_responder_al_mac_addr;
+static int hf_ieee1905_neighbor_al_mac_addr;
+static int hf_ieee1905_receiving_al_mac_addr;
+static int hf_ieee1905_bridge_flag;
+static int hf_ieee1905_packet_errors;
+static int hf_ieee1905_transmitted_packets;
+static int hf_ieee1905_mac_throughput_capacity;
+static int hf_ieee1905_link_availability;
+static int hf_ieee1905_phy_rate;
+static int hf_ieee1905_packets_received;
+static int hf_ieee1905_rssi;
+static int hf_ieee1905_extra_tlv_data;
+static int hf_ieee1905_local_interface_count;
+static int hf_ieee1905_media_type;
+static int hf_ieee1905_media_spec_info_len;
+static int hf_ieee1905_media_spec_info;
+static int hf_ieee1905_media_type_high;
+static int hf_ieee1905_media_type_low;
+static int hf_ieee1905_bridging_tuples_cnt;
+static int hf_ieee1905_bridging_mac_address_cnt;
+static int hf_ieee1905_bridging_mac_address;
+static int hf_ieee1905_local_interface_mac;
+static int hf_ieee1905_non_1905_neighbor_mac;
+static int hf_ieee1905_neighbor_flags;
+static int hf_ieee1905_bridges_flag;
+static int hf_ieee1905_link_metric_result_code;
+static int hf_ieee1905_vendor_specific_oui;
+static int hf_ieee1905_vendor_specific_info;
+static int hf_ieee1905_searched_role;
+static int hf_ieee1905_supported_role;
+static int hf_ieee1905_auto_config_freq_band;
+static int hf_ieee1905_supported_freq_band;
+static int hf_ieee1905_event_notification_media_types;
+static int hf_ieee1905_sender_al_id;
+static int hf_ieee1905_push_button_event_msg_id;
+static int hf_ieee1905_sender_joining_interface;
+static int hf_ieee1905_new_device_interface;
+static int hf_ieee1905_device_al_mac;
+static int hf_ieee1905_local_intf_oui;
+static int hf_ieee1905_local_intf_variant;
+static int hf_ieee1905_local_intf_variant_name;
+static int hf_ieee1905_local_intf_url_count;
+static int hf_ieee1905_local_intf_spec_count;
+static int hf_ieee1905_local_intf_url;
+static int hf_ieee1905_local_intf_spec;
+static int hf_ieee1905_dev_id_friendly_name;
+static int hf_ieee1905_dev_id_manuf_name;
+static int hf_ieee1905_dev_id_manuf_model;
+static int hf_ieee1905_control_url;
+static int hf_ieee1905_ipv4_type_count;
+static int hf_ieee1905_mac_address;
+static int hf_ieee1905_ipv4_addr_count;
+static int hf_ieee1905_addr_type;
+static int hf_ieee1905_ipv4_addr;
+static int hf_ieee1905_dhcp_server;
+static int hf_ieee1905_ipv6_mac_address;
+static int hf_ieee1905_ipv6_linklocal;
+static int hf_ieee1905_ipv6_type_count;
+static int hf_ieee1905_ipv6_addr_count;
+static int hf_ieee1905_ipv6_addr_type;
+static int hf_ieee1905_ipv6_addr;
+static int hf_ieee1905_ipv6_dhcp_server;
+static int hf_ieee1905_generic_phy_media_types;
+static int hf_ieee1905_profile_version;
+static int hf_ieee1905_power_off_intf_count;
+static int hf_ieee1905_power_change_intf_count;
+static int hf_ieee1905_power_change_mac_addr;
+static int hf_ieee1905_power_change_state;
+static int hf_ieee1905_power_status_intf_count;
+static int hf_ieee1905_power_status_mac_addr;
+static int hf_ieee1905_power_status_state;
+static int hf_ieee1905_l2_neighbor_intf_count;
+static int hf_ieee1905_l2_local_intf_mac_addr;
+static int hf_ieee1905_l2_neighbor_dev_count;
+static int hf_ieee1905_l2_neighbor_mac_addr;
+static int hf_ieee1905_l2_behind_mac_addr_count;
+static int hf_ieee1905_l2_behind_mac_addr;
+static int hf_ieee1905_supported_service_count;
+static int hf_ieee1905_supported_service;
+static int hf_ieee1905_searched_service_count;
+static int hf_ieee1905_searched_service;
+static int hf_ieee1905_ap_radio_identifier;
+static int hf_ieee1905_operatonal_bss_radio_count;
+static int hf_ieee1905_ap_operational_intf_count;
+static int hf_ieee1905_ap_local_intf_mac_addr;
+static int hf_ieee1905_ap_local_intf_ssid_len;
+static int hf_ieee1905_ap_local_intf_ssid;
+static int hf_ieee1905_ap_capabilities_flags;
+static int hf_ieee1905_rpt_unsuccessful_associations;
+static int hf_ieee1905_unassoc_sta_metrics_oper_flag;
+static int hf_ieee1905_unassoc_sta_metrics_non_oper_flag;
+static int hf_ieee1905_agent_init_steering;
+static int hf_ieee1905_rpt_unsuccessful_assoc_report;
+static int hf_ieee1905_higher_layer_protocol;
+static int hf_ieee1905_higher_layer_data;
+static int hf_ieee1905_assoc_backhaul_station_mac;
+static int hf_ieee1905_backhaul_target_bssid;
+static int hf_ieee1905_backhaul_steering_status;
+static int hf_ieee1905_backhaul_operating_class;
+static int hf_ieee1905_backhaul_channel_number;
+static int hf_ieee1905_client_assoc_bssid;
+static int hf_ieee1905_association_control;
+static int hf_ieee1905_association_control_validity;
+static int hf_ieee1905_client_assoc_sta_count;
+static int hf_ieee1905_client_assoc_mac_addr;
+static int hf_ieee1905_btm_reporter_bssid;
+static int hf_ieee1905_btm_sta_mac_addr;
+static int hf_ieee1905_btm_report_status;
+static int hf_ieee1905_btm_report_bssid;
+static int hf_ieee1905_source_bss_bssid;
+static int hf_ieee1905_steering_request_flags;
+static int hf_ieee1905_steering_req_op_window;
+static int hf_ieee1905_steering_request_mode_flag;
+static int hf_ieee1905_btm_disassoc_imminent_flag;
+static int hf_ieee1905_btm_abridged_flag;
+static int hf_ieee1905_steering_req_reserved;
+static int hf_ieee1905_steering_btm_disass_timer;
+static int hf_ieee1905_steering_req_sta_count;
+static int hf_ieee1905_steering_req_sta_mac;
+static int hf_ieee1905_steering_req_target_bssid_count;
+static int hf_ieee1905_steering_req_target_bssid;
+static int hf_ieee1905_steering_req_oper_class;
+static int hf_ieee1905_steering_req_target_channel;
+static int hf_ieee1905_client_bssid;
+static int hf_ieee1905_client_mac_addr;
+static int hf_ieee1905_client_capability_result;
+static int hf_ieee1905_client_capability_frame;
+static int hf_ieee1905_association_flag;
+static int hf_ieee1905_association_client_mac_addr;
+static int hf_ieee1905_association_agent_bssid;
+static int hf_ieee1905_association_event_flags;
+static int hf_ieee1905_ap_radio_max_bss;
+static int hf_ieee1905_ap_radio_classes;
+static int hf_ieee1905_ap_radio_class;
+static int hf_ieee1905_ap_radio_eirp;
+static int hf_ieee1905_ap_radio_non_op_count;
+static int hf_ieee1905_radio_basic_non_op_channel;
+static int hf_ieee1905_max_supported_tx_streams;
+static int hf_ieee1905_max_supported_rx_streams;
+static int hf_ieee1905_short_gi_20mhz_flag;
+static int hf_ieee1905_short_gi_40mhz_flag;
+static int hf_ieee1905_ht_support_40mhz_flag;
+static int hf_ieee1905_ap_ht_capabilities_radio_id;
+static int hf_ieee1905_ht_cap_flags;
+static int hf_ieee1905_vht_max_supported_tx_streams;
+static int hf_ieee1905_vht_max_supported_rx_streams;
+static int hf_ieee1905_short_gi_80mhz_flag;
+static int hf_ieee1905_short_gi_160mhz_flag;
+static int hf_ieee1905_vht_support_80plus_mhz_flag;
+static int hf_ieee1905_vht_support_160_mhz_flag;
+static int hf_ieee1905_su_beamformer_capable_flag;
+static int hf_ieee1905_mu_beamformer_capable_flag;
+static int hf_ieee1905_ap_vht_capabilities_radio_id;
+static int hf_ieee1905_vht_cap_flags;
+static int hf_ieee1905_assoc_clients_bss_count;
+static int hf_ieee1905_assoc_bssid;
+static int hf_ieee1905_bss_client_count;
+static int hf_ieee1905_bss_client_mac;
+static int hf_ieee1905_bss_client_last_assoc;
+static int hf_ieee1905_ap_vht_supported_vht_tx_mcs;
+static int hf_ieee1905_ap_vht_supported_vht_rx_mcs;
+static int hf_ieee1905_channel_pref_preference;
+static int hf_ieee1905_channel_pref_reason;
+static int hf_ieee1905_channel_preference_radio_id;
+static int hf_ieee1905_channel_preference_class_count;
+static int hf_ieee1905_channel_pref_class;
+static int hf_ieee1905_channel_pref_channel_count;
+static int hf_ieee1905_channel_pref_channel;
+static int hf_ieee1905_channel_prefs_flags;
+static int hf_ieee1905_trans_power_limit_radio_id;
+static int hf_ieee1905_trans_power_limit_eirp;
+static int hf_ieee1905_channel_select_resp_radio_id;
+static int hf_ieee1905_radio_metrics_radio_id;
+static int hf_ieee1905_channel_select_resp_code;
+static int hf_ieee1905_op_channel_report_radio_id;
+static int hf_ieee1905_op_channel_report_classes;
+static int hf_ieee1905_op_channel_class;
+static int hf_ieee1905_op_channel_number;
+static int hf_ieee1905_op_channel_eirp;
+static int hf_ieee1905_ap_he_cap_radio_id;
+static int hf_ieee1905_ap_he_cap_mcs_length;
+static int hf_ieee1905_ap_he_cap_tx_mcs_le_80_mhz;
+static int hf_ieee1905_ap_he_tx_mcs_map_1ss;
+static int hf_ieee1905_ap_he_tx_mcs_map_2ss;
+static int hf_ieee1905_ap_he_tx_mcs_map_3ss;
+static int hf_ieee1905_ap_he_tx_mcs_map_4ss;
+static int hf_ieee1905_ap_he_tx_mcs_map_5ss;
+static int hf_ieee1905_ap_he_tx_mcs_map_6ss;
+static int hf_ieee1905_ap_he_tx_mcs_map_7ss;
+static int hf_ieee1905_ap_he_tx_mcs_map_8ss;
+static int hf_ieee1905_ap_he_cap_rx_mcs_le_80_mhz;
+static int hf_ieee1905_ap_he_rx_mcs_map_1ss;
+static int hf_ieee1905_ap_he_rx_mcs_map_2ss;
+static int hf_ieee1905_ap_he_rx_mcs_map_3ss;
+static int hf_ieee1905_ap_he_rx_mcs_map_4ss;
+static int hf_ieee1905_ap_he_rx_mcs_map_5ss;
+static int hf_ieee1905_ap_he_rx_mcs_map_6ss;
+static int hf_ieee1905_ap_he_rx_mcs_map_7ss;
+static int hf_ieee1905_ap_he_rx_mcs_map_8ss;
+static int hf_ieee1905_ap_he_cap_tx_mcs_160_mhz;
+static int hf_ieee1905_ap_he_cap_rx_mcs_160_mhz;
+static int hf_ieee1905_ap_he_cap_tx_mcs_80p80_mhz;
+static int hf_ieee1905_ap_he_cap_rx_mcs_80p80_mhz;
+static int hf_ieee1905_unassoc_link_metrics_query_mac;
+static int hf_ieee1905_unassoc_sta_link_metrics_class;
+static int hf_ieee1905_ap_metrics_reporting_interval;
+static int hf_ieee1905_metric_reporting_policy_radio_id;
+static int hf_ieee1905_metric_reporting_radio_count;
+static int hf_ieee1905_metric_rcpi_threshold;
+static int hf_ieee1905_metric_reporting_rcpi_hysteresis;
+static int hf_ieee1905_metrics_policy_flags;
+static int hf_ieee1905_metrics_channel_util_threshold;
+static int hf_ieee1905_assoc_sta_traffic_stats_inclusion;
+static int hf_ieee1905_assoc_sta_link_metrics_inclusion;
+static int hf_ieee1905_assoc_wf6_status_policy_inclusion;
+static int hf_ieee1905_reporting_policy_flags_reserved;
+static int hf_ieee1905_ap_metric_query_bssid_cnt;
+static int hf_ieee1905_ap_metric_query_bssid;
+static int hf_ieee1905_sta_mac_address_type;
+static int hf_ieee1905_assoc_sta_mac_addr;
+static int hf_ieee1905_assoc_sta_bssid_count;
+static int hf_ieee1905_assoc_sta_link_metrics_bssid;
+static int hf_ieee1905_assoc_sta_link_metrics_time_delta;
+static int hf_ieee1905_assoc_sta_link_metrics_dwn_rate;
+static int hf_ieee1905_assoc_sta_link_metrics_up_rate;
+static int hf_ieee1905_assoc_sta_link_metrics_rcpi;
+static int hf_ieee1905_assoc_wf6_sta_mac_addr;
+static int hf_ieee1905_assoc_wf6_sta_tid_count;
+static int hf_ieee1905_assoc_wf6_sta_tid;
+static int hf_ieee1905_assoc_wf6_sta_queue_size;
+static int hf_ieee1905_assoc_sta_ext_link_metrics_mac_addr;
+static int hf_ieee1905_assoc_sta_ext_link_metrics_count;
+static int hf_ieee1905_assoc_sta_extended_metrics_bssid;
+static int hf_ieee1905_assoc_sta_extended_metrics_lddlr;
+static int hf_ieee1905_assoc_sta_extended_metrics_ldulr;
+static int hf_ieee1905_assoc_sta_extended_metrics_ur;
+static int hf_ieee1905_assoc_sta_extended_metrics_tr;
+static int hf_ieee1905_unassoc_sta_link_channel_count;
+static int hf_ieee1905_unassoc_metrics_channel;
+static int hf_ieee1905_unassoc_metrics_mac_count;
+static int hf_ieee1905_he_max_supported_tx_streams;
+static int hf_ieee1905_he_max_supported_rx_streams;
+static int hf_ieee1905_he_support_80plus_mhz_flag;
+static int hf_ieee1905_he_support_160mhz_flag;
+static int hf_ieee1905_he_su_beamformer_capable_flag;
+static int hf_ieee1905_he_mu_beamformer_capable_flag;
+static int hf_ieee1905_ul_mu_mimo_capable_flag;
+static int hf_ieee1905_ul_mu_mimo_ofdma_capable_flag;
+static int hf_ieee1905_dl_mu_mimo_ofdma_capable_flag;
+static int hf_ieee1905_ul_ofdma_capable;
+static int hf_ieee1905_dl_ofdma_capable;
+static int hf_ieee1905_he_cap_flags;
+static int hf_ieee1905_steering_policy_local_disallowed_count;
+static int hf_ieee1905_steering_disallowed_mac_addr;
+static int hf_ieee1905_btm_steering_disallowed_count;
+static int hf_ieee1905_btm_steering_disallowed_mac_addr;
+static int hf_ieee1905_steering_policy_radio_count;
+static int hf_ieee1905_steering_policy_radio_id;
+static int hf_ieee1905_steering_policy_policy;
+static int hf_ieee1905_steering_policy_util;
+static int hf_ieee1905_steering_policy_rcpi_threshold;
+static int hf_ieee1905_radio_restriction_radio_id;
+static int hf_ieee1905_radio_restriction_op_class_count;
+static int hf_ieee1905_radio_restriction_op_class;
+static int hf_ieee1905_radio_restriction_chan_count;
+static int hf_ieee1905_radio_restriction_channel;
+static int hf_ieee1905_radio_restriction_min_separation;
+static int hf_ieee1905_ap_metrics_agent_bssid;
+static int hf_ieee1905_include_estimated_spi_ac_eq_be;
+static int hf_ieee1905_include_estimated_spi_ac_eq_bk;
+static int hf_ieee1905_include_estimated_spi_ac_eq_vo;
+static int hf_ieee1905_include_estimated_spi_ac_eq_vi;
+static int hf_ieee1905_ap_metrics_channel_utilization;
+static int hf_ieee1905_ap_metrics_sta_count;
+static int hf_ieee1905_ap_metrics_flags;
+static int hf_ieee1905_ap_metrics_service_params_be;
+static int hf_ieee1905_ap_metrics_service_params_bk;
+static int hf_ieee1905_ap_metrics_service_params_vo;
+static int hf_ieee1905_ap_metrics_service_params_vi;
+static int hf_ieee1905_unassoc_sta_link_metric_op_class;
+static int hf_ieee1905_unassoc_sta_link_metric_sta_count;
+static int hf_ieee1905_unassoc_link_metric_mac_addr;
+static int hf_ieee1905_unassoc_link_metric_channel;
+static int hf_ieee1905_unassoc_link_metric_delta;
+static int hf_ieee1905_unassoc_link_metric_uplink_rcpi;
+static int hf_ieee1905_beacon_metrics_query_mac_addr;
+static int hf_ieee1905_beacon_metrics_query_op_class;
+static int hf_ieee1905_beacon_metrics_query_channel;
+static int hf_ieee1905_beacon_metrics_query_bssid;
+static int hf_ieee1905_beacon_metrics_query_detail;
+static int hf_ieee1905_beacon_metrics_query_ssid_len;
+static int hf_ieee1905_beacon_metrics_query_ssid;
+static int hf_ieee1905_beacon_metrics_channel_count;
+static int hf_ieee1905_beacon_metrics_report_len;
+static int hf_ieee1905_beacon_metrics_report_op_class;
+static int hf_ieee1905_beacon_metrics_report_channel_id;
+static int hf_ieee1905_measurement_report;
+static int hf_ieee1905_beacon_metrics_response_mac_addr;
+static int hf_ieee1905_beacon_metrics_response_reserved;
+static int hf_ieee1905_beacon_metrics_response_meas_num;
+static int hf_ieee1905_assoc_sta_traffic_stats_mac_addr;
+static int hf_ieee1905_assoc_sta_traffic_stats_bytes_sent;
+static int hf_ieee1905_assoc_sta_traffic_stats_bytes_rcvd;
+static int hf_ieee1905_assoc_sta_traffic_stats_packets_sent;
+static int hf_ieee1905_assoc_sta_traffic_stats_packets_rcvd;
+static int hf_ieee1905_assoc_sta_traffic_stats_tx_pkt_errs;
+static int hf_ieee1905_assoc_sta_traffic_stats_rx_pkt_errs;
+static int hf_ieee1905_assoc_sta_traffic_stats_retrans_count;
+static int hf_ieee1905_error_code_value;
+static int hf_ieee1905_error_code_mac_addr;
+static int hf_ieee1905_channel_scan_rep_policy;
+static int hf_ieee1905_channel_scan_pol_report;
+static int hf_ieee1905_channel_scan_pol_reserved;
+static int hf_ieee1905_channel_scan_capabilities_radio_num;
+static int hf_ieee1905_channel_scan_capa_radio_id;
+static int hf_ieee1905_channel_scan_capa_flags;
+static int hf_ieee1905_channel_scan_capa_flags_on_boot_only;
+static int hf_ieee1905_channel_scan_capa_flags_scan_impact;
+static int hf_ieee1905_channel_scan_capa_flags_reserved;
+static int hf_ieee1905_channel_scan_capa_min_scan_interval;
+static int hf_ieee1905_channel_scan_capa_class_num;
+static int hf_ieee1905_channel_scan_capa_oper_class;
+static int hf_ieee1905_channel_scan_capa_oper_class_chan_cnt;
+static int hf_ieee1905_channel_scan_capa_channel;
+static int hf_ieee1905_channel_scan_request_flags;
+static int hf_ieee1905_channel_scan_request_flags_fresh_scan;
+static int hf_ieee1905_channel_scan_request_flags_reserved;
+static int hf_ieee1905_channel_scan_request_radio_num;
+static int hf_ieee1905_channel_scan_request_radio_id;
+static int hf_ieee1905_channel_scan_request_class_num;
+static int hf_ieee1905_channel_scan_request_oper_class;
+static int hf_ieee1905_channel_scan_request_oper_class_chan_cnt;
+static int hf_ieee1905_channel_scan_request_channel;
+static int hf_ieee1905_channel_scan_result_radio_id;
+static int hf_ieee1905_channel_scan_result_oper_class;
+static int hf_ieee1905_channel_scan_result_channel;
+static int hf_ieee1905_channel_scan_result_status;
+static int hf_ieee1905_channel_scan_result_timestamp_len;
+static int hf_ieee1905_channel_scan_result_timestamp_string;
+static int hf_ieee1905_channel_scan_result_utilization;
+static int hf_ieee1905_channel_scan_result_noise;
+static int hf_ieee1905_radio_metrics_noise;
+static int hf_ieee1905_radio_metrics_transmit;
+static int hf_ieee1905_radio_metrics_receive_self;
+static int hf_ieee1905_radio_metrics_receive_other;
+static int hf_ieee1905_ap_extended_metrics_bssid;
+static int hf_ieee1905_ap_extended_metrics_unicast_sent;
+static int hf_ieee1905_ap_extended_metrics_unicast_rcvd;
+static int hf_ieee1905_ap_extended_metrics_multicast_sent;
+static int hf_ieee1905_ap_extended_metrics_multicast_rcvd;
+static int hf_ieee1905_ap_extended_metrics_bcast_sent;
+static int hf_ieee1905_ap_extended_metrics_bcast_rcvd;
+static int hf_ieee1905_channel_scan_result_neigh_num;
+static int hf_ieee1905_channel_scan_result_bssid;
+static int hf_ieee1905_channel_scan_result_ssid_len;
+static int hf_ieee1905_channel_scan_result_ssid;
+static int hf_ieee1905_channel_scan_result_sig_level;
+static int hf_ieee1905_channel_scan_result_bw_len;
+static int hf_ieee1905_channel_scan_result_bw;
+static int hf_ieee1905_channel_scan_result_neigh_flags;
+static int hf_ieee1905_channel_scan_result_load_element_present;
+static int hf_ieee1905_channel_scan_result_neigh_reserved;
+static int hf_ieee1905_channel_scan_result_util;
+static int hf_ieee1905_channel_scan_result_sta_count;
+static int hf_ieee1905_channel_scan_result_scan_duration;
+static int hf_ieee1905_channel_scan_result_flags;
+static int hf_ieee1905_channel_scan_result_scan_type;
+static int hf_ieee1905_channel_scan_result_scan_flags_reserved;
+static int hf_ieee1905_timestamp_length;
+static int hf_ieee1905_timestamp_string;
+static int hf_ieee1905_1905_layer_sec_capa_onboarding;
+static int hf_ieee1905_1905_layer_sec_capa_mic_sup;
+static int hf_ieee1905_1905_layer_sec_capa_enc_alg_sup;
+static int hf_ieee1905_ap_wf6_capa_radio_id;
+static int hf_ieee1905_ap_wf6_role_count;
+static int hf_ieee1905_ap_wf6_agent_role_flags;
+static int hf_ieee1905_ap_wf6_capa_agents_role;
+static int hf_ieee1905_ap_wf6_capa_he_160_support;
+static int hf_ieee1905_ap_wf6_capa_he_80p80_support;
+static int hf_ieee1905_ap_wf6_capa_reserved;
+static int hf_ieee1905_ap_wf6_he_supported_flags;
+static int hf_ieee1905_ap_wf6_su_beamformer;
+static int hf_ieee1905_ap_wf6_su_beamformee;
+static int hf_ieee1905_ap_wf6_mu_beamformer_status;
+static int hf_ieee1905_ap_wf6_beamformee_sts_le_80mhz;
+static int hf_ieee1905_ap_wf6_beamformee_sts_gt_80mhz;
+static int hf_ieee1905_ap_wf6_ul_mu_mimo;
+static int hf_ieee1905_ap_wf6_ul_ofdma;
+static int hf_ieee1905_ap_wf6_dl_ofdma;
+static int hf_ieee1905_ap_wf6_mimo_max_flags;
+static int hf_ieee1905_ap_wf6_max_ap_dl_mu_mimo_tx;
+static int hf_ieee1905_ap_wf6_max_ap_ul_mu_mimi_rx;
+static int hf_ieee1905_ap_wf6_dl_ofdma_max_tx;
+static int hf_ieee1905_ap_wf6_ul_ofdma_max_rx;
+static int hf_ieee1905_ap_wf6_gen_flags;
+static int hf_ieee1905_ap_wf6_gen_rts;
+static int hf_ieee1905_ap_wf6_gen_mu_rts;
+static int hf_ieee1905_ap_wf6_gen_multi_bssid;
+static int hf_ieee1905_ap_wf6_gen_mu_edca;
+static int hf_ieee1905_ap_wf6_gen_twt_requester;
+static int hf_ieee1905_ap_wf6_gen_twt_responder;
+static int hf_ieee1905_ap_wf6_gen_reserved;
+static int hf_ieee1905_agent_list_bytes;
+static int hf_ieee1905_mic_group_temporal_key_id;
+static int hf_ieee1905_mic_integrity_transmission_counter;
+static int hf_ieee1905_mic_source_la_mac_id;
+static int hf_ieee1905_mic_length;
+static int hf_ieee1905_mic_bytes;
+static int hf_ieee1905_1905_gtk_key_id;
+static int hf_ieee1905_mic_version;
+static int hf_ieee1905_mic_reserved;
+static int hf_ieee1905_encrypted_dest_al_mac_addr;
+static int hf_ieee1905_encrypted_enc_transmission_count;
+static int hf_ieee1905_encrypted_source_la_mac_id;
+static int hf_ieee1905_encrypted_enc_output_field_len;
+static int hf_ieee1905_encrypted_enc_output_field;
+static int hf_ieee1905_cac_request_radio_count;
+static int hf_ieee1905_cac_request_radio_id;
+static int hf_ieee1905_cac_request_op_class;
+static int hf_ieee1905_cac_request_channel;
+static int hf_ieee1905_cac_request_flags;
+static int hf_ieee1905_cac_request_method;
+static int hf_ieee1905_cac_request_completion_action;
+static int hf_ieee1905_cac_request_completion_unsuccess;
+static int hf_ieee1905_cac_request_reserved;
+static int hf_ieee1905_cac_termination_radio_count;
+static int hf_ieee1905_cac_terminate_radio_id;
+static int hf_ieee1905_cac_terminate_op_class;
+static int hf_ieee1905_cac_terminate_channel;
+static int hf_ieee1905_cac_completion_rep_radio_count;
+static int hf_ieee1905_cac_completion_radio_id;
+static int hf_ieee1905_cac_completion_op_class;
+static int hf_ieee1905_cac_completion_channel;
+static int hf_ieee1905_cac_completion_status;
+static int hf_ieee1905_cac_completion_radar_count;
+static int hf_ieee1905_cac_comp_radar_op_class;
+static int hf_ieee1905_cac_comp_radar_channel;
+static int hf_ieee1905_cac_status_rpt_active_chan;
+static int hf_ieee1905_cac_status_rpt_avail_op_class;
+static int hf_ieee1905_cac_status_rpt_avail_channel;
+static int hf_ieee1905_cac_status_rpt_avail_minutes;
+static int hf_ieee1905_cac_status_rpt_non_occ_cnt;
+static int hf_ieee1905_cac_status_rpt_non_occ_op_class;
+static int hf_ieee1905_cac_status_rpt_non_occ_channel;
+static int hf_ieee1905_cac_status_rpt_non_occ_seconds;
+static int hf_ieee1905_cac_status_rpt_active_cac_cnt;
+static int hf_ieee1905_cac_status_rpt_active_cac_op_class;
+static int hf_ieee1905_cac_status_rpt_active_cac_channel;
+static int hf_ieee1905_cac_status_rpt_active_cac_seconds;
+static int hf_ieee1905_cac_capa_country_code;
+static int hf_ieee1905_cac_capa_radio_cnt;
+static int hf_ieee1905_cac_capabilities_radio_id;
+static int hf_ieee1905_cac_capabilities_types_num;
+static int hf_ieee1905_cac_capabilities_cac_mode;
+static int hf_ieee1905_cac_capabilities_cac_seconds;
+static int hf_ieee1905_cac_capabilities_op_class_num;
+static int hf_ieee1905_cac_capabilities_op_class;
+static int hf_ieee1905_cac_capabilities_channel_cnt;
+static int hf_ieee1905_cac_capabillity_channel;
+static int hf_ieee1905_multi_ap_version;
+static int hf_ieee1905_max_total_serv_prio_rules;
+static int hf_ieee1905_r2_ap_capa_reserved;
+static int hf_ieee1905_r2_ap_capa_flags;
+static int hf_ieee1905_byte_counter_units;
+static int hf_ieee1905_ctag_service_prio_flag;
+static int hf_ieee1905_dpp_onboarding_flag;
+static int hf_ieee1905_traffic_separation_flag;
+static int hf_ieee1905_r2_ap_capa_flags_reserved;
+static int hf_ieee1905_max_vid_count;
+static int hf_ieee1905_default_802_1q_settings_primary_vlan;
+static int hf_ieee1905_default_802_1q_settings_flags;
+static int hf_ieee1905_default_802_1q_settings_default_pcp;
+static int hf_ieee1905_default_802_1q_settings_reserved;
+static int hf_ieee1905_ap_radio_advanced_capa_radio_id;
+static int hf_ieee1905_radio_advanced_capa_flags;
+static int hf_ieee1905_traffic_separation_policy_num_ssids;
+static int hf_ieee1905_traffic_separation_policy_ssid_len;
+static int hf_ieee1905_traffic_separation_policy_ssid;
+static int hf_ieee1905_traffic_separation_policy_vlanid;
+static int hf_ieee1905_bss_config_report_radio_count;
+static int hf_ieee1905_bss_config_report_radio_id;
+static int hf_ieee1905_bss_config_report_flags;
+static int hf_ieee1905_bss_config_report_backhaul_bss;
+static int hf_ieee1905_bss_config_report_fronthaul_bss;
+static int hf_ieee1905_bss_config_report_r1_disallowed_status;
+static int hf_ieee1905_bss_config_report_r2_disallowed_status;
+static int hf_ieee1905_bss_config_report_multiple_bssid_set;
+static int hf_ieee1905_bss_config_report_transmitted_bssid;
+static int hf_ieee1905_bss_config_report_reserved;
+static int hf_ieee1905_bss_config_report_res;
+static int hf_ieee1905_bss_config_report_bss_cnt;
+static int hf_ieee1902_bss_config_report_mac;
+static int hf_ieee1902_bss_config_report_ssid_len;
+static int hf_ieee1905_bss_config_report_ssid;
+static int hf_ieee1905_bssid_tlv_bssid;
+static int hf_ieee1905_service_prio_rule_id;
+static int hf_ieee1905_service_prio_rule_flags;
+static int hf_ieee1905_service_prio_rule_add_remove_filter_bit;
+static int hf_ieee1905_service_prio_rule_flags_reserved;
+static int hf_ieee1905_service_prio_match_flags;
+static int hf_ieee1905_service_prio_rule_precedence;
+static int hf_ieee1905_service_prio_rule_output;
+static int hf_ieee1905_service_prio_rule_match_always;
+static int hf_ieee1905_service_prio_rule_match_reserved;
+static int hf_ieee1905_service_prio_rule_match_up_in_qos;
+static int hf_ieee1905_service_prio_rule_match_up_control_match;
+static int hf_ieee1905_service_prio_rule_match_source_mac;
+static int hf_ieee1905_service_prio_rule_match_source_mac_sense;
+static int hf_ieee1905_service_prio_rule_match_dest_mac;
+static int hf_ieee1905_service_prio_rule_match_dest_mac_sense;
+static int hf_ieee1905_service_prio_rule_up_control;
+static int hf_ieee1905_service_prio_rule_source_mac;
+static int hf_ieee1905_service_prio_rule_dest_mac;
+static int hf_ieee1905_dscp_mapping_table_val;
+static int hf_ieee1905_r2_error_reason_code;
+static int hf_ieee1905_r2_error_bssid;
+static int hf_ieee1905_ap_radio_advance_capa_backhaul_bss_traffic_sep;
+static int hf_ieee1905_ap_radio_advance_capa_combined_r1_r2_backhaul;
+static int hf_ieee1905_ap_radio_advance_capa_reserved;
+static int hf_ieee1905_assoc_status_notif_num_bssid;
+static int hf_ieee1905_assoc_status_notif_bssid;
+static int hf_ieee1905_assoc_status_notif_status;
+static int hf_ieee1905_source_info_mac_addr;
+static int hf_ieee1905_tunneled_message_type;
+static int hf_ieee1905_tunneled_data;
+static int hf_ieee1905_status_code_status;
+static int hf_ieee1905_disassociation_reason_code;
+static int hf_ieee1905_backhaul_sta_radio_id;
+static int hf_ieee1905_backhaul_sta_radio_capabilities;
+static int hf_ieee1905_backhaul_sta_radio_capa_mac_included;
+static int hf_ieee1905_backhaul_sta_radio_capa_reserved;
+static int hf_ieee1905_backhaul_sta_addr;
+static int hf_ieee1905_backhaul_akm_suite_capa_count;
+static int hf_ieee1905_akm_backhaul_suite_oui;
+static int hf_ieee1905_akm_backhaul_suite_type;
+static int hf_ieee1905_fronthaul_akm_suite_capa_count;
+static int hf_ieee1905_akm_fronthaul_suite_oui;
+static int hf_ieee1905_akm_fronthaul_suite_type;
+static int hf_ieee1905_encap_dpp_flags;
+static int hf_ieee1905_dpp_encap_enrollee_mac_present;
+static int hf_ieee1905_dpp_encap_reserved;
+static int hf_ieee1905_dpp_encap_frame_type_flag;
+static int hf_ieee1905_dpp_encap_reserved2;
+static int hf_ieee1905_encap_dpp_sta_mac;
+static int hf_ieee1905_dpp_encap_frame_type;
+static int hf_ieee1905_dpp_encap_frame_length;
+static int hf_ieee1905_dpp_encap_dpp_oui;
+static int hf_ieee1905_dpp_encap_category;
+static int hf_ieee1905_dpp_encap_public_action;
+static int hf_ieee1905_dpp_encap_dpp_subtype;
+static int hf_ieee1905_dpp_bootstrapping_uri_radio_id;
+static int hf_ieee1905_dpp_bootstrapping_uri_local_mac_addr;
+static int hf_ieee1905_dpp_bootstrapping_uri_bsta_mac_addr;
+static int hf_ieee1905_dpp_bootstrapping_uri_received;
+static int hf_ieee1905_dpp_advertise_cce_flag;
+static int hf_ieee1905_dpp_chirp_value_flags;
+static int hf_ieee1905_dpp_chirp_enrollee_mac_addr_present;
+static int hf_ieee1905_dpp_chirp_hash_validity;
+static int hf_ieee1905_dpp_chirp_reserved;
+static int hf_ieee1905_dpp_chirp_enrollee_mac_addr;
+static int hf_ieee1905_dpp_chirp_value_hash_length;
+static int hf_ieee1905_dpp_chirp_value_hash_value;
+static int hf_ieee1905_dev_inventory_lsn;
+static int hf_ieee1905_dev_inventory_serial;
+static int hf_ieee1905_dev_inventory_lsv;
+static int hf_ieee1905_dev_inventory_sw_vers;
+static int hf_ieee1905_dev_inventory_lee;
+static int hf_ieee1905_dev_inventory_exec_env;
+static int hf_ieee1905_dev_inventory_num_radios;
+static int hf_ieee1905_dev_inventory_radio_id;
+static int hf_ieee1905_dev_inventory_lcv;
+static int hf_ieee1905_dev_inventory_chp_ven;
+static int hf_ieee1905_r2_steering_req_src_bssid;
+static int hf_ieee1905_r2_steering_req_flags;
+static int hf_ieee1905_r2_steering_request_mode_flag;
+static int hf_ieee1905_r2_btm_disassoc_imminent_flag;
+static int hf_ieee1905_r2_btm_abridged_flag;
+static int hf_ieee1905_r2_steering_req_reserved;
+static int hf_ieee1905_r2_steering_op_window;
+static int hf_ieee1905_r2_steering_btm_dissasoc_tmr;
+static int hf_ieee1905_r2_steering_sta_count;
+static int hf_ieee1905_r2_steering_sta_mac;
+static int hf_ieee1905_r2_steering_target_count;
+static int hf_ieee1905_r2_steering_target_bssid;
+static int hf_ieee1905_r2_steering_target_op_class;
+static int hf_ieee1905_r2_steering_target_channel;
+static int hf_ieee1905_r2_steering_reason;
+static int hf_ieee1905_metric_collection_interval;
+static int hf_ieee1905_max_reporting_rate;
+static int hf_ieee1905_bss_configuration_request;
+static int hf_ieee1905_bss_configuration_response;
+static int hf_ieee1905_dpp_message_category;
+static int hf_ieee1905_dpp_message_public_action;
+static int hf_ieee1905_spatial_reuse_req_radio_id;
+static int hf_ieee1905_spatial_reuse_color_flags;
+static int hf_ieee1905_spatial_reuse_reserved;
+static int hf_ieee1905_spatial_reuse_bss_color;
+static int hf_ieee1905_spatial_reuse_hesiga_flags;
+static int hf_ieee1905_spatial_reuse_reserved2;
+static int hf_ieee1905_spatial_reuse_hesiga_value15_allowed;
+static int hf_ieee1905_spatial_reuse_srg_info_valid;
+static int hf_ieee1905_spatial_reuse_non_srg_offset_valid;
+static int hf_ieee1905_spatial_reuse_reserved3;
+static int hf_ieee1905_spatial_reuse_psr_disallowed;
+static int hf_ieee1905_spatial_reuse_non_srg_obsspd_max_offset;
+static int hf_ieee1905_spatial_reuse_not_valid1;
+static int hf_ieee1905_spatial_reuse_srg_obsspd_min_offset;
+static int hf_ieee1905_spatial_reuse_srg_obsspd_max_offset;
+static int hf_ieee1905_spatial_reuse_srg_bss_color_bitmap;
+static int hf_ieee1905_spatial_reuse_srg_partial_bssid_bitmap;
+static int hf_ieee1905_spatial_reuse_not_valid2;
+static int hf_ieee1905_spatial_reuse_not_valid3;
+static int hf_ieee1905_spatial_reuse_not_valid4;
+static int hf_ieee1905_spatial_reuse_not_valid5;
+static int hf_ieee1905_spatial_reuse_reserved4;
+static int hf_ieee1905_spatial_reuse_rep_radio_id;
+static int hf_ieee1905_spatial_reuse_rep_color_flags;
+static int hf_ieee1905_spatial_reuse_rep_reserved;
+static int hf_ieee1905_spatial_reuse_rep_partial_bss_color;
+static int hf_ieee1905_spatial_reuse_rep_bss_color;
+static int hf_ieee1905_spatial_reuse_rep_hesiga_flags;
+static int hf_ieee1905_spatial_reuse_rep_reserved2;
+static int hf_ieee1905_spatial_reuse_rep_hesiga_value15_allowed;
+static int hf_ieee1905_spatial_reuse_rep_srg_info_valid;
+static int hf_ieee1905_spatial_reuse_rep_non_srg_offset_valid;
+static int hf_ieee1905_spatial_reuse_rep_reserved3;
+static int hf_ieee1905_spatial_reuse_rep_psr_disallowed;
+static int hf_ieee1905_spatial_reuse_rep_non_srg_obsspd_max_offset;
+static int hf_ieee1905_spatial_reuse_rep_not_valid1;
+static int hf_ieee1905_spatial_reuse_rep_srg_obsspd_min_offset;
+static int hf_ieee1905_spatial_reuse_rep_srg_obsspd_max_offset;
+static int hf_ieee1905_spatial_reuse_rep_srg_bss_color_bitmap;
+static int hf_ieee1905_spatial_reuse_rep_srg_partial_bssid_bitmap;
+static int hf_ieee1905_spatial_reuse_rep_not_valid2;
+static int hf_ieee1905_spatial_reuse_rep_not_valid3;
+static int hf_ieee1905_spatial_reuse_rep_not_valid4;
+static int hf_ieee1905_spatial_reuse_rep_not_valid5;
+static int hf_ieee1905_spatial_reuse_rep_nbor_bss_color_bitmap;
+static int hf_ieee1905_spatial_reuse_rep_reserved4;
+static int hf_ieee1905_spatial_reuse_config_radio_id;
+static int hf_ieee1905_spatial_reuse_config_response;
+static int hf_ieee1905_qos_mgmt_policy_mscs_disallowed;
+static int hf_ieee1905_qos_mgmt_mscs_disallow_sta;
+static int hf_ieee1905_qos_mgmt_policy_scs_disallowed;
+static int hf_ieee1905_qos_mgmt_scs_disallow_sta;
+static int hf_ieee1905_qos_mgmt_desc_qmid;
+static int hf_ieee1905_qos_mgmt_desc_bssid;
+static int hf_ieee1905_qos_mgmt_desc_client_mac;
+static int hf_ieee1905_controller_capa_flags;
+static int hf_ieee1905_controller_capa_reserved;
+static int hf_ieee1905_controller_capa_early_ap_capa;
+static int hf_ieee1905_controller_capa_kbmb_counter;
+
+static gint ett_ieee1905;
+static gint ett_ieee1905_flags;
+static gint ett_ieee1905_tlv_len;
+static gint ett_tlv;
+static gint ett_device_information_list;
+static gint ett_device_information_tree;
+static gint ett_media_type;
+static gint ett_bridging_tuples_list;
+static gint ett_bridging_mac_list;
+static gint ett_non_1905_neighbor_list;
+static gint ett_1905_neighbor_list;
+static gint ett_ieee1905_neighbor_flags;
+static gint ett_media_type_list;
+static gint ett_media_item;
+static gint ett_local_interface_list;
+static gint ett_local_interface_info;
+static gint ett_ipv4_list;
+static gint ett_ipv4_info;
+static gint ett_ipv4_type_addr_list;
+static gint ett_ipv4_addr_info;
+static gint ett_ipv6_list;
+static gint ett_ipv6_info;
+static gint ett_ipv6_type_addr_list;
+static gint ett_ipv6_addr_info;
+static gint ett_push_button_phy_list;
+static gint ett_push_button_phy_info;
+static gint ett_power_off_info;
+static gint ett_power_change_list;
+static gint ett_power_change_info;
+static gint ett_power_status_list;
+static gint ett_power_status_info;
+static gint ett_l2_local_intf_list;
+static gint ett_l2_neighbor_device_info;
+static gint ett_l2_neighbor_dev_list;
+static gint ett_l2_neighbor_dev_tree;
+static gint ett_supported_service_list;
+static gint ett_searched_service_list;
+static gint ett_ap_operational_bss_list;
+static gint ett_ap_operational_bss_tree;
+static gint ett_ap_operational_bss_intf;
+static gint ett_ap_operational_bss_intf_list;
+static gint ett_ap_operational_bss_intf_tree;
+static gint ett_ieee1905_capabilities_flags;
+static gint ett_ieee1905_unsuccessful_associations;
+static gint ett_assoc_control_list;
+static gint ett_ieee1905_steering_request_flags;
+static gint ett_ieee1905_association_event_flags;
+static gint ett_radio_basic_class_list;
+static gint ett_ap_radio_basic_cap_class_tree;
+static gint ett_radio_basic_non_op_list;
+static gint ett_ht_cap_flags;
+static gint ett_vht_cap_flags;
+static gint ett_assoc_clients_bss_list;
+static gint ett_assoc_client_bss_tree;
+static gint ett_assoc_client_list;
+static gint ett_assoc_client_tree;
+static gint ett_channel_preference_class_list;
+static gint ett_ap_channel_preference_class_tree;
+static gint ett_channel_pref_channel_list;
+static gint ett_ieee1905_channel_prefs_flags;
+static gint ett_op_channel_report_class_tree;
+static gint ett_op_channel_report_class_list;
+static gint ett_sta_link_metrics_query_channel_list;
+static gint ett_sta_link_link_mac_addr_list;
+static gint ett_metric_reporting_policy_list;
+static gint ett_metric_reporting_policy_tree;
+static gint ett_metric_policy_flags;
+static gint ett_ap_metric_query_bssid_list;
+static gint ett_ieee1905_ap_metrics_flags;
+static gint ett_sta_list_metrics_bss_list;
+static gint ett_sta_list_metrics_bss_tree;
+static gint ett_sta_wf6_status_report_tid_list;
+static gint ett_sta_wf6_status_report_tid_tree;
+static gint ett_sta_extended_link_metrics_list;
+static gint ett_sta_extended_link_metrics_tree;
+static gint ett_ap_he_mcs_set;
+static gint ett_ap_he_cap_flags;
+static gint ett_ieee1905_ap_he_tx_mcs_set;
+static gint ett_ieee1905_ap_he_rx_mcs_set;
+static gint ett_steering_policy_disallowed_list;
+static gint ett_btm_steering_policy_disallowed_list;
+static gint ett_btm_steering_radio_list;
+static gint ett_radio_restriction_op_class_list;
+static gint ett_radio_restriction_op_class_tree;
+static gint ett_radio_restriction_channel_list;
+static gint ett_radio_restriction_channel_tree;
+static gint ett_unassoc_sta_link_metric_list;
+static gint ett_unassoc_sta_link_metric_tree;
+static gint ett_beacon_metrics_query_list;
+static gint ett_beacon_metrics_query_tree;
+static gint ett_beacon_metrics_query_channel_list;
+static gint ett_beacon_report_subelement_list;
+static gint ett_beacon_report_sub_element_tree;
+static gint ett_beacon_metrics_response_report_list;
+static gint ett_beacon_metrics_response_report_tree;
+static gint ett_ieee1905_beacon_reported_flags;
+static gint ett_channel_scan_rep_policy;
+static gint ett_channel_scan_capa_radio_list;
+static gint ett_channel_scan_capa_radio;
+static gint ett_channel_scan_capa_flags;
+static gint ett_channel_scan_capa_class_list;
+static gint ett_channel_scan_capa_class;
+static gint ett_channel_scan_capa_channels;
+static gint ett_channel_scan_request_flags;
+static gint ett_channel_scan_request_radio_list;
+static gint ett_channel_scan_request_radio;
+static gint ett_channel_scan_request_class_list;
+static gint ett_channel_scan_request_class;
+static gint ett_channel_scan_request_channels;
+static gint ett_channel_scan_result_neigh_list;
+static gint ett_channel_scan_result_neigh_flags;
+static gint ett_channel_scan_result_neigh;
+static gint ett_channel_scan_result_flags;
+static gint ett_ap_wf6_role_list;
+static gint ett_ap_wf6_role_tree;
+static gint ett_ap_wf6_agent_role_flags;
+static gint ett_ap_wf6_supported_flags;
+static gint ett_ap_wf6_mimo_max_flags;
+static gint ett_ap_wf6_gen_flags;
+static gint ett_cac_request_flags;
+static gint ett_cac_request_radio_list;
+static gint ett_cac_request_radio;
+static gint ett_cac_terminate_radio_list;
+static gint ett_cac_terminate_radio;
+static gint ett_cac_completion_radio_list;
+static gint ett_cac_completion_radio;
+static gint ett_cac_completion_radar_list;
+static gint ett_cac_completion_radar;
+static gint ett_cac_status_rpt_avail_list;
+static gint ett_cac_status_rpt_avail_chan;
+static gint ett_cac_status_rpt_non_occupy_list;
+static gint ett_cac_status_rpt_unocc_chan;
+static gint ett_cac_status_rpt_active_cac_list;
+static gint ett_cac_status_rpt_active_cac_tree;
+static gint ett_cac_capabilities_radio_list;
+static gint ett_cac_capabilities_radio_tree;
+static gint ett_cac_capabilities_type_list;
+static gint ett_cac_capabilities_type_tree;
+static gint ett_cac_capabilities_class_list;
+static gint ett_cac_capabilities_class_tree;
+static gint ett_cac_capabilities_channel_list;
+static gint ett_cac_capabilities_channel;
+static gint ett_r2_ap_capa_flags;
+static gint ett_edge_interface_list;
+static gint ett_radio_advanced_capa_flags;
+static gint ett_ap_operational_backhaul_bss_tree;
+static gint ett_ap_operational_backhaul_bss_intf_list;
+static gint ett_default_802_1q_settings_flags;
+static gint ett_traffic_separation_ssid_list;
+static gint ett_traffic_separation_ssid;
+static gint ett_bss_config_report_list;
+static gint ett_bss_config_report_tree;
+static gint ett_bss_config_report_bss_list;
+static gint ett_bss_config_report_bss_tree;
+static gint ett_bss_config_report_flags;
+static gint ett_ethernet_config_policy_list;
+static gint ett_ethernet_config_policy;
+static gint ett_ethernet_config_policy_flags;
+static gint ett_ieee1905_service_prio_rule_flags;
+static gint ett_ieee1905_service_prio_rule_match_flags;
+static gint ett_backhaul_sta_radio_capa_flags;
+static gint ett_assoc_status_notif_bssid_list;
+static gint ett_assoc_status_notif_bssid_tree;
+static gint ett_akm_suite_list;
+static gint ett_akm_suite;
+static gint ett_backhaul_akm_suite_list;
+static gint ett_backhaul_akm_suite;
+static gint ett_fronthaul_akm_suite_list;
+static gint ett_fronthaul_akm_suite;
+static gint ett_1905_encap_dpp_flags;
+static gint ett_1905_encap_dpp_classes;
+static gint ett_1905_encap_dpp_op_class_tree;
+static gint ett_1905_encap_dpp_channel_list;
+static gint ett_ieee1905_dpp_chirp;
+static gint ett_device_inventory_radio_list;
+static gint ett_device_inventory_radio_tree;
+static gint ett_r2_steering_sta_list;
+static gint ett_r2_steering_target_list;
+static gint ett_r2_steering_target;
+static gint ett_mic_group_temporal_key;
+static gint ett_ieee1905_spatial_reuse_color;
+static gint ett_ieee1905_spatial_reuse_hesiga;
+static gint ett_ieee1905_spatial_reuse_rep_color;
+static gint ett_ieee1905_spatial_reuse_rep_hesiga;
+static gint ett_qos_mgmt_policy_mscs_list;
+static gint ett_qos_mgmt_policy_scs_list;
+static gint ett_ieee1905_controller_capa;
+
+static gint ett_ieee1905_fragment;
+static gint ett_ieee1905_fragments;
+
+static expert_field ei_ieee1905_malformed_tlv;
+static expert_field ei_ieee1905_extraneous_tlv_data;
 
 #define TOPOLOGY_DISCOVERY_MESSAGE                     0x0000
 #define TOPOLOGY_NOTIFICATION_MESSAGE                  0x0001
diff --git a/epan/dissectors/packet-ieee80211-netmon.c b/epan/dissectors/packet-ieee80211-netmon.c
index 71ecaf7c95..eff813e9af 100644
--- a/epan/dissectors/packet-ieee80211-netmon.c
+++ b/epan/dissectors/packet-ieee80211-netmon.c
@@ -21,7 +21,7 @@ void proto_register_netmon_802_11(void);
 void proto_reg_handoff_netmon_802_11(void);
 
 /* protocol */
-static int proto_netmon_802_11 = -1;
+static int proto_netmon_802_11;
 
 /* Dissector */
 static dissector_handle_t netmon_802_11_handle;
@@ -50,23 +50,23 @@ static dissector_handle_t netmon_802_11_handle;
 #define PHY_TYPE_HT          7 /* 802.11n */
 #define PHY_TYPE_VHT         8 /* 802.11ac */
 
-static int hf_netmon_802_11_version = -1;
-static int hf_netmon_802_11_length = -1;
-static int hf_netmon_802_11_op_mode = -1;
-static int hf_netmon_802_11_op_mode_sta = -1;
-static int hf_netmon_802_11_op_mode_ap = -1;
-static int hf_netmon_802_11_op_mode_sta_ext = -1;
-static int hf_netmon_802_11_op_mode_mon = -1;
-/* static int hf_netmon_802_11_flags = -1; */
-static int hf_netmon_802_11_phy_type = -1;
-static int hf_netmon_802_11_channel = -1;
-static int hf_netmon_802_11_frequency = -1;
-static int hf_netmon_802_11_rssi = -1;
-static int hf_netmon_802_11_datarate = -1;
-static int hf_netmon_802_11_timestamp = -1;
-
-static gint ett_netmon_802_11 = -1;
-static gint ett_netmon_802_11_op_mode = -1;
+static int hf_netmon_802_11_version;
+static int hf_netmon_802_11_length;
+static int hf_netmon_802_11_op_mode;
+static int hf_netmon_802_11_op_mode_sta;
+static int hf_netmon_802_11_op_mode_ap;
+static int hf_netmon_802_11_op_mode_sta_ext;
+static int hf_netmon_802_11_op_mode_mon;
+/* static int hf_netmon_802_11_flags; */
+static int hf_netmon_802_11_phy_type;
+static int hf_netmon_802_11_channel;
+static int hf_netmon_802_11_frequency;
+static int hf_netmon_802_11_rssi;
+static int hf_netmon_802_11_datarate;
+static int hf_netmon_802_11_timestamp;
+
+static gint ett_netmon_802_11;
+static gint ett_netmon_802_11_op_mode;
 
 static dissector_handle_t ieee80211_radio_handle;
 
diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c
index 99a77df0f4..a9c638c355 100644
--- a/epan/dissectors/packet-ieee80211-prism.c
+++ b/epan/dissectors/packet-ieee80211-prism.c
@@ -33,39 +33,39 @@ static dissector_handle_t ieee80211_radio_handle;
 static capture_dissector_handle_t ieee80211_cap_handle;
 static capture_dissector_handle_t wlancap_cap_handle;
 
-static int proto_prism = -1;
+static int proto_prism;
 
 /* Prism radio header */
 
-static int hf_ieee80211_prism_msgcode = -1;
-static int hf_ieee80211_prism_msglen = -1;
-static int hf_ieee80211_prism_devname = -1;
-static int hf_ieee80211_prism_did = -1;
-static int hf_ieee80211_prism_did_type = -1;
-static int hf_ieee80211_prism_did_status = -1;
-static int hf_ieee80211_prism_did_length = -1;
-static int hf_ieee80211_prism_did_hosttime = -1;
-static int hf_ieee80211_prism_did_mactime = -1;
-static int hf_ieee80211_prism_did_channel = -1;
-static int hf_ieee80211_prism_did_rssi = -1;
-static int hf_ieee80211_prism_did_sq = -1;
-static int hf_ieee80211_prism_did_signal = -1;
-static int hf_ieee80211_prism_did_noise = -1;
-static int hf_ieee80211_prism_did_rate = -1;
-static int hf_ieee80211_prism_did_istx = -1;
-static int hf_ieee80211_prism_did_frmlen = -1;
-static int hf_ieee80211_prism_did_unknown = -1;
+static int hf_ieee80211_prism_msgcode;
+static int hf_ieee80211_prism_msglen;
+static int hf_ieee80211_prism_devname;
+static int hf_ieee80211_prism_did;
+static int hf_ieee80211_prism_did_type;
+static int hf_ieee80211_prism_did_status;
+static int hf_ieee80211_prism_did_length;
+static int hf_ieee80211_prism_did_hosttime;
+static int hf_ieee80211_prism_did_mactime;
+static int hf_ieee80211_prism_did_channel;
+static int hf_ieee80211_prism_did_rssi;
+static int hf_ieee80211_prism_did_sq;
+static int hf_ieee80211_prism_did_signal;
+static int hf_ieee80211_prism_did_noise;
+static int hf_ieee80211_prism_did_rate;
+static int hf_ieee80211_prism_did_istx;
+static int hf_ieee80211_prism_did_frmlen;
+static int hf_ieee80211_prism_did_unknown;
 
 /* Qualcomm Extensions */
-static int hf_ieee80211_prism_did_sig_a1 = -1;
-static int hf_ieee80211_prism_did_sig_a2 = -1;
-static int hf_ieee80211_prism_did_sig_b = -1;
-static int hf_ieee80211_prism_did_sig_rate_field = -1;
+static int hf_ieee80211_prism_did_sig_a1;
+static int hf_ieee80211_prism_did_sig_a2;
+static int hf_ieee80211_prism_did_sig_b;
+static int hf_ieee80211_prism_did_sig_rate_field;
 
 
-static gint ett_prism = -1;
-static gint ett_prism_did = -1;
-static gint ett_sig_ab = -1;
+static gint ett_prism;
+static gint ett_prism_did;
+static gint ett_sig_ab;
 
 static dissector_handle_t prism_handle;
 
diff --git a/epan/dissectors/packet-ieee80211-radio.c b/epan/dissectors/packet-ieee80211-radio.c
index 018337366d..60348b654f 100644
--- a/epan/dissectors/packet-ieee80211-radio.c
+++ b/epan/dissectors/packet-ieee80211-radio.c
@@ -35,68 +35,68 @@ static dissector_handle_t wlan_noqos_radio_handle;
 static dissector_handle_t ieee80211_handle;
 static dissector_handle_t ieee80211_noqos_handle;
 
-static int proto_wlan_radio = -1;
+static int proto_wlan_radio;
 
 /* ************************************************************************* */
 /*                Header field info values for radio information             */
 /* ************************************************************************* */
-static int hf_wlan_radio_phy = -1;
-static int hf_wlan_radio_11_fhss_hop_set = -1;
-static int hf_wlan_radio_11_fhss_hop_pattern = -1;
-static int hf_wlan_radio_11_fhss_hop_index = -1;
-static int hf_wlan_radio_11a_channel_type = -1;
-static int hf_wlan_radio_11a_turbo_type = -1;
-static int hf_wlan_radio_11g_mode = -1;
-static int hf_wlan_radio_11n_mcs_index = -1;
-static int hf_wlan_radio_11n_bandwidth = -1;
-static int hf_wlan_radio_11n_short_gi = -1;
-static int hf_wlan_radio_11n_greenfield = -1;
-static int hf_wlan_radio_11n_fec = -1;
-static int hf_wlan_radio_11n_stbc_streams = -1;
-static int hf_wlan_radio_11n_ness = -1;
-static int hf_wlan_radio_11ac_stbc = -1;
-static int hf_wlan_radio_11ac_txop_ps_not_allowed = -1;
-static int hf_wlan_radio_11ac_short_gi = -1;
-static int hf_wlan_radio_11ac_short_gi_nsym_disambig = -1;
-static int hf_wlan_radio_11ac_ldpc_extra_ofdm_symbol = -1;
-static int hf_wlan_radio_11ac_beamformed = -1;
-static int hf_wlan_radio_11ac_bandwidth = -1;
-static int hf_wlan_radio_11ac_user = -1;
-static int hf_wlan_radio_11ac_nsts = -1;
-static int hf_wlan_radio_11ac_mcs = -1;
-static int hf_wlan_radio_11ac_nss = -1;
-static int hf_wlan_radio_11ac_fec = -1;
-static int hf_wlan_radio_11ac_gid = -1;
-static int hf_wlan_radio_11ac_p_aid = -1;
-static int hf_wlan_radio_data_rate = -1;
-static int hf_wlan_radio_channel = -1;
-static int hf_wlan_radio_frequency = -1;
-static int hf_wlan_radio_short_preamble = -1;
-static int hf_wlan_radio_signal_percent = -1;
-static int hf_wlan_radio_signal_db = -1;
-static int hf_wlan_radio_signal_dbm = -1;
-static int hf_wlan_radio_noise_percent = -1;
-static int hf_wlan_radio_noise_db = -1;
-static int hf_wlan_radio_noise_dbm = -1;
-static int hf_wlan_radio_snr = -1;
-static int hf_wlan_radio_timestamp = -1;
-static int hf_wlan_last_part_of_a_mpdu = -1;
-static int hf_wlan_a_mpdu_delim_crc_error = -1;
-static int hf_wlan_a_mpdu_aggregate_id = -1;
-static int hf_wlan_radio_duration = -1;
-static int hf_wlan_radio_preamble = -1;
-static int hf_wlan_radio_aggregate = -1;
-static int hf_wlan_radio_aggregate_duration = -1;
-static int hf_wlan_radio_ifs = -1;
-static int hf_wlan_radio_start_tsf = -1;
-static int hf_wlan_radio_end_tsf = -1;
-static int hf_wlan_zero_length_psdu_type = -1;
-
-static expert_field ei_wlan_radio_assumed_short_preamble = EI_INIT;
-static expert_field ei_wlan_radio_assumed_non_greenfield = EI_INIT;
-static expert_field ei_wlan_radio_assumed_no_stbc = EI_INIT;
-static expert_field ei_wlan_radio_assumed_no_extension_streams = EI_INIT;
-static expert_field ei_wlan_radio_assumed_bcc_fec = EI_INIT;
+static int hf_wlan_radio_phy;
+static int hf_wlan_radio_11_fhss_hop_set;
+static int hf_wlan_radio_11_fhss_hop_pattern;
+static int hf_wlan_radio_11_fhss_hop_index;
+static int hf_wlan_radio_11a_channel_type;
+static int hf_wlan_radio_11a_turbo_type;
+static int hf_wlan_radio_11g_mode;
+static int hf_wlan_radio_11n_mcs_index;
+static int hf_wlan_radio_11n_bandwidth;
+static int hf_wlan_radio_11n_short_gi;
+static int hf_wlan_radio_11n_greenfield;
+static int hf_wlan_radio_11n_fec;
+static int hf_wlan_radio_11n_stbc_streams;
+static int hf_wlan_radio_11n_ness;
+static int hf_wlan_radio_11ac_stbc;
+static int hf_wlan_radio_11ac_txop_ps_not_allowed;
+static int hf_wlan_radio_11ac_short_gi;
+static int hf_wlan_radio_11ac_short_gi_nsym_disambig;
+static int hf_wlan_radio_11ac_ldpc_extra_ofdm_symbol;
+static int hf_wlan_radio_11ac_beamformed;
+static int hf_wlan_radio_11ac_bandwidth;
+static int hf_wlan_radio_11ac_user;
+static int hf_wlan_radio_11ac_nsts;
+static int hf_wlan_radio_11ac_mcs;
+static int hf_wlan_radio_11ac_nss;
+static int hf_wlan_radio_11ac_fec;
+static int hf_wlan_radio_11ac_gid;
+static int hf_wlan_radio_11ac_p_aid;
+static int hf_wlan_radio_data_rate;
+static int hf_wlan_radio_channel;
+static int hf_wlan_radio_frequency;
+static int hf_wlan_radio_short_preamble;
+static int hf_wlan_radio_signal_percent;
+static int hf_wlan_radio_signal_db;
+static int hf_wlan_radio_signal_dbm;
+static int hf_wlan_radio_noise_percent;
+static int hf_wlan_radio_noise_db;
+static int hf_wlan_radio_noise_dbm;
+static int hf_wlan_radio_snr;
+static int hf_wlan_radio_timestamp;
+static int hf_wlan_last_part_of_a_mpdu;
+static int hf_wlan_a_mpdu_delim_crc_error;
+static int hf_wlan_a_mpdu_aggregate_id;
+static int hf_wlan_radio_duration;
+static int hf_wlan_radio_preamble;
+static int hf_wlan_radio_aggregate;
+static int hf_wlan_radio_aggregate_duration;
+static int hf_wlan_radio_ifs;
+static int hf_wlan_radio_start_tsf;
+static int hf_wlan_radio_end_tsf;
+static int hf_wlan_zero_length_psdu_type;
+
+static expert_field ei_wlan_radio_assumed_short_preamble;
+static expert_field ei_wlan_radio_assumed_non_greenfield;
+static expert_field ei_wlan_radio_assumed_no_stbc;
+static expert_field ei_wlan_radio_assumed_no_extension_streams;
+static expert_field ei_wlan_radio_assumed_bcc_fec;
 
 static int wlan_radio_tap = -1;
 static int wlan_radio_timeline_tap = -1;
@@ -640,10 +640,10 @@ static float ieee80211_he_mu_ofdma_rate(guint nsts, guint mcs, guint ru, guint g
   return rate;
 }
 
-static gint ett_wlan_radio = -1;
-static gint ett_wlan_radio_11ac_user = -1;
-static gint ett_wlan_radio_duration = -1;
-static gint ett_wlan_radio_aggregate = -1;
+static gint ett_wlan_radio;
+static gint ett_wlan_radio_11ac_user;
+static gint ett_wlan_radio_duration;
+static gint ett_wlan_radio_aggregate;
 
 /* previous frame details, for aggregate detection */
 struct previous_frame_info {
diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c
index da00c97994..8ecd37eb5b 100644
--- a/epan/dissectors/packet-ieee80211-radiotap.c
+++ b/epan/dissectors/packet-ieee80211-radiotap.c
@@ -32,632 +32,632 @@ void proto_register_radiotap(void);
 void proto_reg_handoff_radiotap(void);
 
 /* protocol */
-static int proto_radiotap = -1;
-
-static int hf_radiotap_version = -1;
-static int hf_radiotap_pad = -1;
-static int hf_radiotap_length = -1;
-static int hf_radiotap_present = -1;
-
-static int hf_radiotap_tlv_type = -1;
-static int hf_radiotap_tlv_datalen = -1;
-static int hf_radiotap_unknown_tlv_data = -1;
-
-static int hf_radiotap_mactime = -1;
-/* static int hf_radiotap_channel = -1; */
-static int hf_radiotap_channel_frequency = -1;
-static int hf_radiotap_channel_flags = -1;
-static int hf_radiotap_channel_flags_700mhz = -1;
-static int hf_radiotap_channel_flags_800mhz = -1;
-static int hf_radiotap_channel_flags_900mhz = -1;
-static int hf_radiotap_channel_flags_turbo = -1;
-static int hf_radiotap_channel_flags_cck = -1;
-static int hf_radiotap_channel_flags_ofdm = -1;
-static int hf_radiotap_channel_flags_2ghz = -1;
-static int hf_radiotap_channel_flags_5ghz = -1;
-static int hf_radiotap_channel_flags_passive = -1;
-static int hf_radiotap_channel_flags_dynamic = -1;
-static int hf_radiotap_channel_flags_gfsk = -1;
-static int hf_radiotap_channel_flags_gsm = -1;
-static int hf_radiotap_channel_flags_sturbo = -1;
-static int hf_radiotap_channel_flags_half = -1;
-static int hf_radiotap_channel_flags_quarter = -1;
-static int hf_radiotap_rxflags = -1;
-static int hf_radiotap_rxflags_badplcp = -1;
-static int hf_radiotap_txflags = -1;
-static int hf_radiotap_txflags_fail = -1;
-static int hf_radiotap_txflags_cts = -1;
-static int hf_radiotap_txflags_rts = -1;
-static int hf_radiotap_txflags_noack = -1;
-static int hf_radiotap_txflags_noseqno = -1;
-static int hf_radiotap_txflags_order = -1;
-static int hf_radiotap_xchannel_channel = -1;
-static int hf_radiotap_xchannel_frequency = -1;
-static int hf_radiotap_xchannel_flags = -1;
-static int hf_radiotap_xchannel_flags_turbo = -1;
-static int hf_radiotap_xchannel_flags_cck = -1;
-static int hf_radiotap_xchannel_flags_ofdm = -1;
-static int hf_radiotap_xchannel_flags_2ghz = -1;
-static int hf_radiotap_xchannel_flags_5ghz = -1;
-static int hf_radiotap_xchannel_flags_passive = -1;
-static int hf_radiotap_xchannel_flags_dynamic = -1;
-static int hf_radiotap_xchannel_flags_gfsk = -1;
-static int hf_radiotap_xchannel_flags_gsm = -1;
-static int hf_radiotap_xchannel_flags_sturbo = -1;
-static int hf_radiotap_xchannel_flags_half = -1;
-static int hf_radiotap_xchannel_flags_quarter = -1;
-static int hf_radiotap_xchannel_flags_ht20 = -1;
-static int hf_radiotap_xchannel_flags_ht40u = -1;
-static int hf_radiotap_xchannel_flags_ht40d = -1;
+static int proto_radiotap;
+
+static int hf_radiotap_version;
+static int hf_radiotap_pad;
+static int hf_radiotap_length;
+static int hf_radiotap_present;
+
+static int hf_radiotap_tlv_type;
+static int hf_radiotap_tlv_datalen;
+static int hf_radiotap_unknown_tlv_data;
+
+static int hf_radiotap_mactime;
+/* static int hf_radiotap_channel; */
+static int hf_radiotap_channel_frequency;
+static int hf_radiotap_channel_flags;
+static int hf_radiotap_channel_flags_700mhz;
+static int hf_radiotap_channel_flags_800mhz;
+static int hf_radiotap_channel_flags_900mhz;
+static int hf_radiotap_channel_flags_turbo;
+static int hf_radiotap_channel_flags_cck;
+static int hf_radiotap_channel_flags_ofdm;
+static int hf_radiotap_channel_flags_2ghz;
+static int hf_radiotap_channel_flags_5ghz;
+static int hf_radiotap_channel_flags_passive;
+static int hf_radiotap_channel_flags_dynamic;
+static int hf_radiotap_channel_flags_gfsk;
+static int hf_radiotap_channel_flags_gsm;
+static int hf_radiotap_channel_flags_sturbo;
+static int hf_radiotap_channel_flags_half;
+static int hf_radiotap_channel_flags_quarter;
+static int hf_radiotap_rxflags;
+static int hf_radiotap_rxflags_badplcp;
+static int hf_radiotap_txflags;
+static int hf_radiotap_txflags_fail;
+static int hf_radiotap_txflags_cts;
+static int hf_radiotap_txflags_rts;
+static int hf_radiotap_txflags_noack;
+static int hf_radiotap_txflags_noseqno;
+static int hf_radiotap_txflags_order;
+static int hf_radiotap_xchannel_channel;
+static int hf_radiotap_xchannel_frequency;
+static int hf_radiotap_xchannel_flags;
+static int hf_radiotap_xchannel_flags_turbo;
+static int hf_radiotap_xchannel_flags_cck;
+static int hf_radiotap_xchannel_flags_ofdm;
+static int hf_radiotap_xchannel_flags_2ghz;
+static int hf_radiotap_xchannel_flags_5ghz;
+static int hf_radiotap_xchannel_flags_passive;
+static int hf_radiotap_xchannel_flags_dynamic;
+static int hf_radiotap_xchannel_flags_gfsk;
+static int hf_radiotap_xchannel_flags_gsm;
+static int hf_radiotap_xchannel_flags_sturbo;
+static int hf_radiotap_xchannel_flags_half;
+static int hf_radiotap_xchannel_flags_quarter;
+static int hf_radiotap_xchannel_flags_ht20;
+static int hf_radiotap_xchannel_flags_ht40u;
+static int hf_radiotap_xchannel_flags_ht40d;
 #if 0
-static int hf_radiotap_xchannel_maxpower = -1;
+static int hf_radiotap_xchannel_maxpower;
 #endif
-static int hf_radiotap_fhss_hopset = -1;
-static int hf_radiotap_fhss_pattern = -1;
-static int hf_radiotap_datarate = -1;
-static int hf_radiotap_antenna = -1;
-static int hf_radiotap_dbm_antsignal = -1;
-static int hf_radiotap_db_antsignal = -1;
-static int hf_radiotap_dbm_antnoise = -1;
-static int hf_radiotap_db_antnoise = -1;
-static int hf_radiotap_tx_attenuation = -1;
-static int hf_radiotap_db_tx_attenuation = -1;
-static int hf_radiotap_txpower = -1;
-static int hf_radiotap_data_retries = -1;
-static int hf_radiotap_vendor_ns = -1;
-static int hf_radiotap_ven_oui = -1;
-static int hf_radiotap_ven_subns = -1;
-static int hf_radiotap_ven_skip = -1;
-static int hf_radiotap_ven_item = -1;
-static int hf_radiotap_ven_data = -1;
-static int hf_radiotap_mcs = -1;
-static int hf_radiotap_mcs_known = -1;
-static int hf_radiotap_mcs_have_bw = -1;
-static int hf_radiotap_mcs_have_index = -1;
-static int hf_radiotap_mcs_have_gi = -1;
-static int hf_radiotap_mcs_have_format = -1;
-static int hf_radiotap_mcs_have_fec = -1;
-static int hf_radiotap_mcs_have_stbc = -1;
-static int hf_radiotap_mcs_have_ness = -1;
-static int hf_radiotap_mcs_ness_bit1 = -1;
-static int hf_radiotap_mcs_bw = -1;
-static int hf_radiotap_mcs_index = -1;
-static int hf_radiotap_mcs_gi = -1;
-static int hf_radiotap_mcs_format = -1;
-static int hf_radiotap_mcs_fec = -1;
-static int hf_radiotap_mcs_stbc = -1;
-static int hf_radiotap_mcs_ness_bit0 = -1;
-static int hf_radiotap_ampdu = -1;
-static int hf_radiotap_ampdu_ref = -1;
-static int hf_radiotap_ampdu_flags = -1;
-static int hf_radiotap_ampdu_flags_report_zerolen = -1;
-static int hf_radiotap_ampdu_flags_is_zerolen = -1;
-static int hf_radiotap_ampdu_flags_last_known = -1;
-static int hf_radiotap_ampdu_flags_is_last = -1;
-static int hf_radiotap_ampdu_flags_delim_crc_error = -1;
-static int hf_radiotap_ampdu_delim_crc = -1;
-static int hf_radiotap_ampdu_flags_eof_known = -1;
-static int hf_radiotap_ampdu_flags_eof = -1;
-static int hf_radiotap_vht = -1;
-static int hf_radiotap_vht_known = -1;
-static int hf_radiotap_vht_have_stbc = -1;
-static int hf_radiotap_vht_have_txop_ps = -1;
-static int hf_radiotap_vht_have_gi = -1;
-static int hf_radiotap_vht_have_sgi_nsym_da = -1;
-static int hf_radiotap_vht_have_ldpc_extra = -1;
-static int hf_radiotap_vht_have_bf = -1;
-static int hf_radiotap_vht_have_bw = -1;
-static int hf_radiotap_vht_have_gid = -1;
-static int hf_radiotap_vht_have_p_aid = -1;
-static int hf_radiotap_vht_stbc = -1;
-static int hf_radiotap_vht_txop_ps = -1;
-static int hf_radiotap_vht_gi = -1;
-static int hf_radiotap_vht_sgi_nsym_da = -1;
-static int hf_radiotap_vht_ldpc_extra = -1;
-static int hf_radiotap_vht_bf = -1;
-static int hf_radiotap_vht_bw = -1;
+static int hf_radiotap_fhss_hopset;
+static int hf_radiotap_fhss_pattern;
+static int hf_radiotap_datarate;
+static int hf_radiotap_antenna;
+static int hf_radiotap_dbm_antsignal;
+static int hf_radiotap_db_antsignal;
+static int hf_radiotap_dbm_antnoise;
+static int hf_radiotap_db_antnoise;
+static int hf_radiotap_tx_attenuation;
+static int hf_radiotap_db_tx_attenuation;
+static int hf_radiotap_txpower;
+static int hf_radiotap_data_retries;
+static int hf_radiotap_vendor_ns;
+static int hf_radiotap_ven_oui;
+static int hf_radiotap_ven_subns;
+static int hf_radiotap_ven_skip;
+static int hf_radiotap_ven_item;
+static int hf_radiotap_ven_data;
+static int hf_radiotap_mcs;
+static int hf_radiotap_mcs_known;
+static int hf_radiotap_mcs_have_bw;
+static int hf_radiotap_mcs_have_index;
+static int hf_radiotap_mcs_have_gi;
+static int hf_radiotap_mcs_have_format;
+static int hf_radiotap_mcs_have_fec;
+static int hf_radiotap_mcs_have_stbc;
+static int hf_radiotap_mcs_have_ness;
+static int hf_radiotap_mcs_ness_bit1;
+static int hf_radiotap_mcs_bw;
+static int hf_radiotap_mcs_index;
+static int hf_radiotap_mcs_gi;
+static int hf_radiotap_mcs_format;
+static int hf_radiotap_mcs_fec;
+static int hf_radiotap_mcs_stbc;
+static int hf_radiotap_mcs_ness_bit0;
+static int hf_radiotap_ampdu;
+static int hf_radiotap_ampdu_ref;
+static int hf_radiotap_ampdu_flags;
+static int hf_radiotap_ampdu_flags_report_zerolen;
+static int hf_radiotap_ampdu_flags_is_zerolen;
+static int hf_radiotap_ampdu_flags_last_known;
+static int hf_radiotap_ampdu_flags_is_last;
+static int hf_radiotap_ampdu_flags_delim_crc_error;
+static int hf_radiotap_ampdu_delim_crc;
+static int hf_radiotap_ampdu_flags_eof_known;
+static int hf_radiotap_ampdu_flags_eof;
+static int hf_radiotap_vht;
+static int hf_radiotap_vht_known;
+static int hf_radiotap_vht_have_stbc;
+static int hf_radiotap_vht_have_txop_ps;
+static int hf_radiotap_vht_have_gi;
+static int hf_radiotap_vht_have_sgi_nsym_da;
+static int hf_radiotap_vht_have_ldpc_extra;
+static int hf_radiotap_vht_have_bf;
+static int hf_radiotap_vht_have_bw;
+static int hf_radiotap_vht_have_gid;
+static int hf_radiotap_vht_have_p_aid;
+static int hf_radiotap_vht_stbc;
+static int hf_radiotap_vht_txop_ps;
+static int hf_radiotap_vht_gi;
+static int hf_radiotap_vht_sgi_nsym_da;
+static int hf_radiotap_vht_ldpc_extra;
+static int hf_radiotap_vht_bf;
+static int hf_radiotap_vht_bw;
 static int hf_radiotap_vht_nsts[4];
 static int hf_radiotap_vht_mcs[4];
 static int hf_radiotap_vht_nss[4];
 static int hf_radiotap_vht_coding[4];
 static int hf_radiotap_vht_datarate[4];
-static int hf_radiotap_vht_gid = -1;
-static int hf_radiotap_vht_p_aid = -1;
-static int hf_radiotap_vht_user = -1;
-static int hf_radiotap_timestamp = -1;
-static int hf_radiotap_timestamp_ts = -1;
-static int hf_radiotap_timestamp_accuracy = -1;
-static int hf_radiotap_timestamp_unit = -1;
-static int hf_radiotap_timestamp_spos = -1;
-static int hf_radiotap_timestamp_flags_32bit = -1;
-static int hf_radiotap_timestamp_flags_accuracy = -1;
+static int hf_radiotap_vht_gid;
+static int hf_radiotap_vht_p_aid;
+static int hf_radiotap_vht_user;
+static int hf_radiotap_timestamp;
+static int hf_radiotap_timestamp_ts;
+static int hf_radiotap_timestamp_accuracy;
+static int hf_radiotap_timestamp_unit;
+static int hf_radiotap_timestamp_spos;
+static int hf_radiotap_timestamp_flags_32bit;
+static int hf_radiotap_timestamp_flags_accuracy;
 
 /* "Present" flags */
-static int hf_radiotap_present_word = -1;
-static int hf_radiotap_present_tsft = -1;
-static int hf_radiotap_present_flags = -1;
-static int hf_radiotap_present_rate = -1;
-static int hf_radiotap_present_channel = -1;
-static int hf_radiotap_present_fhss = -1;
-static int hf_radiotap_present_dbm_antsignal = -1;
-static int hf_radiotap_present_dbm_antnoise = -1;
-static int hf_radiotap_present_lock_quality = -1;
-static int hf_radiotap_present_tx_attenuation = -1;
-static int hf_radiotap_present_db_tx_attenuation = -1;
-static int hf_radiotap_present_dbm_tx_power = -1;
-static int hf_radiotap_present_antenna = -1;
-static int hf_radiotap_present_db_antsignal = -1;
-static int hf_radiotap_present_db_antnoise = -1;
-static int hf_radiotap_present_hdrfcs = -1;
-static int hf_radiotap_present_rxflags = -1;
-static int hf_radiotap_present_txflags = -1;
-static int hf_radiotap_present_data_retries = -1;
-static int hf_radiotap_present_xchannel = -1;
-static int hf_radiotap_present_mcs = -1;
-static int hf_radiotap_present_ampdu = -1;
-static int hf_radiotap_present_vht = -1;
-static int hf_radiotap_present_timestamp = -1;
-static int hf_radiotap_present_he = -1;
-static int hf_radiotap_present_he_mu = -1;
-static int hf_radiotap_present_0_length_psdu = -1;
-static int hf_radiotap_present_l_sig = -1;
-static int hf_radiotap_present_tlv = -1;
-static int hf_radiotap_present_reserved = -1;
-static int hf_radiotap_present_rtap_ns = -1;
-static int hf_radiotap_present_vendor_ns = -1;
-static int hf_radiotap_present_ext = -1;
+static int hf_radiotap_present_word;
+static int hf_radiotap_present_tsft;
+static int hf_radiotap_present_flags;
+static int hf_radiotap_present_rate;
+static int hf_radiotap_present_channel;
+static int hf_radiotap_present_fhss;
+static int hf_radiotap_present_dbm_antsignal;
+static int hf_radiotap_present_dbm_antnoise;
+static int hf_radiotap_present_lock_quality;
+static int hf_radiotap_present_tx_attenuation;
+static int hf_radiotap_present_db_tx_attenuation;
+static int hf_radiotap_present_dbm_tx_power;
+static int hf_radiotap_present_antenna;
+static int hf_radiotap_present_db_antsignal;
+static int hf_radiotap_present_db_antnoise;
+static int hf_radiotap_present_hdrfcs;
+static int hf_radiotap_present_rxflags;
+static int hf_radiotap_present_txflags;
+static int hf_radiotap_present_data_retries;
+static int hf_radiotap_present_xchannel;
+static int hf_radiotap_present_mcs;
+static int hf_radiotap_present_ampdu;
+static int hf_radiotap_present_vht;
+static int hf_radiotap_present_timestamp;
+static int hf_radiotap_present_he;
+static int hf_radiotap_present_he_mu;
+static int hf_radiotap_present_0_length_psdu;
+static int hf_radiotap_present_l_sig;
+static int hf_radiotap_present_tlv;
+static int hf_radiotap_present_reserved;
+static int hf_radiotap_present_rtap_ns;
+static int hf_radiotap_present_vendor_ns;
+static int hf_radiotap_present_ext;
 
 /* "present.flags" flags */
-static int hf_radiotap_flags = -1;
-static int hf_radiotap_flags_cfp = -1;
-static int hf_radiotap_flags_preamble = -1;
-static int hf_radiotap_flags_wep = -1;
-static int hf_radiotap_flags_frag = -1;
-static int hf_radiotap_flags_fcs = -1;
-static int hf_radiotap_flags_datapad = -1;
-static int hf_radiotap_flags_badfcs = -1;
-static int hf_radiotap_flags_shortgi = -1;
-
-static int hf_radiotap_quality = -1;
-static int hf_radiotap_fcs = -1;
-static int hf_radiotap_fcs_bad = -1;
+static int hf_radiotap_flags;
+static int hf_radiotap_flags_cfp;
+static int hf_radiotap_flags_preamble;
+static int hf_radiotap_flags_wep;
+static int hf_radiotap_flags_frag;
+static int hf_radiotap_flags_fcs;
+static int hf_radiotap_flags_datapad;
+static int hf_radiotap_flags_badfcs;
+static int hf_radiotap_flags_shortgi;
+
+static int hf_radiotap_quality;
+static int hf_radiotap_fcs;
+static int hf_radiotap_fcs_bad;
 
 /* HE Info fields */
-static int hf_radiotap_he_ppdu_format = -1;
-static int hf_radiotap_he_bss_color_known = -1;
-static int hf_radiotap_he_beam_change_known = -1;
-static int hf_radiotap_he_ul_dl_known = -1;
-static int hf_radiotap_he_data_mcs_known = -1;
-static int hf_radiotap_he_data_dcm_known = -1;
-static int hf_radiotap_he_coding_known = -1;
-static int hf_radiotap_he_ldpc_extra_symbol_segment_known = -1;
-static int hf_radiotap_he_stbc_known = -1;
-static int hf_radiotap_he_spatial_reuse_1_known = -1;
-static int hf_radiotap_he_spatial_reuse_2_known = -1;
-static int hf_radiotap_he_spatial_reuse_3_known = -1;
-static int hf_radiotap_he_spatial_reuse_4_known = -1;
-static int hf_radiotap_he_data_bw_ru_allocation_known = -1;
-static int hf_radiotap_he_doppler_known = -1;
-static int hf_radiotap_he_pri_sec_80_mhz_known = -1;
-static int hf_radiotap_he_gi_known = -1;
-static int hf_radiotap_he_num_ltf_symbols_known = -1;
-static int hf_radiotap_he_pre_fec_padding_factor_known = -1;
-static int hf_radiotap_he_txbf_known = -1;
-static int hf_radiotap_he_pe_disambiguity_known = -1;
-static int hf_radiotap_he_txop_known = -1;
-static int hf_radiotap_he_midamble_periodicity_known = -1;
-static int hf_radiotap_he_ru_allocation_offset = -1;
-static int hf_radiotap_he_ru_allocation_offset_known = -1;
-static int hf_radiotap_he_pri_sec_80_mhz = -1;
-static int hf_radiotap_he_bss_color = -1;
-static int hf_radiotap_he_bss_color_unknown = -1;
-static int hf_radiotap_he_beam_change = -1;
-static int hf_radiotap_he_beam_change_unknown = -1;
-static int hf_radiotap_he_ul_dl = -1;
-static int hf_radiotap_he_ul_dl_unknown = -1;
-static int hf_radiotap_he_data_mcs = -1;
-static int hf_radiotap_he_data_mcs_unknown = -1;
-static int hf_radiotap_he_data_dcm = -1;
-static int hf_radiotap_he_data_dcm_unknown = -1;
-static int hf_radiotap_he_coding = -1;
-static int hf_radiotap_he_coding_unknown = -1;
-static int hf_radiotap_he_ldpc_extra_symbol_segment = -1;
-static int hf_radiotap_he_ldpc_extra_symbol_segment_unknown = -1;
-static int hf_radiotap_he_stbc = -1;
-static int hf_radiotap_he_stbc_unknown = -1;
-static int hf_radiotap_spatial_reuse = -1;
-static int hf_radiotap_spatial_reuse_unknown = -1;
-static int hf_radiotap_he_su_reserved = -1;
-static int hf_radiotap_spatial_reuse_1 = -1;
-static int hf_radiotap_spatial_reuse_1_unknown = -1;
-static int hf_radiotap_spatial_reuse_2 = -1;
-static int hf_radiotap_spatial_reuse_2_unknown = -1;
-static int hf_radiotap_spatial_reuse_3 = -1;
-static int hf_radiotap_spatial_reuse_3_unknown = -1;
-static int hf_radiotap_spatial_reuse_4 = -1;
-static int hf_radiotap_spatial_reuse_4_unknown = -1;
-static int hf_radiotap_sta_id_user_captured = -1;
-static int hf_radiotap_he_mu_reserved = -1;
-static int hf_radiotap_data_bandwidth_ru_allocation = -1;
-static int hf_radiotap_data_bandwidth_ru_allocation_unknown = -1;
-static int hf_radiotap_gi = -1;
-static int hf_radiotap_gi_unknown = -1;
-static int hf_radiotap_ltf_symbol_size = -1;
-static int hf_radiotap_ltf_symbol_size_unknown = -1;
-static int hf_radiotap_num_ltf_symbols = -1;
-static int hf_radiotap_num_ltf_symbols_unknown = -1;
-static int hf_radiotap_d5_reserved_b11 = -1;
-static int hf_radiotap_pre_fec_padding_factor = -1;
-static int hf_radiotap_pre_fec_padding_factor_unknown = -1;
-static int hf_radiotap_txbf = -1;
-static int hf_radiotap_txbf_unknown = -1;
-static int hf_radiotap_pe_disambiguity = -1;
-static int hf_radiotap_pe_disambiguity_unknown = -1;
-static int hf_radiotap_he_nsts = -1;
-static int hf_radiotap_he_doppler_value = -1;
-static int hf_radiotap_he_doppler_value_unknown = -1;
-static int hf_radiotap_he_d6_reserved_00e0 = -1;
-static int hf_radiotap_he_txop_value = -1;
-static int hf_radiotap_he_txop_value_unknown = -1;
-static int hf_radiotap_midamble_periodicity = -1;
-static int hf_radiotap_midamble_periodicity_unknown = -1;
-static int hf_radiotap_he_info_data_1 = -1;
-static int hf_radiotap_he_info_data_2 = -1;
-static int hf_radiotap_he_info_data_3 = -1;
-static int hf_radiotap_he_info_data_4 = -1;
-static int hf_radiotap_he_info_data_5 = -1;
-static int hf_radiotap_he_info_data_6 = -1;
-static int hf_radiotap_he_mu_sig_b_mcs = -1;
-static int hf_radiotap_he_mu_sig_b_mcs_unknown = -1;
-static int hf_radiotap_he_mu_sig_b_mcs_known = -1;
-static int hf_radiotap_he_mu_sig_b_dcm = -1;
-static int hf_radiotap_he_mu_sig_b_dcm_unknown = -1;
-static int hf_radiotap_he_mu_sig_b_dcm_known = -1;
-static int hf_radiotap_he_mu_chan2_center_26_tone_ru_bit_known = -1;
-static int hf_radiotap_he_mu_chan2_center_26_tone_ru_bit_unknown = -1;
-static int hf_radiotap_he_mu_chan1_rus_known = -1;
-static int hf_radiotap_he_mu_chan1_rus_unknown = -1;
-static int hf_radiotap_he_mu_chan2_rus_known = -1;
-static int hf_radiotap_he_mu_chan2_rus_unknown = -1;
-static int hf_radiotap_he_mu_reserved_f1_b10_b11 = -1;
-static int hf_radiotap_he_mu_chan1_center_26_tone_ru_bit_known = -1;
-static int hf_radiotap_he_mu_chan1_center_26_tone_ru_bit_unknown = -1;
-static int hf_radiotap_he_mu_chan1_center_26_tone_ru_value = -1;
-static int hf_radiotap_he_mu_sig_b_compression_known = -1;
-static int hf_radiotap_he_mu_sig_b_compression_unknown = -1;
-static int hf_radiotap_he_mu_sig_b_compression_from_sig_a = -1;
-static int hf_radiotap_he_mu_sig_b_syms_mu_mimo_users_known = -1;
-static int hf_radiotap_he_mu_sig_b_syms_mu_mimo_users_unknown = -1;
-static int hf_radiotap_he_mu_info_flags_1 = -1;
-static int hf_radiotap_he_mu_bw_from_bw_in_sig_a = -1;
-static int hf_radiotap_he_mu_bw_from_bw_in_sig_a_unknown = -1;
-static int hf_radiotap_he_mu_bw_from_bw_in_sig_a_known = -1;
-static int hf_radiotap_he_mu_sig_b_syms_mu_mimo_users = -1;
-static int hf_radiotap_he_mu_preamble_puncturing = -1;
-static int hf_radiotap_he_mu_preamble_puncturing_unknown = -1;
-static int hf_radiotap_he_mu_preamble_puncturing_known = -1;
-static int hf_radiotap_he_mu_chan2_center_26_tone_ru_value = -1;
-static int hf_radiotap_he_mu_reserved_f2_b12_b15 = -1;
-static int hf_radiotap_he_mu_info_flags_2 = -1;
-static int hf_radiotap_he_mu_chan1_rus_0 = -1;
-static int hf_radiotap_he_mu_chan1_rus_0_unknown = -1;
-static int hf_radiotap_he_mu_chan1_rus_1 = -1;
-static int hf_radiotap_he_mu_chan1_rus_1_unknown = -1;
-static int hf_radiotap_he_mu_chan1_rus_2 = -1;
-static int hf_radiotap_he_mu_chan1_rus_2_unknown = -1;
-static int hf_radiotap_he_mu_chan1_rus_3 = -1;
-static int hf_radiotap_he_mu_chan1_rus_3_unknown = -1;
-static int hf_radiotap_he_mu_chan2_rus_0 = -1;
-static int hf_radiotap_he_mu_chan2_rus_0_unknown = -1;
-static int hf_radiotap_he_mu_chan2_rus_1 = -1;
-static int hf_radiotap_he_mu_chan2_rus_1_unknown = -1;
-static int hf_radiotap_he_mu_chan2_rus_2 = -1;
-static int hf_radiotap_he_mu_chan2_rus_2_unknown = -1;
-static int hf_radiotap_he_mu_chan2_rus_3 = -1;
-static int hf_radiotap_he_mu_chan2_rus_3_unknown = -1;
+static int hf_radiotap_he_ppdu_format;
+static int hf_radiotap_he_bss_color_known;
+static int hf_radiotap_he_beam_change_known;
+static int hf_radiotap_he_ul_dl_known;
+static int hf_radiotap_he_data_mcs_known;
+static int hf_radiotap_he_data_dcm_known;
+static int hf_radiotap_he_coding_known;
+static int hf_radiotap_he_ldpc_extra_symbol_segment_known;
+static int hf_radiotap_he_stbc_known;
+static int hf_radiotap_he_spatial_reuse_1_known;
+static int hf_radiotap_he_spatial_reuse_2_known;
+static int hf_radiotap_he_spatial_reuse_3_known;
+static int hf_radiotap_he_spatial_reuse_4_known;
+static int hf_radiotap_he_data_bw_ru_allocation_known;
+static int hf_radiotap_he_doppler_known;
+static int hf_radiotap_he_pri_sec_80_mhz_known;
+static int hf_radiotap_he_gi_known;
+static int hf_radiotap_he_num_ltf_symbols_known;
+static int hf_radiotap_he_pre_fec_padding_factor_known;
+static int hf_radiotap_he_txbf_known;
+static int hf_radiotap_he_pe_disambiguity_known;
+static int hf_radiotap_he_txop_known;
+static int hf_radiotap_he_midamble_periodicity_known;
+static int hf_radiotap_he_ru_allocation_offset;
+static int hf_radiotap_he_ru_allocation_offset_known;
+static int hf_radiotap_he_pri_sec_80_mhz;
+static int hf_radiotap_he_bss_color;
+static int hf_radiotap_he_bss_color_unknown;
+static int hf_radiotap_he_beam_change;
+static int hf_radiotap_he_beam_change_unknown;
+static int hf_radiotap_he_ul_dl;
+static int hf_radiotap_he_ul_dl_unknown;
+static int hf_radiotap_he_data_mcs;
+static int hf_radiotap_he_data_mcs_unknown;
+static int hf_radiotap_he_data_dcm;
+static int hf_radiotap_he_data_dcm_unknown;
+static int hf_radiotap_he_coding;
+static int hf_radiotap_he_coding_unknown;
+static int hf_radiotap_he_ldpc_extra_symbol_segment;
+static int hf_radiotap_he_ldpc_extra_symbol_segment_unknown;
+static int hf_radiotap_he_stbc;
+static int hf_radiotap_he_stbc_unknown;
+static int hf_radiotap_spatial_reuse;
+static int hf_radiotap_spatial_reuse_unknown;
+static int hf_radiotap_he_su_reserved;
+static int hf_radiotap_spatial_reuse_1;
+static int hf_radiotap_spatial_reuse_1_unknown;
+static int hf_radiotap_spatial_reuse_2;
+static int hf_radiotap_spatial_reuse_2_unknown;
+static int hf_radiotap_spatial_reuse_3;
+static int hf_radiotap_spatial_reuse_3_unknown;
+static int hf_radiotap_spatial_reuse_4;
+static int hf_radiotap_spatial_reuse_4_unknown;
+static int hf_radiotap_sta_id_user_captured;
+static int hf_radiotap_he_mu_reserved;
+static int hf_radiotap_data_bandwidth_ru_allocation;
+static int hf_radiotap_data_bandwidth_ru_allocation_unknown;
+static int hf_radiotap_gi;
+static int hf_radiotap_gi_unknown;
+static int hf_radiotap_ltf_symbol_size;
+static int hf_radiotap_ltf_symbol_size_unknown;
+static int hf_radiotap_num_ltf_symbols;
+static int hf_radiotap_num_ltf_symbols_unknown;
+static int hf_radiotap_d5_reserved_b11;
+static int hf_radiotap_pre_fec_padding_factor;
+static int hf_radiotap_pre_fec_padding_factor_unknown;
+static int hf_radiotap_txbf;
+static int hf_radiotap_txbf_unknown;
+static int hf_radiotap_pe_disambiguity;
+static int hf_radiotap_pe_disambiguity_unknown;
+static int hf_radiotap_he_nsts;
+static int hf_radiotap_he_doppler_value;
+static int hf_radiotap_he_doppler_value_unknown;
+static int hf_radiotap_he_d6_reserved_00e0;
+static int hf_radiotap_he_txop_value;
+static int hf_radiotap_he_txop_value_unknown;
+static int hf_radiotap_midamble_periodicity;
+static int hf_radiotap_midamble_periodicity_unknown;
+static int hf_radiotap_he_info_data_1;
+static int hf_radiotap_he_info_data_2;
+static int hf_radiotap_he_info_data_3;
+static int hf_radiotap_he_info_data_4;
+static int hf_radiotap_he_info_data_5;
+static int hf_radiotap_he_info_data_6;
+static int hf_radiotap_he_mu_sig_b_mcs;
+static int hf_radiotap_he_mu_sig_b_mcs_unknown;
+static int hf_radiotap_he_mu_sig_b_mcs_known;
+static int hf_radiotap_he_mu_sig_b_dcm;
+static int hf_radiotap_he_mu_sig_b_dcm_unknown;
+static int hf_radiotap_he_mu_sig_b_dcm_known;
+static int hf_radiotap_he_mu_chan2_center_26_tone_ru_bit_known;
+static int hf_radiotap_he_mu_chan2_center_26_tone_ru_bit_unknown;
+static int hf_radiotap_he_mu_chan1_rus_known;
+static int hf_radiotap_he_mu_chan1_rus_unknown;
+static int hf_radiotap_he_mu_chan2_rus_known;
+static int hf_radiotap_he_mu_chan2_rus_unknown;
+static int hf_radiotap_he_mu_reserved_f1_b10_b11;
+static int hf_radiotap_he_mu_chan1_center_26_tone_ru_bit_known;
+static int hf_radiotap_he_mu_chan1_center_26_tone_ru_bit_unknown;
+static int hf_radiotap_he_mu_chan1_center_26_tone_ru_value;
+static int hf_radiotap_he_mu_sig_b_compression_known;
+static int hf_radiotap_he_mu_sig_b_compression_unknown;
+static int hf_radiotap_he_mu_sig_b_compression_from_sig_a;
+static int hf_radiotap_he_mu_sig_b_syms_mu_mimo_users_known;
+static int hf_radiotap_he_mu_sig_b_syms_mu_mimo_users_unknown;
+static int hf_radiotap_he_mu_info_flags_1;
+static int hf_radiotap_he_mu_bw_from_bw_in_sig_a;
+static int hf_radiotap_he_mu_bw_from_bw_in_sig_a_unknown;
+static int hf_radiotap_he_mu_bw_from_bw_in_sig_a_known;
+static int hf_radiotap_he_mu_sig_b_syms_mu_mimo_users;
+static int hf_radiotap_he_mu_preamble_puncturing;
+static int hf_radiotap_he_mu_preamble_puncturing_unknown;
+static int hf_radiotap_he_mu_preamble_puncturing_known;
+static int hf_radiotap_he_mu_chan2_center_26_tone_ru_value;
+static int hf_radiotap_he_mu_reserved_f2_b12_b15;
+static int hf_radiotap_he_mu_info_flags_2;
+static int hf_radiotap_he_mu_chan1_rus_0;
+static int hf_radiotap_he_mu_chan1_rus_0_unknown;
+static int hf_radiotap_he_mu_chan1_rus_1;
+static int hf_radiotap_he_mu_chan1_rus_1_unknown;
+static int hf_radiotap_he_mu_chan1_rus_2;
+static int hf_radiotap_he_mu_chan1_rus_2_unknown;
+static int hf_radiotap_he_mu_chan1_rus_3;
+static int hf_radiotap_he_mu_chan1_rus_3_unknown;
+static int hf_radiotap_he_mu_chan2_rus_0;
+static int hf_radiotap_he_mu_chan2_rus_0_unknown;
+static int hf_radiotap_he_mu_chan2_rus_1;
+static int hf_radiotap_he_mu_chan2_rus_1_unknown;
+static int hf_radiotap_he_mu_chan2_rus_2;
+static int hf_radiotap_he_mu_chan2_rus_2_unknown;
+static int hf_radiotap_he_mu_chan2_rus_3;
+static int hf_radiotap_he_mu_chan2_rus_3_unknown;
 
 /* 0-length-psdu */
-static int hf_radiotap_0_length_psdu_type = -1;
+static int hf_radiotap_0_length_psdu_type;
 
 /* L-SIG */
-static int hf_radiotap_l_sig_data_1 = -1;
-static int hf_radiotap_l_sig_rate_known = -1;
-static int hf_radiotap_l_sig_length_known = -1;
-static int hf_radiotap_l_sig_reserved = -1;
-static int hf_radiotap_l_sig_data_2 = -1;
-static int hf_radiotap_l_sig_rate = -1;
-static int hf_radiotap_l_sig_length = -1;
+static int hf_radiotap_l_sig_data_1;
+static int hf_radiotap_l_sig_rate_known;
+static int hf_radiotap_l_sig_length_known;
+static int hf_radiotap_l_sig_reserved;
+static int hf_radiotap_l_sig_data_2;
+static int hf_radiotap_l_sig_rate;
+static int hf_radiotap_l_sig_length;
 
 /* U-SIG */
-static int hf_radiotap_u_sig_common = -1;
-static int hf_radiotap_usig_phy_version_identifier_known = -1;
-static int hf_radiotap_usig_bw_known = -1;
-static int hf_radiotap_usig_ul_dl_known = -1;
-static int hf_radiotap_usig_bss_color_known = -1;
-static int hf_radiotap_usig_txop_known = -1;
-static int hf_radiotap_usig_bad_u_sig_crc = -1;
-static int hf_radiotap_usig_validate_bits_checked = -1;
-static int hf_radiotap_usig_validate_bits_ok = -1;
-static int hf_radiotap_usig_reserved = -1;
-static int hf_radiotap_usig_phy_version_id = -1;
-static int hf_radiotap_usig_bw = -1;
-static int hf_radiotap_usig_ul_dl = -1;
-static int hf_radiotap_usig_bss_color = -1;
-static int hf_radiotap_usig_txop = -1;
-static int hf_radiotap_usig_value_mu_ppdu = -1;
-static int hf_radiotap_usig_eht_mu_b20_b24 = -1;
-static int hf_radiotap_usig_eht_mu_b20_b24_not_known = -1;
-static int hf_radiotap_usig_eht_mu_b25 = -1;
-static int hf_radiotap_usig_eht_mu_b25_not_known = -1;
-static int hf_radiotap_usig_ppdu_type_and_comp_mode = -1;
-static int hf_radiotap_usig_validate1 = -1;
-static int hf_radiotap_usig_validate1_not_known = -1;
-static int hf_radiotap_usig_punctured_channel_info = -1;
-static int hf_radiotap_usig_punctured_channel_info_not_known = -1;
-static int hf_radiotap_usig_validate2 = -1;
-static int hf_radiotap_usig_validate2_not_known = -1;
-static int hf_radiotap_usig_eht_sig_mcs = -1;
-static int hf_radiotap_usig_eht_sig_mcs_not_known = -1;
-static int hf_radiotap_usig_number_eht_sig_symbols = -1;
-static int hf_radiotap_usig_number_eht_sig_symbols_not_known = -1;
-static int hf_radiotap_usig_crc = -1;
-static int hf_radiotap_usig_crc_not_known = -1;
-static int hf_radiotap_usig_tail = -1;
-static int hf_radiotap_usig_tail_not_known = -1;
-static int hf_radiotap_u_sig_mask = -1;
-static int hf_radiotap_usig_value_tb_ppdu = -1;
-static int hf_radiotap_usig_eht_tb_b20_b25 = -1;
-static int hf_radiotap_usig_eht_tb_b20_b25_not_known = -1;
-static int hf_radiotap_usig_eht_tb_validate1 = -1;
-static int hf_radiotap_usig_eht_tb_validate1_not_known = -1;
-static int hf_radiotap_usig_eht_tb_spatial_reuse_1 = -1;
-static int hf_radiotap_usig_eht_tb_spatial_reuse_1_not_known = -1;
-static int hf_radiotap_usig_eht_tb_spatial_reuse_2 = -1;
-static int hf_radiotap_usig_eht_tb_spatial_reuse_2_not_known = -1;
-static int hf_radiotap_usig_eht_tb_disregard = -1;
-static int hf_radiotap_usig_eht_tb_disregard_not_known = -1;
-static int hf_radiotap_usig_eht_tb_crc = -1;
-static int hf_radiotap_usig_eht_tb_crc_not_known = -1;
-static int hf_radiotap_usig_eht_tb_tail = -1;
-static int hf_radiotap_usig_eht_tb_tail_not_known = -1;
+static int hf_radiotap_u_sig_common;
+static int hf_radiotap_usig_phy_version_identifier_known;
+static int hf_radiotap_usig_bw_known;
+static int hf_radiotap_usig_ul_dl_known;
+static int hf_radiotap_usig_bss_color_known;
+static int hf_radiotap_usig_txop_known;
+static int hf_radiotap_usig_bad_u_sig_crc;
+static int hf_radiotap_usig_validate_bits_checked;
+static int hf_radiotap_usig_validate_bits_ok;
+static int hf_radiotap_usig_reserved;
+static int hf_radiotap_usig_phy_version_id;
+static int hf_radiotap_usig_bw;
+static int hf_radiotap_usig_ul_dl;
+static int hf_radiotap_usig_bss_color;
+static int hf_radiotap_usig_txop;
+static int hf_radiotap_usig_value_mu_ppdu;
+static int hf_radiotap_usig_eht_mu_b20_b24;
+static int hf_radiotap_usig_eht_mu_b20_b24_not_known;
+static int hf_radiotap_usig_eht_mu_b25;
+static int hf_radiotap_usig_eht_mu_b25_not_known;
+static int hf_radiotap_usig_ppdu_type_and_comp_mode;
+static int hf_radiotap_usig_validate1;
+static int hf_radiotap_usig_validate1_not_known;
+static int hf_radiotap_usig_punctured_channel_info;
+static int hf_radiotap_usig_punctured_channel_info_not_known;
+static int hf_radiotap_usig_validate2;
+static int hf_radiotap_usig_validate2_not_known;
+static int hf_radiotap_usig_eht_sig_mcs;
+static int hf_radiotap_usig_eht_sig_mcs_not_known;
+static int hf_radiotap_usig_number_eht_sig_symbols;
+static int hf_radiotap_usig_number_eht_sig_symbols_not_known;
+static int hf_radiotap_usig_crc;
+static int hf_radiotap_usig_crc_not_known;
+static int hf_radiotap_usig_tail;
+static int hf_radiotap_usig_tail_not_known;
+static int hf_radiotap_u_sig_mask;
+static int hf_radiotap_usig_value_tb_ppdu;
+static int hf_radiotap_usig_eht_tb_b20_b25;
+static int hf_radiotap_usig_eht_tb_b20_b25_not_known;
+static int hf_radiotap_usig_eht_tb_validate1;
+static int hf_radiotap_usig_eht_tb_validate1_not_known;
+static int hf_radiotap_usig_eht_tb_spatial_reuse_1;
+static int hf_radiotap_usig_eht_tb_spatial_reuse_1_not_known;
+static int hf_radiotap_usig_eht_tb_spatial_reuse_2;
+static int hf_radiotap_usig_eht_tb_spatial_reuse_2_not_known;
+static int hf_radiotap_usig_eht_tb_disregard;
+static int hf_radiotap_usig_eht_tb_disregard_not_known;
+static int hf_radiotap_usig_eht_tb_crc;
+static int hf_radiotap_usig_eht_tb_crc_not_known;
+static int hf_radiotap_usig_eht_tb_tail;
+static int hf_radiotap_usig_eht_tb_tail_not_known;
 
 /* EHT */
-static int hf_radiotap_eht_known = -1;
-static int hf_radiotap_eht_reserved_1 = -1;
-static int hf_radiotap_eht_spatial_reuse_known = -1;
-static int hf_radiotap_eht_guard_interval_known = -1;
-static int hf_radiotap_eht_reserved_8 = -1;
-static int hf_radiotap_eht_number_ltf_symbols_known = -1;
-static int hf_radiotap_eht_ldpc_extra_symbol_segment_known = -1;
-static int hf_radiotap_eht_pre_fec_padding_factor_known = -1;
-static int hf_radiotap_eht_pe_disambiguity_known = -1;
-static int hf_radiotap_eht_disregard_known = -1;
-static int hf_radiotap_eht_reserved1 = -1;
-static int hf_radiotap_eht_reserved_2 = -1;
-static int hf_radiotap_eht_crc1_known = -1;
-static int hf_radiotap_eht_tail1_known = -1;
-static int hf_radiotap_eht_crc2_known = -1;
-static int hf_radiotap_eht_tail2_known = -1;
-static int hf_radiotap_eht_nss_known = -1;
-static int hf_radiotap_eht_beamformed_known = -1;
-static int hf_radiotap_eht_number_non_ofdma_users_known = -1;
-static int hf_radiotap_eht_user_encoding_block_crc_known = -1;
-static int hf_radiotap_eht_user_encoding_block_tail_known = -1;
-static int hf_radiotap_eht_ru_mru_size_known = -1;
-static int hf_radiotap_eht_ru_mru_index_known = -1;
-static int hf_radiotap_eht_tb_ru_allocation_known = -1;
-static int hf_radiotap_eht_primary_80mhz_channel_pos_known = -1;
-static int hf_radiotap_eht_reserved_fc = -1;
-static int hf_radiotap_eht_data0 = -1;
-static int hf_radiotap_eht_data0_reserved1 = -1;
-static int hf_radiotap_eht_data0_spatial_reuse = -1;
-static int hf_radiotap_eht_data0_spatial_reuse_not_known = -1;
-static int hf_radiotap_eht_data0_gi = -1;
-static int hf_radiotap_eht_data0_gi_not_known = -1;
-static int hf_radiotap_eht_data0_ltf_symbol_size = -1;
-static int hf_radiotap_eht_data0_number_ltf_symbols = -1;
-static int hf_radiotap_eht_data0_number_ltf_symbols_not_known = -1;
-static int hf_radiotap_eht_data0_ldpc_extra_symbol_segment = -1;
-static int hf_radiotap_eht_data0_ldpc_extra_symbol_segment_not_known = -1;
-static int hf_radiotap_eht_data0_pre_fec_padding_factor = -1;
-static int hf_radiotap_eht_data0_pre_fec_padding_factor_not_known = -1;
-static int hf_radiotap_eht_data0_pe_disambiguity = -1;
-static int hf_radiotap_eht_data0_pe_disambiguity_not_known = -1;
-static int hf_radiotap_eht_data0_disregard = -1;
-static int hf_radiotap_eht_data0_disregard_not_known = -1;
-static int hf_radiotap_eht_data0_crc1 = -1;
-static int hf_radiotap_eht_data0_crc1_not_known = -1;
-static int hf_radiotap_eht_data0_tail1 = -1;
-static int hf_radiotap_eht_data0_tail1_not_known = -1;
-static int hf_radiotap_eht_data1 = -1;
-static int hf_radiotap_eht_data1_ru_mru_size = -1;
-static int hf_radiotap_eht_data1_ru_mru_size_not_known = -1;
-static int hf_radiotap_eht_data1_ru_mru_index = -1;
-static int hf_radiotap_eht_data1_ru_mru_index_not_known = -1;
-static int hf_radiotap_eht_data1_ru_alloc_c1_1_1 = -1;
-static int hf_radiotap_eht_data1_ru_alloc_c1_1_1_not_known = -1;
-static int hf_radiotap_eht_data1_ru_alloc_c1_1_1_known = -1;
-static int hf_radiotap_eht_data1_reserved = -1;
-static int hf_radiotap_eht_data1_primary_80_mhz_chan_pos = -1;
-static int hf_radiotap_eht_data1_primary_80_mhz_chan_pos_not_known = -1;
-static int hf_radiotap_eht_data2 = -1;
-static int hf_radiotap_eht_data2_ru_alloc_c2_1_1 = -1;
-static int hf_radiotap_eht_data2_ru_alloc_c2_1_1_not_known = -1;
-static int hf_radiotap_eht_data2_ru_alloc_c2_1_1_known = -1;
-static int hf_radiotap_eht_data2_ru_alloc_c1_1_2 = -1;
-static int hf_radiotap_eht_data2_ru_alloc_c1_1_2_not_known = -1;
-static int hf_radiotap_eht_data2_ru_alloc_c1_1_2_known = -1;
-static int hf_radiotap_eht_data2_ru_alloc_c2_1_2 = -1;
-static int hf_radiotap_eht_data2_ru_alloc_c2_1_2_not_known = -1;
-static int hf_radiotap_eht_data2_ru_alloc_c2_1_2_known = -1;
-static int hf_radiotap_eht_data2_reserved = -1;
-static int hf_radiotap_eht_data3 = -1;
-static int hf_radiotap_eht_data3_ru_alloc_c1_2_1 = -1;
-static int hf_radiotap_eht_data3_ru_alloc_c1_2_1_not_known = -1;
-static int hf_radiotap_eht_data3_ru_alloc_c1_2_1_known = -1;
-static int hf_radiotap_eht_data3_ru_alloc_c2_2_1 = -1;
-static int hf_radiotap_eht_data3_ru_alloc_c2_2_1_not_known = -1;
-static int hf_radiotap_eht_data3_ru_alloc_c2_2_1_known = -1;
-static int hf_radiotap_eht_data3_ru_alloc_c1_2_2 = -1;
-static int hf_radiotap_eht_data3_ru_alloc_c1_2_2_not_known = -1;
-static int hf_radiotap_eht_data3_ru_alloc_c1_2_2_known = -1;
-static int hf_radiotap_eht_data3_reserved = -1;
-static int hf_radiotap_eht_data4 = -1;
-static int hf_radiotap_eht_data4_ru_alloc_c2_2_2 = -1;
-static int hf_radiotap_eht_data4_ru_alloc_c2_2_2_not_known = -1;
-static int hf_radiotap_eht_data4_ru_alloc_c2_2_2_known = -1;
-static int hf_radiotap_eht_data4_ru_alloc_c1_2_3 = -1;
-static int hf_radiotap_eht_data4_ru_alloc_c1_2_3_not_known = -1;
-static int hf_radiotap_eht_data4_ru_alloc_c1_2_3_known = -1;
-static int hf_radiotap_eht_data4_ru_alloc_c2_2_3 = -1;
-static int hf_radiotap_eht_data4_ru_alloc_c2_2_3_not_known = -1;
-static int hf_radiotap_eht_data4_ru_alloc_c2_2_3_known = -1;
-static int hf_radiotap_eht_data4_reserved = -1;
-static int hf_radiotap_eht_data5 = -1;
-static int hf_radiotap_eht_data5_ru_alloc_c1_2_4 = -1;
-static int hf_radiotap_eht_data5_ru_alloc_c1_2_4_not_known = -1;
-static int hf_radiotap_eht_data5_ru_alloc_c1_2_4_known = -1;
-static int hf_radiotap_eht_data5_ru_alloc_c2_2_4 = -1;
-static int hf_radiotap_eht_data5_ru_alloc_c2_2_4_not_known = -1;
-static int hf_radiotap_eht_data5_ru_alloc_c2_2_4_known = -1;
-static int hf_radiotap_eht_data5_ru_alloc_c1_2_5 = -1;
-static int hf_radiotap_eht_data5_ru_alloc_c1_2_5_not_known = -1;
-static int hf_radiotap_eht_data5_ru_alloc_c1_2_5_known = -1;
-static int hf_radiotap_eht_data5_reserved = -1;
-static int hf_radiotap_eht_data6 = -1;
-static int hf_radiotap_eht_data6_ru_alloc_c2_2_5 = -1;
-static int hf_radiotap_eht_data6_ru_alloc_c2_2_5_not_known = -1;
-static int hf_radiotap_eht_data6_ru_alloc_c2_2_5_known = -1;
-static int hf_radiotap_eht_data6_ru_alloc_c1_2_6 = -1;
-static int hf_radiotap_eht_data6_ru_alloc_c1_2_6_not_known = -1;
-static int hf_radiotap_eht_data6_ru_alloc_c1_2_6_known = -1;
-static int hf_radiotap_eht_data6_ru_alloc_c2_2_6 = -1;
-static int hf_radiotap_eht_data6_ru_alloc_c2_2_6_not_known = -1;
-static int hf_radiotap_eht_data6_ru_alloc_c2_2_6_known = -1;
-static int hf_radiotap_eht_data6_reserved = -1;
-static int hf_radiotap_eht_data7 = -1;
-static int hf_radiotap_eht_data7_crc2 = -1;
-static int hf_radiotap_eht_data7_tail2 = -1;
-static int hf_radiotap_eht_data7_rsvd = -1;
-static int hf_radiotap_eht_data7_nss = -1;
-static int hf_radiotap_eht_data7_beamformed = -1;
-static int hf_radiotap_eht_data7_number_non_ofdma_users = -1;
-static int hf_radiotap_eht_data7_number_non_ofdma_users_not_known = -1;
-static int hf_radiotap_eht_data7_user_encode_crc = -1;
-static int hf_radiotap_eht_data7_user_encode_tail = -1;
-static int hf_radiotap_eht_data7_rsvd2 = -1;
-static int hf_radiotap_eht_data8 = -1;
-static int hf_radiotap_eht_data8_ru_alloc_ps_160 = -1;
-static int hf_radiotap_eht_data8_ru_alloc_b0 = -1;
-static int hf_radiotap_eht_data8_ru_alloc_b7_b1 = -1;
-static int hf_radiotap_eht_data8_rsvd = -1;
-static int hf_radiotap_eht_user_info = -1;
-static int hf_radiotap_eht_ui_sta_id_known = -1;
-static int hf_radiotap_eht_ui_mcs_known = -1;
-static int hf_radiotap_eht_ui_coding_known = -1;
-static int hf_radiotap_eht_ui_rsvd_known = -1;
-static int hf_radiotap_eht_ui_nss_known = -1;
-static int hf_radiotap_eht_ui_beamforming_known = -1;
-static int hf_radiotap_eht_ui_spatial_config_known = -1;
-static int hf_radiotap_eht_ui_data_captured = -1;
-static int hf_radiotap_eht_ui_sta_id = -1;
-static int hf_radiotap_eht_ui_sta_id_not_known = -1;
-static int hf_radiotap_eht_ui_coding = -1;
-static int hf_radiotap_eht_ui_coding_not_known = -1;
-static int hf_radiotap_eht_ui_mcs = -1;
-static int hf_radiotap_eht_ui_mcs_not_known = -1;
-static int hf_radiotap_eht_ui_nss = -1;
-static int hf_radiotap_eht_ui_nss_not_known = -1;
-static int hf_radiotap_eht_ui_reserved = -1;
-static int hf_radiotap_eht_ui_reserved_not_known = -1;
-static int hf_radiotap_eht_ui_beamforming = -1;
-static int hf_radiotap_eht_ui_beamforming_not_known = -1;
-static int hf_radiotap_eht_ui_spatial_config = -1;
-static int hf_radiotap_eht_ui_rsvd1 = -1;
+static int hf_radiotap_eht_known;
+static int hf_radiotap_eht_reserved_1;
+static int hf_radiotap_eht_spatial_reuse_known;
+static int hf_radiotap_eht_guard_interval_known;
+static int hf_radiotap_eht_reserved_8;
+static int hf_radiotap_eht_number_ltf_symbols_known;
+static int hf_radiotap_eht_ldpc_extra_symbol_segment_known;
+static int hf_radiotap_eht_pre_fec_padding_factor_known;
+static int hf_radiotap_eht_pe_disambiguity_known;
+static int hf_radiotap_eht_disregard_known;
+static int hf_radiotap_eht_reserved1;
+static int hf_radiotap_eht_reserved_2;
+static int hf_radiotap_eht_crc1_known;
+static int hf_radiotap_eht_tail1_known;
+static int hf_radiotap_eht_crc2_known;
+static int hf_radiotap_eht_tail2_known;
+static int hf_radiotap_eht_nss_known;
+static int hf_radiotap_eht_beamformed_known;
+static int hf_radiotap_eht_number_non_ofdma_users_known;
+static int hf_radiotap_eht_user_encoding_block_crc_known;
+static int hf_radiotap_eht_user_encoding_block_tail_known;
+static int hf_radiotap_eht_ru_mru_size_known;
+static int hf_radiotap_eht_ru_mru_index_known;
+static int hf_radiotap_eht_tb_ru_allocation_known;
+static int hf_radiotap_eht_primary_80mhz_channel_pos_known;
+static int hf_radiotap_eht_reserved_fc;
+static int hf_radiotap_eht_data0;
+static int hf_radiotap_eht_data0_reserved1;
+static int hf_radiotap_eht_data0_spatial_reuse;
+static int hf_radiotap_eht_data0_spatial_reuse_not_known;
+static int hf_radiotap_eht_data0_gi;
+static int hf_radiotap_eht_data0_gi_not_known;
+static int hf_radiotap_eht_data0_ltf_symbol_size;
+static int hf_radiotap_eht_data0_number_ltf_symbols;
+static int hf_radiotap_eht_data0_number_ltf_symbols_not_known;
+static int hf_radiotap_eht_data0_ldpc_extra_symbol_segment;
+static int hf_radiotap_eht_data0_ldpc_extra_symbol_segment_not_known;
+static int hf_radiotap_eht_data0_pre_fec_padding_factor;
+static int hf_radiotap_eht_data0_pre_fec_padding_factor_not_known;
+static int hf_radiotap_eht_data0_pe_disambiguity;
+static int hf_radiotap_eht_data0_pe_disambiguity_not_known;
+static int hf_radiotap_eht_data0_disregard;
+static int hf_radiotap_eht_data0_disregard_not_known;
+static int hf_radiotap_eht_data0_crc1;
+static int hf_radiotap_eht_data0_crc1_not_known;
+static int hf_radiotap_eht_data0_tail1;
+static int hf_radiotap_eht_data0_tail1_not_known;
+static int hf_radiotap_eht_data1;
+static int hf_radiotap_eht_data1_ru_mru_size;
+static int hf_radiotap_eht_data1_ru_mru_size_not_known;
+static int hf_radiotap_eht_data1_ru_mru_index;
+static int hf_radiotap_eht_data1_ru_mru_index_not_known;
+static int hf_radiotap_eht_data1_ru_alloc_c1_1_1;
+static int hf_radiotap_eht_data1_ru_alloc_c1_1_1_not_known;
+static int hf_radiotap_eht_data1_ru_alloc_c1_1_1_known;
+static int hf_radiotap_eht_data1_reserved;
+static int hf_radiotap_eht_data1_primary_80_mhz_chan_pos;
+static int hf_radiotap_eht_data1_primary_80_mhz_chan_pos_not_known;
+static int hf_radiotap_eht_data2;
+static int hf_radiotap_eht_data2_ru_alloc_c2_1_1;
+static int hf_radiotap_eht_data2_ru_alloc_c2_1_1_not_known;
+static int hf_radiotap_eht_data2_ru_alloc_c2_1_1_known;
+static int hf_radiotap_eht_data2_ru_alloc_c1_1_2;
+static int hf_radiotap_eht_data2_ru_alloc_c1_1_2_not_known;
+static int hf_radiotap_eht_data2_ru_alloc_c1_1_2_known;
+static int hf_radiotap_eht_data2_ru_alloc_c2_1_2;
+static int hf_radiotap_eht_data2_ru_alloc_c2_1_2_not_known;
+static int hf_radiotap_eht_data2_ru_alloc_c2_1_2_known;
+static int hf_radiotap_eht_data2_reserved;
+static int hf_radiotap_eht_data3;
+static int hf_radiotap_eht_data3_ru_alloc_c1_2_1;
+static int hf_radiotap_eht_data3_ru_alloc_c1_2_1_not_known;
+static int hf_radiotap_eht_data3_ru_alloc_c1_2_1_known;
+static int hf_radiotap_eht_data3_ru_alloc_c2_2_1;
+static int hf_radiotap_eht_data3_ru_alloc_c2_2_1_not_known;
+static int hf_radiotap_eht_data3_ru_alloc_c2_2_1_known;
+static int hf_radiotap_eht_data3_ru_alloc_c1_2_2;
+static int hf_radiotap_eht_data3_ru_alloc_c1_2_2_not_known;
+static int hf_radiotap_eht_data3_ru_alloc_c1_2_2_known;
+static int hf_radiotap_eht_data3_reserved;
+static int hf_radiotap_eht_data4;
+static int hf_radiotap_eht_data4_ru_alloc_c2_2_2;
+static int hf_radiotap_eht_data4_ru_alloc_c2_2_2_not_known;
+static int hf_radiotap_eht_data4_ru_alloc_c2_2_2_known;
+static int hf_radiotap_eht_data4_ru_alloc_c1_2_3;
+static int hf_radiotap_eht_data4_ru_alloc_c1_2_3_not_known;
+static int hf_radiotap_eht_data4_ru_alloc_c1_2_3_known;
+static int hf_radiotap_eht_data4_ru_alloc_c2_2_3;
+static int hf_radiotap_eht_data4_ru_alloc_c2_2_3_not_known;
+static int hf_radiotap_eht_data4_ru_alloc_c2_2_3_known;
+static int hf_radiotap_eht_data4_reserved;
+static int hf_radiotap_eht_data5;
+static int hf_radiotap_eht_data5_ru_alloc_c1_2_4;
+static int hf_radiotap_eht_data5_ru_alloc_c1_2_4_not_known;
+static int hf_radiotap_eht_data5_ru_alloc_c1_2_4_known;
+static int hf_radiotap_eht_data5_ru_alloc_c2_2_4;
+static int hf_radiotap_eht_data5_ru_alloc_c2_2_4_not_known;
+static int hf_radiotap_eht_data5_ru_alloc_c2_2_4_known;
+static int hf_radiotap_eht_data5_ru_alloc_c1_2_5;
+static int hf_radiotap_eht_data5_ru_alloc_c1_2_5_not_known;
+static int hf_radiotap_eht_data5_ru_alloc_c1_2_5_known;
+static int hf_radiotap_eht_data5_reserved;
+static int hf_radiotap_eht_data6;
+static int hf_radiotap_eht_data6_ru_alloc_c2_2_5;
+static int hf_radiotap_eht_data6_ru_alloc_c2_2_5_not_known;
+static int hf_radiotap_eht_data6_ru_alloc_c2_2_5_known;
+static int hf_radiotap_eht_data6_ru_alloc_c1_2_6;
+static int hf_radiotap_eht_data6_ru_alloc_c1_2_6_not_known;
+static int hf_radiotap_eht_data6_ru_alloc_c1_2_6_known;
+static int hf_radiotap_eht_data6_ru_alloc_c2_2_6;
+static int hf_radiotap_eht_data6_ru_alloc_c2_2_6_not_known;
+static int hf_radiotap_eht_data6_ru_alloc_c2_2_6_known;
+static int hf_radiotap_eht_data6_reserved;
+static int hf_radiotap_eht_data7;
+static int hf_radiotap_eht_data7_crc2;
+static int hf_radiotap_eht_data7_tail2;
+static int hf_radiotap_eht_data7_rsvd;
+static int hf_radiotap_eht_data7_nss;
+static int hf_radiotap_eht_data7_beamformed;
+static int hf_radiotap_eht_data7_number_non_ofdma_users;
+static int hf_radiotap_eht_data7_number_non_ofdma_users_not_known;
+static int hf_radiotap_eht_data7_user_encode_crc;
+static int hf_radiotap_eht_data7_user_encode_tail;
+static int hf_radiotap_eht_data7_rsvd2;
+static int hf_radiotap_eht_data8;
+static int hf_radiotap_eht_data8_ru_alloc_ps_160;
+static int hf_radiotap_eht_data8_ru_alloc_b0;
+static int hf_radiotap_eht_data8_ru_alloc_b7_b1;
+static int hf_radiotap_eht_data8_rsvd;
+static int hf_radiotap_eht_user_info;
+static int hf_radiotap_eht_ui_sta_id_known;
+static int hf_radiotap_eht_ui_mcs_known;
+static int hf_radiotap_eht_ui_coding_known;
+static int hf_radiotap_eht_ui_rsvd_known;
+static int hf_radiotap_eht_ui_nss_known;
+static int hf_radiotap_eht_ui_beamforming_known;
+static int hf_radiotap_eht_ui_spatial_config_known;
+static int hf_radiotap_eht_ui_data_captured;
+static int hf_radiotap_eht_ui_sta_id;
+static int hf_radiotap_eht_ui_sta_id_not_known;
+static int hf_radiotap_eht_ui_coding;
+static int hf_radiotap_eht_ui_coding_not_known;
+static int hf_radiotap_eht_ui_mcs;
+static int hf_radiotap_eht_ui_mcs_not_known;
+static int hf_radiotap_eht_ui_nss;
+static int hf_radiotap_eht_ui_nss_not_known;
+static int hf_radiotap_eht_ui_reserved;
+static int hf_radiotap_eht_ui_reserved_not_known;
+static int hf_radiotap_eht_ui_beamforming;
+static int hf_radiotap_eht_ui_beamforming_not_known;
+static int hf_radiotap_eht_ui_spatial_config;
+static int hf_radiotap_eht_ui_rsvd1;
 
 /* S1G */
-static int hf_radiotap_s1g_known = -1;
-static int hf_radiotap_s1g_s1g_ppdu_format_known = -1;
-static int hf_radiotap_s1g_response_indication_known = -1;
-static int hf_radiotap_s1g_guard_interval_known = -1;
-static int hf_radiotap_s1g_nss_known = -1;
-static int hf_radiotap_s1g_bandwidth_known = -1;
-static int hf_radiotap_s1g_mcs_known = -1;
-static int hf_radiotap_s1g_color_known = -1;
-static int hf_radiotap_s1g_uplink_indication_known = -1;
-static int hf_radiotap_s1g_reserved_1 = -1;
-static int hf_radiotap_s1g_data_1 = -1;
-static int hf_radiotap_s1g_s1g_ppdu_format = -1;
-static int hf_radiotap_s1g_response_indication = -1;
-static int hf_radiotap_s1g_reserved_2 = -1;
-static int hf_radiotap_s1g_guard_interval = -1;
-static int hf_radiotap_s1g_nss = -1;
-static int hf_radiotap_s1g_bandwidth = -1;
-static int hf_radiotap_s1g_mcs = -1;
-static int hf_radiotap_s1g_data_2 = -1;
-static int hf_radiotap_s1g_color = -1;
-static int hf_radiotap_s1g_uplink_indication = -1;
-static int hf_radiotap_s1g_rssi = -1;
-static int hf_radiotap_s1g_reserved_3 = -1;
-
-static gint ett_radiotap = -1;
-static gint ett_radiotap_tlv = -1;
-static gint ett_radiotap_present = -1;
-static gint ett_radiotap_present_word = -1;
-static gint ett_radiotap_flags = -1;
-static gint ett_radiotap_rxflags = -1;
-static gint ett_radiotap_txflags = -1;
-static gint ett_radiotap_channel_flags = -1;
-static gint ett_radiotap_xchannel_flags = -1;
-static gint ett_radiotap_vendor = -1;
-static gint ett_radiotap_mcs = -1;
-static gint ett_radiotap_mcs_known = -1;
-static gint ett_radiotap_ampdu = -1;
-static gint ett_radiotap_ampdu_flags = -1;
-static gint ett_radiotap_vht = -1;
-static gint ett_radiotap_vht_known = -1;
-static gint ett_radiotap_vht_user = -1;
-static gint ett_radiotap_timestamp = -1;
-static gint ett_radiotap_timestamp_flags = -1;
-static gint ett_radiotap_he_info = -1;
-static gint ett_radiotap_he_info_data_1 = -1;
-static gint ett_radiotap_he_info_data_2 = -1;
-static gint ett_radiotap_he_info_data_3 = -1;
-static gint ett_radiotap_he_info_data_4 = -1;
-static gint ett_radiotap_he_info_data_5 = -1;
-static gint ett_radiotap_he_info_data_6 = -1;
-static gint ett_radiotap_he_mu_info = -1;
-static gint ett_radiotap_he_mu_info_flags_1 = -1;
-static gint ett_radiotap_he_mu_info_flags_2 = -1;
-static gint ett_radiotap_he_mu_chan_rus = -1;
-static gint ett_radiotap_0_length_psdu = -1;
-static gint ett_radiotap_l_sig = -1;
-static gint ett_radiotap_l_sig_data_1 = -1;
-static gint ett_radiotap_l_sig_data_2 = -1;
-static gint ett_radiotap_unknown_tlv = -1;
+static int hf_radiotap_s1g_known;
+static int hf_radiotap_s1g_s1g_ppdu_format_known;
+static int hf_radiotap_s1g_response_indication_known;
+static int hf_radiotap_s1g_guard_interval_known;
+static int hf_radiotap_s1g_nss_known;
+static int hf_radiotap_s1g_bandwidth_known;
+static int hf_radiotap_s1g_mcs_known;
+static int hf_radiotap_s1g_color_known;
+static int hf_radiotap_s1g_uplink_indication_known;
+static int hf_radiotap_s1g_reserved_1;
+static int hf_radiotap_s1g_data_1;
+static int hf_radiotap_s1g_s1g_ppdu_format;
+static int hf_radiotap_s1g_response_indication;
+static int hf_radiotap_s1g_reserved_2;
+static int hf_radiotap_s1g_guard_interval;
+static int hf_radiotap_s1g_nss;
+static int hf_radiotap_s1g_bandwidth;
+static int hf_radiotap_s1g_mcs;
+static int hf_radiotap_s1g_data_2;
+static int hf_radiotap_s1g_color;
+static int hf_radiotap_s1g_uplink_indication;
+static int hf_radiotap_s1g_rssi;
+static int hf_radiotap_s1g_reserved_3;
+
+static gint ett_radiotap;
+static gint ett_radiotap_tlv;
+static gint ett_radiotap_present;
+static gint ett_radiotap_present_word;
+static gint ett_radiotap_flags;
+static gint ett_radiotap_rxflags;
+static gint ett_radiotap_txflags;
+static gint ett_radiotap_channel_flags;
+static gint ett_radiotap_xchannel_flags;
+static gint ett_radiotap_vendor;
+static gint ett_radiotap_mcs;
+static gint ett_radiotap_mcs_known;
+static gint ett_radiotap_ampdu;
+static gint ett_radiotap_ampdu_flags;
+static gint ett_radiotap_vht;
+static gint ett_radiotap_vht_known;
+static gint ett_radiotap_vht_user;
+static gint ett_radiotap_timestamp;
+static gint ett_radiotap_timestamp_flags;
+static gint ett_radiotap_he_info;
+static gint ett_radiotap_he_info_data_1;
+static gint ett_radiotap_he_info_data_2;
+static gint ett_radiotap_he_info_data_3;
+static gint ett_radiotap_he_info_data_4;
+static gint ett_radiotap_he_info_data_5;
+static gint ett_radiotap_he_info_data_6;
+static gint ett_radiotap_he_mu_info;
+static gint ett_radiotap_he_mu_info_flags_1;
+static gint ett_radiotap_he_mu_info_flags_2;
+static gint ett_radiotap_he_mu_chan_rus;
+static gint ett_radiotap_0_length_psdu;
+static gint ett_radiotap_l_sig;
+static gint ett_radiotap_l_sig_data_1;
+static gint ett_radiotap_l_sig_data_2;
+static gint ett_radiotap_unknown_tlv;
 
 /* U-SIG */
-static gint ett_radiotap_u_sig = -1;
-static gint ett_radiotap_u_sig_common = -1;
-static gint ett_radiotap_u_sig_value = -1;
+static gint ett_radiotap_u_sig;
+static gint ett_radiotap_u_sig_common;
+static gint ett_radiotap_u_sig_value;
 
 /* S1G */
-static gint ett_radiotap_s1g = -1;
-static gint ett_radiotap_s1g_known = -1;
-static gint ett_radiotap_s1g_data_1 = -1;
-static gint ett_radiotap_s1g_data_2 = -1;
+static gint ett_radiotap_s1g;
+static gint ett_radiotap_s1g_known;
+static gint ett_radiotap_s1g_data_1;
+static gint ett_radiotap_s1g_data_2;
 
 /* EHT */
-static gint ett_radiotap_eht = -1;
-static gint ett_radiotap_eht_known = -1;
-static gint ett_radiotap_eht_data = -1;
-static gint ett_radiotap_eht_user_info = -1;
-static gint ett_radiotap_eht_user_info_i = -1;
-
-static expert_field ei_radiotap_invalid_header_length = EI_INIT;
-static expert_field ei_radiotap_data_past_header = EI_INIT;
-static expert_field ei_radiotap_present = EI_INIT;
-static expert_field ei_radiotap_invalid_data_rate = EI_INIT;
+static gint ett_radiotap_eht;
+static gint ett_radiotap_eht_known;
+static gint ett_radiotap_eht_data;
+static gint ett_radiotap_eht_user_info;
+static gint ett_radiotap_eht_user_info_i;
+
+static expert_field ei_radiotap_invalid_header_length;
+static expert_field ei_radiotap_data_past_header;
+static expert_field ei_radiotap_present;
+static expert_field ei_radiotap_invalid_data_rate;
 
 static dissector_handle_t ieee80211_radio_handle;
 
diff --git a/epan/dissectors/packet-ieee80211-wlancap.c b/epan/dissectors/packet-ieee80211-wlancap.c
index ce85eb3863..4421e76b10 100644
--- a/epan/dissectors/packet-ieee80211-wlancap.c
+++ b/epan/dissectors/packet-ieee80211-wlancap.c
@@ -31,38 +31,38 @@ void proto_reg_handoff_ieee80211_wlancap(void);
 
 static dissector_handle_t ieee80211_radio_handle;
 
-static int proto_wlancap = -1;
+static int proto_wlancap;
 
 /* AVS WLANCAP radio header */
-static int hf_wlancap_magic = -1;
-static int hf_wlancap_version = -1;
-static int hf_wlancap_length = -1;
-static int hf_wlancap_mactime = -1;
-static int hf_wlancap_hosttime = -1;
-static int hf_wlancap_phytype = -1;
-static int hf_wlancap_hop_set = -1;
-static int hf_wlancap_hop_pattern = -1;
-static int hf_wlancap_hop_index = -1;
-static int hf_wlancap_channel = -1;
-static int hf_wlancap_channel_frequency = -1;
-static int hf_wlancap_data_rate = -1;
-static int hf_wlancap_antenna = -1;
-static int hf_wlancap_priority = -1;
-static int hf_wlancap_ssi_type = -1;
-static int hf_wlancap_normrssi_antsignal = -1;
-static int hf_wlancap_dbm_antsignal = -1;
-static int hf_wlancap_rawrssi_antsignal = -1;
-static int hf_wlancap_normrssi_antnoise = -1;
-static int hf_wlancap_dbm_antnoise = -1;
-static int hf_wlancap_rawrssi_antnoise = -1;
-static int hf_wlancap_preamble = -1;
-static int hf_wlancap_encoding = -1;
-static int hf_wlancap_sequence = -1;
-static int hf_wlancap_drops = -1;
-static int hf_wlancap_receiver_addr = -1;
-static int hf_wlancap_padding = -1;
-
-static gint ett_wlancap = -1;
+static int hf_wlancap_magic;
+static int hf_wlancap_version;
+static int hf_wlancap_length;
+static int hf_wlancap_mactime;
+static int hf_wlancap_hosttime;
+static int hf_wlancap_phytype;
+static int hf_wlancap_hop_set;
+static int hf_wlancap_hop_pattern;
+static int hf_wlancap_hop_index;
+static int hf_wlancap_channel;
+static int hf_wlancap_channel_frequency;
+static int hf_wlancap_data_rate;
+static int hf_wlancap_antenna;
+static int hf_wlancap_priority;
+static int hf_wlancap_ssi_type;
+static int hf_wlancap_normrssi_antsignal;
+static int hf_wlancap_dbm_antsignal;
+static int hf_wlancap_rawrssi_antsignal;
+static int hf_wlancap_normrssi_antnoise;
+static int hf_wlancap_dbm_antnoise;
+static int hf_wlancap_rawrssi_antnoise;
+static int hf_wlancap_preamble;
+static int hf_wlancap_encoding;
+static int hf_wlancap_sequence;
+static int hf_wlancap_drops;
+static int hf_wlancap_receiver_addr;
+static int hf_wlancap_padding;
+
+static gint ett_wlancap;
 
 static dissector_handle_t wlancap_handle;
 static capture_dissector_handle_t wlancap_cap_handle;
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index a61d07425a..eb95113012 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -3685,92 +3685,92 @@ static const value_string fils_discovery_capability_fils_minimum_rate_he[] = {
   {0x00, NULL}
 };
 
-static int proto_wlan = -1;
-static int proto_centrino = -1;
-static int proto_aggregate = -1;
+static int proto_wlan;
+static int proto_centrino;
+static int proto_aggregate;
 static gboolean ieee80211_tvb_invalid = FALSE;
 
 /* ************************************************************************* */
 /*                Header field info values for FC-field                      */
 /* ************************************************************************* */
-static int hf_ieee80211_fc_field = -1;
-static int hf_ieee80211_fc_proto_version = -1;
-static int hf_ieee80211_fc_frame_type = -1;
-static int hf_ieee80211_fc_frame_subtype = -1;
-static int hf_ieee80211_fc_frame_extension = -1;
-static int hf_ieee80211_fc_frame_type_subtype = -1;
-
-static int hf_ieee80211_fc_flags = -1;
-static int hf_ieee80211_fc_flags_str = -1;
-static int hf_ieee80211_fc_to_ds = -1;
-static int hf_ieee80211_fc_from_ds = -1;
-static int hf_ieee80211_fc_data_ds = -1;
-
-static int hf_ieee80211_fc_more_frag = -1;
-static int hf_ieee80211_fc_retry = -1;
-static int hf_ieee80211_fc_pwr_mgt = -1;
-static int hf_ieee80211_fc_more_data = -1;
-static int hf_ieee80211_fc_protected = -1;
-static int hf_ieee80211_fc_order = -1;
+static int hf_ieee80211_fc_field;
+static int hf_ieee80211_fc_proto_version;
+static int hf_ieee80211_fc_frame_type;
+static int hf_ieee80211_fc_frame_subtype;
+static int hf_ieee80211_fc_frame_extension;
+static int hf_ieee80211_fc_frame_type_subtype;
+
+static int hf_ieee80211_fc_flags;
+static int hf_ieee80211_fc_flags_str;
+static int hf_ieee80211_fc_to_ds;
+static int hf_ieee80211_fc_from_ds;
+static int hf_ieee80211_fc_data_ds;
+
+static int hf_ieee80211_fc_more_frag;
+static int hf_ieee80211_fc_retry;
+static int hf_ieee80211_fc_pwr_mgt;
+static int hf_ieee80211_fc_more_data;
+static int hf_ieee80211_fc_protected;
+static int hf_ieee80211_fc_order;
 
 /* S1G Flags */
-static int hf_ieee80211_fc_s1g_next_tbtt_present = -1;
-static int hf_ieee80211_fc_s1g_compressed_ssid_present = -1;
-static int hf_ieee80211_fc_s1g_ano_present = -1;
-static int hf_ieee80211_fc_s1g_bss_bw = -1;
-static int hf_ieee80211_fc_s1g_security = -1;
-static int hf_ieee80211_fc_s1g_ap_pm = -1;
+static int hf_ieee80211_fc_s1g_next_tbtt_present;
+static int hf_ieee80211_fc_s1g_compressed_ssid_present;
+static int hf_ieee80211_fc_s1g_ano_present;
+static int hf_ieee80211_fc_s1g_bss_bw;
+static int hf_ieee80211_fc_s1g_security;
+static int hf_ieee80211_fc_s1g_ap_pm;
 
 /* PV1 fields */
-static int hf_ieee80211_fc_pv1_proto_version = -1;
-static int hf_ieee80211_fc_pv1_type = -1;
-static int hf_ieee80211_fc_pv1_ptid = -1;
-static int hf_ieee80211_fc_pv1_mgmt_subtype = -1;
-static int hf_ieee80211_fc_pv1_cntl_subtype = -1;
-static int hf_ieee80211_fc_pv1_unk_field = -1;
-static int hf_ieee80211_fc_pv1_bw_indication = -1;
-static int hf_ieee80211_fc_pv1_dynamic_indication = -1;
-static int hf_ieee80211_fc_pv1_cntl_power_mgmt = -1;
-static int hf_ieee80211_fc_pv1_cntl_more_data = -1;
-static int hf_ieee80211_fc_pv1_cntl_flow_control = -1;
-static int hf_ieee80211_fc_pv1_cntl_next_twt_info = -1;
-static int hf_ieee80211_fc_pv1_mgmt_pr_next_tbt = -1;
-static int hf_ieee80211_fc_pv1_mgmt_pr_full_ssid = -1;
-static int hf_ieee80211_fc_pv1_mgmt_pr_ano = -1;
-static int hf_ieee80211_fc_pv1_mgmt_pr_bss_bw = -1;
-static int hf_ieee80211_fc_pv1_mgmt_pr_security = -1;
-static int hf_ieee80211_fc_pv1_mgmt_pr_1mhz_pc = -1;
-static int hf_ieee80211_fc_pv1_mgmt_pr_slot_assign = -1;
-static int hf_ieee80211_fc_pv1_mgmt_pr_more_frag = -1;
-static int hf_ieee80211_fc_pv1_mgmt_pr_pwr_mgmt = -1;
-static int hf_ieee80211_fc_pv1_mgmt_pr_grp_indic = -1;
-static int hf_ieee80211_fc_pv1_mgmt_pr_protected = -1;
-static int hf_ieee80211_fc_pv1_mgmt_pr_end_of_svc = -1;
-static int hf_ieee80211_fc_pv1_mgmt_pr_relayed_frm = -1;
-static int hf_ieee80211_fc_pv1_mgmt_pr_ack_policy = -1;
-static int hf_ieee80211_fc_pv1_from_ds = -1;
-static int hf_ieee80211_fc_pv1_more_fragments = -1;
-static int hf_ieee80211_fc_pv1_power_mgmt = -1;
-static int hf_ieee80211_fc_pv1_more_data = -1;
-static int hf_ieee80211_fc_pv1_protected_frame = -1;
-static int hf_ieee80211_fc_pv1_end_service_per = -1;
-static int hf_ieee80211_fc_pv1_relayed_frame = -1;
-static int hf_ieee80211_fc_pv1_ack_policy = -1;
-static int hf_ieee80211_pv1_sid = -1;
-static int hf_ieee80211_pv1_sid_association_id = -1;
-static int hf_ieee80211_pv1_sid_a3_present = -1;
-static int hf_ieee80211_pv1_sid_a4_present = -1;
-static int hf_ieee80211_pv1_sid_a_msdu = -1;
-
-static int hf_ieee80211_pv1_cnt_stack_tetra_timest = -1;
-static int hf_ieee80211_pv1_cnt_bat_beacon_seq = -1;
-static int hf_ieee80211_pv1_cnt_bat_penta_timest = -1;
-static int hf_ieee80211_pv1_cnt_bat_next_twt_info = -1;
-static int hf_ieee80211_pv1_cnt_bat_stating_seq_cntl = -1;
-static int hf_ieee80211_pv1_cnt_bat_bitmap = -1;
-
-static int hf_ieee80211_pv1_mgmt_reserved = -1;
-static int hf_ieee80211_pv1_cntl_reserved = -1;
+static int hf_ieee80211_fc_pv1_proto_version;
+static int hf_ieee80211_fc_pv1_type;
+static int hf_ieee80211_fc_pv1_ptid;
+static int hf_ieee80211_fc_pv1_mgmt_subtype;
+static int hf_ieee80211_fc_pv1_cntl_subtype;
+static int hf_ieee80211_fc_pv1_unk_field;
+static int hf_ieee80211_fc_pv1_bw_indication;
+static int hf_ieee80211_fc_pv1_dynamic_indication;
+static int hf_ieee80211_fc_pv1_cntl_power_mgmt;
+static int hf_ieee80211_fc_pv1_cntl_more_data;
+static int hf_ieee80211_fc_pv1_cntl_flow_control;
+static int hf_ieee80211_fc_pv1_cntl_next_twt_info;
+static int hf_ieee80211_fc_pv1_mgmt_pr_next_tbt;
+static int hf_ieee80211_fc_pv1_mgmt_pr_full_ssid;
+static int hf_ieee80211_fc_pv1_mgmt_pr_ano;
+static int hf_ieee80211_fc_pv1_mgmt_pr_bss_bw;
+static int hf_ieee80211_fc_pv1_mgmt_pr_security;
+static int hf_ieee80211_fc_pv1_mgmt_pr_1mhz_pc;
+static int hf_ieee80211_fc_pv1_mgmt_pr_slot_assign;
+static int hf_ieee80211_fc_pv1_mgmt_pr_more_frag;
+static int hf_ieee80211_fc_pv1_mgmt_pr_pwr_mgmt;
+static int hf_ieee80211_fc_pv1_mgmt_pr_grp_indic;
+static int hf_ieee80211_fc_pv1_mgmt_pr_protected;
+static int hf_ieee80211_fc_pv1_mgmt_pr_end_of_svc;
+static int hf_ieee80211_fc_pv1_mgmt_pr_relayed_frm;
+static int hf_ieee80211_fc_pv1_mgmt_pr_ack_policy;
+static int hf_ieee80211_fc_pv1_from_ds;
+static int hf_ieee80211_fc_pv1_more_fragments;
+static int hf_ieee80211_fc_pv1_power_mgmt;
+static int hf_ieee80211_fc_pv1_more_data;
+static int hf_ieee80211_fc_pv1_protected_frame;
+static int hf_ieee80211_fc_pv1_end_service_per;
+static int hf_ieee80211_fc_pv1_relayed_frame;
+static int hf_ieee80211_fc_pv1_ack_policy;
+static int hf_ieee80211_pv1_sid;
+static int hf_ieee80211_pv1_sid_association_id;
+static int hf_ieee80211_pv1_sid_a3_present;
+static int hf_ieee80211_pv1_sid_a4_present;
+static int hf_ieee80211_pv1_sid_a_msdu;
+
+static int hf_ieee80211_pv1_cnt_stack_tetra_timest;
+static int hf_ieee80211_pv1_cnt_bat_beacon_seq;
+static int hf_ieee80211_pv1_cnt_bat_penta_timest;
+static int hf_ieee80211_pv1_cnt_bat_next_twt_info;
+static int hf_ieee80211_pv1_cnt_bat_stating_seq_cntl;
+static int hf_ieee80211_pv1_cnt_bat_bitmap;
+
+static int hf_ieee80211_pv1_mgmt_reserved;
+static int hf_ieee80211_pv1_cntl_reserved;
 
 typedef struct retransmit_key {
   guint8  bssid[6];
@@ -3782,541 +3782,541 @@ typedef struct retransmit_key {
 static GHashTable *fc_analyse_retransmit_table = NULL;
 static GHashTable *fc_first_frame_table = NULL;
 
-static int hf_ieee80211_fc_analysis_retransmission = -1;
-static int hf_ieee80211_fc_analysis_retransmission_frame = -1;
+static int hf_ieee80211_fc_analysis_retransmission;
+static int hf_ieee80211_fc_analysis_retransmission_frame;
 
 /* ************************************************************************* */
 /*                   Header values for Duration/ID field                     */
 /* ************************************************************************* */
-static int hf_ieee80211_did_duration = -1;
-static int hf_ieee80211_assoc_id = -1;
+static int hf_ieee80211_did_duration;
+static int hf_ieee80211_assoc_id;
 
 /* ************************************************************************* */
 /*         Header values for different address-fields (all 4 of them)        */
 /* ************************************************************************* */
-static int hf_ieee80211_addr_da = -1;  /* Destination address subfield */
-static int hf_ieee80211_addr_da_resolved = -1;  /* Dst addr subfield resolved*/
-static int hf_ieee80211_addr_da_oui = -1;  /* Destination address subfield */
-static int hf_ieee80211_addr_da_oui_resolved = -1;  /* Dst addr subfield resolved*/
-static int hf_ieee80211_addr_da_ig = -1;  /* Destination address IG bit */
-static int hf_ieee80211_addr_da_lg = -1;  /* Destination address LG bit */
-
-static int hf_ieee80211_addr_sa = -1;  /* Source address subfield */
-static int hf_ieee80211_addr_sa_resolved = -1;  /* Src addr subfield resolved*/
-static int hf_ieee80211_addr_sa_oui = -1;  /* Source address subfield */
-static int hf_ieee80211_addr_sa_oui_resolved = -1;  /* Src addr subfield resolved*/
-static int hf_ieee80211_addr_sa_ig = -1;  /* Source address IG bit */
-static int hf_ieee80211_addr_sa_lg = -1;  /* Source address LG bit */
-
-static int hf_ieee80211_addr_ra = -1;  /* Receiver address subfield */
-static int hf_ieee80211_addr_ra_resolved = -1;  /* Rcv addr subfield resolved*/
-static int hf_ieee80211_addr_ra_oui = -1;  /* Receiver address subfield */
-static int hf_ieee80211_addr_ra_oui_resolved = -1;  /* Rcv addr subfield resolved*/
-static int hf_ieee80211_addr_ra_ig = -1;  /* Receiver address IG bit */
-static int hf_ieee80211_addr_ra_lg = -1;  /* Receiver address LG bit */
-
-static int hf_ieee80211_addr_ta = -1;  /* Transmitter address subfield */
-static int hf_ieee80211_addr_ta_resolved = -1;  /* Txm addr subfield resolved*/
-static int hf_ieee80211_addr_ta_oui = -1;  /* Transmitter address subfield */
-static int hf_ieee80211_addr_ta_oui_resolved = -1;  /* Txm addr subfield resolved*/
-static int hf_ieee80211_addr_ta_ig = -1;  /* Transmitter address IG bit */
-static int hf_ieee80211_addr_ta_lg = -1;  /* Transmitter address LG bit */
-
-static int hf_ieee80211_addr_bssid = -1;  /* address is bssid */
-static int hf_ieee80211_addr_bssid_resolved = -1;  /* bssid resolved*/
-static int hf_ieee80211_addr_bssid_oui = -1;  /* address is bssid */
-static int hf_ieee80211_addr_bssid_oui_resolved = -1;  /* bssid resolved*/
-static int hf_ieee80211_addr_bssid_ig = -1;  /* bssid address IG bit */
-static int hf_ieee80211_addr_bssid_lg = -1;  /* bssid address LG bit */
-
-static int hf_ieee80211_addr_staa = -1;  /* address is station address */
-static int hf_ieee80211_addr_staa_resolved = -1;  /* station address resolved*/
-static int hf_ieee80211_addr_staa_oui = -1;  /* address is station address */
-static int hf_ieee80211_addr_staa_oui_resolved = -1;  /* station address resolved*/
-static int hf_ieee80211_addr_staa_ig = -1;  /* station address IG bit */
-static int hf_ieee80211_addr_staa_lg = -1;  /* station address LG bit */
-
-static int hf_ieee80211_addr = -1;  /* Source or destination address subfield */
-static int hf_ieee80211_addr_resolved = -1;/*Src/dst address subfield resolved*/
-static int hf_ieee80211_addr_oui = -1;  /* Source or destination address subfield */
-static int hf_ieee80211_addr_oui_resolved = -1;/*Src/dst address subfield resolved*/
-static int hf_ieee80211_addr_ig = -1;  /* Src/dst address IG bit */
-static int hf_ieee80211_addr_lg = -1;  /* Src/dst address LG bit */
-
-static int hf_ieee80211_mgt = -1;
+static int hf_ieee80211_addr_da;  /* Destination address subfield */
+static int hf_ieee80211_addr_da_resolved;  /* Dst addr subfield resolved*/
+static int hf_ieee80211_addr_da_oui;  /* Destination address subfield */
+static int hf_ieee80211_addr_da_oui_resolved;  /* Dst addr subfield resolved*/
+static int hf_ieee80211_addr_da_ig;  /* Destination address IG bit */
+static int hf_ieee80211_addr_da_lg;  /* Destination address LG bit */
+
+static int hf_ieee80211_addr_sa;  /* Source address subfield */
+static int hf_ieee80211_addr_sa_resolved;  /* Src addr subfield resolved*/
+static int hf_ieee80211_addr_sa_oui;  /* Source address subfield */
+static int hf_ieee80211_addr_sa_oui_resolved;  /* Src addr subfield resolved*/
+static int hf_ieee80211_addr_sa_ig;  /* Source address IG bit */
+static int hf_ieee80211_addr_sa_lg;  /* Source address LG bit */
+
+static int hf_ieee80211_addr_ra;  /* Receiver address subfield */
+static int hf_ieee80211_addr_ra_resolved;  /* Rcv addr subfield resolved*/
+static int hf_ieee80211_addr_ra_oui;  /* Receiver address subfield */
+static int hf_ieee80211_addr_ra_oui_resolved;  /* Rcv addr subfield resolved*/
+static int hf_ieee80211_addr_ra_ig;  /* Receiver address IG bit */
+static int hf_ieee80211_addr_ra_lg;  /* Receiver address LG bit */
+
+static int hf_ieee80211_addr_ta;  /* Transmitter address subfield */
+static int hf_ieee80211_addr_ta_resolved;  /* Txm addr subfield resolved*/
+static int hf_ieee80211_addr_ta_oui;  /* Transmitter address subfield */
+static int hf_ieee80211_addr_ta_oui_resolved;  /* Txm addr subfield resolved*/
+static int hf_ieee80211_addr_ta_ig;  /* Transmitter address IG bit */
+static int hf_ieee80211_addr_ta_lg;  /* Transmitter address LG bit */
+
+static int hf_ieee80211_addr_bssid;  /* address is bssid */
+static int hf_ieee80211_addr_bssid_resolved;  /* bssid resolved*/
+static int hf_ieee80211_addr_bssid_oui;  /* address is bssid */
+static int hf_ieee80211_addr_bssid_oui_resolved;  /* bssid resolved*/
+static int hf_ieee80211_addr_bssid_ig;  /* bssid address IG bit */
+static int hf_ieee80211_addr_bssid_lg;  /* bssid address LG bit */
+
+static int hf_ieee80211_addr_staa;  /* address is station address */
+static int hf_ieee80211_addr_staa_resolved;  /* station address resolved*/
+static int hf_ieee80211_addr_staa_oui;  /* address is station address */
+static int hf_ieee80211_addr_staa_oui_resolved;  /* station address resolved*/
+static int hf_ieee80211_addr_staa_ig;  /* station address IG bit */
+static int hf_ieee80211_addr_staa_lg;  /* station address LG bit */
+
+static int hf_ieee80211_addr;  /* Source or destination address subfield */
+static int hf_ieee80211_addr_resolved;/*Src/dst address subfield resolved*/
+static int hf_ieee80211_addr_oui;  /* Source or destination address subfield */
+static int hf_ieee80211_addr_oui_resolved;/*Src/dst address subfield resolved*/
+static int hf_ieee80211_addr_ig;  /* Src/dst address IG bit */
+static int hf_ieee80211_addr_lg;  /* Src/dst address LG bit */
+
+static int hf_ieee80211_mgt;
 
 /* ************************************************************************* */
 /*                Header values for QoS control field                        */
 /* ************************************************************************* */
-static int hf_ieee80211_qos = -1;
-static int hf_ieee80211_qos_tid = -1;
-static int hf_ieee80211_qos_priority = -1;
-static int hf_ieee80211_qos_ack_policy = -1;
-static int hf_ieee80211_qos_amsdu_present = -1;
-static int hf_ieee80211_qos_eosp = -1;
-static int hf_ieee80211_qos_bit4 = -1;
-static int hf_ieee80211_qos_txop_limit = -1;
-static int hf_ieee80211_qos_ps_buf_state = -1;
-static int hf_ieee80211_qos_buf_state_indicated = -1;
-static int hf_ieee80211_qos_highest_pri_buf_ac = -1;
-static int hf_ieee80211_qos_qap_buf_load = -1;
-static int hf_ieee80211_qos_txop_dur_req = -1;
-static int hf_ieee80211_qos_queue_size = -1;
-static int hf_ieee80211_qos_mesh_ctl_present = -1;
-static int hf_ieee80211_qos_mesh_ps_rsvd = -1;
-static int hf_ieee80211_qos_mesh_ps_unicast = -1;
-static int hf_ieee80211_qos_mesh_ps_multicast = -1;
-static int hf_ieee80211_qos_mesh_rspi = -1;
+static int hf_ieee80211_qos;
+static int hf_ieee80211_qos_tid;
+static int hf_ieee80211_qos_priority;
+static int hf_ieee80211_qos_ack_policy;
+static int hf_ieee80211_qos_amsdu_present;
+static int hf_ieee80211_qos_eosp;
+static int hf_ieee80211_qos_bit4;
+static int hf_ieee80211_qos_txop_limit;
+static int hf_ieee80211_qos_ps_buf_state;
+static int hf_ieee80211_qos_buf_state_indicated;
+static int hf_ieee80211_qos_highest_pri_buf_ac;
+static int hf_ieee80211_qos_qap_buf_load;
+static int hf_ieee80211_qos_txop_dur_req;
+static int hf_ieee80211_qos_queue_size;
+static int hf_ieee80211_qos_mesh_ctl_present;
+static int hf_ieee80211_qos_mesh_ps_rsvd;
+static int hf_ieee80211_qos_mesh_ps_unicast;
+static int hf_ieee80211_qos_mesh_ps_multicast;
+static int hf_ieee80211_qos_mesh_rspi;
 
 /* ************************************************************************* */
 /*                Header values for HT control field (+HTC) and HE control   */
 /* ************************************************************************* */
 /* 802.11-2012 and 802.11ac-2013 8.2.4.6 */
-static int hf_ieee80211_htc = -1;
-static int hf_ieee80211_htc_vht = -1;
-static int hf_ieee80211_htc_he = -1;
-static int hf_ieee80211_htc_he_ctrl_id = -1;
-static int hf_ieee80211_he_a_control_padding = -1;
-static int hf_ieee80211_he_a_control_ones = -1;
-static int hf_ieee80211_he_trs_he_tb_ppdu_len = -1;
-static int hf_ieee80211_he_trs_ru_allocation = -1;
-static int hf_ieee80211_he_dl_tx_power = -1;
-static int hf_ieee80211_he_ul_target_rssi = -1;
-static int hf_ieee80211_he_ul_mcs = -1;
-static int hf_ieee80211_he_ul_reserved = -1;
-static int hf_ieee80211_he_om_rx_nss = -1;
-static int hf_ieee80211_he_om_channel_width = -1;
-static int hf_ieee80211_he_om_ul_mu_disable = -1;
-static int hf_ieee80211_he_om_tx_nsts = -1;
-static int hf_ieee80211_he_om_er_su_disable = -1;
-static int hf_ieee80211_he_om_dl_mu_mimo_resound = -1;
-static int hf_ieee80211_he_om_ul_mu_data_disable = -1;
-static int hf_ieee80211_he_hla_unsolicited_mfb = -1;
-static int hf_ieee80211_he_hla_mrq = -1;
-static int hf_ieee80211_he_hla_nss = -1;
-static int hf_ieee80211_he_hla_he_mcs = -1;
-static int hf_ieee80211_he_hla_dcm = -1;
-static int hf_ieee80211_he_hla_ru = -1;
-static int hf_ieee80211_he_hla_bw = -1;
-static int hf_ieee80211_he_hla_msi_ppdu_type = -1;
-static int hf_ieee80211_he_hla_tx_bf = -1;
-static int hf_ieee80211_he_hla_reserved = -1;
-static int hf_ieee80211_he_bsr_aci_bitmap = -1;
-static int hf_ieee80211_he_bsr_delta_tid = -1;
-static int hf_ieee80211_he_bsr_aci_high = -1;
-static int hf_ieee80211_he_bsr_scaling_factor = -1;
-static int hf_ieee80211_he_bsr_queue_size_high = -1;
-static int hf_ieee80211_he_bsr_queue_size_all = -1;
-static int hf_ieee80211_he_uph_ul_power_headroom = -1;
-static int hf_ieee80211_he_uph_ul_min_transmit_power_flag = -1;
-static int hf_ieee80211_he_uph_reserved = -1;
-static int hf_ieee80211_he_cci_ac_constraint = -1;
-static int hf_ieee80211_he_cci_rdg_more_ppdu = -1;
-static int hf_ieee80211_he_cci_sr_ppdu_indic = -1;
-static int hf_ieee80211_he_cci_reserved = -1;
-static int hf_ieee80211_he_eht_om_rx_nss_ext = -1;
-static int hf_ieee80211_he_eht_om_chan_w_ext = -1;
-static int hf_ieee80211_he_eht_om_tx_nsts_ext = -1;
-static int hf_ieee80211_he_eht_om_reserved = -1;
-static int hf_ieee80211_he_srs_ppdu_resp_dur = -1;
-static int hf_ieee80211_he_srs_reserved = -1;
-static int hf_ieee80211_he_aar_assisted_ap_bitmap = -1;
-static int hf_ieee80211_he_aar_reserved = -1;
-static int hf_ieee80211_he_btc_avail_chan = -1;
-static int hf_ieee80211_he_btc_reserved = -1;
-static int hf_ieee80211_he_trigger_common_info = -1;
-static int hf_ieee80211_he_trigger_type = -1;
-static int hf_ieee80211_he_trigger_ul_length = -1;
-static int hf_ieee80211_he_trigger_more_tf = -1;
-static int hf_ieee80211_he_trigger_cs_required = -1;
-static int hf_ieee80211_he_trigger_ul_bw = -1;
-static int hf_ieee80211_he_trigger_gi_and_ltf_type = -1;
-static int hf_ieee80211_he_trigger_mu_mimo_ltf_mode = -1;
-static int hf_ieee80211_he_trigger_num_he_ltf_syms_etc = -1;
-static int hf_ieee80211_he_trigger_ul_stbc = -1;
-static int hf_ieee80211_he_trigger_ldpc_extra_sym_seg = -1;
-static int hf_ieee80211_he_trigger_ap_tx_power = -1;
-static int hf_ieee80211_he_trigger_pre_fec_padding_factor = -1;
-static int hf_ieee80211_he_trigger_pe_disambiguity = -1;
-static int hf_ieee80211_he_trigger_ul_spatial_reuse = -1;
-static int hf_ieee80211_he_trigger_doppler = -1;
-static int hf_ieee80211_he_trigger_ul_he_sig_a_reserved = -1;
-static int hf_ieee80211_he_trigger_reserved = -1;
-static int hf_ieee80211_he_trigger_user_info = -1;
-static int hf_ieee80211_he_trigger_user_info_padding_start = -1;
-static int hf_ieee80211_he_trigger_padding = -1;
-static int hf_ieee80211_he_trigger_bar_ctrl = -1;
-static int hf_ieee80211_he_trigger_bar_ctrl_ba_ack_policy = -1;
-static int hf_ieee80211_he_trigger_bar_ctrl_ba_type = -1;
-static int hf_ieee80211_he_trigger_bar_ctrl_reserved = -1;
-static int hf_ieee80211_he_trigger_bar_ctrl_tid_info = -1;
-static int hf_ieee80211_he_trigger_bar_info = -1;
-static int hf_ieee80211_he_trigger_bar_info_blk_ack_seq_ctrl = -1;
-static int hf_ieee80211_he_trigger_mpdu_mu_spacing = -1;
-static int hf_ieee80211_he_trigger_tid_aggregation_limit = -1;
-static int hf_ieee80211_he_trigger_dependent_reserved1 = -1;
-static int hf_ieee80211_he_trigger_preferred_ac = -1;
-static int hf_ieee80211_he_trigger_starting_aid = -1;
-static int hf_ieee80211_he_trigger_dependent_reserved2 = -1;
-static int hf_ieee80211_he_trigger_feedback_type = -1;
-static int hf_ieee80211_he_trigger_dependent_reserved3 = -1;
-static int hf_ieee80211_he_trigger_nfrp_target_rssi = -1;
-static int hf_ieee80211_he_trigger_multiplexing_flag = -1;
-static int hf_ieee80211_he_trigger_dep_nfrp_user_info = -1;
-static int hf_ieee80211_he_trigger_feedback_seg_retrans_bm = -1;
-static int hf_ieee80211_he_trigger_aid12 = -1;
-static int hf_ieee80211_he_trigger_ru_allocation = -1;
-static int hf_ieee80211_he_trigger_ru_allocation_region = -1;
-static int hf_ieee80211_he_trigger_ru_starting_spatial_stream = -1;
-static int hf_ieee80211_he_trigger_ru_number_spatial_streams = -1;
-static int hf_ieee80211_he_trigger_ru_number_ra_ru = -1;
-static int hf_ieee80211_he_trigger_ru_no_more_ra_ru = -1;
-static int hf_ieee80211_he_trigger_ul_fec_coding_type = -1;
-static int hf_ieee80211_he_trigger_ul_mcs = -1;
-static int hf_ieee80211_he_trigger_ul_dcm = -1;
-static int hf_ieee80211_he_trigger_ul_target_rssi = -1;
-static int hf_ieee80211_he_trigger_user_reserved = -1;
-static int hf_ieee80211_he_trigger_dep_basic_user_info = -1;
-static int hf_ieee80211_he_trigger_ranging_common_info_1 = -1;
-static int hf_ieee80211_he_trigger_ranging_common_info_2 = -1;
-static int hf_ieee80211_eht_trigger_common_info = -1;
-static int hf_ieee80211_eht_trigger_type = -1;
-static int hf_ieee80211_eht_trigger_ul_length = -1;
-static int hf_ieee80211_eht_trigger_more_tf = -1;
-static int hf_ieee80211_eht_trigger_cs_required = -1;
-static int hf_ieee80211_eht_trigger_ul_bw = -1;
-static int hf_ieee80211_eht_trigger_gi_and_eht_ltf_type = -1;
-static int hf_ieee80211_eht_trigger_num_he_eht_ltf_syms_etc = -1;
-static int hf_ieee80211_eht_trigger_reserved2 = -1;
-static int hf_ieee80211_eht_trigger_ldpc_extra_sym_seg = -1;
-static int hf_ieee80211_eht_trigger_ap_tx_power = -1;
-static int hf_ieee80211_eht_trigger_pre_fec_padding_factor = -1;
-static int hf_ieee80211_eht_trigger_pe_disambiguity = -1;
-static int hf_ieee80211_eht_trigger_ul_spatial_reuse = -1;
-static int hf_ieee80211_eht_trigger_reserved3 = -1;
-static int hf_ieee80211_eht_trigger_he_eht_p160 = -1;
-static int hf_ieee80211_eht_trigger_special_user_info_flag = -1;
-static int hf_ieee80211_eht_trigger_eht_reserved = -1;
-static int hf_ieee80211_eht_trigger_reserved4 = -1;
-static int hf_ieee80211_eht_trigger_reserved = -1;
-static int hf_ieee80211_eht_trigger_aid12 = -1;
-static int hf_ieee80211_eht_trigger_special_user_info = -1;
-static int hf_ieee80211_eht_trigger_phy_version_identifier = -1;
-static int hf_ieee80211_eht_trigger_ul_bw_extenstion = -1;
-static int hf_ieee80211_eht_trigger_eht_spatial_reuse_1 = -1;
-static int hf_ieee80211_eht_trigger_eht_spatial_reuse_2 = -1;
-static int hf_ieee80211_eht_trigger_disregard_u_sig_1 = -1;
-static int hf_ieee80211_eht_trigger_validate_u_sig_2 = -1;
-static int hf_ieee80211_eht_trigger_disregard_u_sig_2_4lsb = -1;
-static int hf_ieee80211_eht_trigger_disregard_u_sig_2_msb = -1;
-static int hf_ieee80211_eht_trigger_special_reserved = -1;
-static int hf_ieee80211_eht_trigger_user_info = -1;
-static int hf_ieee80211_eht_trigger_ru_allocation_region = -1;
-static int hf_ieee80211_eht_trigger_ru_allocation = -1;
-static int hf_ieee80211_eht_trigger_ul_fec_coding_type = -1;
-static int hf_ieee80211_eht_trigger_ul_eht_mcs = -1;
-static int hf_ieee80211_eht_trigger_ru_starting_spatial_stream = -1;
-static int hf_ieee80211_eht_trigger_ru_number_spatial_streams = -1;
-static int hf_ieee80211_eht_trigger_ul_target_recv_power = -1;
-static int hf_ieee80211_eht_trigger_ps160 = -1;
-static int hf_ieee80211_eht_trigger_user_info_reserved = -1;
-static int hf_ieee80211_ranging_trigger_subtype1 = -1;
-static int hf_ieee80211_ranging_trigger_reserved1 = -1;
-static int hf_ieee80211_ranging_trigger_token = -1;
-static int hf_ieee80211_ranging_trigger_subtype2 = -1;
-static int hf_ieee80211_ranging_trigger_reserved2 = -1;
-static int hf_ieee80211_ranging_trigger_sounding_dialog_token = -1;
-static int hf_ieee80211_he_trigger_ranging_trigger_poll_rpt = -1;
-static int hf_ieee80211_ranging_pol_rpt_aid12_rsid12 = -1;
-static int hf_ieee80211_ranging_pol_rpt_ru_alloc_region = -1;
-static int hf_ieee80211_ranging_pol_rpt_ru_alloc = -1;
-static int hf_ieee80211_ranging_pol_rpt_ul_fec_coding_type = -1;
-static int hf_ieee80211_ranging_pol_rpt_ulmcs = -1;
-static int hf_ieee80211_ranging_pol_rpt_uldcm = -1;
-static int hf_ieee80211_ranging_pol_rpt_starting_spatial_stream = -1;
-static int hf_ieee80211_ranging_pol_rpt_number_spatial_streams = -1;
-static int hf_ieee80211_ranging_pol_rpt_ul_target_rssi = -1;
-static int hf_ieee80211_ranging_pol_rpt_reserved = -1;
-static int hf_ieee80211_he_trigger_ranging_trigger_sounding = -1;
-static int hf_ieee80211_ranging_sounding_aid12_rsid12 = -1;
-static int hf_ieee80211_ranging_sounding_reserved1 = -1;
-static int hf_ieee80211_ranging_sounding_i2r_rep = -1;
-static int hf_ieee80211_ranging_sounding_reserved2 = -1;
-static int hf_ieee80211_ranging_sounding_starting_spatial_stream = -1;
-static int hf_ieee80211_ranging_sounding_number_spatial_streams = -1;
-static int hf_ieee80211_ranging_sounding_ul_target_rssi = -1;
-static int hf_ieee80211_ranging_sounding_reserved3 = -1;
-static int hf_ieee80211_he_trigger_ranging_trigger_sec_sound = -1;
-static int hf_ieee80211_ranging_sec_sound_aid12_rsid12 = -1;
-static int hf_ieee80211_ranging_sec_sound_reserved1 = -1;
-static int hf_ieee80211_ranging_sec_sound_i2r_rep = -1;
-static int hf_ieee80211_ranging_sec_sound_reserved2 = -1;
-static int hf_ieee80211_ranging_sec_sound_starting_spatial_stream = -1;
-static int hf_ieee80211_ranging_sec_sound_number_spatial_streams = -1;
-static int hf_ieee80211_ranging_sec_sound_ul_target_rssi = -1;
-static int hf_ieee80211_ranging_sec_sound_reserved3 = -1;
-static int hf_ieee80211_he_trigger_ranging_user_info_sac = -1;
-static int hf_ieee80211_he_ndp_annc_sta = -1;
-static int hf_ieee80211_he_ndp_annc_aid11 = -1;
-static int hf_ieee80211_he_ndp_annc_ru_start = -1;
-static int hf_ieee80211_he_ndp_annc_ru_end = -1;
-static int hf_ieee80211_he_ndp_annc_feedback_type_and_ng = -1;
-static int hf_ieee80211_he_ndp_annc_disambiguation = -1;
-static int hf_ieee80211_he_ndp_annc_codebook_size = -1;
-static int hf_ieee80211_he_ndp_annc_nc = -1;
-static int hf_ieee80211_he_ndp_annc_disallowed_bitmap = -1;
-static int hf_ieee80211_he_ndp_annc_reserved1 = -1;
-static int hf_ieee80211_he_ndp_annc_reserved2 = -1;
-static int hf_ieee80211_he_qtp_control = -1;
-static int hf_ieee80211_he_qtp_setup_quiet_period_duration = -1;
-static int hf_ieee80211_he_qtp_setup_srv_specific_identif = -1;
-static int hf_ieee80211_he_qtp_request_dialog_token = -1;
-static int hf_ieee80211_he_qtp_request_quiet_period_offset = -1;
-static int hf_ieee80211_he_qtp_request_quiet_period_duration = -1;
-static int hf_ieee80211_he_qtp_request_quiet_period_interval = -1;
-static int hf_ieee80211_he_qtp_request_repetition_count = -1;
-static int hf_ieee80211_he_qtp_request_srv_specific_identif = -1;
-static int hf_ieee80211_he_qtp_response_dialog_token = -1;
-static int hf_ieee80211_he_qtp_response_status_code = -1;
-static int hf_ieee80211_he_qtp_response_quiet_period_offset = -1;
-static int hf_ieee80211_he_qtp_response_quiet_period_duration = -1;
-static int hf_ieee80211_he_qtp_response_quiet_period_interval = -1;
-static int hf_ieee80211_he_qtp_response_repetition_count = -1;
-static int hf_ieee80211_he_qtp_response_srv_specific_identif = -1;
-static int hf_ieee80211_htc_ht_lac = -1;
-static int hf_ieee80211_htc_lac_trq = -1;
-static int hf_ieee80211_htc_lac_mai_aseli = -1;
-static int hf_ieee80211_htc_lac_mai_mrq = -1;
-static int hf_ieee80211_htc_lac_mai_msi = -1;
-static int hf_ieee80211_htc_lac_mai_reserved = -1;
-static int hf_ieee80211_htc_lac_mfsi = -1;
-static int hf_ieee80211_htc_lac_mfb = -1;
-static int hf_ieee80211_htc_lac_asel_command = -1;
-static int hf_ieee80211_htc_lac_asel_data = -1;
-static int hf_ieee80211_htc_cal_pos = -1;
-static int hf_ieee80211_htc_cal_seq = -1;
-static int hf_ieee80211_htc_reserved1 = -1;
-static int hf_ieee80211_htc_csi_steering = -1;
-static int hf_ieee80211_htc_ndp_announcement = -1;
-static int hf_ieee80211_htc_reserved2 = -1;
-static int hf_ieee80211_htc_mrq = -1;
-static int hf_ieee80211_htc_msi = -1;
-static int hf_ieee80211_htc_msi_stbc_reserved = -1;
-static int hf_ieee80211_htc_compressed_msi = -1;
-static int hf_ieee80211_htc_ppdu_stbc_encoded = -1;
-static int hf_ieee80211_htc_mfsi = -1;
-static int hf_ieee80211_htc_gid_l = -1;
-static int hf_ieee80211_htc_mfb = -1;
-static int hf_ieee80211_htc_num_sts = -1;
-static int hf_ieee80211_htc_vht_mcs = -1;
-static int hf_ieee80211_htc_bw = -1;
-static int hf_ieee80211_htc_snr = -1;
-static int hf_ieee80211_htc_reserved3 = -1;
-static int hf_ieee80211_htc_gid_h = -1;
-static int hf_ieee80211_htc_coding_type = -1;
-static int hf_ieee80211_htc_fb_tx_type = -1;
-static int hf_ieee80211_htc_unsolicited_mfb = -1;
-static int hf_ieee80211_htc_ac_constraint = -1;
-static int hf_ieee80211_htc_rdg_more_ppdu = -1;
+static int hf_ieee80211_htc;
+static int hf_ieee80211_htc_vht;
+static int hf_ieee80211_htc_he;
+static int hf_ieee80211_htc_he_ctrl_id;
+static int hf_ieee80211_he_a_control_padding;
+static int hf_ieee80211_he_a_control_ones;
+static int hf_ieee80211_he_trs_he_tb_ppdu_len;
+static int hf_ieee80211_he_trs_ru_allocation;
+static int hf_ieee80211_he_dl_tx_power;
+static int hf_ieee80211_he_ul_target_rssi;
+static int hf_ieee80211_he_ul_mcs;
+static int hf_ieee80211_he_ul_reserved;
+static int hf_ieee80211_he_om_rx_nss;
+static int hf_ieee80211_he_om_channel_width;
+static int hf_ieee80211_he_om_ul_mu_disable;
+static int hf_ieee80211_he_om_tx_nsts;
+static int hf_ieee80211_he_om_er_su_disable;
+static int hf_ieee80211_he_om_dl_mu_mimo_resound;
+static int hf_ieee80211_he_om_ul_mu_data_disable;
+static int hf_ieee80211_he_hla_unsolicited_mfb;
+static int hf_ieee80211_he_hla_mrq;
+static int hf_ieee80211_he_hla_nss;
+static int hf_ieee80211_he_hla_he_mcs;
+static int hf_ieee80211_he_hla_dcm;
+static int hf_ieee80211_he_hla_ru;
+static int hf_ieee80211_he_hla_bw;
+static int hf_ieee80211_he_hla_msi_ppdu_type;
+static int hf_ieee80211_he_hla_tx_bf;
+static int hf_ieee80211_he_hla_reserved;
+static int hf_ieee80211_he_bsr_aci_bitmap;
+static int hf_ieee80211_he_bsr_delta_tid;
+static int hf_ieee80211_he_bsr_aci_high;
+static int hf_ieee80211_he_bsr_scaling_factor;
+static int hf_ieee80211_he_bsr_queue_size_high;
+static int hf_ieee80211_he_bsr_queue_size_all;
+static int hf_ieee80211_he_uph_ul_power_headroom;
+static int hf_ieee80211_he_uph_ul_min_transmit_power_flag;
+static int hf_ieee80211_he_uph_reserved;
+static int hf_ieee80211_he_cci_ac_constraint;
+static int hf_ieee80211_he_cci_rdg_more_ppdu;
+static int hf_ieee80211_he_cci_sr_ppdu_indic;
+static int hf_ieee80211_he_cci_reserved;
+static int hf_ieee80211_he_eht_om_rx_nss_ext;
+static int hf_ieee80211_he_eht_om_chan_w_ext;
+static int hf_ieee80211_he_eht_om_tx_nsts_ext;
+static int hf_ieee80211_he_eht_om_reserved;
+static int hf_ieee80211_he_srs_ppdu_resp_dur;
+static int hf_ieee80211_he_srs_reserved;
+static int hf_ieee80211_he_aar_assisted_ap_bitmap;
+static int hf_ieee80211_he_aar_reserved;
+static int hf_ieee80211_he_btc_avail_chan;
+static int hf_ieee80211_he_btc_reserved;
+static int hf_ieee80211_he_trigger_common_info;
+static int hf_ieee80211_he_trigger_type;
+static int hf_ieee80211_he_trigger_ul_length;
+static int hf_ieee80211_he_trigger_more_tf;
+static int hf_ieee80211_he_trigger_cs_required;
+static int hf_ieee80211_he_trigger_ul_bw;
+static int hf_ieee80211_he_trigger_gi_and_ltf_type;
+static int hf_ieee80211_he_trigger_mu_mimo_ltf_mode;
+static int hf_ieee80211_he_trigger_num_he_ltf_syms_etc;
+static int hf_ieee80211_he_trigger_ul_stbc;
+static int hf_ieee80211_he_trigger_ldpc_extra_sym_seg;
+static int hf_ieee80211_he_trigger_ap_tx_power;
+static int hf_ieee80211_he_trigger_pre_fec_padding_factor;
+static int hf_ieee80211_he_trigger_pe_disambiguity;
+static int hf_ieee80211_he_trigger_ul_spatial_reuse;
+static int hf_ieee80211_he_trigger_doppler;
+static int hf_ieee80211_he_trigger_ul_he_sig_a_reserved;
+static int hf_ieee80211_he_trigger_reserved;
+static int hf_ieee80211_he_trigger_user_info;
+static int hf_ieee80211_he_trigger_user_info_padding_start;
+static int hf_ieee80211_he_trigger_padding;
+static int hf_ieee80211_he_trigger_bar_ctrl;
+static int hf_ieee80211_he_trigger_bar_ctrl_ba_ack_policy;
+static int hf_ieee80211_he_trigger_bar_ctrl_ba_type;
+static int hf_ieee80211_he_trigger_bar_ctrl_reserved;
+static int hf_ieee80211_he_trigger_bar_ctrl_tid_info;
+static int hf_ieee80211_he_trigger_bar_info;
+static int hf_ieee80211_he_trigger_bar_info_blk_ack_seq_ctrl;
+static int hf_ieee80211_he_trigger_mpdu_mu_spacing;
+static int hf_ieee80211_he_trigger_tid_aggregation_limit;
+static int hf_ieee80211_he_trigger_dependent_reserved1;
+static int hf_ieee80211_he_trigger_preferred_ac;
+static int hf_ieee80211_he_trigger_starting_aid;
+static int hf_ieee80211_he_trigger_dependent_reserved2;
+static int hf_ieee80211_he_trigger_feedback_type;
+static int hf_ieee80211_he_trigger_dependent_reserved3;
+static int hf_ieee80211_he_trigger_nfrp_target_rssi;
+static int hf_ieee80211_he_trigger_multiplexing_flag;
+static int hf_ieee80211_he_trigger_dep_nfrp_user_info;
+static int hf_ieee80211_he_trigger_feedback_seg_retrans_bm;
+static int hf_ieee80211_he_trigger_aid12;
+static int hf_ieee80211_he_trigger_ru_allocation;
+static int hf_ieee80211_he_trigger_ru_allocation_region;
+static int hf_ieee80211_he_trigger_ru_starting_spatial_stream;
+static int hf_ieee80211_he_trigger_ru_number_spatial_streams;
+static int hf_ieee80211_he_trigger_ru_number_ra_ru;
+static int hf_ieee80211_he_trigger_ru_no_more_ra_ru;
+static int hf_ieee80211_he_trigger_ul_fec_coding_type;
+static int hf_ieee80211_he_trigger_ul_mcs;
+static int hf_ieee80211_he_trigger_ul_dcm;
+static int hf_ieee80211_he_trigger_ul_target_rssi;
+static int hf_ieee80211_he_trigger_user_reserved;
+static int hf_ieee80211_he_trigger_dep_basic_user_info;
+static int hf_ieee80211_he_trigger_ranging_common_info_1;
+static int hf_ieee80211_he_trigger_ranging_common_info_2;
+static int hf_ieee80211_eht_trigger_common_info;
+static int hf_ieee80211_eht_trigger_type;
+static int hf_ieee80211_eht_trigger_ul_length;
+static int hf_ieee80211_eht_trigger_more_tf;
+static int hf_ieee80211_eht_trigger_cs_required;
+static int hf_ieee80211_eht_trigger_ul_bw;
+static int hf_ieee80211_eht_trigger_gi_and_eht_ltf_type;
+static int hf_ieee80211_eht_trigger_num_he_eht_ltf_syms_etc;
+static int hf_ieee80211_eht_trigger_reserved2;
+static int hf_ieee80211_eht_trigger_ldpc_extra_sym_seg;
+static int hf_ieee80211_eht_trigger_ap_tx_power;
+static int hf_ieee80211_eht_trigger_pre_fec_padding_factor;
+static int hf_ieee80211_eht_trigger_pe_disambiguity;
+static int hf_ieee80211_eht_trigger_ul_spatial_reuse;
+static int hf_ieee80211_eht_trigger_reserved3;
+static int hf_ieee80211_eht_trigger_he_eht_p160;
+static int hf_ieee80211_eht_trigger_special_user_info_flag;
+static int hf_ieee80211_eht_trigger_eht_reserved;
+static int hf_ieee80211_eht_trigger_reserved4;
+static int hf_ieee80211_eht_trigger_reserved;
+static int hf_ieee80211_eht_trigger_aid12;
+static int hf_ieee80211_eht_trigger_special_user_info;
+static int hf_ieee80211_eht_trigger_phy_version_identifier;
+static int hf_ieee80211_eht_trigger_ul_bw_extenstion;
+static int hf_ieee80211_eht_trigger_eht_spatial_reuse_1;
+static int hf_ieee80211_eht_trigger_eht_spatial_reuse_2;
+static int hf_ieee80211_eht_trigger_disregard_u_sig_1;
+static int hf_ieee80211_eht_trigger_validate_u_sig_2;
+static int hf_ieee80211_eht_trigger_disregard_u_sig_2_4lsb;
+static int hf_ieee80211_eht_trigger_disregard_u_sig_2_msb;
+static int hf_ieee80211_eht_trigger_special_reserved;
+static int hf_ieee80211_eht_trigger_user_info;
+static int hf_ieee80211_eht_trigger_ru_allocation_region;
+static int hf_ieee80211_eht_trigger_ru_allocation;
+static int hf_ieee80211_eht_trigger_ul_fec_coding_type;
+static int hf_ieee80211_eht_trigger_ul_eht_mcs;
+static int hf_ieee80211_eht_trigger_ru_starting_spatial_stream;
+static int hf_ieee80211_eht_trigger_ru_number_spatial_streams;
+static int hf_ieee80211_eht_trigger_ul_target_recv_power;
+static int hf_ieee80211_eht_trigger_ps160;
+static int hf_ieee80211_eht_trigger_user_info_reserved;
+static int hf_ieee80211_ranging_trigger_subtype1;
+static int hf_ieee80211_ranging_trigger_reserved1;
+static int hf_ieee80211_ranging_trigger_token;
+static int hf_ieee80211_ranging_trigger_subtype2;
+static int hf_ieee80211_ranging_trigger_reserved2;
+static int hf_ieee80211_ranging_trigger_sounding_dialog_token;
+static int hf_ieee80211_he_trigger_ranging_trigger_poll_rpt;
+static int hf_ieee80211_ranging_pol_rpt_aid12_rsid12;
+static int hf_ieee80211_ranging_pol_rpt_ru_alloc_region;
+static int hf_ieee80211_ranging_pol_rpt_ru_alloc;
+static int hf_ieee80211_ranging_pol_rpt_ul_fec_coding_type;
+static int hf_ieee80211_ranging_pol_rpt_ulmcs;
+static int hf_ieee80211_ranging_pol_rpt_uldcm;
+static int hf_ieee80211_ranging_pol_rpt_starting_spatial_stream;
+static int hf_ieee80211_ranging_pol_rpt_number_spatial_streams;
+static int hf_ieee80211_ranging_pol_rpt_ul_target_rssi;
+static int hf_ieee80211_ranging_pol_rpt_reserved;
+static int hf_ieee80211_he_trigger_ranging_trigger_sounding;
+static int hf_ieee80211_ranging_sounding_aid12_rsid12;
+static int hf_ieee80211_ranging_sounding_reserved1;
+static int hf_ieee80211_ranging_sounding_i2r_rep;
+static int hf_ieee80211_ranging_sounding_reserved2;
+static int hf_ieee80211_ranging_sounding_starting_spatial_stream;
+static int hf_ieee80211_ranging_sounding_number_spatial_streams;
+static int hf_ieee80211_ranging_sounding_ul_target_rssi;
+static int hf_ieee80211_ranging_sounding_reserved3;
+static int hf_ieee80211_he_trigger_ranging_trigger_sec_sound;
+static int hf_ieee80211_ranging_sec_sound_aid12_rsid12;
+static int hf_ieee80211_ranging_sec_sound_reserved1;
+static int hf_ieee80211_ranging_sec_sound_i2r_rep;
+static int hf_ieee80211_ranging_sec_sound_reserved2;
+static int hf_ieee80211_ranging_sec_sound_starting_spatial_stream;
+static int hf_ieee80211_ranging_sec_sound_number_spatial_streams;
+static int hf_ieee80211_ranging_sec_sound_ul_target_rssi;
+static int hf_ieee80211_ranging_sec_sound_reserved3;
+static int hf_ieee80211_he_trigger_ranging_user_info_sac;
+static int hf_ieee80211_he_ndp_annc_sta;
+static int hf_ieee80211_he_ndp_annc_aid11;
+static int hf_ieee80211_he_ndp_annc_ru_start;
+static int hf_ieee80211_he_ndp_annc_ru_end;
+static int hf_ieee80211_he_ndp_annc_feedback_type_and_ng;
+static int hf_ieee80211_he_ndp_annc_disambiguation;
+static int hf_ieee80211_he_ndp_annc_codebook_size;
+static int hf_ieee80211_he_ndp_annc_nc;
+static int hf_ieee80211_he_ndp_annc_disallowed_bitmap;
+static int hf_ieee80211_he_ndp_annc_reserved1;
+static int hf_ieee80211_he_ndp_annc_reserved2;
+static int hf_ieee80211_he_qtp_control;
+static int hf_ieee80211_he_qtp_setup_quiet_period_duration;
+static int hf_ieee80211_he_qtp_setup_srv_specific_identif;
+static int hf_ieee80211_he_qtp_request_dialog_token;
+static int hf_ieee80211_he_qtp_request_quiet_period_offset;
+static int hf_ieee80211_he_qtp_request_quiet_period_duration;
+static int hf_ieee80211_he_qtp_request_quiet_period_interval;
+static int hf_ieee80211_he_qtp_request_repetition_count;
+static int hf_ieee80211_he_qtp_request_srv_specific_identif;
+static int hf_ieee80211_he_qtp_response_dialog_token;
+static int hf_ieee80211_he_qtp_response_status_code;
+static int hf_ieee80211_he_qtp_response_quiet_period_offset;
+static int hf_ieee80211_he_qtp_response_quiet_period_duration;
+static int hf_ieee80211_he_qtp_response_quiet_period_interval;
+static int hf_ieee80211_he_qtp_response_repetition_count;
+static int hf_ieee80211_he_qtp_response_srv_specific_identif;
+static int hf_ieee80211_htc_ht_lac;
+static int hf_ieee80211_htc_lac_trq;
+static int hf_ieee80211_htc_lac_mai_aseli;
+static int hf_ieee80211_htc_lac_mai_mrq;
+static int hf_ieee80211_htc_lac_mai_msi;
+static int hf_ieee80211_htc_lac_mai_reserved;
+static int hf_ieee80211_htc_lac_mfsi;
+static int hf_ieee80211_htc_lac_mfb;
+static int hf_ieee80211_htc_lac_asel_command;
+static int hf_ieee80211_htc_lac_asel_data;
+static int hf_ieee80211_htc_cal_pos;
+static int hf_ieee80211_htc_cal_seq;
+static int hf_ieee80211_htc_reserved1;
+static int hf_ieee80211_htc_csi_steering;
+static int hf_ieee80211_htc_ndp_announcement;
+static int hf_ieee80211_htc_reserved2;
+static int hf_ieee80211_htc_mrq;
+static int hf_ieee80211_htc_msi;
+static int hf_ieee80211_htc_msi_stbc_reserved;
+static int hf_ieee80211_htc_compressed_msi;
+static int hf_ieee80211_htc_ppdu_stbc_encoded;
+static int hf_ieee80211_htc_mfsi;
+static int hf_ieee80211_htc_gid_l;
+static int hf_ieee80211_htc_mfb;
+static int hf_ieee80211_htc_num_sts;
+static int hf_ieee80211_htc_vht_mcs;
+static int hf_ieee80211_htc_bw;
+static int hf_ieee80211_htc_snr;
+static int hf_ieee80211_htc_reserved3;
+static int hf_ieee80211_htc_gid_h;
+static int hf_ieee80211_htc_coding_type;
+static int hf_ieee80211_htc_fb_tx_type;
+static int hf_ieee80211_htc_unsolicited_mfb;
+static int hf_ieee80211_htc_ac_constraint;
+static int hf_ieee80211_htc_rdg_more_ppdu;
 
 /* ************************************************************************* */
 /*                Header values for sequence number field                    */
 /* ************************************************************************* */
-static int hf_ieee80211_frag_number = -1;
-static int hf_ieee80211_seq_number = -1;
+static int hf_ieee80211_frag_number;
+static int hf_ieee80211_seq_number;
 
 /* ************************************************************************* */
 /*                   Header values for Frame Check field                     */
 /* ************************************************************************* */
-static int hf_ieee80211_fcs = -1;
-static int hf_ieee80211_fcs_status = -1;
+static int hf_ieee80211_fcs;
+static int hf_ieee80211_fcs_status;
 
 /* ************************************************************************* */
 /*                   Header values for reassembly                            */
 /* ************************************************************************* */
-static int hf_ieee80211_fragments = -1;
-static int hf_ieee80211_fragment = -1;
-static int hf_ieee80211_fragment_overlap = -1;
-static int hf_ieee80211_fragment_overlap_conflict = -1;
-static int hf_ieee80211_fragment_multiple_tails = -1;
-static int hf_ieee80211_fragment_too_long_fragment = -1;
-static int hf_ieee80211_fragment_error = -1;
-static int hf_ieee80211_fragment_count = -1;
-static int hf_ieee80211_reassembled_in = -1;
-static int hf_ieee80211_reassembled_length = -1;
-
-static int proto_wlan_ext = -1;
+static int hf_ieee80211_fragments;
+static int hf_ieee80211_fragment;
+static int hf_ieee80211_fragment_overlap;
+static int hf_ieee80211_fragment_overlap_conflict;
+static int hf_ieee80211_fragment_multiple_tails;
+static int hf_ieee80211_fragment_too_long_fragment;
+static int hf_ieee80211_fragment_error;
+static int hf_ieee80211_fragment_count;
+static int hf_ieee80211_reassembled_in;
+static int hf_ieee80211_reassembled_length;
+
+static int proto_wlan_ext;
 
 /* ************************************************************************* */
 /*                      Fixed fields found in mgt frames                     */
 /* ************************************************************************* */
-static int hf_ieee80211_fixed_parameters = -1;  /* Protocol payload for management frames */
-
-static int hf_ieee80211_ff_auth_alg = -1;            /* Authentication algorithm field            */
-static int hf_ieee80211_ff_auth_seq = -1;            /* Authentication transaction sequence       */
-static int hf_ieee80211_ff_current_ap = -1;          /* Current AP MAC address                    */
-static int hf_ieee80211_ff_listen_ival = -1;         /* Listen interval fixed field               */
-static int hf_ieee80211_ff_timestamp = -1;           /* 64 bit timestamp                          */
-static int hf_ieee80211_ff_beacon_interval = -1;     /* 16 bit Beacon interval                    */
-static int hf_ieee80211_ff_assoc_id = -1;            /* 16 bit AID field                          */
-static int hf_ieee80211_ff_reason = -1;              /* 16 bit reason code                        */
-static int hf_ieee80211_ff_status_code = -1;         /* Status code                               */
-static int hf_ieee80211_ff_category_code = -1;       /* 8 bit Category code */
-static int hf_ieee80211_ff_action_code = -1;         /* 8 bit Action code */
-static int hf_ieee80211_ff_dialog_token = -1;        /* 8 bit Dialog token */
-static int hf_ieee80211_ff_trigger = -1;
-static int hf_ieee80211_ff_ftm_tod = -1;
-static int hf_ieee80211_ff_ftm_toa = -1;
-static int hf_ieee80211_ff_ftm_tod_err = -1;
-static int hf_ieee80211_ff_ftm_toa_err = -1;
-static int hf_ieee80211_ff_followup_dialog_token = -1;
-static int hf_ieee80211_ff_wme_action_code = -1;     /* Management notification action code */
-static int hf_ieee80211_ff_wme_status_code = -1;     /* Management notification setup response status code */
-static int hf_ieee80211_ff_qos_action_code = -1;
-static int hf_ieee80211_ff_dls_action_code = -1;
-static int hf_ieee80211_ff_dst_mac_addr = -1;        /* DLS destination MAC addressi */
-static int hf_ieee80211_ff_src_mac_addr = -1;        /* DLS source MAC addressi */
-static int hf_ieee80211_ff_req_ap_addr = -1;
-static int hf_ieee80211_ff_res_ap_addr = -1;
-static int hf_ieee80211_ff_check_beacon = -1;
-static int hf_ieee80211_ff_dls_timeout = -1;         /* DLS timeout value */
-static int hf_ieee80211_ff_ft_action_code = -1; /* 8 bit FT Action code */
-static int hf_ieee80211_ff_sta_address = -1;
-static int hf_ieee80211_ff_target_ap_address = -1;
-static int hf_ieee80211_ff_gas_comeback_delay = -1;
-static int hf_ieee80211_ff_gas_fragment_id = -1;
-static int hf_ieee80211_ff_more_gas_fragments = -1;
-static int hf_ieee80211_ff_query_request_length = -1;
-static int hf_ieee80211_ff_query_request = -1;
-static int hf_ieee80211_ff_query_response_length = -1;
-static int hf_ieee80211_ff_query_response = -1;
-static int hf_ieee80211_ff_anqp_info_id = -1;
-static int hf_ieee80211_ff_anqp_info_length = -1;
-static int hf_ieee80211_ff_anqp_info = -1;
-static int hf_ieee80211_ff_anqp_query_id = -1;
-static int hf_ieee80211_ff_anqp_capability = -1;
-static int hf_ieee80211_ff_anqp_capability_vlen = -1;
-static int hf_ieee80211_ff_anqp_capability_vendor = -1;
-static int hf_ieee80211_ff_venue_info_group = -1;
-static int hf_ieee80211_ff_venue_info_type = -1;
-static int hf_ieee80211_ff_anqp_venue_length = -1;
-static int hf_ieee80211_ff_anqp_venue_language = -1;
-static int hf_ieee80211_ff_anqp_venue_name = -1;
-static int hf_ieee80211_ff_anqp_nw_auth_type_indicator = -1;
-static int hf_ieee80211_ff_anqp_nw_auth_type_url_len = -1;
-static int hf_ieee80211_ff_anqp_nw_auth_type_url = -1;
-static int hf_ieee80211_ff_anqp_nw_auth_type_ts_indicator = -1;
-static int hf_ieee80211_ff_anqp_nw_auth_type_ts_url_len = -1;
-static int hf_ieee80211_ff_anqp_nw_auth_type_ts_url = -1;
-static int hf_ieee80211_ff_anqp_nw_auth_type_ts_year = -1;
-static int hf_ieee80211_ff_anqp_nw_auth_type_ts_mon = -1;
-static int hf_ieee80211_ff_anqp_nw_auth_type_ts_day = -1;
-static int hf_ieee80211_ff_anqp_nw_auth_type_ts_hr = -1;
-static int hf_ieee80211_ff_anqp_nw_auth_type_ts_min = -1;
-static int hf_ieee80211_ff_anqp_nw_auth_type_ts_sec = -1;
-static int hf_ieee80211_ff_anqp_nw_auth_type_ts_msec = -1;
-static int hf_ieee80211_ff_anqp_nw_auth_type_ts_rsvd = -1;
-static int hf_ieee80211_ff_anqp_roaming_consortium_oi_len = -1;
-static int hf_ieee80211_ff_anqp_roaming_consortium_oi = -1;
-static int hf_ieee80211_ff_anqp_ip_addr_avail_ipv6 = -1;
-static int hf_ieee80211_ff_anqp_ip_addr_avail_ipv4 = -1;
-static int hf_ieee80211_ff_anqp_nai_realm_count = -1;
-static int hf_ieee80211_ff_anqp_nai_field_len = -1;
-static int hf_ieee80211_ff_anqp_nai_realm_encoding = -1;
-static int hf_ieee80211_ff_anqp_nai_realm_length = -1;
-static int hf_ieee80211_ff_anqp_nai_realm = -1;
-static int hf_ieee80211_ff_anqp_nai_realm_eap_count = -1;
-static int hf_ieee80211_ff_anqp_nai_realm_eap_len = -1;
-static int hf_ieee80211_ff_anqp_nai_realm_eap_method = -1;
-static int hf_ieee80211_ff_anqp_nai_realm_auth_param_count = -1;
-static int hf_ieee80211_ff_anqp_nai_realm_auth_param_id = -1;
-static int hf_ieee80211_ff_anqp_nai_realm_auth_param_len = -1;
-static int hf_ieee80211_ff_anqp_nai_realm_auth_param_value = -1;
-static int hf_ieee80211_3gpp_gc_gud = -1;
-static int hf_ieee80211_3gpp_gc_udhl = -1;
-static int hf_ieee80211_3gpp_gc_iei = -1;
-static int hf_ieee80211_3gpp_gc_num_plmns = -1;
-static int hf_ieee80211_3gpp_gc_plmn = -1;
-static int hf_ieee80211_3gpp_gc_plmn_len = -1;
-static int hf_ieee80211_ff_anqp_domain_name_len = -1;
-static int hf_ieee80211_ff_anqp_domain_name = -1;
-static int hf_ieee80211_ff_tdls_action_code = -1;
-static int hf_ieee80211_ff_target_channel = -1;
-static int hf_ieee80211_ff_operating_class = -1;
-static int hf_ieee80211_ff_wnm_action_code = -1;
-static int hf_ieee80211_ff_unprotected_wnm_action_code = -1;
-static int hf_ieee80211_ff_key_data_length = -1;
-static int hf_ieee80211_ff_key_data = -1;
-static int hf_ieee80211_ff_wnm_notification_type = -1;
-static int hf_ieee80211_ff_wnm_notification_response_status = -1;
-static int hf_ieee80211_ff_rm_action_code = -1;
-static int hf_ieee80211_ff_rm_dialog_token = -1;
-static int hf_ieee80211_ff_rm_repetitions = -1;
-static int hf_ieee80211_ff_rm_tx_power = -1;
-static int hf_ieee80211_ff_rm_max_tx_power = -1;
-static int hf_ieee80211_ff_tpc = -1;
-static int hf_ieee80211_ff_tpc_element_id = -1;
-static int hf_ieee80211_ff_tpc_length = -1;
-static int hf_ieee80211_ff_tpc_tx_power = -1;
-static int hf_ieee80211_ff_tpc_link_margin = -1;
-static int hf_ieee80211_ff_rm_rx_antenna_id = -1;
-static int hf_ieee80211_ff_rm_tx_antenna_id = -1;
-static int hf_ieee80211_ff_rm_rcpi = -1;
-static int hf_ieee80211_ff_rm_rsni = -1;
-static int hf_ieee80211_ff_request_mode_pref_cand = -1;
-static int hf_ieee80211_ff_request_mode_abridged = -1;
-static int hf_ieee80211_ff_request_mode_disassoc_imminent = -1;
-static int hf_ieee80211_ff_request_mode_bss_term_included = -1;
-static int hf_ieee80211_ff_request_mode_ess_disassoc_imminent = -1;
-static int hf_ieee80211_ff_request_mode_link_removal_imminent = -1;
-static int hf_ieee80211_ff_request_mode_reserved = -1;
-static int hf_ieee80211_ff_disassoc_timer = -1;
-static int hf_ieee80211_ff_validity_interval = -1;
-static int hf_ieee80211_ff_url_len = -1;
-static int hf_ieee80211_ff_url = -1;
-static int hf_ieee80211_ff_target_bss = -1;
-static int hf_ieee80211_ff_bss_transition_query_reason = -1;
-static int hf_ieee80211_ff_bss_transition_status_code = -1;
-static int hf_ieee80211_ff_bss_termination_delay = -1;
-static int hf_ieee80211_ff_bss_transition_candidate_list_entries = -1;
-
-static int hf_ieee80211_ff_sa_query_action_code = -1;
-static int hf_ieee80211_ff_transaction_id = -1;
-
-static int hf_ieee80211_ff_send_confirm = -1;
-static int hf_ieee80211_ff_scalar = -1;
-static int hf_ieee80211_ff_finite_field_element = -1;
-static int hf_ieee80211_ff_confirm = -1;
-static int hf_ieee80211_ff_finite_cyclic_group = -1;
-static int hf_ieee80211_ff_sae_message_type = -1;
-static int hf_ieee80211_ff_sae_anti_clogging_token = -1;
+static int hf_ieee80211_fixed_parameters;  /* Protocol payload for management frames */
+
+static int hf_ieee80211_ff_auth_alg;            /* Authentication algorithm field            */
+static int hf_ieee80211_ff_auth_seq;            /* Authentication transaction sequence       */
+static int hf_ieee80211_ff_current_ap;          /* Current AP MAC address                    */
+static int hf_ieee80211_ff_listen_ival;         /* Listen interval fixed field               */
+static int hf_ieee80211_ff_timestamp;           /* 64 bit timestamp                          */
+static int hf_ieee80211_ff_beacon_interval;     /* 16 bit Beacon interval                    */
+static int hf_ieee80211_ff_assoc_id;            /* 16 bit AID field                          */
+static int hf_ieee80211_ff_reason;              /* 16 bit reason code                        */
+static int hf_ieee80211_ff_status_code;         /* Status code                               */
+static int hf_ieee80211_ff_category_code;       /* 8 bit Category code */
+static int hf_ieee80211_ff_action_code;         /* 8 bit Action code */
+static int hf_ieee80211_ff_dialog_token;        /* 8 bit Dialog token */
+static int hf_ieee80211_ff_trigger;
+static int hf_ieee80211_ff_ftm_tod;
+static int hf_ieee80211_ff_ftm_toa;
+static int hf_ieee80211_ff_ftm_tod_err;
+static int hf_ieee80211_ff_ftm_toa_err;
+static int hf_ieee80211_ff_followup_dialog_token;
+static int hf_ieee80211_ff_wme_action_code;     /* Management notification action code */
+static int hf_ieee80211_ff_wme_status_code;     /* Management notification setup response status code */
+static int hf_ieee80211_ff_qos_action_code;
+static int hf_ieee80211_ff_dls_action_code;
+static int hf_ieee80211_ff_dst_mac_addr;        /* DLS destination MAC addressi */
+static int hf_ieee80211_ff_src_mac_addr;        /* DLS source MAC addressi */
+static int hf_ieee80211_ff_req_ap_addr;
+static int hf_ieee80211_ff_res_ap_addr;
+static int hf_ieee80211_ff_check_beacon;
+static int hf_ieee80211_ff_dls_timeout;         /* DLS timeout value */
+static int hf_ieee80211_ff_ft_action_code; /* 8 bit FT Action code */
+static int hf_ieee80211_ff_sta_address;
+static int hf_ieee80211_ff_target_ap_address;
+static int hf_ieee80211_ff_gas_comeback_delay;
+static int hf_ieee80211_ff_gas_fragment_id;
+static int hf_ieee80211_ff_more_gas_fragments;
+static int hf_ieee80211_ff_query_request_length;
+static int hf_ieee80211_ff_query_request;
+static int hf_ieee80211_ff_query_response_length;
+static int hf_ieee80211_ff_query_response;
+static int hf_ieee80211_ff_anqp_info_id;
+static int hf_ieee80211_ff_anqp_info_length;
+static int hf_ieee80211_ff_anqp_info;
+static int hf_ieee80211_ff_anqp_query_id;
+static int hf_ieee80211_ff_anqp_capability;
+static int hf_ieee80211_ff_anqp_capability_vlen;
+static int hf_ieee80211_ff_anqp_capability_vendor;
+static int hf_ieee80211_ff_venue_info_group;
+static int hf_ieee80211_ff_venue_info_type;
+static int hf_ieee80211_ff_anqp_venue_length;
+static int hf_ieee80211_ff_anqp_venue_language;
+static int hf_ieee80211_ff_anqp_venue_name;
+static int hf_ieee80211_ff_anqp_nw_auth_type_indicator;
+static int hf_ieee80211_ff_anqp_nw_auth_type_url_len;
+static int hf_ieee80211_ff_anqp_nw_auth_type_url;
+static int hf_ieee80211_ff_anqp_nw_auth_type_ts_indicator;
+static int hf_ieee80211_ff_anqp_nw_auth_type_ts_url_len;
+static int hf_ieee80211_ff_anqp_nw_auth_type_ts_url;
+static int hf_ieee80211_ff_anqp_nw_auth_type_ts_year;
+static int hf_ieee80211_ff_anqp_nw_auth_type_ts_mon;
+static int hf_ieee80211_ff_anqp_nw_auth_type_ts_day;
+static int hf_ieee80211_ff_anqp_nw_auth_type_ts_hr;
+static int hf_ieee80211_ff_anqp_nw_auth_type_ts_min;
+static int hf_ieee80211_ff_anqp_nw_auth_type_ts_sec;
+static int hf_ieee80211_ff_anqp_nw_auth_type_ts_msec;
+static int hf_ieee80211_ff_anqp_nw_auth_type_ts_rsvd;
+static int hf_ieee80211_ff_anqp_roaming_consortium_oi_len;
+static int hf_ieee80211_ff_anqp_roaming_consortium_oi;
+static int hf_ieee80211_ff_anqp_ip_addr_avail_ipv6;
+static int hf_ieee80211_ff_anqp_ip_addr_avail_ipv4;
+static int hf_ieee80211_ff_anqp_nai_realm_count;
+static int hf_ieee80211_ff_anqp_nai_field_len;
+static int hf_ieee80211_ff_anqp_nai_realm_encoding;
+static int hf_ieee80211_ff_anqp_nai_realm_length;
+static int hf_ieee80211_ff_anqp_nai_realm;
+static int hf_ieee80211_ff_anqp_nai_realm_eap_count;
+static int hf_ieee80211_ff_anqp_nai_realm_eap_len;
+static int hf_ieee80211_ff_anqp_nai_realm_eap_method;
+static int hf_ieee80211_ff_anqp_nai_realm_auth_param_count;
+static int hf_ieee80211_ff_anqp_nai_realm_auth_param_id;
+static int hf_ieee80211_ff_anqp_nai_realm_auth_param_len;
+static int hf_ieee80211_ff_anqp_nai_realm_auth_param_value;
+static int hf_ieee80211_3gpp_gc_gud;
+static int hf_ieee80211_3gpp_gc_udhl;
+static int hf_ieee80211_3gpp_gc_iei;
+static int hf_ieee80211_3gpp_gc_num_plmns;
+static int hf_ieee80211_3gpp_gc_plmn;
+static int hf_ieee80211_3gpp_gc_plmn_len;
+static int hf_ieee80211_ff_anqp_domain_name_len;
+static int hf_ieee80211_ff_anqp_domain_name;
+static int hf_ieee80211_ff_tdls_action_code;
+static int hf_ieee80211_ff_target_channel;
+static int hf_ieee80211_ff_operating_class;
+static int hf_ieee80211_ff_wnm_action_code;
+static int hf_ieee80211_ff_unprotected_wnm_action_code;
+static int hf_ieee80211_ff_key_data_length;
+static int hf_ieee80211_ff_key_data;
+static int hf_ieee80211_ff_wnm_notification_type;
+static int hf_ieee80211_ff_wnm_notification_response_status;
+static int hf_ieee80211_ff_rm_action_code;
+static int hf_ieee80211_ff_rm_dialog_token;
+static int hf_ieee80211_ff_rm_repetitions;
+static int hf_ieee80211_ff_rm_tx_power;
+static int hf_ieee80211_ff_rm_max_tx_power;
+static int hf_ieee80211_ff_tpc;
+static int hf_ieee80211_ff_tpc_element_id;
+static int hf_ieee80211_ff_tpc_length;
+static int hf_ieee80211_ff_tpc_tx_power;
+static int hf_ieee80211_ff_tpc_link_margin;
+static int hf_ieee80211_ff_rm_rx_antenna_id;
+static int hf_ieee80211_ff_rm_tx_antenna_id;
+static int hf_ieee80211_ff_rm_rcpi;
+static int hf_ieee80211_ff_rm_rsni;
+static int hf_ieee80211_ff_request_mode_pref_cand;
+static int hf_ieee80211_ff_request_mode_abridged;
+static int hf_ieee80211_ff_request_mode_disassoc_imminent;
+static int hf_ieee80211_ff_request_mode_bss_term_included;
+static int hf_ieee80211_ff_request_mode_ess_disassoc_imminent;
+static int hf_ieee80211_ff_request_mode_link_removal_imminent;
+static int hf_ieee80211_ff_request_mode_reserved;
+static int hf_ieee80211_ff_disassoc_timer;
+static int hf_ieee80211_ff_validity_interval;
+static int hf_ieee80211_ff_url_len;
+static int hf_ieee80211_ff_url;
+static int hf_ieee80211_ff_target_bss;
+static int hf_ieee80211_ff_bss_transition_query_reason;
+static int hf_ieee80211_ff_bss_transition_status_code;
+static int hf_ieee80211_ff_bss_termination_delay;
+static int hf_ieee80211_ff_bss_transition_candidate_list_entries;
+
+static int hf_ieee80211_ff_sa_query_action_code;
+static int hf_ieee80211_ff_transaction_id;
+
+static int hf_ieee80211_ff_send_confirm;
+static int hf_ieee80211_ff_scalar;
+static int hf_ieee80211_ff_finite_field_element;
+static int hf_ieee80211_ff_confirm;
+static int hf_ieee80211_ff_finite_cyclic_group;
+static int hf_ieee80211_ff_sae_message_type;
+static int hf_ieee80211_ff_sae_anti_clogging_token;
 
 
 /* Vendor specific */
-static int hf_ieee80211_ff_marvell_action_type = -1;
-static int hf_ieee80211_ff_marvell_mesh_mgt_action_code = -1;
-static int hf_ieee80211_ff_marvell_mesh_mgt_length = -1;     /* Mesh Management length */
-static int hf_ieee80211_ff_marvell_mesh_mgt_mode = -1;       /* Mesh Management mode */
-static int hf_ieee80211_ff_marvell_mesh_mgt_ttl = -1;        /* Mesh Management TTL */
-static int hf_ieee80211_ff_marvell_mesh_mgt_dstcount = -1;   /* Mesh Management dst count */
-static int hf_ieee80211_ff_marvell_mesh_mgt_hopcount = -1;   /* Mesh Management hop count */
-static int hf_ieee80211_ff_marvell_mesh_mgt_rreqid = -1;     /* Mesh Management RREQ ID */
-static int hf_ieee80211_ff_marvell_mesh_mgt_sa = -1;         /* Mesh Management src addr */
-static int hf_ieee80211_ff_marvell_mesh_mgt_ssn = -1;        /* Mesh Management src sequence number */
-static int hf_ieee80211_ff_marvell_mesh_mgt_metric = -1;     /* Mesh Management metric */
-static int hf_ieee80211_ff_marvell_mesh_mgt_flags = -1;      /* Mesh Management RREQ flags */
-static int hf_ieee80211_ff_marvell_mesh_mgt_da = -1;         /* Mesh Management dst addr */
-static int hf_ieee80211_ff_marvell_mesh_mgt_dsn = -1;        /* Mesh Management dst sequence number */
-static int hf_ieee80211_ff_marvell_mesh_mgt_lifetime = -1;   /* Mesh Management lifetime */
-
-
-static int hf_ieee80211_ff_ba_action = -1;
-
-static int hf_ieee80211_ff_block_ack_params = -1;
-static int hf_ieee80211_ff_block_ack_params_amsdu_permitted = -1;
-static int hf_ieee80211_ff_block_ack_params_policy = -1;
-static int hf_ieee80211_ff_block_ack_params_tid = -1;
-static int hf_ieee80211_ff_block_ack_params_buffer_size = -1;
+static int hf_ieee80211_ff_marvell_action_type;
+static int hf_ieee80211_ff_marvell_mesh_mgt_action_code;
+static int hf_ieee80211_ff_marvell_mesh_mgt_length;     /* Mesh Management length */
+static int hf_ieee80211_ff_marvell_mesh_mgt_mode;       /* Mesh Management mode */
+static int hf_ieee80211_ff_marvell_mesh_mgt_ttl;        /* Mesh Management TTL */
+static int hf_ieee80211_ff_marvell_mesh_mgt_dstcount;   /* Mesh Management dst count */
+static int hf_ieee80211_ff_marvell_mesh_mgt_hopcount;   /* Mesh Management hop count */
+static int hf_ieee80211_ff_marvell_mesh_mgt_rreqid;     /* Mesh Management RREQ ID */
+static int hf_ieee80211_ff_marvell_mesh_mgt_sa;         /* Mesh Management src addr */
+static int hf_ieee80211_ff_marvell_mesh_mgt_ssn;        /* Mesh Management src sequence number */
+static int hf_ieee80211_ff_marvell_mesh_mgt_metric;     /* Mesh Management metric */
+static int hf_ieee80211_ff_marvell_mesh_mgt_flags;      /* Mesh Management RREQ flags */
+static int hf_ieee80211_ff_marvell_mesh_mgt_da;         /* Mesh Management dst addr */
+static int hf_ieee80211_ff_marvell_mesh_mgt_dsn;        /* Mesh Management dst sequence number */
+static int hf_ieee80211_ff_marvell_mesh_mgt_lifetime;   /* Mesh Management lifetime */
+
+
+static int hf_ieee80211_ff_ba_action;
+
+static int hf_ieee80211_ff_block_ack_params;
+static int hf_ieee80211_ff_block_ack_params_amsdu_permitted;
+static int hf_ieee80211_ff_block_ack_params_policy;
+static int hf_ieee80211_ff_block_ack_params_tid;
+static int hf_ieee80211_ff_block_ack_params_buffer_size;
 
 static int * const ieee80211_ff_block_ack_params_fields[] = {
   &hf_ieee80211_ff_block_ack_params_amsdu_permitted,
@@ -4326,11 +4326,11 @@ static int * const ieee80211_ff_block_ack_params_fields[] = {
   NULL
 };
 
-static int hf_ieee80211_ff_block_ack_timeout = -1;
+static int hf_ieee80211_ff_block_ack_timeout;
 
-static int hf_ieee80211_ff_block_ack_ssc = -1;
-static int hf_ieee80211_ff_block_ack_ssc_fragment = -1;
-static int hf_ieee80211_ff_block_ack_ssc_sequence = -1;
+static int hf_ieee80211_ff_block_ack_ssc;
+static int hf_ieee80211_ff_block_ack_ssc_fragment;
+static int hf_ieee80211_ff_block_ack_ssc_sequence;
 
 static int * const ieee80211_ff_block_ack_ssc_fields[] = {
   &hf_ieee80211_ff_block_ack_ssc_fragment,
@@ -4338,10 +4338,10 @@ static int * const ieee80211_ff_block_ack_ssc_fields[] = {
   NULL
 };
 
-static int hf_ieee80211_ff_delba_param = -1;
-static int hf_ieee80211_ff_delba_param_reserved = -1;
-static int hf_ieee80211_ff_delba_param_init = -1;
-static int hf_ieee80211_ff_delba_param_tid = -1;
+static int hf_ieee80211_ff_delba_param;
+static int hf_ieee80211_ff_delba_param_reserved;
+static int hf_ieee80211_ff_delba_param_init;
+static int hf_ieee80211_ff_delba_param_tid;
 
 static int * const ieee80211_ff_delba_param_fields[] = {
   &hf_ieee80211_ff_delba_param_reserved,
@@ -4350,20 +4350,20 @@ static int * const ieee80211_ff_delba_param_fields[] = {
   NULL
 };
 
-static int hf_ieee80211_ff_max_reg_pwr = -1;
-static int hf_ieee80211_ff_measurement_pilot_int = -1;
-static int hf_ieee80211_ff_country_str = -1;
-static int hf_ieee80211_ff_max_tx_pwr = -1;
-static int hf_ieee80211_ff_tx_pwr_used = -1;
-static int hf_ieee80211_ff_transceiver_noise_floor = -1;
-static int hf_ieee80211_ff_channel_width = -1;
+static int hf_ieee80211_ff_max_reg_pwr;
+static int hf_ieee80211_ff_measurement_pilot_int;
+static int hf_ieee80211_ff_country_str;
+static int hf_ieee80211_ff_max_tx_pwr;
+static int hf_ieee80211_ff_tx_pwr_used;
+static int hf_ieee80211_ff_transceiver_noise_floor;
+static int hf_ieee80211_ff_channel_width;
 
-static int hf_ieee80211_ff_qos_info_ap = -1;
-static int hf_ieee80211_ff_qos_info_ap_edca_param_set_counter = -1;
-static int hf_ieee80211_ff_qos_info_ap_q_ack = -1;
-static int hf_ieee80211_ff_qos_info_ap_queue_req = -1;
-static int hf_ieee80211_ff_qos_info_ap_txop_request = -1;
-static int hf_ieee80211_ff_qos_info_ap_more_data_ack = -1;
+static int hf_ieee80211_ff_qos_info_ap;
+static int hf_ieee80211_ff_qos_info_ap_edca_param_set_counter;
+static int hf_ieee80211_ff_qos_info_ap_q_ack;
+static int hf_ieee80211_ff_qos_info_ap_queue_req;
+static int hf_ieee80211_ff_qos_info_ap_txop_request;
+static int hf_ieee80211_ff_qos_info_ap_more_data_ack;
 
 static int * const ieee80211_ff_qos_info_ap_fields[] = {
   &hf_ieee80211_ff_qos_info_ap_edca_param_set_counter,
@@ -4374,14 +4374,14 @@ static int * const ieee80211_ff_qos_info_ap_fields[] = {
   NULL
 };
 
-static int hf_ieee80211_ff_qos_info_sta = -1;
-static int hf_ieee80211_ff_qos_info_sta_ac_vo = -1;
-static int hf_ieee80211_ff_qos_info_sta_ac_vi = -1;
-static int hf_ieee80211_ff_qos_info_sta_ac_bk = -1;
-static int hf_ieee80211_ff_qos_info_sta_ac_be = -1;
-static int hf_ieee80211_ff_qos_info_sta_q_ack = -1;
-static int hf_ieee80211_ff_qos_info_sta_max_sp_length = -1;
-static int hf_ieee80211_ff_qos_info_sta_more_data_ack = -1;
+static int hf_ieee80211_ff_qos_info_sta;
+static int hf_ieee80211_ff_qos_info_sta_ac_vo;
+static int hf_ieee80211_ff_qos_info_sta_ac_vi;
+static int hf_ieee80211_ff_qos_info_sta_ac_bk;
+static int hf_ieee80211_ff_qos_info_sta_ac_be;
+static int hf_ieee80211_ff_qos_info_sta_q_ack;
+static int hf_ieee80211_ff_qos_info_sta_max_sp_length;
+static int hf_ieee80211_ff_qos_info_sta_more_data_ack;
 
 static int * const ieee80211_ff_qos_info_sta_fields[] = {
   &hf_ieee80211_ff_qos_info_sta_ac_vo,
@@ -4394,10 +4394,10 @@ static int * const ieee80211_ff_qos_info_sta_fields[] = {
   NULL
 };
 
-static int hf_ieee80211_ff_sm_pwr_save = -1;
-static int hf_ieee80211_ff_sm_pwr_save_enabled = -1;
-static int hf_ieee80211_ff_sm_pwr_save_sm_mode = -1;
-static int hf_ieee80211_ff_sm_pwr_save_reserved = -1;
+static int hf_ieee80211_ff_sm_pwr_save;
+static int hf_ieee80211_ff_sm_pwr_save_enabled;
+static int hf_ieee80211_ff_sm_pwr_save_sm_mode;
+static int hf_ieee80211_ff_sm_pwr_save_reserved;
 
 static int * const ieee80211_ff_sw_pwr_save_fields[] = {
   &hf_ieee80211_ff_sm_pwr_save_enabled,
@@ -4406,12 +4406,12 @@ static int * const ieee80211_ff_sw_pwr_save_fields[] = {
   NULL
 };
 
-static int hf_ieee80211_ff_pco_phase_cntrl = -1;
+static int hf_ieee80211_ff_pco_phase_cntrl;
 
-static int hf_ieee80211_ff_psmp_param_set = -1;
-static int hf_ieee80211_ff_psmp_param_set_n_sta = -1;
-static int hf_ieee80211_ff_psmp_param_set_more_psmp = -1;
-static int hf_ieee80211_ff_psmp_param_set_psmp_sequence_duration = -1;
+static int hf_ieee80211_ff_psmp_param_set;
+static int hf_ieee80211_ff_psmp_param_set_n_sta;
+static int hf_ieee80211_ff_psmp_param_set_more_psmp;
+static int hf_ieee80211_ff_psmp_param_set_psmp_sequence_duration;
 
 static int * const ieee80211_ff_psmp_param_set_fields[] = {
   &hf_ieee80211_ff_psmp_param_set_n_sta,
@@ -4420,452 +4420,452 @@ static int * const ieee80211_ff_psmp_param_set_fields[] = {
   NULL
 };
 
-static int hf_ieee80211_ff_mimo_cntrl = -1;
-static int hf_ieee80211_ff_mimo_cntrl_nc_index = -1;
-static int hf_ieee80211_ff_mimo_cntrl_nr_index = -1;
-static int hf_ieee80211_ff_mimo_cntrl_channel_width = -1;
-static int hf_ieee80211_ff_mimo_cntrl_grouping = -1;
-static int hf_ieee80211_ff_mimo_cntrl_coefficient_size = -1;
-static int hf_ieee80211_ff_mimo_cntrl_codebook_info = -1;
-static int hf_ieee80211_ff_mimo_cntrl_remaining_matrix_segment = -1;
-static int hf_ieee80211_ff_mimo_cntrl_reserved = -1;
-static int hf_ieee80211_ff_mimo_cntrl_sounding_timestamp = -1;
-
-static int hf_ieee80211_ff_ftm_param_delim1 = -1;
-static int hf_ieee80211_ff_ftm_param_status_indication = -1;
-static int hf_ieee80211_ff_ftm_param_value = -1;
-static int hf_ieee80211_ff_ftm_param_reserved1 = -1;
-static int hf_ieee80211_ff_ftm_param_burst_exponent = -1;
-static int hf_ieee80211_ff_ftm_param_burst_duration = -1;
-
-static int hf_ieee80211_ff_ftm_param_delim2 = -1;
-static int hf_ieee80211_ff_ftm_param_min_delta_ftm = -1;
-static int hf_ieee80211_ff_ftm_param_partial_tsf_timer = -1;
-static int hf_ieee80211_ff_ftm_param_partial_tsf_no_pref = -1;
-static int hf_ieee80211_ff_ftm_param_asap_capable = -1;
-static int hf_ieee80211_ff_ftm_param_asap = -1;
-static int hf_ieee80211_ff_ftm_param_ftm_per_burst = -1;
-
-static int hf_ieee80211_ff_ftm_param_delim3 = -1;
-static int hf_ieee80211_ff_ftm_param_reserved2 = -1;
-static int hf_ieee80211_ff_ftm_param_format_and_bw = -1;
-static int hf_ieee80211_ff_ftm_param_burst_period = -1;
+static int hf_ieee80211_ff_mimo_cntrl;
+static int hf_ieee80211_ff_mimo_cntrl_nc_index;
+static int hf_ieee80211_ff_mimo_cntrl_nr_index;
+static int hf_ieee80211_ff_mimo_cntrl_channel_width;
+static int hf_ieee80211_ff_mimo_cntrl_grouping;
+static int hf_ieee80211_ff_mimo_cntrl_coefficient_size;
+static int hf_ieee80211_ff_mimo_cntrl_codebook_info;
+static int hf_ieee80211_ff_mimo_cntrl_remaining_matrix_segment;
+static int hf_ieee80211_ff_mimo_cntrl_reserved;
+static int hf_ieee80211_ff_mimo_cntrl_sounding_timestamp;
+
+static int hf_ieee80211_ff_ftm_param_delim1;
+static int hf_ieee80211_ff_ftm_param_status_indication;
+static int hf_ieee80211_ff_ftm_param_value;
+static int hf_ieee80211_ff_ftm_param_reserved1;
+static int hf_ieee80211_ff_ftm_param_burst_exponent;
+static int hf_ieee80211_ff_ftm_param_burst_duration;
+
+static int hf_ieee80211_ff_ftm_param_delim2;
+static int hf_ieee80211_ff_ftm_param_min_delta_ftm;
+static int hf_ieee80211_ff_ftm_param_partial_tsf_timer;
+static int hf_ieee80211_ff_ftm_param_partial_tsf_no_pref;
+static int hf_ieee80211_ff_ftm_param_asap_capable;
+static int hf_ieee80211_ff_ftm_param_asap;
+static int hf_ieee80211_ff_ftm_param_ftm_per_burst;
+
+static int hf_ieee80211_ff_ftm_param_delim3;
+static int hf_ieee80211_ff_ftm_param_reserved2;
+static int hf_ieee80211_ff_ftm_param_format_and_bw;
+static int hf_ieee80211_ff_ftm_param_burst_period;
 
 /* az D3.0 introduces a 1-octet TOD Error field; use a different name to avoid
  * conflicting with the existing hf_ieee80211_ff_ftm_tod_err (which is 2
  * octets).
  */
-static int hf_ieee80211_ff_ftm_tod_err1 = -1;
-static int hf_ieee80211_ff_ftm_max_tod_error_exponent = -1;
-static int hf_ieee80211_ff_ftm_tod_err_reserved = -1;
-static int hf_ieee80211_ff_ftm_tod_not_continuous = -1;
+static int hf_ieee80211_ff_ftm_tod_err1;
+static int hf_ieee80211_ff_ftm_max_tod_error_exponent;
+static int hf_ieee80211_ff_ftm_tod_err_reserved;
+static int hf_ieee80211_ff_ftm_tod_not_continuous;
 
 /* Same situation with ...toa_err1 as ...tod_err1 */
-static int hf_ieee80211_ff_ftm_toa_err1 = -1;
-static int hf_ieee80211_ff_ftm_max_toa_error_exponent = -1;
-static int hf_ieee80211_ff_ftm_toa_err_reserved = -1;
-static int hf_ieee80211_ff_ftm_invalid_measurement = -1;
-static int hf_ieee80211_ff_ftm_toa_type = -1;
+static int hf_ieee80211_ff_ftm_toa_err1;
+static int hf_ieee80211_ff_ftm_max_toa_error_exponent;
+static int hf_ieee80211_ff_ftm_toa_err_reserved;
+static int hf_ieee80211_ff_ftm_invalid_measurement;
+static int hf_ieee80211_ff_ftm_toa_type;
 
-static int hf_ieee80211_ff_ftm_cfo = -1;
-static int hf_ieee80211_ff_ftm_r2i_ndp_tx_power = -1;
-static int hf_ieee80211_ff_ftm_i2r_ndp_target_rssi = -1;
+static int hf_ieee80211_ff_ftm_cfo;
+static int hf_ieee80211_ff_ftm_r2i_ndp_tx_power;
+static int hf_ieee80211_ff_ftm_i2r_ndp_target_rssi;
 
 /* az: FTM Ranging Parameters Element */
-static int hf_ieee80211_tag_ranging_parameters = -1;
-static int hf_ieee80211_tag_ranging_subelt_tag = -1;
-static int hf_ieee80211_tag_ranging_subelt_len = -1;
-static int hf_ieee80211_tag_ranging_status_indication = -1;
-static int hf_ieee80211_tag_ranging_value = -1;
-static int hf_ieee80211_tag_ranging_i2r_lmr_feedback = -1;
-static int hf_ieee80211_tag_ranging_secure_ltf_required = -1;
-static int hf_ieee80211_tag_ranging_secure_ltf_support = -1;
-static int hf_ieee80211_tag_ranging_ranging_priority = -1;
-static int hf_ieee80211_tag_ranging_r2i_toa_type = -1;
-static int hf_ieee80211_tag_ranging_i2r_toa_type = -1;
-static int hf_ieee80211_tag_ranging_r2i_aoa_requested = -1;
-static int hf_ieee80211_tag_ranging_i2r_aoa_requested = -1;
-static int hf_ieee80211_tag_ranging_format_and_bandwidth = -1;
-static int hf_ieee80211_tag_ranging_immediate_r2i_feedback = -1;
-static int hf_ieee80211_tag_ranging_immediate_i2r_feedback = -1;
-static int hf_ieee80211_tag_ranging_max_i2r_repetition = -1;
-static int hf_ieee80211_tag_ranging_max_r2i_repetition = -1;
-static int hf_ieee80211_tag_ranging_reserved1 = -1;
-static int hf_ieee80211_tag_ranging_reserved2 = -1;
-static int hf_ieee80211_tag_ranging_max_r2i_sts_le_80_mhz = -1;
-static int hf_ieee80211_tag_ranging_max_r2i_sts_gt_80_mhz = -1;
-static int hf_ieee80211_tag_ranging_max_r2i_ltf_total = -1;
-static int hf_ieee80211_tag_ranging_max_i2r_ltf_total = -1;
-static int hf_ieee80211_tag_ranging_max_i2r_sts_le_80_mhz = -1;
-static int hf_ieee80211_tag_ranging_max_i2r_sts_gt_80_mhz = -1;
-static int hf_ieee80211_tag_ranging_bss_color_info = -1;
+static int hf_ieee80211_tag_ranging_parameters;
+static int hf_ieee80211_tag_ranging_subelt_tag;
+static int hf_ieee80211_tag_ranging_subelt_len;
+static int hf_ieee80211_tag_ranging_status_indication;
+static int hf_ieee80211_tag_ranging_value;
+static int hf_ieee80211_tag_ranging_i2r_lmr_feedback;
+static int hf_ieee80211_tag_ranging_secure_ltf_required;
+static int hf_ieee80211_tag_ranging_secure_ltf_support;
+static int hf_ieee80211_tag_ranging_ranging_priority;
+static int hf_ieee80211_tag_ranging_r2i_toa_type;
+static int hf_ieee80211_tag_ranging_i2r_toa_type;
+static int hf_ieee80211_tag_ranging_r2i_aoa_requested;
+static int hf_ieee80211_tag_ranging_i2r_aoa_requested;
+static int hf_ieee80211_tag_ranging_format_and_bandwidth;
+static int hf_ieee80211_tag_ranging_immediate_r2i_feedback;
+static int hf_ieee80211_tag_ranging_immediate_i2r_feedback;
+static int hf_ieee80211_tag_ranging_max_i2r_repetition;
+static int hf_ieee80211_tag_ranging_max_r2i_repetition;
+static int hf_ieee80211_tag_ranging_reserved1;
+static int hf_ieee80211_tag_ranging_reserved2;
+static int hf_ieee80211_tag_ranging_max_r2i_sts_le_80_mhz;
+static int hf_ieee80211_tag_ranging_max_r2i_sts_gt_80_mhz;
+static int hf_ieee80211_tag_ranging_max_r2i_ltf_total;
+static int hf_ieee80211_tag_ranging_max_i2r_ltf_total;
+static int hf_ieee80211_tag_ranging_max_i2r_sts_le_80_mhz;
+static int hf_ieee80211_tag_ranging_max_i2r_sts_gt_80_mhz;
+static int hf_ieee80211_tag_ranging_bss_color_info;
 
 /* az: FTM Ranging Parameters NTB-specific subelement */
-static int hf_ieee80211_tag_ranging_ntb = -1;
-static int hf_ieee80211_tag_ranging_ntb_reserved1 = -1;
-static int hf_ieee80211_tag_ranging_ntb_min_time_msmts = -1;
-static int hf_ieee80211_tag_ranging_ntb_max_time_msmts = -1;
-static int hf_ieee80211_tag_ranging_ntb_r2i_tx_power = -1;
-static int hf_ieee80211_tag_ranging_ntb_i2r_tx_power = -1;
-static int hf_ieee80211_tag_ranging_ntb_reserved2 = -1;
+static int hf_ieee80211_tag_ranging_ntb;
+static int hf_ieee80211_tag_ranging_ntb_reserved1;
+static int hf_ieee80211_tag_ranging_ntb_min_time_msmts;
+static int hf_ieee80211_tag_ranging_ntb_max_time_msmts;
+static int hf_ieee80211_tag_ranging_ntb_r2i_tx_power;
+static int hf_ieee80211_tag_ranging_ntb_i2r_tx_power;
+static int hf_ieee80211_tag_ranging_ntb_reserved2;
 
 /* az: FTM Ranging Specific TB subelement */
-static int hf_ieee80211_tag_ranging_aid_rsid = -1;
-static int hf_ieee80211_tag_ranging_device_class = -1;
-static int hf_ieee80211_tag_ranging_full_bw_ul_mu_mimo = -1;
-static int hf_ieee80211_tag_ranging_trigger_frame_paddur = -1;
-static int hf_ieee80211_tag_ranging_max_sess_exp = -1;
-static int hf_ieee80211_tag_ranging_passive_tb_ranging = -1;
-static int hf_ieee80211_tag_ranging_tb_specific_reserved = -1;
+static int hf_ieee80211_tag_ranging_aid_rsid;
+static int hf_ieee80211_tag_ranging_device_class;
+static int hf_ieee80211_tag_ranging_full_bw_ul_mu_mimo;
+static int hf_ieee80211_tag_ranging_trigger_frame_paddur;
+static int hf_ieee80211_tag_ranging_max_sess_exp;
+static int hf_ieee80211_tag_ranging_passive_tb_ranging;
+static int hf_ieee80211_tag_ranging_tb_specific_reserved;
 
 /* az: PASN subelements etc. */
-static int hf_ieee80211_tag_pasn_parameters_control = -1;
-static int hf_ieee80211_tag_pasn_params_comeback_info_present = -1;
-static int hf_ieee80211_tag_pasn_params_group_and_key_present = -1;
-static int hf_ieee80211_tag_pasn_parameters_reserved = -1;
-static int hf_ieee80211_tag_pasn_parameters_wrapped_fmt = -1;
-static int hf_ieee80211_tag_pasn_comeback_after = -1;
-static int hf_ieee80211_tag_pasn_cookie_length = -1;
-static int hf_ieee80211_tag_pasn_cookie = -1;
-static int hf_ieee80211_tag_pasn_finite_cyclic_group_id = -1;
-static int hf_ieee80211_tag_pasn_ephemeral_public_key_len = -1;
-static int hf_ieee80211_tag_pasn_ephemeral_public_key = -1;
-static int hf_ieee80211_pasn_auth1_frame_len = -1;
-static int hf_ieee80211_pasn_auth2_frame_len = -1;
+static int hf_ieee80211_tag_pasn_parameters_control;
+static int hf_ieee80211_tag_pasn_params_comeback_info_present;
+static int hf_ieee80211_tag_pasn_params_group_and_key_present;
+static int hf_ieee80211_tag_pasn_parameters_reserved;
+static int hf_ieee80211_tag_pasn_parameters_wrapped_fmt;
+static int hf_ieee80211_tag_pasn_comeback_after;
+static int hf_ieee80211_tag_pasn_cookie_length;
+static int hf_ieee80211_tag_pasn_cookie;
+static int hf_ieee80211_tag_pasn_finite_cyclic_group_id;
+static int hf_ieee80211_tag_pasn_ephemeral_public_key_len;
+static int hf_ieee80211_tag_pasn_ephemeral_public_key;
+static int hf_ieee80211_pasn_auth1_frame_len;
+static int hf_ieee80211_pasn_auth2_frame_len;
 
 /* az: Secure LTF Parameters */
-static int hf_ieee80211_tag_secure_ltf_params_counter = -1;
-static int hf_ieee80211_tag_secure_ltf_generation_sac = -1;
-static int hf_ieee80211_tag_secure_ltf_management_sac = -1;
-static int hf_ieee80211_tag_secure_ltf_result_ltf_ofs = -1;
+static int hf_ieee80211_tag_secure_ltf_params_counter;
+static int hf_ieee80211_tag_secure_ltf_generation_sac;
+static int hf_ieee80211_tag_secure_ltf_management_sac;
+static int hf_ieee80211_tag_secure_ltf_result_ltf_ofs;
 
 /* az: ista and rsta availability details */
-static int hf_ieee80211_ftm_ista_availability_count = -1;
-static int hf_ieee80211_ftm_ista_availability_reserved = -1;
-static int hf_ieee80211_ftm_ista_avail_bits = -1;
-static int hf_ieee80211_ftm_ista_avail_pad = -1;
-
-static int hf_ieee80211_ftm_rsta_header = -1;
-static int hf_ieee80211_ftm_rsta_count = -1;
-static int hf_ieee80211_ftm_rsta_avail_window_bcast_fmt = -1;
-static int hf_ieee80211_ftm_rsta_partial_tsf_timer1 = -1;
-static int hf_ieee80211_ftm_rsta_duration1 = -1;
-static int hf_ieee80211_ftm_rsta_passive_tb_ranging_reserved1 = -1;
-static int hf_ieee80211_ftm_rsta_periodicity1 = -1;
-static int hf_ieee80211_ftm_rsta_partial_tsf_timer = -1;
-static int hf_ieee80211_ftm_rsta_duration = -1;
-static int hf_ieee80211_ftm_rsta_passive_tb_ranging_reserved = -1;
-static int hf_ieee80211_ftm_rsta_periodicity = -1;
-static int hf_ieee80211_ftm_rsta_format_and_bandwidth = -1;
-static int hf_ieee80211_ftm_rsta_reserved = -1;
-static int hf_ieee80211_ftm_rsta_avail_subfield_short = -1;
-static int hf_ieee80211_ftm_rsta_avail_subfield_long = -1;
+static int hf_ieee80211_ftm_ista_availability_count;
+static int hf_ieee80211_ftm_ista_availability_reserved;
+static int hf_ieee80211_ftm_ista_avail_bits;
+static int hf_ieee80211_ftm_ista_avail_pad;
+
+static int hf_ieee80211_ftm_rsta_header;
+static int hf_ieee80211_ftm_rsta_count;
+static int hf_ieee80211_ftm_rsta_avail_window_bcast_fmt;
+static int hf_ieee80211_ftm_rsta_partial_tsf_timer1;
+static int hf_ieee80211_ftm_rsta_duration1;
+static int hf_ieee80211_ftm_rsta_passive_tb_ranging_reserved1;
+static int hf_ieee80211_ftm_rsta_periodicity1;
+static int hf_ieee80211_ftm_rsta_partial_tsf_timer;
+static int hf_ieee80211_ftm_rsta_duration;
+static int hf_ieee80211_ftm_rsta_passive_tb_ranging_reserved;
+static int hf_ieee80211_ftm_rsta_periodicity;
+static int hf_ieee80211_ftm_rsta_format_and_bandwidth;
+static int hf_ieee80211_ftm_rsta_reserved;
+static int hf_ieee80211_ftm_rsta_avail_subfield_short;
+static int hf_ieee80211_ftm_rsta_avail_subfield_long;
 
 /* be: Multi-link elements and other fields */
-static int hf_ieee80211_eht_multi_link_control = -1;
-static int hf_ieee80211_eht_multi_link_control_type = -1;
-static int hf_ieee80211_eht_multi_link_control_reserved = -1;
-static int hf_ieee80211_eht_multi_link_control_link_id_present = -1;
-static int hf_ieee80211_eht_multi_link_control_bss_parms_ch_count = -1;
-static int hf_ieee80211_eht_multi_link_control_medium_sync_delay = -1;
-static int hf_ieee80211_eht_multi_link_control_eml_capa = -1;
-static int hf_ieee80211_eht_multi_link_control_mld_capa = -1;
-static int hf_ieee80211_eht_multi_link_control_basic_mld_id_present = -1;
-static int hf_ieee80211_eht_multi_link_control_ext_mld_capa = -1;
-static int hf_ieee80211_eht_multi_link_control_bitmap_reserved = -1;
-static int hf_ieee80211_eht_multi_link_control_probe_mld_id_present = -1;
-static int hf_ieee80211_eht_multi_link_control_probe_reserved = -1;
-static int hf_ieee80211_eht_multi_link_control_reconfig_mld_mac = -1;
-static int hf_ieee80211_eht_multi_link_control_reconfig_eml_capa = -1;
-static int hf_ieee80211_eht_multi_link_control_reconfig_mld_capa_oper = -1;
-static int hf_ieee80211_eht_multi_link_control_reconfig_reserved = -1;
-static int hf_ieee80211_eht_multi_link_control_tdls_reserved = -1;
-static int hf_ieee80211_eht_multi_link_control_prio_access_reserved = -1;
-static int hf_ieee80211_eht_common_field_length = -1;
-static int hf_ieee80211_eht_common_field_mld_mac = -1;
-static int hf_ieee80211_eht_common_field_link_id_field = -1;
-static int hf_ieee80211_eht_common_info_link_id = -1;
-static int hf_ieee80211_eht_common_info_link_id_reserved = -1;
-static int hf_ieee80211_eht_common_field_bss_param_change_count = -1;
-static int hf_ieee80211_eht_common_field_medium_sync_field = -1;
-static int hf_ieee80211_eht_common_info_medium_sync_duration = -1;
-static int hf_ieee80211_eht_common_info_medium_sync_threshold = -1;
-static int hf_ieee80211_eht_common_info_medium_sync_max_txops = -1;
-static int hf_ieee80211_eht_common_field_eml_capabilities = -1;
-static int hf_ieee80211_eht_common_info_eml_capa_emlsr_support = -1;
-static int hf_ieee80211_eht_common_info_eml_capa_emlsr_padding_delay = -1;
-static int hf_ieee80211_eht_common_info_eml_capa_emlsr_transition_delay = -1;
-static int hf_ieee80211_eht_common_info_eml_capa_emlmr_support = -1;
-static int hf_ieee80211_eht_common_info_eml_capa_emlmr_delay = -1;
-static int hf_ieee80211_eht_common_info_eml_capa_transition_timeout = -1;
-static int hf_ieee80211_eht_common_info_eml_capa_reserved = -1;
-static int hf_ieee80211_eht_common_field_mld_capabilities = -1;
-static int hf_ieee80211_eht_common_info_mld_max_simul_links = -1;
-static int hf_ieee80211_eht_common_info_mld_srs_support = -1;
-static int hf_ieee80211_eht_common_info_mld_tid_to_link_map_neg = -1;
-static int hf_ieee80211_eht_common_info_mld_freq_sep_for_str = -1;
-static int hf_ieee80211_eht_common_info_mld_aar_support = -1;
-static int hf_ieee80211_eht_common_info_mld_link_reconf_op_support = -1;
-static int hf_ieee80211_eht_common_info_mld_aligned_twt_support = -1;
-static int hf_ieee80211_eht_common_info_mld_reserved = -1;
-static int hf_ieee80211_eht_common_field_mld_id = -1;
-static int hf_ieee80211_eht_common_field_ap_mld_mac = -1;
-static int hf_ieee80211_eht_common_field_ext_mld_capabilities = -1;
-static int hf_ieee80211_eht_common_info_ext_mld_op_update_support = -1;
-static int hf_ieee80211_eht_common_info_ext_mld_max_simul_links = -1;
-static int hf_ieee80211_eht_common_info_ext_mld_reserved = -1;
-static int hf_ieee80211_eht_multi_link_subelt_tag = -1;
-static int hf_ieee80211_eht_multi_link_subelt_len = -1;
-static int hf_ieee80211_eht_multi_link_type_0_link_count = -1;
-static int hf_ieee80211_eht_multi_link_type_1_link_count = -1;
-static int hf_ieee80211_eht_multi_link_type_2_link_count = -1;
-static int hf_ieee80211_eht_multi_link_type_3_link_count = -1;
-static int hf_ieee80211_eht_multi_link_type_4_link_count = -1;
-static int hf_ieee80211_eht_multi_link_link_id_list = -1;
-static int hf_ieee80211_eht_profile_sta_control = -1;
-static int hf_ieee80211_eht_profile_link_id = -1;
-static int hf_ieee80211_eht_profile_complete_profile = -1;
-static int hf_ieee80211_eht_profile_mac_address_present = -1;
-static int hf_ieee80211_eht_profile_beacon_interval_present = -1;
-static int hf_ieee80211_eht_profile_tsf_offset_present = -1;
-static int hf_ieee80211_eht_profile_dtim_info_present = -1;
-static int hf_ieee80211_eht_profile_nstr_link_pair_present = -1;
-static int hf_ieee80211_eht_profile_nstr_bitmap_size = -1;
-static int hf_ieee80211_eht_profile_bss_params_change_count_present = -1;
-static int hf_ieee80211_eht_profile_reserved = -1;
-static int hf_ieee80211_eht_profile_probe_reserved = -1;
-static int hf_ieee80211_eht_profile_removal_timer_present = -1;
-static int hf_ieee80211_eht_profile_reconfig_operation_type = -1;
-static int hf_ieee80211_eht_profile_operation_para_present = -1;
-static int hf_ieee80211_eht_profile_reconfig_nstr_bitmap_size = -1;
-static int hf_ieee80211_eht_profile_reconfig_reserved = -1;
-static int hf_ieee80211_eht_profile_prio_acc_reserved = -1;
-static int hf_ieee80211_eht_sta_profile_info_len = -1;
-static int hf_ieee80211_eht_sta_profile_info_mac = -1;
-static int hf_ieee80211_eht_sta_profile_info_beacon = -1;
-static int hf_ieee80211_eht_sta_profile_info_tsf_offset = -1;
-static int hf_ieee80211_eht_sta_profile_info_dtim_count = -1;
-static int hf_ieee80211_eht_sta_profile_info_dtim_period = -1;
-static int hf_ieee80211_eht_sta_profile_info_bitmap = -1;
-static int hf_ieee80211_eht_sta_profile_bss_params_change_count = -1;
-static int hf_ieee80211_eht_sta_profile_removal_timer = -1;
-static int hf_ieee80211_eht_sta_profile_presence_indi = -1;
-static int hf_ieee80211_eht_sta_profile_presence_indi_max_mpdu_length_present = -1;
-static int hf_ieee80211_eht_sta_profile_presence_indi_max_amsdu_length_present = -1;
-static int hf_ieee80211_eht_sta_profile_presence_indi_reserved = -1;
-static int hf_ieee80211_eht_sta_profile_operation_para_info = -1;
-static int hf_ieee80211_eht_sta_profile_operation_para_info_max_mpdu_length = -1;
-static int hf_ieee80211_eht_sta_profile_operation_para_info_amsdu_length = -1;
-static int hf_ieee80211_eht_sta_profile_operation_para_info_pad = -1;
-static int hf_ieee80211_eht_operation_parameters = -1;
-static int hf_ieee80211_eht_basic_eht_mcs_nss_set = -1;
-static int hf_ieee80211_eht_operation_control_chan_width = -1;
-static int hf_ieee80211_eht_operation_control_reserved = -1;
-static int hf_ieee80211_eht_operation_info_present = -1;
-static int hf_ieee80211_eht_operation_subchannel_bitmap_present = -1;
-static int hf_ieee80211_eht_operation_default_pe_duration = -1;
-static int hf_ieee80211_eht_operation_group_addressed_bu_indication_limit = -1;
-static int hf_ieee80211_eht_operation_group_addressed_bu_indication_exp = -1;
-static int hf_ieee80211_eht_operation_reserved = -1;
-static int hf_ieee80211_eht_operation_control = -1;
-static int hf_ieee80211_eht_operation_ccfs0 = -1;
-static int hf_ieee80211_eht_operation_ccfs1 = -1;
-static int hf_ieee80211_eht_operation_disabled_bitmap = -1;
-static int hf_ieee80211_eht_mac_capabilities = -1;
-static int hf_ieee80211_eht_mac_capa_epcs_prio_access_support = -1;
-static int hf_ieee80211_eht_mac_capa_eht_om_control_support = -1;
-static int hf_ieee80211_eht_mac_capa_trig_txop_sharing_mode_1_support = -1;
-static int hf_ieee80211_eht_mac_capa_trig_txop_sharing_mode_2_support = -1;
-static int hf_ieee80211_eht_mac_capa_restricted_twt_support = -1;
-static int hf_ieee80211_eht_mac_capa_scs_traffic_description_support = -1;
-static int hf_ieee80211_eht_mac_capa_maximum_mpdu_length = -1;
-static int hf_ieee80211_eht_mac_capa_maximum_ampdu_length_exp_ext = -1;
-static int hf_ieee80211_eht_mac_capa_eht_trs_support = -1;
-static int hf_ieee80211_eht_mac_capa_txop_return_support_txop_sha_mode = -1;
-static int hf_ieee80211_eht_mac_capa_two_bqrs_support = -1;
-static int hf_ieee80211_eht_mac_capa_eht_link_adaptation_support = -1;
-static int hf_ieee80211_eht_mac_capa_reserved = -1;
-static int hf_ieee80211_eht_phy_bits_0_15 = -1;
-static int hf_ieee80211_eht_phy_bits_0_15_reserved = -1;
-static int hf_ieee80211_eht_phy_bits_0_15_320_mhz_in_6ghz = -1;
-static int hf_ieee80211_eht_phy_bits_0_15_242_tone_ru_bw_wider_20mhz = -1;
-static int hf_ieee80211_eht_phy_bits_0_15_ndp_and_3_2_us_gi = -1;
-static int hf_ieee80211_eht_phy_bits_0_15_partial_bw_ul_mu_mimo = -1;
-static int hf_ieee80211_eht_phy_bits_0_15_su_beamformer = -1;
-static int hf_ieee80211_eht_phy_bits_0_15_su_beamformee = -1;
-static int hf_ieee80211_eht_phy_bits_0_15_su_beamformee_le_80mhz = -1;
-static int hf_ieee80211_eht_phy_bits_0_15_su_beamformee_eq_160mhz = -1;
-static int hf_ieee80211_eht_phy_bits_0_15_su_beamformee_eq_320mhz = -1;
-static int hf_ieee80211_eht_phy_bits_16_31 = -1;
-static int hf_ieee80211_eht_phy_bits_16_31_num_sounding_dims_lt_80mhz = -1;
-static int hf_ieee80211_eht_phy_bits_16_31_num_sounding_dims_eq_160mhz = -1;
-static int hf_ieee80211_eht_phy_bits_16_31_num_sounding_dims_eq_320mhz = -1;
-static int hf_ieee80211_eht_phy_bits_16_31_num_ng_eq_16_su_feedback = -1;
-static int hf_ieee80211_eht_phy_bits_16_31_num_ng_eq_16_mu_feedback = -1;
-static int hf_ieee80211_eht_phy_bits_16_31_codebook_size_4_2_su_fbck = -1;
-static int hf_ieee80211_eht_phy_bits_16_31_codebook_size_7_5_mu_fbck = -1;
-static int hf_ieee80211_eht_phy_bits_16_31_triggered_su_beemform_fbck = -1;
-static int hf_ieee80211_eht_phy_bits_16_31_triggered_mu_beemform_p_bw_fbck = -1;
-static int hf_ieee80211_eht_phy_bits_16_31_triggered_cqi_feedback = -1;
-static int hf_ieee80211_eht_phy_bits_32_39 = -1;
-static int hf_ieee80211_eht_phy_bits_32_39_partial_bw_dl_mu_mimo = -1;
-static int hf_ieee80211_eht_phy_bits_32_39_eht_psr_based_sr_support = -1;
-static int hf_ieee80211_eht_phy_bits_32_39_power_boost_factor_support = -1;
-static int hf_ieee80211_eht_phy_bits_32_39_eht_mu_ppdu_w_4x_eht_ltf_08_gi = -1;
-static int hf_ieee80211_eht_phy_bits_32_39_max_nc = -1;
-static int hf_ieee80211_eht_phy_bits_40_63 = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_non_triggered_cqi_fbck = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_tx_1024_4096_qam_lt_242_ru_support = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_rx_1024_4096_qam_lt_242_ru_support = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_ppe_thresholds_present = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_common_nominal_packet_padding = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_max_num_supported_eht_ltfs = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_support_of_mcx_15 = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_support_of_eht_dup_in_6_ghz = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_support_20_mhz_sta_ndp_wide_bw = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_non_ofdma_ul_mu_bw_le_80_mhz = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_non_ofdma_ul_mu_bw_eq_160_mhz = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_non_ofdma_ul_mu_bw_eq_320_mhz = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_mu_beamformer_bw_le_80_mhz = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_mu_beamformer_bw_eq_160_mhz = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_mu_beamformer_bw_eq_320_mhz = -1;
-static int hf_ieee80211_eht_phy_bits_40_63_tb_sounding_feedback_rate_limit = -1;
-static int hf_ieee80211_eht_phy_bits_64_71 = -1;
-static int hf_ieee80211_eht_phy_bits_64_71_rx_1024_qam_wid_bw_dl_ofdma_sup = -1;
-static int hf_ieee80211_eht_phy_bits_64_71_rx_4096_qam_wid_bw_dl_ofdma_sup = -1;
-static int hf_ieee80211_eht_phy_bits_64_71_reserved = -1;
-static int hf_ieee80211_eht_supported_mcs_nss_bytes = -1;
-static int hf_ieee80211_eht_mcs_and_nss_non_ap = -1;
-static int hf_ieee80211_eht_rx_max_nss_20mhz_0_7 = -1;
-static int hf_ieee80211_eht_tx_max_nss_20mhz_0_7 = -1;
-static int hf_ieee80211_eht_rx_max_nss_20mhz_8_9 = -1;
-static int hf_ieee80211_eht_tx_max_nss_20mhz_8_9 = -1;
-static int hf_ieee80211_eht_rx_max_nss_20mhz_10_11 = -1;
-static int hf_ieee80211_eht_tx_max_nss_20mhz_10_11 = -1;
-static int hf_ieee80211_eht_rx_max_nss_20mhz_12_13 = -1;
-static int hf_ieee80211_eht_tx_max_nss_20mhz_12_13 = -1;
-static int hf_ieee80211_eht_le_80_rx_max_nss_0_9 = -1;
-static int hf_ieee80211_eht_le_80_tx_max_nss_0_9 = -1;
-static int hf_ieee80211_eht_le_80_rx_max_nss_10_11 = -1;
-static int hf_ieee80211_eht_le_80_tx_max_nss_10_11 = -1;
-static int hf_ieee80211_eht_le_80_rx_max_nss_12_13 = -1;
-static int hf_ieee80211_eht_le_80_tx_max_nss_12_13 = -1;
-static int hf_ieee80211_eht_160_rx_max_nss_0_9 = -1;
-static int hf_ieee80211_eht_160_tx_max_nss_0_9 = -1;
-static int hf_ieee80211_eht_160_rx_max_nss_10_11 = -1;
-static int hf_ieee80211_eht_160_tx_max_nss_10_11 = -1;
-static int hf_ieee80211_eht_160_rx_max_nss_12_13 = -1;
-static int hf_ieee80211_eht_160_tx_max_nss_12_13 = -1;
-static int hf_ieee80211_eht_320_rx_max_nss_0_9 = -1;
-static int hf_ieee80211_eht_320_tx_max_nss_0_9 = -1;
-static int hf_ieee80211_eht_320_rx_max_nss_10_11 = -1;
-static int hf_ieee80211_eht_320_tx_max_nss_10_11 = -1;
-static int hf_ieee80211_eht_320_rx_max_nss_12_13 = -1;
-static int hf_ieee80211_eht_320_tx_max_nss_12_13 = -1;
-static int hf_ieee80211_eht_mcs_and_nss_le_80mhz = -1;
-static int hf_ieee80211_eht_mcs_and_nss_eq_160mhz = -1;
-static int hf_ieee80211_eht_mcs_and_nss_eq_320mhz = -1;
-static int hf_ieee80211_eht_ppe_thresholds = -1;
-static int hf_ieee80211_eht_ttl_mapping_control = -1;
-static int hf_ieee80211_eht_ttl_mapping_direction = -1;
-static int hf_ieee80211_eht_ttl_default_link_mapping = -1;
-static int hf_ieee80211_eht_ttl_mapping_switch_time_pres = -1;
-static int hf_ieee80211_eht_ttl_expected_dura_pres = -1;
-static int hf_ieee80211_eht_ttl_link_mapping_size = -1;
-static int hf_ieee80211_eht_ttl_mapping_reserved = -1;
-static int hf_ieee80211_eht_ttl_mapping_presence = -1;
-static int hf_ieee80211_eht_ttl_mapping_switch_time = -1;
-static int hf_ieee80211_eht_ttl_mapping_expected_duration = -1;
-static int hf_ieee80211_eht_ttl_mapping_tid_0_link_mapping = -1;
-static int hf_ieee80211_eht_ttl_mapping_tid_1_link_mapping = -1;
-static int hf_ieee80211_eht_ttl_mapping_tid_2_link_mapping = -1;
-static int hf_ieee80211_eht_ttl_mapping_tid_3_link_mapping = -1;
-static int hf_ieee80211_eht_ttl_mapping_tid_4_link_mapping = -1;
-static int hf_ieee80211_eht_ttl_mapping_tid_5_link_mapping = -1;
-static int hf_ieee80211_eht_ttl_mapping_tid_6_link_mapping = -1;
-static int hf_ieee80211_eht_ttl_mapping_tid_7_link_mapping = -1;
-static int hf_ieee80211_eht_multi_link_traffic_control = -1;
-static int hf_ieee80211_eht_multi_link_tc_bitmap_size = -1;
-static int hf_ieee80211_eht_multi_link_tc_aid_offset = -1;
-static int hf_ieee80211_eht_multi_link_tc_reserved = -1;
-static int hf_ieee80211_eht_multi_link_traffic_indication = -1;
-static int hf_ieee80211_eht_qos_chars_dirn = -1;
-static int hf_ieee80211_eht_qos_chars_tid = -1;
-static int hf_ieee80211_eht_qos_chars_user_prio = -1;
-static int hf_ieee80211_eht_qos_chars_bitmap = -1;
-static int hf_ieee80211_eht_qos_chars_linkid = -1;
-static int hf_ieee80211_eht_qos_chars_resrvd = -1;
-static int hf_ieee80211_eht_qos_chars_min_svc_interval = -1;
-static int hf_ieee80211_eht_qos_chars_max_svc_interval = -1;
-static int hf_ieee80211_eht_qos_chars_min_data_rate = -1;
-static int hf_ieee80211_eht_qos_chars_delay_bound = -1;
-static int hf_ieee80211_eht_qos_chars_max_msdu_size = -1;
-static int hf_ieee80211_eht_qos_chars_service_start_time = -1;
-static int hf_ieee80211_eht_qos_chars_service_start_time_linkid = -1;
-static int hf_ieee80211_eht_qos_chars_mean_data_rate = -1;
-static int hf_ieee80211_eht_qos_chars_burst_size = -1;
-static int hf_ieee80211_eht_qos_chars_msdu_lifetime = -1;
-static int hf_ieee80211_eht_qos_chars_msdu_delivery_ratio = -1;
-static int hf_ieee80211_eht_qos_chars_msdu_count_exponent = -1;
-static int hf_ieee80211_eht_qos_chars_medium_time = -1;
-static int hf_ieee80211_eht_link_id_bitmap = -1;
-static int hf_ieee80211_eht_aid_bitmap_length = -1;
-static int hf_ieee80211_eht_aid_bitmap_control = -1;
-static int hf_ieee80211_eht_aid_bitmap_control_reserved = -1;
-static int hf_ieee80211_eht_aid_bitmap_control_offset = -1;
-static int hf_ieee80211_eht_aid_bitmap_partial_aid_bitmap = -1;
-static int hf_ieee80211_eht_aid_bitmap_aid = -1;
-static int hf_ieee80211_eht_bw_indi_param = -1;
-static int hf_ieee80211_eht_bw_indi_param_reserved = -1;
-static int hf_ieee80211_eht_bw_indi_param_disabled_subchan_bitmap = -1;
-static int hf_ieee80211_eht_bw_indi_param_reserved1 = -1;
-static int hf_ieee80211_eht_bw_indi_diabled_bitmap = -1;
-static int hf_ieee80211_eht_mimo_ctrl_field = -1;
-static int hf_ieee80211_eht_mimo_ctrl_nc_index = -1;
-static int hf_ieee80211_eht_mimo_ctrl_nr_index = -1;
-static int hf_ieee80211_eht_mimo_ctrl_bw = -1;
-static int hf_ieee80211_eht_mimo_ctrl_grouping = -1;
-static int hf_ieee80211_eht_mimo_ctrl_feedback_type = -1;
-static int hf_ieee80211_eht_mimo_ctrl_reserved1 = -1;
-static int hf_ieee80211_eht_mimo_ctrl_remaining_feedback_segments = -1;
-static int hf_ieee80211_eht_mimo_ctrl_first_feedback_segment = -1;
-static int hf_ieee80211_eht_mimo_ctrl_partial_bw_info = -1;
-static int hf_ieee80211_eht_mimo_ctrl_sounding_dialog_token_number = -1;
-static int hf_ieee80211_eht_mimo_ctrl_codebook_info = -1;
-static int hf_ieee80211_eht_mimo_ctrl_reserved2 = -1;
+static int hf_ieee80211_eht_multi_link_control;
+static int hf_ieee80211_eht_multi_link_control_type;
+static int hf_ieee80211_eht_multi_link_control_reserved;
+static int hf_ieee80211_eht_multi_link_control_link_id_present;
+static int hf_ieee80211_eht_multi_link_control_bss_parms_ch_count;
+static int hf_ieee80211_eht_multi_link_control_medium_sync_delay;
+static int hf_ieee80211_eht_multi_link_control_eml_capa;
+static int hf_ieee80211_eht_multi_link_control_mld_capa;
+static int hf_ieee80211_eht_multi_link_control_basic_mld_id_present;
+static int hf_ieee80211_eht_multi_link_control_ext_mld_capa;
+static int hf_ieee80211_eht_multi_link_control_bitmap_reserved;
+static int hf_ieee80211_eht_multi_link_control_probe_mld_id_present;
+static int hf_ieee80211_eht_multi_link_control_probe_reserved;
+static int hf_ieee80211_eht_multi_link_control_reconfig_mld_mac;
+static int hf_ieee80211_eht_multi_link_control_reconfig_eml_capa;
+static int hf_ieee80211_eht_multi_link_control_reconfig_mld_capa_oper;
+static int hf_ieee80211_eht_multi_link_control_reconfig_reserved;
+static int hf_ieee80211_eht_multi_link_control_tdls_reserved;
+static int hf_ieee80211_eht_multi_link_control_prio_access_reserved;
+static int hf_ieee80211_eht_common_field_length;
+static int hf_ieee80211_eht_common_field_mld_mac;
+static int hf_ieee80211_eht_common_field_link_id_field;
+static int hf_ieee80211_eht_common_info_link_id;
+static int hf_ieee80211_eht_common_info_link_id_reserved;
+static int hf_ieee80211_eht_common_field_bss_param_change_count;
+static int hf_ieee80211_eht_common_field_medium_sync_field;
+static int hf_ieee80211_eht_common_info_medium_sync_duration;
+static int hf_ieee80211_eht_common_info_medium_sync_threshold;
+static int hf_ieee80211_eht_common_info_medium_sync_max_txops;
+static int hf_ieee80211_eht_common_field_eml_capabilities;
+static int hf_ieee80211_eht_common_info_eml_capa_emlsr_support;
+static int hf_ieee80211_eht_common_info_eml_capa_emlsr_padding_delay;
+static int hf_ieee80211_eht_common_info_eml_capa_emlsr_transition_delay;
+static int hf_ieee80211_eht_common_info_eml_capa_emlmr_support;
+static int hf_ieee80211_eht_common_info_eml_capa_emlmr_delay;
+static int hf_ieee80211_eht_common_info_eml_capa_transition_timeout;
+static int hf_ieee80211_eht_common_info_eml_capa_reserved;
+static int hf_ieee80211_eht_common_field_mld_capabilities;
+static int hf_ieee80211_eht_common_info_mld_max_simul_links;
+static int hf_ieee80211_eht_common_info_mld_srs_support;
+static int hf_ieee80211_eht_common_info_mld_tid_to_link_map_neg;
+static int hf_ieee80211_eht_common_info_mld_freq_sep_for_str;
+static int hf_ieee80211_eht_common_info_mld_aar_support;
+static int hf_ieee80211_eht_common_info_mld_link_reconf_op_support;
+static int hf_ieee80211_eht_common_info_mld_aligned_twt_support;
+static int hf_ieee80211_eht_common_info_mld_reserved;
+static int hf_ieee80211_eht_common_field_mld_id;
+static int hf_ieee80211_eht_common_field_ap_mld_mac;
+static int hf_ieee80211_eht_common_field_ext_mld_capabilities;
+static int hf_ieee80211_eht_common_info_ext_mld_op_update_support;
+static int hf_ieee80211_eht_common_info_ext_mld_max_simul_links;
+static int hf_ieee80211_eht_common_info_ext_mld_reserved;
+static int hf_ieee80211_eht_multi_link_subelt_tag;
+static int hf_ieee80211_eht_multi_link_subelt_len;
+static int hf_ieee80211_eht_multi_link_type_0_link_count;
+static int hf_ieee80211_eht_multi_link_type_1_link_count;
+static int hf_ieee80211_eht_multi_link_type_2_link_count;
+static int hf_ieee80211_eht_multi_link_type_3_link_count;
+static int hf_ieee80211_eht_multi_link_type_4_link_count;
+static int hf_ieee80211_eht_multi_link_link_id_list;
+static int hf_ieee80211_eht_profile_sta_control;
+static int hf_ieee80211_eht_profile_link_id;
+static int hf_ieee80211_eht_profile_complete_profile;
+static int hf_ieee80211_eht_profile_mac_address_present;
+static int hf_ieee80211_eht_profile_beacon_interval_present;
+static int hf_ieee80211_eht_profile_tsf_offset_present;
+static int hf_ieee80211_eht_profile_dtim_info_present;
+static int hf_ieee80211_eht_profile_nstr_link_pair_present;
+static int hf_ieee80211_eht_profile_nstr_bitmap_size;
+static int hf_ieee80211_eht_profile_bss_params_change_count_present;
+static int hf_ieee80211_eht_profile_reserved;
+static int hf_ieee80211_eht_profile_probe_reserved;
+static int hf_ieee80211_eht_profile_removal_timer_present;
+static int hf_ieee80211_eht_profile_reconfig_operation_type;
+static int hf_ieee80211_eht_profile_operation_para_present;
+static int hf_ieee80211_eht_profile_reconfig_nstr_bitmap_size;
+static int hf_ieee80211_eht_profile_reconfig_reserved;
+static int hf_ieee80211_eht_profile_prio_acc_reserved;
+static int hf_ieee80211_eht_sta_profile_info_len;
+static int hf_ieee80211_eht_sta_profile_info_mac;
+static int hf_ieee80211_eht_sta_profile_info_beacon;
+static int hf_ieee80211_eht_sta_profile_info_tsf_offset;
+static int hf_ieee80211_eht_sta_profile_info_dtim_count;
+static int hf_ieee80211_eht_sta_profile_info_dtim_period;
+static int hf_ieee80211_eht_sta_profile_info_bitmap;
+static int hf_ieee80211_eht_sta_profile_bss_params_change_count;
+static int hf_ieee80211_eht_sta_profile_removal_timer;
+static int hf_ieee80211_eht_sta_profile_presence_indi;
+static int hf_ieee80211_eht_sta_profile_presence_indi_max_mpdu_length_present;
+static int hf_ieee80211_eht_sta_profile_presence_indi_max_amsdu_length_present;
+static int hf_ieee80211_eht_sta_profile_presence_indi_reserved;
+static int hf_ieee80211_eht_sta_profile_operation_para_info;
+static int hf_ieee80211_eht_sta_profile_operation_para_info_max_mpdu_length;
+static int hf_ieee80211_eht_sta_profile_operation_para_info_amsdu_length;
+static int hf_ieee80211_eht_sta_profile_operation_para_info_pad;
+static int hf_ieee80211_eht_operation_parameters;
+static int hf_ieee80211_eht_basic_eht_mcs_nss_set;
+static int hf_ieee80211_eht_operation_control_chan_width;
+static int hf_ieee80211_eht_operation_control_reserved;
+static int hf_ieee80211_eht_operation_info_present;
+static int hf_ieee80211_eht_operation_subchannel_bitmap_present;
+static int hf_ieee80211_eht_operation_default_pe_duration;
+static int hf_ieee80211_eht_operation_group_addressed_bu_indication_limit;
+static int hf_ieee80211_eht_operation_group_addressed_bu_indication_exp;
+static int hf_ieee80211_eht_operation_reserved;
+static int hf_ieee80211_eht_operation_control;
+static int hf_ieee80211_eht_operation_ccfs0;
+static int hf_ieee80211_eht_operation_ccfs1;
+static int hf_ieee80211_eht_operation_disabled_bitmap;
+static int hf_ieee80211_eht_mac_capabilities;
+static int hf_ieee80211_eht_mac_capa_epcs_prio_access_support;
+static int hf_ieee80211_eht_mac_capa_eht_om_control_support;
+static int hf_ieee80211_eht_mac_capa_trig_txop_sharing_mode_1_support;
+static int hf_ieee80211_eht_mac_capa_trig_txop_sharing_mode_2_support;
+static int hf_ieee80211_eht_mac_capa_restricted_twt_support;
+static int hf_ieee80211_eht_mac_capa_scs_traffic_description_support;
+static int hf_ieee80211_eht_mac_capa_maximum_mpdu_length;
+static int hf_ieee80211_eht_mac_capa_maximum_ampdu_length_exp_ext;
+static int hf_ieee80211_eht_mac_capa_eht_trs_support;
+static int hf_ieee80211_eht_mac_capa_txop_return_support_txop_sha_mode;
+static int hf_ieee80211_eht_mac_capa_two_bqrs_support;
+static int hf_ieee80211_eht_mac_capa_eht_link_adaptation_support;
+static int hf_ieee80211_eht_mac_capa_reserved;
+static int hf_ieee80211_eht_phy_bits_0_15;
+static int hf_ieee80211_eht_phy_bits_0_15_reserved;
+static int hf_ieee80211_eht_phy_bits_0_15_320_mhz_in_6ghz;
+static int hf_ieee80211_eht_phy_bits_0_15_242_tone_ru_bw_wider_20mhz;
+static int hf_ieee80211_eht_phy_bits_0_15_ndp_and_3_2_us_gi;
+static int hf_ieee80211_eht_phy_bits_0_15_partial_bw_ul_mu_mimo;
+static int hf_ieee80211_eht_phy_bits_0_15_su_beamformer;
+static int hf_ieee80211_eht_phy_bits_0_15_su_beamformee;
+static int hf_ieee80211_eht_phy_bits_0_15_su_beamformee_le_80mhz;
+static int hf_ieee80211_eht_phy_bits_0_15_su_beamformee_eq_160mhz;
+static int hf_ieee80211_eht_phy_bits_0_15_su_beamformee_eq_320mhz;
+static int hf_ieee80211_eht_phy_bits_16_31;
+static int hf_ieee80211_eht_phy_bits_16_31_num_sounding_dims_lt_80mhz;
+static int hf_ieee80211_eht_phy_bits_16_31_num_sounding_dims_eq_160mhz;
+static int hf_ieee80211_eht_phy_bits_16_31_num_sounding_dims_eq_320mhz;
+static int hf_ieee80211_eht_phy_bits_16_31_num_ng_eq_16_su_feedback;
+static int hf_ieee80211_eht_phy_bits_16_31_num_ng_eq_16_mu_feedback;
+static int hf_ieee80211_eht_phy_bits_16_31_codebook_size_4_2_su_fbck;
+static int hf_ieee80211_eht_phy_bits_16_31_codebook_size_7_5_mu_fbck;
+static int hf_ieee80211_eht_phy_bits_16_31_triggered_su_beemform_fbck;
+static int hf_ieee80211_eht_phy_bits_16_31_triggered_mu_beemform_p_bw_fbck;
+static int hf_ieee80211_eht_phy_bits_16_31_triggered_cqi_feedback;
+static int hf_ieee80211_eht_phy_bits_32_39;
+static int hf_ieee80211_eht_phy_bits_32_39_partial_bw_dl_mu_mimo;
+static int hf_ieee80211_eht_phy_bits_32_39_eht_psr_based_sr_support;
+static int hf_ieee80211_eht_phy_bits_32_39_power_boost_factor_support;
+static int hf_ieee80211_eht_phy_bits_32_39_eht_mu_ppdu_w_4x_eht_ltf_08_gi;
+static int hf_ieee80211_eht_phy_bits_32_39_max_nc;
+static int hf_ieee80211_eht_phy_bits_40_63;
+static int hf_ieee80211_eht_phy_bits_40_63_non_triggered_cqi_fbck;
+static int hf_ieee80211_eht_phy_bits_40_63_tx_1024_4096_qam_lt_242_ru_support;
+static int hf_ieee80211_eht_phy_bits_40_63_rx_1024_4096_qam_lt_242_ru_support;
+static int hf_ieee80211_eht_phy_bits_40_63_ppe_thresholds_present;
+static int hf_ieee80211_eht_phy_bits_40_63_common_nominal_packet_padding;
+static int hf_ieee80211_eht_phy_bits_40_63_max_num_supported_eht_ltfs;
+static int hf_ieee80211_eht_phy_bits_40_63_support_of_mcx_15;
+static int hf_ieee80211_eht_phy_bits_40_63_support_of_eht_dup_in_6_ghz;
+static int hf_ieee80211_eht_phy_bits_40_63_support_20_mhz_sta_ndp_wide_bw;
+static int hf_ieee80211_eht_phy_bits_40_63_non_ofdma_ul_mu_bw_le_80_mhz;
+static int hf_ieee80211_eht_phy_bits_40_63_non_ofdma_ul_mu_bw_eq_160_mhz;
+static int hf_ieee80211_eht_phy_bits_40_63_non_ofdma_ul_mu_bw_eq_320_mhz;
+static int hf_ieee80211_eht_phy_bits_40_63_mu_beamformer_bw_le_80_mhz;
+static int hf_ieee80211_eht_phy_bits_40_63_mu_beamformer_bw_eq_160_mhz;
+static int hf_ieee80211_eht_phy_bits_40_63_mu_beamformer_bw_eq_320_mhz;
+static int hf_ieee80211_eht_phy_bits_40_63_tb_sounding_feedback_rate_limit;
+static int hf_ieee80211_eht_phy_bits_64_71;
+static int hf_ieee80211_eht_phy_bits_64_71_rx_1024_qam_wid_bw_dl_ofdma_sup;
+static int hf_ieee80211_eht_phy_bits_64_71_rx_4096_qam_wid_bw_dl_ofdma_sup;
+static int hf_ieee80211_eht_phy_bits_64_71_reserved;
+static int hf_ieee80211_eht_supported_mcs_nss_bytes;
+static int hf_ieee80211_eht_mcs_and_nss_non_ap;
+static int hf_ieee80211_eht_rx_max_nss_20mhz_0_7;
+static int hf_ieee80211_eht_tx_max_nss_20mhz_0_7;
+static int hf_ieee80211_eht_rx_max_nss_20mhz_8_9;
+static int hf_ieee80211_eht_tx_max_nss_20mhz_8_9;
+static int hf_ieee80211_eht_rx_max_nss_20mhz_10_11;
+static int hf_ieee80211_eht_tx_max_nss_20mhz_10_11;
+static int hf_ieee80211_eht_rx_max_nss_20mhz_12_13;
+static int hf_ieee80211_eht_tx_max_nss_20mhz_12_13;
+static int hf_ieee80211_eht_le_80_rx_max_nss_0_9;
+static int hf_ieee80211_eht_le_80_tx_max_nss_0_9;
+static int hf_ieee80211_eht_le_80_rx_max_nss_10_11;
+static int hf_ieee80211_eht_le_80_tx_max_nss_10_11;
+static int hf_ieee80211_eht_le_80_rx_max_nss_12_13;
+static int hf_ieee80211_eht_le_80_tx_max_nss_12_13;
+static int hf_ieee80211_eht_160_rx_max_nss_0_9;
+static int hf_ieee80211_eht_160_tx_max_nss_0_9;
+static int hf_ieee80211_eht_160_rx_max_nss_10_11;
+static int hf_ieee80211_eht_160_tx_max_nss_10_11;
+static int hf_ieee80211_eht_160_rx_max_nss_12_13;
+static int hf_ieee80211_eht_160_tx_max_nss_12_13;
+static int hf_ieee80211_eht_320_rx_max_nss_0_9;
+static int hf_ieee80211_eht_320_tx_max_nss_0_9;
+static int hf_ieee80211_eht_320_rx_max_nss_10_11;
+static int hf_ieee80211_eht_320_tx_max_nss_10_11;
+static int hf_ieee80211_eht_320_rx_max_nss_12_13;
+static int hf_ieee80211_eht_320_tx_max_nss_12_13;
+static int hf_ieee80211_eht_mcs_and_nss_le_80mhz;
+static int hf_ieee80211_eht_mcs_and_nss_eq_160mhz;
+static int hf_ieee80211_eht_mcs_and_nss_eq_320mhz;
+static int hf_ieee80211_eht_ppe_thresholds;
+static int hf_ieee80211_eht_ttl_mapping_control;
+static int hf_ieee80211_eht_ttl_mapping_direction;
+static int hf_ieee80211_eht_ttl_default_link_mapping;
+static int hf_ieee80211_eht_ttl_mapping_switch_time_pres;
+static int hf_ieee80211_eht_ttl_expected_dura_pres;
+static int hf_ieee80211_eht_ttl_link_mapping_size;
+static int hf_ieee80211_eht_ttl_mapping_reserved;
+static int hf_ieee80211_eht_ttl_mapping_presence;
+static int hf_ieee80211_eht_ttl_mapping_switch_time;
+static int hf_ieee80211_eht_ttl_mapping_expected_duration;
+static int hf_ieee80211_eht_ttl_mapping_tid_0_link_mapping;
+static int hf_ieee80211_eht_ttl_mapping_tid_1_link_mapping;
+static int hf_ieee80211_eht_ttl_mapping_tid_2_link_mapping;
+static int hf_ieee80211_eht_ttl_mapping_tid_3_link_mapping;
+static int hf_ieee80211_eht_ttl_mapping_tid_4_link_mapping;
+static int hf_ieee80211_eht_ttl_mapping_tid_5_link_mapping;
+static int hf_ieee80211_eht_ttl_mapping_tid_6_link_mapping;
+static int hf_ieee80211_eht_ttl_mapping_tid_7_link_mapping;
+static int hf_ieee80211_eht_multi_link_traffic_control;
+static int hf_ieee80211_eht_multi_link_tc_bitmap_size;
+static int hf_ieee80211_eht_multi_link_tc_aid_offset;
+static int hf_ieee80211_eht_multi_link_tc_reserved;
+static int hf_ieee80211_eht_multi_link_traffic_indication;
+static int hf_ieee80211_eht_qos_chars_dirn;
+static int hf_ieee80211_eht_qos_chars_tid;
+static int hf_ieee80211_eht_qos_chars_user_prio;
+static int hf_ieee80211_eht_qos_chars_bitmap;
+static int hf_ieee80211_eht_qos_chars_linkid;
+static int hf_ieee80211_eht_qos_chars_resrvd;
+static int hf_ieee80211_eht_qos_chars_min_svc_interval;
+static int hf_ieee80211_eht_qos_chars_max_svc_interval;
+static int hf_ieee80211_eht_qos_chars_min_data_rate;
+static int hf_ieee80211_eht_qos_chars_delay_bound;
+static int hf_ieee80211_eht_qos_chars_max_msdu_size;
+static int hf_ieee80211_eht_qos_chars_service_start_time;
+static int hf_ieee80211_eht_qos_chars_service_start_time_linkid;
+static int hf_ieee80211_eht_qos_chars_mean_data_rate;
+static int hf_ieee80211_eht_qos_chars_burst_size;
+static int hf_ieee80211_eht_qos_chars_msdu_lifetime;
+static int hf_ieee80211_eht_qos_chars_msdu_delivery_ratio;
+static int hf_ieee80211_eht_qos_chars_msdu_count_exponent;
+static int hf_ieee80211_eht_qos_chars_medium_time;
+static int hf_ieee80211_eht_link_id_bitmap;
+static int hf_ieee80211_eht_aid_bitmap_length;
+static int hf_ieee80211_eht_aid_bitmap_control;
+static int hf_ieee80211_eht_aid_bitmap_control_reserved;
+static int hf_ieee80211_eht_aid_bitmap_control_offset;
+static int hf_ieee80211_eht_aid_bitmap_partial_aid_bitmap;
+static int hf_ieee80211_eht_aid_bitmap_aid;
+static int hf_ieee80211_eht_bw_indi_param;
+static int hf_ieee80211_eht_bw_indi_param_reserved;
+static int hf_ieee80211_eht_bw_indi_param_disabled_subchan_bitmap;
+static int hf_ieee80211_eht_bw_indi_param_reserved1;
+static int hf_ieee80211_eht_bw_indi_diabled_bitmap;
+static int hf_ieee80211_eht_mimo_ctrl_field;
+static int hf_ieee80211_eht_mimo_ctrl_nc_index;
+static int hf_ieee80211_eht_mimo_ctrl_nr_index;
+static int hf_ieee80211_eht_mimo_ctrl_bw;
+static int hf_ieee80211_eht_mimo_ctrl_grouping;
+static int hf_ieee80211_eht_mimo_ctrl_feedback_type;
+static int hf_ieee80211_eht_mimo_ctrl_reserved1;
+static int hf_ieee80211_eht_mimo_ctrl_remaining_feedback_segments;
+static int hf_ieee80211_eht_mimo_ctrl_first_feedback_segment;
+static int hf_ieee80211_eht_mimo_ctrl_partial_bw_info;
+static int hf_ieee80211_eht_mimo_ctrl_sounding_dialog_token_number;
+static int hf_ieee80211_eht_mimo_ctrl_codebook_info;
+static int hf_ieee80211_eht_mimo_ctrl_reserved2;
 
 /* be: Compressed beamforming report etc */
-static int hf_ieee80211_eht_compressed_beamforming_report_snr = -1;
-static int hf_ieee80211_eht_compressed_beamform_scidx = -1;
+static int hf_ieee80211_eht_compressed_beamforming_report_snr;
+static int hf_ieee80211_eht_compressed_beamform_scidx;
 
 /* be: MU Exclusive beamforming report */
-static int hf_ieee80211_eht_mu_exclusive_beamforming_report_delta_snr = -1;
-
-static int hf_ieee80211_eht_eml_control_field = -1;
-static int hf_ieee80211_eht_eml_control_emlsr_mode = -1;
-static int hf_ieee80211_eht_eml_control_emlmr_mode = -1;
-static int hf_ieee80211_eht_eml_control_emlsr_para_update_control = -1;
-static int hf_ieee80211_eht_eml_control_device_coexist_activities = -1;
-static int hf_ieee80211_eht_eml_control_reserved = -1;
-static int hf_ieee80211_eht_eml_control_link_bitmap = -1;
-static int hf_ieee80211_eht_eml_control_link_enable_id = -1;
-static int hf_ieee80211_eht_eml_control_mcs_map_count = -1;
-static int hf_ieee80211_eht_eml_control_mcs_map_count_bw = -1;
-static int hf_ieee80211_eht_eml_control_mcs_map_count_reserved = -1;
-static int hf_ieee80211_eht_emlsr_para_update = -1;
-static int hf_ieee80211_eht_emlsr_para_update_padding_delay = -1;
-static int hf_ieee80211_eht_emlsr_para_update_tran_delay = -1;
-static int hf_ieee80211_eht_emlsr_para_update_reserved = -1;
-
-static int hf_ieee80211_ff_ant_selection = -1;
-static int hf_ieee80211_ff_ant_selection_0 = -1;
-static int hf_ieee80211_ff_ant_selection_1 = -1;
-static int hf_ieee80211_ff_ant_selection_2 = -1;
-static int hf_ieee80211_ff_ant_selection_3 = -1;
-static int hf_ieee80211_ff_ant_selection_4 = -1;
-static int hf_ieee80211_ff_ant_selection_5 = -1;
-static int hf_ieee80211_ff_ant_selection_6 = -1;
-static int hf_ieee80211_ff_ant_selection_7 = -1;
+static int hf_ieee80211_eht_mu_exclusive_beamforming_report_delta_snr;
+
+static int hf_ieee80211_eht_eml_control_field;
+static int hf_ieee80211_eht_eml_control_emlsr_mode;
+static int hf_ieee80211_eht_eml_control_emlmr_mode;
+static int hf_ieee80211_eht_eml_control_emlsr_para_update_control;
+static int hf_ieee80211_eht_eml_control_device_coexist_activities;
+static int hf_ieee80211_eht_eml_control_reserved;
+static int hf_ieee80211_eht_eml_control_link_bitmap;
+static int hf_ieee80211_eht_eml_control_link_enable_id;
+static int hf_ieee80211_eht_eml_control_mcs_map_count;
+static int hf_ieee80211_eht_eml_control_mcs_map_count_bw;
+static int hf_ieee80211_eht_eml_control_mcs_map_count_reserved;
+static int hf_ieee80211_eht_emlsr_para_update;
+static int hf_ieee80211_eht_emlsr_para_update_padding_delay;
+static int hf_ieee80211_eht_emlsr_para_update_tran_delay;
+static int hf_ieee80211_eht_emlsr_para_update_reserved;
+
+static int hf_ieee80211_ff_ant_selection;
+static int hf_ieee80211_ff_ant_selection_0;
+static int hf_ieee80211_ff_ant_selection_1;
+static int hf_ieee80211_ff_ant_selection_2;
+static int hf_ieee80211_ff_ant_selection_3;
+static int hf_ieee80211_ff_ant_selection_4;
+static int hf_ieee80211_ff_ant_selection_5;
+static int hf_ieee80211_ff_ant_selection_6;
+static int hf_ieee80211_ff_ant_selection_7;
 
 static int * const ieee80211_ff_ant_selection_fields[] = {
   &hf_ieee80211_ff_ant_selection_0,
@@ -4879,11 +4879,11 @@ static int * const ieee80211_ff_ant_selection_fields[] = {
   NULL
 };
 
-static int hf_ieee80211_ff_ext_channel_switch_announcement = -1;
-static int hf_ieee80211_ff_ext_channel_switch_announcement_switch_mode = -1;
-static int hf_ieee80211_ff_ext_channel_switch_announcement_new_ope_class = -1;
-static int hf_ieee80211_ff_ext_channel_switch_announcement_new_chan_number = -1;
-static int hf_ieee80211_ff_ext_channel_switch_announcement_switch_count = -1;
+static int hf_ieee80211_ff_ext_channel_switch_announcement;
+static int hf_ieee80211_ff_ext_channel_switch_announcement_switch_mode;
+static int hf_ieee80211_ff_ext_channel_switch_announcement_new_ope_class;
+static int hf_ieee80211_ff_ext_channel_switch_announcement_new_chan_number;
+static int hf_ieee80211_ff_ext_channel_switch_announcement_switch_count;
 
 static int * const ieee80211_ff_ext_channel_switch_announcement_fields[] = {
   &hf_ieee80211_ff_ext_channel_switch_announcement_switch_mode,
@@ -4893,11 +4893,11 @@ static int * const ieee80211_ff_ext_channel_switch_announcement_fields[] = {
   NULL
 };
 
-static int hf_ieee80211_ff_ht_info = -1;
-static int hf_ieee80211_ff_ht_info_information_request = -1;
-static int hf_ieee80211_ff_ht_info_40_mhz_intolerant = -1;
-static int hf_ieee80211_ff_ht_info_sta_chan_width = -1;
-static int hf_ieee80211_ff_ht_info_reserved = -1;
+static int hf_ieee80211_ff_ht_info;
+static int hf_ieee80211_ff_ht_info_information_request;
+static int hf_ieee80211_ff_ht_info_40_mhz_intolerant;
+static int hf_ieee80211_ff_ht_info_sta_chan_width;
+static int hf_ieee80211_ff_ht_info_reserved;
 
 static int * const ieee80211_ff_ht_info_fields[] = {
   &hf_ieee80211_ff_ht_info_information_request,
@@ -4907,241 +4907,241 @@ static int * const ieee80211_ff_ht_info_fields[] = {
   NULL
 };
 
-static int hf_ieee80211_ff_ht_action = -1;
+static int hf_ieee80211_ff_ht_action;
 
-static int hf_ieee80211_ff_psmp_sta_info = -1;
-static int hf_ieee80211_ff_psmp_sta_info_type = -1;
-static int hf_ieee80211_ff_psmp_sta_info_dtt_start_offset = -1;
-static int hf_ieee80211_ff_psmp_sta_info_dtt_duration = -1;
-static int hf_ieee80211_ff_psmp_sta_info_sta_id = -1;
-static int hf_ieee80211_ff_psmp_sta_info_utt_start_offset = -1;
-static int hf_ieee80211_ff_psmp_sta_info_utt_duration = -1;
-static int hf_ieee80211_ff_psmp_sta_info_reserved_small= -1;
-static int hf_ieee80211_ff_psmp_sta_info_reserved_large = -1;
-static int hf_ieee80211_ff_psmp_sta_info_psmp_multicast_id = -1;
+static int hf_ieee80211_ff_psmp_sta_info;
+static int hf_ieee80211_ff_psmp_sta_info_type;
+static int hf_ieee80211_ff_psmp_sta_info_dtt_start_offset;
+static int hf_ieee80211_ff_psmp_sta_info_dtt_duration;
+static int hf_ieee80211_ff_psmp_sta_info_sta_id;
+static int hf_ieee80211_ff_psmp_sta_info_utt_start_offset;
+static int hf_ieee80211_ff_psmp_sta_info_utt_duration;
+static int hf_ieee80211_ff_psmp_sta_info_reserved_small;
+static int hf_ieee80211_ff_psmp_sta_info_reserved_large;
+static int hf_ieee80211_ff_psmp_sta_info_psmp_multicast_id;
 
-static int hf_ieee80211_ff_mimo_csi_snr = -1;
-static int hf_ieee80211_ff_mimo_csi_matrices = -1;
-static int hf_ieee80211_ff_mimo_csi_bf_matrices = -1;
-static int hf_ieee80211_ff_mimo_csi_cbf_matrices = -1;
+static int hf_ieee80211_ff_mimo_csi_snr;
+static int hf_ieee80211_ff_mimo_csi_matrices;
+static int hf_ieee80211_ff_mimo_csi_bf_matrices;
+static int hf_ieee80211_ff_mimo_csi_cbf_matrices;
 
 /*** Begin: 802.11s additions ***/
-static int hf_ieee80211_mesh_control_field = -1;
-
-static int hf_ieee80211_ff_mesh_action = -1;
-static int hf_ieee80211_ff_multihop_action = -1;
-static int hf_ieee80211_ff_mesh_flags = -1;
-static int hf_ieee80211_ff_mesh_ttl = -1;
-static int hf_ieee80211_ff_mesh_sequence = -1;
-static int hf_ieee80211_ff_mesh_addr4 = -1;
-static int hf_ieee80211_ff_mesh_addr5 = -1;
-static int hf_ieee80211_ff_mesh_addr6 = -1;
-static int hf_ieee80211_ff_selfprot_action = -1;
-
-static int hf_ieee80211_mesh_peering_proto = -1;
-static int hf_ieee80211_mesh_peering_local_link_id = -1;
-static int hf_ieee80211_mesh_peering_peer_link_id = -1;
-
-static int hf_ieee80211_ff_hwmp_flags = -1;
-static int hf_ieee80211_ff_hwmp_hopcount = -1;
-static int hf_ieee80211_ff_hwmp_ttl = -1;
-static int hf_ieee80211_ff_hwmp_pdid = -1;
-static int hf_ieee80211_ff_hwmp_orig_sta = -1;
-static int hf_ieee80211_ff_hwmp_orig_sn = -1;
-static int hf_ieee80211_ff_hwmp_orig_ext = -1;
-static int hf_ieee80211_ff_hwmp_lifetime = -1;
-static int hf_ieee80211_ff_hwmp_metric = -1;
-static int hf_ieee80211_ff_hwmp_targ_count = -1;
-static int hf_ieee80211_ff_hwmp_targ_flags = -1;
-static int hf_ieee80211_ff_hwmp_targ_to_flags = -1;
-static int hf_ieee80211_ff_hwmp_targ_usn_flags = -1;
-static int hf_ieee80211_ff_hwmp_targ_sta = -1;
-static int hf_ieee80211_ff_hwmp_targ_sn = -1;
-static int hf_ieee80211_ff_hwmp_targ_ext = -1;
-static int hf_ieee80211_rann_flags = -1;
-static int hf_ieee80211_rann_root_sta = -1;
-static int hf_ieee80211_rann_sn = -1;
-static int hf_ieee80211_rann_interval = -1;
-
-static int hf_ieee80211_mesh_channel_switch_ttl = -1;
-static int hf_ieee80211_mesh_channel_switch_flag = -1;
-static int hf_ieee80211_mesh_channel_switch_reason_code = -1;
-static int hf_ieee80211_mesh_channel_switch_precedence_value = -1;
-static int hf_ieee80211_mesh_chswitch_flag_txrestrict = -1;
-static int hf_ieee80211_mesh_chswitch_flag_initiator = -1;
-
-static int hf_ieee80211_mesh_config_path_sel_protocol = -1;
-static int hf_ieee80211_mesh_config_path_sel_metric = -1;
-static int hf_ieee80211_mesh_config_congestion_control = -1;
-static int hf_ieee80211_mesh_config_sync_method = -1;
-static int hf_ieee80211_mesh_config_auth_protocol = -1;
-static int hf_ieee80211_mesh_config_formation_info = -1;
-static int hf_ieee80211_mesh_config_capability = -1;
-static int hf_ieee80211_mesh_id = -1;
-static int hf_ieee80211_mesh_config_cap_accepting = -1;
-static int hf_ieee80211_mesh_config_cap_mcca_support = -1;
-static int hf_ieee80211_mesh_config_cap_mcca_enabled = -1;
-static int hf_ieee80211_mesh_config_cap_forwarding = -1;
-static int hf_ieee80211_mesh_config_cap_mbca_enabled = -1;
-static int hf_ieee80211_mesh_config_cap_tbtt_adjusting = -1;
-static int hf_ieee80211_mesh_config_cap_power_save_level = -1;
-static int hf_ieee80211_mesh_config_cap_reserved = -1;
-static int hf_ieee80211_mesh_form_info_conn_to_mesh_gate = -1;
-static int hf_ieee80211_mesh_form_info_num_of_peerings = -1;
-static int hf_ieee80211_mesh_form_info_conn_to_as = -1;
-static int hf_ieee80211_mesh_awake_window = -1;
-static int hf_ieee80211_mesh_mic = -1;
-static int hf_ieee80211_mesh_ampe_encrypted_data = -1;
-
-static int hf_ieee80211_bcn_timing_rctrl = -1;
-static int hf_ieee80211_bcn_timing_rctrl_more = -1;
-static int hf_ieee80211_bcn_timing_rctrl_element_num = -1;
-static int hf_ieee80211_bcn_timing_rctrl_status_num = -1;
-static int hf_ieee80211_bcn_timing_info = -1;
-static int hf_ieee80211_bcn_timing_info_nsta_id = -1;
-static int hf_ieee80211_bcn_timing_info_nsta_tbtt = -1;
-static int hf_ieee80211_bcn_timing_info_nsta_bi = -1;
-
-static int hf_ieee80211_gann_flags = -1;
-static int hf_ieee80211_gann_flags_reserved = -1;
-static int hf_ieee80211_gann_hop_count = -1;
-static int hf_ieee80211_gann_elem_ttl = -1;
-static int hf_ieee80211_gann_mesh_gate_addr = -1;
-static int hf_ieee80211_gann_seq_num = -1;
-static int hf_ieee80211_gann_interval = -1;
-
-static int hf_ieee80211_pxu_pxu_id = -1;
-static int hf_ieee80211_pxu_pxu_origin_mac = -1;
-static int hf_ieee80211_pxu_no_proxy_info = -1;
-static int hf_ieee80211_pxu_proxy_info = -1;
-static int hf_ieee80211_pxu_proxy_info_flags = -1;
-static int hf_ieee80211_pxu_proxy_info_flags_delete = -1;
-static int hf_ieee80211_pxu_proxy_info_flags_orig_is_proxy = -1;
-static int hf_ieee80211_pxu_proxy_info_flags_lifetime = -1;
-static int hf_ieee80211_pxu_proxy_info_flags_reserved = -1;
-static int hf_ieee80211_pxu_proxy_info_ext_mac = -1;
-static int hf_ieee80211_pxu_proxy_info_seq_num = -1;
-static int hf_ieee80211_pxu_proxy_info_proxy_mac = -1;
-static int hf_ieee80211_pxu_proxy_info_lifetime = -1;
-
-static int hf_ieee80211_pxuc_pxu_id = -1;
-static int hf_ieee80211_pxuc_pxu_recip_mac = -1;
-
-static int hf_ieee80211_ff_public_action = -1;
-static int hf_ieee80211_ff_protected_public_action = -1;
-static int hf_ieee80211_ff_tod = -1;
-static int hf_ieee80211_ff_toa = -1;
-static int hf_ieee80211_ff_max_tod_err = -1;
-static int hf_ieee80211_ff_max_toa_err = -1;
+static int hf_ieee80211_mesh_control_field;
+
+static int hf_ieee80211_ff_mesh_action;
+static int hf_ieee80211_ff_multihop_action;
+static int hf_ieee80211_ff_mesh_flags;
+static int hf_ieee80211_ff_mesh_ttl;
+static int hf_ieee80211_ff_mesh_sequence;
+static int hf_ieee80211_ff_mesh_addr4;
+static int hf_ieee80211_ff_mesh_addr5;
+static int hf_ieee80211_ff_mesh_addr6;
+static int hf_ieee80211_ff_selfprot_action;
+
+static int hf_ieee80211_mesh_peering_proto;
+static int hf_ieee80211_mesh_peering_local_link_id;
+static int hf_ieee80211_mesh_peering_peer_link_id;
+
+static int hf_ieee80211_ff_hwmp_flags;
+static int hf_ieee80211_ff_hwmp_hopcount;
+static int hf_ieee80211_ff_hwmp_ttl;
+static int hf_ieee80211_ff_hwmp_pdid;
+static int hf_ieee80211_ff_hwmp_orig_sta;
+static int hf_ieee80211_ff_hwmp_orig_sn;
+static int hf_ieee80211_ff_hwmp_orig_ext;
+static int hf_ieee80211_ff_hwmp_lifetime;
+static int hf_ieee80211_ff_hwmp_metric;
+static int hf_ieee80211_ff_hwmp_targ_count;
+static int hf_ieee80211_ff_hwmp_targ_flags;
+static int hf_ieee80211_ff_hwmp_targ_to_flags;
+static int hf_ieee80211_ff_hwmp_targ_usn_flags;
+static int hf_ieee80211_ff_hwmp_targ_sta;
+static int hf_ieee80211_ff_hwmp_targ_sn;
+static int hf_ieee80211_ff_hwmp_targ_ext;
+static int hf_ieee80211_rann_flags;
+static int hf_ieee80211_rann_root_sta;
+static int hf_ieee80211_rann_sn;
+static int hf_ieee80211_rann_interval;
+
+static int hf_ieee80211_mesh_channel_switch_ttl;
+static int hf_ieee80211_mesh_channel_switch_flag;
+static int hf_ieee80211_mesh_channel_switch_reason_code;
+static int hf_ieee80211_mesh_channel_switch_precedence_value;
+static int hf_ieee80211_mesh_chswitch_flag_txrestrict;
+static int hf_ieee80211_mesh_chswitch_flag_initiator;
+
+static int hf_ieee80211_mesh_config_path_sel_protocol;
+static int hf_ieee80211_mesh_config_path_sel_metric;
+static int hf_ieee80211_mesh_config_congestion_control;
+static int hf_ieee80211_mesh_config_sync_method;
+static int hf_ieee80211_mesh_config_auth_protocol;
+static int hf_ieee80211_mesh_config_formation_info;
+static int hf_ieee80211_mesh_config_capability;
+static int hf_ieee80211_mesh_id;
+static int hf_ieee80211_mesh_config_cap_accepting;
+static int hf_ieee80211_mesh_config_cap_mcca_support;
+static int hf_ieee80211_mesh_config_cap_mcca_enabled;
+static int hf_ieee80211_mesh_config_cap_forwarding;
+static int hf_ieee80211_mesh_config_cap_mbca_enabled;
+static int hf_ieee80211_mesh_config_cap_tbtt_adjusting;
+static int hf_ieee80211_mesh_config_cap_power_save_level;
+static int hf_ieee80211_mesh_config_cap_reserved;
+static int hf_ieee80211_mesh_form_info_conn_to_mesh_gate;
+static int hf_ieee80211_mesh_form_info_num_of_peerings;
+static int hf_ieee80211_mesh_form_info_conn_to_as;
+static int hf_ieee80211_mesh_awake_window;
+static int hf_ieee80211_mesh_mic;
+static int hf_ieee80211_mesh_ampe_encrypted_data;
+
+static int hf_ieee80211_bcn_timing_rctrl;
+static int hf_ieee80211_bcn_timing_rctrl_more;
+static int hf_ieee80211_bcn_timing_rctrl_element_num;
+static int hf_ieee80211_bcn_timing_rctrl_status_num;
+static int hf_ieee80211_bcn_timing_info;
+static int hf_ieee80211_bcn_timing_info_nsta_id;
+static int hf_ieee80211_bcn_timing_info_nsta_tbtt;
+static int hf_ieee80211_bcn_timing_info_nsta_bi;
+
+static int hf_ieee80211_gann_flags;
+static int hf_ieee80211_gann_flags_reserved;
+static int hf_ieee80211_gann_hop_count;
+static int hf_ieee80211_gann_elem_ttl;
+static int hf_ieee80211_gann_mesh_gate_addr;
+static int hf_ieee80211_gann_seq_num;
+static int hf_ieee80211_gann_interval;
+
+static int hf_ieee80211_pxu_pxu_id;
+static int hf_ieee80211_pxu_pxu_origin_mac;
+static int hf_ieee80211_pxu_no_proxy_info;
+static int hf_ieee80211_pxu_proxy_info;
+static int hf_ieee80211_pxu_proxy_info_flags;
+static int hf_ieee80211_pxu_proxy_info_flags_delete;
+static int hf_ieee80211_pxu_proxy_info_flags_orig_is_proxy;
+static int hf_ieee80211_pxu_proxy_info_flags_lifetime;
+static int hf_ieee80211_pxu_proxy_info_flags_reserved;
+static int hf_ieee80211_pxu_proxy_info_ext_mac;
+static int hf_ieee80211_pxu_proxy_info_seq_num;
+static int hf_ieee80211_pxu_proxy_info_proxy_mac;
+static int hf_ieee80211_pxu_proxy_info_lifetime;
+
+static int hf_ieee80211_pxuc_pxu_id;
+static int hf_ieee80211_pxuc_pxu_recip_mac;
+
+static int hf_ieee80211_ff_public_action;
+static int hf_ieee80211_ff_protected_public_action;
+static int hf_ieee80211_ff_tod;
+static int hf_ieee80211_ff_toa;
+static int hf_ieee80211_ff_max_tod_err;
+static int hf_ieee80211_ff_max_toa_err;
 
 /* ************************************************************************* */
 /*            Flags found in the capability field (fixed field)              */
 /* ************************************************************************* */
-static int hf_ieee80211_ff_capture = -1;
-static int hf_ieee80211_ff_cf_ess = -1;
-static int hf_ieee80211_ff_cf_ibss = -1;
-static int hf_ieee80211_ff_cf_reserved1 = -1;
-static int hf_ieee80211_ff_cf_reserved2 = -1;
-static int hf_ieee80211_ff_cf_privacy = -1;
-static int hf_ieee80211_ff_cf_preamble = -1;
-static int hf_ieee80211_ff_cf_critical_update_flag = -1;
-static int hf_ieee80211_ff_cf_nontran_bss_critical_update_flag = -1;
-static int hf_ieee80211_ff_cf_spec_man = -1;
-static int hf_ieee80211_ff_cf_qos = -1;
-static int hf_ieee80211_ff_cf_short_slot_time = -1;
-static int hf_ieee80211_ff_cf_apsd = -1;
-static int hf_ieee80211_ff_cf_radio_measurement = -1;
-static int hf_ieee80211_ff_cf_epd = -1;
-static int hf_ieee80211_ff_cf_reserved5 = -1;
-static int hf_ieee80211_ff_cf_reserved6 = -1;
+static int hf_ieee80211_ff_capture;
+static int hf_ieee80211_ff_cf_ess;
+static int hf_ieee80211_ff_cf_ibss;
+static int hf_ieee80211_ff_cf_reserved1;
+static int hf_ieee80211_ff_cf_reserved2;
+static int hf_ieee80211_ff_cf_privacy;
+static int hf_ieee80211_ff_cf_preamble;
+static int hf_ieee80211_ff_cf_critical_update_flag;
+static int hf_ieee80211_ff_cf_nontran_bss_critical_update_flag;
+static int hf_ieee80211_ff_cf_spec_man;
+static int hf_ieee80211_ff_cf_qos;
+static int hf_ieee80211_ff_cf_short_slot_time;
+static int hf_ieee80211_ff_cf_apsd;
+static int hf_ieee80211_ff_cf_radio_measurement;
+static int hf_ieee80211_ff_cf_epd;
+static int hf_ieee80211_ff_cf_reserved5;
+static int hf_ieee80211_ff_cf_reserved6;
 
 /* ************************************************************************* */
 /*                       A-MSDU fields                                       */
 /* ************************************************************************* */
-static int hf_ieee80211_amsdu_subframe = -1;
-static int hf_ieee80211_amsdu_length = -1;
-static int hf_ieee80211_amsdu_padding = -1;
+static int hf_ieee80211_amsdu_subframe;
+static int hf_ieee80211_amsdu_length;
+static int hf_ieee80211_amsdu_padding;
 
 /* ************************************************************************* */
 /*                       Tagged value format fields                          */
 /* ************************************************************************* */
-static int hf_ieee80211_tagged_parameters = -1;  /* Tagged payload item */
-static int hf_ieee80211_tag = -1;
-static int hf_ieee80211_tag_number = -1;
-static int hf_ieee80211_tag_length = -1;
-static int hf_ieee80211_tag_data = -1;
-static int hf_ieee80211_tag_oui = -1;
-static int hf_ieee80211_tag_oui_wfa_subtype = -1;
-static int hf_ieee80211_tag_oui_wfa_action_type = -1;
-static int hf_ieee80211_tag_ssid = -1;
-static int hf_ieee80211_tag_supp_rates = -1;
-static int hf_ieee80211_tag_fh_dwell_time = -1;
-static int hf_ieee80211_tag_fh_hop_set = -1;
-static int hf_ieee80211_tag_fh_hop_pattern = -1;
-static int hf_ieee80211_tag_fh_hop_index = -1;
-static int hf_ieee80211_tag_ds_param_channel = -1;
-static int hf_ieee80211_tag_cfp_count = -1;
-static int hf_ieee80211_tag_cfp_period = -1;
-static int hf_ieee80211_tag_cfp_max_duration = -1;
-static int hf_ieee80211_tag_cfp_dur_remaining = -1;
-static int hf_ieee80211_tim_dtim_count = -1;
-static int hf_ieee80211_tim_dtim_period = -1;
-static int hf_ieee80211_tim_bmapctl = -1;
-static int hf_ieee80211_tim_bmapctl_mcast = -1;
-static int hf_ieee80211_tim_bmapctl_offset = -1;
-static int hf_ieee80211_tim_partial_virtual_bitmap = -1;
-static int hf_ieee80211_tim_aid = -1;
-static int hf_ieee80211_tag_ibss_atim_window = -1;
-static int hf_ieee80211_tag_country_info_code = -1;
-static int hf_ieee80211_tag_country_info_env = -1;
-static int hf_ieee80211_tag_country_info_pad = -1;
-static int hf_ieee80211_tag_country_info_fnm = -1;
-static int hf_ieee80211_tag_country_info_fnm_fcn = -1;
-static int hf_ieee80211_tag_country_info_fnm_nc = -1;
-static int hf_ieee80211_tag_country_info_fnm_mtpl = -1;
-static int hf_ieee80211_tag_country_info_rrc = -1;
-static int hf_ieee80211_tag_country_info_rrc_oei = -1;
-static int hf_ieee80211_tag_country_info_rrc_oc = -1;
-static int hf_ieee80211_tag_country_info_rrc_cc = -1;
-static int hf_ieee80211_tag_fh_hopping_parameter_prime_radix = -1;
-static int hf_ieee80211_tag_fh_hopping_parameter_nb_channels = -1;
-static int hf_ieee80211_tag_fh_hopping_table_flag = -1;
-static int hf_ieee80211_tag_fh_hopping_table_number_of_sets = -1;
-static int hf_ieee80211_tag_fh_hopping_table_modulus = -1;
-static int hf_ieee80211_tag_fh_hopping_table_offset = -1;
-static int hf_ieee80211_tag_fh_hopping_random_table = -1;
-static int hf_ieee80211_tag_request = -1;
-static int hf_ieee80211_tag_extended_request_id = -1;
-static int hf_ieee80211_tag_extended_request_extension = -1;
-static int hf_ieee80211_tag_challenge_text = -1;
-
-static int hf_ieee80211_oui_qos_subtype = -1;
-static int hf_ieee80211_oui_qos_mgmt_dialog_token = -1;
-static int hf_ieee80211_oui_qos_mgmt_resp_control = -1;
-static int hf_ieee80211_oui_qos_mgmt_rsp_ctrl_more = -1;
-static int hf_ieee80211_oui_qos_mgmt_rsp_ctrl_reset = -1;
-static int hf_ieee80211_oui_qos_mgmt_rsp_reserved = -1;
-static int hf_ieee80211_oui_qos_mgmt_rqst_control = -1;
-static int hf_ieee80211_oui_qos_mgmt_rq_ctrl_more = -1;
-static int hf_ieee80211_oui_qos_mgmt_rq_ctrl_reset = -1;
-static int hf_ieee80211_oui_qos_mgmt_rq_reserved = -1;
-static int hf_ieee80211_oui_qos_mgmt_count = -1;
-static int hf_ieee80211_dscp_policy_id = -1;
-static int hf_ieee80211_dscp_policy_status = -1;
-static int hf_ieee80211_dscp_policy_scs_sts_list = -1;
-
-static int hf_ieee80211_tag_he_6ghz_cap_inf = -1;
-static int hf_ieee80211_tag_he_6ghz_cap_inf_b0_b2 = -1;
-static int hf_ieee80211_tag_he_6ghz_cap_inf_b3_b5 = -1;
-static int hf_ieee80211_tag_he_6ghz_cap_inf_b6_b7 = -1;
-static int hf_ieee80211_tag_he_6ghz_cap_inf_b8 = -1;
-static int hf_ieee80211_tag_he_6ghz_cap_inf_b9_b10 = -1;
-static int hf_ieee80211_tag_he_6ghz_cap_inf_b11 = -1;
-static int hf_ieee80211_tag_he_6ghz_cap_inf_b12 = -1;
-static int hf_ieee80211_tag_he_6ghz_cap_inf_b13 = -1;
-static int hf_ieee80211_tag_he_6ghz_cap_inf_b14_b15 = -1;
-
-static int hf_ieee80211_tag_ftm_tsf_sync_info = -1;
+static int hf_ieee80211_tagged_parameters;  /* Tagged payload item */
+static int hf_ieee80211_tag;
+static int hf_ieee80211_tag_number;
+static int hf_ieee80211_tag_length;
+static int hf_ieee80211_tag_data;
+static int hf_ieee80211_tag_oui;
+static int hf_ieee80211_tag_oui_wfa_subtype;
+static int hf_ieee80211_tag_oui_wfa_action_type;
+static int hf_ieee80211_tag_ssid;
+static int hf_ieee80211_tag_supp_rates;
+static int hf_ieee80211_tag_fh_dwell_time;
+static int hf_ieee80211_tag_fh_hop_set;
+static int hf_ieee80211_tag_fh_hop_pattern;
+static int hf_ieee80211_tag_fh_hop_index;
+static int hf_ieee80211_tag_ds_param_channel;
+static int hf_ieee80211_tag_cfp_count;
+static int hf_ieee80211_tag_cfp_period;
+static int hf_ieee80211_tag_cfp_max_duration;
+static int hf_ieee80211_tag_cfp_dur_remaining;
+static int hf_ieee80211_tim_dtim_count;
+static int hf_ieee80211_tim_dtim_period;
+static int hf_ieee80211_tim_bmapctl;
+static int hf_ieee80211_tim_bmapctl_mcast;
+static int hf_ieee80211_tim_bmapctl_offset;
+static int hf_ieee80211_tim_partial_virtual_bitmap;
+static int hf_ieee80211_tim_aid;
+static int hf_ieee80211_tag_ibss_atim_window;
+static int hf_ieee80211_tag_country_info_code;
+static int hf_ieee80211_tag_country_info_env;
+static int hf_ieee80211_tag_country_info_pad;
+static int hf_ieee80211_tag_country_info_fnm;
+static int hf_ieee80211_tag_country_info_fnm_fcn;
+static int hf_ieee80211_tag_country_info_fnm_nc;
+static int hf_ieee80211_tag_country_info_fnm_mtpl;
+static int hf_ieee80211_tag_country_info_rrc;
+static int hf_ieee80211_tag_country_info_rrc_oei;
+static int hf_ieee80211_tag_country_info_rrc_oc;
+static int hf_ieee80211_tag_country_info_rrc_cc;
+static int hf_ieee80211_tag_fh_hopping_parameter_prime_radix;
+static int hf_ieee80211_tag_fh_hopping_parameter_nb_channels;
+static int hf_ieee80211_tag_fh_hopping_table_flag;
+static int hf_ieee80211_tag_fh_hopping_table_number_of_sets;
+static int hf_ieee80211_tag_fh_hopping_table_modulus;
+static int hf_ieee80211_tag_fh_hopping_table_offset;
+static int hf_ieee80211_tag_fh_hopping_random_table;
+static int hf_ieee80211_tag_request;
+static int hf_ieee80211_tag_extended_request_id;
+static int hf_ieee80211_tag_extended_request_extension;
+static int hf_ieee80211_tag_challenge_text;
+
+static int hf_ieee80211_oui_qos_subtype;
+static int hf_ieee80211_oui_qos_mgmt_dialog_token;
+static int hf_ieee80211_oui_qos_mgmt_resp_control;
+static int hf_ieee80211_oui_qos_mgmt_rsp_ctrl_more;
+static int hf_ieee80211_oui_qos_mgmt_rsp_ctrl_reset;
+static int hf_ieee80211_oui_qos_mgmt_rsp_reserved;
+static int hf_ieee80211_oui_qos_mgmt_rqst_control;
+static int hf_ieee80211_oui_qos_mgmt_rq_ctrl_more;
+static int hf_ieee80211_oui_qos_mgmt_rq_ctrl_reset;
+static int hf_ieee80211_oui_qos_mgmt_rq_reserved;
+static int hf_ieee80211_oui_qos_mgmt_count;
+static int hf_ieee80211_dscp_policy_id;
+static int hf_ieee80211_dscp_policy_status;
+static int hf_ieee80211_dscp_policy_scs_sts_list;
+
+static int hf_ieee80211_tag_he_6ghz_cap_inf;
+static int hf_ieee80211_tag_he_6ghz_cap_inf_b0_b2;
+static int hf_ieee80211_tag_he_6ghz_cap_inf_b3_b5;
+static int hf_ieee80211_tag_he_6ghz_cap_inf_b6_b7;
+static int hf_ieee80211_tag_he_6ghz_cap_inf_b8;
+static int hf_ieee80211_tag_he_6ghz_cap_inf_b9_b10;
+static int hf_ieee80211_tag_he_6ghz_cap_inf_b11;
+static int hf_ieee80211_tag_he_6ghz_cap_inf_b12;
+static int hf_ieee80211_tag_he_6ghz_cap_inf_b13;
+static int hf_ieee80211_tag_he_6ghz_cap_inf_b14_b15;
+
+static int hf_ieee80211_tag_ftm_tsf_sync_info;
 
 static int * const ieee80211_tag_he_6ghz_cap_inf[] = {
   &hf_ieee80211_tag_he_6ghz_cap_inf_b0_b2,
@@ -5157,1004 +5157,1004 @@ static int * const ieee80211_tag_he_6ghz_cap_inf[] = {
 };
 
 
-static int hf_ieee80211_wep_iv = -1;
-static int hf_ieee80211_wep_iv_weak = -1;
-static int hf_ieee80211_tkip_extiv = -1;
-static int hf_ieee80211_ccmp_extiv = -1;
-static int hf_ieee80211_wep_key = -1;
-static int hf_ieee80211_wep_icv = -1;
-static int hf_ieee80211_fc_analysis_pmk = -1;
-static int hf_ieee80211_fc_analysis_kck = -1;
-static int hf_ieee80211_fc_analysis_kek = -1;
-static int hf_ieee80211_fc_analysis_tk = -1;
-static int hf_ieee80211_fc_analysis_gtk = -1;
-
-static int hf_ieee80211_block_ack_control = -1;
-static int hf_ieee80211_block_ack_control_ack_policy = -1;
-static int hf_ieee80211_block_ack_control_type = -1;
-static int hf_ieee80211_block_ack_control_reserved = -1;
-static int hf_ieee80211_block_ack_control_tid_info = -1;
-
-static int hf_ieee80211_block_ack_multi_tid_reserved = -1;
-static int hf_ieee80211_block_ack_multi_tid_value = -1;
-static int hf_ieee80211_block_ack_bitmap = -1;
-static int hf_ieee80211_block_ack_bitmap_missing_frame = -1;
-static int hf_ieee80211_block_ack_gcr_addr = -1;
-
-static int hf_ieee80211_block_ack_multi_sta_aid11 = -1;
-static int hf_ieee80211_block_ack_multi_sta_ack_type = -1;
-static int hf_ieee80211_block_ack_multi_sta_tid = -1;
-static int hf_ieee80211_block_ack_multi_sta_aid_tid = -1;
-static int hf_ieee80211_block_ack_multi_sta_reserved = -1;
-static int hf_ieee80211_block_ack_multi_sta_ra = -1;
-
-static int hf_ieee80211_tag_measure_request_measurement_mode = -1;
-static int hf_ieee80211_tag_measure_request_bssid = -1;
-
-static int hf_ieee80211_tag_measure_request_subelement_length = -1;
-static int hf_ieee80211_tag_measure_request_beacon_sub_id = -1;
-static int hf_ieee80211_tag_measure_request_beacon_sub_ssid = -1;
-static int hf_ieee80211_tag_measure_request_beacon_sub_bri_reporting_condition = -1;
-static int hf_ieee80211_tag_measure_request_beacon_sub_bri_threshold_offset = -1;
-static int hf_ieee80211_tag_measure_request_beacon_sub_reporting_detail = -1;
-static int hf_ieee80211_tag_measure_request_beacon_sub_last_report_indication_request = -1;
-static int hf_ieee80211_tag_measure_request_beacon_unknown = -1;
-
-static int hf_ieee80211_tag_measure_request_channel_load_sub_id = -1;
-static int hf_ieee80211_tag_measure_request_channel_load_sub_reporting_condition = -1;
-static int hf_ieee80211_tag_measure_request_channel_load_sub_reporting_ref = -1;
-
-static int hf_ieee80211_tag_measure_request_noise_histogram_sub_id = -1;
-static int hf_ieee80211_tag_measure_request_noise_histogram_sub_reporting_condition = -1;
-static int hf_ieee80211_tag_measure_request_noise_histogram_sub_reporting_anpi_ref = -1;
-
-static int hf_ieee80211_tag_measure_request_frame_request_type = -1;
-static int hf_ieee80211_tag_measure_request_mac_address  = -1;
-static int hf_ieee80211_tag_measure_request_peer_mac_address = -1;
-static int hf_ieee80211_tag_measure_request_group_id = -1;
-
-static int hf_ieee80211_tag_measure_request_location_subject = -1;
-static int hf_ieee80211_tag_measure_request_civic_location_type = -1;
-static int hf_ieee80211_tag_measure_request_location_service_interval_units = -1;
-static int hf_ieee80211_tag_measure_request_location_service_interval = -1;
-
-static int hf_ieee80211_tag_measure_request_unknown = -1;
-
-static int hf_ieee80211_ht_pren_type = -1;
-static int hf_ieee80211_ht_pren_unknown = -1;
-
-static int hf_ieee80211_ht_cap = -1;
-static int hf_ieee80211_ht_vs_cap = -1;
-static int hf_ieee80211_ht_ldpc_coding = -1;
-static int hf_ieee80211_ht_chan_width = -1;
-static int hf_ieee80211_ht_sm_pwsave = -1;
-static int hf_ieee80211_ht_green = -1;
-static int hf_ieee80211_ht_short20 = -1;
-static int hf_ieee80211_ht_short40 = -1;
-static int hf_ieee80211_ht_tx_stbc = -1;
-static int hf_ieee80211_ht_rx_stbc = -1;
-static int hf_ieee80211_ht_delayed_block_ack = -1;
-static int hf_ieee80211_ht_max_amsdu = -1;
-static int hf_ieee80211_ht_dss_cck_40 = -1;
-static int hf_ieee80211_ht_psmp = -1;
-static int hf_ieee80211_ht_40_mhz_intolerant = -1;
-static int hf_ieee80211_ht_l_sig = -1;
-
-static int hf_ieee80211_ext_bss_mu_mimo_capable_sta_count = -1;
-static int hf_ieee80211_ext_bss_ss_underutilization = -1;
-static int hf_ieee80211_ext_bss_observable_sec_20mhz_utilization = -1;
-static int hf_ieee80211_ext_bss_observable_sec_40mhz_utilization = -1;
-static int hf_ieee80211_ext_bss_observable_sec_80mhz_utilization = -1;
-static int hf_ieee80211_wide_bw_new_channel_width = -1;
-static int hf_ieee80211_wide_bw_new_channel_center_freq_segment0 = -1;
-static int hf_ieee80211_wide_bw_new_channel_center_freq_segment1 = -1;
-
-static int hf_ieee80211_operat_notification_mode = -1;
-static int hf_ieee80211_operat_mode_field_channel_width = -1;
-static int hf_ieee80211_operat_mode_field_reserved = -1;
-static int hf_ieee80211_operat_mode_field_rxnss = -1;
-static int hf_ieee80211_operat_mode_field_rxnsstype= -1;
-
-static int hf_ieee80211_tbtt_info = -1;
-static int hf_ieee80211_tbtt_filtered_nap = -1;
-static int hf_ieee80211_tbtt_info_count = -1;
-static int hf_ieee80211_tbtt_info_length = -1;
-
-static int hf_ieee80211_tbtt_operating_class = -1;
-static int hf_ieee80211_tbtt_channel_number = -1;
-
-static int hf_ieee80211_tbtt_offset = -1;
-static int hf_ieee80211_tbtt_bssid = -1;
-static int hf_ieee80211_tbtt_short_ssid = -1;
-static int hf_ieee80211_rnr_bss_params = -1;
-static int hf_ieee80211_rnr_oct_recommended = -1;
-static int hf_ieee80211_rnr_same_ssid = -1;
-static int hf_ieee80211_rnr_multiple_bssid = -1;
-static int hf_ieee80211_rnr_transmitted_bssid = -1;
-static int hf_ieee80211_rnr_ess_with_colocated_ap = -1;
-static int hf_ieee80211_rnr_unsolicited_probe_responses = -1;
-static int hf_ieee80211_rnr_same_colocated_ap = -1;
-static int hf_ieee80211_rnr_same_reserved = -1;
-static int hf_ieee80211_rnr_20mhz_psd_subfield = -1;
-static int hf_ieee80211_rnr_reserved_data = -1;
-static int hf_ieee80211_rnr_mld_params = -1;
-static int hf_ieee80211_rnr_mld_id = -1;
-static int hf_ieee80211_rnr_mld_link_id = -1;
-static int hf_ieee80211_rnr_mld_bss_params_change_count = -1;
-static int hf_ieee80211_rnr_mld_all_updates_included = -1;
-static int hf_ieee80211_rnr_mld_disabled_link_indication = -1;
-static int hf_ieee80211_rnr_mld_reserved = -1;
-
-static int hf_ieee80211_ampduparam = -1;
-static int hf_ieee80211_ampduparam_vs = -1;
-static int hf_ieee80211_ampduparam_mpdu = -1;
-static int hf_ieee80211_ampduparam_mpdu_start_spacing = -1;
-static int hf_ieee80211_ampduparam_reserved = -1;
-
-static int hf_ieee80211_beacon_sequence = -1;
-static int hf_ieee80211_pentapartial_timestamp = -1;
-static int hf_ieee80211_tack_next_twt_info = -1;
-static int hf_ieee80211_tack_next_twt = -1;
-static int hf_ieee80211_tack_flow_identifier = -1;
-
-static int hf_ieee80211_ff_s1g_action = -1;
-static int hf_ieee80211_ff_s1g_timestamp = -1;
-static int hf_ieee80211_ff_s1g_change_sequence = -1;
-static int hf_ieee80211_ff_s1g_next_tbtt = -1;
-static int hf_ieee80211_ff_s1g_compressed_ssid = -1;
-static int hf_ieee80211_ff_s1g_access_network_options = -1;
-
-static int hf_ieee80211_s1g_sync_control = -1;
-static int hf_ieee80211_s1g_sync_control_uplink_sync_request = -1;
-static int hf_ieee80211_s1g_sync_control_time_slot_protection_request = -1;
-static int hf_ieee80211_s1g_sync_control_reserved = -1;
-
-static int hf_ieee80211_s1g_sector_id_index = -1;
-static int hf_ieee80211_s1g_sector_id_preferred_sector_id = -1;
-static int hf_ieee80211_s1g_sector_id_snr = -1;
-static int hf_ieee80211_s1g_sector_id_receive_sector_bitmap = -1;
-
-static int hf_ieee80211_s1g_twt_information_control = -1;
-static int hf_ieee80211_s1g_twt_flow_identifier = -1;
-static int hf_ieee80211_s1g_twt_response_required = -1;
-static int hf_ieee80211_s1g_twt_next_twt_request = -1;
-static int hf_ieee80211_s1g_twt_next_twt_subfield_size = -1;
-static int hf_ieee80211_s1g_twt_reserved = -1;
-static int hf_ieee80211_s1g_twt_next_twt_32 = -1;
-static int hf_ieee80211_s1g_twt_next_twt_48 = -1;
-static int hf_ieee80211_s1g_twt_next_twt_64 = -1;
-
-static int hf_ieee80211_s1g_update_edca_info = -1;
-static int hf_ieee80211_s1g_update_edca_override = -1;
-static int hf_ieee80211_s1g_update_edca_ps_poll_aci = -1;
-static int hf_ieee80211_s1g_update_edca_raw_aci = -1;
-static int hf_ieee80211_s1g_update_edca_sta_type = -1;
-static int hf_ieee80211_s1g_update_edca_reserved = -1;
-
-static int hf_ieee80211_s1g_cap_byte1 = -1;
-static int hf_ieee80211_s1g_cap_byte2 = -1;
-static int hf_ieee80211_s1g_cap_byte3 = -1;
-static int hf_ieee80211_s1g_cap_byte4 = -1;
-static int hf_ieee80211_s1g_cap_byte5 = -1;
-static int hf_ieee80211_s1g_cap_byte6 = -1;
-static int hf_ieee80211_s1g_cap_byte7 = -1;
-static int hf_ieee80211_s1g_cap_byte8 = -1;
-static int hf_ieee80211_s1g_cap_byte9 = -1;
-static int hf_ieee80211_s1g_cap_byte10 = -1;
-static int hf_ieee80211_s1g_cap_s1g_long_support = -1;
-static int hf_ieee80211_s1g_cap_short_gi_for_1_mhz = -1;
-static int hf_ieee80211_s1g_cap_short_gi_for_2_mhz = -1;
-static int hf_ieee80211_s1g_cap_short_gi_for_4_mhz = -1;
-static int hf_ieee80211_s1g_cap_short_gi_for_8_mhz = -1;
-static int hf_ieee80211_s1g_cap_short_gi_for_16_mhz = -1;
-static int hf_ieee80211_s1g_cap_supported_channel_width = -1;
-static int hf_ieee80211_s1g_cap_rx_lpdc = -1;
-static int hf_ieee80211_s1g_cap_tx_stbc = -1;
-static int hf_ieee80211_s1g_cap_rx_stbc = -1;
-static int hf_ieee80211_s1g_cap_su_beamformer_capable = -1;
-static int hf_ieee80211_s1g_cap_su_beamformee_capable = -1;
-static int hf_ieee80211_s1g_cap_beamformee_sts_capability = -1;
-static int hf_ieee80211_s1g_cap_number_sounding_dimensions = -1;
-static int hf_ieee80211_s1g_cap_mu_beamformer_capable = -1;
-static int hf_ieee80211_s1g_cap_mu_beamformee_capable = -1;
-static int hf_ieee80211_s1g_cap_htc_vht_capable = -1;
-static int hf_ieee80211_s1g_cap_travelling_pilot_support = -1;
-static int hf_ieee80211_s1g_cap_rd_responder = -1;
-static int hf_ieee80211_s1g_cap_ht_delayed_block_ack = -1;
-static int hf_ieee80211_s1g_cap_maximum_mpdu_length = -1;
-static int hf_ieee80211_s1g_cap_maximum_a_mpdu_length_exp = -1;
-static int hf_ieee80211_s1g_cap_minimum_mpdu_start_spacing = -1;
-static int hf_ieee80211_s1g_cap_uplink_sync_capable = -1;
-static int hf_ieee80211_s1g_cap_dynamic_aid = -1;
-static int hf_ieee80211_s1g_cap_bat_support = -1;
-static int hf_ieee80211_s1g_cap_tim_ade_support = -1;
-static int hf_ieee80211_s1g_cap_non_tim_support = -1;
-static int hf_ieee80211_s1g_cap_group_aid_support = -1;
-static int hf_ieee80211_s1g_cap_sta_type_support = -1;
-static int hf_ieee80211_s1g_cap_centralized_authentication_control = -1;
-static int hf_ieee80211_s1g_cap_distributed_authentication_control = -1;
-static int hf_ieee80211_s1g_cap_a_msdu_support = -1;
-static int hf_ieee80211_s1g_cap_a_mpdu_support = -1;
-static int hf_ieee80211_s1g_cap_asymmetic_block_ack_support = -1;
-static int hf_ieee80211_s1g_cap_flow_control_support = -1;
-static int hf_ieee80211_s1g_cap_sectorized_beam_capable = -1;
-static int hf_ieee80211_s1g_cap_obss_mitigation_support = -1;
-static int hf_ieee80211_s1g_cap_fragment_ba_support = -1;
-static int hf_ieee80211_s1g_cap_ndp_ps_poll_supported = -1;
-static int hf_ieee80211_s1g_cap_raw_operation_support = -1;
-static int hf_ieee80211_s1g_cap_page_slicing_support = -1;
-static int hf_ieee80211_s1g_cap_txop_sharing_implicit_ack_support = -1;
-static int hf_ieee80211_s1g_cap_vht_link_adaptation_capable = -1;
-static int hf_ieee80211_s1g_cap_tack_support_as_ps_poll_response = -1;
-static int hf_ieee80211_s1g_cap_duplicate_1_mhz_support = -1;
-static int hf_ieee80211_s1g_cap_mcs_negotiation_support = -1;
-static int hf_ieee80211_s1g_cap_1_mhz_control_response_preamble_support = -1;
-static int hf_ieee80211_s1g_cap_ndp_beamforming_report_poll_support = -1;
-static int hf_ieee80211_s1g_cap_unsolicited_dynamic_aid = -1;
-static int hf_ieee80211_s1g_cap_sector_training_operation_supported = -1;
-static int hf_ieee80211_s1g_cap_temporary_ps_mode_switch = -1;
-static int hf_ieee80211_s1g_cap_twt_grouping_support = -1;
-static int hf_ieee80211_s1g_cap_bdt_capable = -1;
-static int hf_ieee80211_s1g_cap_color = -1;
-static int hf_ieee80211_s1g_cap_twt_requester_support = -1;
-static int hf_ieee80211_s1g_cap_twt_responder_support = -1;
-static int hf_ieee80211_s1g_cap_pv1_frame_support = -1;
-static int hf_ieee80211_s1g_cap_link_adaptation_per_normal_control_response_capable = -1;
-static int hf_ieee80211_s1g_cap_reserved = -1;
-static int hf_ieee80211_s1g_mcs_and_nss_set = -1;
-static int hf_ieee80211_s1g_rx_s1g_mcs_map = -1;
-static int hf_ieee80211_s1g_rx_highest_supported_long_gi_data_rate = -1;
-static int hf_ieee80211_s1g_tx_s1g_mcs_map = -1;
-static int hf_ieee80211_s1g_tx_highest_supported_long_gi_data_rate = -1;
-static int hf_ieee80211_s1g_rx_single_spatial_stream_map_for_1_mhz = -1;
-static int hf_ieee80211_s1g_tx_single_spatial_stream_map_for_1_mhz = -1;
-static int hf_ieee80211_s1g_mcs_and_nss_reserved = -1;
-static int hf_ieee80211_s1g_subchannel_selective_transmission = -1;
-static int hf_ieee80211_s1g_sst_sounding_option = -1;
-static int hf_ieee80211_s1g_channel_activity_bitmap = -1;
-static int hf_ieee80211_s1g_ul_activity = -1;
-static int hf_ieee80211_s1g_dl_activity = -1;
-static int hf_ieee80211_s1g_max_trans_width = -1;
-static int hf_ieee80211_s1g_activity_start_time = -1;
-static int hf_ieee80211_s1g_sst_sounding_option1 = -1;
-static int hf_ieee80211_s1g_channel_activity_bitmap1 = -1;
-static int hf_ieee80211_s1g_sounding_start_time_present = -1;
-static int hf_ieee80211_s1g_channel_activity_reserved = -1;
-static int hf_ieee80211_s1g_max_trans_width1 = -1;
-static int hf_ieee80211_s1g_sounding_start_time = -1;
-static int hf_ieee80211_s1g_open_loop_link_margin = -1;
-static int hf_ieee80211_s1g_raw_control = -1;
-static int hf_ieee80211_s1g_raw_type = -1;
-static int hf_ieee80211_s1g_raw_type_options = -1;
-static int hf_ieee80211_s1g_raw_start_time_indication = -1;
-static int hf_ieee80211_s1g_raw_raw_group_indication = -1;
-static int hf_ieee80211_s1g_raw_channel_indication_preference = -1;
-static int hf_ieee80211_s1g_raw_periodic_raw_indication = -1;
-static int hf_ieee80211_s1g_raw_slot_def = -1;
-static int hf_ieee80211_s1g_slot_def_format_indication = -1;
-static int hf_ieee80211_s1g_slot_def_cross_slot_boundary = -1;
-static int hf_ieee80211_s1g_slot_def_slot_duration_count8 = -1;
-static int hf_ieee80211_s1g_slot_def_num_slots6 = -1;
-static int hf_ieee80211_s1g_slot_def_slot_duration_count11 = -1;
-static int hf_ieee80211_s1g_slot_def_num_slots3 = -1;
-static int hf_ieee80211_s1g_raw_start_time = -1;
-static int hf_ieee80211_s1g_raw_group_subfield = -1;
-static int hf_ieee80211_s1g_raw_group_page_index = -1;
-static int hf_ieee80211_s1g_raw_group_start_aid = -1;
-static int hf_ieee80211_s1g_raw_group_end_aid = -1;
-static int hf_ieee80211_s1g_raw_channel_indication = -1;
-static int hf_ieee80211_s1g_raw_ci_channel_activity_bitmap = -1;
-static int hf_ieee80211_s1g_raw_ci_max_trans_width = -1;
-static int hf_ieee80211_s1g_raw_ci_ul_activity = -1;
-static int hf_ieee80211_s1g_raw_ci_dl_activity = -1;
-static int hf_ieee80211_s1g_raw_ci_reserved = -1;
-static int hf_ieee80211_s1g_raw_praw_periodicity = -1;
-static int hf_ieee80211_s1g_raw_praw_validity = -1;
-static int hf_ieee80211_s1g_raw_praw_start_offset = -1;
-static int hf_ieee80211_s1g_page_slice_page_period = -1;
-static int hf_ieee80211_s1g_page_slice_control = -1;
-static int hf_ieee80211_s1g_page_slice_page_index = -1;
-static int hf_ieee80211_s1g_page_slice_page_slice_length = -1;
-static int hf_ieee80211_s1g_page_slice_page_slice_count = -1;
-static int hf_ieee80211_s1g_page_slice_block_offset = -1;
-static int hf_ieee80211_s1g_page_slice_tim_offset = -1;
-static int hf_ieee80211_s1g_page_slice_reserved = -1;
-static int hf_ieee80211_s1g_page_slice_page_bitmap = -1;
-static int hf_ieee80211_s1g_aid_request_mode = -1;
-static int hf_ieee80211_s1g_aid_request_interval_present = -1;
-static int hf_ieee80211_s1g_aid_request_per_sta_address_present = -1;
-static int hf_ieee80211_s1g_aid_request_service_characteristic_present = -1;
-static int hf_ieee80211_s1g_aid_request_non_tim_mode_switch = -1;
-static int hf_ieee80211_s1g_aid_request_tim_mode_switch = -1;
-static int hf_ieee80211_s1g_aid_request_group_address_present = -1;
-static int hf_ieee80211_s1g_aid_request_reserved = -1;
-static int hf_ieee80211_s1g_aid_request_interval = -1;
-static int hf_ieee80211_s1g_aid_request_characteristic_sensor = -1;
-static int hf_ieee80211_s1g_aid_request_characteristic_offload = -1;
-static int hf_ieee80211_s1g_aid_request_characteristic_official_service = -1;
-static int hf_ieee80211_s1g_aid_request_characteristic_reserved = -1;
-static int hf_ieee80211_s1g_aid_req_peer_sta_addr = -1;
-static int hf_ieee80211_s1g_aid_request_characteristic = -1;
-static int hf_ieee80211_s1g_aid_req_group_addr = -1;
-static int hf_ieee80211_s1g_aid_rsp_aid_group_aid = -1;
-static int hf_ieee80211_s1g_aid_rsp_aid_switch_count = -1;
-static int hf_ieee80211_s1g_aid_rsp_aid_response_interval = -1;
-static int hf_ieee80211_s1g_sector_op_control_16b = -1;
-static int hf_ieee80211_s1g_sector_op_sectorization_type_b16 = -1;
-static int hf_ieee80211_s1g_sector_op_periodic_training_indicator = -1;
-static int hf_ieee80211_s1g_sector_op_training_period = -1;
-static int hf_ieee80211_s1g_sector_op_remaining_beacon_interval = -1;
-static int hf_ieee80211_s1g_sector_op_reserved_b16 = -1;
-static int hf_ieee80211_s1g_sector_op_control = -1;
-static int hf_ieee80211_s1g_sector_op_sectorization_type = -1;
-static int hf_ieee80211_s1g_sector_op_period = -1;
-static int hf_ieee80211_s1g_sector_op_omni = -1;
-static int hf_ieee80211_s1g_sector_op_group_info = -1;
-static int hf_ieee80211_s1g_short_beacon_interval = -1;
-static int hf_ieee80211_s1g_change_sequence = -1;
-static int hf_ieee80211_s1g_auth_control_control = -1;
-static int hf_ieee80211_s1g_auth_control_deferral = -1;
-static int hf_ieee80211_s1g_auth_control_reserved = -1;
-static int hf_ieee80211_s1g_auth_control_thresh = -1;
-static int hf_ieee80211_s1g_auth_control_thresh_tus = -1;
-static int hf_ieee80211_s1g_auth_slot_duration = -1;
-static int hf_ieee80211_s1g_auth_max_trans_int = -1;
-static int hf_ieee80211_s1g_auth_min_trans_int = -1;
-static int hf_ieee80211_s1g_tsf_timer_accuracy = -1;
-static int hf_ieee80211_s1g_relay_control = -1;
-static int hf_ieee80211_s1g_relay_control_rootap_bssid = -1;
-static int hf_ieee80211_s1g_relay_function_activation_mode = -1;
-static int hf_ieee80211_s1g_relay_function_direction = -1;
-static int hf_ieee80211_s1g_relay_function_enable_relay_function = -1;
-static int hf_ieee80211_s1g_relay_function_stas_present_indic = -1;
-static int hf_ieee80211_s1g_relay_function_reserved = -1;
-static int hf_ieee80211_s1g_number_of_stas = -1;
-static int hf_ieee80211_s1g_initiator_mac_address = -1;
-static int hf_ieee80211_s1g_address_count = -1;
-static int hf_ieee80211_s1g_reachable_add_remove = -1;
-static int hf_ieee80211_s1g_reachable_relay_capable = -1;
-static int hf_ieee80211_s1g_reachable_reserved = -1;
-static int hf_ieee80211_s1g_reachable_mac_address = -1;
-static int hf_ieee80211_s1g_relay_discovery_control = -1;
-static int hf_ieee80211_s1g_min_data_rate_included = -1;
-static int hf_ieee80211_s1g_mean_data_rate_included = -1;
-static int hf_ieee80211_s1g_max_data_rate_included = -1;
-static int hf_ieee80211_s1g_delay_and_min_phy_rate = -1;
-static int hf_ieee80211_s1g_information_not_available = -1;
-static int hf_ieee80211_s1g_relay_discovery_reserved = -1;
-static int hf_ieee80211_s1g_relay_control_ul_min = -1;
-static int hf_ieee80211_s1g_relay_control_ul_mean = -1;
-static int hf_ieee80211_s1g_relay_control_ul_max = -1;
-static int hf_ieee80211_s1g_relay_control_dl_min = -1;
-static int hf_ieee80211_s1g_relay_control_dl_mean = -1;
-static int hf_ieee80211_s1g_relay_control_dl_max = -1;
-static int hf_ieee80211_s1g_relay_hierarchy_identifier = -1;
-static int hf_ieee80211_s1g_relay_no_more_relay_flag = -1;
-static int hf_ieee80211_s1g_aid_entry_mac_addr = -1;
-static int hf_ieee80211_s1g_aid_entry_assoc_id = -1;
-static int hf_ieee80211_s1g_beacon_compatibility_info = -1;
-static int hf_ieee80211_s1g_beacon_interval = -1;
-static int hf_ieee80211_s1g_tsf_completion = -1;
-static int hf_ieee80211_s1g_channel_width = -1;
-static int hf_ieee80211_s1g_primary_channel_width = -1;
-static int hf_ieee80211_s1g_bss_operating_channel_width = -1;
-static int hf_ieee80211_s1g_primary_channel_location = -1;
-static int hf_ieee80211_s1g_reserved_b6 = -1;
-static int hf_ieee80211_s1g_mcs10_use = -1;
-static int hf_ieee80211_s1g_operating_class = -1;
-static int hf_ieee80211_s1g_primary_channel_number = -1;
-static int hf_ieee80211_s1g_channel_center_frequency = -1;
-static int hf_ieee80211_s1g_basic_mcs_and_nss_set = -1;
-static int hf_ieee80211_s1g_sst_enabled_channel_bitmap = -1;
-static int hf_ieee80211_s1g_sst_primary_channel_offset = -1;
-static int hf_ieee80211_s1g_sst_channel_unit = -1;
-static int hf_ieee80211_s1g_sst_reserved = -1;
-static int hf_ieee80211_s1g_max_away_duration = -1;
-static int hf_ieee80211_s1g_tim_bmapctrl = -1;
-static int hf_ieee80211_s1g_tim_bmapctl_traffic_indicator = -1;
-static int hf_ieee80211_s1g_tim_page_slice_number = -1;
-static int hf_ieee80211_s1g_tim_page_index = -1;
-static int hf_ieee80211_s1g_pvb_block_control_byte = -1;
-static int hf_ieee80211_s1g_pvb_encoding_mode = -1;
-static int hf_ieee80211_s1g_pvb_inverse_bitmap = -1;
-static int hf_ieee80211_s1g_pvb_block_offset = -1;
-static int hf_ieee80211_s1g_block_bitmap = -1;
-static int hf_ieee80211_s1g_block_bitmap_sta_aid13 = -1;
-static int hf_ieee80211_s1g_block_bitmap_single_aid = -1;
-static int hf_ieee80211_s1g_block_bitmap_olb_length = -1;
-static int hf_ieee80211_s1g_block_bitmap_ade = -1;
-static int hf_ieee80211_s1g_block_bitmap_ewl = -1;
-static int hf_ieee80211_s1g_block_bitmap_len = -1;
-static int hf_ieee80211_s1g_block_bitmap_ade_bytes = -1;
-static int hf_ieee80211_s1g_probe_response_group_bitmap = -1;
-static int hf_ieee80211_s1g_probe_resp_subfield_0 = -1;
-static int hf_ieee80211_pv1_probe_response_req_full_ssid = -1;
-static int hf_ieee80211_pv1_probe_response_req_next_tbtt = -1;
-static int hf_ieee80211_pv1_probe_response_req_access_network_option = -1;
-static int hf_ieee80211_pv1_probe_response_req_s1g_beacon_compatibility = -1;
-static int hf_ieee80211_pv1_probe_response_req_supported_rates = -1;
-static int hf_ieee80211_pv1_probe_response_req_s1g_capability = -1;
-static int hf_ieee80211_pv1_probe_response_req_s1g_operation = -1;
-static int hf_ieee80211_pv1_probe_response_req_rsn = -1;
-static int hf_ieee80211_s1g_el_op_max_awake_duration = -1;
-static int hf_ieee80211_s1g_el_op_recovery_time_duration = -1;
-static int hf_ieee80211_s1g_sectorized_group_id_list = -1;
-static int hf_ieee80211_s1g_header_comp_control = -1;
-static int hf_ieee80211_s1g_header_comp_req_resp = -1;
-static int hf_ieee80211_s1g_header_comp_store_a3 = -1;
-static int hf_ieee80211_s1g_header_comp_store_a4 = -1;
-static int hf_ieee80211_s1g_header_comp_ccmp_update_present = -1;
-static int hf_ieee80211_s1g_header_comp_pv1_data_type_3_supported = -1;
-static int hf_ieee80211_s1g_header_comp_reserved = -1;
-static int hf_ieee80211_s1g_header_comp_a3 = -1;
-static int hf_ieee80211_s1g_header_comp_a4 = -1;
-static int hf_ieee80211_s1g_header_comp_ccmp_update = -1;
-
-static int hf_ieee80211_mcsset = -1;
-static int hf_ieee80211_mcsset_vs = -1;
-static int hf_ieee80211_mcsset_rx_bitmask = -1;
-static int hf_ieee80211_mcsset_rx_bitmask_0to7 = -1;
-static int hf_ieee80211_mcsset_rx_bitmask_8to15 = -1;
-static int hf_ieee80211_mcsset_rx_bitmask_16to23 = -1;
-static int hf_ieee80211_mcsset_rx_bitmask_24to31 = -1;
-static int hf_ieee80211_mcsset_rx_bitmask_32 = -1;
-static int hf_ieee80211_mcsset_rx_bitmask_33to38 = -1;
-static int hf_ieee80211_mcsset_rx_bitmask_39to52 = -1;
-static int hf_ieee80211_mcsset_rx_bitmask_53to76 = -1;
-static int hf_ieee80211_mcsset_highest_data_rate = -1;
-static int hf_ieee80211_mcsset_tx_mcs_set_defined = -1;
-static int hf_ieee80211_mcsset_tx_rx_mcs_set_not_equal = -1;
-static int hf_ieee80211_mcsset_tx_max_spatial_streams = -1;
-static int hf_ieee80211_mcsset_tx_unequal_modulation = -1;
-
-static int hf_ieee80211_htex_cap = -1;
-static int hf_ieee80211_htex_vs_cap = -1;
-static int hf_ieee80211_htex_pco = -1;
-static int hf_ieee80211_htex_transtime = -1;
-static int hf_ieee80211_htex_mcs = -1;
-static int hf_ieee80211_htex_htc_support = -1;
-static int hf_ieee80211_htex_rd_responder = -1;
-
-static int hf_ieee80211_txbf = -1;
-static int hf_ieee80211_txbf_vs = -1;
-static int hf_ieee80211_txbf_cap = -1;
-static int hf_ieee80211_txbf_rcv_ssc = -1;
-static int hf_ieee80211_txbf_tx_ssc = -1;
-static int hf_ieee80211_txbf_rcv_ndp = -1;
-static int hf_ieee80211_txbf_tx_ndp = -1;
-static int hf_ieee80211_txbf_impl_txbf = -1;
-static int hf_ieee80211_txbf_calib = -1;
-static int hf_ieee80211_txbf_expl_csi = -1;
-static int hf_ieee80211_txbf_expl_uncomp_fm = -1;
-static int hf_ieee80211_txbf_expl_comp_fm = -1;
-static int hf_ieee80211_txbf_expl_bf_csi = -1;
-static int hf_ieee80211_txbf_expl_uncomp_fm_feed = -1;
-static int hf_ieee80211_txbf_expl_comp_fm_feed = -1;
-static int hf_ieee80211_txbf_csi_num_bf_ant = -1;
-static int hf_ieee80211_txbf_min_group = -1;
-static int hf_ieee80211_txbf_uncomp_sm_bf_ant = -1;
-static int hf_ieee80211_txbf_comp_sm_bf_ant = -1;
-static int hf_ieee80211_txbf_csi_max_rows_bf = -1;
-static int hf_ieee80211_txbf_chan_est = -1;
-static int hf_ieee80211_txbf_resrv = -1;
+static int hf_ieee80211_wep_iv;
+static int hf_ieee80211_wep_iv_weak;
+static int hf_ieee80211_tkip_extiv;
+static int hf_ieee80211_ccmp_extiv;
+static int hf_ieee80211_wep_key;
+static int hf_ieee80211_wep_icv;
+static int hf_ieee80211_fc_analysis_pmk;
+static int hf_ieee80211_fc_analysis_kck;
+static int hf_ieee80211_fc_analysis_kek;
+static int hf_ieee80211_fc_analysis_tk;
+static int hf_ieee80211_fc_analysis_gtk;
+
+static int hf_ieee80211_block_ack_control;
+static int hf_ieee80211_block_ack_control_ack_policy;
+static int hf_ieee80211_block_ack_control_type;
+static int hf_ieee80211_block_ack_control_reserved;
+static int hf_ieee80211_block_ack_control_tid_info;
+
+static int hf_ieee80211_block_ack_multi_tid_reserved;
+static int hf_ieee80211_block_ack_multi_tid_value;
+static int hf_ieee80211_block_ack_bitmap;
+static int hf_ieee80211_block_ack_bitmap_missing_frame;
+static int hf_ieee80211_block_ack_gcr_addr;
+
+static int hf_ieee80211_block_ack_multi_sta_aid11;
+static int hf_ieee80211_block_ack_multi_sta_ack_type;
+static int hf_ieee80211_block_ack_multi_sta_tid;
+static int hf_ieee80211_block_ack_multi_sta_aid_tid;
+static int hf_ieee80211_block_ack_multi_sta_reserved;
+static int hf_ieee80211_block_ack_multi_sta_ra;
+
+static int hf_ieee80211_tag_measure_request_measurement_mode;
+static int hf_ieee80211_tag_measure_request_bssid;
+
+static int hf_ieee80211_tag_measure_request_subelement_length;
+static int hf_ieee80211_tag_measure_request_beacon_sub_id;
+static int hf_ieee80211_tag_measure_request_beacon_sub_ssid;
+static int hf_ieee80211_tag_measure_request_beacon_sub_bri_reporting_condition;
+static int hf_ieee80211_tag_measure_request_beacon_sub_bri_threshold_offset;
+static int hf_ieee80211_tag_measure_request_beacon_sub_reporting_detail;
+static int hf_ieee80211_tag_measure_request_beacon_sub_last_report_indication_request;
+static int hf_ieee80211_tag_measure_request_beacon_unknown;
+
+static int hf_ieee80211_tag_measure_request_channel_load_sub_id;
+static int hf_ieee80211_tag_measure_request_channel_load_sub_reporting_condition;
+static int hf_ieee80211_tag_measure_request_channel_load_sub_reporting_ref;
+
+static int hf_ieee80211_tag_measure_request_noise_histogram_sub_id;
+static int hf_ieee80211_tag_measure_request_noise_histogram_sub_reporting_condition;
+static int hf_ieee80211_tag_measure_request_noise_histogram_sub_reporting_anpi_ref;
+
+static int hf_ieee80211_tag_measure_request_frame_request_type;
+static int hf_ieee80211_tag_measure_request_mac_address;
+static int hf_ieee80211_tag_measure_request_peer_mac_address;
+static int hf_ieee80211_tag_measure_request_group_id;
+
+static int hf_ieee80211_tag_measure_request_location_subject;
+static int hf_ieee80211_tag_measure_request_civic_location_type;
+static int hf_ieee80211_tag_measure_request_location_service_interval_units;
+static int hf_ieee80211_tag_measure_request_location_service_interval;
+
+static int hf_ieee80211_tag_measure_request_unknown;
+
+static int hf_ieee80211_ht_pren_type;
+static int hf_ieee80211_ht_pren_unknown;
+
+static int hf_ieee80211_ht_cap;
+static int hf_ieee80211_ht_vs_cap;
+static int hf_ieee80211_ht_ldpc_coding;
+static int hf_ieee80211_ht_chan_width;
+static int hf_ieee80211_ht_sm_pwsave;
+static int hf_ieee80211_ht_green;
+static int hf_ieee80211_ht_short20;
+static int hf_ieee80211_ht_short40;
+static int hf_ieee80211_ht_tx_stbc;
+static int hf_ieee80211_ht_rx_stbc;
+static int hf_ieee80211_ht_delayed_block_ack;
+static int hf_ieee80211_ht_max_amsdu;
+static int hf_ieee80211_ht_dss_cck_40;
+static int hf_ieee80211_ht_psmp;
+static int hf_ieee80211_ht_40_mhz_intolerant;
+static int hf_ieee80211_ht_l_sig;
+
+static int hf_ieee80211_ext_bss_mu_mimo_capable_sta_count;
+static int hf_ieee80211_ext_bss_ss_underutilization;
+static int hf_ieee80211_ext_bss_observable_sec_20mhz_utilization;
+static int hf_ieee80211_ext_bss_observable_sec_40mhz_utilization;
+static int hf_ieee80211_ext_bss_observable_sec_80mhz_utilization;
+static int hf_ieee80211_wide_bw_new_channel_width;
+static int hf_ieee80211_wide_bw_new_channel_center_freq_segment0;
+static int hf_ieee80211_wide_bw_new_channel_center_freq_segment1;
+
+static int hf_ieee80211_operat_notification_mode;
+static int hf_ieee80211_operat_mode_field_channel_width;
+static int hf_ieee80211_operat_mode_field_reserved;
+static int hf_ieee80211_operat_mode_field_rxnss;
+static int hf_ieee80211_operat_mode_field_rxnsstype;
+
+static int hf_ieee80211_tbtt_info;
+static int hf_ieee80211_tbtt_filtered_nap;
+static int hf_ieee80211_tbtt_info_count;
+static int hf_ieee80211_tbtt_info_length;
+
+static int hf_ieee80211_tbtt_operating_class;
+static int hf_ieee80211_tbtt_channel_number;
+
+static int hf_ieee80211_tbtt_offset;
+static int hf_ieee80211_tbtt_bssid;
+static int hf_ieee80211_tbtt_short_ssid;
+static int hf_ieee80211_rnr_bss_params;
+static int hf_ieee80211_rnr_oct_recommended;
+static int hf_ieee80211_rnr_same_ssid;
+static int hf_ieee80211_rnr_multiple_bssid;
+static int hf_ieee80211_rnr_transmitted_bssid;
+static int hf_ieee80211_rnr_ess_with_colocated_ap;
+static int hf_ieee80211_rnr_unsolicited_probe_responses;
+static int hf_ieee80211_rnr_same_colocated_ap;
+static int hf_ieee80211_rnr_same_reserved;
+static int hf_ieee80211_rnr_20mhz_psd_subfield;
+static int hf_ieee80211_rnr_reserved_data;
+static int hf_ieee80211_rnr_mld_params;
+static int hf_ieee80211_rnr_mld_id;
+static int hf_ieee80211_rnr_mld_link_id;
+static int hf_ieee80211_rnr_mld_bss_params_change_count;
+static int hf_ieee80211_rnr_mld_all_updates_included;
+static int hf_ieee80211_rnr_mld_disabled_link_indication;
+static int hf_ieee80211_rnr_mld_reserved;
+
+static int hf_ieee80211_ampduparam;
+static int hf_ieee80211_ampduparam_vs;
+static int hf_ieee80211_ampduparam_mpdu;
+static int hf_ieee80211_ampduparam_mpdu_start_spacing;
+static int hf_ieee80211_ampduparam_reserved;
+
+static int hf_ieee80211_beacon_sequence;
+static int hf_ieee80211_pentapartial_timestamp;
+static int hf_ieee80211_tack_next_twt_info;
+static int hf_ieee80211_tack_next_twt;
+static int hf_ieee80211_tack_flow_identifier;
+
+static int hf_ieee80211_ff_s1g_action;
+static int hf_ieee80211_ff_s1g_timestamp;
+static int hf_ieee80211_ff_s1g_change_sequence;
+static int hf_ieee80211_ff_s1g_next_tbtt;
+static int hf_ieee80211_ff_s1g_compressed_ssid;
+static int hf_ieee80211_ff_s1g_access_network_options;
+
+static int hf_ieee80211_s1g_sync_control;
+static int hf_ieee80211_s1g_sync_control_uplink_sync_request;
+static int hf_ieee80211_s1g_sync_control_time_slot_protection_request;
+static int hf_ieee80211_s1g_sync_control_reserved;
+
+static int hf_ieee80211_s1g_sector_id_index;
+static int hf_ieee80211_s1g_sector_id_preferred_sector_id;
+static int hf_ieee80211_s1g_sector_id_snr;
+static int hf_ieee80211_s1g_sector_id_receive_sector_bitmap;
+
+static int hf_ieee80211_s1g_twt_information_control;
+static int hf_ieee80211_s1g_twt_flow_identifier;
+static int hf_ieee80211_s1g_twt_response_required;
+static int hf_ieee80211_s1g_twt_next_twt_request;
+static int hf_ieee80211_s1g_twt_next_twt_subfield_size;
+static int hf_ieee80211_s1g_twt_reserved;
+static int hf_ieee80211_s1g_twt_next_twt_32;
+static int hf_ieee80211_s1g_twt_next_twt_48;
+static int hf_ieee80211_s1g_twt_next_twt_64;
+
+static int hf_ieee80211_s1g_update_edca_info;
+static int hf_ieee80211_s1g_update_edca_override;
+static int hf_ieee80211_s1g_update_edca_ps_poll_aci;
+static int hf_ieee80211_s1g_update_edca_raw_aci;
+static int hf_ieee80211_s1g_update_edca_sta_type;
+static int hf_ieee80211_s1g_update_edca_reserved;
+
+static int hf_ieee80211_s1g_cap_byte1;
+static int hf_ieee80211_s1g_cap_byte2;
+static int hf_ieee80211_s1g_cap_byte3;
+static int hf_ieee80211_s1g_cap_byte4;
+static int hf_ieee80211_s1g_cap_byte5;
+static int hf_ieee80211_s1g_cap_byte6;
+static int hf_ieee80211_s1g_cap_byte7;
+static int hf_ieee80211_s1g_cap_byte8;
+static int hf_ieee80211_s1g_cap_byte9;
+static int hf_ieee80211_s1g_cap_byte10;
+static int hf_ieee80211_s1g_cap_s1g_long_support;
+static int hf_ieee80211_s1g_cap_short_gi_for_1_mhz;
+static int hf_ieee80211_s1g_cap_short_gi_for_2_mhz;
+static int hf_ieee80211_s1g_cap_short_gi_for_4_mhz;
+static int hf_ieee80211_s1g_cap_short_gi_for_8_mhz;
+static int hf_ieee80211_s1g_cap_short_gi_for_16_mhz;
+static int hf_ieee80211_s1g_cap_supported_channel_width;
+static int hf_ieee80211_s1g_cap_rx_lpdc;
+static int hf_ieee80211_s1g_cap_tx_stbc;
+static int hf_ieee80211_s1g_cap_rx_stbc;
+static int hf_ieee80211_s1g_cap_su_beamformer_capable;
+static int hf_ieee80211_s1g_cap_su_beamformee_capable;
+static int hf_ieee80211_s1g_cap_beamformee_sts_capability;
+static int hf_ieee80211_s1g_cap_number_sounding_dimensions;
+static int hf_ieee80211_s1g_cap_mu_beamformer_capable;
+static int hf_ieee80211_s1g_cap_mu_beamformee_capable;
+static int hf_ieee80211_s1g_cap_htc_vht_capable;
+static int hf_ieee80211_s1g_cap_travelling_pilot_support;
+static int hf_ieee80211_s1g_cap_rd_responder;
+static int hf_ieee80211_s1g_cap_ht_delayed_block_ack;
+static int hf_ieee80211_s1g_cap_maximum_mpdu_length;
+static int hf_ieee80211_s1g_cap_maximum_a_mpdu_length_exp;
+static int hf_ieee80211_s1g_cap_minimum_mpdu_start_spacing;
+static int hf_ieee80211_s1g_cap_uplink_sync_capable;
+static int hf_ieee80211_s1g_cap_dynamic_aid;
+static int hf_ieee80211_s1g_cap_bat_support;
+static int hf_ieee80211_s1g_cap_tim_ade_support;
+static int hf_ieee80211_s1g_cap_non_tim_support;
+static int hf_ieee80211_s1g_cap_group_aid_support;
+static int hf_ieee80211_s1g_cap_sta_type_support;
+static int hf_ieee80211_s1g_cap_centralized_authentication_control;
+static int hf_ieee80211_s1g_cap_distributed_authentication_control;
+static int hf_ieee80211_s1g_cap_a_msdu_support;
+static int hf_ieee80211_s1g_cap_a_mpdu_support;
+static int hf_ieee80211_s1g_cap_asymmetic_block_ack_support;
+static int hf_ieee80211_s1g_cap_flow_control_support;
+static int hf_ieee80211_s1g_cap_sectorized_beam_capable;
+static int hf_ieee80211_s1g_cap_obss_mitigation_support;
+static int hf_ieee80211_s1g_cap_fragment_ba_support;
+static int hf_ieee80211_s1g_cap_ndp_ps_poll_supported;
+static int hf_ieee80211_s1g_cap_raw_operation_support;
+static int hf_ieee80211_s1g_cap_page_slicing_support;
+static int hf_ieee80211_s1g_cap_txop_sharing_implicit_ack_support;
+static int hf_ieee80211_s1g_cap_vht_link_adaptation_capable;
+static int hf_ieee80211_s1g_cap_tack_support_as_ps_poll_response;
+static int hf_ieee80211_s1g_cap_duplicate_1_mhz_support;
+static int hf_ieee80211_s1g_cap_mcs_negotiation_support;
+static int hf_ieee80211_s1g_cap_1_mhz_control_response_preamble_support;
+static int hf_ieee80211_s1g_cap_ndp_beamforming_report_poll_support;
+static int hf_ieee80211_s1g_cap_unsolicited_dynamic_aid;
+static int hf_ieee80211_s1g_cap_sector_training_operation_supported;
+static int hf_ieee80211_s1g_cap_temporary_ps_mode_switch;
+static int hf_ieee80211_s1g_cap_twt_grouping_support;
+static int hf_ieee80211_s1g_cap_bdt_capable;
+static int hf_ieee80211_s1g_cap_color;
+static int hf_ieee80211_s1g_cap_twt_requester_support;
+static int hf_ieee80211_s1g_cap_twt_responder_support;
+static int hf_ieee80211_s1g_cap_pv1_frame_support;
+static int hf_ieee80211_s1g_cap_link_adaptation_per_normal_control_response_capable;
+static int hf_ieee80211_s1g_cap_reserved;
+static int hf_ieee80211_s1g_mcs_and_nss_set;
+static int hf_ieee80211_s1g_rx_s1g_mcs_map;
+static int hf_ieee80211_s1g_rx_highest_supported_long_gi_data_rate;
+static int hf_ieee80211_s1g_tx_s1g_mcs_map;
+static int hf_ieee80211_s1g_tx_highest_supported_long_gi_data_rate;
+static int hf_ieee80211_s1g_rx_single_spatial_stream_map_for_1_mhz;
+static int hf_ieee80211_s1g_tx_single_spatial_stream_map_for_1_mhz;
+static int hf_ieee80211_s1g_mcs_and_nss_reserved;
+static int hf_ieee80211_s1g_subchannel_selective_transmission;
+static int hf_ieee80211_s1g_sst_sounding_option;
+static int hf_ieee80211_s1g_channel_activity_bitmap;
+static int hf_ieee80211_s1g_ul_activity;
+static int hf_ieee80211_s1g_dl_activity;
+static int hf_ieee80211_s1g_max_trans_width;
+static int hf_ieee80211_s1g_activity_start_time;
+static int hf_ieee80211_s1g_sst_sounding_option1;
+static int hf_ieee80211_s1g_channel_activity_bitmap1;
+static int hf_ieee80211_s1g_sounding_start_time_present;
+static int hf_ieee80211_s1g_channel_activity_reserved;
+static int hf_ieee80211_s1g_max_trans_width1;
+static int hf_ieee80211_s1g_sounding_start_time;
+static int hf_ieee80211_s1g_open_loop_link_margin;
+static int hf_ieee80211_s1g_raw_control;
+static int hf_ieee80211_s1g_raw_type;
+static int hf_ieee80211_s1g_raw_type_options;
+static int hf_ieee80211_s1g_raw_start_time_indication;
+static int hf_ieee80211_s1g_raw_raw_group_indication;
+static int hf_ieee80211_s1g_raw_channel_indication_preference;
+static int hf_ieee80211_s1g_raw_periodic_raw_indication;
+static int hf_ieee80211_s1g_raw_slot_def;
+static int hf_ieee80211_s1g_slot_def_format_indication;
+static int hf_ieee80211_s1g_slot_def_cross_slot_boundary;
+static int hf_ieee80211_s1g_slot_def_slot_duration_count8;
+static int hf_ieee80211_s1g_slot_def_num_slots6;
+static int hf_ieee80211_s1g_slot_def_slot_duration_count11;
+static int hf_ieee80211_s1g_slot_def_num_slots3;
+static int hf_ieee80211_s1g_raw_start_time;
+static int hf_ieee80211_s1g_raw_group_subfield;
+static int hf_ieee80211_s1g_raw_group_page_index;
+static int hf_ieee80211_s1g_raw_group_start_aid;
+static int hf_ieee80211_s1g_raw_group_end_aid;
+static int hf_ieee80211_s1g_raw_channel_indication;
+static int hf_ieee80211_s1g_raw_ci_channel_activity_bitmap;
+static int hf_ieee80211_s1g_raw_ci_max_trans_width;
+static int hf_ieee80211_s1g_raw_ci_ul_activity;
+static int hf_ieee80211_s1g_raw_ci_dl_activity;
+static int hf_ieee80211_s1g_raw_ci_reserved;
+static int hf_ieee80211_s1g_raw_praw_periodicity;
+static int hf_ieee80211_s1g_raw_praw_validity;
+static int hf_ieee80211_s1g_raw_praw_start_offset;
+static int hf_ieee80211_s1g_page_slice_page_period;
+static int hf_ieee80211_s1g_page_slice_control;
+static int hf_ieee80211_s1g_page_slice_page_index;
+static int hf_ieee80211_s1g_page_slice_page_slice_length;
+static int hf_ieee80211_s1g_page_slice_page_slice_count;
+static int hf_ieee80211_s1g_page_slice_block_offset;
+static int hf_ieee80211_s1g_page_slice_tim_offset;
+static int hf_ieee80211_s1g_page_slice_reserved;
+static int hf_ieee80211_s1g_page_slice_page_bitmap;
+static int hf_ieee80211_s1g_aid_request_mode;
+static int hf_ieee80211_s1g_aid_request_interval_present;
+static int hf_ieee80211_s1g_aid_request_per_sta_address_present;
+static int hf_ieee80211_s1g_aid_request_service_characteristic_present;
+static int hf_ieee80211_s1g_aid_request_non_tim_mode_switch;
+static int hf_ieee80211_s1g_aid_request_tim_mode_switch;
+static int hf_ieee80211_s1g_aid_request_group_address_present;
+static int hf_ieee80211_s1g_aid_request_reserved;
+static int hf_ieee80211_s1g_aid_request_interval;
+static int hf_ieee80211_s1g_aid_request_characteristic_sensor;
+static int hf_ieee80211_s1g_aid_request_characteristic_offload;
+static int hf_ieee80211_s1g_aid_request_characteristic_official_service;
+static int hf_ieee80211_s1g_aid_request_characteristic_reserved;
+static int hf_ieee80211_s1g_aid_req_peer_sta_addr;
+static int hf_ieee80211_s1g_aid_request_characteristic;
+static int hf_ieee80211_s1g_aid_req_group_addr;
+static int hf_ieee80211_s1g_aid_rsp_aid_group_aid;
+static int hf_ieee80211_s1g_aid_rsp_aid_switch_count;
+static int hf_ieee80211_s1g_aid_rsp_aid_response_interval;
+static int hf_ieee80211_s1g_sector_op_control_16b;
+static int hf_ieee80211_s1g_sector_op_sectorization_type_b16;
+static int hf_ieee80211_s1g_sector_op_periodic_training_indicator;
+static int hf_ieee80211_s1g_sector_op_training_period;
+static int hf_ieee80211_s1g_sector_op_remaining_beacon_interval;
+static int hf_ieee80211_s1g_sector_op_reserved_b16;
+static int hf_ieee80211_s1g_sector_op_control;
+static int hf_ieee80211_s1g_sector_op_sectorization_type;
+static int hf_ieee80211_s1g_sector_op_period;
+static int hf_ieee80211_s1g_sector_op_omni;
+static int hf_ieee80211_s1g_sector_op_group_info;
+static int hf_ieee80211_s1g_short_beacon_interval;
+static int hf_ieee80211_s1g_change_sequence;
+static int hf_ieee80211_s1g_auth_control_control;
+static int hf_ieee80211_s1g_auth_control_deferral;
+static int hf_ieee80211_s1g_auth_control_reserved;
+static int hf_ieee80211_s1g_auth_control_thresh;
+static int hf_ieee80211_s1g_auth_control_thresh_tus;
+static int hf_ieee80211_s1g_auth_slot_duration;
+static int hf_ieee80211_s1g_auth_max_trans_int;
+static int hf_ieee80211_s1g_auth_min_trans_int;
+static int hf_ieee80211_s1g_tsf_timer_accuracy;
+static int hf_ieee80211_s1g_relay_control;
+static int hf_ieee80211_s1g_relay_control_rootap_bssid;
+static int hf_ieee80211_s1g_relay_function_activation_mode;
+static int hf_ieee80211_s1g_relay_function_direction;
+static int hf_ieee80211_s1g_relay_function_enable_relay_function;
+static int hf_ieee80211_s1g_relay_function_stas_present_indic;
+static int hf_ieee80211_s1g_relay_function_reserved;
+static int hf_ieee80211_s1g_number_of_stas;
+static int hf_ieee80211_s1g_initiator_mac_address;
+static int hf_ieee80211_s1g_address_count;
+static int hf_ieee80211_s1g_reachable_add_remove;
+static int hf_ieee80211_s1g_reachable_relay_capable;
+static int hf_ieee80211_s1g_reachable_reserved;
+static int hf_ieee80211_s1g_reachable_mac_address;
+static int hf_ieee80211_s1g_relay_discovery_control;
+static int hf_ieee80211_s1g_min_data_rate_included;
+static int hf_ieee80211_s1g_mean_data_rate_included;
+static int hf_ieee80211_s1g_max_data_rate_included;
+static int hf_ieee80211_s1g_delay_and_min_phy_rate;
+static int hf_ieee80211_s1g_information_not_available;
+static int hf_ieee80211_s1g_relay_discovery_reserved;
+static int hf_ieee80211_s1g_relay_control_ul_min;
+static int hf_ieee80211_s1g_relay_control_ul_mean;
+static int hf_ieee80211_s1g_relay_control_ul_max;
+static int hf_ieee80211_s1g_relay_control_dl_min;
+static int hf_ieee80211_s1g_relay_control_dl_mean;
+static int hf_ieee80211_s1g_relay_control_dl_max;
+static int hf_ieee80211_s1g_relay_hierarchy_identifier;
+static int hf_ieee80211_s1g_relay_no_more_relay_flag;
+static int hf_ieee80211_s1g_aid_entry_mac_addr;
+static int hf_ieee80211_s1g_aid_entry_assoc_id;
+static int hf_ieee80211_s1g_beacon_compatibility_info;
+static int hf_ieee80211_s1g_beacon_interval;
+static int hf_ieee80211_s1g_tsf_completion;
+static int hf_ieee80211_s1g_channel_width;
+static int hf_ieee80211_s1g_primary_channel_width;
+static int hf_ieee80211_s1g_bss_operating_channel_width;
+static int hf_ieee80211_s1g_primary_channel_location;
+static int hf_ieee80211_s1g_reserved_b6;
+static int hf_ieee80211_s1g_mcs10_use;
+static int hf_ieee80211_s1g_operating_class;
+static int hf_ieee80211_s1g_primary_channel_number;
+static int hf_ieee80211_s1g_channel_center_frequency;
+static int hf_ieee80211_s1g_basic_mcs_and_nss_set;
+static int hf_ieee80211_s1g_sst_enabled_channel_bitmap;
+static int hf_ieee80211_s1g_sst_primary_channel_offset;
+static int hf_ieee80211_s1g_sst_channel_unit;
+static int hf_ieee80211_s1g_sst_reserved;
+static int hf_ieee80211_s1g_max_away_duration;
+static int hf_ieee80211_s1g_tim_bmapctrl;
+static int hf_ieee80211_s1g_tim_bmapctl_traffic_indicator;
+static int hf_ieee80211_s1g_tim_page_slice_number;
+static int hf_ieee80211_s1g_tim_page_index;
+static int hf_ieee80211_s1g_pvb_block_control_byte;
+static int hf_ieee80211_s1g_pvb_encoding_mode;
+static int hf_ieee80211_s1g_pvb_inverse_bitmap;
+static int hf_ieee80211_s1g_pvb_block_offset;
+static int hf_ieee80211_s1g_block_bitmap;
+static int hf_ieee80211_s1g_block_bitmap_sta_aid13;
+static int hf_ieee80211_s1g_block_bitmap_single_aid;
+static int hf_ieee80211_s1g_block_bitmap_olb_length;
+static int hf_ieee80211_s1g_block_bitmap_ade;
+static int hf_ieee80211_s1g_block_bitmap_ewl;
+static int hf_ieee80211_s1g_block_bitmap_len;
+static int hf_ieee80211_s1g_block_bitmap_ade_bytes;
+static int hf_ieee80211_s1g_probe_response_group_bitmap;
+static int hf_ieee80211_s1g_probe_resp_subfield_0;
+static int hf_ieee80211_pv1_probe_response_req_full_ssid;
+static int hf_ieee80211_pv1_probe_response_req_next_tbtt;
+static int hf_ieee80211_pv1_probe_response_req_access_network_option;
+static int hf_ieee80211_pv1_probe_response_req_s1g_beacon_compatibility;
+static int hf_ieee80211_pv1_probe_response_req_supported_rates;
+static int hf_ieee80211_pv1_probe_response_req_s1g_capability;
+static int hf_ieee80211_pv1_probe_response_req_s1g_operation;
+static int hf_ieee80211_pv1_probe_response_req_rsn;
+static int hf_ieee80211_s1g_el_op_max_awake_duration;
+static int hf_ieee80211_s1g_el_op_recovery_time_duration;
+static int hf_ieee80211_s1g_sectorized_group_id_list;
+static int hf_ieee80211_s1g_header_comp_control;
+static int hf_ieee80211_s1g_header_comp_req_resp;
+static int hf_ieee80211_s1g_header_comp_store_a3;
+static int hf_ieee80211_s1g_header_comp_store_a4;
+static int hf_ieee80211_s1g_header_comp_ccmp_update_present;
+static int hf_ieee80211_s1g_header_comp_pv1_data_type_3_supported;
+static int hf_ieee80211_s1g_header_comp_reserved;
+static int hf_ieee80211_s1g_header_comp_a3;
+static int hf_ieee80211_s1g_header_comp_a4;
+static int hf_ieee80211_s1g_header_comp_ccmp_update;
+
+static int hf_ieee80211_mcsset;
+static int hf_ieee80211_mcsset_vs;
+static int hf_ieee80211_mcsset_rx_bitmask;
+static int hf_ieee80211_mcsset_rx_bitmask_0to7;
+static int hf_ieee80211_mcsset_rx_bitmask_8to15;
+static int hf_ieee80211_mcsset_rx_bitmask_16to23;
+static int hf_ieee80211_mcsset_rx_bitmask_24to31;
+static int hf_ieee80211_mcsset_rx_bitmask_32;
+static int hf_ieee80211_mcsset_rx_bitmask_33to38;
+static int hf_ieee80211_mcsset_rx_bitmask_39to52;
+static int hf_ieee80211_mcsset_rx_bitmask_53to76;
+static int hf_ieee80211_mcsset_highest_data_rate;
+static int hf_ieee80211_mcsset_tx_mcs_set_defined;
+static int hf_ieee80211_mcsset_tx_rx_mcs_set_not_equal;
+static int hf_ieee80211_mcsset_tx_max_spatial_streams;
+static int hf_ieee80211_mcsset_tx_unequal_modulation;
+
+static int hf_ieee80211_htex_cap;
+static int hf_ieee80211_htex_vs_cap;
+static int hf_ieee80211_htex_pco;
+static int hf_ieee80211_htex_transtime;
+static int hf_ieee80211_htex_mcs;
+static int hf_ieee80211_htex_htc_support;
+static int hf_ieee80211_htex_rd_responder;
+
+static int hf_ieee80211_txbf;
+static int hf_ieee80211_txbf_vs;
+static int hf_ieee80211_txbf_cap;
+static int hf_ieee80211_txbf_rcv_ssc;
+static int hf_ieee80211_txbf_tx_ssc;
+static int hf_ieee80211_txbf_rcv_ndp;
+static int hf_ieee80211_txbf_tx_ndp;
+static int hf_ieee80211_txbf_impl_txbf;
+static int hf_ieee80211_txbf_calib;
+static int hf_ieee80211_txbf_expl_csi;
+static int hf_ieee80211_txbf_expl_uncomp_fm;
+static int hf_ieee80211_txbf_expl_comp_fm;
+static int hf_ieee80211_txbf_expl_bf_csi;
+static int hf_ieee80211_txbf_expl_uncomp_fm_feed;
+static int hf_ieee80211_txbf_expl_comp_fm_feed;
+static int hf_ieee80211_txbf_csi_num_bf_ant;
+static int hf_ieee80211_txbf_min_group;
+static int hf_ieee80211_txbf_uncomp_sm_bf_ant;
+static int hf_ieee80211_txbf_comp_sm_bf_ant;
+static int hf_ieee80211_txbf_csi_max_rows_bf;
+static int hf_ieee80211_txbf_chan_est;
+static int hf_ieee80211_txbf_resrv;
 
 /*** Begin: 802.11n D1.10 - HT Information IE  ***/
-static int hf_ieee80211_ht_info_primary_channel = -1;
-
-static int hf_ieee80211_ht_info_delimiter1 = -1;
-static int hf_ieee80211_ht_info_secondary_channel_offset = -1;
-static int hf_ieee80211_ht_info_sta_channel_width = -1;
-static int hf_ieee80211_ht_info_rifs_mode = -1;
-static int hf_ieee80211_ht_info_reserved_b4_b7 = -1;
-
-static int hf_ieee80211_ht_info_delimiter2 = -1;
-static int hf_ieee80211_ht_info_protection = -1;
-static int hf_ieee80211_ht_info_non_greenfield_sta_present = -1;
-static int hf_ieee80211_ht_info_reserved_b11 = -1;
-static int hf_ieee80211_ht_info_obss_non_ht_stas_present = -1;
-static int hf_ieee80211_ht_info_channel_center_freq_seg_2 = -1;
-static int hf_ieee80211_ht_info_reserved_b21_b23 = -1;
-
-static int hf_ieee80211_ht_info_delimiter3 = -1;
-static int hf_ieee80211_ht_info_reserved_b24_b29 = -1;
-static int hf_ieee80211_ht_info_dual_beacon = -1;
-static int hf_ieee80211_ht_info_dual_cts_protection = -1;
-static int hf_ieee80211_ht_info_secondary_beacon = -1;
-static int hf_ieee80211_ht_info_lsig_txop_protection_full_support = -1;
-static int hf_ieee80211_ht_info_pco_active = -1;
-static int hf_ieee80211_ht_info_pco_phase = -1;
-static int hf_ieee80211_ht_info_reserved_b36_b39 = -1;
+static int hf_ieee80211_ht_info_primary_channel;
+
+static int hf_ieee80211_ht_info_delimiter1;
+static int hf_ieee80211_ht_info_secondary_channel_offset;
+static int hf_ieee80211_ht_info_sta_channel_width;
+static int hf_ieee80211_ht_info_rifs_mode;
+static int hf_ieee80211_ht_info_reserved_b4_b7;
+
+static int hf_ieee80211_ht_info_delimiter2;
+static int hf_ieee80211_ht_info_protection;
+static int hf_ieee80211_ht_info_non_greenfield_sta_present;
+static int hf_ieee80211_ht_info_reserved_b11;
+static int hf_ieee80211_ht_info_obss_non_ht_stas_present;
+static int hf_ieee80211_ht_info_channel_center_freq_seg_2;
+static int hf_ieee80211_ht_info_reserved_b21_b23;
+
+static int hf_ieee80211_ht_info_delimiter3;
+static int hf_ieee80211_ht_info_reserved_b24_b29;
+static int hf_ieee80211_ht_info_dual_beacon;
+static int hf_ieee80211_ht_info_dual_cts_protection;
+static int hf_ieee80211_ht_info_secondary_beacon;
+static int hf_ieee80211_ht_info_lsig_txop_protection_full_support;
+static int hf_ieee80211_ht_info_pco_active;
+static int hf_ieee80211_ht_info_pco_phase;
+static int hf_ieee80211_ht_info_reserved_b36_b39;
 /*** End: 802.11n D1.10 - HT Information IE  ***/
 
-static int hf_ieee80211_tag_ap_channel_report_operating_class = -1;
-static int hf_ieee80211_tag_ap_channel_report_channel_list = -1;
-
-static int hf_ieee80211_tag_secondary_channel_offset = -1;
-
-static int hf_ieee80211_tag_bss_ap_avg_access_delay = -1;
-
-static int hf_ieee80211_tag_antenna_id = -1;
-
-static int hf_ieee80211_tag_rsni = -1;
-
-static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up0 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up1 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up2 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up3 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up4 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up5 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up6 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up7 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_ac0 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_ac1 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_ac2 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_ac3 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_rsv = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_up0 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_up1 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_up2 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_up3 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_up4 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_up5 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_up6 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_up7 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_ac0 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_ac1 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_ac2 = -1;
-static int hf_ieee80211_tag_bss_avb_adm_cap_ac3 = -1;
-
-static int hf_ieee80211_tag_bss_avg_ac_access_delay_be = -1;
-static int hf_ieee80211_tag_bss_avg_ac_access_delay_bk = -1;
-static int hf_ieee80211_tag_bss_avg_ac_access_delay_vi = -1;
-static int hf_ieee80211_tag_bss_avg_ac_access_delay_vo = -1;
-
-static int hf_ieee80211_tag_rm_enabled_capabilities = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b0 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b1 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b2 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b3 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b4 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b5 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b6 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b7 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b8 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b9 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b10 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b11 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b12 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b13 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b14 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b15 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b16 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b17 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b18to20 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b21to23 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b24to26 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b27 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b28 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b29 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b30 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b31 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b32 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b33 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b34 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_b35 = -1;
-static int hf_ieee80211_tag_rm_enabled_capabilities_o5 = -1;
-
-static int hf_ieee80211_tag_rcpi = -1;
-static int hf_ieee80211_tag_multiple_bssid = -1;
-static int hf_ieee80211_tag_multiple_bssid_subelem_id = -1;
-static int hf_ieee80211_tag_multiple_bssid_subelem_len = -1;
-static int hf_ieee80211_tag_multiple_bssid_subelem_reserved = -1;
-static int hf_ieee80211_tag_multiple_bssid_subelem_nontrans_profile = -1;
-
-static int hf_ieee80211_tag_20_40_bc = -1;
-static int hf_ieee80211_tag_20_40_bc_information_request = -1;
-static int hf_ieee80211_tag_20_40_bc_forty_mhz_intolerant = -1;
-static int hf_ieee80211_tag_20_40_bc_20_mhz_bss_width_request = -1;
-static int hf_ieee80211_tag_20_40_bc_obss_scanning_exemption_request = -1;
-static int hf_ieee80211_tag_20_40_bc_obss_scanning_exemption_grant = -1;
-static int hf_ieee80211_tag_20_40_bc_reserved = -1;
-
-static int hf_ieee80211_tag_intolerant_operating_class = -1;
-static int hf_ieee80211_tag_intolerant_channel_list = -1;
-static int hf_ieee80211_tag_intolerant_channel = -1;
-
-static int hf_ieee80211_tag_power_constraint_local = -1;
-
-static int hf_ieee80211_tag_power_capability_min = -1;
-static int hf_ieee80211_tag_power_capability_max = -1;
-
-static int hf_ieee80211_tag_tpc_report_trsmt_pow = -1;
-static int hf_ieee80211_tag_tpc_report_link_mrg = -1;
-
-static int hf_ieee80211_tag_supported_channels = -1;
-static int hf_ieee80211_tag_supported_channels_first = -1;
-static int hf_ieee80211_tag_supported_channels_range = -1;
-
-static int hf_ieee80211_csa_channel_switch_mode = -1;
-static int hf_ieee80211_csa_new_channel_number = -1;
-static int hf_ieee80211_csa_channel_switch_count = -1;
-
-static int hf_ieee80211_tag_measure_request_token = -1;
-static int hf_ieee80211_tag_measure_request_mode = -1;
-static int hf_ieee80211_tag_measure_request_mode_parallel = -1;
-static int hf_ieee80211_tag_measure_request_mode_enable = -1;
-static int hf_ieee80211_tag_measure_request_mode_request = -1;
-static int hf_ieee80211_tag_measure_request_mode_report = -1;
-static int hf_ieee80211_tag_measure_request_mode_duration_mandatory = -1;
-static int hf_ieee80211_tag_measure_request_mode_reserved = -1;
-static int hf_ieee80211_tag_measure_request_type = -1;
-
-static int hf_ieee80211_tag_measure_request_channel_number = -1;
-static int hf_ieee80211_tag_measure_request_start_time = -1;
-static int hf_ieee80211_tag_measure_request_duration = -1;
-
-static int hf_ieee80211_tag_measure_request_operating_class = -1;
-static int hf_ieee80211_tag_measure_request_randomization_interval = -1;
-
-static int hf_ieee80211_tag_measure_report_measurement_token = -1;
-static int hf_ieee80211_tag_measure_report_mode = -1;
-static int hf_ieee80211_tag_measure_report_mode_late = -1;
-static int hf_ieee80211_tag_measure_report_mode_incapable = -1;
-static int hf_ieee80211_tag_measure_report_mode_refused = -1;
-static int hf_ieee80211_tag_measure_report_mode_reserved = -1;
-static int hf_ieee80211_tag_measure_report_type = -1;
-static int hf_ieee80211_tag_measure_report_channel_number = -1;
-static int hf_ieee80211_tag_measure_report_start_time = -1;
-static int hf_ieee80211_tag_measure_report_duration = -1;
-
-static int hf_ieee80211_tag_measure_basic_map_field = -1;
-static int hf_ieee80211_tag_measure_map_field_bss = -1;
-static int hf_ieee80211_tag_measure_map_field_ofdm = -1;
-static int hf_ieee80211_tag_measure_map_field_unident_signal = -1;
-static int hf_ieee80211_tag_measure_map_field_radar = -1;
-static int hf_ieee80211_tag_measure_map_field_unmeasured = -1;
-static int hf_ieee80211_tag_measure_map_field_reserved = -1;
-
-static int hf_ieee80211_tag_measure_cca_busy_fraction = -1;
-
-static int hf_ieee80211_tag_measure_rpi_histogram_report = -1;
-static int hf_ieee80211_tag_measure_rpi_histogram_report_0 = -1;
-static int hf_ieee80211_tag_measure_rpi_histogram_report_1 = -1;
-static int hf_ieee80211_tag_measure_rpi_histogram_report_2 = -1;
-static int hf_ieee80211_tag_measure_rpi_histogram_report_3 = -1;
-static int hf_ieee80211_tag_measure_rpi_histogram_report_4 = -1;
-static int hf_ieee80211_tag_measure_rpi_histogram_report_5 = -1;
-static int hf_ieee80211_tag_measure_rpi_histogram_report_6 = -1;
-static int hf_ieee80211_tag_measure_rpi_histogram_report_7 = -1;
-
-static int hf_ieee80211_tag_measure_report_operating_class = -1;
-static int hf_ieee80211_tag_measure_report_channel_load = -1;
-static int hf_ieee80211_tag_measure_report_frame_info = -1;
-static int hf_ieee80211_tag_measure_report_frame_info_phy_type = -1;
-static int hf_ieee80211_tag_measure_report_frame_info_frame_type = -1;
-static int hf_ieee80211_tag_measure_report_rcpi = -1;
-static int hf_ieee80211_tag_measure_report_rsni = -1;
-static int hf_ieee80211_tag_measure_report_bssid = -1;
-static int hf_ieee80211_tag_measure_report_ant_id = -1;
-static int hf_ieee80211_tag_measure_report_anpi = -1;
-static int hf_ieee80211_tag_measure_report_ipi_density_0 = -1;
-static int hf_ieee80211_tag_measure_report_ipi_density_1 = -1;
-static int hf_ieee80211_tag_measure_report_ipi_density_2 = -1;
-static int hf_ieee80211_tag_measure_report_ipi_density_3 = -1;
-static int hf_ieee80211_tag_measure_report_ipi_density_4 = -1;
-static int hf_ieee80211_tag_measure_report_ipi_density_5 = -1;
-static int hf_ieee80211_tag_measure_report_ipi_density_6 = -1;
-static int hf_ieee80211_tag_measure_report_ipi_density_7 = -1;
-static int hf_ieee80211_tag_measure_report_ipi_density_8 = -1;
-static int hf_ieee80211_tag_measure_report_ipi_density_9 = -1;
-static int hf_ieee80211_tag_measure_report_ipi_density_10 = -1;
-static int hf_ieee80211_tag_measure_report_parent_tsf = -1;
-
-static int hf_ieee80211_tag_measure_report_subelement_length = -1;
-static int hf_ieee80211_tag_measure_report_beacon_sub_id = -1;
-static int hf_ieee80211_tag_measure_report_beacon_unknown = -1;
-static int hf_ieee80211_tag_measure_report_beacon_sub_last_report_indication = -1;
-static int hf_ieee80211_tag_measure_reported_frame_frag_id = -1;
-static int hf_ieee80211_tag_measure_reported_frame_frag_rep_id = -1;
-static int hf_ieee80211_tag_measure_reported_frame_frag_number = -1;
-static int hf_ieee80211_tag_measure_reported_frame_frag_more =-1;
-
-static int hf_ieee80211_tag_measure_report_lci_sub_id = -1;
-static int hf_ieee80211_tag_measure_report_lci_lci = -1;
-static int hf_ieee80211_tag_measure_report_lci_z_sta_floor_info = -1;
-static int hf_ieee80211_tag_measure_report_lci_z_sta_floor_info_expected_to_move = -1;
-static int hf_ieee80211_tag_measure_report_lci_z_sta_floor_info_sta_floor_number = -1;
-static int hf_ieee80211_tag_measure_report_lci_z_sta_height_above_floor = -1;
-static int hf_ieee80211_tag_measure_report_lci_z_sta_height_above_floor_uncertainty = -1;
-static int hf_ieee80211_tag_measure_report_lci_urp = -1;
-static int hf_ieee80211_tag_measure_report_lci_urp_retransmission_allowed = -1;
-static int hf_ieee80211_tag_measure_report_lci_urp_retention_expires_relative_present = -1;
-static int hf_ieee80211_tag_measure_report_lci_urp_sta_location_policy = -1;
-static int hf_ieee80211_tag_measure_report_lci_urp_reserved = -1;
-static int hf_ieee80211_tag_measure_report_lci_urp_retention_expires_relative = -1;
-static int hf_ieee80211_tag_measure_report_lci_unknown = -1;
-
-static int hf_ieee80211_tag_measure_report_civic_location_type = -1;
-static int hf_ieee80211_tag_measure_report_civic_sub_id = -1;
-static int hf_ieee80211_tag_measure_report_location_civic_country = -1;
-static int hf_ieee80211_tag_measure_report_location_civic_type = -1;
-static int hf_ieee80211_tag_measure_report_location_civic_length = -1;
-static int hf_ieee80211_tag_measure_report_location_civic = -1;
-
-static int hf_ieee80211_tag_measure_report_unknown = -1;
-
-static int hf_ieee80211_tag_quiet_count = -1;
-static int hf_ieee80211_tag_quiet_period = -1;
-static int hf_ieee80211_tag_quiet_duration = -1;
-static int hf_ieee80211_tag_quiet_offset = -1;
-
-static int hf_ieee80211_tag_dfs_owner = -1;
-static int hf_ieee80211_tag_dfs_recovery_interval = -1;
-static int hf_ieee80211_tag_dfs_channel_map = -1;
-static int hf_ieee80211_tag_dfs_channel_number = -1;
-static int hf_ieee80211_tag_dfs_map = -1;
-
-static int hf_ieee80211_tag_erp_info = -1;
-static int hf_ieee80211_tag_erp_info_erp_present = -1;
-static int hf_ieee80211_tag_erp_info_use_protection = -1;
-static int hf_ieee80211_tag_erp_info_barker_preamble_mode = -1;
-static int hf_ieee80211_tag_erp_info_reserved = -1;
-
-static int hf_ieee80211_tag_extended_capabilities = -1;
-static int hf_ieee80211_tag_extended_capabilities_b0 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b1 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b2 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b3 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b4 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b5 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b6 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b7 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b8 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b9 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b10 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b11 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b12 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b13 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b14 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b15 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b16 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b17 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b18 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b19 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b20 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b21 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b22 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b23 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b24 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b25 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b26 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b27 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b28 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b29 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b30 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b31 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b32 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b33 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b34 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b35 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b36 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b37 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b38 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b39 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b40 = -1;
-static int hf_ieee80211_tag_extended_capabilities_serv_int_granularity = -1;
-static int hf_ieee80211_tag_extended_capabilities_b44 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b45 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b46 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b47 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b48 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b49 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b50 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b51 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b52 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b53 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b54 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b55 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b56 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b57 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b58 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b59 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b60 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b61 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b62 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b63 = -1;
+static int hf_ieee80211_tag_ap_channel_report_operating_class;
+static int hf_ieee80211_tag_ap_channel_report_channel_list;
+
+static int hf_ieee80211_tag_secondary_channel_offset;
+
+static int hf_ieee80211_tag_bss_ap_avg_access_delay;
+
+static int hf_ieee80211_tag_antenna_id;
+
+static int hf_ieee80211_tag_rsni;
+
+static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask;
+static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up0;
+static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up1;
+static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up2;
+static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up3;
+static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up4;
+static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up5;
+static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up6;
+static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_up7;
+static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_ac0;
+static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_ac1;
+static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_ac2;
+static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_ac3;
+static int hf_ieee80211_tag_bss_avb_adm_cap_bitmask_rsv;
+static int hf_ieee80211_tag_bss_avb_adm_cap_up0;
+static int hf_ieee80211_tag_bss_avb_adm_cap_up1;
+static int hf_ieee80211_tag_bss_avb_adm_cap_up2;
+static int hf_ieee80211_tag_bss_avb_adm_cap_up3;
+static int hf_ieee80211_tag_bss_avb_adm_cap_up4;
+static int hf_ieee80211_tag_bss_avb_adm_cap_up5;
+static int hf_ieee80211_tag_bss_avb_adm_cap_up6;
+static int hf_ieee80211_tag_bss_avb_adm_cap_up7;
+static int hf_ieee80211_tag_bss_avb_adm_cap_ac0;
+static int hf_ieee80211_tag_bss_avb_adm_cap_ac1;
+static int hf_ieee80211_tag_bss_avb_adm_cap_ac2;
+static int hf_ieee80211_tag_bss_avb_adm_cap_ac3;
+
+static int hf_ieee80211_tag_bss_avg_ac_access_delay_be;
+static int hf_ieee80211_tag_bss_avg_ac_access_delay_bk;
+static int hf_ieee80211_tag_bss_avg_ac_access_delay_vi;
+static int hf_ieee80211_tag_bss_avg_ac_access_delay_vo;
+
+static int hf_ieee80211_tag_rm_enabled_capabilities;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b0;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b1;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b2;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b3;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b4;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b5;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b6;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b7;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b8;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b9;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b10;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b11;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b12;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b13;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b14;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b15;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b16;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b17;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b18to20;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b21to23;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b24to26;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b27;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b28;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b29;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b30;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b31;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b32;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b33;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b34;
+static int hf_ieee80211_tag_rm_enabled_capabilities_b35;
+static int hf_ieee80211_tag_rm_enabled_capabilities_o5;
+
+static int hf_ieee80211_tag_rcpi;
+static int hf_ieee80211_tag_multiple_bssid;
+static int hf_ieee80211_tag_multiple_bssid_subelem_id;
+static int hf_ieee80211_tag_multiple_bssid_subelem_len;
+static int hf_ieee80211_tag_multiple_bssid_subelem_reserved;
+static int hf_ieee80211_tag_multiple_bssid_subelem_nontrans_profile;
+
+static int hf_ieee80211_tag_20_40_bc;
+static int hf_ieee80211_tag_20_40_bc_information_request;
+static int hf_ieee80211_tag_20_40_bc_forty_mhz_intolerant;
+static int hf_ieee80211_tag_20_40_bc_20_mhz_bss_width_request;
+static int hf_ieee80211_tag_20_40_bc_obss_scanning_exemption_request;
+static int hf_ieee80211_tag_20_40_bc_obss_scanning_exemption_grant;
+static int hf_ieee80211_tag_20_40_bc_reserved;
+
+static int hf_ieee80211_tag_intolerant_operating_class;
+static int hf_ieee80211_tag_intolerant_channel_list;
+static int hf_ieee80211_tag_intolerant_channel;
+
+static int hf_ieee80211_tag_power_constraint_local;
+
+static int hf_ieee80211_tag_power_capability_min;
+static int hf_ieee80211_tag_power_capability_max;
+
+static int hf_ieee80211_tag_tpc_report_trsmt_pow;
+static int hf_ieee80211_tag_tpc_report_link_mrg;
+
+static int hf_ieee80211_tag_supported_channels;
+static int hf_ieee80211_tag_supported_channels_first;
+static int hf_ieee80211_tag_supported_channels_range;
+
+static int hf_ieee80211_csa_channel_switch_mode;
+static int hf_ieee80211_csa_new_channel_number;
+static int hf_ieee80211_csa_channel_switch_count;
+
+static int hf_ieee80211_tag_measure_request_token;
+static int hf_ieee80211_tag_measure_request_mode;
+static int hf_ieee80211_tag_measure_request_mode_parallel;
+static int hf_ieee80211_tag_measure_request_mode_enable;
+static int hf_ieee80211_tag_measure_request_mode_request;
+static int hf_ieee80211_tag_measure_request_mode_report;
+static int hf_ieee80211_tag_measure_request_mode_duration_mandatory;
+static int hf_ieee80211_tag_measure_request_mode_reserved;
+static int hf_ieee80211_tag_measure_request_type;
+
+static int hf_ieee80211_tag_measure_request_channel_number;
+static int hf_ieee80211_tag_measure_request_start_time;
+static int hf_ieee80211_tag_measure_request_duration;
+
+static int hf_ieee80211_tag_measure_request_operating_class;
+static int hf_ieee80211_tag_measure_request_randomization_interval;
+
+static int hf_ieee80211_tag_measure_report_measurement_token;
+static int hf_ieee80211_tag_measure_report_mode;
+static int hf_ieee80211_tag_measure_report_mode_late;
+static int hf_ieee80211_tag_measure_report_mode_incapable;
+static int hf_ieee80211_tag_measure_report_mode_refused;
+static int hf_ieee80211_tag_measure_report_mode_reserved;
+static int hf_ieee80211_tag_measure_report_type;
+static int hf_ieee80211_tag_measure_report_channel_number;
+static int hf_ieee80211_tag_measure_report_start_time;
+static int hf_ieee80211_tag_measure_report_duration;
+
+static int hf_ieee80211_tag_measure_basic_map_field;
+static int hf_ieee80211_tag_measure_map_field_bss;
+static int hf_ieee80211_tag_measure_map_field_ofdm;
+static int hf_ieee80211_tag_measure_map_field_unident_signal;
+static int hf_ieee80211_tag_measure_map_field_radar;
+static int hf_ieee80211_tag_measure_map_field_unmeasured;
+static int hf_ieee80211_tag_measure_map_field_reserved;
+
+static int hf_ieee80211_tag_measure_cca_busy_fraction;
+
+static int hf_ieee80211_tag_measure_rpi_histogram_report;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_0;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_1;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_2;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_3;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_4;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_5;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_6;
+static int hf_ieee80211_tag_measure_rpi_histogram_report_7;
+
+static int hf_ieee80211_tag_measure_report_operating_class;
+static int hf_ieee80211_tag_measure_report_channel_load;
+static int hf_ieee80211_tag_measure_report_frame_info;
+static int hf_ieee80211_tag_measure_report_frame_info_phy_type;
+static int hf_ieee80211_tag_measure_report_frame_info_frame_type;
+static int hf_ieee80211_tag_measure_report_rcpi;
+static int hf_ieee80211_tag_measure_report_rsni;
+static int hf_ieee80211_tag_measure_report_bssid;
+static int hf_ieee80211_tag_measure_report_ant_id;
+static int hf_ieee80211_tag_measure_report_anpi;
+static int hf_ieee80211_tag_measure_report_ipi_density_0;
+static int hf_ieee80211_tag_measure_report_ipi_density_1;
+static int hf_ieee80211_tag_measure_report_ipi_density_2;
+static int hf_ieee80211_tag_measure_report_ipi_density_3;
+static int hf_ieee80211_tag_measure_report_ipi_density_4;
+static int hf_ieee80211_tag_measure_report_ipi_density_5;
+static int hf_ieee80211_tag_measure_report_ipi_density_6;
+static int hf_ieee80211_tag_measure_report_ipi_density_7;
+static int hf_ieee80211_tag_measure_report_ipi_density_8;
+static int hf_ieee80211_tag_measure_report_ipi_density_9;
+static int hf_ieee80211_tag_measure_report_ipi_density_10;
+static int hf_ieee80211_tag_measure_report_parent_tsf;
+
+static int hf_ieee80211_tag_measure_report_subelement_length;
+static int hf_ieee80211_tag_measure_report_beacon_sub_id;
+static int hf_ieee80211_tag_measure_report_beacon_unknown;
+static int hf_ieee80211_tag_measure_report_beacon_sub_last_report_indication;
+static int hf_ieee80211_tag_measure_reported_frame_frag_id;
+static int hf_ieee80211_tag_measure_reported_frame_frag_rep_id;
+static int hf_ieee80211_tag_measure_reported_frame_frag_number;
+static int hf_ieee80211_tag_measure_reported_frame_frag_more;
+
+static int hf_ieee80211_tag_measure_report_lci_sub_id;
+static int hf_ieee80211_tag_measure_report_lci_lci;
+static int hf_ieee80211_tag_measure_report_lci_z_sta_floor_info;
+static int hf_ieee80211_tag_measure_report_lci_z_sta_floor_info_expected_to_move;
+static int hf_ieee80211_tag_measure_report_lci_z_sta_floor_info_sta_floor_number;
+static int hf_ieee80211_tag_measure_report_lci_z_sta_height_above_floor;
+static int hf_ieee80211_tag_measure_report_lci_z_sta_height_above_floor_uncertainty;
+static int hf_ieee80211_tag_measure_report_lci_urp;
+static int hf_ieee80211_tag_measure_report_lci_urp_retransmission_allowed;
+static int hf_ieee80211_tag_measure_report_lci_urp_retention_expires_relative_present;
+static int hf_ieee80211_tag_measure_report_lci_urp_sta_location_policy;
+static int hf_ieee80211_tag_measure_report_lci_urp_reserved;
+static int hf_ieee80211_tag_measure_report_lci_urp_retention_expires_relative;
+static int hf_ieee80211_tag_measure_report_lci_unknown;
+
+static int hf_ieee80211_tag_measure_report_civic_location_type;
+static int hf_ieee80211_tag_measure_report_civic_sub_id;
+static int hf_ieee80211_tag_measure_report_location_civic_country;
+static int hf_ieee80211_tag_measure_report_location_civic_type;
+static int hf_ieee80211_tag_measure_report_location_civic_length;
+static int hf_ieee80211_tag_measure_report_location_civic;
+
+static int hf_ieee80211_tag_measure_report_unknown;
+
+static int hf_ieee80211_tag_quiet_count;
+static int hf_ieee80211_tag_quiet_period;
+static int hf_ieee80211_tag_quiet_duration;
+static int hf_ieee80211_tag_quiet_offset;
+
+static int hf_ieee80211_tag_dfs_owner;
+static int hf_ieee80211_tag_dfs_recovery_interval;
+static int hf_ieee80211_tag_dfs_channel_map;
+static int hf_ieee80211_tag_dfs_channel_number;
+static int hf_ieee80211_tag_dfs_map;
+
+static int hf_ieee80211_tag_erp_info;
+static int hf_ieee80211_tag_erp_info_erp_present;
+static int hf_ieee80211_tag_erp_info_use_protection;
+static int hf_ieee80211_tag_erp_info_barker_preamble_mode;
+static int hf_ieee80211_tag_erp_info_reserved;
+
+static int hf_ieee80211_tag_extended_capabilities;
+static int hf_ieee80211_tag_extended_capabilities_b0;
+static int hf_ieee80211_tag_extended_capabilities_b1;
+static int hf_ieee80211_tag_extended_capabilities_b2;
+static int hf_ieee80211_tag_extended_capabilities_b3;
+static int hf_ieee80211_tag_extended_capabilities_b4;
+static int hf_ieee80211_tag_extended_capabilities_b5;
+static int hf_ieee80211_tag_extended_capabilities_b6;
+static int hf_ieee80211_tag_extended_capabilities_b7;
+static int hf_ieee80211_tag_extended_capabilities_b8;
+static int hf_ieee80211_tag_extended_capabilities_b9;
+static int hf_ieee80211_tag_extended_capabilities_b10;
+static int hf_ieee80211_tag_extended_capabilities_b11;
+static int hf_ieee80211_tag_extended_capabilities_b12;
+static int hf_ieee80211_tag_extended_capabilities_b13;
+static int hf_ieee80211_tag_extended_capabilities_b14;
+static int hf_ieee80211_tag_extended_capabilities_b15;
+static int hf_ieee80211_tag_extended_capabilities_b16;
+static int hf_ieee80211_tag_extended_capabilities_b17;
+static int hf_ieee80211_tag_extended_capabilities_b18;
+static int hf_ieee80211_tag_extended_capabilities_b19;
+static int hf_ieee80211_tag_extended_capabilities_b20;
+static int hf_ieee80211_tag_extended_capabilities_b21;
+static int hf_ieee80211_tag_extended_capabilities_b22;
+static int hf_ieee80211_tag_extended_capabilities_b23;
+static int hf_ieee80211_tag_extended_capabilities_b24;
+static int hf_ieee80211_tag_extended_capabilities_b25;
+static int hf_ieee80211_tag_extended_capabilities_b26;
+static int hf_ieee80211_tag_extended_capabilities_b27;
+static int hf_ieee80211_tag_extended_capabilities_b28;
+static int hf_ieee80211_tag_extended_capabilities_b29;
+static int hf_ieee80211_tag_extended_capabilities_b30;
+static int hf_ieee80211_tag_extended_capabilities_b31;
+static int hf_ieee80211_tag_extended_capabilities_b32;
+static int hf_ieee80211_tag_extended_capabilities_b33;
+static int hf_ieee80211_tag_extended_capabilities_b34;
+static int hf_ieee80211_tag_extended_capabilities_b35;
+static int hf_ieee80211_tag_extended_capabilities_b36;
+static int hf_ieee80211_tag_extended_capabilities_b37;
+static int hf_ieee80211_tag_extended_capabilities_b38;
+static int hf_ieee80211_tag_extended_capabilities_b39;
+static int hf_ieee80211_tag_extended_capabilities_b40;
+static int hf_ieee80211_tag_extended_capabilities_serv_int_granularity;
+static int hf_ieee80211_tag_extended_capabilities_b44;
+static int hf_ieee80211_tag_extended_capabilities_b45;
+static int hf_ieee80211_tag_extended_capabilities_b46;
+static int hf_ieee80211_tag_extended_capabilities_b47;
+static int hf_ieee80211_tag_extended_capabilities_b48;
+static int hf_ieee80211_tag_extended_capabilities_b49;
+static int hf_ieee80211_tag_extended_capabilities_b50;
+static int hf_ieee80211_tag_extended_capabilities_b51;
+static int hf_ieee80211_tag_extended_capabilities_b52;
+static int hf_ieee80211_tag_extended_capabilities_b53;
+static int hf_ieee80211_tag_extended_capabilities_b54;
+static int hf_ieee80211_tag_extended_capabilities_b55;
+static int hf_ieee80211_tag_extended_capabilities_b56;
+static int hf_ieee80211_tag_extended_capabilities_b57;
+static int hf_ieee80211_tag_extended_capabilities_b58;
+static int hf_ieee80211_tag_extended_capabilities_b59;
+static int hf_ieee80211_tag_extended_capabilities_b60;
+static int hf_ieee80211_tag_extended_capabilities_b61;
+static int hf_ieee80211_tag_extended_capabilities_b62;
+static int hf_ieee80211_tag_extended_capabilities_b63;
 /* Used for the two-byte ext-cap field when present */
-static int hf_ieee80211_tag_extended_capabilities_2 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b56_2 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b57_2 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b58_2 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b59_2 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b60_2 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b61_2 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b62_2 = -1;
-static int hf_ieee80211_tag_extended_capabilities_max_num_msdus = -1;
-static int hf_ieee80211_tag_extended_capabilities_b65_2 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b66_2 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b67_2 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b68_2 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b69_2 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b70_2 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b71_2 = -1;
-
-static int hf_ieee80211_tag_extended_capabilities_b72 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b73 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b74 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b75 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b76 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b77 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b78 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b79 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b80 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b81 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b82 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b83 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b84 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b85 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b86 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b87 = -1;
-
-static int hf_ieee80211_tag_extended_capabilities_b88 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b89 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b90 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b91 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b92 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b93 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b94 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b95 = -1;
-
-static int hf_ieee80211_tag_extended_capabilities_b96 = -1;
-static int hf_ieee80211_tag_extended_capabilities_b97 = -1;
-static int hf_ieee80211_tag_extended_capabilities_reserved2 = -1;
-
-static int hf_ieee80211_tag_cisco_ccx1_unknown = -1;
-static int hf_ieee80211_tag_cisco_ccx1_name = -1;
-static int hf_ieee80211_tag_cisco_ccx1_clients = -1;
-static int hf_ieee80211_tag_cisco_ccx1_unknown2 = -1;
-
-static int hf_ieee80211_vht_cap = -1;
-static int hf_ieee80211_vht_max_mpdu_length = -1;
-static int hf_ieee80211_vht_supported_chan_width_set = -1;
-static int hf_ieee80211_vht_rx_ldpc = -1;
-static int hf_ieee80211_vht_short_gi_for_80 = -1;
-static int hf_ieee80211_vht_short_gi_for_160 = -1;
-static int hf_ieee80211_vht_tx_stbc = -1;
-static int hf_ieee80211_vht_rx_stbc = -1;
-static int hf_ieee80211_vht_su_beamformer_cap = -1;
-static int hf_ieee80211_vht_su_beamformee_cap = -1;
-static int hf_ieee80211_vht_beamformer_antennas = -1;
-static int hf_ieee80211_vht_sounding_dimensions = -1;
-static int hf_ieee80211_vht_mu_beamformer_cap = -1;
-static int hf_ieee80211_vht_mu_beamformee_cap = -1;
-static int hf_ieee80211_vht_txop_ps = -1;
-static int hf_ieee80211_vht_var_htc_field = -1;
-static int hf_ieee80211_vht_max_ampdu = -1;
-static int hf_ieee80211_vht_link_adaptation_cap = -1;
-static int hf_ieee80211_vht_rx_pattern = -1;
-static int hf_ieee80211_vht_tx_pattern = -1;
-static int hf_ieee80211_vht_ext_nss_bw_support = -1;
-
-static int hf_ieee80211_vht_mcsset = -1;
-
-static int hf_ieee80211_vht_mcsset_rx_mcs_map = -1;
-static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_1_ss = -1;
-static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_2_ss = -1;
-static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_3_ss = -1;
-static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_4_ss = -1;
-static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_5_ss = -1;
-static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_6_ss = -1;
-static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_7_ss = -1;
-static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_8_ss = -1;
-
-static int hf_ieee80211_vht_mcsset_max_nsts_total = -1;
-static int hf_ieee80211_vht_mcsset_rx_highest_long_gi = -1;
-static int hf_ieee80211_vht_mcsset_extended_nss_bw_capable = -1;
-static int hf_ieee80211_vht_mcsset_reserved = -1;
-
-static int hf_ieee80211_vht_mcsset_tx_mcs_map = -1;
-static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_1_ss = -1;
-static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_2_ss = -1;
-static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_3_ss = -1;
-static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_4_ss = -1;
-static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_5_ss = -1;
-static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_6_ss = -1;
-static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_7_ss = -1;
-static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_8_ss = -1;
-
-static int hf_ieee80211_vht_op = -1;
-static int hf_ieee80211_vht_op_channel_width = -1;
-static int hf_ieee80211_vht_op_channel_center0 = -1;
-static int hf_ieee80211_vht_op_channel_center1 = -1;
-
-static int hf_ieee80211_vht_op_basic_mcs_map = -1;
-static int hf_ieee80211_vht_op_max_basic_mcs_for_1_ss = -1;
-static int hf_ieee80211_vht_op_max_basic_mcs_for_2_ss = -1;
-static int hf_ieee80211_vht_op_max_basic_mcs_for_3_ss = -1;
-static int hf_ieee80211_vht_op_max_basic_mcs_for_4_ss = -1;
-static int hf_ieee80211_vht_op_max_basic_mcs_for_5_ss = -1;
-static int hf_ieee80211_vht_op_max_basic_mcs_for_6_ss = -1;
-static int hf_ieee80211_vht_op_max_basic_mcs_for_7_ss = -1;
-static int hf_ieee80211_vht_op_max_basic_mcs_for_8_ss = -1;
-static int hf_ieee80211_vht_mcsset_tx_highest_long_gi = -1;
-
-static int hf_ieee80211_vht_tpe_pwr_info = -1;
-static int hf_ieee80211_vht_tpe_pwr_info_count = -1;
-static int hf_ieee80211_vht_tpe_pwr_info_unit = -1;
-static int hf_ieee80211_vht_tpe_pwr_info_category = -1;
-static int hf_ieee80211_vht_tpe_pwr_constr_20 = -1;
-static int hf_ieee80211_vht_tpe_pwr_constr_40 = -1;
-static int hf_ieee80211_vht_tpe_pwr_constr_80 = -1;
-static int hf_ieee80211_vht_tpe_pwr_constr_160 = -1;
-static int hf_ieee80211_vht_tpe_any_bw_psd = -1;
-static int hf_ieee80211_vht_tpe_psd = -1;
-
-static int hf_ieee80211_beamform_feedback_seg_retrans_bitmap = -1;
-
-static int hf_ieee80211_ndp_annc_token = -1;
-static int hf_ieee80211_ndp_annc_variant = -1;
-static int hf_ieee80211_ndp_annc_token_number = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_aid12 = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_feedback_type = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_nc_index = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_reserved = -1;
-
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008 = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_aid11 = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_ltf_offset = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_r2i_n_sts = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_r2i_rep = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_i2r_n_sts = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_reserved1 = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_disambiguation = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_i2r_rep = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_reserved2 = -1;
-
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2043 = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2043_aid11 = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2043_sac = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2043_disambiguation = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2043_reserved = -1;
-
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2044 = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2044_aid11 = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2044_partial_tsf = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2044_disambiguation = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2044_reserved = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2044_token = -1;
-
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2045 = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2045_aid11 = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2045_i2r_ndp_tx_power = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2045_r2i_ndp_target_rssi = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2045_disambiguation = -1;
-static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2045_reserved = -1;
-
-
-static int hf_ieee80211_ndp_eht_annc_sta_info = -1;
-static int hf_ieee80211_ndp_eht_annc_aid11 = -1;
-static int hf_ieee80211_ndp_eht_annc_resolution = -1;
-static int hf_ieee80211_ndp_eht_annc_feedback_map = -1;
-static int hf_ieee80211_ndp_eht_annc_reserved1 = -1;
-static int hf_ieee80211_ndp_eht_annc_nc_index = -1;
-static int hf_ieee80211_ndp_eht_annc_feedback_type = -1;
-static int hf_ieee80211_ndp_eht_annc_disambiguation = -1;
-static int hf_ieee80211_ndp_eht_annc_codebook_size = -1;
-static int hf_ieee80211_ndp_eht_annc_reserved2 = -1;
-
-static int hf_ieee80211_ff_vht_action = -1;
-static int hf_ieee80211_ff_vht_mimo_cntrl = -1;
-static int hf_ieee80211_ff_vht_mimo_cntrl_nc_index = -1;
-static int hf_ieee80211_ff_vht_mimo_cntrl_nr_index = -1;
-static int hf_ieee80211_ff_vht_mimo_cntrl_channel_width = -1;
-static int hf_ieee80211_ff_vht_mimo_cntrl_grouping = -1;
-static int hf_ieee80211_ff_vht_mimo_cntrl_codebook_info = -1;
-static int hf_ieee80211_ff_vht_mimo_cntrl_feedback_type = -1;
-static int hf_ieee80211_ff_vht_mimo_cntrl_remaining_feedback_seg = -1;
-static int hf_ieee80211_ff_vht_mimo_cntrl_first_feedback_seg = -1;
-static int hf_ieee80211_ff_vht_mimo_cntrl_reserved = -1;
-static int hf_ieee80211_ff_vht_mimo_cntrl_sounding_dialog_token_number = -1;
+static int hf_ieee80211_tag_extended_capabilities_2;
+static int hf_ieee80211_tag_extended_capabilities_b56_2;
+static int hf_ieee80211_tag_extended_capabilities_b57_2;
+static int hf_ieee80211_tag_extended_capabilities_b58_2;
+static int hf_ieee80211_tag_extended_capabilities_b59_2;
+static int hf_ieee80211_tag_extended_capabilities_b60_2;
+static int hf_ieee80211_tag_extended_capabilities_b61_2;
+static int hf_ieee80211_tag_extended_capabilities_b62_2;
+static int hf_ieee80211_tag_extended_capabilities_max_num_msdus;
+static int hf_ieee80211_tag_extended_capabilities_b65_2;
+static int hf_ieee80211_tag_extended_capabilities_b66_2;
+static int hf_ieee80211_tag_extended_capabilities_b67_2;
+static int hf_ieee80211_tag_extended_capabilities_b68_2;
+static int hf_ieee80211_tag_extended_capabilities_b69_2;
+static int hf_ieee80211_tag_extended_capabilities_b70_2;
+static int hf_ieee80211_tag_extended_capabilities_b71_2;
+
+static int hf_ieee80211_tag_extended_capabilities_b72;
+static int hf_ieee80211_tag_extended_capabilities_b73;
+static int hf_ieee80211_tag_extended_capabilities_b74;
+static int hf_ieee80211_tag_extended_capabilities_b75;
+static int hf_ieee80211_tag_extended_capabilities_b76;
+static int hf_ieee80211_tag_extended_capabilities_b77;
+static int hf_ieee80211_tag_extended_capabilities_b78;
+static int hf_ieee80211_tag_extended_capabilities_b79;
+static int hf_ieee80211_tag_extended_capabilities_b80;
+static int hf_ieee80211_tag_extended_capabilities_b81;
+static int hf_ieee80211_tag_extended_capabilities_b82;
+static int hf_ieee80211_tag_extended_capabilities_b83;
+static int hf_ieee80211_tag_extended_capabilities_b84;
+static int hf_ieee80211_tag_extended_capabilities_b85;
+static int hf_ieee80211_tag_extended_capabilities_b86;
+static int hf_ieee80211_tag_extended_capabilities_b87;
+
+static int hf_ieee80211_tag_extended_capabilities_b88;
+static int hf_ieee80211_tag_extended_capabilities_b89;
+static int hf_ieee80211_tag_extended_capabilities_b90;
+static int hf_ieee80211_tag_extended_capabilities_b91;
+static int hf_ieee80211_tag_extended_capabilities_b92;
+static int hf_ieee80211_tag_extended_capabilities_b93;
+static int hf_ieee80211_tag_extended_capabilities_b94;
+static int hf_ieee80211_tag_extended_capabilities_b95;
+
+static int hf_ieee80211_tag_extended_capabilities_b96;
+static int hf_ieee80211_tag_extended_capabilities_b97;
+static int hf_ieee80211_tag_extended_capabilities_reserved2;
+
+static int hf_ieee80211_tag_cisco_ccx1_unknown;
+static int hf_ieee80211_tag_cisco_ccx1_name;
+static int hf_ieee80211_tag_cisco_ccx1_clients;
+static int hf_ieee80211_tag_cisco_ccx1_unknown2;
+
+static int hf_ieee80211_vht_cap;
+static int hf_ieee80211_vht_max_mpdu_length;
+static int hf_ieee80211_vht_supported_chan_width_set;
+static int hf_ieee80211_vht_rx_ldpc;
+static int hf_ieee80211_vht_short_gi_for_80;
+static int hf_ieee80211_vht_short_gi_for_160;
+static int hf_ieee80211_vht_tx_stbc;
+static int hf_ieee80211_vht_rx_stbc;
+static int hf_ieee80211_vht_su_beamformer_cap;
+static int hf_ieee80211_vht_su_beamformee_cap;
+static int hf_ieee80211_vht_beamformer_antennas;
+static int hf_ieee80211_vht_sounding_dimensions;
+static int hf_ieee80211_vht_mu_beamformer_cap;
+static int hf_ieee80211_vht_mu_beamformee_cap;
+static int hf_ieee80211_vht_txop_ps;
+static int hf_ieee80211_vht_var_htc_field;
+static int hf_ieee80211_vht_max_ampdu;
+static int hf_ieee80211_vht_link_adaptation_cap;
+static int hf_ieee80211_vht_rx_pattern;
+static int hf_ieee80211_vht_tx_pattern;
+static int hf_ieee80211_vht_ext_nss_bw_support;
+
+static int hf_ieee80211_vht_mcsset;
+
+static int hf_ieee80211_vht_mcsset_rx_mcs_map;
+static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_1_ss;
+static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_2_ss;
+static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_3_ss;
+static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_4_ss;
+static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_5_ss;
+static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_6_ss;
+static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_7_ss;
+static int hf_ieee80211_vht_mcsset_rx_max_mcs_for_8_ss;
+
+static int hf_ieee80211_vht_mcsset_max_nsts_total;
+static int hf_ieee80211_vht_mcsset_rx_highest_long_gi;
+static int hf_ieee80211_vht_mcsset_extended_nss_bw_capable;
+static int hf_ieee80211_vht_mcsset_reserved;
+
+static int hf_ieee80211_vht_mcsset_tx_mcs_map;
+static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_1_ss;
+static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_2_ss;
+static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_3_ss;
+static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_4_ss;
+static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_5_ss;
+static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_6_ss;
+static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_7_ss;
+static int hf_ieee80211_vht_mcsset_tx_max_mcs_for_8_ss;
+
+static int hf_ieee80211_vht_op;
+static int hf_ieee80211_vht_op_channel_width;
+static int hf_ieee80211_vht_op_channel_center0;
+static int hf_ieee80211_vht_op_channel_center1;
+
+static int hf_ieee80211_vht_op_basic_mcs_map;
+static int hf_ieee80211_vht_op_max_basic_mcs_for_1_ss;
+static int hf_ieee80211_vht_op_max_basic_mcs_for_2_ss;
+static int hf_ieee80211_vht_op_max_basic_mcs_for_3_ss;
+static int hf_ieee80211_vht_op_max_basic_mcs_for_4_ss;
+static int hf_ieee80211_vht_op_max_basic_mcs_for_5_ss;
+static int hf_ieee80211_vht_op_max_basic_mcs_for_6_ss;
+static int hf_ieee80211_vht_op_max_basic_mcs_for_7_ss;
+static int hf_ieee80211_vht_op_max_basic_mcs_for_8_ss;
+static int hf_ieee80211_vht_mcsset_tx_highest_long_gi;
+
+static int hf_ieee80211_vht_tpe_pwr_info;
+static int hf_ieee80211_vht_tpe_pwr_info_count;
+static int hf_ieee80211_vht_tpe_pwr_info_unit;
+static int hf_ieee80211_vht_tpe_pwr_info_category;
+static int hf_ieee80211_vht_tpe_pwr_constr_20;
+static int hf_ieee80211_vht_tpe_pwr_constr_40;
+static int hf_ieee80211_vht_tpe_pwr_constr_80;
+static int hf_ieee80211_vht_tpe_pwr_constr_160;
+static int hf_ieee80211_vht_tpe_any_bw_psd;
+static int hf_ieee80211_vht_tpe_psd;
+
+static int hf_ieee80211_beamform_feedback_seg_retrans_bitmap;
+
+static int hf_ieee80211_ndp_annc_token;
+static int hf_ieee80211_ndp_annc_variant;
+static int hf_ieee80211_ndp_annc_token_number;
+static int hf_ieee80211_vht_ndp_annc_sta_info_aid12;
+static int hf_ieee80211_vht_ndp_annc_sta_info_feedback_type;
+static int hf_ieee80211_vht_ndp_annc_sta_info_nc_index;
+static int hf_ieee80211_vht_ndp_annc_sta_info_reserved;
+
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_aid11;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_ltf_offset;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_r2i_n_sts;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_r2i_rep;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_i2r_n_sts;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_reserved1;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_disambiguation;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_i2r_rep;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2008_reserved2;
+
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2043;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2043_aid11;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2043_sac;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2043_disambiguation;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2043_reserved;
+
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2044;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2044_aid11;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2044_partial_tsf;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2044_disambiguation;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2044_reserved;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2044_token;
+
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2045;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2045_aid11;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2045_i2r_ndp_tx_power;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2045_r2i_ndp_target_rssi;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2045_disambiguation;
+static int hf_ieee80211_vht_ndp_annc_sta_info_ranging_2045_reserved;
+
+
+static int hf_ieee80211_ndp_eht_annc_sta_info;
+static int hf_ieee80211_ndp_eht_annc_aid11;
+static int hf_ieee80211_ndp_eht_annc_resolution;
+static int hf_ieee80211_ndp_eht_annc_feedback_map;
+static int hf_ieee80211_ndp_eht_annc_reserved1;
+static int hf_ieee80211_ndp_eht_annc_nc_index;
+static int hf_ieee80211_ndp_eht_annc_feedback_type;
+static int hf_ieee80211_ndp_eht_annc_disambiguation;
+static int hf_ieee80211_ndp_eht_annc_codebook_size;
+static int hf_ieee80211_ndp_eht_annc_reserved2;
+
+static int hf_ieee80211_ff_vht_action;
+static int hf_ieee80211_ff_vht_mimo_cntrl;
+static int hf_ieee80211_ff_vht_mimo_cntrl_nc_index;
+static int hf_ieee80211_ff_vht_mimo_cntrl_nr_index;
+static int hf_ieee80211_ff_vht_mimo_cntrl_channel_width;
+static int hf_ieee80211_ff_vht_mimo_cntrl_grouping;
+static int hf_ieee80211_ff_vht_mimo_cntrl_codebook_info;
+static int hf_ieee80211_ff_vht_mimo_cntrl_feedback_type;
+static int hf_ieee80211_ff_vht_mimo_cntrl_remaining_feedback_seg;
+static int hf_ieee80211_ff_vht_mimo_cntrl_first_feedback_seg;
+static int hf_ieee80211_ff_vht_mimo_cntrl_reserved;
+static int hf_ieee80211_ff_vht_mimo_cntrl_sounding_dialog_token_number;
 
 static int * const hf_ieee80211_ff_vht_mimo_cntrl_fields[] = {
   &hf_ieee80211_ff_vht_mimo_cntrl_nc_index,
@@ -6170,95 +6170,95 @@ static int * const hf_ieee80211_ff_vht_mimo_cntrl_fields[] = {
   NULL,
 };
 
-static int hf_ieee80211_vht_compressed_beamforming_report = -1;
-static int hf_ieee80211_vht_compressed_beamforming_report_snr = -1;
-static int hf_ieee80211_vht_compressed_beamform_scidx = -1;
-static int hf_ieee80211_vht_group_id_management = -1;
-static int hf_ieee80211_vht_membership_status_array = -1;
-static int hf_ieee80211_vht_user_position_array = -1;
-static int hf_ieee80211_vht_operation_mode_notification = -1;
-static int hf_ieee80211_vht_membership_status_field = -1;
-static int hf_ieee80211_vht_user_position_field = -1;
-static int hf_ieee80211_vht_mu_exclusive_beamforming_report = -1;
-static int hf_ieee80211_vht_mu_exclusive_beamforming_delta_snr = -1;
-
-static int hf_ieee80211_ff_he_action = -1;
-static int hf_ieee80211_ff_protected_he_action = -1;
-static int hf_ieee80211_ff_protected_ftm_action = -1;
-static int hf_ieee80211_ff_eht_action = -1;
-static int hf_ieee80211_ff_protected_eht_action = -1;
-static int hf_ieee80211_he_mimo_control_nc_index = -1;
-static int hf_ieee80211_he_mimo_control_nr_index = -1;
-static int hf_ieee80211_he_mimo_control_bw = -1;
-static int hf_ieee80211_he_mimo_control_grouping = -1;
-static int hf_ieee80211_he_mimo_control_codebook_info = -1;
-static int hf_ieee80211_he_mimo_control_feedback_type = -1;
-static int hf_ieee80211_he_mimo_control_remaining_feedback_segs = -1;
-static int hf_ieee80211_he_mimo_control_first_feedback_seg = -1;
-static int hf_ieee80211_he_mimo_control_ru_start_index = -1;
-static int hf_ieee80211_he_mimo_control_ru_end_index = -1;
-static int hf_ieee80211_he_mimo_control_sounding_dialog_token_num = -1;
-static int hf_ieee80211_he_mimo_control_reserved = -1;
-static int hf_ieee80211_he_mimo_control_field = -1;
-static int hf_ieee80211_he_compressed_beamforming_report_snr = -1;
-static int hf_ieee80211_he_compressed_beamform_scidx = -1;
-static int hf_ieee80211_he_beamforming_report_len = -1;
-
-static int hf_ieee80211_tag_neighbor_report_bssid = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_reachability = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_security = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_key_scope = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_capability = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_spec_mng = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_qos = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_apsd = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_radio_msnt = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_dback = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_iback = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_mobility_domain = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_high_throughput = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_very_high_throughput = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_ftm = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_high_efficiency = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_er_bss = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_colocated_ap = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_unsolicited_probe_responses_active = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_ess_with_colocated_ap = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_oct_supported_with_reporting_ap = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_colocated_6ghz_ap = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_eht = -1;
-static int hf_ieee80211_tag_neighbor_report_bssid_info_reserved = -1;
-static int hf_ieee80211_tag_neighbor_report_ope_class = -1;
-static int hf_ieee80211_tag_neighbor_report_channel_number = -1;
-static int hf_ieee80211_tag_neighbor_report_phy_type = -1;
-static int hf_ieee80211_tag_neighbor_report_subelement_id = -1;
-static int hf_ieee80211_tag_neighbor_report_subelement_length = -1;
-static int hf_ieee80211_tag_neighbor_report_subelement_data = -1;
-static int hf_ieee80211_tag_neighbor_report_subelement_bss_trn_can_pref = -1;
-static int hf_ieee80211_tag_neighbor_report_subelement_bss_ter_tsf = -1;
-static int hf_ieee80211_tag_neighbor_report_subelement_bss_dur = -1;
-static int hf_ieee80211_tag_neighbor_report_subelement_tsf_offset = -1;
-static int hf_ieee80211_tag_neighbor_report_subelement_beacon_interval = -1;
-static int hf_ieee80211_tag_neighbor_report_subelement_country_code = -1;
-static int hf_ieee80211_tag_supported_ope_classes_current = -1;
-static int hf_ieee80211_tag_supported_ope_classes_alternate = -1;
-
-static int hf_ieee80211_tag_dirn_meas_results_aoa_results = -1;
-static int hf_ieee80211_tag_ftm_aoa_results_aoa_azimuth = -1;
-static int hf_ieee80211_tag_ftm_aoa_results_aoa_elevation = -1;
-static int hf_ieee80211_tag_ftm_aoa_results_aoa_azimuth_accuracy = -1;
-static int hf_ieee80211_tag_ftm_aoa_results_aoa_elevation_accuracy = -1;
-static int hf_ieee80211_tag_ftm_aoa_results_best_awv_id = -1;
-static int hf_ieee80211_tag_ftm_aoa_results_aoa_reference = -1;
-static int hf_ieee80211_tag_ftm_aoa_results_reserved = -1;
+static int hf_ieee80211_vht_compressed_beamforming_report;
+static int hf_ieee80211_vht_compressed_beamforming_report_snr;
+static int hf_ieee80211_vht_compressed_beamform_scidx;
+static int hf_ieee80211_vht_group_id_management;
+static int hf_ieee80211_vht_membership_status_array;
+static int hf_ieee80211_vht_user_position_array;
+static int hf_ieee80211_vht_operation_mode_notification;
+static int hf_ieee80211_vht_membership_status_field;
+static int hf_ieee80211_vht_user_position_field;
+static int hf_ieee80211_vht_mu_exclusive_beamforming_report;
+static int hf_ieee80211_vht_mu_exclusive_beamforming_delta_snr;
+
+static int hf_ieee80211_ff_he_action;
+static int hf_ieee80211_ff_protected_he_action;
+static int hf_ieee80211_ff_protected_ftm_action;
+static int hf_ieee80211_ff_eht_action;
+static int hf_ieee80211_ff_protected_eht_action;
+static int hf_ieee80211_he_mimo_control_nc_index;
+static int hf_ieee80211_he_mimo_control_nr_index;
+static int hf_ieee80211_he_mimo_control_bw;
+static int hf_ieee80211_he_mimo_control_grouping;
+static int hf_ieee80211_he_mimo_control_codebook_info;
+static int hf_ieee80211_he_mimo_control_feedback_type;
+static int hf_ieee80211_he_mimo_control_remaining_feedback_segs;
+static int hf_ieee80211_he_mimo_control_first_feedback_seg;
+static int hf_ieee80211_he_mimo_control_ru_start_index;
+static int hf_ieee80211_he_mimo_control_ru_end_index;
+static int hf_ieee80211_he_mimo_control_sounding_dialog_token_num;
+static int hf_ieee80211_he_mimo_control_reserved;
+static int hf_ieee80211_he_mimo_control_field;
+static int hf_ieee80211_he_compressed_beamforming_report_snr;
+static int hf_ieee80211_he_compressed_beamform_scidx;
+static int hf_ieee80211_he_beamforming_report_len;
+
+static int hf_ieee80211_tag_neighbor_report_bssid;
+static int hf_ieee80211_tag_neighbor_report_bssid_info;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_reachability;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_security;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_key_scope;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_capability;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_spec_mng;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_qos;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_apsd;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_radio_msnt;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_dback;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_capability_iback;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_mobility_domain;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_high_throughput;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_very_high_throughput;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_ftm;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_high_efficiency;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_er_bss;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_colocated_ap;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_unsolicited_probe_responses_active;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_ess_with_colocated_ap;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_oct_supported_with_reporting_ap;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_colocated_6ghz_ap;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_eht;
+static int hf_ieee80211_tag_neighbor_report_bssid_info_reserved;
+static int hf_ieee80211_tag_neighbor_report_ope_class;
+static int hf_ieee80211_tag_neighbor_report_channel_number;
+static int hf_ieee80211_tag_neighbor_report_phy_type;
+static int hf_ieee80211_tag_neighbor_report_subelement_id;
+static int hf_ieee80211_tag_neighbor_report_subelement_length;
+static int hf_ieee80211_tag_neighbor_report_subelement_data;
+static int hf_ieee80211_tag_neighbor_report_subelement_bss_trn_can_pref;
+static int hf_ieee80211_tag_neighbor_report_subelement_bss_ter_tsf;
+static int hf_ieee80211_tag_neighbor_report_subelement_bss_dur;
+static int hf_ieee80211_tag_neighbor_report_subelement_tsf_offset;
+static int hf_ieee80211_tag_neighbor_report_subelement_beacon_interval;
+static int hf_ieee80211_tag_neighbor_report_subelement_country_code;
+static int hf_ieee80211_tag_supported_ope_classes_current;
+static int hf_ieee80211_tag_supported_ope_classes_alternate;
+
+static int hf_ieee80211_tag_dirn_meas_results_aoa_results;
+static int hf_ieee80211_tag_ftm_aoa_results_aoa_azimuth;
+static int hf_ieee80211_tag_ftm_aoa_results_aoa_elevation;
+static int hf_ieee80211_tag_ftm_aoa_results_aoa_azimuth_accuracy;
+static int hf_ieee80211_tag_ftm_aoa_results_aoa_elevation_accuracy;
+static int hf_ieee80211_tag_ftm_aoa_results_best_awv_id;
+static int hf_ieee80211_tag_ftm_aoa_results_aoa_reference;
+static int hf_ieee80211_tag_ftm_aoa_results_reserved;
 
 /* IEEE Std 802.11r-2008 7.3.2.47 */
-static int hf_ieee80211_tag_mobility_domain_mdid = -1;
-static int hf_ieee80211_tag_mobility_domain_ft_capab = -1;
-static int hf_ieee80211_tag_mobility_domain_ft_capab_ft_over_ds = -1;
-static int hf_ieee80211_tag_mobility_domain_ft_capab_resource_req = -1;
-static int hf_ieee80211_tag_mobility_domain_ft_capab_reserved = -1;
+static int hf_ieee80211_tag_mobility_domain_mdid;
+static int hf_ieee80211_tag_mobility_domain_ft_capab;
+static int hf_ieee80211_tag_mobility_domain_ft_capab_ft_over_ds;
+static int hf_ieee80211_tag_mobility_domain_ft_capab_resource_req;
+static int hf_ieee80211_tag_mobility_domain_ft_capab_reserved;
 static int * const ieee80211_tag_mobility_domain_ft_capab_fields[] = {
   &hf_ieee80211_tag_mobility_domain_ft_capab_ft_over_ds,
   &hf_ieee80211_tag_mobility_domain_ft_capab_resource_req,
@@ -6267,11 +6267,11 @@ static int * const ieee80211_tag_mobility_domain_ft_capab_fields[] = {
 };
 
 /* IEEE Std 802.11r-2008 7.3.2.48 */
-static int hf_ieee80211_tag_ft_mic_control = -1;
-static int hf_ieee80211_tag_ft_mic_control_rsnxe_used = -1;
-static int hf_ieee80211_tag_ft_mic_control_mic_length = -1;
-static int hf_ieee80211_tag_ft_mic_control_reserved = -1;
-static int hf_ieee80211_tag_ft_mic_control_element_count = -1;
+static int hf_ieee80211_tag_ft_mic_control;
+static int hf_ieee80211_tag_ft_mic_control_rsnxe_used;
+static int hf_ieee80211_tag_ft_mic_control_mic_length;
+static int hf_ieee80211_tag_ft_mic_control_reserved;
+static int hf_ieee80211_tag_ft_mic_control_element_count;
 static int * const ieee80211_tag_ft_mic_control_fields[] = {
   &hf_ieee80211_tag_ft_mic_control_rsnxe_used,
   &hf_ieee80211_tag_ft_mic_control_mic_length,
@@ -6279,622 +6279,622 @@ static int * const ieee80211_tag_ft_mic_control_fields[] = {
   &hf_ieee80211_tag_ft_mic_control_element_count,
   NULL
 };
-static int hf_ieee80211_tag_ft_mic = -1;
-static int hf_ieee80211_tag_ft_anonce = -1;
-static int hf_ieee80211_tag_ft_snonce = -1;
-static int hf_ieee80211_tag_ft_subelem_id = -1;
-static int hf_ieee80211_tag_ft_subelem_len = -1;
-static int hf_ieee80211_tag_ft_subelem_data = -1;
-static int hf_ieee80211_tag_ft_subelem_r1kh_id = -1;
-static int hf_ieee80211_tag_ft_subelem_gtk_key_info = -1;
-static int hf_ieee80211_tag_ft_subelem_gtk_key_id = -1;
-static int hf_ieee80211_tag_ft_subelem_gtk_key_length = -1;
-static int hf_ieee80211_tag_ft_subelem_gtk_rsc = -1;
-static int hf_ieee80211_tag_ft_subelem_gtk_key = -1;
-static int hf_ieee80211_tag_ft_subelem_gtk_key_encrypted = -1;
-static int hf_ieee80211_tag_ft_subelem_r0kh_id = -1;
-static int hf_ieee80211_tag_ft_subelem_igtk_key_id = -1;
-static int hf_ieee80211_tag_ft_subelem_igtk_ipn = -1;
-static int hf_ieee80211_tag_ft_subelem_igtk_key_length = -1;
-static int hf_ieee80211_tag_ft_subelem_igtk_key = -1;
-static int hf_ieee80211_tag_ft_subelem_oci_op_class = -1;
-static int hf_ieee80211_tag_ft_subelem_oci_prim_chan_num = -1;
-static int hf_ieee80211_tag_ft_subelem_oci_freq_seg_1 = -1;
-static int hf_ieee80211_tag_ft_subelem_oci_oct_op_class = -1;
-static int hf_ieee80211_tag_ft_subelem_oci_oct_prim_chan_num = -1;
-static int hf_ieee80211_tag_ft_subelem_oci_oct_freq_seg_1 = -1;
-static int hf_ieee80211_tag_ft_subelem_bigtk_key_id = -1;
-static int hf_ieee80211_tag_ft_subelem_bigtk_bipn = -1;
-static int hf_ieee80211_tag_ft_subelem_bigtk_key_length = -1;
-static int hf_ieee80211_tag_ft_subelem_bigtk_key = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_gtk_key_info = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_gtk_key_id = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_gtk_link_id_info = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_gtk_link_id = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_gtk_key_length = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_gtk_rsc = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_gtk_key = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_igtk_key_id = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_igtk_ipn = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_igtk_link_id_info = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_igtk_link_id = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_igtk_key_length = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_igtk_key = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_bigtk_key_id = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_bigtk_bipn = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_bigtk_link_id_info = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_bigtk_link_id = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_bigtk_key_length = -1;
-static int hf_ieee80211_tag_ft_subelem_mlo_bigtk_key = -1;
+static int hf_ieee80211_tag_ft_mic;
+static int hf_ieee80211_tag_ft_anonce;
+static int hf_ieee80211_tag_ft_snonce;
+static int hf_ieee80211_tag_ft_subelem_id;
+static int hf_ieee80211_tag_ft_subelem_len;
+static int hf_ieee80211_tag_ft_subelem_data;
+static int hf_ieee80211_tag_ft_subelem_r1kh_id;
+static int hf_ieee80211_tag_ft_subelem_gtk_key_info;
+static int hf_ieee80211_tag_ft_subelem_gtk_key_id;
+static int hf_ieee80211_tag_ft_subelem_gtk_key_length;
+static int hf_ieee80211_tag_ft_subelem_gtk_rsc;
+static int hf_ieee80211_tag_ft_subelem_gtk_key;
+static int hf_ieee80211_tag_ft_subelem_gtk_key_encrypted;
+static int hf_ieee80211_tag_ft_subelem_r0kh_id;
+static int hf_ieee80211_tag_ft_subelem_igtk_key_id;
+static int hf_ieee80211_tag_ft_subelem_igtk_ipn;
+static int hf_ieee80211_tag_ft_subelem_igtk_key_length;
+static int hf_ieee80211_tag_ft_subelem_igtk_key;
+static int hf_ieee80211_tag_ft_subelem_oci_op_class;
+static int hf_ieee80211_tag_ft_subelem_oci_prim_chan_num;
+static int hf_ieee80211_tag_ft_subelem_oci_freq_seg_1;
+static int hf_ieee80211_tag_ft_subelem_oci_oct_op_class;
+static int hf_ieee80211_tag_ft_subelem_oci_oct_prim_chan_num;
+static int hf_ieee80211_tag_ft_subelem_oci_oct_freq_seg_1;
+static int hf_ieee80211_tag_ft_subelem_bigtk_key_id;
+static int hf_ieee80211_tag_ft_subelem_bigtk_bipn;
+static int hf_ieee80211_tag_ft_subelem_bigtk_key_length;
+static int hf_ieee80211_tag_ft_subelem_bigtk_key;
+static int hf_ieee80211_tag_ft_subelem_mlo_gtk_key_info;
+static int hf_ieee80211_tag_ft_subelem_mlo_gtk_key_id;
+static int hf_ieee80211_tag_ft_subelem_mlo_gtk_link_id_info;
+static int hf_ieee80211_tag_ft_subelem_mlo_gtk_link_id;
+static int hf_ieee80211_tag_ft_subelem_mlo_gtk_key_length;
+static int hf_ieee80211_tag_ft_subelem_mlo_gtk_rsc;
+static int hf_ieee80211_tag_ft_subelem_mlo_gtk_key;
+static int hf_ieee80211_tag_ft_subelem_mlo_igtk_key_id;
+static int hf_ieee80211_tag_ft_subelem_mlo_igtk_ipn;
+static int hf_ieee80211_tag_ft_subelem_mlo_igtk_link_id_info;
+static int hf_ieee80211_tag_ft_subelem_mlo_igtk_link_id;
+static int hf_ieee80211_tag_ft_subelem_mlo_igtk_key_length;
+static int hf_ieee80211_tag_ft_subelem_mlo_igtk_key;
+static int hf_ieee80211_tag_ft_subelem_mlo_bigtk_key_id;
+static int hf_ieee80211_tag_ft_subelem_mlo_bigtk_bipn;
+static int hf_ieee80211_tag_ft_subelem_mlo_bigtk_link_id_info;
+static int hf_ieee80211_tag_ft_subelem_mlo_bigtk_link_id;
+static int hf_ieee80211_tag_ft_subelem_mlo_bigtk_key_length;
+static int hf_ieee80211_tag_ft_subelem_mlo_bigtk_key;
 
 /* IEEE Std 802.11-2012: 11r 8.4.2.52 */
-static int hf_ieee80211_tag_ric_data_id = -1;
-static int hf_ieee80211_tag_ric_data_desc_cnt = -1;
-static int hf_ieee80211_tag_ric_data_status_code = -1;
+static int hf_ieee80211_tag_ric_data_id;
+static int hf_ieee80211_tag_ric_data_desc_cnt;
+static int hf_ieee80211_tag_ric_data_status_code;
 
 /* IEEE Std 802.11-2012: 11r 8.4.2.53 */
-static int hf_ieee80211_tag_ric_desc_rsrc_type = -1;
-static int hf_ieee80211_tag_ric_desc_var_params = -1;
+static int hf_ieee80211_tag_ric_desc_rsrc_type;
+static int hf_ieee80211_tag_ric_desc_var_params;
 
 /* IEEE Std 802.11w-2009 7.3.2.55 */
-static int hf_ieee80211_tag_mmie_keyid = -1;
-static int hf_ieee80211_tag_mmie_ipn = -1;
-static int hf_ieee80211_tag_mmie_mic = -1;
+static int hf_ieee80211_tag_mmie_keyid;
+static int hf_ieee80211_tag_mmie_ipn;
+static int hf_ieee80211_tag_mmie_mic;
 
 /* IEEE Std 802.11-2016: 9.4.2.72 */
-static int hf_ieee80211_tag_no_bssid_capability_dmg_bss_control = -1;
-static int hf_ieee80211_tag_no_bssid_capability_dmg_bss_control_type = -1;
-static int hf_ieee80211_tag_no_bssid_capability_dmg_bss_control_reserved = -1;
+static int hf_ieee80211_tag_no_bssid_capability_dmg_bss_control;
+static int hf_ieee80211_tag_no_bssid_capability_dmg_bss_control_type;
+static int hf_ieee80211_tag_no_bssid_capability_dmg_bss_control_reserved;
 
 /* IEEE Std 802.11-2016: 9.4.2.74 */
-static int hf_ieee80211_tag_multiple_bssid_index_bssid_index = -1;
-static int hf_ieee80211_tag_multiple_bssid_index_dtim_period = -1;
-static int hf_ieee80211_tag_multiple_bssid_index_dtim_count = -1;
+static int hf_ieee80211_tag_multiple_bssid_index_bssid_index;
+static int hf_ieee80211_tag_multiple_bssid_index_dtim_period;
+static int hf_ieee80211_tag_multiple_bssid_index_dtim_count;
 
 /* IEEE Std 802.11-2012: 8.4.2.61 */
-static int hf_ieee80211_tag_obss_spd = -1;
-static int hf_ieee80211_tag_obss_sad = -1;
-static int hf_ieee80211_tag_obss_cwtsi = -1;
-static int hf_ieee80211_tag_obss_sptpc = -1;
-static int hf_ieee80211_tag_obss_satpc = -1;
-static int hf_ieee80211_tag_obss_wctdf = -1;
-static int hf_ieee80211_tag_obss_sat = -1;
+static int hf_ieee80211_tag_obss_spd;
+static int hf_ieee80211_tag_obss_sad;
+static int hf_ieee80211_tag_obss_cwtsi;
+static int hf_ieee80211_tag_obss_sptpc;
+static int hf_ieee80211_tag_obss_satpc;
+static int hf_ieee80211_tag_obss_wctdf;
+static int hf_ieee80211_tag_obss_sat;
 
 /* IEEE Std 802.11-2012: 8.4.2.25.1 */
-static int hf_ieee80211_group_data_cipher_suite_oui = -1;
-static int hf_ieee80211_group_data_cipher_suite_type = -1;
-static int hf_ieee80211_osen_pairwise_cipher_suite_oui = -1;
-static int hf_ieee80211_osen_pairwise_cipher_suite_type = -1;
-static int hf_ieee80211_osen_pcs_count = -1;
-static int hf_ieee80211_osen_akm_count = -1;
-static int hf_ieee80211_osen_akm_cipher_suite_oui = -1;
-static int hf_ieee80211_osen_akm_cipher_suite_type = -1;
-static int hf_ieee80211_osen_rsn_cap_preauth = -1;
-static int hf_ieee80211_osen_rsn_cap_no_pairwise = -1;
-static int hf_ieee80211_osen_rsn_cap_ptksa_replay_counter = -1;
-static int hf_ieee80211_osen_rsn_cap_gtksa_replay_counter = -1;
-static int hf_ieee80211_osen_rsn_cap_mfpr = -1;
-static int hf_ieee80211_osen_rsn_cap_mfpc = -1;
-static int hf_ieee80211_osen_rsn_cap_jmr = -1;
-static int hf_ieee80211_osen_rsn_cap_peerkey = -1;
-static int hf_ieee80211_osen_rsn_spp_a_msdu_capable = -1;
-static int hf_ieee80211_osen_rsn_spp_a_msdu_required = -1;
-static int hf_ieee80211_osen_rsn_pbac = -1;
-static int hf_ieee80211_osen_extended_key_id_iaf = -1;
-static int hf_ieee80211_osen_reserved = -1;
-static int hf_ieee80211_osen_rsn_cap_flags = -1;
-static int hf_ieee80211_osen_pmkid_count = -1;
-static int hf_ieee80211_osen_pmkid = -1;
-static int hf_ieee80211_osen_group_management_cipher_suite_oui = -1;
-static int hf_ieee80211_osen_group_management_cipher_suite_type = -1;
+static int hf_ieee80211_group_data_cipher_suite_oui;
+static int hf_ieee80211_group_data_cipher_suite_type;
+static int hf_ieee80211_osen_pairwise_cipher_suite_oui;
+static int hf_ieee80211_osen_pairwise_cipher_suite_type;
+static int hf_ieee80211_osen_pcs_count;
+static int hf_ieee80211_osen_akm_count;
+static int hf_ieee80211_osen_akm_cipher_suite_oui;
+static int hf_ieee80211_osen_akm_cipher_suite_type;
+static int hf_ieee80211_osen_rsn_cap_preauth;
+static int hf_ieee80211_osen_rsn_cap_no_pairwise;
+static int hf_ieee80211_osen_rsn_cap_ptksa_replay_counter;
+static int hf_ieee80211_osen_rsn_cap_gtksa_replay_counter;
+static int hf_ieee80211_osen_rsn_cap_mfpr;
+static int hf_ieee80211_osen_rsn_cap_mfpc;
+static int hf_ieee80211_osen_rsn_cap_jmr;
+static int hf_ieee80211_osen_rsn_cap_peerkey;
+static int hf_ieee80211_osen_rsn_spp_a_msdu_capable;
+static int hf_ieee80211_osen_rsn_spp_a_msdu_required;
+static int hf_ieee80211_osen_rsn_pbac;
+static int hf_ieee80211_osen_extended_key_id_iaf;
+static int hf_ieee80211_osen_reserved;
+static int hf_ieee80211_osen_rsn_cap_flags;
+static int hf_ieee80211_osen_pmkid_count;
+static int hf_ieee80211_osen_pmkid;
+static int hf_ieee80211_osen_group_management_cipher_suite_oui;
+static int hf_ieee80211_osen_group_management_cipher_suite_type;
 
 /*WAPI-Specification 7.3.2.25 : WAPI Parameter Set*/
-static int hf_ieee80211_tag_wapi_param_set_version = -1;
+static int hf_ieee80211_tag_wapi_param_set_version;
 
-static int hf_ieee80211_tag_wapi_param_set_akm_suite_count = -1;
-static int hf_ieee80211_tag_wapi_param_set_akm_suite_oui = -1;
-static int hf_ieee80211_tag_wapi_param_set_akm_suite_type = -1;
+static int hf_ieee80211_tag_wapi_param_set_akm_suite_count;
+static int hf_ieee80211_tag_wapi_param_set_akm_suite_oui;
+static int hf_ieee80211_tag_wapi_param_set_akm_suite_type;
 
-static int hf_ieee80211_tag_wapi_param_set_ucast_cipher_suite_count = -1;
-static int hf_ieee80211_tag_wapi_param_set_ucast_cipher_suite_oui = -1;
-static int hf_ieee80211_tag_wapi_param_set_ucast_cipher_suite_type = -1;
+static int hf_ieee80211_tag_wapi_param_set_ucast_cipher_suite_count;
+static int hf_ieee80211_tag_wapi_param_set_ucast_cipher_suite_oui;
+static int hf_ieee80211_tag_wapi_param_set_ucast_cipher_suite_type;
 
-static int hf_ieee80211_tag_wapi_param_set_mcast_cipher_suite_oui = -1;
-static int hf_ieee80211_tag_wapi_param_set_mcast_cipher_suite_type = -1;
+static int hf_ieee80211_tag_wapi_param_set_mcast_cipher_suite_oui;
+static int hf_ieee80211_tag_wapi_param_set_mcast_cipher_suite_type;
 
-static int hf_ieee80211_tag_wapi_param_set_capab = -1;
-static int hf_ieee80211_tag_wapi_param_set_capab_preauth = -1;
-static int hf_ieee80211_tag_wapi_param_set_capab_rsvd = -1;
-static int hf_ieee80211_tag_wapi_param_set_bkid_count = -1;
-static int hf_ieee80211_tag_wapi_param_set_bkid_list = -1;
+static int hf_ieee80211_tag_wapi_param_set_capab;
+static int hf_ieee80211_tag_wapi_param_set_capab_preauth;
+static int hf_ieee80211_tag_wapi_param_set_capab_rsvd;
+static int hf_ieee80211_tag_wapi_param_set_bkid_count;
+static int hf_ieee80211_tag_wapi_param_set_bkid_list;
 
 /* IEEE Std 802.11v-2011 7.3.2.61 */
-static int hf_ieee80211_tag_time_adv_timing_capab = -1;
-static int hf_ieee80211_tag_time_adv_time_value = -1;
-static int hf_ieee80211_tag_time_adv_time_value_year = -1;
-static int hf_ieee80211_tag_time_adv_time_value_month = -1;
-static int hf_ieee80211_tag_time_adv_time_value_day = -1;
-static int hf_ieee80211_tag_time_adv_time_value_hours = -1;
-static int hf_ieee80211_tag_time_adv_time_value_minutes = -1;
-static int hf_ieee80211_tag_time_adv_time_value_seconds = -1;
-static int hf_ieee80211_tag_time_adv_time_value_milliseconds = -1;
-static int hf_ieee80211_tag_time_adv_time_value_reserved = -1;
-static int hf_ieee80211_tag_time_adv_time_error = -1;
-static int hf_ieee80211_tag_time_adv_time_update_counter = -1;
+static int hf_ieee80211_tag_time_adv_timing_capab;
+static int hf_ieee80211_tag_time_adv_time_value;
+static int hf_ieee80211_tag_time_adv_time_value_year;
+static int hf_ieee80211_tag_time_adv_time_value_month;
+static int hf_ieee80211_tag_time_adv_time_value_day;
+static int hf_ieee80211_tag_time_adv_time_value_hours;
+static int hf_ieee80211_tag_time_adv_time_value_minutes;
+static int hf_ieee80211_tag_time_adv_time_value_seconds;
+static int hf_ieee80211_tag_time_adv_time_value_milliseconds;
+static int hf_ieee80211_tag_time_adv_time_value_reserved;
+static int hf_ieee80211_tag_time_adv_time_error;
+static int hf_ieee80211_tag_time_adv_time_update_counter;
 
 /* IEEE Std 802.11-2012 8.4.2.81 */
-static int hf_ieee80211_tag_bss_max_idle_period = -1;
-static int hf_ieee80211_tag_bss_max_idle_options = -1;
-static int hf_ieee80211_tag_bss_max_idle_options_protected = -1;
-static int hf_ieee80211_tag_bss_idle_options_reserved = -1;
+static int hf_ieee80211_tag_bss_max_idle_period;
+static int hf_ieee80211_tag_bss_max_idle_options;
+static int hf_ieee80211_tag_bss_max_idle_options_protected;
+static int hf_ieee80211_tag_bss_idle_options_reserved;
 
 /* IEEE Std 802.11-2012 8.4.2.82 */
-static int hf_ieee80211_tag_tfs_request_id = -1;
-static int hf_ieee80211_tag_tfs_request_ac_delete_after_match = -1;
-static int hf_ieee80211_tag_tfs_request_ac_notify = -1;
-static int hf_ieee80211_tag_tfs_request_subelem_id = -1;
-static int hf_ieee80211_tag_tfs_request_subelem_len = -1;
-static int hf_ieee80211_tag_tfs_request_subelem = -1;
+static int hf_ieee80211_tag_tfs_request_id;
+static int hf_ieee80211_tag_tfs_request_ac_delete_after_match;
+static int hf_ieee80211_tag_tfs_request_ac_notify;
+static int hf_ieee80211_tag_tfs_request_subelem_id;
+static int hf_ieee80211_tag_tfs_request_subelem_len;
+static int hf_ieee80211_tag_tfs_request_subelem;
 
 /* IEEE Std 802.11-2012 8.4.2.83 */
-static int hf_ieee80211_tag_tfs_response_subelem_id = -1;
-static int hf_ieee80211_tag_tfs_response_subelem_len = -1;
-static int hf_ieee80211_tag_tfs_response_subelem = -1;
-static int hf_ieee80211_tag_tfs_response_status = -1;
-static int hf_ieee80211_tag_tfs_response_id = -1;
+static int hf_ieee80211_tag_tfs_response_subelem_id;
+static int hf_ieee80211_tag_tfs_response_subelem_len;
+static int hf_ieee80211_tag_tfs_response_subelem;
+static int hf_ieee80211_tag_tfs_response_status;
+static int hf_ieee80211_tag_tfs_response_id;
 
 /* IEEE Std 802.11-2012 8.4.2.84 */
-static int hf_ieee80211_tag_wnm_sleep_mode_action_type = -1;
-static int hf_ieee80211_tag_wnm_sleep_mode_response_status = -1;
-static int hf_ieee80211_tag_wnm_sleep_mode_interval = -1;
+static int hf_ieee80211_tag_wnm_sleep_mode_action_type;
+static int hf_ieee80211_tag_wnm_sleep_mode_response_status;
+static int hf_ieee80211_tag_wnm_sleep_mode_interval;
 
-static int hf_ieee80211_wnm_sub_elt_id = -1;
-static int hf_ieee80211_wnm_sub_elt_len = -1;
+static int hf_ieee80211_wnm_sub_elt_id;
+static int hf_ieee80211_wnm_sub_elt_len;
 
 /* IEEE Std 802.11v-2011 7.3.2.87 */
-static int hf_ieee80211_tag_time_zone = -1;
+static int hf_ieee80211_tag_time_zone;
 
 /* IEEE Std 802.11u-2011 7.3.2.92 */
-static int hf_ieee80211_tag_interworking_access_network_type = -1;
-static int hf_ieee80211_tag_interworking_internet = -1;
-static int hf_ieee80211_tag_interworking_asra = -1;
-static int hf_ieee80211_tag_interworking_esr = -1;
-static int hf_ieee80211_tag_interworking_uesa = -1;
-static int hf_ieee80211_tag_interworking_hessid = -1;
+static int hf_ieee80211_tag_interworking_access_network_type;
+static int hf_ieee80211_tag_interworking_internet;
+static int hf_ieee80211_tag_interworking_asra;
+static int hf_ieee80211_tag_interworking_esr;
+static int hf_ieee80211_tag_interworking_uesa;
+static int hf_ieee80211_tag_interworking_hessid;
 
 /* IEEE Std 802.11-2012, 8.4.2.97 */
-static int hf_ieee80211_tag_qos_map_set_dscp_exc = -1;
-static int hf_ieee80211_tag_qos_map_set_dscp_exc_val = -1;
-static int hf_ieee80211_tag_qos_map_set_dscp_exc_up = -1;
-static int hf_ieee80211_tag_qos_map_set_range = -1;
-static int hf_ieee80211_tag_qos_map_set_low = -1;
-static int hf_ieee80211_tag_qos_map_set_high = -1;
+static int hf_ieee80211_tag_qos_map_set_dscp_exc;
+static int hf_ieee80211_tag_qos_map_set_dscp_exc_val;
+static int hf_ieee80211_tag_qos_map_set_dscp_exc_up;
+static int hf_ieee80211_tag_qos_map_set_range;
+static int hf_ieee80211_tag_qos_map_set_low;
+static int hf_ieee80211_tag_qos_map_set_high;
 
 /* IEEE Std 802.11u-2011 7.3.2.93 */
-static int hf_ieee80211_tag_adv_proto_resp_len_limit = -1;
-static int hf_ieee80211_tag_adv_proto_pame_bi = -1;
-static int hf_ieee80211_tag_adv_proto_id = -1;
-static int hf_ieee80211_tag_adv_vs_len = -1;
-/* static int hf_ieee80211_tag_adv_proto_vs_info = -1; */
+static int hf_ieee80211_tag_adv_proto_resp_len_limit;
+static int hf_ieee80211_tag_adv_proto_pame_bi;
+static int hf_ieee80211_tag_adv_proto_id;
+static int hf_ieee80211_tag_adv_vs_len;
+/* static int hf_ieee80211_tag_adv_proto_vs_info; */
 
 /* IEEE Std 802.11u-2011 7.3.2.96 */
-static int hf_ieee80211_tag_roaming_consortium_num_anqp_oi = -1;
-static int hf_ieee80211_tag_roaming_consortium_oi1_len = -1;
-static int hf_ieee80211_tag_roaming_consortium_oi2_len = -1;
-static int hf_ieee80211_tag_roaming_consortium_oi1 = -1;
-static int hf_ieee80211_tag_roaming_consortium_oi2 = -1;
-static int hf_ieee80211_tag_roaming_consortium_oi3 = -1;
+static int hf_ieee80211_tag_roaming_consortium_num_anqp_oi;
+static int hf_ieee80211_tag_roaming_consortium_oi1_len;
+static int hf_ieee80211_tag_roaming_consortium_oi2_len;
+static int hf_ieee80211_tag_roaming_consortium_oi1;
+static int hf_ieee80211_tag_roaming_consortium_oi2;
+static int hf_ieee80211_tag_roaming_consortium_oi3;
 
 /* 802.11n 7.3.2.48 */
-static int hf_ieee80211_hta_cc = -1;
-static int hf_ieee80211_hta_cap1 = -1;
-static int hf_ieee80211_hta_cap2 = -1;
-static int hf_ieee80211_hta_ext_chan_offset = -1;
-static int hf_ieee80211_hta_rec_tx_width = -1;
-static int hf_ieee80211_hta_rifs_mode = -1;
-static int hf_ieee80211_hta_controlled_access = -1;
-static int hf_ieee80211_hta_service_interval = -1;
-static int hf_ieee80211_hta_operating_mode = -1;
-static int hf_ieee80211_hta_non_gf_devices = -1;
-static int hf_ieee80211_hta_basic_stbc_mcs = -1;
-static int hf_ieee80211_hta_dual_stbc_protection = -1;
-static int hf_ieee80211_hta_secondary_beacon = -1;
-static int hf_ieee80211_hta_lsig_txop_protection = -1;
-static int hf_ieee80211_hta_pco_active = -1;
-static int hf_ieee80211_hta_pco_phase = -1;
-
-static int hf_ieee80211_antsel = -1;
-static int hf_ieee80211_antsel_vs = -1;
-static int hf_ieee80211_antsel_b0 = -1;
-static int hf_ieee80211_antsel_b1 = -1;
-static int hf_ieee80211_antsel_b2 = -1;
-static int hf_ieee80211_antsel_b3 = -1;
-static int hf_ieee80211_antsel_b4 = -1;
-static int hf_ieee80211_antsel_b5 = -1;
-static int hf_ieee80211_antsel_b6 = -1;
-static int hf_ieee80211_antsel_b7 = -1;
-
-static int hf_ieee80211_rsn_version = -1;
-static int hf_ieee80211_rsn_gcs = -1;
-static int hf_ieee80211_rsn_gcs_oui = -1;
-static int hf_ieee80211_rsn_gcs_type = -1;
-static int hf_ieee80211_rsn_gcs_80211_type = -1;
-static int hf_ieee80211_rsn_pcs_count = -1;
-static int hf_ieee80211_rsn_pcs_list = -1;
-static int hf_ieee80211_rsn_pcs = -1;
-static int hf_ieee80211_rsn_pcs_oui = -1;
-static int hf_ieee80211_rsn_pcs_80211_type = -1;
-static int hf_ieee80211_rsn_pcs_type = -1;
-static int hf_ieee80211_rsn_akms_count = -1;
-static int hf_ieee80211_rsn_akms_list = -1;
-static int hf_ieee80211_rsn_akms = -1;
-static int hf_ieee80211_rsn_akms_oui = -1;
-static int hf_ieee80211_rsn_akms_80211_type = -1;
-static int hf_ieee80211_rsn_akms_type = -1;
-static int hf_ieee80211_rsn_cap = -1;
-static int hf_ieee80211_rsn_cap_preauth = -1;
-static int hf_ieee80211_rsn_cap_no_pairwise = -1;
-static int hf_ieee80211_rsn_cap_ptksa_replay_counter = -1;
-static int hf_ieee80211_rsn_cap_gtksa_replay_counter = -1;
-static int hf_ieee80211_rsn_cap_mfpr = -1;
-static int hf_ieee80211_rsn_cap_mfpc = -1;
-static int hf_ieee80211_rsn_cap_jmr = -1;
-static int hf_ieee80211_rsn_cap_peerkey = -1;
-static int hf_ieee80211_rsn_cap_extended_key_id_iaf = -1;
-static int hf_ieee80211_rsn_cap_ocvc = -1;
-static int hf_ieee80211_rsn_pmkid_count = -1;
-static int hf_ieee80211_rsn_pmkid_list = -1;
-static int hf_ieee80211_rsn_pmkid = -1;
-static int hf_ieee80211_rsn_gmcs = -1;
-static int hf_ieee80211_rsn_gmcs_oui = -1;
-static int hf_ieee80211_rsn_gmcs_type = -1;
-static int hf_ieee80211_rsn_gmcs_80211_type = -1;
-
-static int hf_ieee80211_wfa_ie_type = -1;
-static int hf_ieee80211_wfa_ie_wpa_version = -1;
-static int hf_ieee80211_wfa_ie_wpa_mcs = -1;
-static int hf_ieee80211_wfa_ie_wpa_mcs_oui = -1;
-static int hf_ieee80211_wfa_ie_wpa_mcs_type = -1;
-static int hf_ieee80211_wfa_ie_wpa_mcs_wfa_type = -1;
-static int hf_ieee80211_wfa_ie_wpa_ucs_count = -1;
-static int hf_ieee80211_wfa_ie_wpa_ucs_list = -1;
-static int hf_ieee80211_wfa_ie_wpa_ucs = -1;
-static int hf_ieee80211_wfa_ie_wpa_ucs_oui = -1;
-static int hf_ieee80211_wfa_ie_wpa_ucs_wfa_type = -1;
-static int hf_ieee80211_wfa_ie_wpa_ucs_type = -1;
-static int hf_ieee80211_wfa_ie_wpa_akms_count = -1;
-static int hf_ieee80211_wfa_ie_wpa_akms_list = -1;
-static int hf_ieee80211_wfa_ie_wpa_akms = -1;
-static int hf_ieee80211_wfa_ie_wpa_akms_oui = -1;
-static int hf_ieee80211_wfa_ie_wpa_akms_wfa_type = -1;
-static int hf_ieee80211_wfa_ie_wpa_akms_type = -1;
-static int hf_ieee80211_wfa_ie_wme_subtype = -1;
-static int hf_ieee80211_wfa_ie_wme_version = -1;
-static int hf_ieee80211_wfa_ie_wme_qos_info = -1;
-static int hf_ieee80211_wfa_ie_wme_qos_info_sta_max_sp_length = -1;
-static int hf_ieee80211_wfa_ie_wme_qos_info_sta_ac_be = -1;
-static int hf_ieee80211_wfa_ie_wme_qos_info_sta_ac_bk = -1;
-static int hf_ieee80211_wfa_ie_wme_qos_info_sta_ac_vi = -1;
-static int hf_ieee80211_wfa_ie_wme_qos_info_sta_ac_vo = -1;
-static int hf_ieee80211_wfa_ie_wme_qos_info_sta_reserved = -1;
-static int hf_ieee80211_wfa_ie_wme_qos_info_ap_u_apsd = -1;
-static int hf_ieee80211_wfa_ie_wme_qos_info_ap_parameter_set_count = -1;
-static int hf_ieee80211_wfa_ie_wme_qos_info_ap_reserved = -1;
-static int hf_ieee80211_wfa_ie_wme_reserved = -1;
-static int hf_ieee80211_wfa_ie_wme_ac_parameters = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_aci_aifsn = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_aci_be = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_acm_be = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_aifsn_be = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_reserved_be = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_aci_bk = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_acm_bk = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_aifsn_bk = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_reserved_bk = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_aci_vi = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_acm_vi = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_aifsn_vi = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_reserved_vi = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_aci_vo = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_acm_vo = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_aifsn_vo = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_reserved_vo = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_ecw = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_ecw_max_be = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_ecw_max_bk = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_ecw_max_vo = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_ecw_max_vi = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_ecw_min_be = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_ecw_min_bk = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_ecw_min_vo = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_ecw_min_vi = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_txop_limit_be = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_txop_limit_bk = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_txop_limit_vo = -1;
-static int hf_ieee80211_wfa_ie_wme_acp_txop_limit_vi = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_tsinfo = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_tsinfo_tid = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_tsinfo_direction = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_tsinfo_psb = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_tsinfo_up = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_tsinfo_reserved = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_nor_msdu = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_max_msdu = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_min_srv = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_max_srv = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_inact_int = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_susp_int = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_srv_start = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_min_data = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_mean_data = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_peak_data = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_burst_size = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_delay_bound = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_min_phy = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_surplus = -1;
-static int hf_ieee80211_wfa_ie_wme_tspec_medium = -1;
-static int hf_ieee80211_wfa_ie_owe_bssid = -1;
-static int hf_ieee80211_wfa_ie_owe_ssid_length = -1;
-static int hf_ieee80211_wfa_ie_owe_ssid = -1;
-static int hf_ieee80211_wfa_ie_owe_band_info = -1;
-static int hf_ieee80211_wfa_ie_owe_channel_info = -1;
-static int hf_ieee80211_wfa_ie_mbo_oce_attr = -1;
-static int hf_ieee80211_wfa_ie_mbo_oce_attr_id = -1;
-static int hf_ieee80211_wfa_ie_mbo_oce_attr_len = -1;
-static int hf_ieee80211_wfa_ie_mbo_ap_cap = -1;
-static int hf_ieee80211_wfa_ie_mbo_ap_cap_cell = -1;
-static int hf_ieee80211_wfa_ie_mbo_ap_cap_reserved = -1;
-static int hf_ieee80211_wfa_ie_mbo_non_pref_chan_op_class =-1;
-static int hf_ieee80211_wfa_ie_mbo_non_pref_chan_chan = -1;
-static int hf_ieee80211_wfa_ie_mbo_non_pref_chan_pref = -1;
-static int hf_ieee80211_wfa_ie_mbo_non_pref_chan_reason = -1;
-static int hf_ieee80211_wfa_ie_mbo_cellular_cap = -1;
-static int hf_ieee80211_wfa_ie_mbo_assoc_disallow_reason = -1;
-static int hf_ieee80211_wfa_ie_mbo_cellular_pref = -1;
-static int hf_ieee80211_wfa_ie_mbo_transition_reason = -1;
-static int hf_ieee80211_wfa_ie_mbo_transition_rej_reason = -1;
-static int hf_ieee80211_wfa_ie_mbo_assoc_retry_delay = -1;
-static int hf_ieee80211_wfa_ie_oce_cap_ctrl = -1;
-static int hf_ieee80211_wfa_ie_oce_cap_release = -1;
-static int hf_ieee80211_wfa_ie_oce_cap_sta_cfon = -1;
-static int hf_ieee80211_wfa_ie_oce_cap_11b_only_ap = -1;
-static int hf_ieee80211_wfa_ie_oce_cap_hlp = -1;
-static int hf_ieee80211_wfa_ie_oce_cap_non_oce_ap = -1;
-static int hf_ieee80211_wfa_ie_oce_cap_reserved = -1;
-static int hf_ieee80211_wfa_ie_oce_rssi_assoc_rej_delta = -1;
-static int hf_ieee80211_wfa_ie_oce_rssi_assoc_rej_delay = -1;
-static int hf_ieee80211_wfa_ie_oce_wan_metrics_avail_cap = -1;
-static int hf_ieee80211_wfa_ie_oce_wan_metrics_avail_cap_downlink = -1;
-static int hf_ieee80211_wfa_ie_oce_wan_metrics_avail_cap_uplink = -1;
-static int hf_ieee80211_wfa_ie_oce_rnr_completeness_short_ssid = -1;
-static int hf_ieee80211_wfa_ie_oce_probe_suppr_bssid = -1;
-static int hf_ieee80211_wfa_ie_oce_probe_suppr_ssid = -1;
-static int hf_ieee80211_wfa_anqp_mbo_subtype = -1;
-static int hf_ieee80211_wfa_anqp_mbo_query = -1;
-static int hf_ieee80211_wfa_anqp_mbo_cellular_pref = -1;
-static int hf_ieee80211_wfa_ie_transition_disable_bitmap = -1;
-static int hf_ieee80211_wfa_ie_transition_disable_wpa3_personal = -1;
-static int hf_ieee80211_wfa_ie_transition_disable_sae_pk = -1;
-static int hf_ieee80211_wfa_ie_transition_disable_wpa3_enterprise = -1;
-static int hf_ieee80211_wfa_ie_transition_disable_enhanced_open = -1;
-static int hf_ieee80211_wfa_ie_transition_disable_reserved_b4thru7 = -1;
-static int hf_ieee80211_wfa_ie_transition_disable_reserved= -1;
-
-static int hf_ieee80211_aironet_ie_type = -1;
-static int hf_ieee80211_aironet_ie_dtpc = -1;
-static int hf_ieee80211_aironet_ie_dtpc_unknown = -1;
-static int hf_ieee80211_aironet_ie_version = -1;
-static int hf_ieee80211_aironet_ie_data = -1;
-static int hf_ieee80211_aironet_ie_qos_reserved = -1;
-static int hf_ieee80211_aironet_ie_qos_paramset = -1;
-static int hf_ieee80211_aironet_ie_qos_val = -1;
-static int hf_ieee80211_aironet_ie_clientmfp = -1;
-
-static int hf_ieee80211_vs_sgdsn_tag = -1;
-static int hf_ieee80211_vs_sgdsn_type = -1;
-static int hf_ieee80211_vs_sgdsn_length = -1;
-static int hf_ieee80211_vs_sgdsn_version = -1;
-static int hf_ieee80211_vs_sgdsn_icaomfrcode = -1;
-static int hf_ieee80211_vs_sgdsn_manufacturer = -1;
-static int hf_ieee80211_vs_sgdsn_model = -1;
-static int hf_ieee80211_vs_sgdsn_serialnumber = -1;
-static int hf_ieee80211_vs_sgdsn_serialnumber_len = -1;
-static int hf_ieee80211_vs_sgdsn_gpscoord = -1;
-static int hf_ieee80211_vs_sgdsn_altitude = -1;
-static int hf_ieee80211_vs_sgdsn_speed = -1;
-static int hf_ieee80211_vs_sgdsn_heading = -1;
-
-static int hf_ieee80211_vs_nintendo_type = -1;
-static int hf_ieee80211_vs_nintendo_length = -1;
-static int hf_ieee80211_vs_nintendo_servicelist = -1;
-static int hf_ieee80211_vs_nintendo_service = -1;
-static int hf_ieee80211_vs_nintendo_consoleid = -1;
-static int hf_ieee80211_vs_nintendo_unknown = -1;
-
-static int hf_ieee80211_vs_aruba_subtype = -1;
-static int hf_ieee80211_vs_aruba_apname = -1;
-static int hf_ieee80211_vs_aruba_data = -1;
-
-static int hf_ieee80211_vs_routerboard_unknown = -1;
-static int hf_ieee80211_vs_routerboard_subitem = -1;
-static int hf_ieee80211_vs_routerboard_subtype = -1;
-static int hf_ieee80211_vs_routerboard_sublength = -1;
-static int hf_ieee80211_vs_routerboard_subdata = -1;
-static int hf_ieee80211_vs_routerboard_subtype1_prefix = -1;
-static int hf_ieee80211_vs_routerboard_subtype1_data = -1;
-
-static int hf_ieee80211_vs_meru_subitem = -1;
-static int hf_ieee80211_vs_meru_subtype = -1;
-static int hf_ieee80211_vs_meru_sublength = -1;
-static int hf_ieee80211_vs_meru_subdata = -1;
-
-static int hf_ieee80211_vs_extreme_subtype = -1;
-static int hf_ieee80211_vs_extreme_subdata = -1;
-static int hf_ieee80211_vs_extreme_unknown = -1;
-static int hf_ieee80211_vs_extreme_ap_length = -1;
-static int hf_ieee80211_vs_extreme_ap_name = -1;
-
-static int hf_ieee80211_vs_aerohive_version = -1;
-static int hf_ieee80211_vs_aerohive_subtype = -1;
-static int hf_ieee80211_vs_aerohive_hostname_length = -1;
-static int hf_ieee80211_vs_aerohive_hostname = -1;
-static int hf_ieee80211_vs_aerohive_data = -1;
-
-static int hf_ieee80211_vs_mist_ap_name = -1;
-static int hf_ieee80211_vs_mist_data = -1;
-
-static int hf_ieee80211_vs_ruckus_ap_name = -1;
-static int hf_ieee80211_vs_ruckus_data = -1;
-
-static int hf_ieee80211_vs_alcatel_ap_name = -1;
-static int hf_ieee80211_vs_alcatel_data = -1;
-
-static int hf_ieee80211_vs_fortinet_subtype = -1;
-static int hf_ieee80211_vs_fortinet_system_type = -1;
-static int hf_ieee80211_vs_fortinet_system_length = -1;
-static int hf_ieee80211_vs_fortinet_system_apname = -1;
-static int hf_ieee80211_vs_fortinet_system_apmodel = -1;
-static int hf_ieee80211_vs_fortinet_system_apserial = -1;
-static int hf_ieee80211_vs_fortinet_data = -1;
-
-static int hf_ieee80211_vs_arista_subtype = -1;
-static int hf_ieee80211_vs_arista_apname = -1;
-static int hf_ieee80211_vs_arista_data = -1;
-
-static int hf_ieee80211_vs_wisun_type = -1;
-static int hf_ieee80211_vs_wisun_ptkid = -1;
-static int hf_ieee80211_vs_wisun_gtkl = -1;
-static int hf_ieee80211_vs_wisun_gtkl_gtk0 = -1;
-static int hf_ieee80211_vs_wisun_gtkl_gtk1 = -1;
-static int hf_ieee80211_vs_wisun_gtkl_gtk2 = -1;
-static int hf_ieee80211_vs_wisun_gtkl_gtk3 = -1;
-static int hf_ieee80211_vs_wisun_nr = -1;
-static int hf_ieee80211_vs_wisun_lgtkl = -1;
-static int hf_ieee80211_vs_wisun_lgtkl_lgtk0 = -1;
-static int hf_ieee80211_vs_wisun_lgtkl_lgtk1 = -1;
-static int hf_ieee80211_vs_wisun_lgtkl_lgtk2 = -1;
-static int hf_ieee80211_vs_wisun_lgtk_key_id = -1;
-static int hf_ieee80211_vs_wisun_lgtk_lgtk = -1;
-static int hf_ieee80211_vs_wisun_data = -1;
-
-static int hf_ieee80211_rsn_ie_ptk_keyid = -1;
-
-static int hf_ieee80211_rsn_ie_gtk_kde_data_type = -1;
-static int hf_ieee80211_rsn_ie_gtk_kde_key_id = -1;
-static int hf_ieee80211_rsn_ie_gtk_kde_tx = -1;
-static int hf_ieee80211_rsn_ie_gtk_kde_reserved1 = -1;
-static int hf_ieee80211_rsn_ie_gtk_kde_reserved2 = -1;
-static int hf_ieee80211_rsn_ie_gtk_kde_gtk = -1;
-
-static int hf_ieee80211_rsn_ie_mac_address_kde_mac = -1;
-
-static int hf_ieee80211_rsn_ie_pmkid = -1;
-
-static int hf_ieee80211_rsn_ie_unknown = -1;
-
-static int hf_ieee80211_rsn_ie_gtk_kde_nonce = -1;
-static int hf_ieee80211_rsn_ie_gtk_kde_lifetime = -1;
-static int hf_ieee80211_rsn_ie_error_kde_res = -1;
-static int hf_ieee80211_rsn_ie_error_kde_error_type = -1;
-static int hf_ieee80211_rsn_ie_igtk_kde_keyid = -1;
-static int hf_ieee80211_rsn_ie_igtk_kde_ipn = -1;
-static int hf_ieee80211_rsn_ie_igtk_kde_igtk = -1;
-static int hf_ieee80211_rsn_ie_oci_operating_class = -1;
-static int hf_ieee80211_rsn_ie_oci_primary_channel_number = -1;
-static int hf_ieee80211_rsn_ie_oci_frequency_segment_1 = -1;
-static int hf_ieee80211_rsn_ie_bigtk_key_id = -1;
-static int hf_ieee80211_rsn_ie_bigtk_bipn = -1;
-static int hf_ieee80211_rsn_ie_bigtk_bigtk = -1;
-static int hf_ieee80211_rsn_ie_mlo_link_info = -1;
-static int hf_ieee80211_rsn_ie_mlo_linkid = -1;
-static int hf_ieee80211_rsn_ie_mlo_rnse_present = -1;
-static int hf_ieee80211_rsn_ie_mlo_rnsxe_present = -1;
-static int hf_ieee80211_rsn_ie_mlo_reserved = -1;
-static int hf_ieee80211_rsn_ie_mlo_mac_addr = -1;
-static int hf_ieee80211_rsn_ie_mlo_gtk_kde_key_id = -1;
-static int hf_ieee80211_rsn_ie_mlo_gtk_kde_tx = -1;
-static int hf_ieee80211_rsn_ie_mlo_gtk_kde_reserved = -1;
-static int hf_ieee80211_rsn_ie_mlo_gtk_kde_linkid = -1;
-static int hf_ieee80211_rsn_ie_mlo_gtk_kde_pn = -1;
-static int hf_ieee80211_rsn_ie_mlo_gtk_kde_gtk = -1;
-
-static int hf_ieee80211_rsn_ie_mlo_igtk_kde_key_id = -1;
-static int hf_ieee80211_rsn_ie_mlo_igtk_kde_ipn = -1;
-static int hf_ieee80211_rsn_ie_mlo_igtk_kde_reserved = -1;
-static int hf_ieee80211_rsn_ie_mlo_igtk_kde_linkid = -1;
-static int hf_ieee80211_rsn_ie_mlo_igtk_kde_igtk = -1;
-
-static int hf_ieee80211_rsn_ie_mlo_bigtk_kde_key_id = -1;
-static int hf_ieee80211_rsn_ie_mlo_bigtk_kde_ipn = -1;
-static int hf_ieee80211_rsn_ie_mlo_bigtk_kde_reserved = -1;
-static int hf_ieee80211_rsn_ie_mlo_bigtk_kde_linkid = -1;
-static int hf_ieee80211_rsn_ie_mlo_bigtk_kde_bigtk = -1;
-
-static int hf_ieee80211_marvell_ie_type = -1;
-static int hf_ieee80211_marvell_ie_mesh_subtype = -1;
-static int hf_ieee80211_marvell_ie_mesh_version = -1;
-static int hf_ieee80211_marvell_ie_mesh_active_proto_id = -1;
-static int hf_ieee80211_marvell_ie_mesh_active_metric_id = -1;
-static int hf_ieee80211_marvell_ie_mesh_cap = -1;
-static int hf_ieee80211_marvell_ie_data = -1;
-
-static int hf_ieee80211_extreme_mesh_ie_type = -1;
-static int hf_ieee80211_extreme_mesh_ie_services = -1;
-static int hf_ieee80211_extreme_mesh_ie_hello_f_root = -1;
-static int hf_ieee80211_extreme_mesh_ie_hello_f_proxy = -1;
-static int hf_ieee80211_extreme_mesh_ie_hello_f_geo = -1;
-static int hf_ieee80211_extreme_mesh_ie_hello_f_path_pref = -1;
-static int hf_ieee80211_extreme_mesh_ie_hello_f_mobile = -1;
-static int hf_ieee80211_extreme_mesh_ie_htr = -1;
-static int hf_ieee80211_extreme_mesh_ie_mtr = -1;
-static int hf_ieee80211_extreme_mesh_ie_root = -1;
-static int hf_ieee80211_extreme_mesh_ie_nh = -1;
-static int hf_ieee80211_extreme_mesh_ie_mesh_id = -1;
-static int hf_ieee80211_extreme_mesh_ie_mp_id = -1;
-
-static int hf_ieee80211_atheros_ie_type = -1;
-static int hf_ieee80211_atheros_ie_subtype = -1;
-static int hf_ieee80211_atheros_ie_version = -1;
-static int hf_ieee80211_atheros_ie_cap_f_turbop = -1;
-static int hf_ieee80211_atheros_ie_cap_f_comp = -1;
-static int hf_ieee80211_atheros_ie_cap_f_ff = -1;
-static int hf_ieee80211_atheros_ie_cap_f_xr = -1;
-static int hf_ieee80211_atheros_ie_cap_f_ar = -1;
-static int hf_ieee80211_atheros_ie_cap_f_burst = -1;
-static int hf_ieee80211_atheros_ie_cap_f_wme = -1;
-static int hf_ieee80211_atheros_ie_cap_f_boost = -1;
-static int hf_ieee80211_atheros_ie_advcap_cap = -1;
-static int hf_ieee80211_atheros_ie_advcap_defkey = -1;
-static int hf_ieee80211_atheros_ie_xr_info = -1;
-static int hf_ieee80211_atheros_ie_xr_base_bssid = -1;
-static int hf_ieee80211_atheros_ie_xr_xr_bssid = -1;
-static int hf_ieee80211_atheros_ie_xr_xr_beacon = -1;
-static int hf_ieee80211_atheros_ie_xr_base_cap = -1;
-static int hf_ieee80211_atheros_ie_xr_xr_cap = -1;
-static int hf_ieee80211_atheros_ie_data = -1;
+static int hf_ieee80211_hta_cc;
+static int hf_ieee80211_hta_cap1;
+static int hf_ieee80211_hta_cap2;
+static int hf_ieee80211_hta_ext_chan_offset;
+static int hf_ieee80211_hta_rec_tx_width;
+static int hf_ieee80211_hta_rifs_mode;
+static int hf_ieee80211_hta_controlled_access;
+static int hf_ieee80211_hta_service_interval;
+static int hf_ieee80211_hta_operating_mode;
+static int hf_ieee80211_hta_non_gf_devices;
+static int hf_ieee80211_hta_basic_stbc_mcs;
+static int hf_ieee80211_hta_dual_stbc_protection;
+static int hf_ieee80211_hta_secondary_beacon;
+static int hf_ieee80211_hta_lsig_txop_protection;
+static int hf_ieee80211_hta_pco_active;
+static int hf_ieee80211_hta_pco_phase;
+
+static int hf_ieee80211_antsel;
+static int hf_ieee80211_antsel_vs;
+static int hf_ieee80211_antsel_b0;
+static int hf_ieee80211_antsel_b1;
+static int hf_ieee80211_antsel_b2;
+static int hf_ieee80211_antsel_b3;
+static int hf_ieee80211_antsel_b4;
+static int hf_ieee80211_antsel_b5;
+static int hf_ieee80211_antsel_b6;
+static int hf_ieee80211_antsel_b7;
+
+static int hf_ieee80211_rsn_version;
+static int hf_ieee80211_rsn_gcs;
+static int hf_ieee80211_rsn_gcs_oui;
+static int hf_ieee80211_rsn_gcs_type;
+static int hf_ieee80211_rsn_gcs_80211_type;
+static int hf_ieee80211_rsn_pcs_count;
+static int hf_ieee80211_rsn_pcs_list;
+static int hf_ieee80211_rsn_pcs;
+static int hf_ieee80211_rsn_pcs_oui;
+static int hf_ieee80211_rsn_pcs_80211_type;
+static int hf_ieee80211_rsn_pcs_type;
+static int hf_ieee80211_rsn_akms_count;
+static int hf_ieee80211_rsn_akms_list;
+static int hf_ieee80211_rsn_akms;
+static int hf_ieee80211_rsn_akms_oui;
+static int hf_ieee80211_rsn_akms_80211_type;
+static int hf_ieee80211_rsn_akms_type;
+static int hf_ieee80211_rsn_cap;
+static int hf_ieee80211_rsn_cap_preauth;
+static int hf_ieee80211_rsn_cap_no_pairwise;
+static int hf_ieee80211_rsn_cap_ptksa_replay_counter;
+static int hf_ieee80211_rsn_cap_gtksa_replay_counter;
+static int hf_ieee80211_rsn_cap_mfpr;
+static int hf_ieee80211_rsn_cap_mfpc;
+static int hf_ieee80211_rsn_cap_jmr;
+static int hf_ieee80211_rsn_cap_peerkey;
+static int hf_ieee80211_rsn_cap_extended_key_id_iaf;
+static int hf_ieee80211_rsn_cap_ocvc;
+static int hf_ieee80211_rsn_pmkid_count;
+static int hf_ieee80211_rsn_pmkid_list;
+static int hf_ieee80211_rsn_pmkid;
+static int hf_ieee80211_rsn_gmcs;
+static int hf_ieee80211_rsn_gmcs_oui;
+static int hf_ieee80211_rsn_gmcs_type;
+static int hf_ieee80211_rsn_gmcs_80211_type;
+
+static int hf_ieee80211_wfa_ie_type;
+static int hf_ieee80211_wfa_ie_wpa_version;
+static int hf_ieee80211_wfa_ie_wpa_mcs;
+static int hf_ieee80211_wfa_ie_wpa_mcs_oui;
+static int hf_ieee80211_wfa_ie_wpa_mcs_type;
+static int hf_ieee80211_wfa_ie_wpa_mcs_wfa_type;
+static int hf_ieee80211_wfa_ie_wpa_ucs_count;
+static int hf_ieee80211_wfa_ie_wpa_ucs_list;
+static int hf_ieee80211_wfa_ie_wpa_ucs;
+static int hf_ieee80211_wfa_ie_wpa_ucs_oui;
+static int hf_ieee80211_wfa_ie_wpa_ucs_wfa_type;
+static int hf_ieee80211_wfa_ie_wpa_ucs_type;
+static int hf_ieee80211_wfa_ie_wpa_akms_count;
+static int hf_ieee80211_wfa_ie_wpa_akms_list;
+static int hf_ieee80211_wfa_ie_wpa_akms;
+static int hf_ieee80211_wfa_ie_wpa_akms_oui;
+static int hf_ieee80211_wfa_ie_wpa_akms_wfa_type;
+static int hf_ieee80211_wfa_ie_wpa_akms_type;
+static int hf_ieee80211_wfa_ie_wme_subtype;
+static int hf_ieee80211_wfa_ie_wme_version;
+static int hf_ieee80211_wfa_ie_wme_qos_info;
+static int hf_ieee80211_wfa_ie_wme_qos_info_sta_max_sp_length;
+static int hf_ieee80211_wfa_ie_wme_qos_info_sta_ac_be;
+static int hf_ieee80211_wfa_ie_wme_qos_info_sta_ac_bk;
+static int hf_ieee80211_wfa_ie_wme_qos_info_sta_ac_vi;
+static int hf_ieee80211_wfa_ie_wme_qos_info_sta_ac_vo;
+static int hf_ieee80211_wfa_ie_wme_qos_info_sta_reserved;
+static int hf_ieee80211_wfa_ie_wme_qos_info_ap_u_apsd;
+static int hf_ieee80211_wfa_ie_wme_qos_info_ap_parameter_set_count;
+static int hf_ieee80211_wfa_ie_wme_qos_info_ap_reserved;
+static int hf_ieee80211_wfa_ie_wme_reserved;
+static int hf_ieee80211_wfa_ie_wme_ac_parameters;
+static int hf_ieee80211_wfa_ie_wme_acp_aci_aifsn;
+static int hf_ieee80211_wfa_ie_wme_acp_aci_be;
+static int hf_ieee80211_wfa_ie_wme_acp_acm_be;
+static int hf_ieee80211_wfa_ie_wme_acp_aifsn_be;
+static int hf_ieee80211_wfa_ie_wme_acp_reserved_be;
+static int hf_ieee80211_wfa_ie_wme_acp_aci_bk;
+static int hf_ieee80211_wfa_ie_wme_acp_acm_bk;
+static int hf_ieee80211_wfa_ie_wme_acp_aifsn_bk;
+static int hf_ieee80211_wfa_ie_wme_acp_reserved_bk;
+static int hf_ieee80211_wfa_ie_wme_acp_aci_vi;
+static int hf_ieee80211_wfa_ie_wme_acp_acm_vi;
+static int hf_ieee80211_wfa_ie_wme_acp_aifsn_vi;
+static int hf_ieee80211_wfa_ie_wme_acp_reserved_vi;
+static int hf_ieee80211_wfa_ie_wme_acp_aci_vo;
+static int hf_ieee80211_wfa_ie_wme_acp_acm_vo;
+static int hf_ieee80211_wfa_ie_wme_acp_aifsn_vo;
+static int hf_ieee80211_wfa_ie_wme_acp_reserved_vo;
+static int hf_ieee80211_wfa_ie_wme_acp_ecw;
+static int hf_ieee80211_wfa_ie_wme_acp_ecw_max_be;
+static int hf_ieee80211_wfa_ie_wme_acp_ecw_max_bk;
+static int hf_ieee80211_wfa_ie_wme_acp_ecw_max_vo;
+static int hf_ieee80211_wfa_ie_wme_acp_ecw_max_vi;
+static int hf_ieee80211_wfa_ie_wme_acp_ecw_min_be;
+static int hf_ieee80211_wfa_ie_wme_acp_ecw_min_bk;
+static int hf_ieee80211_wfa_ie_wme_acp_ecw_min_vo;
+static int hf_ieee80211_wfa_ie_wme_acp_ecw_min_vi;
+static int hf_ieee80211_wfa_ie_wme_acp_txop_limit_be;
+static int hf_ieee80211_wfa_ie_wme_acp_txop_limit_bk;
+static int hf_ieee80211_wfa_ie_wme_acp_txop_limit_vo;
+static int hf_ieee80211_wfa_ie_wme_acp_txop_limit_vi;
+static int hf_ieee80211_wfa_ie_wme_tspec_tsinfo;
+static int hf_ieee80211_wfa_ie_wme_tspec_tsinfo_tid;
+static int hf_ieee80211_wfa_ie_wme_tspec_tsinfo_direction;
+static int hf_ieee80211_wfa_ie_wme_tspec_tsinfo_psb;
+static int hf_ieee80211_wfa_ie_wme_tspec_tsinfo_up;
+static int hf_ieee80211_wfa_ie_wme_tspec_tsinfo_reserved;
+static int hf_ieee80211_wfa_ie_wme_tspec_nor_msdu;
+static int hf_ieee80211_wfa_ie_wme_tspec_max_msdu;
+static int hf_ieee80211_wfa_ie_wme_tspec_min_srv;
+static int hf_ieee80211_wfa_ie_wme_tspec_max_srv;
+static int hf_ieee80211_wfa_ie_wme_tspec_inact_int;
+static int hf_ieee80211_wfa_ie_wme_tspec_susp_int;
+static int hf_ieee80211_wfa_ie_wme_tspec_srv_start;
+static int hf_ieee80211_wfa_ie_wme_tspec_min_data;
+static int hf_ieee80211_wfa_ie_wme_tspec_mean_data;
+static int hf_ieee80211_wfa_ie_wme_tspec_peak_data;
+static int hf_ieee80211_wfa_ie_wme_tspec_burst_size;
+static int hf_ieee80211_wfa_ie_wme_tspec_delay_bound;
+static int hf_ieee80211_wfa_ie_wme_tspec_min_phy;
+static int hf_ieee80211_wfa_ie_wme_tspec_surplus;
+static int hf_ieee80211_wfa_ie_wme_tspec_medium;
+static int hf_ieee80211_wfa_ie_owe_bssid;
+static int hf_ieee80211_wfa_ie_owe_ssid_length;
+static int hf_ieee80211_wfa_ie_owe_ssid;
+static int hf_ieee80211_wfa_ie_owe_band_info;
+static int hf_ieee80211_wfa_ie_owe_channel_info;
+static int hf_ieee80211_wfa_ie_mbo_oce_attr;
+static int hf_ieee80211_wfa_ie_mbo_oce_attr_id;
+static int hf_ieee80211_wfa_ie_mbo_oce_attr_len;
+static int hf_ieee80211_wfa_ie_mbo_ap_cap;
+static int hf_ieee80211_wfa_ie_mbo_ap_cap_cell;
+static int hf_ieee80211_wfa_ie_mbo_ap_cap_reserved;
+static int hf_ieee80211_wfa_ie_mbo_non_pref_chan_op_class;
+static int hf_ieee80211_wfa_ie_mbo_non_pref_chan_chan;
+static int hf_ieee80211_wfa_ie_mbo_non_pref_chan_pref;
+static int hf_ieee80211_wfa_ie_mbo_non_pref_chan_reason;
+static int hf_ieee80211_wfa_ie_mbo_cellular_cap;
+static int hf_ieee80211_wfa_ie_mbo_assoc_disallow_reason;
+static int hf_ieee80211_wfa_ie_mbo_cellular_pref;
+static int hf_ieee80211_wfa_ie_mbo_transition_reason;
+static int hf_ieee80211_wfa_ie_mbo_transition_rej_reason;
+static int hf_ieee80211_wfa_ie_mbo_assoc_retry_delay;
+static int hf_ieee80211_wfa_ie_oce_cap_ctrl;
+static int hf_ieee80211_wfa_ie_oce_cap_release;
+static int hf_ieee80211_wfa_ie_oce_cap_sta_cfon;
+static int hf_ieee80211_wfa_ie_oce_cap_11b_only_ap;
+static int hf_ieee80211_wfa_ie_oce_cap_hlp;
+static int hf_ieee80211_wfa_ie_oce_cap_non_oce_ap;
+static int hf_ieee80211_wfa_ie_oce_cap_reserved;
+static int hf_ieee80211_wfa_ie_oce_rssi_assoc_rej_delta;
+static int hf_ieee80211_wfa_ie_oce_rssi_assoc_rej_delay;
+static int hf_ieee80211_wfa_ie_oce_wan_metrics_avail_cap;
+static int hf_ieee80211_wfa_ie_oce_wan_metrics_avail_cap_downlink;
+static int hf_ieee80211_wfa_ie_oce_wan_metrics_avail_cap_uplink;
+static int hf_ieee80211_wfa_ie_oce_rnr_completeness_short_ssid;
+static int hf_ieee80211_wfa_ie_oce_probe_suppr_bssid;
+static int hf_ieee80211_wfa_ie_oce_probe_suppr_ssid;
+static int hf_ieee80211_wfa_anqp_mbo_subtype;
+static int hf_ieee80211_wfa_anqp_mbo_query;
+static int hf_ieee80211_wfa_anqp_mbo_cellular_pref;
+static int hf_ieee80211_wfa_ie_transition_disable_bitmap;
+static int hf_ieee80211_wfa_ie_transition_disable_wpa3_personal;
+static int hf_ieee80211_wfa_ie_transition_disable_sae_pk;
+static int hf_ieee80211_wfa_ie_transition_disable_wpa3_enterprise;
+static int hf_ieee80211_wfa_ie_transition_disable_enhanced_open;
+static int hf_ieee80211_wfa_ie_transition_disable_reserved_b4thru7;
+static int hf_ieee80211_wfa_ie_transition_disable_reserved;
+
+static int hf_ieee80211_aironet_ie_type;
+static int hf_ieee80211_aironet_ie_dtpc;
+static int hf_ieee80211_aironet_ie_dtpc_unknown;
+static int hf_ieee80211_aironet_ie_version;
+static int hf_ieee80211_aironet_ie_data;
+static int hf_ieee80211_aironet_ie_qos_reserved;
+static int hf_ieee80211_aironet_ie_qos_paramset;
+static int hf_ieee80211_aironet_ie_qos_val;
+static int hf_ieee80211_aironet_ie_clientmfp;
+
+static int hf_ieee80211_vs_sgdsn_tag;
+static int hf_ieee80211_vs_sgdsn_type;
+static int hf_ieee80211_vs_sgdsn_length;
+static int hf_ieee80211_vs_sgdsn_version;
+static int hf_ieee80211_vs_sgdsn_icaomfrcode;
+static int hf_ieee80211_vs_sgdsn_manufacturer;
+static int hf_ieee80211_vs_sgdsn_model;
+static int hf_ieee80211_vs_sgdsn_serialnumber;
+static int hf_ieee80211_vs_sgdsn_serialnumber_len;
+static int hf_ieee80211_vs_sgdsn_gpscoord;
+static int hf_ieee80211_vs_sgdsn_altitude;
+static int hf_ieee80211_vs_sgdsn_speed;
+static int hf_ieee80211_vs_sgdsn_heading;
+
+static int hf_ieee80211_vs_nintendo_type;
+static int hf_ieee80211_vs_nintendo_length;
+static int hf_ieee80211_vs_nintendo_servicelist;
+static int hf_ieee80211_vs_nintendo_service;
+static int hf_ieee80211_vs_nintendo_consoleid;
+static int hf_ieee80211_vs_nintendo_unknown;
+
+static int hf_ieee80211_vs_aruba_subtype;
+static int hf_ieee80211_vs_aruba_apname;
+static int hf_ieee80211_vs_aruba_data;
+
+static int hf_ieee80211_vs_routerboard_unknown;
+static int hf_ieee80211_vs_routerboard_subitem;
+static int hf_ieee80211_vs_routerboard_subtype;
+static int hf_ieee80211_vs_routerboard_sublength;
+static int hf_ieee80211_vs_routerboard_subdata;
+static int hf_ieee80211_vs_routerboard_subtype1_prefix;
+static int hf_ieee80211_vs_routerboard_subtype1_data;
+
+static int hf_ieee80211_vs_meru_subitem;
+static int hf_ieee80211_vs_meru_subtype;
+static int hf_ieee80211_vs_meru_sublength;
+static int hf_ieee80211_vs_meru_subdata;
+
+static int hf_ieee80211_vs_extreme_subtype;
+static int hf_ieee80211_vs_extreme_subdata;
+static int hf_ieee80211_vs_extreme_unknown;
+static int hf_ieee80211_vs_extreme_ap_length;
+static int hf_ieee80211_vs_extreme_ap_name;
+
+static int hf_ieee80211_vs_aerohive_version;
+static int hf_ieee80211_vs_aerohive_subtype;
+static int hf_ieee80211_vs_aerohive_hostname_length;
+static int hf_ieee80211_vs_aerohive_hostname;
+static int hf_ieee80211_vs_aerohive_data;
+
+static int hf_ieee80211_vs_mist_ap_name;
+static int hf_ieee80211_vs_mist_data;
+
+static int hf_ieee80211_vs_ruckus_ap_name;
+static int hf_ieee80211_vs_ruckus_data;
+
+static int hf_ieee80211_vs_alcatel_ap_name;
+static int hf_ieee80211_vs_alcatel_data;
+
+static int hf_ieee80211_vs_fortinet_subtype;
+static int hf_ieee80211_vs_fortinet_system_type;
+static int hf_ieee80211_vs_fortinet_system_length;
+static int hf_ieee80211_vs_fortinet_system_apname;
+static int hf_ieee80211_vs_fortinet_system_apmodel;
+static int hf_ieee80211_vs_fortinet_system_apserial;
+static int hf_ieee80211_vs_fortinet_data;
+
+static int hf_ieee80211_vs_arista_subtype;
+static int hf_ieee80211_vs_arista_apname;
+static int hf_ieee80211_vs_arista_data;
+
+static int hf_ieee80211_vs_wisun_type;
+static int hf_ieee80211_vs_wisun_ptkid;
+static int hf_ieee80211_vs_wisun_gtkl;
+static int hf_ieee80211_vs_wisun_gtkl_gtk0;
+static int hf_ieee80211_vs_wisun_gtkl_gtk1;
+static int hf_ieee80211_vs_wisun_gtkl_gtk2;
+static int hf_ieee80211_vs_wisun_gtkl_gtk3;
+static int hf_ieee80211_vs_wisun_nr;
+static int hf_ieee80211_vs_wisun_lgtkl;
+static int hf_ieee80211_vs_wisun_lgtkl_lgtk0;
+static int hf_ieee80211_vs_wisun_lgtkl_lgtk1;
+static int hf_ieee80211_vs_wisun_lgtkl_lgtk2;
+static int hf_ieee80211_vs_wisun_lgtk_key_id;
+static int hf_ieee80211_vs_wisun_lgtk_lgtk;
+static int hf_ieee80211_vs_wisun_data;
+
+static int hf_ieee80211_rsn_ie_ptk_keyid;
+
+static int hf_ieee80211_rsn_ie_gtk_kde_data_type;
+static int hf_ieee80211_rsn_ie_gtk_kde_key_id;
+static int hf_ieee80211_rsn_ie_gtk_kde_tx;
+static int hf_ieee80211_rsn_ie_gtk_kde_reserved1;
+static int hf_ieee80211_rsn_ie_gtk_kde_reserved2;
+static int hf_ieee80211_rsn_ie_gtk_kde_gtk;
+
+static int hf_ieee80211_rsn_ie_mac_address_kde_mac;
+
+static int hf_ieee80211_rsn_ie_pmkid;
+
+static int hf_ieee80211_rsn_ie_unknown;
+
+static int hf_ieee80211_rsn_ie_gtk_kde_nonce;
+static int hf_ieee80211_rsn_ie_gtk_kde_lifetime;
+static int hf_ieee80211_rsn_ie_error_kde_res;
+static int hf_ieee80211_rsn_ie_error_kde_error_type;
+static int hf_ieee80211_rsn_ie_igtk_kde_keyid;
+static int hf_ieee80211_rsn_ie_igtk_kde_ipn;
+static int hf_ieee80211_rsn_ie_igtk_kde_igtk;
+static int hf_ieee80211_rsn_ie_oci_operating_class;
+static int hf_ieee80211_rsn_ie_oci_primary_channel_number;
+static int hf_ieee80211_rsn_ie_oci_frequency_segment_1;
+static int hf_ieee80211_rsn_ie_bigtk_key_id;
+static int hf_ieee80211_rsn_ie_bigtk_bipn;
+static int hf_ieee80211_rsn_ie_bigtk_bigtk;
+static int hf_ieee80211_rsn_ie_mlo_link_info;
+static int hf_ieee80211_rsn_ie_mlo_linkid;
+static int hf_ieee80211_rsn_ie_mlo_rnse_present;
+static int hf_ieee80211_rsn_ie_mlo_rnsxe_present;
+static int hf_ieee80211_rsn_ie_mlo_reserved;
+static int hf_ieee80211_rsn_ie_mlo_mac_addr;
+static int hf_ieee80211_rsn_ie_mlo_gtk_kde_key_id;
+static int hf_ieee80211_rsn_ie_mlo_gtk_kde_tx;
+static int hf_ieee80211_rsn_ie_mlo_gtk_kde_reserved;
+static int hf_ieee80211_rsn_ie_mlo_gtk_kde_linkid;
+static int hf_ieee80211_rsn_ie_mlo_gtk_kde_pn;
+static int hf_ieee80211_rsn_ie_mlo_gtk_kde_gtk;
+
+static int hf_ieee80211_rsn_ie_mlo_igtk_kde_key_id;
+static int hf_ieee80211_rsn_ie_mlo_igtk_kde_ipn;
+static int hf_ieee80211_rsn_ie_mlo_igtk_kde_reserved;
+static int hf_ieee80211_rsn_ie_mlo_igtk_kde_linkid;
+static int hf_ieee80211_rsn_ie_mlo_igtk_kde_igtk;
+
+static int hf_ieee80211_rsn_ie_mlo_bigtk_kde_key_id;
+static int hf_ieee80211_rsn_ie_mlo_bigtk_kde_ipn;
+static int hf_ieee80211_rsn_ie_mlo_bigtk_kde_reserved;
+static int hf_ieee80211_rsn_ie_mlo_bigtk_kde_linkid;
+static int hf_ieee80211_rsn_ie_mlo_bigtk_kde_bigtk;
+
+static int hf_ieee80211_marvell_ie_type;
+static int hf_ieee80211_marvell_ie_mesh_subtype;
+static int hf_ieee80211_marvell_ie_mesh_version;
+static int hf_ieee80211_marvell_ie_mesh_active_proto_id;
+static int hf_ieee80211_marvell_ie_mesh_active_metric_id;
+static int hf_ieee80211_marvell_ie_mesh_cap;
+static int hf_ieee80211_marvell_ie_data;
+
+static int hf_ieee80211_extreme_mesh_ie_type;
+static int hf_ieee80211_extreme_mesh_ie_services;
+static int hf_ieee80211_extreme_mesh_ie_hello_f_root;
+static int hf_ieee80211_extreme_mesh_ie_hello_f_proxy;
+static int hf_ieee80211_extreme_mesh_ie_hello_f_geo;
+static int hf_ieee80211_extreme_mesh_ie_hello_f_path_pref;
+static int hf_ieee80211_extreme_mesh_ie_hello_f_mobile;
+static int hf_ieee80211_extreme_mesh_ie_htr;
+static int hf_ieee80211_extreme_mesh_ie_mtr;
+static int hf_ieee80211_extreme_mesh_ie_root;
+static int hf_ieee80211_extreme_mesh_ie_nh;
+static int hf_ieee80211_extreme_mesh_ie_mesh_id;
+static int hf_ieee80211_extreme_mesh_ie_mp_id;
+
+static int hf_ieee80211_atheros_ie_type;
+static int hf_ieee80211_atheros_ie_subtype;
+static int hf_ieee80211_atheros_ie_version;
+static int hf_ieee80211_atheros_ie_cap_f_turbop;
+static int hf_ieee80211_atheros_ie_cap_f_comp;
+static int hf_ieee80211_atheros_ie_cap_f_ff;
+static int hf_ieee80211_atheros_ie_cap_f_xr;
+static int hf_ieee80211_atheros_ie_cap_f_ar;
+static int hf_ieee80211_atheros_ie_cap_f_burst;
+static int hf_ieee80211_atheros_ie_cap_f_wme;
+static int hf_ieee80211_atheros_ie_cap_f_boost;
+static int hf_ieee80211_atheros_ie_advcap_cap;
+static int hf_ieee80211_atheros_ie_advcap_defkey;
+static int hf_ieee80211_atheros_ie_xr_info;
+static int hf_ieee80211_atheros_ie_xr_base_bssid;
+static int hf_ieee80211_atheros_ie_xr_xr_bssid;
+static int hf_ieee80211_atheros_ie_xr_xr_beacon;
+static int hf_ieee80211_atheros_ie_xr_base_cap;
+static int hf_ieee80211_atheros_ie_xr_xr_cap;
+static int hf_ieee80211_atheros_ie_data;
 
 /*QBSS - Version 1,2,802.11e*/
 
-static int hf_ieee80211_qbss2_cal = -1;
-static int hf_ieee80211_qbss2_gl = -1;
-static int hf_ieee80211_qbss_cu = -1;
-static int hf_ieee80211_qbss2_cu = -1;
-static int hf_ieee80211_qbss_scount = -1;
-static int hf_ieee80211_qbss2_scount = -1;
-static int hf_ieee80211_qbss_version = -1;
-static int hf_ieee80211_qbss_adc = -1;
-
-static int hf_ieee80211_tsinfo = -1;
-static int hf_ieee80211_tsinfo_type = -1;
-static int hf_ieee80211_tsinfo_tsid = -1;
-static int hf_ieee80211_tsinfo_dir = -1;
-static int hf_ieee80211_tsinfo_access = -1;
-static int hf_ieee80211_tsinfo_agg = -1;
-static int hf_ieee80211_tsinfo_apsd = -1;
-static int hf_ieee80211_tsinfo_up = -1;
-static int hf_ieee80211_tsinfo_ack = -1;
-static int hf_ieee80211_tsinfo_sched = -1;
-static int hf_ieee80211_tsinfo_rsv = -1;
+static int hf_ieee80211_qbss2_cal;
+static int hf_ieee80211_qbss2_gl;
+static int hf_ieee80211_qbss_cu;
+static int hf_ieee80211_qbss2_cu;
+static int hf_ieee80211_qbss_scount;
+static int hf_ieee80211_qbss2_scount;
+static int hf_ieee80211_qbss_version;
+static int hf_ieee80211_qbss_adc;
+
+static int hf_ieee80211_tsinfo;
+static int hf_ieee80211_tsinfo_type;
+static int hf_ieee80211_tsinfo_tsid;
+static int hf_ieee80211_tsinfo_dir;
+static int hf_ieee80211_tsinfo_access;
+static int hf_ieee80211_tsinfo_agg;
+static int hf_ieee80211_tsinfo_apsd;
+static int hf_ieee80211_tsinfo_up;
+static int hf_ieee80211_tsinfo_ack;
+static int hf_ieee80211_tsinfo_sched;
+static int hf_ieee80211_tsinfo_rsv;
 
 static int * const ieee80211_tsinfo_fields[] = {
   &hf_ieee80211_tsinfo_type,
@@ -6910,435 +6910,435 @@ static int * const ieee80211_tsinfo_fields[] = {
   NULL
 };
 
-static int hf_ieee80211_tspec_nor_msdu = -1;
-static int hf_ieee80211_tspec_max_msdu = -1;
-static int hf_ieee80211_tspec_min_srv = -1;
-static int hf_ieee80211_tspec_max_srv = -1;
-static int hf_ieee80211_tspec_inact_int = -1;
-static int hf_ieee80211_tspec_susp_int = -1;
-static int hf_ieee80211_tspec_srv_start = -1;
-static int hf_ieee80211_tspec_min_data = -1;
-static int hf_ieee80211_tspec_mean_data = -1;
-static int hf_ieee80211_tspec_peak_data = -1;
-static int hf_ieee80211_tspec_burst_size = -1;
-static int hf_ieee80211_tspec_delay_bound = -1;
-static int hf_ieee80211_tspec_min_phy = -1;
-static int hf_ieee80211_tspec_surplus = -1;
-static int hf_ieee80211_tspec_medium = -1;
-static int hf_ieee80211_tspec_dmg = -1;
-static int hf_ieee80211_ts_delay = -1;
-static int hf_ieee80211_tclas_process = -1;
-static int hf_ieee80211_tag_ext_supp_rates = -1;
-static int hf_ieee80211_sched_info = -1;
-static int hf_ieee80211_sched_info_agg = -1;
-static int hf_ieee80211_sched_info_tsid = -1;
-static int hf_ieee80211_sched_info_dir = -1;
-static int hf_ieee80211_sched_srv_start = -1;
-static int hf_ieee80211_sched_srv_int = -1;
-static int hf_ieee80211_sched_spec_int = -1;
-static int hf_ieee80211_tclas_up = -1;
-static int hf_ieee80211_tclas_class_type = -1;
-static int hf_ieee80211_tclas_class_mask = -1;
-static int hf_ieee80211_tclas_mask_reserved = -1;
-static int hf_ieee80211_tclas_class_mask0_src_addr = -1;
-static int hf_ieee80211_tclas_class_mask0_dst_addr = -1;
-static int hf_ieee80211_tclas_class_mask0_type = -1;
-static int hf_ieee80211_tclas_class_mask1_ver = -1;
-static int hf_ieee80211_tclas_class_mask1_src_ip = -1;
-static int hf_ieee80211_tclas_class_mask1_dst_ip = -1;
-static int hf_ieee80211_tclas_class_mask1_src_port = -1;
-static int hf_ieee80211_tclas_class_mask1_dst_port = -1;
-static int hf_ieee80211_tclas_class_mask1_ipv4_dscp = -1;
-static int hf_ieee80211_tclas_class_mask1_ipv4_proto = -1;
-static int hf_ieee80211_tclas_class_mask1_reserved = -1;
-static int hf_ieee80211_tclas_class_mask1_ipv6_flow = -1;
-static int hf_ieee80211_tclas_class_mask2_tci = -1;
-static int hf_ieee80211_tclas_src_mac_addr = -1;
-static int hf_ieee80211_tclas_dst_mac_addr = -1;
-static int hf_ieee80211_tclas_ether_type = -1;
-static int hf_ieee80211_tclas_version = -1;
-static int hf_ieee80211_tclas_ipv4_src = -1;
-static int hf_ieee80211_tclas_ipv4_dst = -1;
-static int hf_ieee80211_tclas_src_port = -1;
-static int hf_ieee80211_tclas_dst_port = -1;
-static int hf_ieee80211_tclas_dscp = -1;
-static int hf_ieee80211_tclas_protocol = -1;
-static int hf_ieee80211_tclas_ipv6_src = -1;
-static int hf_ieee80211_tclas_ipv6_dst = -1;
-static int hf_ieee80211_tclas_flow = -1;
-static int hf_ieee80211_tclas_tag_type = -1;
-static int hf_ieee80211_tclas_filter_offset = -1;
-static int hf_ieee80211_tclas_filter_value = -1;
-static int hf_ieee80211_tclas_filter_mask = -1;
-static int hf_ieee80211_tclas4_version = -1;
-static int hf_ieee80211_tclas_class_mask4_ver = -1;
-static int hf_ieee80211_tclas_class_mask4_4_src_ip = -1;
-static int hf_ieee80211_tclas_class_mask4_4_dst_ip = -1;
-static int hf_ieee80211_tclas_class_mask4_src_port = -1;
-static int hf_ieee80211_tclas_class_mask4_dst_port = -1;
-static int hf_ieee80211_tclas_class_mask4_dscp = -1;
-static int hf_ieee80211_tclas_class_mask4_ipv4_proto = -1;
-static int hf_ieee80211_tclas_class_mask4_reserved = -1;
-static int hf_ieee80211_tclas_class_mask4_6_src_ip = -1;
-static int hf_ieee80211_tclas_class_mask4_6_dst_ip = -1;
-static int hf_ieee80211_tclas_reserved_bytes = -1;
-static int hf_ieee80211_tclas_class_mask4_next_hdr = -1;
-static int hf_ieee80211_tclas_class_mask4_flow_label = -1;
-static int hf_ieee80211_tclas4_ipv4_src = -1;
-static int hf_ieee80211_tclas4_ipv4_dst = -1;
-static int hf_ieee80211_tclas4_src_port = -1;
-static int hf_ieee80211_tclas4_dst_port = -1;
-static int hf_ieee80211_tclas4_dscp = -1;
-static int hf_ieee80211_tclas4_protocol = -1;
-static int hf_ieee80211_tclas4_reserved = -1;
-static int hf_ieee80211_tclas4_ipv6_src = -1;
-static int hf_ieee80211_tclas4_ipv6_dst = -1;
-static int hf_ieee80211_tclas4_next_hdr = -1;
-static int hf_ieee80211_tclas4_flow = -1;
-static int hf_ieee80211_tclas_tclas_8021d_up_pcp = -1;
-static int hf_ieee80211_tclas_8021q_dei = -1;
-static int hf_ieee80211_tclas_8021q_vid = -1;
-
-static int hf_ieee80211_tclas_class_mask5_up_prio = -1;
-static int hf_ieee80211_tclas_class_mask5_dei = -1;
-static int hf_ieee80211_tclas_class_mask5_vid = -1;
-static int hf_ieee80211_tclas_class_mask5_reserved = -1;
-
-static int hf_ieee80211_tclas_class_mask6_a_above = -1;
-static int hf_ieee80211_tclas_class_mask6_frame_control_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask6_duration_id_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask6_address_1_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask6_address_2_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask6_address_3_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask6_sequence_control_spec = -1;
-static int hf_ieee80211_tclas_class_mask6_address_4_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask6_qos_control_spec = -1;
-static int hf_ieee80211_tclas_class_mask6_ht_control_spec = -1;
-static int hf_ieee80211_tclas_class_mask6_reserved = -1;
-static int hf_ieee80211_tclas6_frame_control_spec = -1;
-static int hf_ieee80211_tclas6_frame_control_mask = -1;
-static int hf_ieee80211_tclas6_duration_spec = -1;
-static int hf_ieee80211_tclas6_duration_mask = -1;
-static int hf_ieee80211_tclas6_address_1_spec = -1;
-static int hf_ieee80211_tclas6_address_1_mask = -1;
-static int hf_ieee80211_tclas6_address_2_spec = -1;
-static int hf_ieee80211_tclas6_address_2_mask = -1;
-static int hf_ieee80211_tclas6_address_3_spec = -1;
-static int hf_ieee80211_tclas6_address_3_mask = -1;
-static int hf_ieee80211_tclas6_sequence_control_spec = -1;
-static int hf_ieee80211_tclas6_sequence_control_mask = -1;
-static int hf_ieee80211_tclas6_address_4_spec = -1;
-static int hf_ieee80211_tclas6_address_4_mask = -1;
-static int hf_ieee80211_tclas6_qos_control_spec = -1;
-static int hf_ieee80211_tclas6_qos_control_mask = -1;
-static int hf_ieee80211_tclas6_ht_control_spec = -1;
-static int hf_ieee80211_tclas6_ht_control_mask = -1;
-
-static int hf_ieee80211_tclas_class_mask7_frame_control_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask7_address_1_sid_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask7_address_2_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask7_sequence_control_spec = -1;
-static int hf_ieee80211_tclas_class_mask7_address_3_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask7_address_4_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask7_reserved = -1;
-static int hf_ieee80211_tclas7_frame_control_spec = -1;
-static int hf_ieee80211_tclas7_frame_control_mask = -1;
-static int hf_ieee80211_tclas7_address_1_sid_spec = -1;
-static int hf_ieee80211_tclas7_address_1_sid_mask = -1;
-static int hf_ieee80211_tclas7_address_2_spec = -1;
-static int hf_ieee80211_tclas7_address_2_mask = -1;
-static int hf_ieee80211_tclas7_sequence_control_spec = -1;
-static int hf_ieee80211_tclas7_sequence_control_mask = -1;
-static int hf_ieee80211_tclas7_address_3_spec = -1;
-static int hf_ieee80211_tclas7_address_3_mask = -1;
-static int hf_ieee80211_tclas7_address_4_spec = -1;
-static int hf_ieee80211_tclas7_address_4_mask = -1;
-
-static int hf_ieee80211_tclas_class_mask8_frame_control_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask8_address_1_bssid_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask8_address_2_sid_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask8_sequence_control_spec = -1;
-static int hf_ieee80211_tclas_class_mask8_address_3_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask8_address_4_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask8_reserved = -1;
-static int hf_ieee80211_tclas8_frame_control_spec = -1;
-static int hf_ieee80211_tclas8_frame_control_mask = -1;
-static int hf_ieee80211_tclas8_address_1_bssid_spec = -1;
-static int hf_ieee80211_tclas8_address_1_bssid_mask = -1;
-static int hf_ieee80211_tclas8_address_2_sid_spec = -1;
-static int hf_ieee80211_tclas8_address_2_sid_mask = -1;
-static int hf_ieee80211_tclas8_sequence_control_spec = -1;
-static int hf_ieee80211_tclas8_sequence_control_mask = -1;
-static int hf_ieee80211_tclas8_address_3_spec = -1;
-static int hf_ieee80211_tclas8_address_3_mask = -1;
-static int hf_ieee80211_tclas8_address_4_spec = -1;
-static int hf_ieee80211_tclas8_address_4_mask = -1;
-
-static int hf_ieee80211_tclas_class_mask9_frame_control_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask9_address_1_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask9_address_2_match_spec = -1;
-static int hf_ieee80211_tclas_class_mask9_sequence_control_spec = -1;
-static int hf_ieee80211_tclas_class_mask9_reserved = -1;
-static int hf_ieee80211_tclas9_frame_control_spec = -1;
-static int hf_ieee80211_tclas9_frame_control_mask = -1;
-static int hf_ieee80211_tclas9_address_1_spec = -1;
-static int hf_ieee80211_tclas9_address_1_mask = -1;
-static int hf_ieee80211_tclas9_address_2_spec = -1;
-static int hf_ieee80211_tclas9_address_2_mask = -1;
-static int hf_ieee80211_tclas9_sequence_control_spec = -1;
-static int hf_ieee80211_tclas9_sequence_control_mask = -1;
-
-static int hf_ieee80211_tclas10_protocol_instance = -1;
-static int hf_ieee80211_tclas10_protocol_num_next_hdr = -1;
-
-static int hf_ieee80211_aruba = -1;
-static int hf_ieee80211_aruba_hb_seq = -1;
-static int hf_ieee80211_aruba_mtu = -1;
-
-static int hf_ieee80211_tag_vendor_oui_type = -1;
-static int hf_ieee80211_tag_vendor_data = -1;
-
-static int hf_ieee80211_symbp_extreme_assoc_clients = -1;
-static int hf_ieee80211_symbp_extreme_load_kbps = -1;
-static int hf_ieee80211_symbp_extreme_load_pps = -1;
-static int hf_ieee80211_symbp_extreme_client_tx_power = -1;
-static int hf_ieee80211_symbp_extreme_timestamp = -1;
-
-static int hf_ieee80211_tag_symbol_proprietary_oui = -1;
-static int hf_ieee80211_tag_symbol_proprietary_data = -1;
+static int hf_ieee80211_tspec_nor_msdu;
+static int hf_ieee80211_tspec_max_msdu;
+static int hf_ieee80211_tspec_min_srv;
+static int hf_ieee80211_tspec_max_srv;
+static int hf_ieee80211_tspec_inact_int;
+static int hf_ieee80211_tspec_susp_int;
+static int hf_ieee80211_tspec_srv_start;
+static int hf_ieee80211_tspec_min_data;
+static int hf_ieee80211_tspec_mean_data;
+static int hf_ieee80211_tspec_peak_data;
+static int hf_ieee80211_tspec_burst_size;
+static int hf_ieee80211_tspec_delay_bound;
+static int hf_ieee80211_tspec_min_phy;
+static int hf_ieee80211_tspec_surplus;
+static int hf_ieee80211_tspec_medium;
+static int hf_ieee80211_tspec_dmg;
+static int hf_ieee80211_ts_delay;
+static int hf_ieee80211_tclas_process;
+static int hf_ieee80211_tag_ext_supp_rates;
+static int hf_ieee80211_sched_info;
+static int hf_ieee80211_sched_info_agg;
+static int hf_ieee80211_sched_info_tsid;
+static int hf_ieee80211_sched_info_dir;
+static int hf_ieee80211_sched_srv_start;
+static int hf_ieee80211_sched_srv_int;
+static int hf_ieee80211_sched_spec_int;
+static int hf_ieee80211_tclas_up;
+static int hf_ieee80211_tclas_class_type;
+static int hf_ieee80211_tclas_class_mask;
+static int hf_ieee80211_tclas_mask_reserved;
+static int hf_ieee80211_tclas_class_mask0_src_addr;
+static int hf_ieee80211_tclas_class_mask0_dst_addr;
+static int hf_ieee80211_tclas_class_mask0_type;
+static int hf_ieee80211_tclas_class_mask1_ver;
+static int hf_ieee80211_tclas_class_mask1_src_ip;
+static int hf_ieee80211_tclas_class_mask1_dst_ip;
+static int hf_ieee80211_tclas_class_mask1_src_port;
+static int hf_ieee80211_tclas_class_mask1_dst_port;
+static int hf_ieee80211_tclas_class_mask1_ipv4_dscp;
+static int hf_ieee80211_tclas_class_mask1_ipv4_proto;
+static int hf_ieee80211_tclas_class_mask1_reserved;
+static int hf_ieee80211_tclas_class_mask1_ipv6_flow;
+static int hf_ieee80211_tclas_class_mask2_tci;
+static int hf_ieee80211_tclas_src_mac_addr;
+static int hf_ieee80211_tclas_dst_mac_addr;
+static int hf_ieee80211_tclas_ether_type;
+static int hf_ieee80211_tclas_version;
+static int hf_ieee80211_tclas_ipv4_src;
+static int hf_ieee80211_tclas_ipv4_dst;
+static int hf_ieee80211_tclas_src_port;
+static int hf_ieee80211_tclas_dst_port;
+static int hf_ieee80211_tclas_dscp;
+static int hf_ieee80211_tclas_protocol;
+static int hf_ieee80211_tclas_ipv6_src;
+static int hf_ieee80211_tclas_ipv6_dst;
+static int hf_ieee80211_tclas_flow;
+static int hf_ieee80211_tclas_tag_type;
+static int hf_ieee80211_tclas_filter_offset;
+static int hf_ieee80211_tclas_filter_value;
+static int hf_ieee80211_tclas_filter_mask;
+static int hf_ieee80211_tclas4_version;
+static int hf_ieee80211_tclas_class_mask4_ver;
+static int hf_ieee80211_tclas_class_mask4_4_src_ip;
+static int hf_ieee80211_tclas_class_mask4_4_dst_ip;
+static int hf_ieee80211_tclas_class_mask4_src_port;
+static int hf_ieee80211_tclas_class_mask4_dst_port;
+static int hf_ieee80211_tclas_class_mask4_dscp;
+static int hf_ieee80211_tclas_class_mask4_ipv4_proto;
+static int hf_ieee80211_tclas_class_mask4_reserved;
+static int hf_ieee80211_tclas_class_mask4_6_src_ip;
+static int hf_ieee80211_tclas_class_mask4_6_dst_ip;
+static int hf_ieee80211_tclas_reserved_bytes;
+static int hf_ieee80211_tclas_class_mask4_next_hdr;
+static int hf_ieee80211_tclas_class_mask4_flow_label;
+static int hf_ieee80211_tclas4_ipv4_src;
+static int hf_ieee80211_tclas4_ipv4_dst;
+static int hf_ieee80211_tclas4_src_port;
+static int hf_ieee80211_tclas4_dst_port;
+static int hf_ieee80211_tclas4_dscp;
+static int hf_ieee80211_tclas4_protocol;
+static int hf_ieee80211_tclas4_reserved;
+static int hf_ieee80211_tclas4_ipv6_src;
+static int hf_ieee80211_tclas4_ipv6_dst;
+static int hf_ieee80211_tclas4_next_hdr;
+static int hf_ieee80211_tclas4_flow;
+static int hf_ieee80211_tclas_tclas_8021d_up_pcp;
+static int hf_ieee80211_tclas_8021q_dei;
+static int hf_ieee80211_tclas_8021q_vid;
+
+static int hf_ieee80211_tclas_class_mask5_up_prio;
+static int hf_ieee80211_tclas_class_mask5_dei;
+static int hf_ieee80211_tclas_class_mask5_vid;
+static int hf_ieee80211_tclas_class_mask5_reserved;
+
+static int hf_ieee80211_tclas_class_mask6_a_above;
+static int hf_ieee80211_tclas_class_mask6_frame_control_match_spec;
+static int hf_ieee80211_tclas_class_mask6_duration_id_match_spec;
+static int hf_ieee80211_tclas_class_mask6_address_1_match_spec;
+static int hf_ieee80211_tclas_class_mask6_address_2_match_spec;
+static int hf_ieee80211_tclas_class_mask6_address_3_match_spec;
+static int hf_ieee80211_tclas_class_mask6_sequence_control_spec;
+static int hf_ieee80211_tclas_class_mask6_address_4_match_spec;
+static int hf_ieee80211_tclas_class_mask6_qos_control_spec;
+static int hf_ieee80211_tclas_class_mask6_ht_control_spec;
+static int hf_ieee80211_tclas_class_mask6_reserved;
+static int hf_ieee80211_tclas6_frame_control_spec;
+static int hf_ieee80211_tclas6_frame_control_mask;
+static int hf_ieee80211_tclas6_duration_spec;
+static int hf_ieee80211_tclas6_duration_mask;
+static int hf_ieee80211_tclas6_address_1_spec;
+static int hf_ieee80211_tclas6_address_1_mask;
+static int hf_ieee80211_tclas6_address_2_spec;
+static int hf_ieee80211_tclas6_address_2_mask;
+static int hf_ieee80211_tclas6_address_3_spec;
+static int hf_ieee80211_tclas6_address_3_mask;
+static int hf_ieee80211_tclas6_sequence_control_spec;
+static int hf_ieee80211_tclas6_sequence_control_mask;
+static int hf_ieee80211_tclas6_address_4_spec;
+static int hf_ieee80211_tclas6_address_4_mask;
+static int hf_ieee80211_tclas6_qos_control_spec;
+static int hf_ieee80211_tclas6_qos_control_mask;
+static int hf_ieee80211_tclas6_ht_control_spec;
+static int hf_ieee80211_tclas6_ht_control_mask;
+
+static int hf_ieee80211_tclas_class_mask7_frame_control_match_spec;
+static int hf_ieee80211_tclas_class_mask7_address_1_sid_match_spec;
+static int hf_ieee80211_tclas_class_mask7_address_2_match_spec;
+static int hf_ieee80211_tclas_class_mask7_sequence_control_spec;
+static int hf_ieee80211_tclas_class_mask7_address_3_match_spec;
+static int hf_ieee80211_tclas_class_mask7_address_4_match_spec;
+static int hf_ieee80211_tclas_class_mask7_reserved;
+static int hf_ieee80211_tclas7_frame_control_spec;
+static int hf_ieee80211_tclas7_frame_control_mask;
+static int hf_ieee80211_tclas7_address_1_sid_spec;
+static int hf_ieee80211_tclas7_address_1_sid_mask;
+static int hf_ieee80211_tclas7_address_2_spec;
+static int hf_ieee80211_tclas7_address_2_mask;
+static int hf_ieee80211_tclas7_sequence_control_spec;
+static int hf_ieee80211_tclas7_sequence_control_mask;
+static int hf_ieee80211_tclas7_address_3_spec;
+static int hf_ieee80211_tclas7_address_3_mask;
+static int hf_ieee80211_tclas7_address_4_spec;
+static int hf_ieee80211_tclas7_address_4_mask;
+
+static int hf_ieee80211_tclas_class_mask8_frame_control_match_spec;
+static int hf_ieee80211_tclas_class_mask8_address_1_bssid_match_spec;
+static int hf_ieee80211_tclas_class_mask8_address_2_sid_match_spec;
+static int hf_ieee80211_tclas_class_mask8_sequence_control_spec;
+static int hf_ieee80211_tclas_class_mask8_address_3_match_spec;
+static int hf_ieee80211_tclas_class_mask8_address_4_match_spec;
+static int hf_ieee80211_tclas_class_mask8_reserved;
+static int hf_ieee80211_tclas8_frame_control_spec;
+static int hf_ieee80211_tclas8_frame_control_mask;
+static int hf_ieee80211_tclas8_address_1_bssid_spec;
+static int hf_ieee80211_tclas8_address_1_bssid_mask;
+static int hf_ieee80211_tclas8_address_2_sid_spec;
+static int hf_ieee80211_tclas8_address_2_sid_mask;
+static int hf_ieee80211_tclas8_sequence_control_spec;
+static int hf_ieee80211_tclas8_sequence_control_mask;
+static int hf_ieee80211_tclas8_address_3_spec;
+static int hf_ieee80211_tclas8_address_3_mask;
+static int hf_ieee80211_tclas8_address_4_spec;
+static int hf_ieee80211_tclas8_address_4_mask;
+
+static int hf_ieee80211_tclas_class_mask9_frame_control_match_spec;
+static int hf_ieee80211_tclas_class_mask9_address_1_match_spec;
+static int hf_ieee80211_tclas_class_mask9_address_2_match_spec;
+static int hf_ieee80211_tclas_class_mask9_sequence_control_spec;
+static int hf_ieee80211_tclas_class_mask9_reserved;
+static int hf_ieee80211_tclas9_frame_control_spec;
+static int hf_ieee80211_tclas9_frame_control_mask;
+static int hf_ieee80211_tclas9_address_1_spec;
+static int hf_ieee80211_tclas9_address_1_mask;
+static int hf_ieee80211_tclas9_address_2_spec;
+static int hf_ieee80211_tclas9_address_2_mask;
+static int hf_ieee80211_tclas9_sequence_control_spec;
+static int hf_ieee80211_tclas9_sequence_control_mask;
+
+static int hf_ieee80211_tclas10_protocol_instance;
+static int hf_ieee80211_tclas10_protocol_num_next_hdr;
+
+static int hf_ieee80211_aruba;
+static int hf_ieee80211_aruba_hb_seq;
+static int hf_ieee80211_aruba_mtu;
+
+static int hf_ieee80211_tag_vendor_oui_type;
+static int hf_ieee80211_tag_vendor_data;
+
+static int hf_ieee80211_symbp_extreme_assoc_clients;
+static int hf_ieee80211_symbp_extreme_load_kbps;
+static int hf_ieee80211_symbp_extreme_load_pps;
+static int hf_ieee80211_symbp_extreme_client_tx_power;
+static int hf_ieee80211_symbp_extreme_timestamp;
+
+static int hf_ieee80211_tag_symbol_proprietary_oui;
+static int hf_ieee80211_tag_symbol_proprietary_data;
 
 /* IEEE Std 802.11z-2010 7.3.2.62 */
-static int hf_ieee80211_tag_link_id_bssid = -1;
-static int hf_ieee80211_tag_link_id_init_sta = -1;
-static int hf_ieee80211_tag_link_id_resp_sta = -1;
+static int hf_ieee80211_tag_link_id_bssid;
+static int hf_ieee80211_tag_link_id_init_sta;
+static int hf_ieee80211_tag_link_id_resp_sta;
 
 /* IEEE Std 802.11z-2010 7.3.2.63 */
-static int hf_ieee80211_tag_wakeup_schedule_offset = -1;
-static int hf_ieee80211_tag_wakeup_schedule_interval = -1;
-static int hf_ieee80211_tag_wakeup_schedule_awake_window_slots = -1;
-static int hf_ieee80211_tag_wakeup_schedule_max_awake_dur = -1;
-static int hf_ieee80211_tag_wakeup_schedule_idle_count = -1;
+static int hf_ieee80211_tag_wakeup_schedule_offset;
+static int hf_ieee80211_tag_wakeup_schedule_interval;
+static int hf_ieee80211_tag_wakeup_schedule_awake_window_slots;
+static int hf_ieee80211_tag_wakeup_schedule_max_awake_dur;
+static int hf_ieee80211_tag_wakeup_schedule_idle_count;
 
 /* IEEE Std 802.11z-2010 7.3.2.64 */
-static int hf_ieee80211_tag_channel_switch_timing_switch_time = -1;
-static int hf_ieee80211_tag_channel_switch_timing_switch_timeout = -1;
+static int hf_ieee80211_tag_channel_switch_timing_switch_time;
+static int hf_ieee80211_tag_channel_switch_timing_switch_timeout;
 
 /* IEEE Std 802.11z-2010 7.3.2.65 */
-static int hf_ieee80211_tag_pti_control_tid = -1;
-static int hf_ieee80211_tag_pti_control_sequence_control = -1;
+static int hf_ieee80211_tag_pti_control_tid;
+static int hf_ieee80211_tag_pti_control_sequence_control;
 
 /* IEEE Std 802.11z-2010 7.3.2.66 */
-static int hf_ieee80211_tag_pu_buffer_status_ac_bk = -1;
-static int hf_ieee80211_tag_pu_buffer_status_ac_be = -1;
-static int hf_ieee80211_tag_pu_buffer_status_ac_vi = -1;
-static int hf_ieee80211_tag_pu_buffer_status_ac_vo = -1;
+static int hf_ieee80211_tag_pu_buffer_status_ac_bk;
+static int hf_ieee80211_tag_pu_buffer_status_ac_be;
+static int hf_ieee80211_tag_pu_buffer_status_ac_vi;
+static int hf_ieee80211_tag_pu_buffer_status_ac_vo;
 
 /* IEEE Std 802.11r-2008 7.3.2.49 */
-static int hf_ieee80211_tag_timeout_int_type = -1;
-static int hf_ieee80211_tag_timeout_int_value = -1;
+static int hf_ieee80211_tag_timeout_int_type;
+static int hf_ieee80211_tag_timeout_int_value;
 
 /* Ethertype 89-0d */
-static int hf_ieee80211_data_encap_payload_type = -1;
+static int hf_ieee80211_data_encap_payload_type;
 
-static int hf_ieee80211_anqp_wfa_subtype = -1;
+static int hf_ieee80211_anqp_wfa_subtype;
 
-static int hf_ieee80211_dpp_subtype = -1;
+static int hf_ieee80211_dpp_subtype;
 
 /* Hotspot 2.0 */
-static int hf_ieee80211_hs20_indication_dgaf_disabled = -1;
-static int hf_ieee80211_hs20_indication_pps_mo_id_present = -1;
-static int hf_ieee80211_hs20_indication_anqp_domain_id_present = -1;
-static int hf_ieee80211_hs20_reserved = -1;
-static int hf_ieee80211_hs20_indication_version_number = -1;
-static int hf_ieee80211_hs20_indication_pps_mo_id = -1;
-static int hf_ieee80211_hs20_indication_anqp_domain_id = -1;
-
-static int hf_ieee80211_hs20_anqp_subtype = -1;
-static int hf_ieee80211_hs20_anqp_reserved = -1;
-static int hf_ieee80211_hs20_anqp_payload = -1;
-static int hf_ieee80211_hs20_anqp_hs_query_list = -1;
-static int hf_ieee80211_hs20_anqp_hs_capability_list = -1;
-static int hf_ieee80211_hs20_anqp_ofn_length = -1;
-static int hf_ieee80211_hs20_anqp_ofn_language = -1;
-static int hf_ieee80211_hs20_anqp_ofn_name = -1;
-static int hf_ieee80211_hs20_anqp_wan_metrics_link_status = -1;
-static int hf_ieee80211_hs20_anqp_wan_metrics_symmetric_link = -1;
-static int hf_ieee80211_hs20_anqp_wan_metrics_at_capacity = -1;
-static int hf_ieee80211_hs20_anqp_wan_metrics_reserved = -1;
-static int hf_ieee80211_hs20_anqp_wan_metrics_downlink_speed = -1;
-static int hf_ieee80211_hs20_anqp_wan_metrics_uplink_speed = -1;
-static int hf_ieee80211_hs20_anqp_wan_metrics_downlink_load = -1;
-static int hf_ieee80211_hs20_anqp_wan_metrics_uplink_load = -1;
-static int hf_ieee80211_hs20_anqp_wan_metrics_lmd = -1;
-static int hf_ieee80211_hs20_anqp_cc_proto_ip_proto = -1;
-static int hf_ieee80211_hs20_anqp_cc_proto_port_num = -1;
-static int hf_ieee80211_hs20_anqp_cc_proto_status = -1;
-static int hf_ieee80211_hs20_anqp_nai_hrq_count = -1;
-static int hf_ieee80211_hs20_anqp_nai_hrq_encoding_type = -1;
-static int hf_ieee80211_hs20_anqp_nai_hrq_length = -1;
-static int hf_ieee80211_hs20_anqp_nai_hrq_realm_name = -1;
-static int hf_ieee80211_hs20_anqp_oper_class_indic = -1;
-static int hf_ieee80211_hs20_osu_friendly_names_len = -1;
-static int hf_ieee80211_hs20_osu_friendly_name_length = -1;
-static int hf_ieee80211_hs20_osu_friendly_name_language = -1;
-static int hf_ieee80211_hs20_osu_friendly_name_name = -1;
-static int hf_ieee80211_hs20_osu_server_uri_len = -1;
-static int hf_ieee80211_hs20_osu_server_uri = -1;
-static int hf_ieee80211_hs20_osu_method_list_len = -1;
-static int hf_ieee80211_hs20_osu_method_val = -1;
-static int hf_ieee80211_hs20_icons_avail_len = -1;
-static int hf_ieee80211_hs20_osu_providers_list_ssid_len = -1;
-static int hf_ieee80211_hs20_osu_providers_ssid = -1;
-static int hf_ieee80211_hs20_osu_providers_count = -1;
-static int hf_ieee80211_hs20_osu_prov_length = -1;
-static int hf_ieee80211_hs20_icon_request_filename = -1;
-static int hf_ieee80211_hs20_icon_binary_file_status = -1;
-static int hf_ieee80211_hs20_icon_type_length = -1;
-static int hf_ieee80211_hs20_icon_type = -1;
-static int hf_ieee80211_hs20_icon_binary_data_len = -1;
-static int hf_ieee80211_hs20_icon_binary_data = -1;
-static int hf_ieee80211_osu_icon_avail_width = -1;
-static int hf_ieee80211_osu_icon_avail_height = -1;
-static int hf_ieee80211_osu_icon_avail_lang_code = -1;
-static int hf_ieee80211_osu_icon_avail_icon_type_len = -1;
-static int hf_ieee80211_osu_icon_avail_icon_type = -1;
-static int hf_ieee80211_osu_icon_avail_filename_len = -1;
-static int hf_ieee80211_osu_icon_avail_filename = -1;
-static int hf_ieee80211_hs20_osu_nai_len = -1;
-static int hf_ieee80211_hs20_osu_nai = -1;
-static int hf_ieee80211_hs20_osu_service_desc_len = -1;
-static int hf_ieee80211_hs20_osu_service_desc_duple_len = -1;
-static int hf_ieee80211_hs20_osu_service_desc_lang = -1;
-static int hf_ieee80211_hs20_osu_service_desc = -1;
-static int hf_ieee80211_hs20_anqp_venue_url_length = -1;
-static int hf_ieee80211_hs20_anqp_venue_number = -1;
-static int hf_ieee80211_hs20_anqp_venue_url = -1;
-static int hf_ieee80211_hs20_anqp_advice_of_charge_length = -1;
-static int hf_ieee80211_hs20_anqp_advice_of_charge_type = -1;
-static int hf_ieee80211_hs20_anqp_aoc_nai_realm_encoding = -1;
-static int hf_ieee80211_hs20_anqp_aoc_nai_realm_len = -1;
-static int hf_ieee80211_hs20_anqp_aoc_nai_realm = -1;
-static int hf_ieee80211_hs20_anqp_aoc_plan_len = -1;
-static int hf_ieee80211_hs20_anqp_aoc_plan_lang = -1;
-static int hf_ieee80211_hs20_anqp_aoc_plan_curcy = -1;
-static int hf_ieee80211_hs20_anqp_aoc_plan_information = -1;
-
-static int hf_ieee80211_hs20_subscription_remediation_url_len = -1;
-static int hf_ieee80211_hs20_subscription_remediation_server_url = -1;
-static int hf_ieee80211_hs20_subscription_remediation_server_method = -1;
-static int hf_ieee80211_hs20_deauth_reason_code = -1;
-static int hf_ieee80211_hs20_reauth_delay = -1;
-static int hf_ieee80211_hs20_deauth_reason_url_len = -1;
-static int hf_ieee80211_hs20_deauth_imminent_reason_url = -1;
+static int hf_ieee80211_hs20_indication_dgaf_disabled;
+static int hf_ieee80211_hs20_indication_pps_mo_id_present;
+static int hf_ieee80211_hs20_indication_anqp_domain_id_present;
+static int hf_ieee80211_hs20_reserved;
+static int hf_ieee80211_hs20_indication_version_number;
+static int hf_ieee80211_hs20_indication_pps_mo_id;
+static int hf_ieee80211_hs20_indication_anqp_domain_id;
+
+static int hf_ieee80211_hs20_anqp_subtype;
+static int hf_ieee80211_hs20_anqp_reserved;
+static int hf_ieee80211_hs20_anqp_payload;
+static int hf_ieee80211_hs20_anqp_hs_query_list;
+static int hf_ieee80211_hs20_anqp_hs_capability_list;
+static int hf_ieee80211_hs20_anqp_ofn_length;
+static int hf_ieee80211_hs20_anqp_ofn_language;
+static int hf_ieee80211_hs20_anqp_ofn_name;
+static int hf_ieee80211_hs20_anqp_wan_metrics_link_status;
+static int hf_ieee80211_hs20_anqp_wan_metrics_symmetric_link;
+static int hf_ieee80211_hs20_anqp_wan_metrics_at_capacity;
+static int hf_ieee80211_hs20_anqp_wan_metrics_reserved;
+static int hf_ieee80211_hs20_anqp_wan_metrics_downlink_speed;
+static int hf_ieee80211_hs20_anqp_wan_metrics_uplink_speed;
+static int hf_ieee80211_hs20_anqp_wan_metrics_downlink_load;
+static int hf_ieee80211_hs20_anqp_wan_metrics_uplink_load;
+static int hf_ieee80211_hs20_anqp_wan_metrics_lmd;
+static int hf_ieee80211_hs20_anqp_cc_proto_ip_proto;
+static int hf_ieee80211_hs20_anqp_cc_proto_port_num;
+static int hf_ieee80211_hs20_anqp_cc_proto_status;
+static int hf_ieee80211_hs20_anqp_nai_hrq_count;
+static int hf_ieee80211_hs20_anqp_nai_hrq_encoding_type;
+static int hf_ieee80211_hs20_anqp_nai_hrq_length;
+static int hf_ieee80211_hs20_anqp_nai_hrq_realm_name;
+static int hf_ieee80211_hs20_anqp_oper_class_indic;
+static int hf_ieee80211_hs20_osu_friendly_names_len;
+static int hf_ieee80211_hs20_osu_friendly_name_length;
+static int hf_ieee80211_hs20_osu_friendly_name_language;
+static int hf_ieee80211_hs20_osu_friendly_name_name;
+static int hf_ieee80211_hs20_osu_server_uri_len;
+static int hf_ieee80211_hs20_osu_server_uri;
+static int hf_ieee80211_hs20_osu_method_list_len;
+static int hf_ieee80211_hs20_osu_method_val;
+static int hf_ieee80211_hs20_icons_avail_len;
+static int hf_ieee80211_hs20_osu_providers_list_ssid_len;
+static int hf_ieee80211_hs20_osu_providers_ssid;
+static int hf_ieee80211_hs20_osu_providers_count;
+static int hf_ieee80211_hs20_osu_prov_length;
+static int hf_ieee80211_hs20_icon_request_filename;
+static int hf_ieee80211_hs20_icon_binary_file_status;
+static int hf_ieee80211_hs20_icon_type_length;
+static int hf_ieee80211_hs20_icon_type;
+static int hf_ieee80211_hs20_icon_binary_data_len;
+static int hf_ieee80211_hs20_icon_binary_data;
+static int hf_ieee80211_osu_icon_avail_width;
+static int hf_ieee80211_osu_icon_avail_height;
+static int hf_ieee80211_osu_icon_avail_lang_code;
+static int hf_ieee80211_osu_icon_avail_icon_type_len;
+static int hf_ieee80211_osu_icon_avail_icon_type;
+static int hf_ieee80211_osu_icon_avail_filename_len;
+static int hf_ieee80211_osu_icon_avail_filename;
+static int hf_ieee80211_hs20_osu_nai_len;
+static int hf_ieee80211_hs20_osu_nai;
+static int hf_ieee80211_hs20_osu_service_desc_len;
+static int hf_ieee80211_hs20_osu_service_desc_duple_len;
+static int hf_ieee80211_hs20_osu_service_desc_lang;
+static int hf_ieee80211_hs20_osu_service_desc;
+static int hf_ieee80211_hs20_anqp_venue_url_length;
+static int hf_ieee80211_hs20_anqp_venue_number;
+static int hf_ieee80211_hs20_anqp_venue_url;
+static int hf_ieee80211_hs20_anqp_advice_of_charge_length;
+static int hf_ieee80211_hs20_anqp_advice_of_charge_type;
+static int hf_ieee80211_hs20_anqp_aoc_nai_realm_encoding;
+static int hf_ieee80211_hs20_anqp_aoc_nai_realm_len;
+static int hf_ieee80211_hs20_anqp_aoc_nai_realm;
+static int hf_ieee80211_hs20_anqp_aoc_plan_len;
+static int hf_ieee80211_hs20_anqp_aoc_plan_lang;
+static int hf_ieee80211_hs20_anqp_aoc_plan_curcy;
+static int hf_ieee80211_hs20_anqp_aoc_plan_information;
+
+static int hf_ieee80211_hs20_subscription_remediation_url_len;
+static int hf_ieee80211_hs20_subscription_remediation_server_url;
+static int hf_ieee80211_hs20_subscription_remediation_server_method;
+static int hf_ieee80211_hs20_deauth_reason_code;
+static int hf_ieee80211_hs20_reauth_delay;
+static int hf_ieee80211_hs20_deauth_reason_url_len;
+static int hf_ieee80211_hs20_deauth_imminent_reason_url;
 
 /* IEEE Std 802.11ai : FILS Discovery */
-static int hf_ieee80211_ff_fils_discovery_frame_control = -1;
-static int hf_ieee80211_ff_fils_discovery_frame_control_ssid_length = -1;
-static int hf_ieee80211_ff_fils_discovery_frame_control_capability = -1;
-static int hf_ieee80211_ff_fils_discovery_frame_control_short_ssid = -1;
-static int hf_ieee80211_ff_fils_discovery_frame_control_ap_csn = -1;
-static int hf_ieee80211_ff_fils_discovery_frame_control_ano = -1;
-static int hf_ieee80211_ff_fils_discovery_frame_control_channel_center_frequency = -1;
-static int hf_ieee80211_ff_fils_discovery_frame_control_primary_channel = -1;
-static int hf_ieee80211_ff_fils_discovery_frame_control_rsn_info = -1;
-static int hf_ieee80211_ff_fils_discovery_frame_control_length = -1;
-static int hf_ieee80211_ff_fils_discovery_frame_control_md = -1;
-static int hf_ieee80211_ff_fils_discovery_frame_control_reserved = -1;
-static int hf_ieee80211_ff_fils_discovery_ssid = -1;
-static int hf_ieee80211_ff_fils_discovery_capability = -1;
-static int hf_ieee80211_ff_fils_discovery_capability_ess = -1;
-static int hf_ieee80211_ff_fils_discovery_capability_privacy = -1;
-static int hf_ieee80211_ff_fils_discovery_capability_bss_operating_channel_width = -1;
-static int hf_ieee80211_ff_fils_discovery_capability_max_number_of_spatial_streams = -1;
-static int hf_ieee80211_ff_fils_discovery_capability_reserved = -1;
-static int hf_ieee80211_ff_fils_discovery_capability_multiple_bssid = -1;
-static int hf_ieee80211_ff_fils_discovery_capability_phy_index = -1;
-static int hf_ieee80211_ff_fils_discovery_capability_fils_minimum_rate_dsss = -1;
-static int hf_ieee80211_ff_fils_discovery_capability_fils_minimum_rate_ofdm = -1;
-static int hf_ieee80211_ff_fils_discovery_capability_fils_minimum_rate_ht_vht_tvht = -1;
-static int hf_ieee80211_ff_fils_discovery_capability_fils_minimum_rate_he = -1;
-static int hf_ieee80211_ff_fils_discovery_capability_fils_minimum_rate = -1;
-
-static int hf_ieee80211_ff_fils_discovery_short_ssid = -1;
-static int hf_ieee80211_ff_fils_discovery_ap_csn = -1;
-static int hf_ieee80211_ff_fils_discovery_ano = -1;
-static int hf_ieee80211_ff_fils_discovery_ccfs1 = -1;
-static int hf_ieee80211_ff_fils_discovery_operating_class = -1;
-static int hf_ieee80211_ff_fils_discovery_primary_channel = -1;
-static int hf_ieee80211_ff_fils_discovery_rsn_info = -1;
-static int hf_ieee80211_ff_fils_discovery_length = -1;
-static int hf_ieee80211_ff_fils_discovery_md = -1;
+static int hf_ieee80211_ff_fils_discovery_frame_control;
+static int hf_ieee80211_ff_fils_discovery_frame_control_ssid_length;
+static int hf_ieee80211_ff_fils_discovery_frame_control_capability;
+static int hf_ieee80211_ff_fils_discovery_frame_control_short_ssid;
+static int hf_ieee80211_ff_fils_discovery_frame_control_ap_csn;
+static int hf_ieee80211_ff_fils_discovery_frame_control_ano;
+static int hf_ieee80211_ff_fils_discovery_frame_control_channel_center_frequency;
+static int hf_ieee80211_ff_fils_discovery_frame_control_primary_channel;
+static int hf_ieee80211_ff_fils_discovery_frame_control_rsn_info;
+static int hf_ieee80211_ff_fils_discovery_frame_control_length;
+static int hf_ieee80211_ff_fils_discovery_frame_control_md;
+static int hf_ieee80211_ff_fils_discovery_frame_control_reserved;
+static int hf_ieee80211_ff_fils_discovery_ssid;
+static int hf_ieee80211_ff_fils_discovery_capability;
+static int hf_ieee80211_ff_fils_discovery_capability_ess;
+static int hf_ieee80211_ff_fils_discovery_capability_privacy;
+static int hf_ieee80211_ff_fils_discovery_capability_bss_operating_channel_width;
+static int hf_ieee80211_ff_fils_discovery_capability_max_number_of_spatial_streams;
+static int hf_ieee80211_ff_fils_discovery_capability_reserved;
+static int hf_ieee80211_ff_fils_discovery_capability_multiple_bssid;
+static int hf_ieee80211_ff_fils_discovery_capability_phy_index;
+static int hf_ieee80211_ff_fils_discovery_capability_fils_minimum_rate_dsss;
+static int hf_ieee80211_ff_fils_discovery_capability_fils_minimum_rate_ofdm;
+static int hf_ieee80211_ff_fils_discovery_capability_fils_minimum_rate_ht_vht_tvht;
+static int hf_ieee80211_ff_fils_discovery_capability_fils_minimum_rate_he;
+static int hf_ieee80211_ff_fils_discovery_capability_fils_minimum_rate;
+
+static int hf_ieee80211_ff_fils_discovery_short_ssid;
+static int hf_ieee80211_ff_fils_discovery_ap_csn;
+static int hf_ieee80211_ff_fils_discovery_ano;
+static int hf_ieee80211_ff_fils_discovery_ccfs1;
+static int hf_ieee80211_ff_fils_discovery_operating_class;
+static int hf_ieee80211_ff_fils_discovery_primary_channel;
+static int hf_ieee80211_ff_fils_discovery_rsn_info;
+static int hf_ieee80211_ff_fils_discovery_length;
+static int hf_ieee80211_ff_fils_discovery_md;
 
 /* IEEE Std 802.11ad */
-static int hf_ieee80211_block_ack_RBUFCAP = -1;
-static int hf_ieee80211_cf_response_offset = -1;
-static int hf_ieee80211_grant_ack_reserved = -1;
-static int hf_ieee80211_ff_dynamic_allocation = -1;
-static int hf_ieee80211_ff_TID = -1;
-static int hf_ieee80211_ff_alloc_type = -1;
-static int hf_ieee80211_ff_src_aid = -1;
-static int hf_ieee80211_ff_dest_aid = -1;
-static int hf_ieee80211_ff_alloc_duration = -1;
-static int hf_ieee80211_ff_b39 = -1;
-static int hf_ieee80211_ff_ssw = -1;
-static int hf_ieee80211_ff_ssw_direction = -1;
-static int hf_ieee80211_ff_ssw_cdown = -1;
-static int hf_ieee80211_ff_ssw_sector_id = -1;
-static int hf_ieee80211_ff_ssw_dmg_ant_id = -1;
-static int hf_ieee80211_ff_ssw_rxss_len = -1;
-static int hf_ieee80211_ff_bf = -1;
-static int hf_ieee80211_ff_bf_train = -1;
-static int hf_ieee80211_ff_bf_is_init = -1;
-static int hf_ieee80211_ff_bf_is_resp = -1;
-static int hf_ieee80211_ff_bf_num_sectors = -1;
-static int hf_ieee80211_ff_bf_num_rx_dmg_ants = -1;
-static int hf_ieee80211_ff_bf_b12b15 = -1;
-static int hf_ieee80211_ff_bf_rxss_len = -1;
-static int hf_ieee80211_ff_bf_rxss_rate = -1;
-static int hf_ieee80211_ff_bf_b10b15 = -1;
-static int hf_ieee80211_addr_nav_da = -1;
-static int hf_ieee80211_addr_nav_sa = -1;
-static int hf_ieee80211_ff_sswf = -1;
-static int hf_ieee80211_ff_sswf_num_rx_dmg_ants = -1;
-static int hf_ieee80211_ff_sswf_poll_required = -1;
-static int hf_ieee80211_ff_sswf_total_sectors = -1;
-static int hf_ieee80211_ff_sswf_reserved1 = -1;
-static int hf_ieee80211_ff_sswf_reserved2 = -1;
-static int hf_ieee80211_ff_sswf_sector_select = -1;
-static int hf_ieee80211_ff_sswf_dmg_antenna_select = -1;
-static int hf_ieee80211_ff_sswf_snr_report = -1;
-static int hf_ieee80211_ff_brp = -1;
-static int hf_ieee80211_ff_brp_L_RX = -1;
-static int hf_ieee80211_ff_brp_TX_TRN_REQ = -1;
-static int hf_ieee80211_ff_brp_MID_REQ = -1;
-static int hf_ieee80211_ff_brp_BC_REQ = -1;
-static int hf_ieee80211_ff_brp_MID_GRANT = -1;
-static int hf_ieee80211_ff_brp_BC_GRANT = -1;
-static int hf_ieee80211_ff_brp_chan_FBCK_CAP = -1;
-static int hf_ieee80211_ff_brp_tx_sector = -1;
-static int hf_ieee80211_ff_brp_other_aid = -1;
-static int hf_ieee80211_ff_brp_tx_antenna = -1;
-static int hf_ieee80211_ff_brp_reserved = -1;
-static int hf_ieee80211_ff_blm = -1;
-static int hf_ieee80211_ff_blm_unit_index = -1;
-static int hf_ieee80211_ff_blm_maint_value = -1;
-static int hf_ieee80211_ff_blm_is_master = -1;
-static int hf_ieee80211_ff_bic = -1;
-static int hf_ieee80211_ff_bic_cc_present = -1;
-static int hf_ieee80211_ff_bic_discovery_mode = -1;
-static int hf_ieee80211_ff_bic_next_beacon = -1;
-static int hf_ieee80211_ff_bic_ati_present = -1;
-static int hf_ieee80211_ff_bic_abft_len = -1;
-static int hf_ieee80211_ff_bic_fss = -1;
-static int hf_ieee80211_ff_bic_is_resp = -1;
-static int hf_ieee80211_ff_bic_next_abft = -1;
-static int hf_ieee80211_ff_bic_frag_txss = -1;
-static int hf_ieee80211_ff_bic_txss_span = -1;
-static int hf_ieee80211_ff_bic_NBI_abft = -1;
-static int hf_ieee80211_ff_bic_abft_count = -1;
-static int hf_ieee80211_ff_bic_nabft = -1;
-static int hf_ieee80211_ff_bic_pcp = -1;
-static int hf_ieee80211_ff_bic_reserved = -1;
+static int hf_ieee80211_block_ack_RBUFCAP;
+static int hf_ieee80211_cf_response_offset;
+static int hf_ieee80211_grant_ack_reserved;
+static int hf_ieee80211_ff_dynamic_allocation;
+static int hf_ieee80211_ff_TID;
+static int hf_ieee80211_ff_alloc_type;
+static int hf_ieee80211_ff_src_aid;
+static int hf_ieee80211_ff_dest_aid;
+static int hf_ieee80211_ff_alloc_duration;
+static int hf_ieee80211_ff_b39;
+static int hf_ieee80211_ff_ssw;
+static int hf_ieee80211_ff_ssw_direction;
+static int hf_ieee80211_ff_ssw_cdown;
+static int hf_ieee80211_ff_ssw_sector_id;
+static int hf_ieee80211_ff_ssw_dmg_ant_id;
+static int hf_ieee80211_ff_ssw_rxss_len;
+static int hf_ieee80211_ff_bf;
+static int hf_ieee80211_ff_bf_train;
+static int hf_ieee80211_ff_bf_is_init;
+static int hf_ieee80211_ff_bf_is_resp;
+static int hf_ieee80211_ff_bf_num_sectors;
+static int hf_ieee80211_ff_bf_num_rx_dmg_ants;
+static int hf_ieee80211_ff_bf_b12b15;
+static int hf_ieee80211_ff_bf_rxss_len;
+static int hf_ieee80211_ff_bf_rxss_rate;
+static int hf_ieee80211_ff_bf_b10b15;
+static int hf_ieee80211_addr_nav_da;
+static int hf_ieee80211_addr_nav_sa;
+static int hf_ieee80211_ff_sswf;
+static int hf_ieee80211_ff_sswf_num_rx_dmg_ants;
+static int hf_ieee80211_ff_sswf_poll_required;
+static int hf_ieee80211_ff_sswf_total_sectors;
+static int hf_ieee80211_ff_sswf_reserved1;
+static int hf_ieee80211_ff_sswf_reserved2;
+static int hf_ieee80211_ff_sswf_sector_select;
+static int hf_ieee80211_ff_sswf_dmg_antenna_select;
+static int hf_ieee80211_ff_sswf_snr_report;
+static int hf_ieee80211_ff_brp;
+static int hf_ieee80211_ff_brp_L_RX;
+static int hf_ieee80211_ff_brp_TX_TRN_REQ;
+static int hf_ieee80211_ff_brp_MID_REQ;
+static int hf_ieee80211_ff_brp_BC_REQ;
+static int hf_ieee80211_ff_brp_MID_GRANT;
+static int hf_ieee80211_ff_brp_BC_GRANT;
+static int hf_ieee80211_ff_brp_chan_FBCK_CAP;
+static int hf_ieee80211_ff_brp_tx_sector;
+static int hf_ieee80211_ff_brp_other_aid;
+static int hf_ieee80211_ff_brp_tx_antenna;
+static int hf_ieee80211_ff_brp_reserved;
+static int hf_ieee80211_ff_blm;
+static int hf_ieee80211_ff_blm_unit_index;
+static int hf_ieee80211_ff_blm_maint_value;
+static int hf_ieee80211_ff_blm_is_master;
+static int hf_ieee80211_ff_bic;
+static int hf_ieee80211_ff_bic_cc_present;
+static int hf_ieee80211_ff_bic_discovery_mode;
+static int hf_ieee80211_ff_bic_next_beacon;
+static int hf_ieee80211_ff_bic_ati_present;
+static int hf_ieee80211_ff_bic_abft_len;
+static int hf_ieee80211_ff_bic_fss;
+static int hf_ieee80211_ff_bic_is_resp;
+static int hf_ieee80211_ff_bic_next_abft;
+static int hf_ieee80211_ff_bic_frag_txss;
+static int hf_ieee80211_ff_bic_txss_span;
+static int hf_ieee80211_ff_bic_NBI_abft;
+static int hf_ieee80211_ff_bic_abft_count;
+static int hf_ieee80211_ff_bic_nabft;
+static int hf_ieee80211_ff_bic_pcp;
+static int hf_ieee80211_ff_bic_reserved;
 static int * const ieee80211_ff_bic_fields[] = {
   &hf_ieee80211_ff_bic_cc_present,
   &hf_ieee80211_ff_bic_discovery_mode,
@@ -7357,1275 +7357,1275 @@ static int * const ieee80211_ff_bic_fields[] = {
   &hf_ieee80211_ff_bic_reserved,
   NULL
 };
-static int hf_ieee80211_ff_dmg_params = -1;
-static int hf_ieee80211_ff_dmg_params_bss = -1;
-static int hf_ieee80211_ff_dmg_params_cbap_only = -1;
-static int hf_ieee80211_ff_dmg_params_cbap_src = -1;
-static int hf_ieee80211_ff_dmg_params_privacy = -1;
-static int hf_ieee80211_ff_dmg_params_policy = -1;
-static int hf_ieee80211_ff_dmg_params_spec_mgmt = -1;
-static int hf_ieee80211_ff_dmg_params_radio_measure = -1;
-static int hf_ieee80211_ff_cc = -1;
-static int hf_ieee80211_ff_cc_abft_resp_addr = -1;
-static int hf_ieee80211_ff_cc_sp_duration = -1;
-static int hf_ieee80211_ff_cc_cluster_id = -1;
-static int hf_ieee80211_ff_cc_role = -1;
-static int hf_ieee80211_ff_cc_max_mem = -1;
-static int hf_ieee80211_ff_dmg_action_code = -1;
-static int hf_ieee80211_ff_dmg_pwr_mgmt = -1;
-static int hf_ieee80211_ff_subject_address = -1;
-static int hf_ieee80211_ff_handover_reason = -1;
-static int hf_ieee80211_ff_handover_remaining_bi = -1;
-static int hf_ieee80211_ff_handover_result = -1;
-static int hf_ieee80211_ff_handover_reject_reason = -1;
-static int hf_ieee80211_ff_destination_reds_aid = -1;
-static int hf_ieee80211_ff_destination_aid = -1;
-static int hf_ieee80211_ff_relay_aid = -1;
-static int hf_ieee80211_ff_source_aid = -1;
-static int hf_ieee80211_ff_timing_offset = -1;
-static int hf_ieee80211_ff_sampling_frequency_offset = -1;
-static int hf_ieee80211_ff_relay_operation_type = -1;
-static int hf_ieee80211_ff_peer_sta_aid = -1;
-static int hf_ieee80211_ff_snr = -1;
-static int hf_ieee80211_ff_internal_angle = -1;
-static int hf_ieee80211_ff_recommend = -1;
-static int hf_ieee80211_ff_unprotected_dmg_action_code = -1;
-static int hf_ieee80211_ff_fst_action_code = -1;
-static int hf_ieee80211_ff_robust_av_streaming_action_code = -1;
-static int hf_ieee80211_ff_llt = -1;
-static int hf_ieee80211_ff_fsts_id = -1;
-static int hf_ieee80211_ff_mmpdu_len = -1;
-static int hf_ieee80211_ff_mmpdu_ctrl = -1;
-static int hf_ieee80211_ff_oct_mmpdu = -1;
-static int hf_ieee80211_ff_scs_scsid = -1;
-static int hf_ieee80211_ff_scs_status = -1;
-static int hf_ieee80211_ff_scs_response_count = -1;
+static int hf_ieee80211_ff_dmg_params;
+static int hf_ieee80211_ff_dmg_params_bss;
+static int hf_ieee80211_ff_dmg_params_cbap_only;
+static int hf_ieee80211_ff_dmg_params_cbap_src;
+static int hf_ieee80211_ff_dmg_params_privacy;
+static int hf_ieee80211_ff_dmg_params_policy;
+static int hf_ieee80211_ff_dmg_params_spec_mgmt;
+static int hf_ieee80211_ff_dmg_params_radio_measure;
+static int hf_ieee80211_ff_cc;
+static int hf_ieee80211_ff_cc_abft_resp_addr;
+static int hf_ieee80211_ff_cc_sp_duration;
+static int hf_ieee80211_ff_cc_cluster_id;
+static int hf_ieee80211_ff_cc_role;
+static int hf_ieee80211_ff_cc_max_mem;
+static int hf_ieee80211_ff_dmg_action_code;
+static int hf_ieee80211_ff_dmg_pwr_mgmt;
+static int hf_ieee80211_ff_subject_address;
+static int hf_ieee80211_ff_handover_reason;
+static int hf_ieee80211_ff_handover_remaining_bi;
+static int hf_ieee80211_ff_handover_result;
+static int hf_ieee80211_ff_handover_reject_reason;
+static int hf_ieee80211_ff_destination_reds_aid;
+static int hf_ieee80211_ff_destination_aid;
+static int hf_ieee80211_ff_relay_aid;
+static int hf_ieee80211_ff_source_aid;
+static int hf_ieee80211_ff_timing_offset;
+static int hf_ieee80211_ff_sampling_frequency_offset;
+static int hf_ieee80211_ff_relay_operation_type;
+static int hf_ieee80211_ff_peer_sta_aid;
+static int hf_ieee80211_ff_snr;
+static int hf_ieee80211_ff_internal_angle;
+static int hf_ieee80211_ff_recommend;
+static int hf_ieee80211_ff_unprotected_dmg_action_code;
+static int hf_ieee80211_ff_fst_action_code;
+static int hf_ieee80211_ff_robust_av_streaming_action_code;
+static int hf_ieee80211_ff_llt;
+static int hf_ieee80211_ff_fsts_id;
+static int hf_ieee80211_ff_mmpdu_len;
+static int hf_ieee80211_ff_mmpdu_ctrl;
+static int hf_ieee80211_ff_oct_mmpdu;
+static int hf_ieee80211_ff_scs_scsid;
+static int hf_ieee80211_ff_scs_status;
+static int hf_ieee80211_ff_scs_response_count;
 
 #if 0
-static int hf_ieee80211_ff_rcsi = -1;
-static int hf_ieee80211_ff_rcsi_aid = -1;
+static int hf_ieee80211_ff_rcsi;
+static int hf_ieee80211_ff_rcsi_aid;
 #endif
-static int hf_ieee80211_ff_band_id = -1;
-static int hf_ieee80211_tag_relay_support = -1;
-static int hf_ieee80211_tag_relay_use = -1;
-static int hf_ieee80211_tag_relay_permission = -1;
-static int hf_ieee80211_tag_AC_power = -1;
-static int hf_ieee80211_tag_relay_prefer = -1;
-static int hf_ieee80211_tag_duplex = -1;
-static int hf_ieee80211_tag_cooperation = -1;
-static int hf_ieee80211_tag_move = -1;
-static int hf_ieee80211_tag_size = -1;
-static int hf_ieee80211_tag_tbtt_offset = -1;
-static int hf_ieee80211_tag_bi_duration = -1;
-static int hf_ieee80211_tag_dmg_capa_sta_addr = -1;
-static int hf_ieee80211_tag_dmg_capa_aid = -1;
-static int hf_ieee80211_tag_reverse_direction = -1;
-static int hf_ieee80211_tag_hlts = -1;
-static int hf_ieee80211_tag_tpc = -1;
-static int hf_ieee80211_tag_spsh = -1;
-static int hf_ieee80211_tag_rx_antenna = -1;
-static int hf_ieee80211_tag_fast_link = -1;
-static int hf_ieee80211_tag_num_sectors = -1;
-static int hf_ieee80211_tag_rxss_length = -1;
-static int hf_ieee80211_tag_reciprocity = -1;
-static int hf_ieee80211_tag_max_ampdu_exp = -1;
-static int hf_ieee80211_tag_min_mpdu_spacing = -1;
-static int hf_ieee80211_tag_ba_flow_control = -1;
-static int hf_ieee80211_tag_max_sc_rx_mcs = -1;
-static int hf_ieee80211_tag_max_ofdm_rx_mcs = -1;
-static int hf_ieee80211_tag_max_sc_tx_mcs = -1;
-static int hf_ieee80211_tag_max_ofdm_tx_mcs = -1;
-static int hf_ieee80211_tag_low_power_supported = -1;
-static int hf_ieee80211_tag_code_rate = -1;
-static int hf_ieee80211_tag_dtp = -1;
-static int hf_ieee80211_tag_appdu_supp = -1;
-static int hf_ieee80211_tag_heartbeat = -1;
-static int hf_ieee80211_tag_other_aid = -1;
-static int hf_ieee80211_tag_pattern_recip = -1;
-static int hf_ieee80211_tag_heartbeat_elapsed = -1;
-static int hf_ieee80211_tag_grant_ack_supp = -1;
-static int hf_ieee80211_tag_RXSSTxRate_supp = -1;
-static int hf_ieee80211_tag_pcp_tddti = -1;
-static int hf_ieee80211_tag_pcp_PSA = -1;
-static int hf_ieee80211_tag_pcp_handover = -1;
-static int hf_ieee80211_tag_pcp_max_assoc = -1;
-static int hf_ieee80211_tag_pcp_power_src = -1;
-static int hf_ieee80211_tag_pcp_decenter = -1;
-static int hf_ieee80211_tag_pcp_forwarding = -1;
-static int hf_ieee80211_tag_pcp_center = -1;
-static int hf_ieee80211_tag_sta_beam_track = -1;
-static int hf_ieee80211_tag_ext_sc_mcs_max_tx = -1;
-static int hf_ieee80211_tag_ext_sc_mcs_tx_code_7_8 = -1;
-static int hf_ieee80211_tag_ext_sc_mcs_max_rx = -1;
-static int hf_ieee80211_tag_ext_sc_mcs_rx_code_7_8 = -1;
-static int hf_ieee80211_tag_max_basic_sf_amsdu = -1;
-static int hf_ieee80211_tag_max_short_sf_amsdu = -1;
-static int hf_ieee80211_tag_PSRSI = -1;
-static int hf_ieee80211_tag_min_BHI_duration = -1;
-static int hf_ieee80211_tag_brdct_sta_info_dur = -1;
-static int hf_ieee80211_tag_assoc_resp_confirm_time = -1;
-static int hf_ieee80211_tag_min_pp_duration = -1;
-static int hf_ieee80211_tag_SP_idle_timeout = -1;
-static int hf_ieee80211_tag_max_lost_beacons = -1;
-static int hf_ieee80211_tag_type = -1;
-static int hf_ieee80211_tag_tap1 = -1;
-static int hf_ieee80211_tag_state1 = -1;
-static int hf_ieee80211_tag_tap2 = -1;
-static int hf_ieee80211_tag_state2 = -1;
-static int hf_ieee80211_tag_allocation_id = -1;
-static int hf_ieee80211_tag_allocation_type = -1;
-static int hf_ieee80211_tag_pseudo_static = -1;
-static int hf_ieee80211_tag_truncatable = -1;
-static int hf_ieee80211_tag_extendable = -1;
-static int hf_ieee80211_tag_pcp_active = -1;
-static int hf_ieee80211_tag_lp_sc_used = -1;
-static int hf_ieee80211_tag_src_aid = -1;
-static int hf_ieee80211_tag_dest_aid = -1;
-static int hf_ieee80211_tag_alloc_start = -1;
-static int hf_ieee80211_tag_alloc_block_duration = -1;
-static int hf_ieee80211_tag_num_blocks = -1;
-static int hf_ieee80211_tag_alloc_block_period = -1;
-static int hf_ieee80211_tag_aid = -1;
-static int hf_ieee80211_tag_cbap = -1;
-static int hf_ieee80211_tag_pp_avail = -1;
-static int hf_ieee80211_tag_next_ati_start_time = -1;
-static int hf_ieee80211_tag_next_ati_duration = -1;
-static int hf_ieee80211_tag_old_bssid = -1;
-static int hf_ieee80211_tag_new_pcp_addr = -1;
-static int hf_ieee80211_tag_bssid = -1;
-static int hf_ieee80211_tag_duplex_relay = -1;
-static int hf_ieee80211_tag_cooperation_relay = -1;
-static int hf_ieee80211_tag_tx_mode = -1;
-static int hf_ieee80211_tag_link_change_interval = -1;
-static int hf_ieee80211_tag_data_sensing_time = -1;
-static int hf_ieee80211_tag_first_period = -1;
-static int hf_ieee80211_tag_second_period = -1;
-static int hf_ieee80211_tag_initiator = -1;
-static int hf_ieee80211_tag_tx_train_res = -1;
-static int hf_ieee80211_tag_rx_train_res = -1;
-static int hf_ieee80211_tag_tx_trn_ok = -1;
-static int hf_ieee80211_tag_txss_fbck_req = -1;
-static int hf_ieee80211_tag_bs_fbck = -1;
-static int hf_ieee80211_tag_bs_fbck_antenna_id = -1;
-static int hf_ieee80211_tag_snr_requested = -1;
-static int hf_ieee80211_tag_channel_measurement_requested = -1;
-static int hf_ieee80211_tag_number_of_taps_requested = -1;
-static int hf_ieee80211_tag_sector_id_order_req = -1;
-static int hf_ieee80211_tag_snr_present = -1;
-static int hf_ieee80211_tag_channel_measurement_present = -1;
-static int hf_ieee80211_tag_tap_delay_present = -1;
-static int hf_ieee80211_tag_number_of_taps_present = -1;
-static int hf_ieee80211_tag_number_of_measurement = -1;
-static int hf_ieee80211_tag_sector_id_order_present = -1;
-static int hf_ieee80211_tag_number_of_beams = -1;
-static int hf_ieee80211_tag_mid_extension = -1;
-static int hf_ieee80211_tag_capability_request = -1;
-static int hf_ieee80211_tag_beam_refine_reserved = -1;
-static int hf_ieee80211_tag_nextpcp_list = -1;
-static int hf_ieee80211_tag_nextpcp_token = -1;
-static int hf_ieee80211_tag_reamaining_BI = -1;
-static int hf_ieee80211_tag_request_token = -1;
-static int hf_ieee80211_tag_bi_start_time = -1;
-static int hf_ieee80211_tag_sleep_cycle = -1;
-static int hf_ieee80211_tag_num_awake_bis = -1;
-static int hf_ieee80211_tag_tspec_allocation_id = -1;
-static int hf_ieee80211_tag_tspec_allocation_type = -1;
-static int hf_ieee80211_tag_tspec_allocation_format = -1;
-static int hf_ieee80211_tag_tspec_pseudo_static = -1;
-static int hf_ieee80211_tag_tspec_truncatable = -1;
-static int hf_ieee80211_tag_tspec_extendable = -1;
-static int hf_ieee80211_tag_tspec_lp_sc_used = -1;
-static int hf_ieee80211_tag_tspec_up = -1;
-static int hf_ieee80211_tag_tspec_dest_aid = -1;
-static int hf_ieee80211_tag_tspec_allocation_period = -1;
-static int hf_ieee80211_tag_tspec_min_allocation = -1;
-static int hf_ieee80211_tag_tspec_max_allocation = -1;
-static int hf_ieee80211_tag_tspec_min_duration = -1;
-static int hf_ieee80211_tag_tspec_num_of_constraints = -1;
-static int hf_ieee80211_tag_tspec_tsconst_start_time = -1;
-static int hf_ieee80211_tag_tspec_tsconst_duration = -1;
-static int hf_ieee80211_tag_tspec_tsconst_period = -1;
-static int hf_ieee80211_tag_tspec_tsconst_interferer_mac = -1;
-static int hf_ieee80211_tag_channel_measurement_feedback_relative_I = -1;
-static int hf_ieee80211_tag_channel_measurement_feedback_relative_Q = -1;
-static int hf_ieee80211_tag_channel_measurement_feedback_tap_delay = -1;
-static int hf_ieee80211_tag_channel_measurement_feedback_sector_id = -1;
-static int hf_ieee80211_tag_channel_measurement_feedback_antenna_id = -1;
-static int hf_ieee80211_tag_awake_window = -1;
-static int hf_ieee80211_tag_addba_ext_no_frag = -1;
-static int hf_ieee80211_tag_addba_ext_he_fragmentation_operation = -1;
-static int hf_ieee80211_tag_addba_ext_reserved = -1;
-static int hf_ieee80211_tag_addba_ext_buffer_size = -1;
-static int hf_ieee80211_tag_multi_band_ctrl_sta_role = -1;
-static int hf_ieee80211_tag_multi_band_ctrl_addr_present = -1;
-static int hf_ieee80211_tag_multi_band_ctrl_cipher_present = -1;
-static int hf_ieee80211_tag_multi_band_oper_class = -1;
-static int hf_ieee80211_tag_multi_band_channel_number = -1;
-static int hf_ieee80211_tag_multi_band_tsf_offset = -1;
-static int hf_ieee80211_tag_multi_band_conn_ap = -1;
-static int hf_ieee80211_tag_multi_band_conn_pcp = -1;
-static int hf_ieee80211_tag_multi_band_conn_dls = -1;
-static int hf_ieee80211_tag_multi_band_conn_tdls = -1;
-static int hf_ieee80211_tag_multi_band_conn_ibss = -1;
-static int hf_ieee80211_tag_multi_band_fst_timeout = -1;
-static int hf_ieee80211_tag_multi_band_sta_mac = -1;
-static int hf_ieee80211_tag_activity = -1;
-static int hf_ieee80211_tag_dmg_link_adapt_mcs = -1;
-static int hf_ieee80211_tag_dmg_link_adapt_link_margin = -1;
-static int hf_ieee80211_tag_ref_timestamp = -1;
-static int hf_ieee80211_tag_switching_stream_non_qos = -1;
-static int hf_ieee80211_tag_switching_stream_param_num = -1;
-static int hf_ieee80211_tag_switching_stream_old_tid = -1;
-static int hf_ieee80211_tag_switching_stream_old_direction = -1;
-static int hf_ieee80211_tag_switching_stream_new_tid = -1;
-static int hf_ieee80211_tag_switching_stream_new_direction = -1;
-static int hf_ieee80211_tag_switching_stream_new_valid_id = -1;
-static int hf_ieee80211_tag_switching_stream_llt_type = -1;
-
-static int hf_ieee80211_mysterious_extra_stuff = -1;
-
-static int hf_ieee80211_mscs_descriptor_type = -1;
-static int hf_ieee80211_mscs_user_prio_control_reserved = -1;
-static int hf_ieee80211_user_prio_bitmap = -1;
-static int hf_ieee80211_user_prio_bitmap_bit0 = -1;
-static int hf_ieee80211_user_prio_bitmap_bit1 = -1;
-static int hf_ieee80211_user_prio_bitmap_bit2 = -1;
-static int hf_ieee80211_user_prio_bitmap_bit3 = -1;
-static int hf_ieee80211_user_prio_bitmap_bit4 = -1;
-static int hf_ieee80211_user_prio_bitmap_bit5 = -1;
-static int hf_ieee80211_user_prio_bitmap_bit6 = -1;
-static int hf_ieee80211_user_prio_bitmap_bit7 = -1;
-static int hf_ieee80211_user_prio_limit = -1;
-static int hf_ieee80211_user_prio_reserved = -1;
-static int hf_ieee80211_stream_timeout_reserved = -1;
-static int hf_ieee80211_stream_timeout = -1;
-static int hf_ieee80211_mscs_subelement_id = -1;
-static int hf_ieee80211_mscs_subelement_len = -1;
-static int hf_ieee80211_mscs_subelement_data = -1;
-
-static int hf_ieee80211_intra_access_prio = -1;
-static int hf_ieee80211_intra_access_prio_user_prio = -1;
-static int hf_ieee80211_intra_access_prio_alt_queue = -1;
-static int hf_ieee80211_intra_access_prio_drop_elig = -1;
-static int hf_ieee80211_intra_access_prio_reserved = -1;
-
-static int hf_ieee80211_scs_descriptor_scsid = -1;
-static int hf_ieee80211_scs_descriptor_type = -1;
-
-static int hf_ieee80211_esp_access_category = -1;
-static int hf_ieee80211_esp_reserved = -1;
-static int hf_ieee80211_esp_data_format = -1;
-static int hf_ieee80211_esp_ba_windows_size = -1;
-static int hf_ieee80211_esp_est_air_time_frac = -1;
-static int hf_ieee80211_esp_data_ppdu_duration_target = -1;
-static int hf_ieee80211_estimated_service_params = -1;
-
-static int hf_ieee80211_fcg_new_channel_number = -1;
-static int hf_ieee80211_fcg_extra_info = -1;
-static int hf_ieee80211_sae_password_identifier = -1;
-
-static int hf_ieee80211_sae_anti_clogging_token = -1;
-
-static int hf_ieee80211_tag_fils_indication_info_nr_pk = -1;
-static int hf_ieee80211_tag_fils_indication_info_nr_realm = -1;
-static int hf_ieee80211_tag_fils_indication_info_ip_config = -1;
-static int hf_ieee80211_tag_fils_indication_info_cache_id_included = -1;
-static int hf_ieee80211_tag_fils_indication_info_hessid_included = -1;
-static int hf_ieee80211_tag_fils_indication_info_ska_without_pfs = -1;
-static int hf_ieee80211_tag_fils_indication_info_ska_with_pfs = -1;
-static int hf_ieee80211_tag_fils_indication_info_pka = -1;
-static int hf_ieee80211_tag_fils_indication_info_reserved = -1;
-static int hf_ieee80211_tag_fils_indication_cache_identifier = -1;
-static int hf_ieee80211_tag_fils_indication_hessid = -1;
-static int hf_ieee80211_tag_fils_indication_realm_list = -1;
-static int hf_ieee80211_tag_fils_indication_realm_identifier = -1;
-static int hf_ieee80211_tag_fils_indication_public_key_list = -1;
-static int hf_ieee80211_tag_fils_indication_public_key_type = -1;
-static int hf_ieee80211_tag_fils_indication_public_key_length = -1;
-static int hf_ieee80211_tag_fils_indication_public_key_indicator = -1;
-
-static int hf_ieee80211_qos_mgmt_attribute_id = -1;
-static int hf_ieee80211_qos_mgmt_attribute_len = -1;
-static int hf_ieee80211_qos_mgmt_start_port_range = -1;
-static int hf_ieee80211_qos_mgmt_end_port_range = -1;
-static int hf_ieee80211_qos_mgmt_dscp_pol_id = -1;
-static int hf_ieee80211_qos_mgmt_dscp_pol_req_type = -1;
-static int hf_ieee80211_qos_mgmt_dscp_pol_dscp = -1;
-static int hf_ieee80211_qos_mgmt_domain_name = -1;
-static int hf_ieee80211_qos_mgmt_unknown_attr = -1;
-
-static int hf_ieee80211_ext_tag = -1;
-static int hf_ieee80211_ext_tag_number = -1;
-static int hf_ieee80211_ext_tag_length = -1;
-static int hf_ieee80211_ext_tag_data = -1;
-
-static int hf_ieee80211_fils_req_params_parameter_control_bitmap = -1;
-static int hf_ieee80211_fils_req_params_fils_criteria_present = -1;
-static int hf_ieee80211_fils_req_params_max_delay_limit_present = -1;
-static int hf_ieee80211_fils_req_params_minimum_data_rate_present = -1;
-static int hf_ieee80211_fils_req_params_rcpi_limit_present = -1;
-static int hf_ieee80211_fils_req_params_oui_response_criteria_present = -1;
-static int hf_ieee80211_fils_req_params_reserved = -1;
-static int hf_ieee80211_fils_req_params_max_channel_time = -1;
-static int hf_ieee80211_fils_req_params_fils_criteria = -1;
-static int hf_ieee80211_fils_req_params_fils_criteria_bss_delay = -1;
-static int hf_ieee80211_fils_req_params_fils_criteria_phy_support = -1;
-static int hf_ieee80211_fils_req_params_fils_criteria_reserved = -1;
-static int hf_ieee80211_fils_req_params_max_delay_limit = -1;
-static int hf_ieee80211_fils_req_params_minimum_data_rate = -1;
-static int hf_ieee80211_fils_req_params_rcpi_limit = -1;
-static int hf_ieee80211_fils_req_params_oui_response_criteria = -1;
-
-static int hf_ieee80211_fils_session = -1;
-static int hf_ieee80211_fils_encrypted_data = -1;
-static int hf_ieee80211_fils_nonce = -1;
+static int hf_ieee80211_ff_band_id;
+static int hf_ieee80211_tag_relay_support;
+static int hf_ieee80211_tag_relay_use;
+static int hf_ieee80211_tag_relay_permission;
+static int hf_ieee80211_tag_AC_power;
+static int hf_ieee80211_tag_relay_prefer;
+static int hf_ieee80211_tag_duplex;
+static int hf_ieee80211_tag_cooperation;
+static int hf_ieee80211_tag_move;
+static int hf_ieee80211_tag_size;
+static int hf_ieee80211_tag_tbtt_offset;
+static int hf_ieee80211_tag_bi_duration;
+static int hf_ieee80211_tag_dmg_capa_sta_addr;
+static int hf_ieee80211_tag_dmg_capa_aid;
+static int hf_ieee80211_tag_reverse_direction;
+static int hf_ieee80211_tag_hlts;
+static int hf_ieee80211_tag_tpc;
+static int hf_ieee80211_tag_spsh;
+static int hf_ieee80211_tag_rx_antenna;
+static int hf_ieee80211_tag_fast_link;
+static int hf_ieee80211_tag_num_sectors;
+static int hf_ieee80211_tag_rxss_length;
+static int hf_ieee80211_tag_reciprocity;
+static int hf_ieee80211_tag_max_ampdu_exp;
+static int hf_ieee80211_tag_min_mpdu_spacing;
+static int hf_ieee80211_tag_ba_flow_control;
+static int hf_ieee80211_tag_max_sc_rx_mcs;
+static int hf_ieee80211_tag_max_ofdm_rx_mcs;
+static int hf_ieee80211_tag_max_sc_tx_mcs;
+static int hf_ieee80211_tag_max_ofdm_tx_mcs;
+static int hf_ieee80211_tag_low_power_supported;
+static int hf_ieee80211_tag_code_rate;
+static int hf_ieee80211_tag_dtp;
+static int hf_ieee80211_tag_appdu_supp;
+static int hf_ieee80211_tag_heartbeat;
+static int hf_ieee80211_tag_other_aid;
+static int hf_ieee80211_tag_pattern_recip;
+static int hf_ieee80211_tag_heartbeat_elapsed;
+static int hf_ieee80211_tag_grant_ack_supp;
+static int hf_ieee80211_tag_RXSSTxRate_supp;
+static int hf_ieee80211_tag_pcp_tddti;
+static int hf_ieee80211_tag_pcp_PSA;
+static int hf_ieee80211_tag_pcp_handover;
+static int hf_ieee80211_tag_pcp_max_assoc;
+static int hf_ieee80211_tag_pcp_power_src;
+static int hf_ieee80211_tag_pcp_decenter;
+static int hf_ieee80211_tag_pcp_forwarding;
+static int hf_ieee80211_tag_pcp_center;
+static int hf_ieee80211_tag_sta_beam_track;
+static int hf_ieee80211_tag_ext_sc_mcs_max_tx;
+static int hf_ieee80211_tag_ext_sc_mcs_tx_code_7_8;
+static int hf_ieee80211_tag_ext_sc_mcs_max_rx;
+static int hf_ieee80211_tag_ext_sc_mcs_rx_code_7_8;
+static int hf_ieee80211_tag_max_basic_sf_amsdu;
+static int hf_ieee80211_tag_max_short_sf_amsdu;
+static int hf_ieee80211_tag_PSRSI;
+static int hf_ieee80211_tag_min_BHI_duration;
+static int hf_ieee80211_tag_brdct_sta_info_dur;
+static int hf_ieee80211_tag_assoc_resp_confirm_time;
+static int hf_ieee80211_tag_min_pp_duration;
+static int hf_ieee80211_tag_SP_idle_timeout;
+static int hf_ieee80211_tag_max_lost_beacons;
+static int hf_ieee80211_tag_type;
+static int hf_ieee80211_tag_tap1;
+static int hf_ieee80211_tag_state1;
+static int hf_ieee80211_tag_tap2;
+static int hf_ieee80211_tag_state2;
+static int hf_ieee80211_tag_allocation_id;
+static int hf_ieee80211_tag_allocation_type;
+static int hf_ieee80211_tag_pseudo_static;
+static int hf_ieee80211_tag_truncatable;
+static int hf_ieee80211_tag_extendable;
+static int hf_ieee80211_tag_pcp_active;
+static int hf_ieee80211_tag_lp_sc_used;
+static int hf_ieee80211_tag_src_aid;
+static int hf_ieee80211_tag_dest_aid;
+static int hf_ieee80211_tag_alloc_start;
+static int hf_ieee80211_tag_alloc_block_duration;
+static int hf_ieee80211_tag_num_blocks;
+static int hf_ieee80211_tag_alloc_block_period;
+static int hf_ieee80211_tag_aid;
+static int hf_ieee80211_tag_cbap;
+static int hf_ieee80211_tag_pp_avail;
+static int hf_ieee80211_tag_next_ati_start_time;
+static int hf_ieee80211_tag_next_ati_duration;
+static int hf_ieee80211_tag_old_bssid;
+static int hf_ieee80211_tag_new_pcp_addr;
+static int hf_ieee80211_tag_bssid;
+static int hf_ieee80211_tag_duplex_relay;
+static int hf_ieee80211_tag_cooperation_relay;
+static int hf_ieee80211_tag_tx_mode;
+static int hf_ieee80211_tag_link_change_interval;
+static int hf_ieee80211_tag_data_sensing_time;
+static int hf_ieee80211_tag_first_period;
+static int hf_ieee80211_tag_second_period;
+static int hf_ieee80211_tag_initiator;
+static int hf_ieee80211_tag_tx_train_res;
+static int hf_ieee80211_tag_rx_train_res;
+static int hf_ieee80211_tag_tx_trn_ok;
+static int hf_ieee80211_tag_txss_fbck_req;
+static int hf_ieee80211_tag_bs_fbck;
+static int hf_ieee80211_tag_bs_fbck_antenna_id;
+static int hf_ieee80211_tag_snr_requested;
+static int hf_ieee80211_tag_channel_measurement_requested;
+static int hf_ieee80211_tag_number_of_taps_requested;
+static int hf_ieee80211_tag_sector_id_order_req;
+static int hf_ieee80211_tag_snr_present;
+static int hf_ieee80211_tag_channel_measurement_present;
+static int hf_ieee80211_tag_tap_delay_present;
+static int hf_ieee80211_tag_number_of_taps_present;
+static int hf_ieee80211_tag_number_of_measurement;
+static int hf_ieee80211_tag_sector_id_order_present;
+static int hf_ieee80211_tag_number_of_beams;
+static int hf_ieee80211_tag_mid_extension;
+static int hf_ieee80211_tag_capability_request;
+static int hf_ieee80211_tag_beam_refine_reserved;
+static int hf_ieee80211_tag_nextpcp_list;
+static int hf_ieee80211_tag_nextpcp_token;
+static int hf_ieee80211_tag_reamaining_BI;
+static int hf_ieee80211_tag_request_token;
+static int hf_ieee80211_tag_bi_start_time;
+static int hf_ieee80211_tag_sleep_cycle;
+static int hf_ieee80211_tag_num_awake_bis;
+static int hf_ieee80211_tag_tspec_allocation_id;
+static int hf_ieee80211_tag_tspec_allocation_type;
+static int hf_ieee80211_tag_tspec_allocation_format;
+static int hf_ieee80211_tag_tspec_pseudo_static;
+static int hf_ieee80211_tag_tspec_truncatable;
+static int hf_ieee80211_tag_tspec_extendable;
+static int hf_ieee80211_tag_tspec_lp_sc_used;
+static int hf_ieee80211_tag_tspec_up;
+static int hf_ieee80211_tag_tspec_dest_aid;
+static int hf_ieee80211_tag_tspec_allocation_period;
+static int hf_ieee80211_tag_tspec_min_allocation;
+static int hf_ieee80211_tag_tspec_max_allocation;
+static int hf_ieee80211_tag_tspec_min_duration;
+static int hf_ieee80211_tag_tspec_num_of_constraints;
+static int hf_ieee80211_tag_tspec_tsconst_start_time;
+static int hf_ieee80211_tag_tspec_tsconst_duration;
+static int hf_ieee80211_tag_tspec_tsconst_period;
+static int hf_ieee80211_tag_tspec_tsconst_interferer_mac;
+static int hf_ieee80211_tag_channel_measurement_feedback_relative_I;
+static int hf_ieee80211_tag_channel_measurement_feedback_relative_Q;
+static int hf_ieee80211_tag_channel_measurement_feedback_tap_delay;
+static int hf_ieee80211_tag_channel_measurement_feedback_sector_id;
+static int hf_ieee80211_tag_channel_measurement_feedback_antenna_id;
+static int hf_ieee80211_tag_awake_window;
+static int hf_ieee80211_tag_addba_ext_no_frag;
+static int hf_ieee80211_tag_addba_ext_he_fragmentation_operation;
+static int hf_ieee80211_tag_addba_ext_reserved;
+static int hf_ieee80211_tag_addba_ext_buffer_size;
+static int hf_ieee80211_tag_multi_band_ctrl_sta_role;
+static int hf_ieee80211_tag_multi_band_ctrl_addr_present;
+static int hf_ieee80211_tag_multi_band_ctrl_cipher_present;
+static int hf_ieee80211_tag_multi_band_oper_class;
+static int hf_ieee80211_tag_multi_band_channel_number;
+static int hf_ieee80211_tag_multi_band_tsf_offset;
+static int hf_ieee80211_tag_multi_band_conn_ap;
+static int hf_ieee80211_tag_multi_band_conn_pcp;
+static int hf_ieee80211_tag_multi_band_conn_dls;
+static int hf_ieee80211_tag_multi_band_conn_tdls;
+static int hf_ieee80211_tag_multi_band_conn_ibss;
+static int hf_ieee80211_tag_multi_band_fst_timeout;
+static int hf_ieee80211_tag_multi_band_sta_mac;
+static int hf_ieee80211_tag_activity;
+static int hf_ieee80211_tag_dmg_link_adapt_mcs;
+static int hf_ieee80211_tag_dmg_link_adapt_link_margin;
+static int hf_ieee80211_tag_ref_timestamp;
+static int hf_ieee80211_tag_switching_stream_non_qos;
+static int hf_ieee80211_tag_switching_stream_param_num;
+static int hf_ieee80211_tag_switching_stream_old_tid;
+static int hf_ieee80211_tag_switching_stream_old_direction;
+static int hf_ieee80211_tag_switching_stream_new_tid;
+static int hf_ieee80211_tag_switching_stream_new_direction;
+static int hf_ieee80211_tag_switching_stream_new_valid_id;
+static int hf_ieee80211_tag_switching_stream_llt_type;
+
+static int hf_ieee80211_mysterious_extra_stuff;
+
+static int hf_ieee80211_mscs_descriptor_type;
+static int hf_ieee80211_mscs_user_prio_control_reserved;
+static int hf_ieee80211_user_prio_bitmap;
+static int hf_ieee80211_user_prio_bitmap_bit0;
+static int hf_ieee80211_user_prio_bitmap_bit1;
+static int hf_ieee80211_user_prio_bitmap_bit2;
+static int hf_ieee80211_user_prio_bitmap_bit3;
+static int hf_ieee80211_user_prio_bitmap_bit4;
+static int hf_ieee80211_user_prio_bitmap_bit5;
+static int hf_ieee80211_user_prio_bitmap_bit6;
+static int hf_ieee80211_user_prio_bitmap_bit7;
+static int hf_ieee80211_user_prio_limit;
+static int hf_ieee80211_user_prio_reserved;
+static int hf_ieee80211_stream_timeout_reserved;
+static int hf_ieee80211_stream_timeout;
+static int hf_ieee80211_mscs_subelement_id;
+static int hf_ieee80211_mscs_subelement_len;
+static int hf_ieee80211_mscs_subelement_data;
+
+static int hf_ieee80211_intra_access_prio;
+static int hf_ieee80211_intra_access_prio_user_prio;
+static int hf_ieee80211_intra_access_prio_alt_queue;
+static int hf_ieee80211_intra_access_prio_drop_elig;
+static int hf_ieee80211_intra_access_prio_reserved;
+
+static int hf_ieee80211_scs_descriptor_scsid;
+static int hf_ieee80211_scs_descriptor_type;
+
+static int hf_ieee80211_esp_access_category;
+static int hf_ieee80211_esp_reserved;
+static int hf_ieee80211_esp_data_format;
+static int hf_ieee80211_esp_ba_windows_size;
+static int hf_ieee80211_esp_est_air_time_frac;
+static int hf_ieee80211_esp_data_ppdu_duration_target;
+static int hf_ieee80211_estimated_service_params;
+
+static int hf_ieee80211_fcg_new_channel_number;
+static int hf_ieee80211_fcg_extra_info;
+static int hf_ieee80211_sae_password_identifier;
+
+static int hf_ieee80211_sae_anti_clogging_token;
+
+static int hf_ieee80211_tag_fils_indication_info_nr_pk;
+static int hf_ieee80211_tag_fils_indication_info_nr_realm;
+static int hf_ieee80211_tag_fils_indication_info_ip_config;
+static int hf_ieee80211_tag_fils_indication_info_cache_id_included;
+static int hf_ieee80211_tag_fils_indication_info_hessid_included;
+static int hf_ieee80211_tag_fils_indication_info_ska_without_pfs;
+static int hf_ieee80211_tag_fils_indication_info_ska_with_pfs;
+static int hf_ieee80211_tag_fils_indication_info_pka;
+static int hf_ieee80211_tag_fils_indication_info_reserved;
+static int hf_ieee80211_tag_fils_indication_cache_identifier;
+static int hf_ieee80211_tag_fils_indication_hessid;
+static int hf_ieee80211_tag_fils_indication_realm_list;
+static int hf_ieee80211_tag_fils_indication_realm_identifier;
+static int hf_ieee80211_tag_fils_indication_public_key_list;
+static int hf_ieee80211_tag_fils_indication_public_key_type;
+static int hf_ieee80211_tag_fils_indication_public_key_length;
+static int hf_ieee80211_tag_fils_indication_public_key_indicator;
+
+static int hf_ieee80211_qos_mgmt_attribute_id;
+static int hf_ieee80211_qos_mgmt_attribute_len;
+static int hf_ieee80211_qos_mgmt_start_port_range;
+static int hf_ieee80211_qos_mgmt_end_port_range;
+static int hf_ieee80211_qos_mgmt_dscp_pol_id;
+static int hf_ieee80211_qos_mgmt_dscp_pol_req_type;
+static int hf_ieee80211_qos_mgmt_dscp_pol_dscp;
+static int hf_ieee80211_qos_mgmt_domain_name;
+static int hf_ieee80211_qos_mgmt_unknown_attr;
+
+static int hf_ieee80211_ext_tag;
+static int hf_ieee80211_ext_tag_number;
+static int hf_ieee80211_ext_tag_length;
+static int hf_ieee80211_ext_tag_data;
+
+static int hf_ieee80211_fils_req_params_parameter_control_bitmap;
+static int hf_ieee80211_fils_req_params_fils_criteria_present;
+static int hf_ieee80211_fils_req_params_max_delay_limit_present;
+static int hf_ieee80211_fils_req_params_minimum_data_rate_present;
+static int hf_ieee80211_fils_req_params_rcpi_limit_present;
+static int hf_ieee80211_fils_req_params_oui_response_criteria_present;
+static int hf_ieee80211_fils_req_params_reserved;
+static int hf_ieee80211_fils_req_params_max_channel_time;
+static int hf_ieee80211_fils_req_params_fils_criteria;
+static int hf_ieee80211_fils_req_params_fils_criteria_bss_delay;
+static int hf_ieee80211_fils_req_params_fils_criteria_phy_support;
+static int hf_ieee80211_fils_req_params_fils_criteria_reserved;
+static int hf_ieee80211_fils_req_params_max_delay_limit;
+static int hf_ieee80211_fils_req_params_minimum_data_rate;
+static int hf_ieee80211_fils_req_params_rcpi_limit;
+static int hf_ieee80211_fils_req_params_oui_response_criteria;
+
+static int hf_ieee80211_fils_session;
+static int hf_ieee80211_fils_encrypted_data;
+static int hf_ieee80211_fils_nonce;
 
 /* wfa 60g ie tree */
-static int hf_ieee80211_wfa_60g_attr = -1;
-static int hf_ieee80211_wfa_60g_attr_id = -1;
-static int hf_ieee80211_wfa_60g_attr_len = -1;
+static int hf_ieee80211_wfa_60g_attr;
+static int hf_ieee80211_wfa_60g_attr_id;
+static int hf_ieee80211_wfa_60g_attr_len;
 
-static int hf_ieee80211_wfa_60g_attr_cap_sta_mac_addr = -1;
-static int hf_ieee80211_wfa_60g_attr_cap_recv_amsdu_frames = -1;
-static int hf_ieee80211_wfa_60g_attr_cap_reserved = -1;
+static int hf_ieee80211_wfa_60g_attr_cap_sta_mac_addr;
+static int hf_ieee80211_wfa_60g_attr_cap_recv_amsdu_frames;
+static int hf_ieee80211_wfa_60g_attr_cap_reserved;
 
 /* ************************************************************************* */
 /*                              802.11AX fields                              */
 /* ************************************************************************* */
-static int hf_ieee80211_he_mac_capabilities = -1;
-static int hf_ieee80211_he_htc_he_support = -1;
-static int hf_ieee80211_he_twt_requester_support = -1;
-static int hf_ieee80211_he_twt_responder_support = -1;
-static int hf_ieee80211_he_dynamic_fragmentation_support = -1;
-static int hf_ieee80211_he_max_number_fragmented_msdus = -1;
-static int hf_ieee80211_he_min_fragment_size = -1;
-static int hf_ieee80211_he_trigger_frame_mac_padding_dur = -1;
-static int hf_ieee80211_he_multi_tid_aggregation_rx_support = -1;
-static int hf_ieee80211_he_he_link_adaptation_support = -1;
-static int hf_ieee80211_he_all_ack_support = -1;
-static int hf_ieee80211_he_trs_support = -1;
-static int hf_ieee80211_he_bsr_support = -1;
-static int hf_ieee80211_he_broadcast_twt_support = -1;
-static int hf_ieee80211_he_32_bit_ba_bitmap_support = -1;
-static int hf_ieee80211_he_mu_cascading_support = -1;
-static int hf_ieee80211_he_ack_enabled_aggregation_support = -1;
-static int hf_ieee80211_he_reserved_b24 = -1;
-static int hf_ieee80211_he_om_control_support = -1;
-static int hf_ieee80211_he_ofdma_ra_support = -1;
-static int hf_ieee80211_he_max_a_mpdu_length_exponent_ext = -1;
-static int hf_ieee80211_he_a_msdu_fragmentation_support = -1;
-static int hf_ieee80211_he_flexible_twt_schedule_support = -1;
-static int hf_ieee80211_he_rx_control_frame_to_multibss = -1;
-static int hf_ieee80211_he_bsrp_bqrp_a_mpdu_aggregation = -1;
-static int hf_ieee80211_he_qtp_support = -1;
-static int hf_ieee80211_he_bqr_support = -1;
-static int hf_ieee80211_he_psr_responder = -1;
-static int hf_ieee80211_he_ndp_feedback_report_support = -1;
-static int hf_ieee80211_he_ops_support = -1;
-static int hf_ieee80211_he_a_msdu_in_a_mpdu_support = -1;
-static int hf_ieee80211_he_multi_tid_aggregation_tx_support = -1;
-static int hf_ieee80211_he_subchannel_selective_trans_support = -1;
-static int hf_ieee80211_he_2_996_tone_ru_support = -1;
-static int hf_ieee80211_he_om_control_ul_mu_data_disable_rx_support = -1;
-static int hf_ieee80211_he_dynamic_sm_power_save = -1;
-static int hf_ieee80211_he_punctured_sounding_support = -1;
-static int hf_ieee80211_he_ht_and_vht_trigger_frame_rx_support = -1;
-static int hf_ieee80211_he_reserved_bit_18 = -1;
-static int hf_ieee80211_he_reserved_bit_19 = -1;
-static int hf_ieee80211_he_reserved_bit_25 = -1;
-static int hf_ieee80211_he_reserved_bit_29 = -1;
-static int hf_ieee80211_he_reserved_bit_34 = -1;
-static int hf_ieee80211_he_reserved_bits_5_7 = -1;
-static int hf_ieee80211_he_reserved_bits_8_9 = -1;
-static int hf_ieee80211_he_reserved_bits_15_16 = -1;
-static int hf_ieee80211_he_phy_reserved_b0 = -1;
-static int hf_ieee80211_he_phy_cap_reserved_b0 = -1;
-static int hf_ieee80211_he_phy_chan_width_set = -1;
-static int hf_ieee80211_he_40mhz_channel_2_4ghz = -1;
-static int hf_ieee80211_he_40_and_80_mhz_5ghz = -1;
-static int hf_ieee80211_he_160_mhz_5ghz = -1;
-static int hf_ieee80211_he_160_80_plus_80_mhz_5ghz = -1;
-static int hf_ieee80211_he_242_tone_rus_in_2_4ghz = -1;
-static int hf_ieee80211_he_242_tone_rus_in_5ghz = -1;
-static int hf_ieee80211_he_5ghz_b0_reserved = -1;
-static int hf_ieee80211_he_5ghz_b4_reserved = -1;
-static int hf_ieee80211_he_24ghz_b1_reserved = -1;
-static int hf_ieee80211_he_24ghz_b2_reserved = -1;
-static int hf_ieee80211_he_24ghz_b3_reserved = -1;
-static int hf_ieee80211_he_24ghz_b5_reserved = -1;
-static int hf_ieee80211_he_chan_width_reserved = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_1_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_2_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_3_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_4_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_5_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_6_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_7_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_8_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_1_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_2_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_3_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_4_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_5_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_6_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_7_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_8_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_1_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_2_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_3_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_4_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_5_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_6_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_7_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_8_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_1_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_2_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_3_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_4_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_5_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_6_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_7_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_8_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_1_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_2_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_3_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_4_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_5_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_6_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_7_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_8_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_1_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_2_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_3_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_4_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_5_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_6_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_7_ss = -1;
-static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_8_ss = -1;
-static int hf_ieee80211_he_rx_he_mcs_map_lte_80 = -1;
-static int hf_ieee80211_he_tx_he_mcs_map_lte_80 = -1;
-static int hf_ieee80211_he_rx_he_mcs_map_160 = -1;
-static int hf_ieee80211_he_tx_he_mcs_map_160 = -1;
-static int hf_ieee80211_he_rx_he_mcs_map_80_80 = -1;
-static int hf_ieee80211_he_tx_he_mcs_map_80_80 = -1;
-static int hf_ieee80211_he_ppe_thresholds_nss = -1;
-static int hf_ieee80211_he_ppe_thresholds_ru_index_bitmask = -1;
-static int hf_ieee80211_he_ppe_ppet16 = -1;
-static int hf_ieee80211_he_ppe_ppet8 = -1;
-static int hf_ieee80211_he_phy_b8_to_b23 = -1;
-static int hf_ieee80211_he_phy_cap_punctured_preamble_rx = -1;
-static int hf_ieee80211_he_phy_cap_device_class = -1;
-static int hf_ieee80211_he_phy_cap_ldpc_coding_in_payload = -1;
-static int hf_ieee80211_he_phy_cap_he_su_ppdu_1x_he_ltf_08us = -1;
-static int hf_ieee80211_he_phy_cap_midamble_tx_rx_max_nsts = -1;
-static int hf_ieee80211_he_phy_cap_ndp_with_4x_he_ltf_32us = -1;
-static int hf_ieee80211_he_phy_cap_stbc_tx_lt_80mhz = -1;
-static int hf_ieee80211_he_phy_cap_stbc_rx_lt_80mhz = -1;
-static int hf_ieee80211_he_phy_cap_doppler_tx = -1;
-static int hf_ieee80211_he_phy_cap_doppler_rx = -1;
-static int hf_ieee80211_he_phy_cap_full_bw_ul_mu_mimo = -1;
-static int hf_ieee80211_he_phy_cap_partial_bw_ul_mu_mimo = -1;
-static int hf_ieee80211_he_phy_b24_to_b39 = -1;
-static int hf_ieee80211_he_phy_cap_dcm_max_constellation_tx = -1;
-static int hf_ieee80211_he_phy_cap_dcm_max_nss_tx = -1;
-static int hf_ieee80211_he_phy_cap_dcm_max_constellation_rx = -1;
-static int hf_ieee80211_he_phy_cap_dcm_max_nss_rx = -1;
-static int hf_ieee80211_he_phy_cap_rx_partial_bw_su_20mhz_he_mu_ppdu = -1;
-static int hf_ieee80211_he_phy_cap_su_beamformer = -1;
-static int hf_ieee80211_he_phy_cap_su_beamformee = -1;
-static int hf_ieee80211_he_phy_cap_mu_beamformer = -1;
-static int hf_ieee80211_he_phy_cap_beamformee_sts_lte_80mhz = -1;
-static int hf_ieee80211_he_phy_cap_beamformee_sts_gt_80mhz = -1;
-static int hf_ieee80211_he_phy_b40_to_b55 = -1;
-static int hf_ieee80211_he_phy_cap_number_of_sounding_dims_lte_80 = -1;
-static int hf_ieee80211_he_phy_cap_number_of_sounding_dims_gt_80 = -1;
-static int hf_ieee80211_he_phy_cap_ng_eq_16_su_fb = -1;
-static int hf_ieee80211_he_phy_cap_ng_eq_16_mu_fb = -1;
-static int hf_ieee80211_he_phy_cap_codebook_size_eq_4_2_fb = -1;
-static int hf_ieee80211_he_phy_cap_codebook_size_eq_7_5_fb = -1;
-static int hf_ieee80211_he_phy_cap_triggered_su_beamforming_fb = -1;
-static int hf_ieee80211_he_phy_cap_triggered_mu_beamforming_fb = -1;
-static int hf_ieee80211_he_phy_cap_triggered_cqi_fb = -1;
-static int hf_ieee80211_he_phy_cap_partial_bw_extended_range = -1;
-static int hf_ieee80211_he_phy_cap_partial_bw_dl_mu_mimo = -1;
-static int hf_ieee80211_he_phy_cap_ppe_threshold_present = -1;
-static int hf_ieee80211_he_phy_b56_to_b71 = -1;
-static int hf_ieee80211_he_phy_cap_psr_based_sr_support = -1;
-static int hf_ieee80211_he_phy_cap_power_boost_factor_ar_support = -1;
-static int hf_ieee80211_he_phy_cap_he_su_ppdu_etc_gi = -1;
-static int hf_ieee80211_he_phy_cap_max_nc = -1;
-static int hf_ieee80211_he_phy_cap_stbc_tx_gt_80_mhz = -1;
-static int hf_ieee80211_he_phy_cap_stbc_rx_gt_80_mhz = -1;
-static int hf_ieee80211_he_phy_cap_he_er_su_ppdu_4xxx_gi = -1;
-static int hf_ieee80211_he_phy_cap_20mhz_in_40mhz_24ghz_band = -1;
-static int hf_ieee80211_he_phy_cap_20mhz_in_160_80p80_ppdu = -1;
-static int hf_ieee80211_he_phy_cap_80mgz_in_160_80p80_ppdu = -1;
-static int hf_ieee80211_he_phy_cap_he_er_su_ppdu_1xxx_gi = -1;
-static int hf_ieee80211_he_phy_cap_midamble_tx_rx_2x_xxx_ltf = -1;
-static int hf_ieee80211_he_phy_b72_to_b87 = -1;
-static int hf_ieee80211_he_phy_cap_dcm_max_ru = -1;
-static int hf_ieee80211_he_phy_cap_longer_than_16_he_sigb_ofdm_symbol_support = -1;
-static int hf_ieee80211_he_phy_cap_non_triggered_cqi_feedback = -1;
-static int hf_ieee80211_he_phy_cap_tx_1024_qam_242_tone_ru_support = -1;
-static int hf_ieee80211_he_phy_cap_rx_1024_qam_242_tone_ru_support = -1;
-static int hf_ieee80211_he_phy_cap_rx_full_bw_su_using_he_muppdu_w_compressed_sigb = -1;
-static int hf_ieee80211_he_phy_cap_rx_full_bw_su_using_he_muppdu_w_non_compressed_sigb = -1;
-static int hf_ieee80211_he_phy_cap_nominal_packet_padding = -1;
-static int hf_ieee80211_he_phy_cap_he_mu_ppdu_ru_rx_max = -1;
-static int hf_ieee80211_he_phy_cap_b81_b87_reserved = -1;
-static int hf_ieee80211_he_operation_parameter = -1;
-static int hf_ieee80211_he_operation_default_pe_duration = -1;
-static int hf_ieee80211_he_operation_twt_required = -1;
-static int hf_ieee80211_he_operation_txop_duration_rts_threshold = -1;
-static int hf_ieee80211_he_operation_vht_operation_information_present = -1;
-static int hf_ieee80211_he_operation_co_hosted_bss = -1;
-static int hf_ieee80211_he_operation_er_su_disable = -1;
-static int hf_ieee80211_he_operation_6ghz_operation_information_present = -1;
-static int hf_ieee80211_he_operation_reserved_b16_b23 = -1;
-static int hf_ieee80211_he_bss_color_information = -1;
-static int hf_ieee80211_he_bss_color_info_bss_color = -1;
-static int hf_ieee80211_he_bss_color_partial_bss_color = -1;
-static int hf_ieee80211_he_bss_color_bss_color_disabled = -1;
-static int hf_ieee80211_he_operation_basic_mcs = -1;
-static int hf_ieee80211_he_oper_max_he_mcs_for_1_ss = -1;
-static int hf_ieee80211_he_oper_max_he_mcs_for_2_ss = -1;
-static int hf_ieee80211_he_oper_max_he_mcs_for_3_ss = -1;
-static int hf_ieee80211_he_oper_max_he_mcs_for_4_ss = -1;
-static int hf_ieee80211_he_oper_max_he_mcs_for_5_ss = -1;
-static int hf_ieee80211_he_oper_max_he_mcs_for_6_ss = -1;
-static int hf_ieee80211_he_oper_max_he_mcs_for_7_ss = -1;
-static int hf_ieee80211_he_oper_max_he_mcs_for_8_ss = -1;
-static int hf_ieee80211_he_operation_channel_width = -1;
-static int hf_ieee80211_he_operation_channel_center_freq_0 = -1;
-static int hf_ieee80211_he_operation_channel_center_freq_1 = -1;
-static int hf_ieee80211_he_operation_max_co_hosted_bssid_indicator = -1;
-static int hf_ieee80211_he_operation_6ghz_primary_channel = -1;
-static int hf_ieee80211_he_operation_6ghz_control = -1;
-static int hf_ieee80211_he_operation_6ghz_control_channel_width = -1;
-static int hf_ieee80211_he_operation_6ghz_control_duplicate_beacon = -1;
-static int hf_ieee80211_he_operation_6ghz_control_regulatory_info = -1;
-static int hf_ieee80211_he_operation_6ghz_control_reserved = -1;
-static int hf_ieee80211_he_operation_6ghz_channel_center_freq_0 = -1;
-static int hf_ieee80211_he_operation_6ghz_channel_center_freq_1 = -1;
-static int hf_ieee80211_he_operation_6ghz_minimum_rate = -1;
-static int hf_ieee80211_he_muac_aci_aifsn = -1;
-static int hf_ieee80211_he_muac_aifsn = -1;
-static int hf_ieee80211_he_muac_acm = -1;
-static int hf_ieee80211_he_muac_aci = -1;
-static int hf_ieee80211_he_muac_reserved = -1;
-static int hf_ieee80211_he_mu_edca_timer = -1;
-static int hf_ieee80211_he_muac_ecwmin_ecwmax = -1;
-static int hf_ieee80211_he_srp_disallowed = -1;
-static int hf_ieee80211_he_non_srg_obss_pd_sr_disallowed = -1;
-static int hf_ieee80211_he_non_srg_offset_present = -1;
-static int hf_ieee80211_he_srg_information_present = -1;
-static int hf_ieee80211_he_hesiga_spatial_reuse_value15_allowed = -1;
-static int hf_ieee80211_he_sr_control_reserved = -1;
-static int hf_ieee80211_he_spatial_reuse_sr_control = -1;
-static int hf_ieee80211_he_spatial_non_srg_obss_pd_max_offset = -1;
-static int hf_ieee80211_he_spatial_srg_obss_pd_min_offset = -1;
-static int hf_ieee80211_he_spatial_srg_obss_pd_max_offset = -1;
-static int hf_ieee80211_he_spatial_srg_bss_color_bitmap = -1;
-static int hf_ieee80211_he_spatial_srg_partial_bssid_bitmap = -1;
-static int hf_ieee80211_he_ess_report_planned_ess = -1;
-static int hf_ieee80211_he_ess_report_edge_of_ess = -1;
-static int hf_ieee80211_he_resource_request_buffer_thresh = -1;
-static int hf_ieee80211_he_bss_color_change_new_color_info = -1;
-static int hf_ieee80211_he_new_bss_color_info_color = -1;
-static int hf_ieee80211_he_new_bss_color_info_reserved = -1;
-static int hf_ieee80211_he_bss_color_change_switch_countdown = -1;
-static int hf_ieee80211_he_ess_report_info_field = -1;
-static int hf_ieee80211_he_ess_report_recommend_transition_thresh = -1;
-static int hf_ieee80211_he_ops_duration = -1;
-static int hf_ieee80211_he_uora_field = -1;
-static int hf_ieee80211_he_uora_eocwmin = -1;
-static int hf_ieee80211_he_uora_owcwmax = -1;
-static int hf_ieee80211_he_uora_reserved = -1;
-
-static int hf_ieee80211_max_channel_switch_time = -1;
-
-static int hf_ieee80211_oci_operating_class = -1;
-static int hf_ieee80211_oci_primary_channel_number = -1;
-static int hf_ieee80211_oci_frequency_segment_1 = -1;
-static int hf_ieee80211_oci_oct_operating_class = -1;
-static int hf_ieee80211_oci_oct_primary_channel_number = -1;
-static int hf_ieee80211_oci_oct_frequency_segment_1 = -1;
-
-static int hf_ieee80211_multiple_bssid_configuration_bssid_count = -1;
-static int hf_ieee80211_multiple_bssid_configuration_full_set_rx_periodicity = -1;
-static int hf_ieee80211_known_bssid_bitmap = -1;
-static int hf_ieee80211_short_ssid = -1;
-
-static int hf_ieee80211_non_inheritance_element_id_list_length = -1;
-static int hf_ieee80211_non_inheritance_element_id_list_element_id = -1;
-static int hf_ieee80211_non_inheritance_element_id_ext_list_length = -1;
-static int hf_ieee80211_non_inheritance_element_id_ext_list_element_id_ext = -1;
-
-static int hf_ieee80211_rejected_groups_group = -1;
-
-static int hf_ieee80211_twt_bcast_flow = -1;
-static int hf_ieee80211_twt_individual_flow = -1;
-static int hf_ieee80211_twt_individual_flow_id = -1;
-static int hf_ieee80211_twt_individual_reserved = -1;
-static int hf_ieee80211_twt_bcast_id = -1;
-static int hf_ieee80211_twt_neg_type = -1;
-static int hf_ieee80211_twt_neg_type2_reserved1 = -1;
-static int hf_ieee80211_twt_neg_type2_reserved2 = -1;
-static int hf_ieee80211_twt_bcast_teardown_all = -1;
-static int hf_ieee80211_twt_bcast_teardown_all_twt = -1;
-static int hf_ieee80211_twt_bcast_twt_id_reserved = -1;
-static int hf_ieee80211_twt_bcast_neg_type_reserved = -1;
-
-static int hf_ieee80211_tag_twt_control_field = -1;
-static int hf_ieee80211_tag_twt_ndp_paging_indicator = -1;
-static int hf_ieee80211_tag_twt_responder_pm_mode = -1;
-static int hf_ieee80211_tag_twt_neg_type = -1;
-static int hf_ieee80211_tag_twt_info_frame_disabled = -1;
-static int hf_ieee80211_tag_twt_wake_duration_unit = -1;
-static int hf_ieee80211_tag_twt_link_id_bitmap_present = -1;
-static int hf_ieee80211_tag_twt_aligned_twt = -1;
-
-static int hf_ieee80211_tag_twt_req_type_field = -1;
-static int hf_ieee80211_tag_twt_req_type_req = -1;
-static int hf_ieee80211_tag_twt_req_type_setup_cmd = -1;
-static int hf_ieee80211_tag_twt_req_type_trigger = -1;
-static int hf_ieee80211_tag_twt_req_type_implicit = -1;
-static int hf_ieee80211_tag_twt_req_type_flow_type = -1;
-static int hf_ieee80211_tag_twt_req_type_flow_id = -1;
-static int hf_ieee80211_tag_twt_req_type_wake_int_exp = -1;
-static int hf_ieee80211_tag_twt_req_type_prot = -1;
-static int hf_ieee80211_tag_twt_req_type_last_bcst_parm_set = -1;
-static int hf_ieee80211_tag_twt_req_type_bcst_twt_recom = -1;
-static int hf_ieee80211_tag_twt_req_type_aligned = -1;
-
-static int hf_ieee80211_tag_twt_ndp_paging_field = -1;
-static int hf_ieee80211_tag_twt_ndp_paging_p_id = -1;
-static int hf_ieee80211_tag_twt_ndp_max_ndp_paging_period = -1;
-static int hf_ieee80211_tag_twt_ndp_partial_tsf_offset = -1;
-static int hf_ieee80211_tag_twt_ndp_action = -1;
-static int hf_ieee80211_tag_twt_ndp_min_sleep_duration = -1;
-static int hf_ieee80211_tag_twt_ndp_reserved = -1;
-static int hf_ieee80211_tag_twt_link_id_bitmap = -1;
-static int hf_ieee80211_tag_twt_aligned_twt_link_bitmap = -1;
-static int hf_ieee80211_tag_twt_broadcast_info = -1;
-static int hf_ieee80211_tag_twt_bcast_info_persistence = -1;
-static int hf_ieee80211_tag_twt_bcast_info_id = -1;
-static int hf_ieee80211_tag_twt_bcast_info_rtwt_traffic_present = -1;
-static int hf_ieee80211_tag_twt_bcast_info_rtwt_sche_info = -1;
-static int hf_ieee80211_tag_twt_traffic_info_control = -1;
-static int hf_ieee80211_tag_twt_traffic_info_dl_bitmap_valid = -1;
-static int hf_ieee80211_tag_twt_traffic_info_ul_bitmap_valid = -1;
-static int hf_ieee80211_tag_twt_traffic_info_reserved = -1;
-static int hf_ieee80211_tag_twt_traffic_info_rtwt_dl_bitmap = -1;
-static int hf_ieee80211_tag_twt_traffic_info_rtwt_ul_bitmap = -1;
-
-static int hf_ieee80211_tag_twt_target_wake_time = -1;
-static int hf_ieee80211_tag_twt_target_wake_time_short = -1;
-static int hf_ieee80211_tag_twt_nom_min_twt_wake_dur = -1;
-static int hf_ieee80211_tag_twt_wake_interval_mantissa = -1;
-static int hf_ieee80211_tag_twt_channel = -1;
-
-static int hf_ieee80211_tag_rsnx = -1;
+static int hf_ieee80211_he_mac_capabilities;
+static int hf_ieee80211_he_htc_he_support;
+static int hf_ieee80211_he_twt_requester_support;
+static int hf_ieee80211_he_twt_responder_support;
+static int hf_ieee80211_he_dynamic_fragmentation_support;
+static int hf_ieee80211_he_max_number_fragmented_msdus;
+static int hf_ieee80211_he_min_fragment_size;
+static int hf_ieee80211_he_trigger_frame_mac_padding_dur;
+static int hf_ieee80211_he_multi_tid_aggregation_rx_support;
+static int hf_ieee80211_he_he_link_adaptation_support;
+static int hf_ieee80211_he_all_ack_support;
+static int hf_ieee80211_he_trs_support;
+static int hf_ieee80211_he_bsr_support;
+static int hf_ieee80211_he_broadcast_twt_support;
+static int hf_ieee80211_he_32_bit_ba_bitmap_support;
+static int hf_ieee80211_he_mu_cascading_support;
+static int hf_ieee80211_he_ack_enabled_aggregation_support;
+static int hf_ieee80211_he_reserved_b24;
+static int hf_ieee80211_he_om_control_support;
+static int hf_ieee80211_he_ofdma_ra_support;
+static int hf_ieee80211_he_max_a_mpdu_length_exponent_ext;
+static int hf_ieee80211_he_a_msdu_fragmentation_support;
+static int hf_ieee80211_he_flexible_twt_schedule_support;
+static int hf_ieee80211_he_rx_control_frame_to_multibss;
+static int hf_ieee80211_he_bsrp_bqrp_a_mpdu_aggregation;
+static int hf_ieee80211_he_qtp_support;
+static int hf_ieee80211_he_bqr_support;
+static int hf_ieee80211_he_psr_responder;
+static int hf_ieee80211_he_ndp_feedback_report_support;
+static int hf_ieee80211_he_ops_support;
+static int hf_ieee80211_he_a_msdu_in_a_mpdu_support;
+static int hf_ieee80211_he_multi_tid_aggregation_tx_support;
+static int hf_ieee80211_he_subchannel_selective_trans_support;
+static int hf_ieee80211_he_2_996_tone_ru_support;
+static int hf_ieee80211_he_om_control_ul_mu_data_disable_rx_support;
+static int hf_ieee80211_he_dynamic_sm_power_save;
+static int hf_ieee80211_he_punctured_sounding_support;
+static int hf_ieee80211_he_ht_and_vht_trigger_frame_rx_support;
+static int hf_ieee80211_he_reserved_bit_18;
+static int hf_ieee80211_he_reserved_bit_19;
+static int hf_ieee80211_he_reserved_bit_25;
+static int hf_ieee80211_he_reserved_bit_29;
+static int hf_ieee80211_he_reserved_bit_34;
+static int hf_ieee80211_he_reserved_bits_5_7;
+static int hf_ieee80211_he_reserved_bits_8_9;
+static int hf_ieee80211_he_reserved_bits_15_16;
+static int hf_ieee80211_he_phy_reserved_b0;
+static int hf_ieee80211_he_phy_cap_reserved_b0;
+static int hf_ieee80211_he_phy_chan_width_set;
+static int hf_ieee80211_he_40mhz_channel_2_4ghz;
+static int hf_ieee80211_he_40_and_80_mhz_5ghz;
+static int hf_ieee80211_he_160_mhz_5ghz;
+static int hf_ieee80211_he_160_80_plus_80_mhz_5ghz;
+static int hf_ieee80211_he_242_tone_rus_in_2_4ghz;
+static int hf_ieee80211_he_242_tone_rus_in_5ghz;
+static int hf_ieee80211_he_5ghz_b0_reserved;
+static int hf_ieee80211_he_5ghz_b4_reserved;
+static int hf_ieee80211_he_24ghz_b1_reserved;
+static int hf_ieee80211_he_24ghz_b2_reserved;
+static int hf_ieee80211_he_24ghz_b3_reserved;
+static int hf_ieee80211_he_24ghz_b5_reserved;
+static int hf_ieee80211_he_chan_width_reserved;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_1_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_2_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_3_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_4_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_5_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_6_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_7_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_rx_8_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_1_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_2_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_3_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_4_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_5_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_6_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_7_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80_tx_8_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_1_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_2_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_3_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_4_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_5_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_6_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_7_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_rx_8_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_1_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_2_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_3_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_4_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_5_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_6_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_7_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_80p80_tx_8_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_1_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_2_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_3_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_4_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_5_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_6_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_7_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_rx_8_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_1_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_2_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_3_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_4_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_5_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_6_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_7_ss;
+static int hf_ieee80211_he_mcs_max_he_mcs_160_tx_8_ss;
+static int hf_ieee80211_he_rx_he_mcs_map_lte_80;
+static int hf_ieee80211_he_tx_he_mcs_map_lte_80;
+static int hf_ieee80211_he_rx_he_mcs_map_160;
+static int hf_ieee80211_he_tx_he_mcs_map_160;
+static int hf_ieee80211_he_rx_he_mcs_map_80_80;
+static int hf_ieee80211_he_tx_he_mcs_map_80_80;
+static int hf_ieee80211_he_ppe_thresholds_nss;
+static int hf_ieee80211_he_ppe_thresholds_ru_index_bitmask;
+static int hf_ieee80211_he_ppe_ppet16;
+static int hf_ieee80211_he_ppe_ppet8;
+static int hf_ieee80211_he_phy_b8_to_b23;
+static int hf_ieee80211_he_phy_cap_punctured_preamble_rx;
+static int hf_ieee80211_he_phy_cap_device_class;
+static int hf_ieee80211_he_phy_cap_ldpc_coding_in_payload;
+static int hf_ieee80211_he_phy_cap_he_su_ppdu_1x_he_ltf_08us;
+static int hf_ieee80211_he_phy_cap_midamble_tx_rx_max_nsts;
+static int hf_ieee80211_he_phy_cap_ndp_with_4x_he_ltf_32us;
+static int hf_ieee80211_he_phy_cap_stbc_tx_lt_80mhz;
+static int hf_ieee80211_he_phy_cap_stbc_rx_lt_80mhz;
+static int hf_ieee80211_he_phy_cap_doppler_tx;
+static int hf_ieee80211_he_phy_cap_doppler_rx;
+static int hf_ieee80211_he_phy_cap_full_bw_ul_mu_mimo;
+static int hf_ieee80211_he_phy_cap_partial_bw_ul_mu_mimo;
+static int hf_ieee80211_he_phy_b24_to_b39;
+static int hf_ieee80211_he_phy_cap_dcm_max_constellation_tx;
+static int hf_ieee80211_he_phy_cap_dcm_max_nss_tx;
+static int hf_ieee80211_he_phy_cap_dcm_max_constellation_rx;
+static int hf_ieee80211_he_phy_cap_dcm_max_nss_rx;
+static int hf_ieee80211_he_phy_cap_rx_partial_bw_su_20mhz_he_mu_ppdu;
+static int hf_ieee80211_he_phy_cap_su_beamformer;
+static int hf_ieee80211_he_phy_cap_su_beamformee;
+static int hf_ieee80211_he_phy_cap_mu_beamformer;
+static int hf_ieee80211_he_phy_cap_beamformee_sts_lte_80mhz;
+static int hf_ieee80211_he_phy_cap_beamformee_sts_gt_80mhz;
+static int hf_ieee80211_he_phy_b40_to_b55;
+static int hf_ieee80211_he_phy_cap_number_of_sounding_dims_lte_80;
+static int hf_ieee80211_he_phy_cap_number_of_sounding_dims_gt_80;
+static int hf_ieee80211_he_phy_cap_ng_eq_16_su_fb;
+static int hf_ieee80211_he_phy_cap_ng_eq_16_mu_fb;
+static int hf_ieee80211_he_phy_cap_codebook_size_eq_4_2_fb;
+static int hf_ieee80211_he_phy_cap_codebook_size_eq_7_5_fb;
+static int hf_ieee80211_he_phy_cap_triggered_su_beamforming_fb;
+static int hf_ieee80211_he_phy_cap_triggered_mu_beamforming_fb;
+static int hf_ieee80211_he_phy_cap_triggered_cqi_fb;
+static int hf_ieee80211_he_phy_cap_partial_bw_extended_range;
+static int hf_ieee80211_he_phy_cap_partial_bw_dl_mu_mimo;
+static int hf_ieee80211_he_phy_cap_ppe_threshold_present;
+static int hf_ieee80211_he_phy_b56_to_b71;
+static int hf_ieee80211_he_phy_cap_psr_based_sr_support;
+static int hf_ieee80211_he_phy_cap_power_boost_factor_ar_support;
+static int hf_ieee80211_he_phy_cap_he_su_ppdu_etc_gi;
+static int hf_ieee80211_he_phy_cap_max_nc;
+static int hf_ieee80211_he_phy_cap_stbc_tx_gt_80_mhz;
+static int hf_ieee80211_he_phy_cap_stbc_rx_gt_80_mhz;
+static int hf_ieee80211_he_phy_cap_he_er_su_ppdu_4xxx_gi;
+static int hf_ieee80211_he_phy_cap_20mhz_in_40mhz_24ghz_band;
+static int hf_ieee80211_he_phy_cap_20mhz_in_160_80p80_ppdu;
+static int hf_ieee80211_he_phy_cap_80mgz_in_160_80p80_ppdu;
+static int hf_ieee80211_he_phy_cap_he_er_su_ppdu_1xxx_gi;
+static int hf_ieee80211_he_phy_cap_midamble_tx_rx_2x_xxx_ltf;
+static int hf_ieee80211_he_phy_b72_to_b87;
+static int hf_ieee80211_he_phy_cap_dcm_max_ru;
+static int hf_ieee80211_he_phy_cap_longer_than_16_he_sigb_ofdm_symbol_support;
+static int hf_ieee80211_he_phy_cap_non_triggered_cqi_feedback;
+static int hf_ieee80211_he_phy_cap_tx_1024_qam_242_tone_ru_support;
+static int hf_ieee80211_he_phy_cap_rx_1024_qam_242_tone_ru_support;
+static int hf_ieee80211_he_phy_cap_rx_full_bw_su_using_he_muppdu_w_compressed_sigb;
+static int hf_ieee80211_he_phy_cap_rx_full_bw_su_using_he_muppdu_w_non_compressed_sigb;
+static int hf_ieee80211_he_phy_cap_nominal_packet_padding;
+static int hf_ieee80211_he_phy_cap_he_mu_ppdu_ru_rx_max;
+static int hf_ieee80211_he_phy_cap_b81_b87_reserved;
+static int hf_ieee80211_he_operation_parameter;
+static int hf_ieee80211_he_operation_default_pe_duration;
+static int hf_ieee80211_he_operation_twt_required;
+static int hf_ieee80211_he_operation_txop_duration_rts_threshold;
+static int hf_ieee80211_he_operation_vht_operation_information_present;
+static int hf_ieee80211_he_operation_co_hosted_bss;
+static int hf_ieee80211_he_operation_er_su_disable;
+static int hf_ieee80211_he_operation_6ghz_operation_information_present;
+static int hf_ieee80211_he_operation_reserved_b16_b23;
+static int hf_ieee80211_he_bss_color_information;
+static int hf_ieee80211_he_bss_color_info_bss_color;
+static int hf_ieee80211_he_bss_color_partial_bss_color;
+static int hf_ieee80211_he_bss_color_bss_color_disabled;
+static int hf_ieee80211_he_operation_basic_mcs;
+static int hf_ieee80211_he_oper_max_he_mcs_for_1_ss;
+static int hf_ieee80211_he_oper_max_he_mcs_for_2_ss;
+static int hf_ieee80211_he_oper_max_he_mcs_for_3_ss;
+static int hf_ieee80211_he_oper_max_he_mcs_for_4_ss;
+static int hf_ieee80211_he_oper_max_he_mcs_for_5_ss;
+static int hf_ieee80211_he_oper_max_he_mcs_for_6_ss;
+static int hf_ieee80211_he_oper_max_he_mcs_for_7_ss;
+static int hf_ieee80211_he_oper_max_he_mcs_for_8_ss;
+static int hf_ieee80211_he_operation_channel_width;
+static int hf_ieee80211_he_operation_channel_center_freq_0;
+static int hf_ieee80211_he_operation_channel_center_freq_1;
+static int hf_ieee80211_he_operation_max_co_hosted_bssid_indicator;
+static int hf_ieee80211_he_operation_6ghz_primary_channel;
+static int hf_ieee80211_he_operation_6ghz_control;
+static int hf_ieee80211_he_operation_6ghz_control_channel_width;
+static int hf_ieee80211_he_operation_6ghz_control_duplicate_beacon;
+static int hf_ieee80211_he_operation_6ghz_control_regulatory_info;
+static int hf_ieee80211_he_operation_6ghz_control_reserved;
+static int hf_ieee80211_he_operation_6ghz_channel_center_freq_0;
+static int hf_ieee80211_he_operation_6ghz_channel_center_freq_1;
+static int hf_ieee80211_he_operation_6ghz_minimum_rate;
+static int hf_ieee80211_he_muac_aci_aifsn;
+static int hf_ieee80211_he_muac_aifsn;
+static int hf_ieee80211_he_muac_acm;
+static int hf_ieee80211_he_muac_aci;
+static int hf_ieee80211_he_muac_reserved;
+static int hf_ieee80211_he_mu_edca_timer;
+static int hf_ieee80211_he_muac_ecwmin_ecwmax;
+static int hf_ieee80211_he_srp_disallowed;
+static int hf_ieee80211_he_non_srg_obss_pd_sr_disallowed;
+static int hf_ieee80211_he_non_srg_offset_present;
+static int hf_ieee80211_he_srg_information_present;
+static int hf_ieee80211_he_hesiga_spatial_reuse_value15_allowed;
+static int hf_ieee80211_he_sr_control_reserved;
+static int hf_ieee80211_he_spatial_reuse_sr_control;
+static int hf_ieee80211_he_spatial_non_srg_obss_pd_max_offset;
+static int hf_ieee80211_he_spatial_srg_obss_pd_min_offset;
+static int hf_ieee80211_he_spatial_srg_obss_pd_max_offset;
+static int hf_ieee80211_he_spatial_srg_bss_color_bitmap;
+static int hf_ieee80211_he_spatial_srg_partial_bssid_bitmap;
+static int hf_ieee80211_he_ess_report_planned_ess;
+static int hf_ieee80211_he_ess_report_edge_of_ess;
+static int hf_ieee80211_he_resource_request_buffer_thresh;
+static int hf_ieee80211_he_bss_color_change_new_color_info;
+static int hf_ieee80211_he_new_bss_color_info_color;
+static int hf_ieee80211_he_new_bss_color_info_reserved;
+static int hf_ieee80211_he_bss_color_change_switch_countdown;
+static int hf_ieee80211_he_ess_report_info_field;
+static int hf_ieee80211_he_ess_report_recommend_transition_thresh;
+static int hf_ieee80211_he_ops_duration;
+static int hf_ieee80211_he_uora_field;
+static int hf_ieee80211_he_uora_eocwmin;
+static int hf_ieee80211_he_uora_owcwmax;
+static int hf_ieee80211_he_uora_reserved;
+
+static int hf_ieee80211_max_channel_switch_time;
+
+static int hf_ieee80211_oci_operating_class;
+static int hf_ieee80211_oci_primary_channel_number;
+static int hf_ieee80211_oci_frequency_segment_1;
+static int hf_ieee80211_oci_oct_operating_class;
+static int hf_ieee80211_oci_oct_primary_channel_number;
+static int hf_ieee80211_oci_oct_frequency_segment_1;
+
+static int hf_ieee80211_multiple_bssid_configuration_bssid_count;
+static int hf_ieee80211_multiple_bssid_configuration_full_set_rx_periodicity;
+static int hf_ieee80211_known_bssid_bitmap;
+static int hf_ieee80211_short_ssid;
+
+static int hf_ieee80211_non_inheritance_element_id_list_length;
+static int hf_ieee80211_non_inheritance_element_id_list_element_id;
+static int hf_ieee80211_non_inheritance_element_id_ext_list_length;
+static int hf_ieee80211_non_inheritance_element_id_ext_list_element_id_ext;
+
+static int hf_ieee80211_rejected_groups_group;
+
+static int hf_ieee80211_twt_bcast_flow;
+static int hf_ieee80211_twt_individual_flow;
+static int hf_ieee80211_twt_individual_flow_id;
+static int hf_ieee80211_twt_individual_reserved;
+static int hf_ieee80211_twt_bcast_id;
+static int hf_ieee80211_twt_neg_type;
+static int hf_ieee80211_twt_neg_type2_reserved1;
+static int hf_ieee80211_twt_neg_type2_reserved2;
+static int hf_ieee80211_twt_bcast_teardown_all;
+static int hf_ieee80211_twt_bcast_teardown_all_twt;
+static int hf_ieee80211_twt_bcast_twt_id_reserved;
+static int hf_ieee80211_twt_bcast_neg_type_reserved;
+
+static int hf_ieee80211_tag_twt_control_field;
+static int hf_ieee80211_tag_twt_ndp_paging_indicator;
+static int hf_ieee80211_tag_twt_responder_pm_mode;
+static int hf_ieee80211_tag_twt_neg_type;
+static int hf_ieee80211_tag_twt_info_frame_disabled;
+static int hf_ieee80211_tag_twt_wake_duration_unit;
+static int hf_ieee80211_tag_twt_link_id_bitmap_present;
+static int hf_ieee80211_tag_twt_aligned_twt;
+
+static int hf_ieee80211_tag_twt_req_type_field;
+static int hf_ieee80211_tag_twt_req_type_req;
+static int hf_ieee80211_tag_twt_req_type_setup_cmd;
+static int hf_ieee80211_tag_twt_req_type_trigger;
+static int hf_ieee80211_tag_twt_req_type_implicit;
+static int hf_ieee80211_tag_twt_req_type_flow_type;
+static int hf_ieee80211_tag_twt_req_type_flow_id;
+static int hf_ieee80211_tag_twt_req_type_wake_int_exp;
+static int hf_ieee80211_tag_twt_req_type_prot;
+static int hf_ieee80211_tag_twt_req_type_last_bcst_parm_set;
+static int hf_ieee80211_tag_twt_req_type_bcst_twt_recom;
+static int hf_ieee80211_tag_twt_req_type_aligned;
+
+static int hf_ieee80211_tag_twt_ndp_paging_field;
+static int hf_ieee80211_tag_twt_ndp_paging_p_id;
+static int hf_ieee80211_tag_twt_ndp_max_ndp_paging_period;
+static int hf_ieee80211_tag_twt_ndp_partial_tsf_offset;
+static int hf_ieee80211_tag_twt_ndp_action;
+static int hf_ieee80211_tag_twt_ndp_min_sleep_duration;
+static int hf_ieee80211_tag_twt_ndp_reserved;
+static int hf_ieee80211_tag_twt_link_id_bitmap;
+static int hf_ieee80211_tag_twt_aligned_twt_link_bitmap;
+static int hf_ieee80211_tag_twt_broadcast_info;
+static int hf_ieee80211_tag_twt_bcast_info_persistence;
+static int hf_ieee80211_tag_twt_bcast_info_id;
+static int hf_ieee80211_tag_twt_bcast_info_rtwt_traffic_present;
+static int hf_ieee80211_tag_twt_bcast_info_rtwt_sche_info;
+static int hf_ieee80211_tag_twt_traffic_info_control;
+static int hf_ieee80211_tag_twt_traffic_info_dl_bitmap_valid;
+static int hf_ieee80211_tag_twt_traffic_info_ul_bitmap_valid;
+static int hf_ieee80211_tag_twt_traffic_info_reserved;
+static int hf_ieee80211_tag_twt_traffic_info_rtwt_dl_bitmap;
+static int hf_ieee80211_tag_twt_traffic_info_rtwt_ul_bitmap;
+
+static int hf_ieee80211_tag_twt_target_wake_time;
+static int hf_ieee80211_tag_twt_target_wake_time_short;
+static int hf_ieee80211_tag_twt_nom_min_twt_wake_dur;
+static int hf_ieee80211_tag_twt_wake_interval_mantissa;
+static int hf_ieee80211_tag_twt_channel;
+
+static int hf_ieee80211_tag_rsnx;
 /* octet 1 */
-static int hf_ieee80211_tag_rsnx_length = -1;
-static int hf_ieee80211_tag_rsnx_protected_twt_operations_support = -1;
-static int hf_ieee80211_tag_rsnx_sae_hash_to_element = -1;
-static int hf_ieee80211_tag_rsnx_reserved_b6b7 = -1;
+static int hf_ieee80211_tag_rsnx_length;
+static int hf_ieee80211_tag_rsnx_protected_twt_operations_support;
+static int hf_ieee80211_tag_rsnx_sae_hash_to_element;
+static int hf_ieee80211_tag_rsnx_reserved_b6b7;
 /* octet 2 */
-static int hf_ieee80211_tag_rsnx_secure_ltf_support = -1;
-static int hf_ieee80211_tag_rsnx_secure_rtt_supported = -1;
-static int hf_ieee80211_tag_rsnx_range_protection_required = -1;
-static int hf_ieee80211_tag_rsnx_reserved_b11thru15 = -1;
-static int hf_ieee80211_tag_rsnx_reserved = -1;
+static int hf_ieee80211_tag_rsnx_secure_ltf_support;
+static int hf_ieee80211_tag_rsnx_secure_rtt_supported;
+static int hf_ieee80211_tag_rsnx_range_protection_required;
+static int hf_ieee80211_tag_rsnx_reserved_b11thru15;
+static int hf_ieee80211_tag_rsnx_reserved;
 
 
 /* ************************************************************************* */
 /*                              RFC 8110 fields                              */
 /* ************************************************************************* */
-static int hf_ieee80211_owe_dh_parameter_group = -1;
-static int hf_ieee80211_owe_dh_parameter_public_key = -1;
+static int hf_ieee80211_owe_dh_parameter_group;
+static int hf_ieee80211_owe_dh_parameter_public_key;
 
 /* ************************************************************************* */
 /*                               Protocol trees                              */
 /* ************************************************************************* */
-static gint ett_80211 = -1;
-static gint ett_proto_flags = -1;
-static gint ett_cap_tree = -1;
-static gint ett_fc_tree = -1;
-static gint ett_cntrl_wrapper_fc = -1;
-static gint ett_cntrl_wrapper_payload = -1;
-static gint ett_fragments = -1;
-static gint ett_fragment = -1;
-static gint ett_block_ack = -1;
-static gint ett_block_ack_tid = -1;
-static gint ett_block_ack_request_control = -1;
-static gint ett_block_ack_bitmap = -1;
-static gint ett_block_ack_request_multi_sta_aid_tid = -1;
-static gint ett_multi_sta_block_ack = -1;
-static gint ett_ath_cap_tree = -1;
-static gint ett_extreme_mesh_services_tree = -1;
-static gint ett_addr = -1;
-
-static gint ett_80211_mgt = -1;
-static gint ett_fixed_parameters = -1;
-static gint ett_tagged_parameters = -1;
-static gint ett_tag_bmapctl_tree = -1;
-static gint ett_s1g_pvb_tree = -1;
-static gint ett_s1g_pvb_eb_tree = -1;
-static gint ett_s1g_pvb_block_control_byte = -1;
-static gint ett_s1g_pvb_block_bitmap_tree = -1;
-static gint ett_s1g_pvb_subblock_tree = -1;
-static gint ett_s1g_pvb_olb_tree = -1;
-static gint ett_s1g_pvb_olb_subblock = -1;
-static gint ett_s1g_pvb_ade_tree = -1;
-static gint ett_s1g_pvb_ade_control = -1;
-static gint ett_tag_country_fnm_tree = -1;
-static gint ett_tag_country_rcc_tree = -1;
-static gint ett_qos_parameters = -1;
-static gint ett_qos_ps_buf_state = -1;
-static gint ett_wep_parameters = -1;
-static gint ett_msh_control = -1;
-static gint ett_hwmp_targ_flags_tree = -1;
-static gint ett_mesh_chswitch_flag_tree = -1;
-static gint ett_mesh_config_cap_tree = -1;
-static gint ett_mesh_formation_info_tree = -1;
-static gint ett_bcn_timing_rctrl_tree = -1;
-static gint ett_bcn_timing_info_tree = -1;
-static gint ett_gann_flags_tree = -1;
-static gint ett_pxu_proxy_info_tree = -1;
-static gint ett_pxu_proxy_info_flags_tree = -1;
-
-static gint ett_rsn_gcs_tree = -1;
-static gint ett_rsn_pcs_tree = -1;
-static gint ett_rsn_sub_pcs_tree = -1;
-static gint ett_rsn_akms_tree = -1;
-static gint ett_rsn_sub_akms_tree = -1;
-static gint ett_rsn_cap_tree = -1;
-static gint ett_rsn_pmkid_tree = -1;
-static gint ett_rsn_gmcs_tree = -1;
-
-static gint ett_kde_mlo_link_info = -1;
-
-static gint ett_wpa_mcs_tree = -1;
-static gint ett_wpa_ucs_tree = -1;
-static gint ett_wpa_sub_ucs_tree = -1;
-static gint ett_wpa_akms_tree = -1;
-static gint ett_wpa_sub_akms_tree = -1;
-static gint ett_wme_ac = -1;
-static gint ett_wme_aci_aifsn = -1;
-static gint ett_wme_ecw = -1;
-static gint ett_wme_qos_info = -1;
-
-static gint ett_update_edca_info = -1;
-
-static gint ett_ht_cap_tree = -1;
-static gint ett_ampduparam_tree = -1;
-static gint ett_mcsset_tree = -1;
-static gint ett_mcsbit_tree = -1;
-static gint ett_htex_cap_tree = -1;
-static gint ett_txbf_tree = -1;
-static gint ett_antsel_tree = -1;
-static gint ett_hta_cap_tree = -1;
-static gint ett_hta_cap1_tree = -1;
-static gint ett_hta_cap2_tree = -1;
-
-static gint ett_s1g_ndp = -1;
-static gint ett_s1g_ndp_ack = -1;
-static gint ett_s1g_ndp_cts = -1;
-static gint ett_s1g_ndp_cf_end = -1;
-static gint ett_s1g_ndp_ps_poll = -1;
-static gint ett_s1g_ndp_ps_poll_ack = -1;
-static gint ett_s1g_ndp_block_ack = -1;
-static gint ett_s1g_ndp_beamforming_report_poll = -1;
-static gint ett_s1g_ndp_paging = -1;
-static gint ett_s1g_ndp_probe = -1;
-static gint ett_pv1_sid = -1;
-static gint ett_pv1_sid_field = -1;
-static gint ett_pv1_seq_control = -1;
-static gint ett_ieee80211_s1g_capabilities_info = -1;
-static gint ett_ieee80211_s1g_capabilities = -1;
-static gint ett_s1g_cap_byte1 = -1;
-static gint ett_s1g_cap_byte2 = -1;
-static gint ett_s1g_cap_byte3 = -1;
-static gint ett_s1g_cap_byte4 = -1;
-static gint ett_s1g_cap_byte5 = -1;
-static gint ett_s1g_cap_byte6 = -1;
-static gint ett_s1g_cap_byte7 = -1;
-static gint ett_s1g_cap_byte8 = -1;
-static gint ett_s1g_cap_byte9 = -1;
-static gint ett_s1g_cap_byte10 = -1;
-static gint ett_ieee80211_s1g_sup_mcs_and_nss_set = -1;
-static gint ett_s1g_mcs_and_mcs_set = -1;
-static gint ett_s1g_operation_info = -1;
-static gint ett_s1g_channel_width = -1;
-static gint ett_s1g_subchannel_selective_transmission = -1;
-static gint ett_s1g_raw_control = -1;
-static gint ett_s1g_raw_slot_def = -1;
-static gint ett_s1g_raw_group_subfield = -1;
-static gint ett_s1g_raw_channel_indication = -1;
-static gint ett_s1g_page_slice_control = -1;
-static gint ett_s1g_aid_request_mode = -1;
-static gint ett_s1g_aid_characteristic = -1;
-static gint ett_s1g_sector_operation = -1;
-static gint ett_tack_info = -1;
-static gint ett_ieee80211_s1g_auth_control = -1;
-static gint ett_s1g_relay_control = -1;
-static gint ett_s1g_relay_function = -1;
-static gint ett_ieee80211_s1g_addr_list = -1;
-static gint ett_ieee80211_s1g_reach_addr = -1;
-static gint ett_s1g_relay_discovery_control = -1;
-static gint ett_ieee80211_s1g_aid_entry = -1;
-static gint ett_s1g_probe_resp_subfield_0 = -1;
-static gint ett_s1g_header_comp_control = -1;
-static gint ett_pv1_mgmt_action = -1;
-static gint ett_pv1_mgmt_action_no_ack = -1;
-static gint ett_pv1_cntl_stack = -1;
-static gint ett_pv1_cntl_bat = -1;
-
-static gint ett_htc_tree = -1;
-static gint ett_htc_he_a_control = -1;
-static gint ett_mfb_subtree = -1;
-static gint ett_lac_subtree = -1;
-static gint ett_ieee80211_buffer_status_report = -1;
-static gint ett_ieee80211_a_control_padding = -1;
-static gint ett_ieee80211_a_control_ones = -1;
-static gint ett_ieee80211_triggered_response_schedule = -1;
-static gint ett_ieee80211_control_om = -1;
-static gint ett_ieee80211_hla_control = -1;
-static gint ett_ieee80211_control_uph = -1;
-static gint ett_ieee80211_buffer_control_bqr = -1;
-static gint ett_ieee80211_control_cci = -1;
-static gint ett_ieee80211_control_eht_om = -1;
-static gint ett_ieee80211_control_srs = -1;
-static gint ett_ieee80211_control_aar = -1;
-
-static gint ett_vht_cap_tree = -1;
-static gint ett_vht_mcsset_tree = -1;
-static gint ett_vht_rx_mcsbit_tree = -1;
-static gint ett_vht_tx_mcsbit_tree = -1;
-static gint ett_vht_basic_mcsbit_tree = -1;
-static gint ett_vht_op_tree = -1;
-static gint ett_vht_tpe_info_tree = -1;
-static gint ett_tpe_psd = -1;
-
-static gint ett_vht_ranging_annc = -1;
-static gint ett_ndp_ranging_annc_sta_info = -1;
-
-static gint ett_ff_he_action = -1;
-static gint ett_ff_protected_he_action = -1;
-static gint ett_ff_protected_eht_action = -1;
-static gint ett_ff_he_mimo_control = -1;
-static gint ett_ff_he_mimo_beamforming_report_snr = -1;
-static gint ett_ff_he_mimo_feedback_matrices = -1;
-
-static gint ett_ff_vhtmimo_cntrl = -1;
-static gint ett_ff_vhtmimo_beamforming_report = -1;
-static gint ett_ff_vhtmimo_beamforming_report_snr = -1;
-static gint ett_ff_vhtmimo_beamforming_angle = -1;
-static gint ett_ff_vhtmimo_beamforming_report_feedback_matrices = -1;
-static gint ett_ff_vhtmu_exclusive_beamforming_report_matrices = -1;
-
-static gint ett_vht_grpidmgmt = -1;
-static gint ett_vht_msa = -1;
-static gint ett_vht_upa = -1;
-
-static gint ett_ht_info_delimiter1_tree = -1;
-static gint ett_ht_info_delimiter2_tree = -1;
-static gint ett_ht_info_delimiter3_tree = -1;
-
-static gint ett_ff_ftm_param_delim1 = -1;
-static gint ett_ff_ftm_param_delim2 = -1;
-static gint ett_ff_ftm_param_delim3 = -1;
-static gint ett_ff_ftm_tod_err1 = -1;
-static gint ett_ff_ftm_toa_err1 = -1;
-static gint ett_tag_ranging = -1;
-static gint ett_tag_ranging_ntb = -1;
-
-static gint ett_ranging_subelement_tree = -1;
-
-static gint ett_tag_direct_meas_results = -1;
-
-static gint ett_rsta_avail_header = -1;
-static gint ett_rsta_avail_tree = -1;
-static gint ett_rsta_avail_subfield = -1;
-
-static gint ett_pasn_parameters = -1;
-static gint ett_pasn_comeback_tree = -1;
-
-static gint ett_pasn_auth_frame = -1;
+static gint ett_80211;
+static gint ett_proto_flags;
+static gint ett_cap_tree;
+static gint ett_fc_tree;
+static gint ett_cntrl_wrapper_fc;
+static gint ett_cntrl_wrapper_payload;
+static gint ett_fragments;
+static gint ett_fragment;
+static gint ett_block_ack;
+static gint ett_block_ack_tid;
+static gint ett_block_ack_request_control;
+static gint ett_block_ack_bitmap;
+static gint ett_block_ack_request_multi_sta_aid_tid;
+static gint ett_multi_sta_block_ack;
+static gint ett_ath_cap_tree;
+static gint ett_extreme_mesh_services_tree;
+static gint ett_addr;
+
+static gint ett_80211_mgt;
+static gint ett_fixed_parameters;
+static gint ett_tagged_parameters;
+static gint ett_tag_bmapctl_tree;
+static gint ett_s1g_pvb_tree;
+static gint ett_s1g_pvb_eb_tree;
+static gint ett_s1g_pvb_block_control_byte;
+static gint ett_s1g_pvb_block_bitmap_tree;
+static gint ett_s1g_pvb_subblock_tree;
+static gint ett_s1g_pvb_olb_tree;
+static gint ett_s1g_pvb_olb_subblock;
+static gint ett_s1g_pvb_ade_tree;
+static gint ett_s1g_pvb_ade_control;
+static gint ett_tag_country_fnm_tree;
+static gint ett_tag_country_rcc_tree;
+static gint ett_qos_parameters;
+static gint ett_qos_ps_buf_state;
+static gint ett_wep_parameters;
+static gint ett_msh_control;
+static gint ett_hwmp_targ_flags_tree;
+static gint ett_mesh_chswitch_flag_tree;
+static gint ett_mesh_config_cap_tree;
+static gint ett_mesh_formation_info_tree;
+static gint ett_bcn_timing_rctrl_tree;
+static gint ett_bcn_timing_info_tree;
+static gint ett_gann_flags_tree;
+static gint ett_pxu_proxy_info_tree;
+static gint ett_pxu_proxy_info_flags_tree;
+
+static gint ett_rsn_gcs_tree;
+static gint ett_rsn_pcs_tree;
+static gint ett_rsn_sub_pcs_tree;
+static gint ett_rsn_akms_tree;
+static gint ett_rsn_sub_akms_tree;
+static gint ett_rsn_cap_tree;
+static gint ett_rsn_pmkid_tree;
+static gint ett_rsn_gmcs_tree;
+
+static gint ett_kde_mlo_link_info;
+
+static gint ett_wpa_mcs_tree;
+static gint ett_wpa_ucs_tree;
+static gint ett_wpa_sub_ucs_tree;
+static gint ett_wpa_akms_tree;
+static gint ett_wpa_sub_akms_tree;
+static gint ett_wme_ac;
+static gint ett_wme_aci_aifsn;
+static gint ett_wme_ecw;
+static gint ett_wme_qos_info;
+
+static gint ett_update_edca_info;
+
+static gint ett_ht_cap_tree;
+static gint ett_ampduparam_tree;
+static gint ett_mcsset_tree;
+static gint ett_mcsbit_tree;
+static gint ett_htex_cap_tree;
+static gint ett_txbf_tree;
+static gint ett_antsel_tree;
+static gint ett_hta_cap_tree;
+static gint ett_hta_cap1_tree;
+static gint ett_hta_cap2_tree;
+
+static gint ett_s1g_ndp;
+static gint ett_s1g_ndp_ack;
+static gint ett_s1g_ndp_cts;
+static gint ett_s1g_ndp_cf_end;
+static gint ett_s1g_ndp_ps_poll;
+static gint ett_s1g_ndp_ps_poll_ack;
+static gint ett_s1g_ndp_block_ack;
+static gint ett_s1g_ndp_beamforming_report_poll;
+static gint ett_s1g_ndp_paging;
+static gint ett_s1g_ndp_probe;
+static gint ett_pv1_sid;
+static gint ett_pv1_sid_field;
+static gint ett_pv1_seq_control;
+static gint ett_ieee80211_s1g_capabilities_info;
+static gint ett_ieee80211_s1g_capabilities;
+static gint ett_s1g_cap_byte1;
+static gint ett_s1g_cap_byte2;
+static gint ett_s1g_cap_byte3;
+static gint ett_s1g_cap_byte4;
+static gint ett_s1g_cap_byte5;
+static gint ett_s1g_cap_byte6;
+static gint ett_s1g_cap_byte7;
+static gint ett_s1g_cap_byte8;
+static gint ett_s1g_cap_byte9;
+static gint ett_s1g_cap_byte10;
+static gint ett_ieee80211_s1g_sup_mcs_and_nss_set;
+static gint ett_s1g_mcs_and_mcs_set;
+static gint ett_s1g_operation_info;
+static gint ett_s1g_channel_width;
+static gint ett_s1g_subchannel_selective_transmission;
+static gint ett_s1g_raw_control;
+static gint ett_s1g_raw_slot_def;
+static gint ett_s1g_raw_group_subfield;
+static gint ett_s1g_raw_channel_indication;
+static gint ett_s1g_page_slice_control;
+static gint ett_s1g_aid_request_mode;
+static gint ett_s1g_aid_characteristic;
+static gint ett_s1g_sector_operation;
+static gint ett_tack_info;
+static gint ett_ieee80211_s1g_auth_control;
+static gint ett_s1g_relay_control;
+static gint ett_s1g_relay_function;
+static gint ett_ieee80211_s1g_addr_list;
+static gint ett_ieee80211_s1g_reach_addr;
+static gint ett_s1g_relay_discovery_control;
+static gint ett_ieee80211_s1g_aid_entry;
+static gint ett_s1g_probe_resp_subfield_0;
+static gint ett_s1g_header_comp_control;
+static gint ett_pv1_mgmt_action;
+static gint ett_pv1_mgmt_action_no_ack;
+static gint ett_pv1_cntl_stack;
+static gint ett_pv1_cntl_bat;
+
+static gint ett_htc_tree;
+static gint ett_htc_he_a_control;
+static gint ett_mfb_subtree;
+static gint ett_lac_subtree;
+static gint ett_ieee80211_buffer_status_report;
+static gint ett_ieee80211_a_control_padding;
+static gint ett_ieee80211_a_control_ones;
+static gint ett_ieee80211_triggered_response_schedule;
+static gint ett_ieee80211_control_om;
+static gint ett_ieee80211_hla_control;
+static gint ett_ieee80211_control_uph;
+static gint ett_ieee80211_buffer_control_bqr;
+static gint ett_ieee80211_control_cci;
+static gint ett_ieee80211_control_eht_om;
+static gint ett_ieee80211_control_srs;
+static gint ett_ieee80211_control_aar;
+
+static gint ett_vht_cap_tree;
+static gint ett_vht_mcsset_tree;
+static gint ett_vht_rx_mcsbit_tree;
+static gint ett_vht_tx_mcsbit_tree;
+static gint ett_vht_basic_mcsbit_tree;
+static gint ett_vht_op_tree;
+static gint ett_vht_tpe_info_tree;
+static gint ett_tpe_psd;
+
+static gint ett_vht_ranging_annc;
+static gint ett_ndp_ranging_annc_sta_info;
+
+static gint ett_ff_he_action;
+static gint ett_ff_protected_he_action;
+static gint ett_ff_protected_eht_action;
+static gint ett_ff_he_mimo_control;
+static gint ett_ff_he_mimo_beamforming_report_snr;
+static gint ett_ff_he_mimo_feedback_matrices;
+
+static gint ett_ff_vhtmimo_cntrl;
+static gint ett_ff_vhtmimo_beamforming_report;
+static gint ett_ff_vhtmimo_beamforming_report_snr;
+static gint ett_ff_vhtmimo_beamforming_angle;
+static gint ett_ff_vhtmimo_beamforming_report_feedback_matrices;
+static gint ett_ff_vhtmu_exclusive_beamforming_report_matrices;
+
+static gint ett_vht_grpidmgmt;
+static gint ett_vht_msa;
+static gint ett_vht_upa;
+
+static gint ett_ht_info_delimiter1_tree;
+static gint ett_ht_info_delimiter2_tree;
+static gint ett_ht_info_delimiter3_tree;
+
+static gint ett_ff_ftm_param_delim1;
+static gint ett_ff_ftm_param_delim2;
+static gint ett_ff_ftm_param_delim3;
+static gint ett_ff_ftm_tod_err1;
+static gint ett_ff_ftm_toa_err1;
+static gint ett_tag_ranging;
+static gint ett_tag_ranging_ntb;
+
+static gint ett_ranging_subelement_tree;
+
+static gint ett_tag_direct_meas_results;
+
+static gint ett_rsta_avail_header;
+static gint ett_rsta_avail_tree;
+static gint ett_rsta_avail_subfield;
+
+static gint ett_pasn_parameters;
+static gint ett_pasn_comeback_tree;
+
+static gint ett_pasn_auth_frame;
 
 /* 802.11be trees */
-static gint ett_eht_multi_link_control = -1;
-static gint ett_eht_multi_link_common_info = -1;
-static gint ett_eht_multi_link_common_info_link_id = -1;
-static gint ett_eht_multi_link_common_info_medium_sync = -1;
-static gint ett_eht_multi_link_common_info_eml_capa = -1;
-static gint ett_eht_multi_link_common_info_mld_capa = -1;
-static gint ett_eht_multi_link_common_info_ext_mld_capa = -1;
-static gint ett_eht_multi_link_per_sta = -1;
-static gint ett_eht_multi_link_subelt = -1;
-static gint ett_eht_multi_link_sta_control = -1;
-static gint ett_eht_multi_link_per_sta_info = -1;
-static gint ett_eht_multi_link_sta_dtim = -1;
-static gint ett_eht_multi_link_reconf_oper_param = -1;
-static gint ett_eht_multi_link_reconfig_presence_indi = -1;
-static gint ett_eht_multi_link_reconfig_operation_para_info = -1;
-static gint ett_eht_operation_params = -1;
-static gint ett_eht_operation_control = -1;
-static gint ett_eht_mac_capa = -1;
-static gint ett_eht_phy_capa = -1;
-static gint ett_eht_phy_bits_0_15 = -1;
-static gint ett_eht_phy_bits_16_31 = -1;
-static gint ett_eht_phy_bits_32_39 = -1;
-static gint ett_eht_phy_bits_40_63 = -1;
-static gint ett_eht_phy_bits_64_71 = -1;
-static gint ett_eht_phy_mcs_nss = -1;
-static gint ett_eht_phy_mcs_nss_set = -1;
-static gint ett_eht_ttl_mapping = -1;
-static gint ett_eht_ttl_mapping_link_mapping = -1;
-static gint ett_eht_eht_multi_link_tc = -1;
-static gint ett_eht_qos_characteristics = -1;
-static gint ett_eht_aid_bmapctl_tree = -1;
-static gint ett_eht_bw_indication_param = -1;
-static gint ett_eht_eml_control = -1;
-static gint ett_eht_eml_control_link_map = -1;
-static gint ett_eht_eml_control_mcs_map_count = -1;
-static gint ett_eht_emlsr_para_update = -1;
-static gint ett_eht_mimo_ctrl = -1;
-static gint ett_eht_beamforming_rpt_ru_index = -1;
-static gint ett_eht_beamforming_feedback_tree = -1;
-static gint ett_ff_eht_mimo_beamforming_report_snr = -1;
-static gint ett_ff_eht_mimo_mu_exclusive_report = -1;
-static gint ett_eht_mu_exclusive_beamforming_rpt_ru_index = -1;
-
-static gint ett_tag_measure_request_mode_tree = -1;
-static gint ett_tag_measure_request_type_tree = -1;
-static gint ett_tag_measure_request_sub_element_tree = -1;
-static gint ett_tag_measure_report_mode_tree = -1;
-static gint ett_tag_measure_report_type_tree = -1;
-static gint ett_tag_measure_report_basic_map_tree = -1;
-static gint ett_tag_measure_report_rpi_tree = -1;
-static gint ett_tag_measure_report_frame_tree = -1;
-static gint ett_tag_measure_report_sub_element_tree = -1;
-static gint ett_tag_measure_reported_frame_tree = -1;
-static gint ett_tag_measure_reported_frame_frag_id_tree = -1;
-static gint ett_tag_measure_reported_lci_z_tree = -1;
-static gint ett_tag_measure_reported_lci_urp_tree = -1;
-static gint ett_tag_bss_bitmask_tree = -1;
-static gint ett_tag_dfs_map_tree = -1;
-static gint ett_tag_dfs_map_flags_tree = -1;
-static gint ett_tag_erp_info_tree = -1;
-static gint ett_tag_ex_cap1 = -1;
-static gint ett_tag_ex_cap2 = -1;
-static gint ett_tag_ex_cap3 = -1;
-static gint ett_tag_ex_cap4 = -1;
-static gint ett_tag_ex_cap5 = -1;
-static gint ett_tag_ex_cap6 = -1;
-static gint ett_tag_ex_cap7 = -1;
-static gint ett_tag_ex_cap8 = -1;
-static gint ett_tag_ex_cap89 = -1;
-static gint ett_tag_ex_cap10 = -1;
-static gint ett_tag_ex_cap11 = -1;
-static gint ett_tag_ex_cap12 = -1;
-static gint ett_tag_ex_cap13 = -1;
-
-static gint ett_tag_rm_cap1 = -1;
-static gint ett_tag_rm_cap2 = -1;
-static gint ett_tag_rm_cap3 = -1;
-static gint ett_tag_rm_cap4 = -1;
-static gint ett_tag_rm_cap5 = -1;
-
-static gint ett_tag_rsnx_octet1 = -1;
-static gint ett_tag_rsnx_octet2 = -1;
-
-static gint ett_tag_multiple_bssid_subelem_tree = -1;
-static gint ett_tag_20_40_bc = -1;
-
-static gint ett_tag_intolerant_tree = -1;
-
-static gint ett_tag_tclas_mask_tree = -1;
-
-static gint ett_tag_supported_channels = -1;
-
-static gint ett_tag_neighbor_report_bssid_info_tree = -1;
-static gint ett_tag_neighbor_report_bssid_info_capability_tree = -1;
-static gint ett_tag_neighbor_report_subelement_tree = -1;
-static gint ett_tag_neighbor_report_sub_tag_tree = -1;
-
-static gint ett_tag_wapi_param_set_akm_tree = -1;
-static gint ett_tag_wapi_param_set_ucast_tree = -1;
-static gint ett_tag_wapi_param_set_mcast_tree = -1;
-static gint ett_tag_wapi_param_set_preauth_tree = -1;
-
-static gint ett_max_idle_period_options = -1;
-
-static gint ett_tag_time_adv_tree = -1;
-
-static gint ett_tag_he_6ghz_cap_inf_tree = -1;
-
-static gint ett_ff_ba_param_tree = -1;
-static gint ett_ff_ba_ssc_tree = -1;
-static gint ett_ff_delba_param_tree = -1;
-static gint ett_ff_qos_info = -1;
-static gint ett_ff_sm_pwr_save = -1;
-static gint ett_ff_psmp_param_set = -1;
-static gint ett_ff_mimo_cntrl = -1;
-static gint ett_ff_ant_sel = -1;
-static gint ett_mimo_report = -1;
-static gint ett_ff_chan_switch_announce = -1;
-static gint ett_ff_ht_info = -1;
-static gint ett_ff_psmp_sta_info = -1;
-
-static gint ett_tpc = -1;
-
-static gint ett_msdu_aggregation_parent_tree = -1;
-static gint ett_msdu_aggregation_subframe_tree = -1;
-
-static gint ett_80211_mgt_ie = -1;
-static gint ett_tsinfo_tree = -1;
-static gint ett_sched_tree = -1;
-
-static gint ett_fcs = -1;
-
-static gint ett_hs20_osu_providers_list = -1;
-static gint ett_hs20_osu_provider_tree = -1;
-static gint ett_hs20_friendly_names_list = -1;
-static gint ett_hs20_friendly_name_tree = -1;
-static gint ett_hs20_osu_provider_method_list = -1;
-static gint ett_osu_icons_avail_list = -1;
-static gint ett_hs20_osu_icon_tree = -1;
-static gint ett_hs20_osu_service_desc_list = -1;
-static gint ett_hs20_osu_service_desc_tree = -1;
-static gint ett_hs20_venue_url = -1;
-static gint ett_hs20_advice_of_charge = -1;
-static gint ett_hs20_aoc_plan = -1;
-
-static gint ett_hs20_ofn_tree = -1;
-
-static gint ett_adv_proto = -1;
-static gint ett_adv_proto_tuple = -1;
-static gint ett_gas_query = -1;
-static gint ett_gas_anqp = -1;
-static gint ett_nai_realm = -1;
-static gint ett_nai_realm_eap = -1;
-static gint ett_tag_ric_data_desc_ie = -1;
-static gint ett_anqp_vendor_capab = -1;
-
-static gint ett_osen_group_data_cipher_suite = -1;
-static gint ett_osen_pairwise_cipher_suites = -1;
-static gint ett_osen_pairwise_cipher_suite = -1;
-static gint ett_osen_akm_cipher_suites = -1;
-static gint ett_osen_akm_cipher_suite = -1;
-static gint ett_osen_rsn_cap_tree = -1;
-static gint ett_osen_pmkid_list = -1;
-static gint ett_osen_pmkid_tree = -1;
-static gint ett_osen_group_management_cipher_suite = -1;
-
-static gint ett_hs20_cc_proto_port_tuple = -1;
-
-static gint ett_tag_no_bssid_capability_dmg_bss_control_tree = -1;
-static gint ett_ssid_list = -1;
-
-static gint ett_sgdsn = -1;
-static gint ett_nintendo = -1;
-
-static gint ett_routerboard = -1;
-
-static gint ett_meru = -1;
-
-static gint ett_wisun_gtkl = -1;
-static gint ett_wisun_lgtkl = -1;
-
-static gint ett_qos_map_set_exception = -1;
-static gint ett_qos_map_set_range = -1;
-
-static gint ett_wnm_notif_subelt = -1;
-
-static gint ett_ieee80211_3gpp_plmn = -1;
-
-static gint ett_mbo_oce_attr = -1;
-static gint ett_mbo_ap_cap = -1;
-static gint ett_oce_cap = -1;
-static gint ett_oce_metrics_cap = -1;
-
-static gint ett_tag_mobility_domain_ft_capab_tree = -1;
-
-static gint ett_tag_ft_mic_control_tree = -1;
-static gint ett_tag_ft_subelem_tree = -1;
-
-static gint ett_qos_mgmt_pol_capa = -1;
-static gint ett_qos_mgmt_attributes = -1;
-static gint ett_qos_mgmt_dscp_policy_capabilities = -1;
-static gint ett_qos_mgmt_dscp_policy = -1;
-static gint ett_qos_mgmt_tclas = -1;
-static gint ett_qos_mgmt_domain_name = -1;
-static gint ett_qos_mgmt_unknown_attribute = -1;
-static gint ett_dscp_policy_status_list = -1;
-static gint ett_pol_rqst_cont_tree = -1;
-static gint ett_pol_resp_cont_tree = -1;
-
-static expert_field ei_ieee80211_bad_length = EI_INIT;
-static expert_field ei_ieee80211_inv_val = EI_INIT;
-static expert_field ei_ieee80211_vht_tpe_pwr_info_count = EI_INIT;
-static expert_field ei_ieee80211_ff_query_response_length = EI_INIT;
-static expert_field ei_ieee80211_ff_anqp_nai_realm_eap_len = EI_INIT;
-static expert_field ei_hs20_anqp_nai_hrq_length = EI_INIT;
-static expert_field ei_ieee80211_extra_data = EI_INIT;
-static expert_field ei_ieee80211_tag_data = EI_INIT;
-static expert_field ei_ieee80211_tdls_setup_confirm_malformed = EI_INIT;
-static expert_field ei_ieee80211_ff_anqp_nai_field_len = EI_INIT;
-static expert_field ei_ieee80211_rsn_pcs_count = EI_INIT;
-static expert_field ei_ieee80211_tag_measure_request_unknown = EI_INIT;
-static expert_field ei_ieee80211_tag_measure_request_beacon_unknown = EI_INIT;
-static expert_field ei_ieee80211_tag_measure_report_unknown = EI_INIT;
-static expert_field ei_ieee80211_tag_measure_report_beacon_unknown = EI_INIT;
-static expert_field ei_ieee80211_tag_measure_report_lci_unknown = EI_INIT;
-static expert_field ei_ieee80211_tag_number = EI_INIT;
-static expert_field ei_ieee80211_ff_anqp_info_length = EI_INIT;
-static expert_field ei_hs20_anqp_ofn_length = EI_INIT;
-static expert_field ei_ieee80211_tdls_setup_response_malformed = EI_INIT;
-static expert_field ei_ieee80211_ff_anqp_capability = EI_INIT;
-static expert_field ei_ieee80211_not_enough_room_for_anqp_header = EI_INIT;
-static expert_field ei_ieee80211_ff_query_request_length = EI_INIT;
-static expert_field ei_ieee80211_wfa_ie_wme_qos_info_bad_ftype = EI_INIT;
-static expert_field ei_ieee80211_qos_info_bad_ftype = EI_INIT;
-static expert_field ei_ieee80211_qos_bad_aifsn = EI_INIT;
-static expert_field ei_ieee80211_pmkid_count_too_large = EI_INIT;
-static expert_field ei_ieee80211_ff_anqp_venue_length = EI_INIT;
-static expert_field ei_ieee80211_ff_anqp_roaming_consortium_oi_len = EI_INIT;
-static expert_field ei_ieee80211_tag_length = EI_INIT;
-static expert_field ei_ieee80211_missing_data = EI_INIT;
-static expert_field ei_ieee80211_rsn_pmkid_count = EI_INIT;
-static expert_field ei_ieee80211_fc_retry = EI_INIT;
-static expert_field ei_ieee80211_tag_wnm_sleep_mode_no_key_data = EI_INIT;
-static expert_field ei_ieee80211_dmg_subtype = EI_INIT;
-static expert_field ei_ieee80211_vht_action = EI_INIT;
-static expert_field ei_ieee80211_mesh_peering_unexpected = EI_INIT;
-static expert_field ei_ieee80211_fcs = EI_INIT;
-static expert_field ei_ieee80211_mismatched_akm_suite = EI_INIT;
-static expert_field ei_ieee80211_vs_routerboard_unexpected_len = EI_INIT;
-static expert_field ei_ieee80211_vs_sgdsn_serialnumber_invalid_len_val = EI_INIT;
-static expert_field ei_ieee80211_vs_sgdsn_serialnumber_unexpected_len_val = EI_INIT;
-static expert_field ei_ieee80211_twt_tear_down_bad_neg_type = EI_INIT;
-static expert_field ei_ieee80211_twt_setup_bad_command = EI_INIT;
-static expert_field ei_ieee80211_twt_bcast_info_no_term = EI_INIT;
-static expert_field ei_ieee80211_invalid_control_word = EI_INIT;
-static expert_field ei_ieee80211_invalid_control_id = EI_INIT;
-static expert_field ei_ieee80211_invalid_control_length = EI_INIT;
-static expert_field ei_ieee80211_wfa_60g_attr_len_invalid = EI_INIT;
-static expert_field ei_ieee80211_wfa_60g_unknown_attribute = EI_INIT;
-static expert_field ei_ieee80211_htc_in_dmg_packet = EI_INIT;
-static expert_field ei_ieee80211_eht_invalid_subelement = EI_INIT;
-static expert_field ei_ieee80211_eht_invalid_action = EI_INIT;
-static expert_field ei_ieee80211_eht_invalid_multi_link = EI_INIT;
-static expert_field ei_ieee80211_eht_invalid_nc_nr = EI_INIT;
+static gint ett_eht_multi_link_control;
+static gint ett_eht_multi_link_common_info;
+static gint ett_eht_multi_link_common_info_link_id;
+static gint ett_eht_multi_link_common_info_medium_sync;
+static gint ett_eht_multi_link_common_info_eml_capa;
+static gint ett_eht_multi_link_common_info_mld_capa;
+static gint ett_eht_multi_link_common_info_ext_mld_capa;
+static gint ett_eht_multi_link_per_sta;
+static gint ett_eht_multi_link_subelt;
+static gint ett_eht_multi_link_sta_control;
+static gint ett_eht_multi_link_per_sta_info;
+static gint ett_eht_multi_link_sta_dtim;
+static gint ett_eht_multi_link_reconf_oper_param;
+static gint ett_eht_multi_link_reconfig_presence_indi;
+static gint ett_eht_multi_link_reconfig_operation_para_info;
+static gint ett_eht_operation_params;
+static gint ett_eht_operation_control;
+static gint ett_eht_mac_capa;
+static gint ett_eht_phy_capa;
+static gint ett_eht_phy_bits_0_15;
+static gint ett_eht_phy_bits_16_31;
+static gint ett_eht_phy_bits_32_39;
+static gint ett_eht_phy_bits_40_63;
+static gint ett_eht_phy_bits_64_71;
+static gint ett_eht_phy_mcs_nss;
+static gint ett_eht_phy_mcs_nss_set;
+static gint ett_eht_ttl_mapping;
+static gint ett_eht_ttl_mapping_link_mapping;
+static gint ett_eht_eht_multi_link_tc;
+static gint ett_eht_qos_characteristics;
+static gint ett_eht_aid_bmapctl_tree;
+static gint ett_eht_bw_indication_param;
+static gint ett_eht_eml_control;
+static gint ett_eht_eml_control_link_map;
+static gint ett_eht_eml_control_mcs_map_count;
+static gint ett_eht_emlsr_para_update;
+static gint ett_eht_mimo_ctrl;
+static gint ett_eht_beamforming_rpt_ru_index;
+static gint ett_eht_beamforming_feedback_tree;
+static gint ett_ff_eht_mimo_beamforming_report_snr;
+static gint ett_ff_eht_mimo_mu_exclusive_report;
+static gint ett_eht_mu_exclusive_beamforming_rpt_ru_index;
+
+static gint ett_tag_measure_request_mode_tree;
+static gint ett_tag_measure_request_type_tree;
+static gint ett_tag_measure_request_sub_element_tree;
+static gint ett_tag_measure_report_mode_tree;
+static gint ett_tag_measure_report_type_tree;
+static gint ett_tag_measure_report_basic_map_tree;
+static gint ett_tag_measure_report_rpi_tree;
+static gint ett_tag_measure_report_frame_tree;
+static gint ett_tag_measure_report_sub_element_tree;
+static gint ett_tag_measure_reported_frame_tree;
+static gint ett_tag_measure_reported_frame_frag_id_tree;
+static gint ett_tag_measure_reported_lci_z_tree;
+static gint ett_tag_measure_reported_lci_urp_tree;
+static gint ett_tag_bss_bitmask_tree;
+static gint ett_tag_dfs_map_tree;
+static gint ett_tag_dfs_map_flags_tree;
+static gint ett_tag_erp_info_tree;
+static gint ett_tag_ex_cap1;
+static gint ett_tag_ex_cap2;
+static gint ett_tag_ex_cap3;
+static gint ett_tag_ex_cap4;
+static gint ett_tag_ex_cap5;
+static gint ett_tag_ex_cap6;
+static gint ett_tag_ex_cap7;
+static gint ett_tag_ex_cap8;
+static gint ett_tag_ex_cap89;
+static gint ett_tag_ex_cap10;
+static gint ett_tag_ex_cap11;
+static gint ett_tag_ex_cap12;
+static gint ett_tag_ex_cap13;
+
+static gint ett_tag_rm_cap1;
+static gint ett_tag_rm_cap2;
+static gint ett_tag_rm_cap3;
+static gint ett_tag_rm_cap4;
+static gint ett_tag_rm_cap5;
+
+static gint ett_tag_rsnx_octet1;
+static gint ett_tag_rsnx_octet2;
+
+static gint ett_tag_multiple_bssid_subelem_tree;
+static gint ett_tag_20_40_bc;
+
+static gint ett_tag_intolerant_tree;
+
+static gint ett_tag_tclas_mask_tree;
+
+static gint ett_tag_supported_channels;
+
+static gint ett_tag_neighbor_report_bssid_info_tree;
+static gint ett_tag_neighbor_report_bssid_info_capability_tree;
+static gint ett_tag_neighbor_report_subelement_tree;
+static gint ett_tag_neighbor_report_sub_tag_tree;
+
+static gint ett_tag_wapi_param_set_akm_tree;
+static gint ett_tag_wapi_param_set_ucast_tree;
+static gint ett_tag_wapi_param_set_mcast_tree;
+static gint ett_tag_wapi_param_set_preauth_tree;
+
+static gint ett_max_idle_period_options;
+
+static gint ett_tag_time_adv_tree;
+
+static gint ett_tag_he_6ghz_cap_inf_tree;
+
+static gint ett_ff_ba_param_tree;
+static gint ett_ff_ba_ssc_tree;
+static gint ett_ff_delba_param_tree;
+static gint ett_ff_qos_info;
+static gint ett_ff_sm_pwr_save;
+static gint ett_ff_psmp_param_set;
+static gint ett_ff_mimo_cntrl;
+static gint ett_ff_ant_sel;
+static gint ett_mimo_report;
+static gint ett_ff_chan_switch_announce;
+static gint ett_ff_ht_info;
+static gint ett_ff_psmp_sta_info;
+
+static gint ett_tpc;
+
+static gint ett_msdu_aggregation_parent_tree;
+static gint ett_msdu_aggregation_subframe_tree;
+
+static gint ett_80211_mgt_ie;
+static gint ett_tsinfo_tree;
+static gint ett_sched_tree;
+
+static gint ett_fcs;
+
+static gint ett_hs20_osu_providers_list;
+static gint ett_hs20_osu_provider_tree;
+static gint ett_hs20_friendly_names_list;
+static gint ett_hs20_friendly_name_tree;
+static gint ett_hs20_osu_provider_method_list;
+static gint ett_osu_icons_avail_list;
+static gint ett_hs20_osu_icon_tree;
+static gint ett_hs20_osu_service_desc_list;
+static gint ett_hs20_osu_service_desc_tree;
+static gint ett_hs20_venue_url;
+static gint ett_hs20_advice_of_charge;
+static gint ett_hs20_aoc_plan;
+
+static gint ett_hs20_ofn_tree;
+
+static gint ett_adv_proto;
+static gint ett_adv_proto_tuple;
+static gint ett_gas_query;
+static gint ett_gas_anqp;
+static gint ett_nai_realm;
+static gint ett_nai_realm_eap;
+static gint ett_tag_ric_data_desc_ie;
+static gint ett_anqp_vendor_capab;
+
+static gint ett_osen_group_data_cipher_suite;
+static gint ett_osen_pairwise_cipher_suites;
+static gint ett_osen_pairwise_cipher_suite;
+static gint ett_osen_akm_cipher_suites;
+static gint ett_osen_akm_cipher_suite;
+static gint ett_osen_rsn_cap_tree;
+static gint ett_osen_pmkid_list;
+static gint ett_osen_pmkid_tree;
+static gint ett_osen_group_management_cipher_suite;
+
+static gint ett_hs20_cc_proto_port_tuple;
+
+static gint ett_tag_no_bssid_capability_dmg_bss_control_tree;
+static gint ett_ssid_list;
+
+static gint ett_sgdsn;
+static gint ett_nintendo;
+
+static gint ett_routerboard;
+
+static gint ett_meru;
+
+static gint ett_wisun_gtkl;
+static gint ett_wisun_lgtkl;
+
+static gint ett_qos_map_set_exception;
+static gint ett_qos_map_set_range;
+
+static gint ett_wnm_notif_subelt;
+
+static gint ett_ieee80211_3gpp_plmn;
+
+static gint ett_mbo_oce_attr;
+static gint ett_mbo_ap_cap;
+static gint ett_oce_cap;
+static gint ett_oce_metrics_cap;
+
+static gint ett_tag_mobility_domain_ft_capab_tree;
+
+static gint ett_tag_ft_mic_control_tree;
+static gint ett_tag_ft_subelem_tree;
+
+static gint ett_qos_mgmt_pol_capa;
+static gint ett_qos_mgmt_attributes;
+static gint ett_qos_mgmt_dscp_policy_capabilities;
+static gint ett_qos_mgmt_dscp_policy;
+static gint ett_qos_mgmt_tclas;
+static gint ett_qos_mgmt_domain_name;
+static gint ett_qos_mgmt_unknown_attribute;
+static gint ett_dscp_policy_status_list;
+static gint ett_pol_rqst_cont_tree;
+static gint ett_pol_resp_cont_tree;
+
+static expert_field ei_ieee80211_bad_length;
+static expert_field ei_ieee80211_inv_val;
+static expert_field ei_ieee80211_vht_tpe_pwr_info_count;
+static expert_field ei_ieee80211_ff_query_response_length;
+static expert_field ei_ieee80211_ff_anqp_nai_realm_eap_len;
+static expert_field ei_hs20_anqp_nai_hrq_length;
+static expert_field ei_ieee80211_extra_data;
+static expert_field ei_ieee80211_tag_data;
+static expert_field ei_ieee80211_tdls_setup_confirm_malformed;
+static expert_field ei_ieee80211_ff_anqp_nai_field_len;
+static expert_field ei_ieee80211_rsn_pcs_count;
+static expert_field ei_ieee80211_tag_measure_request_unknown;
+static expert_field ei_ieee80211_tag_measure_request_beacon_unknown;
+static expert_field ei_ieee80211_tag_measure_report_unknown;
+static expert_field ei_ieee80211_tag_measure_report_beacon_unknown;
+static expert_field ei_ieee80211_tag_measure_report_lci_unknown;
+static expert_field ei_ieee80211_tag_number;
+static expert_field ei_ieee80211_ff_anqp_info_length;
+static expert_field ei_hs20_anqp_ofn_length;
+static expert_field ei_ieee80211_tdls_setup_response_malformed;
+static expert_field ei_ieee80211_ff_anqp_capability;
+static expert_field ei_ieee80211_not_enough_room_for_anqp_header;
+static expert_field ei_ieee80211_ff_query_request_length;
+static expert_field ei_ieee80211_wfa_ie_wme_qos_info_bad_ftype;
+static expert_field ei_ieee80211_qos_info_bad_ftype;
+static expert_field ei_ieee80211_qos_bad_aifsn;
+static expert_field ei_ieee80211_pmkid_count_too_large;
+static expert_field ei_ieee80211_ff_anqp_venue_length;
+static expert_field ei_ieee80211_ff_anqp_roaming_consortium_oi_len;
+static expert_field ei_ieee80211_tag_length;
+static expert_field ei_ieee80211_missing_data;
+static expert_field ei_ieee80211_rsn_pmkid_count;
+static expert_field ei_ieee80211_fc_retry;
+static expert_field ei_ieee80211_tag_wnm_sleep_mode_no_key_data;
+static expert_field ei_ieee80211_dmg_subtype;
+static expert_field ei_ieee80211_vht_action;
+static expert_field ei_ieee80211_mesh_peering_unexpected;
+static expert_field ei_ieee80211_fcs;
+static expert_field ei_ieee80211_mismatched_akm_suite;
+static expert_field ei_ieee80211_vs_routerboard_unexpected_len;
+static expert_field ei_ieee80211_vs_sgdsn_serialnumber_invalid_len_val;
+static expert_field ei_ieee80211_vs_sgdsn_serialnumber_unexpected_len_val;
+static expert_field ei_ieee80211_twt_tear_down_bad_neg_type;
+static expert_field ei_ieee80211_twt_setup_bad_command;
+static expert_field ei_ieee80211_twt_bcast_info_no_term;
+static expert_field ei_ieee80211_invalid_control_word;
+static expert_field ei_ieee80211_invalid_control_id;
+static expert_field ei_ieee80211_invalid_control_length;
+static expert_field ei_ieee80211_wfa_60g_attr_len_invalid;
+static expert_field ei_ieee80211_wfa_60g_unknown_attribute;
+static expert_field ei_ieee80211_htc_in_dmg_packet;
+static expert_field ei_ieee80211_eht_invalid_subelement;
+static expert_field ei_ieee80211_eht_invalid_action;
+static expert_field ei_ieee80211_eht_invalid_multi_link;
+static expert_field ei_ieee80211_eht_invalid_nc_nr;
 
 
 /* 802.11ad trees */
-static gint ett_dynamic_alloc_tree = -1;
-static gint ett_ssw_tree = -1;
-static gint ett_bf_tree = -1;
-static gint ett_sswf_tree = -1;
-static gint ett_brp_tree = -1;
-static gint ett_blm_tree = -1;
-static gint ett_bic_tree = -1;
-static gint ett_dmg_params_tree = -1;
-static gint ett_cc_tree = -1;
-static gint ett_rcsi_tree = -1;
-static gint ett_80211_ext = -1;
-static gint ett_allocation_tree = -1;
-static gint ett_sta_info = -1;
-
-static gint ett_ieee80211_esp = -1;
-
-static gint ett_ieee80211_wfa_60g_attr = -1;
-static gint ett_ieee80211_wfa_transition_disable_tree = -1;
+static gint ett_dynamic_alloc_tree;
+static gint ett_ssw_tree;
+static gint ett_bf_tree;
+static gint ett_sswf_tree;
+static gint ett_brp_tree;
+static gint ett_blm_tree;
+static gint ett_bic_tree;
+static gint ett_dmg_params_tree;
+static gint ett_cc_tree;
+static gint ett_rcsi_tree;
+static gint ett_80211_ext;
+static gint ett_allocation_tree;
+static gint ett_sta_info;
+
+static gint ett_ieee80211_esp;
+
+static gint ett_ieee80211_wfa_60g_attr;
+static gint ett_ieee80211_wfa_transition_disable_tree;
 
 /* 802.11ah trees */
-static gint ett_s1g_sync_control_tree = -1;
-static gint ett_s1g_sector_id_index = -1;
-static gint ett_s1g_twt_information_control = -1;
-static gint ett_twt_tear_down_tree = -1;
-static gint ett_twt_control_field_tree = -1;
-static gint ett_twt_req_type_tree = -1;
-static gint ett_twt_ndp_paging_field_tree = -1;
-static gint ett_twt_broadcast_info_tree = -1;
-static gint ett_twt_traffic_info_tree = -1;
-static gint ett_twt_traffic_info_control_tree = -1;
+static gint ett_s1g_sync_control_tree;
+static gint ett_s1g_sector_id_index;
+static gint ett_s1g_twt_information_control;
+static gint ett_twt_tear_down_tree;
+static gint ett_twt_control_field_tree;
+static gint ett_twt_req_type_tree;
+static gint ett_twt_ndp_paging_field_tree;
+static gint ett_twt_broadcast_info_tree;
+static gint ett_twt_traffic_info_tree;
+static gint ett_twt_traffic_info_control_tree;
 
 /* 802.11ax trees */
-static gint ett_he_mac_capabilities = -1;
-static gint ett_he_phy_capabilities = -1;
-static gint ett_he_phy_cap_first_byte = -1;
-static gint ett_he_phy_cap_chan_width_set = -1;
-static gint ett_he_phy_cap_b8_to_b23 = -1;
-static gint ett_he_phy_cap_b24_to_b39 = -1;
-static gint ett_he_phy_cap_b40_to_b55 = -1;
-static gint ett_he_phy_cap_b56_to_b71 = -1;
-static gint ett_he_phy_cap_b72_to_b87 = -1;
-static gint ett_he_mcs_and_nss_set = -1;
-static gint ett_he_rx_tx_he_mcs_map_lte_80 = -1;
-static gint ett_he_rx_mcs_map_lte_80 = -1;
-static gint ett_he_tx_mcs_map_lte_80 = -1;
-static gint ett_he_rx_tx_he_mcs_map_160 = -1;
-static gint ett_he_rx_mcs_map_160 = -1;
-static gint ett_he_tx_mcs_map_160 = -1;
-static gint ett_he_rx_tx_he_mcs_map_80_80 = -1;
-static gint ett_he_rx_mcs_map_80_80 = -1;
-static gint ett_he_tx_mcs_map_80_80 = -1;
-static gint ett_he_ppe_threshold = -1;
-static gint ett_he_ppe_nss = -1;
-static gint ett_he_ppe_ru_alloc = -1;
-static gint ett_he_uora_tree = -1;
-static gint ett_he_aic_aifsn = -1;
-static gint ett_he_spatial_reuse_control = -1;
-static gint ett_he_bss_new_color_info = -1;
-static gint ett_he_ess_report_info_field = -1;
-static gint ett_he_operation_params = -1;
-static gint ett_he_bss_color_information = -1;
-static gint ett_he_oper_basic_mcs = -1;
-static gint ett_he_operation_vht_op_info = -1;
-static gint ett_mscs_user_prio = -1;
-static gint ett_ieee80211_user_prio_bitmap = -1;
-static gint ett_ieee80211_intra_access_prio = -1;
-static gint ett_he_operation_6ghz = -1;
-static gint ett_he_operation_6ghz_control = -1;
-static gint ett_he_mu_edca_param = -1;
-static gint ett_he_trigger_common_info = -1;
-static gint ett_he_trigger_ranging = -1;
-static gint ett_he_trigger_ranging_poll = -1;
-static gint ett_he_trigger_packet_extension = -1;
-static gint ett_he_trigger_base_common_info = -1;
-static gint ett_he_trigger_bar_ctrl = -1;
-static gint ett_he_trigger_bar_info = -1;
-static gint ett_he_trigger_user_info = -1;
-static gint ett_he_trigger_base_user_info = -1;
-static gint ett_he_trigger_dep_basic_user_info = -1;
-static gint ett_he_trigger_dep_nfrp_user_info = -1;
-static gint ett_ndp_annc = -1;
-static gint ett_ndp_vht_annc_sta_list = -1;
-static gint ett_ndp_vht_annc_sta_info_tree = -1;
-static gint ett_ndp_he_annc_sta_list = -1;
-static gint ett_ndp_he_annc_sta_item = -1;
-static gint ett_ndp_he_annc_sta_info = -1;
-static gint ett_ndp_ranging_annc_sta_list = -1;
-static gint ett_ndp_eht_annc_sta_list = -1;
-static gint ett_ndp_eht_annc_sta_info = -1;
-static gint ett_non_inheritance_element_id_list = -1;
-static gint ett_non_inheritance_element_id_ext_list = -1;
+static gint ett_he_mac_capabilities;
+static gint ett_he_phy_capabilities;
+static gint ett_he_phy_cap_first_byte;
+static gint ett_he_phy_cap_chan_width_set;
+static gint ett_he_phy_cap_b8_to_b23;
+static gint ett_he_phy_cap_b24_to_b39;
+static gint ett_he_phy_cap_b40_to_b55;
+static gint ett_he_phy_cap_b56_to_b71;
+static gint ett_he_phy_cap_b72_to_b87;
+static gint ett_he_mcs_and_nss_set;
+static gint ett_he_rx_tx_he_mcs_map_lte_80;
+static gint ett_he_rx_mcs_map_lte_80;
+static gint ett_he_tx_mcs_map_lte_80;
+static gint ett_he_rx_tx_he_mcs_map_160;
+static gint ett_he_rx_mcs_map_160;
+static gint ett_he_tx_mcs_map_160;
+static gint ett_he_rx_tx_he_mcs_map_80_80;
+static gint ett_he_rx_mcs_map_80_80;
+static gint ett_he_tx_mcs_map_80_80;
+static gint ett_he_ppe_threshold;
+static gint ett_he_ppe_nss;
+static gint ett_he_ppe_ru_alloc;
+static gint ett_he_uora_tree;
+static gint ett_he_aic_aifsn;
+static gint ett_he_spatial_reuse_control;
+static gint ett_he_bss_new_color_info;
+static gint ett_he_ess_report_info_field;
+static gint ett_he_operation_params;
+static gint ett_he_bss_color_information;
+static gint ett_he_oper_basic_mcs;
+static gint ett_he_operation_vht_op_info;
+static gint ett_mscs_user_prio;
+static gint ett_ieee80211_user_prio_bitmap;
+static gint ett_ieee80211_intra_access_prio;
+static gint ett_he_operation_6ghz;
+static gint ett_he_operation_6ghz_control;
+static gint ett_he_mu_edca_param;
+static gint ett_he_trigger_common_info;
+static gint ett_he_trigger_ranging;
+static gint ett_he_trigger_ranging_poll;
+static gint ett_he_trigger_packet_extension;
+static gint ett_he_trigger_base_common_info;
+static gint ett_he_trigger_bar_ctrl;
+static gint ett_he_trigger_bar_info;
+static gint ett_he_trigger_user_info;
+static gint ett_he_trigger_base_user_info;
+static gint ett_he_trigger_dep_basic_user_info;
+static gint ett_he_trigger_dep_nfrp_user_info;
+static gint ett_ndp_annc;
+static gint ett_ndp_vht_annc_sta_list;
+static gint ett_ndp_vht_annc_sta_info_tree;
+static gint ett_ndp_he_annc_sta_list;
+static gint ett_ndp_he_annc_sta_item;
+static gint ett_ndp_he_annc_sta_info;
+static gint ett_ndp_ranging_annc_sta_list;
+static gint ett_ndp_eht_annc_sta_list;
+static gint ett_ndp_eht_annc_sta_info;
+static gint ett_non_inheritance_element_id_list;
+static gint ett_non_inheritance_element_id_ext_list;
 
 /* 802.11ai trees */
-static gint ett_fils_indication_realm_list = -1;
-static gint ett_fils_indication_public_key_list = -1;
-static gint ett_ff_fils_discovery_frame_control = -1;
-static gint ett_ff_fils_discovery_capability = -1;
-static gint ett_neighbor_ap_info = -1;
-static gint ett_tbtt_infos = -1;
-static gint ett_rnr_bss_params_tree = -1;
-static gint ett_rnr_mld_params_tree = -1;
-
-static gint ett_ff_fils_req_params = -1;
-static gint ett_ff_fils_req_params_fils_criteria = -1;
+static gint ett_fils_indication_realm_list;
+static gint ett_fils_indication_public_key_list;
+static gint ett_ff_fils_discovery_frame_control;
+static gint ett_ff_fils_discovery_capability;
+static gint ett_neighbor_ap_info;
+static gint ett_tbtt_infos;
+static gint ett_rnr_bss_params_tree;
+static gint ett_rnr_mld_params_tree;
+
+static gint ett_ff_fils_req_params;
+static gint ett_ff_fils_req_params_fils_criteria;
 
 /* Generic address HF list for proto_tree_add_mac48_detail() */
 static const mac_hf_list_t mac_addr = {
@@ -11687,19 +11687,19 @@ dissect_gas_initial_response(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo
 
 static reassembly_table gas_reassembly_table;
 
-static gint ett_gas_resp_fragment = -1;
-static gint ett_gas_resp_fragments = -1;
+static gint ett_gas_resp_fragment;
+static gint ett_gas_resp_fragments;
 
-static int hf_ieee80211_gas_resp_fragments = -1;
-static int hf_ieee80211_gas_resp_fragment = -1;
-static int hf_ieee80211_gas_resp_fragment_overlap = -1;
-static int hf_ieee80211_gas_resp_fragment_overlap_conflict = -1;
-static int hf_ieee80211_gas_resp_fragment_multiple_tails = -1;
-static int hf_ieee80211_gas_resp_fragment_too_long_fragment = -1;
-static int hf_ieee80211_gas_resp_fragment_error = -1;
-static int hf_ieee80211_gas_resp_fragment_count = -1;
-static int hf_ieee80211_gas_resp_reassembled_in = -1;
-static int hf_ieee80211_gas_resp_reassembled_length = -1;
+static int hf_ieee80211_gas_resp_fragments;
+static int hf_ieee80211_gas_resp_fragment;
+static int hf_ieee80211_gas_resp_fragment_overlap;
+static int hf_ieee80211_gas_resp_fragment_overlap_conflict;
+static int hf_ieee80211_gas_resp_fragment_multiple_tails;
+static int hf_ieee80211_gas_resp_fragment_too_long_fragment;
+static int hf_ieee80211_gas_resp_fragment_error;
+static int hf_ieee80211_gas_resp_fragment_count;
+static int hf_ieee80211_gas_resp_reassembled_in;
+static int hf_ieee80211_gas_resp_reassembled_length;
 
 static const fragment_items gas_resp_frag_items = {
   &ett_gas_resp_fragment,
@@ -40670,35 +40670,35 @@ static const value_string keydes_version_vals[] = {
   { 0, NULL }
 };
 
-static int proto_wlan_rsna_eapol = -1;
-
-static int hf_wlan_rsna_eapol_wpa_keydes_msgnr = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_keydes_version = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_key_type = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_key_index = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_install = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_key_ack = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_key_mic = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_secure = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_error = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_request = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_encrypted_key_data = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_smk_message = -1;
-static int hf_wlan_rsna_eapol_keydes_key_len = -1;
-static int hf_wlan_rsna_eapol_keydes_replay_counter = -1;
-static int hf_wlan_rsna_eapol_keydes_key_iv = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_nonce = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_rsc = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_id = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_mic = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_data_len = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_data = -1;
-static int hf_wlan_rsna_eapol_wpa_keydes_padding = -1;
-static int hf_wlan_rsna_eapol_wpa_extraneous = -1;
-
-static gint ett_keyinfo = -1;
-static gint ett_wlan_rsna_eapol_keydes_data = -1;
+static int proto_wlan_rsna_eapol;
+
+static int hf_wlan_rsna_eapol_wpa_keydes_msgnr;
+static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo;
+static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_keydes_version;
+static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_key_type;
+static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_key_index;
+static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_install;
+static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_key_ack;
+static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_key_mic;
+static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_secure;
+static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_error;
+static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_request;
+static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_encrypted_key_data;
+static int hf_wlan_rsna_eapol_wpa_keydes_keyinfo_smk_message;
+static int hf_wlan_rsna_eapol_keydes_key_len;
+static int hf_wlan_rsna_eapol_keydes_replay_counter;
+static int hf_wlan_rsna_eapol_keydes_key_iv;
+static int hf_wlan_rsna_eapol_wpa_keydes_nonce;
+static int hf_wlan_rsna_eapol_wpa_keydes_rsc;
+static int hf_wlan_rsna_eapol_wpa_keydes_id;
+static int hf_wlan_rsna_eapol_wpa_keydes_mic;
+static int hf_wlan_rsna_eapol_wpa_keydes_data_len;
+static int hf_wlan_rsna_eapol_wpa_keydes_data;
+static int hf_wlan_rsna_eapol_wpa_keydes_padding;
+static int hf_wlan_rsna_eapol_wpa_extraneous;
+
+static gint ett_keyinfo;
+static gint ett_wlan_rsna_eapol_keydes_data;
 
 static const true_false_string keyinfo_key_type_tfs = { "Pairwise Key", "Group Key" };
 
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 05668e4f2a..dacd665ca2 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -423,310 +423,310 @@ static guint ieee802154_set_mac_key(ieee802154_packet *packet, unsigned char *ke
 static void tsch_ccm_init_nonce(guint64 addr, guint64 asn, gchar* generic_nonce);
 
 /* Initialize Protocol and Registered fields */
-static int proto_ieee802154_nonask_phy = -1;
-static int hf_ieee802154_nonask_phy_preamble = -1;
-static int hf_ieee802154_nonask_phy_sfd = -1;
-static int hf_ieee802154_nonask_phy_length = -1;
-static int hf_ieee802154_nonask_phr = -1;
-
-static int proto_ieee802154 = -1;
-static int proto_ieee802154_tap = -1;
-static int hf_ieee802154_frame_length = -1;
-static int hf_ieee802154_fcf = -1;
-static int hf_ieee802154_frame_type = -1;
-static int hf_ieee802154_security = -1;
-static int hf_ieee802154_pending = -1;
-static int hf_ieee802154_ack_request = -1;
-static int hf_ieee802154_pan_id_compression = -1;
-static int hf_ieee802154_fcf_reserved = -1;
-static int hf_ieee802154_seqno_suppression = -1;
-static int hf_ieee802154_ie_present = -1;
-static int hf_ieee802154_src_addr_mode = -1;
-static int hf_ieee802154_version = -1;
-static int hf_ieee802154_dst_addr_mode = -1;
-
-static int hf_ieee802154_mpf_long_frame_control = -1;
-static int hf_ieee802154_mpf_dst_addr_mode = -1;
-static int hf_ieee802154_mpf_src_addr_mode = -1;
-static int hf_ieee802154_mpf_pan_id_present = -1;
-static int hf_ieee802154_mpf_security = -1;
-static int hf_ieee802154_mpf_seqno_suppression = -1;
-static int hf_ieee802154_mpf_pending = -1;
-static int hf_ieee802154_mpf_version = -1;
-static int hf_ieee802154_mpf_ack_request = -1;
-static int hf_ieee802154_mpf_ie_present = -1;
-
-static int hf_ieee802154_header_ies = -1;
-static int hf_ieee802154_header_ie_tlv = -1;
-static int hf_ieee802154_header_ie_type = -1;
-static int hf_ieee802154_header_ie_id = -1;
-static int hf_ieee802154_header_ie_length = -1;
-static int hf_ieee802154_ie_unknown_content = -1;
-static int hf_ieee802154_hie_unsupported = -1;
-static int hf_ieee802154_hie_time_correction = -1;
-static int hf_ieee802154_hie_ht1 = -1;
-static int hf_ieee802154_hie_ht2 = -1;
-static int hf_ieee802154_nack = -1;
-static int hf_ieee802154_hie_time_correction_time_sync_info = -1;
-static int hf_ieee802154_hie_time_correction_value = -1;
-static int hf_ieee802154_hie_csl = -1;
-static int hf_ieee802154_hie_csl_phase = -1;
-static int hf_ieee802154_hie_csl_period = -1;
-static int hf_ieee802154_hie_csl_rendezvous_time = -1;
-static int hf_ieee802154_hie_rdv = -1;
-static int hf_ieee802154_hie_rdv_wakeup_interval = -1;
-static int hf_ieee802154_hie_global_time = -1;
-static int hf_ieee802154_hie_global_time_value = -1;
-static int hf_ieee802154_hie_vendor_specific = -1;
-static int hf_ieee802154_hie_vendor_specific_vendor_oui = -1;
-static int hf_ieee802154_hie_vendor_specific_content = -1;
-static int hf_ieee802154_payload_ies = -1;
-static int hf_ieee802154_payload_ie_tlv = -1;
-static int hf_ieee802154_payload_ie_type = -1;
-static int hf_ieee802154_payload_ie_id = -1;
-static int hf_ieee802154_payload_ie_length = -1;
-static int hf_ieee802154_pie_unsupported = -1;
-static int hf_ieee802154_pie_termination = -1;
-static int hf_ieee802154_pie_vendor = -1;
-static int hf_ieee802154_pie_vendor_oui = -1;
-static int hf_ieee802154_pie_ietf = -1;
-static int hf_ieee802154_mlme = -1;
-static int hf_ieee802154_mlme_ie_data = -1;
-static int hf_ieee802154_mlme_ie_unsupported = -1;
-static int hf_ieee802154_psie = -1;
-static int hf_ieee802154_psie_type = -1;
-static int hf_ieee802154_psie_id_short = -1;
-static int hf_ieee802154_psie_length_short = -1;
-static int hf_ieee802154_psie_id_long = -1;
-static int hf_ieee802154_psie_length_long = -1;
-
-static int hf_ieee802154_tsch_sync = -1;
-static int hf_ieee802154_tsch_asn = -1;
-static int hf_ieee802154_tsch_join_metric = -1;
-static int hf_ieee802154_tsch_slotframe = -1;
-static int hf_ieee802154_tsch_link_info = -1;
-static int hf_ieee802154_tsch_slotf_link_nb_slotf = -1;
-static int hf_ieee802154_tsch_slotf_link_slotf_handle= -1;
-static int hf_ieee802154_tsch_slotf_size = -1;
-static int hf_ieee802154_tsch_slotf_link_nb_links = -1;
-static int hf_ieee802154_tsch_slotf_link_timeslot = -1;
-static int hf_ieee802154_tsch_slotf_link_channel_offset = -1;
-static int hf_ieee802154_tsch_slotf_link_options = -1;
-static int hf_ieee802154_tsch_slotf_link_options_tx = -1;
-static int hf_ieee802154_tsch_slotf_link_options_rx = -1;
-static int hf_ieee802154_tsch_slotf_link_options_shared = -1;
-static int hf_ieee802154_tsch_slotf_link_options_timkeeping = -1;
-static int hf_ieee802154_tsch_slotf_link_options_priority = -1;
-static int hf_ieee802154_tsch_channel_hopping = -1;
-static int hf_ieee802154_tsch_hopping_sequence_id = -1;
-static int hf_ieee802154_tsch_timeslot = -1;
-static int hf_ieee802154_tsch_timeslot_id = -1;
-static int hf_ieee802154_tsch_timeslot_cca_offset = -1;
-static int hf_ieee802154_tsch_timeslot_cca = -1;
-static int hf_ieee802154_tsch_timeslot_tx_offset = -1;
-static int hf_ieee802154_tsch_timeslot_rx_offset = -1;
-static int hf_ieee802154_tsch_timeslot_rx_ack_delay = -1;
-static int hf_ieee802154_tsch_timeslot_tx_ack_delay = -1;
-static int hf_ieee802154_tsch_timeslot_rx_wait = -1;
-static int hf_ieee802154_tsch_timeslot_ack_wait = -1;
-static int hf_ieee802154_tsch_timeslot_turnaround = -1;
-static int hf_ieee802154_tsch_timeslot_max_ack = -1;
-static int hf_ieee802154_tsch_timeslot_max_tx = -1;
-static int hf_ieee802154_tsch_timeslot_length = -1;
-
-static int hf_ieee802154_psie_eb_filter = -1;
-static int hf_ieee802154_psie_eb_filter_pjoin = -1;
-static int hf_ieee802154_psie_eb_filter_lqi = -1;
-static int hf_ieee802154_psie_eb_filter_lqi_min = -1;
-static int hf_ieee802154_psie_eb_filter_percent = -1;
-static int hf_ieee802154_psie_eb_filter_percent_prob = -1;
-static int hf_ieee802154_psie_eb_filter_attr_id = -1;
-static int hf_ieee802154_psie_eb_filter_attr_id_bitmap = -1;
-static int hf_ieee802154_p_ie_ietf_sub_id = -1;
-
-static int hf_ieee802154_6top = -1;
-static int hf_ieee802154_6top_version = -1;
-static int hf_ieee802154_6top_type = -1;
-static int hf_ieee802154_6top_flags_reserved = -1;
-static int hf_ieee802154_6top_code = -1;
-static int hf_ieee802154_6top_sfid = -1;
-static int hf_ieee802154_6top_seqnum = -1;
-static int hf_ieee802154_6top_metadata = -1;
-static int hf_ieee802154_6top_cell_options = -1;
-static int hf_ieee802154_6top_cell_option_tx = -1;
-static int hf_ieee802154_6top_cell_option_rx = -1;
-static int hf_ieee802154_6top_cell_option_shared = -1;
-static int hf_ieee802154_6top_cell_option_reserved = -1;
-static int hf_ieee802154_6top_num_cells = -1;
-static int hf_ieee802154_6top_cell_list = -1;
-static int hf_ieee802154_6top_rel_cell_list = -1;
-static int hf_ieee802154_6top_cand_cell_list = -1;
-static int hf_ieee802154_6top_cell = -1;
-static int hf_ieee802154_6top_reserved = -1;
-static int hf_ieee802154_6top_offset = -1;
-static int hf_ieee802154_6top_max_num_cells = -1;
-static int hf_ieee802154_6top_slot_offset = -1;
-static int hf_ieee802154_6top_channel_offset = -1;
-static int hf_ieee802154_6top_total_num_cells = -1;
-static int hf_ieee802154_6top_payload = -1;
-
-static int hf_ieee802159_mpx = -1;
-static int hf_ieee802159_mpx_transaction_control = -1;
-static int hf_ieee802159_mpx_transfer_type = -1;
-static int hf_ieee802159_mpx_transaction_id = -1;
-static int hf_ieee802159_mpx_transaction_id_as_multiplex_id = -1;
-static int hf_ieee802159_mpx_fragment_number = -1;
-static int hf_ieee802159_mpx_total_frame_size = -1;
-static int hf_ieee802159_mpx_multiplex_id = -1;
-static int hf_ieee802159_mpx_kmp_id = -1;
-static int hf_ieee802159_mpx_kmp_vendor_oui = -1;
-static int hf_ieee802159_mpx_fragment = -1;
-static int hf_ieee802159_mpx_wisun_subid = -1;
-
-static int proto_zboss = -1;
-static int hf_zboss_direction = -1;
-static int hf_zboss_page = -1;
-static int hf_zboss_channel = -1;
-static int hf_zboss_trace_number = -1;
-
-static int hf_ieee802154_seqno = -1;
-static int hf_ieee802154_dst_panID = -1;
-static int hf_ieee802154_dst16 = -1;
-static int hf_ieee802154_dst64 = -1;
-static int hf_ieee802154_src_panID = -1;
-static int hf_ieee802154_src16 = -1;
-static int hf_ieee802154_src64 = -1;
-static int hf_ieee802154_src64_origin = -1;
-static int hf_ieee802154_addr16 = -1;
-static int hf_ieee802154_addr64 = -1;
-static int hf_ieee802154_fcs = -1;
-static int hf_ieee802154_fcs32 = -1;
-static int hf_ieee802154_rssi = -1;
-static int hf_ieee802154_fcs_ok = -1;
-static int hf_ieee802154_correlation = -1;
+static int proto_ieee802154_nonask_phy;
+static int hf_ieee802154_nonask_phy_preamble;
+static int hf_ieee802154_nonask_phy_sfd;
+static int hf_ieee802154_nonask_phy_length;
+static int hf_ieee802154_nonask_phr;
+
+static int proto_ieee802154;
+static int proto_ieee802154_tap;
+static int hf_ieee802154_frame_length;
+static int hf_ieee802154_fcf;
+static int hf_ieee802154_frame_type;
+static int hf_ieee802154_security;
+static int hf_ieee802154_pending;
+static int hf_ieee802154_ack_request;
+static int hf_ieee802154_pan_id_compression;
+static int hf_ieee802154_fcf_reserved;
+static int hf_ieee802154_seqno_suppression;
+static int hf_ieee802154_ie_present;
+static int hf_ieee802154_src_addr_mode;
+static int hf_ieee802154_version;
+static int hf_ieee802154_dst_addr_mode;
+
+static int hf_ieee802154_mpf_long_frame_control;
+static int hf_ieee802154_mpf_dst_addr_mode;
+static int hf_ieee802154_mpf_src_addr_mode;
+static int hf_ieee802154_mpf_pan_id_present;
+static int hf_ieee802154_mpf_security;
+static int hf_ieee802154_mpf_seqno_suppression;
+static int hf_ieee802154_mpf_pending;
+static int hf_ieee802154_mpf_version;
+static int hf_ieee802154_mpf_ack_request;
+static int hf_ieee802154_mpf_ie_present;
+
+static int hf_ieee802154_header_ies;
+static int hf_ieee802154_header_ie_tlv;
+static int hf_ieee802154_header_ie_type;
+static int hf_ieee802154_header_ie_id;
+static int hf_ieee802154_header_ie_length;
+static int hf_ieee802154_ie_unknown_content;
+static int hf_ieee802154_hie_unsupported;
+static int hf_ieee802154_hie_time_correction;
+static int hf_ieee802154_hie_ht1;
+static int hf_ieee802154_hie_ht2;
+static int hf_ieee802154_nack;
+static int hf_ieee802154_hie_time_correction_time_sync_info;
+static int hf_ieee802154_hie_time_correction_value;
+static int hf_ieee802154_hie_csl;
+static int hf_ieee802154_hie_csl_phase;
+static int hf_ieee802154_hie_csl_period;
+static int hf_ieee802154_hie_csl_rendezvous_time;
+static int hf_ieee802154_hie_rdv;
+static int hf_ieee802154_hie_rdv_wakeup_interval;
+static int hf_ieee802154_hie_global_time;
+static int hf_ieee802154_hie_global_time_value;
+static int hf_ieee802154_hie_vendor_specific;
+static int hf_ieee802154_hie_vendor_specific_vendor_oui;
+static int hf_ieee802154_hie_vendor_specific_content;
+static int hf_ieee802154_payload_ies;
+static int hf_ieee802154_payload_ie_tlv;
+static int hf_ieee802154_payload_ie_type;
+static int hf_ieee802154_payload_ie_id;
+static int hf_ieee802154_payload_ie_length;
+static int hf_ieee802154_pie_unsupported;
+static int hf_ieee802154_pie_termination;
+static int hf_ieee802154_pie_vendor;
+static int hf_ieee802154_pie_vendor_oui;
+static int hf_ieee802154_pie_ietf;
+static int hf_ieee802154_mlme;
+static int hf_ieee802154_mlme_ie_data;
+static int hf_ieee802154_mlme_ie_unsupported;
+static int hf_ieee802154_psie;
+static int hf_ieee802154_psie_type;
+static int hf_ieee802154_psie_id_short;
+static int hf_ieee802154_psie_length_short;
+static int hf_ieee802154_psie_id_long;
+static int hf_ieee802154_psie_length_long;
+
+static int hf_ieee802154_tsch_sync;
+static int hf_ieee802154_tsch_asn;
+static int hf_ieee802154_tsch_join_metric;
+static int hf_ieee802154_tsch_slotframe;
+static int hf_ieee802154_tsch_link_info;
+static int hf_ieee802154_tsch_slotf_link_nb_slotf;
+static int hf_ieee802154_tsch_slotf_link_slotf_handle;
+static int hf_ieee802154_tsch_slotf_size;
+static int hf_ieee802154_tsch_slotf_link_nb_links;
+static int hf_ieee802154_tsch_slotf_link_timeslot;
+static int hf_ieee802154_tsch_slotf_link_channel_offset;
+static int hf_ieee802154_tsch_slotf_link_options;
+static int hf_ieee802154_tsch_slotf_link_options_tx;
+static int hf_ieee802154_tsch_slotf_link_options_rx;
+static int hf_ieee802154_tsch_slotf_link_options_shared;
+static int hf_ieee802154_tsch_slotf_link_options_timkeeping;
+static int hf_ieee802154_tsch_slotf_link_options_priority;
+static int hf_ieee802154_tsch_channel_hopping;
+static int hf_ieee802154_tsch_hopping_sequence_id;
+static int hf_ieee802154_tsch_timeslot;
+static int hf_ieee802154_tsch_timeslot_id;
+static int hf_ieee802154_tsch_timeslot_cca_offset;
+static int hf_ieee802154_tsch_timeslot_cca;
+static int hf_ieee802154_tsch_timeslot_tx_offset;
+static int hf_ieee802154_tsch_timeslot_rx_offset;
+static int hf_ieee802154_tsch_timeslot_rx_ack_delay;
+static int hf_ieee802154_tsch_timeslot_tx_ack_delay;
+static int hf_ieee802154_tsch_timeslot_rx_wait;
+static int hf_ieee802154_tsch_timeslot_ack_wait;
+static int hf_ieee802154_tsch_timeslot_turnaround;
+static int hf_ieee802154_tsch_timeslot_max_ack;
+static int hf_ieee802154_tsch_timeslot_max_tx;
+static int hf_ieee802154_tsch_timeslot_length;
+
+static int hf_ieee802154_psie_eb_filter;
+static int hf_ieee802154_psie_eb_filter_pjoin;
+static int hf_ieee802154_psie_eb_filter_lqi;
+static int hf_ieee802154_psie_eb_filter_lqi_min;
+static int hf_ieee802154_psie_eb_filter_percent;
+static int hf_ieee802154_psie_eb_filter_percent_prob;
+static int hf_ieee802154_psie_eb_filter_attr_id;
+static int hf_ieee802154_psie_eb_filter_attr_id_bitmap;
+static int hf_ieee802154_p_ie_ietf_sub_id;
+
+static int hf_ieee802154_6top;
+static int hf_ieee802154_6top_version;
+static int hf_ieee802154_6top_type;
+static int hf_ieee802154_6top_flags_reserved;
+static int hf_ieee802154_6top_code;
+static int hf_ieee802154_6top_sfid;
+static int hf_ieee802154_6top_seqnum;
+static int hf_ieee802154_6top_metadata;
+static int hf_ieee802154_6top_cell_options;
+static int hf_ieee802154_6top_cell_option_tx;
+static int hf_ieee802154_6top_cell_option_rx;
+static int hf_ieee802154_6top_cell_option_shared;
+static int hf_ieee802154_6top_cell_option_reserved;
+static int hf_ieee802154_6top_num_cells;
+static int hf_ieee802154_6top_cell_list;
+static int hf_ieee802154_6top_rel_cell_list;
+static int hf_ieee802154_6top_cand_cell_list;
+static int hf_ieee802154_6top_cell;
+static int hf_ieee802154_6top_reserved;
+static int hf_ieee802154_6top_offset;
+static int hf_ieee802154_6top_max_num_cells;
+static int hf_ieee802154_6top_slot_offset;
+static int hf_ieee802154_6top_channel_offset;
+static int hf_ieee802154_6top_total_num_cells;
+static int hf_ieee802154_6top_payload;
+
+static int hf_ieee802159_mpx;
+static int hf_ieee802159_mpx_transaction_control;
+static int hf_ieee802159_mpx_transfer_type;
+static int hf_ieee802159_mpx_transaction_id;
+static int hf_ieee802159_mpx_transaction_id_as_multiplex_id;
+static int hf_ieee802159_mpx_fragment_number;
+static int hf_ieee802159_mpx_total_frame_size;
+static int hf_ieee802159_mpx_multiplex_id;
+static int hf_ieee802159_mpx_kmp_id;
+static int hf_ieee802159_mpx_kmp_vendor_oui;
+static int hf_ieee802159_mpx_fragment;
+static int hf_ieee802159_mpx_wisun_subid;
+
+static int proto_zboss;
+static int hf_zboss_direction;
+static int hf_zboss_page;
+static int hf_zboss_channel;
+static int hf_zboss_trace_number;
+
+static int hf_ieee802154_seqno;
+static int hf_ieee802154_dst_panID;
+static int hf_ieee802154_dst16;
+static int hf_ieee802154_dst64;
+static int hf_ieee802154_src_panID;
+static int hf_ieee802154_src16;
+static int hf_ieee802154_src64;
+static int hf_ieee802154_src64_origin;
+static int hf_ieee802154_addr16;
+static int hf_ieee802154_addr64;
+static int hf_ieee802154_fcs;
+static int hf_ieee802154_fcs32;
+static int hf_ieee802154_rssi;
+static int hf_ieee802154_fcs_ok;
+static int hf_ieee802154_correlation;
 
 /* Registered fields for Command Packets */
-static int hf_ieee802154_cmd_id = -1;
-static int hf_ieee802154_cinfo_alt_coord = -1;
-static int hf_ieee802154_cinfo_device_type = -1;
-static int hf_ieee802154_cinfo_power_src = -1;
-static int hf_ieee802154_cinfo_idle_rx = -1;
-static int hf_ieee802154_cinfo_sec_capable = -1;
-static int hf_ieee802154_cinfo_alloc_addr = -1;
-static int hf_ieee802154_assoc_addr = -1;
-static int hf_ieee802154_assoc_status = -1;
-static int hf_ieee802154_disassoc_reason = -1;
-static int hf_ieee802154_realign_pan = -1;
-static int hf_ieee802154_realign_caddr = -1;
-static int hf_ieee802154_realign_channel = -1;
-static int hf_ieee802154_realign_addr = -1;
-static int hf_ieee802154_realign_channel_page = -1;
-static int hf_ieee802154_gtsreq_len = -1;
-static int hf_ieee802154_gtsreq_dir = -1;
-static int hf_ieee802154_gtsreq_type = -1;
-static int hf_ieee802154_cmd_vendor_oui = -1;
+static int hf_ieee802154_cmd_id;
+static int hf_ieee802154_cinfo_alt_coord;
+static int hf_ieee802154_cinfo_device_type;
+static int hf_ieee802154_cinfo_power_src;
+static int hf_ieee802154_cinfo_idle_rx;
+static int hf_ieee802154_cinfo_sec_capable;
+static int hf_ieee802154_cinfo_alloc_addr;
+static int hf_ieee802154_assoc_addr;
+static int hf_ieee802154_assoc_status;
+static int hf_ieee802154_disassoc_reason;
+static int hf_ieee802154_realign_pan;
+static int hf_ieee802154_realign_caddr;
+static int hf_ieee802154_realign_channel;
+static int hf_ieee802154_realign_addr;
+static int hf_ieee802154_realign_channel_page;
+static int hf_ieee802154_gtsreq_len;
+static int hf_ieee802154_gtsreq_dir;
+static int hf_ieee802154_gtsreq_type;
+static int hf_ieee802154_cmd_vendor_oui;
 
 /* Registered fields for Beacon Packets */
-static int hf_ieee802154_beacon_order = -1;
-static int hf_ieee802154_superframe_order = -1;
-static int hf_ieee802154_cap = -1;
-static int hf_ieee802154_superframe_battery_ext = -1;
-static int hf_ieee802154_superframe_coord = -1;
-static int hf_ieee802154_assoc_permit = -1;
-static int hf_ieee802154_gts_count = -1;
-static int hf_ieee802154_gts_permit = -1;
-static int hf_ieee802154_gts_direction = -1;
-static int hf_ieee802154_gts_address = -1;
-static int hf_ieee802154_pending16 = -1;
-static int hf_ieee802154_pending64 = -1;
+static int hf_ieee802154_beacon_order;
+static int hf_ieee802154_superframe_order;
+static int hf_ieee802154_cap;
+static int hf_ieee802154_superframe_battery_ext;
+static int hf_ieee802154_superframe_coord;
+static int hf_ieee802154_assoc_permit;
+static int hf_ieee802154_gts_count;
+static int hf_ieee802154_gts_permit;
+static int hf_ieee802154_gts_direction;
+static int hf_ieee802154_gts_address;
+static int hf_ieee802154_pending16;
+static int hf_ieee802154_pending64;
 
 /* Registered fields for Auxiliary Security Header */
-static int hf_ieee802154_aux_security_header = -1;
-static int hf_ieee802154_aux_sec_security_control = -1;
-static int hf_ieee802154_aux_sec_security_level = -1;
-static int hf_ieee802154_aux_sec_key_id_mode = -1;
-static int hf_ieee802154_aux_sec_frame_counter_suppression = -1;
-static int hf_ieee802154_aux_sec_asn_in_nonce = -1;
-static int hf_ieee802154_aux_sec_reserved = -1;
-static int hf_ieee802154_aux_sec_frame_counter = -1;
-static int hf_ieee802154_aux_sec_key_source = -1;
-static int hf_ieee802154_aux_sec_key_source_bytes = -1;
-static int hf_ieee802154_aux_sec_key_index = -1;
-static int hf_ieee802154_mic = -1;
-static int hf_ieee802154_key_number = -1;
+static int hf_ieee802154_aux_security_header;
+static int hf_ieee802154_aux_sec_security_control;
+static int hf_ieee802154_aux_sec_security_level;
+static int hf_ieee802154_aux_sec_key_id_mode;
+static int hf_ieee802154_aux_sec_frame_counter_suppression;
+static int hf_ieee802154_aux_sec_asn_in_nonce;
+static int hf_ieee802154_aux_sec_reserved;
+static int hf_ieee802154_aux_sec_frame_counter;
+static int hf_ieee802154_aux_sec_key_source;
+static int hf_ieee802154_aux_sec_key_source_bytes;
+static int hf_ieee802154_aux_sec_key_index;
+static int hf_ieee802154_mic;
+static int hf_ieee802154_key_number;
 
 /* 802.15.4-2003 security */
-static int hf_ieee802154_sec_frame_counter = -1;
-static int hf_ieee802154_sec_key_sequence_counter = -1;
+static int hf_ieee802154_sec_frame_counter;
+static int hf_ieee802154_sec_key_sequence_counter;
 
 /* 802.15.4 ack */
-static int hf_ieee802154_no_ack = -1;
-static int hf_ieee802154_no_ack_request = -1;
-static int hf_ieee802154_ack_in = -1;
-static int hf_ieee802154_ack_to = -1;
-static int hf_ieee802154_ack_time = -1;
+static int hf_ieee802154_no_ack;
+static int hf_ieee802154_no_ack_request;
+static int hf_ieee802154_ack_in;
+static int hf_ieee802154_ack_to;
+static int hf_ieee802154_ack_time;
 
 /* 802.15.4 TAP */
-static int hf_ieee802154_tap_version = -1;
-static int hf_ieee802154_tap_reserved = -1;
-static int hf_ieee802154_tap_length = -1;
-static int hf_ieee802154_tap_data_length = -1;
-static int hf_ieee802154_tap_tlv_type = -1;
-static int hf_ieee802154_tap_tlv_length = -1;
-static int hf_ieee802154_tap_tlv_unknown = -1;
-static int hf_ieee802154_tap_tlv_padding = -1;
-static int hf_ieee802154_tap_fcs_type = -1;
-static int hf_ieee802154_tap_rss = -1;
-static int hf_ieee802154_ch_page = -1;
-static int hf_ieee802154_ch_num = -1;
-static int hf_ieee802154_bit_rate = -1;
-static int hf_ieee802154_sun_band = -1;
-static int hf_ieee802154_sun_type = -1;
-static int hf_ieee802154_sun_mode = -1;
-static int hf_ieee802154_mode_fsk_a = -1;
-static int hf_ieee802154_mode_fsk_b = -1;
-static int hf_ieee802154_mode_oqpsk_a = -1;
-static int hf_ieee802154_mode_oqpsk_b = -1;
-static int hf_ieee802154_mode_oqpsk_c = -1;
-static int hf_ieee802154_mode_ofdm = -1;
-static int hf_ieee802154_sof_ts = -1;
-static int hf_ieee802154_eof_ts = -1;
-static int hf_ieee802154_slot_start_ts = -1;
-static int hf_ieee802154_tap_timeslot_length = -1;
-static int hf_ieee802154_tap_lqi = -1;
-static int hf_ieee802154_chplan_start = -1;
-static int hf_ieee802154_chplan_spacing = -1;
-static int hf_ieee802154_chplan_channels = -1;
-static int hf_ieee802154_ch_freq = -1;
-static int hf_ieee802154_frame_start_offset = -1;
-static int hf_ieee802154_frame_duration = -1;
-static int hf_ieee802154_frame_end_offset = -1;
-static int hf_ieee802154_asn = -1;
-
-static int hf_ieee802154_tap_phr_type = -1;
-static int hf_ieee802154_tap_phr_bits = -1;
-static int hf_ieee802154_tap_phr_data = -1;
-
-static int hf_ieee802154_tap_phr_fsk = -1;
-static int hf_ieee802154_tap_fsk_ms_phr = -1;
-static int hf_ieee802154_tap_wisun_ms_phr = -1;
-
-static int hf_ieee802154_tap_phr_fsk_ms = -1;
-static int hf_ieee802154_tap_phr_fsk_fcs = -1;
-static int hf_ieee802154_tap_phr_fsk_dw = -1;
-static int hf_ieee802154_tap_phr_fsk_length = -1;
-
-static int hf_ieee802154_tap_phr_fsk_ms_param = -1;
-static int hf_ieee802154_tap_phr_fsk_ms_fec = -1;
-static int hf_ieee802154_tap_phr_fsk_ms_checksum = -1;
-static int hf_ieee802154_tap_phr_fsk_ms_parity = -1;
-
-static int hf_ieee802154_tap_phr_fsk_ms_mode_page = -1;
-static int hf_ieee802154_tap_phr_fsk_ms_mode_scheme = -1;
-static int hf_ieee802154_tap_phr_fsk_ms_mode_mode = -1;
-static int hf_ieee802154_tap_phr_fsk_ms_mode_addl_mode = -1;
-static int hf_ieee802154_tap_phr_wisun_fsk_ms_reserved = -1;
-static int hf_ieee802154_tap_phr_wisun_fsk_ms_phymodeid = -1;
+static int hf_ieee802154_tap_version;
+static int hf_ieee802154_tap_reserved;
+static int hf_ieee802154_tap_length;
+static int hf_ieee802154_tap_data_length;
+static int hf_ieee802154_tap_tlv_type;
+static int hf_ieee802154_tap_tlv_length;
+static int hf_ieee802154_tap_tlv_unknown;
+static int hf_ieee802154_tap_tlv_padding;
+static int hf_ieee802154_tap_fcs_type;
+static int hf_ieee802154_tap_rss;
+static int hf_ieee802154_ch_page;
+static int hf_ieee802154_ch_num;
+static int hf_ieee802154_bit_rate;
+static int hf_ieee802154_sun_band;
+static int hf_ieee802154_sun_type;
+static int hf_ieee802154_sun_mode;
+static int hf_ieee802154_mode_fsk_a;
+static int hf_ieee802154_mode_fsk_b;
+static int hf_ieee802154_mode_oqpsk_a;
+static int hf_ieee802154_mode_oqpsk_b;
+static int hf_ieee802154_mode_oqpsk_c;
+static int hf_ieee802154_mode_ofdm;
+static int hf_ieee802154_sof_ts;
+static int hf_ieee802154_eof_ts;
+static int hf_ieee802154_slot_start_ts;
+static int hf_ieee802154_tap_timeslot_length;
+static int hf_ieee802154_tap_lqi;
+static int hf_ieee802154_chplan_start;
+static int hf_ieee802154_chplan_spacing;
+static int hf_ieee802154_chplan_channels;
+static int hf_ieee802154_ch_freq;
+static int hf_ieee802154_frame_start_offset;
+static int hf_ieee802154_frame_duration;
+static int hf_ieee802154_frame_end_offset;
+static int hf_ieee802154_asn;
+
+static int hf_ieee802154_tap_phr_type;
+static int hf_ieee802154_tap_phr_bits;
+static int hf_ieee802154_tap_phr_data;
+
+static int hf_ieee802154_tap_phr_fsk;
+static int hf_ieee802154_tap_fsk_ms_phr;
+static int hf_ieee802154_tap_wisun_ms_phr;
+
+static int hf_ieee802154_tap_phr_fsk_ms;
+static int hf_ieee802154_tap_phr_fsk_fcs;
+static int hf_ieee802154_tap_phr_fsk_dw;
+static int hf_ieee802154_tap_phr_fsk_length;
+
+static int hf_ieee802154_tap_phr_fsk_ms_param;
+static int hf_ieee802154_tap_phr_fsk_ms_fec;
+static int hf_ieee802154_tap_phr_fsk_ms_checksum;
+static int hf_ieee802154_tap_phr_fsk_ms_parity;
+
+static int hf_ieee802154_tap_phr_fsk_ms_mode_page;
+static int hf_ieee802154_tap_phr_fsk_ms_mode_scheme;
+static int hf_ieee802154_tap_phr_fsk_ms_mode_mode;
+static int hf_ieee802154_tap_phr_fsk_ms_mode_addl_mode;
+static int hf_ieee802154_tap_phr_wisun_fsk_ms_reserved;
+static int hf_ieee802154_tap_phr_wisun_fsk_ms_phymodeid;
 
 /* Bit-masks for SUN FSK PHR per IEEE 802.15.4-2020 19.2.4 */
 #define IEEE802154_TAP_PHR_FSK_MS               0x8000
@@ -779,97 +779,97 @@ static ieee802154_transaction_t *transaction_start(packet_info *pinfo, proto_tre
 static ieee802154_transaction_t *transaction_end(packet_info *pinfo, proto_tree *tree, const ieee802154_packet *packet, guint32 *key);
 
 /* Initialize Subtree Pointers */
-static gint ett_ieee802154_nonask_phy = -1;
-static gint ett_ieee802154_nonask_phy_phr = -1;
-static gint ett_ieee802154_tap = -1;
-static gint ett_ieee802154_tap_header = -1;
-static gint ett_ieee802154_tap_tlv = -1;
-static gint ett_ieee802154 = -1;
-static gint ett_ieee802154_fcf = -1;
-static gint ett_ieee802154_auxiliary_security = -1;
-static gint ett_ieee802154_aux_sec_control = -1;
-static gint ett_ieee802154_aux_sec_key_id = -1;
-static gint ett_ieee802154_fcs = -1;
-static gint ett_ieee802154_cmd = -1;
-static gint ett_ieee802154_superframe = -1;
-static gint ett_ieee802154_gts = -1;
-static gint ett_ieee802154_gts_direction = -1;
-static gint ett_ieee802154_gts_descriptors = -1;
-static gint ett_ieee802154_pendaddr = -1;
-static gint ett_ieee802154_header_ies = -1;
-static gint ett_ieee802154_header_ie = -1;
-static gint ett_ieee802154_header_ie_tlv = -1;
-static gint ett_ieee802154_hie_unsupported = -1;
-static gint ett_ieee802154_hie_time_correction = -1;
-static gint ett_ieee802154_hie_ht = -1;
-static gint ett_ieee802154_hie_csl = -1;
-static gint ett_ieee802154_hie_rdv = -1;
-static gint ett_ieee802154_hie_global_time = -1;
-static gint ett_ieee802154_hie_vendor_specific = -1;
-static gint ett_ieee802154_payload_ie = -1;
-static gint ett_ieee802154_payload_ie_tlv = -1;
-static gint ett_ieee802154_pie_termination = -1;
-static gint ett_ieee802154_pie_vendor = -1;
-static gint ett_ieee802154_pie_ietf = -1;
-static gint ett_ieee802154_pie_unsupported = -1;
-static gint ett_ieee802154_mlme = -1;
-static gint ett_ieee802154_mlme_payload = -1;
-static gint ett_ieee802154_mlme_payload_data = -1;
-static gint ett_ieee802154_mlme_unsupported = -1;
-static gint ett_ieee802154_tsch_slotframe = -1;
-static gint ett_ieee802154_tsch_slotframe_list = -1;
-static gint ett_ieee802154_tsch_slotframe_link = -1;
-static gint ett_ieee802154_tsch_slotframe_link_options = -1;
-static gint ett_ieee802154_tsch_timeslot = -1;
-static gint ett_ieee802154_tsch_synch = -1;
-static gint ett_ieee802154_channel_hopping = -1;
-static gint ett_ieee802154_psie = -1;
-static gint ett_ieee802154_eb_filter = -1;
-static gint ett_ieee802154_eb_filter_bitmap = -1;
-static gint ett_ieee802154_zigbee = -1;
-static gint ett_ieee802154_zboss = -1;
-static gint ett_ieee802154_p_ie_6top = -1;
-static gint ett_ieee802154_p_ie_6top_cell_options = -1;
-static gint ett_ieee802154_p_ie_6top_cell_list = -1;
-static gint ett_ieee802154_p_ie_6top_cand_cell_list = -1;
-static gint ett_ieee802154_p_ie_6top_rel_cell_list = -1;
-static gint ett_ieee802154_p_ie_6top_cell = -1;
-static gint ett_ieee802159_mpx = -1;
-static gint ett_ieee802159_mpx_transaction_control = -1;
-static gint ett_ieee802154_tap_phr = -1;
-
-static expert_field ei_ieee802154_fcs_bitmask_len = EI_INIT;
-static expert_field ei_ieee802154_invalid_addressing = EI_INIT;
-static expert_field ei_ieee802154_invalid_panid_compression = EI_INIT;
-static expert_field ei_ieee802154_invalid_panid_compression2 = EI_INIT;
-static expert_field ei_ieee802154_fcs = EI_INIT;
-static expert_field ei_ieee802154_decrypt_error = EI_INIT;
-static expert_field ei_ieee802154_dst = EI_INIT;
-static expert_field ei_ieee802154_src = EI_INIT;
-static expert_field ei_ieee802154_frame_ver = EI_INIT;
-/* static expert_field ei_ieee802154_frame_type = EI_INIT; */
-static expert_field ei_ieee802154_seqno_suppression = EI_INIT;
-static expert_field ei_ieee802154_ack_not_found = EI_INIT;
-static expert_field ei_ieee802154_ack_request_not_found = EI_INIT;
-static expert_field ei_ieee802154_time_correction_error = EI_INIT;
-static expert_field ei_ieee802154_6top_unsupported_type = EI_INIT;
-static expert_field ei_ieee802154_6top_unsupported_return_code = EI_INIT;
-static expert_field ei_ieee802154_6top_unsupported_command = EI_INIT;
-static expert_field ei_ieee802154_ie_unsupported_id = EI_INIT;
-static expert_field ei_ieee802154_ie_unknown_extra_content = EI_INIT;
-static expert_field ei_ieee802159_mpx_invalid_transfer_type = EI_INIT;
-static expert_field ei_ieee802159_mpx_unsupported_kmp = EI_INIT;
-static expert_field ei_ieee802159_mpx_unknown_kmp = EI_INIT;
-static expert_field ei_ieee802154_missing_payload_ie = EI_INIT;
-static expert_field ei_ieee802154_payload_ie_in_header = EI_INIT;
-static expert_field ei_ieee802154_unsupported_cmd = EI_INIT;
-static expert_field ei_ieee802154_unknown_cmd = EI_INIT;
-static expert_field ei_ieee802154_tap_tlv_invalid_type = EI_INIT;
-static expert_field ei_ieee802154_tap_tlv_invalid_length = EI_INIT;
-static expert_field ei_ieee802154_tap_tlv_padding_not_zeros = EI_INIT;
-static expert_field ei_ieee802154_tap_tlv_invalid_fcs_type = EI_INIT;
-static expert_field ei_ieee802154_tap_tlv_reserved_not_zero = EI_INIT;
-static expert_field ei_ieee802154_tap_no_payload = EI_INIT;
+static gint ett_ieee802154_nonask_phy;
+static gint ett_ieee802154_nonask_phy_phr;
+static gint ett_ieee802154_tap;
+static gint ett_ieee802154_tap_header;
+static gint ett_ieee802154_tap_tlv;
+static gint ett_ieee802154;
+static gint ett_ieee802154_fcf;
+static gint ett_ieee802154_auxiliary_security;
+static gint ett_ieee802154_aux_sec_control;
+static gint ett_ieee802154_aux_sec_key_id;
+static gint ett_ieee802154_fcs;
+static gint ett_ieee802154_cmd;
+static gint ett_ieee802154_superframe;
+static gint ett_ieee802154_gts;
+static gint ett_ieee802154_gts_direction;
+static gint ett_ieee802154_gts_descriptors;
+static gint ett_ieee802154_pendaddr;
+static gint ett_ieee802154_header_ies;
+static gint ett_ieee802154_header_ie;
+static gint ett_ieee802154_header_ie_tlv;
+static gint ett_ieee802154_hie_unsupported;
+static gint ett_ieee802154_hie_time_correction;
+static gint ett_ieee802154_hie_ht;
+static gint ett_ieee802154_hie_csl;
+static gint ett_ieee802154_hie_rdv;
+static gint ett_ieee802154_hie_global_time;
+static gint ett_ieee802154_hie_vendor_specific;
+static gint ett_ieee802154_payload_ie;
+static gint ett_ieee802154_payload_ie_tlv;
+static gint ett_ieee802154_pie_termination;
+static gint ett_ieee802154_pie_vendor;
+static gint ett_ieee802154_pie_ietf;
+static gint ett_ieee802154_pie_unsupported;
+static gint ett_ieee802154_mlme;
+static gint ett_ieee802154_mlme_payload;
+static gint ett_ieee802154_mlme_payload_data;
+static gint ett_ieee802154_mlme_unsupported;
+static gint ett_ieee802154_tsch_slotframe;
+static gint ett_ieee802154_tsch_slotframe_list;
+static gint ett_ieee802154_tsch_slotframe_link;
+static gint ett_ieee802154_tsch_slotframe_link_options;
+static gint ett_ieee802154_tsch_timeslot;
+static gint ett_ieee802154_tsch_synch;
+static gint ett_ieee802154_channel_hopping;
+static gint ett_ieee802154_psie;
+static gint ett_ieee802154_eb_filter;
+static gint ett_ieee802154_eb_filter_bitmap;
+static gint ett_ieee802154_zigbee;
+static gint ett_ieee802154_zboss;
+static gint ett_ieee802154_p_ie_6top;
+static gint ett_ieee802154_p_ie_6top_cell_options;
+static gint ett_ieee802154_p_ie_6top_cell_list;
+static gint ett_ieee802154_p_ie_6top_cand_cell_list;
+static gint ett_ieee802154_p_ie_6top_rel_cell_list;
+static gint ett_ieee802154_p_ie_6top_cell;
+static gint ett_ieee802159_mpx;
+static gint ett_ieee802159_mpx_transaction_control;
+static gint ett_ieee802154_tap_phr;
+
+static expert_field ei_ieee802154_fcs_bitmask_len;
+static expert_field ei_ieee802154_invalid_addressing;
+static expert_field ei_ieee802154_invalid_panid_compression;
+static expert_field ei_ieee802154_invalid_panid_compression2;
+static expert_field ei_ieee802154_fcs;
+static expert_field ei_ieee802154_decrypt_error;
+static expert_field ei_ieee802154_dst;
+static expert_field ei_ieee802154_src;
+static expert_field ei_ieee802154_frame_ver;
+/* static expert_field ei_ieee802154_frame_type; */
+static expert_field ei_ieee802154_seqno_suppression;
+static expert_field ei_ieee802154_ack_not_found;
+static expert_field ei_ieee802154_ack_request_not_found;
+static expert_field ei_ieee802154_time_correction_error;
+static expert_field ei_ieee802154_6top_unsupported_type;
+static expert_field ei_ieee802154_6top_unsupported_return_code;
+static expert_field ei_ieee802154_6top_unsupported_command;
+static expert_field ei_ieee802154_ie_unsupported_id;
+static expert_field ei_ieee802154_ie_unknown_extra_content;
+static expert_field ei_ieee802159_mpx_invalid_transfer_type;
+static expert_field ei_ieee802159_mpx_unsupported_kmp;
+static expert_field ei_ieee802159_mpx_unknown_kmp;
+static expert_field ei_ieee802154_missing_payload_ie;
+static expert_field ei_ieee802154_payload_ie_in_header;
+static expert_field ei_ieee802154_unsupported_cmd;
+static expert_field ei_ieee802154_unknown_cmd;
+static expert_field ei_ieee802154_tap_tlv_invalid_type;
+static expert_field ei_ieee802154_tap_tlv_invalid_length;
+static expert_field ei_ieee802154_tap_tlv_padding_not_zeros;
+static expert_field ei_ieee802154_tap_tlv_invalid_fcs_type;
+static expert_field ei_ieee802154_tap_tlv_reserved_not_zero;
+static expert_field ei_ieee802154_tap_no_payload;
 
 static int ieee802_15_4_short_address_type = -1;
 /*
diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c
index cc127990e9..26bdb61d71 100644
--- a/epan/dissectors/packet-ieee8021ah.c
+++ b/epan/dissectors/packet-ieee8021ah.c
@@ -38,32 +38,32 @@ static void dissect_ieee8021ah_common(tvbuff_t *tvb, packet_info *pinfo,
 /* ethertype for 802.1ah tag - encapsulating an Ethernet packet */
 static unsigned int ieee8021ah_ethertype = ETHERTYPE_IEEE_802_1AH;
 
-static int proto_ieee8021ah = -1;
-static int proto_ieee8021ad = -1;
+static int proto_ieee8021ah;
+static int proto_ieee8021ad;
 
 /* dot1ad B-tag fields */
-static int hf_ieee8021ad_priority = -1;
-static int hf_ieee8021ad_cfi = -1;
-static int hf_ieee8021ad_id = -1;
-static int hf_ieee8021ad_svid = -1;
-static int hf_ieee8021ad_cvid = -1;
+static int hf_ieee8021ad_priority;
+static int hf_ieee8021ad_cfi;
+static int hf_ieee8021ad_id;
+static int hf_ieee8021ad_svid;
+static int hf_ieee8021ad_cvid;
 
 /* dot1ah C-tag fields */
-static int hf_ieee8021ah_priority = -1;
-static int hf_ieee8021ah_drop = -1;    /* drop eligibility */
-static int hf_ieee8021ah_nca = -1;     /* no customer addresses (c_daddr & c_saddr are 0) */
-static int hf_ieee8021ah_res1 = -1;    /* 2 bits reserved; ignored on receive */
-static int hf_ieee8021ah_res2 = -1;    /* 2 bits reserved; delete frame if non-zero */
-static int hf_ieee8021ah_isid = -1;    /* I-SID */
-static int hf_ieee8021ah_c_daddr = -1; /* encapsulated customer dest addr */
-static int hf_ieee8021ah_c_saddr = -1; /* encapsulated customer src addr */
-
-static int hf_ieee8021ah_etype = -1;
-/* static int hf_ieee8021ah_len = -1; */
-static int hf_ieee8021ah_trailer = -1;
-
-static gint ett_ieee8021ah = -1;
-static gint ett_ieee8021ad = -1;
+static int hf_ieee8021ah_priority;
+static int hf_ieee8021ah_drop;    /* drop eligibility */
+static int hf_ieee8021ah_nca;     /* no customer addresses (c_daddr & c_saddr are 0) */
+static int hf_ieee8021ah_res1;    /* 2 bits reserved; ignored on receive */
+static int hf_ieee8021ah_res2;    /* 2 bits reserved; delete frame if non-zero */
+static int hf_ieee8021ah_isid;    /* I-SID */
+static int hf_ieee8021ah_c_daddr; /* encapsulated customer dest addr */
+static int hf_ieee8021ah_c_saddr; /* encapsulated customer src addr */
+
+static int hf_ieee8021ah_etype;
+/* static int hf_ieee8021ah_len; */
+static int hf_ieee8021ah_trailer;
+
+static gint ett_ieee8021ah;
+static gint ett_ieee8021ad;
 
 #define IEEE8021AD_LEN 4
 #define IEEE8021AH_LEN 18
diff --git a/epan/dissectors/packet-ieee8021cb.c b/epan/dissectors/packet-ieee8021cb.c
index c0cdd30398..1e646e6105 100644
--- a/epan/dissectors/packet-ieee8021cb.c
+++ b/epan/dissectors/packet-ieee8021cb.c
@@ -35,16 +35,16 @@ static capture_dissector_handle_t llc_cap_handle;
 
 /* GLOBALS ************************************************************/
 
-static int proto_ieee8021cb = -1;
+static int proto_ieee8021cb;
 
 /* dot1cb R-tag fields */
-static int hf_ieee8021cb_res = -1;
-static int hf_ieee8021cb_seq = -1;
+static int hf_ieee8021cb_res;
+static int hf_ieee8021cb_seq;
 
 /* Encapsulated protocol */
-static int hf_ieee8021cb_etype = -1;
+static int hf_ieee8021cb_etype;
 
-static gint ett_ieee8021cb = -1;
+static gint ett_ieee8021cb;
 
 #define IEEE8021CB_LEN 6
 
diff --git a/epan/dissectors/packet-ieee802a.c b/epan/dissectors/packet-ieee802a.c
index 450abb8ad1..13249458f5 100644
--- a/epan/dissectors/packet-ieee802a.c
+++ b/epan/dissectors/packet-ieee802a.c
@@ -21,11 +21,11 @@ void proto_reg_handoff_ieee802a(void);
 
 static dissector_handle_t ieee802a_handle;
 
-static int proto_ieee802a = -1;
-static int hf_ieee802a_oui = -1;
-static int hf_ieee802a_pid = -1;
+static int proto_ieee802a;
+static int hf_ieee802a_oui;
+static int hf_ieee802a_pid;
 
-static gint ett_ieee802a = -1;
+static gint ett_ieee802a;
 
 /*
  * Hash table for translating OUIs to a dissector table/field info pair;
diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c
index ad47fdcc55..6227740282 100644
--- a/epan/dissectors/packet-ifcp.c
+++ b/epan/dissectors/packet-ifcp.c
@@ -94,38 +94,38 @@ static const guint8 ifcp_header_4_bytes[4] = {
     0x02, 0x01, 0xFD, 0xFE
 };
 
-static int proto_ifcp                = -1;
-
-static int hf_ifcp_protocol          = -1;
-static int hf_ifcp_protocol_c        = -1;
-static int hf_ifcp_version           = -1;
-static int hf_ifcp_version_c         = -1;
-static int hf_ifcp_encap_flags_c     = -1;
-static int hf_ifcp_framelen          = -1;
-static int hf_ifcp_framelen_c        = -1;
-static int hf_ifcp_tsec              = -1;
-static int hf_ifcp_tusec             = -1;
-static int hf_ifcp_encap_crc         = -1;
-static int hf_ifcp_sof               = -1;
-static int hf_ifcp_sof_c             = -1;
-static int hf_ifcp_eof               = -1;
-static int hf_ifcp_eof_c             = -1;
-static int hf_ifcp_ls_command_acc    = -1;
-static int hf_ifcp_flags             = -1;
-static int hf_ifcp_flags_ses         = -1;
-static int hf_ifcp_flags_trp         = -1;
-static int hf_ifcp_flags_spc         = -1;
-static int hf_ifcp_common_flags      = -1;
-static int hf_ifcp_common_flags_crcv = -1;
-
-static int ett_ifcp              = -1;
-static int ett_ifcp_sof          = -1;
-static int ett_ifcp_eof          = -1;
-static int ett_ifcp_flags        = -1;
-static int ett_ifcp_common_flags = -1;
-static int ett_ifcp_protocol     = -1;
-static int ett_ifcp_version      = -1;
-static int ett_ifcp_frame_len    = -1;
+static int proto_ifcp;
+
+static int hf_ifcp_protocol;
+static int hf_ifcp_protocol_c;
+static int hf_ifcp_version;
+static int hf_ifcp_version_c;
+static int hf_ifcp_encap_flags_c;
+static int hf_ifcp_framelen;
+static int hf_ifcp_framelen_c;
+static int hf_ifcp_tsec;
+static int hf_ifcp_tusec;
+static int hf_ifcp_encap_crc;
+static int hf_ifcp_sof;
+static int hf_ifcp_sof_c;
+static int hf_ifcp_eof;
+static int hf_ifcp_eof_c;
+static int hf_ifcp_ls_command_acc;
+static int hf_ifcp_flags;
+static int hf_ifcp_flags_ses;
+static int hf_ifcp_flags_trp;
+static int hf_ifcp_flags_spc;
+static int hf_ifcp_common_flags;
+static int hf_ifcp_common_flags_crcv;
+
+static int ett_ifcp;
+static int ett_ifcp_sof;
+static int ett_ifcp_eof;
+static int ett_ifcp_flags;
+static int ett_ifcp_common_flags;
+static int ett_ifcp_protocol;
+static int ett_ifcp_version;
+static int ett_ifcp_frame_len;
 
 static gboolean ifcp_desegment    = TRUE;
 
diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c
index e043b03eb5..15bd0cc000 100644
--- a/epan/dissectors/packet-igap.c
+++ b/epan/dissectors/packet-igap.c
@@ -39,30 +39,30 @@ void proto_reg_handoff_igap(void);
 
 static dissector_handle_t igap_handle;
 
-static int proto_igap      = -1;
-static int hf_type         = -1;
-static int hf_max_resp     = -1;
-static int hf_checksum     = -1;
-static int hf_checksum_status = -1;
-static int hf_maddr        = -1;
-static int hf_version      = -1;
-static int hf_subtype      = -1;
-static int hf_challengeid  = -1;
-static int hf_asize        = -1;
-static int hf_msize        = -1;
-static int hf_account      = -1;
+static int proto_igap;
+static int hf_type;
+static int hf_max_resp;
+static int hf_checksum;
+static int hf_checksum_status;
+static int hf_maddr;
+static int hf_version;
+static int hf_subtype;
+static int hf_challengeid;
+static int hf_asize;
+static int hf_msize;
+static int hf_account;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_igap_challenge = -1;
-static int hf_igap_user_password = -1;
-static int hf_igap_authentication_result = -1;
-static int hf_igap_result_of_md5_calculation = -1;
-static int hf_igap_accounting_status = -1;
-static int hf_igap_unknown_message = -1;
+static int hf_igap_challenge;
+static int hf_igap_user_password;
+static int hf_igap_authentication_result;
+static int hf_igap_result_of_md5_calculation;
+static int hf_igap_accounting_status;
+static int hf_igap_unknown_message;
 
-static int ett_igap = -1;
+static int ett_igap;
 
-static expert_field ei_checksum = EI_INIT;
+static expert_field ei_checksum;
 
 static const value_string igap_types[] = {
     {IGMP_IGAP_JOIN,  "Membership Report (Join)"},
diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c
index 2bac7fb507..a0eab14daa 100644
--- a/epan/dissectors/packet-igmp.c
+++ b/epan/dissectors/packet-igmp.c
@@ -110,57 +110,57 @@ void proto_reg_handoff_igmp(void);
 
 static dissector_handle_t igmp_handle, igmpv0_handle, igmpv1_handle, igmpv2_handle;
 
-static int proto_igmp = -1;
-static int hf_type = -1;
-static int hf_reserved = -1;
-static int hf_version = -1;
-static int hf_group_type = -1;
-static int hf_reply_code = -1;
-static int hf_reply_pending = -1;
-static int hf_checksum = -1;
-static int hf_checksum_status = -1;
-static int hf_identifier = -1;
-static int hf_access_key = -1;
-static int hf_max_resp = -1;
-static int hf_max_resp_exp = -1;
-static int hf_max_resp_mant = -1;
-static int hf_suppress = -1;
-static int hf_qrv = -1;
-static int hf_qqic = -1;
-static int hf_num_src = -1;
-static int hf_saddr = -1;
-static int hf_num_grp_recs = -1;
-static int hf_record_type = -1;
-static int hf_aux_data_len = -1;
-static int hf_maddr = -1;
-static int hf_aux_data = -1;
-static int hf_data = -1;
-static int hf_mtrace_max_hops = -1;
-static int hf_mtrace_saddr = -1;
-static int hf_mtrace_raddr = -1;
-static int hf_mtrace_rspaddr = -1;
-static int hf_mtrace_resp_ttl = -1;
-static int hf_mtrace_q_id = -1;
-static int hf_mtrace_q_arrival = -1;
-static int hf_mtrace_q_inaddr = -1;
-static int hf_mtrace_q_outaddr = -1;
-static int hf_mtrace_q_prevrtr = -1;
-static int hf_mtrace_q_inpkt = -1;
-static int hf_mtrace_q_outpkt = -1;
-static int hf_mtrace_q_total = -1;
-static int hf_mtrace_q_rtg_proto = -1;
-static int hf_mtrace_q_fwd_ttl = -1;
-static int hf_mtrace_q_mbz = -1;
-static int hf_mtrace_q_s = -1;
-static int hf_mtrace_q_src_mask = -1;
-static int hf_mtrace_q_fwd_code = -1;
-
-static int ett_igmp = -1;
-static int ett_group_record = -1;
-static int ett_max_resp = -1;
-static int ett_mtrace_block = -1;
-
-static expert_field ei_checksum = EI_INIT;
+static int proto_igmp;
+static int hf_type;
+static int hf_reserved;
+static int hf_version;
+static int hf_group_type;
+static int hf_reply_code;
+static int hf_reply_pending;
+static int hf_checksum;
+static int hf_checksum_status;
+static int hf_identifier;
+static int hf_access_key;
+static int hf_max_resp;
+static int hf_max_resp_exp;
+static int hf_max_resp_mant;
+static int hf_suppress;
+static int hf_qrv;
+static int hf_qqic;
+static int hf_num_src;
+static int hf_saddr;
+static int hf_num_grp_recs;
+static int hf_record_type;
+static int hf_aux_data_len;
+static int hf_maddr;
+static int hf_aux_data;
+static int hf_data;
+static int hf_mtrace_max_hops;
+static int hf_mtrace_saddr;
+static int hf_mtrace_raddr;
+static int hf_mtrace_rspaddr;
+static int hf_mtrace_resp_ttl;
+static int hf_mtrace_q_id;
+static int hf_mtrace_q_arrival;
+static int hf_mtrace_q_inaddr;
+static int hf_mtrace_q_outaddr;
+static int hf_mtrace_q_prevrtr;
+static int hf_mtrace_q_inpkt;
+static int hf_mtrace_q_outpkt;
+static int hf_mtrace_q_total;
+static int hf_mtrace_q_rtg_proto;
+static int hf_mtrace_q_fwd_ttl;
+static int hf_mtrace_q_mbz;
+static int hf_mtrace_q_s;
+static int hf_mtrace_q_src_mask;
+static int hf_mtrace_q_fwd_code;
+
+static int ett_igmp;
+static int ett_group_record;
+static int ett_max_resp;
+static int ett_mtrace_block;
+
+static expert_field ei_checksum;
 
 static dissector_table_t   subdissector_table;
 
diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c
index c4419447c8..12497b45e7 100644
--- a/epan/dissectors/packet-igrp.c
+++ b/epan/dissectors/packet-igrp.c
@@ -30,28 +30,28 @@ void proto_reg_handoff_igrp(void);
 
 static dissector_handle_t igrp_handle;
 
-static gint proto_igrp = -1;
-static gint hf_igrp_update = -1;
-static gint hf_igrp_as = -1;
+static gint proto_igrp;
+static gint hf_igrp_update;
+static gint hf_igrp_as;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_igrp_load = -1;
-static int hf_igrp_bandwidth = -1;
-static int hf_igrp_command = -1;
-static int hf_igrp_reliability = -1;
-static int hf_igrp_network = -1;
-static int hf_igrp_version = -1;
-static int hf_igrp_interior_routes = -1;
-static int hf_igrp_mtu = -1;
-static int hf_igrp_hop_count = -1;
-static int hf_igrp_exterior_routes = -1;
-static int hf_igrp_delay = -1;
-static int hf_igrp_checksum = -1;
-static int hf_igrp_system_routes = -1;
-static gint ett_igrp = -1;
-static gint ett_igrp_vektor = -1;
-static gint ett_igrp_net = -1;
-
-static expert_field ei_igrp_version = EI_INIT;
+static int hf_igrp_load;
+static int hf_igrp_bandwidth;
+static int hf_igrp_command;
+static int hf_igrp_reliability;
+static int hf_igrp_network;
+static int hf_igrp_version;
+static int hf_igrp_interior_routes;
+static int hf_igrp_mtu;
+static int hf_igrp_hop_count;
+static int hf_igrp_exterior_routes;
+static int hf_igrp_delay;
+static int hf_igrp_checksum;
+static int hf_igrp_system_routes;
+static gint ett_igrp;
+static gint ett_igrp_vektor;
+static gint ett_igrp_net;
+
+static expert_field ei_igrp_version;
 
 static void dissect_vektor_igrp (packet_info *pinfo, tvbuff_t *tvb, proto_tree *igrp_vektor_tree, guint8 network);
 
diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c
index c1a629ece7..32d7915ea7 100644
--- a/epan/dissectors/packet-imap.c
+++ b/epan/dissectors/packet-imap.c
@@ -25,28 +25,28 @@
 void proto_register_imap(void);
 void proto_reg_handoff_imap(void);
 
-static int proto_imap = -1;
-static int hf_imap_isrequest = -1;
-static int hf_imap_line = -1;
-static int hf_imap_request = -1;
-static int hf_imap_request_tag = -1;
-static int hf_imap_response = -1;
-static int hf_imap_response_tag = -1;
-static int hf_imap_request_command = -1;
-static int hf_imap_response_command = -1;
-static int hf_imap_tag = -1;
-static int hf_imap_command = -1;
-static int hf_imap_response_status = -1;
-static int hf_imap_request_folder = -1;
-static int hf_imap_request_username = -1;
-static int hf_imap_request_password = -1;
-static int hf_imap_request_uid = -1;
-static int hf_imap_response_in = -1;
-static int hf_imap_response_to = -1;
-static int hf_imap_time = -1;
-
-static gint ett_imap = -1;
-static gint ett_imap_reqresp = -1;
+static int proto_imap;
+static int hf_imap_isrequest;
+static int hf_imap_line;
+static int hf_imap_request;
+static int hf_imap_request_tag;
+static int hf_imap_response;
+static int hf_imap_response_tag;
+static int hf_imap_request_command;
+static int hf_imap_response_command;
+static int hf_imap_tag;
+static int hf_imap_command;
+static int hf_imap_response_status;
+static int hf_imap_request_folder;
+static int hf_imap_request_username;
+static int hf_imap_request_password;
+static int hf_imap_request_uid;
+static int hf_imap_response_in;
+static int hf_imap_response_to;
+static int hf_imap_time;
+
+static gint ett_imap;
+static gint ett_imap_reqresp;
 
 static int credentials_tap = -1;
 
diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c
index 95be6b1a30..af795ed88e 100644
--- a/epan/dissectors/packet-imf.c
+++ b/epan/dissectors/packet-imf.c
@@ -36,115 +36,115 @@ static int imf_eo_tap = -1;
 #define PSNAME "IMF"
 #define PFNAME "imf"
 
-static int proto_imf = -1;
-
-static int hf_imf_date = -1;
-static int hf_imf_from = -1;
-static int hf_imf_sender = -1;
-static int hf_imf_reply_to = -1;
-static int hf_imf_to = -1;
-static int hf_imf_cc = -1;
-static int hf_imf_bcc = -1;
-static int hf_imf_message_id = -1;
-static int hf_imf_in_reply_to = -1;
-static int hf_imf_references = -1;
-static int hf_imf_subject = -1;
-static int hf_imf_comments = -1;
-static int hf_imf_user_agent = -1;
-static int hf_imf_keywords = -1;
-static int hf_imf_resent_date = -1;
-static int hf_imf_resent_from = -1;
-static int hf_imf_resent_sender = -1;
-static int hf_imf_resent_to = -1;
-static int hf_imf_resent_cc = -1;
-static int hf_imf_resent_bcc = -1;
-static int hf_imf_resent_message_id = -1;
-static int hf_imf_return_path = -1;
-static int hf_imf_received = -1;
-static int hf_imf_content_type = -1;
-static int hf_imf_content_type_type = -1;
-static int hf_imf_content_type_parameters = -1;
-static int hf_imf_content_id = -1;
-static int hf_imf_content_transfer_encoding = -1;
-static int hf_imf_content_description = -1;
-static int hf_imf_mime_version = -1;
-static int hf_imf_thread_index = -1;
-static int hf_imf_lines = -1;
-static int hf_imf_precedence = -1;
-static int hf_imf_ext_mailer = -1;
-static int hf_imf_ext_mimeole = -1;
-static int hf_imf_ext_tnef_correlator = -1;
-static int hf_imf_ext_expiry_date = -1;
-static int hf_imf_ext_uidl = -1;
-static int hf_imf_ext_authentication_warning = -1;
-static int hf_imf_ext_virus_scanned = -1;
-static int hf_imf_ext_original_to = -1;
-static int hf_imf_extension = -1;
-static int hf_imf_extension_type = -1;
-static int hf_imf_extension_value = -1;
+static int proto_imf;
+
+static int hf_imf_date;
+static int hf_imf_from;
+static int hf_imf_sender;
+static int hf_imf_reply_to;
+static int hf_imf_to;
+static int hf_imf_cc;
+static int hf_imf_bcc;
+static int hf_imf_message_id;
+static int hf_imf_in_reply_to;
+static int hf_imf_references;
+static int hf_imf_subject;
+static int hf_imf_comments;
+static int hf_imf_user_agent;
+static int hf_imf_keywords;
+static int hf_imf_resent_date;
+static int hf_imf_resent_from;
+static int hf_imf_resent_sender;
+static int hf_imf_resent_to;
+static int hf_imf_resent_cc;
+static int hf_imf_resent_bcc;
+static int hf_imf_resent_message_id;
+static int hf_imf_return_path;
+static int hf_imf_received;
+static int hf_imf_content_type;
+static int hf_imf_content_type_type;
+static int hf_imf_content_type_parameters;
+static int hf_imf_content_id;
+static int hf_imf_content_transfer_encoding;
+static int hf_imf_content_description;
+static int hf_imf_mime_version;
+static int hf_imf_thread_index;
+static int hf_imf_lines;
+static int hf_imf_precedence;
+static int hf_imf_ext_mailer;
+static int hf_imf_ext_mimeole;
+static int hf_imf_ext_tnef_correlator;
+static int hf_imf_ext_expiry_date;
+static int hf_imf_ext_uidl;
+static int hf_imf_ext_authentication_warning;
+static int hf_imf_ext_virus_scanned;
+static int hf_imf_ext_original_to;
+static int hf_imf_extension;
+static int hf_imf_extension_type;
+static int hf_imf_extension_value;
 
 /* RFC 2156 */
-static int hf_imf_autoforwarded = -1;
-static int hf_imf_autosubmitted = -1;
-static int hf_imf_x400_content_identifier = -1;
-static int hf_imf_content_language = -1;
-static int hf_imf_conversion = -1;
-static int hf_imf_conversion_with_loss = -1;
-static int hf_imf_delivery_date = -1;
-static int hf_imf_discarded_x400_ipms_extensions = -1;
-static int hf_imf_discarded_x400_mts_extensions = -1;
-static int hf_imf_dl_expansion_history = -1;
-static int hf_imf_deferred_delivery = -1;
-static int hf_imf_expires = -1;
-static int hf_imf_importance = -1;
-static int hf_imf_incomplete_copy = -1;
-static int hf_imf_latest_delivery_time = -1;
-static int hf_imf_message_type = -1;
-static int hf_imf_original_encoded_information_types = -1;
-static int hf_imf_originator_return_address = -1;
-static int hf_imf_priority = -1;
-static int hf_imf_reply_by = -1;
-static int hf_imf_sensitivity = -1;
-static int hf_imf_supersedes = -1;
-static int hf_imf_x400_content_type = -1;
-static int hf_imf_x400_mts_identifier = -1;
-static int hf_imf_x400_originator = -1;
-static int hf_imf_x400_received = -1;
-static int hf_imf_x400_recipients = -1;
-
-static int hf_imf_delivered_to = -1;
-
-static int hf_imf_message_text = -1;
-
-static int hf_imf_display_name = -1;
-static int hf_imf_address = -1;
-/* static int hf_imf_mailbox_list = -1; */
-static int hf_imf_mailbox_list_item = -1;
-/* static int hf_imf_address_list = -1; */
-static int hf_imf_address_list_item = -1;
+static int hf_imf_autoforwarded;
+static int hf_imf_autosubmitted;
+static int hf_imf_x400_content_identifier;
+static int hf_imf_content_language;
+static int hf_imf_conversion;
+static int hf_imf_conversion_with_loss;
+static int hf_imf_delivery_date;
+static int hf_imf_discarded_x400_ipms_extensions;
+static int hf_imf_discarded_x400_mts_extensions;
+static int hf_imf_dl_expansion_history;
+static int hf_imf_deferred_delivery;
+static int hf_imf_expires;
+static int hf_imf_importance;
+static int hf_imf_incomplete_copy;
+static int hf_imf_latest_delivery_time;
+static int hf_imf_message_type;
+static int hf_imf_original_encoded_information_types;
+static int hf_imf_originator_return_address;
+static int hf_imf_priority;
+static int hf_imf_reply_by;
+static int hf_imf_sensitivity;
+static int hf_imf_supersedes;
+static int hf_imf_x400_content_type;
+static int hf_imf_x400_mts_identifier;
+static int hf_imf_x400_originator;
+static int hf_imf_x400_received;
+static int hf_imf_x400_recipients;
+
+static int hf_imf_delivered_to;
+
+static int hf_imf_message_text;
+
+static int hf_imf_display_name;
+static int hf_imf_address;
+/* static int hf_imf_mailbox_list; */
+static int hf_imf_mailbox_list_item;
+/* static int hf_imf_address_list; */
+static int hf_imf_address_list_item;
 
 /* draft-zeilenga-email-seclabel-04 */
-static int hf_imf_siolabel = -1;
-static int hf_imf_siolabel_marking = -1;
-static int hf_imf_siolabel_fgcolor = -1;
-static int hf_imf_siolabel_bgcolor = -1;
-static int hf_imf_siolabel_type = -1;
-static int hf_imf_siolabel_label = -1;
-static int hf_imf_siolabel_unknown = -1;
-
-static int ett_imf = -1;
-static int ett_imf_content_type = -1;
-static int ett_imf_mailbox = -1;
-static int ett_imf_group = -1;
-static int ett_imf_mailbox_list = -1;
-static int ett_imf_address_list = -1;
-static int ett_imf_siolabel = -1;
-static int ett_imf_extension = -1;
-static int ett_imf_message_text = -1;
+static int hf_imf_siolabel;
+static int hf_imf_siolabel_marking;
+static int hf_imf_siolabel_fgcolor;
+static int hf_imf_siolabel_bgcolor;
+static int hf_imf_siolabel_type;
+static int hf_imf_siolabel_label;
+static int hf_imf_siolabel_unknown;
+
+static int ett_imf;
+static int ett_imf_content_type;
+static int ett_imf_mailbox;
+static int ett_imf_group;
+static int ett_imf_mailbox_list;
+static int ett_imf_address_list;
+static int ett_imf_siolabel;
+static int ett_imf_extension;
+static int ett_imf_message_text;
 
 static dissector_handle_t imf_handle;
 
-static expert_field ei_imf_unknown_param = EI_INIT;
+static expert_field ei_imf_unknown_param;
 
 /* Used for IMF Export Object feature */
 typedef struct _imf_eo_t {
diff --git a/epan/dissectors/packet-indigocare-icall.c b/epan/dissectors/packet-indigocare-icall.c
index 7d9f50629a..cfbd51cfa2 100644
--- a/epan/dissectors/packet-indigocare-icall.c
+++ b/epan/dissectors/packet-indigocare-icall.c
@@ -43,29 +43,29 @@ void proto_register_icall(void);
 
 static dissector_handle_t icall_handle;
 
-static expert_field ei_icall_unexpected_header = EI_INIT;
-static expert_field ei_icall_unexpected_record = EI_INIT;
-static expert_field ei_icall_unexpected_end = EI_INIT;
+static expert_field ei_icall_unexpected_header;
+static expert_field ei_icall_unexpected_record;
+static expert_field ei_icall_unexpected_end;
 
-static int proto_icall = -1;
-static int hf_icall_header_type = -1;
+static int proto_icall;
+static int hf_icall_header_type;
 
-static int hf_icall_call_room_type = -1;
-static int hf_icall_call_type_type = -1;
-static int hf_icall_call_addition_type = -1;
-static int hf_icall_call_id_type = -1;
-static int hf_icall_call_task_type = -1;
-static int hf_icall_call_location_type = -1;
-static int hf_icall_call_name1_type = -1;
-static int hf_icall_call_name2_type = -1;
-static int hf_icall_call_numerical_type = -1;
-static int hf_icall_call_nurse_type = -1;
+static int hf_icall_call_room_type;
+static int hf_icall_call_type_type;
+static int hf_icall_call_addition_type;
+static int hf_icall_call_id_type;
+static int hf_icall_call_task_type;
+static int hf_icall_call_location_type;
+static int hf_icall_call_name1_type;
+static int hf_icall_call_name2_type;
+static int hf_icall_call_numerical_type;
+static int hf_icall_call_nurse_type;
 
-static int hf_icall_padding_type = -1;
+static int hf_icall_padding_type;
 
-static gint ett_icall = -1;
-static gint ett_icall_call = -1;
-static gint ett_icall_unknown = -1;
+static gint ett_icall;
+static gint ett_icall_call;
+static gint ett_icall_unknown;
 
 static const value_string icall_headertypenames[] = {
 	{ INDIGOCARE_ICALL_CALL,		"Call Info" },
diff --git a/epan/dissectors/packet-indigocare-netrix.c b/epan/dissectors/packet-indigocare-netrix.c
index bea7a368fd..f9b0232762 100644
--- a/epan/dissectors/packet-indigocare-netrix.c
+++ b/epan/dissectors/packet-indigocare-netrix.c
@@ -73,61 +73,61 @@ void proto_register_netrix(void);
 
 static dissector_handle_t netrix_handle;
 
-static expert_field ei_netrix_unexpected_header = EI_INIT;
-static expert_field ei_netrix_unexpected_record = EI_INIT;
-
-static int proto_netrix = -1;
-static int hf_netrix_header_type = -1;
-static int hf_netrix_header_systeminfo_type = -1;
-static int hf_netrix_header_groupcall_type = -1;
-static int hf_netrix_header_profilecall_type = -1;
-static int hf_netrix_header_get_conversiontable_type = -1;
-static int hf_netrix_header_get_conversiontable_none_type = -1;
-static int hf_netrix_header_get_conversiontable_result_type = -1;
-static int hf_netrix_header_search_conversiontables_type = -1;
-static int hf_netrix_header_search_conversiontables_none_type = -1;
-static int hf_netrix_header_boschcall_type = -1;
-
-static int hf_netrix_ack_type = -1;
-
-static int hf_netrix_systeminfo_computername_type = -1;
-static int hf_netrix_systeminfo_ipaddress_type = -1;
-static int hf_netrix_systeminfo_version_type = -1;
-static int hf_netrix_systeminfo_beep_type = -1;
-
-static int hf_netrix_groupcall_groupnumber_type = -1;
-static int hf_netrix_groupcall_type_type = -1;
-static int hf_netrix_groupcall_addition_type = -1;
-static int hf_netrix_groupcall_idboschloc_type = -1;
-static int hf_netrix_groupcall_name_type = -1;
-static int hf_netrix_groupcall_room_type = -1;
-static int hf_netrix_groupcall_location_type = -1;
-
-static int hf_netrix_profilecall_groupnumber_type = -1;
-static int hf_netrix_profilecall_type_type = -1;
-static int hf_netrix_profilecall_addition_type = -1;
-static int hf_netrix_profilecall_idboschloc_type = -1;
-static int hf_netrix_profilecall_name_type = -1;
-static int hf_netrix_profilecall_room_type = -1;
-static int hf_netrix_profilecall_location_type = -1;
-
-static int hf_netrix_get_conversiontable_table_type = -1;
-static int hf_netrix_get_conversiontable_key_type = -1;
-static int hf_netrix_get_conversiontable_value_type = -1;
-
-static int hf_netrix_search_conversiontables_key_type = -1;
-static int hf_netrix_search_conversiontables_table_type = -1;
-
-static gint ett_netrix = -1;
-static gint ett_netrix_systeminfo = -1;
-static gint ett_netrix_groupcall = -1;
-static gint ett_netrix_profilecall = -1;
-static gint ett_netrix_get_conversiontable = -1;
-static gint ett_netrix_get_conversiontable_result = -1;
-static gint ett_netrix_search_conversiontables = -1;
-static gint ett_netrix_search_conversiontables_result = -1;
-static gint ett_netrix_boschcall = -1;
-static gint ett_netrix_unknown = -1;
+static expert_field ei_netrix_unexpected_header;
+static expert_field ei_netrix_unexpected_record;
+
+static int proto_netrix;
+static int hf_netrix_header_type;
+static int hf_netrix_header_systeminfo_type;
+static int hf_netrix_header_groupcall_type;
+static int hf_netrix_header_profilecall_type;
+static int hf_netrix_header_get_conversiontable_type;
+static int hf_netrix_header_get_conversiontable_none_type;
+static int hf_netrix_header_get_conversiontable_result_type;
+static int hf_netrix_header_search_conversiontables_type;
+static int hf_netrix_header_search_conversiontables_none_type;
+static int hf_netrix_header_boschcall_type;
+
+static int hf_netrix_ack_type;
+
+static int hf_netrix_systeminfo_computername_type;
+static int hf_netrix_systeminfo_ipaddress_type;
+static int hf_netrix_systeminfo_version_type;
+static int hf_netrix_systeminfo_beep_type;
+
+static int hf_netrix_groupcall_groupnumber_type;
+static int hf_netrix_groupcall_type_type;
+static int hf_netrix_groupcall_addition_type;
+static int hf_netrix_groupcall_idboschloc_type;
+static int hf_netrix_groupcall_name_type;
+static int hf_netrix_groupcall_room_type;
+static int hf_netrix_groupcall_location_type;
+
+static int hf_netrix_profilecall_groupnumber_type;
+static int hf_netrix_profilecall_type_type;
+static int hf_netrix_profilecall_addition_type;
+static int hf_netrix_profilecall_idboschloc_type;
+static int hf_netrix_profilecall_name_type;
+static int hf_netrix_profilecall_room_type;
+static int hf_netrix_profilecall_location_type;
+
+static int hf_netrix_get_conversiontable_table_type;
+static int hf_netrix_get_conversiontable_key_type;
+static int hf_netrix_get_conversiontable_value_type;
+
+static int hf_netrix_search_conversiontables_key_type;
+static int hf_netrix_search_conversiontables_table_type;
+
+static gint ett_netrix;
+static gint ett_netrix_systeminfo;
+static gint ett_netrix_groupcall;
+static gint ett_netrix_profilecall;
+static gint ett_netrix_get_conversiontable;
+static gint ett_netrix_get_conversiontable_result;
+static gint ett_netrix_search_conversiontables;
+static gint ett_netrix_search_conversiontables_result;
+static gint ett_netrix_boschcall;
+static gint ett_netrix_unknown;
 
 static const value_string netrix_headertypenames[] = {
 	{ INDIGOCARE_NETRIX_SYSTEMINFO,				"System Info" },
diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c
index 02c03858f0..e60a726ce3 100644
--- a/epan/dissectors/packet-infiniband.c
+++ b/epan/dissectors/packet-infiniband.c
@@ -38,65 +38,65 @@ void proto_reg_handoff_infiniband(void);
 #define RDMA_IP_CM_SID_PREFIX 0x0000000001000000
 
 /* Wireshark ID */
-static int proto_infiniband = -1;
-static int proto_infiniband_link = -1;
+static int proto_infiniband;
+static int proto_infiniband_link;
 
 /* Variables to hold expansion values between packets */
-/* static gint ett_infiniband = -1;                */
-static gint ett_all_headers = -1;
-static gint ett_lrh = -1;
-static gint ett_grh = -1;
-static gint ett_bth = -1;
-static gint ett_rwh = -1;
-static gint ett_rdeth = -1;
-static gint ett_deth = -1;
-static gint ett_reth = -1;
-static gint ett_atomiceth = -1;
-static gint ett_aeth = -1;
-static gint ett_aeth_syndrome = -1;
-static gint ett_atomicacketh = -1;
-static gint ett_immdt = -1;
-static gint ett_ieth = -1;
-static gint ett_payload = -1;
-static gint ett_vendor = -1;
-static gint ett_subn_lid_routed = -1;
-static gint ett_subn_directed_route = -1;
-static gint ett_subnadmin = -1;
-static gint ett_mad = -1;
-static gint ett_cm = -1;
-static gint ett_cm_sid = -1;
-static gint ett_cm_ipcm = -1;
-static gint ett_rmpp = -1;
-static gint ett_subm_attribute = -1;
-static gint ett_suba_attribute = -1;
-static gint ett_datadetails = -1;
-static gint ett_noticestraps = -1;
-/* static gint ett_nodedesc = -1;                  */
-/* static gint ett_nodeinfo = -1;                  */
-/* static gint ett_switchinfo = -1;                */
-/* static gint ett_guidinfo = -1;                  */
-/* static gint ett_portinfo = -1;                  */
-static gint ett_portinfo_capmask = -1;
-static gint ett_pkeytable = -1;
-static gint ett_sltovlmapping = -1;
-static gint ett_vlarbitrationtable = -1;
-static gint ett_linearforwardingtable = -1;
-static gint ett_randomforwardingtable = -1;
-static gint ett_multicastforwardingtable = -1;
-static gint ett_sminfo = -1;
-static gint ett_vendordiag = -1;
-static gint ett_ledinfo = -1;
-static gint ett_linkspeedwidthpairs = -1;
-static gint ett_informinfo = -1;
-static gint ett_linkrecord = -1;
-static gint ett_servicerecord = -1;
-static gint ett_pathrecord = -1;
-static gint ett_mcmemberrecord = -1;
-static gint ett_tracerecord = -1;
-static gint ett_multipathrecord = -1;
-static gint ett_serviceassocrecord = -1;
-static gint ett_perfclass = -1;
-static gint ett_link = -1;
+/* static gint ett_infiniband;                */
+static gint ett_all_headers;
+static gint ett_lrh;
+static gint ett_grh;
+static gint ett_bth;
+static gint ett_rwh;
+static gint ett_rdeth;
+static gint ett_deth;
+static gint ett_reth;
+static gint ett_atomiceth;
+static gint ett_aeth;
+static gint ett_aeth_syndrome;
+static gint ett_atomicacketh;
+static gint ett_immdt;
+static gint ett_ieth;
+static gint ett_payload;
+static gint ett_vendor;
+static gint ett_subn_lid_routed;
+static gint ett_subn_directed_route;
+static gint ett_subnadmin;
+static gint ett_mad;
+static gint ett_cm;
+static gint ett_cm_sid;
+static gint ett_cm_ipcm;
+static gint ett_rmpp;
+static gint ett_subm_attribute;
+static gint ett_suba_attribute;
+static gint ett_datadetails;
+static gint ett_noticestraps;
+/* static gint ett_nodedesc;                  */
+/* static gint ett_nodeinfo;                  */
+/* static gint ett_switchinfo;                */
+/* static gint ett_guidinfo;                  */
+/* static gint ett_portinfo;                  */
+static gint ett_portinfo_capmask;
+static gint ett_pkeytable;
+static gint ett_sltovlmapping;
+static gint ett_vlarbitrationtable;
+static gint ett_linearforwardingtable;
+static gint ett_randomforwardingtable;
+static gint ett_multicastforwardingtable;
+static gint ett_sminfo;
+static gint ett_vendordiag;
+static gint ett_ledinfo;
+static gint ett_linkspeedwidthpairs;
+static gint ett_informinfo;
+static gint ett_linkrecord;
+static gint ett_servicerecord;
+static gint ett_pathrecord;
+static gint ett_mcmemberrecord;
+static gint ett_tracerecord;
+static gint ett_multipathrecord;
+static gint ett_serviceassocrecord;
+static gint ett_perfclass;
+static gint ett_link;
 
 /* Dissector Declaration */
 static dissector_handle_t ib_handle;
@@ -480,262 +480,262 @@ static const value_string OperationalVLs[]= {
 };
 
 /* For reserved fields in various packets */
-static int hf_infiniband_reserved = -1;
+static int hf_infiniband_reserved;
 /* Local Route Header (LRH) */
-static int hf_infiniband_LRH = -1;
-static int hf_infiniband_virtual_lane = -1;
-static int hf_infiniband_link_version = -1;
-static int hf_infiniband_service_level = -1;
-static int hf_infiniband_reserved2 = -1;
-static int hf_infiniband_link_next_header = -1;
-static int hf_infiniband_destination_local_id = -1;
-static int hf_infiniband_reserved5 = -1;
-static int hf_infiniband_packet_length = -1;
-static int hf_infiniband_source_local_id = -1;
+static int hf_infiniband_LRH;
+static int hf_infiniband_virtual_lane;
+static int hf_infiniband_link_version;
+static int hf_infiniband_service_level;
+static int hf_infiniband_reserved2;
+static int hf_infiniband_link_next_header;
+static int hf_infiniband_destination_local_id;
+static int hf_infiniband_reserved5;
+static int hf_infiniband_packet_length;
+static int hf_infiniband_source_local_id;
 /* Global Route Header (GRH) */
-static int hf_infiniband_GRH = -1;
-static int hf_infiniband_ip_version = -1;
-static int hf_infiniband_traffic_class = -1;
-static int hf_infiniband_flow_label = -1;
-static int hf_infiniband_payload_length = -1;
-static int hf_infiniband_next_header = -1;
-static int hf_infiniband_hop_limit = -1;
-static int hf_infiniband_source_gid = -1;
-static int hf_infiniband_destination_gid = -1;
+static int hf_infiniband_GRH;
+static int hf_infiniband_ip_version;
+static int hf_infiniband_traffic_class;
+static int hf_infiniband_flow_label;
+static int hf_infiniband_payload_length;
+static int hf_infiniband_next_header;
+static int hf_infiniband_hop_limit;
+static int hf_infiniband_source_gid;
+static int hf_infiniband_destination_gid;
 /* Base Transport Header (BTH) */
-static int hf_infiniband_BTH = -1;
-static int hf_infiniband_opcode = -1;
-static int hf_infiniband_solicited_event = -1;
-static int hf_infiniband_migreq = -1;
-static int hf_infiniband_pad_count = -1;
-static int hf_infiniband_transport_header_version = -1;
-static int hf_infiniband_partition_key = -1;
-static int hf_infiniband_destination_qp = -1;
-static int hf_infiniband_acknowledge_request = -1;
-static int hf_infiniband_reserved7 = -1;
-static int hf_infiniband_packet_sequence_number = -1;
+static int hf_infiniband_BTH;
+static int hf_infiniband_opcode;
+static int hf_infiniband_solicited_event;
+static int hf_infiniband_migreq;
+static int hf_infiniband_pad_count;
+static int hf_infiniband_transport_header_version;
+static int hf_infiniband_partition_key;
+static int hf_infiniband_destination_qp;
+static int hf_infiniband_acknowledge_request;
+static int hf_infiniband_reserved7;
+static int hf_infiniband_packet_sequence_number;
 /* Raw Header (RWH) */
-static int hf_infiniband_RWH = -1;
-static int hf_infiniband_etype = -1;
+static int hf_infiniband_RWH;
+static int hf_infiniband_etype;
 /* Reliable Datagram Extended Transport Header (RDETH) */
-static int hf_infiniband_RDETH = -1;
-static int hf_infiniband_ee_context = -1;
+static int hf_infiniband_RDETH;
+static int hf_infiniband_ee_context;
 /* Datagram Extended Transport Header (DETH) */
-static int hf_infiniband_DETH = -1;
-static int hf_infiniband_queue_key = -1;
-static int hf_infiniband_source_qp = -1;
+static int hf_infiniband_DETH;
+static int hf_infiniband_queue_key;
+static int hf_infiniband_source_qp;
 /* RDMA Extended Transport Header (RETH) */
-static int hf_infiniband_RETH = -1;
-static int hf_infiniband_virtual_address = -1;
-static int hf_infiniband_remote_key = -1;
-static int hf_infiniband_dma_length = -1;
+static int hf_infiniband_RETH;
+static int hf_infiniband_virtual_address;
+static int hf_infiniband_remote_key;
+static int hf_infiniband_dma_length;
 /* Atomic Extended Transport Header (AtomicETH) */
-static int hf_infiniband_AtomicETH = -1;
-/* static int hf_infiniband_virtual_address_AtomicETH = -1;                  */
-/* static int hf_infiniband_remote_key_AtomicETH = -1;                       */
-static int hf_infiniband_swap_or_add_data = -1;
-static int hf_infiniband_compare_data = -1;
+static int hf_infiniband_AtomicETH;
+/* static int hf_infiniband_virtual_address_AtomicETH;                  */
+/* static int hf_infiniband_remote_key_AtomicETH;                       */
+static int hf_infiniband_swap_or_add_data;
+static int hf_infiniband_compare_data;
 /* ACK Extended Transport Header (AETH) */
-static int hf_infiniband_AETH = -1;
-static int hf_infiniband_syndrome = -1;
-static int hf_infiniband_syndrome_reserved = -1;
-static int hf_infiniband_syndrome_opcode = -1;
-static int hf_infiniband_syndrome_credit_count = -1;
-static int hf_infiniband_syndrome_timer = -1;
-static int hf_infiniband_syndrome_reserved_value = -1;
-static int hf_infiniband_syndrome_error_code = -1;
-static int hf_infiniband_message_sequence_number = -1;
+static int hf_infiniband_AETH;
+static int hf_infiniband_syndrome;
+static int hf_infiniband_syndrome_reserved;
+static int hf_infiniband_syndrome_opcode;
+static int hf_infiniband_syndrome_credit_count;
+static int hf_infiniband_syndrome_timer;
+static int hf_infiniband_syndrome_reserved_value;
+static int hf_infiniband_syndrome_error_code;
+static int hf_infiniband_message_sequence_number;
 /* Atomic ACK Extended Transport Header (AtomicAckETH) */
-static int hf_infiniband_AtomicAckETH = -1;
-static int hf_infiniband_original_remote_data = -1;
+static int hf_infiniband_AtomicAckETH;
+static int hf_infiniband_original_remote_data;
 /* Immediate Extended Transport Header (ImmDt) */
-static int hf_infiniband_IMMDT = -1;
+static int hf_infiniband_IMMDT;
 /* Invalidate Extended Transport Header (IETH) */
-static int hf_infiniband_IETH = -1;
+static int hf_infiniband_IETH;
 /* FLUSH Extended Transport Header (FETH) */
-static int hf_infiniband_FETH = -1;
-static int hf_infiniband_reserved27 = -1;
-static int hf_infiniband_selectivity_level = -1;
-static int hf_infiniband_placement_type = -1;
+static int hf_infiniband_FETH;
+static int hf_infiniband_reserved27;
+static int hf_infiniband_selectivity_level;
+static int hf_infiniband_placement_type;
 
 /* Payload */
-static int hf_infiniband_payload = -1;
-static int hf_infiniband_invariant_crc = -1;
-static int hf_infiniband_variant_crc = -1;
+static int hf_infiniband_payload;
+static int hf_infiniband_invariant_crc;
+static int hf_infiniband_variant_crc;
 /* Unknown or Vendor Specific */
-static int hf_infiniband_raw_data = -1;
-static int hf_infiniband_vendor = -1;
+static int hf_infiniband_raw_data;
+static int hf_infiniband_vendor;
 /* CM REQ Header */
-static int hf_cm_req_local_comm_id = -1;
-static int hf_cm_req_service_id = -1;
-static int hf_cm_req_service_id_prefix = -1;
-static int hf_cm_req_service_id_protocol = -1;
-static int hf_cm_req_service_id_dport = -1;
-static int hf_cm_req_local_ca_guid = -1;
-static int hf_cm_req_local_qkey = -1;
-static int hf_cm_req_local_qpn = -1;
-static int hf_cm_req_respo_res = -1;
-static int hf_cm_req_local_eecn = -1;
-static int hf_cm_req_init_depth = -1;
-static int hf_cm_req_remote_eecn = -1;
-static int hf_cm_req_remote_cm_resp_to = -1;
-static int hf_cm_req_transp_serv_type = -1;
-static int hf_cm_req_e2e_flow_ctrl = -1;
-static int hf_cm_req_start_psn = -1;
-static int hf_cm_req_local_cm_resp_to = -1;
-static int hf_cm_req_retry_count = -1;
-static int hf_cm_req_pkey = -1;
-static int hf_cm_req_path_pp_mtu = -1;
-static int hf_cm_req_rdc_exists = -1;
-static int hf_cm_req_rnr_retry_count = -1;
-static int hf_cm_req_max_cm_retries = -1;
-static int hf_cm_req_srq = -1;
-static int hf_cm_req_extended_transport = -1;
-static int hf_cm_req_primary_local_lid = -1;
-static int hf_cm_req_primary_remote_lid = -1;
-static int hf_cm_req_primary_local_gid = -1;
-static int hf_cm_req_primary_remote_gid = -1;
-static int hf_cm_req_primary_local_gid_ipv4 = -1;
-static int hf_cm_req_primary_remote_gid_ipv4 = -1;
-static int hf_cm_req_primary_flow_label = -1;
-static int hf_cm_req_primary_reserved0 = -1;
-static int hf_cm_req_primary_packet_rate = -1;
-static int hf_cm_req_primary_traffic_class = -1;
-static int hf_cm_req_primary_hop_limit = -1;
-static int hf_cm_req_primary_sl = -1;
-static int hf_cm_req_primary_subnet_local = -1;
-static int hf_cm_req_primary_reserved1 = -1;
-static int hf_cm_req_primary_local_ack_to = -1;
-static int hf_cm_req_primary_reserved2 = -1;
-static int hf_cm_req_alt_local_lid = -1;
-static int hf_cm_req_alt_remote_lid = -1;
-static int hf_cm_req_alt_local_gid = -1;
-static int hf_cm_req_alt_remote_gid = -1;
-static int hf_cm_req_flow_label = -1;
-static int hf_cm_req_alt_reserved0 = -1;
-static int hf_cm_req_packet_rate = -1;
-static int hf_cm_req_alt_traffic_class = -1;
-static int hf_cm_req_alt_hop_limit = -1;
-static int hf_cm_req_SL = -1;
-static int hf_cm_req_subnet_local = -1;
-static int hf_cm_req_alt_reserved1 = -1;
-static int hf_cm_req_local_ACK_timeout = -1;
-static int hf_cm_req_alt_reserved2 = -1;
-static int hf_cm_req_private_data = -1;
-static int hf_cm_req_ip_cm_req_msg = -1;
-static int hf_cm_req_ip_cm_majv = -1;
-static int hf_cm_req_ip_cm_minv = -1;
-static int hf_cm_req_ip_cm_ipv = -1;
-static int hf_cm_req_ip_cm_res = -1;
-static int hf_cm_req_ip_cm_sport = -1;
-static int hf_cm_req_ip_cm_sip6 = -1;
-static int hf_cm_req_ip_cm_dip6 = -1;
-static int hf_cm_req_ip_cm_sip4 = -1;
-static int hf_cm_req_ip_cm_dip4 = -1;
-static int hf_ip_cm_req_consumer_private_data = -1;
+static int hf_cm_req_local_comm_id;
+static int hf_cm_req_service_id;
+static int hf_cm_req_service_id_prefix;
+static int hf_cm_req_service_id_protocol;
+static int hf_cm_req_service_id_dport;
+static int hf_cm_req_local_ca_guid;
+static int hf_cm_req_local_qkey;
+static int hf_cm_req_local_qpn;
+static int hf_cm_req_respo_res;
+static int hf_cm_req_local_eecn;
+static int hf_cm_req_init_depth;
+static int hf_cm_req_remote_eecn;
+static int hf_cm_req_remote_cm_resp_to;
+static int hf_cm_req_transp_serv_type;
+static int hf_cm_req_e2e_flow_ctrl;
+static int hf_cm_req_start_psn;
+static int hf_cm_req_local_cm_resp_to;
+static int hf_cm_req_retry_count;
+static int hf_cm_req_pkey;
+static int hf_cm_req_path_pp_mtu;
+static int hf_cm_req_rdc_exists;
+static int hf_cm_req_rnr_retry_count;
+static int hf_cm_req_max_cm_retries;
+static int hf_cm_req_srq;
+static int hf_cm_req_extended_transport;
+static int hf_cm_req_primary_local_lid;
+static int hf_cm_req_primary_remote_lid;
+static int hf_cm_req_primary_local_gid;
+static int hf_cm_req_primary_remote_gid;
+static int hf_cm_req_primary_local_gid_ipv4;
+static int hf_cm_req_primary_remote_gid_ipv4;
+static int hf_cm_req_primary_flow_label;
+static int hf_cm_req_primary_reserved0;
+static int hf_cm_req_primary_packet_rate;
+static int hf_cm_req_primary_traffic_class;
+static int hf_cm_req_primary_hop_limit;
+static int hf_cm_req_primary_sl;
+static int hf_cm_req_primary_subnet_local;
+static int hf_cm_req_primary_reserved1;
+static int hf_cm_req_primary_local_ack_to;
+static int hf_cm_req_primary_reserved2;
+static int hf_cm_req_alt_local_lid;
+static int hf_cm_req_alt_remote_lid;
+static int hf_cm_req_alt_local_gid;
+static int hf_cm_req_alt_remote_gid;
+static int hf_cm_req_flow_label;
+static int hf_cm_req_alt_reserved0;
+static int hf_cm_req_packet_rate;
+static int hf_cm_req_alt_traffic_class;
+static int hf_cm_req_alt_hop_limit;
+static int hf_cm_req_SL;
+static int hf_cm_req_subnet_local;
+static int hf_cm_req_alt_reserved1;
+static int hf_cm_req_local_ACK_timeout;
+static int hf_cm_req_alt_reserved2;
+static int hf_cm_req_private_data;
+static int hf_cm_req_ip_cm_req_msg;
+static int hf_cm_req_ip_cm_majv;
+static int hf_cm_req_ip_cm_minv;
+static int hf_cm_req_ip_cm_ipv;
+static int hf_cm_req_ip_cm_res;
+static int hf_cm_req_ip_cm_sport;
+static int hf_cm_req_ip_cm_sip6;
+static int hf_cm_req_ip_cm_dip6;
+static int hf_cm_req_ip_cm_sip4;
+static int hf_cm_req_ip_cm_dip4;
+static int hf_ip_cm_req_consumer_private_data;
 
 /* CM REP Header */
-static int hf_cm_rep_localcommid = -1;
-static int hf_cm_rep_remotecommid = -1;
-static int hf_cm_rep_localqkey = -1;
-static int hf_cm_rep_localqpn = -1;
-static int hf_cm_rep_localeecontnum = -1;
-static int hf_cm_rep_startingpsn = -1;
-static int hf_cm_rep_responderres = -1;
-static int hf_cm_rep_initiatordepth = -1;
-static int hf_cm_rep_tgtackdelay = -1;
-static int hf_cm_rep_failoveracc = -1;
-static int hf_cm_rep_e2eflowctl = -1;
-static int hf_cm_rep_rnrretrycount = -1;
-static int hf_cm_rep_srq = -1;
-static int hf_cm_rep_reserved = -1;
-static int hf_cm_rep_localcaguid = -1;
-static int hf_cm_rep_privatedata = -1;
+static int hf_cm_rep_localcommid;
+static int hf_cm_rep_remotecommid;
+static int hf_cm_rep_localqkey;
+static int hf_cm_rep_localqpn;
+static int hf_cm_rep_localeecontnum;
+static int hf_cm_rep_startingpsn;
+static int hf_cm_rep_responderres;
+static int hf_cm_rep_initiatordepth;
+static int hf_cm_rep_tgtackdelay;
+static int hf_cm_rep_failoveracc;
+static int hf_cm_rep_e2eflowctl;
+static int hf_cm_rep_rnrretrycount;
+static int hf_cm_rep_srq;
+static int hf_cm_rep_reserved;
+static int hf_cm_rep_localcaguid;
+static int hf_cm_rep_privatedata;
 /* CM RTU Header */
-static int hf_cm_rtu_localcommid = -1;
-static int hf_cm_rtu_remotecommid = -1;
-static int hf_cm_rtu_privatedata = -1;
+static int hf_cm_rtu_localcommid;
+static int hf_cm_rtu_remotecommid;
+static int hf_cm_rtu_privatedata;
 /* CM REJ Header */
-static int hf_cm_rej_local_commid = -1;
-static int hf_cm_rej_remote_commid = -1;
-static int hf_cm_rej_msg_rej = -1;
-static int hf_cm_rej_msg_reserved0 = -1;
-static int hf_cm_rej_rej_info_len = -1;
-static int hf_cm_rej_msg_reserved1 = -1;
-static int hf_cm_rej_reason = -1;
-static int hf_cm_rej_add_rej_info = -1;
-static int hf_cm_rej_private_data = -1;
+static int hf_cm_rej_local_commid;
+static int hf_cm_rej_remote_commid;
+static int hf_cm_rej_msg_rej;
+static int hf_cm_rej_msg_reserved0;
+static int hf_cm_rej_rej_info_len;
+static int hf_cm_rej_msg_reserved1;
+static int hf_cm_rej_reason;
+static int hf_cm_rej_add_rej_info;
+static int hf_cm_rej_private_data;
 /* CM DREQ Header */
-static int hf_cm_dreq_localcommid = -1;
-static int hf_cm_dreq_remotecommid = -1;
-static int hf_cm_dreq_remote_qpn = -1;
-static int hf_cm_dreq_privatedata = -1;
+static int hf_cm_dreq_localcommid;
+static int hf_cm_dreq_remotecommid;
+static int hf_cm_dreq_remote_qpn;
+static int hf_cm_dreq_privatedata;
 /* CM DRSP Header */
-static int hf_cm_drsp_localcommid = -1;
-static int hf_cm_drsp_remotecommid = -1;
-static int hf_cm_drsp_privatedata = -1;
+static int hf_cm_drsp_localcommid;
+static int hf_cm_drsp_remotecommid;
+static int hf_cm_drsp_privatedata;
 /* MAD Base Header */
-static int hf_infiniband_MAD = -1;
-static int hf_infiniband_base_version = -1;
-static int hf_infiniband_mgmt_class = -1;
-static int hf_infiniband_class_version = -1;
-static int hf_infiniband_method = -1;
-static int hf_infiniband_status = -1;
-static int hf_infiniband_class_specific = -1;
-static int hf_infiniband_transaction_id = -1;
-static int hf_infiniband_attribute_id = -1;
-static int hf_infiniband_attribute_modifier = -1;
-static int hf_infiniband_data = -1;
+static int hf_infiniband_MAD;
+static int hf_infiniband_base_version;
+static int hf_infiniband_mgmt_class;
+static int hf_infiniband_class_version;
+static int hf_infiniband_method;
+static int hf_infiniband_status;
+static int hf_infiniband_class_specific;
+static int hf_infiniband_transaction_id;
+static int hf_infiniband_attribute_id;
+static int hf_infiniband_attribute_modifier;
+static int hf_infiniband_data;
 /* RMPP Header */
-static int hf_infiniband_RMPP = -1;
-static int hf_infiniband_rmpp_version = -1;
-static int hf_infiniband_rmpp_type = -1;
-static int hf_infiniband_r_resp_time = -1;
-static int hf_infiniband_rmpp_flags = -1;
-static int hf_infiniband_rmpp_status = -1;
-static int hf_infiniband_rmpp_data1 = -1;
-static int hf_infiniband_rmpp_data2 = -1;
+static int hf_infiniband_RMPP;
+static int hf_infiniband_rmpp_version;
+static int hf_infiniband_rmpp_type;
+static int hf_infiniband_r_resp_time;
+static int hf_infiniband_rmpp_flags;
+static int hf_infiniband_rmpp_status;
+static int hf_infiniband_rmpp_data1;
+static int hf_infiniband_rmpp_data2;
 /* RMPP Data */
-/* static int hf_infiniband_RMPP_DATA = -1; */
-static int hf_infiniband_segment_number = -1;
-static int hf_infiniband_payload_length32 = -1;
-static int hf_infiniband_transferred_data = -1;
+/* static int hf_infiniband_RMPP_DATA; */
+static int hf_infiniband_segment_number;
+static int hf_infiniband_payload_length32;
+static int hf_infiniband_transferred_data;
 /* RMPP ACK */
-static int hf_infiniband_new_window_last = -1;
+static int hf_infiniband_new_window_last;
 /* RMPP ABORT and STOP */
-static int hf_infiniband_optional_extended_error_data = -1;
+static int hf_infiniband_optional_extended_error_data;
 /* SMP Data LID Routed */
-static int hf_infiniband_SMP_LID = -1;
-static int hf_infiniband_m_key = -1;
-static int hf_infiniband_smp_data = -1;
+static int hf_infiniband_SMP_LID;
+static int hf_infiniband_m_key;
+static int hf_infiniband_smp_data;
 /* SMP Data Directed Route */
-static int hf_infiniband_SMP_DIRECTED = -1;
-static int hf_infiniband_smp_status = -1;
-static int hf_infiniband_hop_pointer = -1;
-static int hf_infiniband_hop_count = -1;
-static int hf_infiniband_dr_slid = -1;
-static int hf_infiniband_dr_dlid = -1;
-static int hf_infiniband_d = -1;
-static int hf_infiniband_initial_path = -1;
-static int hf_infiniband_return_path = -1;
+static int hf_infiniband_SMP_DIRECTED;
+static int hf_infiniband_smp_status;
+static int hf_infiniband_hop_pointer;
+static int hf_infiniband_hop_count;
+static int hf_infiniband_dr_slid;
+static int hf_infiniband_dr_dlid;
+static int hf_infiniband_d;
+static int hf_infiniband_initial_path;
+static int hf_infiniband_return_path;
 /* SA MAD Header */
-static int hf_infiniband_SA = -1;
-static int hf_infiniband_sm_key = -1;
-static int hf_infiniband_attribute_offset = -1;
-static int hf_infiniband_component_mask = -1;
-static int hf_infiniband_subnet_admin_data = -1;
+static int hf_infiniband_SA;
+static int hf_infiniband_sm_key;
+static int hf_infiniband_attribute_offset;
+static int hf_infiniband_component_mask;
+static int hf_infiniband_subnet_admin_data;
 
 /* Mellanox EoIB encapsulation header */
-static int proto_mellanox_eoib = -1;
-static int hf_infiniband_ver = -1;
-static int hf_infiniband_tcp_chk = -1;
-static int hf_infiniband_ip_chk = -1;
-static int hf_infiniband_fcs = -1;
-static int hf_infiniband_ms = -1;
-static int hf_infiniband_seg_off = -1;
-static int hf_infiniband_seg_id = -1;
+static int proto_mellanox_eoib;
+static int hf_infiniband_ver;
+static int hf_infiniband_tcp_chk;
+static int hf_infiniband_ip_chk;
+static int hf_infiniband_fcs;
+static int hf_infiniband_ms;
+static int hf_infiniband_seg_off;
+static int hf_infiniband_seg_id;
 
-static gint ett_eoib = -1;
+static gint ett_eoib;
 
 #define MELLANOX_VERSION_FLAG           0x3000
 #define MELLANOX_TCP_CHECKSUM_FLAG      0x0C00
@@ -752,167 +752,167 @@ static gint ett_eoib = -1;
 * did not provide adequate readability for the granularity of attribute/attribute fields. */
 
 /* NodeDescription */
-static int hf_infiniband_NodeDescription_NodeString = -1;
+static int hf_infiniband_NodeDescription_NodeString;
 /* NodeInfo */
-static int hf_infiniband_NodeInfo_BaseVersion = -1;
-static int hf_infiniband_NodeInfo_ClassVersion = -1;
-static int hf_infiniband_NodeInfo_NodeType = -1;
-static int hf_infiniband_NodeInfo_NumPorts = -1;
-static int hf_infiniband_NodeInfo_SystemImageGUID = -1;
-static int hf_infiniband_NodeInfo_NodeGUID = -1;
-static int hf_infiniband_NodeInfo_PortGUID = -1;
-static int hf_infiniband_NodeInfo_PartitionCap = -1;
-static int hf_infiniband_NodeInfo_DeviceID = -1;
-static int hf_infiniband_NodeInfo_Revision = -1;
-static int hf_infiniband_NodeInfo_LocalPortNum = -1;
-static int hf_infiniband_NodeInfo_VendorID = -1;
+static int hf_infiniband_NodeInfo_BaseVersion;
+static int hf_infiniband_NodeInfo_ClassVersion;
+static int hf_infiniband_NodeInfo_NodeType;
+static int hf_infiniband_NodeInfo_NumPorts;
+static int hf_infiniband_NodeInfo_SystemImageGUID;
+static int hf_infiniband_NodeInfo_NodeGUID;
+static int hf_infiniband_NodeInfo_PortGUID;
+static int hf_infiniband_NodeInfo_PartitionCap;
+static int hf_infiniband_NodeInfo_DeviceID;
+static int hf_infiniband_NodeInfo_Revision;
+static int hf_infiniband_NodeInfo_LocalPortNum;
+static int hf_infiniband_NodeInfo_VendorID;
 /* SwitchInfo */
-static int hf_infiniband_SwitchInfo_LinearFDBCap = -1;
-static int hf_infiniband_SwitchInfo_RandomFDBCap = -1;
-static int hf_infiniband_SwitchInfo_MulticastFDBCap = -1;
-static int hf_infiniband_SwitchInfo_LinearFDBTop = -1;
-static int hf_infiniband_SwitchInfo_DefaultPort = -1;
-static int hf_infiniband_SwitchInfo_DefaultMulticastPrimaryPort = -1;
-static int hf_infiniband_SwitchInfo_DefaultMulticastNotPrimaryPort = -1;
-static int hf_infiniband_SwitchInfo_LifeTimeValue = -1;
-static int hf_infiniband_SwitchInfo_PortStateChange = -1;
-static int hf_infiniband_SwitchInfo_OptimizedSLtoVLMappingProgramming = -1;
-static int hf_infiniband_SwitchInfo_LIDsPerPort = -1;
-static int hf_infiniband_SwitchInfo_PartitionEnforcementCap = -1;
-static int hf_infiniband_SwitchInfo_InboundEnforcementCap = -1;
-static int hf_infiniband_SwitchInfo_OutboundEnforcementCap = -1;
-static int hf_infiniband_SwitchInfo_FilterRawInboundCap = -1;
-static int hf_infiniband_SwitchInfo_FilterRawOutboundCap = -1;
-static int hf_infiniband_SwitchInfo_EnhancedPortZero = -1;
+static int hf_infiniband_SwitchInfo_LinearFDBCap;
+static int hf_infiniband_SwitchInfo_RandomFDBCap;
+static int hf_infiniband_SwitchInfo_MulticastFDBCap;
+static int hf_infiniband_SwitchInfo_LinearFDBTop;
+static int hf_infiniband_SwitchInfo_DefaultPort;
+static int hf_infiniband_SwitchInfo_DefaultMulticastPrimaryPort;
+static int hf_infiniband_SwitchInfo_DefaultMulticastNotPrimaryPort;
+static int hf_infiniband_SwitchInfo_LifeTimeValue;
+static int hf_infiniband_SwitchInfo_PortStateChange;
+static int hf_infiniband_SwitchInfo_OptimizedSLtoVLMappingProgramming;
+static int hf_infiniband_SwitchInfo_LIDsPerPort;
+static int hf_infiniband_SwitchInfo_PartitionEnforcementCap;
+static int hf_infiniband_SwitchInfo_InboundEnforcementCap;
+static int hf_infiniband_SwitchInfo_OutboundEnforcementCap;
+static int hf_infiniband_SwitchInfo_FilterRawInboundCap;
+static int hf_infiniband_SwitchInfo_FilterRawOutboundCap;
+static int hf_infiniband_SwitchInfo_EnhancedPortZero;
 /* GUIDInfo */
-/* static int hf_infiniband_GUIDInfo_GUIDBlock = -1;                         */
-static int hf_infiniband_GUIDInfo_GUID = -1;
+/* static int hf_infiniband_GUIDInfo_GUIDBlock;                         */
+static int hf_infiniband_GUIDInfo_GUID;
 /* PortInfo */
-static int hf_infiniband_PortInfo_GidPrefix = -1;
-static int hf_infiniband_PortInfo_LID = -1;
-static int hf_infiniband_PortInfo_MasterSMLID = -1;
-static int hf_infiniband_PortInfo_CapabilityMask = -1;
+static int hf_infiniband_PortInfo_GidPrefix;
+static int hf_infiniband_PortInfo_LID;
+static int hf_infiniband_PortInfo_MasterSMLID;
+static int hf_infiniband_PortInfo_CapabilityMask;
 
 /* Capability Mask Flags */
-static int hf_infiniband_PortInfo_CapabilityMask_SM = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_NoticeSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_TrapSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_OptionalIPDSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_AutomaticMigrationSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_SLMappingSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_MKeyNVRAM = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_PKeyNVRAM = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_LEDInfoSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_SMdisabled = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_SystemImageGUIDSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_PKeySwitchExternalPortTrapSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_CommunicationManagementSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_SNMPTunnelingSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_ReinitSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_DeviceManagementSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_VendorClassSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_DRNoticeSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_CapabilityMaskNoticeSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_BootManagementSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_LinkRoundTripLatencySupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_ClientRegistrationSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_OtherLocalChangesNoticeSupported = -1;
-static int hf_infiniband_PortInfo_CapabilityMask_LinkSpeedWIdthPairsTableSupported = -1;
+static int hf_infiniband_PortInfo_CapabilityMask_SM;
+static int hf_infiniband_PortInfo_CapabilityMask_NoticeSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_TrapSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_OptionalIPDSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_AutomaticMigrationSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_SLMappingSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_MKeyNVRAM;
+static int hf_infiniband_PortInfo_CapabilityMask_PKeyNVRAM;
+static int hf_infiniband_PortInfo_CapabilityMask_LEDInfoSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_SMdisabled;
+static int hf_infiniband_PortInfo_CapabilityMask_SystemImageGUIDSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_PKeySwitchExternalPortTrapSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_CommunicationManagementSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_SNMPTunnelingSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_ReinitSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_DeviceManagementSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_VendorClassSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_DRNoticeSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_CapabilityMaskNoticeSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_BootManagementSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_LinkRoundTripLatencySupported;
+static int hf_infiniband_PortInfo_CapabilityMask_ClientRegistrationSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_OtherLocalChangesNoticeSupported;
+static int hf_infiniband_PortInfo_CapabilityMask_LinkSpeedWIdthPairsTableSupported;
 /* End Capability Mask Flags */
 
 
-static int hf_infiniband_PortInfo_DiagCode = -1;
-static int hf_infiniband_PortInfo_M_KeyLeasePeriod = -1;
-static int hf_infiniband_PortInfo_LocalPortNum = -1;
-static int hf_infiniband_PortInfo_LinkWidthEnabled = -1;
-static int hf_infiniband_PortInfo_LinkWidthSupported = -1;
-static int hf_infiniband_PortInfo_LinkWidthActive = -1;
-static int hf_infiniband_PortInfo_LinkSpeedSupported = -1;
-static int hf_infiniband_PortInfo_PortState = -1;
-static int hf_infiniband_PortInfo_PortPhysicalState = -1;
-static int hf_infiniband_PortInfo_LinkDownDefaultState = -1;
-static int hf_infiniband_PortInfo_M_KeyProtectBits = -1;
-static int hf_infiniband_PortInfo_LMC = -1;
-static int hf_infiniband_PortInfo_LinkSpeedActive = -1;
-static int hf_infiniband_PortInfo_LinkSpeedEnabled = -1;
-static int hf_infiniband_PortInfo_NeighborMTU = -1;
-static int hf_infiniband_PortInfo_MasterSMSL = -1;
-static int hf_infiniband_PortInfo_VLCap = -1;
-static int hf_infiniband_PortInfo_M_Key = -1;
-static int hf_infiniband_PortInfo_InitType = -1;
-static int hf_infiniband_PortInfo_VLHighLimit = -1;
-static int hf_infiniband_PortInfo_VLArbitrationHighCap = -1;
-static int hf_infiniband_PortInfo_VLArbitrationLowCap = -1;
-static int hf_infiniband_PortInfo_InitTypeReply = -1;
-static int hf_infiniband_PortInfo_MTUCap = -1;
-static int hf_infiniband_PortInfo_VLStallCount = -1;
-static int hf_infiniband_PortInfo_HOQLife = -1;
-static int hf_infiniband_PortInfo_OperationalVLs = -1;
-static int hf_infiniband_PortInfo_PartitionEnforcementInbound = -1;
-static int hf_infiniband_PortInfo_PartitionEnforcementOutbound = -1;
-static int hf_infiniband_PortInfo_FilterRawInbound = -1;
-static int hf_infiniband_PortInfo_FilterRawOutbound = -1;
-static int hf_infiniband_PortInfo_M_KeyViolations = -1;
-static int hf_infiniband_PortInfo_P_KeyViolations = -1;
-static int hf_infiniband_PortInfo_Q_KeyViolations = -1;
-static int hf_infiniband_PortInfo_GUIDCap = -1;
-static int hf_infiniband_PortInfo_ClientReregister = -1;
-static int hf_infiniband_PortInfo_SubnetTimeOut = -1;
-static int hf_infiniband_PortInfo_RespTimeValue = -1;
-static int hf_infiniband_PortInfo_LocalPhyErrors = -1;
-static int hf_infiniband_PortInfo_OverrunErrors = -1;
-static int hf_infiniband_PortInfo_MaxCreditHint = -1;
-static int hf_infiniband_PortInfo_LinkRoundTripLatency = -1;
+static int hf_infiniband_PortInfo_DiagCode;
+static int hf_infiniband_PortInfo_M_KeyLeasePeriod;
+static int hf_infiniband_PortInfo_LocalPortNum;
+static int hf_infiniband_PortInfo_LinkWidthEnabled;
+static int hf_infiniband_PortInfo_LinkWidthSupported;
+static int hf_infiniband_PortInfo_LinkWidthActive;
+static int hf_infiniband_PortInfo_LinkSpeedSupported;
+static int hf_infiniband_PortInfo_PortState;
+static int hf_infiniband_PortInfo_PortPhysicalState;
+static int hf_infiniband_PortInfo_LinkDownDefaultState;
+static int hf_infiniband_PortInfo_M_KeyProtectBits;
+static int hf_infiniband_PortInfo_LMC;
+static int hf_infiniband_PortInfo_LinkSpeedActive;
+static int hf_infiniband_PortInfo_LinkSpeedEnabled;
+static int hf_infiniband_PortInfo_NeighborMTU;
+static int hf_infiniband_PortInfo_MasterSMSL;
+static int hf_infiniband_PortInfo_VLCap;
+static int hf_infiniband_PortInfo_M_Key;
+static int hf_infiniband_PortInfo_InitType;
+static int hf_infiniband_PortInfo_VLHighLimit;
+static int hf_infiniband_PortInfo_VLArbitrationHighCap;
+static int hf_infiniband_PortInfo_VLArbitrationLowCap;
+static int hf_infiniband_PortInfo_InitTypeReply;
+static int hf_infiniband_PortInfo_MTUCap;
+static int hf_infiniband_PortInfo_VLStallCount;
+static int hf_infiniband_PortInfo_HOQLife;
+static int hf_infiniband_PortInfo_OperationalVLs;
+static int hf_infiniband_PortInfo_PartitionEnforcementInbound;
+static int hf_infiniband_PortInfo_PartitionEnforcementOutbound;
+static int hf_infiniband_PortInfo_FilterRawInbound;
+static int hf_infiniband_PortInfo_FilterRawOutbound;
+static int hf_infiniband_PortInfo_M_KeyViolations;
+static int hf_infiniband_PortInfo_P_KeyViolations;
+static int hf_infiniband_PortInfo_Q_KeyViolations;
+static int hf_infiniband_PortInfo_GUIDCap;
+static int hf_infiniband_PortInfo_ClientReregister;
+static int hf_infiniband_PortInfo_SubnetTimeOut;
+static int hf_infiniband_PortInfo_RespTimeValue;
+static int hf_infiniband_PortInfo_LocalPhyErrors;
+static int hf_infiniband_PortInfo_OverrunErrors;
+static int hf_infiniband_PortInfo_MaxCreditHint;
+static int hf_infiniband_PortInfo_LinkRoundTripLatency;
 
 /* P_KeyTable */
-static int hf_infiniband_P_KeyTable_P_KeyTableBlock = -1;
-static int hf_infiniband_P_KeyTable_MembershipType = -1;
-static int hf_infiniband_P_KeyTable_P_KeyBase = -1;
+static int hf_infiniband_P_KeyTable_P_KeyTableBlock;
+static int hf_infiniband_P_KeyTable_MembershipType;
+static int hf_infiniband_P_KeyTable_P_KeyBase;
 
 /* SLtoVLMappingTable */
-static int hf_infiniband_SLtoVLMappingTable_SLtoVL_HighBits = -1;
-static int hf_infiniband_SLtoVLMappingTable_SLtoVL_LowBits = -1;
+static int hf_infiniband_SLtoVLMappingTable_SLtoVL_HighBits;
+static int hf_infiniband_SLtoVLMappingTable_SLtoVL_LowBits;
 
 /* VLArbitrationTable */
-/* static int hf_infiniband_VLArbitrationTable_VLWeightPairs = -1;           */
-static int hf_infiniband_VLArbitrationTable_VL = -1;
-static int hf_infiniband_VLArbitrationTable_Weight = -1;
+/* static int hf_infiniband_VLArbitrationTable_VLWeightPairs;           */
+static int hf_infiniband_VLArbitrationTable_VL;
+static int hf_infiniband_VLArbitrationTable_Weight;
 
 /* LinearForwardingTable */
-/* static int hf_infiniband_LinearForwardingTable_LinearForwardingTableBlock = -1;  */
-static int hf_infiniband_LinearForwardingTable_Port = -1;
+/* static int hf_infiniband_LinearForwardingTable_LinearForwardingTableBlock;  */
+static int hf_infiniband_LinearForwardingTable_Port;
 
 /* RandomForwardingTable */
-/* static int hf_infiniband_RandomForwardingTable_RandomForwardingTableBlock = -1;  */
-static int hf_infiniband_RandomForwardingTable_LID = -1;
-static int hf_infiniband_RandomForwardingTable_Valid = -1;
-static int hf_infiniband_RandomForwardingTable_LMC = -1;
-static int hf_infiniband_RandomForwardingTable_Port = -1;
+/* static int hf_infiniband_RandomForwardingTable_RandomForwardingTableBlock;  */
+static int hf_infiniband_RandomForwardingTable_LID;
+static int hf_infiniband_RandomForwardingTable_Valid;
+static int hf_infiniband_RandomForwardingTable_LMC;
+static int hf_infiniband_RandomForwardingTable_Port;
 
 /* MulticastForwardingTable */
-/* static int hf_infiniband_MulticastForwardingTable_MulticastForwardingTableBlock = -1;    */
-static int hf_infiniband_MulticastForwardingTable_PortMask = -1;
+/* static int hf_infiniband_MulticastForwardingTable_MulticastForwardingTableBlock;    */
+static int hf_infiniband_MulticastForwardingTable_PortMask;
 
 /* SMInfo */
-static int hf_infiniband_SMInfo_GUID = -1;
-static int hf_infiniband_SMInfo_SM_Key = -1;
-static int hf_infiniband_SMInfo_ActCount = -1;
-static int hf_infiniband_SMInfo_Priority = -1;
-static int hf_infiniband_SMInfo_SMState = -1;
+static int hf_infiniband_SMInfo_GUID;
+static int hf_infiniband_SMInfo_SM_Key;
+static int hf_infiniband_SMInfo_ActCount;
+static int hf_infiniband_SMInfo_Priority;
+static int hf_infiniband_SMInfo_SMState;
 
 /* VendorDiag */
-static int hf_infiniband_VendorDiag_NextIndex = -1;
-static int hf_infiniband_VendorDiag_DiagData = -1;
+static int hf_infiniband_VendorDiag_NextIndex;
+static int hf_infiniband_VendorDiag_DiagData;
 
 /* LedInfo */
-static int hf_infiniband_LedInfo_LedMask = -1;
+static int hf_infiniband_LedInfo_LedMask;
 
 /* LinkSpeedWidthPairsTable */
-static int hf_infiniband_LinkSpeedWidthPairsTable_NumTables = -1;
-static int hf_infiniband_LinkSpeedWidthPairsTable_PortMask = -1;
-static int hf_infiniband_LinkSpeedWidthPairsTable_SpeedTwoFive = -1;
-static int hf_infiniband_LinkSpeedWidthPairsTable_SpeedFive = -1;
-static int hf_infiniband_LinkSpeedWidthPairsTable_SpeedTen = -1;
+static int hf_infiniband_LinkSpeedWidthPairsTable_NumTables;
+static int hf_infiniband_LinkSpeedWidthPairsTable_PortMask;
+static int hf_infiniband_LinkSpeedWidthPairsTable_SpeedTwoFive;
+static int hf_infiniband_LinkSpeedWidthPairsTable_SpeedFive;
+static int hf_infiniband_LinkSpeedWidthPairsTable_SpeedTen;
 
 /* Attributes for Subnet Administration.
 * Mostly we have "Records" here which are just structures of SM attributes.
@@ -927,197 +927,197 @@ static int hf_infiniband_LinkSpeedWidthPairsTable_SpeedTen = -1;
 /* MulticastForwardingTableRecord */
 /* VLArbitrationTableRecord */
 
-static int hf_infiniband_SA_LID = -1;
-static int hf_infiniband_SA_EndportLID = -1;
-static int hf_infiniband_SA_PortNum = -1;
-static int hf_infiniband_SA_InputPortNum = -1;
-static int hf_infiniband_SA_OutputPortNum = -1;
-static int hf_infiniband_SA_BlockNum_EightBit = -1;
-static int hf_infiniband_SA_BlockNum_NineBit = -1;
-static int hf_infiniband_SA_BlockNum_SixteenBit = -1;
-static int hf_infiniband_SA_Position = -1;
-/* static int hf_infiniband_SA_Index = -1;                                   */
+static int hf_infiniband_SA_LID;
+static int hf_infiniband_SA_EndportLID;
+static int hf_infiniband_SA_PortNum;
+static int hf_infiniband_SA_InputPortNum;
+static int hf_infiniband_SA_OutputPortNum;
+static int hf_infiniband_SA_BlockNum_EightBit;
+static int hf_infiniband_SA_BlockNum_NineBit;
+static int hf_infiniband_SA_BlockNum_SixteenBit;
+static int hf_infiniband_SA_Position;
+/* static int hf_infiniband_SA_Index;                                   */
 
 /* InformInfoRecord */
-static int hf_infiniband_InformInfoRecord_SubscriberGID = -1;
-static int hf_infiniband_InformInfoRecord_Enum = -1;
+static int hf_infiniband_InformInfoRecord_SubscriberGID;
+static int hf_infiniband_InformInfoRecord_Enum;
 
 /* InformInfo */
-static int hf_infiniband_InformInfo_GID = -1;
-static int hf_infiniband_InformInfo_LIDRangeBegin = -1;
-static int hf_infiniband_InformInfo_LIDRangeEnd = -1;
-static int hf_infiniband_InformInfo_IsGeneric = -1;
-static int hf_infiniband_InformInfo_Subscribe = -1;
-static int hf_infiniband_InformInfo_Type = -1;
-static int hf_infiniband_InformInfo_TrapNumberDeviceID = -1;
-static int hf_infiniband_InformInfo_QPN = -1;
-static int hf_infiniband_InformInfo_RespTimeValue = -1;
-static int hf_infiniband_InformInfo_ProducerTypeVendorID = -1;
+static int hf_infiniband_InformInfo_GID;
+static int hf_infiniband_InformInfo_LIDRangeBegin;
+static int hf_infiniband_InformInfo_LIDRangeEnd;
+static int hf_infiniband_InformInfo_IsGeneric;
+static int hf_infiniband_InformInfo_Subscribe;
+static int hf_infiniband_InformInfo_Type;
+static int hf_infiniband_InformInfo_TrapNumberDeviceID;
+static int hf_infiniband_InformInfo_QPN;
+static int hf_infiniband_InformInfo_RespTimeValue;
+static int hf_infiniband_InformInfo_ProducerTypeVendorID;
 
 /* LinkRecord */
-static int hf_infiniband_LinkRecord_FromLID = -1;
-static int hf_infiniband_LinkRecord_FromPort = -1;
-static int hf_infiniband_LinkRecord_ToPort = -1;
-static int hf_infiniband_LinkRecord_ToLID = -1;
+static int hf_infiniband_LinkRecord_FromLID;
+static int hf_infiniband_LinkRecord_FromPort;
+static int hf_infiniband_LinkRecord_ToPort;
+static int hf_infiniband_LinkRecord_ToLID;
 
 /* ServiceRecord */
-static int hf_infiniband_ServiceRecord_ServiceID = -1;
-static int hf_infiniband_ServiceRecord_ServiceGID = -1;
-static int hf_infiniband_ServiceRecord_ServiceP_Key = -1;
-static int hf_infiniband_ServiceRecord_ServiceLease = -1;
-static int hf_infiniband_ServiceRecord_ServiceKey = -1;
-static int hf_infiniband_ServiceRecord_ServiceName = -1;
-static int hf_infiniband_ServiceRecord_ServiceData = -1;
+static int hf_infiniband_ServiceRecord_ServiceID;
+static int hf_infiniband_ServiceRecord_ServiceGID;
+static int hf_infiniband_ServiceRecord_ServiceP_Key;
+static int hf_infiniband_ServiceRecord_ServiceLease;
+static int hf_infiniband_ServiceRecord_ServiceKey;
+static int hf_infiniband_ServiceRecord_ServiceName;
+static int hf_infiniband_ServiceRecord_ServiceData;
 
 /* ServiceAssociationRecord */
-static int hf_infiniband_ServiceAssociationRecord_ServiceKey = -1;
-static int hf_infiniband_ServiceAssociationRecord_ServiceName = -1;
+static int hf_infiniband_ServiceAssociationRecord_ServiceKey;
+static int hf_infiniband_ServiceAssociationRecord_ServiceName;
 
 /* PathRecord */
-static int hf_infiniband_PathRecord_DGID = -1;
-static int hf_infiniband_PathRecord_SGID = -1;
-static int hf_infiniband_PathRecord_DLID = -1;
-static int hf_infiniband_PathRecord_SLID = -1;
-static int hf_infiniband_PathRecord_RawTraffic = -1;
-static int hf_infiniband_PathRecord_FlowLabel = -1;
-static int hf_infiniband_PathRecord_HopLimit = -1;
-static int hf_infiniband_PathRecord_TClass = -1;
-static int hf_infiniband_PathRecord_Reversible = -1;
-static int hf_infiniband_PathRecord_NumbPath = -1;
-static int hf_infiniband_PathRecord_P_Key = -1;
-static int hf_infiniband_PathRecord_SL = -1;
-static int hf_infiniband_PathRecord_MTUSelector = -1;
-static int hf_infiniband_PathRecord_MTU = -1;
-static int hf_infiniband_PathRecord_RateSelector = -1;
-static int hf_infiniband_PathRecord_Rate = -1;
-static int hf_infiniband_PathRecord_PacketLifeTimeSelector = -1;
-static int hf_infiniband_PathRecord_PacketLifeTime = -1;
-static int hf_infiniband_PathRecord_Preference = -1;
+static int hf_infiniband_PathRecord_DGID;
+static int hf_infiniband_PathRecord_SGID;
+static int hf_infiniband_PathRecord_DLID;
+static int hf_infiniband_PathRecord_SLID;
+static int hf_infiniband_PathRecord_RawTraffic;
+static int hf_infiniband_PathRecord_FlowLabel;
+static int hf_infiniband_PathRecord_HopLimit;
+static int hf_infiniband_PathRecord_TClass;
+static int hf_infiniband_PathRecord_Reversible;
+static int hf_infiniband_PathRecord_NumbPath;
+static int hf_infiniband_PathRecord_P_Key;
+static int hf_infiniband_PathRecord_SL;
+static int hf_infiniband_PathRecord_MTUSelector;
+static int hf_infiniband_PathRecord_MTU;
+static int hf_infiniband_PathRecord_RateSelector;
+static int hf_infiniband_PathRecord_Rate;
+static int hf_infiniband_PathRecord_PacketLifeTimeSelector;
+static int hf_infiniband_PathRecord_PacketLifeTime;
+static int hf_infiniband_PathRecord_Preference;
 
 /* MCMemberRecord */
-static int hf_infiniband_MCMemberRecord_MGID = -1;
-static int hf_infiniband_MCMemberRecord_PortGID = -1;
-static int hf_infiniband_MCMemberRecord_Q_Key = -1;
-static int hf_infiniband_MCMemberRecord_MLID = -1;
-static int hf_infiniband_MCMemberRecord_MTUSelector = -1;
-static int hf_infiniband_MCMemberRecord_MTU = -1;
-static int hf_infiniband_MCMemberRecord_TClass = -1;
-static int hf_infiniband_MCMemberRecord_P_Key = -1;
-static int hf_infiniband_MCMemberRecord_RateSelector = -1;
-static int hf_infiniband_MCMemberRecord_Rate = -1;
-static int hf_infiniband_MCMemberRecord_PacketLifeTimeSelector = -1;
-static int hf_infiniband_MCMemberRecord_PacketLifeTime = -1;
-static int hf_infiniband_MCMemberRecord_SL = -1;
-static int hf_infiniband_MCMemberRecord_FlowLabel = -1;
-static int hf_infiniband_MCMemberRecord_HopLimit = -1;
-static int hf_infiniband_MCMemberRecord_Scope = -1;
-static int hf_infiniband_MCMemberRecord_JoinState = -1;
-static int hf_infiniband_MCMemberRecord_ProxyJoin = -1;
+static int hf_infiniband_MCMemberRecord_MGID;
+static int hf_infiniband_MCMemberRecord_PortGID;
+static int hf_infiniband_MCMemberRecord_Q_Key;
+static int hf_infiniband_MCMemberRecord_MLID;
+static int hf_infiniband_MCMemberRecord_MTUSelector;
+static int hf_infiniband_MCMemberRecord_MTU;
+static int hf_infiniband_MCMemberRecord_TClass;
+static int hf_infiniband_MCMemberRecord_P_Key;
+static int hf_infiniband_MCMemberRecord_RateSelector;
+static int hf_infiniband_MCMemberRecord_Rate;
+static int hf_infiniband_MCMemberRecord_PacketLifeTimeSelector;
+static int hf_infiniband_MCMemberRecord_PacketLifeTime;
+static int hf_infiniband_MCMemberRecord_SL;
+static int hf_infiniband_MCMemberRecord_FlowLabel;
+static int hf_infiniband_MCMemberRecord_HopLimit;
+static int hf_infiniband_MCMemberRecord_Scope;
+static int hf_infiniband_MCMemberRecord_JoinState;
+static int hf_infiniband_MCMemberRecord_ProxyJoin;
 
 /* TraceRecord */
-static int hf_infiniband_TraceRecord_GIDPrefix = -1;
-static int hf_infiniband_TraceRecord_IDGeneration = -1;
-static int hf_infiniband_TraceRecord_NodeType = -1;
-static int hf_infiniband_TraceRecord_NodeID = -1;
-static int hf_infiniband_TraceRecord_ChassisID = -1;
-static int hf_infiniband_TraceRecord_EntryPortID = -1;
-static int hf_infiniband_TraceRecord_ExitPortID = -1;
-static int hf_infiniband_TraceRecord_EntryPort = -1;
-static int hf_infiniband_TraceRecord_ExitPort = -1;
+static int hf_infiniband_TraceRecord_GIDPrefix;
+static int hf_infiniband_TraceRecord_IDGeneration;
+static int hf_infiniband_TraceRecord_NodeType;
+static int hf_infiniband_TraceRecord_NodeID;
+static int hf_infiniband_TraceRecord_ChassisID;
+static int hf_infiniband_TraceRecord_EntryPortID;
+static int hf_infiniband_TraceRecord_ExitPortID;
+static int hf_infiniband_TraceRecord_EntryPort;
+static int hf_infiniband_TraceRecord_ExitPort;
 
 /* MultiPathRecord */
-static int hf_infiniband_MultiPathRecord_RawTraffic = -1;
-static int hf_infiniband_MultiPathRecord_FlowLabel = -1;
-static int hf_infiniband_MultiPathRecord_HopLimit = -1;
-static int hf_infiniband_MultiPathRecord_TClass = -1;
-static int hf_infiniband_MultiPathRecord_Reversible = -1;
-static int hf_infiniband_MultiPathRecord_NumbPath = -1;
-static int hf_infiniband_MultiPathRecord_P_Key = -1;
-static int hf_infiniband_MultiPathRecord_SL = -1;
-static int hf_infiniband_MultiPathRecord_MTUSelector = -1;
-static int hf_infiniband_MultiPathRecord_MTU = -1;
-static int hf_infiniband_MultiPathRecord_RateSelector = -1;
-static int hf_infiniband_MultiPathRecord_Rate = -1;
-static int hf_infiniband_MultiPathRecord_PacketLifeTimeSelector = -1;
-static int hf_infiniband_MultiPathRecord_PacketLifeTime = -1;
-static int hf_infiniband_MultiPathRecord_IndependenceSelector = -1;
-static int hf_infiniband_MultiPathRecord_GIDScope = -1;
-static int hf_infiniband_MultiPathRecord_SGIDCount = -1;
-static int hf_infiniband_MultiPathRecord_DGIDCount = -1;
-static int hf_infiniband_MultiPathRecord_SDGID = -1;
+static int hf_infiniband_MultiPathRecord_RawTraffic;
+static int hf_infiniband_MultiPathRecord_FlowLabel;
+static int hf_infiniband_MultiPathRecord_HopLimit;
+static int hf_infiniband_MultiPathRecord_TClass;
+static int hf_infiniband_MultiPathRecord_Reversible;
+static int hf_infiniband_MultiPathRecord_NumbPath;
+static int hf_infiniband_MultiPathRecord_P_Key;
+static int hf_infiniband_MultiPathRecord_SL;
+static int hf_infiniband_MultiPathRecord_MTUSelector;
+static int hf_infiniband_MultiPathRecord_MTU;
+static int hf_infiniband_MultiPathRecord_RateSelector;
+static int hf_infiniband_MultiPathRecord_Rate;
+static int hf_infiniband_MultiPathRecord_PacketLifeTimeSelector;
+static int hf_infiniband_MultiPathRecord_PacketLifeTime;
+static int hf_infiniband_MultiPathRecord_IndependenceSelector;
+static int hf_infiniband_MultiPathRecord_GIDScope;
+static int hf_infiniband_MultiPathRecord_SGIDCount;
+static int hf_infiniband_MultiPathRecord_DGIDCount;
+static int hf_infiniband_MultiPathRecord_SDGID;
 
 /* ClassPortInfo */
-static int hf_infiniband_ClassPortInfo_BaseVersion = -1;
-static int hf_infiniband_ClassPortInfo_ClassVersion = -1;
-static int hf_infiniband_ClassPortInfo_CapabilityMask = -1;
-static int hf_infiniband_ClassPortInfo_CapabilityMask2 = -1;
-static int hf_infiniband_ClassPortInfo_RespTimeValue = -1;
-static int hf_infiniband_ClassPortInfo_RedirectGID = -1;
-static int hf_infiniband_ClassPortInfo_RedirectTC = -1;
-static int hf_infiniband_ClassPortInfo_RedirectSL = -1;
-static int hf_infiniband_ClassPortInfo_RedirectFL = -1;
-static int hf_infiniband_ClassPortInfo_RedirectLID = -1;
-static int hf_infiniband_ClassPortInfo_RedirectP_Key = -1;
-static int hf_infiniband_ClassPortInfo_Reserved = -1;
-static int hf_infiniband_ClassPortInfo_RedirectQP = -1;
-static int hf_infiniband_ClassPortInfo_RedirectQ_Key = -1;
-static int hf_infiniband_ClassPortInfo_TrapGID = -1;
-static int hf_infiniband_ClassPortInfo_TrapTC = -1;
-static int hf_infiniband_ClassPortInfo_TrapSL = -1;
-static int hf_infiniband_ClassPortInfo_TrapFL = -1;
-static int hf_infiniband_ClassPortInfo_TrapLID = -1;
-static int hf_infiniband_ClassPortInfo_TrapP_Key = -1;
-static int hf_infiniband_ClassPortInfo_TrapQP = -1;
-static int hf_infiniband_ClassPortInfo_TrapQ_Key = -1;
+static int hf_infiniband_ClassPortInfo_BaseVersion;
+static int hf_infiniband_ClassPortInfo_ClassVersion;
+static int hf_infiniband_ClassPortInfo_CapabilityMask;
+static int hf_infiniband_ClassPortInfo_CapabilityMask2;
+static int hf_infiniband_ClassPortInfo_RespTimeValue;
+static int hf_infiniband_ClassPortInfo_RedirectGID;
+static int hf_infiniband_ClassPortInfo_RedirectTC;
+static int hf_infiniband_ClassPortInfo_RedirectSL;
+static int hf_infiniband_ClassPortInfo_RedirectFL;
+static int hf_infiniband_ClassPortInfo_RedirectLID;
+static int hf_infiniband_ClassPortInfo_RedirectP_Key;
+static int hf_infiniband_ClassPortInfo_Reserved;
+static int hf_infiniband_ClassPortInfo_RedirectQP;
+static int hf_infiniband_ClassPortInfo_RedirectQ_Key;
+static int hf_infiniband_ClassPortInfo_TrapGID;
+static int hf_infiniband_ClassPortInfo_TrapTC;
+static int hf_infiniband_ClassPortInfo_TrapSL;
+static int hf_infiniband_ClassPortInfo_TrapFL;
+static int hf_infiniband_ClassPortInfo_TrapLID;
+static int hf_infiniband_ClassPortInfo_TrapP_Key;
+static int hf_infiniband_ClassPortInfo_TrapQP;
+static int hf_infiniband_ClassPortInfo_TrapQ_Key;
 
 /* Notice */
-static int hf_infiniband_Notice_IsGeneric = -1;
-static int hf_infiniband_Notice_Type = -1;
-static int hf_infiniband_Notice_ProducerTypeVendorID = -1;
-static int hf_infiniband_Notice_TrapNumberDeviceID = -1;
-static int hf_infiniband_Notice_IssuerLID = -1;
-static int hf_infiniband_Notice_NoticeToggle = -1;
-static int hf_infiniband_Notice_NoticeCount = -1;
-static int hf_infiniband_Notice_DataDetails = -1;
-/* static int hf_infiniband_Notice_IssuerGID = -1;             */
-/* static int hf_infiniband_Notice_ClassTrapSpecificData = -1; */
+static int hf_infiniband_Notice_IsGeneric;
+static int hf_infiniband_Notice_Type;
+static int hf_infiniband_Notice_ProducerTypeVendorID;
+static int hf_infiniband_Notice_TrapNumberDeviceID;
+static int hf_infiniband_Notice_IssuerLID;
+static int hf_infiniband_Notice_NoticeToggle;
+static int hf_infiniband_Notice_NoticeCount;
+static int hf_infiniband_Notice_DataDetails;
+/* static int hf_infiniband_Notice_IssuerGID;             */
+/* static int hf_infiniband_Notice_ClassTrapSpecificData; */
 
 /* ClassPortInfo attribute in Performance class */
-static int hf_infiniband_PerfMgt_ClassPortInfo = -1;
+static int hf_infiniband_PerfMgt_ClassPortInfo;
 
 /* PortCounters attribute in Performance class */
-static int hf_infiniband_PortCounters = -1;
-static int hf_infiniband_PortCounters_PortSelect = -1;
-static int hf_infiniband_PortCounters_CounterSelect = -1;
-static int hf_infiniband_PortCounters_SymbolErrorCounter = -1;
-static int hf_infiniband_PortCounters_LinkErrorRecoveryCounter = -1;
-static int hf_infiniband_PortCounters_LinkDownedCounter = -1;
-static int hf_infiniband_PortCounters_PortRcvErrors = -1;
-static int hf_infiniband_PortCounters_PortRcvRemotePhysicalErrors = -1;
-static int hf_infiniband_PortCounters_PortRcvSwitchRelayErrors = -1;
-static int hf_infiniband_PortCounters_PortXmitDiscards = -1;
-static int hf_infiniband_PortCounters_PortXmitConstraintErrors = -1;
-static int hf_infiniband_PortCounters_PortRcvConstraintErrors = -1;
-static int hf_infiniband_PortCounters_LocalLinkIntegrityErrors = -1;
-static int hf_infiniband_PortCounters_ExcessiveBufferOverrunErrors = -1;
-static int hf_infiniband_PortCounters_VL15Dropped = -1;
-static int hf_infiniband_PortCounters_PortXmitData = -1;
-static int hf_infiniband_PortCounters_PortRcvData = -1;
-static int hf_infiniband_PortCounters_PortXmitPkts = -1;
-static int hf_infiniband_PortCounters_PortRcvPkts = -1;
+static int hf_infiniband_PortCounters;
+static int hf_infiniband_PortCounters_PortSelect;
+static int hf_infiniband_PortCounters_CounterSelect;
+static int hf_infiniband_PortCounters_SymbolErrorCounter;
+static int hf_infiniband_PortCounters_LinkErrorRecoveryCounter;
+static int hf_infiniband_PortCounters_LinkDownedCounter;
+static int hf_infiniband_PortCounters_PortRcvErrors;
+static int hf_infiniband_PortCounters_PortRcvRemotePhysicalErrors;
+static int hf_infiniband_PortCounters_PortRcvSwitchRelayErrors;
+static int hf_infiniband_PortCounters_PortXmitDiscards;
+static int hf_infiniband_PortCounters_PortXmitConstraintErrors;
+static int hf_infiniband_PortCounters_PortRcvConstraintErrors;
+static int hf_infiniband_PortCounters_LocalLinkIntegrityErrors;
+static int hf_infiniband_PortCounters_ExcessiveBufferOverrunErrors;
+static int hf_infiniband_PortCounters_VL15Dropped;
+static int hf_infiniband_PortCounters_PortXmitData;
+static int hf_infiniband_PortCounters_PortRcvData;
+static int hf_infiniband_PortCounters_PortXmitPkts;
+static int hf_infiniband_PortCounters_PortRcvPkts;
 
 /* Extended PortCounters attribute in Performance class */
-static int hf_infiniband_PortCountersExt = -1;
-static int hf_infiniband_PortCountersExt_PortSelect = -1;
-static int hf_infiniband_PortCountersExt_CounterSelect = -1;
-static int hf_infiniband_PortCountersExt_PortXmitData = -1;
-static int hf_infiniband_PortCountersExt_PortRcvData = -1;
-static int hf_infiniband_PortCountersExt_PortXmitPkts = -1;
-static int hf_infiniband_PortCountersExt_PortRcvPkts = -1;
-static int hf_infiniband_PortCountersExt_PortUnicastXmitPkts = -1;
-static int hf_infiniband_PortCountersExt_PortUnicastRcvPkts = -1;
-static int hf_infiniband_PortCountersExt_PortMulticastXmitPkts = -1;
-static int hf_infiniband_PortCountersExt_PortMulticastRcvPkts = -1;
+static int hf_infiniband_PortCountersExt;
+static int hf_infiniband_PortCountersExt_PortSelect;
+static int hf_infiniband_PortCountersExt_CounterSelect;
+static int hf_infiniband_PortCountersExt_PortXmitData;
+static int hf_infiniband_PortCountersExt_PortRcvData;
+static int hf_infiniband_PortCountersExt_PortXmitPkts;
+static int hf_infiniband_PortCountersExt_PortRcvPkts;
+static int hf_infiniband_PortCountersExt_PortUnicastXmitPkts;
+static int hf_infiniband_PortCountersExt_PortUnicastRcvPkts;
+static int hf_infiniband_PortCountersExt_PortMulticastXmitPkts;
+static int hf_infiniband_PortCountersExt_PortMulticastRcvPkts;
 
 /* Notice DataDetails and ClassTrapSpecific Data for certain traps
 * Note that traps reuse many fields, so they are only declared once under the first trap that they appear.
@@ -1127,63 +1127,63 @@ static int hf_infiniband_PortCountersExt_PortMulticastRcvPkts = -1;
 static gint parse_NoticeDataDetails(proto_tree*, tvbuff_t*, gint *offset, guint16 trapNumber);
 
 /* Traps 64,65,66,67 */
-static int hf_infiniband_Trap_GIDADDR = -1;
+static int hf_infiniband_Trap_GIDADDR;
 
 /* Traps 68,69 */
 /* DataDetails */
-static int hf_infiniband_Trap_COMP_MASK = -1;
-static int hf_infiniband_Trap_WAIT_FOR_REPATH = -1;
+static int hf_infiniband_Trap_COMP_MASK;
+static int hf_infiniband_Trap_WAIT_FOR_REPATH;
 /* ClassTrapSpecificData */
-/* static int hf_infiniband_Trap_PATH_REC = -1;                              */
+/* static int hf_infiniband_Trap_PATH_REC;                              */
 
 /* Trap 128 */
-static int hf_infiniband_Trap_LIDADDR = -1;
+static int hf_infiniband_Trap_LIDADDR;
 
 /* Trap 129, 130, 131 */
-static int hf_infiniband_Trap_PORTNO = -1;
+static int hf_infiniband_Trap_PORTNO;
 
 /* Trap 144 */
-static int hf_infiniband_Trap_OtherLocalChanges = -1;
-static int hf_infiniband_Trap_CAPABILITYMASK = -1;
-static int hf_infiniband_Trap_LinkSpeecEnabledChange = -1;
-static int hf_infiniband_Trap_LinkWidthEnabledChange = -1;
-static int hf_infiniband_Trap_NodeDescriptionChange = -1;
+static int hf_infiniband_Trap_OtherLocalChanges;
+static int hf_infiniband_Trap_CAPABILITYMASK;
+static int hf_infiniband_Trap_LinkSpeecEnabledChange;
+static int hf_infiniband_Trap_LinkWidthEnabledChange;
+static int hf_infiniband_Trap_NodeDescriptionChange;
 
 /* Trap 145 */
-static int hf_infiniband_Trap_SYSTEMIMAGEGUID = -1;
+static int hf_infiniband_Trap_SYSTEMIMAGEGUID;
 
 /* Trap 256 */
-static int hf_infiniband_Trap_DRSLID = -1;
-static int hf_infiniband_Trap_METHOD = -1;
-static int hf_infiniband_Trap_ATTRIBUTEID = -1;
-static int hf_infiniband_Trap_ATTRIBUTEMODIFIER = -1;
-static int hf_infiniband_Trap_MKEY = -1;
-static int hf_infiniband_Trap_DRNotice = -1;
-static int hf_infiniband_Trap_DRPathTruncated = -1;
-static int hf_infiniband_Trap_DRHopCount = -1;
-static int hf_infiniband_Trap_DRNoticeReturnPath = -1;
+static int hf_infiniband_Trap_DRSLID;
+static int hf_infiniband_Trap_METHOD;
+static int hf_infiniband_Trap_ATTRIBUTEID;
+static int hf_infiniband_Trap_ATTRIBUTEMODIFIER;
+static int hf_infiniband_Trap_MKEY;
+static int hf_infiniband_Trap_DRNotice;
+static int hf_infiniband_Trap_DRPathTruncated;
+static int hf_infiniband_Trap_DRHopCount;
+static int hf_infiniband_Trap_DRNoticeReturnPath;
 
 /* Trap 257, 258 */
-static int hf_infiniband_Trap_LIDADDR1 = -1;
-static int hf_infiniband_Trap_LIDADDR2 = -1;
-static int hf_infiniband_Trap_KEY = -1;
-static int hf_infiniband_Trap_SL = -1;
-static int hf_infiniband_Trap_QP1 = -1;
-static int hf_infiniband_Trap_QP2 = -1;
-static int hf_infiniband_Trap_GIDADDR1 = -1;
-static int hf_infiniband_Trap_GIDADDR2 = -1;
+static int hf_infiniband_Trap_LIDADDR1;
+static int hf_infiniband_Trap_LIDADDR2;
+static int hf_infiniband_Trap_KEY;
+static int hf_infiniband_Trap_SL;
+static int hf_infiniband_Trap_QP1;
+static int hf_infiniband_Trap_QP2;
+static int hf_infiniband_Trap_GIDADDR1;
+static int hf_infiniband_Trap_GIDADDR2;
 
 /* Trap 259 */
-static int hf_infiniband_Trap_DataValid = -1;
-static int hf_infiniband_Trap_PKEY = -1;
-static int hf_infiniband_Trap_SWLIDADDR = -1;
+static int hf_infiniband_Trap_DataValid;
+static int hf_infiniband_Trap_PKEY;
+static int hf_infiniband_Trap_SWLIDADDR;
 
 /* Infiniband Link */
-static int hf_infiniband_link_op = -1;
-static int hf_infiniband_link_fctbs = -1;
-static int hf_infiniband_link_vl = -1;
-static int hf_infiniband_link_fccl = -1;
-static int hf_infiniband_link_lpcrc = -1;
+static int hf_infiniband_link_op;
+static int hf_infiniband_link_fctbs;
+static int hf_infiniband_link_vl;
+static int hf_infiniband_link_fccl;
+static int hf_infiniband_link_lpcrc;
 
 /* Trap Type/Descriptions for dissection */
 static const value_string Operand_Description[]= {
diff --git a/epan/dissectors/packet-infiniband_sdp.c b/epan/dissectors/packet-infiniband_sdp.c
index 7cdb26812c..7b080ea14c 100644
--- a/epan/dissectors/packet-infiniband_sdp.c
+++ b/epan/dissectors/packet-infiniband_sdp.c
@@ -29,54 +29,54 @@ static dissector_handle_t ib_sdp_handle;
    this is SDP traffic */
 #define SERVICE_ID_MASK 0x0000000000010000
 
-static int proto_infiniband = -1;   /* we'll need the Infiniband protocol index for conversation data */
+static int proto_infiniband;   /* we'll need the Infiniband protocol index for conversation data */
 
 /* Initialize the protocol and registered fields... */
-static int proto_ib_sdp = -1;
+static int proto_ib_sdp;
 
 /* IB SDP BSDH Header */
-static int hf_ib_sdp_bsdh = -1;
-static int hf_ib_sdp_mid = -1;
-static int hf_ib_sdp_flags = -1;
-static int hf_ib_sdp_flags_oobpres  = -1;
-static int hf_ib_sdp_flags_oob_pend = -1;
-static int hf_ib_sdp_flags_reqpipe  = -1;
-
-static int hf_ib_sdp_len = -1;
-static int hf_ib_sdp_bufs = -1;
-static int hf_ib_sdp_mseq = -1;
-static int hf_ib_sdp_mseqack = -1;
+static int hf_ib_sdp_bsdh;
+static int hf_ib_sdp_mid;
+static int hf_ib_sdp_flags;
+static int hf_ib_sdp_flags_oobpres;
+static int hf_ib_sdp_flags_oob_pend;
+static int hf_ib_sdp_flags_reqpipe;
+
+static int hf_ib_sdp_len;
+static int hf_ib_sdp_bufs;
+static int hf_ib_sdp_mseq;
+static int hf_ib_sdp_mseqack;
 
 /* IB SDP Hello Header */
-static int hf_ib_sdp_hh = -1;
-static int hf_ib_sdp_majv = -1;
-static int hf_ib_sdp_minv = -1;
-static int hf_ib_sdp_ipv = -1;
-static int hf_ib_sdp_cap = -1;
-static int hf_ib_sdp_cap_invalidate = -1;
-static int hf_ib_sdp_cap_extmaxadverts = -1;
-static int hf_ib_sdp_maxadverts = -1;
-static int hf_ib_sdp_desremrcvsz = -1;
-static int hf_ib_sdp_localrcvsz = -1;
-static int hf_ib_sdp_localport = -1;
-static int hf_ib_sdp_src_ip = -1;
-static int hf_ib_sdp_dst_ip = -1;
-static int hf_ib_sdp_extmaxadverts = -1;
-static int hf_ib_sdp_hah = -1;
-static int hf_ib_sdp_rwch = -1;
-static int hf_ib_sdp_rrch = -1;
-static int hf_ib_sdp_mch = -1;
-static int hf_ib_sdp_crbh = -1;
-static int hf_ib_sdp_crbah = -1;
-static int hf_ib_sdp_suspch = -1;
-static int hf_ib_sdp_sinkah = -1;
-static int hf_ib_sdp_srcah = -1;
-static int hf_ib_sdp_data = -1;
+static int hf_ib_sdp_hh;
+static int hf_ib_sdp_majv;
+static int hf_ib_sdp_minv;
+static int hf_ib_sdp_ipv;
+static int hf_ib_sdp_cap;
+static int hf_ib_sdp_cap_invalidate;
+static int hf_ib_sdp_cap_extmaxadverts;
+static int hf_ib_sdp_maxadverts;
+static int hf_ib_sdp_desremrcvsz;
+static int hf_ib_sdp_localrcvsz;
+static int hf_ib_sdp_localport;
+static int hf_ib_sdp_src_ip;
+static int hf_ib_sdp_dst_ip;
+static int hf_ib_sdp_extmaxadverts;
+static int hf_ib_sdp_hah;
+static int hf_ib_sdp_rwch;
+static int hf_ib_sdp_rrch;
+static int hf_ib_sdp_mch;
+static int hf_ib_sdp_crbh;
+static int hf_ib_sdp_crbah;
+static int hf_ib_sdp_suspch;
+static int hf_ib_sdp_sinkah;
+static int hf_ib_sdp_srcah;
+static int hf_ib_sdp_data;
 
 /* Initialize the subtree pointers */
-static gint ett_ib_sdp = -1;
-static gint ett_ib_sdp_bsdh = -1;
-static gint ett_ib_sdp_hh = -1;
+static gint ett_ib_sdp;
+static gint ett_ib_sdp_bsdh;
+static gint ett_ib_sdp_hh;
 
 typedef enum {
     Hello = 0x0,
diff --git a/epan/dissectors/packet-interlink.c b/epan/dissectors/packet-interlink.c
index f313f79299..3a985fa7aa 100644
--- a/epan/dissectors/packet-interlink.c
+++ b/epan/dissectors/packet-interlink.c
@@ -21,23 +21,23 @@ void proto_reg_handoff_interlink(void);
  * No public information available.
  */
 
-static int proto_interlink = -1;
-
-static int hf_interlink_id = -1;
-static int hf_interlink_version = -1;
-static int hf_interlink_cmd = -1;
-static int hf_interlink_seq = -1;
-static int hf_interlink_flags = -1;
-static int hf_interlink_flags_req_ack = -1;
-static int hf_interlink_flags_inc_ack_port = -1;
-static int hf_interlink_block_type = -1;
-static int hf_interlink_block_version = -1;
-static int hf_interlink_block_length = -1;
-
-static gint ett_interlink = -1;
-static gint ett_interlink_header = -1;
-static gint ett_interlink_flags = -1;
-static gint ett_interlink_block = -1;
+static int proto_interlink;
+
+static int hf_interlink_id;
+static int hf_interlink_version;
+static int hf_interlink_cmd;
+static int hf_interlink_seq;
+static int hf_interlink_flags;
+static int hf_interlink_flags_req_ack;
+static int hf_interlink_flags_inc_ack_port;
+static int hf_interlink_block_type;
+static int hf_interlink_block_version;
+static int hf_interlink_block_length;
+
+static gint ett_interlink;
+static gint ett_interlink_header;
+static gint ett_interlink_flags;
+static gint ett_interlink_block;
 
 static dissector_handle_t data_handle;
 static dissector_table_t subdissector_table;
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 355fc6c069..61dc95567a 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -78,195 +78,195 @@ static gboolean try_heuristic_first = FALSE;
 /* Interpret the reserved flag as security flag (RFC 3514) */
 static gboolean ip_security_flag = FALSE;
 
-static int proto_ip = -1;
-
-static int proto_ip_option_eol = -1;
-static int proto_ip_option_nop = -1;
-static int proto_ip_option_security = -1;
-static int proto_ip_option_route = -1;
-static int proto_ip_option_timestamp = -1;
-static int proto_ip_option_ext_security = -1;
-static int proto_ip_option_cipso = -1;
-static int proto_ip_option_record_route = -1;
-static int proto_ip_option_sid = -1;
-static int proto_ip_option_source_route = -1;
-static int proto_ip_option_mtu_probe = -1;
-static int proto_ip_option_mtu_reply = -1;
-static int proto_ip_option_traceroute = -1;
-static int proto_ip_option_routeralert = -1;
-static int proto_ip_option_sdb = -1;
-static int proto_ip_option_qs = -1;
-static int hf_ip_version = -1;
-static int hf_ip_hdr_len = -1;
-static int hf_ip_dsfield = -1;
-static int hf_ip_dsfield_dscp = -1;
-static int hf_ip_dsfield_ecn = -1;
-static int hf_ip_tos = -1;
-static int hf_ip_tos_precedence = -1;
-static int hf_ip_tos_delay = -1;
-static int hf_ip_tos_throughput = -1;
-static int hf_ip_tos_reliability = -1;
-static int hf_ip_tos_cost = -1;
-static int hf_ip_len = -1;
-static int hf_ip_id = -1;
-static int hf_ip_dst = -1;
-static int hf_ip_dst_host = -1;
-static int hf_ip_src = -1;
-static int hf_ip_src_host = -1;
-static int hf_ip_addr = -1;
-static int hf_ip_host = -1;
-static int hf_ip_flags = -1;
-static int hf_ip_flags_sf = -1;
-static int hf_ip_flags_rf = -1;
-static int hf_ip_flags_df = -1;
-static int hf_ip_flags_mf = -1;
-static int hf_ip_frag_offset = -1;
-static int hf_ip_ttl = -1;
-static int hf_ip_proto = -1;
-static int hf_ip_checksum = -1;
-static int hf_ip_checksum_calculated = -1;
-static int hf_ip_checksum_status = -1;
+static int proto_ip;
+
+static int proto_ip_option_eol;
+static int proto_ip_option_nop;
+static int proto_ip_option_security;
+static int proto_ip_option_route;
+static int proto_ip_option_timestamp;
+static int proto_ip_option_ext_security;
+static int proto_ip_option_cipso;
+static int proto_ip_option_record_route;
+static int proto_ip_option_sid;
+static int proto_ip_option_source_route;
+static int proto_ip_option_mtu_probe;
+static int proto_ip_option_mtu_reply;
+static int proto_ip_option_traceroute;
+static int proto_ip_option_routeralert;
+static int proto_ip_option_sdb;
+static int proto_ip_option_qs;
+static int hf_ip_version;
+static int hf_ip_hdr_len;
+static int hf_ip_dsfield;
+static int hf_ip_dsfield_dscp;
+static int hf_ip_dsfield_ecn;
+static int hf_ip_tos;
+static int hf_ip_tos_precedence;
+static int hf_ip_tos_delay;
+static int hf_ip_tos_throughput;
+static int hf_ip_tos_reliability;
+static int hf_ip_tos_cost;
+static int hf_ip_len;
+static int hf_ip_id;
+static int hf_ip_dst;
+static int hf_ip_dst_host;
+static int hf_ip_src;
+static int hf_ip_src_host;
+static int hf_ip_addr;
+static int hf_ip_host;
+static int hf_ip_flags;
+static int hf_ip_flags_sf;
+static int hf_ip_flags_rf;
+static int hf_ip_flags_df;
+static int hf_ip_flags_mf;
+static int hf_ip_frag_offset;
+static int hf_ip_ttl;
+static int hf_ip_proto;
+static int hf_ip_checksum;
+static int hf_ip_checksum_calculated;
+static int hf_ip_checksum_status;
 
 /* IP option fields */
-static int hf_ip_opt_type = -1;
-static int hf_ip_opt_type_copy = -1;
-static int hf_ip_opt_type_class = -1;
-static int hf_ip_opt_type_number = -1;
-static int hf_ip_opt_len = -1;
-static int hf_ip_opt_ptr = -1;
-static int hf_ip_opt_sid = -1;
-static int hf_ip_opt_mtu = -1;
-static int hf_ip_opt_id_number = -1;
-static int hf_ip_opt_ohc = -1;
-static int hf_ip_opt_rhc = -1;
-static int hf_ip_opt_originator = -1;
-static int hf_ip_opt_ra = -1;
-static int hf_ip_opt_addr = -1;
-static int hf_ip_opt_padding = -1;
-static int hf_ip_opt_qs_func = -1;
-static int hf_ip_opt_qs_rate = -1;
-static int hf_ip_opt_qs_ttl = -1;
-static int hf_ip_opt_qs_ttl_diff = -1;
-static int hf_ip_opt_qs_unused = -1;
-static int hf_ip_opt_qs_nonce = -1;
-static int hf_ip_opt_qs_reserved = -1;
-static int hf_ip_opt_sec_rfc791_sec = -1;
-static int hf_ip_opt_sec_rfc791_comp = -1;
-static int hf_ip_opt_sec_rfc791_hr = -1;
-static int hf_ip_opt_sec_rfc791_tcc = -1;
-static int hf_ip_opt_sec_cl = -1;
-static int hf_ip_opt_sec_prot_auth_flags = -1;
-static int hf_ip_opt_sec_prot_auth_genser = -1;
-static int hf_ip_opt_sec_prot_auth_siop_esi = -1;
-static int hf_ip_opt_sec_prot_auth_sci = -1;
-static int hf_ip_opt_sec_prot_auth_nsa = -1;
-static int hf_ip_opt_sec_prot_auth_doe = -1;
-static int hf_ip_opt_sec_prot_auth_unassigned = -1;
-static int hf_ip_opt_sec_prot_auth_unassigned2 = -1;
-static int hf_ip_opt_sec_prot_auth_fti = -1;
-static int hf_ip_opt_ext_sec_add_sec_info_format_code = -1;
-static int hf_ip_opt_ext_sec_add_sec_info = -1;
-static int hf_ip_rec_rt = -1;
-static int hf_ip_rec_rt_host = -1;
-static int hf_ip_cur_rt = -1;
-static int hf_ip_cur_rt_host = -1;
-static int hf_ip_src_rt = -1;
-static int hf_ip_src_rt_host = -1;
-static int hf_ip_empty_rt = -1;
-static int hf_ip_empty_rt_host = -1;
-static int hf_ip_cipso_tag_type = -1;
-
-static int hf_ip_fragments = -1;
-static int hf_ip_fragment = -1;
-static int hf_ip_fragment_overlap = -1;
-static int hf_ip_fragment_overlap_conflict = -1;
-static int hf_ip_fragment_multiple_tails = -1;
-static int hf_ip_fragment_too_long_fragment = -1;
-static int hf_ip_fragment_error = -1;
-static int hf_ip_fragment_count = -1;
-static int hf_ip_reassembled_in = -1;
-static int hf_ip_reassembled_length = -1;
-static int hf_ip_reassembled_data = -1;
+static int hf_ip_opt_type;
+static int hf_ip_opt_type_copy;
+static int hf_ip_opt_type_class;
+static int hf_ip_opt_type_number;
+static int hf_ip_opt_len;
+static int hf_ip_opt_ptr;
+static int hf_ip_opt_sid;
+static int hf_ip_opt_mtu;
+static int hf_ip_opt_id_number;
+static int hf_ip_opt_ohc;
+static int hf_ip_opt_rhc;
+static int hf_ip_opt_originator;
+static int hf_ip_opt_ra;
+static int hf_ip_opt_addr;
+static int hf_ip_opt_padding;
+static int hf_ip_opt_qs_func;
+static int hf_ip_opt_qs_rate;
+static int hf_ip_opt_qs_ttl;
+static int hf_ip_opt_qs_ttl_diff;
+static int hf_ip_opt_qs_unused;
+static int hf_ip_opt_qs_nonce;
+static int hf_ip_opt_qs_reserved;
+static int hf_ip_opt_sec_rfc791_sec;
+static int hf_ip_opt_sec_rfc791_comp;
+static int hf_ip_opt_sec_rfc791_hr;
+static int hf_ip_opt_sec_rfc791_tcc;
+static int hf_ip_opt_sec_cl;
+static int hf_ip_opt_sec_prot_auth_flags;
+static int hf_ip_opt_sec_prot_auth_genser;
+static int hf_ip_opt_sec_prot_auth_siop_esi;
+static int hf_ip_opt_sec_prot_auth_sci;
+static int hf_ip_opt_sec_prot_auth_nsa;
+static int hf_ip_opt_sec_prot_auth_doe;
+static int hf_ip_opt_sec_prot_auth_unassigned;
+static int hf_ip_opt_sec_prot_auth_unassigned2;
+static int hf_ip_opt_sec_prot_auth_fti;
+static int hf_ip_opt_ext_sec_add_sec_info_format_code;
+static int hf_ip_opt_ext_sec_add_sec_info;
+static int hf_ip_rec_rt;
+static int hf_ip_rec_rt_host;
+static int hf_ip_cur_rt;
+static int hf_ip_cur_rt_host;
+static int hf_ip_src_rt;
+static int hf_ip_src_rt_host;
+static int hf_ip_empty_rt;
+static int hf_ip_empty_rt_host;
+static int hf_ip_cipso_tag_type;
+
+static int hf_ip_fragments;
+static int hf_ip_fragment;
+static int hf_ip_fragment_overlap;
+static int hf_ip_fragment_overlap_conflict;
+static int hf_ip_fragment_multiple_tails;
+static int hf_ip_fragment_too_long_fragment;
+static int hf_ip_fragment_error;
+static int hf_ip_fragment_count;
+static int hf_ip_reassembled_in;
+static int hf_ip_reassembled_length;
+static int hf_ip_reassembled_data;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_ip_opt_flag = -1;
-static int hf_ip_opt_overflow = -1;
-static int hf_ip_cipso_tag_data = -1;
-static int hf_ip_cipso_sensitivity_level = -1;
-static int hf_ip_cipso_categories = -1;
-static int hf_ip_cipso_doi = -1;
-static int hf_ip_opt_time_stamp = -1;
-static int hf_ip_opt_time_stamp_addr = -1;
-
-static int hf_geoip_country = -1;
-static int hf_geoip_country_iso = -1;
-static int hf_geoip_city = -1;
-static int hf_geoip_as_number = -1;
-static int hf_geoip_as_org = -1;
-static int hf_geoip_latitude = -1;
-static int hf_geoip_longitude = -1;
-static int hf_geoip_src_summary = -1;
-static int hf_geoip_src_country = -1;
-static int hf_geoip_src_country_iso = -1;
-static int hf_geoip_src_city = -1;
-static int hf_geoip_src_as_number = -1;
-static int hf_geoip_src_as_org = -1;
-static int hf_geoip_src_latitude = -1;
-static int hf_geoip_src_longitude = -1;
-static int hf_geoip_dst_summary = -1;
-static int hf_geoip_dst_country = -1;
-static int hf_geoip_dst_country_iso = -1;
-static int hf_geoip_dst_city = -1;
-static int hf_geoip_dst_as_number = -1;
-static int hf_geoip_dst_as_org = -1;
-static int hf_geoip_dst_latitude = -1;
-static int hf_geoip_dst_longitude = -1;
-
-static gint ett_ip = -1;
-static gint ett_ip_dsfield = -1;
-static gint ett_ip_tos = -1;
-static gint ett_ip_flags = -1;
-static gint ett_ip_options = -1;
-static gint ett_ip_option_eool = -1;
-static gint ett_ip_option_nop = -1;
-static gint ett_ip_option_sec = -1;
-static gint ett_ip_option_route = -1;
-static gint ett_ip_option_timestamp = -1;
-static gint ett_ip_option_ext_security = -1;
-static gint ett_ip_option_cipso = -1;
-static gint ett_ip_option_sid = -1;
-static gint ett_ip_option_mtu = -1;
-static gint ett_ip_option_tr = -1;
-static gint ett_ip_option_ra = -1;
-static gint ett_ip_option_sdb = -1;
-static gint ett_ip_option_qs = -1;
-static gint ett_ip_option_other = -1;
-static gint ett_ip_fragments = -1;
-static gint ett_ip_fragment  = -1;
-static gint ett_ip_opt_type = -1;
-static gint ett_ip_opt_sec_prot_auth_flags = -1;
-static gint ett_ip_unknown_opt = -1;
-
-static expert_field ei_ip_opt_len_invalid = EI_INIT;
-static expert_field ei_ip_opt_sec_prot_auth_fti = EI_INIT;
-static expert_field ei_ip_extraneous_data = EI_INIT;
-static expert_field ei_ip_opt_ptr_before_address = EI_INIT;
-static expert_field ei_ip_opt_ptr_middle_address = EI_INIT;
-static expert_field ei_ip_subopt_too_long = EI_INIT;
-static expert_field ei_ip_nop = EI_INIT;
-static expert_field ei_ip_bogus_ip_length = EI_INIT;
-static expert_field ei_ip_evil_packet = EI_INIT;
-static expert_field ei_ip_checksum_bad = EI_INIT;
-static expert_field ei_ip_ttl_lncb = EI_INIT;
-static expert_field ei_ip_ttl_too_small = EI_INIT;
-static expert_field ei_ip_cipso_tag = EI_INIT;
-static expert_field ei_ip_bogus_ip_version = EI_INIT;
-static expert_field ei_ip_bogus_header_length = EI_INIT;
+static int hf_ip_opt_flag;
+static int hf_ip_opt_overflow;
+static int hf_ip_cipso_tag_data;
+static int hf_ip_cipso_sensitivity_level;
+static int hf_ip_cipso_categories;
+static int hf_ip_cipso_doi;
+static int hf_ip_opt_time_stamp;
+static int hf_ip_opt_time_stamp_addr;
+
+static int hf_geoip_country;
+static int hf_geoip_country_iso;
+static int hf_geoip_city;
+static int hf_geoip_as_number;
+static int hf_geoip_as_org;
+static int hf_geoip_latitude;
+static int hf_geoip_longitude;
+static int hf_geoip_src_summary;
+static int hf_geoip_src_country;
+static int hf_geoip_src_country_iso;
+static int hf_geoip_src_city;
+static int hf_geoip_src_as_number;
+static int hf_geoip_src_as_org;
+static int hf_geoip_src_latitude;
+static int hf_geoip_src_longitude;
+static int hf_geoip_dst_summary;
+static int hf_geoip_dst_country;
+static int hf_geoip_dst_country_iso;
+static int hf_geoip_dst_city;
+static int hf_geoip_dst_as_number;
+static int hf_geoip_dst_as_org;
+static int hf_geoip_dst_latitude;
+static int hf_geoip_dst_longitude;
+
+static gint ett_ip;
+static gint ett_ip_dsfield;
+static gint ett_ip_tos;
+static gint ett_ip_flags;
+static gint ett_ip_options;
+static gint ett_ip_option_eool;
+static gint ett_ip_option_nop;
+static gint ett_ip_option_sec;
+static gint ett_ip_option_route;
+static gint ett_ip_option_timestamp;
+static gint ett_ip_option_ext_security;
+static gint ett_ip_option_cipso;
+static gint ett_ip_option_sid;
+static gint ett_ip_option_mtu;
+static gint ett_ip_option_tr;
+static gint ett_ip_option_ra;
+static gint ett_ip_option_sdb;
+static gint ett_ip_option_qs;
+static gint ett_ip_option_other;
+static gint ett_ip_fragments;
+static gint ett_ip_fragment;
+static gint ett_ip_opt_type;
+static gint ett_ip_opt_sec_prot_auth_flags;
+static gint ett_ip_unknown_opt;
+
+static expert_field ei_ip_opt_len_invalid;
+static expert_field ei_ip_opt_sec_prot_auth_fti;
+static expert_field ei_ip_extraneous_data;
+static expert_field ei_ip_opt_ptr_before_address;
+static expert_field ei_ip_opt_ptr_middle_address;
+static expert_field ei_ip_subopt_too_long;
+static expert_field ei_ip_nop;
+static expert_field ei_ip_bogus_ip_length;
+static expert_field ei_ip_evil_packet;
+static expert_field ei_ip_checksum_bad;
+static expert_field ei_ip_ttl_lncb;
+static expert_field ei_ip_ttl_too_small;
+static expert_field ei_ip_cipso_tag;
+static expert_field ei_ip_bogus_ip_version;
+static expert_field ei_ip_bogus_header_length;
 
 static dissector_handle_t ip_handle;
 static dissector_table_t ip_option_table;
 
-static gint ett_geoip_info = -1;
+static gint ett_geoip_info;
 
 static const fragment_items ip_frag_items = {
   &ett_ip_fragment,
diff --git a/epan/dissectors/packet-ipars.c b/epan/dissectors/packet-ipars.c
index 4b3a4bbd8a..fe84b8af93 100644
--- a/epan/dissectors/packet-ipars.c
+++ b/epan/dissectors/packet-ipars.c
@@ -19,9 +19,9 @@
 #include <wsutil/str_util.h>
 void proto_register_ipars(void);
 
-static int      proto_ipars     = -1;
+static int      proto_ipars;
 static guint8   ipars_eomtype   = G_MAXUINT8;
-static gint     ett_ipars       = -1;
+static gint     ett_ipars;
 
 #define S1      (0x00)
 #define S2      (0x20)
diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c
index 0422aa7ab8..0af54b84db 100644
--- a/epan/dissectors/packet-ipdc.c
+++ b/epan/dissectors/packet-ipdc.c
@@ -667,29 +667,29 @@ static const value_string tag_enum_type[] = {
 };
 static value_string_ext tag_enum_type_ext = VALUE_STRING_EXT_INIT(tag_enum_type);
 
-static int proto_ipdc = -1;
-static int hf_ipdc_nr = -1;
-static int hf_ipdc_ns = -1;
-static int hf_ipdc_payload_len = -1;
-static int hf_ipdc_protocol_id = -1;
-static int hf_ipdc_trans_id_size = -1;
-static int hf_ipdc_trans_id = -1;
-static int hf_ipdc_message_code = -1;
-static int hf_ipdc_ascii = -1;
-static int hf_ipdc_uint = -1;
-static int hf_ipdc_ipv4 = -1;
-static int hf_ipdc_line_status = -1;
-static int hf_ipdc_channel_status = -1;
-static int hf_ipdc_enctype = -1;
-static int hf_ipdc_end_of_tags = -1;
-static int hf_ipdc_data_trailing_end_of_tags = -1;
-static int hf_ipdc_type_unknown = -1;
-
-static gint ett_ipdc = -1;
-static gint ett_ipdc_tag = -1;
-static gint ett_ipdc_line_status = -1;
-
-static expert_field ei_ipdc_ipv4 = EI_INIT;
+static int proto_ipdc;
+static int hf_ipdc_nr;
+static int hf_ipdc_ns;
+static int hf_ipdc_payload_len;
+static int hf_ipdc_protocol_id;
+static int hf_ipdc_trans_id_size;
+static int hf_ipdc_trans_id;
+static int hf_ipdc_message_code;
+static int hf_ipdc_ascii;
+static int hf_ipdc_uint;
+static int hf_ipdc_ipv4;
+static int hf_ipdc_line_status;
+static int hf_ipdc_channel_status;
+static int hf_ipdc_enctype;
+static int hf_ipdc_end_of_tags;
+static int hf_ipdc_data_trailing_end_of_tags;
+static int hf_ipdc_type_unknown;
+
+static gint ett_ipdc;
+static gint ett_ipdc_tag;
+static gint ett_ipdc_line_status;
+
+static expert_field ei_ipdc_ipv4;
 
 static gboolean ipdc_desegment = TRUE;
 
diff --git a/epan/dissectors/packet-ipdr.c b/epan/dissectors/packet-ipdr.c
index c8bf45c9e9..d775d6a87a 100644
--- a/epan/dissectors/packet-ipdr.c
+++ b/epan/dissectors/packet-ipdr.c
@@ -23,90 +23,90 @@
 void proto_register_ipdr(void);
 void proto_reg_handoff_ipdr(void);
 
-static int proto_ipdr = -1;
-static int proto_ipdr_samis_type_1 = -1;
+static int proto_ipdr;
+static int proto_ipdr_samis_type_1;
 
 static dissector_handle_t ipdr_handle;
 static dissector_handle_t ipdr_samis_type_1_handle;
 
 static dissector_table_t ipdr_sessions_dissector_table;
 
-static int hf_ipdr_version = -1;
-static int hf_ipdr_message_id = -1;
-static int hf_ipdr_session_id = -1;
-static int hf_ipdr_message_flags = -1;
-static int hf_ipdr_message_len = -1;
-static int hf_ipdr_initiator_id = -1;
-static int hf_ipdr_initiator_port = -1;
-static int hf_ipdr_capabilities = -1;
-static int hf_ipdr_keepalive_interval = -1;
-static int hf_ipdr_vendor_id = -1;
-static int hf_ipdr_timestamp = -1;
-static int hf_ipdr_error_code = -1;
-static int hf_ipdr_description = -1;
-static int hf_ipdr_exporter_boot_time = -1;
-static int hf_ipdr_first_record_sequence_number = -1;
-static int hf_ipdr_dropped_record_count = -1;
-static int hf_ipdr_reason_code = -1;
-static int hf_ipdr_reason_info = -1;
-static int hf_ipdr_request_id = -1;
-static int hf_ipdr_config_id = -1;
-static int hf_ipdr_flags = -1;
-static int hf_ipdr_primary = -1;
-static int hf_ipdr_ack_time_interval = -1;
-static int hf_ipdr_ack_sequence_interval = -1;
-static int hf_ipdr_template_id = -1;
-static int hf_ipdr_document_id = -1;
-static int hf_ipdr_sequence_num = -1;
-static int hf_ipdr_request_number = -1;
-static int hf_ipdr_data_record = -1;
+static int hf_ipdr_version;
+static int hf_ipdr_message_id;
+static int hf_ipdr_session_id;
+static int hf_ipdr_message_flags;
+static int hf_ipdr_message_len;
+static int hf_ipdr_initiator_id;
+static int hf_ipdr_initiator_port;
+static int hf_ipdr_capabilities;
+static int hf_ipdr_keepalive_interval;
+static int hf_ipdr_vendor_id;
+static int hf_ipdr_timestamp;
+static int hf_ipdr_error_code;
+static int hf_ipdr_description;
+static int hf_ipdr_exporter_boot_time;
+static int hf_ipdr_first_record_sequence_number;
+static int hf_ipdr_dropped_record_count;
+static int hf_ipdr_reason_code;
+static int hf_ipdr_reason_info;
+static int hf_ipdr_request_id;
+static int hf_ipdr_config_id;
+static int hf_ipdr_flags;
+static int hf_ipdr_primary;
+static int hf_ipdr_ack_time_interval;
+static int hf_ipdr_ack_sequence_interval;
+static int hf_ipdr_template_id;
+static int hf_ipdr_document_id;
+static int hf_ipdr_sequence_num;
+static int hf_ipdr_request_number;
+static int hf_ipdr_data_record;
 
 /* Header fields for SAMIS-TYPE-1 IPDR DATA Records */
-static int hf_ipdr_samis_record_length = -1;
-static int hf_ipdr_cmts_host_name_len = -1;
-static int hf_ipdr_cmts_host_name = -1;
-static int hf_ipdr_cmts_sys_up_time = -1;
-static int hf_ipdr_cmts_ipv4_addr = -1;
-static int hf_ipdr_cmts_ipv6_addr_len = -1;
-static int hf_ipdr_cmts_ipv6_addr = -1;
-static int hf_ipdr_cmts_md_if_name_len = -1;
-static int hf_ipdr_cmts_md_if_name = -1;
-static int hf_ipdr_cmts_md_if_index = -1;
-static int hf_ipdr_cm_mac_addr = -1;
-static int hf_ipdr_cm_ipv4_addr = -1;
-static int hf_ipdr_cm_ipv6_addr = -1;
-static int hf_ipdr_cm_ipv6_addr_string_len = -1;
-static int hf_ipdr_cm_ipv6_addr_string = -1;
-static int hf_ipdr_cm_ipv6_ll_addr = -1;
-static int hf_ipdr_cm_ipv6_ll_addr_string_len = -1;
-static int hf_ipdr_cm_ipv6_ll_addr_string = -1;
-static int hf_ipdr_cm_qos_version = -1;
-static int hf_ipdr_cm_reg_status = -1;
-static int hf_ipdr_cm_last_reg_time = -1;
-static int hf_ipdr_rec_type = -1;
-static int hf_ipdr_rec_creation_time = -1;
-static int hf_ipdr_sf_ch_set = -1;
-static int hf_ipdr_channel_id = -1;
-static int hf_ipdr_service_app_id = -1;
-static int hf_ipdr_service_ds_multicast = -1;
-static int hf_ipdr_service_identifier = -1;
-static int hf_ipdr_service_gate_id = -1;
-static int hf_ipdr_service_class_name_len = -1;
-static int hf_ipdr_service_class_name = -1;
-static int hf_ipdr_service_direction = -1;
-static int hf_ipdr_service_octets_passed = -1;
-static int hf_ipdr_service_pkts_passed = -1;
-static int hf_ipdr_service_sla_drop_pkts = -1;
-static int hf_ipdr_service_sla_delay_pkts = -1;
-static int hf_ipdr_service_time_created = -1;
-static int hf_ipdr_service_time_active = -1;
-
-static gint ett_ipdr = -1;
-static gint ett_ipdr_samis_type_1 = -1;
-static gint ett_ipdr_sf_ch_set = -1;
-
-static expert_field ei_ipdr_message_id = EI_INIT;
-static expert_field ei_ipdr_sf_ch_set = EI_INIT;
+static int hf_ipdr_samis_record_length;
+static int hf_ipdr_cmts_host_name_len;
+static int hf_ipdr_cmts_host_name;
+static int hf_ipdr_cmts_sys_up_time;
+static int hf_ipdr_cmts_ipv4_addr;
+static int hf_ipdr_cmts_ipv6_addr_len;
+static int hf_ipdr_cmts_ipv6_addr;
+static int hf_ipdr_cmts_md_if_name_len;
+static int hf_ipdr_cmts_md_if_name;
+static int hf_ipdr_cmts_md_if_index;
+static int hf_ipdr_cm_mac_addr;
+static int hf_ipdr_cm_ipv4_addr;
+static int hf_ipdr_cm_ipv6_addr;
+static int hf_ipdr_cm_ipv6_addr_string_len;
+static int hf_ipdr_cm_ipv6_addr_string;
+static int hf_ipdr_cm_ipv6_ll_addr;
+static int hf_ipdr_cm_ipv6_ll_addr_string_len;
+static int hf_ipdr_cm_ipv6_ll_addr_string;
+static int hf_ipdr_cm_qos_version;
+static int hf_ipdr_cm_reg_status;
+static int hf_ipdr_cm_last_reg_time;
+static int hf_ipdr_rec_type;
+static int hf_ipdr_rec_creation_time;
+static int hf_ipdr_sf_ch_set;
+static int hf_ipdr_channel_id;
+static int hf_ipdr_service_app_id;
+static int hf_ipdr_service_ds_multicast;
+static int hf_ipdr_service_identifier;
+static int hf_ipdr_service_gate_id;
+static int hf_ipdr_service_class_name_len;
+static int hf_ipdr_service_class_name;
+static int hf_ipdr_service_direction;
+static int hf_ipdr_service_octets_passed;
+static int hf_ipdr_service_pkts_passed;
+static int hf_ipdr_service_sla_drop_pkts;
+static int hf_ipdr_service_sla_delay_pkts;
+static int hf_ipdr_service_time_created;
+static int hf_ipdr_service_time_active;
+
+static gint ett_ipdr;
+static gint ett_ipdr_samis_type_1;
+static gint ett_ipdr_sf_ch_set;
+
+static expert_field ei_ipdr_message_id;
+static expert_field ei_ipdr_sf_ch_set;
 
 static range_t *global_sessions_samis_type_1;
 
diff --git a/epan/dissectors/packet-iperf.c b/epan/dissectors/packet-iperf.c
index 38b9de0b58..04dc342e5d 100644
--- a/epan/dissectors/packet-iperf.c
+++ b/epan/dissectors/packet-iperf.c
@@ -23,78 +23,78 @@
 void proto_register_iperf2(void);
 void proto_reg_handoff_iperf2(void);
 
-static int proto_iperf2 = -1;
-
-static int hf_iperf2_sequence = -1;
-static int hf_iperf2_sec = -1;
-static int hf_iperf2_usec = -1;
-static int hf_iperf2_timestamp = -1;
-static int hf_iperf2_sequence_upper = -1;
-static int hf_iperf2_flags = -1;
-static int hf_iperf2_num_threads = -1;
-static int hf_iperf2_mport = -1;
-static int hf_iperf2_bufferlen = -1;
-static int hf_iperf2_mwinband = -1;
-static int hf_iperf2_mamount = -1;
-static int hf_iperf2_type = -1;
-static int hf_iperf2_length = -1;
-static int hf_iperf2_up_flags = -1;
-static int hf_iperf2_low_flags = -1;
-static int hf_iperf2_version_major = -1;
-static int hf_iperf2_version_minor = -1;
-static int hf_iperf2_version = -1;
-static int hf_iperf2_reserved = -1;
-static int hf_iperf2_tos = -1;
-static int hf_iperf2_rate = -1;
-static int hf_iperf2_rate_units = -1;
-static int hf_iperf2_realtime = -1;
-static int hf_iperf2_permit_key_len = -1;
-static int hf_iperf2_permit_key = -1;
-static int hf_iperf2_isoch_burst_period = -1;
-static int hf_iperf2_isoch_start_ts_s = -1;
-static int hf_iperf2_isoch_start_ts_us = -1;
-static int hf_iperf2_isoch_start_ts = -1;
-static int hf_iperf2_isoch_prev_frameid = -1;
-static int hf_iperf2_isoch_frameid = -1;
-static int hf_iperf2_isoch_burstsize = -1;
-static int hf_iperf2_isoch_bytes_remaining = -1;
-static int hf_iperf2_isoch_reserved = -1;
-static int hf_iperf2_reserved2 = -1;
-static int hf_iperf2_start_tv_sec = -1;
-static int hf_iperf2_start_tv_usec = -1;
-static int hf_iperf2_start_tv = -1;
-static int hf_iperf2_fq_ratel = -1;
-static int hf_iperf2_fq_rateu = -1;
-static int hf_iperf2_fpsl = -1;
-static int hf_iperf2_fpsu = -1;
-static int hf_iperf2_meanl = -1;
-static int hf_iperf2_meanu = -1;
-static int hf_iperf2_variancel = -1;
-static int hf_iperf2_varianceu = -1;
-static int hf_iperf2_burstipgl = -1;
-static int hf_iperf2_burstipg = -1;
-static int hf_iperf2_cca_len = -1;
-static int hf_iperf2_cca_value = -1;
-static int hf_iperf2_bb_size = -1;
-static int hf_iperf2_bb_id = -1;
-static int hf_iperf2_bb_flags = -1;
-static int hf_iperf2_bb_tos = -1;
-static int hf_iperf2_bb_run_time = -1;
-static int hf_iperf2_bb_clienttx_ts_sec = -1;
-static int hf_iperf2_bb_clienttx_ts_usec = -1;
-static int hf_iperf2_bb_clienttx_ts = -1;
-static int hf_iperf2_bb_serverrx_ts_sec = -1;
-static int hf_iperf2_bb_serverrx_ts_usec = -1;
-static int hf_iperf2_bb_serverrx_ts = -1;
-static int hf_iperf2_bb_servertx_ts_sec = -1;
-static int hf_iperf2_bb_servertx_ts_usec = -1;
-static int hf_iperf2_bb_servertx_ts = -1;
-static int hf_iperf2_bb_hold = -1;
-static int hf_iperf2_bb_rtt = -1;
-static int hf_iperf2_bb_read_ts_sec = -1;
-static int hf_iperf2_bb_read_ts_usec = -1;
-static int hf_iperf2_bb_read_ts = -1;
-static int hf_iperf2_bb_reply_size = -1;
+static int proto_iperf2;
+
+static int hf_iperf2_sequence;
+static int hf_iperf2_sec;
+static int hf_iperf2_usec;
+static int hf_iperf2_timestamp;
+static int hf_iperf2_sequence_upper;
+static int hf_iperf2_flags;
+static int hf_iperf2_num_threads;
+static int hf_iperf2_mport;
+static int hf_iperf2_bufferlen;
+static int hf_iperf2_mwinband;
+static int hf_iperf2_mamount;
+static int hf_iperf2_type;
+static int hf_iperf2_length;
+static int hf_iperf2_up_flags;
+static int hf_iperf2_low_flags;
+static int hf_iperf2_version_major;
+static int hf_iperf2_version_minor;
+static int hf_iperf2_version;
+static int hf_iperf2_reserved;
+static int hf_iperf2_tos;
+static int hf_iperf2_rate;
+static int hf_iperf2_rate_units;
+static int hf_iperf2_realtime;
+static int hf_iperf2_permit_key_len;
+static int hf_iperf2_permit_key;
+static int hf_iperf2_isoch_burst_period;
+static int hf_iperf2_isoch_start_ts_s;
+static int hf_iperf2_isoch_start_ts_us;
+static int hf_iperf2_isoch_start_ts;
+static int hf_iperf2_isoch_prev_frameid;
+static int hf_iperf2_isoch_frameid;
+static int hf_iperf2_isoch_burstsize;
+static int hf_iperf2_isoch_bytes_remaining;
+static int hf_iperf2_isoch_reserved;
+static int hf_iperf2_reserved2;
+static int hf_iperf2_start_tv_sec;
+static int hf_iperf2_start_tv_usec;
+static int hf_iperf2_start_tv;
+static int hf_iperf2_fq_ratel;
+static int hf_iperf2_fq_rateu;
+static int hf_iperf2_fpsl;
+static int hf_iperf2_fpsu;
+static int hf_iperf2_meanl;
+static int hf_iperf2_meanu;
+static int hf_iperf2_variancel;
+static int hf_iperf2_varianceu;
+static int hf_iperf2_burstipgl;
+static int hf_iperf2_burstipg;
+static int hf_iperf2_cca_len;
+static int hf_iperf2_cca_value;
+static int hf_iperf2_bb_size;
+static int hf_iperf2_bb_id;
+static int hf_iperf2_bb_flags;
+static int hf_iperf2_bb_tos;
+static int hf_iperf2_bb_run_time;
+static int hf_iperf2_bb_clienttx_ts_sec;
+static int hf_iperf2_bb_clienttx_ts_usec;
+static int hf_iperf2_bb_clienttx_ts;
+static int hf_iperf2_bb_serverrx_ts_sec;
+static int hf_iperf2_bb_serverrx_ts_usec;
+static int hf_iperf2_bb_serverrx_ts;
+static int hf_iperf2_bb_servertx_ts_sec;
+static int hf_iperf2_bb_servertx_ts_usec;
+static int hf_iperf2_bb_servertx_ts;
+static int hf_iperf2_bb_hold;
+static int hf_iperf2_bb_rtt;
+static int hf_iperf2_bb_read_ts_sec;
+static int hf_iperf2_bb_read_ts_usec;
+static int hf_iperf2_bb_read_ts;
+static int hf_iperf2_bb_reply_size;
 
 // Flags definition for hf_iperf2_flags. See include/Listener.hpp in iperf2 source code
 #define HEADER_VERSION1      0x80000000
@@ -139,19 +139,19 @@ static int hf_iperf2_bb_reply_size = -1;
 #define HEADER_CCA          0x8000
 
 // Flags fields declarations for hf_iperf2_flags
-static int hf_iperf2_flag_header_version1 = -1;
-static int hf_iperf2_flag_header_extend = -1;
-static int hf_iperf2_header_udptests = -1;
-static int hf_iperf2_header_seqno64b = -1;
-static int hf_iperf2_header_version2 = -1;
-static int hf_iperf2_header_v2peerdetect = -1;
-static int hf_iperf2_header_udpavoid = -1;
-static int hf_iperf2_header_bounceback = -1;
-static int hf_iperf2_header_len_bit = -1;
-static int hf_iperf2_header_len_mask = -1;
-static int hf_iperf2_run_now = -1;
-static int hf_iperf2_header16_small_triptimes = -1;
-static int hf_iperf2_payload = -1;
+static int hf_iperf2_flag_header_version1;
+static int hf_iperf2_flag_header_extend;
+static int hf_iperf2_header_udptests;
+static int hf_iperf2_header_seqno64b;
+static int hf_iperf2_header_version2;
+static int hf_iperf2_header_v2peerdetect;
+static int hf_iperf2_header_udpavoid;
+static int hf_iperf2_header_bounceback;
+static int hf_iperf2_header_len_bit;
+static int hf_iperf2_header_len_mask;
+static int hf_iperf2_run_now;
+static int hf_iperf2_header16_small_triptimes;
+static int hf_iperf2_payload;
 
 static int * const iperf2_flags[] = {
     &hf_iperf2_flag_header_version1,
@@ -170,22 +170,22 @@ static int * const iperf2_flags[] = {
 };
 
 // Flags fields declarations for iperf2_upper_flags
-static int hf_iperf2_upper_header_isoch = -1;
-static int hf_iperf2_upper_header_l2ethpipv6 = -1;
-static int hf_iperf2_upper_header_l2lencheck = -1;
-static int hf_iperf2_upper_header_noudpfin = -1;
-static int hf_iperf2_upper_header_triptime = -1;
-static int hf_iperf2_upper_header_unused2 = -1;
-static int hf_iperf2_upper_header_isoch_settings = -1;
-static int hf_iperf2_upper_header_units_pps = -1;
-static int hf_iperf2_upper_header_bwset = -1;
-static int hf_iperf2_upper_header_fqrateset = -1;
-static int hf_iperf2_upper_header_reverse = -1;
-static int hf_iperf2_upper_header_fullduplex = -1;
-static int hf_iperf2_upper_header_epoch_start = -1;
-static int hf_iperf2_upper_header_periodicburst = -1;
-static int hf_iperf2_upper_header_writeprefetch = -1;
-static int hf_iperf2_upper_header_tcpquickack = -1;
+static int hf_iperf2_upper_header_isoch;
+static int hf_iperf2_upper_header_l2ethpipv6;
+static int hf_iperf2_upper_header_l2lencheck;
+static int hf_iperf2_upper_header_noudpfin;
+static int hf_iperf2_upper_header_triptime;
+static int hf_iperf2_upper_header_unused2;
+static int hf_iperf2_upper_header_isoch_settings;
+static int hf_iperf2_upper_header_units_pps;
+static int hf_iperf2_upper_header_bwset;
+static int hf_iperf2_upper_header_fqrateset;
+static int hf_iperf2_upper_header_reverse;
+static int hf_iperf2_upper_header_fullduplex;
+static int hf_iperf2_upper_header_epoch_start;
+static int hf_iperf2_upper_header_periodicburst;
+static int hf_iperf2_upper_header_writeprefetch;
+static int hf_iperf2_upper_header_tcpquickack;
 
 static int * const iperf2_upper_flags[] = {
     &hf_iperf2_upper_header_tcpquickack,
@@ -208,7 +208,7 @@ static int * const iperf2_upper_flags[] = {
 };
 
 // Flags fields declarations for iperf2_lower_flags
-static int hf_iperf2_lower_header_cca = -1;
+static int hf_iperf2_lower_header_cca;
 
 static int * const iperf2_lower_flags[] = {
     &hf_iperf2_lower_header_cca,
@@ -216,11 +216,11 @@ static int * const iperf2_lower_flags[] = {
 };
 
 // Flags fields declarations for iperf2_bb_flags
-static int hf_iperf2_header_bbquickack = -1;
-static int hf_iperf2_header_bbclocksynced = -1;
-static int hf_iperf2_header_bbtos = -1;
-static int hf_iperf2_header_bbstop = -1;
-static int hf_iperf2_header_bbreplysize = -1;
+static int hf_iperf2_header_bbquickack;
+static int hf_iperf2_header_bbclocksynced;
+static int hf_iperf2_header_bbtos;
+static int hf_iperf2_header_bbstop;
+static int hf_iperf2_header_bbreplysize;
 
 static int * const iperf2_bb_flags[] = {
     &hf_iperf2_header_bbquickack,
@@ -231,27 +231,27 @@ static int * const iperf2_bb_flags[] = {
     NULL
 };
 
-static gint ett_iperf2_udp = -1;
-static gint ett_iperf2_tcp = -1;
-static gint ett_udphdr = -1;
-static gint ett_clienthdr = -1;
-static gint ett_bbhdr = -1;
-static gint ett_extendedhdr = -1;
-static gint ett_permit_key = -1;
-static gint ett_client_upper_flags = -1;
-static gint ett_client_lower_flags = -1;
-static gint ett_isochhdr = -1;
-static gint ett_fqhdr = -1;
-static gint ett_ext_isochhdr = -1;
-static gint ett_client_hdr = -1;
-static gint ett_client_hdr_flags = -1;
-static gint ett_cca_hdr = -1;
-static gint ett_bb_hdr_flags = -1;
-static gint ett_bbclienttx_ts = -1;
-static gint ett_bbserverrx_ts = -1;
-static gint ett_bbservertx_ts = -1;
-static gint ett_bbread_ts = -1;
-static gint ett_data = -1;
+static gint ett_iperf2_udp;
+static gint ett_iperf2_tcp;
+static gint ett_udphdr;
+static gint ett_clienthdr;
+static gint ett_bbhdr;
+static gint ett_extendedhdr;
+static gint ett_permit_key;
+static gint ett_client_upper_flags;
+static gint ett_client_lower_flags;
+static gint ett_isochhdr;
+static gint ett_fqhdr;
+static gint ett_ext_isochhdr;
+static gint ett_client_hdr;
+static gint ett_client_hdr_flags;
+static gint ett_cca_hdr;
+static gint ett_bb_hdr_flags;
+static gint ett_bbclienttx_ts;
+static gint ett_bbserverrx_ts;
+static gint ett_bbservertx_ts;
+static gint ett_bbread_ts;
+static gint ett_data;
 
 /* parser definitions for iperf2 payload */
 static tvbparse_wanted_t *want;
diff --git a/epan/dissectors/packet-iperf3.c b/epan/dissectors/packet-iperf3.c
index b4ebb7a018..4b90d8a343 100644
--- a/epan/dissectors/packet-iperf3.c
+++ b/epan/dissectors/packet-iperf3.c
@@ -62,18 +62,18 @@ typedef enum
 void proto_register_iperf3(void);
 void proto_reg_handoff_iperf3(void);
 
-static int proto_iperf3 = -1;
+static int proto_iperf3;
 
-static int hf_iperf3_sequence = -1;
-static int hf_iperf3_sec = -1;
-static int hf_iperf3_usec = -1;
-static int hf_iperf3_udp_init_msg = -1;
-static int hf_iperf3_state = -1;
-static int hf_iperf3_prejson = -1;
-static int hf_iperf3_cookie = -1;
+static int hf_iperf3_sequence;
+static int hf_iperf3_sec;
+static int hf_iperf3_usec;
+static int hf_iperf3_udp_init_msg;
+static int hf_iperf3_state;
+static int hf_iperf3_prejson;
+static int hf_iperf3_cookie;
 
-static int ett_iperf3 = -1;
-static int ett_time = -1;
+static int ett_iperf3;
+static int ett_time;
 
 static dissector_handle_t iperf3_handle_tcp = NULL;
 static dissector_handle_t iperf3_handle_udp = NULL;
@@ -130,7 +130,7 @@ static udp_conversation_data *udp_set_conversation_data(packet_info *);
 static gboolean iperf3_pref_64bit_seq_no = FALSE;
 static gboolean iperf3_pref_detect_udp_order = TRUE;
 /* expert info */
-static expert_field ei_udp_out_of_order = EI_INIT;
+static expert_field ei_udp_out_of_order;
 
 #define IPERF3_UDP_HDR_SIZE 12
 #define COOKIE_SIZE 37
diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c
index 5544ea606f..f45fe24abd 100644
--- a/epan/dissectors/packet-ipfc.c
+++ b/epan/dissectors/packet-ipfc.c
@@ -27,12 +27,12 @@ static dissector_handle_t ipfc_handle;
 static capture_dissector_handle_t ipfc_cap_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_ipfc              = -1;
-static int hf_ipfc_network_da = -1;
-static int hf_ipfc_network_sa = -1;
+static int proto_ipfc;
+static int hf_ipfc_network_da;
+static int hf_ipfc_network_sa;
 
 /* Initialize the subtree pointers */
-static gint ett_ipfc = -1;
+static gint ett_ipfc;
 static dissector_handle_t llc_handle;
 static capture_dissector_handle_t llc_cap_handle;
 
diff --git a/epan/dissectors/packet-ipmi-app.c b/epan/dissectors/packet-ipmi-app.c
index 2a6a3852b7..c6b221ef0b 100644
--- a/epan/dissectors/packet-ipmi-app.c
+++ b/epan/dissectors/packet-ipmi-app.c
@@ -18,210 +18,210 @@
 
 void proto_register_ipmi_app(void);
 
-static gint ett_ipmi_app_01_byte2 = -1;
-static gint ett_ipmi_app_01_byte3 = -1;
-static gint ett_ipmi_app_01_byte6 = -1;
-
-static gint ett_ipmi_app_04_byte2 = -1;
-
-static gint ett_ipmi_app_06_syspwr = -1;
-static gint ett_ipmi_app_06_devpwr = -1;
-
-static gint ett_ipmi_app_07_syspwr = -1;
-static gint ett_ipmi_app_07_devpwr = -1;
-
-static gint ett_ipmi_app_24_timer_use = -1;
-static gint ett_ipmi_app_24_timer_action = -1;
-static gint ett_ipmi_app_24_expiration_flags = -1;
-
-static gint ett_ipmi_app_25_timer_use = -1;
-static gint ett_ipmi_app_25_timer_action = -1;
-static gint ett_ipmi_app_25_expiration_flags = -1;
-
-static gint ett_ipmi_app_2e_byte1 = -1;
-static gint ett_ipmi_app_2f_byte1 = -1;
-static gint ett_ipmi_app_30_byte1 = -1;
-static gint ett_ipmi_app_31_byte1 = -1;
-static gint ett_ipmi_app_32_rq_byte1 = -1;
-static gint ett_ipmi_app_32_rq_byte2 = -1;
-static gint ett_ipmi_app_32_rs_byte1 = -1;
-static gint ett_ipmi_app_32_rs_byte2 = -1;
-static gint ett_ipmi_app_33_rs_byte1 = -1;
-static gint ett_ipmi_app_33_msg = -1;
-static gint ett_ipmi_app_34_byte1 = -1;
-static gint ett_ipmi_app_34_msg = -1;
-
-static gint ett_ipmi_app_38_rq_byte1 = -1;
-static gint ett_ipmi_app_38_rq_byte2 = -1;
-static gint ett_ipmi_app_38_rs_byte1 = -1;
-static gint ett_ipmi_app_38_rs_byte2 = -1;
-static gint ett_ipmi_app_38_rs_byte3 = -1;
-static gint ett_ipmi_app_38_rs_byte4 = -1;
-
-static gint ett_ipmi_app_39_byte1 = -1;
-
-static gint ett_ipmi_app_3a_rq_byte1 = -1;
-static gint ett_ipmi_app_3a_rq_byte2 = -1;
-static gint ett_ipmi_app_3a_rs_byte1 = -1;
-static gint ett_ipmi_app_3a_rs_byte10 = -1;
-
-static gint ett_ipmi_app_3b_rq_byte1 = -1;
-static gint ett_ipmi_app_3b_rs_byte1 = -1;
-
-static gint hf_ipmi_app_01_dev_id = -1;
-static gint hf_ipmi_app_01_dev_prov_sdr = -1;
-static gint hf_ipmi_app_01_dev_rev = -1;
-static gint hf_ipmi_app_01_dev_avail = -1;
-static gint hf_ipmi_app_01_fw_rev_maj = -1;
-static gint hf_ipmi_app_01_fw_rev_min = -1;
-static gint hf_ipmi_app_01_ipmi_version = -1;
-static gint hf_ipmi_app_01_ipmi_ads_chassis = -1;
-static gint hf_ipmi_app_01_ipmi_ads_bridge = -1;
-static gint hf_ipmi_app_01_ipmi_ads_ipmb_ev_gen = -1;
-static gint hf_ipmi_app_01_ipmi_ads_ipmb_ev_recv = -1;
-static gint hf_ipmi_app_01_ipmi_ads_fru = -1;
-static gint hf_ipmi_app_01_ipmi_ads_sel = -1;
-static gint hf_ipmi_app_01_ipmi_ads_sdr = -1;
-static gint hf_ipmi_app_01_ipmi_ads_sensor = -1;
-static gint hf_ipmi_app_01_manufacturer = -1;
-static gint hf_ipmi_app_01_product = -1;
-static gint hf_ipmi_app_01_fw_aux = -1;
-
-static gint hf_ipmi_app_04_result = -1;
-static gint hf_ipmi_app_04_fail = -1;
-static gint hf_ipmi_app_04_fail_sel = -1;
-static gint hf_ipmi_app_04_fail_sdr = -1;
-static gint hf_ipmi_app_04_fail_bmc_fru = -1;
-static gint hf_ipmi_app_04_fail_ipmb_sig = -1;
-static gint hf_ipmi_app_04_fail_sdr_empty = -1;
-static gint hf_ipmi_app_04_fail_iua = -1;
-static gint hf_ipmi_app_04_fail_bb_fw = -1;
-static gint hf_ipmi_app_04_fail_oper_fw = -1;
-
-static gint hf_ipmi_app_05_devspec = -1;
-
-static gint hf_ipmi_app_06_syspwr_set = -1;
-static gint hf_ipmi_app_06_syspwr_enum = -1;
-static gint hf_ipmi_app_06_devpwr_set = -1;
-static gint hf_ipmi_app_06_devpwr_enum = -1;
-
-static gint hf_ipmi_app_07_syspwr_enum = -1;
-static gint hf_ipmi_app_07_devpwr_enum = -1;
-
-static gint hf_ipmi_app_08_guid = -1;
-
-static gint hf_ipmi_app_24_timer_use_dont_log = -1;
-static gint hf_ipmi_app_24_timer_use_dont_stop = -1;
-static gint hf_ipmi_app_24_timer_use_timer_use = -1;
-static gint hf_ipmi_app_24_timer_action_interrupt = -1;
-static gint hf_ipmi_app_24_timer_action_timeout_action = -1;
-static gint hf_ipmi_app_24_pretimeout = -1;
-static gint hf_ipmi_app_24_expiration_flags_oem = -1;
-static gint hf_ipmi_app_24_expiration_flags_smsos = -1;
-static gint hf_ipmi_app_24_expiration_flags_osload = -1;
-static gint hf_ipmi_app_24_expiration_flags_biospost = -1;
-static gint hf_ipmi_app_24_expiration_flags_biosfrb2 = -1;
-static gint hf_ipmi_app_24_initial_countdown = -1;
-
-static gint hf_ipmi_app_25_timer_use_dont_log = -1;
-static gint hf_ipmi_app_25_timer_use_started = -1;
-static gint hf_ipmi_app_25_timer_use_timer_use = -1;
-static gint hf_ipmi_app_25_timer_action_interrupt = -1;
-static gint hf_ipmi_app_25_timer_action_timeout_action = -1;
-static gint hf_ipmi_app_25_pretimeout = -1;
-static gint hf_ipmi_app_25_expiration_flags_oem = -1;
-static gint hf_ipmi_app_25_expiration_flags_smsos = -1;
-static gint hf_ipmi_app_25_expiration_flags_osload = -1;
-static gint hf_ipmi_app_25_expiration_flags_biospost = -1;
-static gint hf_ipmi_app_25_expiration_flags_biosfrb2 = -1;
-static gint hf_ipmi_app_25_initial_countdown = -1;
-static gint hf_ipmi_app_25_present_countdown = -1;
-
-static gint hf_ipmi_app_2e_byte1_oem2 = -1;
-static gint hf_ipmi_app_2e_byte1_oem1 = -1;
-static gint hf_ipmi_app_2e_byte1_oem0 = -1;
-static gint hf_ipmi_app_2e_byte1_sel = -1;
-static gint hf_ipmi_app_2e_byte1_emb = -1;
-static gint hf_ipmi_app_2e_byte1_emb_full_intr = -1;
-static gint hf_ipmi_app_2e_byte1_rmq_intr = -1;
-
-static gint hf_ipmi_app_2f_byte1_oem2 = -1;
-static gint hf_ipmi_app_2f_byte1_oem1 = -1;
-static gint hf_ipmi_app_2f_byte1_oem0 = -1;
-static gint hf_ipmi_app_2f_byte1_sel = -1;
-static gint hf_ipmi_app_2f_byte1_emb = -1;
-static gint hf_ipmi_app_2f_byte1_emb_full_intr = -1;
-static gint hf_ipmi_app_2f_byte1_rmq_intr = -1;
-
-static gint hf_ipmi_app_30_byte1_oem2 = -1;
-static gint hf_ipmi_app_30_byte1_oem1 = -1;
-static gint hf_ipmi_app_30_byte1_oem0 = -1;
-static gint hf_ipmi_app_30_byte1_wd_pretimeout = -1;
-static gint hf_ipmi_app_30_byte1_emb = -1;
-static gint hf_ipmi_app_30_byte1_rmq = -1;
-
-static gint hf_ipmi_app_31_byte1_oem2 = -1;
-static gint hf_ipmi_app_31_byte1_oem1 = -1;
-static gint hf_ipmi_app_31_byte1_oem0 = -1;
-static gint hf_ipmi_app_31_byte1_wd_pretimeout = -1;
-static gint hf_ipmi_app_31_byte1_emb = -1;
-static gint hf_ipmi_app_31_byte1_rmq = -1;
-
-static gint hf_ipmi_app_32_rq_chno = -1;
-static gint hf_ipmi_app_32_rq_state = -1;
-static gint hf_ipmi_app_32_rs_chno = -1;
-static gint hf_ipmi_app_32_rs_state = -1;
-
-static gint hf_ipmi_app_33_rs_chan = -1;
-static gint hf_ipmi_app_33_rs_priv = -1;
-static gint hf_ipmi_app_33_msg = -1;
-
-static gint hf_ipmi_app_34_track = -1;
-static gint hf_ipmi_app_34_encrypt = -1;
-static gint hf_ipmi_app_34_auth = -1;
-static gint hf_ipmi_app_34_chan = -1;
-static gint hf_ipmi_app_34_msg = -1;
-
-static gint hf_ipmi_app_38_rq_ipmi20 = -1;
-static gint hf_ipmi_app_38_rq_chan = -1;
-static gint hf_ipmi_app_38_rq_priv = -1;
-static gint hf_ipmi_app_38_rs_chan = -1;
-static gint hf_ipmi_app_38_rs_ipmi20 = -1;
-static gint hf_ipmi_app_38_rs_auth_oem = -1;
-static gint hf_ipmi_app_38_rs_auth_straight = -1;
-static gint hf_ipmi_app_38_rs_auth_md5 = -1;
-static gint hf_ipmi_app_38_rs_auth_md2 = -1;
-static gint hf_ipmi_app_38_rs_auth_none = -1;
-static gint hf_ipmi_app_38_rs_kg = -1;
-static gint hf_ipmi_app_38_rs_permsg = -1;
-static gint hf_ipmi_app_38_rs_userauth = -1;
-static gint hf_ipmi_app_38_rs_user_nonnull = -1;
-static gint hf_ipmi_app_38_rs_user_null = -1;
-static gint hf_ipmi_app_38_rs_user_anon = -1;
-static gint hf_ipmi_app_38_rs_ipmi20_conn = -1;
-static gint hf_ipmi_app_38_rs_ipmi15_conn = -1;
-static gint hf_ipmi_app_38_rs_oem_iana = -1;
-static gint hf_ipmi_app_38_rs_oem_aux = -1;
-
-static gint hf_ipmi_app_39_authtype = -1;
-static gint hf_ipmi_app_39_user = -1;
-static gint hf_ipmi_app_39_temp_session = -1;
-static gint hf_ipmi_app_39_challenge = -1;
-
-static gint hf_ipmi_app_3a_authtype = -1;
-static gint hf_ipmi_app_3a_privlevel = -1;
-static gint hf_ipmi_app_3a_authcode = -1;
-static gint hf_ipmi_app_3a_outbound_seq = -1;
-static gint hf_ipmi_app_3a_authtype_session = -1;
-static gint hf_ipmi_app_3a_session_id = -1;
-static gint hf_ipmi_app_3a_inbound_seq = -1;
-static gint hf_ipmi_app_3a_maxpriv_session = -1;
-
-static gint hf_ipmi_app_3b_req_priv = -1;
-static gint hf_ipmi_app_3b_new_priv = -1;
-
-static gint hf_ipmi_app_3c_session_id = -1;
-static gint hf_ipmi_app_3c_session_handle = -1;
+static gint ett_ipmi_app_01_byte2;
+static gint ett_ipmi_app_01_byte3;
+static gint ett_ipmi_app_01_byte6;
+
+static gint ett_ipmi_app_04_byte2;
+
+static gint ett_ipmi_app_06_syspwr;
+static gint ett_ipmi_app_06_devpwr;
+
+static gint ett_ipmi_app_07_syspwr;
+static gint ett_ipmi_app_07_devpwr;
+
+static gint ett_ipmi_app_24_timer_use;
+static gint ett_ipmi_app_24_timer_action;
+static gint ett_ipmi_app_24_expiration_flags;
+
+static gint ett_ipmi_app_25_timer_use;
+static gint ett_ipmi_app_25_timer_action;
+static gint ett_ipmi_app_25_expiration_flags;
+
+static gint ett_ipmi_app_2e_byte1;
+static gint ett_ipmi_app_2f_byte1;
+static gint ett_ipmi_app_30_byte1;
+static gint ett_ipmi_app_31_byte1;
+static gint ett_ipmi_app_32_rq_byte1;
+static gint ett_ipmi_app_32_rq_byte2;
+static gint ett_ipmi_app_32_rs_byte1;
+static gint ett_ipmi_app_32_rs_byte2;
+static gint ett_ipmi_app_33_rs_byte1;
+static gint ett_ipmi_app_33_msg;
+static gint ett_ipmi_app_34_byte1;
+static gint ett_ipmi_app_34_msg;
+
+static gint ett_ipmi_app_38_rq_byte1;
+static gint ett_ipmi_app_38_rq_byte2;
+static gint ett_ipmi_app_38_rs_byte1;
+static gint ett_ipmi_app_38_rs_byte2;
+static gint ett_ipmi_app_38_rs_byte3;
+static gint ett_ipmi_app_38_rs_byte4;
+
+static gint ett_ipmi_app_39_byte1;
+
+static gint ett_ipmi_app_3a_rq_byte1;
+static gint ett_ipmi_app_3a_rq_byte2;
+static gint ett_ipmi_app_3a_rs_byte1;
+static gint ett_ipmi_app_3a_rs_byte10;
+
+static gint ett_ipmi_app_3b_rq_byte1;
+static gint ett_ipmi_app_3b_rs_byte1;
+
+static gint hf_ipmi_app_01_dev_id;
+static gint hf_ipmi_app_01_dev_prov_sdr;
+static gint hf_ipmi_app_01_dev_rev;
+static gint hf_ipmi_app_01_dev_avail;
+static gint hf_ipmi_app_01_fw_rev_maj;
+static gint hf_ipmi_app_01_fw_rev_min;
+static gint hf_ipmi_app_01_ipmi_version;
+static gint hf_ipmi_app_01_ipmi_ads_chassis;
+static gint hf_ipmi_app_01_ipmi_ads_bridge;
+static gint hf_ipmi_app_01_ipmi_ads_ipmb_ev_gen;
+static gint hf_ipmi_app_01_ipmi_ads_ipmb_ev_recv;
+static gint hf_ipmi_app_01_ipmi_ads_fru;
+static gint hf_ipmi_app_01_ipmi_ads_sel;
+static gint hf_ipmi_app_01_ipmi_ads_sdr;
+static gint hf_ipmi_app_01_ipmi_ads_sensor;
+static gint hf_ipmi_app_01_manufacturer;
+static gint hf_ipmi_app_01_product;
+static gint hf_ipmi_app_01_fw_aux;
+
+static gint hf_ipmi_app_04_result;
+static gint hf_ipmi_app_04_fail;
+static gint hf_ipmi_app_04_fail_sel;
+static gint hf_ipmi_app_04_fail_sdr;
+static gint hf_ipmi_app_04_fail_bmc_fru;
+static gint hf_ipmi_app_04_fail_ipmb_sig;
+static gint hf_ipmi_app_04_fail_sdr_empty;
+static gint hf_ipmi_app_04_fail_iua;
+static gint hf_ipmi_app_04_fail_bb_fw;
+static gint hf_ipmi_app_04_fail_oper_fw;
+
+static gint hf_ipmi_app_05_devspec;
+
+static gint hf_ipmi_app_06_syspwr_set;
+static gint hf_ipmi_app_06_syspwr_enum;
+static gint hf_ipmi_app_06_devpwr_set;
+static gint hf_ipmi_app_06_devpwr_enum;
+
+static gint hf_ipmi_app_07_syspwr_enum;
+static gint hf_ipmi_app_07_devpwr_enum;
+
+static gint hf_ipmi_app_08_guid;
+
+static gint hf_ipmi_app_24_timer_use_dont_log;
+static gint hf_ipmi_app_24_timer_use_dont_stop;
+static gint hf_ipmi_app_24_timer_use_timer_use;
+static gint hf_ipmi_app_24_timer_action_interrupt;
+static gint hf_ipmi_app_24_timer_action_timeout_action;
+static gint hf_ipmi_app_24_pretimeout;
+static gint hf_ipmi_app_24_expiration_flags_oem;
+static gint hf_ipmi_app_24_expiration_flags_smsos;
+static gint hf_ipmi_app_24_expiration_flags_osload;
+static gint hf_ipmi_app_24_expiration_flags_biospost;
+static gint hf_ipmi_app_24_expiration_flags_biosfrb2;
+static gint hf_ipmi_app_24_initial_countdown;
+
+static gint hf_ipmi_app_25_timer_use_dont_log;
+static gint hf_ipmi_app_25_timer_use_started;
+static gint hf_ipmi_app_25_timer_use_timer_use;
+static gint hf_ipmi_app_25_timer_action_interrupt;
+static gint hf_ipmi_app_25_timer_action_timeout_action;
+static gint hf_ipmi_app_25_pretimeout;
+static gint hf_ipmi_app_25_expiration_flags_oem;
+static gint hf_ipmi_app_25_expiration_flags_smsos;
+static gint hf_ipmi_app_25_expiration_flags_osload;
+static gint hf_ipmi_app_25_expiration_flags_biospost;
+static gint hf_ipmi_app_25_expiration_flags_biosfrb2;
+static gint hf_ipmi_app_25_initial_countdown;
+static gint hf_ipmi_app_25_present_countdown;
+
+static gint hf_ipmi_app_2e_byte1_oem2;
+static gint hf_ipmi_app_2e_byte1_oem1;
+static gint hf_ipmi_app_2e_byte1_oem0;
+static gint hf_ipmi_app_2e_byte1_sel;
+static gint hf_ipmi_app_2e_byte1_emb;
+static gint hf_ipmi_app_2e_byte1_emb_full_intr;
+static gint hf_ipmi_app_2e_byte1_rmq_intr;
+
+static gint hf_ipmi_app_2f_byte1_oem2;
+static gint hf_ipmi_app_2f_byte1_oem1;
+static gint hf_ipmi_app_2f_byte1_oem0;
+static gint hf_ipmi_app_2f_byte1_sel;
+static gint hf_ipmi_app_2f_byte1_emb;
+static gint hf_ipmi_app_2f_byte1_emb_full_intr;
+static gint hf_ipmi_app_2f_byte1_rmq_intr;
+
+static gint hf_ipmi_app_30_byte1_oem2;
+static gint hf_ipmi_app_30_byte1_oem1;
+static gint hf_ipmi_app_30_byte1_oem0;
+static gint hf_ipmi_app_30_byte1_wd_pretimeout;
+static gint hf_ipmi_app_30_byte1_emb;
+static gint hf_ipmi_app_30_byte1_rmq;
+
+static gint hf_ipmi_app_31_byte1_oem2;
+static gint hf_ipmi_app_31_byte1_oem1;
+static gint hf_ipmi_app_31_byte1_oem0;
+static gint hf_ipmi_app_31_byte1_wd_pretimeout;
+static gint hf_ipmi_app_31_byte1_emb;
+static gint hf_ipmi_app_31_byte1_rmq;
+
+static gint hf_ipmi_app_32_rq_chno;
+static gint hf_ipmi_app_32_rq_state;
+static gint hf_ipmi_app_32_rs_chno;
+static gint hf_ipmi_app_32_rs_state;
+
+static gint hf_ipmi_app_33_rs_chan;
+static gint hf_ipmi_app_33_rs_priv;
+static gint hf_ipmi_app_33_msg;
+
+static gint hf_ipmi_app_34_track;
+static gint hf_ipmi_app_34_encrypt;
+static gint hf_ipmi_app_34_auth;
+static gint hf_ipmi_app_34_chan;
+static gint hf_ipmi_app_34_msg;
+
+static gint hf_ipmi_app_38_rq_ipmi20;
+static gint hf_ipmi_app_38_rq_chan;
+static gint hf_ipmi_app_38_rq_priv;
+static gint hf_ipmi_app_38_rs_chan;
+static gint hf_ipmi_app_38_rs_ipmi20;
+static gint hf_ipmi_app_38_rs_auth_oem;
+static gint hf_ipmi_app_38_rs_auth_straight;
+static gint hf_ipmi_app_38_rs_auth_md5;
+static gint hf_ipmi_app_38_rs_auth_md2;
+static gint hf_ipmi_app_38_rs_auth_none;
+static gint hf_ipmi_app_38_rs_kg;
+static gint hf_ipmi_app_38_rs_permsg;
+static gint hf_ipmi_app_38_rs_userauth;
+static gint hf_ipmi_app_38_rs_user_nonnull;
+static gint hf_ipmi_app_38_rs_user_null;
+static gint hf_ipmi_app_38_rs_user_anon;
+static gint hf_ipmi_app_38_rs_ipmi20_conn;
+static gint hf_ipmi_app_38_rs_ipmi15_conn;
+static gint hf_ipmi_app_38_rs_oem_iana;
+static gint hf_ipmi_app_38_rs_oem_aux;
+
+static gint hf_ipmi_app_39_authtype;
+static gint hf_ipmi_app_39_user;
+static gint hf_ipmi_app_39_temp_session;
+static gint hf_ipmi_app_39_challenge;
+
+static gint hf_ipmi_app_3a_authtype;
+static gint hf_ipmi_app_3a_privlevel;
+static gint hf_ipmi_app_3a_authcode;
+static gint hf_ipmi_app_3a_outbound_seq;
+static gint hf_ipmi_app_3a_authtype_session;
+static gint hf_ipmi_app_3a_session_id;
+static gint hf_ipmi_app_3a_inbound_seq;
+static gint hf_ipmi_app_3a_maxpriv_session;
+
+static gint hf_ipmi_app_3b_req_priv;
+static gint hf_ipmi_app_3b_new_priv;
+
+static gint hf_ipmi_app_3c_session_id;
+static gint hf_ipmi_app_3c_session_handle;
 
 static const struct true_false_string tfs_01_dev_avail = {
 	"Device firmware, SDR Repository update or self-initialization in progress",
diff --git a/epan/dissectors/packet-ipmi-chassis.c b/epan/dissectors/packet-ipmi-chassis.c
index 43b11f584b..ae545598f2 100644
--- a/epan/dissectors/packet-ipmi-chassis.c
+++ b/epan/dissectors/packet-ipmi-chassis.c
@@ -19,141 +19,141 @@ void proto_register_ipmi_chassis(void);
 
 /* Local variables.
  */
-static gint ett_ipmi_chs_bo00_byte1 = -1;
-static gint ett_ipmi_chs_bo02_byte1 = -1;
-static gint ett_ipmi_chs_bo03_byte1 = -1;
-static gint ett_ipmi_chs_bo04_byte2 = -1;
-static gint ett_ipmi_chs_bo05_byte1 = -1;
-static gint ett_ipmi_chs_bo05_byte2 = -1;
-static gint ett_ipmi_chs_bo05_byte3 = -1;
-static gint ett_ipmi_chs_bo05_byte4 = -1;
-static gint ett_ipmi_chs_bo06_byte1 = -1;
-
-static gint ett_ipmi_chs_00_capflags = -1;
-static gint ett_ipmi_chs_01_pwr_state = -1;
-static gint ett_ipmi_chs_01_last_event = -1;
-static gint ett_ipmi_chs_01_misc = -1;
-static gint ett_ipmi_chs_01_fpb = -1;
-static gint ett_ipmi_chs_02_byte1 = -1;
-static gint ett_ipmi_chs_04_byte2 = -1;
-static gint ett_ipmi_chs_05_flags = -1;
-static gint ett_ipmi_chs_06_byte1 = -1;
-static gint ett_ipmi_chs_06_policy_support = -1;
-static gint ett_ipmi_chs_07_byte1 = -1;
-static gint ett_ipmi_chs_08_byte1 = -1;
-static gint ett_ipmi_chs_09_rq_byte1 = -1;
-static gint ett_ipmi_chs_09_rs_byte1 = -1;
-static gint ett_ipmi_chs_09_rs_byte2 = -1;
-
-static gint hf_ipmi_chs_bo00_sip = -1;
-static gint hf_ipmi_chs_bo01_spsel = -1;
-static gint hf_ipmi_chs_bo02_request = -1;
-static gint hf_ipmi_chs_bo02_discovered = -1;
-static gint hf_ipmi_chs_bo03_pef = -1;
-static gint hf_ipmi_chs_bo03_cctrl_timeout = -1;
-static gint hf_ipmi_chs_bo03_wd_timeout = -1;
-static gint hf_ipmi_chs_bo03_softreset = -1;
-static gint hf_ipmi_chs_bo03_powerup = -1;
-static gint hf_ipmi_chs_bo04_write_mask = -1;
-static gint hf_ipmi_chs_bo04_bootinit_ack_oem = -1;
-static gint hf_ipmi_chs_bo04_bootinit_ack_sms = -1;
-static gint hf_ipmi_chs_bo04_bootinit_ack_os = -1;
-static gint hf_ipmi_chs_bo04_bootinit_ack_osloader = -1;
-static gint hf_ipmi_chs_bo04_bootinit_ack_bios = -1;
-static gint hf_ipmi_chs_bo05_bootflags_valid = -1;
-static gint hf_ipmi_chs_bo05_permanent = -1;
-static gint hf_ipmi_chs_bo05_boottype = -1;
-static gint hf_ipmi_chs_bo05_cmos_clear = -1;
-static gint hf_ipmi_chs_bo05_lock_kbd = -1;
-static gint hf_ipmi_chs_bo05_bootdev = -1;
-static gint hf_ipmi_chs_bo05_screen_blank = -1;
-static gint hf_ipmi_chs_bo05_lockout_reset = -1;
-static gint hf_ipmi_chs_bo05_lockout_poweroff = -1;
-static gint hf_ipmi_chs_bo05_bios_verbosity = -1;
-static gint hf_ipmi_chs_bo05_progress_traps = -1;
-static gint hf_ipmi_chs_bo05_pwd_bypass = -1;
-static gint hf_ipmi_chs_bo05_lock_sleep = -1;
-static gint hf_ipmi_chs_bo05_console_redirection = -1;
-static gint hf_ipmi_chs_bo05_bios_shared_override = -1;
-static gint hf_ipmi_chs_bo05_bios_muxctl_override = -1;
-static gint hf_ipmi_chs_bo05_byte5 = -1;
-static gint hf_ipmi_chs_bo06_chan_num = -1;
-static gint hf_ipmi_chs_bo06_session_id = -1;
-static gint hf_ipmi_chs_bo06_bootinfo_timestamp = -1;
-static gint hf_ipmi_chs_bo07_block_selector = -1;
-static gint hf_ipmi_chs_bo07_block_data = -1;
-
-static gint hf_ipmi_chs_00_capflags_ppi = -1;
-static gint hf_ipmi_chs_00_capflags_di = -1;
-static gint hf_ipmi_chs_00_capflags_fpl = -1;
-static gint hf_ipmi_chs_00_capflags_is = -1;
-static gint hf_ipmi_chs_00_fru_dev_addr = -1;
-static gint hf_ipmi_chs_00_sdr_dev_addr = -1;
-static gint hf_ipmi_chs_00_sel_dev_addr = -1;
-static gint hf_ipmi_chs_00_sm_dev_addr = -1;
-static gint hf_ipmi_chs_00_bridge_dev_addr = -1;
-
-static gint hf_ipmi_chs_01_pwr_state_policy = -1;
-static gint hf_ipmi_chs_01_pwr_state_ctl_fault = -1;
-static gint hf_ipmi_chs_01_pwr_state_fault = -1;
-static gint hf_ipmi_chs_01_pwr_state_ilock = -1;
-static gint hf_ipmi_chs_01_pwr_state_overload = -1;
-static gint hf_ipmi_chs_01_pwr_state_powered = -1;
-static gint hf_ipmi_chs_01_last_event_via_ipmi = -1;
-static gint hf_ipmi_chs_01_last_event_down_by_fault = -1;
-static gint hf_ipmi_chs_01_last_event_interlock = -1;
-static gint hf_ipmi_chs_01_last_event_overload = -1;
-static gint hf_ipmi_chs_01_last_event_ac_failed = -1;
-static gint hf_ipmi_chs_01_misc_identsupp = -1;
-static gint hf_ipmi_chs_01_misc_identstate = -1;
-static gint hf_ipmi_chs_01_misc_fan = -1;
-static gint hf_ipmi_chs_01_misc_drive = -1;
-static gint hf_ipmi_chs_01_misc_fpl_active = -1;
-static gint hf_ipmi_chs_01_misc_intrusion = -1;
-static gint hf_ipmi_chs_01_fpb_standby_allowed = -1;
-static gint hf_ipmi_chs_01_fpb_diagintr_allowed = -1;
-static gint hf_ipmi_chs_01_fpb_reset_allowed = -1;
-static gint hf_ipmi_chs_01_fpb_poweroff_allowed = -1;
-static gint hf_ipmi_chs_01_fpb_standby_disabled = -1;
-static gint hf_ipmi_chs_01_fpb_diagintr_disabled = -1;
-static gint hf_ipmi_chs_01_fpb_reset_disabled = -1;
-static gint hf_ipmi_chs_01_fpb_poweroff_disabled = -1;
-
-static gint hf_ipmi_chs_02_cctrl = -1;
-
-static gint hf_ipmi_chs_04_ival = -1;
-static gint hf_ipmi_chs_04_perm_on = -1;
-
-static gint hf_ipmi_chs_05_flags_fpl = -1;
-static gint hf_ipmi_chs_05_flags_intrusion = -1;
-static gint hf_ipmi_chs_05_fru_dev_addr = -1;
-static gint hf_ipmi_chs_05_sdr_dev_addr = -1;
-static gint hf_ipmi_chs_05_sel_dev_addr = -1;
-static gint hf_ipmi_chs_05_sm_dev_addr = -1;
-static gint hf_ipmi_chs_05_bridge_dev_addr = -1;
-
-static gint hf_ipmi_chs_06_rq_policy = -1;
-static gint hf_ipmi_chs_06_rs_policy_support_powerup = -1;
-static gint hf_ipmi_chs_06_rs_policy_support_restore = -1;
-static gint hf_ipmi_chs_06_rs_policy_support_poweroff = -1;
-
-static gint hf_ipmi_chs_07_cause = -1;
-static gint hf_ipmi_chs_07_chan = -1;
-
-static gint hf_ipmi_chs_08_valid = -1;
-static gint hf_ipmi_chs_08_selector = -1;
-static gint hf_ipmi_chs_08_data = -1;
-
-static gint hf_ipmi_chs_09_rq_param_select = -1;
-static gint hf_ipmi_chs_09_rq_set_select = -1;
-static gint hf_ipmi_chs_09_rq_block_select = -1;
-static gint hf_ipmi_chs_09_rs_param_version = -1;
-static gint hf_ipmi_chs_09_rs_valid = -1;
-static gint hf_ipmi_chs_09_rs_param_select = -1;
-static gint hf_ipmi_chs_09_rs_param_data = -1;
-
-static gint hf_ipmi_chs_0f_minpercnt = -1;
-static gint hf_ipmi_chs_0f_counter = -1;
+static gint ett_ipmi_chs_bo00_byte1;
+static gint ett_ipmi_chs_bo02_byte1;
+static gint ett_ipmi_chs_bo03_byte1;
+static gint ett_ipmi_chs_bo04_byte2;
+static gint ett_ipmi_chs_bo05_byte1;
+static gint ett_ipmi_chs_bo05_byte2;
+static gint ett_ipmi_chs_bo05_byte3;
+static gint ett_ipmi_chs_bo05_byte4;
+static gint ett_ipmi_chs_bo06_byte1;
+
+static gint ett_ipmi_chs_00_capflags;
+static gint ett_ipmi_chs_01_pwr_state;
+static gint ett_ipmi_chs_01_last_event;
+static gint ett_ipmi_chs_01_misc;
+static gint ett_ipmi_chs_01_fpb;
+static gint ett_ipmi_chs_02_byte1;
+static gint ett_ipmi_chs_04_byte2;
+static gint ett_ipmi_chs_05_flags;
+static gint ett_ipmi_chs_06_byte1;
+static gint ett_ipmi_chs_06_policy_support;
+static gint ett_ipmi_chs_07_byte1;
+static gint ett_ipmi_chs_08_byte1;
+static gint ett_ipmi_chs_09_rq_byte1;
+static gint ett_ipmi_chs_09_rs_byte1;
+static gint ett_ipmi_chs_09_rs_byte2;
+
+static gint hf_ipmi_chs_bo00_sip;
+static gint hf_ipmi_chs_bo01_spsel;
+static gint hf_ipmi_chs_bo02_request;
+static gint hf_ipmi_chs_bo02_discovered;
+static gint hf_ipmi_chs_bo03_pef;
+static gint hf_ipmi_chs_bo03_cctrl_timeout;
+static gint hf_ipmi_chs_bo03_wd_timeout;
+static gint hf_ipmi_chs_bo03_softreset;
+static gint hf_ipmi_chs_bo03_powerup;
+static gint hf_ipmi_chs_bo04_write_mask;
+static gint hf_ipmi_chs_bo04_bootinit_ack_oem;
+static gint hf_ipmi_chs_bo04_bootinit_ack_sms;
+static gint hf_ipmi_chs_bo04_bootinit_ack_os;
+static gint hf_ipmi_chs_bo04_bootinit_ack_osloader;
+static gint hf_ipmi_chs_bo04_bootinit_ack_bios;
+static gint hf_ipmi_chs_bo05_bootflags_valid;
+static gint hf_ipmi_chs_bo05_permanent;
+static gint hf_ipmi_chs_bo05_boottype;
+static gint hf_ipmi_chs_bo05_cmos_clear;
+static gint hf_ipmi_chs_bo05_lock_kbd;
+static gint hf_ipmi_chs_bo05_bootdev;
+static gint hf_ipmi_chs_bo05_screen_blank;
+static gint hf_ipmi_chs_bo05_lockout_reset;
+static gint hf_ipmi_chs_bo05_lockout_poweroff;
+static gint hf_ipmi_chs_bo05_bios_verbosity;
+static gint hf_ipmi_chs_bo05_progress_traps;
+static gint hf_ipmi_chs_bo05_pwd_bypass;
+static gint hf_ipmi_chs_bo05_lock_sleep;
+static gint hf_ipmi_chs_bo05_console_redirection;
+static gint hf_ipmi_chs_bo05_bios_shared_override;
+static gint hf_ipmi_chs_bo05_bios_muxctl_override;
+static gint hf_ipmi_chs_bo05_byte5;
+static gint hf_ipmi_chs_bo06_chan_num;
+static gint hf_ipmi_chs_bo06_session_id;
+static gint hf_ipmi_chs_bo06_bootinfo_timestamp;
+static gint hf_ipmi_chs_bo07_block_selector;
+static gint hf_ipmi_chs_bo07_block_data;
+
+static gint hf_ipmi_chs_00_capflags_ppi;
+static gint hf_ipmi_chs_00_capflags_di;
+static gint hf_ipmi_chs_00_capflags_fpl;
+static gint hf_ipmi_chs_00_capflags_is;
+static gint hf_ipmi_chs_00_fru_dev_addr;
+static gint hf_ipmi_chs_00_sdr_dev_addr;
+static gint hf_ipmi_chs_00_sel_dev_addr;
+static gint hf_ipmi_chs_00_sm_dev_addr;
+static gint hf_ipmi_chs_00_bridge_dev_addr;
+
+static gint hf_ipmi_chs_01_pwr_state_policy;
+static gint hf_ipmi_chs_01_pwr_state_ctl_fault;
+static gint hf_ipmi_chs_01_pwr_state_fault;
+static gint hf_ipmi_chs_01_pwr_state_ilock;
+static gint hf_ipmi_chs_01_pwr_state_overload;
+static gint hf_ipmi_chs_01_pwr_state_powered;
+static gint hf_ipmi_chs_01_last_event_via_ipmi;
+static gint hf_ipmi_chs_01_last_event_down_by_fault;
+static gint hf_ipmi_chs_01_last_event_interlock;
+static gint hf_ipmi_chs_01_last_event_overload;
+static gint hf_ipmi_chs_01_last_event_ac_failed;
+static gint hf_ipmi_chs_01_misc_identsupp;
+static gint hf_ipmi_chs_01_misc_identstate;
+static gint hf_ipmi_chs_01_misc_fan;
+static gint hf_ipmi_chs_01_misc_drive;
+static gint hf_ipmi_chs_01_misc_fpl_active;
+static gint hf_ipmi_chs_01_misc_intrusion;
+static gint hf_ipmi_chs_01_fpb_standby_allowed;
+static gint hf_ipmi_chs_01_fpb_diagintr_allowed;
+static gint hf_ipmi_chs_01_fpb_reset_allowed;
+static gint hf_ipmi_chs_01_fpb_poweroff_allowed;
+static gint hf_ipmi_chs_01_fpb_standby_disabled;
+static gint hf_ipmi_chs_01_fpb_diagintr_disabled;
+static gint hf_ipmi_chs_01_fpb_reset_disabled;
+static gint hf_ipmi_chs_01_fpb_poweroff_disabled;
+
+static gint hf_ipmi_chs_02_cctrl;
+
+static gint hf_ipmi_chs_04_ival;
+static gint hf_ipmi_chs_04_perm_on;
+
+static gint hf_ipmi_chs_05_flags_fpl;
+static gint hf_ipmi_chs_05_flags_intrusion;
+static gint hf_ipmi_chs_05_fru_dev_addr;
+static gint hf_ipmi_chs_05_sdr_dev_addr;
+static gint hf_ipmi_chs_05_sel_dev_addr;
+static gint hf_ipmi_chs_05_sm_dev_addr;
+static gint hf_ipmi_chs_05_bridge_dev_addr;
+
+static gint hf_ipmi_chs_06_rq_policy;
+static gint hf_ipmi_chs_06_rs_policy_support_powerup;
+static gint hf_ipmi_chs_06_rs_policy_support_restore;
+static gint hf_ipmi_chs_06_rs_policy_support_poweroff;
+
+static gint hf_ipmi_chs_07_cause;
+static gint hf_ipmi_chs_07_chan;
+
+static gint hf_ipmi_chs_08_valid;
+static gint hf_ipmi_chs_08_selector;
+static gint hf_ipmi_chs_08_data;
+
+static gint hf_ipmi_chs_09_rq_param_select;
+static gint hf_ipmi_chs_09_rq_set_select;
+static gint hf_ipmi_chs_09_rq_block_select;
+static gint hf_ipmi_chs_09_rs_param_version;
+static gint hf_ipmi_chs_09_rs_valid;
+static gint hf_ipmi_chs_09_rs_param_select;
+static gint hf_ipmi_chs_09_rs_param_data;
+
+static gint hf_ipmi_chs_0f_minpercnt;
+static gint hf_ipmi_chs_0f_counter;
 
 static const struct true_false_string tfs_00_provided = { "Provided", "Not Provided" };
 
diff --git a/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c
index f305db36c8..6ab8fb8088 100644
--- a/epan/dissectors/packet-ipmi-picmg.c
+++ b/epan/dissectors/packet-ipmi-picmg.c
@@ -17,429 +17,429 @@
 
 void proto_register_ipmi_picmg(void);
 
-static gint ett_ipmi_picmg_led_color = -1;
-static gint ett_ipmi_picmg_05_byte1 = -1;
-static gint ett_ipmi_picmg_06_byte1 = -1;
-static gint ett_ipmi_picmg_06_byte2 = -1;
-static gint ett_ipmi_picmg_06_byte3 = -1;
-static gint ett_ipmi_picmg_link_info = -1;
-static gint ett_ipmi_picmg_08_byte1 = -1;
-static gint ett_ipmi_picmg_09_ipmba = -1;
-static gint ett_ipmi_picmg_09_ipmbb = -1;
-static gint ett_ipmi_picmg_0a_byte2 = -1;
-static gint ett_ipmi_picmg_0a_byte3 = -1;
-static gint ett_ipmi_picmg_0b_byte1 = -1;
-static gint ett_ipmi_picmg_0f_chan = -1;
-static gint ett_ipmi_picmg_12_byte1 = -1;
-static gint ett_ipmi_picmg_14_prop = -1;
-static gint ett_ipmi_picmg_1e_byte1 = -1;
-static gint ett_ipmi_picmg_21_byte9 = -1;
-static gint ett_ipmi_picmg_XX_compbits = -1;
-static gint ett_ipmi_picmg_2e_byte2 = -1;
-static gint ett_ipmi_picmg_prop00_byte1 = -1;
-static gint ett_ipmi_picmg_prop01_byte1 = -1;
-static gint ett_ipmi_picmg_34_byte3 = -1;
-static gint ett_ipmi_picmg_36_byte2 = -1;
-static gint ett_ipmi_picmg_37_byte2 = -1;
-static gint ett_ipmi_picmg_link_state = -1;
-static gint ett_ipmi_picmg_link_dev = -1;
-
-static gint ett_ipmi_picmg_clock_setting = -1;
-static gint ett_ipmi_picmg_clock_res = -1;
-
-static gint ett_ipmi_picmg_hpm_caps = -1;
-
-static gint ett_ipmi_picmg_47_byte1 = -1;
-
-static gint ett_ipmi_picmg_23_rq_byte2 = -1;
-static gint ett_ipmi_picmg_23_rs_byte5 = -1;
-static gint ett_ipmi_picmg_25_rs_byte4 = -1;
-static gint ett_ipmi_picmg_25_rs_byte5 = -1;
-static gint ett_ipmi_picmg_27_rs_byte3 = -1;
-static gint ett_ipmi_picmg_28_rq_byte3 = -1;
-static gint ett_ipmi_picmg_29_rs_byte3 = -1;
-
-static gint hf_ipmi_picmg_led_function = -1;
-static gint hf_ipmi_picmg_led_on_duration = -1;
-static gint hf_ipmi_picmg_led_color = -1;
-
-static gint hf_ipmi_picmg_linkinfo_grpid = -1;
-static gint hf_ipmi_picmg_linkinfo_type_ext = -1;
-static gint hf_ipmi_picmg_linkinfo_type = -1;
-static gint hf_ipmi_picmg_linkinfo_ports = -1;
-static gint hf_ipmi_picmg_linkinfo_iface = -1;
-static gint hf_ipmi_picmg_linkinfo_chan = -1;
-static gint hf_ipmi_picmg_linkinfo_state = -1;
-static gint hf_ipmi_picmg_linkinfo = -1;
-static gint hf_ipmi_picmg_linkinfo_amc_chan = -1;
-static gint hf_ipmi_picmg_linkinfo_amc_ports = -1;
-static gint hf_ipmi_picmg_linkinfo_amc_type = -1;
-static gint hf_ipmi_picmg_linkinfo_amc_type_ext = -1;
-static gint hf_ipmi_picmg_linkinfo_amc_grpid = -1;
-static gint hf_ipmi_picmg_linkinfo_state_0 = -1;
-static gint hf_ipmi_picmg_linkinfo_state_1 = -1;
-static gint hf_ipmi_picmg_linkinfo_dev = -1;
-static gint hf_ipmi_picmg_linkinfo_dev_type = -1;
-static gint hf_ipmi_picmg_linkinfo_dev_id = -1;
-
-static gint hf_ipmi_picmg_clock_id = -1;
-static gint hf_ipmi_picmg_clock_cfg = -1;
-static gint hf_ipmi_picmg_clock_setting = -1;
-static gint hf_ipmi_picmg_clock_state = -1;
-static gint hf_ipmi_picmg_clock_dir = -1;
-static gint hf_ipmi_picmg_clock_pll = -1;
-static gint hf_ipmi_picmg_clock_family = -1;
-static gint hf_ipmi_picmg_clock_accuracy = -1;
-static gint hf_ipmi_picmg_clock_frequency = -1;
-static gint hf_ipmi_picmg_clock_resource = -1;
-static gint hf_ipmi_picmg_clock_resource_type = -1;
-static gint hf_ipmi_picmg_clock_resource_dev = -1;
-
-static gint hf_ipmi_picmg_00_version = -1;
-static gint hf_ipmi_picmg_00_max_fruid = -1;
-static gint hf_ipmi_picmg_00_ipmc_fruid = -1;
-
-static gint hf_ipmi_picmg_01_rq_fruid = -1;
-static gint hf_ipmi_picmg_01_rq_addr_key_type = -1;
-static gint hf_ipmi_picmg_01_rq_addr_key = -1;
-static gint hf_ipmi_picmg_01_rq_site_type = -1;
-static gint hf_ipmi_picmg_01_rs_hwaddr = -1;
-static gint hf_ipmi_picmg_01_rs_ipmbaddr = -1;
-static gint hf_ipmi_picmg_01_rs_rsrv = -1;
-static gint hf_ipmi_picmg_01_rs_fruid = -1;
-static gint hf_ipmi_picmg_01_rs_site_num = -1;
-static gint hf_ipmi_picmg_01_rs_site_type = -1;
-
-static gint hf_ipmi_picmg_02_shelf_address = -1;
-static gint hf_ipmi_picmg_02_shelf_type = -1;
-static gint hf_ipmi_picmg_02_shelf_length = -1;
-
-static gint hf_ipmi_picmg_03_shelf_address = -1;
-static gint hf_ipmi_picmg_03_shelf_type = -1;
-static gint hf_ipmi_picmg_03_shelf_length = -1;
-
-static gint hf_ipmi_picmg_04_fruid = -1;
-static gint hf_ipmi_picmg_04_cmd = -1;
-
-static gint hf_ipmi_picmg_05_fruid = -1;
-static gint hf_ipmi_picmg_05_led3 = -1;
-static gint hf_ipmi_picmg_05_led2 = -1;
-static gint hf_ipmi_picmg_05_led1 = -1;
-static gint hf_ipmi_picmg_05_blue_led = -1;
-static gint hf_ipmi_picmg_05_app_leds = -1;
-
-static gint hf_ipmi_picmg_06_fruid = -1;
-static gint hf_ipmi_picmg_06_ledid = -1;
-static gint hf_ipmi_picmg_06_cap_white = -1;
-static gint hf_ipmi_picmg_06_cap_orange = -1;
-static gint hf_ipmi_picmg_06_cap_amber = -1;
-static gint hf_ipmi_picmg_06_cap_green = -1;
-static gint hf_ipmi_picmg_06_cap_red = -1;
-static gint hf_ipmi_picmg_06_cap_blue = -1;
-static gint hf_ipmi_picmg_06_default_local_color = -1;
-static gint hf_ipmi_picmg_06_default_override_color = -1;
-
-static gint hf_ipmi_picmg_07_fruid = -1;
-static gint hf_ipmi_picmg_07_ledid = -1;
-
-static gint hf_ipmi_picmg_08_fruid = -1;
-static gint hf_ipmi_picmg_08_ledid = -1;
-static gint hf_ipmi_picmg_08_state_lamptest = -1;
-static gint hf_ipmi_picmg_08_state_override = -1;
-static gint hf_ipmi_picmg_08_state_local = -1;
-static gint hf_ipmi_picmg_08_lamptest_duration = -1;
-
-static gint hf_ipmi_picmg_09_ipmba = -1;
-static gint hf_ipmi_picmg_09_ipmba_link = -1;
-static gint hf_ipmi_picmg_09_ipmba_state = -1;
-static gint hf_ipmi_picmg_09_ipmbb = -1;
-static gint hf_ipmi_picmg_09_ipmbb_link = -1;
-static gint hf_ipmi_picmg_09_ipmbb_state = -1;
-
-static gint hf_ipmi_picmg_0a_fruid = -1;
-static gint hf_ipmi_picmg_0a_msk_d_locked = -1;
-static gint hf_ipmi_picmg_0a_msk_locked = -1;
-static gint hf_ipmi_picmg_0a_d_locked = -1;
-static gint hf_ipmi_picmg_0a_locked = -1;
-
-static gint hf_ipmi_picmg_0b_fruid = -1;
-static gint hf_ipmi_picmg_0b_d_locked = -1;
-static gint hf_ipmi_picmg_0b_locked = -1;
-
-static gint hf_ipmi_picmg_0c_fruid = -1;
-static gint hf_ipmi_picmg_0c_cmd = -1;
-
-static gint hf_ipmi_picmg_0d_fruid = -1;
-static gint hf_ipmi_picmg_0d_start = -1;
-static gint hf_ipmi_picmg_0d_recordid = -1;
-
-static gint hf_ipmi_picmg_0f_iface = -1;
-static gint hf_ipmi_picmg_0f_chan = -1;
-
-static gint hf_ipmi_picmg_10_fruid = -1;
-static gint hf_ipmi_picmg_10_nslots = -1;
-static gint hf_ipmi_picmg_10_ipmc_loc = -1;
-
-static gint hf_ipmi_picmg_11_fruid = -1;
-static gint hf_ipmi_picmg_11_power_level = -1;
-static gint hf_ipmi_picmg_11_set_to_desired = -1;
-
-static gint hf_ipmi_picmg_12_fruid = -1;
-static gint hf_ipmi_picmg_12_pwr_type = -1;
-static gint hf_ipmi_picmg_12_dynamic = -1;
-static gint hf_ipmi_picmg_12_pwr_lvl = -1;
-static gint hf_ipmi_picmg_12_delay = -1;
-static gint hf_ipmi_picmg_12_pwr_mult = -1;
-static gint hf_ipmi_picmg_12_pwr_draw = -1;
-
-static gint hf_ipmi_picmg_13_fruid = -1;
-
-static gint hf_ipmi_picmg_14_fruid = -1;
-static gint hf_ipmi_picmg_14_speed_min = -1;
-static gint hf_ipmi_picmg_14_speed_max = -1;
-static gint hf_ipmi_picmg_14_speed_norm = -1;
-static gint hf_ipmi_picmg_14_local_control = -1;
-
-static gint hf_ipmi_picmg_15_fruid = -1;
-static gint hf_ipmi_picmg_15_fan_level = -1;
-static gint hf_ipmi_picmg_15_local_enable = -1;
-
-static gint hf_ipmi_picmg_16_fruid = -1;
-static gint hf_ipmi_picmg_16_override_level = -1;
-static gint hf_ipmi_picmg_16_local_level = -1;
-static gint hf_ipmi_picmg_16_local_enable = -1;
-
-static gint hf_ipmi_picmg_17_cmd = -1;
-static gint hf_ipmi_picmg_17_resid = -1;
-static gint hf_ipmi_picmg_17_status = -1;
-
-static gint hf_ipmi_picmg_18_li_key_type = -1;
-static gint hf_ipmi_picmg_18_li_key = -1;
-static gint hf_ipmi_picmg_18_link_num = -1;
-static gint hf_ipmi_picmg_18_sensor_num = -1;
-
-static gint hf_ipmi_picmg_1a_flags = -1;
-
-static gint hf_ipmi_picmg_1b_addr_active = -1;
-static gint hf_ipmi_picmg_1b_addr_backup = -1;
-
-static gint hf_ipmi_picmg_1c_fan_site_number = -1;
-static gint hf_ipmi_picmg_1c_fan_enable_state = -1;
-static gint hf_ipmi_picmg_1c_fan_policy_timeout = -1;
-static gint hf_ipmi_picmg_1c_site_number = -1;
-static gint hf_ipmi_picmg_1c_site_type = -1;
-
-static gint hf_ipmi_picmg_1d_fan_site_number = -1;
-static gint hf_ipmi_picmg_1d_site_number = -1;
-static gint hf_ipmi_picmg_1d_site_type = -1;
-static gint hf_ipmi_picmg_1d_policy = -1;
-static gint hf_ipmi_picmg_1d_coverage = -1;
-
-static gint hf_ipmi_picmg_1e_fruid = -1;
-static gint hf_ipmi_picmg_1e_cap_diagintr = -1;
-static gint hf_ipmi_picmg_1e_cap_graceful_reboot = -1;
-static gint hf_ipmi_picmg_1e_cap_warm_reset = -1;
-
-static gint hf_ipmi_picmg_1f_rq_fruid = -1;
-static gint hf_ipmi_picmg_1f_rq_op = -1;
-static gint hf_ipmi_picmg_1f_rq_lockid = -1;
-static gint hf_ipmi_picmg_1f_rs_lockid = -1;
-static gint hf_ipmi_picmg_1f_rs_tstamp = -1;
-
-static gint hf_ipmi_picmg_20_fruid = -1;
-static gint hf_ipmi_picmg_20_lockid = -1;
-static gint hf_ipmi_picmg_20_offset = -1;
-static gint hf_ipmi_picmg_20_data = -1;
-static gint hf_ipmi_picmg_20_count = -1;
-
-static gint hf_ipmi_picmg_21_addr_num = -1;
-static gint hf_ipmi_picmg_21_tstamp = -1;
-static gint hf_ipmi_picmg_21_addr_count = -1;
-static gint hf_ipmi_picmg_21_site_type = -1;
-static gint hf_ipmi_picmg_21_site_num = -1;
-static gint hf_ipmi_picmg_21_max_unavail = -1;
-static gint hf_ipmi_picmg_21_is_shm = -1;
-static gint hf_ipmi_picmg_21_addr_type = -1;
-static gint hf_ipmi_picmg_21_ipaddr = -1;
-static gint hf_ipmi_picmg_21_rmcpport = -1;
-
-static gint hf_ipmi_picmg_22_feed_idx = -1;
-static gint hf_ipmi_picmg_22_update_cnt = -1;
-static gint hf_ipmi_picmg_22_pwr_alloc = -1;
-
-static gint hf_ipmi_picmg_XX_comp7 = -1;
-static gint hf_ipmi_picmg_XX_comp6 = -1;
-static gint hf_ipmi_picmg_XX_comp5 = -1;
-static gint hf_ipmi_picmg_XX_comp4 = -1;
-static gint hf_ipmi_picmg_XX_comp3 = -1;
-static gint hf_ipmi_picmg_XX_comp2 = -1;
-static gint hf_ipmi_picmg_XX_comp1 = -1;
-static gint hf_ipmi_picmg_XX_comp0 = -1;
-
-static gint hf_ipmi_picmg_2e_version = -1;
-static gint hf_ipmi_picmg_2e_upgrade_undesirable = -1;
-static gint hf_ipmi_picmg_2e_auto_rollback_override = -1;
-static gint hf_ipmi_picmg_2e_ipmc_degraded = -1;
-static gint hf_ipmi_picmg_2e_deferred_activate = -1;
-static gint hf_ipmi_picmg_2e_services_affected = -1;
-static gint hf_ipmi_picmg_2e_manual_rollback = -1;
-static gint hf_ipmi_picmg_2e_auto_rollback = -1;
-static gint hf_ipmi_picmg_2e_self_test = -1;
-static gint hf_ipmi_picmg_2e_upgrade_tout = -1;
-static gint hf_ipmi_picmg_2e_selftest_tout = -1;
-static gint hf_ipmi_picmg_2e_rollback_tout = -1;
-static gint hf_ipmi_picmg_2e_inaccessibility_tout = -1;
-
-static gint hf_ipmi_picmg_prop00_cold_reset = -1;
-static gint hf_ipmi_picmg_prop00_deferred_activation = -1;
-static gint hf_ipmi_picmg_prop00_comparison = -1;
-static gint hf_ipmi_picmg_prop00_preparation = -1;
-static gint hf_ipmi_picmg_prop00_rollback = -1;
-static gint hf_ipmi_picmg_prop01_fw_major = -1;
-static gint hf_ipmi_picmg_prop01_fw_minor = -1;
-static gint hf_ipmi_picmg_prop01_fw_aux = -1;
-static gint hf_ipmi_picmg_prop02_desc = -1;
-
-static gint hf_ipmi_picmg_2f_comp_id = -1;
-static gint hf_ipmi_picmg_2f_comp_prop = -1;
-static gint hf_ipmi_picmg_2f_prop_data = -1;
-
-static gint hf_ipmi_picmg_31_action = -1;
-
-static gint hf_ipmi_picmg_32_block = -1;
-static gint hf_ipmi_picmg_32_data = -1;
-static gint hf_ipmi_picmg_32_sec_offs = -1;
-static gint hf_ipmi_picmg_32_sec_len = -1;
-
-static gint hf_ipmi_picmg_33_comp_id = -1;
-static gint hf_ipmi_picmg_33_img_len = -1;
-
-static gint hf_ipmi_picmg_34_cmd = -1;
-static gint hf_ipmi_picmg_34_ccode = -1;
-static gint hf_ipmi_picmg_34_percentage = -1;
-
-static gint hf_ipmi_picmg_35_rollback_override = -1;
-
-static gint hf_ipmi_picmg_36_result = -1;
-static gint hf_ipmi_picmg_36_fail = -1;
-static gint hf_ipmi_picmg_36_fail_sel = -1;
-static gint hf_ipmi_picmg_36_fail_sdr = -1;
-static gint hf_ipmi_picmg_36_fail_bmc_fru = -1;
-static gint hf_ipmi_picmg_36_fail_ipmb_sig = -1;
-static gint hf_ipmi_picmg_36_fail_sdr_empty = -1;
-static gint hf_ipmi_picmg_36_fail_iua = -1;
-static gint hf_ipmi_picmg_36_fail_bb_fw = -1;
-static gint hf_ipmi_picmg_36_fail_oper_fw = -1;
-
-static gint hf_ipmi_picmg_37_percent = -1;
-
-static gint hf_ipmi_picmg_hpm_id = -1;
-static gint hf_ipmi_picmg_hpm_rev = -1;
-static gint hf_ipmi_picmg_hpm2_mask = -1;
-static gint hf_ipmi_picmg_hpm2_caps = -1;
-static gint hf_ipmi_picmg_hpm2_dyn_ssn = -1;
-static gint hf_ipmi_picmg_hpm2_ver_chg = -1;
-static gint hf_ipmi_picmg_hpm2_ext_mgt = -1;
-static gint hf_ipmi_picmg_hpm2_pkt_trc = -1;
-static gint hf_ipmi_picmg_hpm2_sol_ext = -1;
-static gint hf_ipmi_picmg_hpm_oem_start = -1;
-static gint hf_ipmi_picmg_hpm_oem_rev = -1;
-static gint hf_ipmi_picmg_hpm2_sol_oem_start = -1;
-static gint hf_ipmi_picmg_hpm2_sol_oem_rev = -1;
-static gint hf_ipmi_picmg_hpm_cred_hnd = -1;
-static gint hf_ipmi_picmg_hpm_func_sel = -1;
-static gint hf_ipmi_picmg_hpm_ipmi_rev = -1;
-static gint hf_ipmi_picmg_hpm_cipher_id = -1;
-static gint hf_ipmi_picmg_hpm_auth_type = -1;
-static gint hf_ipmi_picmg_hpm_priv_level = -1;
-static gint hf_ipmi_picmg_hpm_chn_num = -1;
-static gint hf_ipmi_picmg_hpm_avail_time = -1;
-static gint hf_ipmi_picmg_hpm_user_name = -1;
-static gint hf_ipmi_picmg_hpm_user_pwd = -1;
-static gint hf_ipmi_picmg_hpm_bmc_key = -1;
-static gint hf_ipmi_picmg_hpm_operation = -1;
-static gint hf_ipmi_picmg_hpm_ssn_hnd = -1;
-
-static gint hf_ipmi_picmg_hpm_power_draw = -1;
-static gint hf_ipmi_picmg_hpm_base_channels = -1;
-static gint hf_ipmi_picmg_hpm_fabric_channels = -1;
-static gint hf_ipmi_picmg_hpm_update_channels = -1;
-static gint hf_ipmi_picmg_hpm_cross_channels = -1;
-static gint hf_ipmi_picmg_hpm_num_chn_desc = -1;
-static gint hf_ipmi_picmg_hpm_chn_mask = -1;
-
-static gint hf_ipmi_picmg_hpm_ext_mgmt_state = -1;
-static gint hf_ipmi_picmg_hpm_polling_period = -1;
-static gint hf_ipmi_picmg_hpm_auth_pwr_state = -1;
-static gint hf_ipmi_picmg_hpm_amc_pwr_state = -1;
-
-static gint hf_ipmi_picmg47_port = -1;
-static gint hf_ipmi_picmg47_flags = -1;
-static gint hf_ipmi_picmg47_assignment = -1;
-static gint hf_ipmi_picmg47_state = -1;
-static gint hf_ipmi_picmg47_instance = -1;
-
-static gint hf_ipmi_picmg48_sub_fru_type = -1;
-static gint hf_ipmi_picmg48_sub_fru_id = -1;
-static gint hf_ipmi_picmg48_ip_source = -1;
-
-static gint hf_ipmi_picmg_23_rq_byte2 = -1;
-static gint hf_ipmi_picmg_23_slot_sel = -1;
-static gint hf_ipmi_picmg_23_carrier_num = -1;
-static gint hf_ipmi_picmg_23_slot_num = -1;
-static gint hf_ipmi_picmg_23_tier_num = -1;
-static gint hf_ipmi_picmg_23_rs_byte5 = -1;
-static gint hf_ipmi_picmg_23_slot_base = -1;
-static gint hf_ipmi_picmg_23_tier_base = -1;
-static gint hf_ipmi_picmg_23_orientation = -1;
-static gint hf_ipmi_picmg_23_origin_x = -1;
-static gint hf_ipmi_picmg_23_origin_y = -1;
-
-static gint hf_ipmi_picmg_24_channel = -1;
-static gint hf_ipmi_picmg_24_control = -1;
-static gint hf_ipmi_picmg_24_current = -1;
-static gint hf_ipmi_picmg_24_primary_pm = -1;
-static gint hf_ipmi_picmg_24_backup_pm = -1;
-
-static gint hf_ipmi_picmg_25_start = -1;
-static gint hf_ipmi_picmg_25_count = -1;
-static gint hf_ipmi_picmg_25_max = -1;
-static gint hf_ipmi_picmg_25_gstatus = -1;
-static gint hf_ipmi_picmg_25_fault = -1;
-static gint hf_ipmi_picmg_25_pwr_good = -1;
-static gint hf_ipmi_picmg_25_mp_good = -1;
-static gint hf_ipmi_picmg_25_role = -1;
-static gint hf_ipmi_picmg_25_cstatus = -1;
-static gint hf_ipmi_picmg_25_pwr_on = -1;
-static gint hf_ipmi_picmg_25_pwr_ovr = -1;
-static gint hf_ipmi_picmg_25_pwr = -1;
-static gint hf_ipmi_picmg_25_enable = -1;
-static gint hf_ipmi_picmg_25_mp_ovr = -1;
-static gint hf_ipmi_picmg_25_mp = -1;
-static gint hf_ipmi_picmg_25_ps1 = -1;
-
-static gint hf_ipmi_picmg_26_pm_site = -1;
-static gint hf_ipmi_picmg_27_rs_byte3 = -1;
-static gint hf_ipmi_picmg_27_pm_healthy = -1;
-static gint hf_ipmi_picmg_28_timeout = -1;
-static gint hf_ipmi_picmg_28_rq_byte3 = -1;
-static gint hf_ipmi_picmg_28_mch2 = -1;
-static gint hf_ipmi_picmg_28_mch1 = -1;
-
-static gint hf_ipmi_picmg_29_rs_byte3 = -1;
-static gint hf_ipmi_picmg_29_maj_rst = -1;
-static gint hf_ipmi_picmg_29_min_rst = -1;
-static gint hf_ipmi_picmg_29_alarm_cut = -1;
-static gint hf_ipmi_picmg_29_test_mode = -1;
-static gint hf_ipmi_picmg_29_pwr_alarm = -1;
-static gint hf_ipmi_picmg_29_minor_alarm = -1;
-static gint hf_ipmi_picmg_29_major_alarm = -1;
-static gint hf_ipmi_picmg_29_crit_alarm = -1;
-
-static gint hf_ipmi_picmg_2a_alarm_id = -1;
-static gint hf_ipmi_picmg_2a_alarm_ctrl = -1;
-
-static gint hf_ipmi_picmg_2b_alarm_state = -1;
+static gint ett_ipmi_picmg_led_color;
+static gint ett_ipmi_picmg_05_byte1;
+static gint ett_ipmi_picmg_06_byte1;
+static gint ett_ipmi_picmg_06_byte2;
+static gint ett_ipmi_picmg_06_byte3;
+static gint ett_ipmi_picmg_link_info;
+static gint ett_ipmi_picmg_08_byte1;
+static gint ett_ipmi_picmg_09_ipmba;
+static gint ett_ipmi_picmg_09_ipmbb;
+static gint ett_ipmi_picmg_0a_byte2;
+static gint ett_ipmi_picmg_0a_byte3;
+static gint ett_ipmi_picmg_0b_byte1;
+static gint ett_ipmi_picmg_0f_chan;
+static gint ett_ipmi_picmg_12_byte1;
+static gint ett_ipmi_picmg_14_prop;
+static gint ett_ipmi_picmg_1e_byte1;
+static gint ett_ipmi_picmg_21_byte9;
+static gint ett_ipmi_picmg_XX_compbits;
+static gint ett_ipmi_picmg_2e_byte2;
+static gint ett_ipmi_picmg_prop00_byte1;
+static gint ett_ipmi_picmg_prop01_byte1;
+static gint ett_ipmi_picmg_34_byte3;
+static gint ett_ipmi_picmg_36_byte2;
+static gint ett_ipmi_picmg_37_byte2;
+static gint ett_ipmi_picmg_link_state;
+static gint ett_ipmi_picmg_link_dev;
+
+static gint ett_ipmi_picmg_clock_setting;
+static gint ett_ipmi_picmg_clock_res;
+
+static gint ett_ipmi_picmg_hpm_caps;
+
+static gint ett_ipmi_picmg_47_byte1;
+
+static gint ett_ipmi_picmg_23_rq_byte2;
+static gint ett_ipmi_picmg_23_rs_byte5;
+static gint ett_ipmi_picmg_25_rs_byte4;
+static gint ett_ipmi_picmg_25_rs_byte5;
+static gint ett_ipmi_picmg_27_rs_byte3;
+static gint ett_ipmi_picmg_28_rq_byte3;
+static gint ett_ipmi_picmg_29_rs_byte3;
+
+static gint hf_ipmi_picmg_led_function;
+static gint hf_ipmi_picmg_led_on_duration;
+static gint hf_ipmi_picmg_led_color;
+
+static gint hf_ipmi_picmg_linkinfo_grpid;
+static gint hf_ipmi_picmg_linkinfo_type_ext;
+static gint hf_ipmi_picmg_linkinfo_type;
+static gint hf_ipmi_picmg_linkinfo_ports;
+static gint hf_ipmi_picmg_linkinfo_iface;
+static gint hf_ipmi_picmg_linkinfo_chan;
+static gint hf_ipmi_picmg_linkinfo_state;
+static gint hf_ipmi_picmg_linkinfo;
+static gint hf_ipmi_picmg_linkinfo_amc_chan;
+static gint hf_ipmi_picmg_linkinfo_amc_ports;
+static gint hf_ipmi_picmg_linkinfo_amc_type;
+static gint hf_ipmi_picmg_linkinfo_amc_type_ext;
+static gint hf_ipmi_picmg_linkinfo_amc_grpid;
+static gint hf_ipmi_picmg_linkinfo_state_0;
+static gint hf_ipmi_picmg_linkinfo_state_1;
+static gint hf_ipmi_picmg_linkinfo_dev;
+static gint hf_ipmi_picmg_linkinfo_dev_type;
+static gint hf_ipmi_picmg_linkinfo_dev_id;
+
+static gint hf_ipmi_picmg_clock_id;
+static gint hf_ipmi_picmg_clock_cfg;
+static gint hf_ipmi_picmg_clock_setting;
+static gint hf_ipmi_picmg_clock_state;
+static gint hf_ipmi_picmg_clock_dir;
+static gint hf_ipmi_picmg_clock_pll;
+static gint hf_ipmi_picmg_clock_family;
+static gint hf_ipmi_picmg_clock_accuracy;
+static gint hf_ipmi_picmg_clock_frequency;
+static gint hf_ipmi_picmg_clock_resource;
+static gint hf_ipmi_picmg_clock_resource_type;
+static gint hf_ipmi_picmg_clock_resource_dev;
+
+static gint hf_ipmi_picmg_00_version;
+static gint hf_ipmi_picmg_00_max_fruid;
+static gint hf_ipmi_picmg_00_ipmc_fruid;
+
+static gint hf_ipmi_picmg_01_rq_fruid;
+static gint hf_ipmi_picmg_01_rq_addr_key_type;
+static gint hf_ipmi_picmg_01_rq_addr_key;
+static gint hf_ipmi_picmg_01_rq_site_type;
+static gint hf_ipmi_picmg_01_rs_hwaddr;
+static gint hf_ipmi_picmg_01_rs_ipmbaddr;
+static gint hf_ipmi_picmg_01_rs_rsrv;
+static gint hf_ipmi_picmg_01_rs_fruid;
+static gint hf_ipmi_picmg_01_rs_site_num;
+static gint hf_ipmi_picmg_01_rs_site_type;
+
+static gint hf_ipmi_picmg_02_shelf_address;
+static gint hf_ipmi_picmg_02_shelf_type;
+static gint hf_ipmi_picmg_02_shelf_length;
+
+static gint hf_ipmi_picmg_03_shelf_address;
+static gint hf_ipmi_picmg_03_shelf_type;
+static gint hf_ipmi_picmg_03_shelf_length;
+
+static gint hf_ipmi_picmg_04_fruid;
+static gint hf_ipmi_picmg_04_cmd;
+
+static gint hf_ipmi_picmg_05_fruid;
+static gint hf_ipmi_picmg_05_led3;
+static gint hf_ipmi_picmg_05_led2;
+static gint hf_ipmi_picmg_05_led1;
+static gint hf_ipmi_picmg_05_blue_led;
+static gint hf_ipmi_picmg_05_app_leds;
+
+static gint hf_ipmi_picmg_06_fruid;
+static gint hf_ipmi_picmg_06_ledid;
+static gint hf_ipmi_picmg_06_cap_white;
+static gint hf_ipmi_picmg_06_cap_orange;
+static gint hf_ipmi_picmg_06_cap_amber;
+static gint hf_ipmi_picmg_06_cap_green;
+static gint hf_ipmi_picmg_06_cap_red;
+static gint hf_ipmi_picmg_06_cap_blue;
+static gint hf_ipmi_picmg_06_default_local_color;
+static gint hf_ipmi_picmg_06_default_override_color;
+
+static gint hf_ipmi_picmg_07_fruid;
+static gint hf_ipmi_picmg_07_ledid;
+
+static gint hf_ipmi_picmg_08_fruid;
+static gint hf_ipmi_picmg_08_ledid;
+static gint hf_ipmi_picmg_08_state_lamptest;
+static gint hf_ipmi_picmg_08_state_override;
+static gint hf_ipmi_picmg_08_state_local;
+static gint hf_ipmi_picmg_08_lamptest_duration;
+
+static gint hf_ipmi_picmg_09_ipmba;
+static gint hf_ipmi_picmg_09_ipmba_link;
+static gint hf_ipmi_picmg_09_ipmba_state;
+static gint hf_ipmi_picmg_09_ipmbb;
+static gint hf_ipmi_picmg_09_ipmbb_link;
+static gint hf_ipmi_picmg_09_ipmbb_state;
+
+static gint hf_ipmi_picmg_0a_fruid;
+static gint hf_ipmi_picmg_0a_msk_d_locked;
+static gint hf_ipmi_picmg_0a_msk_locked;
+static gint hf_ipmi_picmg_0a_d_locked;
+static gint hf_ipmi_picmg_0a_locked;
+
+static gint hf_ipmi_picmg_0b_fruid;
+static gint hf_ipmi_picmg_0b_d_locked;
+static gint hf_ipmi_picmg_0b_locked;
+
+static gint hf_ipmi_picmg_0c_fruid;
+static gint hf_ipmi_picmg_0c_cmd;
+
+static gint hf_ipmi_picmg_0d_fruid;
+static gint hf_ipmi_picmg_0d_start;
+static gint hf_ipmi_picmg_0d_recordid;
+
+static gint hf_ipmi_picmg_0f_iface;
+static gint hf_ipmi_picmg_0f_chan;
+
+static gint hf_ipmi_picmg_10_fruid;
+static gint hf_ipmi_picmg_10_nslots;
+static gint hf_ipmi_picmg_10_ipmc_loc;
+
+static gint hf_ipmi_picmg_11_fruid;
+static gint hf_ipmi_picmg_11_power_level;
+static gint hf_ipmi_picmg_11_set_to_desired;
+
+static gint hf_ipmi_picmg_12_fruid;
+static gint hf_ipmi_picmg_12_pwr_type;
+static gint hf_ipmi_picmg_12_dynamic;
+static gint hf_ipmi_picmg_12_pwr_lvl;
+static gint hf_ipmi_picmg_12_delay;
+static gint hf_ipmi_picmg_12_pwr_mult;
+static gint hf_ipmi_picmg_12_pwr_draw;
+
+static gint hf_ipmi_picmg_13_fruid;
+
+static gint hf_ipmi_picmg_14_fruid;
+static gint hf_ipmi_picmg_14_speed_min;
+static gint hf_ipmi_picmg_14_speed_max;
+static gint hf_ipmi_picmg_14_speed_norm;
+static gint hf_ipmi_picmg_14_local_control;
+
+static gint hf_ipmi_picmg_15_fruid;
+static gint hf_ipmi_picmg_15_fan_level;
+static gint hf_ipmi_picmg_15_local_enable;
+
+static gint hf_ipmi_picmg_16_fruid;
+static gint hf_ipmi_picmg_16_override_level;
+static gint hf_ipmi_picmg_16_local_level;
+static gint hf_ipmi_picmg_16_local_enable;
+
+static gint hf_ipmi_picmg_17_cmd;
+static gint hf_ipmi_picmg_17_resid;
+static gint hf_ipmi_picmg_17_status;
+
+static gint hf_ipmi_picmg_18_li_key_type;
+static gint hf_ipmi_picmg_18_li_key;
+static gint hf_ipmi_picmg_18_link_num;
+static gint hf_ipmi_picmg_18_sensor_num;
+
+static gint hf_ipmi_picmg_1a_flags;
+
+static gint hf_ipmi_picmg_1b_addr_active;
+static gint hf_ipmi_picmg_1b_addr_backup;
+
+static gint hf_ipmi_picmg_1c_fan_site_number;
+static gint hf_ipmi_picmg_1c_fan_enable_state;
+static gint hf_ipmi_picmg_1c_fan_policy_timeout;
+static gint hf_ipmi_picmg_1c_site_number;
+static gint hf_ipmi_picmg_1c_site_type;
+
+static gint hf_ipmi_picmg_1d_fan_site_number;
+static gint hf_ipmi_picmg_1d_site_number;
+static gint hf_ipmi_picmg_1d_site_type;
+static gint hf_ipmi_picmg_1d_policy;
+static gint hf_ipmi_picmg_1d_coverage;
+
+static gint hf_ipmi_picmg_1e_fruid;
+static gint hf_ipmi_picmg_1e_cap_diagintr;
+static gint hf_ipmi_picmg_1e_cap_graceful_reboot;
+static gint hf_ipmi_picmg_1e_cap_warm_reset;
+
+static gint hf_ipmi_picmg_1f_rq_fruid;
+static gint hf_ipmi_picmg_1f_rq_op;
+static gint hf_ipmi_picmg_1f_rq_lockid;
+static gint hf_ipmi_picmg_1f_rs_lockid;
+static gint hf_ipmi_picmg_1f_rs_tstamp;
+
+static gint hf_ipmi_picmg_20_fruid;
+static gint hf_ipmi_picmg_20_lockid;
+static gint hf_ipmi_picmg_20_offset;
+static gint hf_ipmi_picmg_20_data;
+static gint hf_ipmi_picmg_20_count;
+
+static gint hf_ipmi_picmg_21_addr_num;
+static gint hf_ipmi_picmg_21_tstamp;
+static gint hf_ipmi_picmg_21_addr_count;
+static gint hf_ipmi_picmg_21_site_type;
+static gint hf_ipmi_picmg_21_site_num;
+static gint hf_ipmi_picmg_21_max_unavail;
+static gint hf_ipmi_picmg_21_is_shm;
+static gint hf_ipmi_picmg_21_addr_type;
+static gint hf_ipmi_picmg_21_ipaddr;
+static gint hf_ipmi_picmg_21_rmcpport;
+
+static gint hf_ipmi_picmg_22_feed_idx;
+static gint hf_ipmi_picmg_22_update_cnt;
+static gint hf_ipmi_picmg_22_pwr_alloc;
+
+static gint hf_ipmi_picmg_XX_comp7;
+static gint hf_ipmi_picmg_XX_comp6;
+static gint hf_ipmi_picmg_XX_comp5;
+static gint hf_ipmi_picmg_XX_comp4;
+static gint hf_ipmi_picmg_XX_comp3;
+static gint hf_ipmi_picmg_XX_comp2;
+static gint hf_ipmi_picmg_XX_comp1;
+static gint hf_ipmi_picmg_XX_comp0;
+
+static gint hf_ipmi_picmg_2e_version;
+static gint hf_ipmi_picmg_2e_upgrade_undesirable;
+static gint hf_ipmi_picmg_2e_auto_rollback_override;
+static gint hf_ipmi_picmg_2e_ipmc_degraded;
+static gint hf_ipmi_picmg_2e_deferred_activate;
+static gint hf_ipmi_picmg_2e_services_affected;
+static gint hf_ipmi_picmg_2e_manual_rollback;
+static gint hf_ipmi_picmg_2e_auto_rollback;
+static gint hf_ipmi_picmg_2e_self_test;
+static gint hf_ipmi_picmg_2e_upgrade_tout;
+static gint hf_ipmi_picmg_2e_selftest_tout;
+static gint hf_ipmi_picmg_2e_rollback_tout;
+static gint hf_ipmi_picmg_2e_inaccessibility_tout;
+
+static gint hf_ipmi_picmg_prop00_cold_reset;
+static gint hf_ipmi_picmg_prop00_deferred_activation;
+static gint hf_ipmi_picmg_prop00_comparison;
+static gint hf_ipmi_picmg_prop00_preparation;
+static gint hf_ipmi_picmg_prop00_rollback;
+static gint hf_ipmi_picmg_prop01_fw_major;
+static gint hf_ipmi_picmg_prop01_fw_minor;
+static gint hf_ipmi_picmg_prop01_fw_aux;
+static gint hf_ipmi_picmg_prop02_desc;
+
+static gint hf_ipmi_picmg_2f_comp_id;
+static gint hf_ipmi_picmg_2f_comp_prop;
+static gint hf_ipmi_picmg_2f_prop_data;
+
+static gint hf_ipmi_picmg_31_action;
+
+static gint hf_ipmi_picmg_32_block;
+static gint hf_ipmi_picmg_32_data;
+static gint hf_ipmi_picmg_32_sec_offs;
+static gint hf_ipmi_picmg_32_sec_len;
+
+static gint hf_ipmi_picmg_33_comp_id;
+static gint hf_ipmi_picmg_33_img_len;
+
+static gint hf_ipmi_picmg_34_cmd;
+static gint hf_ipmi_picmg_34_ccode;
+static gint hf_ipmi_picmg_34_percentage;
+
+static gint hf_ipmi_picmg_35_rollback_override;
+
+static gint hf_ipmi_picmg_36_result;
+static gint hf_ipmi_picmg_36_fail;
+static gint hf_ipmi_picmg_36_fail_sel;
+static gint hf_ipmi_picmg_36_fail_sdr;
+static gint hf_ipmi_picmg_36_fail_bmc_fru;
+static gint hf_ipmi_picmg_36_fail_ipmb_sig;
+static gint hf_ipmi_picmg_36_fail_sdr_empty;
+static gint hf_ipmi_picmg_36_fail_iua;
+static gint hf_ipmi_picmg_36_fail_bb_fw;
+static gint hf_ipmi_picmg_36_fail_oper_fw;
+
+static gint hf_ipmi_picmg_37_percent;
+
+static gint hf_ipmi_picmg_hpm_id;
+static gint hf_ipmi_picmg_hpm_rev;
+static gint hf_ipmi_picmg_hpm2_mask;
+static gint hf_ipmi_picmg_hpm2_caps;
+static gint hf_ipmi_picmg_hpm2_dyn_ssn;
+static gint hf_ipmi_picmg_hpm2_ver_chg;
+static gint hf_ipmi_picmg_hpm2_ext_mgt;
+static gint hf_ipmi_picmg_hpm2_pkt_trc;
+static gint hf_ipmi_picmg_hpm2_sol_ext;
+static gint hf_ipmi_picmg_hpm_oem_start;
+static gint hf_ipmi_picmg_hpm_oem_rev;
+static gint hf_ipmi_picmg_hpm2_sol_oem_start;
+static gint hf_ipmi_picmg_hpm2_sol_oem_rev;
+static gint hf_ipmi_picmg_hpm_cred_hnd;
+static gint hf_ipmi_picmg_hpm_func_sel;
+static gint hf_ipmi_picmg_hpm_ipmi_rev;
+static gint hf_ipmi_picmg_hpm_cipher_id;
+static gint hf_ipmi_picmg_hpm_auth_type;
+static gint hf_ipmi_picmg_hpm_priv_level;
+static gint hf_ipmi_picmg_hpm_chn_num;
+static gint hf_ipmi_picmg_hpm_avail_time;
+static gint hf_ipmi_picmg_hpm_user_name;
+static gint hf_ipmi_picmg_hpm_user_pwd;
+static gint hf_ipmi_picmg_hpm_bmc_key;
+static gint hf_ipmi_picmg_hpm_operation;
+static gint hf_ipmi_picmg_hpm_ssn_hnd;
+
+static gint hf_ipmi_picmg_hpm_power_draw;
+static gint hf_ipmi_picmg_hpm_base_channels;
+static gint hf_ipmi_picmg_hpm_fabric_channels;
+static gint hf_ipmi_picmg_hpm_update_channels;
+static gint hf_ipmi_picmg_hpm_cross_channels;
+static gint hf_ipmi_picmg_hpm_num_chn_desc;
+static gint hf_ipmi_picmg_hpm_chn_mask;
+
+static gint hf_ipmi_picmg_hpm_ext_mgmt_state;
+static gint hf_ipmi_picmg_hpm_polling_period;
+static gint hf_ipmi_picmg_hpm_auth_pwr_state;
+static gint hf_ipmi_picmg_hpm_amc_pwr_state;
+
+static gint hf_ipmi_picmg47_port;
+static gint hf_ipmi_picmg47_flags;
+static gint hf_ipmi_picmg47_assignment;
+static gint hf_ipmi_picmg47_state;
+static gint hf_ipmi_picmg47_instance;
+
+static gint hf_ipmi_picmg48_sub_fru_type;
+static gint hf_ipmi_picmg48_sub_fru_id;
+static gint hf_ipmi_picmg48_ip_source;
+
+static gint hf_ipmi_picmg_23_rq_byte2;
+static gint hf_ipmi_picmg_23_slot_sel;
+static gint hf_ipmi_picmg_23_carrier_num;
+static gint hf_ipmi_picmg_23_slot_num;
+static gint hf_ipmi_picmg_23_tier_num;
+static gint hf_ipmi_picmg_23_rs_byte5;
+static gint hf_ipmi_picmg_23_slot_base;
+static gint hf_ipmi_picmg_23_tier_base;
+static gint hf_ipmi_picmg_23_orientation;
+static gint hf_ipmi_picmg_23_origin_x;
+static gint hf_ipmi_picmg_23_origin_y;
+
+static gint hf_ipmi_picmg_24_channel;
+static gint hf_ipmi_picmg_24_control;
+static gint hf_ipmi_picmg_24_current;
+static gint hf_ipmi_picmg_24_primary_pm;
+static gint hf_ipmi_picmg_24_backup_pm;
+
+static gint hf_ipmi_picmg_25_start;
+static gint hf_ipmi_picmg_25_count;
+static gint hf_ipmi_picmg_25_max;
+static gint hf_ipmi_picmg_25_gstatus;
+static gint hf_ipmi_picmg_25_fault;
+static gint hf_ipmi_picmg_25_pwr_good;
+static gint hf_ipmi_picmg_25_mp_good;
+static gint hf_ipmi_picmg_25_role;
+static gint hf_ipmi_picmg_25_cstatus;
+static gint hf_ipmi_picmg_25_pwr_on;
+static gint hf_ipmi_picmg_25_pwr_ovr;
+static gint hf_ipmi_picmg_25_pwr;
+static gint hf_ipmi_picmg_25_enable;
+static gint hf_ipmi_picmg_25_mp_ovr;
+static gint hf_ipmi_picmg_25_mp;
+static gint hf_ipmi_picmg_25_ps1;
+
+static gint hf_ipmi_picmg_26_pm_site;
+static gint hf_ipmi_picmg_27_rs_byte3;
+static gint hf_ipmi_picmg_27_pm_healthy;
+static gint hf_ipmi_picmg_28_timeout;
+static gint hf_ipmi_picmg_28_rq_byte3;
+static gint hf_ipmi_picmg_28_mch2;
+static gint hf_ipmi_picmg_28_mch1;
+
+static gint hf_ipmi_picmg_29_rs_byte3;
+static gint hf_ipmi_picmg_29_maj_rst;
+static gint hf_ipmi_picmg_29_min_rst;
+static gint hf_ipmi_picmg_29_alarm_cut;
+static gint hf_ipmi_picmg_29_test_mode;
+static gint hf_ipmi_picmg_29_pwr_alarm;
+static gint hf_ipmi_picmg_29_minor_alarm;
+static gint hf_ipmi_picmg_29_major_alarm;
+static gint hf_ipmi_picmg_29_crit_alarm;
+
+static gint hf_ipmi_picmg_2a_alarm_id;
+static gint hf_ipmi_picmg_2a_alarm_ctrl;
+
+static gint hf_ipmi_picmg_2b_alarm_state;
 
 static const value_string site_type_vals[] = {
 	{ 0x00, "PICMG board" },
diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c
index 812a427971..1e449f5405 100644
--- a/epan/dissectors/packet-ipmi-se.c
+++ b/epan/dissectors/packet-ipmi-se.c
@@ -37,370 +37,370 @@ struct evtype_info {
 	intrp_t intrp3;
 };
 
-static gint ett_ipmi_se_evt_byte3 = -1;
-static gint ett_ipmi_se_evt_evd_byte1 = -1;
-static gint ett_ipmi_se_evt_evd_byte2 = -1;
-static gint ett_ipmi_se_evt_evd_byte3 = -1;
-
-static gint ett_ipmi_se_cp06_byte1 = -1;
-static gint ett_ipmi_se_cp07_byte1 = -1;
-static gint ett_ipmi_se_cp09_byte1 = -1;
-static gint ett_ipmi_se_cp10_byte1 = -1;
-static gint ett_ipmi_se_cp12_byte1 = -1;
-static gint ett_ipmi_se_cp12_byte2 = -1;
-static gint ett_ipmi_se_cp12_byte3 = -1;
-static gint ett_ipmi_se_cp13_byte1 = -1;
-static gint ett_ipmi_se_cp15_byte1 = -1;
-static gint ett_ipmi_se_cp15_byte2 = -1;
-static gint ett_ipmi_se_cp15_member = -1;
-static gint ett_ipmi_se_cp15_byte11 = -1;
-
-static gint ett_ipmi_se_00_byte2 = -1;
-static gint ett_ipmi_se_01_byte2 = -1;
-static gint ett_ipmi_se_10_action = -1;
-static gint ett_ipmi_se_12_byte1 = -1;
-static gint ett_ipmi_se_13_byte1 = -1;
-static gint ett_ipmi_se_13_rev = -1;
-static gint ett_ipmi_se_14_byte1 = -1;
-static gint ett_ipmi_se_16_byte1 = -1;
-static gint ett_ipmi_se_16_byte2 = -1;
-static gint ett_ipmi_se_16_byte3 = -1;
-static gint ett_ipmi_se_20_rq_byte1 = -1;
-static gint ett_ipmi_se_20_rs_byte2 = -1;
-static gint ett_ipmi_se_23_readingfactors = -1;
-static gint ett_ipmi_se_23_byte1 = -1;
-static gint ett_ipmi_se_23_byte2 = -1;
-static gint ett_ipmi_se_23_byte3 = -1;
-static gint ett_ipmi_se_23_byte4 = -1;
-static gint ett_ipmi_se_23_byte5 = -1;
-static gint ett_ipmi_se_23_byte6 = -1;
-static gint ett_ipmi_se_XX_mask = -1;
-static gint ett_ipmi_se_XX_b1 = -1;
-static gint ett_ipmi_se_XX_b2 = -1;
-static gint ett_ipmi_se_XX_b3 = -1;
-static gint ett_ipmi_se_XX_b4 = -1;
-static gint ett_ipmi_se_28_byte2 = -1;
-static gint ett_ipmi_se_29_byte1 = -1;
-static gint ett_ipmi_se_2a_byte2 = -1;
-static gint ett_ipmi_se_2b_byte1 = -1;
-static gint ett_ipmi_se_2d_byte2 = -1;
-static gint ett_ipmi_se_2d_b1 = -1;
-static gint ett_ipmi_se_2d_b2 = -1;
-
-static expert_field ei_ipmi_se_13_request_param_rev = EI_INIT;
-static expert_field ei_ipmi_se_13_request_param_data = EI_INIT;
-
-static gint hf_ipmi_se_evt_rev = -1;
-static gint hf_ipmi_se_evt_sensor_type = -1;
-static gint hf_ipmi_se_evt_sensor_num = -1;
-static gint hf_ipmi_se_evt_byte3 = -1;
-static gint hf_ipmi_se_evt_dir = -1;
-static gint hf_ipmi_se_evt_type = -1;
-static gint hf_ipmi_se_evt_data1 = -1;
-static gint hf_ipmi_se_evt_data1_b2 = -1;
-static gint hf_ipmi_se_evt_data1_b3 = -1;
-static gint hf_ipmi_se_evt_data1_offs = -1;
-static gint hf_ipmi_se_evt_data2 = -1;
-static gint hf_ipmi_se_evt_data3 = -1;
-
-static gint hf_ipmi_se_cp00_sip = -1;
-static gint hf_ipmi_se_cp01_alert_startup = -1;
-static gint hf_ipmi_se_cp01_startup = -1;
-static gint hf_ipmi_se_cp01_event_msg = -1;
-static gint hf_ipmi_se_cp01_pef = -1;
-static gint hf_ipmi_se_cp02_diag_intr = -1;
-static gint hf_ipmi_se_cp02_oem_action = -1;
-static gint hf_ipmi_se_cp02_pwr_cycle = -1;
-static gint hf_ipmi_se_cp02_reset = -1;
-static gint hf_ipmi_se_cp02_pwr_down = -1;
-static gint hf_ipmi_se_cp02_alert = -1;
-static gint hf_ipmi_se_cp03_startup = -1;
-static gint hf_ipmi_se_cp04_alert_startup = -1;
-static gint hf_ipmi_se_cp05_num_evfilters = -1;
-static gint hf_ipmi_se_cp06_filter = -1;
-static gint hf_ipmi_se_cp06_data = -1;
-static gint hf_ipmi_se_cp07_filter = -1;
-/* static gint hf_ipmi_se_cp07_data = -1; */
-static gint hf_ipmi_se_cp08_policies = -1;
-static gint hf_ipmi_se_cp09_entry = -1;
-static gint hf_ipmi_se_cp09_data = -1;
-static gint hf_ipmi_se_cp10_useval = -1;
-static gint hf_ipmi_se_cp10_guid = -1;
-static gint hf_ipmi_se_cp11_num_alertstr = -1;
-static gint hf_ipmi_se_cp12_byte1 = -1;
-static gint hf_ipmi_se_cp12_alert_stringsel = -1;
-static gint hf_ipmi_se_cp12_evfilter = -1;
-static gint hf_ipmi_se_cp12_alert_stringset = -1;
-static gint hf_ipmi_se_cp13_stringsel = -1;
-static gint hf_ipmi_se_cp13_blocksel = -1;
-static gint hf_ipmi_se_cp13_string = -1;
-static gint hf_ipmi_se_cp14_num_gct = -1;
-static gint hf_ipmi_se_cp15_gctsel = -1;
-static gint hf_ipmi_se_cp15_force = -1;
-static gint hf_ipmi_se_cp15_delayed = -1;
-static gint hf_ipmi_se_cp15_channel = -1;
-static gint hf_ipmi_se_cp15_group = -1;
-static gint hf_ipmi_se_cp15_member_check = -1;
-static gint hf_ipmi_se_cp15_member_id = -1;
-static gint hf_ipmi_se_cp15_retries = -1;
-static gint hf_ipmi_se_cp15_operation = -1;
-
-static gint hf_ipmi_se_00_addr = -1;
-static gint hf_ipmi_se_00_lun = -1;
-
-static gint hf_ipmi_se_01_addr = -1;
-static gint hf_ipmi_se_01_lun = -1;
-
-static gint hf_ipmi_se_10_pef_version = -1;
-static gint hf_ipmi_se_10_action_oem_filter = -1;
-static gint hf_ipmi_se_10_action_diag_intr = -1;
-static gint hf_ipmi_se_10_action_oem_action = -1;
-static gint hf_ipmi_se_10_action_pwr_cycle = -1;
-static gint hf_ipmi_se_10_action_reset = -1;
-static gint hf_ipmi_se_10_action_pwr_down = -1;
-static gint hf_ipmi_se_10_action_alert = -1;
-static gint hf_ipmi_se_10_entries = -1;
-static gint hf_ipmi_se_10_evtype = -1;
-
-static gint hf_ipmi_se_11_rq_timeout = -1;
-static gint hf_ipmi_se_11_rs_timeout = -1;
-
-static gint hf_ipmi_se_12_byte1 = -1;
-static gint hf_ipmi_se_12_param = -1;
-static gint hf_ipmi_se_12_data = -1;
-
-static gint hf_ipmi_se_13_byte1 = -1;
-static gint hf_ipmi_se_13_getrev = -1;
-static gint hf_ipmi_se_13_param = -1;
-static gint hf_ipmi_se_13_set = -1;
-static gint hf_ipmi_se_13_block = -1;
-static gint hf_ipmi_se_13_rev_present = -1;
-static gint hf_ipmi_se_13_rev_compat = -1;
-static gint hf_ipmi_se_13_data = -1;
-
-static gint hf_ipmi_se_14_processed_by = -1;
-static gint hf_ipmi_se_14_rid = -1;
-
-static gint hf_ipmi_se_15_tstamp = -1;
-static gint hf_ipmi_se_15_lastrec = -1;
-static gint hf_ipmi_se_15_proc_sw = -1;
-static gint hf_ipmi_se_15_proc_bmc = -1;
-
-static gint hf_ipmi_se_16_chan = -1;
-static gint hf_ipmi_se_16_op = -1;
-static gint hf_ipmi_se_16_dst = -1;
-static gint hf_ipmi_se_16_send_string = -1;
-static gint hf_ipmi_se_16_string_sel = -1;
-static gint hf_ipmi_se_16_gen = -1;
-static gint hf_ipmi_se_16_status = -1;
-
-static gint hf_ipmi_se_17_seq = -1;
-static gint hf_ipmi_se_17_tstamp = -1;
-static gint hf_ipmi_se_17_evsrc = -1;
-static gint hf_ipmi_se_17_sensor_dev = -1;
-static gint hf_ipmi_se_17_sensor_num = -1;
-static gint hf_ipmi_se_17_evdata1 = -1;
-static gint hf_ipmi_se_17_evdata2 = -1;
-static gint hf_ipmi_se_17_evdata3 = -1;
-
-static gint hf_ipmi_se_20_rq_op = -1;
-static gint hf_ipmi_se_20_rs_num = -1;
-static gint hf_ipmi_se_20_rs_sdr = -1;
-static gint hf_ipmi_se_20_rs_population = -1;
-static gint hf_ipmi_se_20_rs_lun3 = -1;
-static gint hf_ipmi_se_20_rs_lun2 = -1;
-static gint hf_ipmi_se_20_rs_lun1 = -1;
-static gint hf_ipmi_se_20_rs_lun0 = -1;
-static gint hf_ipmi_se_20_rs_change = -1;
-
-static gint hf_ipmi_se_21_rid = -1;
-static gint hf_ipmi_se_21_record = -1;
-static gint hf_ipmi_se_21_offset = -1;
-static gint hf_ipmi_se_21_len = -1;
-static gint hf_ipmi_se_21_next = -1;
-static gint hf_ipmi_se_21_recdata = -1;
-
-static gint hf_ipmi_se_22_resid = -1;
-
-static gint hf_ipmi_se_23_rq_sensor = -1;
-static gint hf_ipmi_se_23_rq_reading = -1;
-static gint hf_ipmi_se_23_rs_next_reading = -1;
-
-static gint hf_ipmi_se_24_sensor = -1;
-static gint hf_ipmi_se_24_mask = -1;
-static gint hf_ipmi_se_24_hyst_pos = -1;
-static gint hf_ipmi_se_24_hyst_neg = -1;
-
-static gint hf_ipmi_se_25_sensor = -1;
-static gint hf_ipmi_se_25_mask = -1;
-static gint hf_ipmi_se_25_hyst_pos = -1;
-static gint hf_ipmi_se_25_hyst_neg = -1;
-
-static gint hf_ipmi_se_26_sensor = -1;
-static gint hf_ipmi_se_XX_m_unr = -1;
-static gint hf_ipmi_se_XX_m_uc = -1;
-static gint hf_ipmi_se_XX_m_unc = -1;
-static gint hf_ipmi_se_XX_m_lnr = -1;
-static gint hf_ipmi_se_XX_m_lc = -1;
-static gint hf_ipmi_se_XX_m_lnc = -1;
-static gint hf_ipmi_se_XX_thr_lnc = -1;
-static gint hf_ipmi_se_XX_thr_lc = -1;
-static gint hf_ipmi_se_XX_thr_lnr = -1;
-static gint hf_ipmi_se_XX_thr_unc = -1;
-static gint hf_ipmi_se_XX_thr_uc = -1;
-static gint hf_ipmi_se_XX_thr_unr = -1;
-
-static gint hf_ipmi_se_27_sensor = -1;
-
-static gint hf_ipmi_se_XX_b1_7 = -1;
-static gint hf_ipmi_se_XX_b1_6 = -1;
-static gint hf_ipmi_se_XX_b1_5 = -1;
-static gint hf_ipmi_se_XX_b1_4 = -1;
-static gint hf_ipmi_se_XX_b1_3 = -1;
-static gint hf_ipmi_se_XX_b1_2 = -1;
-static gint hf_ipmi_se_XX_b1_1 = -1;
-static gint hf_ipmi_se_XX_b1_0 = -1;
-static gint hf_ipmi_se_XX_b2_6 = -1;
-static gint hf_ipmi_se_XX_b2_5 = -1;
-static gint hf_ipmi_se_XX_b2_4 = -1;
-static gint hf_ipmi_se_XX_b2_3 = -1;
-static gint hf_ipmi_se_XX_b2_2 = -1;
-static gint hf_ipmi_se_XX_b2_1 = -1;
-static gint hf_ipmi_se_XX_b2_0 = -1;
-static gint hf_ipmi_se_XX_b3_7 = -1;
-static gint hf_ipmi_se_XX_b3_6 = -1;
-static gint hf_ipmi_se_XX_b3_5 = -1;
-static gint hf_ipmi_se_XX_b3_4 = -1;
-static gint hf_ipmi_se_XX_b3_3 = -1;
-static gint hf_ipmi_se_XX_b3_2 = -1;
-static gint hf_ipmi_se_XX_b3_1 = -1;
-static gint hf_ipmi_se_XX_b3_0 = -1;
-static gint hf_ipmi_se_XX_b4_6 = -1;
-static gint hf_ipmi_se_XX_b4_5 = -1;
-static gint hf_ipmi_se_XX_b4_4 = -1;
-static gint hf_ipmi_se_XX_b4_3 = -1;
-static gint hf_ipmi_se_XX_b4_2 = -1;
-static gint hf_ipmi_se_XX_b4_1 = -1;
-static gint hf_ipmi_se_XX_b4_0 = -1;
-
-static gint hf_ipmi_se_28_sensor = -1;
-static gint hf_ipmi_se_28_fl_evm = -1;
-static gint hf_ipmi_se_28_fl_scan = -1;
-static gint hf_ipmi_se_28_fl_action = -1;
-
-static gint hf_ipmi_se_29_sensor = -1;
-static gint hf_ipmi_se_29_fl_evm = -1;
-static gint hf_ipmi_se_29_fl_scan = -1;
-
-static gint hf_ipmi_se_2a_sensor = -1;
-static gint hf_ipmi_se_2a_fl_sel = -1;
-
-static gint hf_ipmi_se_2b_sensor = -1;
-static gint hf_ipmi_se_2b_fl_evm = -1;
-static gint hf_ipmi_se_2b_fl_scan = -1;
-static gint hf_ipmi_se_2b_fl_unavail = -1;
-
-static gint hf_ipmi_se_2d_sensor = -1;
-static gint hf_ipmi_se_2d_reading = -1;
-static gint hf_ipmi_se_2d_b1_7 = -1;
-static gint hf_ipmi_se_2d_b1_6 = -1;
-static gint hf_ipmi_se_2d_b1_5 = -1;
-static gint hf_ipmi_se_2d_b1_4 = -1;
-static gint hf_ipmi_se_2d_b1_3 = -1;
-static gint hf_ipmi_se_2d_b1_2 = -1;
-static gint hf_ipmi_se_2d_b1_1 = -1;
-static gint hf_ipmi_se_2d_b1_0 = -1;
-static gint hf_ipmi_se_2d_b2_6 = -1;
-static gint hf_ipmi_se_2d_b2_5 = -1;
-static gint hf_ipmi_se_2d_b2_4 = -1;
-static gint hf_ipmi_se_2d_b2_3 = -1;
-static gint hf_ipmi_se_2d_b2_2 = -1;
-static gint hf_ipmi_se_2d_b2_1 = -1;
-static gint hf_ipmi_se_2d_b2_0 = -1;
-
-static gint hf_ipmi_se_2e_sensor = -1;
-static gint hf_ipmi_se_2e_stype = -1;
-static gint hf_ipmi_se_2e_evtype = -1;
-
-static gint hf_ipmi_se_2f_sensor = -1;
-static gint hf_ipmi_se_2f_stype = -1;
-static gint hf_ipmi_se_2f_evtype = -1;
+static gint ett_ipmi_se_evt_byte3;
+static gint ett_ipmi_se_evt_evd_byte1;
+static gint ett_ipmi_se_evt_evd_byte2;
+static gint ett_ipmi_se_evt_evd_byte3;
+
+static gint ett_ipmi_se_cp06_byte1;
+static gint ett_ipmi_se_cp07_byte1;
+static gint ett_ipmi_se_cp09_byte1;
+static gint ett_ipmi_se_cp10_byte1;
+static gint ett_ipmi_se_cp12_byte1;
+static gint ett_ipmi_se_cp12_byte2;
+static gint ett_ipmi_se_cp12_byte3;
+static gint ett_ipmi_se_cp13_byte1;
+static gint ett_ipmi_se_cp15_byte1;
+static gint ett_ipmi_se_cp15_byte2;
+static gint ett_ipmi_se_cp15_member;
+static gint ett_ipmi_se_cp15_byte11;
+
+static gint ett_ipmi_se_00_byte2;
+static gint ett_ipmi_se_01_byte2;
+static gint ett_ipmi_se_10_action;
+static gint ett_ipmi_se_12_byte1;
+static gint ett_ipmi_se_13_byte1;
+static gint ett_ipmi_se_13_rev;
+static gint ett_ipmi_se_14_byte1;
+static gint ett_ipmi_se_16_byte1;
+static gint ett_ipmi_se_16_byte2;
+static gint ett_ipmi_se_16_byte3;
+static gint ett_ipmi_se_20_rq_byte1;
+static gint ett_ipmi_se_20_rs_byte2;
+static gint ett_ipmi_se_23_readingfactors;
+static gint ett_ipmi_se_23_byte1;
+static gint ett_ipmi_se_23_byte2;
+static gint ett_ipmi_se_23_byte3;
+static gint ett_ipmi_se_23_byte4;
+static gint ett_ipmi_se_23_byte5;
+static gint ett_ipmi_se_23_byte6;
+static gint ett_ipmi_se_XX_mask;
+static gint ett_ipmi_se_XX_b1;
+static gint ett_ipmi_se_XX_b2;
+static gint ett_ipmi_se_XX_b3;
+static gint ett_ipmi_se_XX_b4;
+static gint ett_ipmi_se_28_byte2;
+static gint ett_ipmi_se_29_byte1;
+static gint ett_ipmi_se_2a_byte2;
+static gint ett_ipmi_se_2b_byte1;
+static gint ett_ipmi_se_2d_byte2;
+static gint ett_ipmi_se_2d_b1;
+static gint ett_ipmi_se_2d_b2;
+
+static expert_field ei_ipmi_se_13_request_param_rev;
+static expert_field ei_ipmi_se_13_request_param_data;
+
+static gint hf_ipmi_se_evt_rev;
+static gint hf_ipmi_se_evt_sensor_type;
+static gint hf_ipmi_se_evt_sensor_num;
+static gint hf_ipmi_se_evt_byte3;
+static gint hf_ipmi_se_evt_dir;
+static gint hf_ipmi_se_evt_type;
+static gint hf_ipmi_se_evt_data1;
+static gint hf_ipmi_se_evt_data1_b2;
+static gint hf_ipmi_se_evt_data1_b3;
+static gint hf_ipmi_se_evt_data1_offs;
+static gint hf_ipmi_se_evt_data2;
+static gint hf_ipmi_se_evt_data3;
+
+static gint hf_ipmi_se_cp00_sip;
+static gint hf_ipmi_se_cp01_alert_startup;
+static gint hf_ipmi_se_cp01_startup;
+static gint hf_ipmi_se_cp01_event_msg;
+static gint hf_ipmi_se_cp01_pef;
+static gint hf_ipmi_se_cp02_diag_intr;
+static gint hf_ipmi_se_cp02_oem_action;
+static gint hf_ipmi_se_cp02_pwr_cycle;
+static gint hf_ipmi_se_cp02_reset;
+static gint hf_ipmi_se_cp02_pwr_down;
+static gint hf_ipmi_se_cp02_alert;
+static gint hf_ipmi_se_cp03_startup;
+static gint hf_ipmi_se_cp04_alert_startup;
+static gint hf_ipmi_se_cp05_num_evfilters;
+static gint hf_ipmi_se_cp06_filter;
+static gint hf_ipmi_se_cp06_data;
+static gint hf_ipmi_se_cp07_filter;
+/* static gint hf_ipmi_se_cp07_data; */
+static gint hf_ipmi_se_cp08_policies;
+static gint hf_ipmi_se_cp09_entry;
+static gint hf_ipmi_se_cp09_data;
+static gint hf_ipmi_se_cp10_useval;
+static gint hf_ipmi_se_cp10_guid;
+static gint hf_ipmi_se_cp11_num_alertstr;
+static gint hf_ipmi_se_cp12_byte1;
+static gint hf_ipmi_se_cp12_alert_stringsel;
+static gint hf_ipmi_se_cp12_evfilter;
+static gint hf_ipmi_se_cp12_alert_stringset;
+static gint hf_ipmi_se_cp13_stringsel;
+static gint hf_ipmi_se_cp13_blocksel;
+static gint hf_ipmi_se_cp13_string;
+static gint hf_ipmi_se_cp14_num_gct;
+static gint hf_ipmi_se_cp15_gctsel;
+static gint hf_ipmi_se_cp15_force;
+static gint hf_ipmi_se_cp15_delayed;
+static gint hf_ipmi_se_cp15_channel;
+static gint hf_ipmi_se_cp15_group;
+static gint hf_ipmi_se_cp15_member_check;
+static gint hf_ipmi_se_cp15_member_id;
+static gint hf_ipmi_se_cp15_retries;
+static gint hf_ipmi_se_cp15_operation;
+
+static gint hf_ipmi_se_00_addr;
+static gint hf_ipmi_se_00_lun;
+
+static gint hf_ipmi_se_01_addr;
+static gint hf_ipmi_se_01_lun;
+
+static gint hf_ipmi_se_10_pef_version;
+static gint hf_ipmi_se_10_action_oem_filter;
+static gint hf_ipmi_se_10_action_diag_intr;
+static gint hf_ipmi_se_10_action_oem_action;
+static gint hf_ipmi_se_10_action_pwr_cycle;
+static gint hf_ipmi_se_10_action_reset;
+static gint hf_ipmi_se_10_action_pwr_down;
+static gint hf_ipmi_se_10_action_alert;
+static gint hf_ipmi_se_10_entries;
+static gint hf_ipmi_se_10_evtype;
+
+static gint hf_ipmi_se_11_rq_timeout;
+static gint hf_ipmi_se_11_rs_timeout;
+
+static gint hf_ipmi_se_12_byte1;
+static gint hf_ipmi_se_12_param;
+static gint hf_ipmi_se_12_data;
+
+static gint hf_ipmi_se_13_byte1;
+static gint hf_ipmi_se_13_getrev;
+static gint hf_ipmi_se_13_param;
+static gint hf_ipmi_se_13_set;
+static gint hf_ipmi_se_13_block;
+static gint hf_ipmi_se_13_rev_present;
+static gint hf_ipmi_se_13_rev_compat;
+static gint hf_ipmi_se_13_data;
+
+static gint hf_ipmi_se_14_processed_by;
+static gint hf_ipmi_se_14_rid;
+
+static gint hf_ipmi_se_15_tstamp;
+static gint hf_ipmi_se_15_lastrec;
+static gint hf_ipmi_se_15_proc_sw;
+static gint hf_ipmi_se_15_proc_bmc;
+
+static gint hf_ipmi_se_16_chan;
+static gint hf_ipmi_se_16_op;
+static gint hf_ipmi_se_16_dst;
+static gint hf_ipmi_se_16_send_string;
+static gint hf_ipmi_se_16_string_sel;
+static gint hf_ipmi_se_16_gen;
+static gint hf_ipmi_se_16_status;
+
+static gint hf_ipmi_se_17_seq;
+static gint hf_ipmi_se_17_tstamp;
+static gint hf_ipmi_se_17_evsrc;
+static gint hf_ipmi_se_17_sensor_dev;
+static gint hf_ipmi_se_17_sensor_num;
+static gint hf_ipmi_se_17_evdata1;
+static gint hf_ipmi_se_17_evdata2;
+static gint hf_ipmi_se_17_evdata3;
+
+static gint hf_ipmi_se_20_rq_op;
+static gint hf_ipmi_se_20_rs_num;
+static gint hf_ipmi_se_20_rs_sdr;
+static gint hf_ipmi_se_20_rs_population;
+static gint hf_ipmi_se_20_rs_lun3;
+static gint hf_ipmi_se_20_rs_lun2;
+static gint hf_ipmi_se_20_rs_lun1;
+static gint hf_ipmi_se_20_rs_lun0;
+static gint hf_ipmi_se_20_rs_change;
+
+static gint hf_ipmi_se_21_rid;
+static gint hf_ipmi_se_21_record;
+static gint hf_ipmi_se_21_offset;
+static gint hf_ipmi_se_21_len;
+static gint hf_ipmi_se_21_next;
+static gint hf_ipmi_se_21_recdata;
+
+static gint hf_ipmi_se_22_resid;
+
+static gint hf_ipmi_se_23_rq_sensor;
+static gint hf_ipmi_se_23_rq_reading;
+static gint hf_ipmi_se_23_rs_next_reading;
+
+static gint hf_ipmi_se_24_sensor;
+static gint hf_ipmi_se_24_mask;
+static gint hf_ipmi_se_24_hyst_pos;
+static gint hf_ipmi_se_24_hyst_neg;
+
+static gint hf_ipmi_se_25_sensor;
+static gint hf_ipmi_se_25_mask;
+static gint hf_ipmi_se_25_hyst_pos;
+static gint hf_ipmi_se_25_hyst_neg;
+
+static gint hf_ipmi_se_26_sensor;
+static gint hf_ipmi_se_XX_m_unr;
+static gint hf_ipmi_se_XX_m_uc;
+static gint hf_ipmi_se_XX_m_unc;
+static gint hf_ipmi_se_XX_m_lnr;
+static gint hf_ipmi_se_XX_m_lc;
+static gint hf_ipmi_se_XX_m_lnc;
+static gint hf_ipmi_se_XX_thr_lnc;
+static gint hf_ipmi_se_XX_thr_lc;
+static gint hf_ipmi_se_XX_thr_lnr;
+static gint hf_ipmi_se_XX_thr_unc;
+static gint hf_ipmi_se_XX_thr_uc;
+static gint hf_ipmi_se_XX_thr_unr;
+
+static gint hf_ipmi_se_27_sensor;
+
+static gint hf_ipmi_se_XX_b1_7;
+static gint hf_ipmi_se_XX_b1_6;
+static gint hf_ipmi_se_XX_b1_5;
+static gint hf_ipmi_se_XX_b1_4;
+static gint hf_ipmi_se_XX_b1_3;
+static gint hf_ipmi_se_XX_b1_2;
+static gint hf_ipmi_se_XX_b1_1;
+static gint hf_ipmi_se_XX_b1_0;
+static gint hf_ipmi_se_XX_b2_6;
+static gint hf_ipmi_se_XX_b2_5;
+static gint hf_ipmi_se_XX_b2_4;
+static gint hf_ipmi_se_XX_b2_3;
+static gint hf_ipmi_se_XX_b2_2;
+static gint hf_ipmi_se_XX_b2_1;
+static gint hf_ipmi_se_XX_b2_0;
+static gint hf_ipmi_se_XX_b3_7;
+static gint hf_ipmi_se_XX_b3_6;
+static gint hf_ipmi_se_XX_b3_5;
+static gint hf_ipmi_se_XX_b3_4;
+static gint hf_ipmi_se_XX_b3_3;
+static gint hf_ipmi_se_XX_b3_2;
+static gint hf_ipmi_se_XX_b3_1;
+static gint hf_ipmi_se_XX_b3_0;
+static gint hf_ipmi_se_XX_b4_6;
+static gint hf_ipmi_se_XX_b4_5;
+static gint hf_ipmi_se_XX_b4_4;
+static gint hf_ipmi_se_XX_b4_3;
+static gint hf_ipmi_se_XX_b4_2;
+static gint hf_ipmi_se_XX_b4_1;
+static gint hf_ipmi_se_XX_b4_0;
+
+static gint hf_ipmi_se_28_sensor;
+static gint hf_ipmi_se_28_fl_evm;
+static gint hf_ipmi_se_28_fl_scan;
+static gint hf_ipmi_se_28_fl_action;
+
+static gint hf_ipmi_se_29_sensor;
+static gint hf_ipmi_se_29_fl_evm;
+static gint hf_ipmi_se_29_fl_scan;
+
+static gint hf_ipmi_se_2a_sensor;
+static gint hf_ipmi_se_2a_fl_sel;
+
+static gint hf_ipmi_se_2b_sensor;
+static gint hf_ipmi_se_2b_fl_evm;
+static gint hf_ipmi_se_2b_fl_scan;
+static gint hf_ipmi_se_2b_fl_unavail;
+
+static gint hf_ipmi_se_2d_sensor;
+static gint hf_ipmi_se_2d_reading;
+static gint hf_ipmi_se_2d_b1_7;
+static gint hf_ipmi_se_2d_b1_6;
+static gint hf_ipmi_se_2d_b1_5;
+static gint hf_ipmi_se_2d_b1_4;
+static gint hf_ipmi_se_2d_b1_3;
+static gint hf_ipmi_se_2d_b1_2;
+static gint hf_ipmi_se_2d_b1_1;
+static gint hf_ipmi_se_2d_b1_0;
+static gint hf_ipmi_se_2d_b2_6;
+static gint hf_ipmi_se_2d_b2_5;
+static gint hf_ipmi_se_2d_b2_4;
+static gint hf_ipmi_se_2d_b2_3;
+static gint hf_ipmi_se_2d_b2_2;
+static gint hf_ipmi_se_2d_b2_1;
+static gint hf_ipmi_se_2d_b2_0;
+
+static gint hf_ipmi_se_2e_sensor;
+static gint hf_ipmi_se_2e_stype;
+static gint hf_ipmi_se_2e_evtype;
+
+static gint hf_ipmi_se_2f_sensor;
+static gint hf_ipmi_se_2f_stype;
+static gint hf_ipmi_se_2f_evtype;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_ipmi_se_f3_gs_management_power = -1;
-static int hf_ipmi_se_f0_cause = -1;
-static int hf_ipmi_se_28_logical_fru_device = -1;
-static int hf_ipmi_se_evt_trigger_threshold = -1;
-static int hf_ipmi_se_10_logging_disable = -1;
-static int hf_ipmi_se_28_sensor_number = -1;
-static int hf_ipmi_se_23_interrupt_type = -1;
-static int hf_ipmi_se_23_accuracy_exponent = -1;
-static int hf_ipmi_se_2a_session_deactivated_by = -1;
-static int hf_ipmi_se_0c_memory_module = -1;
-static int hf_ipmi_se_f1_ipmb_a_override_state = -1;
-static int hf_ipmi_se_12_reset = -1;
-static int hf_ipmi_se_f1_ipmb_b_local_status = -1;
-static int hf_ipmi_se_f1_ipmb_a_local_status = -1;
-static int hf_ipmi_se_1d_restart_cause = -1;
-static int hf_ipmi_se_12_power_off = -1;
-static int hf_ipmi_se_f3_management_power_overcurrent = -1;
-static int hf_ipmi_se_2a_user_id = -1;
-static int hf_ipmi_se_12_event = -1;
-static int hf_ipmi_se_2c_previous_state = -1;
-static int hf_ipmi_se_1d_channel = -1;
-static int hf_ipmi_se_f3_channel_management_power = -1;
-static int hf_ipmi_se_12_power_cycle = -1;
-static int hf_ipmi_se_f1_ipmb_b_override_state = -1;
-static int hf_ipmi_se_19_requested_power_state = -1;
-static int hf_ipmi_se_f3_payload_power_overcurrent = -1;
-static int hf_ipmi_se_f0_previous_state = -1;
-static int hf_ipmi_se_f3_ps1 = -1;
-static int hf_ipmi_se_13_parameter = -1;
-static int hf_ipmi_se_28_i2c_slave_address = -1;
-static int hf_ipmi_se_0f_extension_code_err = -1;
-static int hf_ipmi_se_28_lun_for_master_read_write_command = -1;
-static int hf_ipmi_se_evt_trigger_reading = -1;
-static int hf_ipmi_se_21_slot_connector_type = -1;
-static int hf_ipmi_se_f3_pwr_on = -1;
-static int hf_ipmi_se_28_fru_device_id_within_controller = -1;
-static int hf_ipmi_se_12_log_entry_action = -1;
-static int hf_ipmi_se_12_log_type = -1;
-static int hf_ipmi_se_23_accuracy = -1;
-static int hf_ipmi_se_f3_role = -1;
-static int hf_ipmi_se_f3_channel_payload_power = -1;
-static int hf_ipmi_se_23_m = -1;
-static int hf_ipmi_se_f1_channel = -1;
-static int hf_ipmi_se_10_event_offset = -1;
-static int hf_ipmi_se_f3_gs_payload_power = -1;
-static int hf_ipmi_se_pst_severity = -1;
-static int hf_ipmi_se_f3_global_status = -1;
-static int hf_ipmi_se_f3_channel_status = -1;
-static int hf_ipmi_se_12_alert = -1;
-static int hf_ipmi_se_23_timer_use_at_expiration = -1;
-static int hf_ipmi_se_12_oem_action = -1;
-static int hf_ipmi_se_f0_fru_id = -1;
-static int hf_ipmi_se_pst_previous_state = -1;
-static int hf_ipmi_se_23_tolerance = -1;
-static int hf_ipmi_se_21_slot_connector = -1;
-static int hf_ipmi_se_12_diagnostic_interrupt = -1;
-static int hf_ipmi_se_2c_cause = -1;
-static int hf_ipmi_se_f3_enable = -1;
-static int hf_ipmi_se_10_sel_filled = -1;
-static int hf_ipmi_se_23_b_exponent = -1;
-static int hf_ipmi_se_0f_extension_code_progress = -1;
-static int hf_ipmi_se_05_network_controller = -1;
-static int hf_ipmi_se_28_private_bus_id = -1;
-static int hf_ipmi_se_10_event = -1;
-static int hf_ipmi_se_23_r_exponent = -1;
-static int hf_ipmi_se_f3_power_channel_number = -1;
-static int hf_ipmi_se_2a_channel = -1;
-static int hf_ipmi_se_2b_version_change_type = -1;
-static int hf_ipmi_se_f3_redundant_pm = -1;
-static int hf_ipmi_se_19_power_state = -1;
-static int hf_ipmi_se_08_error_type = -1;
-static int hf_ipmi_se_23_b = -1;
-static int hf_ipmi_se_12_timestamp_clock_type = -1;
-static int hf_ipmi_se_10_memory_module = -1;
+static int hf_ipmi_se_f3_gs_management_power;
+static int hf_ipmi_se_f0_cause;
+static int hf_ipmi_se_28_logical_fru_device;
+static int hf_ipmi_se_evt_trigger_threshold;
+static int hf_ipmi_se_10_logging_disable;
+static int hf_ipmi_se_28_sensor_number;
+static int hf_ipmi_se_23_interrupt_type;
+static int hf_ipmi_se_23_accuracy_exponent;
+static int hf_ipmi_se_2a_session_deactivated_by;
+static int hf_ipmi_se_0c_memory_module;
+static int hf_ipmi_se_f1_ipmb_a_override_state;
+static int hf_ipmi_se_12_reset;
+static int hf_ipmi_se_f1_ipmb_b_local_status;
+static int hf_ipmi_se_f1_ipmb_a_local_status;
+static int hf_ipmi_se_1d_restart_cause;
+static int hf_ipmi_se_12_power_off;
+static int hf_ipmi_se_f3_management_power_overcurrent;
+static int hf_ipmi_se_2a_user_id;
+static int hf_ipmi_se_12_event;
+static int hf_ipmi_se_2c_previous_state;
+static int hf_ipmi_se_1d_channel;
+static int hf_ipmi_se_f3_channel_management_power;
+static int hf_ipmi_se_12_power_cycle;
+static int hf_ipmi_se_f1_ipmb_b_override_state;
+static int hf_ipmi_se_19_requested_power_state;
+static int hf_ipmi_se_f3_payload_power_overcurrent;
+static int hf_ipmi_se_f0_previous_state;
+static int hf_ipmi_se_f3_ps1;
+static int hf_ipmi_se_13_parameter;
+static int hf_ipmi_se_28_i2c_slave_address;
+static int hf_ipmi_se_0f_extension_code_err;
+static int hf_ipmi_se_28_lun_for_master_read_write_command;
+static int hf_ipmi_se_evt_trigger_reading;
+static int hf_ipmi_se_21_slot_connector_type;
+static int hf_ipmi_se_f3_pwr_on;
+static int hf_ipmi_se_28_fru_device_id_within_controller;
+static int hf_ipmi_se_12_log_entry_action;
+static int hf_ipmi_se_12_log_type;
+static int hf_ipmi_se_23_accuracy;
+static int hf_ipmi_se_f3_role;
+static int hf_ipmi_se_f3_channel_payload_power;
+static int hf_ipmi_se_23_m;
+static int hf_ipmi_se_f1_channel;
+static int hf_ipmi_se_10_event_offset;
+static int hf_ipmi_se_f3_gs_payload_power;
+static int hf_ipmi_se_pst_severity;
+static int hf_ipmi_se_f3_global_status;
+static int hf_ipmi_se_f3_channel_status;
+static int hf_ipmi_se_12_alert;
+static int hf_ipmi_se_23_timer_use_at_expiration;
+static int hf_ipmi_se_12_oem_action;
+static int hf_ipmi_se_f0_fru_id;
+static int hf_ipmi_se_pst_previous_state;
+static int hf_ipmi_se_23_tolerance;
+static int hf_ipmi_se_21_slot_connector;
+static int hf_ipmi_se_12_diagnostic_interrupt;
+static int hf_ipmi_se_2c_cause;
+static int hf_ipmi_se_f3_enable;
+static int hf_ipmi_se_10_sel_filled;
+static int hf_ipmi_se_23_b_exponent;
+static int hf_ipmi_se_0f_extension_code_progress;
+static int hf_ipmi_se_05_network_controller;
+static int hf_ipmi_se_28_private_bus_id;
+static int hf_ipmi_se_10_event;
+static int hf_ipmi_se_23_r_exponent;
+static int hf_ipmi_se_f3_power_channel_number;
+static int hf_ipmi_se_2a_channel;
+static int hf_ipmi_se_2b_version_change_type;
+static int hf_ipmi_se_f3_redundant_pm;
+static int hf_ipmi_se_19_power_state;
+static int hf_ipmi_se_08_error_type;
+static int hf_ipmi_se_23_b;
+static int hf_ipmi_se_12_timestamp_clock_type;
+static int hf_ipmi_se_10_memory_module;
 
 
 /* Platform Event parsing. Common for Platform Event and Alert Immediate.
diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c
index 4b3abd5c17..634feacef4 100644
--- a/epan/dissectors/packet-ipmi-session.c
+++ b/epan/dissectors/packet-ipmi-session.c
@@ -23,24 +23,24 @@ static dissector_handle_t ipmi_session_handle;
 
 #define RMCP_CLASS_IPMI 0x07
 
-static int proto_ipmi_session = -1;
+static int proto_ipmi_session;
 
-static gint ett_ipmi_session = -1;
-static gint ett_ipmi_session_payloadtype = -1;
+static gint ett_ipmi_session;
+static gint ett_ipmi_session_payloadtype;
 
 /* IPMI session header */
-static int hf_ipmi_session_id = -1;
-static int hf_ipmi_session_authtype = -1;
-static int hf_ipmi_session_payloadtype = -1;
-static int hf_ipmi_session_payloadtype_auth = -1;
-static int hf_ipmi_session_payloadtype_enc = -1;
-static int hf_ipmi_session_oem_iana = -1;
-static int hf_ipmi_session_oem_payload_id = -1;
-static int hf_ipmi_session_sequence = -1;
-static int hf_ipmi_session_authcode = -1;
-static int hf_ipmi_session_msg_len_1b = -1;
-static int hf_ipmi_session_msg_len_2b = -1;
-static int hf_ipmi_session_trailer = -1;
+static int hf_ipmi_session_id;
+static int hf_ipmi_session_authtype;
+static int hf_ipmi_session_payloadtype;
+static int hf_ipmi_session_payloadtype_auth;
+static int hf_ipmi_session_payloadtype_enc;
+static int hf_ipmi_session_oem_iana;
+static int hf_ipmi_session_oem_payload_id;
+static int hf_ipmi_session_sequence;
+static int hf_ipmi_session_authcode;
+static int hf_ipmi_session_msg_len_1b;
+static int hf_ipmi_session_msg_len_2b;
+static int hf_ipmi_session_trailer;
 
 static dissector_handle_t ipmi_handle;
 
diff --git a/epan/dissectors/packet-ipmi-storage.c b/epan/dissectors/packet-ipmi-storage.c
index 7251fdbd95..ca733359c1 100644
--- a/epan/dissectors/packet-ipmi-storage.c
+++ b/epan/dissectors/packet-ipmi-storage.c
@@ -17,152 +17,152 @@
 
 void proto_register_ipmi_storage(void);
 
-static gint ett_ipmi_stor_10_flags = -1;
-static gint ett_ipmi_stor_20_ops = -1;
-static gint ett_ipmi_stor_25_byte6 = -1;
-static gint ett_ipmi_stor_27_status = -1;
-static gint ett_ipmi_stor_2c_rq_byte1 = -1;
-static gint ett_ipmi_stor_2c_rs_byte1 = -1;
-static gint ett_ipmi_stor_40_ops = -1;
-static gint ett_ipmi_stor_45_byte6 = -1;
-static gint ett_ipmi_stor_47_status = -1;
-static gint ett_ipmi_stor_5a_byte1 = -1;
-static gint ett_ipmi_stor_5b_byte1 = -1;
-
-static gint hf_ipmi_stor_10_fruid = -1;
-static gint hf_ipmi_stor_10_size = -1;
-static gint hf_ipmi_stor_10_access = -1;
-
-static gint hf_ipmi_stor_11_fruid = -1;
-static gint hf_ipmi_stor_11_offset = -1;
-static gint hf_ipmi_stor_11_count = -1;
-static gint hf_ipmi_stor_11_ret_count = -1;
-static gint hf_ipmi_stor_11_data = -1;
-
-static gint hf_ipmi_stor_12_fruid = -1;
-static gint hf_ipmi_stor_12_offset = -1;
-static gint hf_ipmi_stor_12_data = -1;
-static gint hf_ipmi_stor_12_ret_count = -1;
-
-static gint hf_ipmi_stor_20_sdr_version = -1;
-static gint hf_ipmi_stor_20_rec_count = -1;
-static gint hf_ipmi_stor_20_free_space = -1;
-static gint hf_ipmi_stor_20_ts_add = -1;
-static gint hf_ipmi_stor_20_ts_erase = -1;
-static gint hf_ipmi_stor_20_op_overflow = -1;
-static gint hf_ipmi_stor_20_op_update = -1;
-static gint hf_ipmi_stor_20_op_delete = -1;
-static gint hf_ipmi_stor_20_op_partial_add = -1;
-static gint hf_ipmi_stor_20_op_reserve = -1;
-static gint hf_ipmi_stor_20_op_allocinfo = -1;
-
-static gint hf_ipmi_stor_21_units = -1;
-static gint hf_ipmi_stor_21_size = -1;
-static gint hf_ipmi_stor_21_free = -1;
-static gint hf_ipmi_stor_21_largest = -1;
-static gint hf_ipmi_stor_21_maxrec = -1;
-
-static gint hf_ipmi_stor_22_rsrv_id = -1;
-
-static gint hf_ipmi_stor_23_rsrv_id = -1;
-static gint hf_ipmi_stor_23_rec_id = -1;
-static gint hf_ipmi_stor_23_offset = -1;
-static gint hf_ipmi_stor_23_count = -1;
-static gint hf_ipmi_stor_23_next = -1;
-static gint hf_ipmi_stor_23_data = -1;
-
-static gint hf_ipmi_stor_24_data = -1;
-static gint hf_ipmi_stor_24_added_rec_id = -1;
-
-static gint hf_ipmi_stor_25_rsrv_id = -1;
-static gint hf_ipmi_stor_25_rec_id = -1;
-static gint hf_ipmi_stor_25_offset = -1;
-static gint hf_ipmi_stor_25_inprogress = -1;
-static gint hf_ipmi_stor_25_data = -1;
-static gint hf_ipmi_stor_25_added_rec_id = -1;
+static gint ett_ipmi_stor_10_flags;
+static gint ett_ipmi_stor_20_ops;
+static gint ett_ipmi_stor_25_byte6;
+static gint ett_ipmi_stor_27_status;
+static gint ett_ipmi_stor_2c_rq_byte1;
+static gint ett_ipmi_stor_2c_rs_byte1;
+static gint ett_ipmi_stor_40_ops;
+static gint ett_ipmi_stor_45_byte6;
+static gint ett_ipmi_stor_47_status;
+static gint ett_ipmi_stor_5a_byte1;
+static gint ett_ipmi_stor_5b_byte1;
+
+static gint hf_ipmi_stor_10_fruid;
+static gint hf_ipmi_stor_10_size;
+static gint hf_ipmi_stor_10_access;
+
+static gint hf_ipmi_stor_11_fruid;
+static gint hf_ipmi_stor_11_offset;
+static gint hf_ipmi_stor_11_count;
+static gint hf_ipmi_stor_11_ret_count;
+static gint hf_ipmi_stor_11_data;
+
+static gint hf_ipmi_stor_12_fruid;
+static gint hf_ipmi_stor_12_offset;
+static gint hf_ipmi_stor_12_data;
+static gint hf_ipmi_stor_12_ret_count;
+
+static gint hf_ipmi_stor_20_sdr_version;
+static gint hf_ipmi_stor_20_rec_count;
+static gint hf_ipmi_stor_20_free_space;
+static gint hf_ipmi_stor_20_ts_add;
+static gint hf_ipmi_stor_20_ts_erase;
+static gint hf_ipmi_stor_20_op_overflow;
+static gint hf_ipmi_stor_20_op_update;
+static gint hf_ipmi_stor_20_op_delete;
+static gint hf_ipmi_stor_20_op_partial_add;
+static gint hf_ipmi_stor_20_op_reserve;
+static gint hf_ipmi_stor_20_op_allocinfo;
+
+static gint hf_ipmi_stor_21_units;
+static gint hf_ipmi_stor_21_size;
+static gint hf_ipmi_stor_21_free;
+static gint hf_ipmi_stor_21_largest;
+static gint hf_ipmi_stor_21_maxrec;
+
+static gint hf_ipmi_stor_22_rsrv_id;
+
+static gint hf_ipmi_stor_23_rsrv_id;
+static gint hf_ipmi_stor_23_rec_id;
+static gint hf_ipmi_stor_23_offset;
+static gint hf_ipmi_stor_23_count;
+static gint hf_ipmi_stor_23_next;
+static gint hf_ipmi_stor_23_data;
+
+static gint hf_ipmi_stor_24_data;
+static gint hf_ipmi_stor_24_added_rec_id;
+
+static gint hf_ipmi_stor_25_rsrv_id;
+static gint hf_ipmi_stor_25_rec_id;
+static gint hf_ipmi_stor_25_offset;
+static gint hf_ipmi_stor_25_inprogress;
+static gint hf_ipmi_stor_25_data;
+static gint hf_ipmi_stor_25_added_rec_id;
 
 #if 0
-static gint hf_ipmi_stor_26_rsrv_id = -1;
-static gint hf_ipmi_stor_26_rec_id = -1;
+static gint hf_ipmi_stor_26_rsrv_id;
+static gint hf_ipmi_stor_26_rec_id;
 #endif
-static gint hf_ipmi_stor_26_del_rec_id = -1;
-
-static gint hf_ipmi_stor_27_rsrv_id = -1;
-static gint hf_ipmi_stor_27_clr = -1;
-static gint hf_ipmi_stor_27_action = -1;
-static gint hf_ipmi_stor_27_status = -1;
-
-static gint hf_ipmi_stor_28_time = -1;
-
-static gint hf_ipmi_stor_29_time = -1;
-
-static gint hf_ipmi_stor_2c_init_agent = -1;
-static gint hf_ipmi_stor_2c_init_state = -1;
-
-static gint hf_ipmi_stor_40_sel_version = -1;
-static gint hf_ipmi_stor_40_entries = -1;
-static gint hf_ipmi_stor_40_free_space = -1;
-static gint hf_ipmi_stor_40_ts_add = -1;
-static gint hf_ipmi_stor_40_ts_erase = -1;
-static gint hf_ipmi_stor_40_op_overflow = -1;
-static gint hf_ipmi_stor_40_op_delete = -1;
-static gint hf_ipmi_stor_40_op_partial_add = -1;
-static gint hf_ipmi_stor_40_op_reserve = -1;
-static gint hf_ipmi_stor_40_op_allocinfo = -1;
-
-static gint hf_ipmi_stor_41_units = -1;
-static gint hf_ipmi_stor_41_size = -1;
-static gint hf_ipmi_stor_41_free = -1;
-static gint hf_ipmi_stor_41_largest = -1;
-static gint hf_ipmi_stor_41_maxrec = -1;
-
-static gint hf_ipmi_stor_42_rsrv_id = -1;
-
-static gint hf_ipmi_stor_43_rsrv_id = -1;
-static gint hf_ipmi_stor_43_rec_id = -1;
-static gint hf_ipmi_stor_43_offset = -1;
-static gint hf_ipmi_stor_43_count = -1;
-static gint hf_ipmi_stor_43_next = -1;
-static gint hf_ipmi_stor_43_data = -1;
-
-static gint hf_ipmi_stor_44_data = -1;
-static gint hf_ipmi_stor_44_added_rec_id = -1;
-
-static gint hf_ipmi_stor_45_rsrv_id = -1;
-static gint hf_ipmi_stor_45_rec_id = -1;
-static gint hf_ipmi_stor_45_offset = -1;
-static gint hf_ipmi_stor_45_inprogress = -1;
-static gint hf_ipmi_stor_45_data = -1;
-static gint hf_ipmi_stor_45_added_rec_id = -1;
+static gint hf_ipmi_stor_26_del_rec_id;
+
+static gint hf_ipmi_stor_27_rsrv_id;
+static gint hf_ipmi_stor_27_clr;
+static gint hf_ipmi_stor_27_action;
+static gint hf_ipmi_stor_27_status;
+
+static gint hf_ipmi_stor_28_time;
+
+static gint hf_ipmi_stor_29_time;
+
+static gint hf_ipmi_stor_2c_init_agent;
+static gint hf_ipmi_stor_2c_init_state;
+
+static gint hf_ipmi_stor_40_sel_version;
+static gint hf_ipmi_stor_40_entries;
+static gint hf_ipmi_stor_40_free_space;
+static gint hf_ipmi_stor_40_ts_add;
+static gint hf_ipmi_stor_40_ts_erase;
+static gint hf_ipmi_stor_40_op_overflow;
+static gint hf_ipmi_stor_40_op_delete;
+static gint hf_ipmi_stor_40_op_partial_add;
+static gint hf_ipmi_stor_40_op_reserve;
+static gint hf_ipmi_stor_40_op_allocinfo;
+
+static gint hf_ipmi_stor_41_units;
+static gint hf_ipmi_stor_41_size;
+static gint hf_ipmi_stor_41_free;
+static gint hf_ipmi_stor_41_largest;
+static gint hf_ipmi_stor_41_maxrec;
+
+static gint hf_ipmi_stor_42_rsrv_id;
+
+static gint hf_ipmi_stor_43_rsrv_id;
+static gint hf_ipmi_stor_43_rec_id;
+static gint hf_ipmi_stor_43_offset;
+static gint hf_ipmi_stor_43_count;
+static gint hf_ipmi_stor_43_next;
+static gint hf_ipmi_stor_43_data;
+
+static gint hf_ipmi_stor_44_data;
+static gint hf_ipmi_stor_44_added_rec_id;
+
+static gint hf_ipmi_stor_45_rsrv_id;
+static gint hf_ipmi_stor_45_rec_id;
+static gint hf_ipmi_stor_45_offset;
+static gint hf_ipmi_stor_45_inprogress;
+static gint hf_ipmi_stor_45_data;
+static gint hf_ipmi_stor_45_added_rec_id;
 
 #if 0
-static gint hf_ipmi_stor_46_rsrv_id = -1;
-static gint hf_ipmi_stor_46_rec_id = -1;
+static gint hf_ipmi_stor_46_rsrv_id;
+static gint hf_ipmi_stor_46_rec_id;
 #endif
-static gint hf_ipmi_stor_46_del_rec_id = -1;
-
-static gint hf_ipmi_stor_47_rsrv_id = -1;
-static gint hf_ipmi_stor_47_clr = -1;
-static gint hf_ipmi_stor_47_action = -1;
-static gint hf_ipmi_stor_47_status = -1;
-
-static gint hf_ipmi_stor_48_time = -1;
-
-static gint hf_ipmi_stor_49_time = -1;
-
-static gint hf_ipmi_stor_5a_log_type = -1;
-static gint hf_ipmi_stor_5a_ts_add = -1;
-static gint hf_ipmi_stor_5a_num_entries = -1;
-static gint hf_ipmi_stor_5a_iana = -1;
-static gint hf_ipmi_stor_5a_bytes = -1;
-static gint hf_ipmi_stor_5a_unknown = -1;
-
-static gint hf_ipmi_stor_5b_log_type = -1;
-static gint hf_ipmi_stor_5b_ts_add = -1;
-static gint hf_ipmi_stor_5b_num_entries = -1;
-static gint hf_ipmi_stor_5b_iana = -1;
-static gint hf_ipmi_stor_5b_bytes = -1;
-static gint hf_ipmi_stor_5b_unknown = -1;
+static gint hf_ipmi_stor_46_del_rec_id;
+
+static gint hf_ipmi_stor_47_rsrv_id;
+static gint hf_ipmi_stor_47_clr;
+static gint hf_ipmi_stor_47_action;
+static gint hf_ipmi_stor_47_status;
+
+static gint hf_ipmi_stor_48_time;
+
+static gint hf_ipmi_stor_49_time;
+
+static gint hf_ipmi_stor_5a_log_type;
+static gint hf_ipmi_stor_5a_ts_add;
+static gint hf_ipmi_stor_5a_num_entries;
+static gint hf_ipmi_stor_5a_iana;
+static gint hf_ipmi_stor_5a_bytes;
+static gint hf_ipmi_stor_5a_unknown;
+
+static gint hf_ipmi_stor_5b_log_type;
+static gint hf_ipmi_stor_5b_ts_add;
+static gint hf_ipmi_stor_5b_num_entries;
+static gint hf_ipmi_stor_5b_iana;
+static gint hf_ipmi_stor_5b_bytes;
+static gint hf_ipmi_stor_5b_unknown;
 
 static const struct true_false_string tfs_10_access = {
 	"by words", "by bytes"
diff --git a/epan/dissectors/packet-ipmi-trace.c b/epan/dissectors/packet-ipmi-trace.c
index 946252b663..4dc5917863 100644
--- a/epan/dissectors/packet-ipmi-trace.c
+++ b/epan/dissectors/packet-ipmi-trace.c
@@ -80,32 +80,32 @@ void proto_reg_handoff_ipmi_trace(void);
 
 static dissector_handle_t ipmi_trace_handle;
 
-static int proto_ipmi_trace = -1;
+static int proto_ipmi_trace;
 
 static dissector_table_t proto_dissector_table;
 
-static gint ett_ipmi_trace = -1;
-static gint ett_trace_block_type = -1;
-static gint ett_trace_timestamp = -1;
-static gint ett_trace_protocol_data = -1;
-static gint ett_trace_ipmb_state = -1;
-
-static gint hf_trace_block_type = -1;
-static gint hf_trace_channel_num = -1;
-static gint hf_trace_packet_type = -1;
-static gint hf_trace_timestamp = -1;
-static gint hf_trace_timestamp_sec = -1;
-static gint hf_trace_timestamp_msec = -1;
-static gint hf_trace_data_type = -1;
-static gint hf_trace_protocol_data = -1;
-static gint hf_trace_dir = -1;
-static gint hf_trace_ipmb_red_chn = -1;
-static gint hf_trace_ipmb_link_num = -1;
-static gint hf_trace_data_len = -1;
-static gint hf_trace_notify_format = -1;
-static gint hf_trace_ipmb_state = -1;
-static gint hf_trace_ipmb_ovr_state = -1;
-static gint hf_trace_ipmb_loc_state = -1;
+static gint ett_ipmi_trace;
+static gint ett_trace_block_type;
+static gint ett_trace_timestamp;
+static gint ett_trace_protocol_data;
+static gint ett_trace_ipmb_state;
+
+static gint hf_trace_block_type;
+static gint hf_trace_channel_num;
+static gint hf_trace_packet_type;
+static gint hf_trace_timestamp;
+static gint hf_trace_timestamp_sec;
+static gint hf_trace_timestamp_msec;
+static gint hf_trace_data_type;
+static gint hf_trace_protocol_data;
+static gint hf_trace_dir;
+static gint hf_trace_ipmb_red_chn;
+static gint hf_trace_ipmb_link_num;
+static gint hf_trace_data_len;
+static gint hf_trace_notify_format;
+static gint hf_trace_ipmb_state;
+static gint hf_trace_ipmb_ovr_state;
+static gint hf_trace_ipmb_loc_state;
 
 static const value_string str_packet_types[] = {
 	{ 0, "IPMI Trace Packet Data" },
diff --git a/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c
index acb6edb3d7..6eb557a882 100644
--- a/epan/dissectors/packet-ipmi-transport.c
+++ b/epan/dissectors/packet-ipmi-transport.c
@@ -18,549 +18,549 @@
 
 void proto_register_ipmi_transport(void);
 
-static gint ett_ipmi_trn_lan00_byte1 = -1;
-static gint ett_ipmi_trn_lan01_byte1 = -1;
-static gint ett_ipmi_trn_lan02_byte1 = -1;
-static gint ett_ipmi_trn_lan02_byte2 = -1;
-static gint ett_ipmi_trn_lan02_byte3 = -1;
-static gint ett_ipmi_trn_lan02_byte4 = -1;
-static gint ett_ipmi_trn_lan02_byte5 = -1;
-static gint ett_ipmi_trn_lan04_byte1 = -1;
-static gint ett_ipmi_trn_lan07_byte2 = -1;
-static gint ett_ipmi_trn_lan07_byte3 = -1;
-static gint ett_ipmi_trn_lan10_byte1 = -1;
-static gint ett_ipmi_trn_lan17_byte1 = -1;
-static gint ett_ipmi_trn_lan18_byte1 = -1;
-static gint ett_ipmi_trn_lan18_byte2 = -1;
-static gint ett_ipmi_trn_lan18_byte4 = -1;
-static gint ett_ipmi_trn_lan19_byte1 = -1;
-static gint ett_ipmi_trn_lan19_byte2 = -1;
-static gint ett_ipmi_trn_lan19_byte3 = -1;
-static gint ett_ipmi_trn_lan20_byte12 = -1;
-static gint ett_ipmi_trn_lan21_byte1 = -1;
-static gint ett_ipmi_trn_lan22_byte1 = -1;
-static gint ett_ipmi_trn_lan24_byte1 = -1;
-static gint ett_ipmi_trn_lan24_byte2 = -1;
-static gint ett_ipmi_trn_lan24_byte3 = -1;
-static gint ett_ipmi_trn_lan24_byte4 = -1;
-static gint ett_ipmi_trn_lan24_byte5 = -1;
-static gint ett_ipmi_trn_lan24_byte6 = -1;
-static gint ett_ipmi_trn_lan24_byte7 = -1;
-static gint ett_ipmi_trn_lan24_byte8 = -1;
-static gint ett_ipmi_trn_lan25_byte1 = -1;
-static gint ett_ipmi_trn_lan25_byte2 = -1;
-static gint ett_ipmi_trn_lan25_byte34 = -1;
-static gint ett_ipmi_trn_lan50_byte1 = -1;
-static gint ett_ipmi_trn_lan55_byte3 = -1;
-static gint ett_ipmi_trn_lan56_byte2 = -1;
-static gint ett_ipmi_trn_lan64_byte1 = -1;
-static gint ett_ipmi_trn_serial03_byte1 = -1;
-static gint ett_ipmi_trn_serial04_byte1 = -1;
-static gint ett_ipmi_trn_serial05_byte1 = -1;
-static gint ett_ipmi_trn_serial05_byte2 = -1;
-static gint ett_ipmi_trn_serial06_byte1 = -1;
-static gint ett_ipmi_trn_serial07_byte1 = -1;
-static gint ett_ipmi_trn_serial07_byte2 = -1;
-static gint ett_ipmi_trn_serial08_byte1 = -1;
-static gint ett_ipmi_trn_serial08_byte2 = -1;
-static gint ett_ipmi_trn_serial09_byte1 = -1;
-static gint ett_ipmi_trn_serial09_byte2 = -1;
-static gint ett_ipmi_trn_serial16_byte1 = -1;
-static gint ett_ipmi_trn_serial17_byte1 = -1;
-static gint ett_ipmi_trn_serial17_byte2 = -1;
-static gint ett_ipmi_trn_serial17_byte4 = -1;
-static gint ett_ipmi_trn_serial17_byte5 = -1;
-static gint ett_ipmi_trn_serial19_byte1 = -1;
-static gint ett_ipmi_trn_serial19_byte2 = -1;
-static gint ett_ipmi_trn_serial19_byte3 = -1;
-static gint ett_ipmi_trn_serial20_byte1 = -1;
-static gint ett_ipmi_trn_serial21_byte1 = -1;
-static gint ett_ipmi_trn_serial22_byte1 = -1;
-static gint ett_ipmi_trn_serial23_byte1 = -1;
-static gint ett_ipmi_trn_serial24_byte1 = -1;
-static gint ett_ipmi_trn_serial25_byte2 = -1;
-static gint ett_ipmi_trn_serial28_byte1 = -1;
-static gint ett_ipmi_trn_serial28_byte2 = -1;
-static gint ett_ipmi_trn_serial28_byte10 = -1;
-static gint ett_ipmi_trn_serial28_byte11 = -1;
-static gint ett_ipmi_trn_serial28_byte12 = -1;
-static gint ett_ipmi_trn_serial28_byte13 = -1;
-static gint ett_ipmi_trn_serial28_byte14 = -1;
-static gint ett_ipmi_trn_serial29_byte1 = -1;
-static gint ett_ipmi_trn_serial29_byte2 = -1;
-static gint ett_ipmi_trn_serial30_byte1 = -1;
-static gint ett_ipmi_trn_serial30_byte2 = -1;
-static gint ett_ipmi_trn_serial30_byte3 = -1;
-static gint ett_ipmi_trn_serial33_byte1 = -1;
-static gint ett_ipmi_trn_serial37_byte1 = -1;
-static gint ett_ipmi_trn_serial43_byte1 = -1;
-static gint ett_ipmi_trn_serial50_byte1 = -1;
-static gint ett_ipmi_trn_serial51_byte2 = -1;
-static gint ett_ipmi_trn_serial51_byte3 = -1;
-static gint ett_ipmi_trn_01_byte1 = -1;
-static gint ett_ipmi_trn_02_byte1 = -1;
-static gint ett_ipmi_trn_02_rev = -1;
-static gint ett_ipmi_trn_03_rq_byte1 = -1;
-static gint ett_ipmi_trn_03_rq_byte2 = -1;
-static gint ett_ipmi_trn_03_rs_byte1 = -1;
-static gint ett_ipmi_trn_04_byte1 = -1;
-static gint ett_ipmi_trn_04_byte2 = -1;
-static gint ett_ipmi_trn_10_byte1 = -1;
-static gint ett_ipmi_trn_11_byte1 = -1;
-static gint ett_ipmi_trn_11_rev = -1;
-static gint ett_ipmi_trn_12_rq_byte1 = -1;
-static gint ett_ipmi_trn_12_rq_byte2 = -1;
-static gint ett_ipmi_trn_12_rs_byte1 = -1;
-static gint ett_ipmi_trn_13_byte1 = -1;
-static gint ett_ipmi_trn_14_byte1 = -1;
-static gint ett_ipmi_trn_15_byte1 = -1;
-static gint ett_ipmi_trn_16_byte1 = -1;
-static gint ett_ipmi_trn_17_byte1 = -1;
-static gint ett_ipmi_trn_17_byte2 = -1;
-static gint ett_ipmi_trn_18_byte1 = -1;
-static gint ett_ipmi_trn_19_byte1 = -1;
-static gint ett_ipmi_trn_19_byte2 = -1;
-static gint ett_ipmi_trn_XX_usercap = -1;
-static gint ett_ipmi_trn_XX_cbcp = -1;
-static gint ett_ipmi_trn_1a_byte1 = -1;
-static gint ett_ipmi_trn_1a_byte2 = -1;
-static gint ett_ipmi_trn_1b_byte1 = -1;
-static gint ett_ipmi_trn_1b_byte2 = -1;
-static gint ett_ipmi_trn_parameter = -1;
-
-static gint hf_ipmi_trn_lan00_sip = -1;
-
-static gint hf_ipmi_trn_lanXX_oem = -1;
-static gint hf_ipmi_trn_lanXX_passwd = -1;
-static gint hf_ipmi_trn_lanXX_md5 = -1;
-static gint hf_ipmi_trn_lanXX_md2 = -1;
-static gint hf_ipmi_trn_lanXX_none = -1;
-
-static gint hf_ipmi_trn_lan03_ip = -1;
-
-static gint hf_ipmi_trn_lan04_ipsrc = -1;
-
-static gint hf_ipmi_trn_lan05_ether = -1;
-
-static gint hf_ipmi_trn_lan06_subnet = -1;
-
-static gint hf_ipmi_trn_lan07_ttl = -1;
-static gint hf_ipmi_trn_lan07_flags = -1;
-static gint hf_ipmi_trn_lan07_precedence = -1;
-static gint hf_ipmi_trn_lan07_tos = -1;
-
-static gint hf_ipmi_trn_lan08_rmcp_port = -1;
-
-static gint hf_ipmi_trn_lan09_rmcp_port = -1;
-
-static gint hf_ipmi_trn_lan10_responses = -1;
-static gint hf_ipmi_trn_lan10_gratuitous = -1;
-
-static gint hf_ipmi_trn_lan11_arp_interval = -1;
-
-static gint hf_ipmi_trn_lan12_def_gw_ip = -1;
-
-static gint hf_ipmi_trn_lan13_def_gw_mac = -1;
-
-static gint hf_ipmi_trn_lan14_bkp_gw_ip = -1;
-
-static gint hf_ipmi_trn_lan15_bkp_gw_mac = -1;
-
-static gint hf_ipmi_trn_lan16_comm_string = -1;
-
-static gint hf_ipmi_trn_lan17_num_dst = -1;
-
-static gint hf_ipmi_trn_lan18_dst_selector = -1;
-static gint hf_ipmi_trn_lan18_ack = -1;
-static gint hf_ipmi_trn_lan18_dst_type = -1;
-static gint hf_ipmi_trn_lan18_tout = -1;
-static gint hf_ipmi_trn_lan18_retries = -1;
-
-static gint hf_ipmi_trn_lan19_dst_selector = -1;
-static gint hf_ipmi_trn_lan19_addr_format = -1;
-static gint hf_ipmi_trn_lan19_address = -1;
-static gint hf_ipmi_trn_lan19_gw_sel = -1;
-static gint hf_ipmi_trn_lan19_ip = -1;
-static gint hf_ipmi_trn_lan19_mac = -1;
-
-static gint hf_ipmi_trn_lan20_vlan_id_enable = -1;
-static gint hf_ipmi_trn_lan20_vlan_id = -1;
-
-static gint hf_ipmi_trn_lan21_vlan_prio = -1;
-
-static gint hf_ipmi_trn_lan22_num_cs_entries = -1;
-
-static gint hf_ipmi_trn_lan23_cs_entry = -1;
-
-static gint hf_ipmi_trn_lan24_priv1 = -1;
-static gint hf_ipmi_trn_lan24_priv2 = -1;
-
-static gint hf_ipmi_trn_lan25_dst_selector = -1;
-static gint hf_ipmi_trn_lan25_addr_format = -1;
-static gint hf_ipmi_trn_lan25_address = -1;
-static gint hf_ipmi_trn_lan25_uprio = -1;
-static gint hf_ipmi_trn_lan25_cfi = -1;
-static gint hf_ipmi_trn_lan25_vlan_id = -1;
-
-static gint hf_ipmi_trn_lan26_gen_event = -1;
-static gint hf_ipmi_trn_lan26_thresh_number = -1;
-static gint hf_ipmi_trn_lan26_reset_interval = -1;
-static gint hf_ipmi_trn_lan26_lock_interval = -1;
-
-static gint hf_ipmi_trn_lan50_ipv6_only = -1;
-static gint hf_ipmi_trn_lan50_both_ipv4_ipv6 = -1;
-static gint hf_ipmi_trn_lan50_ipv6_alerting = -1;
-
-static gint hf_ipmi_trn_lan51_enables = -1;
-
-static gint hf_ipmi_trn_lan52_traffic_class = -1;
-
-static gint hf_ipmi_trn_lanXX_hop_limit = -1;
-
-static gint hf_ipmi_trn_lan54_flow_label = -1;
-
-static gint hf_ipmi_trn_lan55_static_addr_max = -1;
-static gint hf_ipmi_trn_lan55_dynamic_addr_max = -1;
-static gint hf_ipmi_trn_lan55_dhcpv6_support = -1;
-static gint hf_ipmi_trn_lan55_slaac_support = -1;
-
-static gint hf_ipmi_trn_lanXX_addr_selector = -1;
-static gint hf_ipmi_trn_lanXX_addr_type = -1;
-static gint hf_ipmi_trn_lanXX_addr_enable = -1;
-static gint hf_ipmi_trn_lanXX_addr = -1;
-static gint hf_ipmi_trn_lanXX_prefix_len = -1;
-static gint hf_ipmi_trn_lanXX_addr_status = -1;
-
-static gint hf_ipmi_trn_lanXX_max_duid_blocks = -1;
-
-static gint hf_ipmi_trn_lanXX_duid_selector = -1;
-static gint hf_ipmi_trn_lanXX_block_selector = -1;
-static gint hf_ipmi_trn_lanXX_duid = -1;
-
-static gint hf_ipmi_trn_lanXX_timing_support = -1;
-
-static gint hf_ipmi_trn_lanXX_iface_selector = -1;
-static gint hf_ipmi_trn_lan63_sol_max_delay = -1;
-static gint hf_ipmi_trn_lan63_sol_timeout = -1;
-static gint hf_ipmi_trn_lan63_sol_max_rt = -1;
-static gint hf_ipmi_trn_lan63_req_timeout = -1;
-static gint hf_ipmi_trn_lan63_req_max_rt = -1;
-static gint hf_ipmi_trn_lan63_req_max_rc = -1;
-static gint hf_ipmi_trn_lan63_cnf_max_delay = -1;
-static gint hf_ipmi_trn_lan63_cnf_timeout = -1;
-static gint hf_ipmi_trn_lan63_cnf_max_rt = -1;
-static gint hf_ipmi_trn_lan63_cnf_max_rd = -1;
-static gint hf_ipmi_trn_lan63_ren_timeout = -1;
-static gint hf_ipmi_trn_lan63_ren_max_rt = -1;
-static gint hf_ipmi_trn_lan63_reb_timeout = -1;
-static gint hf_ipmi_trn_lan63_reb_max_rt = -1;
-static gint hf_ipmi_trn_lan63_inf_max_delay = -1;
-static gint hf_ipmi_trn_lan63_inf_timeout = -1;
-static gint hf_ipmi_trn_lan63_inf_max_rt = -1;
-static gint hf_ipmi_trn_lan63_rel_timeout = -1;
-static gint hf_ipmi_trn_lan63_rel_max_rc = -1;
-static gint hf_ipmi_trn_lan63_dec_timeout = -1;
-static gint hf_ipmi_trn_lan63_dec_max_rc = -1;
-static gint hf_ipmi_trn_lan63_hop_count_limit = -1;
-
-static gint hf_ipmi_trn_lan64_static_cfg = -1;
-static gint hf_ipmi_trn_lan64_dynamic_cfg = -1;
-
-static gint hf_ipmi_trn_lanXX_router_selector = -1;
-static gint hf_ipmi_trn_lanXX_router_mac = -1;
-static gint hf_ipmi_trn_lanXX_router_prefix = -1;
-
-static gint hf_ipmi_trn_lan73_num_dynamic_sets = -1;
-
-static gint hf_ipmi_trn_lan80_max_rtr_solicitation_delay = -1;
-static gint hf_ipmi_trn_lan80_rtr_solicitation_interval = -1;
-static gint hf_ipmi_trn_lan80_max_rtr_solicitations = -1;
-static gint hf_ipmi_trn_lan80_dup_addr_detect_transmits = -1;
-static gint hf_ipmi_trn_lan80_max_multicast_solicit = -1;
-static gint hf_ipmi_trn_lan80_max_unicast_solicit = -1;
-static gint hf_ipmi_trn_lan80_max_anycast_delay_time = -1;
-static gint hf_ipmi_trn_lan80_max_neighbor_advertisement = -1;
-static gint hf_ipmi_trn_lan80_reachable_time = -1;
-static gint hf_ipmi_trn_lan80_retrans_timer = -1;
-static gint hf_ipmi_trn_lan80_delay_first_probe_time = -1;
-static gint hf_ipmi_trn_lan80_max_random_factor = -1;
-static gint hf_ipmi_trn_lan80_min_random_factor = -1;
-
-static gint hf_ipmi_trn_serial03_connmode = -1;
-static gint hf_ipmi_trn_serial03_terminal = -1;
-static gint hf_ipmi_trn_serial03_ppp = -1;
-static gint hf_ipmi_trn_serial03_basic = -1;
-
-static gint hf_ipmi_trn_serial04_timeout = -1;
-
-static gint hf_ipmi_trn_serial05_cbcp_callback = -1;
-static gint hf_ipmi_trn_serial05_ipmi_callback = -1;
-static gint hf_ipmi_trn_serial05_cb_list = -1;
-static gint hf_ipmi_trn_serial05_cb_user = -1;
-static gint hf_ipmi_trn_serial05_cb_prespec = -1;
-static gint hf_ipmi_trn_serial05_no_cb = -1;
-static gint hf_ipmi_trn_serial05_cb_dest1 = -1;
-static gint hf_ipmi_trn_serial05_cb_dest2 = -1;
-static gint hf_ipmi_trn_serial05_cb_dest3 = -1;
-
-static gint hf_ipmi_trn_serial06_inactivity = -1;
-static gint hf_ipmi_trn_serial06_dcd = -1;
-
-static gint hf_ipmi_trn_serial07_flowctl = -1;
-static gint hf_ipmi_trn_serial07_dtrhangup = -1;
-static gint hf_ipmi_trn_serial07_bitrate = -1;
-
-static gint hf_ipmi_trn_serial08_esc_powerup = -1;
-static gint hf_ipmi_trn_serial08_esc_reset = -1;
-static gint hf_ipmi_trn_serial08_switch_authcap = -1;
-static gint hf_ipmi_trn_serial08_switch_rmcp = -1;
-static gint hf_ipmi_trn_serial08_esc_switch1 = -1;
-static gint hf_ipmi_trn_serial08_esc_switch2 = -1;
-static gint hf_ipmi_trn_serial08_switch_dcdloss = -1;
-static gint hf_ipmi_trn_serial08_sharing = -1;
-static gint hf_ipmi_trn_serial08_ping_callback = -1;
-static gint hf_ipmi_trn_serial08_ping_direct = -1;
-static gint hf_ipmi_trn_serial08_ping_retry = -1;
-
-static gint hf_ipmi_trn_serial09_ring_duration = -1;
-static gint hf_ipmi_trn_serial09_ring_dead = -1;
-
-static gint hf_ipmi_trn_serial10_set_sel = -1;
-static gint hf_ipmi_trn_serial10_init_str = -1;
-static gint hf_ipmi_trn_serial11_esc_seq = -1;
-static gint hf_ipmi_trn_serial12_hangup_seq = -1;
-static gint hf_ipmi_trn_serial13_dial_cmd = -1;
-static gint hf_ipmi_trn_serial14_page_blackout = -1;
-static gint hf_ipmi_trn_serial15_comm_string = -1;
-
-static gint hf_ipmi_trn_serial16_ndest = -1;
-
-static gint hf_ipmi_trn_serial17_dest_sel = -1;
-static gint hf_ipmi_trn_serial17_ack = -1;
-static gint hf_ipmi_trn_serial17_dest_type = -1;
-/* static gint hf_ipmi_trn_serial17_ack_timeout = -1; */
-static gint hf_ipmi_trn_serial17_alert_retries = -1;
-static gint hf_ipmi_trn_serial17_call_retries = -1;
-static gint hf_ipmi_trn_serial17_alert_ack_timeout = -1;
-static gint hf_ipmi_trn_serial17_dialstr_sel = -1;
-static gint hf_ipmi_trn_serial17_tap_sel = -1;
-static gint hf_ipmi_trn_serial17_ipaddr_sel = -1;
-static gint hf_ipmi_trn_serial17_ppp_sel = -1;
-static gint hf_ipmi_trn_serial17_unknown = -1;
-
-static gint hf_ipmi_trn_serial18_call_retry = -1;
-
-static gint hf_ipmi_trn_serial19_destsel = -1;
-static gint hf_ipmi_trn_serial19_flowctl = -1;
-static gint hf_ipmi_trn_serial19_dtrhangup = -1;
-static gint hf_ipmi_trn_serial19_stopbits = -1;
-static gint hf_ipmi_trn_serial19_charsize = -1;
-static gint hf_ipmi_trn_serial19_parity = -1;
-static gint hf_ipmi_trn_serial19_bitrate = -1;
-
-static gint hf_ipmi_trn_serial20_num_dial_strings = -1;
-static gint hf_ipmi_trn_serial21_dialsel = -1;
-static gint hf_ipmi_trn_serial21_blockno = -1;
-static gint hf_ipmi_trn_serial21_dialstr = -1;
-static gint hf_ipmi_trn_serial22_num_ipaddrs = -1;
-static gint hf_ipmi_trn_serial23_destsel = -1;
-static gint hf_ipmi_trn_serial23_ipaddr = -1;
-static gint hf_ipmi_trn_serial24_num_tap_accounts = -1;
-static gint hf_ipmi_trn_serial25_tap_acct = -1;
-static gint hf_ipmi_trn_serial25_dialstr_sel = -1;
-static gint hf_ipmi_trn_serial25_tapsrv_sel = -1;
-static gint hf_ipmi_trn_serial26_tap_acct = -1;
-static gint hf_ipmi_trn_serial26_tap_passwd = -1;
-static gint hf_ipmi_trn_serial27_tap_acct = -1;
-static gint hf_ipmi_trn_serial27_tap_pager_id = -1;
-
-static gint hf_ipmi_trn_serial28_tapsrv_sel = -1;
-static gint hf_ipmi_trn_serial28_confirm = -1;
-static gint hf_ipmi_trn_serial28_srvtype = -1;
-static gint hf_ipmi_trn_serial28_ctrl_esc = -1;
-static gint hf_ipmi_trn_serial28_t2 = -1;
-static gint hf_ipmi_trn_serial28_t1 = -1;
-static gint hf_ipmi_trn_serial28_t4 = -1;
-static gint hf_ipmi_trn_serial28_t3 = -1;
-static gint hf_ipmi_trn_serial28_t6 = -1;
-static gint hf_ipmi_trn_serial28_t5 = -1;
-static gint hf_ipmi_trn_serial28_n2 = -1;
-static gint hf_ipmi_trn_serial28_n1 = -1;
-static gint hf_ipmi_trn_serial28_n4 = -1;
-static gint hf_ipmi_trn_serial28_n3 = -1;
-
-static gint hf_ipmi_trn_serial29_op = -1;
-static gint hf_ipmi_trn_serial29_lineedit = -1;
-static gint hf_ipmi_trn_serial29_deletectl = -1;
-static gint hf_ipmi_trn_serial29_echo = -1;
-static gint hf_ipmi_trn_serial29_handshake = -1;
-static gint hf_ipmi_trn_serial29_o_newline = -1;
-static gint hf_ipmi_trn_serial29_i_newline = -1;
-static gint hf_ipmi_trn_serial30_snooping = -1;
-static gint hf_ipmi_trn_serial30_snoopctl = -1;
-static gint hf_ipmi_trn_serial30_negot_ctl = -1;
-static gint hf_ipmi_trn_serial30_use_xmit_accm = -1;
-static gint hf_ipmi_trn_serial30_xmit_addr_comp = -1;
-static gint hf_ipmi_trn_serial30_xmit_proto_comp = -1;
-static gint hf_ipmi_trn_serial30_ipaddr = -1;
-static gint hf_ipmi_trn_serial30_accm = -1;
-static gint hf_ipmi_trn_serial30_addr_comp = -1;
-static gint hf_ipmi_trn_serial30_proto_comp = -1;
-static gint hf_ipmi_trn_serial31_port = -1;
-static gint hf_ipmi_trn_serial32_port = -1;
-static gint hf_ipmi_trn_serial33_auth_proto = -1;
-static gint hf_ipmi_trn_serial34_chap_name = -1;
-
-static gint hf_ipmi_trn_serial35_recv_accm = -1;
-static gint hf_ipmi_trn_serial35_xmit_accm = -1;
-static gint hf_ipmi_trn_serial36_snoop_accm = -1;
-static gint hf_ipmi_trn_serial37_num_ppp = -1;
-static gint hf_ipmi_trn_serial38_acct_sel = -1;
-static gint hf_ipmi_trn_serial38_dialstr_sel = -1;
-static gint hf_ipmi_trn_serial39_acct_sel = -1;
-static gint hf_ipmi_trn_serial39_ipaddr = -1;
-static gint hf_ipmi_trn_serial40_acct_sel = -1;
-static gint hf_ipmi_trn_serial40_username = -1;
-static gint hf_ipmi_trn_serial41_acct_sel = -1;
-static gint hf_ipmi_trn_serial41_userdomain = -1;
-static gint hf_ipmi_trn_serial42_acct_sel = -1;
-static gint hf_ipmi_trn_serial42_userpass = -1;
-static gint hf_ipmi_trn_serial43_acct_sel = -1;
-static gint hf_ipmi_trn_serial43_auth_proto = -1;
-static gint hf_ipmi_trn_serial44_acct_sel = -1;
-static gint hf_ipmi_trn_serial44_hold_time = -1;
-
-static gint hf_ipmi_trn_serial45_src_ipaddr = -1;
-static gint hf_ipmi_trn_serial45_dst_ipaddr = -1;
-static gint hf_ipmi_trn_serial46_tx_bufsize = -1;
-static gint hf_ipmi_trn_serial47_rx_bufsize = -1;
-static gint hf_ipmi_trn_serial48_ipaddr = -1;
-static gint hf_ipmi_trn_serial49_blockno = -1;
-static gint hf_ipmi_trn_serial49_dialstr = -1;
-static gint hf_ipmi_trn_serial50_115200 = -1;
-static gint hf_ipmi_trn_serial50_57600 = -1;
-static gint hf_ipmi_trn_serial50_38400 = -1;
-static gint hf_ipmi_trn_serial50_19200 = -1;
-static gint hf_ipmi_trn_serial50_9600 = -1;
-
-static gint hf_ipmi_trn_serial51_port_assoc_sel = -1;
-static gint hf_ipmi_trn_serial51_ipmi_channel = -1;
-static gint hf_ipmi_trn_serial51_conn_num = -1;
-static gint hf_ipmi_trn_serial51_ipmi_sharing = -1;
-static gint hf_ipmi_trn_serial51_ipmi_sol = -1;
-static gint hf_ipmi_trn_serial51_chan_num = -1;
-static gint hf_ipmi_trn_serial52_port_assoc_sel = -1;
-static gint hf_ipmi_trn_serial52_conn_name = -1;
-static gint hf_ipmi_trn_serial53_port_assoc_sel = -1;
-static gint hf_ipmi_trn_serial53_chan_name = -1;
-
-static gint hf_ipmi_trn_01_chan = -1;
-static gint hf_ipmi_trn_01_param = -1;
-static gint hf_ipmi_trn_01_param_data = -1;
-
-static gint hf_ipmi_trn_02_getrev = -1;
-static gint hf_ipmi_trn_02_chan = -1;
-static gint hf_ipmi_trn_02_param = -1;
-static gint hf_ipmi_trn_02_set = -1;
-static gint hf_ipmi_trn_02_block = -1;
-static gint hf_ipmi_trn_02_rev_present = -1;
-static gint hf_ipmi_trn_02_rev_compat = -1;
-static gint hf_ipmi_trn_02_param_data = -1;
-
-static gint hf_ipmi_trn_03_chan = -1;
-static gint hf_ipmi_trn_03_arp_resp = -1;
-static gint hf_ipmi_trn_03_gratuitous_arp = -1;
-static gint hf_ipmi_trn_03_status_arp_resp = -1;
-static gint hf_ipmi_trn_03_status_gratuitous_arp = -1;
-
-static gint hf_ipmi_trn_04_chan = -1;
-static gint hf_ipmi_trn_04_clear = -1;
-static gint hf_ipmi_trn_04_rx_ippkts = -1;
-static gint hf_ipmi_trn_04_rx_iphdr_err = -1;
-static gint hf_ipmi_trn_04_rx_ipaddr_err = -1;
-static gint hf_ipmi_trn_04_rx_ippkts_frag = -1;
-static gint hf_ipmi_trn_04_tx_ippkts = -1;
-static gint hf_ipmi_trn_04_rx_udppkts = -1;
-static gint hf_ipmi_trn_04_rx_validrmcp = -1;
-static gint hf_ipmi_trn_04_rx_udpproxy = -1;
-static gint hf_ipmi_trn_04_dr_udpproxy = -1;
-
-static gint hf_ipmi_trn_10_chan = -1;
-static gint hf_ipmi_trn_10_param = -1;
-static gint hf_ipmi_trn_10_param_data = -1;
-
-static gint hf_ipmi_trn_11_getrev = -1;
-static gint hf_ipmi_trn_11_chan = -1;
-static gint hf_ipmi_trn_11_param = -1;
-static gint hf_ipmi_trn_11_set = -1;
-static gint hf_ipmi_trn_11_block = -1;
-static gint hf_ipmi_trn_11_rev_present = -1;
-static gint hf_ipmi_trn_11_rev_compat = -1;
-static gint hf_ipmi_trn_11_param_data = -1;
-
-static gint hf_ipmi_trn_12_chan = -1;
-static gint hf_ipmi_trn_12_mux_setting = -1;
-static gint hf_ipmi_trn_12_sw_to_sys = -1;
-static gint hf_ipmi_trn_12_sw_to_bmc = -1;
-static gint hf_ipmi_trn_12_alert = -1;
-static gint hf_ipmi_trn_12_msg = -1;
-static gint hf_ipmi_trn_12_req = -1;
-static gint hf_ipmi_trn_12_mux_state = -1;
-
-static gint hf_ipmi_trn_13_chan = -1;
-static gint hf_ipmi_trn_13_code1 = -1;
-static gint hf_ipmi_trn_13_code2 = -1;
-static gint hf_ipmi_trn_13_code3 = -1;
-static gint hf_ipmi_trn_13_code4 = -1;
-static gint hf_ipmi_trn_13_code5 = -1;
-
-static gint hf_ipmi_trn_14_chan = -1;
-static gint hf_ipmi_trn_14_block = -1;
-static gint hf_ipmi_trn_14_data = -1;
-
-static gint hf_ipmi_trn_15_chan = -1;
-static gint hf_ipmi_trn_15_block = -1;
-static gint hf_ipmi_trn_15_data = -1;
-
-static gint hf_ipmi_trn_16_chan = -1;
-static gint hf_ipmi_trn_16_src_port = -1;
-static gint hf_ipmi_trn_16_dst_port = -1;
-static gint hf_ipmi_trn_16_src_addr = -1;
-static gint hf_ipmi_trn_16_dst_addr = -1;
-static gint hf_ipmi_trn_16_bytes = -1;
-
-static gint hf_ipmi_trn_17_chan = -1;
-static gint hf_ipmi_trn_17_clear = -1;
-static gint hf_ipmi_trn_17_block_num = -1;
-static gint hf_ipmi_trn_17_size = -1;
-static gint hf_ipmi_trn_17_data = -1;
-
-static gint hf_ipmi_trn_18_state = -1;
-static gint hf_ipmi_trn_18_ipmi_ver = -1;
-
-static gint hf_ipmi_trn_19_chan = -1;
-static gint hf_ipmi_trn_19_dest_sel = -1;
-
-static gint hf_ipmi_trn_XX_cap_cbcp = -1;
-static gint hf_ipmi_trn_XX_cap_ipmi = -1;
-static gint hf_ipmi_trn_XX_cbcp_from_list = -1;
-static gint hf_ipmi_trn_XX_cbcp_user = -1;
-static gint hf_ipmi_trn_XX_cbcp_prespec = -1;
-static gint hf_ipmi_trn_XX_cbcp_nocb = -1;
-static gint hf_ipmi_trn_XX_dst1 = -1;
-static gint hf_ipmi_trn_XX_dst2 = -1;
-static gint hf_ipmi_trn_XX_dst3 = -1;
-
-static gint hf_ipmi_trn_1a_user = -1;
-static gint hf_ipmi_trn_1a_chan = -1;
-
-static gint hf_ipmi_trn_1b_user = -1;
-static gint hf_ipmi_trn_1b_chan = -1;
-
-static expert_field ei_ipmi_trn_02_request_param_rev = EI_INIT;
-static expert_field ei_ipmi_trn_02_request_param_data = EI_INIT;
-static expert_field ei_ipmi_trn_11_request_param_rev = EI_INIT;
-static expert_field ei_ipmi_trn_11_request_param_data = EI_INIT;
+static gint ett_ipmi_trn_lan00_byte1;
+static gint ett_ipmi_trn_lan01_byte1;
+static gint ett_ipmi_trn_lan02_byte1;
+static gint ett_ipmi_trn_lan02_byte2;
+static gint ett_ipmi_trn_lan02_byte3;
+static gint ett_ipmi_trn_lan02_byte4;
+static gint ett_ipmi_trn_lan02_byte5;
+static gint ett_ipmi_trn_lan04_byte1;
+static gint ett_ipmi_trn_lan07_byte2;
+static gint ett_ipmi_trn_lan07_byte3;
+static gint ett_ipmi_trn_lan10_byte1;
+static gint ett_ipmi_trn_lan17_byte1;
+static gint ett_ipmi_trn_lan18_byte1;
+static gint ett_ipmi_trn_lan18_byte2;
+static gint ett_ipmi_trn_lan18_byte4;
+static gint ett_ipmi_trn_lan19_byte1;
+static gint ett_ipmi_trn_lan19_byte2;
+static gint ett_ipmi_trn_lan19_byte3;
+static gint ett_ipmi_trn_lan20_byte12;
+static gint ett_ipmi_trn_lan21_byte1;
+static gint ett_ipmi_trn_lan22_byte1;
+static gint ett_ipmi_trn_lan24_byte1;
+static gint ett_ipmi_trn_lan24_byte2;
+static gint ett_ipmi_trn_lan24_byte3;
+static gint ett_ipmi_trn_lan24_byte4;
+static gint ett_ipmi_trn_lan24_byte5;
+static gint ett_ipmi_trn_lan24_byte6;
+static gint ett_ipmi_trn_lan24_byte7;
+static gint ett_ipmi_trn_lan24_byte8;
+static gint ett_ipmi_trn_lan25_byte1;
+static gint ett_ipmi_trn_lan25_byte2;
+static gint ett_ipmi_trn_lan25_byte34;
+static gint ett_ipmi_trn_lan50_byte1;
+static gint ett_ipmi_trn_lan55_byte3;
+static gint ett_ipmi_trn_lan56_byte2;
+static gint ett_ipmi_trn_lan64_byte1;
+static gint ett_ipmi_trn_serial03_byte1;
+static gint ett_ipmi_trn_serial04_byte1;
+static gint ett_ipmi_trn_serial05_byte1;
+static gint ett_ipmi_trn_serial05_byte2;
+static gint ett_ipmi_trn_serial06_byte1;
+static gint ett_ipmi_trn_serial07_byte1;
+static gint ett_ipmi_trn_serial07_byte2;
+static gint ett_ipmi_trn_serial08_byte1;
+static gint ett_ipmi_trn_serial08_byte2;
+static gint ett_ipmi_trn_serial09_byte1;
+static gint ett_ipmi_trn_serial09_byte2;
+static gint ett_ipmi_trn_serial16_byte1;
+static gint ett_ipmi_trn_serial17_byte1;
+static gint ett_ipmi_trn_serial17_byte2;
+static gint ett_ipmi_trn_serial17_byte4;
+static gint ett_ipmi_trn_serial17_byte5;
+static gint ett_ipmi_trn_serial19_byte1;
+static gint ett_ipmi_trn_serial19_byte2;
+static gint ett_ipmi_trn_serial19_byte3;
+static gint ett_ipmi_trn_serial20_byte1;
+static gint ett_ipmi_trn_serial21_byte1;
+static gint ett_ipmi_trn_serial22_byte1;
+static gint ett_ipmi_trn_serial23_byte1;
+static gint ett_ipmi_trn_serial24_byte1;
+static gint ett_ipmi_trn_serial25_byte2;
+static gint ett_ipmi_trn_serial28_byte1;
+static gint ett_ipmi_trn_serial28_byte2;
+static gint ett_ipmi_trn_serial28_byte10;
+static gint ett_ipmi_trn_serial28_byte11;
+static gint ett_ipmi_trn_serial28_byte12;
+static gint ett_ipmi_trn_serial28_byte13;
+static gint ett_ipmi_trn_serial28_byte14;
+static gint ett_ipmi_trn_serial29_byte1;
+static gint ett_ipmi_trn_serial29_byte2;
+static gint ett_ipmi_trn_serial30_byte1;
+static gint ett_ipmi_trn_serial30_byte2;
+static gint ett_ipmi_trn_serial30_byte3;
+static gint ett_ipmi_trn_serial33_byte1;
+static gint ett_ipmi_trn_serial37_byte1;
+static gint ett_ipmi_trn_serial43_byte1;
+static gint ett_ipmi_trn_serial50_byte1;
+static gint ett_ipmi_trn_serial51_byte2;
+static gint ett_ipmi_trn_serial51_byte3;
+static gint ett_ipmi_trn_01_byte1;
+static gint ett_ipmi_trn_02_byte1;
+static gint ett_ipmi_trn_02_rev;
+static gint ett_ipmi_trn_03_rq_byte1;
+static gint ett_ipmi_trn_03_rq_byte2;
+static gint ett_ipmi_trn_03_rs_byte1;
+static gint ett_ipmi_trn_04_byte1;
+static gint ett_ipmi_trn_04_byte2;
+static gint ett_ipmi_trn_10_byte1;
+static gint ett_ipmi_trn_11_byte1;
+static gint ett_ipmi_trn_11_rev;
+static gint ett_ipmi_trn_12_rq_byte1;
+static gint ett_ipmi_trn_12_rq_byte2;
+static gint ett_ipmi_trn_12_rs_byte1;
+static gint ett_ipmi_trn_13_byte1;
+static gint ett_ipmi_trn_14_byte1;
+static gint ett_ipmi_trn_15_byte1;
+static gint ett_ipmi_trn_16_byte1;
+static gint ett_ipmi_trn_17_byte1;
+static gint ett_ipmi_trn_17_byte2;
+static gint ett_ipmi_trn_18_byte1;
+static gint ett_ipmi_trn_19_byte1;
+static gint ett_ipmi_trn_19_byte2;
+static gint ett_ipmi_trn_XX_usercap;
+static gint ett_ipmi_trn_XX_cbcp;
+static gint ett_ipmi_trn_1a_byte1;
+static gint ett_ipmi_trn_1a_byte2;
+static gint ett_ipmi_trn_1b_byte1;
+static gint ett_ipmi_trn_1b_byte2;
+static gint ett_ipmi_trn_parameter;
+
+static gint hf_ipmi_trn_lan00_sip;
+
+static gint hf_ipmi_trn_lanXX_oem;
+static gint hf_ipmi_trn_lanXX_passwd;
+static gint hf_ipmi_trn_lanXX_md5;
+static gint hf_ipmi_trn_lanXX_md2;
+static gint hf_ipmi_trn_lanXX_none;
+
+static gint hf_ipmi_trn_lan03_ip;
+
+static gint hf_ipmi_trn_lan04_ipsrc;
+
+static gint hf_ipmi_trn_lan05_ether;
+
+static gint hf_ipmi_trn_lan06_subnet;
+
+static gint hf_ipmi_trn_lan07_ttl;
+static gint hf_ipmi_trn_lan07_flags;
+static gint hf_ipmi_trn_lan07_precedence;
+static gint hf_ipmi_trn_lan07_tos;
+
+static gint hf_ipmi_trn_lan08_rmcp_port;
+
+static gint hf_ipmi_trn_lan09_rmcp_port;
+
+static gint hf_ipmi_trn_lan10_responses;
+static gint hf_ipmi_trn_lan10_gratuitous;
+
+static gint hf_ipmi_trn_lan11_arp_interval;
+
+static gint hf_ipmi_trn_lan12_def_gw_ip;
+
+static gint hf_ipmi_trn_lan13_def_gw_mac;
+
+static gint hf_ipmi_trn_lan14_bkp_gw_ip;
+
+static gint hf_ipmi_trn_lan15_bkp_gw_mac;
+
+static gint hf_ipmi_trn_lan16_comm_string;
+
+static gint hf_ipmi_trn_lan17_num_dst;
+
+static gint hf_ipmi_trn_lan18_dst_selector;
+static gint hf_ipmi_trn_lan18_ack;
+static gint hf_ipmi_trn_lan18_dst_type;
+static gint hf_ipmi_trn_lan18_tout;
+static gint hf_ipmi_trn_lan18_retries;
+
+static gint hf_ipmi_trn_lan19_dst_selector;
+static gint hf_ipmi_trn_lan19_addr_format;
+static gint hf_ipmi_trn_lan19_address;
+static gint hf_ipmi_trn_lan19_gw_sel;
+static gint hf_ipmi_trn_lan19_ip;
+static gint hf_ipmi_trn_lan19_mac;
+
+static gint hf_ipmi_trn_lan20_vlan_id_enable;
+static gint hf_ipmi_trn_lan20_vlan_id;
+
+static gint hf_ipmi_trn_lan21_vlan_prio;
+
+static gint hf_ipmi_trn_lan22_num_cs_entries;
+
+static gint hf_ipmi_trn_lan23_cs_entry;
+
+static gint hf_ipmi_trn_lan24_priv1;
+static gint hf_ipmi_trn_lan24_priv2;
+
+static gint hf_ipmi_trn_lan25_dst_selector;
+static gint hf_ipmi_trn_lan25_addr_format;
+static gint hf_ipmi_trn_lan25_address;
+static gint hf_ipmi_trn_lan25_uprio;
+static gint hf_ipmi_trn_lan25_cfi;
+static gint hf_ipmi_trn_lan25_vlan_id;
+
+static gint hf_ipmi_trn_lan26_gen_event;
+static gint hf_ipmi_trn_lan26_thresh_number;
+static gint hf_ipmi_trn_lan26_reset_interval;
+static gint hf_ipmi_trn_lan26_lock_interval;
+
+static gint hf_ipmi_trn_lan50_ipv6_only;
+static gint hf_ipmi_trn_lan50_both_ipv4_ipv6;
+static gint hf_ipmi_trn_lan50_ipv6_alerting;
+
+static gint hf_ipmi_trn_lan51_enables;
+
+static gint hf_ipmi_trn_lan52_traffic_class;
+
+static gint hf_ipmi_trn_lanXX_hop_limit;
+
+static gint hf_ipmi_trn_lan54_flow_label;
+
+static gint hf_ipmi_trn_lan55_static_addr_max;
+static gint hf_ipmi_trn_lan55_dynamic_addr_max;
+static gint hf_ipmi_trn_lan55_dhcpv6_support;
+static gint hf_ipmi_trn_lan55_slaac_support;
+
+static gint hf_ipmi_trn_lanXX_addr_selector;
+static gint hf_ipmi_trn_lanXX_addr_type;
+static gint hf_ipmi_trn_lanXX_addr_enable;
+static gint hf_ipmi_trn_lanXX_addr;
+static gint hf_ipmi_trn_lanXX_prefix_len;
+static gint hf_ipmi_trn_lanXX_addr_status;
+
+static gint hf_ipmi_trn_lanXX_max_duid_blocks;
+
+static gint hf_ipmi_trn_lanXX_duid_selector;
+static gint hf_ipmi_trn_lanXX_block_selector;
+static gint hf_ipmi_trn_lanXX_duid;
+
+static gint hf_ipmi_trn_lanXX_timing_support;
+
+static gint hf_ipmi_trn_lanXX_iface_selector;
+static gint hf_ipmi_trn_lan63_sol_max_delay;
+static gint hf_ipmi_trn_lan63_sol_timeout;
+static gint hf_ipmi_trn_lan63_sol_max_rt;
+static gint hf_ipmi_trn_lan63_req_timeout;
+static gint hf_ipmi_trn_lan63_req_max_rt;
+static gint hf_ipmi_trn_lan63_req_max_rc;
+static gint hf_ipmi_trn_lan63_cnf_max_delay;
+static gint hf_ipmi_trn_lan63_cnf_timeout;
+static gint hf_ipmi_trn_lan63_cnf_max_rt;
+static gint hf_ipmi_trn_lan63_cnf_max_rd;
+static gint hf_ipmi_trn_lan63_ren_timeout;
+static gint hf_ipmi_trn_lan63_ren_max_rt;
+static gint hf_ipmi_trn_lan63_reb_timeout;
+static gint hf_ipmi_trn_lan63_reb_max_rt;
+static gint hf_ipmi_trn_lan63_inf_max_delay;
+static gint hf_ipmi_trn_lan63_inf_timeout;
+static gint hf_ipmi_trn_lan63_inf_max_rt;
+static gint hf_ipmi_trn_lan63_rel_timeout;
+static gint hf_ipmi_trn_lan63_rel_max_rc;
+static gint hf_ipmi_trn_lan63_dec_timeout;
+static gint hf_ipmi_trn_lan63_dec_max_rc;
+static gint hf_ipmi_trn_lan63_hop_count_limit;
+
+static gint hf_ipmi_trn_lan64_static_cfg;
+static gint hf_ipmi_trn_lan64_dynamic_cfg;
+
+static gint hf_ipmi_trn_lanXX_router_selector;
+static gint hf_ipmi_trn_lanXX_router_mac;
+static gint hf_ipmi_trn_lanXX_router_prefix;
+
+static gint hf_ipmi_trn_lan73_num_dynamic_sets;
+
+static gint hf_ipmi_trn_lan80_max_rtr_solicitation_delay;
+static gint hf_ipmi_trn_lan80_rtr_solicitation_interval;
+static gint hf_ipmi_trn_lan80_max_rtr_solicitations;
+static gint hf_ipmi_trn_lan80_dup_addr_detect_transmits;
+static gint hf_ipmi_trn_lan80_max_multicast_solicit;
+static gint hf_ipmi_trn_lan80_max_unicast_solicit;
+static gint hf_ipmi_trn_lan80_max_anycast_delay_time;
+static gint hf_ipmi_trn_lan80_max_neighbor_advertisement;
+static gint hf_ipmi_trn_lan80_reachable_time;
+static gint hf_ipmi_trn_lan80_retrans_timer;
+static gint hf_ipmi_trn_lan80_delay_first_probe_time;
+static gint hf_ipmi_trn_lan80_max_random_factor;
+static gint hf_ipmi_trn_lan80_min_random_factor;
+
+static gint hf_ipmi_trn_serial03_connmode;
+static gint hf_ipmi_trn_serial03_terminal;
+static gint hf_ipmi_trn_serial03_ppp;
+static gint hf_ipmi_trn_serial03_basic;
+
+static gint hf_ipmi_trn_serial04_timeout;
+
+static gint hf_ipmi_trn_serial05_cbcp_callback;
+static gint hf_ipmi_trn_serial05_ipmi_callback;
+static gint hf_ipmi_trn_serial05_cb_list;
+static gint hf_ipmi_trn_serial05_cb_user;
+static gint hf_ipmi_trn_serial05_cb_prespec;
+static gint hf_ipmi_trn_serial05_no_cb;
+static gint hf_ipmi_trn_serial05_cb_dest1;
+static gint hf_ipmi_trn_serial05_cb_dest2;
+static gint hf_ipmi_trn_serial05_cb_dest3;
+
+static gint hf_ipmi_trn_serial06_inactivity;
+static gint hf_ipmi_trn_serial06_dcd;
+
+static gint hf_ipmi_trn_serial07_flowctl;
+static gint hf_ipmi_trn_serial07_dtrhangup;
+static gint hf_ipmi_trn_serial07_bitrate;
+
+static gint hf_ipmi_trn_serial08_esc_powerup;
+static gint hf_ipmi_trn_serial08_esc_reset;
+static gint hf_ipmi_trn_serial08_switch_authcap;
+static gint hf_ipmi_trn_serial08_switch_rmcp;
+static gint hf_ipmi_trn_serial08_esc_switch1;
+static gint hf_ipmi_trn_serial08_esc_switch2;
+static gint hf_ipmi_trn_serial08_switch_dcdloss;
+static gint hf_ipmi_trn_serial08_sharing;
+static gint hf_ipmi_trn_serial08_ping_callback;
+static gint hf_ipmi_trn_serial08_ping_direct;
+static gint hf_ipmi_trn_serial08_ping_retry;
+
+static gint hf_ipmi_trn_serial09_ring_duration;
+static gint hf_ipmi_trn_serial09_ring_dead;
+
+static gint hf_ipmi_trn_serial10_set_sel;
+static gint hf_ipmi_trn_serial10_init_str;
+static gint hf_ipmi_trn_serial11_esc_seq;
+static gint hf_ipmi_trn_serial12_hangup_seq;
+static gint hf_ipmi_trn_serial13_dial_cmd;
+static gint hf_ipmi_trn_serial14_page_blackout;
+static gint hf_ipmi_trn_serial15_comm_string;
+
+static gint hf_ipmi_trn_serial16_ndest;
+
+static gint hf_ipmi_trn_serial17_dest_sel;
+static gint hf_ipmi_trn_serial17_ack;
+static gint hf_ipmi_trn_serial17_dest_type;
+/* static gint hf_ipmi_trn_serial17_ack_timeout; */
+static gint hf_ipmi_trn_serial17_alert_retries;
+static gint hf_ipmi_trn_serial17_call_retries;
+static gint hf_ipmi_trn_serial17_alert_ack_timeout;
+static gint hf_ipmi_trn_serial17_dialstr_sel;
+static gint hf_ipmi_trn_serial17_tap_sel;
+static gint hf_ipmi_trn_serial17_ipaddr_sel;
+static gint hf_ipmi_trn_serial17_ppp_sel;
+static gint hf_ipmi_trn_serial17_unknown;
+
+static gint hf_ipmi_trn_serial18_call_retry;
+
+static gint hf_ipmi_trn_serial19_destsel;
+static gint hf_ipmi_trn_serial19_flowctl;
+static gint hf_ipmi_trn_serial19_dtrhangup;
+static gint hf_ipmi_trn_serial19_stopbits;
+static gint hf_ipmi_trn_serial19_charsize;
+static gint hf_ipmi_trn_serial19_parity;
+static gint hf_ipmi_trn_serial19_bitrate;
+
+static gint hf_ipmi_trn_serial20_num_dial_strings;
+static gint hf_ipmi_trn_serial21_dialsel;
+static gint hf_ipmi_trn_serial21_blockno;
+static gint hf_ipmi_trn_serial21_dialstr;
+static gint hf_ipmi_trn_serial22_num_ipaddrs;
+static gint hf_ipmi_trn_serial23_destsel;
+static gint hf_ipmi_trn_serial23_ipaddr;
+static gint hf_ipmi_trn_serial24_num_tap_accounts;
+static gint hf_ipmi_trn_serial25_tap_acct;
+static gint hf_ipmi_trn_serial25_dialstr_sel;
+static gint hf_ipmi_trn_serial25_tapsrv_sel;
+static gint hf_ipmi_trn_serial26_tap_acct;
+static gint hf_ipmi_trn_serial26_tap_passwd;
+static gint hf_ipmi_trn_serial27_tap_acct;
+static gint hf_ipmi_trn_serial27_tap_pager_id;
+
+static gint hf_ipmi_trn_serial28_tapsrv_sel;
+static gint hf_ipmi_trn_serial28_confirm;
+static gint hf_ipmi_trn_serial28_srvtype;
+static gint hf_ipmi_trn_serial28_ctrl_esc;
+static gint hf_ipmi_trn_serial28_t2;
+static gint hf_ipmi_trn_serial28_t1;
+static gint hf_ipmi_trn_serial28_t4;
+static gint hf_ipmi_trn_serial28_t3;
+static gint hf_ipmi_trn_serial28_t6;
+static gint hf_ipmi_trn_serial28_t5;
+static gint hf_ipmi_trn_serial28_n2;
+static gint hf_ipmi_trn_serial28_n1;
+static gint hf_ipmi_trn_serial28_n4;
+static gint hf_ipmi_trn_serial28_n3;
+
+static gint hf_ipmi_trn_serial29_op;
+static gint hf_ipmi_trn_serial29_lineedit;
+static gint hf_ipmi_trn_serial29_deletectl;
+static gint hf_ipmi_trn_serial29_echo;
+static gint hf_ipmi_trn_serial29_handshake;
+static gint hf_ipmi_trn_serial29_o_newline;
+static gint hf_ipmi_trn_serial29_i_newline;
+static gint hf_ipmi_trn_serial30_snooping;
+static gint hf_ipmi_trn_serial30_snoopctl;
+static gint hf_ipmi_trn_serial30_negot_ctl;
+static gint hf_ipmi_trn_serial30_use_xmit_accm;
+static gint hf_ipmi_trn_serial30_xmit_addr_comp;
+static gint hf_ipmi_trn_serial30_xmit_proto_comp;
+static gint hf_ipmi_trn_serial30_ipaddr;
+static gint hf_ipmi_trn_serial30_accm;
+static gint hf_ipmi_trn_serial30_addr_comp;
+static gint hf_ipmi_trn_serial30_proto_comp;
+static gint hf_ipmi_trn_serial31_port;
+static gint hf_ipmi_trn_serial32_port;
+static gint hf_ipmi_trn_serial33_auth_proto;
+static gint hf_ipmi_trn_serial34_chap_name;
+
+static gint hf_ipmi_trn_serial35_recv_accm;
+static gint hf_ipmi_trn_serial35_xmit_accm;
+static gint hf_ipmi_trn_serial36_snoop_accm;
+static gint hf_ipmi_trn_serial37_num_ppp;
+static gint hf_ipmi_trn_serial38_acct_sel;
+static gint hf_ipmi_trn_serial38_dialstr_sel;
+static gint hf_ipmi_trn_serial39_acct_sel;
+static gint hf_ipmi_trn_serial39_ipaddr;
+static gint hf_ipmi_trn_serial40_acct_sel;
+static gint hf_ipmi_trn_serial40_username;
+static gint hf_ipmi_trn_serial41_acct_sel;
+static gint hf_ipmi_trn_serial41_userdomain;
+static gint hf_ipmi_trn_serial42_acct_sel;
+static gint hf_ipmi_trn_serial42_userpass;
+static gint hf_ipmi_trn_serial43_acct_sel;
+static gint hf_ipmi_trn_serial43_auth_proto;
+static gint hf_ipmi_trn_serial44_acct_sel;
+static gint hf_ipmi_trn_serial44_hold_time;
+
+static gint hf_ipmi_trn_serial45_src_ipaddr;
+static gint hf_ipmi_trn_serial45_dst_ipaddr;
+static gint hf_ipmi_trn_serial46_tx_bufsize;
+static gint hf_ipmi_trn_serial47_rx_bufsize;
+static gint hf_ipmi_trn_serial48_ipaddr;
+static gint hf_ipmi_trn_serial49_blockno;
+static gint hf_ipmi_trn_serial49_dialstr;
+static gint hf_ipmi_trn_serial50_115200;
+static gint hf_ipmi_trn_serial50_57600;
+static gint hf_ipmi_trn_serial50_38400;
+static gint hf_ipmi_trn_serial50_19200;
+static gint hf_ipmi_trn_serial50_9600;
+
+static gint hf_ipmi_trn_serial51_port_assoc_sel;
+static gint hf_ipmi_trn_serial51_ipmi_channel;
+static gint hf_ipmi_trn_serial51_conn_num;
+static gint hf_ipmi_trn_serial51_ipmi_sharing;
+static gint hf_ipmi_trn_serial51_ipmi_sol;
+static gint hf_ipmi_trn_serial51_chan_num;
+static gint hf_ipmi_trn_serial52_port_assoc_sel;
+static gint hf_ipmi_trn_serial52_conn_name;
+static gint hf_ipmi_trn_serial53_port_assoc_sel;
+static gint hf_ipmi_trn_serial53_chan_name;
+
+static gint hf_ipmi_trn_01_chan;
+static gint hf_ipmi_trn_01_param;
+static gint hf_ipmi_trn_01_param_data;
+
+static gint hf_ipmi_trn_02_getrev;
+static gint hf_ipmi_trn_02_chan;
+static gint hf_ipmi_trn_02_param;
+static gint hf_ipmi_trn_02_set;
+static gint hf_ipmi_trn_02_block;
+static gint hf_ipmi_trn_02_rev_present;
+static gint hf_ipmi_trn_02_rev_compat;
+static gint hf_ipmi_trn_02_param_data;
+
+static gint hf_ipmi_trn_03_chan;
+static gint hf_ipmi_trn_03_arp_resp;
+static gint hf_ipmi_trn_03_gratuitous_arp;
+static gint hf_ipmi_trn_03_status_arp_resp;
+static gint hf_ipmi_trn_03_status_gratuitous_arp;
+
+static gint hf_ipmi_trn_04_chan;
+static gint hf_ipmi_trn_04_clear;
+static gint hf_ipmi_trn_04_rx_ippkts;
+static gint hf_ipmi_trn_04_rx_iphdr_err;
+static gint hf_ipmi_trn_04_rx_ipaddr_err;
+static gint hf_ipmi_trn_04_rx_ippkts_frag;
+static gint hf_ipmi_trn_04_tx_ippkts;
+static gint hf_ipmi_trn_04_rx_udppkts;
+static gint hf_ipmi_trn_04_rx_validrmcp;
+static gint hf_ipmi_trn_04_rx_udpproxy;
+static gint hf_ipmi_trn_04_dr_udpproxy;
+
+static gint hf_ipmi_trn_10_chan;
+static gint hf_ipmi_trn_10_param;
+static gint hf_ipmi_trn_10_param_data;
+
+static gint hf_ipmi_trn_11_getrev;
+static gint hf_ipmi_trn_11_chan;
+static gint hf_ipmi_trn_11_param;
+static gint hf_ipmi_trn_11_set;
+static gint hf_ipmi_trn_11_block;
+static gint hf_ipmi_trn_11_rev_present;
+static gint hf_ipmi_trn_11_rev_compat;
+static gint hf_ipmi_trn_11_param_data;
+
+static gint hf_ipmi_trn_12_chan;
+static gint hf_ipmi_trn_12_mux_setting;
+static gint hf_ipmi_trn_12_sw_to_sys;
+static gint hf_ipmi_trn_12_sw_to_bmc;
+static gint hf_ipmi_trn_12_alert;
+static gint hf_ipmi_trn_12_msg;
+static gint hf_ipmi_trn_12_req;
+static gint hf_ipmi_trn_12_mux_state;
+
+static gint hf_ipmi_trn_13_chan;
+static gint hf_ipmi_trn_13_code1;
+static gint hf_ipmi_trn_13_code2;
+static gint hf_ipmi_trn_13_code3;
+static gint hf_ipmi_trn_13_code4;
+static gint hf_ipmi_trn_13_code5;
+
+static gint hf_ipmi_trn_14_chan;
+static gint hf_ipmi_trn_14_block;
+static gint hf_ipmi_trn_14_data;
+
+static gint hf_ipmi_trn_15_chan;
+static gint hf_ipmi_trn_15_block;
+static gint hf_ipmi_trn_15_data;
+
+static gint hf_ipmi_trn_16_chan;
+static gint hf_ipmi_trn_16_src_port;
+static gint hf_ipmi_trn_16_dst_port;
+static gint hf_ipmi_trn_16_src_addr;
+static gint hf_ipmi_trn_16_dst_addr;
+static gint hf_ipmi_trn_16_bytes;
+
+static gint hf_ipmi_trn_17_chan;
+static gint hf_ipmi_trn_17_clear;
+static gint hf_ipmi_trn_17_block_num;
+static gint hf_ipmi_trn_17_size;
+static gint hf_ipmi_trn_17_data;
+
+static gint hf_ipmi_trn_18_state;
+static gint hf_ipmi_trn_18_ipmi_ver;
+
+static gint hf_ipmi_trn_19_chan;
+static gint hf_ipmi_trn_19_dest_sel;
+
+static gint hf_ipmi_trn_XX_cap_cbcp;
+static gint hf_ipmi_trn_XX_cap_ipmi;
+static gint hf_ipmi_trn_XX_cbcp_from_list;
+static gint hf_ipmi_trn_XX_cbcp_user;
+static gint hf_ipmi_trn_XX_cbcp_prespec;
+static gint hf_ipmi_trn_XX_cbcp_nocb;
+static gint hf_ipmi_trn_XX_dst1;
+static gint hf_ipmi_trn_XX_dst2;
+static gint hf_ipmi_trn_XX_dst3;
+
+static gint hf_ipmi_trn_1a_user;
+static gint hf_ipmi_trn_1a_chan;
+
+static gint hf_ipmi_trn_1b_user;
+static gint hf_ipmi_trn_1b_chan;
+
+static expert_field ei_ipmi_trn_02_request_param_rev;
+static expert_field ei_ipmi_trn_02_request_param_data;
+static expert_field ei_ipmi_trn_11_request_param_rev;
+static expert_field ei_ipmi_trn_11_request_param_data;
 
 static const value_string lan00_sip_vals[] = {
 	{ 0x00, "Set complete" },
diff --git a/epan/dissectors/packet-ipmi-vita.c b/epan/dissectors/packet-ipmi-vita.c
index f4939c2289..eb433b5f40 100644
--- a/epan/dissectors/packet-ipmi-vita.c
+++ b/epan/dissectors/packet-ipmi-vita.c
@@ -19,158 +19,158 @@ void proto_register_ipmi_vita(void);
 
 /* Tree type identifiers.
 */
-static gint ett_vita_ipmc = -1;
-static gint ett_vita_ipmb = -1;
-static gint ett_vita_vso = -1;
-static gint ett_vita_led_caps = -1;
-static gint ett_vita_led_color = -1;
-static gint ett_vita_led_flags = -1;
-static gint ett_vita_led_states = -1;
-static gint ett_vita_ipmb_state = -1;
-static gint ett_vita_fru_policy_bits = -1;
-static gint ett_vita_fan_properties = -1;
-static gint ett_vita_fru_control_caps = -1;
-static gint ett_vita_chassis_addr_type = -1;
-static gint ett_vita_chassis_addr = -1;
-static gint ett_vita_persistent_control_state = -1;
-static gint ett_vita_persistent_control_caps = -1;
+static gint ett_vita_ipmc;
+static gint ett_vita_ipmb;
+static gint ett_vita_vso;
+static gint ett_vita_led_caps;
+static gint ett_vita_led_color;
+static gint ett_vita_led_flags;
+static gint ett_vita_led_states;
+static gint ett_vita_ipmb_state;
+static gint ett_vita_fru_policy_bits;
+static gint ett_vita_fan_properties;
+static gint ett_vita_fru_control_caps;
+static gint ett_vita_chassis_addr_type;
+static gint ett_vita_chassis_addr;
+static gint ett_vita_persistent_control_state;
+static gint ett_vita_persistent_control_caps;
 
 /* Field identifiers.
 */
-static gint hf_vita_reserved = -1;
-static gint hf_vita_fruid = -1;
-static gint hf_vita_addr_key_type = -1;
-static gint hf_vita_addr_key = -1;
-static gint hf_vita_hw_addr = -1;
-static gint hf_vita_ipmb_addr = -1;
-static gint hf_vita_site_type = -1;
-static gint hf_vita_site_num = -1;
-static gint hf_vita_ipmbl_addr = -1;
-
-static gint hf_vita_chassis_identifier = -1;
-static gint hf_vita_chassis_identifier_type = -1;
-static gint hf_vita_chassis_identifier_length = -1;
-static gint hf_vita_ipmc = -1;
-static gint hf_vita_tier = -1;
-static gint hf_vita_layer = -1;
-static gint hf_vita_ipmb = -1;
-static gint hf_vita_ipmb_itfs = -1;
-static gint hf_vita_ipmb_freq = -1;
-static gint hf_vita_vso = -1;
-static gint hf_vita_vso_std = -1;
-static gint hf_vita_rev = -1;
-static gint hf_vita_max_fruid = -1;
-static gint hf_vita_ipmc_fruid = -1;
-static gint hf_vita_fru_control = -1;
-
-static gint hf_vita_led_count = -1;
-static gint hf_vita_led_id = -1;
-static gint hf_vita_led_caps = -1;
-static gint hf_vita_led_cap_blue = -1;
-static gint hf_vita_led_cap_red = -1;
-static gint hf_vita_led_cap_green = -1;
-static gint hf_vita_led_cap_amber = -1;
-static gint hf_vita_led_cap_orange = -1;
-static gint hf_vita_led_cap_white = -1;
-static gint hf_vita_led_def_loc_color = -1;
-static gint hf_vita_led_def_ovr_color = -1;
-static gint hf_vita_led_color = -1;
-static gint hf_vita_led_flags = -1;
-static gint hf_vita_led_flag_pwr = -1;
-static gint hf_vita_led_flag_hw_restrict = -1;
-static gint hf_vita_led_states = -1;
-static gint hf_vita_led_loc_func = -1;
-static gint hf_vita_led_loc_duration = -1;
-static gint hf_vita_led_loc_color = -1;
-static gint hf_vita_led_ovr_func = -1;
-static gint hf_vita_led_ovr_duration = -1;
-static gint hf_vita_led_ovr_color = -1;
-static gint hf_vita_led_lamp_test_duration = -1;
-static gint hf_vita_led_state_local = -1;
-static gint hf_vita_led_state_override = -1;
-static gint hf_vita_led_state_lamp_test = -1;
-static gint hf_vita_led_state_hw_restrict = -1;
-
-static gint hf_vita_ipmba_state = -1;
-static gint hf_vita_ipmbb_state = -1;
-static gint hf_vita_ipmb_state = -1;
-static gint hf_vita_ipmb_link_id = -1;
-
-static gint hf_vita_fru_policy_mask_bits = -1;
-static gint hf_vita_fru_policy_set_bits = -1;
-static gint hf_vita_fru_policy_bits = -1;
-static gint hf_vita_fru_activation_locked = -1;
-static gint hf_vita_fru_deactivation_locked = -1;
-static gint hf_vita_fru_commanded_deactivation_ignored = -1;
-static gint hf_vita_fru_default_activation_locked = -1;
-
-static gint hf_vita_fru_activation = -1;
-
-static gint hf_vita_record_id = -1;
-
-static gint hf_vita_fan_min_level = -1;
-static gint hf_vita_fan_max_level = -1;
-static gint hf_vita_fan_norm_level = -1;
-static gint hf_vita_fan_properties = -1;
-static gint hf_vita_fan_prop_local_control = -1;
-static gint hf_vita_fan_override_level = -1;
-static gint hf_vita_fan_local_level = -1;
-static gint hf_vita_fan_local_control = -1;
-
-static gint hf_vita_ipmb_link_key_type = -1;
-static gint hf_vita_ipmb_link_key_value = -1;
-static gint hf_vita_ipmb_link_number = -1;
-static gint hf_vita_ipmb_sensor_number = -1;
-
-static gint hf_vita_active_chmc_ipmb_addr = -1;
-static gint hf_vita_backup_chmc_ipmb_addr = -1;
-
-static gint hf_vita_fan_number = -1;
-static gint hf_vita_fan_policy = -1;
-static gint hf_vita_fan_policy_timeout = -1;
-static gint hf_vita_fan_coverage = -1;
-
-static gint hf_vita_fru_control_caps = -1;
-static gint hf_vita_fru_control_cap_cold = -1;
-static gint hf_vita_fru_control_cap_warm = -1;
-static gint hf_vita_fru_control_cap_grace = -1;
-static gint hf_vita_fru_control_cap_diag = -1;
-static gint hf_vita_fru_control_cap_pwr = -1;
-
-static gint hf_vita_fru_lock_operation = -1;
-static gint hf_vita_fru_lock_id = -1;
-static gint hf_vita_fru_lock_timestamp = -1;
-
-static gint hf_vita_fru_write_offset = -1;
-static gint hf_vita_fru_write_data = -1;
-static gint hf_vita_fru_write_count = -1;
-
-static gint hf_vita_chassis_addr_number = -1;
-static gint hf_vita_chassis_addr_timestamp = -1;
-static gint hf_vita_chassis_addr_count = -1;
-static gint hf_vita_chassis_max_unavail = -1;
-static gint hf_vita_chassis_addr_type = -1;
-static gint hf_vita_chassis_addr = -1;
-static gint hf_vita_chassis_addr_chmc = -1;
-static gint hf_vita_chassis_addr_format = -1;
-static gint hf_vita_ipv4_addr = -1;
-static gint hf_vita_rmcp_port = -1;
-
-static gint hf_vita_persistent_control_state = -1;
-static gint hf_vita_persistent_control_cold = -1;
-static gint hf_vita_persistent_control_warm = -1;
-static gint hf_vita_persistent_control_mask = -1;
-static gint hf_vita_persistent_control_set = -1;
-static gint hf_vita_persistent_control_caps = -1;
-static gint hf_vita_persistent_control_cap_cold = -1;
-static gint hf_vita_persistent_control_cap_warm = -1;
-
-static gint hf_vita_fru_state_sensor_num = -1;
-static gint hf_vita_fru_health_sensor_num = -1;
-static gint hf_vita_fru_voltage_sensor_num = -1;
-static gint hf_vita_fru_temp_sensor_num = -1;
-static gint hf_vita_payload_test_results_sensor_num = -1;
-static gint hf_vita_payload_test_status_sensor_num = -1;
+static gint hf_vita_reserved;
+static gint hf_vita_fruid;
+static gint hf_vita_addr_key_type;
+static gint hf_vita_addr_key;
+static gint hf_vita_hw_addr;
+static gint hf_vita_ipmb_addr;
+static gint hf_vita_site_type;
+static gint hf_vita_site_num;
+static gint hf_vita_ipmbl_addr;
+
+static gint hf_vita_chassis_identifier;
+static gint hf_vita_chassis_identifier_type;
+static gint hf_vita_chassis_identifier_length;
+static gint hf_vita_ipmc;
+static gint hf_vita_tier;
+static gint hf_vita_layer;
+static gint hf_vita_ipmb;
+static gint hf_vita_ipmb_itfs;
+static gint hf_vita_ipmb_freq;
+static gint hf_vita_vso;
+static gint hf_vita_vso_std;
+static gint hf_vita_rev;
+static gint hf_vita_max_fruid;
+static gint hf_vita_ipmc_fruid;
+static gint hf_vita_fru_control;
+
+static gint hf_vita_led_count;
+static gint hf_vita_led_id;
+static gint hf_vita_led_caps;
+static gint hf_vita_led_cap_blue;
+static gint hf_vita_led_cap_red;
+static gint hf_vita_led_cap_green;
+static gint hf_vita_led_cap_amber;
+static gint hf_vita_led_cap_orange;
+static gint hf_vita_led_cap_white;
+static gint hf_vita_led_def_loc_color;
+static gint hf_vita_led_def_ovr_color;
+static gint hf_vita_led_color;
+static gint hf_vita_led_flags;
+static gint hf_vita_led_flag_pwr;
+static gint hf_vita_led_flag_hw_restrict;
+static gint hf_vita_led_states;
+static gint hf_vita_led_loc_func;
+static gint hf_vita_led_loc_duration;
+static gint hf_vita_led_loc_color;
+static gint hf_vita_led_ovr_func;
+static gint hf_vita_led_ovr_duration;
+static gint hf_vita_led_ovr_color;
+static gint hf_vita_led_lamp_test_duration;
+static gint hf_vita_led_state_local;
+static gint hf_vita_led_state_override;
+static gint hf_vita_led_state_lamp_test;
+static gint hf_vita_led_state_hw_restrict;
+
+static gint hf_vita_ipmba_state;
+static gint hf_vita_ipmbb_state;
+static gint hf_vita_ipmb_state;
+static gint hf_vita_ipmb_link_id;
+
+static gint hf_vita_fru_policy_mask_bits;
+static gint hf_vita_fru_policy_set_bits;
+static gint hf_vita_fru_policy_bits;
+static gint hf_vita_fru_activation_locked;
+static gint hf_vita_fru_deactivation_locked;
+static gint hf_vita_fru_commanded_deactivation_ignored;
+static gint hf_vita_fru_default_activation_locked;
+
+static gint hf_vita_fru_activation;
+
+static gint hf_vita_record_id;
+
+static gint hf_vita_fan_min_level;
+static gint hf_vita_fan_max_level;
+static gint hf_vita_fan_norm_level;
+static gint hf_vita_fan_properties;
+static gint hf_vita_fan_prop_local_control;
+static gint hf_vita_fan_override_level;
+static gint hf_vita_fan_local_level;
+static gint hf_vita_fan_local_control;
+
+static gint hf_vita_ipmb_link_key_type;
+static gint hf_vita_ipmb_link_key_value;
+static gint hf_vita_ipmb_link_number;
+static gint hf_vita_ipmb_sensor_number;
+
+static gint hf_vita_active_chmc_ipmb_addr;
+static gint hf_vita_backup_chmc_ipmb_addr;
+
+static gint hf_vita_fan_number;
+static gint hf_vita_fan_policy;
+static gint hf_vita_fan_policy_timeout;
+static gint hf_vita_fan_coverage;
+
+static gint hf_vita_fru_control_caps;
+static gint hf_vita_fru_control_cap_cold;
+static gint hf_vita_fru_control_cap_warm;
+static gint hf_vita_fru_control_cap_grace;
+static gint hf_vita_fru_control_cap_diag;
+static gint hf_vita_fru_control_cap_pwr;
+
+static gint hf_vita_fru_lock_operation;
+static gint hf_vita_fru_lock_id;
+static gint hf_vita_fru_lock_timestamp;
+
+static gint hf_vita_fru_write_offset;
+static gint hf_vita_fru_write_data;
+static gint hf_vita_fru_write_count;
+
+static gint hf_vita_chassis_addr_number;
+static gint hf_vita_chassis_addr_timestamp;
+static gint hf_vita_chassis_addr_count;
+static gint hf_vita_chassis_max_unavail;
+static gint hf_vita_chassis_addr_type;
+static gint hf_vita_chassis_addr;
+static gint hf_vita_chassis_addr_chmc;
+static gint hf_vita_chassis_addr_format;
+static gint hf_vita_ipv4_addr;
+static gint hf_vita_rmcp_port;
+
+static gint hf_vita_persistent_control_state;
+static gint hf_vita_persistent_control_cold;
+static gint hf_vita_persistent_control_warm;
+static gint hf_vita_persistent_control_mask;
+static gint hf_vita_persistent_control_set;
+static gint hf_vita_persistent_control_caps;
+static gint hf_vita_persistent_control_cap_cold;
+static gint hf_vita_persistent_control_cap_warm;
+
+static gint hf_vita_fru_state_sensor_num;
+static gint hf_vita_fru_health_sensor_num;
+static gint hf_vita_fru_voltage_sensor_num;
+static gint hf_vita_fru_temp_sensor_num;
+static gint hf_vita_payload_test_results_sensor_num;
+static gint hf_vita_payload_test_status_sensor_num;
 
 /* String values.
 */
diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c
index add8257ece..26efb23a4e 100644
--- a/epan/dissectors/packet-ipmi.c
+++ b/epan/dissectors/packet-ipmi.c
@@ -120,10 +120,10 @@ typedef struct {
 /* Maximum nest level where it worth caching data */
 #define MAX_NEST_LEVEL	3
 
-gint proto_ipmi = -1;
-static gint proto_ipmb = -1;
-static gint proto_kcs = -1;
-static gint proto_tmode = -1;
+gint proto_ipmi;
+static gint proto_ipmb;
+static gint proto_kcs;
+static gint proto_tmode;
 
 /* WARNING: Setting this to true might result in the entire dissector being
    disabled by default or removed completely. */
@@ -134,32 +134,32 @@ static guint response_before_req = 0;
 static guint message_format = MSGFMT_GUESS;
 static guint selected_oem = IPMI_OEM_NONE;
 
-static gint hf_ipmi_command_data = -1;
-static gint hf_ipmi_session_handle = -1;
-static gint hf_ipmi_header_trg = -1;
-static gint hf_ipmi_header_trg_lun = -1;
-static gint hf_ipmi_header_netfn = -1;
-static gint hf_ipmi_header_crc = -1;
-static gint hf_ipmi_header_src = -1;
-static gint hf_ipmi_header_src_lun = -1;
-static gint hf_ipmi_header_bridged = -1;
-static gint hf_ipmi_header_sequence = -1;
-static gint hf_ipmi_header_command = -1;
-static gint hf_ipmi_header_completion = -1;
-static gint hf_ipmi_header_sig = -1;
-static gint hf_ipmi_data_crc = -1;
-static gint hf_ipmi_response_to = -1;
-static gint hf_ipmi_response_in = -1;
-static gint hf_ipmi_response_time = -1;
-
-static gint ett_ipmi = -1;
-static gint ett_header = -1;
-static gint ett_header_byte_1 = -1;
-static gint ett_header_byte_4 = -1;
-static gint ett_data = -1;
-static gint ett_typelen = -1;
-
-static expert_field ei_impi_parser_not_implemented = EI_INIT;
+static gint hf_ipmi_command_data;
+static gint hf_ipmi_session_handle;
+static gint hf_ipmi_header_trg;
+static gint hf_ipmi_header_trg_lun;
+static gint hf_ipmi_header_netfn;
+static gint hf_ipmi_header_crc;
+static gint hf_ipmi_header_src;
+static gint hf_ipmi_header_src_lun;
+static gint hf_ipmi_header_bridged;
+static gint hf_ipmi_header_sequence;
+static gint hf_ipmi_header_command;
+static gint hf_ipmi_header_completion;
+static gint hf_ipmi_header_sig;
+static gint hf_ipmi_data_crc;
+static gint hf_ipmi_response_to;
+static gint hf_ipmi_response_in;
+static gint hf_ipmi_response_time;
+
+static gint ett_ipmi;
+static gint ett_header;
+static gint ett_header_byte_1;
+static gint ett_header_byte_4;
+static gint ett_data;
+static gint ett_typelen;
+
+static expert_field ei_impi_parser_not_implemented;
 
 static struct ipmi_netfn_root ipmi_cmd_tab[IPMI_NETFN_MAX];
 
diff --git a/epan/dissectors/packet-ipnet.c b/epan/dissectors/packet-ipnet.c
index 6e47db3213..34297ae0a5 100644
--- a/epan/dissectors/packet-ipnet.c
+++ b/epan/dissectors/packet-ipnet.c
@@ -17,17 +17,17 @@
 void proto_register_ipnet(void);
 void proto_reg_handoff_ipnet(void);
 
-static int proto_ipnet   = -1;
-static int hf_version    = -1;
-static int hf_family     = -1;
-static int hf_htype      = -1;
-static int hf_pktlen     = -1;
-static int hf_ifindex    = -1;
-static int hf_grifindex  = -1;
-static int hf_zsrc       = -1;
-static int hf_zdst       = -1;
-
-static gint ett_raw = -1;
+static int proto_ipnet;
+static int hf_version;
+static int hf_family;
+static int hf_htype;
+static int hf_pktlen;
+static int hf_ifindex;
+static int hf_grifindex;
+static int hf_zsrc;
+static int hf_zdst;
+
+static gint ett_raw;
 
 static dissector_handle_t ipnet_handle;
 static dissector_handle_t ip_handle;
diff --git a/epan/dissectors/packet-ipoib.c b/epan/dissectors/packet-ipoib.c
index dc64828120..6a1db9d615 100644
--- a/epan/dissectors/packet-ipoib.c
+++ b/epan/dissectors/packet-ipoib.c
@@ -20,21 +20,21 @@ void proto_reg_handoff_ipoib(void);
 
 static dissector_handle_t ipoib_handle;
 
-static int proto_ipoib          = -1;
-static int hf_dgid              = -1;
-static int hf_daddr             = -1;
-static int hf_daddr_qpn         = -1;
-static int hf_grh               = -1;
-static int hf_grh_ip_version    = -1;
-static int hf_grh_traffic_class = -1;
-static int hf_grh_flow_label    = -1;
-static int hf_grh_sqpn          = -1;
-static int hf_grh_sgid          = -1;
-static int hf_type              = -1;
-static int hf_reserved          = -1;
-
-static gint ett_raw = -1;
-static gint ett_hdr = -1;
+static int proto_ipoib;
+static int hf_dgid;
+static int hf_daddr;
+static int hf_daddr_qpn;
+static int hf_grh;
+static int hf_grh_ip_version;
+static int hf_grh_traffic_class;
+static int hf_grh_flow_label;
+static int hf_grh_sqpn;
+static int hf_grh_sgid;
+static int hf_type;
+static int hf_reserved;
+
+static gint ett_raw;
+static gint ett_hdr;
 
 static dissector_handle_t arp_handle;
 static dissector_handle_t ip_handle;
diff --git a/epan/dissectors/packet-ipos.c b/epan/dissectors/packet-ipos.c
index 4441d0a200..b50cb6b2cf 100644
--- a/epan/dissectors/packet-ipos.c
+++ b/epan/dissectors/packet-ipos.c
@@ -33,14 +33,14 @@ void proto_register_ipos(void);
 static dissector_handle_t ipos_handle;
 static dissector_handle_t redback_handle;
 
-static int proto_ipos = -1;
-static int hf_ipos_protocol = -1;
-static int hf_ipos_priority = -1;
-static int hf_ipos_ppe = -1;
-static int hf_ipos_slot = -1;
-static gint ett_ipos = -1;
-
-/* static expert_field ei_ipos_protocol = EI_INIT; */
+static int proto_ipos;
+static int hf_ipos_protocol;
+static int hf_ipos_priority;
+static int hf_ipos_ppe;
+static int hf_ipos_slot;
+static gint ett_ipos;
+
+/* static expert_field ei_ipos_protocol; */
 
 #define LINUX_SLL_P_IPOS_NETIPC	 0x0030	/* IPOS IPC frames to/from AF_IPC module */
 #define LINUX_SLL_P_IPOS_RBN     0x0031  /* IPOS IP frames to/from CTX module */
diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c
index 8c6941d56d..2b83100254 100644
--- a/epan/dissectors/packet-ipp.c
+++ b/epan/dissectors/packet-ipp.c
@@ -29,38 +29,38 @@ void proto_reg_handoff_ipp(void);
 
 static dissector_handle_t ipp_handle;
 
-static int proto_ipp = -1;
+static int proto_ipp;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_ipp_version = -1;
-static int hf_ipp_operation_id = -1;
-static int hf_ipp_status_code = -1;
-static int hf_ipp_request_id = -1;
-static int hf_ipp_name = -1;
-static int hf_ipp_memberattrname = -1;
-static int hf_ipp_outofband_value = -1;
-static int hf_ipp_charstring_value = -1;
-static int hf_ipp_boolean_value = -1;
-static int hf_ipp_enum_value = -1;
-static int hf_ipp_enum_value_printer_state = -1;
-static int hf_ipp_enum_value_job_state = -1;
-static int hf_ipp_enum_value_document_state = -1;
-static int hf_ipp_enum_value_operations_supported = -1;
-static int hf_ipp_enum_value_finishings = -1;
-static int hf_ipp_enum_value_orientation = -1;
-static int hf_ipp_enum_value_print_quality = -1;
-static int hf_ipp_enum_value_transmission_status = -1;
-static int hf_ipp_integer_value = -1;
-static int hf_ipp_octetstring_value = -1;
-static int hf_ipp_datetime_value = -1;
-static int hf_ipp_resolution_value = -1;
-static int hf_ipp_rangeofinteger_value = -1;
-static int hf_ipp_textwithlanguage_value = -1;
-static int hf_ipp_namewithlanguage_value = -1;
-static int hf_ipp_unknown_value = -1;
-
-static int hf_ipp_response_in = -1;
-static int hf_ipp_response_to = -1;
-static int hf_ipp_response_time = -1;
+static int hf_ipp_version;
+static int hf_ipp_operation_id;
+static int hf_ipp_status_code;
+static int hf_ipp_request_id;
+static int hf_ipp_name;
+static int hf_ipp_memberattrname;
+static int hf_ipp_outofband_value;
+static int hf_ipp_charstring_value;
+static int hf_ipp_boolean_value;
+static int hf_ipp_enum_value;
+static int hf_ipp_enum_value_printer_state;
+static int hf_ipp_enum_value_job_state;
+static int hf_ipp_enum_value_document_state;
+static int hf_ipp_enum_value_operations_supported;
+static int hf_ipp_enum_value_finishings;
+static int hf_ipp_enum_value_orientation;
+static int hf_ipp_enum_value_print_quality;
+static int hf_ipp_enum_value_transmission_status;
+static int hf_ipp_integer_value;
+static int hf_ipp_octetstring_value;
+static int hf_ipp_datetime_value;
+static int hf_ipp_resolution_value;
+static int hf_ipp_rangeofinteger_value;
+static int hf_ipp_textwithlanguage_value;
+static int hf_ipp_namewithlanguage_value;
+static int hf_ipp_unknown_value;
+
+static int hf_ipp_response_in;
+static int hf_ipp_response_to;
+static int hf_ipp_response_time;
 
 typedef struct _ipp_transaction_t {
         guint32 req_frame;
@@ -72,10 +72,10 @@ typedef struct _ipp_conv_info_t {
         wmem_map_t *pdus;
 } ipp_conv_info_t;
 
-static gint ett_ipp = -1;
-static gint ett_ipp_as = -1;
-static gint ett_ipp_attr = -1;
-static gint ett_ipp_member = -1;
+static gint ett_ipp;
+static gint ett_ipp_as;
+static gint ett_ipp_attr;
+static gint ett_ipp_member;
 
 #define PRINT_JOB              0x0002
 #define PRINT_URI              0x0003
diff --git a/epan/dissectors/packet-ippusb.c b/epan/dissectors/packet-ippusb.c
index c00b34bec9..02edb7a8c3 100644
--- a/epan/dissectors/packet-ippusb.c
+++ b/epan/dissectors/packet-ippusb.c
@@ -51,28 +51,28 @@ static gint is_http_header(guint first_linelen, const guchar *first_line);
 
 static dissector_handle_t ippusb_handle;
 
-static gint proto_ippusb = -1;
-static gint ett_ippusb = -1;
-static gint ett_ippusb_as = -1;
-static gint ett_ippusb_attr = -1;
-static gint ett_ippusb_member = -1;
-static gint ett_ippusb_fragment= -1;
-static gint ett_ippusb_fragments = -1;
+static gint proto_ippusb;
+static gint ett_ippusb;
+static gint ett_ippusb_as;
+static gint ett_ippusb_attr;
+static gint ett_ippusb_member;
+static gint ett_ippusb_fragment;
+static gint ett_ippusb_fragments;
 
 /* For reassembly */
 static gint32 ippusb_last_pdu = -1;
 
-static int hf_ippusb_fragments = -1;
-static int hf_ippusb_fragment = -1;
-static int hf_ippusb_fragment_overlap = -1;
-static int hf_ippusb_fragment_overlap_conflict = -1;
-static int hf_ippusb_fragment_multiple_tails = -1;
-static int hf_ippusb_fragment_too_long_fragment = -1;
-static int hf_ippusb_fragment_error = -1;
-static int hf_ippusb_fragment_count = -1;
-static int hf_ippusb_reassembled_in = -1;
-static int hf_ippusb_reassembled_length = -1;
-static int hf_ippusb_reassembled_data = -1;
+static int hf_ippusb_fragments;
+static int hf_ippusb_fragment;
+static int hf_ippusb_fragment_overlap;
+static int hf_ippusb_fragment_overlap_conflict;
+static int hf_ippusb_fragment_multiple_tails;
+static int hf_ippusb_fragment_too_long_fragment;
+static int hf_ippusb_fragment_error;
+static int hf_ippusb_fragment_count;
+static int hf_ippusb_reassembled_in;
+static int hf_ippusb_reassembled_length;
+static int hf_ippusb_reassembled_data;
 
 /* Reassemble by default */
 static gboolean global_ippusb_reassemble = TRUE;
diff --git a/epan/dissectors/packet-ipsec-tcp.c b/epan/dissectors/packet-ipsec-tcp.c
index 82f834de5e..c70420bcab 100644
--- a/epan/dissectors/packet-ipsec-tcp.c
+++ b/epan/dissectors/packet-ipsec-tcp.c
@@ -27,18 +27,18 @@ void proto_reg_handoff_tcpencap(void);
 
 static dissector_handle_t tcpencap_handle;
 
-static int hf_tcpencap_unknown = -1;
-static int hf_tcpencap_zero = -1;
-static int hf_tcpencap_seq = -1;
-static int hf_tcpencap_ike_direction = -1;
-static int hf_tcpencap_esp_zero = -1;
-static int hf_tcpencap_magic = -1;
-static int hf_tcpencap_proto = -1;
-static int hf_tcpencap_magic2 = -1;
-
-static int proto_tcpencap = -1;
-static gint ett_tcpencap = -1;
-static gint ett_tcpencap_unknown = -1;
+static int hf_tcpencap_unknown;
+static int hf_tcpencap_zero;
+static int hf_tcpencap_seq;
+static int hf_tcpencap_ike_direction;
+static int hf_tcpencap_esp_zero;
+static int hf_tcpencap_magic;
+static int hf_tcpencap_proto;
+static int hf_tcpencap_magic2;
+
+static int proto_tcpencap;
+static gint ett_tcpencap;
+static gint ett_tcpencap_unknown;
 
 static const value_string tcpencap_ikedir_vals[] = {
 	{ 0x0000,	"Server to client" },
diff --git a/epan/dissectors/packet-ipsec-udp.c b/epan/dissectors/packet-ipsec-udp.c
index 04c95725c7..25a1087e8a 100644
--- a/epan/dissectors/packet-ipsec-udp.c
+++ b/epan/dissectors/packet-ipsec-udp.c
@@ -13,12 +13,12 @@ void proto_reg_handoff_udpencap(void);
 
 #define UDPENCAP_PORT 4500
 
-static int proto_udpencap = -1;
+static int proto_udpencap;
 
-static int hf_nat_keepalive = -1;
-static int hf_non_esp_marker = -1;
+static int hf_nat_keepalive;
+static int hf_non_esp_marker;
 
-static gint ett_udpencap = -1;
+static gint ett_udpencap;
 
 static dissector_handle_t udpencap_handle;
 static dissector_handle_t esp_handle;
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c
index b5b3bf1d01..7e8c24d3a8 100644
--- a/epan/dissectors/packet-ipsec.c
+++ b/epan/dissectors/packet-ipsec.c
@@ -80,41 +80,41 @@ ADD: Additional generic (non-checked) ICV length of 128, 192 and 256.
 void proto_register_ipsec(void);
 void proto_reg_handoff_ipsec(void);
 
-static int proto_ah = -1;
-static int hf_ah_next_header = -1;
-static int hf_ah_length = -1;
-static int hf_ah_reserved = -1;
-static int hf_ah_spi = -1;
-static int hf_ah_iv = -1;
-static int hf_ah_sequence = -1;
-static int proto_esp = -1;
-static int hf_esp_spi = -1;
-static int hf_esp_iv = -1;
-static int hf_esp_icv = -1;
-static int hf_esp_icv_good = -1;
-static int hf_esp_icv_bad = -1;
-static int hf_esp_sequence = -1;
-static int hf_esp_encrypted_data = -1;
-static int hf_esp_decrypted_data = -1;
-static int hf_esp_contained_data = -1;
-static int hf_esp_pad = -1;
-static int hf_esp_pad_len = -1;
-static int hf_esp_protocol = -1;
-static int hf_esp_sequence_analysis_expected_sn = -1;
-static int hf_esp_sequence_analysis_previous_frame = -1;
-
-static int proto_ipcomp = -1;
-static int hf_ipcomp_next_header = -1;
-static int hf_ipcomp_flags = -1;
-static int hf_ipcomp_cpi = -1;
-
-static gint ett_ah = -1;
-static gint ett_esp = -1;
-static gint ett_esp_icv = -1;
-static gint ett_esp_decrypted_data = -1;
-static gint ett_ipcomp = -1;
-
-static expert_field ei_esp_sequence_analysis_wrong_sequence_number = EI_INIT;
+static int proto_ah;
+static int hf_ah_next_header;
+static int hf_ah_length;
+static int hf_ah_reserved;
+static int hf_ah_spi;
+static int hf_ah_iv;
+static int hf_ah_sequence;
+static int proto_esp;
+static int hf_esp_spi;
+static int hf_esp_iv;
+static int hf_esp_icv;
+static int hf_esp_icv_good;
+static int hf_esp_icv_bad;
+static int hf_esp_sequence;
+static int hf_esp_encrypted_data;
+static int hf_esp_decrypted_data;
+static int hf_esp_contained_data;
+static int hf_esp_pad;
+static int hf_esp_pad_len;
+static int hf_esp_protocol;
+static int hf_esp_sequence_analysis_expected_sn;
+static int hf_esp_sequence_analysis_previous_frame;
+
+static int proto_ipcomp;
+static int hf_ipcomp_next_header;
+static int hf_ipcomp_flags;
+static int hf_ipcomp_cpi;
+
+static gint ett_ah;
+static gint ett_esp;
+static gint ett_esp_icv;
+static gint ett_esp_decrypted_data;
+static gint ett_ipcomp;
+
+static expert_field ei_esp_sequence_analysis_wrong_sequence_number;
 
 
 static gint exported_pdu_tap = -1;
diff --git a/epan/dissectors/packet-ipsi-ctl.c b/epan/dissectors/packet-ipsi-ctl.c
index 8dc73a10f7..7e22129e6c 100644
--- a/epan/dissectors/packet-ipsi-ctl.c
+++ b/epan/dissectors/packet-ipsi-ctl.c
@@ -24,18 +24,18 @@ static dissector_handle_t ipsictl_handle = NULL;
 #define IPSICTL_PORT            5010 /* Not IANA registered */
 #define IPSICTL_PDU_MAGIC       0x0300
 
-static int proto_ipsictl = -1;
-
-static int hf_ipsictl_pdu = -1;
-static int hf_ipsictl_magic = -1;
-static int hf_ipsictl_length = -1;
-static int hf_ipsictl_type = -1;
-static int hf_ipsictl_sequence = -1;
-static int hf_ipsictl_field1 = -1;
-static int hf_ipsictl_data = -1;
-
-static gint ett_ipsictl = -1;
-static gint ett_ipsictl_pdu = -1;
+static int proto_ipsictl;
+
+static int hf_ipsictl_pdu;
+static int hf_ipsictl_magic;
+static int hf_ipsictl_length;
+static int hf_ipsictl_type;
+static int hf_ipsictl_sequence;
+static int hf_ipsictl_field1;
+static int hf_ipsictl_data;
+
+static gint ett_ipsictl;
+static gint ett_ipsictl_pdu;
 
 static int dissect_ipsictl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 057593856f..2df102ae82 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -142,272 +142,272 @@ static int ipv6_tap  = -1;
 
 static int exported_pdu_tap = -1;
 
-static int proto_ipv6                           = -1;
-static int proto_ipv6_hopopts                   = -1;
-static int proto_ipv6_routing                   = -1;
-static int proto_ipv6_fraghdr                   = -1;
-static int proto_ipv6_dstopts                   = -1;
-
-static int proto_ipv6_routing_rt0               = -1;
-static int proto_ipv6_routing_mipv6             = -1;
-static int proto_ipv6_routing_rpl               = -1;
-static int proto_ipv6_routing_srh               = -1;
-static int proto_ipv6_routing_crh               = -1;
-
-static int hf_ipv6_version                      = -1;
-static int hf_ip_version                        = -1;
-static int hf_ipv6_tclass                       = -1;
-static int hf_ipv6_tclass_dscp                  = -1;
-static int hf_ipv6_tclass_ecn                   = -1;
-static int hf_ipv6_flow                         = -1;
-static int hf_ipv6_plen                         = -1;
-static int hf_ipv6_nxt                          = -1;
-static int hf_ipv6_hlim                         = -1;
-static int hf_ipv6_src                          = -1;
-static int hf_ipv6_src_addr_space               = -1;
-static int hf_ipv6_src_multicast_flags          = -1;
-static int hf_ipv6_src_multicast_flags_reserved = -1;
-static int hf_ipv6_src_multicast_flags_transient = -1;
-static int hf_ipv6_src_multicast_flags_network_prefix = -1;
-static int hf_ipv6_src_multicast_flags_embed_rp = -1;
-static int hf_ipv6_src_special_purpose          = -1;
-static int hf_ipv6_src_special_purpose_source   = -1;
-static int hf_ipv6_src_special_purpose_destination = -1;
-static int hf_ipv6_src_special_purpose_forwardable = -1;
-static int hf_ipv6_src_special_purpose_global   = -1;
-static int hf_ipv6_src_special_purpose_reserved = -1;
-static int hf_ipv6_src_multicast_scope          = -1;
-static int hf_ipv6_src_host                     = -1;
-static int hf_ipv6_src_slaac_mac                = -1;
-static int hf_ipv6_src_isatap_ipv4              = -1;
-static int hf_ipv6_src_6to4_gateway_ipv4        = -1;
-static int hf_ipv6_src_6to4_sla_id              = -1;
-static int hf_ipv6_src_teredo_server_ipv4       = -1;
-static int hf_ipv6_src_teredo_port              = -1;
-static int hf_ipv6_src_teredo_client_ipv4       = -1;
-static int hf_ipv6_src_embed_ipv4               = -1;
-static int hf_ipv6_dst                          = -1;
-static int hf_ipv6_dst_addr_space               = -1;
-static int hf_ipv6_dst_multicast_flags          = -1;
-static int hf_ipv6_dst_multicast_flags_reserved = -1;
-static int hf_ipv6_dst_multicast_flags_transient = -1;
-static int hf_ipv6_dst_multicast_flags_network_prefix = -1;
-static int hf_ipv6_dst_multicast_flags_embed_rp = -1;
-static int hf_ipv6_dst_multicast_scope          = -1;
-static int hf_ipv6_dst_special_purpose          = -1;
-static int hf_ipv6_dst_special_purpose_source   = -1;
-static int hf_ipv6_dst_special_purpose_destination = -1;
-static int hf_ipv6_dst_special_purpose_forwardable = -1;
-static int hf_ipv6_dst_special_purpose_global   = -1;
-static int hf_ipv6_dst_special_purpose_reserved = -1;
-static int hf_ipv6_dst_host                     = -1;
-static int hf_ipv6_dst_slaac_mac                = -1;
-static int hf_ipv6_dst_isatap_ipv4              = -1;
-static int hf_ipv6_dst_6to4_gateway_ipv4        = -1;
-static int hf_ipv6_dst_6to4_sla_id              = -1;
-static int hf_ipv6_dst_teredo_server_ipv4       = -1;
-static int hf_ipv6_dst_teredo_port              = -1;
-static int hf_ipv6_dst_teredo_client_ipv4       = -1;
-static int hf_ipv6_dst_embed_ipv4               = -1;
-static int hf_ipv6_addr                         = -1;
-static int hf_ipv6_addr_space                   = -1;
-static int hf_ipv6_multicast_flags              = -1;
-static int hf_ipv6_multicast_flags_reserved     = -1;
-static int hf_ipv6_multicast_flags_transient    = -1;
-static int hf_ipv6_multicast_flags_network_prefix = -1;
-static int hf_ipv6_multicast_flags_embed_rp     = -1;
-static int hf_ipv6_multicast_scope              = -1;
-static int hf_ipv6_addr_special_purpose         = -1;
-static int hf_ipv6_addr_special_purpose_source  = -1;
-static int hf_ipv6_addr_special_purpose_destination = -1;
-static int hf_ipv6_addr_special_purpose_forwardable = -1;
-static int hf_ipv6_addr_special_purpose_global  = -1;
-static int hf_ipv6_addr_special_purpose_reserved = -1;
-static int hf_ipv6_host                         = -1;
-static int hf_ipv6_slaac_mac                    = -1;
-static int hf_ipv6_isatap_ipv4                  = -1;
-static int hf_ipv6_6to4_gateway_ipv4            = -1;
-static int hf_ipv6_6to4_sla_id                  = -1;
-static int hf_ipv6_teredo_server_ipv4           = -1;
-static int hf_ipv6_teredo_port                  = -1;
-static int hf_ipv6_teredo_client_ipv4           = -1;
-static int hf_ipv6_embed_ipv4_prefix            = -1;
-static int hf_ipv6_embed_ipv4                   = -1;
-static int hf_ipv6_embed_ipv4_u                 = -1;
-static int hf_ipv6_embed_ipv4_suffix            = -1;
-static int hf_ipv6_opt                          = -1;
-static int hf_ipv6_opt_type                     = -1;
-static int hf_ipv6_opt_type_action              = -1;
-static int hf_ipv6_opt_type_change              = -1;
-static int hf_ipv6_opt_type_rest                = -1;
-static int hf_ipv6_opt_length                   = -1;
-static int hf_ipv6_opt_pad1                     = -1;
-static int hf_ipv6_opt_padn                     = -1;
-static int hf_ipv6_opt_tel                      = -1;
-static int hf_ipv6_opt_rtalert                  = -1;
-static int hf_ipv6_opt_pmtu_min                 = -1;
-static int hf_ipv6_opt_pmtu_rtn                 = -1;
-static int hf_ipv6_opt_pmtu_rtn_flag            = -1;
-static int hf_ipv6_opt_apn_id_type              = -1;
-static int hf_ipv6_opt_apn_flags                = -1;
-static int hf_ipv6_opt_apn_param_type           = -1;
-static int hf_ipv6_opt_apn_id_part1             = -1;
-static int hf_ipv6_opt_apn_id_part2             = -1;
-static int hf_ipv6_opt_apn_id_part3             = -1;
-static int hf_ipv6_opt_apn_id_part4             = -1;
-static int hf_ipv6_opt_jumbo                    = -1;
-static int hf_ipv6_opt_calipso_doi              = -1;
-static int hf_ipv6_opt_calipso_cmpt_length      = -1;
-static int hf_ipv6_opt_calipso_sens_level       = -1;
-static int hf_ipv6_opt_calipso_checksum         = -1;
-static int hf_ipv6_opt_calipso_cmpt_bitmap      = -1;
-static int hf_ipv6_opt_smf_dpd_hash_bit         = -1;
-static int hf_ipv6_opt_smf_dpd_tid_type         = -1;
-static int hf_ipv6_opt_smf_dpd_tid_len          = -1;
-static int hf_ipv6_opt_smf_dpd_tagger_id        = -1;
-static int hf_ipv6_opt_smf_dpd_ident            = -1;
-static int hf_ipv6_opt_smf_dpd_hav              = -1;
-static int hf_ipv6_opt_pdm_scale_dtlr           = -1;
-static int hf_ipv6_opt_pdm_scale_dtls           = -1;
-static int hf_ipv6_opt_pdm_psn_this_pkt         = -1;
-static int hf_ipv6_opt_pdm_psn_last_recv        = -1;
-static int hf_ipv6_opt_pdm_delta_last_recv      = -1;
-static int hf_ipv6_opt_pdm_delta_last_sent      = -1;
-static int hf_ipv6_opt_qs_func                  = -1;
-static int hf_ipv6_opt_qs_rate                  = -1;
-static int hf_ipv6_opt_qs_ttl                   = -1;
-static int hf_ipv6_opt_qs_ttl_diff              = -1;
-static int hf_ipv6_opt_qs_unused                = -1;
-static int hf_ipv6_opt_qs_nonce                 = -1;
-static int hf_ipv6_opt_qs_reserved              = -1;
-static int hf_ipv6_opt_ioam_rsv                 = -1;
-static int hf_ipv6_opt_ioam_opt_type            = -1;
-static int hf_ipv6_opt_ioam_trace_ns            = -1;
-static int hf_ipv6_opt_ioam_trace_nodelen       = -1;
-static int hf_ipv6_opt_ioam_trace_flags         = -1;
-static int hf_ipv6_opt_ioam_trace_flag_o        = -1;
-static int hf_ipv6_opt_ioam_trace_flag_l        = -1;
-static int hf_ipv6_opt_ioam_trace_flag_a        = -1;
-static int hf_ipv6_opt_ioam_trace_flag_rsv      = -1;
-static int hf_ipv6_opt_ioam_trace_remlen        = -1;
-static int hf_ipv6_opt_ioam_trace_type          = -1;
-static int hf_ipv6_opt_ioam_trace_type_bit0     = -1;
-static int hf_ipv6_opt_ioam_trace_type_bit1     = -1;
-static int hf_ipv6_opt_ioam_trace_type_bit2     = -1;
-static int hf_ipv6_opt_ioam_trace_type_bit3     = -1;
-static int hf_ipv6_opt_ioam_trace_type_bit4     = -1;
-static int hf_ipv6_opt_ioam_trace_type_bit5     = -1;
-static int hf_ipv6_opt_ioam_trace_type_bit6     = -1;
-static int hf_ipv6_opt_ioam_trace_type_bit7     = -1;
-static int hf_ipv6_opt_ioam_trace_type_bit8     = -1;
-static int hf_ipv6_opt_ioam_trace_type_bit9     = -1;
-static int hf_ipv6_opt_ioam_trace_type_bit10    = -1;
-static int hf_ipv6_opt_ioam_trace_type_bit11    = -1;
-static int hf_ipv6_opt_ioam_trace_type_undef    = -1;
-static int hf_ipv6_opt_ioam_trace_type_bit22    = -1;
-static int hf_ipv6_opt_ioam_trace_type_rsv      = -1;
-static int hf_ipv6_opt_ioam_trace_rsv           = -1;
-static int hf_ipv6_opt_ioam_trace_free_space    = -1;
-static int hf_ipv6_opt_ioam_trace_node_hlim     = -1;
-static int hf_ipv6_opt_ioam_trace_node_id       = -1;
-static int hf_ipv6_opt_ioam_trace_node_iif      = -1;
-static int hf_ipv6_opt_ioam_trace_node_eif      = -1;
-static int hf_ipv6_opt_ioam_trace_node_tss      = -1;
-static int hf_ipv6_opt_ioam_trace_node_tsf      = -1;
-static int hf_ipv6_opt_ioam_trace_node_trdelay  = -1;
-static int hf_ipv6_opt_ioam_trace_node_nsdata   = -1;
-static int hf_ipv6_opt_ioam_trace_node_qdepth   = -1;
-static int hf_ipv6_opt_ioam_trace_node_csum     = -1;
-static int hf_ipv6_opt_ioam_trace_node_id_wide  = -1;
-static int hf_ipv6_opt_ioam_trace_node_iif_wide = -1;
-static int hf_ipv6_opt_ioam_trace_node_eif_wide = -1;
-static int hf_ipv6_opt_ioam_trace_node_nsdata_wide = -1;
-static int hf_ipv6_opt_ioam_trace_node_bufoccup = -1;
-static int hf_ipv6_opt_ioam_trace_node_undefined = -1;
-static int hf_ipv6_opt_ioam_trace_node_oss_len  = -1;
-static int hf_ipv6_opt_ioam_trace_node_oss_scid = -1;
-static int hf_ipv6_opt_ioam_trace_node_oss_data = -1;
-static int hf_ipv6_opt_tpf_information          = -1;
-static int hf_ipv6_opt_mipv6_home_address       = -1;
-static int hf_ipv6_opt_rpl_flag                 = -1;
-static int hf_ipv6_opt_rpl_flag_o               = -1;
-static int hf_ipv6_opt_rpl_flag_r               = -1;
-static int hf_ipv6_opt_rpl_flag_f               = -1;
-static int hf_ipv6_opt_rpl_flag_rsv             = -1;
-static int hf_ipv6_opt_rpl_instance_id          = -1;
-static int hf_ipv6_opt_rpl_senderrank           = -1;
-static int hf_ipv6_opt_ilnp_nonce               = -1;
-static int hf_ipv6_opt_lio_len                  = -1;
-static int hf_ipv6_opt_lio_id                   = -1;
-static int hf_ipv6_opt_mpl_flag                 = -1;
-static int hf_ipv6_opt_mpl_flag_s               = -1;
-static int hf_ipv6_opt_mpl_flag_m               = -1;
-static int hf_ipv6_opt_mpl_flag_v               = -1;
-static int hf_ipv6_opt_mpl_flag_rsv             = -1;
-static int hf_ipv6_opt_mpl_sequence             = -1;
-static int hf_ipv6_opt_mpl_seed_id              = -1;
-static int hf_ipv6_opt_dff_flags                = -1;
-static int hf_ipv6_opt_dff_flag_ver             = -1;
-static int hf_ipv6_opt_dff_flag_dup             = -1;
-static int hf_ipv6_opt_dff_flag_ret             = -1;
-static int hf_ipv6_opt_dff_flag_rsv             = -1;
-static int hf_ipv6_opt_dff_seqnum               = -1;
-static int hf_ipv6_opt_experimental             = -1;
-static int hf_ipv6_opt_unknown_data             = -1;
-static int hf_ipv6_opt_unknown                  = -1;
-static int hf_ipv6_dstopts_nxt                  = -1;
-static int hf_ipv6_dstopts_len                  = -1;
-static int hf_ipv6_dstopts_len_oct              = -1;
-static int hf_ipv6_hopopts_nxt                  = -1;
-static int hf_ipv6_hopopts_len                  = -1;
-static int hf_ipv6_hopopts_len_oct              = -1;
-static int hf_ipv6_routing_nxt                  = -1;
-static int hf_ipv6_routing_len                  = -1;
-static int hf_ipv6_routing_len_oct              = -1;
-static int hf_ipv6_routing_type                 = -1;
-static int hf_ipv6_routing_segleft              = -1;
-static int hf_ipv6_routing_unknown_data         = -1;
-static int hf_ipv6_fraghdr_nxt                  = -1;
-static int hf_ipv6_fraghdr_reserved_octet       = -1;
-static int hf_ipv6_fraghdr_offset               = -1;
-static int hf_ipv6_fraghdr_reserved_bits        = -1;
-static int hf_ipv6_fraghdr_more                 = -1;
-static int hf_ipv6_fraghdr_ident                = -1;
-static int hf_ipv6_fragment                     = -1;
-static int hf_ipv6_fragment_overlap             = -1;
-static int hf_ipv6_fragment_overlap_conflict    = -1;
-static int hf_ipv6_fragment_multiple_tails      = -1;
-static int hf_ipv6_fragment_too_long_fragment   = -1;
-static int hf_ipv6_fragment_error               = -1;
-static int hf_ipv6_fragment_count               = -1;
-static int hf_ipv6_fragments                    = -1;
-static int hf_ipv6_reassembled_in               = -1;
-static int hf_ipv6_reassembled_length           = -1;
-static int hf_ipv6_reassembled_data             = -1;
-
-static int hf_ipv6_routing_src_reserved         = -1;
-static int hf_ipv6_routing_src_addr             = -1;
-
-static int hf_ipv6_routing_mipv6_reserved       = -1;
-static int hf_ipv6_routing_mipv6_home_address   = -1;
-
-static int hf_ipv6_routing_rpl_cmprI            = -1;
-static int hf_ipv6_routing_rpl_cmprE            = -1;
-static int hf_ipv6_routing_rpl_pad              = -1;
-static int hf_ipv6_routing_rpl_reserved         = -1;
-static int hf_ipv6_routing_rpl_addr_count       = -1;
-static int hf_ipv6_routing_rpl_addr             = -1;
-static int hf_ipv6_routing_rpl_fulladdr         = -1;
-
-static int hf_ipv6_routing_srh_last_entry       = -1;
-static int hf_ipv6_routing_srh_flags            = -1;
-static int hf_ipv6_routing_srh_tag              = -1;
-static int hf_ipv6_routing_srh_addr             = -1;
-
-static int hf_ipv6_routing_crh16_current_sid      = -1;
-static int hf_ipv6_routing_crh32_current_sid      = -1;
-static int hf_ipv6_routing_crh16_segment_id     = -1;
-static int hf_ipv6_routing_crh32_segment_id     = -1;
+static int proto_ipv6;
+static int proto_ipv6_hopopts;
+static int proto_ipv6_routing;
+static int proto_ipv6_fraghdr;
+static int proto_ipv6_dstopts;
+
+static int proto_ipv6_routing_rt0;
+static int proto_ipv6_routing_mipv6;
+static int proto_ipv6_routing_rpl;
+static int proto_ipv6_routing_srh;
+static int proto_ipv6_routing_crh;
+
+static int hf_ipv6_version;
+static int hf_ip_version;
+static int hf_ipv6_tclass;
+static int hf_ipv6_tclass_dscp;
+static int hf_ipv6_tclass_ecn;
+static int hf_ipv6_flow;
+static int hf_ipv6_plen;
+static int hf_ipv6_nxt;
+static int hf_ipv6_hlim;
+static int hf_ipv6_src;
+static int hf_ipv6_src_addr_space;
+static int hf_ipv6_src_multicast_flags;
+static int hf_ipv6_src_multicast_flags_reserved;
+static int hf_ipv6_src_multicast_flags_transient;
+static int hf_ipv6_src_multicast_flags_network_prefix;
+static int hf_ipv6_src_multicast_flags_embed_rp;
+static int hf_ipv6_src_special_purpose;
+static int hf_ipv6_src_special_purpose_source;
+static int hf_ipv6_src_special_purpose_destination;
+static int hf_ipv6_src_special_purpose_forwardable;
+static int hf_ipv6_src_special_purpose_global;
+static int hf_ipv6_src_special_purpose_reserved;
+static int hf_ipv6_src_multicast_scope;
+static int hf_ipv6_src_host;
+static int hf_ipv6_src_slaac_mac;
+static int hf_ipv6_src_isatap_ipv4;
+static int hf_ipv6_src_6to4_gateway_ipv4;
+static int hf_ipv6_src_6to4_sla_id;
+static int hf_ipv6_src_teredo_server_ipv4;
+static int hf_ipv6_src_teredo_port;
+static int hf_ipv6_src_teredo_client_ipv4;
+static int hf_ipv6_src_embed_ipv4;
+static int hf_ipv6_dst;
+static int hf_ipv6_dst_addr_space;
+static int hf_ipv6_dst_multicast_flags;
+static int hf_ipv6_dst_multicast_flags_reserved;
+static int hf_ipv6_dst_multicast_flags_transient;
+static int hf_ipv6_dst_multicast_flags_network_prefix;
+static int hf_ipv6_dst_multicast_flags_embed_rp;
+static int hf_ipv6_dst_multicast_scope;
+static int hf_ipv6_dst_special_purpose;
+static int hf_ipv6_dst_special_purpose_source;
+static int hf_ipv6_dst_special_purpose_destination;
+static int hf_ipv6_dst_special_purpose_forwardable;
+static int hf_ipv6_dst_special_purpose_global;
+static int hf_ipv6_dst_special_purpose_reserved;
+static int hf_ipv6_dst_host;
+static int hf_ipv6_dst_slaac_mac;
+static int hf_ipv6_dst_isatap_ipv4;
+static int hf_ipv6_dst_6to4_gateway_ipv4;
+static int hf_ipv6_dst_6to4_sla_id;
+static int hf_ipv6_dst_teredo_server_ipv4;
+static int hf_ipv6_dst_teredo_port;
+static int hf_ipv6_dst_teredo_client_ipv4;
+static int hf_ipv6_dst_embed_ipv4;
+static int hf_ipv6_addr;
+static int hf_ipv6_addr_space;
+static int hf_ipv6_multicast_flags;
+static int hf_ipv6_multicast_flags_reserved;
+static int hf_ipv6_multicast_flags_transient;
+static int hf_ipv6_multicast_flags_network_prefix;
+static int hf_ipv6_multicast_flags_embed_rp;
+static int hf_ipv6_multicast_scope;
+static int hf_ipv6_addr_special_purpose;
+static int hf_ipv6_addr_special_purpose_source;
+static int hf_ipv6_addr_special_purpose_destination;
+static int hf_ipv6_addr_special_purpose_forwardable;
+static int hf_ipv6_addr_special_purpose_global;
+static int hf_ipv6_addr_special_purpose_reserved;
+static int hf_ipv6_host;
+static int hf_ipv6_slaac_mac;
+static int hf_ipv6_isatap_ipv4;
+static int hf_ipv6_6to4_gateway_ipv4;
+static int hf_ipv6_6to4_sla_id;
+static int hf_ipv6_teredo_server_ipv4;
+static int hf_ipv6_teredo_port;
+static int hf_ipv6_teredo_client_ipv4;
+static int hf_ipv6_embed_ipv4_prefix;
+static int hf_ipv6_embed_ipv4;
+static int hf_ipv6_embed_ipv4_u;
+static int hf_ipv6_embed_ipv4_suffix;
+static int hf_ipv6_opt;
+static int hf_ipv6_opt_type;
+static int hf_ipv6_opt_type_action;
+static int hf_ipv6_opt_type_change;
+static int hf_ipv6_opt_type_rest;
+static int hf_ipv6_opt_length;
+static int hf_ipv6_opt_pad1;
+static int hf_ipv6_opt_padn;
+static int hf_ipv6_opt_tel;
+static int hf_ipv6_opt_rtalert;
+static int hf_ipv6_opt_pmtu_min;
+static int hf_ipv6_opt_pmtu_rtn;
+static int hf_ipv6_opt_pmtu_rtn_flag;
+static int hf_ipv6_opt_apn_id_type;
+static int hf_ipv6_opt_apn_flags;
+static int hf_ipv6_opt_apn_param_type;
+static int hf_ipv6_opt_apn_id_part1;
+static int hf_ipv6_opt_apn_id_part2;
+static int hf_ipv6_opt_apn_id_part3;
+static int hf_ipv6_opt_apn_id_part4;
+static int hf_ipv6_opt_jumbo;
+static int hf_ipv6_opt_calipso_doi;
+static int hf_ipv6_opt_calipso_cmpt_length;
+static int hf_ipv6_opt_calipso_sens_level;
+static int hf_ipv6_opt_calipso_checksum;
+static int hf_ipv6_opt_calipso_cmpt_bitmap;
+static int hf_ipv6_opt_smf_dpd_hash_bit;
+static int hf_ipv6_opt_smf_dpd_tid_type;
+static int hf_ipv6_opt_smf_dpd_tid_len;
+static int hf_ipv6_opt_smf_dpd_tagger_id;
+static int hf_ipv6_opt_smf_dpd_ident;
+static int hf_ipv6_opt_smf_dpd_hav;
+static int hf_ipv6_opt_pdm_scale_dtlr;
+static int hf_ipv6_opt_pdm_scale_dtls;
+static int hf_ipv6_opt_pdm_psn_this_pkt;
+static int hf_ipv6_opt_pdm_psn_last_recv;
+static int hf_ipv6_opt_pdm_delta_last_recv;
+static int hf_ipv6_opt_pdm_delta_last_sent;
+static int hf_ipv6_opt_qs_func;
+static int hf_ipv6_opt_qs_rate;
+static int hf_ipv6_opt_qs_ttl;
+static int hf_ipv6_opt_qs_ttl_diff;
+static int hf_ipv6_opt_qs_unused;
+static int hf_ipv6_opt_qs_nonce;
+static int hf_ipv6_opt_qs_reserved;
+static int hf_ipv6_opt_ioam_rsv;
+static int hf_ipv6_opt_ioam_opt_type;
+static int hf_ipv6_opt_ioam_trace_ns;
+static int hf_ipv6_opt_ioam_trace_nodelen;
+static int hf_ipv6_opt_ioam_trace_flags;
+static int hf_ipv6_opt_ioam_trace_flag_o;
+static int hf_ipv6_opt_ioam_trace_flag_l;
+static int hf_ipv6_opt_ioam_trace_flag_a;
+static int hf_ipv6_opt_ioam_trace_flag_rsv;
+static int hf_ipv6_opt_ioam_trace_remlen;
+static int hf_ipv6_opt_ioam_trace_type;
+static int hf_ipv6_opt_ioam_trace_type_bit0;
+static int hf_ipv6_opt_ioam_trace_type_bit1;
+static int hf_ipv6_opt_ioam_trace_type_bit2;
+static int hf_ipv6_opt_ioam_trace_type_bit3;
+static int hf_ipv6_opt_ioam_trace_type_bit4;
+static int hf_ipv6_opt_ioam_trace_type_bit5;
+static int hf_ipv6_opt_ioam_trace_type_bit6;
+static int hf_ipv6_opt_ioam_trace_type_bit7;
+static int hf_ipv6_opt_ioam_trace_type_bit8;
+static int hf_ipv6_opt_ioam_trace_type_bit9;
+static int hf_ipv6_opt_ioam_trace_type_bit10;
+static int hf_ipv6_opt_ioam_trace_type_bit11;
+static int hf_ipv6_opt_ioam_trace_type_undef;
+static int hf_ipv6_opt_ioam_trace_type_bit22;
+static int hf_ipv6_opt_ioam_trace_type_rsv;
+static int hf_ipv6_opt_ioam_trace_rsv;
+static int hf_ipv6_opt_ioam_trace_free_space;
+static int hf_ipv6_opt_ioam_trace_node_hlim;
+static int hf_ipv6_opt_ioam_trace_node_id;
+static int hf_ipv6_opt_ioam_trace_node_iif;
+static int hf_ipv6_opt_ioam_trace_node_eif;
+static int hf_ipv6_opt_ioam_trace_node_tss;
+static int hf_ipv6_opt_ioam_trace_node_tsf;
+static int hf_ipv6_opt_ioam_trace_node_trdelay;
+static int hf_ipv6_opt_ioam_trace_node_nsdata;
+static int hf_ipv6_opt_ioam_trace_node_qdepth;
+static int hf_ipv6_opt_ioam_trace_node_csum;
+static int hf_ipv6_opt_ioam_trace_node_id_wide;
+static int hf_ipv6_opt_ioam_trace_node_iif_wide;
+static int hf_ipv6_opt_ioam_trace_node_eif_wide;
+static int hf_ipv6_opt_ioam_trace_node_nsdata_wide;
+static int hf_ipv6_opt_ioam_trace_node_bufoccup;
+static int hf_ipv6_opt_ioam_trace_node_undefined;
+static int hf_ipv6_opt_ioam_trace_node_oss_len;
+static int hf_ipv6_opt_ioam_trace_node_oss_scid;
+static int hf_ipv6_opt_ioam_trace_node_oss_data;
+static int hf_ipv6_opt_tpf_information;
+static int hf_ipv6_opt_mipv6_home_address;
+static int hf_ipv6_opt_rpl_flag;
+static int hf_ipv6_opt_rpl_flag_o;
+static int hf_ipv6_opt_rpl_flag_r;
+static int hf_ipv6_opt_rpl_flag_f;
+static int hf_ipv6_opt_rpl_flag_rsv;
+static int hf_ipv6_opt_rpl_instance_id;
+static int hf_ipv6_opt_rpl_senderrank;
+static int hf_ipv6_opt_ilnp_nonce;
+static int hf_ipv6_opt_lio_len;
+static int hf_ipv6_opt_lio_id;
+static int hf_ipv6_opt_mpl_flag;
+static int hf_ipv6_opt_mpl_flag_s;
+static int hf_ipv6_opt_mpl_flag_m;
+static int hf_ipv6_opt_mpl_flag_v;
+static int hf_ipv6_opt_mpl_flag_rsv;
+static int hf_ipv6_opt_mpl_sequence;
+static int hf_ipv6_opt_mpl_seed_id;
+static int hf_ipv6_opt_dff_flags;
+static int hf_ipv6_opt_dff_flag_ver;
+static int hf_ipv6_opt_dff_flag_dup;
+static int hf_ipv6_opt_dff_flag_ret;
+static int hf_ipv6_opt_dff_flag_rsv;
+static int hf_ipv6_opt_dff_seqnum;
+static int hf_ipv6_opt_experimental;
+static int hf_ipv6_opt_unknown_data;
+static int hf_ipv6_opt_unknown;
+static int hf_ipv6_dstopts_nxt;
+static int hf_ipv6_dstopts_len;
+static int hf_ipv6_dstopts_len_oct;
+static int hf_ipv6_hopopts_nxt;
+static int hf_ipv6_hopopts_len;
+static int hf_ipv6_hopopts_len_oct;
+static int hf_ipv6_routing_nxt;
+static int hf_ipv6_routing_len;
+static int hf_ipv6_routing_len_oct;
+static int hf_ipv6_routing_type;
+static int hf_ipv6_routing_segleft;
+static int hf_ipv6_routing_unknown_data;
+static int hf_ipv6_fraghdr_nxt;
+static int hf_ipv6_fraghdr_reserved_octet;
+static int hf_ipv6_fraghdr_offset;
+static int hf_ipv6_fraghdr_reserved_bits;
+static int hf_ipv6_fraghdr_more;
+static int hf_ipv6_fraghdr_ident;
+static int hf_ipv6_fragment;
+static int hf_ipv6_fragment_overlap;
+static int hf_ipv6_fragment_overlap_conflict;
+static int hf_ipv6_fragment_multiple_tails;
+static int hf_ipv6_fragment_too_long_fragment;
+static int hf_ipv6_fragment_error;
+static int hf_ipv6_fragment_count;
+static int hf_ipv6_fragments;
+static int hf_ipv6_reassembled_in;
+static int hf_ipv6_reassembled_length;
+static int hf_ipv6_reassembled_data;
+
+static int hf_ipv6_routing_src_reserved;
+static int hf_ipv6_routing_src_addr;
+
+static int hf_ipv6_routing_mipv6_reserved;
+static int hf_ipv6_routing_mipv6_home_address;
+
+static int hf_ipv6_routing_rpl_cmprI;
+static int hf_ipv6_routing_rpl_cmprE;
+static int hf_ipv6_routing_rpl_pad;
+static int hf_ipv6_routing_rpl_reserved;
+static int hf_ipv6_routing_rpl_addr_count;
+static int hf_ipv6_routing_rpl_addr;
+static int hf_ipv6_routing_rpl_fulladdr;
+
+static int hf_ipv6_routing_srh_last_entry;
+static int hf_ipv6_routing_srh_flags;
+static int hf_ipv6_routing_srh_tag;
+static int hf_ipv6_routing_srh_addr;
+
+static int hf_ipv6_routing_crh16_current_sid;
+static int hf_ipv6_routing_crh32_current_sid;
+static int hf_ipv6_routing_crh16_segment_id;
+static int hf_ipv6_routing_crh32_segment_id;
 
 struct ipv6_addr_info_s {
     int *hf_addr;
@@ -470,85 +470,85 @@ static struct ipv6_addr_info_s ipv6_dst_info = {
     &hf_ipv6_dst_host,
 };
 
-static int hf_geoip_country             = -1;
-static int hf_geoip_country_iso         = -1;
-static int hf_geoip_city                = -1;
-static int hf_geoip_as_number           = -1;
-static int hf_geoip_as_org              = -1;
-static int hf_geoip_latitude            = -1;
-static int hf_geoip_longitude           = -1;
-static int hf_geoip_src_summary         = -1;
-static int hf_geoip_src_country         = -1;
-static int hf_geoip_src_country_iso     = -1;
-static int hf_geoip_src_city            = -1;
-static int hf_geoip_src_as_number       = -1;
-static int hf_geoip_src_as_org          = -1;
-static int hf_geoip_src_latitude        = -1;
-static int hf_geoip_src_longitude       = -1;
-static int hf_geoip_dst_summary         = -1;
-static int hf_geoip_dst_country         = -1;
-static int hf_geoip_dst_country_iso     = -1;
-static int hf_geoip_dst_city            = -1;
-static int hf_geoip_dst_as_number       = -1;
-static int hf_geoip_dst_as_org          = -1;
-static int hf_geoip_dst_latitude        = -1;
-static int hf_geoip_dst_longitude       = -1;
-
-static gint ett_ipv6_proto              = -1;
-static gint ett_ipv6_detail             = -1;
-static gint ett_ipv6_detail_special_purpose = -1;
-static gint ett_ipv6_multicast_flags    = -1;
-static gint ett_ipv6_traffic_class      = -1;
-static gint ett_ipv6_opt                = -1;
-static gint ett_ipv6_opt_type           = -1;
-static gint ett_ipv6_opt_rpl            = -1;
-static gint ett_ipv6_opt_mpl            = -1;
-static gint ett_ipv6_opt_dff_flags      = -1;
-static gint ett_ipv6_opt_ioam_trace_flags = -1;
-static gint ett_ipv6_opt_ioam_trace_types = -1;
-static gint ett_ipv6_hopopts_proto      = -1;
-static gint ett_ipv6_fraghdr_proto      = -1;
-static gint ett_ipv6_routing_proto      = -1;
-static gint ett_ipv6_routing_srh_vect   = -1;
-static gint ett_ipv6_fragments          = -1;
-static gint ett_ipv6_fragment           = -1;
-static gint ett_ipv6_dstopts_proto      = -1;
-
-static gint ett_geoip_info              = -1;
-
-static expert_field ei_ipv6_routing_invalid_length = EI_INIT;
-static expert_field ei_ipv6_routing_invalid_segleft = EI_INIT;
-static expert_field ei_ipv6_routing_undecoded = EI_INIT;
-static expert_field ei_ipv6_dst_addr_not_unspecified = EI_INIT;
-static expert_field ei_ipv6_src_addr_not_multicast = EI_INIT;
-static expert_field ei_ipv6_dst_addr_not_multicast = EI_INIT;
-static expert_field ei_ipv6_src_route_list_mult_inst_same_addr = EI_INIT;
-static expert_field ei_ipv6_src_route_list_src_addr = EI_INIT;
-static expert_field ei_ipv6_src_route_list_dst_addr = EI_INIT;
-static expert_field ei_ipv6_src_route_list_multicast_addr = EI_INIT;
-static expert_field ei_ipv6_routing_rpl_cmpri_cmpre_pad = EI_INIT;
-static expert_field ei_ipv6_routing_rpl_addr_count_ge0 = EI_INIT;
-static expert_field ei_ipv6_routing_rpl_reserved = EI_INIT;
-static expert_field ei_ipv6_routing_deprecated = EI_INIT;
-static expert_field ei_ipv6_opt_jumbo_missing = EI_INIT;
-static expert_field ei_ipv6_opt_jumbo_prohibited = EI_INIT;
-static expert_field ei_ipv6_opt_jumbo_truncated = EI_INIT;
-static expert_field ei_ipv6_opt_jumbo_fragment = EI_INIT;
-static expert_field ei_ipv6_opt_invalid_len = EI_INIT;
-static expert_field ei_ipv6_opt_apn_invalid_id_type = EI_INIT;
-static expert_field ei_ipv6_opt_unknown_data = EI_INIT;
-static expert_field ei_ipv6_opt_deprecated = EI_INIT;
-static expert_field ei_ipv6_opt_mpl_ipv6_src_seed_id = EI_INIT;
-static expert_field ei_ipv6_hopopts_not_first = EI_INIT;
-static expert_field ei_ipv6_plen_exceeds_framing = EI_INIT;
-static expert_field ei_ipv6_plen_zero = EI_INIT;
-static expert_field ei_ipv6_bogus_ipv6_version = EI_INIT;
-static expert_field ei_ipv6_invalid_header = EI_INIT;
-static expert_field ei_ipv6_opt_header_mismatch = EI_INIT;
-static expert_field ei_ipv6_opt_ioam_invalid_nodelen = EI_INIT;
-static expert_field ei_ipv6_opt_ioam_invalid_remlen = EI_INIT;
-static expert_field ei_ipv6_opt_ioam_invalid_trace_type = EI_INIT;
-static expert_field ei_ipv6_embed_ipv4_u_value = EI_INIT;
+static int hf_geoip_country;
+static int hf_geoip_country_iso;
+static int hf_geoip_city;
+static int hf_geoip_as_number;
+static int hf_geoip_as_org;
+static int hf_geoip_latitude;
+static int hf_geoip_longitude;
+static int hf_geoip_src_summary;
+static int hf_geoip_src_country;
+static int hf_geoip_src_country_iso;
+static int hf_geoip_src_city;
+static int hf_geoip_src_as_number;
+static int hf_geoip_src_as_org;
+static int hf_geoip_src_latitude;
+static int hf_geoip_src_longitude;
+static int hf_geoip_dst_summary;
+static int hf_geoip_dst_country;
+static int hf_geoip_dst_country_iso;
+static int hf_geoip_dst_city;
+static int hf_geoip_dst_as_number;
+static int hf_geoip_dst_as_org;
+static int hf_geoip_dst_latitude;
+static int hf_geoip_dst_longitude;
+
+static gint ett_ipv6_proto;
+static gint ett_ipv6_detail;
+static gint ett_ipv6_detail_special_purpose;
+static gint ett_ipv6_multicast_flags;
+static gint ett_ipv6_traffic_class;
+static gint ett_ipv6_opt;
+static gint ett_ipv6_opt_type;
+static gint ett_ipv6_opt_rpl;
+static gint ett_ipv6_opt_mpl;
+static gint ett_ipv6_opt_dff_flags;
+static gint ett_ipv6_opt_ioam_trace_flags;
+static gint ett_ipv6_opt_ioam_trace_types;
+static gint ett_ipv6_hopopts_proto;
+static gint ett_ipv6_fraghdr_proto;
+static gint ett_ipv6_routing_proto;
+static gint ett_ipv6_routing_srh_vect;
+static gint ett_ipv6_fragments;
+static gint ett_ipv6_fragment;
+static gint ett_ipv6_dstopts_proto;
+
+static gint ett_geoip_info;
+
+static expert_field ei_ipv6_routing_invalid_length;
+static expert_field ei_ipv6_routing_invalid_segleft;
+static expert_field ei_ipv6_routing_undecoded;
+static expert_field ei_ipv6_dst_addr_not_unspecified;
+static expert_field ei_ipv6_src_addr_not_multicast;
+static expert_field ei_ipv6_dst_addr_not_multicast;
+static expert_field ei_ipv6_src_route_list_mult_inst_same_addr;
+static expert_field ei_ipv6_src_route_list_src_addr;
+static expert_field ei_ipv6_src_route_list_dst_addr;
+static expert_field ei_ipv6_src_route_list_multicast_addr;
+static expert_field ei_ipv6_routing_rpl_cmpri_cmpre_pad;
+static expert_field ei_ipv6_routing_rpl_addr_count_ge0;
+static expert_field ei_ipv6_routing_rpl_reserved;
+static expert_field ei_ipv6_routing_deprecated;
+static expert_field ei_ipv6_opt_jumbo_missing;
+static expert_field ei_ipv6_opt_jumbo_prohibited;
+static expert_field ei_ipv6_opt_jumbo_truncated;
+static expert_field ei_ipv6_opt_jumbo_fragment;
+static expert_field ei_ipv6_opt_invalid_len;
+static expert_field ei_ipv6_opt_apn_invalid_id_type;
+static expert_field ei_ipv6_opt_unknown_data;
+static expert_field ei_ipv6_opt_deprecated;
+static expert_field ei_ipv6_opt_mpl_ipv6_src_seed_id;
+static expert_field ei_ipv6_hopopts_not_first;
+static expert_field ei_ipv6_plen_exceeds_framing;
+static expert_field ei_ipv6_plen_zero;
+static expert_field ei_ipv6_bogus_ipv6_version;
+static expert_field ei_ipv6_invalid_header;
+static expert_field ei_ipv6_opt_header_mismatch;
+static expert_field ei_ipv6_opt_ioam_invalid_nodelen;
+static expert_field ei_ipv6_opt_ioam_invalid_remlen;
+static expert_field ei_ipv6_opt_ioam_invalid_trace_type;
+static expert_field ei_ipv6_embed_ipv4_u_value;
 
 static dissector_handle_t ipv6_handle;
 
diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c
index aa24f01e03..23ffa152b6 100644
--- a/epan/dissectors/packet-ipvs-syncd.c
+++ b/epan/dissectors/packet-ipvs-syncd.c
@@ -17,49 +17,49 @@ void proto_reg_handoff_ipvs_syncd(void);
 
 static dissector_handle_t ipvs_syncd_handle;
 
-static int proto_ipvs_syncd = -1;
-static int hf_conn_count = -1;
-static int hf_syncid = -1;
-static int hf_size = -1;
-static int hf_resv = -1;
-static int hf_version = -1;
-static int hf_proto = -1;
-static int hf_cport = -1;
-static int hf_vport = -1;
-static int hf_dport = -1;
-static int hf_caddr = -1;
-static int hf_vaddr = -1;
-static int hf_daddr = -1;
-static int hf_flags = -1;
-static int hf_flags_conn_type = -1;
-static int hf_flags_hashed_entry = -1;
-static int hf_flags_no_output_packets = -1;
-static int hf_flags_conn_not_established = -1;
-static int hf_flags_adjust_output_seq = -1;
-static int hf_flags_adjust_input_seq = -1;
-static int hf_flags_no_client_port_set = -1;
-static int hf_state = -1;
-static int hf_in_seq_init = -1;
-static int hf_in_seq_delta = -1;
-static int hf_in_seq_pdelta = -1;
-static int hf_out_seq_init = -1;
-static int hf_out_seq_delta = -1;
-static int hf_out_seq_pdelta = -1;
+static int proto_ipvs_syncd;
+static int hf_conn_count;
+static int hf_syncid;
+static int hf_size;
+static int hf_resv;
+static int hf_version;
+static int hf_proto;
+static int hf_cport;
+static int hf_vport;
+static int hf_dport;
+static int hf_caddr;
+static int hf_vaddr;
+static int hf_daddr;
+static int hf_flags;
+static int hf_flags_conn_type;
+static int hf_flags_hashed_entry;
+static int hf_flags_no_output_packets;
+static int hf_flags_conn_not_established;
+static int hf_flags_adjust_output_seq;
+static int hf_flags_adjust_input_seq;
+static int hf_flags_no_client_port_set;
+static int hf_state;
+static int hf_in_seq_init;
+static int hf_in_seq_delta;
+static int hf_in_seq_pdelta;
+static int hf_out_seq_init;
+static int hf_out_seq_delta;
+static int hf_out_seq_pdelta;
 
 /* Payload v1 */
-static int hf_type = -1;
-static int hf_ver = -1;
-static int hf_size_v1 = -1;
-static int hf_flags_v1 = -1;
-static int hf_fwmark  = -1;
-static int hf_timeout = -1;
-static int hf_caddr6 = -1;
-static int hf_vaddr6 = -1;
-static int hf_daddr6 = -1;
-
-static int ett_ipvs_syncd = -1;
-static int ett_conn = -1;
-static int ett_flags = -1;
+static int hf_type;
+static int hf_ver;
+static int hf_size_v1;
+static int hf_flags_v1;
+static int hf_fwmark;
+static int hf_timeout;
+static int hf_caddr6;
+static int hf_vaddr6;
+static int hf_daddr6;
+
+static int ett_ipvs_syncd;
+static int ett_conn;
+static int ett_flags;
 
 #define IPVS_SYNCD_MC_GROUP "224.0.0.18"
 #define IPVS_SYNCD_PORT 8848 /* Not IANA registered */
diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c
index 8bd449c5f7..bce9b83a2a 100644
--- a/epan/dissectors/packet-ipx.c
+++ b/epan/dissectors/packet-ipx.c
@@ -45,25 +45,25 @@ static int ipx_tap = -1;
 
 */
 
-static int proto_ipx = -1;
-static int hf_ipx_checksum = -1;
-static int hf_ipx_len = -1;
-static int hf_ipx_src = -1;
-static int hf_ipx_dst = -1;
-static int hf_ipx_addr = -1;
-static int hf_ipx_hops = -1;
-static int hf_ipx_packet_type = -1;
-static int hf_ipx_dnet = -1;
-static int hf_ipx_dnode = -1;
-static int hf_ipx_dsocket = -1;
-static int hf_ipx_snet = -1;
-static int hf_ipx_snode = -1;
-static int hf_ipx_ssocket = -1;
-static int hf_ipx_net = -1;
-static int hf_ipx_node = -1;
-static int hf_ipx_socket = -1;
-
-static gint ett_ipx = -1;
+static int proto_ipx;
+static int hf_ipx_checksum;
+static int hf_ipx_len;
+static int hf_ipx_src;
+static int hf_ipx_dst;
+static int hf_ipx_addr;
+static int hf_ipx_hops;
+static int hf_ipx_packet_type;
+static int hf_ipx_dnet;
+static int hf_ipx_dnode;
+static int hf_ipx_dsocket;
+static int hf_ipx_snet;
+static int hf_ipx_snode;
+static int hf_ipx_ssocket;
+static int hf_ipx_net;
+static int hf_ipx_node;
+static int hf_ipx_socket;
+
+static gint ett_ipx;
 
 static dissector_table_t ipx_type_dissector_table;
 static dissector_table_t ipx_socket_dissector_table;
@@ -75,62 +75,62 @@ static dissector_handle_t ipxrip_handle;
 static dissector_handle_t serialization_handle;
 static dissector_handle_t ipxmsg_handle;
 
-static int proto_spx = -1;
-static int hf_spx_connection_control = -1;
-static int hf_spx_connection_control_sys = -1;
-static int hf_spx_connection_control_send_ack = -1;
-static int hf_spx_connection_control_attn = -1;
-static int hf_spx_connection_control_eom = -1;
-static int hf_spx_connection_control_v2 = -1;
-static int hf_spx_connection_control_neg_size = -1;
-static int hf_spx_connection_control_reserved = -1;
-static int hf_spx_connection_control_ext_header = -1;
-static int hf_spx_datastream_type = -1;
-static int hf_spx_src_id = -1;
-static int hf_spx_dst_id = -1;
-static int hf_spx_seq_nr = -1;
-static int hf_spx_ack_nr = -1;
-static int hf_spx_all_nr = -1;
-static int hf_spx_neg_size = -1;
-static int hf_spx_rexmt_frame = -1;
-static int hf_spx_rexmt_data = -1;
-
-static gint ett_spx = -1;
-static gint ett_spx_connctrl = -1;
-
-static int proto_ipxrip = -1;
-static int hf_ipxrip_request = -1;
-static int hf_ipxrip_response = -1;
-static int hf_ipxrip_packet_type = -1;
-static int hf_ipxrip_route_vector = -1;
-static int hf_ipxrip_hops = -1;
-static int hf_ipxrip_ticks = -1;
-
-static gint ett_ipxrip = -1;
-
-static int proto_serialization = -1;
-static int hf_serial_number = -1;
-static gint ett_serialization = -1;
-
-static int proto_sap = -1;
-static int hf_sap_request = -1;
-static int hf_sap_response = -1;
-static int hf_sap_packet_type = -1;
-static int hf_sap_server = -1;
-static int hf_sap_server_type = -1;
-static int hf_sap_server_name = -1;
-static int hf_sap_server_network = -1;
-static int hf_sap_server_node = -1;
-static int hf_sap_server_socket = -1;
-static int hf_sap_server_intermediate_networks = -1;
-
-static gint ett_ipxsap = -1;
-static gint ett_ipxsap_server = -1;
-
-static gint ett_ipxmsg = -1;
-static int proto_ipxmsg = -1;
-static int hf_msg_conn = -1;
-static int hf_msg_sigchar = -1;
+static int proto_spx;
+static int hf_spx_connection_control;
+static int hf_spx_connection_control_sys;
+static int hf_spx_connection_control_send_ack;
+static int hf_spx_connection_control_attn;
+static int hf_spx_connection_control_eom;
+static int hf_spx_connection_control_v2;
+static int hf_spx_connection_control_neg_size;
+static int hf_spx_connection_control_reserved;
+static int hf_spx_connection_control_ext_header;
+static int hf_spx_datastream_type;
+static int hf_spx_src_id;
+static int hf_spx_dst_id;
+static int hf_spx_seq_nr;
+static int hf_spx_ack_nr;
+static int hf_spx_all_nr;
+static int hf_spx_neg_size;
+static int hf_spx_rexmt_frame;
+static int hf_spx_rexmt_data;
+
+static gint ett_spx;
+static gint ett_spx_connctrl;
+
+static int proto_ipxrip;
+static int hf_ipxrip_request;
+static int hf_ipxrip_response;
+static int hf_ipxrip_packet_type;
+static int hf_ipxrip_route_vector;
+static int hf_ipxrip_hops;
+static int hf_ipxrip_ticks;
+
+static gint ett_ipxrip;
+
+static int proto_serialization;
+static int hf_serial_number;
+static gint ett_serialization;
+
+static int proto_sap;
+static int hf_sap_request;
+static int hf_sap_response;
+static int hf_sap_packet_type;
+static int hf_sap_server;
+static int hf_sap_server_type;
+static int hf_sap_server_name;
+static int hf_sap_server_network;
+static int hf_sap_server_node;
+static int hf_sap_server_socket;
+static int hf_sap_server_intermediate_networks;
+
+static gint ett_ipxsap;
+static gint ett_ipxsap_server;
+
+static gint ett_ipxmsg;
+static int proto_ipxmsg;
+static int hf_msg_conn;
+static int hf_msg_sigchar;
 
 #define UDP_PORT_IPX    213		/* RFC 1234 */
 
diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c
index d1ab93fce3..03a5ab7924 100644
--- a/epan/dissectors/packet-ipxwan.c
+++ b/epan/dissectors/packet-ipxwan.c
@@ -23,37 +23,37 @@ static dissector_handle_t ipxwan_handle;
  * See RFC 1362 for version 1 of this protocol; see the NetWare Link
  * Services Protocol Specification, chapter 3, for version 2.
  */
-static int proto_ipxwan = -1;
-
-static int hf_ipxwan_identifier = -1;
-static int hf_ipxwan_packet_type = -1;
-static int hf_ipxwan_node_id = -1;
-static int hf_ipxwan_sequence_number = -1;
-static int hf_ipxwan_num_options = -1;
-static int hf_ipxwan_option_num = -1;
-static int hf_ipxwan_accept_option = -1;
-static int hf_ipxwan_option_data_len = -1;
-static int hf_ipxwan_routing_type = -1;
-static int hf_ipxwan_wan_link_delay = -1;
-static int hf_ipxwan_common_network_number = -1;
-static int hf_ipxwan_router_name = -1;
-static int hf_ipxwan_delay = -1;
-static int hf_ipxwan_throughput = -1;
-static int hf_ipxwan_request_size = -1;
-static int hf_ipxwan_delta_time = -1;
-static int hf_ipxwan_extended_node_id = -1;
-static int hf_ipxwan_node_number = -1;
-static int hf_ipxwan_compression_type = -1;
-static int hf_ipxwan_compression_options = -1;
-static int hf_ipxwan_compression_slots = -1;
-static int hf_ipxwan_compression_parameters = -1;
-static int hf_ipxwan_padding = -1;
-static int hf_ipxwan_option_value = -1;
-
-static gint ett_ipxwan = -1;
-static gint ett_ipxwan_option = -1;
-
-static expert_field ei_ipxwan_option_data_len = EI_INIT;
+static int proto_ipxwan;
+
+static int hf_ipxwan_identifier;
+static int hf_ipxwan_packet_type;
+static int hf_ipxwan_node_id;
+static int hf_ipxwan_sequence_number;
+static int hf_ipxwan_num_options;
+static int hf_ipxwan_option_num;
+static int hf_ipxwan_accept_option;
+static int hf_ipxwan_option_data_len;
+static int hf_ipxwan_routing_type;
+static int hf_ipxwan_wan_link_delay;
+static int hf_ipxwan_common_network_number;
+static int hf_ipxwan_router_name;
+static int hf_ipxwan_delay;
+static int hf_ipxwan_throughput;
+static int hf_ipxwan_request_size;
+static int hf_ipxwan_delta_time;
+static int hf_ipxwan_extended_node_id;
+static int hf_ipxwan_node_number;
+static int hf_ipxwan_compression_type;
+static int hf_ipxwan_compression_options;
+static int hf_ipxwan_compression_slots;
+static int hf_ipxwan_compression_parameters;
+static int hf_ipxwan_padding;
+static int hf_ipxwan_option_value;
+
+static gint ett_ipxwan;
+static gint ett_ipxwan_option;
+
+static expert_field ei_ipxwan_option_data_len;
 
 static const value_string ipxwan_packet_type_vals[] = {
 	{ 0,    "Timer Request" },
diff --git a/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c
index ad4a8872ee..216fb304cf 100644
--- a/epan/dissectors/packet-irc.c
+++ b/epan/dissectors/packet-irc.c
@@ -33,35 +33,35 @@
 void proto_register_irc(void);
 void proto_reg_handoff_irc(void);
 
-static int proto_irc = -1;
-static int proto_irc_ctcp = -1;
-static int hf_irc_request = -1;
-static int hf_irc_request_prefix = -1;
-static int hf_irc_request_command = -1;
-static int hf_irc_request_command_param = -1;
-static int hf_irc_request_trailer = -1;
-static int hf_irc_response = -1;
-static int hf_irc_response_prefix = -1;
-static int hf_irc_response_command = -1;
-static int hf_irc_response_num_command = -1;
-static int hf_irc_response_command_param = -1;
-static int hf_irc_response_trailer = -1;
-static int hf_irc_ctcp = -1;
-static int hf_irc_ctcp_command = -1;
-static int hf_irc_ctcp_params = -1;
-
-static gint ett_irc = -1;
-static gint ett_irc_request = -1;
-static gint ett_irc_request_command = -1;
-static gint ett_irc_response = -1;
-static gint ett_irc_response_command = -1;
-
-static expert_field ei_irc_missing_end_delimiter = EI_INIT;
-static expert_field ei_irc_numeric_request_command = EI_INIT;
-static expert_field ei_irc_response_command = EI_INIT;
-static expert_field ei_irc_prefix_missing_ending_space = EI_INIT;
-static expert_field ei_irc_request_command = EI_INIT;
-static expert_field ei_irc_tag_data_invalid = EI_INIT;
+static int proto_irc;
+static int proto_irc_ctcp;
+static int hf_irc_request;
+static int hf_irc_request_prefix;
+static int hf_irc_request_command;
+static int hf_irc_request_command_param;
+static int hf_irc_request_trailer;
+static int hf_irc_response;
+static int hf_irc_response_prefix;
+static int hf_irc_response_command;
+static int hf_irc_response_num_command;
+static int hf_irc_response_command_param;
+static int hf_irc_response_trailer;
+static int hf_irc_ctcp;
+static int hf_irc_ctcp_command;
+static int hf_irc_ctcp_params;
+
+static gint ett_irc;
+static gint ett_irc_request;
+static gint ett_irc_request_command;
+static gint ett_irc_response;
+static gint ett_irc_response_command;
+
+static expert_field ei_irc_missing_end_delimiter;
+static expert_field ei_irc_numeric_request_command;
+static expert_field ei_irc_response_command;
+static expert_field ei_irc_prefix_missing_ending_space;
+static expert_field ei_irc_request_command;
+static expert_field ei_irc_tag_data_invalid;
 
 /* This must be a null-terminated string */
 static const guint8 TAG_DELIMITER[] = {0x01, 0x00};
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index 066d5c2770..ce5b8319f9 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -66,394 +66,394 @@ typedef struct _attribute_common_fields {
   int value;
 } attribute_common_fields;
 
-static int proto_isakmp = -1;
-
-static int hf_isakmp_nat_keepalive = -1;
-static int hf_isakmp_nat_hash = -1;
-static int hf_isakmp_nat_original_address_ipv6 = -1;
-static int hf_isakmp_nat_original_address_ipv4 = -1;
-
-static int hf_isakmp_ispi         = -1;
-static int hf_isakmp_rspi         = -1;
-static int hf_isakmp_typepayload     = -1;
-static int hf_isakmp_nextpayload     = -1;
-static int hf_isakmp_criticalpayload = -1;
-static int hf_isakmp_reserved2       = -1;
-static int hf_isakmp_reserved7       = -1;
-static int hf_isakmp_reserved        = -1;
-static int hf_isakmp_datapayload     = -1;
-static int hf_isakmp_extradata       = -1;
-static int hf_isakmp_version         = -1;
-static int hf_isakmp_mjver           = -1;
-static int hf_isakmp_mnver           = -1;
-static int hf_isakmp_exchangetype_v1 = -1;
-static int hf_isakmp_exchangetype_v2 = -1;
-static int hf_isakmp_flags           = -1;
-static int hf_isakmp_flag_e          = -1;
-static int hf_isakmp_flag_c          = -1;
-static int hf_isakmp_flag_a          = -1;
-static int hf_isakmp_flag_i          = -1;
-static int hf_isakmp_flag_v          = -1;
-static int hf_isakmp_flag_r          = -1;
-static int hf_isakmp_messageid       = -1;
-static int hf_isakmp_length          = -1;
-static int hf_isakmp_payloadlen      = -1;
-static int hf_isakmp_sa_doi          = -1;
-static int hf_isakmp_sa_situation    = -1;
-static int hf_isakmp_sa_attribute_next_payload     = -1;
-static int hf_isakmp_sa_situation_identity_only    = -1;
-static int hf_isakmp_sa_situation_secrecy          = -1;
-static int hf_isakmp_sa_situation_integrity        = -1;
-static int hf_isakmp_prop_protoid_v1 = -1;
-static int hf_isakmp_prop_protoid_v2 = -1;
-static int hf_isakmp_prop_number     = -1;
-static int hf_isakmp_prop_transforms = -1;
-static int hf_isakmp_spisize         = -1;
-static int hf_isakmp_spi             = -1;
-static int hf_isakmp_trans_number    = -1;
-static int hf_isakmp_trans_id        = -1;
-static int hf_isakmp_id_type_v1      = -1;
-static int hf_isakmp_id_type_v2      = -1;
-static int hf_isakmp_id_protoid      = -1;
-static int hf_isakmp_id_port         = -1;
-static int hf_isakmp_id_data         = -1;
-static int hf_isakmp_id_data_ipv4_addr = -1;
-static int hf_isakmp_id_data_fqdn    = -1;
-static int hf_isakmp_id_data_user_fqdn = -1;
-static int hf_isakmp_id_data_ipv4_subnet = -1;
-static int hf_isakmp_id_data_ipv4_range_start = -1;
-static int hf_isakmp_id_data_ipv4_range_end = -1;
-static int hf_isakmp_id_data_ipv6_addr = -1;
-static int hf_isakmp_id_data_ipv6_subnet = -1;
-static int hf_isakmp_id_data_ipv6_range_start = -1;
-static int hf_isakmp_id_data_ipv6_range_end = -1;
-static int hf_isakmp_id_data_key_id = -1;
-static int hf_isakmp_id_data_cert = -1;
-static int hf_isakmp_cert_encoding_v1 = -1;
-static int hf_isakmp_cert_encoding_v2 = -1;
-static int hf_isakmp_cert_data = -1;
-static int hf_isakmp_cert_x509_hash = -1;
-static int hf_isakmp_cert_x509_url = -1;
-static int hf_isakmp_certreq_type_v1 = -1;
-static int hf_isakmp_certreq_type_v2 = -1;
-static int hf_isakmp_certreq_authority_v1  = -1;
-static int hf_isakmp_certreq_authority_v2 = -1;
-static int hf_isakmp_certreq_authority_sig = -1;
-static int hf_isakmp_auth_meth = -1;
-static int hf_isakmp_auth_data = -1;
-static int hf_isakmp_auth_digital_sig_asn1_len = -1;
-static int hf_isakmp_auth_digital_sig_asn1_data = -1;
-static int hf_isakmp_auth_digital_sig_value = -1;
-static int hf_isakmp_notify_doi = -1;
-static int hf_isakmp_notify_protoid_v1 = -1;
-static int hf_isakmp_notify_protoid_v2 = -1;
-static int hf_isakmp_notify_msgtype_v1 = -1;
-static int hf_isakmp_notify_msgtype_v2 = -1;
-static int hf_isakmp_notify_data = -1;
-static int hf_isakmp_notify_data_dpd_are_you_there = -1;
-static int hf_isakmp_notify_data_dpd_are_you_there_ack = -1;
-static int hf_isakmp_notify_data_unity_load_balance = -1;
-static int hf_isakmp_notify_data_fortinet_network_overlay_id = -1;
-static int hf_isakmp_notify_data_accepted_dh_group = -1;
-static int hf_isakmp_notify_data_ipcomp_cpi = -1;
-static int hf_isakmp_notify_data_ipcomp_transform_id = -1;
-static int hf_isakmp_notify_data_auth_lifetime = -1;
-static int hf_isakmp_notify_data_redirect_gw_ident_type = -1;
-static int hf_isakmp_notify_data_redirect_gw_ident_len = -1;
-static int hf_isakmp_notify_data_redirect_new_resp_gw_ident_ipv4 = -1;
-static int hf_isakmp_notify_data_redirect_new_resp_gw_ident_ipv6 = -1;
-static int hf_isakmp_notify_data_redirect_new_resp_gw_ident_fqdn = -1;
-static int hf_isakmp_notify_data_redirect_new_resp_gw_ident = -1;
-static int hf_isakmp_notify_data_redirect_nonce_data = -1;
-static int hf_isakmp_notify_data_redirect_org_resp_gw_ident_ipv4 = -1;
-static int hf_isakmp_notify_data_redirect_org_resp_gw_ident_ipv6 = -1;
-static int hf_isakmp_notify_data_redirect_org_resp_gw_ident = -1;
-static int hf_isakmp_notify_data_ticket_lifetime = -1;
-static int hf_isakmp_notify_data_ticket_data = -1;
+static int proto_isakmp;
+
+static int hf_isakmp_nat_keepalive;
+static int hf_isakmp_nat_hash;
+static int hf_isakmp_nat_original_address_ipv6;
+static int hf_isakmp_nat_original_address_ipv4;
+
+static int hf_isakmp_ispi;
+static int hf_isakmp_rspi;
+static int hf_isakmp_typepayload;
+static int hf_isakmp_nextpayload;
+static int hf_isakmp_criticalpayload;
+static int hf_isakmp_reserved2;
+static int hf_isakmp_reserved7;
+static int hf_isakmp_reserved;
+static int hf_isakmp_datapayload;
+static int hf_isakmp_extradata;
+static int hf_isakmp_version;
+static int hf_isakmp_mjver;
+static int hf_isakmp_mnver;
+static int hf_isakmp_exchangetype_v1;
+static int hf_isakmp_exchangetype_v2;
+static int hf_isakmp_flags;
+static int hf_isakmp_flag_e;
+static int hf_isakmp_flag_c;
+static int hf_isakmp_flag_a;
+static int hf_isakmp_flag_i;
+static int hf_isakmp_flag_v;
+static int hf_isakmp_flag_r;
+static int hf_isakmp_messageid;
+static int hf_isakmp_length;
+static int hf_isakmp_payloadlen;
+static int hf_isakmp_sa_doi;
+static int hf_isakmp_sa_situation;
+static int hf_isakmp_sa_attribute_next_payload;
+static int hf_isakmp_sa_situation_identity_only;
+static int hf_isakmp_sa_situation_secrecy;
+static int hf_isakmp_sa_situation_integrity;
+static int hf_isakmp_prop_protoid_v1;
+static int hf_isakmp_prop_protoid_v2;
+static int hf_isakmp_prop_number;
+static int hf_isakmp_prop_transforms;
+static int hf_isakmp_spisize;
+static int hf_isakmp_spi;
+static int hf_isakmp_trans_number;
+static int hf_isakmp_trans_id;
+static int hf_isakmp_id_type_v1;
+static int hf_isakmp_id_type_v2;
+static int hf_isakmp_id_protoid;
+static int hf_isakmp_id_port;
+static int hf_isakmp_id_data;
+static int hf_isakmp_id_data_ipv4_addr;
+static int hf_isakmp_id_data_fqdn;
+static int hf_isakmp_id_data_user_fqdn;
+static int hf_isakmp_id_data_ipv4_subnet;
+static int hf_isakmp_id_data_ipv4_range_start;
+static int hf_isakmp_id_data_ipv4_range_end;
+static int hf_isakmp_id_data_ipv6_addr;
+static int hf_isakmp_id_data_ipv6_subnet;
+static int hf_isakmp_id_data_ipv6_range_start;
+static int hf_isakmp_id_data_ipv6_range_end;
+static int hf_isakmp_id_data_key_id;
+static int hf_isakmp_id_data_cert;
+static int hf_isakmp_cert_encoding_v1;
+static int hf_isakmp_cert_encoding_v2;
+static int hf_isakmp_cert_data;
+static int hf_isakmp_cert_x509_hash;
+static int hf_isakmp_cert_x509_url;
+static int hf_isakmp_certreq_type_v1;
+static int hf_isakmp_certreq_type_v2;
+static int hf_isakmp_certreq_authority_v1;
+static int hf_isakmp_certreq_authority_v2;
+static int hf_isakmp_certreq_authority_sig;
+static int hf_isakmp_auth_meth;
+static int hf_isakmp_auth_data;
+static int hf_isakmp_auth_digital_sig_asn1_len;
+static int hf_isakmp_auth_digital_sig_asn1_data;
+static int hf_isakmp_auth_digital_sig_value;
+static int hf_isakmp_notify_doi;
+static int hf_isakmp_notify_protoid_v1;
+static int hf_isakmp_notify_protoid_v2;
+static int hf_isakmp_notify_msgtype_v1;
+static int hf_isakmp_notify_msgtype_v2;
+static int hf_isakmp_notify_data;
+static int hf_isakmp_notify_data_dpd_are_you_there;
+static int hf_isakmp_notify_data_dpd_are_you_there_ack;
+static int hf_isakmp_notify_data_unity_load_balance;
+static int hf_isakmp_notify_data_fortinet_network_overlay_id;
+static int hf_isakmp_notify_data_accepted_dh_group;
+static int hf_isakmp_notify_data_ipcomp_cpi;
+static int hf_isakmp_notify_data_ipcomp_transform_id;
+static int hf_isakmp_notify_data_auth_lifetime;
+static int hf_isakmp_notify_data_redirect_gw_ident_type;
+static int hf_isakmp_notify_data_redirect_gw_ident_len;
+static int hf_isakmp_notify_data_redirect_new_resp_gw_ident_ipv4;
+static int hf_isakmp_notify_data_redirect_new_resp_gw_ident_ipv6;
+static int hf_isakmp_notify_data_redirect_new_resp_gw_ident_fqdn;
+static int hf_isakmp_notify_data_redirect_new_resp_gw_ident;
+static int hf_isakmp_notify_data_redirect_nonce_data;
+static int hf_isakmp_notify_data_redirect_org_resp_gw_ident_ipv4;
+static int hf_isakmp_notify_data_redirect_org_resp_gw_ident_ipv6;
+static int hf_isakmp_notify_data_redirect_org_resp_gw_ident;
+static int hf_isakmp_notify_data_ticket_lifetime;
+static int hf_isakmp_notify_data_ticket_data;
 
 static attribute_common_fields hf_isakmp_notify_data_rohc_attr;
-static int hf_isakmp_notify_data_rohc_attr_max_cid = -1;
-static int hf_isakmp_notify_data_rohc_attr_profile = -1;
-static int hf_isakmp_notify_data_rohc_attr_integ = -1;
-static int hf_isakmp_notify_data_rohc_attr_icv_len = -1;
-static int hf_isakmp_notify_data_rohc_attr_mrru = -1;
-static int hf_isakmp_notify_data_qcd_token_secret_data = -1;
-static int hf_isakmp_notify_data_ha_nonce_data = -1;
-static int hf_isakmp_notify_data_ha_expected_send_req_msg_id = -1;
-static int hf_isakmp_notify_data_ha_expected_recv_req_msg_id = -1;
-static int hf_isakmp_notify_data_ha_incoming_ipsec_sa_delta_value = -1;
-static int hf_isakmp_notify_data_secure_password_methods = -1;
-static int hf_isakmp_notify_data_signature_hash_algorithms = -1;
-static int hf_isakmp_delete_doi = -1;
-static int hf_isakmp_delete_protoid_v1 = -1;
-static int hf_isakmp_delete_protoid_v2 = -1;
-static int hf_isakmp_delete_spi = -1;
-static int hf_isakmp_vid_bytes = -1;
-static int hf_isakmp_vid_string = -1;
-static int hf_isakmp_vid_cp_product = -1;
-static int hf_isakmp_vid_cp_version = -1;
-static int hf_isakmp_vid_cp_timestamp = -1;
-static int hf_isakmp_vid_cp_reserved = -1;
-static int hf_isakmp_vid_cp_features = -1;
-static int hf_isakmp_vid_cisco_unity_major = -1;
-static int hf_isakmp_vid_cisco_unity_minor = -1;
-static int hf_isakmp_vid_ms_nt5_isakmpoakley = -1;
-static int hf_isakmp_vid_aruba_via_auth_profile = -1;
-static int hf_isakmp_vid_fortinet_fortigate_release = -1;
-static int hf_isakmp_vid_fortinet_fortigate_build = -1;
-static int hf_isakmp_ts_number_of_ts = -1;
-static int hf_isakmp_ts_type = -1;
-static int hf_isakmp_ts_protoid = -1;
-static int hf_isakmp_ts_selector_length = -1;
-static int hf_isakmp_ts_start_port = -1;
-static int hf_isakmp_ts_end_port = -1;
-static int hf_isakmp_ts_start_addr_ipv4 = -1;
-static int hf_isakmp_ts_end_addr_ipv4 = -1;
-static int hf_isakmp_ts_start_addr_ipv6 = -1;
-static int hf_isakmp_ts_end_addr_ipv6 = -1;
-static int hf_isakmp_ts_start_addr_fc = -1;
-static int hf_isakmp_ts_end_addr_fc = -1;
-static int hf_isakmp_ts_start_r_ctl = -1;
-static int hf_isakmp_ts_end_r_ctl = -1;
-static int hf_isakmp_ts_start_type = -1;
-static int hf_isakmp_ts_end_type = -1;
-static int hf_isakmp_ts_data = -1;
-static int hf_isakmp_num_spis = -1;
-static int hf_isakmp_hash = -1;
-static int hf_isakmp_sig = -1;
-static int hf_isakmp_nonce = -1;
-
-static int hf_isakmp_notify_data_3gpp_backoff_timer_len = -1;
-
-static int hf_isakmp_notify_data_3gpp_device_identity_len = -1;
-static int hf_isakmp_notify_data_3gpp_device_identity_type = -1;
-static int hf_isakmp_notify_data_3gpp_device_identity_imei = -1;
-static int hf_isakmp_notify_data_3gpp_device_identity_imeisv = -1;
-
-static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_len = -1;
-static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_spare = -1;
-static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_element_len = -1;
-static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_flags = -1;
-
-static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_flag_b1_police = -1;
-static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_flag_b2_ambulance = -1;
-static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_flag_b3_fire_brigade = -1;
-static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_flag_b4_marine_guard = -1;
-static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_flag_b5_mountain_rescue = -1;
-
-static int hf_iskamp_notify_data_3gpp_emergency_call_number = -1;
+static int hf_isakmp_notify_data_rohc_attr_max_cid;
+static int hf_isakmp_notify_data_rohc_attr_profile;
+static int hf_isakmp_notify_data_rohc_attr_integ;
+static int hf_isakmp_notify_data_rohc_attr_icv_len;
+static int hf_isakmp_notify_data_rohc_attr_mrru;
+static int hf_isakmp_notify_data_qcd_token_secret_data;
+static int hf_isakmp_notify_data_ha_nonce_data;
+static int hf_isakmp_notify_data_ha_expected_send_req_msg_id;
+static int hf_isakmp_notify_data_ha_expected_recv_req_msg_id;
+static int hf_isakmp_notify_data_ha_incoming_ipsec_sa_delta_value;
+static int hf_isakmp_notify_data_secure_password_methods;
+static int hf_isakmp_notify_data_signature_hash_algorithms;
+static int hf_isakmp_delete_doi;
+static int hf_isakmp_delete_protoid_v1;
+static int hf_isakmp_delete_protoid_v2;
+static int hf_isakmp_delete_spi;
+static int hf_isakmp_vid_bytes;
+static int hf_isakmp_vid_string;
+static int hf_isakmp_vid_cp_product;
+static int hf_isakmp_vid_cp_version;
+static int hf_isakmp_vid_cp_timestamp;
+static int hf_isakmp_vid_cp_reserved;
+static int hf_isakmp_vid_cp_features;
+static int hf_isakmp_vid_cisco_unity_major;
+static int hf_isakmp_vid_cisco_unity_minor;
+static int hf_isakmp_vid_ms_nt5_isakmpoakley;
+static int hf_isakmp_vid_aruba_via_auth_profile;
+static int hf_isakmp_vid_fortinet_fortigate_release;
+static int hf_isakmp_vid_fortinet_fortigate_build;
+static int hf_isakmp_ts_number_of_ts;
+static int hf_isakmp_ts_type;
+static int hf_isakmp_ts_protoid;
+static int hf_isakmp_ts_selector_length;
+static int hf_isakmp_ts_start_port;
+static int hf_isakmp_ts_end_port;
+static int hf_isakmp_ts_start_addr_ipv4;
+static int hf_isakmp_ts_end_addr_ipv4;
+static int hf_isakmp_ts_start_addr_ipv6;
+static int hf_isakmp_ts_end_addr_ipv6;
+static int hf_isakmp_ts_start_addr_fc;
+static int hf_isakmp_ts_end_addr_fc;
+static int hf_isakmp_ts_start_r_ctl;
+static int hf_isakmp_ts_end_r_ctl;
+static int hf_isakmp_ts_start_type;
+static int hf_isakmp_ts_end_type;
+static int hf_isakmp_ts_data;
+static int hf_isakmp_num_spis;
+static int hf_isakmp_hash;
+static int hf_isakmp_sig;
+static int hf_isakmp_nonce;
+
+static int hf_isakmp_notify_data_3gpp_backoff_timer_len;
+
+static int hf_isakmp_notify_data_3gpp_device_identity_len;
+static int hf_isakmp_notify_data_3gpp_device_identity_type;
+static int hf_isakmp_notify_data_3gpp_device_identity_imei;
+static int hf_isakmp_notify_data_3gpp_device_identity_imeisv;
+
+static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_len;
+static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_spare;
+static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_element_len;
+static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_flags;
+
+static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_flag_b1_police;
+static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_flag_b2_ambulance;
+static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_flag_b3_fire_brigade;
+static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_flag_b4_marine_guard;
+static int hf_isakmp_notify_data_3gpp_emergency_call_numbers_flag_b5_mountain_rescue;
+
+static int hf_iskamp_notify_data_3gpp_emergency_call_number;
 
 static attribute_common_fields hf_isakmp_tek_key_attr;
 
 static attribute_common_fields hf_isakmp_ipsec_attr;
-static int hf_isakmp_ipsec_attr_life_type = -1;
-static int hf_isakmp_ipsec_attr_life_duration_uint32 = -1;
-static int hf_isakmp_ipsec_attr_life_duration_uint64 = -1;
-static int hf_isakmp_ipsec_attr_life_duration_bytes = -1;
-static int hf_isakmp_ipsec_attr_group_description = -1;
-static int hf_isakmp_ipsec_attr_encap_mode = -1;
-static int hf_isakmp_ipsec_attr_auth_algorithm = -1;
-static int hf_isakmp_ipsec_attr_key_length = -1;
-static int hf_isakmp_ipsec_attr_key_rounds = -1;
-static int hf_isakmp_ipsec_attr_cmpr_dict_size = -1;
-static int hf_isakmp_ipsec_attr_cmpr_algorithm = -1;
-static int hf_isakmp_ipsec_attr_ecn_tunnel = -1;
-static int hf_isakmp_ipsec_attr_ext_seq_nbr = -1;
-static int hf_isakmp_ipsec_attr_auth_key_length = -1;
-static int hf_isakmp_ipsec_attr_sig_enco_algorithm = -1;
-static int hf_isakmp_ipsec_attr_addr_preservation = -1;
-static int hf_isakmp_ipsec_attr_sa_direction = -1;
+static int hf_isakmp_ipsec_attr_life_type;
+static int hf_isakmp_ipsec_attr_life_duration_uint32;
+static int hf_isakmp_ipsec_attr_life_duration_uint64;
+static int hf_isakmp_ipsec_attr_life_duration_bytes;
+static int hf_isakmp_ipsec_attr_group_description;
+static int hf_isakmp_ipsec_attr_encap_mode;
+static int hf_isakmp_ipsec_attr_auth_algorithm;
+static int hf_isakmp_ipsec_attr_key_length;
+static int hf_isakmp_ipsec_attr_key_rounds;
+static int hf_isakmp_ipsec_attr_cmpr_dict_size;
+static int hf_isakmp_ipsec_attr_cmpr_algorithm;
+static int hf_isakmp_ipsec_attr_ecn_tunnel;
+static int hf_isakmp_ipsec_attr_ext_seq_nbr;
+static int hf_isakmp_ipsec_attr_auth_key_length;
+static int hf_isakmp_ipsec_attr_sig_enco_algorithm;
+static int hf_isakmp_ipsec_attr_addr_preservation;
+static int hf_isakmp_ipsec_attr_sa_direction;
 
 static attribute_common_fields hf_isakmp_resp_lifetime_ipsec_attr;
-static int hf_isakmp_resp_lifetime_ipsec_attr_life_type = -1;
-static int hf_isakmp_resp_lifetime_ipsec_attr_life_duration_uint32 = -1;
-static int hf_isakmp_resp_lifetime_ipsec_attr_life_duration_uint64 = -1;
-static int hf_isakmp_resp_lifetime_ipsec_attr_life_duration_bytes = -1;
+static int hf_isakmp_resp_lifetime_ipsec_attr_life_type;
+static int hf_isakmp_resp_lifetime_ipsec_attr_life_duration_uint32;
+static int hf_isakmp_resp_lifetime_ipsec_attr_life_duration_uint64;
+static int hf_isakmp_resp_lifetime_ipsec_attr_life_duration_bytes;
 
 static attribute_common_fields hf_isakmp_ike_attr;
-static int hf_isakmp_ike_attr_encryption_algorithm = -1;
-static int hf_isakmp_ike_attr_hash_algorithm = -1;
-static int hf_isakmp_ike_attr_authentication_method = -1;
-static int hf_isakmp_ike_attr_group_description = -1;
-static int hf_isakmp_ike_attr_group_type = -1;
-static int hf_isakmp_ike_attr_group_prime = -1;
-static int hf_isakmp_ike_attr_group_generator_one = -1;
-static int hf_isakmp_ike_attr_group_generator_two = -1;
-static int hf_isakmp_ike_attr_group_curve_a = -1;
-static int hf_isakmp_ike_attr_group_curve_b = -1;
-static int hf_isakmp_ike_attr_life_type = -1;
-static int hf_isakmp_ike_attr_life_duration_uint32 = -1;
-static int hf_isakmp_ike_attr_life_duration_uint64 = -1;
-static int hf_isakmp_ike_attr_life_duration_bytes = -1;
-static int hf_isakmp_ike_attr_prf = -1;
-static int hf_isakmp_ike_attr_key_length = -1;
-static int hf_isakmp_ike_attr_field_size = -1;
-static int hf_isakmp_ike_attr_group_order = -1;
-static int hf_isakmp_ike_attr_block_size = -1;
-static int hf_isakmp_ike_attr_asymmetric_cryptographic_algorithm_type = -1;
+static int hf_isakmp_ike_attr_encryption_algorithm;
+static int hf_isakmp_ike_attr_hash_algorithm;
+static int hf_isakmp_ike_attr_authentication_method;
+static int hf_isakmp_ike_attr_group_description;
+static int hf_isakmp_ike_attr_group_type;
+static int hf_isakmp_ike_attr_group_prime;
+static int hf_isakmp_ike_attr_group_generator_one;
+static int hf_isakmp_ike_attr_group_generator_two;
+static int hf_isakmp_ike_attr_group_curve_a;
+static int hf_isakmp_ike_attr_group_curve_b;
+static int hf_isakmp_ike_attr_life_type;
+static int hf_isakmp_ike_attr_life_duration_uint32;
+static int hf_isakmp_ike_attr_life_duration_uint64;
+static int hf_isakmp_ike_attr_life_duration_bytes;
+static int hf_isakmp_ike_attr_prf;
+static int hf_isakmp_ike_attr_key_length;
+static int hf_isakmp_ike_attr_field_size;
+static int hf_isakmp_ike_attr_group_order;
+static int hf_isakmp_ike_attr_block_size;
+static int hf_isakmp_ike_attr_asymmetric_cryptographic_algorithm_type;
 
 static attribute_common_fields hf_isakmp_resp_lifetime_ike_attr;
-static int hf_isakmp_resp_lifetime_ike_attr_life_type = -1;
-static int hf_isakmp_resp_lifetime_ike_attr_life_duration_uint32 = -1;
-static int hf_isakmp_resp_lifetime_ike_attr_life_duration_uint64 = -1;
-static int hf_isakmp_resp_lifetime_ike_attr_life_duration_bytes = -1;
-
-static int hf_isakmp_trans_type = -1;
-static int hf_isakmp_trans_encr = -1;
-static int hf_isakmp_trans_prf = -1;
-static int hf_isakmp_trans_integ = -1;
-static int hf_isakmp_trans_dh = -1;
-static int hf_isakmp_trans_esn = -1;
-static int hf_isakmp_trans_id_v2 = -1;
+static int hf_isakmp_resp_lifetime_ike_attr_life_type;
+static int hf_isakmp_resp_lifetime_ike_attr_life_duration_uint32;
+static int hf_isakmp_resp_lifetime_ike_attr_life_duration_uint64;
+static int hf_isakmp_resp_lifetime_ike_attr_life_duration_bytes;
+
+static int hf_isakmp_trans_type;
+static int hf_isakmp_trans_encr;
+static int hf_isakmp_trans_prf;
+static int hf_isakmp_trans_integ;
+static int hf_isakmp_trans_dh;
+static int hf_isakmp_trans_esn;
+static int hf_isakmp_trans_id_v2;
 
 static attribute_common_fields hf_isakmp_ike2_attr;
-static int hf_isakmp_ike2_attr_key_length = -1;
+static int hf_isakmp_ike2_attr_key_length;
 
-static int hf_isakmp_fragments = -1;
-static int hf_isakmp_fragment = -1;
-static int hf_isakmp_fragment_overlap = -1;
-static int hf_isakmp_fragment_overlap_conflicts = -1;
-static int hf_isakmp_fragment_multiple_tails = -1;
-static int hf_isakmp_fragment_too_long_fragment = -1;
-static int hf_isakmp_fragment_error = -1;
-static int hf_isakmp_fragment_count = -1;
-static int hf_isakmp_reassembled_in = -1;
-static int hf_isakmp_reassembled_length = -1;
+static int hf_isakmp_fragments;
+static int hf_isakmp_fragment;
+static int hf_isakmp_fragment_overlap;
+static int hf_isakmp_fragment_overlap_conflicts;
+static int hf_isakmp_fragment_multiple_tails;
+static int hf_isakmp_fragment_too_long_fragment;
+static int hf_isakmp_fragment_error;
+static int hf_isakmp_fragment_count;
+static int hf_isakmp_reassembled_in;
+static int hf_isakmp_reassembled_length;
 
-static int hf_isakmp_ike2_fragment_number = -1;
-static int hf_isakmp_ike2_total_fragments = -1;
+static int hf_isakmp_ike2_fragment_number;
+static int hf_isakmp_ike2_total_fragments;
 
-static int hf_isakmp_cisco_frag_packetid = -1;
-static int hf_isakmp_cisco_frag_seq = -1;
-static int hf_isakmp_cisco_frag_last = -1;
+static int hf_isakmp_cisco_frag_packetid;
+static int hf_isakmp_cisco_frag_seq;
+static int hf_isakmp_cisco_frag_last;
 
-static int hf_isakmp_key_exch_dh_group = -1;
-static int hf_isakmp_key_exch_data = -1;
-static int hf_isakmp_eap_data = -1;
+static int hf_isakmp_key_exch_dh_group;
+static int hf_isakmp_key_exch_data;
+static int hf_isakmp_eap_data;
 
-static int hf_isakmp_gspm_data = -1;
+static int hf_isakmp_gspm_data;
 
-static int hf_isakmp_cfg_type_v1 = -1;
-static int hf_isakmp_cfg_identifier = -1;
-static int hf_isakmp_cfg_type_v2 = -1;
+static int hf_isakmp_cfg_type_v1;
+static int hf_isakmp_cfg_identifier;
+static int hf_isakmp_cfg_type_v2;
 
 static attribute_common_fields hf_isakmp_cfg_attr;
-static int hf_isakmp_cfg_attr_type_v1 = -1;
-static int hf_isakmp_cfg_attr_type_v2 = -1;
-
-static int hf_isakmp_cfg_attr_internal_ip4_address = -1;
-static int hf_isakmp_cfg_attr_internal_ip4_netmask = -1;
-static int hf_isakmp_cfg_attr_internal_ip4_dns = -1;
-static int hf_isakmp_cfg_attr_internal_ip4_nbns = -1;
-static int hf_isakmp_cfg_attr_internal_address_expiry = -1;
-static int hf_isakmp_cfg_attr_internal_ip4_dhcp = -1;
-static int hf_isakmp_cfg_attr_application_version = -1;
-static int hf_isakmp_cfg_attr_internal_ip6_address_ip = -1;
-static int hf_isakmp_cfg_attr_internal_ip6_address_prefix = -1;
-static int hf_isakmp_cfg_attr_internal_ip6_netmask = -1;
-static int hf_isakmp_cfg_attr_internal_ip6_dns = -1;
-static int hf_isakmp_cfg_attr_internal_ip6_nbns = -1;
-static int hf_isakmp_cfg_attr_internal_ip6_dhcp = -1;
-static int hf_isakmp_cfg_attr_internal_ip4_subnet_ip = -1;
-static int hf_isakmp_cfg_attr_internal_ip4_subnet_netmask = -1;
-static int hf_isakmp_cfg_attr_supported_attributes = -1;
-static int hf_isakmp_cfg_attr_internal_ip6_subnet_ip = -1;
-static int hf_isakmp_cfg_attr_internal_ip6_subnet_prefix = -1;
-static int hf_isakmp_cfg_attr_internal_ip6_link_interface = -1;
-static int hf_isakmp_cfg_attr_internal_ip6_link_id = -1;
-static int hf_isakmp_cfg_attr_internal_ip6_prefix_ip = -1;
-static int hf_isakmp_cfg_attr_internal_ip6_prefix_length = -1;
-static int hf_isakmp_cfg_attr_p_cscf_ip4_address = -1;
-static int hf_isakmp_cfg_attr_p_cscf_ip6_address = -1;
-static int hf_isakmp_cfg_attr_xauth_type = -1;
-static int hf_isakmp_cfg_attr_xauth_user_name = -1;
-static int hf_isakmp_cfg_attr_xauth_user_password = -1;
-static int hf_isakmp_cfg_attr_xauth_passcode = -1;
-static int hf_isakmp_cfg_attr_xauth_message = -1;
-static int hf_isakmp_cfg_attr_xauth_challenge = -1;
-static int hf_isakmp_cfg_attr_xauth_domain = -1;
-static int hf_isakmp_cfg_attr_xauth_status = -1;
-static int hf_isakmp_cfg_attr_xauth_next_pin = -1;
-static int hf_isakmp_cfg_attr_xauth_answer = -1;
-static int hf_isakmp_cfg_attr_unity_banner = -1;
-static int hf_isakmp_cfg_attr_unity_def_domain = -1;
-
-static int hf_isakmp_sak_next_payload = -1;
-static int hf_isakmp_sak_reserved = -1;
-static int hf_isakmp_sak_payload_len = -1;
-static int hf_isakmp_sak_protocol = -1;
-static int hf_isakmp_sak_src_id_type = -1;
-static int hf_isakmp_sak_src_id_port = -1;
-static int hf_isakmp_sak_src_id_length = -1;
-static int hf_isakmp_sak_src_id_data = -1;
-static int hf_isakmp_sak_dst_id_type = -1;
-static int hf_isakmp_sak_dst_id_port = -1;
-static int hf_isakmp_sak_dst_id_length = -1;
-static int hf_isakmp_sak_dst_id_data = -1;
-static int hf_isakmp_sak_spi = -1;
-
-static int hf_isakmp_sat_next_payload = -1;
-static int hf_isakmp_sat_reserved = -1;
-static int hf_isakmp_sat_payload_len = -1;
-static int hf_isakmp_sat_protocol_id = -1;
-static int hf_isakmp_sat_protocol = -1;
-static int hf_isakmp_sat_src_id_type = -1;
-static int hf_isakmp_sat_src_id_port = -1;
-static int hf_isakmp_sat_src_id_length = -1;
-static int hf_isakmp_sat_src_id_data = -1;
-static int hf_isakmp_sat_dst_id_type = -1;
-static int hf_isakmp_sat_dst_id_port = -1;
-static int hf_isakmp_sat_dst_id_length = -1;
-static int hf_isakmp_sat_dst_id_data = -1;
-static int hf_isakmp_sat_transform_id = -1;
-static int hf_isakmp_sat_spi = -1;
-static int hf_isakmp_sat_payload = -1;
-
-static int hf_isakmp_kd_num_key_pkt = -1;
-static int hf_isakmp_kd_payload = -1;
-static int hf_isakmp_kdp_type = -1;
-static int hf_isakmp_kdp_length = -1;
-static int hf_isakmp_kdp_spi_size = -1;
-static int hf_isakmp_kdp_spi = -1;
-
-static int hf_isakmp_seq_seq = -1;
-
-static int hf_isakmp_enc_decrypted_data = -1;
-static int hf_isakmp_enc_contained_data = -1;
-static int hf_isakmp_enc_pad_length= -1;
-static int hf_isakmp_enc_padding = -1;
-static int hf_isakmp_enc_data = -1;
-static int hf_isakmp_enc_iv = -1;
-static int hf_isakmp_enc_icd = -1;
-
-static gint ett_isakmp = -1;
-static gint ett_isakmp_version = -1;
-static gint ett_isakmp_flags = -1;
-static gint ett_isakmp_payload = -1;
-static gint ett_isakmp_payload_digital_signature = -1;
-static gint ett_isakmp_payload_digital_signature_asn1_data = -1;
-static gint ett_isakmp_fragment = -1;
-static gint ett_isakmp_fragments = -1;
-static gint ett_isakmp_sa = -1;
-static gint ett_isakmp_attr = -1;
-static gint ett_isakmp_id = -1;
-static gint ett_isakmp_notify_data = -1;
-static gint ett_isakmp_notify_data_3gpp_emergency_call_numbers_main = -1;
-static gint ett_isakmp_notify_data_3gpp_emergency_call_numbers_element = -1;
-static gint ett_isakmp_ts = -1;
-static gint ett_isakmp_kd = -1;
+static int hf_isakmp_cfg_attr_type_v1;
+static int hf_isakmp_cfg_attr_type_v2;
+
+static int hf_isakmp_cfg_attr_internal_ip4_address;
+static int hf_isakmp_cfg_attr_internal_ip4_netmask;
+static int hf_isakmp_cfg_attr_internal_ip4_dns;
+static int hf_isakmp_cfg_attr_internal_ip4_nbns;
+static int hf_isakmp_cfg_attr_internal_address_expiry;
+static int hf_isakmp_cfg_attr_internal_ip4_dhcp;
+static int hf_isakmp_cfg_attr_application_version;
+static int hf_isakmp_cfg_attr_internal_ip6_address_ip;
+static int hf_isakmp_cfg_attr_internal_ip6_address_prefix;
+static int hf_isakmp_cfg_attr_internal_ip6_netmask;
+static int hf_isakmp_cfg_attr_internal_ip6_dns;
+static int hf_isakmp_cfg_attr_internal_ip6_nbns;
+static int hf_isakmp_cfg_attr_internal_ip6_dhcp;
+static int hf_isakmp_cfg_attr_internal_ip4_subnet_ip;
+static int hf_isakmp_cfg_attr_internal_ip4_subnet_netmask;
+static int hf_isakmp_cfg_attr_supported_attributes;
+static int hf_isakmp_cfg_attr_internal_ip6_subnet_ip;
+static int hf_isakmp_cfg_attr_internal_ip6_subnet_prefix;
+static int hf_isakmp_cfg_attr_internal_ip6_link_interface;
+static int hf_isakmp_cfg_attr_internal_ip6_link_id;
+static int hf_isakmp_cfg_attr_internal_ip6_prefix_ip;
+static int hf_isakmp_cfg_attr_internal_ip6_prefix_length;
+static int hf_isakmp_cfg_attr_p_cscf_ip4_address;
+static int hf_isakmp_cfg_attr_p_cscf_ip6_address;
+static int hf_isakmp_cfg_attr_xauth_type;
+static int hf_isakmp_cfg_attr_xauth_user_name;
+static int hf_isakmp_cfg_attr_xauth_user_password;
+static int hf_isakmp_cfg_attr_xauth_passcode;
+static int hf_isakmp_cfg_attr_xauth_message;
+static int hf_isakmp_cfg_attr_xauth_challenge;
+static int hf_isakmp_cfg_attr_xauth_domain;
+static int hf_isakmp_cfg_attr_xauth_status;
+static int hf_isakmp_cfg_attr_xauth_next_pin;
+static int hf_isakmp_cfg_attr_xauth_answer;
+static int hf_isakmp_cfg_attr_unity_banner;
+static int hf_isakmp_cfg_attr_unity_def_domain;
+
+static int hf_isakmp_sak_next_payload;
+static int hf_isakmp_sak_reserved;
+static int hf_isakmp_sak_payload_len;
+static int hf_isakmp_sak_protocol;
+static int hf_isakmp_sak_src_id_type;
+static int hf_isakmp_sak_src_id_port;
+static int hf_isakmp_sak_src_id_length;
+static int hf_isakmp_sak_src_id_data;
+static int hf_isakmp_sak_dst_id_type;
+static int hf_isakmp_sak_dst_id_port;
+static int hf_isakmp_sak_dst_id_length;
+static int hf_isakmp_sak_dst_id_data;
+static int hf_isakmp_sak_spi;
+
+static int hf_isakmp_sat_next_payload;
+static int hf_isakmp_sat_reserved;
+static int hf_isakmp_sat_payload_len;
+static int hf_isakmp_sat_protocol_id;
+static int hf_isakmp_sat_protocol;
+static int hf_isakmp_sat_src_id_type;
+static int hf_isakmp_sat_src_id_port;
+static int hf_isakmp_sat_src_id_length;
+static int hf_isakmp_sat_src_id_data;
+static int hf_isakmp_sat_dst_id_type;
+static int hf_isakmp_sat_dst_id_port;
+static int hf_isakmp_sat_dst_id_length;
+static int hf_isakmp_sat_dst_id_data;
+static int hf_isakmp_sat_transform_id;
+static int hf_isakmp_sat_spi;
+static int hf_isakmp_sat_payload;
+
+static int hf_isakmp_kd_num_key_pkt;
+static int hf_isakmp_kd_payload;
+static int hf_isakmp_kdp_type;
+static int hf_isakmp_kdp_length;
+static int hf_isakmp_kdp_spi_size;
+static int hf_isakmp_kdp_spi;
+
+static int hf_isakmp_seq_seq;
+
+static int hf_isakmp_enc_decrypted_data;
+static int hf_isakmp_enc_contained_data;
+static int hf_isakmp_enc_pad_length;
+static int hf_isakmp_enc_padding;
+static int hf_isakmp_enc_data;
+static int hf_isakmp_enc_iv;
+static int hf_isakmp_enc_icd;
+
+static gint ett_isakmp;
+static gint ett_isakmp_version;
+static gint ett_isakmp_flags;
+static gint ett_isakmp_payload;
+static gint ett_isakmp_payload_digital_signature;
+static gint ett_isakmp_payload_digital_signature_asn1_data;
+static gint ett_isakmp_fragment;
+static gint ett_isakmp_fragments;
+static gint ett_isakmp_sa;
+static gint ett_isakmp_attr;
+static gint ett_isakmp_id;
+static gint ett_isakmp_notify_data;
+static gint ett_isakmp_notify_data_3gpp_emergency_call_numbers_main;
+static gint ett_isakmp_notify_data_3gpp_emergency_call_numbers_element;
+static gint ett_isakmp_ts;
+static gint ett_isakmp_kd;
 /* For decrypted IKEv2 Encrypted payload*/
-static gint ett_isakmp_decrypted_data = -1;
-static gint ett_isakmp_decrypted_payloads = -1;
-
-static expert_field ei_isakmp_enc_iv = EI_INIT;
-static expert_field ei_isakmp_ikev2_integrity_checksum = EI_INIT;
-static expert_field ei_isakmp_enc_data_length_mult_block_size = EI_INIT;
-static expert_field ei_isakmp_enc_pad_length_big = EI_INIT;
-static expert_field ei_isakmp_attribute_value_empty = EI_INIT;
-static expert_field ei_isakmp_payload_bad_length = EI_INIT;
-static expert_field ei_isakmp_bad_fragment_number = EI_INIT;
-static expert_field ei_isakmp_notify_data_3gpp_unknown_device_identity = EI_INIT;
+static gint ett_isakmp_decrypted_data;
+static gint ett_isakmp_decrypted_payloads;
+
+static expert_field ei_isakmp_enc_iv;
+static expert_field ei_isakmp_ikev2_integrity_checksum;
+static expert_field ei_isakmp_enc_data_length_mult_block_size;
+static expert_field ei_isakmp_enc_pad_length_big;
+static expert_field ei_isakmp_attribute_value_empty;
+static expert_field ei_isakmp_payload_bad_length;
+static expert_field ei_isakmp_bad_fragment_number;
+static expert_field ei_isakmp_notify_data_3gpp_unknown_device_identity;
 
 static dissector_handle_t eap_handle = NULL;
 static dissector_handle_t isakmp_handle;
diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c
index 0741025c25..435a46b3c7 100644
--- a/epan/dissectors/packet-iscsi.c
+++ b/epan/dissectors/packet-iscsi.c
@@ -73,126 +73,126 @@ static range_t *global_iscsi_port_range;
 static guint iscsi_system_port = 860;
 
 /* Initialize the protocol and registered fields */
-static int proto_iscsi = -1;
-static int hf_iscsi_time = -1;
-static int hf_iscsi_request_frame = -1;
-static int hf_iscsi_data_in_frame = -1;
-static int hf_iscsi_data_out_frame = -1;
-static int hf_iscsi_response_frame = -1;
-static int hf_iscsi_AHS_length = -1;
-static int hf_iscsi_AHS_type = -1;
-static int hf_iscsi_AHS_blob = -1;
-static int hf_iscsi_AHS_read_data_length = -1;
-static int hf_iscsi_AHS_extended_cdb = -1;
-static int hf_iscsi_Padding = -1;
-static int hf_iscsi_ping_data = -1;
-static int hf_iscsi_immediate_data = -1;
-static int hf_iscsi_async_event_data = -1;
-static int hf_iscsi_vendor_specific_data = -1;
-static int hf_iscsi_Opcode = -1;
-static int hf_iscsi_Flags = -1;
-static int hf_iscsi_HeaderDigest32 = -1;
-static int hf_iscsi_DataDigest32 = -1;
+static int proto_iscsi;
+static int hf_iscsi_time;
+static int hf_iscsi_request_frame;
+static int hf_iscsi_data_in_frame;
+static int hf_iscsi_data_out_frame;
+static int hf_iscsi_response_frame;
+static int hf_iscsi_AHS_length;
+static int hf_iscsi_AHS_type;
+static int hf_iscsi_AHS_blob;
+static int hf_iscsi_AHS_read_data_length;
+static int hf_iscsi_AHS_extended_cdb;
+static int hf_iscsi_Padding;
+static int hf_iscsi_ping_data;
+static int hf_iscsi_immediate_data;
+static int hf_iscsi_async_event_data;
+static int hf_iscsi_vendor_specific_data;
+static int hf_iscsi_Opcode;
+static int hf_iscsi_Flags;
+static int hf_iscsi_HeaderDigest32;
+static int hf_iscsi_DataDigest32;
 /* #ifdef DRAFT08 */
-static int hf_iscsi_X = -1;
+static int hf_iscsi_X;
 /* #endif */
-static int hf_iscsi_I = -1;
-static int hf_iscsi_SCSICommand_F = -1;
-static int hf_iscsi_SCSICommand_R = -1;
-static int hf_iscsi_SCSICommand_W = -1;
-static int hf_iscsi_SCSICommand_Attr = -1;
-static int hf_iscsi_SCSICommand_CRN = -1;
-static int hf_iscsi_DataSegmentLength = -1;
-static int hf_iscsi_TotalAHSLength = -1;
-static int hf_iscsi_InitiatorTaskTag = -1;
-static int hf_iscsi_ExpectedDataTransferLength = -1;
-static int hf_iscsi_CmdSN = -1;
-static int hf_iscsi_ExpStatSN = -1;
-static int hf_iscsi_StatSN = -1;
-static int hf_iscsi_ExpCmdSN = -1;
-static int hf_iscsi_MaxCmdSN = -1;
-static int hf_iscsi_SCSIResponse_o = -1;
-static int hf_iscsi_SCSIResponse_u = -1;
-static int hf_iscsi_SCSIResponse_O = -1;
-static int hf_iscsi_SCSIResponse_U = -1;
-static int hf_iscsi_SCSIResponse_BidiReadResidualCount = -1;
-static int hf_iscsi_SCSIResponse_ResidualCount = -1;
-static int hf_iscsi_SCSIResponse_Response = -1;
-static int hf_iscsi_SCSIResponse_Status = -1;
-static int hf_iscsi_SenseLength = -1;
-static int hf_iscsi_SCSIData_F = -1;
-static int hf_iscsi_SCSIData_A = -1;
-static int hf_iscsi_SCSIData_S = -1;
-static int hf_iscsi_SCSIData_O = -1;
-static int hf_iscsi_SCSIData_U = -1;
-static int hf_iscsi_TargetTransferTag = -1;
-static int hf_iscsi_DataSN = -1;
-static int hf_iscsi_BufferOffset = -1;
-static int hf_iscsi_SCSIData_ResidualCount = -1;
-static int hf_iscsi_VersionMin = -1;
-static int hf_iscsi_VersionMax = -1;
-static int hf_iscsi_VersionActive = -1;
-static int hf_iscsi_CID = -1;
-static int hf_iscsi_ISID8 = -1;
-static int hf_iscsi_ISID = -1;
+static int hf_iscsi_I;
+static int hf_iscsi_SCSICommand_F;
+static int hf_iscsi_SCSICommand_R;
+static int hf_iscsi_SCSICommand_W;
+static int hf_iscsi_SCSICommand_Attr;
+static int hf_iscsi_SCSICommand_CRN;
+static int hf_iscsi_DataSegmentLength;
+static int hf_iscsi_TotalAHSLength;
+static int hf_iscsi_InitiatorTaskTag;
+static int hf_iscsi_ExpectedDataTransferLength;
+static int hf_iscsi_CmdSN;
+static int hf_iscsi_ExpStatSN;
+static int hf_iscsi_StatSN;
+static int hf_iscsi_ExpCmdSN;
+static int hf_iscsi_MaxCmdSN;
+static int hf_iscsi_SCSIResponse_o;
+static int hf_iscsi_SCSIResponse_u;
+static int hf_iscsi_SCSIResponse_O;
+static int hf_iscsi_SCSIResponse_U;
+static int hf_iscsi_SCSIResponse_BidiReadResidualCount;
+static int hf_iscsi_SCSIResponse_ResidualCount;
+static int hf_iscsi_SCSIResponse_Response;
+static int hf_iscsi_SCSIResponse_Status;
+static int hf_iscsi_SenseLength;
+static int hf_iscsi_SCSIData_F;
+static int hf_iscsi_SCSIData_A;
+static int hf_iscsi_SCSIData_S;
+static int hf_iscsi_SCSIData_O;
+static int hf_iscsi_SCSIData_U;
+static int hf_iscsi_TargetTransferTag;
+static int hf_iscsi_DataSN;
+static int hf_iscsi_BufferOffset;
+static int hf_iscsi_SCSIData_ResidualCount;
+static int hf_iscsi_VersionMin;
+static int hf_iscsi_VersionMax;
+static int hf_iscsi_VersionActive;
+static int hf_iscsi_CID;
+static int hf_iscsi_ISID8;
+static int hf_iscsi_ISID;
 /* #if defined(DRAFT09) */
-static int hf_iscsi_ISID_Type = -1;
-static int hf_iscsi_ISID_NamingAuthority = -1;
-static int hf_iscsi_ISID_Qualifier = -1;
+static int hf_iscsi_ISID_Type;
+static int hf_iscsi_ISID_NamingAuthority;
+static int hf_iscsi_ISID_Qualifier;
 /* #elif !defined(DRAFT08) */
-static int hf_iscsi_ISID_t = -1;
-static int hf_iscsi_ISID_a = -1;
-static int hf_iscsi_ISID_b = -1;
-static int hf_iscsi_ISID_c = -1;
-static int hf_iscsi_ISID_d = -1;
+static int hf_iscsi_ISID_t;
+static int hf_iscsi_ISID_a;
+static int hf_iscsi_ISID_b;
+static int hf_iscsi_ISID_c;
+static int hf_iscsi_ISID_d;
 /* #endif */
-static int hf_iscsi_TSID = -1;
-static int hf_iscsi_TSIH = -1;
+static int hf_iscsi_TSID;
+static int hf_iscsi_TSIH;
 /* #ifdef DRAFT09 */
-static int hf_iscsi_Login_X = -1;
+static int hf_iscsi_Login_X;
 /* #endif */
-static int hf_iscsi_Login_C = -1;
-static int hf_iscsi_Login_T = -1;
-static int hf_iscsi_Login_CSG = -1;
-static int hf_iscsi_Login_NSG = -1;
-static int hf_iscsi_Login_Status = -1;
-static int hf_iscsi_KeyValue = -1;
-static int hf_iscsi_Text_C = -1;
-static int hf_iscsi_Text_F = -1;
-static int hf_iscsi_ExpDataSN = -1;
-static int hf_iscsi_R2TSN = -1;
-static int hf_iscsi_TaskManagementFunction_ReferencedTaskTag = -1;
-static int hf_iscsi_RefCmdSN = -1;
-static int hf_iscsi_TaskManagementFunction_Function = -1;
-static int hf_iscsi_TaskManagementFunction_Response = -1;
-static int hf_iscsi_Logout_Reason = -1;
-static int hf_iscsi_Logout_Response = -1;
-static int hf_iscsi_Time2Wait = -1;
-static int hf_iscsi_Time2Retain = -1;
-static int hf_iscsi_DesiredDataLength = -1;
-static int hf_iscsi_AsyncEvent = -1;
-static int hf_iscsi_EventVendorCode = -1;
-static int hf_iscsi_Parameter1 = -1;
-static int hf_iscsi_Parameter2 = -1;
-static int hf_iscsi_Parameter3 = -1;
-static int hf_iscsi_Reject_Reason = -1;
-static int hf_iscsi_snack_type = -1;
-static int hf_iscsi_BegRun = -1;
-static int hf_iscsi_RunLength = -1;
+static int hf_iscsi_Login_C;
+static int hf_iscsi_Login_T;
+static int hf_iscsi_Login_CSG;
+static int hf_iscsi_Login_NSG;
+static int hf_iscsi_Login_Status;
+static int hf_iscsi_KeyValue;
+static int hf_iscsi_Text_C;
+static int hf_iscsi_Text_F;
+static int hf_iscsi_ExpDataSN;
+static int hf_iscsi_R2TSN;
+static int hf_iscsi_TaskManagementFunction_ReferencedTaskTag;
+static int hf_iscsi_RefCmdSN;
+static int hf_iscsi_TaskManagementFunction_Function;
+static int hf_iscsi_TaskManagementFunction_Response;
+static int hf_iscsi_Logout_Reason;
+static int hf_iscsi_Logout_Response;
+static int hf_iscsi_Time2Wait;
+static int hf_iscsi_Time2Retain;
+static int hf_iscsi_DesiredDataLength;
+static int hf_iscsi_AsyncEvent;
+static int hf_iscsi_EventVendorCode;
+static int hf_iscsi_Parameter1;
+static int hf_iscsi_Parameter2;
+static int hf_iscsi_Parameter3;
+static int hf_iscsi_Reject_Reason;
+static int hf_iscsi_snack_type;
+static int hf_iscsi_BegRun;
+static int hf_iscsi_RunLength;
 
 /* Initialize the subtree pointers */
-static gint ett_iscsi = -1;
-static gint ett_iscsi_KeyValues = -1;
-static gint ett_iscsi_CDB = -1;
-static gint ett_iscsi_Flags = -1;
-static gint ett_iscsi_RejectHeader = -1;
-static gint ett_iscsi_lun = -1;
+static gint ett_iscsi;
+static gint ett_iscsi_KeyValues;
+static gint ett_iscsi_CDB;
+static gint ett_iscsi_Flags;
+static gint ett_iscsi_RejectHeader;
+static gint ett_iscsi_lun;
 /* #ifndef DRAFT08 */
-static gint ett_iscsi_ISID = -1;
+static gint ett_iscsi_ISID;
 /* #endif */
 
-static expert_field ei_iscsi_keyvalue_invalid = EI_INIT;
-static expert_field ei_iscsi_opcode_invalid = EI_INIT;
+static expert_field ei_iscsi_keyvalue_invalid;
+static expert_field ei_iscsi_opcode_invalid;
 
 enum iscsi_digest {
     ISCSI_DIGEST_AUTO,
diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c
index c134492991..12cea76ca5 100644
--- a/epan/dissectors/packet-isdn.c
+++ b/epan/dissectors/packet-isdn.c
@@ -18,11 +18,11 @@
 void proto_register_isdn(void);
 void proto_reg_handoff_isdn(void);
 
-static int proto_isdn = -1;
-static int hf_isdn_direction = -1;
-static int hf_isdn_channel = -1;
+static int proto_isdn;
+static int hf_isdn_direction;
+static int hf_isdn_channel;
 
-static gint ett_isdn = -1;
+static gint ett_isdn;
 
 static dissector_handle_t isdn_handle;
 
diff --git a/epan/dissectors/packet-iser.c b/epan/dissectors/packet-iser.c
index 33b3f05848..65082cb3e1 100644
--- a/epan/dissectors/packet-iser.c
+++ b/epan/dissectors/packet-iser.c
@@ -53,27 +53,27 @@ void proto_register_iser(void);
 
 static dissector_handle_t iser_handle;
 
-static int proto_iser = -1;
+static int proto_iser;
 static dissector_handle_t iscsi_handler;
 
-static int proto_ib = -1;
+static int proto_ib;
 
 /* iSER Header */
-static int hf_iser_flags = -1;
-static int hf_iser_opcode_f = -1;
-static int hf_iser_RSV_f = -1;
-static int hf_iser_WSV_f = -1;
-static int hf_iser_REJ_f = -1;
-static int hf_iser_write_stag = -1;
-static int hf_iser_write_va = -1;
-static int hf_iser_read_stag = -1;
-static int hf_iser_read_va = -1;
-static int hf_iser_ird = -1;
-static int hf_iser_ord = -1;
+static int hf_iser_flags;
+static int hf_iser_opcode_f;
+static int hf_iser_RSV_f;
+static int hf_iser_WSV_f;
+static int hf_iser_REJ_f;
+static int hf_iser_write_stag;
+static int hf_iser_write_va;
+static int hf_iser_read_stag;
+static int hf_iser_read_va;
+static int hf_iser_ird;
+static int hf_iser_ord;
 
 /* Initialize the subtree pointers */
-static gint ett_iser = -1;
-static gint ett_iser_flags = -1;
+static gint ett_iser;
+static gint ett_iser_flags;
 
 /* global preferences */
 static range_t *gPORT_RANGE;
diff --git a/epan/dissectors/packet-isi.c b/epan/dissectors/packet-isi.c
index 6183b83daa..8379924c34 100644
--- a/epan/dissectors/packet-isi.c
+++ b/epan/dissectors/packet-isi.c
@@ -537,130 +537,130 @@ static const value_string isi_sms_common_message_id[] = {
 };
 
 
-static int proto_isi = -1;
-
-static int hf_isi_rdev = -1;
-static int hf_isi_sdev = -1;
-static int hf_isi_res  = -1;
-static int hf_isi_len  = -1;
-static int hf_isi_robj = -1;
-static int hf_isi_sobj = -1;
-static int hf_isi_id   = -1;
-
-static int hf_isi_sim_auth_payload = -1;
-static int hf_isi_sim_auth_cmd = -1;
-static int hf_isi_sim_auth_status_rsp = -1;
-static int hf_isi_sim_auth_protection_req = -1;
-static int hf_isi_sim_auth_protection_rsp = -1;
-static int hf_isi_sim_auth_pin = -1;
-static int hf_isi_sim_auth_puk = -1;
-static int hf_isi_sim_auth_new_pin = -1;
-static int hf_isi_sim_auth_pw_type = -1;
-static int hf_isi_sim_auth_indication = -1;
-static int hf_isi_sim_auth_indication_cfg = -1;
-
-static int hf_isi_sim_payload = -1;
-static int hf_isi_sim_message_id = -1;
-static int hf_isi_sim_service_type = -1;
-static int hf_isi_sim_cause = -1;
-static int hf_isi_sim_secondary_cause = -1;
-static int hf_isi_sim_subblock_count = -1;
-static int hf_isi_sim_subblock_size = -1;
-static int hf_isi_sim_pb_subblock = -1;
-static int hf_isi_sim_pb_type = -1;
-static int hf_isi_sim_pb_location = -1;
-static int hf_isi_sim_pb_tag_count = -1;
-static int hf_isi_sim_pb_tag = -1;
-static int hf_isi_sim_imsi_length = -1;
-
-static int hf_isi_gss_payload = -1;
-static int hf_isi_gss_message_id = -1;
+static int proto_isi;
+
+static int hf_isi_rdev;
+static int hf_isi_sdev;
+static int hf_isi_res;
+static int hf_isi_len;
+static int hf_isi_robj;
+static int hf_isi_sobj;
+static int hf_isi_id;
+
+static int hf_isi_sim_auth_payload;
+static int hf_isi_sim_auth_cmd;
+static int hf_isi_sim_auth_status_rsp;
+static int hf_isi_sim_auth_protection_req;
+static int hf_isi_sim_auth_protection_rsp;
+static int hf_isi_sim_auth_pin;
+static int hf_isi_sim_auth_puk;
+static int hf_isi_sim_auth_new_pin;
+static int hf_isi_sim_auth_pw_type;
+static int hf_isi_sim_auth_indication;
+static int hf_isi_sim_auth_indication_cfg;
+
+static int hf_isi_sim_payload;
+static int hf_isi_sim_message_id;
+static int hf_isi_sim_service_type;
+static int hf_isi_sim_cause;
+static int hf_isi_sim_secondary_cause;
+static int hf_isi_sim_subblock_count;
+static int hf_isi_sim_subblock_size;
+static int hf_isi_sim_pb_subblock;
+static int hf_isi_sim_pb_type;
+static int hf_isi_sim_pb_location;
+static int hf_isi_sim_pb_tag_count;
+static int hf_isi_sim_pb_tag;
+static int hf_isi_sim_imsi_length;
+
+static int hf_isi_gss_payload;
+static int hf_isi_gss_message_id;
 #if 0
-static int hf_isi_gss_subblock = -1;
+static int hf_isi_gss_subblock;
 #endif
-static int hf_isi_gss_operation = -1;
-static int hf_isi_gss_subblock_count = -1;
-static int hf_isi_gss_cause = -1;
-static int hf_isi_gss_common_message_id = -1;
-
-static int hf_isi_gps_payload = -1;
-static int hf_isi_gps_cmd = -1;
-static int hf_isi_gps_sub_pkgs = -1;
-static int hf_isi_gps_sub_type = -1;
-static int hf_isi_gps_sub_len = -1;
-static int hf_isi_gps_status = -1;
-static int hf_isi_gps_year = -1;
-static int hf_isi_gps_month = -1;
-static int hf_isi_gps_day = -1;
-static int hf_isi_gps_hour = -1;
-static int hf_isi_gps_minute = -1;
-static int hf_isi_gps_second = -1;
-static int hf_isi_gps_latitude = -1;
-static int hf_isi_gps_longitude = -1;
-static int hf_isi_gps_eph = -1;
-static int hf_isi_gps_altitude = -1;
-static int hf_isi_gps_epv = -1;
-static int hf_isi_gps_course = -1;
-static int hf_isi_gps_epd = -1;
-static int hf_isi_gps_speed = -1;
-static int hf_isi_gps_eps = -1;
-static int hf_isi_gps_climb = -1;
-static int hf_isi_gps_epc = -1;
-static int hf_isi_gps_mcc = -1;
-static int hf_isi_gps_mnc = -1;
-static int hf_isi_gps_lac = -1;
-static int hf_isi_gps_cid = -1;
-static int hf_isi_gps_ucid = -1;
-static int hf_isi_gps_satellites = -1;
-static int hf_isi_gps_prn = -1;
-static int hf_isi_gps_sat_used = -1;
-static int hf_isi_gps_sat_strength = -1;
-static int hf_isi_gps_sat_elevation = -1;
-static int hf_isi_gps_sat_azimuth = -1;
-
-static int hf_isi_ss_payload = -1;
-static int hf_isi_ss_message_id = -1;
-static int hf_isi_ss_ussd_type = -1;
-static int hf_isi_ss_subblock_count = -1;
-static int hf_isi_ss_subblock = -1;
-static int hf_isi_ss_operation = -1;
-static int hf_isi_ss_service_code = -1;
-static int hf_isi_ss_status_indication = -1;
-static int hf_isi_ss_ussd_length = -1;
-static int hf_isi_ss_common_message_id = -1;
-
-static int hf_isi_network_payload = -1;
-static int hf_isi_network_cmd = -1;
-static int hf_isi_network_data_sub_pkgs = -1;
-static int hf_isi_network_status_sub_type = -1;
-static int hf_isi_network_status_sub_len = -1;
-static int hf_isi_network_status_sub_lac = -1;
-static int hf_isi_network_status_sub_cid = -1;
-static int hf_isi_network_status_sub_msg = -1;
-static int hf_isi_network_status_sub_msg_len = -1;
-static int hf_isi_network_cell_info_sub_type = -1;
-static int hf_isi_network_cell_info_sub_len  = -1;
-static int hf_isi_network_cell_info_sub_operator = -1;
-static int hf_isi_network_gsm_band_900 = -1;
-static int hf_isi_network_gsm_band_1800 = -1;
-static int hf_isi_network_gsm_band_1900 = -1;
-static int hf_isi_network_gsm_band_850 = -1;
-
-static int hf_isi_sms_payload = -1;
-static int hf_isi_sms_message_id = -1;
-static int hf_isi_sms_routing_command = -1;
-static int hf_isi_sms_routing_mode = -1;
-static int hf_isi_sms_route = -1;
-static int hf_isi_sms_subblock_count = -1;
-static int hf_isi_sms_send_status = -1;
-static int hf_isi_sms_common_message_id = -1;
-
-static int ett_isi = -1;
-static int ett_isi_msg = -1;
-static int ett_isi_network_gsm_band_info = -1;
-
-static expert_field ei_isi_len = EI_INIT;
-static expert_field ei_isi_unsupported_packet = EI_INIT;
+static int hf_isi_gss_operation;
+static int hf_isi_gss_subblock_count;
+static int hf_isi_gss_cause;
+static int hf_isi_gss_common_message_id;
+
+static int hf_isi_gps_payload;
+static int hf_isi_gps_cmd;
+static int hf_isi_gps_sub_pkgs;
+static int hf_isi_gps_sub_type;
+static int hf_isi_gps_sub_len;
+static int hf_isi_gps_status;
+static int hf_isi_gps_year;
+static int hf_isi_gps_month;
+static int hf_isi_gps_day;
+static int hf_isi_gps_hour;
+static int hf_isi_gps_minute;
+static int hf_isi_gps_second;
+static int hf_isi_gps_latitude;
+static int hf_isi_gps_longitude;
+static int hf_isi_gps_eph;
+static int hf_isi_gps_altitude;
+static int hf_isi_gps_epv;
+static int hf_isi_gps_course;
+static int hf_isi_gps_epd;
+static int hf_isi_gps_speed;
+static int hf_isi_gps_eps;
+static int hf_isi_gps_climb;
+static int hf_isi_gps_epc;
+static int hf_isi_gps_mcc;
+static int hf_isi_gps_mnc;
+static int hf_isi_gps_lac;
+static int hf_isi_gps_cid;
+static int hf_isi_gps_ucid;
+static int hf_isi_gps_satellites;
+static int hf_isi_gps_prn;
+static int hf_isi_gps_sat_used;
+static int hf_isi_gps_sat_strength;
+static int hf_isi_gps_sat_elevation;
+static int hf_isi_gps_sat_azimuth;
+
+static int hf_isi_ss_payload;
+static int hf_isi_ss_message_id;
+static int hf_isi_ss_ussd_type;
+static int hf_isi_ss_subblock_count;
+static int hf_isi_ss_subblock;
+static int hf_isi_ss_operation;
+static int hf_isi_ss_service_code;
+static int hf_isi_ss_status_indication;
+static int hf_isi_ss_ussd_length;
+static int hf_isi_ss_common_message_id;
+
+static int hf_isi_network_payload;
+static int hf_isi_network_cmd;
+static int hf_isi_network_data_sub_pkgs;
+static int hf_isi_network_status_sub_type;
+static int hf_isi_network_status_sub_len;
+static int hf_isi_network_status_sub_lac;
+static int hf_isi_network_status_sub_cid;
+static int hf_isi_network_status_sub_msg;
+static int hf_isi_network_status_sub_msg_len;
+static int hf_isi_network_cell_info_sub_type;
+static int hf_isi_network_cell_info_sub_len;
+static int hf_isi_network_cell_info_sub_operator;
+static int hf_isi_network_gsm_band_900;
+static int hf_isi_network_gsm_band_1800;
+static int hf_isi_network_gsm_band_1900;
+static int hf_isi_network_gsm_band_850;
+
+static int hf_isi_sms_payload;
+static int hf_isi_sms_message_id;
+static int hf_isi_sms_routing_command;
+static int hf_isi_sms_routing_mode;
+static int hf_isi_sms_route;
+static int hf_isi_sms_subblock_count;
+static int hf_isi_sms_send_status;
+static int hf_isi_sms_common_message_id;
+
+static int ett_isi;
+static int ett_isi_msg;
+static int ett_isi_network_gsm_band_info;
+
+static expert_field ei_isi_len;
+static expert_field ei_isi_unsupported_packet;
 
 static int dissect_isi_sim_auth(tvbuff_t *tvb, packet_info *pinfo, proto_item *isitree, void* data _U_) {
 	proto_item *item;
diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c
index 19b06eaee8..2e661a50e7 100644
--- a/epan/dissectors/packet-isis-hello.c
+++ b/epan/dissectors/packet-isis-hello.c
@@ -47,134 +47,134 @@
 void proto_register_isis_hello(void);
 void proto_reg_handoff_isis_hello(void);
 
-static int proto_isis_hello = -1;
+static int proto_isis_hello;
 
 /* hello packets */
-static int hf_isis_hello_circuit = -1;
-static int hf_isis_hello_circuit_reserved = -1;
-static int hf_isis_hello_source_id = -1;
-static int hf_isis_hello_holding_timer = -1;
-static int hf_isis_hello_pdu_length = -1;
-static int hf_isis_hello_priority = -1;
-static int hf_isis_hello_priority_reserved = -1;
-static int hf_isis_hello_lan_id = -1;
-static int hf_isis_hello_clv_type = -1;
-static int hf_isis_hello_clv_length = -1;
-static int hf_isis_hello_local_circuit_id = -1;
-static int hf_isis_hello_clv_ipv4_int_addr = -1;
-static int hf_isis_hello_clv_ipv6_int_addr = -1;
-/* static int hf_isis_hello_clv_ptp_adj = -1; */
-static int hf_isis_hello_clv_mt = -1;
-static int hf_isis_hello_clv_restart_flags = -1;
-static int hf_isis_hello_clv_restart_flags_rr = -1;
-static int hf_isis_hello_clv_restart_flags_ra = -1;
-static int hf_isis_hello_clv_restart_flags_sa = -1;
-static int hf_isis_hello_clv_restart_remain_time = -1;
-static int hf_isis_hello_clv_restart_neighbor = -1;
+static int hf_isis_hello_circuit;
+static int hf_isis_hello_circuit_reserved;
+static int hf_isis_hello_source_id;
+static int hf_isis_hello_holding_timer;
+static int hf_isis_hello_pdu_length;
+static int hf_isis_hello_priority;
+static int hf_isis_hello_priority_reserved;
+static int hf_isis_hello_lan_id;
+static int hf_isis_hello_clv_type;
+static int hf_isis_hello_clv_length;
+static int hf_isis_hello_local_circuit_id;
+static int hf_isis_hello_clv_ipv4_int_addr;
+static int hf_isis_hello_clv_ipv6_int_addr;
+/* static int hf_isis_hello_clv_ptp_adj; */
+static int hf_isis_hello_clv_mt;
+static int hf_isis_hello_clv_restart_flags;
+static int hf_isis_hello_clv_restart_flags_rr;
+static int hf_isis_hello_clv_restart_flags_ra;
+static int hf_isis_hello_clv_restart_flags_sa;
+static int hf_isis_hello_clv_restart_remain_time;
+static int hf_isis_hello_clv_restart_neighbor;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_isis_hello_extended_local_circuit_id = -1;
-static int hf_isis_hello_adjacency_state = -1;
-static int hf_isis_hello_neighbor_systemid = -1;
-static int hf_isis_hello_digest = -1;
-static int hf_isis_hello_digest_v = -1;
-static int hf_isis_hello_digest_a = -1;
-static int hf_isis_hello_digest_d = -1;
-static int hf_isis_hello_ect = -1;
-static int hf_isis_hello_bvid = -1;
-static int hf_isis_hello_bvid_u = -1;
-static int hf_isis_hello_bvid_m = -1;
-static int hf_isis_hello_area_address = -1;
-static int hf_isis_hello_instance_identifier = -1;
-static int hf_isis_hello_supported_itid = -1;
-static int hf_isis_hello_clv_nlpid_nlpid = -1;
-static int hf_isis_hello_clv_ip_authentication = -1;
-static int hf_isis_hello_authentication = -1;
-
-static int hf_isis_hello_aux_mcid = -1;
-static int hf_isis_hello_mcid = -1;
-static int hf_isis_hello_is_neighbor = -1;
-static int hf_isis_hello_mtid = -1;
-static int hf_isis_hello_checksum = -1;
-static int hf_isis_hello_checksum_status = -1;
-static int hf_isis_hello_trill_neighbor_sf = -1;
-static int hf_isis_hello_trill_neighbor_lf = -1;
-static int hf_isis_hello_trill_neighbor_ff = -1;
-static int hf_isis_hello_trill_neighbor_of = -1;
-static int hf_isis_hello_trill_neighbor_size = -1;
-static int hf_isis_hello_trill_neighbor_reserved = -1;
-static int hf_isis_hello_trill_neighbor_mtu = -1;
-static int hf_isis_hello_trill_neighbor_snpa = -1;
-static int hf_isis_hello_reverse_metric_flags = -1;
-static int hf_isis_hello_reverse_metric_flag_reserved = -1;
-static int hf_isis_hello_reverse_metric_flag_u = -1;
-static int hf_isis_hello_reverse_metric_flag_w = -1;
-static int hf_isis_hello_reverse_metric_metric = -1;
-static int hf_isis_hello_reverse_metric_sub_length = -1;
-static int hf_isis_hello_reverse_metric_sub_data = -1;
-static int hf_isis_hello_bfd_enabled_nlpid = -1;
-static int hf_isis_hello_neighbor_extended_local_circuit_id = -1;
-static int hf_isis_hello_vlan_flags_port_id = -1;
-static int hf_isis_hello_vlan_flags_nickname = -1;
-static int hf_isis_hello_vlan_flags_af = -1;
-static int hf_isis_hello_vlan_flags_ac = -1;
-static int hf_isis_hello_vlan_flags_vm = -1;
-static int hf_isis_hello_vlan_flags_by = -1;
-static int hf_isis_hello_vlan_flags_outer_vlan = -1;
-static int hf_isis_hello_vlan_flags_tr = -1;
-static int hf_isis_hello_vlan_flags_reserved = -1;
-static int hf_isis_hello_vlan_flags_designated_vlan = -1;
-static int hf_isis_hello_enabled_vlans = -1;
-static int hf_isis_hello_appointed_vlans = -1;
-static int hf_isis_hello_af_nickname = -1;
-static int hf_isis_hello_af_start_vlan = -1;
-static int hf_isis_hello_af_end_vlan = -1;
-static int hf_isis_hello_trill_version = -1;
-static int hf_isis_hello_trill_hello_reduction = -1;
-static int hf_isis_hello_trill_unassigned_1 = -1;
-static int hf_isis_hello_trill_hop_by_hop_flags = -1;
-static int hf_isis_hello_trill_unassigned_2 = -1;
-static int hf_isis_hello_clv_ipv6_glb_int_addr = -1;
-
-static gint ett_isis_hello = -1;
-static gint ett_isis_hello_clv_area_addr = -1;
-static gint ett_isis_hello_clv_instance_identifier = -1;
-static gint ett_isis_hello_clv_is_neighbors = -1;
-static gint ett_isis_hello_clv_padding = -1;
-static gint ett_isis_hello_clv_unknown = -1;
-static gint ett_isis_hello_clv_nlpid = -1;
-static gint ett_isis_hello_clv_nlpid_nlpid = -1;
-static gint ett_isis_hello_clv_authentication = -1;
-static gint ett_isis_hello_clv_ip_authentication = -1;
-static gint ett_isis_hello_clv_ipv4_int_addr = -1;
-static gint ett_isis_hello_clv_ipv6_int_addr = -1;
-static gint ett_isis_hello_clv_ptp_adj = -1;
-static gint ett_isis_hello_clv_mt = -1;
-static gint ett_isis_hello_clv_restart = -1;
-static gint ett_isis_hello_clv_restart_flags = -1;
-static gint ett_isis_hello_clv_mt_port_cap = -1;
-static gint ett_isis_hello_clv_mt_port_cap_spb_mcid = -1;
-static gint ett_isis_hello_clv_mt_port_cap_spb_digest = -1;
-static gint ett_isis_hello_clv_mt_port_cap_spb_bvid_tuples = -1;
-static gint ett_isis_hello_clv_mt_port_cap_vlan_flags = -1;
-static gint ett_isis_hello_clv_mt_port_cap_enabled_vlans = -1;
-static gint ett_isis_hello_clv_mt_port_cap_appointedfwrdrs = -1;
-static gint ett_isis_hello_clv_mt_port_cap_port_trill_ver = -1;
-static gint ett_isis_hello_clv_mt_port_cap_vlans_appointed = -1;
-static gint ett_isis_hello_clv_trill_neighbor = -1;
-static gint ett_isis_hello_clv_checksum = -1;
-static gint ett_isis_hello_clv_reverse_metric = -1;
-static gint ett_isis_hello_clv_bfd_enabled = -1;
-static gint ett_isis_hello_clv_ipv6_glb_int_addr = -1;
-static gint ett_isis_hello_reverse_metric_flags = -1;
-
-static expert_field ei_isis_hello_short_pdu = EI_INIT;
-static expert_field ei_isis_hello_long_pdu = EI_INIT;
-static expert_field ei_isis_hello_bad_checksum = EI_INIT;
-static expert_field ei_isis_hello_authentication = EI_INIT;
-static expert_field ei_isis_hello_subtlv = EI_INIT;
-static expert_field ei_isis_hello_short_clv = EI_INIT;
-static expert_field ei_isis_hello_clv_mt = EI_INIT;
-static expert_field ei_isis_hello_clv_unknown = EI_INIT;
+static int hf_isis_hello_extended_local_circuit_id;
+static int hf_isis_hello_adjacency_state;
+static int hf_isis_hello_neighbor_systemid;
+static int hf_isis_hello_digest;
+static int hf_isis_hello_digest_v;
+static int hf_isis_hello_digest_a;
+static int hf_isis_hello_digest_d;
+static int hf_isis_hello_ect;
+static int hf_isis_hello_bvid;
+static int hf_isis_hello_bvid_u;
+static int hf_isis_hello_bvid_m;
+static int hf_isis_hello_area_address;
+static int hf_isis_hello_instance_identifier;
+static int hf_isis_hello_supported_itid;
+static int hf_isis_hello_clv_nlpid_nlpid;
+static int hf_isis_hello_clv_ip_authentication;
+static int hf_isis_hello_authentication;
+
+static int hf_isis_hello_aux_mcid;
+static int hf_isis_hello_mcid;
+static int hf_isis_hello_is_neighbor;
+static int hf_isis_hello_mtid;
+static int hf_isis_hello_checksum;
+static int hf_isis_hello_checksum_status;
+static int hf_isis_hello_trill_neighbor_sf;
+static int hf_isis_hello_trill_neighbor_lf;
+static int hf_isis_hello_trill_neighbor_ff;
+static int hf_isis_hello_trill_neighbor_of;
+static int hf_isis_hello_trill_neighbor_size;
+static int hf_isis_hello_trill_neighbor_reserved;
+static int hf_isis_hello_trill_neighbor_mtu;
+static int hf_isis_hello_trill_neighbor_snpa;
+static int hf_isis_hello_reverse_metric_flags;
+static int hf_isis_hello_reverse_metric_flag_reserved;
+static int hf_isis_hello_reverse_metric_flag_u;
+static int hf_isis_hello_reverse_metric_flag_w;
+static int hf_isis_hello_reverse_metric_metric;
+static int hf_isis_hello_reverse_metric_sub_length;
+static int hf_isis_hello_reverse_metric_sub_data;
+static int hf_isis_hello_bfd_enabled_nlpid;
+static int hf_isis_hello_neighbor_extended_local_circuit_id;
+static int hf_isis_hello_vlan_flags_port_id;
+static int hf_isis_hello_vlan_flags_nickname;
+static int hf_isis_hello_vlan_flags_af;
+static int hf_isis_hello_vlan_flags_ac;
+static int hf_isis_hello_vlan_flags_vm;
+static int hf_isis_hello_vlan_flags_by;
+static int hf_isis_hello_vlan_flags_outer_vlan;
+static int hf_isis_hello_vlan_flags_tr;
+static int hf_isis_hello_vlan_flags_reserved;
+static int hf_isis_hello_vlan_flags_designated_vlan;
+static int hf_isis_hello_enabled_vlans;
+static int hf_isis_hello_appointed_vlans;
+static int hf_isis_hello_af_nickname;
+static int hf_isis_hello_af_start_vlan;
+static int hf_isis_hello_af_end_vlan;
+static int hf_isis_hello_trill_version;
+static int hf_isis_hello_trill_hello_reduction;
+static int hf_isis_hello_trill_unassigned_1;
+static int hf_isis_hello_trill_hop_by_hop_flags;
+static int hf_isis_hello_trill_unassigned_2;
+static int hf_isis_hello_clv_ipv6_glb_int_addr;
+
+static gint ett_isis_hello;
+static gint ett_isis_hello_clv_area_addr;
+static gint ett_isis_hello_clv_instance_identifier;
+static gint ett_isis_hello_clv_is_neighbors;
+static gint ett_isis_hello_clv_padding;
+static gint ett_isis_hello_clv_unknown;
+static gint ett_isis_hello_clv_nlpid;
+static gint ett_isis_hello_clv_nlpid_nlpid;
+static gint ett_isis_hello_clv_authentication;
+static gint ett_isis_hello_clv_ip_authentication;
+static gint ett_isis_hello_clv_ipv4_int_addr;
+static gint ett_isis_hello_clv_ipv6_int_addr;
+static gint ett_isis_hello_clv_ptp_adj;
+static gint ett_isis_hello_clv_mt;
+static gint ett_isis_hello_clv_restart;
+static gint ett_isis_hello_clv_restart_flags;
+static gint ett_isis_hello_clv_mt_port_cap;
+static gint ett_isis_hello_clv_mt_port_cap_spb_mcid;
+static gint ett_isis_hello_clv_mt_port_cap_spb_digest;
+static gint ett_isis_hello_clv_mt_port_cap_spb_bvid_tuples;
+static gint ett_isis_hello_clv_mt_port_cap_vlan_flags;
+static gint ett_isis_hello_clv_mt_port_cap_enabled_vlans;
+static gint ett_isis_hello_clv_mt_port_cap_appointedfwrdrs;
+static gint ett_isis_hello_clv_mt_port_cap_port_trill_ver;
+static gint ett_isis_hello_clv_mt_port_cap_vlans_appointed;
+static gint ett_isis_hello_clv_trill_neighbor;
+static gint ett_isis_hello_clv_checksum;
+static gint ett_isis_hello_clv_reverse_metric;
+static gint ett_isis_hello_clv_bfd_enabled;
+static gint ett_isis_hello_clv_ipv6_glb_int_addr;
+static gint ett_isis_hello_reverse_metric_flags;
+
+static expert_field ei_isis_hello_short_pdu;
+static expert_field ei_isis_hello_long_pdu;
+static expert_field ei_isis_hello_bad_checksum;
+static expert_field ei_isis_hello_authentication;
+static expert_field ei_isis_hello_subtlv;
+static expert_field ei_isis_hello_short_clv;
+static expert_field ei_isis_hello_clv_mt;
+static expert_field ei_isis_hello_clv_unknown;
 
 static const value_string isis_hello_circuit_type_vals[] = {
     { ISIS_HELLO_TYPE_RESERVED,    "Reserved 0 (discard PDU)"},
diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c
index ea927e42c3..4d19901f6b 100644
--- a/epan/dissectors/packet-isis-lsp.c
+++ b/epan/dissectors/packet-isis-lsp.c
@@ -156,475 +156,475 @@ const range_string mtid_strings[] = {
 void proto_register_isis_lsp(void);
 void proto_reg_handoff_isis_lsp(void);
 
-static int proto_isis_lsp = -1;
+static int proto_isis_lsp;
 
 /* lsp packets */
-static int hf_isis_lsp_pdu_length = -1;
-static int hf_isis_lsp_remaining_life = -1;
-static int hf_isis_lsp_sequence_number = -1;
-static int hf_isis_lsp_lsp_id = -1;
-static int hf_isis_lsp_hostname = -1;
-static int hf_isis_lsp_srlg_system_id = -1;
-static int hf_isis_lsp_srlg_pseudo_num = -1;
-static int hf_isis_lsp_srlg_flags_numbered = -1;
-static int hf_isis_lsp_srlg_ipv4_local = -1;
-static int hf_isis_lsp_srlg_ipv4_remote = -1;
-static int hf_isis_lsp_srlg_value = -1;
-static int hf_isis_lsp_checksum = -1;
-static int hf_isis_lsp_checksum_status = -1;
-static int hf_isis_lsp_clv_ipv4_int_addr = -1;
-static int hf_isis_lsp_clv_ipv6_int_addr = -1;
-static int hf_isis_lsp_clv_te_router_id = -1;
-static int hf_isis_lsp_clv_mt = -1;
-static int hf_isis_lsp_p = -1;
-static int hf_isis_lsp_att = -1;
-static int hf_isis_lsp_hippity = -1;
-static int hf_isis_lsp_is_type = -1;
-static int hf_isis_lsp_clv_type = -1;
-static int hf_isis_lsp_clv_length = -1;
-static int hf_isis_lsp_root_id = -1;
-static int hf_isis_lsp_bw_ct_model = -1;
-static int hf_isis_lsp_bw_ct_reserved = -1;
-static int hf_isis_lsp_bw_ct0 = -1;
-static int hf_isis_lsp_bw_ct1 = -1;
-static int hf_isis_lsp_bw_ct2 = -1;
-static int hf_isis_lsp_bw_ct3 = -1;
-static int hf_isis_lsp_bw_ct4 = -1;
-static int hf_isis_lsp_bw_ct5 = -1;
-static int hf_isis_lsp_bw_ct6 = -1;
-static int hf_isis_lsp_bw_ct7 = -1;
-static int hf_isis_lsp_spb_link_metric = -1;
-static int hf_isis_lsp_spb_port_count = -1;
-static int hf_isis_lsp_spb_port_id = -1;
-static int hf_isis_lsp_adj_sid_flags = -1;
-static int hf_isis_lsp_adj_sid_family_flag = -1;
-static int hf_isis_lsp_adj_sid_backup_flag = -1;
-static int hf_isis_lsp_adj_sid_value_flag = -1;
-static int hf_isis_lsp_adj_sid_local_flag = -1;
-static int hf_isis_lsp_adj_sid_set_flag = -1;
-static int hf_isis_lsp_adj_sid_weight = -1;
-static int hf_isis_lsp_adj_sid_system_id = -1;
-static int hf_isis_lsp_sid_sli_label = -1;
-static int hf_isis_lsp_sid_sli_index = -1;
-static int hf_isis_lsp_sid_sli_ipv6 = -1;
-static int hf_isis_lsp_spb_reserved = -1;
-static int hf_isis_lsp_spb_sr_bit = -1;
-static int hf_isis_lsp_spb_spvid = -1;
-static int hf_isis_lsp_spb_short_mac_address_t = -1;
-static int hf_isis_lsp_spb_short_mac_address_r = -1;
-static int hf_isis_lsp_spb_short_mac_address_reserved = -1;
-static int hf_isis_lsp_spb_short_mac_address = -1;
+static int hf_isis_lsp_pdu_length;
+static int hf_isis_lsp_remaining_life;
+static int hf_isis_lsp_sequence_number;
+static int hf_isis_lsp_lsp_id;
+static int hf_isis_lsp_hostname;
+static int hf_isis_lsp_srlg_system_id;
+static int hf_isis_lsp_srlg_pseudo_num;
+static int hf_isis_lsp_srlg_flags_numbered;
+static int hf_isis_lsp_srlg_ipv4_local;
+static int hf_isis_lsp_srlg_ipv4_remote;
+static int hf_isis_lsp_srlg_value;
+static int hf_isis_lsp_checksum;
+static int hf_isis_lsp_checksum_status;
+static int hf_isis_lsp_clv_ipv4_int_addr;
+static int hf_isis_lsp_clv_ipv6_int_addr;
+static int hf_isis_lsp_clv_te_router_id;
+static int hf_isis_lsp_clv_mt;
+static int hf_isis_lsp_p;
+static int hf_isis_lsp_att;
+static int hf_isis_lsp_hippity;
+static int hf_isis_lsp_is_type;
+static int hf_isis_lsp_clv_type;
+static int hf_isis_lsp_clv_length;
+static int hf_isis_lsp_root_id;
+static int hf_isis_lsp_bw_ct_model;
+static int hf_isis_lsp_bw_ct_reserved;
+static int hf_isis_lsp_bw_ct0;
+static int hf_isis_lsp_bw_ct1;
+static int hf_isis_lsp_bw_ct2;
+static int hf_isis_lsp_bw_ct3;
+static int hf_isis_lsp_bw_ct4;
+static int hf_isis_lsp_bw_ct5;
+static int hf_isis_lsp_bw_ct6;
+static int hf_isis_lsp_bw_ct7;
+static int hf_isis_lsp_spb_link_metric;
+static int hf_isis_lsp_spb_port_count;
+static int hf_isis_lsp_spb_port_id;
+static int hf_isis_lsp_adj_sid_flags;
+static int hf_isis_lsp_adj_sid_family_flag;
+static int hf_isis_lsp_adj_sid_backup_flag;
+static int hf_isis_lsp_adj_sid_value_flag;
+static int hf_isis_lsp_adj_sid_local_flag;
+static int hf_isis_lsp_adj_sid_set_flag;
+static int hf_isis_lsp_adj_sid_weight;
+static int hf_isis_lsp_adj_sid_system_id;
+static int hf_isis_lsp_sid_sli_label;
+static int hf_isis_lsp_sid_sli_index;
+static int hf_isis_lsp_sid_sli_ipv6;
+static int hf_isis_lsp_spb_reserved;
+static int hf_isis_lsp_spb_sr_bit;
+static int hf_isis_lsp_spb_spvid;
+static int hf_isis_lsp_spb_short_mac_address_t;
+static int hf_isis_lsp_spb_short_mac_address_r;
+static int hf_isis_lsp_spb_short_mac_address_reserved;
+static int hf_isis_lsp_spb_short_mac_address;
 /* TLV 149 items draft-previdi-isis-segment-routing-extensions */
-static int hf_isis_lsp_sl_binding_flags = -1;
-static int hf_isis_lsp_sl_binding_flags_f = -1;
-static int hf_isis_lsp_sl_binding_flags_m = -1;
-static int hf_isis_lsp_sl_binding_flags_s = -1;
-static int hf_isis_lsp_sl_binding_flags_d = -1;
-static int hf_isis_lsp_sl_binding_flags_a = -1;
-static int hf_isis_lsp_sl_binding_flags_rsv = -1;
-static int hf_isis_lsp_sl_binding_weight = -1;
-static int hf_isis_lsp_sl_binding_range = -1;
-static int hf_isis_lsp_sl_binding_prefix_length = -1;
-static int hf_isis_lsp_sl_binding_fec_prefix_ipv4 = -1;
-static int hf_isis_lsp_sl_binding_fec_prefix_ipv6 = -1;
-static int hf_isis_lsp_sl_sub_tlv = -1;
-static int hf_isis_lsp_sl_sub_tlv_type = -1;
-static int hf_isis_lsp_sl_sub_tlv_length = -1;
-static int hf_isis_lsp_sl_sub_tlv_label_20 = -1;
-static int hf_isis_lsp_sl_sub_tlv_label_32 = -1;
-static int hf_isis_lsp_sl_sub_tlv_flags = -1;
-static int hf_isis_lsp_sl_sub_tlv_flags_r = -1;
-static int hf_isis_lsp_sl_sub_tlv_flags_n = -1;
-static int hf_isis_lsp_sl_sub_tlv_flags_p = -1;
-static int hf_isis_lsp_sl_sub_tlv_flags_e = -1;
-static int hf_isis_lsp_sl_sub_tlv_flags_v = -1;
-static int hf_isis_lsp_sl_sub_tlv_flags_l = -1;
-static int hf_isis_lsp_sl_sub_tlv_flags_rsv = -1;
-static int hf_isis_lsp_sl_sub_tlv_algorithm = -1;
-static int hf_isis_lsp_mt_cap_spb_instance_v = -1;
-static int hf_isis_lsp_mt_cap_spb_instance_cist_external_root_path_cost = -1;
-static int hf_isis_lsp_rt_capable_tree_used_id_starting_tree_no = -1;
-static int hf_isis_lsp_mt_cap_spb_instance_bridge_priority = -1;
-static int hf_isis_lsp_mt_cap_spbm_service_identifier_base_vid = -1;
-static int hf_isis_lsp_mt_cap_spbm_service_identifier_t = -1;
-static int hf_isis_lsp_mt_cap_spbm_service_identifier_r = -1;
-static int hf_isis_lsp_mt_cap_spbm_service_identifier_reserved = -1;
-static int hf_isis_lsp_mt_cap_spbm_service_identifier_i_sid = -1;
-static int hf_isis_lsp_64_bit_administrative_tag = -1;
-static int hf_isis_lsp_grp_type = -1;
-static int hf_isis_lsp_grp_macaddr_length = -1;
-static int hf_isis_lsp_grp_ipv4addr_length = -1;
-static int hf_isis_lsp_grp_ipv6addr_length = -1;
-static int hf_isis_lsp_grp_unknown_length = -1;
-static int hf_isis_lsp_grp_macaddr_number_of_sources = -1;
-static int hf_isis_lsp_grp_ipv4addr_number_of_sources = -1;
-static int hf_isis_lsp_grp_ipv6addr_number_of_sources = -1;
-static int hf_isis_lsp_ext_is_reachability_traffic_engineering_default_metric = -1;
-static int hf_isis_lsp_grp_macaddr_group_address = -1;
-static int hf_isis_lsp_grp_ipv4addr_group_address = -1;
-static int hf_isis_lsp_grp_ipv6addr_group_address = -1;
-static int hf_isis_lsp_rt_capable_tree_root_id_nickname = -1;
-static int hf_isis_lsp_ext_is_reachability_ipv4_interface_address = -1;
-static int hf_isis_lsp_ext_ip_reachability_metric = -1;
-static int hf_isis_lsp_ext_ip_reachability_ipv4_prefix = -1;
-static int hf_isis_lsp_eis_neighbors_es_neighbor_id = -1;
-static int hf_isis_lsp_expense_metric = -1;
-static int hf_isis_lsp_ext_is_reachability_link_remote_identifier = -1;
-static int hf_isis_lsp_rt_capable_vlan_group_secondary_vlan_id = -1;
-static int hf_isis_lsp_grp_macaddr_vlan_id = -1;
-static int hf_isis_lsp_grp_ipv4addr_vlan_id = -1;
-static int hf_isis_lsp_grp_ipv6addr_vlan_id = -1;
-static int hf_isis_lsp_rt_capable_trill_affinity_tlv = -1;
-static int hf_isis_lsp_rt_capable_trill_fgl_safe = -1;
-static int hf_isis_lsp_rt_capable_trill_caps = -1;
-static int hf_isis_lsp_rt_capable_trill_flags = -1;
-static int hf_isis_lsp_rt_capable_tree_root_id_starting_tree_no = -1;
-static int hf_isis_lsp_rt_capable_interested_vlans_nickname = -1;
-static int hf_isis_lsp_ip_reachability_ipv4_prefix = -1;
-static int hf_isis_lsp_grp_macaddr_topology_id = -1;
-static int hf_isis_lsp_grp_ipv4addr_topology_id = -1;
-static int hf_isis_lsp_grp_ipv6addr_topology_id = -1;
-static int hf_isis_lsp_ext_is_reachability_ipv4_neighbor_address = -1;
-static int hf_isis_lsp_ipv6_reachability_reserved_bits = -1;
-static int hf_isis_lsp_eis_neighbors_default_metric = -1;
-static int hf_isis_lsp_mt_cap_spb_instance_cist_root_identifier = -1;
-static int hf_isis_lsp_rt_capable_tree_used_id_nickname = -1;
-static int hf_isis_lsp_grp_macaddr_source_address = -1;
-static int hf_isis_lsp_grp_ipv4addr_source_address = -1;
-static int hf_isis_lsp_grp_ipv6addr_source_address = -1;
-static int hf_isis_lsp_delay_metric = -1;
-static int hf_isis_lsp_ext_is_reachability_link_local_identifier = -1;
-static int hf_isis_lsp_mt_cap_mtid = -1;
-static int hf_isis_lsp_32_bit_administrative_tag = -1;
-static int hf_isis_lsp_ext_is_reachability_is_neighbor_id = -1;
-static int hf_isis_lsp_reservable_link_bandwidth = -1;
-static int hf_isis_lsp_rt_capable_vlan_group_primary_vlan_id = -1;
-static int hf_isis_lsp_rt_capable_interested_vlans_multicast_ipv4 = -1;
-static int hf_isis_lsp_rt_capable_interested_vlans_multicast_ipv6 = -1;
-static int hf_isis_lsp_mt_cap_spb_instance_number_of_trees = -1;
-static int hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_u = -1;
-static int hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_m = -1;
-static int hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_a = -1;
-static int hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_reserved = -1;
-static int hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_ect = -1;
-static int hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_base_vid = -1;
-static int hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_spvid = -1;
-static int hf_isis_lsp_mt_cap_spb_opaque_algorithm = -1;
-static int hf_isis_lsp_mt_cap_spb_opaque_information = -1;
-static int hf_isis_lsp_mt_cap_spbm_service_identifier_b_mac = -1;
-static int hf_isis_lsp_ipv6_reachability_subclvs_len = -1;
-static int hf_isis_lsp_ipv6_reachability_distribution = -1;
-static int hf_isis_lsp_ipv6_reachability_distribution_internal = -1;
-static int hf_isis_lsp_ipv6_reachability_subtlv = -1;
-static int hf_isis_lsp_ipv6_reachability_metric = -1;
-static int hf_isis_lsp_ipv6_reachability_prefix_length = -1;
-static int hf_isis_lsp_prefix_attr_flags = -1;
-static int hf_isis_lsp_prefix_attr_flags_x = -1;
-static int hf_isis_lsp_prefix_attr_flags_r = -1;
-static int hf_isis_lsp_prefix_attr_flags_n = -1;
-static int hf_isis_lsp_rt_capable_trees_maximum_nof_trees_to_compute = -1;
-static int hf_isis_lsp_rt_capable_interested_vlans_vlan_start_id = -1;
-static int hf_isis_lsp_rt_capable_nickname_nickname_priority = -1;
-static int hf_isis_lsp_ext_is_reachability_metric = -1;
-static int hf_isis_lsp_ext_is_reachability_subclvs_len = -1;
-static int hf_isis_lsp_ext_is_reachability_code = -1;
-static int hf_isis_lsp_ext_is_reachability_len = -1;
-static int hf_isis_lsp_ext_is_reachability_value = -1;
-static int hf_isis_lsp_default_metric = -1;
-static int hf_isis_lsp_ext_is_reachability_unidir_link_flags = -1;
-static int hf_isis_lsp_ext_is_reachability_unidir_link_flags_a = -1;
-static int hf_isis_lsp_ext_is_reachability_unidir_link_reserved = -1;
-static int hf_isis_lsp_ext_is_reachability_unidir_link_delay = -1;
-static int hf_isis_lsp_ext_is_reachability_unidir_link_delay_min = -1;
-static int hf_isis_lsp_ext_is_reachability_unidir_link_delay_max = -1;
-static int hf_isis_lsp_ext_is_reachability_unidir_delay_variation = -1;
-static int hf_isis_lsp_ext_is_reachability_unidir_link_loss = -1;
-static int hf_isis_lsp_ext_is_reachability_unidir_residual_bandwidth = -1;
-static int hf_isis_lsp_ext_is_reachability_unidir_available_bandwidth = -1;
-static int hf_isis_lsp_ext_is_reachability_unidir_utilized_bandwidth = -1;
-static int hf_isis_lsp_ext_ip_reachability_distribution = -1;
-static int hf_isis_lsp_ext_ip_reachability_subtlv = -1;
-static int hf_isis_lsp_ext_ip_reachability_prefix_length = -1;
-static int hf_isis_lsp_ext_ip_reachability_subclvs_len = -1;
-static int hf_isis_lsp_ext_ip_reachability_code = -1;
-static int hf_isis_lsp_ext_ip_reachability_len = -1;
-static int hf_isis_lsp_ext_ip_reachability_prefix_flags = -1;
-static int hf_isis_lsp_ext_ip_reachability_prefix_re_adv_flag = -1;
-static int hf_isis_lsp_ext_ip_reachability_prefix_node_sid_flag = -1;
-static int hf_isis_lsp_ext_ip_reachability_prefix_nophp_flag = -1;
-static int hf_isis_lsp_ext_ip_reachability_prefix_expl_null_flag = -1;
-static int hf_isis_lsp_ext_ip_reachability_prefix_value_flag = -1;
-static int hf_isis_lsp_ext_ip_reachability_prefix_local_flag = -1;
-static int hf_isis_lsp_maximum_link_bandwidth = -1;
-static int hf_isis_lsp_rt_capable_nickname_tree_root_priority = -1;
-static int hf_isis_lsp_eis_neighbors_delay_metric = -1;
-static int hf_isis_lsp_rt_capable_trill_maximum_version = -1;
-static int hf_isis_lsp_rt_capable_interested_vlans_afs_lost_counter = -1;
-static int hf_isis_lsp_ipv6_reachability_ipv6_prefix = -1;
-static int hf_isis_lsp_eis_neighbors_error_metric = -1;
-static int hf_isis_lsp_rt_capable_interested_vlans_vlan_end_id = -1;
-static int hf_isis_lsp_error_metric = -1;
-static int hf_isis_lsp_grp_macaddr_number_of_records = -1;
-static int hf_isis_lsp_grp_ipv4addr_number_of_records = -1;
-static int hf_isis_lsp_grp_ipv6addr_number_of_records = -1;
-static int hf_isis_lsp_rt_capable_nickname_nickname = -1;
-static int hf_isis_lsp_mt_id_reserved = -1;
-static int hf_isis_lsp_eis_neighbors_is_neighbor_id = -1;
-static int hf_isis_lsp_mt_id = -1;
-static int hf_isis_lsp_eis_neighbors_reserved = -1;
-static int hf_isis_lsp_ip_reachability_error_metric = -1;
-static int hf_isis_lsp_ip_reachability_delay_metric = -1;
-static int hf_isis_lsp_ip_reachability_expense_metric = -1;
-static int hf_isis_lsp_rt_capable_trees_nof_trees_to_use = -1;
-static int hf_isis_lsp_ip_reachability_default_metric = -1;
-static int hf_isis_lsp_rt_capable_trees_nof_trees_to_compute = -1;
-static int hf_isis_lsp_eis_neighbors_expense_metric = -1;
-static int hf_isis_lsp_partition_designated_l2_is = -1;
-static int hf_isis_lsp_originating_lsp_buffer_size = -1;
-static int hf_isis_lsp_ip_reachability_default_metric_ie = -1;
-static int hf_isis_lsp_eis_neighbors_default_metric_ie = -1;
-static int hf_isis_lsp_eis_neighbors_error_metric_supported = -1;
-static int hf_isis_lsp_unrsv_bw_priority_level = -1;
-static int hf_isis_lsp_ip_reachability_expense_metric_support = -1;
-static int hf_isis_lsp_mt_cap_overload = -1;
-static int hf_isis_lsp_eis_neighbors_expense_metric_supported = -1;
-static int hf_isis_lsp_ip_reachability_delay_metric_support = -1;
-static int hf_isis_lsp_ip_reachability_error_metric_support = -1;
-static int hf_isis_lsp_mt_cap_spsourceid = -1;
-static int hf_isis_lsp_eis_neighbors_delay_metric_supported = -1;
-static int hf_isis_lsp_eis_neighbors_error_metric_ie = -1;
-static int hf_isis_lsp_eis_neighbors_expense_metric_ie = -1;
-static int hf_isis_lsp_eis_neighbors_delay_metric_ie = -1;
-static int hf_isis_lsp_ip_reachability_delay_metric_ie = -1;
-static int hf_isis_lsp_ip_reachability_distribution = -1;
-static int hf_isis_lsp_ip_reachability_error_metric_ie = -1;
-static int hf_isis_lsp_ip_reachability_expense_metric_ie = -1;
-static int hf_isis_lsp_rt_capable_router_id =-1;
-static int hf_isis_lsp_rt_capable_flag_s =-1;
-static int hf_isis_lsp_rt_capable_flag_d =-1;
-static int hf_isis_lsp_clv_te_node_cap_b_bit = -1;
-static int hf_isis_lsp_clv_te_node_cap_e_bit = -1;
-static int hf_isis_lsp_clv_te_node_cap_m_bit = -1;
-static int hf_isis_lsp_clv_te_node_cap_g_bit = -1;
-static int hf_isis_lsp_clv_te_node_cap_p_bit = -1;
-static int hf_isis_lsp_clv_sr_cap_i_flag = -1;
-static int hf_isis_lsp_clv_sr_cap_v_flag = -1;
-static int hf_isis_lsp_clv_sr_cap_range = -1;
-static int hf_isis_lsp_clv_sr_cap_sid = -1;
-static int hf_isis_lsp_clv_sr_cap_label = -1;
-static int hf_isis_lsp_clv_sr_alg = -1;
-static int hf_isis_lsp_clv_sr_lb_flags = -1;
-static int hf_isis_lsp_clv_srv6_cap_flags = -1;
-static int hf_isis_lsp_clv_srv6_cap_flags_o = -1;
-static int hf_isis_lsp_clv_srv6_cap_flags_reserved = -1;
-static int hf_isis_lsp_clv_igp_msd_type = -1;
-static int hf_isis_lsp_clv_igp_msd_value = -1;
-static int hf_isis_lsp_clv_ext_admin_group = -1;
-static int hf_isis_lsp_clv_app_sabm_legacy = -1;
-static int hf_isis_lsp_clv_app_sabm_length = -1;
-static int hf_isis_lsp_clv_app_sabm_bits = -1;
-static int hf_isis_lsp_clv_app_sabm_bits_r = -1;
-static int hf_isis_lsp_clv_app_sabm_bits_s = -1;
-static int hf_isis_lsp_clv_app_sabm_bits_f = -1;
-static int hf_isis_lsp_clv_app_sabm_bits_x = -1;
-static int hf_isis_lsp_clv_app_udabm_reserved = -1;
-static int hf_isis_lsp_clv_app_udabm_length = -1;
-static int hf_isis_lsp_clv_app_udabm_bits = -1;
-static int hf_isis_lsp_clv_flex_algo_algorithm = -1;
-static int hf_isis_lsp_clv_flex_algo_metric_type = -1;
-static int hf_isis_lsp_clv_flex_algo_calc_type = -1;
-static int hf_isis_lsp_clv_flex_algo_priority = -1;
-static int hf_isis_lsp_clv_srv6_endx_sid_system_id = -1;
-static int hf_isis_lsp_clv_srv6_endx_sid_flags = -1;
-static int hf_isis_lsp_clv_srv6_endx_sid_flags_b = -1;
-static int hf_isis_lsp_clv_srv6_endx_sid_flags_s = -1;
-static int hf_isis_lsp_clv_srv6_endx_sid_flags_p = -1;
-static int hf_isis_lsp_clv_srv6_endx_sid_flags_reserved = -1;
-static int hf_isis_lsp_clv_srv6_endx_sid_alg = -1;
-static int hf_isis_lsp_clv_srv6_endx_sid_weight = -1;
-static int hf_isis_lsp_clv_srv6_endx_sid_endpoint_behavior = -1;
-static int hf_isis_lsp_clv_srv6_endx_sid_sid = -1;
-static int hf_isis_lsp_clv_srv6_endx_sid_subsubclvs_len = -1;
-static int hf_isis_lsp_area_address = -1;
-static int hf_isis_lsp_instance_identifier = -1;
-static int hf_isis_lsp_supported_itid = -1;
-static int hf_isis_lsp_clv_nlpid_nlpid = -1;
-static int hf_isis_lsp_ip_authentication = -1;
-static int hf_isis_lsp_authentication = -1;
-static int hf_isis_lsp_area_address_str = -1;
-static int hf_isis_lsp_is_virtual = -1;
-static int hf_isis_lsp_group = -1;
-static int hf_isis_lsp_default = -1;
-static int hf_isis_lsp_default_support = -1;
-static int hf_isis_lsp_delay = -1;
-static int hf_isis_lsp_delay_support = -1;
-static int hf_isis_lsp_expense = -1;
-static int hf_isis_lsp_expense_support = -1;
-static int hf_isis_lsp_error = -1;
-static int hf_isis_lsp_error_support = -1;
-static int hf_isis_lsp_clv_ipv6_te_router_id = -1;
-static int hf_isis_lsp_ext_is_reachability_ipv6_interface_address = -1;
-static int hf_isis_lsp_ext_is_reachability_ipv6_neighbor_address = -1;
-static int hf_isis_lsp_clv_bier_alg = -1;
-static int hf_isis_lsp_clv_bier_igp_alg = -1;
-static int hf_isis_lsp_clv_bier_subdomain = -1;
-static int hf_isis_lsp_clv_bier_bfrid = -1;
-static int hf_isis_lsp_clv_bier_subsub_type = -1;
-static int hf_isis_lsp_clv_bier_subsub_len = -1;
-static int hf_isis_lsp_clv_bier_subsub_mplsencap_maxsi= -1;
-static int hf_isis_lsp_clv_bier_subsub_mplsencap_bslen= -1;
-static int hf_isis_lsp_clv_bier_subsub_mplsencap_label= -1;
-static int hf_isis_lsp_srv6_loc_metric = -1;
-static int hf_isis_lsp_srv6_loc_flags = -1;
-static int hf_isis_lsp_srv6_loc_flags_d = -1;
-static int hf_isis_lsp_srv6_loc_flags_reserved = -1;
-static int hf_isis_lsp_srv6_loc_alg = -1;
-static int hf_isis_lsp_srv6_loc_size = -1;
-static int hf_isis_lsp_srv6_loc_locator = -1;
-static int hf_isis_lsp_srv6_loc_subclvs_len = -1;
-static int hf_isis_lsp_srv6_loc_sub_tlv_type = -1;
-static int hf_isis_lsp_srv6_loc_sub_tlv_length = -1;
-static int hf_isis_lsp_clv_srv6_end_sid_flags = -1;
-static int hf_isis_lsp_clv_srv6_end_sid_endpoint_behavior = -1;
-static int hf_isis_lsp_clv_srv6_end_sid_sid = -1;
-static int hf_isis_lsp_clv_srv6_end_sid_subsubclvs_len = -1;
-static int hf_isis_lsp_clv_srv6_sid_struct_lb_len = -1;
-static int hf_isis_lsp_clv_srv6_sid_struct_ln_len = -1;
-static int hf_isis_lsp_clv_srv6_sid_struct_fun_len = -1;
-static int hf_isis_lsp_clv_srv6_sid_struct_arg_len = -1;
-static int hf_isis_lsp_purge_orig_id_num = -1;
-static int hf_isis_lsp_purge_orig_id_system_id = -1;
+static int hf_isis_lsp_sl_binding_flags;
+static int hf_isis_lsp_sl_binding_flags_f;
+static int hf_isis_lsp_sl_binding_flags_m;
+static int hf_isis_lsp_sl_binding_flags_s;
+static int hf_isis_lsp_sl_binding_flags_d;
+static int hf_isis_lsp_sl_binding_flags_a;
+static int hf_isis_lsp_sl_binding_flags_rsv;
+static int hf_isis_lsp_sl_binding_weight;
+static int hf_isis_lsp_sl_binding_range;
+static int hf_isis_lsp_sl_binding_prefix_length;
+static int hf_isis_lsp_sl_binding_fec_prefix_ipv4;
+static int hf_isis_lsp_sl_binding_fec_prefix_ipv6;
+static int hf_isis_lsp_sl_sub_tlv;
+static int hf_isis_lsp_sl_sub_tlv_type;
+static int hf_isis_lsp_sl_sub_tlv_length;
+static int hf_isis_lsp_sl_sub_tlv_label_20;
+static int hf_isis_lsp_sl_sub_tlv_label_32;
+static int hf_isis_lsp_sl_sub_tlv_flags;
+static int hf_isis_lsp_sl_sub_tlv_flags_r;
+static int hf_isis_lsp_sl_sub_tlv_flags_n;
+static int hf_isis_lsp_sl_sub_tlv_flags_p;
+static int hf_isis_lsp_sl_sub_tlv_flags_e;
+static int hf_isis_lsp_sl_sub_tlv_flags_v;
+static int hf_isis_lsp_sl_sub_tlv_flags_l;
+static int hf_isis_lsp_sl_sub_tlv_flags_rsv;
+static int hf_isis_lsp_sl_sub_tlv_algorithm;
+static int hf_isis_lsp_mt_cap_spb_instance_v;
+static int hf_isis_lsp_mt_cap_spb_instance_cist_external_root_path_cost;
+static int hf_isis_lsp_rt_capable_tree_used_id_starting_tree_no;
+static int hf_isis_lsp_mt_cap_spb_instance_bridge_priority;
+static int hf_isis_lsp_mt_cap_spbm_service_identifier_base_vid;
+static int hf_isis_lsp_mt_cap_spbm_service_identifier_t;
+static int hf_isis_lsp_mt_cap_spbm_service_identifier_r;
+static int hf_isis_lsp_mt_cap_spbm_service_identifier_reserved;
+static int hf_isis_lsp_mt_cap_spbm_service_identifier_i_sid;
+static int hf_isis_lsp_64_bit_administrative_tag;
+static int hf_isis_lsp_grp_type;
+static int hf_isis_lsp_grp_macaddr_length;
+static int hf_isis_lsp_grp_ipv4addr_length;
+static int hf_isis_lsp_grp_ipv6addr_length;
+static int hf_isis_lsp_grp_unknown_length;
+static int hf_isis_lsp_grp_macaddr_number_of_sources;
+static int hf_isis_lsp_grp_ipv4addr_number_of_sources;
+static int hf_isis_lsp_grp_ipv6addr_number_of_sources;
+static int hf_isis_lsp_ext_is_reachability_traffic_engineering_default_metric;
+static int hf_isis_lsp_grp_macaddr_group_address;
+static int hf_isis_lsp_grp_ipv4addr_group_address;
+static int hf_isis_lsp_grp_ipv6addr_group_address;
+static int hf_isis_lsp_rt_capable_tree_root_id_nickname;
+static int hf_isis_lsp_ext_is_reachability_ipv4_interface_address;
+static int hf_isis_lsp_ext_ip_reachability_metric;
+static int hf_isis_lsp_ext_ip_reachability_ipv4_prefix;
+static int hf_isis_lsp_eis_neighbors_es_neighbor_id;
+static int hf_isis_lsp_expense_metric;
+static int hf_isis_lsp_ext_is_reachability_link_remote_identifier;
+static int hf_isis_lsp_rt_capable_vlan_group_secondary_vlan_id;
+static int hf_isis_lsp_grp_macaddr_vlan_id;
+static int hf_isis_lsp_grp_ipv4addr_vlan_id;
+static int hf_isis_lsp_grp_ipv6addr_vlan_id;
+static int hf_isis_lsp_rt_capable_trill_affinity_tlv;
+static int hf_isis_lsp_rt_capable_trill_fgl_safe;
+static int hf_isis_lsp_rt_capable_trill_caps;
+static int hf_isis_lsp_rt_capable_trill_flags;
+static int hf_isis_lsp_rt_capable_tree_root_id_starting_tree_no;
+static int hf_isis_lsp_rt_capable_interested_vlans_nickname;
+static int hf_isis_lsp_ip_reachability_ipv4_prefix;
+static int hf_isis_lsp_grp_macaddr_topology_id;
+static int hf_isis_lsp_grp_ipv4addr_topology_id;
+static int hf_isis_lsp_grp_ipv6addr_topology_id;
+static int hf_isis_lsp_ext_is_reachability_ipv4_neighbor_address;
+static int hf_isis_lsp_ipv6_reachability_reserved_bits;
+static int hf_isis_lsp_eis_neighbors_default_metric;
+static int hf_isis_lsp_mt_cap_spb_instance_cist_root_identifier;
+static int hf_isis_lsp_rt_capable_tree_used_id_nickname;
+static int hf_isis_lsp_grp_macaddr_source_address;
+static int hf_isis_lsp_grp_ipv4addr_source_address;
+static int hf_isis_lsp_grp_ipv6addr_source_address;
+static int hf_isis_lsp_delay_metric;
+static int hf_isis_lsp_ext_is_reachability_link_local_identifier;
+static int hf_isis_lsp_mt_cap_mtid;
+static int hf_isis_lsp_32_bit_administrative_tag;
+static int hf_isis_lsp_ext_is_reachability_is_neighbor_id;
+static int hf_isis_lsp_reservable_link_bandwidth;
+static int hf_isis_lsp_rt_capable_vlan_group_primary_vlan_id;
+static int hf_isis_lsp_rt_capable_interested_vlans_multicast_ipv4;
+static int hf_isis_lsp_rt_capable_interested_vlans_multicast_ipv6;
+static int hf_isis_lsp_mt_cap_spb_instance_number_of_trees;
+static int hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_u;
+static int hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_m;
+static int hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_a;
+static int hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_reserved;
+static int hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_ect;
+static int hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_base_vid;
+static int hf_isis_lsp_mt_cap_spb_instance_vlanid_tuple_spvid;
+static int hf_isis_lsp_mt_cap_spb_opaque_algorithm;
+static int hf_isis_lsp_mt_cap_spb_opaque_information;
+static int hf_isis_lsp_mt_cap_spbm_service_identifier_b_mac;
+static int hf_isis_lsp_ipv6_reachability_subclvs_len;
+static int hf_isis_lsp_ipv6_reachability_distribution;
+static int hf_isis_lsp_ipv6_reachability_distribution_internal;
+static int hf_isis_lsp_ipv6_reachability_subtlv;
+static int hf_isis_lsp_ipv6_reachability_metric;
+static int hf_isis_lsp_ipv6_reachability_prefix_length;
+static int hf_isis_lsp_prefix_attr_flags;
+static int hf_isis_lsp_prefix_attr_flags_x;
+static int hf_isis_lsp_prefix_attr_flags_r;
+static int hf_isis_lsp_prefix_attr_flags_n;
+static int hf_isis_lsp_rt_capable_trees_maximum_nof_trees_to_compute;
+static int hf_isis_lsp_rt_capable_interested_vlans_vlan_start_id;
+static int hf_isis_lsp_rt_capable_nickname_nickname_priority;
+static int hf_isis_lsp_ext_is_reachability_metric;
+static int hf_isis_lsp_ext_is_reachability_subclvs_len;
+static int hf_isis_lsp_ext_is_reachability_code;
+static int hf_isis_lsp_ext_is_reachability_len;
+static int hf_isis_lsp_ext_is_reachability_value;
+static int hf_isis_lsp_default_metric;
+static int hf_isis_lsp_ext_is_reachability_unidir_link_flags;
+static int hf_isis_lsp_ext_is_reachability_unidir_link_flags_a;
+static int hf_isis_lsp_ext_is_reachability_unidir_link_reserved;
+static int hf_isis_lsp_ext_is_reachability_unidir_link_delay;
+static int hf_isis_lsp_ext_is_reachability_unidir_link_delay_min;
+static int hf_isis_lsp_ext_is_reachability_unidir_link_delay_max;
+static int hf_isis_lsp_ext_is_reachability_unidir_delay_variation;
+static int hf_isis_lsp_ext_is_reachability_unidir_link_loss;
+static int hf_isis_lsp_ext_is_reachability_unidir_residual_bandwidth;
+static int hf_isis_lsp_ext_is_reachability_unidir_available_bandwidth;
+static int hf_isis_lsp_ext_is_reachability_unidir_utilized_bandwidth;
+static int hf_isis_lsp_ext_ip_reachability_distribution;
+static int hf_isis_lsp_ext_ip_reachability_subtlv;
+static int hf_isis_lsp_ext_ip_reachability_prefix_length;
+static int hf_isis_lsp_ext_ip_reachability_subclvs_len;
+static int hf_isis_lsp_ext_ip_reachability_code;
+static int hf_isis_lsp_ext_ip_reachability_len;
+static int hf_isis_lsp_ext_ip_reachability_prefix_flags;
+static int hf_isis_lsp_ext_ip_reachability_prefix_re_adv_flag;
+static int hf_isis_lsp_ext_ip_reachability_prefix_node_sid_flag;
+static int hf_isis_lsp_ext_ip_reachability_prefix_nophp_flag;
+static int hf_isis_lsp_ext_ip_reachability_prefix_expl_null_flag;
+static int hf_isis_lsp_ext_ip_reachability_prefix_value_flag;
+static int hf_isis_lsp_ext_ip_reachability_prefix_local_flag;
+static int hf_isis_lsp_maximum_link_bandwidth;
+static int hf_isis_lsp_rt_capable_nickname_tree_root_priority;
+static int hf_isis_lsp_eis_neighbors_delay_metric;
+static int hf_isis_lsp_rt_capable_trill_maximum_version;
+static int hf_isis_lsp_rt_capable_interested_vlans_afs_lost_counter;
+static int hf_isis_lsp_ipv6_reachability_ipv6_prefix;
+static int hf_isis_lsp_eis_neighbors_error_metric;
+static int hf_isis_lsp_rt_capable_interested_vlans_vlan_end_id;
+static int hf_isis_lsp_error_metric;
+static int hf_isis_lsp_grp_macaddr_number_of_records;
+static int hf_isis_lsp_grp_ipv4addr_number_of_records;
+static int hf_isis_lsp_grp_ipv6addr_number_of_records;
+static int hf_isis_lsp_rt_capable_nickname_nickname;
+static int hf_isis_lsp_mt_id_reserved;
+static int hf_isis_lsp_eis_neighbors_is_neighbor_id;
+static int hf_isis_lsp_mt_id;
+static int hf_isis_lsp_eis_neighbors_reserved;
+static int hf_isis_lsp_ip_reachability_error_metric;
+static int hf_isis_lsp_ip_reachability_delay_metric;
+static int hf_isis_lsp_ip_reachability_expense_metric;
+static int hf_isis_lsp_rt_capable_trees_nof_trees_to_use;
+static int hf_isis_lsp_ip_reachability_default_metric;
+static int hf_isis_lsp_rt_capable_trees_nof_trees_to_compute;
+static int hf_isis_lsp_eis_neighbors_expense_metric;
+static int hf_isis_lsp_partition_designated_l2_is;
+static int hf_isis_lsp_originating_lsp_buffer_size;
+static int hf_isis_lsp_ip_reachability_default_metric_ie;
+static int hf_isis_lsp_eis_neighbors_default_metric_ie;
+static int hf_isis_lsp_eis_neighbors_error_metric_supported;
+static int hf_isis_lsp_unrsv_bw_priority_level;
+static int hf_isis_lsp_ip_reachability_expense_metric_support;
+static int hf_isis_lsp_mt_cap_overload;
+static int hf_isis_lsp_eis_neighbors_expense_metric_supported;
+static int hf_isis_lsp_ip_reachability_delay_metric_support;
+static int hf_isis_lsp_ip_reachability_error_metric_support;
+static int hf_isis_lsp_mt_cap_spsourceid;
+static int hf_isis_lsp_eis_neighbors_delay_metric_supported;
+static int hf_isis_lsp_eis_neighbors_error_metric_ie;
+static int hf_isis_lsp_eis_neighbors_expense_metric_ie;
+static int hf_isis_lsp_eis_neighbors_delay_metric_ie;
+static int hf_isis_lsp_ip_reachability_delay_metric_ie;
+static int hf_isis_lsp_ip_reachability_distribution;
+static int hf_isis_lsp_ip_reachability_error_metric_ie;
+static int hf_isis_lsp_ip_reachability_expense_metric_ie;
+static int hf_isis_lsp_rt_capable_router_id;
+static int hf_isis_lsp_rt_capable_flag_s;
+static int hf_isis_lsp_rt_capable_flag_d;
+static int hf_isis_lsp_clv_te_node_cap_b_bit;
+static int hf_isis_lsp_clv_te_node_cap_e_bit;
+static int hf_isis_lsp_clv_te_node_cap_m_bit;
+static int hf_isis_lsp_clv_te_node_cap_g_bit;
+static int hf_isis_lsp_clv_te_node_cap_p_bit;
+static int hf_isis_lsp_clv_sr_cap_i_flag;
+static int hf_isis_lsp_clv_sr_cap_v_flag;
+static int hf_isis_lsp_clv_sr_cap_range;
+static int hf_isis_lsp_clv_sr_cap_sid;
+static int hf_isis_lsp_clv_sr_cap_label;
+static int hf_isis_lsp_clv_sr_alg;
+static int hf_isis_lsp_clv_sr_lb_flags;
+static int hf_isis_lsp_clv_srv6_cap_flags;
+static int hf_isis_lsp_clv_srv6_cap_flags_o;
+static int hf_isis_lsp_clv_srv6_cap_flags_reserved;
+static int hf_isis_lsp_clv_igp_msd_type;
+static int hf_isis_lsp_clv_igp_msd_value;
+static int hf_isis_lsp_clv_ext_admin_group;
+static int hf_isis_lsp_clv_app_sabm_legacy;
+static int hf_isis_lsp_clv_app_sabm_length;
+static int hf_isis_lsp_clv_app_sabm_bits;
+static int hf_isis_lsp_clv_app_sabm_bits_r;
+static int hf_isis_lsp_clv_app_sabm_bits_s;
+static int hf_isis_lsp_clv_app_sabm_bits_f;
+static int hf_isis_lsp_clv_app_sabm_bits_x;
+static int hf_isis_lsp_clv_app_udabm_reserved;
+static int hf_isis_lsp_clv_app_udabm_length;
+static int hf_isis_lsp_clv_app_udabm_bits;
+static int hf_isis_lsp_clv_flex_algo_algorithm;
+static int hf_isis_lsp_clv_flex_algo_metric_type;
+static int hf_isis_lsp_clv_flex_algo_calc_type;
+static int hf_isis_lsp_clv_flex_algo_priority;
+static int hf_isis_lsp_clv_srv6_endx_sid_system_id;
+static int hf_isis_lsp_clv_srv6_endx_sid_flags;
+static int hf_isis_lsp_clv_srv6_endx_sid_flags_b;
+static int hf_isis_lsp_clv_srv6_endx_sid_flags_s;
+static int hf_isis_lsp_clv_srv6_endx_sid_flags_p;
+static int hf_isis_lsp_clv_srv6_endx_sid_flags_reserved;
+static int hf_isis_lsp_clv_srv6_endx_sid_alg;
+static int hf_isis_lsp_clv_srv6_endx_sid_weight;
+static int hf_isis_lsp_clv_srv6_endx_sid_endpoint_behavior;
+static int hf_isis_lsp_clv_srv6_endx_sid_sid;
+static int hf_isis_lsp_clv_srv6_endx_sid_subsubclvs_len;
+static int hf_isis_lsp_area_address;
+static int hf_isis_lsp_instance_identifier;
+static int hf_isis_lsp_supported_itid;
+static int hf_isis_lsp_clv_nlpid_nlpid;
+static int hf_isis_lsp_ip_authentication;
+static int hf_isis_lsp_authentication;
+static int hf_isis_lsp_area_address_str;
+static int hf_isis_lsp_is_virtual;
+static int hf_isis_lsp_group;
+static int hf_isis_lsp_default;
+static int hf_isis_lsp_default_support;
+static int hf_isis_lsp_delay;
+static int hf_isis_lsp_delay_support;
+static int hf_isis_lsp_expense;
+static int hf_isis_lsp_expense_support;
+static int hf_isis_lsp_error;
+static int hf_isis_lsp_error_support;
+static int hf_isis_lsp_clv_ipv6_te_router_id;
+static int hf_isis_lsp_ext_is_reachability_ipv6_interface_address;
+static int hf_isis_lsp_ext_is_reachability_ipv6_neighbor_address;
+static int hf_isis_lsp_clv_bier_alg;
+static int hf_isis_lsp_clv_bier_igp_alg;
+static int hf_isis_lsp_clv_bier_subdomain;
+static int hf_isis_lsp_clv_bier_bfrid;
+static int hf_isis_lsp_clv_bier_subsub_type;
+static int hf_isis_lsp_clv_bier_subsub_len;
+static int hf_isis_lsp_clv_bier_subsub_mplsencap_maxsi;
+static int hf_isis_lsp_clv_bier_subsub_mplsencap_bslen;
+static int hf_isis_lsp_clv_bier_subsub_mplsencap_label;
+static int hf_isis_lsp_srv6_loc_metric;
+static int hf_isis_lsp_srv6_loc_flags;
+static int hf_isis_lsp_srv6_loc_flags_d;
+static int hf_isis_lsp_srv6_loc_flags_reserved;
+static int hf_isis_lsp_srv6_loc_alg;
+static int hf_isis_lsp_srv6_loc_size;
+static int hf_isis_lsp_srv6_loc_locator;
+static int hf_isis_lsp_srv6_loc_subclvs_len;
+static int hf_isis_lsp_srv6_loc_sub_tlv_type;
+static int hf_isis_lsp_srv6_loc_sub_tlv_length;
+static int hf_isis_lsp_clv_srv6_end_sid_flags;
+static int hf_isis_lsp_clv_srv6_end_sid_endpoint_behavior;
+static int hf_isis_lsp_clv_srv6_end_sid_sid;
+static int hf_isis_lsp_clv_srv6_end_sid_subsubclvs_len;
+static int hf_isis_lsp_clv_srv6_sid_struct_lb_len;
+static int hf_isis_lsp_clv_srv6_sid_struct_ln_len;
+static int hf_isis_lsp_clv_srv6_sid_struct_fun_len;
+static int hf_isis_lsp_clv_srv6_sid_struct_arg_len;
+static int hf_isis_lsp_purge_orig_id_num;
+static int hf_isis_lsp_purge_orig_id_system_id;
 /* rfc 6165: MAC Reachability */
-static int hf_isis_lsp_mac_reachability_topoid_nick = -1;
-static int hf_isis_lsp_mac_reachability_confidence = -1;
-static int hf_isis_lsp_mac_reachability_reserved = -1;
-static int hf_isis_lsp_mac_reachability_vlan = -1;
-static int hf_isis_lsp_mac_reachability_mac = -1;
-static int hf_isis_lsp_mac_reachability_chassismac = -1;
-static int hf_isis_lsp_mac_reachability_fanmcast = -1;
+static int hf_isis_lsp_mac_reachability_topoid_nick;
+static int hf_isis_lsp_mac_reachability_confidence;
+static int hf_isis_lsp_mac_reachability_reserved;
+static int hf_isis_lsp_mac_reachability_vlan;
+static int hf_isis_lsp_mac_reachability_mac;
+static int hf_isis_lsp_mac_reachability_chassismac;
+static int hf_isis_lsp_mac_reachability_fanmcast;
 /* Avaya proprietary */
-static int hf_isis_lsp_avaya_ipvpn_unknown = -1;
-static int hf_isis_lsp_avaya_ipvpn_system_id = -1;
-static int hf_isis_lsp_avaya_ipvpn_vrfsid = -1;
-static int hf_isis_lsp_avaya_ipvpn_subtlvbytes = -1;
-static int hf_isis_lsp_avaya_ipvpn_subtlvtype = -1;
-static int hf_isis_lsp_avaya_ipvpn_subtlvlength = -1;
-static int hf_isis_lsp_avaya_ipvpn_unknown_sub = -1;
-static int hf_isis_lsp_avaya_ipvpn_ipv4_metric = -1;
-static int hf_isis_lsp_avaya_ipvpn_ipv4_metrictype = -1;
-static int hf_isis_lsp_avaya_ipvpn_ipv4_addr = -1;
-static int hf_isis_lsp_avaya_ipvpn_ipv4_mask = -1;
-static int hf_isis_lsp_avaya_ipvpn_ipv6_metric = -1;
-static int hf_isis_lsp_avaya_ipvpn_ipv6_prefixlen = -1;
-static int hf_isis_lsp_avaya_ipvpn_ipv6_prefix = -1;
-static int hf_isis_lsp_avaya_185_unknown = -1;
-static int hf_isis_lsp_avaya_186_unknown = -1;
-
-static gint ett_isis_lsp = -1;
-static gint ett_isis_lsp_info = -1;
-static gint ett_isis_lsp_att = -1;
-static gint ett_isis_lsp_cksum = -1;
-static gint ett_isis_lsp_clv_area_addr = -1;
-static gint ett_isis_lsp_clv_is_neighbors = -1;
-static gint ett_isis_lsp_clv_instance_identifier = -1;
-static gint ett_isis_lsp_clv_ext_is_reachability = -1; /* CLV 22 */
-static gint ett_isis_lsp_part_of_clv_ext_is_reachability = -1;
-static gint ett_isis_lsp_part_of_clv_ext_is_reachability_subtlv = -1;
-static gint ett_isis_lsp_subclv_admin_group = -1;
-static gint ett_isis_lsp_subclv_unrsv_bw = -1;
-static gint ett_isis_lsp_subclv_bw_ct = -1;
-static gint ett_isis_lsp_subclv_spb_link_metric = -1;
-static gint ett_isis_lsp_adj_sid_flags = -1;
-static gint ett_isis_lsp_clv_unknown = -1;
-static gint ett_isis_lsp_clv_partition_dis = -1;
-static gint ett_isis_lsp_clv_prefix_neighbors = -1;
-static gint ett_isis_lsp_clv_nlpid_nlpid = -1;
-static gint ett_isis_lsp_clv_hostname = -1;
-static gint ett_isis_lsp_clv_srlg = -1;
-static gint ett_isis_lsp_clv_te_router_id = -1;
-static gint ett_isis_lsp_clv_authentication = -1;
-static gint ett_isis_lsp_clv_ip_authentication = -1;
-static gint ett_isis_lsp_clv_ipv4_int_addr = -1;
-static gint ett_isis_lsp_clv_ipv6_int_addr = -1; /* CLV 232 */
-static gint ett_isis_lsp_clv_mt_cap = -1;
-static gint ett_isis_lsp_clv_mt_cap_spb_instance = -1;
-static gint ett_isis_lsp_clv_mt_cap_spbm_service_identifier = -1;
-static gint ett_isis_lsp_clv_mt_cap_spbv_mac_address = -1;
-static gint ett_isis_lsp_clv_sid_label_binding = -1;
-static gint ett_isis_lsp_clv_ip_reachability = -1;
-static gint ett_isis_lsp_clv_ip_reach_subclv = -1;
-static gint ett_isis_lsp_clv_ext_ip_reachability = -1; /* CLV 135 */
-static gint ett_isis_lsp_part_of_clv_ext_ip_reachability = -1;
-static gint ett_isis_lsp_clv_ipv6_reachability = -1; /* CLV 236 */
-static gint ett_isis_lsp_part_of_clv_ipv6_reachability = -1;
-static gint ett_isis_lsp_prefix_sid_flags = -1;
-static gint ett_isis_lsp_prefix_attr_flags = -1;
-static gint ett_isis_lsp_clv_mt = -1;
-static gint ett_isis_lsp_clv_mt_is = -1;
-static gint ett_isis_lsp_part_of_clv_mt_is = -1;
-static gint ett_isis_lsp_clv_mt_reachable_IPv4_prefx = -1;  /* CLV 235 */
-static gint ett_isis_lsp_clv_mt_reachable_IPv6_prefx = -1;  /* CLV 237 */
-static gint ett_isis_lsp_clv_rt_capable = -1;   /* CLV 242 */
-static gint ett_isis_lsp_clv_te_node_cap_desc = -1;
-static gint ett_isis_lsp_clv_sr_cap = -1;
-static gint ett_isis_lsp_clv_sr_sid_label = -1;
-static gint ett_isis_lsp_clv_sr_alg = -1;
-static gint ett_isis_lsp_clv_sr_lb = -1;
-static gint ett_isis_lsp_clv_node_msd = -1;
-static gint ett_isis_lsp_clv_srv6_cap = -1;
-static gint ett_isis_lsp_clv_srv6_cap_flags = -1;
-static gint ett_isis_lsp_clv_flex_algo_def = -1;
-static gint ett_isis_lsp_clv_flex_algo_def_sub_tlv = -1;
-static gint ett_isis_lsp_clv_app_sabm_bits = -1;
-static gint ett_isis_lsp_clv_ipv6_te_rtrid = -1;
-static gint ett_isis_lsp_clv_trill_version = -1;
-static gint ett_isis_lsp_clv_trees = -1;
-static gint ett_isis_lsp_clv_root_id = -1;
-static gint ett_isis_lsp_clv_nickname = -1;
-static gint ett_isis_lsp_clv_interested_vlans = -1;
-static gint ett_isis_lsp_clv_tree_used = -1;
-static gint ett_isis_lsp_clv_vlan_group = -1;
-static gint ett_isis_lsp_clv_grp_address = -1;  /* CLV 142 */
-static gint ett_isis_lsp_clv_grp_macaddr = -1;
-static gint ett_isis_lsp_clv_grp_ipv4addr = -1;
-static gint ett_isis_lsp_clv_grp_ipv6addr = -1;
-static gint ett_isis_lsp_clv_grp_unknown = -1;
-static gint ett_isis_lsp_clv_purge_orig_id = -1; /* CLV 13 */
-static gint ett_isis_lsp_clv_originating_buff_size = -1; /* CLV 14 */
-static gint ett_isis_lsp_sl_flags = -1;
-static gint ett_isis_lsp_sl_sub_tlv = -1;
-static gint ett_isis_lsp_sl_sub_tlv_flags = -1;
-static gint ett_isis_lsp_clv_ipv6_te_router_id = -1;
-static gint ett_isis_lsp_clv_bier_subsub_tlv = -1;
-static gint ett_isis_lsp_clv_srv6_locator = -1;
-static gint ett_isis_lsp_clv_srv6_loc_entry = -1;
-static gint ett_isis_lsp_clv_srv6_loc_flags = -1;
-static gint ett_isis_lsp_clv_srv6_loc_sub_tlv = -1;
-static gint ett_isis_lsp_clv_srv6_loc_end_sid_sub_sub_tlv = -1;
-static gint ett_isis_lsp_clv_srv6_endx_sid_flags = -1;
-static gint ett_isis_lsp_clv_srv6_endx_sid_sub_sub_tlv = -1;
-static gint ett_isis_lsp_clv_unidir_link_flags = -1;
-static gint ett_isis_lsp_clv_mac_reachability = -1;
-static gint ett_isis_lsp_clv_avaya_ipvpn = -1;
-static gint ett_isis_lsp_clv_avaya_ipvpn_subtlv = -1;
-static gint ett_isis_lsp_clv_avaya_ipvpn_mc = -1;
-static gint ett_isis_lsp_clv_avaya_ip_grt_mc = -1;
-
-
-static expert_field ei_isis_lsp_short_pdu = EI_INIT;
-static expert_field ei_isis_lsp_long_pdu = EI_INIT;
-static expert_field ei_isis_lsp_bad_checksum = EI_INIT;
-static expert_field ei_isis_lsp_subtlv = EI_INIT;
-static expert_field ei_isis_lsp_authentication = EI_INIT;
-static expert_field ei_isis_lsp_short_clv = EI_INIT;
-static expert_field ei_isis_lsp_long_clv = EI_INIT;
-static expert_field ei_isis_lsp_length_clv = EI_INIT;
-static expert_field ei_isis_lsp_clv_mt = EI_INIT;
-static expert_field ei_isis_lsp_clv_unknown = EI_INIT;
-static expert_field ei_isis_lsp_malformed_subtlv = EI_INIT;
-static expert_field ei_isis_lsp_unknown_subtlv = EI_INIT;
-static expert_field ei_isis_lsp_reserved_not_zero = EI_INIT;
-static expert_field ei_isis_lsp_length_invalid = EI_INIT;
+static int hf_isis_lsp_avaya_ipvpn_unknown;
+static int hf_isis_lsp_avaya_ipvpn_system_id;
+static int hf_isis_lsp_avaya_ipvpn_vrfsid;
+static int hf_isis_lsp_avaya_ipvpn_subtlvbytes;
+static int hf_isis_lsp_avaya_ipvpn_subtlvtype;
+static int hf_isis_lsp_avaya_ipvpn_subtlvlength;
+static int hf_isis_lsp_avaya_ipvpn_unknown_sub;
+static int hf_isis_lsp_avaya_ipvpn_ipv4_metric;
+static int hf_isis_lsp_avaya_ipvpn_ipv4_metrictype;
+static int hf_isis_lsp_avaya_ipvpn_ipv4_addr;
+static int hf_isis_lsp_avaya_ipvpn_ipv4_mask;
+static int hf_isis_lsp_avaya_ipvpn_ipv6_metric;
+static int hf_isis_lsp_avaya_ipvpn_ipv6_prefixlen;
+static int hf_isis_lsp_avaya_ipvpn_ipv6_prefix;
+static int hf_isis_lsp_avaya_185_unknown;
+static int hf_isis_lsp_avaya_186_unknown;
+
+static gint ett_isis_lsp;
+static gint ett_isis_lsp_info;
+static gint ett_isis_lsp_att;
+static gint ett_isis_lsp_cksum;
+static gint ett_isis_lsp_clv_area_addr;
+static gint ett_isis_lsp_clv_is_neighbors;
+static gint ett_isis_lsp_clv_instance_identifier;
+static gint ett_isis_lsp_clv_ext_is_reachability; /* CLV 22 */
+static gint ett_isis_lsp_part_of_clv_ext_is_reachability;
+static gint ett_isis_lsp_part_of_clv_ext_is_reachability_subtlv;
+static gint ett_isis_lsp_subclv_admin_group;
+static gint ett_isis_lsp_subclv_unrsv_bw;
+static gint ett_isis_lsp_subclv_bw_ct;
+static gint ett_isis_lsp_subclv_spb_link_metric;
+static gint ett_isis_lsp_adj_sid_flags;
+static gint ett_isis_lsp_clv_unknown;
+static gint ett_isis_lsp_clv_partition_dis;
+static gint ett_isis_lsp_clv_prefix_neighbors;
+static gint ett_isis_lsp_clv_nlpid_nlpid;
+static gint ett_isis_lsp_clv_hostname;
+static gint ett_isis_lsp_clv_srlg;
+static gint ett_isis_lsp_clv_te_router_id;
+static gint ett_isis_lsp_clv_authentication;
+static gint ett_isis_lsp_clv_ip_authentication;
+static gint ett_isis_lsp_clv_ipv4_int_addr;
+static gint ett_isis_lsp_clv_ipv6_int_addr; /* CLV 232 */
+static gint ett_isis_lsp_clv_mt_cap;
+static gint ett_isis_lsp_clv_mt_cap_spb_instance;
+static gint ett_isis_lsp_clv_mt_cap_spbm_service_identifier;
+static gint ett_isis_lsp_clv_mt_cap_spbv_mac_address;
+static gint ett_isis_lsp_clv_sid_label_binding;
+static gint ett_isis_lsp_clv_ip_reachability;
+static gint ett_isis_lsp_clv_ip_reach_subclv;
+static gint ett_isis_lsp_clv_ext_ip_reachability; /* CLV 135 */
+static gint ett_isis_lsp_part_of_clv_ext_ip_reachability;
+static gint ett_isis_lsp_clv_ipv6_reachability; /* CLV 236 */
+static gint ett_isis_lsp_part_of_clv_ipv6_reachability;
+static gint ett_isis_lsp_prefix_sid_flags;
+static gint ett_isis_lsp_prefix_attr_flags;
+static gint ett_isis_lsp_clv_mt;
+static gint ett_isis_lsp_clv_mt_is;
+static gint ett_isis_lsp_part_of_clv_mt_is;
+static gint ett_isis_lsp_clv_mt_reachable_IPv4_prefx;  /* CLV 235 */
+static gint ett_isis_lsp_clv_mt_reachable_IPv6_prefx;  /* CLV 237 */
+static gint ett_isis_lsp_clv_rt_capable;   /* CLV 242 */
+static gint ett_isis_lsp_clv_te_node_cap_desc;
+static gint ett_isis_lsp_clv_sr_cap;
+static gint ett_isis_lsp_clv_sr_sid_label;
+static gint ett_isis_lsp_clv_sr_alg;
+static gint ett_isis_lsp_clv_sr_lb;
+static gint ett_isis_lsp_clv_node_msd;
+static gint ett_isis_lsp_clv_srv6_cap;
+static gint ett_isis_lsp_clv_srv6_cap_flags;
+static gint ett_isis_lsp_clv_flex_algo_def;
+static gint ett_isis_lsp_clv_flex_algo_def_sub_tlv;
+static gint ett_isis_lsp_clv_app_sabm_bits;
+static gint ett_isis_lsp_clv_ipv6_te_rtrid;
+static gint ett_isis_lsp_clv_trill_version;
+static gint ett_isis_lsp_clv_trees;
+static gint ett_isis_lsp_clv_root_id;
+static gint ett_isis_lsp_clv_nickname;
+static gint ett_isis_lsp_clv_interested_vlans;
+static gint ett_isis_lsp_clv_tree_used;
+static gint ett_isis_lsp_clv_vlan_group;
+static gint ett_isis_lsp_clv_grp_address;  /* CLV 142 */
+static gint ett_isis_lsp_clv_grp_macaddr;
+static gint ett_isis_lsp_clv_grp_ipv4addr;
+static gint ett_isis_lsp_clv_grp_ipv6addr;
+static gint ett_isis_lsp_clv_grp_unknown;
+static gint ett_isis_lsp_clv_purge_orig_id; /* CLV 13 */
+static gint ett_isis_lsp_clv_originating_buff_size; /* CLV 14 */
+static gint ett_isis_lsp_sl_flags;
+static gint ett_isis_lsp_sl_sub_tlv;
+static gint ett_isis_lsp_sl_sub_tlv_flags;
+static gint ett_isis_lsp_clv_ipv6_te_router_id;
+static gint ett_isis_lsp_clv_bier_subsub_tlv;
+static gint ett_isis_lsp_clv_srv6_locator;
+static gint ett_isis_lsp_clv_srv6_loc_entry;
+static gint ett_isis_lsp_clv_srv6_loc_flags;
+static gint ett_isis_lsp_clv_srv6_loc_sub_tlv;
+static gint ett_isis_lsp_clv_srv6_loc_end_sid_sub_sub_tlv;
+static gint ett_isis_lsp_clv_srv6_endx_sid_flags;
+static gint ett_isis_lsp_clv_srv6_endx_sid_sub_sub_tlv;
+static gint ett_isis_lsp_clv_unidir_link_flags;
+static gint ett_isis_lsp_clv_mac_reachability;
+static gint ett_isis_lsp_clv_avaya_ipvpn;
+static gint ett_isis_lsp_clv_avaya_ipvpn_subtlv;
+static gint ett_isis_lsp_clv_avaya_ipvpn_mc;
+static gint ett_isis_lsp_clv_avaya_ip_grt_mc;
+
+
+static expert_field ei_isis_lsp_short_pdu;
+static expert_field ei_isis_lsp_long_pdu;
+static expert_field ei_isis_lsp_bad_checksum;
+static expert_field ei_isis_lsp_subtlv;
+static expert_field ei_isis_lsp_authentication;
+static expert_field ei_isis_lsp_short_clv;
+static expert_field ei_isis_lsp_long_clv;
+static expert_field ei_isis_lsp_length_clv;
+static expert_field ei_isis_lsp_clv_mt;
+static expert_field ei_isis_lsp_clv_unknown;
+static expert_field ei_isis_lsp_malformed_subtlv;
+static expert_field ei_isis_lsp_unknown_subtlv;
+static expert_field ei_isis_lsp_reserved_not_zero;
+static expert_field ei_isis_lsp_length_invalid;
 
 static const value_string isis_lsp_istype_vals[] = {
     { ISIS_LSP_TYPE_UNUSED0,    "Unused 0x0 (invalid)"},
diff --git a/epan/dissectors/packet-isis-snp.c b/epan/dissectors/packet-isis-snp.c
index c9603753ed..cac3325921 100644
--- a/epan/dissectors/packet-isis-snp.c
+++ b/epan/dissectors/packet-isis-snp.c
@@ -27,62 +27,62 @@ void proto_reg_handoff_isis_lsp(void);
 void proto_register_isis_hello(void);
 void proto_reg_handoff_isis_hello(void);
 
-static int proto_isis_csnp = -1;
-static int proto_isis_psnp = -1;
+static int proto_isis_csnp;
+static int proto_isis_psnp;
 
 /* csnp packets */
-static int hf_isis_csnp_pdu_length = -1;
-static int hf_isis_csnp_source_id = -1;
-static int hf_isis_csnp_source_circuit = -1;
-static int hf_isis_csnp_start_lsp_id = -1;
-static int hf_isis_csnp_end_lsp_id = -1;
-static int hf_isis_csnp_lsp_id = -1;
-static int hf_isis_csnp_lsp_seq_num = -1;
-static int hf_isis_csnp_lsp_remain_life = -1;
-static int hf_isis_csnp_lsp_checksum = -1;
-static int hf_isis_csnp_checksum = -1;
-static int hf_isis_csnp_checksum_status = -1;
-static int hf_isis_csnp_clv_type = -1;
-static int hf_isis_csnp_clv_length = -1;
-static int hf_isis_csnp_ip_authentication = -1;
-static int hf_isis_csnp_authentication = -1;
-static int hf_isis_csnp_instance_identifier = -1;
-static int hf_isis_csnp_supported_itid = -1;
-static gint ett_isis_csnp = -1;
-static gint ett_isis_csnp_clv_lsp_entries = -1;
-static gint ett_isis_csnp_lsp_entry = -1;
-static gint ett_isis_csnp_clv_authentication = -1;
-static gint ett_isis_csnp_clv_ip_authentication = -1;
-static gint ett_isis_csnp_clv_instance_identifier = -1;
-static gint ett_isis_csnp_clv_checksum = -1;
-static gint ett_isis_csnp_clv_unknown = -1;
-
-static expert_field ei_isis_csnp_short_pdu = EI_INIT;
-static expert_field ei_isis_csnp_long_pdu = EI_INIT;
-static expert_field ei_isis_csnp_bad_checksum = EI_INIT;
-static expert_field ei_isis_csnp_authentication = EI_INIT;
-static expert_field ei_isis_csnp_short_clv = EI_INIT;
-static expert_field ei_isis_csnp_clv_unknown = EI_INIT;
+static int hf_isis_csnp_pdu_length;
+static int hf_isis_csnp_source_id;
+static int hf_isis_csnp_source_circuit;
+static int hf_isis_csnp_start_lsp_id;
+static int hf_isis_csnp_end_lsp_id;
+static int hf_isis_csnp_lsp_id;
+static int hf_isis_csnp_lsp_seq_num;
+static int hf_isis_csnp_lsp_remain_life;
+static int hf_isis_csnp_lsp_checksum;
+static int hf_isis_csnp_checksum;
+static int hf_isis_csnp_checksum_status;
+static int hf_isis_csnp_clv_type;
+static int hf_isis_csnp_clv_length;
+static int hf_isis_csnp_ip_authentication;
+static int hf_isis_csnp_authentication;
+static int hf_isis_csnp_instance_identifier;
+static int hf_isis_csnp_supported_itid;
+static gint ett_isis_csnp;
+static gint ett_isis_csnp_clv_lsp_entries;
+static gint ett_isis_csnp_lsp_entry;
+static gint ett_isis_csnp_clv_authentication;
+static gint ett_isis_csnp_clv_ip_authentication;
+static gint ett_isis_csnp_clv_instance_identifier;
+static gint ett_isis_csnp_clv_checksum;
+static gint ett_isis_csnp_clv_unknown;
+
+static expert_field ei_isis_csnp_short_pdu;
+static expert_field ei_isis_csnp_long_pdu;
+static expert_field ei_isis_csnp_bad_checksum;
+static expert_field ei_isis_csnp_authentication;
+static expert_field ei_isis_csnp_short_clv;
+static expert_field ei_isis_csnp_clv_unknown;
 
 /* psnp packets */
-static int hf_isis_psnp_pdu_length = -1;
-static int hf_isis_psnp_source_id = -1;
-static int hf_isis_psnp_source_circuit = -1;
-static int hf_isis_psnp_clv_type = -1;
-static int hf_isis_psnp_clv_length = -1;
-static int hf_isis_psnp_ip_authentication = -1;
-static gint ett_isis_psnp = -1;
-static gint ett_isis_psnp_clv_lsp_entries = -1;
-static gint ett_isis_psnp_lsp_entry = -1;
-static gint ett_isis_psnp_clv_authentication = -1;
-static gint ett_isis_psnp_clv_ip_authentication = -1;
-static gint ett_isis_psnp_clv_checksum = -1;
-static gint ett_isis_psnp_clv_unknown = -1;
-
-static expert_field ei_isis_psnp_short_pdu = EI_INIT;
-static expert_field ei_isis_psnp_long_pdu = EI_INIT;
-static expert_field ei_isis_psnp_short_clv = EI_INIT;
-static expert_field ei_isis_psnp_clv_unknown = EI_INIT;
+static int hf_isis_psnp_pdu_length;
+static int hf_isis_psnp_source_id;
+static int hf_isis_psnp_source_circuit;
+static int hf_isis_psnp_clv_type;
+static int hf_isis_psnp_clv_length;
+static int hf_isis_psnp_ip_authentication;
+static gint ett_isis_psnp;
+static gint ett_isis_psnp_clv_lsp_entries;
+static gint ett_isis_psnp_lsp_entry;
+static gint ett_isis_psnp_clv_authentication;
+static gint ett_isis_psnp_clv_ip_authentication;
+static gint ett_isis_psnp_clv_checksum;
+static gint ett_isis_psnp_clv_unknown;
+
+static expert_field ei_isis_psnp_short_pdu;
+static expert_field ei_isis_psnp_long_pdu;
+static expert_field ei_isis_psnp_short_clv;
+static expert_field ei_isis_psnp_clv_unknown;
 
 static void
 dissect_snp_authentication_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tree *tree, int offset,
diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c
index c872d7472d..1f4c090393 100644
--- a/epan/dissectors/packet-isis.c
+++ b/epan/dissectors/packet-isis.c
@@ -26,26 +26,26 @@ void proto_reg_handoff_isis(void);
 static dissector_table_t isis_dissector_table;
 
 /* isis base header */
-static int proto_isis               = -1;
-
-static int hf_isis_irpd             = -1;
-static int hf_isis_header_length    = -1;
-static int hf_isis_version          = -1;
-static int hf_isis_system_id_length = -1;
-static int hf_isis_type             = -1;
-static int hf_isis_type_reserved    = -1;
-static int hf_isis_version2         = -1;
-static int hf_isis_reserved         = -1;
-static int hf_isis_max_area_adr     = -1;
-int hf_isis_clv_key_id              = -1;
-
-static gint ett_isis                = -1;
-
-static expert_field ei_isis_length_indicator_too_small = EI_INIT;
-static expert_field ei_isis_version = EI_INIT;
-static expert_field ei_isis_version2 = EI_INIT;
-static expert_field ei_isis_reserved = EI_INIT;
-static expert_field ei_isis_type = EI_INIT;
+static int proto_isis;
+
+static int hf_isis_irpd;
+static int hf_isis_header_length;
+static int hf_isis_version;
+static int hf_isis_system_id_length;
+static int hf_isis_type;
+static int hf_isis_type_reserved;
+static int hf_isis_version2;
+static int hf_isis_reserved;
+static int hf_isis_max_area_adr;
+int hf_isis_clv_key_id;
+
+static gint ett_isis;
+
+static expert_field ei_isis_length_indicator_too_small;
+static expert_field ei_isis_version;
+static expert_field ei_isis_version2;
+static expert_field ei_isis_reserved;
+static expert_field ei_isis_type;
 
 static dissector_handle_t isis_handle;
 
diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c
index 36d1b8616b..f2c422591f 100644
--- a/epan/dissectors/packet-isl.c
+++ b/epan/dissectors/packet-isl.c
@@ -33,33 +33,33 @@ void proto_reg_handoff_isl(void);
  *
  * for information on ISL.
  */
-static int proto_isl = -1;
-static int hf_isl_dst = -1;
-static int hf_isl_type = -1;
-static int hf_isl_user_eth = -1;
-static int hf_isl_user = -1;
-static int hf_isl_src = -1;
-static int hf_isl_addr = -1;
-static int hf_isl_len = -1;
-static int hf_isl_hsa = -1;
-static int hf_isl_dsap = -1;
-static int hf_isl_ssap = -1;
-static int hf_isl_control = -1;
-static int hf_isl_vlan_id = -1;
-static int hf_isl_bpdu = -1;
-static int hf_isl_index = -1;
-static int hf_isl_reserved = -1;
-/* static int hf_isl_crc = -1; */
-static int hf_isl_src_vlan_id = -1;
-static int hf_isl_explorer = -1;
-static int hf_isl_dst_route_descriptor = -1;
-static int hf_isl_src_route_descriptor = -1;
-static int hf_isl_fcs_not_incl = -1;
-static int hf_isl_esize = -1;
-static int hf_isl_trailer = -1;
-
-static gint ett_isl = -1;
-static gint ett_isl_dst = -1;
+static int proto_isl;
+static int hf_isl_dst;
+static int hf_isl_type;
+static int hf_isl_user_eth;
+static int hf_isl_user;
+static int hf_isl_src;
+static int hf_isl_addr;
+static int hf_isl_len;
+static int hf_isl_hsa;
+static int hf_isl_dsap;
+static int hf_isl_ssap;
+static int hf_isl_control;
+static int hf_isl_vlan_id;
+static int hf_isl_bpdu;
+static int hf_isl_index;
+static int hf_isl_reserved;
+/* static int hf_isl_crc; */
+static int hf_isl_src_vlan_id;
+static int hf_isl_explorer;
+static int hf_isl_dst_route_descriptor;
+static int hf_isl_src_route_descriptor;
+static int hf_isl_fcs_not_incl;
+static int hf_isl_esize;
+static int hf_isl_trailer;
+
+static gint ett_isl;
+static gint ett_isl_dst;
 
 #define ISL_HEADER_SIZE 26
 
diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c
index dad15174b3..a1ce8b9c8f 100644
--- a/epan/dissectors/packet-ismacryp.c
+++ b/epan/dissectors/packet-ismacryp.c
@@ -66,9 +66,9 @@ static void add_bits(offset_struct* poffset, gint len_bits);
 #define DEFAULT_STREAM_STATE_INDICATION		0
 
 /* Wireshark ID of the ISMACRYP protocol */
-static int proto_ismacryp = -1;
-static int proto_ismacryp_v11 = -1;
-static int proto_ismacryp_v20 = -1;
+static int proto_ismacryp;
+static int proto_ismacryp_v11;
+static int proto_ismacryp_v20;
 
 /* parameters set in preferences */
 static guint    pref_au_size_length           = DEFAULT_AU_SIZE_LENGTH;            /* default Au size length */
@@ -116,46 +116,46 @@ static const value_string modetypenames[] = {
 * proto_register_field_array() in proto_register_ismacryp()
 */
 /** Kts attempt at defining the protocol */
-/* static gint hf_ismacryp = -1; */
-static gint hf_ismacryp_header = -1;
-static gint hf_ismacryp_au_headers_length = -1;
-/* static gint hf_ismacryp_header_length = -1; */
-static gint hf_ismacryp_header_byte = -1;
-/* static gint hf_ismacryp_version = -1; */
-/* static gint hf_ismacryp_length = -1; */
-/* static gint hf_ismacryp_message_type = -1; */
-/* static gint hf_ismacryp_message_length = -1; */
-static gint hf_ismacryp_message = -1;
-/* static gint hf_ismacryp_parameter = -1; */
-/* static gint hf_ismacryp_parameter_type = -1; */
-/* static gint hf_ismacryp_parameter_length = -1; */
-/* static gint hf_ismacryp_parameter_value = -1; */
-static gint hf_ismacryp_iv = -1;
-static gint hf_ismacryp_delta_iv = -1;
-static gint hf_ismacryp_key_indicator = -1;
-/* static gint hf_ismacryp_delta_iv_length = -1; */
-static gint hf_ismacryp_au_size = -1;
-static gint hf_ismacryp_au_index = -1;
-static gint hf_ismacryp_au_index_delta = -1;
-static gint hf_ismacryp_cts_delta = -1;
-static gint hf_ismacryp_cts_flag = -1;
-static gint hf_ismacryp_dts_flag = -1;
-static gint hf_ismacryp_dts_delta = -1;
-static gint hf_ismacryp_rap_flag = -1;
-static gint hf_ismacryp_au_is_encrypted = -1;
-static gint hf_ismacryp_slice_start = -1;
-static gint hf_ismacryp_slice_end = -1;
-static gint hf_ismacryp_padding_bitcount = -1;
-static gint hf_ismacryp_padding = -1;
-static gint hf_ismacryp_reserved_bits = -1;
-static gint hf_ismacryp_unused_bits = -1;
-static gint hf_ismacryp_stream_state = -1;
+/* static gint hf_ismacryp; */
+static gint hf_ismacryp_header;
+static gint hf_ismacryp_au_headers_length;
+/* static gint hf_ismacryp_header_length; */
+static gint hf_ismacryp_header_byte;
+/* static gint hf_ismacryp_version; */
+/* static gint hf_ismacryp_length; */
+/* static gint hf_ismacryp_message_type; */
+/* static gint hf_ismacryp_message_length; */
+static gint hf_ismacryp_message;
+/* static gint hf_ismacryp_parameter; */
+/* static gint hf_ismacryp_parameter_type; */
+/* static gint hf_ismacryp_parameter_length; */
+/* static gint hf_ismacryp_parameter_value; */
+static gint hf_ismacryp_iv;
+static gint hf_ismacryp_delta_iv;
+static gint hf_ismacryp_key_indicator;
+/* static gint hf_ismacryp_delta_iv_length; */
+static gint hf_ismacryp_au_size;
+static gint hf_ismacryp_au_index;
+static gint hf_ismacryp_au_index_delta;
+static gint hf_ismacryp_cts_delta;
+static gint hf_ismacryp_cts_flag;
+static gint hf_ismacryp_dts_flag;
+static gint hf_ismacryp_dts_delta;
+static gint hf_ismacryp_rap_flag;
+static gint hf_ismacryp_au_is_encrypted;
+static gint hf_ismacryp_slice_start;
+static gint hf_ismacryp_slice_end;
+static gint hf_ismacryp_padding_bitcount;
+static gint hf_ismacryp_padding;
+static gint hf_ismacryp_reserved_bits;
+static gint hf_ismacryp_unused_bits;
+static gint hf_ismacryp_stream_state;
 
 /* These are the ids of the subtrees that we may be creating */
-static gint ett_ismacryp = -1;
-static gint ett_ismacryp_header = -1;
-static gint ett_ismacryp_header_byte = -1;
-static gint ett_ismacryp_message = -1;
+static gint ett_ismacryp;
+static gint ett_ismacryp_header;
+static gint ett_ismacryp_header_byte;
+static gint ett_ismacryp_message;
 
 /* Informative tree structure is shown here:
 * TREE 	-
diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c
index 2517c50db4..ac26cde6a8 100644
--- a/epan/dissectors/packet-ismp.c
+++ b/epan/dissectors/packet-ismp.c
@@ -24,88 +24,88 @@ void proto_reg_handoff_ismp(void);
 static dissector_handle_t ismp_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_ismp = -1;
-static int hf_ismp_version = -1;
-static int hf_ismp_message_type = -1;
-static int hf_ismp_seq_num = -1;
-static int hf_ismp_code_length = -1;
-static int hf_ismp_auth_data = -1;
+static int proto_ismp;
+static int hf_ismp_version;
+static int hf_ismp_message_type;
+static int hf_ismp_seq_num;
+static int hf_ismp_code_length;
+static int hf_ismp_auth_data;
 
 /* Enterasys/Cabletron Dicovery Protocol fields*/
-static int hf_ismp_edp = -1;
-static int hf_ismp_edp_version = -1;
-static int hf_ismp_edp_module_ip = -1;
-static int hf_ismp_edp_module_mac = -1;
-static int hf_ismp_edp_module_port = -1;
-static int hf_ismp_edp_chassis_mac =-1;
-static int hf_ismp_edp_chassis_ip = -1;
-static int hf_ismp_edp_device_type = -1;
-static int hf_ismp_edp_module_rev = -1;
-static int hf_ismp_edp_options = -1;
-static int hf_ismp_edp_sfs_option_unused1 = -1;
-static int hf_ismp_edp_sfs_option_sfssup = -1;
-static int hf_ismp_edp_sfs_option_lsp = -1;
-static int hf_ismp_edp_sfs_option_flood = -1;
-static int hf_ismp_edp_sfs_option_resolve = -1;
-static int hf_ismp_edp_sfs_option_unused2 = -1;
-static int hf_ismp_edp_sfs_option_tagflood = -1;
-static int hf_ismp_edp_sfs_option_calltap = -1;
-static int hf_ismp_edp_sfs_option_conmsg = -1;
-static int hf_ismp_edp_sfs_option_redun = -1;
-static int hf_ismp_edp_sfs_option_isolated = -1;
-static int hf_ismp_edp_sfs_option_uplink_switch = -1;
-static int hf_ismp_edp_sfs_option_uplink_core = -1;
-static int hf_ismp_edp_sfs_option_uplink_port = -1;
-static int hf_ismp_edp_sfs_option_uplink_flood = -1;
-static int hf_ismp_edp_rtr_option_ssr = -1;
-static int hf_ismp_edp_rtr_option_igmp = -1;
-static int hf_ismp_edp_rtr_option_rip = -1;
-static int hf_ismp_edp_rtr_option_bgp = -1;
-static int hf_ismp_edp_rtr_option_ospf = -1;
-static int hf_ismp_edp_rtr_option_dvmrp = -1;
-static int hf_ismp_edp_rtr_option_8021q = -1;
-static int hf_ismp_edp_rtr_option_gvrp = -1;
-static int hf_ismp_edp_rtr_option_gmrp = -1;
-static int hf_ismp_edp_rtr_option_igmp_snoop = -1;
-static int hf_ismp_edp_rtr_option_route = -1;
-static int hf_ismp_edp_rtr_option_trans = -1;
-static int hf_ismp_edp_rtr_option_level1 = -1;
-static int hf_ismp_edp_switch_option_8021q = -1;
-static int hf_ismp_edp_switch_option_gvrp = -1;
-static int hf_ismp_edp_switch_option_gmrp = -1;
-static int hf_ismp_edp_switch_option_igmp = -1;
-static int hf_ismp_edp_switch_option_route = -1;
-static int hf_ismp_edp_switch_option_trans = -1;
-static int hf_ismp_edp_switch_option_level1 = -1;
-static int hf_ismp_edp_end_station_option_dhcp = -1;
-static int hf_ismp_edp_end_station_option_dns = -1;
-static int hf_ismp_edp_end_station_option_ad = -1;
-static int hf_ismp_edp_num_neighbors = -1;
-static int hf_ismp_edp_neighbors = -1;
-static int hf_ismp_edp_num_tuples = -1;
-static int hf_ismp_edp_tuples = -1;
+static int hf_ismp_edp;
+static int hf_ismp_edp_version;
+static int hf_ismp_edp_module_ip;
+static int hf_ismp_edp_module_mac;
+static int hf_ismp_edp_module_port;
+static int hf_ismp_edp_chassis_mac;
+static int hf_ismp_edp_chassis_ip;
+static int hf_ismp_edp_device_type;
+static int hf_ismp_edp_module_rev;
+static int hf_ismp_edp_options;
+static int hf_ismp_edp_sfs_option_unused1;
+static int hf_ismp_edp_sfs_option_sfssup;
+static int hf_ismp_edp_sfs_option_lsp;
+static int hf_ismp_edp_sfs_option_flood;
+static int hf_ismp_edp_sfs_option_resolve;
+static int hf_ismp_edp_sfs_option_unused2;
+static int hf_ismp_edp_sfs_option_tagflood;
+static int hf_ismp_edp_sfs_option_calltap;
+static int hf_ismp_edp_sfs_option_conmsg;
+static int hf_ismp_edp_sfs_option_redun;
+static int hf_ismp_edp_sfs_option_isolated;
+static int hf_ismp_edp_sfs_option_uplink_switch;
+static int hf_ismp_edp_sfs_option_uplink_core;
+static int hf_ismp_edp_sfs_option_uplink_port;
+static int hf_ismp_edp_sfs_option_uplink_flood;
+static int hf_ismp_edp_rtr_option_ssr;
+static int hf_ismp_edp_rtr_option_igmp;
+static int hf_ismp_edp_rtr_option_rip;
+static int hf_ismp_edp_rtr_option_bgp;
+static int hf_ismp_edp_rtr_option_ospf;
+static int hf_ismp_edp_rtr_option_dvmrp;
+static int hf_ismp_edp_rtr_option_8021q;
+static int hf_ismp_edp_rtr_option_gvrp;
+static int hf_ismp_edp_rtr_option_gmrp;
+static int hf_ismp_edp_rtr_option_igmp_snoop;
+static int hf_ismp_edp_rtr_option_route;
+static int hf_ismp_edp_rtr_option_trans;
+static int hf_ismp_edp_rtr_option_level1;
+static int hf_ismp_edp_switch_option_8021q;
+static int hf_ismp_edp_switch_option_gvrp;
+static int hf_ismp_edp_switch_option_gmrp;
+static int hf_ismp_edp_switch_option_igmp;
+static int hf_ismp_edp_switch_option_route;
+static int hf_ismp_edp_switch_option_trans;
+static int hf_ismp_edp_switch_option_level1;
+static int hf_ismp_edp_end_station_option_dhcp;
+static int hf_ismp_edp_end_station_option_dns;
+static int hf_ismp_edp_end_station_option_ad;
+static int hf_ismp_edp_num_neighbors;
+static int hf_ismp_edp_neighbors;
+static int hf_ismp_edp_num_tuples;
+static int hf_ismp_edp_tuples;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_ismp_assigned_neighbor_state = -1;
-static int hf_ismp_hold_time = -1;
-static int hf_ismp_interface_name = -1;
-static int hf_ismp_tuple_length = -1;
-static int hf_ismp_neighborhood_mac_address = -1;
-static int hf_ismp_unknown_tuple_data = -1;
-static int hf_ismp_tuple_type = -1;
-static int hf_ismp_system_description = -1;
-static int hf_ismp_interface_ipx_address = -1;
+static int hf_ismp_assigned_neighbor_state;
+static int hf_ismp_hold_time;
+static int hf_ismp_interface_name;
+static int hf_ismp_tuple_length;
+static int hf_ismp_neighborhood_mac_address;
+static int hf_ismp_unknown_tuple_data;
+static int hf_ismp_tuple_type;
+static int hf_ismp_system_description;
+static int hf_ismp_interface_ipx_address;
 
 
 /* Initialize the subtree pointers */
-static gint ett_ismp = -1;
-static gint ett_ismp_edp = -1;
-static gint ett_ismp_edp_options = -1;
-static gint ett_ismp_edp_neighbors = -1;
-static gint ett_ismp_edp_neighbors_leaf = -1;
-static gint ett_ismp_edp_tuples = -1;
-static gint ett_ismp_edp_tuples_leaf = -1;
-
-static expert_field ei_ismp_malformed = EI_INIT;
+static gint ett_ismp;
+static gint ett_ismp_edp;
+static gint ett_ismp_edp_options;
+static gint ett_ismp_edp_neighbors;
+static gint ett_ismp_edp_neighbors_leaf;
+static gint ett_ismp_edp_tuples;
+static gint ett_ismp_edp_tuples_leaf;
+
+static expert_field ei_ismp_malformed;
 
 /* ISMP TYPES */
 #define ISMPTYPE_EDP	2
diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c
index ba7b9a1652..e01e65dda3 100644
--- a/epan/dissectors/packet-isns.c
+++ b/epan/dissectors/packet-isns.c
@@ -41,130 +41,130 @@ void proto_reg_handoff_isns(void);
 static dissector_handle_t isns_tcp_handle;
 static dissector_handle_t isns_udp_handle;
 
-static gint ett_isns_flags = -1;
-static gint ett_isns_payload = -1;
-static gint ett_isns_attribute = -1;
-static gint ett_isns_port = -1;
-static gint ett_isns_isnt = -1;
+static gint ett_isns_flags;
+static gint ett_isns_payload;
+static gint ett_isns_attribute;
+static gint ett_isns_port;
+static gint ett_isns_isnt;
 
 static guint AddAttribute(packet_info *pinfo, tvbuff_t *tvb, proto_tree *tree,
                           guint offset, guint16 function_id);
 
 /* Initialize the protocol and registered fields */
-static int proto_isns = -1;
+static int proto_isns;
 
 
 /* Header Stuff */
-static int hf_isns_version = -1;
-static int hf_isns_function_id = -1;
-static int hf_isns_pdu_length = -1;
-static int hf_isns_flags = -1;
-static int hf_isns_transaction_id = -1;
-static int hf_isns_sequence_id = -1;
-static int hf_isns_payload = -1;
-static int hf_isns_first_pdu = -1;
-static int hf_isns_last_pdu = -1;
-static int hf_isns_replace = -1;
-static int hf_isns_auth = -1;
-static int hf_isns_server = -1;
-static int hf_isns_client = -1;
+static int hf_isns_version;
+static int hf_isns_function_id;
+static int hf_isns_pdu_length;
+static int hf_isns_flags;
+static int hf_isns_transaction_id;
+static int hf_isns_sequence_id;
+static int hf_isns_payload;
+static int hf_isns_first_pdu;
+static int hf_isns_last_pdu;
+static int hf_isns_replace;
+static int hf_isns_auth;
+static int hf_isns_server;
+static int hf_isns_client;
 
 /* Payload stuff */
-static int hf_isns_scn_bitmap                                      = -1;
-static int hf_isns_scn_bitmap_initiator_and_self_information_only  = -1;
-static int hf_isns_scn_bitmap_target_and_self_information_only     = -1;
-static int hf_isns_scn_bitmap_management_registration_scn          = -1;
-static int hf_isns_scn_bitmap_object_removed                       = -1;
-static int hf_isns_scn_bitmap_object_added                         = -1;
-static int hf_isns_scn_bitmap_object_updated                       = -1;
-static int hf_isns_scn_bitmap_dd_dds_member_removed                = -1;
-static int hf_isns_scn_bitmap_dd_dds_member_added                  = -1;
-static int hf_isns_isnt_control = -1;
-static int hf_isns_isnt_initiator = -1;
-static int hf_isns_isnt_target = -1;
-
-static int hf_isns_psb = -1;
-static int hf_isns_psb_tunnel_mode = -1;
-static int hf_isns_psb_transport_mode = -1;
-static int hf_isns_psb_pfs = -1;
-static int hf_isns_psb_aggressive_mode = -1;
-static int hf_isns_psb_main_mode = -1;
-static int hf_isns_psb_ike_ipsec = -1;
-static int hf_isns_psb_bitmap = -1;
-
-static int hf_isns_dd_member_portal_port = -1;
-static int hf_isns_portal_port = -1;
-static int hf_isns_esi_port = -1;
-static int hf_isns_scn_port = -1;
-static int hf_isns_port_type = -1;
-
-static int hf_isns_entity_protocol = -1;
-static int hf_isns_iscsi_node_type = -1;
-static int hf_isns_resp_errorcode = -1;
-static int hf_isns_attr_tag = -1;
-static int hf_isns_attr_len = -1;
-static int hf_isns_heartbeat_ipv6_addr = -1;
-static int hf_isns_heartbeat_udp_port = -1;
-static int hf_isns_heartbeat_tcp_port = -1;
-static int hf_isns_heartbeat_interval = -1;
-static int hf_isns_heartbeat_counter = -1;
-
-static int hf_isns_mgmt_ip_addr = -1;
-static int hf_isns_node_ip_addr = -1;
-static int hf_isns_port_ip_addr = -1;
-static int hf_isns_portal_ip_addr = -1;
-static int hf_isns_dd_member_portal_ip_addr = -1;
-static int hf_isns_iscsi_name = -1;
-static int hf_isns_switch_name = -1;
-static int hf_isns_dd_member_iscsi_name = -1;
-static int hf_isns_virtual_fabric_id = -1;
-static int hf_isns_proxy_iscsi_name = -1;
-static int hf_isns_fc4_descriptor = -1;
-static int hf_isns_iscsi_auth_method = -1;
-static int hf_isns_iscsi_alias = -1;
-static int hf_isns_portal_symbolic_name = -1;
-static int hf_isns_dd_set_symbolic_name = -1;
-static int hf_isns_dd_symbolic_name = -1;
-static int hf_isns_symbolic_port_name = -1;
-static int hf_isns_symbolic_node_name = -1;
-static int hf_isns_entity_identifier = -1;
-static int hf_isns_dd_id_next_id = -1;
-static int hf_isns_member_iscsi_index = -1;
-static int hf_isns_member_portal_index = -1;
-static int hf_isns_member_fc_port_name = -1;
-static int hf_isns_vendor_oui = -1;
-static int hf_isns_preferred_id = -1;
-static int hf_isns_assigned_id = -1;
-static int hf_isns_dd_id = -1;
-static int hf_isns_dd_set_id = -1;
-static int hf_isns_dd_set_next_id = -1;
-static int hf_isns_node_index = -1;
-static int hf_isns_node_next_index = -1;
-static int hf_isns_entity_index = -1;
-static int hf_isns_portal_index = -1;
-static int hf_isns_portal_next_index = -1;
-static int hf_isns_entity_next_index = -1;
-static int hf_isns_timestamp = -1;
-static int hf_isns_esi_interval = -1;
-static int hf_isns_registration_period = -1;
-static int hf_isns_port_id = -1;
-static int hf_isns_hard_address = -1;
-static int hf_isns_wwnn_token = -1;
-static int hf_isns_node_ipa = -1;
-static int hf_isns_fc_port_name_wwpn = -1;
-static int hf_isns_fc_node_name_wwnn = -1;
-static int hf_isns_fabric_port_name = -1;
-static int hf_isns_permanent_port_name = -1;
-static int hf_isns_not_decoded_yet = -1;
-static int hf_isns_portal_group_tag = -1;
-static int hf_isns_pg_iscsi_name = -1;
-static int hf_isns_pg_portal_ip_addr = -1;
-static int hf_isns_pg_portal_port = -1;
-static int hf_isns_pg_index = -1;
-static int hf_isns_pg_next_index = -1;
-
-static expert_field ei_isns_not_first_pdu = EI_INIT;
-static expert_field ei_isns_invalid_attr_len = EI_INIT;
+static int hf_isns_scn_bitmap;
+static int hf_isns_scn_bitmap_initiator_and_self_information_only;
+static int hf_isns_scn_bitmap_target_and_self_information_only;
+static int hf_isns_scn_bitmap_management_registration_scn;
+static int hf_isns_scn_bitmap_object_removed;
+static int hf_isns_scn_bitmap_object_added;
+static int hf_isns_scn_bitmap_object_updated;
+static int hf_isns_scn_bitmap_dd_dds_member_removed;
+static int hf_isns_scn_bitmap_dd_dds_member_added;
+static int hf_isns_isnt_control;
+static int hf_isns_isnt_initiator;
+static int hf_isns_isnt_target;
+
+static int hf_isns_psb;
+static int hf_isns_psb_tunnel_mode;
+static int hf_isns_psb_transport_mode;
+static int hf_isns_psb_pfs;
+static int hf_isns_psb_aggressive_mode;
+static int hf_isns_psb_main_mode;
+static int hf_isns_psb_ike_ipsec;
+static int hf_isns_psb_bitmap;
+
+static int hf_isns_dd_member_portal_port;
+static int hf_isns_portal_port;
+static int hf_isns_esi_port;
+static int hf_isns_scn_port;
+static int hf_isns_port_type;
+
+static int hf_isns_entity_protocol;
+static int hf_isns_iscsi_node_type;
+static int hf_isns_resp_errorcode;
+static int hf_isns_attr_tag;
+static int hf_isns_attr_len;
+static int hf_isns_heartbeat_ipv6_addr;
+static int hf_isns_heartbeat_udp_port;
+static int hf_isns_heartbeat_tcp_port;
+static int hf_isns_heartbeat_interval;
+static int hf_isns_heartbeat_counter;
+
+static int hf_isns_mgmt_ip_addr;
+static int hf_isns_node_ip_addr;
+static int hf_isns_port_ip_addr;
+static int hf_isns_portal_ip_addr;
+static int hf_isns_dd_member_portal_ip_addr;
+static int hf_isns_iscsi_name;
+static int hf_isns_switch_name;
+static int hf_isns_dd_member_iscsi_name;
+static int hf_isns_virtual_fabric_id;
+static int hf_isns_proxy_iscsi_name;
+static int hf_isns_fc4_descriptor;
+static int hf_isns_iscsi_auth_method;
+static int hf_isns_iscsi_alias;
+static int hf_isns_portal_symbolic_name;
+static int hf_isns_dd_set_symbolic_name;
+static int hf_isns_dd_symbolic_name;
+static int hf_isns_symbolic_port_name;
+static int hf_isns_symbolic_node_name;
+static int hf_isns_entity_identifier;
+static int hf_isns_dd_id_next_id;
+static int hf_isns_member_iscsi_index;
+static int hf_isns_member_portal_index;
+static int hf_isns_member_fc_port_name;
+static int hf_isns_vendor_oui;
+static int hf_isns_preferred_id;
+static int hf_isns_assigned_id;
+static int hf_isns_dd_id;
+static int hf_isns_dd_set_id;
+static int hf_isns_dd_set_next_id;
+static int hf_isns_node_index;
+static int hf_isns_node_next_index;
+static int hf_isns_entity_index;
+static int hf_isns_portal_index;
+static int hf_isns_portal_next_index;
+static int hf_isns_entity_next_index;
+static int hf_isns_timestamp;
+static int hf_isns_esi_interval;
+static int hf_isns_registration_period;
+static int hf_isns_port_id;
+static int hf_isns_hard_address;
+static int hf_isns_wwnn_token;
+static int hf_isns_node_ipa;
+static int hf_isns_fc_port_name_wwpn;
+static int hf_isns_fc_node_name_wwnn;
+static int hf_isns_fabric_port_name;
+static int hf_isns_permanent_port_name;
+static int hf_isns_not_decoded_yet;
+static int hf_isns_portal_group_tag;
+static int hf_isns_pg_iscsi_name;
+static int hf_isns_pg_portal_ip_addr;
+static int hf_isns_pg_portal_port;
+static int hf_isns_pg_index;
+static int hf_isns_pg_next_index;
+
+static expert_field ei_isns_not_first_pdu;
+static expert_field ei_isns_invalid_attr_len;
 
 /* Desegment iSNS over TCP messages */
 static gboolean isns_desegment = TRUE;
@@ -519,7 +519,7 @@ static const true_false_string tfs_isns_flag_client = {
 
 
 /* Initialize the subtree pointers */
-static gint ett_isns = -1;
+static gint ett_isns;
 
 
 /* Code to actually dissect the packets */
diff --git a/epan/dissectors/packet-iso10681.c b/epan/dissectors/packet-iso10681.c
index 37edd587bc..09d24186db 100644
--- a/epan/dissectors/packet-iso10681.c
+++ b/epan/dissectors/packet-iso10681.c
@@ -104,28 +104,28 @@ static const value_string iso10681_fc_ack_values[] = {
         {0, NULL}
 };
 
-static int hf_iso10681_target_address = -1;
-static int hf_iso10681_source_address = -1;
-static int hf_iso10681_type = -1;
-static int hf_iso10681_type2 = -1;
-static int hf_iso10681_frame_payload_length = -1;
-static int hf_iso10681_message_length = -1;
-static int hf_iso10681_sequence_number = -1;
-static int hf_iso10681_fc_flow_status = -1;
-static int hf_iso10681_fc_bandwidth_control = -1;
-static int hf_iso10681_fc_bc_separation_cycle_exp = -1;
-static int hf_iso10681_fc_bc_max_num_pdu_per_cycle = -1;
-static int hf_iso10681_fc_buffer_size = -1;
-static int hf_iso10681_fc_ack = -1;
-static int hf_iso10681_fc_byte_position = -1;
-
-
-static gint ett_iso10681 = -1;
-static gint ett_iso10681_bandwidth_control = -1;
-
-static expert_field ei_iso10681_message_type_bad = EI_INIT;
-
-static int proto_iso10681 = -1;
+static int hf_iso10681_target_address;
+static int hf_iso10681_source_address;
+static int hf_iso10681_type;
+static int hf_iso10681_type2;
+static int hf_iso10681_frame_payload_length;
+static int hf_iso10681_message_length;
+static int hf_iso10681_sequence_number;
+static int hf_iso10681_fc_flow_status;
+static int hf_iso10681_fc_bandwidth_control;
+static int hf_iso10681_fc_bc_separation_cycle_exp;
+static int hf_iso10681_fc_bc_max_num_pdu_per_cycle;
+static int hf_iso10681_fc_buffer_size;
+static int hf_iso10681_fc_ack;
+static int hf_iso10681_fc_byte_position;
+
+
+static gint ett_iso10681;
+static gint ett_iso10681_bandwidth_control;
+
+static expert_field ei_iso10681_message_type_bad;
+
+static int proto_iso10681;
 static dissector_handle_t iso10681_handle_flexray = NULL;
 
 static dissector_table_t subdissector_table;
@@ -139,19 +139,19 @@ static wmem_map_t *iso10681_seq_table = NULL;
 static guint32     next_seqnum = 0;
 
 
-static int hf_iso10681_fragments = -1;
-static int hf_iso10681_fragment = -1;
-static int hf_iso10681_fragment_overlap = -1;
-static int hf_iso10681_fragment_overlap_conflicts = -1;
-static int hf_iso10681_fragment_multiple_tails = -1;
-static int hf_iso10681_fragment_too_long_fragment = -1;
-static int hf_iso10681_fragment_error = -1;
-static int hf_iso10681_fragment_count = -1;
-static int hf_iso10681_reassembled_in = -1;
-static int hf_iso10681_reassembled_length = -1;
+static int hf_iso10681_fragments;
+static int hf_iso10681_fragment;
+static int hf_iso10681_fragment_overlap;
+static int hf_iso10681_fragment_overlap_conflicts;
+static int hf_iso10681_fragment_multiple_tails;
+static int hf_iso10681_fragment_too_long_fragment;
+static int hf_iso10681_fragment_error;
+static int hf_iso10681_fragment_count;
+static int hf_iso10681_reassembled_in;
+static int hf_iso10681_reassembled_length;
 
-static gint ett_iso10681_fragment = -1;
-static gint ett_iso10681_fragments = -1;
+static gint ett_iso10681_fragment;
+static gint ett_iso10681_fragments;
 
 static const fragment_items iso10681_frag_items = {
         /* Fragment subtrees */
diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c
index 32108849ce..9818734875 100644
--- a/epan/dissectors/packet-iso14443.c
+++ b/epan/dissectors/packet-iso14443.c
@@ -166,7 +166,7 @@ static const true_false_string tfs_nak_ack = { "NAK", "ACK" };
 void proto_register_iso14443(void);
 void proto_reg_handoff_iso14443(void);
 
-static int proto_iso14443 = -1;
+static int proto_iso14443;
 
 static dissector_handle_t iso14443_handle;
 
@@ -174,133 +174,133 @@ static dissector_table_t iso14443_cmd_type_table;
 
 static dissector_table_t iso14443_subdissector_table;
 
-static int ett_iso14443 = -1;
-static int ett_iso14443_hdr = -1;
-static int ett_iso14443_msg = -1;
-static int ett_iso14443_app_data = -1;
-static int ett_iso14443_prot_inf = -1;
-static int ett_iso14443_bit_rate = -1;
-static int ett_iso14443_prot_type = -1;
-static int ett_iso14443_ats_t0 = -1;
-static int ett_iso14443_ats_ta1 = -1;
-static int ett_iso14443_ats_tb1 = -1;
-static int ett_iso14443_ats_tc1 = -1;
-static int ett_iso14443_attr_p1 = -1;
-static int ett_iso14443_attr_p2 = -1;
-static int ett_iso14443_attr_p3 = -1;
-static int ett_iso14443_attr_p4 = -1;
-static int ett_iso14443_pcb = -1;
-static int ett_iso14443_inf = -1;
-static int ett_iso14443_frag = -1;
-static int ett_iso14443_frags = -1;
-
-static int hf_iso14443_hdr_ver = -1;
-static int hf_iso14443_event = -1;
-static int hf_iso14443_len_field = -1;
-static int hf_iso14443_resp_to = -1;
-static int hf_iso14443_resp_in = -1;
-static int hf_iso14443_short_frame = -1;
-static int hf_iso14443_atqa_rfu1 = -1;
-static int hf_iso14443_atqa_rfu2 = -1;
-static int hf_iso14443_propr_coding = -1;
-static int hf_iso14443_uid_bits = -1;
-static int hf_iso14443_uid_size = -1;
-static int hf_iso14443_max_frame_size = -1;
-static int hf_iso14443_bit_frame_anticoll = -1;
-static int hf_iso14443_apf = -1;
-static int hf_iso14443_afi = -1;
-static int hf_iso14443_ext_atqb = -1;
+static int ett_iso14443;
+static int ett_iso14443_hdr;
+static int ett_iso14443_msg;
+static int ett_iso14443_app_data;
+static int ett_iso14443_prot_inf;
+static int ett_iso14443_bit_rate;
+static int ett_iso14443_prot_type;
+static int ett_iso14443_ats_t0;
+static int ett_iso14443_ats_ta1;
+static int ett_iso14443_ats_tb1;
+static int ett_iso14443_ats_tc1;
+static int ett_iso14443_attr_p1;
+static int ett_iso14443_attr_p2;
+static int ett_iso14443_attr_p3;
+static int ett_iso14443_attr_p4;
+static int ett_iso14443_pcb;
+static int ett_iso14443_inf;
+static int ett_iso14443_frag;
+static int ett_iso14443_frags;
+
+static int hf_iso14443_hdr_ver;
+static int hf_iso14443_event;
+static int hf_iso14443_len_field;
+static int hf_iso14443_resp_to;
+static int hf_iso14443_resp_in;
+static int hf_iso14443_short_frame;
+static int hf_iso14443_atqa_rfu1;
+static int hf_iso14443_atqa_rfu2;
+static int hf_iso14443_propr_coding;
+static int hf_iso14443_uid_bits;
+static int hf_iso14443_uid_size;
+static int hf_iso14443_max_frame_size;
+static int hf_iso14443_bit_frame_anticoll;
+static int hf_iso14443_apf;
+static int hf_iso14443_afi;
+static int hf_iso14443_ext_atqb;
 /* if this is present but unset, we have a REQB */
-static int hf_iso14443_wupb = -1;
-static int hf_iso14443_n = -1;
-static int hf_iso14443_atqb_start = -1;
-static int hf_iso14443_app_data = -1;
-static int hf_iso14443_num_afi_apps = -1;
-static int hf_iso14443_total_num_apps = -1;
-static int hf_iso14443_prot_inf = -1;
-static int hf_iso14443_bit_rate_cap = -1;
-static int hf_iso14443_same_bit_rate = -1;
-static int hf_iso14443_picc_pcd_847 = -1;
-static int hf_iso14443_picc_pcd_424 = -1;
-static int hf_iso14443_picc_pcd_212 = -1;
-static int hf_iso14443_pcd_picc_847 = -1;
-static int hf_iso14443_pcd_picc_424 = -1;
-static int hf_iso14443_pcd_picc_212 = -1;
-static int hf_iso14443_max_frame_size_code = -1;
-static int hf_iso14443_prot_type = -1;
-static int hf_iso14443_min_tr2 = -1;
-static int hf_iso14443_4_compl_atqb = -1;
-static int hf_iso14443_fwi = -1;
-static int hf_iso14443_sfgi = -1;
-static int hf_iso14443_adc = -1;
-static int hf_iso14443_nad_supported = -1;
-static int hf_iso14443_cid_supported = -1;
-static int hf_iso14443_hlta = -1;
-static int hf_iso14443_sel = -1;
-static int hf_iso14443_nvb = -1;
-static int hf_iso14443_4_compl_sak = -1;
-static int hf_iso14443_uid_complete = -1;
-static int hf_iso14443_ct = -1;
-static int hf_iso14443_uid_cln = -1;
-static int hf_iso14443_bcc = -1;
-static int hf_iso14443_rats_start = -1;
-static int hf_iso14443_fsdi = -1;
-static int hf_iso14443_fsd = -1;
-static int hf_iso14443_cid = -1;
-static int hf_iso14443_tl = -1;
-static int hf_iso14443_t0 = -1;
-static int hf_iso14443_tc1_transmitted = -1;
-static int hf_iso14443_tb1_transmitted = -1;
-static int hf_iso14443_ta1_transmitted = -1;
-static int hf_iso14443_fsci = -1;
-static int hf_iso14443_fsc = -1;
-static int hf_iso14443_tc1 = -1;
-static int hf_iso14443_tb1 = -1;
-static int hf_iso14443_ta1 = -1;
-static int hf_iso14443_same_d = -1;
-static int hf_iso14443_ds8 = -1;
-static int hf_iso14443_ds4 = -1;
-static int hf_iso14443_ds2 = -1;
-static int hf_iso14443_dr8 = -1;
-static int hf_iso14443_dr4 = -1;
-static int hf_iso14443_dr2 = -1;
-static int hf_iso14443_hist_bytes = -1;
-static int hf_iso14443_attrib_start = -1;
-static int hf_iso14443_pupi = -1;
-static int hf_iso14443_param1 = -1;
-static int hf_iso14443_min_tr0 = -1;
-static int hf_iso14443_min_tr1 = -1;
-static int hf_iso14443_eof = -1;
-static int hf_iso14443_sof = -1;
-static int hf_iso14443_param2 = -1;
-static int hf_iso14443_bitrate_picc_pcd = -1;
-static int hf_iso14443_bitrate_pcd_picc = -1;
-static int hf_iso14443_param3 = -1;
-static int hf_iso14443_param4 = -1;
-static int hf_iso14443_mbli = -1;
-static int hf_iso14443_pcb = -1;
-static int hf_iso14443_block_type = -1;
-static int hf_iso14443_i_blk_chaining = -1;
-static int hf_iso14443_cid_following = -1;
-static int hf_iso14443_nad_following = -1;
-static int hf_iso14443_nak = -1;
-static int hf_iso14443_blk_num = -1;
-static int hf_iso14443_s_blk_cmd = -1;
-static int hf_iso14443_pwr_lvl_ind = -1;
-static int hf_iso14443_wtxm = -1;
-static int hf_iso14443_inf = -1;
-static int hf_iso14443_frags = -1;
-static int hf_iso14443_frag = -1;
-static int hf_iso14443_frag_overlap = -1;
-static int hf_iso14443_frag_overlap_conflicts = -1;
-static int hf_iso14443_frag_multiple_tails = -1;
-static int hf_iso14443_frag_too_long_frag = -1;
-static int hf_iso14443_frag_err = -1;
-static int hf_iso14443_frag_cnt = -1;
-static int hf_iso14443_reass_in = -1;
-static int hf_iso14443_reass_len = -1;
-static int hf_iso14443_crc = -1;
-static int hf_iso14443_crc_status = -1;
+static int hf_iso14443_wupb;
+static int hf_iso14443_n;
+static int hf_iso14443_atqb_start;
+static int hf_iso14443_app_data;
+static int hf_iso14443_num_afi_apps;
+static int hf_iso14443_total_num_apps;
+static int hf_iso14443_prot_inf;
+static int hf_iso14443_bit_rate_cap;
+static int hf_iso14443_same_bit_rate;
+static int hf_iso14443_picc_pcd_847;
+static int hf_iso14443_picc_pcd_424;
+static int hf_iso14443_picc_pcd_212;
+static int hf_iso14443_pcd_picc_847;
+static int hf_iso14443_pcd_picc_424;
+static int hf_iso14443_pcd_picc_212;
+static int hf_iso14443_max_frame_size_code;
+static int hf_iso14443_prot_type;
+static int hf_iso14443_min_tr2;
+static int hf_iso14443_4_compl_atqb;
+static int hf_iso14443_fwi;
+static int hf_iso14443_sfgi;
+static int hf_iso14443_adc;
+static int hf_iso14443_nad_supported;
+static int hf_iso14443_cid_supported;
+static int hf_iso14443_hlta;
+static int hf_iso14443_sel;
+static int hf_iso14443_nvb;
+static int hf_iso14443_4_compl_sak;
+static int hf_iso14443_uid_complete;
+static int hf_iso14443_ct;
+static int hf_iso14443_uid_cln;
+static int hf_iso14443_bcc;
+static int hf_iso14443_rats_start;
+static int hf_iso14443_fsdi;
+static int hf_iso14443_fsd;
+static int hf_iso14443_cid;
+static int hf_iso14443_tl;
+static int hf_iso14443_t0;
+static int hf_iso14443_tc1_transmitted;
+static int hf_iso14443_tb1_transmitted;
+static int hf_iso14443_ta1_transmitted;
+static int hf_iso14443_fsci;
+static int hf_iso14443_fsc;
+static int hf_iso14443_tc1;
+static int hf_iso14443_tb1;
+static int hf_iso14443_ta1;
+static int hf_iso14443_same_d;
+static int hf_iso14443_ds8;
+static int hf_iso14443_ds4;
+static int hf_iso14443_ds2;
+static int hf_iso14443_dr8;
+static int hf_iso14443_dr4;
+static int hf_iso14443_dr2;
+static int hf_iso14443_hist_bytes;
+static int hf_iso14443_attrib_start;
+static int hf_iso14443_pupi;
+static int hf_iso14443_param1;
+static int hf_iso14443_min_tr0;
+static int hf_iso14443_min_tr1;
+static int hf_iso14443_eof;
+static int hf_iso14443_sof;
+static int hf_iso14443_param2;
+static int hf_iso14443_bitrate_picc_pcd;
+static int hf_iso14443_bitrate_pcd_picc;
+static int hf_iso14443_param3;
+static int hf_iso14443_param4;
+static int hf_iso14443_mbli;
+static int hf_iso14443_pcb;
+static int hf_iso14443_block_type;
+static int hf_iso14443_i_blk_chaining;
+static int hf_iso14443_cid_following;
+static int hf_iso14443_nad_following;
+static int hf_iso14443_nak;
+static int hf_iso14443_blk_num;
+static int hf_iso14443_s_blk_cmd;
+static int hf_iso14443_pwr_lvl_ind;
+static int hf_iso14443_wtxm;
+static int hf_iso14443_inf;
+static int hf_iso14443_frags;
+static int hf_iso14443_frag;
+static int hf_iso14443_frag_overlap;
+static int hf_iso14443_frag_overlap_conflicts;
+static int hf_iso14443_frag_multiple_tails;
+static int hf_iso14443_frag_too_long_frag;
+static int hf_iso14443_frag_err;
+static int hf_iso14443_frag_cnt;
+static int hf_iso14443_reass_in;
+static int hf_iso14443_reass_len;
+static int hf_iso14443_crc;
+static int hf_iso14443_crc_status;
 
 static int * const bit_rate_fields[] = {
     &hf_iso14443_same_bit_rate,
@@ -324,9 +324,9 @@ static int * const ats_ta1_fields[] = {
     NULL
 };
 
-static expert_field ei_iso14443_unknown_cmd = EI_INIT;
-static expert_field ei_iso14443_wrong_crc = EI_INIT;
-static expert_field ei_iso14443_uid_inval_size = EI_INIT;
+static expert_field ei_iso14443_unknown_cmd;
+static expert_field ei_iso14443_wrong_crc;
+static expert_field ei_iso14443_uid_inval_size;
 
 static reassembly_table i_block_reassembly_table;
 
diff --git a/epan/dissectors/packet-iso15765.c b/epan/dissectors/packet-iso15765.c
index bd3ff6141c..62871b6372 100644
--- a/epan/dissectors/packet-iso15765.c
+++ b/epan/dissectors/packet-iso15765.c
@@ -146,26 +146,26 @@ static const enum_val_t enum_ipdum_addressing[] = {
         {NULL, NULL, 0}
 };
 
-static int hf_iso15765_address = -1;
-static int hf_iso15765_target_address = -1;
-static int hf_iso15765_source_address = -1;
-static int hf_iso15765_message_type = -1;
-static int hf_iso15765_data_length = -1;
-static int hf_iso15765_frame_length = -1;
-static int hf_iso15765_sequence_number = -1;
-static int hf_iso15765_flow_status = -1;
+static int hf_iso15765_address;
+static int hf_iso15765_target_address;
+static int hf_iso15765_source_address;
+static int hf_iso15765_message_type;
+static int hf_iso15765_data_length;
+static int hf_iso15765_frame_length;
+static int hf_iso15765_sequence_number;
+static int hf_iso15765_flow_status;
 
-static int hf_iso15765_fc_bs = -1;
-static int hf_iso15765_fc_stmin = -1;
-static int hf_iso15765_fc_stmin_in_us = -1;
+static int hf_iso15765_fc_bs;
+static int hf_iso15765_fc_stmin;
+static int hf_iso15765_fc_stmin_in_us;
 
-static int hf_iso15765_autosar_ack = -1;
+static int hf_iso15765_autosar_ack;
 
-static gint ett_iso15765 = -1;
+static gint ett_iso15765;
 
-static expert_field ei_iso15765_message_type_bad = EI_INIT;
+static expert_field ei_iso15765_message_type_bad;
 
-static int proto_iso15765 = -1;
+static int proto_iso15765;
 static dissector_handle_t iso15765_handle_can = NULL;
 static dissector_handle_t iso15765_handle_lin = NULL;
 static dissector_handle_t iso15765_handle_flexray = NULL;
@@ -177,19 +177,19 @@ static dissector_table_t subdissector_table;
 static reassembly_table iso15765_reassembly_table;
 static wmem_map_t *iso15765_frame_table = NULL;
 
-static int hf_iso15765_fragments = -1;
-static int hf_iso15765_fragment = -1;
-static int hf_iso15765_fragment_overlap = -1;
-static int hf_iso15765_fragment_overlap_conflicts = -1;
-static int hf_iso15765_fragment_multiple_tails = -1;
-static int hf_iso15765_fragment_too_long_fragment = -1;
-static int hf_iso15765_fragment_error = -1;
-static int hf_iso15765_fragment_count = -1;
-static int hf_iso15765_reassembled_in = -1;
-static int hf_iso15765_reassembled_length = -1;
-
-static gint ett_iso15765_fragment = -1;
-static gint ett_iso15765_fragments = -1;
+static int hf_iso15765_fragments;
+static int hf_iso15765_fragment;
+static int hf_iso15765_fragment_overlap;
+static int hf_iso15765_fragment_overlap_conflicts;
+static int hf_iso15765_fragment_multiple_tails;
+static int hf_iso15765_fragment_too_long_fragment;
+static int hf_iso15765_fragment_error;
+static int hf_iso15765_fragment_count;
+static int hf_iso15765_reassembled_in;
+static int hf_iso15765_reassembled_length;
+
+static gint ett_iso15765_fragment;
+static gint ett_iso15765_fragments;
 
 static const fragment_items iso15765_frag_items = {
         /* Fragment subtrees */
diff --git a/epan/dissectors/packet-iso7816.c b/epan/dissectors/packet-iso7816.c
index 26ab7489eb..f4cfc90dec 100644
--- a/epan/dissectors/packet-iso7816.c
+++ b/epan/dissectors/packet-iso7816.c
@@ -27,8 +27,8 @@
 void proto_register_iso7816(void);
 void proto_reg_handoff_iso7816(void);
 
-static int proto_iso7816 = -1;
-static int proto_iso7816_atr = -1;
+static int proto_iso7816;
+static int proto_iso7816_atr;
 
 static dissector_handle_t iso7816_handle;
 static dissector_handle_t iso7816_atr_handle;
@@ -37,58 +37,58 @@ static wmem_tree_t *transactions = NULL;
 
 static dissector_table_t iso7816_apdu_pld_table;
 
-static int ett_iso7816 = -1;
-static int ett_iso7816_class = -1;
-static int ett_iso7816_param = -1;
-static int ett_iso7816_p1 = -1;
-static int ett_iso7816_p2 = -1;
-static int ett_iso7816_atr = -1;
-static int ett_iso7816_atr_ta = -1;
-static int ett_iso7816_atr_td = -1;
-
-static int hf_iso7816_atr_init_char = -1;
-static int hf_iso7816_atr_t0 = -1;
-static int hf_iso7816_atr_ta = -1;
+static int ett_iso7816;
+static int ett_iso7816_class;
+static int ett_iso7816_param;
+static int ett_iso7816_p1;
+static int ett_iso7816_p2;
+static int ett_iso7816_atr;
+static int ett_iso7816_atr_ta;
+static int ett_iso7816_atr_td;
+
+static int hf_iso7816_atr_init_char;
+static int hf_iso7816_atr_t0;
+static int hf_iso7816_atr_ta;
 /* these two fields hold the converted values Fi and Di,
    not the binary representations FI and DI */
-static int hf_iso7816_atr_ta1_fi = -1;
-static int hf_iso7816_atr_ta1_di = -1;
-static int hf_iso7816_atr_tb = -1;
-static int hf_iso7816_atr_tc = -1;
-static int hf_iso7816_atr_td = -1;
-static int hf_iso7816_atr_next_ta_present = -1;
-static int hf_iso7816_atr_next_tb_present = -1;
-static int hf_iso7816_atr_next_tc_present = -1;
-static int hf_iso7816_atr_next_td_present = -1;
-static int hf_iso7816_atr_k = -1;
-static int hf_iso7816_atr_t = -1;
-static int hf_iso7816_atr_hist_bytes = -1;
-static int hf_iso7816_atr_tck = -1;
-
-static int hf_iso7816_resp_in = -1;
-static int hf_iso7816_resp_to = -1;
-static int hf_iso7816_cla = -1;
-static int hf_iso7816_cla_sm = -1;
-static int hf_iso7816_cla_channel = -1;
-static int hf_iso7816_ins = -1;
-static int hf_iso7816_p1 = -1;
-static int hf_iso7816_p2 = -1;
-static int hf_iso7816_lc = -1;
-static int hf_iso7816_le = -1;
-static int hf_iso7816_body = -1;
-static int hf_iso7816_sw1 = -1;
-static int hf_iso7816_sw2 = -1;
-static int hf_iso7816_sel_file_ctrl = -1;
-static int hf_iso7816_sel_file_fci_req = -1;
-static int hf_iso7816_sel_file_occ = -1;
-static int hf_iso7816_read_rec_ef = -1;
-static int hf_iso7816_read_rec_usage = -1;
-static int hf_iso7816_get_resp = -1;
-static int hf_iso7816_offset_first_byte = -1;
-static int hf_iso7816_rfu = -1;
-static int hf_iso7816_application_data = -1;
-
-static expert_field ei_iso7816_atr_tck_not1 = EI_INIT;
+static int hf_iso7816_atr_ta1_fi;
+static int hf_iso7816_atr_ta1_di;
+static int hf_iso7816_atr_tb;
+static int hf_iso7816_atr_tc;
+static int hf_iso7816_atr_td;
+static int hf_iso7816_atr_next_ta_present;
+static int hf_iso7816_atr_next_tb_present;
+static int hf_iso7816_atr_next_tc_present;
+static int hf_iso7816_atr_next_td_present;
+static int hf_iso7816_atr_k;
+static int hf_iso7816_atr_t;
+static int hf_iso7816_atr_hist_bytes;
+static int hf_iso7816_atr_tck;
+
+static int hf_iso7816_resp_in;
+static int hf_iso7816_resp_to;
+static int hf_iso7816_cla;
+static int hf_iso7816_cla_sm;
+static int hf_iso7816_cla_channel;
+static int hf_iso7816_ins;
+static int hf_iso7816_p1;
+static int hf_iso7816_p2;
+static int hf_iso7816_lc;
+static int hf_iso7816_le;
+static int hf_iso7816_body;
+static int hf_iso7816_sw1;
+static int hf_iso7816_sw2;
+static int hf_iso7816_sel_file_ctrl;
+static int hf_iso7816_sel_file_fci_req;
+static int hf_iso7816_sel_file_occ;
+static int hf_iso7816_read_rec_ef;
+static int hf_iso7816_read_rec_usage;
+static int hf_iso7816_get_resp;
+static int hf_iso7816_offset_first_byte;
+static int hf_iso7816_rfu;
+static int hf_iso7816_application_data;
+
+static expert_field ei_iso7816_atr_tck_not1;
 
 #define ADDR_INTF "Interface"
 #define ADDR_CARD "Card"
diff --git a/epan/dissectors/packet-iso8583.c b/epan/dissectors/packet-iso8583.c
index 7b9f58e42c..059c5f164b 100644
--- a/epan/dissectors/packet-iso8583.c
+++ b/epan/dissectors/packet-iso8583.c
@@ -334,19 +334,19 @@ void proto_register_iso8583(void);
 
 static dissector_handle_t iso8583_handle;
 
-static int proto_iso8583 = -1;
+static int proto_iso8583;
 
-static int hf_iso8583_len = -1;
-static int hf_iso8583_mti = -1;
-static int hf_iso8583_bitmap1 = -1;
-static int hf_iso8583_bitmap2 = -1;
+static int hf_iso8583_len;
+static int hf_iso8583_mti;
+static int hf_iso8583_bitmap1;
+static int hf_iso8583_bitmap2;
 
 /* TODO: This array should be renamed to hf_iso8583_data_bit[] when checkhf.pl allow. */
 static int iso8583_data_bit[128];
 
-static gint ett_iso8583 = -1;
+static gint ett_iso8583;
 
-static expert_field ei_iso8583_MALFORMED = EI_INIT;
+static expert_field ei_iso8583_MALFORMED;
 
 static struct iso_type *data_array = NULL;
 
diff --git a/epan/dissectors/packet-isobus-vt.c b/epan/dissectors/packet-isobus-vt.c
index 2c8073dd20..4a33cfecba 100644
--- a/epan/dissectors/packet-isobus-vt.c
+++ b/epan/dissectors/packet-isobus-vt.c
@@ -24,321 +24,321 @@ void proto_reg_handoff_isobus_vt(void);
 static guint8 current_vt_version = 0;
 
 /* Initialize the protocol and registered fields */
-static int proto_vt = -1;
-static int hf_isobus_vt = -1;
-static int hf_isobus_vt_command = -1;
-static int hf_isobus_vt_objectid = -1;
-static int hf_isobus_vt_softkey_keyactcode = -1;
-static int hf_isobus_vt_softkey_objectid = -1;
-static int hf_isobus_vt_softkey_parentobjectid = -1;
-static int hf_isobus_vt_softkey_keynumber = -1;
-static int hf_isobus_vt_button_keyactcode = -1;
-static int hf_isobus_vt_button_objectid = -1;
-static int hf_isobus_vt_button_parentobjectid = -1;
-static int hf_isobus_vt_button_keynumber = -1;
-static int hf_isobus_vt_pointing_xposition = -1;
-static int hf_isobus_vt_pointing_yposition = -1;
-static int hf_isobus_vt_pointing_touchstate = -1;
-static int hf_isobus_vt_vtselectinputobject_objectid = -1;
-static int hf_isobus_vt_vtselectinputobject_selection = -1;
-static int hf_isobus_vt_vtselectinputobject_openforinput = -1;
-static int hf_isobus_vt_vtescmessage_objectid = -1;
-static int hf_isobus_vt_vtescmessage_errorcodes = -1;
-static int hf_isobus_vt_vtchgnumval_objectid = -1;
-static int hf_isobus_vt_vtchgnumval_value = -1;
-static int hf_isobus_vt_vtchgactivemask_maskobjectid = -1;
-static int hf_isobus_vt_vtchgactivemask_errorcodes = -1;
-static int hf_isobus_vt_vtchgactivemask_errorobjectid = -1;
-static int hf_isobus_vt_vtchgactivemask_errorobjectidparent = -1;
-static int hf_isobus_vt_vtchgstrval_objectid = -1;
-static int hf_isobus_vt_vtchgstrval_length = -1;
-static int hf_isobus_vt_vtchgstrval_value = -1;
-static int hf_isobus_vt_vtonuserlayouthideshow_objectid_1 = -1;
-static int hf_isobus_vt_vtonuserlayouthideshow_status_1 = -1;
-static int hf_isobus_vt_vtonuserlayouthideshow_objectid_2 = -1;
-static int hf_isobus_vt_vtonuserlayouthideshow_status_2 = -1;
-static int hf_isobus_vt_vtcontrolaudiosignaltermination_terminationcause = -1;
-static int hf_isobus_vt_endofobjectpool_errorcodes = -1;
-static int hf_isobus_vt_endofobjectpool_faultyobjectid = -1;
-static int hf_isobus_vt_endofobjectpool_faultyparentobjectid = -1;
-static int hf_isobus_vt_endofobjectpool_objectpoolerrorcodes = -1;
-static int hf_isobus_vt_auxiliaryassignmenttype1_sourceaddressauxinputdevice = -1;
-static int hf_isobus_vt_auxiliaryassignmenttype1_auxinputnumber = -1;
-static int hf_isobus_vt_auxiliaryassignmenttype1_objectidauxinputdevice = -1;
-static int hf_isobus_vt_auxiliaryinputtype1status_inputnumber = -1;
-static int hf_isobus_vt_auxiliaryinputtype1status_analyzevalue = -1;
-static int hf_isobus_vt_auxiliaryinputtype1status_numberoftransitions = -1;
-static int hf_isobus_vt_auxiliaryinputtype1status_booleanvalue = -1;
-static int hf_isobus_vt_preferredassignment_numberofinputunits = -1;
-static int hf_isobus_vt_preferredassignment_auxinputunit_name = -1;
-static int hf_isobus_vt_preferredassignment_auxinputunit_modelidentificationcode = -1;
-static int hf_isobus_vt_preferredassignment_auxinputunit_numberofpreferredfunctions = -1;
-static int hf_isobus_vt_preferredassignment_auxinputunit_preferredfunctions_auxfunctionobjectid = -1;
-static int hf_isobus_vt_preferredassignment_auxinputunit_preferredfunctions_auxinputobjectid = -1;
-static int hf_isobus_vt_preferredassignment_errorcodes = -1;
-static int hf_isobus_vt_preferredassignment_faultyauxiliaryfunctionobjectid = -1;
-static int hf_isobus_vt_auxiliaryinputtype2maintenance_modelidentificationcode = -1;
-static int hf_isobus_vt_auxiliaryinputtype2maintenance_status = -1;
-static int hf_isobus_vt_auxiliaryassignmenttype2_name = -1;
-static int hf_isobus_vt_auxiliaryassignmenttype2_flags = -1;
-static int hf_isobus_vt_auxiliaryassignmenttype2_flags_preferredassignment = -1;
-static int hf_isobus_vt_auxiliaryassignmenttype2_flags_auxiliaryfunctiontype = -1;
-static int hf_isobus_vt_auxiliaryassignmenttype2_auxinputobjectid = -1;
-static int hf_isobus_vt_auxiliaryassignmenttype2_auxfunctionobjectid = -1;
-static int hf_isobus_vt_auxiliaryassignmenttype2_errorcodes = -1;
-static int hf_isobus_vt_auxiliaryinputstatustype2enable_auxiliaryinputobjectid = -1;
-static int hf_isobus_vt_auxiliaryinputstatustype2enable_enable = -1;
-static int hf_isobus_vt_auxiliaryinputstatustype2enable_status = -1;
-static int hf_isobus_vt_auxiliaryinputstatustype2enable_errorcodes = -1;
-static int hf_isobus_vt_auxiliaryinputtype2status_auxiliaryinputobjectid = -1;
-static int hf_isobus_vt_auxiliaryinputtype2status_value1 = -1;
-static int hf_isobus_vt_auxiliaryinputtype2status_value2 = -1;
-static int hf_isobus_vt_auxiliaryinputtype2status_operatingstate = -1;
-static int hf_isobus_vt_auxiliaryinputtype2status_operatingstate_learnmodeactive = -1;
-static int hf_isobus_vt_auxiliaryinputtype2status_operatingstate_inputactivatedinlearnmode = -1;
-static int hf_isobus_vt_auxiliarycapabilities_requesttype = -1;
-static int hf_isobus_vt_auxiliarycapabilities_numberofauxiliaryunits = -1;
-static int hf_isobus_vt_auxiliarycapabilities_auxiliaryunit_name = -1;
-static int hf_isobus_vt_auxiliarycapabilities_auxiliaryunit_numberofdifferentsets = -1;
-static int hf_isobus_vt_auxiliarycapabilities_auxiliaryunit_set_numberofinstances = -1;
-static int hf_isobus_vt_auxiliarycapabilities_auxiliaryunit_set_functionattribute = -1;
-static int hf_isobus_vt_auxiliarycapabilities_auxiliaryunit_set_assignedattribute = -1;
-static int hf_isobus_vt_esc_objectid = -1;
-static int hf_isobus_vt_esc_errorcodes = -1;
-static int hf_isobus_vt_hideshowobj_objectid = -1;
-static int hf_isobus_vt_hideshowobj_action = -1;
-static int hf_isobus_vt_hideshowobj_errorcodes = -1;
-static int hf_isobus_vt_enabledisableobj_objectid = -1;
-static int hf_isobus_vt_enabledisableobj_enabledisable = -1;
-static int hf_isobus_vt_enabledisableobj_errorcodes = -1;
-static int hf_isobus_vt_selectinputobject_objectid = -1;
-static int hf_isobus_vt_selectinputobject_option = -1;
-static int hf_isobus_vt_selectinputobject_response = -1;
-static int hf_isobus_vt_selectinputobject_errorcodes = -1;
-static int hf_isobus_vt_controlaudiosignal_activations = -1;
-static int hf_isobus_vt_controlaudiosignal_frequency = -1;
-static int hf_isobus_vt_controlaudiosignal_ontime = -1;
-static int hf_isobus_vt_controlaudiosignal_offtime = -1;
-static int hf_isobus_vt_controlaudiosignal_errorcodes = -1;
-static int hf_isobus_vt_setaudiovolume_volume = -1;
-static int hf_isobus_vt_setaudiovolume_errorcodes = -1;
-static int hf_isobus_vt_changechildlocation_parentobjectid = -1;
-static int hf_isobus_vt_changechildlocation_objectid = -1;
-static int hf_isobus_vt_changechildlocation_relativexpos = -1;
-static int hf_isobus_vt_changechildlocation_relativeypos = -1;
-static int hf_isobus_vt_changechildlocation_errorcodes = -1;
-static int hf_isobus_vt_changesize_objectid = -1;
-static int hf_isobus_vt_changesize_newwidth = -1;
-static int hf_isobus_vt_changesize_newheight = -1;
-static int hf_isobus_vt_changesize_errorcodes = -1;
-static int hf_isobus_vt_changebackgroundcolour_objectid = -1;
-static int hf_isobus_vt_changebackgroundcolour_colour = -1;
-static int hf_isobus_vt_changebackgroundcolour_errorcodes = -1;
-static int hf_isobus_vt_chgnumval_objectid = -1;
-static int hf_isobus_vt_chgnumval_errorcodes = -1;
-static int hf_isobus_vt_chgnumval_value = -1;
-static int hf_isobus_vt_changeendpoint_objectid = -1;
-static int hf_isobus_vt_changeendpoint_width = -1;
-static int hf_isobus_vt_changeendpoint_height = -1;
-static int hf_isobus_vt_changeendpoint_linedirection = -1;
-static int hf_isobus_vt_changefontattributes_objectid = -1;
-static int hf_isobus_vt_changefontattributes_fontcolour = -1;
-static int hf_isobus_vt_changefontattributes_fontsize = -1;
-static int hf_isobus_vt_changefontattributes_fonttype = -1;
-static int hf_isobus_vt_changefontattributes_fontstyle = -1;
-static int hf_isobus_vt_changefontattributes_errorcodes = -1;
-static int hf_isobus_vt_changelineattributes_objectid = -1;
-static int hf_isobus_vt_changelineattributes_linecolour = -1;
-static int hf_isobus_vt_changelineattributes_linewidth = -1;
-static int hf_isobus_vt_changelineattributes_lineart = -1;
-static int hf_isobus_vt_changelineattributes_errorcodes = -1;
-static int hf_isobus_vt_changefillattributes_objectid = -1;
-static int hf_isobus_vt_changefillattributes_filltype = -1;
-static int hf_isobus_vt_changefillattributes_fillcolour = -1;
-static int hf_isobus_vt_changefillattributes_fillpatternobjectid = -1;
-static int hf_isobus_vt_changefillattributes_errorcodes = -1;
-static int hf_isobus_vt_changeactivemask_workingset = -1;
-static int hf_isobus_vt_changeactivemask_newactivemask = -1;
-static int hf_isobus_vt_changeactivemask_errorcodes = -1;
-static int hf_isobus_vt_changesoftkeymask_masktype = -1;
-static int hf_isobus_vt_changesoftkeymask_datamaskobjectid = -1;
-static int hf_isobus_vt_changesoftkeymask_newsoftkeymaskobjectid = -1;
-static int hf_isobus_vt_changesoftkeymask_errorcodes = -1;
-static int hf_isobus_vt_changeattributes_objectid = -1;
-static int hf_isobus_vt_changeattributes_attributeid = -1;
-static int hf_isobus_vt_changeattributes_newvalue = -1;
-static int hf_isobus_vt_changeattributes_errorcodes = -1;
-static int hf_isobus_vt_changepriority_objectid = -1;
-static int hf_isobus_vt_changepriority_newpriority = -1;
-static int hf_isobus_vt_changepriority_errorcodes = -1;
-static int hf_isobus_vt_changelistitem_listobjectid = -1;
-static int hf_isobus_vt_changelistitem_listindex = -1;
-static int hf_isobus_vt_changelistitem_newobjectid = -1;
-static int hf_isobus_vt_changelistitem_errorcodes = -1;
-static int hf_isobus_vt_deleteobjectpool_errorcodes = -1;
-static int hf_isobus_vt_chgstrval_objectid = -1;
-static int hf_isobus_vt_chgstrval_length = -1;
-static int hf_isobus_vt_chgstrval_errorcodes = -1;
-static int hf_isobus_vt_chgstrval_value = -1;
-static int hf_isobus_vt_changechildposition_parentobjectid = -1;
-static int hf_isobus_vt_changechildposition_objectid = -1;
-static int hf_isobus_vt_changechildposition_xpos = -1;
-static int hf_isobus_vt_changechildposition_ypos = -1;
-static int hf_isobus_vt_changechildposition_errorcodes = -1;
-static int hf_isobus_vt_changeobjectlabel_objectid = -1;
-static int hf_isobus_vt_changeobjectlabel_stringobjectid = -1;
-static int hf_isobus_vt_changeobjectlabel_fonttype = -1;
-static int hf_isobus_vt_changeobjectlabel_graphicobjectid = -1;
-static int hf_isobus_vt_changeobjectlabel_errorcodes = -1;
-static int hf_isobus_vt_changepolygonpoint_objectid = -1;
-static int hf_isobus_vt_changepolygonpoint_pointindex = -1;
-static int hf_isobus_vt_changepolygonpoint_xvalue = -1;
-static int hf_isobus_vt_changepolygonpoint_yvalue = -1;
-static int hf_isobus_vt_changepolygonpoint_errorcodes = -1;
-static int hf_isobus_vt_changepolygonscale_objectid = -1;
-static int hf_isobus_vt_changepolygonscale_newwidth = -1;
-static int hf_isobus_vt_changepolygonscale_newheight = -1;
-static int hf_isobus_vt_changepolygonscale_errorcodes = -1;
-static int hf_isobus_vt_graphicscontext_objectid = -1;
-static int hf_isobus_vt_graphicscontext_subcommandid = -1;
-static int hf_isobus_vt_graphicscontext_setgraphicscursor_xposition = -1;
-static int hf_isobus_vt_graphicscontext_setgraphicscursor_yposition = -1;
-static int hf_isobus_vt_graphicscontext_movegraphicscursor_xoffset = -1;
-static int hf_isobus_vt_graphicscontext_movegraphicscursor_yoffset = -1;
-static int hf_isobus_vt_graphicscontext_setforegroundcolour_colour = -1;
-static int hf_isobus_vt_graphicscontext_setbackgroundcolour_colour = -1;
-static int hf_isobus_vt_graphicscontext_setlineattributesobjectid_objectid = -1;
-static int hf_isobus_vt_graphicscontext_setfillattributesobjectid_objectid = -1;
-static int hf_isobus_vt_graphicscontext_setfontattributesobjectid_objectid = -1;
-static int hf_isobus_vt_graphicscontext_eraserectangle_width = -1;
-static int hf_isobus_vt_graphicscontext_eraserectangle_height = -1;
-static int hf_isobus_vt_graphicscontext_drawpoint_xoffset = -1;
-static int hf_isobus_vt_graphicscontext_drawpoint_yoffset = -1;
-static int hf_isobus_vt_graphicscontext_drawline_xoffset = -1;
-static int hf_isobus_vt_graphicscontext_drawline_yoffset = -1;
-static int hf_isobus_vt_graphicscontext_drawrectangle_width = -1;
-static int hf_isobus_vt_graphicscontext_drawrectangle_height = -1;
-static int hf_isobus_vt_graphicscontext_drawclosedellipse_width = -1;
-static int hf_isobus_vt_graphicscontext_drawclosedellipse_height = -1;
-static int hf_isobus_vt_graphicscontext_drawpolygon_numberofpoints = -1;
-static int hf_isobus_vt_graphicscontext_drawpolygon_point_xoffset = -1;
-static int hf_isobus_vt_graphicscontext_drawpolygon_point_yoffset = -1;
-static int hf_isobus_vt_graphicscontext_drawtext_background = -1;
-static int hf_isobus_vt_graphicscontext_drawtext_numberofbytes = -1;
-static int hf_isobus_vt_graphicscontext_drawtext_textstring = -1;
-static int hf_isobus_vt_graphicscontext_panviewport_viewportx = -1;
-static int hf_isobus_vt_graphicscontext_panviewport_viewporty = -1;
-static int hf_isobus_vt_graphicscontext_zoomviewport_zoomvalue = -1;
-static int hf_isobus_vt_graphicscontext_panandzoomviewport_viewportx = -1;
-static int hf_isobus_vt_graphicscontext_panandzoomviewport_viewporty = -1;
-static int hf_isobus_vt_graphicscontext_panandzoomviewport_zoomvalue = -1;
-static int hf_isobus_vt_graphicscontext_changeviewportsize_newwidth = -1;
-static int hf_isobus_vt_graphicscontext_changeviewportsize_newheight = -1;
-static int hf_isobus_vt_graphicscontext_drawvtobject_objectid = -1;
-static int hf_isobus_vt_graphicscontext_copycanvastopicturegraphic_objectidpicturegraphic = -1;
-static int hf_isobus_vt_graphicscontext_copyviewporttopicturegraphic_objectidpicturegraphic = -1;
-static int hf_isobus_vt_getattributevalue_objectid = -1;
-static int hf_isobus_vt_getattributevalue_attributeid = -1;
-static int hf_isobus_vt_getattributevalue_value = -1;
-static int hf_isobus_vt_getattributevalue_errorcodes = -1;
-static int hf_isobus_vt_selectcolourmap_objectid = -1;
-static int hf_isobus_vt_selectcolourmap_errorcodes = -1;
-static int hf_isobus_vt_executeextendedmacro_objectid = -1;
-static int hf_isobus_vt_executeextendedmacro_errorcodes = -1;
-static int hf_isobus_vt_lockunlockmask_command = -1;
-static int hf_isobus_vt_lockunlockmask_objectid = -1;
-static int hf_isobus_vt_lockunlockmask_locktimeout = -1;
-static int hf_isobus_vt_lockunlockmask_errorcodes = -1;
-static int hf_isobus_vt_executemacro_objectid = -1;
-static int hf_isobus_vt_executemacro_errorcodes = -1;
-static int hf_isobus_vt_getmemory_memoryrequired = -1;
-static int hf_isobus_vt_getmemory_vtversion = -1;
-static int hf_isobus_vt_getmemory_status = -1;
-static int hf_isobus_vt_getsupportedwidechars_codeplane = -1;
-static int hf_isobus_vt_getsupportedwidechars_firstwidechar = -1;
-static int hf_isobus_vt_getsupportedwidechars_lastwidechar = -1;
-static int hf_isobus_vt_getsupportedwidechars_errorcodes = -1;
-static int hf_isobus_vt_getsupportedwidechars_numberofranges = -1;
-static int hf_isobus_vt_getsupportedwidechars_firstavailablewidechar = -1;
-static int hf_isobus_vt_getsupportedwidechars_lastavailablewidechar = -1;
-static int hf_isobus_vt_getnumberofsoftkeys_navigationsoftkeys = -1;
-static int hf_isobus_vt_getnumberofsoftkeys_xdots = -1;
-static int hf_isobus_vt_getnumberofsoftkeys_ydots = -1;
-static int hf_isobus_vt_getnumberofsoftkeys_virtualsoftkeys = -1;
-static int hf_isobus_vt_getnumberofsoftkeys_physicalsoftkeys = -1;
-static int hf_isobus_vt_gettextfontdata_smallfontsizes = -1;
-static int hf_isobus_vt_gettextfontdata_smallfontsizes_font8x8 = -1;
-static int hf_isobus_vt_gettextfontdata_smallfontsizes_font8x12 = -1;
-static int hf_isobus_vt_gettextfontdata_smallfontsizes_font12x16 = -1;
-static int hf_isobus_vt_gettextfontdata_smallfontsizes_font16x16 = -1;
-static int hf_isobus_vt_gettextfontdata_smallfontsizes_font16x24 = -1;
-static int hf_isobus_vt_gettextfontdata_smallfontsizes_font24x32 = -1;
-static int hf_isobus_vt_gettextfontdata_smallfontsizes_font32x32 = -1;
-static int hf_isobus_vt_gettextfontdata_largefontsizes = -1;
-static int hf_isobus_vt_gettextfontdata_largefontsizes_font32x48 = -1;
-static int hf_isobus_vt_gettextfontdata_largefontsizes_font48x64 = -1;
-static int hf_isobus_vt_gettextfontdata_largefontsizes_font64x64 = -1;
-static int hf_isobus_vt_gettextfontdata_largefontsizes_font64x96 = -1;
-static int hf_isobus_vt_gettextfontdata_largefontsizes_font96x128 = -1;
-static int hf_isobus_vt_gettextfontdata_largefontsizes_font128x128 = -1;
-static int hf_isobus_vt_gettextfontdata_largefontsizes_font128x192 = -1;
-static int hf_isobus_vt_gettextfontdata_typeattributes = -1;
-static int hf_isobus_vt_gettextfontdata_typeattributes_boldtext = -1;
-static int hf_isobus_vt_gettextfontdata_typeattributes_crossedouttext = -1;
-static int hf_isobus_vt_gettextfontdata_typeattributes_underlinedtext = -1;
-static int hf_isobus_vt_gettextfontdata_typeattributes_italicstext = -1;
-static int hf_isobus_vt_gettextfontdata_typeattributes_invertedtext = -1;
-static int hf_isobus_vt_gettextfontdata_typeattributes_flashinverted = -1;
-static int hf_isobus_vt_gettextfontdata_typeattributes_flashhidden = -1;
-static int hf_isobus_vt_gettextfontdata_typeattributes_proportionalfontrendering = -1;
-static int hf_isobus_vt_getwindowmaskdata_backgroundcolourdatamask = -1;
-static int hf_isobus_vt_getwindowmaskdata_backgroundcoloursoftkeymask = -1;
-static int hf_isobus_vt_getsupportedobjects_numberofbytes = -1;
-static int hf_isobus_vt_getsupportedobjects_objecttype = -1;
-static int hf_isobus_vt_gethardware_boottime = -1;
-static int hf_isobus_vt_gethardware_graphictype = -1;
-static int hf_isobus_vt_gethardware_hardware = -1;
-static int hf_isobus_vt_gethardware_hardware_touchscreen = -1;
-static int hf_isobus_vt_gethardware_hardware_pointingdevice = -1;
-static int hf_isobus_vt_gethardware_hardware_multifreqaudiooutput = -1;
-static int hf_isobus_vt_gethardware_hardware_adjustvolumeaudiooutput = -1;
-static int hf_isobus_vt_gethardware_hardware_simultaneousactivationphysicalsoftkeys = -1;
-static int hf_isobus_vt_gethardware_hardware_simultaneousactivationbuttons = -1;
-static int hf_isobus_vt_gethardware_hardware_dragoperation = -1;
-static int hf_isobus_vt_gethardware_hardware_intermediatecoordinatesdrag = -1;
-static int hf_isobus_vt_gethardware_xpixels = -1;
-static int hf_isobus_vt_gethardware_ypixels = -1;
-static int hf_isobus_vt_storeversion_versionlabel = -1;
-static int hf_isobus_vt_storeversion_errorcodes = -1;
-static int hf_isobus_vt_loadversion_versionlabel = -1;
-static int hf_isobus_vt_loadversion_errorcodes = -1;
-static int hf_isobus_vt_deleteversion_versionlabel = -1;
-static int hf_isobus_vt_deleteversion_errorcodes = -1;
-static int hf_isobus_vt_extendedgetversions_numberofversions = -1;
-static int hf_isobus_vt_extendedgetversions_versionlabel = -1;
-static int hf_isobus_vt_extendedstoreversion_versionlabel = -1;
-static int hf_isobus_vt_extendedstoreversion_errorcodes = -1;
-static int hf_isobus_vt_extendedloadversion_versionlabel = -1;
-static int hf_isobus_vt_extendedloadversion_errorcodes = -1;
-static int hf_isobus_vt_extendeddeleteversion_versionlabel = -1;
-static int hf_isobus_vt_extendeddeleteversion_errorcodes = -1;
-static int hf_isobus_vt_getversions_numberofversions = -1;
-static int hf_isobus_vt_getversions_versionlabel = -1;
-static int hf_isobus_vt_unsupportedvtfunction_unsupportedvtfunction = -1;
-static int hf_isobus_vt_vtstatus_workingsetmaster = -1;
-static int hf_isobus_vt_vtstatus_objectiddatamask = -1;
-static int hf_isobus_vt_vtstatus_objectidsoftkeymask = -1;
-static int hf_isobus_vt_vtstatus_vtbusycodes = -1;
-static int hf_isobus_vt_vtstatus_vtbusycodes_updatingvisiblemask = -1;
-static int hf_isobus_vt_vtstatus_vtbusycodes_savingdata = -1;
-static int hf_isobus_vt_vtstatus_vtbusycodes_executingcommand = -1;
-static int hf_isobus_vt_vtstatus_vtbusycodes_executingmacro = -1;
-static int hf_isobus_vt_vtstatus_vtbusycodes_parsingobjectpool = -1;
-static int hf_isobus_vt_vtstatus_vtbusycodes_auxcontrolsactive = -1;
-static int hf_isobus_vt_vtstatus_vtbusycodes_outofmemory = -1;
-static int hf_isobus_vt_vtstatus_vtfunctioncodes = -1;
-static int hf_isobus_vt_wrksetmain_bitmask = -1;
-static int hf_isobus_vt_wrksetmain_version = -1;
+static int proto_vt;
+static int hf_isobus_vt;
+static int hf_isobus_vt_command;
+static int hf_isobus_vt_objectid;
+static int hf_isobus_vt_softkey_keyactcode;
+static int hf_isobus_vt_softkey_objectid;
+static int hf_isobus_vt_softkey_parentobjectid;
+static int hf_isobus_vt_softkey_keynumber;
+static int hf_isobus_vt_button_keyactcode;
+static int hf_isobus_vt_button_objectid;
+static int hf_isobus_vt_button_parentobjectid;
+static int hf_isobus_vt_button_keynumber;
+static int hf_isobus_vt_pointing_xposition;
+static int hf_isobus_vt_pointing_yposition;
+static int hf_isobus_vt_pointing_touchstate;
+static int hf_isobus_vt_vtselectinputobject_objectid;
+static int hf_isobus_vt_vtselectinputobject_selection;
+static int hf_isobus_vt_vtselectinputobject_openforinput;
+static int hf_isobus_vt_vtescmessage_objectid;
+static int hf_isobus_vt_vtescmessage_errorcodes;
+static int hf_isobus_vt_vtchgnumval_objectid;
+static int hf_isobus_vt_vtchgnumval_value;
+static int hf_isobus_vt_vtchgactivemask_maskobjectid;
+static int hf_isobus_vt_vtchgactivemask_errorcodes;
+static int hf_isobus_vt_vtchgactivemask_errorobjectid;
+static int hf_isobus_vt_vtchgactivemask_errorobjectidparent;
+static int hf_isobus_vt_vtchgstrval_objectid;
+static int hf_isobus_vt_vtchgstrval_length;
+static int hf_isobus_vt_vtchgstrval_value;
+static int hf_isobus_vt_vtonuserlayouthideshow_objectid_1;
+static int hf_isobus_vt_vtonuserlayouthideshow_status_1;
+static int hf_isobus_vt_vtonuserlayouthideshow_objectid_2;
+static int hf_isobus_vt_vtonuserlayouthideshow_status_2;
+static int hf_isobus_vt_vtcontrolaudiosignaltermination_terminationcause;
+static int hf_isobus_vt_endofobjectpool_errorcodes;
+static int hf_isobus_vt_endofobjectpool_faultyobjectid;
+static int hf_isobus_vt_endofobjectpool_faultyparentobjectid;
+static int hf_isobus_vt_endofobjectpool_objectpoolerrorcodes;
+static int hf_isobus_vt_auxiliaryassignmenttype1_sourceaddressauxinputdevice;
+static int hf_isobus_vt_auxiliaryassignmenttype1_auxinputnumber;
+static int hf_isobus_vt_auxiliaryassignmenttype1_objectidauxinputdevice;
+static int hf_isobus_vt_auxiliaryinputtype1status_inputnumber;
+static int hf_isobus_vt_auxiliaryinputtype1status_analyzevalue;
+static int hf_isobus_vt_auxiliaryinputtype1status_numberoftransitions;
+static int hf_isobus_vt_auxiliaryinputtype1status_booleanvalue;
+static int hf_isobus_vt_preferredassignment_numberofinputunits;
+static int hf_isobus_vt_preferredassignment_auxinputunit_name;
+static int hf_isobus_vt_preferredassignment_auxinputunit_modelidentificationcode;
+static int hf_isobus_vt_preferredassignment_auxinputunit_numberofpreferredfunctions;
+static int hf_isobus_vt_preferredassignment_auxinputunit_preferredfunctions_auxfunctionobjectid;
+static int hf_isobus_vt_preferredassignment_auxinputunit_preferredfunctions_auxinputobjectid;
+static int hf_isobus_vt_preferredassignment_errorcodes;
+static int hf_isobus_vt_preferredassignment_faultyauxiliaryfunctionobjectid;
+static int hf_isobus_vt_auxiliaryinputtype2maintenance_modelidentificationcode;
+static int hf_isobus_vt_auxiliaryinputtype2maintenance_status;
+static int hf_isobus_vt_auxiliaryassignmenttype2_name;
+static int hf_isobus_vt_auxiliaryassignmenttype2_flags;
+static int hf_isobus_vt_auxiliaryassignmenttype2_flags_preferredassignment;
+static int hf_isobus_vt_auxiliaryassignmenttype2_flags_auxiliaryfunctiontype;
+static int hf_isobus_vt_auxiliaryassignmenttype2_auxinputobjectid;
+static int hf_isobus_vt_auxiliaryassignmenttype2_auxfunctionobjectid;
+static int hf_isobus_vt_auxiliaryassignmenttype2_errorcodes;
+static int hf_isobus_vt_auxiliaryinputstatustype2enable_auxiliaryinputobjectid;
+static int hf_isobus_vt_auxiliaryinputstatustype2enable_enable;
+static int hf_isobus_vt_auxiliaryinputstatustype2enable_status;
+static int hf_isobus_vt_auxiliaryinputstatustype2enable_errorcodes;
+static int hf_isobus_vt_auxiliaryinputtype2status_auxiliaryinputobjectid;
+static int hf_isobus_vt_auxiliaryinputtype2status_value1;
+static int hf_isobus_vt_auxiliaryinputtype2status_value2;
+static int hf_isobus_vt_auxiliaryinputtype2status_operatingstate;
+static int hf_isobus_vt_auxiliaryinputtype2status_operatingstate_learnmodeactive;
+static int hf_isobus_vt_auxiliaryinputtype2status_operatingstate_inputactivatedinlearnmode;
+static int hf_isobus_vt_auxiliarycapabilities_requesttype;
+static int hf_isobus_vt_auxiliarycapabilities_numberofauxiliaryunits;
+static int hf_isobus_vt_auxiliarycapabilities_auxiliaryunit_name;
+static int hf_isobus_vt_auxiliarycapabilities_auxiliaryunit_numberofdifferentsets;
+static int hf_isobus_vt_auxiliarycapabilities_auxiliaryunit_set_numberofinstances;
+static int hf_isobus_vt_auxiliarycapabilities_auxiliaryunit_set_functionattribute;
+static int hf_isobus_vt_auxiliarycapabilities_auxiliaryunit_set_assignedattribute;
+static int hf_isobus_vt_esc_objectid;
+static int hf_isobus_vt_esc_errorcodes;
+static int hf_isobus_vt_hideshowobj_objectid;
+static int hf_isobus_vt_hideshowobj_action;
+static int hf_isobus_vt_hideshowobj_errorcodes;
+static int hf_isobus_vt_enabledisableobj_objectid;
+static int hf_isobus_vt_enabledisableobj_enabledisable;
+static int hf_isobus_vt_enabledisableobj_errorcodes;
+static int hf_isobus_vt_selectinputobject_objectid;
+static int hf_isobus_vt_selectinputobject_option;
+static int hf_isobus_vt_selectinputobject_response;
+static int hf_isobus_vt_selectinputobject_errorcodes;
+static int hf_isobus_vt_controlaudiosignal_activations;
+static int hf_isobus_vt_controlaudiosignal_frequency;
+static int hf_isobus_vt_controlaudiosignal_ontime;
+static int hf_isobus_vt_controlaudiosignal_offtime;
+static int hf_isobus_vt_controlaudiosignal_errorcodes;
+static int hf_isobus_vt_setaudiovolume_volume;
+static int hf_isobus_vt_setaudiovolume_errorcodes;
+static int hf_isobus_vt_changechildlocation_parentobjectid;
+static int hf_isobus_vt_changechildlocation_objectid;
+static int hf_isobus_vt_changechildlocation_relativexpos;
+static int hf_isobus_vt_changechildlocation_relativeypos;
+static int hf_isobus_vt_changechildlocation_errorcodes;
+static int hf_isobus_vt_changesize_objectid;
+static int hf_isobus_vt_changesize_newwidth;
+static int hf_isobus_vt_changesize_newheight;
+static int hf_isobus_vt_changesize_errorcodes;
+static int hf_isobus_vt_changebackgroundcolour_objectid;
+static int hf_isobus_vt_changebackgroundcolour_colour;
+static int hf_isobus_vt_changebackgroundcolour_errorcodes;
+static int hf_isobus_vt_chgnumval_objectid;
+static int hf_isobus_vt_chgnumval_errorcodes;
+static int hf_isobus_vt_chgnumval_value;
+static int hf_isobus_vt_changeendpoint_objectid;
+static int hf_isobus_vt_changeendpoint_width;
+static int hf_isobus_vt_changeendpoint_height;
+static int hf_isobus_vt_changeendpoint_linedirection;
+static int hf_isobus_vt_changefontattributes_objectid;
+static int hf_isobus_vt_changefontattributes_fontcolour;
+static int hf_isobus_vt_changefontattributes_fontsize;
+static int hf_isobus_vt_changefontattributes_fonttype;
+static int hf_isobus_vt_changefontattributes_fontstyle;
+static int hf_isobus_vt_changefontattributes_errorcodes;
+static int hf_isobus_vt_changelineattributes_objectid;
+static int hf_isobus_vt_changelineattributes_linecolour;
+static int hf_isobus_vt_changelineattributes_linewidth;
+static int hf_isobus_vt_changelineattributes_lineart;
+static int hf_isobus_vt_changelineattributes_errorcodes;
+static int hf_isobus_vt_changefillattributes_objectid;
+static int hf_isobus_vt_changefillattributes_filltype;
+static int hf_isobus_vt_changefillattributes_fillcolour;
+static int hf_isobus_vt_changefillattributes_fillpatternobjectid;
+static int hf_isobus_vt_changefillattributes_errorcodes;
+static int hf_isobus_vt_changeactivemask_workingset;
+static int hf_isobus_vt_changeactivemask_newactivemask;
+static int hf_isobus_vt_changeactivemask_errorcodes;
+static int hf_isobus_vt_changesoftkeymask_masktype;
+static int hf_isobus_vt_changesoftkeymask_datamaskobjectid;
+static int hf_isobus_vt_changesoftkeymask_newsoftkeymaskobjectid;
+static int hf_isobus_vt_changesoftkeymask_errorcodes;
+static int hf_isobus_vt_changeattributes_objectid;
+static int hf_isobus_vt_changeattributes_attributeid;
+static int hf_isobus_vt_changeattributes_newvalue;
+static int hf_isobus_vt_changeattributes_errorcodes;
+static int hf_isobus_vt_changepriority_objectid;
+static int hf_isobus_vt_changepriority_newpriority;
+static int hf_isobus_vt_changepriority_errorcodes;
+static int hf_isobus_vt_changelistitem_listobjectid;
+static int hf_isobus_vt_changelistitem_listindex;
+static int hf_isobus_vt_changelistitem_newobjectid;
+static int hf_isobus_vt_changelistitem_errorcodes;
+static int hf_isobus_vt_deleteobjectpool_errorcodes;
+static int hf_isobus_vt_chgstrval_objectid;
+static int hf_isobus_vt_chgstrval_length;
+static int hf_isobus_vt_chgstrval_errorcodes;
+static int hf_isobus_vt_chgstrval_value;
+static int hf_isobus_vt_changechildposition_parentobjectid;
+static int hf_isobus_vt_changechildposition_objectid;
+static int hf_isobus_vt_changechildposition_xpos;
+static int hf_isobus_vt_changechildposition_ypos;
+static int hf_isobus_vt_changechildposition_errorcodes;
+static int hf_isobus_vt_changeobjectlabel_objectid;
+static int hf_isobus_vt_changeobjectlabel_stringobjectid;
+static int hf_isobus_vt_changeobjectlabel_fonttype;
+static int hf_isobus_vt_changeobjectlabel_graphicobjectid;
+static int hf_isobus_vt_changeobjectlabel_errorcodes;
+static int hf_isobus_vt_changepolygonpoint_objectid;
+static int hf_isobus_vt_changepolygonpoint_pointindex;
+static int hf_isobus_vt_changepolygonpoint_xvalue;
+static int hf_isobus_vt_changepolygonpoint_yvalue;
+static int hf_isobus_vt_changepolygonpoint_errorcodes;
+static int hf_isobus_vt_changepolygonscale_objectid;
+static int hf_isobus_vt_changepolygonscale_newwidth;
+static int hf_isobus_vt_changepolygonscale_newheight;
+static int hf_isobus_vt_changepolygonscale_errorcodes;
+static int hf_isobus_vt_graphicscontext_objectid;
+static int hf_isobus_vt_graphicscontext_subcommandid;
+static int hf_isobus_vt_graphicscontext_setgraphicscursor_xposition;
+static int hf_isobus_vt_graphicscontext_setgraphicscursor_yposition;
+static int hf_isobus_vt_graphicscontext_movegraphicscursor_xoffset;
+static int hf_isobus_vt_graphicscontext_movegraphicscursor_yoffset;
+static int hf_isobus_vt_graphicscontext_setforegroundcolour_colour;
+static int hf_isobus_vt_graphicscontext_setbackgroundcolour_colour;
+static int hf_isobus_vt_graphicscontext_setlineattributesobjectid_objectid;
+static int hf_isobus_vt_graphicscontext_setfillattributesobjectid_objectid;
+static int hf_isobus_vt_graphicscontext_setfontattributesobjectid_objectid;
+static int hf_isobus_vt_graphicscontext_eraserectangle_width;
+static int hf_isobus_vt_graphicscontext_eraserectangle_height;
+static int hf_isobus_vt_graphicscontext_drawpoint_xoffset;
+static int hf_isobus_vt_graphicscontext_drawpoint_yoffset;
+static int hf_isobus_vt_graphicscontext_drawline_xoffset;
+static int hf_isobus_vt_graphicscontext_drawline_yoffset;
+static int hf_isobus_vt_graphicscontext_drawrectangle_width;
+static int hf_isobus_vt_graphicscontext_drawrectangle_height;
+static int hf_isobus_vt_graphicscontext_drawclosedellipse_width;
+static int hf_isobus_vt_graphicscontext_drawclosedellipse_height;
+static int hf_isobus_vt_graphicscontext_drawpolygon_numberofpoints;
+static int hf_isobus_vt_graphicscontext_drawpolygon_point_xoffset;
+static int hf_isobus_vt_graphicscontext_drawpolygon_point_yoffset;
+static int hf_isobus_vt_graphicscontext_drawtext_background;
+static int hf_isobus_vt_graphicscontext_drawtext_numberofbytes;
+static int hf_isobus_vt_graphicscontext_drawtext_textstring;
+static int hf_isobus_vt_graphicscontext_panviewport_viewportx;
+static int hf_isobus_vt_graphicscontext_panviewport_viewporty;
+static int hf_isobus_vt_graphicscontext_zoomviewport_zoomvalue;
+static int hf_isobus_vt_graphicscontext_panandzoomviewport_viewportx;
+static int hf_isobus_vt_graphicscontext_panandzoomviewport_viewporty;
+static int hf_isobus_vt_graphicscontext_panandzoomviewport_zoomvalue;
+static int hf_isobus_vt_graphicscontext_changeviewportsize_newwidth;
+static int hf_isobus_vt_graphicscontext_changeviewportsize_newheight;
+static int hf_isobus_vt_graphicscontext_drawvtobject_objectid;
+static int hf_isobus_vt_graphicscontext_copycanvastopicturegraphic_objectidpicturegraphic;
+static int hf_isobus_vt_graphicscontext_copyviewporttopicturegraphic_objectidpicturegraphic;
+static int hf_isobus_vt_getattributevalue_objectid;
+static int hf_isobus_vt_getattributevalue_attributeid;
+static int hf_isobus_vt_getattributevalue_value;
+static int hf_isobus_vt_getattributevalue_errorcodes;
+static int hf_isobus_vt_selectcolourmap_objectid;
+static int hf_isobus_vt_selectcolourmap_errorcodes;
+static int hf_isobus_vt_executeextendedmacro_objectid;
+static int hf_isobus_vt_executeextendedmacro_errorcodes;
+static int hf_isobus_vt_lockunlockmask_command;
+static int hf_isobus_vt_lockunlockmask_objectid;
+static int hf_isobus_vt_lockunlockmask_locktimeout;
+static int hf_isobus_vt_lockunlockmask_errorcodes;
+static int hf_isobus_vt_executemacro_objectid;
+static int hf_isobus_vt_executemacro_errorcodes;
+static int hf_isobus_vt_getmemory_memoryrequired;
+static int hf_isobus_vt_getmemory_vtversion;
+static int hf_isobus_vt_getmemory_status;
+static int hf_isobus_vt_getsupportedwidechars_codeplane;
+static int hf_isobus_vt_getsupportedwidechars_firstwidechar;
+static int hf_isobus_vt_getsupportedwidechars_lastwidechar;
+static int hf_isobus_vt_getsupportedwidechars_errorcodes;
+static int hf_isobus_vt_getsupportedwidechars_numberofranges;
+static int hf_isobus_vt_getsupportedwidechars_firstavailablewidechar;
+static int hf_isobus_vt_getsupportedwidechars_lastavailablewidechar;
+static int hf_isobus_vt_getnumberofsoftkeys_navigationsoftkeys;
+static int hf_isobus_vt_getnumberofsoftkeys_xdots;
+static int hf_isobus_vt_getnumberofsoftkeys_ydots;
+static int hf_isobus_vt_getnumberofsoftkeys_virtualsoftkeys;
+static int hf_isobus_vt_getnumberofsoftkeys_physicalsoftkeys;
+static int hf_isobus_vt_gettextfontdata_smallfontsizes;
+static int hf_isobus_vt_gettextfontdata_smallfontsizes_font8x8;
+static int hf_isobus_vt_gettextfontdata_smallfontsizes_font8x12;
+static int hf_isobus_vt_gettextfontdata_smallfontsizes_font12x16;
+static int hf_isobus_vt_gettextfontdata_smallfontsizes_font16x16;
+static int hf_isobus_vt_gettextfontdata_smallfontsizes_font16x24;
+static int hf_isobus_vt_gettextfontdata_smallfontsizes_font24x32;
+static int hf_isobus_vt_gettextfontdata_smallfontsizes_font32x32;
+static int hf_isobus_vt_gettextfontdata_largefontsizes;
+static int hf_isobus_vt_gettextfontdata_largefontsizes_font32x48;
+static int hf_isobus_vt_gettextfontdata_largefontsizes_font48x64;
+static int hf_isobus_vt_gettextfontdata_largefontsizes_font64x64;
+static int hf_isobus_vt_gettextfontdata_largefontsizes_font64x96;
+static int hf_isobus_vt_gettextfontdata_largefontsizes_font96x128;
+static int hf_isobus_vt_gettextfontdata_largefontsizes_font128x128;
+static int hf_isobus_vt_gettextfontdata_largefontsizes_font128x192;
+static int hf_isobus_vt_gettextfontdata_typeattributes;
+static int hf_isobus_vt_gettextfontdata_typeattributes_boldtext;
+static int hf_isobus_vt_gettextfontdata_typeattributes_crossedouttext;
+static int hf_isobus_vt_gettextfontdata_typeattributes_underlinedtext;
+static int hf_isobus_vt_gettextfontdata_typeattributes_italicstext;
+static int hf_isobus_vt_gettextfontdata_typeattributes_invertedtext;
+static int hf_isobus_vt_gettextfontdata_typeattributes_flashinverted;
+static int hf_isobus_vt_gettextfontdata_typeattributes_flashhidden;
+static int hf_isobus_vt_gettextfontdata_typeattributes_proportionalfontrendering;
+static int hf_isobus_vt_getwindowmaskdata_backgroundcolourdatamask;
+static int hf_isobus_vt_getwindowmaskdata_backgroundcoloursoftkeymask;
+static int hf_isobus_vt_getsupportedobjects_numberofbytes;
+static int hf_isobus_vt_getsupportedobjects_objecttype;
+static int hf_isobus_vt_gethardware_boottime;
+static int hf_isobus_vt_gethardware_graphictype;
+static int hf_isobus_vt_gethardware_hardware;
+static int hf_isobus_vt_gethardware_hardware_touchscreen;
+static int hf_isobus_vt_gethardware_hardware_pointingdevice;
+static int hf_isobus_vt_gethardware_hardware_multifreqaudiooutput;
+static int hf_isobus_vt_gethardware_hardware_adjustvolumeaudiooutput;
+static int hf_isobus_vt_gethardware_hardware_simultaneousactivationphysicalsoftkeys;
+static int hf_isobus_vt_gethardware_hardware_simultaneousactivationbuttons;
+static int hf_isobus_vt_gethardware_hardware_dragoperation;
+static int hf_isobus_vt_gethardware_hardware_intermediatecoordinatesdrag;
+static int hf_isobus_vt_gethardware_xpixels;
+static int hf_isobus_vt_gethardware_ypixels;
+static int hf_isobus_vt_storeversion_versionlabel;
+static int hf_isobus_vt_storeversion_errorcodes;
+static int hf_isobus_vt_loadversion_versionlabel;
+static int hf_isobus_vt_loadversion_errorcodes;
+static int hf_isobus_vt_deleteversion_versionlabel;
+static int hf_isobus_vt_deleteversion_errorcodes;
+static int hf_isobus_vt_extendedgetversions_numberofversions;
+static int hf_isobus_vt_extendedgetversions_versionlabel;
+static int hf_isobus_vt_extendedstoreversion_versionlabel;
+static int hf_isobus_vt_extendedstoreversion_errorcodes;
+static int hf_isobus_vt_extendedloadversion_versionlabel;
+static int hf_isobus_vt_extendedloadversion_errorcodes;
+static int hf_isobus_vt_extendeddeleteversion_versionlabel;
+static int hf_isobus_vt_extendeddeleteversion_errorcodes;
+static int hf_isobus_vt_getversions_numberofversions;
+static int hf_isobus_vt_getversions_versionlabel;
+static int hf_isobus_vt_unsupportedvtfunction_unsupportedvtfunction;
+static int hf_isobus_vt_vtstatus_workingsetmaster;
+static int hf_isobus_vt_vtstatus_objectiddatamask;
+static int hf_isobus_vt_vtstatus_objectidsoftkeymask;
+static int hf_isobus_vt_vtstatus_vtbusycodes;
+static int hf_isobus_vt_vtstatus_vtbusycodes_updatingvisiblemask;
+static int hf_isobus_vt_vtstatus_vtbusycodes_savingdata;
+static int hf_isobus_vt_vtstatus_vtbusycodes_executingcommand;
+static int hf_isobus_vt_vtstatus_vtbusycodes_executingmacro;
+static int hf_isobus_vt_vtstatus_vtbusycodes_parsingobjectpool;
+static int hf_isobus_vt_vtstatus_vtbusycodes_auxcontrolsactive;
+static int hf_isobus_vt_vtstatus_vtbusycodes_outofmemory;
+static int hf_isobus_vt_vtstatus_vtfunctioncodes;
+static int hf_isobus_vt_wrksetmain_bitmask;
+static int hf_isobus_vt_wrksetmain_version;
 
 
 #define VT_SOFT_KEY_ACTIVATION                  0
@@ -803,19 +803,19 @@ static const value_string draw_text_background[] = {
 static value_string object_id_strings[MAX_OBJECT_ID_DB_SIZE];
 
 /* Initialize the subtree pointers */
-static gint ett_isobus_vt = -1;
-static gint ett_isobus_vt_vtstatus_busycodes_subtree = -1;
-static gint ett_isobus_vt_getsupportedwidechars_range = -1;
-static gint ett_isobus_vt_gettextfontdata_smallfontsizes = -1;
-static gint ett_isobus_vt_gettextfontdata_largefontsizes = -1;
-static gint ett_isobus_vt_gettextfontdata_typeattributes = -1;
-static gint ett_isobus_vt_gethardware_hardware = -1;
-static gint ett_isobus_vt_preferredassignment_inputunit = -1;
-static gint ett_isobus_vt_preferredassignment_inputunit_preferredfunction = -1;
-static gint ett_isobus_vt_auxiliarycapabilities_inputunit = -1;
-static gint ett_isobus_vt_auxiliarycapabilities_inputunit_set = -1;
-static gint ett_isobus_vt_auxiliaryassignmenttype2_flags = -1;
-static gint ett_isobus_vt_auxiliaryinputtype2status_operatingstate = -1;
+static gint ett_isobus_vt;
+static gint ett_isobus_vt_vtstatus_busycodes_subtree;
+static gint ett_isobus_vt_getsupportedwidechars_range;
+static gint ett_isobus_vt_gettextfontdata_smallfontsizes;
+static gint ett_isobus_vt_gettextfontdata_largefontsizes;
+static gint ett_isobus_vt_gettextfontdata_typeattributes;
+static gint ett_isobus_vt_gethardware_hardware;
+static gint ett_isobus_vt_preferredassignment_inputunit;
+static gint ett_isobus_vt_preferredassignment_inputunit_preferredfunction;
+static gint ett_isobus_vt_auxiliarycapabilities_inputunit;
+static gint ett_isobus_vt_auxiliarycapabilities_inputunit_set;
+static gint ett_isobus_vt_auxiliaryassignmenttype2_flags;
+static gint ett_isobus_vt_auxiliaryinputtype2status_operatingstate;
 
 static const char *object_id_translation = "";
 
diff --git a/epan/dissectors/packet-isobus.c b/epan/dissectors/packet-isobus.c
index 412fa762af..1e2433dffb 100644
--- a/epan/dissectors/packet-isobus.c
+++ b/epan/dissectors/packet-isobus.c
@@ -27,61 +27,61 @@ static dissector_table_t subdissector_table_pdu_format;
 static dissector_table_t subdissector_table_pgn;
 
 /* Initialize the protocol and registered fields */
-static int proto_isobus = -1;
-static int hf_isobus_can_id = -1;
-static int hf_isobus_priority = -1;
-static int hf_isobus_ext_data_page = -1;
-static int hf_isobus_data_page = -1;
-static int hf_isobus_pdu_format_dp0 = -1;
-static int hf_isobus_pdu_format_dp1 = -1;
-static int hf_isobus_group_extension = -1;
-static int hf_isobus_src_addr = -1;
-static int hf_isobus_dst_addr = -1;
-static int hf_isobus_pgn = -1;
-static int hf_isobus_payload = -1;
-
-static int hf_isobus_req_requested_pgn = -1;
-static int hf_isobus_ac_name = -1;
-static int hf_isobus_ac_name_id_number = -1;
-static int hf_isobus_ac_name_manufacturer = -1;
-static int hf_isobus_ac_name_ecu_instance = -1;
-static int hf_isobus_ac_name_function_instance = -1;
-static int hf_isobus_ac_name_function = -1;
-static int hf_isobus_ac_name_reserved = -1;
-static int hf_isobus_ac_name_vehicle_system = -1;
-static int hf_isobus_ac_name_vehicle_system_instance = -1;
-static int hf_isobus_ac_name_industry_group = -1;
-static int hf_isobus_ac_name_arbitrary_address_capable = -1;
-
-static int hf_isobus_transportprotocol_controlbyte = -1;
-static int hf_isobus_transportprotocol_requesttosend_totalsize = -1;
-static int hf_isobus_transportprotocol_requesttosend_numberofpackets = -1;
-static int hf_isobus_transportprotocol_requesttosend_maximumpackets = -1;
-static int hf_isobus_transportprotocol_requesttosend_pgn = -1;
-static int hf_isobus_transportprotocol_cleartosend_numberofpacketscanbesent = -1;
-static int hf_isobus_transportprotocol_cleartosend_nextpacketnumber = -1;
-static int hf_isobus_transportprotocol_cleartosend_pgn = -1;
-static int hf_isobus_transportprotocol_endofmsgack_totalsize = -1;
-static int hf_isobus_transportprotocol_endofmsgack_numberofpackets = -1;
-static int hf_isobus_transportprotocol_endofmsgack_pgn = -1;
-static int hf_isobus_transportprotocol_connabort_abortreason = -1;
-static int hf_isobus_transportprotocol_connabort_pgn = -1;
-static int hf_isobus_transportprotocol_broadcastannouncemessage_totalsize = -1;
-static int hf_isobus_transportprotocol_broadcastannouncemessage_numberofpackets = -1;
-static int hf_isobus_transportprotocol_broadcastannouncemessage_pgn = -1;
-static int hf_isobus_transportprotocol_reserved = -1;
-
-static int hf_msg_fragments = -1;
-static int hf_msg_fragment = -1;
-static int hf_msg_fragment_overlap = -1;
-static int hf_msg_fragment_overlap_conflicts = -1;
-static int hf_msg_fragment_multiple_tails = -1;
-static int hf_msg_fragment_too_long_fragment = -1;
-static int hf_msg_fragment_error = -1;
-static int hf_msg_fragment_count = -1;
-static int hf_msg_reassembled_in = -1;
-static int hf_msg_reassembled_length = -1;
-static int hf_msg_reassembled_data = -1;
+static int proto_isobus;
+static int hf_isobus_can_id;
+static int hf_isobus_priority;
+static int hf_isobus_ext_data_page;
+static int hf_isobus_data_page;
+static int hf_isobus_pdu_format_dp0;
+static int hf_isobus_pdu_format_dp1;
+static int hf_isobus_group_extension;
+static int hf_isobus_src_addr;
+static int hf_isobus_dst_addr;
+static int hf_isobus_pgn;
+static int hf_isobus_payload;
+
+static int hf_isobus_req_requested_pgn;
+static int hf_isobus_ac_name;
+static int hf_isobus_ac_name_id_number;
+static int hf_isobus_ac_name_manufacturer;
+static int hf_isobus_ac_name_ecu_instance;
+static int hf_isobus_ac_name_function_instance;
+static int hf_isobus_ac_name_function;
+static int hf_isobus_ac_name_reserved;
+static int hf_isobus_ac_name_vehicle_system;
+static int hf_isobus_ac_name_vehicle_system_instance;
+static int hf_isobus_ac_name_industry_group;
+static int hf_isobus_ac_name_arbitrary_address_capable;
+
+static int hf_isobus_transportprotocol_controlbyte;
+static int hf_isobus_transportprotocol_requesttosend_totalsize;
+static int hf_isobus_transportprotocol_requesttosend_numberofpackets;
+static int hf_isobus_transportprotocol_requesttosend_maximumpackets;
+static int hf_isobus_transportprotocol_requesttosend_pgn;
+static int hf_isobus_transportprotocol_cleartosend_numberofpacketscanbesent;
+static int hf_isobus_transportprotocol_cleartosend_nextpacketnumber;
+static int hf_isobus_transportprotocol_cleartosend_pgn;
+static int hf_isobus_transportprotocol_endofmsgack_totalsize;
+static int hf_isobus_transportprotocol_endofmsgack_numberofpackets;
+static int hf_isobus_transportprotocol_endofmsgack_pgn;
+static int hf_isobus_transportprotocol_connabort_abortreason;
+static int hf_isobus_transportprotocol_connabort_pgn;
+static int hf_isobus_transportprotocol_broadcastannouncemessage_totalsize;
+static int hf_isobus_transportprotocol_broadcastannouncemessage_numberofpackets;
+static int hf_isobus_transportprotocol_broadcastannouncemessage_pgn;
+static int hf_isobus_transportprotocol_reserved;
+
+static int hf_msg_fragments;
+static int hf_msg_fragment;
+static int hf_msg_fragment_overlap;
+static int hf_msg_fragment_overlap_conflicts;
+static int hf_msg_fragment_multiple_tails;
+static int hf_msg_fragment_too_long_fragment;
+static int hf_msg_fragment_error;
+static int hf_msg_fragment_count;
+static int hf_msg_reassembled_in;
+static int hf_msg_reassembled_length;
+static int hf_msg_reassembled_data;
 
 /* Desegmentation of isobus transport protocol streams */
 static reassembly_table isobus_reassembly_table;
@@ -196,11 +196,11 @@ static const value_string transport_protocol_control_byte[] = {
 };
 
 
-static gint ett_isobus = -1;
-static gint ett_isobus_can_id = -1;
-static gint ett_isobus_name = -1;
-static gint ett_isobus_fragment = -1;
-static gint ett_isobus_fragments = -1;
+static gint ett_isobus;
+static gint ett_isobus_can_id;
+static gint ett_isobus_name;
+static gint ett_isobus_fragment;
+static gint ett_isobus_fragments;
 
 static const fragment_items isobus_frag_items = {
     &ett_isobus_fragment,
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index d0a2484913..169f3e1188 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -2759,457 +2759,457 @@ static const true_false_string isup_Sequence_ind_value = {
 #define PONM_16BIT_MASK 0x00F0
 
 /* Initialize the protocol and registered fields */
-static int proto_isup = -1;
-static int proto_bicc = -1;
+static int proto_isup;
+static int proto_bicc;
 
 static gboolean isup_show_cic_in_info = TRUE;
 
-static int hf_isup_called = -1;
-static int hf_isup_calling = -1;
-static int hf_isup_redirecting = -1;
-static int hf_isup_redirection_number = -1;
-static int hf_isup_subsequent_number = -1;
-static int hf_isup_connected_number = -1;
-static int hf_isup_transit_network_selection = -1;
-static int hf_isup_original_called_number = -1;
-static int hf_isup_location_number = -1;
-static int hf_isup_call_transfer_number = -1;
-static int hf_isup_called_in_number = -1;
-static int hf_isup_generic_number = -1;
-static int hf_isup_jurisdiction = -1;
-static int hf_isup_charge_number = -1;
-
-static int hf_isup_cic = -1;
-static int hf_bicc_cic = -1;
+static int hf_isup_called;
+static int hf_isup_calling;
+static int hf_isup_redirecting;
+static int hf_isup_redirection_number;
+static int hf_isup_subsequent_number;
+static int hf_isup_connected_number;
+static int hf_isup_transit_network_selection;
+static int hf_isup_original_called_number;
+static int hf_isup_location_number;
+static int hf_isup_call_transfer_number;
+static int hf_isup_called_in_number;
+static int hf_isup_generic_number;
+static int hf_isup_jurisdiction;
+static int hf_isup_charge_number;
+
+static int hf_isup_cic;
+static int hf_bicc_cic;
 
 static int isup_tap = -1;
 
-static int hf_isup_message_type = -1;
-static int hf_isup_parameter_type = -1;
-static int hf_isup_parameter_value = -1;
-static int hf_isup_mand_parameter_type = -1;
-static int hf_isup_opt_parameter_type = -1;
-static int hf_isup_parameter_length = -1;
-static int hf_isup_mandatory_variable_parameter_pointer = -1;
-static int hf_isup_pointer_to_start_of_optional_part = -1;
-
-static int hf_isup_cvr_rsp_ind = -1;
-static int hf_isup_cvr_cg_car_ind = -1;
-static int hf_isup_cvr_cg_double_seize = -1;
-static int hf_isup_cvr_cg_alarm_car_ind = -1;
-static int hf_isup_cvr_cont_chk_ind = -1;
-
-static int hf_isup_satellite_indicator = -1;
-static int hf_isup_continuity_check_indicator = -1;
-static int hf_bicc_continuity_check_indicator = -1;
-static int hf_isup_echo_control_device_indicator = -1;
-
-static int hf_isup_forw_call_natnl_inatnl_call_indicator = -1;
-static int hf_isup_forw_call_end_to_end_method_indicator = -1;
-static int hf_bicc_forw_call_end_to_end_method_indicator = -1;
-static int hf_isup_forw_call_interworking_indicator = -1;
-static int hf_isup_forw_call_end_to_end_info_indicator = -1;
-static int hf_bicc_forw_call_end_to_end_info_indicator = -1;
-static int hf_isup_forw_call_isdn_user_part_indicator = -1;
-static int hf_bicc_forw_call_isdn_user_part_indicator = -1;
-static int hf_isup_forw_call_preferences_indicator = -1;
-static int hf_bicc_forw_call_preferences_indicator = -1;
-static int hf_isup_forw_call_isdn_access_indicator = -1;
-static int hf_isup_forw_call_ported_num_trans_indicator = -1;
-static int hf_isup_forw_call_qor_attempt_indicator = -1;
-static int hf_isup_forw_call_sccp_method_indicator = -1;
-static int hf_bicc_forw_call_sccp_method_indicator = -1;
-
-static int hf_isup_calling_partys_category = -1;
-static int hf_russian_isup_calling_partys_category = -1;
-
-static int hf_isup_transmission_medium_requirement = -1;
-
-static int hf_isup_odd_even_indicator = -1;
-static int hf_isup_called_party_nature_of_address_indicator = -1;
-static int hf_isup_calling_party_nature_of_address_indicator = -1;
-static int hf_isup_inn_indicator = -1;
-static int hf_isup_ni_indicator = -1;
-static int hf_isup_numbering_plan_indicator = -1;
-static int hf_isup_address_presentation_restricted_indicator = -1;
-static int hf_isup_screening_indicator = -1;
-static int hf_isup_screening_indicator_enhanced = -1;
-static int hf_isup_called_party_odd_address_signal_digit = -1;
-static int hf_isup_calling_party_odd_address_signal_digit = -1;
-static int hf_isup_called_party_even_address_signal_digit = -1;
-static int hf_isup_calling_party_even_address_signal_digit = -1;
-
-static int hf_isup_generic_name_presentation  = -1;
-static int hf_isup_generic_name_availability  = -1;
-static int hf_isup_generic_name_type          = -1;
-static int hf_isup_generic_name_ia5           = -1;
-
-static int hf_isup_OECD_inf_ind = -1;
-static int hf_isup_IECD_inf_ind = -1;
-static int hf_isup_OECD_req_ind = -1;
-static int hf_isup_IECD_req_ind = -1;
-
-static int hf_isup_calling_party_address_request_indicator = -1;
-static int hf_isup_info_req_holding_indicator = -1;
-static int hf_isup_calling_partys_category_request_indicator = -1;
-static int hf_isup_charge_information_request_indicator = -1;
-static int hf_isup_charge_number_nature_of_address_indicator = -1;
-static int hf_isup_malicious_call_identification_request_indicator = -1;
-
-static int hf_isup_calling_party_address_response_indicator = -1;
-static int hf_isup_hold_provided_indicator = -1;
-static int hf_isup_calling_partys_category_response_indicator = -1;
-static int hf_isup_charge_information_response_indicator = -1;
-static int hf_isup_solicited_indicator = -1;
-
-static int hf_isup_continuity_indicator = -1;
-
-static int hf_isup_backw_call_charge_ind = -1 ;
-static int hf_isup_backw_call_called_partys_status_ind = -1;
-static int hf_isup_backw_call_called_partys_category_ind = -1;
-static int hf_isup_backw_call_end_to_end_method_ind = -1;
-static int hf_bicc_backw_call_end_to_end_method_ind = -1;
-static int hf_isup_backw_call_interworking_ind = -1;
-static int hf_isup_backw_call_end_to_end_info_ind = -1;
-static int hf_bicc_backw_call_end_to_end_info_ind = -1;
-static int hf_isup_backw_call_iam_seg_ind = -1;
-static int hf_isup_backw_call_isdn_user_part_ind = -1;
-static int hf_bicc_backw_call_isdn_user_part_ind = -1;
-static int hf_isup_backw_call_holding_ind = -1;
-static int hf_isup_backw_call_isdn_access_ind = -1;
-static int hf_isup_backw_call_echo_control_device_ind = -1;
-static int hf_isup_backw_call_sccp_method_ind = -1;
-static int hf_bicc_backw_call_sccp_method_ind = -1;
-
-static int hf_isup_cause_indicator = -1;
-static int hf_ansi_isup_cause_indicator = -1;
-
-static int hf_isup_suspend_resume_indicator = -1;
-
-static int hf_isup_range_indicator = -1;
-static int hf_isup_bitbucket = -1;
-static int hf_isup_cgs_message_type = -1;
-
-static int hf_isup_mtc_blocking_state1 = -1;
-static int hf_isup_mtc_blocking_state2 = -1;
-static int hf_isup_call_proc_state = -1;
-static int hf_isup_hw_blocking_state = -1;
-
-static int hf_isup_event_ind = -1;
-static int hf_isup_event_presentation_restricted_ind = -1;
-
-static int hf_isup_cug_call_ind = -1;
-static int hf_isup_simple_segmentation_ind = -1;
-static int hf_isup_connected_line_identity_request_ind = -1;
-
-static int hf_isup_redirecting_ind = -1;
-static int hf_isup_original_redirection_reason = -1;
-static int hf_isup_redirection_counter = -1;
-static int hf_isup_redirection_reason = -1;
-
-static int hf_isup_type_of_network_identification = -1;
-static int hf_isup_network_identification_plan = -1;
-
-static int hf_isup_map_type = -1;
-
-static int hf_isup_automatic_congestion_level               = -1;
-
-static int hf_isup_inband_information_ind                   = -1;
-static int hf_isup_call_diversion_may_occur_ind             = -1;
-static int hf_isup_mlpp_user_ind                            = -1;
-
-static int hf_isup_UUI_type                                 = -1;
-static int hf_isup_UUI_req_service1                         = -1;
-static int hf_isup_UUI_req_service2                         = -1;
-static int hf_isup_UUI_req_service3                         = -1;
-static int hf_isup_UUI_res_service1                         = -1;
-static int hf_isup_UUI_res_service2                         = -1;
-static int hf_isup_UUI_res_service3                         = -1;
-static int hf_isup_notification_indicator                   = -1;
-static int hf_isup_UUI_network_discard_ind                  = -1;
-static int hf_isup_access_delivery_ind                      = -1;
-
-static int hf_isup_transmission_medium_requirement_prime    = -1;
-
-static int hf_isup_loop_prevention_response_ind             = -1;
-
-static int hf_isup_temporary_alternative_routing_ind        = -1;
-static int hf_isup_extension_ind                            = -1;
-
-static int hf_isup_call_to_be_diverted_ind                  = -1;
-
-static int hf_isup_call_to_be_offered_ind                   = -1;
-
-static int hf_isup_conference_acceptance_ind                = -1;
-
-static int hf_isup_transit_at_intermediate_exchange_ind     = -1;
-static int hf_isup_Release_call_ind                         = -1;
-static int hf_isup_Send_notification_ind                    = -1;
-static int hf_isup_Discard_message_ind_value                = -1;
-static int hf_isup_Discard_parameter_ind                    = -1;
-static int hf_isup_Pass_on_not_possible_indicator           = -1;
-static int hf_isup_pass_on_not_possible_indicator2          = -1;
-static int hf_isup_Broadband_narrowband_interworking_ind    = -1;
-static int hf_isup_Broadband_narrowband_interworking_ind2   = -1;
-
-static int hf_isup_app_cont_ident                   = -1;
-static int hf_isup_app_Send_notification_ind        = -1;
-static int hf_isup_apm_segmentation_ind             = -1;
-static int hf_isup_apm_si_ind                       = -1;
-static int hf_isup_apm_slr                          = -1;
-static int hf_isup_orig_addr_len                    = -1;
-static int hf_isup_dest_addr_len                    = -1;
-static int hf_isup_app_Release_call_ind             = -1;
-static int hf_isup_cause_location                   = -1;
-
-static int hf_ansi_isup_coding_standard             = -1;
-static int hf_ansi_isup_spare_b7 = -1;
-static int hf_ansi_isup_type_of_nw_id = -1;
-static int hf_ansi_isup_nw_id_plan = -1;
-static int hf_ansi_isup_tns_nw_id_plan = -1;
-static int hf_ansi_isup_nw_id = -1;
-static int hf_ansi_isup_circuit_code = -1;
-
-static int hf_length_indicator                      = -1;
-static int hf_afi                                   = -1;
-static int hf_bicc_nsap_dsp                         = -1;
-static int hf_bicc_nsap_dsp_length                  = -1;
-static int hf_bat_ase_identifier                    = -1;
-
-static int hf_Action_Indicator                      = -1;
-
-static int hf_Instruction_ind_for_general_action       = -1;
-
-static int hf_Send_notification_ind_for_general_action = -1;
-
-static int hf_Instruction_ind_for_pass_on_not_possible = -1;
-
-static int hf_Send_notification_ind_for_pass_on_not_possible = -1;
-static int hf_BCTP_Version_Indicator        = -1;
-static int hf_Tunnelled_Protocol_Indicator  = -1;
-static int hf_TPEI                          = -1;
-static int hf_BVEI                          = -1;
-static int hf_bncid                         = -1;
-static int hf_bat_ase_biwfa                 = -1;
-static int hf_characteristics               = -1;
-
-static int hf_Organization_Identifier       = -1;
-static int hf_codec_type                    = -1;
-static int hf_etsi_codec_type               = -1;
-static int hf_active_code_set  = -1;
-static int hf_active_code_set_12_2  = -1;
-static int hf_active_code_set_10_2  = -1;
-static int hf_active_code_set_7_95  = -1;
-static int hf_active_code_set_7_40  = -1;
-static int hf_active_code_set_6_70  = -1;
-static int hf_active_code_set_5_90  = -1;
-static int hf_active_code_set_5_15  = -1;
-static int hf_active_code_set_4_75  = -1;
-static int hf_supported_code_set  = -1;
-static int hf_supported_code_set_12_2  = -1;
-static int hf_supported_code_set_10_2  = -1;
-static int hf_supported_code_set_7_95  = -1;
-static int hf_supported_code_set_7_40  = -1;
-static int hf_supported_code_set_6_70  = -1;
-static int hf_supported_code_set_5_90  = -1;
-static int hf_supported_code_set_5_15  = -1;
-static int hf_supported_code_set_4_75  = -1;
-static int hf_optimisation_mode  = -1;
-static int hf_max_codec_modes  = -1;
-static int hf_bearer_control_tunneling          = -1;
-static int hf_Local_BCU_ID                      = -1;
-static int hf_late_cut_through_cap_ind           = -1;
-static int hf_bat_ase_signal                    = -1;
-static int hf_bat_ase_duration                  = -1;
-static int hf_bat_ase_bearer_redir_ind          = -1;
-static int hf_bat_ase_default                   = -1;
-static int hf_BAT_ASE_Comp_Report_Reason        = -1;
-static int hf_BAT_ASE_Comp_Report_ident         = -1;
-static int hf_BAT_ASE_Comp_Report_diagnostic    = -1;
-static int hf_nsap_ipv4_addr                    = -1;
-static int hf_nsap_ipv6_addr                    = -1;
-static int hf_iana_icp                          = -1;
-
-static int hf_isup_geo_loc_presentation_restricted_ind  = -1;
-static int hf_isup_geo_loc_screening_ind        = -1;
-
-static int hf_isup_apm_msg_fragments = -1;
-static int hf_isup_apm_msg_fragment = -1;
-static int hf_isup_apm_msg_fragment_overlap = -1;
-static int hf_isup_apm_msg_fragment_overlap_conflicts = -1;
-static int hf_isup_apm_msg_fragment_multiple_tails = -1;
-static int hf_isup_apm_msg_fragment_too_long_fragment = -1;
-static int hf_isup_apm_msg_fragment_error = -1;
-static int hf_isup_apm_msg_fragment_count = -1;
-static int hf_isup_apm_msg_reassembled_in = -1;
-static int hf_isup_apm_msg_reassembled_length = -1;
+static int hf_isup_message_type;
+static int hf_isup_parameter_type;
+static int hf_isup_parameter_value;
+static int hf_isup_mand_parameter_type;
+static int hf_isup_opt_parameter_type;
+static int hf_isup_parameter_length;
+static int hf_isup_mandatory_variable_parameter_pointer;
+static int hf_isup_pointer_to_start_of_optional_part;
+
+static int hf_isup_cvr_rsp_ind;
+static int hf_isup_cvr_cg_car_ind;
+static int hf_isup_cvr_cg_double_seize;
+static int hf_isup_cvr_cg_alarm_car_ind;
+static int hf_isup_cvr_cont_chk_ind;
+
+static int hf_isup_satellite_indicator;
+static int hf_isup_continuity_check_indicator;
+static int hf_bicc_continuity_check_indicator;
+static int hf_isup_echo_control_device_indicator;
+
+static int hf_isup_forw_call_natnl_inatnl_call_indicator;
+static int hf_isup_forw_call_end_to_end_method_indicator;
+static int hf_bicc_forw_call_end_to_end_method_indicator;
+static int hf_isup_forw_call_interworking_indicator;
+static int hf_isup_forw_call_end_to_end_info_indicator;
+static int hf_bicc_forw_call_end_to_end_info_indicator;
+static int hf_isup_forw_call_isdn_user_part_indicator;
+static int hf_bicc_forw_call_isdn_user_part_indicator;
+static int hf_isup_forw_call_preferences_indicator;
+static int hf_bicc_forw_call_preferences_indicator;
+static int hf_isup_forw_call_isdn_access_indicator;
+static int hf_isup_forw_call_ported_num_trans_indicator;
+static int hf_isup_forw_call_qor_attempt_indicator;
+static int hf_isup_forw_call_sccp_method_indicator;
+static int hf_bicc_forw_call_sccp_method_indicator;
+
+static int hf_isup_calling_partys_category;
+static int hf_russian_isup_calling_partys_category;
+
+static int hf_isup_transmission_medium_requirement;
+
+static int hf_isup_odd_even_indicator;
+static int hf_isup_called_party_nature_of_address_indicator;
+static int hf_isup_calling_party_nature_of_address_indicator;
+static int hf_isup_inn_indicator;
+static int hf_isup_ni_indicator;
+static int hf_isup_numbering_plan_indicator;
+static int hf_isup_address_presentation_restricted_indicator;
+static int hf_isup_screening_indicator;
+static int hf_isup_screening_indicator_enhanced;
+static int hf_isup_called_party_odd_address_signal_digit;
+static int hf_isup_calling_party_odd_address_signal_digit;
+static int hf_isup_called_party_even_address_signal_digit;
+static int hf_isup_calling_party_even_address_signal_digit;
+
+static int hf_isup_generic_name_presentation;
+static int hf_isup_generic_name_availability;
+static int hf_isup_generic_name_type;
+static int hf_isup_generic_name_ia5;
+
+static int hf_isup_OECD_inf_ind;
+static int hf_isup_IECD_inf_ind;
+static int hf_isup_OECD_req_ind;
+static int hf_isup_IECD_req_ind;
+
+static int hf_isup_calling_party_address_request_indicator;
+static int hf_isup_info_req_holding_indicator;
+static int hf_isup_calling_partys_category_request_indicator;
+static int hf_isup_charge_information_request_indicator;
+static int hf_isup_charge_number_nature_of_address_indicator;
+static int hf_isup_malicious_call_identification_request_indicator;
+
+static int hf_isup_calling_party_address_response_indicator;
+static int hf_isup_hold_provided_indicator;
+static int hf_isup_calling_partys_category_response_indicator;
+static int hf_isup_charge_information_response_indicator;
+static int hf_isup_solicited_indicator;
+
+static int hf_isup_continuity_indicator;
+
+static int hf_isup_backw_call_charge_ind;
+static int hf_isup_backw_call_called_partys_status_ind;
+static int hf_isup_backw_call_called_partys_category_ind;
+static int hf_isup_backw_call_end_to_end_method_ind;
+static int hf_bicc_backw_call_end_to_end_method_ind;
+static int hf_isup_backw_call_interworking_ind;
+static int hf_isup_backw_call_end_to_end_info_ind;
+static int hf_bicc_backw_call_end_to_end_info_ind;
+static int hf_isup_backw_call_iam_seg_ind;
+static int hf_isup_backw_call_isdn_user_part_ind;
+static int hf_bicc_backw_call_isdn_user_part_ind;
+static int hf_isup_backw_call_holding_ind;
+static int hf_isup_backw_call_isdn_access_ind;
+static int hf_isup_backw_call_echo_control_device_ind;
+static int hf_isup_backw_call_sccp_method_ind;
+static int hf_bicc_backw_call_sccp_method_ind;
+
+static int hf_isup_cause_indicator;
+static int hf_ansi_isup_cause_indicator;
+
+static int hf_isup_suspend_resume_indicator;
+
+static int hf_isup_range_indicator;
+static int hf_isup_bitbucket;
+static int hf_isup_cgs_message_type;
+
+static int hf_isup_mtc_blocking_state1;
+static int hf_isup_mtc_blocking_state2;
+static int hf_isup_call_proc_state;
+static int hf_isup_hw_blocking_state;
+
+static int hf_isup_event_ind;
+static int hf_isup_event_presentation_restricted_ind;
+
+static int hf_isup_cug_call_ind;
+static int hf_isup_simple_segmentation_ind;
+static int hf_isup_connected_line_identity_request_ind;
+
+static int hf_isup_redirecting_ind;
+static int hf_isup_original_redirection_reason;
+static int hf_isup_redirection_counter;
+static int hf_isup_redirection_reason;
+
+static int hf_isup_type_of_network_identification;
+static int hf_isup_network_identification_plan;
+
+static int hf_isup_map_type;
+
+static int hf_isup_automatic_congestion_level;
+
+static int hf_isup_inband_information_ind;
+static int hf_isup_call_diversion_may_occur_ind;
+static int hf_isup_mlpp_user_ind;
+
+static int hf_isup_UUI_type;
+static int hf_isup_UUI_req_service1;
+static int hf_isup_UUI_req_service2;
+static int hf_isup_UUI_req_service3;
+static int hf_isup_UUI_res_service1;
+static int hf_isup_UUI_res_service2;
+static int hf_isup_UUI_res_service3;
+static int hf_isup_notification_indicator;
+static int hf_isup_UUI_network_discard_ind;
+static int hf_isup_access_delivery_ind;
+
+static int hf_isup_transmission_medium_requirement_prime;
+
+static int hf_isup_loop_prevention_response_ind;
+
+static int hf_isup_temporary_alternative_routing_ind;
+static int hf_isup_extension_ind;
+
+static int hf_isup_call_to_be_diverted_ind;
+
+static int hf_isup_call_to_be_offered_ind;
+
+static int hf_isup_conference_acceptance_ind;
+
+static int hf_isup_transit_at_intermediate_exchange_ind;
+static int hf_isup_Release_call_ind;
+static int hf_isup_Send_notification_ind;
+static int hf_isup_Discard_message_ind_value;
+static int hf_isup_Discard_parameter_ind;
+static int hf_isup_Pass_on_not_possible_indicator;
+static int hf_isup_pass_on_not_possible_indicator2;
+static int hf_isup_Broadband_narrowband_interworking_ind;
+static int hf_isup_Broadband_narrowband_interworking_ind2;
+
+static int hf_isup_app_cont_ident;
+static int hf_isup_app_Send_notification_ind;
+static int hf_isup_apm_segmentation_ind;
+static int hf_isup_apm_si_ind;
+static int hf_isup_apm_slr;
+static int hf_isup_orig_addr_len;
+static int hf_isup_dest_addr_len;
+static int hf_isup_app_Release_call_ind;
+static int hf_isup_cause_location;
+
+static int hf_ansi_isup_coding_standard;
+static int hf_ansi_isup_spare_b7;
+static int hf_ansi_isup_type_of_nw_id;
+static int hf_ansi_isup_nw_id_plan;
+static int hf_ansi_isup_tns_nw_id_plan;
+static int hf_ansi_isup_nw_id;
+static int hf_ansi_isup_circuit_code;
+
+static int hf_length_indicator;
+static int hf_afi;
+static int hf_bicc_nsap_dsp;
+static int hf_bicc_nsap_dsp_length;
+static int hf_bat_ase_identifier;
+
+static int hf_Action_Indicator;
+
+static int hf_Instruction_ind_for_general_action;
+
+static int hf_Send_notification_ind_for_general_action;
+
+static int hf_Instruction_ind_for_pass_on_not_possible;
+
+static int hf_Send_notification_ind_for_pass_on_not_possible;
+static int hf_BCTP_Version_Indicator;
+static int hf_Tunnelled_Protocol_Indicator;
+static int hf_TPEI;
+static int hf_BVEI;
+static int hf_bncid;
+static int hf_bat_ase_biwfa;
+static int hf_characteristics;
+
+static int hf_Organization_Identifier;
+static int hf_codec_type;
+static int hf_etsi_codec_type;
+static int hf_active_code_set;
+static int hf_active_code_set_12_2;
+static int hf_active_code_set_10_2;
+static int hf_active_code_set_7_95;
+static int hf_active_code_set_7_40;
+static int hf_active_code_set_6_70;
+static int hf_active_code_set_5_90;
+static int hf_active_code_set_5_15;
+static int hf_active_code_set_4_75;
+static int hf_supported_code_set;
+static int hf_supported_code_set_12_2;
+static int hf_supported_code_set_10_2;
+static int hf_supported_code_set_7_95;
+static int hf_supported_code_set_7_40;
+static int hf_supported_code_set_6_70;
+static int hf_supported_code_set_5_90;
+static int hf_supported_code_set_5_15;
+static int hf_supported_code_set_4_75;
+static int hf_optimisation_mode;
+static int hf_max_codec_modes;
+static int hf_bearer_control_tunneling;
+static int hf_Local_BCU_ID;
+static int hf_late_cut_through_cap_ind;
+static int hf_bat_ase_signal;
+static int hf_bat_ase_duration;
+static int hf_bat_ase_bearer_redir_ind;
+static int hf_bat_ase_default;
+static int hf_BAT_ASE_Comp_Report_Reason;
+static int hf_BAT_ASE_Comp_Report_ident;
+static int hf_BAT_ASE_Comp_Report_diagnostic;
+static int hf_nsap_ipv4_addr;
+static int hf_nsap_ipv6_addr;
+static int hf_iana_icp;
+
+static int hf_isup_geo_loc_presentation_restricted_ind;
+static int hf_isup_geo_loc_screening_ind;
+
+static int hf_isup_apm_msg_fragments;
+static int hf_isup_apm_msg_fragment;
+static int hf_isup_apm_msg_fragment_overlap;
+static int hf_isup_apm_msg_fragment_overlap_conflicts;
+static int hf_isup_apm_msg_fragment_multiple_tails;
+static int hf_isup_apm_msg_fragment_too_long_fragment;
+static int hf_isup_apm_msg_fragment_error;
+static int hf_isup_apm_msg_fragment_count;
+static int hf_isup_apm_msg_reassembled_in;
+static int hf_isup_apm_msg_reassembled_length;
 
 /* national parameters */
-static int hf_isup_french_coll_field = -1;
-static int hf_isup_french_msg_num = -1;
-
-static int hf_isup_israeli_charging_message_indicators_current = -1;
-static int hf_isup_israeli_charging_message_indicators_next = -1;
-static int hf_isup_israeli_current_rate = -1;
-static int hf_isup_israeli_time_indicator = -1;
-static int hf_isup_israeli_next_rate = -1;
-
-static int hf_japan_isup_redirect_capability = -1;
-static int hf_japan_isup_redirect_counter = -1;
-static int hf_japan_isup_rfi_info_type = -1;
-static int hf_japan_isup_rfi_info_len = -1;
-static int hf_japan_isup_perf_redir_reason = -1;
-static int hf_japan_isup_redir_pos_ind = -1;
-static int hf_japan_isup_inv_redir_reason = -1;
-static int hf_japan_isup_bwd_info_type = -1;
-static int hf_japan_isup_tag_len = -1;
-static int hf_japan_isup_hold_at_emerg_call_disc_ind = -1;
-static int hf_japan_isup_emerg_call_type = -1;
-static int hf_japan_isup_add_user_cat_type = -1;
-static int hf_japan_isup_type_1_add_fixed_serv_inf = -1;
-static int hf_japan_isup_type_1_add_mobile_serv_inf = -1;
-static int hf_japan_isup_type_2_add_mobile_serv_inf = -1;
-static int hf_japan_isup_type_3_add_mobile_serv_inf = -1;
-static int hf_japan_isup_reason_for_clip_fail = -1;
-static int hf_japan_isup_contractor_number = -1;
-
-static int hf_isup_carrier_info_iec = -1;
-/*static int hf_isup_carrier_info_cat_of_carrier = -1;*/
-/*static int hf_isup_carrier_info_type_of_carrier_info = -1;*/
-static int hf_japan_isup_carrier_info_length = -1;
-static int hf_isup_carrier_info_odd_no_digits = -1;
-static int hf_isup_carrier_info_even_no_digits = -1;
-static int hf_isup_carrier_info_ca_odd_no_digits = -1;
-static int hf_isup_carrier_info_ca_even_no_digits = -1;
-static int hf_isup_carrier_info_poi_entry_HEI = -1;
-static int hf_isup_carrier_info_poi_exit_HEI = -1;
-
-static int hf_japan_isup_charge_delay_type = -1;
-static int hf_japan_isup_charge_info_type = -1;
-static int hf_japan_isup_sig_elem_type = -1;
-static int hf_japan_isup_activation_id = -1;
-static int hf_japan_isup_op_cls = -1;
-static int hf_japan_isup_op_type = -1;
-static int hf_japan_isup_charging_party_type = -1;
-static int hf_japan_isup_utp = -1;
-static int hf_japan_isup_crci1 = -1;
-static int hf_japan_isup_crci2 = -1;
-static int hf_japan_isup_crci1_len = -1;
-static int hf_japan_isup_iu = -1;
-static int hf_japan_isup_dcr = -1;
-static int hf_japan_isup_ecr = -1;
-static int hf_japan_isup_ncr = -1;
-static int hf_japan_isup_scr = -1;
-static int hf_japan_isup_collecting_method = -1;
-static int hf_japan_isup_tariff_rate_pres = -1;
-
-static int hf_japan_isup_charge_area_nat_of_info_value = -1;
-static int hf_japan_isup_charging_info_nc_odd_digits = -1;
-static int hf_japan_isup_charging_info_nc_even_digits = -1;
-static int hf_isup_charging_info_maca_odd_digits = -1;
-static int hf_isup_charging_info_maca_even_digits = -1;
+static int hf_isup_french_coll_field;
+static int hf_isup_french_msg_num;
+
+static int hf_isup_israeli_charging_message_indicators_current;
+static int hf_isup_israeli_charging_message_indicators_next;
+static int hf_isup_israeli_current_rate;
+static int hf_isup_israeli_time_indicator;
+static int hf_isup_israeli_next_rate;
+
+static int hf_japan_isup_redirect_capability;
+static int hf_japan_isup_redirect_counter;
+static int hf_japan_isup_rfi_info_type;
+static int hf_japan_isup_rfi_info_len;
+static int hf_japan_isup_perf_redir_reason;
+static int hf_japan_isup_redir_pos_ind;
+static int hf_japan_isup_inv_redir_reason;
+static int hf_japan_isup_bwd_info_type;
+static int hf_japan_isup_tag_len;
+static int hf_japan_isup_hold_at_emerg_call_disc_ind;
+static int hf_japan_isup_emerg_call_type;
+static int hf_japan_isup_add_user_cat_type;
+static int hf_japan_isup_type_1_add_fixed_serv_inf;
+static int hf_japan_isup_type_1_add_mobile_serv_inf;
+static int hf_japan_isup_type_2_add_mobile_serv_inf;
+static int hf_japan_isup_type_3_add_mobile_serv_inf;
+static int hf_japan_isup_reason_for_clip_fail;
+static int hf_japan_isup_contractor_number;
+
+static int hf_isup_carrier_info_iec;
+/*static int hf_isup_carrier_info_cat_of_carrier;*/
+/*static int hf_isup_carrier_info_type_of_carrier_info;*/
+static int hf_japan_isup_carrier_info_length;
+static int hf_isup_carrier_info_odd_no_digits;
+static int hf_isup_carrier_info_even_no_digits;
+static int hf_isup_carrier_info_ca_odd_no_digits;
+static int hf_isup_carrier_info_ca_even_no_digits;
+static int hf_isup_carrier_info_poi_entry_HEI;
+static int hf_isup_carrier_info_poi_exit_HEI;
+
+static int hf_japan_isup_charge_delay_type;
+static int hf_japan_isup_charge_info_type;
+static int hf_japan_isup_sig_elem_type;
+static int hf_japan_isup_activation_id;
+static int hf_japan_isup_op_cls;
+static int hf_japan_isup_op_type;
+static int hf_japan_isup_charging_party_type;
+static int hf_japan_isup_utp;
+static int hf_japan_isup_crci1;
+static int hf_japan_isup_crci2;
+static int hf_japan_isup_crci1_len;
+static int hf_japan_isup_iu;
+static int hf_japan_isup_dcr;
+static int hf_japan_isup_ecr;
+static int hf_japan_isup_ncr;
+static int hf_japan_isup_scr;
+static int hf_japan_isup_collecting_method;
+static int hf_japan_isup_tariff_rate_pres;
+
+static int hf_japan_isup_charge_area_nat_of_info_value;
+static int hf_japan_isup_charging_info_nc_odd_digits;
+static int hf_japan_isup_charging_info_nc_even_digits;
+static int hf_isup_charging_info_maca_odd_digits;
+static int hf_isup_charging_info_maca_even_digits;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_isup_protocol_class = -1;
-static int hf_isup_geo_loc_shape_description = -1;
-static int hf_isup_geo_loc_shape = -1;
-static int hf_isup_ccss_call_indicator = -1;
-static int hf_isup_charged_party_identification = -1;
-static int hf_isup_forward_gvns = -1;
-static int hf_isup_idi = -1;
-static int hf_isup_precedence_level = -1;
-static int hf_isup_configuration_data = -1;
-static int hf_isup_redirect_capability = -1;
-static int hf_isup_credit = -1;
-static int hf_isup_idp = -1;
-static int hf_isup_apm_seg_indicator = -1;
-static int hf_isup_user_service_information = -1;
-static int hf_isup_tunnelled_protocol_data = -1;
-static int hf_isup_mlpp_service_domain = -1;
-static int hf_isup_uid_capability_indicators = -1;
-static int hf_isup_call_identity = -1;
-static int hf_isup_scf_id = -1;
-static int hf_isup_call_diversion_information = -1;
-static int hf_isup_display_information = -1;
-static int hf_isup_call_history_info = -1;
-static int hf_isup_remote_operations = -1;
-static int hf_isup_user_to_user_info = -1;
-static int hf_isup_address_digits = -1;
-static int hf_isup_network_id = -1;
-static int hf_isup_uid_action_indicators = -1;
-static int hf_isup_dsp = -1;
-static int hf_isup_instruction_indicators = -1;
-static int hf_isup_circuit_assignment_map = -1;
-static int hf_isup_collect_call_request_indicator = -1;
-static int hf_isup_hop_counter = -1;
-static int hf_isup_user_service_information_prime = -1;
-static int hf_isup_message_compatibility_information = -1;
-static int hf_isup_app_transport_param_field8 = -1;
-static int hf_isup_app_transport_param_field16 = -1;
-static int hf_isup_binary_code = -1;
-static int hf_isup_local_reference = -1;
-static int hf_isup_cause_indicators = -1;
-static int hf_isup_backward_gvns = -1;
-static int hf_isup_presentation_indicator = -1;
-static int hf_isup_mcid_request_indicators = -1;
-static int hf_isup_origination_isc_point_code = -1;
-static int hf_isup_upgraded_parameter = -1;
-static int hf_isup_generic_digits = -1;
-static int hf_isup_diagnostic = -1;
-static int hf_isup_network_specific_facility = -1;
-static int hf_isup_app_transport_instruction_indicator = -1;
-static int hf_isup_look_forward_busy = -1;
-static int hf_isup_redirect_counter = -1;
-static int hf_isup_correlation_id = -1;
-static int hf_isup_network_identity = -1;
-static int hf_isup_user_teleservice_information = -1;
-static int hf_isup_mcid_response_indicators = -1;
-static int hf_isup_apm_user_info_field = -1;
-static int hf_isup_feature_code = -1;
-static int hf_isup_number_qualifier_indicator = -1;
-static int hf_isup_echo_control_information = -1;
-static int hf_isup_network_id_length_indicator = -1;
-static int hf_isup_unknown_organisation_identifier = -1;
-static int hf_isup_originating_line_info = -1;
-static int hf_isup_loop_prevention_indicator_type = -1;
-static int hf_isup_signalling_point_code = -1;
-static int hf_isup_call_transfer_identity = -1;
-static int hf_isup_access_transport_parameter_field = -1;
-static int hf_isup_propagation_delay_counter = -1;
-static int hf_isup_number_different_meaning = -1;
+static int hf_isup_protocol_class;
+static int hf_isup_geo_loc_shape_description;
+static int hf_isup_geo_loc_shape;
+static int hf_isup_ccss_call_indicator;
+static int hf_isup_charged_party_identification;
+static int hf_isup_forward_gvns;
+static int hf_isup_idi;
+static int hf_isup_precedence_level;
+static int hf_isup_configuration_data;
+static int hf_isup_redirect_capability;
+static int hf_isup_credit;
+static int hf_isup_idp;
+static int hf_isup_apm_seg_indicator;
+static int hf_isup_user_service_information;
+static int hf_isup_tunnelled_protocol_data;
+static int hf_isup_mlpp_service_domain;
+static int hf_isup_uid_capability_indicators;
+static int hf_isup_call_identity;
+static int hf_isup_scf_id;
+static int hf_isup_call_diversion_information;
+static int hf_isup_display_information;
+static int hf_isup_call_history_info;
+static int hf_isup_remote_operations;
+static int hf_isup_user_to_user_info;
+static int hf_isup_address_digits;
+static int hf_isup_network_id;
+static int hf_isup_uid_action_indicators;
+static int hf_isup_dsp;
+static int hf_isup_instruction_indicators;
+static int hf_isup_circuit_assignment_map;
+static int hf_isup_collect_call_request_indicator;
+static int hf_isup_hop_counter;
+static int hf_isup_user_service_information_prime;
+static int hf_isup_message_compatibility_information;
+static int hf_isup_app_transport_param_field8;
+static int hf_isup_app_transport_param_field16;
+static int hf_isup_binary_code;
+static int hf_isup_local_reference;
+static int hf_isup_cause_indicators;
+static int hf_isup_backward_gvns;
+static int hf_isup_presentation_indicator;
+static int hf_isup_mcid_request_indicators;
+static int hf_isup_origination_isc_point_code;
+static int hf_isup_upgraded_parameter;
+static int hf_isup_generic_digits;
+static int hf_isup_diagnostic;
+static int hf_isup_network_specific_facility;
+static int hf_isup_app_transport_instruction_indicator;
+static int hf_isup_look_forward_busy;
+static int hf_isup_redirect_counter;
+static int hf_isup_correlation_id;
+static int hf_isup_network_identity;
+static int hf_isup_user_teleservice_information;
+static int hf_isup_mcid_response_indicators;
+static int hf_isup_apm_user_info_field;
+static int hf_isup_feature_code;
+static int hf_isup_number_qualifier_indicator;
+static int hf_isup_echo_control_information;
+static int hf_isup_network_id_length_indicator;
+static int hf_isup_unknown_organisation_identifier;
+static int hf_isup_originating_line_info;
+static int hf_isup_loop_prevention_indicator_type;
+static int hf_isup_signalling_point_code;
+static int hf_isup_call_transfer_identity;
+static int hf_isup_access_transport_parameter_field;
+static int hf_isup_propagation_delay_counter;
+static int hf_isup_number_different_meaning;
 
 /* Initialize the subtree pointers */
-static gint ett_isup                            = -1;
-static gint ett_isup_parameter                  = -1;
-static gint ett_isup_address_digits             = -1;
-static gint ett_isup_carrier_info               = -1;
-static gint ett_isup_pass_along_message         = -1;
-static gint ett_isup_circuit_state_ind          = -1;
-static gint ett_bat_ase                         = -1;
-static gint ett_bicc                            = -1;
-static gint ett_bat_ase_element                 = -1;
-static gint ett_bat_ase_iwfa                    = -1;
-static gint ett_acs                             = -1;
-static gint ett_scs                             = -1;
-
-static gint ett_isup_apm_msg_fragment = -1;
-static gint ett_isup_apm_msg_fragments = -1;
-static gint ett_isup_range = -1;
-static gint ett_app_transport_fields = -1;
-static gint ett_app_transport = -1;
-static gint ett_apm_seg_indicator = -1;
-static gint ett_echo_control_information = -1;
-static gint ett_instruction_indicators = -1;
-static gint ett_message_compatibility_information = -1;
-
-static expert_field ei_isup_format_national_matter = EI_INIT;
-static expert_field ei_isup_message_type_unknown = EI_INIT;
-static expert_field ei_isup_not_dissected_yet = EI_INIT;
-static expert_field ei_isup_message_type_no_optional_parameters = EI_INIT;
-static expert_field ei_isup_status_subfield_not_present = EI_INIT;
-static expert_field ei_isup_empty_number = EI_INIT;
-static expert_field ei_isup_too_many_digits = EI_INIT;
-static expert_field ei_isup_opt_par_length_err = EI_INIT;
+static gint ett_isup;
+static gint ett_isup_parameter;
+static gint ett_isup_address_digits;
+static gint ett_isup_carrier_info;
+static gint ett_isup_pass_along_message;
+static gint ett_isup_circuit_state_ind;
+static gint ett_bat_ase;
+static gint ett_bicc;
+static gint ett_bat_ase_element;
+static gint ett_bat_ase_iwfa;
+static gint ett_acs;
+static gint ett_scs;
+
+static gint ett_isup_apm_msg_fragment;
+static gint ett_isup_apm_msg_fragments;
+static gint ett_isup_range;
+static gint ett_app_transport_fields;
+static gint ett_app_transport;
+static gint ett_apm_seg_indicator;
+static gint ett_echo_control_information;
+static gint ett_instruction_indicators;
+static gint ett_message_compatibility_information;
+
+static expert_field ei_isup_format_national_matter;
+static expert_field ei_isup_message_type_unknown;
+static expert_field ei_isup_not_dissected_yet;
+static expert_field ei_isup_message_type_no_optional_parameters;
+static expert_field ei_isup_status_subfield_not_present;
+static expert_field ei_isup_empty_number;
+static expert_field ei_isup_too_many_digits;
+static expert_field ei_isup_opt_par_length_err;
 
 static dissector_handle_t bicc_handle;
 
diff --git a/epan/dissectors/packet-itdm.c b/epan/dissectors/packet-itdm.c
index 96375874da..c50289e21d 100644
--- a/epan/dissectors/packet-itdm.c
+++ b/epan/dissectors/packet-itdm.c
@@ -20,37 +20,37 @@ void proto_register_itdm(void);
 void proto_reg_handoff_itdm(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_itdm        = -1;
-static int hf_itdm_timestamp = -1;
-static int hf_itdm_seqnum    = -1;
-static int hf_itdm_sop_eop   = -1;
-static int hf_itdm_last_pack = -1;
-static int hf_itdm_pktlen    = -1;
-static int hf_itdm_chksum    = -1;
-static int hf_itdm_uid       = -1;
-static int hf_itdm_ack       = -1;
-static int hf_itdm_act       = -1;
-static int hf_itdm_chcmd     = -1;
-static int hf_itdm_chid      = -1;
-static int hf_itdm_chloc1    = -1;
-static int hf_itdm_chloc2    = -1;
-static int hf_itdm_pktrate   = -1;
-static int hf_itdm_cxnsize   = -1;
+static int proto_itdm;
+static int hf_itdm_timestamp;
+static int hf_itdm_seqnum;
+static int hf_itdm_sop_eop;
+static int hf_itdm_last_pack;
+static int hf_itdm_pktlen;
+static int hf_itdm_chksum;
+static int hf_itdm_uid;
+static int hf_itdm_ack;
+static int hf_itdm_act;
+static int hf_itdm_chcmd;
+static int hf_itdm_chid;
+static int hf_itdm_chloc1;
+static int hf_itdm_chloc2;
+static int hf_itdm_pktrate;
+static int hf_itdm_cxnsize;
 
 /* I-TDM control protocol fields */
-static int hf_itdm_ctl_transid   = -1;
-static int hf_itdm_ctl_command   = -1;
-static int hf_itdm_ctl_flowid    = -1;
-static int hf_itdm_ctl_dm        = -1;
-static int hf_itdm_ctl_emts      = -1;
-static int hf_itdm_ctl_pktrate   = -1;
-static int hf_itdm_ctl_ptid      = -1;
-static int hf_itdm_ctl_cksum     = -1;
+static int hf_itdm_ctl_transid;
+static int hf_itdm_ctl_command;
+static int hf_itdm_ctl_flowid;
+static int hf_itdm_ctl_dm;
+static int hf_itdm_ctl_emts;
+static int hf_itdm_ctl_pktrate;
+static int hf_itdm_ctl_ptid;
+static int hf_itdm_ctl_cksum;
 
 
 /* Initialize the subtree pointers */
-static gint ett_itdm       = -1;
-static gint ett_itdm_ctl   = -1;
+static gint ett_itdm;
+static gint ett_itdm_ctl;
 
 static dissector_handle_t itdm_handle;
 
diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c
index 19b9eb0298..a1afa26213 100644
--- a/epan/dissectors/packet-iua.c
+++ b/epan/dissectors/packet-iua.c
@@ -37,44 +37,44 @@ static dissector_table_t lapd_gsm_sapi_dissector_table;
 static gboolean global_iua_gsm_sapis = TRUE;
 
 /* Initialize the protocol and registered fields */
-static int proto_iua                = -1;
-static int hf_int_interface_id      = -1;
-static int hf_text_interface_id     = -1;
-static int hf_info_string           = -1;
-static int hf_dlci_zero_bit         = -1;
-static int hf_dlci_spare_bit        = -1;
-static int hf_dlci_sapi             = -1;
-static int hf_dlci_gsm_sapi         = -1;
-static int hf_dlci_one_bit          = -1;
-static int hf_dlci_tei              = -1;
-static int hf_dlci_spare            = -1;
-static int hf_diag_info             = -1;
-static int hf_interface_range_start = -1;
-static int hf_interface_range_end   = -1;
-static int hf_heartbeat_data        = -1;
-static int hf_asp_reason            = -1;
-static int hf_traffic_mode_type     = -1;
-static int hf_error_code            = -1;
-static int hf_error_code_ig         = -1;
-static int hf_status_type           = -1;
-static int hf_status_id             = -1;
-static int hf_release_reason        = -1;
-static int hf_tei_status            = -1;
-static int hf_asp_id                = -1;
-static int hf_parameter_tag         = -1;
-static int hf_parameter_tag_ig      = -1;
-static int hf_parameter_length      = -1;
-static int hf_parameter_value       = -1;
-static int hf_parameter_padding     = -1;
-static int hf_version               = -1;
-static int hf_reserved              = -1;
-static int hf_message_class         = -1;
-static int hf_message_type          = -1;
-static int hf_message_length        = -1;
+static int proto_iua;
+static int hf_int_interface_id;
+static int hf_text_interface_id;
+static int hf_info_string;
+static int hf_dlci_zero_bit;
+static int hf_dlci_spare_bit;
+static int hf_dlci_sapi;
+static int hf_dlci_gsm_sapi;
+static int hf_dlci_one_bit;
+static int hf_dlci_tei;
+static int hf_dlci_spare;
+static int hf_diag_info;
+static int hf_interface_range_start;
+static int hf_interface_range_end;
+static int hf_heartbeat_data;
+static int hf_asp_reason;
+static int hf_traffic_mode_type;
+static int hf_error_code;
+static int hf_error_code_ig;
+static int hf_status_type;
+static int hf_status_id;
+static int hf_release_reason;
+static int hf_tei_status;
+static int hf_asp_id;
+static int hf_parameter_tag;
+static int hf_parameter_tag_ig;
+static int hf_parameter_length;
+static int hf_parameter_value;
+static int hf_parameter_padding;
+static int hf_version;
+static int hf_reserved;
+static int hf_message_class;
+static int hf_message_type;
+static int hf_message_length;
 
 /* Initialize the subtree pointers */
-static gint ett_iua                 = -1;
-static gint ett_iua_parameter       = -1;
+static gint ett_iua;
+static gint ett_iua_parameter;
 
 /* stores the current SAPI value */
 static guint8 sapi_val;
diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c
index 11a4d399bb..5957b39de9 100644
--- a/epan/dissectors/packet-iuup.c
+++ b/epan/dissectors/packet-iuup.c
@@ -48,54 +48,54 @@ typedef struct {
     iuup_rfci_t* last_rfci;
 } iuup_circuit_t;
 
-static int proto_iuup = -1;
-
-static int hf_iuup_direction = -1;
-static int hf_iuup_circuit_id = -1;
-
-static int hf_iuup_pdu_type = -1;
-static int hf_iuup_frame_number = -1;
-static int hf_iuup_fqc = -1;
-static int hf_iuup_rfci = -1;
-static int hf_iuup_hdr_crc = -1;
-static int hf_iuup_payload_crc = -1;
-
-static int hf_iuup_ack_nack = -1;
-static int hf_iuup_frame_number_t14 = -1;
-static int hf_iuup_mode_version = -1;
-static int hf_iuup_procedure_indicator = -1;
-static int hf_iuup_error_cause_val = -1;
-
-static int hf_iuup_init_ti = -1;
-static int hf_iuup_init_subflows_per_rfci = -1;
-static int hf_iuup_init_chain_ind = -1;
-
-static int hf_iuup_error_distance = -1;
-static int hf_iuup_errorevt_cause_val = -1;
-
-static int hf_iuup_time_align = -1;
-static int hf_iuup_spare_bytes = -1;
-static int hf_iuup_spare_03 = -1;
-/* static int hf_iuup_spare_0f = -1; */
-/* static int hf_iuup_spare_c0 = -1; */
-static int hf_iuup_spare_e0 = -1;
-static int hf_iuup_spare_ff = -1;
-
-static int hf_iuup_delay = -1;
-static int hf_iuup_advance = -1;
-static int hf_iuup_delta = -1;
-
-static int hf_iuup_mode_versions = -1;
+static int proto_iuup;
+
+static int hf_iuup_direction;
+static int hf_iuup_circuit_id;
+
+static int hf_iuup_pdu_type;
+static int hf_iuup_frame_number;
+static int hf_iuup_fqc;
+static int hf_iuup_rfci;
+static int hf_iuup_hdr_crc;
+static int hf_iuup_payload_crc;
+
+static int hf_iuup_ack_nack;
+static int hf_iuup_frame_number_t14;
+static int hf_iuup_mode_version;
+static int hf_iuup_procedure_indicator;
+static int hf_iuup_error_cause_val;
+
+static int hf_iuup_init_ti;
+static int hf_iuup_init_subflows_per_rfci;
+static int hf_iuup_init_chain_ind;
+
+static int hf_iuup_error_distance;
+static int hf_iuup_errorevt_cause_val;
+
+static int hf_iuup_time_align;
+static int hf_iuup_spare_bytes;
+static int hf_iuup_spare_03;
+/* static int hf_iuup_spare_0f; */
+/* static int hf_iuup_spare_c0; */
+static int hf_iuup_spare_e0;
+static int hf_iuup_spare_ff;
+
+static int hf_iuup_delay;
+static int hf_iuup_advance;
+static int hf_iuup_delta;
+
+static int hf_iuup_mode_versions;
 static int hf_iuup_mode_versions_a[16];
 
 
-static int hf_iuup_data_pdu_type = -1;
+static int hf_iuup_data_pdu_type;
 
-static int hf_iuup_num_rfci_ind = -1;
+static int hf_iuup_num_rfci_ind;
 
-static int hf_iuup_payload = -1;
+static int hf_iuup_payload;
 
-static int hf_iuup_init_rfci_ind = -1;
+static int hf_iuup_init_rfci_ind;
 static int hf_iuup_init_rfci[64];
 
 static int hf_iuup_init_rfci_flow_len[64][8];
@@ -106,23 +106,23 @@ static int hf_iuup_rfci_subflow[64][8];
 static int hf_iuup_rfci_ratectl[64];
 
 
-static gint ett_iuup = -1;
-static gint ett_rfci = -1;
-static gint ett_ipti = -1;
-static gint ett_support = -1;
-static gint ett_time = -1;
-static gint ett_rfciinds = -1;
-static gint ett_payload = -1;
-static gint ett_payload_subflows = -1;
-
-static expert_field ei_iuup_hdr_crc_bad = EI_INIT;
-static expert_field ei_iuup_payload_crc_bad = EI_INIT;
-static expert_field ei_iuup_payload_undecoded = EI_INIT;
-static expert_field ei_iuup_error_response = EI_INIT;
-static expert_field ei_iuup_ack_nack = EI_INIT;
-static expert_field ei_iuup_time_align = EI_INIT;
-static expert_field ei_iuup_procedure_indicator = EI_INIT;
-static expert_field ei_iuup_pdu_type = EI_INIT;
+static gint ett_iuup;
+static gint ett_rfci;
+static gint ett_ipti;
+static gint ett_support;
+static gint ett_time;
+static gint ett_rfciinds;
+static gint ett_payload;
+static gint ett_payload_subflows;
+
+static expert_field ei_iuup_hdr_crc_bad;
+static expert_field ei_iuup_payload_crc_bad;
+static expert_field ei_iuup_payload_undecoded;
+static expert_field ei_iuup_error_response;
+static expert_field ei_iuup_ack_nack;
+static expert_field ei_iuup_time_align;
+static expert_field ei_iuup_procedure_indicator;
+static expert_field ei_iuup_pdu_type;
 
 static wmem_map_t* circuits = NULL;
 
diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c
index 3693335353..7d7d7956be 100644
--- a/epan/dissectors/packet-iwarp-ddp-rdmap.c
+++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c
@@ -87,125 +87,125 @@ void proto_register_iwarp_ddp_rdmap(void);
 #define IWARP_ETYPE_DDP_UNTAGGED 0x02
 
 /* GLOBALS */
-static gint proto_iwarp_ddp_rdmap = -1;
-static gint ett_iwarp_ddp_rdmap = -1;
+static gint proto_iwarp_ddp_rdmap;
+static gint ett_iwarp_ddp_rdmap;
 
 /*
  * DDP: initialize the protocol and registered fields
  */
-static gint hf_iwarp_ddp = -1;
+static gint hf_iwarp_ddp;
 
 /* DDP Control Field */
-static gint hf_iwarp_ddp_control_field = -1;
-static gint hf_iwarp_ddp_t_flag = -1;
-static gint hf_iwarp_ddp_l_flag = -1;
-static gint hf_iwarp_ddp_rsvd = -1;
-static gint hf_iwarp_ddp_dv = -1;
+static gint hf_iwarp_ddp_control_field;
+static gint hf_iwarp_ddp_t_flag;
+static gint hf_iwarp_ddp_l_flag;
+static gint hf_iwarp_ddp_rsvd;
+static gint hf_iwarp_ddp_dv;
 
 /* DDP rsvdULP[8:39] field */
-static gint hf_iwarp_ddp_rsvdulp = -1;
+static gint hf_iwarp_ddp_rsvdulp;
 
 /* Tagged Buffer Model Header */
-static gint hf_iwarp_ddp_tagged_header = -1;
-static gint hf_iwarp_ddp_stag = -1;
-static gint hf_iwarp_ddp_to = -1;
+static gint hf_iwarp_ddp_tagged_header;
+static gint hf_iwarp_ddp_stag;
+static gint hf_iwarp_ddp_to;
 
 /* Untagged Buffer Model Header */
-static gint hf_iwarp_ddp_untagged_header = -1;
-static gint hf_iwarp_ddp_qn= -1;
-static gint hf_iwarp_ddp_msn = -1;
-static gint hf_iwarp_ddp_mo = -1;
+static gint hf_iwarp_ddp_untagged_header;
+static gint hf_iwarp_ddp_qn;
+static gint hf_iwarp_ddp_msn;
+static gint hf_iwarp_ddp_mo;
 
 /* initialize the subtree pointers */
-static gint ett_iwarp_ddp = -1;
+static gint ett_iwarp_ddp;
 
-static gint ett_iwarp_ddp_control_field = -1;
-static gint ett_iwarp_ddp_tagged_header = -1;
-static gint ett_iwarp_ddp_untagged_header = -1;
+static gint ett_iwarp_ddp_control_field;
+static gint ett_iwarp_ddp_tagged_header;
+static gint ett_iwarp_ddp_untagged_header;
 
 /*
  * RDMAP: initialize the protocol and registered fields
  */
-static gint hf_iwarp_rdma = -1;
+static gint hf_iwarp_rdma;
 
 /* Control Field */
-static gint hf_iwarp_rdma_control_field = -1;
-static gint hf_iwarp_rdma_version = -1;
-static gint hf_iwarp_rdma_rsvd = -1;
-static gint hf_iwarp_rdma_opcode = -1;
+static gint hf_iwarp_rdma_control_field;
+static gint hf_iwarp_rdma_version;
+static gint hf_iwarp_rdma_rsvd;
+static gint hf_iwarp_rdma_opcode;
 
 /* DDP rsvdULP[8:39] RDMA interpretations */
-static gint hf_iwarp_rdma_reserved = -1;
-static gint hf_iwarp_rdma_inval_stag = -1;
+static gint hf_iwarp_rdma_reserved;
+static gint hf_iwarp_rdma_inval_stag;
 
 /* Read Request Header */
-static gint hf_iwarp_rdma_rr_header = -1;
-static gint hf_iwarp_rdma_sinkstag = -1;
-static gint hf_iwarp_rdma_sinkto = -1;
-static gint hf_iwarp_rdma_rdmardsz = -1;
-static gint hf_iwarp_rdma_srcstag = -1;
-static gint hf_iwarp_rdma_srcto = -1;
+static gint hf_iwarp_rdma_rr_header;
+static gint hf_iwarp_rdma_sinkstag;
+static gint hf_iwarp_rdma_sinkto;
+static gint hf_iwarp_rdma_rdmardsz;
+static gint hf_iwarp_rdma_srcstag;
+static gint hf_iwarp_rdma_srcto;
 
 /* Terminate Header */
-static gint hf_iwarp_rdma_terminate_header = -1;
-static gint hf_iwarp_rdma_term_ctrl = -1;
-static gint hf_iwarp_rdma_term_layer = -1;
-static gint hf_iwarp_rdma_term_etype = -1;
-static gint hf_iwarp_rdma_term_etype_rdma = -1;
-static gint hf_iwarp_rdma_term_etype_ddp = -1;
-static gint hf_iwarp_rdma_term_etype_llp = -1;
-static gint hf_iwarp_rdma_term_errcode = -1;
-static gint hf_iwarp_rdma_term_errcode_rdma = -1;
-static gint hf_iwarp_rdma_term_errcode_ddp_untagged = -1;
-static gint hf_iwarp_rdma_term_errcode_ddp_tagged = -1;
-static gint hf_iwarp_rdma_term_errcode_llp = -1;
-static gint hf_iwarp_rdma_term_hdrct = -1;
-static gint hf_iwarp_rdma_term_hdrct_m = -1;
-static gint hf_iwarp_rdma_term_hdrct_d = -1;
-static gint hf_iwarp_rdma_term_hdrct_r = -1;
-static gint hf_iwarp_rdma_term_rsvd = -1;
-static gint hf_iwarp_rdma_term_ddp_seg_len = -1;
-static gint hf_iwarp_rdma_term_ddp_h = -1;
-static gint hf_iwarp_rdma_term_rdma_h = -1;
+static gint hf_iwarp_rdma_terminate_header;
+static gint hf_iwarp_rdma_term_ctrl;
+static gint hf_iwarp_rdma_term_layer;
+static gint hf_iwarp_rdma_term_etype;
+static gint hf_iwarp_rdma_term_etype_rdma;
+static gint hf_iwarp_rdma_term_etype_ddp;
+static gint hf_iwarp_rdma_term_etype_llp;
+static gint hf_iwarp_rdma_term_errcode;
+static gint hf_iwarp_rdma_term_errcode_rdma;
+static gint hf_iwarp_rdma_term_errcode_ddp_untagged;
+static gint hf_iwarp_rdma_term_errcode_ddp_tagged;
+static gint hf_iwarp_rdma_term_errcode_llp;
+static gint hf_iwarp_rdma_term_hdrct;
+static gint hf_iwarp_rdma_term_hdrct_m;
+static gint hf_iwarp_rdma_term_hdrct_d;
+static gint hf_iwarp_rdma_term_hdrct_r;
+static gint hf_iwarp_rdma_term_rsvd;
+static gint hf_iwarp_rdma_term_ddp_seg_len;
+static gint hf_iwarp_rdma_term_ddp_h;
+static gint hf_iwarp_rdma_term_rdma_h;
 
 /* Atomic */
-static gint hf_iwarp_rdma_atomic_reserved = -1;
-static gint hf_iwarp_rdma_atomic_opcode = -1;
-static gint hf_iwarp_rdma_atomic_request_identifier = -1;
-static gint hf_iwarp_rdma_atomic_remote_stag = -1;
-static gint hf_iwarp_rdma_atomic_remote_tagged_offset = -1;
-static gint hf_iwarp_rdma_atomic_add_data = -1;
-static gint hf_iwarp_rdma_atomic_add_mask = -1;
-static gint hf_iwarp_rdma_atomic_swap_data = -1;
-static gint hf_iwarp_rdma_atomic_swap_mask = -1;
-static gint hf_iwarp_rdma_atomic_compare_data = -1;
-static gint hf_iwarp_rdma_atomic_compare_mask = -1;
-static gint hf_iwarp_rdma_atomic_original_request_identifier = -1;
-static gint hf_iwarp_rdma_atomic_original_remote_data_value = -1;
-
-static gint hf_iwarp_rdma_send_fragments = -1;
-static gint hf_iwarp_rdma_send_fragment = -1;
-static gint hf_iwarp_rdma_send_fragment_overlap = -1;
-static gint hf_iwarp_rdma_send_fragment_overlap_conflict = -1;
-static gint hf_iwarp_rdma_send_fragment_multiple_tails = -1;
-static gint hf_iwarp_rdma_send_fragment_too_long_fragment = -1;
-static gint hf_iwarp_rdma_send_fragment_error = -1;
-static gint hf_iwarp_rdma_send_fragment_count = -1;
-static gint hf_iwarp_rdma_send_reassembled_in = -1;
-static gint hf_iwarp_rdma_send_reassembled_length = -1;
-static gint hf_iwarp_rdma_send_reassembled_data = -1;
+static gint hf_iwarp_rdma_atomic_reserved;
+static gint hf_iwarp_rdma_atomic_opcode;
+static gint hf_iwarp_rdma_atomic_request_identifier;
+static gint hf_iwarp_rdma_atomic_remote_stag;
+static gint hf_iwarp_rdma_atomic_remote_tagged_offset;
+static gint hf_iwarp_rdma_atomic_add_data;
+static gint hf_iwarp_rdma_atomic_add_mask;
+static gint hf_iwarp_rdma_atomic_swap_data;
+static gint hf_iwarp_rdma_atomic_swap_mask;
+static gint hf_iwarp_rdma_atomic_compare_data;
+static gint hf_iwarp_rdma_atomic_compare_mask;
+static gint hf_iwarp_rdma_atomic_original_request_identifier;
+static gint hf_iwarp_rdma_atomic_original_remote_data_value;
+
+static gint hf_iwarp_rdma_send_fragments;
+static gint hf_iwarp_rdma_send_fragment;
+static gint hf_iwarp_rdma_send_fragment_overlap;
+static gint hf_iwarp_rdma_send_fragment_overlap_conflict;
+static gint hf_iwarp_rdma_send_fragment_multiple_tails;
+static gint hf_iwarp_rdma_send_fragment_too_long_fragment;
+static gint hf_iwarp_rdma_send_fragment_error;
+static gint hf_iwarp_rdma_send_fragment_count;
+static gint hf_iwarp_rdma_send_reassembled_in;
+static gint hf_iwarp_rdma_send_reassembled_length;
+static gint hf_iwarp_rdma_send_reassembled_data;
 
 /* initialize the subtree pointers */
-static gint ett_iwarp_rdma = -1;
+static gint ett_iwarp_rdma;
 
-static gint ett_iwarp_rdma_control_field = -1;
-static gint ett_iwarp_rdma_rr_header = -1;
-static gint ett_iwarp_rdma_terminate_header = -1;
-static gint ett_iwarp_rdma_term_ctrl = -1;
-static gint ett_iwarp_rdma_term_hdrct = -1;
+static gint ett_iwarp_rdma_control_field;
+static gint ett_iwarp_rdma_rr_header;
+static gint ett_iwarp_rdma_terminate_header;
+static gint ett_iwarp_rdma_term_ctrl;
+static gint ett_iwarp_rdma_term_hdrct;
 
-static gint ett_iwarp_rdma_send_fragment = -1;
-static gint ett_iwarp_rdma_send_fragments = -1;
+static gint ett_iwarp_rdma_send_fragment;
+static gint ett_iwarp_rdma_send_fragments;
 
 static const fragment_items iwarp_rdma_send_frag_items = {
 	&ett_iwarp_rdma_send_fragment,
diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c
index 7434cd0313..785f2affe5 100644
--- a/epan/dissectors/packet-iwarp-mpa.c
+++ b/epan/dissectors/packet-iwarp-mpa.c
@@ -64,43 +64,43 @@ void proto_reg_handoff_mpa(void);
 /* GLOBALS */
 
 /* initialize the protocol and registered fields */
-static gint proto_iwarp_mpa = -1;
-
-static gint hf_mpa_req = -1;
-static gint hf_mpa_rep = -1;
-static gint hf_mpa_fpdu = -1;
-static gint hf_mpa_marker = -1;
-
-static gint hf_mpa_key_req = -1;
-static gint hf_mpa_key_rep = -1;
-static gint hf_mpa_flag_m = -1;
-static gint hf_mpa_flag_c = -1;
-static gint hf_mpa_flag_r = -1;
-static gint hf_mpa_flag_res = -1;
-static gint hf_mpa_rev = -1;
-static gint hf_mpa_pd_length = -1;
-static gint hf_mpa_private_data = -1;
-
-static gint hf_mpa_ulpdu_length = -1;
-static gint hf_mpa_pad = -1;
-static gint hf_mpa_crc = -1;
-static gint hf_mpa_crc_check = -1;
-
-static gint hf_mpa_marker_res = -1;
-static gint hf_mpa_marker_fpduptr = -1;
+static gint proto_iwarp_mpa;
+
+static gint hf_mpa_req;
+static gint hf_mpa_rep;
+static gint hf_mpa_fpdu;
+static gint hf_mpa_marker;
+
+static gint hf_mpa_key_req;
+static gint hf_mpa_key_rep;
+static gint hf_mpa_flag_m;
+static gint hf_mpa_flag_c;
+static gint hf_mpa_flag_r;
+static gint hf_mpa_flag_res;
+static gint hf_mpa_rev;
+static gint hf_mpa_pd_length;
+static gint hf_mpa_private_data;
+
+static gint hf_mpa_ulpdu_length;
+static gint hf_mpa_pad;
+static gint hf_mpa_crc;
+static gint hf_mpa_crc_check;
+
+static gint hf_mpa_marker_res;
+static gint hf_mpa_marker_fpduptr;
 
 /* initialize the subtree pointers */
-static gint ett_mpa = -1;
+static gint ett_mpa;
 
-static gint ett_mpa_req = -1;
-static gint ett_mpa_rep = -1;
-static gint ett_mpa_fpdu = -1;
-static gint ett_mpa_marker = -1;
+static gint ett_mpa_req;
+static gint ett_mpa_rep;
+static gint ett_mpa_fpdu;
+static gint ett_mpa_marker;
 
-static expert_field ei_mpa_res_field_not_set0 = EI_INIT;
-static expert_field ei_mpa_rev_field_not_set1 = EI_INIT;
-static expert_field ei_mpa_reject_bit_responder = EI_INIT;
-static expert_field ei_mpa_bad_length = EI_INIT;
+static expert_field ei_mpa_res_field_not_set0;
+static expert_field ei_mpa_rev_field_not_set1;
+static expert_field ei_mpa_reject_bit_responder;
+static expert_field ei_mpa_bad_length;
 
 /* handles of our subdissectors */
 static dissector_handle_t ddp_rdmap_handle = NULL;
diff --git a/epan/dissectors/packet-ixiatrailer.c b/epan/dissectors/packet-ixiatrailer.c
index 1cdff60be0..41c3312542 100644
--- a/epan/dissectors/packet-ixiatrailer.c
+++ b/epan/dissectors/packet-ixiatrailer.c
@@ -48,14 +48,14 @@ static const value_string ixiatrailer_ftype_timestamp[] = {
 /* Preference settings */
 static gboolean ixiatrailer_summary_in_tree = TRUE;
 
-static int proto_ixiatrailer = -1;
-static gint ett_ixiatrailer = -1;
+static int proto_ixiatrailer;
+static gint ett_ixiatrailer;
 
-static int hf_ixiatrailer_packetlen = -1;
-static int hf_ixiatrailer_timestamp = -1;
-static int hf_ixiatrailer_generic = -1;
+static int hf_ixiatrailer_packetlen;
+static int hf_ixiatrailer_timestamp;
+static int hf_ixiatrailer_generic;
 
-static expert_field ei_ixiatrailer_field_length_invalid = EI_INIT;
+static expert_field ei_ixiatrailer_field_length_invalid;
 
 /* The trailer begins with a sequence of TLVs, each of which has a
    1-byte type, a 1-byte value length (not TLV length, so the TLV
diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c
index 00933fe749..c210db60b2 100644
--- a/epan/dissectors/packet-ixveriwave.c
+++ b/epan/dissectors/packet-ixveriwave.c
@@ -108,373 +108,373 @@ static frame_end_data previous_frame_data = {0,0};
 #define VHT_BW_80_MHZ  2
 #define VHT_BW_160_MHZ 3
 
-static int proto_ixveriwave = -1;
+static int proto_ixveriwave;
 static dissector_handle_t ethernet_handle;
 
-/* static int hf_ixveriwave_version = -1; */
-static int hf_ixveriwave_frame_length = -1;
+/* static int hf_ixveriwave_version; */
+static int hf_ixveriwave_frame_length;
 
-/* static int hf_ixveriwave_fcs = -1; */
+/* static int hf_ixveriwave_fcs; */
 
-static int hf_ixveriwave_vw_msdu_length = -1;
-static int hf_ixveriwave_vw_flowid = -1;
-static int hf_ixveriwave_vw_vcid = -1;
-static int hf_ixveriwave_vw_seqnum = -1;
+static int hf_ixveriwave_vw_msdu_length;
+static int hf_ixveriwave_vw_flowid;
+static int hf_ixveriwave_vw_vcid;
+static int hf_ixveriwave_vw_seqnum;
 
-static int hf_ixveriwave_vw_mslatency = -1;
-static int hf_ixveriwave_vw_latency = -1;
-static int hf_ixveriwave_vw_sig_ts = -1;
-static int hf_ixveriwave_vw_delay = -1;
-static int hf_ixveriwave_vw_startt = -1;
-static int hf_ixveriwave_vw_endt = -1;
-static int hf_ixveriwave_vw_pktdur = -1;
-static int hf_ixveriwave_vw_ifg = -1;
+static int hf_ixveriwave_vw_mslatency;
+static int hf_ixveriwave_vw_latency;
+static int hf_ixveriwave_vw_sig_ts;
+static int hf_ixveriwave_vw_delay;
+static int hf_ixveriwave_vw_startt;
+static int hf_ixveriwave_vw_endt;
+static int hf_ixveriwave_vw_pktdur;
+static int hf_ixveriwave_vw_ifg;
 
 // RF LOGGING
-static int hf_radiotap_rf_info = -1;
-static int hf_radiotap_rfinfo_rfid = -1;
+static int hf_radiotap_rf_info;
+static int hf_radiotap_rfinfo_rfid;
 
 /*
-static int hf_radiotap_rfinfo_noise = -1;
-static int hf_radiotap_rfinfo_noise_anta = -1;
-static int hf_radiotap_rfinfo_noise_antb = -1;
-static int hf_radiotap_rfinfo_noise_antc = -1;
-static int hf_radiotap_rfinfo_noise_antd = -1;
+static int hf_radiotap_rfinfo_noise;
+static int hf_radiotap_rfinfo_noise_anta;
+static int hf_radiotap_rfinfo_noise_antb;
+static int hf_radiotap_rfinfo_noise_antc;
+static int hf_radiotap_rfinfo_noise_antd;
 */
 
-static int hf_radiotap_rfinfo_snr = -1;
-static int hf_radiotap_rfinfo_snr_anta = -1;
-static int hf_radiotap_rfinfo_snr_antb = -1;
-static int hf_radiotap_rfinfo_snr_antc = -1;
-static int hf_radiotap_rfinfo_snr_antd = -1;
-
-static int hf_radiotap_rfinfo_pfe = -1;
-static int hf_radiotap_rfinfo_pfe_anta = -1;
-static int hf_radiotap_rfinfo_pfe_antb = -1;
-static int hf_radiotap_rfinfo_pfe_antc = -1;
-static int hf_radiotap_rfinfo_pfe_antd = -1;
-
-static int hf_radiotap_rfinfo_sigdata = -1;
-static int hf_radiotap_rfinfo_avg_evm_sd_siga = -1;
-static int hf_radiotap_rfinfo_avg_evm_sd_sigb = -1;
-static int hf_radiotap_rfinfo_avg_evm_sd_sigc = -1;
-static int hf_radiotap_rfinfo_avg_evm_sd_sigd = -1;
-
-static int hf_radiotap_rfinfo_sigpilot = -1;
-static int hf_radiotap_rfinfo_avg_evm_sp_siga = -1;
-static int hf_radiotap_rfinfo_avg_evm_sp_sigb = -1;
-static int hf_radiotap_rfinfo_avg_evm_sp_sigc = -1;
-static int hf_radiotap_rfinfo_avg_evm_sp_sigd = -1;
-
-static int hf_radiotap_rfinfo_datadata = -1;
-static int hf_radiotap_rfinfo_avg_evm_dd_siga = -1;
-static int hf_radiotap_rfinfo_avg_evm_dd_sigb = -1;
-static int hf_radiotap_rfinfo_avg_evm_dd_sigc = -1;
-static int hf_radiotap_rfinfo_avg_evm_dd_sigd = -1;
-
-static int hf_radiotap_rfinfo_datapilot = -1;
-static int hf_radiotap_rfinfo_avg_evm_dp_siga = -1;
-static int hf_radiotap_rfinfo_avg_evm_dp_sigb = -1;
-static int hf_radiotap_rfinfo_avg_evm_dp_sigc = -1;
-static int hf_radiotap_rfinfo_avg_evm_dp_sigd = -1;
-
-static int hf_radiotap_rfinfo_avg_ws_symbol = -1;
-static int hf_radiotap_rfinfo_avg_evm_ws_siga = -1;
-static int hf_radiotap_rfinfo_avg_evm_ws_sigb = -1;
-static int hf_radiotap_rfinfo_avg_evm_ws_sigc = -1;
-static int hf_radiotap_rfinfo_avg_evm_ws_sigd = -1;
-
-static int hf_radiotap_rfinfo_contextpa = -1;
-static int hf_radiotap_rfinfo_contextpA_snr_noise_valid = -1;
-static int hf_radiotap_rfinfo_contextpA_pfe_valid = -1;
-static int hf_radiotap_rfinfo_contextpA_pfe_is_cck = -1;
-static int hf_radiotap_rfinfo_contextpA_agc_idle2iqrdy_no_gain_change = -1;
-static int hf_radiotap_rfinfo_contextpA_agc_high_pwr_terminated = -1;
-static int hf_radiotap_rfinfo_contextpA_agc_high_pwr_terminator = -1;
-/* static int hf_radiotap_rfinfo_contextpA_frame_format = -1; */
-/* static int hf_radiotap_rfinfo_contextpA_ofdm_or_cck = -1; */
-/* static int hf_radiotap_rfinfo_contextpA_sigbandwidth_of_evm = -1; */
-static int hf_radiotap_rfinfo_contextpA_qam_modulation = -1;
-
-static int hf_radiotap_rfinfo_frameformatA = -1;
-static int hf_radiotap_rfinfo_sigbwevmA = -1;
-static int hf_radiotap_rfinfo_legacytypeA = -1;
-
-static int hf_radiotap_rfinfo_contextpb = -1;
-static int hf_radiotap_rfinfo_contextpB_snr_noise_valid = -1;
-static int hf_radiotap_rfinfo_contextpB_pfe_valid = -1;
-static int hf_radiotap_rfinfo_contextpB_pfe_is_cck = -1;
-static int hf_radiotap_rfinfo_contextpB_agc_idle2iqrdy_no_gain_change = -1;
-static int hf_radiotap_rfinfo_contextpB_agc_high_pwr_terminated = -1;
-static int hf_radiotap_rfinfo_contextpB_agc_high_pwr_terminator = -1;
-static int hf_radiotap_rfinfo_contextpB_qam_modulation = -1;
-
-static int hf_radiotap_rfinfo_frameformatB = -1;
-static int hf_radiotap_rfinfo_sigbwevmB = -1;
-static int hf_radiotap_rfinfo_legacytypeB = -1;
-
-static int hf_radiotap_rfinfo_contextpc = -1;
-static int hf_radiotap_rfinfo_contextpC_snr_noise_valid = -1;
-static int hf_radiotap_rfinfo_contextpC_pfe_valid = -1;
-static int hf_radiotap_rfinfo_contextpC_pfe_is_cck = -1;
-static int hf_radiotap_rfinfo_contextpC_agc_idle2iqrdy_no_gain_change = -1;
-static int hf_radiotap_rfinfo_contextpC_agc_high_pwr_terminated = -1;
-static int hf_radiotap_rfinfo_contextpC_agc_high_pwr_terminator = -1;
-static int hf_radiotap_rfinfo_contextpC_qam_modulation = -1;
-
-static int hf_radiotap_rfinfo_frameformatC = -1;
-static int hf_radiotap_rfinfo_sigbwevmC = -1;
-static int hf_radiotap_rfinfo_legacytypeC = -1;
-
-static int hf_radiotap_rfinfo_contextpd = -1;
-static int hf_radiotap_rfinfo_contextpD_snr_noise_valid = -1;
-static int hf_radiotap_rfinfo_contextpD_pfe_valid = -1;
-static int hf_radiotap_rfinfo_contextpD_pfe_is_cck = -1;
-static int hf_radiotap_rfinfo_contextpD_agc_idle2iqrdy_no_gain_change = -1;
-static int hf_radiotap_rfinfo_contextpD_agc_high_pwr_terminated = -1;
-static int hf_radiotap_rfinfo_contextpD_agc_high_pwr_terminator = -1;
-static int hf_radiotap_rfinfo_contextpD_qam_modulation = -1;
-
-static int hf_radiotap_rfinfo_frameformatD = -1;
-static int hf_radiotap_rfinfo_sigbwevmD = -1;
-static int hf_radiotap_rfinfo_legacytypeD = -1;
-
-/* static int hf_radiotap_rfinfo_tbd = -1; */
+static int hf_radiotap_rfinfo_snr;
+static int hf_radiotap_rfinfo_snr_anta;
+static int hf_radiotap_rfinfo_snr_antb;
+static int hf_radiotap_rfinfo_snr_antc;
+static int hf_radiotap_rfinfo_snr_antd;
+
+static int hf_radiotap_rfinfo_pfe;
+static int hf_radiotap_rfinfo_pfe_anta;
+static int hf_radiotap_rfinfo_pfe_antb;
+static int hf_radiotap_rfinfo_pfe_antc;
+static int hf_radiotap_rfinfo_pfe_antd;
+
+static int hf_radiotap_rfinfo_sigdata;
+static int hf_radiotap_rfinfo_avg_evm_sd_siga;
+static int hf_radiotap_rfinfo_avg_evm_sd_sigb;
+static int hf_radiotap_rfinfo_avg_evm_sd_sigc;
+static int hf_radiotap_rfinfo_avg_evm_sd_sigd;
+
+static int hf_radiotap_rfinfo_sigpilot;
+static int hf_radiotap_rfinfo_avg_evm_sp_siga;
+static int hf_radiotap_rfinfo_avg_evm_sp_sigb;
+static int hf_radiotap_rfinfo_avg_evm_sp_sigc;
+static int hf_radiotap_rfinfo_avg_evm_sp_sigd;
+
+static int hf_radiotap_rfinfo_datadata;
+static int hf_radiotap_rfinfo_avg_evm_dd_siga;
+static int hf_radiotap_rfinfo_avg_evm_dd_sigb;
+static int hf_radiotap_rfinfo_avg_evm_dd_sigc;
+static int hf_radiotap_rfinfo_avg_evm_dd_sigd;
+
+static int hf_radiotap_rfinfo_datapilot;
+static int hf_radiotap_rfinfo_avg_evm_dp_siga;
+static int hf_radiotap_rfinfo_avg_evm_dp_sigb;
+static int hf_radiotap_rfinfo_avg_evm_dp_sigc;
+static int hf_radiotap_rfinfo_avg_evm_dp_sigd;
+
+static int hf_radiotap_rfinfo_avg_ws_symbol;
+static int hf_radiotap_rfinfo_avg_evm_ws_siga;
+static int hf_radiotap_rfinfo_avg_evm_ws_sigb;
+static int hf_radiotap_rfinfo_avg_evm_ws_sigc;
+static int hf_radiotap_rfinfo_avg_evm_ws_sigd;
+
+static int hf_radiotap_rfinfo_contextpa;
+static int hf_radiotap_rfinfo_contextpA_snr_noise_valid;
+static int hf_radiotap_rfinfo_contextpA_pfe_valid;
+static int hf_radiotap_rfinfo_contextpA_pfe_is_cck;
+static int hf_radiotap_rfinfo_contextpA_agc_idle2iqrdy_no_gain_change;
+static int hf_radiotap_rfinfo_contextpA_agc_high_pwr_terminated;
+static int hf_radiotap_rfinfo_contextpA_agc_high_pwr_terminator;
+/* static int hf_radiotap_rfinfo_contextpA_frame_format; */
+/* static int hf_radiotap_rfinfo_contextpA_ofdm_or_cck; */
+/* static int hf_radiotap_rfinfo_contextpA_sigbandwidth_of_evm; */
+static int hf_radiotap_rfinfo_contextpA_qam_modulation;
+
+static int hf_radiotap_rfinfo_frameformatA;
+static int hf_radiotap_rfinfo_sigbwevmA;
+static int hf_radiotap_rfinfo_legacytypeA;
+
+static int hf_radiotap_rfinfo_contextpb;
+static int hf_radiotap_rfinfo_contextpB_snr_noise_valid;
+static int hf_radiotap_rfinfo_contextpB_pfe_valid;
+static int hf_radiotap_rfinfo_contextpB_pfe_is_cck;
+static int hf_radiotap_rfinfo_contextpB_agc_idle2iqrdy_no_gain_change;
+static int hf_radiotap_rfinfo_contextpB_agc_high_pwr_terminated;
+static int hf_radiotap_rfinfo_contextpB_agc_high_pwr_terminator;
+static int hf_radiotap_rfinfo_contextpB_qam_modulation;
+
+static int hf_radiotap_rfinfo_frameformatB;
+static int hf_radiotap_rfinfo_sigbwevmB;
+static int hf_radiotap_rfinfo_legacytypeB;
+
+static int hf_radiotap_rfinfo_contextpc;
+static int hf_radiotap_rfinfo_contextpC_snr_noise_valid;
+static int hf_radiotap_rfinfo_contextpC_pfe_valid;
+static int hf_radiotap_rfinfo_contextpC_pfe_is_cck;
+static int hf_radiotap_rfinfo_contextpC_agc_idle2iqrdy_no_gain_change;
+static int hf_radiotap_rfinfo_contextpC_agc_high_pwr_terminated;
+static int hf_radiotap_rfinfo_contextpC_agc_high_pwr_terminator;
+static int hf_radiotap_rfinfo_contextpC_qam_modulation;
+
+static int hf_radiotap_rfinfo_frameformatC;
+static int hf_radiotap_rfinfo_sigbwevmC;
+static int hf_radiotap_rfinfo_legacytypeC;
+
+static int hf_radiotap_rfinfo_contextpd;
+static int hf_radiotap_rfinfo_contextpD_snr_noise_valid;
+static int hf_radiotap_rfinfo_contextpD_pfe_valid;
+static int hf_radiotap_rfinfo_contextpD_pfe_is_cck;
+static int hf_radiotap_rfinfo_contextpD_agc_idle2iqrdy_no_gain_change;
+static int hf_radiotap_rfinfo_contextpD_agc_high_pwr_terminated;
+static int hf_radiotap_rfinfo_contextpD_agc_high_pwr_terminator;
+static int hf_radiotap_rfinfo_contextpD_qam_modulation;
+
+static int hf_radiotap_rfinfo_frameformatD;
+static int hf_radiotap_rfinfo_sigbwevmD;
+static int hf_radiotap_rfinfo_legacytypeD;
+
+/* static int hf_radiotap_rfinfo_tbd; */
 
 /* Fields for both Ethernet and WLAN */
-static int hf_ixveriwave_vw_l4id = -1;
+static int hf_ixveriwave_vw_l4id;
 
 /* Ethernet fields */
-static int hf_ixveriwave_vwf_txf = -1;
-static int hf_ixveriwave_vwf_fcserr = -1;
+static int hf_ixveriwave_vwf_txf;
+static int hf_ixveriwave_vwf_fcserr;
 
-static int hf_ixveriwave_vw_info = -1;
-static int hf_ixveriwave_vw_info_go_no_flow = -1;
-static int hf_ixveriwave_vw_info_go_with_flow = -1;
+static int hf_ixveriwave_vw_info;
+static int hf_ixveriwave_vw_info_go_no_flow;
+static int hf_ixveriwave_vw_info_go_with_flow;
 
 /*veriwave note:  i know the below method seems clunky, but
 they didn't have a item_format at the time to dynamically add the appropriate decode text*/
-static int hf_ixveriwave_vw_info_retry_count = -1;
+static int hf_ixveriwave_vw_info_retry_count;
 
-static int hf_ixveriwave_vw_error = -1;
+static int hf_ixveriwave_vw_error;
 
 /*error flags*/
-static int hf_ixveriwave_vw_error_1_alignment_error = -1;
-static int hf_ixveriwave_vw_error_1_packet_fcs_error = -1;
-static int hf_ixveriwave_vw_error_1_bad_magic_byte_signature = -1;
-static int hf_ixveriwave_vw_error_1_bad_payload_checksum = -1;
-static int hf_ixveriwave_vw_error_1_frame_too_long = -1;
-static int hf_ixveriwave_vw_error_1_ip_checksum_error = -1;
-static int hf_ixveriwave_vw_error_1_l4_checksum_error = -1;
-static int hf_ixveriwave_vw_error_1_id_mismatch = -1;
-static int hf_ixveriwave_vw_error_1_length_error = -1;
-static int hf_ixveriwave_vw_error_1_underflow = -1;
-static int hf_ixveriwave_vw_error_1_late_collision = -1;
-static int hf_ixveriwave_vw_error_1_excessive_collisions = -1;
+static int hf_ixveriwave_vw_error_1_alignment_error;
+static int hf_ixveriwave_vw_error_1_packet_fcs_error;
+static int hf_ixveriwave_vw_error_1_bad_magic_byte_signature;
+static int hf_ixveriwave_vw_error_1_bad_payload_checksum;
+static int hf_ixveriwave_vw_error_1_frame_too_long;
+static int hf_ixveriwave_vw_error_1_ip_checksum_error;
+static int hf_ixveriwave_vw_error_1_l4_checksum_error;
+static int hf_ixveriwave_vw_error_1_id_mismatch;
+static int hf_ixveriwave_vw_error_1_length_error;
+static int hf_ixveriwave_vw_error_1_underflow;
+static int hf_ixveriwave_vw_error_1_late_collision;
+static int hf_ixveriwave_vw_error_1_excessive_collisions;
 
 /* WLAN fields */
-static int hf_radiotap_flags = -1;
-static int hf_radiotap_flags_preamble = -1;
-static int hf_radiotap_flags_wep = -1;
-static int hf_radiotap_flags_ht = -1;
-static int hf_radiotap_flags_vht = -1;
-static int hf_radiotap_flags_short_gi = -1;
-static int hf_radiotap_flags_40mhz = -1;
-static int hf_radiotap_flags_80mhz = -1;
-
-static int hf_radiotap_datarate = -1;
-static int hf_radiotap_mcsindex = -1;
-static int hf_radiotap_nss = -1;
-
-static int hf_radiotap_dbm_anta = -1;
-static int hf_radiotap_dbm_antb = -1;
-static int hf_radiotap_dbm_antc = -1;
-static int hf_radiotap_dbm_antd = -1;
-
-static int hf_radiotap_plcptype = -1;
-
-static int hf_radiotap_vwf_txf = -1;
-static int hf_radiotap_vwf_fcserr = -1;
-static int hf_radiotap_vwf_dcrerr = -1;
-static int hf_radiotap_vwf_retrerr = -1;
-static int hf_radiotap_vwf_enctype = -1;
-
-static int hf_radiotap_vw_ht_length = -1;
-
-static int hf_radiotap_vw_info = -1;
-
-static int hf_radiotap_vw_info_2_ack_withheld_from_frame = -1;
-static int hf_radiotap_vw_info_2_sent_cts_to_self_before_data = -1;
-static int hf_radiotap_vw_info_2_mpdu_of_a_mpdu = -1;
-static int hf_radiotap_vw_info_2_first_mpdu_of_a_mpdu = -1;
-static int hf_radiotap_vw_info_2_last_pdu_of_a_mpdu = -1;
-static int hf_radiotap_vw_info_2_msdu_of_a_msdu = -1;
-static int hf_radiotap_vw_info_2_first_msdu_of_a_msdu = -1;
-static int hf_radiotap_vw_info_2_last_msdu_of_a_msdu = -1;
-
-static int hf_radiotap_vw_errors = -1;
-
-static int hf_radiotap_vw_errors_rx_2_crc16_or_parity_error = -1;
-static int hf_radiotap_vw_errors_rx_2_non_supported_rate_or_service_field = -1;
-static int hf_radiotap_vw_errors_rx_2_short_frame = -1;
-static int hf_radiotap_vw_errors_rx_2_fcs_error = -1;
-static int hf_radiotap_vw_errors_rx_2_l2_de_aggregation_error = -1;
-static int hf_radiotap_vw_errors_rx_2_duplicate_mpdu = -1;
-static int hf_radiotap_vw_errors_rx_2_bad_flow_magic_number = -1;
-static int hf_radiotap_vw_errors_rx_2_flow_payload_checksum_error = -1;
-static int hf_radiotap_vw_errors_rx_2_ip_checksum_error = -1;
-static int hf_radiotap_vw_errors_rx_2_l4_checksum_error = -1;
-
-static int hf_radiotap_vw_errors_tx_2_crc32_error = -1;
-static int hf_radiotap_vw_errors_tx_2_ip_checksum_error = -1;
-static int hf_radiotap_vw_errors_tx_2_ack_timeout = -1;
-static int hf_radiotap_vw_errors_tx_2_cts_timeout = -1;
-static int hf_radiotap_vw_errors_tx_2_last_retry_attempt = -1;
-static int hf_radiotap_vw_errors_tx_2_internal_error = -1;
-
-static int hf_radiotap_vht_mu_mimo_flg = -1;
-static int hf_radiotap_vht_user_pos = -1;
-static int hf_radiotap_vht_su_mimo_flg = -1;
-
-static int hf_radiotap_l1info = -1;
-static int hf_radiotap_l1info_preamble = -1;
-static int hf_radiotap_l1info_rateindex = -1;
-static int hf_radiotap_l1info_ht_mcsindex = -1;
-static int hf_radiotap_l1info_vht_mcsindex = -1;
-static int hf_radiotap_l1info_nss = -1;
-static int hf_radiotap_l1info_transmitted = -1;
-
-static int hf_radiotap_sigbandwidth = -1;
-/* static int hf_radiotap_rssi = -1; */
-static int hf_radiotap_modulation = -1;
-
-static int hf_radiotap_dbm_tx_anta = -1;
-static int hf_radiotap_dbm_tx_antb = -1;
-static int hf_radiotap_dbm_tx_antc = -1;
-static int hf_radiotap_dbm_tx_antd = -1;
-
-static int hf_radiotap_sigbandwidthmask = -1;
-static int hf_radiotap_antennaportenergydetect = -1;
-static int hf_radiotap_tx_antennaselect = -1;
-static int hf_radiotap_tx_stbcselect = -1;
-static int hf_radiotap_mumask = -1;
-
-static int hf_radiotap_l1infoc = -1;
-static int hf_radiotap_vht_ndp_flg = -1;
-
-static int hf_radiotap_plcp_info = -1;
-static int hf_radiotap_plcp_type = -1;
-static int hf_radiotap_plcp_default = -1;
-
-static int hf_radiotap_plcp_signal = -1;
-static int hf_radiotap_plcp_locked_clocks = -1;
-static int hf_radiotap_plcp_modulation = -1;
-static int hf_radiotap_plcp_length_extension = -1;
-static int hf_radiotap_plcp_length = -1;
-static int hf_radiotap_plcp_crc16 = -1;
-
-static int hf_radiotap_ofdm_service = -1;
-
-static int hf_radiotap_ofdm_rate = -1;
-static int hf_radiotap_ofdm_length = -1;
-static int hf_radiotap_ofdm_parity = -1;
-static int hf_radiotap_ofdm_tail = -1;
+static int hf_radiotap_flags;
+static int hf_radiotap_flags_preamble;
+static int hf_radiotap_flags_wep;
+static int hf_radiotap_flags_ht;
+static int hf_radiotap_flags_vht;
+static int hf_radiotap_flags_short_gi;
+static int hf_radiotap_flags_40mhz;
+static int hf_radiotap_flags_80mhz;
+
+static int hf_radiotap_datarate;
+static int hf_radiotap_mcsindex;
+static int hf_radiotap_nss;
+
+static int hf_radiotap_dbm_anta;
+static int hf_radiotap_dbm_antb;
+static int hf_radiotap_dbm_antc;
+static int hf_radiotap_dbm_antd;
+
+static int hf_radiotap_plcptype;
+
+static int hf_radiotap_vwf_txf;
+static int hf_radiotap_vwf_fcserr;
+static int hf_radiotap_vwf_dcrerr;
+static int hf_radiotap_vwf_retrerr;
+static int hf_radiotap_vwf_enctype;
+
+static int hf_radiotap_vw_ht_length;
+
+static int hf_radiotap_vw_info;
+
+static int hf_radiotap_vw_info_2_ack_withheld_from_frame;
+static int hf_radiotap_vw_info_2_sent_cts_to_self_before_data;
+static int hf_radiotap_vw_info_2_mpdu_of_a_mpdu;
+static int hf_radiotap_vw_info_2_first_mpdu_of_a_mpdu;
+static int hf_radiotap_vw_info_2_last_pdu_of_a_mpdu;
+static int hf_radiotap_vw_info_2_msdu_of_a_msdu;
+static int hf_radiotap_vw_info_2_first_msdu_of_a_msdu;
+static int hf_radiotap_vw_info_2_last_msdu_of_a_msdu;
+
+static int hf_radiotap_vw_errors;
+
+static int hf_radiotap_vw_errors_rx_2_crc16_or_parity_error;
+static int hf_radiotap_vw_errors_rx_2_non_supported_rate_or_service_field;
+static int hf_radiotap_vw_errors_rx_2_short_frame;
+static int hf_radiotap_vw_errors_rx_2_fcs_error;
+static int hf_radiotap_vw_errors_rx_2_l2_de_aggregation_error;
+static int hf_radiotap_vw_errors_rx_2_duplicate_mpdu;
+static int hf_radiotap_vw_errors_rx_2_bad_flow_magic_number;
+static int hf_radiotap_vw_errors_rx_2_flow_payload_checksum_error;
+static int hf_radiotap_vw_errors_rx_2_ip_checksum_error;
+static int hf_radiotap_vw_errors_rx_2_l4_checksum_error;
+
+static int hf_radiotap_vw_errors_tx_2_crc32_error;
+static int hf_radiotap_vw_errors_tx_2_ip_checksum_error;
+static int hf_radiotap_vw_errors_tx_2_ack_timeout;
+static int hf_radiotap_vw_errors_tx_2_cts_timeout;
+static int hf_radiotap_vw_errors_tx_2_last_retry_attempt;
+static int hf_radiotap_vw_errors_tx_2_internal_error;
+
+static int hf_radiotap_vht_mu_mimo_flg;
+static int hf_radiotap_vht_user_pos;
+static int hf_radiotap_vht_su_mimo_flg;
+
+static int hf_radiotap_l1info;
+static int hf_radiotap_l1info_preamble;
+static int hf_radiotap_l1info_rateindex;
+static int hf_radiotap_l1info_ht_mcsindex;
+static int hf_radiotap_l1info_vht_mcsindex;
+static int hf_radiotap_l1info_nss;
+static int hf_radiotap_l1info_transmitted;
+
+static int hf_radiotap_sigbandwidth;
+/* static int hf_radiotap_rssi; */
+static int hf_radiotap_modulation;
+
+static int hf_radiotap_dbm_tx_anta;
+static int hf_radiotap_dbm_tx_antb;
+static int hf_radiotap_dbm_tx_antc;
+static int hf_radiotap_dbm_tx_antd;
+
+static int hf_radiotap_sigbandwidthmask;
+static int hf_radiotap_antennaportenergydetect;
+static int hf_radiotap_tx_antennaselect;
+static int hf_radiotap_tx_stbcselect;
+static int hf_radiotap_mumask;
+
+static int hf_radiotap_l1infoc;
+static int hf_radiotap_vht_ndp_flg;
+
+static int hf_radiotap_plcp_info;
+static int hf_radiotap_plcp_type;
+static int hf_radiotap_plcp_default;
+
+static int hf_radiotap_plcp_signal;
+static int hf_radiotap_plcp_locked_clocks;
+static int hf_radiotap_plcp_modulation;
+static int hf_radiotap_plcp_length_extension;
+static int hf_radiotap_plcp_length;
+static int hf_radiotap_plcp_crc16;
+
+static int hf_radiotap_ofdm_service;
+
+static int hf_radiotap_ofdm_rate;
+static int hf_radiotap_ofdm_length;
+static int hf_radiotap_ofdm_parity;
+static int hf_radiotap_ofdm_tail;
 
 /* HT-SIG1 */
-static int hf_radiotap_ht_mcsindex = -1;
-static int hf_radiotap_ht_bw = -1;
-static int hf_radiotap_ht_length = -1;
+static int hf_radiotap_ht_mcsindex;
+static int hf_radiotap_ht_bw;
+static int hf_radiotap_ht_length;
 
 /* HT-SIG2 */
-static int hf_radiotap_ht_smoothing = -1;
-static int hf_radiotap_ht_notsounding = -1;
-static int hf_radiotap_ht_aggregation = -1;
-static int hf_radiotap_ht_stbc = -1;
-static int hf_radiotap_ht_feccoding = -1;
-static int hf_radiotap_ht_short_gi = -1;
-static int hf_radiotap_ht_ness = -1;
-static int hf_radiotap_ht_crc = -1;
-static int hf_radiotap_ht_tail = -1;
+static int hf_radiotap_ht_smoothing;
+static int hf_radiotap_ht_notsounding;
+static int hf_radiotap_ht_aggregation;
+static int hf_radiotap_ht_stbc;
+static int hf_radiotap_ht_feccoding;
+static int hf_radiotap_ht_short_gi;
+static int hf_radiotap_ht_ness;
+static int hf_radiotap_ht_crc;
+static int hf_radiotap_ht_tail;
 
 /* VHT-SIG-A1 */
-static int hf_radiotap_vht_bw = -1;
-static int hf_radiotap_vht_stbc = -1;
-static int hf_radiotap_vht_group_id = -1;
-static int hf_radiotap_vht_su_nsts = -1;
-static int hf_radiotap_vht_su_partial_aid = -1;
-static int hf_radiotap_vht_u0_nsts = -1;
-static int hf_radiotap_vht_u1_nsts = -1;
-static int hf_radiotap_vht_u2_nsts = -1;
-static int hf_radiotap_vht_u3_nsts = -1;
-static int hf_radiotap_vht_txop_ps_not_allowed = -1;
+static int hf_radiotap_vht_bw;
+static int hf_radiotap_vht_stbc;
+static int hf_radiotap_vht_group_id;
+static int hf_radiotap_vht_su_nsts;
+static int hf_radiotap_vht_su_partial_aid;
+static int hf_radiotap_vht_u0_nsts;
+static int hf_radiotap_vht_u1_nsts;
+static int hf_radiotap_vht_u2_nsts;
+static int hf_radiotap_vht_u3_nsts;
+static int hf_radiotap_vht_txop_ps_not_allowed;
 
 /* VHT-SIG-A2 */
-static int hf_radiotap_vht_short_gi = -1;
-static int hf_radiotap_vht_short_gi_nsym_disambig = -1;
-static int hf_radiotap_vht_su_coding_type = -1;
-static int hf_radiotap_vht_u0_coding_type = -1;
-static int hf_radiotap_vht_ldpc_ofdmsymbol = -1;
-static int hf_radiotap_vht_su_mcs = -1;
-static int hf_radiotap_vht_beamformed = -1;
-static int hf_radiotap_vht_u1_coding_type = -1;
-static int hf_radiotap_vht_u2_coding_type = -1;
-static int hf_radiotap_vht_u3_coding_type = -1;
-static int hf_radiotap_vht_crc = -1;
-static int hf_radiotap_vht_tail = -1;
+static int hf_radiotap_vht_short_gi;
+static int hf_radiotap_vht_short_gi_nsym_disambig;
+static int hf_radiotap_vht_su_coding_type;
+static int hf_radiotap_vht_u0_coding_type;
+static int hf_radiotap_vht_ldpc_ofdmsymbol;
+static int hf_radiotap_vht_su_mcs;
+static int hf_radiotap_vht_beamformed;
+static int hf_radiotap_vht_u1_coding_type;
+static int hf_radiotap_vht_u2_coding_type;
+static int hf_radiotap_vht_u3_coding_type;
+static int hf_radiotap_vht_crc;
+static int hf_radiotap_vht_tail;
 
 /* VHT-SIG-B */
-static int hf_radiotap_vht_su_sig_b_length_20_mhz = -1;
-static int hf_radiotap_vht_su_sig_b_length_40_mhz = -1;
-static int hf_radiotap_vht_su_sig_b_length_80_160_mhz = -1;
-static int hf_radiotap_vht_mu_sig_b_length_20_mhz = -1;
-static int hf_radiotap_vht_mu_mcs_20_mhz = -1;
-static int hf_radiotap_vht_mu_sig_b_length_40_mhz = -1;
-static int hf_radiotap_vht_mu_mcs_40_mhz = -1;
-static int hf_radiotap_vht_mu_sig_b_length_80_160_mhz = -1;
-static int hf_radiotap_vht_mu_mcs_80_160_mhz = -1;
-
-static int hf_radiotap_rfid = -1;
-
-static int hf_radiotap_l2_l4_info = -1;
-
-static int hf_radiotap_bssid = -1;
-
-static int hf_radiotap_clientidvalid = -1;
-static int hf_radiotap_bssidvalid = -1;
-static int hf_radiotap_unicastormulticast = -1;
-
-/*static int hf_radiotap_wlantype = -1; */
-
-static int hf_radiotap_tid = -1;
-static int hf_radiotap_ac = -1;
-static int hf_radiotap_l4idvalid = -1;
-static int hf_radiotap_containshtfield = -1;
-static int hf_radiotap_istypeqos = -1;
-static int hf_radiotap_flowvalid = -1;
-
-static int hf_radiotap_payloaddecode = -1;
-
-static int hf_radiotap_vw_info_rx = -1;
-static int hf_radiotap_vw_info_rx_crypto_wep_encoded = -1;
-static int hf_radiotap_vw_info_rx_crypto_tkip_encoded = -1;
-static int hf_radiotap_vw_info_rx_crypto_rx_tkip_tsc_seqskip = -1;
-static int hf_radiotap_vw_info_rx_crypto_rx_ccmp_pn_seqskip = -1;
-static int hf_radiotap_vw_info_rx_tkip_not_full_msdu = -1;
-static int hf_radiotap_vw_info_rx_mpdu_length_gt_mpdu_octets = -1;
-static int hf_radiotap_vw_info_rx_tkip_ccmp_tsc_seqerr = -1;
-static int hf_radiotap_vw_info_rx_ack_withheld_from_frame = -1;
-static int hf_radiotap_vw_info_rx_client_bssid_matched = -1;
-static int hf_radiotap_vw_info_rx_mpdu_of_a_mpdu = -1;
-static int hf_radiotap_vw_info_rx_first_mpdu_of_a_mpdu = -1;
-static int hf_radiotap_vw_info_rx_last_mpdu_of_a_mpdu = -1;
-static int hf_radiotap_vw_info_rx_msdu_of_a_msdu = -1;
-static int hf_radiotap_vw_info_rx_first_msdu_of_a_msdu = -1;
-static int hf_radiotap_vw_info_rx_last_msdu_of_a_msdu = -1;
-static int hf_radiotap_vw_info_rx_layer_1_info_0 = -1;
-static int hf_radiotap_vw_info_rx_layer_1_info_1 = -1;
-static int hf_radiotap_vw_info_rx_vht_frame_received_with_vht_sig_b_length = -1;
-static int hf_radiotap_vw_info_rx_vht_frame_received_without_vht_sig_b_length = -1;
-static int hf_radiotap_vw_info_rx_factory_internal = -1;
+static int hf_radiotap_vht_su_sig_b_length_20_mhz;
+static int hf_radiotap_vht_su_sig_b_length_40_mhz;
+static int hf_radiotap_vht_su_sig_b_length_80_160_mhz;
+static int hf_radiotap_vht_mu_sig_b_length_20_mhz;
+static int hf_radiotap_vht_mu_mcs_20_mhz;
+static int hf_radiotap_vht_mu_sig_b_length_40_mhz;
+static int hf_radiotap_vht_mu_mcs_40_mhz;
+static int hf_radiotap_vht_mu_sig_b_length_80_160_mhz;
+static int hf_radiotap_vht_mu_mcs_80_160_mhz;
+
+static int hf_radiotap_rfid;
+
+static int hf_radiotap_l2_l4_info;
+
+static int hf_radiotap_bssid;
+
+static int hf_radiotap_clientidvalid;
+static int hf_radiotap_bssidvalid;
+static int hf_radiotap_unicastormulticast;
+
+/*static int hf_radiotap_wlantype; */
+
+static int hf_radiotap_tid;
+static int hf_radiotap_ac;
+static int hf_radiotap_l4idvalid;
+static int hf_radiotap_containshtfield;
+static int hf_radiotap_istypeqos;
+static int hf_radiotap_flowvalid;
+
+static int hf_radiotap_payloaddecode;
+
+static int hf_radiotap_vw_info_rx;
+static int hf_radiotap_vw_info_rx_crypto_wep_encoded;
+static int hf_radiotap_vw_info_rx_crypto_tkip_encoded;
+static int hf_radiotap_vw_info_rx_crypto_rx_tkip_tsc_seqskip;
+static int hf_radiotap_vw_info_rx_crypto_rx_ccmp_pn_seqskip;
+static int hf_radiotap_vw_info_rx_tkip_not_full_msdu;
+static int hf_radiotap_vw_info_rx_mpdu_length_gt_mpdu_octets;
+static int hf_radiotap_vw_info_rx_tkip_ccmp_tsc_seqerr;
+static int hf_radiotap_vw_info_rx_ack_withheld_from_frame;
+static int hf_radiotap_vw_info_rx_client_bssid_matched;
+static int hf_radiotap_vw_info_rx_mpdu_of_a_mpdu;
+static int hf_radiotap_vw_info_rx_first_mpdu_of_a_mpdu;
+static int hf_radiotap_vw_info_rx_last_mpdu_of_a_mpdu;
+static int hf_radiotap_vw_info_rx_msdu_of_a_msdu;
+static int hf_radiotap_vw_info_rx_first_msdu_of_a_msdu;
+static int hf_radiotap_vw_info_rx_last_msdu_of_a_msdu;
+static int hf_radiotap_vw_info_rx_layer_1_info_0;
+static int hf_radiotap_vw_info_rx_layer_1_info_1;
+static int hf_radiotap_vw_info_rx_vht_frame_received_with_vht_sig_b_length;
+static int hf_radiotap_vw_info_rx_vht_frame_received_without_vht_sig_b_length;
+static int hf_radiotap_vw_info_rx_factory_internal;
 static int * const radiotap_info_rx_fields[] = {
     &hf_radiotap_vw_info_rx_crypto_wep_encoded,
     &hf_radiotap_vw_info_rx_crypto_tkip_encoded,
@@ -499,22 +499,22 @@ static int * const radiotap_info_rx_fields[] = {
     NULL,
 };
 
-static int hf_radiotap_vw_info_tx = -1;
-static int hf_radiotap_vw_info_tx_crypto_wep_encoded = -1;
-static int hf_radiotap_vw_info_tx_crypto_tkip_encoded = -1;
-static int hf_radiotap_vw_info_tx_crypto_c_bit_error = -1;
-static int hf_radiotap_vw_info_tx_crypto_tkip_not_full_msdu = -1;
-static int hf_radiotap_vw_info_tx_crypto_software_error = -1;
-static int hf_radiotap_vw_info_tx_crypto_short_fault = -1;
-static int hf_radiotap_vw_info_tx_crypto_payload_length_fault = -1;
-static int hf_radiotap_vw_info_tx_sent_rts_before_data = -1;
-static int hf_radiotap_vw_info_tx_sent_cts_to_self_before_data = -1;
-static int hf_radiotap_vw_info_tx_mpdu_of_a_mpdu = -1;
-static int hf_radiotap_vw_info_tx_first_mpdu_of_a_mpdu = -1;
-static int hf_radiotap_vw_info_tx_last_mpdu_of_a_mpdu = -1;
-static int hf_radiotap_vw_info_tx_msdu_of_a_msdu = -1;
-static int hf_radiotap_vw_info_tx_first_msdu_of_a_msdu = -1;
-static int hf_radiotap_vw_info_tx_last_msdu_of_a_msdu = -1;
+static int hf_radiotap_vw_info_tx;
+static int hf_radiotap_vw_info_tx_crypto_wep_encoded;
+static int hf_radiotap_vw_info_tx_crypto_tkip_encoded;
+static int hf_radiotap_vw_info_tx_crypto_c_bit_error;
+static int hf_radiotap_vw_info_tx_crypto_tkip_not_full_msdu;
+static int hf_radiotap_vw_info_tx_crypto_software_error;
+static int hf_radiotap_vw_info_tx_crypto_short_fault;
+static int hf_radiotap_vw_info_tx_crypto_payload_length_fault;
+static int hf_radiotap_vw_info_tx_sent_rts_before_data;
+static int hf_radiotap_vw_info_tx_sent_cts_to_self_before_data;
+static int hf_radiotap_vw_info_tx_mpdu_of_a_mpdu;
+static int hf_radiotap_vw_info_tx_first_mpdu_of_a_mpdu;
+static int hf_radiotap_vw_info_tx_last_mpdu_of_a_mpdu;
+static int hf_radiotap_vw_info_tx_msdu_of_a_msdu;
+static int hf_radiotap_vw_info_tx_first_msdu_of_a_msdu;
+static int hf_radiotap_vw_info_tx_last_msdu_of_a_msdu;
 static int * const radiotap_info_tx_fields[] = {
     &hf_radiotap_vw_info_tx_crypto_wep_encoded,
     &hf_radiotap_vw_info_tx_crypto_tkip_encoded,
@@ -534,56 +534,56 @@ static int * const radiotap_info_tx_fields[] = {
     NULL,
 };
 
-static int hf_radiotap_vw_errors_rx_sig_field_crc_parity_error = -1;
-static int hf_radiotap_vw_errors_rx_non_supported_service_field = -1;
-static int hf_radiotap_vw_errors_rx_frame_length_error = -1;
-static int hf_radiotap_vw_errors_rx_vht_sig_ab_crc_error = -1;
-static int hf_radiotap_vw_errors_rx_crc32_error = -1;
-static int hf_radiotap_vw_errors_rx_l2_de_aggregation_error = -1;
-static int hf_radiotap_vw_errors_rx_duplicate_mpdu = -1;
-static int hf_radiotap_vw_errors_rx_bad_flow_magic_number = -1;
-static int hf_radiotap_vw_errors_rx_bad_flow_payload_checksum = -1;
-static int hf_radiotap_vw_errors_rx_illegal_vht_sig_value = -1;
-static int hf_radiotap_vw_errors_rx_ip_checksum_error = -1;
-static int hf_radiotap_vw_errors_rx_l4_checksum_error = -1;
-static int hf_radiotap_vw_errors_rx_l1_unsupported_feature = -1;
-static int hf_radiotap_vw_errors_rx_l1_packet_termination = -1;
-static int hf_radiotap_vw_errors_rx_internal_error_bit15 = -1;
-static int hf_radiotap_vw_errors_rx_wep_mic_miscompare = -1;
-static int hf_radiotap_vw_errors_rx_wep_tkip_rate_exceeded = -1;
-static int hf_radiotap_vw_errors_rx_crypto_short_error = -1;
-static int hf_radiotap_vw_errors_rx_extiv_fault_a = -1;
-static int hf_radiotap_vw_errors_rx_extiv_fault_b = -1;
-static int hf_radiotap_vw_errors_rx_internal_error_bit21 = -1;
-static int hf_radiotap_vw_errors_rx_protected_fault_a = -1;
-static int hf_radiotap_vw_errors_rx_rx_mac_crypto_incompatibility = -1;
-static int hf_radiotap_vw_errors_rx_factory_debug = -1;
-static int hf_radiotap_vw_errors_rx_internal_error_bit32 = -1;
-
-static int hf_radiotap_vw_errors_tx_packet_fcs_error = -1;
-static int hf_radiotap_vw_errors_tx_ip_checksum_error = -1;
-
-static int hf_radiotap_vw_tx_retrycount = -1;
-static int hf_radiotap_vw_tx_factorydebug = -1;
-
-static gint ett_radiotap_info = -1;
-static gint ett_radiotap_errors = -1;
-static gint ett_radiotap_times = -1;
-static gint ett_radiotap_layer1 = -1;
-static gint ett_radiotap_layer2to4 = -1;
-static gint ett_radiotap_rf = -1;
-static gint ett_radiotap_plcp = -1;
-static gint ett_radiotap_infoc = -1;
-static gint ett_radiotap_contextp = -1;
-static gint ett_rf_info = -1;
-
-static gint ett_commontap = -1;
-static gint ett_commontap_times = -1;
-static gint ett_ethernettap_info = -1;
-static gint ett_ethernettap_error = -1;
-static gint ett_ethernettap_flags = -1;
-
-static gint ett_radiotap_flags = -1;
+static int hf_radiotap_vw_errors_rx_sig_field_crc_parity_error;
+static int hf_radiotap_vw_errors_rx_non_supported_service_field;
+static int hf_radiotap_vw_errors_rx_frame_length_error;
+static int hf_radiotap_vw_errors_rx_vht_sig_ab_crc_error;
+static int hf_radiotap_vw_errors_rx_crc32_error;
+static int hf_radiotap_vw_errors_rx_l2_de_aggregation_error;
+static int hf_radiotap_vw_errors_rx_duplicate_mpdu;
+static int hf_radiotap_vw_errors_rx_bad_flow_magic_number;
+static int hf_radiotap_vw_errors_rx_bad_flow_payload_checksum;
+static int hf_radiotap_vw_errors_rx_illegal_vht_sig_value;
+static int hf_radiotap_vw_errors_rx_ip_checksum_error;
+static int hf_radiotap_vw_errors_rx_l4_checksum_error;
+static int hf_radiotap_vw_errors_rx_l1_unsupported_feature;
+static int hf_radiotap_vw_errors_rx_l1_packet_termination;
+static int hf_radiotap_vw_errors_rx_internal_error_bit15;
+static int hf_radiotap_vw_errors_rx_wep_mic_miscompare;
+static int hf_radiotap_vw_errors_rx_wep_tkip_rate_exceeded;
+static int hf_radiotap_vw_errors_rx_crypto_short_error;
+static int hf_radiotap_vw_errors_rx_extiv_fault_a;
+static int hf_radiotap_vw_errors_rx_extiv_fault_b;
+static int hf_radiotap_vw_errors_rx_internal_error_bit21;
+static int hf_radiotap_vw_errors_rx_protected_fault_a;
+static int hf_radiotap_vw_errors_rx_rx_mac_crypto_incompatibility;
+static int hf_radiotap_vw_errors_rx_factory_debug;
+static int hf_radiotap_vw_errors_rx_internal_error_bit32;
+
+static int hf_radiotap_vw_errors_tx_packet_fcs_error;
+static int hf_radiotap_vw_errors_tx_ip_checksum_error;
+
+static int hf_radiotap_vw_tx_retrycount;
+static int hf_radiotap_vw_tx_factorydebug;
+
+static gint ett_radiotap_info;
+static gint ett_radiotap_errors;
+static gint ett_radiotap_times;
+static gint ett_radiotap_layer1;
+static gint ett_radiotap_layer2to4;
+static gint ett_radiotap_rf;
+static gint ett_radiotap_plcp;
+static gint ett_radiotap_infoc;
+static gint ett_radiotap_contextp;
+static gint ett_rf_info;
+
+static gint ett_commontap;
+static gint ett_commontap_times;
+static gint ett_ethernettap_info;
+static gint ett_ethernettap_error;
+static gint ett_ethernettap_flags;
+
+static gint ett_radiotap_flags;
 
 static dissector_handle_t ieee80211_radio_handle;
 
diff --git a/epan/dissectors/packet-j1939.c b/epan/dissectors/packet-j1939.c
index 8e27dfe893..4fae0ea40e 100644
--- a/epan/dissectors/packet-j1939.c
+++ b/epan/dissectors/packet-j1939.c
@@ -24,23 +24,23 @@ void proto_reg_handoff_j1939(void);
 
 static dissector_handle_t j1939_handle;
 
-static int proto_j1939 = -1;
-
-static int hf_j1939_can_id = -1;
-static int hf_j1939_priority = -1;
-static int hf_j1939_pgn = -1;
-static int hf_j1939_data_page = -1;
-static int hf_j1939_extended_data_page = -1;
-static int hf_j1939_pdu_format = -1;
-static int hf_j1939_pdu_specific = -1;
-static int hf_j1939_src_addr = -1;
-static int hf_j1939_dst_addr = -1;
-static int hf_j1939_group_extension = -1;
-static int hf_j1939_data = -1;
-
-static gint ett_j1939 = -1;
-static gint ett_j1939_can = -1;
-static gint ett_j1939_message = -1;
+static int proto_j1939;
+
+static int hf_j1939_can_id;
+static int hf_j1939_priority;
+static int hf_j1939_pgn;
+static int hf_j1939_data_page;
+static int hf_j1939_extended_data_page;
+static int hf_j1939_pdu_format;
+static int hf_j1939_pdu_specific;
+static int hf_j1939_src_addr;
+static int hf_j1939_dst_addr;
+static int hf_j1939_group_extension;
+static int hf_j1939_data;
+
+static gint ett_j1939;
+static gint ett_j1939_can;
+static gint ett_j1939_message;
 
 static int j1939_address_type = -1;
 static dissector_table_t   subdissector_pgn_table;
diff --git a/epan/dissectors/packet-jdwp.c b/epan/dissectors/packet-jdwp.c
index 073788207f..e669a62042 100644
--- a/epan/dissectors/packet-jdwp.c
+++ b/epan/dissectors/packet-jdwp.c
@@ -65,38 +65,38 @@ static dissector_handle_t jdwp_handle;
 #define COMMAND_SET_MODULEREFERENCE 18
 #define COMMAND_SET_EVENT 64
 
-static int proto_jdwp = -1;
-
-static int hf_jdwp_type = -1;
-static int hf_jdwp_length = -1;
-static int hf_jdwp_id = -1;
-static int hf_jdwp_flags = -1;
-static int hf_jdwp_commandset = -1;
-static int hf_jdwp_commandset_virtualmachine = -1;
-static int hf_jdwp_commandset_referencetype = -1;
-static int hf_jdwp_commandset_classtype = -1;
-static int hf_jdwp_commandset_arraytype = -1;
-static int hf_jdwp_commandset_interfacetype = -1;
-static int hf_jdwp_commandset_method = -1;
-static int hf_jdwp_commandset_field = -1;
-static int hf_jdwp_commandset_objectreference = -1;
-static int hf_jdwp_commandset_stringreference = -1;
-static int hf_jdwp_commandset_threadreference = -1;
-static int hf_jdwp_commandset_threadgroupreference = -1;
-static int hf_jdwp_commandset_arrayreference = -1;
-static int hf_jdwp_commandset_classloaderreference = -1;
-static int hf_jdwp_commandset_eventrequest = -1;
-static int hf_jdwp_commandset_stackframe = -1;
-static int hf_jdwp_commandset_classobjectreference = -1;
-static int hf_jdwp_commandset_modulereference = -1;
-static int hf_jdwp_commandset_event = -1;
-static int hf_jdwp_errorcode = -1;
-static int hf_jdwp_data = -1;
-
-static gint ett_jdwp = -1;
-
-static expert_field ei_jdwp_hlen_invalid  = EI_INIT;
-static expert_field ei_jdwp_flags_invalid  = EI_INIT;
+static int proto_jdwp;
+
+static int hf_jdwp_type;
+static int hf_jdwp_length;
+static int hf_jdwp_id;
+static int hf_jdwp_flags;
+static int hf_jdwp_commandset;
+static int hf_jdwp_commandset_virtualmachine;
+static int hf_jdwp_commandset_referencetype;
+static int hf_jdwp_commandset_classtype;
+static int hf_jdwp_commandset_arraytype;
+static int hf_jdwp_commandset_interfacetype;
+static int hf_jdwp_commandset_method;
+static int hf_jdwp_commandset_field;
+static int hf_jdwp_commandset_objectreference;
+static int hf_jdwp_commandset_stringreference;
+static int hf_jdwp_commandset_threadreference;
+static int hf_jdwp_commandset_threadgroupreference;
+static int hf_jdwp_commandset_arrayreference;
+static int hf_jdwp_commandset_classloaderreference;
+static int hf_jdwp_commandset_eventrequest;
+static int hf_jdwp_commandset_stackframe;
+static int hf_jdwp_commandset_classobjectreference;
+static int hf_jdwp_commandset_modulereference;
+static int hf_jdwp_commandset_event;
+static int hf_jdwp_errorcode;
+static int hf_jdwp_data;
+
+static gint ett_jdwp;
+
+static expert_field ei_jdwp_hlen_invalid;
+static expert_field ei_jdwp_flags_invalid;
 
 // contains the command set names
 static const value_string commandsetnames[] = {
diff --git a/epan/dissectors/packet-jmirror.c b/epan/dissectors/packet-jmirror.c
index 9f4acca7a5..60da846724 100644
--- a/epan/dissectors/packet-jmirror.c
+++ b/epan/dissectors/packet-jmirror.c
@@ -30,10 +30,10 @@ static dissector_handle_t jmirror_handle;
  */
 
 /* Jmirror protocol variables */
-static int proto_jmirror = -1;
-static int hf_jmirror_mid = -1;
-static int hf_jmirror_sid = -1;
-static gint ett_jmirror = -1;
+static int proto_jmirror;
+static int hf_jmirror_mid;
+static int hf_jmirror_sid;
+static gint ett_jmirror;
 
 /* Handles which point to the packet dissectors */
 static dissector_handle_t ipv4_handle;
diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c
index dd939233ed..57639c0269 100644
--- a/epan/dissectors/packet-jpeg.c
+++ b/epan/dissectors/packet-jpeg.c
@@ -48,29 +48,29 @@ static const range_string jpeg_type_rvals [] = {
     {  0,   0,  NULL}
 };
 
-static int proto_jpeg = -1;
+static int proto_jpeg;
 
-static int hf_rtp_jpeg_main_hdr = -1;
-static int hf_rtp_jpeg_main_hdr_height = -1;
-static int hf_rtp_jpeg_main_hdr_offs = -1;
-static int hf_rtp_jpeg_main_hdr_q = -1;
-static int hf_rtp_jpeg_main_hdr_ts = -1;
-static int hf_rtp_jpeg_main_hdr_type = -1;
-static int hf_rtp_jpeg_main_hdr_width = -1;
-static int hf_rtp_jpeg_payload = -1;
-static int hf_rtp_jpeg_qtable_hdr = -1;
-static int hf_rtp_jpeg_qtable_hdr_data = -1;
-static int hf_rtp_jpeg_qtable_hdr_length = -1;
-static int hf_rtp_jpeg_qtable_hdr_mbz = -1;
-static int hf_rtp_jpeg_qtable_hdr_prec = -1;
-static int hf_rtp_jpeg_restart_hdr = -1;
-static int hf_rtp_jpeg_restart_hdr_count = -1;
-static int hf_rtp_jpeg_restart_hdr_f = -1;
-static int hf_rtp_jpeg_restart_hdr_interval = -1;
-static int hf_rtp_jpeg_restart_hdr_l = -1;
+static int hf_rtp_jpeg_main_hdr;
+static int hf_rtp_jpeg_main_hdr_height;
+static int hf_rtp_jpeg_main_hdr_offs;
+static int hf_rtp_jpeg_main_hdr_q;
+static int hf_rtp_jpeg_main_hdr_ts;
+static int hf_rtp_jpeg_main_hdr_type;
+static int hf_rtp_jpeg_main_hdr_width;
+static int hf_rtp_jpeg_payload;
+static int hf_rtp_jpeg_qtable_hdr;
+static int hf_rtp_jpeg_qtable_hdr_data;
+static int hf_rtp_jpeg_qtable_hdr_length;
+static int hf_rtp_jpeg_qtable_hdr_mbz;
+static int hf_rtp_jpeg_qtable_hdr_prec;
+static int hf_rtp_jpeg_restart_hdr;
+static int hf_rtp_jpeg_restart_hdr_count;
+static int hf_rtp_jpeg_restart_hdr_f;
+static int hf_rtp_jpeg_restart_hdr_interval;
+static int hf_rtp_jpeg_restart_hdr_l;
 
 /* JPEG fields defining a sub tree */
-static gint ett_jpeg = -1;
+static gint ett_jpeg;
 
 static int
 dissect_jpeg( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ )
diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c
index a14c4e86bb..73fbfbdd1e 100644
--- a/epan/dissectors/packet-json.c
+++ b/epan/dissectors/packet-json.c
@@ -36,49 +36,49 @@ static const char* get_json_string(wmem_allocator_t *scope, tvbparse_elem_t *tok
 static dissector_handle_t json_handle;
 static dissector_handle_t json_file_handle;
 
-static int proto_json = -1;
+static int proto_json;
 
 //Used to get AC DR proto data
-static int proto_acdr = -1;
-
-static int hf_json_array = -1;
-static int hf_json_array_compact = -1;
-static int hf_json_array_item_compact = -1;
-static int hf_json_array_raw = -1;
-static int hf_json_array_item_raw = -1;
-static int hf_json_binary_data = -1;
-static int hf_json_ignored_leading_bytes = -1;
-static int hf_json_key = -1;
-static int hf_json_member = -1;
-static int hf_json_member_compact = -1;
-static int hf_json_member_raw = -1;
-static int hf_json_member_with_value = -1;
-static int hf_json_object = -1;
-static int hf_json_object_compact = -1;
-static int hf_json_object_raw = -1;
-static int hf_json_path = -1;
-static int hf_json_path_with_value = -1;
-static int hf_json_value_false = -1;
-static int hf_json_value_nan = -1;
-static int hf_json_value_null = -1;
-static int hf_json_value_number = -1;
-static int hf_json_value_string = -1;
-static int hf_json_value_true = -1;
-
-static gint ett_json = -1;
-static gint ett_json_array = -1;
-static gint ett_json_object = -1;
-static gint ett_json_member = -1;
+static int proto_acdr;
+
+static int hf_json_array;
+static int hf_json_array_compact;
+static int hf_json_array_item_compact;
+static int hf_json_array_raw;
+static int hf_json_array_item_raw;
+static int hf_json_binary_data;
+static int hf_json_ignored_leading_bytes;
+static int hf_json_key;
+static int hf_json_member;
+static int hf_json_member_compact;
+static int hf_json_member_raw;
+static int hf_json_member_with_value;
+static int hf_json_object;
+static int hf_json_object_compact;
+static int hf_json_object_raw;
+static int hf_json_path;
+static int hf_json_path_with_value;
+static int hf_json_value_false;
+static int hf_json_value_nan;
+static int hf_json_value_null;
+static int hf_json_value_number;
+static int hf_json_value_string;
+static int hf_json_value_true;
+
+static gint ett_json;
+static gint ett_json_array;
+static gint ett_json_object;
+static gint ett_json_member;
 /* Define the trees for json compact form */
-static gint ett_json_compact = -1;
-static gint ett_json_array_compact = -1;
-static gint ett_json_object_compact = -1;
-static gint ett_json_member_compact = -1;
+static gint ett_json_compact;
+static gint ett_json_array_compact;
+static gint ett_json_object_compact;
+static gint ett_json_member_compact;
 /* Define the trees for json raw form */
-static gint ett_json_raw = -1;
-static gint ett_json_array_raw = -1;
-static gint ett_json_object_raw = -1;
-static gint ett_json_member_raw = -1;
+static gint ett_json_raw;
+static gint ett_json_array_raw;
+static gint ett_json_object_raw;
+static gint ett_json_member_raw;
 
 /* Preferences */
 static gboolean json_compact = FALSE;
diff --git a/epan/dissectors/packet-json_3gpp.c b/epan/dissectors/packet-json_3gpp.c
index 3a859b2899..c99e7f7750 100644
--- a/epan/dissectors/packet-json_3gpp.c
+++ b/epan/dissectors/packet-json_3gpp.c
@@ -34,147 +34,147 @@
 
 void proto_register_json_3gpp(void);
 
-static int proto_json_3gpp = -1;
-
-static gint ett_json_base64decoded_eps_ie = -1;
-static gint ett_json_base64decoded_nas5g_ie = -1;
-static gint ett_json_3gpp_data = -1;
-
-static expert_field ei_json_3gpp_data_not_decoded = EI_INIT;
-static expert_field ei_json_3gpp_encoding_error = EI_INIT;
-
-static int hf_json_3gpp_binary_data = -1;
-
-static int hf_json_3gpp_ueepspdnconnection = -1;
-static int hf_json_3gpp_bearerlevelqos = -1;
-static int hf_json_3gpp_epsbearersetup = -1;
-static int hf_json_3gpp_forwardingbearercontexts = -1;
-static int hf_json_3gpp_forwardingfteid = -1;
-static int hf_json_3gpp_pgwnodename = -1;
-static int hf_json_3gpp_pgws8cfteid = -1;
-static int hf_json_3gpp_pgws8ufteid = -1;
-static int hf_json_3gpp_qosrules = -1;
-static int hf_json_3gpp_qosflowdescription = -1;
-static int hf_json_3gpp_suppFeat = -1;
-
-
-static int hf_json_3gpp_suppfeat = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_am_1_slicesupport = -1;
-static int hf_json_3gpp_suppfeat_npcf_am_2_pendingtransaction = -1;
-static int hf_json_3gpp_suppfeat_npcf_am_3_ueambrauthorization = -1;
-static int hf_json_3gpp_suppfeat_npcf_am_4_dnnreplacementcontrol = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_am_5_multipleaccesstypes = -1;
-static int hf_json_3gpp_suppfeat_npcf_am_6_wirelinewirelessconvergence = -1;
-static int hf_json_3gpp_suppfeat_npcf_am_7_immediatereport = -1;
-static int hf_json_3gpp_suppfeat_npcf_am_8_es3xx = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_am_9_ueslicembrauthorization = -1;
-static int hf_json_3gpp_suppfeat_npcf_am_10_aminfluence = -1;
-static int hf_json_3gpp_suppfeat_npcf_am_11_enena = -1;
-static int hf_json_3gpp_suppfeat_npcf_am_12_targetnssai = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_am_13_5gaccessstratumtime = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_1_tsc = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_2_resshare = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_3_3gpppsdataoff = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_4_adc = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_5_umc = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_6_netloc = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_7_rannascause = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_8_provafsignalflow = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_9_pcscfrestorationenhancement = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_10_pra = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_11_ruleversioning = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_12_sponsoredconnectivity = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_13_ransupportinfo = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_14_policyupdatewhenuesuspends = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_15_accesstypecondition = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_16_multiipv6addrprefix = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_17_sessionruleerrorhandling = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_18_af_charging_identifier = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_19_atsss = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_20_pendingtransaction = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_21_urllc = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_22_macaddressrange = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_23_wwc = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_24_qosmonitoring = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_25_authorizationwithrequiredqos = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_26_enhancedbackgrounddatatransfer = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_27_dn_authorization = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_28_pdusessionrelcause = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_29_samepcf = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_30_adcmultiredirection = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_31_respbasedsessionrel = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_32_timesensitivenetworking = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_33_emdbv = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_34_dnnselectionmode = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_35_epsfallbackreport = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_36_policydecisionerrorhandling = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_37_ddneventpolicycontrol = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_38_reallocationofcredit = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_39_bdtpolicyrenegotiation = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_40_extpolicydecisionerrorhandling = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_41_immediatetermination = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_42_aggregateduelocchanges = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_43_es3xx = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_44_groupidlistchange = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_45_disableuenotification = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_46_offlinechonly = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_47_dual_connectivity_redundant_up_paths = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_48_ddneventpolicycontrol2 = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_49_vplmn_qos_control = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_50_2g3giwk = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_51_timesensitivecommunication = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_52_enedge = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_53_satbackhaulcategorychg = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_54_chfsetsupport = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_55_enatsss = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_56_mpsfordts = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_57_routinginforemoval = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_58_epra = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_59_aminfluence = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_60_pvssupport = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_61_enena = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_62_biumr = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_63_easipreplacement = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_64_exposuretoeas = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_65_simultconnectivity = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_66_sgwrest = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_67_releasetoreactivate = -1;
-static int hf_json_3gpp_suppfeat_npcf_sm_68_easdiscovery = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_sm_69_accnetchargid_string = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_ue_1_pendingtransaction = -1;
-static int hf_json_3gpp_suppfeat_npcf_ue_2_plmnchange = -1;
-static int hf_json_3gpp_suppfeat_npcf_ue_3_connectivitystatechange = -1;
-static int hf_json_3gpp_suppfeat_npcf_ue_4_v2x = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_ue_5_groupidlistchange = -1;
-static int hf_json_3gpp_suppfeat_npcf_ue_6_immediatereport = -1;
-static int hf_json_3gpp_suppfeat_npcf_ue_7_errorresponse = -1;
-static int hf_json_3gpp_suppfeat_npcf_ue_8_es3xx = -1;
-
-static int hf_json_3gpp_suppfeat_npcf_ue_9_prose = -1;
+static int proto_json_3gpp;
+
+static gint ett_json_base64decoded_eps_ie;
+static gint ett_json_base64decoded_nas5g_ie;
+static gint ett_json_3gpp_data;
+
+static expert_field ei_json_3gpp_data_not_decoded;
+static expert_field ei_json_3gpp_encoding_error;
+
+static int hf_json_3gpp_binary_data;
+
+static int hf_json_3gpp_ueepspdnconnection;
+static int hf_json_3gpp_bearerlevelqos;
+static int hf_json_3gpp_epsbearersetup;
+static int hf_json_3gpp_forwardingbearercontexts;
+static int hf_json_3gpp_forwardingfteid;
+static int hf_json_3gpp_pgwnodename;
+static int hf_json_3gpp_pgws8cfteid;
+static int hf_json_3gpp_pgws8ufteid;
+static int hf_json_3gpp_qosrules;
+static int hf_json_3gpp_qosflowdescription;
+static int hf_json_3gpp_suppFeat;
+
+
+static int hf_json_3gpp_suppfeat;
+
+static int hf_json_3gpp_suppfeat_npcf_am_1_slicesupport;
+static int hf_json_3gpp_suppfeat_npcf_am_2_pendingtransaction;
+static int hf_json_3gpp_suppfeat_npcf_am_3_ueambrauthorization;
+static int hf_json_3gpp_suppfeat_npcf_am_4_dnnreplacementcontrol;
+
+static int hf_json_3gpp_suppfeat_npcf_am_5_multipleaccesstypes;
+static int hf_json_3gpp_suppfeat_npcf_am_6_wirelinewirelessconvergence;
+static int hf_json_3gpp_suppfeat_npcf_am_7_immediatereport;
+static int hf_json_3gpp_suppfeat_npcf_am_8_es3xx;
+
+static int hf_json_3gpp_suppfeat_npcf_am_9_ueslicembrauthorization;
+static int hf_json_3gpp_suppfeat_npcf_am_10_aminfluence;
+static int hf_json_3gpp_suppfeat_npcf_am_11_enena;
+static int hf_json_3gpp_suppfeat_npcf_am_12_targetnssai;
+
+static int hf_json_3gpp_suppfeat_npcf_am_13_5gaccessstratumtime;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_1_tsc;
+static int hf_json_3gpp_suppfeat_npcf_sm_2_resshare;
+static int hf_json_3gpp_suppfeat_npcf_sm_3_3gpppsdataoff;
+static int hf_json_3gpp_suppfeat_npcf_sm_4_adc;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_5_umc;
+static int hf_json_3gpp_suppfeat_npcf_sm_6_netloc;
+static int hf_json_3gpp_suppfeat_npcf_sm_7_rannascause;
+static int hf_json_3gpp_suppfeat_npcf_sm_8_provafsignalflow;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_9_pcscfrestorationenhancement;
+static int hf_json_3gpp_suppfeat_npcf_sm_10_pra;
+static int hf_json_3gpp_suppfeat_npcf_sm_11_ruleversioning;
+static int hf_json_3gpp_suppfeat_npcf_sm_12_sponsoredconnectivity;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_13_ransupportinfo;
+static int hf_json_3gpp_suppfeat_npcf_sm_14_policyupdatewhenuesuspends;
+static int hf_json_3gpp_suppfeat_npcf_sm_15_accesstypecondition;
+static int hf_json_3gpp_suppfeat_npcf_sm_16_multiipv6addrprefix;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_17_sessionruleerrorhandling;
+static int hf_json_3gpp_suppfeat_npcf_sm_18_af_charging_identifier;
+static int hf_json_3gpp_suppfeat_npcf_sm_19_atsss;
+static int hf_json_3gpp_suppfeat_npcf_sm_20_pendingtransaction;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_21_urllc;
+static int hf_json_3gpp_suppfeat_npcf_sm_22_macaddressrange;
+static int hf_json_3gpp_suppfeat_npcf_sm_23_wwc;
+static int hf_json_3gpp_suppfeat_npcf_sm_24_qosmonitoring;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_25_authorizationwithrequiredqos;
+static int hf_json_3gpp_suppfeat_npcf_sm_26_enhancedbackgrounddatatransfer;
+static int hf_json_3gpp_suppfeat_npcf_sm_27_dn_authorization;
+static int hf_json_3gpp_suppfeat_npcf_sm_28_pdusessionrelcause;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_29_samepcf;
+static int hf_json_3gpp_suppfeat_npcf_sm_30_adcmultiredirection;
+static int hf_json_3gpp_suppfeat_npcf_sm_31_respbasedsessionrel;
+static int hf_json_3gpp_suppfeat_npcf_sm_32_timesensitivenetworking;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_33_emdbv;
+static int hf_json_3gpp_suppfeat_npcf_sm_34_dnnselectionmode;
+static int hf_json_3gpp_suppfeat_npcf_sm_35_epsfallbackreport;
+static int hf_json_3gpp_suppfeat_npcf_sm_36_policydecisionerrorhandling;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_37_ddneventpolicycontrol;
+static int hf_json_3gpp_suppfeat_npcf_sm_38_reallocationofcredit;
+static int hf_json_3gpp_suppfeat_npcf_sm_39_bdtpolicyrenegotiation;
+static int hf_json_3gpp_suppfeat_npcf_sm_40_extpolicydecisionerrorhandling;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_41_immediatetermination;
+static int hf_json_3gpp_suppfeat_npcf_sm_42_aggregateduelocchanges;
+static int hf_json_3gpp_suppfeat_npcf_sm_43_es3xx;
+static int hf_json_3gpp_suppfeat_npcf_sm_44_groupidlistchange;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_45_disableuenotification;
+static int hf_json_3gpp_suppfeat_npcf_sm_46_offlinechonly;
+static int hf_json_3gpp_suppfeat_npcf_sm_47_dual_connectivity_redundant_up_paths;
+static int hf_json_3gpp_suppfeat_npcf_sm_48_ddneventpolicycontrol2;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_49_vplmn_qos_control;
+static int hf_json_3gpp_suppfeat_npcf_sm_50_2g3giwk;
+static int hf_json_3gpp_suppfeat_npcf_sm_51_timesensitivecommunication;
+static int hf_json_3gpp_suppfeat_npcf_sm_52_enedge;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_53_satbackhaulcategorychg;
+static int hf_json_3gpp_suppfeat_npcf_sm_54_chfsetsupport;
+static int hf_json_3gpp_suppfeat_npcf_sm_55_enatsss;
+static int hf_json_3gpp_suppfeat_npcf_sm_56_mpsfordts;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_57_routinginforemoval;
+static int hf_json_3gpp_suppfeat_npcf_sm_58_epra;
+static int hf_json_3gpp_suppfeat_npcf_sm_59_aminfluence;
+static int hf_json_3gpp_suppfeat_npcf_sm_60_pvssupport;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_61_enena;
+static int hf_json_3gpp_suppfeat_npcf_sm_62_biumr;
+static int hf_json_3gpp_suppfeat_npcf_sm_63_easipreplacement;
+static int hf_json_3gpp_suppfeat_npcf_sm_64_exposuretoeas;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_65_simultconnectivity;
+static int hf_json_3gpp_suppfeat_npcf_sm_66_sgwrest;
+static int hf_json_3gpp_suppfeat_npcf_sm_67_releasetoreactivate;
+static int hf_json_3gpp_suppfeat_npcf_sm_68_easdiscovery;
+
+static int hf_json_3gpp_suppfeat_npcf_sm_69_accnetchargid_string;
+
+static int hf_json_3gpp_suppfeat_npcf_ue_1_pendingtransaction;
+static int hf_json_3gpp_suppfeat_npcf_ue_2_plmnchange;
+static int hf_json_3gpp_suppfeat_npcf_ue_3_connectivitystatechange;
+static int hf_json_3gpp_suppfeat_npcf_ue_4_v2x;
+
+static int hf_json_3gpp_suppfeat_npcf_ue_5_groupidlistchange;
+static int hf_json_3gpp_suppfeat_npcf_ue_6_immediatereport;
+static int hf_json_3gpp_suppfeat_npcf_ue_7_errorresponse;
+static int hf_json_3gpp_suppfeat_npcf_ue_8_es3xx;
+
+static int hf_json_3gpp_suppfeat_npcf_ue_9_prose;
 
 #define NPCF_AM_POLICY_CONTROL "/npcf-am-policy-control/v1/policies"
 #define NPCF_SM_POLICY_CONTROL "/npcf-smpolicycontrol/v1/sm-policies" /* inconsistency naming from 3gpp */
diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c
index c650ee47a8..2766f9f3f8 100644
--- a/epan/dissectors/packet-juniper.c
+++ b/epan/dissectors/packet-juniper.c
@@ -361,61 +361,61 @@ static const value_string juniper_ifle_vals[] = {
 };
 
 
-static int proto_juniper = -1;
-
-static int hf_juniper_magic = -1;
-static int hf_juniper_direction = -1;
-static int hf_juniper_l2hdr_presence = -1;
-static int hf_juniper_ext_total_len = -1;
-static int hf_juniper_cookie_len = -1;
-static int hf_juniper_atm1_cookie = -1;
-static int hf_juniper_atm2_cookie = -1;
-static int hf_juniper_mlpic_cookie = -1;
-static int hf_juniper_lspic_cookie = -1;
-static int hf_juniper_aspic_cookie = -1;
-static int hf_juniper_vlan = -1;
-static int hf_juniper_proto = -1;
-static int hf_juniper_payload_type = -1;
-static int hf_juniper_encap_type = -1;
-static int hf_juniper_ext_ifd = -1;
-static int hf_juniper_ext_ifl = -1;
-static int hf_juniper_ext_unit = -1;
-static int hf_juniper_ext_ifmt = -1;
-static int hf_juniper_ext_ifle = -1;
-static int hf_juniper_ext_ttp_ifmt = -1;
-static int hf_juniper_ext_ttp_ifle = -1;
-static int hf_juniper_unknown_data = -1;
-
-static expert_field ei_juniper_no_magic = EI_INIT;
-static expert_field ei_juniper_vn_incorrect_format = EI_INIT;
-
-static int hf_juniper_vn_host_ip = -1;
-static int hf_juniper_vn_src = -1;
-static int hf_juniper_vn_dst = -1;
-static int hf_juniper_vn_flags = -1;
-static int hf_juniper_vn_flag_alert = -1;
-static int hf_juniper_vn_flag_drop = -1;
-static int hf_juniper_vn_flag_deny = -1;
-static int hf_juniper_vn_flag_log = -1;
-static int hf_juniper_vn_flag_pass = -1;
-static int hf_juniper_vn_flag_reject = -1;
-static int hf_juniper_vn_flag_mirror = -1;
-static int hf_juniper_vn_flag_direction = -1;
-
-static int hf_juniper_st_eth_dst = -1;
-static int hf_juniper_st_eth_src = -1;
-static int hf_juniper_st_eth_type = -1;
-static int hf_juniper_st_ip_len = -1;
-static int hf_juniper_st_ip_proto = -1;
-static int hf_juniper_st_esp_spi = -1;
-static int hf_juniper_st_esp_seq = -1;
-
-static gint ett_juniper = -1;
-static gint ett_juniper_vn_flags = -1;
-static gint ett_juniper_st_eth = -1;
-static gint ett_juniper_st_ip = -1;
-static gint ett_juniper_st_esp = -1;
-static gint ett_juniper_st_unknown = -1;
+static int proto_juniper;
+
+static int hf_juniper_magic;
+static int hf_juniper_direction;
+static int hf_juniper_l2hdr_presence;
+static int hf_juniper_ext_total_len;
+static int hf_juniper_cookie_len;
+static int hf_juniper_atm1_cookie;
+static int hf_juniper_atm2_cookie;
+static int hf_juniper_mlpic_cookie;
+static int hf_juniper_lspic_cookie;
+static int hf_juniper_aspic_cookie;
+static int hf_juniper_vlan;
+static int hf_juniper_proto;
+static int hf_juniper_payload_type;
+static int hf_juniper_encap_type;
+static int hf_juniper_ext_ifd;
+static int hf_juniper_ext_ifl;
+static int hf_juniper_ext_unit;
+static int hf_juniper_ext_ifmt;
+static int hf_juniper_ext_ifle;
+static int hf_juniper_ext_ttp_ifmt;
+static int hf_juniper_ext_ttp_ifle;
+static int hf_juniper_unknown_data;
+
+static expert_field ei_juniper_no_magic;
+static expert_field ei_juniper_vn_incorrect_format;
+
+static int hf_juniper_vn_host_ip;
+static int hf_juniper_vn_src;
+static int hf_juniper_vn_dst;
+static int hf_juniper_vn_flags;
+static int hf_juniper_vn_flag_alert;
+static int hf_juniper_vn_flag_drop;
+static int hf_juniper_vn_flag_deny;
+static int hf_juniper_vn_flag_log;
+static int hf_juniper_vn_flag_pass;
+static int hf_juniper_vn_flag_reject;
+static int hf_juniper_vn_flag_mirror;
+static int hf_juniper_vn_flag_direction;
+
+static int hf_juniper_st_eth_dst;
+static int hf_juniper_st_eth_src;
+static int hf_juniper_st_eth_type;
+static int hf_juniper_st_ip_len;
+static int hf_juniper_st_ip_proto;
+static int hf_juniper_st_esp_spi;
+static int hf_juniper_st_esp_seq;
+
+static gint ett_juniper;
+static gint ett_juniper_vn_flags;
+static gint ett_juniper_st_eth;
+static gint ett_juniper_st_ip;
+static gint ett_juniper_st_esp;
+static gint ett_juniper_st_unknown;
 
 static dissector_table_t payload_table;
 
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c
index 4646686438..71a3870c33 100644
--- a/epan/dissectors/packet-jxta.c
+++ b/epan/dissectors/packet-jxta.c
@@ -58,8 +58,8 @@ static const int JXTAMSG2_ELMFLAG_TYPE = 1 << 2;
 static const int JXTAMSG2_ELMFLAG_SIGNATURE = 1 << 3;
 static const int JXTAMSG2_ELMFLAG_ENCODINGS = 1 << 4;
 
-static int proto_jxta = -1;
-static int proto_message_jxta = -1;
+static int proto_jxta;
+static int proto_message_jxta;
 static int jxta_tap = -1;
 
 static dissector_table_t media_type_dissector_table = NULL;
@@ -67,76 +67,76 @@ static dissector_handle_t media_handle = NULL;
 static dissector_handle_t stream_jxta_handle = NULL;
 static dissector_handle_t tls_handle = NULL;
 
-static int hf_uri_addr = -1;
-static int hf_uri_src = -1;
-static int hf_uri_dst = -1;
-static int hf_jxta_udp = -1;
-static int hf_jxta_udpsig = -1;
-static int hf_jxta_welcome = -1;
-static int hf_jxta_welcome_initiator = -1;
-static int hf_jxta_welcome_sig = -1;
-static int hf_jxta_welcome_destAddr = -1;
-static int hf_jxta_welcome_pubAddr = -1;
-static int hf_jxta_welcome_peerid = -1;
-static int hf_jxta_welcome_noProp = -1;
-static int hf_jxta_welcome_msgVers = -1;
-static int hf_jxta_welcome_variable = -1;
-static int hf_jxta_welcome_version = -1;
-static int hf_jxta_framing = -1;
-static int hf_jxta_framing_header = -1;
-static int hf_jxta_framing_header_name = -1;
-static int hf_jxta_framing_header_value_length = -1;
-static int hf_jxta_framing_header_value = -1;
-static int hf_jxta_message_address = -1;
-static int hf_jxta_message_src = -1;
-static int hf_jxta_message_dst = -1;
-static int hf_jxta_message_sig = -1;
-static int hf_jxta_message_version = -1;
-static int hf_jxta_message_flags = -1;
-static int hf_jxta_message_flag_utf16be = -1;
-static int hf_jxta_message_flag_ucs32be = -1;
-static int hf_jxta_message_names_count = -1;
-static int hf_jxta_message_names_name = -1;
-static int hf_jxta_message_element_count = -1;
-static int hf_jxta_element = -1;
-static int hf_jxta_element_sig = -1;
-static int hf_jxta_element1_namespaceid = -1;
-static int hf_jxta_element2_namespaceid = -1;
-static int hf_jxta_element2_nameid = -1;
-static int hf_jxta_element2_mimeid = -1;
-static int hf_jxta_element2_encodingid = -1;
-static int hf_jxta_element_flags = -1;
-static int hf_jxta_element1_flag_hasType = -1;
-static int hf_jxta_element1_flag_hasEncoding = -1;
-static int hf_jxta_element1_flag_hasSignature = -1;
-static int hf_jxta_element2_flag_64bitlens = -1;
-static int hf_jxta_element2_flag_nameLiteral = -1;
-static int hf_jxta_element2_flag_hasType = -1;
-static int hf_jxta_element2_flag_hasSignature = -1;
-static int hf_jxta_element2_flag_hasEncoding = -1;
-static int hf_jxta_element2_flag_sigOfEncoded = -1;
-static int hf_jxta_element_name = -1;
-static int hf_jxta_element_type = -1;
-static int hf_jxta_element_encoding = -1;
-static int hf_jxta_element_content_len = -1;
-static int hf_jxta_element_content_len64 = -1;
-/* static int hf_jxta_element_content = -1; */
+static int hf_uri_addr;
+static int hf_uri_src;
+static int hf_uri_dst;
+static int hf_jxta_udp;
+static int hf_jxta_udpsig;
+static int hf_jxta_welcome;
+static int hf_jxta_welcome_initiator;
+static int hf_jxta_welcome_sig;
+static int hf_jxta_welcome_destAddr;
+static int hf_jxta_welcome_pubAddr;
+static int hf_jxta_welcome_peerid;
+static int hf_jxta_welcome_noProp;
+static int hf_jxta_welcome_msgVers;
+static int hf_jxta_welcome_variable;
+static int hf_jxta_welcome_version;
+static int hf_jxta_framing;
+static int hf_jxta_framing_header;
+static int hf_jxta_framing_header_name;
+static int hf_jxta_framing_header_value_length;
+static int hf_jxta_framing_header_value;
+static int hf_jxta_message_address;
+static int hf_jxta_message_src;
+static int hf_jxta_message_dst;
+static int hf_jxta_message_sig;
+static int hf_jxta_message_version;
+static int hf_jxta_message_flags;
+static int hf_jxta_message_flag_utf16be;
+static int hf_jxta_message_flag_ucs32be;
+static int hf_jxta_message_names_count;
+static int hf_jxta_message_names_name;
+static int hf_jxta_message_element_count;
+static int hf_jxta_element;
+static int hf_jxta_element_sig;
+static int hf_jxta_element1_namespaceid;
+static int hf_jxta_element2_namespaceid;
+static int hf_jxta_element2_nameid;
+static int hf_jxta_element2_mimeid;
+static int hf_jxta_element2_encodingid;
+static int hf_jxta_element_flags;
+static int hf_jxta_element1_flag_hasType;
+static int hf_jxta_element1_flag_hasEncoding;
+static int hf_jxta_element1_flag_hasSignature;
+static int hf_jxta_element2_flag_64bitlens;
+static int hf_jxta_element2_flag_nameLiteral;
+static int hf_jxta_element2_flag_hasType;
+static int hf_jxta_element2_flag_hasSignature;
+static int hf_jxta_element2_flag_hasEncoding;
+static int hf_jxta_element2_flag_sigOfEncoded;
+static int hf_jxta_element_name;
+static int hf_jxta_element_type;
+static int hf_jxta_element_encoding;
+static int hf_jxta_element_content_len;
+static int hf_jxta_element_content_len64;
+/* static int hf_jxta_element_content; */
 
 /**
 *    JXTA Protocol subtree handles
 **/
-static gint ett_jxta = -1;
-static gint ett_jxta_welcome = -1;
-static gint ett_jxta_udp = -1;
-static gint ett_jxta_framing = -1;
-static gint ett_jxta_framing_header = -1;
-static gint ett_jxta_msg = -1;
-static gint ett_jxta_msg_flags = -1;
-static gint ett_jxta_elem = -1;
-static gint ett_jxta_elem_1_flags = -1;
-static gint ett_jxta_elem_2_flags = -1;
-
-static expert_field ei_media_too_short = EI_INIT;
+static gint ett_jxta;
+static gint ett_jxta_welcome;
+static gint ett_jxta_udp;
+static gint ett_jxta_framing;
+static gint ett_jxta_framing_header;
+static gint ett_jxta_msg;
+static gint ett_jxta_msg_flags;
+static gint ett_jxta_elem;
+static gint ett_jxta_elem_1_flags;
+static gint ett_jxta_elem_2_flags;
+
+static expert_field ei_media_too_short;
 
 static int uri_address_type = -1;
 
diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c
index 55bc31a510..58863a0a24 100644
--- a/epan/dissectors/packet-k12.c
+++ b/epan/dissectors/packet-k12.c
@@ -35,23 +35,23 @@ typedef struct _k12_hdls_t {
 	dissector_handle_t* handles;
 } k12_handles_t;
 
-static int proto_k12 = -1;
+static int proto_k12;
 
-static int hf_k12_port_id = -1;
-static int hf_k12_port_name = -1;
-static int hf_k12_stack_file = -1;
-static int hf_k12_port_type = -1;
-static int hf_k12_atm_vp = -1;
-static int hf_k12_atm_vc = -1;
-static int hf_k12_atm_cid = -1;
+static int hf_k12_port_id;
+static int hf_k12_port_name;
+static int hf_k12_stack_file;
+static int hf_k12_port_type;
+static int hf_k12_atm_vp;
+static int hf_k12_atm_vc;
+static int hf_k12_atm_cid;
 
-static int hf_k12_ts = -1;
+static int hf_k12_ts;
 
-static gint ett_k12 = -1;
-static gint ett_port = -1;
+static gint ett_k12;
+static gint ett_port;
 
-static expert_field ei_k12_unmatched_stk_file = EI_INIT;
-static expert_field ei_k12_unmatched_info = EI_INIT;
+static expert_field ei_k12_unmatched_stk_file;
+static expert_field ei_k12_unmatched_info;
 
 static dissector_handle_t k12_handle;
 static dissector_handle_t data_handle;
diff --git a/epan/dissectors/packet-kadm5.c b/epan/dissectors/packet-kadm5.c
index 2a1e3bbabd..958ab4fe99 100644
--- a/epan/dissectors/packet-kadm5.c
+++ b/epan/dissectors/packet-kadm5.c
@@ -45,9 +45,9 @@ void proto_reg_handoff_kadm5(void);
 #define KADM5PROC_CHRAND_PRINCIPAL3	20
 #define KADM5PROC_SETKEY_PRINCIPAL3	21
 
-static int proto_kadm5 = -1;
-static int hf_kadm5_procedure_v2 = -1;
-static gint ett_kadm5 = -1;
+static int proto_kadm5;
+static int hf_kadm5_procedure_v2;
+static gint ett_kadm5;
 
 /* proc number, "proc name", dissect_request, dissect_reply */
 static const vsff kadm5_v2_proc[] = {
diff --git a/epan/dissectors/packet-kafka.c b/epan/dissectors/packet-kafka.c
index 798f1c95f2..c7b7385134 100644
--- a/epan/dissectors/packet-kafka.c
+++ b/epan/dissectors/packet-kafka.c
@@ -32,241 +32,241 @@
 void proto_register_kafka(void);
 void proto_reg_handoff_kafka(void);
 
-static int proto_kafka = -1;
-
-static int hf_kafka_len = -1;
-static int hf_kafka_api_key = -1;
-static int hf_kafka_api_version = -1;
-static int hf_kafka_request_api_key = -1;
-static int hf_kafka_response_api_key = -1;
-static int hf_kafka_request_api_version = -1;
-static int hf_kafka_response_api_version = -1;
-static int hf_kafka_correlation_id = -1;
-static int hf_kafka_client_id = -1;
-static int hf_kafka_client_host = -1;
-static int hf_kafka_required_acks = -1;
-static int hf_kafka_timeout = -1;
-static int hf_kafka_topic_name = -1;
-static int hf_kafka_transactional_id = -1;
-static int hf_kafka_transaction_result = -1;
-static int hf_kafka_transaction_timeout = -1;
-static int hf_kafka_partition_id = -1;
-static int hf_kafka_replica = -1;
-static int hf_kafka_replication_factor = -1;
-static int hf_kafka_isr = -1;
-static int hf_kafka_offline = -1;
-static int hf_kafka_last_stable_offset = -1;
-static int hf_kafka_log_start_offset = -1;
-static int hf_kafka_first_offset = -1;
-static int hf_kafka_producer_id = -1;
-static int hf_kafka_producer_epoch = -1;
-static int hf_kafka_message_size = -1;
-static int hf_kafka_message_crc = -1;
-static int hf_kafka_message_magic = -1;
-static int hf_kafka_message_codec = -1;
-static int hf_kafka_message_timestamp_type = -1;
-static int hf_kafka_message_timestamp = -1;
-static int hf_kafka_batch_crc = -1;
-static int hf_kafka_batch_codec = -1;
-static int hf_kafka_batch_timestamp_type = -1;
-static int hf_kafka_batch_transactional = -1;
-static int hf_kafka_batch_control_batch = -1;
-static int hf_kafka_batch_last_offset_delta = -1;
-static int hf_kafka_batch_first_timestamp = -1;
-static int hf_kafka_batch_last_timestamp = -1;
-static int hf_kafka_batch_base_sequence = -1;
-static int hf_kafka_batch_size = -1;
-static int hf_kafka_batch_index = -1;
-static int hf_kafka_batch_index_error_message = -1;
-static int hf_kafka_message_key = -1;
-static int hf_kafka_message_value = -1;
-static int hf_kafka_message_compression_reduction = -1;
-static int hf_kafka_truncated_content = -1;
-static int hf_kafka_request_frame = -1;
-static int hf_kafka_response_frame = -1;
-static int hf_kafka_consumer_group = -1;
-static int hf_kafka_consumer_group_instance = -1;
-static int hf_kafka_coordinator_key = -1;
-static int hf_kafka_coordinator_type = -1;
-static int hf_kafka_group_state = -1;
-static int hf_kafka_offset = -1;
-static int hf_kafka_offset_time = -1;
-static int hf_kafka_max_offsets = -1;
-static int hf_kafka_metadata = -1;
-static int hf_kafka_error = -1;
-static int hf_kafka_error_message = -1;
-static int hf_kafka_broker_nodeid = -1;
-static int hf_kafka_broker_epoch = -1;
-static int hf_kafka_broker_host = -1;
-static int hf_kafka_listener_name = -1;
-static int hf_kafka_broker_port = -1;
-static int hf_kafka_rack = -1;
-static int hf_kafka_broker_security_protocol_type = -1;
-static int hf_kafka_cluster_id = -1;
-static int hf_kafka_controller_id = -1;
-static int hf_kafka_controller_epoch = -1;
-static int hf_kafka_delete_partitions = -1;
-static int hf_kafka_leader_id = -1;
-static int hf_kafka_group_leader_id = -1;
-static int hf_kafka_leader_epoch = -1;
-static int hf_kafka_current_leader_epoch = -1;
-static int hf_kafka_is_internal = -1;
-static int hf_kafka_isolation_level = -1;
-static int hf_kafka_min_bytes = -1;
-static int hf_kafka_max_bytes = -1;
-static int hf_kafka_max_wait_time = -1;
-static int hf_kafka_throttle_time = -1;
-static int hf_kafka_api_versions_api_key = -1;
-static int hf_kafka_api_versions_min_version = -1;
-static int hf_kafka_api_versions_max_version = -1;
-static int hf_kafka_session_timeout = -1;
-static int hf_kafka_rebalance_timeout = -1;
-static int hf_kafka_member_id = -1;
-static int hf_kafka_protocol_type = -1;
-static int hf_kafka_protocol_name = -1;
-static int hf_kafka_protocol_metadata = -1;
-static int hf_kafka_member_metadata = -1;
-static int hf_kafka_generation_id = -1;
-static int hf_kafka_member_assignment = -1;
-static int hf_kafka_sasl_mechanism = -1;
-static int hf_kafka_num_partitions = -1;
-static int hf_kafka_zk_version = -1;
-static int hf_kafka_is_new_replica = -1;
-static int hf_kafka_config_key = -1;
-static int hf_kafka_config_value = -1;
-static int hf_kafka_commit_timestamp = -1;
-static int hf_kafka_retention_time = -1;
-static int hf_kafka_forgotten_topic_name = -1;
-static int hf_kafka_forgotten_topic_partition = -1;
-static int hf_kafka_fetch_session_id = -1;
-static int hf_kafka_fetch_session_epoch = -1;
-static int hf_kafka_require_stable_offset = -1;
-static int hf_kafka_record_header_key = -1;
-static int hf_kafka_record_header_value = -1;
-static int hf_kafka_record_attributes = -1;
-static int hf_kafka_allow_auto_topic_creation = -1;
-static int hf_kafka_validate_only = -1;
-static int hf_kafka_coordinator_epoch = -1;
-static int hf_kafka_sasl_auth_bytes = -1;
-static int hf_kafka_session_lifetime_ms = -1;
-static int hf_kafka_acl_resource_type = -1;
-static int hf_kafka_acl_resource_name = -1;
-static int hf_kafka_acl_resource_pattern_type = -1;
-static int hf_kafka_acl_principal = -1;
-static int hf_kafka_acl_host = -1;
-static int hf_kafka_acl_operation = -1;
-static int hf_kafka_acl_permission_type = -1;
-static int hf_kafka_config_resource_type = -1;
-static int hf_kafka_config_resource_name = -1;
-static int hf_kafka_config_include_synonyms = -1;
-static int hf_kafka_config_source = -1;
-static int hf_kafka_config_readonly = -1;
-static int hf_kafka_config_default = -1;
-static int hf_kafka_config_sensitive = -1;
-static int hf_kafka_config_operation = -1;
-static int hf_kafka_log_dir = -1;
-static int hf_kafka_segment_size = -1;
-static int hf_kafka_offset_lag = -1;
-static int hf_kafka_future = -1;
-static int hf_kafka_partition_count = -1;
-static int hf_kafka_token_max_life_time = -1;
-static int hf_kafka_token_renew_time = -1;
-static int hf_kafka_token_expiry_time = -1;
-static int hf_kafka_token_principal_type = -1;
-static int hf_kafka_token_principal_name = -1;
-static int hf_kafka_token_issue_timestamp = -1;
-static int hf_kafka_token_expiry_timestamp = -1;
-static int hf_kafka_token_max_timestamp = -1;
-static int hf_kafka_token_id = -1;
-static int hf_kafka_token_hmac = -1;
-static int hf_kafka_include_cluster_authorized_ops = -1;
-static int hf_kafka_include_topic_authorized_ops = -1;
-static int hf_kafka_include_group_authorized_ops = -1;
-static int hf_kafka_cluster_authorized_ops = -1;
-static int hf_kafka_topic_authorized_ops = -1;
-static int hf_kafka_group_authorized_ops = -1;
-static int hf_kafka_election_type = -1;
-static int hf_kafka_tagged_field_tag = -1;
-static int hf_kafka_tagged_field_data = -1;
-static int hf_kafka_client_software_name = -1;
-static int hf_kafka_client_software_version = -1;
-
-static int ett_kafka = -1;
-static int ett_kafka_batch = -1;
-static int ett_kafka_message = -1;
-static int ett_kafka_message_set = -1;
-static int ett_kafka_replicas = -1;
-static int ett_kafka_isrs = -1;
-static int ett_kafka_offline = -1;
-static int ett_kafka_broker = -1;
-static int ett_kafka_brokers = -1;
-static int ett_kafka_broker_end_point = -1;
-static int ett_kafka_markers = -1;
-static int ett_kafka_marker = -1;
-static int ett_kafka_topics = -1;
-static int ett_kafka_topic = -1;
-static int ett_kafka_partitions = -1;
-static int ett_kafka_partition = -1;
-static int ett_kafka_api_version = -1;
-static int ett_kafka_group_protocols = -1;
-static int ett_kafka_group_protocol = -1;
-static int ett_kafka_group_members = -1;
-static int ett_kafka_group_member = -1;
-static int ett_kafka_group_assignments = -1;
-static int ett_kafka_group_assignment = -1;
-static int ett_kafka_groups = -1;
-static int ett_kafka_group = -1;
-static int ett_kafka_sasl_enabled_mechanisms = -1;
-static int ett_kafka_replica_assignment = -1;
-static int ett_kafka_configs = -1;
-static int ett_kafka_config = -1;
-static int ett_kafka_request_forgotten_topic = -1;
-static int ett_kafka_record = -1;
-static int ett_kafka_record_headers = -1;
-static int ett_kafka_record_headers_header = -1;
-static int ett_kafka_aborted_transactions = -1;
-static int ett_kafka_aborted_transaction = -1;
-static int ett_kafka_resources = -1;
-static int ett_kafka_resource = -1;
-static int ett_kafka_acls = -1;
-static int ett_kafka_acl = -1;
-static int ett_kafka_acl_creations = -1;
-static int ett_kafka_acl_creation = -1;
-static int ett_kafka_acl_filters = -1;
-static int ett_kafka_acl_filter = -1;
-static int ett_kafka_acl_filter_matches = -1;
-static int ett_kafka_acl_filter_match = -1;
-static int ett_kafka_config_synonyms = -1;
-static int ett_kafka_config_synonym = -1;
-static int ett_kafka_config_entries = -1;
-static int ett_kafka_config_entry = -1;
-static int ett_kafka_log_dirs = -1;
-static int ett_kafka_log_dir = -1;
-static int ett_kafka_renewers = -1;
-static int ett_kafka_renewer = -1;
-static int ett_kafka_owners = -1;
-static int ett_kafka_owner = -1;
-static int ett_kafka_tokens = -1;
-static int ett_kafka_token = -1;
+static int proto_kafka;
+
+static int hf_kafka_len;
+static int hf_kafka_api_key;
+static int hf_kafka_api_version;
+static int hf_kafka_request_api_key;
+static int hf_kafka_response_api_key;
+static int hf_kafka_request_api_version;
+static int hf_kafka_response_api_version;
+static int hf_kafka_correlation_id;
+static int hf_kafka_client_id;
+static int hf_kafka_client_host;
+static int hf_kafka_required_acks;
+static int hf_kafka_timeout;
+static int hf_kafka_topic_name;
+static int hf_kafka_transactional_id;
+static int hf_kafka_transaction_result;
+static int hf_kafka_transaction_timeout;
+static int hf_kafka_partition_id;
+static int hf_kafka_replica;
+static int hf_kafka_replication_factor;
+static int hf_kafka_isr;
+static int hf_kafka_offline;
+static int hf_kafka_last_stable_offset;
+static int hf_kafka_log_start_offset;
+static int hf_kafka_first_offset;
+static int hf_kafka_producer_id;
+static int hf_kafka_producer_epoch;
+static int hf_kafka_message_size;
+static int hf_kafka_message_crc;
+static int hf_kafka_message_magic;
+static int hf_kafka_message_codec;
+static int hf_kafka_message_timestamp_type;
+static int hf_kafka_message_timestamp;
+static int hf_kafka_batch_crc;
+static int hf_kafka_batch_codec;
+static int hf_kafka_batch_timestamp_type;
+static int hf_kafka_batch_transactional;
+static int hf_kafka_batch_control_batch;
+static int hf_kafka_batch_last_offset_delta;
+static int hf_kafka_batch_first_timestamp;
+static int hf_kafka_batch_last_timestamp;
+static int hf_kafka_batch_base_sequence;
+static int hf_kafka_batch_size;
+static int hf_kafka_batch_index;
+static int hf_kafka_batch_index_error_message;
+static int hf_kafka_message_key;
+static int hf_kafka_message_value;
+static int hf_kafka_message_compression_reduction;
+static int hf_kafka_truncated_content;
+static int hf_kafka_request_frame;
+static int hf_kafka_response_frame;
+static int hf_kafka_consumer_group;
+static int hf_kafka_consumer_group_instance;
+static int hf_kafka_coordinator_key;
+static int hf_kafka_coordinator_type;
+static int hf_kafka_group_state;
+static int hf_kafka_offset;
+static int hf_kafka_offset_time;
+static int hf_kafka_max_offsets;
+static int hf_kafka_metadata;
+static int hf_kafka_error;
+static int hf_kafka_error_message;
+static int hf_kafka_broker_nodeid;
+static int hf_kafka_broker_epoch;
+static int hf_kafka_broker_host;
+static int hf_kafka_listener_name;
+static int hf_kafka_broker_port;
+static int hf_kafka_rack;
+static int hf_kafka_broker_security_protocol_type;
+static int hf_kafka_cluster_id;
+static int hf_kafka_controller_id;
+static int hf_kafka_controller_epoch;
+static int hf_kafka_delete_partitions;
+static int hf_kafka_leader_id;
+static int hf_kafka_group_leader_id;
+static int hf_kafka_leader_epoch;
+static int hf_kafka_current_leader_epoch;
+static int hf_kafka_is_internal;
+static int hf_kafka_isolation_level;
+static int hf_kafka_min_bytes;
+static int hf_kafka_max_bytes;
+static int hf_kafka_max_wait_time;
+static int hf_kafka_throttle_time;
+static int hf_kafka_api_versions_api_key;
+static int hf_kafka_api_versions_min_version;
+static int hf_kafka_api_versions_max_version;
+static int hf_kafka_session_timeout;
+static int hf_kafka_rebalance_timeout;
+static int hf_kafka_member_id;
+static int hf_kafka_protocol_type;
+static int hf_kafka_protocol_name;
+static int hf_kafka_protocol_metadata;
+static int hf_kafka_member_metadata;
+static int hf_kafka_generation_id;
+static int hf_kafka_member_assignment;
+static int hf_kafka_sasl_mechanism;
+static int hf_kafka_num_partitions;
+static int hf_kafka_zk_version;
+static int hf_kafka_is_new_replica;
+static int hf_kafka_config_key;
+static int hf_kafka_config_value;
+static int hf_kafka_commit_timestamp;
+static int hf_kafka_retention_time;
+static int hf_kafka_forgotten_topic_name;
+static int hf_kafka_forgotten_topic_partition;
+static int hf_kafka_fetch_session_id;
+static int hf_kafka_fetch_session_epoch;
+static int hf_kafka_require_stable_offset;
+static int hf_kafka_record_header_key;
+static int hf_kafka_record_header_value;
+static int hf_kafka_record_attributes;
+static int hf_kafka_allow_auto_topic_creation;
+static int hf_kafka_validate_only;
+static int hf_kafka_coordinator_epoch;
+static int hf_kafka_sasl_auth_bytes;
+static int hf_kafka_session_lifetime_ms;
+static int hf_kafka_acl_resource_type;
+static int hf_kafka_acl_resource_name;
+static int hf_kafka_acl_resource_pattern_type;
+static int hf_kafka_acl_principal;
+static int hf_kafka_acl_host;
+static int hf_kafka_acl_operation;
+static int hf_kafka_acl_permission_type;
+static int hf_kafka_config_resource_type;
+static int hf_kafka_config_resource_name;
+static int hf_kafka_config_include_synonyms;
+static int hf_kafka_config_source;
+static int hf_kafka_config_readonly;
+static int hf_kafka_config_default;
+static int hf_kafka_config_sensitive;
+static int hf_kafka_config_operation;
+static int hf_kafka_log_dir;
+static int hf_kafka_segment_size;
+static int hf_kafka_offset_lag;
+static int hf_kafka_future;
+static int hf_kafka_partition_count;
+static int hf_kafka_token_max_life_time;
+static int hf_kafka_token_renew_time;
+static int hf_kafka_token_expiry_time;
+static int hf_kafka_token_principal_type;
+static int hf_kafka_token_principal_name;
+static int hf_kafka_token_issue_timestamp;
+static int hf_kafka_token_expiry_timestamp;
+static int hf_kafka_token_max_timestamp;
+static int hf_kafka_token_id;
+static int hf_kafka_token_hmac;
+static int hf_kafka_include_cluster_authorized_ops;
+static int hf_kafka_include_topic_authorized_ops;
+static int hf_kafka_include_group_authorized_ops;
+static int hf_kafka_cluster_authorized_ops;
+static int hf_kafka_topic_authorized_ops;
+static int hf_kafka_group_authorized_ops;
+static int hf_kafka_election_type;
+static int hf_kafka_tagged_field_tag;
+static int hf_kafka_tagged_field_data;
+static int hf_kafka_client_software_name;
+static int hf_kafka_client_software_version;
+
+static int ett_kafka;
+static int ett_kafka_batch;
+static int ett_kafka_message;
+static int ett_kafka_message_set;
+static int ett_kafka_replicas;
+static int ett_kafka_isrs;
+static int ett_kafka_offline;
+static int ett_kafka_broker;
+static int ett_kafka_brokers;
+static int ett_kafka_broker_end_point;
+static int ett_kafka_markers;
+static int ett_kafka_marker;
+static int ett_kafka_topics;
+static int ett_kafka_topic;
+static int ett_kafka_partitions;
+static int ett_kafka_partition;
+static int ett_kafka_api_version;
+static int ett_kafka_group_protocols;
+static int ett_kafka_group_protocol;
+static int ett_kafka_group_members;
+static int ett_kafka_group_member;
+static int ett_kafka_group_assignments;
+static int ett_kafka_group_assignment;
+static int ett_kafka_groups;
+static int ett_kafka_group;
+static int ett_kafka_sasl_enabled_mechanisms;
+static int ett_kafka_replica_assignment;
+static int ett_kafka_configs;
+static int ett_kafka_config;
+static int ett_kafka_request_forgotten_topic;
+static int ett_kafka_record;
+static int ett_kafka_record_headers;
+static int ett_kafka_record_headers_header;
+static int ett_kafka_aborted_transactions;
+static int ett_kafka_aborted_transaction;
+static int ett_kafka_resources;
+static int ett_kafka_resource;
+static int ett_kafka_acls;
+static int ett_kafka_acl;
+static int ett_kafka_acl_creations;
+static int ett_kafka_acl_creation;
+static int ett_kafka_acl_filters;
+static int ett_kafka_acl_filter;
+static int ett_kafka_acl_filter_matches;
+static int ett_kafka_acl_filter_match;
+static int ett_kafka_config_synonyms;
+static int ett_kafka_config_synonym;
+static int ett_kafka_config_entries;
+static int ett_kafka_config_entry;
+static int ett_kafka_log_dirs;
+static int ett_kafka_log_dir;
+static int ett_kafka_renewers;
+static int ett_kafka_renewer;
+static int ett_kafka_owners;
+static int ett_kafka_owner;
+static int ett_kafka_tokens;
+static int ett_kafka_token;
 /* in Kafka 2.5 these structures have been added, but not yet used */
-static int ett_kafka_tagged_fields = -1;
-static int ett_kafka_tagged_field = -1;
-static int ett_kafka_record_errors = -1;
-static int ett_kafka_record_error = -1;
-
-static expert_field ei_kafka_request_missing = EI_INIT;
-static expert_field ei_kafka_unknown_api_key = EI_INIT;
-static expert_field ei_kafka_unsupported_api_version = EI_INIT;
-static expert_field ei_kafka_bad_string_length = EI_INIT;
-static expert_field ei_kafka_bad_bytes_length = EI_INIT;
-static expert_field ei_kafka_bad_array_length = EI_INIT;
-static expert_field ei_kafka_bad_record_length = EI_INIT;
-static expert_field ei_kafka_bad_varint = EI_INIT;
-static expert_field ei_kafka_bad_message_set_length = EI_INIT;
-static expert_field ei_kafka_bad_decompression_length = EI_INIT;
-static expert_field ei_kafka_zero_decompression_length = EI_INIT;
-static expert_field ei_kafka_unknown_message_magic = EI_INIT;
-static expert_field ei_kafka_pdu_length_mismatch = EI_INIT;
+static int ett_kafka_tagged_fields;
+static int ett_kafka_tagged_field;
+static int ett_kafka_record_errors;
+static int ett_kafka_record_error;
+
+static expert_field ei_kafka_request_missing;
+static expert_field ei_kafka_unknown_api_key;
+static expert_field ei_kafka_unsupported_api_version;
+static expert_field ei_kafka_bad_string_length;
+static expert_field ei_kafka_bad_bytes_length;
+static expert_field ei_kafka_bad_array_length;
+static expert_field ei_kafka_bad_record_length;
+static expert_field ei_kafka_bad_varint;
+static expert_field ei_kafka_bad_message_set_length;
+static expert_field ei_kafka_bad_decompression_length;
+static expert_field ei_kafka_zero_decompression_length;
+static expert_field ei_kafka_unknown_message_magic;
+static expert_field ei_kafka_pdu_length_mismatch;
 
 typedef gint16 kafka_api_key_t;
 typedef gint16 kafka_api_version_t;
diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c
index e714bebef0..847f4cc33e 100644
--- a/epan/dissectors/packet-kdp.c
+++ b/epan/dissectors/packet-kdp.c
@@ -21,35 +21,35 @@ static dissector_handle_t kdp_handle;
 
 #define KDP_PORT 19948 /* Not IANA registered */
 #define BUFFER_SIZE 80
-static int proto_kdp = -1;
-static gint ett_kdp = -1;
-static gint ett_kdp_flags = -1;
-
-static int hf_kdp_version = -1;
-static int hf_kdp_headerlen = -1;
-static int hf_kdp_flags = -1;
-static int hf_kdp_errors = -1;
-static int hf_kdp_destflowid = -1;
-static int hf_kdp_srcflowid = -1;
-static int hf_kdp_sequence = -1;
-static int hf_kdp_ack = -1;
-static int hf_kdp_maxsegmentsize = -1;
-static int hf_kdp_optionnumber = -1;
-static int hf_kdp_optionlen = -1;
-static int hf_kdp_option1 = -1;
-static int hf_kdp_option2 = -1;
-static int hf_kdp_option3 = -1;
-static int hf_kdp_option4 = -1;
-static int hf_kdp_option5 = -1;
-static int hf_kdp_option6 = -1;
-static int hf_kdp_option7 = -1;
-static int hf_kdp_option8 = -1;
-static int hf_kdp_option9 = -1;
-static int hf_kdp_option_unknown = -1;
-static int hf_kdp_fragment = -1;
-static int hf_kdp_fragtotal = -1;
-static int hf_kdp_body = -1;
-static int hf_kdp_xml_body = -1;
+static int proto_kdp;
+static gint ett_kdp;
+static gint ett_kdp_flags;
+
+static int hf_kdp_version;
+static int hf_kdp_headerlen;
+static int hf_kdp_flags;
+static int hf_kdp_errors;
+static int hf_kdp_destflowid;
+static int hf_kdp_srcflowid;
+static int hf_kdp_sequence;
+static int hf_kdp_ack;
+static int hf_kdp_maxsegmentsize;
+static int hf_kdp_optionnumber;
+static int hf_kdp_optionlen;
+static int hf_kdp_option1;
+static int hf_kdp_option2;
+static int hf_kdp_option3;
+static int hf_kdp_option4;
+static int hf_kdp_option5;
+static int hf_kdp_option6;
+static int hf_kdp_option7;
+static int hf_kdp_option8;
+static int hf_kdp_option9;
+static int hf_kdp_option_unknown;
+static int hf_kdp_fragment;
+static int hf_kdp_fragtotal;
+static int hf_kdp_body;
+static int hf_kdp_xml_body;
 
 #define KDP_DROP_FLAG (1 << 0)
 #define KDP_SYN_FLAG  (1 << 1)
@@ -58,12 +58,12 @@ static int hf_kdp_xml_body = -1;
 #define KDP_BCST_FLAG (1 << 4)
 #define KDP_DUP_FLAG  (1 << 5)
 
-static int hf_kdp_drop_flag = -1;
-static int hf_kdp_syn_flag = -1;
-static int hf_kdp_ack_flag = -1;
-static int hf_kdp_rst_flag = -1;
-static int hf_kdp_bcst_flag = -1;
-static int hf_kdp_dup_flag = -1;
+static int hf_kdp_drop_flag;
+static int hf_kdp_syn_flag;
+static int hf_kdp_ack_flag;
+static int hf_kdp_rst_flag;
+static int hf_kdp_bcst_flag;
+static int hf_kdp_dup_flag;
 
 static int dissect_kdp(tvbuff_t *tvb,
                         packet_info *pinfo,
diff --git a/epan/dissectors/packet-kdsp.c b/epan/dissectors/packet-kdsp.c
index 34eacbef62..bd42db465d 100644
--- a/epan/dissectors/packet-kdsp.c
+++ b/epan/dissectors/packet-kdsp.c
@@ -86,7 +86,7 @@ static dissector_handle_t kdsp_handle;
 #define DATALINK_WLAN 0x69
 #define DATALINK_RADIOTAP 0x7F
 
-static int proto_kdsp = -1;
+static int proto_kdsp;
 
 static dissector_table_t  subdissector_dlt_table;
 
@@ -117,123 +117,123 @@ static const value_string channelcmds[] = {
 };
 
 
-static gint hf_kdsp_sentinel = -1;
-static gint hf_kdsp_cmdnum = -1;
-static gint hf_kdsp_length = -1;
-
-static gint hf_kdsp_version = -1;
-static gint hf_kdsp_server_version = -1;
-static gint hf_kdsp_hostname = -1;
-
-static gint hf_kdsp_str_flags = -1;
-static gint hf_kdsp_str_len = -1;
-static gint hf_kdsp_str_msg = -1;
-
-static gint hf_kdsp_cpt_bitmap = -1;
-static gint hf_kdsp_cpt_flag_cpt = -1;
-static gint hf_kdsp_cpt_flag_fcs = -1;
-static gint hf_kdsp_cpt_flag_gps = -1;
-static gint hf_kdsp_cpt_flag_radio = -1;
-static gint hf_kdsp_cpt_offset = -1;
-
-static gint hf_kdsp_fcs = -1;
-static gint hf_kdsp_fcs_data = -1;
-
-static gint hf_kdsp_radio_hdr = -1;
-static gint hf_kdsp_radio_hdr_len = -1;
-static gint hf_kdsp_radio_content_bitmap = -1;
-static gint hf_kdsp_radio_accuracy = -1;
-static gint hf_kdsp_radio_freq_mhz = -1;
-static gint hf_kdsp_radio_signal_dbm = -1;
-static gint hf_kdsp_radio_noise_dbm = -1;
-static gint hf_kdsp_radio_carrier = -1;
-static gint hf_kdsp_radio_encoding = -1;
-static gint hf_kdsp_radio_datarate = -1;
-static gint hf_kdsp_radio_signal_rssi = -1;
-static gint hf_kdsp_radio_noise_rssi = -1;
-
-static gint hf_kdsp_gps_hdr = -1;
-static gint hf_kdsp_gps_hdr_len = -1;
-static gint hf_kdsp_gps_content_bitmap = -1;
-static gint hf_kdsp_gps_fix = -1;
-static gint hf_kdsp_gps_lat = -1;
-static gint hf_kdsp_gps_lon = -1;
-static gint hf_kdsp_gps_alt = -1;
-static gint hf_kdsp_gps_spd = -1;
-static gint hf_kdsp_gps_heading = -1;
-
-static gint hf_kdsp_cpt_data_hdr = -1;
-static gint hf_kdsp_cpt_data_hdr_len = -1;
-static gint hf_kdsp_cpt_data_content_bitmap = -1;
-static gint hf_kdsp_cpt_dc_flag_uuid = -1;
-static gint hf_kdsp_cpt_dc_flag_len = -1;
-static gint hf_kdsp_cpt_dc_flag_sec = -1;
-static gint hf_kdsp_cpt_dc_flag_usec = -1;
-static gint hf_kdsp_cpt_dc_flag_dlt = -1;
-static gint hf_kdsp_cpt_uuid = -1;
-static gint hf_kdsp_cpt_packet_len = -1;
-static gint hf_kdsp_cpt_tv_sec = -1;
-static gint hf_kdsp_cpt_tv_usec = -1;
-static gint hf_kdsp_cpt_dlt = -1;
-
-static gint hf_kdsp_ch_length = -1;
-static gint hf_kdsp_ch_bitmap = -1;
-static gint hf_kdsp_ch_flag_uuid = -1;
-static gint hf_kdsp_ch_flag_cmd = -1;
-static gint hf_kdsp_ch_flag_curch = -1;
-static gint hf_kdsp_ch_flag_hop = -1;
-static gint hf_kdsp_ch_flag_numch = -1;
-static gint hf_kdsp_ch_flag_channels = -1;
-static gint hf_kdsp_ch_flag_dwell = -1;
-static gint hf_kdsp_ch_flag_rate = -1;
-static gint hf_kdsp_ch_flag_hopdwell = -1;
-static gint hf_kdsp_ch_uuid = -1;
-static gint hf_kdsp_ch_cmd = -1;
-static gint hf_kdsp_ch_cur_ch = -1;
-static gint hf_kdsp_ch_hop = -1;
-static gint hf_kdsp_ch_num_ch = -1;
-static gint hf_kdsp_ch_data = -1;
-static gint hf_kdsp_ch_ch = -1;
-static gint hf_kdsp_ch_dwell = -1;
-static gint hf_kdsp_ch_start = -1;
-static gint hf_kdsp_ch_end = -1;
-static gint hf_kdsp_ch_width = -1;
-static gint hf_kdsp_ch_iter = -1;
-static gint hf_kdsp_ch_rate = -1;
-static gint hf_kdsp_ch_ch_dwell = -1;
-
-static gint hf_kdsp_source_length = -1;
-static gint hf_kdsp_source_bitmap = -1;
-static gint hf_kdsp_source_uuid = -1;
-static gint hf_kdsp_source_invalidate = -1;
-static gint hf_kdsp_source_name = -1;
-static gint hf_kdsp_source_interface = -1;
-static gint hf_kdsp_source_type = -1;
-static gint hf_kdsp_source_hop = -1;
-static gint hf_kdsp_source_dwell = -1;
-static gint hf_kdsp_source_rate = -1;
-
-static gint hf_kdsp_report_hdr_len = -1;
-static gint hf_kdsp_report_content_bitmap = -1;
-static gint hf_kdsp_report_uuid = -1;
-static gint hf_kdsp_report_flags = -1;
-static gint hf_kdsp_report_hop_tm_sec = -1;
-static gint hf_kdsp_report_hop_tm_usec = -1;
-
-static gint ett_kdsp_pdu = -1;
-static gint ett_cpt_bitmap = -1;
-static gint ett_cpt_data_content_bitmap = -1;
-static gint ett_ch_bitmap = -1;
-static gint ett_ch_data = -1;
-static gint ett_sub_fcs = -1;
-static gint ett_sub_radio = -1;
-static gint ett_sub_gps = -1;
-static gint ett_sub_cpt = -1;
-
-static expert_field ei_kdsp_payload_expected = EI_INIT;
-static expert_field ei_kdsp_payload_unexpected = EI_INIT;
-static expert_field ei_kdsp_cpt_data_hdr_len = EI_INIT;
-static expert_field ei_kdsp_cmdnum = EI_INIT;
+static gint hf_kdsp_sentinel;
+static gint hf_kdsp_cmdnum;
+static gint hf_kdsp_length;
+
+static gint hf_kdsp_version;
+static gint hf_kdsp_server_version;
+static gint hf_kdsp_hostname;
+
+static gint hf_kdsp_str_flags;
+static gint hf_kdsp_str_len;
+static gint hf_kdsp_str_msg;
+
+static gint hf_kdsp_cpt_bitmap;
+static gint hf_kdsp_cpt_flag_cpt;
+static gint hf_kdsp_cpt_flag_fcs;
+static gint hf_kdsp_cpt_flag_gps;
+static gint hf_kdsp_cpt_flag_radio;
+static gint hf_kdsp_cpt_offset;
+
+static gint hf_kdsp_fcs;
+static gint hf_kdsp_fcs_data;
+
+static gint hf_kdsp_radio_hdr;
+static gint hf_kdsp_radio_hdr_len;
+static gint hf_kdsp_radio_content_bitmap;
+static gint hf_kdsp_radio_accuracy;
+static gint hf_kdsp_radio_freq_mhz;
+static gint hf_kdsp_radio_signal_dbm;
+static gint hf_kdsp_radio_noise_dbm;
+static gint hf_kdsp_radio_carrier;
+static gint hf_kdsp_radio_encoding;
+static gint hf_kdsp_radio_datarate;
+static gint hf_kdsp_radio_signal_rssi;
+static gint hf_kdsp_radio_noise_rssi;
+
+static gint hf_kdsp_gps_hdr;
+static gint hf_kdsp_gps_hdr_len;
+static gint hf_kdsp_gps_content_bitmap;
+static gint hf_kdsp_gps_fix;
+static gint hf_kdsp_gps_lat;
+static gint hf_kdsp_gps_lon;
+static gint hf_kdsp_gps_alt;
+static gint hf_kdsp_gps_spd;
+static gint hf_kdsp_gps_heading;
+
+static gint hf_kdsp_cpt_data_hdr;
+static gint hf_kdsp_cpt_data_hdr_len;
+static gint hf_kdsp_cpt_data_content_bitmap;
+static gint hf_kdsp_cpt_dc_flag_uuid;
+static gint hf_kdsp_cpt_dc_flag_len;
+static gint hf_kdsp_cpt_dc_flag_sec;
+static gint hf_kdsp_cpt_dc_flag_usec;
+static gint hf_kdsp_cpt_dc_flag_dlt;
+static gint hf_kdsp_cpt_uuid;
+static gint hf_kdsp_cpt_packet_len;
+static gint hf_kdsp_cpt_tv_sec;
+static gint hf_kdsp_cpt_tv_usec;
+static gint hf_kdsp_cpt_dlt;
+
+static gint hf_kdsp_ch_length;
+static gint hf_kdsp_ch_bitmap;
+static gint hf_kdsp_ch_flag_uuid;
+static gint hf_kdsp_ch_flag_cmd;
+static gint hf_kdsp_ch_flag_curch;
+static gint hf_kdsp_ch_flag_hop;
+static gint hf_kdsp_ch_flag_numch;
+static gint hf_kdsp_ch_flag_channels;
+static gint hf_kdsp_ch_flag_dwell;
+static gint hf_kdsp_ch_flag_rate;
+static gint hf_kdsp_ch_flag_hopdwell;
+static gint hf_kdsp_ch_uuid;
+static gint hf_kdsp_ch_cmd;
+static gint hf_kdsp_ch_cur_ch;
+static gint hf_kdsp_ch_hop;
+static gint hf_kdsp_ch_num_ch;
+static gint hf_kdsp_ch_data;
+static gint hf_kdsp_ch_ch;
+static gint hf_kdsp_ch_dwell;
+static gint hf_kdsp_ch_start;
+static gint hf_kdsp_ch_end;
+static gint hf_kdsp_ch_width;
+static gint hf_kdsp_ch_iter;
+static gint hf_kdsp_ch_rate;
+static gint hf_kdsp_ch_ch_dwell;
+
+static gint hf_kdsp_source_length;
+static gint hf_kdsp_source_bitmap;
+static gint hf_kdsp_source_uuid;
+static gint hf_kdsp_source_invalidate;
+static gint hf_kdsp_source_name;
+static gint hf_kdsp_source_interface;
+static gint hf_kdsp_source_type;
+static gint hf_kdsp_source_hop;
+static gint hf_kdsp_source_dwell;
+static gint hf_kdsp_source_rate;
+
+static gint hf_kdsp_report_hdr_len;
+static gint hf_kdsp_report_content_bitmap;
+static gint hf_kdsp_report_uuid;
+static gint hf_kdsp_report_flags;
+static gint hf_kdsp_report_hop_tm_sec;
+static gint hf_kdsp_report_hop_tm_usec;
+
+static gint ett_kdsp_pdu;
+static gint ett_cpt_bitmap;
+static gint ett_cpt_data_content_bitmap;
+static gint ett_ch_bitmap;
+static gint ett_ch_data;
+static gint ett_sub_fcs;
+static gint ett_sub_radio;
+static gint ett_sub_gps;
+static gint ett_sub_cpt;
+
+static expert_field ei_kdsp_payload_expected;
+static expert_field ei_kdsp_payload_unexpected;
+static expert_field ei_kdsp_cpt_data_hdr_len;
+static expert_field ei_kdsp_cmdnum;
 
 /* determine PDU length of protocol */
 static guint
diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c
index 4c3b523062..7a3f228164 100644
--- a/epan/dissectors/packet-kerberos4.c
+++ b/epan/dissectors/packet-kerberos4.c
@@ -29,31 +29,31 @@
 void proto_register_krb4(void);
 void proto_reg_handoff_krb4(void);
 
-static int proto_krb4 = -1;
-static int hf_krb4_version = -1;
-static int hf_krb4_auth_msg_type = -1;
-static int hf_krb4_m_type = -1;
-static int hf_krb4_byte_order = -1;
-static int hf_krb4_name = -1;
-static int hf_krb4_instance = -1;
-static int hf_krb4_realm = -1;
-static int hf_krb4_time_sec = -1;
-static int hf_krb4_exp_date = -1;
-static int hf_krb4_req_date = -1;
-static int hf_krb4_lifetime = -1;
-static int hf_krb4_s_name = -1;
-static int hf_krb4_s_instance = -1;
-static int hf_krb4_kvno = -1;
-static int hf_krb4_length = -1;
-static int hf_krb4_ticket_length = -1;
-static int hf_krb4_request_length = -1;
-static int hf_krb4_ticket_blob = -1;
-static int hf_krb4_request_blob = -1;
-static int hf_krb4_encrypted_blob = -1;
-static int hf_krb4_unknown_transarc_blob = -1;
-
-static gint ett_krb4 = -1;
-static gint ett_krb4_auth_msg_type = -1;
+static int proto_krb4;
+static int hf_krb4_version;
+static int hf_krb4_auth_msg_type;
+static int hf_krb4_m_type;
+static int hf_krb4_byte_order;
+static int hf_krb4_name;
+static int hf_krb4_instance;
+static int hf_krb4_realm;
+static int hf_krb4_time_sec;
+static int hf_krb4_exp_date;
+static int hf_krb4_req_date;
+static int hf_krb4_lifetime;
+static int hf_krb4_s_name;
+static int hf_krb4_s_instance;
+static int hf_krb4_kvno;
+static int hf_krb4_length;
+static int hf_krb4_ticket_length;
+static int hf_krb4_request_length;
+static int hf_krb4_ticket_blob;
+static int hf_krb4_request_blob;
+static int hf_krb4_encrypted_blob;
+static int hf_krb4_unknown_transarc_blob;
+
+static gint ett_krb4;
+static gint ett_krb4_auth_msg_type;
 
 static dissector_handle_t krb4_handle;
 
diff --git a/epan/dissectors/packet-kingfisher.c b/epan/dissectors/packet-kingfisher.c
index 4e6a2038f9..cb1c5ddc55 100644
--- a/epan/dissectors/packet-kingfisher.c
+++ b/epan/dissectors/packet-kingfisher.c
@@ -32,20 +32,20 @@ static dissector_handle_t kingfisher_handle;
 #define UDP_PORT_KINGFISHER_RANGE   "4058"
 #endif
 
-static int proto_kingfisher = -1;
-static int hf_kingfisher_version = -1;
-static int hf_kingfisher_system = -1;
-static int hf_kingfisher_length = -1;
-static int hf_kingfisher_from = -1;
-static int hf_kingfisher_target = -1;
-static int hf_kingfisher_via = -1;
-static int hf_kingfisher_message = -1;
-static int hf_kingfisher_function = -1;
-static int hf_kingfisher_checksum = -1;
-static int hf_kingfisher_checksum_status = -1;
-static int hf_kingfisher_message_data = -1;
-
-static expert_field ei_kingfisher_checksum = EI_INIT;
+static int proto_kingfisher;
+static int hf_kingfisher_version;
+static int hf_kingfisher_system;
+static int hf_kingfisher_length;
+static int hf_kingfisher_from;
+static int hf_kingfisher_target;
+static int hf_kingfisher_via;
+static int hf_kingfisher_message;
+static int hf_kingfisher_function;
+static int hf_kingfisher_checksum;
+static int hf_kingfisher_checksum_status;
+static int hf_kingfisher_message_data;
+
+static expert_field ei_kingfisher_checksum;
 
 static dissector_handle_t kingfisher_conv_handle;
 
@@ -63,7 +63,7 @@ typedef struct _kingfisher_packet_t
     guint16     checksum;
 } kingfisher_packet_t;
 
-static gint ett_kingfisher = -1;
+static gint ett_kingfisher;
 
 static const value_string function_code_vals[] =
 {
diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c
index 7c19b1daad..5257336c64 100644
--- a/epan/dissectors/packet-kink.c
+++ b/epan/dissectors/packet-kink.c
@@ -29,52 +29,52 @@ static dissector_handle_t kink_handle;
 
 #define KINK_ISAKMP_PAYLOAD_BASE 14
 
-static int proto_kink = -1;
+static int proto_kink;
 
 /* Argument for proto_tree_add_uint() */
-static int hf_kink_type = -1;
-static int hf_kink_length = -1;
-static int hf_kink_transactionId = -1;
-static int hf_kink_checkSumLength = -1;
-static int hf_kink_A = -1;
-static int hf_kink_version = -1;
-static int hf_kink_domain_of_interpretation = -1;
-static int hf_kink_qmversion = -1;
-static int hf_kink_error_code = -1;
-static int hf_kink_reserved8 = -1;
-static int hf_kink_reserved15 = -1;
-static int hf_kink_reserved16 = -1;
-static int hf_kink_reserved24 = -1;
-static int hf_kink_checkSum = -1;
-static int hf_kink_next_payload = -1;
-static int hf_kink_payload_length = -1;
-static int hf_kink_epoch = -1;
-static int hf_kink_inner_next_pload = -1;
-static int hf_kink_realm_name_length = -1;
-static int hf_kink_realm_name = -1;
-static int hf_kink_princ_name_length = -1;
-static int hf_kink_princ_name = -1;
-static int hf_kink_tgt_length = -1;
-static int hf_kink_tgt = -1;
-static int hf_kink_payload = -1;
+static int hf_kink_type;
+static int hf_kink_length;
+static int hf_kink_transactionId;
+static int hf_kink_checkSumLength;
+static int hf_kink_A;
+static int hf_kink_version;
+static int hf_kink_domain_of_interpretation;
+static int hf_kink_qmversion;
+static int hf_kink_error_code;
+static int hf_kink_reserved8;
+static int hf_kink_reserved15;
+static int hf_kink_reserved16;
+static int hf_kink_reserved24;
+static int hf_kink_checkSum;
+static int hf_kink_next_payload;
+static int hf_kink_payload_length;
+static int hf_kink_epoch;
+static int hf_kink_inner_next_pload;
+static int hf_kink_realm_name_length;
+static int hf_kink_realm_name;
+static int hf_kink_princ_name_length;
+static int hf_kink_princ_name;
+static int hf_kink_tgt_length;
+static int hf_kink_tgt;
+static int hf_kink_payload;
 
 /* Argument for making the subtree */
-static gint ett_kink = -1;
-/*static gint ett_kink_version = -1;*/
-static gint ett_kink_payload = -1;
-static gint ett_payload_kink_ap_req = -1;
-static gint ett_payload_kink_ap_rep = -1;
-static gint ett_payload_kink_krb_error = -1;
-static gint ett_payload_kink_tgt_req = -1;
-static gint ett_payload_kink_tgt_rep = -1;
-static gint ett_payload_kink_isakmp = -1;
-static gint ett_payload_kink_encrypt = -1;
-static gint ett_payload_kink_error = -1;
-static gint ett_payload_not_defined = -1;
-static gint ett_decrypt_kink_encrypt = -1;
-
-static expert_field ei_kink_payload_length_small = EI_INIT;
-static expert_field ei_kink_payload_length_mismatch = EI_INIT;
+static gint ett_kink;
+/*static gint ett_kink_version;*/
+static gint ett_kink_payload;
+static gint ett_payload_kink_ap_req;
+static gint ett_payload_kink_ap_rep;
+static gint ett_payload_kink_krb_error;
+static gint ett_payload_kink_tgt_req;
+static gint ett_payload_kink_tgt_rep;
+static gint ett_payload_kink_isakmp;
+static gint ett_payload_kink_encrypt;
+static gint ett_payload_kink_error;
+static gint ett_payload_not_defined;
+static gint ett_decrypt_kink_encrypt;
+
+static expert_field ei_kink_payload_length_small;
+static expert_field ei_kink_payload_length_mismatch;
 
 
 /* Define the kink type value */
diff --git a/epan/dissectors/packet-kismet.c b/epan/dissectors/packet-kismet.c
index 637f394e51..0329b579b3 100644
--- a/epan/dissectors/packet-kismet.c
+++ b/epan/dissectors/packet-kismet.c
@@ -20,21 +20,21 @@
 #include <epan/expert.h>
 #include <wsutil/strtoi.h>
 
-static int proto_kismet = -1;
-static int hf_kismet_response = -1;
-static int hf_kismet_request = -1;
-static int hf_kismet_version = -1;
-static int hf_kismet_start_time = -1;
-static int hf_kismet_server_name = -1;
-static int hf_kismet_build_revision = -1;
-static int hf_kismet_unknown_field = -1;
-static int hf_kismet_extended_version_string = -1;
-static int hf_kismet_time = -1;
-
-static gint ett_kismet = -1;
-static gint ett_kismet_reqresp = -1;
-
-static expert_field ei_time_invalid = EI_INIT;
+static int proto_kismet;
+static int hf_kismet_response;
+static int hf_kismet_request;
+static int hf_kismet_version;
+static int hf_kismet_start_time;
+static int hf_kismet_server_name;
+static int hf_kismet_build_revision;
+static int hf_kismet_unknown_field;
+static int hf_kismet_extended_version_string;
+static int hf_kismet_time;
+
+static gint ett_kismet;
+static gint ett_kismet_reqresp;
+
+static expert_field ei_time_invalid;
 
 #define TCP_PORT_KISMET	2501 /* Not IANA registered */
 
diff --git a/epan/dissectors/packet-klm.c b/epan/dissectors/packet-klm.c
index 5d15bfd195..ebc90d26d2 100644
--- a/epan/dissectors/packet-klm.c
+++ b/epan/dissectors/packet-klm.c
@@ -15,21 +15,21 @@
 void proto_register_klm(void);
 void proto_reg_handoff_klm(void);
 
-static int proto_klm = -1;
-static int hf_klm_procedure_v1 = -1;
-static int hf_klm_exclusive = -1;
-static int hf_klm_lock = -1;
-static int hf_klm_servername = -1;
-static int hf_klm_pid = -1;
-static int hf_klm_offset = -1;
-static int hf_klm_len = -1;
-static int hf_klm_stats = -1;
-static int hf_klm_holder = -1;
-static int hf_klm_block = -1;
-
-static gint ett_klm = -1;
-static gint ett_klm_lock = -1;
-static gint ett_klm_holder = -1;
+static int proto_klm;
+static int hf_klm_procedure_v1;
+static int hf_klm_exclusive;
+static int hf_klm_lock;
+static int hf_klm_servername;
+static int hf_klm_pid;
+static int hf_klm_offset;
+static int hf_klm_len;
+static int hf_klm_stats;
+static int hf_klm_holder;
+static int hf_klm_block;
+
+static gint ett_klm;
+static gint ett_klm_lock;
+static gint ett_klm_holder;
 
 #define KLMPROC_TEST   1
 #define KLMPROC_LOCK   2
diff --git a/epan/dissectors/packet-knet.c b/epan/dissectors/packet-knet.c
index fa03e7570c..dbc49a12b0 100644
--- a/epan/dissectors/packet-knet.c
+++ b/epan/dissectors/packet-knet.c
@@ -50,7 +50,7 @@ void proto_reg_handoff_knet(void);
  * Protocol variables.
  */
 /**@{*/
-static int proto_knet        = -1;
+static int proto_knet;
 /**@}*/
 
 /**
@@ -60,31 +60,31 @@ static int proto_knet        = -1;
 /* *@{*/
 
 /* Fields used by the TCP/SCTP dissector */
-static int hf_knet_message_tree =   -1; /*!< Message tree */
-static int hf_knet_content_length_vle = -1; /*!< Content Length */
+static int hf_knet_message_tree; /*!< Message tree */
+static int hf_knet_content_length_vle; /*!< Content Length */
 
 /* Fields used by the UDP dissector */
-static int hf_knet_content_length =              -1; /*!< Content Length */
-static int hf_knet_datagram_tree =               -1; /*!< Datagram subtree */
-static int hf_knet_flags =                       -1; /*!< UDP Flags subtree */
-static int hf_knet_inorder =                     -1; /*!< Inorder Flag */
-static int hf_knet_reliable =                    -1; /*!< Reliable Flag */
-static int hf_knet_packetid =                    -1; /*!< PacketID */
-static int hf_knet_rmib =                        -1; /*!< Reliable Message Index Base */
-static int hf_knet_msg_flags =                   -1; /*!< Message Block Flags subtree */
-static int hf_knet_msg_fs =                      -1; /*!< Fragment Start */
-static int hf_knet_msg_ff =                      -1; /*!< Fragment Flag */
-static int hf_knet_msg_inorder =                 -1; /*!< Inorder Flag */
-static int hf_knet_msg_reliable =                -1; /*!< Reliable Flag */
-static int hf_knet_msg_reliable_message_number = -1; /*!< Reliable Message Number */
-
-static int hf_knet_payload_tree =    -1; /*!< Payload subtree */
-static int hf_knet_payload =         -1; /*!< Payload subtree */
-static int hf_knet_messageid =       -1; /*!< MessageID of the packet */
-static int hf_knet_pingid =          -1;
-static int hf_knet_flowctrlreq =     -1;
-static int hf_knet_packetack =       -1;
-static int hf_knet_seqnumber =       -1;
+static int hf_knet_content_length; /*!< Content Length */
+static int hf_knet_datagram_tree; /*!< Datagram subtree */
+static int hf_knet_flags; /*!< UDP Flags subtree */
+static int hf_knet_inorder; /*!< Inorder Flag */
+static int hf_knet_reliable; /*!< Reliable Flag */
+static int hf_knet_packetid; /*!< PacketID */
+static int hf_knet_rmib; /*!< Reliable Message Index Base */
+static int hf_knet_msg_flags; /*!< Message Block Flags subtree */
+static int hf_knet_msg_fs; /*!< Fragment Start */
+static int hf_knet_msg_ff; /*!< Fragment Flag */
+static int hf_knet_msg_inorder; /*!< Inorder Flag */
+static int hf_knet_msg_reliable; /*!< Reliable Flag */
+static int hf_knet_msg_reliable_message_number; /*!< Reliable Message Number */
+
+static int hf_knet_payload_tree; /*!< Payload subtree */
+static int hf_knet_payload; /*!< Payload subtree */
+static int hf_knet_messageid; /*!< MessageID of the packet */
+static int hf_knet_pingid;
+static int hf_knet_flowctrlreq;
+static int hf_knet_packetack;
+static int hf_knet_seqnumber;
 /**@}*/
 
 /**
@@ -93,12 +93,12 @@ static int hf_knet_seqnumber =       -1;
 /* *@{*/
 
 /*Knet Subtrees */
-static gint ett_knet_main =          -1; /*!< Main kNet tree */
-static gint ett_knet_message =       -1; /*!< Message tree */
-static gint ett_knet_payload =       -1; /*!< Payload tree */
-static gint ett_knet_message_flags = -1; /*!< Message flags tree */
-static gint ett_knet_datagram =      -1;
-static gint ett_knet_flags =         -1;
+static gint ett_knet_main; /*!< Main kNet tree */
+static gint ett_knet_message; /*!< Message tree */
+static gint ett_knet_payload; /*!< Payload tree */
+static gint ett_knet_message_flags; /*!< Message flags tree */
+static gint ett_knet_datagram;
+static gint ett_knet_flags;
 /**@}*/
 
 static dissector_handle_t knet_handle_sctp;
diff --git a/epan/dissectors/packet-knxip.c b/epan/dissectors/packet-knxip.c
index cb7d5ec614..7b97e61af2 100644
--- a/epan/dissectors/packet-knxip.c
+++ b/epan/dissectors/packet-knxip.c
@@ -202,89 +202,89 @@
 /* Initialize the protocol identifier that is needed for the
  protocol hook and to register the fields in the protocol tree
 */
-static gint proto_knxip = -1;
+static gint proto_knxip;
 
 /* Initialize the registered fields identifiers. These fields
  will be registered with the protocol during initialization.
  Protocol fields are like type definitions. The protocol dissector
  later on adds items of these types to the protocol tree.
 */
-static gint hf_bytes = -1;
-static gint hf_folder = -1;
-static gint hf_knxip_header_length = -1;
-static gint hf_knxip_protocol_version = -1;
-static gint hf_knxip_service_id = -1;
-static gint hf_knxip_service_family = -1;
-static gint hf_knxip_service_type = -1;
-static gint hf_knxip_total_length = -1;
-static gint hf_knxip_structure_length = -1;
-static gint hf_knxip_host_protocol = -1;
-static gint hf_knxip_ip_address = -1;
-static gint hf_knxip_port = -1;
-static gint hf_knxip_description_type = -1;
-static gint hf_knxip_knx_medium = -1;
-static gint hf_knxip_device_status = -1;
-static gint hf_knxip_program_mode = -1;
-static gint hf_knxip_knx_address = -1;
-static gint hf_knxip_project_id = -1;
-static gint hf_knxip_project_number = -1;
-static gint hf_knxip_installation_number = -1;
-static gint hf_knxip_serial_number = -1;
-static gint hf_knxip_multicast_address = -1;
-static gint hf_knxip_mac_address = -1;
-static gint hf_knxip_friendly_name = -1;
-static gint hf_knxip_service_version = -1;
-static gint hf_knxip_security_version = -1;
-static gint hf_knxip_manufacturer_code = -1;
-static gint hf_knxip_connection_type = -1;
-static gint hf_knxip_knx_layer = -1;
-static gint hf_knxip_reserved = -1;
-static gint hf_knxip_channel = -1;
-static gint hf_knxip_status = -1;
-static gint hf_knxip_seq_counter = -1;
-static gint hf_knxip_ip_subnet = -1;
-static gint hf_knxip_ip_gateway = -1;
-static gint hf_knxip_ip_assign = -1;
-static gint hf_knxip_ip_caps = -1;
-static gint hf_knxip_ip_dhcp = -1;
-static gint hf_knxip_tunnel_feature = -1;
-static gint hf_knxip_routing_loss = -1;
-static gint hf_knxip_busy_time = -1;
-static gint hf_knxip_busy_control = -1;
-static gint hf_knxip_selector = -1;
-static gint hf_knxip_max_apdu_length = -1;
-static gint hf_knxip_medium_status = -1;
-static gint hf_knxip_mask_version = -1;
-static gint hf_knxip_srp_mandatory = -1;
-static gint hf_knxip_srp_type = -1;
-static gint hf_knxip_reset_command = -1;
-static gint hf_knxip_session = -1;
-static gint hf_knxip_tag = -1;
-static gint hf_knxip_user = -1;
-static gint hf_knxip_session_status = -1;
+static gint hf_bytes;
+static gint hf_folder;
+static gint hf_knxip_header_length;
+static gint hf_knxip_protocol_version;
+static gint hf_knxip_service_id;
+static gint hf_knxip_service_family;
+static gint hf_knxip_service_type;
+static gint hf_knxip_total_length;
+static gint hf_knxip_structure_length;
+static gint hf_knxip_host_protocol;
+static gint hf_knxip_ip_address;
+static gint hf_knxip_port;
+static gint hf_knxip_description_type;
+static gint hf_knxip_knx_medium;
+static gint hf_knxip_device_status;
+static gint hf_knxip_program_mode;
+static gint hf_knxip_knx_address;
+static gint hf_knxip_project_id;
+static gint hf_knxip_project_number;
+static gint hf_knxip_installation_number;
+static gint hf_knxip_serial_number;
+static gint hf_knxip_multicast_address;
+static gint hf_knxip_mac_address;
+static gint hf_knxip_friendly_name;
+static gint hf_knxip_service_version;
+static gint hf_knxip_security_version;
+static gint hf_knxip_manufacturer_code;
+static gint hf_knxip_connection_type;
+static gint hf_knxip_knx_layer;
+static gint hf_knxip_reserved;
+static gint hf_knxip_channel;
+static gint hf_knxip_status;
+static gint hf_knxip_seq_counter;
+static gint hf_knxip_ip_subnet;
+static gint hf_knxip_ip_gateway;
+static gint hf_knxip_ip_assign;
+static gint hf_knxip_ip_caps;
+static gint hf_knxip_ip_dhcp;
+static gint hf_knxip_tunnel_feature;
+static gint hf_knxip_routing_loss;
+static gint hf_knxip_busy_time;
+static gint hf_knxip_busy_control;
+static gint hf_knxip_selector;
+static gint hf_knxip_max_apdu_length;
+static gint hf_knxip_medium_status;
+static gint hf_knxip_mask_version;
+static gint hf_knxip_srp_mandatory;
+static gint hf_knxip_srp_type;
+static gint hf_knxip_reset_command;
+static gint hf_knxip_session;
+static gint hf_knxip_tag;
+static gint hf_knxip_user;
+static gint hf_knxip_session_status;
 
 /* Initialize the subtree pointers. These pointers are needed to
  display the protocol in a structured tree. Subtrees hook on
  already defined fields or (the topmost) on the protocol itself
 */
-static gint ett_kip = -1;
-static gint ett_efcp = -1;
-static gint ett_service = -1;
-static gint ett_hpai = -1;
-static gint ett_dib = -1;
-static gint ett_medium = -1;
-static gint ett_status = -1;
-static gint ett_projectid = -1;
-static gint ett_service_family = -1;
-static gint ett_ip_assignment = -1;
-static gint ett_cri = -1;
-static gint ett_crd = -1;
-static gint ett_cnhdr = -1;
-static gint ett_loss = -1;
-static gint ett_busy = -1;
-static gint ett_selector = -1;
-static gint ett_decrypted = -1;
-static gint ett_tunnel = -1;
+static gint ett_kip;
+static gint ett_efcp;
+static gint ett_service;
+static gint ett_hpai;
+static gint ett_dib;
+static gint ett_medium;
+static gint ett_status;
+static gint ett_projectid;
+static gint ett_service_family;
+static gint ett_ip_assignment;
+static gint ett_cri;
+static gint ett_crd;
+static gint ett_cnhdr;
+static gint ett_loss;
+static gint ett_busy;
+static gint ett_selector;
+static gint ett_decrypted;
+static gint ett_tunnel;
 
 /* Set up the value_string tables for the service families
  and the service types (note that the service types in KNXnet/IP
@@ -487,8 +487,8 @@ static const value_string session_status_vals[] = {
 guint8 knxip_error;
 guint8 knxip_host_protocol;
 
-expert_field ei_knxip_error = EI_INIT;
-expert_field ei_knxip_warning = EI_INIT;
+expert_field ei_knxip_error;
+expert_field ei_knxip_warning;
 
 static gboolean pref_desegment = TRUE;
 static const gchar* pref_key_texts[ MAX_KNX_DECRYPTION_KEYS ];
diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c
index 338dc99ddb..e7316481d1 100644
--- a/epan/dissectors/packet-kpasswd.c
+++ b/epan/dissectors/packet-kpasswd.c
@@ -28,19 +28,19 @@ static dissector_handle_t kpasswd_handle_tcp;
 /* Desegment Kerberos over TCP messages */
 static gboolean kpasswd_desegment = TRUE;
 
-static int proto_kpasswd = -1;
-static int hf_kpasswd_message_len = -1;
-static int hf_kpasswd_version = -1;
-static int hf_kpasswd_result = -1;
-static int hf_kpasswd_result_string = -1;
-static int hf_kpasswd_ap_req_len = -1;
-static int hf_kpasswd_ap_req_data = -1;
-static int hf_kpasswd_krb_priv_message = -1;
-static int hf_kpasswd_ChangePasswdData = -1;
-
-static gint ett_kpasswd = -1;
-static gint ett_ap_req_data = -1;
-static gint ett_krb_priv_message = -1;
+static int proto_kpasswd;
+static int hf_kpasswd_message_len;
+static int hf_kpasswd_version;
+static int hf_kpasswd_result;
+static int hf_kpasswd_result_string;
+static int hf_kpasswd_ap_req_len;
+static int hf_kpasswd_ap_req_data;
+static int hf_kpasswd_krb_priv_message;
+static int hf_kpasswd_ChangePasswdData;
+
+static gint ett_kpasswd;
+static gint ett_ap_req_data;
+static gint ett_krb_priv_message;
 
 
 #define UDP_PORT_KPASSWD        464
diff --git a/epan/dissectors/packet-kt.c b/epan/dissectors/packet-kt.c
index 47b6abb2da..56892c225f 100644
--- a/epan/dissectors/packet-kt.c
+++ b/epan/dissectors/packet-kt.c
@@ -24,7 +24,7 @@
 void proto_register_kt(void);
 void proto_reg_handoff_kt(void);
 
-static int proto_kt = -1;
+static int proto_kt;
 
 /*
  * A few notes before we get into the thick of things...
@@ -68,31 +68,31 @@ static int proto_kt = -1;
 static dissector_handle_t kt_handle;
 
 /* Sub-trees */
-static gint ett_kt = -1;
-static gint ett_kt_rec = -1;
+static gint ett_kt;
+static gint ett_kt_rec;
 
 /* Header fields */
-static gint hf_kt_magic = -1;
-static gint hf_kt_type = -1;
-static gint hf_kt_ts = -1;
-static gint hf_kt_flags = -1;
-static gint hf_kt_rnum = -1;
-static gint hf_kt_dbidx = -1;
-static gint hf_kt_sid= -1;
-static gint hf_kt_xt = -1;
-static gint hf_kt_xt_resp = -1;
-static gint hf_kt_ksiz = -1;
-static gint hf_kt_vsiz = -1;
-static gint hf_kt_key = -1;
-static gint hf_kt_val = -1;
-static gint hf_kt_key_str = -1;
-static gint hf_kt_val_str = -1;
-static gint hf_kt_hits = -1;
-static gint hf_kt_nsiz = -1;
-static gint hf_kt_name = -1;
-static gint hf_kt_size = -1;
-static gint hf_kt_log = -1;
-static gint hf_kt_rec = -1;
+static gint hf_kt_magic;
+static gint hf_kt_type;
+static gint hf_kt_ts;
+static gint hf_kt_flags;
+static gint hf_kt_rnum;
+static gint hf_kt_dbidx;
+static gint hf_kt_sid;
+static gint hf_kt_xt;
+static gint hf_kt_xt_resp;
+static gint hf_kt_ksiz;
+static gint hf_kt_vsiz;
+static gint hf_kt_key;
+static gint hf_kt_val;
+static gint hf_kt_key_str;
+static gint hf_kt_val_str;
+static gint hf_kt_hits;
+static gint hf_kt_nsiz;
+static gint hf_kt_name;
+static gint hf_kt_size;
+static gint hf_kt_log;
+static gint hf_kt_rec;
 
 /* Magic Values */
 #define KT_MAGIC_REPL_WAIT      0xB0
diff --git a/epan/dissectors/packet-l1-events.c b/epan/dissectors/packet-l1-events.c
index 13e3752f4c..02e94ac009 100644
--- a/epan/dissectors/packet-l1-events.c
+++ b/epan/dissectors/packet-l1-events.c
@@ -29,10 +29,10 @@ static dissector_handle_t l1_events_handle;
  */
 
 /* Filterable header fields */
-static gint proto_l1_events = -1;
+static gint proto_l1_events;
 
 /* Subtrees */
-static gint ett_l1_events = -1;
+static gint ett_l1_events;
 
 static int
 dissect_l1_events(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c
index c8637df916..5c4e7fe462 100644
--- a/epan/dissectors/packet-l2tp.c
+++ b/epan/dissectors/packet-l2tp.c
@@ -63,198 +63,198 @@
 void proto_register_l2tp(void);
 void proto_reg_handoff_l2tp(void);
 
-static int proto_l2tp = -1;
-static int hf_l2tp_flags = -1;
-static int hf_l2tp_type = -1;
-static int hf_l2tp_length_bit = -1;
-static int hf_l2tp_seq_bit = -1;
-static int hf_l2tp_offset_bit = -1;
-static int hf_l2tp_priority = -1;
-static int hf_l2tp_version = -1;
-static int hf_l2tp_length = -1;
-static int hf_l2tp_tunnel = -1;
-static int hf_l2tp_session = -1;
-static int hf_l2tp_Ns = -1;
-static int hf_l2tp_Nr = -1;
-static int hf_l2tp_offset = -1;
-static int hf_l2tp_avp_mandatory = -1;
-static int hf_l2tp_avp_hidden = -1;
-static int hf_l2tp_avp_length = -1;
-static int hf_l2tp_avp_vendor_id = -1;
-static int hf_l2tp_avp_type = -1;
-static int hf_l2tp_tie_breaker = -1;
-static int hf_l2tp_sid = -1;
-static int hf_l2tp_res = -1;
-static int hf_l2tp_ccid = -1;
-static int hf_l2tp_cookie = -1;
-static int hf_l2tp_l2_spec_def = -1;
-static int hf_l2tp_l2_spec_atm = -1;
-static int hf_l2tp_l2_spec_docsis_dmpt = -1;
-static int hf_l2tp_l2_spec_v = -1;
-static int hf_l2tp_l2_spec_s = -1;
-static int hf_l2tp_l2_spec_h = -1;
-static int hf_l2tp_l2_spec_flow_id = -1;
-static int hf_l2tp_l2_spec_sequence = -1;
-static int hf_l2tp_l2_spec_t = -1;
-static int hf_l2tp_l2_spec_g = -1;
-static int hf_l2tp_l2_spec_c = -1;
-static int hf_l2tp_l2_spec_u = -1;
-static int hf_l2tp_cisco_avp_type = -1;
-static int hf_l2tp_ericsson_avp_type = -1;
-static int hf_l2tp_broadband_avp_type = -1;
-static int hf_l2tp_cablelabs_avp_type = -1;
-static int hf_l2tp_avp_message_type = -1;
-static int hf_l2tp_avp_assigned_tunnel_id = -1;
-static int hf_l2tp_avp_assigned_control_conn_id = -1;
-static int hf_l2tp_avp_assigned_session_id = -1;
-static int hf_l2tp_avp_remote_session_id = -1;
-static int hf_l2tp_avp_local_session_id = -1;
-static int hf_l2tp_avp_called_number = -1;
-static int hf_l2tp_avp_calling_number = -1;
-static int hf_l2tp_cisco_tie_breaker = -1;
-static int hf_l2tp_cablel_avp_l_bit = -1;
-static int hf_l2tp_cablel_avp_tsid_group_id = -1;
-static int hf_l2tp_cablel_avp_frequency = -1;
-static int hf_l2tp_cablel_avp_modulation = -1;
-static int hf_l2tp_cablel_avp_m = -1;
-static int hf_l2tp_cablel_avp_n = -1;
-static int hf_l2tp_broadband_agent_circuit_id = -1;
-static int hf_l2tp_broadband_agent_remote_id = -1;
-static int hf_l2tp_broadband_actual_dr_up = -1;
-static int hf_l2tp_broadband_actual_dr_down = -1;
-static int hf_l2tp_broadband_minimum_dr_up = -1;
-static int hf_l2tp_broadband_minimum_dr_down = -1;
-static int hf_l2tp_broadband_attainable_dr_up = -1;
-static int hf_l2tp_broadband_attainable_dr_down = -1;
-static int hf_l2tp_broadband_maximum_dr_up = -1;
-static int hf_l2tp_broadband_maximum_dr_down = -1;
-static int hf_l2tp_broadband_minimum_dr_up_low_power = -1;
-static int hf_l2tp_broadband_minimum_dr_down_low_power = -1;
-static int hf_l2tp_broadband_maximum_interleaving_delay_up = -1;
-static int hf_l2tp_broadband_actual_interleaving_delay_up = -1;
-static int hf_l2tp_broadband_maximum_interleaving_delay_down = -1;
-static int hf_l2tp_broadband_actual_interleaving_delay_down = -1;
-static int hf_l2tp_broadband_access_loop_encapsulation = -1;
-static int hf_l2tp_broadband_access_loop_encapsulation_data_link = -1;
-static int hf_l2tp_broadband_access_loop_encapsulation_enc1 = -1;
-static int hf_l2tp_broadband_access_loop_encapsulation_enc2 = -1;
-static int hf_l2tp_broadband_ancp_access_line_type = -1;
-static int hf_l2tp_broadband_iwf_session = -1;
-static int hf_l2tp_avp_csu = -1;
-static int hf_l2tp_avp_csu_res = -1;
-static int hf_l2tp_avp_csu_remote_session_id_v2 = -1;
-static int hf_l2tp_avp_csu_current_tx_speed_v2 = -1;
-static int hf_l2tp_avp_csu_current_rx_speed_v2 = -1;
-static int hf_l2tp_avp_csu_remote_session_id_v3 = -1;
-static int hf_l2tp_avp_csu_current_tx_speed_v3 = -1;
-static int hf_l2tp_avp_csu_current_rx_speed_v3 = -1;
-
-static int hf_l2tp_ericsson_msg_type = -1;
-static int hf_l2tp_ericsson_conn_type = -1;
-static int hf_l2tp_ericsson_stn_name = -1;
-static int hf_l2tp_ericsson_crc32_enable = -1;
-static int hf_l2tp_ericsson_abis_lower_mode = -1;
-static int hf_l2tp_ericsson_tc_overl_thresh = -1;
-static int hf_l2tp_ericsson_tc_num_groups = -1;
-static int hf_l2tp_ericsson_tcg_group_id = -1;
-static int hf_l2tp_ericsson_tcg_num_sapis = -1;
-static int hf_l2tp_ericsson_tcg_sapi = -1;
-static int hf_l2tp_ericsson_tcg_ip = -1;
-static int hf_l2tp_ericsson_tcg_dscp = -1;
-static int hf_l2tp_ericsson_tcg_crc32_enable = -1;
-static int hf_l2tp_ericsson_tcg_bundling_tout = -1;
-static int hf_l2tp_ericsson_tcg_bundling_max_pkt = -1;
-static int hf_l2tp_ericsson_tc_num_maps = -1;
-static int hf_l2tp_ericsson_map_tei_low = -1;
-static int hf_l2tp_ericsson_map_tei_high = -1;
-static int hf_l2tp_ericsson_map_sc = -1;
-static int hf_l2tp_ericsson_ver_pref = -1;
-static int hf_l2tp_ericsson_ver_2 = -1;
-static int hf_l2tp_ericsson_ver_3 = -1;
+static int proto_l2tp;
+static int hf_l2tp_flags;
+static int hf_l2tp_type;
+static int hf_l2tp_length_bit;
+static int hf_l2tp_seq_bit;
+static int hf_l2tp_offset_bit;
+static int hf_l2tp_priority;
+static int hf_l2tp_version;
+static int hf_l2tp_length;
+static int hf_l2tp_tunnel;
+static int hf_l2tp_session;
+static int hf_l2tp_Ns;
+static int hf_l2tp_Nr;
+static int hf_l2tp_offset;
+static int hf_l2tp_avp_mandatory;
+static int hf_l2tp_avp_hidden;
+static int hf_l2tp_avp_length;
+static int hf_l2tp_avp_vendor_id;
+static int hf_l2tp_avp_type;
+static int hf_l2tp_tie_breaker;
+static int hf_l2tp_sid;
+static int hf_l2tp_res;
+static int hf_l2tp_ccid;
+static int hf_l2tp_cookie;
+static int hf_l2tp_l2_spec_def;
+static int hf_l2tp_l2_spec_atm;
+static int hf_l2tp_l2_spec_docsis_dmpt;
+static int hf_l2tp_l2_spec_v;
+static int hf_l2tp_l2_spec_s;
+static int hf_l2tp_l2_spec_h;
+static int hf_l2tp_l2_spec_flow_id;
+static int hf_l2tp_l2_spec_sequence;
+static int hf_l2tp_l2_spec_t;
+static int hf_l2tp_l2_spec_g;
+static int hf_l2tp_l2_spec_c;
+static int hf_l2tp_l2_spec_u;
+static int hf_l2tp_cisco_avp_type;
+static int hf_l2tp_ericsson_avp_type;
+static int hf_l2tp_broadband_avp_type;
+static int hf_l2tp_cablelabs_avp_type;
+static int hf_l2tp_avp_message_type;
+static int hf_l2tp_avp_assigned_tunnel_id;
+static int hf_l2tp_avp_assigned_control_conn_id;
+static int hf_l2tp_avp_assigned_session_id;
+static int hf_l2tp_avp_remote_session_id;
+static int hf_l2tp_avp_local_session_id;
+static int hf_l2tp_avp_called_number;
+static int hf_l2tp_avp_calling_number;
+static int hf_l2tp_cisco_tie_breaker;
+static int hf_l2tp_cablel_avp_l_bit;
+static int hf_l2tp_cablel_avp_tsid_group_id;
+static int hf_l2tp_cablel_avp_frequency;
+static int hf_l2tp_cablel_avp_modulation;
+static int hf_l2tp_cablel_avp_m;
+static int hf_l2tp_cablel_avp_n;
+static int hf_l2tp_broadband_agent_circuit_id;
+static int hf_l2tp_broadband_agent_remote_id;
+static int hf_l2tp_broadband_actual_dr_up;
+static int hf_l2tp_broadband_actual_dr_down;
+static int hf_l2tp_broadband_minimum_dr_up;
+static int hf_l2tp_broadband_minimum_dr_down;
+static int hf_l2tp_broadband_attainable_dr_up;
+static int hf_l2tp_broadband_attainable_dr_down;
+static int hf_l2tp_broadband_maximum_dr_up;
+static int hf_l2tp_broadband_maximum_dr_down;
+static int hf_l2tp_broadband_minimum_dr_up_low_power;
+static int hf_l2tp_broadband_minimum_dr_down_low_power;
+static int hf_l2tp_broadband_maximum_interleaving_delay_up;
+static int hf_l2tp_broadband_actual_interleaving_delay_up;
+static int hf_l2tp_broadband_maximum_interleaving_delay_down;
+static int hf_l2tp_broadband_actual_interleaving_delay_down;
+static int hf_l2tp_broadband_access_loop_encapsulation;
+static int hf_l2tp_broadband_access_loop_encapsulation_data_link;
+static int hf_l2tp_broadband_access_loop_encapsulation_enc1;
+static int hf_l2tp_broadband_access_loop_encapsulation_enc2;
+static int hf_l2tp_broadband_ancp_access_line_type;
+static int hf_l2tp_broadband_iwf_session;
+static int hf_l2tp_avp_csu;
+static int hf_l2tp_avp_csu_res;
+static int hf_l2tp_avp_csu_remote_session_id_v2;
+static int hf_l2tp_avp_csu_current_tx_speed_v2;
+static int hf_l2tp_avp_csu_current_rx_speed_v2;
+static int hf_l2tp_avp_csu_remote_session_id_v3;
+static int hf_l2tp_avp_csu_current_tx_speed_v3;
+static int hf_l2tp_avp_csu_current_rx_speed_v3;
+
+static int hf_l2tp_ericsson_msg_type;
+static int hf_l2tp_ericsson_conn_type;
+static int hf_l2tp_ericsson_stn_name;
+static int hf_l2tp_ericsson_crc32_enable;
+static int hf_l2tp_ericsson_abis_lower_mode;
+static int hf_l2tp_ericsson_tc_overl_thresh;
+static int hf_l2tp_ericsson_tc_num_groups;
+static int hf_l2tp_ericsson_tcg_group_id;
+static int hf_l2tp_ericsson_tcg_num_sapis;
+static int hf_l2tp_ericsson_tcg_sapi;
+static int hf_l2tp_ericsson_tcg_ip;
+static int hf_l2tp_ericsson_tcg_dscp;
+static int hf_l2tp_ericsson_tcg_crc32_enable;
+static int hf_l2tp_ericsson_tcg_bundling_tout;
+static int hf_l2tp_ericsson_tcg_bundling_max_pkt;
+static int hf_l2tp_ericsson_tc_num_maps;
+static int hf_l2tp_ericsson_map_tei_low;
+static int hf_l2tp_ericsson_map_tei_high;
+static int hf_l2tp_ericsson_map_sc;
+static int hf_l2tp_ericsson_ver_pref;
+static int hf_l2tp_ericsson_ver_2;
+static int hf_l2tp_ericsson_ver_3;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_l2tp_cisco_pw_type = -1;
-static int hf_l2tp_avp_error_code = -1;
-static int hf_l2tp_avp_cause_msg = -1;
-static int hf_l2tp_avp_host_name = -1;
-static int hf_l2tp_avp_maximum_bps = -1;
-static int hf_l2tp_avp_pseudowire_type = -1;
-static int hf_l2tp_avp_minimum_bps = -1;
-static int hf_l2tp_avp_nonce = -1;
-static int hf_l2tp_avp_circuit_status = -1;
-static int hf_l2tp_avp_receive_window_size = -1;
-static int hf_l2tp_avp_vendor_name = -1;
-static int hf_l2tp_avp_layer2_specific_sublayer = -1;
-static int hf_l2tp_avp_disconnect_code = -1;
-static int hf_l2tp_cisco_circuit_status = -1;
-static int hf_l2tp_cisco_remote_session_id = -1;
-static int hf_l2tp_avp_router_id = -1;
-static int hf_l2tp_avp_send_accm = -1;
-static int hf_l2tp_avp_last_sent_lcp_confreq = -1;
-static int hf_l2tp_avp_sync_framing_supported = -1;
-static int hf_l2tp_cisco_assigned_control_connection_id = -1;
-static int hf_l2tp_avp_sync_framing_type = -1;
-static int hf_l2tp_avp_assigned_cookie = -1;
-static int hf_l2tp_avp_time_out_errors = -1;
-static int hf_l2tp_avp_sub_address = -1;
-static int hf_l2tp_avp_connect_speed = -1;
-static int hf_l2tp_avp_analog_access_supported = -1;
-static int hf_l2tp_avp_private_group_id = -1;
-static int hf_l2tp_avp_proxy_authen_response = -1;
-static int hf_l2tp_avp_chap_challenge = -1;
-static int hf_l2tp_avp_call_serial_number = -1;
-static int hf_l2tp_avp_digital_access_supported = -1;
-static int hf_l2tp_avp_physical_channel = -1;
-static int hf_l2tp_avp_advisory_msg = -1;
-static int hf_l2tp_avp_data_sequencing = -1;
-static int hf_l2tp_avp_control_protocol_number = -1;
-static int hf_l2tp_avp_error_message = -1;
-static int hf_l2tp_avp_initial_received_lcp_confreq = -1;
-static int hf_l2tp_avp_async_framing_supported = -1;
-static int hf_l2tp_cisco_message_digest = -1;
-static int hf_l2tp_avp_circuit_type = -1;
-static int hf_l2tp_cisco_circuit_type = -1;
-static int hf_l2tp_avp_proxy_authen_challenge = -1;
-static int hf_l2tp_cisco_assigned_cookie = -1;
-static int hf_l2tp_avp_receive_accm = -1;
-static int hf_l2tp_stop_ccn_result_code = -1;
-static int hf_l2tp_avp_proxy_authen_id = -1;
-static int hf_l2tp_avp_digital_bearer_type = -1;
-static int hf_l2tp_avp_rx_connect_speed = -1;
-static int hf_l2tp_cisco_nonce = -1;
-static int hf_l2tp_avp_chap_challenge_response = -1;
-static int hf_l2tp_avp_cause_code = -1;
-static int hf_l2tp_avp_protocol_revision = -1;
-static int hf_l2tp_avp_alignment_errors = -1;
-static int hf_l2tp_avp_last_received_lcp_confreq = -1;
-static int hf_l2tp_avp_crc_errors = -1;
-static int hf_l2tp_avp_random_vector = -1;
-static int hf_l2tp_avp_preferred_language = -1;
-static int hf_l2tp_cisco_interface_mtu = -1;
-static int hf_l2tp_avp_async_framing_type = -1;
-static int hf_l2tp_avp_pw_type = -1;
-static int hf_l2tp_cisco_local_session_id = -1;
-static int hf_l2tp_avp_hardware_overruns = -1;
-static int hf_l2tp_avp_proxy_authen_type = -1;
-static int hf_l2tp_cisco_draft_avp_version = -1;
-static int hf_l2tp_avp_protocol_version = -1;
-static int hf_l2tp_result_code = -1;
-static int hf_l2tp_avp_buffer_overruns = -1;
-static int hf_l2tp_avp_remote_end_id = -1;
-static int hf_l2tp_cisco_pseudowire_type = -1;
-static int hf_l2tp_avp_message_digest = -1;
-static int hf_l2tp_avp_proxy_authen_name = -1;
-static int hf_l2tp_avp_analog_bearer_type = -1;
-static int hf_l2tp_avp_cause_code_direction = -1;
-static int hf_l2tp_avp_firmware_revision = -1;
-static int hf_l2tp_avp_cause_code_message = -1;
-static int hf_l2tp_avp_framing_errors = -1;
-static int hf_l2tp_cisco_remote_end_id = -1;
-static int hf_l2tp_avp_tx_connect_speed_v3 = -1;
-static int hf_l2tp_avp_rx_connect_speed_v3 = -1;
-static int hf_l2tp_lapd_info = -1;
-static int hf_l2tp_zero_length_body_message = -1;
-static int hf_l2tp_offset_padding = -1;
+static int hf_l2tp_cisco_pw_type;
+static int hf_l2tp_avp_error_code;
+static int hf_l2tp_avp_cause_msg;
+static int hf_l2tp_avp_host_name;
+static int hf_l2tp_avp_maximum_bps;
+static int hf_l2tp_avp_pseudowire_type;
+static int hf_l2tp_avp_minimum_bps;
+static int hf_l2tp_avp_nonce;
+static int hf_l2tp_avp_circuit_status;
+static int hf_l2tp_avp_receive_window_size;
+static int hf_l2tp_avp_vendor_name;
+static int hf_l2tp_avp_layer2_specific_sublayer;
+static int hf_l2tp_avp_disconnect_code;
+static int hf_l2tp_cisco_circuit_status;
+static int hf_l2tp_cisco_remote_session_id;
+static int hf_l2tp_avp_router_id;
+static int hf_l2tp_avp_send_accm;
+static int hf_l2tp_avp_last_sent_lcp_confreq;
+static int hf_l2tp_avp_sync_framing_supported;
+static int hf_l2tp_cisco_assigned_control_connection_id;
+static int hf_l2tp_avp_sync_framing_type;
+static int hf_l2tp_avp_assigned_cookie;
+static int hf_l2tp_avp_time_out_errors;
+static int hf_l2tp_avp_sub_address;
+static int hf_l2tp_avp_connect_speed;
+static int hf_l2tp_avp_analog_access_supported;
+static int hf_l2tp_avp_private_group_id;
+static int hf_l2tp_avp_proxy_authen_response;
+static int hf_l2tp_avp_chap_challenge;
+static int hf_l2tp_avp_call_serial_number;
+static int hf_l2tp_avp_digital_access_supported;
+static int hf_l2tp_avp_physical_channel;
+static int hf_l2tp_avp_advisory_msg;
+static int hf_l2tp_avp_data_sequencing;
+static int hf_l2tp_avp_control_protocol_number;
+static int hf_l2tp_avp_error_message;
+static int hf_l2tp_avp_initial_received_lcp_confreq;
+static int hf_l2tp_avp_async_framing_supported;
+static int hf_l2tp_cisco_message_digest;
+static int hf_l2tp_avp_circuit_type;
+static int hf_l2tp_cisco_circuit_type;
+static int hf_l2tp_avp_proxy_authen_challenge;
+static int hf_l2tp_cisco_assigned_cookie;
+static int hf_l2tp_avp_receive_accm;
+static int hf_l2tp_stop_ccn_result_code;
+static int hf_l2tp_avp_proxy_authen_id;
+static int hf_l2tp_avp_digital_bearer_type;
+static int hf_l2tp_avp_rx_connect_speed;
+static int hf_l2tp_cisco_nonce;
+static int hf_l2tp_avp_chap_challenge_response;
+static int hf_l2tp_avp_cause_code;
+static int hf_l2tp_avp_protocol_revision;
+static int hf_l2tp_avp_alignment_errors;
+static int hf_l2tp_avp_last_received_lcp_confreq;
+static int hf_l2tp_avp_crc_errors;
+static int hf_l2tp_avp_random_vector;
+static int hf_l2tp_avp_preferred_language;
+static int hf_l2tp_cisco_interface_mtu;
+static int hf_l2tp_avp_async_framing_type;
+static int hf_l2tp_avp_pw_type;
+static int hf_l2tp_cisco_local_session_id;
+static int hf_l2tp_avp_hardware_overruns;
+static int hf_l2tp_avp_proxy_authen_type;
+static int hf_l2tp_cisco_draft_avp_version;
+static int hf_l2tp_avp_protocol_version;
+static int hf_l2tp_result_code;
+static int hf_l2tp_avp_buffer_overruns;
+static int hf_l2tp_avp_remote_end_id;
+static int hf_l2tp_cisco_pseudowire_type;
+static int hf_l2tp_avp_message_digest;
+static int hf_l2tp_avp_proxy_authen_name;
+static int hf_l2tp_avp_analog_bearer_type;
+static int hf_l2tp_avp_cause_code_direction;
+static int hf_l2tp_avp_firmware_revision;
+static int hf_l2tp_avp_cause_code_message;
+static int hf_l2tp_avp_framing_errors;
+static int hf_l2tp_cisco_remote_end_id;
+static int hf_l2tp_avp_tx_connect_speed_v3;
+static int hf_l2tp_avp_rx_connect_speed_v3;
+static int hf_l2tp_lapd_info;
+static int hf_l2tp_zero_length_body_message;
+static int hf_l2tp_offset_padding;
 
 static dissector_table_t l2tp_vendor_avp_dissector_table;
 static dissector_table_t pw_type_table;
@@ -281,21 +281,21 @@ static dissector_table_t pw_type_table;
 /* DOCSIS DMPT Sub-Layer Header definitions */
 #define FLOW_ID_MASK  0x0E
 
-static gint ett_l2tp = -1;
-static gint ett_l2tp_flags = -1;
-static gint ett_l2tp_avp = -1;
-static gint ett_l2tp_avp_sub = -1;
-static gint ett_l2tp_ale_sub = -1;
-static gint ett_l2tp_lcp = -1;
-static gint ett_l2tp_l2_spec = -1;
-static gint ett_l2tp_csu = -1;
-static gint ett_l2tp_ericsson_tcg = -1;
-static gint ett_l2tp_ericsson_map = -1;
-
-static expert_field ei_l2tp_incorrect_digest = EI_INIT;
+static gint ett_l2tp;
+static gint ett_l2tp_flags;
+static gint ett_l2tp_avp;
+static gint ett_l2tp_avp_sub;
+static gint ett_l2tp_ale_sub;
+static gint ett_l2tp_lcp;
+static gint ett_l2tp_l2_spec;
+static gint ett_l2tp_csu;
+static gint ett_l2tp_ericsson_tcg;
+static gint ett_l2tp_ericsson_map;
+
+static expert_field ei_l2tp_incorrect_digest;
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_l2tp_vendor_specific_avp_data = EI_INIT;
-static expert_field ei_l2tp_avp_length = EI_INIT;
+static expert_field ei_l2tp_vendor_specific_avp_data;
+static expert_field ei_l2tp_avp_length;
 
 static const enum_val_t l2tpv3_cookies[] = {
     {"detect",  "Detect",              -1},
diff --git a/epan/dissectors/packet-lacp.c b/epan/dissectors/packet-lacp.c
index e0dc999f9f..daf8eaa7dc 100644
--- a/epan/dissectors/packet-lacp.c
+++ b/epan/dissectors/packet-lacp.c
@@ -54,70 +54,70 @@ static const value_string lacp_type_vals[] = {
 #define LACPDU_FLAGS_EXPIRED            0x80
 
 /* Initialise the protocol and registered fields */
-static int proto_lacp = -1;
-
-static int hf_lacp_vlacp_subtype = -1;
-static int hf_lacp_version = -1;
-static int hf_lacp_tlv_type = -1;
-static int hf_lacp_tlv_length = -1;
-
-static int hf_lacp_actor_sysid_priority = -1;
-static int hf_lacp_actor_sysid = -1;
-static int hf_lacp_actor_key = -1;
-static int hf_lacp_actor_port_priority = -1;
-static int hf_lacp_actor_port = -1;
-static int hf_lacp_actor_state = -1;
-static int hf_lacp_actor_state_str = -1;
-static int hf_lacp_flags_a_activity = -1;
-static int hf_lacp_flags_a_timeout = -1;
-static int hf_lacp_flags_a_aggregation = -1;
-static int hf_lacp_flags_a_sync = -1;
-static int hf_lacp_flags_a_collecting = -1;
-static int hf_lacp_flags_a_distrib = -1;
-static int hf_lacp_flags_a_defaulted = -1;
-static int hf_lacp_flags_a_expired = -1;
-static int hf_lacp_actor_reserved = -1;
-
-static int hf_lacp_partner_sysid_priority = -1;
-static int hf_lacp_partner_sysid = -1;
-static int hf_lacp_partner_key = -1;
-static int hf_lacp_partner_port_priority = -1;
-static int hf_lacp_partner_port = -1;
-static int hf_lacp_partner_state = -1;
-static int hf_lacp_partner_state_str = -1;
-static int hf_lacp_flags_p_activity = -1;
-static int hf_lacp_flags_p_timeout = -1;
-static int hf_lacp_flags_p_aggregation = -1;
-static int hf_lacp_flags_p_sync = -1;
-static int hf_lacp_flags_p_collecting = -1;
-static int hf_lacp_flags_p_distrib = -1;
-static int hf_lacp_flags_p_defaulted = -1;
-static int hf_lacp_flags_p_expired = -1;
-static int hf_lacp_partner_reserved = -1;
-
-static int hf_lacp_coll_max_delay = -1;
-static int hf_lacp_coll_reserved = -1;
-
-static int hf_lacp_pad = -1;
-
-static int hf_lacp_vendor = -1;
-
-static int hf_lacp_vendor_hp_length = -1;
-static int hf_lacp_vendor_hp_irf_domain = -1;
-static int hf_lacp_vendor_hp_irf_mac = -1;
-static int hf_lacp_vendor_hp_irf_switch = -1;
-static int hf_lacp_vendor_hp_irf_port = -1;
-static int hf_lacp_vendor_hp_unknown = -1;
+static int proto_lacp;
+
+static int hf_lacp_vlacp_subtype;
+static int hf_lacp_version;
+static int hf_lacp_tlv_type;
+static int hf_lacp_tlv_length;
+
+static int hf_lacp_actor_sysid_priority;
+static int hf_lacp_actor_sysid;
+static int hf_lacp_actor_key;
+static int hf_lacp_actor_port_priority;
+static int hf_lacp_actor_port;
+static int hf_lacp_actor_state;
+static int hf_lacp_actor_state_str;
+static int hf_lacp_flags_a_activity;
+static int hf_lacp_flags_a_timeout;
+static int hf_lacp_flags_a_aggregation;
+static int hf_lacp_flags_a_sync;
+static int hf_lacp_flags_a_collecting;
+static int hf_lacp_flags_a_distrib;
+static int hf_lacp_flags_a_defaulted;
+static int hf_lacp_flags_a_expired;
+static int hf_lacp_actor_reserved;
+
+static int hf_lacp_partner_sysid_priority;
+static int hf_lacp_partner_sysid;
+static int hf_lacp_partner_key;
+static int hf_lacp_partner_port_priority;
+static int hf_lacp_partner_port;
+static int hf_lacp_partner_state;
+static int hf_lacp_partner_state_str;
+static int hf_lacp_flags_p_activity;
+static int hf_lacp_flags_p_timeout;
+static int hf_lacp_flags_p_aggregation;
+static int hf_lacp_flags_p_sync;
+static int hf_lacp_flags_p_collecting;
+static int hf_lacp_flags_p_distrib;
+static int hf_lacp_flags_p_defaulted;
+static int hf_lacp_flags_p_expired;
+static int hf_lacp_partner_reserved;
+
+static int hf_lacp_coll_max_delay;
+static int hf_lacp_coll_reserved;
+
+static int hf_lacp_pad;
+
+static int hf_lacp_vendor;
+
+static int hf_lacp_vendor_hp_length;
+static int hf_lacp_vendor_hp_irf_domain;
+static int hf_lacp_vendor_hp_irf_mac;
+static int hf_lacp_vendor_hp_irf_switch;
+static int hf_lacp_vendor_hp_irf_port;
+static int hf_lacp_vendor_hp_unknown;
 
 
 /* Initialise the subtree pointers */
-static gint ett_lacp = -1;
-static gint ett_lacp_a_flags = -1;
-static gint ett_lacp_p_flags = -1;
+static gint ett_lacp;
+static gint ett_lacp_a_flags;
+static gint ett_lacp_p_flags;
 
 /* Expert Items */
-static expert_field ei_lacp_wrong_tlv_type = EI_INIT;
-static expert_field ei_lacp_wrong_tlv_length = EI_INIT;
+static expert_field ei_lacp_wrong_tlv_type;
+static expert_field ei_lacp_wrong_tlv_length;
 
 static const true_false_string tfs_active_passive = { "Active", "Passive" };
 static const true_false_string tfs_short_long_timeout = { "Short Timeout", "Long Timeout" };
diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c
index a90f8a8823..7a2ad18332 100644
--- a/epan/dissectors/packet-lanforge.c
+++ b/epan/dissectors/packet-lanforge.c
@@ -28,24 +28,24 @@ void proto_reg_handoff_lanforge(void);
 #define LANFORGE_MAGIC 0x1a2b3c4d
 
 /* Initialize the protocol and registered fields */
-static int proto_lanforge = -1;
+static int proto_lanforge;
 
 /* lanforge header */
-static int hf_lanforge_crc = -1;
-static int hf_lanforge_magic = -1;
-static int hf_lanforge_src_session = -1;
-static int hf_lanforge_dst_session = -1;
-static int hf_lanforge_pld_len_l = -1;
-static int hf_lanforge_pld_len_h = -1;
-static int hf_lanforge_pld_len = -1;
-static int hf_lanforge_pld_pattern = -1;
-static int hf_lanforge_seq = -1;
-static int hf_lanforge_tx_time_s = -1;
-static int hf_lanforge_tx_time_ns = -1;
-static int hf_lanforge_timestamp = -1;
+static int hf_lanforge_crc;
+static int hf_lanforge_magic;
+static int hf_lanforge_src_session;
+static int hf_lanforge_dst_session;
+static int hf_lanforge_pld_len_l;
+static int hf_lanforge_pld_len_h;
+static int hf_lanforge_pld_len;
+static int hf_lanforge_pld_pattern;
+static int hf_lanforge_seq;
+static int hf_lanforge_tx_time_s;
+static int hf_lanforge_tx_time_ns;
+static int hf_lanforge_timestamp;
 
 /* Initialize the subtree pointer */
-static gint ett_lanforge = -1;
+static gint ett_lanforge;
 
 /* entry point */
 static gboolean dissect_lanforge(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c
index c1ea68383a..b2f047b1a4 100644
--- a/epan/dissectors/packet-lapb.c
+++ b/epan/dissectors/packet-lapb.c
@@ -18,21 +18,21 @@
 void proto_register_lapb(void);
 void proto_reg_handoff_lapb(void);
 
-static int proto_lapb = -1;
-static int hf_lapb_address = -1;
-static int hf_lapb_control = -1;
-static int hf_lapb_n_r = -1;
-static int hf_lapb_n_s = -1;
-static int hf_lapb_p = -1;
-static int hf_lapb_f = -1;
-static int hf_lapb_s_ftype = -1;
-static int hf_lapb_u_modifier_cmd = -1;
-static int hf_lapb_u_modifier_resp = -1;
-static int hf_lapb_ftype_i = -1;
-static int hf_lapb_ftype_s_u = -1;
-
-static gint ett_lapb = -1;
-static gint ett_lapb_control = -1;
+static int proto_lapb;
+static int hf_lapb_address;
+static int hf_lapb_control;
+static int hf_lapb_n_r;
+static int hf_lapb_n_s;
+static int hf_lapb_p;
+static int hf_lapb_f;
+static int hf_lapb_s_ftype;
+static int hf_lapb_u_modifier_cmd;
+static int hf_lapb_u_modifier_resp;
+static int hf_lapb_ftype_i;
+static int hf_lapb_ftype_s_u;
+
+static gint ett_lapb;
+static gint ett_lapb_control;
 
 static dissector_handle_t x25_dir_handle;
 static dissector_handle_t x25_handle;
diff --git a/epan/dissectors/packet-lapbether.c b/epan/dissectors/packet-lapbether.c
index 7e6471c53f..1d86044fb7 100644
--- a/epan/dissectors/packet-lapbether.c
+++ b/epan/dissectors/packet-lapbether.c
@@ -18,11 +18,11 @@
 void proto_register_lapbether(void);
 void proto_reg_handoff_lapbether(void);
 
-static int proto_lapbether = -1;
+static int proto_lapbether;
 
-static int hf_lapbether_length = -1;
+static int hf_lapbether_length;
 
-static gint ett_lapbether = -1;
+static gint ett_lapbether;
 
 static dissector_handle_t lapbether_handle;
 static dissector_handle_t lapb_handle;
diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c
index fcae4e191b..40fa845d79 100644
--- a/epan/dissectors/packet-lapd.c
+++ b/epan/dissectors/packet-lapd.c
@@ -39,38 +39,38 @@
 void proto_register_lapd(void);
 void proto_reg_handoff_lapd(void);
 
-static int proto_lapd = -1;
-static int hf_lapd_direction = -1;
-static int hf_lapd_address = -1;
-static int hf_lapd_sapi = -1;
-static int hf_lapd_gsm_sapi = -1;
-static int hf_lapd_cr = -1;
-static int hf_lapd_ea1 = -1;
-static int hf_lapd_tei = -1;
-static int hf_lapd_ea2 = -1;
-static int hf_lapd_control = -1;
-static int hf_lapd_n_r = -1;
-static int hf_lapd_n_s = -1;
-static int hf_lapd_p = -1;
-static int hf_lapd_p_ext = -1;
-static int hf_lapd_f = -1;
-static int hf_lapd_f_ext = -1;
-static int hf_lapd_s_ftype = -1;
-static int hf_lapd_u_modifier_cmd = -1;
-static int hf_lapd_u_modifier_resp = -1;
-static int hf_lapd_ftype_i = -1;
-static int hf_lapd_ftype_s_u = -1;
-static int hf_lapd_ftype_s_u_ext = -1;
-static int hf_lapd_checksum = -1;
-static int hf_lapd_checksum_status = -1;
-
-static gint ett_lapd = -1;
-static gint ett_lapd_address = -1;
-static gint ett_lapd_control = -1;
-static gint ett_lapd_checksum = -1;
-
-static expert_field ei_lapd_abort = EI_INIT;
-static expert_field ei_lapd_checksum_bad = EI_INIT;
+static int proto_lapd;
+static int hf_lapd_direction;
+static int hf_lapd_address;
+static int hf_lapd_sapi;
+static int hf_lapd_gsm_sapi;
+static int hf_lapd_cr;
+static int hf_lapd_ea1;
+static int hf_lapd_tei;
+static int hf_lapd_ea2;
+static int hf_lapd_control;
+static int hf_lapd_n_r;
+static int hf_lapd_n_s;
+static int hf_lapd_p;
+static int hf_lapd_p_ext;
+static int hf_lapd_f;
+static int hf_lapd_f_ext;
+static int hf_lapd_s_ftype;
+static int hf_lapd_u_modifier_cmd;
+static int hf_lapd_u_modifier_resp;
+static int hf_lapd_ftype_i;
+static int hf_lapd_ftype_s_u;
+static int hf_lapd_ftype_s_u_ext;
+static int hf_lapd_checksum;
+static int hf_lapd_checksum_status;
+
+static gint ett_lapd;
+static gint ett_lapd_address;
+static gint ett_lapd_control;
+static gint ett_lapd_checksum;
+
+static expert_field ei_lapd_abort;
+static expert_field ei_lapd_checksum_bad;
 
 static dissector_handle_t lapd_handle;
 static dissector_handle_t lapd_phdr_handle;
diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c
index 91e3fc2c84..3aae536e89 100644
--- a/epan/dissectors/packet-lapdm.c
+++ b/epan/dissectors/packet-lapdm.c
@@ -50,50 +50,50 @@ void proto_register_lapdm(void);
 
 static dissector_handle_t b4_info_handle;
 
-static int proto_lapdm = -1;
-static int hf_lapdm_address = -1;
-static int hf_lapdm_ea = -1;
-static int hf_lapdm_cr = -1;
-static int hf_lapdm_sapi = -1;
-static int hf_lapdm_lpd = -1;
-
-static int hf_lapdm_control = -1;
-static int hf_lapdm_n_r = -1;
-static int hf_lapdm_n_s = -1;
-static int hf_lapdm_p = -1;
-static int hf_lapdm_f = -1;
-static int hf_lapdm_s_ftype = -1;
-static int hf_lapdm_u_modifier_cmd = -1;
-static int hf_lapdm_u_modifier_resp = -1;
-static int hf_lapdm_ftype_i = -1;
-static int hf_lapdm_ftype_s_u = -1;
-
-static int hf_lapdm_length = -1;
-static int hf_lapdm_el = -1;
-static int hf_lapdm_m = -1;
-static int hf_lapdm_len = -1;
+static int proto_lapdm;
+static int hf_lapdm_address;
+static int hf_lapdm_ea;
+static int hf_lapdm_cr;
+static int hf_lapdm_sapi;
+static int hf_lapdm_lpd;
+
+static int hf_lapdm_control;
+static int hf_lapdm_n_r;
+static int hf_lapdm_n_s;
+static int hf_lapdm_p;
+static int hf_lapdm_f;
+static int hf_lapdm_s_ftype;
+static int hf_lapdm_u_modifier_cmd;
+static int hf_lapdm_u_modifier_resp;
+static int hf_lapdm_ftype_i;
+static int hf_lapdm_ftype_s_u;
+
+static int hf_lapdm_length;
+static int hf_lapdm_el;
+static int hf_lapdm_m;
+static int hf_lapdm_len;
 
 /*
  * LAPDm fragment handling
  */
-static int hf_lapdm_fragment_data = -1;
-static int hf_lapdm_fragments = -1;
-static int hf_lapdm_fragment = -1;
-static int hf_lapdm_fragment_overlap = -1;
-static int hf_lapdm_fragment_overlap_conflicts = -1;
-static int hf_lapdm_fragment_multiple_tails = -1;
-static int hf_lapdm_fragment_too_long_fragment = -1;
-static int hf_lapdm_fragment_error = -1;
-static int hf_lapdm_fragment_count = -1;
-static int hf_lapdm_reassembled_in = -1;
-static int hf_lapdm_reassembled_length = -1;
-
-static gint ett_lapdm = -1;
-static gint ett_lapdm_address = -1;
-static gint ett_lapdm_control = -1;
-static gint ett_lapdm_length = -1;
-static gint ett_lapdm_fragment = -1;
-static gint ett_lapdm_fragments = -1;
+static int hf_lapdm_fragment_data;
+static int hf_lapdm_fragments;
+static int hf_lapdm_fragment;
+static int hf_lapdm_fragment_overlap;
+static int hf_lapdm_fragment_overlap_conflicts;
+static int hf_lapdm_fragment_multiple_tails;
+static int hf_lapdm_fragment_too_long_fragment;
+static int hf_lapdm_fragment_error;
+static int hf_lapdm_fragment_count;
+static int hf_lapdm_reassembled_in;
+static int hf_lapdm_reassembled_length;
+
+static gint ett_lapdm;
+static gint ett_lapdm_address;
+static gint ett_lapdm_control;
+static gint ett_lapdm_length;
+static gint ett_lapdm_fragment;
+static gint ett_lapdm_fragments;
 
 static reassembly_table lapdm_reassembly_table;
 
diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c
index 5ed41f91c0..05bc63c791 100644
--- a/epan/dissectors/packet-laplink.c
+++ b/epan/dissectors/packet-laplink.c
@@ -26,15 +26,15 @@ static dissector_handle_t laplink_tcp_handle;
 #define UDP_PORT_LAPLINK 1547
 
 /* Initialize the protocol and registered fields */
-static int proto_laplink = -1;
-static int hf_laplink_udp_ident = -1;
-static int hf_laplink_udp_name = -1;
-static int hf_laplink_tcp_ident = -1;
-static int hf_laplink_tcp_length = -1;
-static int hf_laplink_tcp_data = -1;
+static int proto_laplink;
+static int hf_laplink_udp_ident;
+static int hf_laplink_udp_name;
+static int hf_laplink_tcp_ident;
+static int hf_laplink_tcp_length;
+static int hf_laplink_tcp_data;
 
 /* Initialize the subtree pointers */
-static gint ett_laplink = -1;
+static gint ett_laplink;
 
 static const value_string laplink_udp_magic[] = {
 	{ 0x0f010000, "Name Solicitation" },
diff --git a/epan/dissectors/packet-lapsat.c b/epan/dissectors/packet-lapsat.c
index ce3f844686..9809b8f8d3 100644
--- a/epan/dissectors/packet-lapsat.c
+++ b/epan/dissectors/packet-lapsat.c
@@ -27,53 +27,53 @@
 
 void proto_register_lapsat(void);
 
-static int proto_lapsat = -1;
+static int proto_lapsat;
 
 static reassembly_table lapsat_reassembly_table;
 
 static dissector_table_t lapsat_sapi_dissector_table;
 
-static gint ett_lapsat = -1;
-static gint ett_lapsat_address = -1;
-static gint ett_lapsat_control = -1;
-static gint ett_lapsat_fragment = -1;
-static gint ett_lapsat_fragments = -1;
-
-static int hf_lapsat_addr = -1;
-static int hf_lapsat_addr_sst = -1;
-static int hf_lapsat_addr_cr = -1;
-static int hf_lapsat_addr_sapi = -1;
-static int hf_lapsat_addr_si = -1;
-static int hf_lapsat_addr_lpd = -1;
-static int hf_lapsat_addr_lfi = -1;
-
-static int hf_lapsat_ctl = -1;
-static int hf_lapsat_ctl_ftype_i = -1;
-static int hf_lapsat_ctl_ftype_s_u = -1;
-static int hf_lapsat_ctl_s_ftype = -1;
-static int hf_lapsat_ctl_u_modifier_cmd = -1;
-static int hf_lapsat_ctl_u_modifier_resp = -1;
-static int hf_lapsat_ctl_n_r = -1;
-static int hf_lapsat_ctl_n_s = -1;
-static int hf_lapsat_ctl_p = -1;
-static int hf_lapsat_ctl_f = -1;
-static int hf_lapsat_ctl_mii = -1;
-
-static int hf_lapsat_payload_last_nibble = -1;
-
-static int hf_lapsat_len = -1;
-
-static int hf_lapsat_fragment_data = -1;
-static int hf_lapsat_fragments = -1;
-static int hf_lapsat_fragment = -1;
-static int hf_lapsat_fragment_overlap = -1;
-static int hf_lapsat_fragment_overlap_conflicts = -1;
-static int hf_lapsat_fragment_multiple_tails = -1;
-static int hf_lapsat_fragment_too_long_fragment = -1;
-static int hf_lapsat_fragment_error = -1;
-static int hf_lapsat_fragment_count = -1;
-static int hf_lapsat_reassembled_in = -1;
-static int hf_lapsat_reassembled_length = -1;
+static gint ett_lapsat;
+static gint ett_lapsat_address;
+static gint ett_lapsat_control;
+static gint ett_lapsat_fragment;
+static gint ett_lapsat_fragments;
+
+static int hf_lapsat_addr;
+static int hf_lapsat_addr_sst;
+static int hf_lapsat_addr_cr;
+static int hf_lapsat_addr_sapi;
+static int hf_lapsat_addr_si;
+static int hf_lapsat_addr_lpd;
+static int hf_lapsat_addr_lfi;
+
+static int hf_lapsat_ctl;
+static int hf_lapsat_ctl_ftype_i;
+static int hf_lapsat_ctl_ftype_s_u;
+static int hf_lapsat_ctl_s_ftype;
+static int hf_lapsat_ctl_u_modifier_cmd;
+static int hf_lapsat_ctl_u_modifier_resp;
+static int hf_lapsat_ctl_n_r;
+static int hf_lapsat_ctl_n_s;
+static int hf_lapsat_ctl_p;
+static int hf_lapsat_ctl_f;
+static int hf_lapsat_ctl_mii;
+
+static int hf_lapsat_payload_last_nibble;
+
+static int hf_lapsat_len;
+
+static int hf_lapsat_fragment_data;
+static int hf_lapsat_fragments;
+static int hf_lapsat_fragment;
+static int hf_lapsat_fragment_overlap;
+static int hf_lapsat_fragment_overlap_conflicts;
+static int hf_lapsat_fragment_multiple_tails;
+static int hf_lapsat_fragment_too_long_fragment;
+static int hf_lapsat_fragment_error;
+static int hf_lapsat_fragment_count;
+static int hf_lapsat_reassembled_in;
+static int hf_lapsat_reassembled_length;
 
 
 #define LAPSAT_HEADER_LEN		3
diff --git a/epan/dissectors/packet-lat.c b/epan/dissectors/packet-lat.c
index 7a76035abd..de0bb5083f 100644
--- a/epan/dissectors/packet-lat.c
+++ b/epan/dissectors/packet-lat.c
@@ -27,24 +27,24 @@ void proto_reg_handoff_lat(void);
 
 static dissector_handle_t lat_handle;
 
-static int proto_lat = -1;
-static int hf_lat_rrf = -1;
-static int hf_lat_master = -1;
-static int hf_lat_msg_typ = -1;
-static int hf_lat_nbr_slots = -1;
-static int hf_lat_dst_cir_id = -1;
-static int hf_lat_src_cir_id = -1;
-static int hf_lat_msg_seq_nbr = -1;
-static int hf_lat_msg_ack_nbr = -1;
-static int hf_lat_min_rcv_datagram_size = -1;
-static int hf_lat_prtcl_ver = -1;
-static int hf_lat_prtcl_eco = -1;
-static int hf_lat_max_sim_slots = -1;
-static int hf_lat_nbr_dl_bufs = -1;
-static int hf_lat_server_circuit_timer = -1;
-static int hf_lat_keep_alive_timer = -1;
-static int hf_lat_facility_number = -1;
-static int hf_lat_prod_type_code = -1;
+static int proto_lat;
+static int hf_lat_rrf;
+static int hf_lat_master;
+static int hf_lat_msg_typ;
+static int hf_lat_nbr_slots;
+static int hf_lat_dst_cir_id;
+static int hf_lat_src_cir_id;
+static int hf_lat_msg_seq_nbr;
+static int hf_lat_msg_ack_nbr;
+static int hf_lat_min_rcv_datagram_size;
+static int hf_lat_prtcl_ver;
+static int hf_lat_prtcl_eco;
+static int hf_lat_max_sim_slots;
+static int hf_lat_nbr_dl_bufs;
+static int hf_lat_server_circuit_timer;
+static int hf_lat_keep_alive_timer;
+static int hf_lat_facility_number;
+static int hf_lat_prod_type_code;
 static const value_string prod_type_code_vals[] = {
 	{ 1, "Ethernet terminal server" },
 	{ 2, "DECserver 100" },
@@ -67,34 +67,34 @@ static const value_string prod_type_code_vals[] = {
 	{ 19, "Actor" },
 	{ 0, NULL }
 };
-static int hf_lat_prod_vers_numb = -1;
-static int hf_lat_slave_node_name = -1;
-static int hf_lat_master_node_name = -1;
-static int hf_lat_location_text = -1;
-static int hf_lat_param_code = -1;
-static int hf_lat_param_len = -1;
-static int hf_lat_param_data = -1;
-static int hf_lat_slot_dst_slot_id = -1;
-static int hf_lat_slot_src_slot_id = -1;
-static int hf_lat_slot_byte_count = -1;
-static int hf_lat_slot_credits = -1;
-static int hf_lat_slot_type = -1;
-static int hf_lat_start_slot_service_class = -1;
-static int hf_lat_start_slot_minimum_attention_slot_size = -1;
-static int hf_lat_start_slot_minimum_data_slot_size = -1;
-static int hf_lat_start_slot_obj_srvc = -1;
-static int hf_lat_start_slot_subj_dscr = -1;
-static int hf_lat_start_slot_class_1_param_code = -1;
-static int hf_lat_status_remaining = -1;
-static int hf_lat_slot_data = -1;
-static int hf_lat_data_b_slot_control_flags = -1;
-static int hf_lat_data_b_slot_control_flags_enable_input_flow_control = -1;
-static int hf_lat_data_b_slot_control_flags_disable_input_flow_control = -1;
-static int hf_lat_data_b_slot_control_flags_enable_output_flow_control = -1;
-static int hf_lat_data_b_slot_control_flags_disable_output_flow_control = -1;
-static int hf_lat_data_b_slot_control_flags_break_detected = -1;
-static int hf_lat_data_b_slot_control_flags_set_port_char = -1;
-static int hf_lat_data_b_slot_control_flags_report_port_char = -1;
+static int hf_lat_prod_vers_numb;
+static int hf_lat_slave_node_name;
+static int hf_lat_master_node_name;
+static int hf_lat_location_text;
+static int hf_lat_param_code;
+static int hf_lat_param_len;
+static int hf_lat_param_data;
+static int hf_lat_slot_dst_slot_id;
+static int hf_lat_slot_src_slot_id;
+static int hf_lat_slot_byte_count;
+static int hf_lat_slot_credits;
+static int hf_lat_slot_type;
+static int hf_lat_start_slot_service_class;
+static int hf_lat_start_slot_minimum_attention_slot_size;
+static int hf_lat_start_slot_minimum_data_slot_size;
+static int hf_lat_start_slot_obj_srvc;
+static int hf_lat_start_slot_subj_dscr;
+static int hf_lat_start_slot_class_1_param_code;
+static int hf_lat_status_remaining;
+static int hf_lat_slot_data;
+static int hf_lat_data_b_slot_control_flags;
+static int hf_lat_data_b_slot_control_flags_enable_input_flow_control;
+static int hf_lat_data_b_slot_control_flags_disable_input_flow_control;
+static int hf_lat_data_b_slot_control_flags_enable_output_flow_control;
+static int hf_lat_data_b_slot_control_flags_disable_output_flow_control;
+static int hf_lat_data_b_slot_control_flags_break_detected;
+static int hf_lat_data_b_slot_control_flags_set_port_char;
+static int hf_lat_data_b_slot_control_flags_report_port_char;
 static int * const data_b_slot_control_flags_fields[] = {
 	&hf_lat_data_b_slot_control_flags_enable_input_flow_control,
 	&hf_lat_data_b_slot_control_flags_disable_input_flow_control,
@@ -105,11 +105,11 @@ static int * const data_b_slot_control_flags_fields[] = {
 	&hf_lat_data_b_slot_control_flags_report_port_char,
 	NULL
 };
-static int hf_lat_data_b_slot_stop_output_channel_char = -1;
-static int hf_lat_data_b_slot_start_output_channel_char = -1;
-static int hf_lat_data_b_slot_stop_input_channel_char = -1;
-static int hf_lat_data_b_slot_start_input_channel_char = -1;
-static int hf_lat_data_b_slot_param_code = -1;
+static int hf_lat_data_b_slot_stop_output_channel_char;
+static int hf_lat_data_b_slot_start_output_channel_char;
+static int hf_lat_data_b_slot_stop_input_channel_char;
+static int hf_lat_data_b_slot_start_input_channel_char;
+static int hf_lat_data_b_slot_param_code;
 static const value_string data_b_slot_param_code_vals[] = {
 	{ 0, "End of parameters" },
 	{ 1, "Parity and frame size" },
@@ -120,39 +120,39 @@ static const value_string data_b_slot_param_code_vals[] = {
 	{ 6, "Status" },
 	{ 0, NULL }
 };
-static int hf_lat_slot_data_remaining = -1;
-static int hf_lat_attention_slot_control_flags = -1;
-static int hf_lat_attention_slot_control_flags_abort = -1;
+static int hf_lat_slot_data_remaining;
+static int hf_lat_attention_slot_control_flags;
+static int hf_lat_attention_slot_control_flags_abort;
 static int * const attention_slot_control_flags_fields[] = {
 	&hf_lat_attention_slot_control_flags_abort,
 	NULL
 };
-static int hf_lat_mbz = -1;
-static int hf_lat_reason = -1;
-static int hf_lat_circuit_disconnect_reason = -1;
-static int hf_lat_reason_text = -1;
-static int hf_lat_high_prtcl_ver = -1;
-static int hf_lat_low_prtcl_ver = -1;
-static int hf_lat_cur_prtcl_ver = -1;
-static int hf_lat_cur_prtcl_eco = -1;
-static int hf_lat_msg_inc = -1;
-static int hf_lat_change_flags = -1;
-static int hf_lat_data_link_rcv_frame_size = -1;
-static int hf_lat_node_multicast_timer = -1;
-static int hf_lat_node_status = -1;
-static int hf_lat_node_group_len = -1;
-static int hf_lat_node_groups = -1;
-static int hf_lat_node_name = -1;
-static int hf_lat_node_description = -1;
-static int hf_lat_service_name_count = -1;
-static int hf_lat_service_rating = -1;
-static int hf_lat_node_service_len = -1;
-static int hf_lat_node_service_class = -1;
-
-static int hf_lat_prtcl_format = -1;
-static int hf_lat_request_identifier = -1;
-static int hf_lat_entry_identifier = -1;
-static int hf_lat_command_type = -1;
+static int hf_lat_mbz;
+static int hf_lat_reason;
+static int hf_lat_circuit_disconnect_reason;
+static int hf_lat_reason_text;
+static int hf_lat_high_prtcl_ver;
+static int hf_lat_low_prtcl_ver;
+static int hf_lat_cur_prtcl_ver;
+static int hf_lat_cur_prtcl_eco;
+static int hf_lat_msg_inc;
+static int hf_lat_change_flags;
+static int hf_lat_data_link_rcv_frame_size;
+static int hf_lat_node_multicast_timer;
+static int hf_lat_node_status;
+static int hf_lat_node_group_len;
+static int hf_lat_node_groups;
+static int hf_lat_node_name;
+static int hf_lat_node_description;
+static int hf_lat_service_name_count;
+static int hf_lat_service_rating;
+static int hf_lat_node_service_len;
+static int hf_lat_node_service_class;
+
+static int hf_lat_prtcl_format;
+static int hf_lat_request_identifier;
+static int hf_lat_entry_identifier;
+static int hf_lat_command_type;
 static const value_string command_type_vals[] = {
 	{ 1, "Solicit non-queued access to the service" },
 	{ 2, "Solicit queued access to the service" },
@@ -162,25 +162,25 @@ static const value_string command_type_vals[] = {
 	{ 6, "Send status of multiple entries" },
 	{ 0, NULL }
 };
-static int hf_lat_command_modifier = -1;
-static int hf_lat_command_modifier_send_status_periodically = -1;
-static int hf_lat_command_modifier_send_status_on_queue_depth_change = -1;
+static int hf_lat_command_modifier;
+static int hf_lat_command_modifier_send_status_periodically;
+static int hf_lat_command_modifier_send_status_on_queue_depth_change;
 static int * const lat_command_modifier_fields[] = {
 	&hf_lat_command_modifier_send_status_periodically,
 	&hf_lat_command_modifier_send_status_on_queue_depth_change,
 	NULL
 };
-static int hf_lat_obj_node_name = -1;
-static int hf_lat_subj_group_len = -1;
-static int hf_lat_subj_group = -1;
-static int hf_lat_subj_node_name = -1;
-static int hf_lat_subj_port_name = -1;
-static int hf_lat_status_retransmit_timer = -1;
-static int hf_lat_entries_counter = -1;
-static int hf_lat_entry_length = -1;
-static int hf_lat_entry_status = -1;
-static int hf_lat_entry_status_rejected = -1;
-static int hf_lat_entry_status_additional_information = -1;
+static int hf_lat_obj_node_name;
+static int hf_lat_subj_group_len;
+static int hf_lat_subj_group;
+static int hf_lat_subj_node_name;
+static int hf_lat_subj_port_name;
+static int hf_lat_status_retransmit_timer;
+static int hf_lat_entries_counter;
+static int hf_lat_entry_length;
+static int hf_lat_entry_status;
+static int hf_lat_entry_status_rejected;
+static int hf_lat_entry_status_additional_information;
 static int * const lat_entry_status_fields[] = {
 	&hf_lat_entry_status_rejected,
 	&hf_lat_entry_status_additional_information,
@@ -196,7 +196,7 @@ static const value_string additional_information_vals[] = {
 	{ 4, "Queue-depth status report is not supported" },
 	{ 0, NULL }
 };
-static int hf_lat_entry_error = -1;
+static int hf_lat_entry_error;
 static const value_string entry_error_vals[] = {
 	{ 1, "reason is unknown" },
 	{ 2, "user requested disconnect" },
@@ -219,75 +219,75 @@ static const value_string entry_error_vals[] = {
 	{ 19, "Inconsistent or illegal request parameters" },
 	{ 0, NULL }
 };
-static int hf_lat_elapsed_queue_time = -1;
-static int hf_lat_min_queue_position = -1;
-static int hf_lat_max_queue_position = -1;
-static int hf_lat_obj_srvc_name = -1;
-static int hf_lat_obj_port_name = -1;
-static int hf_lat_subj_description = -1;
-
-static int hf_lat_solicit_identifier = -1;
-static int hf_lat_response_timer = -1;
-static int hf_lat_dst_node_name = -1;
-static int hf_lat_src_node_group_len = -1;
-static int hf_lat_src_node_groups = -1;
-static int hf_lat_src_node_name = -1;
-static int hf_lat_dst_srvc_name = -1;
-
-static int hf_lat_response_status = -1;
-static int hf_lat_response_status_node_does_not_offer_requested_service = -1;
+static int hf_lat_elapsed_queue_time;
+static int hf_lat_min_queue_position;
+static int hf_lat_max_queue_position;
+static int hf_lat_obj_srvc_name;
+static int hf_lat_obj_port_name;
+static int hf_lat_subj_description;
+
+static int hf_lat_solicit_identifier;
+static int hf_lat_response_timer;
+static int hf_lat_dst_node_name;
+static int hf_lat_src_node_group_len;
+static int hf_lat_src_node_groups;
+static int hf_lat_src_node_name;
+static int hf_lat_dst_srvc_name;
+
+static int hf_lat_response_status;
+static int hf_lat_response_status_node_does_not_offer_requested_service;
 static int * const lat_response_status_fields[] = {
 	&hf_lat_response_status_node_does_not_offer_requested_service,
 	NULL
 };
-static int hf_lat_src_node_status = -1;
-static int hf_lat_src_node_status_node_is_disabled = -1;
-static int hf_lat_src_node_status_start_message_can_be_sent = -1;
-static int hf_lat_src_node_status_command_message_can_be_sent = -1;
+static int hf_lat_src_node_status;
+static int hf_lat_src_node_status_node_is_disabled;
+static int hf_lat_src_node_status_start_message_can_be_sent;
+static int hf_lat_src_node_status_command_message_can_be_sent;
 static int * const lat_src_node_status_fields[] = {
 	&hf_lat_src_node_status_node_is_disabled,
 	&hf_lat_src_node_status_start_message_can_be_sent,
 	&hf_lat_src_node_status_command_message_can_be_sent,
 	NULL
 };
-static int hf_lat_source_node_addr = -1;
-static int hf_lat_src_node_mc_timer = -1;
-static int hf_lat_src_node_desc = -1;
-static int hf_lat_srvc_count = -1;
-static int hf_lat_srvc_entry_len = -1;
-static int hf_lat_srvc_class_len = -1;
-static int hf_lat_srvc_class = -1;
-static int hf_lat_srvc_status = -1;
-static int hf_lat_srvc_status_enabled = -1;
-static int hf_lat_srvc_status_supports_queueing = -1;
+static int hf_lat_source_node_addr;
+static int hf_lat_src_node_mc_timer;
+static int hf_lat_src_node_desc;
+static int hf_lat_srvc_count;
+static int hf_lat_srvc_entry_len;
+static int hf_lat_srvc_class_len;
+static int hf_lat_srvc_class;
+static int hf_lat_srvc_status;
+static int hf_lat_srvc_status_enabled;
+static int hf_lat_srvc_status_supports_queueing;
 static int * const lat_srvc_status_fields[] = {
 	&hf_lat_srvc_status_enabled,
 	&hf_lat_srvc_status_supports_queueing,
 	NULL
 };
-static int hf_lat_srvc_rating = -1;
-static int hf_lat_srvc_group_len = -1;
-static int hf_lat_srvc_groups = -1;
-static int hf_lat_srvc_name = -1;
-static int hf_lat_srvc_desc = -1;
-
-static int hf_lat_service_name = -1;
-static int hf_lat_service_description = -1;
-static int hf_lat_unknown_command_data = -1;
-
-static gint ett_lat = -1;
-static gint ett_data_b_slot_control_flags = -1;
-static gint ett_lat_attention_slot_control_flags = -1;
-static gint ett_lat_command_modifier = -1;
-static gint ett_lat_entry_status = -1;
-static gint ett_lat_response_status = -1;
-static gint ett_lat_src_node_status = -1;
-static gint ett_lat_srvc_status = -1;
-
-static expert_field ei_slot_data_len_invalid = EI_INIT;
-static expert_field ei_entry_length_too_short = EI_INIT;
-static expert_field ei_srvc_entry_len_too_short = EI_INIT;
-static expert_field ei_mbz_data_nonzero = EI_INIT;
+static int hf_lat_srvc_rating;
+static int hf_lat_srvc_group_len;
+static int hf_lat_srvc_groups;
+static int hf_lat_srvc_name;
+static int hf_lat_srvc_desc;
+
+static int hf_lat_service_name;
+static int hf_lat_service_description;
+static int hf_lat_unknown_command_data;
+
+static gint ett_lat;
+static gint ett_data_b_slot_control_flags;
+static gint ett_lat_attention_slot_control_flags;
+static gint ett_lat_command_modifier;
+static gint ett_lat_entry_status;
+static gint ett_lat_response_status;
+static gint ett_lat_src_node_status;
+static gint ett_lat_srvc_status;
+
+static expert_field ei_slot_data_len_invalid;
+static expert_field ei_entry_length_too_short;
+static expert_field ei_srvc_entry_len_too_short;
+static expert_field ei_mbz_data_nonzero;
 
 /* LAT message types. */
 #define LAT_MSG_TYP_RUN				0
diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c
index b078c224f5..5270428165 100644
--- a/epan/dissectors/packet-lbmc.c
+++ b/epan/dissectors/packet-lbmc.c
@@ -4557,1458 +4557,1458 @@ static heur_dissector_list_t lbmc_heuristic_subdissector_list;
 /* Handles of all types.                                                      */
 /*----------------------------------------------------------------------------*/
 
-static int proto_lbmc = -1;
+static int proto_lbmc;
 static int tnw_protocol_handle = -1;
 static int lbmc_uim_tap_handle = -1;
 static int lbmc_stream_tap_handle = -1;
-static int hf_lbmc_tag = -1;
-static int hf_lbmc_topic = -1;
-static int hf_lbmc_version = -1;
-static int hf_lbmc_type = -1;
-static int hf_lbmc_next_hdr = -1;
-static int hf_lbmc_msglen = -1;
-static int hf_lbmc_tidx = -1;
-static int hf_lbmc_sqn = -1;
-static int hf_lbmc_frag = -1;
-static int hf_lbmc_frag_next_hdr = -1;
-static int hf_lbmc_frag_hdr_len = -1;
-static int hf_lbmc_frag_flags = -1;
-static int hf_lbmc_frag_flags_ignore = -1;
-static int hf_lbmc_frag_first_sqn = -1;
-static int hf_lbmc_frag_offset = -1;
-static int hf_lbmc_frag_len = -1;
-static int hf_lbmc_batch = -1;
-static int hf_lbmc_batch_next_hdr = -1;
-static int hf_lbmc_batch_hdr_len = -1;
-static int hf_lbmc_batch_flags = -1;
-static int hf_lbmc_batch_flags_ignore = -1;
-static int hf_lbmc_batch_flags_batch_start = -1;
-static int hf_lbmc_batch_flags_batch_end = -1;
-static int hf_lbmc_tcp_request = -1;
-static int hf_lbmc_tcp_request_next_hdr = -1;
-static int hf_lbmc_tcp_request_hdr_len = -1;
-static int hf_lbmc_tcp_request_flags = -1;
-static int hf_lbmc_tcp_request_flags_ignore = -1;
-static int hf_lbmc_tcp_request_transport = -1;
-static int hf_lbmc_tcp_request_qidx = -1;
-static int hf_lbmc_tcp_request_port = -1;
-static int hf_lbmc_tcp_request_reserved = -1;
-static int hf_lbmc_tcp_request_ipaddr = -1;
-static int hf_lbmc_topicname = -1;
-static int hf_lbmc_topicname_next_hdr = -1;
-static int hf_lbmc_topicname_hdr_len = -1;
-static int hf_lbmc_topicname_flags = -1;
-static int hf_lbmc_topicname_flags_ignore = -1;
-static int hf_lbmc_topicname_topicname = -1;
-static int hf_lbmc_apphdr = -1;
-static int hf_lbmc_apphdr_next_hdr = -1;
-static int hf_lbmc_apphdr_hdr_len = -1;
-static int hf_lbmc_apphdr_code = -1;
-static int hf_lbmc_apphdr_ignore = -1;
-static int hf_lbmc_apphdr_data = -1;
-static int hf_lbmc_apphdr_chain = -1;
-static int hf_lbmc_apphdr_chain_next_hdr = -1;
-static int hf_lbmc_apphdr_chain_hdr_len = -1;
-static int hf_lbmc_apphdr_chain_res = -1;
-static int hf_lbmc_apphdr_chain_first_chain_hdr = -1;
-static int hf_lbmc_apphdr_chain_element = -1;
-static int hf_lbmc_apphdr_chain_element_next_hdr = -1;
-static int hf_lbmc_apphdr_chain_element_hdr_len = -1;
-static int hf_lbmc_apphdr_chain_element_res = -1;
-static int hf_lbmc_apphdr_chain_element_data = -1;
-static int hf_lbmc_apphdr_chain_msgprop = -1;
-static int hf_lbmc_apphdr_chain_msgprop_next_hdr = -1;
-static int hf_lbmc_apphdr_chain_msgprop_hdr_len = -1;
-static int hf_lbmc_apphdr_chain_msgprop_res = -1;
-static int hf_lbmc_apphdr_chain_msgprop_len = -1;
-static int hf_lbmc_umq_msgid = -1;
-static int hf_lbmc_umq_msgid_next_hdr = -1;
-static int hf_lbmc_umq_msgid_hdr_len = -1;
-static int hf_lbmc_umq_msgid_flags = -1;
-static int hf_lbmc_umq_msgid_flags_ignore = -1;
-static int hf_lbmc_umq_msgid_msgid_regid = -1;
-static int hf_lbmc_umq_msgid_msgid_stamp = -1;
-static int hf_lbmc_umq_sqd_rcv = -1;
-static int hf_lbmc_umq_sqd_rcv_next_hdr = -1;
-static int hf_lbmc_umq_sqd_rcv_hdr_len = -1;
-static int hf_lbmc_umq_sqd_rcv_flags = -1;
-static int hf_lbmc_umq_sqd_rcv_flags_ignore = -1;
-static int hf_lbmc_umq_sqd_rcv_flags_r_flag = -1;
-static int hf_lbmc_umq_sqd_rcv_flags_s_flag = -1;
-static int hf_lbmc_umq_sqd_rcv_flags_re_flag = -1;
-static int hf_lbmc_umq_sqd_rcv_flags_eoi_flag = -1;
-static int hf_lbmc_umq_sqd_rcv_flags_boi_flag = -1;
-static int hf_lbmc_umq_sqd_rcv_queue_id = -1;
-static int hf_lbmc_umq_sqd_rcv_queue_ver = -1;
-static int hf_lbmc_umq_sqd_rcv_rcr_idx = -1;
-static int hf_lbmc_umq_sqd_rcv_assign_id = -1;
-static int hf_lbmc_umq_resub = -1;
-static int hf_lbmc_umq_resub_next_hdr = -1;
-static int hf_lbmc_umq_resub_hdr_len = -1;
-static int hf_lbmc_umq_resub_flags = -1;
-static int hf_lbmc_umq_resub_flags_ignore = -1;
-static int hf_lbmc_umq_resub_flags_q_flag = -1;
-static int hf_lbmc_umq_resub_rcr_idx = -1;
-static int hf_lbmc_umq_resub_resp_ip = -1;
-static int hf_lbmc_umq_resub_resp_port = -1;
-static int hf_lbmc_umq_resub_appset_idx = -1;
-static int hf_lbmc_otid = -1;
-static int hf_lbmc_otid_next_hdr = -1;
-static int hf_lbmc_otid_hdr_len = -1;
-static int hf_lbmc_otid_flags = -1;
-static int hf_lbmc_otid_flags_ignore = -1;
-static int hf_lbmc_otid_otid = -1;
-static int hf_lbmc_ctxinst = -1;
-static int hf_lbmc_ctxinst_next_hdr = -1;
-static int hf_lbmc_ctxinst_hdr_len = -1;
-static int hf_lbmc_ctxinst_flags = -1;
-static int hf_lbmc_ctxinst_flags_ignore = -1;
-static int hf_lbmc_ctxinst_ctxinst = -1;
-static int hf_lbmc_ctxinstd = -1;
-static int hf_lbmc_ctxinstr = -1;
-static int hf_lbmc_srcidx = -1;
-static int hf_lbmc_srcidx_next_hdr = -1;
-static int hf_lbmc_srcidx_hdr_len = -1;
-static int hf_lbmc_srcidx_flags = -1;
-static int hf_lbmc_srcidx_flags_ignore = -1;
-static int hf_lbmc_srcidx_srcidx = -1;
-static int hf_lbmc_umq_ulb_msg = -1;
-static int hf_lbmc_umq_ulb_msg_next_hdr = -1;
-static int hf_lbmc_umq_ulb_msg_hdr_len = -1;
-static int hf_lbmc_umq_ulb_msg_flags = -1;
-static int hf_lbmc_umq_ulb_msg_flags_ignore = -1;
-static int hf_lbmc_umq_ulb_msg_flags_a_flag = -1;
-static int hf_lbmc_umq_ulb_msg_flags_r_flag = -1;
-static int hf_lbmc_umq_ulb_msg_queue_id = -1;
-static int hf_lbmc_umq_ulb_msg_ulb_src_id = -1;
-static int hf_lbmc_umq_ulb_msg_assign_id = -1;
-static int hf_lbmc_umq_ulb_msg_appset_idx = -1;
-static int hf_lbmc_umq_ulb_msg_num_ras = -1;
-static int hf_lbmc_ssf_init = -1;
-static int hf_lbmc_ssf_init_next_hdr = -1;
-static int hf_lbmc_ssf_init_hdr_len = -1;
-static int hf_lbmc_ssf_init_transport = -1;
-static int hf_lbmc_ssf_init_flags = -1;
-static int hf_lbmc_ssf_init_flags_ignore = -1;
-static int hf_lbmc_ssf_init_flags_default_inclusions = -1;
-static int hf_lbmc_ssf_init_flags_default_exclusions = -1;
-static int hf_lbmc_ssf_init_transport_idx = -1;
-static int hf_lbmc_ssf_init_client_idx = -1;
-static int hf_lbmc_ssf_init_ssf_port = -1;
-static int hf_lbmc_ssf_init_res = -1;
-static int hf_lbmc_ssf_init_ssf_ip = -1;
-static int hf_lbmc_ssf_creq = -1;
-static int hf_lbmc_ssf_creq_next_hdr = -1;
-static int hf_lbmc_ssf_creq_hdr_len = -1;
-static int hf_lbmc_ssf_creq_flags = -1;
-static int hf_lbmc_ssf_creq_flags_ignore = -1;
-static int hf_lbmc_ssf_creq_mode = -1;
-static int hf_lbmc_ssf_creq_transport_idx = -1;
-static int hf_lbmc_ssf_creq_topic_idx = -1;
-static int hf_lbmc_ssf_creq_client_idx = -1;
-static int hf_lbmc_ume_preg = -1;
-static int hf_lbmc_ume_preg_next_hdr = -1;
-static int hf_lbmc_ume_preg_hdr_len = -1;
-static int hf_lbmc_ume_preg_flags = -1;
-static int hf_lbmc_ume_preg_flags_ignore = -1;
-static int hf_lbmc_ume_preg_flags_f_flag = -1;
-static int hf_lbmc_ume_preg_flags_p_flag = -1;
-static int hf_lbmc_ume_preg_flags_w_flag = -1;
-static int hf_lbmc_ume_preg_flags_d_flag = -1;
-static int hf_lbmc_ume_preg_s_flag = -1;
-static int hf_lbmc_ume_preg_marker = -1;
-static int hf_lbmc_ume_preg_reg_id = -1;
-static int hf_lbmc_ume_preg_transport_idx = -1;
-static int hf_lbmc_ume_preg_topic_idx = -1;
-static int hf_lbmc_ume_preg_src_reg_id = -1;
-static int hf_lbmc_ume_preg_resp_port = -1;
-static int hf_lbmc_ume_preg_res2 = -1;
-static int hf_lbmc_ume_preg_resp_ip = -1;
-static int hf_lbmc_ume_preg_resp = -1;
-static int hf_lbmc_ume_preg_resp_next_hdr = -1;
-static int hf_lbmc_ume_preg_resp_hdr_len = -1;
-static int hf_lbmc_ume_preg_resp_code = -1;
-static int hf_lbmc_ume_preg_resp_code_ignore = -1;
-static int hf_lbmc_ume_preg_resp_code_e_flag = -1;
-static int hf_lbmc_ume_preg_resp_code_o_flag = -1;
-static int hf_lbmc_ume_preg_resp_code_n_flag = -1;
-static int hf_lbmc_ume_preg_resp_code_w_flag = -1;
-static int hf_lbmc_ume_preg_resp_code_d_flag = -1;
-static int hf_lbmc_ume_preg_resp_code_code = -1;
-static int hf_lbmc_ume_preg_resp_s_flag = -1;
-static int hf_lbmc_ume_preg_resp_marker = -1;
-static int hf_lbmc_ume_preg_resp_reg_id = -1;
-static int hf_lbmc_ume_preg_resp_transport_idx = -1;
-static int hf_lbmc_ume_preg_resp_topic_idx = -1;
-static int hf_lbmc_ume_preg_resp_low_seqnum = -1;
-static int hf_lbmc_ume_preg_resp_high_seqnum = -1;
-static int hf_lbmc_ume_ack = -1;
-static int hf_lbmc_ume_ack_next_hdr = -1;
-static int hf_lbmc_ume_ack_hdr_len = -1;
-static int hf_lbmc_ume_ack_flags = -1;
-static int hf_lbmc_ume_ack_flags_ignore = -1;
-static int hf_lbmc_ume_ack_flags_o_flag = -1;
-static int hf_lbmc_ume_ack_flags_f_flag = -1;
-static int hf_lbmc_ume_ack_flags_u_flag = -1;
-static int hf_lbmc_ume_ack_flags_e_flag = -1;
-static int hf_lbmc_ume_ack_type = -1;
-static int hf_lbmc_ume_ack_transport_idx = -1;
-static int hf_lbmc_ume_ack_id_2 = -1;
-static int hf_lbmc_ume_ack_rcv_reg_id = -1;
-static int hf_lbmc_ume_ack_seqnum = -1;
-static int hf_lbmc_ume_rxreq = -1;
-static int hf_lbmc_ume_rxreq_next_hdr = -1;
-static int hf_lbmc_ume_rxreq_hdr_len = -1;
-static int hf_lbmc_ume_rxreq_flags = -1;
-static int hf_lbmc_ume_rxreq_flags_ignore = -1;
-static int hf_lbmc_ume_rxreq_flags_tsni_req = -1;
-static int hf_lbmc_ume_rxreq_marker = -1;
-static int hf_lbmc_ume_rxreq_request_idx = -1;
-static int hf_lbmc_ume_rxreq_transport_idx = -1;
-static int hf_lbmc_ume_rxreq_id_2 = -1;
-static int hf_lbmc_ume_rxreq_seqnum = -1;
-static int hf_lbmc_ume_rxreq_rx_port = -1;
-static int hf_lbmc_ume_rxreq_res = -1;
-static int hf_lbmc_ume_rxreq_rx_ip = -1;
-static int hf_lbmc_ume_keepalive = -1;
-static int hf_lbmc_ume_keepalive_next_hdr = -1;
-static int hf_lbmc_ume_keepalive_hdr_len = -1;
-static int hf_lbmc_ume_keepalive_flags = -1;
-static int hf_lbmc_ume_keepalive_flags_ignore = -1;
-static int hf_lbmc_ume_keepalive_flags_r_flag = -1;
-static int hf_lbmc_ume_keepalive_flags_t_flag = -1;
-static int hf_lbmc_ume_keepalive_type = -1;
-static int hf_lbmc_ume_keepalive_transport_idx = -1;
-static int hf_lbmc_ume_keepalive_topic_idx = -1;
-static int hf_lbmc_ume_keepalive_reg_id = -1;
-static int hf_lbmc_ume_storeid = -1;
-static int hf_lbmc_ume_storeid_next_hdr = -1;
-static int hf_lbmc_ume_storeid_hdr_len = -1;
-static int hf_lbmc_ume_storeid_ignore = -1;
-static int hf_lbmc_ume_storeid_store_id = -1;
-static int hf_lbmc_ume_ranged_ack = -1;
-static int hf_lbmc_ume_ranged_ack_next_hdr = -1;
-static int hf_lbmc_ume_ranged_ack_hdr_len = -1;
-static int hf_lbmc_ume_ranged_ack_flags = -1;
-static int hf_lbmc_ume_ranged_ack_flags_ignore = -1;
-static int hf_lbmc_ume_ranged_ack_first_seqnum = -1;
-static int hf_lbmc_ume_ranged_ack_last_seqnum = -1;
-static int hf_lbmc_ume_ack_id = -1;
-static int hf_lbmc_ume_ack_id_next_hdr = -1;
-static int hf_lbmc_ume_ack_id_hdr_len = -1;
-static int hf_lbmc_ume_ack_id_flags = -1;
-static int hf_lbmc_ume_ack_id_flags_ignore = -1;
-static int hf_lbmc_ume_ack_id_id = -1;
-static int hf_lbmc_ume_capability = -1;
-static int hf_lbmc_ume_capability_next_hdr = -1;
-static int hf_lbmc_ume_capability_hdr_len = -1;
-static int hf_lbmc_ume_capability_flags = -1;
-static int hf_lbmc_ume_capability_flags_ignore = -1;
-static int hf_lbmc_ume_capability_flags_qc_flag = -1;
-static int hf_lbmc_ume_capability_flags_client_lifetime_flag = -1;
-static int hf_lbmc_ume_proxy_src = -1;
-static int hf_lbmc_ume_proxy_src_next_hdr = -1;
-static int hf_lbmc_ume_proxy_src_hdr_len = -1;
-static int hf_lbmc_ume_proxy_src_flags = -1;
-static int hf_lbmc_ume_proxy_src_flags_ignore = -1;
-static int hf_lbmc_ume_proxy_src_flags_enable = -1;
-static int hf_lbmc_ume_proxy_src_flags_compatibility = -1;
-static int hf_lbmc_ume_store_group = -1;
-static int hf_lbmc_ume_store_group_next_hdr = -1;
-static int hf_lbmc_ume_store_group_hdr_len = -1;
-static int hf_lbmc_ume_store_group_flags = -1;
-static int hf_lbmc_ume_store_group_flags_ignore = -1;
-static int hf_lbmc_ume_store_group_grp_idx = -1;
-static int hf_lbmc_ume_store_group_grp_sz = -1;
-static int hf_lbmc_ume_store_group_res1 = -1;
-static int hf_lbmc_ume_store = -1;
-static int hf_lbmc_ume_store_next_hdr = -1;
-static int hf_lbmc_ume_store_hdr_len = -1;
-static int hf_lbmc_ume_store_flags = -1;
-static int hf_lbmc_ume_store_flags_ignore = -1;
-static int hf_lbmc_ume_store_grp_idx = -1;
-static int hf_lbmc_ume_store_store_tcp_port = -1;
-static int hf_lbmc_ume_store_store_idx = -1;
-static int hf_lbmc_ume_store_store_ip_addr = -1;
-static int hf_lbmc_ume_store_src_reg_id = -1;
-static int hf_lbmc_ume_lj_info = -1;
-static int hf_lbmc_ume_lj_info_next_hdr = -1;
-static int hf_lbmc_ume_lj_info_hdr_len = -1;
-static int hf_lbmc_ume_lj_info_flags = -1;
-static int hf_lbmc_ume_lj_info_flags_ignore = -1;
-static int hf_lbmc_ume_lj_info_low_seqnum = -1;
-static int hf_lbmc_ume_lj_info_high_seqnum = -1;
-static int hf_lbmc_ume_lj_info_qidx = -1;
-static int hf_lbmc_tsni = -1;
-static int hf_lbmc_tsni_next_hdr = -1;
-static int hf_lbmc_tsni_hdr_len = -1;
-static int hf_lbmc_tsni_ignore = -1;
-static int hf_lbmc_tsni_num_recs = -1;
-static int hf_lbmc_tsni_rec = -1;
-static int hf_lbmc_tsni_rec_tidx = -1;
-static int hf_lbmc_tsni_rec_sqn = -1;
-static int hf_lbmc_umq_reg = -1;
-static int hf_lbmc_umq_reg_next_hdr = -1;
-static int hf_lbmc_umq_reg_hdr_len = -1;
-static int hf_lbmc_umq_reg_flags = -1;
-static int hf_lbmc_umq_reg_flags_ignore = -1;
-static int hf_lbmc_umq_reg_flags_r_flag = -1;
-static int hf_lbmc_umq_reg_flags_t_flag = -1;
-static int hf_lbmc_umq_reg_flags_i_flag = -1;
-static int hf_lbmc_umq_reg_flags_msg_sel_flag = -1;
-static int hf_lbmc_umq_reg_reg_type = -1;
-static int hf_lbmc_umq_reg_queue_id = -1;
-static int hf_lbmc_umq_reg_cmd_id = -1;
-static int hf_lbmc_umq_reg_inst_idx = -1;
-static int hf_lbmc_umq_reg_regid = -1;
-static int hf_lbmc_umq_reg_reg_ctx = -1;
-static int hf_lbmc_umq_reg_reg_ctx_port = -1;
-static int hf_lbmc_umq_reg_reg_ctx_reserved = -1;
-static int hf_lbmc_umq_reg_reg_ctx_ip = -1;
-static int hf_lbmc_umq_reg_reg_ctx_capabilities = -1;
-static int hf_lbmc_umq_reg_reg_src = -1;
-static int hf_lbmc_umq_reg_reg_src_transport_idx = -1;
-static int hf_lbmc_umq_reg_reg_src_topic_idx = -1;
-static int hf_lbmc_umq_reg_reg_rcv = -1;
-static int hf_lbmc_umq_reg_reg_rcv_assign_id = -1;
-static int hf_lbmc_umq_reg_reg_rcv_rcv_type_id = -1;
-static int hf_lbmc_umq_reg_reg_rcv_last_topic_rcr_tsp = -1;
-static int hf_lbmc_umq_reg_rcv_dereg = -1;
-static int hf_lbmc_umq_reg_rcv_dereg_rcr_idx = -1;
-static int hf_lbmc_umq_reg_rcv_dereg_assign_id = -1;
-static int hf_lbmc_umq_reg_reg_ulb_rcv = -1;
-static int hf_lbmc_umq_reg_reg_ulb_rcv_ulb_src_id = -1;
-static int hf_lbmc_umq_reg_reg_ulb_rcv_assign_id = -1;
-static int hf_lbmc_umq_reg_reg_ulb_rcv_rcv_type_id = -1;
-static int hf_lbmc_umq_reg_reg_ulb_rcv_port = -1;
-static int hf_lbmc_umq_reg_reg_ulb_rcv_reserved = -1;
-static int hf_lbmc_umq_reg_reg_ulb_rcv_ip = -1;
-static int hf_lbmc_umq_reg_reg_ulb_rcv_capabilities = -1;
-static int hf_lbmc_umq_reg_ulb_rcv_dereg = -1;
-static int hf_lbmc_umq_reg_ulb_rcv_dereg_ulb_src_id = -1;
-static int hf_lbmc_umq_reg_ulb_rcv_dereg_assign_id = -1;
-static int hf_lbmc_umq_reg_reg_observer_rcv = -1;
-static int hf_lbmc_umq_reg_reg_observer_rcv_assign_id = -1;
-static int hf_lbmc_umq_reg_reg_observer_rcv_rcv_type_id = -1;
-static int hf_lbmc_umq_reg_reg_observer_rcv_last_topic_rcr_tsp = -1;
-static int hf_lbmc_umq_reg_observer_rcv_dereg = -1;
-static int hf_lbmc_umq_reg_observer_rcv_dereg_rcr_idx = -1;
-static int hf_lbmc_umq_reg_observer_rcv_dereg_assign_id = -1;
-static int hf_lbmc_umq_reg_resp = -1;
-static int hf_lbmc_umq_reg_resp_next_hdr = -1;
-static int hf_lbmc_umq_reg_resp_hdr_len = -1;
-static int hf_lbmc_umq_reg_resp_flags = -1;
-static int hf_lbmc_umq_reg_resp_flags_ignore = -1;
-static int hf_lbmc_umq_reg_resp_flags_r_flag = -1;
-static int hf_lbmc_umq_reg_resp_flags_l_flag = -1;
-static int hf_lbmc_umq_reg_resp_flags_src_s_flag = -1;
-static int hf_lbmc_umq_reg_resp_flags_src_d_flag = -1;
-static int hf_lbmc_umq_reg_resp_resp_type = -1;
-static int hf_lbmc_umq_reg_resp_queue_id = -1;
-static int hf_lbmc_umq_reg_resp_cmd_id = -1;
-static int hf_lbmc_umq_reg_resp_inst_idx = -1;
-static int hf_lbmc_umq_reg_resp_regid = -1;
-static int hf_lbmc_umq_reg_resp_reg_ctx = -1;
-static int hf_lbmc_umq_reg_resp_reg_ctx_capabilities = -1;
-static int hf_lbmc_umq_reg_resp_reg_ctx_ex = -1;
-static int hf_lbmc_umq_reg_resp_reg_ctx_ex_capabilities = -1;
-static int hf_lbmc_umq_reg_resp_reg_ctx_ex_reserved = -1;
-static int hf_lbmc_umq_reg_resp_reg_ctx_ex_flags = -1;
-static int hf_lbmc_umq_reg_resp_reg_ctx_ex_flags_firstmsg = -1;
-static int hf_lbmc_umq_reg_resp_reg_ctx_ex_stamp = -1;
-static int hf_lbmc_umq_reg_resp_err = -1;
-static int hf_lbmc_umq_reg_resp_err_reserved = -1;
-static int hf_lbmc_umq_reg_resp_err_code = -1;
-static int hf_lbmc_umq_reg_resp_reg_src = -1;
-static int hf_lbmc_umq_reg_resp_reg_src_rcr_idx = -1;
-static int hf_lbmc_umq_reg_resp_reg_rcv = -1;
-static int hf_lbmc_umq_reg_resp_reg_rcv_rcr_idx = -1;
-static int hf_lbmc_umq_reg_resp_reg_rcv_assign_id = -1;
-static int hf_lbmc_umq_reg_resp_reg_rcv_appset_idx = -1;
-static int hf_lbmc_umq_reg_resp_reg_rcv_reserved = -1;
-static int hf_lbmc_umq_reg_resp_rcv_dereg = -1;
-static int hf_lbmc_umq_reg_resp_rcv_dereg_rcr_idx = -1;
-static int hf_lbmc_umq_reg_resp_rcv_dereg_assign_id = -1;
-static int hf_lbmc_umq_reg_resp_reg_ulb_rcv = -1;
-static int hf_lbmc_umq_reg_resp_reg_ulb_rcv_ulb_src_id = -1;
-static int hf_lbmc_umq_reg_resp_reg_ulb_rcv_assign_id = -1;
-static int hf_lbmc_umq_reg_resp_reg_ulb_rcv_appset_idx = -1;
-static int hf_lbmc_umq_reg_resp_reg_ulb_rcv_reserved = -1;
-static int hf_lbmc_umq_reg_resp_reg_ulb_rcv_capabilities = -1;
-static int hf_lbmc_umq_reg_resp_ulb_rcv_dereg = -1;
-static int hf_lbmc_umq_reg_resp_ulb_rcv_dereg_ulb_src_id = -1;
-static int hf_lbmc_umq_reg_resp_ulb_rcv_dereg_assign_id = -1;
-static int hf_lbmc_umq_reg_resp_reg_observer_rcv = -1;
-static int hf_lbmc_umq_reg_resp_reg_observer_rcv_rcr_idx = -1;
-static int hf_lbmc_umq_reg_resp_reg_observer_rcv_assign_id = -1;
-static int hf_lbmc_umq_reg_resp_reg_observer_rcv_appset_idx = -1;
-static int hf_lbmc_umq_reg_resp_reg_observer_rcv_reserved = -1;
-static int hf_lbmc_umq_reg_resp_observer_rcv_dereg = -1;
-static int hf_lbmc_umq_reg_resp_observer_rcv_dereg_rcr_idx = -1;
-static int hf_lbmc_umq_reg_resp_observer_rcv_dereg_assign_id = -1;
-static int hf_lbmc_umq_ack = -1;
-static int hf_lbmc_umq_ack_next_hdr = -1;
-static int hf_lbmc_umq_ack_hdr_len = -1;
-static int hf_lbmc_umq_ack_msgs = -1;
-static int hf_lbmc_umq_ack_msgs_ignore = -1;
-static int hf_lbmc_umq_ack_msgs_t_flag = -1;
-static int hf_lbmc_umq_ack_msgs_d_flag = -1;
-static int hf_lbmc_umq_ack_numids = -1;
-static int hf_lbmc_umq_ack_ack_type = -1;
-static int hf_lbmc_umq_ack_msgid = -1;
-static int hf_lbmc_umq_ack_msgid_regid = -1;
-static int hf_lbmc_umq_ack_msgid_stamp = -1;
-static int hf_lbmc_umq_ack_stable = -1;
-static int hf_lbmc_umq_ack_stable_queue_id = -1;
-static int hf_lbmc_umq_ack_stable_inst_idx = -1;
-static int hf_lbmc_umq_ack_stable_reserved = -1;
-static int hf_lbmc_umq_ack_cr = -1;
-static int hf_lbmc_umq_ack_cr_rcr_idx = -1;
-static int hf_lbmc_umq_ack_cr_assign_id = -1;
-static int hf_lbmc_umq_ack_cr_appset_idx = -1;
-static int hf_lbmc_umq_ack_cr_reserved = -1;
-static int hf_lbmc_umq_ack_ulb_cr = -1;
-static int hf_lbmc_umq_ack_ulb_cr_ulb_src_id = -1;
-static int hf_lbmc_umq_ack_ulb_cr_assign_id = -1;
-static int hf_lbmc_umq_ack_ulb_cr_appset_idx = -1;
-static int hf_lbmc_umq_ack_ulb_cr_reserved = -1;
-static int hf_lbmc_umq_rcr = -1;
-static int hf_lbmc_umq_rcr_next_hdr = -1;
-static int hf_lbmc_umq_rcr_hdr_len = -1;
-static int hf_lbmc_umq_rcr_flags = -1;
-static int hf_lbmc_umq_rcr_flags_ignore = -1;
-static int hf_lbmc_umq_rcr_flags_r_flag = -1;
-static int hf_lbmc_umq_rcr_flags_d_flag = -1;
-static int hf_lbmc_umq_rcr_flags_s_flag = -1;
-static int hf_lbmc_umq_rcr_flags_eoi_flag = -1;
-static int hf_lbmc_umq_rcr_flags_boi_flag = -1;
-static int hf_lbmc_umq_rcr_queue_id = -1;
-static int hf_lbmc_umq_rcr_rcr_idx = -1;
-static int hf_lbmc_umq_rcr_msgid_regid = -1;
-static int hf_lbmc_umq_rcr_msgid_stamp = -1;
-static int hf_lbmc_umq_rcr_topic_tsp = -1;
-static int hf_lbmc_umq_rcr_q_tsp = -1;
-static int hf_lbmc_umq_rcr_assign_id = -1;
-static int hf_lbmc_umq_rcr_appset_idx = -1;
-static int hf_lbmc_umq_rcr_num_ras = -1;
-static int hf_lbmc_umq_rcr_queue_ver = -1;
-static int hf_lbmc_cntl_umq_ka = -1;
-static int hf_lbmc_cntl_umq_ka_next_hdr = -1;
-static int hf_lbmc_cntl_umq_ka_hdr_len = -1;
-static int hf_lbmc_cntl_umq_ka_flags = -1;
-static int hf_lbmc_cntl_umq_ka_flags_ignore = -1;
-static int hf_lbmc_cntl_umq_ka_flags_r_flag = -1;
-static int hf_lbmc_cntl_umq_ka_ka_type = -1;
-static int hf_lbmc_cntl_umq_ka_queue_id = -1;
-static int hf_lbmc_cntl_umq_ka_regid = -1;
-static int hf_lbmc_cntl_umq_ka_inst_idx = -1;
-static int hf_lbmc_cntl_umq_ka_reserved = -1;
-static int hf_lbmc_umq_ka_src = -1;
-static int hf_lbmc_umq_ka_src_transport_idx = -1;
-static int hf_lbmc_umq_ka_src_topic_idx = -1;
-static int hf_lbmc_umq_ka_rcv = -1;
-static int hf_lbmc_umq_ka_rcv_rcr_idx = -1;
-static int hf_lbmc_umq_ka_rcv_assign_id = -1;
-static int hf_lbmc_umq_ka_ulb_rcv = -1;
-static int hf_lbmc_umq_ka_ulb_rcv_ulb_src_id = -1;
-static int hf_lbmc_umq_ka_ulb_rcv_assign_id = -1;
-static int hf_lbmc_umq_ka_ulb_rcv_resp = -1;
-static int hf_lbmc_umq_ka_ulb_rcv_resp_ulb_src_id = -1;
-static int hf_lbmc_umq_ka_ulb_rcv_resp_assign_id = -1;
-static int hf_lbmc_umq_ka_ulb_rcv_resp_appset_idx = -1;
-static int hf_lbmc_umq_ka_ulb_rcv_resp_reserved = -1;
-static int hf_lbmc_umq_rxreq = -1;
-static int hf_lbmc_umq_rxreq_next_hdr = -1;
-static int hf_lbmc_umq_rxreq_hdr_len = -1;
-static int hf_lbmc_umq_rxreq_flags = -1;
-static int hf_lbmc_umq_rxreq_flags_ignore = -1;
-static int hf_lbmc_umq_rxreq_flags_r_flag = -1;
-static int hf_lbmc_umq_rxreq_rxreq_type = -1;
-static int hf_lbmc_umq_rxreq_regid_resp = -1;
-static int hf_lbmc_umq_rxreq_regid_resp_regid = -1;
-static int hf_lbmc_umq_rxreq_addr_resp = -1;
-static int hf_lbmc_umq_rxreq_addr_resp_ip = -1;
-static int hf_lbmc_umq_rxreq_addr_resp_port = -1;
-static int hf_lbmc_umq_rxreq_addr_resp_reserved = -1;
-static int hf_lbmc_umq_rxreq_mr = -1;
-static int hf_lbmc_umq_rxreq_mr_assign_id = -1;
-static int hf_lbmc_umq_rxreq_mr_msgid_regid = -1;
-static int hf_lbmc_umq_rxreq_mr_msgid_stamp = -1;
-static int hf_lbmc_umq_rxreq_ulb_mr = -1;
-static int hf_lbmc_umq_rxreq_ulb_mr_ulb_src_id = -1;
-static int hf_lbmc_umq_rxreq_ulb_mr_assign_id = -1;
-static int hf_lbmc_umq_rxreq_ulb_mr_appset_idx = -1;
-static int hf_lbmc_umq_rxreq_ulb_mr_reserved = -1;
-static int hf_lbmc_umq_rxreq_ulb_mr_msgid_regid = -1;
-static int hf_lbmc_umq_rxreq_ulb_mr_msgid_stamp = -1;
-static int hf_lbmc_umq_rxreq_ulb_mr_abort = -1;
-static int hf_lbmc_umq_rxreq_ulb_mr_abort_ulb_src_id = -1;
-static int hf_lbmc_umq_rxreq_ulb_mr_abort_assign_id = -1;
-static int hf_lbmc_umq_rxreq_ulb_mr_abort_msgid_regid = -1;
-static int hf_lbmc_umq_rxreq_ulb_mr_abort_msgid_stamp = -1;
-static int hf_lbmc_umq_rxreq_qrcrr = -1;
-static int hf_lbmc_umq_rxreq_qrcrr_tsp = -1;
-static int hf_lbmc_umq_rxreq_trcrr = -1;
-static int hf_lbmc_umq_rxreq_trcrr_rcr_idx = -1;
-static int hf_lbmc_umq_rxreq_trcrr_tsp = -1;
-static int hf_lbmc_umq_rxreq_ulb_trcrr = -1;
-static int hf_lbmc_umq_rxreq_ulb_trcrr_ulb_src_id = -1;
-static int hf_lbmc_umq_rxreq_ulb_trcrr_assign_id = -1;
-static int hf_lbmc_umq_rxreq_ulb_trcrr_tsp = -1;
-static int hf_lbmc_umq_rxreq_ulb_trcrr_abort = -1;
-static int hf_lbmc_umq_rxreq_ulb_trcrr_abort_ulb_src_id = -1;
-static int hf_lbmc_umq_rxreq_ulb_trcrr_abort_assign_id = -1;
-static int hf_lbmc_umq_rxreq_ulb_trcrr_abort_tsp = -1;
-static int hf_lbmc_umq_qmgmt = -1;
-static int hf_lbmc_umq_qmgmt_next_hdr = -1;
-static int hf_lbmc_umq_qmgmt_hdr_len = -1;
-static int hf_lbmc_umq_resub_req = -1;
-static int hf_lbmc_umq_resub_req_next_hdr = -1;
-static int hf_lbmc_umq_resub_req_hdr_len = -1;
-static int hf_lbmc_umq_resub_req_flags = -1;
-static int hf_lbmc_umq_resub_req_flags_ignore = -1;
-static int hf_lbmc_umq_resub_req_msgid_regid = -1;
-static int hf_lbmc_umq_resub_req_msgid_stamp = -1;
-static int hf_lbmc_umq_resub_req_rcr_idx = -1;
-static int hf_lbmc_umq_resub_req_resp_ip = -1;
-static int hf_lbmc_umq_resub_req_resp_port = -1;
-static int hf_lbmc_umq_resub_req_appset_idx = -1;
-static int hf_lbmc_umq_resub_resp = -1;
-static int hf_lbmc_umq_resub_resp_next_hdr = -1;
-static int hf_lbmc_umq_resub_resp_hdr_len = -1;
-static int hf_lbmc_umq_resub_resp_flags = -1;
-static int hf_lbmc_umq_resub_resp_flags_ignore = -1;
-static int hf_lbmc_umq_resub_resp_code = -1;
-static int hf_lbmc_umq_resub_resp_msgid_regid = -1;
-static int hf_lbmc_umq_resub_resp_msgid_stamp = -1;
-static int hf_lbmc_umq_resub_resp_rcr_idx = -1;
-static int hf_lbmc_umq_resub_resp_reserved = -1;
-static int hf_lbmc_umq_resub_resp_appset_idx = -1;
-static int hf_lbmc_topic_interest = -1;
-static int hf_lbmc_topic_interest_next_hdr = -1;
-static int hf_lbmc_topic_interest_hdr_len = -1;
-static int hf_lbmc_topic_interest_flags = -1;
-static int hf_lbmc_topic_interest_flags_ignore = -1;
-static int hf_lbmc_topic_interest_flags_cancel = -1;
-static int hf_lbmc_topic_interest_flags_refresh = -1;
-static int hf_lbmc_topic_interest_domain_id = -1;
-static int hf_lbmc_pattern_interest = -1;
-static int hf_lbmc_pattern_interest_next_hdr = -1;
-static int hf_lbmc_pattern_interest_hdr_len = -1;
-static int hf_lbmc_pattern_interest_flags = -1;
-static int hf_lbmc_pattern_interest_flags_ignore = -1;
-static int hf_lbmc_pattern_interest_flags_cancel = -1;
-static int hf_lbmc_pattern_interest_flags_refresh = -1;
-static int hf_lbmc_pattern_interest_type = -1;
-static int hf_lbmc_pattern_interest_domain_id = -1;
-static int hf_lbmc_pattern_interest_index = -1;
-static int hf_lbmc_advertisement = -1;
-static int hf_lbmc_advertisement_next_hdr = -1;
-static int hf_lbmc_advertisement_hdr_len = -1;
-static int hf_lbmc_advertisement_flags = -1;
-static int hf_lbmc_advertisement_flags_ignore = -1;
-static int hf_lbmc_advertisement_flags_eos = -1;
-static int hf_lbmc_advertisement_flags_pattern = -1;
-static int hf_lbmc_advertisement_flags_change = -1;
-static int hf_lbmc_advertisement_flags_ctxinst = -1;
-static int hf_lbmc_advertisement_hop_count = -1;
-static int hf_lbmc_advertisement_ad_flags = -1;
-static int hf_lbmc_advertisement_ad_flags_lj = -1;
-static int hf_lbmc_advertisement_ad_flags_ume = -1;
-static int hf_lbmc_advertisement_ad_flags_acktosrc = -1;
-static int hf_lbmc_advertisement_ad_flags_queue = -1;
-static int hf_lbmc_advertisement_ad_flags_ulb = -1;
-static int hf_lbmc_advertisement_cost = -1;
-static int hf_lbmc_advertisement_transport_idx = -1;
-static int hf_lbmc_advertisement_topic_idx = -1;
-static int hf_lbmc_advertisement_low_seqno = -1;
-static int hf_lbmc_advertisement_high_seqno = -1;
-static int hf_lbmc_advertisement_domain_id = -1;
-static int hf_lbmc_advertisement_pat_idx = -1;
-static int hf_lbmc_advertisement_ctxinst = -1;
-static int hf_lbmc_ume_storename = -1;
-static int hf_lbmc_ume_storename_next_hdr = -1;
-static int hf_lbmc_ume_storename_hdr_len = -1;
-static int hf_lbmc_ume_storename_flags = -1;
-static int hf_lbmc_ume_storename_flags_ignore = -1;
-static int hf_lbmc_ume_storename_store = -1;
-static int hf_lbmc_umq_ulb_rcr = -1;
-static int hf_lbmc_umq_ulb_rcr_next_hdr = -1;
-static int hf_lbmc_umq_ulb_rcr_hdr_len = -1;
-static int hf_lbmc_umq_ulb_rcr_flags = -1;
-static int hf_lbmc_umq_ulb_rcr_flags_ignore = -1;
-static int hf_lbmc_umq_ulb_rcr_flags_r_flag = -1;
-static int hf_lbmc_umq_ulb_rcr_flags_d_flag = -1;
-static int hf_lbmc_umq_ulb_rcr_flags_eoi_flag = -1;
-static int hf_lbmc_umq_ulb_rcr_flags_boi_flag = -1;
-static int hf_lbmc_umq_ulb_rcr_queue_id = -1;
-static int hf_lbmc_umq_ulb_rcr_ulb_src_id = -1;
-static int hf_lbmc_umq_ulb_rcr_msgid_regid = -1;
-static int hf_lbmc_umq_ulb_rcr_msgid_stamp = -1;
-static int hf_lbmc_umq_ulb_rcr_topic_tsp = -1;
-static int hf_lbmc_umq_ulb_rcr_assign_id = -1;
-static int hf_lbmc_umq_ulb_rcr_appset_idx = -1;
-static int hf_lbmc_umq_ulb_rcr_num_ras = -1;
-static int hf_lbmc_umq_lf = -1;
-static int hf_lbmc_umq_lf_next_hdr = -1;
-static int hf_lbmc_umq_lf_hdr_len = -1;
-static int hf_lbmc_umq_lf_flags = -1;
-static int hf_lbmc_umq_lf_flags_ignore = -1;
-static int hf_lbmc_umq_lf_type = -1;
-static int hf_lbmc_umq_lf_num_srcs = -1;
-static int hf_lbmc_umq_lf_lf = -1;
-static int hf_lbmc_ctxinfo = -1;
-static int hf_lbmc_ctxinfo_next_hdr = -1;
-static int hf_lbmc_ctxinfo_hdr_len = -1;
-static int hf_lbmc_ctxinfo_flags = -1;
-static int hf_lbmc_ctxinfo_flags_ignore = -1;
-static int hf_lbmc_ctxinfo_flags_query = -1;
-static int hf_lbmc_ctxinfo_flags_addr = -1;
-static int hf_lbmc_ctxinfo_flags_ctxinst = -1;
-static int hf_lbmc_ctxinfo_flags_name = -1;
-static int hf_lbmc_ctxinfo_flags_tnwgsrc = -1;
-static int hf_lbmc_ctxinfo_flags_tnwgrcv = -1;
-static int hf_lbmc_ctxinfo_flags_proxy = -1;
-static int hf_lbmc_ctxinfo_reserved = -1;
-static int hf_lbmc_ctxinfo_hop_count = -1;
-static int hf_lbmc_ctxinfo_port = -1;
-static int hf_lbmc_ctxinfo_addr = -1;
-static int hf_lbmc_ctxinfo_domain_id = -1;
-static int hf_lbmc_ctxinfo_ctxinst = -1;
-static int hf_lbmc_ctxinfo_name = -1;
-static int hf_lbmc_ume_pser = -1;
-static int hf_lbmc_ume_pser_next_hdr = -1;
-static int hf_lbmc_ume_pser_hdr_len = -1;
-static int hf_lbmc_ume_pser_flags = -1;
-static int hf_lbmc_ume_pser_flags_ignore = -1;
-static int hf_lbmc_ume_pser_flags_source_ctxinst = -1;
-static int hf_lbmc_ume_pser_flags_store_ctxinst = -1;
-static int hf_lbmc_ume_pser_flags_reelect = -1;
-static int hf_lbmc_ume_pser_source_ip = -1;
-static int hf_lbmc_ume_pser_store_ip = -1;
-static int hf_lbmc_ume_pser_transport_idx = -1;
-static int hf_lbmc_ume_pser_topic_idx = -1;
-static int hf_lbmc_ume_pser_source_port = -1;
-static int hf_lbmc_ume_pser_store_port = -1;
-static int hf_lbmc_ume_pser_source_ctxinst = -1;
-static int hf_lbmc_ume_pser_store_ctxinst = -1;
-static int hf_lbmc_domain = -1;
-static int hf_lbmc_domain_next_hdr = -1;
-static int hf_lbmc_domain_hdr_len = -1;
-static int hf_lbmc_domain_flags = -1;
-static int hf_lbmc_domain_flags_ignore = -1;
-static int hf_lbmc_domain_flags_active = -1;
-static int hf_lbmc_domain_domain = -1;
-static int hf_lbmc_tnwg_capabilities = -1;
-static int hf_lbmc_tnwg_capabilities_next_hdr = -1;
-static int hf_lbmc_tnwg_capabilities_hdr_len = -1;
-static int hf_lbmc_tnwg_capabilities_flags = -1;
-static int hf_lbmc_tnwg_capabilities_flags_ignore = -1;
-static int hf_lbmc_tnwg_capabilities_flags_version = -1;
-static int hf_lbmc_tnwg_capabilities_capabilities1 = -1;
-static int hf_lbmc_tnwg_capabilities_capabilities1_ume = -1;
-static int hf_lbmc_tnwg_capabilities_capabilities1_umq = -1;
-static int hf_lbmc_tnwg_capabilities_capabilities2 = -1;
-static int hf_lbmc_tnwg_capabilities_capabilities3 = -1;
-static int hf_lbmc_tnwg_capabilities_capabilities3_pcre = -1;
-static int hf_lbmc_tnwg_capabilities_capabilities3_regex = -1;
-static int hf_lbmc_tnwg_capabilities_capabilities4 = -1;
-static int hf_lbmc_patidx = -1;
-static int hf_lbmc_patidx_next_hdr = -1;
-static int hf_lbmc_patidx_hdr_len = -1;
-static int hf_lbmc_patidx_flags = -1;
-static int hf_lbmc_patidx_flags_ignore = -1;
-static int hf_lbmc_patidx_patidx = -1;
-static int hf_lbmc_ume_client_lifetime = -1;
-static int hf_lbmc_ume_client_lifetime_next_hdr = -1;
-static int hf_lbmc_ume_client_lifetime_hdr_len = -1;
-static int hf_lbmc_ume_client_lifetime_flags = -1;
-static int hf_lbmc_ume_client_lifetime_flags_ignore = -1;
-static int hf_lbmc_ume_client_lifetime_activity_tmo = -1;
-static int hf_lbmc_ume_client_lifetime_lifetime = -1;
-static int hf_lbmc_ume_client_lifetime_ttl = -1;
-static int hf_lbmc_ume_sid = -1;
-static int hf_lbmc_ume_sid_next_hdr = -1;
-static int hf_lbmc_ume_sid_hdr_len = -1;
-static int hf_lbmc_ume_sid_flags = -1;
-static int hf_lbmc_ume_sid_flags_ignore = -1;
-static int hf_lbmc_ume_sid_sid = -1;
-static int hf_lbmc_umq_idx_cmd = -1;
-static int hf_lbmc_umq_idx_cmd_next_hdr = -1;
-static int hf_lbmc_umq_idx_cmd_hdr_len = -1;
-static int hf_lbmc_umq_idx_cmd_flags = -1;
-static int hf_lbmc_umq_idx_cmd_flags_ignore = -1;
-static int hf_lbmc_umq_idx_cmd_cmd_type = -1;
-static int hf_lbmc_umq_idx_cmd_queue_id = -1;
-static int hf_lbmc_umq_idx_cmd_cmd_id = -1;
-static int hf_lbmc_umq_idx_cmd_inst_idx = -1;
-static int hf_lbmc_umq_idx_cmd_regid = -1;
-static int hf_lbmc_umq_idx_cmd_stop_assign = -1;
-static int hf_lbmc_umq_idx_cmd_stop_assign_rcr_idx = -1;
-static int hf_lbmc_umq_idx_cmd_stop_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_start_assign = -1;
-static int hf_lbmc_umq_idx_cmd_start_assign_rcr_idx = -1;
-static int hf_lbmc_umq_idx_cmd_start_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_release_assign = -1;
-static int hf_lbmc_umq_idx_cmd_release_assign_rcr_idx = -1;
-static int hf_lbmc_umq_idx_cmd_release_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_release_assign_flags = -1;
-static int hf_lbmc_umq_idx_cmd_release_assign_flags_numeric = -1;
-static int hf_lbmc_umq_idx_cmd_release_assign_index_len = -1;
-static int hf_lbmc_umq_idx_cmd_release_assign_reserved = -1;
-static int hf_lbmc_umq_idx_cmd_release_assign_numeric_index = -1;
-static int hf_lbmc_umq_idx_cmd_release_assign_string_index = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_stop_assign = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_stop_assign_src_id = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_stop_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_stop_assign_appset_idx = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_stop_assign_reserved = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_start_assign = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_start_assign_src_id = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_start_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_start_assign_appset_idx = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_start_assign_reserved = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_release_assign = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_release_assign_src_id = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_release_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_release_assign_flags = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_release_assign_flags_numeric = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_release_assign_appset_idx = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_release_assign_index_len = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_release_assign_reserved = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_release_assign_numeric_index = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_release_assign_string_index = -1;
-static int hf_lbmc_umq_idx_cmd_reserve_assign = -1;
-static int hf_lbmc_umq_idx_cmd_reserve_assign_rcr_idx = -1;
-static int hf_lbmc_umq_idx_cmd_reserve_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_reserve_assign_flags = -1;
-static int hf_lbmc_umq_idx_cmd_reserve_assign_flags_numeric = -1;
-static int hf_lbmc_umq_idx_cmd_reserve_assign_index_len = -1;
-static int hf_lbmc_umq_idx_cmd_reserve_assign_reserved = -1;
-static int hf_lbmc_umq_idx_cmd_reserve_assign_numeric_index = -1;
-static int hf_lbmc_umq_idx_cmd_reserve_assign_string_index = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_src_id = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_flags = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_flags_numeric = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_appset_idx = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_index_len = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_reserved = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_numeric_index = -1;
-static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_string_index = -1;
-static int hf_lbmc_umq_idx_cmd_resp = -1;
-static int hf_lbmc_umq_idx_cmd_resp_next_hdr = -1;
-static int hf_lbmc_umq_idx_cmd_resp_hdr_len = -1;
-static int hf_lbmc_umq_idx_cmd_resp_flags = -1;
-static int hf_lbmc_umq_idx_cmd_resp_flags_ignore = -1;
-static int hf_lbmc_umq_idx_cmd_resp_flags_ulb = -1;
-static int hf_lbmc_umq_idx_cmd_resp_resp_type = -1;
-static int hf_lbmc_umq_idx_cmd_resp_queue_id = -1;
-static int hf_lbmc_umq_idx_cmd_resp_cmd_id = -1;
-static int hf_lbmc_umq_idx_cmd_resp_inst_idx = -1;
-static int hf_lbmc_umq_idx_cmd_resp_regid = -1;
-static int hf_lbmc_umq_idx_cmd_resp_err = -1;
-static int hf_lbmc_umq_idx_cmd_resp_err_reserved = -1;
-static int hf_lbmc_umq_idx_cmd_resp_err_code = -1;
-static int hf_lbmc_umq_idx_cmd_resp_err_error_string = -1;
-static int hf_lbmc_umq_idx_cmd_resp_stop_assign = -1;
-static int hf_lbmc_umq_idx_cmd_resp_stop_assign_rcr_idx = -1;
-static int hf_lbmc_umq_idx_cmd_resp_stop_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_resp_start_assign = -1;
-static int hf_lbmc_umq_idx_cmd_resp_start_assign_rcr_idx = -1;
-static int hf_lbmc_umq_idx_cmd_resp_start_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_resp_start_assign_appset_idx = -1;
-static int hf_lbmc_umq_idx_cmd_resp_start_assign_reserved = -1;
-static int hf_lbmc_umq_idx_cmd_resp_release_assign = -1;
-static int hf_lbmc_umq_idx_cmd_resp_release_assign_rcr_idx = -1;
-static int hf_lbmc_umq_idx_cmd_resp_release_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_resp_release_assign_appset_idx = -1;
-static int hf_lbmc_umq_idx_cmd_resp_release_assign_reserved = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_stop_assign = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_stop_assign_src_id = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_stop_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_stop_assign_appset_idx = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_stop_assign_reserved = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_start_assign = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_start_assign_src_id = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_start_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_start_assign_appset_idx = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_start_assign_reserved = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_release_assign = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_release_assign_src_id = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_release_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_release_assign_appset_idx = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_release_assign_reserved = -1;
-static int hf_lbmc_umq_idx_cmd_resp_reserve_assign = -1;
-static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_rcr_idx = -1;
-static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_flags = -1;
-static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_flags_numeric = -1;
-static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_appset_idx = -1;
-static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_index_len = -1;
-static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_reserved = -1;
-static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_numeric_index = -1;
-static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_string_index = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_src_id = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_assign_id = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_flags = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_flags_numeric = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_appset_idx = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_index_len = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_reserved = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_numeric_index = -1;
-static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_string_index = -1;
-static int hf_lbmc_odomain = -1;
-static int hf_lbmc_odomain_next_hdr = -1;
-static int hf_lbmc_odomain_hdr_len = -1;
-static int hf_lbmc_odomain_flags = -1;
-static int hf_lbmc_odomain_flags_ignore = -1;
-static int hf_lbmc_odomain_domain = -1;
-static int hf_lbmc_stream = -1;
-static int hf_lbmc_stream_next_hdr = -1;
-static int hf_lbmc_stream_hdr_len = -1;
-static int hf_lbmc_stream_flags = -1;
-static int hf_lbmc_stream_flags_ignore = -1;
-static int hf_lbmc_stream_stream_id = -1;
-static int hf_lbmc_stream_sqn = -1;
-static int hf_lbmc_stream_ctxinst = -1;
-static int hf_lbmc_topic_md_interest = -1;
-static int hf_lbmc_topic_md_interest_next_hdr = -1;
-static int hf_lbmc_topic_md_interest_hdr_len = -1;
-static int hf_lbmc_topic_md_interest_flags = -1;
-static int hf_lbmc_topic_md_interest_flags_ignore = -1;
-static int hf_lbmc_topic_md_interest_flags_cancel = -1;
-static int hf_lbmc_topic_md_interest_flags_refresh = -1;
-static int hf_lbmc_topic_md_interest_domain_count = -1;
-static int hf_lbmc_topic_md_interest_res1 = -1;
-static int hf_lbmc_topic_md_interest_domain_id = -1;
-static int hf_lbmc_pattern_md_interest = -1;
-static int hf_lbmc_pattern_md_interest_next_hdr = -1;
-static int hf_lbmc_pattern_md_interest_hdr_len = -1;
-static int hf_lbmc_pattern_md_interest_flags = -1;
-static int hf_lbmc_pattern_md_interest_flags_ignore = -1;
-static int hf_lbmc_pattern_md_interest_flags_cancel = -1;
-static int hf_lbmc_pattern_md_interest_flags_refresh = -1;
-static int hf_lbmc_pattern_md_interest_type = -1;
-static int hf_lbmc_pattern_md_interest_domain_count = -1;
-static int hf_lbmc_pattern_md_interest_res1 = -1;
-static int hf_lbmc_pattern_md_interest_index = -1;
-static int hf_lbmc_pattern_md_interest_domain_id = -1;
-static int hf_lbmc_lji_req = -1;
-static int hf_lbmc_lji_req_next_hdr = -1;
-static int hf_lbmc_lji_req_hdr_len = -1;
-static int hf_lbmc_lji_req_flags = -1;
-static int hf_lbmc_lji_req_flags_ignore = -1;
-static int hf_lbmc_lji_req_flags_l_flag = -1;
-static int hf_lbmc_lji_req_flags_m_flag = -1;
-static int hf_lbmc_lji_req_flags_o_flag = -1;
-static int hf_lbmc_lji_req_request_idx = -1;
-static int hf_lbmc_lji_req_transport_idx = -1;
-static int hf_lbmc_lji_req_topic_idx = -1;
-static int hf_lbmc_lji_req_req_ip = -1;
-static int hf_lbmc_lji_req_req_port = -1;
-static int hf_lbmc_lji_req_res = -1;
-static int hf_lbmc_lji_req_tx_low_sqn = -1;
-static int hf_lbmc_lji_req_rx_req_max = -1;
-static int hf_lbmc_lji_req_rx_req_outstanding_max = -1;
-static int hf_lbmc_tnwg_ka = -1;
-static int hf_lbmc_tnwg_ka_next_hdr = -1;
-static int hf_lbmc_tnwg_ka_hdr_len = -1;
-static int hf_lbmc_tnwg_ka_flags = -1;
-static int hf_lbmc_tnwg_ka_flags_ignore = -1;
-static int hf_lbmc_tnwg_ka_flags_q_flag = -1;
-static int hf_lbmc_tnwg_ka_flags_r_flag = -1;
-static int hf_lbmc_tnwg_ka_index = -1;
-static int hf_lbmc_tnwg_ka_ts_seconds = -1;
-static int hf_lbmc_tnwg_ka_ts_microseconds = -1;
-static int hf_lbmc_tnwg_ka_reserved_1 = -1;
-static int hf_lbmc_tnwg_ka_reserved_2 = -1;
-static int hf_lbmc_tnwg_ka_reserved_3 = -1;
-static int hf_lbmc_tnwg_ka_reserved_4 = -1;
-static int hf_lbmc_tnwg_ka_reserved_5 = -1;
-static int hf_lbmc_tnwg_ka_reserved_6 = -1;
-static int hf_lbmc_ume_receiver_keepalive = -1;
-static int hf_lbmc_ume_receiver_keepalive_next_hdr = -1;
-static int hf_lbmc_ume_receiver_keepalive_hdr_len = -1;
-static int hf_lbmc_ume_receiver_keepalive_flags = -1;
-static int hf_lbmc_ume_receiver_keepalive_flags_ignore = -1;
-static int hf_lbmc_ume_receiver_keepalive_rcv_regid = -1;
-static int hf_lbmc_ume_receiver_keepalive_session_id = -1;
-static int hf_lbmc_ume_receiver_keepalive_ctxinst = -1;
-static int hf_lbmc_umq_cmd = -1;
-static int hf_lbmc_umq_cmd_next_hdr = -1;
-static int hf_lbmc_umq_cmd_hdr_len = -1;
-static int hf_lbmc_umq_cmd_flags = -1;
-static int hf_lbmc_umq_cmd_flags_ignore = -1;
-static int hf_lbmc_umq_cmd_cmd_type = -1;
-static int hf_lbmc_umq_cmd_queue_id = -1;
-static int hf_lbmc_umq_cmd_cmd_id = -1;
-static int hf_lbmc_umq_cmd_inst_idx = -1;
-static int hf_lbmc_umq_cmd_regid = -1;
-static int hf_lbmc_umq_cmd_topic_list = -1;
-static int hf_lbmc_umq_cmd_topic_list_serial_num = -1;
-static int hf_lbmc_umq_cmd_msg_retrieve = -1;
-static int hf_lbmc_umq_cmd_msg_retrieve_rcr_idx = -1;
-static int hf_lbmc_umq_cmd_msg_retrieve_assign_id = -1;
-static int hf_lbmc_umq_cmd_msg_retrieve_info_only = -1;
-static int hf_lbmc_umq_cmd_msg_retrieve_num_msgids = -1;
-static int hf_lbmc_umq_cmd_msg_retrieve_flags = -1;
-static int hf_lbmc_umq_cmd_msg_retrieve_entry = -1;
-static int hf_lbmc_umq_cmd_msg_retrieve_entry_regid = -1;
-static int hf_lbmc_umq_cmd_msg_retrieve_entry_stamp = -1;
-static int hf_lbmc_umq_cmd_msg_list = -1;
-static int hf_lbmc_umq_cmd_msg_list_rcr_idx = -1;
-static int hf_lbmc_umq_cmd_msg_list_assign_id = -1;
-static int hf_lbmc_umq_cmd_resp = -1;
-static int hf_lbmc_umq_cmd_resp_next_hdr = -1;
-static int hf_lbmc_umq_cmd_resp_hdr_len = -1;
-static int hf_lbmc_umq_cmd_resp_flags = -1;
-static int hf_lbmc_umq_cmd_resp_flags_ignore = -1;
-static int hf_lbmc_umq_cmd_resp_resp_type = -1;
-static int hf_lbmc_umq_cmd_resp_queue_id = -1;
-static int hf_lbmc_umq_cmd_resp_cmd_id = -1;
-static int hf_lbmc_umq_cmd_resp_inst_idx = -1;
-static int hf_lbmc_umq_cmd_resp_regid = -1;
-static int hf_lbmc_umq_cmd_resp_msg_retrieve = -1;
-static int hf_lbmc_umq_cmd_resp_msg_retrieve_rcr_idx = -1;
-static int hf_lbmc_umq_cmd_resp_msg_retrieve_assign_id = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_retrieve = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_num_msgs = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_flags = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_reserved = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_entry = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_entry_regid = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_entry_stamp = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_entry_assign_id = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_entry_num_ras = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_entry_status = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_entry_reserved = -1;
-static int hf_lbmc_umq_cmd_resp_msg_list = -1;
-static int hf_lbmc_umq_cmd_resp_msg_list_rcr_idx = -1;
-static int hf_lbmc_umq_cmd_resp_msg_list_assign_id = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_list = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_list_num_msgs = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_list_entry = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_list_entry_regid = -1;
-static int hf_lbmc_umq_cmd_resp_xmsg_list_entry_stamp = -1;
-static int hf_lbmc_umq_cmd_resp_topic_list = -1;
-static int hf_lbmc_umq_cmd_resp_topic_list_num_topics = -1;
-static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry = -1;
-static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_rcr_idx = -1;
-static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_num_appsets = -1;
-static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_topic_len = -1;
-static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_reserved = -1;
-static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_topic = -1;
-static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry = -1;
-static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_num_receiver_type_ids = -1;
-static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_appset_idx = -1;
-static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_appset_name_len = -1;
-static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_reserved = -1;
-static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_name = -1;
-static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_receiver_type_id = -1;
-static int hf_lbmc_umq_cmd_resp_err = -1;
-static int hf_lbmc_umq_cmd_resp_err_reserved = -1;
-static int hf_lbmc_umq_cmd_resp_err_code = -1;
-static int hf_lbmc_umq_cmd_resp_err_errmsg = -1;
-static int hf_lbmc_sri_req = -1;
-static int hf_lbmc_sri_req_next_hdr = -1;
-static int hf_lbmc_sri_req_hdr_len = -1;
-static int hf_lbmc_sri_req_flags = -1;
-static int hf_lbmc_sri_req_flags_ignore = -1;
-static int hf_lbmc_sri_req_transport_idx = -1;
-static int hf_lbmc_sri_req_topic_idx = -1;
-static int hf_lbmc_ume_store_domain = -1;
-static int hf_lbmc_ume_store_domain_next_hdr = -1;
-static int hf_lbmc_ume_store_domain_hdr_len = -1;
-static int hf_lbmc_ume_store_domain_flags = -1;
-static int hf_lbmc_ume_store_domain_flags_ignore = -1;
-static int hf_lbmc_ume_store_domain_domain = -1;
-static int hf_lbmc_sri = -1;
-static int hf_lbmc_sri_next_hdr = -1;
-static int hf_lbmc_sri_hdr_len = -1;
-static int hf_lbmc_sri_flags = -1;
-static int hf_lbmc_sri_flags_ignore = -1;
-static int hf_lbmc_sri_flags_acktosrc = -1;
-static int hf_lbmc_sri_flags_initial_sqn_known = -1;
-static int hf_lbmc_sri_version = -1;
-static int hf_lbmc_sri_low_sqn = -1;
-static int hf_lbmc_sri_high_sqn = -1;
-static int hf_lbmc_route_info = -1;
-static int hf_lbmc_route_info_next_hdr = -1;
-static int hf_lbmc_route_info_hdr_len = -1;
-static int hf_lbmc_route_info_flags = -1;
-static int hf_lbmc_route_info_flags_ignore = -1;
-static int hf_lbmc_route_info_gateway_version = -1;
-static int hf_lbmc_route_info_configuration_signature = -1;
-static int hf_lbmc_route_info_node_id = -1;
-static int hf_lbmc_route_info_topology = -1;
-static int hf_lbmc_route_info_vers = -1;
-static int hf_lbmc_route_info_sqn = -1;
-static int hf_lbmc_route_info_ttl = -1;
-static int hf_lbmc_route_info_reserved1 = -1;
-static int hf_lbmc_route_info_reserved2 = -1;
-static int hf_lbmc_route_info_neighbor = -1;
-static int hf_lbmc_route_info_neighbor_next_hdr = -1;
-static int hf_lbmc_route_info_neighbor_hdr_len = -1;
-static int hf_lbmc_route_info_neighbor_flags = -1;
-static int hf_lbmc_route_info_neighbor_flags_ignore = -1;
-static int hf_lbmc_route_info_neighbor_node_id = -1;
-static int hf_lbmc_route_info_neighbor_ingress_cost = -1;
-static int hf_lbmc_route_info_neighbor_egress_cost = -1;
-static int hf_lbmc_gateway_name = -1;
-static int hf_lbmc_gateway_name_next_hdr = -1;
-static int hf_lbmc_gateway_name_hdr_len = -1;
-static int hf_lbmc_gateway_name_flags = -1;
-static int hf_lbmc_gateway_name_flags_ignore = -1;
-static int hf_lbmc_gateway_name_gateway_name = -1;
-static int hf_lbmc_auth_request = -1;
-static int hf_lbmc_auth_request_next_hdr = -1;
-static int hf_lbmc_auth_request_hdr_len = -1;
-static int hf_lbmc_auth_request_flags = -1;
-static int hf_lbmc_auth_request_flags_ignore = -1;
-static int hf_lbmc_auth_request_opid = -1;
-static int hf_lbmc_auth_request_user_len = -1;
-static int hf_lbmc_auth_request_user_name = -1;
-static int hf_lbmc_auth_challenge = -1;
-static int hf_lbmc_auth_challenge_next_hdr = -1;
-static int hf_lbmc_auth_challenge_hdr_len = -1;
-static int hf_lbmc_auth_challenge_flags = -1;
-static int hf_lbmc_auth_challenge_flags_ignore = -1;
-static int hf_lbmc_auth_challenge_opid = -1;
-static int hf_lbmc_auth_challenge_mod_len = -1;
-static int hf_lbmc_auth_challenge_gen_len = -1;
-static int hf_lbmc_auth_challenge_salt_len = -1;
-static int hf_lbmc_auth_challenge_pubkey_len = -1;
-static int hf_lbmc_auth_challenge_mod = -1;
-static int hf_lbmc_auth_challenge_gen = -1;
-static int hf_lbmc_auth_challenge_salt = -1;
-static int hf_lbmc_auth_challenge_pubkey = -1;
-static int hf_lbmc_auth_challenge_rsp = -1;
-static int hf_lbmc_auth_challenge_rsp_next_hdr = -1;
-static int hf_lbmc_auth_challenge_rsp_hdr_len = -1;
-static int hf_lbmc_auth_challenge_rsp_flags = -1;
-static int hf_lbmc_auth_challenge_rsp_flags_ignore = -1;
-static int hf_lbmc_auth_challenge_rsp_opid = -1;
-static int hf_lbmc_auth_challenge_rsp_pubkey_len = -1;
-static int hf_lbmc_auth_challenge_rsp_evidence_len = -1;
-static int hf_lbmc_auth_challenge_rsp_pubkey = -1;
-static int hf_lbmc_auth_challenge_rsp_evidence = -1;
-static int hf_lbmc_auth_result = -1;
-static int hf_lbmc_auth_result_next_hdr = -1;
-static int hf_lbmc_auth_result_hdr_len = -1;
-static int hf_lbmc_auth_result_flags = -1;
-static int hf_lbmc_auth_result_flags_ignore = -1;
-static int hf_lbmc_auth_result_opid = -1;
-static int hf_lbmc_auth_result_result = -1;
-static int hf_lbmc_auth_unknown = -1;
-static int hf_lbmc_auth_unknown_next_hdr = -1;
-static int hf_lbmc_auth_unknown_hdr_len = -1;
-static int hf_lbmc_auth_unknown_flags = -1;
-static int hf_lbmc_auth_unknown_opid = -1;
-static int hf_lbmc_auth_unknown_data = -1;
-static int hf_lbmc_hmac = -1;
-static int hf_lbmc_hmac_next_hdr = -1;
-static int hf_lbmc_hmac_hdr_len = -1;
-static int hf_lbmc_hmac_flags = -1;
-static int hf_lbmc_hmac_flags_ignore = -1;
-static int hf_lbmc_hmac_padding = -1;
-static int hf_lbmc_hmac_data = -1;
-static int hf_lbmc_umq_sid = -1;
-static int hf_lbmc_umq_sid_next_hdr = -1;
-static int hf_lbmc_umq_sid_hdr_len = -1;
-static int hf_lbmc_umq_sid_flags = -1;
-static int hf_lbmc_umq_sid_flags_ignore = -1;
-static int hf_lbmc_umq_sid_key = -1;
-static int hf_lbmc_umq_sid_sid = -1;
-static int hf_lbmc_destination = -1;
-static int hf_lbmc_destination_next_hdr = -1;
-static int hf_lbmc_destination_hdr_len = -1;
-static int hf_lbmc_destination_flags = -1;
-static int hf_lbmc_destination_flags_ignore = -1;
-static int hf_lbmc_destination_domain_id = -1;
-static int hf_lbmc_destination_ipaddr = -1;
-static int hf_lbmc_destination_port = -1;
-static int hf_lbmc_destination_hops_taken = -1;
-static int hf_lbmc_destination_orig_domain_id = -1;
-static int hf_lbmc_destination_orig_ipaddr = -1;
-static int hf_lbmc_destination_orig_port = -1;
-static int hf_lbmc_destination_reserved = -1;
-static int hf_lbmc_topic_idx = -1;
-static int hf_lbmc_topic_idx_next_hdr = -1;
-static int hf_lbmc_topic_idx_hdr_len = -1;
-static int hf_lbmc_topic_idx_flags = -1;
-static int hf_lbmc_topic_idx_flags_ignore = -1;
-static int hf_lbmc_topic_idx_tidx = -1;
-static int hf_lbmc_topic_source = -1;
-static int hf_lbmc_topic_source_next_hdr = -1;
-static int hf_lbmc_topic_source_hdr_len = -1;
-static int hf_lbmc_topic_source_flags = -1;
-static int hf_lbmc_topic_source_flags_ignore = -1;
-static int hf_lbmc_topic_source_flags_eos = -1;
-static int hf_lbmc_topic_source_domain_id = -1;
-static int hf_lbmc_topic_source_exfunc = -1;
-static int hf_lbmc_topic_source_exfunc_next_hdr = -1;
-static int hf_lbmc_topic_source_exfunc_hdr_len = -1;
-static int hf_lbmc_topic_source_exfunc_flags = -1;
-static int hf_lbmc_topic_source_exfunc_flags_ignore = -1;
-static int hf_lbmc_topic_source_exfunc_src_ip = -1;
-static int hf_lbmc_topic_source_exfunc_src_port = -1;
-static int hf_lbmc_topic_source_exfunc_unused = -1;
-static int hf_lbmc_topic_source_exfunc_functionality_flags = -1;
-static int hf_lbmc_topic_source_exfunc_functionality_flags_ulb = -1;
-static int hf_lbmc_topic_source_exfunc_functionality_flags_umq = -1;
-static int hf_lbmc_topic_source_exfunc_functionality_flags_ume = -1;
-static int hf_lbmc_topic_source_exfunc_functionality_flags_lj = -1;
-static int hf_lbmc_ume_store_ext = -1;
-static int hf_lbmc_ume_store_ext_next_hdr = -1;
-static int hf_lbmc_ume_store_ext_hdr_len = -1;
-static int hf_lbmc_ume_store_ext_flags = -1;
-static int hf_lbmc_ume_store_ext_flags_ignore = -1;
-static int hf_lbmc_ume_store_ext_grp_idx = -1;
-static int hf_lbmc_ume_store_ext_store_tcp_port = -1;
-static int hf_lbmc_ume_store_ext_store_idx = -1;
-static int hf_lbmc_ume_store_ext_store_ip_addr = -1;
-static int hf_lbmc_ume_store_ext_src_reg_id = -1;
-static int hf_lbmc_ume_store_ext_domain_id = -1;
-static int hf_lbmc_ume_store_ext_version = -1;
-static int hf_lbmc_ume_psrc_election_token = -1;
-static int hf_lbmc_ume_psrc_election_token_next_hdr = -1;
-static int hf_lbmc_ume_psrc_election_token_hdr_len = -1;
-static int hf_lbmc_ume_psrc_election_token_flags = -1;
-static int hf_lbmc_ume_psrc_election_token_flags_ignore = -1;
-static int hf_lbmc_ume_psrc_election_token_store_index = -1;
-static int hf_lbmc_ume_psrc_election_token_token = -1;
-static int hf_lbmc_tcp_sid = -1;
-static int hf_lbmc_tcp_sid_next_hdr = -1;
-static int hf_lbmc_tcp_sid_hdr_len = -1;
-static int hf_lbmc_tcp_sid_flags = -1;
-static int hf_lbmc_tcp_sid_flags_ignore = -1;
-static int hf_lbmc_tcp_sid_sid = -1;
-static int hf_lbmc_extopt = -1;
-static int hf_lbmc_extopt_next_hdr = -1;
-static int hf_lbmc_extopt_hdr_len = -1;
-static int hf_lbmc_extopt_flags = -1;
-static int hf_lbmc_extopt_flags_ignore = -1;
-static int hf_lbmc_extopt_flags_ignore_subtype = -1;
-static int hf_lbmc_extopt_flags_more_fragments = -1;
-static int hf_lbmc_extopt_id = -1;
-static int hf_lbmc_extopt_subtype = -1;
-static int hf_lbmc_extopt_fragment_offset = -1;
-static int hf_lbmc_extopt_data = -1;
-static int hf_lbmc_extopt_cfgopt = -1;
-static int hf_lbmc_extopt_cfgopt_scope = -1;
-static int hf_lbmc_extopt_cfgopt_parent = -1;
-static int hf_lbmc_extopt_cfgopt_name = -1;
-static int hf_lbmc_extopt_cfgopt_value = -1;
-static int hf_lbmc_extopt_msgsel = -1;
-static int hf_lbmc_extopt_reassembled_data = -1;
-static int hf_lbmc_extopt_reassembled_data_subtype = -1;
-static int hf_lbmc_extopt_reassembled_data_len = -1;
-static int hf_lbmc_extopt_reassembled_data_data = -1;
-static int hf_lbmc_extopt_reassembled_data_msgsel = -1;
-static int hf_lbm_msg_properties = -1;
-static int hf_lbm_msg_properties_data = -1;
-static int hf_lbm_msg_properties_data_magic = -1;
-static int hf_lbm_msg_properties_data_num_fields = -1;
-static int hf_lbm_msg_properties_data_version = -1;
-static int hf_lbm_msg_properties_data_type = -1;
-static int hf_lbm_msg_properties_data_res = -1;
-static int hf_lbm_msg_properties_hdr = -1;
-static int hf_lbm_msg_properties_hdr_key_offset = -1;
-static int hf_lbm_msg_properties_hdr_value_offset = -1;
-static int hf_lbm_msg_properties_hdr_hash = -1;
-static int hf_lbm_msg_properties_hdr_type = -1;
-static int hf_lbm_msg_properties_hdr_key = -1;
-static int hf_lbm_msg_properties_hdr_boolean_value = -1;
-static int hf_lbm_msg_properties_hdr_byte_value = -1;
-static int hf_lbm_msg_properties_hdr_short_value = -1;
-static int hf_lbm_msg_properties_hdr_int_value = -1;
-static int hf_lbm_msg_properties_hdr_float_value = -1;
-static int hf_lbm_msg_properties_hdr_long_value = -1;
-static int hf_lbm_msg_properties_hdr_double_value = -1;
-static int hf_lbm_msg_properties_hdr_string_value = -1;
-static int hf_lbm_msg_properties_hdr_unknown_value = -1;
-static int hf_lbmc_unhandled = -1;
-static int hf_lbmc_unhandled_next_hdr = -1;
-static int hf_lbmc_unhandled_hdr_len = -1;
-static int hf_lbmc_unhandled_data = -1;
-static int hf_lbm_stream = -1;
-static int hf_lbm_stream_stream_id = -1;
-static int hf_lbm_stream_substream_id = -1;
-static int hf_lbmc_reassembly = -1;
-static int hf_lbmc_reassembly_fragment = -1;
-static int hf_reassembly_frame = -1;
+static int hf_lbmc_tag;
+static int hf_lbmc_topic;
+static int hf_lbmc_version;
+static int hf_lbmc_type;
+static int hf_lbmc_next_hdr;
+static int hf_lbmc_msglen;
+static int hf_lbmc_tidx;
+static int hf_lbmc_sqn;
+static int hf_lbmc_frag;
+static int hf_lbmc_frag_next_hdr;
+static int hf_lbmc_frag_hdr_len;
+static int hf_lbmc_frag_flags;
+static int hf_lbmc_frag_flags_ignore;
+static int hf_lbmc_frag_first_sqn;
+static int hf_lbmc_frag_offset;
+static int hf_lbmc_frag_len;
+static int hf_lbmc_batch;
+static int hf_lbmc_batch_next_hdr;
+static int hf_lbmc_batch_hdr_len;
+static int hf_lbmc_batch_flags;
+static int hf_lbmc_batch_flags_ignore;
+static int hf_lbmc_batch_flags_batch_start;
+static int hf_lbmc_batch_flags_batch_end;
+static int hf_lbmc_tcp_request;
+static int hf_lbmc_tcp_request_next_hdr;
+static int hf_lbmc_tcp_request_hdr_len;
+static int hf_lbmc_tcp_request_flags;
+static int hf_lbmc_tcp_request_flags_ignore;
+static int hf_lbmc_tcp_request_transport;
+static int hf_lbmc_tcp_request_qidx;
+static int hf_lbmc_tcp_request_port;
+static int hf_lbmc_tcp_request_reserved;
+static int hf_lbmc_tcp_request_ipaddr;
+static int hf_lbmc_topicname;
+static int hf_lbmc_topicname_next_hdr;
+static int hf_lbmc_topicname_hdr_len;
+static int hf_lbmc_topicname_flags;
+static int hf_lbmc_topicname_flags_ignore;
+static int hf_lbmc_topicname_topicname;
+static int hf_lbmc_apphdr;
+static int hf_lbmc_apphdr_next_hdr;
+static int hf_lbmc_apphdr_hdr_len;
+static int hf_lbmc_apphdr_code;
+static int hf_lbmc_apphdr_ignore;
+static int hf_lbmc_apphdr_data;
+static int hf_lbmc_apphdr_chain;
+static int hf_lbmc_apphdr_chain_next_hdr;
+static int hf_lbmc_apphdr_chain_hdr_len;
+static int hf_lbmc_apphdr_chain_res;
+static int hf_lbmc_apphdr_chain_first_chain_hdr;
+static int hf_lbmc_apphdr_chain_element;
+static int hf_lbmc_apphdr_chain_element_next_hdr;
+static int hf_lbmc_apphdr_chain_element_hdr_len;
+static int hf_lbmc_apphdr_chain_element_res;
+static int hf_lbmc_apphdr_chain_element_data;
+static int hf_lbmc_apphdr_chain_msgprop;
+static int hf_lbmc_apphdr_chain_msgprop_next_hdr;
+static int hf_lbmc_apphdr_chain_msgprop_hdr_len;
+static int hf_lbmc_apphdr_chain_msgprop_res;
+static int hf_lbmc_apphdr_chain_msgprop_len;
+static int hf_lbmc_umq_msgid;
+static int hf_lbmc_umq_msgid_next_hdr;
+static int hf_lbmc_umq_msgid_hdr_len;
+static int hf_lbmc_umq_msgid_flags;
+static int hf_lbmc_umq_msgid_flags_ignore;
+static int hf_lbmc_umq_msgid_msgid_regid;
+static int hf_lbmc_umq_msgid_msgid_stamp;
+static int hf_lbmc_umq_sqd_rcv;
+static int hf_lbmc_umq_sqd_rcv_next_hdr;
+static int hf_lbmc_umq_sqd_rcv_hdr_len;
+static int hf_lbmc_umq_sqd_rcv_flags;
+static int hf_lbmc_umq_sqd_rcv_flags_ignore;
+static int hf_lbmc_umq_sqd_rcv_flags_r_flag;
+static int hf_lbmc_umq_sqd_rcv_flags_s_flag;
+static int hf_lbmc_umq_sqd_rcv_flags_re_flag;
+static int hf_lbmc_umq_sqd_rcv_flags_eoi_flag;
+static int hf_lbmc_umq_sqd_rcv_flags_boi_flag;
+static int hf_lbmc_umq_sqd_rcv_queue_id;
+static int hf_lbmc_umq_sqd_rcv_queue_ver;
+static int hf_lbmc_umq_sqd_rcv_rcr_idx;
+static int hf_lbmc_umq_sqd_rcv_assign_id;
+static int hf_lbmc_umq_resub;
+static int hf_lbmc_umq_resub_next_hdr;
+static int hf_lbmc_umq_resub_hdr_len;
+static int hf_lbmc_umq_resub_flags;
+static int hf_lbmc_umq_resub_flags_ignore;
+static int hf_lbmc_umq_resub_flags_q_flag;
+static int hf_lbmc_umq_resub_rcr_idx;
+static int hf_lbmc_umq_resub_resp_ip;
+static int hf_lbmc_umq_resub_resp_port;
+static int hf_lbmc_umq_resub_appset_idx;
+static int hf_lbmc_otid;
+static int hf_lbmc_otid_next_hdr;
+static int hf_lbmc_otid_hdr_len;
+static int hf_lbmc_otid_flags;
+static int hf_lbmc_otid_flags_ignore;
+static int hf_lbmc_otid_otid;
+static int hf_lbmc_ctxinst;
+static int hf_lbmc_ctxinst_next_hdr;
+static int hf_lbmc_ctxinst_hdr_len;
+static int hf_lbmc_ctxinst_flags;
+static int hf_lbmc_ctxinst_flags_ignore;
+static int hf_lbmc_ctxinst_ctxinst;
+static int hf_lbmc_ctxinstd;
+static int hf_lbmc_ctxinstr;
+static int hf_lbmc_srcidx;
+static int hf_lbmc_srcidx_next_hdr;
+static int hf_lbmc_srcidx_hdr_len;
+static int hf_lbmc_srcidx_flags;
+static int hf_lbmc_srcidx_flags_ignore;
+static int hf_lbmc_srcidx_srcidx;
+static int hf_lbmc_umq_ulb_msg;
+static int hf_lbmc_umq_ulb_msg_next_hdr;
+static int hf_lbmc_umq_ulb_msg_hdr_len;
+static int hf_lbmc_umq_ulb_msg_flags;
+static int hf_lbmc_umq_ulb_msg_flags_ignore;
+static int hf_lbmc_umq_ulb_msg_flags_a_flag;
+static int hf_lbmc_umq_ulb_msg_flags_r_flag;
+static int hf_lbmc_umq_ulb_msg_queue_id;
+static int hf_lbmc_umq_ulb_msg_ulb_src_id;
+static int hf_lbmc_umq_ulb_msg_assign_id;
+static int hf_lbmc_umq_ulb_msg_appset_idx;
+static int hf_lbmc_umq_ulb_msg_num_ras;
+static int hf_lbmc_ssf_init;
+static int hf_lbmc_ssf_init_next_hdr;
+static int hf_lbmc_ssf_init_hdr_len;
+static int hf_lbmc_ssf_init_transport;
+static int hf_lbmc_ssf_init_flags;
+static int hf_lbmc_ssf_init_flags_ignore;
+static int hf_lbmc_ssf_init_flags_default_inclusions;
+static int hf_lbmc_ssf_init_flags_default_exclusions;
+static int hf_lbmc_ssf_init_transport_idx;
+static int hf_lbmc_ssf_init_client_idx;
+static int hf_lbmc_ssf_init_ssf_port;
+static int hf_lbmc_ssf_init_res;
+static int hf_lbmc_ssf_init_ssf_ip;
+static int hf_lbmc_ssf_creq;
+static int hf_lbmc_ssf_creq_next_hdr;
+static int hf_lbmc_ssf_creq_hdr_len;
+static int hf_lbmc_ssf_creq_flags;
+static int hf_lbmc_ssf_creq_flags_ignore;
+static int hf_lbmc_ssf_creq_mode;
+static int hf_lbmc_ssf_creq_transport_idx;
+static int hf_lbmc_ssf_creq_topic_idx;
+static int hf_lbmc_ssf_creq_client_idx;
+static int hf_lbmc_ume_preg;
+static int hf_lbmc_ume_preg_next_hdr;
+static int hf_lbmc_ume_preg_hdr_len;
+static int hf_lbmc_ume_preg_flags;
+static int hf_lbmc_ume_preg_flags_ignore;
+static int hf_lbmc_ume_preg_flags_f_flag;
+static int hf_lbmc_ume_preg_flags_p_flag;
+static int hf_lbmc_ume_preg_flags_w_flag;
+static int hf_lbmc_ume_preg_flags_d_flag;
+static int hf_lbmc_ume_preg_s_flag;
+static int hf_lbmc_ume_preg_marker;
+static int hf_lbmc_ume_preg_reg_id;
+static int hf_lbmc_ume_preg_transport_idx;
+static int hf_lbmc_ume_preg_topic_idx;
+static int hf_lbmc_ume_preg_src_reg_id;
+static int hf_lbmc_ume_preg_resp_port;
+static int hf_lbmc_ume_preg_res2;
+static int hf_lbmc_ume_preg_resp_ip;
+static int hf_lbmc_ume_preg_resp;
+static int hf_lbmc_ume_preg_resp_next_hdr;
+static int hf_lbmc_ume_preg_resp_hdr_len;
+static int hf_lbmc_ume_preg_resp_code;
+static int hf_lbmc_ume_preg_resp_code_ignore;
+static int hf_lbmc_ume_preg_resp_code_e_flag;
+static int hf_lbmc_ume_preg_resp_code_o_flag;
+static int hf_lbmc_ume_preg_resp_code_n_flag;
+static int hf_lbmc_ume_preg_resp_code_w_flag;
+static int hf_lbmc_ume_preg_resp_code_d_flag;
+static int hf_lbmc_ume_preg_resp_code_code;
+static int hf_lbmc_ume_preg_resp_s_flag;
+static int hf_lbmc_ume_preg_resp_marker;
+static int hf_lbmc_ume_preg_resp_reg_id;
+static int hf_lbmc_ume_preg_resp_transport_idx;
+static int hf_lbmc_ume_preg_resp_topic_idx;
+static int hf_lbmc_ume_preg_resp_low_seqnum;
+static int hf_lbmc_ume_preg_resp_high_seqnum;
+static int hf_lbmc_ume_ack;
+static int hf_lbmc_ume_ack_next_hdr;
+static int hf_lbmc_ume_ack_hdr_len;
+static int hf_lbmc_ume_ack_flags;
+static int hf_lbmc_ume_ack_flags_ignore;
+static int hf_lbmc_ume_ack_flags_o_flag;
+static int hf_lbmc_ume_ack_flags_f_flag;
+static int hf_lbmc_ume_ack_flags_u_flag;
+static int hf_lbmc_ume_ack_flags_e_flag;
+static int hf_lbmc_ume_ack_type;
+static int hf_lbmc_ume_ack_transport_idx;
+static int hf_lbmc_ume_ack_id_2;
+static int hf_lbmc_ume_ack_rcv_reg_id;
+static int hf_lbmc_ume_ack_seqnum;
+static int hf_lbmc_ume_rxreq;
+static int hf_lbmc_ume_rxreq_next_hdr;
+static int hf_lbmc_ume_rxreq_hdr_len;
+static int hf_lbmc_ume_rxreq_flags;
+static int hf_lbmc_ume_rxreq_flags_ignore;
+static int hf_lbmc_ume_rxreq_flags_tsni_req;
+static int hf_lbmc_ume_rxreq_marker;
+static int hf_lbmc_ume_rxreq_request_idx;
+static int hf_lbmc_ume_rxreq_transport_idx;
+static int hf_lbmc_ume_rxreq_id_2;
+static int hf_lbmc_ume_rxreq_seqnum;
+static int hf_lbmc_ume_rxreq_rx_port;
+static int hf_lbmc_ume_rxreq_res;
+static int hf_lbmc_ume_rxreq_rx_ip;
+static int hf_lbmc_ume_keepalive;
+static int hf_lbmc_ume_keepalive_next_hdr;
+static int hf_lbmc_ume_keepalive_hdr_len;
+static int hf_lbmc_ume_keepalive_flags;
+static int hf_lbmc_ume_keepalive_flags_ignore;
+static int hf_lbmc_ume_keepalive_flags_r_flag;
+static int hf_lbmc_ume_keepalive_flags_t_flag;
+static int hf_lbmc_ume_keepalive_type;
+static int hf_lbmc_ume_keepalive_transport_idx;
+static int hf_lbmc_ume_keepalive_topic_idx;
+static int hf_lbmc_ume_keepalive_reg_id;
+static int hf_lbmc_ume_storeid;
+static int hf_lbmc_ume_storeid_next_hdr;
+static int hf_lbmc_ume_storeid_hdr_len;
+static int hf_lbmc_ume_storeid_ignore;
+static int hf_lbmc_ume_storeid_store_id;
+static int hf_lbmc_ume_ranged_ack;
+static int hf_lbmc_ume_ranged_ack_next_hdr;
+static int hf_lbmc_ume_ranged_ack_hdr_len;
+static int hf_lbmc_ume_ranged_ack_flags;
+static int hf_lbmc_ume_ranged_ack_flags_ignore;
+static int hf_lbmc_ume_ranged_ack_first_seqnum;
+static int hf_lbmc_ume_ranged_ack_last_seqnum;
+static int hf_lbmc_ume_ack_id;
+static int hf_lbmc_ume_ack_id_next_hdr;
+static int hf_lbmc_ume_ack_id_hdr_len;
+static int hf_lbmc_ume_ack_id_flags;
+static int hf_lbmc_ume_ack_id_flags_ignore;
+static int hf_lbmc_ume_ack_id_id;
+static int hf_lbmc_ume_capability;
+static int hf_lbmc_ume_capability_next_hdr;
+static int hf_lbmc_ume_capability_hdr_len;
+static int hf_lbmc_ume_capability_flags;
+static int hf_lbmc_ume_capability_flags_ignore;
+static int hf_lbmc_ume_capability_flags_qc_flag;
+static int hf_lbmc_ume_capability_flags_client_lifetime_flag;
+static int hf_lbmc_ume_proxy_src;
+static int hf_lbmc_ume_proxy_src_next_hdr;
+static int hf_lbmc_ume_proxy_src_hdr_len;
+static int hf_lbmc_ume_proxy_src_flags;
+static int hf_lbmc_ume_proxy_src_flags_ignore;
+static int hf_lbmc_ume_proxy_src_flags_enable;
+static int hf_lbmc_ume_proxy_src_flags_compatibility;
+static int hf_lbmc_ume_store_group;
+static int hf_lbmc_ume_store_group_next_hdr;
+static int hf_lbmc_ume_store_group_hdr_len;
+static int hf_lbmc_ume_store_group_flags;
+static int hf_lbmc_ume_store_group_flags_ignore;
+static int hf_lbmc_ume_store_group_grp_idx;
+static int hf_lbmc_ume_store_group_grp_sz;
+static int hf_lbmc_ume_store_group_res1;
+static int hf_lbmc_ume_store;
+static int hf_lbmc_ume_store_next_hdr;
+static int hf_lbmc_ume_store_hdr_len;
+static int hf_lbmc_ume_store_flags;
+static int hf_lbmc_ume_store_flags_ignore;
+static int hf_lbmc_ume_store_grp_idx;
+static int hf_lbmc_ume_store_store_tcp_port;
+static int hf_lbmc_ume_store_store_idx;
+static int hf_lbmc_ume_store_store_ip_addr;
+static int hf_lbmc_ume_store_src_reg_id;
+static int hf_lbmc_ume_lj_info;
+static int hf_lbmc_ume_lj_info_next_hdr;
+static int hf_lbmc_ume_lj_info_hdr_len;
+static int hf_lbmc_ume_lj_info_flags;
+static int hf_lbmc_ume_lj_info_flags_ignore;
+static int hf_lbmc_ume_lj_info_low_seqnum;
+static int hf_lbmc_ume_lj_info_high_seqnum;
+static int hf_lbmc_ume_lj_info_qidx;
+static int hf_lbmc_tsni;
+static int hf_lbmc_tsni_next_hdr;
+static int hf_lbmc_tsni_hdr_len;
+static int hf_lbmc_tsni_ignore;
+static int hf_lbmc_tsni_num_recs;
+static int hf_lbmc_tsni_rec;
+static int hf_lbmc_tsni_rec_tidx;
+static int hf_lbmc_tsni_rec_sqn;
+static int hf_lbmc_umq_reg;
+static int hf_lbmc_umq_reg_next_hdr;
+static int hf_lbmc_umq_reg_hdr_len;
+static int hf_lbmc_umq_reg_flags;
+static int hf_lbmc_umq_reg_flags_ignore;
+static int hf_lbmc_umq_reg_flags_r_flag;
+static int hf_lbmc_umq_reg_flags_t_flag;
+static int hf_lbmc_umq_reg_flags_i_flag;
+static int hf_lbmc_umq_reg_flags_msg_sel_flag;
+static int hf_lbmc_umq_reg_reg_type;
+static int hf_lbmc_umq_reg_queue_id;
+static int hf_lbmc_umq_reg_cmd_id;
+static int hf_lbmc_umq_reg_inst_idx;
+static int hf_lbmc_umq_reg_regid;
+static int hf_lbmc_umq_reg_reg_ctx;
+static int hf_lbmc_umq_reg_reg_ctx_port;
+static int hf_lbmc_umq_reg_reg_ctx_reserved;
+static int hf_lbmc_umq_reg_reg_ctx_ip;
+static int hf_lbmc_umq_reg_reg_ctx_capabilities;
+static int hf_lbmc_umq_reg_reg_src;
+static int hf_lbmc_umq_reg_reg_src_transport_idx;
+static int hf_lbmc_umq_reg_reg_src_topic_idx;
+static int hf_lbmc_umq_reg_reg_rcv;
+static int hf_lbmc_umq_reg_reg_rcv_assign_id;
+static int hf_lbmc_umq_reg_reg_rcv_rcv_type_id;
+static int hf_lbmc_umq_reg_reg_rcv_last_topic_rcr_tsp;
+static int hf_lbmc_umq_reg_rcv_dereg;
+static int hf_lbmc_umq_reg_rcv_dereg_rcr_idx;
+static int hf_lbmc_umq_reg_rcv_dereg_assign_id;
+static int hf_lbmc_umq_reg_reg_ulb_rcv;
+static int hf_lbmc_umq_reg_reg_ulb_rcv_ulb_src_id;
+static int hf_lbmc_umq_reg_reg_ulb_rcv_assign_id;
+static int hf_lbmc_umq_reg_reg_ulb_rcv_rcv_type_id;
+static int hf_lbmc_umq_reg_reg_ulb_rcv_port;
+static int hf_lbmc_umq_reg_reg_ulb_rcv_reserved;
+static int hf_lbmc_umq_reg_reg_ulb_rcv_ip;
+static int hf_lbmc_umq_reg_reg_ulb_rcv_capabilities;
+static int hf_lbmc_umq_reg_ulb_rcv_dereg;
+static int hf_lbmc_umq_reg_ulb_rcv_dereg_ulb_src_id;
+static int hf_lbmc_umq_reg_ulb_rcv_dereg_assign_id;
+static int hf_lbmc_umq_reg_reg_observer_rcv;
+static int hf_lbmc_umq_reg_reg_observer_rcv_assign_id;
+static int hf_lbmc_umq_reg_reg_observer_rcv_rcv_type_id;
+static int hf_lbmc_umq_reg_reg_observer_rcv_last_topic_rcr_tsp;
+static int hf_lbmc_umq_reg_observer_rcv_dereg;
+static int hf_lbmc_umq_reg_observer_rcv_dereg_rcr_idx;
+static int hf_lbmc_umq_reg_observer_rcv_dereg_assign_id;
+static int hf_lbmc_umq_reg_resp;
+static int hf_lbmc_umq_reg_resp_next_hdr;
+static int hf_lbmc_umq_reg_resp_hdr_len;
+static int hf_lbmc_umq_reg_resp_flags;
+static int hf_lbmc_umq_reg_resp_flags_ignore;
+static int hf_lbmc_umq_reg_resp_flags_r_flag;
+static int hf_lbmc_umq_reg_resp_flags_l_flag;
+static int hf_lbmc_umq_reg_resp_flags_src_s_flag;
+static int hf_lbmc_umq_reg_resp_flags_src_d_flag;
+static int hf_lbmc_umq_reg_resp_resp_type;
+static int hf_lbmc_umq_reg_resp_queue_id;
+static int hf_lbmc_umq_reg_resp_cmd_id;
+static int hf_lbmc_umq_reg_resp_inst_idx;
+static int hf_lbmc_umq_reg_resp_regid;
+static int hf_lbmc_umq_reg_resp_reg_ctx;
+static int hf_lbmc_umq_reg_resp_reg_ctx_capabilities;
+static int hf_lbmc_umq_reg_resp_reg_ctx_ex;
+static int hf_lbmc_umq_reg_resp_reg_ctx_ex_capabilities;
+static int hf_lbmc_umq_reg_resp_reg_ctx_ex_reserved;
+static int hf_lbmc_umq_reg_resp_reg_ctx_ex_flags;
+static int hf_lbmc_umq_reg_resp_reg_ctx_ex_flags_firstmsg;
+static int hf_lbmc_umq_reg_resp_reg_ctx_ex_stamp;
+static int hf_lbmc_umq_reg_resp_err;
+static int hf_lbmc_umq_reg_resp_err_reserved;
+static int hf_lbmc_umq_reg_resp_err_code;
+static int hf_lbmc_umq_reg_resp_reg_src;
+static int hf_lbmc_umq_reg_resp_reg_src_rcr_idx;
+static int hf_lbmc_umq_reg_resp_reg_rcv;
+static int hf_lbmc_umq_reg_resp_reg_rcv_rcr_idx;
+static int hf_lbmc_umq_reg_resp_reg_rcv_assign_id;
+static int hf_lbmc_umq_reg_resp_reg_rcv_appset_idx;
+static int hf_lbmc_umq_reg_resp_reg_rcv_reserved;
+static int hf_lbmc_umq_reg_resp_rcv_dereg;
+static int hf_lbmc_umq_reg_resp_rcv_dereg_rcr_idx;
+static int hf_lbmc_umq_reg_resp_rcv_dereg_assign_id;
+static int hf_lbmc_umq_reg_resp_reg_ulb_rcv;
+static int hf_lbmc_umq_reg_resp_reg_ulb_rcv_ulb_src_id;
+static int hf_lbmc_umq_reg_resp_reg_ulb_rcv_assign_id;
+static int hf_lbmc_umq_reg_resp_reg_ulb_rcv_appset_idx;
+static int hf_lbmc_umq_reg_resp_reg_ulb_rcv_reserved;
+static int hf_lbmc_umq_reg_resp_reg_ulb_rcv_capabilities;
+static int hf_lbmc_umq_reg_resp_ulb_rcv_dereg;
+static int hf_lbmc_umq_reg_resp_ulb_rcv_dereg_ulb_src_id;
+static int hf_lbmc_umq_reg_resp_ulb_rcv_dereg_assign_id;
+static int hf_lbmc_umq_reg_resp_reg_observer_rcv;
+static int hf_lbmc_umq_reg_resp_reg_observer_rcv_rcr_idx;
+static int hf_lbmc_umq_reg_resp_reg_observer_rcv_assign_id;
+static int hf_lbmc_umq_reg_resp_reg_observer_rcv_appset_idx;
+static int hf_lbmc_umq_reg_resp_reg_observer_rcv_reserved;
+static int hf_lbmc_umq_reg_resp_observer_rcv_dereg;
+static int hf_lbmc_umq_reg_resp_observer_rcv_dereg_rcr_idx;
+static int hf_lbmc_umq_reg_resp_observer_rcv_dereg_assign_id;
+static int hf_lbmc_umq_ack;
+static int hf_lbmc_umq_ack_next_hdr;
+static int hf_lbmc_umq_ack_hdr_len;
+static int hf_lbmc_umq_ack_msgs;
+static int hf_lbmc_umq_ack_msgs_ignore;
+static int hf_lbmc_umq_ack_msgs_t_flag;
+static int hf_lbmc_umq_ack_msgs_d_flag;
+static int hf_lbmc_umq_ack_numids;
+static int hf_lbmc_umq_ack_ack_type;
+static int hf_lbmc_umq_ack_msgid;
+static int hf_lbmc_umq_ack_msgid_regid;
+static int hf_lbmc_umq_ack_msgid_stamp;
+static int hf_lbmc_umq_ack_stable;
+static int hf_lbmc_umq_ack_stable_queue_id;
+static int hf_lbmc_umq_ack_stable_inst_idx;
+static int hf_lbmc_umq_ack_stable_reserved;
+static int hf_lbmc_umq_ack_cr;
+static int hf_lbmc_umq_ack_cr_rcr_idx;
+static int hf_lbmc_umq_ack_cr_assign_id;
+static int hf_lbmc_umq_ack_cr_appset_idx;
+static int hf_lbmc_umq_ack_cr_reserved;
+static int hf_lbmc_umq_ack_ulb_cr;
+static int hf_lbmc_umq_ack_ulb_cr_ulb_src_id;
+static int hf_lbmc_umq_ack_ulb_cr_assign_id;
+static int hf_lbmc_umq_ack_ulb_cr_appset_idx;
+static int hf_lbmc_umq_ack_ulb_cr_reserved;
+static int hf_lbmc_umq_rcr;
+static int hf_lbmc_umq_rcr_next_hdr;
+static int hf_lbmc_umq_rcr_hdr_len;
+static int hf_lbmc_umq_rcr_flags;
+static int hf_lbmc_umq_rcr_flags_ignore;
+static int hf_lbmc_umq_rcr_flags_r_flag;
+static int hf_lbmc_umq_rcr_flags_d_flag;
+static int hf_lbmc_umq_rcr_flags_s_flag;
+static int hf_lbmc_umq_rcr_flags_eoi_flag;
+static int hf_lbmc_umq_rcr_flags_boi_flag;
+static int hf_lbmc_umq_rcr_queue_id;
+static int hf_lbmc_umq_rcr_rcr_idx;
+static int hf_lbmc_umq_rcr_msgid_regid;
+static int hf_lbmc_umq_rcr_msgid_stamp;
+static int hf_lbmc_umq_rcr_topic_tsp;
+static int hf_lbmc_umq_rcr_q_tsp;
+static int hf_lbmc_umq_rcr_assign_id;
+static int hf_lbmc_umq_rcr_appset_idx;
+static int hf_lbmc_umq_rcr_num_ras;
+static int hf_lbmc_umq_rcr_queue_ver;
+static int hf_lbmc_cntl_umq_ka;
+static int hf_lbmc_cntl_umq_ka_next_hdr;
+static int hf_lbmc_cntl_umq_ka_hdr_len;
+static int hf_lbmc_cntl_umq_ka_flags;
+static int hf_lbmc_cntl_umq_ka_flags_ignore;
+static int hf_lbmc_cntl_umq_ka_flags_r_flag;
+static int hf_lbmc_cntl_umq_ka_ka_type;
+static int hf_lbmc_cntl_umq_ka_queue_id;
+static int hf_lbmc_cntl_umq_ka_regid;
+static int hf_lbmc_cntl_umq_ka_inst_idx;
+static int hf_lbmc_cntl_umq_ka_reserved;
+static int hf_lbmc_umq_ka_src;
+static int hf_lbmc_umq_ka_src_transport_idx;
+static int hf_lbmc_umq_ka_src_topic_idx;
+static int hf_lbmc_umq_ka_rcv;
+static int hf_lbmc_umq_ka_rcv_rcr_idx;
+static int hf_lbmc_umq_ka_rcv_assign_id;
+static int hf_lbmc_umq_ka_ulb_rcv;
+static int hf_lbmc_umq_ka_ulb_rcv_ulb_src_id;
+static int hf_lbmc_umq_ka_ulb_rcv_assign_id;
+static int hf_lbmc_umq_ka_ulb_rcv_resp;
+static int hf_lbmc_umq_ka_ulb_rcv_resp_ulb_src_id;
+static int hf_lbmc_umq_ka_ulb_rcv_resp_assign_id;
+static int hf_lbmc_umq_ka_ulb_rcv_resp_appset_idx;
+static int hf_lbmc_umq_ka_ulb_rcv_resp_reserved;
+static int hf_lbmc_umq_rxreq;
+static int hf_lbmc_umq_rxreq_next_hdr;
+static int hf_lbmc_umq_rxreq_hdr_len;
+static int hf_lbmc_umq_rxreq_flags;
+static int hf_lbmc_umq_rxreq_flags_ignore;
+static int hf_lbmc_umq_rxreq_flags_r_flag;
+static int hf_lbmc_umq_rxreq_rxreq_type;
+static int hf_lbmc_umq_rxreq_regid_resp;
+static int hf_lbmc_umq_rxreq_regid_resp_regid;
+static int hf_lbmc_umq_rxreq_addr_resp;
+static int hf_lbmc_umq_rxreq_addr_resp_ip;
+static int hf_lbmc_umq_rxreq_addr_resp_port;
+static int hf_lbmc_umq_rxreq_addr_resp_reserved;
+static int hf_lbmc_umq_rxreq_mr;
+static int hf_lbmc_umq_rxreq_mr_assign_id;
+static int hf_lbmc_umq_rxreq_mr_msgid_regid;
+static int hf_lbmc_umq_rxreq_mr_msgid_stamp;
+static int hf_lbmc_umq_rxreq_ulb_mr;
+static int hf_lbmc_umq_rxreq_ulb_mr_ulb_src_id;
+static int hf_lbmc_umq_rxreq_ulb_mr_assign_id;
+static int hf_lbmc_umq_rxreq_ulb_mr_appset_idx;
+static int hf_lbmc_umq_rxreq_ulb_mr_reserved;
+static int hf_lbmc_umq_rxreq_ulb_mr_msgid_regid;
+static int hf_lbmc_umq_rxreq_ulb_mr_msgid_stamp;
+static int hf_lbmc_umq_rxreq_ulb_mr_abort;
+static int hf_lbmc_umq_rxreq_ulb_mr_abort_ulb_src_id;
+static int hf_lbmc_umq_rxreq_ulb_mr_abort_assign_id;
+static int hf_lbmc_umq_rxreq_ulb_mr_abort_msgid_regid;
+static int hf_lbmc_umq_rxreq_ulb_mr_abort_msgid_stamp;
+static int hf_lbmc_umq_rxreq_qrcrr;
+static int hf_lbmc_umq_rxreq_qrcrr_tsp;
+static int hf_lbmc_umq_rxreq_trcrr;
+static int hf_lbmc_umq_rxreq_trcrr_rcr_idx;
+static int hf_lbmc_umq_rxreq_trcrr_tsp;
+static int hf_lbmc_umq_rxreq_ulb_trcrr;
+static int hf_lbmc_umq_rxreq_ulb_trcrr_ulb_src_id;
+static int hf_lbmc_umq_rxreq_ulb_trcrr_assign_id;
+static int hf_lbmc_umq_rxreq_ulb_trcrr_tsp;
+static int hf_lbmc_umq_rxreq_ulb_trcrr_abort;
+static int hf_lbmc_umq_rxreq_ulb_trcrr_abort_ulb_src_id;
+static int hf_lbmc_umq_rxreq_ulb_trcrr_abort_assign_id;
+static int hf_lbmc_umq_rxreq_ulb_trcrr_abort_tsp;
+static int hf_lbmc_umq_qmgmt;
+static int hf_lbmc_umq_qmgmt_next_hdr;
+static int hf_lbmc_umq_qmgmt_hdr_len;
+static int hf_lbmc_umq_resub_req;
+static int hf_lbmc_umq_resub_req_next_hdr;
+static int hf_lbmc_umq_resub_req_hdr_len;
+static int hf_lbmc_umq_resub_req_flags;
+static int hf_lbmc_umq_resub_req_flags_ignore;
+static int hf_lbmc_umq_resub_req_msgid_regid;
+static int hf_lbmc_umq_resub_req_msgid_stamp;
+static int hf_lbmc_umq_resub_req_rcr_idx;
+static int hf_lbmc_umq_resub_req_resp_ip;
+static int hf_lbmc_umq_resub_req_resp_port;
+static int hf_lbmc_umq_resub_req_appset_idx;
+static int hf_lbmc_umq_resub_resp;
+static int hf_lbmc_umq_resub_resp_next_hdr;
+static int hf_lbmc_umq_resub_resp_hdr_len;
+static int hf_lbmc_umq_resub_resp_flags;
+static int hf_lbmc_umq_resub_resp_flags_ignore;
+static int hf_lbmc_umq_resub_resp_code;
+static int hf_lbmc_umq_resub_resp_msgid_regid;
+static int hf_lbmc_umq_resub_resp_msgid_stamp;
+static int hf_lbmc_umq_resub_resp_rcr_idx;
+static int hf_lbmc_umq_resub_resp_reserved;
+static int hf_lbmc_umq_resub_resp_appset_idx;
+static int hf_lbmc_topic_interest;
+static int hf_lbmc_topic_interest_next_hdr;
+static int hf_lbmc_topic_interest_hdr_len;
+static int hf_lbmc_topic_interest_flags;
+static int hf_lbmc_topic_interest_flags_ignore;
+static int hf_lbmc_topic_interest_flags_cancel;
+static int hf_lbmc_topic_interest_flags_refresh;
+static int hf_lbmc_topic_interest_domain_id;
+static int hf_lbmc_pattern_interest;
+static int hf_lbmc_pattern_interest_next_hdr;
+static int hf_lbmc_pattern_interest_hdr_len;
+static int hf_lbmc_pattern_interest_flags;
+static int hf_lbmc_pattern_interest_flags_ignore;
+static int hf_lbmc_pattern_interest_flags_cancel;
+static int hf_lbmc_pattern_interest_flags_refresh;
+static int hf_lbmc_pattern_interest_type;
+static int hf_lbmc_pattern_interest_domain_id;
+static int hf_lbmc_pattern_interest_index;
+static int hf_lbmc_advertisement;
+static int hf_lbmc_advertisement_next_hdr;
+static int hf_lbmc_advertisement_hdr_len;
+static int hf_lbmc_advertisement_flags;
+static int hf_lbmc_advertisement_flags_ignore;
+static int hf_lbmc_advertisement_flags_eos;
+static int hf_lbmc_advertisement_flags_pattern;
+static int hf_lbmc_advertisement_flags_change;
+static int hf_lbmc_advertisement_flags_ctxinst;
+static int hf_lbmc_advertisement_hop_count;
+static int hf_lbmc_advertisement_ad_flags;
+static int hf_lbmc_advertisement_ad_flags_lj;
+static int hf_lbmc_advertisement_ad_flags_ume;
+static int hf_lbmc_advertisement_ad_flags_acktosrc;
+static int hf_lbmc_advertisement_ad_flags_queue;
+static int hf_lbmc_advertisement_ad_flags_ulb;
+static int hf_lbmc_advertisement_cost;
+static int hf_lbmc_advertisement_transport_idx;
+static int hf_lbmc_advertisement_topic_idx;
+static int hf_lbmc_advertisement_low_seqno;
+static int hf_lbmc_advertisement_high_seqno;
+static int hf_lbmc_advertisement_domain_id;
+static int hf_lbmc_advertisement_pat_idx;
+static int hf_lbmc_advertisement_ctxinst;
+static int hf_lbmc_ume_storename;
+static int hf_lbmc_ume_storename_next_hdr;
+static int hf_lbmc_ume_storename_hdr_len;
+static int hf_lbmc_ume_storename_flags;
+static int hf_lbmc_ume_storename_flags_ignore;
+static int hf_lbmc_ume_storename_store;
+static int hf_lbmc_umq_ulb_rcr;
+static int hf_lbmc_umq_ulb_rcr_next_hdr;
+static int hf_lbmc_umq_ulb_rcr_hdr_len;
+static int hf_lbmc_umq_ulb_rcr_flags;
+static int hf_lbmc_umq_ulb_rcr_flags_ignore;
+static int hf_lbmc_umq_ulb_rcr_flags_r_flag;
+static int hf_lbmc_umq_ulb_rcr_flags_d_flag;
+static int hf_lbmc_umq_ulb_rcr_flags_eoi_flag;
+static int hf_lbmc_umq_ulb_rcr_flags_boi_flag;
+static int hf_lbmc_umq_ulb_rcr_queue_id;
+static int hf_lbmc_umq_ulb_rcr_ulb_src_id;
+static int hf_lbmc_umq_ulb_rcr_msgid_regid;
+static int hf_lbmc_umq_ulb_rcr_msgid_stamp;
+static int hf_lbmc_umq_ulb_rcr_topic_tsp;
+static int hf_lbmc_umq_ulb_rcr_assign_id;
+static int hf_lbmc_umq_ulb_rcr_appset_idx;
+static int hf_lbmc_umq_ulb_rcr_num_ras;
+static int hf_lbmc_umq_lf;
+static int hf_lbmc_umq_lf_next_hdr;
+static int hf_lbmc_umq_lf_hdr_len;
+static int hf_lbmc_umq_lf_flags;
+static int hf_lbmc_umq_lf_flags_ignore;
+static int hf_lbmc_umq_lf_type;
+static int hf_lbmc_umq_lf_num_srcs;
+static int hf_lbmc_umq_lf_lf;
+static int hf_lbmc_ctxinfo;
+static int hf_lbmc_ctxinfo_next_hdr;
+static int hf_lbmc_ctxinfo_hdr_len;
+static int hf_lbmc_ctxinfo_flags;
+static int hf_lbmc_ctxinfo_flags_ignore;
+static int hf_lbmc_ctxinfo_flags_query;
+static int hf_lbmc_ctxinfo_flags_addr;
+static int hf_lbmc_ctxinfo_flags_ctxinst;
+static int hf_lbmc_ctxinfo_flags_name;
+static int hf_lbmc_ctxinfo_flags_tnwgsrc;
+static int hf_lbmc_ctxinfo_flags_tnwgrcv;
+static int hf_lbmc_ctxinfo_flags_proxy;
+static int hf_lbmc_ctxinfo_reserved;
+static int hf_lbmc_ctxinfo_hop_count;
+static int hf_lbmc_ctxinfo_port;
+static int hf_lbmc_ctxinfo_addr;
+static int hf_lbmc_ctxinfo_domain_id;
+static int hf_lbmc_ctxinfo_ctxinst;
+static int hf_lbmc_ctxinfo_name;
+static int hf_lbmc_ume_pser;
+static int hf_lbmc_ume_pser_next_hdr;
+static int hf_lbmc_ume_pser_hdr_len;
+static int hf_lbmc_ume_pser_flags;
+static int hf_lbmc_ume_pser_flags_ignore;
+static int hf_lbmc_ume_pser_flags_source_ctxinst;
+static int hf_lbmc_ume_pser_flags_store_ctxinst;
+static int hf_lbmc_ume_pser_flags_reelect;
+static int hf_lbmc_ume_pser_source_ip;
+static int hf_lbmc_ume_pser_store_ip;
+static int hf_lbmc_ume_pser_transport_idx;
+static int hf_lbmc_ume_pser_topic_idx;
+static int hf_lbmc_ume_pser_source_port;
+static int hf_lbmc_ume_pser_store_port;
+static int hf_lbmc_ume_pser_source_ctxinst;
+static int hf_lbmc_ume_pser_store_ctxinst;
+static int hf_lbmc_domain;
+static int hf_lbmc_domain_next_hdr;
+static int hf_lbmc_domain_hdr_len;
+static int hf_lbmc_domain_flags;
+static int hf_lbmc_domain_flags_ignore;
+static int hf_lbmc_domain_flags_active;
+static int hf_lbmc_domain_domain;
+static int hf_lbmc_tnwg_capabilities;
+static int hf_lbmc_tnwg_capabilities_next_hdr;
+static int hf_lbmc_tnwg_capabilities_hdr_len;
+static int hf_lbmc_tnwg_capabilities_flags;
+static int hf_lbmc_tnwg_capabilities_flags_ignore;
+static int hf_lbmc_tnwg_capabilities_flags_version;
+static int hf_lbmc_tnwg_capabilities_capabilities1;
+static int hf_lbmc_tnwg_capabilities_capabilities1_ume;
+static int hf_lbmc_tnwg_capabilities_capabilities1_umq;
+static int hf_lbmc_tnwg_capabilities_capabilities2;
+static int hf_lbmc_tnwg_capabilities_capabilities3;
+static int hf_lbmc_tnwg_capabilities_capabilities3_pcre;
+static int hf_lbmc_tnwg_capabilities_capabilities3_regex;
+static int hf_lbmc_tnwg_capabilities_capabilities4;
+static int hf_lbmc_patidx;
+static int hf_lbmc_patidx_next_hdr;
+static int hf_lbmc_patidx_hdr_len;
+static int hf_lbmc_patidx_flags;
+static int hf_lbmc_patidx_flags_ignore;
+static int hf_lbmc_patidx_patidx;
+static int hf_lbmc_ume_client_lifetime;
+static int hf_lbmc_ume_client_lifetime_next_hdr;
+static int hf_lbmc_ume_client_lifetime_hdr_len;
+static int hf_lbmc_ume_client_lifetime_flags;
+static int hf_lbmc_ume_client_lifetime_flags_ignore;
+static int hf_lbmc_ume_client_lifetime_activity_tmo;
+static int hf_lbmc_ume_client_lifetime_lifetime;
+static int hf_lbmc_ume_client_lifetime_ttl;
+static int hf_lbmc_ume_sid;
+static int hf_lbmc_ume_sid_next_hdr;
+static int hf_lbmc_ume_sid_hdr_len;
+static int hf_lbmc_ume_sid_flags;
+static int hf_lbmc_ume_sid_flags_ignore;
+static int hf_lbmc_ume_sid_sid;
+static int hf_lbmc_umq_idx_cmd;
+static int hf_lbmc_umq_idx_cmd_next_hdr;
+static int hf_lbmc_umq_idx_cmd_hdr_len;
+static int hf_lbmc_umq_idx_cmd_flags;
+static int hf_lbmc_umq_idx_cmd_flags_ignore;
+static int hf_lbmc_umq_idx_cmd_cmd_type;
+static int hf_lbmc_umq_idx_cmd_queue_id;
+static int hf_lbmc_umq_idx_cmd_cmd_id;
+static int hf_lbmc_umq_idx_cmd_inst_idx;
+static int hf_lbmc_umq_idx_cmd_regid;
+static int hf_lbmc_umq_idx_cmd_stop_assign;
+static int hf_lbmc_umq_idx_cmd_stop_assign_rcr_idx;
+static int hf_lbmc_umq_idx_cmd_stop_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_start_assign;
+static int hf_lbmc_umq_idx_cmd_start_assign_rcr_idx;
+static int hf_lbmc_umq_idx_cmd_start_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_release_assign;
+static int hf_lbmc_umq_idx_cmd_release_assign_rcr_idx;
+static int hf_lbmc_umq_idx_cmd_release_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_release_assign_flags;
+static int hf_lbmc_umq_idx_cmd_release_assign_flags_numeric;
+static int hf_lbmc_umq_idx_cmd_release_assign_index_len;
+static int hf_lbmc_umq_idx_cmd_release_assign_reserved;
+static int hf_lbmc_umq_idx_cmd_release_assign_numeric_index;
+static int hf_lbmc_umq_idx_cmd_release_assign_string_index;
+static int hf_lbmc_umq_idx_cmd_ulb_stop_assign;
+static int hf_lbmc_umq_idx_cmd_ulb_stop_assign_src_id;
+static int hf_lbmc_umq_idx_cmd_ulb_stop_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_ulb_stop_assign_appset_idx;
+static int hf_lbmc_umq_idx_cmd_ulb_stop_assign_reserved;
+static int hf_lbmc_umq_idx_cmd_ulb_start_assign;
+static int hf_lbmc_umq_idx_cmd_ulb_start_assign_src_id;
+static int hf_lbmc_umq_idx_cmd_ulb_start_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_ulb_start_assign_appset_idx;
+static int hf_lbmc_umq_idx_cmd_ulb_start_assign_reserved;
+static int hf_lbmc_umq_idx_cmd_ulb_release_assign;
+static int hf_lbmc_umq_idx_cmd_ulb_release_assign_src_id;
+static int hf_lbmc_umq_idx_cmd_ulb_release_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_ulb_release_assign_flags;
+static int hf_lbmc_umq_idx_cmd_ulb_release_assign_flags_numeric;
+static int hf_lbmc_umq_idx_cmd_ulb_release_assign_appset_idx;
+static int hf_lbmc_umq_idx_cmd_ulb_release_assign_index_len;
+static int hf_lbmc_umq_idx_cmd_ulb_release_assign_reserved;
+static int hf_lbmc_umq_idx_cmd_ulb_release_assign_numeric_index;
+static int hf_lbmc_umq_idx_cmd_ulb_release_assign_string_index;
+static int hf_lbmc_umq_idx_cmd_reserve_assign;
+static int hf_lbmc_umq_idx_cmd_reserve_assign_rcr_idx;
+static int hf_lbmc_umq_idx_cmd_reserve_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_reserve_assign_flags;
+static int hf_lbmc_umq_idx_cmd_reserve_assign_flags_numeric;
+static int hf_lbmc_umq_idx_cmd_reserve_assign_index_len;
+static int hf_lbmc_umq_idx_cmd_reserve_assign_reserved;
+static int hf_lbmc_umq_idx_cmd_reserve_assign_numeric_index;
+static int hf_lbmc_umq_idx_cmd_reserve_assign_string_index;
+static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign;
+static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_src_id;
+static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_flags;
+static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_flags_numeric;
+static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_appset_idx;
+static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_index_len;
+static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_reserved;
+static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_numeric_index;
+static int hf_lbmc_umq_idx_cmd_ulb_reserve_assign_string_index;
+static int hf_lbmc_umq_idx_cmd_resp;
+static int hf_lbmc_umq_idx_cmd_resp_next_hdr;
+static int hf_lbmc_umq_idx_cmd_resp_hdr_len;
+static int hf_lbmc_umq_idx_cmd_resp_flags;
+static int hf_lbmc_umq_idx_cmd_resp_flags_ignore;
+static int hf_lbmc_umq_idx_cmd_resp_flags_ulb;
+static int hf_lbmc_umq_idx_cmd_resp_resp_type;
+static int hf_lbmc_umq_idx_cmd_resp_queue_id;
+static int hf_lbmc_umq_idx_cmd_resp_cmd_id;
+static int hf_lbmc_umq_idx_cmd_resp_inst_idx;
+static int hf_lbmc_umq_idx_cmd_resp_regid;
+static int hf_lbmc_umq_idx_cmd_resp_err;
+static int hf_lbmc_umq_idx_cmd_resp_err_reserved;
+static int hf_lbmc_umq_idx_cmd_resp_err_code;
+static int hf_lbmc_umq_idx_cmd_resp_err_error_string;
+static int hf_lbmc_umq_idx_cmd_resp_stop_assign;
+static int hf_lbmc_umq_idx_cmd_resp_stop_assign_rcr_idx;
+static int hf_lbmc_umq_idx_cmd_resp_stop_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_resp_start_assign;
+static int hf_lbmc_umq_idx_cmd_resp_start_assign_rcr_idx;
+static int hf_lbmc_umq_idx_cmd_resp_start_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_resp_start_assign_appset_idx;
+static int hf_lbmc_umq_idx_cmd_resp_start_assign_reserved;
+static int hf_lbmc_umq_idx_cmd_resp_release_assign;
+static int hf_lbmc_umq_idx_cmd_resp_release_assign_rcr_idx;
+static int hf_lbmc_umq_idx_cmd_resp_release_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_resp_release_assign_appset_idx;
+static int hf_lbmc_umq_idx_cmd_resp_release_assign_reserved;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_stop_assign;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_stop_assign_src_id;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_stop_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_stop_assign_appset_idx;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_stop_assign_reserved;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_start_assign;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_start_assign_src_id;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_start_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_start_assign_appset_idx;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_start_assign_reserved;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_release_assign;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_release_assign_src_id;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_release_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_release_assign_appset_idx;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_release_assign_reserved;
+static int hf_lbmc_umq_idx_cmd_resp_reserve_assign;
+static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_rcr_idx;
+static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_flags;
+static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_flags_numeric;
+static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_appset_idx;
+static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_index_len;
+static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_reserved;
+static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_numeric_index;
+static int hf_lbmc_umq_idx_cmd_resp_reserve_assign_string_index;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_src_id;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_assign_id;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_flags;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_flags_numeric;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_appset_idx;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_index_len;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_reserved;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_numeric_index;
+static int hf_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_string_index;
+static int hf_lbmc_odomain;
+static int hf_lbmc_odomain_next_hdr;
+static int hf_lbmc_odomain_hdr_len;
+static int hf_lbmc_odomain_flags;
+static int hf_lbmc_odomain_flags_ignore;
+static int hf_lbmc_odomain_domain;
+static int hf_lbmc_stream;
+static int hf_lbmc_stream_next_hdr;
+static int hf_lbmc_stream_hdr_len;
+static int hf_lbmc_stream_flags;
+static int hf_lbmc_stream_flags_ignore;
+static int hf_lbmc_stream_stream_id;
+static int hf_lbmc_stream_sqn;
+static int hf_lbmc_stream_ctxinst;
+static int hf_lbmc_topic_md_interest;
+static int hf_lbmc_topic_md_interest_next_hdr;
+static int hf_lbmc_topic_md_interest_hdr_len;
+static int hf_lbmc_topic_md_interest_flags;
+static int hf_lbmc_topic_md_interest_flags_ignore;
+static int hf_lbmc_topic_md_interest_flags_cancel;
+static int hf_lbmc_topic_md_interest_flags_refresh;
+static int hf_lbmc_topic_md_interest_domain_count;
+static int hf_lbmc_topic_md_interest_res1;
+static int hf_lbmc_topic_md_interest_domain_id;
+static int hf_lbmc_pattern_md_interest;
+static int hf_lbmc_pattern_md_interest_next_hdr;
+static int hf_lbmc_pattern_md_interest_hdr_len;
+static int hf_lbmc_pattern_md_interest_flags;
+static int hf_lbmc_pattern_md_interest_flags_ignore;
+static int hf_lbmc_pattern_md_interest_flags_cancel;
+static int hf_lbmc_pattern_md_interest_flags_refresh;
+static int hf_lbmc_pattern_md_interest_type;
+static int hf_lbmc_pattern_md_interest_domain_count;
+static int hf_lbmc_pattern_md_interest_res1;
+static int hf_lbmc_pattern_md_interest_index;
+static int hf_lbmc_pattern_md_interest_domain_id;
+static int hf_lbmc_lji_req;
+static int hf_lbmc_lji_req_next_hdr;
+static int hf_lbmc_lji_req_hdr_len;
+static int hf_lbmc_lji_req_flags;
+static int hf_lbmc_lji_req_flags_ignore;
+static int hf_lbmc_lji_req_flags_l_flag;
+static int hf_lbmc_lji_req_flags_m_flag;
+static int hf_lbmc_lji_req_flags_o_flag;
+static int hf_lbmc_lji_req_request_idx;
+static int hf_lbmc_lji_req_transport_idx;
+static int hf_lbmc_lji_req_topic_idx;
+static int hf_lbmc_lji_req_req_ip;
+static int hf_lbmc_lji_req_req_port;
+static int hf_lbmc_lji_req_res;
+static int hf_lbmc_lji_req_tx_low_sqn;
+static int hf_lbmc_lji_req_rx_req_max;
+static int hf_lbmc_lji_req_rx_req_outstanding_max;
+static int hf_lbmc_tnwg_ka;
+static int hf_lbmc_tnwg_ka_next_hdr;
+static int hf_lbmc_tnwg_ka_hdr_len;
+static int hf_lbmc_tnwg_ka_flags;
+static int hf_lbmc_tnwg_ka_flags_ignore;
+static int hf_lbmc_tnwg_ka_flags_q_flag;
+static int hf_lbmc_tnwg_ka_flags_r_flag;
+static int hf_lbmc_tnwg_ka_index;
+static int hf_lbmc_tnwg_ka_ts_seconds;
+static int hf_lbmc_tnwg_ka_ts_microseconds;
+static int hf_lbmc_tnwg_ka_reserved_1;
+static int hf_lbmc_tnwg_ka_reserved_2;
+static int hf_lbmc_tnwg_ka_reserved_3;
+static int hf_lbmc_tnwg_ka_reserved_4;
+static int hf_lbmc_tnwg_ka_reserved_5;
+static int hf_lbmc_tnwg_ka_reserved_6;
+static int hf_lbmc_ume_receiver_keepalive;
+static int hf_lbmc_ume_receiver_keepalive_next_hdr;
+static int hf_lbmc_ume_receiver_keepalive_hdr_len;
+static int hf_lbmc_ume_receiver_keepalive_flags;
+static int hf_lbmc_ume_receiver_keepalive_flags_ignore;
+static int hf_lbmc_ume_receiver_keepalive_rcv_regid;
+static int hf_lbmc_ume_receiver_keepalive_session_id;
+static int hf_lbmc_ume_receiver_keepalive_ctxinst;
+static int hf_lbmc_umq_cmd;
+static int hf_lbmc_umq_cmd_next_hdr;
+static int hf_lbmc_umq_cmd_hdr_len;
+static int hf_lbmc_umq_cmd_flags;
+static int hf_lbmc_umq_cmd_flags_ignore;
+static int hf_lbmc_umq_cmd_cmd_type;
+static int hf_lbmc_umq_cmd_queue_id;
+static int hf_lbmc_umq_cmd_cmd_id;
+static int hf_lbmc_umq_cmd_inst_idx;
+static int hf_lbmc_umq_cmd_regid;
+static int hf_lbmc_umq_cmd_topic_list;
+static int hf_lbmc_umq_cmd_topic_list_serial_num;
+static int hf_lbmc_umq_cmd_msg_retrieve;
+static int hf_lbmc_umq_cmd_msg_retrieve_rcr_idx;
+static int hf_lbmc_umq_cmd_msg_retrieve_assign_id;
+static int hf_lbmc_umq_cmd_msg_retrieve_info_only;
+static int hf_lbmc_umq_cmd_msg_retrieve_num_msgids;
+static int hf_lbmc_umq_cmd_msg_retrieve_flags;
+static int hf_lbmc_umq_cmd_msg_retrieve_entry;
+static int hf_lbmc_umq_cmd_msg_retrieve_entry_regid;
+static int hf_lbmc_umq_cmd_msg_retrieve_entry_stamp;
+static int hf_lbmc_umq_cmd_msg_list;
+static int hf_lbmc_umq_cmd_msg_list_rcr_idx;
+static int hf_lbmc_umq_cmd_msg_list_assign_id;
+static int hf_lbmc_umq_cmd_resp;
+static int hf_lbmc_umq_cmd_resp_next_hdr;
+static int hf_lbmc_umq_cmd_resp_hdr_len;
+static int hf_lbmc_umq_cmd_resp_flags;
+static int hf_lbmc_umq_cmd_resp_flags_ignore;
+static int hf_lbmc_umq_cmd_resp_resp_type;
+static int hf_lbmc_umq_cmd_resp_queue_id;
+static int hf_lbmc_umq_cmd_resp_cmd_id;
+static int hf_lbmc_umq_cmd_resp_inst_idx;
+static int hf_lbmc_umq_cmd_resp_regid;
+static int hf_lbmc_umq_cmd_resp_msg_retrieve;
+static int hf_lbmc_umq_cmd_resp_msg_retrieve_rcr_idx;
+static int hf_lbmc_umq_cmd_resp_msg_retrieve_assign_id;
+static int hf_lbmc_umq_cmd_resp_xmsg_retrieve;
+static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_num_msgs;
+static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_flags;
+static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_reserved;
+static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_entry;
+static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_entry_regid;
+static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_entry_stamp;
+static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_entry_assign_id;
+static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_entry_num_ras;
+static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_entry_status;
+static int hf_lbmc_umq_cmd_resp_xmsg_retrieve_entry_reserved;
+static int hf_lbmc_umq_cmd_resp_msg_list;
+static int hf_lbmc_umq_cmd_resp_msg_list_rcr_idx;
+static int hf_lbmc_umq_cmd_resp_msg_list_assign_id;
+static int hf_lbmc_umq_cmd_resp_xmsg_list;
+static int hf_lbmc_umq_cmd_resp_xmsg_list_num_msgs;
+static int hf_lbmc_umq_cmd_resp_xmsg_list_entry;
+static int hf_lbmc_umq_cmd_resp_xmsg_list_entry_regid;
+static int hf_lbmc_umq_cmd_resp_xmsg_list_entry_stamp;
+static int hf_lbmc_umq_cmd_resp_topic_list;
+static int hf_lbmc_umq_cmd_resp_topic_list_num_topics;
+static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry;
+static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_rcr_idx;
+static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_num_appsets;
+static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_topic_len;
+static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_reserved;
+static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_topic;
+static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry;
+static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_num_receiver_type_ids;
+static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_appset_idx;
+static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_appset_name_len;
+static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_reserved;
+static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_name;
+static int hf_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry_receiver_type_id;
+static int hf_lbmc_umq_cmd_resp_err;
+static int hf_lbmc_umq_cmd_resp_err_reserved;
+static int hf_lbmc_umq_cmd_resp_err_code;
+static int hf_lbmc_umq_cmd_resp_err_errmsg;
+static int hf_lbmc_sri_req;
+static int hf_lbmc_sri_req_next_hdr;
+static int hf_lbmc_sri_req_hdr_len;
+static int hf_lbmc_sri_req_flags;
+static int hf_lbmc_sri_req_flags_ignore;
+static int hf_lbmc_sri_req_transport_idx;
+static int hf_lbmc_sri_req_topic_idx;
+static int hf_lbmc_ume_store_domain;
+static int hf_lbmc_ume_store_domain_next_hdr;
+static int hf_lbmc_ume_store_domain_hdr_len;
+static int hf_lbmc_ume_store_domain_flags;
+static int hf_lbmc_ume_store_domain_flags_ignore;
+static int hf_lbmc_ume_store_domain_domain;
+static int hf_lbmc_sri;
+static int hf_lbmc_sri_next_hdr;
+static int hf_lbmc_sri_hdr_len;
+static int hf_lbmc_sri_flags;
+static int hf_lbmc_sri_flags_ignore;
+static int hf_lbmc_sri_flags_acktosrc;
+static int hf_lbmc_sri_flags_initial_sqn_known;
+static int hf_lbmc_sri_version;
+static int hf_lbmc_sri_low_sqn;
+static int hf_lbmc_sri_high_sqn;
+static int hf_lbmc_route_info;
+static int hf_lbmc_route_info_next_hdr;
+static int hf_lbmc_route_info_hdr_len;
+static int hf_lbmc_route_info_flags;
+static int hf_lbmc_route_info_flags_ignore;
+static int hf_lbmc_route_info_gateway_version;
+static int hf_lbmc_route_info_configuration_signature;
+static int hf_lbmc_route_info_node_id;
+static int hf_lbmc_route_info_topology;
+static int hf_lbmc_route_info_vers;
+static int hf_lbmc_route_info_sqn;
+static int hf_lbmc_route_info_ttl;
+static int hf_lbmc_route_info_reserved1;
+static int hf_lbmc_route_info_reserved2;
+static int hf_lbmc_route_info_neighbor;
+static int hf_lbmc_route_info_neighbor_next_hdr;
+static int hf_lbmc_route_info_neighbor_hdr_len;
+static int hf_lbmc_route_info_neighbor_flags;
+static int hf_lbmc_route_info_neighbor_flags_ignore;
+static int hf_lbmc_route_info_neighbor_node_id;
+static int hf_lbmc_route_info_neighbor_ingress_cost;
+static int hf_lbmc_route_info_neighbor_egress_cost;
+static int hf_lbmc_gateway_name;
+static int hf_lbmc_gateway_name_next_hdr;
+static int hf_lbmc_gateway_name_hdr_len;
+static int hf_lbmc_gateway_name_flags;
+static int hf_lbmc_gateway_name_flags_ignore;
+static int hf_lbmc_gateway_name_gateway_name;
+static int hf_lbmc_auth_request;
+static int hf_lbmc_auth_request_next_hdr;
+static int hf_lbmc_auth_request_hdr_len;
+static int hf_lbmc_auth_request_flags;
+static int hf_lbmc_auth_request_flags_ignore;
+static int hf_lbmc_auth_request_opid;
+static int hf_lbmc_auth_request_user_len;
+static int hf_lbmc_auth_request_user_name;
+static int hf_lbmc_auth_challenge;
+static int hf_lbmc_auth_challenge_next_hdr;
+static int hf_lbmc_auth_challenge_hdr_len;
+static int hf_lbmc_auth_challenge_flags;
+static int hf_lbmc_auth_challenge_flags_ignore;
+static int hf_lbmc_auth_challenge_opid;
+static int hf_lbmc_auth_challenge_mod_len;
+static int hf_lbmc_auth_challenge_gen_len;
+static int hf_lbmc_auth_challenge_salt_len;
+static int hf_lbmc_auth_challenge_pubkey_len;
+static int hf_lbmc_auth_challenge_mod;
+static int hf_lbmc_auth_challenge_gen;
+static int hf_lbmc_auth_challenge_salt;
+static int hf_lbmc_auth_challenge_pubkey;
+static int hf_lbmc_auth_challenge_rsp;
+static int hf_lbmc_auth_challenge_rsp_next_hdr;
+static int hf_lbmc_auth_challenge_rsp_hdr_len;
+static int hf_lbmc_auth_challenge_rsp_flags;
+static int hf_lbmc_auth_challenge_rsp_flags_ignore;
+static int hf_lbmc_auth_challenge_rsp_opid;
+static int hf_lbmc_auth_challenge_rsp_pubkey_len;
+static int hf_lbmc_auth_challenge_rsp_evidence_len;
+static int hf_lbmc_auth_challenge_rsp_pubkey;
+static int hf_lbmc_auth_challenge_rsp_evidence;
+static int hf_lbmc_auth_result;
+static int hf_lbmc_auth_result_next_hdr;
+static int hf_lbmc_auth_result_hdr_len;
+static int hf_lbmc_auth_result_flags;
+static int hf_lbmc_auth_result_flags_ignore;
+static int hf_lbmc_auth_result_opid;
+static int hf_lbmc_auth_result_result;
+static int hf_lbmc_auth_unknown;
+static int hf_lbmc_auth_unknown_next_hdr;
+static int hf_lbmc_auth_unknown_hdr_len;
+static int hf_lbmc_auth_unknown_flags;
+static int hf_lbmc_auth_unknown_opid;
+static int hf_lbmc_auth_unknown_data;
+static int hf_lbmc_hmac;
+static int hf_lbmc_hmac_next_hdr;
+static int hf_lbmc_hmac_hdr_len;
+static int hf_lbmc_hmac_flags;
+static int hf_lbmc_hmac_flags_ignore;
+static int hf_lbmc_hmac_padding;
+static int hf_lbmc_hmac_data;
+static int hf_lbmc_umq_sid;
+static int hf_lbmc_umq_sid_next_hdr;
+static int hf_lbmc_umq_sid_hdr_len;
+static int hf_lbmc_umq_sid_flags;
+static int hf_lbmc_umq_sid_flags_ignore;
+static int hf_lbmc_umq_sid_key;
+static int hf_lbmc_umq_sid_sid;
+static int hf_lbmc_destination;
+static int hf_lbmc_destination_next_hdr;
+static int hf_lbmc_destination_hdr_len;
+static int hf_lbmc_destination_flags;
+static int hf_lbmc_destination_flags_ignore;
+static int hf_lbmc_destination_domain_id;
+static int hf_lbmc_destination_ipaddr;
+static int hf_lbmc_destination_port;
+static int hf_lbmc_destination_hops_taken;
+static int hf_lbmc_destination_orig_domain_id;
+static int hf_lbmc_destination_orig_ipaddr;
+static int hf_lbmc_destination_orig_port;
+static int hf_lbmc_destination_reserved;
+static int hf_lbmc_topic_idx;
+static int hf_lbmc_topic_idx_next_hdr;
+static int hf_lbmc_topic_idx_hdr_len;
+static int hf_lbmc_topic_idx_flags;
+static int hf_lbmc_topic_idx_flags_ignore;
+static int hf_lbmc_topic_idx_tidx;
+static int hf_lbmc_topic_source;
+static int hf_lbmc_topic_source_next_hdr;
+static int hf_lbmc_topic_source_hdr_len;
+static int hf_lbmc_topic_source_flags;
+static int hf_lbmc_topic_source_flags_ignore;
+static int hf_lbmc_topic_source_flags_eos;
+static int hf_lbmc_topic_source_domain_id;
+static int hf_lbmc_topic_source_exfunc;
+static int hf_lbmc_topic_source_exfunc_next_hdr;
+static int hf_lbmc_topic_source_exfunc_hdr_len;
+static int hf_lbmc_topic_source_exfunc_flags;
+static int hf_lbmc_topic_source_exfunc_flags_ignore;
+static int hf_lbmc_topic_source_exfunc_src_ip;
+static int hf_lbmc_topic_source_exfunc_src_port;
+static int hf_lbmc_topic_source_exfunc_unused;
+static int hf_lbmc_topic_source_exfunc_functionality_flags;
+static int hf_lbmc_topic_source_exfunc_functionality_flags_ulb;
+static int hf_lbmc_topic_source_exfunc_functionality_flags_umq;
+static int hf_lbmc_topic_source_exfunc_functionality_flags_ume;
+static int hf_lbmc_topic_source_exfunc_functionality_flags_lj;
+static int hf_lbmc_ume_store_ext;
+static int hf_lbmc_ume_store_ext_next_hdr;
+static int hf_lbmc_ume_store_ext_hdr_len;
+static int hf_lbmc_ume_store_ext_flags;
+static int hf_lbmc_ume_store_ext_flags_ignore;
+static int hf_lbmc_ume_store_ext_grp_idx;
+static int hf_lbmc_ume_store_ext_store_tcp_port;
+static int hf_lbmc_ume_store_ext_store_idx;
+static int hf_lbmc_ume_store_ext_store_ip_addr;
+static int hf_lbmc_ume_store_ext_src_reg_id;
+static int hf_lbmc_ume_store_ext_domain_id;
+static int hf_lbmc_ume_store_ext_version;
+static int hf_lbmc_ume_psrc_election_token;
+static int hf_lbmc_ume_psrc_election_token_next_hdr;
+static int hf_lbmc_ume_psrc_election_token_hdr_len;
+static int hf_lbmc_ume_psrc_election_token_flags;
+static int hf_lbmc_ume_psrc_election_token_flags_ignore;
+static int hf_lbmc_ume_psrc_election_token_store_index;
+static int hf_lbmc_ume_psrc_election_token_token;
+static int hf_lbmc_tcp_sid;
+static int hf_lbmc_tcp_sid_next_hdr;
+static int hf_lbmc_tcp_sid_hdr_len;
+static int hf_lbmc_tcp_sid_flags;
+static int hf_lbmc_tcp_sid_flags_ignore;
+static int hf_lbmc_tcp_sid_sid;
+static int hf_lbmc_extopt;
+static int hf_lbmc_extopt_next_hdr;
+static int hf_lbmc_extopt_hdr_len;
+static int hf_lbmc_extopt_flags;
+static int hf_lbmc_extopt_flags_ignore;
+static int hf_lbmc_extopt_flags_ignore_subtype;
+static int hf_lbmc_extopt_flags_more_fragments;
+static int hf_lbmc_extopt_id;
+static int hf_lbmc_extopt_subtype;
+static int hf_lbmc_extopt_fragment_offset;
+static int hf_lbmc_extopt_data;
+static int hf_lbmc_extopt_cfgopt;
+static int hf_lbmc_extopt_cfgopt_scope;
+static int hf_lbmc_extopt_cfgopt_parent;
+static int hf_lbmc_extopt_cfgopt_name;
+static int hf_lbmc_extopt_cfgopt_value;
+static int hf_lbmc_extopt_msgsel;
+static int hf_lbmc_extopt_reassembled_data;
+static int hf_lbmc_extopt_reassembled_data_subtype;
+static int hf_lbmc_extopt_reassembled_data_len;
+static int hf_lbmc_extopt_reassembled_data_data;
+static int hf_lbmc_extopt_reassembled_data_msgsel;
+static int hf_lbm_msg_properties;
+static int hf_lbm_msg_properties_data;
+static int hf_lbm_msg_properties_data_magic;
+static int hf_lbm_msg_properties_data_num_fields;
+static int hf_lbm_msg_properties_data_version;
+static int hf_lbm_msg_properties_data_type;
+static int hf_lbm_msg_properties_data_res;
+static int hf_lbm_msg_properties_hdr;
+static int hf_lbm_msg_properties_hdr_key_offset;
+static int hf_lbm_msg_properties_hdr_value_offset;
+static int hf_lbm_msg_properties_hdr_hash;
+static int hf_lbm_msg_properties_hdr_type;
+static int hf_lbm_msg_properties_hdr_key;
+static int hf_lbm_msg_properties_hdr_boolean_value;
+static int hf_lbm_msg_properties_hdr_byte_value;
+static int hf_lbm_msg_properties_hdr_short_value;
+static int hf_lbm_msg_properties_hdr_int_value;
+static int hf_lbm_msg_properties_hdr_float_value;
+static int hf_lbm_msg_properties_hdr_long_value;
+static int hf_lbm_msg_properties_hdr_double_value;
+static int hf_lbm_msg_properties_hdr_string_value;
+static int hf_lbm_msg_properties_hdr_unknown_value;
+static int hf_lbmc_unhandled;
+static int hf_lbmc_unhandled_next_hdr;
+static int hf_lbmc_unhandled_hdr_len;
+static int hf_lbmc_unhandled_data;
+static int hf_lbm_stream;
+static int hf_lbm_stream_stream_id;
+static int hf_lbm_stream_substream_id;
+static int hf_lbmc_reassembly;
+static int hf_lbmc_reassembly_fragment;
+static int hf_reassembly_frame;
 
 /* Protocol trees */
-static gint ett_lbmc = -1;
-static gint ett_lbmc_frag = -1;
-static gint ett_lbmc_frag_flags = -1;
-static gint ett_lbmc_batch = -1;
-static gint ett_lbmc_batch_flags = -1;
-static gint ett_lbmc_tcp_request = -1;
-static gint ett_lbmc_tcp_request_flags = -1;
-static gint ett_lbmc_topicname = -1;
-static gint ett_lbmc_topicname_flags = -1;
-static gint ett_lbmc_apphdr = -1;
-static gint ett_lbmc_apphdr_chain = -1;
-static gint ett_lbmc_apphdr_chain_element = -1;
-static gint ett_lbmc_apphdr_chain_msgprop = -1;
-static gint ett_lbmc_umq_msgid = -1;
-static gint ett_lbmc_umq_msgid_flags = -1;
-static gint ett_lbmc_umq_sqd_rcv = -1;
-static gint ett_lbmc_umq_sqd_rcv_flags = -1;
-static gint ett_lbmc_umq_resub = -1;
-static gint ett_lbmc_umq_resub_flags = -1;
-static gint ett_lbmc_otid = -1;
-static gint ett_lbmc_otid_flags = -1;
-static gint ett_lbmc_ctxinst = -1;
-static gint ett_lbmc_ctxinst_flags = -1;
-static gint ett_lbmc_ctxinstd = -1;
-static gint ett_lbmc_ctxinstr = -1;
-static gint ett_lbmc_srcidx = -1;
-static gint ett_lbmc_srcidx_flags = -1;
-static gint ett_lbmc_umq_ulb_msg = -1;
-static gint ett_lbmc_umq_ulb_msg_flags = -1;
-static gint ett_lbmc_ssf_init = -1;
-static gint ett_lbmc_ssf_init_flags = -1;
-static gint ett_lbmc_ssf_creq = -1;
-static gint ett_lbmc_ssf_creq_flags = -1;
-static gint ett_lbmc_ume_preg = -1;
-static gint ett_lbmc_ume_preg_flags = -1;
-static gint ett_lbmc_ume_preg_resp = -1;
-static gint ett_lbmc_ume_preg_resp_code = -1;
-static gint ett_lbmc_ume_preg_resp_marker = -1;
-static gint ett_lbmc_ume_ack = -1;
-static gint ett_lbmc_ume_ack_flags = -1;
-static gint ett_lbmc_ume_rxreq = -1;
-static gint ett_lbmc_ume_rxreq_flags = -1;
-static gint ett_lbmc_ume_keepalive = -1;
-static gint ett_lbmc_ume_keepalive_flags = -1;
-static gint ett_lbmc_ume_storeid = -1;
-static gint ett_lbmc_ume_ranged_ack = -1;
-static gint ett_lbmc_ume_ranged_ack_flags = -1;
-static gint ett_lbmc_ume_ack_id = -1;
-static gint ett_lbmc_ume_ack_id_flags = -1;
-static gint ett_lbmc_ume_capability = -1;
-static gint ett_lbmc_ume_capability_flags = -1;
-static gint ett_lbmc_ume_proxy_src = -1;
-static gint ett_lbmc_ume_proxy_src_flags = -1;
-static gint ett_lbmc_ume_store_group = -1;
-static gint ett_lbmc_ume_store_group_flags = -1;
-static gint ett_lbmc_ume_store = -1;
-static gint ett_lbmc_ume_store_flags = -1;
-static gint ett_lbmc_ume_lj_info = -1;
-static gint ett_lbmc_ume_lj_info_flags = -1;
-static gint ett_lbmc_tsni = -1;
-static gint ett_lbmc_tsni_rec = -1;
-static gint ett_lbmc_umq_reg = -1;
-static gint ett_lbmc_umq_reg_flags = -1;
-static gint ett_lbmc_umq_reg_reg_ctx = -1;
-static gint ett_lbmc_umq_reg_reg_src = -1;
-static gint ett_lbmc_umq_reg_reg_rcv = -1;
-static gint ett_lbmc_umq_reg_rcv_dereg = -1;
-static gint ett_lbmc_umq_reg_reg_ulb_rcv = -1;
-static gint ett_lbmc_umq_reg_ulb_rcv_dereg = -1;
-static gint ett_lbmc_umq_reg_reg_observer_rcv = -1;
-static gint ett_lbmc_umq_reg_observer_rcv_dereg = -1;
-static gint ett_lbmc_umq_reg_resp = -1;
-static gint ett_lbmc_umq_reg_resp_flags = -1;
-static gint ett_lbmc_umq_reg_resp_reg_ctx = -1;
-static gint ett_lbmc_umq_reg_resp_reg_ctx_ex = -1;
-static gint ett_lbmc_umq_reg_resp_reg_ctx_ex_flags = -1;
-static gint ett_lbmc_umq_reg_resp_err = -1;
-static gint ett_lbmc_umq_reg_resp_reg_src = -1;
-static gint ett_lbmc_umq_reg_resp_reg_rcv = -1;
-static gint ett_lbmc_umq_reg_resp_rcv_dereg = -1;
-static gint ett_lbmc_umq_reg_resp_reg_ulb_rcv = -1;
-static gint ett_lbmc_umq_reg_resp_ulb_rcv_dereg = -1;
-static gint ett_lbmc_umq_reg_resp_reg_observer_rcv = -1;
-static gint ett_lbmc_umq_reg_resp_observer_rcv_dereg = -1;
-static gint ett_lbmc_umq_ack = -1;
-static gint ett_lbmc_umq_ack_msgs = -1;
-static gint ett_lbmc_umq_ack_msgid = -1;
-static gint ett_lbmc_umq_ack_stable = -1;
-static gint ett_lbmc_umq_ack_cr = -1;
-static gint ett_lbmc_umq_ack_ulb_cr = -1;
-static gint ett_lbmc_umq_rcr = -1;
-static gint ett_lbmc_umq_rcr_flags = -1;
-static gint ett_lbmc_umq_ka = -1;
-static gint ett_lbmc_umq_ka_flags = -1;
-static gint ett_lbmc_umq_ka_src = -1;
-static gint ett_lbmc_umq_ka_rcv = -1;
-static gint ett_lbmc_umq_ka_ulb_rcv = -1;
-static gint ett_lbmc_umq_ka_ulb_rcv_resp = -1;
-static gint ett_lbmc_umq_rxreq = -1;
-static gint ett_lbmc_umq_rxreq_flags = -1;
-static gint ett_lbmc_umq_rxreq_regid_resp = -1;
-static gint ett_lbmc_umq_rxreq_addr_resp = -1;
-static gint ett_lbmc_umq_rxreq_mr = -1;
-static gint ett_lbmc_umq_rxreq_ulb_mr = -1;
-static gint ett_lbmc_umq_rxreq_ulb_mr_abort = -1;
-static gint ett_lbmc_umq_rxreq_qrcrr = -1;
-static gint ett_lbmc_umq_rxreq_trcrr = -1;
-static gint ett_lbmc_umq_rxreq_ulb_trcrr = -1;
-static gint ett_lbmc_umq_rxreq_ulb_trcrr_abort = -1;
-static gint ett_lbmc_umq_qmgmt = -1;
-static gint ett_lbmc_umq_resub_req = -1;
-static gint ett_lbmc_umq_resub_req_flags = -1;
-static gint ett_lbmc_umq_resub_resp = -1;
-static gint ett_lbmc_umq_resub_resp_flags = -1;
-static gint ett_lbmc_topic_interest = -1;
-static gint ett_lbmc_topic_interest_flags = -1;
-static gint ett_lbmc_pattern_interest = -1;
-static gint ett_lbmc_pattern_interest_flags = -1;
-static gint ett_lbmc_advertisement = -1;
-static gint ett_lbmc_advertisement_flags = -1;
-static gint ett_lbmc_advertisement_ad_flags = -1;
-static gint ett_lbmc_ume_storename = -1;
-static gint ett_lbmc_ume_storename_flags = -1;
-static gint ett_lbmc_umq_ulb_rcr = -1;
-static gint ett_lbmc_umq_ulb_rcr_flags = -1;
-static gint ett_lbmc_umq_lf = -1;
-static gint ett_lbmc_umq_lf_flags = -1;
-static gint ett_lbmc_ctxinfo = -1;
-static gint ett_lbmc_ctxinfo_flags = -1;
-static gint ett_lbmc_ume_pser = -1;
-static gint ett_lbmc_ume_pser_flags = -1;
-static gint ett_lbmc_domain = -1;
-static gint ett_lbmc_domain_flags = -1;
-static gint ett_lbmc_tnwg_capabilities = -1;
-static gint ett_lbmc_tnwg_capabilities_flags = -1;
-static gint ett_lbmc_tnwg_capabilities_capabilities1 = -1;
-static gint ett_lbmc_tnwg_capabilities_capabilities3 = -1;
-static gint ett_lbmc_patidx = -1;
-static gint ett_lbmc_patidx_flags = -1;
-static gint ett_lbmc_ume_client_lifetime = -1;
-static gint ett_lbmc_ume_client_lifetime_flags = -1;
-static gint ett_lbmc_ume_sid = -1;
-static gint ett_lbmc_ume_sid_flags = -1;
-static gint ett_lbmc_umq_idx_cmd = -1;
-static gint ett_lbmc_umq_idx_cmd_flags = -1;
-static gint ett_lbmc_umq_idx_cmd_stop_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_start_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_release_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_release_assign_flags = -1;
-static gint ett_lbmc_umq_idx_cmd_ulb_stop_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_ulb_start_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_ulb_release_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_ulb_release_assign_flags = -1;
-static gint ett_lbmc_umq_idx_cmd_reserve_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_reserve_assign_flags = -1;
-static gint ett_lbmc_umq_idx_cmd_ulb_reserve_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_ulb_reserve_assign_flags = -1;
-static gint ett_lbmc_umq_idx_cmd_resp = -1;
-static gint ett_lbmc_umq_idx_cmd_resp_flags = -1;
-static gint ett_lbmc_umq_idx_cmd_resp_err = -1;
-static gint ett_lbmc_umq_idx_cmd_resp_stop_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_resp_start_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_resp_release_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_resp_ulb_stop_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_resp_ulb_start_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_resp_ulb_release_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_resp_reserve_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_resp_reserve_assign_flags = -1;
-static gint ett_lbmc_umq_idx_cmd_resp_ulb_reserve_assign = -1;
-static gint ett_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_flags = -1;
-static gint ett_lbmc_odomain = -1;
-static gint ett_lbmc_odomain_flags = -1;
-static gint ett_lbmc_stream = -1;
-static gint ett_lbmc_stream_flags = -1;
-static gint ett_lbmc_topic_md_interest = -1;
-static gint ett_lbmc_topic_md_interest_flags = -1;
-static gint ett_lbmc_pattern_md_interest = -1;
-static gint ett_lbmc_pattern_md_interest_flags = -1;
-static gint ett_lbmc_lji_req = -1;
-static gint ett_lbmc_lji_req_flags = -1;
-static gint ett_lbmc_tnwg_ka = -1;
-static gint ett_lbmc_tnwg_ka_flags = -1;
-static gint ett_lbmc_ume_receiver_keepalive = -1;
-static gint ett_lbmc_ume_receiver_keepalive_flags = -1;
-static gint ett_lbmc_umq_cmd = -1;
-static gint ett_lbmc_umq_cmd_flags = -1;
-static gint ett_lbmc_umq_cmd_topic_list = -1;
-static gint ett_lbmc_umq_cmd_msg_retrieve = -1;
-static gint ett_lbmc_umq_cmd_msg_retrieve_entry = -1;
-static gint ett_lbmc_umq_cmd_msg_list = -1;
-static gint ett_lbmc_umq_cmd_resp = -1;
-static gint ett_lbmc_umq_cmd_resp_flags = -1;
-static gint ett_lbmc_umq_cmd_resp_msg_retrieve = -1;
-static gint ett_lbmc_umq_cmd_resp_xmsg_retrieve = -1;
-static gint ett_lbmc_umq_cmd_resp_xmsg_retrieve_entry = -1;
-static gint ett_lbmc_umq_cmd_resp_msg_list = -1;
-static gint ett_lbmc_umq_cmd_resp_xmsg_list = -1;
-static gint ett_lbmc_umq_cmd_resp_xmsg_list_entry = -1;
-static gint ett_lbmc_umq_cmd_resp_topic_list = -1;
-static gint ett_lbmc_umq_cmd_resp_topic_list_topic_entry = -1;
-static gint ett_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry = -1;
-static gint ett_lbmc_umq_cmd_resp_err = -1;
-static gint ett_lbmc_sri_req = -1;
-static gint ett_lbmc_sri_req_flags = -1;
-static gint ett_lbmc_ume_store_domain = -1;
-static gint ett_lbmc_ume_store_domain_flags = -1;
-static gint ett_lbmc_sri = -1;
-static gint ett_lbmc_sri_flags = -1;
-static gint ett_lbmc_route_info = -1;
-static gint ett_lbmc_route_info_flags = -1;
-static gint ett_lbmc_route_info_neighbor = -1;
-static gint ett_lbmc_route_info_neighbor_flags = -1;
-static gint ett_lbmc_gateway_name = -1;
-static gint ett_lbmc_gateway_name_flags = -1;
-static gint ett_lbmc_auth_request = -1;
-static gint ett_lbmc_auth_request_flags = -1;
-static gint ett_lbmc_auth_challenge = -1;
-static gint ett_lbmc_auth_challenge_flags = -1;
-static gint ett_lbmc_auth_challenge_rsp = -1;
-static gint ett_lbmc_auth_challenge_rsp_flags = -1;
-static gint ett_lbmc_auth_result = -1;
-static gint ett_lbmc_auth_result_flags = -1;
-static gint ett_lbmc_auth_unknown = -1;
-static gint ett_lbmc_hmac = -1;
-static gint ett_lbmc_hmac_flags = -1;
-static gint ett_lbmc_umq_sid = -1;
-static gint ett_lbmc_umq_sid_flags = -1;
-static gint ett_lbmc_destination = -1;
-static gint ett_lbmc_destination_flags = -1;
-static gint ett_lbmc_topic_idx = -1;
-static gint ett_lbmc_topic_idx_flags = -1;
-static gint ett_lbmc_topic_source = -1;
-static gint ett_lbmc_topic_source_flags = -1;
-static gint ett_lbmc_topic_source_exfunc = -1;
-static gint ett_lbmc_topic_source_exfunc_flags = -1;
-static gint ett_lbmc_topic_source_exfunc_functionality_flags = -1;
-static gint ett_lbmc_ume_store_ext = -1;
-static gint ett_lbmc_ume_store_ext_flags = -1;
-static gint ett_lbmc_ume_psrc_election_token = -1;
-static gint ett_lbmc_ume_psrc_election_token_flags = -1;
-static gint ett_lbmc_tcp_sid = -1;
-static gint ett_lbmc_tcp_sid_flags = -1;
-static gint ett_lbmc_extopt = -1;
-static gint ett_lbmc_extopt_flags = -1;
-static gint ett_lbmc_extopt_cfgopt = -1;
-static gint ett_lbmc_extopt_reassembled_data = -1;
-static gint ett_lbmc_extopt_reassembled_data_cfgopt = -1;
-static gint ett_lbm_msg_properties = -1;
-static gint ett_lbm_msg_properties_data = -1;
-static gint ett_lbm_msg_properties_hdr = -1;
-static gint ett_lbmc_unhandled_hdr = -1;
-static gint ett_lbm_stream = -1;
-static gint ett_lbmc_reassembly = -1;
-static gint ett_unknown = -1;
-static gint ett_msg_data = -1;
-static gint ett_msgprop_data = -1;
+static gint ett_lbmc;
+static gint ett_lbmc_frag;
+static gint ett_lbmc_frag_flags;
+static gint ett_lbmc_batch;
+static gint ett_lbmc_batch_flags;
+static gint ett_lbmc_tcp_request;
+static gint ett_lbmc_tcp_request_flags;
+static gint ett_lbmc_topicname;
+static gint ett_lbmc_topicname_flags;
+static gint ett_lbmc_apphdr;
+static gint ett_lbmc_apphdr_chain;
+static gint ett_lbmc_apphdr_chain_element;
+static gint ett_lbmc_apphdr_chain_msgprop;
+static gint ett_lbmc_umq_msgid;
+static gint ett_lbmc_umq_msgid_flags;
+static gint ett_lbmc_umq_sqd_rcv;
+static gint ett_lbmc_umq_sqd_rcv_flags;
+static gint ett_lbmc_umq_resub;
+static gint ett_lbmc_umq_resub_flags;
+static gint ett_lbmc_otid;
+static gint ett_lbmc_otid_flags;
+static gint ett_lbmc_ctxinst;
+static gint ett_lbmc_ctxinst_flags;
+static gint ett_lbmc_ctxinstd;
+static gint ett_lbmc_ctxinstr;
+static gint ett_lbmc_srcidx;
+static gint ett_lbmc_srcidx_flags;
+static gint ett_lbmc_umq_ulb_msg;
+static gint ett_lbmc_umq_ulb_msg_flags;
+static gint ett_lbmc_ssf_init;
+static gint ett_lbmc_ssf_init_flags;
+static gint ett_lbmc_ssf_creq;
+static gint ett_lbmc_ssf_creq_flags;
+static gint ett_lbmc_ume_preg;
+static gint ett_lbmc_ume_preg_flags;
+static gint ett_lbmc_ume_preg_resp;
+static gint ett_lbmc_ume_preg_resp_code;
+static gint ett_lbmc_ume_preg_resp_marker;
+static gint ett_lbmc_ume_ack;
+static gint ett_lbmc_ume_ack_flags;
+static gint ett_lbmc_ume_rxreq;
+static gint ett_lbmc_ume_rxreq_flags;
+static gint ett_lbmc_ume_keepalive;
+static gint ett_lbmc_ume_keepalive_flags;
+static gint ett_lbmc_ume_storeid;
+static gint ett_lbmc_ume_ranged_ack;
+static gint ett_lbmc_ume_ranged_ack_flags;
+static gint ett_lbmc_ume_ack_id;
+static gint ett_lbmc_ume_ack_id_flags;
+static gint ett_lbmc_ume_capability;
+static gint ett_lbmc_ume_capability_flags;
+static gint ett_lbmc_ume_proxy_src;
+static gint ett_lbmc_ume_proxy_src_flags;
+static gint ett_lbmc_ume_store_group;
+static gint ett_lbmc_ume_store_group_flags;
+static gint ett_lbmc_ume_store;
+static gint ett_lbmc_ume_store_flags;
+static gint ett_lbmc_ume_lj_info;
+static gint ett_lbmc_ume_lj_info_flags;
+static gint ett_lbmc_tsni;
+static gint ett_lbmc_tsni_rec;
+static gint ett_lbmc_umq_reg;
+static gint ett_lbmc_umq_reg_flags;
+static gint ett_lbmc_umq_reg_reg_ctx;
+static gint ett_lbmc_umq_reg_reg_src;
+static gint ett_lbmc_umq_reg_reg_rcv;
+static gint ett_lbmc_umq_reg_rcv_dereg;
+static gint ett_lbmc_umq_reg_reg_ulb_rcv;
+static gint ett_lbmc_umq_reg_ulb_rcv_dereg;
+static gint ett_lbmc_umq_reg_reg_observer_rcv;
+static gint ett_lbmc_umq_reg_observer_rcv_dereg;
+static gint ett_lbmc_umq_reg_resp;
+static gint ett_lbmc_umq_reg_resp_flags;
+static gint ett_lbmc_umq_reg_resp_reg_ctx;
+static gint ett_lbmc_umq_reg_resp_reg_ctx_ex;
+static gint ett_lbmc_umq_reg_resp_reg_ctx_ex_flags;
+static gint ett_lbmc_umq_reg_resp_err;
+static gint ett_lbmc_umq_reg_resp_reg_src;
+static gint ett_lbmc_umq_reg_resp_reg_rcv;
+static gint ett_lbmc_umq_reg_resp_rcv_dereg;
+static gint ett_lbmc_umq_reg_resp_reg_ulb_rcv;
+static gint ett_lbmc_umq_reg_resp_ulb_rcv_dereg;
+static gint ett_lbmc_umq_reg_resp_reg_observer_rcv;
+static gint ett_lbmc_umq_reg_resp_observer_rcv_dereg;
+static gint ett_lbmc_umq_ack;
+static gint ett_lbmc_umq_ack_msgs;
+static gint ett_lbmc_umq_ack_msgid;
+static gint ett_lbmc_umq_ack_stable;
+static gint ett_lbmc_umq_ack_cr;
+static gint ett_lbmc_umq_ack_ulb_cr;
+static gint ett_lbmc_umq_rcr;
+static gint ett_lbmc_umq_rcr_flags;
+static gint ett_lbmc_umq_ka;
+static gint ett_lbmc_umq_ka_flags;
+static gint ett_lbmc_umq_ka_src;
+static gint ett_lbmc_umq_ka_rcv;
+static gint ett_lbmc_umq_ka_ulb_rcv;
+static gint ett_lbmc_umq_ka_ulb_rcv_resp;
+static gint ett_lbmc_umq_rxreq;
+static gint ett_lbmc_umq_rxreq_flags;
+static gint ett_lbmc_umq_rxreq_regid_resp;
+static gint ett_lbmc_umq_rxreq_addr_resp;
+static gint ett_lbmc_umq_rxreq_mr;
+static gint ett_lbmc_umq_rxreq_ulb_mr;
+static gint ett_lbmc_umq_rxreq_ulb_mr_abort;
+static gint ett_lbmc_umq_rxreq_qrcrr;
+static gint ett_lbmc_umq_rxreq_trcrr;
+static gint ett_lbmc_umq_rxreq_ulb_trcrr;
+static gint ett_lbmc_umq_rxreq_ulb_trcrr_abort;
+static gint ett_lbmc_umq_qmgmt;
+static gint ett_lbmc_umq_resub_req;
+static gint ett_lbmc_umq_resub_req_flags;
+static gint ett_lbmc_umq_resub_resp;
+static gint ett_lbmc_umq_resub_resp_flags;
+static gint ett_lbmc_topic_interest;
+static gint ett_lbmc_topic_interest_flags;
+static gint ett_lbmc_pattern_interest;
+static gint ett_lbmc_pattern_interest_flags;
+static gint ett_lbmc_advertisement;
+static gint ett_lbmc_advertisement_flags;
+static gint ett_lbmc_advertisement_ad_flags;
+static gint ett_lbmc_ume_storename;
+static gint ett_lbmc_ume_storename_flags;
+static gint ett_lbmc_umq_ulb_rcr;
+static gint ett_lbmc_umq_ulb_rcr_flags;
+static gint ett_lbmc_umq_lf;
+static gint ett_lbmc_umq_lf_flags;
+static gint ett_lbmc_ctxinfo;
+static gint ett_lbmc_ctxinfo_flags;
+static gint ett_lbmc_ume_pser;
+static gint ett_lbmc_ume_pser_flags;
+static gint ett_lbmc_domain;
+static gint ett_lbmc_domain_flags;
+static gint ett_lbmc_tnwg_capabilities;
+static gint ett_lbmc_tnwg_capabilities_flags;
+static gint ett_lbmc_tnwg_capabilities_capabilities1;
+static gint ett_lbmc_tnwg_capabilities_capabilities3;
+static gint ett_lbmc_patidx;
+static gint ett_lbmc_patidx_flags;
+static gint ett_lbmc_ume_client_lifetime;
+static gint ett_lbmc_ume_client_lifetime_flags;
+static gint ett_lbmc_ume_sid;
+static gint ett_lbmc_ume_sid_flags;
+static gint ett_lbmc_umq_idx_cmd;
+static gint ett_lbmc_umq_idx_cmd_flags;
+static gint ett_lbmc_umq_idx_cmd_stop_assign;
+static gint ett_lbmc_umq_idx_cmd_start_assign;
+static gint ett_lbmc_umq_idx_cmd_release_assign;
+static gint ett_lbmc_umq_idx_cmd_release_assign_flags;
+static gint ett_lbmc_umq_idx_cmd_ulb_stop_assign;
+static gint ett_lbmc_umq_idx_cmd_ulb_start_assign;
+static gint ett_lbmc_umq_idx_cmd_ulb_release_assign;
+static gint ett_lbmc_umq_idx_cmd_ulb_release_assign_flags;
+static gint ett_lbmc_umq_idx_cmd_reserve_assign;
+static gint ett_lbmc_umq_idx_cmd_reserve_assign_flags;
+static gint ett_lbmc_umq_idx_cmd_ulb_reserve_assign;
+static gint ett_lbmc_umq_idx_cmd_ulb_reserve_assign_flags;
+static gint ett_lbmc_umq_idx_cmd_resp;
+static gint ett_lbmc_umq_idx_cmd_resp_flags;
+static gint ett_lbmc_umq_idx_cmd_resp_err;
+static gint ett_lbmc_umq_idx_cmd_resp_stop_assign;
+static gint ett_lbmc_umq_idx_cmd_resp_start_assign;
+static gint ett_lbmc_umq_idx_cmd_resp_release_assign;
+static gint ett_lbmc_umq_idx_cmd_resp_ulb_stop_assign;
+static gint ett_lbmc_umq_idx_cmd_resp_ulb_start_assign;
+static gint ett_lbmc_umq_idx_cmd_resp_ulb_release_assign;
+static gint ett_lbmc_umq_idx_cmd_resp_reserve_assign;
+static gint ett_lbmc_umq_idx_cmd_resp_reserve_assign_flags;
+static gint ett_lbmc_umq_idx_cmd_resp_ulb_reserve_assign;
+static gint ett_lbmc_umq_idx_cmd_resp_ulb_reserve_assign_flags;
+static gint ett_lbmc_odomain;
+static gint ett_lbmc_odomain_flags;
+static gint ett_lbmc_stream;
+static gint ett_lbmc_stream_flags;
+static gint ett_lbmc_topic_md_interest;
+static gint ett_lbmc_topic_md_interest_flags;
+static gint ett_lbmc_pattern_md_interest;
+static gint ett_lbmc_pattern_md_interest_flags;
+static gint ett_lbmc_lji_req;
+static gint ett_lbmc_lji_req_flags;
+static gint ett_lbmc_tnwg_ka;
+static gint ett_lbmc_tnwg_ka_flags;
+static gint ett_lbmc_ume_receiver_keepalive;
+static gint ett_lbmc_ume_receiver_keepalive_flags;
+static gint ett_lbmc_umq_cmd;
+static gint ett_lbmc_umq_cmd_flags;
+static gint ett_lbmc_umq_cmd_topic_list;
+static gint ett_lbmc_umq_cmd_msg_retrieve;
+static gint ett_lbmc_umq_cmd_msg_retrieve_entry;
+static gint ett_lbmc_umq_cmd_msg_list;
+static gint ett_lbmc_umq_cmd_resp;
+static gint ett_lbmc_umq_cmd_resp_flags;
+static gint ett_lbmc_umq_cmd_resp_msg_retrieve;
+static gint ett_lbmc_umq_cmd_resp_xmsg_retrieve;
+static gint ett_lbmc_umq_cmd_resp_xmsg_retrieve_entry;
+static gint ett_lbmc_umq_cmd_resp_msg_list;
+static gint ett_lbmc_umq_cmd_resp_xmsg_list;
+static gint ett_lbmc_umq_cmd_resp_xmsg_list_entry;
+static gint ett_lbmc_umq_cmd_resp_topic_list;
+static gint ett_lbmc_umq_cmd_resp_topic_list_topic_entry;
+static gint ett_lbmc_umq_cmd_resp_topic_list_topic_entry_appset_entry;
+static gint ett_lbmc_umq_cmd_resp_err;
+static gint ett_lbmc_sri_req;
+static gint ett_lbmc_sri_req_flags;
+static gint ett_lbmc_ume_store_domain;
+static gint ett_lbmc_ume_store_domain_flags;
+static gint ett_lbmc_sri;
+static gint ett_lbmc_sri_flags;
+static gint ett_lbmc_route_info;
+static gint ett_lbmc_route_info_flags;
+static gint ett_lbmc_route_info_neighbor;
+static gint ett_lbmc_route_info_neighbor_flags;
+static gint ett_lbmc_gateway_name;
+static gint ett_lbmc_gateway_name_flags;
+static gint ett_lbmc_auth_request;
+static gint ett_lbmc_auth_request_flags;
+static gint ett_lbmc_auth_challenge;
+static gint ett_lbmc_auth_challenge_flags;
+static gint ett_lbmc_auth_challenge_rsp;
+static gint ett_lbmc_auth_challenge_rsp_flags;
+static gint ett_lbmc_auth_result;
+static gint ett_lbmc_auth_result_flags;
+static gint ett_lbmc_auth_unknown;
+static gint ett_lbmc_hmac;
+static gint ett_lbmc_hmac_flags;
+static gint ett_lbmc_umq_sid;
+static gint ett_lbmc_umq_sid_flags;
+static gint ett_lbmc_destination;
+static gint ett_lbmc_destination_flags;
+static gint ett_lbmc_topic_idx;
+static gint ett_lbmc_topic_idx_flags;
+static gint ett_lbmc_topic_source;
+static gint ett_lbmc_topic_source_flags;
+static gint ett_lbmc_topic_source_exfunc;
+static gint ett_lbmc_topic_source_exfunc_flags;
+static gint ett_lbmc_topic_source_exfunc_functionality_flags;
+static gint ett_lbmc_ume_store_ext;
+static gint ett_lbmc_ume_store_ext_flags;
+static gint ett_lbmc_ume_psrc_election_token;
+static gint ett_lbmc_ume_psrc_election_token_flags;
+static gint ett_lbmc_tcp_sid;
+static gint ett_lbmc_tcp_sid_flags;
+static gint ett_lbmc_extopt;
+static gint ett_lbmc_extopt_flags;
+static gint ett_lbmc_extopt_cfgopt;
+static gint ett_lbmc_extopt_reassembled_data;
+static gint ett_lbmc_extopt_reassembled_data_cfgopt;
+static gint ett_lbm_msg_properties;
+static gint ett_lbm_msg_properties_data;
+static gint ett_lbm_msg_properties_hdr;
+static gint ett_lbmc_unhandled_hdr;
+static gint ett_lbm_stream;
+static gint ett_lbmc_reassembly;
+static gint ett_unknown;
+static gint ett_msg_data;
+static gint ett_msgprop_data;
 
 /* Expert info handles */
-static expert_field ei_lbmc_analysis_length_incorrect = EI_INIT;
-static expert_field ei_lbmc_analysis_zero_length = EI_INIT;
-static expert_field ei_lbmc_analysis_tsni = EI_INIT;
-static expert_field ei_lbmc_analysis_invalid_value = EI_INIT;
-static expert_field ei_lbmc_analysis_no_reassembly = EI_INIT;
-/* static expert_field ei_lbmc_analysis_invalid_offset = EI_INIT; */
-static expert_field ei_lbmc_analysis_missing_reassembly_frame = EI_INIT;
-static expert_field ei_lbmc_analysis_invalid_fragment = EI_INIT;
-static expert_field ei_lbmc_extopt_fragment_offset = EI_INIT;
+static expert_field ei_lbmc_analysis_length_incorrect;
+static expert_field ei_lbmc_analysis_zero_length;
+static expert_field ei_lbmc_analysis_tsni;
+static expert_field ei_lbmc_analysis_invalid_value;
+static expert_field ei_lbmc_analysis_no_reassembly;
+/* static expert_field ei_lbmc_analysis_invalid_offset; */
+static expert_field ei_lbmc_analysis_missing_reassembly_frame;
+static expert_field ei_lbmc_analysis_invalid_fragment;
+static expert_field ei_lbmc_extopt_fragment_offset;
 
 /* Extended option reassembly structures. */
 #define LBMC_EXTOPT_REASSEMBLED_DATA_MAX_LEN 65536
diff --git a/epan/dissectors/packet-lbmpdm.c b/epan/dissectors/packet-lbmpdm.c
index 1ec7fd245e..8df6f5c682 100644
--- a/epan/dissectors/packet-lbmpdm.c
+++ b/epan/dissectors/packet-lbmpdm.c
@@ -300,82 +300,82 @@ static wmem_tree_t * lbmpdm_definition_table = NULL;
 /*----------------------------------------------------------------------------*/
 
 /* Protocol handle */
-static int proto_lbmpdm = -1;
+static int proto_lbmpdm;
 
 /* Protocol fields */
-static int hf_lbmpdm_magic = -1;
-static int hf_lbmpdm_encoding = -1;
-static int hf_lbmpdm_ver = -1;
-static int hf_lbmpdm_type = -1;
-static int hf_lbmpdm_next_hdr = -1;
-static int hf_lbmpdm_def_major_ver = -1;
-static int hf_lbmpdm_def_minor_ver = -1;
-static int hf_lbmpdm_def_id = -1;
-static int hf_lbmpdm_len = -1;
-static int hf_lbmpdm_segments = -1;
-static int hf_lbmpdm_segment = -1;
-static int hf_lbmpdm_segment_next_hdr = -1;
-static int hf_lbmpdm_segment_flags = -1;
-static int hf_lbmpdm_segment_res = -1;
-static int hf_lbmpdm_segment_len = -1;
-static int hf_lbmpdm_segment_def_id = -1;
-static int hf_lbmpdm_segment_def_num_fields = -1;
-static int hf_lbmpdm_segment_def_field_names_type = -1;
-static int hf_lbmpdm_segment_def_finalized = -1;
-static int hf_lbmpdm_segment_def_msg_vers_major = -1;
-static int hf_lbmpdm_segment_def_msg_vers_minor = -1;
-static int hf_lbmpdm_segment_def_fixed_req_section_len = -1;
-static int hf_lbmpdm_segment_def_field_info_len = -1;
-static int hf_lbmpdm_segment_def_field = -1;
-static int hf_lbmpdm_segment_def_field_def_len = -1;
-static int hf_lbmpdm_segment_def_field_id = -1;
-static int hf_lbmpdm_segment_def_field_len = -1;
-static int hf_lbmpdm_segment_def_field_fixed_str_len = -1;
-static int hf_lbmpdm_segment_def_field_num_arr_elem = -1;
-static int hf_lbmpdm_segment_def_field_req = -1;
-static int hf_lbmpdm_segment_def_field_fixed = -1;
-static int hf_lbmpdm_segment_def_field_fld_int_name = -1;
-static int hf_lbmpdm_segment_def_field_str_name_len = -1;
-static int hf_lbmpdm_segment_def_field_str_name = -1;
-static int hf_lbmpdm_segment_def_field_fld_type = -1;
-static int hf_lbmpdm_offset_entry = -1;
-static int hf_lbmpdm_offset_entry_id = -1;
-static int hf_lbmpdm_offset_entry_offset = -1;
-static int hf_lbmpdm_segment_data = -1;
-static int hf_lbmpdm_field = -1;
-static int hf_lbmpdm_field_id = -1;
-static int hf_lbmpdm_field_string_name = -1;
-static int hf_lbmpdm_field_int_name = -1;
-static int hf_lbmpdm_field_type = -1;
-static int hf_lbmpdm_field_total_length = -1;
-static int hf_lbmpdm_field_length = -1;
-static int hf_lbmpdm_field_value_boolean = -1;
-static int hf_lbmpdm_field_value_int8 = -1;
-static int hf_lbmpdm_field_value_uint8 = -1;
-static int hf_lbmpdm_field_value_int16 = -1;
-static int hf_lbmpdm_field_value_uint16 = -1;
-static int hf_lbmpdm_field_value_int32 = -1;
-static int hf_lbmpdm_field_value_uint32 = -1;
-static int hf_lbmpdm_field_value_int64 = -1;
-static int hf_lbmpdm_field_value_uint64 = -1;
-static int hf_lbmpdm_field_value_float = -1;
-static int hf_lbmpdm_field_value_double = -1;
-static int hf_lbmpdm_field_value_decimal = -1;
-static int hf_lbmpdm_field_value_timestamp = -1;
-static int hf_lbmpdm_field_value_fixed_string = -1;
-static int hf_lbmpdm_field_value_string = -1;
-static int hf_lbmpdm_field_value_fixed_unicode = -1;
-static int hf_lbmpdm_field_value_unicode = -1;
-static int hf_lbmpdm_field_value_blob = -1;
-static int hf_lbmpdm_field_value_message = -1;
+static int hf_lbmpdm_magic;
+static int hf_lbmpdm_encoding;
+static int hf_lbmpdm_ver;
+static int hf_lbmpdm_type;
+static int hf_lbmpdm_next_hdr;
+static int hf_lbmpdm_def_major_ver;
+static int hf_lbmpdm_def_minor_ver;
+static int hf_lbmpdm_def_id;
+static int hf_lbmpdm_len;
+static int hf_lbmpdm_segments;
+static int hf_lbmpdm_segment;
+static int hf_lbmpdm_segment_next_hdr;
+static int hf_lbmpdm_segment_flags;
+static int hf_lbmpdm_segment_res;
+static int hf_lbmpdm_segment_len;
+static int hf_lbmpdm_segment_def_id;
+static int hf_lbmpdm_segment_def_num_fields;
+static int hf_lbmpdm_segment_def_field_names_type;
+static int hf_lbmpdm_segment_def_finalized;
+static int hf_lbmpdm_segment_def_msg_vers_major;
+static int hf_lbmpdm_segment_def_msg_vers_minor;
+static int hf_lbmpdm_segment_def_fixed_req_section_len;
+static int hf_lbmpdm_segment_def_field_info_len;
+static int hf_lbmpdm_segment_def_field;
+static int hf_lbmpdm_segment_def_field_def_len;
+static int hf_lbmpdm_segment_def_field_id;
+static int hf_lbmpdm_segment_def_field_len;
+static int hf_lbmpdm_segment_def_field_fixed_str_len;
+static int hf_lbmpdm_segment_def_field_num_arr_elem;
+static int hf_lbmpdm_segment_def_field_req;
+static int hf_lbmpdm_segment_def_field_fixed;
+static int hf_lbmpdm_segment_def_field_fld_int_name;
+static int hf_lbmpdm_segment_def_field_str_name_len;
+static int hf_lbmpdm_segment_def_field_str_name;
+static int hf_lbmpdm_segment_def_field_fld_type;
+static int hf_lbmpdm_offset_entry;
+static int hf_lbmpdm_offset_entry_id;
+static int hf_lbmpdm_offset_entry_offset;
+static int hf_lbmpdm_segment_data;
+static int hf_lbmpdm_field;
+static int hf_lbmpdm_field_id;
+static int hf_lbmpdm_field_string_name;
+static int hf_lbmpdm_field_int_name;
+static int hf_lbmpdm_field_type;
+static int hf_lbmpdm_field_total_length;
+static int hf_lbmpdm_field_length;
+static int hf_lbmpdm_field_value_boolean;
+static int hf_lbmpdm_field_value_int8;
+static int hf_lbmpdm_field_value_uint8;
+static int hf_lbmpdm_field_value_int16;
+static int hf_lbmpdm_field_value_uint16;
+static int hf_lbmpdm_field_value_int32;
+static int hf_lbmpdm_field_value_uint32;
+static int hf_lbmpdm_field_value_int64;
+static int hf_lbmpdm_field_value_uint64;
+static int hf_lbmpdm_field_value_float;
+static int hf_lbmpdm_field_value_double;
+static int hf_lbmpdm_field_value_decimal;
+static int hf_lbmpdm_field_value_timestamp;
+static int hf_lbmpdm_field_value_fixed_string;
+static int hf_lbmpdm_field_value_string;
+static int hf_lbmpdm_field_value_fixed_unicode;
+static int hf_lbmpdm_field_value_unicode;
+static int hf_lbmpdm_field_value_blob;
+static int hf_lbmpdm_field_value_message;
 
 /* Protocol trees */
-static gint ett_lbmpdm = -1;
-static gint ett_lbmpdm_segments = -1;
-static gint ett_lbmpdm_segment = -1;
-static gint ett_lbmpdm_offset_entry = -1;
-static gint ett_lbmpdm_segment_def_field = -1;
-static gint ett_lbmpdm_field = -1;
+static gint ett_lbmpdm;
+static gint ett_lbmpdm_segments;
+static gint ett_lbmpdm_segment;
+static gint ett_lbmpdm_offset_entry;
+static gint ett_lbmpdm_segment_def_field;
+static gint ett_lbmpdm_field;
 
 /*----------------------------------------------------------------------------*/
 /* Value translation tables.                                                  */
diff --git a/epan/dissectors/packet-lbmpdmtcp.c b/epan/dissectors/packet-lbmpdmtcp.c
index 2cdf9dcce2..3ecf31bd80 100644
--- a/epan/dissectors/packet-lbmpdmtcp.c
+++ b/epan/dissectors/packet-lbmpdmtcp.c
@@ -228,11 +228,11 @@ static char * lbmpdm_tcp_tag_find(packet_info * pinfo)
 /*----------------------------------------------------------------------------*/
 
 /* Dissector tree handles */
-static int ett_lbmpdm_tcp = -1;
+static int ett_lbmpdm_tcp;
 
 /* Dissector field handles */
-static int hf_lbmpdm_tcp_tag = -1;
-static int hf_lbmpdm_tcp_channel = -1;
+static int hf_lbmpdm_tcp_tag;
+static int hf_lbmpdm_tcp_channel;
 
 static guint get_lbmpdm_tcp_pdu_length(packet_info * pinfo _U_, tvbuff_t * tvb,
                                        int offset, void *data _U_)
diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c
index 8ad2ebcfd4..5165403073 100644
--- a/epan/dissectors/packet-lbmr.c
+++ b/epan/dissectors/packet-lbmr.c
@@ -2090,562 +2090,562 @@ static char * lbmr_tag_find(packet_info * pinfo)
 /* Handles of all types.                                                      */
 /*----------------------------------------------------------------------------*/
 /* Protocol handle */
-static int proto_lbmr = -1;
+static int proto_lbmr;
 
 /* Dissector handle */
 static dissector_handle_t lbmr_dissector_handle;
 
 /* Dissector tree handles */
-static gint ett_lbmr = -1;
-static gint ett_lbmr_hdr = -1;
-static gint ett_lbmr_tqrs = -1;
-static gint ett_lbmr_tqr = -1;
-static gint ett_lbmr_tirs = -1;
-static gint ett_lbmr_tir = -1;
-static gint ett_lbmr_tir_tcp = -1;
-static gint ett_lbmr_tir_lbtrm = -1;
-static gint ett_lbmr_tir_lbtru = -1;
-static gint ett_lbmr_tir_lbtipc = -1;
-static gint ett_lbmr_tir_lbtrdma = -1;
-static gint ett_lbmr_tir_lbtsmx = -1;
-static gint ett_lbmr_topts = -1;
-static gint ett_lbmr_topt_len = -1;
-static gint ett_lbmr_topt_ume = -1;
-static gint ett_lbmr_topt_ume_flags = -1;
-static gint ett_lbmr_topt_ume_store = -1;
-static gint ett_lbmr_topt_ume_store_flags = -1;
-static gint ett_lbmr_topt_ume_store_group = -1;
-static gint ett_lbmr_topt_ume_store_group_flags = -1;
-static gint ett_lbmr_topt_latejoin = -1;
-static gint ett_lbmr_topt_latejoin_flags = -1;
-static gint ett_lbmr_topt_umq_rcridx = -1;
-static gint ett_lbmr_topt_umq_rcridx_flags = -1;
-static gint ett_lbmr_topt_umq_qinfo = -1;
-static gint ett_lbmr_topt_umq_qinfo_flags = -1;
-static gint ett_lbmr_topt_cost = -1;
-static gint ett_lbmr_topt_cost_flags = -1;
-static gint ett_lbmr_topt_otid = -1;
-static gint ett_lbmr_topt_otid_flags = -1;
-static gint ett_lbmr_topt_ctxinst = -1;
-static gint ett_lbmr_topt_ctxinst_flags = -1;
-static gint ett_lbmr_topt_ctxinsts = -1;
-static gint ett_lbmr_topt_ctxinsts_flags = -1;
-static gint ett_lbmr_topt_ulb = -1;
-static gint ett_lbmr_topt_ulb_flags = -1;
-static gint ett_lbmr_topt_ctxinstq = -1;
-static gint ett_lbmr_topt_ctxinstq_flags = -1;
-static gint ett_lbmr_topt_domain_id = -1;
-static gint ett_lbmr_topt_domain_id_flags = -1;
-static gint ett_lbmr_topt_exfunc = -1;
-static gint ett_lbmr_topt_exfunc_flags = -1;
-static gint ett_lbmr_topt_exfunc_functionality_flags = -1;
-static gint ett_lbmr_topt_unknown = -1;
-static gint ett_lbmr_tmb = -1;
-static gint ett_lbmr_tmrs = -1;
-static gint ett_lbmr_tmr = -1;
-static gint ett_lbmr_tmr_flags = -1;
-static gint ett_lbmr_pser_flags = -1;
-static gint ett_lbmr_pser_opts = -1;
-static gint ett_lbmr_pser_opt_len = -1;
-static gint ett_lbmr_pser_opt_ctxinst = -1;
-static gint ett_lbmr_qqrs = -1;
-static gint ett_lbmr_qirs = -1;
-static gint ett_lbmr_qir = -1;
-static gint ett_lbmr_qir_options = -1;
-static gint ett_lbmr_qir_grp_blk = -1;
-static gint ett_lbmr_qir_queue_blk = -1;
-static gint ett_lbmr_qir_grp = -1;
-static gint ett_lbmr_qir_queue = -1;
-static gint ett_lbmr_topic_res_request_flags = -1;
-static gint ett_lbmr_ctxinfo_flags = -1;
-static gint ett_lbmr_tnwg = -1;
-static gint ett_lbmr_tnwg_interest = -1;
-static gint ett_lbmr_tnwg_interest_rec = -1;
-static gint ett_lbmr_tnwg_interest_rec_flags = -1;
-static gint ett_lbmr_tnwg_ctxinfo = -1;
-static gint ett_lbmr_tnwg_ctxinfo_flags1 = -1;
-static gint ett_lbmr_tnwg_trreq = -1;
-static gint ett_lbmr_tnwg_ctxinst_opt = -1;
-static gint ett_lbmr_tnwg_ctxinst_opt_flags = -1;
-static gint ett_lbmr_tnwg_address_opt = -1;
-static gint ett_lbmr_tnwg_address_opt_flags = -1;
-static gint ett_lbmr_tnwg_domain_opt = -1;
-static gint ett_lbmr_tnwg_domain_opt_flags = -1;
-static gint ett_lbmr_tnwg_name_opt = -1;
-static gint ett_lbmr_tnwg_name_opt_flags = -1;
-static gint ett_lbmr_tnwg_unknown_opt = -1;
-static gint ett_lbmr_tnwg_unknown_opt_flags = -1;
-static gint ett_lbmr_remote_domain_route_hdr = -1;
-static gint ett_lbmr_rctxinfo = -1;
-static gint ett_lbmr_rctxinfo_rec = -1;
-static gint ett_lbmr_rctxinfo_rec_flags = -1;
-static gint ett_lbmr_rctxinfo_rec_address = -1;
-static gint ett_lbmr_rctxinfo_rec_instance = -1;
-static gint ett_lbmr_rctxinfo_rec_odomain = -1;
-static gint ett_lbmr_rctxinfo_rec_name = -1;
-static gint ett_lbmr_rctxinfo_rec_unknown = -1;
-static gint ett_qmgmt_flags = -1;
-static gint ett_qmgmt_il = -1;
-static gint ett_qmgmt_il_inst = -1;
-static gint ett_qmgmt_il_inst_flags = -1;
-static gint ett_qmgmt_ec = -1;
-static gint ett_qmgmt_ev = -1;
-static gint ett_qmgmt_qro = -1;
-static gint ett_lbmr_opts = -1;
-static gint ett_lbmr_opt_src_id = -1;
-static gint ett_lbmr_opt_src_id_flags = -1;
-static gint ett_lbmr_opt_len = -1;
-static gint ett_lbmr_opt_src_type = -1;
-static gint ett_lbmr_opt_src_type_flags = -1;
-static gint ett_lbmr_opt_version = -1;
-static gint ett_lbmr_opt_version_flags = -1;
-static gint ett_lbmr_opt_local_domain = -1;
-static gint ett_lbmr_opt_local_domain_flags = -1;
-static gint ett_lbmr_opt_unknown = -1;
+static gint ett_lbmr;
+static gint ett_lbmr_hdr;
+static gint ett_lbmr_tqrs;
+static gint ett_lbmr_tqr;
+static gint ett_lbmr_tirs;
+static gint ett_lbmr_tir;
+static gint ett_lbmr_tir_tcp;
+static gint ett_lbmr_tir_lbtrm;
+static gint ett_lbmr_tir_lbtru;
+static gint ett_lbmr_tir_lbtipc;
+static gint ett_lbmr_tir_lbtrdma;
+static gint ett_lbmr_tir_lbtsmx;
+static gint ett_lbmr_topts;
+static gint ett_lbmr_topt_len;
+static gint ett_lbmr_topt_ume;
+static gint ett_lbmr_topt_ume_flags;
+static gint ett_lbmr_topt_ume_store;
+static gint ett_lbmr_topt_ume_store_flags;
+static gint ett_lbmr_topt_ume_store_group;
+static gint ett_lbmr_topt_ume_store_group_flags;
+static gint ett_lbmr_topt_latejoin;
+static gint ett_lbmr_topt_latejoin_flags;
+static gint ett_lbmr_topt_umq_rcridx;
+static gint ett_lbmr_topt_umq_rcridx_flags;
+static gint ett_lbmr_topt_umq_qinfo;
+static gint ett_lbmr_topt_umq_qinfo_flags;
+static gint ett_lbmr_topt_cost;
+static gint ett_lbmr_topt_cost_flags;
+static gint ett_lbmr_topt_otid;
+static gint ett_lbmr_topt_otid_flags;
+static gint ett_lbmr_topt_ctxinst;
+static gint ett_lbmr_topt_ctxinst_flags;
+static gint ett_lbmr_topt_ctxinsts;
+static gint ett_lbmr_topt_ctxinsts_flags;
+static gint ett_lbmr_topt_ulb;
+static gint ett_lbmr_topt_ulb_flags;
+static gint ett_lbmr_topt_ctxinstq;
+static gint ett_lbmr_topt_ctxinstq_flags;
+static gint ett_lbmr_topt_domain_id;
+static gint ett_lbmr_topt_domain_id_flags;
+static gint ett_lbmr_topt_exfunc;
+static gint ett_lbmr_topt_exfunc_flags;
+static gint ett_lbmr_topt_exfunc_functionality_flags;
+static gint ett_lbmr_topt_unknown;
+static gint ett_lbmr_tmb;
+static gint ett_lbmr_tmrs;
+static gint ett_lbmr_tmr;
+static gint ett_lbmr_tmr_flags;
+static gint ett_lbmr_pser_flags;
+static gint ett_lbmr_pser_opts;
+static gint ett_lbmr_pser_opt_len;
+static gint ett_lbmr_pser_opt_ctxinst;
+static gint ett_lbmr_qqrs;
+static gint ett_lbmr_qirs;
+static gint ett_lbmr_qir;
+static gint ett_lbmr_qir_options;
+static gint ett_lbmr_qir_grp_blk;
+static gint ett_lbmr_qir_queue_blk;
+static gint ett_lbmr_qir_grp;
+static gint ett_lbmr_qir_queue;
+static gint ett_lbmr_topic_res_request_flags;
+static gint ett_lbmr_ctxinfo_flags;
+static gint ett_lbmr_tnwg;
+static gint ett_lbmr_tnwg_interest;
+static gint ett_lbmr_tnwg_interest_rec;
+static gint ett_lbmr_tnwg_interest_rec_flags;
+static gint ett_lbmr_tnwg_ctxinfo;
+static gint ett_lbmr_tnwg_ctxinfo_flags1;
+static gint ett_lbmr_tnwg_trreq;
+static gint ett_lbmr_tnwg_ctxinst_opt;
+static gint ett_lbmr_tnwg_ctxinst_opt_flags;
+static gint ett_lbmr_tnwg_address_opt;
+static gint ett_lbmr_tnwg_address_opt_flags;
+static gint ett_lbmr_tnwg_domain_opt;
+static gint ett_lbmr_tnwg_domain_opt_flags;
+static gint ett_lbmr_tnwg_name_opt;
+static gint ett_lbmr_tnwg_name_opt_flags;
+static gint ett_lbmr_tnwg_unknown_opt;
+static gint ett_lbmr_tnwg_unknown_opt_flags;
+static gint ett_lbmr_remote_domain_route_hdr;
+static gint ett_lbmr_rctxinfo;
+static gint ett_lbmr_rctxinfo_rec;
+static gint ett_lbmr_rctxinfo_rec_flags;
+static gint ett_lbmr_rctxinfo_rec_address;
+static gint ett_lbmr_rctxinfo_rec_instance;
+static gint ett_lbmr_rctxinfo_rec_odomain;
+static gint ett_lbmr_rctxinfo_rec_name;
+static gint ett_lbmr_rctxinfo_rec_unknown;
+static gint ett_qmgmt_flags;
+static gint ett_qmgmt_il;
+static gint ett_qmgmt_il_inst;
+static gint ett_qmgmt_il_inst_flags;
+static gint ett_qmgmt_ec;
+static gint ett_qmgmt_ev;
+static gint ett_qmgmt_qro;
+static gint ett_lbmr_opts;
+static gint ett_lbmr_opt_src_id;
+static gint ett_lbmr_opt_src_id_flags;
+static gint ett_lbmr_opt_len;
+static gint ett_lbmr_opt_src_type;
+static gint ett_lbmr_opt_src_type_flags;
+static gint ett_lbmr_opt_version;
+static gint ett_lbmr_opt_version_flags;
+static gint ett_lbmr_opt_local_domain;
+static gint ett_lbmr_opt_local_domain_flags;
+static gint ett_lbmr_opt_unknown;
 
 /* Dissector field handles */
-static int hf_lbmr_tag = -1;
-static int hf_lbmr_hdr = -1;
-static int hf_lbmr_hdr_ver = -1;
-static int hf_lbmr_hdr_opt = -1;
-static int hf_lbmr_hdr_type = -1;
-static int hf_lbmr_hdr_tqrs = -1;
-static int hf_lbmr_hdr_tirs = -1;
-static int hf_lbmr_hdr_qqrs = -1;
-static int hf_lbmr_hdr_qirs = -1;
-static int hf_lbmr_hdr_ext_type = -1;
-static int hf_lbmr_tqrs = -1;
-static int hf_lbmr_tqr = -1;
-static int hf_lbmr_tqr_pattern_type = -1;
-static int hf_lbmr_tqr_pattern = -1;
-static int hf_lbmr_tqr_name = -1;
-static int hf_lbmr_tirs = -1;
-static int hf_lbmr_tir = -1;
-static int hf_lbmr_tir_transport_opts = -1;
-static int hf_lbmr_tir_transport_type = -1;
-static int hf_lbmr_tir_tlen = -1;
-static int hf_lbmr_tir_ttl = -1;
-static int hf_lbmr_tir_index = -1;
-static int hf_lbmr_tir_name = -1;
-static int hf_lbmr_tir_tcp = -1;
-static int hf_lbmr_tir_tcp_ip = -1;
-static int hf_lbmr_tir_tcp_session_id = -1;
-static int hf_lbmr_tir_tcp_port = -1;
-static int hf_lbmr_tir_lbtrm = -1;
-static int hf_lbmr_tir_lbtrm_src_addr = -1;
-static int hf_lbmr_tir_lbtrm_mcast_addr = -1;
-static int hf_lbmr_tir_lbtrm_session_id = -1;
-static int hf_lbmr_tir_lbtrm_udp_dest_port = -1;
-static int hf_lbmr_tir_lbtrm_src_ucast_port = -1;
-static int hf_lbmr_tir_lbtru = -1;
-static int hf_lbmr_tir_lbtru_ip = -1;
-static int hf_lbmr_tir_lbtru_port = -1;
-static int hf_lbmr_tir_lbtru_session_id = -1;
-static int hf_lbmr_tir_lbtipc = -1;
-static int hf_lbmr_tir_lbtipc_host_id = -1;
-static int hf_lbmr_tir_lbtipc_session_id = -1;
-static int hf_lbmr_tir_lbtipc_xport_id = -1;
-static int hf_lbmr_tir_lbtrdma = -1;
-static int hf_lbmr_tir_lbtrdma_ip = -1;
-static int hf_lbmr_tir_lbtrdma_session_id = -1;
-static int hf_lbmr_tir_lbtrdma_port = -1;
-static int hf_lbmr_tir_lbtsmx = -1;
-static int hf_lbmr_tir_lbtsmx_host_id = -1;
-static int hf_lbmr_tir_lbtsmx_session_id = -1;
-static int hf_lbmr_tir_lbtsmx_xport_id = -1;
-static int hf_lbmr_tir_channel = -1;
-static int hf_lbmr_tir_unknown_transport = -1;
-static int hf_lbmr_topts = -1;
-static int hf_lbmr_topt_len = -1;
-static int hf_lbmr_topt_len_type = -1;
-static int hf_lbmr_topt_len_len = -1;
-static int hf_lbmr_topt_len_total_len = -1;
-static int hf_lbmr_topt_ume = -1;
-static int hf_lbmr_topt_ume_type = -1;
-static int hf_lbmr_topt_ume_len = -1;
-static int hf_lbmr_topt_ume_flags = -1;
-static int hf_lbmr_topt_ume_flags_ignore = -1;
-static int hf_lbmr_topt_ume_flags_latejoin = -1;
-static int hf_lbmr_topt_ume_flags_store = -1;
-static int hf_lbmr_topt_ume_flags_qccap = -1;
-static int hf_lbmr_topt_ume_flags_acktosrc = -1;
-static int hf_lbmr_topt_ume_store_tcp_port = -1;
-static int hf_lbmr_topt_ume_src_tcp_port = -1;
-static int hf_lbmr_topt_ume_store_tcp_addr = -1;
-static int hf_lbmr_topt_ume_src_tcp_addr = -1;
-static int hf_lbmr_topt_ume_src_reg_id = -1;
-static int hf_lbmr_topt_ume_transport_idx = -1;
-static int hf_lbmr_topt_ume_high_seqnum = -1;
-static int hf_lbmr_topt_ume_low_seqnum = -1;
-static int hf_lbmr_topt_ume_store = -1;
-static int hf_lbmr_topt_ume_store_type = -1;
-static int hf_lbmr_topt_ume_store_len = -1;
-static int hf_lbmr_topt_ume_store_flags = -1;
-static int hf_lbmr_topt_ume_store_flags_ignore = -1;
-static int hf_lbmr_topt_ume_store_grp_idx = -1;
-static int hf_lbmr_topt_ume_store_store_tcp_port = -1;
-static int hf_lbmr_topt_ume_store_store_idx = -1;
-static int hf_lbmr_topt_ume_store_store_ip_addr = -1;
-static int hf_lbmr_topt_ume_store_src_reg_id = -1;
-static int hf_lbmr_topt_ume_store_group = -1;
-static int hf_lbmr_topt_ume_store_group_type = -1;
-static int hf_lbmr_topt_ume_store_group_len = -1;
-static int hf_lbmr_topt_ume_store_group_flags = -1;
-static int hf_lbmr_topt_ume_store_group_flags_ignore = -1;
-static int hf_lbmr_topt_ume_store_group_grp_idx = -1;
-static int hf_lbmr_topt_ume_store_group_grp_sz = -1;
-static int hf_lbmr_topt_ume_store_group_reserved = -1;
-static int hf_lbmr_topt_latejoin = -1;
-static int hf_lbmr_topt_latejoin_type = -1;
-static int hf_lbmr_topt_latejoin_len = -1;
-static int hf_lbmr_topt_latejoin_flags = -1;
-static int hf_lbmr_topt_latejoin_flags_ignore = -1;
-static int hf_lbmr_topt_latejoin_flags_acktosrc = -1;
-static int hf_lbmr_topt_latejoin_src_tcp_port = -1;
-static int hf_lbmr_topt_latejoin_reserved = -1;
-static int hf_lbmr_topt_latejoin_src_ip_addr = -1;
-static int hf_lbmr_topt_latejoin_transport_idx = -1;
-static int hf_lbmr_topt_latejoin_high_seqnum = -1;
-static int hf_lbmr_topt_latejoin_low_seqnum = -1;
-static int hf_lbmr_topt_umq_rcridx = -1;
-static int hf_lbmr_topt_umq_rcridx_type = -1;
-static int hf_lbmr_topt_umq_rcridx_len = -1;
-static int hf_lbmr_topt_umq_rcridx_flags = -1;
-static int hf_lbmr_topt_umq_rcridx_flags_ignore = -1;
-static int hf_lbmr_topt_umq_rcridx_rcr_idx = -1;
-static int hf_lbmr_topt_umq_qinfo = -1;
-static int hf_lbmr_topt_umq_qinfo_type = -1;
-static int hf_lbmr_topt_umq_qinfo_len = -1;
-static int hf_lbmr_topt_umq_qinfo_flags = -1;
-static int hf_lbmr_topt_umq_qinfo_flags_ignore = -1;
-static int hf_lbmr_topt_umq_qinfo_flags_queue = -1;
-static int hf_lbmr_topt_umq_qinfo_flags_rcvlisten = -1;
-static int hf_lbmr_topt_umq_qinfo_flags_control = -1;
-static int hf_lbmr_topt_umq_qinfo_flags_srcrcvlisten = -1;
-static int hf_lbmr_topt_umq_qinfo_flags_participants_only = -1;
-static int hf_lbmr_topt_umq_qinfo_queue = -1;
-static int hf_lbmr_topt_cost = -1;
-static int hf_lbmr_topt_cost_type = -1;
-static int hf_lbmr_topt_cost_len = -1;
-static int hf_lbmr_topt_cost_flags = -1;
-static int hf_lbmr_topt_cost_flags_ignore = -1;
-static int hf_lbmr_topt_cost_hop_count = -1;
-static int hf_lbmr_topt_cost_cost = -1;
-static int hf_lbmr_topt_otid = -1;
-static int hf_lbmr_topt_otid_type = -1;
-static int hf_lbmr_topt_otid_len = -1;
-static int hf_lbmr_topt_otid_flags = -1;
-static int hf_lbmr_topt_otid_flags_ignore = -1;
-static int hf_lbmr_topt_otid_originating_transport = -1;
-static int hf_lbmr_topt_ctxinst = -1;
-static int hf_lbmr_topt_ctxinst_type = -1;
-static int hf_lbmr_topt_ctxinst_len = -1;
-static int hf_lbmr_topt_ctxinst_flags = -1;
-static int hf_lbmr_topt_ctxinst_flags_ignore = -1;
-static int hf_lbmr_topt_ctxinst_res = -1;
-static int hf_lbmr_topt_ctxinst_ctxinst = -1;
-static int hf_lbmr_topt_ctxinsts = -1;
-static int hf_lbmr_topt_ctxinsts_type = -1;
-static int hf_lbmr_topt_ctxinsts_len = -1;
-static int hf_lbmr_topt_ctxinsts_flags = -1;
-static int hf_lbmr_topt_ctxinsts_flags_ignore = -1;
-static int hf_lbmr_topt_ctxinsts_idx = -1;
-static int hf_lbmr_topt_ctxinsts_ctxinst = -1;
-static int hf_lbmr_topt_ulb = -1;
-static int hf_lbmr_topt_ulb_type = -1;
-static int hf_lbmr_topt_ulb_len = -1;
-static int hf_lbmr_topt_ulb_flags = -1;
-static int hf_lbmr_topt_ulb_flags_ignore = -1;
-static int hf_lbmr_topt_ulb_queue_id = -1;
-static int hf_lbmr_topt_ulb_regid = -1;
-static int hf_lbmr_topt_ulb_ulb_src_id = -1;
-static int hf_lbmr_topt_ulb_src_ip_addr = -1;
-static int hf_lbmr_topt_ulb_src_tcp_port = -1;
-static int hf_lbmr_topt_ulb_reserved = -1;
-static int hf_lbmr_topt_ctxinstq = -1;
-static int hf_lbmr_topt_ctxinstq_type = -1;
-static int hf_lbmr_topt_ctxinstq_len = -1;
-static int hf_lbmr_topt_ctxinstq_flags = -1;
-static int hf_lbmr_topt_ctxinstq_flags_ignore = -1;
-static int hf_lbmr_topt_ctxinstq_idx = -1;
-static int hf_lbmr_topt_ctxinstq_ctxinst = -1;
-static int hf_lbmr_topt_domain_id = -1;
-static int hf_lbmr_topt_domain_id_type = -1;
-static int hf_lbmr_topt_domain_id_len = -1;
-static int hf_lbmr_topt_domain_id_flags = -1;
-static int hf_lbmr_topt_domain_id_flags_ignore = -1;
-static int hf_lbmr_topt_domain_id_domain_id = -1;
-static int hf_lbmr_topt_exfunc = -1;
-static int hf_lbmr_topt_exfunc_type = -1;
-static int hf_lbmr_topt_exfunc_len = -1;
-static int hf_lbmr_topt_exfunc_flags = -1;
-static int hf_lbmr_topt_exfunc_flags_ignore = -1;
-static int hf_lbmr_topt_exfunc_src_tcp_port = -1;
-static int hf_lbmr_topt_exfunc_reserved = -1;
-static int hf_lbmr_topt_exfunc_src_ip_addr = -1;
-static int hf_lbmr_topt_exfunc_functionality_flags = -1;
-static int hf_lbmr_topt_exfunc_functionality_flags_lj = -1;
-static int hf_lbmr_topt_exfunc_functionality_flags_ume = -1;
-static int hf_lbmr_topt_exfunc_functionality_flags_umq = -1;
-static int hf_lbmr_topt_exfunc_functionality_flags_ulb = -1;
-static int hf_lbmr_topt_unknown = -1;
-static int hf_lbmr_topt_unknown_type = -1;
-static int hf_lbmr_topt_unknown_len = -1;
-static int hf_lbmr_topt_unknown_flags = -1;
-static int hf_lbmr_topt_unknown_data = -1;
-static int hf_lbmr_qqr = -1;
-static int hf_lbmr_qqr_name = -1;
-static int hf_lbmr_qirs = -1;
-static int hf_lbmr_qir = -1;
-static int hf_lbmr_qir_queue_name = -1;
-static int hf_lbmr_qir_topic_name = -1;
-static int hf_lbmr_qir_queue_id = -1;
-static int hf_lbmr_qir_queue_ver = -1;
-static int hf_lbmr_qir_queue_prev_ver = -1;
-static int hf_lbmr_qir_option_flag = -1;
-static int hf_lbmr_qir_grp_blks = -1;
-static int hf_lbmr_qir_queue_blks = -1;
-static int hf_lbmr_qir_grps = -1;
-static int hf_lbmr_qir_grp_blk = -1;
-static int hf_lbmr_qir_grp_blk_grp_idx = -1;
-static int hf_lbmr_qir_grp_blk_grp_sz = -1;
-static int hf_lbmr_qir_queues = -1;
-static int hf_lbmr_qir_queue_blk = -1;
-static int hf_lbmr_qir_queue_blk_ip = -1;
-static int hf_lbmr_qir_queue_blk_port = -1;
-static int hf_lbmr_qir_queue_blk_idx = -1;
-static int hf_lbmr_qir_queue_blk_grp_idx = -1;
-static int hf_lbmr_qir_queue_blk_reserved = -1;
-static int hf_lbmr_tmb = -1;
-static int hf_lbmr_tmb_len = -1;
-static int hf_lbmr_tmb_tmrs = -1;
-static int hf_lbmr_tmb_tmr_list = -1;
-static int hf_lbmr_tmr = -1;
-static int hf_lbmr_tmr_len = -1;
-static int hf_lbmr_tmr_type = -1;
-static int hf_lbmr_tmr_flags = -1;
-static int hf_lbmr_tmr_flags_response = -1;
-static int hf_lbmr_tmr_flags_wildcard_pcre = -1;
-static int hf_lbmr_tmr_flags_wildcard_regex = -1;
-static int hf_lbmr_tmr_name = -1;
-static int hf_lbmr_pser_dep_type = -1;
-static int hf_lbmr_pser_len = -1;
-static int hf_lbmr_pser_flags = -1;
-static int hf_lbmr_pser_flags_option = -1;
-static int hf_lbmr_pser_source_ip = -1;
-static int hf_lbmr_pser_store_ip = -1;
-static int hf_lbmr_pser_transport_idx = -1;
-static int hf_lbmr_pser_topic_idx = -1;
-static int hf_lbmr_pser_source_port = -1;
-static int hf_lbmr_pser_store_port = -1;
-static int hf_lbmr_pser_topic = -1;
-static int hf_lbmr_pser_opts = -1;
-static int hf_lbmr_pser_optlen = -1;
-static int hf_lbmr_pser_optlen_type = -1;
-static int hf_lbmr_pser_optlen_optlen = -1;
-static int hf_lbmr_pser_opt_ctxinst = -1;
-static int hf_lbmr_pser_opt_ctxinst_len = -1;
-static int hf_lbmr_pser_opt_ctxinst_type = -1;
-static int hf_lbmr_pser_opt_ctxinst_ctxinst = -1;
-static int hf_lbmr_opts = -1;
-static int hf_lbmr_opt_len = -1;
-static int hf_lbmr_opt_len_type = -1;
-static int hf_lbmr_opt_len_len = -1;
-static int hf_lbmr_opt_len_total_len = -1;
-static int hf_lbmr_opt_src_id = -1;
-static int hf_lbmr_opt_src_id_type = -1;
-static int hf_lbmr_opt_src_id_len = -1;
-static int hf_lbmr_opt_src_id_flags = -1;
-static int hf_lbmr_opt_src_id_flags_ignore = -1;
-static int hf_lbmr_opt_src_id_src_id = -1;
-static int hf_lbmr_opt_src_type = -1;
-static int hf_lbmr_opt_src_type_type = -1;
-static int hf_lbmr_opt_src_type_len = -1;
-static int hf_lbmr_opt_src_type_flags = -1;
-static int hf_lbmr_opt_src_type_flags_ignore = -1;
-static int hf_lbmr_opt_src_type_src_type = -1;
-static int hf_lbmr_opt_version = -1;
-static int hf_lbmr_opt_version_type = -1;
-static int hf_lbmr_opt_version_len = -1;
-static int hf_lbmr_opt_version_flags = -1;
-static int hf_lbmr_opt_version_flags_ignore = -1;
-static int hf_lbmr_opt_version_flags_ume = -1;
-static int hf_lbmr_opt_version_flags_umq = -1;
-static int hf_lbmr_opt_version_version = -1;
-static int hf_lbmr_opt_local_domain = -1;
-static int hf_lbmr_opt_local_domain_type = -1;
-static int hf_lbmr_opt_local_domain_len = -1;
-static int hf_lbmr_opt_local_domain_flags = -1;
-static int hf_lbmr_opt_local_domain_flags_ignore = -1;
-static int hf_lbmr_opt_local_domain_local_domain_id = -1;
-static int hf_lbmr_opt_unknown = -1;
-static int hf_lbmr_opt_unknown_type = -1;
-static int hf_lbmr_opt_unknown_len = -1;
-static int hf_lbmr_opt_unknown_flags = -1;
-static int hf_lbmr_opt_unknown_data = -1;
-static int hf_lbmr_topic_res_request_flags = -1;
-static int hf_lbmr_topic_res_request_flags_gw_remote_interest = -1;
-static int hf_lbmr_topic_res_request_flags_context_query = -1;
-static int hf_lbmr_topic_res_request_flags_context_advertisement = -1;
-static int hf_lbmr_topic_res_request_flags_gateway_meta = -1;
-static int hf_lbmr_topic_res_request_flags_advertisement = -1;
-static int hf_lbmr_topic_res_request_flags_query = -1;
-static int hf_lbmr_topic_res_request_flags_wildcard_query = -1;
-static int hf_lbmr_ctxinfo_len = -1;
-static int hf_lbmr_ctxinfo_hop_count = -1;
-static int hf_lbmr_ctxinfo_flags = -1;
-static int hf_lbmr_ctxinfo_flags_query = -1;
-static int hf_lbmr_ctxinfo_flags_ip = -1;
-static int hf_lbmr_ctxinfo_flags_instance = -1;
-static int hf_lbmr_ctxinfo_flags_tnwg_src = -1;
-static int hf_lbmr_ctxinfo_flags_tnwg_rcv = -1;
-static int hf_lbmr_ctxinfo_flags_proxy = -1;
-static int hf_lbmr_ctxinfo_flags_name = -1;
-static int hf_lbmr_ctxinfo_port = -1;
-static int hf_lbmr_ctxinfo_ip = -1;
-static int hf_lbmr_ctxinfo_instance = -1;
-static int hf_lbmr_ctxinfo_name = -1;
-static int hf_lbmr_tnwg_len = -1;
-static int hf_lbmr_tnwg_type = -1;
-static int hf_lbmr_tnwg_reserved = -1;
-static int hf_lbmr_tnwg_interest = -1;
-static int hf_lbmr_tnwg_interest_len = -1;
-static int hf_lbmr_tnwg_interest_count = -1;
-static int hf_lbmr_tnwg_interest_rec = -1;
-static int hf_lbmr_tnwg_interest_rec_len = -1;
-static int hf_lbmr_tnwg_interest_rec_flags = -1;
-static int hf_lbmr_tnwg_interest_rec_flags_pattern = -1;
-static int hf_lbmr_tnwg_interest_rec_flags_cancel = -1;
-static int hf_lbmr_tnwg_interest_rec_flags_refresh = -1;
-static int hf_lbmr_tnwg_interest_rec_pattype = -1;
-static int hf_lbmr_tnwg_interest_rec_domain_id = -1;
-static int hf_lbmr_tnwg_interest_rec_symbol = -1;
-static int hf_lbmr_tnwg_ctxinfo = -1;
-static int hf_lbmr_tnwg_ctxinfo_len = -1;
-static int hf_lbmr_tnwg_ctxinfo_hop_count = -1;
-static int hf_lbmr_tnwg_ctxinfo_reserved = -1;
-static int hf_lbmr_tnwg_ctxinfo_flags1 = -1;
-static int hf_lbmr_tnwg_ctxinfo_flags1_query = -1;
-static int hf_lbmr_tnwg_ctxinfo_flags1_tnwg_src = -1;
-static int hf_lbmr_tnwg_ctxinfo_flags1_tnwg_rcv = -1;
-static int hf_lbmr_tnwg_ctxinfo_flags1_proxy = -1;
-static int hf_lbmr_tnwg_ctxinfo_flags2 = -1;
-static int hf_lbmr_tnwg_trreq = -1;
-static int hf_lbmr_tnwg_trreq_len = -1;
-static int hf_lbmr_tnwg_opt = -1;
-static int hf_lbmr_tnwg_opt_type = -1;
-static int hf_lbmr_tnwg_opt_len = -1;
-static int hf_lbmr_tnwg_opt_flags = -1;
-static int hf_lbmr_tnwg_opt_flags_ignore = -1;
-static int hf_lbmr_tnwg_opt_data = -1;
-static int hf_lbmr_tnwg_opt_ctxinst = -1;
-static int hf_lbmr_tnwg_opt_ctxinst_type = -1;
-static int hf_lbmr_tnwg_opt_ctxinst_len = -1;
-static int hf_lbmr_tnwg_opt_ctxinst_flags = -1;
-static int hf_lbmr_tnwg_opt_ctxinst_flags_ignore = -1;
-static int hf_lbmr_tnwg_opt_ctxinst_instance = -1;
-static int hf_lbmr_tnwg_opt_address = -1;
-static int hf_lbmr_tnwg_opt_address_type = -1;
-static int hf_lbmr_tnwg_opt_address_len = -1;
-static int hf_lbmr_tnwg_opt_address_flags = -1;
-static int hf_lbmr_tnwg_opt_address_flags_ignore = -1;
-static int hf_lbmr_tnwg_opt_address_port = -1;
-static int hf_lbmr_tnwg_opt_address_res = -1;
-static int hf_lbmr_tnwg_opt_address_ip = -1;
-static int hf_lbmr_tnwg_opt_domain = -1;
-static int hf_lbmr_tnwg_opt_domain_type = -1;
-static int hf_lbmr_tnwg_opt_domain_len = -1;
-static int hf_lbmr_tnwg_opt_domain_flags = -1;
-static int hf_lbmr_tnwg_opt_domain_flags_ignore = -1;
-static int hf_lbmr_tnwg_opt_domain_domain_id = -1;
-static int hf_lbmr_tnwg_opt_name = -1;
-static int hf_lbmr_tnwg_opt_name_type = -1;
-static int hf_lbmr_tnwg_opt_name_len = -1;
-static int hf_lbmr_tnwg_opt_name_flags = -1;
-static int hf_lbmr_tnwg_opt_name_flags_ignore = -1;
-static int hf_lbmr_tnwg_opt_name_name = -1;
-static int hf_lbmr_remote_domain_route_hdr_num_domains = -1;
-static int hf_lbmr_remote_domain_route_hdr_ip = -1;
-static int hf_lbmr_remote_domain_route_hdr_port = -1;
-static int hf_lbmr_remote_domain_route_hdr_reserved = -1;
-static int hf_lbmr_remote_domain_route_hdr_length = -1;
-static int hf_lbmr_remote_domain_route_hdr_domain = -1;
-static int hf_lbmr_rctxinfo_len = -1;
-static int hf_lbmr_rctxinfo_num_recs = -1;
-static int hf_lbmr_rctxinfo_reserved = -1;
-static int hf_lbmr_rctxinfo_rec = -1;
-static int hf_lbmr_rctxinfo_rec_len = -1;
-static int hf_lbmr_rctxinfo_rec_flags = -1;
-static int hf_lbmr_rctxinfo_rec_flags_query = -1;
-static int hf_lbmr_rctxinfo_rec_address = -1;
-static int hf_lbmr_rctxinfo_rec_address_type = -1;
-static int hf_lbmr_rctxinfo_rec_address_len = -1;
-static int hf_lbmr_rctxinfo_rec_address_flags = -1;
-static int hf_lbmr_rctxinfo_rec_address_domain_id = -1;
-static int hf_lbmr_rctxinfo_rec_address_ip = -1;
-static int hf_lbmr_rctxinfo_rec_address_port = -1;
-static int hf_lbmr_rctxinfo_rec_address_res = -1;
-static int hf_lbmr_rctxinfo_rec_instance = -1;
-static int hf_lbmr_rctxinfo_rec_instance_type = -1;
-static int hf_lbmr_rctxinfo_rec_instance_len = -1;
-static int hf_lbmr_rctxinfo_rec_instance_flags = -1;
-static int hf_lbmr_rctxinfo_rec_instance_instance = -1;
-static int hf_lbmr_rctxinfo_rec_odomain = -1;
-static int hf_lbmr_rctxinfo_rec_odomain_type = -1;
-static int hf_lbmr_rctxinfo_rec_odomain_len = -1;
-static int hf_lbmr_rctxinfo_rec_odomain_flags = -1;
-static int hf_lbmr_rctxinfo_rec_odomain_domain_id = -1;
-static int hf_lbmr_rctxinfo_rec_name = -1;
-static int hf_lbmr_rctxinfo_rec_name_type = -1;
-static int hf_lbmr_rctxinfo_rec_name_len = -1;
-static int hf_lbmr_rctxinfo_rec_name_flags = -1;
-static int hf_lbmr_rctxinfo_rec_name_name = -1;
-static int hf_lbmr_rctxinfo_rec_unknown = -1;
-static int hf_lbmr_rctxinfo_rec_unknown_type = -1;
-static int hf_lbmr_rctxinfo_rec_unknown_len = -1;
-static int hf_lbmr_rctxinfo_rec_unknown_flags = -1;
-static int hf_lbmr_rctxinfo_rec_unknown_data = -1;
-static int hf_qmgmt_flags = -1;
-static int hf_qmgmt_flags_i_flag = -1;
-static int hf_qmgmt_flags_n_flag = -1;
-static int hf_qmgmt_flags_il_l_flag = -1;
-static int hf_qmgmt_flags_il_k_flag = -1;
-static int hf_qmgmt_pckt_type = -1;
-static int hf_qmgmt_cfgsig = -1;
-static int hf_qmgmt_queue_id = -1;
-static int hf_qmgmt_queue_ver = -1;
-static int hf_qmgmt_ip = -1;
-static int hf_qmgmt_port = -1;
-static int hf_qmgmt_inst_idx = -1;
-static int hf_qmgmt_grp_idx = -1;
-static int hf_qmgmt_pckt_type_dep16 = -1;
-static int hf_qmgmt_il_num_insts = -1;
-static int hf_qmgmt_jrej_code = -1;
-static int hf_qmgmt_ev_bias = -1;
-static int hf_qmgmt_il = -1;
-static int hf_qmgmt_il_highest_rcr_tsp = -1;
-static int hf_qmgmt_il_inst = -1;
-static int hf_qmgmt_il_inst_ip = -1;
-static int hf_qmgmt_il_inst_port = -1;
-static int hf_qmgmt_il_inst_inst_idx = -1;
-static int hf_qmgmt_il_inst_grp_idx = -1;
-static int hf_qmgmt_il_inst_flags = -1;
-static int hf_qmgmt_il_inst_flags_m_flag = -1;
-static int hf_qmgmt_il_inst_flags_q_flag = -1;
-static int hf_qmgmt_il_inst_flags_p_flag = -1;
-static int hf_qmgmt_ec = -1;
-static int hf_qmgmt_ec_queue_new_ver = -1;
-static int hf_qmgmt_ev = -1;
-static int hf_qmgmt_ev_highest_rcr_tsp = -1;
-static int hf_qmgmt_ev_age = -1;
-static int hf_qmgmt_qro = -1;
-static int hf_qmgmt_qro_highest_rcr_tsp = -1;
-static int hf_qmgmt_qname = -1;
+static int hf_lbmr_tag;
+static int hf_lbmr_hdr;
+static int hf_lbmr_hdr_ver;
+static int hf_lbmr_hdr_opt;
+static int hf_lbmr_hdr_type;
+static int hf_lbmr_hdr_tqrs;
+static int hf_lbmr_hdr_tirs;
+static int hf_lbmr_hdr_qqrs;
+static int hf_lbmr_hdr_qirs;
+static int hf_lbmr_hdr_ext_type;
+static int hf_lbmr_tqrs;
+static int hf_lbmr_tqr;
+static int hf_lbmr_tqr_pattern_type;
+static int hf_lbmr_tqr_pattern;
+static int hf_lbmr_tqr_name;
+static int hf_lbmr_tirs;
+static int hf_lbmr_tir;
+static int hf_lbmr_tir_transport_opts;
+static int hf_lbmr_tir_transport_type;
+static int hf_lbmr_tir_tlen;
+static int hf_lbmr_tir_ttl;
+static int hf_lbmr_tir_index;
+static int hf_lbmr_tir_name;
+static int hf_lbmr_tir_tcp;
+static int hf_lbmr_tir_tcp_ip;
+static int hf_lbmr_tir_tcp_session_id;
+static int hf_lbmr_tir_tcp_port;
+static int hf_lbmr_tir_lbtrm;
+static int hf_lbmr_tir_lbtrm_src_addr;
+static int hf_lbmr_tir_lbtrm_mcast_addr;
+static int hf_lbmr_tir_lbtrm_session_id;
+static int hf_lbmr_tir_lbtrm_udp_dest_port;
+static int hf_lbmr_tir_lbtrm_src_ucast_port;
+static int hf_lbmr_tir_lbtru;
+static int hf_lbmr_tir_lbtru_ip;
+static int hf_lbmr_tir_lbtru_port;
+static int hf_lbmr_tir_lbtru_session_id;
+static int hf_lbmr_tir_lbtipc;
+static int hf_lbmr_tir_lbtipc_host_id;
+static int hf_lbmr_tir_lbtipc_session_id;
+static int hf_lbmr_tir_lbtipc_xport_id;
+static int hf_lbmr_tir_lbtrdma;
+static int hf_lbmr_tir_lbtrdma_ip;
+static int hf_lbmr_tir_lbtrdma_session_id;
+static int hf_lbmr_tir_lbtrdma_port;
+static int hf_lbmr_tir_lbtsmx;
+static int hf_lbmr_tir_lbtsmx_host_id;
+static int hf_lbmr_tir_lbtsmx_session_id;
+static int hf_lbmr_tir_lbtsmx_xport_id;
+static int hf_lbmr_tir_channel;
+static int hf_lbmr_tir_unknown_transport;
+static int hf_lbmr_topts;
+static int hf_lbmr_topt_len;
+static int hf_lbmr_topt_len_type;
+static int hf_lbmr_topt_len_len;
+static int hf_lbmr_topt_len_total_len;
+static int hf_lbmr_topt_ume;
+static int hf_lbmr_topt_ume_type;
+static int hf_lbmr_topt_ume_len;
+static int hf_lbmr_topt_ume_flags;
+static int hf_lbmr_topt_ume_flags_ignore;
+static int hf_lbmr_topt_ume_flags_latejoin;
+static int hf_lbmr_topt_ume_flags_store;
+static int hf_lbmr_topt_ume_flags_qccap;
+static int hf_lbmr_topt_ume_flags_acktosrc;
+static int hf_lbmr_topt_ume_store_tcp_port;
+static int hf_lbmr_topt_ume_src_tcp_port;
+static int hf_lbmr_topt_ume_store_tcp_addr;
+static int hf_lbmr_topt_ume_src_tcp_addr;
+static int hf_lbmr_topt_ume_src_reg_id;
+static int hf_lbmr_topt_ume_transport_idx;
+static int hf_lbmr_topt_ume_high_seqnum;
+static int hf_lbmr_topt_ume_low_seqnum;
+static int hf_lbmr_topt_ume_store;
+static int hf_lbmr_topt_ume_store_type;
+static int hf_lbmr_topt_ume_store_len;
+static int hf_lbmr_topt_ume_store_flags;
+static int hf_lbmr_topt_ume_store_flags_ignore;
+static int hf_lbmr_topt_ume_store_grp_idx;
+static int hf_lbmr_topt_ume_store_store_tcp_port;
+static int hf_lbmr_topt_ume_store_store_idx;
+static int hf_lbmr_topt_ume_store_store_ip_addr;
+static int hf_lbmr_topt_ume_store_src_reg_id;
+static int hf_lbmr_topt_ume_store_group;
+static int hf_lbmr_topt_ume_store_group_type;
+static int hf_lbmr_topt_ume_store_group_len;
+static int hf_lbmr_topt_ume_store_group_flags;
+static int hf_lbmr_topt_ume_store_group_flags_ignore;
+static int hf_lbmr_topt_ume_store_group_grp_idx;
+static int hf_lbmr_topt_ume_store_group_grp_sz;
+static int hf_lbmr_topt_ume_store_group_reserved;
+static int hf_lbmr_topt_latejoin;
+static int hf_lbmr_topt_latejoin_type;
+static int hf_lbmr_topt_latejoin_len;
+static int hf_lbmr_topt_latejoin_flags;
+static int hf_lbmr_topt_latejoin_flags_ignore;
+static int hf_lbmr_topt_latejoin_flags_acktosrc;
+static int hf_lbmr_topt_latejoin_src_tcp_port;
+static int hf_lbmr_topt_latejoin_reserved;
+static int hf_lbmr_topt_latejoin_src_ip_addr;
+static int hf_lbmr_topt_latejoin_transport_idx;
+static int hf_lbmr_topt_latejoin_high_seqnum;
+static int hf_lbmr_topt_latejoin_low_seqnum;
+static int hf_lbmr_topt_umq_rcridx;
+static int hf_lbmr_topt_umq_rcridx_type;
+static int hf_lbmr_topt_umq_rcridx_len;
+static int hf_lbmr_topt_umq_rcridx_flags;
+static int hf_lbmr_topt_umq_rcridx_flags_ignore;
+static int hf_lbmr_topt_umq_rcridx_rcr_idx;
+static int hf_lbmr_topt_umq_qinfo;
+static int hf_lbmr_topt_umq_qinfo_type;
+static int hf_lbmr_topt_umq_qinfo_len;
+static int hf_lbmr_topt_umq_qinfo_flags;
+static int hf_lbmr_topt_umq_qinfo_flags_ignore;
+static int hf_lbmr_topt_umq_qinfo_flags_queue;
+static int hf_lbmr_topt_umq_qinfo_flags_rcvlisten;
+static int hf_lbmr_topt_umq_qinfo_flags_control;
+static int hf_lbmr_topt_umq_qinfo_flags_srcrcvlisten;
+static int hf_lbmr_topt_umq_qinfo_flags_participants_only;
+static int hf_lbmr_topt_umq_qinfo_queue;
+static int hf_lbmr_topt_cost;
+static int hf_lbmr_topt_cost_type;
+static int hf_lbmr_topt_cost_len;
+static int hf_lbmr_topt_cost_flags;
+static int hf_lbmr_topt_cost_flags_ignore;
+static int hf_lbmr_topt_cost_hop_count;
+static int hf_lbmr_topt_cost_cost;
+static int hf_lbmr_topt_otid;
+static int hf_lbmr_topt_otid_type;
+static int hf_lbmr_topt_otid_len;
+static int hf_lbmr_topt_otid_flags;
+static int hf_lbmr_topt_otid_flags_ignore;
+static int hf_lbmr_topt_otid_originating_transport;
+static int hf_lbmr_topt_ctxinst;
+static int hf_lbmr_topt_ctxinst_type;
+static int hf_lbmr_topt_ctxinst_len;
+static int hf_lbmr_topt_ctxinst_flags;
+static int hf_lbmr_topt_ctxinst_flags_ignore;
+static int hf_lbmr_topt_ctxinst_res;
+static int hf_lbmr_topt_ctxinst_ctxinst;
+static int hf_lbmr_topt_ctxinsts;
+static int hf_lbmr_topt_ctxinsts_type;
+static int hf_lbmr_topt_ctxinsts_len;
+static int hf_lbmr_topt_ctxinsts_flags;
+static int hf_lbmr_topt_ctxinsts_flags_ignore;
+static int hf_lbmr_topt_ctxinsts_idx;
+static int hf_lbmr_topt_ctxinsts_ctxinst;
+static int hf_lbmr_topt_ulb;
+static int hf_lbmr_topt_ulb_type;
+static int hf_lbmr_topt_ulb_len;
+static int hf_lbmr_topt_ulb_flags;
+static int hf_lbmr_topt_ulb_flags_ignore;
+static int hf_lbmr_topt_ulb_queue_id;
+static int hf_lbmr_topt_ulb_regid;
+static int hf_lbmr_topt_ulb_ulb_src_id;
+static int hf_lbmr_topt_ulb_src_ip_addr;
+static int hf_lbmr_topt_ulb_src_tcp_port;
+static int hf_lbmr_topt_ulb_reserved;
+static int hf_lbmr_topt_ctxinstq;
+static int hf_lbmr_topt_ctxinstq_type;
+static int hf_lbmr_topt_ctxinstq_len;
+static int hf_lbmr_topt_ctxinstq_flags;
+static int hf_lbmr_topt_ctxinstq_flags_ignore;
+static int hf_lbmr_topt_ctxinstq_idx;
+static int hf_lbmr_topt_ctxinstq_ctxinst;
+static int hf_lbmr_topt_domain_id;
+static int hf_lbmr_topt_domain_id_type;
+static int hf_lbmr_topt_domain_id_len;
+static int hf_lbmr_topt_domain_id_flags;
+static int hf_lbmr_topt_domain_id_flags_ignore;
+static int hf_lbmr_topt_domain_id_domain_id;
+static int hf_lbmr_topt_exfunc;
+static int hf_lbmr_topt_exfunc_type;
+static int hf_lbmr_topt_exfunc_len;
+static int hf_lbmr_topt_exfunc_flags;
+static int hf_lbmr_topt_exfunc_flags_ignore;
+static int hf_lbmr_topt_exfunc_src_tcp_port;
+static int hf_lbmr_topt_exfunc_reserved;
+static int hf_lbmr_topt_exfunc_src_ip_addr;
+static int hf_lbmr_topt_exfunc_functionality_flags;
+static int hf_lbmr_topt_exfunc_functionality_flags_lj;
+static int hf_lbmr_topt_exfunc_functionality_flags_ume;
+static int hf_lbmr_topt_exfunc_functionality_flags_umq;
+static int hf_lbmr_topt_exfunc_functionality_flags_ulb;
+static int hf_lbmr_topt_unknown;
+static int hf_lbmr_topt_unknown_type;
+static int hf_lbmr_topt_unknown_len;
+static int hf_lbmr_topt_unknown_flags;
+static int hf_lbmr_topt_unknown_data;
+static int hf_lbmr_qqr;
+static int hf_lbmr_qqr_name;
+static int hf_lbmr_qirs;
+static int hf_lbmr_qir;
+static int hf_lbmr_qir_queue_name;
+static int hf_lbmr_qir_topic_name;
+static int hf_lbmr_qir_queue_id;
+static int hf_lbmr_qir_queue_ver;
+static int hf_lbmr_qir_queue_prev_ver;
+static int hf_lbmr_qir_option_flag;
+static int hf_lbmr_qir_grp_blks;
+static int hf_lbmr_qir_queue_blks;
+static int hf_lbmr_qir_grps;
+static int hf_lbmr_qir_grp_blk;
+static int hf_lbmr_qir_grp_blk_grp_idx;
+static int hf_lbmr_qir_grp_blk_grp_sz;
+static int hf_lbmr_qir_queues;
+static int hf_lbmr_qir_queue_blk;
+static int hf_lbmr_qir_queue_blk_ip;
+static int hf_lbmr_qir_queue_blk_port;
+static int hf_lbmr_qir_queue_blk_idx;
+static int hf_lbmr_qir_queue_blk_grp_idx;
+static int hf_lbmr_qir_queue_blk_reserved;
+static int hf_lbmr_tmb;
+static int hf_lbmr_tmb_len;
+static int hf_lbmr_tmb_tmrs;
+static int hf_lbmr_tmb_tmr_list;
+static int hf_lbmr_tmr;
+static int hf_lbmr_tmr_len;
+static int hf_lbmr_tmr_type;
+static int hf_lbmr_tmr_flags;
+static int hf_lbmr_tmr_flags_response;
+static int hf_lbmr_tmr_flags_wildcard_pcre;
+static int hf_lbmr_tmr_flags_wildcard_regex;
+static int hf_lbmr_tmr_name;
+static int hf_lbmr_pser_dep_type;
+static int hf_lbmr_pser_len;
+static int hf_lbmr_pser_flags;
+static int hf_lbmr_pser_flags_option;
+static int hf_lbmr_pser_source_ip;
+static int hf_lbmr_pser_store_ip;
+static int hf_lbmr_pser_transport_idx;
+static int hf_lbmr_pser_topic_idx;
+static int hf_lbmr_pser_source_port;
+static int hf_lbmr_pser_store_port;
+static int hf_lbmr_pser_topic;
+static int hf_lbmr_pser_opts;
+static int hf_lbmr_pser_optlen;
+static int hf_lbmr_pser_optlen_type;
+static int hf_lbmr_pser_optlen_optlen;
+static int hf_lbmr_pser_opt_ctxinst;
+static int hf_lbmr_pser_opt_ctxinst_len;
+static int hf_lbmr_pser_opt_ctxinst_type;
+static int hf_lbmr_pser_opt_ctxinst_ctxinst;
+static int hf_lbmr_opts;
+static int hf_lbmr_opt_len;
+static int hf_lbmr_opt_len_type;
+static int hf_lbmr_opt_len_len;
+static int hf_lbmr_opt_len_total_len;
+static int hf_lbmr_opt_src_id;
+static int hf_lbmr_opt_src_id_type;
+static int hf_lbmr_opt_src_id_len;
+static int hf_lbmr_opt_src_id_flags;
+static int hf_lbmr_opt_src_id_flags_ignore;
+static int hf_lbmr_opt_src_id_src_id;
+static int hf_lbmr_opt_src_type;
+static int hf_lbmr_opt_src_type_type;
+static int hf_lbmr_opt_src_type_len;
+static int hf_lbmr_opt_src_type_flags;
+static int hf_lbmr_opt_src_type_flags_ignore;
+static int hf_lbmr_opt_src_type_src_type;
+static int hf_lbmr_opt_version;
+static int hf_lbmr_opt_version_type;
+static int hf_lbmr_opt_version_len;
+static int hf_lbmr_opt_version_flags;
+static int hf_lbmr_opt_version_flags_ignore;
+static int hf_lbmr_opt_version_flags_ume;
+static int hf_lbmr_opt_version_flags_umq;
+static int hf_lbmr_opt_version_version;
+static int hf_lbmr_opt_local_domain;
+static int hf_lbmr_opt_local_domain_type;
+static int hf_lbmr_opt_local_domain_len;
+static int hf_lbmr_opt_local_domain_flags;
+static int hf_lbmr_opt_local_domain_flags_ignore;
+static int hf_lbmr_opt_local_domain_local_domain_id;
+static int hf_lbmr_opt_unknown;
+static int hf_lbmr_opt_unknown_type;
+static int hf_lbmr_opt_unknown_len;
+static int hf_lbmr_opt_unknown_flags;
+static int hf_lbmr_opt_unknown_data;
+static int hf_lbmr_topic_res_request_flags;
+static int hf_lbmr_topic_res_request_flags_gw_remote_interest;
+static int hf_lbmr_topic_res_request_flags_context_query;
+static int hf_lbmr_topic_res_request_flags_context_advertisement;
+static int hf_lbmr_topic_res_request_flags_gateway_meta;
+static int hf_lbmr_topic_res_request_flags_advertisement;
+static int hf_lbmr_topic_res_request_flags_query;
+static int hf_lbmr_topic_res_request_flags_wildcard_query;
+static int hf_lbmr_ctxinfo_len;
+static int hf_lbmr_ctxinfo_hop_count;
+static int hf_lbmr_ctxinfo_flags;
+static int hf_lbmr_ctxinfo_flags_query;
+static int hf_lbmr_ctxinfo_flags_ip;
+static int hf_lbmr_ctxinfo_flags_instance;
+static int hf_lbmr_ctxinfo_flags_tnwg_src;
+static int hf_lbmr_ctxinfo_flags_tnwg_rcv;
+static int hf_lbmr_ctxinfo_flags_proxy;
+static int hf_lbmr_ctxinfo_flags_name;
+static int hf_lbmr_ctxinfo_port;
+static int hf_lbmr_ctxinfo_ip;
+static int hf_lbmr_ctxinfo_instance;
+static int hf_lbmr_ctxinfo_name;
+static int hf_lbmr_tnwg_len;
+static int hf_lbmr_tnwg_type;
+static int hf_lbmr_tnwg_reserved;
+static int hf_lbmr_tnwg_interest;
+static int hf_lbmr_tnwg_interest_len;
+static int hf_lbmr_tnwg_interest_count;
+static int hf_lbmr_tnwg_interest_rec;
+static int hf_lbmr_tnwg_interest_rec_len;
+static int hf_lbmr_tnwg_interest_rec_flags;
+static int hf_lbmr_tnwg_interest_rec_flags_pattern;
+static int hf_lbmr_tnwg_interest_rec_flags_cancel;
+static int hf_lbmr_tnwg_interest_rec_flags_refresh;
+static int hf_lbmr_tnwg_interest_rec_pattype;
+static int hf_lbmr_tnwg_interest_rec_domain_id;
+static int hf_lbmr_tnwg_interest_rec_symbol;
+static int hf_lbmr_tnwg_ctxinfo;
+static int hf_lbmr_tnwg_ctxinfo_len;
+static int hf_lbmr_tnwg_ctxinfo_hop_count;
+static int hf_lbmr_tnwg_ctxinfo_reserved;
+static int hf_lbmr_tnwg_ctxinfo_flags1;
+static int hf_lbmr_tnwg_ctxinfo_flags1_query;
+static int hf_lbmr_tnwg_ctxinfo_flags1_tnwg_src;
+static int hf_lbmr_tnwg_ctxinfo_flags1_tnwg_rcv;
+static int hf_lbmr_tnwg_ctxinfo_flags1_proxy;
+static int hf_lbmr_tnwg_ctxinfo_flags2;
+static int hf_lbmr_tnwg_trreq;
+static int hf_lbmr_tnwg_trreq_len;
+static int hf_lbmr_tnwg_opt;
+static int hf_lbmr_tnwg_opt_type;
+static int hf_lbmr_tnwg_opt_len;
+static int hf_lbmr_tnwg_opt_flags;
+static int hf_lbmr_tnwg_opt_flags_ignore;
+static int hf_lbmr_tnwg_opt_data;
+static int hf_lbmr_tnwg_opt_ctxinst;
+static int hf_lbmr_tnwg_opt_ctxinst_type;
+static int hf_lbmr_tnwg_opt_ctxinst_len;
+static int hf_lbmr_tnwg_opt_ctxinst_flags;
+static int hf_lbmr_tnwg_opt_ctxinst_flags_ignore;
+static int hf_lbmr_tnwg_opt_ctxinst_instance;
+static int hf_lbmr_tnwg_opt_address;
+static int hf_lbmr_tnwg_opt_address_type;
+static int hf_lbmr_tnwg_opt_address_len;
+static int hf_lbmr_tnwg_opt_address_flags;
+static int hf_lbmr_tnwg_opt_address_flags_ignore;
+static int hf_lbmr_tnwg_opt_address_port;
+static int hf_lbmr_tnwg_opt_address_res;
+static int hf_lbmr_tnwg_opt_address_ip;
+static int hf_lbmr_tnwg_opt_domain;
+static int hf_lbmr_tnwg_opt_domain_type;
+static int hf_lbmr_tnwg_opt_domain_len;
+static int hf_lbmr_tnwg_opt_domain_flags;
+static int hf_lbmr_tnwg_opt_domain_flags_ignore;
+static int hf_lbmr_tnwg_opt_domain_domain_id;
+static int hf_lbmr_tnwg_opt_name;
+static int hf_lbmr_tnwg_opt_name_type;
+static int hf_lbmr_tnwg_opt_name_len;
+static int hf_lbmr_tnwg_opt_name_flags;
+static int hf_lbmr_tnwg_opt_name_flags_ignore;
+static int hf_lbmr_tnwg_opt_name_name;
+static int hf_lbmr_remote_domain_route_hdr_num_domains;
+static int hf_lbmr_remote_domain_route_hdr_ip;
+static int hf_lbmr_remote_domain_route_hdr_port;
+static int hf_lbmr_remote_domain_route_hdr_reserved;
+static int hf_lbmr_remote_domain_route_hdr_length;
+static int hf_lbmr_remote_domain_route_hdr_domain;
+static int hf_lbmr_rctxinfo_len;
+static int hf_lbmr_rctxinfo_num_recs;
+static int hf_lbmr_rctxinfo_reserved;
+static int hf_lbmr_rctxinfo_rec;
+static int hf_lbmr_rctxinfo_rec_len;
+static int hf_lbmr_rctxinfo_rec_flags;
+static int hf_lbmr_rctxinfo_rec_flags_query;
+static int hf_lbmr_rctxinfo_rec_address;
+static int hf_lbmr_rctxinfo_rec_address_type;
+static int hf_lbmr_rctxinfo_rec_address_len;
+static int hf_lbmr_rctxinfo_rec_address_flags;
+static int hf_lbmr_rctxinfo_rec_address_domain_id;
+static int hf_lbmr_rctxinfo_rec_address_ip;
+static int hf_lbmr_rctxinfo_rec_address_port;
+static int hf_lbmr_rctxinfo_rec_address_res;
+static int hf_lbmr_rctxinfo_rec_instance;
+static int hf_lbmr_rctxinfo_rec_instance_type;
+static int hf_lbmr_rctxinfo_rec_instance_len;
+static int hf_lbmr_rctxinfo_rec_instance_flags;
+static int hf_lbmr_rctxinfo_rec_instance_instance;
+static int hf_lbmr_rctxinfo_rec_odomain;
+static int hf_lbmr_rctxinfo_rec_odomain_type;
+static int hf_lbmr_rctxinfo_rec_odomain_len;
+static int hf_lbmr_rctxinfo_rec_odomain_flags;
+static int hf_lbmr_rctxinfo_rec_odomain_domain_id;
+static int hf_lbmr_rctxinfo_rec_name;
+static int hf_lbmr_rctxinfo_rec_name_type;
+static int hf_lbmr_rctxinfo_rec_name_len;
+static int hf_lbmr_rctxinfo_rec_name_flags;
+static int hf_lbmr_rctxinfo_rec_name_name;
+static int hf_lbmr_rctxinfo_rec_unknown;
+static int hf_lbmr_rctxinfo_rec_unknown_type;
+static int hf_lbmr_rctxinfo_rec_unknown_len;
+static int hf_lbmr_rctxinfo_rec_unknown_flags;
+static int hf_lbmr_rctxinfo_rec_unknown_data;
+static int hf_qmgmt_flags;
+static int hf_qmgmt_flags_i_flag;
+static int hf_qmgmt_flags_n_flag;
+static int hf_qmgmt_flags_il_l_flag;
+static int hf_qmgmt_flags_il_k_flag;
+static int hf_qmgmt_pckt_type;
+static int hf_qmgmt_cfgsig;
+static int hf_qmgmt_queue_id;
+static int hf_qmgmt_queue_ver;
+static int hf_qmgmt_ip;
+static int hf_qmgmt_port;
+static int hf_qmgmt_inst_idx;
+static int hf_qmgmt_grp_idx;
+static int hf_qmgmt_pckt_type_dep16;
+static int hf_qmgmt_il_num_insts;
+static int hf_qmgmt_jrej_code;
+static int hf_qmgmt_ev_bias;
+static int hf_qmgmt_il;
+static int hf_qmgmt_il_highest_rcr_tsp;
+static int hf_qmgmt_il_inst;
+static int hf_qmgmt_il_inst_ip;
+static int hf_qmgmt_il_inst_port;
+static int hf_qmgmt_il_inst_inst_idx;
+static int hf_qmgmt_il_inst_grp_idx;
+static int hf_qmgmt_il_inst_flags;
+static int hf_qmgmt_il_inst_flags_m_flag;
+static int hf_qmgmt_il_inst_flags_q_flag;
+static int hf_qmgmt_il_inst_flags_p_flag;
+static int hf_qmgmt_ec;
+static int hf_qmgmt_ec_queue_new_ver;
+static int hf_qmgmt_ev;
+static int hf_qmgmt_ev_highest_rcr_tsp;
+static int hf_qmgmt_ev_age;
+static int hf_qmgmt_qro;
+static int hf_qmgmt_qro_highest_rcr_tsp;
+static int hf_qmgmt_qname;
 
 /* Expert info handles */
-static expert_field ei_lbmr_analysis_length_incorrect = EI_INIT;
-static expert_field ei_lbmr_analysis_invalid_value = EI_INIT;
-static expert_field ei_lbmr_analysis_zero_len_option = EI_INIT;
+static expert_field ei_lbmr_analysis_length_incorrect;
+static expert_field ei_lbmr_analysis_invalid_value;
+static expert_field ei_lbmr_analysis_zero_len_option;
 
 
 /* Tap handles */
diff --git a/epan/dissectors/packet-lbmsrs.c b/epan/dissectors/packet-lbmsrs.c
index c2c1a69b86..a8213b032a 100644
--- a/epan/dissectors/packet-lbmsrs.c
+++ b/epan/dissectors/packet-lbmsrs.c
@@ -27,7 +27,7 @@
 
 
 
-static gint proto_lbmsrs = -1;
+static gint proto_lbmsrs;
 
 void proto_register_lbmsrs(void);
 void proto_reg_handoff_lbmsrs(void);
@@ -368,186 +368,186 @@ static const value_string lbmsrsApplicationType[] =
 };
 
 /* Dissector field handles */
-static gint hf_lbmsrs_message_id = -1;
+static gint hf_lbmsrs_message_id;
 
 /*handles for registration request*/
-static gint hf_lbmsrs_app_type = -1;
-static gint hf_lbmsrs_client_addr = -1;
-static gint hf_lbmsrs_client_port = -1;
-static gint hf_lbmsrs_session_id = -1;
-static gint hf_lbmsrs_host_id = -1;
-static gint hf_lbmsrs_protocol_version = -1;
-static gint hf_lbmsrs_interest_mode = -1;
-static gint hf_lbmsrs_req_local_domain_id = -1;
+static gint hf_lbmsrs_app_type;
+static gint hf_lbmsrs_client_addr;
+static gint hf_lbmsrs_client_port;
+static gint hf_lbmsrs_session_id;
+static gint hf_lbmsrs_host_id;
+static gint hf_lbmsrs_protocol_version;
+static gint hf_lbmsrs_interest_mode;
+static gint hf_lbmsrs_req_local_domain_id;
 
 /*handles for registration respose*/
-static gint hf_lbmsrs_client_id = -1;
-static gint hf_lbmsrs_resp_local_domain_id = -1;
-static gint hf_lbmsrs_reg_resp_protocol_version = -1;
+static gint hf_lbmsrs_client_id;
+static gint hf_lbmsrs_resp_local_domain_id;
+static gint hf_lbmsrs_reg_resp_protocol_version;
 
 /*handles for stream request*/
-static gint hf_lbmsrs_stream_req_unused = -1;
+static gint hf_lbmsrs_stream_req_unused;
 
 /*handles for source info*/
-static gint hf_lbmsrs_sir = -1;
-static gint hf_lbmsrs_sir_otid = -1;
-static gint hf_lbmsrs_sir_topic_len = -1;
-static gint hf_lbmsrs_sir_topic = -1;
-static gint hf_lbmsrs_sir_source_len = -1;
-static gint hf_lbmsrs_sir_source = -1;
-static gint hf_lbmsrs_sir_host_id = -1;
-static gint hf_lbmsrs_sir_topic_idx = -1;
-static gint hf_lbmsrs_sir_functionality_flags = -1;
-static gint hf_lbmsrs_sir_request_ip = -1;
-static gint hf_lbmsrs_sir_request_port = -1;
-static gint hf_lbmsrs_sir_domain_id = -1;
-static gint hf_lbmsrs_sir_encryption = -1;
-static gint hf_lbmsrs_sir_compression = -1;
-static gint hf_lbmsrs_sir_ulb_src_id = -1;
-static gint hf_lbmsrs_sir_ulb_queue_id = -1;
-static gint hf_lbmsrs_sir_ulb_reg_id = -1;
-static gint hf_lbmsrs_sir_context_instance = -1;
-static gint hf_lbmsrs_sir_context_type = -1;
-static gint hf_lbmsrs_sir_version = -1;
-static gint hf_lbmsrs_sir_version_flags = -1;
-static gint hf_lbmsrs_sir_ttl = -1;
-static gint hf_lbmsrs_sir_cost = -1;
+static gint hf_lbmsrs_sir;
+static gint hf_lbmsrs_sir_otid;
+static gint hf_lbmsrs_sir_topic_len;
+static gint hf_lbmsrs_sir_topic;
+static gint hf_lbmsrs_sir_source_len;
+static gint hf_lbmsrs_sir_source;
+static gint hf_lbmsrs_sir_host_id;
+static gint hf_lbmsrs_sir_topic_idx;
+static gint hf_lbmsrs_sir_functionality_flags;
+static gint hf_lbmsrs_sir_request_ip;
+static gint hf_lbmsrs_sir_request_port;
+static gint hf_lbmsrs_sir_domain_id;
+static gint hf_lbmsrs_sir_encryption;
+static gint hf_lbmsrs_sir_compression;
+static gint hf_lbmsrs_sir_ulb_src_id;
+static gint hf_lbmsrs_sir_ulb_queue_id;
+static gint hf_lbmsrs_sir_ulb_reg_id;
+static gint hf_lbmsrs_sir_context_instance;
+static gint hf_lbmsrs_sir_context_type;
+static gint hf_lbmsrs_sir_version;
+static gint hf_lbmsrs_sir_version_flags;
+static gint hf_lbmsrs_sir_ttl;
+static gint hf_lbmsrs_sir_cost;
 
 /*handles for source delete*/
-static gint hf_lbmsrs_sdr = -1;
-static gint hf_lbmsrs_sdr_otid = -1;
-static gint hf_lbmsrs_sdr_topic_len = -1;
-static gint hf_lbmsrs_sdr_topic = -1;
+static gint hf_lbmsrs_sdr;
+static gint hf_lbmsrs_sdr_otid;
+static gint hf_lbmsrs_sdr_topic_len;
+static gint hf_lbmsrs_sdr_topic;
 
 /*handles for receiver info*/
-static gint hf_lbmsrs_rir = -1;
-static gint hf_lbmsrs_rir_topic_len = -1;
-static gint hf_lbmsrs_rir_topic = -1;
-static gint hf_lbmsrs_rir_domain_id = -1;
-static gint hf_lbmsrs_rir_context_instance = -1;
-static gint hf_lbmsrs_rir_context_type = -1;
-static gint hf_lbmsrs_rir_version = -1;
-static gint hf_lbmsrs_rir_version_flags = -1;
-static gint hf_lbmsrs_rir_reserved = -1;
+static gint hf_lbmsrs_rir;
+static gint hf_lbmsrs_rir_topic_len;
+static gint hf_lbmsrs_rir_topic;
+static gint hf_lbmsrs_rir_domain_id;
+static gint hf_lbmsrs_rir_context_instance;
+static gint hf_lbmsrs_rir_context_type;
+static gint hf_lbmsrs_rir_version;
+static gint hf_lbmsrs_rir_version_flags;
+static gint hf_lbmsrs_rir_reserved;
 
 /*handles for receiver delete*/
-static gint hf_lbmsrs_rdr = -1;
-static gint hf_lbmsrs_rdr_topic_len = -1;
-static gint hf_lbmsrs_rdr_topic = -1;
-static gint hf_lbmsrs_rdr_domain_id = -1;
-static gint hf_lbmsrs_rdr_context_instance = -1;
-static gint hf_lbmsrs_rdr_context_type = -1;
-static gint hf_lbmsrs_rdr_version = -1;
-static gint hf_lbmsrs_rdr_version_flags = -1;
-static gint hf_lbmsrs_rdr_reserved = -1;
+static gint hf_lbmsrs_rdr;
+static gint hf_lbmsrs_rdr_topic_len;
+static gint hf_lbmsrs_rdr_topic;
+static gint hf_lbmsrs_rdr_domain_id;
+static gint hf_lbmsrs_rdr_context_instance;
+static gint hf_lbmsrs_rdr_context_type;
+static gint hf_lbmsrs_rdr_version;
+static gint hf_lbmsrs_rdr_version_flags;
+static gint hf_lbmsrs_rdr_reserved;
 
 /*handles for receiver end*/
-static gint hf_lbmsrs_rer = -1;
-static gint hf_lbmsrs_rer_topic_len = -1;
-static gint hf_lbmsrs_rer_topic = -1;
-static gint hf_lbmsrs_rer_domain_id = -1;
-static gint hf_lbmsrs_rer_context_instance = -1;
-static gint hf_lbmsrs_rer_context_type = -1;
-static gint hf_lbmsrs_rer_version = -1;
-static gint hf_lbmsrs_rer_version_flags = -1;
-static gint hf_lbmsrs_rer_reserved = -1;
+static gint hf_lbmsrs_rer;
+static gint hf_lbmsrs_rer_topic_len;
+static gint hf_lbmsrs_rer_topic;
+static gint hf_lbmsrs_rer_domain_id;
+static gint hf_lbmsrs_rer_context_instance;
+static gint hf_lbmsrs_rer_context_type;
+static gint hf_lbmsrs_rer_version;
+static gint hf_lbmsrs_rer_version_flags;
+static gint hf_lbmsrs_rer_reserved;
 
 /*handles for wildcard receiver info*/
-static gint hf_lbmsrs_wir = -1;
-static gint hf_lbmsrs_wir_pattern_len = -1;
-static gint hf_lbmsrs_wir_pattern = -1;
-static gint hf_lbmsrs_wir_domain_id = -1;
-static gint hf_lbmsrs_wir_context_instance = -1;
-static gint hf_lbmsrs_wir_context_type = -1;
-static gint hf_lbmsrs_wir_version = -1;
-static gint hf_lbmsrs_wir_version_flags = -1;
-static gint hf_lbmsrs_wir_reserved = -1;
+static gint hf_lbmsrs_wir;
+static gint hf_lbmsrs_wir_pattern_len;
+static gint hf_lbmsrs_wir_pattern;
+static gint hf_lbmsrs_wir_domain_id;
+static gint hf_lbmsrs_wir_context_instance;
+static gint hf_lbmsrs_wir_context_type;
+static gint hf_lbmsrs_wir_version;
+static gint hf_lbmsrs_wir_version_flags;
+static gint hf_lbmsrs_wir_reserved;
 
 /*handles for wildcard receiver delete*/
-static gint hf_lbmsrs_wdr = -1;
-static gint hf_lbmsrs_wdr_pattern_len = -1;
-static gint hf_lbmsrs_wdr_pattern = -1;
-static gint hf_lbmsrs_wdr_domain_id = -1;
-static gint hf_lbmsrs_wdr_context_instance = -1;
-static gint hf_lbmsrs_wdr_context_type = -1;
-static gint hf_lbmsrs_wdr_version = -1;
-static gint hf_lbmsrs_wdr_version_flags = -1;
-static gint hf_lbmsrs_wdr_reserved = -1;
+static gint hf_lbmsrs_wdr;
+static gint hf_lbmsrs_wdr_pattern_len;
+static gint hf_lbmsrs_wdr_pattern;
+static gint hf_lbmsrs_wdr_domain_id;
+static gint hf_lbmsrs_wdr_context_instance;
+static gint hf_lbmsrs_wdr_context_type;
+static gint hf_lbmsrs_wdr_version;
+static gint hf_lbmsrs_wdr_version_flags;
+static gint hf_lbmsrs_wdr_reserved;
 
 /*handles for wildcard receiver end*/
-static gint hf_lbmsrs_wer = -1;
-static gint hf_lbmsrs_wer_pattern_len = -1;
-static gint hf_lbmsrs_wer_pattern = -1;
-static gint hf_lbmsrs_wer_domain_id = -1;
-static gint hf_lbmsrs_wer_context_instance = -1;
-static gint hf_lbmsrs_wer_context_type = -1;
-static gint hf_lbmsrs_wer_version = -1;
-static gint hf_lbmsrs_wer_version_flags = -1;
-static gint hf_lbmsrs_wer_reserved = -1;
+static gint hf_lbmsrs_wer;
+static gint hf_lbmsrs_wer_pattern_len;
+static gint hf_lbmsrs_wer_pattern;
+static gint hf_lbmsrs_wer_domain_id;
+static gint hf_lbmsrs_wer_context_instance;
+static gint hf_lbmsrs_wer_context_type;
+static gint hf_lbmsrs_wer_version;
+static gint hf_lbmsrs_wer_version_flags;
+static gint hf_lbmsrs_wer_reserved;
 
 /*handles for src leave info*/
-static gint hf_lbmsrs_sli = -1;
-static gint hf_lbmsrs_sli_otid = -1;
-static gint hf_lbmsrs_sli_topic_len = -1;
-static gint hf_lbmsrs_sli_topic = -1;
-static gint hf_lbmsrs_sli_source_len = -1;
-static gint hf_lbmsrs_sli_source = -1;
-static gint hf_lbmsrs_sli_context_instance = -1;
-static gint hf_lbmsrs_sli_context_type = -1;
-static gint hf_lbmsrs_sli_version = -1;
-static gint hf_lbmsrs_sli_version_flags = -1;
-static gint hf_lbmsrs_sli_reserved = -1;
+static gint hf_lbmsrs_sli;
+static gint hf_lbmsrs_sli_otid;
+static gint hf_lbmsrs_sli_topic_len;
+static gint hf_lbmsrs_sli_topic;
+static gint hf_lbmsrs_sli_source_len;
+static gint hf_lbmsrs_sli_source;
+static gint hf_lbmsrs_sli_context_instance;
+static gint hf_lbmsrs_sli_context_type;
+static gint hf_lbmsrs_sli_version;
+static gint hf_lbmsrs_sli_version_flags;
+static gint hf_lbmsrs_sli_reserved;
 
 
 /*rsocket dissector field handles*/
-static gint hf_lbmsrs_rsocket_frame_len = -1;
-static gint hf_lbmsrs_rsocket_stream_id = -1;
-static gint hf_lbmsrs_rsocket_frame_type = -1;
-static gint hf_lbmsrs_rsocket_mdata_len = -1;
-static gint hf_lbmsrs_rsocket_mdata = -1;
-static gint hf_lbmsrs_rsocket_major_version = -1;
-static gint hf_lbmsrs_rsocket_minor_version = -1;
-static gint hf_lbmsrs_rsocket_keepalive_interval = -1;
-static gint hf_lbmsrs_rsocket_max_lifetime = -1;
-static gint hf_lbmsrs_rsocket_mdata_mime_length = -1;
-static gint hf_lbmsrs_rsocket_mdata_mime_type = -1;
-static gint hf_lbmsrs_rsocket_data_mime_length = -1;
-static gint hf_lbmsrs_rsocket_data_mime_type = -1;
-static gint hf_lbmsrs_rsocket_req_n = -1;
-static gint hf_lbmsrs_rsocket_error_code = -1;
-static gint hf_lbmsrs_rsocket_keepalive_last_rcvd_pos = -1;
-static gint hf_lbmsrs_rsocket_resume_token_len = -1;
-static gint hf_lbmsrs_rsocket_resume_token = -1;
+static gint hf_lbmsrs_rsocket_frame_len;
+static gint hf_lbmsrs_rsocket_stream_id;
+static gint hf_lbmsrs_rsocket_frame_type;
+static gint hf_lbmsrs_rsocket_mdata_len;
+static gint hf_lbmsrs_rsocket_mdata;
+static gint hf_lbmsrs_rsocket_major_version;
+static gint hf_lbmsrs_rsocket_minor_version;
+static gint hf_lbmsrs_rsocket_keepalive_interval;
+static gint hf_lbmsrs_rsocket_max_lifetime;
+static gint hf_lbmsrs_rsocket_mdata_mime_length;
+static gint hf_lbmsrs_rsocket_mdata_mime_type;
+static gint hf_lbmsrs_rsocket_data_mime_length;
+static gint hf_lbmsrs_rsocket_data_mime_type;
+static gint hf_lbmsrs_rsocket_req_n;
+static gint hf_lbmsrs_rsocket_error_code;
+static gint hf_lbmsrs_rsocket_keepalive_last_rcvd_pos;
+static gint hf_lbmsrs_rsocket_resume_token_len;
+static gint hf_lbmsrs_rsocket_resume_token;
 
 // other flags
-static gint hf_lbmsrs_rsocket_ignore_flag = -1;
-static gint hf_lbmsrs_rsocket_metadata_flag = -1;
-static gint hf_lbmsrs_rsocket_resume_flag = -1;
-static gint hf_lbmsrs_rsocket_lease_flag = -1;
-static gint hf_lbmsrs_rsocket_follows_flag = -1;
-static gint hf_lbmsrs_rsocket_complete_flag = -1;
-static gint hf_lbmsrs_rsocket_next_flag = -1;
-static gint hf_lbmsrs_rsocket_respond_flag = -1;
+static gint hf_lbmsrs_rsocket_ignore_flag;
+static gint hf_lbmsrs_rsocket_metadata_flag;
+static gint hf_lbmsrs_rsocket_resume_flag;
+static gint hf_lbmsrs_rsocket_lease_flag;
+static gint hf_lbmsrs_rsocket_follows_flag;
+static gint hf_lbmsrs_rsocket_complete_flag;
+static gint hf_lbmsrs_rsocket_next_flag;
+static gint hf_lbmsrs_rsocket_respond_flag;
 
 /*dissector tree handles*/
-static gint ett_lbmsrs = -1;
-static gint ett_lbmsrs_data = -1;
-static gint ett_lbmsrs_details = -1;
-static gint ett_lbmsrs_sir = -1;
-static gint ett_lbmsrs_sdr = -1;
-static gint ett_lbmsrs_ser = -1;
-static gint ett_lbmsrs_rir = -1;
-static gint ett_lbmsrs_rdr = -1;
-static gint ett_lbmsrs_rer = -1;
-static gint ett_lbmsrs_wir = -1;
-static gint ett_lbmsrs_wdr = -1;
-static gint ett_lbmsrs_wer = -1;
-static gint ett_lbmsrs_sli = -1;
-
-static gint ett_lbmsrs_rsocket_frame = -1;
+static gint ett_lbmsrs;
+static gint ett_lbmsrs_data;
+static gint ett_lbmsrs_details;
+static gint ett_lbmsrs_sir;
+static gint ett_lbmsrs_sdr;
+static gint ett_lbmsrs_ser;
+static gint ett_lbmsrs_rir;
+static gint ett_lbmsrs_rdr;
+static gint ett_lbmsrs_rer;
+static gint ett_lbmsrs_wir;
+static gint ett_lbmsrs_wdr;
+static gint ett_lbmsrs_wer;
+static gint ett_lbmsrs_sli;
+
+static gint ett_lbmsrs_rsocket_frame;
 
 /*Expert analysis fields*/
-static expert_field ei_lbmsrs_analysis_invalid_msg_id = EI_INIT;
+static expert_field ei_lbmsrs_analysis_invalid_msg_id;
 
 /* Dissector handle */
 static dissector_handle_t lbmsrs_dissector_handle;
diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c
index 633be10092..928dd91e67 100644
--- a/epan/dissectors/packet-lbtrm.c
+++ b/epan/dissectors/packet-lbtrm.c
@@ -27,7 +27,7 @@ void proto_register_lbtrm(void);
 void proto_reg_handoff_lbtrm(void);
 
 /* Protocol handle */
-static int proto_lbtrm = -1;
+static int proto_lbtrm;
 
 /* Dissector handle */
 static dissector_handle_t lbtrm_dissector_handle;
@@ -770,93 +770,93 @@ static char * lbtrm_tag_find(packet_info * pinfo)
 /*----------------------------------------------------------------------------*/
 
 /* Dissector tree handles */
-static gint ett_lbtrm = -1;
-static gint ett_lbtrm_hdr = -1;
-static gint ett_lbtrm_data = -1;
-static gint ett_lbtrm_data_flags_fec_type = -1;
-static gint ett_lbtrm_sm = -1;
-static gint ett_lbtrm_sm_flags_fec_type = -1;
-static gint ett_lbtrm_nak = -1;
-static gint ett_lbtrm_nak_list = -1;
-static gint ett_lbtrm_ncf = -1;
-static gint ett_lbtrm_ncf_list = -1;
-static gint ett_lbtrm_transport = -1;
-static gint ett_lbtrm_transport_sqn = -1;
+static gint ett_lbtrm;
+static gint ett_lbtrm_hdr;
+static gint ett_lbtrm_data;
+static gint ett_lbtrm_data_flags_fec_type;
+static gint ett_lbtrm_sm;
+static gint ett_lbtrm_sm_flags_fec_type;
+static gint ett_lbtrm_nak;
+static gint ett_lbtrm_nak_list;
+static gint ett_lbtrm_ncf;
+static gint ett_lbtrm_ncf_list;
+static gint ett_lbtrm_transport;
+static gint ett_lbtrm_transport_sqn;
 
 /* Dissector field handles */
-static int hf_lbtrm_channel = -1;
-static int hf_lbtrm_tag = -1;
-static int hf_lbtrm_hdr = -1;
-static int hf_lbtrm_hdr_ver = -1;
-static int hf_lbtrm_hdr_type = -1;
-static int hf_lbtrm_hdr_next_hdr = -1;
-static int hf_lbtrm_hdr_ucast_port = -1;
-static int hf_lbtrm_hdr_session_id = -1;
-static int hf_lbtrm_data = -1;
-static int hf_lbtrm_data_sqn = -1;
-static int hf_lbtrm_data_trail_sqn = -1;
-static int hf_lbtrm_data_flags_fec_type = -1;
-static int hf_lbtrm_data_flags_fec_type_ucast_naks = -1;
-static int hf_lbtrm_data_flags_fec_type_rx = -1;
-static int hf_lbtrm_data_flags_tgsz = -1;
-static int hf_lbtrm_data_fec_symbol = -1;
-static int hf_lbtrm_sm = -1;
-static int hf_lbtrm_sm_sm_sqn = -1;
-static int hf_lbtrm_sm_lead_sqn = -1;
-static int hf_lbtrm_sm_trail_sqn = -1;
-static int hf_lbtrm_sm_flags_fec_type = -1;
-static int hf_lbtrm_sm_flags_fec_type_ucast_naks = -1;
-static int hf_lbtrm_sm_flags_tgsz = -1;
-static int hf_lbtrm_sm_reserved = -1;
-static int hf_lbtrm_nak = -1;
-static int hf_lbtrm_nak_num_naks = -1;
-static int hf_lbtrm_nak_format = -1;
-static int hf_lbtrm_nak_list = -1;
-static int hf_lbtrm_nak_list_nak = -1;
-static int hf_lbtrm_ncf = -1;
-static int hf_lbtrm_ncf_trail_sqn = -1;
-static int hf_lbtrm_ncf_num_ncfs = -1;
-static int hf_lbtrm_ncf_reserved = -1;
-static int hf_lbtrm_ncf_reason = -1;
-static int hf_lbtrm_ncf_format = -1;
-static int hf_lbtrm_ncf_list = -1;
-static int hf_lbtrm_ncf_list_ncf = -1;
-static int hf_lbtrm_analysis = -1;
-static int hf_lbtrm_analysis_prev_frame = -1;
-static int hf_lbtrm_analysis_prev_data_frame = -1;
-static int hf_lbtrm_analysis_prev_sm_frame = -1;
-static int hf_lbtrm_analysis_prev_nak_frame = -1;
-static int hf_lbtrm_analysis_prev_ncf_frame = -1;
-static int hf_lbtrm_analysis_next_frame = -1;
-static int hf_lbtrm_analysis_next_data_frame = -1;
-static int hf_lbtrm_analysis_next_sm_frame = -1;
-static int hf_lbtrm_analysis_next_nak_frame = -1;
-static int hf_lbtrm_analysis_next_ncf_frame = -1;
-static int hf_lbtrm_analysis_sqn = -1;
-static int hf_lbtrm_analysis_sqn_frame = -1;
-static int hf_lbtrm_analysis_data_retransmission = -1;
-static int hf_lbtrm_analysis_data_sqn_gap = -1;
-static int hf_lbtrm_analysis_data_ooo_gap = -1;
-static int hf_lbtrm_analysis_data_duplicate = -1;
-static int hf_lbtrm_analysis_sm_sqn_gap = -1;
-static int hf_lbtrm_analysis_sm_ooo_gap = -1;
-static int hf_lbtrm_analysis_sm_duplicate = -1;
+static int hf_lbtrm_channel;
+static int hf_lbtrm_tag;
+static int hf_lbtrm_hdr;
+static int hf_lbtrm_hdr_ver;
+static int hf_lbtrm_hdr_type;
+static int hf_lbtrm_hdr_next_hdr;
+static int hf_lbtrm_hdr_ucast_port;
+static int hf_lbtrm_hdr_session_id;
+static int hf_lbtrm_data;
+static int hf_lbtrm_data_sqn;
+static int hf_lbtrm_data_trail_sqn;
+static int hf_lbtrm_data_flags_fec_type;
+static int hf_lbtrm_data_flags_fec_type_ucast_naks;
+static int hf_lbtrm_data_flags_fec_type_rx;
+static int hf_lbtrm_data_flags_tgsz;
+static int hf_lbtrm_data_fec_symbol;
+static int hf_lbtrm_sm;
+static int hf_lbtrm_sm_sm_sqn;
+static int hf_lbtrm_sm_lead_sqn;
+static int hf_lbtrm_sm_trail_sqn;
+static int hf_lbtrm_sm_flags_fec_type;
+static int hf_lbtrm_sm_flags_fec_type_ucast_naks;
+static int hf_lbtrm_sm_flags_tgsz;
+static int hf_lbtrm_sm_reserved;
+static int hf_lbtrm_nak;
+static int hf_lbtrm_nak_num_naks;
+static int hf_lbtrm_nak_format;
+static int hf_lbtrm_nak_list;
+static int hf_lbtrm_nak_list_nak;
+static int hf_lbtrm_ncf;
+static int hf_lbtrm_ncf_trail_sqn;
+static int hf_lbtrm_ncf_num_ncfs;
+static int hf_lbtrm_ncf_reserved;
+static int hf_lbtrm_ncf_reason;
+static int hf_lbtrm_ncf_format;
+static int hf_lbtrm_ncf_list;
+static int hf_lbtrm_ncf_list_ncf;
+static int hf_lbtrm_analysis;
+static int hf_lbtrm_analysis_prev_frame;
+static int hf_lbtrm_analysis_prev_data_frame;
+static int hf_lbtrm_analysis_prev_sm_frame;
+static int hf_lbtrm_analysis_prev_nak_frame;
+static int hf_lbtrm_analysis_prev_ncf_frame;
+static int hf_lbtrm_analysis_next_frame;
+static int hf_lbtrm_analysis_next_data_frame;
+static int hf_lbtrm_analysis_next_sm_frame;
+static int hf_lbtrm_analysis_next_nak_frame;
+static int hf_lbtrm_analysis_next_ncf_frame;
+static int hf_lbtrm_analysis_sqn;
+static int hf_lbtrm_analysis_sqn_frame;
+static int hf_lbtrm_analysis_data_retransmission;
+static int hf_lbtrm_analysis_data_sqn_gap;
+static int hf_lbtrm_analysis_data_ooo_gap;
+static int hf_lbtrm_analysis_data_duplicate;
+static int hf_lbtrm_analysis_sm_sqn_gap;
+static int hf_lbtrm_analysis_sm_ooo_gap;
+static int hf_lbtrm_analysis_sm_duplicate;
 
 /* Expert info handles */
-static expert_field ei_lbtrm_analysis_ncf = EI_INIT;
-static expert_field ei_lbtrm_analysis_ncf_ncf = EI_INIT;
-static expert_field ei_lbtrm_analysis_nak = EI_INIT;
-static expert_field ei_lbtrm_analysis_nak_nak = EI_INIT;
-static expert_field ei_lbtrm_analysis_sm = EI_INIT;
-static expert_field ei_lbtrm_analysis_rx = EI_INIT;
-static expert_field ei_lbtrm_analysis_invalid_value = EI_INIT;
-static expert_field ei_lbtrm_analysis_data_rx = EI_INIT;
-static expert_field ei_lbtrm_analysis_data_gap = EI_INIT;
-static expert_field ei_lbtrm_analysis_data_ooo = EI_INIT;
-static expert_field ei_lbtrm_analysis_data_dup = EI_INIT;
-static expert_field ei_lbtrm_analysis_sm_gap = EI_INIT;
-static expert_field ei_lbtrm_analysis_sm_ooo = EI_INIT;
-static expert_field ei_lbtrm_analysis_sm_dup = EI_INIT;
+static expert_field ei_lbtrm_analysis_ncf;
+static expert_field ei_lbtrm_analysis_ncf_ncf;
+static expert_field ei_lbtrm_analysis_nak;
+static expert_field ei_lbtrm_analysis_nak_nak;
+static expert_field ei_lbtrm_analysis_sm;
+static expert_field ei_lbtrm_analysis_rx;
+static expert_field ei_lbtrm_analysis_invalid_value;
+static expert_field ei_lbtrm_analysis_data_rx;
+static expert_field ei_lbtrm_analysis_data_gap;
+static expert_field ei_lbtrm_analysis_data_ooo;
+static expert_field ei_lbtrm_analysis_data_dup;
+static expert_field ei_lbtrm_analysis_sm_gap;
+static expert_field ei_lbtrm_analysis_sm_ooo;
+static expert_field ei_lbtrm_analysis_sm_dup;
 
 /*----------------------------------------------------------------------------*/
 /* LBT-RM data payload dissection functions.                                  */
diff --git a/epan/dissectors/packet-lbtru.c b/epan/dissectors/packet-lbtru.c
index 6d80669044..4ca9f5cb63 100644
--- a/epan/dissectors/packet-lbtru.c
+++ b/epan/dissectors/packet-lbtru.c
@@ -25,7 +25,7 @@ void proto_register_lbtru(void);
 void proto_reg_handoff_lbtru(void);
 
 /* Protocol handle */
-static int proto_lbtru = -1;
+static int proto_lbtru;
 
 /* Dissector handle */
 static dissector_handle_t lbtru_dissector_handle;
@@ -762,122 +762,122 @@ static char * lbtru_tag_find(packet_info * pinfo)
 /*----------------------------------------------------------------------------*/
 
 /* Dissector tree handles */
-static gint ett_lbtru = -1;
-static gint ett_lbtru_channel = -1;
-static gint ett_lbtru_hdr = -1;
-static gint ett_lbtru_hdr_flags = -1;
-static gint ett_lbtru_data = -1;
-static gint ett_lbtru_sm = -1;
-static gint ett_lbtru_nak = -1;
-static gint ett_lbtru_nak_list = -1;
-static gint ett_lbtru_ncf = -1;
-static gint ett_lbtru_ncf_list = -1;
-static gint ett_lbtru_ack = -1;
-static gint ett_lbtru_opt = -1;
-static gint ett_lbtru_opt_sid_flags = -1;
-static gint ett_lbtru_opt_cid_flags = -1;
-static gint ett_lbtru_transport = -1;
-static gint ett_lbtru_transport_sqn = -1;
+static gint ett_lbtru;
+static gint ett_lbtru_channel;
+static gint ett_lbtru_hdr;
+static gint ett_lbtru_hdr_flags;
+static gint ett_lbtru_data;
+static gint ett_lbtru_sm;
+static gint ett_lbtru_nak;
+static gint ett_lbtru_nak_list;
+static gint ett_lbtru_ncf;
+static gint ett_lbtru_ncf_list;
+static gint ett_lbtru_ack;
+static gint ett_lbtru_opt;
+static gint ett_lbtru_opt_sid_flags;
+static gint ett_lbtru_opt_cid_flags;
+static gint ett_lbtru_transport;
+static gint ett_lbtru_transport_sqn;
 
 /* Dissector field handles */
-static int hf_lbtru_channel = -1;
-static int hf_lbtru_channel_id = -1;
-static int hf_lbtru_channel_client = -1;
-static int hf_lbtru_tag = -1;
-static int hf_lbtru_hdr = -1;
-static int hf_lbtru_hdr_ver = -1;
-static int hf_lbtru_hdr_type = -1;
-static int hf_lbtru_hdr_next_hdr = -1;
-static int hf_lbtru_hdr_res = -1;
-static int hf_lbtru_hdr_flags = -1;
-static int hf_lbtru_hdr_flags_syn = -1;
-static int hf_lbtru_hdr_flags_rx = -1;
-static int hf_lbtru_hdr_request = -1;
-static int hf_lbtru_hdr_reason = -1;
-static int hf_lbtru_data = -1;
-static int hf_lbtru_data_sqn = -1;
-static int hf_lbtru_data_trail_sqn = -1;
-static int hf_lbtru_sm = -1;
-static int hf_lbtru_sm_sqn = -1;
-static int hf_lbtru_sm_lead_sqn = -1;
-static int hf_lbtru_sm_trail_sqn = -1;
-static int hf_lbtru_nak = -1;
-static int hf_lbtru_nak_num = -1;
-static int hf_lbtru_nak_format = -1;
-static int hf_lbtru_nak_list = -1;
-static int hf_lbtru_nak_list_nak = -1;
-static int hf_lbtru_ncf = -1;
-static int hf_lbtru_ncf_trail_sqn = -1;
-static int hf_lbtru_ncf_num = -1;
-static int hf_lbtru_ncf_reserved = -1;
-static int hf_lbtru_ncf_reason = -1;
-static int hf_lbtru_ncf_format = -1;
-static int hf_lbtru_ncf_list = -1;
-static int hf_lbtru_ncf_list_ncf = -1;
-static int hf_lbtru_ack = -1;
-static int hf_lbtru_ack_sqn = -1;
-static int hf_lbtru_opt_sid = -1;
-static int hf_lbtru_opt_sid_next_hdr = -1;
-static int hf_lbtru_opt_sid_hdr_len = -1;
-static int hf_lbtru_opt_sid_flags = -1;
-static int hf_lbtru_opt_sid_flags_ignore = -1;
-static int hf_lbtru_opt_sid_session_id = -1;
-static int hf_lbtru_opt_cid = -1;
-static int hf_lbtru_opt_cid_next_hdr = -1;
-static int hf_lbtru_opt_cid_hdr_len = -1;
-static int hf_lbtru_opt_cid_flags = -1;
-static int hf_lbtru_opt_cid_flags_ignore = -1;
-static int hf_lbtru_opt_cid_client_id = -1;
-static int hf_lbtru_opt_unknown = -1;
-static int hf_lbtru_opt_unknown_next_hdr = -1;
-static int hf_lbtru_opt_unknown_hdr_len = -1;
-static int hf_lbtru_analysis = -1;
-static int hf_lbtru_analysis_prev_frame = -1;
-static int hf_lbtru_analysis_prev_data_frame = -1;
-static int hf_lbtru_analysis_prev_sm_frame = -1;
-static int hf_lbtru_analysis_prev_nak_frame = -1;
-static int hf_lbtru_analysis_prev_ncf_frame = -1;
-static int hf_lbtru_analysis_prev_ack_frame = -1;
-static int hf_lbtru_analysis_prev_creq_frame = -1;
-static int hf_lbtru_analysis_prev_rst_frame = -1;
-static int hf_lbtru_analysis_next_frame = -1;
-static int hf_lbtru_analysis_next_data_frame = -1;
-static int hf_lbtru_analysis_next_sm_frame = -1;
-static int hf_lbtru_analysis_next_nak_frame = -1;
-static int hf_lbtru_analysis_next_ncf_frame = -1;
-static int hf_lbtru_analysis_next_ack_frame = -1;
-static int hf_lbtru_analysis_next_creq_frame = -1;
-static int hf_lbtru_analysis_next_rst_frame = -1;
-static int hf_lbtru_analysis_sqn = -1;
-static int hf_lbtru_analysis_sqn_frame = -1;
-static int hf_lbtru_analysis_data_retransmission = -1;
-static int hf_lbtru_analysis_data_sqn_gap = -1;
-static int hf_lbtru_analysis_data_ooo_gap = -1;
-static int hf_lbtru_analysis_data_duplicate = -1;
-static int hf_lbtru_analysis_sm_sqn_gap = -1;
-static int hf_lbtru_analysis_sm_ooo_gap = -1;
-static int hf_lbtru_analysis_sm_duplicate = -1;
+static int hf_lbtru_channel;
+static int hf_lbtru_channel_id;
+static int hf_lbtru_channel_client;
+static int hf_lbtru_tag;
+static int hf_lbtru_hdr;
+static int hf_lbtru_hdr_ver;
+static int hf_lbtru_hdr_type;
+static int hf_lbtru_hdr_next_hdr;
+static int hf_lbtru_hdr_res;
+static int hf_lbtru_hdr_flags;
+static int hf_lbtru_hdr_flags_syn;
+static int hf_lbtru_hdr_flags_rx;
+static int hf_lbtru_hdr_request;
+static int hf_lbtru_hdr_reason;
+static int hf_lbtru_data;
+static int hf_lbtru_data_sqn;
+static int hf_lbtru_data_trail_sqn;
+static int hf_lbtru_sm;
+static int hf_lbtru_sm_sqn;
+static int hf_lbtru_sm_lead_sqn;
+static int hf_lbtru_sm_trail_sqn;
+static int hf_lbtru_nak;
+static int hf_lbtru_nak_num;
+static int hf_lbtru_nak_format;
+static int hf_lbtru_nak_list;
+static int hf_lbtru_nak_list_nak;
+static int hf_lbtru_ncf;
+static int hf_lbtru_ncf_trail_sqn;
+static int hf_lbtru_ncf_num;
+static int hf_lbtru_ncf_reserved;
+static int hf_lbtru_ncf_reason;
+static int hf_lbtru_ncf_format;
+static int hf_lbtru_ncf_list;
+static int hf_lbtru_ncf_list_ncf;
+static int hf_lbtru_ack;
+static int hf_lbtru_ack_sqn;
+static int hf_lbtru_opt_sid;
+static int hf_lbtru_opt_sid_next_hdr;
+static int hf_lbtru_opt_sid_hdr_len;
+static int hf_lbtru_opt_sid_flags;
+static int hf_lbtru_opt_sid_flags_ignore;
+static int hf_lbtru_opt_sid_session_id;
+static int hf_lbtru_opt_cid;
+static int hf_lbtru_opt_cid_next_hdr;
+static int hf_lbtru_opt_cid_hdr_len;
+static int hf_lbtru_opt_cid_flags;
+static int hf_lbtru_opt_cid_flags_ignore;
+static int hf_lbtru_opt_cid_client_id;
+static int hf_lbtru_opt_unknown;
+static int hf_lbtru_opt_unknown_next_hdr;
+static int hf_lbtru_opt_unknown_hdr_len;
+static int hf_lbtru_analysis;
+static int hf_lbtru_analysis_prev_frame;
+static int hf_lbtru_analysis_prev_data_frame;
+static int hf_lbtru_analysis_prev_sm_frame;
+static int hf_lbtru_analysis_prev_nak_frame;
+static int hf_lbtru_analysis_prev_ncf_frame;
+static int hf_lbtru_analysis_prev_ack_frame;
+static int hf_lbtru_analysis_prev_creq_frame;
+static int hf_lbtru_analysis_prev_rst_frame;
+static int hf_lbtru_analysis_next_frame;
+static int hf_lbtru_analysis_next_data_frame;
+static int hf_lbtru_analysis_next_sm_frame;
+static int hf_lbtru_analysis_next_nak_frame;
+static int hf_lbtru_analysis_next_ncf_frame;
+static int hf_lbtru_analysis_next_ack_frame;
+static int hf_lbtru_analysis_next_creq_frame;
+static int hf_lbtru_analysis_next_rst_frame;
+static int hf_lbtru_analysis_sqn;
+static int hf_lbtru_analysis_sqn_frame;
+static int hf_lbtru_analysis_data_retransmission;
+static int hf_lbtru_analysis_data_sqn_gap;
+static int hf_lbtru_analysis_data_ooo_gap;
+static int hf_lbtru_analysis_data_duplicate;
+static int hf_lbtru_analysis_sm_sqn_gap;
+static int hf_lbtru_analysis_sm_ooo_gap;
+static int hf_lbtru_analysis_sm_duplicate;
 
 /* Expert info handles */
-static expert_field ei_lbtru_analysis_unknown_type = EI_INIT;
-static expert_field ei_lbtru_analysis_unknown_header = EI_INIT;
-static expert_field ei_lbtru_analysis_zero_length_header = EI_INIT;
-static expert_field ei_lbtru_analysis_ack = EI_INIT;
-static expert_field ei_lbtru_analysis_ncf = EI_INIT;
-static expert_field ei_lbtru_analysis_ncf_ncf = EI_INIT;
-static expert_field ei_lbtru_analysis_nak = EI_INIT;
-static expert_field ei_lbtru_analysis_nak_nak = EI_INIT;
-static expert_field ei_lbtru_analysis_sm = EI_INIT;
-static expert_field ei_lbtru_analysis_sm_syn = EI_INIT;
-static expert_field ei_lbtru_analysis_creq = EI_INIT;
-static expert_field ei_lbtru_analysis_rst = EI_INIT;
-static expert_field ei_lbtru_analysis_data_rx = EI_INIT;
-static expert_field ei_lbtru_analysis_data_gap = EI_INIT;
-static expert_field ei_lbtru_analysis_data_ooo = EI_INIT;
-static expert_field ei_lbtru_analysis_data_dup = EI_INIT;
-static expert_field ei_lbtru_analysis_sm_gap = EI_INIT;
-static expert_field ei_lbtru_analysis_sm_ooo = EI_INIT;
-static expert_field ei_lbtru_analysis_sm_dup = EI_INIT;
+static expert_field ei_lbtru_analysis_unknown_type;
+static expert_field ei_lbtru_analysis_unknown_header;
+static expert_field ei_lbtru_analysis_zero_length_header;
+static expert_field ei_lbtru_analysis_ack;
+static expert_field ei_lbtru_analysis_ncf;
+static expert_field ei_lbtru_analysis_ncf_ncf;
+static expert_field ei_lbtru_analysis_nak;
+static expert_field ei_lbtru_analysis_nak_nak;
+static expert_field ei_lbtru_analysis_sm;
+static expert_field ei_lbtru_analysis_sm_syn;
+static expert_field ei_lbtru_analysis_creq;
+static expert_field ei_lbtru_analysis_rst;
+static expert_field ei_lbtru_analysis_data_rx;
+static expert_field ei_lbtru_analysis_data_gap;
+static expert_field ei_lbtru_analysis_data_ooo;
+static expert_field ei_lbtru_analysis_data_dup;
+static expert_field ei_lbtru_analysis_sm_gap;
+static expert_field ei_lbtru_analysis_sm_ooo;
+static expert_field ei_lbtru_analysis_sm_dup;
 
 /*----------------------------------------------------------------------------*/
 /* LBT-RU data payload dissection functions.                                  */
diff --git a/epan/dissectors/packet-lbttcp.c b/epan/dissectors/packet-lbttcp.c
index 41e4b9e70f..c21c45a6de 100644
--- a/epan/dissectors/packet-lbttcp.c
+++ b/epan/dissectors/packet-lbttcp.c
@@ -24,7 +24,7 @@ void proto_register_lbttcp(void);
 void proto_reg_handoff_lbttcp(void);
 
 /* Protocol handle */
-static int proto_lbttcp = -1;
+static int proto_lbttcp;
 
 /* Dissector handle */
 static dissector_handle_t lbttcp_dissector_handle;
@@ -409,14 +409,14 @@ static char * lbttcp_tag_find(packet_info * pinfo)
 /*----------------------------------------------------------------------------*/
 
 /* Dissector tree handles */
-static gint ett_lbttcp = -1;
-static gint ett_lbttcp_channel = -1;
+static gint ett_lbttcp;
+static gint ett_lbttcp_channel;
 
 /* Dissector field handles */
-static int hf_lbttcp_tag = -1;
-static int hf_lbttcp_channel = -1;
-static int hf_lbttcp_channel_id = -1;
-static int hf_lbttcp_channel_client = -1;
+static int hf_lbttcp_tag;
+static int hf_lbttcp_channel;
+static int hf_lbttcp_channel_id;
+static int hf_lbttcp_channel_client;
 
 static gboolean lbttcp_packet_is_transport_source(packet_info * pinfo, const lbttcp_tag_entry_t * tag)
 {
diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c
index 33842330f9..ef5402656f 100644
--- a/epan/dissectors/packet-ldp.c
+++ b/epan/dissectors/packet-ldp.c
@@ -47,295 +47,295 @@ void proto_reg_handoff_ldp(void);
 
 static dissector_handle_t ldp_tcp_handle, ldp_handle;
 
-static int proto_ldp = -1;
+static int proto_ldp;
 
 /* Delete the following if you do not use it, or add to it if you need */
-/* static int hf_ldp_req = -1; */
-/* static int hf_ldp_rsp = -1; */
-static int hf_ldp_version = -1;
-static int hf_ldp_pdu_len = -1;
-static int hf_ldp_lsr = -1;
-static int hf_ldp_ls_id = -1;
-static int hf_ldp_msg_ubit = -1;
-static int hf_ldp_msg_type = -1;
-static int hf_ldp_msg_len = -1;
-static int hf_ldp_msg_id = -1;
-static int hf_ldp_msg_vendor_id = -1;
-static int hf_ldp_msg_experiment_id = -1;
-static int hf_ldp_tlv_value = -1;
-static int hf_ldp_tlv_type = -1;
-static int hf_ldp_tlv_unknown = -1;
-static int hf_ldp_tlv_len = -1;
-static int hf_ldp_tlv_val_hold = -1;
-static int hf_ldp_tlv_val_target = -1;
-static int hf_ldp_tlv_val_request = -1;
-static int hf_ldp_tlv_val_res = -1;
-static int hf_ldp_tlv_val_gtsm_flag = -1;
-static int hf_ldp_tlv_ipv4_taddr = -1;
-static int hf_ldp_tlv_config_seqno = -1;
-static int hf_ldp_tlv_ipv6_taddr = -1;
-static int hf_ldp_tlv_fec_wc = -1;
-static int hf_ldp_tlv_fec_af = -1;
-static int hf_ldp_tlv_fec_len = -1;
-static int hf_ldp_tlv_fec_pfval = -1;
-static int hf_ldp_tlv_fec_hoval = -1;
-static int hf_ldp_tlv_addrl_addr_family = -1;
-static int hf_ldp_tlv_addrl_addr = -1;
-static int hf_ldp_tlv_hc_value = -1;
-static int hf_ldp_tlv_pv_lsrid = -1;
-static int hf_ldp_tlv_generic_label = -1;
-static int hf_ldp_tlv_atm_label_vbits = -1;
-static int hf_ldp_tlv_atm_label_vpi = -1;
-static int hf_ldp_tlv_atm_label_vci = -1;
-static int hf_ldp_tlv_fr_label_len = -1;
-static int hf_ldp_tlv_fr_label_dlci = -1;
-static int hf_ldp_tlv_ft_protect_sequence_num = -1;
-static int hf_ldp_tlv_status_ebit = -1;
-static int hf_ldp_tlv_status_fbit = -1;
-static int hf_ldp_tlv_status_data = -1;
-static int hf_ldp_tlv_status_msg_id = -1;
-static int hf_ldp_tlv_status_msg_type = -1;
-static int hf_ldp_tlv_extstatus_data = -1;
-static int hf_ldp_tlv_returned_version = -1;
-static int hf_ldp_tlv_returned_pdu_len = -1;
-static int hf_ldp_tlv_returned_lsr = -1;
-static int hf_ldp_tlv_returned_ls_id = -1;
-static int hf_ldp_tlv_returned_msg_ubit = -1;
-static int hf_ldp_tlv_returned_msg_type = -1;
-static int hf_ldp_tlv_returned_msg_len = -1;
-static int hf_ldp_tlv_returned_msg_id = -1;
-static int hf_ldp_tlv_mac = -1;
-static int hf_ldp_tlv_sess_ver = -1;
-static int hf_ldp_tlv_sess_ka = -1;
-static int hf_ldp_tlv_sess_advbit = -1;
-static int hf_ldp_tlv_sess_ldetbit = -1;
-static int hf_ldp_tlv_sess_pvlim = -1;
-static int hf_ldp_tlv_sess_mxpdu = -1;
-static int hf_ldp_tlv_sess_rxlsr = -1;
-static int hf_ldp_tlv_sess_rxls = -1;
-static int hf_ldp_tlv_sess_atm_merge = -1;
-static int hf_ldp_tlv_sess_atm_lr = -1;
-static int hf_ldp_tlv_sess_atm_dir = -1;
-static int hf_ldp_tlv_sess_atm_minvpi = -1;
-static int hf_ldp_tlv_sess_atm_maxvpi = -1;
-static int hf_ldp_tlv_sess_atm_minvci = -1;
-static int hf_ldp_tlv_sess_atm_maxvci = -1;
-static int hf_ldp_tlv_sess_fr_merge = -1;
-static int hf_ldp_tlv_sess_fr_lr = -1;
-static int hf_ldp_tlv_sess_fr_dir = -1;
-static int hf_ldp_tlv_sess_fr_len = -1;
-static int hf_ldp_tlv_sess_fr_mindlci = -1;
-static int hf_ldp_tlv_sess_fr_maxdlci = -1;
-static int hf_ldp_tlv_ft_sess_flags = -1;
-static int hf_ldp_tlv_ft_sess_flag_r = -1;
-static int hf_ldp_tlv_ft_sess_flag_res = -1;
-static int hf_ldp_tlv_ft_sess_flag_s = -1;
-static int hf_ldp_tlv_ft_sess_flag_a = -1;
-static int hf_ldp_tlv_ft_sess_flag_c = -1;
-static int hf_ldp_tlv_ft_sess_flag_l = -1;
-static int hf_ldp_tlv_ft_sess_res = -1;
-static int hf_ldp_tlv_ft_sess_reconn_to = -1;
-static int hf_ldp_tlv_ft_sess_recovery_time = -1;
-static int hf_ldp_tlv_ft_ack_sequence_num = -1;
-static int hf_ldp_tlv_lbl_req_msg_id = -1;
-static int hf_ldp_tlv_vendor_id = -1;
-static int hf_ldp_tlv_experiment_id = -1;
-static int hf_ldp_tlv_fec_vc_controlword = -1;
-static int hf_ldp_tlv_fec_vc_vctype = -1;
-static int hf_ldp_tlv_fec_vc_infolength = -1;
-static int hf_ldp_tlv_fec_vc_groupid = -1;
-static int hf_ldp_tlv_fec_vc_vcid = -1;
-static int hf_ldp_tlv_fec_vc_intparam_length = -1;
-static int hf_ldp_tlv_fec_vc_intparam_mtu = -1;
-static int hf_ldp_tlv_fec_vc_intparam_tdmbps = -1;
-static int hf_ldp_tlv_fec_vc_intparam_id = -1;
-static int hf_ldp_tlv_fec_vc_intparam_maxcatmcells = -1;
-static int hf_ldp_tlv_fec_vc_intparam_desc = -1;
-static int hf_ldp_tlv_fec_vc_intparam_cepbytes = -1;
-static int hf_ldp_tlv_fec_vc_intparam_cepopt_ais = -1;
-static int hf_ldp_tlv_fec_vc_intparam_cepopt_une = -1;
-static int hf_ldp_tlv_fec_vc_intparam_cepopt_rtp = -1;
-static int hf_ldp_tlv_fec_vc_intparam_cepopt_ebm = -1;
-static int hf_ldp_tlv_fec_vc_intparam_cepopt_mah = -1;
-static int hf_ldp_tlv_fec_vc_intparam_cepopt_res = -1;
-static int hf_ldp_tlv_fec_vc_intparam_cepopt_ceptype = -1;
-static int hf_ldp_tlv_fec_vc_intparam_cepopt_t3 = -1;
-static int hf_ldp_tlv_fec_vc_intparam_cepopt_e3 = -1;
-static int hf_ldp_tlv_fec_vc_intparam_vlanid = -1;
-static int hf_ldp_tlv_fec_vc_intparam_dlcilen = -1;
-static int hf_ldp_tlv_fec_vc_intparam_fcslen = -1;
-static int hf_ldp_tlv_fec_vc_intparam_tdmopt_r = -1;
-static int hf_ldp_tlv_fec_vc_intparam_tdmopt_d = -1;
-static int hf_ldp_tlv_fec_vc_intparam_tdmopt_f = -1;
-static int hf_ldp_tlv_fec_vc_intparam_tdmopt_res1 = -1;
-static int hf_ldp_tlv_fec_vc_intparam_tdmopt_pt = -1;
-static int hf_ldp_tlv_fec_vc_intparam_tdmopt_res2 = -1;
-static int hf_ldp_tlv_fec_vc_intparam_tdmopt_freq = -1;
-static int hf_ldp_tlv_fec_vc_intparam_tdmopt_ssrc = -1;
-static int hf_ldp_tlv_fec_vc_intparam_vccv_cctype_cw = -1;
-static int hf_ldp_tlv_fec_vc_intparam_vccv_cctype_mplsra = -1;
-static int hf_ldp_tlv_fec_vc_intparam_vccv_cctype_ttl1 = -1;
-static int hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_icmpping = -1;
-static int hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_lspping = -1;
-static int hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd1 = -1;
-static int hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd2 = -1;
-static int hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd3 = -1;
-static int hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd4 = -1;
-static int hf_ldp_tlv_fec_vc_intparam_flowlabel_t = -1;                    /* Flow label interface parameter RFC6391 */
-static int hf_ldp_tlv_fec_vc_intparam_flowlabel_r = -1;                    /* Flow label interface parameter RFC6391 */
-static int hf_ldp_tlv_fec_vc_intparam_flowlabel_res = -1;                  /* Flow label interface parameter RFC6391 */
-static int hf_ldp_tlv_lspid_act_flg = -1;
-static int hf_ldp_tlv_lspid_cr_lsp = -1;
-static int hf_ldp_tlv_lspid_ldpid = -1;
-static int hf_ldp_tlv_er_hop_loose = -1;
-static int hf_ldp_tlv_er_hop_prelen = -1;
-static int hf_ldp_tlv_er_hop_prefix4 = -1;
-static int hf_ldp_tlv_er_hop_prefix6 = -1;
-static int hf_ldp_tlv_er_hop_as = -1;
-static int hf_ldp_tlv_er_hop_cr_lsp = -1;
-static int hf_ldp_tlv_er_hop_ldpid = -1;
-static int hf_ldp_tlv_flags_reserv = -1;
-static int hf_ldp_tlv_flags_weight = -1;
-static int hf_ldp_tlv_flags_ebs = -1;
-static int hf_ldp_tlv_flags_cbs = -1;
-static int hf_ldp_tlv_flags_cdr = -1;
-static int hf_ldp_tlv_flags_pbs = -1;
-static int hf_ldp_tlv_flags_pdr = -1;
-static int hf_ldp_tlv_frequency = -1;
-static int hf_ldp_tlv_pdr = -1;
-static int hf_ldp_tlv_pbs = -1;
-static int hf_ldp_tlv_cdr = -1;
-static int hf_ldp_tlv_cbs = -1;
-static int hf_ldp_tlv_ebs = -1;
-static int hf_ldp_tlv_weight = -1;
-static int hf_ldp_tlv_set_prio = -1;
-static int hf_ldp_tlv_hold_prio = -1;
-static int hf_ldp_tlv_route_pinning = -1;
-static int hf_ldp_tlv_resource_class = -1;
-/* static int hf_ldp_tlv_diffserv = -1; */
-static int hf_ldp_tlv_diffserv_type = -1;
-static int hf_ldp_tlv_diffserv_mapnb = -1;
-static int hf_ldp_tlv_diffserv_map = -1;
-static int hf_ldp_tlv_diffserv_map_exp = -1;
-static int hf_ldp_tlv_diffserv_phbid = -1;
-static int hf_ldp_tlv_diffserv_phbid_dscp = -1;
-static int hf_ldp_tlv_diffserv_phbid_code = -1;
-static int hf_ldp_tlv_diffserv_phbid_bit14 = -1;
-static int hf_ldp_tlv_diffserv_phbid_bit15 = -1;
-static int hf_ldp_tlv_fec_gen_agi_type = -1;
-static int hf_ldp_tlv_fec_gen_agi_length = -1;
-static int hf_ldp_tlv_fec_gen_agi_value = -1;
-static int hf_ldp_tlv_fec_gen_saii_type = -1;
-static int hf_ldp_tlv_fec_gen_saii_length = -1;
-static int hf_ldp_tlv_fec_gen_saii_value = -1;
-static int hf_ldp_tlv_fec_gen_taii_type = -1;
-static int hf_ldp_tlv_fec_gen_taii_length = -1;
-static int hf_ldp_tlv_fec_gen_taii_value = -1;
-static int hf_ldp_tlv_fec_gen_aai_globalid = -1;
-static int hf_ldp_tlv_fec_gen_aai_prefix = -1;
-static int hf_ldp_tlv_fec_gen_aai_ac_id = -1;
-static int hf_ldp_tlv_fec_pw_controlword = -1;
-static int hf_ldp_tlv_fec_pw_pwtype = -1;
-static int hf_ldp_tlv_fec_pw_infolength = -1;
-static int hf_ldp_tlv_fec_pw_groupid = -1;
-static int hf_ldp_tlv_fec_pw_pwid = -1;
-static int hf_ldp_tlv_pw_status_data = -1;
-static int hf_ldp_tlv_pw_not_forwarding = -1;
-static int hf_ldp_tlv_pw_lac_ingress_recv_fault = -1;
-static int hf_ldp_tlv_pw_lac_egress_recv_fault = -1;
-static int hf_ldp_tlv_pw_psn_pw_ingress_recv_fault = -1;
-static int hf_ldp_tlv_pw_psn_pw_egress_recv_fault = -1;
-static int hf_ldp_tlv_pw_grouping_value = -1;
-static int hf_ldp_tlv_intparam_length = -1;
-static int hf_ldp_tlv_intparam_mtu = -1;
-static int hf_ldp_tlv_intparam_tdmbps = -1;
-static int hf_ldp_tlv_intparam_id = -1;
-static int hf_ldp_tlv_intparam_maxcatmcells = -1;
-static int hf_ldp_tlv_intparam_desc = -1;
-static int hf_ldp_tlv_intparam_cepbytes = -1;
-static int hf_ldp_tlv_intparam_cepopt_ais = -1;
-static int hf_ldp_tlv_intparam_cepopt_une = -1;
-static int hf_ldp_tlv_intparam_cepopt_rtp = -1;
-static int hf_ldp_tlv_intparam_cepopt_ebm = -1;
-static int hf_ldp_tlv_intparam_cepopt_mah = -1;
-static int hf_ldp_tlv_intparam_cepopt_res = -1;
-static int hf_ldp_tlv_intparam_cepopt_ceptype = -1;
-static int hf_ldp_tlv_intparam_cepopt_t3 = -1;
-static int hf_ldp_tlv_intparam_cepopt_e3 = -1;
-static int hf_ldp_tlv_intparam_vlanid = -1;
-static int hf_ldp_tlv_intparam_dlcilen = -1;
-static int hf_ldp_tlv_intparam_fcslen = -1;
-static int hf_ldp_tlv_intparam_tdmopt_r = -1;
-static int hf_ldp_tlv_intparam_tdmopt_d = -1;
-static int hf_ldp_tlv_intparam_tdmopt_f = -1;
-static int hf_ldp_tlv_intparam_tdmopt_res1 = -1;
-static int hf_ldp_tlv_intparam_tdmopt_pt = -1;
-static int hf_ldp_tlv_intparam_tdmopt_res2 = -1;
-static int hf_ldp_tlv_intparam_tdmopt_freq = -1;
-static int hf_ldp_tlv_intparam_tdmopt_ssrc = -1;
-static int hf_ldp_tlv_intparam_vccv_cctype_cw = -1;
-static int hf_ldp_tlv_intparam_vccv_cctype_mplsra = -1;
-static int hf_ldp_tlv_intparam_vccv_cctype_ttl1 = -1;
-static int hf_ldp_tlv_intparam_vccv_cvtype_icmpping = -1;
-static int hf_ldp_tlv_intparam_vccv_cvtype_lspping = -1;
-static int hf_ldp_tlv_intparam_vccv_cvtype_bfd = -1;
-static int hf_ldp_tlv_upstr_sbit = -1;
-static int hf_ldp_tlv_upstr_lbl_req_resvbit = -1;
-static int hf_ldp_tlv_upstr_ass_lbl = -1;
-static int hf_ldp_tlv_upstr_lbl_resvbit = -1;
-static int hf_ldp_tlv_ipv4_intID_hop_addr = -1;
-static int hf_ldp_tlv_logical_intID = -1;
-static int hf_ldp_tlv_ip_multicast_srcaddr = -1;
-static int hf_ldp_tlv_ip_multicast_mltcstaddr = -1;
-static int hf_ldp_tlv_ldp_p2mp_lsptype = -1;
-static int hf_ldp_tlv_ip_mpls_context_srcaddr = -1;
-static int hf_ldp_tlv_ldp_p2mp_addrfam = -1;
-static int hf_ldp_tlv_ldp_p2mp_addrlen = -1;
-static int hf_ldp_tlv_ldp_p2mp_rtnodeaddr = -1;
-static int hf_ldp_tlv_ldp_p2mp_oplength = -1;
-static int hf_ldp_tlv_ldp_p2mp_opvalue = -1;
-static int hf_ldp_tlv_rsvp_te_p2mp_id = -1;
-static int hf_ldp_tlv_must_be_zero = -1;
-static int hf_ldp_tlv_tunnel_id = -1;
-static int hf_ldp_tlv_ext_tunnel_id = -1;
-static int hf_ldp_tlv_inv_length = -1;
-static int hf_ldp_returned_pdu_data = -1;
-static int hf_ldp_returned_message_parameters = -1;
-static int hf_ldp_data = -1;
-static int hf_ldp_unknown_data = -1;
-
-
-static int ett_ldp = -1;
-static int ett_ldp_header = -1;
-static int ett_ldp_ldpid = -1;
-static int ett_ldp_message = -1;
-static int ett_ldp_tlv = -1;
-static int ett_ldp_tlv_val = -1;
-static int ett_ldp_tlv_ft_flags = -1;
-static int ett_ldp_fec = -1;
-static int ett_ldp_fec_vc_interfaceparam = -1;
-static int ett_ldp_fec_vc_interfaceparam_cepopt = -1;
-static int ett_ldp_fec_vc_interfaceparam_vccvtype = -1;
-static int ett_ldp_diffserv_map = -1;
-static int ett_ldp_diffserv_map_phbid = -1;
-static int ett_ldp_gen_agi = -1;
-static int ett_ldp_gen_saii = -1;
-static int ett_ldp_gen_taii = -1;
-static int ett_ldp_gen_aai_type2 = -1;
-static int ett_ldp_sub_tlv = -1;
-
-static expert_field ei_ldp_dtsm_and_target = EI_INIT;
-static expert_field ei_ldp_gtsm_supported = EI_INIT;
-static expert_field ei_ldp_gtsm_not_supported_basic_discovery = EI_INIT;
-static expert_field ei_ldp_gtsm_not_supported = EI_INIT;
-static expert_field ei_ldp_inv_length = EI_INIT;
-static expert_field ei_ldp_tlv_fec_vc_infolength = EI_INIT;
-static expert_field ei_ldp_tlv_fec_type = EI_INIT;
-static expert_field ei_ldp_tlv_fec_len = EI_INIT;
-static expert_field ei_ldp_malformed_data = EI_INIT;
-static expert_field ei_ldp_address_family_not_implemented = EI_INIT;
-static expert_field ei_ldp_malformed_interface_parameter = EI_INIT;
-static expert_field ei_ldp_tlv_fec = EI_INIT;
+/* static int hf_ldp_req; */
+/* static int hf_ldp_rsp; */
+static int hf_ldp_version;
+static int hf_ldp_pdu_len;
+static int hf_ldp_lsr;
+static int hf_ldp_ls_id;
+static int hf_ldp_msg_ubit;
+static int hf_ldp_msg_type;
+static int hf_ldp_msg_len;
+static int hf_ldp_msg_id;
+static int hf_ldp_msg_vendor_id;
+static int hf_ldp_msg_experiment_id;
+static int hf_ldp_tlv_value;
+static int hf_ldp_tlv_type;
+static int hf_ldp_tlv_unknown;
+static int hf_ldp_tlv_len;
+static int hf_ldp_tlv_val_hold;
+static int hf_ldp_tlv_val_target;
+static int hf_ldp_tlv_val_request;
+static int hf_ldp_tlv_val_res;
+static int hf_ldp_tlv_val_gtsm_flag;
+static int hf_ldp_tlv_ipv4_taddr;
+static int hf_ldp_tlv_config_seqno;
+static int hf_ldp_tlv_ipv6_taddr;
+static int hf_ldp_tlv_fec_wc;
+static int hf_ldp_tlv_fec_af;
+static int hf_ldp_tlv_fec_len;
+static int hf_ldp_tlv_fec_pfval;
+static int hf_ldp_tlv_fec_hoval;
+static int hf_ldp_tlv_addrl_addr_family;
+static int hf_ldp_tlv_addrl_addr;
+static int hf_ldp_tlv_hc_value;
+static int hf_ldp_tlv_pv_lsrid;
+static int hf_ldp_tlv_generic_label;
+static int hf_ldp_tlv_atm_label_vbits;
+static int hf_ldp_tlv_atm_label_vpi;
+static int hf_ldp_tlv_atm_label_vci;
+static int hf_ldp_tlv_fr_label_len;
+static int hf_ldp_tlv_fr_label_dlci;
+static int hf_ldp_tlv_ft_protect_sequence_num;
+static int hf_ldp_tlv_status_ebit;
+static int hf_ldp_tlv_status_fbit;
+static int hf_ldp_tlv_status_data;
+static int hf_ldp_tlv_status_msg_id;
+static int hf_ldp_tlv_status_msg_type;
+static int hf_ldp_tlv_extstatus_data;
+static int hf_ldp_tlv_returned_version;
+static int hf_ldp_tlv_returned_pdu_len;
+static int hf_ldp_tlv_returned_lsr;
+static int hf_ldp_tlv_returned_ls_id;
+static int hf_ldp_tlv_returned_msg_ubit;
+static int hf_ldp_tlv_returned_msg_type;
+static int hf_ldp_tlv_returned_msg_len;
+static int hf_ldp_tlv_returned_msg_id;
+static int hf_ldp_tlv_mac;
+static int hf_ldp_tlv_sess_ver;
+static int hf_ldp_tlv_sess_ka;
+static int hf_ldp_tlv_sess_advbit;
+static int hf_ldp_tlv_sess_ldetbit;
+static int hf_ldp_tlv_sess_pvlim;
+static int hf_ldp_tlv_sess_mxpdu;
+static int hf_ldp_tlv_sess_rxlsr;
+static int hf_ldp_tlv_sess_rxls;
+static int hf_ldp_tlv_sess_atm_merge;
+static int hf_ldp_tlv_sess_atm_lr;
+static int hf_ldp_tlv_sess_atm_dir;
+static int hf_ldp_tlv_sess_atm_minvpi;
+static int hf_ldp_tlv_sess_atm_maxvpi;
+static int hf_ldp_tlv_sess_atm_minvci;
+static int hf_ldp_tlv_sess_atm_maxvci;
+static int hf_ldp_tlv_sess_fr_merge;
+static int hf_ldp_tlv_sess_fr_lr;
+static int hf_ldp_tlv_sess_fr_dir;
+static int hf_ldp_tlv_sess_fr_len;
+static int hf_ldp_tlv_sess_fr_mindlci;
+static int hf_ldp_tlv_sess_fr_maxdlci;
+static int hf_ldp_tlv_ft_sess_flags;
+static int hf_ldp_tlv_ft_sess_flag_r;
+static int hf_ldp_tlv_ft_sess_flag_res;
+static int hf_ldp_tlv_ft_sess_flag_s;
+static int hf_ldp_tlv_ft_sess_flag_a;
+static int hf_ldp_tlv_ft_sess_flag_c;
+static int hf_ldp_tlv_ft_sess_flag_l;
+static int hf_ldp_tlv_ft_sess_res;
+static int hf_ldp_tlv_ft_sess_reconn_to;
+static int hf_ldp_tlv_ft_sess_recovery_time;
+static int hf_ldp_tlv_ft_ack_sequence_num;
+static int hf_ldp_tlv_lbl_req_msg_id;
+static int hf_ldp_tlv_vendor_id;
+static int hf_ldp_tlv_experiment_id;
+static int hf_ldp_tlv_fec_vc_controlword;
+static int hf_ldp_tlv_fec_vc_vctype;
+static int hf_ldp_tlv_fec_vc_infolength;
+static int hf_ldp_tlv_fec_vc_groupid;
+static int hf_ldp_tlv_fec_vc_vcid;
+static int hf_ldp_tlv_fec_vc_intparam_length;
+static int hf_ldp_tlv_fec_vc_intparam_mtu;
+static int hf_ldp_tlv_fec_vc_intparam_tdmbps;
+static int hf_ldp_tlv_fec_vc_intparam_id;
+static int hf_ldp_tlv_fec_vc_intparam_maxcatmcells;
+static int hf_ldp_tlv_fec_vc_intparam_desc;
+static int hf_ldp_tlv_fec_vc_intparam_cepbytes;
+static int hf_ldp_tlv_fec_vc_intparam_cepopt_ais;
+static int hf_ldp_tlv_fec_vc_intparam_cepopt_une;
+static int hf_ldp_tlv_fec_vc_intparam_cepopt_rtp;
+static int hf_ldp_tlv_fec_vc_intparam_cepopt_ebm;
+static int hf_ldp_tlv_fec_vc_intparam_cepopt_mah;
+static int hf_ldp_tlv_fec_vc_intparam_cepopt_res;
+static int hf_ldp_tlv_fec_vc_intparam_cepopt_ceptype;
+static int hf_ldp_tlv_fec_vc_intparam_cepopt_t3;
+static int hf_ldp_tlv_fec_vc_intparam_cepopt_e3;
+static int hf_ldp_tlv_fec_vc_intparam_vlanid;
+static int hf_ldp_tlv_fec_vc_intparam_dlcilen;
+static int hf_ldp_tlv_fec_vc_intparam_fcslen;
+static int hf_ldp_tlv_fec_vc_intparam_tdmopt_r;
+static int hf_ldp_tlv_fec_vc_intparam_tdmopt_d;
+static int hf_ldp_tlv_fec_vc_intparam_tdmopt_f;
+static int hf_ldp_tlv_fec_vc_intparam_tdmopt_res1;
+static int hf_ldp_tlv_fec_vc_intparam_tdmopt_pt;
+static int hf_ldp_tlv_fec_vc_intparam_tdmopt_res2;
+static int hf_ldp_tlv_fec_vc_intparam_tdmopt_freq;
+static int hf_ldp_tlv_fec_vc_intparam_tdmopt_ssrc;
+static int hf_ldp_tlv_fec_vc_intparam_vccv_cctype_cw;
+static int hf_ldp_tlv_fec_vc_intparam_vccv_cctype_mplsra;
+static int hf_ldp_tlv_fec_vc_intparam_vccv_cctype_ttl1;
+static int hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_icmpping;
+static int hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_lspping;
+static int hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd1;
+static int hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd2;
+static int hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd3;
+static int hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd4;
+static int hf_ldp_tlv_fec_vc_intparam_flowlabel_t;                    /* Flow label interface parameter RFC6391 */
+static int hf_ldp_tlv_fec_vc_intparam_flowlabel_r;                    /* Flow label interface parameter RFC6391 */
+static int hf_ldp_tlv_fec_vc_intparam_flowlabel_res;                  /* Flow label interface parameter RFC6391 */
+static int hf_ldp_tlv_lspid_act_flg;
+static int hf_ldp_tlv_lspid_cr_lsp;
+static int hf_ldp_tlv_lspid_ldpid;
+static int hf_ldp_tlv_er_hop_loose;
+static int hf_ldp_tlv_er_hop_prelen;
+static int hf_ldp_tlv_er_hop_prefix4;
+static int hf_ldp_tlv_er_hop_prefix6;
+static int hf_ldp_tlv_er_hop_as;
+static int hf_ldp_tlv_er_hop_cr_lsp;
+static int hf_ldp_tlv_er_hop_ldpid;
+static int hf_ldp_tlv_flags_reserv;
+static int hf_ldp_tlv_flags_weight;
+static int hf_ldp_tlv_flags_ebs;
+static int hf_ldp_tlv_flags_cbs;
+static int hf_ldp_tlv_flags_cdr;
+static int hf_ldp_tlv_flags_pbs;
+static int hf_ldp_tlv_flags_pdr;
+static int hf_ldp_tlv_frequency;
+static int hf_ldp_tlv_pdr;
+static int hf_ldp_tlv_pbs;
+static int hf_ldp_tlv_cdr;
+static int hf_ldp_tlv_cbs;
+static int hf_ldp_tlv_ebs;
+static int hf_ldp_tlv_weight;
+static int hf_ldp_tlv_set_prio;
+static int hf_ldp_tlv_hold_prio;
+static int hf_ldp_tlv_route_pinning;
+static int hf_ldp_tlv_resource_class;
+/* static int hf_ldp_tlv_diffserv; */
+static int hf_ldp_tlv_diffserv_type;
+static int hf_ldp_tlv_diffserv_mapnb;
+static int hf_ldp_tlv_diffserv_map;
+static int hf_ldp_tlv_diffserv_map_exp;
+static int hf_ldp_tlv_diffserv_phbid;
+static int hf_ldp_tlv_diffserv_phbid_dscp;
+static int hf_ldp_tlv_diffserv_phbid_code;
+static int hf_ldp_tlv_diffserv_phbid_bit14;
+static int hf_ldp_tlv_diffserv_phbid_bit15;
+static int hf_ldp_tlv_fec_gen_agi_type;
+static int hf_ldp_tlv_fec_gen_agi_length;
+static int hf_ldp_tlv_fec_gen_agi_value;
+static int hf_ldp_tlv_fec_gen_saii_type;
+static int hf_ldp_tlv_fec_gen_saii_length;
+static int hf_ldp_tlv_fec_gen_saii_value;
+static int hf_ldp_tlv_fec_gen_taii_type;
+static int hf_ldp_tlv_fec_gen_taii_length;
+static int hf_ldp_tlv_fec_gen_taii_value;
+static int hf_ldp_tlv_fec_gen_aai_globalid;
+static int hf_ldp_tlv_fec_gen_aai_prefix;
+static int hf_ldp_tlv_fec_gen_aai_ac_id;
+static int hf_ldp_tlv_fec_pw_controlword;
+static int hf_ldp_tlv_fec_pw_pwtype;
+static int hf_ldp_tlv_fec_pw_infolength;
+static int hf_ldp_tlv_fec_pw_groupid;
+static int hf_ldp_tlv_fec_pw_pwid;
+static int hf_ldp_tlv_pw_status_data;
+static int hf_ldp_tlv_pw_not_forwarding;
+static int hf_ldp_tlv_pw_lac_ingress_recv_fault;
+static int hf_ldp_tlv_pw_lac_egress_recv_fault;
+static int hf_ldp_tlv_pw_psn_pw_ingress_recv_fault;
+static int hf_ldp_tlv_pw_psn_pw_egress_recv_fault;
+static int hf_ldp_tlv_pw_grouping_value;
+static int hf_ldp_tlv_intparam_length;
+static int hf_ldp_tlv_intparam_mtu;
+static int hf_ldp_tlv_intparam_tdmbps;
+static int hf_ldp_tlv_intparam_id;
+static int hf_ldp_tlv_intparam_maxcatmcells;
+static int hf_ldp_tlv_intparam_desc;
+static int hf_ldp_tlv_intparam_cepbytes;
+static int hf_ldp_tlv_intparam_cepopt_ais;
+static int hf_ldp_tlv_intparam_cepopt_une;
+static int hf_ldp_tlv_intparam_cepopt_rtp;
+static int hf_ldp_tlv_intparam_cepopt_ebm;
+static int hf_ldp_tlv_intparam_cepopt_mah;
+static int hf_ldp_tlv_intparam_cepopt_res;
+static int hf_ldp_tlv_intparam_cepopt_ceptype;
+static int hf_ldp_tlv_intparam_cepopt_t3;
+static int hf_ldp_tlv_intparam_cepopt_e3;
+static int hf_ldp_tlv_intparam_vlanid;
+static int hf_ldp_tlv_intparam_dlcilen;
+static int hf_ldp_tlv_intparam_fcslen;
+static int hf_ldp_tlv_intparam_tdmopt_r;
+static int hf_ldp_tlv_intparam_tdmopt_d;
+static int hf_ldp_tlv_intparam_tdmopt_f;
+static int hf_ldp_tlv_intparam_tdmopt_res1;
+static int hf_ldp_tlv_intparam_tdmopt_pt;
+static int hf_ldp_tlv_intparam_tdmopt_res2;
+static int hf_ldp_tlv_intparam_tdmopt_freq;
+static int hf_ldp_tlv_intparam_tdmopt_ssrc;
+static int hf_ldp_tlv_intparam_vccv_cctype_cw;
+static int hf_ldp_tlv_intparam_vccv_cctype_mplsra;
+static int hf_ldp_tlv_intparam_vccv_cctype_ttl1;
+static int hf_ldp_tlv_intparam_vccv_cvtype_icmpping;
+static int hf_ldp_tlv_intparam_vccv_cvtype_lspping;
+static int hf_ldp_tlv_intparam_vccv_cvtype_bfd;
+static int hf_ldp_tlv_upstr_sbit;
+static int hf_ldp_tlv_upstr_lbl_req_resvbit;
+static int hf_ldp_tlv_upstr_ass_lbl;
+static int hf_ldp_tlv_upstr_lbl_resvbit;
+static int hf_ldp_tlv_ipv4_intID_hop_addr;
+static int hf_ldp_tlv_logical_intID;
+static int hf_ldp_tlv_ip_multicast_srcaddr;
+static int hf_ldp_tlv_ip_multicast_mltcstaddr;
+static int hf_ldp_tlv_ldp_p2mp_lsptype;
+static int hf_ldp_tlv_ip_mpls_context_srcaddr;
+static int hf_ldp_tlv_ldp_p2mp_addrfam;
+static int hf_ldp_tlv_ldp_p2mp_addrlen;
+static int hf_ldp_tlv_ldp_p2mp_rtnodeaddr;
+static int hf_ldp_tlv_ldp_p2mp_oplength;
+static int hf_ldp_tlv_ldp_p2mp_opvalue;
+static int hf_ldp_tlv_rsvp_te_p2mp_id;
+static int hf_ldp_tlv_must_be_zero;
+static int hf_ldp_tlv_tunnel_id;
+static int hf_ldp_tlv_ext_tunnel_id;
+static int hf_ldp_tlv_inv_length;
+static int hf_ldp_returned_pdu_data;
+static int hf_ldp_returned_message_parameters;
+static int hf_ldp_data;
+static int hf_ldp_unknown_data;
+
+
+static int ett_ldp;
+static int ett_ldp_header;
+static int ett_ldp_ldpid;
+static int ett_ldp_message;
+static int ett_ldp_tlv;
+static int ett_ldp_tlv_val;
+static int ett_ldp_tlv_ft_flags;
+static int ett_ldp_fec;
+static int ett_ldp_fec_vc_interfaceparam;
+static int ett_ldp_fec_vc_interfaceparam_cepopt;
+static int ett_ldp_fec_vc_interfaceparam_vccvtype;
+static int ett_ldp_diffserv_map;
+static int ett_ldp_diffserv_map_phbid;
+static int ett_ldp_gen_agi;
+static int ett_ldp_gen_saii;
+static int ett_ldp_gen_taii;
+static int ett_ldp_gen_aai_type2;
+static int ett_ldp_sub_tlv;
+
+static expert_field ei_ldp_dtsm_and_target;
+static expert_field ei_ldp_gtsm_supported;
+static expert_field ei_ldp_gtsm_not_supported_basic_discovery;
+static expert_field ei_ldp_gtsm_not_supported;
+static expert_field ei_ldp_inv_length;
+static expert_field ei_ldp_tlv_fec_vc_infolength;
+static expert_field ei_ldp_tlv_fec_type;
+static expert_field ei_ldp_tlv_fec_len;
+static expert_field ei_ldp_malformed_data;
+static expert_field ei_ldp_address_family_not_implemented;
+static expert_field ei_ldp_malformed_interface_parameter;
+static expert_field ei_ldp_tlv_fec;
 
 /* desegmentation of LDP over TCP */
 static gboolean ldp_desegment = TRUE;
diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c
index a5acce5caa..143ef29127 100644
--- a/epan/dissectors/packet-ldss.c
+++ b/epan/dissectors/packet-ldss.c
@@ -155,37 +155,37 @@ void proto_register_ldss(void);
 void proto_reg_handoff_ldss(void);
 
 /* Define the ldss proto */
-static int	proto_ldss		= -1;
+static int	proto_ldss;
 
 /* Define headers for ldss */
-static int	hf_ldss_message_id	= -1;
-static int	hf_ldss_message_detail	= -1;
-static int	hf_ldss_digest_type	= -1;
-static int	hf_ldss_compression	= -1;
-static int	hf_ldss_cookie		= -1;
-static int	hf_ldss_digest		= -1;
-static int	hf_ldss_size		= -1;
-static int	hf_ldss_offset		= -1;
-static int	hf_ldss_target_time	= -1;
-static int	hf_ldss_reserved_1	= -1;
-static int	hf_ldss_port		= -1;
-static int	hf_ldss_rate		= -1;
-static int	hf_ldss_priority	= -1;
-static int	hf_ldss_property_count	= -1;
-static int	hf_ldss_properties	= -1;
-static int	hf_ldss_file_data	= -1;
-static int	hf_ldss_response_in	= -1;
-static int	hf_ldss_response_to	= -1;
-static int	hf_ldss_initiated_by	= -1;
-static int	hf_ldss_transfer_response_time	= -1;
-static int	hf_ldss_transfer_completed_in	= -1;
+static int	hf_ldss_message_id;
+static int	hf_ldss_message_detail;
+static int	hf_ldss_digest_type;
+static int	hf_ldss_compression;
+static int	hf_ldss_cookie;
+static int	hf_ldss_digest;
+static int	hf_ldss_size;
+static int	hf_ldss_offset;
+static int	hf_ldss_target_time;
+static int	hf_ldss_reserved_1;
+static int	hf_ldss_port;
+static int	hf_ldss_rate;
+static int	hf_ldss_priority;
+static int	hf_ldss_property_count;
+static int	hf_ldss_properties;
+static int	hf_ldss_file_data;
+static int	hf_ldss_response_in;
+static int	hf_ldss_response_to;
+static int	hf_ldss_initiated_by;
+static int	hf_ldss_transfer_response_time;
+static int	hf_ldss_transfer_completed_in;
 
 /* Define the tree for ldss */
-static int ett_ldss_broadcast	 = -1;
-static int ett_ldss_transfer     = -1;
-static int ett_ldss_transfer_req = -1;
+static int ett_ldss_broadcast;
+static int ett_ldss_transfer;
+static int ett_ldss_transfer_req;
 
-static expert_field ei_ldss_unrecognized_line = EI_INIT;
+static expert_field ei_ldss_unrecognized_line;
 
 
 static dissector_handle_t	ldss_udp_handle;
diff --git a/epan/dissectors/packet-lg8979.c b/epan/dissectors/packet-lg8979.c
index 507500e3a4..362f91ca4a 100644
--- a/epan/dissectors/packet-lg8979.c
+++ b/epan/dissectors/packet-lg8979.c
@@ -20,126 +20,126 @@
 void proto_register_lg8979(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_lg8979                    = -1;
-static int hf_lg8979_header                = -1;
-static int hf_lg8979_flags                 = -1;
-static int hf_lg8979_shr                   = -1;
-static int hf_lg8979_mfc                   = -1;
-static int hf_lg8979_ack                   = -1;
-static int hf_lg8979_con                   = -1;
-static int hf_lg8979_frz                   = -1;
-static int hf_lg8979_ind                   = -1;
-static int hf_lg8979_sch                   = -1;
-static int hf_lg8979_slg                   = -1;
-static int hf_lg8979_address               = -1;
-static int hf_lg8979_lastblock             = -1;
-static int hf_lg8979_funccode              = -1;
-static int hf_lg8979_length                = -1;
-static int hf_lg8979_start_ptnum16         = -1;
-static int hf_lg8979_start_ptnum8          = -1;
-static int hf_lg8979_stop_ptnum16          = -1;
-static int hf_lg8979_stop_ptnum8           = -1;
-static int hf_lg8979_ang_point             = -1;
-static int hf_lg8979_adc_ref_zero          = -1;
-static int hf_lg8979_adc_ref_neg90         = -1;
-static int hf_lg8979_adc_ref_pos90         = -1;
-static int hf_lg8979_ind_chgrpt_ptnum      = -1;
-static int hf_lg8979_ind_chgrpt_status     = -1;
-static int hf_lg8979_ind_chgrpt_change     = -1;
-static int hf_lg8979_ind_frcrpt_status_b0  = -1;
-static int hf_lg8979_ind_frcrpt_status_b1  = -1;
-static int hf_lg8979_ind_frcrpt_status_b2  = -1;
-static int hf_lg8979_ind_frcrpt_status_b3  = -1;
-static int hf_lg8979_ind_frcrpt_status_b4  = -1;
-static int hf_lg8979_ind_frcrpt_status_b5  = -1;
-static int hf_lg8979_ind_frcrpt_status_b6  = -1;
-static int hf_lg8979_ind_frcrpt_status_b7  = -1;
-static int hf_lg8979_ind_frcrpt_change_b0  = -1;
-static int hf_lg8979_ind_frcrpt_change_b1  = -1;
-static int hf_lg8979_ind_frcrpt_change_b2  = -1;
-static int hf_lg8979_ind_frcrpt_change_b3  = -1;
-static int hf_lg8979_ind_frcrpt_change_b4  = -1;
-static int hf_lg8979_ind_frcrpt_change_b5  = -1;
-static int hf_lg8979_ind_frcrpt_change_b6  = -1;
-static int hf_lg8979_ind_frcrpt_change_b7  = -1;
-static int hf_lg8979_soe_chgrpt_ptnum      = -1;
-static int hf_lg8979_soe_chgrpt_status     = -1;
-static int hf_lg8979_soe_chgrpt_change     = -1;
-static int hf_lg8979_soe_frcrpt_status_b0  = -1;
-static int hf_lg8979_soe_frcrpt_status_b1  = -1;
-static int hf_lg8979_soe_frcrpt_status_b2  = -1;
-static int hf_lg8979_soe_frcrpt_status_b3  = -1;
-static int hf_lg8979_soe_frcrpt_status_b4  = -1;
-static int hf_lg8979_soe_frcrpt_status_b5  = -1;
-static int hf_lg8979_soe_frcrpt_status_b6  = -1;
-static int hf_lg8979_soe_frcrpt_status_b7  = -1;
-static int hf_lg8979_soe_frcrpt_change_b0  = -1;
-static int hf_lg8979_soe_frcrpt_change_b1  = -1;
-static int hf_lg8979_soe_frcrpt_change_b2  = -1;
-static int hf_lg8979_soe_frcrpt_change_b3  = -1;
-static int hf_lg8979_soe_frcrpt_change_b4  = -1;
-static int hf_lg8979_soe_frcrpt_change_b5  = -1;
-static int hf_lg8979_soe_frcrpt_change_b6  = -1;
-static int hf_lg8979_soe_frcrpt_change_b7  = -1;
-static int hf_lg8979_digin_b0              = -1;
-static int hf_lg8979_digin_b1              = -1;
-static int hf_lg8979_digin_b2              = -1;
-static int hf_lg8979_digin_b3              = -1;
-static int hf_lg8979_digin_b4              = -1;
-static int hf_lg8979_digin_b5              = -1;
-static int hf_lg8979_digin_b6              = -1;
-static int hf_lg8979_digin_b7              = -1;
-static int hf_lg8979_digin_b8              = -1;
-static int hf_lg8979_digin_b9              = -1;
-static int hf_lg8979_digin_b10             = -1;
-static int hf_lg8979_digin_b11             = -1;
-static int hf_lg8979_digin_b12             = -1;
-static int hf_lg8979_digin_b13             = -1;
-static int hf_lg8979_digin_b14             = -1;
-static int hf_lg8979_digin_b15             = -1;
-static int hf_lg8979_acc_point             = -1;
-static int hf_lg8979_soe_logchg_ptnum      = -1;
-static int hf_lg8979_soe_logchg_newstat    = -1;
-static int hf_lg8979_soe_logchg_mon        = -1;
-static int hf_lg8979_soe_logchg_day        = -1;
-static int hf_lg8979_soe_logchg_hour       = -1;
-static int hf_lg8979_soe_logchg_min        = -1;
-static int hf_lg8979_soe_logchg_sec        = -1;
-static int hf_lg8979_soe_logchg_msec       = -1;
-static int hf_lg8979_ang_output_val        = -1;
-static int hf_lg8979_sbo_tripclose         = -1;
-static int hf_lg8979_sbo_timercnt          = -1;
-static int hf_lg8979_digout_data           = -1;
-static int hf_lg8979_pul_output_base       = -1;
-static int hf_lg8979_pul_output_dur        = -1;
-static int hf_lg8979_pul_output_rl         = -1;
-static int hf_lg8979_ang_deadband          = -1;
-static int hf_lg8979_ang_group             = -1;
-static int hf_lg8979_ang_group_pts         = -1;
-static int hf_lg8979_acc_preset            = -1;
-static int hf_lg8979_rtucfg_num_chassis    = -1;
-static int hf_lg8979_rtucfg_chassis_num    = -1;
-static int hf_lg8979_rtucfg_card_slot      = -1;
-static int hf_lg8979_timesync_mon          = -1;
-static int hf_lg8979_timesync_day          = -1;
-static int hf_lg8979_timesync_hour         = -1;
-static int hf_lg8979_timesync_min          = -1;
-static int hf_lg8979_timesync_sec          = -1;
-static int hf_lg8979_timesync_msec         = -1;
-static int hf_lg8979_timebias_value        = -1;
-static int hf_lg8979_timebias_proctime     = -1;
-static int hf_lg8979_firmware_ver          = -1;
-static int hf_lg8979_exprpt_code           = -1;
-static int hf_lg8979_exprpt_parm           = -1;
-static int hf_lg8979_disallowed_func       = -1;
-static int hf_lg8979_crc16                 = -1;
+static int proto_lg8979;
+static int hf_lg8979_header;
+static int hf_lg8979_flags;
+static int hf_lg8979_shr;
+static int hf_lg8979_mfc;
+static int hf_lg8979_ack;
+static int hf_lg8979_con;
+static int hf_lg8979_frz;
+static int hf_lg8979_ind;
+static int hf_lg8979_sch;
+static int hf_lg8979_slg;
+static int hf_lg8979_address;
+static int hf_lg8979_lastblock;
+static int hf_lg8979_funccode;
+static int hf_lg8979_length;
+static int hf_lg8979_start_ptnum16;
+static int hf_lg8979_start_ptnum8;
+static int hf_lg8979_stop_ptnum16;
+static int hf_lg8979_stop_ptnum8;
+static int hf_lg8979_ang_point;
+static int hf_lg8979_adc_ref_zero;
+static int hf_lg8979_adc_ref_neg90;
+static int hf_lg8979_adc_ref_pos90;
+static int hf_lg8979_ind_chgrpt_ptnum;
+static int hf_lg8979_ind_chgrpt_status;
+static int hf_lg8979_ind_chgrpt_change;
+static int hf_lg8979_ind_frcrpt_status_b0;
+static int hf_lg8979_ind_frcrpt_status_b1;
+static int hf_lg8979_ind_frcrpt_status_b2;
+static int hf_lg8979_ind_frcrpt_status_b3;
+static int hf_lg8979_ind_frcrpt_status_b4;
+static int hf_lg8979_ind_frcrpt_status_b5;
+static int hf_lg8979_ind_frcrpt_status_b6;
+static int hf_lg8979_ind_frcrpt_status_b7;
+static int hf_lg8979_ind_frcrpt_change_b0;
+static int hf_lg8979_ind_frcrpt_change_b1;
+static int hf_lg8979_ind_frcrpt_change_b2;
+static int hf_lg8979_ind_frcrpt_change_b3;
+static int hf_lg8979_ind_frcrpt_change_b4;
+static int hf_lg8979_ind_frcrpt_change_b5;
+static int hf_lg8979_ind_frcrpt_change_b6;
+static int hf_lg8979_ind_frcrpt_change_b7;
+static int hf_lg8979_soe_chgrpt_ptnum;
+static int hf_lg8979_soe_chgrpt_status;
+static int hf_lg8979_soe_chgrpt_change;
+static int hf_lg8979_soe_frcrpt_status_b0;
+static int hf_lg8979_soe_frcrpt_status_b1;
+static int hf_lg8979_soe_frcrpt_status_b2;
+static int hf_lg8979_soe_frcrpt_status_b3;
+static int hf_lg8979_soe_frcrpt_status_b4;
+static int hf_lg8979_soe_frcrpt_status_b5;
+static int hf_lg8979_soe_frcrpt_status_b6;
+static int hf_lg8979_soe_frcrpt_status_b7;
+static int hf_lg8979_soe_frcrpt_change_b0;
+static int hf_lg8979_soe_frcrpt_change_b1;
+static int hf_lg8979_soe_frcrpt_change_b2;
+static int hf_lg8979_soe_frcrpt_change_b3;
+static int hf_lg8979_soe_frcrpt_change_b4;
+static int hf_lg8979_soe_frcrpt_change_b5;
+static int hf_lg8979_soe_frcrpt_change_b6;
+static int hf_lg8979_soe_frcrpt_change_b7;
+static int hf_lg8979_digin_b0;
+static int hf_lg8979_digin_b1;
+static int hf_lg8979_digin_b2;
+static int hf_lg8979_digin_b3;
+static int hf_lg8979_digin_b4;
+static int hf_lg8979_digin_b5;
+static int hf_lg8979_digin_b6;
+static int hf_lg8979_digin_b7;
+static int hf_lg8979_digin_b8;
+static int hf_lg8979_digin_b9;
+static int hf_lg8979_digin_b10;
+static int hf_lg8979_digin_b11;
+static int hf_lg8979_digin_b12;
+static int hf_lg8979_digin_b13;
+static int hf_lg8979_digin_b14;
+static int hf_lg8979_digin_b15;
+static int hf_lg8979_acc_point;
+static int hf_lg8979_soe_logchg_ptnum;
+static int hf_lg8979_soe_logchg_newstat;
+static int hf_lg8979_soe_logchg_mon;
+static int hf_lg8979_soe_logchg_day;
+static int hf_lg8979_soe_logchg_hour;
+static int hf_lg8979_soe_logchg_min;
+static int hf_lg8979_soe_logchg_sec;
+static int hf_lg8979_soe_logchg_msec;
+static int hf_lg8979_ang_output_val;
+static int hf_lg8979_sbo_tripclose;
+static int hf_lg8979_sbo_timercnt;
+static int hf_lg8979_digout_data;
+static int hf_lg8979_pul_output_base;
+static int hf_lg8979_pul_output_dur;
+static int hf_lg8979_pul_output_rl;
+static int hf_lg8979_ang_deadband;
+static int hf_lg8979_ang_group;
+static int hf_lg8979_ang_group_pts;
+static int hf_lg8979_acc_preset;
+static int hf_lg8979_rtucfg_num_chassis;
+static int hf_lg8979_rtucfg_chassis_num;
+static int hf_lg8979_rtucfg_card_slot;
+static int hf_lg8979_timesync_mon;
+static int hf_lg8979_timesync_day;
+static int hf_lg8979_timesync_hour;
+static int hf_lg8979_timesync_min;
+static int hf_lg8979_timesync_sec;
+static int hf_lg8979_timesync_msec;
+static int hf_lg8979_timebias_value;
+static int hf_lg8979_timebias_proctime;
+static int hf_lg8979_firmware_ver;
+static int hf_lg8979_exprpt_code;
+static int hf_lg8979_exprpt_parm;
+static int hf_lg8979_disallowed_func;
+static int hf_lg8979_crc16;
 
 /* Initialize the subtree pointers */
-static gint ett_lg8979                   = -1;
-static gint ett_lg8979_flags             = -1;
-static gint ett_lg8979_funccode          = -1;
-static gint ett_lg8979_point             = -1;
-static gint ett_lg8979_ts                = -1;
+static gint ett_lg8979;
+static gint ett_lg8979_flags;
+static gint ett_lg8979_funccode;
+static gint ett_lg8979_point;
+static gint ett_lg8979_ts;
 
 /* Globals for L&G 8979 Protocol Preferences */
 static gboolean lg8979_desegment = TRUE;
diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c
index 86ee09d91d..4c096ba183 100644
--- a/epan/dissectors/packet-lge_monitor.c
+++ b/epan/dissectors/packet-lge_monitor.c
@@ -21,16 +21,16 @@ void proto_register_lge_monitor(void);
 static dissector_handle_t lge_monitor_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_lge_monitor		= -1;
+static int proto_lge_monitor;
 
-static int hf_lge_monitor_dir = -1;
-static int hf_lge_monitor_prot = -1;
-static int hf_lge_monitor_length = -1;
-static int hf_lge_monitor_data = -1;
+static int hf_lge_monitor_dir;
+static int hf_lge_monitor_prot;
+static int hf_lge_monitor_length;
+static int hf_lge_monitor_data;
 
 /* Initialize the subtree pointers */
-static int ett_lge_monitor = -1;
-static int ett_lge_header = -1;
+static int ett_lge_monitor;
+static int ett_lge_header;
 
 static dissector_handle_t mtp3_handle, m3ua_handle, sccp_handle, sctp_handle;
 
diff --git a/epan/dissectors/packet-li5g.c b/epan/dissectors/packet-li5g.c
index 4a5def2d46..b176bf87e9 100644
--- a/epan/dissectors/packet-li5g.c
+++ b/epan/dissectors/packet-li5g.c
@@ -16,25 +16,25 @@
 void proto_reg_handoff_li5g(void);
 void proto_register_li5g(void);
 
-static int proto_li5g = -1;
-static int hf_li5g_version = -1;
-static int hf_li5g_pduType = -1;
-static int hf_li5g_headerLen = -1;
-static int hf_li5g_payloadLen = -1;
-static int hf_li5g_payloadFormat = -1;
-static int hf_li5g_payloadDirection = -1;
-static int hf_li5g_xid = -1;
-static int hf_li5g_cid = -1;
-static int hf_li5g_attrType = -1;
-static int hf_li5g_attrLen = -1;
-static int hf_li5g_pld = -1;
+static int proto_li5g;
+static int hf_li5g_version;
+static int hf_li5g_pduType;
+static int hf_li5g_headerLen;
+static int hf_li5g_payloadLen;
+static int hf_li5g_payloadFormat;
+static int hf_li5g_payloadDirection;
+static int hf_li5g_xid;
+static int hf_li5g_cid;
+static int hf_li5g_attrType;
+static int hf_li5g_attrLen;
+static int hf_li5g_pld;
 
 /* the min Attribute Type is 1 */
 #define LI_5G_ATTR_TYPE_MAX 23
 /* the min header length */
 #define LI_5G_HEADER_LEN_MIN 40
 
-static gint ett_li5g = -1;
+static gint ett_li5g;
 static gint ett_attrContents[LI_5G_ATTR_TYPE_MAX];
 static int hf_li5g_attrContents[LI_5G_ATTR_TYPE_MAX];
 static dissector_handle_t li5g_handle;
diff --git a/epan/dissectors/packet-lin.c b/epan/dissectors/packet-lin.c
index aeda98720e..4c3fbd7b8b 100644
--- a/epan/dissectors/packet-lin.c
+++ b/epan/dissectors/packet-lin.c
@@ -35,32 +35,32 @@
 static heur_dissector_list_t                 heur_subdissector_list;
 static heur_dtbl_entry_t                    *heur_dtbl_entry;
 
-static int proto_lin = -1;
+static int proto_lin;
 
 static dissector_handle_t lin_handle;
 
 /* header field */
-static int hf_lin_msg_format_rev = -1;
-static int hf_lin_reserved1 = -1;
-static int hf_lin_payload_length = -1;
-static int hf_lin_message_type = -1;
-static int hf_lin_checksum_type = -1;
-static int hf_lin_pid = -1;
-static int hf_lin_id = -1;
-static int hf_lin_parity = -1;
-static int hf_lin_checksum = -1;
-static int hf_lin_err_errors = -1;
-static int hf_lin_err_no_slave_response = -1;
-static int hf_lin_err_framing = -1;
-static int hf_lin_err_parity = -1;
-static int hf_lin_err_checksum = -1;
-static int hf_lin_err_invalidid = -1;
-static int hf_lin_err_overflow = -1;
-static int hf_lin_event_id = -1;
-
-static gint ett_lin = -1;
-static gint ett_lin_pid = -1;
-static gint ett_errors = -1;
+static int hf_lin_msg_format_rev;
+static int hf_lin_reserved1;
+static int hf_lin_payload_length;
+static int hf_lin_message_type;
+static int hf_lin_checksum_type;
+static int hf_lin_pid;
+static int hf_lin_id;
+static int hf_lin_parity;
+static int hf_lin_checksum;
+static int hf_lin_err_errors;
+static int hf_lin_err_no_slave_response;
+static int hf_lin_err_framing;
+static int hf_lin_err_parity;
+static int hf_lin_err_checksum;
+static int hf_lin_err_invalidid;
+static int hf_lin_err_overflow;
+static int hf_lin_event_id;
+
+static gint ett_lin;
+static gint ett_lin_pid;
+static gint ett_errors;
 
 static int * const error_fields[] = {
     &hf_lin_err_overflow,
diff --git a/epan/dissectors/packet-link16.c b/epan/dissectors/packet-link16.c
index 3f63111a02..6815d80e35 100644
--- a/epan/dissectors/packet-link16.c
+++ b/epan/dissectors/packet-link16.c
@@ -162,15 +162,15 @@ const value_string Link16_NPG_Strings[] = {
     { 0, NULL },
 };
 
-static int proto_link16 = -1;
+static int proto_link16;
 
-static gint hf_link16_wordformat = -1;
-static gint hf_link16_label = -1;
-static gint hf_link16_sublabel = -1;
-static gint hf_link16_mli = -1;
-static gint hf_link16_contlabel = -1;
+static gint hf_link16_wordformat;
+static gint hf_link16_label;
+static gint hf_link16_sublabel;
+static gint hf_link16_mli;
+static gint hf_link16_contlabel;
 
-static gint ett_link16 = -1;
+static gint ett_link16;
 
 static int * const link16_initial_word_fields[] = {
     &hf_link16_wordformat,
diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c
index 8ba4b8040a..3ddcce3f4a 100644
--- a/epan/dissectors/packet-linx.c
+++ b/epan/dissectors/packet-linx.c
@@ -41,112 +41,112 @@ void proto_reg_handoff_linx_tcp(void);
 
 static dissector_handle_t linx_handle;
 
-static int proto_linx     = -1;
-static int proto_linx_tcp = -1;
+static int proto_linx;
+static int proto_linx_tcp;
 
 /* ALL */
-static int hf_linx_nexthdr         = -1;
+static int hf_linx_nexthdr;
 
 /* MULTICORE */
-static int hf_linx_multicore_scoreid   = -1;
-static int hf_linx_multicore_dcoreid   = -1;
-static int hf_linx_multicore_reserved  = -1;
-static int hf_linx_multicore_reserved1 = -1;
+static int hf_linx_multicore_scoreid;
+static int hf_linx_multicore_dcoreid;
+static int hf_linx_multicore_reserved;
+static int hf_linx_multicore_reserved1;
 
 
 /* MAIN */
-static int hf_linx_main_version    = -1;
-static int hf_linx_main_reserved   = -1;
-static int hf_linx_main_connection = -1;
-static int hf_linx_main_bundle     = -1;
-static int hf_linx_main_pkgsize    = -1;
+static int hf_linx_main_version;
+static int hf_linx_main_reserved;
+static int hf_linx_main_connection;
+static int hf_linx_main_bundle;
+static int hf_linx_main_pkgsize;
 
 /* UDATA */
-static int hf_linx_udata_reserved  = -1;
-static int hf_linx_udata_morefrags = -1;
-static int hf_linx_udata_fragno    = -1;
-static int hf_linx_udata_signo     = -1;
-static int hf_linx_udata_dstaddr16 = -1;
-static int hf_linx_udata_dstaddr32 = -1;
-static int hf_linx_udata_srcaddr16 = -1;
-static int hf_linx_udata_srcaddr32 = -1;
-static int hf_linx_udata_payload   = -1;
+static int hf_linx_udata_reserved;
+static int hf_linx_udata_morefrags;
+static int hf_linx_udata_fragno;
+static int hf_linx_udata_signo;
+static int hf_linx_udata_dstaddr16;
+static int hf_linx_udata_dstaddr32;
+static int hf_linx_udata_srcaddr16;
+static int hf_linx_udata_srcaddr32;
+static int hf_linx_udata_payload;
 
 /* ACK */
-static int hf_linx_ack_reserved    = -1;
-static int hf_linx_ack_request     = -1;
-static int hf_linx_ack_ackno       = -1;
-static int hf_linx_ack_seqno       = -1;
+static int hf_linx_ack_reserved;
+static int hf_linx_ack_request;
+static int hf_linx_ack_ackno;
+static int hf_linx_ack_seqno;
 
 /* CONN */
-static int hf_linx_conn_cmd          = -1;
-static int hf_linx_conn_size         = -1;
-static int hf_linx_conn_reserved     = -1;
-static int hf_linx_conn_srcmac       = -1;
-static int hf_linx_conn_dstmac       = -1;
-static int hf_linx_conn_winsize      = -1;
-static int hf_linx_conn_publcid      = -1;
-static int hf_linx_conn_feat_neg_str = -1;
+static int hf_linx_conn_cmd;
+static int hf_linx_conn_size;
+static int hf_linx_conn_reserved;
+static int hf_linx_conn_srcmac;
+static int hf_linx_conn_dstmac;
+static int hf_linx_conn_winsize;
+static int hf_linx_conn_publcid;
+static int hf_linx_conn_feat_neg_str;
 /* FRAG */
-static int hf_linx_frag_reserved   = -1;
-static int hf_linx_frag_morefrags  = -1;
-static int hf_linx_frag_fragno     = -1;
+static int hf_linx_frag_reserved;
+static int hf_linx_frag_morefrags;
+static int hf_linx_frag_fragno;
 
 /* NACK */
-static int hf_linx_nack_reserv1    = -1;
-static int hf_linx_nack_reserv2    = -1;
-static int hf_linx_nack_count      = -1;
-static int hf_linx_nack_seqno      = -1;
+static int hf_linx_nack_reserv1;
+static int hf_linx_nack_reserv2;
+static int hf_linx_nack_count;
+static int hf_linx_nack_seqno;
 
 /* RLNH */
-static int hf_linx_rlnh_msg_type32    = -1;
-static int hf_linx_rlnh_msg_type8     = -1;
-/* static int hf_linx_rlnh_linkaddr      = -1; */
-static int hf_linx_rlnh_src_linkaddr  = -1;
-static int hf_linx_rlnh_version       = -1;
-static int hf_linx_rlnh_status        = -1;
-static int hf_linx_rlnh_name          = -1;
-static int hf_linx_rlnh_peer_linkaddr = -1;
-static int hf_linx_rlnh_feat_neg_str  = -1;
-static int hf_linx_rlnh_msg_reserved  = -1;
+static int hf_linx_rlnh_msg_type32;
+static int hf_linx_rlnh_msg_type8;
+/* static int hf_linx_rlnh_linkaddr; */
+static int hf_linx_rlnh_src_linkaddr;
+static int hf_linx_rlnh_version;
+static int hf_linx_rlnh_status;
+static int hf_linx_rlnh_name;
+static int hf_linx_rlnh_peer_linkaddr;
+static int hf_linx_rlnh_feat_neg_str;
+static int hf_linx_rlnh_msg_reserved;
 
 /* TCP CM */
-/* static int hf_linx_tcp_reserved           = -1; */
-static int hf_linx_tcp_oob                = -1;
-static int hf_linx_tcp_version            = -1;
-static int hf_linx_tcp_type               = -1;
-static int hf_linx_tcp_src                = -1;
-static int hf_linx_tcp_dst                = -1;
-static int hf_linx_tcp_size               = -1;
-static int hf_linx_tcp_rlnh_msg_type32    = -1;
-static int hf_linx_tcp_rlnh_msg_type8     = -1;
-/* static int hf_linx_tcp_rlnh_linkaddr      = -1; */
-static int hf_linx_tcp_rlnh_src_linkaddr  = -1;
-static int hf_linx_tcp_rlnh_version       = -1;
-static int hf_linx_tcp_rlnh_status        = -1;
-static int hf_linx_tcp_rlnh_name          = -1;
-static int hf_linx_tcp_rlnh_peer_linkaddr = -1;
-static int hf_linx_tcp_rlnh_feat_neg_str  = -1;
-static int hf_linx_tcp_rlnh_msg_reserved  = -1;
-static int hf_linx_tcp_payload            = -1;
+/* static int hf_linx_tcp_reserved; */
+static int hf_linx_tcp_oob;
+static int hf_linx_tcp_version;
+static int hf_linx_tcp_type;
+static int hf_linx_tcp_src;
+static int hf_linx_tcp_dst;
+static int hf_linx_tcp_size;
+static int hf_linx_tcp_rlnh_msg_type32;
+static int hf_linx_tcp_rlnh_msg_type8;
+/* static int hf_linx_tcp_rlnh_linkaddr; */
+static int hf_linx_tcp_rlnh_src_linkaddr;
+static int hf_linx_tcp_rlnh_version;
+static int hf_linx_tcp_rlnh_status;
+static int hf_linx_tcp_rlnh_name;
+static int hf_linx_tcp_rlnh_peer_linkaddr;
+static int hf_linx_tcp_rlnh_feat_neg_str;
+static int hf_linx_tcp_rlnh_msg_reserved;
+static int hf_linx_tcp_payload;
 
 
 static int rlnh_version = 0;
 
-static gint ett_linx           = -1;
-static gint ett_linx_multicore = -1;
-static gint ett_linx_main      = -1;
-static gint ett_linx_error     = -1;
-static gint ett_linx_udata     = -1;
-static gint ett_linx_ack       = -1;
-static gint ett_linx_tcp       = -1;
+static gint ett_linx;
+static gint ett_linx_multicore;
+static gint ett_linx_main;
+static gint ett_linx_error;
+static gint ett_linx_udata;
+static gint ett_linx_ack;
+static gint ett_linx_tcp;
 
-static expert_field ei_linx_version = EI_INIT;
-static expert_field ei_linx_rlnh_msg = EI_INIT;
-static expert_field ei_linx_header = EI_INIT;
+static expert_field ei_linx_version;
+static expert_field ei_linx_rlnh_msg;
+static expert_field ei_linx_header;
 
-static expert_field ei_linx_tcp_version = EI_INIT;
-static expert_field ei_linx_tcp_rlnh_msg = EI_INIT;
+static expert_field ei_linx_tcp_version;
+static expert_field ei_linx_tcp_rlnh_msg;
 
 
 
diff --git a/epan/dissectors/packet-lisp-data.c b/epan/dissectors/packet-lisp-data.c
index 787f71310b..9e968e83b4 100644
--- a/epan/dissectors/packet-lisp-data.c
+++ b/epan/dissectors/packet-lisp-data.c
@@ -39,29 +39,29 @@ void proto_reg_handoff_lisp_data(void);
 #define LISP_DATA_FLAG_RES      0x07    /* Reserved */
 
 /* Initialize the protocol and registered fields */
-static int proto_lisp_data = -1;
-static int hf_lisp_data_flags = -1;
-static int hf_lisp_data_flags_nonce = -1;
-static int hf_lisp_data_flags_lsb = -1;
-static int hf_lisp_data_flags_enr = -1;
-static int hf_lisp_data_flags_mv = -1;
-static int hf_lisp_data_flags_iid = -1;
-static int hf_lisp_data_flags_res = -1;
-static int hf_lisp_data_nonce = -1;
-static int hf_lisp_data_mapver = -1;
-static int hf_lisp_data_srcmapver = -1;
-static int hf_lisp_data_dstmapver = -1;
-static int hf_lisp_data_iid = -1;
-static int hf_lisp_data_lsb = -1;
-static int hf_lisp_data_lsb8 = -1;
+static int proto_lisp_data;
+static int hf_lisp_data_flags;
+static int hf_lisp_data_flags_nonce;
+static int hf_lisp_data_flags_lsb;
+static int hf_lisp_data_flags_enr;
+static int hf_lisp_data_flags_mv;
+static int hf_lisp_data_flags_iid;
+static int hf_lisp_data_flags_res;
+static int hf_lisp_data_nonce;
+static int hf_lisp_data_mapver;
+static int hf_lisp_data_srcmapver;
+static int hf_lisp_data_dstmapver;
+static int hf_lisp_data_iid;
+static int hf_lisp_data_lsb;
+static int hf_lisp_data_lsb8;
 
 /* Initialize the subtree pointers */
-static gint ett_lisp_data = -1;
-static gint ett_lisp_data_flags = -1;
-static gint ett_lisp_data_mapver = -1;
+static gint ett_lisp_data;
+static gint ett_lisp_data_flags;
+static gint ett_lisp_data_mapver;
 
-static expert_field ei_lisp_data_flags_en_invalid = EI_INIT;
-static expert_field ei_lisp_data_flags_nv_invalid = EI_INIT;
+static expert_field ei_lisp_data_flags_en_invalid;
+static expert_field ei_lisp_data_flags_nv_invalid;
 
 static dissector_handle_t ipv4_handle;
 static dissector_handle_t ipv6_handle;
diff --git a/epan/dissectors/packet-lisp-tcp.c b/epan/dissectors/packet-lisp-tcp.c
index f05e2bbf11..a181405d62 100644
--- a/epan/dissectors/packet-lisp-tcp.c
+++ b/epan/dissectors/packet-lisp-tcp.c
@@ -41,51 +41,51 @@ void proto_reg_handoff_lisp_tcp(void);
 static gboolean lisp_tcp_desegment = TRUE;
 
 /* Initialize the protocol and registered fields */
-static int proto_lisp_tcp = -1;
-static int hf_lisp_tcp_message_type = -1;
-static int hf_lisp_tcp_message_length = -1;
-static int hf_lisp_tcp_message_id = -1;
-static int hf_lisp_tcp_message_data = -1;
-static int hf_lisp_tcp_message_eid_afi = -1;
-static int hf_lisp_tcp_message_iid = -1;
-static int hf_lisp_tcp_message_sid = -1;
-static int hf_lisp_tcp_message_err = -1;
-static int hf_lisp_tcp_message_err_code = -1;
-static int hf_lisp_tcp_message_err_reserved = -1;
-static int hf_lisp_tcp_message_err_offending_msg_type = -1;
-static int hf_lisp_tcp_message_err_offending_msg_len = -1;
-static int hf_lisp_tcp_message_err_offending_msg_id = -1;
-static int hf_lisp_tcp_message_err_offending_msg_data = -1;
-static int hf_lisp_tcp_message_registration_reject_reason = -1;
-static int hf_lisp_tcp_message_registration_reject_res = -1;
-static int hf_lisp_tcp_message_registration_refresh_scope = -1;
-static int hf_lisp_tcp_message_registration_refresh_flags_rejected = -1;
-static int hf_lisp_tcp_message_registration_refresh_res = -1;
-static int hf_lisp_tcp_message_xtr_id = -1;
-static int hf_lisp_tcp_message_site_id = -1;
-static int hf_lisp_tcp_message_eid_prefix_length = -1;
-static int hf_lisp_tcp_message_eid_prefix_afi = -1;
-static int hf_lisp_tcp_message_eid_ipv4 = -1;
-static int hf_lisp_tcp_message_eid_ipv6 = -1;
-static int hf_lisp_tcp_message_eid_mac = -1;
-static int hf_lisp_tcp_message_eid_dn = -1;
-static int hf_lisp_tcp_message_rloc_afi = -1;
-static int hf_lisp_tcp_message_rloc_ipv4 = -1;
-static int hf_lisp_tcp_message_rloc_ipv6 = -1;
-static int hf_lisp_tcp_message_rid = -1;
-static int hf_lisp_tcp_message_end_marker = -1;
+static int proto_lisp_tcp;
+static int hf_lisp_tcp_message_type;
+static int hf_lisp_tcp_message_length;
+static int hf_lisp_tcp_message_id;
+static int hf_lisp_tcp_message_data;
+static int hf_lisp_tcp_message_eid_afi;
+static int hf_lisp_tcp_message_iid;
+static int hf_lisp_tcp_message_sid;
+static int hf_lisp_tcp_message_err;
+static int hf_lisp_tcp_message_err_code;
+static int hf_lisp_tcp_message_err_reserved;
+static int hf_lisp_tcp_message_err_offending_msg_type;
+static int hf_lisp_tcp_message_err_offending_msg_len;
+static int hf_lisp_tcp_message_err_offending_msg_id;
+static int hf_lisp_tcp_message_err_offending_msg_data;
+static int hf_lisp_tcp_message_registration_reject_reason;
+static int hf_lisp_tcp_message_registration_reject_res;
+static int hf_lisp_tcp_message_registration_refresh_scope;
+static int hf_lisp_tcp_message_registration_refresh_flags_rejected;
+static int hf_lisp_tcp_message_registration_refresh_res;
+static int hf_lisp_tcp_message_xtr_id;
+static int hf_lisp_tcp_message_site_id;
+static int hf_lisp_tcp_message_eid_prefix_length;
+static int hf_lisp_tcp_message_eid_prefix_afi;
+static int hf_lisp_tcp_message_eid_ipv4;
+static int hf_lisp_tcp_message_eid_ipv6;
+static int hf_lisp_tcp_message_eid_mac;
+static int hf_lisp_tcp_message_eid_dn;
+static int hf_lisp_tcp_message_rloc_afi;
+static int hf_lisp_tcp_message_rloc_ipv4;
+static int hf_lisp_tcp_message_rloc_ipv6;
+static int hf_lisp_tcp_message_rid;
+static int hf_lisp_tcp_message_end_marker;
 
 /* Initialize the subtree pointers */
-static gint ett_lisp_tcp = -1;
-static gint ett_lisp_tcp_lcaf = -1;
-static gint ett_lisp_tcp_eid_prefix = -1;
-static gint ett_lisp_tcp_map_register = -1;
+static gint ett_lisp_tcp;
+static gint ett_lisp_tcp_lcaf;
+static gint ett_lisp_tcp_eid_prefix;
+static gint ett_lisp_tcp_map_register;
 
 /* Initialize expert fields */
-static expert_field ei_lisp_tcp_undecoded = EI_INIT;
-static expert_field ei_lisp_tcp_invalid_length = EI_INIT;
-static expert_field ei_lisp_tcp_invalid_marker = EI_INIT;
-static expert_field ei_lisp_tcp_unexpected_afi = EI_INIT;
+static expert_field ei_lisp_tcp_undecoded;
+static expert_field ei_lisp_tcp_invalid_length;
+static expert_field ei_lisp_tcp_invalid_marker;
+static expert_field ei_lisp_tcp_unexpected_afi;
 
 static dissector_handle_t lisp_tcp_handle;
 
diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c
index 6eb7db4d20..a5596bbc59 100644
--- a/epan/dissectors/packet-lisp.c
+++ b/epan/dissectors/packet-lisp.c
@@ -127,290 +127,290 @@ void proto_reg_handoff_lisp(void);
 #define ELP_FLAG_S          0x0001
 
 /* Initialize the protocol and registered fields */
-static int proto_lisp = -1;
-static int hf_lisp_type = -1;
-static int hf_lisp_irc = -1;
-static int hf_lisp_records = -1;
-static int hf_lisp_nonce = -1;
-static int hf_lisp_keyid = -1;
-static int hf_lisp_authlen = -1;
-static int hf_lisp_auth = -1;
-static int hf_lisp_msrtr_keyid = -1;
-static int hf_lisp_msrtr_authlen = -1;
-static int hf_lisp_msrtr_auth = -1;
-static int hf_lisp_xtrid = -1;
-static int hf_lisp_siteid = -1;
+static int proto_lisp;
+static int hf_lisp_type;
+static int hf_lisp_irc;
+static int hf_lisp_records;
+static int hf_lisp_nonce;
+static int hf_lisp_keyid;
+static int hf_lisp_authlen;
+static int hf_lisp_auth;
+static int hf_lisp_msrtr_keyid;
+static int hf_lisp_msrtr_authlen;
+static int hf_lisp_msrtr_auth;
+static int hf_lisp_xtrid;
+static int hf_lisp_siteid;
 
 /* Map-Request fields */
-static int hf_lisp_mreq_flags = -1;
-static int hf_lisp_mreq_flags_auth = -1;
-static int hf_lisp_mreq_flags_mrp = -1;
-static int hf_lisp_mreq_flags_probe = -1;
-static int hf_lisp_mreq_flags_smr = -1;
-static int hf_lisp_mreq_flags_pitr = -1;
-static int hf_lisp_mreq_flags_smri = -1;
-static int hf_lisp_mreq_res = -1;
-static int hf_lisp_mreq_srceid_afi = -1;
-static int hf_lisp_mreq_srceid_string = -1;
-static int hf_lisp_mreq_srceid_ipv4 = -1;
-static int hf_lisp_mreq_srceid_ipv6 = -1;
-static int hf_lisp_mreq_srceid_mac = -1;
-static int hf_lisp_mreq_itr_rloc = -1;
-static int hf_lisp_mreq_itr_rloc_afi = -1;
-static int hf_lisp_mreq_itr_rloc_ipv4 = -1;
-static int hf_lisp_mreq_itr_rloc_ipv6 = -1;
-static int hf_lisp_mreq_record = -1;
-static int hf_lisp_mreq_record_res = -1;
-static int hf_lisp_mreq_record_prefix_length = -1;
-static int hf_lisp_mreq_record_prefix_afi = -1;
-static int hf_lisp_mreq_record_prefix_ipv4 = -1;
-static int hf_lisp_mreq_record_prefix_ipv6 = -1;
-static int hf_lisp_mreq_record_prefix_mac = -1;
-static int hf_lisp_mreq_record_prefix_dn = -1;
+static int hf_lisp_mreq_flags;
+static int hf_lisp_mreq_flags_auth;
+static int hf_lisp_mreq_flags_mrp;
+static int hf_lisp_mreq_flags_probe;
+static int hf_lisp_mreq_flags_smr;
+static int hf_lisp_mreq_flags_pitr;
+static int hf_lisp_mreq_flags_smri;
+static int hf_lisp_mreq_res;
+static int hf_lisp_mreq_srceid_afi;
+static int hf_lisp_mreq_srceid_string;
+static int hf_lisp_mreq_srceid_ipv4;
+static int hf_lisp_mreq_srceid_ipv6;
+static int hf_lisp_mreq_srceid_mac;
+static int hf_lisp_mreq_itr_rloc;
+static int hf_lisp_mreq_itr_rloc_afi;
+static int hf_lisp_mreq_itr_rloc_ipv4;
+static int hf_lisp_mreq_itr_rloc_ipv6;
+static int hf_lisp_mreq_record;
+static int hf_lisp_mreq_record_res;
+static int hf_lisp_mreq_record_prefix_length;
+static int hf_lisp_mreq_record_prefix_afi;
+static int hf_lisp_mreq_record_prefix_ipv4;
+static int hf_lisp_mreq_record_prefix_ipv6;
+static int hf_lisp_mreq_record_prefix_mac;
+static int hf_lisp_mreq_record_prefix_dn;
 
 /* Map-Reply fields */
-static int hf_lisp_mrep_record = -1;
-static int hf_lisp_mrep_flags_probe = -1;
-static int hf_lisp_mrep_flags_enlr = -1;
-static int hf_lisp_mrep_flags_sec = -1;
-static int hf_lisp_mrep_res = -1;
+static int hf_lisp_mrep_record;
+static int hf_lisp_mrep_flags_probe;
+static int hf_lisp_mrep_flags_enlr;
+static int hf_lisp_mrep_flags_sec;
+static int hf_lisp_mrep_res;
 
 /* Map-Register fields */
-static int hf_lisp_mreg_flags_pmr = -1;
-static int hf_lisp_mreg_flags_sec = -1;
-static int hf_lisp_mreg_flags_xtrid = -1;
-static int hf_lisp_mreg_flags_rtr = -1;
-static int hf_lisp_mreg_flags_wmn = -1;
-static int hf_lisp_mreg_res = -1;
+static int hf_lisp_mreg_flags_pmr;
+static int hf_lisp_mreg_flags_sec;
+static int hf_lisp_mreg_flags_xtrid;
+static int hf_lisp_mreg_flags_rtr;
+static int hf_lisp_mreg_flags_wmn;
+static int hf_lisp_mreg_res;
 
 /* Map-Notify fields */
-static int hf_lisp_mnot_flags_xtrid = -1;
-static int hf_lisp_mnot_flags_rtr = -1;
-static int hf_lisp_mnot_res = -1;
+static int hf_lisp_mnot_flags_xtrid;
+static int hf_lisp_mnot_flags_rtr;
+static int hf_lisp_mnot_res;
 
 /* Map-Referral fields */
-static int hf_lisp_mref_res = -1;
-static int hf_lisp_referral_sigcnt = -1;
-static int hf_lisp_referral_incomplete = -1;
+static int hf_lisp_mref_res;
+static int hf_lisp_referral_sigcnt;
+static int hf_lisp_referral_incomplete;
 
 /* Info fields */
-static int hf_lisp_info_r = -1;
-static int hf_lisp_info_res1 = -1;
-static int hf_lisp_info_ttl = -1;
-static int hf_lisp_info_res2 = -1;
-static int hf_lisp_info_prefix_masklen = -1;
-static int hf_lisp_info_prefix_afi = -1;
-static int hf_lisp_info_prefix_ipv4 = -1;
-static int hf_lisp_info_prefix_ipv6 = -1;
-static int hf_lisp_info_afi = -1;
+static int hf_lisp_info_r;
+static int hf_lisp_info_res1;
+static int hf_lisp_info_ttl;
+static int hf_lisp_info_res2;
+static int hf_lisp_info_prefix_masklen;
+static int hf_lisp_info_prefix_afi;
+static int hf_lisp_info_prefix_ipv4;
+static int hf_lisp_info_prefix_ipv6;
+static int hf_lisp_info_afi;
 
 /* Mapping record fields */
-static int hf_lisp_mapping = -1;
-static int hf_lisp_mapping_ttl = -1;
-static int hf_lisp_mapping_loccnt = -1;
-static int hf_lisp_mapping_eid_masklen = -1;
-static int hf_lisp_mapping_act = -1;
-static int hf_lisp_mapping_auth = -1;
-static int hf_lisp_mapping_res1 = -1;
-static int hf_lisp_mapping_res2 = -1;
-static int hf_lisp_mapping_ver = -1;
-static int hf_lisp_mapping_eid_afi = -1;
-static int hf_lisp_mapping_eid_ipv4 = -1;
-static int hf_lisp_mapping_eid_ipv6 = -1;
-static int hf_lisp_mapping_eid_mac = -1;
-static int hf_lisp_mapping_eid_dn = -1;
+static int hf_lisp_mapping;
+static int hf_lisp_mapping_ttl;
+static int hf_lisp_mapping_loccnt;
+static int hf_lisp_mapping_eid_masklen;
+static int hf_lisp_mapping_act;
+static int hf_lisp_mapping_auth;
+static int hf_lisp_mapping_res1;
+static int hf_lisp_mapping_res2;
+static int hf_lisp_mapping_ver;
+static int hf_lisp_mapping_eid_afi;
+static int hf_lisp_mapping_eid_ipv4;
+static int hf_lisp_mapping_eid_ipv6;
+static int hf_lisp_mapping_eid_mac;
+static int hf_lisp_mapping_eid_dn;
 
 /* Locator fields */
-static int hf_lisp_loc = -1;
-static int hf_lisp_loc_priority = -1;
-static int hf_lisp_loc_weight = -1;
-static int hf_lisp_loc_mpriority = -1;
-static int hf_lisp_loc_mweight = -1;
-static int hf_lisp_loc_flags = -1;
-static int hf_lisp_loc_flags_local = -1;
-static int hf_lisp_loc_flags_probe = -1;
-static int hf_lisp_loc_flags_reach = -1;
-static int hf_lisp_loc_flags_res = -1;
-static int hf_lisp_loc_afi = -1;
-static int hf_lisp_loc_locator = -1;
+static int hf_lisp_loc;
+static int hf_lisp_loc_priority;
+static int hf_lisp_loc_weight;
+static int hf_lisp_loc_mpriority;
+static int hf_lisp_loc_mweight;
+static int hf_lisp_loc_flags;
+static int hf_lisp_loc_flags_local;
+static int hf_lisp_loc_flags_probe;
+static int hf_lisp_loc_flags_reach;
+static int hf_lisp_loc_flags_res;
+static int hf_lisp_loc_afi;
+static int hf_lisp_loc_locator;
 
 /* LCAF fields */
-static int hf_lisp_lcaf = -1;
-static int hf_lisp_lcaf_header = -1;
-static int hf_lisp_lcaf_res1 = -1;
-static int hf_lisp_lcaf_flags = -1;
-static int hf_lisp_lcaf_type = -1;
-static int hf_lisp_lcaf_res2 = -1;
-static int hf_lisp_lcaf_length = -1;
+static int hf_lisp_lcaf;
+static int hf_lisp_lcaf_header;
+static int hf_lisp_lcaf_res1;
+static int hf_lisp_lcaf_flags;
+static int hf_lisp_lcaf_type;
+static int hf_lisp_lcaf_res2;
+static int hf_lisp_lcaf_length;
 
 /* LCAF AFI List fields */
-static int hf_lisp_lcaf_afi_list_item = -1;
-static int hf_lisp_lcaf_afi_list_afi = -1;
-static int hf_lisp_lcaf_afi_list_ipv4 = -1;
-static int hf_lisp_lcaf_afi_list_ipv6 = -1;
-static int hf_lisp_lcaf_afi_list_mac = -1;
-static int hf_lisp_lcaf_afi_list_dn = -1;
+static int hf_lisp_lcaf_afi_list_item;
+static int hf_lisp_lcaf_afi_list_afi;
+static int hf_lisp_lcaf_afi_list_ipv4;
+static int hf_lisp_lcaf_afi_list_ipv6;
+static int hf_lisp_lcaf_afi_list_mac;
+static int hf_lisp_lcaf_afi_list_dn;
 
 /* LCAF IID fields */
-static int hf_lisp_lcaf_iid = -1;
-static int hf_lisp_lcaf_iid_afi = -1;
-static int hf_lisp_lcaf_iid_ipv4 = -1;
-static int hf_lisp_lcaf_iid_ipv6 = -1;
-static int hf_lisp_lcaf_iid_mac = -1;
-static int hf_lisp_lcaf_iid_dn = -1;
+static int hf_lisp_lcaf_iid;
+static int hf_lisp_lcaf_iid_afi;
+static int hf_lisp_lcaf_iid_ipv4;
+static int hf_lisp_lcaf_iid_ipv6;
+static int hf_lisp_lcaf_iid_mac;
+static int hf_lisp_lcaf_iid_dn;
 
 /* LCAF ASN fields */
-static int hf_lisp_lcaf_asn = -1;
-static int hf_lisp_lcaf_asn_afi = -1;
-static int hf_lisp_lcaf_asn_ipv4 = -1;
-static int hf_lisp_lcaf_asn_ipv6 = -1;
-static int hf_lisp_lcaf_asn_mac = -1;
-static int hf_lisp_lcaf_asn_dn = -1;
+static int hf_lisp_lcaf_asn;
+static int hf_lisp_lcaf_asn_afi;
+static int hf_lisp_lcaf_asn_ipv4;
+static int hf_lisp_lcaf_asn_ipv6;
+static int hf_lisp_lcaf_asn_mac;
+static int hf_lisp_lcaf_asn_dn;
 
 /* LCAF Geo Coordinates fields */
-static int hf_lisp_lcaf_geo_lat = -1;
-static int hf_lisp_lcaf_geo_lat_hemisphere = -1;
-static int hf_lisp_lcaf_geo_lat_deg = -1;
-static int hf_lisp_lcaf_geo_lat_min = -1;
-static int hf_lisp_lcaf_geo_lat_sec = -1;
-static int hf_lisp_lcaf_geo_lon = -1;
-static int hf_lisp_lcaf_geo_lon_hemisphere = -1;
-static int hf_lisp_lcaf_geo_lon_deg = -1;
-static int hf_lisp_lcaf_geo_lon_min = -1;
-static int hf_lisp_lcaf_geo_lon_sec = -1;
-static int hf_lisp_lcaf_geo_alt = -1;
-static int hf_lisp_lcaf_geo_afi = -1;
-static int hf_lisp_lcaf_geo_ipv4 = -1;
-static int hf_lisp_lcaf_geo_ipv6 = -1;
-static int hf_lisp_lcaf_geo_mac = -1;
-static int hf_lisp_lcaf_geo_dn = -1;
+static int hf_lisp_lcaf_geo_lat;
+static int hf_lisp_lcaf_geo_lat_hemisphere;
+static int hf_lisp_lcaf_geo_lat_deg;
+static int hf_lisp_lcaf_geo_lat_min;
+static int hf_lisp_lcaf_geo_lat_sec;
+static int hf_lisp_lcaf_geo_lon;
+static int hf_lisp_lcaf_geo_lon_hemisphere;
+static int hf_lisp_lcaf_geo_lon_deg;
+static int hf_lisp_lcaf_geo_lon_min;
+static int hf_lisp_lcaf_geo_lon_sec;
+static int hf_lisp_lcaf_geo_alt;
+static int hf_lisp_lcaf_geo_afi;
+static int hf_lisp_lcaf_geo_ipv4;
+static int hf_lisp_lcaf_geo_ipv6;
+static int hf_lisp_lcaf_geo_mac;
+static int hf_lisp_lcaf_geo_dn;
 
 /* LCAF NATT fields */
-static int hf_lisp_lcaf_natt_msport = -1;
-static int hf_lisp_lcaf_natt_etrport = -1;
-static int hf_lisp_lcaf_natt_rloc = -1;
-static int hf_lisp_lcaf_natt_rloc_afi = -1;
-static int hf_lisp_lcaf_natt_rloc_ipv4 = -1;
-static int hf_lisp_lcaf_natt_rloc_ipv6 = -1;
+static int hf_lisp_lcaf_natt_msport;
+static int hf_lisp_lcaf_natt_etrport;
+static int hf_lisp_lcaf_natt_rloc;
+static int hf_lisp_lcaf_natt_rloc_afi;
+static int hf_lisp_lcaf_natt_rloc_ipv4;
+static int hf_lisp_lcaf_natt_rloc_ipv6;
 
 /* LCAF Nonce Locator fields */
-static int hf_lisp_lcaf_nonce_loc_res = -1;
-static int hf_lisp_lcaf_nonce_loc = -1;
-static int hf_lisp_lcaf_nonce_loc_afi = -1;
-static int hf_lisp_lcaf_nonce_loc_ipv4 = -1;
-static int hf_lisp_lcaf_nonce_loc_ipv6 = -1;
-static int hf_lisp_lcaf_nonce_loc_mac = -1;
-static int hf_lisp_lcaf_nonce_loc_dn = -1;
+static int hf_lisp_lcaf_nonce_loc_res;
+static int hf_lisp_lcaf_nonce_loc;
+static int hf_lisp_lcaf_nonce_loc_afi;
+static int hf_lisp_lcaf_nonce_loc_ipv4;
+static int hf_lisp_lcaf_nonce_loc_ipv6;
+static int hf_lisp_lcaf_nonce_loc_mac;
+static int hf_lisp_lcaf_nonce_loc_dn;
 
 /* LCAF Multicast Group Membership Information fields */
-static int hf_lisp_lcaf_mcinfo_flags = -1;
-static int hf_lisp_lcaf_mcinfo_flags_res = -1;
-static int hf_lisp_lcaf_mcinfo_flags_rp = -1;
-static int hf_lisp_lcaf_mcinfo_flags_leave = -1;
-static int hf_lisp_lcaf_mcinfo_flags_join = -1;
-static int hf_lisp_lcaf_mcinfo_iid = -1;
-static int hf_lisp_lcaf_mcinfo_res = -1;
-static int hf_lisp_lcaf_mcinfo_src_masklen = -1;
-static int hf_lisp_lcaf_mcinfo_grp_masklen = -1;
-static int hf_lisp_lcaf_mcinfo_src = -1;
-static int hf_lisp_lcaf_mcinfo_src_afi = -1;
-static int hf_lisp_lcaf_mcinfo_src_ipv4 = -1;
-static int hf_lisp_lcaf_mcinfo_src_ipv6 = -1;
-static int hf_lisp_lcaf_mcinfo_grp = -1;
-static int hf_lisp_lcaf_mcinfo_grp_afi = -1;
-static int hf_lisp_lcaf_mcinfo_grp_ipv4 = -1;
-static int hf_lisp_lcaf_mcinfo_grp_ipv6 = -1;
+static int hf_lisp_lcaf_mcinfo_flags;
+static int hf_lisp_lcaf_mcinfo_flags_res;
+static int hf_lisp_lcaf_mcinfo_flags_rp;
+static int hf_lisp_lcaf_mcinfo_flags_leave;
+static int hf_lisp_lcaf_mcinfo_flags_join;
+static int hf_lisp_lcaf_mcinfo_iid;
+static int hf_lisp_lcaf_mcinfo_res;
+static int hf_lisp_lcaf_mcinfo_src_masklen;
+static int hf_lisp_lcaf_mcinfo_grp_masklen;
+static int hf_lisp_lcaf_mcinfo_src;
+static int hf_lisp_lcaf_mcinfo_src_afi;
+static int hf_lisp_lcaf_mcinfo_src_ipv4;
+static int hf_lisp_lcaf_mcinfo_src_ipv6;
+static int hf_lisp_lcaf_mcinfo_grp;
+static int hf_lisp_lcaf_mcinfo_grp_afi;
+static int hf_lisp_lcaf_mcinfo_grp_ipv4;
+static int hf_lisp_lcaf_mcinfo_grp_ipv6;
 
 /* LCAF ELP fields */
-static int hf_lisp_lcaf_elp_hop = -1;
-static int hf_lisp_lcaf_elp_hop_flags = -1;
-static int hf_lisp_lcaf_elp_hop_flags_res = -1;
-static int hf_lisp_lcaf_elp_hop_flags_lookup = -1;
-static int hf_lisp_lcaf_elp_hop_flags_probe = -1;
-static int hf_lisp_lcaf_elp_hop_flags_strict = -1;
-static int hf_lisp_lcaf_elp_hop_afi = -1;
-static int hf_lisp_lcaf_elp_hop_ipv4 = -1;
-static int hf_lisp_lcaf_elp_hop_ipv6 = -1;
+static int hf_lisp_lcaf_elp_hop;
+static int hf_lisp_lcaf_elp_hop_flags;
+static int hf_lisp_lcaf_elp_hop_flags_res;
+static int hf_lisp_lcaf_elp_hop_flags_lookup;
+static int hf_lisp_lcaf_elp_hop_flags_probe;
+static int hf_lisp_lcaf_elp_hop_flags_strict;
+static int hf_lisp_lcaf_elp_hop_afi;
+static int hf_lisp_lcaf_elp_hop_ipv4;
+static int hf_lisp_lcaf_elp_hop_ipv6;
 
 /* LCAF Source/Destination 2-Tuple Lookups fields */
-static int hf_lisp_lcaf_srcdst_res = -1;
-static int hf_lisp_lcaf_srcdst_src_masklen = -1;
-static int hf_lisp_lcaf_srcdst_dst_masklen = -1;
-static int hf_lisp_lcaf_srcdst_src = -1;
-static int hf_lisp_lcaf_srcdst_src_afi = -1;
-static int hf_lisp_lcaf_srcdst_src_ipv4 = -1;
-static int hf_lisp_lcaf_srcdst_src_ipv6 = -1;
-static int hf_lisp_lcaf_srcdst_src_mac = -1;
-static int hf_lisp_lcaf_srcdst_dst = -1;
-static int hf_lisp_lcaf_srcdst_dst_afi = -1;
-static int hf_lisp_lcaf_srcdst_dst_ipv4 = -1;
-static int hf_lisp_lcaf_srcdst_dst_ipv6 = -1;
-static int hf_lisp_lcaf_srcdst_dst_mac = -1;
+static int hf_lisp_lcaf_srcdst_res;
+static int hf_lisp_lcaf_srcdst_src_masklen;
+static int hf_lisp_lcaf_srcdst_dst_masklen;
+static int hf_lisp_lcaf_srcdst_src;
+static int hf_lisp_lcaf_srcdst_src_afi;
+static int hf_lisp_lcaf_srcdst_src_ipv4;
+static int hf_lisp_lcaf_srcdst_src_ipv6;
+static int hf_lisp_lcaf_srcdst_src_mac;
+static int hf_lisp_lcaf_srcdst_dst;
+static int hf_lisp_lcaf_srcdst_dst_afi;
+static int hf_lisp_lcaf_srcdst_dst_ipv4;
+static int hf_lisp_lcaf_srcdst_dst_ipv6;
+static int hf_lisp_lcaf_srcdst_dst_mac;
 
 /* LCAF RLE fields */
-static int hf_lisp_lcaf_rle_entry = -1;
-static int hf_lisp_lcaf_rle_entry_res = -1;
-static int hf_lisp_lcaf_rle_entry_level = -1;
-static int hf_lisp_lcaf_rle_entry_afi = -1;
-static int hf_lisp_lcaf_rle_entry_ipv4 = -1;
-static int hf_lisp_lcaf_rle_entry_ipv6 = -1;
+static int hf_lisp_lcaf_rle_entry;
+static int hf_lisp_lcaf_rle_entry_res;
+static int hf_lisp_lcaf_rle_entry_level;
+static int hf_lisp_lcaf_rle_entry_afi;
+static int hf_lisp_lcaf_rle_entry_ipv4;
+static int hf_lisp_lcaf_rle_entry_ipv6;
 
 /* LCAF Key/Value Pair fields */
-static int hf_lisp_lcaf_kv_key = -1;
-static int hf_lisp_lcaf_kv_key_afi = -1;
-static int hf_lisp_lcaf_kv_key_ipv4 = -1;
-static int hf_lisp_lcaf_kv_key_ipv6 = -1;
-static int hf_lisp_lcaf_kv_key_mac = -1;
-static int hf_lisp_lcaf_kv_key_dn = -1;
-static int hf_lisp_lcaf_kv_value = -1;
-static int hf_lisp_lcaf_kv_value_afi = -1;
-static int hf_lisp_lcaf_kv_value_ipv4 = -1;
-static int hf_lisp_lcaf_kv_value_ipv6 = -1;
-static int hf_lisp_lcaf_kv_value_mac = -1;
-static int hf_lisp_lcaf_kv_value_dn = -1;
+static int hf_lisp_lcaf_kv_key;
+static int hf_lisp_lcaf_kv_key_afi;
+static int hf_lisp_lcaf_kv_key_ipv4;
+static int hf_lisp_lcaf_kv_key_ipv6;
+static int hf_lisp_lcaf_kv_key_mac;
+static int hf_lisp_lcaf_kv_key_dn;
+static int hf_lisp_lcaf_kv_value;
+static int hf_lisp_lcaf_kv_value_afi;
+static int hf_lisp_lcaf_kv_value_ipv4;
+static int hf_lisp_lcaf_kv_value_ipv6;
+static int hf_lisp_lcaf_kv_value_mac;
+static int hf_lisp_lcaf_kv_value_dn;
 
 /* Vendor Specific LCAF fields */
-static int hf_lisp_lcaf_vendor_res = -1;
-static int hf_lisp_lcaf_vendor_oui = -1;
-static int hf_lisp_lcaf_vendor_data = -1;
+static int hf_lisp_lcaf_vendor_res;
+static int hf_lisp_lcaf_vendor_oui;
+static int hf_lisp_lcaf_vendor_data;
 
 /* Encapsulated Control Message fields */
-static int hf_lisp_ecm_flags_sec = -1;
-static int hf_lisp_ecm_flags_ddt = -1;
-static int hf_lisp_ecm_res = -1;
+static int hf_lisp_ecm_flags_sec;
+static int hf_lisp_ecm_flags_ddt;
+static int hf_lisp_ecm_res;
 
 /* Initialize the subtree pointers */
-static gint ett_lisp = -1;
-static gint ett_lisp_mr = -1;
-static gint ett_lisp_mreq_flags = -1;
-static gint ett_lisp_mapping = -1;
-static gint ett_lisp_itr = -1;
-static gint ett_lisp_record = -1;
-static gint ett_lisp_lcaf = -1;
-static gint ett_lisp_lcaf_header = -1;
-static gint ett_lisp_lcaf_geo_lat = -1;
-static gint ett_lisp_lcaf_geo_lon = -1;
-static gint ett_lisp_lcaf_natt_rloc = -1;
-static gint ett_lisp_lcaf_mcinfo_flags = -1;
-static gint ett_lisp_lcaf_mcinfo_src = -1;
-static gint ett_lisp_lcaf_mcinfo_grp = -1;
-static gint ett_lisp_lcaf_elp_hop = -1;
-static gint ett_lisp_lcaf_elp_hop_flags = -1;
-static gint ett_lisp_lcaf_srcdst_src = -1;
-static gint ett_lisp_lcaf_srcdst_dst = -1;
-static gint ett_lisp_lcaf_rle_entry = -1;
-static gint ett_lisp_lcaf_kv_key = -1;
-static gint ett_lisp_lcaf_kv_value = -1;
-static gint ett_lisp_lcaf_vendor = -1;
-static gint ett_lisp_loc = -1;
-static gint ett_lisp_loc_flags = -1;
-static gint ett_lisp_info_prefix = -1;
-static gint ett_lisp_afi_list = -1;
-
-static expert_field ei_lisp_undecoded = EI_INIT;
-static expert_field ei_lisp_expected_field = EI_INIT;
-static expert_field ei_lisp_invalid_field = EI_INIT;
-static expert_field ei_lisp_unexpected_field = EI_INIT;
+static gint ett_lisp;
+static gint ett_lisp_mr;
+static gint ett_lisp_mreq_flags;
+static gint ett_lisp_mapping;
+static gint ett_lisp_itr;
+static gint ett_lisp_record;
+static gint ett_lisp_lcaf;
+static gint ett_lisp_lcaf_header;
+static gint ett_lisp_lcaf_geo_lat;
+static gint ett_lisp_lcaf_geo_lon;
+static gint ett_lisp_lcaf_natt_rloc;
+static gint ett_lisp_lcaf_mcinfo_flags;
+static gint ett_lisp_lcaf_mcinfo_src;
+static gint ett_lisp_lcaf_mcinfo_grp;
+static gint ett_lisp_lcaf_elp_hop;
+static gint ett_lisp_lcaf_elp_hop_flags;
+static gint ett_lisp_lcaf_srcdst_src;
+static gint ett_lisp_lcaf_srcdst_dst;
+static gint ett_lisp_lcaf_rle_entry;
+static gint ett_lisp_lcaf_kv_key;
+static gint ett_lisp_lcaf_kv_value;
+static gint ett_lisp_lcaf_vendor;
+static gint ett_lisp_loc;
+static gint ett_lisp_loc_flags;
+static gint ett_lisp_info_prefix;
+static gint ett_lisp_afi_list;
+
+static expert_field ei_lisp_undecoded;
+static expert_field ei_lisp_expected_field;
+static expert_field ei_lisp_invalid_field;
+static expert_field ei_lisp_unexpected_field;
 
 static dissector_handle_t lisp_handle;
 
diff --git a/epan/dissectors/packet-lithionics.c b/epan/dissectors/packet-lithionics.c
index 7906315714..bf8b59fec0 100644
--- a/epan/dissectors/packet-lithionics.c
+++ b/epan/dissectors/packet-lithionics.c
@@ -22,45 +22,45 @@ void proto_reg_handoff_lithionics(void);
 
 static dissector_handle_t lithionics_handle;
 
-static int proto_lithionics = -1;
-
-static int hf_lithionics_battery_address = -1;
-static int hf_lithionics_amp_hours_remain = -1;
-static int hf_lithionics_volts = -1;
-static int hf_lithionics_bat_gauge = -1;
-static int hf_lithionics_soc = -1;
-static int hf_lithionics_direction = -1;
-static int hf_lithionics_amps = -1;
-static int hf_lithionics_watts = -1;
-static int hf_lithionics_temperature = -1;
-static int hf_lithionics_system_status = -1;
-static int hf_lithionics_system_status_high_voltage_state = -1;
-static int hf_lithionics_system_status_charge_source_detected = -1;
-static int hf_lithionics_system_status_neverdie_reserve_state = -1;
-static int hf_lithionics_system_status_optoloop_cell_open = -1;
-static int hf_lithionics_system_status_reserve_voltage_range = -1;
-static int hf_lithionics_system_status_low_voltage_state = -1;
-static int hf_lithionics_system_status_battery_protection_state = -1;
-static int hf_lithionics_system_status_power_off_state = -1;
-static int hf_lithionics_system_status_aux_contacts_state = -1;
-static int hf_lithionics_system_status_aux_contacts_error = -1;
-static int hf_lithionics_system_status_precharge_error = -1;
-static int hf_lithionics_system_status_contactor_flutter = -1;
-static int hf_lithionics_system_status_ac_power_present = -1;
-static int hf_lithionics_system_status_tsm_charger_present = -1;
-static int hf_lithionics_system_status_tsm_charger_error = -1;
-static int hf_lithionics_system_status_external_temp_sensor_error = -1;
-static int hf_lithionics_system_status_agsr_state = -1;
-static int hf_lithionics_system_status_high_temperature_state = -1;
-static int hf_lithionics_system_status_low_temperature_state = -1;
-static int hf_lithionics_system_status_aux_input1_state = -1;
-static int hf_lithionics_system_status_charge_disable_state = -1;
-static int hf_lithionics_system_status_overcurrent_state = -1;
-static int hf_lithionics_system_status_reserved = -1;
-static int hf_lithionics_temination = -1;
-
-static gint ett_lithionics = -1;
-static gint ett_lithionics_system_status = -1;
+static int proto_lithionics;
+
+static int hf_lithionics_battery_address;
+static int hf_lithionics_amp_hours_remain;
+static int hf_lithionics_volts;
+static int hf_lithionics_bat_gauge;
+static int hf_lithionics_soc;
+static int hf_lithionics_direction;
+static int hf_lithionics_amps;
+static int hf_lithionics_watts;
+static int hf_lithionics_temperature;
+static int hf_lithionics_system_status;
+static int hf_lithionics_system_status_high_voltage_state;
+static int hf_lithionics_system_status_charge_source_detected;
+static int hf_lithionics_system_status_neverdie_reserve_state;
+static int hf_lithionics_system_status_optoloop_cell_open;
+static int hf_lithionics_system_status_reserve_voltage_range;
+static int hf_lithionics_system_status_low_voltage_state;
+static int hf_lithionics_system_status_battery_protection_state;
+static int hf_lithionics_system_status_power_off_state;
+static int hf_lithionics_system_status_aux_contacts_state;
+static int hf_lithionics_system_status_aux_contacts_error;
+static int hf_lithionics_system_status_precharge_error;
+static int hf_lithionics_system_status_contactor_flutter;
+static int hf_lithionics_system_status_ac_power_present;
+static int hf_lithionics_system_status_tsm_charger_present;
+static int hf_lithionics_system_status_tsm_charger_error;
+static int hf_lithionics_system_status_external_temp_sensor_error;
+static int hf_lithionics_system_status_agsr_state;
+static int hf_lithionics_system_status_high_temperature_state;
+static int hf_lithionics_system_status_low_temperature_state;
+static int hf_lithionics_system_status_aux_input1_state;
+static int hf_lithionics_system_status_charge_disable_state;
+static int hf_lithionics_system_status_overcurrent_state;
+static int hf_lithionics_system_status_reserved;
+static int hf_lithionics_temination;
+
+static gint ett_lithionics;
+static gint ett_lithionics_system_status;
 
 static int* const system_status_flags[] = {
 	&hf_lithionics_system_status_high_voltage_state,
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index df0ce1be7c..4e4f2acee1 100644
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -37,40 +37,40 @@ void proto_reg_handoff_llc(void);
 
 #define UDP_PORT_LLC_RANGE   "12000-12004"
 
-static int proto_llc = -1;
-static int hf_llc_dsap = -1;
-static int hf_llc_ssap = -1;
-static int hf_llc_dsap_sap = -1;
-static int hf_llc_dsap_ig = -1;
-static int hf_llc_ssap_sap = -1;
-static int hf_llc_ssap_cr = -1;
-static int hf_llc_ctrl = -1;
-static int hf_llc_n_r = -1;
-static int hf_llc_n_s = -1;
-static int hf_llc_p = -1;
-static int hf_llc_p_ext = -1;
-static int hf_llc_f = -1;
-static int hf_llc_f_ext = -1;
-static int hf_llc_s_ftype = -1;
-static int hf_llc_u_modifier_cmd = -1;
-static int hf_llc_u_modifier_resp = -1;
-static int hf_llc_ftype_i = -1;
-static int hf_llc_ftype_s_u = -1;
-static int hf_llc_ftype_s_u_ext = -1;
-static int hf_llc_type = -1;
-static int hf_llc_oui = -1;
-static int hf_llc_pid = -1;
-
-static int proto_basicxid = -1;
-static int hf_llc_xid_format = -1;
-static int hf_llc_xid_types = -1;
-static int hf_llc_xid_wsize = -1;
-
-static gint ett_llc = -1;
-static gint ett_llc_dsap = -1;
-static gint ett_llc_ssap = -1;
-static gint ett_llc_ctrl = -1;
-static gint ett_llc_basicxid = -1;
+static int proto_llc;
+static int hf_llc_dsap;
+static int hf_llc_ssap;
+static int hf_llc_dsap_sap;
+static int hf_llc_dsap_ig;
+static int hf_llc_ssap_sap;
+static int hf_llc_ssap_cr;
+static int hf_llc_ctrl;
+static int hf_llc_n_r;
+static int hf_llc_n_s;
+static int hf_llc_p;
+static int hf_llc_p_ext;
+static int hf_llc_f;
+static int hf_llc_f_ext;
+static int hf_llc_s_ftype;
+static int hf_llc_u_modifier_cmd;
+static int hf_llc_u_modifier_resp;
+static int hf_llc_ftype_i;
+static int hf_llc_ftype_s_u;
+static int hf_llc_ftype_s_u_ext;
+static int hf_llc_type;
+static int hf_llc_oui;
+static int hf_llc_pid;
+
+static int proto_basicxid;
+static int hf_llc_xid_format;
+static int hf_llc_xid_types;
+static int hf_llc_xid_wsize;
+
+static gint ett_llc;
+static gint ett_llc_dsap;
+static gint ett_llc_ssap;
+static gint ett_llc_ctrl;
+static gint ett_llc_basicxid;
 
 static dissector_table_t dsap_subdissector_table;
 static dissector_table_t xid_subdissector_table;
diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c
index d70c379daf..50b7dff80f 100644
--- a/epan/dissectors/packet-lldp.c
+++ b/epan/dissectors/packet-lldp.c
@@ -61,514 +61,514 @@ static dissector_handle_t lldp_handle;
 void proto_register_lldp(void);
 void proto_reg_handoff_lldp(void);
 
-static int hf_ex_avaya_tlv_subtype = -1;
-static int hf_ex_avaya_hmac_shi = -1;
-static int hf_ex_avaya_element_type = -1;
-static int hf_ex_avaya_state = -1;
-static int hf_ex_avaya_vlan = -1;
-static int hf_ex_avaya_mgnt_vlan = -1;
-static int hf_ex_avaya_rsvd = -1;
-static int hf_ex_avaya_system_id = -1;
-static int hf_ex_avaya_status = -1;
-static int hf_ex_avaya_i_sid = -1;
-
-static int hf_ex_avaya2_tlv_subtype = -1;
-static int hf_ex_avaya2_fabric_connect = -1;
-static int hf_ex_avaya2_fabric_numbvlans = -1;
-static int hf_ex_avaya2_fabric_bvlanid = -1;
-static int hf_ex_avaya2_fabric_sysidlength = -1;
-static int hf_ex_avaya2_fabric_sysid = -1;
+static int hf_ex_avaya_tlv_subtype;
+static int hf_ex_avaya_hmac_shi;
+static int hf_ex_avaya_element_type;
+static int hf_ex_avaya_state;
+static int hf_ex_avaya_vlan;
+static int hf_ex_avaya_mgnt_vlan;
+static int hf_ex_avaya_rsvd;
+static int hf_ex_avaya_system_id;
+static int hf_ex_avaya_status;
+static int hf_ex_avaya_i_sid;
+
+static int hf_ex_avaya2_tlv_subtype;
+static int hf_ex_avaya2_fabric_connect;
+static int hf_ex_avaya2_fabric_numbvlans;
+static int hf_ex_avaya2_fabric_bvlanid;
+static int hf_ex_avaya2_fabric_sysidlength;
+static int hf_ex_avaya2_fabric_sysid;
 
 /* Sub Dissector Tables */
 static dissector_table_t oui_unique_code_table;
 
 /* Initialize the protocol and registered fields */
-static int proto_lldp = -1;
-static int hf_lldp_tlv_type = -1;
-static int hf_lldp_tlv_len = -1;
-static int hf_lldp_tlv_system_cap = -1;
-static int hf_lldp_tlv_system_cap_other = -1;
-static int hf_lldp_tlv_system_cap_repeater = -1;
-static int hf_lldp_tlv_system_cap_bridge = -1;
-static int hf_lldp_tlv_system_cap_wlan_access_pt = -1;
-static int hf_lldp_tlv_system_cap_router = -1;
-static int hf_lldp_tlv_system_cap_telephone = -1;
-static int hf_lldp_tlv_system_cap_docsis_cable_device = -1;
-static int hf_lldp_tlv_system_cap_station_only = -1;
-static int hf_lldp_tlv_system_cap_cvlan_component = -1;
-static int hf_lldp_tlv_system_cap_svlan_component = -1;
-static int hf_lldp_tlv_system_cap_tpmr_component = -1;
-static int hf_lldp_tlv_system_name = -1;
-static int hf_lldp_tlv_system_desc = -1;
-static int hf_lldp_tlv_enable_system_cap = -1;
-static int hf_lldp_tlv_enable_system_cap_other = -1;
-static int hf_lldp_tlv_enable_system_cap_repeater = -1;
-static int hf_lldp_tlv_enable_system_cap_bridge = -1;
-static int hf_lldp_tlv_enable_system_cap_wlan_access_pt = -1;
-static int hf_lldp_tlv_enable_system_cap_router = -1;
-static int hf_lldp_tlv_enable_system_cap_telephone = -1;
-static int hf_lldp_tlv_enable_system_cap_docsis_cable_device = -1;
-static int hf_lldp_tlv_enable_system_cap_station_only = -1;
-static int hf_lldp_tlv_enable_system_cap_cvlan_component = -1;
-static int hf_lldp_tlv_enable_system_cap_svlan_component = -1;
-static int hf_lldp_tlv_enable_system_cap_tpmr_component = -1;
-static int hf_chassis_id_subtype = -1;
-static int hf_chassis_id = -1;
-static int hf_chassis_id_mac = -1;
-static int hf_chassis_id_ip4 = -1;
-static int hf_chassis_id_ip6 = -1;
-static int hf_port_id_subtype = -1;
-static int hf_port_id = -1;
-static int hf_port_desc = -1;
-static int hf_port_id_mac = -1;
-static int hf_lldp_network_address_family = -1;
-static int hf_port_id_ip4 = -1;
-static int hf_port_id_ip6 = -1;
-static int hf_time_to_live = -1;
-static int hf_mgn_address_len = -1;
-static int hf_mgn_address_subtype = -1;
-static int hf_mgn_addr_ipv4 = -1;
-static int hf_mgn_addr_ipv6 = -1;
-static int hf_mgn_addr_hex = -1;
-static int hf_mgn_interface_subtype = -1;
-static int hf_mgn_interface_number = -1;
-static int hf_mgn_oid_len = -1;
-static int hf_mgn_obj_id = -1;
-static int hf_org_spc_oui = -1;
-static int hf_dcbx_type = -1;
-static int hf_dcbx_tlv_type = -1;
-static int hf_dcbx_tlv_len = -1;
-static int hf_dcbx_tlv_oper_version = -1;
-static int hf_dcbx_tlv_max_version = -1;
-static int hf_dcbx_control_sequence = -1;
-static int hf_dcbx_control_ack = -1;
-static int hf_dcbx_feature_flag_enabled = -1;
-static int hf_dcbx_feature_flag_error = -1;
-static int hf_dcbx_feature_flag_willing = -1;
-static int hf_dcbx_feature_subtype = -1;
-static int hf_dcbx_feature_pgid_reserved = -1;
-static int hf_dcbx_feature_pgid_prio_0 = -1;
-static int hf_dcbx_feature_pgid_prio_1 = -1;
-static int hf_dcbx_feature_pgid_prio_2 = -1;
-static int hf_dcbx_feature_pgid_prio_3 = -1;
-static int hf_dcbx_feature_pgid_prio_4 = -1;
-static int hf_dcbx_feature_pgid_prio_5 = -1;
-static int hf_dcbx_feature_pgid_prio_6 = -1;
-static int hf_dcbx_feature_pgid_prio_7 = -1;
-static int hf_dcbx_feature_pg_per_0 = -1;
-static int hf_dcbx_feature_pg_per_1 = -1;
-static int hf_dcbx_feature_pg_per_2 = -1;
-static int hf_dcbx_feature_pg_per_3 = -1;
-static int hf_dcbx_feature_pg_per_4 = -1;
-static int hf_dcbx_feature_pg_per_5 = -1;
-static int hf_dcbx_feature_pg_per_6 = -1;
-static int hf_dcbx_feature_pg_per_7 = -1;
-static int hf_dcbx_feature_pg_numtcs = -1;
-static int hf_dcbx_feature_pfc_prio0 = -1;
-static int hf_dcbx_feature_pfc_prio1 = -1;
-static int hf_dcbx_feature_pfc_prio2 = -1;
-static int hf_dcbx_feature_pfc_prio3 = -1;
-static int hf_dcbx_feature_pfc_prio4 = -1;
-static int hf_dcbx_feature_pfc_prio5 = -1;
-static int hf_dcbx_feature_pfc_prio6 = -1;
-static int hf_dcbx_feature_pfc_prio7 = -1;
-static int hf_dcbx_feature_pfc_numtcs = -1;
-static int hf_dcbx_feature_app_proto = -1;
-static int hf_dcbx_feature_app_selector = -1;
-static int hf_dcbx_feature_app_oui = -1;
-static int hf_dcbx_feature_app_prio = -1;
-static int hf_dcbx_feature_flag_llink_type = -1;
-static int hf_ieee_802_1_subtype = -1;
-static int hf_ieee_802_1_port_and_vlan_id_flag = -1;
-static int hf_ieee_802_1_port_and_vlan_id_flag_supported = -1;
-static int hf_ieee_802_1_port_and_vlan_id_flag_enabled = -1;
-static int hf_ieee_802_1_port_vlan_id = -1;
-static int hf_ieee_802_1_port_proto_vlan_id = -1;
-static int hf_ieee_802_1_vlan_id = -1;
-static int hf_ieee_802_1_vlan_name_length = -1;
-static int hf_ieee_802_1_vlan_name = -1;
-static int hf_ieee_802_1_proto_id_length = -1;
-static int hf_ieee_802_1_proto_id = -1;
-static int hf_ieee_802_1_aggregation_status = -1;
-static int hf_ieee_802_1_aggregation_status_cap = -1;
-static int hf_ieee_802_1_aggregation_status_enabled = -1;
-static int hf_ieee_802_1_aggregation_status_porttype = -1;
-static int hf_ieee_802_1_aggregated_port_id = -1;
-static int hf_ieee_8021qau_cnpv_prio0 = -1;
-static int hf_ieee_8021qau_cnpv_prio1 = -1;
-static int hf_ieee_8021qau_cnpv_prio2 = -1;
-static int hf_ieee_8021qau_cnpv_prio3 = -1;
-static int hf_ieee_8021qau_cnpv_prio4 = -1;
-static int hf_ieee_8021qau_cnpv_prio5 = -1;
-static int hf_ieee_8021qau_cnpv_prio6 = -1;
-static int hf_ieee_8021qau_cnpv_prio7 = -1;
-static int hf_ieee_8021qau_ready_prio0 = -1;
-static int hf_ieee_8021qau_ready_prio1 = -1;
-static int hf_ieee_8021qau_ready_prio2 = -1;
-static int hf_ieee_8021qau_ready_prio3 = -1;
-static int hf_ieee_8021qau_ready_prio4 = -1;
-static int hf_ieee_8021qau_ready_prio5 = -1;
-static int hf_ieee_8021qau_ready_prio6 = -1;
-static int hf_ieee_8021qau_ready_prio7 = -1;
-static int hf_ieee_8021az_feature_flag_willing = -1;
-static int hf_ieee_8021az_feature_flag_cbs = -1;
-static int hf_ieee_8021az_maxtcs = -1;
-static int hf_ieee_8021az_tsa_class0 = -1;
-static int hf_ieee_8021az_tsa_class1 = -1;
-static int hf_ieee_8021az_tsa_class2 = -1;
-static int hf_ieee_8021az_tsa_class3 = -1;
-static int hf_ieee_8021az_tsa_class4 = -1;
-static int hf_ieee_8021az_tsa_class5 = -1;
-static int hf_ieee_8021az_tsa_class6 = -1;
-static int hf_ieee_8021az_tsa_class7 = -1;
-static int hf_ieee_8021az_feature_flag_mbc = -1;
-static int hf_ieee_8021az_pfc_numtcs = -1;
-static int hf_ieee_8021az_app_reserved = -1;
-static int hf_ieee_8021az_app_prio = -1;
-static int hf_ieee_8021az_app_selector = -1;
-static int hf_ieee_802_3_subtype = -1;
-static int hf_ieee_802_3_mac_phy_auto_neg_status = -1;
-static int hf_ieee_802_3_mac_phy_auto_neg_status_supported = -1;
-static int hf_ieee_802_3_mac_phy_auto_neg_status_enabled = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_1000base_tfd = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_1000base_t = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_1000base_xfd = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_1000base_x = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_fdx_bpause = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_fdx_spause = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_fdx_apause = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_fdx_pause = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_100base_t2fd = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_100base_t2 = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_100base_txfd = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_100base_tx = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_100base_t4 = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_10base_tfd = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_10base_t = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_other = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_1000base_tfd = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_1000base_t = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_1000base_xfd = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_1000base_x = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_fdx_bpause = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_fdx_spause = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_fdx_apause = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_fdx_pause = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_100base_t2fd = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_100base_t2 = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_100base_txfd = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_100base_tx = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_100base_t4 = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_10base_tfd = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_10base_t = -1;
-static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_other = -1;
-static int hf_ieee_802_3_pmd_mau_type = -1;
-static int hf_ieee_802_3_mdi_power_support = -1;
-static int hf_ieee_802_3_mdi_power_support_port_class = -1;
-static int hf_ieee_802_3_mdi_power_support_pse_power_support = -1;
-static int hf_ieee_802_3_mdi_power_support_pse_power_enabled = -1;
-static int hf_ieee_802_3_mdi_power_support_pse_pairs = -1;
-static int hf_ieee_802_3_mdi_power_pse_pair = -1;
-static int hf_ieee_802_3_mdi_power_class = -1;
-static int hf_ieee_802_3_mdi_power_type = -1;
-static int hf_ieee_802_3_mdi_power_source = -1;
-static int hf_ieee_802_3_mdi_power_priority = -1;
-static int hf_ieee_802_3_mdi_requested_power = -1;
-static int hf_ieee_802_3_mdi_allocated_power = -1;
-
-static int hf_ieee_802_3_bt_ds_pd_requested_power_value_mode_a = -1;
-static int hf_ieee_802_3_bt_ds_pd_requested_power_value_mode_b = -1;
-static int hf_ieee_802_3_bt_ds_pse_allocated_power_value_alt_a = -1;
-static int hf_ieee_802_3_bt_ds_pse_allocated_power_value_alt_b = -1;
-static int hf_ieee_802_3_bt_power_status = -1;
-static int hf_ieee_802_3_bt_pse_powering_status = -1;
-static int hf_ieee_802_3_bt_pd_powered_status = -1;
-static int hf_ieee_802_3_bt_pse_power_pairs_ext = -1;
-static int hf_ieee_802_3_bt_ds_pwr_class_ext_a = -1;
-static int hf_ieee_802_3_bt_ds_pwr_class_ext_b = -1;
-static int hf_ieee_802_3_bt_pwr_class_ext = -1;
-static int hf_ieee_802_3_bt_system_setup = -1;
-static int hf_ieee_802_3_bt_power_type_ext = -1;
-static int hf_ieee_802_3_bt_pse_maximum_available_power_value = -1;
-static int hf_ieee_802_3_bt_autoclass = -1;
-static int hf_ieee_802_3_bt_pse_autoclass_support = -1;
-static int hf_ieee_802_3_bt_autoclass_completed = -1;
-static int hf_ieee_802_3_bt_autoclass_request = -1;
-static int hf_ieee_802_3_bt_autoclass_reserved = -1;
-static int hf_ieee_802_3_bt_power_down = -1;
-static int hf_ieee_802_3_bt_power_down_request = -1;
-static int hf_ieee_802_3_bt_power_down_time = -1;
-static int hf_ieee_802_3_aggregation_status = -1;
-static int hf_ieee_802_3_aggregation_status_cap = -1;
-static int hf_ieee_802_3_aggregation_status_enabled = -1;
-static int hf_ieee_802_3_aggregated_port_id = -1;
-static int hf_ieee_802_3_max_frame_size = -1;
-static int hf_ieee_802_3_eee_transmit = -1;
-static int hf_ieee_802_3_eee_receive = -1;
-static int hf_ieee_802_3_eee_fallback_receive = -1;
-static int hf_ieee_802_3_eee_echo_transmit = -1;
-static int hf_ieee_802_3_eee_echo_receive = -1;
-static int hf_ieee_802_1qbg_subtype = -1;
-static int hf_ieee_802_1qbg_evb_support_caps = -1;
-static int hf_ieee_802_1qbg_evb_support_caps_std = -1;
-static int hf_ieee_802_1qbg_evb_support_caps_rr = -1;
-static int hf_ieee_802_1qbg_evb_support_caps_rte = -1;
-static int hf_ieee_802_1qbg_evb_support_caps_ecp = -1;
-static int hf_ieee_802_1qbg_evb_support_caps_vdp = -1;
-static int hf_ieee_802_1qbg_evb_configure_caps = -1;
-static int hf_ieee_802_1qbg_evb_configure_caps_std = -1;
-static int hf_ieee_802_1qbg_evb_configure_caps_rr = -1;
-static int hf_ieee_802_1qbg_evb_configure_caps_rte = -1;
-static int hf_ieee_802_1qbg_evb_configure_caps_ecp = -1;
-static int hf_ieee_802_1qbg_evb_configure_caps_vdp = -1;
-static int hf_ieee_802_1qbg_evb_supported_vsi = -1;
-static int hf_ieee_802_1qbg_evb_configured_vsi = -1;
-static int hf_ieee_802_1qbg_evb_retrans_timer = -1;
-static int hf_ieee_802_3br_aec = -1;
-static int hf_ieee_802_3br_aec_support = -1;
-static int hf_ieee_802_3br_aec_enable = -1;
-static int hf_ieee_802_3br_aec_active = -1;
-static int hf_ieee_802_3br_aec_addfragsize = -1;
-static int hf_ieee_802_3br_aec_reserved = -1;
-static int hf_media_tlv_subtype = -1;
-static int hf_media_tlv_subtype_caps = -1;
-static int hf_media_tlv_subtype_caps_llpd = -1;
-static int hf_media_tlv_subtype_caps_network_policy = -1;
-static int hf_media_tlv_subtype_caps_location_id = -1;
-static int hf_media_tlv_subtype_caps_mdi_pse = -1;
-static int hf_media_tlv_subtype_caps_mid_pd = -1;
-static int hf_media_tlv_subtype_caps_inventory = -1;
-static int hf_media_tlv_subtype_class = -1;
-static int hf_media_application_type = -1;
-static int hf_media_policy_flag = -1;
-static int hf_media_tag_flag = -1;
-static int hf_media_vlan_id = -1;
-static int hf_media_l2_prio = -1;
-static int hf_media_dscp = -1;
-static int hf_media_loc_data_format = -1;
-static int hf_media_loc_lat_resolution = -1;
-static int hf_media_loc_lat = -1;
-static int hf_media_loc_long_resolution = -1;
-static int hf_media_loc_long = -1;
-static int hf_media_loc_alt_type = -1;
-static int hf_media_loc_alt_resolution = -1;
-static int hf_media_loc_alt = -1;
-static int hf_media_loc_datum = -1;
-static int hf_media_civic_lci_length = -1;
-static int hf_media_civic_what = -1;
-static int hf_media_civic_country = -1;
-static int hf_media_civic_addr_type = -1;
-static int hf_media_civic_addr_len = -1;
-static int hf_media_civic_addr_value = -1;
-static int hf_media_ecs = -1;
-static int hf_media_power_type = -1;
-static int hf_media_power_source = -1;
-static int hf_media_power_priority = -1;
-static int hf_media_power_value = -1;
-static int hf_media_hardware = -1;
-static int hf_media_firmware = -1;
-static int hf_media_software = -1;
-static int hf_media_sn = -1;
-static int hf_media_manufacturer = -1;
-static int hf_media_model = -1;
-static int hf_media_asset = -1;
-static int hf_profinet_tlv_subtype = -1;
-static int hf_profinet_class2_port_status = -1;
-static int hf_profinet_class3_port_status = -1;
-static int hf_profinet_class3_port_status_Fragmentation = -1;
-static int hf_profinet_class3_port_status_reserved = -1;
-static int hf_profinet_class3_port_status_PreambleLength = -1;
-static int hf_profinet_port_rx_delay_local = -1;
-static int hf_profinet_port_rx_delay_remote = -1;
-static int hf_profinet_port_tx_delay_local = -1;
-static int hf_profinet_port_tx_delay_remote = -1;
-static int hf_profinet_cable_delay_local = -1;
-static int hf_profinet_mrp_domain_uuid = -1;
-static int hf_profinet_tsn_domain_uuid = -1;
-static int hf_profinet_tsn_nme_management_addr = -1;
-static int hf_profinet_tsn_nme_management_addr_str_length = -1;
-static int hf_profinet_tsn_nme_management_addr_subtype = -1;
-static int hf_profinet_tsn_nme_name_uuid = -1;
-static int hf_profinet_tsn_nme_parameter_uuid = -1;
-static int hf_profinet_time_domain_number = -1;
-static int hf_profinet_time_domain_uuid = -1;
-static int hf_profinet_time_domain_master_identity = -1;
-static int hf_profinet_mrrt_port_status = -1;
-static int hf_profinet_cm_mac = -1;
-static int hf_profinet_master_source_address = -1;
-static int hf_profinet_subdomain_uuid = -1;
-static int hf_profinet_ir_data_uuid = -1;
-static int hf_profinet_length_of_period_valid = -1;
-static int hf_profinet_length_of_period_length = -1;
-static int hf_profinet_red_period_begin_valid = -1;
-static int hf_profinet_red_period_begin_offset = -1;
-static int hf_profinet_orange_period_begin_valid = -1;
-static int hf_profinet_orange_period_begin_offset = -1;
-static int hf_profinet_green_period_begin_valid = -1;
-static int hf_profinet_green_period_begin_offset = -1;
-static int hf_cisco_subtype = -1;
-static int hf_cisco_upoe = -1;
-static int hf_cisco_upoe_supported = -1;
-static int hf_cisco_upoe_altb_detection = -1;
-static int hf_cisco_upoe_req_spare_pair = -1;
-static int hf_cisco_upoe_pse_spare_pair_oper = -1;
-static int hf_cisco_aci_portstate = -1;
-static int hf_cisco_aci_noderole = -1;
-static int hf_cisco_aci_nodeid = -1;
-static int hf_cisco_aci_spinelevel = -1;
-static int hf_cisco_aci_podid = -1;
-static int hf_cisco_aci_fabricname = -1;
-static int hf_cisco_aci_apiclist = -1;
-static int hf_cisco_aci_apicid = -1;
-static int hf_cisco_aci_apicipv4 = -1;
-static int hf_cisco_aci_apicuuid = -1;
-static int hf_cisco_aci_nodeip = -1;
-static int hf_cisco_aci_portrole = -1;
-static int hf_cisco_aci_version = -1;
-static int hf_cisco_aci_fabricvlan = -1;
-static int hf_cisco_aci_serialno = -1;
-static int hf_cisco_aci_model = -1;
-static int hf_cisco_aci_nodename = -1;
-static int hf_cisco_aci_portmode = -1;
-static int hf_cisco_aci_authcookie = -1;
-static int hf_cisco_aci_apicmode = -1;
-static int hf_cisco_aci_fabricid = -1;
-static int hf_hytec_tlv_subtype = -1;
-static int hf_hytec_group = -1;
-static int hf_hytec_identifier = -1;
-static int hf_hytec_transceiver_vendor_product_revision = -1;
-static int hf_hytec_single_mode = -1;
-static int hf_hytec_multi_mode_50 = -1;
-static int hf_hytec_multi_mode_62_5 = -1;
-static int hf_hytec_tx_current_output_power = -1;
-static int hf_hytec_rx_current_input_power = -1;
-static int hf_hytec_rx_input_snr = -1;
-static int hf_hytec_lineloss = -1;
-static int hf_hytec_mac_trace_request = -1;
-static int hf_hytec_trace_mac_address = -1;
-static int hf_hytec_request_mac_address = -1;
-static int hf_hytec_maximum_depth = -1;
-static int hf_hytec_mac_trace_reply = -1;
-static int hf_hytec_answering_mac_address = -1;
-static int hf_hytec_actual_depth = -1;
-static int hf_hytec_name_of_replying_device = -1;
-static int hf_hytec_outgoing_port_name = -1;
-static int hf_hytec_ipv4_address_of_replying_device = -1;
-static int hf_hytec_end_of_trace = -1;
-static int hf_hytec_ipv6_address_of_replying_device = -1;
-static int hf_hytec_incoming_port_name = -1;
-static int hf_hytec_trace_identifier = -1;
-static int hf_hytec_invalid_object_data = -1;
-static int hf_hytec_unknown_identifier_content = -1;
-static int hf_avaya_subtype = -1;
-static int hf_avaya_poe = -1;
-static int hf_avaya_call_server = -1;
-static int hf_avaya_cna_server = -1;
-static int hf_avaya_file_server = -1;
-static int hf_avaya_dot1q = -1;
-static int hf_avaya_ipphone = -1;
-static int hf_avaya_ipphone_ip = -1;
-static int hf_avaya_ipphone_mask = -1;
-static int hf_avaya_ipphone_gateway = -1;
-static int hf_unknown_subtype = -1;
-static int hf_unknown_subtype_content = -1;
-static int hf_subtype_content_remaining = -1;
-static int hf_iana_subtype = -1;
-static int hf_iana_mudurl = -1;
-static int hf_onos_subtype = -1;
-static int hf_onos_chassis = -1;
-static int hf_onos_port = -1;
-static int hf_onos_ttl = -1;
+static int proto_lldp;
+static int hf_lldp_tlv_type;
+static int hf_lldp_tlv_len;
+static int hf_lldp_tlv_system_cap;
+static int hf_lldp_tlv_system_cap_other;
+static int hf_lldp_tlv_system_cap_repeater;
+static int hf_lldp_tlv_system_cap_bridge;
+static int hf_lldp_tlv_system_cap_wlan_access_pt;
+static int hf_lldp_tlv_system_cap_router;
+static int hf_lldp_tlv_system_cap_telephone;
+static int hf_lldp_tlv_system_cap_docsis_cable_device;
+static int hf_lldp_tlv_system_cap_station_only;
+static int hf_lldp_tlv_system_cap_cvlan_component;
+static int hf_lldp_tlv_system_cap_svlan_component;
+static int hf_lldp_tlv_system_cap_tpmr_component;
+static int hf_lldp_tlv_system_name;
+static int hf_lldp_tlv_system_desc;
+static int hf_lldp_tlv_enable_system_cap;
+static int hf_lldp_tlv_enable_system_cap_other;
+static int hf_lldp_tlv_enable_system_cap_repeater;
+static int hf_lldp_tlv_enable_system_cap_bridge;
+static int hf_lldp_tlv_enable_system_cap_wlan_access_pt;
+static int hf_lldp_tlv_enable_system_cap_router;
+static int hf_lldp_tlv_enable_system_cap_telephone;
+static int hf_lldp_tlv_enable_system_cap_docsis_cable_device;
+static int hf_lldp_tlv_enable_system_cap_station_only;
+static int hf_lldp_tlv_enable_system_cap_cvlan_component;
+static int hf_lldp_tlv_enable_system_cap_svlan_component;
+static int hf_lldp_tlv_enable_system_cap_tpmr_component;
+static int hf_chassis_id_subtype;
+static int hf_chassis_id;
+static int hf_chassis_id_mac;
+static int hf_chassis_id_ip4;
+static int hf_chassis_id_ip6;
+static int hf_port_id_subtype;
+static int hf_port_id;
+static int hf_port_desc;
+static int hf_port_id_mac;
+static int hf_lldp_network_address_family;
+static int hf_port_id_ip4;
+static int hf_port_id_ip6;
+static int hf_time_to_live;
+static int hf_mgn_address_len;
+static int hf_mgn_address_subtype;
+static int hf_mgn_addr_ipv4;
+static int hf_mgn_addr_ipv6;
+static int hf_mgn_addr_hex;
+static int hf_mgn_interface_subtype;
+static int hf_mgn_interface_number;
+static int hf_mgn_oid_len;
+static int hf_mgn_obj_id;
+static int hf_org_spc_oui;
+static int hf_dcbx_type;
+static int hf_dcbx_tlv_type;
+static int hf_dcbx_tlv_len;
+static int hf_dcbx_tlv_oper_version;
+static int hf_dcbx_tlv_max_version;
+static int hf_dcbx_control_sequence;
+static int hf_dcbx_control_ack;
+static int hf_dcbx_feature_flag_enabled;
+static int hf_dcbx_feature_flag_error;
+static int hf_dcbx_feature_flag_willing;
+static int hf_dcbx_feature_subtype;
+static int hf_dcbx_feature_pgid_reserved;
+static int hf_dcbx_feature_pgid_prio_0;
+static int hf_dcbx_feature_pgid_prio_1;
+static int hf_dcbx_feature_pgid_prio_2;
+static int hf_dcbx_feature_pgid_prio_3;
+static int hf_dcbx_feature_pgid_prio_4;
+static int hf_dcbx_feature_pgid_prio_5;
+static int hf_dcbx_feature_pgid_prio_6;
+static int hf_dcbx_feature_pgid_prio_7;
+static int hf_dcbx_feature_pg_per_0;
+static int hf_dcbx_feature_pg_per_1;
+static int hf_dcbx_feature_pg_per_2;
+static int hf_dcbx_feature_pg_per_3;
+static int hf_dcbx_feature_pg_per_4;
+static int hf_dcbx_feature_pg_per_5;
+static int hf_dcbx_feature_pg_per_6;
+static int hf_dcbx_feature_pg_per_7;
+static int hf_dcbx_feature_pg_numtcs;
+static int hf_dcbx_feature_pfc_prio0;
+static int hf_dcbx_feature_pfc_prio1;
+static int hf_dcbx_feature_pfc_prio2;
+static int hf_dcbx_feature_pfc_prio3;
+static int hf_dcbx_feature_pfc_prio4;
+static int hf_dcbx_feature_pfc_prio5;
+static int hf_dcbx_feature_pfc_prio6;
+static int hf_dcbx_feature_pfc_prio7;
+static int hf_dcbx_feature_pfc_numtcs;
+static int hf_dcbx_feature_app_proto;
+static int hf_dcbx_feature_app_selector;
+static int hf_dcbx_feature_app_oui;
+static int hf_dcbx_feature_app_prio;
+static int hf_dcbx_feature_flag_llink_type;
+static int hf_ieee_802_1_subtype;
+static int hf_ieee_802_1_port_and_vlan_id_flag;
+static int hf_ieee_802_1_port_and_vlan_id_flag_supported;
+static int hf_ieee_802_1_port_and_vlan_id_flag_enabled;
+static int hf_ieee_802_1_port_vlan_id;
+static int hf_ieee_802_1_port_proto_vlan_id;
+static int hf_ieee_802_1_vlan_id;
+static int hf_ieee_802_1_vlan_name_length;
+static int hf_ieee_802_1_vlan_name;
+static int hf_ieee_802_1_proto_id_length;
+static int hf_ieee_802_1_proto_id;
+static int hf_ieee_802_1_aggregation_status;
+static int hf_ieee_802_1_aggregation_status_cap;
+static int hf_ieee_802_1_aggregation_status_enabled;
+static int hf_ieee_802_1_aggregation_status_porttype;
+static int hf_ieee_802_1_aggregated_port_id;
+static int hf_ieee_8021qau_cnpv_prio0;
+static int hf_ieee_8021qau_cnpv_prio1;
+static int hf_ieee_8021qau_cnpv_prio2;
+static int hf_ieee_8021qau_cnpv_prio3;
+static int hf_ieee_8021qau_cnpv_prio4;
+static int hf_ieee_8021qau_cnpv_prio5;
+static int hf_ieee_8021qau_cnpv_prio6;
+static int hf_ieee_8021qau_cnpv_prio7;
+static int hf_ieee_8021qau_ready_prio0;
+static int hf_ieee_8021qau_ready_prio1;
+static int hf_ieee_8021qau_ready_prio2;
+static int hf_ieee_8021qau_ready_prio3;
+static int hf_ieee_8021qau_ready_prio4;
+static int hf_ieee_8021qau_ready_prio5;
+static int hf_ieee_8021qau_ready_prio6;
+static int hf_ieee_8021qau_ready_prio7;
+static int hf_ieee_8021az_feature_flag_willing;
+static int hf_ieee_8021az_feature_flag_cbs;
+static int hf_ieee_8021az_maxtcs;
+static int hf_ieee_8021az_tsa_class0;
+static int hf_ieee_8021az_tsa_class1;
+static int hf_ieee_8021az_tsa_class2;
+static int hf_ieee_8021az_tsa_class3;
+static int hf_ieee_8021az_tsa_class4;
+static int hf_ieee_8021az_tsa_class5;
+static int hf_ieee_8021az_tsa_class6;
+static int hf_ieee_8021az_tsa_class7;
+static int hf_ieee_8021az_feature_flag_mbc;
+static int hf_ieee_8021az_pfc_numtcs;
+static int hf_ieee_8021az_app_reserved;
+static int hf_ieee_8021az_app_prio;
+static int hf_ieee_8021az_app_selector;
+static int hf_ieee_802_3_subtype;
+static int hf_ieee_802_3_mac_phy_auto_neg_status;
+static int hf_ieee_802_3_mac_phy_auto_neg_status_supported;
+static int hf_ieee_802_3_mac_phy_auto_neg_status_enabled;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_1000base_tfd;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_1000base_t;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_1000base_xfd;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_1000base_x;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_fdx_bpause;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_fdx_spause;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_fdx_apause;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_fdx_pause;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_100base_t2fd;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_100base_t2;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_100base_txfd;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_100base_tx;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_100base_t4;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_10base_tfd;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_10base_t;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_other;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_1000base_tfd;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_1000base_t;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_1000base_xfd;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_1000base_x;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_fdx_bpause;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_fdx_spause;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_fdx_apause;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_fdx_pause;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_100base_t2fd;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_100base_t2;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_100base_txfd;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_100base_tx;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_100base_t4;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_10base_tfd;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_10base_t;
+static int hf_ieee_802_3_pmd_auto_neg_advertised_caps_inv_other;
+static int hf_ieee_802_3_pmd_mau_type;
+static int hf_ieee_802_3_mdi_power_support;
+static int hf_ieee_802_3_mdi_power_support_port_class;
+static int hf_ieee_802_3_mdi_power_support_pse_power_support;
+static int hf_ieee_802_3_mdi_power_support_pse_power_enabled;
+static int hf_ieee_802_3_mdi_power_support_pse_pairs;
+static int hf_ieee_802_3_mdi_power_pse_pair;
+static int hf_ieee_802_3_mdi_power_class;
+static int hf_ieee_802_3_mdi_power_type;
+static int hf_ieee_802_3_mdi_power_source;
+static int hf_ieee_802_3_mdi_power_priority;
+static int hf_ieee_802_3_mdi_requested_power;
+static int hf_ieee_802_3_mdi_allocated_power;
+
+static int hf_ieee_802_3_bt_ds_pd_requested_power_value_mode_a;
+static int hf_ieee_802_3_bt_ds_pd_requested_power_value_mode_b;
+static int hf_ieee_802_3_bt_ds_pse_allocated_power_value_alt_a;
+static int hf_ieee_802_3_bt_ds_pse_allocated_power_value_alt_b;
+static int hf_ieee_802_3_bt_power_status;
+static int hf_ieee_802_3_bt_pse_powering_status;
+static int hf_ieee_802_3_bt_pd_powered_status;
+static int hf_ieee_802_3_bt_pse_power_pairs_ext;
+static int hf_ieee_802_3_bt_ds_pwr_class_ext_a;
+static int hf_ieee_802_3_bt_ds_pwr_class_ext_b;
+static int hf_ieee_802_3_bt_pwr_class_ext;
+static int hf_ieee_802_3_bt_system_setup;
+static int hf_ieee_802_3_bt_power_type_ext;
+static int hf_ieee_802_3_bt_pse_maximum_available_power_value;
+static int hf_ieee_802_3_bt_autoclass;
+static int hf_ieee_802_3_bt_pse_autoclass_support;
+static int hf_ieee_802_3_bt_autoclass_completed;
+static int hf_ieee_802_3_bt_autoclass_request;
+static int hf_ieee_802_3_bt_autoclass_reserved;
+static int hf_ieee_802_3_bt_power_down;
+static int hf_ieee_802_3_bt_power_down_request;
+static int hf_ieee_802_3_bt_power_down_time;
+static int hf_ieee_802_3_aggregation_status;
+static int hf_ieee_802_3_aggregation_status_cap;
+static int hf_ieee_802_3_aggregation_status_enabled;
+static int hf_ieee_802_3_aggregated_port_id;
+static int hf_ieee_802_3_max_frame_size;
+static int hf_ieee_802_3_eee_transmit;
+static int hf_ieee_802_3_eee_receive;
+static int hf_ieee_802_3_eee_fallback_receive;
+static int hf_ieee_802_3_eee_echo_transmit;
+static int hf_ieee_802_3_eee_echo_receive;
+static int hf_ieee_802_1qbg_subtype;
+static int hf_ieee_802_1qbg_evb_support_caps;
+static int hf_ieee_802_1qbg_evb_support_caps_std;
+static int hf_ieee_802_1qbg_evb_support_caps_rr;
+static int hf_ieee_802_1qbg_evb_support_caps_rte;
+static int hf_ieee_802_1qbg_evb_support_caps_ecp;
+static int hf_ieee_802_1qbg_evb_support_caps_vdp;
+static int hf_ieee_802_1qbg_evb_configure_caps;
+static int hf_ieee_802_1qbg_evb_configure_caps_std;
+static int hf_ieee_802_1qbg_evb_configure_caps_rr;
+static int hf_ieee_802_1qbg_evb_configure_caps_rte;
+static int hf_ieee_802_1qbg_evb_configure_caps_ecp;
+static int hf_ieee_802_1qbg_evb_configure_caps_vdp;
+static int hf_ieee_802_1qbg_evb_supported_vsi;
+static int hf_ieee_802_1qbg_evb_configured_vsi;
+static int hf_ieee_802_1qbg_evb_retrans_timer;
+static int hf_ieee_802_3br_aec;
+static int hf_ieee_802_3br_aec_support;
+static int hf_ieee_802_3br_aec_enable;
+static int hf_ieee_802_3br_aec_active;
+static int hf_ieee_802_3br_aec_addfragsize;
+static int hf_ieee_802_3br_aec_reserved;
+static int hf_media_tlv_subtype;
+static int hf_media_tlv_subtype_caps;
+static int hf_media_tlv_subtype_caps_llpd;
+static int hf_media_tlv_subtype_caps_network_policy;
+static int hf_media_tlv_subtype_caps_location_id;
+static int hf_media_tlv_subtype_caps_mdi_pse;
+static int hf_media_tlv_subtype_caps_mid_pd;
+static int hf_media_tlv_subtype_caps_inventory;
+static int hf_media_tlv_subtype_class;
+static int hf_media_application_type;
+static int hf_media_policy_flag;
+static int hf_media_tag_flag;
+static int hf_media_vlan_id;
+static int hf_media_l2_prio;
+static int hf_media_dscp;
+static int hf_media_loc_data_format;
+static int hf_media_loc_lat_resolution;
+static int hf_media_loc_lat;
+static int hf_media_loc_long_resolution;
+static int hf_media_loc_long;
+static int hf_media_loc_alt_type;
+static int hf_media_loc_alt_resolution;
+static int hf_media_loc_alt;
+static int hf_media_loc_datum;
+static int hf_media_civic_lci_length;
+static int hf_media_civic_what;
+static int hf_media_civic_country;
+static int hf_media_civic_addr_type;
+static int hf_media_civic_addr_len;
+static int hf_media_civic_addr_value;
+static int hf_media_ecs;
+static int hf_media_power_type;
+static int hf_media_power_source;
+static int hf_media_power_priority;
+static int hf_media_power_value;
+static int hf_media_hardware;
+static int hf_media_firmware;
+static int hf_media_software;
+static int hf_media_sn;
+static int hf_media_manufacturer;
+static int hf_media_model;
+static int hf_media_asset;
+static int hf_profinet_tlv_subtype;
+static int hf_profinet_class2_port_status;
+static int hf_profinet_class3_port_status;
+static int hf_profinet_class3_port_status_Fragmentation;
+static int hf_profinet_class3_port_status_reserved;
+static int hf_profinet_class3_port_status_PreambleLength;
+static int hf_profinet_port_rx_delay_local;
+static int hf_profinet_port_rx_delay_remote;
+static int hf_profinet_port_tx_delay_local;
+static int hf_profinet_port_tx_delay_remote;
+static int hf_profinet_cable_delay_local;
+static int hf_profinet_mrp_domain_uuid;
+static int hf_profinet_tsn_domain_uuid;
+static int hf_profinet_tsn_nme_management_addr;
+static int hf_profinet_tsn_nme_management_addr_str_length;
+static int hf_profinet_tsn_nme_management_addr_subtype;
+static int hf_profinet_tsn_nme_name_uuid;
+static int hf_profinet_tsn_nme_parameter_uuid;
+static int hf_profinet_time_domain_number;
+static int hf_profinet_time_domain_uuid;
+static int hf_profinet_time_domain_master_identity;
+static int hf_profinet_mrrt_port_status;
+static int hf_profinet_cm_mac;
+static int hf_profinet_master_source_address;
+static int hf_profinet_subdomain_uuid;
+static int hf_profinet_ir_data_uuid;
+static int hf_profinet_length_of_period_valid;
+static int hf_profinet_length_of_period_length;
+static int hf_profinet_red_period_begin_valid;
+static int hf_profinet_red_period_begin_offset;
+static int hf_profinet_orange_period_begin_valid;
+static int hf_profinet_orange_period_begin_offset;
+static int hf_profinet_green_period_begin_valid;
+static int hf_profinet_green_period_begin_offset;
+static int hf_cisco_subtype;
+static int hf_cisco_upoe;
+static int hf_cisco_upoe_supported;
+static int hf_cisco_upoe_altb_detection;
+static int hf_cisco_upoe_req_spare_pair;
+static int hf_cisco_upoe_pse_spare_pair_oper;
+static int hf_cisco_aci_portstate;
+static int hf_cisco_aci_noderole;
+static int hf_cisco_aci_nodeid;
+static int hf_cisco_aci_spinelevel;
+static int hf_cisco_aci_podid;
+static int hf_cisco_aci_fabricname;
+static int hf_cisco_aci_apiclist;
+static int hf_cisco_aci_apicid;
+static int hf_cisco_aci_apicipv4;
+static int hf_cisco_aci_apicuuid;
+static int hf_cisco_aci_nodeip;
+static int hf_cisco_aci_portrole;
+static int hf_cisco_aci_version;
+static int hf_cisco_aci_fabricvlan;
+static int hf_cisco_aci_serialno;
+static int hf_cisco_aci_model;
+static int hf_cisco_aci_nodename;
+static int hf_cisco_aci_portmode;
+static int hf_cisco_aci_authcookie;
+static int hf_cisco_aci_apicmode;
+static int hf_cisco_aci_fabricid;
+static int hf_hytec_tlv_subtype;
+static int hf_hytec_group;
+static int hf_hytec_identifier;
+static int hf_hytec_transceiver_vendor_product_revision;
+static int hf_hytec_single_mode;
+static int hf_hytec_multi_mode_50;
+static int hf_hytec_multi_mode_62_5;
+static int hf_hytec_tx_current_output_power;
+static int hf_hytec_rx_current_input_power;
+static int hf_hytec_rx_input_snr;
+static int hf_hytec_lineloss;
+static int hf_hytec_mac_trace_request;
+static int hf_hytec_trace_mac_address;
+static int hf_hytec_request_mac_address;
+static int hf_hytec_maximum_depth;
+static int hf_hytec_mac_trace_reply;
+static int hf_hytec_answering_mac_address;
+static int hf_hytec_actual_depth;
+static int hf_hytec_name_of_replying_device;
+static int hf_hytec_outgoing_port_name;
+static int hf_hytec_ipv4_address_of_replying_device;
+static int hf_hytec_end_of_trace;
+static int hf_hytec_ipv6_address_of_replying_device;
+static int hf_hytec_incoming_port_name;
+static int hf_hytec_trace_identifier;
+static int hf_hytec_invalid_object_data;
+static int hf_hytec_unknown_identifier_content;
+static int hf_avaya_subtype;
+static int hf_avaya_poe;
+static int hf_avaya_call_server;
+static int hf_avaya_cna_server;
+static int hf_avaya_file_server;
+static int hf_avaya_dot1q;
+static int hf_avaya_ipphone;
+static int hf_avaya_ipphone_ip;
+static int hf_avaya_ipphone_mask;
+static int hf_avaya_ipphone_gateway;
+static int hf_unknown_subtype;
+static int hf_unknown_subtype_content;
+static int hf_subtype_content_remaining;
+static int hf_iana_subtype;
+static int hf_iana_mudurl;
+static int hf_onos_subtype;
+static int hf_onos_chassis;
+static int hf_onos_port;
+static int hf_onos_ttl;
 
 /* Initialize the subtree pointers */
-static gint ett_lldp = -1;
-static gint ett_chassis_id = -1;
-static gint ett_port_id = -1;
-static gint ett_time_to_live = -1;
-static gint ett_end_of_lldpdu = -1;
-static gint ett_port_description = -1;
-static gint ett_system_name = -1;
-static gint ett_system_desc = -1;
-static gint ett_system_cap = -1;
-static gint ett_system_cap_summary = -1;
-static gint ett_system_cap_enabled = -1;
-static gint ett_management_address = -1;
-static gint ett_unknown_tlv = -1;
-static gint ett_org_spc_def =-1;
-static gint ett_org_spc_dcbx_cin = -1;
-static gint ett_org_spc_dcbx_cee = -1;
-static gint ett_org_spc_dcbx_cee_1 = -1;
-static gint ett_org_spc_dcbx_cee_2 = -1;
-static gint ett_org_spc_dcbx_cee_3 = -1;
-static gint ett_org_spc_dcbx_cee_4 = -1;
-static gint ett_org_spc_dcbx_cin_6 = -1;
-static gint ett_org_spc_dcbx_cee_app = -1;
-static gint ett_org_spc_ieee_802_1_1 = -1;
-static gint ett_org_spc_ieee_802_1_2 = -1;
-static gint ett_org_spc_ieee_802_1_3 = -1;
-static gint ett_org_spc_ieee_802_1_4 = -1;
-static gint ett_org_spc_ieee_802_1_8 = -1;
-static gint ett_org_spc_ieee_802_1_9 = -1;
-static gint ett_org_spc_ieee_802_1_a = -1;
-static gint ett_org_spc_ieee_802_1_b = -1;
-static gint ett_org_spc_ieee_802_1_c = -1;
-static gint ett_org_spc_ieee_dcbx_app = -1;
-
-static gint ett_org_spc_ieee_802_3_1 = -1;
-static gint ett_org_spc_ieee_802_3_2 = -1;
-static gint ett_org_spc_ieee_802_3_3 = -1;
-static gint ett_org_spc_ieee_802_3_4 = -1;
-static gint ett_org_spc_ieee_802_3_5 = -1;
-static gint ett_org_spc_ieee_802_3_7 = -1;
-
-static gint ett_org_spc_media_1 = -1;
-static gint ett_org_spc_media_2 = -1;
-static gint ett_org_spc_media_3 = -1;
-static gint ett_org_spc_media_4 = -1;
-static gint ett_org_spc_media_5 = -1;
-static gint ett_org_spc_media_6 = -1;
-static gint ett_org_spc_media_7 = -1;
-static gint ett_org_spc_media_8 = -1;
-static gint ett_org_spc_media_9 = -1;
-static gint ett_org_spc_media_10 = -1;
-static gint ett_org_spc_media_11 = -1;
-
-static gint ett_ex_avayaSubTypes_11 = -1;
-static gint ett_ex_avayaSubTypes_12 = -1;
-static gint ett_ex_avaya2SubTypes_4 = -1;
-static gint ett_org_spc_ProfinetSubTypes_1 = -1;
-static gint ett_org_spc_ProfinetSubTypes_2 = -1;
-static gint ett_org_spc_ProfinetSubTypes_3 = -1;
-static gint ett_org_spc_ProfinetSubTypes_4 = -1;
-static gint ett_org_spc_ProfinetSubTypes_5 = -1;
-static gint ett_org_spc_ProfinetSubTypes_6 = -1;
-static gint ett_org_spc_tlv = -1;
-static gint ett_port_vlan_flags = -1;
-static gint ett_802_3_flags = -1;
-static gint ett_802_3_autoneg_advertised = -1;
-static gint ett_802_3_power = -1;
-static gint ett_802_3_bt_power = -1;
-static gint ett_802_3_bt_system_setup = -1;
-static gint ett_802_3_bt_autoclass = -1;
-static gint ett_802_3_bt_power_down = -1;
-static gint ett_802_3_aggregation = -1;
-static gint ett_802_1_aggregation = -1;
-static gint ett_802_1qbg_capabilities_flags = -1;
-static gint ett_802_3br_capabilities_flags = -1;
-static gint ett_media_capabilities = -1;
-static gint ett_profinet_period = -1;
-static gint ett_cisco_upoe_tlv = -1;
-static gint ett_avaya_ipphone_tlv = -1;
-static gint ett_org_spc_hytec_subtype_transceiver = -1;
-static gint ett_org_spc_hytec_subtype_trace = -1;
-static gint ett_org_spc_hytec_trace_request = -1;
-static gint ett_org_spc_hytec_trace_reply = -1;
-
-static expert_field ei_lldp_bad_length = EI_INIT;
-static expert_field ei_lldp_bad_length_excess = EI_INIT;
-static expert_field ei_lldp_bad_type = EI_INIT;
-static expert_field ei_lldp_tlv_deprecated = EI_INIT;
+static gint ett_lldp;
+static gint ett_chassis_id;
+static gint ett_port_id;
+static gint ett_time_to_live;
+static gint ett_end_of_lldpdu;
+static gint ett_port_description;
+static gint ett_system_name;
+static gint ett_system_desc;
+static gint ett_system_cap;
+static gint ett_system_cap_summary;
+static gint ett_system_cap_enabled;
+static gint ett_management_address;
+static gint ett_unknown_tlv;
+static gint ett_org_spc_def;
+static gint ett_org_spc_dcbx_cin;
+static gint ett_org_spc_dcbx_cee;
+static gint ett_org_spc_dcbx_cee_1;
+static gint ett_org_spc_dcbx_cee_2;
+static gint ett_org_spc_dcbx_cee_3;
+static gint ett_org_spc_dcbx_cee_4;
+static gint ett_org_spc_dcbx_cin_6;
+static gint ett_org_spc_dcbx_cee_app;
+static gint ett_org_spc_ieee_802_1_1;
+static gint ett_org_spc_ieee_802_1_2;
+static gint ett_org_spc_ieee_802_1_3;
+static gint ett_org_spc_ieee_802_1_4;
+static gint ett_org_spc_ieee_802_1_8;
+static gint ett_org_spc_ieee_802_1_9;
+static gint ett_org_spc_ieee_802_1_a;
+static gint ett_org_spc_ieee_802_1_b;
+static gint ett_org_spc_ieee_802_1_c;
+static gint ett_org_spc_ieee_dcbx_app;
+
+static gint ett_org_spc_ieee_802_3_1;
+static gint ett_org_spc_ieee_802_3_2;
+static gint ett_org_spc_ieee_802_3_3;
+static gint ett_org_spc_ieee_802_3_4;
+static gint ett_org_spc_ieee_802_3_5;
+static gint ett_org_spc_ieee_802_3_7;
+
+static gint ett_org_spc_media_1;
+static gint ett_org_spc_media_2;
+static gint ett_org_spc_media_3;
+static gint ett_org_spc_media_4;
+static gint ett_org_spc_media_5;
+static gint ett_org_spc_media_6;
+static gint ett_org_spc_media_7;
+static gint ett_org_spc_media_8;
+static gint ett_org_spc_media_9;
+static gint ett_org_spc_media_10;
+static gint ett_org_spc_media_11;
+
+static gint ett_ex_avayaSubTypes_11;
+static gint ett_ex_avayaSubTypes_12;
+static gint ett_ex_avaya2SubTypes_4;
+static gint ett_org_spc_ProfinetSubTypes_1;
+static gint ett_org_spc_ProfinetSubTypes_2;
+static gint ett_org_spc_ProfinetSubTypes_3;
+static gint ett_org_spc_ProfinetSubTypes_4;
+static gint ett_org_spc_ProfinetSubTypes_5;
+static gint ett_org_spc_ProfinetSubTypes_6;
+static gint ett_org_spc_tlv;
+static gint ett_port_vlan_flags;
+static gint ett_802_3_flags;
+static gint ett_802_3_autoneg_advertised;
+static gint ett_802_3_power;
+static gint ett_802_3_bt_power;
+static gint ett_802_3_bt_system_setup;
+static gint ett_802_3_bt_autoclass;
+static gint ett_802_3_bt_power_down;
+static gint ett_802_3_aggregation;
+static gint ett_802_1_aggregation;
+static gint ett_802_1qbg_capabilities_flags;
+static gint ett_802_3br_capabilities_flags;
+static gint ett_media_capabilities;
+static gint ett_profinet_period;
+static gint ett_cisco_upoe_tlv;
+static gint ett_avaya_ipphone_tlv;
+static gint ett_org_spc_hytec_subtype_transceiver;
+static gint ett_org_spc_hytec_subtype_trace;
+static gint ett_org_spc_hytec_trace_request;
+static gint ett_org_spc_hytec_trace_reply;
+
+static expert_field ei_lldp_bad_length;
+static expert_field ei_lldp_bad_length_excess;
+static expert_field ei_lldp_bad_type;
+static expert_field ei_lldp_tlv_deprecated;
 
 /* TLV Types */
 #define END_OF_LLDPDU_TLV_TYPE		0x00	/* Mandatory */
diff --git a/epan/dissectors/packet-llrp.c b/epan/dissectors/packet-llrp.c
index 9b02b0722e..92491c5cbd 100644
--- a/epan/dissectors/packet-llrp.c
+++ b/epan/dissectors/packet-llrp.c
@@ -27,276 +27,276 @@ static dissector_handle_t llrp_handle;
 #define LLRP_PORT 5084
 
 /* Initialize the protocol and registered fields */
-static int proto_llrp                             = -1;
-static int hf_llrp_version                        = -1;
-static int hf_llrp_type                           = -1;
-static int hf_llrp_length                         = -1;
-static int hf_llrp_id                             = -1;
-static int hf_llrp_cur_ver                        = -1;
-static int hf_llrp_sup_ver                        = -1;
-static int hf_llrp_req_cap                        = -1;
-static int hf_llrp_req_conf                       = -1;
-static int hf_llrp_rospec                         = -1;
-static int hf_llrp_antenna_id                     = -1;
-static int hf_llrp_gpi_port                       = -1;
-static int hf_llrp_gpo_port                       = -1;
-static int hf_llrp_rest_fact                      = -1;
-static int hf_llrp_accessspec                     = -1;
-static int hf_llrp_vendor                         = -1;
-static int hf_llrp_impinj_msg_type                = -1;
-static int hf_llrp_tlv_type                       = -1;
-static int hf_llrp_tv_type                        = -1;
-static int hf_llrp_tlv_len                        = -1;
-static int hf_llrp_param                          = -1;
-static int hf_llrp_num_gpi                        = -1;
-static int hf_llrp_num_gpo                        = -1;
-static int hf_llrp_microseconds                   = -1;
-static int hf_llrp_max_supported_antenna          = -1;
-static int hf_llrp_can_set_antenna_prop           = -1;
-static int hf_llrp_has_utc_clock                  = -1;
-static int hf_llrp_device_manufacturer            = -1;
-static int hf_llrp_model                          = -1;
-static int hf_llrp_firmware_version               = -1;
-static int hf_llrp_max_receive_sense              = -1;
-static int hf_llrp_index                          = -1;
-static int hf_llrp_receive_sense                  = -1;
-static int hf_llrp_receive_sense_index_min        = -1;
-static int hf_llrp_receive_sense_index_max        = -1;
-static int hf_llrp_num_protocols                  = -1;
-static int hf_llrp_protocol_id                    = -1;
-static int hf_llrp_can_do_survey                  = -1;
-static int hf_llrp_can_report_buffer_warning      = -1;
-static int hf_llrp_support_client_opspec          = -1;
-static int hf_llrp_can_stateaware                 = -1;
-static int hf_llrp_support_holding                = -1;
-static int hf_llrp_max_priority_supported         = -1;
-static int hf_llrp_client_opspec_timeout          = -1;
-static int hf_llrp_max_num_rospec                 = -1;
-static int hf_llrp_max_num_spec_per_rospec        = -1;
-static int hf_llrp_max_num_inventory_per_aispec   = -1;
-static int hf_llrp_max_num_accessspec             = -1;
-static int hf_llrp_max_num_opspec_per_accressspec = -1;
-static int hf_llrp_country_code                   = -1;
-static int hf_llrp_comm_standard                  = -1;
-static int hf_llrp_transmit_power                 = -1;
-static int hf_llrp_hopping                        = -1;
-static int hf_llrp_hop_table_id                   = -1;
-static int hf_llrp_rfu                            = -1;
-static int hf_llrp_num_hops                       = -1;
-static int hf_llrp_frequency                      = -1;
-static int hf_llrp_num_freqs                      = -1;
-static int hf_llrp_min_freq                       = -1;
-static int hf_llrp_max_freq                       = -1;
-static int hf_llrp_rospec_id                      = -1;
-static int hf_llrp_priority                       = -1;
-static int hf_llrp_cur_state                      = -1;
-static int hf_llrp_rospec_start_trig_type         = -1;
-static int hf_llrp_offset                         = -1;
-static int hf_llrp_period                         = -1;
-static int hf_llrp_gpi_event                      = -1;
-static int hf_llrp_timeout                        = -1;
-static int hf_llrp_rospec_stop_trig_type          = -1;
-static int hf_llrp_duration_trig                  = -1;
-static int hf_llrp_antenna_count                  = -1;
-static int hf_llrp_antenna                        = -1;
-static int hf_llrp_aispec_stop_trig_type          = -1;
-static int hf_llrp_trig_type                      = -1;
-static int hf_llrp_number_of_tags                 = -1;
-static int hf_llrp_number_of_attempts             = -1;
-static int hf_llrp_t                              = -1;
-static int hf_llrp_inventory_spec_id              = -1;
-static int hf_llrp_start_freq                     = -1;
-static int hf_llrp_stop_freq                      = -1;
-static int hf_llrp_stop_trig_type                 = -1;
-static int hf_llrp_n_4                            = -1;
-static int hf_llrp_duration                       = -1;
-static int hf_llrp_accessspec_id                  = -1;
-static int hf_llrp_access_cur_state               = -1;
-static int hf_llrp_access_stop_trig_type          = -1;
-static int hf_llrp_operation_count                = -1;
-static int hf_llrp_opspec_id                      = -1;
-static int hf_llrp_conf_value                     = -1;
-static int hf_llrp_id_type                        = -1;
-static int hf_llrp_reader_id                      = -1;
-static int hf_llrp_gpo_data                       = -1;
-static int hf_llrp_keepalive_trig_type            = -1;
-static int hf_llrp_time_iterval                   = -1;
-static int hf_llrp_antenna_connected              = -1;
-static int hf_llrp_antenna_gain                   = -1;
-static int hf_llrp_receiver_sense                 = -1;
-static int hf_llrp_channel_idx                    = -1;
-static int hf_llrp_gpi_config                     = -1;
-static int hf_llrp_gpi_state                      = -1;
-static int hf_llrp_hold_events_and_reports        = -1;
-static int hf_llrp_ro_report_trig                 = -1;
-static int hf_llrp_n_2                            = -1;
-static int hf_llrp_enable_rospec_id               = -1;
-static int hf_llrp_enable_spec_idx                = -1;
-static int hf_llrp_enable_inv_spec_id             = -1;
-static int hf_llrp_enable_antenna_id              = -1;
-static int hf_llrp_enable_channel_idx             = -1;
-static int hf_llrp_enable_peak_rssi               = -1;
-static int hf_llrp_enable_first_seen              = -1;
-static int hf_llrp_enable_last_seen               = -1;
-static int hf_llrp_enable_seen_count              = -1;
-static int hf_llrp_enable_accessspec_id           = -1;
-static int hf_llrp_access_report_trig             = -1;
-static int hf_llrp_length_bits                    = -1;
-static int hf_llrp_epc                            = -1;
-static int hf_llrp_spec_idx                       = -1;
-static int hf_llrp_peak_rssi                      = -1;
-static int hf_llrp_tag_count                      = -1;
-static int hf_llrp_bandwidth                      = -1;
-static int hf_llrp_average_rssi                   = -1;
-static int hf_llrp_notif_state                    = -1;
-static int hf_llrp_event_type                     = -1;
-static int hf_llrp_next_chan_idx                  = -1;
-static int hf_llrp_roevent_type                   = -1;
-static int hf_llrp_prem_rospec_id                 = -1;
-static int hf_llrp_buffer_full_percentage         = -1;
-static int hf_llrp_message                        = -1;
-static int hf_llrp_rfevent_type                   = -1;
-static int hf_llrp_aievent_type                   = -1;
-static int hf_llrp_antenna_event_type             = -1;
-static int hf_llrp_conn_status                    = -1;
-static int hf_llrp_loop_count                     = -1;
-static int hf_llrp_status_code                    = -1;
-static int hf_llrp_error_desc                     = -1;
-static int hf_llrp_field_num                      = -1;
-static int hf_llrp_error_code                     = -1;
-static int hf_llrp_parameter_type                 = -1;
-static int hf_llrp_can_support_block_erase        = -1;
-static int hf_llrp_can_support_block_write        = -1;
-static int hf_llrp_can_support_block_permalock    = -1;
-static int hf_llrp_can_support_tag_recomm         = -1;
-static int hf_llrp_can_support_UMI_method2        = -1;
-static int hf_llrp_can_support_XPC                = -1;
-static int hf_llrp_max_num_filter_per_query       = -1;
-static int hf_llrp_mode_ident                     = -1;
-static int hf_llrp_DR                             = -1;
-static int hf_llrp_hag_conformance                = -1;
-static int hf_llrp_mod                            = -1;
-static int hf_llrp_flm                            = -1;
-static int hf_llrp_m                              = -1;
-static int hf_llrp_bdr                            = -1;
-static int hf_llrp_pie                            = -1;
-static int hf_llrp_min_tari                       = -1;
-static int hf_llrp_max_tari                       = -1;
-static int hf_llrp_step_tari                      = -1;
-static int hf_llrp_inventory_state_aware          = -1;
-static int hf_llrp_trunc                          = -1;
-static int hf_llrp_mb                             = -1;
-static int hf_llrp_pointer                        = -1;
-static int hf_llrp_tag_mask                       = -1;
-static int hf_llrp_aware_filter_target            = -1;
-static int hf_llrp_aware_filter_action            = -1;
-static int hf_llrp_unaware_filter_action          = -1;
-static int hf_llrp_mode_idx                       = -1;
-static int hf_llrp_tari                           = -1;
-static int hf_llrp_session                        = -1;
-static int hf_llrp_tag_population                 = -1;
-static int hf_llrp_tag_transit_time               = -1;
-static int hf_llrp_sing_i                         = -1;
-static int hf_llrp_sing_s                         = -1;
-static int hf_llrp_sing_a                         = -1;
-static int hf_llrp_match                          = -1;
-static int hf_llrp_tag_data                       = -1;
-static int hf_llrp_access_pass                    = -1;
-static int hf_llrp_word_pointer                   = -1;
-static int hf_llrp_word_count                     = -1;
-static int hf_llrp_write_data                     = -1;
-static int hf_llrp_kill_pass                      = -1;
-static int hf_llrp_kill_3                         = -1;
-static int hf_llrp_kill_2                         = -1;
-static int hf_llrp_kill_l                         = -1;
-static int hf_llrp_privilege                      = -1;
-static int hf_llrp_data_field                     = -1;
-static int hf_llrp_block_pointer                  = -1;
-static int hf_llrp_block_mask                     = -1;
-static int hf_llrp_length_words                   = -1;
-static int hf_llrp_block_range                    = -1;
-static int hf_llrp_enable_crc                     = -1;
-static int hf_llrp_enable_pc                      = -1;
-static int hf_llrp_enable_xpc                     = -1;
-static int hf_llrp_pc_bits                        = -1;
-static int hf_llrp_xpc_w1                         = -1;
-static int hf_llrp_xpc_w2                         = -1;
-static int hf_llrp_crc                            = -1;
-static int hf_llrp_num_coll                       = -1;
-static int hf_llrp_num_empty                      = -1;
-static int hf_llrp_access_result                  = -1;
-static int hf_llrp_read_data                      = -1;
-static int hf_llrp_num_words_written              = -1;
-static int hf_llrp_permlock_status                = -1;
-static int hf_llrp_vendor_id                      = -1;
-static int hf_llrp_vendor_unknown                 = -1;
-static int hf_llrp_impinj_param_type              = -1;
-static int hf_llrp_save_config                    = -1;
-static int hf_llrp_impinj_req_data                = -1;
-static int hf_llrp_impinj_reg_region              = -1;
-static int hf_llrp_impinj_search_mode             = -1;
-static int hf_llrp_impinj_en_tag_dir              = -1;
-static int hf_llrp_impinj_antenna_conf            = -1;
-static int hf_llrp_decision_time                  = -1;
-static int hf_llrp_impinj_tag_dir                 = -1;
-static int hf_llrp_confidence                     = -1;
-static int hf_llrp_impinj_fix_freq_mode           = -1;
-static int hf_llrp_num_channels                   = -1;
-static int hf_llrp_channel                        = -1;
-static int hf_llrp_impinj_reduce_power_mode       = -1;
-static int hf_llrp_impinj_low_duty_mode           = -1;
-static int hf_llrp_empty_field_timeout            = -1;
-static int hf_llrp_field_ping_interval            = -1;
-static int hf_llrp_model_name                     = -1;
-static int hf_llrp_serial_number                  = -1;
-static int hf_llrp_soft_ver                       = -1;
-static int hf_llrp_firm_ver                       = -1;
-static int hf_llrp_fpga_ver                       = -1;
-static int hf_llrp_pcba_ver                       = -1;
-static int hf_llrp_height_thresh                  = -1;
-static int hf_llrp_zero_motion_thresh             = -1;
-static int hf_llrp_board_manufacturer             = -1;
-static int hf_llrp_fw_ver_hex                     = -1;
-static int hf_llrp_hw_ver_hex                     = -1;
-static int hf_llrp_gpi_debounce                   = -1;
-static int hf_llrp_temperature                    = -1;
-static int hf_llrp_impinj_link_monitor_mode       = -1;
-static int hf_llrp_link_down_thresh               = -1;
-static int hf_llrp_impinj_report_buff_mode        = -1;
-static int hf_llrp_permalock_result               = -1;
-static int hf_llrp_block_permalock_result         = -1;
-static int hf_llrp_impinj_data_profile            = -1;
-static int hf_llrp_impinj_access_range            = -1;
-static int hf_llrp_impinj_persistence             = -1;
-static int hf_llrp_set_qt_config_result           = -1;
-static int hf_llrp_get_qt_config_result           = -1;
-static int hf_llrp_impinj_serialized_tid_mode     = -1;
-static int hf_llrp_impinj_rf_phase_mode           = -1;
-static int hf_llrp_impinj_peak_rssi_mode          = -1;
-static int hf_llrp_impinj_gps_coordinates_mode    = -1;
-static int hf_llrp_impinj_tid                     = -1;
-static int hf_llrp_phase_angle                    = -1;
-static int hf_llrp_rssi                           = -1;
-static int hf_llrp_latitude                       = -1;
-static int hf_llrp_longitude                      = -1;
-static int hf_llrp_gga_sentence                   = -1;
-static int hf_llrp_rmc_sentence                   = -1;
-static int hf_llrp_impinj_optim_read_mode         = -1;
-static int hf_llrp_impinj_rf_doppler_mode         = -1;
-static int hf_llrp_retry_count                    = -1;
-static int hf_llrp_impinj_access_spec_ordering    = -1;
-static int hf_llrp_impinj_gpo_mode                = -1;
-static int hf_llrp_gpo_pulse_dur                  = -1;
-static int hf_llrp_impinj_hub_id                  = -1;
-static int hf_llrp_impinj_hub_fault_type          = -1;
-static int hf_llrp_impinj_hub_connected_type      = -1;
+static int proto_llrp;
+static int hf_llrp_version;
+static int hf_llrp_type;
+static int hf_llrp_length;
+static int hf_llrp_id;
+static int hf_llrp_cur_ver;
+static int hf_llrp_sup_ver;
+static int hf_llrp_req_cap;
+static int hf_llrp_req_conf;
+static int hf_llrp_rospec;
+static int hf_llrp_antenna_id;
+static int hf_llrp_gpi_port;
+static int hf_llrp_gpo_port;
+static int hf_llrp_rest_fact;
+static int hf_llrp_accessspec;
+static int hf_llrp_vendor;
+static int hf_llrp_impinj_msg_type;
+static int hf_llrp_tlv_type;
+static int hf_llrp_tv_type;
+static int hf_llrp_tlv_len;
+static int hf_llrp_param;
+static int hf_llrp_num_gpi;
+static int hf_llrp_num_gpo;
+static int hf_llrp_microseconds;
+static int hf_llrp_max_supported_antenna;
+static int hf_llrp_can_set_antenna_prop;
+static int hf_llrp_has_utc_clock;
+static int hf_llrp_device_manufacturer;
+static int hf_llrp_model;
+static int hf_llrp_firmware_version;
+static int hf_llrp_max_receive_sense;
+static int hf_llrp_index;
+static int hf_llrp_receive_sense;
+static int hf_llrp_receive_sense_index_min;
+static int hf_llrp_receive_sense_index_max;
+static int hf_llrp_num_protocols;
+static int hf_llrp_protocol_id;
+static int hf_llrp_can_do_survey;
+static int hf_llrp_can_report_buffer_warning;
+static int hf_llrp_support_client_opspec;
+static int hf_llrp_can_stateaware;
+static int hf_llrp_support_holding;
+static int hf_llrp_max_priority_supported;
+static int hf_llrp_client_opspec_timeout;
+static int hf_llrp_max_num_rospec;
+static int hf_llrp_max_num_spec_per_rospec;
+static int hf_llrp_max_num_inventory_per_aispec;
+static int hf_llrp_max_num_accessspec;
+static int hf_llrp_max_num_opspec_per_accressspec;
+static int hf_llrp_country_code;
+static int hf_llrp_comm_standard;
+static int hf_llrp_transmit_power;
+static int hf_llrp_hopping;
+static int hf_llrp_hop_table_id;
+static int hf_llrp_rfu;
+static int hf_llrp_num_hops;
+static int hf_llrp_frequency;
+static int hf_llrp_num_freqs;
+static int hf_llrp_min_freq;
+static int hf_llrp_max_freq;
+static int hf_llrp_rospec_id;
+static int hf_llrp_priority;
+static int hf_llrp_cur_state;
+static int hf_llrp_rospec_start_trig_type;
+static int hf_llrp_offset;
+static int hf_llrp_period;
+static int hf_llrp_gpi_event;
+static int hf_llrp_timeout;
+static int hf_llrp_rospec_stop_trig_type;
+static int hf_llrp_duration_trig;
+static int hf_llrp_antenna_count;
+static int hf_llrp_antenna;
+static int hf_llrp_aispec_stop_trig_type;
+static int hf_llrp_trig_type;
+static int hf_llrp_number_of_tags;
+static int hf_llrp_number_of_attempts;
+static int hf_llrp_t;
+static int hf_llrp_inventory_spec_id;
+static int hf_llrp_start_freq;
+static int hf_llrp_stop_freq;
+static int hf_llrp_stop_trig_type;
+static int hf_llrp_n_4;
+static int hf_llrp_duration;
+static int hf_llrp_accessspec_id;
+static int hf_llrp_access_cur_state;
+static int hf_llrp_access_stop_trig_type;
+static int hf_llrp_operation_count;
+static int hf_llrp_opspec_id;
+static int hf_llrp_conf_value;
+static int hf_llrp_id_type;
+static int hf_llrp_reader_id;
+static int hf_llrp_gpo_data;
+static int hf_llrp_keepalive_trig_type;
+static int hf_llrp_time_iterval;
+static int hf_llrp_antenna_connected;
+static int hf_llrp_antenna_gain;
+static int hf_llrp_receiver_sense;
+static int hf_llrp_channel_idx;
+static int hf_llrp_gpi_config;
+static int hf_llrp_gpi_state;
+static int hf_llrp_hold_events_and_reports;
+static int hf_llrp_ro_report_trig;
+static int hf_llrp_n_2;
+static int hf_llrp_enable_rospec_id;
+static int hf_llrp_enable_spec_idx;
+static int hf_llrp_enable_inv_spec_id;
+static int hf_llrp_enable_antenna_id;
+static int hf_llrp_enable_channel_idx;
+static int hf_llrp_enable_peak_rssi;
+static int hf_llrp_enable_first_seen;
+static int hf_llrp_enable_last_seen;
+static int hf_llrp_enable_seen_count;
+static int hf_llrp_enable_accessspec_id;
+static int hf_llrp_access_report_trig;
+static int hf_llrp_length_bits;
+static int hf_llrp_epc;
+static int hf_llrp_spec_idx;
+static int hf_llrp_peak_rssi;
+static int hf_llrp_tag_count;
+static int hf_llrp_bandwidth;
+static int hf_llrp_average_rssi;
+static int hf_llrp_notif_state;
+static int hf_llrp_event_type;
+static int hf_llrp_next_chan_idx;
+static int hf_llrp_roevent_type;
+static int hf_llrp_prem_rospec_id;
+static int hf_llrp_buffer_full_percentage;
+static int hf_llrp_message;
+static int hf_llrp_rfevent_type;
+static int hf_llrp_aievent_type;
+static int hf_llrp_antenna_event_type;
+static int hf_llrp_conn_status;
+static int hf_llrp_loop_count;
+static int hf_llrp_status_code;
+static int hf_llrp_error_desc;
+static int hf_llrp_field_num;
+static int hf_llrp_error_code;
+static int hf_llrp_parameter_type;
+static int hf_llrp_can_support_block_erase;
+static int hf_llrp_can_support_block_write;
+static int hf_llrp_can_support_block_permalock;
+static int hf_llrp_can_support_tag_recomm;
+static int hf_llrp_can_support_UMI_method2;
+static int hf_llrp_can_support_XPC;
+static int hf_llrp_max_num_filter_per_query;
+static int hf_llrp_mode_ident;
+static int hf_llrp_DR;
+static int hf_llrp_hag_conformance;
+static int hf_llrp_mod;
+static int hf_llrp_flm;
+static int hf_llrp_m;
+static int hf_llrp_bdr;
+static int hf_llrp_pie;
+static int hf_llrp_min_tari;
+static int hf_llrp_max_tari;
+static int hf_llrp_step_tari;
+static int hf_llrp_inventory_state_aware;
+static int hf_llrp_trunc;
+static int hf_llrp_mb;
+static int hf_llrp_pointer;
+static int hf_llrp_tag_mask;
+static int hf_llrp_aware_filter_target;
+static int hf_llrp_aware_filter_action;
+static int hf_llrp_unaware_filter_action;
+static int hf_llrp_mode_idx;
+static int hf_llrp_tari;
+static int hf_llrp_session;
+static int hf_llrp_tag_population;
+static int hf_llrp_tag_transit_time;
+static int hf_llrp_sing_i;
+static int hf_llrp_sing_s;
+static int hf_llrp_sing_a;
+static int hf_llrp_match;
+static int hf_llrp_tag_data;
+static int hf_llrp_access_pass;
+static int hf_llrp_word_pointer;
+static int hf_llrp_word_count;
+static int hf_llrp_write_data;
+static int hf_llrp_kill_pass;
+static int hf_llrp_kill_3;
+static int hf_llrp_kill_2;
+static int hf_llrp_kill_l;
+static int hf_llrp_privilege;
+static int hf_llrp_data_field;
+static int hf_llrp_block_pointer;
+static int hf_llrp_block_mask;
+static int hf_llrp_length_words;
+static int hf_llrp_block_range;
+static int hf_llrp_enable_crc;
+static int hf_llrp_enable_pc;
+static int hf_llrp_enable_xpc;
+static int hf_llrp_pc_bits;
+static int hf_llrp_xpc_w1;
+static int hf_llrp_xpc_w2;
+static int hf_llrp_crc;
+static int hf_llrp_num_coll;
+static int hf_llrp_num_empty;
+static int hf_llrp_access_result;
+static int hf_llrp_read_data;
+static int hf_llrp_num_words_written;
+static int hf_llrp_permlock_status;
+static int hf_llrp_vendor_id;
+static int hf_llrp_vendor_unknown;
+static int hf_llrp_impinj_param_type;
+static int hf_llrp_save_config;
+static int hf_llrp_impinj_req_data;
+static int hf_llrp_impinj_reg_region;
+static int hf_llrp_impinj_search_mode;
+static int hf_llrp_impinj_en_tag_dir;
+static int hf_llrp_impinj_antenna_conf;
+static int hf_llrp_decision_time;
+static int hf_llrp_impinj_tag_dir;
+static int hf_llrp_confidence;
+static int hf_llrp_impinj_fix_freq_mode;
+static int hf_llrp_num_channels;
+static int hf_llrp_channel;
+static int hf_llrp_impinj_reduce_power_mode;
+static int hf_llrp_impinj_low_duty_mode;
+static int hf_llrp_empty_field_timeout;
+static int hf_llrp_field_ping_interval;
+static int hf_llrp_model_name;
+static int hf_llrp_serial_number;
+static int hf_llrp_soft_ver;
+static int hf_llrp_firm_ver;
+static int hf_llrp_fpga_ver;
+static int hf_llrp_pcba_ver;
+static int hf_llrp_height_thresh;
+static int hf_llrp_zero_motion_thresh;
+static int hf_llrp_board_manufacturer;
+static int hf_llrp_fw_ver_hex;
+static int hf_llrp_hw_ver_hex;
+static int hf_llrp_gpi_debounce;
+static int hf_llrp_temperature;
+static int hf_llrp_impinj_link_monitor_mode;
+static int hf_llrp_link_down_thresh;
+static int hf_llrp_impinj_report_buff_mode;
+static int hf_llrp_permalock_result;
+static int hf_llrp_block_permalock_result;
+static int hf_llrp_impinj_data_profile;
+static int hf_llrp_impinj_access_range;
+static int hf_llrp_impinj_persistence;
+static int hf_llrp_set_qt_config_result;
+static int hf_llrp_get_qt_config_result;
+static int hf_llrp_impinj_serialized_tid_mode;
+static int hf_llrp_impinj_rf_phase_mode;
+static int hf_llrp_impinj_peak_rssi_mode;
+static int hf_llrp_impinj_gps_coordinates_mode;
+static int hf_llrp_impinj_tid;
+static int hf_llrp_phase_angle;
+static int hf_llrp_rssi;
+static int hf_llrp_latitude;
+static int hf_llrp_longitude;
+static int hf_llrp_gga_sentence;
+static int hf_llrp_rmc_sentence;
+static int hf_llrp_impinj_optim_read_mode;
+static int hf_llrp_impinj_rf_doppler_mode;
+static int hf_llrp_retry_count;
+static int hf_llrp_impinj_access_spec_ordering;
+static int hf_llrp_impinj_gpo_mode;
+static int hf_llrp_gpo_pulse_dur;
+static int hf_llrp_impinj_hub_id;
+static int hf_llrp_impinj_hub_fault_type;
+static int hf_llrp_impinj_hub_connected_type;
 
 /* Initialize the subtree pointers */
-static gint ett_llrp = -1;
-static gint ett_llrp_param = -1;
+static gint ett_llrp;
+static gint ett_llrp_param;
 
-static expert_field ei_llrp_req_conf = EI_INIT;
-static expert_field ei_llrp_invalid_length = EI_INIT;
+static expert_field ei_llrp_req_conf;
+static expert_field ei_llrp_invalid_length;
 
 /* Message Types */
 #define LLRP_TYPE_GET_READER_CAPABILITIES           1
diff --git a/epan/dissectors/packet-lls.c b/epan/dissectors/packet-lls.c
index 3c162592ca..990bc27397 100644
--- a/epan/dissectors/packet-lls.c
+++ b/epan/dissectors/packet-lls.c
@@ -31,20 +31,20 @@
 void proto_reg_handoff_lls(void);
 void proto_register_lls(void);
 
-static int proto_lls = -1;
-static gint ett_lls = -1;
-static gint ett_lls_smt_entry = -1;
-static gint ett_lls_smt_signature = -1;
-static gint ett_lls_table_payload = -1;
-static gint ett_lls_table_payload_xml = -1;
+static int proto_lls;
+static gint ett_lls;
+static gint ett_lls_smt_entry;
+static gint ett_lls_smt_signature;
+static gint ett_lls_table_payload;
+static gint ett_lls_table_payload_xml;
 
 static dissector_handle_t lls_handle;
 static dissector_handle_t xml_handle;
 static dissector_handle_t cms_handle;
 
-static expert_field ei_lls_table_decompression_failed = EI_INIT;
+static expert_field ei_lls_table_decompression_failed;
 
-static int hf_lls_table_id = -1;
+static int hf_lls_table_id;
 #define LLS_TABLE_TYPE_SIGNED_MULTI_TABLE 0xFE
 #define LLS_TABLE_TYPE_SLT                0x01
 static const value_string hf_lls_table_type_vals[] = {
@@ -78,17 +78,17 @@ static const value_string hf_lls_table_type_short_vals[] = {
     { 0x00, NULL }
 };
 
-static int hf_lls_group_id = -1;
-static int hf_lls_group_count = -1;
-static int hf_lls_table_version = -1;
-static int hf_lls_table_payload = -1;
-static int hf_lls_table_payload_uncompressed = -1;
-
-static int hf_lls_smt_payload_count = -1;
-static int hf_lls_smt_entry = -1;
-static int hf_lls_smt_entry_payload_length = -1;
-static int hf_lls_smt_signature_length = -1;
-static int hf_lls_smt_signature = -1;
+static int hf_lls_group_id;
+static int hf_lls_group_count;
+static int hf_lls_table_version;
+static int hf_lls_table_payload;
+static int hf_lls_table_payload_uncompressed;
+
+static int hf_lls_smt_payload_count;
+static int hf_lls_smt_entry;
+static int hf_lls_smt_entry_payload_length;
+static int hf_lls_smt_signature_length;
+static int hf_lls_smt_signature;
 
 
 static void
diff --git a/epan/dissectors/packet-llt.c b/epan/dissectors/packet-llt.c
index 7dcf0a4a59..b3fa24a3ee 100644
--- a/epan/dissectors/packet-llt.c
+++ b/epan/dissectors/packet-llt.c
@@ -29,18 +29,18 @@ static const value_string message_type_vs[] = {
 static guint preference_alternate_ethertype = 0x0;
 
 /* Initialize the protocol and registered fields */
-static int proto_llt = -1;
+static int proto_llt;
 
-static int hf_llt_cluster_num = -1;
-static int hf_llt_node_id = -1;
-static int hf_llt_message_type = -1;
-static int hf_llt_sequence_num = -1;
-static int hf_llt_message_time = -1;
-static int hf_llt_dst_node_id = -1;
-static int hf_llt_src_node_id = -1;
+static int hf_llt_cluster_num;
+static int hf_llt_node_id;
+static int hf_llt_message_type;
+static int hf_llt_sequence_num;
+static int hf_llt_message_time;
+static int hf_llt_dst_node_id;
+static int hf_llt_src_node_id;
 
 /* Initialize the subtree pointers */
-static gint ett_llt = -1;
+static gint ett_llt;
 
 /* Code to actually dissect the packets */
 static int
diff --git a/epan/dissectors/packet-lltd.c b/epan/dissectors/packet-lltd.c
index f57ebcba39..261677ca9e 100644
--- a/epan/dissectors/packet-lltd.c
+++ b/epan/dissectors/packet-lltd.c
@@ -20,131 +20,131 @@ void proto_reg_handoff_lltd(void);
 
 static dissector_handle_t lltd_handle;
 
-static int proto_lltd = -1;
-
-static int hf_lltd_version                  = -1;
-static int hf_lltd_type_of_service          = -1;
-static int hf_lltd_reserved                 = -1;
-static int hf_lltd_discovery_func           = -1;
-static int hf_lltd_discovery_real_dest_addr = -1;
-static int hf_lltd_discovery_real_src_addr  = -1;
-static int hf_lltd_discovery_xid            = -1;
-static int hf_lltd_discovery_seq_num        = -1;
-static int hf_lltd_discover_gen_num         = -1;
-static int hf_lltd_discover_num_stations    = -1;
-static int hf_lltd_discover_station         = -1;
-static int hf_lltd_hello_gen_num            = -1;
-static int hf_lltd_hello_current_address    = -1;
-static int hf_lltd_hello_apparent_address   = -1;
-static int hf_lltd_tlv_type                 = -1;
-static int hf_lltd_tlv_length               = -1;
-static int hf_lltd_host_id                  = -1;
-static int hf_lltd_char_p                   = -1;
-static int hf_lltd_char_x                   = -1;
-static int hf_lltd_char_f                   = -1;
-static int hf_lltd_char_m                   = -1;
-static int hf_lltd_char_l                   = -1;
-static int hf_lltd_char_reserved            = -1;
-static int hf_lltd_physical_medium          = -1;
-static int hf_lltd_wireless_mode            = -1;
-static int hf_lltd_bssid                    = -1;
-static int hf_lltd_ssid                     = -1;
-static int hf_lltd_ipv4_address             = -1;
-static int hf_lltd_ipv6_address             = -1;
-static int hf_lltd_max_operation_rate       = -1;
-static int hf_lltd_performance_count_freq   = -1;
-static int hf_lltd_link_speed               = -1;
-static int hf_lltd_rssi                     = -1;
-static int hf_lltd_machine_name             = -1;
-static int hf_lltd_support_info             = -1;
-static int hf_lltd_device_uuid              = -1;
-static int hf_lltd_qos_char_e               = -1;
-static int hf_lltd_qos_char_q               = -1;
-static int hf_lltd_qos_char_p               = -1;
-static int hf_lltd_qos_char_reserved        = -1;
-static int hf_lltd_80211_physical_medium    = -1;
-static int hf_lltd_sees_list_working_set    = -1;
-static int hf_lltd_repeater_ap_lineage      = -1;
-static int hf_lltd_emit_num_descs           = -1;
-static int hf_lltd_emit_type                = -1;
-static int hf_lltd_emit_pause               = -1;
-static int hf_lltd_emit_src_addr            = -1;
-static int hf_lltd_emit_dest_addr           = -1;
-static int hf_lltd_queryresp_more_descs     = -1;
-static int hf_lltd_queryresp_memory_descs   = -1;
-static int hf_lltd_queryresp_num_descs      = -1;
-static int hf_lltd_queryresp_type           = -1;
-static int hf_lltd_queryresp_real_src_addr  = -1;
-static int hf_lltd_queryresp_ethernet_src_addr  = -1;
-static int hf_lltd_queryresp_ethernet_dest_addr = -1;
-static int hf_lltd_flat_crc_bytes           = -1;
-static int hf_lltd_flat_crc_packets         = -1;
-static int hf_lltd_query_large_tlv_type     = -1;
-static int hf_lltd_query_large_tlv_offset   = -1;
-static int hf_lltd_querylargeresp_more_descs    = -1;
-static int hf_lltd_querylargeresp_memory_descs  = -1;
-static int hf_lltd_querylargeresp_num_descs = -1;
-static int hf_lltd_querylargeresp_data      = -1;
-
-static int hf_lltd_qos_diag_func            = -1;
-static int hf_lltd_qos_real_dest_addr       = -1;
-static int hf_lltd_qos_real_src_addr        = -1;
-static int hf_lltd_qos_seq_num              = -1;
-static int hf_lltd_qos_initialize_interrupt_mod = -1;
-static int hf_lltd_qos_ready_sink_link_speed = -1;
-static int hf_lltd_qos_ready_perf_count_freq = -1;
-static int hf_lltd_qos_probe_controller_transmit_timestamp = -1;
-static int hf_lltd_qos_probe_sink_receive_timestamp = -1;
-static int hf_lltd_qos_probe_sink_transmit_timestamp = -1;
-static int hf_lltd_qos_probe_test_type      = -1;
-static int hf_lltd_qos_probe_packet_id      = -1;
-static int hf_lltd_qos_probe_t              = -1;
-static int hf_lltd_qos_probe_8021p_value    = -1;
-static int hf_lltd_qos_probe_payload        = -1;
-static int hf_lltd_qos_error_value          = -1;
-static int hf_lltd_qos_count_snapshot_history = -1;
-static int hf_lltd_qos_query_resp_r         = -1;
-static int hf_lltd_qos_query_resp_e         = -1;
-static int hf_lltd_qos_query_resp_num_events = -1;
-static int hf_lltd_qos_query_resp_controller_timestamp = -1;
-static int hf_lltd_qos_query_resp_sink_timestamp = -1;
-static int hf_lltd_qos_query_resp_packet_id = -1;
-static int hf_lltd_qos_query_resp_reserved  = -1;
-static int hf_lltd_qos_counter_result_subsec_span = -1;
-static int hf_lltd_qos_counter_result_byte_scale = -1;
-static int hf_lltd_qos_counter_result_packet_scale = -1;
-static int hf_lltd_qos_counter_result_history_size = -1;
-static int hf_lltd_qos_snapshot_bytes_recv  = -1;
-static int hf_lltd_qos_snapshot_packets_recv= -1;
-static int hf_lltd_qos_snapshot_bytes_sent  = -1;
-static int hf_lltd_qos_snapshot_packets_sent= -1;
-
-
-static gint ett_lltd                = -1;
-static gint ett_base_header         = -1;
-static gint ett_discover_stations   = -1;
-static gint ett_tlv                 = -1;
-static gint ett_tlv_item            = -1;
-static gint ett_characteristics     = -1;
-static gint ett_qos_characteristics = -1;
-static gint ett_repeater_ap_lineage = -1;
-static gint ett_emitee_descs        = -1;
-static gint ett_emitee_descs_item   = -1;
-static gint ett_recvee_descs        = -1;
-static gint ett_recvee_descs_item   = -1;
-static gint ett_qos_event_descs     = -1;
-static gint ett_qos_event_item      = -1;
-static gint ett_qos_snapshot_list   = -1;
-static gint ett_qos_snapshot_item   = -1;
-
-static expert_field ei_lltd_tlv_length_invalid = EI_INIT;
-static expert_field ei_lltd_too_many_paths = EI_INIT;
-static expert_field ei_lltd_type_of_service = EI_INIT;
-static expert_field ei_lltd_char_reserved = EI_INIT;
-static expert_field ei_lltd_qos_seq_num = EI_INIT;
-static expert_field ei_lltd_discovery_func = EI_INIT;
-static expert_field ei_lltd_tlv_type = EI_INIT;
-static expert_field ei_lltd_qos_diag_func = EI_INIT;
+static int proto_lltd;
+
+static int hf_lltd_version;
+static int hf_lltd_type_of_service;
+static int hf_lltd_reserved;
+static int hf_lltd_discovery_func;
+static int hf_lltd_discovery_real_dest_addr;
+static int hf_lltd_discovery_real_src_addr;
+static int hf_lltd_discovery_xid;
+static int hf_lltd_discovery_seq_num;
+static int hf_lltd_discover_gen_num;
+static int hf_lltd_discover_num_stations;
+static int hf_lltd_discover_station;
+static int hf_lltd_hello_gen_num;
+static int hf_lltd_hello_current_address;
+static int hf_lltd_hello_apparent_address;
+static int hf_lltd_tlv_type;
+static int hf_lltd_tlv_length;
+static int hf_lltd_host_id;
+static int hf_lltd_char_p;
+static int hf_lltd_char_x;
+static int hf_lltd_char_f;
+static int hf_lltd_char_m;
+static int hf_lltd_char_l;
+static int hf_lltd_char_reserved;
+static int hf_lltd_physical_medium;
+static int hf_lltd_wireless_mode;
+static int hf_lltd_bssid;
+static int hf_lltd_ssid;
+static int hf_lltd_ipv4_address;
+static int hf_lltd_ipv6_address;
+static int hf_lltd_max_operation_rate;
+static int hf_lltd_performance_count_freq;
+static int hf_lltd_link_speed;
+static int hf_lltd_rssi;
+static int hf_lltd_machine_name;
+static int hf_lltd_support_info;
+static int hf_lltd_device_uuid;
+static int hf_lltd_qos_char_e;
+static int hf_lltd_qos_char_q;
+static int hf_lltd_qos_char_p;
+static int hf_lltd_qos_char_reserved;
+static int hf_lltd_80211_physical_medium;
+static int hf_lltd_sees_list_working_set;
+static int hf_lltd_repeater_ap_lineage;
+static int hf_lltd_emit_num_descs;
+static int hf_lltd_emit_type;
+static int hf_lltd_emit_pause;
+static int hf_lltd_emit_src_addr;
+static int hf_lltd_emit_dest_addr;
+static int hf_lltd_queryresp_more_descs;
+static int hf_lltd_queryresp_memory_descs;
+static int hf_lltd_queryresp_num_descs;
+static int hf_lltd_queryresp_type;
+static int hf_lltd_queryresp_real_src_addr;
+static int hf_lltd_queryresp_ethernet_src_addr;
+static int hf_lltd_queryresp_ethernet_dest_addr;
+static int hf_lltd_flat_crc_bytes;
+static int hf_lltd_flat_crc_packets;
+static int hf_lltd_query_large_tlv_type;
+static int hf_lltd_query_large_tlv_offset;
+static int hf_lltd_querylargeresp_more_descs;
+static int hf_lltd_querylargeresp_memory_descs;
+static int hf_lltd_querylargeresp_num_descs;
+static int hf_lltd_querylargeresp_data;
+
+static int hf_lltd_qos_diag_func;
+static int hf_lltd_qos_real_dest_addr;
+static int hf_lltd_qos_real_src_addr;
+static int hf_lltd_qos_seq_num;
+static int hf_lltd_qos_initialize_interrupt_mod;
+static int hf_lltd_qos_ready_sink_link_speed;
+static int hf_lltd_qos_ready_perf_count_freq;
+static int hf_lltd_qos_probe_controller_transmit_timestamp;
+static int hf_lltd_qos_probe_sink_receive_timestamp;
+static int hf_lltd_qos_probe_sink_transmit_timestamp;
+static int hf_lltd_qos_probe_test_type;
+static int hf_lltd_qos_probe_packet_id;
+static int hf_lltd_qos_probe_t;
+static int hf_lltd_qos_probe_8021p_value;
+static int hf_lltd_qos_probe_payload;
+static int hf_lltd_qos_error_value;
+static int hf_lltd_qos_count_snapshot_history;
+static int hf_lltd_qos_query_resp_r;
+static int hf_lltd_qos_query_resp_e;
+static int hf_lltd_qos_query_resp_num_events;
+static int hf_lltd_qos_query_resp_controller_timestamp;
+static int hf_lltd_qos_query_resp_sink_timestamp;
+static int hf_lltd_qos_query_resp_packet_id;
+static int hf_lltd_qos_query_resp_reserved;
+static int hf_lltd_qos_counter_result_subsec_span;
+static int hf_lltd_qos_counter_result_byte_scale;
+static int hf_lltd_qos_counter_result_packet_scale;
+static int hf_lltd_qos_counter_result_history_size;
+static int hf_lltd_qos_snapshot_bytes_recv;
+static int hf_lltd_qos_snapshot_packets_recv;
+static int hf_lltd_qos_snapshot_bytes_sent;
+static int hf_lltd_qos_snapshot_packets_sent;
+
+
+static gint ett_lltd;
+static gint ett_base_header;
+static gint ett_discover_stations;
+static gint ett_tlv;
+static gint ett_tlv_item;
+static gint ett_characteristics;
+static gint ett_qos_characteristics;
+static gint ett_repeater_ap_lineage;
+static gint ett_emitee_descs;
+static gint ett_emitee_descs_item;
+static gint ett_recvee_descs;
+static gint ett_recvee_descs_item;
+static gint ett_qos_event_descs;
+static gint ett_qos_event_item;
+static gint ett_qos_snapshot_list;
+static gint ett_qos_snapshot_item;
+
+static expert_field ei_lltd_tlv_length_invalid;
+static expert_field ei_lltd_too_many_paths;
+static expert_field ei_lltd_type_of_service;
+static expert_field ei_lltd_char_reserved;
+static expert_field ei_lltd_qos_seq_num;
+static expert_field ei_lltd_discovery_func;
+static expert_field ei_lltd_tlv_type;
+static expert_field ei_lltd_qos_diag_func;
 
 #define LLTD_CHARACTERISTIC_P_MASK          0x80000000
 #define LLTD_CHARACTERISTIC_X_MASK          0x40000000
diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c
index c81f511733..3c7f3dc964 100644
--- a/epan/dissectors/packet-lmi.c
+++ b/epan/dissectors/packet-lmi.c
@@ -30,22 +30,22 @@ void proto_reg_handoff_lmi(void);
 
 static dissector_handle_t lmi_handle;
 
-static int proto_lmi = -1;
-static int hf_lmi_call_ref = -1;
-static int hf_lmi_msg_type = -1;
-static int hf_lmi_inf_ele = -1;
-static int hf_lmi_inf_len = -1;
-
-static int hf_lmi_rcd_type = -1;
-static int hf_lmi_send_seq = -1;
-static int hf_lmi_recv_seq = -1;
-static int hf_lmi_dlci_high = -1;
-static int hf_lmi_dlci_low = -1;
-static int hf_lmi_new = -1;
-static int hf_lmi_act = -1;
-
-static gint ett_lmi = -1;
-static gint ett_lmi_ele = -1;
+static int proto_lmi;
+static int hf_lmi_call_ref;
+static int hf_lmi_msg_type;
+static int hf_lmi_inf_ele;
+static int hf_lmi_inf_len;
+
+static int hf_lmi_rcd_type;
+static int hf_lmi_send_seq;
+static int hf_lmi_recv_seq;
+static int hf_lmi_dlci_high;
+static int hf_lmi_dlci_low;
+static int hf_lmi_new;
+static int hf_lmi_act;
+
+static gint ett_lmi;
+static gint ett_lmi_ele;
 
 #ifdef _OLD_
 /*
diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c
index ef38caba0f..820a9cd195 100644
--- a/epan/dissectors/packet-lmp.c
+++ b/epan/dissectors/packet-lmp.c
@@ -43,7 +43,7 @@
 void proto_register_lmp(void);
 void proto_reg_handoff_lmp(void);
 
-static int proto_lmp = -1;
+static int proto_lmp;
 
 #define UDP_PORT_LMP_DEFAULT 701
 
@@ -488,41 +488,41 @@ static int hf_lmp_filter[LMPF_MAX];
 static int hf_lmp_data;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_lmp_maximum_reservable_bandwidth = -1;
-static int hf_lmp_verify_transport_mechanism = -1;
-static int hf_lmp_interface_id_ipv6 = -1;
-static int hf_lmp_minimum_reservable_bandwidth = -1;
-static int hf_lmp_object_length = -1;
-static int hf_lmp_interface_id_unnumbered = -1;
-static int hf_lmp_signal_types_sdh = -1;
-static int hf_lmp_link_type = -1;
-static int hf_lmp_number_of_data_links = -1;
-static int hf_lmp_version = -1;
-static int hf_lmp_interface_id_ipv4 = -1;
-static int hf_lmp_header_length = -1;
-static int hf_lmp_uni_version = -1;
-static int hf_lmp_subobject_type = -1;
-static int hf_lmp_object_class = -1;
-static int hf_lmp_negotiable = -1;
-static int hf_lmp_signal_types_sonet = -1;
-static int hf_lmp_header_flags = -1;
-static int hf_lmp_verify_interval = -1;
-static int hf_lmp_wavelength = -1;
-static int hf_lmp_channel_status = -1;
-static int hf_lmp_verifydeadinterval = -1;
-static int hf_lmp_data_link_remote_id_ipv6 = -1;
-static int hf_lmp_link = -1;
-static int hf_lmp_subobject_length = -1;
-static int hf_lmp_transmission_rate = -1;
-static int hf_lmp_verify_transport_response = -1;
-static int hf_lmp_data_link_local_id_ipv6 = -1;
-static int hf_lmp_free_timeslots = -1;
-
-static expert_field ei_lmp_checksum_incorrect = EI_INIT;
-static expert_field ei_lmp_invalid_msg_type = EI_INIT;
-static expert_field ei_lmp_invalid_class = EI_INIT;
-static expert_field ei_lmp_trace_len = EI_INIT;
-static expert_field ei_lmp_obj_len = EI_INIT;
+static int hf_lmp_maximum_reservable_bandwidth;
+static int hf_lmp_verify_transport_mechanism;
+static int hf_lmp_interface_id_ipv6;
+static int hf_lmp_minimum_reservable_bandwidth;
+static int hf_lmp_object_length;
+static int hf_lmp_interface_id_unnumbered;
+static int hf_lmp_signal_types_sdh;
+static int hf_lmp_link_type;
+static int hf_lmp_number_of_data_links;
+static int hf_lmp_version;
+static int hf_lmp_interface_id_ipv4;
+static int hf_lmp_header_length;
+static int hf_lmp_uni_version;
+static int hf_lmp_subobject_type;
+static int hf_lmp_object_class;
+static int hf_lmp_negotiable;
+static int hf_lmp_signal_types_sonet;
+static int hf_lmp_header_flags;
+static int hf_lmp_verify_interval;
+static int hf_lmp_wavelength;
+static int hf_lmp_channel_status;
+static int hf_lmp_verifydeadinterval;
+static int hf_lmp_data_link_remote_id_ipv6;
+static int hf_lmp_link;
+static int hf_lmp_subobject_length;
+static int hf_lmp_transmission_rate;
+static int hf_lmp_verify_transport_response;
+static int hf_lmp_data_link_local_id_ipv6;
+static int hf_lmp_free_timeslots;
+
+static expert_field ei_lmp_checksum_incorrect;
+static expert_field ei_lmp_invalid_msg_type;
+static expert_field ei_lmp_invalid_class;
+static expert_field ei_lmp_trace_len;
+static expert_field ei_lmp_obj_len;
 
 static int
 lmp_valid_class(int lmp_class)
diff --git a/epan/dissectors/packet-lnet.c b/epan/dissectors/packet-lnet.c
index 0e49c5e911..9db2b7a2a1 100644
--- a/epan/dissectors/packet-lnet.c
+++ b/epan/dissectors/packet-lnet.c
@@ -36,78 +36,78 @@ void proto_register_lnet(void);
 static dissector_handle_t lnet_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_lnet = -1;
+static int proto_lnet;
 
-static int hf_lnet_ksm_type = -1;
-static int hf_lnet_ksm_csum = -1;
-static int hf_lnet_ksm_zc_req_cookie = -1;
-static int hf_lnet_ksm_zc_ack_cookie = -1;
+static int hf_lnet_ksm_type;
+static int hf_lnet_ksm_csum;
+static int hf_lnet_ksm_zc_req_cookie;
+static int hf_lnet_ksm_zc_ack_cookie;
 
-static int hf_lnet_ib_magic = -1;
-static int hf_lnet_ib_version = -1;
-static int hf_lnet_ib_type = -1;
-static int hf_lnet_ib_credits = -1;
-static int hf_lnet_ib_nob = -1;
-static int hf_lnet_ib_csum = -1;
-static int hf_lnet_ib_srcstamp = -1;
-static int hf_lnet_ib_dststamp = -1;
+static int hf_lnet_ib_magic;
+static int hf_lnet_ib_version;
+static int hf_lnet_ib_type;
+static int hf_lnet_ib_credits;
+static int hf_lnet_ib_nob;
+static int hf_lnet_ib_csum;
+static int hf_lnet_ib_srcstamp;
+static int hf_lnet_ib_dststamp;
 
-static int hf_lnet_src_nid = -1;
-static int hf_lnet_dest_nid = -1;
+static int hf_lnet_src_nid;
+static int hf_lnet_dest_nid;
 
-static int hf_lnet_nid_addr = -1;
-static int hf_lnet_nid_lnet_type = -1;
-static int hf_lnet_nid_interface = -1;
+static int hf_lnet_nid_addr;
+static int hf_lnet_nid_lnet_type;
+static int hf_lnet_nid_interface;
 
-static int hf_lnet_dest_pid = -1;
-static int hf_lnet_src_pid = -1;
+static int hf_lnet_dest_pid;
+static int hf_lnet_src_pid;
 
-static int hf_lnet_msg_type = -1;
-static int hf_lnet_payload_length = -1;
-static int hf_lnet_payload = -1;
-static int hf_lnet_msg_filler = -1;
+static int hf_lnet_msg_type;
+static int hf_lnet_payload_length;
+static int hf_lnet_payload;
+static int hf_lnet_msg_filler;
 
-static int hf_dst_wmd_interface = -1;
-static int hf_dst_wmd_object = -1;
+static int hf_dst_wmd_interface;
+static int hf_dst_wmd_object;
 
-static int hf_match_bits = -1;
-static int hf_mlength = -1;
+static int hf_match_bits;
+static int hf_mlength;
 
-static int hf_hdr_data = -1;
-static int hf_ptl_index = -1;
-static int hf_offset = -1;
+static int hf_hdr_data;
+static int hf_ptl_index;
+static int hf_offset;
 
-static int hf_src_offset = -1;
-static int hf_sink_length = -1;
+static int hf_src_offset;
+static int hf_sink_length;
 
-static int hf_hello_incarnation = -1;
-static int hf_hello_type = -1;
+static int hf_hello_incarnation;
+static int hf_hello_type;
 
-static int hf_lnet_o2ib_connparam = -1;
-static int hf_lnet_o2ib_connparam_qdepth = -1;
-static int hf_lnet_o2ib_connparam_max_frags = -1;
-static int hf_lnet_o2ib_connparam_max_size = -1;
-static int hf_lnet_o2ib_cookie = -1;
-static int hf_lnet_o2ib_src_cookie = -1;
-static int hf_lnet_o2ib_dest_cookie = -1;
-static int hf_lnet_o2ib_status = -1;
+static int hf_lnet_o2ib_connparam;
+static int hf_lnet_o2ib_connparam_qdepth;
+static int hf_lnet_o2ib_connparam_max_frags;
+static int hf_lnet_o2ib_connparam_max_size;
+static int hf_lnet_o2ib_cookie;
+static int hf_lnet_o2ib_src_cookie;
+static int hf_lnet_o2ib_dest_cookie;
+static int hf_lnet_o2ib_status;
 
-static int hf_lnet_rdma_desc = -1;
-static int hf_lnet_rdma_desc_key = -1;
-static int hf_lnet_rdma_desc_nfrags = -1;
+static int hf_lnet_rdma_desc;
+static int hf_lnet_rdma_desc_key;
+static int hf_lnet_rdma_desc_nfrags;
 
-static int hf_lnet_rdma_frag_size = -1;
-static int hf_lnet_rdma_frag_addr = -1;
+static int hf_lnet_rdma_frag_size;
+static int hf_lnet_rdma_frag_addr;
 
 /* Initialize the subtree pointers */
-static gint ett_lnet = -1;
-static gint ett_lnet_nid = -1;
-static gint ett_lnet_o2ib_connparams = -1;
-static gint ett_lnet_rdma_desc = -1;
-static gint ett_lnet_rdma_frag = -1;
-
-static expert_field ei_lnet_buflen = EI_INIT;
-static expert_field ei_lnet_type = EI_INIT;
+static gint ett_lnet;
+static gint ett_lnet_nid;
+static gint ett_lnet_o2ib_connparams;
+static gint ett_lnet_rdma_desc;
+static gint ett_lnet_rdma_frag;
+
+static expert_field ei_lnet_buflen;
+static expert_field ei_lnet_type;
 
 #define LNET_TCP_PORT 988   /* Not IANA registered */
 
diff --git a/epan/dissectors/packet-locamation-im.c b/epan/dissectors/packet-locamation-im.c
index 5b3cbe9cf1..a8f5db2b63 100644
--- a/epan/dissectors/packet-locamation-im.c
+++ b/epan/dissectors/packet-locamation-im.c
@@ -212,13 +212,13 @@ static void add_split_lines(packet_info *pinfo, tvbuff_t *tvb, int tvb_offset, p
  * Calibration Chunk: string
  */
 
-static int hf_calibration_sequence_number = -1;
-static int hf_calibration_first_sequence_number = -1;
-static int hf_calibration_last_sequence_number = -1;
-static int hf_calibration_name = -1;
-static int hf_calibration_name_line = -1;
-static int hf_calibration_chunk = -1;
-static int hf_calibration_chunk_line = -1;
+static int hf_calibration_sequence_number;
+static int hf_calibration_first_sequence_number;
+static int hf_calibration_last_sequence_number;
+static int hf_calibration_name;
+static int hf_calibration_name_line;
+static int hf_calibration_chunk;
+static int hf_calibration_chunk_line;
 
 static hf_register_info protocol_registration_calibration[] = {
     {&hf_calibration_sequence_number, {"Sequence Number", "locamation-im.calibration.sequence_number", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
@@ -229,15 +229,15 @@ static hf_register_info protocol_registration_calibration[] = {
     {&hf_calibration_chunk, {"Chunk", "locamation-im.calibration.chunk", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_calibration_chunk_line, {"Chunk Line", "locamation-im.calibration.chunk.line", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}}};
 
-static expert_field ei_calibration_header = EI_INIT;
+static expert_field ei_calibration_header;
 
 static ei_register_info ei_calibration[] = {
     {&ei_calibration_header, {"locamation-im.calibration.header", PI_SEQUENCE, PI_NOTE, "Header Packet", EXPFILL}}};
 
 static int h_protocol_calibration = -1;
 
-static gint ett_protocol_calibration = -1;
-static gint ett_calibration_lines = -1;
+static gint ett_protocol_calibration;
+static gint ett_calibration_lines;
 
 static int dissect_calibration(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTOCOL_SHORTNAME_CALIBRATION);
@@ -311,8 +311,8 @@ static int dissect_calibration(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
  * Content: string
  */
 
-static int hf_ident_contents = -1;
-static int hf_ident_contents_line = -1;
+static int hf_ident_contents;
+static int hf_ident_contents_line;
 
 static hf_register_info protocol_registration_ident[] = {
     {&hf_ident_contents, {"Contents", "locamation-im.ident.contents", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
@@ -320,8 +320,8 @@ static hf_register_info protocol_registration_ident[] = {
 
 static int h_protocol_ident = -1;
 
-static gint ett_protocol_ident = -1;
-static gint ett_ident_lines = -1;
+static gint ett_protocol_ident;
+static gint ett_ident_lines;
 
 static int dissect_ident(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTOCOL_SHORTNAME_IDENT);
@@ -349,14 +349,14 @@ static int dissect_ident(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
  * ########################################################################
  */
 
-static expert_field ei_samples_ranges_sample_1_invalid = EI_INIT;
-static expert_field ei_samples_ranges_sample_2_invalid = EI_INIT;
-static expert_field ei_samples_ranges_sample_3_invalid = EI_INIT;
-static expert_field ei_samples_ranges_sample_4_invalid = EI_INIT;
-static expert_field ei_samples_ranges_sample_5_invalid = EI_INIT;
-static expert_field ei_samples_ranges_sample_6_invalid = EI_INIT;
-static expert_field ei_samples_ranges_sample_7_invalid = EI_INIT;
-static expert_field ei_samples_ranges_sample_8_invalid = EI_INIT;
+static expert_field ei_samples_ranges_sample_1_invalid;
+static expert_field ei_samples_ranges_sample_2_invalid;
+static expert_field ei_samples_ranges_sample_3_invalid;
+static expert_field ei_samples_ranges_sample_4_invalid;
+static expert_field ei_samples_ranges_sample_5_invalid;
+static expert_field ei_samples_ranges_sample_6_invalid;
+static expert_field ei_samples_ranges_sample_7_invalid;
+static expert_field ei_samples_ranges_sample_8_invalid;
 
 static void check_ranges(tvbuff_t *tvb, packet_info *pinfo, gint tvb_offset, proto_item *item) {
 	guint16 ranges = tvb_get_guint16(tvb, tvb_offset, ENC_BIG_ENDIAN);
@@ -387,18 +387,18 @@ static void check_ranges(tvbuff_t *tvb, packet_info *pinfo, gint tvb_offset, pro
 	}
 }
 
-static gint ett_samples_sample_set_ranges = -1;
+static gint ett_samples_sample_set_ranges;
 
-static int hf_samples_sample_set_ranges = -1;
+static int hf_samples_sample_set_ranges;
 
-static int hf_samples_sample_set_ranges_sample_1 = -1;
-static int hf_samples_sample_set_ranges_sample_2 = -1;
-static int hf_samples_sample_set_ranges_sample_3 = -1;
-static int hf_samples_sample_set_ranges_sample_4 = -1;
-static int hf_samples_sample_set_ranges_sample_5 = -1;
-static int hf_samples_sample_set_ranges_sample_6 = -1;
-static int hf_samples_sample_set_ranges_sample_7 = -1;
-static int hf_samples_sample_set_ranges_sample_8 = -1;
+static int hf_samples_sample_set_ranges_sample_1;
+static int hf_samples_sample_set_ranges_sample_2;
+static int hf_samples_sample_set_ranges_sample_3;
+static int hf_samples_sample_set_ranges_sample_4;
+static int hf_samples_sample_set_ranges_sample_5;
+static int hf_samples_sample_set_ranges_sample_6;
+static int hf_samples_sample_set_ranges_sample_7;
+static int hf_samples_sample_set_ranges_sample_8;
 
 static int *const rangesBits[] = {
     &hf_samples_sample_set_ranges_sample_8,
@@ -411,14 +411,14 @@ static int *const rangesBits[] = {
     &hf_samples_sample_set_ranges_sample_1,
     NULL};
 
-static int hf_samples_sample_set_sample_1 = -1;
-static int hf_samples_sample_set_sample_2 = -1;
-static int hf_samples_sample_set_sample_3 = -1;
-static int hf_samples_sample_set_sample_4 = -1;
-static int hf_samples_sample_set_sample_5 = -1;
-static int hf_samples_sample_set_sample_6 = -1;
-static int hf_samples_sample_set_sample_7 = -1;
-static int hf_samples_sample_set_sample_8 = -1;
+static int hf_samples_sample_set_sample_1;
+static int hf_samples_sample_set_sample_2;
+static int hf_samples_sample_set_sample_3;
+static int hf_samples_sample_set_sample_4;
+static int hf_samples_sample_set_sample_5;
+static int hf_samples_sample_set_sample_6;
+static int hf_samples_sample_set_sample_7;
+static int hf_samples_sample_set_sample_8;
 
 static void add_sample_set(tvbuff_t *tvb, packet_info *pinfo, gint *tvb_offset, int hf, proto_tree *tree) {
 	gint item_size = SAMPLE_SET_SIZE;
@@ -468,17 +468,17 @@ static void add_rms_values(tvbuff_t *tvb, gint *tvb_offset, int *hfs, guint hfs_
 	}
 }
 
-static gint ett_samples_timestamps_sample = -1;
-static gint ett_samples_timestamps_sample_reserved = -1;
-static gint ett_samples_timestamps_sample_timestamp = -1;
+static gint ett_samples_timestamps_sample;
+static gint ett_samples_timestamps_sample_reserved;
+static gint ett_samples_timestamps_sample_timestamp;
 
-static int hf_samples_timestamps_sample_sync_status = -1;
-static int hf_samples_timestamps_sample_additional_status = -1;
-static int hf_samples_timestamps_sample_additional_status_holdover_state = -1;
-static int hf_samples_timestamps_sample_additional_status_master_clock_switch = -1;
-static int hf_samples_timestamps_sample_timestamp = -1;
-static int hf_samples_timestamps_sample_timestamp_seconds = -1;
-static int hf_samples_timestamps_sample_timestamp_nanoseconds = -1;
+static int hf_samples_timestamps_sample_sync_status;
+static int hf_samples_timestamps_sample_additional_status;
+static int hf_samples_timestamps_sample_additional_status_holdover_state;
+static int hf_samples_timestamps_sample_additional_status_master_clock_switch;
+static int hf_samples_timestamps_sample_timestamp;
+static int hf_samples_timestamps_sample_timestamp_seconds;
+static int hf_samples_timestamps_sample_timestamp_nanoseconds;
 
 static const value_string samples_timestamps_sample_sync_status[] = {
     {0, "None"},
@@ -491,7 +491,7 @@ static int *const timestamp_additional_status_bits[] = {
     &hf_samples_timestamps_sample_additional_status_master_clock_switch,
     NULL};
 
-static expert_field ei_samples_timestamp_sync_status_invalid = EI_INIT;
+static expert_field ei_samples_timestamp_sync_status_invalid;
 
 static void add_timestamp_sample(tvbuff_t *tvb, packet_info *pinfo, gint *tvb_offset_previous, gint *tvb_offset, int hf, proto_tree *tree) {
 	gint item_size = TIMESTAMP_SIZE;
@@ -748,30 +748,30 @@ static void add_timestamps_set(tvbuff_t *tvb, packet_info *pinfo, gint *tvb_offs
  *     Nanoseconds  4 bytes, unsigned
  */
 
-static gint ett_protocol_samples = -1;
-static gint ett_samples_control = -1;
-static gint ett_samples_sets = -1;
-static gint ett_samples_sets_set = -1;
-static gint ett_samples_rms = -1;
-static gint ett_samples_rms_values = -1;
-static gint ett_samples_timestamps = -1;
-static gint ett_samples_timestamps_set = -1;
-
-static expert_field ei_samples_im_version_invalid = EI_INIT;
-
-static int hf_samples_transport_delay = -1;
-static int hf_samples_hop_count = -1;
-static int hf_samples_control = -1;
-static int hf_samples_control_type = -1;
-static int hf_samples_control_simulated = -1;
-static int hf_samples_control_version = -1;
-static int hf_samples_control_sequence_number = -1;
-static int hf_samples_temperature = -1;
-static int hf_samples_padding = -1;
-static int hf_samples_adc_status = -1;
-static int hf_samples_sample_set = -1;
-static int hf_samples_rms_values = -1;
-static int hf_samples_timestamps = -1;
+static gint ett_protocol_samples;
+static gint ett_samples_control;
+static gint ett_samples_sets;
+static gint ett_samples_sets_set;
+static gint ett_samples_rms;
+static gint ett_samples_rms_values;
+static gint ett_samples_timestamps;
+static gint ett_samples_timestamps_set;
+
+static expert_field ei_samples_im_version_invalid;
+
+static int hf_samples_transport_delay;
+static int hf_samples_hop_count;
+static int hf_samples_control;
+static int hf_samples_control_type;
+static int hf_samples_control_simulated;
+static int hf_samples_control_version;
+static int hf_samples_control_sequence_number;
+static int hf_samples_temperature;
+static int hf_samples_padding;
+static int hf_samples_adc_status;
+static int hf_samples_sample_set;
+static int hf_samples_rms_values;
+static int hf_samples_timestamps;
 
 static int *const controlBits[] = {
     &hf_samples_control_type,
@@ -780,34 +780,34 @@ static int *const controlBits[] = {
     &hf_samples_control_sequence_number,
     NULL};
 
-static int hf_samples_sample_set_measurement_channel_1 = -1;
-static int hf_samples_sample_set_measurement_channel_2 = -1;
-static int hf_samples_sample_set_measurement_channel_3 = -1;
-static int hf_samples_sample_set_measurement_channel_n = -1;
-static int hf_samples_sample_set_protection_channel_1 = -1;
-static int hf_samples_sample_set_protection_channel_2 = -1;
-static int hf_samples_sample_set_protection_channel_3 = -1;
-static int hf_samples_sample_set_protection_channel_n = -1;
-static int hf_samples_sample_set_channel_unused = -1;
-
-static int hf_samples_rms_values_measurement_channel_1 = -1;
-static int hf_samples_rms_values_measurement_channel_2 = -1;
-static int hf_samples_rms_values_measurement_channel_3 = -1;
-static int hf_samples_rms_values_protection_channel_1 = -1;
-static int hf_samples_rms_values_protection_channel_2 = -1;
-static int hf_samples_rms_values_protection_channel_3 = -1;
-static int hf_samples_rms_values_channel_unused = -1;
-
-static int hf_samples_timestamps_version = -1;
-static int hf_samples_timestamps_reserved = -1;
-static int hf_samples_timestamps_sample_1 = -1;
-static int hf_samples_timestamps_sample_2 = -1;
-static int hf_samples_timestamps_sample_3 = -1;
-static int hf_samples_timestamps_sample_4 = -1;
-static int hf_samples_timestamps_sample_5 = -1;
-static int hf_samples_timestamps_sample_6 = -1;
-static int hf_samples_timestamps_sample_7 = -1;
-static int hf_samples_timestamps_sample_8 = -1;
+static int hf_samples_sample_set_measurement_channel_1;
+static int hf_samples_sample_set_measurement_channel_2;
+static int hf_samples_sample_set_measurement_channel_3;
+static int hf_samples_sample_set_measurement_channel_n;
+static int hf_samples_sample_set_protection_channel_1;
+static int hf_samples_sample_set_protection_channel_2;
+static int hf_samples_sample_set_protection_channel_3;
+static int hf_samples_sample_set_protection_channel_n;
+static int hf_samples_sample_set_channel_unused;
+
+static int hf_samples_rms_values_measurement_channel_1;
+static int hf_samples_rms_values_measurement_channel_2;
+static int hf_samples_rms_values_measurement_channel_3;
+static int hf_samples_rms_values_protection_channel_1;
+static int hf_samples_rms_values_protection_channel_2;
+static int hf_samples_rms_values_protection_channel_3;
+static int hf_samples_rms_values_channel_unused;
+
+static int hf_samples_timestamps_version;
+static int hf_samples_timestamps_reserved;
+static int hf_samples_timestamps_sample_1;
+static int hf_samples_timestamps_sample_2;
+static int hf_samples_timestamps_sample_3;
+static int hf_samples_timestamps_sample_4;
+static int hf_samples_timestamps_sample_5;
+static int hf_samples_timestamps_sample_6;
+static int hf_samples_timestamps_sample_7;
+static int hf_samples_timestamps_sample_8;
 
 static int dissect_samples_im(gboolean im1, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_, int h_protocol_samples) {
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, im1 ? PROTOCOL_SHORTNAME_SAMPLES_IM1 : PROTOCOL_SHORTNAME_SAMPLES_IM2R0);
@@ -1184,7 +1184,7 @@ static int dissect_samples_im2r0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
  * ########################################################################
  */
 
-static int hf_llc_company_pid = -1;
+static int hf_llc_company_pid;
 
 static hf_register_info llc_registration[] = {
     {&hf_llc_company_pid, {"PID", "locamation-im.llc.pid", FT_UINT16, BASE_HEX, VALS(company_pid_vals), 0x0, "Protocol ID", HFILL}}};
diff --git a/epan/dissectors/packet-log3gpp.c b/epan/dissectors/packet-log3gpp.c
index 995c509f00..f486c48798 100644
--- a/epan/dissectors/packet-log3gpp.c
+++ b/epan/dissectors/packet-log3gpp.c
@@ -30,18 +30,18 @@ void proto_register_log3gpp(void);
 void proto_reg_handoff_log3gpp(void);
 
 /* Protocol and registered fields. */
-static int proto_log3gpp = -1;
+static int proto_log3gpp;
 
 
-static int hf_log3gpp_timestamp = -1;
-static int hf_log3gpp_protocol = -1;
-static int hf_log3gpp_direction = -1;
-static int hf_log3gpp_dissector_option = -1;
-static int hf_log3gpp_unparsed_data = -1;
-static int hf_log3gpp_dissected_length = -1;
+static int hf_log3gpp_timestamp;
+static int hf_log3gpp_protocol;
+static int hf_log3gpp_direction;
+static int hf_log3gpp_dissector_option;
+static int hf_log3gpp_unparsed_data;
+static int hf_log3gpp_dissected_length;
 
 /* Protocol subtree. */
-static int ett_log3gpp = -1;
+static int ett_log3gpp;
 
 /* Variables used to select a version for RRC and NAS */
 static int lte_rrc_prot_version = REL8;
diff --git a/epan/dissectors/packet-logcat-text.c b/epan/dissectors/packet-logcat-text.c
index dd895a69c4..4eceb7ff79 100644
--- a/epan/dissectors/packet-logcat-text.c
+++ b/epan/dissectors/packet-logcat-text.c
@@ -22,19 +22,19 @@
 
 extern const value_string priority_vals[];
 
-static int proto_logcat_text = -1;
+static int proto_logcat_text;
 
-static int hf_logcat_text_pid = -1;
-static int hf_logcat_text_tid = -1;
-static int hf_logcat_text_timestamp = -1;
-static int hf_logcat_text_priority = -1;
-static int hf_logcat_text_tag = -1;
-static int hf_logcat_text_log = -1;
+static int hf_logcat_text_pid;
+static int hf_logcat_text_tid;
+static int hf_logcat_text_timestamp;
+static int hf_logcat_text_priority;
+static int hf_logcat_text_tag;
+static int hf_logcat_text_log;
 
-static gint ett_logcat = -1;
+static gint ett_logcat;
 
-static expert_field ei_malformed_time = EI_INIT;
-static expert_field ei_malformed_token = EI_INIT;
+static expert_field ei_malformed_time;
+static expert_field ei_malformed_token;
 
 static dissector_handle_t logcat_text_brief_handle;
 static dissector_handle_t logcat_text_tag_handle;
diff --git a/epan/dissectors/packet-logcat.c b/epan/dissectors/packet-logcat.c
index 9c33eca671..fb80a5cc0a 100644
--- a/epan/dissectors/packet-logcat.c
+++ b/epan/dissectors/packet-logcat.c
@@ -19,32 +19,32 @@
 #include <epan/prefs.h>
 #include <wiretap/wtap.h>
 
-static int proto_logcat = -1;
-
-static int hf_logcat_version = -1;
-static int hf_logcat_length = -1;
-static int hf_logcat_padding = -1;
-static int hf_logcat_header_size = -1;
-static int hf_logcat_pid = -1;
-static int hf_logcat_tid = -1;
-static int hf_logcat_timestamp = -1;
-static int hf_logcat_timestamp_seconds = -1;
-static int hf_logcat_timestamp_nanoseconds = -1;
-static int hf_logcat_euid = -1;
-static int hf_logcat_priority = -1;
-static int hf_logcat_tag = -1;
-static int hf_logcat_log = -1;
-
-static gint ett_logcat = -1;
-static gint ett_logcat_timestamp = -1;
-static gint ett_logcat_log = -1;
+static int proto_logcat;
+
+static int hf_logcat_version;
+static int hf_logcat_length;
+static int hf_logcat_padding;
+static int hf_logcat_header_size;
+static int hf_logcat_pid;
+static int hf_logcat_tid;
+static int hf_logcat_timestamp;
+static int hf_logcat_timestamp_seconds;
+static int hf_logcat_timestamp_nanoseconds;
+static int hf_logcat_euid;
+static int hf_logcat_priority;
+static int hf_logcat_tag;
+static int hf_logcat_log;
+
+static gint ett_logcat;
+static gint ett_logcat_timestamp;
+static gint ett_logcat_log;
 
 static dissector_handle_t logcat_handle;
 static dissector_handle_t data_text_lines_handle;
 
 static gint exported_pdu_tap = -1;
 
-static expert_field ei_invalid_payload_length = EI_INIT;
+static expert_field ei_invalid_payload_length;
 
 static gboolean  pref_one_line_info_column = TRUE;
 
diff --git a/epan/dissectors/packet-lon.c b/epan/dissectors/packet-lon.c
index 33ce55660c..b879e3b064 100644
--- a/epan/dissectors/packet-lon.c
+++ b/epan/dissectors/packet-lon.c
@@ -111,70 +111,70 @@ static const value_string nd_code_vs[]=
 	{0, NULL}
 };
 
-static gint hf_lon_ppdu			= -1;
-static gint hf_lon_ppdu_prio		= -1;
-static gint hf_lon_ppdu_alt		= -1;
-static gint hf_lon_ppdu_deltabl		= -1;
-static gint hf_lon_npdu			= -1;
-static gint hf_lon_npdu_version		= -1;
-static gint hf_lon_npdu_pdu_fmt		= -1;
-static gint hf_lon_npdu_addr_fmt	= -1;
-static gint hf_lon_npdu_dom_len		= -1;
-static gint hf_lon_addr_srcsub		= -1;
-static gint hf_lon_addr_srcnode		= -1;
-static gint hf_lon_addr_dstsub		= -1;
-static gint hf_lon_addr_dstgrp		= -1;
-static gint hf_lon_addr_dstnode		= -1;
-static gint hf_lon_addr_grp		= -1;
-static gint hf_lon_addr_grpmem		= -1;
-static gint hf_lon_addr_uid		= -1;
-static gint hf_lon_name			= -1;
-static gint hf_lon_domain		= -1;
-static gint hf_lon_tpdu			= -1;
-static gint hf_lon_auth			= -1;
-static gint hf_lon_tpdu_tpdu_type	= -1;
-static gint hf_lon_trans_no		= -1;
-static gint hf_lon_spdu			= -1;
-static gint hf_lon_spdu_spdu_type	= -1;
-static gint hf_lon_mlen			= -1;
-static gint hf_lon_mlist		= -1;
-static gint hf_lon_authpdu		= -1;
-static gint hf_lon_authpdu_fmt		= -1;
-static gint hf_lon_authpdu_authpdu_type	= -1;
-static gint hf_lon_nv_dir		= -1;
-static gint hf_lon_nv_selector		= -1;
-static gint hf_lon_app_code		= -1;
-static gint hf_lon_nm_code		= -1;
-static gint hf_lon_nd_code		= -1;
-static gint hf_lon_ff_code		= -1;
-static gint hf_lon_nv			= -1;
-static gint hf_lon_app			= -1;
-static gint hf_lon_nm			= -1;
-static gint hf_lon_nd			= -1;
-static gint hf_lon_ff			= -1;
-/* static gint hf_lon_checksum		= -1; */
-static gint proto_lon			= -1;
-
-
-static gint ett_lon                     = -1;
-static gint ett_ppdu			= -1;
-static gint ett_npdu			= -1;
-static gint ett_tpdu                    = -1;
-static gint ett_spdu                    = -1;
-static gint ett_authpdu                 = -1;
-static gint ett_apdu                    = -1;
-static gint ett_nv                      = -1;
-static gint ett_app                     = -1;
-static gint ett_nm                      = -1;
-static gint ett_nd                      = -1;
-static gint ett_ff                      = -1;
-
-static gint ett_address			= -1;
-
-static expert_field ei_lon_tpdu_tpdu_type_unknown = EI_INIT;
-static expert_field ei_lon_tpdu_spdu_type_unknown = EI_INIT;
-static expert_field ei_lon_tpdu_authpdu_type_unknown = EI_INIT;
-static expert_field ei_lon_tpdu_apdu_dest_type = EI_INIT;
+static gint hf_lon_ppdu;
+static gint hf_lon_ppdu_prio;
+static gint hf_lon_ppdu_alt;
+static gint hf_lon_ppdu_deltabl;
+static gint hf_lon_npdu;
+static gint hf_lon_npdu_version;
+static gint hf_lon_npdu_pdu_fmt;
+static gint hf_lon_npdu_addr_fmt;
+static gint hf_lon_npdu_dom_len;
+static gint hf_lon_addr_srcsub;
+static gint hf_lon_addr_srcnode;
+static gint hf_lon_addr_dstsub;
+static gint hf_lon_addr_dstgrp;
+static gint hf_lon_addr_dstnode;
+static gint hf_lon_addr_grp;
+static gint hf_lon_addr_grpmem;
+static gint hf_lon_addr_uid;
+static gint hf_lon_name;
+static gint hf_lon_domain;
+static gint hf_lon_tpdu;
+static gint hf_lon_auth;
+static gint hf_lon_tpdu_tpdu_type;
+static gint hf_lon_trans_no;
+static gint hf_lon_spdu;
+static gint hf_lon_spdu_spdu_type;
+static gint hf_lon_mlen;
+static gint hf_lon_mlist;
+static gint hf_lon_authpdu;
+static gint hf_lon_authpdu_fmt;
+static gint hf_lon_authpdu_authpdu_type;
+static gint hf_lon_nv_dir;
+static gint hf_lon_nv_selector;
+static gint hf_lon_app_code;
+static gint hf_lon_nm_code;
+static gint hf_lon_nd_code;
+static gint hf_lon_ff_code;
+static gint hf_lon_nv;
+static gint hf_lon_app;
+static gint hf_lon_nm;
+static gint hf_lon_nd;
+static gint hf_lon_ff;
+/* static gint hf_lon_checksum; */
+static gint proto_lon;
+
+
+static gint ett_lon;
+static gint ett_ppdu;
+static gint ett_npdu;
+static gint ett_tpdu;
+static gint ett_spdu;
+static gint ett_authpdu;
+static gint ett_apdu;
+static gint ett_nv;
+static gint ett_app;
+static gint ett_nm;
+static gint ett_nd;
+static gint ett_ff;
+
+static gint ett_address;
+
+static expert_field ei_lon_tpdu_tpdu_type_unknown;
+static expert_field ei_lon_tpdu_spdu_type_unknown;
+static expert_field ei_lon_tpdu_authpdu_type_unknown;
+static expert_field ei_lon_tpdu_apdu_dest_type;
 
 static gint dissect_apdu(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb,
 		gint offset);
diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c
index cba222ec36..a2980a18c1 100644
--- a/epan/dissectors/packet-loop.c
+++ b/epan/dissectors/packet-loop.c
@@ -30,14 +30,14 @@ void proto_reg_handoff_loop(void);
 
 static dissector_handle_t loop_handle;
 
-static int proto_loop = -1;
-static int hf_loop_skipcount = -1;
-static int hf_loop_function = -1;
-static int hf_loop_relevant_function = -1;
-static int hf_loop_receipt_number = -1;
-static int hf_loop_forwarding_address = -1;
-
-static gint ett_loop = -1;
+static int proto_loop;
+static int hf_loop_skipcount;
+static int hf_loop_function;
+static int hf_loop_relevant_function;
+static int hf_loop_receipt_number;
+static int hf_loop_forwarding_address;
+
+static gint ett_loop;
 
 #define FUNC_REPLY              1
 #define FUNC_FORWARD_DATA       2
diff --git a/epan/dissectors/packet-loratap.c b/epan/dissectors/packet-loratap.c
index 9f377c89ab..3e3e1315e0 100644
--- a/epan/dissectors/packet-loratap.c
+++ b/epan/dissectors/packet-loratap.c
@@ -28,34 +28,34 @@ static dissector_handle_t loratap_handle;
 
 static dissector_table_t loratap_dissector_table;
 
-static int proto_loratap = -1;
-static int hf_loratap_header_version_type = -1;
-static int hf_loratap_header_length_type = -1;
-static int hf_loratap_header_padding = -1;
-static int hf_loratap_header_channel_type = -1;
-static int hf_loratap_header_channel_frequency_type = -1;
-static int hf_loratap_header_channel_bandwidth_type = -1;
-static int hf_loratap_header_channel_sf_type = -1;
-static int hf_loratap_header_rssi_type = -1;
-static int hf_loratap_header_rssi_packet_type = -1;
-static int hf_loratap_header_rssi_max_type = -1;
-static int hf_loratap_header_rssi_current_type = -1;
-static int hf_loratap_header_rssi_snr_type = -1;
-static int hf_loratap_header_syncword_type = -1;
-static int hf_loratap_header_tag_type = -1;
-static int hf_loratap_header_payload_type = -1;
-static int hf_loratap_header_source_gw_type = -1;
-static int hf_loratap_header_timestamp_type = -1;
-static int hf_loratap_header_datarate_type = -1;
-static int hf_loratap_header_if_channel_type = -1;
-static int hf_loratap_header_rf_chain_type = -1;
-static int hf_loratap_header_cr_type = -1;
-static int hf_loratap_header_flags_type = -1;
-static int hf_loratap_header_flags_mod_fsk_type = -1;
-static int hf_loratap_header_flags_iq_inverted_type = -1;
-static int hf_loratap_header_flags_implicit_hdr_type = -1;
-static int hf_loratap_header_flags_crc_type = -1;
-static int hf_loratap_header_flags_padding_type = -1;
+static int proto_loratap;
+static int hf_loratap_header_version_type;
+static int hf_loratap_header_length_type;
+static int hf_loratap_header_padding;
+static int hf_loratap_header_channel_type;
+static int hf_loratap_header_channel_frequency_type;
+static int hf_loratap_header_channel_bandwidth_type;
+static int hf_loratap_header_channel_sf_type;
+static int hf_loratap_header_rssi_type;
+static int hf_loratap_header_rssi_packet_type;
+static int hf_loratap_header_rssi_max_type;
+static int hf_loratap_header_rssi_current_type;
+static int hf_loratap_header_rssi_snr_type;
+static int hf_loratap_header_syncword_type;
+static int hf_loratap_header_tag_type;
+static int hf_loratap_header_payload_type;
+static int hf_loratap_header_source_gw_type;
+static int hf_loratap_header_timestamp_type;
+static int hf_loratap_header_datarate_type;
+static int hf_loratap_header_if_channel_type;
+static int hf_loratap_header_rf_chain_type;
+static int hf_loratap_header_cr_type;
+static int hf_loratap_header_flags_type;
+static int hf_loratap_header_flags_mod_fsk_type;
+static int hf_loratap_header_flags_iq_inverted_type;
+static int hf_loratap_header_flags_implicit_hdr_type;
+static int hf_loratap_header_flags_crc_type;
+static int hf_loratap_header_flags_padding_type;
 
 static int * const hfx_loratap_header_flags[] = {
 	&hf_loratap_header_flags_mod_fsk_type,
@@ -66,10 +66,10 @@ static int * const hfx_loratap_header_flags[] = {
 	NULL
 };
 
-static gint ett_loratap = -1;
-static gint ett_loratap_flags = -1;
-static gint ett_loratap_channel = -1;
-static gint ett_loratap_rssi = -1;
+static gint ett_loratap;
+static gint ett_loratap_flags;
+static gint ett_loratap_channel;
+static gint ett_loratap_rssi;
 
 static const value_string channel_bandwidth[] = {
 	{ 1, "125 kHz" },
diff --git a/epan/dissectors/packet-lorawan.c b/epan/dissectors/packet-lorawan.c
index dd0d0d7ba7..62d871deac 100644
--- a/epan/dissectors/packet-lorawan.c
+++ b/epan/dissectors/packet-lorawan.c
@@ -26,107 +26,107 @@ void proto_register_lorawan(void);
 
 static dissector_handle_t lorawan_handle;
 
-static int proto_lorawan = -1;
-static int hf_lorawan_msgtype_type = -1;
-static int hf_lorawan_mac_header_type = -1;
-static int hf_lorawan_mac_header_ftype_type = -1;
-static int hf_lorawan_mac_header_rfu_type = -1;
-static int hf_lorawan_mac_header_major_type = -1;
-static int hf_lorawan_mac_commands_type = -1;
-static int hf_lorawan_mac_command_uplink_type = -1;
-static int hf_lorawan_mac_command_downlink_type = -1;
-static int hf_lorawan_mac_command_down_link_check_ans_type = -1;
-static int hf_lorawan_mac_command_down_link_check_ans_margin_type = -1;
-static int hf_lorawan_mac_command_down_link_check_ans_gwcnt_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_datarate_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_txpower_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel1_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel2_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel3_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel4_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel5_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel6_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel7_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel8_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel9_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel10_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel11_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel12_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel13_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel14_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel15_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel16_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_channel_mask_control_type = -1;
-static int hf_lorawan_mac_command_down_link_adr_req_repetitions_type = -1;
-static int hf_lorawan_mac_command_up_link_adr_ans_txpower_type = -1;
-static int hf_lorawan_mac_command_up_link_adr_ans_datarate_type = -1;
-static int hf_lorawan_mac_command_up_link_adr_ans_channel_mask_type = -1;
-static int hf_lorawan_mac_command_down_dutycycle_type = -1;
-static int hf_lorawan_mac_command_down_rx_setup_req_rx1droffset_type = -1;
-static int hf_lorawan_mac_command_down_rx_setup_req_rx2datarate_type = -1;
-static int hf_lorawan_mac_command_down_rx_setup_req_frequency_type = -1;
-static int hf_lorawan_mac_command_up_rx_setup_ans_type = -1;
-static int hf_lorawan_mac_command_up_rx_setup_ans_rx1droffset_type = -1;
-static int hf_lorawan_mac_command_up_rx_setup_ans_rx2datarate_type = -1;
-static int hf_lorawan_mac_command_up_rx_setup_ans_frequency_type = -1;
-static int hf_lorawan_mac_command_up_device_status_ans_battery_type = -1;
-static int hf_lorawan_mac_command_up_device_status_ans_margin_type = -1;
-static int hf_lorawan_mac_command_down_new_channel_req_index_type = -1;
-static int hf_lorawan_mac_command_down_new_channel_req_frequency_type = -1;
-static int hf_lorawan_mac_command_down_new_channel_req_drrange_max_type = -1;
-static int hf_lorawan_mac_command_down_new_channel_req_drrange_min_type = -1;
-static int hf_lorawan_mac_command_up_new_channel_ans_type = -1;
-static int hf_lorawan_mac_command_up_new_channel_ans_datarate_type = -1;
-static int hf_lorawan_mac_command_up_new_channel_ans_frequency_type = -1;
-static int hf_lorawan_mac_command_down_rx_timing_req_delay_type = -1;
-static int hf_lorawan_mac_command_up_di_channel_ans_type = -1;
-static int hf_lorawan_mac_command_up_ping_slot_info_req_type = -1;
-static int hf_lorawan_mac_command_up_ping_slot_channel_ans_type = -1;
-static int hf_lorawan_mac_command_up_beacon_freq_ans_type = -1;
-static int hf_lorawan_mac_command_down_tx_param_setup_req_type = -1;
-static int hf_lorawan_mac_command_down_di_channel_req_type = -1;
-static int hf_lorawan_mac_command_down_device_time_ans_type = -1;
-static int hf_lorawan_mac_command_down_ping_slot_channel_req_type = -1;
-static int hf_lorawan_mac_command_down_beacon_freq_req_type = -1;
-static int hf_lorawan_join_request_type = -1;
-static int hf_lorawan_join_request_joineui_type = -1;
-static int hf_lorawan_join_request_deveui_type = -1;
-static int hf_lorawan_join_request_devnonce_type = -1;
-static int hf_lorawan_join_accept_type = -1;
-static int hf_lorawan_join_accept_joinnonce_type = -1;
-static int hf_lorawan_join_accept_netid_type = -1;
-static int hf_lorawan_join_accept_devaddr_type = -1;
-static int hf_lorawan_join_accept_dlsettings_type = -1;
-static int hf_lorawan_join_accept_dlsettings_rx1droffset_type = -1;
-static int hf_lorawan_join_accept_dlsettings_rx2dr_type = -1;
-static int hf_lorawan_join_accept_rxdelay_type = -1;
-static int hf_lorawan_join_accept_cflist_type = -1;
-static int hf_lorawan_frame_header_type = -1;
-static int hf_lorawan_frame_header_address_type = -1;
-static int hf_lorawan_frame_header_frame_control_adr_type = -1;
-static int hf_lorawan_frame_header_frame_control_adrackreq_type = -1;
-static int hf_lorawan_frame_header_frame_control_ack_type = -1;
-static int hf_lorawan_frame_header_frame_control_fpending_type = -1;
-static int hf_lorawan_frame_header_frame_control_foptslen_type = -1;
-static int hf_lorawan_frame_header_frame_control_type = -1;
-static int hf_lorawan_frame_header_frame_counter_type = -1;
-static int hf_lorawan_frame_fport_type = -1;
-static int hf_lorawan_frame_payload_type = -1;
-static int hf_lorawan_frame_payload_decrypted_type = -1;
-static int hf_lorawan_mic_type = -1;
-static int hf_lorawan_mic_status_type = -1;
-static int hf_lorawan_beacon_rfu1_type = -1;
-static int hf_lorawan_beacon_time_type = -1;
-static int hf_lorawan_beacon_crc1_type = -1;
-static int hf_lorawan_beacon_crc1_status_type = -1;
-static int hf_lorawan_beacon_gwspecific_type = -1;
-static int hf_lorawan_beacon_gwspecific_infodesc_type = -1;
-static int hf_lorawan_beacon_gwspecific_lat_type = -1;
-static int hf_lorawan_beacon_gwspecific_lng_type = -1;
-static int hf_lorawan_beacon_rfu2_type = -1;
-static int hf_lorawan_beacon_crc2_type = -1;
-static int hf_lorawan_beacon_crc2_status_type = -1;
+static int proto_lorawan;
+static int hf_lorawan_msgtype_type;
+static int hf_lorawan_mac_header_type;
+static int hf_lorawan_mac_header_ftype_type;
+static int hf_lorawan_mac_header_rfu_type;
+static int hf_lorawan_mac_header_major_type;
+static int hf_lorawan_mac_commands_type;
+static int hf_lorawan_mac_command_uplink_type;
+static int hf_lorawan_mac_command_downlink_type;
+static int hf_lorawan_mac_command_down_link_check_ans_type;
+static int hf_lorawan_mac_command_down_link_check_ans_margin_type;
+static int hf_lorawan_mac_command_down_link_check_ans_gwcnt_type;
+static int hf_lorawan_mac_command_down_link_adr_req_datarate_type;
+static int hf_lorawan_mac_command_down_link_adr_req_txpower_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel1_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel2_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel3_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel4_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel5_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel6_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel7_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel8_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel9_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel10_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel11_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel12_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel13_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel14_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel15_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel16_type;
+static int hf_lorawan_mac_command_down_link_adr_req_channel_mask_control_type;
+static int hf_lorawan_mac_command_down_link_adr_req_repetitions_type;
+static int hf_lorawan_mac_command_up_link_adr_ans_txpower_type;
+static int hf_lorawan_mac_command_up_link_adr_ans_datarate_type;
+static int hf_lorawan_mac_command_up_link_adr_ans_channel_mask_type;
+static int hf_lorawan_mac_command_down_dutycycle_type;
+static int hf_lorawan_mac_command_down_rx_setup_req_rx1droffset_type;
+static int hf_lorawan_mac_command_down_rx_setup_req_rx2datarate_type;
+static int hf_lorawan_mac_command_down_rx_setup_req_frequency_type;
+static int hf_lorawan_mac_command_up_rx_setup_ans_type;
+static int hf_lorawan_mac_command_up_rx_setup_ans_rx1droffset_type;
+static int hf_lorawan_mac_command_up_rx_setup_ans_rx2datarate_type;
+static int hf_lorawan_mac_command_up_rx_setup_ans_frequency_type;
+static int hf_lorawan_mac_command_up_device_status_ans_battery_type;
+static int hf_lorawan_mac_command_up_device_status_ans_margin_type;
+static int hf_lorawan_mac_command_down_new_channel_req_index_type;
+static int hf_lorawan_mac_command_down_new_channel_req_frequency_type;
+static int hf_lorawan_mac_command_down_new_channel_req_drrange_max_type;
+static int hf_lorawan_mac_command_down_new_channel_req_drrange_min_type;
+static int hf_lorawan_mac_command_up_new_channel_ans_type;
+static int hf_lorawan_mac_command_up_new_channel_ans_datarate_type;
+static int hf_lorawan_mac_command_up_new_channel_ans_frequency_type;
+static int hf_lorawan_mac_command_down_rx_timing_req_delay_type;
+static int hf_lorawan_mac_command_up_di_channel_ans_type;
+static int hf_lorawan_mac_command_up_ping_slot_info_req_type;
+static int hf_lorawan_mac_command_up_ping_slot_channel_ans_type;
+static int hf_lorawan_mac_command_up_beacon_freq_ans_type;
+static int hf_lorawan_mac_command_down_tx_param_setup_req_type;
+static int hf_lorawan_mac_command_down_di_channel_req_type;
+static int hf_lorawan_mac_command_down_device_time_ans_type;
+static int hf_lorawan_mac_command_down_ping_slot_channel_req_type;
+static int hf_lorawan_mac_command_down_beacon_freq_req_type;
+static int hf_lorawan_join_request_type;
+static int hf_lorawan_join_request_joineui_type;
+static int hf_lorawan_join_request_deveui_type;
+static int hf_lorawan_join_request_devnonce_type;
+static int hf_lorawan_join_accept_type;
+static int hf_lorawan_join_accept_joinnonce_type;
+static int hf_lorawan_join_accept_netid_type;
+static int hf_lorawan_join_accept_devaddr_type;
+static int hf_lorawan_join_accept_dlsettings_type;
+static int hf_lorawan_join_accept_dlsettings_rx1droffset_type;
+static int hf_lorawan_join_accept_dlsettings_rx2dr_type;
+static int hf_lorawan_join_accept_rxdelay_type;
+static int hf_lorawan_join_accept_cflist_type;
+static int hf_lorawan_frame_header_type;
+static int hf_lorawan_frame_header_address_type;
+static int hf_lorawan_frame_header_frame_control_adr_type;
+static int hf_lorawan_frame_header_frame_control_adrackreq_type;
+static int hf_lorawan_frame_header_frame_control_ack_type;
+static int hf_lorawan_frame_header_frame_control_fpending_type;
+static int hf_lorawan_frame_header_frame_control_foptslen_type;
+static int hf_lorawan_frame_header_frame_control_type;
+static int hf_lorawan_frame_header_frame_counter_type;
+static int hf_lorawan_frame_fport_type;
+static int hf_lorawan_frame_payload_type;
+static int hf_lorawan_frame_payload_decrypted_type;
+static int hf_lorawan_mic_type;
+static int hf_lorawan_mic_status_type;
+static int hf_lorawan_beacon_rfu1_type;
+static int hf_lorawan_beacon_time_type;
+static int hf_lorawan_beacon_crc1_type;
+static int hf_lorawan_beacon_crc1_status_type;
+static int hf_lorawan_beacon_gwspecific_type;
+static int hf_lorawan_beacon_gwspecific_infodesc_type;
+static int hf_lorawan_beacon_gwspecific_lat_type;
+static int hf_lorawan_beacon_gwspecific_lng_type;
+static int hf_lorawan_beacon_rfu2_type;
+static int hf_lorawan_beacon_crc2_type;
+static int hf_lorawan_beacon_crc2_status_type;
 
 static int * const hfx_lorawan_mac_command_link_check_ans[] = {
 	&hf_lorawan_mac_command_up_link_adr_ans_txpower_type,
@@ -180,22 +180,22 @@ static int * const hfx_lorawan_join_accept_dlsettings[] = {
 	NULL
 };
 
-static gint ett_lorawan = -1;
-static gint ett_lorawan_mac_header = -1;
-static gint ett_lorawan_mac_commands = -1;
-static gint ett_lorawan_mac_command = -1;
-static gint ett_lorawan_mac_command_link_check_ans = -1;
-static gint ett_lorawan_mac_command_link_adr_req_channel = -1;
-static gint ett_lorawan_mac_command_rx_setup_ans = -1;
-static gint ett_lorawan_mac_command_new_channel_ans = -1;
-static gint ett_lorawan_join_request = -1;
-static gint ett_lorawan_join_accept = -1;
-static gint ett_lorawan_join_accept_dlsettings = -1;
-static gint ett_lorawan_frame_header = -1;
-static gint ett_lorawan_frame_header_control = -1;
-static gint ett_lorawan_frame_payload_decrypted = -1;
-static gint ett_lorawan_beacon = -1;
-static gint ett_lorawan_beacon_gwspecific = -1;
+static gint ett_lorawan;
+static gint ett_lorawan_mac_header;
+static gint ett_lorawan_mac_commands;
+static gint ett_lorawan_mac_command;
+static gint ett_lorawan_mac_command_link_check_ans;
+static gint ett_lorawan_mac_command_link_adr_req_channel;
+static gint ett_lorawan_mac_command_rx_setup_ans;
+static gint ett_lorawan_mac_command_new_channel_ans;
+static gint ett_lorawan_join_request;
+static gint ett_lorawan_join_accept;
+static gint ett_lorawan_join_accept_dlsettings;
+static gint ett_lorawan_frame_header;
+static gint ett_lorawan_frame_header_control;
+static gint ett_lorawan_frame_payload_decrypted;
+static gint ett_lorawan_beacon;
+static gint ett_lorawan_beacon_gwspecific;
 
 #define LORAWAN_MAC_FTYPE_MASK						0xE0
 #define LORAWAN_MAC_FTYPE(ftype)					(((ftype) & LORAWAN_MAC_FTYPE_MASK) >> 5)
@@ -290,11 +290,11 @@ static gint ett_lorawan_beacon_gwspecific = -1;
 #define LORAWAN_AES_BLOCK_LENGTH					16
 #define LORAWAN_AES_PADDEDSIZE(length)					(LORAWAN_AES_BLOCK_LENGTH * ((length + LORAWAN_AES_BLOCK_LENGTH - 1) / LORAWAN_AES_BLOCK_LENGTH))
 
-static expert_field ei_lorawan_missing_keys = EI_INIT;
-static expert_field ei_lorawan_decrypting_error = EI_INIT;
-static expert_field ei_lorawan_mic = EI_INIT;
-static expert_field ei_lorawan_length_error = EI_INIT;
-static expert_field ei_lorawan_mhdr_error = EI_INIT;
+static expert_field ei_lorawan_missing_keys;
+static expert_field ei_lorawan_decrypting_error;
+static expert_field ei_lorawan_mic;
+static expert_field ei_lorawan_length_error;
+static expert_field ei_lorawan_mhdr_error;
 
 static const value_string lorawan_ftypenames[] = {
 	{ LORAWAN_MAC_FTYPE_JOINREQUEST,		"Join Request" },
diff --git a/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c
index f6065eb14b..2dd3cc1add 100644
--- a/epan/dissectors/packet-lpd.c
+++ b/epan/dissectors/packet-lpd.c
@@ -20,14 +20,14 @@ static dissector_handle_t lpd_handle;
 
 #define TCP_PORT_PRINTER		515
 
-static int proto_lpd = -1;
-static int hf_lpd_response = -1;
-static int hf_lpd_request = -1;
-static int hf_lpd_client_code = -1;
-static int hf_lpd_printer_option = -1;
-static int hf_lpd_response_code = -1;
-
-static gint ett_lpd = -1;
+static int proto_lpd;
+static int hf_lpd_response;
+static int hf_lpd_request;
+static int hf_lpd_client_code;
+static int hf_lpd_printer_option;
+static int hf_lpd_response_code;
+
+static gint ett_lpd;
 
 enum lpr_type { request, response, unknown };
 
diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c
index 9b5536d43d..86d76f9f17 100644
--- a/epan/dissectors/packet-lsc.c
+++ b/epan/dissectors/packet-lsc.c
@@ -100,21 +100,21 @@ static const value_string mode_vals[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_lsc = -1;
-static int hf_lsc_version = -1;
-static int hf_lsc_trans_id = -1;
-static int hf_lsc_op_code = -1;
-static int hf_lsc_status_code = -1;
-static int hf_lsc_stream_handle = -1;
-static int hf_lsc_start_npt = -1;
-static int hf_lsc_stop_npt = -1;
-static int hf_lsc_current_npt = -1;
-static int hf_lsc_scale_num = -1;
-static int hf_lsc_scale_denom = -1;
-static int hf_lsc_mode = -1;
+static int proto_lsc;
+static int hf_lsc_version;
+static int hf_lsc_trans_id;
+static int hf_lsc_op_code;
+static int hf_lsc_status_code;
+static int hf_lsc_stream_handle;
+static int hf_lsc_start_npt;
+static int hf_lsc_stop_npt;
+static int hf_lsc_current_npt;
+static int hf_lsc_scale_num;
+static int hf_lsc_scale_denom;
+static int hf_lsc_mode;
 
 /* Initialize the subtree pointers */
-static gint ett_lsc = -1;
+static gint ett_lsc;
 
 static dissector_handle_t lsc_udp_handle;
 static dissector_handle_t lsc_tcp_handle;
diff --git a/epan/dissectors/packet-lsd.c b/epan/dissectors/packet-lsd.c
index 97cb1d7d34..1267484755 100644
--- a/epan/dissectors/packet-lsd.c
+++ b/epan/dissectors/packet-lsd.c
@@ -24,16 +24,16 @@ void proto_reg_handoff_lsd(void);
 #define LSD_MULTICAST_ADDRESS 0xEFC0988F /* 239.192.152.143 */
 #define LSD_PORT 6771
 
-static int proto_lsd = -1;
-static int hf_lsd_header = -1;
-static int hf_lsd_host = -1;
-static int hf_lsd_port = -1;
-static int hf_lsd_infohash = -1;
-static int hf_lsd_cookie = -1;
+static int proto_lsd;
+static int hf_lsd_header;
+static int hf_lsd_host;
+static int hf_lsd_port;
+static int hf_lsd_infohash;
+static int hf_lsd_cookie;
 
-static gint ett_lsd = -1;
+static gint ett_lsd;
 
-static expert_field ei_lsd_field = EI_INIT;
+static expert_field ei_lsd_field;
 
 static gboolean
 parse_string_field(proto_tree *tree, int hf, packet_info *pinfo, tvbuff_t *tvb, int offset, int* next_offset, int* linelen)
diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c
index 0ee141de2e..100446cf96 100644
--- a/epan/dissectors/packet-ltp.c
+++ b/epan/dissectors/packet-ltp.c
@@ -243,7 +243,7 @@ typedef struct {
 static reassembly_table ltp_reassembly_table;
 
 /* Initialize the protocol and registered fields */
-static int proto_ltp = -1;
+static int proto_ltp;
 
 static int ltp_tap = -1;
 
@@ -251,90 +251,90 @@ static gboolean ltp_reassemble_block = TRUE;
 static gboolean ltp_analyze_sequence = TRUE;
 
 /* LTP Header variables */
-static int hf_ltp_version       = -1;
-static int hf_ltp_type          = -1;
-static int hf_ltp_session_name    = -1;
-static int hf_ltp_session_orig  = -1;
-static int hf_ltp_session_no    = -1;
-static int hf_ltp_hdr_extn_cnt  = -1;
-static int hf_ltp_trl_extn_cnt  = -1;
+static int hf_ltp_version;
+static int hf_ltp_type;
+static int hf_ltp_session_name;
+static int hf_ltp_session_orig;
+static int hf_ltp_session_no;
+static int hf_ltp_hdr_extn_cnt;
+static int hf_ltp_trl_extn_cnt;
 
 /* LTP Data Segment variable */
-static int hf_ltp_data_clid     = -1;
-static int hf_ltp_data_offset   = -1;
-static int hf_ltp_data_length   = -1;
-static int hf_ltp_data_chkp     = -1;
-static int hf_ltp_data_chkp_rpt = -1;
-static int hf_ltp_data_rpt      = -1;
-static int hf_ltp_data_rpt_ref  = -1;
-static int hf_ltp_data_rpt_time = -1;
-static int hf_ltp_data_sda_clid = -1;
-static int hf_ltp_partial_packet = -1;
-static int hf_ltp_data_clidata  = -1;
-static int hf_ltp_data_retrans  = -1;
-static int hf_ltp_data_clm_rpt  = -1;
-static int hf_ltp_block_red_size = -1;
-static int hf_ltp_block_green_size = -1;
-static int hf_ltp_block_bundle_size = -1;
-static int hf_ltp_block_bundle_cnt = -1;
+static int hf_ltp_data_clid;
+static int hf_ltp_data_offset;
+static int hf_ltp_data_length;
+static int hf_ltp_data_chkp;
+static int hf_ltp_data_chkp_rpt;
+static int hf_ltp_data_rpt;
+static int hf_ltp_data_rpt_ref;
+static int hf_ltp_data_rpt_time;
+static int hf_ltp_data_sda_clid;
+static int hf_ltp_partial_packet;
+static int hf_ltp_data_clidata;
+static int hf_ltp_data_retrans;
+static int hf_ltp_data_clm_rpt;
+static int hf_ltp_block_red_size;
+static int hf_ltp_block_green_size;
+static int hf_ltp_block_bundle_size;
+static int hf_ltp_block_bundle_cnt;
 
 /* LTP Report Segment variable */
-static int hf_ltp_rpt_sno       = -1;
-static int hf_ltp_rpt_sno_ack   = -1;
-static int hf_ltp_rpt_sno_data  = -1;
-static int hf_ltp_rpt_chkp      = -1;
-static int hf_ltp_rpt_chkp_ref  = -1;
-static int hf_ltp_rpt_chkp_time = -1;
-static int hf_ltp_rpt_ub        = -1;
-static int hf_ltp_rpt_lb        = -1;
-static int hf_ltp_rpt_len       = -1;
-static int hf_ltp_rpt_retrans   = -1;
-static int hf_ltp_rpt_clm_cnt   = -1;
-static int hf_ltp_rpt_clm_off   = -1;
-static int hf_ltp_rpt_clm_len   = -1;
-static int hf_ltp_rpt_clm_fst   = -1;
-static int hf_ltp_rpt_clm_lst   = -1;
-static int hf_ltp_rpt_clm_ref   = -1;
-static int hf_ltp_rpt_gap       = -1;
-static int hf_ltp_rpt_gap_ref   = -1;
-static int hf_ltp_rpt_gap_total = -1;
+static int hf_ltp_rpt_sno;
+static int hf_ltp_rpt_sno_ack;
+static int hf_ltp_rpt_sno_data;
+static int hf_ltp_rpt_chkp;
+static int hf_ltp_rpt_chkp_ref;
+static int hf_ltp_rpt_chkp_time;
+static int hf_ltp_rpt_ub;
+static int hf_ltp_rpt_lb;
+static int hf_ltp_rpt_len;
+static int hf_ltp_rpt_retrans;
+static int hf_ltp_rpt_clm_cnt;
+static int hf_ltp_rpt_clm_off;
+static int hf_ltp_rpt_clm_len;
+static int hf_ltp_rpt_clm_fst;
+static int hf_ltp_rpt_clm_lst;
+static int hf_ltp_rpt_clm_ref;
+static int hf_ltp_rpt_gap;
+static int hf_ltp_rpt_gap_ref;
+static int hf_ltp_rpt_gap_total;
 
 /* LTP Report Ack Segment Variable */
-static int hf_ltp_rpt_ack_sno   = -1;
-static int hf_ltp_rpt_ack_dupe  = -1;
-static int hf_ltp_rpt_ack_ref   = -1;
-static int hf_ltp_rpt_ack_time   = -1;
-static int hf_ltp_cancel_ack    = -1;
+static int hf_ltp_rpt_ack_sno;
+static int hf_ltp_rpt_ack_dupe;
+static int hf_ltp_rpt_ack_ref;
+static int hf_ltp_rpt_ack_time;
+static int hf_ltp_cancel_ack;
 
 /* LTP Session Management Segment Variable */
-static int hf_ltp_cancel_code   = -1;
+static int hf_ltp_cancel_code;
 
 /* LTP Header Extension Segment */
-static int hf_ltp_hdr_extn_tag  = -1;
-static int hf_ltp_hdr_extn_len  = -1;
-static int hf_ltp_hdr_extn_val  = -1;
+static int hf_ltp_hdr_extn_tag;
+static int hf_ltp_hdr_extn_len;
+static int hf_ltp_hdr_extn_val;
 
 /* LTP Trailer Extension Segment */
-static int hf_ltp_trl_extn_tag  = -1;
-static int hf_ltp_trl_extn_len  = -1;
-static int hf_ltp_trl_extn_val  = -1;
+static int hf_ltp_trl_extn_tag;
+static int hf_ltp_trl_extn_len;
+static int hf_ltp_trl_extn_val;
 
 /*LTP reassembly */
-static int hf_ltp_fragments = -1;
-static int hf_ltp_fragment = -1;
-static int hf_ltp_fragment_overlap = -1;
-static int hf_ltp_fragment_overlap_conflicts = -1;
-static int hf_ltp_fragment_multiple_tails = -1;
-static int hf_ltp_fragment_too_long_fragment = -1;
-static int hf_ltp_fragment_error = -1;
-static int hf_ltp_fragment_count = -1;
-static int hf_ltp_reassembled_in = -1;
-static int hf_ltp_reassembled_length = -1;
-
-static expert_field ei_ltp_mal_reception_claim = EI_INIT;
-static expert_field ei_ltp_sdnv_length = EI_INIT;
-static expert_field ei_ltp_sno_larger_than_ccsds = EI_INIT;
-static expert_field ei_ltp_report_async = EI_INIT;
+static int hf_ltp_fragments;
+static int hf_ltp_fragment;
+static int hf_ltp_fragment_overlap;
+static int hf_ltp_fragment_overlap_conflicts;
+static int hf_ltp_fragment_multiple_tails;
+static int hf_ltp_fragment_too_long_fragment;
+static int hf_ltp_fragment_error;
+static int hf_ltp_fragment_count;
+static int hf_ltp_reassembled_in;
+static int hf_ltp_reassembled_length;
+
+static expert_field ei_ltp_mal_reception_claim;
+static expert_field ei_ltp_sdnv_length;
+static expert_field ei_ltp_sno_larger_than_ccsds;
+static expert_field ei_ltp_report_async;
 
 static dissector_handle_t bundle_handle;
 
@@ -403,21 +403,21 @@ static const val64_string client_service_id_info[] = {
 #define LTP_PORT    1113
 
 /* Initialize the subtree pointers */
-static gint ett_ltp             = -1;
-static gint ett_ltp_hdr         = -1;
-static gint ett_hdr_session     = -1;
-static gint ett_hdr_extn        = -1;
-static gint ett_frame_ref       = -1;
-static gint ett_data_segm       = -1;
-static gint ett_block           = -1;
-static gint ett_rpt_segm        = -1;
-static gint ett_rpt_clm         = -1;
-static gint ett_rpt_gap         = -1;
-static gint ett_rpt_ack_segm    = -1;
-static gint ett_session_mgmt    = -1;
-static gint ett_trl_extn        = -1;
-static gint ett_ltp_fragment	= -1;
-static gint ett_ltp_fragments	= -1;
+static gint ett_ltp;
+static gint ett_ltp_hdr;
+static gint ett_hdr_session;
+static gint ett_hdr_extn;
+static gint ett_frame_ref;
+static gint ett_data_segm;
+static gint ett_block;
+static gint ett_rpt_segm;
+static gint ett_rpt_clm;
+static gint ett_rpt_gap;
+static gint ett_rpt_ack_segm;
+static gint ett_session_mgmt;
+static gint ett_trl_extn;
+static gint ett_ltp_fragment;
+static gint ett_ltp_fragments;
 
 static const fragment_items ltp_frag_items = {
 	/*Fragment subtrees*/
diff --git a/epan/dissectors/packet-lustre.c b/epan/dissectors/packet-lustre.c
index e6e4049075..4bd7e5ddc8 100644
--- a/epan/dissectors/packet-lustre.c
+++ b/epan/dissectors/packet-lustre.c
@@ -26,789 +26,789 @@ void proto_register_lustre(void);
 static dissector_handle_t lustre_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_lustre = -1;
-
-static int hf_lustre_lustre_msg_v1_lm_magic = -1;
-static int hf_lustre_lustre_msg_v1_lm_handle = -1;
-static int hf_lustre_lustre_msg_v1_lm_last_xid = -1;
-static int hf_lustre_lustre_msg_v1_lm_status = -1;
-static int hf_lustre_lustre_msg_v1_lm_type = -1;
-static int hf_lustre_lustre_msg_v1_lm_flags = -1;
-static int hf_lustre_lustre_msg_v1_lm_last_committed = -1;
-static int hf_lustre_lustre_msg_v1_lm_buflens = -1;
-static int hf_lustre_lustre_msg_v1_lm_conn_cnt = -1;
-static int hf_lustre_lustre_msg_v1_lm_transno = -1;
-static int hf_lustre_lustre_msg_v1_lm_opc = -1;
-static int hf_lustre_lustre_msg_v1_lm_version = -1;
-static int hf_lustre_lustre_msg_v1_lm_bufcount = -1;
-static int hf_lustre_lustre_msg_v2_lm_magic = -1;
-static int hf_lustre_lustre_msg_v2_lm_bufcount = -1;
-static int hf_lustre_lustre_msg_v2_lm_repsize = -1;
-static int hf_lustre_lustre_msg_v2_lm_cksum = -1;
-static int hf_lustre_lustre_msg_v2_lm_buflens = -1;
-static int hf_lustre_lustre_msg_v2_lm_flags = -1;
-static int hf_lustre_lustre_msg_v2_lm_secflvr = -1;
-static int hf_lustre_lustre_msg_v2_lm_padding_2 = -1;
-static int hf_lustre_lustre_msg_v2_lm_padding_3 = -1;
-static int hf_lustre_extra_padding = -1;
-static int hf_lustre_target_uuid = -1;
-static int hf_lustre_client_uuid = -1;
-static int hf_lustre_mdt_body = -1;
-static int hf_lustre_mdt_body_fid1 = -1;
-static int hf_lustre_mdt_body_fid2 = -1;
-static int hf_lustre_mdt_body_handle = -1;
-static int hf_lustre_mdt_body_valid = -1;
-static int hf_lustre_mdt_body_size = -1;
-static int hf_lustre_mdt_body_mtime = -1;
-static int hf_lustre_mdt_body_atime = -1;
-static int hf_lustre_mdt_body_ctime = -1;
-static int hf_lustre_mdt_body_blocks = -1;
-static int hf_lustre_mdt_body_ioepoch = -1;
-static int hf_lustre_mdt_body_ino = -1;
-static int hf_lustre_mdt_body_fsuid = -1;
-static int hf_lustre_mdt_body_fsgid = -1;
-static int hf_lustre_mdt_body_capability = -1;
-static int hf_lustre_mdt_body_mode = -1;
-static int hf_lustre_mdt_body_uid = -1;
-static int hf_lustre_mdt_body_gid = -1;
-static int hf_lustre_mdt_body_flags = -1;
-static int hf_lustre_mdt_body_rdev = -1;
-static int hf_lustre_mdt_body_nlink = -1;
-static int hf_lustre_mdt_body_generation = -1;
-static int hf_lustre_mdt_body_suppgid = -1;
-static int hf_lustre_mdt_body_eadatasize = -1;
-static int hf_lustre_mdt_body_aclsize = -1;
-static int hf_lustre_mdt_body_max_mdsize = -1;
-static int hf_lustre_mdt_body_max_cookiesize = -1;
-static int hf_lustre_mdt_body_uid_h = -1;
-static int hf_lustre_mdt_body_gid_h = -1;
-static int hf_lustre_mdt_body_padding_5 = -1;
-static int hf_lustre_mdt_body_padding_6 = -1;
-static int hf_lustre_mdt_body_padding_7 = -1;
-static int hf_lustre_mdt_body_padding_8 = -1;
-static int hf_lustre_mdt_body_padding_9 = -1;
-static int hf_lustre_mdt_body_padding_10 = -1;
-static int hf_lustre_close_data = -1;
-static int hf_lustre_close_fid = -1;
-static int hf_lustre_close_handle = -1;
-static int hf_lustre_close_data_ver = -1;
-static int hf_lustre_close_reserved = -1;
-static int hf_lustre_mdt_key = -1;
-static int hf_lustre_mdt_val = -1;
-static int hf_lustre_mdt_vallen = -1;
-static int hf_lustre_mdt_rec_reint = -1;
-static int hf_lustre_mdt_rec_reint_opcode = -1;
-static int hf_lustre_mdt_rec_reint_cap = -1;
-static int hf_lustre_mdt_rec_reint_fsuid = -1;
-static int hf_lustre_mdt_rec_reint_fsuid_h = -1;
-static int hf_lustre_mdt_rec_reint_fsgid = -1;
-static int hf_lustre_mdt_rec_reint_fsgid_h = -1;
-static int hf_lustre_mdt_rec_reint_suppgid1 = -1;
-static int hf_lustre_mdt_rec_reint_suppgid1_h = -1;
-static int hf_lustre_mdt_rec_reint_suppgid2 = -1;
-static int hf_lustre_mdt_rec_reint_suppgid2_h = -1;
-static int hf_lustre_mdt_rec_reint_mtime = -1;
-static int hf_lustre_mdt_rec_reint_atime = -1;
-static int hf_lustre_mdt_rec_reint_ctime = -1;
-static int hf_lustre_mdt_rec_reint_time = -1;
-static int hf_lustre_mdt_rec_reint_size32 = -1;
-static int hf_lustre_mdt_rec_reint_size64 = -1;
-static int hf_lustre_mdt_rec_reint_blocks = -1;
-static int hf_lustre_mdt_rec_reint_bias = -1;
-static int hf_lustre_mdt_rec_reint_mode = -1;
-static int hf_lustre_mdt_rec_reint_flags = -1;
-static int hf_lustre_mdt_rec_reint_flags_h = -1;
-static int hf_lustre_mdt_rec_reint_attr_flags = -1;
-static int hf_lustre_mdt_rec_reint_umask = -1;
-static int hf_lustre_mdt_rec_reint_padding = -1;
-static int hf_lustre_mdt_rec_reint_fid1 = -1;
-static int hf_lustre_mdt_rec_reint_fid2 = -1;
-static int hf_lustre_mdt_rec_reint_old_handle = -1;
-static int hf_lustre_mdt_rec_reint_rdev = -1;
-static int hf_lustre_mdt_rec_reint_valid = -1;
-static int hf_lustre_mdt_rec_reint_ioepoch = -1;
-static int hf_lustre_mdt_rec_reint_uid = -1;
-static int hf_lustre_mdt_rec_reint_gid = -1;
-static int hf_lustre_mdt_rec_reint_projid = -1;
-static int hf_lustre_mdt_ioepoch = -1;
-static int hf_lustre_mdt_ioepoch_ioepoch = -1;
-static int hf_lustre_mdt_ioepoch_handle = -1;
-static int hf_lustre_mdt_ioepoch_flags = -1;
-static int hf_lustre_mdt_ioepoch_padding = -1;
-static int hf_lustre_ptlrpc_body_pb = -1;
-static int hf_lustre_ptlrpc_body_pb_last_committed = -1;
-static int hf_lustre_ptlrpc_body_pb_version = -1;
-static int hf_lustre_ptlrpc_body_pb_slv = -1;
-static int hf_lustre_ptlrpc_body_pb_pre_version = -1;
-static int hf_lustre_ptlrpc_body_pb_padding = -1;
-static int hf_lustre_ptlrpc_body_pb_jobid = -1;
-static int hf_lustre_ptlrpc_body_pb_timeout = -1;
-static int hf_lustre_ptlrpc_body_pb_op_flags = -1;
-static int hf_lustre_ptlrpc_body_pb_type = -1;
-static int hf_lustre_ptlrpc_body_pb_flags = -1;
-static int hf_lustre_ptlrpc_body_pb_limit = -1;
-static int hf_lustre_ptlrpc_body_pb_transno = -1;
-static int hf_lustre_ptlrpc_body_pb_service_time = -1;
-static int hf_lustre_ptlrpc_body_pb_conn_cnt = -1;
-static int hf_lustre_ptlrpc_body_pb_opc = -1;
-static int hf_lustre_ptlrpc_body_pb_last_seen = -1;
-static int hf_lustre_ptlrpc_body_pb_last_xid = -1;
-static int hf_lustre_ptlrpc_body_pb_status = -1;
-static int hf_lustre_ptlrpc_body_pb_handle = -1;
-static int hf_lustre_mdc_swap_layouts = -1;
-static int hf_lustre_mdc_swap_layouts_flags = -1;
-static int hf_lustre_hsm_current_action = -1;
-static int hf_lustre_hsm_current_action_state = -1;
-static int hf_lustre_hsm_current_action_action = -1;
-static int hf_lustre_hsm_archive = -1;
-static int hf_lustre_hsm_archive_id = -1;
-static int hf_lustre_hsm_req = -1;
-static int hf_lustre_hsm_req_action = -1;
-static int hf_lustre_hsm_req_archive_id = -1;
-static int hf_lustre_hsm_req_flags = -1;
-static int hf_lustre_hsm_req_itemcount = -1;
-static int hf_lustre_hsm_req_data_len = -1;
-static int hf_lustre_hsm_extent = -1;
-static int hf_lustre_hsm_extent_offset = -1;
-static int hf_lustre_hsm_extent_length = -1;
-static int hf_lustre_hsm_prog = -1;
-static int hf_lustre_hsm_prog_fid = -1;
-static int hf_lustre_hsm_prog_cookie = -1;
-static int hf_lustre_hsm_prog_flags = -1;
-static int hf_lustre_hsm_prog_errval = -1;
-static int hf_lustre_hsm_prog_data_ver = -1;
-static int hf_lustre_hsm_prog_padding1 = -1;
-static int hf_lustre_hsm_prog_padding2 = -1;
-static int hf_lustre_hsm_user_state = -1;
-static int hf_lustre_hsm_us_states = -1;
-static int hf_lustre_hsm_us_archive_id = -1;
-static int hf_lustre_hsm_us_in_prog_state = -1;
-static int hf_lustre_hsm_us_in_prog_action = -1;
-static int hf_lustre_hsm_us_ext_info = -1;
-static int hf_lustre_hsm_state_set = -1;
-static int hf_lustre_hsm_hss_valid = -1;
-static int hf_lustre_hsm_hss_archive_id = -1;
-static int hf_lustre_hsm_hss_setmask = -1;
-static int hf_lustre_hsm_hss_clearmask = -1;
-static int hf_lustre_obd_ioobj = -1;
-static int hf_lustre_obd_ioobj_ioo_bufcnt = -1;
-static int hf_lustre_obd_ioobj_ioo_id = -1;
-static int hf_lustre_obd_ioobj_ioo_max_brw = -1;
-static int hf_lustre_obd_ioobj_ioo_seq = -1;
-static int hf_lustre_obd_statfs = -1;
-static int hf_lustre_obd_statfs_os_type = -1;
-static int hf_lustre_obd_statfs_os_bavail = -1;
-static int hf_lustre_obd_statfs_os_bsize = -1;
-static int hf_lustre_obd_statfs_os_maxbytes = -1;
-static int hf_lustre_obd_statfs_os_ffree = -1;
-static int hf_lustre_obd_statfs_os_files = -1;
-static int hf_lustre_obd_statfs_os_bfree = -1;
-static int hf_lustre_obd_statfs_os_namelen = -1;
-static int hf_lustre_obd_statfs_os_blocks = -1;
-static int hf_lustre_obd_statfs_os_fsid = -1;
-static int hf_lustre_obd_statfs_os_state = -1;
-static int hf_lustre_obd_statfs_os_fprecreated = -1;
-static int hf_lustre_obd_statfs_os_spare = -1;
-static int hf_lustre_obd_connect_data = -1;
-static int hf_lustre_obd_connect_data_ocd_version = -1;
-static int hf_lustre_obd_connect_data_ocd_grant = -1;
-static int hf_lustre_obd_connect_data_ocd_nllg = -1;
-static int hf_lustre_obd_connect_data_ocd_nllu = -1;
-static int hf_lustre_obd_connect_data_ocd_grant_blkbits = -1;
-static int hf_lustre_obd_connect_data_ocd_grant_inobits = -1;
-static int hf_lustre_obd_connect_data_ocd_grant_tax_kb = -1;
-static int hf_lustre_obd_connect_data_ocd_grant_max_blks = -1;
-static int hf_lustre_obd_connect_data_ocd_padding = -1;
-static int hf_lustre_obd_connect_data_ocd_ibits_known = -1;
-static int hf_lustre_obd_connect_data_ocd_group = -1;
-static int hf_lustre_obd_connect_data_ocd_brw_size = -1;
-static int hf_lustre_obd_connect_data_ocd_index = -1;
-static int hf_lustre_obd_connect_data_ocd_connect_flags = -1;
-static int hf_lustre_obd_connect_data_ocd_connect_flags2 = -1;
-static int hf_lustre_obd_connect_data_ocd_cksum_types = -1;
-static int hf_lustre_obd_connect_data_ocd_max_easize = -1;
-static int hf_lustre_obd_connect_data_ocd_instance = -1;
-static int hf_lustre_obd_connect_data_ocd_maxbytes = -1;
-static int hf_lustre_obd_connect_data_ocd_maxmodrpcs = -1;
-static int hf_lustre_obd_connect_data_ocd_transno = -1;
-static int hf_lustre_obd_uuid = -1;
-static int hf_lustre_obd_quotactl = -1;
-static int hf_lustre_obd_quotactl_qc_stat = -1;
-static int hf_lustre_obd_quotactl_qc_cmd = -1;
-static int hf_lustre_obd_quotactl_qc_id = -1;
-static int hf_lustre_obd_quotactl_qc_type = -1;
-static int hf_lustre_obd_dqinfo = -1;
-static int hf_lustre_obd_dqinfo_dqi_valid = -1;
-static int hf_lustre_obd_dqinfo_dqi_igrace = -1;
-static int hf_lustre_obd_dqinfo_dqi_bgrace = -1;
-static int hf_lustre_obd_dqinfo_dqi_flags = -1;
-static int hf_lustre_obd_dqblk = -1;
-static int hf_lustre_obd_dqblk_dqb_isoftlimit = -1;
-static int hf_lustre_obd_dqblk_dqb_bhardlimit = -1;
-static int hf_lustre_obd_dqblk_dqb_curspace = -1;
-static int hf_lustre_obd_dqblk_dqb_itime = -1;
-static int hf_lustre_obd_dqblk_dqb_valid = -1;
-static int hf_lustre_obd_dqblk_padding = -1;
-static int hf_lustre_obd_dqblk_dqb_curinodes = -1;
-static int hf_lustre_obd_dqblk_dqb_bsoftlimit = -1;
-static int hf_lustre_obd_dqblk_dqb_btime = -1;
-static int hf_lustre_obd_dqblk_dqb_ihardlimit = -1;
-static int hf_lustre_ost_body = -1;
-static int hf_lustre_ost_key = -1;
-static int hf_lustre_ost_val = -1;
-static int hf_lustre_ost_lvb = -1;
-static int hf_lustre_ost_lvb_atime = -1;
-static int hf_lustre_ost_lvb_ctime = -1;
-static int hf_lustre_ost_lvb_mtime = -1;
-static int hf_lustre_ost_lvb_mtime_ns = -1;
-static int hf_lustre_ost_lvb_atime_ns = -1;
-static int hf_lustre_ost_lvb_ctime_ns = -1;
-static int hf_lustre_ost_lvb_padding = -1;
-static int hf_lustre_ost_lvb_size = -1;
-static int hf_lustre_ost_lvb_blocks = -1;
-static int hf_lustre_ost_id = -1;
-static int hf_lustre_ost_id_fid = -1;
-static int hf_lustre_ost_id_oi = -1;
-static int hf_lustre_ost_layout = -1;
-static int hf_lustre_ost_layout_stripe_size = -1;
-static int hf_lustre_ost_layout_stripe_count = -1;
-static int hf_lustre_ost_layout_comp_start = -1;
-static int hf_lustre_ost_layout_comp_end = -1;
-static int hf_lustre_ost_layout_comp_id = -1;
-static int hf_lustre_lu_ladvise_hdr = -1;
-static int hf_lustre_lu_ladvise_hdr_magic = -1;
-static int hf_lustre_lu_ladvise_hdr_count = -1;
-static int hf_lustre_lu_ladvise_hdr_flags = -1;
-static int hf_lustre_lu_ladvise_hdr_value1 = -1;
-static int hf_lustre_lu_ladvise_hdr_value2 = -1;
-static int hf_lustre_lu_ladvise_hdr_value3 = -1;
-static int hf_lustre_lu_ladvise = -1;
-static int hf_lustre_lu_ladvise_advice = -1;
-static int hf_lustre_lu_ladvise_value1 = -1;
-static int hf_lustre_lu_ladvise_value2 = -1;
-static int hf_lustre_lu_ladvise_start = -1;
-static int hf_lustre_lu_ladvise_end = -1;
-static int hf_lustre_lu_ladvise_value3 = -1;
-static int hf_lustre_lu_ladvise_value4 = -1;
-static int hf_lustre_llogd_body = -1;
-static int hf_lustre_llogd_body_lgd_len = -1;
-static int hf_lustre_llogd_body_lgd_logid = -1;
-static int hf_lustre_llogd_body_lgd_index = -1;
-static int hf_lustre_llogd_body_lgd_saved_index = -1;
-static int hf_lustre_llogd_body_lgd_llh_flags = -1;
-static int hf_lustre_llogd_body_lgd_cur_offset = -1;
-static int hf_lustre_llogd_body_lgd_ctxt_idx = -1;
-static int hf_lustre_llogd_conn_body = -1;
-static int hf_lustre_llogd_conn_body_lgdc_gen = -1;
-static int hf_lustre_llogd_conn_body_lgdc_logid = -1;
-static int hf_lustre_llogd_conn_body_lgdc_ctxt_idx = -1;
-static int hf_lustre_llog_rec = -1;
-static int hf_lustre_llog_rec_hdr = -1;
-static int hf_lustre_llog_rec_tail = -1;
-static int hf_lustre_llog_rec_hdr_lrh_type = -1;
-static int hf_lustre_llog_rec_hdr_lrh_len = -1;
-static int hf_lustre_llog_rec_hdr_lrh_index = -1;
-static int hf_lustre_llog_rec_hdr_lrh_id = -1;
-static int hf_lustre_llog_rec_tail_lrt_index = -1;
-static int hf_lustre_llog_rec_tail_lrt_len = -1;
-static int hf_lustre_llog_log_hdr = -1;
-static int hf_lustre_llog_log_hdr_tgtuuid = -1;
-static int hf_lustre_llog_log_hdr_cat_idx = -1;
-static int hf_lustre_llog_log_hdr_bitmap_offset = -1;
-static int hf_lustre_llog_log_hdr_flags = -1;
-static int hf_lustre_llog_log_hdr_size = -1;
-static int hf_lustre_llog_log_hdr_tail = -1;
-static int hf_lustre_llog_log_hdr_bitmap = -1;
-static int hf_lustre_llog_log_hdr_count = -1;
-static int hf_lustre_llog_log_hdr_timestamp = -1;
-static int hf_lustre_llog_log_hdr_hdr = -1;
-static int hf_lustre_llog_log_hdr_reserved = -1;
-static int hf_lustre_llog_hdr_flag_zap_when_empty = -1;
-static int hf_lustre_llog_hdr_flag_is_cat = -1;
-static int hf_lustre_llog_hdr_flag_is_plain = -1;
-static int hf_lustre_llog_hdr_flag_ext_jobid = -1;
-static int hf_lustre_llog_hdr_flag_is_fixsize = -1;
-static int hf_lustre_llog_gen_rec = -1;
-static int hf_lustre_llog_gen_rec_hdr = -1;
-static int hf_lustre_llog_gen_rec_tail = -1;
-static int hf_lustre_llog_gen_rec_gen = -1;
-static int hf_lustre_llog_gen_rec_padding = -1;
-static int hf_lustre_llog_logid_rec = -1;
-static int hf_lustre_llog_logid_rec_hdr = -1;
-static int hf_lustre_llog_logid_rec_tail = -1;
-static int hf_lustre_llog_logid_rec_id = -1;
-static int hf_lustre_llog_logid_rec_padding = -1;
-static int hf_lustre_llog_logid_lgl_ogen = -1;
-static int hf_lustre_llog_unlink_rec = -1;
-static int hf_lustre_llog_unlink_rec_hdr = -1;
-static int hf_lustre_llog_unlink_rec_tail = -1;
-static int hf_lustre_llog_unlink_rec_oseq = -1;
-static int hf_lustre_llog_unlink_rec_oid = -1;
-static int hf_lustre_llog_unlink_rec_count = -1;
-static int hf_lustre_llog_unlink64_rec = -1;
-static int hf_lustre_llog_unlink64_rec_hdr = -1;
-static int hf_lustre_llog_unlink64_rec_fid = -1;
-static int hf_lustre_llog_unlink64_rec_count = -1;
-static int hf_lustre_llog_unlink64_rec_padding = -1;
-static int hf_lustre_llog_unlink64_rec_tail = -1;
-static int hf_lustre_llog_setattr64_rec = -1;
-static int hf_lustre_llog_setattr64_rec_hdr = -1;
-static int hf_lustre_llog_setattr64_rec_uid = -1;
-static int hf_lustre_llog_setattr64_rec_uid_h = -1;
-static int hf_lustre_llog_setattr64_rec_gid = -1;
-static int hf_lustre_llog_setattr64_rec_gid_h = -1;
-static int hf_lustre_llog_setattr64_rec_valid = -1;
-static int hf_lustre_llog_setattr64_rec_tail = -1;
-static int hf_lustre_llog_size_change_rec = -1;
-static int hf_lustre_llog_size_change_rec_hdr = -1;
-static int hf_lustre_llog_size_change_rec_io_epoch = -1;
-static int hf_lustre_llog_size_change_rec_fid = -1;
-static int hf_lustre_llog_size_change_rec_tail = -1;
-static int hf_lustre_llog_size_change_rec_padding = -1;
-static int hf_lustre_llog_cookie = -1;
-static int hf_lustre_llog_cookie_lgc_lgl = -1;
-static int hf_lustre_llog_cookie_lgc_padding = -1;
-static int hf_lustre_llog_cookie_lgc_index = -1;
-static int hf_lustre_llog_cookie_lgc_subsys = -1;
-static int hf_lustre_llog_gen_conn_cnt = -1;
-static int hf_lustre_llog_gen_mnt_cnt = -1;
-static int hf_lustre_llog_setattr_rec = -1;
-static int hf_lustre_llog_setattr_rec_hdr = -1;
-static int hf_lustre_llog_setattr_rec_oseq = -1;
-static int hf_lustre_llog_setattr_rec_padding = -1;
-static int hf_lustre_llog_setattr_rec_uid = -1;
-static int hf_lustre_llog_setattr_rec_oid = -1;
-static int hf_lustre_llog_setattr_rec_gid = -1;
-static int hf_lustre_llog_setattr_rec_tail = -1;
-static int hf_lustre_llog_changelog_rec = -1;
-static int hf_lustre_llog_changelog_rec_hdr = -1;
-static int hf_lustre_llog_changelog_rec_tail = -1;
-static int hf_lustre_changelog_rec = -1;
-static int hf_lustre_changelog_rec_namelen = -1;
-static int hf_lustre_changelog_rec_flags = -1;
-static int hf_lustre_changelog_rec_type = -1;
-static int hf_lustre_changelog_rec_index = -1;
-static int hf_lustre_changelog_rec_prev = -1;
-static int hf_lustre_changelog_rec_time = -1;
-static int hf_lustre_changelog_rec_tfid = -1;
-static int hf_lustre_changelog_rec_markerflags = -1;
-static int hf_lustre_changelog_rec_padding = -1;
-static int hf_lustre_changelog_rec_pfid = -1;
-static int hf_lustre_changelog_ext_rename_sfid = -1;
-static int hf_lustre_changelog_ext_rename_spfid = -1;
-static int hf_lustre_changelog_ext_jobid_jobid = -1;
-static int hf_lustre_changelog_extra_flags_extra_flags = -1;
-static int hf_lustre_changelog_ext_name = -1;
-static int hf_lustre_lustre_cfg = -1;
-static int hf_lustre_lustre_cfg_version = -1;
-static int hf_lustre_lustre_cfg_command = -1;
-static int hf_lustre_lustre_cfg_num = -1;
-static int hf_lustre_lustre_cfg_flags = -1;
-static int hf_lustre_lustre_cfg_nid = -1;
-static int hf_lustre_lustre_cfg_padding = -1;
-static int hf_lustre_lustre_cfg_bufcount = -1;
-static int hf_lustre_lustre_cfg_buflen = -1;
-static int hf_lustre_lustre_cfg_buffer = -1;
-static int hf_lustre_cfg_marker = -1;
-static int hf_lustre_cfg_marker_step = -1;
-static int hf_lustre_cfg_marker_flags = -1;
-static int hf_lustre_cfg_marker_vers = -1;
-static int hf_lustre_cfg_marker_padding = -1;
-static int hf_lustre_cfg_marker_createtime = -1;
-static int hf_lustre_cfg_marker_canceltime = -1;
-static int hf_lustre_cfg_marker_tgtname = -1;
-static int hf_lustre_cfg_marker_comment = -1;
-static int hf_lustre_rcs = -1;
-static int hf_lustre_rcs_rc = -1;
-static int hf_lustre_fid_array = -1;
-static int hf_lustre_fid_array_fid = -1;
-static int hf_lustre_niobuf_remote = -1;
-static int hf_lustre_niobuf_remote_len = -1;
-static int hf_lustre_niobuf_remote_flags = -1;
-static int hf_lustre_niobuf_remote_offset = -1;
-static int hf_lustre_lov_ost_data_v1 = -1;
-static int hf_lustre_lov_ost_data_v1_l_ost_gen = -1;
-static int hf_lustre_lov_ost_data_v1_l_ost_idx = -1;
-static int hf_lustre_lmv_mds_md = -1;
-static int hf_lustre_lmv_mds_md_magic = -1;
-static int hf_lustre_lmv_mds_md_stripe_count = -1;
-static int hf_lustre_lmv_mds_md_master_mdt_index = -1;
-static int hf_lustre_lmv_mds_md_hash_type = -1;
-static int hf_lustre_lmv_mds_md_status = -1;
-static int hf_lustre_lmv_mds_md_layout_version = -1;
-static int hf_lustre_lmv_mds_md_padding = -1;
-static int hf_lustre_lmv_mds_md_pool_name = -1;
-static int hf_lustre_lmv_mds_md_stripe_fid = -1;
-static int hf_lustre_lov_mds_md = -1;
-static int hf_lustre_lov_mds_md_lmm_magic = -1;
-static int hf_lustre_lov_mds_md_lmm_stripe_size = -1;
-static int hf_lustre_lov_mds_md_lmm_object_id = -1;
-static int hf_lustre_lov_mds_md_lmm_object_seq = -1;
-static int hf_lustre_lov_mds_md_lmm_stripe_count = -1;
-static int hf_lustre_lov_mds_md_lmm_pattern = -1;
-static int hf_lustre_lov_mds_md_lmm_layout_gen = -1;
-static int hf_lustre_lov_mds_md_lmm_pool_name = -1;
-static int hf_lustre_lov_desc = -1;
-static int hf_lustre_lov_desc_padding = -1;
-static int hf_lustre_lov_desc_pattern = -1;
-static int hf_lustre_lov_desc_default_stripe_count = -1;
-static int hf_lustre_lov_desc_magic = -1;
-static int hf_lustre_lov_desc_uuid = -1;
-static int hf_lustre_lov_desc_tgt_count = -1;
-static int hf_lustre_lov_desc_default_stripe_size = -1;
-static int hf_lustre_lov_desc_default_stripe_offset = -1;
-static int hf_lustre_lov_desc_qos_maxage = -1;
-static int hf_lustre_quota_body = -1;
-static int hf_lustre_qb_flags = -1;
-static int hf_lustre_qb_fid = -1;
-static int hf_lustre_qb_padding = -1;
-static int hf_lustre_qb_lockh = -1;
-static int hf_lustre_qb_glb_lockh = -1;
-static int hf_lustre_qb_count = -1;
-static int hf_lustre_qb_usage = -1;
-static int hf_lustre_qb_slv_ver = -1;
-static int hf_lustre_quota_adjust_qunit = -1;
-static int hf_lustre_quota_adjust_qunit_qaq_id = -1;
-static int hf_lustre_quota_adjust_qunit_qaq_flags = -1;
-static int hf_lustre_quota_adjust_qunit_qaq_iunit_sz = -1;
-static int hf_lustre_quota_adjust_qunit_qaq_bunit_sz = -1;
-static int hf_lustre_quota_adjust_qunit_padding1 = -1;
-static int hf_lustre_lquota_id = -1;
-static int hf_lustre_qid_fid = -1;
-static int hf_lustre_qid_uid = -1;
-static int hf_lustre_qid_gid = -1;
-static int hf_lustre_ldlm_extent_gid = -1;
-static int hf_lustre_ldlm_extent_start = -1;
-static int hf_lustre_ldlm_extent_end = -1;
-static int hf_lustre_ldlm_flock_owner = -1;
-static int hf_lustre_ldlm_flock_pid = -1;
-static int hf_lustre_ldlm_flock_start = -1;
-static int hf_lustre_ldlm_flock_end = -1;
-static int hf_lustre_ldlm_flock_padding = -1;
-static int hf_lustre_ldlm_request = -1;
-static int hf_lustre_ldlm_request_lock_handle = -1;
-static int hf_lustre_ldlm_request_lock_flags = -1;
-static int hf_lustre_ldlm_request_lock_count = -1;
-static int hf_lustre_ldlm_reply = -1;
-static int hf_lustre_ldlm_reply_lock_flags = -1;
-static int hf_lustre_ldlm_reply_lock_policy_res1 = -1;
-static int hf_lustre_ldlm_reply_lock_policy_res2 = -1;
-static int hf_lustre_ldlm_reply_lock_handle = -1;
-static int hf_lustre_ldlm_reply_lock_padding = -1;
-static int hf_lustre_ldlm_inodebits_bits = -1;
-static int hf_lustre_ldlm_inodebits_try_bits = -1;
-static int hf_lustre_ldlm_lock_desc = -1;
-static int hf_lustre_ldlm_lock_desc_l_policy_data = -1;
-static int hf_lustre_ldlm_lock_desc_l_granted_mode = -1;
-static int hf_lustre_ldlm_lock_desc_l_req_mode = -1;
-static int hf_lustre_ldlm_res_id = -1;
-static int hf_lustre_ldlm_res_id_name = -1;
-static int hf_lustre_ldlm_res_id_bits = -1;
-static int hf_lustre_ldlm_res_id_string = -1;
-static int hf_lustre_ldlm_res_id_type = -1;
-static int hf_lustre_ldlm_resource_desc = -1;
-static int hf_lustre_ldlm_resource_desc_lr_type = -1;
-static int hf_lustre_ldlm_resource_desc_lr_padding = -1;
-static int hf_lustre_ldlm_intent_opc = -1;
-static int hf_lustre_ldlm_intent_opc_open = -1;
-static int hf_lustre_ldlm_intent_opc_creat = -1;
-static int hf_lustre_ldlm_intent_opc_readdir = -1;
-static int hf_lustre_ldlm_intent_opc_getattr = -1;
-static int hf_lustre_ldlm_intent_opc_lookup = -1;
-static int hf_lustre_ldlm_intent_opc_unlink = -1;
-static int hf_lustre_ldlm_intent_opc_trunc = -1;
-static int hf_lustre_ldlm_intent_opc_getxattr = -1;
-static int hf_lustre_ldlm_intent_opc_exec = -1;
-static int hf_lustre_ldlm_intent_opc_pin = -1;
-static int hf_lustre_ldlm_intent_opc_layout = -1;
-static int hf_lustre_ldlm_intent_opc_q_dqacq = -1;
-static int hf_lustre_ldlm_intent_opc_q_conn = -1;
-static int hf_lustre_ldlm_intent_opc_setxattr = -1;
-static int hf_lustre_ldlm_gl_barrier_desc = -1;
-static int hf_lustre_ldlm_gl_barrier_desc_status = -1;
-static int hf_lustre_ldlm_gl_barrier_desc_timeout = -1;
-static int hf_lustre_ldlm_gl_barrier_desc_padding = -1;
-static int hf_lustre_ldlm_gl_lquota_desc = -1;
-static int hf_lustre_ldlm_gl_lquota_desc_flags = -1;
-static int hf_lustre_ldlm_gl_lquota_desc_ver = -1;
-static int hf_lustre_ldlm_gl_lquota_desc_hardlimit = -1;
-static int hf_lustre_ldlm_gl_lquota_desc_softlimit = -1;
-static int hf_lustre_ldlm_gl_lquota_desc_time = -1;
-static int hf_lustre_ldlm_gl_lquota_desc_pad2 = -1;
-static int hf_lustre_ldlm_key = -1;
-static int hf_lustre_ldlm_val = -1;
-static int hf_lustre_barrier_lvb = -1;
-static int hf_lustre_barrier_lvb_status = -1;
-static int hf_lustre_barrier_lvb_index = -1;
-static int hf_lustre_barrier_lvb_padding = -1;
-static int hf_lustre_mgs_target_info = -1;
-static int hf_lustre_mgs_target_info_mti_flags = -1;
-static int hf_lustre_mgs_target_info_mti_fsname = -1;
-static int hf_lustre_mgs_target_info_mti_svname = -1;
-static int hf_lustre_mgs_target_info_mti_config_ver = -1;
-static int hf_lustre_mgs_target_info_mti_uuid = -1;
-static int hf_lustre_mgs_target_info_mti_stripe_index = -1;
-static int hf_lustre_mgs_target_info_mti_params = -1;
-static int hf_lustre_mgs_target_info_mti_nids = -1;
-static int hf_lustre_mgs_target_info_mti_lustre_ver = -1;
-static int hf_lustre_mgs_target_info_mti_nid_count = -1;
-static int hf_lustre_mgs_target_info_mti_instance = -1;
-static int hf_lustre_mgs_target_info_padding = -1;
-static int hf_lustre_mgs_send_param = -1;
-static int hf_lustre_mgs_config_body = -1;
-static int hf_lustre_mgs_config_body_name = -1;
-static int hf_lustre_mgs_config_body_offset = -1;
-static int hf_lustre_mgs_config_body_type = -1;
-static int hf_lustre_mgs_config_body_nm_cur_pass = -1;
-static int hf_lustre_mgs_config_body_bits = -1;
-static int hf_lustre_mgs_config_body_units = -1;
-static int hf_lustre_mgs_config_res = -1;
-static int hf_lustre_mgs_config_res_offset = -1;
-static int hf_lustre_mgs_config_res_size = -1;
-static int hf_lustre_mgs_config_res_nm_cur_pass = -1;
-static int hf_lustre_lustre_handle = -1;
-static int hf_lustre_lustre_handle_cookie = -1;
-static int hf_lustre_lu_fid_f_seq = -1;
-static int hf_lustre_lu_fid_f_oid = -1;
-static int hf_lustre_lu_fid_f_ver = -1;
-static int hf_lustre_ost_oi_id = -1;
-static int hf_lustre_ost_oi_seq = -1;
-static int hf_lustre_obdo = -1;
-static int hf_lustre_obdo_o_nlink = -1;
-static int hf_lustre_obdo_o_uid = -1;
-static int hf_lustre_obdo_o_valid = -1;
-static int hf_lustre_obdo_o_misc = -1;
-static int hf_lustre_obdo_o_padding_4 = -1;
-static int hf_lustre_obdo_o_size = -1;
-static int hf_lustre_obdo_o_mode = -1;
-static int hf_lustre_obdo_o_handle = -1;
-static int hf_lustre_obdo_o_atime = -1;
-static int hf_lustre_obdo_o_gid = -1;
-static int hf_lustre_obdo_o_ioepoch = -1;
-static int hf_lustre_obdo_o_data_version = -1;
-static int hf_lustre_obdo_o_projid = -1;
-//static int hf_lustre_obdo_o_lcookie = -1;
-static int hf_lustre_obdo_o_padding_6 = -1;
-static int hf_lustre_obdo_o_padding_3 = -1;
-static int hf_lustre_obdo_o_flags = -1;
-static int hf_lustre_obdo_o_mtime = -1;
-static int hf_lustre_obdo_o_blksize = -1;
-static int hf_lustre_obdo_o_blocks = -1;
-static int hf_lustre_obdo_o_grant = -1;
-static int hf_lustre_obdo_o_uid_h = -1;
-static int hf_lustre_obdo_o_gid_h = -1;
-static int hf_lustre_obdo_o_stripe_idx = -1;
-static int hf_lustre_obdo_o_parent_ver = -1;
-static int hf_lustre_obdo_o_parent_oid = -1;
-static int hf_lustre_obdo_o_padding_5 = -1;
-static int hf_lustre_obdo_o_parent_seq = -1;
-static int hf_lustre_obdo_o_ctime = -1;
-static int hf_lustre_xattr_list = -1;
-static int hf_lustre_xattr = -1;
-static int hf_lustre_xattr_name = -1;
-static int hf_lustre_xattr_data = -1;
-static int hf_lustre_xattr_size = -1;
-static int hf_lustre_seq_opc = -1;
-static int hf_lustre_seq_range = -1;
-static int hf_lustre_seq_range_start = -1;
-static int hf_lustre_seq_range_end = -1;
-static int hf_lustre_seq_range_index = -1;
-static int hf_lustre_seq_range_flags = -1;
-static int hf_lustre_fld_opc = -1;
-static int hf_lustre_capa = -1;
-static int hf_lustre_capa_fid = -1;
-static int hf_lustre_capa_opc = -1;
-static int hf_lustre_capa_uid = -1;
-static int hf_lustre_capa_gid = -1;
-static int hf_lustre_capa_flags = -1;
-static int hf_lustre_capa_keyid = -1;
-static int hf_lustre_capa_timeout = -1;
-static int hf_lustre_capa_expiry = -1;
-static int hf_lustre_capa_hmac = -1;
-static int hf_lustre_acl = -1;
-static int hf_lustre_hsm_user_item = -1;
-static int hf_lustre_hsm_user_item_fid = -1;
-static int hf_lustre_layout_intent = -1;
-static int hf_lustre_layout_intent_opc = -1;
-static int hf_lustre_layout_intent_flags = -1;
-static int hf_lustre_layout_intent_start = -1;
-static int hf_lustre_layout_intent_end = -1;
-static int hf_lustre_data = -1;
-static int hf_lustre_name = -1;
-static int hf_lustre_filename = -1;
-static int hf_lustre_secctx_name = -1;
-static int hf_lustre_selinux_pol = -1;
-static int hf_lustre_target = -1;
-static int hf_lustre_eadata = -1;
-static int hf_lustre_idx_info = -1;
-static int hf_lustre_idx_info_magic = -1;
-static int hf_lustre_idx_info_flags = -1;
-static int hf_lustre_idx_info_count = -1;
-static int hf_lustre_idx_info_attrs = -1;
-static int hf_lustre_idx_info_fid = -1;
-static int hf_lustre_idx_info_hash_start = -1;
-static int hf_lustre_idx_info_hash_end = -1;
-static int hf_lustre_idx_info_keysize = -1;
-static int hf_lustre_idx_info_recsize = -1;
-static int hf_lustre_idx_info_padding = -1;
-static int hf_lustre_out_update_header = -1;
-static int hf_lustre_out_update_header_magic = -1;
-static int hf_lustre_out_update_header_count = -1;
-static int hf_lustre_out_update_header_inline_length = -1;
-static int hf_lustre_out_update_header_reply_size = -1;
-static int hf_lustre_out_update_header_inline_data = -1;
-static int hf_lustre_out_update_buffer = -1;
-static int hf_lustre_out_update_buffer_size = -1;
-static int hf_lustre_out_update_buffer_padding = -1;
-static int hf_lustre_obj_update_reply = -1;
-static int hf_lustre_obj_update_reply_magic = -1;
-static int hf_lustre_obj_update_reply_count = -1;
-static int hf_lustre_obj_update_reply_padding = -1;
-static int hf_lustre_obj_update_reply_lens = -1;
-static int hf_lustre_obj_update_request = -1;
-static int hf_lustre_obj_update_request_magic = -1;
-static int hf_lustre_obj_update_request_count = -1;
-static int hf_lustre_obj_update_request_padding = -1;
-static int hf_lustre_obj_update = -1;
-static int hf_lustre_obj_update_type = -1;
-static int hf_lustre_obj_update_params_count = -1;
-static int hf_lustre_obj_update_result_size = -1;
-static int hf_lustre_obj_update_flags = -1;
-static int hf_lustre_obj_update_padding = -1;
-static int hf_lustre_obj_update_batchid = -1;
-static int hf_lustre_obj_update_fid = -1;
-static int hf_lustre_obj_update_param = -1;
-static int hf_lustre_obj_update_param_len = -1;
-static int hf_lustre_obj_update_param_padding = -1;
-static int hf_lustre_obj_update_param_buf = -1;
-static int hf_lustre_lfsck_request = -1;
-static int hf_lustre_lfsck_request_event = -1;
-static int hf_lustre_lfsck_request_index = -1;
-static int hf_lustre_lfsck_request_flags = -1;
-static int hf_lustre_lfsck_request_valid = -1;
-static int hf_lustre_lfsck_request_speed = -1;
-static int hf_lustre_lfsck_request_status = -1;
-static int hf_lustre_lfsck_request_version = -1;
-static int hf_lustre_lfsck_request_active = -1;
-static int hf_lustre_lfsck_request_param = -1;
-static int hf_lustre_lfsck_request_async_windows = -1;
-static int hf_lustre_lfsck_request_flags2 = -1;
-static int hf_lustre_lfsck_request_fid = -1;
-static int hf_lustre_lfsck_request_fid2 = -1;
-static int hf_lustre_lfsck_request_comp_id = -1;
-static int hf_lustre_lfsck_request_padding = -1;
-static int hf_lustre_lfsck_reply = -1;
-static int hf_lustre_lfsck_reply_status = -1;
-static int hf_lustre_lfsck_reply_padding = -1;
-static int hf_lustre_lfsck_reply_repaired = -1;
+static int proto_lustre;
+
+static int hf_lustre_lustre_msg_v1_lm_magic;
+static int hf_lustre_lustre_msg_v1_lm_handle;
+static int hf_lustre_lustre_msg_v1_lm_last_xid;
+static int hf_lustre_lustre_msg_v1_lm_status;
+static int hf_lustre_lustre_msg_v1_lm_type;
+static int hf_lustre_lustre_msg_v1_lm_flags;
+static int hf_lustre_lustre_msg_v1_lm_last_committed;
+static int hf_lustre_lustre_msg_v1_lm_buflens;
+static int hf_lustre_lustre_msg_v1_lm_conn_cnt;
+static int hf_lustre_lustre_msg_v1_lm_transno;
+static int hf_lustre_lustre_msg_v1_lm_opc;
+static int hf_lustre_lustre_msg_v1_lm_version;
+static int hf_lustre_lustre_msg_v1_lm_bufcount;
+static int hf_lustre_lustre_msg_v2_lm_magic;
+static int hf_lustre_lustre_msg_v2_lm_bufcount;
+static int hf_lustre_lustre_msg_v2_lm_repsize;
+static int hf_lustre_lustre_msg_v2_lm_cksum;
+static int hf_lustre_lustre_msg_v2_lm_buflens;
+static int hf_lustre_lustre_msg_v2_lm_flags;
+static int hf_lustre_lustre_msg_v2_lm_secflvr;
+static int hf_lustre_lustre_msg_v2_lm_padding_2;
+static int hf_lustre_lustre_msg_v2_lm_padding_3;
+static int hf_lustre_extra_padding;
+static int hf_lustre_target_uuid;
+static int hf_lustre_client_uuid;
+static int hf_lustre_mdt_body;
+static int hf_lustre_mdt_body_fid1;
+static int hf_lustre_mdt_body_fid2;
+static int hf_lustre_mdt_body_handle;
+static int hf_lustre_mdt_body_valid;
+static int hf_lustre_mdt_body_size;
+static int hf_lustre_mdt_body_mtime;
+static int hf_lustre_mdt_body_atime;
+static int hf_lustre_mdt_body_ctime;
+static int hf_lustre_mdt_body_blocks;
+static int hf_lustre_mdt_body_ioepoch;
+static int hf_lustre_mdt_body_ino;
+static int hf_lustre_mdt_body_fsuid;
+static int hf_lustre_mdt_body_fsgid;
+static int hf_lustre_mdt_body_capability;
+static int hf_lustre_mdt_body_mode;
+static int hf_lustre_mdt_body_uid;
+static int hf_lustre_mdt_body_gid;
+static int hf_lustre_mdt_body_flags;
+static int hf_lustre_mdt_body_rdev;
+static int hf_lustre_mdt_body_nlink;
+static int hf_lustre_mdt_body_generation;
+static int hf_lustre_mdt_body_suppgid;
+static int hf_lustre_mdt_body_eadatasize;
+static int hf_lustre_mdt_body_aclsize;
+static int hf_lustre_mdt_body_max_mdsize;
+static int hf_lustre_mdt_body_max_cookiesize;
+static int hf_lustre_mdt_body_uid_h;
+static int hf_lustre_mdt_body_gid_h;
+static int hf_lustre_mdt_body_padding_5;
+static int hf_lustre_mdt_body_padding_6;
+static int hf_lustre_mdt_body_padding_7;
+static int hf_lustre_mdt_body_padding_8;
+static int hf_lustre_mdt_body_padding_9;
+static int hf_lustre_mdt_body_padding_10;
+static int hf_lustre_close_data;
+static int hf_lustre_close_fid;
+static int hf_lustre_close_handle;
+static int hf_lustre_close_data_ver;
+static int hf_lustre_close_reserved;
+static int hf_lustre_mdt_key;
+static int hf_lustre_mdt_val;
+static int hf_lustre_mdt_vallen;
+static int hf_lustre_mdt_rec_reint;
+static int hf_lustre_mdt_rec_reint_opcode;
+static int hf_lustre_mdt_rec_reint_cap;
+static int hf_lustre_mdt_rec_reint_fsuid;
+static int hf_lustre_mdt_rec_reint_fsuid_h;
+static int hf_lustre_mdt_rec_reint_fsgid;
+static int hf_lustre_mdt_rec_reint_fsgid_h;
+static int hf_lustre_mdt_rec_reint_suppgid1;
+static int hf_lustre_mdt_rec_reint_suppgid1_h;
+static int hf_lustre_mdt_rec_reint_suppgid2;
+static int hf_lustre_mdt_rec_reint_suppgid2_h;
+static int hf_lustre_mdt_rec_reint_mtime;
+static int hf_lustre_mdt_rec_reint_atime;
+static int hf_lustre_mdt_rec_reint_ctime;
+static int hf_lustre_mdt_rec_reint_time;
+static int hf_lustre_mdt_rec_reint_size32;
+static int hf_lustre_mdt_rec_reint_size64;
+static int hf_lustre_mdt_rec_reint_blocks;
+static int hf_lustre_mdt_rec_reint_bias;
+static int hf_lustre_mdt_rec_reint_mode;
+static int hf_lustre_mdt_rec_reint_flags;
+static int hf_lustre_mdt_rec_reint_flags_h;
+static int hf_lustre_mdt_rec_reint_attr_flags;
+static int hf_lustre_mdt_rec_reint_umask;
+static int hf_lustre_mdt_rec_reint_padding;
+static int hf_lustre_mdt_rec_reint_fid1;
+static int hf_lustre_mdt_rec_reint_fid2;
+static int hf_lustre_mdt_rec_reint_old_handle;
+static int hf_lustre_mdt_rec_reint_rdev;
+static int hf_lustre_mdt_rec_reint_valid;
+static int hf_lustre_mdt_rec_reint_ioepoch;
+static int hf_lustre_mdt_rec_reint_uid;
+static int hf_lustre_mdt_rec_reint_gid;
+static int hf_lustre_mdt_rec_reint_projid;
+static int hf_lustre_mdt_ioepoch;
+static int hf_lustre_mdt_ioepoch_ioepoch;
+static int hf_lustre_mdt_ioepoch_handle;
+static int hf_lustre_mdt_ioepoch_flags;
+static int hf_lustre_mdt_ioepoch_padding;
+static int hf_lustre_ptlrpc_body_pb;
+static int hf_lustre_ptlrpc_body_pb_last_committed;
+static int hf_lustre_ptlrpc_body_pb_version;
+static int hf_lustre_ptlrpc_body_pb_slv;
+static int hf_lustre_ptlrpc_body_pb_pre_version;
+static int hf_lustre_ptlrpc_body_pb_padding;
+static int hf_lustre_ptlrpc_body_pb_jobid;
+static int hf_lustre_ptlrpc_body_pb_timeout;
+static int hf_lustre_ptlrpc_body_pb_op_flags;
+static int hf_lustre_ptlrpc_body_pb_type;
+static int hf_lustre_ptlrpc_body_pb_flags;
+static int hf_lustre_ptlrpc_body_pb_limit;
+static int hf_lustre_ptlrpc_body_pb_transno;
+static int hf_lustre_ptlrpc_body_pb_service_time;
+static int hf_lustre_ptlrpc_body_pb_conn_cnt;
+static int hf_lustre_ptlrpc_body_pb_opc;
+static int hf_lustre_ptlrpc_body_pb_last_seen;
+static int hf_lustre_ptlrpc_body_pb_last_xid;
+static int hf_lustre_ptlrpc_body_pb_status;
+static int hf_lustre_ptlrpc_body_pb_handle;
+static int hf_lustre_mdc_swap_layouts;
+static int hf_lustre_mdc_swap_layouts_flags;
+static int hf_lustre_hsm_current_action;
+static int hf_lustre_hsm_current_action_state;
+static int hf_lustre_hsm_current_action_action;
+static int hf_lustre_hsm_archive;
+static int hf_lustre_hsm_archive_id;
+static int hf_lustre_hsm_req;
+static int hf_lustre_hsm_req_action;
+static int hf_lustre_hsm_req_archive_id;
+static int hf_lustre_hsm_req_flags;
+static int hf_lustre_hsm_req_itemcount;
+static int hf_lustre_hsm_req_data_len;
+static int hf_lustre_hsm_extent;
+static int hf_lustre_hsm_extent_offset;
+static int hf_lustre_hsm_extent_length;
+static int hf_lustre_hsm_prog;
+static int hf_lustre_hsm_prog_fid;
+static int hf_lustre_hsm_prog_cookie;
+static int hf_lustre_hsm_prog_flags;
+static int hf_lustre_hsm_prog_errval;
+static int hf_lustre_hsm_prog_data_ver;
+static int hf_lustre_hsm_prog_padding1;
+static int hf_lustre_hsm_prog_padding2;
+static int hf_lustre_hsm_user_state;
+static int hf_lustre_hsm_us_states;
+static int hf_lustre_hsm_us_archive_id;
+static int hf_lustre_hsm_us_in_prog_state;
+static int hf_lustre_hsm_us_in_prog_action;
+static int hf_lustre_hsm_us_ext_info;
+static int hf_lustre_hsm_state_set;
+static int hf_lustre_hsm_hss_valid;
+static int hf_lustre_hsm_hss_archive_id;
+static int hf_lustre_hsm_hss_setmask;
+static int hf_lustre_hsm_hss_clearmask;
+static int hf_lustre_obd_ioobj;
+static int hf_lustre_obd_ioobj_ioo_bufcnt;
+static int hf_lustre_obd_ioobj_ioo_id;
+static int hf_lustre_obd_ioobj_ioo_max_brw;
+static int hf_lustre_obd_ioobj_ioo_seq;
+static int hf_lustre_obd_statfs;
+static int hf_lustre_obd_statfs_os_type;
+static int hf_lustre_obd_statfs_os_bavail;
+static int hf_lustre_obd_statfs_os_bsize;
+static int hf_lustre_obd_statfs_os_maxbytes;
+static int hf_lustre_obd_statfs_os_ffree;
+static int hf_lustre_obd_statfs_os_files;
+static int hf_lustre_obd_statfs_os_bfree;
+static int hf_lustre_obd_statfs_os_namelen;
+static int hf_lustre_obd_statfs_os_blocks;
+static int hf_lustre_obd_statfs_os_fsid;
+static int hf_lustre_obd_statfs_os_state;
+static int hf_lustre_obd_statfs_os_fprecreated;
+static int hf_lustre_obd_statfs_os_spare;
+static int hf_lustre_obd_connect_data;
+static int hf_lustre_obd_connect_data_ocd_version;
+static int hf_lustre_obd_connect_data_ocd_grant;
+static int hf_lustre_obd_connect_data_ocd_nllg;
+static int hf_lustre_obd_connect_data_ocd_nllu;
+static int hf_lustre_obd_connect_data_ocd_grant_blkbits;
+static int hf_lustre_obd_connect_data_ocd_grant_inobits;
+static int hf_lustre_obd_connect_data_ocd_grant_tax_kb;
+static int hf_lustre_obd_connect_data_ocd_grant_max_blks;
+static int hf_lustre_obd_connect_data_ocd_padding;
+static int hf_lustre_obd_connect_data_ocd_ibits_known;
+static int hf_lustre_obd_connect_data_ocd_group;
+static int hf_lustre_obd_connect_data_ocd_brw_size;
+static int hf_lustre_obd_connect_data_ocd_index;
+static int hf_lustre_obd_connect_data_ocd_connect_flags;
+static int hf_lustre_obd_connect_data_ocd_connect_flags2;
+static int hf_lustre_obd_connect_data_ocd_cksum_types;
+static int hf_lustre_obd_connect_data_ocd_max_easize;
+static int hf_lustre_obd_connect_data_ocd_instance;
+static int hf_lustre_obd_connect_data_ocd_maxbytes;
+static int hf_lustre_obd_connect_data_ocd_maxmodrpcs;
+static int hf_lustre_obd_connect_data_ocd_transno;
+static int hf_lustre_obd_uuid;
+static int hf_lustre_obd_quotactl;
+static int hf_lustre_obd_quotactl_qc_stat;
+static int hf_lustre_obd_quotactl_qc_cmd;
+static int hf_lustre_obd_quotactl_qc_id;
+static int hf_lustre_obd_quotactl_qc_type;
+static int hf_lustre_obd_dqinfo;
+static int hf_lustre_obd_dqinfo_dqi_valid;
+static int hf_lustre_obd_dqinfo_dqi_igrace;
+static int hf_lustre_obd_dqinfo_dqi_bgrace;
+static int hf_lustre_obd_dqinfo_dqi_flags;
+static int hf_lustre_obd_dqblk;
+static int hf_lustre_obd_dqblk_dqb_isoftlimit;
+static int hf_lustre_obd_dqblk_dqb_bhardlimit;
+static int hf_lustre_obd_dqblk_dqb_curspace;
+static int hf_lustre_obd_dqblk_dqb_itime;
+static int hf_lustre_obd_dqblk_dqb_valid;
+static int hf_lustre_obd_dqblk_padding;
+static int hf_lustre_obd_dqblk_dqb_curinodes;
+static int hf_lustre_obd_dqblk_dqb_bsoftlimit;
+static int hf_lustre_obd_dqblk_dqb_btime;
+static int hf_lustre_obd_dqblk_dqb_ihardlimit;
+static int hf_lustre_ost_body;
+static int hf_lustre_ost_key;
+static int hf_lustre_ost_val;
+static int hf_lustre_ost_lvb;
+static int hf_lustre_ost_lvb_atime;
+static int hf_lustre_ost_lvb_ctime;
+static int hf_lustre_ost_lvb_mtime;
+static int hf_lustre_ost_lvb_mtime_ns;
+static int hf_lustre_ost_lvb_atime_ns;
+static int hf_lustre_ost_lvb_ctime_ns;
+static int hf_lustre_ost_lvb_padding;
+static int hf_lustre_ost_lvb_size;
+static int hf_lustre_ost_lvb_blocks;
+static int hf_lustre_ost_id;
+static int hf_lustre_ost_id_fid;
+static int hf_lustre_ost_id_oi;
+static int hf_lustre_ost_layout;
+static int hf_lustre_ost_layout_stripe_size;
+static int hf_lustre_ost_layout_stripe_count;
+static int hf_lustre_ost_layout_comp_start;
+static int hf_lustre_ost_layout_comp_end;
+static int hf_lustre_ost_layout_comp_id;
+static int hf_lustre_lu_ladvise_hdr;
+static int hf_lustre_lu_ladvise_hdr_magic;
+static int hf_lustre_lu_ladvise_hdr_count;
+static int hf_lustre_lu_ladvise_hdr_flags;
+static int hf_lustre_lu_ladvise_hdr_value1;
+static int hf_lustre_lu_ladvise_hdr_value2;
+static int hf_lustre_lu_ladvise_hdr_value3;
+static int hf_lustre_lu_ladvise;
+static int hf_lustre_lu_ladvise_advice;
+static int hf_lustre_lu_ladvise_value1;
+static int hf_lustre_lu_ladvise_value2;
+static int hf_lustre_lu_ladvise_start;
+static int hf_lustre_lu_ladvise_end;
+static int hf_lustre_lu_ladvise_value3;
+static int hf_lustre_lu_ladvise_value4;
+static int hf_lustre_llogd_body;
+static int hf_lustre_llogd_body_lgd_len;
+static int hf_lustre_llogd_body_lgd_logid;
+static int hf_lustre_llogd_body_lgd_index;
+static int hf_lustre_llogd_body_lgd_saved_index;
+static int hf_lustre_llogd_body_lgd_llh_flags;
+static int hf_lustre_llogd_body_lgd_cur_offset;
+static int hf_lustre_llogd_body_lgd_ctxt_idx;
+static int hf_lustre_llogd_conn_body;
+static int hf_lustre_llogd_conn_body_lgdc_gen;
+static int hf_lustre_llogd_conn_body_lgdc_logid;
+static int hf_lustre_llogd_conn_body_lgdc_ctxt_idx;
+static int hf_lustre_llog_rec;
+static int hf_lustre_llog_rec_hdr;
+static int hf_lustre_llog_rec_tail;
+static int hf_lustre_llog_rec_hdr_lrh_type;
+static int hf_lustre_llog_rec_hdr_lrh_len;
+static int hf_lustre_llog_rec_hdr_lrh_index;
+static int hf_lustre_llog_rec_hdr_lrh_id;
+static int hf_lustre_llog_rec_tail_lrt_index;
+static int hf_lustre_llog_rec_tail_lrt_len;
+static int hf_lustre_llog_log_hdr;
+static int hf_lustre_llog_log_hdr_tgtuuid;
+static int hf_lustre_llog_log_hdr_cat_idx;
+static int hf_lustre_llog_log_hdr_bitmap_offset;
+static int hf_lustre_llog_log_hdr_flags;
+static int hf_lustre_llog_log_hdr_size;
+static int hf_lustre_llog_log_hdr_tail;
+static int hf_lustre_llog_log_hdr_bitmap;
+static int hf_lustre_llog_log_hdr_count;
+static int hf_lustre_llog_log_hdr_timestamp;
+static int hf_lustre_llog_log_hdr_hdr;
+static int hf_lustre_llog_log_hdr_reserved;
+static int hf_lustre_llog_hdr_flag_zap_when_empty;
+static int hf_lustre_llog_hdr_flag_is_cat;
+static int hf_lustre_llog_hdr_flag_is_plain;
+static int hf_lustre_llog_hdr_flag_ext_jobid;
+static int hf_lustre_llog_hdr_flag_is_fixsize;
+static int hf_lustre_llog_gen_rec;
+static int hf_lustre_llog_gen_rec_hdr;
+static int hf_lustre_llog_gen_rec_tail;
+static int hf_lustre_llog_gen_rec_gen;
+static int hf_lustre_llog_gen_rec_padding;
+static int hf_lustre_llog_logid_rec;
+static int hf_lustre_llog_logid_rec_hdr;
+static int hf_lustre_llog_logid_rec_tail;
+static int hf_lustre_llog_logid_rec_id;
+static int hf_lustre_llog_logid_rec_padding;
+static int hf_lustre_llog_logid_lgl_ogen;
+static int hf_lustre_llog_unlink_rec;
+static int hf_lustre_llog_unlink_rec_hdr;
+static int hf_lustre_llog_unlink_rec_tail;
+static int hf_lustre_llog_unlink_rec_oseq;
+static int hf_lustre_llog_unlink_rec_oid;
+static int hf_lustre_llog_unlink_rec_count;
+static int hf_lustre_llog_unlink64_rec;
+static int hf_lustre_llog_unlink64_rec_hdr;
+static int hf_lustre_llog_unlink64_rec_fid;
+static int hf_lustre_llog_unlink64_rec_count;
+static int hf_lustre_llog_unlink64_rec_padding;
+static int hf_lustre_llog_unlink64_rec_tail;
+static int hf_lustre_llog_setattr64_rec;
+static int hf_lustre_llog_setattr64_rec_hdr;
+static int hf_lustre_llog_setattr64_rec_uid;
+static int hf_lustre_llog_setattr64_rec_uid_h;
+static int hf_lustre_llog_setattr64_rec_gid;
+static int hf_lustre_llog_setattr64_rec_gid_h;
+static int hf_lustre_llog_setattr64_rec_valid;
+static int hf_lustre_llog_setattr64_rec_tail;
+static int hf_lustre_llog_size_change_rec;
+static int hf_lustre_llog_size_change_rec_hdr;
+static int hf_lustre_llog_size_change_rec_io_epoch;
+static int hf_lustre_llog_size_change_rec_fid;
+static int hf_lustre_llog_size_change_rec_tail;
+static int hf_lustre_llog_size_change_rec_padding;
+static int hf_lustre_llog_cookie;
+static int hf_lustre_llog_cookie_lgc_lgl;
+static int hf_lustre_llog_cookie_lgc_padding;
+static int hf_lustre_llog_cookie_lgc_index;
+static int hf_lustre_llog_cookie_lgc_subsys;
+static int hf_lustre_llog_gen_conn_cnt;
+static int hf_lustre_llog_gen_mnt_cnt;
+static int hf_lustre_llog_setattr_rec;
+static int hf_lustre_llog_setattr_rec_hdr;
+static int hf_lustre_llog_setattr_rec_oseq;
+static int hf_lustre_llog_setattr_rec_padding;
+static int hf_lustre_llog_setattr_rec_uid;
+static int hf_lustre_llog_setattr_rec_oid;
+static int hf_lustre_llog_setattr_rec_gid;
+static int hf_lustre_llog_setattr_rec_tail;
+static int hf_lustre_llog_changelog_rec;
+static int hf_lustre_llog_changelog_rec_hdr;
+static int hf_lustre_llog_changelog_rec_tail;
+static int hf_lustre_changelog_rec;
+static int hf_lustre_changelog_rec_namelen;
+static int hf_lustre_changelog_rec_flags;
+static int hf_lustre_changelog_rec_type;
+static int hf_lustre_changelog_rec_index;
+static int hf_lustre_changelog_rec_prev;
+static int hf_lustre_changelog_rec_time;
+static int hf_lustre_changelog_rec_tfid;
+static int hf_lustre_changelog_rec_markerflags;
+static int hf_lustre_changelog_rec_padding;
+static int hf_lustre_changelog_rec_pfid;
+static int hf_lustre_changelog_ext_rename_sfid;
+static int hf_lustre_changelog_ext_rename_spfid;
+static int hf_lustre_changelog_ext_jobid_jobid;
+static int hf_lustre_changelog_extra_flags_extra_flags;
+static int hf_lustre_changelog_ext_name;
+static int hf_lustre_lustre_cfg;
+static int hf_lustre_lustre_cfg_version;
+static int hf_lustre_lustre_cfg_command;
+static int hf_lustre_lustre_cfg_num;
+static int hf_lustre_lustre_cfg_flags;
+static int hf_lustre_lustre_cfg_nid;
+static int hf_lustre_lustre_cfg_padding;
+static int hf_lustre_lustre_cfg_bufcount;
+static int hf_lustre_lustre_cfg_buflen;
+static int hf_lustre_lustre_cfg_buffer;
+static int hf_lustre_cfg_marker;
+static int hf_lustre_cfg_marker_step;
+static int hf_lustre_cfg_marker_flags;
+static int hf_lustre_cfg_marker_vers;
+static int hf_lustre_cfg_marker_padding;
+static int hf_lustre_cfg_marker_createtime;
+static int hf_lustre_cfg_marker_canceltime;
+static int hf_lustre_cfg_marker_tgtname;
+static int hf_lustre_cfg_marker_comment;
+static int hf_lustre_rcs;
+static int hf_lustre_rcs_rc;
+static int hf_lustre_fid_array;
+static int hf_lustre_fid_array_fid;
+static int hf_lustre_niobuf_remote;
+static int hf_lustre_niobuf_remote_len;
+static int hf_lustre_niobuf_remote_flags;
+static int hf_lustre_niobuf_remote_offset;
+static int hf_lustre_lov_ost_data_v1;
+static int hf_lustre_lov_ost_data_v1_l_ost_gen;
+static int hf_lustre_lov_ost_data_v1_l_ost_idx;
+static int hf_lustre_lmv_mds_md;
+static int hf_lustre_lmv_mds_md_magic;
+static int hf_lustre_lmv_mds_md_stripe_count;
+static int hf_lustre_lmv_mds_md_master_mdt_index;
+static int hf_lustre_lmv_mds_md_hash_type;
+static int hf_lustre_lmv_mds_md_status;
+static int hf_lustre_lmv_mds_md_layout_version;
+static int hf_lustre_lmv_mds_md_padding;
+static int hf_lustre_lmv_mds_md_pool_name;
+static int hf_lustre_lmv_mds_md_stripe_fid;
+static int hf_lustre_lov_mds_md;
+static int hf_lustre_lov_mds_md_lmm_magic;
+static int hf_lustre_lov_mds_md_lmm_stripe_size;
+static int hf_lustre_lov_mds_md_lmm_object_id;
+static int hf_lustre_lov_mds_md_lmm_object_seq;
+static int hf_lustre_lov_mds_md_lmm_stripe_count;
+static int hf_lustre_lov_mds_md_lmm_pattern;
+static int hf_lustre_lov_mds_md_lmm_layout_gen;
+static int hf_lustre_lov_mds_md_lmm_pool_name;
+static int hf_lustre_lov_desc;
+static int hf_lustre_lov_desc_padding;
+static int hf_lustre_lov_desc_pattern;
+static int hf_lustre_lov_desc_default_stripe_count;
+static int hf_lustre_lov_desc_magic;
+static int hf_lustre_lov_desc_uuid;
+static int hf_lustre_lov_desc_tgt_count;
+static int hf_lustre_lov_desc_default_stripe_size;
+static int hf_lustre_lov_desc_default_stripe_offset;
+static int hf_lustre_lov_desc_qos_maxage;
+static int hf_lustre_quota_body;
+static int hf_lustre_qb_flags;
+static int hf_lustre_qb_fid;
+static int hf_lustre_qb_padding;
+static int hf_lustre_qb_lockh;
+static int hf_lustre_qb_glb_lockh;
+static int hf_lustre_qb_count;
+static int hf_lustre_qb_usage;
+static int hf_lustre_qb_slv_ver;
+static int hf_lustre_quota_adjust_qunit;
+static int hf_lustre_quota_adjust_qunit_qaq_id;
+static int hf_lustre_quota_adjust_qunit_qaq_flags;
+static int hf_lustre_quota_adjust_qunit_qaq_iunit_sz;
+static int hf_lustre_quota_adjust_qunit_qaq_bunit_sz;
+static int hf_lustre_quota_adjust_qunit_padding1;
+static int hf_lustre_lquota_id;
+static int hf_lustre_qid_fid;
+static int hf_lustre_qid_uid;
+static int hf_lustre_qid_gid;
+static int hf_lustre_ldlm_extent_gid;
+static int hf_lustre_ldlm_extent_start;
+static int hf_lustre_ldlm_extent_end;
+static int hf_lustre_ldlm_flock_owner;
+static int hf_lustre_ldlm_flock_pid;
+static int hf_lustre_ldlm_flock_start;
+static int hf_lustre_ldlm_flock_end;
+static int hf_lustre_ldlm_flock_padding;
+static int hf_lustre_ldlm_request;
+static int hf_lustre_ldlm_request_lock_handle;
+static int hf_lustre_ldlm_request_lock_flags;
+static int hf_lustre_ldlm_request_lock_count;
+static int hf_lustre_ldlm_reply;
+static int hf_lustre_ldlm_reply_lock_flags;
+static int hf_lustre_ldlm_reply_lock_policy_res1;
+static int hf_lustre_ldlm_reply_lock_policy_res2;
+static int hf_lustre_ldlm_reply_lock_handle;
+static int hf_lustre_ldlm_reply_lock_padding;
+static int hf_lustre_ldlm_inodebits_bits;
+static int hf_lustre_ldlm_inodebits_try_bits;
+static int hf_lustre_ldlm_lock_desc;
+static int hf_lustre_ldlm_lock_desc_l_policy_data;
+static int hf_lustre_ldlm_lock_desc_l_granted_mode;
+static int hf_lustre_ldlm_lock_desc_l_req_mode;
+static int hf_lustre_ldlm_res_id;
+static int hf_lustre_ldlm_res_id_name;
+static int hf_lustre_ldlm_res_id_bits;
+static int hf_lustre_ldlm_res_id_string;
+static int hf_lustre_ldlm_res_id_type;
+static int hf_lustre_ldlm_resource_desc;
+static int hf_lustre_ldlm_resource_desc_lr_type;
+static int hf_lustre_ldlm_resource_desc_lr_padding;
+static int hf_lustre_ldlm_intent_opc;
+static int hf_lustre_ldlm_intent_opc_open;
+static int hf_lustre_ldlm_intent_opc_creat;
+static int hf_lustre_ldlm_intent_opc_readdir;
+static int hf_lustre_ldlm_intent_opc_getattr;
+static int hf_lustre_ldlm_intent_opc_lookup;
+static int hf_lustre_ldlm_intent_opc_unlink;
+static int hf_lustre_ldlm_intent_opc_trunc;
+static int hf_lustre_ldlm_intent_opc_getxattr;
+static int hf_lustre_ldlm_intent_opc_exec;
+static int hf_lustre_ldlm_intent_opc_pin;
+static int hf_lustre_ldlm_intent_opc_layout;
+static int hf_lustre_ldlm_intent_opc_q_dqacq;
+static int hf_lustre_ldlm_intent_opc_q_conn;
+static int hf_lustre_ldlm_intent_opc_setxattr;
+static int hf_lustre_ldlm_gl_barrier_desc;
+static int hf_lustre_ldlm_gl_barrier_desc_status;
+static int hf_lustre_ldlm_gl_barrier_desc_timeout;
+static int hf_lustre_ldlm_gl_barrier_desc_padding;
+static int hf_lustre_ldlm_gl_lquota_desc;
+static int hf_lustre_ldlm_gl_lquota_desc_flags;
+static int hf_lustre_ldlm_gl_lquota_desc_ver;
+static int hf_lustre_ldlm_gl_lquota_desc_hardlimit;
+static int hf_lustre_ldlm_gl_lquota_desc_softlimit;
+static int hf_lustre_ldlm_gl_lquota_desc_time;
+static int hf_lustre_ldlm_gl_lquota_desc_pad2;
+static int hf_lustre_ldlm_key;
+static int hf_lustre_ldlm_val;
+static int hf_lustre_barrier_lvb;
+static int hf_lustre_barrier_lvb_status;
+static int hf_lustre_barrier_lvb_index;
+static int hf_lustre_barrier_lvb_padding;
+static int hf_lustre_mgs_target_info;
+static int hf_lustre_mgs_target_info_mti_flags;
+static int hf_lustre_mgs_target_info_mti_fsname;
+static int hf_lustre_mgs_target_info_mti_svname;
+static int hf_lustre_mgs_target_info_mti_config_ver;
+static int hf_lustre_mgs_target_info_mti_uuid;
+static int hf_lustre_mgs_target_info_mti_stripe_index;
+static int hf_lustre_mgs_target_info_mti_params;
+static int hf_lustre_mgs_target_info_mti_nids;
+static int hf_lustre_mgs_target_info_mti_lustre_ver;
+static int hf_lustre_mgs_target_info_mti_nid_count;
+static int hf_lustre_mgs_target_info_mti_instance;
+static int hf_lustre_mgs_target_info_padding;
+static int hf_lustre_mgs_send_param;
+static int hf_lustre_mgs_config_body;
+static int hf_lustre_mgs_config_body_name;
+static int hf_lustre_mgs_config_body_offset;
+static int hf_lustre_mgs_config_body_type;
+static int hf_lustre_mgs_config_body_nm_cur_pass;
+static int hf_lustre_mgs_config_body_bits;
+static int hf_lustre_mgs_config_body_units;
+static int hf_lustre_mgs_config_res;
+static int hf_lustre_mgs_config_res_offset;
+static int hf_lustre_mgs_config_res_size;
+static int hf_lustre_mgs_config_res_nm_cur_pass;
+static int hf_lustre_lustre_handle;
+static int hf_lustre_lustre_handle_cookie;
+static int hf_lustre_lu_fid_f_seq;
+static int hf_lustre_lu_fid_f_oid;
+static int hf_lustre_lu_fid_f_ver;
+static int hf_lustre_ost_oi_id;
+static int hf_lustre_ost_oi_seq;
+static int hf_lustre_obdo;
+static int hf_lustre_obdo_o_nlink;
+static int hf_lustre_obdo_o_uid;
+static int hf_lustre_obdo_o_valid;
+static int hf_lustre_obdo_o_misc;
+static int hf_lustre_obdo_o_padding_4;
+static int hf_lustre_obdo_o_size;
+static int hf_lustre_obdo_o_mode;
+static int hf_lustre_obdo_o_handle;
+static int hf_lustre_obdo_o_atime;
+static int hf_lustre_obdo_o_gid;
+static int hf_lustre_obdo_o_ioepoch;
+static int hf_lustre_obdo_o_data_version;
+static int hf_lustre_obdo_o_projid;
+//static int hf_lustre_obdo_o_lcookie;
+static int hf_lustre_obdo_o_padding_6;
+static int hf_lustre_obdo_o_padding_3;
+static int hf_lustre_obdo_o_flags;
+static int hf_lustre_obdo_o_mtime;
+static int hf_lustre_obdo_o_blksize;
+static int hf_lustre_obdo_o_blocks;
+static int hf_lustre_obdo_o_grant;
+static int hf_lustre_obdo_o_uid_h;
+static int hf_lustre_obdo_o_gid_h;
+static int hf_lustre_obdo_o_stripe_idx;
+static int hf_lustre_obdo_o_parent_ver;
+static int hf_lustre_obdo_o_parent_oid;
+static int hf_lustre_obdo_o_padding_5;
+static int hf_lustre_obdo_o_parent_seq;
+static int hf_lustre_obdo_o_ctime;
+static int hf_lustre_xattr_list;
+static int hf_lustre_xattr;
+static int hf_lustre_xattr_name;
+static int hf_lustre_xattr_data;
+static int hf_lustre_xattr_size;
+static int hf_lustre_seq_opc;
+static int hf_lustre_seq_range;
+static int hf_lustre_seq_range_start;
+static int hf_lustre_seq_range_end;
+static int hf_lustre_seq_range_index;
+static int hf_lustre_seq_range_flags;
+static int hf_lustre_fld_opc;
+static int hf_lustre_capa;
+static int hf_lustre_capa_fid;
+static int hf_lustre_capa_opc;
+static int hf_lustre_capa_uid;
+static int hf_lustre_capa_gid;
+static int hf_lustre_capa_flags;
+static int hf_lustre_capa_keyid;
+static int hf_lustre_capa_timeout;
+static int hf_lustre_capa_expiry;
+static int hf_lustre_capa_hmac;
+static int hf_lustre_acl;
+static int hf_lustre_hsm_user_item;
+static int hf_lustre_hsm_user_item_fid;
+static int hf_lustre_layout_intent;
+static int hf_lustre_layout_intent_opc;
+static int hf_lustre_layout_intent_flags;
+static int hf_lustre_layout_intent_start;
+static int hf_lustre_layout_intent_end;
+static int hf_lustre_data;
+static int hf_lustre_name;
+static int hf_lustre_filename;
+static int hf_lustre_secctx_name;
+static int hf_lustre_selinux_pol;
+static int hf_lustre_target;
+static int hf_lustre_eadata;
+static int hf_lustre_idx_info;
+static int hf_lustre_idx_info_magic;
+static int hf_lustre_idx_info_flags;
+static int hf_lustre_idx_info_count;
+static int hf_lustre_idx_info_attrs;
+static int hf_lustre_idx_info_fid;
+static int hf_lustre_idx_info_hash_start;
+static int hf_lustre_idx_info_hash_end;
+static int hf_lustre_idx_info_keysize;
+static int hf_lustre_idx_info_recsize;
+static int hf_lustre_idx_info_padding;
+static int hf_lustre_out_update_header;
+static int hf_lustre_out_update_header_magic;
+static int hf_lustre_out_update_header_count;
+static int hf_lustre_out_update_header_inline_length;
+static int hf_lustre_out_update_header_reply_size;
+static int hf_lustre_out_update_header_inline_data;
+static int hf_lustre_out_update_buffer;
+static int hf_lustre_out_update_buffer_size;
+static int hf_lustre_out_update_buffer_padding;
+static int hf_lustre_obj_update_reply;
+static int hf_lustre_obj_update_reply_magic;
+static int hf_lustre_obj_update_reply_count;
+static int hf_lustre_obj_update_reply_padding;
+static int hf_lustre_obj_update_reply_lens;
+static int hf_lustre_obj_update_request;
+static int hf_lustre_obj_update_request_magic;
+static int hf_lustre_obj_update_request_count;
+static int hf_lustre_obj_update_request_padding;
+static int hf_lustre_obj_update;
+static int hf_lustre_obj_update_type;
+static int hf_lustre_obj_update_params_count;
+static int hf_lustre_obj_update_result_size;
+static int hf_lustre_obj_update_flags;
+static int hf_lustre_obj_update_padding;
+static int hf_lustre_obj_update_batchid;
+static int hf_lustre_obj_update_fid;
+static int hf_lustre_obj_update_param;
+static int hf_lustre_obj_update_param_len;
+static int hf_lustre_obj_update_param_padding;
+static int hf_lustre_obj_update_param_buf;
+static int hf_lustre_lfsck_request;
+static int hf_lustre_lfsck_request_event;
+static int hf_lustre_lfsck_request_index;
+static int hf_lustre_lfsck_request_flags;
+static int hf_lustre_lfsck_request_valid;
+static int hf_lustre_lfsck_request_speed;
+static int hf_lustre_lfsck_request_status;
+static int hf_lustre_lfsck_request_version;
+static int hf_lustre_lfsck_request_active;
+static int hf_lustre_lfsck_request_param;
+static int hf_lustre_lfsck_request_async_windows;
+static int hf_lustre_lfsck_request_flags2;
+static int hf_lustre_lfsck_request_fid;
+static int hf_lustre_lfsck_request_fid2;
+static int hf_lustre_lfsck_request_comp_id;
+static int hf_lustre_lfsck_request_padding;
+static int hf_lustre_lfsck_reply;
+static int hf_lustre_lfsck_reply_status;
+static int hf_lustre_lfsck_reply_padding;
+static int hf_lustre_lfsck_reply_repaired;
 
 /* Ett declarations */
-static gint ett_lustre = -1;
-static gint ett_lustre_lustre_handle_cookie = -1;
-static gint ett_lustre_lustre_msg_v1 = -1;
-static gint ett_lustre_lustre_handle_v1 = -1;
-static gint ett_lustre_lustre_msg_v2 = -1;
-static gint ett_lustre_ptlrpc_body = -1;
-static gint ett_lustre_lustre_handle_v2 = -1;
-static gint ett_lustre_obd_connect_data = -1;
-static gint ett_lustre_lov_ost_data_v1 = -1;
-static gint ett_lustre_obd_statfs = -1;
-static gint ett_lustre_obd_ioobj = -1;
-static gint ett_lustre_niobuf_remote = -1;
-static gint ett_lustre_rcs = -1;
-static gint ett_lustre_fid_array = -1;
-static gint ett_lustre_ost_lvb = -1;
-static gint ett_lustre_lu_fid = -1;
-static gint ett_lustre_mdc_swap_layouts = -1;
-static gint ett_lustre_mdt_body = -1;
-static gint ett_lustre_mdt_rec_reint = -1;
-static gint ett_lustre_obd_quotactl = -1;
-static gint ett_lustre_obd_dqinfo = -1;
-static gint ett_lustre_obd_dqblk = -1;
-static gint ett_lustre_quota_adjust_qunit = -1;
-static gint ett_lustre_lov_desc = -1;
-static gint ett_lustre_obd_uuid = -1;
-static gint ett_lustre_ldlm_res_id = -1;
-static gint ett_lustre_ldlm_extent = -1;
-static gint ett_lustre_ldlm_inodebits = -1;
-static gint ett_lustre_ldlm_flock = -1;
-static gint ett_lustre_ldlm_intent_opc = -1;
-static gint ett_lustre_ldlm_resource_desc = -1;
-static gint ett_lustre_ldlm_lock_desc = -1;
-static gint ett_lustre_ldlm_request = -1;
-static gint ett_lustre_lustre_handle = -1;
-static gint ett_lustre_ldlm_reply = -1;
-static gint ett_lustre_ldlm_gl_barrier_desc = -1;
-static gint ett_lustre_ldlm_gl_lquota_desc = -1;
-static gint ett_lustre_mgs_target_info = -1;
-static gint ett_lustre_mgs_config_body = -1;
-static gint ett_lustre_mgs_config_res = -1;
-static gint ett_lustre_llog_rec = -1;
-static gint ett_lustre_llog_rec_hdr = -1;
-static gint ett_lustre_llog_rec_tail = -1;
-static gint ett_lustre_llog_logid_rec = -1;
-static gint ett_lustre_llog_logid = -1;
-static gint ett_lustre_lmv_mds_md = -1;
-static gint ett_lustre_lov_mds_md = -1;
-static gint ett_lustre_llog_unlink_rec = -1;
-static gint ett_lustre_llog_unlink64_rec = -1;
-static gint ett_lustre_llog_setattr_rec = -1;
-static gint ett_lustre_llog_setattr64_rec = -1;
-static gint ett_lustre_llog_size_change_rec = -1;
-static gint ett_lustre_llog_gen_rec = -1;
-static gint ett_lustre_llog_changelog_rec = -1;
-static gint ett_lustre_llog_log_hdr = -1;
-static gint ett_lustre_llog_hdr_flags = -1;
-static gint ett_lustre_llog_cookie = -1;
-static gint ett_lustre_llogd_body = -1;
-static gint ett_lustre_llogd_conn_body = -1;
-static gint ett_lustre_llog_gen = -1;
-static gint ett_lustre_changelog_rec = -1;
-static gint ett_lustre_lustre_cfg = -1;
-static gint ett_lustre_cfg_marker = -1;
-static gint ett_lustre_obdo = -1;
-static gint ett_lustre_ost_body = -1;
-static gint ett_lustre_ldlm_lock_flags = -1;
-static gint ett_lustre_seq_range = -1;
-static gint ett_lustre_mdt_ioepoch = -1;
-static gint ett_lustre_capa = -1;
-static gint ett_lustre_idx_info = -1;
-static gint ett_lustre_close_data = -1;
-static gint ett_lustre_acl = -1;
-static gint ett_lustre_ladvise_hdr = -1;
-static gint ett_lustre_ladvise = -1;
-static gint ett_lustre_hsm_request = -1;
-static gint ett_lustre_hsm_archive = -1;
-static gint ett_lustre_hsm_current_action = -1;
-static gint ett_lustre_hsm_user_item = -1;
-static gint ett_lustre_hsm_extent = -1;
-static gint ett_lustre_hsm_state_set = -1;
-static gint ett_lustre_hsm_progress = -1;
-static gint ett_lustre_hsm_user_state = -1;
-static gint ett_lustre_quota_body = -1;
-static gint ett_lustre_lquota_id = -1;
-static gint ett_lustre_layout_intent = -1;
-static gint ett_lustre_xattrs = -1;
-static gint ett_lustre_xattr_item = -1;
-static gint ett_lustre_ost_id = -1;
-static gint ett_lustre_ost_id_oi = -1;
-static gint ett_lustre_ost_layout = -1;
-static gint ett_lustre_eadata = -1;
-static gint ett_lustre_out_update_header = -1;
-static gint ett_lustre_out_update_header_data = -1;
-static gint ett_lustre_out_update_buffer = -1;
-static gint ett_lustre_obj_update_reply = -1;
-static gint ett_lustre_object_update_request = -1;
-static gint ett_lustre_object_update = -1;
-static gint ett_lustre_object_update_param = -1;
-static gint ett_lustre_lfsck_request = -1;
-static gint ett_lustre_lfsck_reply = -1;
-static gint ett_lustre_barrier_lvb = -1;
-
-static expert_field ei_lustre_buflen = EI_INIT;
-static expert_field ei_lustre_badopc = EI_INIT;
-static expert_field ei_lustre_badmagic = EI_INIT;
-static expert_field ei_lustre_obsopc = EI_INIT;
+static gint ett_lustre;
+static gint ett_lustre_lustre_handle_cookie;
+static gint ett_lustre_lustre_msg_v1;
+static gint ett_lustre_lustre_handle_v1;
+static gint ett_lustre_lustre_msg_v2;
+static gint ett_lustre_ptlrpc_body;
+static gint ett_lustre_lustre_handle_v2;
+static gint ett_lustre_obd_connect_data;
+static gint ett_lustre_lov_ost_data_v1;
+static gint ett_lustre_obd_statfs;
+static gint ett_lustre_obd_ioobj;
+static gint ett_lustre_niobuf_remote;
+static gint ett_lustre_rcs;
+static gint ett_lustre_fid_array;
+static gint ett_lustre_ost_lvb;
+static gint ett_lustre_lu_fid;
+static gint ett_lustre_mdc_swap_layouts;
+static gint ett_lustre_mdt_body;
+static gint ett_lustre_mdt_rec_reint;
+static gint ett_lustre_obd_quotactl;
+static gint ett_lustre_obd_dqinfo;
+static gint ett_lustre_obd_dqblk;
+static gint ett_lustre_quota_adjust_qunit;
+static gint ett_lustre_lov_desc;
+static gint ett_lustre_obd_uuid;
+static gint ett_lustre_ldlm_res_id;
+static gint ett_lustre_ldlm_extent;
+static gint ett_lustre_ldlm_inodebits;
+static gint ett_lustre_ldlm_flock;
+static gint ett_lustre_ldlm_intent_opc;
+static gint ett_lustre_ldlm_resource_desc;
+static gint ett_lustre_ldlm_lock_desc;
+static gint ett_lustre_ldlm_request;
+static gint ett_lustre_lustre_handle;
+static gint ett_lustre_ldlm_reply;
+static gint ett_lustre_ldlm_gl_barrier_desc;
+static gint ett_lustre_ldlm_gl_lquota_desc;
+static gint ett_lustre_mgs_target_info;
+static gint ett_lustre_mgs_config_body;
+static gint ett_lustre_mgs_config_res;
+static gint ett_lustre_llog_rec;
+static gint ett_lustre_llog_rec_hdr;
+static gint ett_lustre_llog_rec_tail;
+static gint ett_lustre_llog_logid_rec;
+static gint ett_lustre_llog_logid;
+static gint ett_lustre_lmv_mds_md;
+static gint ett_lustre_lov_mds_md;
+static gint ett_lustre_llog_unlink_rec;
+static gint ett_lustre_llog_unlink64_rec;
+static gint ett_lustre_llog_setattr_rec;
+static gint ett_lustre_llog_setattr64_rec;
+static gint ett_lustre_llog_size_change_rec;
+static gint ett_lustre_llog_gen_rec;
+static gint ett_lustre_llog_changelog_rec;
+static gint ett_lustre_llog_log_hdr;
+static gint ett_lustre_llog_hdr_flags;
+static gint ett_lustre_llog_cookie;
+static gint ett_lustre_llogd_body;
+static gint ett_lustre_llogd_conn_body;
+static gint ett_lustre_llog_gen;
+static gint ett_lustre_changelog_rec;
+static gint ett_lustre_lustre_cfg;
+static gint ett_lustre_cfg_marker;
+static gint ett_lustre_obdo;
+static gint ett_lustre_ost_body;
+static gint ett_lustre_ldlm_lock_flags;
+static gint ett_lustre_seq_range;
+static gint ett_lustre_mdt_ioepoch;
+static gint ett_lustre_capa;
+static gint ett_lustre_idx_info;
+static gint ett_lustre_close_data;
+static gint ett_lustre_acl;
+static gint ett_lustre_ladvise_hdr;
+static gint ett_lustre_ladvise;
+static gint ett_lustre_hsm_request;
+static gint ett_lustre_hsm_archive;
+static gint ett_lustre_hsm_current_action;
+static gint ett_lustre_hsm_user_item;
+static gint ett_lustre_hsm_extent;
+static gint ett_lustre_hsm_state_set;
+static gint ett_lustre_hsm_progress;
+static gint ett_lustre_hsm_user_state;
+static gint ett_lustre_quota_body;
+static gint ett_lustre_lquota_id;
+static gint ett_lustre_layout_intent;
+static gint ett_lustre_xattrs;
+static gint ett_lustre_xattr_item;
+static gint ett_lustre_ost_id;
+static gint ett_lustre_ost_id_oi;
+static gint ett_lustre_ost_layout;
+static gint ett_lustre_eadata;
+static gint ett_lustre_out_update_header;
+static gint ett_lustre_out_update_header_data;
+static gint ett_lustre_out_update_buffer;
+static gint ett_lustre_obj_update_reply;
+static gint ett_lustre_object_update_request;
+static gint ett_lustre_object_update;
+static gint ett_lustre_object_update_param;
+static gint ett_lustre_lfsck_request;
+static gint ett_lustre_lfsck_reply;
+static gint ett_lustre_barrier_lvb;
+
+static expert_field ei_lustre_buflen;
+static expert_field ei_lustre_badopc;
+static expert_field ei_lustre_badmagic;
+static expert_field ei_lustre_obsopc;
 
 /* --------------------------------------------------------------------------------------- */
 /* def and macro to know where we are the the lustre payload */
diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c
index 2ac3d3569c..2b1774b7d3 100644
--- a/epan/dissectors/packet-lwapp.c
+++ b/epan/dissectors/packet-lwapp.c
@@ -32,33 +32,33 @@ static dissector_handle_t lwapp_handle;
 #define LWAPP_FLAGS_F 0x02
 #define LWAPP_FLAGS_FT 0x01
 
-static gint proto_lwapp = -1;
-static gint proto_lwapp_l3 = -1;
-static gint proto_lwapp_control = -1;
-static gint ett_lwapp = -1;
-static gint ett_lwapp_l3 = -1;
-static gint ett_lwapp_flags = -1;
-static gint ett_lwapp_control = -1;
-
-static gint hf_lwapp_version = -1;
-static gint hf_lwapp_slotid = -1;
-static gint hf_lwapp_flags = -1;
-static gint hf_lwapp_flags_type = -1;
-static gint hf_lwapp_flags_fragment = -1;
-static gint hf_lwapp_flags_fragment_type = -1;
-static gint hf_lwapp_fragment_id = -1;
-static gint hf_lwapp_length = -1;
-static gint hf_lwapp_rssi = -1;
-static gint hf_lwapp_snr = -1;
-/* static gint hf_lwapp_control = -1; */
-static gint hf_lwapp_control_mac = -1;
-static gint hf_lwapp_control_type = -1;
-static gint hf_lwapp_control_seq_no = -1;
-static gint hf_lwapp_control_length = -1;
+static gint proto_lwapp;
+static gint proto_lwapp_l3;
+static gint proto_lwapp_control;
+static gint ett_lwapp;
+static gint ett_lwapp_l3;
+static gint ett_lwapp_flags;
+static gint ett_lwapp_control;
+
+static gint hf_lwapp_version;
+static gint hf_lwapp_slotid;
+static gint hf_lwapp_flags;
+static gint hf_lwapp_flags_type;
+static gint hf_lwapp_flags_fragment;
+static gint hf_lwapp_flags_fragment_type;
+static gint hf_lwapp_fragment_id;
+static gint hf_lwapp_length;
+static gint hf_lwapp_rssi;
+static gint hf_lwapp_snr;
+/* static gint hf_lwapp_control; */
+static gint hf_lwapp_control_mac;
+static gint hf_lwapp_control_type;
+static gint hf_lwapp_control_seq_no;
+static gint hf_lwapp_control_length;
 
 #define LWAPP_MAX_NESTED_ENCAP 10
 
-static expert_field ei_lwapp_too_many_encap = EI_INIT;
+static expert_field ei_lwapp_too_many_encap;
 
 static dissector_handle_t eth_withoutfcs_handle;
 static dissector_handle_t wlan_handle;
diff --git a/epan/dissectors/packet-lwm.c b/epan/dissectors/packet-lwm.c
index daf13c0fbf..8fa9d7e04c 100644
--- a/epan/dissectors/packet-lwm.c
+++ b/epan/dissectors/packet-lwm.c
@@ -96,46 +96,46 @@ static int  dissect_lwm_cmd_frame_route_req   (tvbuff_t *, packet_info *, proto_
 static int  dissect_lwm_cmd_frame_route_reply (tvbuff_t *, packet_info *, proto_tree *);
 
 /*  Initialize protocol and registered fields. */
-static int proto_lwm = -1;
-
-static int hf_lwm_fcf = -1;
-static int hf_lwm_fcf_ack_req = -1;
-static int hf_lwm_fcf_security = -1;
-static int hf_lwm_fcf_linklocal = -1;
-static int hf_lwm_fcf_multicast = -1;
-static int hf_lwm_fcf_reserved = -1;
-static int hf_lwm_seq = -1;
-static int hf_lwm_src_addr = -1;
-static int hf_lwm_dst_addr = -1;
-static int hf_lwm_src_endp = -1;
-static int hf_lwm_dst_endp = -1;
-static int hf_lwm_multi_nmrad = -1;
-static int hf_lwm_multi_mnmrad = -1;
-static int hf_lwm_multi_mrad = -1;
-static int hf_lwm_multi_mmrad = -1;
-static int hf_lwm_mic = -1;
-static int hf_lwm_cmd = -1;
-static int hf_lwm_cmd_seq = -1;
-static int hf_lwm_cmd_cm = -1;
-static int hf_lwm_cmd_route_src  = -1;
-static int hf_lwm_cmd_route_dst  = -1;
-static int hf_lwm_cmd_route_multi  = -1;
-static int hf_lwm_cmd_linkquality  = -1;
-static int hf_lwm_cmd_forwlinkquality  = -1;
-static int hf_lwm_cmd_revlinkquality  = -1;
+static int proto_lwm;
+
+static int hf_lwm_fcf;
+static int hf_lwm_fcf_ack_req;
+static int hf_lwm_fcf_security;
+static int hf_lwm_fcf_linklocal;
+static int hf_lwm_fcf_multicast;
+static int hf_lwm_fcf_reserved;
+static int hf_lwm_seq;
+static int hf_lwm_src_addr;
+static int hf_lwm_dst_addr;
+static int hf_lwm_src_endp;
+static int hf_lwm_dst_endp;
+static int hf_lwm_multi_nmrad;
+static int hf_lwm_multi_mnmrad;
+static int hf_lwm_multi_mrad;
+static int hf_lwm_multi_mmrad;
+static int hf_lwm_mic;
+static int hf_lwm_cmd;
+static int hf_lwm_cmd_seq;
+static int hf_lwm_cmd_cm;
+static int hf_lwm_cmd_route_src;
+static int hf_lwm_cmd_route_dst;
+static int hf_lwm_cmd_route_multi;
+static int hf_lwm_cmd_linkquality;
+static int hf_lwm_cmd_forwlinkquality;
+static int hf_lwm_cmd_revlinkquality;
 
 /* Initialize protocol subtrees. */
-static gint ett_lwm = -1;
-static gint ett_lwm_fcf = -1;
-static gint ett_lwm_cmd_tree = -1;
-static gint ett_lwm_multi_tree = -1;
-
-static expert_field ei_lwm_mal_error = EI_INIT;
-static expert_field ei_lwm_n_src_broad = EI_INIT;
-static expert_field ei_lwm_mismatch_endp = EI_INIT;
-static expert_field ei_lwm_empty_payload = EI_INIT;
-static expert_field ei_lwm_no_decryption_key = EI_INIT;
-static expert_field ei_lwm_decryption_failed = EI_INIT;
+static gint ett_lwm;
+static gint ett_lwm_fcf;
+static gint ett_lwm_cmd_tree;
+static gint ett_lwm_multi_tree;
+
+static expert_field ei_lwm_mal_error;
+static expert_field ei_lwm_n_src_broad;
+static expert_field ei_lwm_mismatch_endp;
+static expert_field ei_lwm_empty_payload;
+static expert_field ei_lwm_no_decryption_key;
+static expert_field ei_lwm_decryption_failed;
 
 static dissector_handle_t lwm_handle;
 
diff --git a/epan/dissectors/packet-lwm2mtlv.c b/epan/dissectors/packet-lwm2mtlv.c
index da5995fb17..aaa80418a5 100644
--- a/epan/dissectors/packet-lwm2mtlv.c
+++ b/epan/dissectors/packet-lwm2mtlv.c
@@ -31,40 +31,40 @@ void proto_reg_handoff_lwm2mtlv(void);
 
 static dissector_handle_t lwm2mtlv_handle;
 
-static int proto_lwm2mtlv = -1;
-
-static int hf_lwm2mtlv_object_name               = -1;
-static int hf_lwm2mtlv_resource_name             = -1;
-static int hf_lwm2mtlv_header                    = -1;
-static int hf_lwm2mtlv_type_type                 = -1;
-static int hf_lwm2mtlv_type_length_of_identifier = -1;
-static int hf_lwm2mtlv_type_length_of_length     = -1;
-static int hf_lwm2mtlv_type_length               = -1;
-static int hf_lwm2mtlv_type_ignored              = -1;
-
-static int hf_lwm2mtlv_identifier                = -1;
-static int hf_lwm2mtlv_length                    = -1;
-static int hf_lwm2mtlv_value                     = -1;
-static int hf_lwm2mtlv_value_string              = -1;
-static int hf_lwm2mtlv_value_integer             = -1;
-static int hf_lwm2mtlv_value_unsigned_integer    = -1;
-static int hf_lwm2mtlv_value_float               = -1;
-static int hf_lwm2mtlv_value_double              = -1;
-static int hf_lwm2mtlv_value_boolean             = -1;
-static int hf_lwm2mtlv_value_timestamp           = -1;
-
-static int hf_lwm2mtlv_object_instance           = -1;
-static int hf_lwm2mtlv_resource_instance         = -1;
-static int hf_lwm2mtlv_resource_array            = -1;
-static int hf_lwm2mtlv_resource                  = -1;
-
-static gint ett_lwm2mtlv                         = -1;
-static gint ett_lwm2mtlv_header                  = -1;
-static gint ett_lwm2mtlv_resource                = -1;
-static gint ett_lwm2mtlv_resource_instance       = -1;
-static gint ett_lwm2mtlv_resource_array          = -1;
-static gint ett_lwm2mtlv_object_instance         = -1;
-static gint ett_lwm2mtlv_location_velocity       = -1;
+static int proto_lwm2mtlv;
+
+static int hf_lwm2mtlv_object_name;
+static int hf_lwm2mtlv_resource_name;
+static int hf_lwm2mtlv_header;
+static int hf_lwm2mtlv_type_type;
+static int hf_lwm2mtlv_type_length_of_identifier;
+static int hf_lwm2mtlv_type_length_of_length;
+static int hf_lwm2mtlv_type_length;
+static int hf_lwm2mtlv_type_ignored;
+
+static int hf_lwm2mtlv_identifier;
+static int hf_lwm2mtlv_length;
+static int hf_lwm2mtlv_value;
+static int hf_lwm2mtlv_value_string;
+static int hf_lwm2mtlv_value_integer;
+static int hf_lwm2mtlv_value_unsigned_integer;
+static int hf_lwm2mtlv_value_float;
+static int hf_lwm2mtlv_value_double;
+static int hf_lwm2mtlv_value_boolean;
+static int hf_lwm2mtlv_value_timestamp;
+
+static int hf_lwm2mtlv_object_instance;
+static int hf_lwm2mtlv_resource_instance;
+static int hf_lwm2mtlv_resource_array;
+static int hf_lwm2mtlv_resource;
+
+static gint ett_lwm2mtlv;
+static gint ett_lwm2mtlv_header;
+static gint ett_lwm2mtlv_resource;
+static gint ett_lwm2mtlv_resource_instance;
+static gint ett_lwm2mtlv_resource_array;
+static gint ett_lwm2mtlv_object_instance;
+static gint ett_lwm2mtlv_location_velocity;
 
 typedef enum {
 	OBJECT_INSTANCE   = 0,
diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c
index a31b7e1e52..ad700a57eb 100644
--- a/epan/dissectors/packet-lwres.c
+++ b/epan/dissectors/packet-lwres.c
@@ -102,79 +102,79 @@ static const value_string result_values[]  = {
     { 0,                        NULL },
 };
 
-static int hf_length = -1;
-static int hf_version = -1;
-static int hf_flags = -1;
-static int hf_serial = -1;
-static int hf_opcode = -1;
-static int hf_result = -1;
-static int hf_recvlen = -1;
-static int hf_authtype = -1;
-static int hf_authlen = -1;
-
-static int hf_rflags = -1;
-static int hf_rdclass = -1;
-static int hf_rdtype = -1;
-static int hf_namelen = -1;
-static int hf_req_name = -1;
-
-static int hf_ttl = -1;
-static int hf_nrdatas = -1;
-static int hf_nsigs = -1;
-static int hf_realnamelen = -1;
-static int hf_realname = -1;
-
-
-static int hf_a_record = -1;
-static int hf_a_rec_len = -1;
-static int hf_srv_prio = -1;
-static int hf_srv_weight = -1;
-static int hf_srv_port = -1;
-static int hf_srv_dname = -1;
-
-static int hf_adn_flags = -1;
-static int hf_adn_addrtype = -1;
-static int hf_adn_namelen = -1;
-static int hf_adn_name = -1;
-
-static int hf_adn_realname = -1;
-static int hf_adn_aliasname = -1;
-
-static int hf_adn_naddrs = -1;
-static int hf_adn_naliases = -1;
-static int hf_adn_family = -1;
-static int hf_adn_addr_len = -1;
-static int hf_adn_addr_addr = -1;
-
-static int hf_ns_dname = -1;
-
-static int ett_lwres = -1;
-static int ett_rdata_req = -1;
-static int ett_rdata_resp = -1;
-static int ett_a_rec = -1;
-static int ett_a_rec_addr = -1;
-static int ett_srv_rec = -1;
-static int ett_srv_rec_item = -1;
-static int ett_adn_request = -1;
-static int ett_adn_resp = -1;
-static int ett_adn_alias = -1;
-static int ett_adn_addr = -1;
-static int ett_nba_request = -1;
-static int ett_nba_resp = -1;
-static int ett_noop = -1;
-
-static int ett_mx_rec = -1;
-static int ett_mx_rec_item = -1;
-
-static int ett_ns_rec = -1;
-static int ett_ns_rec_item = -1;
+static int hf_length;
+static int hf_version;
+static int hf_flags;
+static int hf_serial;
+static int hf_opcode;
+static int hf_result;
+static int hf_recvlen;
+static int hf_authtype;
+static int hf_authlen;
+
+static int hf_rflags;
+static int hf_rdclass;
+static int hf_rdtype;
+static int hf_namelen;
+static int hf_req_name;
+
+static int hf_ttl;
+static int hf_nrdatas;
+static int hf_nsigs;
+static int hf_realnamelen;
+static int hf_realname;
+
+
+static int hf_a_record;
+static int hf_a_rec_len;
+static int hf_srv_prio;
+static int hf_srv_weight;
+static int hf_srv_port;
+static int hf_srv_dname;
+
+static int hf_adn_flags;
+static int hf_adn_addrtype;
+static int hf_adn_namelen;
+static int hf_adn_name;
+
+static int hf_adn_realname;
+static int hf_adn_aliasname;
+
+static int hf_adn_naddrs;
+static int hf_adn_naliases;
+static int hf_adn_family;
+static int hf_adn_addr_len;
+static int hf_adn_addr_addr;
+
+static int hf_ns_dname;
+
+static int ett_lwres;
+static int ett_rdata_req;
+static int ett_rdata_resp;
+static int ett_a_rec;
+static int ett_a_rec_addr;
+static int ett_srv_rec;
+static int ett_srv_rec_item;
+static int ett_adn_request;
+static int ett_adn_resp;
+static int ett_adn_alias;
+static int ett_adn_addr;
+static int ett_nba_request;
+static int ett_nba_resp;
+static int ett_noop;
+
+static int ett_mx_rec;
+static int ett_mx_rec_item;
+
+static int ett_ns_rec;
+static int ett_ns_rec_item;
 
 
 
 #define LWRES_UDP_PORT 921 /* Not IANA registered */
 
 /* Define the lwres proto */
-static int proto_lwres = -1;
+static int proto_lwres;
 
 
 /* Define many many headers for mgcp */
diff --git a/epan/dissectors/packet-m2pa.c b/epan/dissectors/packet-m2pa.c
index 53e188109d..2393853830 100644
--- a/epan/dissectors/packet-m2pa.c
+++ b/epan/dissectors/packet-m2pa.c
@@ -31,37 +31,37 @@ void proto_reg_handoff_m2pa(void);
 
 #define SCTP_PORT_M2PA              3565
 
-static int proto_m2pa      = -1;
+static int proto_m2pa;
 static module_t *m2pa_module;
 
-static int hf_version      = -1;
-static int hf_spare        = -1;
-static int hf_v2_type      = -1;
-static int hf_v8_type      = -1;
-static int hf_type         = -1;
-static int hf_class        = -1;
-static int hf_length       = -1;
-static int hf_unused       = -1;
-static int hf_bsn          = -1;
-static int hf_fsn          = -1;
-static int hf_v2_status    = -1;
-static int hf_v8_status    = -1;
-static int hf_status       = -1;
-static int hf_v2_li_spare  = -1;
-static int hf_v8_li_spare  = -1;
-static int hf_v2_li_prio   = -1;
-static int hf_v8_li_prio   = -1;
-static int hf_filler       = -1;
-static int hf_unknown_data = -1;
-static int hf_pri_prio     = -1;
-static int hf_pri_spare    = -1;
-static int hf_undecode_data   = -1;
-
-static gint ett_m2pa       = -1;
-static gint ett_m2pa_li    = -1;
-
-static expert_field ei_undecode_data = EI_INIT;
-static expert_field ei_length = EI_INIT;
+static int hf_version;
+static int hf_spare;
+static int hf_v2_type;
+static int hf_v8_type;
+static int hf_type;
+static int hf_class;
+static int hf_length;
+static int hf_unused;
+static int hf_bsn;
+static int hf_fsn;
+static int hf_v2_status;
+static int hf_v8_status;
+static int hf_status;
+static int hf_v2_li_spare;
+static int hf_v8_li_spare;
+static int hf_v2_li_prio;
+static int hf_v8_li_prio;
+static int hf_filler;
+static int hf_unknown_data;
+static int hf_pri_prio;
+static int hf_pri_spare;
+static int hf_undecode_data;
+
+static gint ett_m2pa;
+static gint ett_m2pa_li;
+
+static expert_field ei_undecode_data;
+static expert_field ei_length;
 
 static dissector_handle_t m2pa_handle;
 static dissector_handle_t mtp3_handle;
diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c
index aeb7701ea9..d4e676735d 100644
--- a/epan/dissectors/packet-m2tp.c
+++ b/epan/dissectors/packet-m2tp.c
@@ -209,28 +209,28 @@ static const value_string m2tp_reason_code_values[] = {
 
 
 /* Initialize the protocol and registered fields */
-static int proto_m2tp = -1;
-static int hf_m2tp_version = -1;
-static int hf_m2tp_reserved = -1;
-static int hf_m2tp_message_class = -1;
-static int hf_m2tp_message_type = -1;
-static int hf_m2tp_message_length = -1;
-static int hf_m2tp_parameter_tag = -1;
-static int hf_m2tp_parameter_length = -1;
-static int hf_m2tp_parameter_value = -1;
-static int hf_m2tp_parameter_padding = -1;
-static int hf_m2tp_interface_identifier = -1;
-static int hf_m2tp_user = -1;
-static int hf_m2tp_master_slave = -1;
-static int hf_m2tp_info_string = -1;
-static int hf_m2tp_heartbeat_data = -1;
-static int hf_m2tp_diagnostic_info = -1;
-static int hf_m2tp_error_code = -1;
-static int hf_m2tp_reason = -1;
+static int proto_m2tp;
+static int hf_m2tp_version;
+static int hf_m2tp_reserved;
+static int hf_m2tp_message_class;
+static int hf_m2tp_message_type;
+static int hf_m2tp_message_length;
+static int hf_m2tp_parameter_tag;
+static int hf_m2tp_parameter_length;
+static int hf_m2tp_parameter_value;
+static int hf_m2tp_parameter_padding;
+static int hf_m2tp_interface_identifier;
+static int hf_m2tp_user;
+static int hf_m2tp_master_slave;
+static int hf_m2tp_info_string;
+static int hf_m2tp_heartbeat_data;
+static int hf_m2tp_diagnostic_info;
+static int hf_m2tp_error_code;
+static int hf_m2tp_reason;
 
 /* Initialize the subtree pointers */
-static gint ett_m2tp = -1;
-static gint ett_m2tp_parameter = -1;
+static gint ett_m2tp;
+static gint ett_m2tp_parameter;
 
 static dissector_handle_t mtp2_handle;
 
diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c
index 3e0e662ab1..f2224677aa 100644
--- a/epan/dissectors/packet-m2ua.c
+++ b/epan/dissectors/packet-m2ua.c
@@ -30,48 +30,48 @@ void proto_reg_handoff_m2ua(void);
 #define SCTP_PORT_M2UA                  2904
 
 /* Initialize the protocol and registered fields */
-static int proto_m2ua =                 -1;
-static int hf_version =                 -1;
-static int hf_reserved =                -1;
-static int hf_message_class =           -1;
-static int hf_message_type =            -1;
-static int hf_message_length =          -1;
-static int hf_parameter_tag =           -1;
-static int hf_parameter_length =        -1;
-static int hf_parameter_value =         -1;
-static int hf_parameter_padding =       -1;
-static int hf_interface_id_int =        -1;
-static int hf_interface_id_text =       -1;
-static int hf_info_string =             -1;
-static int hf_diagnostic_information =  -1;
-static int hf_interface_id_start =      -1;
-static int hf_interface_id_stop =       -1;
-static int hf_heartbeat_data =          -1;
-static int hf_traffic_mode_type =       -1;
-static int hf_error_code =              -1;
-static int hf_status_type =             -1;
-static int hf_status_ident =            -1;
-static int hf_asp_id =                  -1;
-static int hf_correlation_id =          -1;
-static int hf_data_2_li =               -1;
-static int hf_state =                   -1;
-static int hf_event =                   -1;
-static int hf_congestion_status =       -1;
-static int hf_discard_status =          -1;
-static int hf_action =                  -1;
-static int hf_sequence_number =         -1;
-static int hf_retrieval_result =        -1;
-static int hf_local_lk_id =             -1;
-static int hf_sdt_reserved =            -1;
-static int hf_sdt_id =                  -1;
-static int hf_sdl_reserved =            -1;
-static int hf_sdl_id =                  -1;
-static int hf_registration_status =     -1;
-static int hf_deregistration_status =   -1;
+static int proto_m2ua;
+static int hf_version;
+static int hf_reserved;
+static int hf_message_class;
+static int hf_message_type;
+static int hf_message_length;
+static int hf_parameter_tag;
+static int hf_parameter_length;
+static int hf_parameter_value;
+static int hf_parameter_padding;
+static int hf_interface_id_int;
+static int hf_interface_id_text;
+static int hf_info_string;
+static int hf_diagnostic_information;
+static int hf_interface_id_start;
+static int hf_interface_id_stop;
+static int hf_heartbeat_data;
+static int hf_traffic_mode_type;
+static int hf_error_code;
+static int hf_status_type;
+static int hf_status_ident;
+static int hf_asp_id;
+static int hf_correlation_id;
+static int hf_data_2_li;
+static int hf_state;
+static int hf_event;
+static int hf_congestion_status;
+static int hf_discard_status;
+static int hf_action;
+static int hf_sequence_number;
+static int hf_retrieval_result;
+static int hf_local_lk_id;
+static int hf_sdt_reserved;
+static int hf_sdt_id;
+static int hf_sdl_reserved;
+static int hf_sdl_id;
+static int hf_registration_status;
+static int hf_deregistration_status;
 
 /* Initialize the subtree pointers */
-static gint ett_m2ua =                  -1;
-static gint ett_m2ua_parameter =        -1;
+static gint ett_m2ua;
+static gint ett_m2ua_parameter;
 
 static dissector_handle_t mtp3_handle;
 static dissector_handle_t m2ua_handle;
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
index 7ce880c627..6e546c0da9 100644
--- a/epan/dissectors/packet-m3ua.c
+++ b/epan/dissectors/packet-m3ua.c
@@ -216,87 +216,87 @@ static const value_string message_class_type_acro_values[] = {
   { 0,                           NULL } };
 
 /* Initialize the protocol and registered fields */
-static int proto_m3ua = -1;
-static int hf_version = -1;
-static int hf_reserved = -1;
-static int hf_message_class = -1;
-static int hf_v5_message_class = -1;
-static int hf_message_type = -1;
-static int hf_message_length = -1;
-static int hf_v5_parameter_tag = -1;
-static int hf_v6_parameter_tag = -1;
-static int hf_v7_parameter_tag = -1;
-static int hf_parameter_tag = -1;
-static int hf_parameter_length = -1;
-static int hf_parameter_value = -1;
-static int hf_parameter_padding = -1;
-/* static int hf_parameter_trailer = -1; */
-static int hf_network_appearance = -1;
-static int hf_info_string = -1;
-static int hf_routing_context = -1;
-static int hf_diagnostic_information = -1;
-static int hf_heartbeat_data = -1;
-static int hf_v5_error_code = -1;
-static int hf_v6_error_code = -1;
-static int hf_v7_error_code = -1;
-static int hf_error_code = -1;
-static int hf_status_type = -1;
-static int hf_status_info = -1;
-static int hf_asp_identifier = -1;
-static int hf_affected_point_code_mask = -1;
-static int hf_affected_point_code_pc = -1;
-static int hf_cause = -1;
-static int hf_user = -1;
-static int hf_reason = -1;
-static int hf_v5_traffic_mode_type = -1;
-static int hf_v6_traffic_mode_type = -1;
-static int hf_v7_traffic_mode_type = -1;
-static int hf_traffic_mode_type = -1;
-static int hf_congestion_reserved = -1;
-static int hf_congestion_level = -1;
-static int hf_concerned_dest_reserved = -1;
-static int hf_concerned_dest_pc = -1;
-static int hf_local_rk_identifier = -1;
-static int hf_dpc_mask = -1;
-static int hf_dpc_pc = -1;
-static int hf_si = -1;
-static int hf_ssn = -1;
-static int hf_opc_list_mask = -1;
-static int hf_opc_list_pc = -1;
-static int hf_cic_range_mask = -1;
-static int hf_cic_range_pc = -1;
-static int hf_cic_range_upper = -1;
-static int hf_cic_range_lower = -1;
-static int hf_protocol_data_opc = -1;
-static int hf_protocol_data_dpc = -1;
-static int hf_protocol_data_mtp3_opc = -1;
-static int hf_protocol_data_mtp3_dpc = -1;
-static int hf_protocol_data_mtp3_pc = -1;
-static int hf_protocol_data_si = -1;
-static int hf_protocol_data_ni = -1;
-static int hf_protocol_data_mtp3_ni = -1;
-static int hf_protocol_data_mp = -1;
-static int hf_protocol_data_sls = -1;
-static int hf_protocol_data_mtp3_sls = -1;
-static int hf_correlation_identifier = -1;
-static int hf_registration_status = -1;
-static int hf_deregistration_status = -1;
-static int hf_registration_result_identifier = -1;
-static int hf_registration_result_status = -1;
-static int hf_registration_result_context = -1;
-static int hf_v6_deregistration_result_status = -1;
-static int hf_v6_deregistration_result_context = -1;
-static int hf_li = -1;
-static int hf_heuristic_standard = -1;
+static int proto_m3ua;
+static int hf_version;
+static int hf_reserved;
+static int hf_message_class;
+static int hf_v5_message_class;
+static int hf_message_type;
+static int hf_message_length;
+static int hf_v5_parameter_tag;
+static int hf_v6_parameter_tag;
+static int hf_v7_parameter_tag;
+static int hf_parameter_tag;
+static int hf_parameter_length;
+static int hf_parameter_value;
+static int hf_parameter_padding;
+/* static int hf_parameter_trailer; */
+static int hf_network_appearance;
+static int hf_info_string;
+static int hf_routing_context;
+static int hf_diagnostic_information;
+static int hf_heartbeat_data;
+static int hf_v5_error_code;
+static int hf_v6_error_code;
+static int hf_v7_error_code;
+static int hf_error_code;
+static int hf_status_type;
+static int hf_status_info;
+static int hf_asp_identifier;
+static int hf_affected_point_code_mask;
+static int hf_affected_point_code_pc;
+static int hf_cause;
+static int hf_user;
+static int hf_reason;
+static int hf_v5_traffic_mode_type;
+static int hf_v6_traffic_mode_type;
+static int hf_v7_traffic_mode_type;
+static int hf_traffic_mode_type;
+static int hf_congestion_reserved;
+static int hf_congestion_level;
+static int hf_concerned_dest_reserved;
+static int hf_concerned_dest_pc;
+static int hf_local_rk_identifier;
+static int hf_dpc_mask;
+static int hf_dpc_pc;
+static int hf_si;
+static int hf_ssn;
+static int hf_opc_list_mask;
+static int hf_opc_list_pc;
+static int hf_cic_range_mask;
+static int hf_cic_range_pc;
+static int hf_cic_range_upper;
+static int hf_cic_range_lower;
+static int hf_protocol_data_opc;
+static int hf_protocol_data_dpc;
+static int hf_protocol_data_mtp3_opc;
+static int hf_protocol_data_mtp3_dpc;
+static int hf_protocol_data_mtp3_pc;
+static int hf_protocol_data_si;
+static int hf_protocol_data_ni;
+static int hf_protocol_data_mtp3_ni;
+static int hf_protocol_data_mp;
+static int hf_protocol_data_sls;
+static int hf_protocol_data_mtp3_sls;
+static int hf_correlation_identifier;
+static int hf_registration_status;
+static int hf_deregistration_status;
+static int hf_registration_result_identifier;
+static int hf_registration_result_status;
+static int hf_registration_result_context;
+static int hf_v6_deregistration_result_status;
+static int hf_v6_deregistration_result_context;
+static int hf_li;
+static int hf_heuristic_standard;
 
 static int m3ua_tap = -1;
 
 /* Initialize the subtree pointers */
-static gint ett_m3ua = -1;
-static gint ett_parameter = -1;
-static gint ett_mtp3_equiv = -1;
-static gint ett_q708_opc = -1;
-static gint ett_q708_dpc = -1;
+static gint ett_m3ua;
+static gint ett_parameter;
+static gint ett_mtp3_equiv;
+static gint ett_q708_opc;
+static gint ett_q708_dpc;
 
 static module_t *m3ua_module;
 static dissector_handle_t mtp3_handle;
diff --git a/epan/dissectors/packet-maap.c b/epan/dissectors/packet-maap.c
index 07a588e1fe..a849c7b9a1 100644
--- a/epan/dissectors/packet-maap.c
+++ b/epan/dissectors/packet-maap.c
@@ -56,20 +56,20 @@ static const value_string maap_msg_type_vals [] = {
 /**********************************************************/
 /* Initialize the protocol and registered fields          */
 /**********************************************************/
-static int proto_maap = -1;
+static int proto_maap;
 
 /* MAAP PDU */
-static int hf_maap_message_type = -1;
-static int hf_maap_version = -1;
-static int hf_maap_data_length = -1;
-static int hf_maap_stream_id = -1;
-static int hf_maap_req_start_addr = -1;
-static int hf_maap_req_count = -1;
-static int hf_maap_conflict_start_addr = -1;
-static int hf_maap_conflict_count = -1;
+static int hf_maap_message_type;
+static int hf_maap_version;
+static int hf_maap_data_length;
+static int hf_maap_stream_id;
+static int hf_maap_req_start_addr;
+static int hf_maap_req_count;
+static int hf_maap_conflict_start_addr;
+static int hf_maap_conflict_count;
 
 /* Initialize the subtree pointers */
-static int ett_maap = -1;
+static int ett_maap;
 
 static int
 dissect_maap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-mac-lte-framed.c b/epan/dissectors/packet-mac-lte-framed.c
index 0a805513af..7b845a06b5 100644
--- a/epan/dissectors/packet-mac-lte-framed.c
+++ b/epan/dissectors/packet-mac-lte-framed.c
@@ -18,7 +18,7 @@
 void proto_register_mac_lte_framed(void);
 
 /* Initialize the protocol and registered fields. */
-static int proto_mac_lte_framed = -1;
+static int proto_mac_lte_framed;
 
 extern int proto_mac_lte;
 
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c
index e6c882fc61..ebbd8a414f 100644
--- a/epan/dissectors/packet-mac-lte.c
+++ b/epan/dissectors/packet-mac-lte.c
@@ -35,7 +35,7 @@ void proto_reg_handoff_mac_lte(void);
  */
 
 /* Initialize the protocol and registered fields. */
-int proto_mac_lte = -1;
+int proto_mac_lte;
 
 static int mac_lte_tap = -1;
 
@@ -56,508 +56,508 @@ static dissector_handle_t lte_rrc_sc_mcch_handle;
 
 
 /* Decoding context */
-static int hf_mac_lte_context = -1;
-static int hf_mac_lte_context_radio_type = -1;
-static int hf_mac_lte_context_direction = -1;
-static int hf_mac_lte_context_rnti = -1;
-static int hf_mac_lte_context_rnti_type = -1;
-static int hf_mac_lte_context_ueid = -1;
-static int hf_mac_lte_context_sysframe_number = -1;
-static int hf_mac_lte_context_subframe_number = -1;
-static int hf_mac_lte_context_grant_subframe_number = -1;
-static int hf_mac_lte_context_predefined_frame = -1;
-static int hf_mac_lte_context_length = -1;
-static int hf_mac_lte_context_ul_grant_size = -1;
-static int hf_mac_lte_context_bch_transport_channel = -1;
-static int hf_mac_lte_context_retx_count = -1;
-static int hf_mac_lte_context_retx_reason = -1;
-static int hf_mac_lte_context_crc_status = -1;
-static int hf_mac_lte_context_carrier_id = -1;
-
-static int hf_mac_lte_context_rapid = -1;
-static int hf_mac_lte_context_rach_attempt_number = -1;
+static int hf_mac_lte_context;
+static int hf_mac_lte_context_radio_type;
+static int hf_mac_lte_context_direction;
+static int hf_mac_lte_context_rnti;
+static int hf_mac_lte_context_rnti_type;
+static int hf_mac_lte_context_ueid;
+static int hf_mac_lte_context_sysframe_number;
+static int hf_mac_lte_context_subframe_number;
+static int hf_mac_lte_context_grant_subframe_number;
+static int hf_mac_lte_context_predefined_frame;
+static int hf_mac_lte_context_length;
+static int hf_mac_lte_context_ul_grant_size;
+static int hf_mac_lte_context_bch_transport_channel;
+static int hf_mac_lte_context_retx_count;
+static int hf_mac_lte_context_retx_reason;
+static int hf_mac_lte_context_crc_status;
+static int hf_mac_lte_context_carrier_id;
+
+static int hf_mac_lte_context_rapid;
+static int hf_mac_lte_context_rach_attempt_number;
 
 /* Inferred context */
-static int hf_mac_lte_ues_ul_per_tti = -1;
-static int hf_mac_lte_ues_dl_per_tti = -1;
+static int hf_mac_lte_ues_ul_per_tti;
+static int hf_mac_lte_ues_dl_per_tti;
 
 
 /* Extra PHY context */
-static int hf_mac_lte_context_phy_ul = -1;
-static int hf_mac_lte_context_phy_ul_modulation_type = -1;
-static int hf_mac_lte_context_phy_ul_tbs_index = -1;
-static int hf_mac_lte_context_phy_ul_resource_block_length = -1;
-static int hf_mac_lte_context_phy_ul_resource_block_start = -1;
-static int hf_mac_lte_context_phy_ul_harq_id = -1;
-static int hf_mac_lte_context_phy_ul_ndi = -1;
-
-static int hf_mac_lte_context_phy_dl = -1;
-static int hf_mac_lte_context_phy_dl_dci_format = -1;
-static int hf_mac_lte_context_phy_dl_resource_allocation_type = -1;
-static int hf_mac_lte_context_phy_dl_aggregation_level = -1;
-static int hf_mac_lte_context_phy_dl_mcs_index = -1;
-static int hf_mac_lte_context_phy_dl_redundancy_version_index = -1;
-static int hf_mac_lte_context_phy_dl_retx = -1;
-static int hf_mac_lte_context_phy_dl_resource_block_length = -1;
-static int hf_mac_lte_context_phy_dl_harq_id = -1;
-static int hf_mac_lte_context_phy_dl_ndi = -1;
-static int hf_mac_lte_context_phy_dl_tb = -1;
+static int hf_mac_lte_context_phy_ul;
+static int hf_mac_lte_context_phy_ul_modulation_type;
+static int hf_mac_lte_context_phy_ul_tbs_index;
+static int hf_mac_lte_context_phy_ul_resource_block_length;
+static int hf_mac_lte_context_phy_ul_resource_block_start;
+static int hf_mac_lte_context_phy_ul_harq_id;
+static int hf_mac_lte_context_phy_ul_ndi;
+
+static int hf_mac_lte_context_phy_dl;
+static int hf_mac_lte_context_phy_dl_dci_format;
+static int hf_mac_lte_context_phy_dl_resource_allocation_type;
+static int hf_mac_lte_context_phy_dl_aggregation_level;
+static int hf_mac_lte_context_phy_dl_mcs_index;
+static int hf_mac_lte_context_phy_dl_redundancy_version_index;
+static int hf_mac_lte_context_phy_dl_retx;
+static int hf_mac_lte_context_phy_dl_resource_block_length;
+static int hf_mac_lte_context_phy_dl_harq_id;
+static int hf_mac_lte_context_phy_dl_ndi;
+static int hf_mac_lte_context_phy_dl_tb;
 
 
 /* Out-of-band events */
-static int hf_mac_lte_oob_send_preamble = -1;
-static int hf_mac_lte_number_of_srs = -1;
+static int hf_mac_lte_oob_send_preamble;
+static int hf_mac_lte_number_of_srs;
 
 /* MAC SCH/MCH header fields */
-static int hf_mac_lte_ulsch = -1;
-static int hf_mac_lte_ulsch_header = -1;
-static int hf_mac_lte_dlsch = -1;
-static int hf_mac_lte_dlsch_header = -1;
-static int hf_mac_lte_sch_subheader = -1;
-static int hf_mac_lte_mch = -1;
-static int hf_mac_lte_mch_header = -1;
-static int hf_mac_lte_mch_subheader = -1;
-static int hf_mac_lte_slsch = -1;
-static int hf_mac_lte_slsch_header = -1;
-static int hf_mac_lte_slsch_subheader = -1;
-
-static int hf_mac_lte_sch_reserved = -1;
-static int hf_mac_lte_sch_format2 = -1;
-static int hf_mac_lte_dlsch_lcid = -1;
-static int hf_mac_lte_ulsch_lcid = -1;
-static int hf_mac_lte_sch_extended = -1;
-static int hf_mac_lte_sch_format = -1;
-static int hf_mac_lte_sch_reserved2 = -1;
-static int hf_mac_lte_sch_elcid = -1;
-static int hf_mac_lte_sch_length = -1;
-static int hf_mac_lte_mch_reserved = -1;
-static int hf_mac_lte_mch_format2 = -1;
-static int hf_mac_lte_mch_lcid = -1;
-static int hf_mac_lte_mch_extended = -1;
-static int hf_mac_lte_mch_format = -1;
-static int hf_mac_lte_mch_length = -1;
-static int hf_mac_lte_slsch_version = -1;
-static int hf_mac_lte_slsch_reserved = -1;
-static int hf_mac_lte_slsch_src_l2_id = -1;
-static int hf_mac_lte_slsch_dst_l2_id = -1;
-static int hf_mac_lte_slsch_dst_l2_id2 = -1;
-static int hf_mac_lte_slsch_reserved2 = -1;
-static int hf_mac_lte_slsch_extended = -1;
-static int hf_mac_lte_slsch_lcid = -1;
-static int hf_mac_lte_slsch_format = -1;
-static int hf_mac_lte_slsch_length = -1;
-
-static int hf_mac_lte_sch_header_only = -1;
-static int hf_mac_lte_mch_header_only = -1;
-static int hf_mac_lte_slsch_header_only = -1;
+static int hf_mac_lte_ulsch;
+static int hf_mac_lte_ulsch_header;
+static int hf_mac_lte_dlsch;
+static int hf_mac_lte_dlsch_header;
+static int hf_mac_lte_sch_subheader;
+static int hf_mac_lte_mch;
+static int hf_mac_lte_mch_header;
+static int hf_mac_lte_mch_subheader;
+static int hf_mac_lte_slsch;
+static int hf_mac_lte_slsch_header;
+static int hf_mac_lte_slsch_subheader;
+
+static int hf_mac_lte_sch_reserved;
+static int hf_mac_lte_sch_format2;
+static int hf_mac_lte_dlsch_lcid;
+static int hf_mac_lte_ulsch_lcid;
+static int hf_mac_lte_sch_extended;
+static int hf_mac_lte_sch_format;
+static int hf_mac_lte_sch_reserved2;
+static int hf_mac_lte_sch_elcid;
+static int hf_mac_lte_sch_length;
+static int hf_mac_lte_mch_reserved;
+static int hf_mac_lte_mch_format2;
+static int hf_mac_lte_mch_lcid;
+static int hf_mac_lte_mch_extended;
+static int hf_mac_lte_mch_format;
+static int hf_mac_lte_mch_length;
+static int hf_mac_lte_slsch_version;
+static int hf_mac_lte_slsch_reserved;
+static int hf_mac_lte_slsch_src_l2_id;
+static int hf_mac_lte_slsch_dst_l2_id;
+static int hf_mac_lte_slsch_dst_l2_id2;
+static int hf_mac_lte_slsch_reserved2;
+static int hf_mac_lte_slsch_extended;
+static int hf_mac_lte_slsch_lcid;
+static int hf_mac_lte_slsch_format;
+static int hf_mac_lte_slsch_length;
+
+static int hf_mac_lte_sch_header_only;
+static int hf_mac_lte_mch_header_only;
+static int hf_mac_lte_slsch_header_only;
 
 /* Data */
-static int hf_mac_lte_sch_sdu = -1;
-static int hf_mac_lte_mch_sdu = -1;
-static int hf_mac_lte_bch_pdu = -1;
-static int hf_mac_lte_pch_pdu = -1;
-static int hf_mac_lte_slbch_pdu = -1;
-static int hf_mac_lte_slsch_sdu = -1;
-static int hf_mac_lte_predefined_pdu = -1;
-static int hf_mac_lte_raw_pdu = -1;
-static int hf_mac_lte_padding_data = -1;
-static int hf_mac_lte_padding_length = -1;
+static int hf_mac_lte_sch_sdu;
+static int hf_mac_lte_mch_sdu;
+static int hf_mac_lte_bch_pdu;
+static int hf_mac_lte_pch_pdu;
+static int hf_mac_lte_slbch_pdu;
+static int hf_mac_lte_slsch_sdu;
+static int hf_mac_lte_predefined_pdu;
+static int hf_mac_lte_raw_pdu;
+static int hf_mac_lte_padding_data;
+static int hf_mac_lte_padding_length;
 
 
 /* RAR fields */
-static int hf_mac_lte_rar = -1;
-static int hf_mac_lte_rar_headers = -1;
-static int hf_mac_lte_rar_header = -1;
-static int hf_mac_lte_rar_extension = -1;
-static int hf_mac_lte_rar_t = -1;
-static int hf_mac_lte_rar_bi = -1;
-static int hf_mac_lte_rar_bi_nb = -1;
-static int hf_mac_lte_rar_rapid = -1;
-static int hf_mac_lte_rar_no_of_rapids = -1;
-static int hf_mac_lte_rar_reserved = -1;
-static int hf_mac_lte_rar_body = -1;
-static int hf_mac_lte_rar_reserved2 = -1;
-static int hf_mac_lte_rar_ta = -1;
-static int hf_mac_lte_rar_ul_grant_ce_mode_b = -1;
-static int hf_mac_lte_rar_ul_grant = -1;
-static int hf_mac_lte_rar_ul_grant_hopping = -1;
-static int hf_mac_lte_rar_ul_grant_fsrba = -1;
-static int hf_mac_lte_rar_ul_grant_tmcs = -1;
-static int hf_mac_lte_rar_ul_grant_tcsp = -1;
-static int hf_mac_lte_rar_ul_grant_ul_delay = -1;
-static int hf_mac_lte_rar_ul_grant_cqi_request = -1;
-static int hf_mac_lte_rar_ul_grant_msg3_pusch_nb_idx_ce_mode_a = -1;
-static int hf_mac_lte_rar_ul_grant_msg3_pusch_res_alloc_ce_mode_a = -1;
-static int hf_mac_lte_rar_ul_grant_nb_rep_msg3_pusch_ce_mode_a = -1;
-static int hf_mac_lte_rar_ul_grant_mcs_ce_mode_a = -1;
-static int hf_mac_lte_rar_ul_grant_tpc_ce_mode_a = -1;
-static int hf_mac_lte_rar_ul_grant_csi_request_ce_mode_a = -1;
-static int hf_mac_lte_rar_ul_grant_ul_delay_ce_mode_a = -1;
-static int hf_mac_lte_rar_ul_grant_msg3_msg4_mpdcch_nb_idx = -1;
-static int hf_mac_lte_rar_ul_grant_padding_ce_mode_a = -1;
-static int hf_mac_lte_rar_ul_grant_msg3_pusch_nb_idx_ce_mode_b = -1;
-static int hf_mac_lte_rar_ul_grant_msg3_pusch_res_alloc_ce_mode_b = -1;
-static int hf_mac_lte_rar_ul_grant_nb_rep_msg3_pusch_ce_mode_b = -1;
-static int hf_mac_lte_rar_ul_grant_tbs_ce_mode_b = -1;
-static int hf_mac_lte_rar_ul_grant_ul_subcarrier_spacing = -1;
-static int hf_mac_lte_rar_ul_grant_subcarrier_indication = -1;
-static int hf_mac_lte_rar_ul_grant_scheduling_delay = -1;
-static int hf_mac_lte_rar_ul_grant_msg3_repetition_number = -1;
-static int hf_mac_lte_rar_ul_grant_mcs_index = -1;
-static int hf_mac_lte_rar_ul_grant_padding_nb_mode = -1;
-static int hf_mac_lte_rar_temporary_crnti = -1;
+static int hf_mac_lte_rar;
+static int hf_mac_lte_rar_headers;
+static int hf_mac_lte_rar_header;
+static int hf_mac_lte_rar_extension;
+static int hf_mac_lte_rar_t;
+static int hf_mac_lte_rar_bi;
+static int hf_mac_lte_rar_bi_nb;
+static int hf_mac_lte_rar_rapid;
+static int hf_mac_lte_rar_no_of_rapids;
+static int hf_mac_lte_rar_reserved;
+static int hf_mac_lte_rar_body;
+static int hf_mac_lte_rar_reserved2;
+static int hf_mac_lte_rar_ta;
+static int hf_mac_lte_rar_ul_grant_ce_mode_b;
+static int hf_mac_lte_rar_ul_grant;
+static int hf_mac_lte_rar_ul_grant_hopping;
+static int hf_mac_lte_rar_ul_grant_fsrba;
+static int hf_mac_lte_rar_ul_grant_tmcs;
+static int hf_mac_lte_rar_ul_grant_tcsp;
+static int hf_mac_lte_rar_ul_grant_ul_delay;
+static int hf_mac_lte_rar_ul_grant_cqi_request;
+static int hf_mac_lte_rar_ul_grant_msg3_pusch_nb_idx_ce_mode_a;
+static int hf_mac_lte_rar_ul_grant_msg3_pusch_res_alloc_ce_mode_a;
+static int hf_mac_lte_rar_ul_grant_nb_rep_msg3_pusch_ce_mode_a;
+static int hf_mac_lte_rar_ul_grant_mcs_ce_mode_a;
+static int hf_mac_lte_rar_ul_grant_tpc_ce_mode_a;
+static int hf_mac_lte_rar_ul_grant_csi_request_ce_mode_a;
+static int hf_mac_lte_rar_ul_grant_ul_delay_ce_mode_a;
+static int hf_mac_lte_rar_ul_grant_msg3_msg4_mpdcch_nb_idx;
+static int hf_mac_lte_rar_ul_grant_padding_ce_mode_a;
+static int hf_mac_lte_rar_ul_grant_msg3_pusch_nb_idx_ce_mode_b;
+static int hf_mac_lte_rar_ul_grant_msg3_pusch_res_alloc_ce_mode_b;
+static int hf_mac_lte_rar_ul_grant_nb_rep_msg3_pusch_ce_mode_b;
+static int hf_mac_lte_rar_ul_grant_tbs_ce_mode_b;
+static int hf_mac_lte_rar_ul_grant_ul_subcarrier_spacing;
+static int hf_mac_lte_rar_ul_grant_subcarrier_indication;
+static int hf_mac_lte_rar_ul_grant_scheduling_delay;
+static int hf_mac_lte_rar_ul_grant_msg3_repetition_number;
+static int hf_mac_lte_rar_ul_grant_mcs_index;
+static int hf_mac_lte_rar_ul_grant_padding_nb_mode;
+static int hf_mac_lte_rar_temporary_crnti;
 
 /* Common channel control values */
-static int hf_mac_lte_control_bsr = -1;
-static int hf_mac_lte_control_bsr_lcg_id = -1;
-static int hf_mac_lte_control_short_bsr_buffer_size = -1;
-static int hf_mac_lte_control_long_bsr_buffer_size_0 = -1;
-static int hf_mac_lte_control_long_bsr_buffer_size_1 = -1;
-static int hf_mac_lte_control_long_bsr_buffer_size_2 = -1;
-static int hf_mac_lte_control_long_bsr_buffer_size_3 = -1;
-static int hf_mac_lte_control_short_ext_bsr_buffer_size = -1;
-static int hf_mac_lte_control_long_ext_bsr_buffer_size_0 = -1;
-static int hf_mac_lte_control_long_ext_bsr_buffer_size_1 = -1;
-static int hf_mac_lte_control_long_ext_bsr_buffer_size_2 = -1;
-static int hf_mac_lte_control_long_ext_bsr_buffer_size_3 = -1;
-static int hf_mac_lte_bsr_size_median = -1;
-static int hf_mac_lte_control_crnti = -1;
-static int hf_mac_lte_control_timing_advance = -1;
-static int hf_mac_lte_control_timing_advance_group_id = -1;
-static int hf_mac_lte_control_timing_advance_command = -1;
-static int hf_mac_lte_control_timing_advance_value_reserved = -1;
-static int hf_mac_lte_control_timing_advance_value = -1;
-static int hf_mac_lte_control_as_rai = -1;
-static int hf_mac_lte_control_as_rai_reserved = -1;
-static int hf_mac_lte_control_as_rai_quality_report = -1;
-static int hf_mac_lte_control_ue_contention_resolution = -1;
-static int hf_mac_lte_control_ue_contention_resolution_identity = -1;
-static int hf_mac_lte_control_ue_contention_resolution_msg3 = -1;
-static int hf_mac_lte_control_ue_contention_resolution_msg3_matched = -1;
-static int hf_mac_lte_control_ue_contention_resolution_time_since_msg3 = -1;
-static int hf_mac_lte_control_msg3_to_cr = -1;
-
-static int hf_mac_lte_control_power_headroom = -1;
-static int hf_mac_lte_control_power_headroom_reserved = -1;
-static int hf_mac_lte_control_power_headroom_level = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c7 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c6 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c5 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c4 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c3 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c2 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c1 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c15 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c14 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c13 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c12 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c11 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c10 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c9 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c8 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c23 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c22 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c21 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c20 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c19 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c18 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c17 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c16 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c31 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c30 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c29 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c28 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c27 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c26 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c25 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_c24 = -1;
-
-static int hf_mac_lte_control_dual_conn_power_headroom_reserved = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_power_backoff = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_value = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_level = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_reserved2 = -1;
-static int hf_mac_lte_control_dual_conn_power_headroom_pcmaxc = -1;
-static int hf_mac_lte_control_ext_power_headroom = -1;
-static int hf_mac_lte_control_ext_power_headroom_c7 = -1;
-static int hf_mac_lte_control_ext_power_headroom_c6 = -1;
-static int hf_mac_lte_control_ext_power_headroom_c5 = -1;
-static int hf_mac_lte_control_ext_power_headroom_c4 = -1;
-static int hf_mac_lte_control_ext_power_headroom_c3 = -1;
-static int hf_mac_lte_control_ext_power_headroom_c2 = -1;
-static int hf_mac_lte_control_ext_power_headroom_c1 = -1;
-static int hf_mac_lte_control_ext_power_headroom_reserved = -1;
-static int hf_mac_lte_control_ext_power_headroom_power_backoff = -1;
-static int hf_mac_lte_control_ext_power_headroom_value = -1;
-static int hf_mac_lte_control_ext_power_headroom_level = -1;
-static int hf_mac_lte_control_ext_power_headroom_reserved2 = -1;
-static int hf_mac_lte_control_ext_power_headroom_pcmaxc = -1;
-static int hf_mac_lte_control_activation_deactivation = -1;
-static int hf_mac_lte_control_activation_deactivation_c7 = -1;
-static int hf_mac_lte_control_activation_deactivation_c6 = -1;
-static int hf_mac_lte_control_activation_deactivation_c5 = -1;
-static int hf_mac_lte_control_activation_deactivation_c4 = -1;
-static int hf_mac_lte_control_activation_deactivation_c3 = -1;
-static int hf_mac_lte_control_activation_deactivation_c2 = -1;
-static int hf_mac_lte_control_activation_deactivation_c1 = -1;
-static int hf_mac_lte_control_activation_deactivation_reserved = -1;
-static int hf_mac_lte_control_activation_deactivation_c15 = -1;
-static int hf_mac_lte_control_activation_deactivation_c14 = -1;
-static int hf_mac_lte_control_activation_deactivation_c13 = -1;
-static int hf_mac_lte_control_activation_deactivation_c12 = -1;
-static int hf_mac_lte_control_activation_deactivation_c11 = -1;
-static int hf_mac_lte_control_activation_deactivation_c10 = -1;
-static int hf_mac_lte_control_activation_deactivation_c9 = -1;
-static int hf_mac_lte_control_activation_deactivation_c8 = -1;
-static int hf_mac_lte_control_activation_deactivation_c23 = -1;
-static int hf_mac_lte_control_activation_deactivation_c22 = -1;
-static int hf_mac_lte_control_activation_deactivation_c21 = -1;
-static int hf_mac_lte_control_activation_deactivation_c20 = -1;
-static int hf_mac_lte_control_activation_deactivation_c19 = -1;
-static int hf_mac_lte_control_activation_deactivation_c18 = -1;
-static int hf_mac_lte_control_activation_deactivation_c17 = -1;
-static int hf_mac_lte_control_activation_deactivation_c16 = -1;
-static int hf_mac_lte_control_activation_deactivation_c31 = -1;
-static int hf_mac_lte_control_activation_deactivation_c30 = -1;
-static int hf_mac_lte_control_activation_deactivation_c29 = -1;
-static int hf_mac_lte_control_activation_deactivation_c28 = -1;
-static int hf_mac_lte_control_activation_deactivation_c27 = -1;
-static int hf_mac_lte_control_activation_deactivation_c26 = -1;
-static int hf_mac_lte_control_activation_deactivation_c25 = -1;
-static int hf_mac_lte_control_activation_deactivation_c24 = -1;
-static int hf_mac_lte_control_mch_scheduling_info = -1;
-static int hf_mac_lte_control_mch_scheduling_info_lcid = -1;
-static int hf_mac_lte_control_mch_scheduling_info_stop_mtch = -1;
-static int hf_mac_lte_control_sidelink_bsr = -1;
-static int hf_mac_lte_control_sidelink_bsr_destination_idx_odd = -1;
-static int hf_mac_lte_control_sidelink_bsr_lcg_id_odd = -1;
-static int hf_mac_lte_control_sidelink_bsr_buffer_size_odd = -1;
-static int hf_mac_lte_control_sidelink_bsr_destination_idx_even = -1;
-static int hf_mac_lte_control_sidelink_bsr_lcg_id_even = -1;
-static int hf_mac_lte_control_sidelink_bsr_buffer_size_even = -1;
-static int hf_mac_lte_control_sidelink_reserved = -1;
-static int hf_mac_lte_control_data_vol_power_headroom = -1;
-static int hf_mac_lte_control_data_vol_power_headroom_reserved = -1;
-static int hf_mac_lte_control_data_vol_power_headroom_level = -1;
-static int hf_mac_lte_control_data_vol_power_headroom_level_4_bits = -1;
-static int hf_mac_lte_control_data_vol_power_headroom_data_vol = -1;
-static int hf_mac_lte_control_recommended_bit_rate = -1;
-static int hf_mac_lte_control_recommended_bit_rate_lcid = -1;
-static int hf_mac_lte_control_recommended_bit_rate_dir = -1;
-static int hf_mac_lte_control_recommended_bit_rate_bit_rate = -1;
-static int hf_mac_lte_control_recommended_bit_rate_reserved = -1;
-static int hf_mac_lte_control_recommended_bit_rate_query = -1;
-static int hf_mac_lte_control_recommended_bit_rate_query_lcid = -1;
-static int hf_mac_lte_control_recommended_bit_rate_query_dir = -1;
-static int hf_mac_lte_control_recommended_bit_rate_query_bit_rate = -1;
-static int hf_mac_lte_control_recommended_bit_rate_query_reserved = -1;
-static int hf_mac_lte_control_activation_deactivation_csi_rs = -1;
-static int hf_mac_lte_control_activation_deactivation_csi_rs_a8 = -1;
-static int hf_mac_lte_control_activation_deactivation_csi_rs_a7 = -1;
-static int hf_mac_lte_control_activation_deactivation_csi_rs_a6 = -1;
-static int hf_mac_lte_control_activation_deactivation_csi_rs_a5 = -1;
-static int hf_mac_lte_control_activation_deactivation_csi_rs_a4 = -1;
-static int hf_mac_lte_control_activation_deactivation_csi_rs_a3 = -1;
-static int hf_mac_lte_control_activation_deactivation_csi_rs_a2 = -1;
-static int hf_mac_lte_control_activation_deactivation_csi_rs_a1 = -1;
-static int hf_mac_lte_control_activation_deactivation_pdcp_dup = -1;
-static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d8 = -1;
-static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d7 = -1;
-static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d6 = -1;
-static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d5 = -1;
-static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d4 = -1;
-static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d3 = -1;
-static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d2 = -1;
-static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d1 = -1;
-static int hf_mac_lte_control_hibernation = -1;
-static int hf_mac_lte_control_hibernation_c7 = -1;
-static int hf_mac_lte_control_hibernation_c6 = -1;
-static int hf_mac_lte_control_hibernation_c5 = -1;
-static int hf_mac_lte_control_hibernation_c4 = -1;
-static int hf_mac_lte_control_hibernation_c3 = -1;
-static int hf_mac_lte_control_hibernation_c2 = -1;
-static int hf_mac_lte_control_hibernation_c1 = -1;
-static int hf_mac_lte_control_hibernation_reserved = -1;
-static int hf_mac_lte_control_hibernation_c15 = -1;
-static int hf_mac_lte_control_hibernation_c14 = -1;
-static int hf_mac_lte_control_hibernation_c13 = -1;
-static int hf_mac_lte_control_hibernation_c12 = -1;
-static int hf_mac_lte_control_hibernation_c11 = -1;
-static int hf_mac_lte_control_hibernation_c10 = -1;
-static int hf_mac_lte_control_hibernation_c9 = -1;
-static int hf_mac_lte_control_hibernation_c8 = -1;
-static int hf_mac_lte_control_hibernation_c23 = -1;
-static int hf_mac_lte_control_hibernation_c22 = -1;
-static int hf_mac_lte_control_hibernation_c21 = -1;
-static int hf_mac_lte_control_hibernation_c20 = -1;
-static int hf_mac_lte_control_hibernation_c19 = -1;
-static int hf_mac_lte_control_hibernation_c18 = -1;
-static int hf_mac_lte_control_hibernation_c17 = -1;
-static int hf_mac_lte_control_hibernation_c16 = -1;
-static int hf_mac_lte_control_hibernation_c31 = -1;
-static int hf_mac_lte_control_hibernation_c30 = -1;
-static int hf_mac_lte_control_hibernation_c29 = -1;
-static int hf_mac_lte_control_hibernation_c28 = -1;
-static int hf_mac_lte_control_hibernation_c27 = -1;
-static int hf_mac_lte_control_hibernation_c26 = -1;
-static int hf_mac_lte_control_hibernation_c25 = -1;
-static int hf_mac_lte_control_hibernation_c24 = -1;
-static int hf_mac_lte_control_aul_confirmation = -1;
-static int hf_mac_lte_control_aul_confirmation_c7 = -1;
-static int hf_mac_lte_control_aul_confirmation_c6 = -1;
-static int hf_mac_lte_control_aul_confirmation_c5 = -1;
-static int hf_mac_lte_control_aul_confirmation_c4 = -1;
-static int hf_mac_lte_control_aul_confirmation_c3 = -1;
-static int hf_mac_lte_control_aul_confirmation_c2 = -1;
-static int hf_mac_lte_control_aul_confirmation_c1 = -1;
-static int hf_mac_lte_control_aul_confirmation_reserved = -1;
-static int hf_mac_lte_control_aul_confirmation_c15 = -1;
-static int hf_mac_lte_control_aul_confirmation_c14 = -1;
-static int hf_mac_lte_control_aul_confirmation_c13 = -1;
-static int hf_mac_lte_control_aul_confirmation_c12 = -1;
-static int hf_mac_lte_control_aul_confirmation_c11 = -1;
-static int hf_mac_lte_control_aul_confirmation_c10 = -1;
-static int hf_mac_lte_control_aul_confirmation_c9 = -1;
-static int hf_mac_lte_control_aul_confirmation_c8 = -1;
-static int hf_mac_lte_control_aul_confirmation_c23 = -1;
-static int hf_mac_lte_control_aul_confirmation_c22 = -1;
-static int hf_mac_lte_control_aul_confirmation_c21 = -1;
-static int hf_mac_lte_control_aul_confirmation_c20 = -1;
-static int hf_mac_lte_control_aul_confirmation_c19 = -1;
-static int hf_mac_lte_control_aul_confirmation_c18 = -1;
-static int hf_mac_lte_control_aul_confirmation_c17 = -1;
-static int hf_mac_lte_control_aul_confirmation_c16 = -1;
-static int hf_mac_lte_control_aul_confirmation_c31 = -1;
-static int hf_mac_lte_control_aul_confirmation_c30 = -1;
-static int hf_mac_lte_control_aul_confirmation_c29 = -1;
-static int hf_mac_lte_control_aul_confirmation_c28 = -1;
-static int hf_mac_lte_control_aul_confirmation_c27 = -1;
-static int hf_mac_lte_control_aul_confirmation_c26 = -1;
-static int hf_mac_lte_control_aul_confirmation_c25 = -1;
-static int hf_mac_lte_control_aul_confirmation_c24 = -1;
-
-
-
-static int hf_mac_lte_dl_harq_resend_original_frame = -1;
-static int hf_mac_lte_dl_harq_resend_time_since_previous_frame = -1;
-static int hf_mac_lte_dl_harq_resend_next_frame = -1;
-static int hf_mac_lte_dl_harq_resend_time_until_next_frame = -1;
-
-static int hf_mac_lte_ul_harq_resend_original_frame = -1;
-static int hf_mac_lte_ul_harq_resend_time_since_previous_frame = -1;
-static int hf_mac_lte_ul_harq_resend_next_frame = -1;
-static int hf_mac_lte_ul_harq_resend_time_until_next_frame = -1;
-
-static int hf_mac_lte_grant_answering_sr = -1;
-static int hf_mac_lte_failure_answering_sr = -1;
-static int hf_mac_lte_sr_leading_to_failure = -1;
-static int hf_mac_lte_sr_leading_to_grant = -1;
-static int hf_mac_lte_sr_time_since_request = -1;
-static int hf_mac_lte_sr_time_until_answer = -1;
-
-static int hf_mac_lte_drx_config = -1;
-static int hf_mac_lte_drx_config_frame_num = -1;
-static int hf_mac_lte_drx_config_previous_frame_num = -1;
-static int hf_mac_lte_drx_config_long_cycle = -1;
-static int hf_mac_lte_drx_config_cycle_offset = -1;
-static int hf_mac_lte_drx_config_onduration_timer = -1;
-static int hf_mac_lte_drx_config_inactivity_timer = -1;
-static int hf_mac_lte_drx_config_retransmission_timer = -1;
-static int hf_mac_lte_drx_config_short_cycle = -1;
-static int hf_mac_lte_drx_config_short_cycle_timer = -1;
-
-static int hf_mac_lte_drx_state = -1;
-static int hf_mac_lte_drx_state_long_cycle_offset = -1;
-/* static int hf_mac_lte_drx_state_long_cycle_on = -1; */
-static int hf_mac_lte_drx_state_short_cycle_offset = -1;
-/* static int hf_mac_lte_drx_state_short_cycle_on = -1; */
-static int hf_mac_lte_drx_state_inactivity_remaining = -1;
-static int hf_mac_lte_drx_state_onduration_remaining = -1;
-static int hf_mac_lte_drx_state_retransmission_remaining = -1;
-static int hf_mac_lte_drx_state_rtt_remaining = -1;
-static int hf_mac_lte_drx_state_short_cycle_remaining = -1;
+static int hf_mac_lte_control_bsr;
+static int hf_mac_lte_control_bsr_lcg_id;
+static int hf_mac_lte_control_short_bsr_buffer_size;
+static int hf_mac_lte_control_long_bsr_buffer_size_0;
+static int hf_mac_lte_control_long_bsr_buffer_size_1;
+static int hf_mac_lte_control_long_bsr_buffer_size_2;
+static int hf_mac_lte_control_long_bsr_buffer_size_3;
+static int hf_mac_lte_control_short_ext_bsr_buffer_size;
+static int hf_mac_lte_control_long_ext_bsr_buffer_size_0;
+static int hf_mac_lte_control_long_ext_bsr_buffer_size_1;
+static int hf_mac_lte_control_long_ext_bsr_buffer_size_2;
+static int hf_mac_lte_control_long_ext_bsr_buffer_size_3;
+static int hf_mac_lte_bsr_size_median;
+static int hf_mac_lte_control_crnti;
+static int hf_mac_lte_control_timing_advance;
+static int hf_mac_lte_control_timing_advance_group_id;
+static int hf_mac_lte_control_timing_advance_command;
+static int hf_mac_lte_control_timing_advance_value_reserved;
+static int hf_mac_lte_control_timing_advance_value;
+static int hf_mac_lte_control_as_rai;
+static int hf_mac_lte_control_as_rai_reserved;
+static int hf_mac_lte_control_as_rai_quality_report;
+static int hf_mac_lte_control_ue_contention_resolution;
+static int hf_mac_lte_control_ue_contention_resolution_identity;
+static int hf_mac_lte_control_ue_contention_resolution_msg3;
+static int hf_mac_lte_control_ue_contention_resolution_msg3_matched;
+static int hf_mac_lte_control_ue_contention_resolution_time_since_msg3;
+static int hf_mac_lte_control_msg3_to_cr;
+
+static int hf_mac_lte_control_power_headroom;
+static int hf_mac_lte_control_power_headroom_reserved;
+static int hf_mac_lte_control_power_headroom_level;
+static int hf_mac_lte_control_dual_conn_power_headroom;
+static int hf_mac_lte_control_dual_conn_power_headroom_c7;
+static int hf_mac_lte_control_dual_conn_power_headroom_c6;
+static int hf_mac_lte_control_dual_conn_power_headroom_c5;
+static int hf_mac_lte_control_dual_conn_power_headroom_c4;
+static int hf_mac_lte_control_dual_conn_power_headroom_c3;
+static int hf_mac_lte_control_dual_conn_power_headroom_c2;
+static int hf_mac_lte_control_dual_conn_power_headroom_c1;
+static int hf_mac_lte_control_dual_conn_power_headroom_c15;
+static int hf_mac_lte_control_dual_conn_power_headroom_c14;
+static int hf_mac_lte_control_dual_conn_power_headroom_c13;
+static int hf_mac_lte_control_dual_conn_power_headroom_c12;
+static int hf_mac_lte_control_dual_conn_power_headroom_c11;
+static int hf_mac_lte_control_dual_conn_power_headroom_c10;
+static int hf_mac_lte_control_dual_conn_power_headroom_c9;
+static int hf_mac_lte_control_dual_conn_power_headroom_c8;
+static int hf_mac_lte_control_dual_conn_power_headroom_c23;
+static int hf_mac_lte_control_dual_conn_power_headroom_c22;
+static int hf_mac_lte_control_dual_conn_power_headroom_c21;
+static int hf_mac_lte_control_dual_conn_power_headroom_c20;
+static int hf_mac_lte_control_dual_conn_power_headroom_c19;
+static int hf_mac_lte_control_dual_conn_power_headroom_c18;
+static int hf_mac_lte_control_dual_conn_power_headroom_c17;
+static int hf_mac_lte_control_dual_conn_power_headroom_c16;
+static int hf_mac_lte_control_dual_conn_power_headroom_c31;
+static int hf_mac_lte_control_dual_conn_power_headroom_c30;
+static int hf_mac_lte_control_dual_conn_power_headroom_c29;
+static int hf_mac_lte_control_dual_conn_power_headroom_c28;
+static int hf_mac_lte_control_dual_conn_power_headroom_c27;
+static int hf_mac_lte_control_dual_conn_power_headroom_c26;
+static int hf_mac_lte_control_dual_conn_power_headroom_c25;
+static int hf_mac_lte_control_dual_conn_power_headroom_c24;
+
+static int hf_mac_lte_control_dual_conn_power_headroom_reserved;
+static int hf_mac_lte_control_dual_conn_power_headroom_power_backoff;
+static int hf_mac_lte_control_dual_conn_power_headroom_value;
+static int hf_mac_lte_control_dual_conn_power_headroom_level;
+static int hf_mac_lte_control_dual_conn_power_headroom_reserved2;
+static int hf_mac_lte_control_dual_conn_power_headroom_pcmaxc;
+static int hf_mac_lte_control_ext_power_headroom;
+static int hf_mac_lte_control_ext_power_headroom_c7;
+static int hf_mac_lte_control_ext_power_headroom_c6;
+static int hf_mac_lte_control_ext_power_headroom_c5;
+static int hf_mac_lte_control_ext_power_headroom_c4;
+static int hf_mac_lte_control_ext_power_headroom_c3;
+static int hf_mac_lte_control_ext_power_headroom_c2;
+static int hf_mac_lte_control_ext_power_headroom_c1;
+static int hf_mac_lte_control_ext_power_headroom_reserved;
+static int hf_mac_lte_control_ext_power_headroom_power_backoff;
+static int hf_mac_lte_control_ext_power_headroom_value;
+static int hf_mac_lte_control_ext_power_headroom_level;
+static int hf_mac_lte_control_ext_power_headroom_reserved2;
+static int hf_mac_lte_control_ext_power_headroom_pcmaxc;
+static int hf_mac_lte_control_activation_deactivation;
+static int hf_mac_lte_control_activation_deactivation_c7;
+static int hf_mac_lte_control_activation_deactivation_c6;
+static int hf_mac_lte_control_activation_deactivation_c5;
+static int hf_mac_lte_control_activation_deactivation_c4;
+static int hf_mac_lte_control_activation_deactivation_c3;
+static int hf_mac_lte_control_activation_deactivation_c2;
+static int hf_mac_lte_control_activation_deactivation_c1;
+static int hf_mac_lte_control_activation_deactivation_reserved;
+static int hf_mac_lte_control_activation_deactivation_c15;
+static int hf_mac_lte_control_activation_deactivation_c14;
+static int hf_mac_lte_control_activation_deactivation_c13;
+static int hf_mac_lte_control_activation_deactivation_c12;
+static int hf_mac_lte_control_activation_deactivation_c11;
+static int hf_mac_lte_control_activation_deactivation_c10;
+static int hf_mac_lte_control_activation_deactivation_c9;
+static int hf_mac_lte_control_activation_deactivation_c8;
+static int hf_mac_lte_control_activation_deactivation_c23;
+static int hf_mac_lte_control_activation_deactivation_c22;
+static int hf_mac_lte_control_activation_deactivation_c21;
+static int hf_mac_lte_control_activation_deactivation_c20;
+static int hf_mac_lte_control_activation_deactivation_c19;
+static int hf_mac_lte_control_activation_deactivation_c18;
+static int hf_mac_lte_control_activation_deactivation_c17;
+static int hf_mac_lte_control_activation_deactivation_c16;
+static int hf_mac_lte_control_activation_deactivation_c31;
+static int hf_mac_lte_control_activation_deactivation_c30;
+static int hf_mac_lte_control_activation_deactivation_c29;
+static int hf_mac_lte_control_activation_deactivation_c28;
+static int hf_mac_lte_control_activation_deactivation_c27;
+static int hf_mac_lte_control_activation_deactivation_c26;
+static int hf_mac_lte_control_activation_deactivation_c25;
+static int hf_mac_lte_control_activation_deactivation_c24;
+static int hf_mac_lte_control_mch_scheduling_info;
+static int hf_mac_lte_control_mch_scheduling_info_lcid;
+static int hf_mac_lte_control_mch_scheduling_info_stop_mtch;
+static int hf_mac_lte_control_sidelink_bsr;
+static int hf_mac_lte_control_sidelink_bsr_destination_idx_odd;
+static int hf_mac_lte_control_sidelink_bsr_lcg_id_odd;
+static int hf_mac_lte_control_sidelink_bsr_buffer_size_odd;
+static int hf_mac_lte_control_sidelink_bsr_destination_idx_even;
+static int hf_mac_lte_control_sidelink_bsr_lcg_id_even;
+static int hf_mac_lte_control_sidelink_bsr_buffer_size_even;
+static int hf_mac_lte_control_sidelink_reserved;
+static int hf_mac_lte_control_data_vol_power_headroom;
+static int hf_mac_lte_control_data_vol_power_headroom_reserved;
+static int hf_mac_lte_control_data_vol_power_headroom_level;
+static int hf_mac_lte_control_data_vol_power_headroom_level_4_bits;
+static int hf_mac_lte_control_data_vol_power_headroom_data_vol;
+static int hf_mac_lte_control_recommended_bit_rate;
+static int hf_mac_lte_control_recommended_bit_rate_lcid;
+static int hf_mac_lte_control_recommended_bit_rate_dir;
+static int hf_mac_lte_control_recommended_bit_rate_bit_rate;
+static int hf_mac_lte_control_recommended_bit_rate_reserved;
+static int hf_mac_lte_control_recommended_bit_rate_query;
+static int hf_mac_lte_control_recommended_bit_rate_query_lcid;
+static int hf_mac_lte_control_recommended_bit_rate_query_dir;
+static int hf_mac_lte_control_recommended_bit_rate_query_bit_rate;
+static int hf_mac_lte_control_recommended_bit_rate_query_reserved;
+static int hf_mac_lte_control_activation_deactivation_csi_rs;
+static int hf_mac_lte_control_activation_deactivation_csi_rs_a8;
+static int hf_mac_lte_control_activation_deactivation_csi_rs_a7;
+static int hf_mac_lte_control_activation_deactivation_csi_rs_a6;
+static int hf_mac_lte_control_activation_deactivation_csi_rs_a5;
+static int hf_mac_lte_control_activation_deactivation_csi_rs_a4;
+static int hf_mac_lte_control_activation_deactivation_csi_rs_a3;
+static int hf_mac_lte_control_activation_deactivation_csi_rs_a2;
+static int hf_mac_lte_control_activation_deactivation_csi_rs_a1;
+static int hf_mac_lte_control_activation_deactivation_pdcp_dup;
+static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d8;
+static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d7;
+static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d6;
+static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d5;
+static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d4;
+static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d3;
+static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d2;
+static int hf_mac_lte_control_activation_deactivation_pdcp_dup_d1;
+static int hf_mac_lte_control_hibernation;
+static int hf_mac_lte_control_hibernation_c7;
+static int hf_mac_lte_control_hibernation_c6;
+static int hf_mac_lte_control_hibernation_c5;
+static int hf_mac_lte_control_hibernation_c4;
+static int hf_mac_lte_control_hibernation_c3;
+static int hf_mac_lte_control_hibernation_c2;
+static int hf_mac_lte_control_hibernation_c1;
+static int hf_mac_lte_control_hibernation_reserved;
+static int hf_mac_lte_control_hibernation_c15;
+static int hf_mac_lte_control_hibernation_c14;
+static int hf_mac_lte_control_hibernation_c13;
+static int hf_mac_lte_control_hibernation_c12;
+static int hf_mac_lte_control_hibernation_c11;
+static int hf_mac_lte_control_hibernation_c10;
+static int hf_mac_lte_control_hibernation_c9;
+static int hf_mac_lte_control_hibernation_c8;
+static int hf_mac_lte_control_hibernation_c23;
+static int hf_mac_lte_control_hibernation_c22;
+static int hf_mac_lte_control_hibernation_c21;
+static int hf_mac_lte_control_hibernation_c20;
+static int hf_mac_lte_control_hibernation_c19;
+static int hf_mac_lte_control_hibernation_c18;
+static int hf_mac_lte_control_hibernation_c17;
+static int hf_mac_lte_control_hibernation_c16;
+static int hf_mac_lte_control_hibernation_c31;
+static int hf_mac_lte_control_hibernation_c30;
+static int hf_mac_lte_control_hibernation_c29;
+static int hf_mac_lte_control_hibernation_c28;
+static int hf_mac_lte_control_hibernation_c27;
+static int hf_mac_lte_control_hibernation_c26;
+static int hf_mac_lte_control_hibernation_c25;
+static int hf_mac_lte_control_hibernation_c24;
+static int hf_mac_lte_control_aul_confirmation;
+static int hf_mac_lte_control_aul_confirmation_c7;
+static int hf_mac_lte_control_aul_confirmation_c6;
+static int hf_mac_lte_control_aul_confirmation_c5;
+static int hf_mac_lte_control_aul_confirmation_c4;
+static int hf_mac_lte_control_aul_confirmation_c3;
+static int hf_mac_lte_control_aul_confirmation_c2;
+static int hf_mac_lte_control_aul_confirmation_c1;
+static int hf_mac_lte_control_aul_confirmation_reserved;
+static int hf_mac_lte_control_aul_confirmation_c15;
+static int hf_mac_lte_control_aul_confirmation_c14;
+static int hf_mac_lte_control_aul_confirmation_c13;
+static int hf_mac_lte_control_aul_confirmation_c12;
+static int hf_mac_lte_control_aul_confirmation_c11;
+static int hf_mac_lte_control_aul_confirmation_c10;
+static int hf_mac_lte_control_aul_confirmation_c9;
+static int hf_mac_lte_control_aul_confirmation_c8;
+static int hf_mac_lte_control_aul_confirmation_c23;
+static int hf_mac_lte_control_aul_confirmation_c22;
+static int hf_mac_lte_control_aul_confirmation_c21;
+static int hf_mac_lte_control_aul_confirmation_c20;
+static int hf_mac_lte_control_aul_confirmation_c19;
+static int hf_mac_lte_control_aul_confirmation_c18;
+static int hf_mac_lte_control_aul_confirmation_c17;
+static int hf_mac_lte_control_aul_confirmation_c16;
+static int hf_mac_lte_control_aul_confirmation_c31;
+static int hf_mac_lte_control_aul_confirmation_c30;
+static int hf_mac_lte_control_aul_confirmation_c29;
+static int hf_mac_lte_control_aul_confirmation_c28;
+static int hf_mac_lte_control_aul_confirmation_c27;
+static int hf_mac_lte_control_aul_confirmation_c26;
+static int hf_mac_lte_control_aul_confirmation_c25;
+static int hf_mac_lte_control_aul_confirmation_c24;
+
+
+
+static int hf_mac_lte_dl_harq_resend_original_frame;
+static int hf_mac_lte_dl_harq_resend_time_since_previous_frame;
+static int hf_mac_lte_dl_harq_resend_next_frame;
+static int hf_mac_lte_dl_harq_resend_time_until_next_frame;
+
+static int hf_mac_lte_ul_harq_resend_original_frame;
+static int hf_mac_lte_ul_harq_resend_time_since_previous_frame;
+static int hf_mac_lte_ul_harq_resend_next_frame;
+static int hf_mac_lte_ul_harq_resend_time_until_next_frame;
+
+static int hf_mac_lte_grant_answering_sr;
+static int hf_mac_lte_failure_answering_sr;
+static int hf_mac_lte_sr_leading_to_failure;
+static int hf_mac_lte_sr_leading_to_grant;
+static int hf_mac_lte_sr_time_since_request;
+static int hf_mac_lte_sr_time_until_answer;
+
+static int hf_mac_lte_drx_config;
+static int hf_mac_lte_drx_config_frame_num;
+static int hf_mac_lte_drx_config_previous_frame_num;
+static int hf_mac_lte_drx_config_long_cycle;
+static int hf_mac_lte_drx_config_cycle_offset;
+static int hf_mac_lte_drx_config_onduration_timer;
+static int hf_mac_lte_drx_config_inactivity_timer;
+static int hf_mac_lte_drx_config_retransmission_timer;
+static int hf_mac_lte_drx_config_short_cycle;
+static int hf_mac_lte_drx_config_short_cycle_timer;
+
+static int hf_mac_lte_drx_state;
+static int hf_mac_lte_drx_state_long_cycle_offset;
+/* static int hf_mac_lte_drx_state_long_cycle_on; */
+static int hf_mac_lte_drx_state_short_cycle_offset;
+/* static int hf_mac_lte_drx_state_short_cycle_on; */
+static int hf_mac_lte_drx_state_inactivity_remaining;
+static int hf_mac_lte_drx_state_onduration_remaining;
+static int hf_mac_lte_drx_state_retransmission_remaining;
+static int hf_mac_lte_drx_state_rtt_remaining;
+static int hf_mac_lte_drx_state_short_cycle_remaining;
 
 /* Subtrees. */
-static int ett_mac_lte = -1;
-static int ett_mac_lte_context = -1;
-static int ett_mac_lte_phy_context = -1;
-static int ett_mac_lte_ulsch_header = -1;
-static int ett_mac_lte_dlsch_header = -1;
-static int ett_mac_lte_mch_header = -1;
-static int ett_mac_lte_sch_subheader = -1;
-static int ett_mac_lte_mch_subheader = -1;
-static int ett_mac_lte_slsch_header = -1;
-static int ett_mac_lte_slsch_subheader = -1;
-static int ett_mac_lte_rar_headers = -1;
-static int ett_mac_lte_rar_header = -1;
-static int ett_mac_lte_rar_body = -1;
-static int ett_mac_lte_rar_ul_grant = -1;
-static int ett_mac_lte_bsr = -1;
-static int ett_mac_lte_bch = -1;
-static int ett_mac_lte_pch = -1;
-static int ett_mac_lte_activation_deactivation = -1;
-static int ett_mac_lte_contention_resolution = -1;
-static int ett_mac_lte_timing_advance = -1;
-static int ett_mac_lte_power_headroom = -1;
-static int ett_mac_lte_dual_conn_power_headroom = -1;
-static int ett_mac_lte_dual_conn_power_headroom_cell = -1;
-static int ett_mac_lte_extended_power_headroom = -1;
-static int ett_mac_lte_extended_power_headroom_cell = -1;
-static int ett_mac_lte_mch_scheduling_info = -1;
-static int ett_mac_lte_oob = -1;
-static int ett_mac_lte_drx_config = -1;
-static int ett_mac_lte_drx_state = -1;
-static int ett_mac_lte_sidelink_bsr = -1;
-static int ett_mac_lte_data_vol_power_headroom = -1;
-static int ett_mac_lte_recommended_bit_rate = -1;
-static int ett_mac_lte_recommended_bit_rate_query = -1;
-static int ett_mac_lte_activation_deactivation_csi_rs = -1;
-static int ett_mac_lte_activation_deactivation_pdcp_dup = -1;
-static int ett_mac_lte_hibernation = -1;
-static int ett_mac_lte_aul_confirmation = -1;
-
-static expert_field ei_mac_lte_context_rnti_type = EI_INIT;
-static expert_field ei_mac_lte_lcid_unexpected = EI_INIT;
-static expert_field ei_mac_lte_ul_mac_frame_retx = EI_INIT;
-static expert_field ei_mac_lte_oob_sr_failure = EI_INIT;
-static expert_field ei_mac_lte_control_timing_advance_command_correction_needed = EI_INIT;
-static expert_field ei_mac_lte_sch_header_only_truncated = EI_INIT;
-static expert_field ei_mac_lte_mch_header_only_truncated = EI_INIT;
-static expert_field ei_mac_lte_slsch_header_only_truncated = EI_INIT;
-static expert_field ei_mac_lte_control_timing_advance_command_no_correction = EI_INIT;
-static expert_field ei_mac_lte_rar_timing_advance_not_zero_note = EI_INIT;
-static expert_field ei_mac_lte_padding_data_start_and_end = EI_INIT;
-static expert_field ei_mac_lte_bch_pdu = EI_INIT;
-static expert_field ei_mac_lte_rach_preamble_sent_note = EI_INIT;
-static expert_field ei_mac_lte_pch_pdu = EI_INIT;
-static expert_field ei_mac_lte_ul_harq_resend_next_frame = EI_INIT;
-static expert_field ei_mac_lte_control_bsr_multiple = EI_INIT;
-static expert_field ei_mac_lte_padding_data_multiple = EI_INIT;
-static expert_field ei_mac_lte_context_sysframe_number = EI_INIT;
-static expert_field ei_mac_lte_rar_bi_present = EI_INIT;
-static expert_field ei_mac_lte_control_element_size_invalid = EI_INIT;
-static expert_field ei_mac_lte_bsr_warn_threshold_exceeded = EI_INIT;
-static expert_field ei_mac_lte_too_many_subheaders = EI_INIT;
-static expert_field ei_mac_lte_oob_send_sr = EI_INIT;
-static expert_field ei_mac_lte_orig_tx_ul_frame_not_found = EI_INIT;
-static expert_field ei_mac_lte_control_ue_contention_resolution_msg3_matched = EI_INIT;
-static expert_field ei_mac_lte_sr_results_not_grant_or_failure_indication = EI_INIT;
-static expert_field ei_mac_lte_context_crc_status = EI_INIT;
-static expert_field ei_mac_lte_sr_invalid_event = EI_INIT;
-static expert_field ei_mac_lte_control_subheader_after_data_subheader = EI_INIT;
-static expert_field ei_mac_lte_rar_bi_not_first_subheader = EI_INIT;
-static expert_field ei_mac_lte_context_length = EI_INIT;
-static expert_field ei_mac_lte_reserved_not_zero = EI_INIT;
-static expert_field ei_mac_lte_rar_timing_advance_not_zero_warn = EI_INIT;
-static expert_field ei_mac_lte_dlsch_lcid = EI_INIT;
-static expert_field ei_mac_lte_padding_data_before_control_subheader = EI_INIT;
-static expert_field ei_mac_lte_rach_preamble_sent_warn = EI_INIT;
-static expert_field ei_mac_lte_no_per_frame_data = EI_INIT;
-static expert_field ei_mac_lte_sch_invalid_length = EI_INIT;
-static expert_field ei_mac_lte_mch_invalid_length = EI_INIT;
-static expert_field ei_mac_lte_invalid_sc_mcch_sc_mtch_subheader_multiplexing = EI_INIT;
-static expert_field ei_mac_lte_unknown_udp_framing_tag = EI_INIT;
+static int ett_mac_lte;
+static int ett_mac_lte_context;
+static int ett_mac_lte_phy_context;
+static int ett_mac_lte_ulsch_header;
+static int ett_mac_lte_dlsch_header;
+static int ett_mac_lte_mch_header;
+static int ett_mac_lte_sch_subheader;
+static int ett_mac_lte_mch_subheader;
+static int ett_mac_lte_slsch_header;
+static int ett_mac_lte_slsch_subheader;
+static int ett_mac_lte_rar_headers;
+static int ett_mac_lte_rar_header;
+static int ett_mac_lte_rar_body;
+static int ett_mac_lte_rar_ul_grant;
+static int ett_mac_lte_bsr;
+static int ett_mac_lte_bch;
+static int ett_mac_lte_pch;
+static int ett_mac_lte_activation_deactivation;
+static int ett_mac_lte_contention_resolution;
+static int ett_mac_lte_timing_advance;
+static int ett_mac_lte_power_headroom;
+static int ett_mac_lte_dual_conn_power_headroom;
+static int ett_mac_lte_dual_conn_power_headroom_cell;
+static int ett_mac_lte_extended_power_headroom;
+static int ett_mac_lte_extended_power_headroom_cell;
+static int ett_mac_lte_mch_scheduling_info;
+static int ett_mac_lte_oob;
+static int ett_mac_lte_drx_config;
+static int ett_mac_lte_drx_state;
+static int ett_mac_lte_sidelink_bsr;
+static int ett_mac_lte_data_vol_power_headroom;
+static int ett_mac_lte_recommended_bit_rate;
+static int ett_mac_lte_recommended_bit_rate_query;
+static int ett_mac_lte_activation_deactivation_csi_rs;
+static int ett_mac_lte_activation_deactivation_pdcp_dup;
+static int ett_mac_lte_hibernation;
+static int ett_mac_lte_aul_confirmation;
+
+static expert_field ei_mac_lte_context_rnti_type;
+static expert_field ei_mac_lte_lcid_unexpected;
+static expert_field ei_mac_lte_ul_mac_frame_retx;
+static expert_field ei_mac_lte_oob_sr_failure;
+static expert_field ei_mac_lte_control_timing_advance_command_correction_needed;
+static expert_field ei_mac_lte_sch_header_only_truncated;
+static expert_field ei_mac_lte_mch_header_only_truncated;
+static expert_field ei_mac_lte_slsch_header_only_truncated;
+static expert_field ei_mac_lte_control_timing_advance_command_no_correction;
+static expert_field ei_mac_lte_rar_timing_advance_not_zero_note;
+static expert_field ei_mac_lte_padding_data_start_and_end;
+static expert_field ei_mac_lte_bch_pdu;
+static expert_field ei_mac_lte_rach_preamble_sent_note;
+static expert_field ei_mac_lte_pch_pdu;
+static expert_field ei_mac_lte_ul_harq_resend_next_frame;
+static expert_field ei_mac_lte_control_bsr_multiple;
+static expert_field ei_mac_lte_padding_data_multiple;
+static expert_field ei_mac_lte_context_sysframe_number;
+static expert_field ei_mac_lte_rar_bi_present;
+static expert_field ei_mac_lte_control_element_size_invalid;
+static expert_field ei_mac_lte_bsr_warn_threshold_exceeded;
+static expert_field ei_mac_lte_too_many_subheaders;
+static expert_field ei_mac_lte_oob_send_sr;
+static expert_field ei_mac_lte_orig_tx_ul_frame_not_found;
+static expert_field ei_mac_lte_control_ue_contention_resolution_msg3_matched;
+static expert_field ei_mac_lte_sr_results_not_grant_or_failure_indication;
+static expert_field ei_mac_lte_context_crc_status;
+static expert_field ei_mac_lte_sr_invalid_event;
+static expert_field ei_mac_lte_control_subheader_after_data_subheader;
+static expert_field ei_mac_lte_rar_bi_not_first_subheader;
+static expert_field ei_mac_lte_context_length;
+static expert_field ei_mac_lte_reserved_not_zero;
+static expert_field ei_mac_lte_rar_timing_advance_not_zero_warn;
+static expert_field ei_mac_lte_dlsch_lcid;
+static expert_field ei_mac_lte_padding_data_before_control_subheader;
+static expert_field ei_mac_lte_rach_preamble_sent_warn;
+static expert_field ei_mac_lte_no_per_frame_data;
+static expert_field ei_mac_lte_sch_invalid_length;
+static expert_field ei_mac_lte_mch_invalid_length;
+static expert_field ei_mac_lte_invalid_sc_mcch_sc_mtch_subheader_multiplexing;
+static expert_field ei_mac_lte_unknown_udp_framing_tag;
 
 
 /* Constants and value strings */
diff --git a/epan/dissectors/packet-mac-nr-framed.c b/epan/dissectors/packet-mac-nr-framed.c
index 702a29187b..f09a7d686b 100644
--- a/epan/dissectors/packet-mac-nr-framed.c
+++ b/epan/dissectors/packet-mac-nr-framed.c
@@ -21,7 +21,7 @@
 void proto_register_mac_nr_framed(void);
 
 /* Initialize the protocol and registered fields. */
-static int proto_mac_nr_framed = -1;
+static int proto_mac_nr_framed;
 
 extern int proto_mac_nr;
 
diff --git a/epan/dissectors/packet-mac-nr.c b/epan/dissectors/packet-mac-nr.c
index 6d0d6f95ac..e3fac5ef4e 100644
--- a/epan/dissectors/packet-mac-nr.c
+++ b/epan/dissectors/packet-mac-nr.c
@@ -28,310 +28,310 @@ void proto_reg_handoff_mac_nr(void);
  */
 
 /* Initialize the protocol and registered fields. */
-int proto_mac_nr = -1;
+int proto_mac_nr;
 
 static dissector_handle_t rlc_nr_handle;
 
 /* Decoding context */
-static int hf_mac_nr_context = -1;
-static int hf_mac_nr_context_radio_type = -1;
-static int hf_mac_nr_context_direction = -1;
-static int hf_mac_nr_context_rnti = -1;
-static int hf_mac_nr_context_rnti_type = -1;
-static int hf_mac_nr_context_ueid = -1;
-static int hf_mac_nr_context_sysframe_number = -1;
-static int hf_mac_nr_context_slot_number = -1;
-static int hf_mac_nr_context_harqid = -1;
-static int hf_mac_nr_context_bcch_transport_channel = -1;
-static int hf_mac_nr_context_phr_type2_othercell = -1;
-
-
-static int hf_mac_nr_subheader = -1;
-static int hf_mac_nr_subheader_reserved = -1;
-static int hf_mac_nr_subheader_f = -1;
-static int hf_mac_nr_subheader_length_1_byte = -1;
-static int hf_mac_nr_subheader_length_2_bytes = -1;
-static int hf_mac_nr_lcid = -1;
-static int hf_mac_nr_ulsch_lcid = -1;
-static int hf_mac_nr_dlsch_lcid = -1;
-static int hf_mac_nr_dlsch_elcid_2oct = -1;
-static int hf_mac_nr_ulsch_elcid_2oct = -1;
-static int hf_mac_nr_dlsch_elcid_1oct = -1;
-static int hf_mac_nr_ulsch_elcid_1oct = -1;
-static int hf_mac_nr_dlsch_sdu = -1;
-static int hf_mac_nr_ulsch_sdu = -1;
-static int hf_mac_nr_bcch_pdu = -1;
-static int hf_mac_nr_pcch_pdu = -1;
-
-static int hf_mac_nr_control_crnti = -1;
-static int hf_mac_nr_control_ue_contention_resolution_identity = -1;
-static int hf_mac_nr_control_timing_advance_tagid = -1;
-static int hf_mac_nr_control_timing_advance_command = -1;
-static int hf_mac_nr_control_se_phr_reserved = -1;
-static int hf_mac_nr_control_se_phr_ph = -1;
-static int hf_mac_nr_control_se_phr_pcmax_f_c = -1;
-static int hf_mac_nr_control_recommended_bit_rate_query_lcid = -1;
-static int hf_mac_nr_control_recommended_bit_rate_query_dir = -1;
-static int hf_mac_nr_control_recommended_bit_rate_query_bit_rate = -1;
-static int hf_mac_nr_control_recommended_bit_rate_query_reserved = -1;
-static int hf_mac_nr_control_me_phr_c7_flag = -1;
-static int hf_mac_nr_control_me_phr_c6_flag = -1;
-static int hf_mac_nr_control_me_phr_c5_flag = -1;
-static int hf_mac_nr_control_me_phr_c4_flag = -1;
-static int hf_mac_nr_control_me_phr_c3_flag = -1;
-static int hf_mac_nr_control_me_phr_c2_flag = -1;
-static int hf_mac_nr_control_me_phr_c1_flag = -1;
-static int hf_mac_nr_control_me_phr_c15_flag = -1;
-static int hf_mac_nr_control_me_phr_c14_flag = -1;
-static int hf_mac_nr_control_me_phr_c13_flag = -1;
-static int hf_mac_nr_control_me_phr_c12_flag = -1;
-static int hf_mac_nr_control_me_phr_c11_flag = -1;
-static int hf_mac_nr_control_me_phr_c10_flag = -1;
-static int hf_mac_nr_control_me_phr_c9_flag = -1;
-static int hf_mac_nr_control_me_phr_c8_flag = -1;
-static int hf_mac_nr_control_me_phr_c23_flag = -1;
-static int hf_mac_nr_control_me_phr_c22_flag = -1;
-static int hf_mac_nr_control_me_phr_c21_flag = -1;
-static int hf_mac_nr_control_me_phr_c20_flag = -1;
-static int hf_mac_nr_control_me_phr_c19_flag = -1;
-static int hf_mac_nr_control_me_phr_c18_flag = -1;
-static int hf_mac_nr_control_me_phr_c17_flag = -1;
-static int hf_mac_nr_control_me_phr_c16_flag = -1;
-static int hf_mac_nr_control_me_phr_c31_flag = -1;
-static int hf_mac_nr_control_me_phr_c30_flag = -1;
-static int hf_mac_nr_control_me_phr_c29_flag = -1;
-static int hf_mac_nr_control_me_phr_c28_flag = -1;
-static int hf_mac_nr_control_me_phr_c27_flag = -1;
-static int hf_mac_nr_control_me_phr_c26_flag = -1;
-static int hf_mac_nr_control_me_phr_c25_flag = -1;
-static int hf_mac_nr_control_me_phr_c24_flag = -1;
-static int hf_mac_nr_control_me_phr_entry = -1;
-static int hf_mac_nr_control_me_phr_p = -1;
-static int hf_mac_nr_control_me_phr_v = -1;
-static int hf_mac_nr_control_me_phr_reserved_2 = -1;
-static int hf_mac_nr_control_me_phr_ph_type2_spcell = -1;
-static int hf_mac_nr_control_me_phr_ph_type1_pcell = -1;
-static int hf_mac_nr_control_me_phr_ph_c31 = -1;
-static int hf_mac_nr_control_me_phr_ph_c30 = -1;
-static int hf_mac_nr_control_me_phr_ph_c29 = -1;
-static int hf_mac_nr_control_me_phr_ph_c28 = -1;
-static int hf_mac_nr_control_me_phr_ph_c27 = -1;
-static int hf_mac_nr_control_me_phr_ph_c26 = -1;
-static int hf_mac_nr_control_me_phr_ph_c25 = -1;
-static int hf_mac_nr_control_me_phr_ph_c24 = -1;
-static int hf_mac_nr_control_me_phr_ph_c23 = -1;
-static int hf_mac_nr_control_me_phr_ph_c22 = -1;
-static int hf_mac_nr_control_me_phr_ph_c21 = -1;
-static int hf_mac_nr_control_me_phr_ph_c20 = -1;
-static int hf_mac_nr_control_me_phr_ph_c19 = -1;
-static int hf_mac_nr_control_me_phr_ph_c18 = -1;
-static int hf_mac_nr_control_me_phr_ph_c17 = -1;
-static int hf_mac_nr_control_me_phr_ph_c16 = -1;
-static int hf_mac_nr_control_me_phr_ph_c15 = -1;
-static int hf_mac_nr_control_me_phr_ph_c14 = -1;
-static int hf_mac_nr_control_me_phr_ph_c13 = -1;
-static int hf_mac_nr_control_me_phr_ph_c12 = -1;
-static int hf_mac_nr_control_me_phr_ph_c11 = -1;
-static int hf_mac_nr_control_me_phr_ph_c10 = -1;
-static int hf_mac_nr_control_me_phr_ph_c9 = -1;
-static int hf_mac_nr_control_me_phr_ph_c8 = -1;
-static int hf_mac_nr_control_me_phr_ph_c7 = -1;
-static int hf_mac_nr_control_me_phr_ph_c6 = -1;
-static int hf_mac_nr_control_me_phr_ph_c5 = -1;
-static int hf_mac_nr_control_me_phr_ph_c4 = -1;
-static int hf_mac_nr_control_me_phr_ph_c3 = -1;
-static int hf_mac_nr_control_me_phr_ph_c2 = -1;
-static int hf_mac_nr_control_me_phr_ph_c1 = -1;
-static int hf_mac_nr_control_me_phr_reserved = -1;
-static int hf_mac_nr_control_me_phr_pcmax_f_c_type2_spcell = -1;
-static int hf_mac_nr_control_me_phr_pcmax_f_c_type1_pcell = -1;
+static int hf_mac_nr_context;
+static int hf_mac_nr_context_radio_type;
+static int hf_mac_nr_context_direction;
+static int hf_mac_nr_context_rnti;
+static int hf_mac_nr_context_rnti_type;
+static int hf_mac_nr_context_ueid;
+static int hf_mac_nr_context_sysframe_number;
+static int hf_mac_nr_context_slot_number;
+static int hf_mac_nr_context_harqid;
+static int hf_mac_nr_context_bcch_transport_channel;
+static int hf_mac_nr_context_phr_type2_othercell;
+
+
+static int hf_mac_nr_subheader;
+static int hf_mac_nr_subheader_reserved;
+static int hf_mac_nr_subheader_f;
+static int hf_mac_nr_subheader_length_1_byte;
+static int hf_mac_nr_subheader_length_2_bytes;
+static int hf_mac_nr_lcid;
+static int hf_mac_nr_ulsch_lcid;
+static int hf_mac_nr_dlsch_lcid;
+static int hf_mac_nr_dlsch_elcid_2oct;
+static int hf_mac_nr_ulsch_elcid_2oct;
+static int hf_mac_nr_dlsch_elcid_1oct;
+static int hf_mac_nr_ulsch_elcid_1oct;
+static int hf_mac_nr_dlsch_sdu;
+static int hf_mac_nr_ulsch_sdu;
+static int hf_mac_nr_bcch_pdu;
+static int hf_mac_nr_pcch_pdu;
+
+static int hf_mac_nr_control_crnti;
+static int hf_mac_nr_control_ue_contention_resolution_identity;
+static int hf_mac_nr_control_timing_advance_tagid;
+static int hf_mac_nr_control_timing_advance_command;
+static int hf_mac_nr_control_se_phr_reserved;
+static int hf_mac_nr_control_se_phr_ph;
+static int hf_mac_nr_control_se_phr_pcmax_f_c;
+static int hf_mac_nr_control_recommended_bit_rate_query_lcid;
+static int hf_mac_nr_control_recommended_bit_rate_query_dir;
+static int hf_mac_nr_control_recommended_bit_rate_query_bit_rate;
+static int hf_mac_nr_control_recommended_bit_rate_query_reserved;
+static int hf_mac_nr_control_me_phr_c7_flag;
+static int hf_mac_nr_control_me_phr_c6_flag;
+static int hf_mac_nr_control_me_phr_c5_flag;
+static int hf_mac_nr_control_me_phr_c4_flag;
+static int hf_mac_nr_control_me_phr_c3_flag;
+static int hf_mac_nr_control_me_phr_c2_flag;
+static int hf_mac_nr_control_me_phr_c1_flag;
+static int hf_mac_nr_control_me_phr_c15_flag;
+static int hf_mac_nr_control_me_phr_c14_flag;
+static int hf_mac_nr_control_me_phr_c13_flag;
+static int hf_mac_nr_control_me_phr_c12_flag;
+static int hf_mac_nr_control_me_phr_c11_flag;
+static int hf_mac_nr_control_me_phr_c10_flag;
+static int hf_mac_nr_control_me_phr_c9_flag;
+static int hf_mac_nr_control_me_phr_c8_flag;
+static int hf_mac_nr_control_me_phr_c23_flag;
+static int hf_mac_nr_control_me_phr_c22_flag;
+static int hf_mac_nr_control_me_phr_c21_flag;
+static int hf_mac_nr_control_me_phr_c20_flag;
+static int hf_mac_nr_control_me_phr_c19_flag;
+static int hf_mac_nr_control_me_phr_c18_flag;
+static int hf_mac_nr_control_me_phr_c17_flag;
+static int hf_mac_nr_control_me_phr_c16_flag;
+static int hf_mac_nr_control_me_phr_c31_flag;
+static int hf_mac_nr_control_me_phr_c30_flag;
+static int hf_mac_nr_control_me_phr_c29_flag;
+static int hf_mac_nr_control_me_phr_c28_flag;
+static int hf_mac_nr_control_me_phr_c27_flag;
+static int hf_mac_nr_control_me_phr_c26_flag;
+static int hf_mac_nr_control_me_phr_c25_flag;
+static int hf_mac_nr_control_me_phr_c24_flag;
+static int hf_mac_nr_control_me_phr_entry;
+static int hf_mac_nr_control_me_phr_p;
+static int hf_mac_nr_control_me_phr_v;
+static int hf_mac_nr_control_me_phr_reserved_2;
+static int hf_mac_nr_control_me_phr_ph_type2_spcell;
+static int hf_mac_nr_control_me_phr_ph_type1_pcell;
+static int hf_mac_nr_control_me_phr_ph_c31;
+static int hf_mac_nr_control_me_phr_ph_c30;
+static int hf_mac_nr_control_me_phr_ph_c29;
+static int hf_mac_nr_control_me_phr_ph_c28;
+static int hf_mac_nr_control_me_phr_ph_c27;
+static int hf_mac_nr_control_me_phr_ph_c26;
+static int hf_mac_nr_control_me_phr_ph_c25;
+static int hf_mac_nr_control_me_phr_ph_c24;
+static int hf_mac_nr_control_me_phr_ph_c23;
+static int hf_mac_nr_control_me_phr_ph_c22;
+static int hf_mac_nr_control_me_phr_ph_c21;
+static int hf_mac_nr_control_me_phr_ph_c20;
+static int hf_mac_nr_control_me_phr_ph_c19;
+static int hf_mac_nr_control_me_phr_ph_c18;
+static int hf_mac_nr_control_me_phr_ph_c17;
+static int hf_mac_nr_control_me_phr_ph_c16;
+static int hf_mac_nr_control_me_phr_ph_c15;
+static int hf_mac_nr_control_me_phr_ph_c14;
+static int hf_mac_nr_control_me_phr_ph_c13;
+static int hf_mac_nr_control_me_phr_ph_c12;
+static int hf_mac_nr_control_me_phr_ph_c11;
+static int hf_mac_nr_control_me_phr_ph_c10;
+static int hf_mac_nr_control_me_phr_ph_c9;
+static int hf_mac_nr_control_me_phr_ph_c8;
+static int hf_mac_nr_control_me_phr_ph_c7;
+static int hf_mac_nr_control_me_phr_ph_c6;
+static int hf_mac_nr_control_me_phr_ph_c5;
+static int hf_mac_nr_control_me_phr_ph_c4;
+static int hf_mac_nr_control_me_phr_ph_c3;
+static int hf_mac_nr_control_me_phr_ph_c2;
+static int hf_mac_nr_control_me_phr_ph_c1;
+static int hf_mac_nr_control_me_phr_reserved;
+static int hf_mac_nr_control_me_phr_pcmax_f_c_type2_spcell;
+static int hf_mac_nr_control_me_phr_pcmax_f_c_type1_pcell;
 /* TODO: is it worth having separate fields for each SCellIndex for this field too? */
-static int hf_mac_nr_control_me_phr_pcmax_f_c_typeX = -1;
-static int hf_mac_nr_control_recommended_bit_rate_lcid = -1;
-static int hf_mac_nr_control_recommended_bit_rate_dir = -1;
-static int hf_mac_nr_control_recommended_bit_rate_bit_rate = -1;
-static int hf_mac_nr_control_recommended_bit_rate_reserved = -1;
-static int hf_mac_control_sp_zp_csi_rs_resource_set_act_deact_ad = -1;
-static int hf_mac_control_sp_zp_csi_rs_resource_set_act_deact_serving_cell_id = -1;
-static int hf_mac_control_sp_zp_csi_rs_resource_set_act_deact_bwp_id = -1;
-static int hf_mac_control_sp_zp_csi_rs_resource_set_act_deact_reserved_2 = -1;
-static int hf_mac_control_sp_zp_csi_rs_resource_set_act_deact_sp_zp_rs_resource_set_id = -1;
-static int hf_mac_nr_control_pucch_spatial_rel_act_deact_reserved = -1;
-static int hf_mac_nr_control_pucch_spatial_rel_act_deact_serving_cell_id = -1;
-static int hf_mac_nr_control_pucch_spatial_rel_act_deact_bwp_id = -1;
-static int hf_mac_nr_control_pucch_spatial_rel_act_deact_pucch_resource_id = -1;
-static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s8 = -1;
-static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s7 = -1;
-static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s6 = -1;
-static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s5 = -1;
-static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s4 = -1;
-static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s3 = -1;
-static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s2 = -1;
-static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s1 = -1;
-static int hf_mac_nr_control_sp_srs_act_deact_ad = -1;
-static int hf_mac_nr_control_sp_srs_act_deact_srs_resource_set_cell_id = -1;
-static int hf_mac_nr_control_sp_srs_act_deact_srs_resource_set_bwp_id = -1;
-static int hf_mac_nr_control_sp_srs_act_deact_reserved = -1;
-static int hf_mac_nr_control_sp_srs_act_deact_c = -1;
-static int hf_mac_nr_control_sp_srs_act_deact_sul = -1;
-static int hf_mac_nr_control_sp_srs_act_deact_sp_srs_resource_set_id = -1;
-static int hf_mac_nr_control_sp_srs_act_deact_f = -1;
-static int hf_mac_nr_control_sp_srs_act_deact_resource_id = -1;
-static int hf_mac_nr_control_sp_srs_act_deact_resource_id_ssb = -1;
-static int hf_mac_nr_control_sp_srs_act_deact_resource_serving_cell_id = -1;
-static int hf_mac_nr_control_sp_srs_act_deact_resource_bwp_id = -1;
-static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_reserved = -1;
-static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_serving_cell_id = -1;
-static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_bwp_id = -1;
-static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s7 = -1;
-static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s6 = -1;
-static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s5 = -1;
-static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s4 = -1;
-static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s3 = -1;
-static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s2 = -1;
-static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s1 = -1;
-static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s0 = -1;
-static int hf_mac_nr_control_tci_state_ind_for_ue_spec_pdcch_serving_cell_id = -1;
-static int hf_mac_nr_control_tci_state_ind_for_ue_spec_pdcch_coreset_id = -1;
-static int hf_mac_nr_control_tci_state_ind_for_ue_spec_pdcch_tci_state_id = -1;
-static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_reserved = -1;
-static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_serving_cell_id = -1;
-static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_bwp_id = -1;
-static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t7 = -1;
-static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t6 = -1;
-static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t5 = -1;
-static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t4 = -1;
-static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t3 = -1;
-static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t2 = -1;
-static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t1 = -1;
-static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t0 = -1;
-static int hf_mac_nr_control_aper_csi_trigger_state_subselect_reserved = -1;
-static int hf_mac_nr_control_aper_csi_trigger_state_subselect_serving_cell_id = -1;
-static int hf_mac_nr_control_aper_csi_trigger_state_subselect_bwp_id = -1;
-static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t7 = -1;
-static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t6 = -1;
-static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t5 = -1;
-static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t4 = -1;
-static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t3 = -1;
-static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t2 = -1;
-static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t1 = -1;
-static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t0 = -1;
-static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_ad = -1;
-static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_serving_cell_id = -1;
-static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_bwp_id = -1;
-static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_reserved = -1;
-static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_im = -1;
-static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_sp_csi_rs_res_set_id = -1;
-static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_reserved2 = -1;
-static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_sp_csi_im_res_set_id = -1;
-static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_reserved3 = -1;
-static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_tci_state_id = -1;
-static int hf_mac_nr_control_dupl_act_deact_drb7 = -1;
-static int hf_mac_nr_control_dupl_act_deact_drb6 = -1;
-static int hf_mac_nr_control_dupl_act_deact_drb5 = -1;
-static int hf_mac_nr_control_dupl_act_deact_drb4 = -1;
-static int hf_mac_nr_control_dupl_act_deact_drb3 = -1;
-static int hf_mac_nr_control_dupl_act_deact_drb2 = -1;
-static int hf_mac_nr_control_dupl_act_deact_drb1 = -1;
-static int hf_mac_nr_control_dupl_act_deact_reserved = -1;
-static int hf_mac_nr_control_scell_act_deact_cell7 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell6 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell5 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell4 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell3 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell2 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell1 = -1;
-static int hf_mac_nr_control_scell_act_deact_reserved = -1;
-static int hf_mac_nr_control_scell_act_deact_cell15 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell14 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell13 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell12 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell11 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell10 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell9 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell8 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell23 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell22 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell21 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell20 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell19 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell18 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell17 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell16 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell31 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell30 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell29 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell28 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell27 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell26 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell25 = -1;
-static int hf_mac_nr_control_scell_act_deact_cell24 = -1;
-static int hf_mac_nr_control_bsr_short_lcg = -1;
-static int hf_mac_nr_control_bsr_short_bs_lcg0 = -1;
-static int hf_mac_nr_control_bsr_short_bs_lcg1 = -1;
-static int hf_mac_nr_control_bsr_short_bs_lcg2 = -1;
-static int hf_mac_nr_control_bsr_short_bs_lcg3 = -1;
-static int hf_mac_nr_control_bsr_short_bs_lcg4 = -1;
-static int hf_mac_nr_control_bsr_short_bs_lcg5 = -1;
-static int hf_mac_nr_control_bsr_short_bs_lcg6 = -1;
-static int hf_mac_nr_control_bsr_short_bs_lcg7 = -1;
-static int hf_mac_nr_control_bsr_long_lcg7 = -1;
-static int hf_mac_nr_control_bsr_long_lcg6 = -1;
-static int hf_mac_nr_control_bsr_long_lcg5 = -1;
-static int hf_mac_nr_control_bsr_long_lcg4 = -1;
-static int hf_mac_nr_control_bsr_long_lcg3 = -1;
-static int hf_mac_nr_control_bsr_long_lcg2 = -1;
-static int hf_mac_nr_control_bsr_long_lcg1 = -1;
-static int hf_mac_nr_control_bsr_long_lcg0 = -1;
-static int hf_mac_nr_control_bsr_trunc_long_bs = -1;
-static int hf_mac_nr_control_bsr_long_bs_lcg0 = -1;
-static int hf_mac_nr_control_bsr_long_bs_lcg1 = -1;
-static int hf_mac_nr_control_bsr_long_bs_lcg2 = -1;
-static int hf_mac_nr_control_bsr_long_bs_lcg3 = -1;
-static int hf_mac_nr_control_bsr_long_bs_lcg4 = -1;
-static int hf_mac_nr_control_bsr_long_bs_lcg5 = -1;
-static int hf_mac_nr_control_bsr_long_bs_lcg6 = -1;
-static int hf_mac_nr_control_bsr_long_bs_lcg7 = -1;
-static int hf_mac_nr_control_timing_advance_report_reserved = -1;
-static int hf_mac_nr_control_timing_advance_report_ta = -1;
-
-static int hf_mac_nr_rar = -1;
-static int hf_mac_nr_rar_subheader = -1;
-static int hf_mac_nr_rar_e = -1;
-static int hf_mac_nr_rar_t = -1;
-static int hf_mac_nr_rar_reserved = -1;
-static int hf_mac_nr_rar_reserved1 = -1;
-
-static int hf_mac_nr_rar_bi = -1;
-static int hf_mac_nr_rar_rapid = -1;
-static int hf_mac_nr_rar_ta = -1;
-static int hf_mac_nr_rar_grant = -1;
-static int hf_mac_nr_rar_grant_hopping = -1;
-static int hf_mac_nr_rar_grant_fra = -1;
-static int hf_mac_nr_rar_grant_tsa = -1;
-static int hf_mac_nr_rar_grant_mcs = -1;
-static int hf_mac_nr_rar_grant_tcsp = -1;
-static int hf_mac_nr_rar_grant_csi = -1;
-
-static int hf_mac_nr_rar_temp_crnti = -1;
-
-static int hf_mac_nr_padding = -1;
-
-static int hf_mac_nr_differential_koffset = -1;
-static int hf_mac_nr_differential_koffset_reserved = -1;
+static int hf_mac_nr_control_me_phr_pcmax_f_c_typeX;
+static int hf_mac_nr_control_recommended_bit_rate_lcid;
+static int hf_mac_nr_control_recommended_bit_rate_dir;
+static int hf_mac_nr_control_recommended_bit_rate_bit_rate;
+static int hf_mac_nr_control_recommended_bit_rate_reserved;
+static int hf_mac_control_sp_zp_csi_rs_resource_set_act_deact_ad;
+static int hf_mac_control_sp_zp_csi_rs_resource_set_act_deact_serving_cell_id;
+static int hf_mac_control_sp_zp_csi_rs_resource_set_act_deact_bwp_id;
+static int hf_mac_control_sp_zp_csi_rs_resource_set_act_deact_reserved_2;
+static int hf_mac_control_sp_zp_csi_rs_resource_set_act_deact_sp_zp_rs_resource_set_id;
+static int hf_mac_nr_control_pucch_spatial_rel_act_deact_reserved;
+static int hf_mac_nr_control_pucch_spatial_rel_act_deact_serving_cell_id;
+static int hf_mac_nr_control_pucch_spatial_rel_act_deact_bwp_id;
+static int hf_mac_nr_control_pucch_spatial_rel_act_deact_pucch_resource_id;
+static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s8;
+static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s7;
+static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s6;
+static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s5;
+static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s4;
+static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s3;
+static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s2;
+static int hf_mac_nr_control_pucch_spatial_rel_act_deact_s1;
+static int hf_mac_nr_control_sp_srs_act_deact_ad;
+static int hf_mac_nr_control_sp_srs_act_deact_srs_resource_set_cell_id;
+static int hf_mac_nr_control_sp_srs_act_deact_srs_resource_set_bwp_id;
+static int hf_mac_nr_control_sp_srs_act_deact_reserved;
+static int hf_mac_nr_control_sp_srs_act_deact_c;
+static int hf_mac_nr_control_sp_srs_act_deact_sul;
+static int hf_mac_nr_control_sp_srs_act_deact_sp_srs_resource_set_id;
+static int hf_mac_nr_control_sp_srs_act_deact_f;
+static int hf_mac_nr_control_sp_srs_act_deact_resource_id;
+static int hf_mac_nr_control_sp_srs_act_deact_resource_id_ssb;
+static int hf_mac_nr_control_sp_srs_act_deact_resource_serving_cell_id;
+static int hf_mac_nr_control_sp_srs_act_deact_resource_bwp_id;
+static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_reserved;
+static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_serving_cell_id;
+static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_bwp_id;
+static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s7;
+static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s6;
+static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s5;
+static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s4;
+static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s3;
+static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s2;
+static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s1;
+static int hf_mac_nr_control_sp_csi_report_on_pucch_act_deact_s0;
+static int hf_mac_nr_control_tci_state_ind_for_ue_spec_pdcch_serving_cell_id;
+static int hf_mac_nr_control_tci_state_ind_for_ue_spec_pdcch_coreset_id;
+static int hf_mac_nr_control_tci_state_ind_for_ue_spec_pdcch_tci_state_id;
+static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_reserved;
+static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_serving_cell_id;
+static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_bwp_id;
+static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t7;
+static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t6;
+static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t5;
+static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t4;
+static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t3;
+static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t2;
+static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t1;
+static int hf_mac_nr_control_tci_states_act_deact_for_ue_spec_pdsch_t0;
+static int hf_mac_nr_control_aper_csi_trigger_state_subselect_reserved;
+static int hf_mac_nr_control_aper_csi_trigger_state_subselect_serving_cell_id;
+static int hf_mac_nr_control_aper_csi_trigger_state_subselect_bwp_id;
+static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t7;
+static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t6;
+static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t5;
+static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t4;
+static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t3;
+static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t2;
+static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t1;
+static int hf_mac_nr_control_aper_csi_trigger_state_subselect_t0;
+static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_ad;
+static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_serving_cell_id;
+static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_bwp_id;
+static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_reserved;
+static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_im;
+static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_sp_csi_rs_res_set_id;
+static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_reserved2;
+static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_sp_csi_im_res_set_id;
+static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_reserved3;
+static int hf_mac_nr_control_sp_csi_rs_csi_im_res_set_act_deact_tci_state_id;
+static int hf_mac_nr_control_dupl_act_deact_drb7;
+static int hf_mac_nr_control_dupl_act_deact_drb6;
+static int hf_mac_nr_control_dupl_act_deact_drb5;
+static int hf_mac_nr_control_dupl_act_deact_drb4;
+static int hf_mac_nr_control_dupl_act_deact_drb3;
+static int hf_mac_nr_control_dupl_act_deact_drb2;
+static int hf_mac_nr_control_dupl_act_deact_drb1;
+static int hf_mac_nr_control_dupl_act_deact_reserved;
+static int hf_mac_nr_control_scell_act_deact_cell7;
+static int hf_mac_nr_control_scell_act_deact_cell6;
+static int hf_mac_nr_control_scell_act_deact_cell5;
+static int hf_mac_nr_control_scell_act_deact_cell4;
+static int hf_mac_nr_control_scell_act_deact_cell3;
+static int hf_mac_nr_control_scell_act_deact_cell2;
+static int hf_mac_nr_control_scell_act_deact_cell1;
+static int hf_mac_nr_control_scell_act_deact_reserved;
+static int hf_mac_nr_control_scell_act_deact_cell15;
+static int hf_mac_nr_control_scell_act_deact_cell14;
+static int hf_mac_nr_control_scell_act_deact_cell13;
+static int hf_mac_nr_control_scell_act_deact_cell12;
+static int hf_mac_nr_control_scell_act_deact_cell11;
+static int hf_mac_nr_control_scell_act_deact_cell10;
+static int hf_mac_nr_control_scell_act_deact_cell9;
+static int hf_mac_nr_control_scell_act_deact_cell8;
+static int hf_mac_nr_control_scell_act_deact_cell23;
+static int hf_mac_nr_control_scell_act_deact_cell22;
+static int hf_mac_nr_control_scell_act_deact_cell21;
+static int hf_mac_nr_control_scell_act_deact_cell20;
+static int hf_mac_nr_control_scell_act_deact_cell19;
+static int hf_mac_nr_control_scell_act_deact_cell18;
+static int hf_mac_nr_control_scell_act_deact_cell17;
+static int hf_mac_nr_control_scell_act_deact_cell16;
+static int hf_mac_nr_control_scell_act_deact_cell31;
+static int hf_mac_nr_control_scell_act_deact_cell30;
+static int hf_mac_nr_control_scell_act_deact_cell29;
+static int hf_mac_nr_control_scell_act_deact_cell28;
+static int hf_mac_nr_control_scell_act_deact_cell27;
+static int hf_mac_nr_control_scell_act_deact_cell26;
+static int hf_mac_nr_control_scell_act_deact_cell25;
+static int hf_mac_nr_control_scell_act_deact_cell24;
+static int hf_mac_nr_control_bsr_short_lcg;
+static int hf_mac_nr_control_bsr_short_bs_lcg0;
+static int hf_mac_nr_control_bsr_short_bs_lcg1;
+static int hf_mac_nr_control_bsr_short_bs_lcg2;
+static int hf_mac_nr_control_bsr_short_bs_lcg3;
+static int hf_mac_nr_control_bsr_short_bs_lcg4;
+static int hf_mac_nr_control_bsr_short_bs_lcg5;
+static int hf_mac_nr_control_bsr_short_bs_lcg6;
+static int hf_mac_nr_control_bsr_short_bs_lcg7;
+static int hf_mac_nr_control_bsr_long_lcg7;
+static int hf_mac_nr_control_bsr_long_lcg6;
+static int hf_mac_nr_control_bsr_long_lcg5;
+static int hf_mac_nr_control_bsr_long_lcg4;
+static int hf_mac_nr_control_bsr_long_lcg3;
+static int hf_mac_nr_control_bsr_long_lcg2;
+static int hf_mac_nr_control_bsr_long_lcg1;
+static int hf_mac_nr_control_bsr_long_lcg0;
+static int hf_mac_nr_control_bsr_trunc_long_bs;
+static int hf_mac_nr_control_bsr_long_bs_lcg0;
+static int hf_mac_nr_control_bsr_long_bs_lcg1;
+static int hf_mac_nr_control_bsr_long_bs_lcg2;
+static int hf_mac_nr_control_bsr_long_bs_lcg3;
+static int hf_mac_nr_control_bsr_long_bs_lcg4;
+static int hf_mac_nr_control_bsr_long_bs_lcg5;
+static int hf_mac_nr_control_bsr_long_bs_lcg6;
+static int hf_mac_nr_control_bsr_long_bs_lcg7;
+static int hf_mac_nr_control_timing_advance_report_reserved;
+static int hf_mac_nr_control_timing_advance_report_ta;
+
+static int hf_mac_nr_rar;
+static int hf_mac_nr_rar_subheader;
+static int hf_mac_nr_rar_e;
+static int hf_mac_nr_rar_t;
+static int hf_mac_nr_rar_reserved;
+static int hf_mac_nr_rar_reserved1;
+
+static int hf_mac_nr_rar_bi;
+static int hf_mac_nr_rar_rapid;
+static int hf_mac_nr_rar_ta;
+static int hf_mac_nr_rar_grant;
+static int hf_mac_nr_rar_grant_hopping;
+static int hf_mac_nr_rar_grant_fra;
+static int hf_mac_nr_rar_grant_tsa;
+static int hf_mac_nr_rar_grant_mcs;
+static int hf_mac_nr_rar_grant_tcsp;
+static int hf_mac_nr_rar_grant_csi;
+
+static int hf_mac_nr_rar_temp_crnti;
+
+static int hf_mac_nr_padding;
+
+static int hf_mac_nr_differential_koffset;
+static int hf_mac_nr_differential_koffset_reserved;
 /* Subtrees. */
-static int ett_mac_nr = -1;
-static int ett_mac_nr_context = -1;
-static int ett_mac_nr_subheader = -1;
-static int ett_mac_nr_rar_subheader = -1;
-static int ett_mac_nr_rar_grant = -1;
-static int ett_mac_nr_me_phr_entry = -1;
-
-static expert_field ei_mac_nr_no_per_frame_data = EI_INIT;
-static expert_field ei_mac_nr_sdu_length_different_from_dissected = EI_INIT;
-static expert_field ei_mac_nr_unknown_udp_framing_tag = EI_INIT;
-static expert_field ei_mac_nr_dl_sch_control_subheader_after_data_subheader = EI_INIT;
-static expert_field ei_mac_nr_ul_sch_control_subheader_before_data_subheader = EI_INIT;
+static int ett_mac_nr;
+static int ett_mac_nr_context;
+static int ett_mac_nr_subheader;
+static int ett_mac_nr_rar_subheader;
+static int ett_mac_nr_rar_grant;
+static int ett_mac_nr_me_phr_entry;
+
+static expert_field ei_mac_nr_no_per_frame_data;
+static expert_field ei_mac_nr_sdu_length_different_from_dissected;
+static expert_field ei_mac_nr_unknown_udp_framing_tag;
+static expert_field ei_mac_nr_dl_sch_control_subheader_after_data_subheader;
+static expert_field ei_mac_nr_ul_sch_control_subheader_before_data_subheader;
 
 
 static dissector_handle_t nr_rrc_bcch_bch_handle;
diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c
index a1117a566b..787392eb93 100644
--- a/epan/dissectors/packet-maccontrol.c
+++ b/epan/dissectors/packet-maccontrol.c
@@ -27,44 +27,44 @@ void proto_reg_handoff_macctrl(void);
 
 static dissector_handle_t macctrl_handle;
 
-static int proto_macctrl = -1;
-
-static int hf_macctrl_opcode       = -1;
-static int hf_macctrl_timestamp    = -1;
-static int hf_macctrl_pause_time   = -1;
-static int hf_macctrl_cbfc_enbv    = -1;
-static int hf_macctrl_cbfc_enbv_c0 = -1;
-static int hf_macctrl_cbfc_enbv_c1 = -1;
-static int hf_macctrl_cbfc_enbv_c2 = -1;
-static int hf_macctrl_cbfc_enbv_c3 = -1;
-static int hf_macctrl_cbfc_enbv_c4 = -1;
-static int hf_macctrl_cbfc_enbv_c5 = -1;
-static int hf_macctrl_cbfc_enbv_c6 = -1;
-static int hf_macctrl_cbfc_enbv_c7 = -1;
-static int hf_macctrl_cbfc_pause_time_c0 = -1;
-static int hf_macctrl_cbfc_pause_time_c1 = -1;
-static int hf_macctrl_cbfc_pause_time_c2 = -1;
-static int hf_macctrl_cbfc_pause_time_c3 = -1;
-static int hf_macctrl_cbfc_pause_time_c4 = -1;
-static int hf_macctrl_cbfc_pause_time_c5 = -1;
-static int hf_macctrl_cbfc_pause_time_c6 = -1;
-static int hf_macctrl_cbfc_pause_time_c7 = -1;
-
-static int hf_reg_flags      = -1;
-static int hf_reg_req_grants = -1;
-static int hf_reg_grants     = -1;
-static int hf_reg_port       = -1;
-static int hf_reg_ack_port   = -1;
-static int hf_reg_time       = -1;
-static int hf_reg_ack_time   = -1;
-
-static gint ett_macctrl            = -1;
-static gint ett_macctrl_cbfc_enbv  = -1;
-static gint ett_macctrl_cbfc_pause_times = -1;
-
-static expert_field ei_macctrl_opcode = EI_INIT;
-static expert_field ei_macctrl_cbfc_enbv = EI_INIT;
-static expert_field ei_macctrl_dst_address = EI_INIT;
+static int proto_macctrl;
+
+static int hf_macctrl_opcode;
+static int hf_macctrl_timestamp;
+static int hf_macctrl_pause_time;
+static int hf_macctrl_cbfc_enbv;
+static int hf_macctrl_cbfc_enbv_c0;
+static int hf_macctrl_cbfc_enbv_c1;
+static int hf_macctrl_cbfc_enbv_c2;
+static int hf_macctrl_cbfc_enbv_c3;
+static int hf_macctrl_cbfc_enbv_c4;
+static int hf_macctrl_cbfc_enbv_c5;
+static int hf_macctrl_cbfc_enbv_c6;
+static int hf_macctrl_cbfc_enbv_c7;
+static int hf_macctrl_cbfc_pause_time_c0;
+static int hf_macctrl_cbfc_pause_time_c1;
+static int hf_macctrl_cbfc_pause_time_c2;
+static int hf_macctrl_cbfc_pause_time_c3;
+static int hf_macctrl_cbfc_pause_time_c4;
+static int hf_macctrl_cbfc_pause_time_c5;
+static int hf_macctrl_cbfc_pause_time_c6;
+static int hf_macctrl_cbfc_pause_time_c7;
+
+static int hf_reg_flags;
+static int hf_reg_req_grants;
+static int hf_reg_grants;
+static int hf_reg_port;
+static int hf_reg_ack_port;
+static int hf_reg_time;
+static int hf_reg_ack_time;
+
+static gint ett_macctrl;
+static gint ett_macctrl_cbfc_enbv;
+static gint ett_macctrl_cbfc_pause_times;
+
+static expert_field ei_macctrl_opcode;
+static expert_field ei_macctrl_cbfc_enbv;
+static expert_field ei_macctrl_dst_address;
 
 static int * const macctrl_cbfc_enbv_list[] = {
   &hf_macctrl_cbfc_enbv_c0,
diff --git a/epan/dissectors/packet-macsec.c b/epan/dissectors/packet-macsec.c
index 1122e14871..2a039fc8d0 100644
--- a/epan/dissectors/packet-macsec.c
+++ b/epan/dissectors/packet-macsec.c
@@ -31,26 +31,26 @@ static dissector_handle_t ethertype_handle;
 #define AN_MASK      0x03
 
 
-static int proto_macsec = -1;
-static int hf_macsec_TCI                   = -1;
-static int hf_macsec_TCI_V                 = -1;
-static int hf_macsec_TCI_ES                = -1;
-static int hf_macsec_TCI_SC                = -1;
-static int hf_macsec_TCI_SCB               = -1;
-static int hf_macsec_TCI_E                 = -1;
-static int hf_macsec_TCI_C                 = -1;
-static int hf_macsec_AN                    = -1;
-static int hf_macsec_SL                    = -1;
-static int hf_macsec_PN                    = -1;
-static int hf_macsec_SCI_system_identifier = -1;
-static int hf_macsec_SCI_port_identifier   = -1;
-static int hf_macsec_etype                 = -1;
-static int hf_macsec_eth_padding           = -1;
-static int hf_macsec_ICV                   = -1;
+static int proto_macsec;
+static int hf_macsec_TCI;
+static int hf_macsec_TCI_V;
+static int hf_macsec_TCI_ES;
+static int hf_macsec_TCI_SC;
+static int hf_macsec_TCI_SCB;
+static int hf_macsec_TCI_E;
+static int hf_macsec_TCI_C;
+static int hf_macsec_AN;
+static int hf_macsec_SL;
+static int hf_macsec_PN;
+static int hf_macsec_SCI_system_identifier;
+static int hf_macsec_SCI_port_identifier;
+static int hf_macsec_etype;
+static int hf_macsec_eth_padding;
+static int hf_macsec_ICV;
 
 /* Initialize the subtree pointers */
-static gint ett_macsec = -1;
-static gint ett_macsec_tci = -1;
+static gint ett_macsec;
+static gint ett_macsec_tci;
 
 /* Code to actually dissect the packets */
 static int dissect_macsec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) {
diff --git a/epan/dissectors/packet-mactelnet.c b/epan/dissectors/packet-mactelnet.c
index 569b84b3e0..cf763d5c58 100644
--- a/epan/dissectors/packet-mactelnet.c
+++ b/epan/dissectors/packet-mactelnet.c
@@ -25,24 +25,24 @@ void proto_reg_handoff_mactelnet(void);
 #define PROTO_TAG_MACTELNET "MAC-Telnet"
 
 /* Initialize the protocol and registered fields */
-static gint proto_mactelnet = -1;
-static gint hf_mactelnet_control_packet = -1;
-static gint hf_mactelnet_type = -1;
-static gint hf_mactelnet_protocolver = -1;
-static gint hf_mactelnet_source_mac = -1;
-static gint hf_mactelnet_destination_mac = -1;
-static gint hf_mactelnet_session_id = -1;
-static gint hf_mactelnet_client_type = -1;
-static gint hf_mactelnet_databytes = -1;
-static gint hf_mactelnet_datatype = -1;
-static gint hf_mactelnet_control = -1;
-static gint hf_mactelnet_control_length = -1;
-static gint hf_mactelnet_control_encryption_key = -1;
-static gint hf_mactelnet_control_password = -1;
-static gint hf_mactelnet_control_username = -1;
-static gint hf_mactelnet_control_terminal = -1;
-static gint hf_mactelnet_control_width = -1;
-static gint hf_mactelnet_control_height = -1;
+static gint proto_mactelnet;
+static gint hf_mactelnet_control_packet;
+static gint hf_mactelnet_type;
+static gint hf_mactelnet_protocolver;
+static gint hf_mactelnet_source_mac;
+static gint hf_mactelnet_destination_mac;
+static gint hf_mactelnet_session_id;
+static gint hf_mactelnet_client_type;
+static gint hf_mactelnet_databytes;
+static gint hf_mactelnet_datatype;
+static gint hf_mactelnet_control;
+static gint hf_mactelnet_control_length;
+static gint hf_mactelnet_control_encryption_key;
+static gint hf_mactelnet_control_password;
+static gint hf_mactelnet_control_username;
+static gint hf_mactelnet_control_terminal;
+static gint hf_mactelnet_control_width;
+static gint hf_mactelnet_control_height;
 
 #define MACTELNET_UDP_PORT      20561 /* Not IANA registered */
 
@@ -50,8 +50,8 @@ static gint hf_mactelnet_control_height = -1;
 static const guint32 control_packet = 0x563412FF;
 
 /* Initialize the subtree pointers */
-static gint ett_mactelnet = -1;
-static gint ett_mactelnet_control = -1;
+static gint ett_mactelnet;
+static gint ett_mactelnet_control;
 
 /* Packet types */
 static const value_string packettypenames[] = {
diff --git a/epan/dissectors/packet-manolito.c b/epan/dissectors/packet-manolito.c
index 5fd7d7709d..f000feb4a6 100644
--- a/epan/dissectors/packet-manolito.c
+++ b/epan/dissectors/packet-manolito.c
@@ -23,20 +23,20 @@ static dissector_handle_t manolito_handle;
 
 #define MANOLITO_PORT   41170 /* Not IANA registered */
 
-static int proto_manolito = -1;
+static int proto_manolito;
 
-static int hf_manolito_checksum = -1;
-static int hf_manolito_seqno = -1;
-static int hf_manolito_src = -1;
-static int hf_manolito_dest = -1;
-static int hf_manolito_options_short = -1;
-static int hf_manolito_options = -1;
-static int hf_manolito_string = -1;
-static int hf_manolito_integer = -1;
+static int hf_manolito_checksum;
+static int hf_manolito_seqno;
+static int hf_manolito_src;
+static int hf_manolito_dest;
+static int hf_manolito_options_short;
+static int hf_manolito_options;
+static int hf_manolito_string;
+static int hf_manolito_integer;
 
-static gint ett_manolito = -1;
+static gint ett_manolito;
 
-static expert_field ei_manolito_type = EI_INIT;
+static expert_field ei_manolito_type;
 
 #define MANOLITO_STRING  1
 #define MANOLITO_INTEGER 0
diff --git a/epan/dissectors/packet-marker.c b/epan/dissectors/packet-marker.c
index 6cb924d19c..03ad7b0cfd 100644
--- a/epan/dissectors/packet-marker.c
+++ b/epan/dissectors/packet-marker.c
@@ -38,24 +38,24 @@ static const value_string marker_vals[] = {
 };
 
 /* Initialise the protocol and registered fields */
-static int proto_marker = -1;
+static int proto_marker;
 
-static int hf_marker_version_number = -1;
-static int hf_marker_tlv_type = -1;
-static int hf_marker_tlv_length = -1;
-static int hf_marker_req_port = -1;
-static int hf_marker_req_system = -1;
-static int hf_marker_req_trans_id = -1;
-static int hf_marker_req_pad = -1;
-static int hf_marker_reserved = -1;
+static int hf_marker_version_number;
+static int hf_marker_tlv_type;
+static int hf_marker_tlv_length;
+static int hf_marker_req_port;
+static int hf_marker_req_system;
+static int hf_marker_req_trans_id;
+static int hf_marker_req_pad;
+static int hf_marker_reserved;
 
 /* Expert Items */
-static expert_field ei_marker_wrong_tlv_type = EI_INIT;
-static expert_field ei_marker_wrong_tlv_length = EI_INIT;
-static expert_field ei_marker_wrong_pad_value = EI_INIT;
+static expert_field ei_marker_wrong_tlv_type;
+static expert_field ei_marker_wrong_tlv_length;
+static expert_field ei_marker_wrong_pad_value;
 
 /* Initialise the subtree pointers */
-static gint ett_marker = -1;
+static gint ett_marker;
 
 static int
 dissect_marker(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-matter.c b/epan/dissectors/packet-matter.c
index 6eec8155b3..a134b67605 100644
--- a/epan/dissectors/packet-matter.c
+++ b/epan/dissectors/packet-matter.c
@@ -29,43 +29,43 @@ void proto_register_matter(void);
 /* Initialize the protocol and registered fields */
 static dissector_handle_t matter_handle;
 
-static int proto_matter = -1;
-static int hf_message_flags = -1;
-static int hf_message_version = -1;
-static int hf_message_has_source = -1;
-static int hf_message_dsiz = -1;
-static int hf_message_session_id = -1;
-static int hf_message_security_flags = -1;
-static int hf_message_flag_privacy = -1;
-static int hf_message_flag_control = -1;
-static int hf_message_flag_extensions = -1;
-static int hf_message_session_type = -1;
-static int hf_message_counter = -1;
-static int hf_message_src_id = -1;
-static int hf_message_dest_id = -1;
-static int hf_message_privacy_header = -1;
-
-static int hf_payload = -1;
-static int hf_payload_exchange_flags = -1;
-static int hf_payload_flag_initiator = -1;
-static int hf_payload_flag_ack = -1;
-static int hf_payload_flag_reliability = -1;
-static int hf_payload_flag_secured_extensions = -1;
-static int hf_payload_flag_vendor = -1;
-static int hf_payload_protocol_opcode = -1;
-static int hf_payload_exchange_id = -1;
-static int hf_payload_protocol_vendor_id = -1;
-static int hf_payload_protocol_id = -1;
-static int hf_payload_ack_counter = -1;
-static int hf_payload_secured_ext_length = -1;
-static int hf_payload_secured_ext = -1;
-static int hf_payload_application = -1;
-
-static gint ett_matter = -1;
-static gint ett_message_flags = -1;
-static gint ett_security_flags = -1;
-static gint ett_payload = -1;
-static gint ett_exchange_flags = -1;
+static int proto_matter;
+static int hf_message_flags;
+static int hf_message_version;
+static int hf_message_has_source;
+static int hf_message_dsiz;
+static int hf_message_session_id;
+static int hf_message_security_flags;
+static int hf_message_flag_privacy;
+static int hf_message_flag_control;
+static int hf_message_flag_extensions;
+static int hf_message_session_type;
+static int hf_message_counter;
+static int hf_message_src_id;
+static int hf_message_dest_id;
+static int hf_message_privacy_header;
+
+static int hf_payload;
+static int hf_payload_exchange_flags;
+static int hf_payload_flag_initiator;
+static int hf_payload_flag_ack;
+static int hf_payload_flag_reliability;
+static int hf_payload_flag_secured_extensions;
+static int hf_payload_flag_vendor;
+static int hf_payload_protocol_opcode;
+static int hf_payload_exchange_id;
+static int hf_payload_protocol_vendor_id;
+static int hf_payload_protocol_id;
+static int hf_payload_ack_counter;
+static int hf_payload_secured_ext_length;
+static int hf_payload_secured_ext;
+static int hf_payload_application;
+
+static gint ett_matter;
+static gint ett_message_flags;
+static gint ett_security_flags;
+static gint ett_payload;
+static gint ett_exchange_flags;
 
 /* message flags + session ID + security flags + counter */
 #define MATTER_MIN_LENGTH 8
diff --git a/epan/dissectors/packet-mausb.c b/epan/dissectors/packet-mausb.c
index 5015da29c1..79587e2c7e 100644
--- a/epan/dissectors/packet-mausb.c
+++ b/epan/dissectors/packet-mausb.c
@@ -29,16 +29,16 @@ static dissector_handle_t mausb_tcp_handle;
 static dissector_handle_t mausb_pkt_handle;
 
 /* For SNAP Packets */
-static int hf_llc_mausb_pid = -1;
+static int hf_llc_mausb_pid;
 
 /* Initialize the protocol and registered fields */
-static int proto_mausb = -1;
-static int hf_mausb_version = -1;
-static int hf_mausb_flags = -1;
-static int hf_mausb_flag_host = -1;
-static int hf_mausb_flag_retry = -1;
-static int hf_mausb_flag_timestamp = -1;
-static int hf_mausb_flag_reserved = -1;
+static int proto_mausb;
+static int hf_mausb_version;
+static int hf_mausb_flags;
+static int hf_mausb_flag_host;
+static int hf_mausb_flag_retry;
+static int hf_mausb_flag_timestamp;
+static int hf_mausb_flag_reserved;
 
 
 static int * const mausb_flag_fields[] = {
@@ -49,83 +49,83 @@ static int * const mausb_flag_fields[] = {
     NULL
 };
 
-static int hf_mausb_type = -1;
-static int hf_mausb_length = -1;
-static int hf_mausb_dev_handle = -1;
-static int hf_mausb_ep_handle = -1;
-static int hf_mausb_ep_handle_d = -1;
-static int hf_mausb_ep_handle_ep_num = -1;
-static int hf_mausb_ep_handle_dev_addr = -1;
-static int hf_mausb_ep_handle_bus_num = -1;
-static int hf_mausb_ma_dev_addr = -1;
-static int hf_mausb_ssid = -1;
-static int hf_mausb_status = -1;
+static int hf_mausb_type;
+static int hf_mausb_length;
+static int hf_mausb_dev_handle;
+static int hf_mausb_ep_handle;
+static int hf_mausb_ep_handle_d;
+static int hf_mausb_ep_handle_ep_num;
+static int hf_mausb_ep_handle_dev_addr;
+static int hf_mausb_ep_handle_bus_num;
+static int hf_mausb_ma_dev_addr;
+static int hf_mausb_ssid;
+static int hf_mausb_status;
 
 /* management packet specific */
-static int hf_mausb_token = -1;
-static int hf_mausb_mgmt_pad = -1;
-static int hf_mausb_mgmt_ep_handle_num = -1;
-static int hf_mausb_mgmt_ep_handle_pad = -1;
-static int hf_mausb_mgmt_ep_des_num = -1;
-static int hf_mausb_mgmt_ep_des_size = -1;
-static int hf_mausb_mgmt_ep_des_pad = -1;
-static int hf_mausb_mgmt_type_spec = -1;
-static int hf_mausb_mgmt_type_spec_generic = -1;
+static int hf_mausb_token;
+static int hf_mausb_mgmt_pad;
+static int hf_mausb_mgmt_ep_handle_num;
+static int hf_mausb_mgmt_ep_handle_pad;
+static int hf_mausb_mgmt_ep_des_num;
+static int hf_mausb_mgmt_ep_des_size;
+static int hf_mausb_mgmt_ep_des_pad;
+static int hf_mausb_mgmt_type_spec;
+static int hf_mausb_mgmt_type_spec_generic;
 
 /* CapResp packet specific */
-static int hf_mausb_cap_resp_num_ep = -1;
-static int hf_mausb_cap_resp_num_dev = -1;
-static int hf_mausb_cap_resp_num_stream = -1;
-static int hf_mausb_cap_resp_dev_type = -1;
-static int hf_mausb_cap_resp_desc_count = -1;
-static int hf_mausb_cap_resp_desc_len = -1;
-static int hf_mausb_cap_resp_transfer_req = -1;
-static int hf_mausb_cap_resp_mgmt_req = -1;
-static int hf_mausb_cap_resp_rsvd = -1;
-
-static int hf_mausb_dev_cap_len = -1;
-static int hf_mausb_dev_cap_type = -1;
-static int hf_mausb_dev_cap_generic = -1;
+static int hf_mausb_cap_resp_num_ep;
+static int hf_mausb_cap_resp_num_dev;
+static int hf_mausb_cap_resp_num_stream;
+static int hf_mausb_cap_resp_dev_type;
+static int hf_mausb_cap_resp_desc_count;
+static int hf_mausb_cap_resp_desc_len;
+static int hf_mausb_cap_resp_transfer_req;
+static int hf_mausb_cap_resp_mgmt_req;
+static int hf_mausb_cap_resp_rsvd;
+
+static int hf_mausb_dev_cap_len;
+static int hf_mausb_dev_cap_type;
+static int hf_mausb_dev_cap_generic;
 
 /* EPHandleReq & Resp packet specific */
-static int hf_mausb_ep_handle_req_pad = -1;
-static int hf_mausb_ep_handle_resp_dir = -1;
-static int hf_mausb_ep_handle_resp_iso = -1;
-static int hf_mausb_ep_handle_resp_lman = -1;
-static int hf_mausb_ep_handle_resp_valid = -1;
-static int hf_mausb_ep_handle_resp_ccu = -1;
-static int hf_mausb_ep_handle_resp_buf_size = -1;
-static int hf_mausb_ep_handle_resp_iso_prog_dly = -1;
-static int hf_mausb_ep_handle_resp_iso_resp_dly = -1;
+static int hf_mausb_ep_handle_req_pad;
+static int hf_mausb_ep_handle_resp_dir;
+static int hf_mausb_ep_handle_resp_iso;
+static int hf_mausb_ep_handle_resp_lman;
+static int hf_mausb_ep_handle_resp_valid;
+static int hf_mausb_ep_handle_resp_ccu;
+static int hf_mausb_ep_handle_resp_buf_size;
+static int hf_mausb_ep_handle_resp_iso_prog_dly;
+static int hf_mausb_ep_handle_resp_iso_resp_dly;
 
 /* (Clear/Cancel)TransferReq & Resp packet specific */
-static int hf_mausb_clear_transfers_info_block = -1;
-static int hf_mausb_clear_transfers_status_block = -1;
-static int hf_mausb_cancel_transfer_rsvd = -1;
-static int hf_mausb_clear_transfers_req_num = -1;
-static int hf_mausb_clear_transfers_req_rsvd = -1;
-static int hf_mausb_clear_transfers_resp_num = -1;
-static int hf_mausb_clear_transfers_resp_rsvd = -1;
-static int hf_mausb_cancel_transfer_status = -1;
-static int hf_mausb_cancel_transfer_rsvd_2 = -1;
-static int hf_mausb_clear_transfers_status = -1;
-static int hf_mausb_clear_transfers_partial = -1;
-static int hf_mausb_clear_transfers_start_req_id = -1;
-static int hf_mausb_clear_transfers_last_req_id = -1;
-static int hf_mausb_clear_transfers_req_block_rsvd = -1;
-static int hf_mausb_clear_transfers_resp_block_rsvd = -1;
-static int hf_mausb_cancel_transfer_seq_num = -1;
-static int hf_mausb_cancel_transfer_byte_offset = -1;
+static int hf_mausb_clear_transfers_info_block;
+static int hf_mausb_clear_transfers_status_block;
+static int hf_mausb_cancel_transfer_rsvd;
+static int hf_mausb_clear_transfers_req_num;
+static int hf_mausb_clear_transfers_req_rsvd;
+static int hf_mausb_clear_transfers_resp_num;
+static int hf_mausb_clear_transfers_resp_rsvd;
+static int hf_mausb_cancel_transfer_status;
+static int hf_mausb_cancel_transfer_rsvd_2;
+static int hf_mausb_clear_transfers_status;
+static int hf_mausb_clear_transfers_partial;
+static int hf_mausb_clear_transfers_start_req_id;
+static int hf_mausb_clear_transfers_last_req_id;
+static int hf_mausb_clear_transfers_req_block_rsvd;
+static int hf_mausb_clear_transfers_resp_block_rsvd;
+static int hf_mausb_cancel_transfer_seq_num;
+static int hf_mausb_cancel_transfer_byte_offset;
 
 /* data packet specific */
-static int hf_mausb_eps = -1;
-static int hf_mausb_eps_rsvd = -1;
-static int hf_mausb_tflags = -1;
-static int hf_mausb_tflag_arq = -1;
-static int hf_mausb_tflag_neg = -1;
-static int hf_mausb_tflag_eot = -1;
-static int hf_mausb_tflag_type = -1;
-static int hf_mausb_tflag_rsvd = -1;
+static int hf_mausb_eps;
+static int hf_mausb_eps_rsvd;
+static int hf_mausb_tflags;
+static int hf_mausb_tflag_arq;
+static int hf_mausb_tflag_neg;
+static int hf_mausb_tflag_eot;
+static int hf_mausb_tflag_type;
+static int hf_mausb_tflag_rsvd;
 
 static int * const mausb_tflag_fields[] = {
     &hf_mausb_tflag_arq,
@@ -136,11 +136,11 @@ static int * const mausb_tflag_fields[] = {
     NULL
 };
 
-static int hf_mausb_num_iso_hdr = -1;
-static int hf_mausb_iflags = -1;
-static int hf_mausb_iflag_mtd = -1;
-static int hf_mausb_iflag_hdr_format = -1;
-static int hf_mausb_iflag_asap = -1;
+static int hf_mausb_num_iso_hdr;
+static int hf_mausb_iflags;
+static int hf_mausb_iflag_mtd;
+static int hf_mausb_iflag_hdr_format;
+static int hf_mausb_iflag_asap;
 
 static int * const mausb_iflag_fields[] = {
     &hf_mausb_iflag_mtd,
@@ -149,32 +149,32 @@ static int * const mausb_iflag_fields[] = {
     NULL
 };
 
-static int hf_mausb_stream_id = -1;
-static int hf_mausb_seq_num = -1;
-static int hf_mausb_req_id = -1;
-static int hf_mausb_present_time = -1;
-static int hf_mausb_uframe = -1;
-static int hf_mausb_frame = -1;
-static int hf_mausb_num_segs = -1;
+static int hf_mausb_stream_id;
+static int hf_mausb_seq_num;
+static int hf_mausb_req_id;
+static int hf_mausb_present_time;
+static int hf_mausb_uframe;
+static int hf_mausb_frame;
+static int hf_mausb_num_segs;
 
-static int hf_mausb_timestamp = -1;
-static int hf_mausb_delta = -1;
-static int hf_mausb_nom_interval = -1;
+static int hf_mausb_timestamp;
+static int hf_mausb_delta;
+static int hf_mausb_nom_interval;
 
 
 
-static int hf_mausb_mtd = -1;
-static int hf_mausb_rem_size_credit = -1;
+static int hf_mausb_mtd;
+static int hf_mausb_rem_size_credit;
 
 /* expert info fields */
-static expert_field ei_ep_handle_len = EI_INIT;
-static expert_field ei_len = EI_INIT;
-static expert_field ei_mgmt_type_undef = EI_INIT;
-static expert_field ei_mgmt_type_spec_len_long = EI_INIT;
-static expert_field ei_mgmt_type_spec_len_short = EI_INIT;
-static expert_field ei_dev_cap_len = EI_INIT;
-static expert_field ei_dev_cap_resp_desc_len = EI_INIT;
-static expert_field ei_cap_resp_desc_len = EI_INIT;
+static expert_field ei_ep_handle_len;
+static expert_field ei_len;
+static expert_field ei_mgmt_type_undef;
+static expert_field ei_mgmt_type_spec_len_long;
+static expert_field ei_mgmt_type_spec_len_short;
+static expert_field ei_dev_cap_len;
+static expert_field ei_dev_cap_resp_desc_len;
+static expert_field ei_cap_resp_desc_len;
 
 /* MAUSB Version, per 6.2.1.1 */
 #define MAUSB_VERSION_1_0     0x0
@@ -668,16 +668,16 @@ static guint mausb_get_pkt_len(packet_info *pinfo _U_, tvbuff_t *tvb,
 }
 
 /* Initialize the subtree pointers */
-static gint ett_mausb = -1;
-static gint ett_mausb_flags = -1;
-static gint ett_mausb_ep_handle = -1;
-static gint ett_mausb_tflags = -1;
-static gint ett_mausb_iflags = -1;
-static gint ett_mausb_present_time = -1;
-static gint ett_mausb_timestamp = -1;
-static gint ett_mgmt = -1;
-static gint ett_dev_cap = -1;
-static gint ett_clear_transfers_block = -1;
+static gint ett_mausb;
+static gint ett_mausb_flags;
+static gint ett_mausb_ep_handle;
+static gint ett_mausb_tflags;
+static gint ett_mausb_iflags;
+static gint ett_mausb_present_time;
+static gint ett_mausb_timestamp;
+static gint ett_mgmt;
+static gint ett_dev_cap;
+static gint ett_clear_transfers_block;
 
 
 #define USB_DT_EP_SIZE              7
diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c
index 1b59496817..a1bc95273e 100644
--- a/epan/dissectors/packet-mbim.c
+++ b/epan/dissectors/packet-mbim.c
@@ -55,1057 +55,1057 @@ void proto_register_mbim(void);
 void proto_reg_handoff_mbim(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_mbim = -1;
-static int hf_mbim_control = -1;
-static int hf_mbim_header_message_type = -1;
-static int hf_mbim_header_message_length = -1;
-static int hf_mbim_header_transaction_id = -1;
-static int hf_mbim_fragment_total = -1;
-static int hf_mbim_fragment_current = -1;
-static int hf_mbim_max_ctrl_transfer = -1;
-static int hf_mbim_device_service_id = -1;
-static int hf_mbim_uuid_basic_connect_cid = -1;
-static int hf_mbim_uuid_sms_cid = -1;
-static int hf_mbim_uuid_ussd_cid = -1;
-static int hf_mbim_uuid_phonebook_cid = -1;
-static int hf_mbim_uuid_stk_cid = -1;
-static int hf_mbim_uuid_auth_cid = -1;
-static int hf_mbim_uuid_dss_cid = -1;
-static int hf_mbim_uuid_multicarrier_cid = -1;
-static int hf_mbim_uuid_ms_hostshutdown_cid = -1;
-static int hf_mbim_uuid_msfwid_cid = -1;
-static int hf_mbim_uuid_qmi_cid = -1;
-static int hf_mbim_uuid_intel_fwusvc_cid = -1;
-static int hf_mbim_uuid_intel_dptf_cid = -1;
-static int hf_mbim_uuid_intel_sar_cid = -1;
-static int hf_mbim_uuid_intel_act_cid = -1;
-static int hf_mbim_uuid_intel_trcsvc_cid = -1;
-static int hf_mbim_uuid_intel_nrtc_cid = -1;
-static int hf_mbim_uuid_intel_usb_profile_cid = -1;
-static int hf_mbim_uuid_intel_ciq_cid = -1;
-static int hf_mbim_uuid_atds_cid = -1;
-static int hf_mbim_uuid_multiflow_cid = -1;
-static int hf_mbim_uuid_basic_connect_extensions_cid = -1;
-static int hf_mbim_uuid_ms_sarcontrol_cid = -1;
-static int hf_mbim_uuid_ms_uicc_low_level_cid = -1;
-static int hf_mbim_uuid_ms_voice_extensions_cid = -1;
-static int hf_mbim_cid = -1;
-static int hf_mbim_command_type = -1;
-static int hf_mbim_info_buffer_len = -1;
-static int hf_mbim_info_buffer = -1;
-static int hf_mbim_error_status_code = -1;
-static int hf_mbim_status = -1;
-static int hf_mbim_tlv_ie_type = -1;
-static int hf_mbim_tlv_ie_reserved = -1;
-static int hf_mbim_tlv_ie_padding_length = -1;
-static int hf_mbim_tlv_ie_data_length = -1;
-static int hf_mbim_tlv_ie_unnamed_data = -1;
-static int hf_mbim_tlv_ie_data_wchar_str = -1;
-static int hf_mbim_tlv_ie_data_int32 = -1;
-static int hf_mbim_tlv_ie_data_guid = -1;
-static int hf_mbim_tlv_ie_padding = -1;
-static int hf_mbim_ms_ursp_tc_length = -1;
-static int hf_mbim_ms_ursp_precedence = -1;
-static int hf_mbim_ms_ursp_tc_type = -1;
-static int hf_mbim_ms_ursp_tc_os_id = -1;
-static int hf_mbim_ms_ursp_tc_dnn = -1;
-static int hf_mbim_ms_ursp_tc_fqdn = -1;
-static int hf_mbim_ms_ursp_tc_ipv4 = -1;
-static int hf_mbim_ms_ursp_tc_ipv4_mask = -1;
-static int hf_mbim_ms_ursp_tc_ipv6 = -1;
-static int hf_mbim_ms_ursp_tc_ipv6_prefix_length = -1;
-static int hf_mbim_ms_ursp_tc_proto_id = -1;
-static int hf_mbim_ms_ursp_tc_port = -1;
-static int hf_mbim_ms_ursp_tc_port_range_low = -1;
-static int hf_mbim_ms_ursp_tc_port_range_high = -1;
-static int hf_mbim_ms_ursp_tc_app_id = -1;
-static int hf_mbim_ms_ursp_tc_byte_value = -1;
-static int hf_mbim_ms_ursp_tc_capability = -1;
-static int hf_mbim_ms_ursp_tc_connection_capability_flag_ims = -1;
-static int hf_mbim_ms_ursp_tc_connection_capability_flag_mms = -1;
-static int hf_mbim_ms_ursp_tc_connection_capability_flag_supl = -1;
-static int hf_mbim_ms_ursp_tc_connection_capability_flag_internet = -1;
-static int hf_mbim_ms_snssai_length = -1;
-static int hf_mbim_ms_snssai_slice_service_type = -1;
-static int hf_mbim_ms_snssai_slice_differentiator = -1;
-static int hf_mbim_ms_snssai_mapped_slice_service_type = -1;
-static int hf_mbim_ms_snssai_mapped_slice_differentiator = -1;
-static int hf_mbim_ms_rej_snssai_cause = -1;
-static int hf_mbim_ms_pre_dflt_nssai_info_access_type = -1;
-static int hf_mbim_device_caps_info_device_type = -1;
-static int hf_mbim_device_caps_info_cellular_class = -1;
-static int hf_mbim_cellular_class_gsm = -1;
-static int hf_mbim_cellular_class_cdma = -1;
-static int hf_mbim_device_caps_info_voice_class = -1;
-static int hf_mbim_device_caps_info_sim_class = -1;
-static int hf_mbim_device_caps_info_sim_class_logical = -1;
-static int hf_mbim_device_caps_info_sim_class_removable = -1;
-static int hf_mbim_device_caps_info_data_class = -1;
-static int hf_mbim_data_class_gprs = -1;
-static int hf_mbim_data_class_edge = -1;
-static int hf_mbim_data_class_umts = -1;
-static int hf_mbim_data_class_hsdpa = -1;
-static int hf_mbim_data_class_hsupa = -1;
-static int hf_mbim_data_class_lte = -1;
-static int hf_mbim_data_class_5g = -1;
-static int hf_mbim_data_class_reserved_gsm = -1;
-static int hf_mbim_data_class_1xrtt = -1;
-static int hf_mbim_data_class_1xevdo = -1;
-static int hf_mbim_data_class_1xevdoreva = -1;
-static int hf_mbim_data_class_1xevdv = -1;
-static int hf_mbim_data_class_3xrtt = -1;
-static int hf_mbim_data_class_1xevdorevb = -1;
-static int hf_mbim_data_class_umb = -1;
-static int hf_mbim_data_class_reserved_cdma = -1;
-static int hf_mbim_data_class_custom = -1;
-static int hf_mbim_device_caps_info_sms_caps = -1;
-static int hf_mbim_device_caps_info_sms_caps_pdu_receive = -1;
-static int hf_mbim_device_caps_info_sms_caps_pdu_send = -1;
-static int hf_mbim_device_caps_info_sms_caps_text_receive = -1;
-static int hf_mbim_device_caps_info_sms_caps_text_send = -1;
-static int hf_mbim_device_caps_info_control_caps = -1;
-static int hf_mbim_device_caps_info_control_caps_reg_manual = -1;
-static int hf_mbim_device_caps_info_control_caps_hw_radio_switch = -1;
-static int hf_mbim_device_caps_info_control_caps_cdma_mobile_ip = -1;
-static int hf_mbim_device_caps_info_control_caps_cdma_simple_ip = -1;
-static int hf_mbim_device_caps_info_control_caps_multi_carrier = -1;
-static int hf_mbim_device_caps_info_control_caps_esim = -1;
-static int hf_mbim_device_caps_info_control_caps_ue_policy_route_selection = -1;
-static int hf_mbim_device_caps_info_control_caps_sim_hot_swap_capable = -1;
-static int hf_mbim_device_caps_info_control_caps_use_ursp_rule_on_epc_capable = -1;
-static int hf_mbim_device_caps_info_data_subclass = -1;
-static int hf_mbim_data_subclass_5gendc = -1;
-static int hf_mbim_data_subclass_5gnr = -1;
-static int hf_mbim_data_subclass_5gnedc = -1;
-static int hf_mbim_data_subclass_5gelte = -1;
-static int hf_mbim_data_subclass_5gngendc = -1;
-static int hf_mbim_device_caps_info_max_sessions = -1;
-static int hf_mbim_device_caps_info_wcdma_band_class = -1;
-static int hf_mbim_device_caps_info_custom_data_class_offset = -1;
-static int hf_mbim_device_caps_info_custom_data_class_size = -1;
-static int hf_mbim_device_caps_info_device_id_offset = -1;
-static int hf_mbim_device_caps_info_device_id_size = -1;
-static int hf_mbim_device_caps_info_fw_info_offset = -1;
-static int hf_mbim_device_caps_info_fw_info_size = -1;
-static int hf_mbim_device_caps_info_hw_info_offset = -1;
-static int hf_mbim_device_caps_info_hw_info_size = -1;
-static int hf_mbim_device_caps_info_custom_data_class = -1;
-static int hf_mbim_device_caps_info_device_id = -1;
-static int hf_mbim_device_caps_info_fw_info = -1;
-static int hf_mbim_device_caps_info_hw_info = -1;
-static int hf_mbim_device_caps_info_v2_executor_index = -1;
-static int hf_mbim_subscr_ready_status_ready_state = -1;
-static int hf_mbim_subscr_ready_status_flags = -1;
-static int hf_mbim_subscr_ready_status_flag_esim = -1;
-static int hf_mbim_subscr_ready_status_flag_sim_removability_known = -1;
-static int hf_mbim_subscr_ready_status_flag_sim_removable = -1;
-static int hf_mbim_subscr_ready_status_flag_sim_slot_active = -1;
-static int hf_mbim_subscr_ready_status_susbcr_id_offset = -1;
-static int hf_mbim_subscr_ready_status_susbcr_id_size = -1;
-static int hf_mbim_subscr_ready_status_sim_icc_id_offset = -1;
-static int hf_mbim_subscr_ready_status_sim_icc_id_size = -1;
-static int hf_mbim_subscr_ready_status_ready_info = -1;
-static int hf_mbim_subscr_ready_status_elem_count = -1;
-static int hf_mbim_subscr_ready_status_tel_nb_offset = -1;
-static int hf_mbim_subscr_ready_status_tel_nb_size = -1;
-static int hf_mbim_subscr_ready_status_susbcr_id = -1;
-static int hf_mbim_subscr_ready_status_sim_icc_id = -1;
-static int hf_mbim_subscr_ready_status_tel_nb = -1;
-static int hf_mbim_radio_state_set = -1;
-static int hf_mbim_radio_state_hw_radio_state = -1;
-static int hf_mbim_radio_state_sw_radio_state = -1;
-static int hf_mbim_set_pin_pin_type = -1;
-static int hf_mbim_set_pin_pin_pin_operation = -1;
-static int hf_mbim_set_pin_pin_pin_offset = -1;
-static int hf_mbim_set_pin_pin_pin_size = -1;
-static int hf_mbim_set_pin_new_pin_offset = -1;
-static int hf_mbim_set_pin_new_pin_size = -1;
-static int hf_mbim_set_pin_pin = -1;
-static int hf_mbim_set_pin_new_pin = -1;
-static int hf_mbim_pin_info_pin_type = -1;
-static int hf_mbim_pin_info_pin_state = -1;
-static int hf_mbim_pin_info_remaining_attempts = -1;
-static int hf_mbim_pin_list_pin_mode = -1;
-static int hf_mbim_pin_list_pin_format = -1;
-static int hf_mbim_pin_list_pin_length_min = -1;
-static int hf_mbim_pin_list_pin_length_max = -1;
-static int hf_mbim_provider_state = -1;
-static int hf_mbim_provider_state_home = -1;
-static int hf_mbim_provider_state_forbidden = -1;
-static int hf_mbim_provider_state_preferred = -1;
-static int hf_mbim_provider_state_visible = -1;
-static int hf_mbim_provider_state_registered = -1;
-static int hf_mbim_provider_state_preferred_multicarrier = -1;
-static int hf_mbim_provider_provider_id_offset = -1;
-static int hf_mbim_provider_provider_id_size = -1;
-static int hf_mbim_provider_provider_name_offset = -1;
-static int hf_mbim_provider_provider_name_size = -1;
-static int hf_mbim_provider_cellular_class = -1;
-static int hf_mbim_provider_rssi = -1;
-static int hf_mbim_provider_error_rate = -1;
-static int hf_mbim_provider_provider_id = -1;
-static int hf_mbim_provider_provider_name = -1;
-static int hf_mbim_providers_elem_count = -1;
-static int hf_mbim_providers_provider_offset = -1;
-static int hf_mbim_providers_provider_size = -1;
-static int hf_mbim_visible_providers_req_action = -1;
-static int hf_mbim_set_register_state_provider_id_offset = -1;
-static int hf_mbim_set_register_state_provider_id_size = -1;
-static int hf_mbim_set_register_state_register_action = -1;
-static int hf_mbim_register_state_data_class = -1;
-static int hf_mbim_set_register_state_provider_id = -1;
-static int hf_mbim_registration_state_info_nw_error = -1;
-static int hf_mbim_registration_state_info_register_state = -1;
-static int hf_mbim_registration_state_info_register_mode = -1;
-static int hf_mbim_registration_state_info_available_data_classes = -1;
-static int hf_mbim_registration_state_info_current_cellular_class = -1;
-static int hf_mbim_registration_state_info_provider_id_offset = -1;
-static int hf_mbim_registration_state_info_provider_id_size = -1;
-static int hf_mbim_registration_state_info_provider_name_offset = -1;
-static int hf_mbim_registration_state_info_provider_name_size = -1;
-static int hf_mbim_registration_state_info_roaming_text_offset = -1;
-static int hf_mbim_registration_state_info_roaming_text_size = -1;
-static int hf_mbim_registration_state_info_registration_flags = -1;
-static int hf_mbim_registration_state_info_registration_flags_manual_selection_not_available = -1;
-static int hf_mbim_registration_state_info_registration_flags_packet_service_auto_attach = -1;
-static int hf_mbim_registration_state_info_preferred_data_class = -1;
-static int hf_mbim_registration_state_info_provider_id = -1;
-static int hf_mbim_registration_state_info_provider_name = -1;
-static int hf_mbim_registration_state_info_roaming_text = -1;
-static int hf_mbim_set_packet_service_action = -1;
-static int hf_mbim_ms_plmn_mcc = -1;
-static int hf_mbim_ms_plmn_mnc = -1;
-static int hf_mbim_ms_tai_tac = -1;
-static int hf_mbim_ms_tai_list_type = -1;
-static int hf_mbim_ms_tai_list_single_plmn_tac_element = -1;
-static int hf_mbim_ms_tai_list_multi_plmn_tai_element = -1;
-static int hf_mbim_packet_service_info_nw_error = -1;
-static int hf_mbim_packet_service_info_packet_service_state = -1;
-static int hf_mbim_packet_service_info_highest_available_data_class = -1;
-static int hf_mbim_packet_service_info_current_data_class = -1;
-static int hf_mbim_packet_service_info_uplink_speed = -1;
-static int hf_mbim_packet_service_info_downlink_speed = -1;
-static int hf_mbim_packet_service_info_frequency_range = -1;
-static int hf_mbim_packet_service_info_data_subclass = -1;
-static int hf_mbim_set_signal_state_signal_strength_interval = -1;
-static int hf_mbim_set_signal_state_rssi_threshold = -1;
-static int hf_mbim_set_signal_state_error_rate_threshold = -1;
-static int hf_mbim_signal_state_element_rsrp = -1;
-static int hf_mbim_signal_state_element_snr = -1;
-static int hf_mbim_signal_state_element_rsrp_threshold = -1;
-static int hf_mbim_signal_state_element_snr_threshold = -1;
-static int hf_mbim_signal_state_element_system_type = -1;
-static int hf_mbim_signal_state_info_rssi = -1;
-static int hf_mbim_signal_state_info_error_rate = -1;
-static int hf_mbim_signal_state_info_signal_strength_interval = -1;
-static int hf_mbim_signal_state_info_rssi_threshold = -1;
-static int hf_mbim_signal_state_info_error_rate_threshold = -1;
-static int hf_mbim_signal_state_info_rsrp_snr_offset = -1;
-static int hf_mbim_signal_state_info_rsrp_snr_size = -1;
-static int hf_mbim_signal_state_info_elem_count = -1;
-static int hf_mbim_context_type = -1;
-static int hf_mbim_set_connect_session_id = -1;
-static int hf_mbim_set_connect_activation_command = -1;
-static int hf_mbim_set_connect_activation_option = -1;
-static int hf_mbim_set_connect_access_string_offset = -1;
-static int hf_mbim_set_connect_access_string_size = -1;
-static int hf_mbim_set_connect_user_name_offset = -1;
-static int hf_mbim_set_connect_user_name_size = -1;
-static int hf_mbim_set_connect_password_offset = -1;
-static int hf_mbim_set_connect_password_size = -1;
-static int hf_mbim_set_connect_compression = -1;
-static int hf_mbim_set_connect_auth_protocol = -1;
-static int hf_mbim_set_connect_ip_type = -1;
-static int hf_mbim_set_connect_access_string = -1;
-static int hf_mbim_set_connect_user_name = -1;
-static int hf_mbim_set_connect_password = -1;
-static int hf_mbim_set_connect_media_preference = -1;
-static int hf_mbim_connect_info_session_id = -1;
-static int hf_mbim_connect_info_activation_state = -1;
-static int hf_mbim_connect_info_voice_call_state = -1;
-static int hf_mbim_connect_info_ip_type = -1;
-static int hf_mbim_connect_info_nw_error = -1;
-static int hf_mbim_connect_info_access_media = -1;
-static int hf_mbim_context_context_id = -1;
-static int hf_mbim_context_access_string_offset = -1;
-static int hf_mbim_context_access_string_size = -1;
-static int hf_mbim_context_user_name_offset = -1;
-static int hf_mbim_context_user_name_size = -1;
-static int hf_mbim_context_password_offset = -1;
-static int hf_mbim_context_password_size = -1;
-static int hf_mbim_context_compression = -1;
-static int hf_mbim_context_auth_protocol = -1;
-static int hf_mbim_context_provider_id_offset = -1;
-static int hf_mbim_context_provider_id_size = -1;
-static int hf_mbim_context_provider_id = -1;
-static int hf_mbim_context_access_string = -1;
-static int hf_mbim_context_user_name = -1;
-static int hf_mbim_context_password = -1;
-static int hf_mbim_provisioned_contexts_info_elem_count = -1;
-static int hf_mbim_provisioned_contexts_info_provisioned_context_offset = -1;
-static int hf_mbim_provisioned_contexts_info_provisioned_context_size = -1;
-static int hf_mbim_set_service_activation_data_buffer = -1;
-static int hf_mbim_service_activation_info_nw_error = -1;
-static int hf_mbim_service_activation_info_data_buffer = -1;
-static int hf_mbim_ipv4_element_on_link_prefix_length = -1;
-static int hf_mbim_ipv4_element_ipv4_address = -1;
-static int hf_mbim_ipv6_element_on_link_prefix_length = -1;
-static int hf_mbim_ipv6_element_ipv6_address = -1;
-static int hf_mbim_ip_configuration_info_session_id = -1;
-static int hf_mbim_ip_configuration_info_ipv4_configuration_available = -1;
-static int hf_mbim_ip_configuration_info_ipv4_configuration_available_address = -1;
-static int hf_mbim_ip_configuration_info_ipv4_configuration_available_gateway = -1;
-static int hf_mbim_ip_configuration_info_ipv4_configuration_available_dns = -1;
-static int hf_mbim_ip_configuration_info_ipv4_configuration_available_mtu = -1;
-static int hf_mbim_ip_configuration_info_ipv6_configuration_available = -1;
-static int hf_mbim_ip_configuration_info_ipv6_configuration_available_address = -1;
-static int hf_mbim_ip_configuration_info_ipv6_configuration_available_gateway = -1;
-static int hf_mbim_ip_configuration_info_ipv6_configuration_available_dns = -1;
-static int hf_mbim_ip_configuration_info_ipv6_configuration_available_mtu = -1;
-static int hf_mbim_ip_configuration_info_ipv4_address_count = -1;
-static int hf_mbim_ip_configuration_info_ipv4_address_offset = -1;
-static int hf_mbim_ip_configuration_info_ipv6_address_count = -1;
-static int hf_mbim_ip_configuration_info_ipv6_address_offset = -1;
-static int hf_mbim_ip_configuration_info_ipv4_gateway_offset = -1;
-static int hf_mbim_ip_configuration_info_ipv6_gateway_offset = -1;
-static int hf_mbim_ip_configuration_info_ipv4_dns_count = -1;
-static int hf_mbim_ip_configuration_info_ipv4_dns_offset = -1;
-static int hf_mbim_ip_configuration_info_ipv6_dns_count = -1;
-static int hf_mbim_ip_configuration_info_ipv6_dns_offset = -1;
-static int hf_mbim_ip_configuration_info_ipv4_mtu = -1;
-static int hf_mbim_ip_configuration_info_ipv6_mtu = -1;
-static int hf_mbim_ip_configuration_info_ipv4_gateway = -1;
-static int hf_mbim_ip_configuration_info_ipv6_gateway = -1;
-static int hf_mbim_ip_configuration_info_ipv4_dns = -1;
-static int hf_mbim_ip_configuration_info_ipv6_dns = -1;
-static int hf_mbim_device_service_element_device_service_id = -1;
-static int hf_mbim_device_service_element_dss_payload = -1;
-static int hf_mbim_device_service_element_dss_payload_host_device = -1;
-static int hf_mbim_device_service_element_dss_payload_device_host = -1;
-static int hf_mbim_device_service_element_max_dss_instances = -1;
-static int hf_mbim_device_service_element_cid_count = -1;
-static int hf_mbim_device_service_element_cid = -1;
-static int hf_mbim_device_services_info_device_services_count = -1;
-static int hf_mbim_device_services_info_max_dss_sessions = -1;
-static int hf_mbim_device_services_info_device_services_offset = -1;
-static int hf_mbim_device_services_info_device_services_size = -1;
-static int hf_mbim_event_entry_device_service_id = -1;
-static int hf_mbim_event_entry_cid_count = -1;
-static int hf_mbim_event_entry_cid = -1;
-static int hf_mbim_device_service_subscribe_element_count = -1;
-static int hf_mbim_device_service_subscribe_device_service_offset = -1;
-static int hf_mbim_device_service_subscribe_device_service_size = -1;
-static int hf_mbim_packet_statistics_info_in_discards = -1;
-static int hf_mbim_packet_statistics_info_in_errors = -1;
-static int hf_mbim_packet_statistics_info_in_octets = -1;
-static int hf_mbim_packet_statistics_info_in_packets = -1;
-static int hf_mbim_packet_statistics_info_out_octets = -1;
-static int hf_mbim_packet_statistics_info_out_packets = -1;
-static int hf_mbim_packet_statistics_info_out_errors = -1;
-static int hf_mbim_packet_statistics_info_out_discards = -1;
-static int hf_mbim_network_idle_hint_state = -1;
-static int hf_mbim_emergency_mode_info_emergency_mode = -1;
-static int hf_mbim_single_packet_filter_filter_size = -1;
-static int hf_mbim_single_packet_filter_packet_filter_offset = -1;
-static int hf_mbim_single_packet_filter_packet_mask_offset = -1;
-static int hf_mbim_single_packet_filter_filter_id = -1;
-static int hf_mbim_single_packet_filter_packet_filter = -1;
-static int hf_mbim_single_packet_filter_packet_mask = -1;
-static int hf_mbim_packet_filters_session_id = -1;
-static int hf_mbim_packet_filters_packet_filters_count = -1;
-static int hf_mbim_packet_filters_packet_filters_packet_filter_offset = -1;
-static int hf_mbim_packet_filters_packet_filters_packet_filter_size = -1;
-static int hf_mbim_set_sms_configuration_format = -1;
-static int hf_mbim_set_sms_configuration_sc_address_offset = -1;
-static int hf_mbim_set_sms_configuration_sc_address_size = -1;
-static int hf_mbim_set_sms_configuration_sc_address = -1;
-static int hf_mbim_sms_configuration_info_sms_storage_state = -1;
-static int hf_mbim_sms_configuration_info_format = -1;
-static int hf_mbim_sms_configuration_info_max_messages = -1;
-static int hf_mbim_sms_configuration_info_cdma_short_message_size = -1;
-static int hf_mbim_sms_configuration_info_sc_address_offset = -1;
-static int hf_mbim_sms_configuration_info_sc_address_size = -1;
-static int hf_mbim_sms_configuration_info_sc_address = -1;
-static int hf_mbim_sms_pdu_record_message_index = -1;
-static int hf_mbim_sms_pdu_record_message_status = -1;
-static int hf_mbim_sms_pdu_record_pdu_data_offset = -1;
-static int hf_mbim_sms_pdu_record_pdu_data_size = -1;
-static int hf_mbim_sms_pdu_record_pdu_data = -1;
-static int hf_mbim_sms_pdu_record_pdu_data_sc_address_size = -1;
-static int hf_mbim_sms_cdma_record_message_index = -1;
-static int hf_mbim_sms_cdma_record_message_status = -1;
-static int hf_mbim_sms_cdma_record_address_offset = -1;
-static int hf_mbim_sms_cdma_record_address_size = -1;
-static int hf_mbim_sms_cdma_record_timestamp_offset = -1;
-static int hf_mbim_sms_cdma_record_timestamp_size = -1;
-static int hf_mbim_sms_cdma_record_encoding_id = -1;
-static int hf_mbim_sms_cdma_record_language_id = -1;
-static int hf_mbim_sms_cdma_record_encoded_message_offset = -1;
-static int hf_mbim_sms_cdma_record_size_in_bytes = -1;
-static int hf_mbim_sms_cdma_record_size_in_characters = -1;
-static int hf_mbim_sms_cdma_record_address = -1;
-static int hf_mbim_sms_cdma_record_timestamp = -1;
-static int hf_mbim_sms_cdma_record_encoded_message = -1;
-static int hf_mbim_sms_cdma_record_encoded_message_text = -1;
-static int hf_mbim_sms_read_req_format = -1;
-static int hf_mbim_sms_read_req_flag = -1;
-static int hf_mbim_sms_read_req_message_index = -1;
-static int hf_mbim_sms_read_info_format = -1;
-static int hf_mbim_sms_read_info_element_count = -1;
-static int hf_mbim_sms_read_info_sms_offset = -1;
-static int hf_mbim_sms_read_info_sms_size = -1;
-static int hf_mbim_sms_send_pdu_pdu_data_offset = -1;
-static int hf_mbim_sms_send_pdu_pdu_data_size = -1;
-static int hf_mbim_sms_send_pdu_pdu_data = -1;
-static int hf_mbim_sms_send_pdu_pdu_data_sc_address_size = -1;
-static int hf_mbim_sms_send_cdma_encoding_id = -1;
-static int hf_mbim_sms_send_cdma_language_id = -1;
-static int hf_mbim_sms_send_cdma_address_offset = -1;
-static int hf_mbim_sms_send_cdma_address_size = -1;
-static int hf_mbim_sms_send_cdma_encoded_message_offset = -1;
-static int hf_mbim_sms_send_cdma_size_in_bytes = -1;
-static int hf_mbim_sms_send_cdma_size_in_characters = -1;
-static int hf_mbim_sms_send_cdma_address = -1;
-static int hf_mbim_sms_send_cdma_encoded_message = -1;
-static int hf_mbim_sms_send_cdma_encoded_message_text = -1;
-static int hf_mbim_set_sms_send_format = -1;
-static int hf_mbim_sms_send_info_message_reference = -1;
-static int hf_mbim_set_sms_delete_flag = -1;
-static int hf_mbim_set_sms_delete_message_index = -1;
-static int hf_mbim_sms_status_info_flags = -1;
-static int hf_mbim_sms_status_info_flags_message_store_full = -1;
-static int hf_mbim_sms_status_info_flags_new_message = -1;
-static int hf_mbim_sms_status_info_message_index = -1;
-static int hf_mbim_set_ussd_ussd_action = -1;
-static int hf_mbim_set_ussd_ussd_data_coding_scheme = -1;
-static int hf_mbim_set_ussd_ussd_payload_offset = -1;
-static int hf_mbim_set_ussd_ussd_payload_length = -1;
-static int hf_mbim_set_ussd_ussd_payload = -1;
-static int hf_mbim_set_ussd_ussd_payload_text = -1;
-static int hf_mbim_ussd_info_ussd_response = -1;
-static int hf_mbim_ussd_info_ussd_session_state = -1;
-static int hf_mbim_ussd_info_ussd_data_coding_scheme = -1;
-static int hf_mbim_ussd_info_ussd_payload_offset = -1;
-static int hf_mbim_ussd_info_ussd_payload_length = -1;
-static int hf_mbim_ussd_info_ussd_payload = -1;
-static int hf_mbim_ussd_info_ussd_payload_text = -1;
-static int hf_mbim_phonebook_configuration_info_phonebook_state = -1;
-static int hf_mbim_phonebook_configuration_info_total_nb_of_entries = -1;
-static int hf_mbim_phonebook_configuration_info_used_entries = -1;
-static int hf_mbim_phonebook_configuration_info_max_number_length = -1;
-static int hf_mbim_phonebook_configuration_info_max_name_length = -1;
-static int hf_mbim_phonebook_entry_entry_index = -1;
-static int hf_mbim_phonebook_entry_number_offset = -1;
-static int hf_mbim_phonebook_entry_number_length = -1;
-static int hf_mbim_phonebook_entry_name_offset = -1;
-static int hf_mbim_phonebook_entry_name_length = -1;
-static int hf_mbim_phonebook_entry_number = -1;
-static int hf_mbim_phonebook_entry_name = -1;
-static int hf_mbim_phonebook_read_req_filter_flag = -1;
-static int hf_mbim_phonebook_read_req_filter_message_index = -1;
-static int hf_mbim_phonebook_read_info_element_count = -1;
-static int hf_mbim_phonebook_read_info_phonebook_offset = -1;
-static int hf_mbim_phonebook_read_info_phonebook_size = -1;
-static int hf_mbim_set_phonebook_delete_filter_flag = -1;
-static int hf_mbim_set_phonebook_delete_filter_message_index = -1;
-static int hf_mbim_set_phonebook_write_save_flag = -1;
-static int hf_mbim_set_phonebook_write_save_index = -1;
-static int hf_mbim_set_phonebook_write_number_offset = -1;
-static int hf_mbim_set_phonebook_write_number_length = -1;
-static int hf_mbim_set_phonebook_write_name_offset = -1;
-static int hf_mbim_set_phonebook_write_name_length = -1;
-static int hf_mbim_set_phonebook_write_number = -1;
-static int hf_mbim_set_phonebook_write_name = -1;
-static int hf_mbim_set_stk_pac_pac_host_control = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_refresh = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_more_time = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_poll_interval = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_polling_off = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_set_up_evt_list = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_set_up_call = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_send_ss = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_send_ussd = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_send_short_msg = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_send_dtmf = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_launch_browser = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_geo_loc_req = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_play_tone = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_display_text = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_get_inkey = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_get_input = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_select_item = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_set_up_menu = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_prov_local_info = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_timer_management = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_set_up_idle_mode_text = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_perform_card_apdu = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_power_on_card = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_power_off_card = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_get_reader_status = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_run_at_cmd = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_lang_notif = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_open_channel = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_close_channel = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_receive_data = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_send_data = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_get_channel_status = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_service_search = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_get_service_info = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_declare_service = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_set_frames = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_get_frames_status = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_retrieve_multimedia_msg = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_submit_multimedia_msg = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_display_multimedia_msg = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_activate = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_contactless_state_changed = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_cmd_container = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_encapsulated_session_ctrl = -1;
-static int hf_mbim_set_stk_pac_pac_host_control_end_proact_session = -1;
-static int hf_mbim_stk_pac_info_pac_support = -1;
-static int hf_mbim_stk_pac_info_pac_support_refresh = -1;
-static int hf_mbim_stk_pac_info_pac_support_more_time = -1;
-static int hf_mbim_stk_pac_info_pac_support_poll_interval = -1;
-static int hf_mbim_stk_pac_info_pac_support_polling_off = -1;
-static int hf_mbim_stk_pac_info_pac_support_set_up_evt_list = -1;
-static int hf_mbim_stk_pac_info_pac_support_set_up_call = -1;
-static int hf_mbim_stk_pac_info_pac_support_send_ss = -1;
-static int hf_mbim_stk_pac_info_pac_support_send_ussd = -1;
-static int hf_mbim_stk_pac_info_pac_support_send_short_msg = -1;
-static int hf_mbim_stk_pac_info_pac_support_send_dtmf = -1;
-static int hf_mbim_stk_pac_info_pac_support_launch_browser = -1;
-static int hf_mbim_stk_pac_info_pac_support_geo_loc_req = -1;
-static int hf_mbim_stk_pac_info_pac_support_play_tone = -1;
-static int hf_mbim_stk_pac_info_pac_support_display_text = -1;
-static int hf_mbim_stk_pac_info_pac_support_get_inkey = -1;
-static int hf_mbim_stk_pac_info_pac_support_get_input = -1;
-static int hf_mbim_stk_pac_info_pac_support_select_item = -1;
-static int hf_mbim_stk_pac_info_pac_support_set_up_menu = -1;
-static int hf_mbim_stk_pac_info_pac_support_prov_local_info = -1;
-static int hf_mbim_stk_pac_info_pac_support_timer_management = -1;
-static int hf_mbim_stk_pac_info_pac_support_set_up_idle_mode_text = -1;
-static int hf_mbim_stk_pac_info_pac_support_perform_card_apdu = -1;
-static int hf_mbim_stk_pac_info_pac_support_power_on_card = -1;
-static int hf_mbim_stk_pac_info_pac_support_power_off_card = -1;
-static int hf_mbim_stk_pac_info_pac_support_get_reader_status = -1;
-static int hf_mbim_stk_pac_info_pac_support_run_at_cmd = -1;
-static int hf_mbim_stk_pac_info_pac_support_lang_notif = -1;
-static int hf_mbim_stk_pac_info_pac_support_open_channel = -1;
-static int hf_mbim_stk_pac_info_pac_support_close_channel = -1;
-static int hf_mbim_stk_pac_info_pac_support_receive_data = -1;
-static int hf_mbim_stk_pac_info_pac_support_send_data = -1;
-static int hf_mbim_stk_pac_info_pac_support_get_channel_status = -1;
-static int hf_mbim_stk_pac_info_pac_support_service_search = -1;
-static int hf_mbim_stk_pac_info_pac_support_get_service_info = -1;
-static int hf_mbim_stk_pac_info_pac_support_declare_service = -1;
-static int hf_mbim_stk_pac_info_pac_support_set_frames = -1;
-static int hf_mbim_stk_pac_info_pac_support_get_frames_status = -1;
-static int hf_mbim_stk_pac_info_pac_support_retrieve_multimedia_msg = -1;
-static int hf_mbim_stk_pac_info_pac_support_submit_multimedia_msg = -1;
-static int hf_mbim_stk_pac_info_pac_support_display_multimedia_msg = -1;
-static int hf_mbim_stk_pac_info_pac_support_activate = -1;
-static int hf_mbim_stk_pac_info_pac_support_contactless_state_changed = -1;
-static int hf_mbim_stk_pac_info_pac_support_cmd_container = -1;
-static int hf_mbim_stk_pac_info_pac_support_encapsulated_session_ctrl = -1;
-static int hf_mbim_stk_pac_info_pac_support_end_proact_session = -1;
-static int hf_mbim_stk_pac_pac_type = -1;
-static int hf_mbim_stk_pac_pac = -1;
-static int hf_mbim_set_stk_terminal_response_response_length = -1;
-static int hf_mbim_set_stk_terminal_response_data_buffer = -1;
-static int hf_mbim_stk_terminal_response_info_result_data_string_offset = -1;
-static int hf_mbim_stk_terminal_response_info_result_data_string_length = -1;
-static int hf_mbim_stk_terminal_response_info_status_word = -1;
-static int hf_mbim_stk_terminal_response_info_result_data_string = -1;
-static int hf_mbim_set_stk_envelope_data_buffer = -1;
-static int hf_mbim_stk_envelope_info_envelope_support = -1;
-static int hf_mbim_aka_auth_req_rand = -1;
-static int hf_mbim_aka_auth_req_autn = -1;
-static int hf_mbim_aka_auth_info_res = -1;
-static int hf_mbim_aka_auth_info_res_length = -1;
-static int hf_mbim_aka_auth_info_ik = -1;
-static int hf_mbim_aka_auth_info_ck = -1;
-static int hf_mbim_aka_auth_info_auts = -1;
-static int hf_mbim_akap_auth_req_rand = -1;
-static int hf_mbim_akap_auth_req_autn = -1;
-static int hf_mbim_akap_auth_req_network_name_offset = -1;
-static int hf_mbim_akap_auth_req_network_name_length = -1;
-static int hf_mbim_akap_auth_req_network_name = -1;
-static int hf_mbim_akap_auth_info_res = -1;
-static int hf_mbim_akap_auth_info_res_length = -1;
-static int hf_mbim_akap_auth_info_ik = -1;
-static int hf_mbim_akap_auth_info_ck = -1;
-static int hf_mbim_akap_auth_info_auts = -1;
-static int hf_mbim_sim_auth_req_rand1 = -1;
-static int hf_mbim_sim_auth_req_rand2 = -1;
-static int hf_mbim_sim_auth_req_rand3 = -1;
-static int hf_mbim_sim_auth_req_n = -1;
-static int hf_mbim_sim_auth_info_sres1 = -1;
-static int hf_mbim_sim_auth_info_kc1 = -1;
-static int hf_mbim_sim_auth_info_sres2 = -1;
-static int hf_mbim_sim_auth_info_kc2 = -1;
-static int hf_mbim_sim_auth_info_sres3 = -1;
-static int hf_mbim_sim_auth_info_kc3 = -1;
-static int hf_mbim_sim_auth_info_n = -1;
-static int hf_mbim_set_dss_connect_device_service_id = -1;
-static int hf_mbim_set_dss_connect_dss_session_id = -1;
-static int hf_mbim_set_dss_connect_dss_link_state = -1;
-static int hf_mbim_multicarrier_capabilities_info_capabilities = -1;
-static int hf_mbim_multicarrier_capabilities_info_capabilities_static_scan = -1;
-static int hf_mbim_multicarrier_capabilities_info_capabilities_fw_requires_reboot = -1;
-static int hf_mbim_location_info_country = -1;
-static int hf_mbim_multicarrier_current_cid_list_req_uuid = -1;
-static int hf_mbim_multicarrier_current_cid_list_info_cid_count = -1;
-static int hf_mbim_multicarrier_current_cid_list_info_cid = -1;
-static int hf_mbim_msfwid_firmwareid_info_firmware_id = -1;
-static int hf_mbim_qmi_buffer = -1;
-static int hf_mbim_thermal_config_enable = -1;
-static int hf_mbim_thermal_config_temp_sensor_id = -1;
-static int hf_mbim_thermal_config_alarm_id = -1;
-static int hf_mbim_thermal_config_threshold_value = -1;
-static int hf_mbim_thermal_config_hyst_value = -1;
-static int hf_mbim_thermal_config_sampling_period = -1;
-static int hf_mbim_query_thermal_state_temp_sensor_id = -1;
-static int hf_mbim_thermal_state_info_current_temp_value = -1;
-static int hf_mbim_thermal_state_info_enable = -1;
-static int hf_mbim_thermal_state_info_temp_sensor_id = -1;
-static int hf_mbim_thermal_state_info_alarm_id = -1;
-static int hf_mbim_thermal_state_info_threshold_value = -1;
-static int hf_mbim_thermal_state_info_hyst_value = -1;
-static int hf_mbim_thermal_state_info_sampling_period = -1;
-static int hf_mbim_sar_config_sar_status = -1;
-static int hf_mbim_sar_config_level = -1;
-static int hf_mbim_ms_sar_config_sar_mode = -1;
-static int hf_mbim_ms_sar_config_sar_backoff_status = -1;
-static int hf_mbim_ms_sar_config_sar_wifi_Integration = -1;
-static int hf_mbim_ms_sar_config_element_count = -1;
-static int hf_mbim_ms_sar_config_element_offset = -1;
-static int hf_mbim_ms_sar_config_element_size = -1;
-static int hf_mbim_ms_sar_config_state_sar_antenna_index = -1;
-static int hf_mbim_ms_sar_config_state_sar_backoff_index = -1;
-static int hf_mbim_ms_transmission_status_channel_notification = -1;
-static int hf_mbim_ms_transmission_status_transmission_status = -1;
-static int hf_mbim_ms_transmission_status_hysteresis_timer = -1;
-static int hf_mbim_adpclk_activate_state = -1;
-static int hf_mbim_adpclk_freq_info_elem_count = -1;
-static int hf_mbim_adpclk_freq_info_adpclk_freq_value_offset = -1;
-static int hf_mbim_adpclk_freq_info_adpclk_freq_value_size = -1;
-static int hf_mbim_adpclk_freq_info_adpclk_freq_value_center_freq = -1;
-static int hf_mbim_adpclk_freq_info_adpclk_freq_value_freq_spread = -1;
-static int hf_mbim_adpclk_freq_info_adpclk_freq_value_noise_power = -1;
-static int hf_mbim_adpclk_freq_info_adpclk_freq_value_rssi = -1;
-static int hf_mbim_adpclk_freq_info_adpclk_freq_value_connect_status = -1;
-static int hf_mbim_trace_config_config = -1;
-static int hf_mbim_nrtc_app_info_period = -1;
-static int hf_mbim_nrtc_app_info_duration = -1;
-static int hf_mbim_nrtcws_config_mode = -1;
-static int hf_mbim_nrtcws_config_wlan_active = -1;
-static int hf_mbim_nrtcws_config_wlan_safe_rx = -1;
-static int hf_mbim_nrtcws_config_wlan_bandwidth = -1;
-static int hf_mbim_nrtcws_config_bt_active = -1;
-static int hf_mbim_nrtcws_config_bt_safe_rx = -1;
-static int hf_mbim_nrtcws_info_lte_active = -1;
-static int hf_mbim_nrtcws_info_wlan_safe_rx_min = -1;
-static int hf_mbim_nrtcws_info_wlan_safe_rx_max = -1;
-static int hf_mbim_nrtcws_info_bt_safe_rx_min = -1;
-static int hf_mbim_nrtcws_info_bt_safe_rx_max = -1;
-static int hf_mbim_nrtcws_info_lte_sps_period = -1;
-static int hf_mbim_nrtcws_info_lte_sps_duration = -1;
-static int hf_mbim_nrtcws_info_lte_sps_initial_offset = -1;
-static int hf_mbim_usbprofile_cmd_length = -1;
-static int hf_mbim_usbprofile_cmd_buffer = -1;
-static int hf_mbim_usbprofile_rsp_length = -1;
-static int hf_mbim_usbprofile_rsp_buffer = -1;
-static int hf_mbim_ciq_set_mode = -1;
-static int hf_mbim_ciq_set_debug_info_size = -1;
-static int hf_mbim_ciq_set_debug_info = -1;
-static int hf_mbim_ciq_info_mode = -1;
-static int hf_mbim_atds_signal_info_rssi = -1;
-static int hf_mbim_atds_signal_info_ber = -1;
-static int hf_mbim_atds_signal_info_rscp = -1;
-static int hf_mbim_atds_signal_info_ecno = -1;
-static int hf_mbim_atds_signal_info_rsrq = -1;
-static int hf_mbim_atds_signal_info_rsrp = -1;
-static int hf_mbim_atds_signal_info_rssnr = -1;
-static int hf_mbim_atds_location_info_lac = -1;
-static int hf_mbim_atds_location_info_tac = -1;
-static int hf_mbim_atds_location_info_cellid = -1;
-static int hf_mbim_atds_operator_provider_id_offset = -1;
-static int hf_mbim_atds_operator_provider_id_size = -1;
-static int hf_mbim_atds_operator_provider_state = -1;
-static int hf_mbim_atds_operator_provider_name_offset = -1;
-static int hf_mbim_atds_operator_provider_name_size = -1;
-static int hf_mbim_atds_operator_plmn_mode = -1;
-static int hf_mbim_atds_operator_rssi = -1;
-static int hf_mbim_atds_operator_error_rate = -1;
-static int hf_mbim_atds_operator_provider_id = -1;
-static int hf_mbim_atds_operator_provider_name = -1;
-static int hf_mbim_atds_operators_elem_count = -1;
-static int hf_mbim_atds_operators_operator_offset = -1;
-static int hf_mbim_atds_operators_operator_size = -1;
-static int hf_mbim_atds_rat_info_mode = -1;
-static int hf_mbim_atds_projection_table_type = -1;
-static int hf_mbim_atds_projection_table_bar5min = -1;
-static int hf_mbim_atds_projection_table_a5 = -1;
-static int hf_mbim_atds_projection_table_b5 = -1;
-static int hf_mbim_atds_projection_table_bar4min = -1;
-static int hf_mbim_atds_projection_table_a4 = -1;
-static int hf_mbim_atds_projection_table_b4 = -1;
-static int hf_mbim_atds_projection_table_bar3min = -1;
-static int hf_mbim_atds_projection_table_a3 = -1;
-static int hf_mbim_atds_projection_table_b3 = -1;
-static int hf_mbim_atds_projection_table_bar2min = -1;
-static int hf_mbim_atds_projection_table_a2 = -1;
-static int hf_mbim_atds_projection_table_b2 = -1;
-static int hf_mbim_atds_projection_table_bar1min = -1;
-static int hf_mbim_atds_projection_table_a1 = -1;
-static int hf_mbim_atds_projection_table_b1 = -1;
-static int hf_mbim_atds_projection_table_bar0min = -1;
-static int hf_mbim_atds_projection_table_a0 = -1;
-static int hf_mbim_atds_projection_table_b0 = -1;
-static int hf_mbim_atds_projection_tables_elem_count = -1;
-static int hf_mbim_atds_projection_tables_projection_table_offset = -1;
-static int hf_mbim_atds_projection_tables_projection_table_size = -1;
-static int hf_mbim_multiflow_caps_info_control_caps = -1;
-static int hf_mbim_multiflow_caps_info_control_caps_uplink = -1;
-static int hf_mbim_multiflow_caps_info_control_caps_downlink = -1;
-static int hf_mbim_set_multiflow_state_state = -1;
-static int hf_mbim_multiflow_state_info_state = -1;
-static int hf_mbim_multiflow_tft_info_session_id = -1;
-static int hf_mbim_multiflow_tft_info_elem_count = -1;
-static int hf_mbim_multiflow_tft_info_tft_list_offset = -1;
-static int hf_mbim_multiflow_tft_info_tft_list_size = -1;
-static int hf_mbim_version = -1;
-static int hf_mbim_extended_version = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_operation = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_ip_type = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_enable = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_roaming = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_media_type = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_source = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_access_string = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_access_string_offset = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_access_string_size = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_user_name = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_user_name_offset = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_user_name_size = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_password = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_password_offset = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_password_size = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_compression = -1;
-static int hf_mbim_set_ms_provisioned_context_v2_auth_protocol = -1;
-static int hf_mbim_ms_provisioned_context_info_v2_elem_count = -1;
-static int hf_mbim_ms_provisioned_context_info_v2_list_offset = -1;
-static int hf_mbim_ms_provisioned_context_info_v2_list_size = -1;
-static int hf_mbim_ms_provisioned_context_info_v2_context_id = -1;
-static int hf_mbim_ms_network_blacklist_info_blacklist_state = -1;
-static int hf_mbim_ms_network_blacklist_state_sim_provider_actuated = -1;
-static int hf_mbim_ms_network_blacklist_state_network_provider_actuated = -1;
-static int hf_mbim_ms_network_blacklist_info_elem_count = -1;
-static int hf_mbim_ms_network_blacklist_info_list_offset = -1;
-static int hf_mbim_ms_network_blacklist_info_list_size = -1;
-static int hf_mbim_ms_network_blacklist_provider_mcc = -1;
-static int hf_mbim_ms_network_blacklist_provider_mnc = -1;
-static int hf_mbim_ms_network_blacklist_provider_type = -1;
-static int hf_mbim_sys_caps_info_number_of_executors = -1;
-static int hf_mbim_sys_caps_info_number_of_slots = -1;
-static int hf_mbim_sys_caps_info_concurrency = -1;
-static int hf_mbim_sys_caps_info_modem_id = -1;
-static int hf_mbim_ms_set_lte_attach_operation = -1;
-static int hf_mbim_ms_lte_attach_context_count = -1;
-static int hf_mbim_ms_lte_attach_context_offset = -1;
-static int hf_mbim_ms_lte_attach_context_size = -1;
-static int hf_mbim_ms_lte_attach_context_ip_type = -1;
-static int hf_mbim_ms_lte_attach_context_roaming = -1;
-static int hf_mbim_ms_lte_attach_context_source = -1;
-static int hf_mbim_ms_lte_attach_context_access_string = -1;
-static int hf_mbim_ms_lte_attach_context_access_string_offset = -1;
-static int hf_mbim_ms_lte_attach_context_access_string_size = -1;
-static int hf_mbim_ms_lte_attach_context_user_name = -1;
-static int hf_mbim_ms_lte_attach_context_user_name_offset = -1;
-static int hf_mbim_ms_lte_attach_context_user_name_size = -1;
-static int hf_mbim_ms_lte_attach_context_password = -1;
-static int hf_mbim_ms_lte_attach_context_password_offset = -1;
-static int hf_mbim_ms_lte_attach_context_password_size = -1;
-static int hf_mbim_ms_lte_attach_context_compression = -1;
-static int hf_mbim_ms_lte_attach_context_auth_protocol = -1;
-static int hf_mbim_ms_lte_attach_state = -1;
-static int hf_mbim_ms_device_slot_mapping_info_map_count = -1;
-static int hf_mbim_ms_device_slot_mapping_info_map_offset = -1;
-static int hf_mbim_ms_device_slot_mapping_info_map_size = -1;
-static int hf_mbim_ms_device_slot_mapping_info_executor_slot_index = -1;
-static int hf_mbim_ms_slot_info_req_slot_index = -1;
-static int hf_mbim_ms_slot_info_slot_index = -1;
-static int hf_mbim_ms_slot_info_state = -1;
-static int hf_mbim_base_station_max_gsm_count = -1;
-static int hf_mbim_base_station_max_umts_count = -1;
-static int hf_mbim_base_station_max_td_scdma_count = -1;
-static int hf_mbim_base_station_max_lte_count = -1;
-static int hf_mbim_base_station_max_cdma_count = -1;
-static int hf_mbim_base_station_max_nr_count = -1;
-static int hf_mbim_base_station_provider_id_offset = -1;
-static int hf_mbim_base_station_provider_id_size = -1;
-static int hf_mbim_base_station_location_area_code = -1;
-static int hf_mbim_base_station_cell_id = -1;
-static int hf_mbim_base_station_timing_advance = -1;
-static int hf_mbim_base_station_arfcn = -1;
-static int hf_mbim_base_station_base_station_id = -1;
-static int hf_mbim_base_station_rx_level = -1;
-static int hf_mbim_base_station_provider_id = -1;
-static int hf_mbim_base_station_frequency_info_ul = -1;
-static int hf_mbim_base_station_frequency_info_dl = -1;
-static int hf_mbim_base_station_frequency_info_nt = -1;
-static int hf_mbim_base_station_uarfcn = -1;
-static int hf_mbim_base_station_primary_scrambling_code = -1;
-static int hf_mbim_base_station_rscp = -1;
-static int hf_mbim_base_station_ecno = -1;
-static int hf_mbim_base_station_path_loss = -1;
-static int hf_mbim_base_station_call_parameter = -1;
-static int hf_mbim_base_station_earfcn = -1;
-static int hf_mbim_base_station_physical_cell_id = -1;
-static int hf_mbim_base_station_tac = -1;
-static int hf_mbim_base_station_rsrp = -1;
-static int hf_mbim_base_station_rsrq = -1;
-static int hf_mbim_base_station_serving_cell_flag = -1;
-static int hf_mbim_base_station_nid = -1;
-static int hf_mbim_base_station_sid = -1;
-static int hf_mbim_base_station_base_latitude = -1;
-static int hf_mbim_base_station_base_longitude = -1;
-static int hf_mbim_base_station_ref_pn = -1;
-static int hf_mbim_base_station_gps_seconds = -1;
-static int hf_mbim_base_station_pilot_strength = -1;
-static int hf_mbim_base_station_nci = -1;
-static int hf_mbim_base_station_cell_id_offset = -1;
-static int hf_mbim_base_station_cell_id_size = -1;
-static int hf_mbim_base_station_sinr = -1;
-static int hf_mbim_base_station_cell_id_string = -1;
-static int hf_mbim_base_station_system_type = -1;
-static int hf_mbim_base_station_system_sub_type = -1;
-static int hf_mbim_base_station_gsm_serving_cell_offset = -1;
-static int hf_mbim_base_station_gsm_serving_cell_size = -1;
-static int hf_mbim_base_station_umts_serving_cell_offset = -1;
-static int hf_mbim_base_station_umts_serving_cell_size = -1;
-static int hf_mbim_base_station_td_scdma_serving_cell_offset = -1;
-static int hf_mbim_base_station_td_scdma_serving_cell_size = -1;
-static int hf_mbim_base_station_lte_serving_cell_offset = -1;
-static int hf_mbim_base_station_lte_serving_cell_size = -1;
-static int hf_mbim_base_station_gsm_nmr_offset = -1;
-static int hf_mbim_base_station_gsm_nmr_size = -1;
-static int hf_mbim_base_station_umts_mrl_offset = -1;
-static int hf_mbim_base_station_umts_mrl_size = -1;
-static int hf_mbim_base_station_td_scdma_mrl_offset = -1;
-static int hf_mbim_base_station_td_scdma_mrl_size = -1;
-static int hf_mbim_base_station_lte_mrl_offset = -1;
-static int hf_mbim_base_station_lte_mrl_size = -1;
-static int hf_mbim_base_station_cdma_mrl_offset = -1;
-static int hf_mbim_base_station_cdma_mrl_size = -1;
-static int hf_mbim_base_station_nr_serving_cell_offset = -1;
-static int hf_mbim_base_station_nr_serving_cell_size = -1;
-static int hf_mbim_base_station_nr_neighbor_cells_offset = -1;
-static int hf_mbim_base_station_nr_neighbor_cells_size = -1;
-static int hf_mbim_base_station_count = -1;
-static int hf_mbim_ms_modem_config_config_status = -1;
-static int hf_mbim_ms_registration_params_info_mico_mode = -1;
-static int hf_mbim_ms_registration_params_info_drx_params = -1;
-static int hf_mbim_ms_registration_params_info_ladn_info = -1;
-static int hf_mbim_ms_registration_params_info_default_pdu_hint = -1;
-static int hf_mbim_ms_registration_params_info_re_register_if_needed = -1;
-static int hf_mbim_ms_network_params_info_mico_indication = -1;
-static int hf_mbim_ms_network_params_info_drx_params = -1;
-static int hf_mbim_ms_wake_reason_wake_type = -1;
-static int hf_mbim_ms_wake_reason_session_id = -1;
-static int hf_mbim_ms_wake_reason_command_payload_offset = -1;
-static int hf_mbim_ms_wake_reason_command_payload_size = -1;
-static int hf_mbim_ms_wake_reason_command_payload = -1;
-static int hf_mbim_ms_wake_reason_packet_original_size = -1;
-static int hf_mbim_ms_wake_reason_packet_saved_offset = -1;
-static int hf_mbim_ms_wake_reason_packet_saved_size = -1;
-static int hf_mbim_ms_wake_reason_packet_saved_data = -1;
-static int hf_mbim_ms_slot_id = -1;
-static int hf_mbim_ms_open_channel_app_id_size = -1;
-static int hf_mbim_ms_open_channel_app_id_offset = -1;
-static int hf_mbim_ms_open_channel_select_p2_arg = -1;
-static int hf_mbim_ms_uicc_channel_group = -1;
-static int hf_mbim_ms_open_channel_app_id = -1;
-static int hf_mbim_ms_uicc_status = -1;
-static int hf_mbim_ms_uicc_channel = -1;
-static int hf_mbim_ms_uicc_response_length = -1;
-static int hf_mbim_ms_uicc_response_offset = -1;
-static int hf_mbim_ms_uicc_response = -1;
-static int hf_mbim_ms_apdu_secure_messaging = -1;
-static int hf_mbim_ms_apdu_type = -1;
-static int hf_mbim_ms_apdu_command_size = -1;
-static int hf_mbim_ms_apdu_command_offset = -1;
-static int hf_mbim_ms_apdu_command = -1;
-static int hf_mbim_ms_terminal_capability_count = -1;
-static int hf_mbim_ms_terminal_capability_offset = -1;
-static int hf_mbim_ms_terminal_capability_size = -1;
-static int hf_mbim_ms_terminal_capability = -1;
-static int hf_mbim_ms_reset_pass_through_action = -1;
-static int hf_mbim_ms_atr_info_atr_offset = -1;
-static int hf_mbim_ms_atr_info_atr_size = -1;
-static int hf_mbim_ms_app_info_app_type = -1;
-static int hf_mbim_ms_app_info_app_id_offset = -1;
-static int hf_mbim_ms_app_info_app_id_size = -1;
-static int hf_mbim_ms_app_info_app_id = -1;
-static int hf_mbim_ms_app_info_app_name_offset = -1;
-static int hf_mbim_ms_app_info_app_name_size = -1;
-static int hf_mbim_ms_app_info_app_name = -1;
-static int hf_mbim_ms_app_info_num_pins = -1;
-static int hf_mbim_ms_app_info_pin_ref_offset = -1;
-static int hf_mbim_ms_app_info_pin_ref_size = -1;
-static int hf_mbim_ms_app_info_pin_ref = -1;
-static int hf_mbim_ms_app_list_version = -1;
-static int hf_mbim_ms_app_list_app_count = -1;
-static int hf_mbim_ms_app_list_active_app_index = -1;
-static int hf_mbim_ms_app_list_size = -1;
-static int hf_mbim_ms_app_list_app_info_offset = -1;
-static int hf_mbim_ms_app_list_app_info_size = -1;
-static int hf_mbim_ms_file_path_version = -1;
-static int hf_mbim_ms_file_path_app_id_offset = -1;
-static int hf_mbim_ms_file_path_app_id_size = -1;
-static int hf_mbim_ms_file_path_file_path_offset = -1;
-static int hf_mbim_ms_file_path_file_path_size = -1;
-static int hf_mbim_ms_file_path_app_id = -1;
-static int hf_mbim_ms_file_path_file_path = -1;
-static int hf_mbim_ms_file_status_version = -1;
-static int hf_mbim_ms_file_status_status_word_1 = -1;
-static int hf_mbim_ms_file_status_status_word_2 = -1;
-static int hf_mbim_ms_file_status_file_accessibility = -1;
-static int hf_mbim_ms_file_status_file_type = -1;
-static int hf_mbim_ms_file_status_file_structure = -1;
-static int hf_mbim_ms_file_status_item_count = -1;
-static int hf_mbim_ms_file_status_size = -1;
-static int hf_mbim_ms_file_status_file_lock_status = -1;
-static int hf_mbim_ms_response_version = -1;
-static int hf_mbim_ms_response_status_word_1 = -1;
-static int hf_mbim_ms_response_status_word_2 = -1;
-static int hf_mbim_ms_response_response_data_offset = -1;
-static int hf_mbim_ms_response_response_data_size = -1;
-static int hf_mbim_ms_response_response_data = -1;
-static int hf_mbim_ms_access_binary_version = -1;
-static int hf_mbim_ms_access_binary_app_id_offset = -1;
-static int hf_mbim_ms_access_binary_app_id_size = -1;
-static int hf_mbim_ms_access_binary_file_path_offset = -1;
-static int hf_mbim_ms_access_binary_file_path_size = -1;
-static int hf_mbim_ms_access_binary_file_offset = -1;
-static int hf_mbim_ms_access_binary_number_of_bytes = -1;
-static int hf_mbim_ms_access_binary_local_pin_offset = -1;
-static int hf_mbim_ms_access_binary_local_pin_size = -1;
-static int hf_mbim_ms_access_binary_binary_data_offset = -1;
-static int hf_mbim_ms_access_binary_binary_data_size = -1;
-static int hf_mbim_ms_access_binary_app_id = -1;
-static int hf_mbim_ms_access_binary_file_path = -1;
-static int hf_mbim_ms_access_binary_local_pin = -1;
-static int hf_mbim_ms_access_binary_binary_data = -1;
-static int hf_mbim_ms_access_record_version = -1;
-static int hf_mbim_ms_access_record_app_id_offset = -1;
-static int hf_mbim_ms_access_record_app_id_size = -1;
-static int hf_mbim_ms_access_record_file_path_offset = -1;
-static int hf_mbim_ms_access_record_file_path_size = -1;
-static int hf_mbim_ms_access_record_record_number = -1;
-static int hf_mbim_ms_access_record_local_pin_offset = -1;
-static int hf_mbim_ms_access_record_local_pin_size = -1;
-static int hf_mbim_ms_access_record_record_data_offset = -1;
-static int hf_mbim_ms_access_record_record_data_size = -1;
-static int hf_mbim_ms_access_record_app_id = -1;
-static int hf_mbim_ms_access_record_file_path = -1;
-static int hf_mbim_ms_access_record_local_pin = -1;
-static int hf_mbim_ms_access_record_record_data = -1;
-static int hf_mbim_nitz_year = -1;
-static int hf_mbim_nitz_month = -1;
-static int hf_mbim_nitz_day = -1;
-static int hf_mbim_nitz_hour = -1;
-static int hf_mbim_nitz_minute = -1;
-static int hf_mbim_nitz_second = -1;
-static int hf_mbim_nitz_timezone_offset_minutes = -1;
-static int hf_mbim_nitz_daylight_saving_time_offset_minutes = -1;
-static int hf_mbim_nitz_data_class = -1;
-static int hf_mbim_fragmented_payload = -1;
-static int hf_mbim_request_in = -1;
-static int hf_mbim_response_in = -1;
-static int hf_mbim_descriptor = -1;
-static int hf_mbim_descriptor_version = -1;
-static int hf_mbim_descriptor_max_control_message = -1;
-static int hf_mbim_descriptor_number_filters = -1;
-static int hf_mbim_descriptor_max_filter_size = -1;
-static int hf_mbim_descriptor_max_segment_size = -1;
-static int hf_mbim_descriptor_network_capabilities = -1;
-static int hf_mbim_descriptor_network_capabilities_max_datagram_size = -1;
-static int hf_mbim_descriptor_network_capabilities_ntb_input_size = -1;
-static int hf_mbim_descriptor_extended_version = -1;
-static int hf_mbim_descriptor_max_outstanding_command_messages = -1;
-static int hf_mbim_descriptor_mtu = -1;
-static int hf_mbim_bulk = -1;
-static int hf_mbim_bulk_nth_signature = -1;
-static int hf_mbim_bulk_nth_header_length = -1;
-static int hf_mbim_bulk_nth_sequence_number = -1;
-static int hf_mbim_bulk_nth_block_length = -1;
-static int hf_mbim_bulk_nth_block_length_32 = -1;
-static int hf_mbim_bulk_nth_ndp_index = -1;
-static int hf_mbim_bulk_nth_ndp_index_32 = -1;
-static int hf_mbim_bulk_ndp_signature = -1;
-static int hf_mbim_bulk_ndp_signature_ips_session_id = -1;
-static int hf_mbim_bulk_ndp_signature_ipc_session_id = -1;
-static int hf_mbim_bulk_ndp_signature_dss_session_id = -1;
-static int hf_mbim_bulk_ndp_signature_dsc_session_id = -1;
-static int hf_mbim_bulk_ndp_length = -1;
-static int hf_mbim_bulk_ndp_next_ndp_index = -1;
-static int hf_mbim_bulk_ndp_next_ndp_index_32 = -1;
-static int hf_mbim_bulk_ndp_reserved = -1;
-static int hf_mbim_bulk_ndp_reserved2 = -1;
-static int hf_mbim_bulk_ndp_datagram_index = -1;
-static int hf_mbim_bulk_ndp_datagram_index_32 = -1;
-static int hf_mbim_bulk_ndp_datagram_length = -1;
-static int hf_mbim_bulk_ndp_datagram_length_32 = -1;
-static int hf_mbim_bulk_ndp_datagram = -1;
-static int hf_mbim_bulk_ndp_nb_datagrams = -1;
-static int hf_mbim_bulk_total_nb_datagrams = -1;
-static int hf_mbim_bulk_ndp_ctrl = -1;
-static int hf_mbim_bulk_ndp_ctrl_message_type = -1;
-static int hf_mbim_bulk_ndp_ctrl_message_length = -1;
-static int hf_mbim_bulk_ndp_ctrl_multiflow_status = -1;
-static int hf_mbim_bulk_ndp_ctrl_multiflow_watermark = -1;
-static int hf_mbim_bulk_ndp_ctrl_message_payload = -1;
-static int hf_mbim_fragments = -1;
-static int hf_mbim_fragment = -1;
-static int hf_mbim_fragment_overlap = -1;
-static int hf_mbim_fragment_overlap_conflict = -1;
-static int hf_mbim_fragment_multiple_tails = -1;
-static int hf_mbim_fragment_too_long_fragment = -1;
-static int hf_mbim_fragment_error = -1;
-static int hf_mbim_fragment_count = -1;
-static int hf_mbim_reassembled_in = -1;
-static int hf_mbim_reassembled_length = -1;
-static int hf_mbim_reassembled_data = -1;
-
-static expert_field ei_mbim_max_ctrl_transfer = EI_INIT;
-static expert_field ei_mbim_unexpected_msg = EI_INIT;
-static expert_field ei_mbim_unexpected_info_buffer = EI_INIT;
-static expert_field ei_mbim_illegal_on_link_prefix_length = EI_INIT;
-static expert_field ei_mbim_unknown_sms_format = EI_INIT;
-static expert_field ei_mbim_unexpected_uuid_value = EI_INIT;
-static expert_field ei_mbim_too_many_items = EI_INIT;
-static expert_field ei_mbim_alignment_error = EI_INIT;
-static expert_field ei_mbim_invalid_block_len = EI_INIT;
-static expert_field ei_mbim_out_of_bounds_index = EI_INIT;
-static expert_field ei_mbim_oversized_string = EI_INIT;
-static expert_field ei_mbim_oversized_pdu = EI_INIT;
+static int proto_mbim;
+static int hf_mbim_control;
+static int hf_mbim_header_message_type;
+static int hf_mbim_header_message_length;
+static int hf_mbim_header_transaction_id;
+static int hf_mbim_fragment_total;
+static int hf_mbim_fragment_current;
+static int hf_mbim_max_ctrl_transfer;
+static int hf_mbim_device_service_id;
+static int hf_mbim_uuid_basic_connect_cid;
+static int hf_mbim_uuid_sms_cid;
+static int hf_mbim_uuid_ussd_cid;
+static int hf_mbim_uuid_phonebook_cid;
+static int hf_mbim_uuid_stk_cid;
+static int hf_mbim_uuid_auth_cid;
+static int hf_mbim_uuid_dss_cid;
+static int hf_mbim_uuid_multicarrier_cid;
+static int hf_mbim_uuid_ms_hostshutdown_cid;
+static int hf_mbim_uuid_msfwid_cid;
+static int hf_mbim_uuid_qmi_cid;
+static int hf_mbim_uuid_intel_fwusvc_cid;
+static int hf_mbim_uuid_intel_dptf_cid;
+static int hf_mbim_uuid_intel_sar_cid;
+static int hf_mbim_uuid_intel_act_cid;
+static int hf_mbim_uuid_intel_trcsvc_cid;
+static int hf_mbim_uuid_intel_nrtc_cid;
+static int hf_mbim_uuid_intel_usb_profile_cid;
+static int hf_mbim_uuid_intel_ciq_cid;
+static int hf_mbim_uuid_atds_cid;
+static int hf_mbim_uuid_multiflow_cid;
+static int hf_mbim_uuid_basic_connect_extensions_cid;
+static int hf_mbim_uuid_ms_sarcontrol_cid;
+static int hf_mbim_uuid_ms_uicc_low_level_cid;
+static int hf_mbim_uuid_ms_voice_extensions_cid;
+static int hf_mbim_cid;
+static int hf_mbim_command_type;
+static int hf_mbim_info_buffer_len;
+static int hf_mbim_info_buffer;
+static int hf_mbim_error_status_code;
+static int hf_mbim_status;
+static int hf_mbim_tlv_ie_type;
+static int hf_mbim_tlv_ie_reserved;
+static int hf_mbim_tlv_ie_padding_length;
+static int hf_mbim_tlv_ie_data_length;
+static int hf_mbim_tlv_ie_unnamed_data;
+static int hf_mbim_tlv_ie_data_wchar_str;
+static int hf_mbim_tlv_ie_data_int32;
+static int hf_mbim_tlv_ie_data_guid;
+static int hf_mbim_tlv_ie_padding;
+static int hf_mbim_ms_ursp_tc_length;
+static int hf_mbim_ms_ursp_precedence;
+static int hf_mbim_ms_ursp_tc_type;
+static int hf_mbim_ms_ursp_tc_os_id;
+static int hf_mbim_ms_ursp_tc_dnn;
+static int hf_mbim_ms_ursp_tc_fqdn;
+static int hf_mbim_ms_ursp_tc_ipv4;
+static int hf_mbim_ms_ursp_tc_ipv4_mask;
+static int hf_mbim_ms_ursp_tc_ipv6;
+static int hf_mbim_ms_ursp_tc_ipv6_prefix_length;
+static int hf_mbim_ms_ursp_tc_proto_id;
+static int hf_mbim_ms_ursp_tc_port;
+static int hf_mbim_ms_ursp_tc_port_range_low;
+static int hf_mbim_ms_ursp_tc_port_range_high;
+static int hf_mbim_ms_ursp_tc_app_id;
+static int hf_mbim_ms_ursp_tc_byte_value;
+static int hf_mbim_ms_ursp_tc_capability;
+static int hf_mbim_ms_ursp_tc_connection_capability_flag_ims;
+static int hf_mbim_ms_ursp_tc_connection_capability_flag_mms;
+static int hf_mbim_ms_ursp_tc_connection_capability_flag_supl;
+static int hf_mbim_ms_ursp_tc_connection_capability_flag_internet;
+static int hf_mbim_ms_snssai_length;
+static int hf_mbim_ms_snssai_slice_service_type;
+static int hf_mbim_ms_snssai_slice_differentiator;
+static int hf_mbim_ms_snssai_mapped_slice_service_type;
+static int hf_mbim_ms_snssai_mapped_slice_differentiator;
+static int hf_mbim_ms_rej_snssai_cause;
+static int hf_mbim_ms_pre_dflt_nssai_info_access_type;
+static int hf_mbim_device_caps_info_device_type;
+static int hf_mbim_device_caps_info_cellular_class;
+static int hf_mbim_cellular_class_gsm;
+static int hf_mbim_cellular_class_cdma;
+static int hf_mbim_device_caps_info_voice_class;
+static int hf_mbim_device_caps_info_sim_class;
+static int hf_mbim_device_caps_info_sim_class_logical;
+static int hf_mbim_device_caps_info_sim_class_removable;
+static int hf_mbim_device_caps_info_data_class;
+static int hf_mbim_data_class_gprs;
+static int hf_mbim_data_class_edge;
+static int hf_mbim_data_class_umts;
+static int hf_mbim_data_class_hsdpa;
+static int hf_mbim_data_class_hsupa;
+static int hf_mbim_data_class_lte;
+static int hf_mbim_data_class_5g;
+static int hf_mbim_data_class_reserved_gsm;
+static int hf_mbim_data_class_1xrtt;
+static int hf_mbim_data_class_1xevdo;
+static int hf_mbim_data_class_1xevdoreva;
+static int hf_mbim_data_class_1xevdv;
+static int hf_mbim_data_class_3xrtt;
+static int hf_mbim_data_class_1xevdorevb;
+static int hf_mbim_data_class_umb;
+static int hf_mbim_data_class_reserved_cdma;
+static int hf_mbim_data_class_custom;
+static int hf_mbim_device_caps_info_sms_caps;
+static int hf_mbim_device_caps_info_sms_caps_pdu_receive;
+static int hf_mbim_device_caps_info_sms_caps_pdu_send;
+static int hf_mbim_device_caps_info_sms_caps_text_receive;
+static int hf_mbim_device_caps_info_sms_caps_text_send;
+static int hf_mbim_device_caps_info_control_caps;
+static int hf_mbim_device_caps_info_control_caps_reg_manual;
+static int hf_mbim_device_caps_info_control_caps_hw_radio_switch;
+static int hf_mbim_device_caps_info_control_caps_cdma_mobile_ip;
+static int hf_mbim_device_caps_info_control_caps_cdma_simple_ip;
+static int hf_mbim_device_caps_info_control_caps_multi_carrier;
+static int hf_mbim_device_caps_info_control_caps_esim;
+static int hf_mbim_device_caps_info_control_caps_ue_policy_route_selection;
+static int hf_mbim_device_caps_info_control_caps_sim_hot_swap_capable;
+static int hf_mbim_device_caps_info_control_caps_use_ursp_rule_on_epc_capable;
+static int hf_mbim_device_caps_info_data_subclass;
+static int hf_mbim_data_subclass_5gendc;
+static int hf_mbim_data_subclass_5gnr;
+static int hf_mbim_data_subclass_5gnedc;
+static int hf_mbim_data_subclass_5gelte;
+static int hf_mbim_data_subclass_5gngendc;
+static int hf_mbim_device_caps_info_max_sessions;
+static int hf_mbim_device_caps_info_wcdma_band_class;
+static int hf_mbim_device_caps_info_custom_data_class_offset;
+static int hf_mbim_device_caps_info_custom_data_class_size;
+static int hf_mbim_device_caps_info_device_id_offset;
+static int hf_mbim_device_caps_info_device_id_size;
+static int hf_mbim_device_caps_info_fw_info_offset;
+static int hf_mbim_device_caps_info_fw_info_size;
+static int hf_mbim_device_caps_info_hw_info_offset;
+static int hf_mbim_device_caps_info_hw_info_size;
+static int hf_mbim_device_caps_info_custom_data_class;
+static int hf_mbim_device_caps_info_device_id;
+static int hf_mbim_device_caps_info_fw_info;
+static int hf_mbim_device_caps_info_hw_info;
+static int hf_mbim_device_caps_info_v2_executor_index;
+static int hf_mbim_subscr_ready_status_ready_state;
+static int hf_mbim_subscr_ready_status_flags;
+static int hf_mbim_subscr_ready_status_flag_esim;
+static int hf_mbim_subscr_ready_status_flag_sim_removability_known;
+static int hf_mbim_subscr_ready_status_flag_sim_removable;
+static int hf_mbim_subscr_ready_status_flag_sim_slot_active;
+static int hf_mbim_subscr_ready_status_susbcr_id_offset;
+static int hf_mbim_subscr_ready_status_susbcr_id_size;
+static int hf_mbim_subscr_ready_status_sim_icc_id_offset;
+static int hf_mbim_subscr_ready_status_sim_icc_id_size;
+static int hf_mbim_subscr_ready_status_ready_info;
+static int hf_mbim_subscr_ready_status_elem_count;
+static int hf_mbim_subscr_ready_status_tel_nb_offset;
+static int hf_mbim_subscr_ready_status_tel_nb_size;
+static int hf_mbim_subscr_ready_status_susbcr_id;
+static int hf_mbim_subscr_ready_status_sim_icc_id;
+static int hf_mbim_subscr_ready_status_tel_nb;
+static int hf_mbim_radio_state_set;
+static int hf_mbim_radio_state_hw_radio_state;
+static int hf_mbim_radio_state_sw_radio_state;
+static int hf_mbim_set_pin_pin_type;
+static int hf_mbim_set_pin_pin_pin_operation;
+static int hf_mbim_set_pin_pin_pin_offset;
+static int hf_mbim_set_pin_pin_pin_size;
+static int hf_mbim_set_pin_new_pin_offset;
+static int hf_mbim_set_pin_new_pin_size;
+static int hf_mbim_set_pin_pin;
+static int hf_mbim_set_pin_new_pin;
+static int hf_mbim_pin_info_pin_type;
+static int hf_mbim_pin_info_pin_state;
+static int hf_mbim_pin_info_remaining_attempts;
+static int hf_mbim_pin_list_pin_mode;
+static int hf_mbim_pin_list_pin_format;
+static int hf_mbim_pin_list_pin_length_min;
+static int hf_mbim_pin_list_pin_length_max;
+static int hf_mbim_provider_state;
+static int hf_mbim_provider_state_home;
+static int hf_mbim_provider_state_forbidden;
+static int hf_mbim_provider_state_preferred;
+static int hf_mbim_provider_state_visible;
+static int hf_mbim_provider_state_registered;
+static int hf_mbim_provider_state_preferred_multicarrier;
+static int hf_mbim_provider_provider_id_offset;
+static int hf_mbim_provider_provider_id_size;
+static int hf_mbim_provider_provider_name_offset;
+static int hf_mbim_provider_provider_name_size;
+static int hf_mbim_provider_cellular_class;
+static int hf_mbim_provider_rssi;
+static int hf_mbim_provider_error_rate;
+static int hf_mbim_provider_provider_id;
+static int hf_mbim_provider_provider_name;
+static int hf_mbim_providers_elem_count;
+static int hf_mbim_providers_provider_offset;
+static int hf_mbim_providers_provider_size;
+static int hf_mbim_visible_providers_req_action;
+static int hf_mbim_set_register_state_provider_id_offset;
+static int hf_mbim_set_register_state_provider_id_size;
+static int hf_mbim_set_register_state_register_action;
+static int hf_mbim_register_state_data_class;
+static int hf_mbim_set_register_state_provider_id;
+static int hf_mbim_registration_state_info_nw_error;
+static int hf_mbim_registration_state_info_register_state;
+static int hf_mbim_registration_state_info_register_mode;
+static int hf_mbim_registration_state_info_available_data_classes;
+static int hf_mbim_registration_state_info_current_cellular_class;
+static int hf_mbim_registration_state_info_provider_id_offset;
+static int hf_mbim_registration_state_info_provider_id_size;
+static int hf_mbim_registration_state_info_provider_name_offset;
+static int hf_mbim_registration_state_info_provider_name_size;
+static int hf_mbim_registration_state_info_roaming_text_offset;
+static int hf_mbim_registration_state_info_roaming_text_size;
+static int hf_mbim_registration_state_info_registration_flags;
+static int hf_mbim_registration_state_info_registration_flags_manual_selection_not_available;
+static int hf_mbim_registration_state_info_registration_flags_packet_service_auto_attach;
+static int hf_mbim_registration_state_info_preferred_data_class;
+static int hf_mbim_registration_state_info_provider_id;
+static int hf_mbim_registration_state_info_provider_name;
+static int hf_mbim_registration_state_info_roaming_text;
+static int hf_mbim_set_packet_service_action;
+static int hf_mbim_ms_plmn_mcc;
+static int hf_mbim_ms_plmn_mnc;
+static int hf_mbim_ms_tai_tac;
+static int hf_mbim_ms_tai_list_type;
+static int hf_mbim_ms_tai_list_single_plmn_tac_element;
+static int hf_mbim_ms_tai_list_multi_plmn_tai_element;
+static int hf_mbim_packet_service_info_nw_error;
+static int hf_mbim_packet_service_info_packet_service_state;
+static int hf_mbim_packet_service_info_highest_available_data_class;
+static int hf_mbim_packet_service_info_current_data_class;
+static int hf_mbim_packet_service_info_uplink_speed;
+static int hf_mbim_packet_service_info_downlink_speed;
+static int hf_mbim_packet_service_info_frequency_range;
+static int hf_mbim_packet_service_info_data_subclass;
+static int hf_mbim_set_signal_state_signal_strength_interval;
+static int hf_mbim_set_signal_state_rssi_threshold;
+static int hf_mbim_set_signal_state_error_rate_threshold;
+static int hf_mbim_signal_state_element_rsrp;
+static int hf_mbim_signal_state_element_snr;
+static int hf_mbim_signal_state_element_rsrp_threshold;
+static int hf_mbim_signal_state_element_snr_threshold;
+static int hf_mbim_signal_state_element_system_type;
+static int hf_mbim_signal_state_info_rssi;
+static int hf_mbim_signal_state_info_error_rate;
+static int hf_mbim_signal_state_info_signal_strength_interval;
+static int hf_mbim_signal_state_info_rssi_threshold;
+static int hf_mbim_signal_state_info_error_rate_threshold;
+static int hf_mbim_signal_state_info_rsrp_snr_offset;
+static int hf_mbim_signal_state_info_rsrp_snr_size;
+static int hf_mbim_signal_state_info_elem_count;
+static int hf_mbim_context_type;
+static int hf_mbim_set_connect_session_id;
+static int hf_mbim_set_connect_activation_command;
+static int hf_mbim_set_connect_activation_option;
+static int hf_mbim_set_connect_access_string_offset;
+static int hf_mbim_set_connect_access_string_size;
+static int hf_mbim_set_connect_user_name_offset;
+static int hf_mbim_set_connect_user_name_size;
+static int hf_mbim_set_connect_password_offset;
+static int hf_mbim_set_connect_password_size;
+static int hf_mbim_set_connect_compression;
+static int hf_mbim_set_connect_auth_protocol;
+static int hf_mbim_set_connect_ip_type;
+static int hf_mbim_set_connect_access_string;
+static int hf_mbim_set_connect_user_name;
+static int hf_mbim_set_connect_password;
+static int hf_mbim_set_connect_media_preference;
+static int hf_mbim_connect_info_session_id;
+static int hf_mbim_connect_info_activation_state;
+static int hf_mbim_connect_info_voice_call_state;
+static int hf_mbim_connect_info_ip_type;
+static int hf_mbim_connect_info_nw_error;
+static int hf_mbim_connect_info_access_media;
+static int hf_mbim_context_context_id;
+static int hf_mbim_context_access_string_offset;
+static int hf_mbim_context_access_string_size;
+static int hf_mbim_context_user_name_offset;
+static int hf_mbim_context_user_name_size;
+static int hf_mbim_context_password_offset;
+static int hf_mbim_context_password_size;
+static int hf_mbim_context_compression;
+static int hf_mbim_context_auth_protocol;
+static int hf_mbim_context_provider_id_offset;
+static int hf_mbim_context_provider_id_size;
+static int hf_mbim_context_provider_id;
+static int hf_mbim_context_access_string;
+static int hf_mbim_context_user_name;
+static int hf_mbim_context_password;
+static int hf_mbim_provisioned_contexts_info_elem_count;
+static int hf_mbim_provisioned_contexts_info_provisioned_context_offset;
+static int hf_mbim_provisioned_contexts_info_provisioned_context_size;
+static int hf_mbim_set_service_activation_data_buffer;
+static int hf_mbim_service_activation_info_nw_error;
+static int hf_mbim_service_activation_info_data_buffer;
+static int hf_mbim_ipv4_element_on_link_prefix_length;
+static int hf_mbim_ipv4_element_ipv4_address;
+static int hf_mbim_ipv6_element_on_link_prefix_length;
+static int hf_mbim_ipv6_element_ipv6_address;
+static int hf_mbim_ip_configuration_info_session_id;
+static int hf_mbim_ip_configuration_info_ipv4_configuration_available;
+static int hf_mbim_ip_configuration_info_ipv4_configuration_available_address;
+static int hf_mbim_ip_configuration_info_ipv4_configuration_available_gateway;
+static int hf_mbim_ip_configuration_info_ipv4_configuration_available_dns;
+static int hf_mbim_ip_configuration_info_ipv4_configuration_available_mtu;
+static int hf_mbim_ip_configuration_info_ipv6_configuration_available;
+static int hf_mbim_ip_configuration_info_ipv6_configuration_available_address;
+static int hf_mbim_ip_configuration_info_ipv6_configuration_available_gateway;
+static int hf_mbim_ip_configuration_info_ipv6_configuration_available_dns;
+static int hf_mbim_ip_configuration_info_ipv6_configuration_available_mtu;
+static int hf_mbim_ip_configuration_info_ipv4_address_count;
+static int hf_mbim_ip_configuration_info_ipv4_address_offset;
+static int hf_mbim_ip_configuration_info_ipv6_address_count;
+static int hf_mbim_ip_configuration_info_ipv6_address_offset;
+static int hf_mbim_ip_configuration_info_ipv4_gateway_offset;
+static int hf_mbim_ip_configuration_info_ipv6_gateway_offset;
+static int hf_mbim_ip_configuration_info_ipv4_dns_count;
+static int hf_mbim_ip_configuration_info_ipv4_dns_offset;
+static int hf_mbim_ip_configuration_info_ipv6_dns_count;
+static int hf_mbim_ip_configuration_info_ipv6_dns_offset;
+static int hf_mbim_ip_configuration_info_ipv4_mtu;
+static int hf_mbim_ip_configuration_info_ipv6_mtu;
+static int hf_mbim_ip_configuration_info_ipv4_gateway;
+static int hf_mbim_ip_configuration_info_ipv6_gateway;
+static int hf_mbim_ip_configuration_info_ipv4_dns;
+static int hf_mbim_ip_configuration_info_ipv6_dns;
+static int hf_mbim_device_service_element_device_service_id;
+static int hf_mbim_device_service_element_dss_payload;
+static int hf_mbim_device_service_element_dss_payload_host_device;
+static int hf_mbim_device_service_element_dss_payload_device_host;
+static int hf_mbim_device_service_element_max_dss_instances;
+static int hf_mbim_device_service_element_cid_count;
+static int hf_mbim_device_service_element_cid;
+static int hf_mbim_device_services_info_device_services_count;
+static int hf_mbim_device_services_info_max_dss_sessions;
+static int hf_mbim_device_services_info_device_services_offset;
+static int hf_mbim_device_services_info_device_services_size;
+static int hf_mbim_event_entry_device_service_id;
+static int hf_mbim_event_entry_cid_count;
+static int hf_mbim_event_entry_cid;
+static int hf_mbim_device_service_subscribe_element_count;
+static int hf_mbim_device_service_subscribe_device_service_offset;
+static int hf_mbim_device_service_subscribe_device_service_size;
+static int hf_mbim_packet_statistics_info_in_discards;
+static int hf_mbim_packet_statistics_info_in_errors;
+static int hf_mbim_packet_statistics_info_in_octets;
+static int hf_mbim_packet_statistics_info_in_packets;
+static int hf_mbim_packet_statistics_info_out_octets;
+static int hf_mbim_packet_statistics_info_out_packets;
+static int hf_mbim_packet_statistics_info_out_errors;
+static int hf_mbim_packet_statistics_info_out_discards;
+static int hf_mbim_network_idle_hint_state;
+static int hf_mbim_emergency_mode_info_emergency_mode;
+static int hf_mbim_single_packet_filter_filter_size;
+static int hf_mbim_single_packet_filter_packet_filter_offset;
+static int hf_mbim_single_packet_filter_packet_mask_offset;
+static int hf_mbim_single_packet_filter_filter_id;
+static int hf_mbim_single_packet_filter_packet_filter;
+static int hf_mbim_single_packet_filter_packet_mask;
+static int hf_mbim_packet_filters_session_id;
+static int hf_mbim_packet_filters_packet_filters_count;
+static int hf_mbim_packet_filters_packet_filters_packet_filter_offset;
+static int hf_mbim_packet_filters_packet_filters_packet_filter_size;
+static int hf_mbim_set_sms_configuration_format;
+static int hf_mbim_set_sms_configuration_sc_address_offset;
+static int hf_mbim_set_sms_configuration_sc_address_size;
+static int hf_mbim_set_sms_configuration_sc_address;
+static int hf_mbim_sms_configuration_info_sms_storage_state;
+static int hf_mbim_sms_configuration_info_format;
+static int hf_mbim_sms_configuration_info_max_messages;
+static int hf_mbim_sms_configuration_info_cdma_short_message_size;
+static int hf_mbim_sms_configuration_info_sc_address_offset;
+static int hf_mbim_sms_configuration_info_sc_address_size;
+static int hf_mbim_sms_configuration_info_sc_address;
+static int hf_mbim_sms_pdu_record_message_index;
+static int hf_mbim_sms_pdu_record_message_status;
+static int hf_mbim_sms_pdu_record_pdu_data_offset;
+static int hf_mbim_sms_pdu_record_pdu_data_size;
+static int hf_mbim_sms_pdu_record_pdu_data;
+static int hf_mbim_sms_pdu_record_pdu_data_sc_address_size;
+static int hf_mbim_sms_cdma_record_message_index;
+static int hf_mbim_sms_cdma_record_message_status;
+static int hf_mbim_sms_cdma_record_address_offset;
+static int hf_mbim_sms_cdma_record_address_size;
+static int hf_mbim_sms_cdma_record_timestamp_offset;
+static int hf_mbim_sms_cdma_record_timestamp_size;
+static int hf_mbim_sms_cdma_record_encoding_id;
+static int hf_mbim_sms_cdma_record_language_id;
+static int hf_mbim_sms_cdma_record_encoded_message_offset;
+static int hf_mbim_sms_cdma_record_size_in_bytes;
+static int hf_mbim_sms_cdma_record_size_in_characters;
+static int hf_mbim_sms_cdma_record_address;
+static int hf_mbim_sms_cdma_record_timestamp;
+static int hf_mbim_sms_cdma_record_encoded_message;
+static int hf_mbim_sms_cdma_record_encoded_message_text;
+static int hf_mbim_sms_read_req_format;
+static int hf_mbim_sms_read_req_flag;
+static int hf_mbim_sms_read_req_message_index;
+static int hf_mbim_sms_read_info_format;
+static int hf_mbim_sms_read_info_element_count;
+static int hf_mbim_sms_read_info_sms_offset;
+static int hf_mbim_sms_read_info_sms_size;
+static int hf_mbim_sms_send_pdu_pdu_data_offset;
+static int hf_mbim_sms_send_pdu_pdu_data_size;
+static int hf_mbim_sms_send_pdu_pdu_data;
+static int hf_mbim_sms_send_pdu_pdu_data_sc_address_size;
+static int hf_mbim_sms_send_cdma_encoding_id;
+static int hf_mbim_sms_send_cdma_language_id;
+static int hf_mbim_sms_send_cdma_address_offset;
+static int hf_mbim_sms_send_cdma_address_size;
+static int hf_mbim_sms_send_cdma_encoded_message_offset;
+static int hf_mbim_sms_send_cdma_size_in_bytes;
+static int hf_mbim_sms_send_cdma_size_in_characters;
+static int hf_mbim_sms_send_cdma_address;
+static int hf_mbim_sms_send_cdma_encoded_message;
+static int hf_mbim_sms_send_cdma_encoded_message_text;
+static int hf_mbim_set_sms_send_format;
+static int hf_mbim_sms_send_info_message_reference;
+static int hf_mbim_set_sms_delete_flag;
+static int hf_mbim_set_sms_delete_message_index;
+static int hf_mbim_sms_status_info_flags;
+static int hf_mbim_sms_status_info_flags_message_store_full;
+static int hf_mbim_sms_status_info_flags_new_message;
+static int hf_mbim_sms_status_info_message_index;
+static int hf_mbim_set_ussd_ussd_action;
+static int hf_mbim_set_ussd_ussd_data_coding_scheme;
+static int hf_mbim_set_ussd_ussd_payload_offset;
+static int hf_mbim_set_ussd_ussd_payload_length;
+static int hf_mbim_set_ussd_ussd_payload;
+static int hf_mbim_set_ussd_ussd_payload_text;
+static int hf_mbim_ussd_info_ussd_response;
+static int hf_mbim_ussd_info_ussd_session_state;
+static int hf_mbim_ussd_info_ussd_data_coding_scheme;
+static int hf_mbim_ussd_info_ussd_payload_offset;
+static int hf_mbim_ussd_info_ussd_payload_length;
+static int hf_mbim_ussd_info_ussd_payload;
+static int hf_mbim_ussd_info_ussd_payload_text;
+static int hf_mbim_phonebook_configuration_info_phonebook_state;
+static int hf_mbim_phonebook_configuration_info_total_nb_of_entries;
+static int hf_mbim_phonebook_configuration_info_used_entries;
+static int hf_mbim_phonebook_configuration_info_max_number_length;
+static int hf_mbim_phonebook_configuration_info_max_name_length;
+static int hf_mbim_phonebook_entry_entry_index;
+static int hf_mbim_phonebook_entry_number_offset;
+static int hf_mbim_phonebook_entry_number_length;
+static int hf_mbim_phonebook_entry_name_offset;
+static int hf_mbim_phonebook_entry_name_length;
+static int hf_mbim_phonebook_entry_number;
+static int hf_mbim_phonebook_entry_name;
+static int hf_mbim_phonebook_read_req_filter_flag;
+static int hf_mbim_phonebook_read_req_filter_message_index;
+static int hf_mbim_phonebook_read_info_element_count;
+static int hf_mbim_phonebook_read_info_phonebook_offset;
+static int hf_mbim_phonebook_read_info_phonebook_size;
+static int hf_mbim_set_phonebook_delete_filter_flag;
+static int hf_mbim_set_phonebook_delete_filter_message_index;
+static int hf_mbim_set_phonebook_write_save_flag;
+static int hf_mbim_set_phonebook_write_save_index;
+static int hf_mbim_set_phonebook_write_number_offset;
+static int hf_mbim_set_phonebook_write_number_length;
+static int hf_mbim_set_phonebook_write_name_offset;
+static int hf_mbim_set_phonebook_write_name_length;
+static int hf_mbim_set_phonebook_write_number;
+static int hf_mbim_set_phonebook_write_name;
+static int hf_mbim_set_stk_pac_pac_host_control;
+static int hf_mbim_set_stk_pac_pac_host_control_refresh;
+static int hf_mbim_set_stk_pac_pac_host_control_more_time;
+static int hf_mbim_set_stk_pac_pac_host_control_poll_interval;
+static int hf_mbim_set_stk_pac_pac_host_control_polling_off;
+static int hf_mbim_set_stk_pac_pac_host_control_set_up_evt_list;
+static int hf_mbim_set_stk_pac_pac_host_control_set_up_call;
+static int hf_mbim_set_stk_pac_pac_host_control_send_ss;
+static int hf_mbim_set_stk_pac_pac_host_control_send_ussd;
+static int hf_mbim_set_stk_pac_pac_host_control_send_short_msg;
+static int hf_mbim_set_stk_pac_pac_host_control_send_dtmf;
+static int hf_mbim_set_stk_pac_pac_host_control_launch_browser;
+static int hf_mbim_set_stk_pac_pac_host_control_geo_loc_req;
+static int hf_mbim_set_stk_pac_pac_host_control_play_tone;
+static int hf_mbim_set_stk_pac_pac_host_control_display_text;
+static int hf_mbim_set_stk_pac_pac_host_control_get_inkey;
+static int hf_mbim_set_stk_pac_pac_host_control_get_input;
+static int hf_mbim_set_stk_pac_pac_host_control_select_item;
+static int hf_mbim_set_stk_pac_pac_host_control_set_up_menu;
+static int hf_mbim_set_stk_pac_pac_host_control_prov_local_info;
+static int hf_mbim_set_stk_pac_pac_host_control_timer_management;
+static int hf_mbim_set_stk_pac_pac_host_control_set_up_idle_mode_text;
+static int hf_mbim_set_stk_pac_pac_host_control_perform_card_apdu;
+static int hf_mbim_set_stk_pac_pac_host_control_power_on_card;
+static int hf_mbim_set_stk_pac_pac_host_control_power_off_card;
+static int hf_mbim_set_stk_pac_pac_host_control_get_reader_status;
+static int hf_mbim_set_stk_pac_pac_host_control_run_at_cmd;
+static int hf_mbim_set_stk_pac_pac_host_control_lang_notif;
+static int hf_mbim_set_stk_pac_pac_host_control_open_channel;
+static int hf_mbim_set_stk_pac_pac_host_control_close_channel;
+static int hf_mbim_set_stk_pac_pac_host_control_receive_data;
+static int hf_mbim_set_stk_pac_pac_host_control_send_data;
+static int hf_mbim_set_stk_pac_pac_host_control_get_channel_status;
+static int hf_mbim_set_stk_pac_pac_host_control_service_search;
+static int hf_mbim_set_stk_pac_pac_host_control_get_service_info;
+static int hf_mbim_set_stk_pac_pac_host_control_declare_service;
+static int hf_mbim_set_stk_pac_pac_host_control_set_frames;
+static int hf_mbim_set_stk_pac_pac_host_control_get_frames_status;
+static int hf_mbim_set_stk_pac_pac_host_control_retrieve_multimedia_msg;
+static int hf_mbim_set_stk_pac_pac_host_control_submit_multimedia_msg;
+static int hf_mbim_set_stk_pac_pac_host_control_display_multimedia_msg;
+static int hf_mbim_set_stk_pac_pac_host_control_activate;
+static int hf_mbim_set_stk_pac_pac_host_control_contactless_state_changed;
+static int hf_mbim_set_stk_pac_pac_host_control_cmd_container;
+static int hf_mbim_set_stk_pac_pac_host_control_encapsulated_session_ctrl;
+static int hf_mbim_set_stk_pac_pac_host_control_end_proact_session;
+static int hf_mbim_stk_pac_info_pac_support;
+static int hf_mbim_stk_pac_info_pac_support_refresh;
+static int hf_mbim_stk_pac_info_pac_support_more_time;
+static int hf_mbim_stk_pac_info_pac_support_poll_interval;
+static int hf_mbim_stk_pac_info_pac_support_polling_off;
+static int hf_mbim_stk_pac_info_pac_support_set_up_evt_list;
+static int hf_mbim_stk_pac_info_pac_support_set_up_call;
+static int hf_mbim_stk_pac_info_pac_support_send_ss;
+static int hf_mbim_stk_pac_info_pac_support_send_ussd;
+static int hf_mbim_stk_pac_info_pac_support_send_short_msg;
+static int hf_mbim_stk_pac_info_pac_support_send_dtmf;
+static int hf_mbim_stk_pac_info_pac_support_launch_browser;
+static int hf_mbim_stk_pac_info_pac_support_geo_loc_req;
+static int hf_mbim_stk_pac_info_pac_support_play_tone;
+static int hf_mbim_stk_pac_info_pac_support_display_text;
+static int hf_mbim_stk_pac_info_pac_support_get_inkey;
+static int hf_mbim_stk_pac_info_pac_support_get_input;
+static int hf_mbim_stk_pac_info_pac_support_select_item;
+static int hf_mbim_stk_pac_info_pac_support_set_up_menu;
+static int hf_mbim_stk_pac_info_pac_support_prov_local_info;
+static int hf_mbim_stk_pac_info_pac_support_timer_management;
+static int hf_mbim_stk_pac_info_pac_support_set_up_idle_mode_text;
+static int hf_mbim_stk_pac_info_pac_support_perform_card_apdu;
+static int hf_mbim_stk_pac_info_pac_support_power_on_card;
+static int hf_mbim_stk_pac_info_pac_support_power_off_card;
+static int hf_mbim_stk_pac_info_pac_support_get_reader_status;
+static int hf_mbim_stk_pac_info_pac_support_run_at_cmd;
+static int hf_mbim_stk_pac_info_pac_support_lang_notif;
+static int hf_mbim_stk_pac_info_pac_support_open_channel;
+static int hf_mbim_stk_pac_info_pac_support_close_channel;
+static int hf_mbim_stk_pac_info_pac_support_receive_data;
+static int hf_mbim_stk_pac_info_pac_support_send_data;
+static int hf_mbim_stk_pac_info_pac_support_get_channel_status;
+static int hf_mbim_stk_pac_info_pac_support_service_search;
+static int hf_mbim_stk_pac_info_pac_support_get_service_info;
+static int hf_mbim_stk_pac_info_pac_support_declare_service;
+static int hf_mbim_stk_pac_info_pac_support_set_frames;
+static int hf_mbim_stk_pac_info_pac_support_get_frames_status;
+static int hf_mbim_stk_pac_info_pac_support_retrieve_multimedia_msg;
+static int hf_mbim_stk_pac_info_pac_support_submit_multimedia_msg;
+static int hf_mbim_stk_pac_info_pac_support_display_multimedia_msg;
+static int hf_mbim_stk_pac_info_pac_support_activate;
+static int hf_mbim_stk_pac_info_pac_support_contactless_state_changed;
+static int hf_mbim_stk_pac_info_pac_support_cmd_container;
+static int hf_mbim_stk_pac_info_pac_support_encapsulated_session_ctrl;
+static int hf_mbim_stk_pac_info_pac_support_end_proact_session;
+static int hf_mbim_stk_pac_pac_type;
+static int hf_mbim_stk_pac_pac;
+static int hf_mbim_set_stk_terminal_response_response_length;
+static int hf_mbim_set_stk_terminal_response_data_buffer;
+static int hf_mbim_stk_terminal_response_info_result_data_string_offset;
+static int hf_mbim_stk_terminal_response_info_result_data_string_length;
+static int hf_mbim_stk_terminal_response_info_status_word;
+static int hf_mbim_stk_terminal_response_info_result_data_string;
+static int hf_mbim_set_stk_envelope_data_buffer;
+static int hf_mbim_stk_envelope_info_envelope_support;
+static int hf_mbim_aka_auth_req_rand;
+static int hf_mbim_aka_auth_req_autn;
+static int hf_mbim_aka_auth_info_res;
+static int hf_mbim_aka_auth_info_res_length;
+static int hf_mbim_aka_auth_info_ik;
+static int hf_mbim_aka_auth_info_ck;
+static int hf_mbim_aka_auth_info_auts;
+static int hf_mbim_akap_auth_req_rand;
+static int hf_mbim_akap_auth_req_autn;
+static int hf_mbim_akap_auth_req_network_name_offset;
+static int hf_mbim_akap_auth_req_network_name_length;
+static int hf_mbim_akap_auth_req_network_name;
+static int hf_mbim_akap_auth_info_res;
+static int hf_mbim_akap_auth_info_res_length;
+static int hf_mbim_akap_auth_info_ik;
+static int hf_mbim_akap_auth_info_ck;
+static int hf_mbim_akap_auth_info_auts;
+static int hf_mbim_sim_auth_req_rand1;
+static int hf_mbim_sim_auth_req_rand2;
+static int hf_mbim_sim_auth_req_rand3;
+static int hf_mbim_sim_auth_req_n;
+static int hf_mbim_sim_auth_info_sres1;
+static int hf_mbim_sim_auth_info_kc1;
+static int hf_mbim_sim_auth_info_sres2;
+static int hf_mbim_sim_auth_info_kc2;
+static int hf_mbim_sim_auth_info_sres3;
+static int hf_mbim_sim_auth_info_kc3;
+static int hf_mbim_sim_auth_info_n;
+static int hf_mbim_set_dss_connect_device_service_id;
+static int hf_mbim_set_dss_connect_dss_session_id;
+static int hf_mbim_set_dss_connect_dss_link_state;
+static int hf_mbim_multicarrier_capabilities_info_capabilities;
+static int hf_mbim_multicarrier_capabilities_info_capabilities_static_scan;
+static int hf_mbim_multicarrier_capabilities_info_capabilities_fw_requires_reboot;
+static int hf_mbim_location_info_country;
+static int hf_mbim_multicarrier_current_cid_list_req_uuid;
+static int hf_mbim_multicarrier_current_cid_list_info_cid_count;
+static int hf_mbim_multicarrier_current_cid_list_info_cid;
+static int hf_mbim_msfwid_firmwareid_info_firmware_id;
+static int hf_mbim_qmi_buffer;
+static int hf_mbim_thermal_config_enable;
+static int hf_mbim_thermal_config_temp_sensor_id;
+static int hf_mbim_thermal_config_alarm_id;
+static int hf_mbim_thermal_config_threshold_value;
+static int hf_mbim_thermal_config_hyst_value;
+static int hf_mbim_thermal_config_sampling_period;
+static int hf_mbim_query_thermal_state_temp_sensor_id;
+static int hf_mbim_thermal_state_info_current_temp_value;
+static int hf_mbim_thermal_state_info_enable;
+static int hf_mbim_thermal_state_info_temp_sensor_id;
+static int hf_mbim_thermal_state_info_alarm_id;
+static int hf_mbim_thermal_state_info_threshold_value;
+static int hf_mbim_thermal_state_info_hyst_value;
+static int hf_mbim_thermal_state_info_sampling_period;
+static int hf_mbim_sar_config_sar_status;
+static int hf_mbim_sar_config_level;
+static int hf_mbim_ms_sar_config_sar_mode;
+static int hf_mbim_ms_sar_config_sar_backoff_status;
+static int hf_mbim_ms_sar_config_sar_wifi_Integration;
+static int hf_mbim_ms_sar_config_element_count;
+static int hf_mbim_ms_sar_config_element_offset;
+static int hf_mbim_ms_sar_config_element_size;
+static int hf_mbim_ms_sar_config_state_sar_antenna_index;
+static int hf_mbim_ms_sar_config_state_sar_backoff_index;
+static int hf_mbim_ms_transmission_status_channel_notification;
+static int hf_mbim_ms_transmission_status_transmission_status;
+static int hf_mbim_ms_transmission_status_hysteresis_timer;
+static int hf_mbim_adpclk_activate_state;
+static int hf_mbim_adpclk_freq_info_elem_count;
+static int hf_mbim_adpclk_freq_info_adpclk_freq_value_offset;
+static int hf_mbim_adpclk_freq_info_adpclk_freq_value_size;
+static int hf_mbim_adpclk_freq_info_adpclk_freq_value_center_freq;
+static int hf_mbim_adpclk_freq_info_adpclk_freq_value_freq_spread;
+static int hf_mbim_adpclk_freq_info_adpclk_freq_value_noise_power;
+static int hf_mbim_adpclk_freq_info_adpclk_freq_value_rssi;
+static int hf_mbim_adpclk_freq_info_adpclk_freq_value_connect_status;
+static int hf_mbim_trace_config_config;
+static int hf_mbim_nrtc_app_info_period;
+static int hf_mbim_nrtc_app_info_duration;
+static int hf_mbim_nrtcws_config_mode;
+static int hf_mbim_nrtcws_config_wlan_active;
+static int hf_mbim_nrtcws_config_wlan_safe_rx;
+static int hf_mbim_nrtcws_config_wlan_bandwidth;
+static int hf_mbim_nrtcws_config_bt_active;
+static int hf_mbim_nrtcws_config_bt_safe_rx;
+static int hf_mbim_nrtcws_info_lte_active;
+static int hf_mbim_nrtcws_info_wlan_safe_rx_min;
+static int hf_mbim_nrtcws_info_wlan_safe_rx_max;
+static int hf_mbim_nrtcws_info_bt_safe_rx_min;
+static int hf_mbim_nrtcws_info_bt_safe_rx_max;
+static int hf_mbim_nrtcws_info_lte_sps_period;
+static int hf_mbim_nrtcws_info_lte_sps_duration;
+static int hf_mbim_nrtcws_info_lte_sps_initial_offset;
+static int hf_mbim_usbprofile_cmd_length;
+static int hf_mbim_usbprofile_cmd_buffer;
+static int hf_mbim_usbprofile_rsp_length;
+static int hf_mbim_usbprofile_rsp_buffer;
+static int hf_mbim_ciq_set_mode;
+static int hf_mbim_ciq_set_debug_info_size;
+static int hf_mbim_ciq_set_debug_info;
+static int hf_mbim_ciq_info_mode;
+static int hf_mbim_atds_signal_info_rssi;
+static int hf_mbim_atds_signal_info_ber;
+static int hf_mbim_atds_signal_info_rscp;
+static int hf_mbim_atds_signal_info_ecno;
+static int hf_mbim_atds_signal_info_rsrq;
+static int hf_mbim_atds_signal_info_rsrp;
+static int hf_mbim_atds_signal_info_rssnr;
+static int hf_mbim_atds_location_info_lac;
+static int hf_mbim_atds_location_info_tac;
+static int hf_mbim_atds_location_info_cellid;
+static int hf_mbim_atds_operator_provider_id_offset;
+static int hf_mbim_atds_operator_provider_id_size;
+static int hf_mbim_atds_operator_provider_state;
+static int hf_mbim_atds_operator_provider_name_offset;
+static int hf_mbim_atds_operator_provider_name_size;
+static int hf_mbim_atds_operator_plmn_mode;
+static int hf_mbim_atds_operator_rssi;
+static int hf_mbim_atds_operator_error_rate;
+static int hf_mbim_atds_operator_provider_id;
+static int hf_mbim_atds_operator_provider_name;
+static int hf_mbim_atds_operators_elem_count;
+static int hf_mbim_atds_operators_operator_offset;
+static int hf_mbim_atds_operators_operator_size;
+static int hf_mbim_atds_rat_info_mode;
+static int hf_mbim_atds_projection_table_type;
+static int hf_mbim_atds_projection_table_bar5min;
+static int hf_mbim_atds_projection_table_a5;
+static int hf_mbim_atds_projection_table_b5;
+static int hf_mbim_atds_projection_table_bar4min;
+static int hf_mbim_atds_projection_table_a4;
+static int hf_mbim_atds_projection_table_b4;
+static int hf_mbim_atds_projection_table_bar3min;
+static int hf_mbim_atds_projection_table_a3;
+static int hf_mbim_atds_projection_table_b3;
+static int hf_mbim_atds_projection_table_bar2min;
+static int hf_mbim_atds_projection_table_a2;
+static int hf_mbim_atds_projection_table_b2;
+static int hf_mbim_atds_projection_table_bar1min;
+static int hf_mbim_atds_projection_table_a1;
+static int hf_mbim_atds_projection_table_b1;
+static int hf_mbim_atds_projection_table_bar0min;
+static int hf_mbim_atds_projection_table_a0;
+static int hf_mbim_atds_projection_table_b0;
+static int hf_mbim_atds_projection_tables_elem_count;
+static int hf_mbim_atds_projection_tables_projection_table_offset;
+static int hf_mbim_atds_projection_tables_projection_table_size;
+static int hf_mbim_multiflow_caps_info_control_caps;
+static int hf_mbim_multiflow_caps_info_control_caps_uplink;
+static int hf_mbim_multiflow_caps_info_control_caps_downlink;
+static int hf_mbim_set_multiflow_state_state;
+static int hf_mbim_multiflow_state_info_state;
+static int hf_mbim_multiflow_tft_info_session_id;
+static int hf_mbim_multiflow_tft_info_elem_count;
+static int hf_mbim_multiflow_tft_info_tft_list_offset;
+static int hf_mbim_multiflow_tft_info_tft_list_size;
+static int hf_mbim_version;
+static int hf_mbim_extended_version;
+static int hf_mbim_set_ms_provisioned_context_v2_operation;
+static int hf_mbim_set_ms_provisioned_context_v2_ip_type;
+static int hf_mbim_set_ms_provisioned_context_v2_enable;
+static int hf_mbim_set_ms_provisioned_context_v2_roaming;
+static int hf_mbim_set_ms_provisioned_context_v2_media_type;
+static int hf_mbim_set_ms_provisioned_context_v2_source;
+static int hf_mbim_set_ms_provisioned_context_v2_access_string;
+static int hf_mbim_set_ms_provisioned_context_v2_access_string_offset;
+static int hf_mbim_set_ms_provisioned_context_v2_access_string_size;
+static int hf_mbim_set_ms_provisioned_context_v2_user_name;
+static int hf_mbim_set_ms_provisioned_context_v2_user_name_offset;
+static int hf_mbim_set_ms_provisioned_context_v2_user_name_size;
+static int hf_mbim_set_ms_provisioned_context_v2_password;
+static int hf_mbim_set_ms_provisioned_context_v2_password_offset;
+static int hf_mbim_set_ms_provisioned_context_v2_password_size;
+static int hf_mbim_set_ms_provisioned_context_v2_compression;
+static int hf_mbim_set_ms_provisioned_context_v2_auth_protocol;
+static int hf_mbim_ms_provisioned_context_info_v2_elem_count;
+static int hf_mbim_ms_provisioned_context_info_v2_list_offset;
+static int hf_mbim_ms_provisioned_context_info_v2_list_size;
+static int hf_mbim_ms_provisioned_context_info_v2_context_id;
+static int hf_mbim_ms_network_blacklist_info_blacklist_state;
+static int hf_mbim_ms_network_blacklist_state_sim_provider_actuated;
+static int hf_mbim_ms_network_blacklist_state_network_provider_actuated;
+static int hf_mbim_ms_network_blacklist_info_elem_count;
+static int hf_mbim_ms_network_blacklist_info_list_offset;
+static int hf_mbim_ms_network_blacklist_info_list_size;
+static int hf_mbim_ms_network_blacklist_provider_mcc;
+static int hf_mbim_ms_network_blacklist_provider_mnc;
+static int hf_mbim_ms_network_blacklist_provider_type;
+static int hf_mbim_sys_caps_info_number_of_executors;
+static int hf_mbim_sys_caps_info_number_of_slots;
+static int hf_mbim_sys_caps_info_concurrency;
+static int hf_mbim_sys_caps_info_modem_id;
+static int hf_mbim_ms_set_lte_attach_operation;
+static int hf_mbim_ms_lte_attach_context_count;
+static int hf_mbim_ms_lte_attach_context_offset;
+static int hf_mbim_ms_lte_attach_context_size;
+static int hf_mbim_ms_lte_attach_context_ip_type;
+static int hf_mbim_ms_lte_attach_context_roaming;
+static int hf_mbim_ms_lte_attach_context_source;
+static int hf_mbim_ms_lte_attach_context_access_string;
+static int hf_mbim_ms_lte_attach_context_access_string_offset;
+static int hf_mbim_ms_lte_attach_context_access_string_size;
+static int hf_mbim_ms_lte_attach_context_user_name;
+static int hf_mbim_ms_lte_attach_context_user_name_offset;
+static int hf_mbim_ms_lte_attach_context_user_name_size;
+static int hf_mbim_ms_lte_attach_context_password;
+static int hf_mbim_ms_lte_attach_context_password_offset;
+static int hf_mbim_ms_lte_attach_context_password_size;
+static int hf_mbim_ms_lte_attach_context_compression;
+static int hf_mbim_ms_lte_attach_context_auth_protocol;
+static int hf_mbim_ms_lte_attach_state;
+static int hf_mbim_ms_device_slot_mapping_info_map_count;
+static int hf_mbim_ms_device_slot_mapping_info_map_offset;
+static int hf_mbim_ms_device_slot_mapping_info_map_size;
+static int hf_mbim_ms_device_slot_mapping_info_executor_slot_index;
+static int hf_mbim_ms_slot_info_req_slot_index;
+static int hf_mbim_ms_slot_info_slot_index;
+static int hf_mbim_ms_slot_info_state;
+static int hf_mbim_base_station_max_gsm_count;
+static int hf_mbim_base_station_max_umts_count;
+static int hf_mbim_base_station_max_td_scdma_count;
+static int hf_mbim_base_station_max_lte_count;
+static int hf_mbim_base_station_max_cdma_count;
+static int hf_mbim_base_station_max_nr_count;
+static int hf_mbim_base_station_provider_id_offset;
+static int hf_mbim_base_station_provider_id_size;
+static int hf_mbim_base_station_location_area_code;
+static int hf_mbim_base_station_cell_id;
+static int hf_mbim_base_station_timing_advance;
+static int hf_mbim_base_station_arfcn;
+static int hf_mbim_base_station_base_station_id;
+static int hf_mbim_base_station_rx_level;
+static int hf_mbim_base_station_provider_id;
+static int hf_mbim_base_station_frequency_info_ul;
+static int hf_mbim_base_station_frequency_info_dl;
+static int hf_mbim_base_station_frequency_info_nt;
+static int hf_mbim_base_station_uarfcn;
+static int hf_mbim_base_station_primary_scrambling_code;
+static int hf_mbim_base_station_rscp;
+static int hf_mbim_base_station_ecno;
+static int hf_mbim_base_station_path_loss;
+static int hf_mbim_base_station_call_parameter;
+static int hf_mbim_base_station_earfcn;
+static int hf_mbim_base_station_physical_cell_id;
+static int hf_mbim_base_station_tac;
+static int hf_mbim_base_station_rsrp;
+static int hf_mbim_base_station_rsrq;
+static int hf_mbim_base_station_serving_cell_flag;
+static int hf_mbim_base_station_nid;
+static int hf_mbim_base_station_sid;
+static int hf_mbim_base_station_base_latitude;
+static int hf_mbim_base_station_base_longitude;
+static int hf_mbim_base_station_ref_pn;
+static int hf_mbim_base_station_gps_seconds;
+static int hf_mbim_base_station_pilot_strength;
+static int hf_mbim_base_station_nci;
+static int hf_mbim_base_station_cell_id_offset;
+static int hf_mbim_base_station_cell_id_size;
+static int hf_mbim_base_station_sinr;
+static int hf_mbim_base_station_cell_id_string;
+static int hf_mbim_base_station_system_type;
+static int hf_mbim_base_station_system_sub_type;
+static int hf_mbim_base_station_gsm_serving_cell_offset;
+static int hf_mbim_base_station_gsm_serving_cell_size;
+static int hf_mbim_base_station_umts_serving_cell_offset;
+static int hf_mbim_base_station_umts_serving_cell_size;
+static int hf_mbim_base_station_td_scdma_serving_cell_offset;
+static int hf_mbim_base_station_td_scdma_serving_cell_size;
+static int hf_mbim_base_station_lte_serving_cell_offset;
+static int hf_mbim_base_station_lte_serving_cell_size;
+static int hf_mbim_base_station_gsm_nmr_offset;
+static int hf_mbim_base_station_gsm_nmr_size;
+static int hf_mbim_base_station_umts_mrl_offset;
+static int hf_mbim_base_station_umts_mrl_size;
+static int hf_mbim_base_station_td_scdma_mrl_offset;
+static int hf_mbim_base_station_td_scdma_mrl_size;
+static int hf_mbim_base_station_lte_mrl_offset;
+static int hf_mbim_base_station_lte_mrl_size;
+static int hf_mbim_base_station_cdma_mrl_offset;
+static int hf_mbim_base_station_cdma_mrl_size;
+static int hf_mbim_base_station_nr_serving_cell_offset;
+static int hf_mbim_base_station_nr_serving_cell_size;
+static int hf_mbim_base_station_nr_neighbor_cells_offset;
+static int hf_mbim_base_station_nr_neighbor_cells_size;
+static int hf_mbim_base_station_count;
+static int hf_mbim_ms_modem_config_config_status;
+static int hf_mbim_ms_registration_params_info_mico_mode;
+static int hf_mbim_ms_registration_params_info_drx_params;
+static int hf_mbim_ms_registration_params_info_ladn_info;
+static int hf_mbim_ms_registration_params_info_default_pdu_hint;
+static int hf_mbim_ms_registration_params_info_re_register_if_needed;
+static int hf_mbim_ms_network_params_info_mico_indication;
+static int hf_mbim_ms_network_params_info_drx_params;
+static int hf_mbim_ms_wake_reason_wake_type;
+static int hf_mbim_ms_wake_reason_session_id;
+static int hf_mbim_ms_wake_reason_command_payload_offset;
+static int hf_mbim_ms_wake_reason_command_payload_size;
+static int hf_mbim_ms_wake_reason_command_payload;
+static int hf_mbim_ms_wake_reason_packet_original_size;
+static int hf_mbim_ms_wake_reason_packet_saved_offset;
+static int hf_mbim_ms_wake_reason_packet_saved_size;
+static int hf_mbim_ms_wake_reason_packet_saved_data;
+static int hf_mbim_ms_slot_id;
+static int hf_mbim_ms_open_channel_app_id_size;
+static int hf_mbim_ms_open_channel_app_id_offset;
+static int hf_mbim_ms_open_channel_select_p2_arg;
+static int hf_mbim_ms_uicc_channel_group;
+static int hf_mbim_ms_open_channel_app_id;
+static int hf_mbim_ms_uicc_status;
+static int hf_mbim_ms_uicc_channel;
+static int hf_mbim_ms_uicc_response_length;
+static int hf_mbim_ms_uicc_response_offset;
+static int hf_mbim_ms_uicc_response;
+static int hf_mbim_ms_apdu_secure_messaging;
+static int hf_mbim_ms_apdu_type;
+static int hf_mbim_ms_apdu_command_size;
+static int hf_mbim_ms_apdu_command_offset;
+static int hf_mbim_ms_apdu_command;
+static int hf_mbim_ms_terminal_capability_count;
+static int hf_mbim_ms_terminal_capability_offset;
+static int hf_mbim_ms_terminal_capability_size;
+static int hf_mbim_ms_terminal_capability;
+static int hf_mbim_ms_reset_pass_through_action;
+static int hf_mbim_ms_atr_info_atr_offset;
+static int hf_mbim_ms_atr_info_atr_size;
+static int hf_mbim_ms_app_info_app_type;
+static int hf_mbim_ms_app_info_app_id_offset;
+static int hf_mbim_ms_app_info_app_id_size;
+static int hf_mbim_ms_app_info_app_id;
+static int hf_mbim_ms_app_info_app_name_offset;
+static int hf_mbim_ms_app_info_app_name_size;
+static int hf_mbim_ms_app_info_app_name;
+static int hf_mbim_ms_app_info_num_pins;
+static int hf_mbim_ms_app_info_pin_ref_offset;
+static int hf_mbim_ms_app_info_pin_ref_size;
+static int hf_mbim_ms_app_info_pin_ref;
+static int hf_mbim_ms_app_list_version;
+static int hf_mbim_ms_app_list_app_count;
+static int hf_mbim_ms_app_list_active_app_index;
+static int hf_mbim_ms_app_list_size;
+static int hf_mbim_ms_app_list_app_info_offset;
+static int hf_mbim_ms_app_list_app_info_size;
+static int hf_mbim_ms_file_path_version;
+static int hf_mbim_ms_file_path_app_id_offset;
+static int hf_mbim_ms_file_path_app_id_size;
+static int hf_mbim_ms_file_path_file_path_offset;
+static int hf_mbim_ms_file_path_file_path_size;
+static int hf_mbim_ms_file_path_app_id;
+static int hf_mbim_ms_file_path_file_path;
+static int hf_mbim_ms_file_status_version;
+static int hf_mbim_ms_file_status_status_word_1;
+static int hf_mbim_ms_file_status_status_word_2;
+static int hf_mbim_ms_file_status_file_accessibility;
+static int hf_mbim_ms_file_status_file_type;
+static int hf_mbim_ms_file_status_file_structure;
+static int hf_mbim_ms_file_status_item_count;
+static int hf_mbim_ms_file_status_size;
+static int hf_mbim_ms_file_status_file_lock_status;
+static int hf_mbim_ms_response_version;
+static int hf_mbim_ms_response_status_word_1;
+static int hf_mbim_ms_response_status_word_2;
+static int hf_mbim_ms_response_response_data_offset;
+static int hf_mbim_ms_response_response_data_size;
+static int hf_mbim_ms_response_response_data;
+static int hf_mbim_ms_access_binary_version;
+static int hf_mbim_ms_access_binary_app_id_offset;
+static int hf_mbim_ms_access_binary_app_id_size;
+static int hf_mbim_ms_access_binary_file_path_offset;
+static int hf_mbim_ms_access_binary_file_path_size;
+static int hf_mbim_ms_access_binary_file_offset;
+static int hf_mbim_ms_access_binary_number_of_bytes;
+static int hf_mbim_ms_access_binary_local_pin_offset;
+static int hf_mbim_ms_access_binary_local_pin_size;
+static int hf_mbim_ms_access_binary_binary_data_offset;
+static int hf_mbim_ms_access_binary_binary_data_size;
+static int hf_mbim_ms_access_binary_app_id;
+static int hf_mbim_ms_access_binary_file_path;
+static int hf_mbim_ms_access_binary_local_pin;
+static int hf_mbim_ms_access_binary_binary_data;
+static int hf_mbim_ms_access_record_version;
+static int hf_mbim_ms_access_record_app_id_offset;
+static int hf_mbim_ms_access_record_app_id_size;
+static int hf_mbim_ms_access_record_file_path_offset;
+static int hf_mbim_ms_access_record_file_path_size;
+static int hf_mbim_ms_access_record_record_number;
+static int hf_mbim_ms_access_record_local_pin_offset;
+static int hf_mbim_ms_access_record_local_pin_size;
+static int hf_mbim_ms_access_record_record_data_offset;
+static int hf_mbim_ms_access_record_record_data_size;
+static int hf_mbim_ms_access_record_app_id;
+static int hf_mbim_ms_access_record_file_path;
+static int hf_mbim_ms_access_record_local_pin;
+static int hf_mbim_ms_access_record_record_data;
+static int hf_mbim_nitz_year;
+static int hf_mbim_nitz_month;
+static int hf_mbim_nitz_day;
+static int hf_mbim_nitz_hour;
+static int hf_mbim_nitz_minute;
+static int hf_mbim_nitz_second;
+static int hf_mbim_nitz_timezone_offset_minutes;
+static int hf_mbim_nitz_daylight_saving_time_offset_minutes;
+static int hf_mbim_nitz_data_class;
+static int hf_mbim_fragmented_payload;
+static int hf_mbim_request_in;
+static int hf_mbim_response_in;
+static int hf_mbim_descriptor;
+static int hf_mbim_descriptor_version;
+static int hf_mbim_descriptor_max_control_message;
+static int hf_mbim_descriptor_number_filters;
+static int hf_mbim_descriptor_max_filter_size;
+static int hf_mbim_descriptor_max_segment_size;
+static int hf_mbim_descriptor_network_capabilities;
+static int hf_mbim_descriptor_network_capabilities_max_datagram_size;
+static int hf_mbim_descriptor_network_capabilities_ntb_input_size;
+static int hf_mbim_descriptor_extended_version;
+static int hf_mbim_descriptor_max_outstanding_command_messages;
+static int hf_mbim_descriptor_mtu;
+static int hf_mbim_bulk;
+static int hf_mbim_bulk_nth_signature;
+static int hf_mbim_bulk_nth_header_length;
+static int hf_mbim_bulk_nth_sequence_number;
+static int hf_mbim_bulk_nth_block_length;
+static int hf_mbim_bulk_nth_block_length_32;
+static int hf_mbim_bulk_nth_ndp_index;
+static int hf_mbim_bulk_nth_ndp_index_32;
+static int hf_mbim_bulk_ndp_signature;
+static int hf_mbim_bulk_ndp_signature_ips_session_id;
+static int hf_mbim_bulk_ndp_signature_ipc_session_id;
+static int hf_mbim_bulk_ndp_signature_dss_session_id;
+static int hf_mbim_bulk_ndp_signature_dsc_session_id;
+static int hf_mbim_bulk_ndp_length;
+static int hf_mbim_bulk_ndp_next_ndp_index;
+static int hf_mbim_bulk_ndp_next_ndp_index_32;
+static int hf_mbim_bulk_ndp_reserved;
+static int hf_mbim_bulk_ndp_reserved2;
+static int hf_mbim_bulk_ndp_datagram_index;
+static int hf_mbim_bulk_ndp_datagram_index_32;
+static int hf_mbim_bulk_ndp_datagram_length;
+static int hf_mbim_bulk_ndp_datagram_length_32;
+static int hf_mbim_bulk_ndp_datagram;
+static int hf_mbim_bulk_ndp_nb_datagrams;
+static int hf_mbim_bulk_total_nb_datagrams;
+static int hf_mbim_bulk_ndp_ctrl;
+static int hf_mbim_bulk_ndp_ctrl_message_type;
+static int hf_mbim_bulk_ndp_ctrl_message_length;
+static int hf_mbim_bulk_ndp_ctrl_multiflow_status;
+static int hf_mbim_bulk_ndp_ctrl_multiflow_watermark;
+static int hf_mbim_bulk_ndp_ctrl_message_payload;
+static int hf_mbim_fragments;
+static int hf_mbim_fragment;
+static int hf_mbim_fragment_overlap;
+static int hf_mbim_fragment_overlap_conflict;
+static int hf_mbim_fragment_multiple_tails;
+static int hf_mbim_fragment_too_long_fragment;
+static int hf_mbim_fragment_error;
+static int hf_mbim_fragment_count;
+static int hf_mbim_reassembled_in;
+static int hf_mbim_reassembled_length;
+static int hf_mbim_reassembled_data;
+
+static expert_field ei_mbim_max_ctrl_transfer;
+static expert_field ei_mbim_unexpected_msg;
+static expert_field ei_mbim_unexpected_info_buffer;
+static expert_field ei_mbim_illegal_on_link_prefix_length;
+static expert_field ei_mbim_unknown_sms_format;
+static expert_field ei_mbim_unexpected_uuid_value;
+static expert_field ei_mbim_too_many_items;
+static expert_field ei_mbim_alignment_error;
+static expert_field ei_mbim_invalid_block_len;
+static expert_field ei_mbim_out_of_bounds_index;
+static expert_field ei_mbim_oversized_string;
+static expert_field ei_mbim_oversized_pdu;
 
 /* Initialize the subtree pointers */
-static gint ett_mbim = -1;
-static gint ett_mbim_msg_header = -1;
-static gint ett_mbim_frag_header = -1;
-static gint ett_mbim_info_buffer = -1;
-static gint ett_mbim_bitmap = -1;
-static gint ett_mbim_pair_list = -1;
-static gint ett_mbim_pin = -1;
-static gint ett_mbim_buffer = -1;
-static gint ett_mbim_sc_address = -1;
-static gint ett_mbim_pac = -1;
-static gint ett_mbim_thermal_threshold_setting = -1;
-static gint ett_mbim_fragment = -1;
-static gint ett_mbim_fragments = -1;
-static gint ett_mbim_bulk_ndp_ctrl = -1;
+static gint ett_mbim;
+static gint ett_mbim_msg_header;
+static gint ett_mbim_frag_header;
+static gint ett_mbim_info_buffer;
+static gint ett_mbim_bitmap;
+static gint ett_mbim_pair_list;
+static gint ett_mbim_pin;
+static gint ett_mbim_buffer;
+static gint ett_mbim_sc_address;
+static gint ett_mbim_pac;
+static gint ett_mbim_thermal_threshold_setting;
+static gint ett_mbim_fragment;
+static gint ett_mbim_fragments;
+static gint ett_mbim_bulk_ndp_ctrl;
 
 static dissector_table_t dss_dissector_table;
 static dissector_handle_t bertlv_handle;
diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c
index 81470001a2..70634fa0af 100644
--- a/epan/dissectors/packet-mbtcp.c
+++ b/epan/dissectors/packet-mbtcp.c
@@ -65,102 +65,102 @@ void proto_reg_handoff_mbtcp(void);
 void proto_reg_handoff_mbrtu(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_mbtcp = -1;
-static int proto_mbudp = -1;
-static int proto_mbrtu = -1;
-static int proto_modbus = -1;
-static int hf_mbtcp_transid = -1;
-static int hf_mbtcp_protid = -1;
-static int hf_mbtcp_len = -1;
-static int hf_mbtcp_unitid = -1;
-static int hf_modbus_request_frame = -1;
-static int hf_modbus_response_time = -1;
-static int hf_modbus_functioncode = -1;
-static int hf_modbus_reference = -1;
-static int hf_modbus_padding = -1;
-static int hf_modbus_lreference = -1;
-static int hf_modbus_reftype = -1;
-static int hf_modbus_readref = -1;
-static int hf_modbus_writeref = -1;
-static int hf_modbus_wordcnt = -1;
-static int hf_modbus_readwordcnt = -1;
-static int hf_modbus_writewordcnt = -1;
-static int hf_modbus_bytecnt = -1;
-static int hf_modbus_lbytecnt = -1;
-static int hf_modbus_bitcnt = -1;
-static int hf_modbus_exceptioncode = -1;
-static int hf_modbus_diag_sf = -1;
-static int hf_modbus_diag_return_query_data_request = -1;
-static int hf_modbus_diag_return_query_data_echo = -1;
-static int hf_modbus_diag_restart_communication_option = -1;
-static int hf_modbus_diag_return_diag_register = -1;
-static int hf_modbus_diag_ascii_input_delimiter = -1;
-static int hf_modbus_diag_clear_ctr_diag_reg = -1;
-static int hf_modbus_diag_return_bus_message_count = -1;
-static int hf_modbus_diag_return_bus_comm_error_count = -1;
-static int hf_modbus_diag_return_bus_exception_error_count = -1;
-static int hf_modbus_diag_return_slave_message_count = -1;
-static int hf_modbus_diag_return_no_slave_response_count = -1;
-static int hf_modbus_diag_return_slave_nak_count = -1;
-static int hf_modbus_diag_return_slave_busy_count = -1;
-static int hf_modbus_diag_return_bus_char_overrun_count = -1;
-static int hf_modbus_status = -1;
-static int hf_modbus_event = -1;
-static int hf_modbus_event_count = -1;
-static int hf_modbus_message_count = -1;
-static int hf_modbus_event_recv_comm_err = -1;
-static int hf_modbus_event_recv_char_over = -1;
-static int hf_modbus_event_recv_lo_mode = -1;
-static int hf_modbus_event_recv_broadcast = -1;
-static int hf_modbus_event_send_read_ex = -1;
-static int hf_modbus_event_send_slave_abort_ex = -1;
-static int hf_modbus_event_send_slave_busy_ex = -1;
-static int hf_modbus_event_send_slave_nak_ex = -1;
-static int hf_modbus_event_send_write_timeout = -1;
-static int hf_modbus_event_send_lo_mode = -1;
-static int hf_modbus_andmask = -1;
-static int hf_modbus_ormask = -1;
-static int hf_modbus_data = -1;
-static int hf_modbus_mei = -1;
-static int hf_modbus_read_device_id = -1;
-static int hf_modbus_object_id = -1;
-static int hf_modbus_num_objects = -1;
-static int hf_modbus_list_object_len = -1;
-static int hf_modbus_conformity_level = -1;
-static int hf_modbus_more_follows = -1;
-static int hf_modbus_next_object_id = -1;
-static int hf_modbus_object_str_value = -1;
-static int hf_modbus_object_value = -1;
-static int hf_modbus_bitnum = -1;
-static int hf_modbus_bitval = -1;
-static int hf_modbus_regnum16 = -1;
-static int hf_modbus_regnum32 = -1;
-static int hf_modbus_regval_uint16 = -1;
-static int hf_modbus_regval_int16 = -1;
-static int hf_modbus_regval_uint32 = -1;
-static int hf_modbus_regval_int32 = -1;
-static int hf_modbus_regval_ieee_float = -1;
-static int hf_modbus_regval_modicon_float = -1;
-static int hf_mbrtu_unitid = -1;
-static int hf_mbrtu_crc16 = -1;
-static int hf_mbrtu_crc16_status = -1;
+static int proto_mbtcp;
+static int proto_mbudp;
+static int proto_mbrtu;
+static int proto_modbus;
+static int hf_mbtcp_transid;
+static int hf_mbtcp_protid;
+static int hf_mbtcp_len;
+static int hf_mbtcp_unitid;
+static int hf_modbus_request_frame;
+static int hf_modbus_response_time;
+static int hf_modbus_functioncode;
+static int hf_modbus_reference;
+static int hf_modbus_padding;
+static int hf_modbus_lreference;
+static int hf_modbus_reftype;
+static int hf_modbus_readref;
+static int hf_modbus_writeref;
+static int hf_modbus_wordcnt;
+static int hf_modbus_readwordcnt;
+static int hf_modbus_writewordcnt;
+static int hf_modbus_bytecnt;
+static int hf_modbus_lbytecnt;
+static int hf_modbus_bitcnt;
+static int hf_modbus_exceptioncode;
+static int hf_modbus_diag_sf;
+static int hf_modbus_diag_return_query_data_request;
+static int hf_modbus_diag_return_query_data_echo;
+static int hf_modbus_diag_restart_communication_option;
+static int hf_modbus_diag_return_diag_register;
+static int hf_modbus_diag_ascii_input_delimiter;
+static int hf_modbus_diag_clear_ctr_diag_reg;
+static int hf_modbus_diag_return_bus_message_count;
+static int hf_modbus_diag_return_bus_comm_error_count;
+static int hf_modbus_diag_return_bus_exception_error_count;
+static int hf_modbus_diag_return_slave_message_count;
+static int hf_modbus_diag_return_no_slave_response_count;
+static int hf_modbus_diag_return_slave_nak_count;
+static int hf_modbus_diag_return_slave_busy_count;
+static int hf_modbus_diag_return_bus_char_overrun_count;
+static int hf_modbus_status;
+static int hf_modbus_event;
+static int hf_modbus_event_count;
+static int hf_modbus_message_count;
+static int hf_modbus_event_recv_comm_err;
+static int hf_modbus_event_recv_char_over;
+static int hf_modbus_event_recv_lo_mode;
+static int hf_modbus_event_recv_broadcast;
+static int hf_modbus_event_send_read_ex;
+static int hf_modbus_event_send_slave_abort_ex;
+static int hf_modbus_event_send_slave_busy_ex;
+static int hf_modbus_event_send_slave_nak_ex;
+static int hf_modbus_event_send_write_timeout;
+static int hf_modbus_event_send_lo_mode;
+static int hf_modbus_andmask;
+static int hf_modbus_ormask;
+static int hf_modbus_data;
+static int hf_modbus_mei;
+static int hf_modbus_read_device_id;
+static int hf_modbus_object_id;
+static int hf_modbus_num_objects;
+static int hf_modbus_list_object_len;
+static int hf_modbus_conformity_level;
+static int hf_modbus_more_follows;
+static int hf_modbus_next_object_id;
+static int hf_modbus_object_str_value;
+static int hf_modbus_object_value;
+static int hf_modbus_bitnum;
+static int hf_modbus_bitval;
+static int hf_modbus_regnum16;
+static int hf_modbus_regnum32;
+static int hf_modbus_regval_uint16;
+static int hf_modbus_regval_int16;
+static int hf_modbus_regval_uint32;
+static int hf_modbus_regval_int32;
+static int hf_modbus_regval_ieee_float;
+static int hf_modbus_regval_modicon_float;
+static int hf_mbrtu_unitid;
+static int hf_mbrtu_crc16;
+static int hf_mbrtu_crc16_status;
 
 /* Initialize the subtree pointers */
-static gint ett_mbtcp = -1;
-static gint ett_mbrtu = -1;
-static gint ett_modbus_hdr = -1;
-static gint ett_group_hdr = -1;
-static gint ett_events = -1;
-static gint ett_events_recv = -1;
-static gint ett_events_send = -1;
-static gint ett_device_id_objects = -1;
-static gint ett_device_id_object_items = -1;
-static gint ett_bit = -1;
-static gint ett_register = -1;
-
-static expert_field ei_mbrtu_crc16_incorrect = EI_INIT;
-static expert_field ei_modbus_data_decode = EI_INIT;
-static expert_field ei_mbtcp_cannot_classify = EI_INIT;
+static gint ett_mbtcp;
+static gint ett_mbrtu;
+static gint ett_modbus_hdr;
+static gint ett_group_hdr;
+static gint ett_events;
+static gint ett_events_recv;
+static gint ett_events_send;
+static gint ett_device_id_objects;
+static gint ett_device_id_object_items;
+static gint ett_bit;
+static gint ett_register;
+
+static expert_field ei_mbrtu_crc16_incorrect;
+static expert_field ei_modbus_data_decode;
+static expert_field ei_mbtcp_cannot_classify;
 
 static dissector_handle_t modbus_handle;
 static dissector_handle_t mbtcp_handle;
diff --git a/epan/dissectors/packet-mc-nmf.c b/epan/dissectors/packet-mc-nmf.c
index 97895c5acc..3ac3b4d578 100644
--- a/epan/dissectors/packet-mc-nmf.c
+++ b/epan/dissectors/packet-mc-nmf.c
@@ -94,28 +94,28 @@ struct mc_nmf_session_state {
     guint32   upgrade_rsp;
 };
 
-static int proto_mc_nmf = -1;
-static int hf_mc_nmf_record_type = -1;
-static int hf_mc_nmf_major_version = -1;
-static int hf_mc_nmf_minor_version = -1;
-static int hf_mc_nmf_mode = -1;
-static int hf_mc_nmf_known_encoding = -1;
-static int hf_mc_nmf_via_length = -1;
-static int hf_mc_nmf_via = -1;
-static int hf_mc_nmf_encoding_length = -1;
-static int hf_mc_nmf_encoding_type = -1;
-static int hf_mc_nmf_fault_length = -1;
-static int hf_mc_nmf_fault = -1;
-static int hf_mc_nmf_upgrade_length = -1;
-static int hf_mc_nmf_upgrade = -1;
-static int hf_mc_nmf_chunk_length = -1;
-static int hf_mc_nmf_chunk = -1;
-static int hf_mc_nmf_terminator = -1;
-static int hf_mc_nmf_payload_length = -1;
-static int hf_mc_nmf_payload = -1;
-static int hf_mc_nmf_upgrade_proto_data = -1;
-
-static expert_field ei_mc_nmf_size_too_big = EI_INIT;
+static int proto_mc_nmf;
+static int hf_mc_nmf_record_type;
+static int hf_mc_nmf_major_version;
+static int hf_mc_nmf_minor_version;
+static int hf_mc_nmf_mode;
+static int hf_mc_nmf_known_encoding;
+static int hf_mc_nmf_via_length;
+static int hf_mc_nmf_via;
+static int hf_mc_nmf_encoding_length;
+static int hf_mc_nmf_encoding_type;
+static int hf_mc_nmf_fault_length;
+static int hf_mc_nmf_fault;
+static int hf_mc_nmf_upgrade_length;
+static int hf_mc_nmf_upgrade;
+static int hf_mc_nmf_chunk_length;
+static int hf_mc_nmf_chunk;
+static int hf_mc_nmf_terminator;
+static int hf_mc_nmf_payload_length;
+static int hf_mc_nmf_payload;
+static int hf_mc_nmf_upgrade_proto_data;
+
+static expert_field ei_mc_nmf_size_too_big;
 
 // [MC-NMF] does not have a defined port https://learn.microsoft.com/en-us/openspecs/windows_protocols/mc-nmf/51b5eb53-f488-4b74-b21d-8a498f016b61
 // but 9389 is ADWS port https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-adcap/cfff3d7f-e7cd-4529-86a0-4de89efe3855
@@ -123,8 +123,8 @@ static expert_field ei_mc_nmf_size_too_big = EI_INIT;
 #define MC_NMF_TCP_PORT 9389
 
 /* Initialize the subtree pointers */
-static gint ett_mc_nmf = -1;
-static gint ett_mc_nmf_rec = -1;
+static gint ett_mc_nmf;
+static gint ett_mc_nmf_rec;
 
 #define MC_NMF_MIN_LENGTH 1
 
diff --git a/epan/dissectors/packet-mcpe.c b/epan/dissectors/packet-mcpe.c
index b27e549727..78a956e890 100644
--- a/epan/dissectors/packet-mcpe.c
+++ b/epan/dissectors/packet-mcpe.c
@@ -33,12 +33,12 @@
 #define MCPE_UDP_PORT_DEFAULT 19132 /* Not IANA registered */
 static guint mcpe_udp_port_requested = MCPE_UDP_PORT_DEFAULT;
 
-static int proto_mcpe = -1;
-static gint ett_mcpe = -1; /* Should this node be expanded */
-static gint ett_mcpe_batch = -1;
-static gint ett_mcpe_batch_record = -1;
-static gint ett_mcpe_login = -1;
-static gint ett_mcpe_string = -1;
+static int proto_mcpe;
+static gint ett_mcpe; /* Should this node be expanded */
+static gint ett_mcpe_batch;
+static gint ett_mcpe_batch_record;
+static gint ett_mcpe_login;
+static gint ett_mcpe_string;
 
 /*
  * Dissectors
@@ -49,36 +49,36 @@ static dissector_table_t mcpe_packet_dissectors = NULL;
 /*
  * Expert fields
  */
-static expert_field ei_mcpe_unknown_packet_id = EI_INIT;
-static expert_field ei_mcpe_decompression_failed = EI_INIT;
-static expert_field ei_mcpe_encrypted_packet = EI_INIT;
+static expert_field ei_mcpe_unknown_packet_id;
+static expert_field ei_mcpe_decompression_failed;
+static expert_field ei_mcpe_encrypted_packet;
 
 /*
  * Common Header fields
  */
-static int hf_mcpe_message_id = -1;
-static int hf_mcpe_packet_id = -1;
-static int hf_mcpe_string_length = -1;
-static int hf_mcpe_UTF8_string = -1;
-static int hf_mcpe_byte_string = -1;
+static int hf_mcpe_message_id;
+static int hf_mcpe_packet_id;
+static int hf_mcpe_string_length;
+static int hf_mcpe_UTF8_string;
+static int hf_mcpe_byte_string;
 
 /*
  * Fields specific to a packet ID
  */
-static int hf_mcpe_protocol_version = -1;
-static int hf_mcpe_login_data_length = -1;
-static int hf_mcpe_login_data = -1;
-static int hf_mcpe_login = -1;
-static int hf_mcpe_chain_JSON = -1;
-static int hf_mcpe_client_data_JWT = -1;
-static int hf_mcpe_public_key = -1;
-static int hf_mcpe_server_token = -1;
-
-static int hf_mcpe_batch_length = -1;
-static int hf_mcpe_batch_body = -1;
-static int hf_mcpe_batch_records = -1;
-static int hf_mcpe_batch_record_length = -1;
-static int hf_mcpe_batch_record = -1;
+static int hf_mcpe_protocol_version;
+static int hf_mcpe_login_data_length;
+static int hf_mcpe_login_data;
+static int hf_mcpe_login;
+static int hf_mcpe_chain_JSON;
+static int hf_mcpe_client_data_JWT;
+static int hf_mcpe_public_key;
+static int hf_mcpe_server_token;
+
+static int hf_mcpe_batch_length;
+static int hf_mcpe_batch_body;
+static int hf_mcpe_batch_records;
+static int hf_mcpe_batch_record_length;
+static int hf_mcpe_batch_record;
 
 /*
  * RakNet Message ID
diff --git a/epan/dissectors/packet-mctp-control.c b/epan/dissectors/packet-mctp-control.c
index 54eab53627..98841738a2 100644
--- a/epan/dissectors/packet-mctp-control.c
+++ b/epan/dissectors/packet-mctp-control.c
@@ -31,17 +31,17 @@
 void proto_register_mctp_control(void);
 void proto_reg_handoff_mctp_control(void);
 
-static int proto_mctp_ctrl = -1;
+static int proto_mctp_ctrl;
 
-static int hf_mctp_ctrl_command = -1;
-static int hf_mctp_ctrl_rq = -1;
-static int hf_mctp_ctrl_d = -1;
-static int hf_mctp_ctrl_instance = -1;
-static int hf_mctp_ctrl_cc = -1;
-static int hf_mctp_ctrl_data = -1;
+static int hf_mctp_ctrl_command;
+static int hf_mctp_ctrl_rq;
+static int hf_mctp_ctrl_d;
+static int hf_mctp_ctrl_instance;
+static int hf_mctp_ctrl_cc;
+static int hf_mctp_ctrl_data;
 
-static gint ett_mctp_ctrl = -1;
-static gint ett_mctp_ctrl_hdr = -1;
+static gint ett_mctp_ctrl;
+static gint ett_mctp_ctrl_hdr;
 
 static const value_string command_vals[] = {
     { 0x00, "Reserved" },
diff --git a/epan/dissectors/packet-mctp.c b/epan/dissectors/packet-mctp.c
index 5204f30e25..f60dbc3c3e 100644
--- a/epan/dissectors/packet-mctp.c
+++ b/epan/dissectors/packet-mctp.c
@@ -30,43 +30,43 @@
 void proto_register_mctp(void);
 void proto_reg_handoff_mctp(void);
 
-static int proto_mctp = -1;
-
-static int hf_mctp_ver = -1;
-static int hf_mctp_dst = -1;
-static int hf_mctp_src = -1;
-static int hf_mctp_flags = -1;
-static int hf_mctp_flags_som = -1;
-static int hf_mctp_flags_eom = -1;
-static int hf_mctp_seq = -1;
-static int hf_mctp_tag = -1;
-static int hf_mctp_tag_to = -1;
-static int hf_mctp_tag_value = -1;
-static int hf_mctp_msg_ic = -1;
-static int hf_mctp_msg_type = -1;
-
-static gint ett_mctp = -1;
-static gint ett_mctp_fst = -1;
-static gint ett_mctp_flags = -1;
-static gint ett_mctp_tag = -1;
-static gint ett_mctp_type = -1;
+static int proto_mctp;
+
+static int hf_mctp_ver;
+static int hf_mctp_dst;
+static int hf_mctp_src;
+static int hf_mctp_flags;
+static int hf_mctp_flags_som;
+static int hf_mctp_flags_eom;
+static int hf_mctp_seq;
+static int hf_mctp_tag;
+static int hf_mctp_tag_to;
+static int hf_mctp_tag_value;
+static int hf_mctp_msg_ic;
+static int hf_mctp_msg_type;
+
+static gint ett_mctp;
+static gint ett_mctp_fst;
+static gint ett_mctp_flags;
+static gint ett_mctp_tag;
+static gint ett_mctp_type;
 
 static const true_false_string tfs_tag_to = { "Sender", "Receiver" };
 
-static int hf_mctp_fragments = -1;
-static int hf_mctp_fragment = -1;
-static int hf_mctp_fragment_overlap = -1;
-static int hf_mctp_fragment_overlap_conflicts = -1;
-static int hf_mctp_fragment_multiple_tails = -1;
-static int hf_mctp_fragment_too_long_fragment = -1;
-static int hf_mctp_fragment_error = -1;
-static int hf_mctp_fragment_count = -1;
-static int hf_mctp_reassembled_in = -1;
-static int hf_mctp_reassembled_length = -1;
-static int hf_mctp_reassembled_data = -1;
-
-static gint ett_mctp_fragment = -1;
-static gint ett_mctp_fragments = -1;
+static int hf_mctp_fragments;
+static int hf_mctp_fragment;
+static int hf_mctp_fragment_overlap;
+static int hf_mctp_fragment_overlap_conflicts;
+static int hf_mctp_fragment_multiple_tails;
+static int hf_mctp_fragment_too_long_fragment;
+static int hf_mctp_fragment_error;
+static int hf_mctp_fragment_count;
+static int hf_mctp_reassembled_in;
+static int hf_mctp_reassembled_length;
+static int hf_mctp_reassembled_data;
+
+static gint ett_mctp_fragment;
+static gint ett_mctp_fragments;
 
 static const fragment_items mctp_frag_items = {
     /* Fragment subtrees */
diff --git a/epan/dissectors/packet-mdb.c b/epan/dissectors/packet-mdb.c
index 6c16ea4cdd..b72dece539 100644
--- a/epan/dissectors/packet-mdb.c
+++ b/epan/dissectors/packet-mdb.c
@@ -37,57 +37,57 @@ void proto_register_mdb(void);
 
 static dissector_handle_t mdb_handle;
 
-static int proto_mdb = -1;
-
-static int ett_mdb = -1;
-static int ett_mdb_hdr = -1;
-static int ett_mdb_cl = -1;
-static int ett_mdb_cgw = -1;
-
-static int hf_mdb_hdr_ver = -1;
-static int hf_mdb_event = -1;
-static int hf_mdb_addr = -1;
-static int hf_mdb_cmd = -1;
-static int hf_mdb_cl_setup_sub = -1;
-static int hf_mdb_cl_feat_lvl = -1;
-static int hf_mdb_cl_cols = -1;
-static int hf_mdb_cl_rows = -1;
-static int hf_mdb_cl_disp_info = -1;
-static int hf_mdb_cl_max_price = -1;
-static int hf_mdb_cl_min_price = -1;
-static int hf_mdb_cl_vend_sub = -1;
-static int hf_mdb_cl_item_price = -1;
-static int hf_mdb_cl_item_num = -1;
-static int hf_mdb_cl_reader_sub = -1;
-static int hf_mdb_cl_resp = -1;
-static int hf_mdb_cl_scale = -1;
-static int hf_mdb_cl_dec_pl = -1;
-static int hf_mdb_cl_max_rsp_time = -1;
-static int hf_mdb_cl_vend_amt = -1;
-static int hf_mdb_cl_expns_sub = -1;
-static int hf_mdb_cl_manuf_code = -1;
-static int hf_mdb_cl_ser_num = -1;
-static int hf_mdb_cl_mod_num = -1;
-static int hf_mdb_cl_opt_feat = -1;
-static int hf_mdb_cgw_feat_lvl = -1;
-static int hf_mdb_cgw_scale = -1;
-static int hf_mdb_cgw_dec_pl = -1;
-static int hf_mdb_cgw_resp = -1;
-static int hf_mdb_cgw_max_rsp_time = -1;
-static int hf_mdb_cgw_report_sub = -1;
-static int hf_mdb_cgw_dts_evt_code = -1;
-static int hf_mdb_cgw_duration = -1;
-static int hf_mdb_cgw_activity = -1;
-static int hf_mdb_cgw_expns_sub = -1;
-static int hf_mdb_cgw_opt_feat = -1;
-static int hf_mdb_cgw_manuf_code = -1;
-static int hf_mdb_cgw_ser_num = -1;
-static int hf_mdb_cgw_mod_num = -1;
-static int hf_mdb_ack = -1;
-static int hf_mdb_data = -1;
-static int hf_mdb_chk = -1;
-
-static expert_field ei_mdb_short_packet = EI_INIT;
+static int proto_mdb;
+
+static int ett_mdb;
+static int ett_mdb_hdr;
+static int ett_mdb_cl;
+static int ett_mdb_cgw;
+
+static int hf_mdb_hdr_ver;
+static int hf_mdb_event;
+static int hf_mdb_addr;
+static int hf_mdb_cmd;
+static int hf_mdb_cl_setup_sub;
+static int hf_mdb_cl_feat_lvl;
+static int hf_mdb_cl_cols;
+static int hf_mdb_cl_rows;
+static int hf_mdb_cl_disp_info;
+static int hf_mdb_cl_max_price;
+static int hf_mdb_cl_min_price;
+static int hf_mdb_cl_vend_sub;
+static int hf_mdb_cl_item_price;
+static int hf_mdb_cl_item_num;
+static int hf_mdb_cl_reader_sub;
+static int hf_mdb_cl_resp;
+static int hf_mdb_cl_scale;
+static int hf_mdb_cl_dec_pl;
+static int hf_mdb_cl_max_rsp_time;
+static int hf_mdb_cl_vend_amt;
+static int hf_mdb_cl_expns_sub;
+static int hf_mdb_cl_manuf_code;
+static int hf_mdb_cl_ser_num;
+static int hf_mdb_cl_mod_num;
+static int hf_mdb_cl_opt_feat;
+static int hf_mdb_cgw_feat_lvl;
+static int hf_mdb_cgw_scale;
+static int hf_mdb_cgw_dec_pl;
+static int hf_mdb_cgw_resp;
+static int hf_mdb_cgw_max_rsp_time;
+static int hf_mdb_cgw_report_sub;
+static int hf_mdb_cgw_dts_evt_code;
+static int hf_mdb_cgw_duration;
+static int hf_mdb_cgw_activity;
+static int hf_mdb_cgw_expns_sub;
+static int hf_mdb_cgw_opt_feat;
+static int hf_mdb_cgw_manuf_code;
+static int hf_mdb_cgw_ser_num;
+static int hf_mdb_cgw_mod_num;
+static int hf_mdb_ack;
+static int hf_mdb_data;
+static int hf_mdb_chk;
+
+static expert_field ei_mdb_short_packet;
 
 #define MDB_EVT_DATA_MST_PER 0xFF
 #define MDB_EVT_DATA_PER_MST 0xFE
diff --git a/epan/dissectors/packet-mdp.c b/epan/dissectors/packet-mdp.c
index 65c0c49c19..b7a66a17a1 100644
--- a/epan/dissectors/packet-mdp.c
+++ b/epan/dissectors/packet-mdp.c
@@ -24,20 +24,20 @@
 void proto_register_mdp(void);
 void proto_reg_handoff_mdp(void);
 
-static int proto_mdp = -1;
-static int hf_mdp_preamble_data = -1;
-static int hf_mdp_device_info = -1;
-static int hf_mdp_network_info = -1;
-static int hf_mdp_type = -1;
-static int hf_mdp_length = -1;
-static int hf_mdp_longitude = -1;
-static int hf_mdp_latitude = -1;
-static int hf_mdp_type_six = -1;
-static int hf_mdp_type_seven = -1;
-static int hf_mdp_data = -1;
-
-static gint ett_mdp = -1;
-static gint ett_mdp_tlv = -1;
+static int proto_mdp;
+static int hf_mdp_preamble_data;
+static int hf_mdp_device_info;
+static int hf_mdp_network_info;
+static int hf_mdp_type;
+static int hf_mdp_length;
+static int hf_mdp_longitude;
+static int hf_mdp_latitude;
+static int hf_mdp_type_six;
+static int hf_mdp_type_seven;
+static int hf_mdp_data;
+
+static gint ett_mdp;
+static gint ett_mdp_tlv;
 
 static dissector_handle_t mdp_handle;
 
diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c
index d0ba688883..7bd9dd31d9 100644
--- a/epan/dissectors/packet-mdshdr.c
+++ b/epan/dissectors/packet-mdshdr.c
@@ -69,21 +69,21 @@ void proto_reg_handoff_mdshdr(void);
 #define MDSHDR_EOF_UNKNOWN               0xb
 
 /* Initialize the protocol and registered fields */
-static int proto_mdshdr = -1;
-static int hf_mdshdr_sof = -1;
-static int hf_mdshdr_pkt_len = -1;
-static int hf_mdshdr_dstidx = -1;
-static int hf_mdshdr_srcidx = -1;
-static int hf_mdshdr_vsan = -1;
-static int hf_mdshdr_eof = -1;
-static int hf_mdshdr_no_trailer = -1;
-static int hf_mdshdr_span = -1;
-static int hf_mdshdr_fccrc = -1;
+static int proto_mdshdr;
+static int hf_mdshdr_sof;
+static int hf_mdshdr_pkt_len;
+static int hf_mdshdr_dstidx;
+static int hf_mdshdr_srcidx;
+static int hf_mdshdr_vsan;
+static int hf_mdshdr_eof;
+static int hf_mdshdr_no_trailer;
+static int hf_mdshdr_span;
+static int hf_mdshdr_fccrc;
 
 /* Initialize the subtree pointers */
-static gint ett_mdshdr = -1;
-static gint ett_mdshdr_hdr = -1;
-static gint ett_mdshdr_trlr = -1;
+static gint ett_mdshdr;
+static gint ett_mdshdr_hdr;
+static gint ett_mdshdr_trlr;
 
 static dissector_handle_t mdshdr_handle;
 static dissector_handle_t fc_dissector_handle;
diff --git a/epan/dissectors/packet-media.c b/epan/dissectors/packet-media.c
index e4c3154c22..721cfd9369 100644
--- a/epan/dissectors/packet-media.c
+++ b/epan/dissectors/packet-media.c
@@ -24,9 +24,9 @@
 
 void proto_register_media(void);
 
-static int proto_media = -1;
-static gint hf_media_type = -1;
-static gint ett_media = -1;
+static int proto_media;
+static gint hf_media_type;
+static gint ett_media;
 static heur_dissector_list_t heur_subdissector_list;
 
 static int
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index b9bd93b0df..dac97c1e20 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -59,109 +59,109 @@ static pref_t *sip_hide_generated_call_ids;
 
 
 /* Define the megaco proto */
-static int proto_megaco         = -1;
+static int proto_megaco;
 
 /* Define headers for megaco */
-static int hf_megaco_start          = -1;
-static int hf_megaco_version        = -1;
-static int hf_megaco_transaction    = -1;
-static int hf_megaco_transid        = -1;
-static int hf_megaco_Context        = -1;
-/* static int hf_megaco_command_line   = -1; */
-static int hf_megaco_command        = -1;
-static int hf_megaco_command_optional = -1;
-static int hf_megaco_wildcard_response = -1;
-static int hf_megaco_termid         = -1;
+static int hf_megaco_start;
+static int hf_megaco_version;
+static int hf_megaco_transaction;
+static int hf_megaco_transid;
+static int hf_megaco_Context;
+/* static int hf_megaco_command_line; */
+static int hf_megaco_command;
+static int hf_megaco_command_optional;
+static int hf_megaco_wildcard_response;
+static int hf_megaco_termid;
 
 
 
 /* Define headers in subtree for megaco */
-static int hf_megaco_modem_descriptor           = -1;
-static int hf_megaco_multiplex_descriptor       = -1;
-static int hf_megaco_media_descriptor           = -1;
-static int hf_megaco_Local_descriptor           = -1;
-static int hf_megaco_events_descriptor          = -1;
-static int hf_megaco_signal_descriptor          = -1;
-static int hf_megaco_audit_descriptor           = -1;
-/* static int hf_megaco_servicechange_descriptor   = -1; */
-static int hf_megaco_digitmap_descriptor        = -1;
-static int hf_megaco_statistics_descriptor      = -1;
-static int hf_megaco_observedevents_descriptor  = -1;
-static int hf_megaco_topology_descriptor        = -1;
-static int hf_megaco_error_descriptor           = -1;
-static int hf_megaco_error_code                 = -1;
-static int hf_megaco_error_string               = -1;
-static int hf_megaco_TerminationState_descriptor= -1;
-static int hf_megaco_Remote_descriptor          = -1;
-static int hf_megaco_LocalControl_descriptor    = -1;
-static int hf_megaco_packages_descriptor        = -1;
-static int hf_megaco_Service_State              = -1;
-static int hf_megaco_Event_Buffer_Control       = -1;
-static int hf_megaco_mode                       = -1;
-static int hf_megaco_reserve_group              = -1;
-static int hf_megaco_h324_muxtbl_in             = -1;
-static int hf_megaco_h324_muxtbl_out            = -1;
-static int hf_megaco_ds_dscp                    = -1;
-static int hf_megaco_gm_saf                     = -1;
-static int hf_megaco_gm_sam                     = -1;
-static int hf_megaco_gm_spf                     = -1;
-static int hf_megaco_gm_spr                     = -1;
-static int hf_megaco_gm_esas                    = -1;
-static int hf_megaco_tman_pol                   = -1;
-static int hf_megaco_gm_rsb                     = -1;
-static int hf_megaco_tman_sdr                   = -1;
-static int hf_megaco_tman_mbs                   = -1;
-static int hf_megaco_tman_pdr                   = -1;
-static int hf_megaco_tman_dvt                   = -1;
-static int hf_megaco_ipdc_realm                 = -1;
-static int hf_megaco_h324_h223capr              = -1;
-static int hf_megaco_reserve_value              = -1;
-static int hf_megaco_streamid                   = -1;
-static int hf_megaco_requestid                  = -1;
-static int hf_megaco_pkgdname                   = -1;
-static int hf_megaco_mId                        = -1;
-static int hf_megaco_h245                       = -1;
-static int hf_megaco_h223Capability             = -1;
-static int hf_megaco_audititem                  = -1;
-static int hf_megaco_priority                   = -1;
+static int hf_megaco_modem_descriptor;
+static int hf_megaco_multiplex_descriptor;
+static int hf_megaco_media_descriptor;
+static int hf_megaco_Local_descriptor;
+static int hf_megaco_events_descriptor;
+static int hf_megaco_signal_descriptor;
+static int hf_megaco_audit_descriptor;
+/* static int hf_megaco_servicechange_descriptor; */
+static int hf_megaco_digitmap_descriptor;
+static int hf_megaco_statistics_descriptor;
+static int hf_megaco_observedevents_descriptor;
+static int hf_megaco_topology_descriptor;
+static int hf_megaco_error_descriptor;
+static int hf_megaco_error_code;
+static int hf_megaco_error_string;
+static int hf_megaco_TerminationState_descriptor;
+static int hf_megaco_Remote_descriptor;
+static int hf_megaco_LocalControl_descriptor;
+static int hf_megaco_packages_descriptor;
+static int hf_megaco_Service_State;
+static int hf_megaco_Event_Buffer_Control;
+static int hf_megaco_mode;
+static int hf_megaco_reserve_group;
+static int hf_megaco_h324_muxtbl_in;
+static int hf_megaco_h324_muxtbl_out;
+static int hf_megaco_ds_dscp;
+static int hf_megaco_gm_saf;
+static int hf_megaco_gm_sam;
+static int hf_megaco_gm_spf;
+static int hf_megaco_gm_spr;
+static int hf_megaco_gm_esas;
+static int hf_megaco_tman_pol;
+static int hf_megaco_gm_rsb;
+static int hf_megaco_tman_sdr;
+static int hf_megaco_tman_mbs;
+static int hf_megaco_tman_pdr;
+static int hf_megaco_tman_dvt;
+static int hf_megaco_ipdc_realm;
+static int hf_megaco_h324_h223capr;
+static int hf_megaco_reserve_value;
+static int hf_megaco_streamid;
+static int hf_megaco_requestid;
+static int hf_megaco_pkgdname;
+static int hf_megaco_mId;
+static int hf_megaco_h245;
+static int hf_megaco_h223Capability;
+static int hf_megaco_audititem;
+static int hf_megaco_priority;
 
 /* Define the trees for megaco */
-static int ett_megaco                           = -1;
-static int ett_megaco_message                   = -1;
-static int ett_megaco_message_body              = -1;
-static int ett_megaco_context                   = -1;
-static int ett_megaco_command_line              = -1;
-static int ett_megaco_mediadescriptor           = -1;
-static int ett_megaco_descriptors               = -1;
-static int ett_megaco_raw_text                  = -1;
-static int ett_megaco_error_descriptor          = -1;
-static int ett_megaco_TerminationState          = -1;
-static int ett_megaco_Localdescriptor           = -1;
-static int ett_megaco_Remotedescriptor          = -1;
-static int ett_megaco_LocalControldescriptor    = -1;
-static int ett_megaco_auditdescriptor           = -1;
-static int ett_megaco_eventsdescriptor          = -1;
-static int ett_megaco_statisticsdescriptor      = -1;
-static int ett_megaco_observedeventsdescriptor  = -1;
-static int ett_megaco_observedevent             = -1;
-static int ett_megaco_packagesdescriptor        = -1;
-static int ett_megaco_requestedevent            = -1;
-static int ett_megaco_signalsdescriptor         = -1;
-static int ett_megaco_requestedsignal           = -1;
-static int ett_megaco_h245                      = -1;
+static int ett_megaco;
+static int ett_megaco_message;
+static int ett_megaco_message_body;
+static int ett_megaco_context;
+static int ett_megaco_command_line;
+static int ett_megaco_mediadescriptor;
+static int ett_megaco_descriptors;
+static int ett_megaco_raw_text;
+static int ett_megaco_error_descriptor;
+static int ett_megaco_TerminationState;
+static int ett_megaco_Localdescriptor;
+static int ett_megaco_Remotedescriptor;
+static int ett_megaco_LocalControldescriptor;
+static int ett_megaco_auditdescriptor;
+static int ett_megaco_eventsdescriptor;
+static int ett_megaco_statisticsdescriptor;
+static int ett_megaco_observedeventsdescriptor;
+static int ett_megaco_observedevent;
+static int ett_megaco_packagesdescriptor;
+static int ett_megaco_requestedevent;
+static int ett_megaco_signalsdescriptor;
+static int ett_megaco_requestedsignal;
+static int ett_megaco_h245;
 
 static gcp_hf_ett_t megaco_ctx_ids;
 
-static expert_field ei_megaco_errored_command = EI_INIT;
-static expert_field ei_megaco_no_command = EI_INIT;
-static expert_field ei_megaco_no_descriptor = EI_INIT;
-static expert_field ei_megaco_error_descriptor_transaction_list = EI_INIT;
-static expert_field ei_megaco_parse_error = EI_INIT;
-static expert_field ei_megaco_audit_descriptor = EI_INIT;
-static expert_field ei_megaco_signal_descriptor = EI_INIT;
-static expert_field ei_megaco_reason_invalid = EI_INIT;
-static expert_field ei_megaco_error_code_invalid = EI_INIT;
-static expert_field ei_megaco_invalid_sdr = EI_INIT;
+static expert_field ei_megaco_errored_command;
+static expert_field ei_megaco_no_command;
+static expert_field ei_megaco_no_descriptor;
+static expert_field ei_megaco_error_descriptor_transaction_list;
+static expert_field ei_megaco_parse_error;
+static expert_field ei_megaco_audit_descriptor;
+static expert_field ei_megaco_signal_descriptor;
+static expert_field ei_megaco_reason_invalid;
+static expert_field ei_megaco_error_code_invalid;
+static expert_field ei_megaco_invalid_sdr;
 
 static dissector_handle_t megaco_text_handle;
 
diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c
index 186bdbfd6c..61418c62db 100644
--- a/epan/dissectors/packet-memcache.c
+++ b/epan/dissectors/packet-memcache.c
@@ -90,59 +90,59 @@ void proto_reg_handoff_memcache(void);
 /* Data Types */
 #define DT_RAW_BYTES          0x00
 
-static int proto_memcache = -1;
+static int proto_memcache;
 
 static dissector_handle_t memcache_tcp_handle;
 static dissector_handle_t memcache_udp_handle;
 
-static int hf_magic = -1;
-static int hf_opcode = -1;
-static int hf_extras_length = -1;
-static int hf_key_length = -1;
-static int hf_value_length = -1;
-static int hf_data_type = -1;
-static int hf_reserved = -1;
-static int hf_status = -1;
-static int hf_total_body_length = -1;
-static int hf_opaque = -1;
-static int hf_cas = -1;
-static int hf_extras = -1;
-static int hf_extras_flags = -1;
-static int hf_extras_expiration = -1;
-static int hf_extras_delta = -1;
-static int hf_extras_initial = -1;
-static int hf_extras_unknown = -1;
-static int hf_key = -1;
-static int hf_value = -1;
-static int hf_uint64_response = -1;
-
-static int hf_command = -1;
-static int hf_subcommand = -1;
-static int hf_flags = -1;
-static int hf_expiration = -1;
-static int hf_noreply = -1;
-
-static int hf_response = -1;
-
-static int hf_version = -1;
-static int hf_slabclass = -1;
-static int hf_name = -1;
-static int hf_name_value = -1;
-
-static gint ett_memcache = -1;
-static gint ett_extras = -1;
-
-static expert_field ei_value_missing   = EI_INIT;
-static expert_field ei_extras_missing  = EI_INIT;
-static expert_field ei_value_length    = EI_INIT;
-static expert_field ei_key_missing     = EI_INIT;
-static expert_field ei_key_unknown     = EI_INIT;
-static expert_field ei_extras_unknown  = EI_INIT;
-static expert_field ei_value_unknown   = EI_INIT;
-static expert_field ei_status_response = EI_INIT;
-static expert_field ei_opcode_unknown  = EI_INIT;
-static expert_field ei_reserved_value  = EI_INIT;
-static expert_field ei_magic_unknown   = EI_INIT;
+static int hf_magic;
+static int hf_opcode;
+static int hf_extras_length;
+static int hf_key_length;
+static int hf_value_length;
+static int hf_data_type;
+static int hf_reserved;
+static int hf_status;
+static int hf_total_body_length;
+static int hf_opaque;
+static int hf_cas;
+static int hf_extras;
+static int hf_extras_flags;
+static int hf_extras_expiration;
+static int hf_extras_delta;
+static int hf_extras_initial;
+static int hf_extras_unknown;
+static int hf_key;
+static int hf_value;
+static int hf_uint64_response;
+
+static int hf_command;
+static int hf_subcommand;
+static int hf_flags;
+static int hf_expiration;
+static int hf_noreply;
+
+static int hf_response;
+
+static int hf_version;
+static int hf_slabclass;
+static int hf_name;
+static int hf_name_value;
+
+static gint ett_memcache;
+static gint ett_extras;
+
+static expert_field ei_value_missing;
+static expert_field ei_extras_missing;
+static expert_field ei_value_length;
+static expert_field ei_key_missing;
+static expert_field ei_key_unknown;
+static expert_field ei_extras_unknown;
+static expert_field ei_value_unknown;
+static expert_field ei_status_response;
+static expert_field ei_opcode_unknown;
+static expert_field ei_reserved_value;
+static expert_field ei_magic_unknown;
 
 static const value_string magic_vals[] = {
   { MAGIC_REQUEST,         "Request"            },
diff --git a/epan/dissectors/packet-mesh.c b/epan/dissectors/packet-mesh.c
index c910074415..c428320100 100644
--- a/epan/dissectors/packet-mesh.c
+++ b/epan/dissectors/packet-mesh.c
@@ -17,12 +17,12 @@
 void proto_register_mesh(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_mesh = -1;
-static int hf_mesh_ttl = -1;
-static int hf_mesh_e2eseq = -1;
+static int proto_mesh;
+static int hf_mesh_ttl;
+static int hf_mesh_e2eseq;
 
 /* Initialize the subtree pointers */
-static gint ett_mesh = -1;
+static gint ett_mesh;
 
 /* Code to actually dissect the packets */
 static int
diff --git a/epan/dissectors/packet-messageanalyzer.c b/epan/dissectors/packet-messageanalyzer.c
index 6c33a1d9eb..3814b10c59 100644
--- a/epan/dissectors/packet-messageanalyzer.c
+++ b/epan/dissectors/packet-messageanalyzer.c
@@ -24,158 +24,158 @@ void proto_register_message_analyzer(void);
 void proto_reg_handoff_message_analyzer(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_ma_wfp_capture_v4 = -1;
-static int proto_ma_wfp_capture2_v4 = -1;
-static int proto_ma_wfp_capture_v6 = -1;
-static int proto_ma_wfp_capture2_v6 = -1;
-static int proto_ma_wfp_capture_auth_v4 = -1;
-static int proto_ma_wfp_capture_auth_v6 = -1;
-static int proto_etw_wfp_capture = -1;
-static int proto_etw_ndis = -1;
-
-static int hf_ma_wfp_capture_flow_context = -1;
-static int hf_ma_wfp_capture_payload_length = -1;
-static int hf_ma_wfp_capture_auth_src_port = -1;
-static int hf_ma_wfp_capture_auth_dst_port = -1;
-static int hf_ma_wfp_capture_auth_interface_id = -1;
-static int hf_ma_wfp_capture_auth_direction = -1;
-static int hf_ma_wfp_capture_auth_process_id = -1;
-static int hf_ma_wfp_capture_auth_process_path = -1;
-
-static int hf_etw_wfp_capture_event_id = -1;
-static int hf_etw_wfp_capture_driver_name = -1;
-static int hf_etw_wfp_capture_major_version = -1;
-static int hf_etw_wfp_capture_minor_version = -1;
-static int hf_etw_wfp_capture_callout = -1;
-static int hf_etw_wfp_capture_filter_id = -1;
-static int hf_etw_wfp_capture_filter_weight = -1;
-static int hf_etw_wfp_capture_driver_error_message = -1;
-static int hf_etw_wfp_capture_nt_status = -1;
-static int hf_etw_wfp_capture_callout_error_message = -1;
-
-static int hf_etw_ndis_event_id = -1;
-static int hf_etw_ndis_miniport_if_index = -1;
-static int hf_etw_ndis_lower_if_index = -1;
-static int hf_etw_ndis_fragment_size = -1;
-static int hf_etw_ndis_fragment = -1;
-static int hf_etw_ndis_metadata_size = -1;
-static int hf_etw_ndis_metadata = -1;
-static int hf_etw_ndis_source_port_id = -1;
-static int hf_etw_ndis_source_port_name = -1;
-static int hf_etw_ndis_source_nic_name = -1;
-static int hf_etw_ndis_source_nic_type = -1;
-static int hf_etw_ndis_destination_count = -1;
-static int hf_etw_ndis_destination_port_id = -1;
-static int hf_etw_ndis_destination_port_name = -1;
-static int hf_etw_ndis_destination_nic_name = -1;
-static int hf_etw_ndis_destination_nic_type = -1;
-static int hf_etw_ndis_oob_data_size = -1;
-static int hf_etw_ndis_oob_data = -1;
-static int hf_etw_ndis_rules_count = -1;
-static int hf_etw_ndis_friendly_name = -1;
-static int hf_etw_ndis_unique_name = -1;
-static int hf_etw_ndis_service_name = -1;
-static int hf_etw_ndis_version = -1;
-static int hf_etw_ndis_media_type = -1;
-static int hf_etw_ndis_reference_context = -1;
-static int hf_etw_ndis_rule_id = -1;
-static int hf_etw_ndis_directive = -1;
-static int hf_etw_ndis_value_length = -1;
-static int hf_etw_ndis_value = -1;
-static int hf_etw_ndis_error_code = -1;
-static int hf_etw_ndis_location = -1;
-static int hf_etw_ndis_context = -1;
-static int hf_etw_ndis_previous_state = -1;
-static int hf_etw_ndis_next_state = -1;
-static int hf_etw_ndis_source_id = -1;
-static int hf_etw_ndis_rundown_id = -1;
-static int hf_etw_ndis_param1 = -1;
-static int hf_etw_ndis_param2 = -1;
-static int hf_etw_ndis_param_str = -1;
-static int hf_etw_ndis_description = -1;
-static int hf_etw_ndis_source_name = -1;
-static int hf_etw_ndis_if_index = -1;
-static int hf_etw_ndis_layer_count = -1;
-static int hf_etw_ndis_layer_id = -1;
-static int hf_etw_ndis_layer_name = -1;
-static int hf_etw_ndis_keyword = -1;
-static int hf_etw_ndis_keyword_ethernet8023 = -1;
-static int hf_etw_ndis_keyword_reserved1 = -1;
-static int hf_etw_ndis_keyword_wireless_wan = -1;
-static int hf_etw_ndis_keyword_reserved2 = -1;
-static int hf_etw_ndis_keyword_tunnel = -1;
-static int hf_etw_ndis_keyword_native80211 = -1;
-static int hf_etw_ndis_keyword_reserved3 = -1;
-static int hf_etw_ndis_keyword_vmswitch = -1;
-static int hf_etw_ndis_keyword_reserved4 = -1;
-static int hf_etw_ndis_keyword_packet_start = -1;
-static int hf_etw_ndis_keyword_packet_end = -1;
-static int hf_etw_ndis_keyword_send_path = -1;
-static int hf_etw_ndis_keyword_receive_path = -1;
-static int hf_etw_ndis_keyword_l3_connect_path = -1;
-static int hf_etw_ndis_keyword_l2_connect_path = -1;
-static int hf_etw_ndis_keyword_close_path = -1;
-static int hf_etw_ndis_keyword_authentication = -1;
-static int hf_etw_ndis_keyword_configuration = -1;
-static int hf_etw_ndis_keyword_global = -1;
-static int hf_etw_ndis_keyword_dropped = -1;
-static int hf_etw_ndis_keyword_pii_present = -1;
-static int hf_etw_ndis_keyword_packet = -1;
-static int hf_etw_ndis_keyword_address = -1;
-static int hf_etw_ndis_keyword_std_template_hint = -1;
-static int hf_etw_ndis_keyword_state_transition = -1;
-static int hf_etw_ndis_keyword_reserved5 = -1;
-static int hf_etw_ndis_packet_metadata_type = -1;
-static int hf_etw_ndis_packet_metadata_revision = -1;
-static int hf_etw_ndis_packet_metadata_size = -1;
-static int hf_etw_ndis_packet_metadata_wifi_flags = -1;
-static int hf_etw_ndis_packet_metadata_wifi_phytype = -1;
-static int hf_etw_ndis_packet_metadata_wifi_channel = -1;
-static int hf_etw_ndis_packet_metadata_wifi_mpdus_received = -1;
-static int hf_etw_ndis_packet_metadata_wifi_mpdu_padding = -1;
-static int hf_etw_ndis_packet_metadata_wifi_rssi = -1;
-static int hf_etw_ndis_packet_metadata_wifi_datarate = -1;
-static int hf_etw_ndis_packet_metadata_data = -1;
-static int hf_etw_ndis_tcp_ip_checksum_net_buffer_list = -1;
-static int hf_etw_ndis_ipsec_offload_v1_net_buffer_list_info = -1;
-static int hf_etw_ndis_tcp_large_send_net_buffer_list_info = -1;
-static int hf_etw_ndis_classification_handle_net_buffer_list_info = -1;
-static int hf_etw_ndis_ieee8021q_net_buffer_list_info = -1;
-static int hf_etw_ndis_net_buffer_cancel_id = -1;
-static int hf_etw_ndis_media_specific_information = -1;
-static int hf_etw_ndis_net_buffer_list_frame_type = -1;
-static int hf_etw_ndis_net_buffer_list_hash_value = -1;
-static int hf_etw_ndis_net_buffer_list_hash_info = -1;
-static int hf_etw_ndis_wpf_net_buffer_list_info = -1;
-static int hf_etw_ndis_max_net_buffer_list_info = -1;
+static int proto_ma_wfp_capture_v4;
+static int proto_ma_wfp_capture2_v4;
+static int proto_ma_wfp_capture_v6;
+static int proto_ma_wfp_capture2_v6;
+static int proto_ma_wfp_capture_auth_v4;
+static int proto_ma_wfp_capture_auth_v6;
+static int proto_etw_wfp_capture;
+static int proto_etw_ndis;
+
+static int hf_ma_wfp_capture_flow_context;
+static int hf_ma_wfp_capture_payload_length;
+static int hf_ma_wfp_capture_auth_src_port;
+static int hf_ma_wfp_capture_auth_dst_port;
+static int hf_ma_wfp_capture_auth_interface_id;
+static int hf_ma_wfp_capture_auth_direction;
+static int hf_ma_wfp_capture_auth_process_id;
+static int hf_ma_wfp_capture_auth_process_path;
+
+static int hf_etw_wfp_capture_event_id;
+static int hf_etw_wfp_capture_driver_name;
+static int hf_etw_wfp_capture_major_version;
+static int hf_etw_wfp_capture_minor_version;
+static int hf_etw_wfp_capture_callout;
+static int hf_etw_wfp_capture_filter_id;
+static int hf_etw_wfp_capture_filter_weight;
+static int hf_etw_wfp_capture_driver_error_message;
+static int hf_etw_wfp_capture_nt_status;
+static int hf_etw_wfp_capture_callout_error_message;
+
+static int hf_etw_ndis_event_id;
+static int hf_etw_ndis_miniport_if_index;
+static int hf_etw_ndis_lower_if_index;
+static int hf_etw_ndis_fragment_size;
+static int hf_etw_ndis_fragment;
+static int hf_etw_ndis_metadata_size;
+static int hf_etw_ndis_metadata;
+static int hf_etw_ndis_source_port_id;
+static int hf_etw_ndis_source_port_name;
+static int hf_etw_ndis_source_nic_name;
+static int hf_etw_ndis_source_nic_type;
+static int hf_etw_ndis_destination_count;
+static int hf_etw_ndis_destination_port_id;
+static int hf_etw_ndis_destination_port_name;
+static int hf_etw_ndis_destination_nic_name;
+static int hf_etw_ndis_destination_nic_type;
+static int hf_etw_ndis_oob_data_size;
+static int hf_etw_ndis_oob_data;
+static int hf_etw_ndis_rules_count;
+static int hf_etw_ndis_friendly_name;
+static int hf_etw_ndis_unique_name;
+static int hf_etw_ndis_service_name;
+static int hf_etw_ndis_version;
+static int hf_etw_ndis_media_type;
+static int hf_etw_ndis_reference_context;
+static int hf_etw_ndis_rule_id;
+static int hf_etw_ndis_directive;
+static int hf_etw_ndis_value_length;
+static int hf_etw_ndis_value;
+static int hf_etw_ndis_error_code;
+static int hf_etw_ndis_location;
+static int hf_etw_ndis_context;
+static int hf_etw_ndis_previous_state;
+static int hf_etw_ndis_next_state;
+static int hf_etw_ndis_source_id;
+static int hf_etw_ndis_rundown_id;
+static int hf_etw_ndis_param1;
+static int hf_etw_ndis_param2;
+static int hf_etw_ndis_param_str;
+static int hf_etw_ndis_description;
+static int hf_etw_ndis_source_name;
+static int hf_etw_ndis_if_index;
+static int hf_etw_ndis_layer_count;
+static int hf_etw_ndis_layer_id;
+static int hf_etw_ndis_layer_name;
+static int hf_etw_ndis_keyword;
+static int hf_etw_ndis_keyword_ethernet8023;
+static int hf_etw_ndis_keyword_reserved1;
+static int hf_etw_ndis_keyword_wireless_wan;
+static int hf_etw_ndis_keyword_reserved2;
+static int hf_etw_ndis_keyword_tunnel;
+static int hf_etw_ndis_keyword_native80211;
+static int hf_etw_ndis_keyword_reserved3;
+static int hf_etw_ndis_keyword_vmswitch;
+static int hf_etw_ndis_keyword_reserved4;
+static int hf_etw_ndis_keyword_packet_start;
+static int hf_etw_ndis_keyword_packet_end;
+static int hf_etw_ndis_keyword_send_path;
+static int hf_etw_ndis_keyword_receive_path;
+static int hf_etw_ndis_keyword_l3_connect_path;
+static int hf_etw_ndis_keyword_l2_connect_path;
+static int hf_etw_ndis_keyword_close_path;
+static int hf_etw_ndis_keyword_authentication;
+static int hf_etw_ndis_keyword_configuration;
+static int hf_etw_ndis_keyword_global;
+static int hf_etw_ndis_keyword_dropped;
+static int hf_etw_ndis_keyword_pii_present;
+static int hf_etw_ndis_keyword_packet;
+static int hf_etw_ndis_keyword_address;
+static int hf_etw_ndis_keyword_std_template_hint;
+static int hf_etw_ndis_keyword_state_transition;
+static int hf_etw_ndis_keyword_reserved5;
+static int hf_etw_ndis_packet_metadata_type;
+static int hf_etw_ndis_packet_metadata_revision;
+static int hf_etw_ndis_packet_metadata_size;
+static int hf_etw_ndis_packet_metadata_wifi_flags;
+static int hf_etw_ndis_packet_metadata_wifi_phytype;
+static int hf_etw_ndis_packet_metadata_wifi_channel;
+static int hf_etw_ndis_packet_metadata_wifi_mpdus_received;
+static int hf_etw_ndis_packet_metadata_wifi_mpdu_padding;
+static int hf_etw_ndis_packet_metadata_wifi_rssi;
+static int hf_etw_ndis_packet_metadata_wifi_datarate;
+static int hf_etw_ndis_packet_metadata_data;
+static int hf_etw_ndis_tcp_ip_checksum_net_buffer_list;
+static int hf_etw_ndis_ipsec_offload_v1_net_buffer_list_info;
+static int hf_etw_ndis_tcp_large_send_net_buffer_list_info;
+static int hf_etw_ndis_classification_handle_net_buffer_list_info;
+static int hf_etw_ndis_ieee8021q_net_buffer_list_info;
+static int hf_etw_ndis_net_buffer_cancel_id;
+static int hf_etw_ndis_media_specific_information;
+static int hf_etw_ndis_net_buffer_list_frame_type;
+static int hf_etw_ndis_net_buffer_list_hash_value;
+static int hf_etw_ndis_net_buffer_list_hash_info;
+static int hf_etw_ndis_wpf_net_buffer_list_info;
+static int hf_etw_ndis_max_net_buffer_list_info;
 
 /* Fields used from other common dissectors */
-static int hf_ip_src = -1;
-static int hf_ip_addr = -1;
-static int hf_ip_src_host = -1;
-static int hf_ip_host = -1;
-static int hf_ip_dst = -1;
-static int hf_ip_dst_host = -1;
-static int hf_ip_proto = -1;
-static int hf_ipv6_src = -1;
-static int hf_ipv6_addr = -1;
-static int hf_ipv6_src_host = -1;
-static int hf_ipv6_host = -1;
-static int hf_ipv6_dst = -1;
-static int hf_ipv6_dst_host = -1;
+static int hf_ip_src;
+static int hf_ip_addr;
+static int hf_ip_src_host;
+static int hf_ip_host;
+static int hf_ip_dst;
+static int hf_ip_dst_host;
+static int hf_ip_proto;
+static int hf_ipv6_src;
+static int hf_ipv6_addr;
+static int hf_ipv6_src_host;
+static int hf_ipv6_host;
+static int hf_ipv6_dst;
+static int hf_ipv6_dst_host;
 
 
 /* Initialize the subtree pointers */
-static gint ett_ma_wfp_capture_v4 = -1;
-static gint ett_ma_wfp_capture_v6 = -1;
-static gint ett_ma_wfp_capture_auth = -1;
-static gint ett_etw_wfp_capture = -1;
-static gint ett_etw_ndis = -1;
-static gint ett_etw_ndis_dest = -1;
-static gint ett_etw_ndis_layer = -1;
-static gint ett_etw_ndis_keyword = -1;
-static gint ett_etw_ndis_packet_metadata = -1;
-static gint ett_etw_ndis_oob_data = -1;
+static gint ett_ma_wfp_capture_v4;
+static gint ett_ma_wfp_capture_v6;
+static gint ett_ma_wfp_capture_auth;
+static gint ett_etw_wfp_capture;
+static gint ett_etw_ndis;
+static gint ett_etw_ndis_dest;
+static gint ett_etw_ndis_layer;
+static gint ett_etw_ndis_keyword;
+static gint ett_etw_ndis_packet_metadata;
+static gint ett_etw_ndis_oob_data;
 
 static dissector_handle_t ma_wfp_capture_v4_handle;
 static dissector_handle_t ma_wfp_capture2_v4_handle;
diff --git a/epan/dissectors/packet-meta.c b/epan/dissectors/packet-meta.c
index a0385a1bd5..c4111b58ca 100644
--- a/epan/dissectors/packet-meta.c
+++ b/epan/dissectors/packet-meta.c
@@ -75,51 +75,51 @@ enum meta_direction {
     META_DIR_DOWN
 };
 
-static int proto_meta = -1;
+static int proto_meta;
 extern int proto_sscop;
 
 /* fields */
-static int hf_meta_schema = -1;
-static int hf_meta_hdrlen = -1;
-static int hf_meta_proto = -1;
-static int hf_meta_reserved = -1;
-static int hf_meta_item = -1;
-static int hf_meta_item_id = -1;
-static int hf_meta_item_type = -1;
-static int hf_meta_item_len = -1;
-static int hf_meta_item_data = -1;
+static int hf_meta_schema;
+static int hf_meta_hdrlen;
+static int hf_meta_proto;
+static int hf_meta_reserved;
+static int hf_meta_item;
+static int hf_meta_item_id;
+static int hf_meta_item_type;
+static int hf_meta_item_len;
+static int hf_meta_item_data;
 /* specific fields */
-static int hf_meta_item_direction = -1;
-static int hf_meta_item_ts = -1;
-static int hf_meta_item_phylinkid = -1;
-static int hf_meta_item_nsapi = -1;
-static int hf_meta_item_imsi_value = -1;
-static int hf_meta_item_imsi_digits = -1;
-static int hf_meta_item_imei_value = -1;
-static int hf_meta_item_imei_digits = -1;
-static int hf_meta_item_signaling = -1;
-static int hf_meta_item_incomplete = -1;
-static int hf_meta_item_deciphered = -1;
-static int hf_meta_item_apn = -1;
-static int hf_meta_item_rat = -1;
-static int hf_meta_item_aal5proto = -1;
-static int hf_meta_item_cell = -1;
-static int hf_meta_item_localdevid = -1;
-static int hf_meta_item_remotedevid = -1;
-static int hf_meta_item_tapgroupid = -1;
-static int hf_meta_item_tlli = -1;
-static int hf_meta_item_calling = -1;
-static int hf_meta_item_called = -1;
+static int hf_meta_item_direction;
+static int hf_meta_item_ts;
+static int hf_meta_item_phylinkid;
+static int hf_meta_item_nsapi;
+static int hf_meta_item_imsi_value;
+static int hf_meta_item_imsi_digits;
+static int hf_meta_item_imei_value;
+static int hf_meta_item_imei_digits;
+static int hf_meta_item_signaling;
+static int hf_meta_item_incomplete;
+static int hf_meta_item_deciphered;
+static int hf_meta_item_apn;
+static int hf_meta_item_rat;
+static int hf_meta_item_aal5proto;
+static int hf_meta_item_cell;
+static int hf_meta_item_localdevid;
+static int hf_meta_item_remotedevid;
+static int hf_meta_item_tapgroupid;
+static int hf_meta_item_tlli;
+static int hf_meta_item_calling;
+static int hf_meta_item_called;
 
 /* subtrees */
-static gint ett_meta = -1;
-static gint ett_meta_item = -1;
-static gint ett_meta_cell = -1;
-static gint ett_meta_imsi = -1;
-static gint ett_meta_imei = -1;
-
-static expert_field ei_meta_malformed = EI_INIT;
-static expert_field ei_meta_invalid_header = EI_INIT;
+static gint ett_meta;
+static gint ett_meta_item;
+static gint ett_meta_cell;
+static gint ett_meta_imsi;
+static gint ett_meta_imei;
+
+static expert_field ei_meta_malformed;
+static expert_field ei_meta_invalid_header;
 
 /* default handle */
 static dissector_handle_t data_handle;
diff --git a/epan/dissectors/packet-metamako.c b/epan/dissectors/packet-metamako.c
index 44aeaaa151..89218ca2c6 100644
--- a/epan/dissectors/packet-metamako.c
+++ b/epan/dissectors/packet-metamako.c
@@ -43,7 +43,7 @@ static range_t* metamako_trailer_secs_bounds = NULL;
 static guint metamako_trailer_days_diff_limit = TRAILER_DAYS_DIFF_LIMIT_DFLT;
 
 /* Protocols and Header Fields */
-static int proto_metamako = -1;
+static int proto_metamako;
 
 /*
   Metamako trailer format
@@ -65,34 +65,34 @@ static int proto_metamako = -1;
   +---------------+---------------+---------------+---------------+
 */
 
-static int hf_metamako_origfcs = -1;
-static int hf_metamako_trailerext = -1;
-static int hf_metamako_unknownext = -1;
-static int hf_metamako_seqnum = -1;
-static int hf_metamako_tagstring = -1;
-static int hf_metamako_fracns = -1;
-static int hf_metamako_crchash = -1;
-static int hf_metamako_egress_seqnum = -1;
-static int hf_metamako_time_abs = -1;
-static int hf_metamako_time_rel = -1;
-static int hf_metamako_flags = -1;
-static int hf_metamako_src_port = -1;
-static int hf_metamako_src_device = -1;
-static int hf_metamako_time_diff = -1;
-static int hf_metamako_fcs = -1;
-static int hf_metamako_fcs_status = -1;
-
-static int hf_metamako_flags_orig_fcs_vld = -1;
-static int hf_metamako_flags_has_ext = -1;
-static int hf_metamako_flags_duplicate = -1;
-static int hf_metamako_flags_ts_degraded = -1;
-static int hf_metamako_flags_control_block_type = -1;
-static int hf_metamako_reserved = -1;
-
-static gint ett_metamako = -1;
-static gint ett_metamako_timestamp = -1;
-static gint ett_metamako_extensions = -1;
-static gint ett_metamako_flags = -1;
+static int hf_metamako_origfcs;
+static int hf_metamako_trailerext;
+static int hf_metamako_unknownext;
+static int hf_metamako_seqnum;
+static int hf_metamako_tagstring;
+static int hf_metamako_fracns;
+static int hf_metamako_crchash;
+static int hf_metamako_egress_seqnum;
+static int hf_metamako_time_abs;
+static int hf_metamako_time_rel;
+static int hf_metamako_flags;
+static int hf_metamako_src_port;
+static int hf_metamako_src_device;
+static int hf_metamako_time_diff;
+static int hf_metamako_fcs;
+static int hf_metamako_fcs_status;
+
+static int hf_metamako_flags_orig_fcs_vld;
+static int hf_metamako_flags_has_ext;
+static int hf_metamako_flags_duplicate;
+static int hf_metamako_flags_ts_degraded;
+static int hf_metamako_flags_control_block_type;
+static int hf_metamako_reserved;
+
+static gint ett_metamako;
+static gint ett_metamako_timestamp;
+static gint ett_metamako_extensions;
+static gint ett_metamako_flags;
 
 static const enum_val_t metamako_fcs_vals[] = {
   {"heuristic", "According to heuristic", -1},
@@ -130,7 +130,7 @@ static int* const flags[] = {
   NULL
 };
 
-static expert_field ei_metamako_fcs_bad = EI_INIT;
+static expert_field ei_metamako_fcs_bad;
 
 static void
 sub_nanos_base_custom(gchar* result, guint32 value)
diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c
index fa69e1dc4a..7e23599def 100644
--- a/epan/dissectors/packet-mgcp.c
+++ b/epan/dissectors/packet-mgcp.c
@@ -46,124 +46,124 @@
 
 
 /* Define the mgcp proto */
-static int proto_mgcp = -1;
+static int proto_mgcp;
 
 /* Define many many headers for mgcp */
-static int hf_mgcp_req = -1;
-static int hf_mgcp_req_verb = -1;
-static int hf_mgcp_req_endpoint = -1;
-static int hf_mgcp_req_frame = -1;
-static int hf_mgcp_rsp = -1;
-static int hf_mgcp_rsp_frame = -1;
-static int hf_mgcp_time = -1;
-static int hf_mgcp_transid = -1;
-static int hf_mgcp_version = -1;
-static int hf_mgcp_rsp_rspcode = -1;
-static int hf_mgcp_rsp_rspstring = -1;
-static int hf_mgcp_params = -1;
-static int hf_mgcp_param_rspack = -1;
-static int hf_mgcp_param_bearerinfo = -1;
-static int hf_mgcp_param_callid = -1;
-static int hf_mgcp_param_connectionid = -1;
-static int hf_mgcp_param_secondconnectionid = -1;
-static int hf_mgcp_param_notifiedentity = -1;
-static int hf_mgcp_param_requestid = -1;
-static int hf_mgcp_param_localconnoptions = -1;
-static int hf_mgcp_param_localconnoptions_p = -1;
-static int hf_mgcp_param_localconnoptions_a = -1;
-static int hf_mgcp_param_localconnoptions_s = -1;
-static int hf_mgcp_param_localconnoptions_e = -1;
-static int hf_mgcp_param_localconnoptions_scrtp = -1;
-static int hf_mgcp_param_localconnoptions_scrtcp = -1;
-static int hf_mgcp_param_localconnoptions_b = -1;
-static int hf_mgcp_param_localconnoptions_esccd = -1;
-static int hf_mgcp_param_localconnoptions_escci = -1;
-static int hf_mgcp_param_localconnoptions_dqgi = -1;
-static int hf_mgcp_param_localconnoptions_dqrd = -1;
-static int hf_mgcp_param_localconnoptions_dqri = -1;
-static int hf_mgcp_param_localconnoptions_dqrr = -1;
-static int hf_mgcp_param_localconnoptions_k = -1;
-static int hf_mgcp_param_localconnoptions_gc = -1;
-static int hf_mgcp_param_localconnoptions_fmtp = -1;
-static int hf_mgcp_param_localconnoptions_nt = -1;
-static int hf_mgcp_param_localconnoptions_ofmtp = -1;
-static int hf_mgcp_param_localconnoptions_r = -1;
-static int hf_mgcp_param_localconnoptions_t = -1;
-static int hf_mgcp_param_localconnoptions_rcnf = -1;
-static int hf_mgcp_param_localconnoptions_rdir = -1;
-static int hf_mgcp_param_localconnoptions_rsh = -1;
-static int hf_mgcp_param_localconnoptions_mp = -1;
-static int hf_mgcp_param_localconnoptions_fxr = -1;
-static int hf_mgcp_param_localvoicemetrics = -1;
-static int hf_mgcp_param_remotevoicemetrics = -1;
-static int hf_mgcp_param_voicemetrics_nlr = -1;
-static int hf_mgcp_param_voicemetrics_jdr = -1;
-static int hf_mgcp_param_voicemetrics_bld = -1;
-static int hf_mgcp_param_voicemetrics_gld = -1;
-static int hf_mgcp_param_voicemetrics_bd = -1;
-static int hf_mgcp_param_voicemetrics_gd = -1;
-static int hf_mgcp_param_voicemetrics_rtd = -1;
-static int hf_mgcp_param_voicemetrics_esd = -1;
-static int hf_mgcp_param_voicemetrics_sl = -1;
-static int hf_mgcp_param_voicemetrics_nl = -1;
-static int hf_mgcp_param_voicemetrics_rerl = -1;
-static int hf_mgcp_param_voicemetrics_gmn = -1;
-static int hf_mgcp_param_voicemetrics_nsr = -1;
-static int hf_mgcp_param_voicemetrics_xsr = -1;
-static int hf_mgcp_param_voicemetrics_mlq = -1;
-static int hf_mgcp_param_voicemetrics_mcq = -1;
-static int hf_mgcp_param_voicemetrics_plc = -1;
-static int hf_mgcp_param_voicemetrics_jba = -1;
-static int hf_mgcp_param_voicemetrics_jbr = -1;
-static int hf_mgcp_param_voicemetrics_jbn = -1;
-static int hf_mgcp_param_voicemetrics_jbm = -1;
-static int hf_mgcp_param_voicemetrics_jbs = -1;
-static int hf_mgcp_param_voicemetrics_iaj = -1;
-static int hf_mgcp_param_connectionmode = -1;
-static int hf_mgcp_param_reqevents = -1;
-static int hf_mgcp_param_restartmethod = -1;
-static int hf_mgcp_param_restartdelay = -1;
-static int hf_mgcp_param_signalreq  = -1;
-static int hf_mgcp_param_digitmap = -1;
-static int hf_mgcp_param_observedevent = -1;
-static int hf_mgcp_param_connectionparam = -1;
-static int hf_mgcp_param_connectionparam_ps = -1;
-static int hf_mgcp_param_connectionparam_os = -1;
-static int hf_mgcp_param_connectionparam_pr = -1;
-static int hf_mgcp_param_connectionparam_or = -1;
-static int hf_mgcp_param_connectionparam_pl = -1;
-static int hf_mgcp_param_connectionparam_ji = -1;
-static int hf_mgcp_param_connectionparam_la = -1;
-static int hf_mgcp_param_connectionparam_pcrps = -1;
-static int hf_mgcp_param_connectionparam_pcros = -1;
-static int hf_mgcp_param_connectionparam_pcrpl = -1;
-static int hf_mgcp_param_connectionparam_pcrji = -1;
-static int hf_mgcp_param_connectionparam_x = -1;
-static int hf_mgcp_param_reasoncode = -1;
-static int hf_mgcp_param_eventstates = -1;
-static int hf_mgcp_param_specificendpoint = -1;
-static int hf_mgcp_param_secondendpointid = -1;
-static int hf_mgcp_param_reqinfo = -1;
-static int hf_mgcp_param_quarantinehandling = -1;
-static int hf_mgcp_param_detectedevents = -1;
-static int hf_mgcp_param_capabilities = -1;
-static int hf_mgcp_param_maxmgcpdatagram = -1;
-static int hf_mgcp_param_packagelist = -1;
-static int hf_mgcp_param_extension = -1;
-static int hf_mgcp_param_extension_critical = -1;
-static int hf_mgcp_param_resourceid = -1;
-static int hf_mgcp_param_invalid = -1;
-static int hf_mgcp_messagecount = -1;
-static int hf_mgcp_dup = -1;
-static int hf_mgcp_req_dup = -1;
-static int hf_mgcp_req_dup_frame = -1;
-static int hf_mgcp_rsp_dup = -1;
-static int hf_mgcp_rsp_dup_frame = -1;
-static int hf_mgcp_param_x_osmux = -1;
-static int hf_mgcp_unknown_parameter = -1;
-static int hf_mgcp_malformed_parameter = -1;
-
-static expert_field ei_mgcp_rsp_rspcode_invalid = EI_INIT;
+static int hf_mgcp_req;
+static int hf_mgcp_req_verb;
+static int hf_mgcp_req_endpoint;
+static int hf_mgcp_req_frame;
+static int hf_mgcp_rsp;
+static int hf_mgcp_rsp_frame;
+static int hf_mgcp_time;
+static int hf_mgcp_transid;
+static int hf_mgcp_version;
+static int hf_mgcp_rsp_rspcode;
+static int hf_mgcp_rsp_rspstring;
+static int hf_mgcp_params;
+static int hf_mgcp_param_rspack;
+static int hf_mgcp_param_bearerinfo;
+static int hf_mgcp_param_callid;
+static int hf_mgcp_param_connectionid;
+static int hf_mgcp_param_secondconnectionid;
+static int hf_mgcp_param_notifiedentity;
+static int hf_mgcp_param_requestid;
+static int hf_mgcp_param_localconnoptions;
+static int hf_mgcp_param_localconnoptions_p;
+static int hf_mgcp_param_localconnoptions_a;
+static int hf_mgcp_param_localconnoptions_s;
+static int hf_mgcp_param_localconnoptions_e;
+static int hf_mgcp_param_localconnoptions_scrtp;
+static int hf_mgcp_param_localconnoptions_scrtcp;
+static int hf_mgcp_param_localconnoptions_b;
+static int hf_mgcp_param_localconnoptions_esccd;
+static int hf_mgcp_param_localconnoptions_escci;
+static int hf_mgcp_param_localconnoptions_dqgi;
+static int hf_mgcp_param_localconnoptions_dqrd;
+static int hf_mgcp_param_localconnoptions_dqri;
+static int hf_mgcp_param_localconnoptions_dqrr;
+static int hf_mgcp_param_localconnoptions_k;
+static int hf_mgcp_param_localconnoptions_gc;
+static int hf_mgcp_param_localconnoptions_fmtp;
+static int hf_mgcp_param_localconnoptions_nt;
+static int hf_mgcp_param_localconnoptions_ofmtp;
+static int hf_mgcp_param_localconnoptions_r;
+static int hf_mgcp_param_localconnoptions_t;
+static int hf_mgcp_param_localconnoptions_rcnf;
+static int hf_mgcp_param_localconnoptions_rdir;
+static int hf_mgcp_param_localconnoptions_rsh;
+static int hf_mgcp_param_localconnoptions_mp;
+static int hf_mgcp_param_localconnoptions_fxr;
+static int hf_mgcp_param_localvoicemetrics;
+static int hf_mgcp_param_remotevoicemetrics;
+static int hf_mgcp_param_voicemetrics_nlr;
+static int hf_mgcp_param_voicemetrics_jdr;
+static int hf_mgcp_param_voicemetrics_bld;
+static int hf_mgcp_param_voicemetrics_gld;
+static int hf_mgcp_param_voicemetrics_bd;
+static int hf_mgcp_param_voicemetrics_gd;
+static int hf_mgcp_param_voicemetrics_rtd;
+static int hf_mgcp_param_voicemetrics_esd;
+static int hf_mgcp_param_voicemetrics_sl;
+static int hf_mgcp_param_voicemetrics_nl;
+static int hf_mgcp_param_voicemetrics_rerl;
+static int hf_mgcp_param_voicemetrics_gmn;
+static int hf_mgcp_param_voicemetrics_nsr;
+static int hf_mgcp_param_voicemetrics_xsr;
+static int hf_mgcp_param_voicemetrics_mlq;
+static int hf_mgcp_param_voicemetrics_mcq;
+static int hf_mgcp_param_voicemetrics_plc;
+static int hf_mgcp_param_voicemetrics_jba;
+static int hf_mgcp_param_voicemetrics_jbr;
+static int hf_mgcp_param_voicemetrics_jbn;
+static int hf_mgcp_param_voicemetrics_jbm;
+static int hf_mgcp_param_voicemetrics_jbs;
+static int hf_mgcp_param_voicemetrics_iaj;
+static int hf_mgcp_param_connectionmode;
+static int hf_mgcp_param_reqevents;
+static int hf_mgcp_param_restartmethod;
+static int hf_mgcp_param_restartdelay;
+static int hf_mgcp_param_signalreq;
+static int hf_mgcp_param_digitmap;
+static int hf_mgcp_param_observedevent;
+static int hf_mgcp_param_connectionparam;
+static int hf_mgcp_param_connectionparam_ps;
+static int hf_mgcp_param_connectionparam_os;
+static int hf_mgcp_param_connectionparam_pr;
+static int hf_mgcp_param_connectionparam_or;
+static int hf_mgcp_param_connectionparam_pl;
+static int hf_mgcp_param_connectionparam_ji;
+static int hf_mgcp_param_connectionparam_la;
+static int hf_mgcp_param_connectionparam_pcrps;
+static int hf_mgcp_param_connectionparam_pcros;
+static int hf_mgcp_param_connectionparam_pcrpl;
+static int hf_mgcp_param_connectionparam_pcrji;
+static int hf_mgcp_param_connectionparam_x;
+static int hf_mgcp_param_reasoncode;
+static int hf_mgcp_param_eventstates;
+static int hf_mgcp_param_specificendpoint;
+static int hf_mgcp_param_secondendpointid;
+static int hf_mgcp_param_reqinfo;
+static int hf_mgcp_param_quarantinehandling;
+static int hf_mgcp_param_detectedevents;
+static int hf_mgcp_param_capabilities;
+static int hf_mgcp_param_maxmgcpdatagram;
+static int hf_mgcp_param_packagelist;
+static int hf_mgcp_param_extension;
+static int hf_mgcp_param_extension_critical;
+static int hf_mgcp_param_resourceid;
+static int hf_mgcp_param_invalid;
+static int hf_mgcp_messagecount;
+static int hf_mgcp_dup;
+static int hf_mgcp_req_dup;
+static int hf_mgcp_req_dup_frame;
+static int hf_mgcp_rsp_dup;
+static int hf_mgcp_rsp_dup_frame;
+static int hf_mgcp_param_x_osmux;
+static int hf_mgcp_unknown_parameter;
+static int hf_mgcp_malformed_parameter;
+
+static expert_field ei_mgcp_rsp_rspcode_invalid;
 
 static const value_string mgcp_return_code_vals[] = {
 	{000, "Response Acknowledgement"},
@@ -247,12 +247,12 @@ static const value_string mgcp_reason_code_vals[] = {
  * We need one for MGCP itself, one for the MGCP paramters and one
  * for each of the dissected parameters
  */
-static int ett_mgcp = -1;
-static int ett_mgcp_param = -1;
-static int ett_mgcp_param_connectionparam = -1;
-static int ett_mgcp_param_localconnectionoptions = -1;
-static int ett_mgcp_param_localvoicemetrics = -1;
-static int ett_mgcp_param_remotevoicemetrics = -1;
+static int ett_mgcp;
+static int ett_mgcp_param;
+static int ett_mgcp_param_connectionparam;
+static int ett_mgcp_param_localconnectionoptions;
+static int ett_mgcp_param_localvoicemetrics;
+static int ett_mgcp_param_remotevoicemetrics;
 
 /*
  * Define the tap for mgcp
diff --git a/epan/dissectors/packet-mih.c b/epan/dissectors/packet-mih.c
index 2496cdf06d..624961b16c 100644
--- a/epan/dissectors/packet-mih.c
+++ b/epan/dissectors/packet-mih.c
@@ -179,279 +179,279 @@ static dissector_handle_t mih_handle;
 #define IP_CFG_IP6_MAN_MASK     0x00040000
 
 /*information holder integers...*/
-static int proto_mih = -1;
-static int hf_mih_version = -1;
-static int hf_mih_ack_req = -1;
-static int hf_mih_ack_resp = -1;
-static int hf_mih_uir = -1;
-static int hf_mih_more_frag = -1;
-static int hf_mih_frag_no = -1;
-static int hf_mih_mid = -1;
-static int hf_mih_service_id = -1;
-static int hf_mih_opcode = -1;
-static int hf_mih_serv_actionid = -1;
-static int hf_mih_event_actionid = -1;
-static int hf_mih_command_actionid = -1;
-static int hf_mih_info_actionid = -1;
-static int hf_mih_tid = -1;
-static int hf_mih_pay_len = -1;
-static int hf_mih_type = -1;
-static int hf_mih_type_length = -1;
-static int hf_mih_type_length_ext = -1;
-static int hf_mihf_id = -1;
-static int hf_mihf_id_mac = -1;
-static int hf_mihf_id_ipv4 = -1;
-static int hf_mihf_id_ipv6 = -1;
-static int hf_status = -1;
-static int hf_ip_methods_supported = -1;
-static int hf_ip_dhcp_services = -1;
-static int hf_fn_agent = -1;
-static int hf_access_router = -1;
-static int hf_link_type = -1;
-static int hf_link_type_ext = -1;
-static int hf_ipv4_addr = -1;
-static int hf_ipv6_addr = -1;
-static int hf_link_dn_reason = -1;
-static int hf_link_gdn_reason = -1;
-static int hf_mac_addr = -1;
-static int hf_link_param_gen = -1;
-static int hf_link_param_qos = -1;
-static int hf_link_param_gg = -1;
-static int hf_link_param_802_11 = -1;
-static int hf_link_param_fdd = -1 ;
-static int hf_link_param_edge = -1;
-static int hf_link_param_eth = -1;
-static int hf_link_param_c2k = -1;
-static int hf_link_param_hrpd = -1;
-static int hf_link_param_802_16 = -1;
-static int hf_link_param_802_20 = -1;
-static int hf_link_param_802_22 = -1;
-static int hf_link_param_value = -1;
-static int hf_op_mode = -1;
-static int hf_link_ac_type = -1;
-static int hf_link_ac_ext_time = -1;
-static int hf_link_ac_result = -1;
-static int hf_ho_reason = -1;
-static int hf_ho_status = -1;
-static int hf_reg_request_code = -1;
-static int hf_ip_renewal = -1;
-static int hf_max_resp_size = -1;
-static int hf_time_interval = -1;
-static int hf_valid_time_interval = -1;
-static int hf_tsp_carrier = -1;
-static int hf_mbb_ho_supp = -1;
-static int hf_link_addr_type = -1;
-static int hf_link_transport_addr_type = -1;
-static int hf_link_addr_string = -1;
-static int hf_link_data_rate = -1;
-static int hf_plmn_id = -1;
-static int hf_location_area_id = -1;
-static int hf_cell_id = -1;
-static int hf_ci = -1;
-static int hf_threshold_val = -1;
-static int hf_threshold_x_dir = -1;
-static int hf_threshold_action = -1;
-static int hf_config_status = -1;
-static int hf_num_cos = -1;
-static int hf_num_queue = -1;
-static int hf_channel_id = -1;
-static int hf_predef_cfg_id = -1;
-static int hf_network_id = -1;
-static int hf_net_aux_id = -1;
-static int hf_sig_strength_dbm = -1;
-static int hf_sig_strength_per = -1;
-static int hf_cos_id = -1;
-static int hf_cos_value = -1;
-static int hf_sinr = -1;
-static int hf_rdf_data = -1;
-static int hf_rdf_mime_type = -1;
-static int hf_link_res_status = -1;
-static int hf_res_retention_status = -1;
-static int hf_res_rpt_flag = -1;
-static int hf_unauth_info_req = -1;
-static int hf_rdf_sch = -1;
-static int hf_rdf_sch_url = -1;
-static int hf_ir_bin_data = -1;
-static int hf_iq_bin_data_x = -1;
-static int hf_vendor_specific_tlv = -1;
-static int hf_reserved_tlv = -1;
-static int hf_experimental_tlv = -1;
-static int hf_unknown_tlv = -1;
-static int hf_fragmented_tlv = -1;
+static int proto_mih;
+static int hf_mih_version;
+static int hf_mih_ack_req;
+static int hf_mih_ack_resp;
+static int hf_mih_uir;
+static int hf_mih_more_frag;
+static int hf_mih_frag_no;
+static int hf_mih_mid;
+static int hf_mih_service_id;
+static int hf_mih_opcode;
+static int hf_mih_serv_actionid;
+static int hf_mih_event_actionid;
+static int hf_mih_command_actionid;
+static int hf_mih_info_actionid;
+static int hf_mih_tid;
+static int hf_mih_pay_len;
+static int hf_mih_type;
+static int hf_mih_type_length;
+static int hf_mih_type_length_ext;
+static int hf_mihf_id;
+static int hf_mihf_id_mac;
+static int hf_mihf_id_ipv4;
+static int hf_mihf_id_ipv6;
+static int hf_status;
+static int hf_ip_methods_supported;
+static int hf_ip_dhcp_services;
+static int hf_fn_agent;
+static int hf_access_router;
+static int hf_link_type;
+static int hf_link_type_ext;
+static int hf_ipv4_addr;
+static int hf_ipv6_addr;
+static int hf_link_dn_reason;
+static int hf_link_gdn_reason;
+static int hf_mac_addr;
+static int hf_link_param_gen;
+static int hf_link_param_qos;
+static int hf_link_param_gg;
+static int hf_link_param_802_11;
+static int hf_link_param_fdd;
+static int hf_link_param_edge;
+static int hf_link_param_eth;
+static int hf_link_param_c2k;
+static int hf_link_param_hrpd;
+static int hf_link_param_802_16;
+static int hf_link_param_802_20;
+static int hf_link_param_802_22;
+static int hf_link_param_value;
+static int hf_op_mode;
+static int hf_link_ac_type;
+static int hf_link_ac_ext_time;
+static int hf_link_ac_result;
+static int hf_ho_reason;
+static int hf_ho_status;
+static int hf_reg_request_code;
+static int hf_ip_renewal;
+static int hf_max_resp_size;
+static int hf_time_interval;
+static int hf_valid_time_interval;
+static int hf_tsp_carrier;
+static int hf_mbb_ho_supp;
+static int hf_link_addr_type;
+static int hf_link_transport_addr_type;
+static int hf_link_addr_string;
+static int hf_link_data_rate;
+static int hf_plmn_id;
+static int hf_location_area_id;
+static int hf_cell_id;
+static int hf_ci;
+static int hf_threshold_val;
+static int hf_threshold_x_dir;
+static int hf_threshold_action;
+static int hf_config_status;
+static int hf_num_cos;
+static int hf_num_queue;
+static int hf_channel_id;
+static int hf_predef_cfg_id;
+static int hf_network_id;
+static int hf_net_aux_id;
+static int hf_sig_strength_dbm;
+static int hf_sig_strength_per;
+static int hf_cos_id;
+static int hf_cos_value;
+static int hf_sinr;
+static int hf_rdf_data;
+static int hf_rdf_mime_type;
+static int hf_link_res_status;
+static int hf_res_retention_status;
+static int hf_res_rpt_flag;
+static int hf_unauth_info_req;
+static int hf_rdf_sch;
+static int hf_rdf_sch_url;
+static int hf_ir_bin_data;
+static int hf_iq_bin_data_x;
+static int hf_vendor_specific_tlv;
+static int hf_reserved_tlv;
+static int hf_experimental_tlv;
+static int hf_unknown_tlv;
+static int hf_fragmented_tlv;
 
 /*header fields for event list */
-static int hf_event_list = -1;
-static int hf_event_link_detect = -1;
-static int hf_event_link_up = -1;
-static int hf_event_link_dn = -1;
-static int hf_event_link_param = -1;
-static int hf_event_link_gd = -1;
-static int hf_event_ho_imm = -1;
-static int hf_event_ho_comp = -1;
-static int hf_event_pdu_tx_stat = -1;
+static int hf_event_list;
+static int hf_event_link_detect;
+static int hf_event_link_up;
+static int hf_event_link_dn;
+static int hf_event_link_param;
+static int hf_event_link_gd;
+static int hf_event_ho_imm;
+static int hf_event_ho_comp;
+static int hf_event_pdu_tx_stat;
 
 /*header fields for command list*/
-static int hf_cmd_list = -1;
-static int hf_cmd_event_subs = -1;
-static int hf_cmd_event_unsub = -1;
-static int hf_cmd_get_param = -1;
-static int hf_cmd_con_thres = -1;
-static int hf_cmd_link_action = -1;
+static int hf_cmd_list;
+static int hf_cmd_event_subs;
+static int hf_cmd_event_unsub;
+static int hf_cmd_get_param;
+static int hf_cmd_con_thres;
+static int hf_cmd_link_action;
 
 /*header fields for iq type list*/
-static int hf_iq_list = -1;
-static int hf_iq_bin_data = -1;
-static int hf_iq_rdf_data = -1;
-static int hf_iq_rdf_sch_url = -1;
-static int hf_iq_rdf_sch = -1;
-static int hf_iq_net_type = -1;
-static int hf_iq_op_id = -1;
-static int hf_iq_serv_pro_id = -1;
-static int hf_iq_country_code = -1;
-static int hf_iq_net_id = -1;
-static int hf_iq_net_aux_id = -1;
-static int hf_iq_roam_part = -1;
-static int hf_iq_cost = -1;
-static int hf_iq_net_qos = -1;
-static int hf_iq_net_dat_rt = -1;
-static int hf_iq_net_reg_dom = -1;
-static int hf_iq_freq_bands = -1;
-static int hf_iq_ip_cfg_mthds = -1;
-static int hf_iq_net_cap = -1;
-static int hf_iq_supp_lcp = -1;
-static int hf_iq_net_mob_mg = -1;
-static int hf_iq_net_emserv = -1;
-static int hf_iq_net_ims_pcscf = -1;
-static int hf_iq_net_mob_net = -1;
-static int hf_iq_link_addr = -1;
-static int hf_iq_poa_loc = -1;
-static int hf_iq_poa_chan_range = -1;
-static int hf_iq_poa_sys_info = -1;
-static int hf_iq_poa_sub_info = -1;
-static int hf_iq_poa_ip = -1;
+static int hf_iq_list;
+static int hf_iq_bin_data;
+static int hf_iq_rdf_data;
+static int hf_iq_rdf_sch_url;
+static int hf_iq_rdf_sch;
+static int hf_iq_net_type;
+static int hf_iq_op_id;
+static int hf_iq_serv_pro_id;
+static int hf_iq_country_code;
+static int hf_iq_net_id;
+static int hf_iq_net_aux_id;
+static int hf_iq_roam_part;
+static int hf_iq_cost;
+static int hf_iq_net_qos;
+static int hf_iq_net_dat_rt;
+static int hf_iq_net_reg_dom;
+static int hf_iq_freq_bands;
+static int hf_iq_ip_cfg_mthds;
+static int hf_iq_net_cap;
+static int hf_iq_supp_lcp;
+static int hf_iq_net_mob_mg;
+static int hf_iq_net_emserv;
+static int hf_iq_net_ims_pcscf;
+static int hf_iq_net_mob_net;
+static int hf_iq_link_addr;
+static int hf_iq_poa_loc;
+static int hf_iq_poa_chan_range;
+static int hf_iq_poa_sys_info;
+static int hf_iq_poa_sub_info;
+static int hf_iq_poa_ip;
 
 /*header fields for mob mgmt*/
-static int hf_mob_list = -1;
-static int hf_mob_mip4 = -1;
-static int hf_mob_mip4_reg = -1;
-static int hf_mob_mip6 = -1;
-static int hf_mob_hmip6 = -1;
-static int hf_mob_low_lat = -1;
-static int hf_mob_fmip6 = -1;
-static int hf_mob_ike_multi = -1;
+static int hf_mob_list;
+static int hf_mob_mip4;
+static int hf_mob_mip4_reg;
+static int hf_mob_mip6;
+static int hf_mob_hmip6;
+static int hf_mob_low_lat;
+static int hf_mob_fmip6;
+static int hf_mob_ike_multi;
 
 /*header fields for configure methods*/
-static int hf_cfg_mthds = -1;
-static int hf_cfg_ip4_stat = -1;
-static int hf_cfg_dhcp4 = -1;
-static int hf_cfg_mip_fa = -1;
-static int hf_cfg_mip_wo_fa = -1;
-static int hf_cfg_ip6_sac = -1;
-static int hf_cfg_dhcp6 = -1;
-static int hf_cfg_ip6_manual = -1;
+static int hf_cfg_mthds;
+static int hf_cfg_ip4_stat;
+static int hf_cfg_dhcp4;
+static int hf_cfg_mip_fa;
+static int hf_cfg_mip_wo_fa;
+static int hf_cfg_ip6_sac;
+static int hf_cfg_dhcp6;
+static int hf_cfg_ip6_manual;
 
 /*header fields for transport list*/
-static int hf_trans_list = -1;
-static int hf_trans_udp = -1;
-static int hf_trans_tcp = -1;
+static int hf_trans_list;
+static int hf_trans_udp;
+static int hf_trans_tcp;
 
 /*header fields for device state requests and responses*/
-static int hf_dev_states_req = -1;
-static int hf_dev_states_req_dev_info = -1;
-static int hf_dev_states_req_batt_lvl = -1;
-static int hf_dev_states_resp = -1;
-static int hf_dev_batt_level = -1;
-static int hf_dev_info = -1;
+static int hf_dev_states_req;
+static int hf_dev_states_req_dev_info;
+static int hf_dev_states_req_batt_lvl;
+static int hf_dev_states_resp;
+static int hf_dev_batt_level;
+static int hf_dev_info;
 
 /*header fields for Link Action Attributes*/
-static int hf_link_ac_attr = -1;
-static int hf_link_ac_attr_link_scan = -1;
-static int hf_link_ac_attr_link_res_retain = -1;
-static int hf_link_ac_attr_data_fwd_req = -1;
+static int hf_link_ac_attr;
+static int hf_link_ac_attr_link_scan;
+static int hf_link_ac_attr_link_res_retain;
+static int hf_link_ac_attr_data_fwd_req;
 
 /*header fields for transport subtypes*/
-static int hf_link_subtype_eth = -1;
-static int hf_link_subtype_eth_10m = -1;
-static int hf_link_subtype_eth_100m = -1;
-static int hf_link_subtype_eth_1000m = -1;
-static int hf_link_subtype_wireless_other = -1;
-static int hf_link_subtype_wireless_other_dvb = -1;
-static int hf_link_subtype_wireless_other_tdmb = -1;
-static int hf_link_subtype_wireless_other_atsc = -1;
-static int hf_link_subtype_ieee80211 = -1;
-static int hf_link_subtype_ieee80211_24 = -1;
-static int hf_link_subtype_ieee80211_5 = -1;
-static int hf_link_subtype_ieee80211_49 = -1;
-static int hf_link_subtype_ieee80211_365 = -1;
-static int hf_link_subtype_ieee80211_316 = -1;
-static int hf_link_subtype_umts = -1;
-static int hf_link_subtype_umts_99 = -1;
-static int hf_link_subtype_umts_4 = -1;
-static int hf_link_subtype_umts_5 = -1;
-static int hf_link_subtype_umts_6 = -1;
-static int hf_link_subtype_umts_7 = -1;
-static int hf_link_subtype_umts_8 = -1;
-static int hf_link_subtype_cdma2000 = -1;
-static int hf_link_subtype_cdma2000_0 = -1;
-static int hf_link_subtype_cdma2000_a = -1;
-static int hf_link_subtype_cdma2000_b = -1;
-static int hf_link_subtype_cdma2000_c = -1;
-static int hf_link_subtype_ieee80216 = -1;
-static int hf_link_subtype_ieee80216_25 = -1;
-static int hf_link_subtype_ieee80216_35 = -1;
+static int hf_link_subtype_eth;
+static int hf_link_subtype_eth_10m;
+static int hf_link_subtype_eth_100m;
+static int hf_link_subtype_eth_1000m;
+static int hf_link_subtype_wireless_other;
+static int hf_link_subtype_wireless_other_dvb;
+static int hf_link_subtype_wireless_other_tdmb;
+static int hf_link_subtype_wireless_other_atsc;
+static int hf_link_subtype_ieee80211;
+static int hf_link_subtype_ieee80211_24;
+static int hf_link_subtype_ieee80211_5;
+static int hf_link_subtype_ieee80211_49;
+static int hf_link_subtype_ieee80211_365;
+static int hf_link_subtype_ieee80211_316;
+static int hf_link_subtype_umts;
+static int hf_link_subtype_umts_99;
+static int hf_link_subtype_umts_4;
+static int hf_link_subtype_umts_5;
+static int hf_link_subtype_umts_6;
+static int hf_link_subtype_umts_7;
+static int hf_link_subtype_umts_8;
+static int hf_link_subtype_cdma2000;
+static int hf_link_subtype_cdma2000_0;
+static int hf_link_subtype_cdma2000_a;
+static int hf_link_subtype_cdma2000_b;
+static int hf_link_subtype_cdma2000_c;
+static int hf_link_subtype_ieee80216;
+static int hf_link_subtype_ieee80216_25;
+static int hf_link_subtype_ieee80216_35;
 
 /*header fields for MIH Capabilities*/
-static int hf_mihcap = -1;
-static int hf_mihcap_es = -1;
-static int hf_mihcap_cs = -1;
-static int hf_mihcap_is = -1;
+static int hf_mihcap;
+static int hf_mihcap_es;
+static int hf_mihcap_cs;
+static int hf_mihcap_is;
 
 /*header fields for High Level Network Capabilities*/
-static int hf_net_caps = -1;
-static int hf_net_caps_sec = -1;
-static int hf_net_caps_qos0 = -1;
-static int hf_net_caps_qos1 = -1;
-static int hf_net_caps_qos2 = -1;
-static int hf_net_caps_qos3 = -1;
-static int hf_net_caps_qos4 = -1;
-static int hf_net_caps_qos5 = -1;
-static int hf_net_caps_ia = -1;
-static int hf_net_caps_es = -1;
-static int hf_net_caps_mihcap = -1;
+static int hf_net_caps;
+static int hf_net_caps_sec;
+static int hf_net_caps_qos0;
+static int hf_net_caps_qos1;
+static int hf_net_caps_qos2;
+static int hf_net_caps_qos3;
+static int hf_net_caps_qos4;
+static int hf_net_caps_qos5;
+static int hf_net_caps_ia;
+static int hf_net_caps_es;
+static int hf_net_caps_mihcap;
 
 /*trees and subtrees...*/
-static gint ett_mih = -1;
-static gint ett_ver_flags = -1;
-static gint ett_mid = -1;
-static gint ett_tlv = -1;
-static gint ett_cmd_bitmap = -1;
-static gint ett_event_bitmap = -1;
-static gint ett_mob_mgt_bitmap = -1;
-static gint ett_cfg_mtd_bitmap = -1;
-static gint ett_iq_type_bitmap = -1;
-static gint ett_trans_list_bitmap = -1;
-static gint ett_dev_states_bitmap = -1;
-static gint ett_mihcap_bitmap = -1;
-static gint ett_net_caps_bitmap = -1;
-static gint ett_ac_attr_bitmap = -1;
-static gint ett_subtype_eth_bitmap = -1;
-static gint ett_subtype_wireless_other_bitmap = -1;
-static gint ett_subtype_ieee80211_bitmap = -1;
-static gint ett_subtype_umts_bitmap = -1;
-static gint ett_subtype_cdma2000_bitmap = -1;
-static gint ett_subtype_ieee80216_bitmap = -1;
-static gint ett_min_pk_tx_delay = -1;
-static gint ett_avg_pk_tx_delay = -1;
-static gint ett_max_pk_tx_delay = -1;
-static gint ett_pk_delay_jitter = -1;
-static gint ett_pk_loss_rate = -1;
-static gint ett_list_prefer_link = -1;
-static gint ett_ip_dhcp_server = -1;
-static gint ett_fn_agent = -1;
-static gint ett_access_router = -1;
-static gint ett_link_states_req = -1;
-static gint ett_link_desc_req = -1;
-static gint ett_dev_states_resp = -1;
+static gint ett_mih;
+static gint ett_ver_flags;
+static gint ett_mid;
+static gint ett_tlv;
+static gint ett_cmd_bitmap;
+static gint ett_event_bitmap;
+static gint ett_mob_mgt_bitmap;
+static gint ett_cfg_mtd_bitmap;
+static gint ett_iq_type_bitmap;
+static gint ett_trans_list_bitmap;
+static gint ett_dev_states_bitmap;
+static gint ett_mihcap_bitmap;
+static gint ett_net_caps_bitmap;
+static gint ett_ac_attr_bitmap;
+static gint ett_subtype_eth_bitmap;
+static gint ett_subtype_wireless_other_bitmap;
+static gint ett_subtype_ieee80211_bitmap;
+static gint ett_subtype_umts_bitmap;
+static gint ett_subtype_cdma2000_bitmap;
+static gint ett_subtype_ieee80216_bitmap;
+static gint ett_min_pk_tx_delay;
+static gint ett_avg_pk_tx_delay;
+static gint ett_max_pk_tx_delay;
+static gint ett_pk_delay_jitter;
+static gint ett_pk_loss_rate;
+static gint ett_list_prefer_link;
+static gint ett_ip_dhcp_server;
+static gint ett_fn_agent;
+static gint ett_access_router;
+static gint ett_link_states_req;
+static gint ett_link_desc_req;
+static gint ett_dev_states_resp;
 
 /*field definitions of evt, cmd, mob mgmt, ip cfg, iq type */
 static int * const event_fields[] = {
diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c
index 0a03426203..67abc06086 100644
--- a/epan/dissectors/packet-mikey.c
+++ b/epan/dissectors/packet-mikey.c
@@ -591,17 +591,17 @@ static int dissect_payload(int payload, mikey_t *mikey, tvbuff_t *tvb, packet_in
 
 
 /* Initialize the protocol and registered fields */
-static int proto_mikey = -1;
+static int proto_mikey;
 static int hf_mikey[MAX_POS+1];
 static int hf_mikey_sp_param[SP_MAX+1];
 static int hf_mikey_pl[PL_MAX];
 
 /* Initialize the subtree pointers */
-static gint ett_mikey = -1;
-static gint ett_mikey_payload = -1;
-static gint ett_mikey_sp_param = -1;
-static gint ett_mikey_hdr_id = -1;
-static gint ett_mikey_enc_data = -1;
+static gint ett_mikey;
+static gint ett_mikey_payload;
+static gint ett_mikey_sp_param;
+static gint ett_mikey_hdr_id;
+static gint ett_mikey_enc_data;
 
 static dissector_handle_t mikey_handle;
 
diff --git a/epan/dissectors/packet-mime-encap.c b/epan/dissectors/packet-mime-encap.c
index 2ad855394c..c547315bbd 100644
--- a/epan/dissectors/packet-mime-encap.c
+++ b/epan/dissectors/packet-mime-encap.c
@@ -16,7 +16,7 @@
 void proto_register_mime_encap(void);
 void proto_reg_handoff_mime_encap(void);
 
-static int proto_mime_encap = -1;
+static int proto_mime_encap;
 
 static dissector_handle_t mime_encap_handle;
 
diff --git a/epan/dissectors/packet-mint.c b/epan/dissectors/packet-mint.c
index c684666158..765e9a9c31 100644
--- a/epan/dissectors/packet-mint.c
+++ b/epan/dissectors/packet-mint.c
@@ -51,54 +51,54 @@ void proto_reg_handoff_mint(void);
 
 static dissector_handle_t eth_handle;
 
-static int proto_mint = -1;
-
-static int hf_mint_control = -1;
-static int hf_mint_control_32zerobytes = -1;
-static int hf_mint_control_unknown1 = -1;
-static int hf_mint_data = -1;
-static int hf_mint_data_seqno = -1;
-static int hf_mint_data_unknown1 = -1;
-static int hf_mint_data_vlan = -1;
-static int hf_mint_ethshim = -1;
-static int hf_mint_ethshim_length = -1;
-static int hf_mint_ethshim_unknown = -1;
-static int hf_mint_header = -1;
-static int hf_mint_header_dstdataport = -1;
-static int hf_mint_header_dstid = -1;
-static int hf_mint_header_srcdataport = -1;
-static int hf_mint_header_srcid = -1;
-static int hf_mint_header_ttl = -1;
-static int hf_mint_header_unknown1 = -1;
-static int hf_mint_header_unknown2 = -1;
-static int hf_mint_mlcp_length = -1;
-static int hf_mint_mlcp_message = -1;
-static int hf_mint_mlcp_type = -1;
-static int hf_mint_mlcp_value = -1;
-static int hf_mint_neighbor_unknown = -1;
-static int hf_mint_router_array = -1;
-static int hf_mint_router_element = -1;
-static int hf_mint_router_header_length = -1;
-static int hf_mint_router_header_sender = -1;
-static int hf_mint_router_header_unknown = -1;
-static int hf_mint_router_length = -1;
-static int hf_mint_router_message_type = -1;
-static int hf_mint_router_type_csnp = -1;
-static int hf_mint_router_type_helo = -1;
-static int hf_mint_router_type_lsp = -1;
-static int hf_mint_router_type_psnp = -1;
-static int hf_mint_router_type_unknown = -1;
-static int hf_mint_router_unknown1 = -1;
-static int hf_mint_router_unknown2 = -1;
-static int hf_mint_router_unknown3 = -1;
-static int hf_mint_router_value = -1;
+static int proto_mint;
+
+static int hf_mint_control;
+static int hf_mint_control_32zerobytes;
+static int hf_mint_control_unknown1;
+static int hf_mint_data;
+static int hf_mint_data_seqno;
+static int hf_mint_data_unknown1;
+static int hf_mint_data_vlan;
+static int hf_mint_ethshim;
+static int hf_mint_ethshim_length;
+static int hf_mint_ethshim_unknown;
+static int hf_mint_header;
+static int hf_mint_header_dstdataport;
+static int hf_mint_header_dstid;
+static int hf_mint_header_srcdataport;
+static int hf_mint_header_srcid;
+static int hf_mint_header_ttl;
+static int hf_mint_header_unknown1;
+static int hf_mint_header_unknown2;
+static int hf_mint_mlcp_length;
+static int hf_mint_mlcp_message;
+static int hf_mint_mlcp_type;
+static int hf_mint_mlcp_value;
+static int hf_mint_neighbor_unknown;
+static int hf_mint_router_array;
+static int hf_mint_router_element;
+static int hf_mint_router_header_length;
+static int hf_mint_router_header_sender;
+static int hf_mint_router_header_unknown;
+static int hf_mint_router_length;
+static int hf_mint_router_message_type;
+static int hf_mint_router_type_csnp;
+static int hf_mint_router_type_helo;
+static int hf_mint_router_type_lsp;
+static int hf_mint_router_type_psnp;
+static int hf_mint_router_type_unknown;
+static int hf_mint_router_unknown1;
+static int hf_mint_router_unknown2;
+static int hf_mint_router_unknown3;
+static int hf_mint_router_value;
 
 /* ett handles */
-static int ett_mint_ethshim = -1;
-static int ett_mint = -1;
-static int ett_mint_header = -1;
-static int ett_mint_ctrl = -1;
-static int ett_mint_data = -1;
+static int ett_mint_ethshim;
+static int ett_mint;
+static int ett_mint_header;
+static int ett_mint_ctrl;
+static int ett_mint_data;
 
 static dissector_handle_t mint_control_handle;
 static dissector_handle_t mint_data_handle;
diff --git a/epan/dissectors/packet-miop.c b/epan/dissectors/packet-miop.c
index 8fed8c2b80..f850f8207a 100644
--- a/epan/dissectors/packet-miop.c
+++ b/epan/dissectors/packet-miop.c
@@ -48,26 +48,26 @@ void proto_reg_handoff_miop(void);
  */
 
 
-static int proto_miop = -1;
+static int proto_miop;
 
 /*
  * (sub)Tree declares
  */
 
 
-static gint hf_miop_magic = -1;
-static gint hf_miop_hdr_version = -1;
-static gint hf_miop_flags = -1;
-static gint hf_miop_packet_length = -1;
-static gint hf_miop_packet_number = -1;
-static gint hf_miop_number_of_packets = -1;
-static gint hf_miop_unique_id_len = -1;
-static gint hf_miop_unique_id = -1;
+static gint hf_miop_magic;
+static gint hf_miop_hdr_version;
+static gint hf_miop_flags;
+static gint hf_miop_packet_length;
+static gint hf_miop_packet_number;
+static gint hf_miop_number_of_packets;
+static gint hf_miop_unique_id_len;
+static gint hf_miop_unique_id;
 
-static gint ett_miop = -1;
+static gint ett_miop;
 
-static expert_field ei_miop_version_not_supported = EI_INIT;
-static expert_field ei_miop_unique_id_len_exceed_max_value = EI_INIT;
+static expert_field ei_miop_version_not_supported;
+static expert_field ei_miop_unique_id_len_exceed_max_value;
 
 static dissector_handle_t miop_handle;
 
diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c
index 5209fa7841..37919c2997 100644
--- a/epan/dissectors/packet-mip.c
+++ b/epan/dissectors/packet-mip.c
@@ -26,107 +26,107 @@ void proto_reg_handoff_mip(void);
 static dissector_table_t mip_nvse_ext_dissector_table;
 
 /* Initialize the protocol and registered fields */
-static int proto_mip = -1;
-static int hf_mip_type = -1;
-static int hf_mip_flags = -1;
-static int hf_mip_s = -1;
-static int hf_mip_b = -1;
-static int hf_mip_d = -1;
-static int hf_mip_m = -1;
-static int hf_mip_g = -1;
-static int hf_mip_v = -1;
-static int hf_mip_t = -1;
-static int hf_mip_x = -1;
-static int hf_mip_code = -1;
-static int hf_mip_life = -1;
-static int hf_mip_homeaddr = -1;
-static int hf_mip_haaddr = -1;
-static int hf_mip_coa = -1;
-static int hf_mip_ident = -1;
-static int hf_mip_ext_type = -1;
-static int hf_mip_gaext_stype = -1;
-static int hf_mip_ext_len = -1;
-static int hf_mip_ext = -1;
-static int hf_mip_aext_spi = -1;
-static int hf_mip_aext_auth = -1;
-static int hf_mip_next_nai = -1;
-static int hf_mip_rext_flags = -1;
-static int hf_mip_rext_i = -1;
-static int hf_mip_rext_reserved = -1;
-static int hf_mip_rext_tstamp = -1;
-static int hf_mip_rev_reserved = -1;
-static int hf_mip_flags2 = -1;
-static int hf_mip_rev_a = -1;
-static int hf_mip_rev_i = -1;
-static int hf_mip_rev_reserved2 = -1;
-static int hf_mip_ack_reserved = -1;
-static int hf_mip_ack_i = -1;
-static int hf_mip_ack_reserved2 = -1;
-static int hf_mip_hda = -1;
-static int hf_mip_fda = -1;
-static int hf_mip_revid = -1;
-static int hf_mip_dhaext_stype = -1;
-static int hf_mip_dhaext_addr = -1;
-static int hf_mip_mstrext_stype = -1;
-static int hf_mip_mstrext_text = -1;
-static int hf_mip_nattt_nexthdr = -1;
-static int hf_mip_nattt_reserved = -1;
-static int hf_mip_utrqext_stype = -1;
-static int hf_mip_utrqext_reserved1 = -1;
-static int hf_mip_utrqext_flags = -1;
-static int hf_mip_utrqext_f = -1;
-static int hf_mip_utrqext_r = -1;
-static int hf_mip_utrqext_reserved2 = -1;
-static int hf_mip_utrqext_encap_type = -1;
-static int hf_mip_utrqext_reserved3 = -1;
-static int hf_mip_utrpext_stype = -1;
-static int hf_mip_utrpext_code = -1;
-static int hf_mip_utrpext_flags = -1;
-static int hf_mip_utrpext_f = -1;
-static int hf_mip_utrpext_reserved = -1;
-static int hf_mip_utrpext_keepalive = -1;
-static int hf_mip_pmipv4nonskipext_stype = -1;
-static int hf_mip_pmipv4nonskipext_pernodeauthmethod = -1;
-static int hf_mip_pmipv4skipext_stype = -1;
-static int hf_mip_pmipv4skipext_interfaceid = -1;
-static int hf_mip_pmipv4skipext_deviceid_type = -1;
-static int hf_mip_pmipv4skipext_deviceid_id = -1;
-static int hf_mip_pmipv4skipext_subscriberid_type = -1;
-static int hf_mip_pmipv4skipext_subscriberid_id = -1;
-static int hf_mip_pmipv4skipext_accesstechnology_type = -1;
-static int hf_mip_cvse_reserved = -1;
-static int hf_mip_cvse_vendor_org_id = -1;
-static int hf_mip_cvse_verizon_cvse_type = -1;
-static int hf_mip_cvse_3gpp2_cvse_type = -1;
-static int hf_mip_cvse_3gpp2_grekey = -1;
-static int hf_mip_cvse_vendor_cvse_type = -1;
-static int hf_mip_cvse_vendor_cvse_value = -1;
-static int hf_mip_nvse_reserved = -1;
-static int hf_mip_nvse_vendor_org_id = -1;
-static int hf_mip_nvse_vendor_nvse_type = -1;
-static int hf_mip_nvse_vendor_nvse_value = -1;
-static int hf_mip_nvse_3gpp2_type = -1;
-static int hf_mip_nvse_3gpp2_type17_entity = -1;
-static int hf_mip_nvse_3gpp2_type16_value = -1;
-static int hf_mip_nvse_3gpp2_type17_subtype1 = -1;
-static int hf_mip_nvse_3gpp2_type17_subtype2 = -1;
-static int hf_mip_nvse_3gpp2_type17_length = -1;
-static int hf_mip_nvse_3gpp2_type17_prim_dns = -1;
-static int hf_mip_nvse_3gpp2_type17_sec_dns = -1;
-static int hf_mip_mne_sub_type = -1;
-static int hf_mip_mne_code = -1;
-static int hf_mip_mne_prefix_length = -1;
-static int hf_mip_mne_prefix = -1;
-static int hf_mip_mne_reserved = -1;
+static int proto_mip;
+static int hf_mip_type;
+static int hf_mip_flags;
+static int hf_mip_s;
+static int hf_mip_b;
+static int hf_mip_d;
+static int hf_mip_m;
+static int hf_mip_g;
+static int hf_mip_v;
+static int hf_mip_t;
+static int hf_mip_x;
+static int hf_mip_code;
+static int hf_mip_life;
+static int hf_mip_homeaddr;
+static int hf_mip_haaddr;
+static int hf_mip_coa;
+static int hf_mip_ident;
+static int hf_mip_ext_type;
+static int hf_mip_gaext_stype;
+static int hf_mip_ext_len;
+static int hf_mip_ext;
+static int hf_mip_aext_spi;
+static int hf_mip_aext_auth;
+static int hf_mip_next_nai;
+static int hf_mip_rext_flags;
+static int hf_mip_rext_i;
+static int hf_mip_rext_reserved;
+static int hf_mip_rext_tstamp;
+static int hf_mip_rev_reserved;
+static int hf_mip_flags2;
+static int hf_mip_rev_a;
+static int hf_mip_rev_i;
+static int hf_mip_rev_reserved2;
+static int hf_mip_ack_reserved;
+static int hf_mip_ack_i;
+static int hf_mip_ack_reserved2;
+static int hf_mip_hda;
+static int hf_mip_fda;
+static int hf_mip_revid;
+static int hf_mip_dhaext_stype;
+static int hf_mip_dhaext_addr;
+static int hf_mip_mstrext_stype;
+static int hf_mip_mstrext_text;
+static int hf_mip_nattt_nexthdr;
+static int hf_mip_nattt_reserved;
+static int hf_mip_utrqext_stype;
+static int hf_mip_utrqext_reserved1;
+static int hf_mip_utrqext_flags;
+static int hf_mip_utrqext_f;
+static int hf_mip_utrqext_r;
+static int hf_mip_utrqext_reserved2;
+static int hf_mip_utrqext_encap_type;
+static int hf_mip_utrqext_reserved3;
+static int hf_mip_utrpext_stype;
+static int hf_mip_utrpext_code;
+static int hf_mip_utrpext_flags;
+static int hf_mip_utrpext_f;
+static int hf_mip_utrpext_reserved;
+static int hf_mip_utrpext_keepalive;
+static int hf_mip_pmipv4nonskipext_stype;
+static int hf_mip_pmipv4nonskipext_pernodeauthmethod;
+static int hf_mip_pmipv4skipext_stype;
+static int hf_mip_pmipv4skipext_interfaceid;
+static int hf_mip_pmipv4skipext_deviceid_type;
+static int hf_mip_pmipv4skipext_deviceid_id;
+static int hf_mip_pmipv4skipext_subscriberid_type;
+static int hf_mip_pmipv4skipext_subscriberid_id;
+static int hf_mip_pmipv4skipext_accesstechnology_type;
+static int hf_mip_cvse_reserved;
+static int hf_mip_cvse_vendor_org_id;
+static int hf_mip_cvse_verizon_cvse_type;
+static int hf_mip_cvse_3gpp2_cvse_type;
+static int hf_mip_cvse_3gpp2_grekey;
+static int hf_mip_cvse_vendor_cvse_type;
+static int hf_mip_cvse_vendor_cvse_value;
+static int hf_mip_nvse_reserved;
+static int hf_mip_nvse_vendor_org_id;
+static int hf_mip_nvse_vendor_nvse_type;
+static int hf_mip_nvse_vendor_nvse_value;
+static int hf_mip_nvse_3gpp2_type;
+static int hf_mip_nvse_3gpp2_type17_entity;
+static int hf_mip_nvse_3gpp2_type16_value;
+static int hf_mip_nvse_3gpp2_type17_subtype1;
+static int hf_mip_nvse_3gpp2_type17_subtype2;
+static int hf_mip_nvse_3gpp2_type17_length;
+static int hf_mip_nvse_3gpp2_type17_prim_dns;
+static int hf_mip_nvse_3gpp2_type17_sec_dns;
+static int hf_mip_mne_sub_type;
+static int hf_mip_mne_code;
+static int hf_mip_mne_prefix_length;
+static int hf_mip_mne_prefix;
+static int hf_mip_mne_reserved;
 
 /* Initialize the subtree pointers */
-static gint ett_mip = -1;
-static gint ett_mip_flags = -1;
-static gint ett_mip_ext = -1;
-static gint ett_mip_exts = -1;
-static gint ett_mip_pmipv4_ext = -1;
+static gint ett_mip;
+static gint ett_mip_flags;
+static gint ett_mip_ext;
+static gint ett_mip_exts;
+static gint ett_mip_pmipv4_ext;
 
-static expert_field ei_mip_data_not_dissected = EI_INIT;
+static expert_field ei_mip_data_not_dissected;
 
 static dissector_handle_t mip_handle;
 
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c
index f6b83a5aab..d039445de8 100644
--- a/epan/dissectors/packet-mip6.c
+++ b/epan/dissectors/packet-mip6.c
@@ -918,377 +918,377 @@ static const true_false_string mip6_dmnp_v_flag_value = {
 static dissector_table_t ip_dissector_table;
 
 /* Initialize the protocol and registered header fields */
-static int proto_mip6 = -1;
-static int proto_nemo = -1;
-static int proto_mip6_option_pad1 = -1;
-static int proto_mip6_option_padn = -1;
-static int proto_mip6_option_bra = -1;
-static int proto_mip6_option_acoa = -1;
-static int proto_mip6_option_ni = -1;
-static int proto_mip6_option_bad_auth = -1;
-static int proto_mip6_option_mnp = -1;
-static int proto_mip6_option_mhlla = -1;
-static int proto_mip6_option_mnid = -1;
-static int proto_mip6_option_auth = -1;
-static int proto_mip6_option_mseg_id = -1;
-static int proto_mip6_option_cgapr = -1;
-static int proto_mip6_option_cgar = -1;
-static int proto_mip6_option_sign = -1;
-static int proto_mip6_option_phkt = -1;
-static int proto_mip6_option_coti = -1;
-static int proto_mip6_option_cot = -1;
-static int proto_mip6_option_dnsu = -1;
-static int proto_mip6_option_em = -1;
-static int proto_mip6_option_vsm = -1;
-static int proto_mip6_option_ssm = -1;
-static int proto_mip6_option_badff = -1;
-static int proto_mip6_option_hnp = -1;
-static int proto_mip6_option_hi = -1;
-static int proto_mip6_option_att = -1;
-static int proto_mip6_option_mnlli = -1;
-static int proto_mip6_option_lla = -1;
-static int proto_mip6_option_ts = -1;
-static int proto_mip6_option_rc = -1;
-static int proto_mip6_option_ipv4ha = -1;
-static int proto_mip6_option_ipv4aa = -1;
-static int proto_mip6_option_natd = -1;
-static int proto_mip6_option_ipv4coa = -1;
-static int proto_mip6_option_grek = -1;
-static int proto_mip6_option_mhipv6ap = -1;
-static int proto_mip6_option_bi = -1;
-static int proto_mip6_option_ipv4hareq = -1;
-static int proto_mip6_option_ipv4harep = -1;
-static int proto_mip6_option_ipv4dra = -1;
-static int proto_mip6_option_ipv4dsm = -1;
-static int proto_mip6_option_cr = -1;
-static int proto_mip6_option_lmaa = -1;
-static int proto_mip6_option_recap = -1;
-static int proto_mip6_option_redir = -1;
-static int proto_mip6_option_load_inf = -1;
-static int proto_mip6_option_alt_ip4 = -1;
-static int proto_mip6_option_mng = -1;
-static int proto_mip6_option_mag_ipv6 = -1;
-static int proto_mip6_option_acc_net_id = -1;
-static int proto_mip6_option_dmnp = -1;
-
-static int hf_mip6_proto = -1;
-static int hf_mip6_hlen = -1;
-static int hf_mip6_mhtype = -1;
-static int hf_mip6_reserved = -1;
-static int hf_mip6_csum = -1;
-
-static int hf_mip6_hoti_cookie = -1;
-
-static int hf_mip6_coti_cookie = -1;
-
-static int hf_mip6_hot_nindex = -1;
-static int hf_mip6_hot_cookie = -1;
-static int hf_mip6_hot_token = -1;
-
-static int hf_mip6_cot_nindex = -1;
-static int hf_mip6_cot_cookie = -1;
-/* static int hf_mip6_cot_token = -1; */
-
-static int hf_mip6_bu_seqnr = -1;
-static int hf_mip6_bu_a_flag = -1;
-static int hf_mip6_bu_h_flag = -1;
-static int hf_mip6_bu_l_flag = -1;
-static int hf_mip6_bu_k_flag = -1;
-static int hf_mip6_bu_m_flag = -1;
-static int hf_mip6_nemo_bu_r_flag = -1;
-static int hf_pmip6_bu_p_flag = -1;
-static int hf_mip6_bu_f_flag = -1;
-static int hf_pmip6_bu_t_flag = -1;
-static int hf_pmip6_bu_b_flag = -1;
-static int hf_mip6_bu_lifetime = -1;
-
-static int hf_mip6_ba_status = -1;
-static int hf_mip6_ba_k_flag = -1;
-static int hf_mip6_nemo_ba_r_flag = -1;
-static int hf_pmip6_ba_p_flag = -1;
-static int hf_pmip6_ba_t_flag = -1;
-static int hf_pmip6_ba_b_flag = -1;
-static int hf_mip6_ba_seqnr = -1;
-static int hf_mip6_ba_lifetime = -1;
-
-static int hf_mip6_be_status = -1;
-static int hf_mip6_be_haddr = -1;
-
-static int hf_fmip6_fbu_seqnr = -1;
-static int hf_fmip6_fbu_a_flag = -1;
-static int hf_fmip6_fbu_h_flag = -1;
-static int hf_fmip6_fbu_l_flag = -1;
-static int hf_fmip6_fbu_k_flag = -1;
-static int hf_fmip6_fbu_lifetime = -1;
-
-static int hf_fmip6_fback_status = -1;
-static int hf_fmip6_fback_k_flag = -1;
-static int hf_fmip6_fback_seqnr = -1;
-static int hf_fmip6_fback_lifetime = -1;
-
-static int hf_mip6_has_num_addrs = -1;
-static int hf_mip6_has_reserved = -1;
-static int hf_mip6_has_address = -1;
-
-static int hf_mip6_hb_u_flag = -1;
-static int hf_mip6_hb_r_flag = -1;
-static int hf_mip6_hb_seqnr = -1;
-
-static int hf_mip6_hi_seqnr = -1;
-static int hf_mip6_hi_s_flag = -1;
-static int hf_mip6_hi_u_flag = -1;
-static int hf_mip6_hi_code = -1;
-
-static int hf_mip6_hack_seqnr = -1;
-static int hf_mip6_hack_code = -1;
-
-static int hf_mip6_opt_3gpp_reserved = -1;
-static int hf_mip6_opt_3gpp_flag_m = -1;
-static int hf_mip6_opt_3gpp_spec_pmipv6_err_code = -1;
-static int hf_mip6_opt_3gpp_pdn_gw_ipv4_addr = -1;
-static int hf_mip6_opt_3gpp_pdn_gw_ipv6_addr = -1;
-static int hf_mip6_opt_3gpp_dhcpv4_addr_all_proc_ind = -1;
-static int hf_mip6_opt_3gpp_pdn_type = -1;
-static int hf_mip6_opt_3gpp_pdn_ind_cause = -1;
-static int hf_mip6_opt_3gpp_chg_id = -1;
-static int hf_mip6_opt_3gpp_charging_characteristic = -1;
-static int hf_mip6_opt_3gpp_mei = -1;
-static int hf_mip6_opt_3gpp_msisdn = -1;
-static int hf_mip6_opt_3gpp_apn_rest = -1;
-static int hf_mip6_opt_3gpp_max_apn_rest = -1;
-static int hf_mip6_opt_3gpp_imsi = -1;
-static int hf_mip6_opt_3gpp_pdn_conn_id = -1;
-static int hf_mip6_opt_3gpp_lapi = -1;
-
-static int hf_mip6_bra_interval = -1;
-
-static int hf_mip6_acoa_acoa = -1;
-static int hf_mip6_nemo_mnp_mnp = -1;
-static int hf_mip6_nemo_mnp_pfl = -1;
-
-static int hf_mip6_ni_hni = -1;
-static int hf_mip6_ni_cni = -1;
-
-static int hf_mip6_bad_auth = -1;
-
-static int hf_fmip6_lla = -1;
-static int hf_fmip6_lla_optcode = -1;
-
-static int hf_mip6_mnid_subtype = -1;
-static int hf_mip6_mnid_identifier = -1;
-static int hf_mip6_vsm_vid = -1;
-static int hf_mip6_vsm_subtype = -1;
-static int hf_mip6_vsm_subtype_3gpp = -1;
-
-static int hf_mip6_opt_ss_identifier = -1;
-
-static int hf_mip6_opt_badff_spi = -1;
-static int hf_mip6_opt_badff_auth = -1;
-
-static int hf_mip6_opt_auth_sub_type = -1;
-static int hf_mip6_opt_auth_mobility_spi = -1;
-static int hf_mip6_opt_auth_auth_data = -1;
-static int hf_mip6_opt_mseg_id_timestamp = -1;
-
-static int hf_mip6_opt_cgar_cga_par = -1;
-static int hf_mip6_opt_sign_sign = -1;
-static int hf_mip6_opt_phkt_phkt = -1;
-static int hf_mip6_opt_mocot_co_keygen_tok = -1;
-
-static int hf_mip6_opt_dnsu_status = -1;
-static int hf_mip6_opt_dnsu_flag_r = -1;
-static int hf_mip6_opt_dnsu_mn_id = -1;
-
-static int hf_mip6_opt_em_data = -1;
-
-static int hf_pmip6_hi_hi = -1;
-static int hf_pmip6_hi_reserved = -1;
-
-static int hf_pmip6_att_reserved = -1;
-static int hf_pmip6_att_att = -1;
-
-static int hf_mip6_opt_mnlli_reserved = -1;
-static int hf_mip6_opt_mnlli_lli = -1;
-
-static int hf_pmip6_timestamp = -1;
-static int hf_pmip6_rc = -1;
-static int hf_mip6_ipv4ha_preflen = -1;
-static int hf_mip6_ipv4ha_p_flag = -1;
-static int hf_mip6_ipv4ha_ha = -1;
-static int hf_mip6_ipv4ha_reserved = -1;
-static int hf_mip6_ipv4aa_status = -1;
-
-static int hf_mip6_opt_natd_f_flag = -1;
-static int hf_mip6_opt_natd_reserved = -1;
-static int hf_mip6_opt_natd_refresh_t = -1;
-
-static int hf_mip6_opt_ipv4coa_reserved = -1;
-static int hf_mip6_opt_ipv4coa_addr = -1;
-
-static int hf_pmip6_gre_key = -1;
-static int hf_mip6_opt_mhipv6ap_opt_code = -1;
-static int hf_mip6_opt_mhipv6ap_prefix_l = -1;
-static int hf_mip6_opt_mhipv6ap_ipv6_address = -1;
-static int hf_mip6_opt_mhipv6ap_ipv6_address_prefix = -1;
-static int hf_mip6_ipv4dra_reserved = -1;
-static int hf_mip6_ipv4dra_dra = -1;
-
-static int hf_mip6_ipv4dsm_reserved = -1;
-static int hf_mip6_ipv4dsm_s_flag = -1;
-static int hf_mip6_cr_reserved = -1;
-static int hf_mip6_cr_req_type = -1;
-static int hf_mip6_cr_req_length = -1;
-
-static int hf_mip6_lmaa_opt_code = -1;
-static int hf_mip6_lmaa_reserved = -1;
-static int hf_mip6_lmaa_ipv4 = -1;
-static int hf_mip6_lmaa_ipv6 = -1;
-
-static int hf_mip6_mobility_opt = -1;
-static int hf_mip6_opt_len = -1;
-
-static int hf_mip6_opt_bi_bid = -1;
-static int hf_mip6_opt_bi_status = -1;
-static int hf_mip6_bi_h_flag = -1;
-static int hf_mip6_bi_coa_ipv4 = -1;
-static int hf_mip6_bi_coa_ipv6 = -1;
-
-static int hf_mip6_binding_refresh_request = -1;
-static int hf_mip6_unknown_type_data = -1;
-static int hf_mip6_fast_neighbor_advertisement = -1;
-static int hf_mip6_vsm_data = -1;
-static int hf_mip6_vsm_req_data = -1;
-static int hf_mip6_opt_padn = -1;
+static int proto_mip6;
+static int proto_nemo;
+static int proto_mip6_option_pad1;
+static int proto_mip6_option_padn;
+static int proto_mip6_option_bra;
+static int proto_mip6_option_acoa;
+static int proto_mip6_option_ni;
+static int proto_mip6_option_bad_auth;
+static int proto_mip6_option_mnp;
+static int proto_mip6_option_mhlla;
+static int proto_mip6_option_mnid;
+static int proto_mip6_option_auth;
+static int proto_mip6_option_mseg_id;
+static int proto_mip6_option_cgapr;
+static int proto_mip6_option_cgar;
+static int proto_mip6_option_sign;
+static int proto_mip6_option_phkt;
+static int proto_mip6_option_coti;
+static int proto_mip6_option_cot;
+static int proto_mip6_option_dnsu;
+static int proto_mip6_option_em;
+static int proto_mip6_option_vsm;
+static int proto_mip6_option_ssm;
+static int proto_mip6_option_badff;
+static int proto_mip6_option_hnp;
+static int proto_mip6_option_hi;
+static int proto_mip6_option_att;
+static int proto_mip6_option_mnlli;
+static int proto_mip6_option_lla;
+static int proto_mip6_option_ts;
+static int proto_mip6_option_rc;
+static int proto_mip6_option_ipv4ha;
+static int proto_mip6_option_ipv4aa;
+static int proto_mip6_option_natd;
+static int proto_mip6_option_ipv4coa;
+static int proto_mip6_option_grek;
+static int proto_mip6_option_mhipv6ap;
+static int proto_mip6_option_bi;
+static int proto_mip6_option_ipv4hareq;
+static int proto_mip6_option_ipv4harep;
+static int proto_mip6_option_ipv4dra;
+static int proto_mip6_option_ipv4dsm;
+static int proto_mip6_option_cr;
+static int proto_mip6_option_lmaa;
+static int proto_mip6_option_recap;
+static int proto_mip6_option_redir;
+static int proto_mip6_option_load_inf;
+static int proto_mip6_option_alt_ip4;
+static int proto_mip6_option_mng;
+static int proto_mip6_option_mag_ipv6;
+static int proto_mip6_option_acc_net_id;
+static int proto_mip6_option_dmnp;
+
+static int hf_mip6_proto;
+static int hf_mip6_hlen;
+static int hf_mip6_mhtype;
+static int hf_mip6_reserved;
+static int hf_mip6_csum;
+
+static int hf_mip6_hoti_cookie;
+
+static int hf_mip6_coti_cookie;
+
+static int hf_mip6_hot_nindex;
+static int hf_mip6_hot_cookie;
+static int hf_mip6_hot_token;
+
+static int hf_mip6_cot_nindex;
+static int hf_mip6_cot_cookie;
+/* static int hf_mip6_cot_token; */
+
+static int hf_mip6_bu_seqnr;
+static int hf_mip6_bu_a_flag;
+static int hf_mip6_bu_h_flag;
+static int hf_mip6_bu_l_flag;
+static int hf_mip6_bu_k_flag;
+static int hf_mip6_bu_m_flag;
+static int hf_mip6_nemo_bu_r_flag;
+static int hf_pmip6_bu_p_flag;
+static int hf_mip6_bu_f_flag;
+static int hf_pmip6_bu_t_flag;
+static int hf_pmip6_bu_b_flag;
+static int hf_mip6_bu_lifetime;
+
+static int hf_mip6_ba_status;
+static int hf_mip6_ba_k_flag;
+static int hf_mip6_nemo_ba_r_flag;
+static int hf_pmip6_ba_p_flag;
+static int hf_pmip6_ba_t_flag;
+static int hf_pmip6_ba_b_flag;
+static int hf_mip6_ba_seqnr;
+static int hf_mip6_ba_lifetime;
+
+static int hf_mip6_be_status;
+static int hf_mip6_be_haddr;
+
+static int hf_fmip6_fbu_seqnr;
+static int hf_fmip6_fbu_a_flag;
+static int hf_fmip6_fbu_h_flag;
+static int hf_fmip6_fbu_l_flag;
+static int hf_fmip6_fbu_k_flag;
+static int hf_fmip6_fbu_lifetime;
+
+static int hf_fmip6_fback_status;
+static int hf_fmip6_fback_k_flag;
+static int hf_fmip6_fback_seqnr;
+static int hf_fmip6_fback_lifetime;
+
+static int hf_mip6_has_num_addrs;
+static int hf_mip6_has_reserved;
+static int hf_mip6_has_address;
+
+static int hf_mip6_hb_u_flag;
+static int hf_mip6_hb_r_flag;
+static int hf_mip6_hb_seqnr;
+
+static int hf_mip6_hi_seqnr;
+static int hf_mip6_hi_s_flag;
+static int hf_mip6_hi_u_flag;
+static int hf_mip6_hi_code;
+
+static int hf_mip6_hack_seqnr;
+static int hf_mip6_hack_code;
+
+static int hf_mip6_opt_3gpp_reserved;
+static int hf_mip6_opt_3gpp_flag_m;
+static int hf_mip6_opt_3gpp_spec_pmipv6_err_code;
+static int hf_mip6_opt_3gpp_pdn_gw_ipv4_addr;
+static int hf_mip6_opt_3gpp_pdn_gw_ipv6_addr;
+static int hf_mip6_opt_3gpp_dhcpv4_addr_all_proc_ind;
+static int hf_mip6_opt_3gpp_pdn_type;
+static int hf_mip6_opt_3gpp_pdn_ind_cause;
+static int hf_mip6_opt_3gpp_chg_id;
+static int hf_mip6_opt_3gpp_charging_characteristic;
+static int hf_mip6_opt_3gpp_mei;
+static int hf_mip6_opt_3gpp_msisdn;
+static int hf_mip6_opt_3gpp_apn_rest;
+static int hf_mip6_opt_3gpp_max_apn_rest;
+static int hf_mip6_opt_3gpp_imsi;
+static int hf_mip6_opt_3gpp_pdn_conn_id;
+static int hf_mip6_opt_3gpp_lapi;
+
+static int hf_mip6_bra_interval;
+
+static int hf_mip6_acoa_acoa;
+static int hf_mip6_nemo_mnp_mnp;
+static int hf_mip6_nemo_mnp_pfl;
+
+static int hf_mip6_ni_hni;
+static int hf_mip6_ni_cni;
+
+static int hf_mip6_bad_auth;
+
+static int hf_fmip6_lla;
+static int hf_fmip6_lla_optcode;
+
+static int hf_mip6_mnid_subtype;
+static int hf_mip6_mnid_identifier;
+static int hf_mip6_vsm_vid;
+static int hf_mip6_vsm_subtype;
+static int hf_mip6_vsm_subtype_3gpp;
+
+static int hf_mip6_opt_ss_identifier;
+
+static int hf_mip6_opt_badff_spi;
+static int hf_mip6_opt_badff_auth;
+
+static int hf_mip6_opt_auth_sub_type;
+static int hf_mip6_opt_auth_mobility_spi;
+static int hf_mip6_opt_auth_auth_data;
+static int hf_mip6_opt_mseg_id_timestamp;
+
+static int hf_mip6_opt_cgar_cga_par;
+static int hf_mip6_opt_sign_sign;
+static int hf_mip6_opt_phkt_phkt;
+static int hf_mip6_opt_mocot_co_keygen_tok;
+
+static int hf_mip6_opt_dnsu_status;
+static int hf_mip6_opt_dnsu_flag_r;
+static int hf_mip6_opt_dnsu_mn_id;
+
+static int hf_mip6_opt_em_data;
+
+static int hf_pmip6_hi_hi;
+static int hf_pmip6_hi_reserved;
+
+static int hf_pmip6_att_reserved;
+static int hf_pmip6_att_att;
+
+static int hf_mip6_opt_mnlli_reserved;
+static int hf_mip6_opt_mnlli_lli;
+
+static int hf_pmip6_timestamp;
+static int hf_pmip6_rc;
+static int hf_mip6_ipv4ha_preflen;
+static int hf_mip6_ipv4ha_p_flag;
+static int hf_mip6_ipv4ha_ha;
+static int hf_mip6_ipv4ha_reserved;
+static int hf_mip6_ipv4aa_status;
+
+static int hf_mip6_opt_natd_f_flag;
+static int hf_mip6_opt_natd_reserved;
+static int hf_mip6_opt_natd_refresh_t;
+
+static int hf_mip6_opt_ipv4coa_reserved;
+static int hf_mip6_opt_ipv4coa_addr;
+
+static int hf_pmip6_gre_key;
+static int hf_mip6_opt_mhipv6ap_opt_code;
+static int hf_mip6_opt_mhipv6ap_prefix_l;
+static int hf_mip6_opt_mhipv6ap_ipv6_address;
+static int hf_mip6_opt_mhipv6ap_ipv6_address_prefix;
+static int hf_mip6_ipv4dra_reserved;
+static int hf_mip6_ipv4dra_dra;
+
+static int hf_mip6_ipv4dsm_reserved;
+static int hf_mip6_ipv4dsm_s_flag;
+static int hf_mip6_cr_reserved;
+static int hf_mip6_cr_req_type;
+static int hf_mip6_cr_req_length;
+
+static int hf_mip6_lmaa_opt_code;
+static int hf_mip6_lmaa_reserved;
+static int hf_mip6_lmaa_ipv4;
+static int hf_mip6_lmaa_ipv6;
+
+static int hf_mip6_mobility_opt;
+static int hf_mip6_opt_len;
+
+static int hf_mip6_opt_bi_bid;
+static int hf_mip6_opt_bi_status;
+static int hf_mip6_bi_h_flag;
+static int hf_mip6_bi_coa_ipv4;
+static int hf_mip6_bi_coa_ipv6;
+
+static int hf_mip6_binding_refresh_request;
+static int hf_mip6_unknown_type_data;
+static int hf_mip6_fast_neighbor_advertisement;
+static int hf_mip6_vsm_data;
+static int hf_mip6_vsm_req_data;
+static int hf_mip6_opt_padn;
 
 /* PMIP BRI */
-static int hf_pmip6_bri_brtype = -1;
-static int hf_pmip6_bri_rtrigger = -1;
-static int hf_pmip6_bri_status = -1;
-static int hf_pmip6_bri_seqnr = -1;
-static int hf_pmip6_bri_ip_flag = -1;
-static int hf_pmip6_bri_ap_flag = -1;
-static int hf_pmip6_bri_iv_flag = -1;
-static int hf_pmip6_bri_av_flag = -1;
-static int hf_pmip6_bri_ig_flag = -1;
-static int hf_pmip6_bri_ag_flag = -1;
-static int hf_pmip6_bri_res = -1;
-
-static int hf_pmip6_lri_sequence = -1;
-static int hf_pmip6_lri_reserved = -1;
-static int hf_pmip6_lri_lifetime = -1;
-
-static int hf_pmip6_lra_sequence = -1;
-static int hf_pmip6_lra_u = -1;
-static int hf_pmip6_lra_reserved = -1;
-static int hf_pmip6_lra_status = -1;
-static int hf_pmip6_lra_lifetime = -1;
-
-static int hf_mip6_opt_recap_reserved = -1;
-static int hf_mip6_opt_redir_k = -1;
-static int hf_mip6_opt_redir_n = -1;
-static int hf_mip6_opt_redir_reserved = -1;
-static int hf_mip6_opt_redir_addr_r2LMA_ipv6 = -1;
-static int hf_mip6_opt_redir_addr_r2LMA_ipv4 = -1;
-static int hf_mip6_opt_load_inf_priority = -1;
-static int hf_mip6_opt_load_inf_sessions_in_use = -1;
-static int hf_mip6_opt_load_inf_maximum_sessions = -1;
-static int hf_mip6_opt_load_inf_used_capacity = -1;
-static int hf_mip6_opt_load_inf_maximum_capacity = -1;
-static int hf_mip6_opt_alt_ip4 = -1;
+static int hf_pmip6_bri_brtype;
+static int hf_pmip6_bri_rtrigger;
+static int hf_pmip6_bri_status;
+static int hf_pmip6_bri_seqnr;
+static int hf_pmip6_bri_ip_flag;
+static int hf_pmip6_bri_ap_flag;
+static int hf_pmip6_bri_iv_flag;
+static int hf_pmip6_bri_av_flag;
+static int hf_pmip6_bri_ig_flag;
+static int hf_pmip6_bri_ag_flag;
+static int hf_pmip6_bri_res;
+
+static int hf_pmip6_lri_sequence;
+static int hf_pmip6_lri_reserved;
+static int hf_pmip6_lri_lifetime;
+
+static int hf_pmip6_lra_sequence;
+static int hf_pmip6_lra_u;
+static int hf_pmip6_lra_reserved;
+static int hf_pmip6_lra_status;
+static int hf_pmip6_lra_lifetime;
+
+static int hf_mip6_opt_recap_reserved;
+static int hf_mip6_opt_redir_k;
+static int hf_mip6_opt_redir_n;
+static int hf_mip6_opt_redir_reserved;
+static int hf_mip6_opt_redir_addr_r2LMA_ipv6;
+static int hf_mip6_opt_redir_addr_r2LMA_ipv4;
+static int hf_mip6_opt_load_inf_priority;
+static int hf_mip6_opt_load_inf_sessions_in_use;
+static int hf_mip6_opt_load_inf_maximum_sessions;
+static int hf_mip6_opt_load_inf_used_capacity;
+static int hf_mip6_opt_load_inf_maximum_capacity;
+static int hf_mip6_opt_alt_ip4;
 
 /* Mobile Node Group Identifier Optionm */
-static int hf_mip6_opt_mng_sub_type = -1;
-static int hf_mip6_opt_mng_reserved = -1;
-static int hf_mip6_opt_mng_mng_id = -1;
-
-static int hf_mip6_opt_mag_ipv6_reserved = -1;
-static int hf_mip6_opt_mag_ipv6_address_length = -1;
-static int hf_mip6_opt_mag_ipv6_address = -1;
-
-static int hf_mip6_opt_acc_net_id_sub = -1;
-static int hf_mip6_opt_acc_net_id_sub_opt = -1;
-static int hf_mip6_opt_acc_net_id_sub_opt_len = -1;
-static int hf_mip6_opt_acc_net_id_sub_opt_e_bit = -1;
-static int hf_mip6_opt_acc_net_id_sub_opt_net_name_len = -1;
-static int hf_mip6_opt_acc_net_id_sub_opt_net_name = -1;
-static int hf_mip6_opt_acc_net_id_sub_opt_net_name_data = -1;
-static int hf_mip6_opt_acc_net_id_sub_opt_ap_name_len = -1;
-static int hf_mip6_opt_acc_net_id_sub_opt_ap_name = -1;
-static int hf_mip6_opt_acc_net_id_sub_opt_geo_latitude_degrees = -1;
-static int hf_mip6_opt_acc_net_id_sub_opt_geo_longitude_degrees = -1;
-static int hf_mip6_opt_acc_net_id_sub_opt_op_id_type = -1;
-static int hf_mip6_opt_acc_net_id_sub_opt_op_id = -1;
-
-static int hf_pmip6_opt_lila_lla = -1;
+static int hf_mip6_opt_mng_sub_type;
+static int hf_mip6_opt_mng_reserved;
+static int hf_mip6_opt_mng_mng_id;
+
+static int hf_mip6_opt_mag_ipv6_reserved;
+static int hf_mip6_opt_mag_ipv6_address_length;
+static int hf_mip6_opt_mag_ipv6_address;
+
+static int hf_mip6_opt_acc_net_id_sub;
+static int hf_mip6_opt_acc_net_id_sub_opt;
+static int hf_mip6_opt_acc_net_id_sub_opt_len;
+static int hf_mip6_opt_acc_net_id_sub_opt_e_bit;
+static int hf_mip6_opt_acc_net_id_sub_opt_net_name_len;
+static int hf_mip6_opt_acc_net_id_sub_opt_net_name;
+static int hf_mip6_opt_acc_net_id_sub_opt_net_name_data;
+static int hf_mip6_opt_acc_net_id_sub_opt_ap_name_len;
+static int hf_mip6_opt_acc_net_id_sub_opt_ap_name;
+static int hf_mip6_opt_acc_net_id_sub_opt_geo_latitude_degrees;
+static int hf_mip6_opt_acc_net_id_sub_opt_geo_longitude_degrees;
+static int hf_mip6_opt_acc_net_id_sub_opt_op_id_type;
+static int hf_mip6_opt_acc_net_id_sub_opt_op_id;
+
+static int hf_pmip6_opt_lila_lla;
 
 /* Delegated Mobile Network Prefix Option */
-static int hf_mip6_opt_dmnp_v_flag = -1;
-static int hf_mip6_opt_dmnp_reserved = -1;
-static int hf_mip6_opt_dmnp_prefix_len = -1;
-static int hf_mip6_opt_dmnp_dmnp_ipv4 = -1;
-static int hf_mip6_opt_dmnp_dmnp_ipv6 = -1;
+static int hf_mip6_opt_dmnp_v_flag;
+static int hf_mip6_opt_dmnp_reserved;
+static int hf_mip6_opt_dmnp_prefix_len;
+static int hf_mip6_opt_dmnp_dmnp_ipv4;
+static int hf_mip6_opt_dmnp_dmnp_ipv6;
 
 /* Initialize the subtree pointers */
-static gint ett_mip6 = -1;
-static gint ett_mip6_opt_pad1 = -1;
-static gint ett_mip6_opt_padn = -1;
-static gint ett_mip6_opts = -1;
-static gint ett_mip6_opt_bra = -1;
-static gint ett_mip6_opt_acoa = -1;
-static gint ett_mip6_opt_ni = -1;
-static gint ett_mip6_opt_bad = -1;
-static gint ett_mip6_nemo_opt_mnp = -1;
-static gint ett_fmip6_opt_lla = -1;
-static gint ett_mip6_opt_mnid = -1;
-static gint ett_mip6_opt_auth = -1;
-static gint ett_mip6_opt_mesgid = -1;
-static gint ett_mip6_opt_cgapr = -1;
-static gint ett_mip6_opt_cgar = -1;
-static gint ett_mip6_opt_sign = -1;
-static gint ett_mip6_opt_phkt = -1;
-static gint ett_mip6_opt_mocoti = -1;
-static gint ett_mip6_opt_mocot = -1;
-static gint ett_mip6_opt_dnsu = -1;
-static gint ett_mip6_opt_em = -1;
-static gint ett_mip6_opt_vsm = -1;
-static gint ett_mip6_opt_ssm = -1;
-static gint ett_mip6_opt_badff = -1;
-static gint ett_mip6_opt_unknown = -1;
-static gint ett_pmip6_opt_hnp = -1;
-static gint ett_pmip6_opt_hi = -1;
-static gint ett_pmip6_opt_att = -1;
-static gint ett_pmip6_opt_mnlli = -1;
-static gint ett_pmip6_opt_lla = -1;
-static gint ett_pmip6_opt_ts = -1;
-static gint ett_pmip6_opt_rc = -1;
-static gint ett_mip6_opt_ipv4ha = -1;
-static gint ett_mip6_opt_ipv4aa = -1;
-static gint ett_mip6_opt_natd = -1;
-static gint ett_mip6_opt_ipv4coa = -1;
-static gint ett_pmip6_opt_grek = -1;
-static gint ett_pmip6_opt_mhipv6ap = -1;
-static gint ett_pmip6_opt_bi = -1;
-static gint ett_mip6_opt_ipv4hareq = -1;
-static gint ett_mip6_opt_ipv4harep = -1;
-static gint ett_mip6_opt_ipv4dra = -1;
-static gint ett_mip6_opt_ipv4dsm = -1;
-static gint ett_mip6_opt_cr = -1;
-static gint ett_mip6_opt_lmaa = -1;
-static gint ett_mip6_opt_recap = -1;
-static gint ett_mip6_opt_redir = -1;
-static gint ett_mip6_opt_load_inf = -1;
-static gint ett_mip6_opt_alt_ip4 = -1;
-static gint ett_mip6_opt_mng = -1;
-static gint ett_mip6_opt_mag_ipv6 = -1;
-static gint ett_mip6_opt_acc_net_id = -1;
-static gint ett_mip6_sub_opt_acc_net_id = -1;
-static gint ett_mip6_opt_dmnp = -1;
-
-static expert_field ei_mip6_ie_not_dissected = EI_INIT;
-static expert_field ei_mip6_ani_type_not_dissected = EI_INIT;
-static expert_field ei_mip6_opt_len_invalid = EI_INIT;
-static expert_field ei_mip6_vsm_data_not_dissected = EI_INIT;
-static expert_field ei_mip6_bogus_header_length = EI_INIT;
+static gint ett_mip6;
+static gint ett_mip6_opt_pad1;
+static gint ett_mip6_opt_padn;
+static gint ett_mip6_opts;
+static gint ett_mip6_opt_bra;
+static gint ett_mip6_opt_acoa;
+static gint ett_mip6_opt_ni;
+static gint ett_mip6_opt_bad;
+static gint ett_mip6_nemo_opt_mnp;
+static gint ett_fmip6_opt_lla;
+static gint ett_mip6_opt_mnid;
+static gint ett_mip6_opt_auth;
+static gint ett_mip6_opt_mesgid;
+static gint ett_mip6_opt_cgapr;
+static gint ett_mip6_opt_cgar;
+static gint ett_mip6_opt_sign;
+static gint ett_mip6_opt_phkt;
+static gint ett_mip6_opt_mocoti;
+static gint ett_mip6_opt_mocot;
+static gint ett_mip6_opt_dnsu;
+static gint ett_mip6_opt_em;
+static gint ett_mip6_opt_vsm;
+static gint ett_mip6_opt_ssm;
+static gint ett_mip6_opt_badff;
+static gint ett_mip6_opt_unknown;
+static gint ett_pmip6_opt_hnp;
+static gint ett_pmip6_opt_hi;
+static gint ett_pmip6_opt_att;
+static gint ett_pmip6_opt_mnlli;
+static gint ett_pmip6_opt_lla;
+static gint ett_pmip6_opt_ts;
+static gint ett_pmip6_opt_rc;
+static gint ett_mip6_opt_ipv4ha;
+static gint ett_mip6_opt_ipv4aa;
+static gint ett_mip6_opt_natd;
+static gint ett_mip6_opt_ipv4coa;
+static gint ett_pmip6_opt_grek;
+static gint ett_pmip6_opt_mhipv6ap;
+static gint ett_pmip6_opt_bi;
+static gint ett_mip6_opt_ipv4hareq;
+static gint ett_mip6_opt_ipv4harep;
+static gint ett_mip6_opt_ipv4dra;
+static gint ett_mip6_opt_ipv4dsm;
+static gint ett_mip6_opt_cr;
+static gint ett_mip6_opt_lmaa;
+static gint ett_mip6_opt_recap;
+static gint ett_mip6_opt_redir;
+static gint ett_mip6_opt_load_inf;
+static gint ett_mip6_opt_alt_ip4;
+static gint ett_mip6_opt_mng;
+static gint ett_mip6_opt_mag_ipv6;
+static gint ett_mip6_opt_acc_net_id;
+static gint ett_mip6_sub_opt_acc_net_id;
+static gint ett_mip6_opt_dmnp;
+
+static expert_field ei_mip6_ie_not_dissected;
+static expert_field ei_mip6_ani_type_not_dissected;
+static expert_field ei_mip6_opt_len_invalid;
+static expert_field ei_mip6_vsm_data_not_dissected;
+static expert_field ei_mip6_bogus_header_length;
 
 static dissector_table_t mip6_option_table;
 
diff --git a/epan/dissectors/packet-mka.c b/epan/dissectors/packet-mka.c
index 55dece6859..24866d035b 100644
--- a/epan/dissectors/packet-mka.c
+++ b/epan/dissectors/packet-mka.c
@@ -31,94 +31,94 @@
 void proto_register_mka(void);
 void proto_reg_handoff_mka(void);
 
-static int proto_mka = -1;
-
-static int hf_mka_version_id = -1;
-static int hf_mka_basic_param_set = -1;
-static int hf_mka_live_peer_list_set = -1;
-static int hf_mka_potential_peer_list_set = -1;
-static int hf_mka_macsec_sak_use_set = -1;
-static int hf_mka_distributed_sak_set = -1;
-static int hf_mka_distributed_cak_set = -1;
-static int hf_mka_kmd_set = -1;
-static int hf_mka_announcement_set = -1;
-static int hf_mka_xpn_set = -1;
-static int hf_mka_icv_set = -1;
-static int hf_mka_param_set_type = -1;
-
-static int hf_mka_keyserver_priority = -1;
-static int hf_mka_key_server = -1;
-static int hf_mka_macsec_desired = -1;
-static int hf_mka_macsec_capability = -1;
-static int hf_mka_param_body_length = -1;
-static int hf_mka_sci = -1;
-static int hf_mka_actor_mi = -1;
-static int hf_mka_actor_mn = -1;
-static int hf_mka_algo_agility = -1;
-static int hf_mka_cak_name = -1;
-static int hf_mka_cak_name_info = -1;
-
-static int hf_mka_padding = -1;
-
-static int hf_mka_key_server_ssci = -1;
-static int hf_mka_peer_mi = -1;
-static int hf_mka_peer_mn = -1;
-
-static int hf_mka_latest_key_an = -1;
-static int hf_mka_latest_key_tx = -1;
-static int hf_mka_latest_key_rx = -1;
-static int hf_mka_old_key_an = -1;
-static int hf_mka_old_key_tx = -1;
-static int hf_mka_old_key_rx = -1;
-static int hf_mka_plain_tx = -1;
-static int hf_mka_plain_rx = -1;
-static int hf_mka_delay_protect = -1;
-static int hf_mka_latest_key_server_mi = -1;
-static int hf_mka_latest_key_number = -1;
-static int hf_mka_latest_lowest_acceptable_pn = -1;
-static int hf_mka_old_key_server_mi = -1;
-static int hf_mka_old_key_number = -1;
-static int hf_mka_old_lowest_acceptable_pn = -1;
-
-static int hf_mka_distributed_an = -1;
-static int hf_mka_confidentiality_offset = -1;
-static int hf_mka_key_number = -1;
-static int hf_mka_aes_key_wrap_sak = -1;
-static int hf_mka_macsec_cipher_suite = -1;
-static int hf_mka_aes_key_wrap_cak = -1;
-
-static int hf_mka_kmd = -1;
-
-static int hf_mka_suspension_time = -1;
-
-static int hf_mka_unknown_set = -1;
-static int hf_mka_unknown_param_set = -1;
-
-static int hf_mka_icv = -1;
-
-static int hf_mka_tlv_entry = -1;
-static int hf_mka_tlv_type = -1;
-static int hf_mka_tlv_info_string_length = -1;
-static int hf_mka_tlv_data = -1;
-static int hf_mka_tlv_cipher_suite_impl_cap = -1;
-
-static expert_field ei_mka_undecoded = EI_INIT;
-static expert_field ei_unexpected_data = EI_INIT;
-static expert_field ei_mka_unimplemented = EI_INIT;
-
-static gint ett_mka = -1;
-static gint ett_mka_basic_param_set = -1;
-static gint ett_mka_peer_list_set = -1;
-static gint ett_mka_sak_use_set = -1;
-static gint ett_mka_distributed_sak_set = -1;
-static gint ett_mka_distributed_cak_set = -1;
-static gint ett_mka_kmd_set = -1;
-static gint ett_mka_announcement_set = -1;
-static gint ett_mka_xpn_set = -1;
-static gint ett_mka_unknown_set = -1;
-static gint ett_mka_icv_set = -1;
-static gint ett_mka_tlv = -1;
-static gint ett_mka_cipher_suite_entry = -1;
+static int proto_mka;
+
+static int hf_mka_version_id;
+static int hf_mka_basic_param_set;
+static int hf_mka_live_peer_list_set;
+static int hf_mka_potential_peer_list_set;
+static int hf_mka_macsec_sak_use_set;
+static int hf_mka_distributed_sak_set;
+static int hf_mka_distributed_cak_set;
+static int hf_mka_kmd_set;
+static int hf_mka_announcement_set;
+static int hf_mka_xpn_set;
+static int hf_mka_icv_set;
+static int hf_mka_param_set_type;
+
+static int hf_mka_keyserver_priority;
+static int hf_mka_key_server;
+static int hf_mka_macsec_desired;
+static int hf_mka_macsec_capability;
+static int hf_mka_param_body_length;
+static int hf_mka_sci;
+static int hf_mka_actor_mi;
+static int hf_mka_actor_mn;
+static int hf_mka_algo_agility;
+static int hf_mka_cak_name;
+static int hf_mka_cak_name_info;
+
+static int hf_mka_padding;
+
+static int hf_mka_key_server_ssci;
+static int hf_mka_peer_mi;
+static int hf_mka_peer_mn;
+
+static int hf_mka_latest_key_an;
+static int hf_mka_latest_key_tx;
+static int hf_mka_latest_key_rx;
+static int hf_mka_old_key_an;
+static int hf_mka_old_key_tx;
+static int hf_mka_old_key_rx;
+static int hf_mka_plain_tx;
+static int hf_mka_plain_rx;
+static int hf_mka_delay_protect;
+static int hf_mka_latest_key_server_mi;
+static int hf_mka_latest_key_number;
+static int hf_mka_latest_lowest_acceptable_pn;
+static int hf_mka_old_key_server_mi;
+static int hf_mka_old_key_number;
+static int hf_mka_old_lowest_acceptable_pn;
+
+static int hf_mka_distributed_an;
+static int hf_mka_confidentiality_offset;
+static int hf_mka_key_number;
+static int hf_mka_aes_key_wrap_sak;
+static int hf_mka_macsec_cipher_suite;
+static int hf_mka_aes_key_wrap_cak;
+
+static int hf_mka_kmd;
+
+static int hf_mka_suspension_time;
+
+static int hf_mka_unknown_set;
+static int hf_mka_unknown_param_set;
+
+static int hf_mka_icv;
+
+static int hf_mka_tlv_entry;
+static int hf_mka_tlv_type;
+static int hf_mka_tlv_info_string_length;
+static int hf_mka_tlv_data;
+static int hf_mka_tlv_cipher_suite_impl_cap;
+
+static expert_field ei_mka_undecoded;
+static expert_field ei_unexpected_data;
+static expert_field ei_mka_unimplemented;
+
+static gint ett_mka;
+static gint ett_mka_basic_param_set;
+static gint ett_mka_peer_list_set;
+static gint ett_mka_sak_use_set;
+static gint ett_mka_distributed_sak_set;
+static gint ett_mka_distributed_cak_set;
+static gint ett_mka_kmd_set;
+static gint ett_mka_announcement_set;
+static gint ett_mka_xpn_set;
+static gint ett_mka_unknown_set;
+static gint ett_mka_icv_set;
+static gint ett_mka_tlv;
+static gint ett_mka_cipher_suite_entry;
 
 static const value_string param_set_type_vals[] = {
   { LIVE_PEER_LIST_TYPE,       "Live Peer List" },
diff --git a/epan/dissectors/packet-mle.c b/epan/dissectors/packet-mle.c
index 790e7de829..f358126054 100644
--- a/epan/dissectors/packet-mle.c
+++ b/epan/dissectors/packet-mle.c
@@ -38,112 +38,112 @@
 void proto_register_mle(void);
 void proto_reg_handoff_mle(void);
 
-static int proto_mle = -1;
-static int proto_ieee802154 = -1; /* cache 802.15.4 protocol ID */
+static int proto_mle;
+static int proto_ieee802154; /* cache 802.15.4 protocol ID */
 
 /*  Registered fields for Auxiliary Security Header */
-static int hf_mle_security_suite = -1;
-static int hf_mle_mic = -1;
-
-static int hf_mle_command = -1;
-static int hf_mle_tlv = -1;
-static int hf_mle_tlv_type = -1;
-static int hf_mle_tlv_length = -1;
-static int hf_mle_tlv_source_addr = -1;
-static int hf_mle_tlv_mode_device_type = -1;
-static int hf_mle_tlv_mode_idle_rx = -1;
-static int hf_mle_tlv_mode_sec_data_req = -1;
-static int hf_mle_tlv_mode_nwk_data = -1;
-static int hf_mle_tlv_timeout = -1;
-static int hf_mle_tlv_challenge = -1;
-static int hf_mle_tlv_response = -1;
-static int hf_mle_tlv_ll_frm_cntr = -1;
-static int hf_mle_tlv_lqi_c = -1;
-static int hf_mle_tlv_lqi_size = -1;
-static int hf_mle_tlv_neighbor = -1;
-static int hf_mle_tlv_neighbor_flagI = -1;
-static int hf_mle_tlv_neighbor_flagO = -1;
-static int hf_mle_tlv_neighbor_flagP = -1;
-static int hf_mle_tlv_neighbor_idr = -1;
-static int hf_mle_tlv_neighbor_addr = -1;
-static int hf_mle_tlv_network_param_id = -1;
-static int hf_mle_tlv_network_delay = -1;
-static int hf_mle_tlv_network_channel = -1;
-static int hf_mle_tlv_network_pan_id = -1;
-static int hf_mle_tlv_network_pmt_join = -1;
-static int hf_mle_tlv_network_bcn_payload = -1;
-static int hf_mle_tlv_network_unknown = -1;
-static int hf_mle_tlv_mle_frm_cntr = -1;
-static int hf_mle_tlv_unknown = -1;
-static int hf_mle_tlv_route64_id_seq = -1;
-static int hf_mle_tlv_route64_id_mask = -1;
-static int hf_mle_tlv_route64_entry = -1;
-static int hf_mle_tlv_route64_nbr_out = -1;
-static int hf_mle_tlv_route64_nbr_in = -1;
-static int hf_mle_tlv_route64_cost = -1;
+static int hf_mle_security_suite;
+static int hf_mle_mic;
+
+static int hf_mle_command;
+static int hf_mle_tlv;
+static int hf_mle_tlv_type;
+static int hf_mle_tlv_length;
+static int hf_mle_tlv_source_addr;
+static int hf_mle_tlv_mode_device_type;
+static int hf_mle_tlv_mode_idle_rx;
+static int hf_mle_tlv_mode_sec_data_req;
+static int hf_mle_tlv_mode_nwk_data;
+static int hf_mle_tlv_timeout;
+static int hf_mle_tlv_challenge;
+static int hf_mle_tlv_response;
+static int hf_mle_tlv_ll_frm_cntr;
+static int hf_mle_tlv_lqi_c;
+static int hf_mle_tlv_lqi_size;
+static int hf_mle_tlv_neighbor;
+static int hf_mle_tlv_neighbor_flagI;
+static int hf_mle_tlv_neighbor_flagO;
+static int hf_mle_tlv_neighbor_flagP;
+static int hf_mle_tlv_neighbor_idr;
+static int hf_mle_tlv_neighbor_addr;
+static int hf_mle_tlv_network_param_id;
+static int hf_mle_tlv_network_delay;
+static int hf_mle_tlv_network_channel;
+static int hf_mle_tlv_network_pan_id;
+static int hf_mle_tlv_network_pmt_join;
+static int hf_mle_tlv_network_bcn_payload;
+static int hf_mle_tlv_network_unknown;
+static int hf_mle_tlv_mle_frm_cntr;
+static int hf_mle_tlv_unknown;
+static int hf_mle_tlv_route64_id_seq;
+static int hf_mle_tlv_route64_id_mask;
+static int hf_mle_tlv_route64_entry;
+static int hf_mle_tlv_route64_nbr_out;
+static int hf_mle_tlv_route64_nbr_in;
+static int hf_mle_tlv_route64_cost;
 #if 0
-static int hf_mle_tlv_route64_unknown = -1;
+static int hf_mle_tlv_route64_unknown;
 #endif
-static int hf_mle_tlv_addr16 = -1;
-static int hf_mle_tlv_leader_data_partition_id = -1;
-static int hf_mle_tlv_leader_data_weighting = -1;
-static int hf_mle_tlv_leader_data_version = -1;
-static int hf_mle_tlv_leader_data_stable_version = -1;
-static int hf_mle_tlv_leader_data_router_id = -1;
+static int hf_mle_tlv_addr16;
+static int hf_mle_tlv_leader_data_partition_id;
+static int hf_mle_tlv_leader_data_weighting;
+static int hf_mle_tlv_leader_data_version;
+static int hf_mle_tlv_leader_data_stable_version;
+static int hf_mle_tlv_leader_data_router_id;
 #if 0
-static int hf_mle_tlv_network_data = -1;
+static int hf_mle_tlv_network_data;
 #endif
-static int hf_mle_tlv_scan_mask_r = -1;
-static int hf_mle_tlv_scan_mask_e = -1;
-static int hf_mle_tlv_conn_flags = -1;
-static int hf_mle_tlv_conn_flags_pp = -1;
-static int hf_mle_tlv_conn_lq3 = -1;
-static int hf_mle_tlv_conn_lq2 = -1;
-static int hf_mle_tlv_conn_lq1 = -1;
-static int hf_mle_tlv_conn_leader_cost = -1;
-static int hf_mle_tlv_conn_id_seq = -1;
-static int hf_mle_tlv_conn_active_rtrs = -1;
-static int hf_mle_tlv_conn_sed_buf_size = -1;
-static int hf_mle_tlv_conn_sed_dgram_cnt = -1;
-static int hf_mle_tlv_link_margin = -1;
-static int hf_mle_tlv_status = -1;
-static int hf_mle_tlv_version = -1;
-static int hf_mle_tlv_addr_reg_entry = -1;
-static int hf_mle_tlv_addr_reg_iid_type = -1;
-static int hf_mle_tlv_addr_reg_cid = -1;
-static int hf_mle_tlv_addr_reg_iid = -1;
-static int hf_mle_tlv_addr_reg_ipv6 = -1;
+static int hf_mle_tlv_scan_mask_r;
+static int hf_mle_tlv_scan_mask_e;
+static int hf_mle_tlv_conn_flags;
+static int hf_mle_tlv_conn_flags_pp;
+static int hf_mle_tlv_conn_lq3;
+static int hf_mle_tlv_conn_lq2;
+static int hf_mle_tlv_conn_lq1;
+static int hf_mle_tlv_conn_leader_cost;
+static int hf_mle_tlv_conn_id_seq;
+static int hf_mle_tlv_conn_active_rtrs;
+static int hf_mle_tlv_conn_sed_buf_size;
+static int hf_mle_tlv_conn_sed_dgram_cnt;
+static int hf_mle_tlv_link_margin;
+static int hf_mle_tlv_status;
+static int hf_mle_tlv_version;
+static int hf_mle_tlv_addr_reg_entry;
+static int hf_mle_tlv_addr_reg_iid_type;
+static int hf_mle_tlv_addr_reg_cid;
+static int hf_mle_tlv_addr_reg_iid;
+static int hf_mle_tlv_addr_reg_ipv6;
 #if 0
-static int hf_mle_tlv_hold_time = -1;
+static int hf_mle_tlv_hold_time;
 #endif
-static int hf_mle_tlv_channel_page = -1; /* v1.1-draft-2 */
-static int hf_mle_tlv_channel = -1; /* v1.1-draft-2 */
-static int hf_mle_tlv_pan_id = -1; /* v1.1-draft-2 */
-static int hf_mle_tlv_active_tstamp = -1; /* SPEC-472 */
-static int hf_mle_tlv_pending_tstamp = -1; /* SPEC-472 */
+static int hf_mle_tlv_channel_page; /* v1.1-draft-2 */
+static int hf_mle_tlv_channel; /* v1.1-draft-2 */
+static int hf_mle_tlv_pan_id; /* v1.1-draft-2 */
+static int hf_mle_tlv_active_tstamp; /* SPEC-472 */
+static int hf_mle_tlv_pending_tstamp; /* SPEC-472 */
 #if 0
-static int hf_mle_tlv_active_op_dataset = -1; /* SPEC-472 */
-static int hf_mle_tlv_pending_op_dataset = -1; /* SPEC-472 */
+static int hf_mle_tlv_active_op_dataset; /* SPEC-472 */
+static int hf_mle_tlv_pending_op_dataset; /* SPEC-472 */
 #endif
 
-static gint ett_mle = -1;
-static gint ett_mle_tlv = -1;
-static gint ett_mle_neighbor = -1;
-static gint ett_mle_router = -1;
-static gint ett_mle_addr_reg = -1;
-static gint ett_mle_conn_flg = -1;
-static gint ett_mle_thread_nwd = -1;
-static gint ett_mle_auxiliary_security = -1;
-static gint ett_mle_aux_sec_control = -1;
-static gint ett_mle_aux_sec_key_id = -1;
-
-static expert_field ei_mle_cbc_mac_failed = EI_INIT;
-static expert_field ei_mle_packet_too_small = EI_INIT;
-static expert_field ei_mle_no_key = EI_INIT;
-static expert_field ei_mle_decrypt_failed = EI_INIT;
-static expert_field ei_mle_mic_check_failed = EI_INIT;
-static expert_field ei_mle_tlv_length_failed = EI_INIT;
-static expert_field ei_mle_len_size_mismatch = EI_INIT;
+static gint ett_mle;
+static gint ett_mle_tlv;
+static gint ett_mle_neighbor;
+static gint ett_mle_router;
+static gint ett_mle_addr_reg;
+static gint ett_mle_conn_flg;
+static gint ett_mle_thread_nwd;
+static gint ett_mle_auxiliary_security;
+static gint ett_mle_aux_sec_control;
+static gint ett_mle_aux_sec_key_id;
+
+static expert_field ei_mle_cbc_mac_failed;
+static expert_field ei_mle_packet_too_small;
+static expert_field ei_mle_no_key;
+static expert_field ei_mle_decrypt_failed;
+static expert_field ei_mle_mic_check_failed;
+static expert_field ei_mle_tlv_length_failed;
+static expert_field ei_mle_len_size_mismatch;
 
 static dissector_handle_t mle_handle;
 static dissector_handle_t thread_nwd_handle;
diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c
index d61885129c..7d42553006 100644
--- a/epan/dissectors/packet-mmse.c
+++ b/epan/dissectors/packet-mmse.c
@@ -185,63 +185,63 @@ static const value_string vals_mm_header_names[] = {
 /*
  * Initialize the protocol and registered fields
  */
-static int proto_mmse = -1;
-
-static int hf_mmse_message_type         = -1;
-static int hf_mmse_transaction_id       = -1;
-static int hf_mmse_mms_version          = -1;
-static int hf_mmse_bcc                  = -1;
-static int hf_mmse_cc                   = -1;
-static int hf_mmse_content_location     = -1;
-static int hf_mmse_date                 = -1;
-static int hf_mmse_delivery_report      = -1;
-static int hf_mmse_delivery_time_abs    = -1;
-static int hf_mmse_delivery_time_rel    = -1;
-static int hf_mmse_expiry_abs           = -1;
-static int hf_mmse_expiry_rel           = -1;
-static int hf_mmse_from                 = -1;
-static int hf_mmse_message_class_id     = -1;
-static int hf_mmse_message_class_str    = -1;
-static int hf_mmse_message_id           = -1;
-static int hf_mmse_message_size         = -1;
-static int hf_mmse_priority             = -1;
-static int hf_mmse_read_reply           = -1;
-static int hf_mmse_report_allowed       = -1;
-static int hf_mmse_response_status      = -1;
-static int hf_mmse_response_text        = -1;
-static int hf_mmse_sender_visibility    = -1;
-static int hf_mmse_status               = -1;
-static int hf_mmse_subject              = -1;
-static int hf_mmse_to                   = -1;
-/* static int hf_mmse_content_type              = -1; */
-static int hf_mmse_ffheader             = -1;
+static int proto_mmse;
+
+static int hf_mmse_message_type;
+static int hf_mmse_transaction_id;
+static int hf_mmse_mms_version;
+static int hf_mmse_bcc;
+static int hf_mmse_cc;
+static int hf_mmse_content_location;
+static int hf_mmse_date;
+static int hf_mmse_delivery_report;
+static int hf_mmse_delivery_time_abs;
+static int hf_mmse_delivery_time_rel;
+static int hf_mmse_expiry_abs;
+static int hf_mmse_expiry_rel;
+static int hf_mmse_from;
+static int hf_mmse_message_class_id;
+static int hf_mmse_message_class_str;
+static int hf_mmse_message_id;
+static int hf_mmse_message_size;
+static int hf_mmse_priority;
+static int hf_mmse_read_reply;
+static int hf_mmse_report_allowed;
+static int hf_mmse_response_status;
+static int hf_mmse_response_text;
+static int hf_mmse_sender_visibility;
+static int hf_mmse_status;
+static int hf_mmse_subject;
+static int hf_mmse_to;
+/* static int hf_mmse_content_type; */
+static int hf_mmse_ffheader;
 /* MMSE 1.1 */
-static int hf_mmse_read_report          = -1;
-static int hf_mmse_retrieve_status      = -1;
-static int hf_mmse_retrieve_text        = -1;
-static int hf_mmse_read_status          = -1;
-static int hf_mmse_reply_charging       = -1;
-static int hf_mmse_reply_charging_deadline_abs  = -1;
-static int hf_mmse_reply_charging_deadline_rel  = -1;
-static int hf_mmse_reply_charging_id    = -1;
-static int hf_mmse_reply_charging_size  = -1;
-static int hf_mmse_prev_sent_by = -1;
-static int hf_mmse_prev_sent_by_fwd_count       = -1;
-static int hf_mmse_prev_sent_by_address = -1;
-static int hf_mmse_prev_sent_date       = -1;
-static int hf_mmse_prev_sent_date_fwd_count     = -1;
-static int hf_mmse_prev_sent_date_date  = -1;
-static int hf_mmse_header_uint = -1;
-static int hf_mmse_header_string = -1;
-static int hf_mmse_header_bytes = -1;
+static int hf_mmse_read_report;
+static int hf_mmse_retrieve_status;
+static int hf_mmse_retrieve_text;
+static int hf_mmse_read_status;
+static int hf_mmse_reply_charging;
+static int hf_mmse_reply_charging_deadline_abs;
+static int hf_mmse_reply_charging_deadline_rel;
+static int hf_mmse_reply_charging_id;
+static int hf_mmse_reply_charging_size;
+static int hf_mmse_prev_sent_by;
+static int hf_mmse_prev_sent_by_fwd_count;
+static int hf_mmse_prev_sent_by_address;
+static int hf_mmse_prev_sent_date;
+static int hf_mmse_prev_sent_date_fwd_count;
+static int hf_mmse_prev_sent_date_date;
+static int hf_mmse_header_uint;
+static int hf_mmse_header_string;
+static int hf_mmse_header_bytes;
 
 /*
  * Initialize the subtree pointers
  */
-static gint ett_mmse                    = -1;
-static gint ett_mmse_hdr_details        = -1;
+static gint ett_mmse;
+static gint ett_mmse_hdr_details;
 
-static expert_field ei_mmse_oversized_uintvar = EI_INIT;
+static expert_field ei_mmse_oversized_uintvar;
 
 /*
  * Valuestrings for PDU types
diff --git a/epan/dissectors/packet-mndp.c b/epan/dissectors/packet-mndp.c
index a7509ba4c9..a4cd337bea 100644
--- a/epan/dissectors/packet-mndp.c
+++ b/epan/dissectors/packet-mndp.c
@@ -27,32 +27,32 @@ void proto_reg_handoff_mndp(void);
 static dissector_handle_t mndp_handle;
 
 /* protocol handles */
-static int proto_mndp = -1;
+static int proto_mndp;
 
 /* ett handles */
-static int ett_mndp = -1;
-static int ett_mndp_tlv_header = -1;
+static int ett_mndp;
+static int ett_mndp_tlv_header;
 
 /* hf elements */
 /* tlv generic */
-static int hf_mndp_tlv_type = -1;
-static int hf_mndp_tlv_length = -1;
-static int hf_mndp_tlv_data = -1;
+static int hf_mndp_tlv_type;
+static int hf_mndp_tlv_length;
+static int hf_mndp_tlv_data;
 /* tunnel header */
-static int hf_mndp_header_unknown = -1;
-static int hf_mndp_header_seqno = -1;
+static int hf_mndp_header_unknown;
+static int hf_mndp_header_seqno;
 /* tlvs */
-static int hf_mndp_mac = -1;
-static int hf_mndp_softwareid = -1;
-static int hf_mndp_version = -1;
-static int hf_mndp_identity = -1;
-static int hf_mndp_uptime = -1;
-static int hf_mndp_platform = -1;
-static int hf_mndp_board = -1;
-static int hf_mndp_unpack = -1;
-static int hf_mndp_ipv6address = -1;
-static int hf_mndp_interfacename = -1;
-static int hf_mndp_ipv4address = -1;
+static int hf_mndp_mac;
+static int hf_mndp_softwareid;
+static int hf_mndp_version;
+static int hf_mndp_identity;
+static int hf_mndp_uptime;
+static int hf_mndp_platform;
+static int hf_mndp_board;
+static int hf_mndp_unpack;
+static int hf_mndp_ipv6address;
+static int hf_mndp_interfacename;
+static int hf_mndp_ipv4address;
 
 #define PROTO_SHORT_NAME "MNDP"
 #define PROTO_LONG_NAME "Mikrotik Neighbor Discovery Protocol"
diff --git a/epan/dissectors/packet-mojito.c b/epan/dissectors/packet-mojito.c
index 26a07cf370..c7aaf6fce5 100644
--- a/epan/dissectors/packet-mojito.c
+++ b/epan/dissectors/packet-mojito.c
@@ -36,78 +36,78 @@ static dissector_handle_t mojito_handle;
 #define MOJITO_STATS_RESPONSE_DEPRECATED  10
 
 /* Initialize the protocol and registered fields */
-static int proto_mojito = -1;
+static int proto_mojito;
 
 /* Start of fields */
-static int hf_mojito_messageid = -1;
-static int hf_mojito_fdhtmessage = -1;
-static int hf_mojito_mjrversion = -1;
-static int hf_mojito_mnrversion = -1;
-static int hf_mojito_length = -1;
-static int hf_mojito_opcode = -1;
-static int hf_mojito_vendor = -1;
-static int hf_mojito_origmjrversion = -1;
-static int hf_mojito_origmnrversion = -1;
-static int hf_mojito_kuid = -1;
-static int hf_mojito_socketaddress_version = -1;
-static int hf_mojito_socketaddress_ipv4 = -1;
-static int hf_mojito_socketaddress_ipv6 = -1;
-static int hf_mojito_socketaddress_port = -1;
-static int hf_mojito_instanceid = -1;
-static int hf_mojito_flags = -1;
-static int hf_mojito_flags_shutdown = -1;
-static int hf_mojito_flags_firewalled = -1;
-static int hf_mojito_extendedlength = -1;
-static int hf_mojito_kuidcount = -1;
-static int hf_mojito_bigintegerlen = -1;
-static int hf_mojito_bigintegerval = -1;
-static int hf_mojito_dhtvaluetype = -1;
-static int hf_mojito_sectokenlen = -1;
-static int hf_mojito_sectoken = -1;
-static int hf_mojito_contactcount = -1;
-static int hf_mojito_contactvendor = -1;
-static int hf_mojito_contactversion = -1;
-static int hf_mojito_contactkuid = -1;
-static int hf_mojito_dhtvaluecount = -1;
-static int hf_mojito_dhtvalue_kuid = -1;
-static int hf_mojito_target_kuid = -1;
-static int hf_mojito_dhtvalue_valuetype = -1;
-static int hf_mojito_dhtvalue_version = -1;
-static int hf_mojito_dhtvalue_length = -1;
-static int hf_mojito_dhtvalue_value = -1;
-static int hf_mojito_bigint_value_one = -1;
-static int hf_mojito_bigint_value_two = -1;
-static int hf_mojito_bigint_value_three = -1;
-static int hf_mojito_bigint_value_four = -1;
-static int hf_mojito_storestatuscode_count = -1;
-static int hf_mojito_storestatuscode_code = -1;
-static int hf_mojito_storestatuscode_kuid = -1;
-static int hf_mojito_storestatuscode_secondary_kuid = -1;
-static int hf_mojito_requestload = -1;
+static int hf_mojito_messageid;
+static int hf_mojito_fdhtmessage;
+static int hf_mojito_mjrversion;
+static int hf_mojito_mnrversion;
+static int hf_mojito_length;
+static int hf_mojito_opcode;
+static int hf_mojito_vendor;
+static int hf_mojito_origmjrversion;
+static int hf_mojito_origmnrversion;
+static int hf_mojito_kuid;
+static int hf_mojito_socketaddress_version;
+static int hf_mojito_socketaddress_ipv4;
+static int hf_mojito_socketaddress_ipv6;
+static int hf_mojito_socketaddress_port;
+static int hf_mojito_instanceid;
+static int hf_mojito_flags;
+static int hf_mojito_flags_shutdown;
+static int hf_mojito_flags_firewalled;
+static int hf_mojito_extendedlength;
+static int hf_mojito_kuidcount;
+static int hf_mojito_bigintegerlen;
+static int hf_mojito_bigintegerval;
+static int hf_mojito_dhtvaluetype;
+static int hf_mojito_sectokenlen;
+static int hf_mojito_sectoken;
+static int hf_mojito_contactcount;
+static int hf_mojito_contactvendor;
+static int hf_mojito_contactversion;
+static int hf_mojito_contactkuid;
+static int hf_mojito_dhtvaluecount;
+static int hf_mojito_dhtvalue_kuid;
+static int hf_mojito_target_kuid;
+static int hf_mojito_dhtvalue_valuetype;
+static int hf_mojito_dhtvalue_version;
+static int hf_mojito_dhtvalue_length;
+static int hf_mojito_dhtvalue_value;
+static int hf_mojito_bigint_value_one;
+static int hf_mojito_bigint_value_two;
+static int hf_mojito_bigint_value_three;
+static int hf_mojito_bigint_value_four;
+static int hf_mojito_storestatuscode_count;
+static int hf_mojito_storestatuscode_code;
+static int hf_mojito_storestatuscode_kuid;
+static int hf_mojito_storestatuscode_secondary_kuid;
+static int hf_mojito_requestload;
 #if 0
-static int hf_mojito_startflag = -1;
-static int hf_mojito_endflag = -1;
-static int hf_mojito_priorityflag = -1;
+static int hf_mojito_startflag;
+static int hf_mojito_endflag;
+static int hf_mojito_priorityflag;
 #endif
-static int hf_mojito_opcode_data = -1;
+static int hf_mojito_opcode_data;
 
 /* Initialize the subtree pointers */
-static gint ett_mojito = -1;
-static gint ett_mojito_header = -1;
-static gint ett_mojito_header_version = -1;
-static gint ett_mojito_contact = -1;
-static gint ett_mojito_contact_version = -1;
-static gint ett_mojito_socket_address = -1;
-static gint ett_mojito_flags = -1;
-static gint ett_mojito_bigint = -1;
-static gint ett_mojito_opcode = -1;
-static gint ett_mojito_dht_version = -1;
-static gint ett_mojito_dht = -1;
-static gint ett_mojito_status_code = -1;
-static gint ett_mojito_kuids = -1;
-
-static expert_field ei_mojito_socketaddress_unknown = EI_INIT;
-static expert_field ei_mojito_bigint_unsupported = EI_INIT;
+static gint ett_mojito;
+static gint ett_mojito_header;
+static gint ett_mojito_header_version;
+static gint ett_mojito_contact;
+static gint ett_mojito_contact_version;
+static gint ett_mojito_socket_address;
+static gint ett_mojito_flags;
+static gint ett_mojito_bigint;
+static gint ett_mojito_opcode;
+static gint ett_mojito_dht_version;
+static gint ett_mojito_dht;
+static gint ett_mojito_status_code;
+static gint ett_mojito_kuids;
+
+static expert_field ei_mojito_socketaddress_unknown;
+static expert_field ei_mojito_bigint_unsupported;
 
 typedef struct mojito_header_data {
 	guint8 opcode;
diff --git a/epan/dissectors/packet-moldudp.c b/epan/dissectors/packet-moldudp.c
index d6e885bbaf..e5be9dfb83 100644
--- a/epan/dissectors/packet-moldudp.c
+++ b/epan/dissectors/packet-moldudp.c
@@ -23,14 +23,14 @@ void proto_reg_handoff_moldudp(void);
 static dissector_handle_t moldudp_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_moldudp       = -1;
-static int hf_moldudp_session  = -1;
-static int hf_moldudp_sequence = -1;
-static int hf_moldudp_count    = -1;
-static int hf_moldudp_msgblk   = -1;
-static int hf_moldudp_msgseq   = -1;
-static int hf_moldudp_msglen   = -1;
-static int hf_moldudp_msgdata  = -1;
+static int proto_moldudp;
+static int hf_moldudp_session;
+static int hf_moldudp_sequence;
+static int hf_moldudp_count;
+static int hf_moldudp_msgblk;
+static int hf_moldudp_msgseq;
+static int hf_moldudp_msglen;
+static int hf_moldudp_msgdata;
 
 #define MOLDUDP_SESSION_LEN  10
 #define MOLDUDP_SEQUENCE_LEN  4
@@ -40,11 +40,11 @@ static int hf_moldudp_msgdata  = -1;
 #define MOLDUDP_HEARTBEAT 0x0000
 
 /* Initialize the subtree pointers */
-static gint ett_moldudp        = -1;
-static gint ett_moldudp_msgblk = -1;
+static gint ett_moldudp;
+static gint ett_moldudp_msgblk;
 
-static expert_field ei_moldudp_msglen_invalid = EI_INIT;
-static expert_field ei_moldudp_count_invalid = EI_INIT;
+static expert_field ei_moldudp_msglen_invalid;
+static expert_field ei_moldudp_count_invalid;
 
 static dissector_table_t moldudp_payload_table;
 
diff --git a/epan/dissectors/packet-moldudp64.c b/epan/dissectors/packet-moldudp64.c
index 5126b65e4a..fc320f866b 100644
--- a/epan/dissectors/packet-moldudp64.c
+++ b/epan/dissectors/packet-moldudp64.c
@@ -23,14 +23,14 @@ void proto_reg_handoff_moldudp64(void);
 static dissector_handle_t moldudp64_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_moldudp64       = -1;
-static int hf_moldudp64_session  = -1;
-static int hf_moldudp64_sequence = -1;
-static int hf_moldudp64_count    = -1;
-static int hf_moldudp64_msgblk   = -1;
-static int hf_moldudp64_msglen   = -1;
-static int hf_moldudp64_msgseq   = -1;
-static int hf_moldudp64_msgdata  = -1;
+static int proto_moldudp64;
+static int hf_moldudp64_session;
+static int hf_moldudp64_sequence;
+static int hf_moldudp64_count;
+static int hf_moldudp64_msgblk;
+static int hf_moldudp64_msglen;
+static int hf_moldudp64_msgseq;
+static int hf_moldudp64_msgdata;
 
 #define MOLDUDP64_SESSION_LEN  10
 #define MOLDUDP64_SEQUENCE_LEN  8
@@ -41,13 +41,13 @@ static int hf_moldudp64_msgdata  = -1;
 #define MOLDUDP64_ENDOFSESS 0xFFFF
 
 /* Initialize the subtree pointers */
-static gint ett_moldudp64        = -1;
-static gint ett_moldudp64_msgblk = -1;
+static gint ett_moldudp64;
+static gint ett_moldudp64_msgblk;
 
-static expert_field ei_moldudp64_msglen_invalid = EI_INIT;
-static expert_field ei_moldudp64_end_of_session_extra = EI_INIT;
-static expert_field ei_moldudp64_count_invalid = EI_INIT;
-static expert_field ei_moldudp64_request = EI_INIT;
+static expert_field ei_moldudp64_msglen_invalid;
+static expert_field ei_moldudp64_end_of_session_extra;
+static expert_field ei_moldudp64_count_invalid;
+static expert_field ei_moldudp64_request;
 
 static dissector_table_t moldudp64_payload_table;
 
diff --git a/epan/dissectors/packet-mongo.c b/epan/dissectors/packet-mongo.c
index a7bf02c05c..ba5c25dfe5 100644
--- a/epan/dissectors/packet-mongo.c
+++ b/epan/dissectors/packet-mongo.c
@@ -180,120 +180,120 @@ static const value_string binary_type_vals[] = {
 };
 #endif
 
-static int proto_mongo = -1;
-static int hf_mongo_message_length = -1;
-static int hf_mongo_request_id = -1;
-static int hf_mongo_response_to = -1;
-static int hf_mongo_op_code = -1;
-static int hf_mongo_fullcollectionname = -1;
-static int hf_mongo_database_name = -1;
-static int hf_mongo_collection_name = -1;
-static int hf_mongo_reply_flags = -1;
-static int hf_mongo_reply_flags_cursornotfound = -1;
-static int hf_mongo_reply_flags_queryfailure = -1;
-static int hf_mongo_reply_flags_sharedconfigstale = -1;
-static int hf_mongo_reply_flags_awaitcapable = -1;
-static int hf_mongo_cursor_id = -1;
-static int hf_mongo_starting_from = -1;
-static int hf_mongo_number_returned = -1;
-static int hf_mongo_message = -1;
-static int hf_mongo_zero = -1;
-static int hf_mongo_update_flags = -1;
-static int hf_mongo_update_flags_upsert = -1;
-static int hf_mongo_update_flags_multiupdate = -1;
-static int hf_mongo_selector = -1;
-static int hf_mongo_update = -1;
-static int hf_mongo_insert_flags = -1;
-static int hf_mongo_insert_flags_continueonerror = -1;
-static int hf_mongo_query_flags = -1;
-static int hf_mongo_query_flags_tailablecursor = -1;
-static int hf_mongo_query_flags_slaveok = -1;
-static int hf_mongo_query_flags_oplogreplay = -1;
-static int hf_mongo_query_flags_nocursortimeout = -1;
-static int hf_mongo_query_flags_awaitdata = -1;
-static int hf_mongo_query_flags_exhaust = -1;
-static int hf_mongo_query_flags_partial = -1;
-static int hf_mongo_number_to_skip = -1;
-static int hf_mongo_number_to_return = -1;
-static int hf_mongo_query = -1;
-static int hf_mongo_return_field_selector = -1;
-static int hf_mongo_document = -1;
-static int hf_mongo_document_length = -1;
-static int hf_mongo_document_empty = -1;
-static int hf_mongo_delete_flags = -1;
-static int hf_mongo_delete_flags_singleremove = -1;
-static int hf_mongo_number_of_cursor_ids = -1;
-static int hf_mongo_elements = -1;
-static int hf_mongo_element_name = -1;
-static int hf_mongo_element_type = -1;
-static int hf_mongo_element_length = -1;
-static int hf_mongo_element_value_boolean = -1;
-static int hf_mongo_element_value_int32 = -1;
-static int hf_mongo_element_value_int64 = -1;
-static int hf_mongo_element_value_decimal128 = -1;
-static int hf_mongo_element_value_double = -1;
-static int hf_mongo_element_value_string = -1;
-static int hf_mongo_element_value_string_length = -1;
-static int hf_mongo_element_value_binary = -1;
-static int hf_mongo_element_value_binary_length = -1;
-static int hf_mongo_element_value_regex_pattern = -1;
-static int hf_mongo_element_value_regex_options = -1;
-static int hf_mongo_element_value_objectid = -1;
-static int hf_mongo_element_value_objectid_time = -1;
-static int hf_mongo_element_value_objectid_host = -1;
-static int hf_mongo_element_value_objectid_pid = -1;
-static int hf_mongo_element_value_objectid_machine_id = -1;
-static int hf_mongo_element_value_objectid_inc = -1;
-static int hf_mongo_element_value_db_ptr = -1;
-static int hf_mongo_element_value_js_code = -1;
-static int hf_mongo_element_value_js_scope = -1;
-static int hf_mongo_database = -1;
-static int hf_mongo_commandname = -1;
-static int hf_mongo_metadata = -1;
-static int hf_mongo_commandargs = -1;
-static int hf_mongo_commandreply = -1;
-static int hf_mongo_outputdocs = -1;
-static int hf_mongo_unknown = -1;
-static int hf_mongo_compression_info = -1;
-static int hf_mongo_original_op_code = -1;
-static int hf_mongo_uncompressed_size = -1;
-static int hf_mongo_compressor = -1;
-static int hf_mongo_compressed_data = -1;
-static int hf_mongo_unsupported_compressed = -1;
-static int hf_mongo_msg_flags = -1;
-static int hf_mongo_msg_flags_checksumpresent = -1;
-static int hf_mongo_msg_flags_moretocome = -1;
-static int hf_mongo_msg_flags_exhaustallowed = -1;
-static int hf_mongo_msg_sections_section = -1;
-static int hf_mongo_msg_sections_section_kind = -1;
-static int hf_mongo_msg_sections_section_body = -1;
-static int hf_mongo_msg_sections_section_doc_sequence = -1;
-static int hf_mongo_msg_sections_section_size = -1;
-static int hf_mongo_msg_sections_section_doc_sequence_id = -1;
-static int hf_mongo_msg_checksum = -1;
-static int hf_mongo_msg_checksum_status = -1;
-
-static gint ett_mongo = -1;
-static gint ett_mongo_doc = -1;
-static gint ett_mongo_elements = -1;
-static gint ett_mongo_element = -1;
-static gint ett_mongo_objectid = -1;
-static gint ett_mongo_machine_id = -1;
-static gint ett_mongo_code = -1;
-static gint ett_mongo_fcn = -1;
-static gint ett_mongo_flags = -1;
-static gint ett_mongo_compression_info = -1;
-static gint ett_mongo_sections = -1;
-static gint ett_mongo_section = -1;
-static gint ett_mongo_msg_flags = -1;
-static gint ett_mongo_doc_sequence= -1;
-
-static expert_field ei_mongo_document_recursion_exceeded = EI_INIT;
-static expert_field ei_mongo_document_length_bad = EI_INIT;
-static expert_field ei_mongo_unknown = EI_INIT;
-static expert_field ei_mongo_unsupported_compression = EI_INIT;
-static expert_field ei_mongo_too_large_compressed = EI_INIT;
-static expert_field ei_mongo_msg_checksum = EI_INIT;
+static int proto_mongo;
+static int hf_mongo_message_length;
+static int hf_mongo_request_id;
+static int hf_mongo_response_to;
+static int hf_mongo_op_code;
+static int hf_mongo_fullcollectionname;
+static int hf_mongo_database_name;
+static int hf_mongo_collection_name;
+static int hf_mongo_reply_flags;
+static int hf_mongo_reply_flags_cursornotfound;
+static int hf_mongo_reply_flags_queryfailure;
+static int hf_mongo_reply_flags_sharedconfigstale;
+static int hf_mongo_reply_flags_awaitcapable;
+static int hf_mongo_cursor_id;
+static int hf_mongo_starting_from;
+static int hf_mongo_number_returned;
+static int hf_mongo_message;
+static int hf_mongo_zero;
+static int hf_mongo_update_flags;
+static int hf_mongo_update_flags_upsert;
+static int hf_mongo_update_flags_multiupdate;
+static int hf_mongo_selector;
+static int hf_mongo_update;
+static int hf_mongo_insert_flags;
+static int hf_mongo_insert_flags_continueonerror;
+static int hf_mongo_query_flags;
+static int hf_mongo_query_flags_tailablecursor;
+static int hf_mongo_query_flags_slaveok;
+static int hf_mongo_query_flags_oplogreplay;
+static int hf_mongo_query_flags_nocursortimeout;
+static int hf_mongo_query_flags_awaitdata;
+static int hf_mongo_query_flags_exhaust;
+static int hf_mongo_query_flags_partial;
+static int hf_mongo_number_to_skip;
+static int hf_mongo_number_to_return;
+static int hf_mongo_query;
+static int hf_mongo_return_field_selector;
+static int hf_mongo_document;
+static int hf_mongo_document_length;
+static int hf_mongo_document_empty;
+static int hf_mongo_delete_flags;
+static int hf_mongo_delete_flags_singleremove;
+static int hf_mongo_number_of_cursor_ids;
+static int hf_mongo_elements;
+static int hf_mongo_element_name;
+static int hf_mongo_element_type;
+static int hf_mongo_element_length;
+static int hf_mongo_element_value_boolean;
+static int hf_mongo_element_value_int32;
+static int hf_mongo_element_value_int64;
+static int hf_mongo_element_value_decimal128;
+static int hf_mongo_element_value_double;
+static int hf_mongo_element_value_string;
+static int hf_mongo_element_value_string_length;
+static int hf_mongo_element_value_binary;
+static int hf_mongo_element_value_binary_length;
+static int hf_mongo_element_value_regex_pattern;
+static int hf_mongo_element_value_regex_options;
+static int hf_mongo_element_value_objectid;
+static int hf_mongo_element_value_objectid_time;
+static int hf_mongo_element_value_objectid_host;
+static int hf_mongo_element_value_objectid_pid;
+static int hf_mongo_element_value_objectid_machine_id;
+static int hf_mongo_element_value_objectid_inc;
+static int hf_mongo_element_value_db_ptr;
+static int hf_mongo_element_value_js_code;
+static int hf_mongo_element_value_js_scope;
+static int hf_mongo_database;
+static int hf_mongo_commandname;
+static int hf_mongo_metadata;
+static int hf_mongo_commandargs;
+static int hf_mongo_commandreply;
+static int hf_mongo_outputdocs;
+static int hf_mongo_unknown;
+static int hf_mongo_compression_info;
+static int hf_mongo_original_op_code;
+static int hf_mongo_uncompressed_size;
+static int hf_mongo_compressor;
+static int hf_mongo_compressed_data;
+static int hf_mongo_unsupported_compressed;
+static int hf_mongo_msg_flags;
+static int hf_mongo_msg_flags_checksumpresent;
+static int hf_mongo_msg_flags_moretocome;
+static int hf_mongo_msg_flags_exhaustallowed;
+static int hf_mongo_msg_sections_section;
+static int hf_mongo_msg_sections_section_kind;
+static int hf_mongo_msg_sections_section_body;
+static int hf_mongo_msg_sections_section_doc_sequence;
+static int hf_mongo_msg_sections_section_size;
+static int hf_mongo_msg_sections_section_doc_sequence_id;
+static int hf_mongo_msg_checksum;
+static int hf_mongo_msg_checksum_status;
+
+static gint ett_mongo;
+static gint ett_mongo_doc;
+static gint ett_mongo_elements;
+static gint ett_mongo_element;
+static gint ett_mongo_objectid;
+static gint ett_mongo_machine_id;
+static gint ett_mongo_code;
+static gint ett_mongo_fcn;
+static gint ett_mongo_flags;
+static gint ett_mongo_compression_info;
+static gint ett_mongo_sections;
+static gint ett_mongo_section;
+static gint ett_mongo_msg_flags;
+static gint ett_mongo_doc_sequence;
+
+static expert_field ei_mongo_document_recursion_exceeded;
+static expert_field ei_mongo_document_length_bad;
+static expert_field ei_mongo_unknown;
+static expert_field ei_mongo_unsupported_compression;
+static expert_field ei_mongo_too_large_compressed;
+static expert_field ei_mongo_msg_checksum;
 
 static int
 dissect_fullcollectionname(tvbuff_t *tvb, guint offset, proto_tree *tree)
diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c
index 537d0beba6..512d1fc7a9 100644
--- a/epan/dissectors/packet-mount.c
+++ b/epan/dissectors/packet-mount.c
@@ -22,69 +22,69 @@
 void proto_register_mount(void);
 void proto_reg_handoff_mount(void);
 
-static int proto_mount = -1;
-static int proto_sgi_mount = -1;
-static int hf_mount_procedure_v1 = -1;
-static int hf_mount_procedure_v2 = -1;
-static int hf_mount_procedure_v3 = -1;
-static int hf_sgi_mount_procedure_v1 = -1;
-static int hf_mount_path = -1;
-static int hf_mount3_status = -1;
-static int hf_mount_mountlist_hostname = -1;
-static int hf_mount_mountlist_directory = -1;
-static int hf_mount_mountlist = -1;
-static int hf_mount_groups_group = -1;
-static int hf_mount_groups = -1;
-static int hf_mount_exportlist_directory = -1;
-static int hf_mount_exportlist = -1;
-static int hf_mount_has_options = -1;
-static int hf_mount_options = -1;
-static int hf_mount_pathconf_link_max = -1;
-static int hf_mount_pathconf_max_canon = -1;
-static int hf_mount_pathconf_max_input = -1;
-static int hf_mount_pathconf_name_max = -1;
-static int hf_mount_pathconf_path_max = -1;
-static int hf_mount_pathconf_pipe_buf = -1;
-static int hf_mount_pathconf_vdisable = -1;
-static int hf_mount_pathconf_mask = -1;
-static int hf_mount_pathconf_error_all = -1;
-static int hf_mount_pathconf_error_link_max = -1;
-static int hf_mount_pathconf_error_max_canon = -1;
-static int hf_mount_pathconf_error_max_input = -1;
-static int hf_mount_pathconf_error_name_max = -1;
-static int hf_mount_pathconf_error_path_max = -1;
-static int hf_mount_pathconf_error_pipe_buf = -1;
-static int hf_mount_pathconf_chown_restricted = -1;
-static int hf_mount_pathconf_no_trunc = -1;
-static int hf_mount_pathconf_error_vdisable = -1;
-static int hf_mount_statvfs_bsize = -1;
-static int hf_mount_statvfs_frsize = -1;
-static int hf_mount_statvfs_blocks = -1;
-static int hf_mount_statvfs_bfree = -1;
-static int hf_mount_statvfs_bavail = -1;
-static int hf_mount_statvfs_files = -1;
-static int hf_mount_statvfs_ffree = -1;
-static int hf_mount_statvfs_favail = -1;
-static int hf_mount_statvfs_fsid = -1;
-static int hf_mount_statvfs_basetype = -1;
-static int hf_mount_statvfs_flag = -1;
-static int hf_mount_statvfs_flag_rdonly = -1;
-static int hf_mount_statvfs_flag_nosuid = -1;
-static int hf_mount_statvfs_flag_notrunc = -1;
-static int hf_mount_statvfs_flag_nodev = -1;
-static int hf_mount_statvfs_flag_grpid = -1;
-static int hf_mount_statvfs_flag_local = -1;
-static int hf_mount_statvfs_namemax = -1;
-static int hf_mount_statvfs_fstr = -1;
-static int hf_mount_flavors = -1;
-static int hf_mount_flavor = -1;
-
-static gint ett_mount = -1;
-static gint ett_mount_mountlist = -1;
-static gint ett_mount_groups = -1;
-static gint ett_mount_exportlist = -1;
-static gint ett_mount_pathconf_mask = -1;
-static gint ett_mount_statvfs_flag = -1;
+static int proto_mount;
+static int proto_sgi_mount;
+static int hf_mount_procedure_v1;
+static int hf_mount_procedure_v2;
+static int hf_mount_procedure_v3;
+static int hf_sgi_mount_procedure_v1;
+static int hf_mount_path;
+static int hf_mount3_status;
+static int hf_mount_mountlist_hostname;
+static int hf_mount_mountlist_directory;
+static int hf_mount_mountlist;
+static int hf_mount_groups_group;
+static int hf_mount_groups;
+static int hf_mount_exportlist_directory;
+static int hf_mount_exportlist;
+static int hf_mount_has_options;
+static int hf_mount_options;
+static int hf_mount_pathconf_link_max;
+static int hf_mount_pathconf_max_canon;
+static int hf_mount_pathconf_max_input;
+static int hf_mount_pathconf_name_max;
+static int hf_mount_pathconf_path_max;
+static int hf_mount_pathconf_pipe_buf;
+static int hf_mount_pathconf_vdisable;
+static int hf_mount_pathconf_mask;
+static int hf_mount_pathconf_error_all;
+static int hf_mount_pathconf_error_link_max;
+static int hf_mount_pathconf_error_max_canon;
+static int hf_mount_pathconf_error_max_input;
+static int hf_mount_pathconf_error_name_max;
+static int hf_mount_pathconf_error_path_max;
+static int hf_mount_pathconf_error_pipe_buf;
+static int hf_mount_pathconf_chown_restricted;
+static int hf_mount_pathconf_no_trunc;
+static int hf_mount_pathconf_error_vdisable;
+static int hf_mount_statvfs_bsize;
+static int hf_mount_statvfs_frsize;
+static int hf_mount_statvfs_blocks;
+static int hf_mount_statvfs_bfree;
+static int hf_mount_statvfs_bavail;
+static int hf_mount_statvfs_files;
+static int hf_mount_statvfs_ffree;
+static int hf_mount_statvfs_favail;
+static int hf_mount_statvfs_fsid;
+static int hf_mount_statvfs_basetype;
+static int hf_mount_statvfs_flag;
+static int hf_mount_statvfs_flag_rdonly;
+static int hf_mount_statvfs_flag_nosuid;
+static int hf_mount_statvfs_flag_notrunc;
+static int hf_mount_statvfs_flag_nodev;
+static int hf_mount_statvfs_flag_grpid;
+static int hf_mount_statvfs_flag_local;
+static int hf_mount_statvfs_namemax;
+static int hf_mount_statvfs_fstr;
+static int hf_mount_flavors;
+static int hf_mount_flavor;
+
+static gint ett_mount;
+static gint ett_mount_mountlist;
+static gint ett_mount_groups;
+static gint ett_mount_exportlist;
+static gint ett_mount_pathconf_mask;
+static gint ett_mount_statvfs_flag;
 
 /* RFC 1813, Page 107 */
 static const value_string mount3_mountstat3[] =
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c
index dea6571252..ecd0984780 100644
--- a/epan/dissectors/packet-mp2t.c
+++ b/epan/dissectors/packet-mp2t.c
@@ -42,26 +42,26 @@ static dissector_handle_t mpeg_sect_handle;
 
 static heur_dissector_list_t heur_subdissector_list;
 
-static int proto_mp2t = -1;
-static gint ett_mp2t = -1;
-static gint ett_mp2t_header = -1;
-static gint ett_mp2t_af = -1;
-static gint ett_mp2t_analysis = -1;
-static gint ett_stuff = -1;
-
-static int hf_mp2t_header = -1;
-static int hf_mp2t_sync_byte = -1;
-static int hf_mp2t_tei = -1;
-static int hf_mp2t_pusi = -1;
-static int hf_mp2t_tp = -1;
-static int hf_mp2t_pid = -1;
-static int hf_mp2t_tsc = -1;
-static int hf_mp2t_afc = -1;
-static int hf_mp2t_cc = -1;
-
-/* static int hf_mp2t_analysis_flags = -1; */
-static int hf_mp2t_analysis_skips = -1;
-static int hf_mp2t_analysis_drops = -1;
+static int proto_mp2t;
+static gint ett_mp2t;
+static gint ett_mp2t_header;
+static gint ett_mp2t_af;
+static gint ett_mp2t_analysis;
+static gint ett_stuff;
+
+static int hf_mp2t_header;
+static int hf_mp2t_sync_byte;
+static int hf_mp2t_tei;
+static int hf_mp2t_pusi;
+static int hf_mp2t_tp;
+static int hf_mp2t_pid;
+static int hf_mp2t_tsc;
+static int hf_mp2t_afc;
+static int hf_mp2t_cc;
+
+/* static int hf_mp2t_analysis_flags; */
+static int hf_mp2t_analysis_skips;
+static int hf_mp2t_analysis_drops;
 
 #define MP2T_SYNC_BYTE_MASK  0xFF000000
 #define MP2T_TEI_MASK        0x00800000
@@ -81,16 +81,16 @@ static int hf_mp2t_analysis_drops = -1;
 #define MP2T_AFC_SHIFT         4
 #define MP2T_CC_SHIFT          0
 
-static int hf_mp2t_af = -1;
-static int hf_mp2t_af_length = -1;
-static int hf_mp2t_af_di = -1;
-static int hf_mp2t_af_rai = -1;
-static int hf_mp2t_af_espi = -1;
-static int hf_mp2t_af_pcr_flag = -1;
-static int hf_mp2t_af_opcr_flag = -1;
-static int hf_mp2t_af_sp_flag = -1;
-static int hf_mp2t_af_tpd_flag = -1;
-static int hf_mp2t_af_afe_flag = -1;
+static int hf_mp2t_af;
+static int hf_mp2t_af_length;
+static int hf_mp2t_af_di;
+static int hf_mp2t_af_rai;
+static int hf_mp2t_af_espi;
+static int hf_mp2t_af_pcr_flag;
+static int hf_mp2t_af_opcr_flag;
+static int hf_mp2t_af_sp_flag;
+static int hf_mp2t_af_tpd_flag;
+static int hf_mp2t_af_afe_flag;
 
 #define MP2T_AF_DI_MASK     0x80
 #define MP2T_AF_RAI_MASK    0x40
@@ -110,44 +110,44 @@ static int hf_mp2t_af_afe_flag = -1;
 #define MP2T_AF_TPD_SHIFT    1
 #define MP2T_AF_AFE_SHIFT    0
 
-static int hf_mp2t_af_pcr = -1;
-static int hf_mp2t_af_opcr = -1;
+static int hf_mp2t_af_pcr;
+static int hf_mp2t_af_opcr;
 
-static int hf_mp2t_af_sc = -1;
+static int hf_mp2t_af_sc;
 
-static int hf_mp2t_af_tpd_length = -1;
-static int hf_mp2t_af_tpd = -1;
+static int hf_mp2t_af_tpd_length;
+static int hf_mp2t_af_tpd;
 
-static int hf_mp2t_af_e_length = -1;
-static int hf_mp2t_af_e_ltw_flag = -1;
-static int hf_mp2t_af_e_pr_flag = -1;
-static int hf_mp2t_af_e_ss_flag = -1;
-static int hf_mp2t_af_e_reserved = -1;
+static int hf_mp2t_af_e_length;
+static int hf_mp2t_af_e_ltw_flag;
+static int hf_mp2t_af_e_pr_flag;
+static int hf_mp2t_af_e_ss_flag;
+static int hf_mp2t_af_e_reserved;
 
 #define MP2T_AF_E_LTW_FLAG_MASK   0x80
 #define MP2T_AF_E_PR_FLAG_MASK    0x40
 #define MP2T_AF_E_SS_FLAG_MASK    0x20
 
-static int hf_mp2t_af_e_reserved_bytes = -1;
-static int hf_mp2t_af_stuffing_bytes = -1;
+static int hf_mp2t_af_e_reserved_bytes;
+static int hf_mp2t_af_stuffing_bytes;
 
-static int hf_mp2t_af_e_ltwv_flag = -1;
-static int hf_mp2t_af_e_ltwo = -1;
+static int hf_mp2t_af_e_ltwv_flag;
+static int hf_mp2t_af_e_ltwo;
 
-static int hf_mp2t_af_e_pr_reserved = -1;
-static int hf_mp2t_af_e_pr = -1;
+static int hf_mp2t_af_e_pr_reserved;
+static int hf_mp2t_af_e_pr;
 
-static int hf_mp2t_af_e_st = -1;
-static int hf_mp2t_af_e_dnau_32_30 = -1;
-static int hf_mp2t_af_e_m_1 = -1;
-static int hf_mp2t_af_e_dnau_29_15 = -1;
-static int hf_mp2t_af_e_m_2 = -1;
-static int hf_mp2t_af_e_dnau_14_0 = -1;
-static int hf_mp2t_af_e_m_3 = -1;
+static int hf_mp2t_af_e_st;
+static int hf_mp2t_af_e_dnau_32_30;
+static int hf_mp2t_af_e_m_1;
+static int hf_mp2t_af_e_dnau_29_15;
+static int hf_mp2t_af_e_m_2;
+static int hf_mp2t_af_e_dnau_14_0;
+static int hf_mp2t_af_e_m_3;
 
-/* static int hf_mp2t_payload = -1; */
-static int hf_mp2t_stuff_bytes = -1;
-static int hf_mp2t_pointer = -1;
+/* static int hf_mp2t_payload; */
+static int hf_mp2t_stuff_bytes;
+static int hf_mp2t_pointer;
 
 /* proto data keys. Note that the packet_analysis_data structure is stored
  * using the layer number, but since that is at wmem_file_scope() while
@@ -216,24 +216,24 @@ static const value_string mp2t_afc_vals[] = {
     { 0, NULL }
 };
 
-static gint ett_msg_fragment = -1;
-static gint ett_msg_fragments = -1;
-static int hf_msg_fragments = -1;
-static int hf_msg_fragment = -1;
-static int hf_msg_fragment_overlap = -1;
-static int hf_msg_fragment_overlap_conflicts = -1;
-static int hf_msg_fragment_multiple_tails = -1;
-static int hf_msg_fragment_too_long_fragment = -1;
-static int hf_msg_fragment_error = -1;
-static int hf_msg_fragment_count = -1;
-static int hf_msg_reassembled_in = -1;
-static int hf_msg_reassembled_length = -1;
-
-static int hf_msg_ts_packet_reassembled = -1;
-
-static expert_field ei_mp2t_pointer = EI_INIT;
-static expert_field ei_mp2t_cc_drop = EI_INIT;
-static expert_field ei_mp2t_invalid_afc = EI_INIT;
+static gint ett_msg_fragment;
+static gint ett_msg_fragments;
+static int hf_msg_fragments;
+static int hf_msg_fragment;
+static int hf_msg_fragment_overlap;
+static int hf_msg_fragment_overlap_conflicts;
+static int hf_msg_fragment_multiple_tails;
+static int hf_msg_fragment_too_long_fragment;
+static int hf_msg_fragment_error;
+static int hf_msg_fragment_count;
+static int hf_msg_reassembled_in;
+static int hf_msg_reassembled_length;
+
+static int hf_msg_ts_packet_reassembled;
+
+static expert_field ei_mp2t_pointer;
+static expert_field ei_mp2t_cc_drop;
+static expert_field ei_mp2t_invalid_afc;
 
 static const fragment_items mp2t_msg_frag_items = {
     /* Fragment subtrees */
diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c
index 0f22c09a6b..10f9a16bc7 100644
--- a/epan/dissectors/packet-mp4ves.c
+++ b/epan/dissectors/packet-mp4ves.c
@@ -28,32 +28,32 @@ void proto_register_mp4ves(void);
 void proto_reg_handoff_mp4ves(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_mp4ves	= -1;
-
-static int hf_mp4ves_config = -1;
-static int hf_mp4ves_start_code_prefix = -1;
-static int hf_mp4ves_start_code = -1;
-static int hf_mp4ves_vop_coding_type = -1;
-static int hf_mp4ves_profile_and_level_indication = -1;
-static int hf_mp4ves_is_visual_object_identifier = -1;
-static int hf_mp4ves_visual_object_type = -1;
-static int hf_mp4ves_video_signal_type = -1;
-static int hf_mp4ves_stuffing = -1;
-static int hf_mp4ves_video_object_type_indication = -1;
-static int hf_mp4ves_random_accessible_vol = -1;
-static int hf_mp4ves_is_object_layer_identifier = -1;
-static int hf_mp4ves_aspect_ratio_info = -1;
-static int hf_mp4ves_vol_control_parameters = -1;
-static int hf_mp4ves_video_object_layer_shape = -1;
-static int hf_mp4ves_user_data = -1;
-static int hf_mp4ves_data = -1;
+static int proto_mp4ves;
+
+static int hf_mp4ves_config;
+static int hf_mp4ves_start_code_prefix;
+static int hf_mp4ves_start_code;
+static int hf_mp4ves_vop_coding_type;
+static int hf_mp4ves_profile_and_level_indication;
+static int hf_mp4ves_is_visual_object_identifier;
+static int hf_mp4ves_visual_object_type;
+static int hf_mp4ves_video_signal_type;
+static int hf_mp4ves_stuffing;
+static int hf_mp4ves_video_object_type_indication;
+static int hf_mp4ves_random_accessible_vol;
+static int hf_mp4ves_is_object_layer_identifier;
+static int hf_mp4ves_aspect_ratio_info;
+static int hf_mp4ves_vol_control_parameters;
+static int hf_mp4ves_video_object_layer_shape;
+static int hf_mp4ves_user_data;
+static int hf_mp4ves_data;
 
 /* Initialize the subtree pointers */
-static int ett_mp4ves = -1;
-static int ett_mp4ves_config = -1;
+static int ett_mp4ves;
+static int ett_mp4ves_config;
 
-static expert_field ei_mp4ves_config_too_short = EI_INIT;
-static expert_field ei_mp4ves_not_dissected_bits = EI_INIT;
+static expert_field ei_mp4ves_config_too_short;
+static expert_field ei_mp4ves_not_dissected_bits;
 
 static dissector_handle_t mp4ves_name_handle;
 
diff --git a/epan/dissectors/packet-mpeg-ca.c b/epan/dissectors/packet-mpeg-ca.c
index 96d9042d4a..859f075bce 100644
--- a/epan/dissectors/packet-mpeg-ca.c
+++ b/epan/dissectors/packet-mpeg-ca.c
@@ -20,14 +20,14 @@ void proto_reg_handoff_mpeg_ca(void);
 
 static dissector_handle_t mpeg_ca_handle;
 
-static int proto_mpeg_ca = -1;
-static int hf_mpeg_ca_reserved = -1;
-static int hf_mpeg_ca_version_number = -1;
-static int hf_mpeg_ca_current_next_indicator = -1;
-static int hf_mpeg_ca_section_number = -1;
-static int hf_mpeg_ca_last_section_number = -1;
-
-static gint ett_mpeg_ca = -1;
+static int proto_mpeg_ca;
+static int hf_mpeg_ca_reserved;
+static int hf_mpeg_ca_version_number;
+static int hf_mpeg_ca_current_next_indicator;
+static int hf_mpeg_ca_section_number;
+static int hf_mpeg_ca_last_section_number;
+
+static gint ett_mpeg_ca;
 
 #define MPEG_CA_RESERVED_MASK                   0xFFFFC0
 #define MPEG_CA_VERSION_NUMBER_MASK             0x00003E
diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c
index ab6785a1a3..e3a92552bc 100644
--- a/epan/dissectors/packet-mpeg-descriptor.c
+++ b/epan/dissectors/packet-mpeg-descriptor.c
@@ -18,12 +18,12 @@
 
 void proto_register_mpeg_descriptor(void);
 
-static int proto_mpeg_descriptor = -1;
-static int hf_mpeg_descriptor_tag = -1;
-static int hf_mpeg_descriptor_length = -1;
-static int hf_mpeg_descriptor_data = -1;
+static int proto_mpeg_descriptor;
+static int hf_mpeg_descriptor_tag;
+static int hf_mpeg_descriptor_length;
+static int hf_mpeg_descriptor_data;
 
-static gint ett_mpeg_descriptor = -1;
+static gint ett_mpeg_descriptor;
 
 static const value_string mpeg_descriptor_tag_vals[] = {
     /* From ISO/IEC 13818-1 */
@@ -177,15 +177,15 @@ static const value_string mpeg_descriptor_tag_vals[] = {
 static value_string_ext mpeg_descriptor_tag_vals_ext = VALUE_STRING_EXT_INIT(mpeg_descriptor_tag_vals);
 
 /* 0x02 Video Stream Descriptor */
-static int hf_mpeg_descr_video_stream_multiple_frame_rate_flag = -1;
-static int hf_mpeg_descr_video_stream_frame_rate_code = -1;
-static int hf_mpeg_descr_video_stream_mpeg1_only_flag = -1;
-static int hf_mpeg_descr_video_stream_constrained_parameter_flag = -1;
-static int hf_mpeg_descr_video_stream_still_picture_flag = -1;
-static int hf_mpeg_descr_video_stream_profile_and_level_indication = -1;
-static int hf_mpeg_descr_video_stream_chroma_format = -1;
-static int hf_mpeg_descr_video_stream_frame_rate_extension_flag = -1;
-static int hf_mpeg_descr_video_stream_reserved = -1;
+static int hf_mpeg_descr_video_stream_multiple_frame_rate_flag;
+static int hf_mpeg_descr_video_stream_frame_rate_code;
+static int hf_mpeg_descr_video_stream_mpeg1_only_flag;
+static int hf_mpeg_descr_video_stream_constrained_parameter_flag;
+static int hf_mpeg_descr_video_stream_still_picture_flag;
+static int hf_mpeg_descr_video_stream_profile_and_level_indication;
+static int hf_mpeg_descr_video_stream_chroma_format;
+static int hf_mpeg_descr_video_stream_frame_rate_extension_flag;
+static int hf_mpeg_descr_video_stream_reserved;
 
 #define MPEG_DESCR_VIDEO_STREAM_MULTIPLE_FRAME_RATE_FLAG_MASK   0x80
 #define MPEG_DESCR_VIDEO_STREAM_FRAME_RATE_CODE_MASK            0x78
@@ -230,11 +230,11 @@ proto_mpeg_descriptor_dissect_video_stream(tvbuff_t *tvb, guint offset, proto_tr
 }
 
 /* 0x03 Audio Stream Descriptor */
-static int hf_mpeg_descr_audio_stream_free_format_flag = -1;
-static int hf_mpeg_descr_audio_stream_id = -1;
-static int hf_mpeg_descr_audio_stream_layer = -1;
-static int hf_mpeg_descr_audio_stream_variable_rate_audio_indicator = -1;
-static int hf_mpeg_descr_audio_stream_reserved = -1;
+static int hf_mpeg_descr_audio_stream_free_format_flag;
+static int hf_mpeg_descr_audio_stream_id;
+static int hf_mpeg_descr_audio_stream_layer;
+static int hf_mpeg_descr_audio_stream_variable_rate_audio_indicator;
+static int hf_mpeg_descr_audio_stream_reserved;
 
 #define MPEG_DESCR_AUDIO_STREAM_FREE_FORMAT_FLAG_MASK                   0x80
 #define MPEG_DESCR_AUDIO_STREAM_ID_MASK                                 0x40
@@ -474,8 +474,8 @@ static const value_string mpeg_descr_registration_reg_form_vals[] = {
     { 0x00, NULL }
 };
 
-static int hf_mpeg_descr_reg_form_id = -1;
-static int hf_mpeg_descr_reg_add_id_inf = -1;
+static int hf_mpeg_descr_reg_form_id;
+static int hf_mpeg_descr_reg_add_id_inf;
 
 static void
 proto_mpeg_descriptor_dissect_registration(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree)
@@ -493,7 +493,7 @@ proto_mpeg_descriptor_dissect_registration(tvbuff_t *tvb, guint offset, guint le
 }
 
 /* 0x06 Data Stream Alignment Descriptor */
-static int hf_mpeg_descr_data_stream_alignment = -1;
+static int hf_mpeg_descr_data_stream_alignment;
 
 static const value_string mpeg_descr_data_stream_alignment_vals[] = {
     { 0x00, "Reserved" },
@@ -512,10 +512,10 @@ proto_mpeg_descriptor_dissect_data_stream_alignment(tvbuff_t *tvb, guint offset,
 }
 
 /* 0x09 CA Descriptor */
-static int hf_mpeg_descr_ca_system_id = -1;
-static int hf_mpeg_descr_ca_reserved = -1;
-static int hf_mpeg_descr_ca_pid = -1;
-static int hf_mpeg_descr_ca_private = -1;
+static int hf_mpeg_descr_ca_system_id;
+static int hf_mpeg_descr_ca_reserved;
+static int hf_mpeg_descr_ca_pid;
+static int hf_mpeg_descr_ca_private;
 
 #define MPEG_DESCR_CA_RESERVED_MASK 0xE000
 #define MPEG_DESCR_CA_PID_MASK      0x1FFF
@@ -536,8 +536,8 @@ proto_mpeg_descriptor_dissect_ca(tvbuff_t *tvb, guint offset, guint len, proto_t
 
 
 /* 0x0A ISO 639 Language Descriptor */
-static int hf_mpeg_descr_iso639_lang = -1;
-static int hf_mpeg_descr_iso639_type = -1;
+static int hf_mpeg_descr_iso639_lang;
+static int hf_mpeg_descr_iso639_type;
 
 static const value_string mpeg_descr_iso639_type_vals[] = {
     { 0x00, "Undefined" },
@@ -558,11 +558,11 @@ proto_mpeg_descriptor_dissect_iso639(tvbuff_t *tvb, guint offset, guint len, pro
 }
 
 /* 0x0B System Clock Descriptor */
-static int hf_mpeg_descr_system_clock_external_clock_reference_indicator = -1;
-static int hf_mpeg_descr_system_clock_reserved1 = -1;
-static int hf_mpeg_descr_system_clock_accuracy_integer = -1;
-static int hf_mpeg_descr_system_clock_accuracy_exponent = -1;
-static int hf_mpeg_descr_system_clock_reserved2 = -1;
+static int hf_mpeg_descr_system_clock_external_clock_reference_indicator;
+static int hf_mpeg_descr_system_clock_reserved1;
+static int hf_mpeg_descr_system_clock_accuracy_integer;
+static int hf_mpeg_descr_system_clock_accuracy_exponent;
+static int hf_mpeg_descr_system_clock_reserved2;
 
 #define MPEG_DESCR_SYSTEM_CLOCK_EXTERNAL_CLOCK_REFERENCE_INDICATOR_MASK 0x80
 #define MPEG_DESCR_SYSTEM_CLOCK_RESERVED1_MASK                          0x40
@@ -583,8 +583,8 @@ proto_mpeg_descriptor_dissect_system_clock(tvbuff_t *tvb, guint offset, proto_tr
 }
 
 /* 0x0E Maximum Bitrate Descriptor */
-static int hf_mpeg_descr_max_bitrate_reserved = -1;
-static int hf_mpeg_descr_max_bitrate = -1;
+static int hf_mpeg_descr_max_bitrate_reserved;
+static int hf_mpeg_descr_max_bitrate;
 
 #define MPEG_DESCR_MAX_BITRATE_RESERVED_MASK    0xC00000
 #define MPEG_DESCR_MAX_BITRATE_MASK     0x3FFFFF
@@ -603,10 +603,10 @@ proto_mpeg_descriptor_dissect_max_bitrate(tvbuff_t *tvb, guint offset, proto_tre
 }
 
 /* 0x10 Smoothing Buffer Descriptor */
-static int hf_mpeg_descr_smoothing_buffer_reserved1 = -1;
-static int hf_mpeg_descr_smoothing_buffer_leak_rate = -1;
-static int hf_mpeg_descr_smoothing_buffer_reserved2 = -1;
-static int hf_mpeg_descr_smoothing_buffer_size = -1;
+static int hf_mpeg_descr_smoothing_buffer_reserved1;
+static int hf_mpeg_descr_smoothing_buffer_leak_rate;
+static int hf_mpeg_descr_smoothing_buffer_reserved2;
+static int hf_mpeg_descr_smoothing_buffer_size;
 
 #define MPEG_DESCR_SMOOTHING_BUFFER_RESERVED1_MASK  0xC00000
 #define MPEG_DESCR_SMOOTHING_BUFFER_LEAK_RATE_MASK  0x3FFFFF
@@ -632,8 +632,8 @@ proto_mpeg_descriptor_dissect_smoothing_buffer(tvbuff_t *tvb, guint offset, prot
 }
 
 /* 0x11 STD Descriptor */
-static int hf_mpeg_descr_std_reserved = -1;
-static int hf_mpeg_descr_std_leak_valid = -1;
+static int hf_mpeg_descr_std_reserved;
+static int hf_mpeg_descr_std_leak_valid;
 
 #define MPEG_DESCR_STD_RESERVED_MASK    0xFE
 #define MPEG_DESCR_STD_LEAK_VALID_MASK  0x01
@@ -646,18 +646,18 @@ proto_mpeg_descriptor_dissect_std(tvbuff_t *tvb, guint offset, proto_tree *tree)
 }
 
 /* 0x13 Carousel Identifier Descriptor */
-static int hf_mpeg_descr_carousel_identifier_id = -1;
-static int hf_mpeg_descr_carousel_identifier_format_id = -1;
-static int hf_mpeg_descr_carousel_identifier_module_version = -1;
-static int hf_mpeg_descr_carousel_identifier_module_id = -1;
-static int hf_mpeg_descr_carousel_identifier_block_size = -1;
-static int hf_mpeg_descr_carousel_identifier_module_size = -1;
-static int hf_mpeg_descr_carousel_identifier_compression_method = -1;
-static int hf_mpeg_descr_carousel_identifier_original_size = -1;
-static int hf_mpeg_descr_carousel_identifier_timeout = -1;
-static int hf_mpeg_descr_carousel_identifier_object_key_len = -1;
-static int hf_mpeg_descr_carousel_identifier_object_key_data = -1;
-static int hf_mpeg_descr_carousel_identifier_private = -1;
+static int hf_mpeg_descr_carousel_identifier_id;
+static int hf_mpeg_descr_carousel_identifier_format_id;
+static int hf_mpeg_descr_carousel_identifier_module_version;
+static int hf_mpeg_descr_carousel_identifier_module_id;
+static int hf_mpeg_descr_carousel_identifier_block_size;
+static int hf_mpeg_descr_carousel_identifier_module_size;
+static int hf_mpeg_descr_carousel_identifier_compression_method;
+static int hf_mpeg_descr_carousel_identifier_original_size;
+static int hf_mpeg_descr_carousel_identifier_timeout;
+static int hf_mpeg_descr_carousel_identifier_object_key_len;
+static int hf_mpeg_descr_carousel_identifier_object_key_data;
+static int hf_mpeg_descr_carousel_identifier_private;
 
 static const value_string mpeg_descr_carousel_identifier_format_id_vals[] = {
     { 0x00, "No Format Specifier" },
@@ -723,13 +723,13 @@ proto_mpeg_descriptor_dissect_carousel_identifier(tvbuff_t *tvb, guint offset, g
 }
 
 /* 0x14 Association Tag Descriptor */
-static int hf_mpeg_descr_association_tag = -1;
-static int hf_mpeg_descr_association_tag_use = -1;
-static int hf_mpeg_descr_association_tag_selector_len = -1;
-static int hf_mpeg_descr_association_tag_transaction_id = -1;
-static int hf_mpeg_descr_association_tag_timeout = -1;
-static int hf_mpeg_descr_association_tag_selector_bytes = -1;
-static int hf_mpeg_descr_association_tag_private_bytes = -1;
+static int hf_mpeg_descr_association_tag;
+static int hf_mpeg_descr_association_tag_use;
+static int hf_mpeg_descr_association_tag_selector_len;
+static int hf_mpeg_descr_association_tag_transaction_id;
+static int hf_mpeg_descr_association_tag_timeout;
+static int hf_mpeg_descr_association_tag_selector_bytes;
+static int hf_mpeg_descr_association_tag_private_bytes;
 
 static void
 proto_mpeg_descriptor_dissect_association_tag(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree)
@@ -768,15 +768,15 @@ proto_mpeg_descriptor_dissect_association_tag(tvbuff_t *tvb, guint offset, guint
 }
 
 /* 0x28 AVC Video Descriptor */
-static int hf_mpeg_descr_avc_vid_profile_idc = -1;
-static int hf_mpeg_descr_avc_vid_constraint_set0_flag = -1;
-static int hf_mpeg_descr_avc_vid_constraint_set1_flag = -1;
-static int hf_mpeg_descr_avc_vid_constraint_set2_flag = -1;
-static int hf_mpeg_descr_avc_vid_compatible_flags = -1;
-static int hf_mpeg_descr_avc_vid_level_idc = -1;
-static int hf_mpeg_descr_avc_vid_still_present = -1;
-static int hf_mpeg_descr_avc_vid_24h_picture_flag = -1;
-static int hf_mpeg_descr_avc_vid_reserved = -1;
+static int hf_mpeg_descr_avc_vid_profile_idc;
+static int hf_mpeg_descr_avc_vid_constraint_set0_flag;
+static int hf_mpeg_descr_avc_vid_constraint_set1_flag;
+static int hf_mpeg_descr_avc_vid_constraint_set2_flag;
+static int hf_mpeg_descr_avc_vid_compatible_flags;
+static int hf_mpeg_descr_avc_vid_level_idc;
+static int hf_mpeg_descr_avc_vid_still_present;
+static int hf_mpeg_descr_avc_vid_24h_picture_flag;
+static int hf_mpeg_descr_avc_vid_reserved;
 
 #define MPEG_DESCR_AVC_VID_CONSTRAINT_SET0_FLAG_MASK    0x80
 #define MPEG_DESCR_AVC_VID_CONSTRAINT_SET1_FLAG_MASK    0x40
@@ -807,8 +807,8 @@ proto_mpeg_descriptor_dissect_avc_vid(tvbuff_t *tvb, guint offset, proto_tree *t
 }
 
 /* 0x40 Network Name Descriptor */
-static int hf_mpeg_descr_network_name_encoding = -1;
-static int hf_mpeg_descr_network_name_descriptor = -1;
+static int hf_mpeg_descr_network_name_encoding;
+static int hf_mpeg_descr_network_name_descriptor;
 
 static void
 proto_mpeg_descriptor_dissect_network_name(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree)
@@ -821,10 +821,10 @@ proto_mpeg_descriptor_dissect_network_name(tvbuff_t *tvb, guint offset, guint le
 }
 
 /* 0x41 Service List Descriptor */
-static int hf_mpeg_descr_service_list_id = -1;
-static int hf_mpeg_descr_service_list_type = -1;
+static int hf_mpeg_descr_service_list_id;
+static int hf_mpeg_descr_service_list_type;
 
-static gint ett_mpeg_descriptor_service_list = -1;
+static gint ett_mpeg_descriptor_service_list;
 
 static void
 proto_mpeg_descriptor_dissect_service_list(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree)
@@ -850,7 +850,7 @@ proto_mpeg_descriptor_dissect_service_list(tvbuff_t *tvb, guint offset, guint le
 }
 
 /* 0x42 Stuffing Descriptor */
-static int hf_mpeg_descr_stuffing = -1;
+static int hf_mpeg_descr_stuffing;
 
 static void
 proto_mpeg_descriptor_stuffing(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree)
@@ -859,16 +859,16 @@ proto_mpeg_descriptor_stuffing(tvbuff_t *tvb, guint offset, guint len, proto_tre
 }
 
 /* 0x43 Satellite Delivery System Descriptor */
-static int hf_mpeg_descr_satellite_delivery_frequency = -1;
-static int hf_mpeg_descr_satellite_delivery_orbital_position = -1;
-static int hf_mpeg_descr_satellite_delivery_west_east_flag = -1;
-static int hf_mpeg_descr_satellite_delivery_polarization = -1;
-static int hf_mpeg_descr_satellite_delivery_roll_off = -1;
-static int hf_mpeg_descr_satellite_delivery_zero = -1;
-static int hf_mpeg_descr_satellite_delivery_modulation_system = -1;
-static int hf_mpeg_descr_satellite_delivery_modulation_type = -1;
-static int hf_mpeg_descr_satellite_delivery_symbol_rate = -1;
-static int hf_mpeg_descr_satellite_delivery_fec_inner = -1;
+static int hf_mpeg_descr_satellite_delivery_frequency;
+static int hf_mpeg_descr_satellite_delivery_orbital_position;
+static int hf_mpeg_descr_satellite_delivery_west_east_flag;
+static int hf_mpeg_descr_satellite_delivery_polarization;
+static int hf_mpeg_descr_satellite_delivery_roll_off;
+static int hf_mpeg_descr_satellite_delivery_zero;
+static int hf_mpeg_descr_satellite_delivery_modulation_system;
+static int hf_mpeg_descr_satellite_delivery_modulation_type;
+static int hf_mpeg_descr_satellite_delivery_symbol_rate;
+static int hf_mpeg_descr_satellite_delivery_fec_inner;
 
 #define MPEG_DESCR_SATELLITE_DELIVERY_WEST_EAST_FLAG_MASK       0x80
 #define MPEG_DESCR_SATELLITE_DELIVERY_POLARIZATION_MASK         0x60
@@ -984,12 +984,12 @@ proto_mpeg_descriptor_dissect_satellite_delivery(tvbuff_t *tvb, guint offset, pr
 }
 
 /* 0x44 Cable Delivery System Descriptor */
-static int hf_mpeg_descr_cable_delivery_frequency = -1;
-static int hf_mpeg_descr_cable_delivery_reserved = -1;
-static int hf_mpeg_descr_cable_delivery_fec_outer = -1;
-static int hf_mpeg_descr_cable_delivery_modulation = -1;
-static int hf_mpeg_descr_cable_delivery_symbol_rate = -1;
-static int hf_mpeg_descr_cable_delivery_fec_inner = -1;
+static int hf_mpeg_descr_cable_delivery_frequency;
+static int hf_mpeg_descr_cable_delivery_reserved;
+static int hf_mpeg_descr_cable_delivery_fec_outer;
+static int hf_mpeg_descr_cable_delivery_modulation;
+static int hf_mpeg_descr_cable_delivery_symbol_rate;
+static int hf_mpeg_descr_cable_delivery_fec_inner;
 
 #define MPEG_DESCR_CABLE_DELIVERY_RESERVED_MASK     0xFFF0
 #define MPEG_DESCR_CABLE_DELIVERY_FEC_OUTER_MASK    0x000F
@@ -1065,18 +1065,18 @@ proto_mpeg_descriptor_dissect_cable_delivery(tvbuff_t *tvb, guint offset, proto_
 }
 
 /* 0x45 VBI Data Descriptor */
-static int hf_mpeg_descr_vbi_data_service_id = -1;
-static int hf_mpeg_descr_vbi_data_descr_len = -1;
-static int hf_mpeg_descr_vbi_data_reserved1 = -1;
-static int hf_mpeg_descr_vbi_data_field_parity = -1;
-static int hf_mpeg_descr_vbi_data_line_offset = -1;
-static int hf_mpeg_descr_vbi_data_reserved2 = -1;
+static int hf_mpeg_descr_vbi_data_service_id;
+static int hf_mpeg_descr_vbi_data_descr_len;
+static int hf_mpeg_descr_vbi_data_reserved1;
+static int hf_mpeg_descr_vbi_data_field_parity;
+static int hf_mpeg_descr_vbi_data_line_offset;
+static int hf_mpeg_descr_vbi_data_reserved2;
 
 #define MPEG_DESCR_VBI_DATA_RESERVED1_MASK  0xC0
 #define MPEG_DESCR_VBI_DATA_FIELD_PARITY_MASK   0x20
 #define MPEG_DESCR_VBI_DATA_LINE_OFFSET_MASK    0x1F
 
-static gint ett_mpeg_descriptor_vbi_data_service = -1;
+static gint ett_mpeg_descriptor_vbi_data_service;
 
 static const value_string mpeg_descr_vbi_data_service_id_vals[] = {
 
@@ -1145,8 +1145,8 @@ proto_mpeg_descriptor_dissect_vbi_data(tvbuff_t *tvb, guint offset, guint len, p
 }
 
 /* 0x47 Bouquet Name Descriptor */
-static int hf_mpeg_descr_bouquet_name_encoding = -1;
-static int hf_mpeg_descr_bouquet_name = -1;
+static int hf_mpeg_descr_bouquet_name_encoding;
+static int hf_mpeg_descr_bouquet_name;
 
 static void
 proto_mpeg_descriptor_dissect_bouquet_name(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree)
@@ -1159,13 +1159,13 @@ proto_mpeg_descriptor_dissect_bouquet_name(tvbuff_t *tvb, guint offset, guint le
 }
 
 /* 0x48 Service Descriptor */
-static int hf_mpeg_descr_service_type = -1;
-static int hf_mpeg_descr_service_provider_name_length = -1;
-static int hf_mpeg_descr_service_provider_name_encoding = -1;
-static int hf_mpeg_descr_service_provider = -1;
-static int hf_mpeg_descr_service_name_length = -1;
-static int hf_mpeg_descr_service_name_encoding = -1;
-static int hf_mpeg_descr_service_name = -1;
+static int hf_mpeg_descr_service_type;
+static int hf_mpeg_descr_service_provider_name_length;
+static int hf_mpeg_descr_service_provider_name_encoding;
+static int hf_mpeg_descr_service_provider;
+static int hf_mpeg_descr_service_name_length;
+static int hf_mpeg_descr_service_name_encoding;
+static int hf_mpeg_descr_service_name;
 
 static const value_string mpeg_descr_service_type_vals[] = {
 
@@ -1243,11 +1243,11 @@ proto_mpeg_descriptor_dissect_service(tvbuff_t *tvb, guint offset, proto_tree *t
 }
 
 /* 0x49 Country Availability Descriptor */
-static int hf_mpeg_descr_country_availability_flag = -1;
-static int hf_mpeg_descr_country_availability_reserved_future_use = -1;
-static int hf_mpeg_descr_country_availability_country_code = -1;
+static int hf_mpeg_descr_country_availability_flag;
+static int hf_mpeg_descr_country_availability_reserved_future_use;
+static int hf_mpeg_descr_country_availability_country_code;
 
-static gint ett_mpeg_descriptor_country_availability_countries = -1;
+static gint ett_mpeg_descriptor_country_availability_countries;
 
 #define MPEG_DESCR_COUNTRY_AVAILABILITY_FLAG_MASK           0x80
 #define MPEG_DESCR_COUNTRY_AVAILABILITY_RESERVED_MASK       0x7F
@@ -1279,31 +1279,31 @@ proto_mpeg_descriptor_dissect_country_availability_descriptor(tvbuff_t *tvb, gui
 }
 
 /* 0x4A Linkage Descriptor */
-static int hf_mpeg_descr_linkage_transport_stream_id = -1;
-static int hf_mpeg_descr_linkage_original_network_id = -1;
-static int hf_mpeg_descr_linkage_service_id = -1;
-static int hf_mpeg_descr_linkage_linkage_type = -1;
+static int hf_mpeg_descr_linkage_transport_stream_id;
+static int hf_mpeg_descr_linkage_original_network_id;
+static int hf_mpeg_descr_linkage_service_id;
+static int hf_mpeg_descr_linkage_linkage_type;
 
-static int hf_mpeg_descr_linkage_hand_over_type = -1;
-static int hf_mpeg_descr_linkage_reserved1 = -1;
-static int hf_mpeg_descr_linkage_origin_type = -1;
-static int hf_mpeg_descr_linkage_network_id = -1;
-static int hf_mpeg_descr_linkage_initial_service_id = -1;
+static int hf_mpeg_descr_linkage_hand_over_type;
+static int hf_mpeg_descr_linkage_reserved1;
+static int hf_mpeg_descr_linkage_origin_type;
+static int hf_mpeg_descr_linkage_network_id;
+static int hf_mpeg_descr_linkage_initial_service_id;
 
-static int hf_mpeg_descr_linkage_target_event_id = -1;
-static int hf_mpeg_descr_linkage_target_listed = -1;
-static int hf_mpeg_descr_linkage_event_simulcast = -1;
-static int hf_mpeg_descr_linkage_reserved2 = -1;
+static int hf_mpeg_descr_linkage_target_event_id;
+static int hf_mpeg_descr_linkage_target_listed;
+static int hf_mpeg_descr_linkage_event_simulcast;
+static int hf_mpeg_descr_linkage_reserved2;
 
-static int hf_mpeg_descr_linkage_interactive_network_id = -1;
-static int hf_mpeg_descr_linkage_population_id_loop_count = -1;
-static int hf_mpeg_descr_linkage_population_id = -1;
-static int hf_mpeg_descr_linkage_population_id_base = -1;
-static int hf_mpeg_descr_linkage_population_id_mask = -1;
+static int hf_mpeg_descr_linkage_interactive_network_id;
+static int hf_mpeg_descr_linkage_population_id_loop_count;
+static int hf_mpeg_descr_linkage_population_id;
+static int hf_mpeg_descr_linkage_population_id_base;
+static int hf_mpeg_descr_linkage_population_id_mask;
 
-static int hf_mpeg_descr_linkage_private_data_byte = -1;
+static int hf_mpeg_descr_linkage_private_data_byte;
 
-static gint ett_mpeg_descriptor_linkage_population_id = -1;
+static gint ett_mpeg_descriptor_linkage_population_id;
 
 #define MPEG_DESCR_LINKAGE_HAND_OVER_TYPE_MASK  0xF0
 #define MPEG_DESCR_LINKAGE_HAND_OVER_TYPE_SHIFT 0x04
@@ -1452,11 +1452,11 @@ proto_mpeg_descriptor_dissect_linkage(tvbuff_t *tvb, guint offset, guint len, pr
 }
 
 /* 0x4B NVOD Reference Descriptor */
-static int hf_mpeg_descr_nvod_reference_tsid = -1;
-static int hf_mpeg_descr_nvod_reference_onid = -1;
-static int hf_mpeg_descr_nvod_reference_sid  = -1;
+static int hf_mpeg_descr_nvod_reference_tsid;
+static int hf_mpeg_descr_nvod_reference_onid;
+static int hf_mpeg_descr_nvod_reference_sid;
 
-static gint ett_mpeg_descriptor_nvod_reference_triplet = -1;
+static gint ett_mpeg_descriptor_nvod_reference_triplet;
 
 static void
 proto_mpeg_descriptor_dissect_nvod_reference(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree)
@@ -1484,7 +1484,7 @@ proto_mpeg_descriptor_dissect_nvod_reference(tvbuff_t *tvb, guint offset, guint
 }
 
 /* 0x4C Time Shifted Service Descriptor */
-static int hf_mpeg_descr_time_shifted_service_id = -1;
+static int hf_mpeg_descr_time_shifted_service_id;
 
 static void
 proto_mpeg_descriptor_dissect_time_shifted_service(tvbuff_t *tvb, guint offset, proto_tree *tree)
@@ -1493,13 +1493,13 @@ proto_mpeg_descriptor_dissect_time_shifted_service(tvbuff_t *tvb, guint offset,
 }
 
 /* 0x4D Short Event Descriptor */
-static int hf_mpeg_descr_short_event_lang_code = -1;
-static int hf_mpeg_descr_short_event_name_length = -1;
-static int hf_mpeg_descr_short_event_name_encoding = -1;
-static int hf_mpeg_descr_short_event_name = -1;
-static int hf_mpeg_descr_short_event_text_length = -1;
-static int hf_mpeg_descr_short_event_text_encoding = -1;
-static int hf_mpeg_descr_short_event_text = -1;
+static int hf_mpeg_descr_short_event_lang_code;
+static int hf_mpeg_descr_short_event_name_length;
+static int hf_mpeg_descr_short_event_name_encoding;
+static int hf_mpeg_descr_short_event_name;
+static int hf_mpeg_descr_short_event_text_length;
+static int hf_mpeg_descr_short_event_text_encoding;
+static int hf_mpeg_descr_short_event_text;
 
 static void
 proto_mpeg_descriptor_dissect_short_event(tvbuff_t *tvb, guint offset, proto_tree *tree)
@@ -1536,22 +1536,22 @@ proto_mpeg_descriptor_dissect_short_event(tvbuff_t *tvb, guint offset, proto_tre
 }
 
 /* 0x4E Extended Event Descriptor */
-static int hf_mpeg_descr_extended_event_descriptor_number = -1;
-static int hf_mpeg_descr_extended_event_last_descriptor_number = -1;
-static int hf_mpeg_descr_extended_event_lang_code = -1;
-static int hf_mpeg_descr_extended_event_length_of_items = -1;
-static int hf_mpeg_descr_extended_event_item_description_length = -1;
-static int hf_mpeg_descr_extended_event_item_description_char = -1;
-static int hf_mpeg_descr_extended_event_item_length = -1;
-static int hf_mpeg_descr_extended_event_item_char = -1;
-static int hf_mpeg_descr_extended_event_text_length = -1;
-static int hf_mpeg_descr_extended_event_text_encoding = -1;
-static int hf_mpeg_descr_extended_event_text = -1;
+static int hf_mpeg_descr_extended_event_descriptor_number;
+static int hf_mpeg_descr_extended_event_last_descriptor_number;
+static int hf_mpeg_descr_extended_event_lang_code;
+static int hf_mpeg_descr_extended_event_length_of_items;
+static int hf_mpeg_descr_extended_event_item_description_length;
+static int hf_mpeg_descr_extended_event_item_description_char;
+static int hf_mpeg_descr_extended_event_item_length;
+static int hf_mpeg_descr_extended_event_item_char;
+static int hf_mpeg_descr_extended_event_text_length;
+static int hf_mpeg_descr_extended_event_text_encoding;
+static int hf_mpeg_descr_extended_event_text;
 
 #define MPEG_DESCR_EXTENDED_EVENT_DESCRIPTOR_NUMBER_MASK    0xF0
 #define MPEG_DESCR_EXTENDED_EVENT_LAST_DESCRIPTOR_NUMBER_MASK   0x0F
 
-static gint ett_mpeg_descriptor_extended_event_item = -1;
+static gint ett_mpeg_descriptor_extended_event_item;
 
 static void
 proto_mpeg_descriptor_dissect_extended_event(tvbuff_t *tvb, guint offset, proto_tree *tree)
@@ -1608,8 +1608,8 @@ proto_mpeg_descriptor_dissect_extended_event(tvbuff_t *tvb, guint offset, proto_
 }
 
 /* 0x4F Time Shifted Event Descriptor */
-static int hf_mpeg_descr_time_shifted_event_reference_service_id = -1;
-static int hf_mpeg_descr_time_shifted_event_reference_event_id = -1;
+static int hf_mpeg_descr_time_shifted_event_reference_service_id;
+static int hf_mpeg_descr_time_shifted_event_reference_event_id;
 
 static void
 proto_mpeg_descriptor_dissect_time_shifted_event(tvbuff_t *tvb, guint offset, proto_tree *tree)
@@ -1621,28 +1621,28 @@ proto_mpeg_descriptor_dissect_time_shifted_event(tvbuff_t *tvb, guint offset, pr
 }
 
 /* 0x50 Component Descriptor */
-static int hf_mpeg_descr_component_stream_content_ext = -1;
-static int hf_mpeg_descr_component_stream_content = -1;
-static int hf_mpeg_descr_component_type = -1;
-static int hf_mpeg_descr_component_content_type = -1;
-static int hf_mpeg_descr_component_tag = -1;
-static int hf_mpeg_descr_component_lang_code = -1;
-static int hf_mpeg_descr_component_text_encoding = -1;
-static int hf_mpeg_descr_component_text = -1;
-
-static int hf_mpeg_descr_component_high_stream_content_ext = -1;
-static int hf_mpeg_descr_component_high_stream_content = -1;
-static int hf_mpeg_descr_component_high_stream_content_both = -1;
-static int hf_mpeg_descr_component_high_component_type = -1;
-static int hf_mpeg_descr_component_high_stream_content_n_component_type = -1;
-
-static int hf_mpeg_descr_component_nga_bits_b7_reserved = -1;
-static int hf_mpeg_descr_component_nga_bits_b6_headphones = -1;
-static int hf_mpeg_descr_component_nga_bits_b5_interactivity = -1;
-static int hf_mpeg_descr_component_nga_bits_b4_dialogue_enhancement = -1;
-static int hf_mpeg_descr_component_nga_bits_b3_spoken_subtitles = -1;
-static int hf_mpeg_descr_component_nga_bits_b2_audio_description = -1;
-static int hf_mpeg_descr_component_nga_bits_b10_channel_layout = -1;
+static int hf_mpeg_descr_component_stream_content_ext;
+static int hf_mpeg_descr_component_stream_content;
+static int hf_mpeg_descr_component_type;
+static int hf_mpeg_descr_component_content_type;
+static int hf_mpeg_descr_component_tag;
+static int hf_mpeg_descr_component_lang_code;
+static int hf_mpeg_descr_component_text_encoding;
+static int hf_mpeg_descr_component_text;
+
+static int hf_mpeg_descr_component_high_stream_content_ext;
+static int hf_mpeg_descr_component_high_stream_content;
+static int hf_mpeg_descr_component_high_stream_content_both;
+static int hf_mpeg_descr_component_high_component_type;
+static int hf_mpeg_descr_component_high_stream_content_n_component_type;
+
+static int hf_mpeg_descr_component_nga_bits_b7_reserved;
+static int hf_mpeg_descr_component_nga_bits_b6_headphones;
+static int hf_mpeg_descr_component_nga_bits_b5_interactivity;
+static int hf_mpeg_descr_component_nga_bits_b4_dialogue_enhancement;
+static int hf_mpeg_descr_component_nga_bits_b3_spoken_subtitles;
+static int hf_mpeg_descr_component_nga_bits_b2_audio_description;
+static int hf_mpeg_descr_component_nga_bits_b10_channel_layout;
 
 #define MPEG_DESCR_COMPONENT_STREAM_CONTENT_EXT_MASK      0xF0
 #define MPEG_DESCR_COMPONENT_STREAM_CONTENT_MASK    0x0F
@@ -1662,7 +1662,7 @@ static int hf_mpeg_descr_component_nga_bits_b10_channel_layout = -1;
 #define MPEG_DESCR_COMPONENT_NGA_BITS_B2_MASK    0x0004
 #define MPEG_DESCR_COMPONENT_NGA_BITS_B10_MASK   0x0003
 
-static gint ett_mpeg_descriptor_component_content_type = -1;
+static gint ett_mpeg_descriptor_component_content_type;
 
 static const value_string mpeg_descr_component_stream_content_vals[] = {
 
@@ -1918,22 +1918,22 @@ mpeg_descr_component_tail:
 }
 
 /* 0x51 Mosaic Descriptor */
-static int hf_mpeg_descr_mosaic_mosaic_entry_point = -1;
-static int hf_mpeg_descr_mosaic_number_of_horizontal_elementary_cells = -1;
-static int hf_mpeg_descr_mosaic_reserved_future_use1 = -1;
-static int hf_mpeg_descr_mosaic_number_of_vertical_elementary_cells = -1;
-static int hf_mpeg_descr_mosaic_logical_cell_id = -1;
-static int hf_mpeg_descr_mosaic_reserved_future_use2 = -1;
-static int hf_mpeg_descr_mosaic_logical_cell_presentation_info = -1;
-static int hf_mpeg_descr_mosaic_elementary_cell_field_length = -1;
-static int hf_mpeg_descr_mosaic_reserved_future_use3 = -1;
-static int hf_mpeg_descr_mosaic_elementary_cell_id = -1;
-static int hf_mpeg_descr_mosaic_cell_linkage_info = -1;
-static int hf_mpeg_descr_mosaic_bouquet_id = -1;
-static int hf_mpeg_descr_mosaic_original_network_id = -1;
-static int hf_mpeg_descr_mosaic_transport_stream_id = -1;
-static int hf_mpeg_descr_mosaic_service_id = -1;
-static int hf_mpeg_descr_mosaic_event_id = -1;
+static int hf_mpeg_descr_mosaic_mosaic_entry_point;
+static int hf_mpeg_descr_mosaic_number_of_horizontal_elementary_cells;
+static int hf_mpeg_descr_mosaic_reserved_future_use1;
+static int hf_mpeg_descr_mosaic_number_of_vertical_elementary_cells;
+static int hf_mpeg_descr_mosaic_logical_cell_id;
+static int hf_mpeg_descr_mosaic_reserved_future_use2;
+static int hf_mpeg_descr_mosaic_logical_cell_presentation_info;
+static int hf_mpeg_descr_mosaic_elementary_cell_field_length;
+static int hf_mpeg_descr_mosaic_reserved_future_use3;
+static int hf_mpeg_descr_mosaic_elementary_cell_id;
+static int hf_mpeg_descr_mosaic_cell_linkage_info;
+static int hf_mpeg_descr_mosaic_bouquet_id;
+static int hf_mpeg_descr_mosaic_original_network_id;
+static int hf_mpeg_descr_mosaic_transport_stream_id;
+static int hf_mpeg_descr_mosaic_service_id;
+static int hf_mpeg_descr_mosaic_event_id;
 
 #define MPEG_DESCR_MOSAIC_ENTRY_POINT_MASK              0x80
 #define MPEG_DESCR_MOSAIC_NUM_OF_H_CELLS_MASK           0x70
@@ -1945,8 +1945,8 @@ static int hf_mpeg_descr_mosaic_event_id = -1;
 #define MPEG_DESCR_MOSAIC_RESERVED3_MASK                0xC0
 #define MPEG_DESCR_MOSAIC_ELEMENTARY_CELL_ID_MASK       0x3F
 
-static gint ett_mpeg_descriptor_mosaic_logical_cell = -1;
-static gint ett_mpeg_descriptor_mosaic_elementary_cells = -1;
+static gint ett_mpeg_descriptor_mosaic_logical_cell;
+static gint ett_mpeg_descriptor_mosaic_elementary_cells;
 
 static const value_string mpeg_descr_mosaic_number_of_e_cells_vals[] = {
     { 0x00, "One cell" },
@@ -2078,7 +2078,7 @@ proto_mpeg_descriptor_dissect_mosaic(tvbuff_t *tvb, guint offset, guint len, pro
 }
 
 /* 0x52 Stream Identifier Descriptor */
-static int hf_mpeg_descr_stream_identifier_component_tag = -1;
+static int hf_mpeg_descr_stream_identifier_component_tag;
 
 static void
 proto_mpeg_descriptor_dissect_stream_identifier(tvbuff_t *tvb, guint offset, proto_tree *tree)
@@ -2087,7 +2087,7 @@ proto_mpeg_descriptor_dissect_stream_identifier(tvbuff_t *tvb, guint offset, pro
 }
 
 /* 0x53 CA Identifier Descriptor */
-static int hf_mpeg_descr_ca_identifier_system_id = -1;
+static int hf_mpeg_descr_ca_identifier_system_id;
 
 static void
 proto_mpeg_descriptor_dissect_ca_identifier(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree)
@@ -2102,15 +2102,15 @@ proto_mpeg_descriptor_dissect_ca_identifier(tvbuff_t *tvb, guint offset, guint l
 }
 
 /* 0x54 Content Descriptor */
-static int hf_mpeg_descr_content_nibble = -1;
-static int hf_mpeg_descr_content_nibble_level_1 = -1;
-static int hf_mpeg_descr_content_nibble_level_2 = -1;
-static int hf_mpeg_descr_content_user_byte = -1;
+static int hf_mpeg_descr_content_nibble;
+static int hf_mpeg_descr_content_nibble_level_1;
+static int hf_mpeg_descr_content_nibble_level_2;
+static int hf_mpeg_descr_content_user_byte;
 
 #define MPEG_DESCR_CONTENT_NIBBLE_LEVEL_1_MASK  0xF0
 #define MPEG_DESCR_CONTENT_NIBBLE_LEVEL_2_MASK  0x0F
 
-static gint ett_mpeg_descriptor_content_nibble = -1;
+static gint ett_mpeg_descriptor_content_nibble;
 
 static const value_string mpeg_descr_content_nibble_vals[] = {
 
@@ -2260,8 +2260,8 @@ proto_mpeg_descriptor_dissect_content(tvbuff_t *tvb, guint offset, guint len, pr
 }
 
 /* 0x55 Parental Rating Descriptor */
-static int hf_mpeg_descr_parental_rating_country_code = -1;
-static int hf_mpeg_descr_parental_rating_rating = -1;
+static int hf_mpeg_descr_parental_rating_country_code;
+static int hf_mpeg_descr_parental_rating_rating;
 
 static const value_string mpeg_descr_parental_rating_vals[] = {
     { 0x00, "Undefined" },
@@ -2296,10 +2296,10 @@ proto_mpeg_descriptor_dissect_parental_rating(tvbuff_t *tvb, guint offset, proto
 }
 
 /* 0x56 Teletext Descriptor */
-static int hf_mpeg_descr_teletext_lang_code = -1;
-static int hf_mpeg_descr_teletext_type = -1;
-static int hf_mpeg_descr_teletext_magazine_number = -1;
-static int hf_mpeg_descr_teletext_page_number = -1;
+static int hf_mpeg_descr_teletext_lang_code;
+static int hf_mpeg_descr_teletext_type;
+static int hf_mpeg_descr_teletext_magazine_number;
+static int hf_mpeg_descr_teletext_page_number;
 
 #define MPEG_DESCR_TELETEXT_TYPE_MASK           0xF8
 #define MPEG_DESCR_TELETEXT_MAGAZINE_NUMBER_MASK    0x07
@@ -2335,22 +2335,22 @@ proto_mpeg_descriptor_dissect_teletext(tvbuff_t *tvb, guint offset, guint len, p
 }
 
 /* 0x57 Telephone Descriptor */
-static int hf_mpeg_descr_telephone_reserved_future_use1 = -1;
-static int hf_mpeg_descr_telephone_foreign_availability = -1;
-static int hf_mpeg_descr_telephone_connection_type = -1;
-static int hf_mpeg_descr_telephone_reserved_future_use2 = -1;
-static int hf_mpeg_descr_telephone_country_prefix_length = -1;
-static int hf_mpeg_descr_telephone_international_area_code_length = -1;
-static int hf_mpeg_descr_telephone_operator_code_length = -1;
-static int hf_mpeg_descr_telephone_reserved_future_use3 = -1;
-static int hf_mpeg_descr_telephone_national_area_code_length = -1;
-static int hf_mpeg_descr_telephone_core_number_length = -1;
-static int hf_mpeg_descr_telephone_number = -1;
-static int hf_mpeg_descr_telephone_country_prefix = -1;
-static int hf_mpeg_descr_telephone_international_area_code = -1;
-static int hf_mpeg_descr_telephone_operator_code = -1;
-static int hf_mpeg_descr_telephone_national_area_code = -1;
-static int hf_mpeg_descr_telephone_core_number = -1;
+static int hf_mpeg_descr_telephone_reserved_future_use1;
+static int hf_mpeg_descr_telephone_foreign_availability;
+static int hf_mpeg_descr_telephone_connection_type;
+static int hf_mpeg_descr_telephone_reserved_future_use2;
+static int hf_mpeg_descr_telephone_country_prefix_length;
+static int hf_mpeg_descr_telephone_international_area_code_length;
+static int hf_mpeg_descr_telephone_operator_code_length;
+static int hf_mpeg_descr_telephone_reserved_future_use3;
+static int hf_mpeg_descr_telephone_national_area_code_length;
+static int hf_mpeg_descr_telephone_core_number_length;
+static int hf_mpeg_descr_telephone_number;
+static int hf_mpeg_descr_telephone_country_prefix;
+static int hf_mpeg_descr_telephone_international_area_code;
+static int hf_mpeg_descr_telephone_operator_code;
+static int hf_mpeg_descr_telephone_national_area_code;
+static int hf_mpeg_descr_telephone_core_number;
 
 #define MPEG_DESCR_TELEPHONE_RESERVED1_MASK                 0xC0
 #define MPEG_DESCR_TELEPHONE_FOREIGN_AVAILABILITY_MASK      0x20
@@ -2376,7 +2376,7 @@ static const range_string mpeg_descr_telephone_connection_type_vals[] = {
     { 0, 0, NULL }
 };
 
-static gint ett_mpeg_descriptor_telephone_number = -1;
+static gint ett_mpeg_descriptor_telephone_number;
 
 static void
 proto_mpeg_descriptor_dissect_telephone(tvbuff_t *tvb, guint offset, proto_tree *tree)
@@ -2437,13 +2437,13 @@ proto_mpeg_descriptor_dissect_telephone(tvbuff_t *tvb, guint offset, proto_tree
 }
 
 /* 0x58 Local Time Offset Descriptor */
-static int hf_mpeg_descr_local_time_offset_country_code = -1;
-static int hf_mpeg_descr_local_time_offset_region_id = -1;
-static int hf_mpeg_descr_local_time_offset_reserved = -1;
-static int hf_mpeg_descr_local_time_offset_polarity = -1;
-static int hf_mpeg_descr_local_time_offset_offset = -1;
-static int hf_mpeg_descr_local_time_offset_time_of_change = -1;
-static int hf_mpeg_descr_local_time_offset_next_time_offset = -1;
+static int hf_mpeg_descr_local_time_offset_country_code;
+static int hf_mpeg_descr_local_time_offset_region_id;
+static int hf_mpeg_descr_local_time_offset_reserved;
+static int hf_mpeg_descr_local_time_offset_polarity;
+static int hf_mpeg_descr_local_time_offset_offset;
+static int hf_mpeg_descr_local_time_offset_time_of_change;
+static int hf_mpeg_descr_local_time_offset_next_time_offset;
 
 #define MPEG_DESCR_LOCAL_TIME_OFFSET_COUNTRY_REGION_ID_MASK 0xFC
 #define MPEG_DESCR_LOCAL_TIME_OFFSET_RESERVED_MASK      0x02
@@ -2499,10 +2499,10 @@ proto_mpeg_descriptor_dissect_local_time_offset(tvbuff_t *tvb, guint offset, gui
 }
 
 /* 0x59 Subtitling Descriptor */
-static int hf_mpeg_descr_subtitling_lang_code = -1;
-static int hf_mpeg_descr_subtitling_type = -1;
-static int hf_mpeg_descr_subtitling_composition_page_id = -1;
-static int hf_mpeg_descr_subtitling_ancillary_page_id = -1;
+static int hf_mpeg_descr_subtitling_lang_code;
+static int hf_mpeg_descr_subtitling_type;
+static int hf_mpeg_descr_subtitling_composition_page_id;
+static int hf_mpeg_descr_subtitling_ancillary_page_id;
 
 
 static const value_string mpeg_descr_subtitling_type_vals[] = {
@@ -2549,20 +2549,20 @@ proto_mpeg_descriptor_dissect_subtitling(tvbuff_t *tvb, guint offset, guint len,
 }
 
 /* 0x5A Terrestrial Delivery System Descriptor */
-static int hf_mpeg_descr_terrestrial_delivery_centre_frequency = -1;
-static int hf_mpeg_descr_terrestrial_delivery_bandwidth = -1;
-static int hf_mpeg_descr_terrestrial_delivery_priority = -1;
-static int hf_mpeg_descr_terrestrial_delivery_time_slicing_indicator = -1;
-static int hf_mpeg_descr_terrestrial_delivery_mpe_fec_indicator = -1;
-static int hf_mpeg_descr_terrestrial_delivery_reserved1 = -1;
-static int hf_mpeg_descr_terrestrial_delivery_constellation = -1;
-static int hf_mpeg_descr_terrestrial_delivery_hierarchy_information = -1;
-static int hf_mpeg_descr_terrestrial_delivery_code_rate_hp_stream = -1;
-static int hf_mpeg_descr_terrestrial_delivery_code_rate_lp_stream = -1;
-static int hf_mpeg_descr_terrestrial_delivery_guard_interval = -1;
-static int hf_mpeg_descr_terrestrial_delivery_transmission_mode = -1;
-static int hf_mpeg_descr_terrestrial_delivery_other_frequency_flag = -1;
-static int hf_mpeg_descr_terrestrial_delivery_reserved2 = -1;
+static int hf_mpeg_descr_terrestrial_delivery_centre_frequency;
+static int hf_mpeg_descr_terrestrial_delivery_bandwidth;
+static int hf_mpeg_descr_terrestrial_delivery_priority;
+static int hf_mpeg_descr_terrestrial_delivery_time_slicing_indicator;
+static int hf_mpeg_descr_terrestrial_delivery_mpe_fec_indicator;
+static int hf_mpeg_descr_terrestrial_delivery_reserved1;
+static int hf_mpeg_descr_terrestrial_delivery_constellation;
+static int hf_mpeg_descr_terrestrial_delivery_hierarchy_information;
+static int hf_mpeg_descr_terrestrial_delivery_code_rate_hp_stream;
+static int hf_mpeg_descr_terrestrial_delivery_code_rate_lp_stream;
+static int hf_mpeg_descr_terrestrial_delivery_guard_interval;
+static int hf_mpeg_descr_terrestrial_delivery_transmission_mode;
+static int hf_mpeg_descr_terrestrial_delivery_other_frequency_flag;
+static int hf_mpeg_descr_terrestrial_delivery_reserved2;
 
 #define MPEG_DESCR_TERRESTRIAL_DELIVERY_BANDWIDTH_MASK          0xE0
 #define MPEG_DESCR_TERRESTRIAL_DELIVERY_PRIORITY_MASK           0x10
@@ -2698,12 +2698,12 @@ proto_mpeg_descriptor_dissect_terrestrial_delivery(tvbuff_t *tvb, guint offset,
 }
 
 /* 0x5B Multilingual Network Name Descriptor */
-static int hf_mpeg_descr_multilng_network_name_desc_iso639_language_code = -1;
-static int hf_mpeg_descr_multilng_network_name_desc_name_length = -1;
-static int hf_mpeg_descr_multilng_network_name_desc_name_encoding = -1;
-static int hf_mpeg_descr_multilng_network_name_desc_name = -1;
+static int hf_mpeg_descr_multilng_network_name_desc_iso639_language_code;
+static int hf_mpeg_descr_multilng_network_name_desc_name_length;
+static int hf_mpeg_descr_multilng_network_name_desc_name_encoding;
+static int hf_mpeg_descr_multilng_network_name_desc_name;
 
-static gint ett_mpeg_descriptor_multilng_network_name_desc_lng = -1;
+static gint ett_mpeg_descriptor_multilng_network_name_desc_lng;
 
 static guint
 proto_mpeg_descriptor_dissect_multilng_network_name_desc_measure_lng_len(tvbuff_t *tvb, guint offset, guint len)
@@ -2767,12 +2767,12 @@ proto_mpeg_descriptor_dissect_multilng_network_name_desc(tvbuff_t *tvb, guint of
 }
 
 /* 0x5C Multilingual Bouquet Name Descriptor */
-static int hf_mpeg_descr_multilng_bouquet_name_desc_iso639_language_code = -1;
-static int hf_mpeg_descr_multilng_bouquet_name_desc_name_length = -1;
-static int hf_mpeg_descr_multilng_bouquet_name_desc_name_encoding = -1;
-static int hf_mpeg_descr_multilng_bouquet_name_desc_name = -1;
+static int hf_mpeg_descr_multilng_bouquet_name_desc_iso639_language_code;
+static int hf_mpeg_descr_multilng_bouquet_name_desc_name_length;
+static int hf_mpeg_descr_multilng_bouquet_name_desc_name_encoding;
+static int hf_mpeg_descr_multilng_bouquet_name_desc_name;
 
-static gint ett_mpeg_descriptor_multilng_bouquet_name_desc_lng = -1;
+static gint ett_mpeg_descriptor_multilng_bouquet_name_desc_lng;
 
 static guint
 proto_mpeg_descriptor_dissect_multilng_bouquet_name_desc_measure_lng_len(tvbuff_t *tvb, guint offset, guint len)
@@ -2836,15 +2836,15 @@ proto_mpeg_descriptor_dissect_multilng_bouquet_name_desc(tvbuff_t *tvb, guint of
 }
 
 /* 0x5D Multilingual Service Name Descriptor */
-static int hf_mpeg_descr_multilng_srv_name_desc_iso639_language_code = -1;
-static int hf_mpeg_descr_multilng_srv_name_desc_service_provider_name_length = -1;
-static int hf_mpeg_descr_multilng_srv_name_desc_service_provider_name_encoding = -1;
-static int hf_mpeg_descr_multilng_srv_name_desc_service_provider_name = -1;
-static int hf_mpeg_descr_multilng_srv_name_desc_service_name_length = -1;
-static int hf_mpeg_descr_multilng_srv_name_desc_service_name_encoding = -1;
-static int hf_mpeg_descr_multilng_srv_name_desc_service_name = -1;
+static int hf_mpeg_descr_multilng_srv_name_desc_iso639_language_code;
+static int hf_mpeg_descr_multilng_srv_name_desc_service_provider_name_length;
+static int hf_mpeg_descr_multilng_srv_name_desc_service_provider_name_encoding;
+static int hf_mpeg_descr_multilng_srv_name_desc_service_provider_name;
+static int hf_mpeg_descr_multilng_srv_name_desc_service_name_length;
+static int hf_mpeg_descr_multilng_srv_name_desc_service_name_encoding;
+static int hf_mpeg_descr_multilng_srv_name_desc_service_name;
 
-static gint ett_mpeg_descriptor_multilng_srv_name_desc_lng = -1;
+static gint ett_mpeg_descriptor_multilng_srv_name_desc_lng;
 
 static guint
 proto_mpeg_descriptor_dissect_multilng_srv_name_desc_measure_lng_len(tvbuff_t *tvb, guint offset, guint len)
@@ -2932,13 +2932,13 @@ proto_mpeg_descriptor_dissect_multilng_srv_name_desc(tvbuff_t *tvb, guint offset
 }
 
 /* 0x5E Multilingual Component Descriptor */
-static int hf_mpeg_descr_multilng_component_desc_iso639_language_code = -1;
-static int hf_mpeg_descr_multilng_component_desc_tag = -1;
-static int hf_mpeg_descr_multilng_component_desc_text_length = -1;
-static int hf_mpeg_descr_multilng_component_desc_text_encoding = -1;
-static int hf_mpeg_descr_multilng_component_desc_text = -1;
+static int hf_mpeg_descr_multilng_component_desc_iso639_language_code;
+static int hf_mpeg_descr_multilng_component_desc_tag;
+static int hf_mpeg_descr_multilng_component_desc_text_length;
+static int hf_mpeg_descr_multilng_component_desc_text_encoding;
+static int hf_mpeg_descr_multilng_component_desc_text;
 
-static gint ett_mpeg_descriptor_multilng_component_desc_lng = -1;
+static gint ett_mpeg_descriptor_multilng_component_desc_lng;
 
 static guint
 proto_mpeg_descriptor_dissect_multilng_component_desc_measure_lng_len(tvbuff_t *tvb, guint offset, guint len)
@@ -3007,7 +3007,7 @@ proto_mpeg_descriptor_dissect_multilng_component_desc(tvbuff_t *tvb, guint offse
 }
 
 /* 0x5F Private Data Specifier */
-static int hf_mpeg_descr_private_data_specifier_id = -1;
+static int hf_mpeg_descr_private_data_specifier_id;
 
 #define PRIVATE_DATA_SPECIFIER_RESERVED    0x00000000
 #define PRIVATE_DATA_SPECIFIER_NORDIG      0x00000029
@@ -3031,9 +3031,9 @@ proto_mpeg_descriptor_dissect_private_data_specifier(tvbuff_t *tvb, guint offset
 }
 
 /* 0x61 Short Smoothing Buffer Descriptor */
-static int hf_mpeg_descr_short_smoothing_buffer_sb_size = -1;
-static int hf_mpeg_descr_short_smoothing_buffer_sb_leak_rate = -1;
-static int hf_mpeg_descr_short_smoothing_buffer_dvb_reserved = -1;
+static int hf_mpeg_descr_short_smoothing_buffer_sb_size;
+static int hf_mpeg_descr_short_smoothing_buffer_sb_leak_rate;
+static int hf_mpeg_descr_short_smoothing_buffer_dvb_reserved;
 
 #define MPEG_DESCR_SHORT_SMOOTHING_BUFFER_SB_SIZE_MASK      0xC0
 #define MPEG_DESCR_SHORT_SMOOTHING_BUFFER_SB_LEAK_RATE_MASK 0x3F
@@ -3127,12 +3127,12 @@ proto_mpeg_descriptor_dissect_short_smoothing_buffer(tvbuff_t *tvb, guint offset
 }
 
 /* 0x63 Partial Transport Stream Descriptor */
-static int hf_mpeg_descr_partial_transport_stream_reserved_future_use1 = -1;
-static int hf_mpeg_descr_partial_transport_stream_peak_rate = -1;
-static int hf_mpeg_descr_partial_transport_stream_reserved_future_use2 = -1;
-static int hf_mpeg_descr_partial_transport_stream_minimum_overall_smoothing_rate = -1;
-static int hf_mpeg_descr_partial_transport_stream_reserved_future_use3 = -1;
-static int hf_mpeg_descr_partial_transport_stream_maximum_overall_smoothing_buffer = -1;
+static int hf_mpeg_descr_partial_transport_stream_reserved_future_use1;
+static int hf_mpeg_descr_partial_transport_stream_peak_rate;
+static int hf_mpeg_descr_partial_transport_stream_reserved_future_use2;
+static int hf_mpeg_descr_partial_transport_stream_minimum_overall_smoothing_rate;
+static int hf_mpeg_descr_partial_transport_stream_reserved_future_use3;
+static int hf_mpeg_descr_partial_transport_stream_maximum_overall_smoothing_buffer;
 
 #define PARTIAL_TRANSPORT_STREAM_DESCR_RESERVED_FUTURE_USE1_MASK   0xC00000
 #define PARTIAL_TRANSPORT_STREAM_DESCR_PEAK_RATE_MASK              0x3FFFFF
@@ -3170,13 +3170,13 @@ proto_mpeg_descriptor_dissect_partial_transport_stream(tvbuff_t *tvb, guint offs
 }
 
 /* 0x64 Data Broadcast Descriptor */
-static int hf_mpeg_descr_data_bcast_bcast_id = -1;
-static int hf_mpeg_descr_data_bcast_component_tag = -1;
-static int hf_mpeg_descr_data_bcast_selector_len = -1;
-static int hf_mpeg_descr_data_bcast_selector_bytes = -1;
-static int hf_mpeg_descr_data_bcast_lang_code = -1;
-static int hf_mpeg_descr_data_bcast_text_len = -1;
-static int hf_mpeg_descr_data_bcast_text = -1;
+static int hf_mpeg_descr_data_bcast_bcast_id;
+static int hf_mpeg_descr_data_bcast_component_tag;
+static int hf_mpeg_descr_data_bcast_selector_len;
+static int hf_mpeg_descr_data_bcast_selector_bytes;
+static int hf_mpeg_descr_data_bcast_lang_code;
+static int hf_mpeg_descr_data_bcast_text_len;
+static int hf_mpeg_descr_data_bcast_text;
 
 static const value_string mpeg_descr_data_bcast_id_vals[] = {
 
@@ -3235,8 +3235,8 @@ proto_mpeg_descriptor_dissect_data_bcast(tvbuff_t *tvb, guint offset, proto_tree
 }
 
 /* 0x66 Data Broadcast ID Descriptor */
-static int hf_mpeg_descr_data_bcast_id_bcast_id = -1;
-static int hf_mpeg_descr_data_bcast_id_id_selector_bytes = -1;
+static int hf_mpeg_descr_data_bcast_id_bcast_id;
+static int hf_mpeg_descr_data_bcast_id_id_selector_bytes;
 
 static void
 proto_mpeg_descriptor_dissect_data_bcast_id(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree)
@@ -3249,12 +3249,12 @@ proto_mpeg_descriptor_dissect_data_bcast_id(tvbuff_t *tvb, guint offset, guint l
 }
 
 /* 0x69 PDC Descriptor */
-static int hf_mpeg_descr_pdc_reserved = -1;
-static int hf_mpeg_descr_pdc_pil = -1;
-static int hf_mpeg_descr_pdc_day = -1;
-static int hf_mpeg_descr_pdc_month = -1;
-static int hf_mpeg_descr_pdc_hour = -1;
-static int hf_mpeg_descr_pdc_minute = -1;
+static int hf_mpeg_descr_pdc_reserved;
+static int hf_mpeg_descr_pdc_pil;
+static int hf_mpeg_descr_pdc_day;
+static int hf_mpeg_descr_pdc_month;
+static int hf_mpeg_descr_pdc_hour;
+static int hf_mpeg_descr_pdc_minute;
 
 #define MPEG_DESCR_PDC_RESERVED_MASK    0xF00000
 #define MPEG_DESCR_PDC_PIL_MASK         0x0FFFFF
@@ -3263,7 +3263,7 @@ static int hf_mpeg_descr_pdc_minute = -1;
 #define MPEG_DESCR_PDC_HOUR_MASK        0x0007C0
 #define MPEG_DESCR_PDC_MINUTE_MASK      0x00003F
 
-static gint ett_mpeg_descriptor_pdc_pil = -1;
+static gint ett_mpeg_descriptor_pdc_pil;
 
 static void
 proto_mpeg_descriptor_dissect_pdc(tvbuff_t *tvb, guint offset, proto_tree *tree)
@@ -3281,21 +3281,21 @@ proto_mpeg_descriptor_dissect_pdc(tvbuff_t *tvb, guint offset, proto_tree *tree)
 }
 
 /* 0x6A AC-3 Descriptor */
-static int hf_mpeg_descr_ac3_component_type_flag = -1;
-static int hf_mpeg_descr_ac3_bsid_flag = -1;
-static int hf_mpeg_descr_ac3_mainid_flag = -1;
-static int hf_mpeg_descr_ac3_asvc_flag = -1;
-static int hf_mpeg_descr_ac3_reserved = -1;
-static int hf_mpeg_descr_ac3_component_type_reserved_flag = -1;
-static int hf_mpeg_descr_ac3_component_type_full_service_flag = -1;
-static int hf_mpeg_descr_ac3_component_type_service_type_flags = -1;
-static int hf_mpeg_descr_ac3_component_type_number_of_channels_flags = -1;
-static int hf_mpeg_descr_ac3_bsid = -1;
-static int hf_mpeg_descr_ac3_mainid = -1;
-static int hf_mpeg_descr_ac3_asvc = -1;
-static int hf_mpeg_descr_ac3_additional_info = -1;
-
-static gint ett_mpeg_descriptor_ac3_component_type = -1;
+static int hf_mpeg_descr_ac3_component_type_flag;
+static int hf_mpeg_descr_ac3_bsid_flag;
+static int hf_mpeg_descr_ac3_mainid_flag;
+static int hf_mpeg_descr_ac3_asvc_flag;
+static int hf_mpeg_descr_ac3_reserved;
+static int hf_mpeg_descr_ac3_component_type_reserved_flag;
+static int hf_mpeg_descr_ac3_component_type_full_service_flag;
+static int hf_mpeg_descr_ac3_component_type_service_type_flags;
+static int hf_mpeg_descr_ac3_component_type_number_of_channels_flags;
+static int hf_mpeg_descr_ac3_bsid;
+static int hf_mpeg_descr_ac3_mainid;
+static int hf_mpeg_descr_ac3_asvc;
+static int hf_mpeg_descr_ac3_additional_info;
+
+static gint ett_mpeg_descriptor_ac3_component_type;
 
 #define MPEG_DESCR_AC3_COMPONENT_TYPE_FLAG_MASK 0x80
 #define MPEG_DESCR_AC3_BSID_FLAG_MASK           0x40
@@ -3413,8 +3413,8 @@ proto_mpeg_descriptor_dissect_ac3(tvbuff_t *tvb, guint offset, guint len, proto_
 }
 
 /* 0x6F Application Signalling Descriptor */
-static int hf_mpeg_descr_app_sig_app_type = -1;
-static int hf_mpeg_descr_app_sig_ait_ver = -1;
+static int hf_mpeg_descr_app_sig_app_type;
+static int hf_mpeg_descr_app_sig_ait_ver;
 
 static void
 proto_mpeg_descriptor_dissect_app_sig(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree)
@@ -3431,7 +3431,7 @@ proto_mpeg_descriptor_dissect_app_sig(tvbuff_t *tvb, guint offset, guint len, pr
 }
 
 /* 0x71 Service Identifier Descriptor */
-static int hf_mpeg_descr_service_identifier = -1;
+static int hf_mpeg_descr_service_identifier;
 
 static void
 proto_mpeg_descriptor_dissect_service_identifier(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree)
@@ -3440,14 +3440,14 @@ proto_mpeg_descriptor_dissect_service_identifier(tvbuff_t *tvb, guint offset, gu
 }
 
 /* 0x72 Service Availability Descriptor */
-static int hf_mpeg_descr_service_availability_flag = -1;
-static int hf_mpeg_descr_service_availability_reserved = -1;
-static int hf_mpeg_descr_service_availability_cell_id = -1;
+static int hf_mpeg_descr_service_availability_flag;
+static int hf_mpeg_descr_service_availability_reserved;
+static int hf_mpeg_descr_service_availability_cell_id;
 
 #define MPEG_DESCR_SRV_AVAIL_FLAG_MASK      0x80
 #define MPEG_DESCR_SRV_AVAIL_RESERVED_MASK  0x7F
 
-static gint ett_mpeg_descriptor_srv_avail_cells = -1;
+static gint ett_mpeg_descriptor_srv_avail_cells;
 
 static const value_string mpeg_descr_srv_avail_flag_vals[] = {
     { 0x0, "Service is unavailable on the cells" },
@@ -3476,7 +3476,7 @@ proto_mpeg_descriptor_dissect_service_availability(tvbuff_t *tvb, guint offset,
 }
 
 /* 0x73 Default Authority Descriptor */
-static int hf_mpeg_descr_default_authority_name = -1;
+static int hf_mpeg_descr_default_authority_name;
 
 static void
 proto_mpeg_descriptor_dissect_default_authority(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree)
@@ -3485,11 +3485,11 @@ proto_mpeg_descriptor_dissect_default_authority(tvbuff_t *tvb, guint offset, gui
 }
 
 /* 0x75 TVA ID Descriptor */
-static int hf_mpeg_descr_tva_id = -1;
-static int hf_mpeg_descr_tva_reserved = -1;
-static int hf_mpeg_descr_tva_running_status = -1;
+static int hf_mpeg_descr_tva_id;
+static int hf_mpeg_descr_tva_reserved;
+static int hf_mpeg_descr_tva_running_status;
 
-static gint ett_mpeg_descriptor_tva = -1;
+static gint ett_mpeg_descriptor_tva;
 
 #define MPEG_DESCR_TVA_RESREVED_MASK        0xF8
 #define MPEG_DESCR_TVA_RUNNING_STATUS_MASK  0x07
@@ -3528,16 +3528,16 @@ proto_mpeg_descriptor_dissect_tva_id(tvbuff_t *tvb, guint offset, guint len, pro
 }
 
 /* 0x76 Content Identifier Descriptor */
-static int hf_mpeg_descr_content_identifier_crid_type = -1;
-static int hf_mpeg_descr_content_identifier_crid_location = -1;
-static int hf_mpeg_descr_content_identifier_crid_length = -1;
-static int hf_mpeg_descr_content_identifier_crid_bytes = -1;
-static int hf_mpeg_descr_content_identifier_cird_ref = -1;
+static int hf_mpeg_descr_content_identifier_crid_type;
+static int hf_mpeg_descr_content_identifier_crid_location;
+static int hf_mpeg_descr_content_identifier_crid_length;
+static int hf_mpeg_descr_content_identifier_crid_bytes;
+static int hf_mpeg_descr_content_identifier_cird_ref;
 
 #define MPEG_DESCR_CONTENT_IDENTIFIER_CRID_TYPE_MASK        0xFC
 #define MPEG_DESCR_CONTENT_IDENTIFIER_CRID_LOCATION_MASK    0x03
 
-static gint ett_mpeg_descriptor_content_identifier_crid = -1;
+static gint ett_mpeg_descriptor_content_identifier_crid;
 
 static const value_string mpeg_descr_content_identifier_crid_type_vals[] = {
     { 0x00, "No type defined" },
@@ -3600,10 +3600,10 @@ proto_mpeg_descriptor_dissect_content_identifier(tvbuff_t *tvb, guint offset, gu
 }
 
 /* 0x7D XAIT Content Location Descriptor */
-static int hf_mpeg_descr_xait_onid = -1;
-static int hf_mpeg_descr_xait_sid = -1;
-static int hf_mpeg_descr_xait_version_number = -1;
-static int hf_mpeg_descr_xait_update_policy = -1;
+static int hf_mpeg_descr_xait_onid;
+static int hf_mpeg_descr_xait_sid;
+static int hf_mpeg_descr_xait_version_number;
+static int hf_mpeg_descr_xait_update_policy;
 
 #define MPEG_DESCR_XAIT_VERSION_NUM_MASK    0xF8
 #define MPEG_DESCR_XAIT_UPDATE_POLICY_MASK  0x07
@@ -3628,11 +3628,11 @@ proto_mpeg_descriptor_dissect_xait(tvbuff_t *tvb, guint offset, proto_tree *tree
 }
 
 /* 0x7E FTA Content Management Descriptor */
-static int hf_mpeg_descr_fta_user_defined = -1;
-static int hf_mpeg_descr_fta_reserved_future_use = -1;
-static int hf_mpeg_descr_fta_do_not_scramble = -1;
-static int hf_mpeg_descr_fta_control_remote_access_over_internet = -1;
-static int hf_mpeg_descr_fta_do_not_apply_revocation = -1;
+static int hf_mpeg_descr_fta_user_defined;
+static int hf_mpeg_descr_fta_reserved_future_use;
+static int hf_mpeg_descr_fta_do_not_scramble;
+static int hf_mpeg_descr_fta_control_remote_access_over_internet;
+static int hf_mpeg_descr_fta_do_not_apply_revocation;
 
 #define MPEG_DESCR_FTA_USER_DEFINED_MASK 0x80
 #define MPEG_DESCR_FTA_RESERVED_MASK 0x70
@@ -3661,15 +3661,15 @@ proto_mpeg_descriptor_dissect_fta(tvbuff_t *tvb, guint offset, proto_tree *tree)
 }
 
 /* 0x7F Extension Descriptor */
-static int hf_mpeg_descr_extension_tag_extension = -1;
-static int hf_mpeg_descr_extension_data = -1;
+static int hf_mpeg_descr_extension_tag_extension;
+static int hf_mpeg_descr_extension_data;
 /* Supplementary Audio (Sub-)Descriptor */
-static int hf_mpeg_descr_extension_supp_audio_mix_type = -1;
-static int hf_mpeg_descr_extension_supp_audio_ed_cla = -1;
-static int hf_mpeg_descr_extension_supp_audio_lang_code_present = -1;
-static int hf_mpeg_descr_extension_supp_audio_lang_code = -1;
+static int hf_mpeg_descr_extension_supp_audio_mix_type;
+static int hf_mpeg_descr_extension_supp_audio_ed_cla;
+static int hf_mpeg_descr_extension_supp_audio_lang_code_present;
+static int hf_mpeg_descr_extension_supp_audio_lang_code;
 
-static int hf_mpeg_descr_private_data = -1;
+static int hf_mpeg_descr_private_data;
 
 #define EXT_TAG_IMG_ICON      0x00
 #define EXT_TAG_CPCM_DLV      0x01
@@ -3772,26 +3772,26 @@ proto_mpeg_descriptor_dissect_extension(tvbuff_t *tvb, guint offset, guint len,
 #define MPEG_DESCR_AC3_SYSA_LANG1_MASK 0x80
 #define MPEG_DESCR_AC3_SYSA_LANG2_MASK 0x40
 
-static int hf_mpeg_descr_ac3_sysa_srate = -1;
-static int hf_mpeg_descr_ac3_sysa_bsid = -1;
-static int hf_mpeg_descr_ac3_sysa_bitrate = -1;
-static int hf_mpeg_descr_ac3_sysa_bitrate_limit = -1;
-static int hf_mpeg_descr_ac3_sysa_surround = -1;
-static int hf_mpeg_descr_ac3_sysa_bsmod = -1;
-static int hf_mpeg_descr_ac3_sysa_num_channels = -1;
-static int hf_mpeg_descr_ac3_sysa_full_svc = -1;
-static int hf_mpeg_descr_ac3_sysa_langcode = -1;
-static int hf_mpeg_descr_ac3_sysa_langcode2 = -1;
-static int hf_mpeg_descr_ac3_sysa_mainid = -1;
-static int hf_mpeg_descr_ac3_sysa_priority = -1;
-static int hf_mpeg_descr_ac3_sysa_reserved = -1;
-static int hf_mpeg_descr_ac3_sysa_asvcflags = -1;
-static int hf_mpeg_descr_ac3_sysa_textlen = -1;
-static int hf_mpeg_descr_ac3_sysa_textcode = -1;
-static int hf_mpeg_descr_ac3_sysa_lang1 = -1;
-static int hf_mpeg_descr_ac3_sysa_lang2 = -1;
-static int hf_mpeg_descr_ac3_sysa_lang1_bytes = -1;
-static int hf_mpeg_descr_ac3_sysa_lang2_bytes = -1;
+static int hf_mpeg_descr_ac3_sysa_srate;
+static int hf_mpeg_descr_ac3_sysa_bsid;
+static int hf_mpeg_descr_ac3_sysa_bitrate;
+static int hf_mpeg_descr_ac3_sysa_bitrate_limit;
+static int hf_mpeg_descr_ac3_sysa_surround;
+static int hf_mpeg_descr_ac3_sysa_bsmod;
+static int hf_mpeg_descr_ac3_sysa_num_channels;
+static int hf_mpeg_descr_ac3_sysa_full_svc;
+static int hf_mpeg_descr_ac3_sysa_langcode;
+static int hf_mpeg_descr_ac3_sysa_langcode2;
+static int hf_mpeg_descr_ac3_sysa_mainid;
+static int hf_mpeg_descr_ac3_sysa_priority;
+static int hf_mpeg_descr_ac3_sysa_reserved;
+static int hf_mpeg_descr_ac3_sysa_asvcflags;
+static int hf_mpeg_descr_ac3_sysa_textlen;
+static int hf_mpeg_descr_ac3_sysa_textcode;
+static int hf_mpeg_descr_ac3_sysa_lang1;
+static int hf_mpeg_descr_ac3_sysa_lang2;
+static int hf_mpeg_descr_ac3_sysa_lang1_bytes;
+static int hf_mpeg_descr_ac3_sysa_lang2_bytes;
 
 /* ATSC A/52 Annex A Table A4.2*/
 static const value_string mpeg_descr_ac3_sysa_srate_flag_vals[] = {
@@ -3958,12 +3958,12 @@ proto_mpeg_descriptor_dissect_ac3_system_a(tvbuff_t *tvb, guint offset, guint le
 }
 
 /* 0x83 NorDig Logical Channel Descriptor (version 1) */
-static int hf_mpeg_descr_nordig_lcd_v1_service_list_id = -1;
-static int hf_mpeg_descr_nordig_lcd_v1_service_list_visible_service_flag = -1;
-static int hf_mpeg_descr_nordig_lcd_v1_service_list_reserved = -1;
-static int hf_mpeg_descr_nordig_lcd_v1_service_list_logical_channel_number = -1;
+static int hf_mpeg_descr_nordig_lcd_v1_service_list_id;
+static int hf_mpeg_descr_nordig_lcd_v1_service_list_visible_service_flag;
+static int hf_mpeg_descr_nordig_lcd_v1_service_list_reserved;
+static int hf_mpeg_descr_nordig_lcd_v1_service_list_logical_channel_number;
 
-static gint ett_mpeg_descriptor_nordig_lcd_v1_service_list = -1;
+static gint ett_mpeg_descriptor_nordig_lcd_v1_service_list;
 
 #define MPEG_DESCR_NORDIG_LCD_V1_VISIBLE_SERVICE_FLAG_MASK 0x8000
 #define MPEG_DESCR_NORDIG_LCD_V1_RESERVED_MASK             0x4000
@@ -3999,19 +3999,19 @@ proto_mpeg_descriptor_dissect_nordig_lcd_v1(tvbuff_t *tvb, guint offset, guint l
 }
 
 /* 0x87 NorDig Logical Channel Descriptor (version 2) */
-static gint hf_mpeg_descr_nordig_lcd_v2_channel_list_id = -1;
-static gint hf_mpeg_descr_nordig_lcd_v2_channel_list_name_length = -1;
-static gint hf_mpeg_descr_nordig_lcd_v2_channel_list_name_encoding = -1;
-static gint hf_mpeg_descr_nordig_lcd_v2_channel_list_name = -1;
-static gint hf_mpeg_descr_nordig_lcd_v2_country_code = -1;
-static gint hf_mpeg_descr_nordig_lcd_v2_descriptor_length = -1;
-static gint hf_mpeg_descr_nordig_lcd_v2_service_id = -1;
-static gint hf_mpeg_descr_nordig_lcd_v2_visible_service_flag = -1;
-static gint hf_mpeg_descr_nordig_lcd_v2_reserved = -1;
-static gint hf_mpeg_descr_nordig_lcd_v2_logical_channel_number = -1;
-
-static gint ett_mpeg_descriptor_nordig_lcd_v2_channel_list_list = -1;
-static gint ett_mpeg_descriptor_nordig_lcd_v2_service_list = -1;
+static gint hf_mpeg_descr_nordig_lcd_v2_channel_list_id;
+static gint hf_mpeg_descr_nordig_lcd_v2_channel_list_name_length;
+static gint hf_mpeg_descr_nordig_lcd_v2_channel_list_name_encoding;
+static gint hf_mpeg_descr_nordig_lcd_v2_channel_list_name;
+static gint hf_mpeg_descr_nordig_lcd_v2_country_code;
+static gint hf_mpeg_descr_nordig_lcd_v2_descriptor_length;
+static gint hf_mpeg_descr_nordig_lcd_v2_service_id;
+static gint hf_mpeg_descr_nordig_lcd_v2_visible_service_flag;
+static gint hf_mpeg_descr_nordig_lcd_v2_reserved;
+static gint hf_mpeg_descr_nordig_lcd_v2_logical_channel_number;
+
+static gint ett_mpeg_descriptor_nordig_lcd_v2_channel_list_list;
+static gint ett_mpeg_descriptor_nordig_lcd_v2_service_list;
 
 #define MPEG_DESCR_NORDIG_LCD_V2_VISIBLE_SERVICE_FLAG_MASK 0x8000
 #define MPEG_DESCR_NORDIG_LCD_V2_RESERVED_MASK             0x7c00
@@ -4114,38 +4114,38 @@ proto_mpeg_descriptor_dissect_nordig_lcd_v2(tvbuff_t *tvb, guint offset, guint l
 }
 
 /* 0xA2 Logon Initialize Descriptor */
-static int hf_mpeg_descr_logon_initialize_group_id = -1;
-static int hf_mpeg_descr_logon_initialize_logon_id = -1;
-static int hf_mpeg_descr_logon_initialize_continuous_carrier_reserved = -1;
-static int hf_mpeg_descr_logon_initialize_continuous_carrier = -1;
-static int hf_mpeg_descr_logon_initialize_security_handshake_required = -1;
-static int hf_mpeg_descr_logon_initialize_prefix_flag = -1;
-static int hf_mpeg_descr_logon_initialize_data_unit_labelling_flag = -1;
-static int hf_mpeg_descr_logon_initialize_mini_slot_flag = -1;
-static int hf_mpeg_descr_logon_initialize_contention_based_mini_slot_flag = -1;
-static int hf_mpeg_descr_logon_initialize_capacity_type_flag_reserved = -1;
-static int hf_mpeg_descr_logon_initialize_capacity_type_flag = -1;
-static int hf_mpeg_descr_logon_initialize_traffic_burst_type = -1;
-static int hf_mpeg_descr_logon_initialize_connectivity = -1;
-static int hf_mpeg_descr_logon_initialize_return_vpi_reserved = -1;
-static int hf_mpeg_descr_logon_initialize_return_vpi = -1;
-static int hf_mpeg_descr_logon_initialize_return_vci = -1;
-static int hf_mpeg_descr_logon_initialize_return_signalling_vpi_reserved = -1;
-static int hf_mpeg_descr_logon_initialize_return_signalling_vpi = -1;
-static int hf_mpeg_descr_logon_initialize_return_signalling_vci = -1;
-static int hf_mpeg_descr_logon_initialize_forward_signalling_vpi_reserved = -1;
-static int hf_mpeg_descr_logon_initialize_forward_signalling_vpi = -1;
-static int hf_mpeg_descr_logon_initialize_forward_signalling_vci = -1;
-
-static int hf_mpeg_descr_logon_initialize_return_trf_pid = -1;
-static int hf_mpeg_descr_logon_initialize_return_ctrl_mngm_pid_reserved = -1;
-static int hf_mpeg_descr_logon_initialize_return_ctrl_mngm_pid = -1;
-
-static int hf_mpeg_descr_logon_initialize_cra_level = -1;
-static int hf_mpeg_descr_logon_initialize_vbdc_max_reserved = -1;
-static int hf_mpeg_descr_logon_initialize_vbdc_max = -1;
-static int hf_mpeg_descr_logon_initialize_rbdc_max = -1;
-static int hf_mpeg_descr_logon_initialize_rbdc_timeout = -1;
+static int hf_mpeg_descr_logon_initialize_group_id;
+static int hf_mpeg_descr_logon_initialize_logon_id;
+static int hf_mpeg_descr_logon_initialize_continuous_carrier_reserved;
+static int hf_mpeg_descr_logon_initialize_continuous_carrier;
+static int hf_mpeg_descr_logon_initialize_security_handshake_required;
+static int hf_mpeg_descr_logon_initialize_prefix_flag;
+static int hf_mpeg_descr_logon_initialize_data_unit_labelling_flag;
+static int hf_mpeg_descr_logon_initialize_mini_slot_flag;
+static int hf_mpeg_descr_logon_initialize_contention_based_mini_slot_flag;
+static int hf_mpeg_descr_logon_initialize_capacity_type_flag_reserved;
+static int hf_mpeg_descr_logon_initialize_capacity_type_flag;
+static int hf_mpeg_descr_logon_initialize_traffic_burst_type;
+static int hf_mpeg_descr_logon_initialize_connectivity;
+static int hf_mpeg_descr_logon_initialize_return_vpi_reserved;
+static int hf_mpeg_descr_logon_initialize_return_vpi;
+static int hf_mpeg_descr_logon_initialize_return_vci;
+static int hf_mpeg_descr_logon_initialize_return_signalling_vpi_reserved;
+static int hf_mpeg_descr_logon_initialize_return_signalling_vpi;
+static int hf_mpeg_descr_logon_initialize_return_signalling_vci;
+static int hf_mpeg_descr_logon_initialize_forward_signalling_vpi_reserved;
+static int hf_mpeg_descr_logon_initialize_forward_signalling_vpi;
+static int hf_mpeg_descr_logon_initialize_forward_signalling_vci;
+
+static int hf_mpeg_descr_logon_initialize_return_trf_pid;
+static int hf_mpeg_descr_logon_initialize_return_ctrl_mngm_pid_reserved;
+static int hf_mpeg_descr_logon_initialize_return_ctrl_mngm_pid;
+
+static int hf_mpeg_descr_logon_initialize_cra_level;
+static int hf_mpeg_descr_logon_initialize_vbdc_max_reserved;
+static int hf_mpeg_descr_logon_initialize_vbdc_max;
+static int hf_mpeg_descr_logon_initialize_rbdc_max;
+static int hf_mpeg_descr_logon_initialize_rbdc_timeout;
 
 
 #define MPEG_DESCR_LOGON_INITIALIZE_CONTINUOUS_CARRIER_RESERVED_MASK              0xC0
@@ -4286,7 +4286,7 @@ proto_mpeg_descriptor_dissect_logon_initialize(tvbuff_t *tvb, guint offset, guin
 }
 
 /* 0xA7 RCS Content Descriptor */
-static int hf_mpeg_descr_rcs_content_table_id = -1;
+static int hf_mpeg_descr_rcs_content_table_id;
 
 static void
 proto_mpeg_descriptor_dissect_rcs_content(tvbuff_t *tvb, guint offset, guint len, proto_tree *tree)
@@ -4315,25 +4315,25 @@ static const value_string mpeg_descriptor_ciplus_tag_vals[] = {
 };
 
 /* 0xCB CI+ Content Label Descriptor */
-static int hf_mpeg_descr_ciplus_cl_cb_min = -1;
-static int hf_mpeg_descr_ciplus_cl_cb_max = -1;
-static int hf_mpeg_descr_ciplus_cl_lang = -1;
-static int hf_mpeg_descr_ciplus_cl_label = -1;
+static int hf_mpeg_descr_ciplus_cl_cb_min;
+static int hf_mpeg_descr_ciplus_cl_cb_max;
+static int hf_mpeg_descr_ciplus_cl_lang;
+static int hf_mpeg_descr_ciplus_cl_label;
 
 /* 0xCC CI+ Service Descriptor */
-static int hf_mpeg_descr_ciplus_svc_id = -1;
-static int hf_mpeg_descr_ciplus_svc_type = -1;
-static int hf_mpeg_descr_ciplus_svc_visible = -1;
-static int hf_mpeg_descr_ciplus_svc_selectable = -1;
-static int hf_mpeg_descr_ciplus_svc_lcn = -1;
-static int hf_mpeg_descr_ciplus_svc_prov_name = -1;
-static int hf_mpeg_descr_ciplus_svc_name = -1;
+static int hf_mpeg_descr_ciplus_svc_id;
+static int hf_mpeg_descr_ciplus_svc_type;
+static int hf_mpeg_descr_ciplus_svc_visible;
+static int hf_mpeg_descr_ciplus_svc_selectable;
+static int hf_mpeg_descr_ciplus_svc_lcn;
+static int hf_mpeg_descr_ciplus_svc_prov_name;
+static int hf_mpeg_descr_ciplus_svc_name;
 
 /* 0xCE CI+ Protection Descriptor */
-static int hf_mpeg_descr_ciplus_prot_free_ci_mode = -1;
-static int hf_mpeg_descr_ciplus_prot_match_brand_flag = -1;
-static int hf_mpeg_descr_ciplus_prot_num_entries = -1;
-static int hf_mpeg_descr_ciplus_prot_brand_id = -1;
+static int hf_mpeg_descr_ciplus_prot_free_ci_mode;
+static int hf_mpeg_descr_ciplus_prot_match_brand_flag;
+static int hf_mpeg_descr_ciplus_prot_num_entries;
+static int hf_mpeg_descr_ciplus_prot_brand_id;
 
 static const true_false_string tfs_prot_noprot = { "CI+ protection required", "CI+ protection not required" };
 
diff --git a/epan/dissectors/packet-mpeg-dsmcc.c b/epan/dissectors/packet-mpeg-dsmcc.c
index ca5c412f8f..1b8c001057 100644
--- a/epan/dissectors/packet-mpeg-dsmcc.c
+++ b/epan/dissectors/packet-mpeg-dsmcc.c
@@ -61,7 +61,7 @@ static dissector_handle_t dsmcc_ts_handle, dsmcc_tcp_handle, dsmcc_udp_handle;
  */
 
 
-static int proto_dsmcc = -1;
+static int proto_dsmcc;
 static gboolean dsmcc_sect_check_crc = FALSE;
 
 /* NOTE: Please add values numerically according to 13818-6 so it is easier to
@@ -69,191 +69,191 @@ static gboolean dsmcc_sect_check_crc = FALSE;
  */
 
 /* table 2-1 dsmccMessageHeader - start */
-static int hf_dsmcc_protocol_discriminator = -1;
-static int hf_dsmcc_type = -1;
-static int hf_dsmcc_message_id = -1;
-static int hf_dsmcc_transaction_id = -1;
-static int hf_dsmcc_header_reserved = -1;
-static int hf_dsmcc_adaptation_length = -1;
-static int hf_dsmcc_message_length = -1;
+static int hf_dsmcc_protocol_discriminator;
+static int hf_dsmcc_type;
+static int hf_dsmcc_message_id;
+static int hf_dsmcc_transaction_id;
+static int hf_dsmcc_header_reserved;
+static int hf_dsmcc_adaptation_length;
+static int hf_dsmcc_message_length;
 /* table 2-1 dsmccMessageHeader - end */
 
 /* table 2-3 transactionId - start */
-static int hf_dsmcc_un_sess_flag_transaction_id_originator = -1;
-static int hf_dsmcc_un_sess_flag_transaction_id_number = -1;
+static int hf_dsmcc_un_sess_flag_transaction_id_originator;
+static int hf_dsmcc_un_sess_flag_transaction_id_number;
 /* table 2-3 transactionId - end */
 
 /* table 2-4 dsmccAdaptationHeader - start */
-static int hf_dsmcc_adaptation_type = -1;
+static int hf_dsmcc_adaptation_type;
 /* table 2-4 dsmccAdaptationHeader - end */
 
 /* table 2-6 dsmccConditionalAccess - start */
-static int hf_dsmcc_adaptation_ca_reserved = -1;
-static int hf_dsmcc_adaptation_ca_system_id = -1;
-static int hf_dsmcc_adaptation_ca_length = -1;
+static int hf_dsmcc_adaptation_ca_reserved;
+static int hf_dsmcc_adaptation_ca_system_id;
+static int hf_dsmcc_adaptation_ca_length;
 /* table 2-6 dsmccConditionalAccess - end */
 
 /* table 2-7 dsmccUserId - start */
-static int hf_dsmcc_adaptation_user_id_reserved = -1;
+static int hf_dsmcc_adaptation_user_id_reserved;
 /* table 2-7 dsmccUserId - end */
 
 /* table 4-2, 4-3, 4-4 U-N messageDiscriminator - start */
-/*static int hf_dsmcc_un_sess_message_discriminator = -1;*/
-static int hf_dsmcc_un_sess_flag_message_discriminator = -1;
-static int hf_dsmcc_un_sess_flag_message_scenario = -1;
-static int hf_dsmcc_un_sess_flag_message_type = -1;
+/*static int hf_dsmcc_un_sess_message_discriminator;*/
+static int hf_dsmcc_un_sess_flag_message_discriminator;
+static int hf_dsmcc_un_sess_flag_message_scenario;
+static int hf_dsmcc_un_sess_flag_message_type;
 /* table 4-2, 4-3, 4-4 U-N messageDiscriminator - end */
 
 /* other tables in section 4.2 - start */
-static int hf_dsmcc_un_sess_response = -1;
-static int hf_dsmcc_un_sess_reason = -1;
-static int hf_dsmcc_un_sess_reserved = -1;
+static int hf_dsmcc_un_sess_response;
+static int hf_dsmcc_un_sess_reason;
+static int hf_dsmcc_un_sess_reserved;
 /* other tables in section 4.2 - end */
 
 /* table 4-6 U-N user data format - start */
-static int hf_dsmcc_un_sess_uu_data_len = -1;
-static int hf_dsmcc_un_sess_uu_data = -1;
-static int hf_dsmcc_un_sess_priv_data_len = -1;
-static int hf_dsmcc_un_sess_priv_data = -1;
+static int hf_dsmcc_un_sess_uu_data_len;
+static int hf_dsmcc_un_sess_uu_data;
+static int hf_dsmcc_un_sess_priv_data_len;
+static int hf_dsmcc_un_sess_priv_data;
 /* table 4-6 U-N user data format - end */
 
 /* table 4-7 U-N Resources - start */
-static int hf_dsmcc_un_sess_rsrc_desc_count = -1;
+static int hf_dsmcc_un_sess_rsrc_desc_count;
 /* table 4-7 U-N Resources - end */
 
 /* table 4-10 U-N Server Session Setup Indication - start */
-static int hf_dsmcc_un_sess_forward_count = -1;
+static int hf_dsmcc_un_sess_forward_count;
 /* table 4-10 U-N Server Session Setup Indication - end */
 
 /* 4-26 Server Delete Resource Request - start */
-static int hf_dsmcc_un_sess_resource_count = -1;
-static int hf_dsmcc_un_sess_resource_num = -1;
+static int hf_dsmcc_un_sess_resource_count;
+static int hf_dsmcc_un_sess_resource_num;
 /* 4-26 Server Delete Resource Request - end */
 
 /* table 4-30, 4-31, 4-32, 4-33, 4-34, 4-35, 4-36 - start */
-static int hf_dsmcc_un_sess_status_type = -1;
-static int hf_dsmcc_un_sess_status_count = -1;
-static int hf_dsmcc_un_sess_status_byte = -1;
+static int hf_dsmcc_un_sess_status_type;
+static int hf_dsmcc_un_sess_status_count;
+static int hf_dsmcc_un_sess_status_byte;
 /* table 4-30, 4-31, 4-32, 4-33, 4-34, 4-35, 4-36 - end */
 
 /* table 4-56 Client Session In Progress - start */
-static int hf_dsmcc_un_sess_session_count = -1;
+static int hf_dsmcc_un_sess_session_count;
 /* table 4-56 Client Session In Progress - end */
 
 /* table 4-58 Message Fields data types - start */
-static int hf_dsmcc_un_sess_session_id_device_id = -1;
-static int hf_dsmcc_un_sess_session_id_session_number = -1;
+static int hf_dsmcc_un_sess_session_id_device_id;
+static int hf_dsmcc_un_sess_session_id_session_number;
 /* table 4-58 Message Fields data types - end */
 
 /* table 4-63 U-N common descriptor header - start */
-static int hf_dsmcc_un_sess_rsrc_request_id = -1;
-static int hf_dsmcc_un_sess_rsrc_descriptor_type = -1;
-static int hf_dsmcc_un_sess_rsrc_number = -1;
-static int hf_dsmcc_un_sess_rsrc_association_tag = -1;
-static int hf_dsmcc_un_sess_rsrc_flags = -1;
-static int hf_dsmcc_un_sess_rsrc_status = -1;
-static int hf_dsmcc_un_sess_rsrc_desc_data_fields_length = -1;
-static int hf_dsmcc_un_sess_rsrc_data_field_count = -1;
-static int hf_dsmcc_un_sess_rsrc_type_owner_id = -1;
-static int hf_dsmcc_un_sess_rsrc_type_owner_value = -1;
+static int hf_dsmcc_un_sess_rsrc_request_id;
+static int hf_dsmcc_un_sess_rsrc_descriptor_type;
+static int hf_dsmcc_un_sess_rsrc_number;
+static int hf_dsmcc_un_sess_rsrc_association_tag;
+static int hf_dsmcc_un_sess_rsrc_flags;
+static int hf_dsmcc_un_sess_rsrc_status;
+static int hf_dsmcc_un_sess_rsrc_desc_data_fields_length;
+static int hf_dsmcc_un_sess_rsrc_data_field_count;
+static int hf_dsmcc_un_sess_rsrc_type_owner_id;
+static int hf_dsmcc_un_sess_rsrc_type_owner_value;
 /* table 4-63 U-N common descriptor header - end */
 
 /* table 4-64 U-N resource number assignor - start */
-static int hf_dsmcc_un_sess_rsrc_flag_num_assignor = -1;
-static int hf_dsmcc_un_sess_rsrc_flag_num_value = -1;
+static int hf_dsmcc_un_sess_rsrc_flag_num_assignor;
+static int hf_dsmcc_un_sess_rsrc_flag_num_value;
 /* table 4-64 U-N resource number assignor - end */
 
 /* table 4-65 U-N resource association tag assignor - start */
-static int hf_dsmcc_un_sess_rsrc_flag_association_tag_assignor = -1;
-static int hf_dsmcc_un_sess_rsrc_flag_association_tag_value = -1;
+static int hf_dsmcc_un_sess_rsrc_flag_association_tag_assignor;
+static int hf_dsmcc_un_sess_rsrc_flag_association_tag_value;
 /* table 4-65 U-N resource association tag assignor - end */
 
 /* table 4-66 U-N resource allocator - start */
-static int hf_dsmcc_un_sess_rsrc_flag_allocator = -1;
+static int hf_dsmcc_un_sess_rsrc_flag_allocator;
 /* table 4-66 U-N resource allocator - end */
 
 /* table 4-67 U-N resource attribute - start */
-static int hf_dsmcc_un_sess_rsrc_flag_attribute = -1;
+static int hf_dsmcc_un_sess_rsrc_flag_attribute;
 /* table 4-67 U-N resource attribute - end */
 
 /* table 4-68 U-N resource view - start */
-static int hf_dsmcc_un_sess_rsrc_flag_view = -1;
+static int hf_dsmcc_un_sess_rsrc_flag_view;
 /* table 4-68 U-N resource view - end */
 
 /* table 4-71 U-N dsmccResourceDescriptorValue() format - start */
-static int hf_dsmcc_un_sess_rsrc_value_type = -1;
-static int hf_dsmcc_un_sess_rsrc_value_count = -1;
-static int hf_dsmcc_un_sess_rsrc_value_data = -1;
-static int hf_dsmcc_un_sess_rsrc_most_desired = -1;
-static int hf_dsmcc_un_sess_rsrc_least_desired = -1;
+static int hf_dsmcc_un_sess_rsrc_value_type;
+static int hf_dsmcc_un_sess_rsrc_value_count;
+static int hf_dsmcc_un_sess_rsrc_value_data;
+static int hf_dsmcc_un_sess_rsrc_most_desired;
+static int hf_dsmcc_un_sess_rsrc_least_desired;
 /* table 4-71 U-N dsmccResourceDescriptorValue() format - end */
 
 /* table 4-74 U-N Continuous Feed Session resource descriptor - start */
-static int hf_dsmcc_un_sess_rsrc_cfs_num_count = -1;
-static int hf_dsmcc_un_sess_rsrc_cfs_num = -1;
+static int hf_dsmcc_un_sess_rsrc_cfs_num_count;
+static int hf_dsmcc_un_sess_rsrc_cfs_num;
 /* table 4-74 U-N Continuous Feed Session resource descriptor - end  */
 
 /* table 4-75 U-N ATM Connection resource descriptor - start */
-static int hf_dsmcc_un_sess_rsrc_atm_vpi = -1;
-static int hf_dsmcc_un_sess_rsrc_atm_vci = -1;
+static int hf_dsmcc_un_sess_rsrc_atm_vpi;
+static int hf_dsmcc_un_sess_rsrc_atm_vci;
 /* table 4-75 U-N ATM Connection resource descriptor - end  */
 
 /* table 4-76 MPEG Program - start */
-static int hf_dsmcc_un_sess_rsrc_mpeg_ca_pid = -1;
-static int hf_dsmcc_un_sess_rsrc_mpeg_elem_stream_count = -1;
+static int hf_dsmcc_un_sess_rsrc_mpeg_ca_pid;
+static int hf_dsmcc_un_sess_rsrc_mpeg_elem_stream_count;
 /* table 4-76 MPEG Program - end */
 
 /* table 4-77 Physical Channel - start */
-static int hf_dsmcc_un_sess_rsrc_phys_chan_direction = -1;
+static int hf_dsmcc_un_sess_rsrc_phys_chan_direction;
 /* table 4-77 Physical Channel - end */
 
 /* table 4-84 IP - start */
-static int hf_dsmcc_un_sess_rsrc_src_ip_addr = -1;
-static int hf_dsmcc_un_sess_rsrc_src_ip_port = -1;
-static int hf_dsmcc_un_sess_rsrc_dst_ip_addr = -1;
-static int hf_dsmcc_un_sess_rsrc_dst_ip_port = -1;
-static int hf_dsmcc_un_sess_rsrc_ip_protocol = -1;
+static int hf_dsmcc_un_sess_rsrc_src_ip_addr;
+static int hf_dsmcc_un_sess_rsrc_src_ip_port;
+static int hf_dsmcc_un_sess_rsrc_dst_ip_addr;
+static int hf_dsmcc_un_sess_rsrc_dst_ip_port;
+static int hf_dsmcc_un_sess_rsrc_ip_protocol;
 /* table 4-84 IP - end */
 
 /* table 4-86 PSTN Setup - start */
-static int hf_dsmcc_un_sess_rsrc_pstn_calling_id = -1;
-static int hf_dsmcc_un_sess_rsrc_pstn_called_id = -1;
+static int hf_dsmcc_un_sess_rsrc_pstn_calling_id;
+static int hf_dsmcc_un_sess_rsrc_pstn_called_id;
 /* table 4-86 PSTN Setup - end */
 
 /* Table 4-89 Q.922 Connection - start */
-static int hf_dsmcc_un_sess_rsrc_dlci_count = -1;
-static int hf_dsmcc_un_sess_rsrc_dlci = -1;
-static int hf_dsmcc_un_sess_rsrc_dl_association_tag = -1;
+static int hf_dsmcc_un_sess_rsrc_dlci_count;
+static int hf_dsmcc_un_sess_rsrc_dlci;
+static int hf_dsmcc_un_sess_rsrc_dl_association_tag;
 /* Table 4-89 Q.922 Connection - end */
 
 /* table 4-90 Shared Resource - start */
-static int hf_dsmcc_un_sess_rsrc_shared_resource_num = -1;
+static int hf_dsmcc_un_sess_rsrc_shared_resource_num;
 /* table 4-90 Shared Resource - end */
 
 /* table 4-91 Shared Request ID - start */
-static int hf_dsmcc_un_sess_rsrc_shared_resource_request_id = -1;
+static int hf_dsmcc_un_sess_rsrc_shared_resource_request_id;
 /* table 4-91 Shared Request ID - end */
 
 /* table 4-92 Headend List - start */
-static int hf_dsmcc_un_sess_rsrc_headend_count = -1;
-static int hf_dsmcc_un_sess_rsrc_headend_code = -1;
+static int hf_dsmcc_un_sess_rsrc_headend_count;
+static int hf_dsmcc_un_sess_rsrc_headend_code;
 /* table 4-92 Headend List - end */
 
 /* table 4-94 SDB Continuous Feed - start */
-static int hf_dsmcc_un_sess_rsrc_sdb_id = -1;
-static int hf_dsmcc_un_sess_rsrc_sdb_program_count = -1;
-static int hf_dsmcc_un_sess_rsrc_sdb_association_tag = -1;
-static int hf_dsmcc_un_sess_rsrc_sdb_broadcast_program_id = -1;
+static int hf_dsmcc_un_sess_rsrc_sdb_id;
+static int hf_dsmcc_un_sess_rsrc_sdb_program_count;
+static int hf_dsmcc_un_sess_rsrc_sdb_association_tag;
+static int hf_dsmcc_un_sess_rsrc_sdb_broadcast_program_id;
 /* table 4-94 SDB Continuous Feed - end */
 
 /* table 4-95 SDB Associations - start */
-static int hf_dsmcc_un_sess_rsrc_sdb_control_association_tag = -1;
-static int hf_dsmcc_un_sess_rsrc_sdb_program_association_tag = -1;
+static int hf_dsmcc_un_sess_rsrc_sdb_control_association_tag;
+static int hf_dsmcc_un_sess_rsrc_sdb_program_association_tag;
 /* table 4-95 SDB Associations - end */
 
 /* table 4-96 SDB Entitlement - start */
-static int hf_dsmcc_un_sess_rsrc_sdb_exclude_count = -1;
-static int hf_dsmcc_un_sess_rsrc_sdb_include_count = -1;
+static int hf_dsmcc_un_sess_rsrc_sdb_exclude_count;
+static int hf_dsmcc_un_sess_rsrc_sdb_include_count;
 /* table 4-96 SDB Entitlement - end */
 
 /* user defined 0xf001-0xf007 - start */
@@ -261,112 +261,112 @@ static int hf_dsmcc_un_sess_rsrc_sdb_include_count = -1;
 * Version 2.3, May 19 2003
 * These user defined resource descriptors have been implemented in
 * VOD BackOffice products by Time Warner, Arris and Ericsson. */
-static int hf_dsmcc_un_sess_rsrc_trans_system = -1;
-static int hf_dsmcc_un_sess_rsrc_inner_coding = -1;
-static int hf_dsmcc_un_sess_rsrc_split_bitstream = -1;
-static int hf_dsmcc_un_sess_rsrc_mod_format = -1;
-static int hf_dsmcc_un_sess_rsrc_symbol_rate = -1;
-static int hf_dsmcc_un_sess_rsrc_reserved = -1;
-static int hf_dsmcc_un_sess_rsrc_interleave_depth = -1;
-static int hf_dsmcc_un_sess_rsrc_modulation_mode = -1;
-static int hf_dsmcc_un_sess_rsrc_fec = -1;
-static int hf_dsmcc_un_sess_rsrc_headend_flag = -1;
-static int hf_dsmcc_un_sess_rsrc_headend_tsid = -1;
-static int hf_dsmcc_un_sess_rsrc_server_ca_copyprotect = -1;
-static int hf_dsmcc_un_sess_rsrc_server_ca_usercount = -1;
-static int hf_dsmcc_un_sess_rsrc_client_ca_info_length = -1;
-static int hf_dsmcc_un_sess_rsrc_client_ca_info_data = -1;
-static int hf_dsmcc_un_sess_rsrc_service_group = -1;
+static int hf_dsmcc_un_sess_rsrc_trans_system;
+static int hf_dsmcc_un_sess_rsrc_inner_coding;
+static int hf_dsmcc_un_sess_rsrc_split_bitstream;
+static int hf_dsmcc_un_sess_rsrc_mod_format;
+static int hf_dsmcc_un_sess_rsrc_symbol_rate;
+static int hf_dsmcc_un_sess_rsrc_reserved;
+static int hf_dsmcc_un_sess_rsrc_interleave_depth;
+static int hf_dsmcc_un_sess_rsrc_modulation_mode;
+static int hf_dsmcc_un_sess_rsrc_fec;
+static int hf_dsmcc_un_sess_rsrc_headend_flag;
+static int hf_dsmcc_un_sess_rsrc_headend_tsid;
+static int hf_dsmcc_un_sess_rsrc_server_ca_copyprotect;
+static int hf_dsmcc_un_sess_rsrc_server_ca_usercount;
+static int hf_dsmcc_un_sess_rsrc_client_ca_info_length;
+static int hf_dsmcc_un_sess_rsrc_client_ca_info_data;
+static int hf_dsmcc_un_sess_rsrc_service_group;
 /* user defined 0xf001-0xf007 - end */
 
 /* table 6-1 compatabilityDescriptor - start */
-static int hf_compat_desc_length = -1;
-static int hf_compat_desc_count = -1;
-static int hf_desc_type = -1;
-static int hf_desc_length = -1;
-static int hf_desc_spec_type = -1;
-static int hf_desc_spec_data = -1;
-static int hf_desc_model = -1;
-static int hf_desc_version = -1;
-static int hf_desc_sub_desc_count = -1;
-static int hf_desc_sub_desc_type = -1;
-static int hf_desc_sub_desc_len = -1;
+static int hf_compat_desc_length;
+static int hf_compat_desc_count;
+static int hf_desc_type;
+static int hf_desc_length;
+static int hf_desc_spec_type;
+static int hf_desc_spec_data;
+static int hf_desc_model;
+static int hf_desc_version;
+static int hf_desc_sub_desc_count;
+static int hf_desc_sub_desc_type;
+static int hf_desc_sub_desc_len;
 /* table 6-1 compatabilityDescriptor - end */
 
 /* table 7-3 dsmccDownloadDataHeader - start */
-static int hf_dsmcc_dd_download_id = -1;
-static int hf_dsmcc_dd_message_id = -1;
+static int hf_dsmcc_dd_download_id;
+static int hf_dsmcc_dd_message_id;
 /* table 7-3 dsmccDownloadDataHeader - end */
 
 /* table 7-6 dsmccDownloadInfoIndication/InfoResponse - start */
-static int hf_dsmcc_dii_download_id = -1;
-static int hf_dsmcc_dii_block_size = -1;
-static int hf_dsmcc_dii_window_size = -1;
-static int hf_dsmcc_dii_ack_period = -1;
-static int hf_dsmcc_dii_t_c_download_window = -1;
-static int hf_dsmcc_dii_t_c_download_scenario = -1;
-static int hf_dsmcc_dii_number_of_modules = -1;
-static int hf_dsmcc_dii_module_id = -1;
-static int hf_dsmcc_dii_module_size = -1;
-static int hf_dsmcc_dii_module_version = -1;
-static int hf_dsmcc_dii_module_info_length = -1;
-static int hf_dsmcc_dii_private_data_length = -1;
+static int hf_dsmcc_dii_download_id;
+static int hf_dsmcc_dii_block_size;
+static int hf_dsmcc_dii_window_size;
+static int hf_dsmcc_dii_ack_period;
+static int hf_dsmcc_dii_t_c_download_window;
+static int hf_dsmcc_dii_t_c_download_scenario;
+static int hf_dsmcc_dii_number_of_modules;
+static int hf_dsmcc_dii_module_id;
+static int hf_dsmcc_dii_module_size;
+static int hf_dsmcc_dii_module_version;
+static int hf_dsmcc_dii_module_info_length;
+static int hf_dsmcc_dii_private_data_length;
 /* table 7-6 dsmccDownloadInfoIndication/InfoResponse - end */
 
 /* table 7-7 dsmccDownloadDataBlock - start */
-static int hf_dsmcc_ddb_module_id = -1;
-static int hf_dsmcc_ddb_version = -1;
-static int hf_dsmcc_ddb_reserved = -1;
-static int hf_dsmcc_ddb_block_number = -1;
+static int hf_dsmcc_ddb_module_id;
+static int hf_dsmcc_ddb_version;
+static int hf_dsmcc_ddb_reserved;
+static int hf_dsmcc_ddb_block_number;
 /* table 7-7 dsmccDownloadDataBlock - end */
 
 /* table 9-2 dsmccSection - start */
-static int hf_dsmcc_table_id = -1;
-static int hf_dsmcc_section_syntax_indicator = -1;
-static int hf_dsmcc_private_indicator = -1;
-static int hf_dsmcc_reserved = -1;
-static int hf_dsmcc_section_length = -1;
-static int hf_dsmcc_table_id_extension = -1;
-static int hf_dsmcc_reserved2 = -1;
-static int hf_dsmcc_version_number = -1;
-static int hf_dsmcc_current_next_indicator = -1;
-static int hf_dsmcc_section_number = -1;
-static int hf_dsmcc_last_section_number = -1;
-static int hf_dsmcc_crc = -1;
-static int hf_dsmcc_checksum = -1;
+static int hf_dsmcc_table_id;
+static int hf_dsmcc_section_syntax_indicator;
+static int hf_dsmcc_private_indicator;
+static int hf_dsmcc_reserved;
+static int hf_dsmcc_section_length;
+static int hf_dsmcc_table_id_extension;
+static int hf_dsmcc_reserved2;
+static int hf_dsmcc_version_number;
+static int hf_dsmcc_current_next_indicator;
+static int hf_dsmcc_section_number;
+static int hf_dsmcc_last_section_number;
+static int hf_dsmcc_crc;
+static int hf_dsmcc_checksum;
 /* table 9-2 dsmccSection - end */
 
 /* table J.3 E-164 NSAP - start */
-static int hf_dsmcc_un_sess_nsap_afi = -1;
-static int hf_dsmcc_un_sess_nsap_idi = -1;
-static int hf_dsmcc_un_sess_nsap_ho_dsp = -1;
-static int hf_dsmcc_un_sess_nsap_esi = -1;
-static int hf_dsmcc_un_sess_nsap_sel = -1;
+static int hf_dsmcc_un_sess_nsap_afi;
+static int hf_dsmcc_un_sess_nsap_idi;
+static int hf_dsmcc_un_sess_nsap_ho_dsp;
+static int hf_dsmcc_un_sess_nsap_esi;
+static int hf_dsmcc_un_sess_nsap_sel;
 /* table J.3 E-164 NSAP - end */
 
 /* TODO: this should really live in the ETV dissector, but I'm not sure how
  * to make the functionality work exactly right yet.  Will work on a patch
  * for this next.
  */
-static int hf_etv_module_abs_path = -1;
-static int hf_etv_dii_authority = -1;
-
-static gint ett_dsmcc = -1;
-static gint ett_dsmcc_payload = -1;
-static gint ett_dsmcc_header = -1;
-static gint ett_dsmcc_adaptation_header = -1;
-static gint ett_dsmcc_message_id = -1;
-static gint ett_dsmcc_transaction_id = -1;
-static gint ett_dsmcc_heading = -1;
-static gint ett_dsmcc_rsrc_number = -1;
-static gint ett_dsmcc_rsrc_association_tag = -1;
-static gint ett_dsmcc_rsrc_flags = -1;
-static gint ett_dsmcc_compat = -1;
-static gint ett_dsmcc_compat_sub_desc = -1;
-static gint ett_dsmcc_dii_module = -1;
-
-static expert_field ei_dsmcc_invalid_value = EI_INIT;
-static expert_field ei_dsmcc_crc_invalid = EI_INIT;
+static int hf_etv_module_abs_path;
+static int hf_etv_dii_authority;
+
+static gint ett_dsmcc;
+static gint ett_dsmcc_payload;
+static gint ett_dsmcc_header;
+static gint ett_dsmcc_adaptation_header;
+static gint ett_dsmcc_message_id;
+static gint ett_dsmcc_transaction_id;
+static gint ett_dsmcc_heading;
+static gint ett_dsmcc_rsrc_number;
+static gint ett_dsmcc_rsrc_association_tag;
+static gint ett_dsmcc_rsrc_flags;
+static gint ett_dsmcc_compat;
+static gint ett_dsmcc_compat_sub_desc;
+static gint ett_dsmcc_dii_module;
+
+static expert_field ei_dsmcc_invalid_value;
+static expert_field ei_dsmcc_crc_invalid;
 
 #define DSMCC_TCP_PORT          13819
 #define DSMCC_UDP_PORT          13819
diff --git a/epan/dissectors/packet-mpeg-pat.c b/epan/dissectors/packet-mpeg-pat.c
index 8f5ae08e3b..34bc79bb85 100644
--- a/epan/dissectors/packet-mpeg-pat.c
+++ b/epan/dissectors/packet-mpeg-pat.c
@@ -19,21 +19,21 @@ void proto_reg_handoff_mpeg_pat(void);
 
 static dissector_handle_t mpeg_pat_handle;
 
-static int proto_mpeg_pat = -1;
-static int hf_mpeg_pat_transport_stream_id = -1;
-static int hf_mpeg_pat_reserved = -1;
-static int hf_mpeg_pat_version_number = -1;
-static int hf_mpeg_pat_current_next_indicator = -1;
-static int hf_mpeg_pat_section_number = -1;
-static int hf_mpeg_pat_last_section_number = -1;
+static int proto_mpeg_pat;
+static int hf_mpeg_pat_transport_stream_id;
+static int hf_mpeg_pat_reserved;
+static int hf_mpeg_pat_version_number;
+static int hf_mpeg_pat_current_next_indicator;
+static int hf_mpeg_pat_section_number;
+static int hf_mpeg_pat_last_section_number;
 
-static int hf_mpeg_pat_program_number = -1;
-static int hf_mpeg_pat_program_reserved = -1;
-static int hf_mpeg_pat_program_map_pid = -1;
+static int hf_mpeg_pat_program_number;
+static int hf_mpeg_pat_program_reserved;
+static int hf_mpeg_pat_program_map_pid;
 
 
-static gint ett_mpeg_pat = -1;
-static gint ett_mpeg_pat_prog = -1;
+static gint ett_mpeg_pat;
+static gint ett_mpeg_pat_prog;
 
 #define MPEG_PAT_RESERVED_MASK                    0xC0
 #define MPEG_PAT_VERSION_NUMBER_MASK              0x3E
diff --git a/epan/dissectors/packet-mpeg-pmt.c b/epan/dissectors/packet-mpeg-pmt.c
index a38ce97627..5ab474370a 100644
--- a/epan/dissectors/packet-mpeg-pmt.c
+++ b/epan/dissectors/packet-mpeg-pmt.c
@@ -19,27 +19,27 @@
 void proto_register_mpeg_pmt(void);
 void proto_reg_handoff_mpeg_pmt(void);
 
-static int proto_mpeg_pmt = -1;
-static int hf_mpeg_pmt_program_number = -1;
-static int hf_mpeg_pmt_reserved1 = -1;
-static int hf_mpeg_pmt_version_number = -1;
-static int hf_mpeg_pmt_current_next_indicator = -1;
-static int hf_mpeg_pmt_section_number = -1;
-static int hf_mpeg_pmt_last_section_number = -1;
-static int hf_mpeg_pmt_reserved2 = -1;
-static int hf_mpeg_pmt_pcr_pid = -1;
-static int hf_mpeg_pmt_reserved3 = -1;
-static int hf_mpeg_pmt_program_info_length = -1;
-
-
-static int hf_mpeg_pmt_stream_type = -1;
-static int hf_mpeg_pmt_stream_reserved1 = -1;
-static int hf_mpeg_pmt_stream_elementary_pid = -1;
-static int hf_mpeg_pmt_stream_reserved2 = -1;
-static int hf_mpeg_pmt_stream_es_info_length = -1;
-
-static gint ett_mpeg_pmt = -1;
-static gint ett_mpeg_pmt_stream = -1;
+static int proto_mpeg_pmt;
+static int hf_mpeg_pmt_program_number;
+static int hf_mpeg_pmt_reserved1;
+static int hf_mpeg_pmt_version_number;
+static int hf_mpeg_pmt_current_next_indicator;
+static int hf_mpeg_pmt_section_number;
+static int hf_mpeg_pmt_last_section_number;
+static int hf_mpeg_pmt_reserved2;
+static int hf_mpeg_pmt_pcr_pid;
+static int hf_mpeg_pmt_reserved3;
+static int hf_mpeg_pmt_program_info_length;
+
+
+static int hf_mpeg_pmt_stream_type;
+static int hf_mpeg_pmt_stream_reserved1;
+static int hf_mpeg_pmt_stream_elementary_pid;
+static int hf_mpeg_pmt_stream_reserved2;
+static int hf_mpeg_pmt_stream_es_info_length;
+
+static gint ett_mpeg_pmt;
+static gint ett_mpeg_pmt_stream;
 
 static dissector_handle_t mpeg_pmt_handle;
 
diff --git a/epan/dissectors/packet-mpeg-sect.c b/epan/dissectors/packet-mpeg-sect.c
index bd2ad5d1a9..3069a62dcc 100644
--- a/epan/dissectors/packet-mpeg-sect.c
+++ b/epan/dissectors/packet-mpeg-sect.c
@@ -21,17 +21,17 @@
 
 void proto_register_mpeg_sect(void);
 
-static int proto_mpeg_sect = -1;
-static int hf_mpeg_sect_table_id = -1;
-static int hf_mpeg_sect_syntax_indicator = -1;
-static int hf_mpeg_sect_reserved = -1;
-static int hf_mpeg_sect_length = -1;
-static int hf_mpeg_sect_crc = -1;
-static int hf_mpeg_sect_crc_status = -1;
+static int proto_mpeg_sect;
+static int hf_mpeg_sect_table_id;
+static int hf_mpeg_sect_syntax_indicator;
+static int hf_mpeg_sect_reserved;
+static int hf_mpeg_sect_length;
+static int hf_mpeg_sect_crc;
+static int hf_mpeg_sect_crc_status;
 
-static gint ett_mpeg_sect = -1;
+static gint ett_mpeg_sect;
 
-static expert_field ei_mpeg_sect_crc = EI_INIT;
+static expert_field ei_mpeg_sect_crc;
 
 static dissector_table_t mpeg_sect_tid_dissector_table;
 
diff --git a/epan/dissectors/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c
index 2e90aa4486..d2a6683d8e 100644
--- a/epan/dissectors/packet-mpeg1.c
+++ b/epan/dissectors/packet-mpeg1.c
@@ -30,28 +30,28 @@ static dissector_handle_t mpeg1_handle;
 
 /* MPEG1 header fields             */
 
-static int proto_mpg          = -1;
+static int proto_mpg;
 
-static int hf_rtp_mpg_mbz     = -1;
-static int hf_rtp_mpg_T       = -1;
-static int hf_rtp_mpg_tr      = -1;
-static int hf_rtp_mpg_an      = -1;
-static int hf_rtp_mpg_n       = -1;
-static int hf_rtp_mpg_s       = -1;
-static int hf_rtp_mpg_b       = -1;
-static int hf_rtp_mpg_e       = -1;
-static int hf_rtp_mpg_p       = -1;
+static int hf_rtp_mpg_mbz;
+static int hf_rtp_mpg_T;
+static int hf_rtp_mpg_tr;
+static int hf_rtp_mpg_an;
+static int hf_rtp_mpg_n;
+static int hf_rtp_mpg_s;
+static int hf_rtp_mpg_b;
+static int hf_rtp_mpg_e;
+static int hf_rtp_mpg_p;
 
 
-static int hf_rtp_mpg_fbv     = -1;
-static int hf_rtp_mpg_bfc     = -1;
-static int hf_rtp_mpg_ffv     = -1;
-static int hf_rtp_mpg_ffc     = -1;
-static int hf_rtp_mpg_data    = -1;
+static int hf_rtp_mpg_fbv;
+static int hf_rtp_mpg_bfc;
+static int hf_rtp_mpg_ffv;
+static int hf_rtp_mpg_ffc;
+static int hf_rtp_mpg_data;
 
 
 /* MPEG-1 fields defining a sub tree */
-static gint ett_mpg           = -1;
+static gint ett_mpg;
 
 static const value_string rtp_mpg_picture_types_vals[] =
 {
diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c
index 6178c74286..bf2f2cbe6d 100644
--- a/epan/dissectors/packet-mpls-echo.c
+++ b/epan/dissectors/packet-mpls-echo.c
@@ -35,224 +35,224 @@ static dissector_handle_t mpls_echo_handle;
 
 #define UDP_PORT_MPLS_ECHO 3503
 
-static int proto_mpls_echo = -1;
-static int hf_mpls_echo_version = -1;
-static int hf_mpls_echo_mbz = -1;
-static int hf_mpls_echo_gflags = -1;
-static int hf_mpls_echo_flag_sbz = -1;
-static int hf_mpls_echo_flag_v = -1;
-static int hf_mpls_echo_flag_t = -1;
-static int hf_mpls_echo_flag_r = -1;
-static int hf_mpls_echo_msgtype = -1;
-static int hf_mpls_echo_replymode = -1;
-static int hf_mpls_echo_returncode = -1;
-static int hf_mpls_echo_returnsubcode = -1;
-static int hf_mpls_echo_handle = -1;
-static int hf_mpls_echo_sequence = -1;
-static int hf_mpls_echo_ts_sent = -1;
-static int hf_mpls_echo_ts_rec = -1;
-static int hf_mpls_echo_tlv_type = -1;
-static int hf_mpls_echo_tlv_len = -1;
-static int hf_mpls_echo_tlv_value = -1;
-static int hf_mpls_echo_tlv_fec_type = -1;
-static int hf_mpls_echo_tlv_fec_len = -1;
-static int hf_mpls_echo_tlv_fec_value = -1;
-static int hf_mpls_echo_tlv_fec_ldp_ipv4 = -1;
-static int hf_mpls_echo_tlv_fec_ldp_ipv4_mask = -1;
-static int hf_mpls_echo_tlv_fec_ldp_ipv6 = -1;
-static int hf_mpls_echo_tlv_fec_ldp_ipv6_mask = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_ipv4_ipv4_endpoint = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_ipv6_ipv6_endpoint = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_ip_mbz1 = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_ip_tunnel_id = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_ipv4_ext_tunnel_id = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_ipv4_ipv4_sender = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_ipv6_ext_tunnel_id = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_ipv6_ipv6_sender = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_ip_mbz2 = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_ip_lsp_id = -1;
-static int hf_mpls_echo_tlv_fec_vpn_route_dist = -1;
-static int hf_mpls_echo_tlv_fec_vpn_ipv4 = -1;
-static int hf_mpls_echo_tlv_fec_vpn_len = -1;
-static int hf_mpls_echo_tlv_fec_vpn_ipv6 = -1;
-static int hf_mpls_echo_tlv_fec_l2_vpn_route_dist = -1;
-static int hf_mpls_echo_tlv_fec_l2_vpn_send_ve_id = -1;
-static int hf_mpls_echo_tlv_fec_l2_vpn_recv_ve_id = -1;
-static int hf_mpls_echo_tlv_fec_l2_vpn_encap_type = -1;
-static int hf_mpls_echo_tlv_fec_l2cid_sender = -1;
-static int hf_mpls_echo_tlv_fec_l2cid_remote = -1;
-static int hf_mpls_echo_tlv_fec_l2cid_vcid = -1;
-static int hf_mpls_echo_tlv_fec_l2cid_encap = -1;
-static int hf_mpls_echo_tlv_fec_l2cid_mbz = -1;
-static int hf_mpls_echo_tlv_fec_bgp_ipv4 = -1;
-static int hf_mpls_echo_tlv_fec_bgp_ipv6 = -1;
-static int hf_mpls_echo_tlv_fec_bgp_len = -1;
-static int hf_mpls_echo_tlv_fec_gen_ipv4 = -1;
-static int hf_mpls_echo_tlv_fec_gen_ipv4_mask = -1;
-static int hf_mpls_echo_tlv_fec_gen_ipv6 = -1;
-static int hf_mpls_echo_tlv_fec_gen_ipv6_mask = -1;
-static int hf_mpls_echo_tlv_fec_nil_label = -1;
-static int hf_mpls_echo_tlv_fec_pw_ipv6_128_sender = -1;
-static int hf_mpls_echo_tlv_fec_pw_ipv6_128_remote = -1;
-static int hf_mpls_echo_tlv_fec_pw_ipv6_128_pw_id = -1;
-static int hf_mpls_echo_tlv_fec_pw_ipv6_128_pw_type = -1;
-static int hf_mpls_echo_tlv_fec_pw_ipv6_128_mbz = -1;
-static int hf_mpls_echo_tlv_fec_igp_ipv4 = -1;
-static int hf_mpls_echo_tlv_fec_igp_ipv6 = -1;
-static int hf_mpls_echo_tlv_fec_igp_mask = -1;
-static int hf_mpls_echo_tlv_fec_igp_protocol = -1;
-static int hf_mpls_echo_tlv_fec_igp_reserved = -1;
-static int hf_mpls_echo_tlv_fec_igp_adj_type = -1;
-static int hf_mpls_echo_tlv_fec_igp_adj_local_ipv4 = -1;
-static int hf_mpls_echo_tlv_fec_igp_adj_local_ipv6 = -1;
-static int hf_mpls_echo_tlv_fec_igp_adj_local_ident = -1;
-static int hf_mpls_echo_tlv_fec_igp_adj_remote_ipv4 = -1;
-static int hf_mpls_echo_tlv_fec_igp_adj_remote_ipv6 = -1;
-static int hf_mpls_echo_tlv_fec_igp_adj_remote_ident = -1;
-static int hf_mpls_echo_tlv_fec_igp_adj_adv_ident_ospf = -1;
-static int hf_mpls_echo_tlv_fec_igp_adj_adv_ident_isis = -1;
-static int hf_mpls_echo_tlv_fec_igp_adj_adv_ident = -1;
-static int hf_mpls_echo_tlv_fec_igp_adj_rec_ident_ospf = -1;
-static int hf_mpls_echo_tlv_fec_igp_adj_rec_ident_isis = -1;
-static int hf_mpls_echo_tlv_fec_igp_adj_rec_ident = -1;
-static int hf_mpls_echo_tlv_ds_map_mtu = -1;
-static int hf_mpls_echo_tlv_ds_map_addr_type = -1;
-static int hf_mpls_echo_tlv_ds_map_res = -1;
-static int hf_mpls_echo_tlv_ds_map_flag_res = -1;
-static int hf_mpls_echo_tlv_ds_map_flag_i = -1;
-static int hf_mpls_echo_tlv_ds_map_flag_n = -1;
-static int hf_mpls_echo_tlv_ds_map_ds_ip = -1;
-static int hf_mpls_echo_tlv_ds_map_int_ip = -1;
-static int hf_mpls_echo_tlv_ds_map_if_index = -1;
-static int hf_mpls_echo_tlv_ds_map_ds_ipv6 = -1;
-static int hf_mpls_echo_tlv_ds_map_int_ipv6 = -1;
-static int hf_mpls_echo_tlv_ds_map_hash_type = -1;
-static int hf_mpls_echo_tlv_ds_map_depth = -1;
-static int hf_mpls_echo_tlv_ds_map_muti_len = -1;
-static int hf_mpls_echo_tlv_ds_map_mp_ip = -1;
-static int hf_mpls_echo_tlv_ds_map_mp_mask = -1;
-static int hf_mpls_echo_tlv_ds_map_mp_ip_low = -1;
-static int hf_mpls_echo_tlv_ds_map_mp_ip_high = -1;
-static int hf_mpls_echo_tlv_ds_map_mp_no_multipath_info = -1;
-static int hf_mpls_echo_tlv_ds_map_mp_value = -1;
-static int hf_mpls_echo_tlv_ds_map_mp_label = -1;
-static int hf_mpls_echo_tlv_ds_map_mp_exp = -1;
-static int hf_mpls_echo_tlv_ds_map_mp_bos = -1;
-static int hf_mpls_echo_tlv_ds_map_mp_proto = -1;
-static int hf_mpls_echo_tlv_dd_map_mtu = -1;
-static int hf_mpls_echo_tlv_dd_map_addr_type = -1;
-static int hf_mpls_echo_tlv_dd_map_res = -1;
-static int hf_mpls_echo_tlv_dd_map_flag_res = -1;
-static int hf_mpls_echo_tlv_dd_map_flag_i = -1;
-static int hf_mpls_echo_tlv_dd_map_flag_n = -1;
-static int hf_mpls_echo_tlv_dd_map_ds_ip = -1;
-static int hf_mpls_echo_tlv_dd_map_int_ip = -1;
-static int hf_mpls_echo_tlv_dd_map_ds_ipv6 = -1;
-static int hf_mpls_echo_tlv_dd_map_int_ipv6 = -1;
-static int hf_mpls_echo_tlv_dd_map_return_code = -1;
-static int hf_mpls_echo_tlv_dd_map_return_subcode = -1;
-static int hf_mpls_echo_tlv_dd_map_subtlv_len = -1;
-static int hf_mpls_echo_tlv_dd_map_ingress_if_num = -1;
-static int hf_mpls_echo_tlv_dd_map_egress_if_num = -1;
-static int hf_mpls_echo_sub_tlv_multipath_type = -1;
-static int hf_mpls_echo_sub_tlv_multipath_length = -1;
-static int hf_mpls_echo_sub_tlv_multipath_value = -1;
-static int hf_mpls_echo_sub_tlv_resv = -1;
-static int hf_mpls_echo_sub_tlv_multipath_info = -1;
-/* static int hf_mpls_echo_tlv_ddstlv_map_mp_label = -1; */
-static int hf_mpls_echo_tlv_ddstlv_map_mp_proto = -1;
-/* static int hf_mpls_echo_tlv_ddstlv_map_mp_exp = -1; */
-/* static int hf_mpls_echo_tlv_ddstlv_map_mp_bos = -1; */
-static int hf_mpls_echo_sub_tlv_multipath_ip = -1;
-static int hf_mpls_echo_sub_tlv_mp_ip_low = -1;
-static int hf_mpls_echo_sub_tlv_mp_ip_high = -1;
-static int hf_mpls_echo_sub_tlv_mp_mask = -1;
-static int hf_mpls_echo_sub_tlv_op_type = -1;
-static int hf_mpls_echo_sub_tlv_addr_type = -1;
-static int hf_mpls_echo_sub_tlv_fec_tlv_value = -1;
-static int hf_mpls_echo_sub_tlv_label = -1;
-static int hf_mpls_echo_sub_tlv_traffic_class = -1;
-static int hf_mpls_echo_sub_tlv_s_bit = -1;
-static int hf_mpls_echo_sub_tlv_res = -1;
-static int hf_mpls_echo_sub_tlv_remote_peer_unspecified = -1;
-static int hf_mpls_echo_sub_tlv_remote_peer_ip = -1;
-static int hf_mpls_echo_sub_tlv_remore_peer_ipv6 = -1;
-static int hf_mpls_echo_tlv_dd_map_type = -1;
-static int hf_mpls_echo_tlv_dd_map_length = -1;
-static int hf_mpls_echo_tlv_dd_map_value = -1;
-static int hf_mpls_echo_tlv_padaction = -1;
-static int hf_mpls_echo_tlv_padding = -1;
-static int hf_mpls_echo_tlv_vendor = -1;
-static int hf_mpls_echo_tlv_ilso_addr_type = -1;
-static int hf_mpls_echo_tlv_ilso_mbz = -1;
-static int hf_mpls_echo_tlv_ilso_ipv4_addr = -1;
-static int hf_mpls_echo_tlv_ilso_ipv4_int_addr = -1;
-static int hf_mpls_echo_tlv_ilso_ipv6_addr = -1;
-static int hf_mpls_echo_tlv_ilso_ipv6_int_addr = -1;
-static int hf_mpls_echo_tlv_ilso_int_index = -1;
-static int hf_mpls_echo_tlv_ilso_label = -1;
-static int hf_mpls_echo_tlv_ilso_exp = -1;
-static int hf_mpls_echo_tlv_ilso_bos = -1;
-static int hf_mpls_echo_tlv_ilso_ttl = -1;
+static int proto_mpls_echo;
+static int hf_mpls_echo_version;
+static int hf_mpls_echo_mbz;
+static int hf_mpls_echo_gflags;
+static int hf_mpls_echo_flag_sbz;
+static int hf_mpls_echo_flag_v;
+static int hf_mpls_echo_flag_t;
+static int hf_mpls_echo_flag_r;
+static int hf_mpls_echo_msgtype;
+static int hf_mpls_echo_replymode;
+static int hf_mpls_echo_returncode;
+static int hf_mpls_echo_returnsubcode;
+static int hf_mpls_echo_handle;
+static int hf_mpls_echo_sequence;
+static int hf_mpls_echo_ts_sent;
+static int hf_mpls_echo_ts_rec;
+static int hf_mpls_echo_tlv_type;
+static int hf_mpls_echo_tlv_len;
+static int hf_mpls_echo_tlv_value;
+static int hf_mpls_echo_tlv_fec_type;
+static int hf_mpls_echo_tlv_fec_len;
+static int hf_mpls_echo_tlv_fec_value;
+static int hf_mpls_echo_tlv_fec_ldp_ipv4;
+static int hf_mpls_echo_tlv_fec_ldp_ipv4_mask;
+static int hf_mpls_echo_tlv_fec_ldp_ipv6;
+static int hf_mpls_echo_tlv_fec_ldp_ipv6_mask;
+static int hf_mpls_echo_tlv_fec_rsvp_ipv4_ipv4_endpoint;
+static int hf_mpls_echo_tlv_fec_rsvp_ipv6_ipv6_endpoint;
+static int hf_mpls_echo_tlv_fec_rsvp_ip_mbz1;
+static int hf_mpls_echo_tlv_fec_rsvp_ip_tunnel_id;
+static int hf_mpls_echo_tlv_fec_rsvp_ipv4_ext_tunnel_id;
+static int hf_mpls_echo_tlv_fec_rsvp_ipv4_ipv4_sender;
+static int hf_mpls_echo_tlv_fec_rsvp_ipv6_ext_tunnel_id;
+static int hf_mpls_echo_tlv_fec_rsvp_ipv6_ipv6_sender;
+static int hf_mpls_echo_tlv_fec_rsvp_ip_mbz2;
+static int hf_mpls_echo_tlv_fec_rsvp_ip_lsp_id;
+static int hf_mpls_echo_tlv_fec_vpn_route_dist;
+static int hf_mpls_echo_tlv_fec_vpn_ipv4;
+static int hf_mpls_echo_tlv_fec_vpn_len;
+static int hf_mpls_echo_tlv_fec_vpn_ipv6;
+static int hf_mpls_echo_tlv_fec_l2_vpn_route_dist;
+static int hf_mpls_echo_tlv_fec_l2_vpn_send_ve_id;
+static int hf_mpls_echo_tlv_fec_l2_vpn_recv_ve_id;
+static int hf_mpls_echo_tlv_fec_l2_vpn_encap_type;
+static int hf_mpls_echo_tlv_fec_l2cid_sender;
+static int hf_mpls_echo_tlv_fec_l2cid_remote;
+static int hf_mpls_echo_tlv_fec_l2cid_vcid;
+static int hf_mpls_echo_tlv_fec_l2cid_encap;
+static int hf_mpls_echo_tlv_fec_l2cid_mbz;
+static int hf_mpls_echo_tlv_fec_bgp_ipv4;
+static int hf_mpls_echo_tlv_fec_bgp_ipv6;
+static int hf_mpls_echo_tlv_fec_bgp_len;
+static int hf_mpls_echo_tlv_fec_gen_ipv4;
+static int hf_mpls_echo_tlv_fec_gen_ipv4_mask;
+static int hf_mpls_echo_tlv_fec_gen_ipv6;
+static int hf_mpls_echo_tlv_fec_gen_ipv6_mask;
+static int hf_mpls_echo_tlv_fec_nil_label;
+static int hf_mpls_echo_tlv_fec_pw_ipv6_128_sender;
+static int hf_mpls_echo_tlv_fec_pw_ipv6_128_remote;
+static int hf_mpls_echo_tlv_fec_pw_ipv6_128_pw_id;
+static int hf_mpls_echo_tlv_fec_pw_ipv6_128_pw_type;
+static int hf_mpls_echo_tlv_fec_pw_ipv6_128_mbz;
+static int hf_mpls_echo_tlv_fec_igp_ipv4;
+static int hf_mpls_echo_tlv_fec_igp_ipv6;
+static int hf_mpls_echo_tlv_fec_igp_mask;
+static int hf_mpls_echo_tlv_fec_igp_protocol;
+static int hf_mpls_echo_tlv_fec_igp_reserved;
+static int hf_mpls_echo_tlv_fec_igp_adj_type;
+static int hf_mpls_echo_tlv_fec_igp_adj_local_ipv4;
+static int hf_mpls_echo_tlv_fec_igp_adj_local_ipv6;
+static int hf_mpls_echo_tlv_fec_igp_adj_local_ident;
+static int hf_mpls_echo_tlv_fec_igp_adj_remote_ipv4;
+static int hf_mpls_echo_tlv_fec_igp_adj_remote_ipv6;
+static int hf_mpls_echo_tlv_fec_igp_adj_remote_ident;
+static int hf_mpls_echo_tlv_fec_igp_adj_adv_ident_ospf;
+static int hf_mpls_echo_tlv_fec_igp_adj_adv_ident_isis;
+static int hf_mpls_echo_tlv_fec_igp_adj_adv_ident;
+static int hf_mpls_echo_tlv_fec_igp_adj_rec_ident_ospf;
+static int hf_mpls_echo_tlv_fec_igp_adj_rec_ident_isis;
+static int hf_mpls_echo_tlv_fec_igp_adj_rec_ident;
+static int hf_mpls_echo_tlv_ds_map_mtu;
+static int hf_mpls_echo_tlv_ds_map_addr_type;
+static int hf_mpls_echo_tlv_ds_map_res;
+static int hf_mpls_echo_tlv_ds_map_flag_res;
+static int hf_mpls_echo_tlv_ds_map_flag_i;
+static int hf_mpls_echo_tlv_ds_map_flag_n;
+static int hf_mpls_echo_tlv_ds_map_ds_ip;
+static int hf_mpls_echo_tlv_ds_map_int_ip;
+static int hf_mpls_echo_tlv_ds_map_if_index;
+static int hf_mpls_echo_tlv_ds_map_ds_ipv6;
+static int hf_mpls_echo_tlv_ds_map_int_ipv6;
+static int hf_mpls_echo_tlv_ds_map_hash_type;
+static int hf_mpls_echo_tlv_ds_map_depth;
+static int hf_mpls_echo_tlv_ds_map_muti_len;
+static int hf_mpls_echo_tlv_ds_map_mp_ip;
+static int hf_mpls_echo_tlv_ds_map_mp_mask;
+static int hf_mpls_echo_tlv_ds_map_mp_ip_low;
+static int hf_mpls_echo_tlv_ds_map_mp_ip_high;
+static int hf_mpls_echo_tlv_ds_map_mp_no_multipath_info;
+static int hf_mpls_echo_tlv_ds_map_mp_value;
+static int hf_mpls_echo_tlv_ds_map_mp_label;
+static int hf_mpls_echo_tlv_ds_map_mp_exp;
+static int hf_mpls_echo_tlv_ds_map_mp_bos;
+static int hf_mpls_echo_tlv_ds_map_mp_proto;
+static int hf_mpls_echo_tlv_dd_map_mtu;
+static int hf_mpls_echo_tlv_dd_map_addr_type;
+static int hf_mpls_echo_tlv_dd_map_res;
+static int hf_mpls_echo_tlv_dd_map_flag_res;
+static int hf_mpls_echo_tlv_dd_map_flag_i;
+static int hf_mpls_echo_tlv_dd_map_flag_n;
+static int hf_mpls_echo_tlv_dd_map_ds_ip;
+static int hf_mpls_echo_tlv_dd_map_int_ip;
+static int hf_mpls_echo_tlv_dd_map_ds_ipv6;
+static int hf_mpls_echo_tlv_dd_map_int_ipv6;
+static int hf_mpls_echo_tlv_dd_map_return_code;
+static int hf_mpls_echo_tlv_dd_map_return_subcode;
+static int hf_mpls_echo_tlv_dd_map_subtlv_len;
+static int hf_mpls_echo_tlv_dd_map_ingress_if_num;
+static int hf_mpls_echo_tlv_dd_map_egress_if_num;
+static int hf_mpls_echo_sub_tlv_multipath_type;
+static int hf_mpls_echo_sub_tlv_multipath_length;
+static int hf_mpls_echo_sub_tlv_multipath_value;
+static int hf_mpls_echo_sub_tlv_resv;
+static int hf_mpls_echo_sub_tlv_multipath_info;
+/* static int hf_mpls_echo_tlv_ddstlv_map_mp_label; */
+static int hf_mpls_echo_tlv_ddstlv_map_mp_proto;
+/* static int hf_mpls_echo_tlv_ddstlv_map_mp_exp; */
+/* static int hf_mpls_echo_tlv_ddstlv_map_mp_bos; */
+static int hf_mpls_echo_sub_tlv_multipath_ip;
+static int hf_mpls_echo_sub_tlv_mp_ip_low;
+static int hf_mpls_echo_sub_tlv_mp_ip_high;
+static int hf_mpls_echo_sub_tlv_mp_mask;
+static int hf_mpls_echo_sub_tlv_op_type;
+static int hf_mpls_echo_sub_tlv_addr_type;
+static int hf_mpls_echo_sub_tlv_fec_tlv_value;
+static int hf_mpls_echo_sub_tlv_label;
+static int hf_mpls_echo_sub_tlv_traffic_class;
+static int hf_mpls_echo_sub_tlv_s_bit;
+static int hf_mpls_echo_sub_tlv_res;
+static int hf_mpls_echo_sub_tlv_remote_peer_unspecified;
+static int hf_mpls_echo_sub_tlv_remote_peer_ip;
+static int hf_mpls_echo_sub_tlv_remore_peer_ipv6;
+static int hf_mpls_echo_tlv_dd_map_type;
+static int hf_mpls_echo_tlv_dd_map_length;
+static int hf_mpls_echo_tlv_dd_map_value;
+static int hf_mpls_echo_tlv_padaction;
+static int hf_mpls_echo_tlv_padding;
+static int hf_mpls_echo_tlv_vendor;
+static int hf_mpls_echo_tlv_ilso_addr_type;
+static int hf_mpls_echo_tlv_ilso_mbz;
+static int hf_mpls_echo_tlv_ilso_ipv4_addr;
+static int hf_mpls_echo_tlv_ilso_ipv4_int_addr;
+static int hf_mpls_echo_tlv_ilso_ipv6_addr;
+static int hf_mpls_echo_tlv_ilso_ipv6_int_addr;
+static int hf_mpls_echo_tlv_ilso_int_index;
+static int hf_mpls_echo_tlv_ilso_label;
+static int hf_mpls_echo_tlv_ilso_exp;
+static int hf_mpls_echo_tlv_ilso_bos;
+static int hf_mpls_echo_tlv_ilso_ttl;
 #if 0
-static int hf_mpls_echo_tlv_rto_ipv4 = -1;
-static int hf_mpls_echo_tlv_rto_ipv6 = -1;
+static int hf_mpls_echo_tlv_rto_ipv4;
+static int hf_mpls_echo_tlv_rto_ipv6;
 #endif
-static int hf_mpls_echo_tlv_reply_tos = -1;
-static int hf_mpls_echo_tlv_reply_tos_mbz = -1;
-static int hf_mpls_echo_tlv_errored_type = -1;
-static int hf_mpls_echo_tlv_ds_map_ingress_if_num = -1;
-static int hf_mpls_echo_tlv_ds_map_egress_if_num = -1;
-static int hf_mpls_echo_lspping_tlv_src_gid = -1;
-static int hf_mpls_echo_lspping_tlv_src_nid = -1;
-static int hf_mpls_echo_lspping_tlv_src_tunnel_no = -1;
-static int hf_mpls_echo_lspping_tlv_lsp_no = -1;
-static int hf_mpls_echo_lspping_tlv_dst_gid = -1;
-static int hf_mpls_echo_lspping_tlv_dst_nid = -1;
-static int hf_mpls_echo_lspping_tlv_dst_tunnel_no = -1;
-static int hf_mpls_echo_lspping_tlv_resv = -1;
-static int hf_mpls_echo_lspping_tlv_src_addr_gid = -1;
-static int hf_mpls_echo_lspping_tlv_src_addr_nid=-1;
-static int hf_mpls_echo_lspping_tlv_pw_serv_identifier = -1;
-static int hf_mpls_echo_lspping_tlv_pw_src_ac_id = -1;
-static int hf_mpls_echo_lspping_tlv_pw_dst_ac_id = -1;
-static int hf_mpls_echo_padding = -1;
-/* static int hf_mpls_echo_lspping_tlv_pw_agi_type = -1; */
-/* static int hf_mpls_echo_lspping_tlv_pw_agi_len = -1; */
-/* static int hf_mpls_echo_lspping_tlv_pw_agi_val = -1; */
-static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv4_p2mp_id = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_mbz1 = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_tunnel_id = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv4_ext_tunnel_id = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv4_ipv4_sender = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_mbz2 = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_lsp_id = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv6_p2mp_id = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv6_ext_tunnel_id = -1;
-static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv6_ipv6_sender = -1;
-static int hf_mpls_echo_tlv_echo_jitter = -1;
-static int hf_mpls_echo_tlv_responder_indent_type = -1;
-static int hf_mpls_echo_tlv_responder_indent_len = -1;
-static int hf_mpls_echo_tlv_responder_indent_ipv4 = -1;
-/* static int hf_mpls_echo_tlv_responder_indent_ipv6 = -1; */
-static int hf_mpls_echo_tlv_bfd = -1;
-
-static gint ett_mpls_echo = -1;
-static gint ett_mpls_echo_gflags = -1;
-static gint ett_mpls_echo_tlv = -1;
-static gint ett_mpls_echo_tlv_fec = -1;
-static gint ett_mpls_echo_tlv_ds_map = -1;
-static gint ett_mpls_echo_tlv_ilso = -1;
-static gint ett_mpls_echo_tlv_dd_map = -1;
-static gint ett_mpls_echo_tlv_ddstlv_map = -1;
-
-static expert_field ei_mpls_echo_tlv_fec_len = EI_INIT;
-static expert_field ei_mpls_echo_tlv_dd_map_subtlv_len = EI_INIT;
-static expert_field ei_mpls_echo_tlv_len = EI_INIT;
-static expert_field ei_mpls_echo_tlv_ds_map_muti_len = EI_INIT;
-static expert_field ei_mpls_echo_unknown_address_type = EI_INIT;
-static expert_field ei_mpls_echo_incorrect_address_type = EI_INIT;
-static expert_field ei_mpls_echo_malformed = EI_INIT;
+static int hf_mpls_echo_tlv_reply_tos;
+static int hf_mpls_echo_tlv_reply_tos_mbz;
+static int hf_mpls_echo_tlv_errored_type;
+static int hf_mpls_echo_tlv_ds_map_ingress_if_num;
+static int hf_mpls_echo_tlv_ds_map_egress_if_num;
+static int hf_mpls_echo_lspping_tlv_src_gid;
+static int hf_mpls_echo_lspping_tlv_src_nid;
+static int hf_mpls_echo_lspping_tlv_src_tunnel_no;
+static int hf_mpls_echo_lspping_tlv_lsp_no;
+static int hf_mpls_echo_lspping_tlv_dst_gid;
+static int hf_mpls_echo_lspping_tlv_dst_nid;
+static int hf_mpls_echo_lspping_tlv_dst_tunnel_no;
+static int hf_mpls_echo_lspping_tlv_resv;
+static int hf_mpls_echo_lspping_tlv_src_addr_gid;
+static int hf_mpls_echo_lspping_tlv_src_addr_nid;
+static int hf_mpls_echo_lspping_tlv_pw_serv_identifier;
+static int hf_mpls_echo_lspping_tlv_pw_src_ac_id;
+static int hf_mpls_echo_lspping_tlv_pw_dst_ac_id;
+static int hf_mpls_echo_padding;
+/* static int hf_mpls_echo_lspping_tlv_pw_agi_type; */
+/* static int hf_mpls_echo_lspping_tlv_pw_agi_len; */
+/* static int hf_mpls_echo_lspping_tlv_pw_agi_val; */
+static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv4_p2mp_id;
+static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_mbz1;
+static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_tunnel_id;
+static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv4_ext_tunnel_id;
+static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv4_ipv4_sender;
+static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_mbz2;
+static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ip_lsp_id;
+static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv6_p2mp_id;
+static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv6_ext_tunnel_id;
+static int hf_mpls_echo_tlv_fec_rsvp_p2mp_ipv6_ipv6_sender;
+static int hf_mpls_echo_tlv_echo_jitter;
+static int hf_mpls_echo_tlv_responder_indent_type;
+static int hf_mpls_echo_tlv_responder_indent_len;
+static int hf_mpls_echo_tlv_responder_indent_ipv4;
+/* static int hf_mpls_echo_tlv_responder_indent_ipv6; */
+static int hf_mpls_echo_tlv_bfd;
+
+static gint ett_mpls_echo;
+static gint ett_mpls_echo_gflags;
+static gint ett_mpls_echo_tlv;
+static gint ett_mpls_echo_tlv_fec;
+static gint ett_mpls_echo_tlv_ds_map;
+static gint ett_mpls_echo_tlv_ilso;
+static gint ett_mpls_echo_tlv_dd_map;
+static gint ett_mpls_echo_tlv_ddstlv_map;
+
+static expert_field ei_mpls_echo_tlv_fec_len;
+static expert_field ei_mpls_echo_tlv_dd_map_subtlv_len;
+static expert_field ei_mpls_echo_tlv_len;
+static expert_field ei_mpls_echo_tlv_ds_map_muti_len;
+static expert_field ei_mpls_echo_unknown_address_type;
+static expert_field ei_mpls_echo_incorrect_address_type;
+static expert_field ei_mpls_echo_malformed;
 
 static const value_string mpls_echo_msgtype[] = {
     {1, "MPLS Echo Request"},
diff --git a/epan/dissectors/packet-mpls-mac.c b/epan/dissectors/packet-mpls-mac.c
index 7bb27724eb..334dc45e62 100644
--- a/epan/dissectors/packet-mpls-mac.c
+++ b/epan/dissectors/packet-mpls-mac.c
@@ -19,24 +19,24 @@ void proto_reg_handoff_mpls_mac(void);
 
 static dissector_handle_t mpls_mac_handle;
 
-static gint proto_mpls_mac = -1;
-
-static gint ett_mpls_mac = -1;
-static gint ett_mpls_mac_flags = -1;
-static gint ett_mpls_mac_tlv = -1;
-
-static int hf_mpls_mac_reserved = -1;
-static int hf_mpls_mac_tlv_length_total = -1;
-static int hf_mpls_mac_flags = -1;
-static int hf_mpls_mac_flags_a = -1;
-static int hf_mpls_mac_flags_r = -1;
-static int hf_mpls_mac_flags_reserved = -1;
-static int hf_mpls_mac_tlv = -1;
-static int hf_mpls_mac_tlv_res = -1;
-static int hf_mpls_mac_tlv_type = -1;
-static int hf_mpls_mac_tlv_length = -1;
-static int hf_mpls_mac_tlv_value = -1;
-static int hf_mpls_mac_tlv_sequence_number = -1;
+static gint proto_mpls_mac;
+
+static gint ett_mpls_mac;
+static gint ett_mpls_mac_flags;
+static gint ett_mpls_mac_tlv;
+
+static int hf_mpls_mac_reserved;
+static int hf_mpls_mac_tlv_length_total;
+static int hf_mpls_mac_flags;
+static int hf_mpls_mac_flags_a;
+static int hf_mpls_mac_flags_r;
+static int hf_mpls_mac_flags_reserved;
+static int hf_mpls_mac_tlv;
+static int hf_mpls_mac_tlv_res;
+static int hf_mpls_mac_tlv_type;
+static int hf_mpls_mac_tlv_length;
+static int hf_mpls_mac_tlv_value;
+static int hf_mpls_mac_tlv_sequence_number;
 
 
 static int * const mpls_mac_flags[] = {
diff --git a/epan/dissectors/packet-mpls-pm.c b/epan/dissectors/packet-mpls-pm.c
index 307544d8dd..2200a14d2e 100644
--- a/epan/dissectors/packet-mpls-pm.c
+++ b/epan/dissectors/packet-mpls-pm.c
@@ -35,76 +35,76 @@ void proto_reg_handoff_mpls_pm(void);
 #define MPLS_PM_DFLAGS_RES  0x30
 #define MPLS_PM_DFLAGS_MASK 0xF0
 
-static gint proto_mpls_pm_dlm = -1;
-static gint proto_mpls_pm_ilm = -1;
-static gint proto_mpls_pm_dm = -1;
-static gint proto_mpls_pm_dlm_dm = -1;
-static gint proto_mpls_pm_ilm_dm = -1;
-
-static gint ett_mpls_pm = -1;
-static gint ett_mpls_pm_flags = -1;
-static gint ett_mpls_pm_dflags = -1;
-
-static int hf_mpls_pm_version = -1;
-static int hf_mpls_pm_flags = -1;
-static int hf_mpls_pm_flags_r = -1;
-static int hf_mpls_pm_flags_t = -1;
-static int hf_mpls_pm_flags_res = -1;
-static int hf_mpls_pm_query_ctrl_code = -1;
-static int hf_mpls_pm_response_ctrl_code = -1;
-static int hf_mpls_pm_length = -1;
-static int hf_mpls_pm_dflags = -1;
-static int hf_mpls_pm_dflags_x = -1;
-static int hf_mpls_pm_dflags_b = -1;
-static int hf_mpls_pm_dflags_res = -1;
-static int hf_mpls_pm_otf = -1;
-static int hf_mpls_pm_session_id = -1;
-static int hf_mpls_pm_ds = -1;
-static int hf_mpls_pm_origin_timestamp_null = -1;
-static int hf_mpls_pm_origin_timestamp_seq = -1;
-static int hf_mpls_pm_origin_timestamp_ntp = -1;
-static int hf_mpls_pm_origin_timestamp_ptp = -1;
-static int hf_mpls_pm_origin_timestamp_unk = -1;
-static int hf_mpls_pm_counter1 = -1;
-static int hf_mpls_pm_counter2 = -1;
-static int hf_mpls_pm_counter3 = -1;
-static int hf_mpls_pm_counter4 = -1;
-static int hf_mpls_pm_qtf = -1;
-static int hf_mpls_pm_qtf_combined = -1;
-static int hf_mpls_pm_rtf = -1;
-static int hf_mpls_pm_rtf_combined = -1;
-static int hf_mpls_pm_rptf = -1;
-static int hf_mpls_pm_rptf_combined = -1;
-static int hf_mpls_pm_timestamp1_q_null = -1;
-static int hf_mpls_pm_timestamp1_r_null = -1;
-static int hf_mpls_pm_timestamp1_q_seq = -1;
-static int hf_mpls_pm_timestamp1_r_seq = -1;
-static int hf_mpls_pm_timestamp1_q_ntp = -1;
-static int hf_mpls_pm_timestamp1_r_ntp = -1;
-static int hf_mpls_pm_timestamp1_q_ptp = -1;
-static int hf_mpls_pm_timestamp1_r_ptp = -1;
-static int hf_mpls_pm_timestamp1_unk = -1;
-static int hf_mpls_pm_timestamp2_q_null = -1;
-static int hf_mpls_pm_timestamp2_r_null = -1;
-static int hf_mpls_pm_timestamp2_q_seq = -1;
-static int hf_mpls_pm_timestamp2_r_seq = -1;
-static int hf_mpls_pm_timestamp2_q_ntp = -1;
-static int hf_mpls_pm_timestamp2_r_ntp = -1;
-static int hf_mpls_pm_timestamp2_q_ptp = -1;
-static int hf_mpls_pm_timestamp2_r_ptp = -1;
-static int hf_mpls_pm_timestamp2_unk = -1;
-static int hf_mpls_pm_timestamp3_null = -1;
-static int hf_mpls_pm_timestamp3_r_null = -1;
-static int hf_mpls_pm_timestamp3_r_seq = -1;
-static int hf_mpls_pm_timestamp3_r_ntp = -1;
-static int hf_mpls_pm_timestamp3_r_ptp = -1;
-static int hf_mpls_pm_timestamp3_unk = -1;
-static int hf_mpls_pm_timestamp4_null = -1;
-static int hf_mpls_pm_timestamp4_r_null = -1;
-static int hf_mpls_pm_timestamp4_r_seq = -1;
-static int hf_mpls_pm_timestamp4_r_ntp = -1;
-static int hf_mpls_pm_timestamp4_r_ptp = -1;
-static int hf_mpls_pm_timestamp4_unk = -1;
+static gint proto_mpls_pm_dlm;
+static gint proto_mpls_pm_ilm;
+static gint proto_mpls_pm_dm;
+static gint proto_mpls_pm_dlm_dm;
+static gint proto_mpls_pm_ilm_dm;
+
+static gint ett_mpls_pm;
+static gint ett_mpls_pm_flags;
+static gint ett_mpls_pm_dflags;
+
+static int hf_mpls_pm_version;
+static int hf_mpls_pm_flags;
+static int hf_mpls_pm_flags_r;
+static int hf_mpls_pm_flags_t;
+static int hf_mpls_pm_flags_res;
+static int hf_mpls_pm_query_ctrl_code;
+static int hf_mpls_pm_response_ctrl_code;
+static int hf_mpls_pm_length;
+static int hf_mpls_pm_dflags;
+static int hf_mpls_pm_dflags_x;
+static int hf_mpls_pm_dflags_b;
+static int hf_mpls_pm_dflags_res;
+static int hf_mpls_pm_otf;
+static int hf_mpls_pm_session_id;
+static int hf_mpls_pm_ds;
+static int hf_mpls_pm_origin_timestamp_null;
+static int hf_mpls_pm_origin_timestamp_seq;
+static int hf_mpls_pm_origin_timestamp_ntp;
+static int hf_mpls_pm_origin_timestamp_ptp;
+static int hf_mpls_pm_origin_timestamp_unk;
+static int hf_mpls_pm_counter1;
+static int hf_mpls_pm_counter2;
+static int hf_mpls_pm_counter3;
+static int hf_mpls_pm_counter4;
+static int hf_mpls_pm_qtf;
+static int hf_mpls_pm_qtf_combined;
+static int hf_mpls_pm_rtf;
+static int hf_mpls_pm_rtf_combined;
+static int hf_mpls_pm_rptf;
+static int hf_mpls_pm_rptf_combined;
+static int hf_mpls_pm_timestamp1_q_null;
+static int hf_mpls_pm_timestamp1_r_null;
+static int hf_mpls_pm_timestamp1_q_seq;
+static int hf_mpls_pm_timestamp1_r_seq;
+static int hf_mpls_pm_timestamp1_q_ntp;
+static int hf_mpls_pm_timestamp1_r_ntp;
+static int hf_mpls_pm_timestamp1_q_ptp;
+static int hf_mpls_pm_timestamp1_r_ptp;
+static int hf_mpls_pm_timestamp1_unk;
+static int hf_mpls_pm_timestamp2_q_null;
+static int hf_mpls_pm_timestamp2_r_null;
+static int hf_mpls_pm_timestamp2_q_seq;
+static int hf_mpls_pm_timestamp2_r_seq;
+static int hf_mpls_pm_timestamp2_q_ntp;
+static int hf_mpls_pm_timestamp2_r_ntp;
+static int hf_mpls_pm_timestamp2_q_ptp;
+static int hf_mpls_pm_timestamp2_r_ptp;
+static int hf_mpls_pm_timestamp2_unk;
+static int hf_mpls_pm_timestamp3_null;
+static int hf_mpls_pm_timestamp3_r_null;
+static int hf_mpls_pm_timestamp3_r_seq;
+static int hf_mpls_pm_timestamp3_r_ntp;
+static int hf_mpls_pm_timestamp3_r_ptp;
+static int hf_mpls_pm_timestamp3_unk;
+static int hf_mpls_pm_timestamp4_null;
+static int hf_mpls_pm_timestamp4_r_null;
+static int hf_mpls_pm_timestamp4_r_seq;
+static int hf_mpls_pm_timestamp4_r_ntp;
+static int hf_mpls_pm_timestamp4_r_ptp;
+static int hf_mpls_pm_timestamp4_unk;
 
 /*
  * FF: please keep this list in sync with
diff --git a/epan/dissectors/packet-mpls-psc.c b/epan/dissectors/packet-mpls-psc.c
index bd05a1b4d4..6529439bcf 100644
--- a/epan/dissectors/packet-mpls-psc.c
+++ b/epan/dissectors/packet-mpls-psc.c
@@ -24,17 +24,17 @@ void proto_reg_handoff_mpls_psc(void);
 
 static dissector_handle_t mpls_psc_handle;
 
-static gint proto_mpls_psc = -1;
+static gint proto_mpls_psc;
 
-static gint ett_mpls_psc = -1;
+static gint ett_mpls_psc;
 
-static int hf_mpls_psc_ver = -1;
-static int hf_mpls_psc_req = -1;
-static int hf_mpls_psc_pt = -1;
-static int hf_mpls_psc_rev = -1;
-static int hf_mpls_psc_fpath = -1;
-static int hf_mpls_psc_dpath = -1;
-static int hf_mpls_psc_tlvlen = -1;
+static int hf_mpls_psc_ver;
+static int hf_mpls_psc_req;
+static int hf_mpls_psc_pt;
+static int hf_mpls_psc_rev;
+static int hf_mpls_psc_fpath;
+static int hf_mpls_psc_dpath;
+static int hf_mpls_psc_tlvlen;
 
 /*
  * FF: please keep this list in sync with
diff --git a/epan/dissectors/packet-mpls-y1711.c b/epan/dissectors/packet-mpls-y1711.c
index ad7ccab5bc..bf299cad0b 100644
--- a/epan/dissectors/packet-mpls-y1711.c
+++ b/epan/dissectors/packet-mpls-y1711.c
@@ -33,31 +33,31 @@
 void proto_register_mpls_y1711(void);
 void proto_reg_handoff_mpls_y1711(void);
 
-static gint proto_mpls_y1711 = -1;
-
-static int hf_mpls_y1711_function_type = -1;
-/* static int hf_mpls_y1711_ttsi = -1; */
-static int hf_mpls_y1711_frequency = -1;
-static int hf_mpls_y1711_defect_type = -1;
-static int hf_mpls_y1711_defect_location = -1;
-static int hf_mpls_y1711_bip16 = -1;
+static gint proto_mpls_y1711;
+
+static int hf_mpls_y1711_function_type;
+/* static int hf_mpls_y1711_ttsi; */
+static int hf_mpls_y1711_frequency;
+static int hf_mpls_y1711_defect_type;
+static int hf_mpls_y1711_defect_location;
+static int hf_mpls_y1711_bip16;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_mpls_y1711_lsr_id = -1;
-static int hf_mpls_y1711_lsp_id = -1;
+static int hf_mpls_y1711_lsr_id;
+static int hf_mpls_y1711_lsp_id;
 
-static gint ett_mpls_y1711 = -1;
+static gint ett_mpls_y1711;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_mpls_y1711_padding_not_ff = EI_INIT;
-static expert_field ei_mpls_y1711_reserved_not_zero = EI_INIT;
-static expert_field ei_mpls_y1711_ttsi_not_preset = EI_INIT;
-static expert_field ei_mpls_y1711_minimum_payload = EI_INIT;
-static expert_field ei_mpls_y1711_s_bit_not_one = EI_INIT;
-static expert_field ei_mpls_y1711_no_OAM_alert_label = EI_INIT;
-static expert_field ei_mpls_y1711_exp_bits_not_zero = EI_INIT;
-static expert_field ei_mpls_y1711_ttl_not_one = EI_INIT;
-static expert_field ei_mpls_y1711_padding_not_zero = EI_INIT;
-static expert_field ei_mpls_y1711_unknown_pdu = EI_INIT;
+static expert_field ei_mpls_y1711_padding_not_ff;
+static expert_field ei_mpls_y1711_reserved_not_zero;
+static expert_field ei_mpls_y1711_ttsi_not_preset;
+static expert_field ei_mpls_y1711_minimum_payload;
+static expert_field ei_mpls_y1711_s_bit_not_one;
+static expert_field ei_mpls_y1711_no_OAM_alert_label;
+static expert_field ei_mpls_y1711_exp_bits_not_zero;
+static expert_field ei_mpls_y1711_ttl_not_one;
+static expert_field ei_mpls_y1711_padding_not_zero;
+static expert_field ei_mpls_y1711_unknown_pdu;
 
 static dissector_handle_t mpls_y1711_handle;
 
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c
index bd96efd9b9..462442c74f 100644
--- a/epan/dissectors/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
@@ -61,15 +61,15 @@
 void proto_register_mpls(void);
 void proto_reg_handoff_mpls(void);
 
-static gint proto_mpls = -1;
-static gint proto_pw_ach = -1;
-static gint proto_pw_ach_mcc = -1;
-static gint proto_pw_mcw = -1;
-
-static gint ett_mpls = -1;
-static gint ett_mpls_pw_ach = -1;
-static gint ett_mpls_pw_ach_mcc = -1;
-static gint ett_mpls_pw_mcw = -1;
+static gint proto_mpls;
+static gint proto_pw_ach;
+static gint proto_pw_ach_mcc;
+static gint proto_pw_mcw;
+
+static gint ett_mpls;
+static gint ett_mpls_pw_ach;
+static gint ett_mpls_pw_ach_mcc;
+static gint ett_mpls_pw_mcw;
 static char PW_ACH[50] = "PW Associated Channel Header";
 
 const value_string special_labels[] = {
@@ -97,26 +97,26 @@ static dissector_handle_t mpls_mcc_handle;
 /* For RFC6391 - Flow aware transport of pseudowire over a mpls PSN*/
 static gboolean mpls_bos_flowlabel = FALSE;
 
-static int hf_mpls_label = -1;
-static int hf_mpls_label_special = -1;
-static int hf_mpls_exp = -1;
-static int hf_mpls_bos = -1;
-static int hf_mpls_ttl = -1;
+static int hf_mpls_label;
+static int hf_mpls_label_special;
+static int hf_mpls_exp;
+static int hf_mpls_bos;
+static int hf_mpls_ttl;
 
-static int hf_mpls_pw_ach_ver = -1;
-static int hf_mpls_pw_ach_res = -1;
-static int hf_mpls_pw_ach_channel_type = -1;
+static int hf_mpls_pw_ach_ver;
+static int hf_mpls_pw_ach_res;
+static int hf_mpls_pw_ach_channel_type;
 
-static int hf_mpls_pw_ach_mcc_proto = -1;
+static int hf_mpls_pw_ach_mcc_proto;
 
-static int hf_mpls_pw_mcw_flags = -1;
-static int hf_mpls_pw_mcw_length = -1;
-static int hf_mpls_pw_mcw_sequence_number = -1;
+static int hf_mpls_pw_mcw_flags;
+static int hf_mpls_pw_mcw_length;
+static int hf_mpls_pw_mcw_sequence_number;
 
-static expert_field ei_mpls_pw_ach_error_processing_message = EI_INIT;
-static expert_field ei_mpls_pw_ach_res = EI_INIT;
-static expert_field ei_mpls_pw_mcw_error_processing_message = EI_INIT;
-static expert_field ei_mpls_invalid_label = EI_INIT;
+static expert_field ei_mpls_pw_ach_error_processing_message;
+static expert_field ei_mpls_pw_ach_res;
+static expert_field ei_mpls_pw_mcw_error_processing_message;
+static expert_field ei_mpls_invalid_label;
 
 #if 0 /*not used yet*/
 /*
diff --git a/epan/dissectors/packet-mplstp-oam.c b/epan/dissectors/packet-mplstp-oam.c
index 6e28d1c548..6c0bdbf4f2 100644
--- a/epan/dissectors/packet-mplstp-oam.c
+++ b/epan/dissectors/packet-mplstp-oam.c
@@ -28,26 +28,26 @@ static dissector_handle_t mplstp_lock_handle;
 static dissector_handle_t mplstp_fm_handle;
 
 /* MPLS-TP FM protocol specific variables */
-static gint proto_mplstp_fm     = -1;
-static gint ett_mplstp_fm       = -1;
-static gint ett_mplstp_fm_flags = -1;
-static gint ett_mplstp_fm_tlv_tree     = -1;
-
-static int hf_mplstp_fm_version         = -1;
-
-static int hf_mplstp_fm_reserved        = -1;
-static int hf_mplstp_fm_msg_type        = -1;
-static int hf_mplstp_fm_flags           = -1;
-static int hf_mplstp_fm_flags_l         = -1;
-static int hf_mplstp_fm_flags_r         = -1;
-static int hf_mplstp_fm_refresh_timer   = -1;
-static int hf_mplstp_fm_total_tlv_len   = -1;
-static int hf_mplstp_fm_if_tlv_type     = -1;
-static int hf_mplstp_fm_global_tlv_type = -1;
-static int hf_mplstp_fm_tlv_len         = -1;
-static int hf_mplstp_fm_node_id         = -1;
-static int hf_mplstp_fm_if_num          = -1;
-static int hf_mplstp_fm_global_id       = -1;
+static gint proto_mplstp_fm;
+static gint ett_mplstp_fm;
+static gint ett_mplstp_fm_flags;
+static gint ett_mplstp_fm_tlv_tree;
+
+static int hf_mplstp_fm_version;
+
+static int hf_mplstp_fm_reserved;
+static int hf_mplstp_fm_msg_type;
+static int hf_mplstp_fm_flags;
+static int hf_mplstp_fm_flags_l;
+static int hf_mplstp_fm_flags_r;
+static int hf_mplstp_fm_refresh_timer;
+static int hf_mplstp_fm_total_tlv_len;
+static int hf_mplstp_fm_if_tlv_type;
+static int hf_mplstp_fm_global_tlv_type;
+static int hf_mplstp_fm_tlv_len;
+static int hf_mplstp_fm_node_id;
+static int hf_mplstp_fm_if_num;
+static int hf_mplstp_fm_global_id;
 
 static const value_string fm_msg_type[] = {
   {0, "No Return Code"},
@@ -57,12 +57,12 @@ static const value_string fm_msg_type[] = {
 };
 
 /* MPLS-TP Lock protocol specific variables */
-static gint proto_mplstp_lock = -1;
-static gint ett_mplstp_lock   = -1;
+static gint proto_mplstp_lock;
+static gint ett_mplstp_lock;
 
-static int hf_mplstp_lock_version       = -1;
-static int hf_mplstp_lock_reserved      = -1;
-static int hf_mplstp_lock_refresh_timer = -1;
+static int hf_mplstp_lock_version;
+static int hf_mplstp_lock_reserved;
+static int hf_mplstp_lock_refresh_timer;
 
 static void
 dissect_mplstp_fm_tlv (tvbuff_t *tvb, proto_tree *tree)
diff --git a/epan/dissectors/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c
index b9b4b97924..1d598a3c4a 100644
--- a/epan/dissectors/packet-mq-pcf.c
+++ b/epan/dissectors/packet-mq-pcf.c
@@ -43,48 +43,48 @@ void proto_reg_handoff_mqpcf(void);
 static guint mq_pcf_maxprm = PCF_MAX_PARM;
 static guint mq_pcf_maxlst = PCF_MAX_LIST;
 
-static int proto_mqpcf = -1;
-
-static int hf_mqpcf_cfh_type = -1;
-static int hf_mqpcf_cfh_length = -1;
-static int hf_mqpcf_cfh_version = -1;
-static int hf_mqpcf_cfh_command = -1;
-static int hf_mqpcf_cfh_MsgSeqNbr = -1;
-static int hf_mqpcf_cfh_control = -1;
-static int hf_mqpcf_cfh_compcode = -1;
-static int hf_mqpcf_cfh_reason = -1;
-static int hf_mqpcf_cfh_ParmCount = -1;
-
-static int hf_mq_pcf_prmtyp = -1;
-static int hf_mq_pcf_prmlen = -1;
-static int hf_mq_pcf_prmid = -1;
-static int hf_mq_pcf_prmidnovals = -1;
-static int hf_mq_pcf_filterop = -1;
-static int hf_mq_pcf_prmccsid = -1;
-static int hf_mq_pcf_prmstrlen = -1;
-static int hf_mq_pcf_prmcount = -1;
-static int hf_mq_pcf_prmunused = -1;
-
-static int hf_mq_pcf_string = -1;
-static int hf_mq_pcf_stringlist = -1;
-static int hf_mq_pcf_int = -1;
-static int hf_mq_pcf_intlist = -1;
-static int hf_mq_pcf_bytestring = -1;
-static int hf_mq_pcf_int64 = -1;
-static int hf_mq_pcf_int64list = -1;
-
-static expert_field ei_mq_pcf_hdrlne = EI_INIT;
-static expert_field ei_mq_pcf_prmln0 = EI_INIT;
-static expert_field ei_mq_pcf_MaxInt = EI_INIT;
-static expert_field ei_mq_pcf_MaxStr = EI_INIT;
-static expert_field ei_mq_pcf_MaxI64 = EI_INIT;
-static expert_field ei_mq_pcf_MaxPrm = EI_INIT;
-static expert_field ei_mq_pcf_PrmCnt = EI_INIT;
-
-static gint ett_mqpcf_prm = -1;
-static gint ett_mqpcf_grp = -1;
-static gint ett_mqpcf = -1;
-static gint ett_mqpcf_cfh = -1;
+static int proto_mqpcf;
+
+static int hf_mqpcf_cfh_type;
+static int hf_mqpcf_cfh_length;
+static int hf_mqpcf_cfh_version;
+static int hf_mqpcf_cfh_command;
+static int hf_mqpcf_cfh_MsgSeqNbr;
+static int hf_mqpcf_cfh_control;
+static int hf_mqpcf_cfh_compcode;
+static int hf_mqpcf_cfh_reason;
+static int hf_mqpcf_cfh_ParmCount;
+
+static int hf_mq_pcf_prmtyp;
+static int hf_mq_pcf_prmlen;
+static int hf_mq_pcf_prmid;
+static int hf_mq_pcf_prmidnovals;
+static int hf_mq_pcf_filterop;
+static int hf_mq_pcf_prmccsid;
+static int hf_mq_pcf_prmstrlen;
+static int hf_mq_pcf_prmcount;
+static int hf_mq_pcf_prmunused;
+
+static int hf_mq_pcf_string;
+static int hf_mq_pcf_stringlist;
+static int hf_mq_pcf_int;
+static int hf_mq_pcf_intlist;
+static int hf_mq_pcf_bytestring;
+static int hf_mq_pcf_int64;
+static int hf_mq_pcf_int64list;
+
+static expert_field ei_mq_pcf_hdrlne;
+static expert_field ei_mq_pcf_prmln0;
+static expert_field ei_mq_pcf_MaxInt;
+static expert_field ei_mq_pcf_MaxStr;
+static expert_field ei_mq_pcf_MaxI64;
+static expert_field ei_mq_pcf_MaxPrm;
+static expert_field ei_mq_pcf_PrmCnt;
+
+static gint ett_mqpcf_prm;
+static gint ett_mqpcf_grp;
+static gint ett_mqpcf;
+static gint ett_mqpcf_cfh;
 
 #define MQ_TEXT_CFH   "MQ Command Format Header"
 
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index ae53d21757..e6f7a75035 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -79,31 +79,31 @@
 void proto_register_mq(void);
 void proto_reg_handoff_mq(void);
 
-static int proto_mq = -1;
-static int hf_mq_tsh_StructID = -1;
-static int hf_mq_tsh_mqseglen = -1;
-static int hf_mq_tsh_convid = -1;
-static int hf_mq_tsh_requestid = -1;
-static int hf_mq_tsh_byteorder = -1;
-static int hf_mq_tsh_opcode = -1;
-static int hf_mq_tsh_ctlflgs1 = -1;
-
-static int hf_mq_tsh_ctlflgs2 = -1;
-static int hf_mq_tsh_luwid = -1;
-static int hf_mq_tsh_encoding = -1;
-
-static int hf_mq_tsh_ccsid = -1;
-static int hf_mq_tsh_reserved = -1;
+static int proto_mq;
+static int hf_mq_tsh_StructID;
+static int hf_mq_tsh_mqseglen;
+static int hf_mq_tsh_convid;
+static int hf_mq_tsh_requestid;
+static int hf_mq_tsh_byteorder;
+static int hf_mq_tsh_opcode;
+static int hf_mq_tsh_ctlflgs1;
+
+static int hf_mq_tsh_ctlflgs2;
+static int hf_mq_tsh_luwid;
+static int hf_mq_tsh_encoding;
+
+static int hf_mq_tsh_ccsid;
+static int hf_mq_tsh_reserved;
 
 /* Transmission Segment Control Flags 1 */
-static int hf_mq_tsh_tcf_confirmreq = -1;
-static int hf_mq_tsh_tcf_error = -1;
-static int hf_mq_tsh_tcf_reqclose = -1;
-static int hf_mq_tsh_tcf_closechann = -1;
-static int hf_mq_tsh_tcf_first = -1;
-static int hf_mq_tsh_tcf_last = -1;
-static int hf_mq_tsh_tcf_reqacc = -1;
-static int hf_mq_tsh_tcf_dlq = -1;
+static int hf_mq_tsh_tcf_confirmreq;
+static int hf_mq_tsh_tcf_error;
+static int hf_mq_tsh_tcf_reqclose;
+static int hf_mq_tsh_tcf_closechann;
+static int hf_mq_tsh_tcf_first;
+static int hf_mq_tsh_tcf_last;
+static int hf_mq_tsh_tcf_reqacc;
+static int hf_mq_tsh_tcf_dlq;
 static int* const pf_flds_tcf[] =
 {
     &hf_mq_tsh_tcf_dlq,
@@ -118,10 +118,10 @@ static int* const pf_flds_tcf[] =
 };
 
 /* Transmission Segment Control Flags 2 */
-static int hf_mq_tsh_tcf2_HdrComp = -1;
-static int hf_mq_tsh_tcf2_MsgComp = -1;
-static int hf_mq_tsh_tcf2_CSH = -1;
-static int hf_mq_tsh_tcf2_CmitIntv = -1;
+static int hf_mq_tsh_tcf2_HdrComp;
+static int hf_mq_tsh_tcf2_MsgComp;
+static int hf_mq_tsh_tcf2_CSH;
+static int hf_mq_tsh_tcf2_CmitIntv;
 static int* const pf_flds_tcf2[] =
 {
     &hf_mq_tsh_tcf2_CmitIntv,
@@ -131,69 +131,69 @@ static int* const pf_flds_tcf2[] =
     NULL
 };
 
-static int hf_mq_api_replylen = -1;
-static int hf_mq_api_compcode = -1;
-static int hf_mq_api_reascode = -1;
-static int hf_mq_api_objecthdl = -1;
-static int hf_mq_socket_conversid = -1;
-static int hf_mq_socket_requestid = -1;
-static int hf_mq_socket_type = -1;
-static int hf_mq_socket_parm1 = -1;
-static int hf_mq_socket_parm2 = -1;
-static int hf_mq_msh_StructID = -1;
-static int hf_mq_msh_seqnum = -1;
-static int hf_mq_msh_datalength = -1;
-static int hf_mq_msh_unknown1 = -1;
-static int hf_mq_msh_msglength = -1;
-static int hf_mq_xqh_StructID = -1;
-static int hf_mq_xqh_version = -1;
-static int hf_mq_xqh_remoteq = -1;
-static int hf_mq_xqh_remoteqmgr = -1;
-
-static int hf_mq_id_StructID = -1;
-static int hf_mq_id_FapLevel = -1;
-static int hf_mq_id_cf1 = -1;
-static int hf_mq_id_ecf1 = -1;
-static int hf_mq_id_ief1 = -1;
-static int hf_mq_id_Reserved = -1;
-static int hf_mq_id_MaxMsgBatch = -1;
-static int hf_mq_id_MaxTrSize = -1;
-static int hf_mq_id_MaxMsgSize = -1;
-static int hf_mq_id_SeqWrapVal = -1;
-static int hf_mq_id_channel = -1;
-static int hf_mq_id_cf2 = -1;
-static int hf_mq_id_ecf2 = -1;
-static int hf_mq_id_ccsid = -1;
-static int hf_mq_id_qmgrname = -1;
-static int hf_mq_id_HBInterval = -1;
-static int hf_mq_id_EFLLength = -1;
-static int hf_mq_id_ief2 = -1;
-static int hf_mq_id_Reserved1 = -1;
-static int hf_mq_id_HdrCprsLst = -1;
-static int hf_mq_id_MsgCprsLst = -1;
-static int hf_mq_id_Reserved2 = -1;
-static int hf_mq_id_SSLKeyRst = -1;
-static int hf_mq_id_ConvBySkt = -1;
-static int hf_mq_id_cf3 = -1;
-static int hf_mq_id_ecf3 = -1;
-static int hf_mq_id_Reserved3 = -1;
-static int hf_mq_id_ProcessId = -1;
-static int hf_mq_id_ThreadId = -1;
-static int hf_mq_id_TraceId = -1;
-static int hf_mq_id_ProdId = -1;
-static int hf_mq_id_mqmid = -1;
-static int hf_mq_id_pal = -1;
-static int hf_mq_id_r = -1;
+static int hf_mq_api_replylen;
+static int hf_mq_api_compcode;
+static int hf_mq_api_reascode;
+static int hf_mq_api_objecthdl;
+static int hf_mq_socket_conversid;
+static int hf_mq_socket_requestid;
+static int hf_mq_socket_type;
+static int hf_mq_socket_parm1;
+static int hf_mq_socket_parm2;
+static int hf_mq_msh_StructID;
+static int hf_mq_msh_seqnum;
+static int hf_mq_msh_datalength;
+static int hf_mq_msh_unknown1;
+static int hf_mq_msh_msglength;
+static int hf_mq_xqh_StructID;
+static int hf_mq_xqh_version;
+static int hf_mq_xqh_remoteq;
+static int hf_mq_xqh_remoteqmgr;
+
+static int hf_mq_id_StructID;
+static int hf_mq_id_FapLevel;
+static int hf_mq_id_cf1;
+static int hf_mq_id_ecf1;
+static int hf_mq_id_ief1;
+static int hf_mq_id_Reserved;
+static int hf_mq_id_MaxMsgBatch;
+static int hf_mq_id_MaxTrSize;
+static int hf_mq_id_MaxMsgSize;
+static int hf_mq_id_SeqWrapVal;
+static int hf_mq_id_channel;
+static int hf_mq_id_cf2;
+static int hf_mq_id_ecf2;
+static int hf_mq_id_ccsid;
+static int hf_mq_id_qmgrname;
+static int hf_mq_id_HBInterval;
+static int hf_mq_id_EFLLength;
+static int hf_mq_id_ief2;
+static int hf_mq_id_Reserved1;
+static int hf_mq_id_HdrCprsLst;
+static int hf_mq_id_MsgCprsLst;
+static int hf_mq_id_Reserved2;
+static int hf_mq_id_SSLKeyRst;
+static int hf_mq_id_ConvBySkt;
+static int hf_mq_id_cf3;
+static int hf_mq_id_ecf3;
+static int hf_mq_id_Reserved3;
+static int hf_mq_id_ProcessId;
+static int hf_mq_id_ThreadId;
+static int hf_mq_id_TraceId;
+static int hf_mq_id_ProdId;
+static int hf_mq_id_mqmid;
+static int hf_mq_id_pal;
+static int hf_mq_id_r;
 
 /* Initial Data - Capability Flag 1 */
-static int hf_mq_id_cf1_msgseq = -1;
-static int hf_mq_id_cf1_convcap = -1;
-static int hf_mq_id_cf1_splitmsg = -1;
-static int hf_mq_id_cf1_RqstInit = -1;
-static int hf_mq_id_cf1_RqstSecu = -1;
-static int hf_mq_id_cf1_mqreq = -1;
-static int hf_mq_id_cf1_svrsec = -1;
-static int hf_mq_id_cf1_runtime = -1;
+static int hf_mq_id_cf1_msgseq;
+static int hf_mq_id_cf1_convcap;
+static int hf_mq_id_cf1_splitmsg;
+static int hf_mq_id_cf1_RqstInit;
+static int hf_mq_id_cf1_RqstSecu;
+static int hf_mq_id_cf1_mqreq;
+static int hf_mq_id_cf1_svrsec;
+static int hf_mq_id_cf1_runtime;
 static int* const pf_flds_cf1[] =
 {
     &hf_mq_id_cf1_runtime,
@@ -208,14 +208,14 @@ static int* const pf_flds_cf1[] =
 };
 
 /* Initial Data - Init Error Flag 1 */
-static int hf_mq_id_ief1_ccsid = -1;
-static int hf_mq_id_ief1_enc = -1;
-static int hf_mq_id_ief1_mxtrsz = -1;
-static int hf_mq_id_ief1_fap = -1;
-static int hf_mq_id_ief1_mxmsgsz = -1;
-static int hf_mq_id_ief1_mxmsgpb = -1;
-static int hf_mq_id_ief1_seqwrap = -1;
-static int hf_mq_id_ief1_hbint = -1;
+static int hf_mq_id_ief1_ccsid;
+static int hf_mq_id_ief1_enc;
+static int hf_mq_id_ief1_mxtrsz;
+static int hf_mq_id_ief1_fap;
+static int hf_mq_id_ief1_mxmsgsz;
+static int hf_mq_id_ief1_mxmsgpb;
+static int hf_mq_id_ief1_seqwrap;
+static int hf_mq_id_ief1_hbint;
 static int* const pf_flds_ef1[] =
 {
     &hf_mq_id_ief1_hbint,
@@ -230,14 +230,14 @@ static int* const pf_flds_ef1[] =
 };
 
 /* Initial Data - Capability Flag 2 */
-static int hf_mq_id_cf2_CanDstLst = -1;
-static int hf_mq_id_cf2_FstMsgReq = -1;
-static int hf_mq_id_cf2_RespConv = -1;
-static int hf_mq_id_cf2_XARequest = -1;
-static int hf_mq_id_cf2_XARunTApp = -1;
-static int hf_mq_id_cf2_SPIRqst = -1;
-static int hf_mq_id_cf2_DualUOW = -1;
-static int hf_mq_id_cf2_CanTrcRte = -1;
+static int hf_mq_id_cf2_CanDstLst;
+static int hf_mq_id_cf2_FstMsgReq;
+static int hf_mq_id_cf2_RespConv;
+static int hf_mq_id_cf2_XARequest;
+static int hf_mq_id_cf2_XARunTApp;
+static int hf_mq_id_cf2_SPIRqst;
+static int hf_mq_id_cf2_DualUOW;
+static int hf_mq_id_cf2_CanTrcRte;
 static int* const pf_flds_cf2[] =
 {
     &hf_mq_id_cf2_CanTrcRte,
@@ -252,9 +252,9 @@ static int* const pf_flds_cf2[] =
 };
 
 /* Initial Data - Init Error Flag 2 */
-static int hf_mq_id_ief2_HdrCmpLst = -1;
-static int hf_mq_id_ief2_MsgCmpLst = -1;
-static int hf_mq_id_ief2_SSLReset = -1;
+static int hf_mq_id_ief2_HdrCmpLst;
+static int hf_mq_id_ief2_MsgCmpLst;
+static int hf_mq_id_ief2_SSLReset;
 static int* const pf_flds_ef2[] =
 {
     &hf_mq_id_ief2_SSLReset,
@@ -264,12 +264,12 @@ static int* const pf_flds_ef2[] =
 };
 
 /* Initial Data - Capability Flag 3 */
-static int hf_mq_id_cf3_CanMsgPrp = -1;
-static int hf_mq_id_cf3_CanMulticast = -1;
-static int hf_mq_id_cf3_PropIntSep = -1;
-static int hf_mq_id_cf3_MPlxSyGet = -1;
-static int hf_mq_id_cf3_ProtAlgorit = -1;
-static int hf_mq_id_cf3_CanGenConnTag = -1;
+static int hf_mq_id_cf3_CanMsgPrp;
+static int hf_mq_id_cf3_CanMulticast;
+static int hf_mq_id_cf3_PropIntSep;
+static int hf_mq_id_cf3_MPlxSyGet;
+static int hf_mq_id_cf3_ProtAlgorit;
+static int hf_mq_id_cf3_CanGenConnTag;
 
 static int* const pf_flds_cf3[] =
 {
@@ -282,61 +282,61 @@ static int* const pf_flds_cf3[] =
     NULL
 };
 
-static int hf_mq_uid_StructID = -1;
-static int hf_mq_uid_userid = -1;
-static int hf_mq_uid_password = -1;
-static int hf_mq_uid_longuserid = -1;
-static int hf_mq_sidlen = -1;
-static int hf_mq_sidtyp = -1;
-static int hf_mq_securityid = -1;
-
-static int hf_mq_conn_QMgr = -1;
-static int hf_mq_conn_appname = -1;
-static int hf_mq_conn_apptype = -1;
-static int hf_mq_conn_acttoken = -1;
-static int hf_mq_conn_Xoptions = -1;
-static int hf_mq_conn_options = -1;
-static int hf_mq_fcno_StructID = -1;
-static int hf_mq_fcno_prodid = -1;
-static int hf_mq_fcno_mqmid = -1;
-static int hf_mq_fcno_version = -1;
-static int hf_mq_fcno_capflag = -1;
-static int hf_mq_fcno_conn_tag = -1;
-static int hf_mq_fcno_retconn_tag = -1;
-static int hf_mq_fcno_unknowb01 = -1;
-
-static int hf_mq_inq_nbsel = -1;
-static int hf_mq_inq_nbint = -1;
-static int hf_mq_inq_charlen = -1;
-static int hf_mq_inq_sel = -1;
-static int hf_mq_inq_intvalue = -1;
-static int hf_mq_inq_charvalues = -1;
-
-static int hf_mq_spi_verb = -1;
-static int hf_mq_spi_version = -1;
-static int hf_mq_spi_length = -1;
-static int hf_mq_spi_base_StructID = -1;
-static int hf_mq_spi_base_version = -1;
-static int hf_mq_spi_base_length = -1;
-static int hf_mq_spi_spqo_nbverb = -1;
-static int hf_mq_spi_spqo_verbid = -1;
-static int hf_mq_spi_spqo_maxiover = -1;
-static int hf_mq_spi_spqo_maxinver = -1;
-static int hf_mq_spi_spqo_maxouver = -1;
-static int hf_mq_spi_spqo_flags = -1;
-static int hf_mq_spi_spai_mode = -1;
-static int hf_mq_spi_spai_unknown1 = -1;
-static int hf_mq_spi_spai_unknown2 = -1;
-static int hf_mq_spi_spai_msgid = -1;
-static int hf_mq_spi_spgi_batchsz = -1;
-static int hf_mq_spi_spgi_batchint = -1;
-static int hf_mq_spi_spgi_maxmsgsz = -1;
-static int hf_mq_spi_spgo_options = -1;
-static int hf_mq_spi_spgo_size = -1;
-
-static int hf_mq_spi_opt_blank = -1;
-static int hf_mq_spi_opt_syncp = -1;
-static int hf_mq_spi_opt_deferred = -1;
+static int hf_mq_uid_StructID;
+static int hf_mq_uid_userid;
+static int hf_mq_uid_password;
+static int hf_mq_uid_longuserid;
+static int hf_mq_sidlen;
+static int hf_mq_sidtyp;
+static int hf_mq_securityid;
+
+static int hf_mq_conn_QMgr;
+static int hf_mq_conn_appname;
+static int hf_mq_conn_apptype;
+static int hf_mq_conn_acttoken;
+static int hf_mq_conn_Xoptions;
+static int hf_mq_conn_options;
+static int hf_mq_fcno_StructID;
+static int hf_mq_fcno_prodid;
+static int hf_mq_fcno_mqmid;
+static int hf_mq_fcno_version;
+static int hf_mq_fcno_capflag;
+static int hf_mq_fcno_conn_tag;
+static int hf_mq_fcno_retconn_tag;
+static int hf_mq_fcno_unknowb01;
+
+static int hf_mq_inq_nbsel;
+static int hf_mq_inq_nbint;
+static int hf_mq_inq_charlen;
+static int hf_mq_inq_sel;
+static int hf_mq_inq_intvalue;
+static int hf_mq_inq_charvalues;
+
+static int hf_mq_spi_verb;
+static int hf_mq_spi_version;
+static int hf_mq_spi_length;
+static int hf_mq_spi_base_StructID;
+static int hf_mq_spi_base_version;
+static int hf_mq_spi_base_length;
+static int hf_mq_spi_spqo_nbverb;
+static int hf_mq_spi_spqo_verbid;
+static int hf_mq_spi_spqo_maxiover;
+static int hf_mq_spi_spqo_maxinver;
+static int hf_mq_spi_spqo_maxouver;
+static int hf_mq_spi_spqo_flags;
+static int hf_mq_spi_spai_mode;
+static int hf_mq_spi_spai_unknown1;
+static int hf_mq_spi_spai_unknown2;
+static int hf_mq_spi_spai_msgid;
+static int hf_mq_spi_spgi_batchsz;
+static int hf_mq_spi_spgi_batchint;
+static int hf_mq_spi_spgi_maxmsgsz;
+static int hf_mq_spi_spgo_options;
+static int hf_mq_spi_spgo_size;
+
+static int hf_mq_spi_opt_blank;
+static int hf_mq_spi_opt_syncp;
+static int hf_mq_spi_opt_deferred;
 static int* const pf_flds_spiopt[] =
 {
     &hf_mq_spi_opt_deferred,
@@ -345,14 +345,14 @@ static int* const pf_flds_spiopt[] =
     NULL
 };
 
-static int hf_mq_put_length = -1;
+static int hf_mq_put_length;
 
-static int hf_mq_close_options = -1;
-static int hf_mq_close_options_DELETE = -1;
-static int hf_mq_close_options_DELETE_PURGE = -1;
-static int hf_mq_close_options_KEEP_SUB = -1;
-static int hf_mq_close_options_REMOVE_SUB = -1;
-static int hf_mq_close_options_QUIESCE = -1;
+static int hf_mq_close_options;
+static int hf_mq_close_options_DELETE;
+static int hf_mq_close_options_DELETE_PURGE;
+static int hf_mq_close_options_KEEP_SUB;
+static int hf_mq_close_options_REMOVE_SUB;
+static int hf_mq_close_options_QUIESCE;
 static int* const pf_flds_clsopt[] =
 {
     &hf_mq_close_options_QUIESCE,
@@ -363,30 +363,30 @@ static int* const pf_flds_clsopt[] =
     NULL
 };
 
-static int hf_mq_open_options = -1;
-static int hf_mq_open_options_INPUT_SHARED = -1;
-static int hf_mq_open_options_INPUT_AS_Q_DEF = -1;
-static int hf_mq_open_options_INPUT_EXCLUSIVE = -1;
-static int hf_mq_open_options_BROWSE = -1;
-static int hf_mq_open_options_OUTPUT = -1;
-static int hf_mq_open_options_INQUIRE = -1;
-static int hf_mq_open_options_SET = -1;
-static int hf_mq_open_options_SAVE_ALL_CTX = -1;
-static int hf_mq_open_options_PASS_IDENT_CTX = -1;
-static int hf_mq_open_options_PASS_ALL_CTX = -1;
-static int hf_mq_open_options_SET_IDENT_CTX = -1;
-static int hf_mq_open_options_SET_ALL_CONTEXT = -1;
-static int hf_mq_open_options_ALT_USER_AUTH = -1;
-static int hf_mq_open_options_FAIL_IF_QUIESC = -1;
-static int hf_mq_open_options_BIND_ON_OPEN = -1;
-static int hf_mq_open_options_BIND_NOT_FIXED = -1;
-static int hf_mq_open_options_RESOLVE_NAMES = -1;
-static int hf_mq_open_options_CO_OP = -1;
-static int hf_mq_open_options_RESOLVE_LOCAL_Q = -1;
-static int hf_mq_open_options_NO_READ_AHEAD = -1;
-static int hf_mq_open_options_READ_AHEAD = -1;
-static int hf_mq_open_options_NO_MULTICAST = -1;
-static int hf_mq_open_options_BIND_ON_GROUP = -1;
+static int hf_mq_open_options;
+static int hf_mq_open_options_INPUT_SHARED;
+static int hf_mq_open_options_INPUT_AS_Q_DEF;
+static int hf_mq_open_options_INPUT_EXCLUSIVE;
+static int hf_mq_open_options_BROWSE;
+static int hf_mq_open_options_OUTPUT;
+static int hf_mq_open_options_INQUIRE;
+static int hf_mq_open_options_SET;
+static int hf_mq_open_options_SAVE_ALL_CTX;
+static int hf_mq_open_options_PASS_IDENT_CTX;
+static int hf_mq_open_options_PASS_ALL_CTX;
+static int hf_mq_open_options_SET_IDENT_CTX;
+static int hf_mq_open_options_SET_ALL_CONTEXT;
+static int hf_mq_open_options_ALT_USER_AUTH;
+static int hf_mq_open_options_FAIL_IF_QUIESC;
+static int hf_mq_open_options_BIND_ON_OPEN;
+static int hf_mq_open_options_BIND_NOT_FIXED;
+static int hf_mq_open_options_RESOLVE_NAMES;
+static int hf_mq_open_options_CO_OP;
+static int hf_mq_open_options_RESOLVE_LOCAL_Q;
+static int hf_mq_open_options_NO_READ_AHEAD;
+static int hf_mq_open_options_READ_AHEAD;
+static int hf_mq_open_options_NO_MULTICAST;
+static int hf_mq_open_options_BIND_ON_GROUP;
 static int* const pf_flds_opnopt[] =
 {
     &hf_mq_open_options_BIND_ON_GROUP,
@@ -415,151 +415,151 @@ static int* const pf_flds_opnopt[] =
     NULL
 };
 
-static int hf_mq_fopa_StructID = -1;
-static int hf_mq_fopa_version = -1;
-static int hf_mq_fopa_length = -1;
-static int hf_mq_fopa_DefPersistence = -1;
-static int hf_mq_fopa_DefPutRespType = -1;
-static int hf_mq_fopa_DefReadAhead = -1;
-static int hf_mq_fopa_PropertyControl = -1;
-static int hf_mq_fopa_Unknown = -1;
-
-static int hf_mq_fcmi_StructID = -1;
-static int hf_mq_fcmi_unknown = -1;
-
-static int hf_mq_ping_length = -1;
-static int hf_mq_ping_buffer = -1;
-static int hf_mq_reset_length = -1;
-static int hf_mq_reset_seqnum = -1;
-static int hf_mq_status_length = -1;
-static int hf_mq_status_code = -1;
-static int hf_mq_status_value = -1;
-
-static int hf_mq_caut_StructID = -1;
-static int hf_mq_caut_AuthType = -1;
-static int hf_mq_caut_UsrMaxLen = -1;
-static int hf_mq_caut_PwdMaxLen = -1;
-static int hf_mq_caut_UsrLength = -1;
-static int hf_mq_caut_PwdLength = -1;
-static int hf_mq_caut_usr = -1;
-static int hf_mq_caut_psw = -1;
-
-static int hf_mq_od_StructID = -1;
-static int hf_mq_od_version = -1;
-static int hf_mq_od_objecttype = -1;
-static int hf_mq_od_objectname = -1;
-static int hf_mq_od_objqmgrname = -1;
-static int hf_mq_od_dynqname = -1;
-static int hf_mq_od_altuserid = -1;
-static int hf_mq_od_recspresent = -1;
-static int hf_mq_od_knowndstcnt = -1;
-static int hf_mq_od_unknowdstcnt = -1;
-static int hf_mq_od_invaldstcnt = -1;
-static int hf_mq_od_objrecofs = -1;
-static int hf_mq_od_resprecofs = -1;
-static int hf_mq_od_objrecptr = -1;
-static int hf_mq_od_resprecptr = -1;
-static int hf_mq_od_altsecurid = -1;
-static int hf_mq_od_resolvqname = -1;
-static int hf_mq_od_resolvqmgrnm = -1;
-static int hf_mq_od_resolvobjtyp = -1;
-
-static int hf_mq_or_objname = -1;
-static int hf_mq_or_objqmgrname = -1;
-static int hf_mq_rr_compcode = -1;
-static int hf_mq_rr_reascode = -1;
-static int hf_mq_pmr_msgid = -1;
-static int hf_mq_pmr_correlid = -1;
-static int hf_mq_pmr_groupid = -1;
-static int hf_mq_pmr_feedback = -1;
-static int hf_mq_pmr_acttoken = -1;
-static int hf_mq_md_StructID = -1;
-static int hf_mq_md_version = -1;
-static int hf_mq_md_report = -1;
-static int hf_mq_md_msgtype = -1;
-static int hf_mq_md_expiry = -1;
-static int hf_mq_md_feedback = -1;
-static int hf_mq_md_encoding = -1;
-static int hf_mq_md_ccsid = -1;
-static int hf_mq_md_format = -1;
-static int hf_mq_md_priority = -1;
-static int hf_mq_md_persistence = -1;
-static int hf_mq_md_msgid = -1;
-static int hf_mq_md_correlid = -1;
-static int hf_mq_md_backoutcnt = -1;
-static int hf_mq_md_replytoq = -1;
-static int hf_mq_md_replytoqmgr = -1;
-static int hf_mq_md_userid = -1;
-static int hf_mq_md_acttoken = -1;
-static int hf_mq_md_appliddata = -1;
-static int hf_mq_md_putappltype = -1;
-static int hf_mq_md_putapplname = -1;
-static int hf_mq_md_putdate = -1;
-static int hf_mq_md_puttime = -1;
-static int hf_mq_md_apporigdata = -1;
-static int hf_mq_md_groupid = -1;
-static int hf_mq_md_msgseqnumber = -1;
-static int hf_mq_md_offset = -1;
-static int hf_mq_md_msgflags = -1;
-static int hf_mq_md_origlen = -1;
-static int hf_mq_dlh_StructID = -1;
-static int hf_mq_dlh_version = -1;
-static int hf_mq_dlh_reason = -1;
-static int hf_mq_dlh_destq = -1;
-static int hf_mq_dlh_destqmgr = -1;
-static int hf_mq_dlh_encoding = -1;
-static int hf_mq_dlh_ccsid = -1;
-static int hf_mq_dlh_format = -1;
-static int hf_mq_dlh_putappltype = -1;
-static int hf_mq_dlh_putapplname = -1;
-static int hf_mq_dlh_putdate = -1;
-static int hf_mq_dlh_puttime = -1;
-
-static int hf_mq_gmo_StructID = -1;
-static int hf_mq_gmo_version = -1;
-static int hf_mq_gmo_options = -1;
-static int hf_mq_gmo_waitinterval = -1;
-static int hf_mq_gmo_signal1 = -1;
-static int hf_mq_gmo_signal2 = -1;
-static int hf_mq_gmo_resolvqname = -1;
-static int hf_mq_gmo_matchoptions = -1;
-static int hf_mq_gmo_groupstatus = -1;
-static int hf_mq_gmo_segmstatus = -1;
-static int hf_mq_gmo_segmentation = -1;
-static int hf_mq_gmo_reserved = -1;
-static int hf_mq_gmo_msgtoken = -1;
-static int hf_mq_gmo_returnedlen = -1;
-static int hf_mq_gmo_reserved2 = -1;
-static int hf_mq_gmo_msghandle = -1;
-
-static int hf_mq_gmo_options_PROPERTIES_COMPATIBILITY = -1;
-static int hf_mq_gmo_options_PROPERTIES_IN_HANDLE = -1;
-static int hf_mq_gmo_options_NO_PROPERTIES = -1;
-static int hf_mq_gmo_options_PROPERTIES_FORCE_MQRFH2 = -1;
-static int hf_mq_gmo_options_UNMARKED_BROWSE_MSG = -1;
-static int hf_mq_gmo_options_UNMARK_BROWSE_HANDLE = -1;
-static int hf_mq_gmo_options_UNMARK_BROWSE_CO_OP = -1;
-static int hf_mq_gmo_options_MARK_BROWSE_CO_OP = -1;
-static int hf_mq_gmo_options_MARK_BROWSE_HANDLE = -1;
-static int hf_mq_gmo_options_ALL_SEGMENTS_AVAILABLE = -1;
-static int hf_mq_gmo_options_ALL_MSGS_AVAILABLE = -1;
-static int hf_mq_gmo_options_COMPLETE_MSG = -1;
-static int hf_mq_gmo_options_LOGICAL_ORDER = -1;
-static int hf_mq_gmo_options_CONVERT = -1;
-static int hf_mq_gmo_options_FAIL_IF_QUIESCING = -1;
-static int hf_mq_gmo_options_SYNCPOINT_IF_PERSISTENT = -1;
-static int hf_mq_gmo_options_BROWSE_MSG_UNDER_CURSOR = -1;
-static int hf_mq_gmo_options_UNLOCK = -1;
-static int hf_mq_gmo_options_LOCK = -1;
-static int hf_mq_gmo_options_MSG_UNDER_CURSOR = -1;
-static int hf_mq_gmo_options_MARK_SKIP_BACKOUT = -1;
-static int hf_mq_gmo_options_ACCEPT_TRUNCATED_MSG = -1;
-static int hf_mq_gmo_options_BROWSE_NEXT = -1;
-static int hf_mq_gmo_options_BROWSE_FIRST = -1;
-static int hf_mq_gmo_options_SET_SIGNAL = -1;
-static int hf_mq_gmo_options_NO_SYNCPOINT = -1;
-static int hf_mq_gmo_options_SYNCPOINT = -1;
-static int hf_mq_gmo_options_WAIT = -1;
+static int hf_mq_fopa_StructID;
+static int hf_mq_fopa_version;
+static int hf_mq_fopa_length;
+static int hf_mq_fopa_DefPersistence;
+static int hf_mq_fopa_DefPutRespType;
+static int hf_mq_fopa_DefReadAhead;
+static int hf_mq_fopa_PropertyControl;
+static int hf_mq_fopa_Unknown;
+
+static int hf_mq_fcmi_StructID;
+static int hf_mq_fcmi_unknown;
+
+static int hf_mq_ping_length;
+static int hf_mq_ping_buffer;
+static int hf_mq_reset_length;
+static int hf_mq_reset_seqnum;
+static int hf_mq_status_length;
+static int hf_mq_status_code;
+static int hf_mq_status_value;
+
+static int hf_mq_caut_StructID;
+static int hf_mq_caut_AuthType;
+static int hf_mq_caut_UsrMaxLen;
+static int hf_mq_caut_PwdMaxLen;
+static int hf_mq_caut_UsrLength;
+static int hf_mq_caut_PwdLength;
+static int hf_mq_caut_usr;
+static int hf_mq_caut_psw;
+
+static int hf_mq_od_StructID;
+static int hf_mq_od_version;
+static int hf_mq_od_objecttype;
+static int hf_mq_od_objectname;
+static int hf_mq_od_objqmgrname;
+static int hf_mq_od_dynqname;
+static int hf_mq_od_altuserid;
+static int hf_mq_od_recspresent;
+static int hf_mq_od_knowndstcnt;
+static int hf_mq_od_unknowdstcnt;
+static int hf_mq_od_invaldstcnt;
+static int hf_mq_od_objrecofs;
+static int hf_mq_od_resprecofs;
+static int hf_mq_od_objrecptr;
+static int hf_mq_od_resprecptr;
+static int hf_mq_od_altsecurid;
+static int hf_mq_od_resolvqname;
+static int hf_mq_od_resolvqmgrnm;
+static int hf_mq_od_resolvobjtyp;
+
+static int hf_mq_or_objname;
+static int hf_mq_or_objqmgrname;
+static int hf_mq_rr_compcode;
+static int hf_mq_rr_reascode;
+static int hf_mq_pmr_msgid;
+static int hf_mq_pmr_correlid;
+static int hf_mq_pmr_groupid;
+static int hf_mq_pmr_feedback;
+static int hf_mq_pmr_acttoken;
+static int hf_mq_md_StructID;
+static int hf_mq_md_version;
+static int hf_mq_md_report;
+static int hf_mq_md_msgtype;
+static int hf_mq_md_expiry;
+static int hf_mq_md_feedback;
+static int hf_mq_md_encoding;
+static int hf_mq_md_ccsid;
+static int hf_mq_md_format;
+static int hf_mq_md_priority;
+static int hf_mq_md_persistence;
+static int hf_mq_md_msgid;
+static int hf_mq_md_correlid;
+static int hf_mq_md_backoutcnt;
+static int hf_mq_md_replytoq;
+static int hf_mq_md_replytoqmgr;
+static int hf_mq_md_userid;
+static int hf_mq_md_acttoken;
+static int hf_mq_md_appliddata;
+static int hf_mq_md_putappltype;
+static int hf_mq_md_putapplname;
+static int hf_mq_md_putdate;
+static int hf_mq_md_puttime;
+static int hf_mq_md_apporigdata;
+static int hf_mq_md_groupid;
+static int hf_mq_md_msgseqnumber;
+static int hf_mq_md_offset;
+static int hf_mq_md_msgflags;
+static int hf_mq_md_origlen;
+static int hf_mq_dlh_StructID;
+static int hf_mq_dlh_version;
+static int hf_mq_dlh_reason;
+static int hf_mq_dlh_destq;
+static int hf_mq_dlh_destqmgr;
+static int hf_mq_dlh_encoding;
+static int hf_mq_dlh_ccsid;
+static int hf_mq_dlh_format;
+static int hf_mq_dlh_putappltype;
+static int hf_mq_dlh_putapplname;
+static int hf_mq_dlh_putdate;
+static int hf_mq_dlh_puttime;
+
+static int hf_mq_gmo_StructID;
+static int hf_mq_gmo_version;
+static int hf_mq_gmo_options;
+static int hf_mq_gmo_waitinterval;
+static int hf_mq_gmo_signal1;
+static int hf_mq_gmo_signal2;
+static int hf_mq_gmo_resolvqname;
+static int hf_mq_gmo_matchoptions;
+static int hf_mq_gmo_groupstatus;
+static int hf_mq_gmo_segmstatus;
+static int hf_mq_gmo_segmentation;
+static int hf_mq_gmo_reserved;
+static int hf_mq_gmo_msgtoken;
+static int hf_mq_gmo_returnedlen;
+static int hf_mq_gmo_reserved2;
+static int hf_mq_gmo_msghandle;
+
+static int hf_mq_gmo_options_PROPERTIES_COMPATIBILITY;
+static int hf_mq_gmo_options_PROPERTIES_IN_HANDLE;
+static int hf_mq_gmo_options_NO_PROPERTIES;
+static int hf_mq_gmo_options_PROPERTIES_FORCE_MQRFH2;
+static int hf_mq_gmo_options_UNMARKED_BROWSE_MSG;
+static int hf_mq_gmo_options_UNMARK_BROWSE_HANDLE;
+static int hf_mq_gmo_options_UNMARK_BROWSE_CO_OP;
+static int hf_mq_gmo_options_MARK_BROWSE_CO_OP;
+static int hf_mq_gmo_options_MARK_BROWSE_HANDLE;
+static int hf_mq_gmo_options_ALL_SEGMENTS_AVAILABLE;
+static int hf_mq_gmo_options_ALL_MSGS_AVAILABLE;
+static int hf_mq_gmo_options_COMPLETE_MSG;
+static int hf_mq_gmo_options_LOGICAL_ORDER;
+static int hf_mq_gmo_options_CONVERT;
+static int hf_mq_gmo_options_FAIL_IF_QUIESCING;
+static int hf_mq_gmo_options_SYNCPOINT_IF_PERSISTENT;
+static int hf_mq_gmo_options_BROWSE_MSG_UNDER_CURSOR;
+static int hf_mq_gmo_options_UNLOCK;
+static int hf_mq_gmo_options_LOCK;
+static int hf_mq_gmo_options_MSG_UNDER_CURSOR;
+static int hf_mq_gmo_options_MARK_SKIP_BACKOUT;
+static int hf_mq_gmo_options_ACCEPT_TRUNCATED_MSG;
+static int hf_mq_gmo_options_BROWSE_NEXT;
+static int hf_mq_gmo_options_BROWSE_FIRST;
+static int hf_mq_gmo_options_SET_SIGNAL;
+static int hf_mq_gmo_options_NO_SYNCPOINT;
+static int hf_mq_gmo_options_SYNCPOINT;
+static int hf_mq_gmo_options_WAIT;
 static int* const pf_flds_gmoopt[] =
 {
     &hf_mq_gmo_options_PROPERTIES_COMPATIBILITY,
@@ -593,12 +593,12 @@ static int* const pf_flds_gmoopt[] =
     NULL
 };
 
-static int hf_mq_gmo_matchoptions_MATCH_MSG_TOKEN = -1;
-static int hf_mq_gmo_matchoptions_MATCH_OFFSET = -1;
-static int hf_mq_gmo_matchoptions_MATCH_MSG_SEQ_NUMBER = -1;
-static int hf_mq_gmo_matchoptions_MATCH_GROUP_ID = -1;
-static int hf_mq_gmo_matchoptions_MATCH_CORREL_ID = -1;
-static int hf_mq_gmo_matchoptions_MATCH_MSG_ID = -1;
+static int hf_mq_gmo_matchoptions_MATCH_MSG_TOKEN;
+static int hf_mq_gmo_matchoptions_MATCH_OFFSET;
+static int hf_mq_gmo_matchoptions_MATCH_MSG_SEQ_NUMBER;
+static int hf_mq_gmo_matchoptions_MATCH_GROUP_ID;
+static int hf_mq_gmo_matchoptions_MATCH_CORREL_ID;
+static int hf_mq_gmo_matchoptions_MATCH_MSG_ID;
 static int* const pf_flds_mtchopt[] =
 {
     &hf_mq_gmo_matchoptions_MATCH_MSG_TOKEN,
@@ -610,20 +610,20 @@ static int* const pf_flds_mtchopt[] =
     NULL
 };
 
-static int hf_mq_lpoo_StructID = -1;
-static int hf_mq_lpoo_version = -1;
-static int hf_mq_lpoo_lpiopts = -1;
-static int hf_mq_lpoo_defpersist = -1;
-static int hf_mq_lpoo_defputresptype = -1;
-static int hf_mq_lpoo_defreadahead = -1;
-static int hf_mq_lpoo_propertyctl = -1;
-static int hf_mq_lpoo_qprotect = -1;
-static int hf_mq_lpoo_qprotect_val1 = -1;
-static int hf_mq_lpoo_qprotect_val2 = -1;
-
-static int hf_mq_lpoo_lpiopts_SAVE_IDENTITY_CTXT = -1;
-static int hf_mq_lpoo_lpiopts_SAVE_ORIGIN_CTXT = -1;
-static int hf_mq_lpoo_lpiopts_SAVE_USER_CTXT = -1;
+static int hf_mq_lpoo_StructID;
+static int hf_mq_lpoo_version;
+static int hf_mq_lpoo_lpiopts;
+static int hf_mq_lpoo_defpersist;
+static int hf_mq_lpoo_defputresptype;
+static int hf_mq_lpoo_defreadahead;
+static int hf_mq_lpoo_propertyctl;
+static int hf_mq_lpoo_qprotect;
+static int hf_mq_lpoo_qprotect_val1;
+static int hf_mq_lpoo_qprotect_val2;
+
+static int hf_mq_lpoo_lpiopts_SAVE_IDENTITY_CTXT;
+static int hf_mq_lpoo_lpiopts_SAVE_ORIGIN_CTXT;
+static int hf_mq_lpoo_lpiopts_SAVE_USER_CTXT;
 static int* const pf_flds_lpooopt[] =
 {
     &hf_mq_lpoo_lpiopts_SAVE_USER_CTXT,
@@ -633,69 +633,69 @@ static int* const pf_flds_lpooopt[] =
 };
 
 
-static int hf_mq_charv_vsptr = -1;
-static int hf_mq_charv_vsoffset = -1;
-static int hf_mq_charv_vsbufsize = -1;
-static int hf_mq_charv_vslength = -1;
-static int hf_mq_charv_vsccsid = -1;
-static int hf_mq_charv_vsvalue = -1;
-
-static int hf_mq_pmo_StructID = -1;
-static int hf_mq_pmo_version = -1;
-static int hf_mq_pmo_options = -1;
-static int hf_mq_pmo_timeout = -1;
-static int hf_mq_pmo_context = -1;
-static int hf_mq_pmo_knowndstcnt = -1;
-static int hf_mq_pmo_unkndstcnt = -1;
-static int hf_mq_pmo_invaldstcnt = -1;
-static int hf_mq_pmo_resolvqname = -1;
-static int hf_mq_pmo_resolvqmgr = -1;
-static int hf_mq_pmo_recspresent = -1;
-static int hf_mq_pmo_putmsgrecfld = -1;
-static int hf_mq_pmo_putmsgrecofs = -1;
-static int hf_mq_pmo_resprecofs = -1;
-static int hf_mq_pmo_putmsgrecptr = -1;
-static int hf_mq_pmo_resprecptr = -1;
-static int hf_mq_pmo_originalmsghandle = -1;
-static int hf_mq_pmo_newmsghandle = -1;
-static int hf_mq_pmo_action = -1;
-static int hf_mq_pmo_publevel = -1;
-
-static int hf_mq_xa_length = -1;
-static int hf_mq_xa_returnvalue = -1;
-static int hf_mq_xa_tmflags = -1;
-static int hf_mq_xa_rmid = -1;
-static int hf_mq_xa_count = -1;
-static int hf_mq_xa_xid_formatid = -1;
-static int hf_mq_xa_xid_glbxid_len = -1;
-static int hf_mq_xa_xid_brq_length = -1;
-static int hf_mq_xa_xid_globalxid = -1;
-static int hf_mq_xa_xid_brq = -1;
-static int hf_mq_xa_xainfo_length = -1;
-static int hf_mq_xa_xainfo_value = -1;
-
-static int hf_mq_pmo_options_NOT_OWN_SUBS = -1;
-static int hf_mq_pmo_options_SUPPRESS_REPLYTO = -1;
-static int hf_mq_pmo_options_SCOPE_QMGR = -1;
-static int hf_mq_pmo_options_MD_FOR_OUTPUT_ONLY = -1;
-static int hf_mq_pmo_options_RETAIN = -1;
-static int hf_mq_pmo_options_WARN_IF_NO_SUBS_MATCHED = -1;
-static int hf_mq_pmo_options_RESOLVE_LOCAL_Q = -1;
-static int hf_mq_pmo_options_SYNC_RESPONSE = -1;
-static int hf_mq_pmo_options_ASYNC_RESPONSE = -1;
-static int hf_mq_pmo_options_LOGICAL_ORDER = -1;
-static int hf_mq_pmo_options_NO_CONTEXT = -1;
-static int hf_mq_pmo_options_FAIL_IF_QUIESCING = -1;
-static int hf_mq_pmo_options_ALTERNATE_USER_AUTHORITY = -1;
-static int hf_mq_pmo_options_SET_ALL_CONTEXT = -1;
-static int hf_mq_pmo_options_SET_IDENTITY_CONTEXT = -1;
-static int hf_mq_pmo_options_PASS_ALL_CONTEXT = -1;
-static int hf_mq_pmo_options_PASS_IDENTITY_CONTEXT = -1;
-static int hf_mq_pmo_options_NEW_CORREL_ID = -1;
-static int hf_mq_pmo_options_NEW_MSG_ID = -1;
-static int hf_mq_pmo_options_DEFAULT_CONTEXT = -1;
-static int hf_mq_pmo_options_NO_SYNCPOINT = -1;
-static int hf_mq_pmo_options_SYNCPOINT = -1;
+static int hf_mq_charv_vsptr;
+static int hf_mq_charv_vsoffset;
+static int hf_mq_charv_vsbufsize;
+static int hf_mq_charv_vslength;
+static int hf_mq_charv_vsccsid;
+static int hf_mq_charv_vsvalue;
+
+static int hf_mq_pmo_StructID;
+static int hf_mq_pmo_version;
+static int hf_mq_pmo_options;
+static int hf_mq_pmo_timeout;
+static int hf_mq_pmo_context;
+static int hf_mq_pmo_knowndstcnt;
+static int hf_mq_pmo_unkndstcnt;
+static int hf_mq_pmo_invaldstcnt;
+static int hf_mq_pmo_resolvqname;
+static int hf_mq_pmo_resolvqmgr;
+static int hf_mq_pmo_recspresent;
+static int hf_mq_pmo_putmsgrecfld;
+static int hf_mq_pmo_putmsgrecofs;
+static int hf_mq_pmo_resprecofs;
+static int hf_mq_pmo_putmsgrecptr;
+static int hf_mq_pmo_resprecptr;
+static int hf_mq_pmo_originalmsghandle;
+static int hf_mq_pmo_newmsghandle;
+static int hf_mq_pmo_action;
+static int hf_mq_pmo_publevel;
+
+static int hf_mq_xa_length;
+static int hf_mq_xa_returnvalue;
+static int hf_mq_xa_tmflags;
+static int hf_mq_xa_rmid;
+static int hf_mq_xa_count;
+static int hf_mq_xa_xid_formatid;
+static int hf_mq_xa_xid_glbxid_len;
+static int hf_mq_xa_xid_brq_length;
+static int hf_mq_xa_xid_globalxid;
+static int hf_mq_xa_xid_brq;
+static int hf_mq_xa_xainfo_length;
+static int hf_mq_xa_xainfo_value;
+
+static int hf_mq_pmo_options_NOT_OWN_SUBS;
+static int hf_mq_pmo_options_SUPPRESS_REPLYTO;
+static int hf_mq_pmo_options_SCOPE_QMGR;
+static int hf_mq_pmo_options_MD_FOR_OUTPUT_ONLY;
+static int hf_mq_pmo_options_RETAIN;
+static int hf_mq_pmo_options_WARN_IF_NO_SUBS_MATCHED;
+static int hf_mq_pmo_options_RESOLVE_LOCAL_Q;
+static int hf_mq_pmo_options_SYNC_RESPONSE;
+static int hf_mq_pmo_options_ASYNC_RESPONSE;
+static int hf_mq_pmo_options_LOGICAL_ORDER;
+static int hf_mq_pmo_options_NO_CONTEXT;
+static int hf_mq_pmo_options_FAIL_IF_QUIESCING;
+static int hf_mq_pmo_options_ALTERNATE_USER_AUTHORITY;
+static int hf_mq_pmo_options_SET_ALL_CONTEXT;
+static int hf_mq_pmo_options_SET_IDENTITY_CONTEXT;
+static int hf_mq_pmo_options_PASS_ALL_CONTEXT;
+static int hf_mq_pmo_options_PASS_IDENTITY_CONTEXT;
+static int hf_mq_pmo_options_NEW_CORREL_ID;
+static int hf_mq_pmo_options_NEW_MSG_ID;
+static int hf_mq_pmo_options_DEFAULT_CONTEXT;
+static int hf_mq_pmo_options_NO_SYNCPOINT;
+static int hf_mq_pmo_options_SYNCPOINT;
 static int* const pf_flds_pmoopt[] =
 {
     &hf_mq_pmo_options_NOT_OWN_SUBS,
@@ -723,14 +723,14 @@ static int* const pf_flds_pmoopt[] =
     NULL
 };
 
-static int hf_mq_xa_tmflags_join = -1;
-static int hf_mq_xa_tmflags_endrscan = -1;
-static int hf_mq_xa_tmflags_startrscan = -1;
-static int hf_mq_xa_tmflags_suspend = -1;
-static int hf_mq_xa_tmflags_success = -1;
-static int hf_mq_xa_tmflags_resume = -1;
-static int hf_mq_xa_tmflags_fail = -1;
-static int hf_mq_xa_tmflags_onephase = -1;
+static int hf_mq_xa_tmflags_join;
+static int hf_mq_xa_tmflags_endrscan;
+static int hf_mq_xa_tmflags_startrscan;
+static int hf_mq_xa_tmflags_suspend;
+static int hf_mq_xa_tmflags_success;
+static int hf_mq_xa_tmflags_resume;
+static int hf_mq_xa_tmflags_fail;
+static int hf_mq_xa_tmflags_onephase;
 static int* const pf_flds_tmflags[] =
 {
     &hf_mq_xa_tmflags_onephase,
@@ -744,30 +744,30 @@ static int* const pf_flds_tmflags[] =
     NULL
 };
 
-static int hf_mq_msgreq_version = -1;
-static int hf_mq_msgreq_handle = -1;
-static int hf_mq_msgreq_RecvBytes = -1;
-static int hf_mq_msgreq_RqstBytes = -1;
-static int hf_mq_msgreq_MaxMsgLen = -1;
-static int hf_mq_msgreq_WaitIntrv = -1;
-static int hf_mq_msgreq_QueStatus = -1;
-static int hf_mq_msgreq_RqstFlags = -1;
-static int hf_mq_msgreq_GlbMsgIdx = -1;
-static int hf_mq_msgreq_SelectIdx = -1;
-static int hf_mq_msgreq_MQMDVers = -1;
-static int hf_mq_msgreq_ccsid = -1;
-static int hf_mq_msgreq_encoding = -1;
-static int hf_mq_msgreq_MsgSeqNum = -1;
-static int hf_mq_msgreq_offset = -1;
-static int hf_mq_msgreq_mtchMsgId = -1;
-static int hf_mq_msgreq_mtchCorId = -1;
-static int hf_mq_msgreq_mtchGrpid = -1;
-static int hf_mq_msgreq_mtchMsgTk = -1;
-
-static int hf_mq_msgreq_flags_selection = -1;
-static int hf_mq_msgreq_flags_F00000008 = -1;
-static int hf_mq_msgreq_flags_F00000004 = -1;
-static int hf_mq_msgreq_flags_F00000002 = -1;
+static int hf_mq_msgreq_version;
+static int hf_mq_msgreq_handle;
+static int hf_mq_msgreq_RecvBytes;
+static int hf_mq_msgreq_RqstBytes;
+static int hf_mq_msgreq_MaxMsgLen;
+static int hf_mq_msgreq_WaitIntrv;
+static int hf_mq_msgreq_QueStatus;
+static int hf_mq_msgreq_RqstFlags;
+static int hf_mq_msgreq_GlbMsgIdx;
+static int hf_mq_msgreq_SelectIdx;
+static int hf_mq_msgreq_MQMDVers;
+static int hf_mq_msgreq_ccsid;
+static int hf_mq_msgreq_encoding;
+static int hf_mq_msgreq_MsgSeqNum;
+static int hf_mq_msgreq_offset;
+static int hf_mq_msgreq_mtchMsgId;
+static int hf_mq_msgreq_mtchCorId;
+static int hf_mq_msgreq_mtchGrpid;
+static int hf_mq_msgreq_mtchMsgTk;
+
+static int hf_mq_msgreq_flags_selection;
+static int hf_mq_msgreq_flags_F00000008;
+static int hf_mq_msgreq_flags_F00000004;
+static int hf_mq_msgreq_flags_F00000002;
 static int* const pf_flds_msgreq_flags[] =
 {
     &hf_mq_msgreq_flags_selection,
@@ -777,51 +777,51 @@ static int* const pf_flds_msgreq_flags[] =
     NULL
 };
 
-static int hf_mq_msgasy_version = -1;
-static int hf_mq_msgasy_handle = -1;
-static int hf_mq_msgasy_MsgIndex = -1;
-static int hf_mq_msgasy_GlbMsgIdx = -1;
-static int hf_mq_msgasy_SegLength = -1;
-static int hf_mq_msgasy_SeleIndex = -1;
-static int hf_mq_msgasy_SegmIndex = -1;
-static int hf_mq_msgasy_ReasonCod = -1;
-static int hf_mq_msgasy_ActMsgLen = -1;
-static int hf_mq_msgasy_TotMsgLen = -1;
-static int hf_mq_msgasy_MsgToken = -1;
-static int hf_mq_msgasy_Status = -1;
-static int hf_mq_msgasy_resolQNLn = -1;
-static int hf_mq_msgasy_resolQNme = -1;
-static int hf_mq_msgasy_padding = -1;
-
-static int hf_mq_notif_vers = -1;
-static int hf_mq_notif_handle = -1;
-static int hf_mq_notif_code = -1;
-static int hf_mq_notif_value = -1;
-
-static int hf_mq_head_StructID = -1;
-static int hf_mq_head_version = -1;
-static int hf_mq_head_length = -1;
-static int hf_mq_head_encoding = -1;
-static int hf_mq_head_ccsid = -1;
-static int hf_mq_head_format = -1;
-static int hf_mq_head_flags = -1;
-static int hf_mq_head_struct = -1;
-
-static int hf_mq_dh_flags_newmsgid = -1;
+static int hf_mq_msgasy_version;
+static int hf_mq_msgasy_handle;
+static int hf_mq_msgasy_MsgIndex;
+static int hf_mq_msgasy_GlbMsgIdx;
+static int hf_mq_msgasy_SegLength;
+static int hf_mq_msgasy_SeleIndex;
+static int hf_mq_msgasy_SegmIndex;
+static int hf_mq_msgasy_ReasonCod;
+static int hf_mq_msgasy_ActMsgLen;
+static int hf_mq_msgasy_TotMsgLen;
+static int hf_mq_msgasy_MsgToken;
+static int hf_mq_msgasy_Status;
+static int hf_mq_msgasy_resolQNLn;
+static int hf_mq_msgasy_resolQNme;
+static int hf_mq_msgasy_padding;
+
+static int hf_mq_notif_vers;
+static int hf_mq_notif_handle;
+static int hf_mq_notif_code;
+static int hf_mq_notif_value;
+
+static int hf_mq_head_StructID;
+static int hf_mq_head_version;
+static int hf_mq_head_length;
+static int hf_mq_head_encoding;
+static int hf_mq_head_ccsid;
+static int hf_mq_head_format;
+static int hf_mq_head_flags;
+static int hf_mq_head_struct;
+
+static int hf_mq_dh_flags_newmsgid;
 static int* const pf_flds_dh_flags[] =
 {
     &hf_mq_dh_flags_newmsgid,
     NULL
 };
-static int hf_mq_dh_putmsgrecfld = -1;
-static int hf_mq_dh_recspresent = -1;
-static int hf_mq_dh_objrecofs = -1;
-static int hf_mq_dh_putmsgrecofs = -1;
-
-static int hf_mq_iih_flags_passexpir = -1;
-static int hf_mq_iih_flags_replyfmtnone = -1;
-static int hf_mq_iih_flags_ignorepurg = -1;
-static int hf_mq_iih_flags_cmqrqstresp = -1;
+static int hf_mq_dh_putmsgrecfld;
+static int hf_mq_dh_recspresent;
+static int hf_mq_dh_objrecofs;
+static int hf_mq_dh_putmsgrecofs;
+
+static int hf_mq_iih_flags_passexpir;
+static int hf_mq_iih_flags_replyfmtnone;
+static int hf_mq_iih_flags_ignorepurg;
+static int hf_mq_iih_flags_cmqrqstresp;
 static int* const pf_flds_iih_flags[] =
 {
     &hf_mq_iih_flags_cmqrqstresp,
@@ -830,45 +830,45 @@ static int* const pf_flds_iih_flags[] =
     &hf_mq_iih_flags_passexpir,
     NULL
 };
-static int hf_mq_iih_ltermoverride = -1;
-static int hf_mq_iih_mfsmapname = -1;
-static int hf_mq_iih_replytofmt = -1;
-static int hf_mq_iih_authenticator = -1;
-static int hf_mq_iih_transinstid = -1;
-static int hf_mq_iih_transstate = -1;
-static int hf_mq_iih_commimode = -1;
-static int hf_mq_iih_securityscope = -1;
-static int hf_mq_iih_reserved = -1;
-
-static int hf_mq_ims_ll = -1;
-static int hf_mq_ims_zz = -1;
-static int hf_mq_ims_trx = -1;
-static int hf_mq_ims_data = -1;
-
-static int hf_mq_tm_StructID = -1;
-static int hf_mq_tm_version = -1;
-static int hf_mq_tm_QName = -1;
-static int hf_mq_tm_ProcessNme = -1;
-static int hf_mq_tm_TriggerData = -1;
-static int hf_mq_tm_ApplType = -1;
-static int hf_mq_tm_ApplId = -1;
-static int hf_mq_tm_EnvData = -1;
-static int hf_mq_tm_UserData = -1;
-
-static int hf_mq_tmc2_StructID = -1;
-static int hf_mq_tmc2_version = -1;
-static int hf_mq_tmc2_QName = -1;
-static int hf_mq_tmc2_ProcessNme = -1;
-static int hf_mq_tmc2_TriggerData = -1;
-static int hf_mq_tmc2_ApplType = -1;
-static int hf_mq_tmc2_ApplId = -1;
-static int hf_mq_tmc2_EnvData = -1;
-static int hf_mq_tmc2_UserData = -1;
-static int hf_mq_tmc2_QMgrName = -1;
-
-static int hf_mq_cih_flags_synconret = -1;
-static int hf_mq_cih_flags_replywonulls = -1;
-static int hf_mq_cih_flags_passexpir = -1;
+static int hf_mq_iih_ltermoverride;
+static int hf_mq_iih_mfsmapname;
+static int hf_mq_iih_replytofmt;
+static int hf_mq_iih_authenticator;
+static int hf_mq_iih_transinstid;
+static int hf_mq_iih_transstate;
+static int hf_mq_iih_commimode;
+static int hf_mq_iih_securityscope;
+static int hf_mq_iih_reserved;
+
+static int hf_mq_ims_ll;
+static int hf_mq_ims_zz;
+static int hf_mq_ims_trx;
+static int hf_mq_ims_data;
+
+static int hf_mq_tm_StructID;
+static int hf_mq_tm_version;
+static int hf_mq_tm_QName;
+static int hf_mq_tm_ProcessNme;
+static int hf_mq_tm_TriggerData;
+static int hf_mq_tm_ApplType;
+static int hf_mq_tm_ApplId;
+static int hf_mq_tm_EnvData;
+static int hf_mq_tm_UserData;
+
+static int hf_mq_tmc2_StructID;
+static int hf_mq_tmc2_version;
+static int hf_mq_tmc2_QName;
+static int hf_mq_tmc2_ProcessNme;
+static int hf_mq_tmc2_TriggerData;
+static int hf_mq_tmc2_ApplType;
+static int hf_mq_tmc2_ApplId;
+static int hf_mq_tmc2_EnvData;
+static int hf_mq_tmc2_UserData;
+static int hf_mq_tmc2_QMgrName;
+
+static int hf_mq_cih_flags_synconret;
+static int hf_mq_cih_flags_replywonulls;
+static int hf_mq_cih_flags_passexpir;
 static int* const pf_flds_cih_flags[] =
 {
     &hf_mq_cih_flags_synconret,
@@ -876,138 +876,138 @@ static int* const pf_flds_cih_flags[] =
     &hf_mq_cih_flags_passexpir,
     NULL
 };
-static int hf_mq_cih_returncode = -1;
-static int hf_mq_cih_compcode = -1;
-static int hf_mq_cih_reasoncode = -1;
-static int hf_mq_cih_uowcontrols = -1;
-static int hf_mq_cih_getwaitintv = -1;
-static int hf_mq_cih_linktype = -1;
-static int hf_mq_cih_outdatalen = -1;
-static int hf_mq_cih_facilkeeptime = -1;
-static int hf_mq_cih_adsdescriptor = -1;
-static int hf_mq_cih_converstask = -1;
-static int hf_mq_cih_taskendstatus = -1;
-static int hf_mq_cih_bridgefactokn = -1;
-static int hf_mq_cih_function = -1;
-static int hf_mq_cih_abendcode = -1;
-static int hf_mq_cih_authenticator = -1;
-static int hf_mq_cih_reserved = -1;
-static int hf_mq_cih_replytofmt = -1;
-static int hf_mq_cih_remotesysid = -1;
-static int hf_mq_cih_remotetransid = -1;
-static int hf_mq_cih_transactionid = -1;
-static int hf_mq_cih_facilitylike = -1;
-static int hf_mq_cih_attentionid = -1;
-static int hf_mq_cih_startcode = -1;
-static int hf_mq_cih_cancelcode = -1;
-static int hf_mq_cih_nexttransid = -1;
-static int hf_mq_cih_reserved2 = -1;
-static int hf_mq_cih_reserved3 = -1;
-static int hf_mq_cih_cursorpos = -1;
-static int hf_mq_cih_erroroffset = -1;
-static int hf_mq_cih_inputitem = -1;
-static int hf_mq_cih_reserved4 = -1;
-
-static int hf_mq_rfh_ccsid = -1;
-static int hf_mq_rfh_length = -1;
-static int hf_mq_rfh_string = -1;
-
-static int hf_mq_rmh_flags_last = -1;
+static int hf_mq_cih_returncode;
+static int hf_mq_cih_compcode;
+static int hf_mq_cih_reasoncode;
+static int hf_mq_cih_uowcontrols;
+static int hf_mq_cih_getwaitintv;
+static int hf_mq_cih_linktype;
+static int hf_mq_cih_outdatalen;
+static int hf_mq_cih_facilkeeptime;
+static int hf_mq_cih_adsdescriptor;
+static int hf_mq_cih_converstask;
+static int hf_mq_cih_taskendstatus;
+static int hf_mq_cih_bridgefactokn;
+static int hf_mq_cih_function;
+static int hf_mq_cih_abendcode;
+static int hf_mq_cih_authenticator;
+static int hf_mq_cih_reserved;
+static int hf_mq_cih_replytofmt;
+static int hf_mq_cih_remotesysid;
+static int hf_mq_cih_remotetransid;
+static int hf_mq_cih_transactionid;
+static int hf_mq_cih_facilitylike;
+static int hf_mq_cih_attentionid;
+static int hf_mq_cih_startcode;
+static int hf_mq_cih_cancelcode;
+static int hf_mq_cih_nexttransid;
+static int hf_mq_cih_reserved2;
+static int hf_mq_cih_reserved3;
+static int hf_mq_cih_cursorpos;
+static int hf_mq_cih_erroroffset;
+static int hf_mq_cih_inputitem;
+static int hf_mq_cih_reserved4;
+
+static int hf_mq_rfh_ccsid;
+static int hf_mq_rfh_length;
+static int hf_mq_rfh_string;
+
+static int hf_mq_rmh_flags_last;
 static int* const pf_flds_rmh_flags[] =
 {
     &hf_mq_rmh_flags_last,
     NULL
 };
-static int hf_mq_rmh_objecttype = -1;
-static int hf_mq_rmh_objectinstid = -1;
-static int hf_mq_rmh_srcenvlen = -1;
-static int hf_mq_rmh_srcenvofs = -1;
-static int hf_mq_rmh_srcnamelen = -1;
-static int hf_mq_rmh_srcnameofs = -1;
-static int hf_mq_rmh_dstenvlen = -1;
-static int hf_mq_rmh_dstenvofs = -1;
-static int hf_mq_rmh_dstnamelen = -1;
-static int hf_mq_rmh_dstnameofs = -1;
-static int hf_mq_rmh_datalogiclen = -1;
-static int hf_mq_rmh_datalogicofsl = -1;
-static int hf_mq_rmh_datalogicofsh = -1;
-
-static int hf_mq_wih_servicename = -1;
-static int hf_mq_wih_servicestep = -1;
-static int hf_mq_wih_msgtoken = -1;
-static int hf_mq_wih_reserved = -1;
-
-static gint ett_mq = -1;
-static gint ett_mq_tsh = -1;
-static gint ett_mq_tsh_tcf = -1;
-static gint ett_mq_tsh_tcf2 = -1;
-static gint ett_mq_api = -1;
-static gint ett_mq_socket = -1;
-static gint ett_mq_caut = -1;
-static gint ett_mq_msh = -1;
-static gint ett_mq_xqh = -1;
-static gint ett_mq_id = -1;
-static gint ett_mq_id_cf1 = -1;
-static gint ett_mq_id_cf2 = -1;
-static gint ett_mq_id_cf3 = -1;
-static gint ett_mq_id_ecf1 = -1;
-static gint ett_mq_id_ecf2 = -1;
-static gint ett_mq_id_ecf3 = -1;
-static gint ett_mq_id_ief1 = -1;
-static gint ett_mq_id_ief2 = -1;
-static gint ett_mq_uid = -1;
-static gint ett_mq_conn = -1;
-static gint ett_mq_fcno = -1;
-static gint ett_mq_msg = -1;
-static gint ett_mq_inq = -1;
-static gint ett_mq_spi = -1;
-static gint ett_mq_spi_base = -1; /* Factorisation of common SPI items */
-static gint ett_mq_spi_options = -1;
-static gint ett_mq_put = -1;
-static gint ett_mq_open = -1;
-static gint ett_mq_open_option = -1;
-static gint ett_mq_close_option = -1;
-static gint ett_mq_fopa = -1;
-static gint ett_mq_fcmi = -1;
-static gint ett_mq_ping = -1;
-static gint ett_mq_reset = -1;
-static gint ett_mq_status = -1;
-static gint ett_mq_od = -1;
-static gint ett_mq_od_objstr = -1;
-static gint ett_mq_od_selstr = -1;
-static gint ett_mq_od_resobjstr = -1;
-static gint ett_mq_or = -1;
-static gint ett_mq_rr = -1;
-static gint ett_mq_pmr = -1;
-static gint ett_mq_md = -1;
-static gint ett_mq_dlh = -1;
-static gint ett_mq_dh = -1;
-static gint ett_mq_gmo = -1;
-static gint ett_mq_gmo_option = -1;
-static gint ett_mq_gmo_matchoption = -1;
-static gint ett_mq_pmo = -1;
-static gint ett_mq_pmo_option = -1;
-static gint ett_mq_rfh_ValueName = -1;
-static gint ett_mq_msgreq_RqstFlags = -1;
-
-static gint ett_mq_lpoo = -1;
-static gint ett_mq_lpoo_lpiopts = -1;
-
-static gint ett_mq_head = -1; /* Factorisation of common Header structure items (DH, MDE, CIH, IIH, RFH, RMH, WIH, TM, TMC2 */
-static gint ett_mq_head_flags = -1;
-static gint ett_mq_ims = -1;
-
-static gint ett_mq_xa = -1;
-static gint ett_mq_xa_tmflags = -1;
-static gint ett_mq_xa_xid = -1;
-static gint ett_mq_xa_info = -1;
-static gint ett_mq_charv = -1;
-static gint ett_mq_reassemb = -1;
-static gint ett_mq_notif = -1;
-
-static gint ett_mq_structid = -1;
-
-static expert_field ei_mq_reassembly_error = EI_INIT;
+static int hf_mq_rmh_objecttype;
+static int hf_mq_rmh_objectinstid;
+static int hf_mq_rmh_srcenvlen;
+static int hf_mq_rmh_srcenvofs;
+static int hf_mq_rmh_srcnamelen;
+static int hf_mq_rmh_srcnameofs;
+static int hf_mq_rmh_dstenvlen;
+static int hf_mq_rmh_dstenvofs;
+static int hf_mq_rmh_dstnamelen;
+static int hf_mq_rmh_dstnameofs;
+static int hf_mq_rmh_datalogiclen;
+static int hf_mq_rmh_datalogicofsl;
+static int hf_mq_rmh_datalogicofsh;
+
+static int hf_mq_wih_servicename;
+static int hf_mq_wih_servicestep;
+static int hf_mq_wih_msgtoken;
+static int hf_mq_wih_reserved;
+
+static gint ett_mq;
+static gint ett_mq_tsh;
+static gint ett_mq_tsh_tcf;
+static gint ett_mq_tsh_tcf2;
+static gint ett_mq_api;
+static gint ett_mq_socket;
+static gint ett_mq_caut;
+static gint ett_mq_msh;
+static gint ett_mq_xqh;
+static gint ett_mq_id;
+static gint ett_mq_id_cf1;
+static gint ett_mq_id_cf2;
+static gint ett_mq_id_cf3;
+static gint ett_mq_id_ecf1;
+static gint ett_mq_id_ecf2;
+static gint ett_mq_id_ecf3;
+static gint ett_mq_id_ief1;
+static gint ett_mq_id_ief2;
+static gint ett_mq_uid;
+static gint ett_mq_conn;
+static gint ett_mq_fcno;
+static gint ett_mq_msg;
+static gint ett_mq_inq;
+static gint ett_mq_spi;
+static gint ett_mq_spi_base; /* Factorisation of common SPI items */
+static gint ett_mq_spi_options;
+static gint ett_mq_put;
+static gint ett_mq_open;
+static gint ett_mq_open_option;
+static gint ett_mq_close_option;
+static gint ett_mq_fopa;
+static gint ett_mq_fcmi;
+static gint ett_mq_ping;
+static gint ett_mq_reset;
+static gint ett_mq_status;
+static gint ett_mq_od;
+static gint ett_mq_od_objstr;
+static gint ett_mq_od_selstr;
+static gint ett_mq_od_resobjstr;
+static gint ett_mq_or;
+static gint ett_mq_rr;
+static gint ett_mq_pmr;
+static gint ett_mq_md;
+static gint ett_mq_dlh;
+static gint ett_mq_dh;
+static gint ett_mq_gmo;
+static gint ett_mq_gmo_option;
+static gint ett_mq_gmo_matchoption;
+static gint ett_mq_pmo;
+static gint ett_mq_pmo_option;
+static gint ett_mq_rfh_ValueName;
+static gint ett_mq_msgreq_RqstFlags;
+
+static gint ett_mq_lpoo;
+static gint ett_mq_lpoo_lpiopts;
+
+static gint ett_mq_head; /* Factorisation of common Header structure items (DH, MDE, CIH, IIH, RFH, RMH, WIH, TM, TMC2 */
+static gint ett_mq_head_flags;
+static gint ett_mq_ims;
+
+static gint ett_mq_xa;
+static gint ett_mq_xa_tmflags;
+static gint ett_mq_xa_xid;
+static gint ett_mq_xa_info;
+static gint ett_mq_charv;
+static gint ett_mq_reassemb;
+static gint ett_mq_notif;
+
+static gint ett_mq_structid;
+
+static expert_field ei_mq_reassembly_error;
 
 static dissector_handle_t mq_handle;
 static dissector_handle_t mq_spx_handle;
diff --git a/epan/dissectors/packet-mqtt-sn.c b/epan/dissectors/packet-mqtt-sn.c
index b9623a0abb..60dc9b8fe3 100644
--- a/epan/dissectors/packet-mqtt-sn.c
+++ b/epan/dissectors/packet-mqtt-sn.c
@@ -148,40 +148,40 @@ static const value_string mqttsn_return_vals[] = {
 static dissector_handle_t mqttsn_handle;
 
 /* Initialize the protocol and registered fields. */
-static int proto_mqttsn = -1;
-
-static int hf_mqttsn_msg = -1;
-static int hf_mqttsn_msg_len = -1;
-static int hf_mqttsn_msg_type = -1;
-static int hf_mqttsn_dup = -1;
-static int hf_mqttsn_qos = -1;
-static int hf_mqttsn_retain = -1;
-static int hf_mqttsn_will = -1;
-static int hf_mqttsn_clean_session = -1;
-static int hf_mqttsn_topic_id_type = -1;
-static int hf_mqttsn_return_code = -1;
-static int hf_mqttsn_gw_id = -1;
-static int hf_mqttsn_gw_addr = -1;
-static int hf_mqttsn_adv_interv = -1;
-static int hf_mqttsn_radius = -1;
-static int hf_mqttsn_protocol_id = -1;
-static int hf_mqttsn_topic_id = -1;
-static int hf_mqttsn_msg_id = -1;
-static int hf_mqttsn_topic = -1;
-static int hf_mqttsn_topic_name_or_id = -1;
-static int hf_mqttsn_sleep_timer = -1;
-static int hf_mqttsn_will_topic = -1;
-static int hf_mqttsn_will_msg = -1;
-static int hf_mqttsn_pub_msg = -1;
-static int hf_mqttsn_client_id = -1;
-static int hf_mqttsn_keep_alive = -1;
-static int hf_mqttsn_control_info = -1;
-static int hf_mqttsn_wireless_node_id = -1;
+static int proto_mqttsn;
+
+static int hf_mqttsn_msg;
+static int hf_mqttsn_msg_len;
+static int hf_mqttsn_msg_type;
+static int hf_mqttsn_dup;
+static int hf_mqttsn_qos;
+static int hf_mqttsn_retain;
+static int hf_mqttsn_will;
+static int hf_mqttsn_clean_session;
+static int hf_mqttsn_topic_id_type;
+static int hf_mqttsn_return_code;
+static int hf_mqttsn_gw_id;
+static int hf_mqttsn_gw_addr;
+static int hf_mqttsn_adv_interv;
+static int hf_mqttsn_radius;
+static int hf_mqttsn_protocol_id;
+static int hf_mqttsn_topic_id;
+static int hf_mqttsn_msg_id;
+static int hf_mqttsn_topic;
+static int hf_mqttsn_topic_name_or_id;
+static int hf_mqttsn_sleep_timer;
+static int hf_mqttsn_will_topic;
+static int hf_mqttsn_will_msg;
+static int hf_mqttsn_pub_msg;
+static int hf_mqttsn_client_id;
+static int hf_mqttsn_keep_alive;
+static int hf_mqttsn_control_info;
+static int hf_mqttsn_wireless_node_id;
 
 /* Initialize subtree pointers. */
-static gint ett_mqttsn_hdr = -1;
-static gint ett_mqttsn_msg = -1;
-static gint ett_mqttsn_flags = -1;
+static gint ett_mqttsn_hdr;
+static gint ett_mqttsn_msg;
+static gint ett_mqttsn_flags;
 
 /* Dissect a single MQTT-SN packet. */
 static void dissect_mqttsn_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset)
diff --git a/epan/dissectors/packet-mqtt.c b/epan/dissectors/packet-mqtt.c
index 4ec92c2a1b..2b3c88bbb2 100644
--- a/epan/dissectors/packet-mqtt.c
+++ b/epan/dissectors/packet-mqtt.c
@@ -509,103 +509,103 @@ static dissector_handle_t mqtt_handle;
 static heur_dissector_list_t mqtt_topic_subdissector;
 
 /* Initialize the protocol and registered fields */
-static int proto_mqtt = -1;
+static int proto_mqtt;
 
 /* Message */
-static int hf_mqtt_hdrflags = -1;
-static int hf_mqtt_msg_len = -1;
-static int hf_mqtt_msg_type = -1;
-static int hf_mqtt_reserved = -1;
-static int hf_mqtt_dup_flag = -1;
-static int hf_mqtt_qos_level = -1;
-static int hf_mqtt_retain = -1;
-static int hf_mqtt_retain_reserved = -1;
-static int hf_mqtt_conack_reserved = -1;
-static int hf_mqtt_conack_flags = -1;
-static int hf_mqtt_conackflag_reserved = -1;
-static int hf_mqtt_conackflag_sp = -1;
-static int hf_mqtt_conack_code = -1;
-static int hf_mqtt_msgid = -1;
-static int hf_mqtt_sub_qos = -1;
-static int hf_mqtt_suback_qos = -1;
-static int hf_mqtt_topic_len = -1;
-static int hf_mqtt_topic = -1;
-static int hf_mqtt_will_topic_len = -1;
-static int hf_mqtt_will_topic = -1;
-static int hf_mqtt_will_msg_len = -1;
-static int hf_mqtt_will_msg = -1;
-static int hf_mqtt_will_msg_text = -1;
-static int hf_mqtt_username_len = -1;
-static int hf_mqtt_username = -1;
-static int hf_mqtt_passwd_len = -1;
-static int hf_mqtt_passwd = -1;
-static int hf_mqtt_pubmsg = -1;
-static int hf_mqtt_pubmsg_text = -1;
-static int hf_mqtt_pubmsg_decoded = -1;
-static int hf_mqtt_proto_len = -1;
-static int hf_mqtt_proto_name = -1;
-static int hf_mqtt_client_id_len = -1;
-static int hf_mqtt_client_id = -1;
-static int hf_mqtt_proto_ver = -1;
-static int hf_mqtt_conflags = -1;
-static int hf_mqtt_conflag_user = -1;
-static int hf_mqtt_conflag_passwd = -1;
-static int hf_mqtt_conflag_will_retain = -1;
-static int hf_mqtt_conflag_will_qos = -1;
-static int hf_mqtt_conflag_will_flag = -1;
-static int hf_mqtt_conflag_clean_sess = -1;
-static int hf_mqtt_conflag_reserved = -1;
-static int hf_mqtt_keep_alive = -1;
-static int hf_mqtt_subscription_options = -1;
+static int hf_mqtt_hdrflags;
+static int hf_mqtt_msg_len;
+static int hf_mqtt_msg_type;
+static int hf_mqtt_reserved;
+static int hf_mqtt_dup_flag;
+static int hf_mqtt_qos_level;
+static int hf_mqtt_retain;
+static int hf_mqtt_retain_reserved;
+static int hf_mqtt_conack_reserved;
+static int hf_mqtt_conack_flags;
+static int hf_mqtt_conackflag_reserved;
+static int hf_mqtt_conackflag_sp;
+static int hf_mqtt_conack_code;
+static int hf_mqtt_msgid;
+static int hf_mqtt_sub_qos;
+static int hf_mqtt_suback_qos;
+static int hf_mqtt_topic_len;
+static int hf_mqtt_topic;
+static int hf_mqtt_will_topic_len;
+static int hf_mqtt_will_topic;
+static int hf_mqtt_will_msg_len;
+static int hf_mqtt_will_msg;
+static int hf_mqtt_will_msg_text;
+static int hf_mqtt_username_len;
+static int hf_mqtt_username;
+static int hf_mqtt_passwd_len;
+static int hf_mqtt_passwd;
+static int hf_mqtt_pubmsg;
+static int hf_mqtt_pubmsg_text;
+static int hf_mqtt_pubmsg_decoded;
+static int hf_mqtt_proto_len;
+static int hf_mqtt_proto_name;
+static int hf_mqtt_client_id_len;
+static int hf_mqtt_client_id;
+static int hf_mqtt_proto_ver;
+static int hf_mqtt_conflags;
+static int hf_mqtt_conflag_user;
+static int hf_mqtt_conflag_passwd;
+static int hf_mqtt_conflag_will_retain;
+static int hf_mqtt_conflag_will_qos;
+static int hf_mqtt_conflag_will_flag;
+static int hf_mqtt_conflag_clean_sess;
+static int hf_mqtt_conflag_reserved;
+static int hf_mqtt_keep_alive;
+static int hf_mqtt_subscription_options;
 
 /* MQTT v5.0 Reason Codes */
-static int hf_mqtt_reason_code_connack = -1;
-static int hf_mqtt_reason_code_puback = -1;
-static int hf_mqtt_reason_code_pubrec = -1;
-static int hf_mqtt_reason_code_pubrel = -1;
-static int hf_mqtt_reason_code_pubcomp = -1;
-static int hf_mqtt_reason_code_suback = -1;
-static int hf_mqtt_reason_code_unsuback = -1;
-static int hf_mqtt_reason_code_disconnect = -1;
-static int hf_mqtt_reason_code_auth = -1;
+static int hf_mqtt_reason_code_connack;
+static int hf_mqtt_reason_code_puback;
+static int hf_mqtt_reason_code_pubrec;
+static int hf_mqtt_reason_code_pubrel;
+static int hf_mqtt_reason_code_pubcomp;
+static int hf_mqtt_reason_code_suback;
+static int hf_mqtt_reason_code_unsuback;
+static int hf_mqtt_reason_code_disconnect;
+static int hf_mqtt_reason_code_auth;
 
 /* MQTT v5.0 Subscribe Options */
-static int hf_mqtt_subscription_qos = -1;
-static int hf_mqtt_subscription_nl = -1;
-static int hf_mqtt_subscription_rap = -1;
-static int hf_mqtt_subscription_retain = -1;
-static int hf_mqtt_subscription_reserved = -1;
+static int hf_mqtt_subscription_qos;
+static int hf_mqtt_subscription_nl;
+static int hf_mqtt_subscription_rap;
+static int hf_mqtt_subscription_retain;
+static int hf_mqtt_subscription_reserved;
 
 /* MQTT v5.0 Properties */
-static int hf_mqtt_property_len = -1;
-static int hf_mqtt_property = -1;
-static int hf_mqtt_will_property = -1;
-static int hf_mqtt_property_id = -1;
-static int hf_mqtt_prop_num = -1;
-static int hf_mqtt_prop_content_type = -1;
-static int hf_mqtt_prop_max_qos = -1;
-static int hf_mqtt_prop_topic_alias = -1;
-static int hf_mqtt_prop_unknown = -1;
-static int hf_mqtt_prop_string_len = -1;
-static int hf_mqtt_prop_string = -1;
-static int hf_mqtt_prop_key_len = -1;
-static int hf_mqtt_prop_key = -1;
-static int hf_mqtt_prop_value_len = -1;
-static int hf_mqtt_prop_value = -1;
+static int hf_mqtt_property_len;
+static int hf_mqtt_property;
+static int hf_mqtt_will_property;
+static int hf_mqtt_property_id;
+static int hf_mqtt_prop_num;
+static int hf_mqtt_prop_content_type;
+static int hf_mqtt_prop_max_qos;
+static int hf_mqtt_prop_topic_alias;
+static int hf_mqtt_prop_unknown;
+static int hf_mqtt_prop_string_len;
+static int hf_mqtt_prop_string;
+static int hf_mqtt_prop_key_len;
+static int hf_mqtt_prop_key;
+static int hf_mqtt_prop_value_len;
+static int hf_mqtt_prop_value;
 
 /* Initialize the subtree pointers */
-static gint ett_mqtt_hdr = -1;
-static gint ett_mqtt_msg = -1;
-static gint ett_mqtt_hdr_flags = -1;
-static gint ett_mqtt_con_flags = -1;
-static gint ett_mqtt_conack_flags = -1;
-static gint ett_mqtt_property = -1;
-static gint ett_mqtt_subscription_flags = -1;
+static gint ett_mqtt_hdr;
+static gint ett_mqtt_msg;
+static gint ett_mqtt_hdr_flags;
+static gint ett_mqtt_con_flags;
+static gint ett_mqtt_conack_flags;
+static gint ett_mqtt_property;
+static gint ett_mqtt_subscription_flags;
 
 /* Initialize the expert fields */
-static expert_field ei_illegal_length = EI_INIT;
-static expert_field ei_unknown_version = EI_INIT;
-static expert_field ei_unknown_topic_alias = EI_INIT;
+static expert_field ei_illegal_length;
+static expert_field ei_unknown_version;
+static expert_field ei_unknown_topic_alias;
 
 /* Reassemble SMPP TCP segments */
 static gboolean reassemble_mqtt_over_tcp = TRUE;
diff --git a/epan/dissectors/packet-mrcpv2.c b/epan/dissectors/packet-mrcpv2.c
index 10b73199b1..379641f011 100644
--- a/epan/dissectors/packet-mrcpv2.c
+++ b/epan/dissectors/packet-mrcpv2.c
@@ -258,128 +258,128 @@ static const value_string header_type_vals[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_mrcpv2 = -1;
-static int hf_mrcpv2_Request_Line = -1;
-static int hf_mrcpv2_Response_Line = -1;
-static int hf_mrcpv2_Event_Line = -1;
-static int hf_mrcpv2_Unknown_Message = -1;
-static int hf_mrcpv2_Unknown_Header = -1;
-static int hf_mrcpv2_Data = -1;
-static int hf_mrcpv2_Method = -1;
-static int hf_mrcpv2_Event = -1;
-static int hf_mrcpv2_version = -1;
-static int hf_mrcpv2_message_length = -1;
-static int hf_mrcpv2_request_id = -1;
-static int hf_mrcpv2_status_code = -1;
-static int hf_mrcpv2_request_state = -1;
-static int hf_mrcpv2_Abort_Model = -1;
-static int hf_mrcpv2_Abort_Phrase_Enrollment = -1;
-static int hf_mrcpv2_Abort_Verification = -1;
-static int hf_mrcpv2_Accept = -1;
-static int hf_mrcpv2_Accept_Charset = -1;
-static int hf_mrcpv2_Active_Request_Id_List = -1;
-static int hf_mrcpv2_Adapt_Model = -1;
-static int hf_mrcpv2_Audio_Fetch_Hint = -1;
-static int hf_mrcpv2_Cache_Control = -1;
-static int hf_mrcpv2_Cancel_If_Queue = -1;
-static int hf_mrcpv2_Capture_On_Speech = -1;
-static int hf_mrcpv2_Channel_Identifier = -1;
-static int hf_mrcpv2_Clash_Threshold = -1;
-static int hf_mrcpv2_Clear_Dtmf_Buffer = -1;
-static int hf_mrcpv2_Completion_Cause = -1;
-static int hf_mrcpv2_Completion_Reason = -1;
-static int hf_mrcpv2_Confidence_Threshold = -1;
-static int hf_mrcpv2_Confusable_Phrases_URI = -1;
-static int hf_mrcpv2_Consistency_Threshold = -1;
-static int hf_mrcpv2_Content_Base = -1;
-static int hf_mrcpv2_Content_Encoding = -1;
-static int hf_mrcpv2_Content_ID = -1;
-static int hf_mrcpv2_Content_Length = -1;
-static int hf_mrcpv2_Content_Location = -1;
-static int hf_mrcpv2_Content_Type = -1;
-static int hf_mrcpv2_Dtmf_Buffer_Time = -1;
-static int hf_mrcpv2_Dtmf_Interdigit_Timeout = -1;
-static int hf_mrcpv2_Dtmf_Term_Char = -1;
-static int hf_mrcpv2_Dtmf_Term_Timeout = -1;
-static int hf_mrcpv2_Early_No_Match = -1;
-static int hf_mrcpv2_Enroll_Utterance = -1;
-static int hf_mrcpv2_Failed_URI = -1;
-static int hf_mrcpv2_Failed_URI_Cause = -1;
-static int hf_mrcpv2_Fetch_Hint = -1;
-static int hf_mrcpv2_Fetch_Timeout = -1;
-static int hf_mrcpv2_Final_Silence = -1;
-static int hf_mrcpv2_Hotword_Max_Duration = -1;
-static int hf_mrcpv2_Hotword_Min_Duration = -1;
-static int hf_mrcpv2_Input_Type = -1;
-static int hf_mrcpv2_Input_Waveform_URI = -1;
-static int hf_mrcpv2_Interpret_Text = -1;
-static int hf_mrcpv2_Jump_Size = -1;
-static int hf_mrcpv2_Kill_On_Barge_In = -1;
-static int hf_mrcpv2_Lexicon_Search_Order = -1;
-static int hf_mrcpv2_Load_Lexicon = -1;
-static int hf_mrcpv2_Logging_Tag = -1;
-static int hf_mrcpv2_Max_Time = -1;
-static int hf_mrcpv2_Media_Type = -1;
-static int hf_mrcpv2_Min_Verification_Score = -1;
-static int hf_mrcpv2_N_Best_List_Length = -1;
-static int hf_mrcpv2_New_Audio_Channel = -1;
-static int hf_mrcpv2_New_Phrase_ID = -1;
-static int hf_mrcpv2_No_Input_Timeout = -1;
-static int hf_mrcpv2_Num_Max_Verification_Phrases = -1;
-static int hf_mrcpv2_Num_Min_Consistent_Pronunciations = -1;
-static int hf_mrcpv2_Num_Min_Verification_Phrases = -1;
-static int hf_mrcpv2_Personal_Grammar_URI = -1;
-static int hf_mrcpv2_Phrase_ID = -1;
-static int hf_mrcpv2_Phrase_NL = -1;
-static int hf_mrcpv2_Prosody_Contour = -1;
-static int hf_mrcpv2_Prosody_Duration = -1;
-static int hf_mrcpv2_Prosody_Pitch = -1;
-static int hf_mrcpv2_Prosody_Range = -1;
-static int hf_mrcpv2_Prosody_Rate = -1;
-static int hf_mrcpv2_Prosody_Volume = -1;
-static int hf_mrcpv2_Proxy_Sync_Id = -1;
-static int hf_mrcpv2_Recognition_Mode = -1;
-static int hf_mrcpv2_Recognition_Timeout = -1;
-static int hf_mrcpv2_Recognizer_Context_Block = -1;
-static int hf_mrcpv2_Record_URI = -1;
-static int hf_mrcpv2_Repository_URI = -1;
-static int hf_mrcpv2_Save_Best_Waveform = -1;
-static int hf_mrcpv2_Save_Waveform = -1;
-static int hf_mrcpv2_Sensitivity_Level = -1;
-static int hf_mrcpv2_Set_Cookie = -1;
-static int hf_mrcpv2_Speak_Length = -1;
-static int hf_mrcpv2_Speak_Restart = -1;
-static int hf_mrcpv2_Speaker_Profile = -1;
-static int hf_mrcpv2_Speech_Complete_Timeout = -1;
-static int hf_mrcpv2_Speech_Incomplete_Timeout = -1;
-static int hf_mrcpv2_Speech_Language = -1;
-static int hf_mrcpv2_Speech_Marker = -1;
-static int hf_mrcpv2_Speed_Vs_Accuracy = -1;
-static int hf_mrcpv2_Start_Input_Timers = -1;
-static int hf_mrcpv2_Trim_Length = -1;
-static int hf_mrcpv2_Vendor_Specific_Parameters = -1;
-static int hf_mrcpv2_Ver_Buffer_Utterance = -1;
-static int hf_mrcpv2_Verification_Mode = -1;
-static int hf_mrcpv2_Voice_Age = -1;
-static int hf_mrcpv2_Voice_Gender = -1;
-static int hf_mrcpv2_Voice_Name = -1;
-static int hf_mrcpv2_Voice_Variant = -1;
-static int hf_mrcpv2_Voiceprint_Exists = -1;
-static int hf_mrcpv2_Voiceprint_Identifier = -1;
-static int hf_mrcpv2_Waveform_URI = -1;
-static int hf_mrcpv2_Weight = -1;
+static int proto_mrcpv2;
+static int hf_mrcpv2_Request_Line;
+static int hf_mrcpv2_Response_Line;
+static int hf_mrcpv2_Event_Line;
+static int hf_mrcpv2_Unknown_Message;
+static int hf_mrcpv2_Unknown_Header;
+static int hf_mrcpv2_Data;
+static int hf_mrcpv2_Method;
+static int hf_mrcpv2_Event;
+static int hf_mrcpv2_version;
+static int hf_mrcpv2_message_length;
+static int hf_mrcpv2_request_id;
+static int hf_mrcpv2_status_code;
+static int hf_mrcpv2_request_state;
+static int hf_mrcpv2_Abort_Model;
+static int hf_mrcpv2_Abort_Phrase_Enrollment;
+static int hf_mrcpv2_Abort_Verification;
+static int hf_mrcpv2_Accept;
+static int hf_mrcpv2_Accept_Charset;
+static int hf_mrcpv2_Active_Request_Id_List;
+static int hf_mrcpv2_Adapt_Model;
+static int hf_mrcpv2_Audio_Fetch_Hint;
+static int hf_mrcpv2_Cache_Control;
+static int hf_mrcpv2_Cancel_If_Queue;
+static int hf_mrcpv2_Capture_On_Speech;
+static int hf_mrcpv2_Channel_Identifier;
+static int hf_mrcpv2_Clash_Threshold;
+static int hf_mrcpv2_Clear_Dtmf_Buffer;
+static int hf_mrcpv2_Completion_Cause;
+static int hf_mrcpv2_Completion_Reason;
+static int hf_mrcpv2_Confidence_Threshold;
+static int hf_mrcpv2_Confusable_Phrases_URI;
+static int hf_mrcpv2_Consistency_Threshold;
+static int hf_mrcpv2_Content_Base;
+static int hf_mrcpv2_Content_Encoding;
+static int hf_mrcpv2_Content_ID;
+static int hf_mrcpv2_Content_Length;
+static int hf_mrcpv2_Content_Location;
+static int hf_mrcpv2_Content_Type;
+static int hf_mrcpv2_Dtmf_Buffer_Time;
+static int hf_mrcpv2_Dtmf_Interdigit_Timeout;
+static int hf_mrcpv2_Dtmf_Term_Char;
+static int hf_mrcpv2_Dtmf_Term_Timeout;
+static int hf_mrcpv2_Early_No_Match;
+static int hf_mrcpv2_Enroll_Utterance;
+static int hf_mrcpv2_Failed_URI;
+static int hf_mrcpv2_Failed_URI_Cause;
+static int hf_mrcpv2_Fetch_Hint;
+static int hf_mrcpv2_Fetch_Timeout;
+static int hf_mrcpv2_Final_Silence;
+static int hf_mrcpv2_Hotword_Max_Duration;
+static int hf_mrcpv2_Hotword_Min_Duration;
+static int hf_mrcpv2_Input_Type;
+static int hf_mrcpv2_Input_Waveform_URI;
+static int hf_mrcpv2_Interpret_Text;
+static int hf_mrcpv2_Jump_Size;
+static int hf_mrcpv2_Kill_On_Barge_In;
+static int hf_mrcpv2_Lexicon_Search_Order;
+static int hf_mrcpv2_Load_Lexicon;
+static int hf_mrcpv2_Logging_Tag;
+static int hf_mrcpv2_Max_Time;
+static int hf_mrcpv2_Media_Type;
+static int hf_mrcpv2_Min_Verification_Score;
+static int hf_mrcpv2_N_Best_List_Length;
+static int hf_mrcpv2_New_Audio_Channel;
+static int hf_mrcpv2_New_Phrase_ID;
+static int hf_mrcpv2_No_Input_Timeout;
+static int hf_mrcpv2_Num_Max_Verification_Phrases;
+static int hf_mrcpv2_Num_Min_Consistent_Pronunciations;
+static int hf_mrcpv2_Num_Min_Verification_Phrases;
+static int hf_mrcpv2_Personal_Grammar_URI;
+static int hf_mrcpv2_Phrase_ID;
+static int hf_mrcpv2_Phrase_NL;
+static int hf_mrcpv2_Prosody_Contour;
+static int hf_mrcpv2_Prosody_Duration;
+static int hf_mrcpv2_Prosody_Pitch;
+static int hf_mrcpv2_Prosody_Range;
+static int hf_mrcpv2_Prosody_Rate;
+static int hf_mrcpv2_Prosody_Volume;
+static int hf_mrcpv2_Proxy_Sync_Id;
+static int hf_mrcpv2_Recognition_Mode;
+static int hf_mrcpv2_Recognition_Timeout;
+static int hf_mrcpv2_Recognizer_Context_Block;
+static int hf_mrcpv2_Record_URI;
+static int hf_mrcpv2_Repository_URI;
+static int hf_mrcpv2_Save_Best_Waveform;
+static int hf_mrcpv2_Save_Waveform;
+static int hf_mrcpv2_Sensitivity_Level;
+static int hf_mrcpv2_Set_Cookie;
+static int hf_mrcpv2_Speak_Length;
+static int hf_mrcpv2_Speak_Restart;
+static int hf_mrcpv2_Speaker_Profile;
+static int hf_mrcpv2_Speech_Complete_Timeout;
+static int hf_mrcpv2_Speech_Incomplete_Timeout;
+static int hf_mrcpv2_Speech_Language;
+static int hf_mrcpv2_Speech_Marker;
+static int hf_mrcpv2_Speed_Vs_Accuracy;
+static int hf_mrcpv2_Start_Input_Timers;
+static int hf_mrcpv2_Trim_Length;
+static int hf_mrcpv2_Vendor_Specific_Parameters;
+static int hf_mrcpv2_Ver_Buffer_Utterance;
+static int hf_mrcpv2_Verification_Mode;
+static int hf_mrcpv2_Voice_Age;
+static int hf_mrcpv2_Voice_Gender;
+static int hf_mrcpv2_Voice_Name;
+static int hf_mrcpv2_Voice_Variant;
+static int hf_mrcpv2_Voiceprint_Exists;
+static int hf_mrcpv2_Voiceprint_Identifier;
+static int hf_mrcpv2_Waveform_URI;
+static int hf_mrcpv2_Weight;
 
-static expert_field ei_mrcpv2_Content_Length_invalid = EI_INIT;
+static expert_field ei_mrcpv2_Content_Length_invalid;
 
 /* Global MRCPv2 port pref */
 #define TCP_DEFAULT_RANGE "6075, 30000-30200" /* Not IANA registered */
 
 /* Initialize the subtree pointers */
-static gint ett_mrcpv2 = -1;
-static gint ett_Request_Line = -1;
-static gint ett_Response_Line = -1;
-static gint ett_Event_Line = -1;
-static gint ett_Status_Code = -1;
+static gint ett_mrcpv2;
+static gint ett_Request_Line;
+static gint ett_Response_Line;
+static gint ett_Event_Line;
+static gint ett_Status_Code;
 
 /* format status code description */
 static const string_string status_code_vals[] = {
diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c
index 778ced11c8..5052e2a42e 100644
--- a/epan/dissectors/packet-mrdisc.c
+++ b/epan/dissectors/packet-mrdisc.c
@@ -34,23 +34,23 @@ void proto_reg_handoff_mrdisc(void);
 
 static dissector_handle_t mrdisc_handle;
 
-static int proto_mrdisc = -1;
-static int hf_checksum = -1;
-static int hf_checksum_status = -1;
-static int hf_type = -1;
-static int hf_advint = -1;
-static int hf_numopts = -1;
-static int hf_options = -1;
-static int hf_option = -1;
-static int hf_option_len = -1;
-static int hf_qi = -1;
-static int hf_rv = -1;
-static int hf_option_bytes = -1;
-
-static int ett_mrdisc = -1;
-static int ett_options = -1;
-
-static expert_field ei_checksum = EI_INIT;
+static int proto_mrdisc;
+static int hf_checksum;
+static int hf_checksum_status;
+static int hf_type;
+static int hf_advint;
+static int hf_numopts;
+static int hf_options;
+static int hf_option;
+static int hf_option_len;
+static int hf_qi;
+static int hf_rv;
+static int hf_option_bytes;
+
+static int ett_mrdisc;
+static int ett_options;
+
+static expert_field ei_checksum;
 
 #define MC_ALL_ROUTERS		0xe0000002
 
diff --git a/epan/dissectors/packet-mrp-mmrp.c b/epan/dissectors/packet-mrp-mmrp.c
index bef7d293be..df387d3718 100644
--- a/epan/dissectors/packet-mrp-mmrp.c
+++ b/epan/dissectors/packet-mrp-mmrp.c
@@ -94,40 +94,40 @@ static const value_string three_packed_vals[] = {
 /**********************************************************/
 /* Initialize the protocol and registered fields          */
 /**********************************************************/
-static int proto_mmrp = -1;
-static int hf_mmrp_proto_id = -1;
-static int hf_mmrp_message = -1; /* Message is a group of fields */
-static int hf_mmrp_attribute_type = -1;
-static int hf_mmrp_attribute_length = -1;
-static int hf_mmrp_attribute_list = -1; /* AttributeList is a group of fields */
-static int hf_mmrp_vector_attribute = -1; /* VectorAttribute is a group of fields */
+static int proto_mmrp;
+static int hf_mmrp_proto_id;
+static int hf_mmrp_message; /* Message is a group of fields */
+static int hf_mmrp_attribute_type;
+static int hf_mmrp_attribute_length;
+static int hf_mmrp_attribute_list; /* AttributeList is a group of fields */
+static int hf_mmrp_vector_attribute; /* VectorAttribute is a group of fields */
 
 /* The following VectorHeader contains the LeaveAllEvent and NumberOfValues */
-static int hf_mmrp_vector_header = -1;
-static int hf_mmrp_leave_all_event = -1;
-static int hf_mmrp_number_of_values = -1;
-static gint ett_vector_header = -1;
+static int hf_mmrp_vector_header;
+static int hf_mmrp_leave_all_event;
+static int hf_mmrp_number_of_values;
+static gint ett_vector_header;
 static int * const vector_header_fields[] = {
     &hf_mmrp_leave_all_event,
     &hf_mmrp_number_of_values,
     NULL
 };
 
-static int hf_mmrp_first_value = -1; /* FirstValue is a group of fields */
+static int hf_mmrp_first_value; /* FirstValue is a group of fields */
 
-static int hf_mmrp_mac = -1;
-static int hf_mmrp_ser_req = -1;
+static int hf_mmrp_mac;
+static int hf_mmrp_ser_req;
 
-static int hf_mmrp_three_packed_event = -1;
+static int hf_mmrp_three_packed_event;
 
-static int hf_mmrp_end_mark = -1;
+static int hf_mmrp_end_mark;
 
 /* Initialize the subtree pointers */
-static gint ett_mmrp = -1;
-static gint ett_msg = -1;
-static gint ett_attr_list = -1;
-static gint ett_vect_attr = -1;
-static gint ett_first_value = -1;
+static gint ett_mmrp;
+static gint ett_msg;
+static gint ett_attr_list;
+static gint ett_vect_attr;
+static gint ett_first_value;
 
 
 
diff --git a/epan/dissectors/packet-mrp-msrp.c b/epan/dissectors/packet-mrp-msrp.c
index fec4e46c7f..bb666b2523 100644
--- a/epan/dissectors/packet-mrp-msrp.c
+++ b/epan/dissectors/packet-mrp-msrp.c
@@ -205,37 +205,37 @@ static const value_string four_packed_vals[] = {
 /**********************************************************/
 /* Initialize the protocol and registered fields          */
 /**********************************************************/
-static int proto_msrp = -1;
-static int hf_msrp_proto_id = -1;
-static int hf_msrp_message = -1; /* Message is a group of fields */
-static int hf_msrp_attribute_type = -1;
-static int hf_msrp_attribute_length = -1;
-static int hf_msrp_attribute_list_length = -1;
-static int hf_msrp_attribute_list = -1; /* AttributeList is a group of fields */
-static int hf_msrp_vector_attribute = -1; /* VectorAttribute is a group of fields */
+static int proto_msrp;
+static int hf_msrp_proto_id;
+static int hf_msrp_message; /* Message is a group of fields */
+static int hf_msrp_attribute_type;
+static int hf_msrp_attribute_length;
+static int hf_msrp_attribute_list_length;
+static int hf_msrp_attribute_list; /* AttributeList is a group of fields */
+static int hf_msrp_vector_attribute; /* VectorAttribute is a group of fields */
 
 /* The following VectorHeader contains the LeaveAllEvent and NumberOfValues */
-static int hf_msrp_vector_header = -1;
-static int hf_msrp_leave_all_event = -1;
-static int hf_msrp_number_of_values = -1;
-static gint ett_vector_header = -1;
+static int hf_msrp_vector_header;
+static int hf_msrp_leave_all_event;
+static int hf_msrp_number_of_values;
+static gint ett_vector_header;
 static int * const vector_header_fields[] = {
     &hf_msrp_leave_all_event,
     &hf_msrp_number_of_values,
     NULL
 };
 
-static int hf_msrp_first_value = -1; /* FirstValue is a group of fields */
-static int hf_msrp_stream_id = -1;
-static int hf_msrp_stream_da = -1;
-static int hf_msrp_vlan_id = -1;
-static int hf_msrp_tspec_max_frame_size = -1;
-static int hf_msrp_tspec_max_interval_frames = -1;
-static int hf_msrp_priority_and_rank = -1;
-static int hf_msrp_priority = -1;
-static int hf_msrp_rank = -1;
-static int hf_msrp_reserved = -1;
-static gint ett_priority_and_rank = -1;
+static int hf_msrp_first_value; /* FirstValue is a group of fields */
+static int hf_msrp_stream_id;
+static int hf_msrp_stream_da;
+static int hf_msrp_vlan_id;
+static int hf_msrp_tspec_max_frame_size;
+static int hf_msrp_tspec_max_interval_frames;
+static int hf_msrp_priority_and_rank;
+static int hf_msrp_priority;
+static int hf_msrp_rank;
+static int hf_msrp_reserved;
+static gint ett_priority_and_rank;
 static int * const priority_and_rank_fields[] = {
     &hf_msrp_priority,
     &hf_msrp_rank,
@@ -243,27 +243,27 @@ static int * const priority_and_rank_fields[] = {
     NULL
 };
 
-static int hf_msrp_sr_class_id = -1;
-static int hf_msrp_sr_class_priority = -1;
-static int hf_msrp_sr_class_vid = -1;
+static int hf_msrp_sr_class_id;
+static int hf_msrp_sr_class_priority;
+static int hf_msrp_sr_class_vid;
 
-static int hf_msrp_accumulated_latency = -1;
-static int hf_msrp_failure_bridge_id = -1;
-static int hf_msrp_failure_code = -1;
+static int hf_msrp_accumulated_latency;
+static int hf_msrp_failure_bridge_id;
+static int hf_msrp_failure_code;
 
-static int hf_msrp_three_packed_event = -1;
-static int hf_msrp_four_packed_event = -1;
+static int hf_msrp_three_packed_event;
+static int hf_msrp_four_packed_event;
 
-static int hf_msrp_end_mark = -1;
+static int hf_msrp_end_mark;
 
 /* Initialize the subtree pointers */
-static gint ett_msrp = -1;
-static gint ett_msg = -1;
-static gint ett_attr_list = -1;
-static gint ett_vect_attr = -1;
-static gint ett_first_value = -1;
+static gint ett_msrp;
+static gint ett_msg;
+static gint ett_attr_list;
+static gint ett_vect_attr;
+static gint ett_first_value;
 
-static expert_field ei_msrp_attribute_type = EI_INIT;
+static expert_field ei_msrp_attribute_type;
 
 /**********************************************************/
 /* Dissector starts here                                  */
diff --git a/epan/dissectors/packet-mrp-mvrp.c b/epan/dissectors/packet-mrp-mvrp.c
index faced26fa4..c17ba03645 100644
--- a/epan/dissectors/packet-mrp-mvrp.c
+++ b/epan/dissectors/packet-mrp-mvrp.c
@@ -91,37 +91,37 @@ static const value_string three_packed_vals[] = {
 /**********************************************************/
 /* Initialize the protocol and registered fields          */
 /**********************************************************/
-static int proto_mvrp = -1;
-static int hf_mvrp_proto_id = -1;
-static int hf_mvrp_message = -1; /* Message is a group of fields */
-static int hf_mvrp_attribute_type = -1;
-static int hf_mvrp_attribute_length = -1;
-static int hf_mvrp_attribute_list = -1; /* AttributeList is a group of fields */
-static int hf_mvrp_vector_attribute = -1; /* VectorAttribute is a group of fields */
+static int proto_mvrp;
+static int hf_mvrp_proto_id;
+static int hf_mvrp_message; /* Message is a group of fields */
+static int hf_mvrp_attribute_type;
+static int hf_mvrp_attribute_length;
+static int hf_mvrp_attribute_list; /* AttributeList is a group of fields */
+static int hf_mvrp_vector_attribute; /* VectorAttribute is a group of fields */
 
 /* The following VectorHeader contains the LeaveAllEvent and NumberOfValues */
-static int hf_mvrp_vector_header = -1;
-static int hf_mvrp_leave_all_event = -1;
-static int hf_mvrp_number_of_values = -1;
-static gint ett_vector_header = -1;
+static int hf_mvrp_vector_header;
+static int hf_mvrp_leave_all_event;
+static int hf_mvrp_number_of_values;
+static gint ett_vector_header;
 static int * const vector_header_fields[] = {
     &hf_mvrp_leave_all_event,
     &hf_mvrp_number_of_values,
     NULL
 };
 
-static int hf_mvrp_first_value = -1; /* FirstValue is a group of fields */
-static int hf_mvrp_vid = -1;
-static int hf_mvrp_three_packed_event = -1;
+static int hf_mvrp_first_value; /* FirstValue is a group of fields */
+static int hf_mvrp_vid;
+static int hf_mvrp_three_packed_event;
 
-static int hf_mvrp_end_mark = -1;
+static int hf_mvrp_end_mark;
 
 /* Initialize the subtree pointers */
-static gint ett_mvrp = -1;
-static gint ett_msg = -1;
-static gint ett_attr_list = -1;
-static gint ett_vect_attr = -1;
-static gint ett_first_value = -1;
+static gint ett_mvrp;
+static gint ett_msg;
+static gint ett_attr_list;
+static gint ett_vect_attr;
+static gint ett_first_value;
 
 
 
diff --git a/epan/dissectors/packet-ms-do.c b/epan/dissectors/packet-ms-do.c
index d30905ca2a..40bf2fe356 100644
--- a/epan/dissectors/packet-ms-do.c
+++ b/epan/dissectors/packet-ms-do.c
@@ -27,51 +27,51 @@
 void proto_reg_handoff_do(void);
 void proto_register_do(void);
 
-static int proto_do = -1;
+static int proto_do;
 // Message types
-static int hf_do_handshake_message = -1;
-static int hf_do_keepalive_message = -1;
-static int hf_do_choke_message = -1;
-static int hf_do_unchoke_message = -1;
-static int hf_do_interested_message = -1;
-static int hf_do_notinterested_message = -1;
-static int hf_do_have_message = -1;
-static int hf_do_bitfield_message = -1;
-static int hf_do_request_message = -1;
-static int hf_do_piece_message = -1;
-static int hf_do_cancel_message = -1;
-static int hf_do_heap_spraying_message = -1;
-static int hf_do_unknown_message = -1;
+static int hf_do_handshake_message;
+static int hf_do_keepalive_message;
+static int hf_do_choke_message;
+static int hf_do_unchoke_message;
+static int hf_do_interested_message;
+static int hf_do_notinterested_message;
+static int hf_do_have_message;
+static int hf_do_bitfield_message;
+static int hf_do_request_message;
+static int hf_do_piece_message;
+static int hf_do_cancel_message;
+static int hf_do_heap_spraying_message;
+static int hf_do_unknown_message;
 // Handshake
-static int hf_do_protocol_name = -1;
-static int hf_do_size = -1;
-static int hf_do_swarm_hash = -1;
-static int hf_do_peer_id = -1;
-static int hf_do_peer_id_suffix = -1;
+static int hf_do_protocol_name;
+static int hf_do_size;
+static int hf_do_swarm_hash;
+static int hf_do_peer_id;
+static int hf_do_peer_id_suffix;
 // Message header
-static int hf_do_message_size = -1;
-static int hf_do_message_id = -1;
+static int hf_do_message_size;
+static int hf_do_message_id;
 // BitField
-static int hf_do_bitfield = -1;
-static int hf_do_bitfield_piece = -1;
-static int hf_do_has_piece = -1;
+static int hf_do_bitfield;
+static int hf_do_bitfield_piece;
+static int hf_do_has_piece;
 // Request & Piece
-static int hf_do_piece_index = -1;
-static int hf_do_piece_start_offset = -1;
-static int hf_do_piece_size = -1;
-static int hf_do_piece_buffer = -1;
-static int hf_do_piece_response_size = -1;
+static int hf_do_piece_index;
+static int hf_do_piece_start_offset;
+static int hf_do_piece_size;
+static int hf_do_piece_buffer;
+static int hf_do_piece_response_size;
 // "HeapSpraying"
-static int hf_do_heap_spraying = -1;
+static int hf_do_heap_spraying;
 
-static gint ett_do = -1;
-static gint ett_do_handshake = -1;
-static gint ett_do_message = -1;
-static gint ett_do_bitfield = -1;
-static gint ett_do_bitfield_single = -1;
+static gint ett_do;
+static gint ett_do_handshake;
+static gint ett_do_message;
+static gint ett_do_bitfield;
+static gint ett_do_bitfield_single;
 
-static expert_field ei_do_invalid_message_id = EI_INIT;
-static expert_field ei_do_invalid_message_length = EI_INIT;
+static expert_field ei_do_invalid_message_id;
+static expert_field ei_do_invalid_message_length;
 
 static dissector_handle_t do_handle = NULL;
 
diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c
index 95d984eaaa..d6e333001b 100644
--- a/epan/dissectors/packet-ms-mms.c
+++ b/epan/dissectors/packet-ms-mms.c
@@ -31,92 +31,92 @@
 #include <epan/strutil.h>
 
 static dissector_handle_t msmms_handle;
-static gint               proto_msmms                      = -1;
+static gint               proto_msmms;
 
 
 /* Command fields */
-static gint   hf_msmms_command                             = -1;
-static gint   hf_msmms_command_common_header               = -1;
-/* static gint   hf_msmms_command_version                     = -1; */
-static gint   hf_msmms_command_signature                   = -1;
-static gint   hf_msmms_command_length                      = -1;
-static gint   hf_msmms_command_protocol_type               = -1;
-static gint   hf_msmms_command_length_remaining            = -1;
-static gint   hf_msmms_command_sequence_number             = -1;
-static gint   hf_msmms_command_timestamp                   = -1;
-static gint   hf_msmms_command_length_remaining2           = -1;
-static gint   hf_msmms_command_to_client_id                = -1;
-static gint   hf_msmms_command_to_server_id                = -1;
-static gint   hf_msmms_command_direction                   = -1;
+static gint   hf_msmms_command;
+static gint   hf_msmms_command_common_header;
+/* static gint   hf_msmms_command_version; */
+static gint   hf_msmms_command_signature;
+static gint   hf_msmms_command_length;
+static gint   hf_msmms_command_protocol_type;
+static gint   hf_msmms_command_length_remaining;
+static gint   hf_msmms_command_sequence_number;
+static gint   hf_msmms_command_timestamp;
+static gint   hf_msmms_command_length_remaining2;
+static gint   hf_msmms_command_to_client_id;
+static gint   hf_msmms_command_to_server_id;
+static gint   hf_msmms_command_direction;
 
-static gint   hf_msmms_command_prefix1                     = -1;
-static gint   hf_msmms_command_prefix1_error               = -1;
-static gint   hf_msmms_command_prefix1_command_level       = -1;
-static gint   hf_msmms_command_prefix2                     = -1;
+static gint   hf_msmms_command_prefix1;
+static gint   hf_msmms_command_prefix1_error;
+static gint   hf_msmms_command_prefix1_command_level;
+static gint   hf_msmms_command_prefix2;
 
-static gint   hf_msmms_command_client_transport_info       = -1;
-static gint   hf_msmms_command_client_player_info          = -1;
+static gint   hf_msmms_command_client_transport_info;
+static gint   hf_msmms_command_client_player_info;
 
-static gint   hf_msmms_command_server_version              = -1;
-static gint   hf_msmms_command_tool_version                = -1;
-static gint   hf_msmms_command_update_url                  = -1;
-static gint   hf_msmms_command_password_type               = -1;
+static gint   hf_msmms_command_server_version;
+static gint   hf_msmms_command_tool_version;
+static gint   hf_msmms_command_update_url;
+static gint   hf_msmms_command_password_type;
 
-static gint   hf_msmms_command_server_version_length       = -1;
-static gint   hf_msmms_command_tool_version_length         = -1;
-static gint   hf_msmms_command_update_url_length           = -1;
-static gint   hf_msmms_command_password_type_length        = -1;
+static gint   hf_msmms_command_server_version_length;
+static gint   hf_msmms_command_tool_version_length;
+static gint   hf_msmms_command_update_url_length;
+static gint   hf_msmms_command_password_type_length;
 
-static gint   hf_msmms_command_number_of_words             = -1;
-static gint   hf_msmms_command_client_id                   = -1;
-static gint   hf_msmms_command_server_file                 = -1;
+static gint   hf_msmms_command_number_of_words;
+static gint   hf_msmms_command_client_id;
+static gint   hf_msmms_command_server_file;
 
-static gint   hf_msmms_command_result_flags                = -1;
+static gint   hf_msmms_command_result_flags;
 
-static gint   hf_msmms_command_broadcast_indexing          = -1;
-static gint   hf_msmms_command_broadcast_liveness          = -1;
+static gint   hf_msmms_command_broadcast_indexing;
+static gint   hf_msmms_command_broadcast_liveness;
 
-static gint   hf_msmms_command_recorded_media_length       = -1;
-static gint   hf_msmms_command_media_packet_length         = -1;
+static gint   hf_msmms_command_recorded_media_length;
+static gint   hf_msmms_command_media_packet_length;
 
-static gint   hf_msmms_command_strange_string              = -1;
+static gint   hf_msmms_command_strange_string;
 
-static gint   hf_msmms_command_stream_structure_count      = -1;
-static gint   hf_msmms_stream_selection_flags              = -1;
-static gint   hf_msmms_stream_selection_stream_id          = -1;
-static gint   hf_msmms_stream_selection_action             = -1;
+static gint   hf_msmms_command_stream_structure_count;
+static gint   hf_msmms_stream_selection_flags;
+static gint   hf_msmms_stream_selection_stream_id;
+static gint   hf_msmms_stream_selection_action;
 
-static gint   hf_msmms_command_header_packet_id_type       = -1;
+static gint   hf_msmms_command_header_packet_id_type;
 
 
 /* Data fields */
-static gint   hf_msmms_data                                = -1;
-static gint   hf_msmms_data_sequence_number                = -1;
-static gint   hf_msmms_data_packet_id_type                 = -1;
-static gint   hf_msmms_data_udp_sequence                   = -1;
-static gint   hf_msmms_data_tcp_flags                      = -1;
-static gint   hf_msmms_data_packet_length                  = -1;
+static gint   hf_msmms_data;
+static gint   hf_msmms_data_sequence_number;
+static gint   hf_msmms_data_packet_id_type;
+static gint   hf_msmms_data_udp_sequence;
+static gint   hf_msmms_data_tcp_flags;
+static gint   hf_msmms_data_packet_length;
 
-static gint   hf_msmms_data_header_id                      = -1;
-static gint   hf_msmms_data_client_id                      = -1;
-static gint   hf_msmms_data_command_id                     = -1;
-static gint   hf_msmms_data_packet_to_resend               = -1;
+static gint   hf_msmms_data_header_id;
+static gint   hf_msmms_data_client_id;
+static gint   hf_msmms_data_command_id;
+static gint   hf_msmms_data_packet_to_resend;
 
-static gint   hf_msmms_data_timing_pair                    = -1;
-static gint   hf_msmms_data_timing_pair_seqno              = -1;
-static gint   hf_msmms_data_timing_pair_flags              = -1;
-static gint   hf_msmms_data_timing_pair_id                 = -1;
-static gint   hf_msmms_data_timing_pair_flag               = -1;
-static gint   hf_msmms_data_timing_pair_packet_length      = -1;
+static gint   hf_msmms_data_timing_pair;
+static gint   hf_msmms_data_timing_pair_seqno;
+static gint   hf_msmms_data_timing_pair_flags;
+static gint   hf_msmms_data_timing_pair_id;
+static gint   hf_msmms_data_timing_pair_flag;
+static gint   hf_msmms_data_timing_pair_packet_length;
 
-static gint   hf_msmms_data_unparsed                       = -1;
+static gint   hf_msmms_data_unparsed;
 
 
 /* Subtrees */
-static gint   ett_msmms_command                            = -1;
-static gint   ett_msmms_command_common_header              = -1;
-static gint   ett_msmms_data                               = -1;
-static gint   ett_msmms_data_timing_packet_pair            = -1;
+static gint   ett_msmms_command;
+static gint   ett_msmms_command_common_header;
+static gint   ett_msmms_data;
+static gint   ett_msmms_data_timing_packet_pair;
 
 #define MSMMS_PORT 1755
 
diff --git a/epan/dissectors/packet-ms-nns.c b/epan/dissectors/packet-ms-nns.c
index a364dc5bb5..20a1ec1dbc 100644
--- a/epan/dissectors/packet-ms-nns.c
+++ b/epan/dissectors/packet-ms-nns.c
@@ -42,17 +42,17 @@ struct nns_session_state {
     gboolean  first_handshake_done;
 };
 
-static int proto_nns = -1;
-static int hf_nns_message_id = -1;
-static int hf_nns_major_version = -1;
-static int hf_nns_minor_version = -1;
-static int hf_nns_auth_payload_size = -1;
-static int hf_nns_auth_payload = -1;
-static int hf_nns_payload_size = -1;
-static int hf_nns_payload = -1;
-
-static gint ett_nns = -1;
-static gint ett_nns_payload = -1;
+static int proto_nns;
+static int hf_nns_message_id;
+static int hf_nns_major_version;
+static int hf_nns_minor_version;
+static int hf_nns_auth_payload_size;
+static int hf_nns_auth_payload;
+static int hf_nns_payload_size;
+static int hf_nns_payload;
+
+static gint ett_nns;
+static gint ett_nns_payload;
 
 #define MS_NNS_MIN_LENGTH 4
 
diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c
index ef952782f2..e149a29b96 100644
--- a/epan/dissectors/packet-msdp.c
+++ b/epan/dissectors/packet-msdp.c
@@ -119,42 +119,42 @@ static const value_string sa_unspec_error_vals[] = {
 #define MSDP_PORT  639
 
 /* Initialize the protocol and registered fields */
-static int proto_msdp = -1;
-static int hf_msdp_type = -1;
-static int hf_msdp_length = -1;
-
-static int hf_msdp_sa_entry_count = -1;
-static int hf_msdp_sa_rp_addr = -1;
-static int hf_msdp_sa_reserved = -1;
-static int hf_msdp_sa_sprefix_len = -1;
-static int hf_msdp_sa_group_addr = -1;
-static int hf_msdp_sa_src_addr = -1;
-
-static int hf_msdp_sa_req_res = -1;
-static int hf_msdp_sa_req_group = -1;
-
-static int hf_msdp_not_o = -1;
-static int hf_msdp_not_error = -1;
-static int hf_msdp_not_error_sub = -1;
-
-static int hf_msdp_not_group_address = -1;
-static int hf_msdp_not_rp_address = -1;
-static int hf_msdp_not_source_address = -1;
-static int hf_msdp_not_res = -1;
-static int hf_msdp_not_entry_count = -1;
-static int hf_msdp_not_sprefix_len = -1;
-
-static int hf_msdp_tlv_contents = -1;
-static int hf_msdp_trailing_junk = -1;
-static int hf_msdp_unknown_data = -1;
-
-static gint ett_msdp = -1;
-static gint ett_msdp_sa_entry = -1;
-static gint ett_msdp_sa_enc_data = -1;
-static gint ett_msdp_not_data = -1;
-
-static expert_field ei_msdp_tlv_len_too_short = EI_INIT;
-static expert_field ei_msdp_tlv_len_too_long = EI_INIT;
+static int proto_msdp;
+static int hf_msdp_type;
+static int hf_msdp_length;
+
+static int hf_msdp_sa_entry_count;
+static int hf_msdp_sa_rp_addr;
+static int hf_msdp_sa_reserved;
+static int hf_msdp_sa_sprefix_len;
+static int hf_msdp_sa_group_addr;
+static int hf_msdp_sa_src_addr;
+
+static int hf_msdp_sa_req_res;
+static int hf_msdp_sa_req_group;
+
+static int hf_msdp_not_o;
+static int hf_msdp_not_error;
+static int hf_msdp_not_error_sub;
+
+static int hf_msdp_not_group_address;
+static int hf_msdp_not_rp_address;
+static int hf_msdp_not_source_address;
+static int hf_msdp_not_res;
+static int hf_msdp_not_entry_count;
+static int hf_msdp_not_sprefix_len;
+
+static int hf_msdp_tlv_contents;
+static int hf_msdp_trailing_junk;
+static int hf_msdp_unknown_data;
+
+static gint ett_msdp;
+static gint ett_msdp_sa_entry;
+static gint ett_msdp_sa_enc_data;
+static gint ett_msdp_not_data;
+
+static expert_field ei_msdp_tlv_len_too_short;
+static expert_field ei_msdp_tlv_len_too_long;
 
 static dissector_handle_t msdp_handle;
 static dissector_handle_t ip_handle;
diff --git a/epan/dissectors/packet-msgpack.c b/epan/dissectors/packet-msgpack.c
index fa7b819a81..ed028d7ac4 100644
--- a/epan/dissectors/packet-msgpack.c
+++ b/epan/dissectors/packet-msgpack.c
@@ -26,33 +26,33 @@ void proto_reg_handoff_msgpack(void);
 
 dissector_handle_t msgpack_handle;
 
-static int proto_msgpack = -1;
-
-static int hf_msgpack_string = -1;
-static int hf_msgpack_type = -1;
-static int hf_msgpack_string_len = -1;
-static int hf_msgpack_uint_8 = -1;
-static int hf_msgpack_uint_16 = -1;
-static int hf_msgpack_uint_32 = -1;
-static int hf_msgpack_uint_64 = -1;
-static int hf_msgpack_int_8 = -1;
-static int hf_msgpack_int_16 = -1;
-static int hf_msgpack_int_32 = -1;
-static int hf_msgpack_int_64 = -1;
-static int hf_msgpack_bool = -1;
-static int hf_msgpack_float = -1;
-static int hf_msgpack_ext_fixext = -1;
-static int hf_msgpack_ext_type = -1;
-static int hf_msgpack_ext_bytes = -1;
-
-static gint ett_msgpack = -1;
-static gint ett_msgpack_string = -1;
-static gint ett_msgpack_array = -1;
-static gint ett_msgpack_map = -1;
-static gint ett_msgpack_map_elem = -1;
-static gint ett_msgpack_ext = -1;
-
-static expert_field ei_msgpack_unsupported = EI_INIT;
+static int proto_msgpack;
+
+static int hf_msgpack_string;
+static int hf_msgpack_type;
+static int hf_msgpack_string_len;
+static int hf_msgpack_uint_8;
+static int hf_msgpack_uint_16;
+static int hf_msgpack_uint_32;
+static int hf_msgpack_uint_64;
+static int hf_msgpack_int_8;
+static int hf_msgpack_int_16;
+static int hf_msgpack_int_32;
+static int hf_msgpack_int_64;
+static int hf_msgpack_bool;
+static int hf_msgpack_float;
+static int hf_msgpack_ext_fixext;
+static int hf_msgpack_ext_type;
+static int hf_msgpack_ext_bytes;
+
+static gint ett_msgpack;
+static gint ett_msgpack_string;
+static gint ett_msgpack_array;
+static gint ett_msgpack_map;
+static gint ett_msgpack_map_elem;
+static gint ett_msgpack_ext;
+
+static expert_field ei_msgpack_unsupported;
 
 static const value_string msgpack_ext_fixtexts[] = {
 	{ 0xd4, "fixext 1" },
diff --git a/epan/dissectors/packet-msn-messenger.c b/epan/dissectors/packet-msn-messenger.c
index 1f45efe757..ec7cbddbe2 100644
--- a/epan/dissectors/packet-msn-messenger.c
+++ b/epan/dissectors/packet-msn-messenger.c
@@ -42,10 +42,10 @@ static dissector_handle_t msnms_handle;
  * this should be done.
  */
 
-static int proto_msnms = -1;
-/* static int hf_msnms_command = -1; */
+static int proto_msnms;
+/* static int hf_msnms_command; */
 
-static gint ett_msnms = -1;
+static gint ett_msnms;
 
 #define TCP_PORT_MSNMS    1863
 
diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c
index 8000e049a9..002056eb75 100644
--- a/epan/dissectors/packet-msnip.c
+++ b/epan/dissectors/packet-msnip.c
@@ -33,23 +33,23 @@ void proto_reg_handoff_msnip(void);
 
 static dissector_handle_t msnip_handle;
 
-static int proto_msnip = -1;
-static int hf_checksum = -1;
-static int hf_checksum_status = -1;
-static int hf_type = -1;
-static int hf_count = -1;
-static int hf_holdtime = -1;
-static int hf_groups = -1;
-static int hf_maddr = -1;
-static int hf_mask = -1;
-static int hf_holdtime16 = -1;
-static int hf_genid = -1;
-static int hf_rec_type = -1;
-
-static int ett_msnip = -1;
-static int ett_groups = -1;
-
-static expert_field ei_checksum = EI_INIT;
+static int proto_msnip;
+static int hf_checksum;
+static int hf_checksum_status;
+static int hf_type;
+static int hf_count;
+static int hf_holdtime;
+static int hf_groups;
+static int hf_maddr;
+static int hf_mask;
+static int hf_holdtime16;
+static int hf_genid;
+static int hf_rec_type;
+
+static int ett_msnip;
+static int ett_groups;
+
+static expert_field ei_checksum;
 
 #define MC_ALL_IGMPV3_ROUTERS	0xe0000016
 
diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c
index f691ef1e23..773a76ba8a 100644
--- a/epan/dissectors/packet-msnlb.c
+++ b/epan/dissectors/packet-msnlb.c
@@ -21,66 +21,66 @@ void proto_reg_handoff_msnlb(void);
 static dissector_handle_t msnlb_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_msnlb = -1;
-
-static int hf_msnlb_signature = -1;
-static int hf_msnlb_version = -1;
-static int hf_msnlb_uniquehostid = -1;
-static int hf_msnlb_clusterip = -1;
-static int hf_msnlb_dedicatedip = -1;
-static int hf_msnlb_signature_data = -1;
-
-static int hf_msnlb_myhostid = -1;
-static int hf_msnlb_defaulthostid = -1;
-static int hf_msnlb_convergencestate = -1;
-static int hf_msnlb_numberofportrules = -1;
-static int hf_msnlb_uniquehostcode = -1;
-static int hf_msnlb_packetshandled = -1;
-static int hf_msnlb_teamingcfg = -1;
-static int hf_msnlb_teamingcfg_reserved = -1;
-static int hf_msnlb_teamingcfg_xorclusterip = -1;
-static int hf_msnlb_teamingcfg_numberofparticipants = -1;
-static int hf_msnlb_teamingcfg_hashing = -1;
-static int hf_msnlb_teamingcfg_master = -1;
-static int hf_msnlb_teamingcfg_active = -1;
-static int hf_msnlb_reserved = -1;
-static int hf_msnlb_portruleconfiguration = -1;
-static int hf_msnlb_portruleconfiguration_data = -1;
-static int hf_msnlb_currentmap = -1;
-static int hf_msnlb_currentmap_data = -1;
-static int hf_msnlb_newmap = -1;
-static int hf_msnlb_newmap_data = -1;
-static int hf_msnlb_idlemap = -1;
-static int hf_msnlb_idlemap_data = -1;
-static int hf_msnlb_readymap = -1;
-static int hf_msnlb_readymap_data = -1;
-static int hf_msnlb_loadweights = -1;
-static int hf_msnlb_loadweights_data = -1;
-static int hf_msnlb_reserved2 = -1;
-static int hf_msnlb_reserved2_data = -1;
-
-static int hf_msnlb_extended_hb = -1;
-static int hf_msnlb_extended_hb_type = -1;
-static int hf_msnlb_length = -1;
-static int hf_msnlb_address_family = -1;
-static int hf_msnlb_host_name = -1;
-static int hf_msnlb_host_ipv4 = -1;
-static int hf_msnlb_host_ipv6 = -1;
-static int hf_msnlb_host_unknown = -1;
-static int hf_msnlb_padding = -1;
-static int hf_msnlb_extended_hb_unknown = -1;
-
-static gint ett_msnlb = -1;
-static gint ett_msnlb_signature = -1;
-static gint ett_msnlb_teamingcfg = -1;
-static gint ett_msnlb_portruleconfiguration = -1;
-static gint ett_msnlb_currentmap = -1;
-static gint ett_msnlb_newmap = -1;
-static gint ett_msnlb_idlemap = -1;
-static gint ett_msnlb_readymap = -1;
-static gint ett_msnlb_loadweights = -1;
-static gint ett_msnlb_reserved = -1;
-static gint ett_msnlb_extended_hb = -1;
+static int proto_msnlb;
+
+static int hf_msnlb_signature;
+static int hf_msnlb_version;
+static int hf_msnlb_uniquehostid;
+static int hf_msnlb_clusterip;
+static int hf_msnlb_dedicatedip;
+static int hf_msnlb_signature_data;
+
+static int hf_msnlb_myhostid;
+static int hf_msnlb_defaulthostid;
+static int hf_msnlb_convergencestate;
+static int hf_msnlb_numberofportrules;
+static int hf_msnlb_uniquehostcode;
+static int hf_msnlb_packetshandled;
+static int hf_msnlb_teamingcfg;
+static int hf_msnlb_teamingcfg_reserved;
+static int hf_msnlb_teamingcfg_xorclusterip;
+static int hf_msnlb_teamingcfg_numberofparticipants;
+static int hf_msnlb_teamingcfg_hashing;
+static int hf_msnlb_teamingcfg_master;
+static int hf_msnlb_teamingcfg_active;
+static int hf_msnlb_reserved;
+static int hf_msnlb_portruleconfiguration;
+static int hf_msnlb_portruleconfiguration_data;
+static int hf_msnlb_currentmap;
+static int hf_msnlb_currentmap_data;
+static int hf_msnlb_newmap;
+static int hf_msnlb_newmap_data;
+static int hf_msnlb_idlemap;
+static int hf_msnlb_idlemap_data;
+static int hf_msnlb_readymap;
+static int hf_msnlb_readymap_data;
+static int hf_msnlb_loadweights;
+static int hf_msnlb_loadweights_data;
+static int hf_msnlb_reserved2;
+static int hf_msnlb_reserved2_data;
+
+static int hf_msnlb_extended_hb;
+static int hf_msnlb_extended_hb_type;
+static int hf_msnlb_length;
+static int hf_msnlb_address_family;
+static int hf_msnlb_host_name;
+static int hf_msnlb_host_ipv4;
+static int hf_msnlb_host_ipv6;
+static int hf_msnlb_host_unknown;
+static int hf_msnlb_padding;
+static int hf_msnlb_extended_hb_unknown;
+
+static gint ett_msnlb;
+static gint ett_msnlb_signature;
+static gint ett_msnlb_teamingcfg;
+static gint ett_msnlb_portruleconfiguration;
+static gint ett_msnlb_currentmap;
+static gint ett_msnlb_newmap;
+static gint ett_msnlb_idlemap;
+static gint ett_msnlb_readymap;
+static gint ett_msnlb_loadweights;
+static gint ett_msnlb_reserved;
+static gint ett_msnlb_extended_hb;
 
 #define NLB_CLUSTER_MEMBERSHIP_HB 0xC0DE01BF
 #define NLB_EXTENDED_HB 0xC0DE01C0
diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c
index 73a98a1a4d..2a87b1f4da 100644
--- a/epan/dissectors/packet-msproxy.c
+++ b/epan/dissectors/packet-msproxy.c
@@ -39,52 +39,52 @@ void proto_register_msproxy(void);
 void proto_reg_handoff_msproxy(void);
 
 
-static int proto_msproxy = -1;
-
-static int ett_msproxy = -1;
-static int ett_msproxy_name = -1;
-
-static int hf_msproxy_cmd = -1;
-static int hf_msproxy_clntport = -1;
-
-static int hf_msproxy_dstaddr = -1;
-
-/* static int hf_msproxy_srcport = -1; */
-static int hf_msproxy_dstport = -1;
-static int hf_msproxy_serverport = -1;
-static int hf_msproxy_serveraddr = -1;
-static int hf_msproxy_bindport = -1;
-static int hf_msproxy_bindaddr = -1;
-static int hf_msproxy_boundport = -1;
-static int hf_msproxy_bind_id = -1;
-static int hf_msproxy_resolvaddr = -1;
-
-static int hf_msproxy_client_id = -1;
-static int hf_msproxy_version = -1;
-static int hf_msproxy_server_id = -1;
-static int hf_msproxy_server_ack = -1;
-static int hf_msproxy_client_ack = -1;
-static int hf_msproxy_seq_num = -1;
-static int hf_msproxy_rwsp_signature = -1;
-static int hf_msproxy_ntlmssp_signature = -1;
-
-static int hf_msproxy_server_int_addr = -1;
-static int hf_msproxy_server_int_port = -1;
-static int hf_msproxy_server_ext_addr = -1;
-static int hf_msproxy_server_ext_port = -1;
+static int proto_msproxy;
+
+static int ett_msproxy;
+static int ett_msproxy_name;
+
+static int hf_msproxy_cmd;
+static int hf_msproxy_clntport;
+
+static int hf_msproxy_dstaddr;
+
+/* static int hf_msproxy_srcport; */
+static int hf_msproxy_dstport;
+static int hf_msproxy_serverport;
+static int hf_msproxy_serveraddr;
+static int hf_msproxy_bindport;
+static int hf_msproxy_bindaddr;
+static int hf_msproxy_boundport;
+static int hf_msproxy_bind_id;
+static int hf_msproxy_resolvaddr;
+
+static int hf_msproxy_client_id;
+static int hf_msproxy_version;
+static int hf_msproxy_server_id;
+static int hf_msproxy_server_ack;
+static int hf_msproxy_client_ack;
+static int hf_msproxy_seq_num;
+static int hf_msproxy_rwsp_signature;
+static int hf_msproxy_ntlmssp_signature;
+
+static int hf_msproxy_server_int_addr;
+static int hf_msproxy_server_int_port;
+static int hf_msproxy_server_ext_addr;
+static int hf_msproxy_server_ext_port;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_msproxy_host_name = -1;
-static int hf_msproxy_address_offset = -1;
-static int hf_msproxy_client_computer_name = -1;
-static int hf_msproxy_nt_domain = -1;
-static int hf_msproxy_req_resolve_length = -1;
-static int hf_msproxy_application_name = -1;
-static int hf_msproxy_user_name = -1;
-static int hf_msproxy_application = -1;
-
-static expert_field ei_msproxy_unknown = EI_INIT;
-static expert_field ei_msproxy_unhandled = EI_INIT;
+static int hf_msproxy_host_name;
+static int hf_msproxy_address_offset;
+static int hf_msproxy_client_computer_name;
+static int hf_msproxy_nt_domain;
+static int hf_msproxy_req_resolve_length;
+static int hf_msproxy_application_name;
+static int hf_msproxy_user_name;
+static int hf_msproxy_application;
+
+static expert_field ei_msproxy_unknown;
+static expert_field ei_msproxy_unhandled;
 
 static dissector_handle_t msproxy_sub_handle;
 
diff --git a/epan/dissectors/packet-msrcp.c b/epan/dissectors/packet-msrcp.c
index 3b5b58e480..1f541fba74 100644
--- a/epan/dissectors/packet-msrcp.c
+++ b/epan/dissectors/packet-msrcp.c
@@ -55,25 +55,25 @@ typedef struct _msrcp_transaction_t {
     gboolean matched;
 } msrcp_transaction_t;
 
-static int proto_msrcp = -1;
-static int hf_msrcp_id = -1;
-static int hf_msrcp_type = -1;
-static int hf_msrcp_vers = -1;
-static int hf_msrcp_reserved = -1;
-static int hf_msrcp_next_header = -1;
-static int hf_msrcp_len = -1;
-static int hf_msrcp_seq = -1;
-static int hf_msrcp_response_in = -1;
-static int hf_msrcp_response_to = -1;
-static int hf_msrcp_ext_header = -1;
-static int hf_msrcp_ext_next_header = -1;
-static int hf_msrcp_ext_len = -1;
-static int hf_msrcp_ext_res = -1;
-
-static gint ett_msrcp = -1;
-static gint ett_msrcp_nxt = -1;
-
-static expert_field ei_msrcp_no_resp = EI_INIT;
+static int proto_msrcp;
+static int hf_msrcp_id;
+static int hf_msrcp_type;
+static int hf_msrcp_vers;
+static int hf_msrcp_reserved;
+static int hf_msrcp_next_header;
+static int hf_msrcp_len;
+static int hf_msrcp_seq;
+static int hf_msrcp_response_in;
+static int hf_msrcp_response_to;
+static int hf_msrcp_ext_header;
+static int hf_msrcp_ext_next_header;
+static int hf_msrcp_ext_len;
+static int hf_msrcp_ext_res;
+
+static gint ett_msrcp;
+static gint ett_msrcp_nxt;
+
+static expert_field ei_msrcp_no_resp;
 
 // Handles for subparsing
 static dissector_handle_t eth_handle;
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c
index bdd4e77e52..b3099c8036 100644
--- a/epan/dissectors/packet-msrp.c
+++ b/epan/dissectors/packet-msrp.c
@@ -36,35 +36,35 @@ void proto_reg_handoff_msrp(void);
 #define MSRP_HDR_LEN (strlen (MSRP_HDR))
 
 /* Initialize the protocol and registered fields */
-static int proto_msrp       = -1;
+static int proto_msrp;
 
 /* Initialize the subtree pointers */
-static int ett_msrp                 = -1;
-static int ett_raw_text             = -1;
-static int ett_msrp_reqresp         = -1;
-static int ett_msrp_hdr             = -1;
-static int ett_msrp_data            = -1;
-static int ett_msrp_end_line        = -1;
-static int ett_msrp_setup           = -1;
-
-static int hf_msrp_response_line    = -1;
-static int hf_msrp_request_line     = -1;
-static int hf_msrp_transactionID    = -1;
-static int hf_msrp_method           = -1;
-static int hf_msrp_status_code      = -1;
-static int hf_msrp_hdr              = -1;
-static int hf_msrp_msg_hdr          = -1;
-static int hf_msrp_end_line         = -1;
-static int hf_msrp_cnt_flg          = -1;
-
-static int hf_msrp_data             = -1;
-
-static expert_field ei_msrp_status_code_invalid = EI_INIT;
+static int ett_msrp;
+static int ett_raw_text;
+static int ett_msrp_reqresp;
+static int ett_msrp_hdr;
+static int ett_msrp_data;
+static int ett_msrp_end_line;
+static int ett_msrp_setup;
+
+static int hf_msrp_response_line;
+static int hf_msrp_request_line;
+static int hf_msrp_transactionID;
+static int hf_msrp_method;
+static int hf_msrp_status_code;
+static int hf_msrp_hdr;
+static int hf_msrp_msg_hdr;
+static int hf_msrp_end_line;
+static int hf_msrp_cnt_flg;
+
+static int hf_msrp_data;
+
+static expert_field ei_msrp_status_code_invalid;
 
 /* MSRP setup fields */
-static int hf_msrp_setup        = -1;
-static int hf_msrp_setup_frame  = -1;
-static int hf_msrp_setup_method = -1;
+static int hf_msrp_setup;
+static int hf_msrp_setup_frame;
+static int hf_msrp_setup_method;
 
 typedef struct {
         const char *name;
diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c
index 93150f40ce..4a3a1f9da3 100644
--- a/epan/dissectors/packet-mstp.c
+++ b/epan/dissectors/packet-mstp.c
@@ -65,24 +65,24 @@ bacnet_mstp_frame_type_name[] = {
 
 static dissector_table_t subdissector_table;
 
-static int proto_mstp = -1;
-
-static gint ett_bacnet_mstp = -1;
-static gint ett_bacnet_mstp_checksum = -1;
-
-static int hf_mstp_preamble_55 = -1;
-static int hf_mstp_preamble_FF = -1;
-static int hf_mstp_frame_type = -1;
-static int hf_mstp_frame_destination = -1;
-static int hf_mstp_frame_source = -1;
-static int hf_mstp_frame_vendor_id = -1;
-static int hf_mstp_frame_pdu_len = -1;
-static int hf_mstp_frame_crc8 = -1;
-static int hf_mstp_frame_crc16 = -1;
-static int hf_mstp_frame_checksum_status = -1;
-
-static expert_field ei_mstp_frame_pdu_len = EI_INIT;
-static expert_field ei_mstp_frame_checksum_bad = EI_INIT;
+static int proto_mstp;
+
+static gint ett_bacnet_mstp;
+static gint ett_bacnet_mstp_checksum;
+
+static int hf_mstp_preamble_55;
+static int hf_mstp_preamble_FF;
+static int hf_mstp_frame_type;
+static int hf_mstp_frame_destination;
+static int hf_mstp_frame_source;
+static int hf_mstp_frame_vendor_id;
+static int hf_mstp_frame_pdu_len;
+static int hf_mstp_frame_crc8;
+static int hf_mstp_frame_crc16;
+static int hf_mstp_frame_checksum_status;
+
+static expert_field ei_mstp_frame_pdu_len;
+static expert_field ei_mstp_frame_checksum_bad;
 
 static int mstp_address_type = -1;
 
diff --git a/epan/dissectors/packet-mswsp.c b/epan/dissectors/packet-mswsp.c
index 5f676c69b7..d1da7edfce 100644
--- a/epan/dissectors/packet-mswsp.c
+++ b/epan/dissectors/packet-mswsp.c
@@ -361,288 +361,288 @@ static int SMB2 = 2;
 
 void proto_reg_handoff_mswsp(void);
 
-static expert_field ei_mswsp_invalid_variant_type = EI_INIT;
-static expert_field ei_missing_msg_context = EI_INIT;
-static expert_field ei_mswsp_msg_cpmsetbinding_ccolumns = EI_INIT;
-
-static int proto_mswsp = -1;
-static int hf_mswsp_msg = -1;
-static int hf_mswsp_hdr = -1;
-static int hf_mswsp_hdr_msg = -1;
-static int hf_mswsp_hdr_status = -1;
-static int hf_mswsp_hdr_checksum = -1;
-static int hf_mswsp_hdr_reserved = -1;
-static int hf_mswsp_msg_Connect_Version = -1;
-static int hf_mswsp_msg_ConnectIn_ClientIsRemote = -1;
-static int hf_mswsp_msg_ConnectIn_Blob1 = -1;
-static int hf_mswsp_msg_ConnectIn_MachineName = -1;
-static int hf_mswsp_msg_ConnectIn_UserName = -1;
-static int hf_mswsp_msg_ConnectIn_PropSets_num = -1;
-static int hf_mswsp_bool_options = -1;
-static int hf_mswsp_bool_options_cursor = -1;
-static int hf_mswsp_bool_options_async = -1;
-static int hf_mswsp_bool_options_firstrows = -1;
-static int hf_mswsp_bool_options_holdrows = -1;
-static int hf_mswsp_bool_options_chaptered = -1;
-static int hf_mswsp_bool_options_useci = -1;
-static int hf_mswsp_bool_options_defertrim = -1;
-static int hf_mswsp_bool_options_rowsetevents = -1;
-static int hf_mswsp_bool_options_dontcomputeexpensive = -1;
-static int hf_mswsp_guid_time_low = -1;
-static int hf_mswsp_guid_time_mid = -1;
-static int hf_mswsp_guid_time_high = -1;
-static int hf_mswsp_guid_time_clock_hi = -1;
-static int hf_mswsp_guid_time_clock_low = -1;
-static int hf_mswsp_guid_node = -1;
-static int hf_mswsp_lcid = -1;
-static int hf_mswsp_lcid_sortid = -1;
-static int hf_mswsp_lcid_langid = -1;
-static int hf_mswsp_cscort_column = -1;
-static int hf_mswsp_cscort_order = -1;
-static int hf_mswsp_cscort_individual = -1;
-static int hf_mswsp_cscortset_count = -1;
-static int hf_mswsp_ctablecolumn_vtype = -1;
-static int hf_mswsp_ctablecolumn_aggused = -1;
-static int hf_mswsp_ctablecolumn_aggtype = -1;
-static int hf_mswsp_ctablecolumn_valused = -1;
-static int hf_mswsp_ctablecolumn_valoffset = -1;
-static int hf_mswsp_ctablecolumn_valsize = -1;
-static int hf_mswsp_ctablecolumn_statused = -1;
-static int hf_mswsp_ctablecolumn_statoffset = -1;
-static int hf_mswsp_ctablecolumn_lenused = -1;
-static int hf_mswsp_ctablecolumn_lenoffset = -1;
-static int hf_mswsp_cfullpropspec_kind = -1;
-static int hf_mswsp_cfullpropspec_propid = -1;
-static int hf_mswsp_cfullpropspec_propname = -1;
-static int hf_mswsp_cproprestrict_relop = -1;
-static int hf_mswsp_ccoercerestrict_value = -1;
-static int hf_mswsp_ccontentrestrict_cc = -1;
-static int hf_mswsp_ccontentrestrict_phrase = -1;
-static int hf_mswsp_ccontentrestrict_method = -1;
-static int hf_mswsp_natlangrestrict_cc = -1;
-static int hf_mswsp_natlangrestrict_phrase = -1;
-static int hf_mswsp_crestrict_ultype = -1;
-static int hf_mswsp_crestrict_weight = -1;
-static int hf_mswsp_crestrictarray_count = -1;
-static int hf_mswsp_crestrictarray_present = -1;
-static int hf_mswsp_cnoderestrict_cnode = -1;
-static int hf_mswsp_cbasestorvariant_vtype = -1;
-static int hf_mswsp_cbasestorvariant_vvalue = -1;
-static int hf_mswsp_cbasestorvariant_vdata1 = -1;
-static int hf_mswsp_cbasestorvariant_vdata2 = -1;
-static int hf_mswsp_cbasestorvariant_num = -1;
-static int hf_mswsp_cbasestorvariant_cdims = -1;
-static int hf_mswsp_cbasestorvariant_ffeatures = -1;
-static int hf_mswsp_cbasestorvariant_cbelements = -1;
-static int hf_mswsp_cbasestorvariant_rgsabound = -1;
-static int hf_mswsp_cdbcolid_ekind = -1;
-static int hf_mswsp_cdbcolid_ulid = -1;
-static int hf_mswsp_cdbcolid_vstring = -1;
-static int hf_mswsp_cdbprop_id = -1;
-static int hf_mswsp_cdbprop_options = -1;
-static int hf_mswsp_cdbprop_status = -1;
-static int hf_mswsp_cdbpropset_cprops = -1;
-static int hf_mswsp_rangeboundry_ultype = -1;
-static int hf_mswsp_rangeboundry_labelpresent = -1;
-static int hf_mswsp_rangeboundry_cclabel = -1;
-static int hf_mswsp_rangeboundry_label = -1;
-static int hf_mswsp_crangecategspec_crange = -1;
-static int hf_mswsp_ccategspec_type = -1;
-static int hf_mswsp_caggregspec_type = -1;
-static int hf_mswsp_caggregspec_ccalias = -1;
-static int hf_mswsp_caggregspec_alias = -1;
-static int hf_mswsp_caggregspec_idcolumn = -1;
-static int hf_mswsp_caggregspec_ulmaxnumtoreturn = -1;
-static int hf_mswsp_caggregspec_idrepresentative = -1;
-static int hf_mswsp_caggregset_count = -1;
-static int hf_mswsp_caggregsortkey_order = -1;
-static int hf_mswsp_csortaggregset_count = -1;
-static int hf_mswsp_cingroupsortaggregset_type = -1;
-static int hf_mswsp_cingroupsortaggregsets_count = -1;
-static int hf_mswsp_categorizationspec_cmaxres= -1;
-static int hf_mswsp_crowsetprops_ulmaxopenrows = -1;
-static int hf_mswsp_crowsetprops_ulmemusage = -1;
-static int hf_mswsp_crowsetprops_cmaxresults = -1;
-static int hf_mswsp_crowsetprops_ccmdtimeout = -1;
-static int hf_mswsp_cpidmapper_count = -1;
-static int hf_mswsp_ccolumngroup_count = -1;
-static int hf_mswsp_ccolumngroup_grouppid = -1;
-static int hf_mswsp_ccolumngroup_pid = -1;
-static int hf_mswsp_ccolumngrouparray_count = -1;
-static int hf_mswsp_int32array_value = -1;
-static int hf_mswsp_crowseeknext_cskip = -1;
-static int hf_mswsp_crowseekat_bmkoffset = -1;
-static int hf_mswsp_crowseekat_skip = -1;
-static int hf_mswsp_crowseekat_hregion = -1;
-static int hf_mswsp_crowseekatratio_ulnumerator = -1;
-static int hf_mswsp_crowseekatratio_uldenominator = -1;
-static int hf_mswsp_crowseekatratio_hregion = -1;
-static int hf_mswsp_crowseekbybookmark_cbookmarks = -1;
-static int hf_mswsp_crowseekbybookmark_maxret = -1;
-static int hf_mswsp_crowvariantinfo_count64 = -1;
-static int hf_mswsp_arrayvector_address64 = -1;
-static int hf_mswsp_crowvariantinfo_count32 = -1;
-static int hf_mswsp_arrayvector_address32 = -1;
-static int hf_mswsp_rowvariant_item_address64 = -1;
-static int hf_mswsp_rowvariant_item_address32 = -1;
-static int hf_mswsp_rowvariant_item_value = -1;
-static int hf_mswsp_rowvariant_vtype = -1;
-static int hf_mswsp_rowvariant_reserved1 = -1;
-static int hf_mswsp_rowvariant_reserved2 = -1;
-static int hf_mswsp_ctablecolumn_status = -1;
-static int hf_mswsp_ctablecolumn_length = -1;
-static int hf_mswsp_msg_cpmcreatequery_size = -1;
-static int hf_mswsp_msg_cpmcreatequery_ccolumnsetpresent = -1;
-static int hf_mswsp_msg_cpmcreatequery_crestrictionpresent = -1;
-static int hf_mswsp_msg_cpmcreatequery_csortpresent = -1;
-static int hf_mswsp_msg_cpmcreatequery_ccategpresent = -1;
-static int hf_mswsp_msg_cpmcreatequery_ccateg_count = -1;
-static int hf_mswsp_msg_cpmcreatequery_trueseq = -1;
-static int hf_mswsp_msg_cpmcreatequery_workid = -1;
-static int hf_mswsp_msg_cpmcreatequery_cursors = -1;
-static int hf_mswsp_msg_cpmgetrows_hcursor = -1;
-static int hf_mswsp_msg_cpmgetrows_rowstotransfer = -1;
-static int hf_mswsp_msg_cpmgetrows_rowwidth = -1;
-static int hf_mswsp_msg_cpmgetrows_cbseek = -1;
-static int hf_mswsp_msg_cpmgetrows_cbreserved = -1;
-static int hf_mswsp_msg_cpmgetrows_cbreadbuffer = -1;
-static int hf_mswsp_msg_cpmgetrows_ulclientbase = -1;
-static int hf_mswsp_msg_cpmgetrows_fbwdfetch = -1;
-static int hf_mswsp_msg_cpmgetrows_etype = -1;
-static int hf_mswsp_msg_cpmgetrows_chapt = -1;
-static int hf_mswsp_msg_cpmgetrows_crowsreturned = -1;
-static int hf_mswsp_msg_cpmratiofinished_hcursor = -1;
-static int hf_mswsp_msg_cpmratiofinished_fquick = -1;
-static int hf_mswsp_msg_cpmratiofinished_ulnumerator = -1;
-static int hf_mswsp_msg_cpmratiofinished_uldenominator = -1;
-static int hf_mswsp_msg_cpmratiofinished_crows = -1;
-static int hf_mswsp_msg_cpmratiofinished_fnewrows = -1;
-static int hf_mswsp_msg_cpmcomparebmk_hcursor = -1;
-static int hf_mswsp_msg_cpmcomparebmk_chapt = -1;
-static int hf_mswsp_msg_cpmcomparebmk_bmkfirst = -1;
-static int hf_mswsp_msg_cpmcomparebmk_bmksecond = -1;
-static int hf_mswsp_msg_cpmcomparebmk_dwcomparison = -1;
-static int hf_mswsp_msg_cpmgetapproxpos_hcursor = -1;
-static int hf_mswsp_msg_cpmgetapproxpos_chapt = -1;
-static int hf_mswsp_msg_cpmgetapproxpos_bmk = -1;
-static int hf_mswsp_msg_cpmgetapproxpos_numerator = -1;
-static int hf_mswsp_msg_cpmgetapproxpos_denominator = -1;
-static int hf_mswsp_msg_cpmsetbinding_hcursor = -1;
-static int hf_mswsp_msg_cpmsetbinding_cbrow = -1;
-static int hf_mswsp_msg_cpmsetbinding_desc = -1;
-static int hf_mswsp_msg_cpmsetbinding_dummy = -1;
-static int hf_mswsp_msg_cpmsetbinding_ccolumns = -1;
-static int hf_mswsp_msg_cpmsetbinding_acolumns = -1;
-static int hf_mswsp_msg_cpmsendnotify_watchnotify = -1;
-static int hf_mswsp_msg_cpmgetquerystatus_hcursor = -1;
-static int hf_mswsp_msg_cpmgetquerystatus_qstatus = -1;
-static int hf_mswsp_msg_cpmcistate_cbstruct = -1;
-static int hf_mswsp_msg_cpmcistate_cwordlist = -1;
-static int hf_mswsp_msg_cpmcistate_cpersistindex = -1;
-static int hf_mswsp_msg_cpmcistate_cqueries = -1;
-static int hf_mswsp_msg_cpmcistate_cfreshtest = -1;
-static int hf_mswsp_msg_cpmcistate_dwmergeprogress = -1;
-static int hf_mswsp_msg_cpmcistate_estate = -1;
-static int hf_mswsp_msg_cpmcistate_cfiltereddocs = -1;
-static int hf_mswsp_msg_cpmcistate_ctotaldocs = -1;
-static int hf_mswsp_msg_cpmcistate_cpendingscans = -1;
-static int hf_mswsp_msg_cpmcistate_dwindexsize = -1;
-static int hf_mswsp_msg_cpmcistate_cuniquekeys = -1;
-static int hf_mswsp_msg_cpmcistate_csecqdocuments = -1;
-static int hf_mswsp_msg_cpmcistate_dwpropcachesize = -1;
-static int hf_mswsp_msg_cpmfetchvalue_wid = -1;
-static int hf_mswsp_msg_cpmfetchvalue_cbsofar = -1;
-static int hf_mswsp_msg_cpmfetchvalue_cbpropspec = -1;
-static int hf_mswsp_msg_cpmfetchvalue_cbchunk = -1;
-static int hf_mswsp_msg_cpmfetchvalue_cbvalue = -1;
-static int hf_mswsp_msg_cpmfetchvalue_fmoreexists = -1;
-static int hf_mswsp_msg_cpmfetchvalue_fvalueexists = -1;
-static int hf_mswsp_msg_cpmfetchvalue_vvalue = -1;
-static int hf_mswsp_msg_cpmquerystatusex_hcursor = -1;
-static int hf_mswsp_msg_cpmquerystatusex_bmk = -1;
-static int hf_mswsp_msg_cpmquerystatusex_qstatus = -1;
-static int hf_mswsp_msg_cpmquerystatusex_cfiltereddocs = -1;
-static int hf_mswsp_msg_cpmquerystatusex_cdocstofilter = -1;
-static int hf_mswsp_msg_cpmquerystatusex_dwratiodenom = -1;
-static int hf_mswsp_msg_cpmquerystatusex_dwrationumer = -1;
-static int hf_mswsp_msg_cpmquerystatusex_irowbmk = -1;
-static int hf_mswsp_msg_cpmquerystatusex_crowstotal = -1;
-static int hf_mswsp_msg_cpmquerystatusex_maxrank = -1;
-static int hf_mswsp_msg_cpmquerystatusex_cresultsfound = -1;
-static int hf_mswsp_msg_cpmquerystatusex_whereid = -1;
-static int hf_mswsp_msg_cpmrestartposition_hcursor = -1;
-static int hf_mswsp_msg_cpmrestartposition_chapt = -1;
-static int hf_mswsp_msg_cpmgetrowsetnotify_wid = -1;
-static int hf_mswsp_msg_cpmgetrowsetnotify_moreevents = -1;
-static int hf_mswsp_msg_cpmgetrowsetnotify_eventtype = -1;
-static int hf_mswsp_msg_cpmgetrowsetnotify_rowsetitemstate = -1;
-static int hf_mswsp_msg_cpmgetrowsetnotify_changeditemstate = -1;
-static int hf_mswsp_msg_cpmgetrowsetnotify_rowsetevent = -1;
-static int hf_mswsp_msg_cpmgetrowsetnotify_rowseteventdata1 = -1;
-static int hf_mswsp_msg_cpmgetrowsetnotify_rowseteventdata2 = -1;
-static int hf_mswsp_msg_cpmfindindices_cwids = -1;
-static int hf_mswsp_msg_cpmfindindices_cdepthprev = -1;
-static int hf_mswsp_msg_cpmfindindices_cdepthnext = -1;
-static int hf_mswsp_msg_cpmsetscopeprioritization_priority = -1;
-static int hf_mswsp_msg_cpmsetscopeprioritization_eventfreq = -1;
-static int hf_mswsp_msg_cpmsetscopestatisics_dwindexitems = -1;
-static int hf_mswsp_msg_cpmsetscopestatisics_dwoutstandingadds = -1;
-static int hf_mswsp_msg_cpmsetscopestatisics_dwoutstandingmodifies = -1;
-
-static gint ett_mswsp = -1;
-static gint ett_mswsp_hdr = -1;
-static gint ett_mswsp_msg = -1;
-static gint ett_mswsp_pad = -1;
-
-static gint ett_mswsp_property_restriction = -1;
-static gint ett_CRestrictionArray = -1;
-static gint ett_CBaseStorageVariant = -1;
-static gint ett_CBaseStorageVariant_Vector = -1;
-static gint ett_CBaseStorageVariant_Array = -1;
-static gint ett_CDbColId = -1;
-static gint ett_GUID = -1;
-static gint ett_CDbProp = -1;
-static gint ett_CDbPropSet = -1;
-static gint ett_CDbPropSet_Array = -1;
-static gint ett_CRestriction = -1;
-static gint ett_CNodeRestriction = -1;
-static gint ett_CPropertyRestriction = -1;
-static gint ett_CCoercionRestriction = -1;
-static gint ett_CContentRestriction = -1;
-static gint ett_RANGEBOUNDARY = -1;
-static gint ett_CRangeCategSpec = -1;
-static gint ett_CCategSpec = -1;
-static gint ett_CAggregSpec = -1;
-static gint ett_CAggregSet = -1;
-static gint ett_CCategorizationSpec = -1;
-static gint ett_CAggregSortKey = -1;
-static gint ett_CSortAggregSet = -1;
-static gint ett_CInGroupSortAggregSet = -1;
-static gint ett_CInGroupSortAggregSets = -1;
-static gint ett_CRowsetProperties = -1;
-static gint ett_CFullPropSpec = -1;
-static gint ett_CPidMapper = -1;
-static gint ett_CSort = -1;
-static gint ett_CSortSet = -1;
-static gint ett_CNatLanguageRestriction = -1;
-static gint ett_CColumnGroup = -1;
-static gint ett_CColumnGroupArray = -1;
-static gint ett_LCID = -1;
-static gint ett_CTableColumn = -1;
-static gint ett_Array = -1;
-static gint ett_SeekDescription = -1;
-static gint ett_CRowsSeekNext = -1;
-static gint ett_CRowsSeekAt = -1;
-static gint ett_CRowsSeekAtRatio = -1;
-static gint ett_CRowsSeekByBookmark = -1;
-static gint ett_GetRowsRow = -1;
-static gint ett_GetRowsColumn = -1;
-static gint ett_CRowVariant = -1;
-static gint ett_CRowVariant_Vector = -1;
-static gint ett_mswsp_bool_options = -1;
-static gint ett_mswsp_uin32_array = -1;
-static gint ett_mswsp_msg_padding = -1;
-static gint ett_mswsp_msg_creusewhere = -1;
+static expert_field ei_mswsp_invalid_variant_type;
+static expert_field ei_missing_msg_context;
+static expert_field ei_mswsp_msg_cpmsetbinding_ccolumns;
+
+static int proto_mswsp;
+static int hf_mswsp_msg;
+static int hf_mswsp_hdr;
+static int hf_mswsp_hdr_msg;
+static int hf_mswsp_hdr_status;
+static int hf_mswsp_hdr_checksum;
+static int hf_mswsp_hdr_reserved;
+static int hf_mswsp_msg_Connect_Version;
+static int hf_mswsp_msg_ConnectIn_ClientIsRemote;
+static int hf_mswsp_msg_ConnectIn_Blob1;
+static int hf_mswsp_msg_ConnectIn_MachineName;
+static int hf_mswsp_msg_ConnectIn_UserName;
+static int hf_mswsp_msg_ConnectIn_PropSets_num;
+static int hf_mswsp_bool_options;
+static int hf_mswsp_bool_options_cursor;
+static int hf_mswsp_bool_options_async;
+static int hf_mswsp_bool_options_firstrows;
+static int hf_mswsp_bool_options_holdrows;
+static int hf_mswsp_bool_options_chaptered;
+static int hf_mswsp_bool_options_useci;
+static int hf_mswsp_bool_options_defertrim;
+static int hf_mswsp_bool_options_rowsetevents;
+static int hf_mswsp_bool_options_dontcomputeexpensive;
+static int hf_mswsp_guid_time_low;
+static int hf_mswsp_guid_time_mid;
+static int hf_mswsp_guid_time_high;
+static int hf_mswsp_guid_time_clock_hi;
+static int hf_mswsp_guid_time_clock_low;
+static int hf_mswsp_guid_node;
+static int hf_mswsp_lcid;
+static int hf_mswsp_lcid_sortid;
+static int hf_mswsp_lcid_langid;
+static int hf_mswsp_cscort_column;
+static int hf_mswsp_cscort_order;
+static int hf_mswsp_cscort_individual;
+static int hf_mswsp_cscortset_count;
+static int hf_mswsp_ctablecolumn_vtype;
+static int hf_mswsp_ctablecolumn_aggused;
+static int hf_mswsp_ctablecolumn_aggtype;
+static int hf_mswsp_ctablecolumn_valused;
+static int hf_mswsp_ctablecolumn_valoffset;
+static int hf_mswsp_ctablecolumn_valsize;
+static int hf_mswsp_ctablecolumn_statused;
+static int hf_mswsp_ctablecolumn_statoffset;
+static int hf_mswsp_ctablecolumn_lenused;
+static int hf_mswsp_ctablecolumn_lenoffset;
+static int hf_mswsp_cfullpropspec_kind;
+static int hf_mswsp_cfullpropspec_propid;
+static int hf_mswsp_cfullpropspec_propname;
+static int hf_mswsp_cproprestrict_relop;
+static int hf_mswsp_ccoercerestrict_value;
+static int hf_mswsp_ccontentrestrict_cc;
+static int hf_mswsp_ccontentrestrict_phrase;
+static int hf_mswsp_ccontentrestrict_method;
+static int hf_mswsp_natlangrestrict_cc;
+static int hf_mswsp_natlangrestrict_phrase;
+static int hf_mswsp_crestrict_ultype;
+static int hf_mswsp_crestrict_weight;
+static int hf_mswsp_crestrictarray_count;
+static int hf_mswsp_crestrictarray_present;
+static int hf_mswsp_cnoderestrict_cnode;
+static int hf_mswsp_cbasestorvariant_vtype;
+static int hf_mswsp_cbasestorvariant_vvalue;
+static int hf_mswsp_cbasestorvariant_vdata1;
+static int hf_mswsp_cbasestorvariant_vdata2;
+static int hf_mswsp_cbasestorvariant_num;
+static int hf_mswsp_cbasestorvariant_cdims;
+static int hf_mswsp_cbasestorvariant_ffeatures;
+static int hf_mswsp_cbasestorvariant_cbelements;
+static int hf_mswsp_cbasestorvariant_rgsabound;
+static int hf_mswsp_cdbcolid_ekind;
+static int hf_mswsp_cdbcolid_ulid;
+static int hf_mswsp_cdbcolid_vstring;
+static int hf_mswsp_cdbprop_id;
+static int hf_mswsp_cdbprop_options;
+static int hf_mswsp_cdbprop_status;
+static int hf_mswsp_cdbpropset_cprops;
+static int hf_mswsp_rangeboundry_ultype;
+static int hf_mswsp_rangeboundry_labelpresent;
+static int hf_mswsp_rangeboundry_cclabel;
+static int hf_mswsp_rangeboundry_label;
+static int hf_mswsp_crangecategspec_crange;
+static int hf_mswsp_ccategspec_type;
+static int hf_mswsp_caggregspec_type;
+static int hf_mswsp_caggregspec_ccalias;
+static int hf_mswsp_caggregspec_alias;
+static int hf_mswsp_caggregspec_idcolumn;
+static int hf_mswsp_caggregspec_ulmaxnumtoreturn;
+static int hf_mswsp_caggregspec_idrepresentative;
+static int hf_mswsp_caggregset_count;
+static int hf_mswsp_caggregsortkey_order;
+static int hf_mswsp_csortaggregset_count;
+static int hf_mswsp_cingroupsortaggregset_type;
+static int hf_mswsp_cingroupsortaggregsets_count;
+static int hf_mswsp_categorizationspec_cmaxres;
+static int hf_mswsp_crowsetprops_ulmaxopenrows;
+static int hf_mswsp_crowsetprops_ulmemusage;
+static int hf_mswsp_crowsetprops_cmaxresults;
+static int hf_mswsp_crowsetprops_ccmdtimeout;
+static int hf_mswsp_cpidmapper_count;
+static int hf_mswsp_ccolumngroup_count;
+static int hf_mswsp_ccolumngroup_grouppid;
+static int hf_mswsp_ccolumngroup_pid;
+static int hf_mswsp_ccolumngrouparray_count;
+static int hf_mswsp_int32array_value;
+static int hf_mswsp_crowseeknext_cskip;
+static int hf_mswsp_crowseekat_bmkoffset;
+static int hf_mswsp_crowseekat_skip;
+static int hf_mswsp_crowseekat_hregion;
+static int hf_mswsp_crowseekatratio_ulnumerator;
+static int hf_mswsp_crowseekatratio_uldenominator;
+static int hf_mswsp_crowseekatratio_hregion;
+static int hf_mswsp_crowseekbybookmark_cbookmarks;
+static int hf_mswsp_crowseekbybookmark_maxret;
+static int hf_mswsp_crowvariantinfo_count64;
+static int hf_mswsp_arrayvector_address64;
+static int hf_mswsp_crowvariantinfo_count32;
+static int hf_mswsp_arrayvector_address32;
+static int hf_mswsp_rowvariant_item_address64;
+static int hf_mswsp_rowvariant_item_address32;
+static int hf_mswsp_rowvariant_item_value;
+static int hf_mswsp_rowvariant_vtype;
+static int hf_mswsp_rowvariant_reserved1;
+static int hf_mswsp_rowvariant_reserved2;
+static int hf_mswsp_ctablecolumn_status;
+static int hf_mswsp_ctablecolumn_length;
+static int hf_mswsp_msg_cpmcreatequery_size;
+static int hf_mswsp_msg_cpmcreatequery_ccolumnsetpresent;
+static int hf_mswsp_msg_cpmcreatequery_crestrictionpresent;
+static int hf_mswsp_msg_cpmcreatequery_csortpresent;
+static int hf_mswsp_msg_cpmcreatequery_ccategpresent;
+static int hf_mswsp_msg_cpmcreatequery_ccateg_count;
+static int hf_mswsp_msg_cpmcreatequery_trueseq;
+static int hf_mswsp_msg_cpmcreatequery_workid;
+static int hf_mswsp_msg_cpmcreatequery_cursors;
+static int hf_mswsp_msg_cpmgetrows_hcursor;
+static int hf_mswsp_msg_cpmgetrows_rowstotransfer;
+static int hf_mswsp_msg_cpmgetrows_rowwidth;
+static int hf_mswsp_msg_cpmgetrows_cbseek;
+static int hf_mswsp_msg_cpmgetrows_cbreserved;
+static int hf_mswsp_msg_cpmgetrows_cbreadbuffer;
+static int hf_mswsp_msg_cpmgetrows_ulclientbase;
+static int hf_mswsp_msg_cpmgetrows_fbwdfetch;
+static int hf_mswsp_msg_cpmgetrows_etype;
+static int hf_mswsp_msg_cpmgetrows_chapt;
+static int hf_mswsp_msg_cpmgetrows_crowsreturned;
+static int hf_mswsp_msg_cpmratiofinished_hcursor;
+static int hf_mswsp_msg_cpmratiofinished_fquick;
+static int hf_mswsp_msg_cpmratiofinished_ulnumerator;
+static int hf_mswsp_msg_cpmratiofinished_uldenominator;
+static int hf_mswsp_msg_cpmratiofinished_crows;
+static int hf_mswsp_msg_cpmratiofinished_fnewrows;
+static int hf_mswsp_msg_cpmcomparebmk_hcursor;
+static int hf_mswsp_msg_cpmcomparebmk_chapt;
+static int hf_mswsp_msg_cpmcomparebmk_bmkfirst;
+static int hf_mswsp_msg_cpmcomparebmk_bmksecond;
+static int hf_mswsp_msg_cpmcomparebmk_dwcomparison;
+static int hf_mswsp_msg_cpmgetapproxpos_hcursor;
+static int hf_mswsp_msg_cpmgetapproxpos_chapt;
+static int hf_mswsp_msg_cpmgetapproxpos_bmk;
+static int hf_mswsp_msg_cpmgetapproxpos_numerator;
+static int hf_mswsp_msg_cpmgetapproxpos_denominator;
+static int hf_mswsp_msg_cpmsetbinding_hcursor;
+static int hf_mswsp_msg_cpmsetbinding_cbrow;
+static int hf_mswsp_msg_cpmsetbinding_desc;
+static int hf_mswsp_msg_cpmsetbinding_dummy;
+static int hf_mswsp_msg_cpmsetbinding_ccolumns;
+static int hf_mswsp_msg_cpmsetbinding_acolumns;
+static int hf_mswsp_msg_cpmsendnotify_watchnotify;
+static int hf_mswsp_msg_cpmgetquerystatus_hcursor;
+static int hf_mswsp_msg_cpmgetquerystatus_qstatus;
+static int hf_mswsp_msg_cpmcistate_cbstruct;
+static int hf_mswsp_msg_cpmcistate_cwordlist;
+static int hf_mswsp_msg_cpmcistate_cpersistindex;
+static int hf_mswsp_msg_cpmcistate_cqueries;
+static int hf_mswsp_msg_cpmcistate_cfreshtest;
+static int hf_mswsp_msg_cpmcistate_dwmergeprogress;
+static int hf_mswsp_msg_cpmcistate_estate;
+static int hf_mswsp_msg_cpmcistate_cfiltereddocs;
+static int hf_mswsp_msg_cpmcistate_ctotaldocs;
+static int hf_mswsp_msg_cpmcistate_cpendingscans;
+static int hf_mswsp_msg_cpmcistate_dwindexsize;
+static int hf_mswsp_msg_cpmcistate_cuniquekeys;
+static int hf_mswsp_msg_cpmcistate_csecqdocuments;
+static int hf_mswsp_msg_cpmcistate_dwpropcachesize;
+static int hf_mswsp_msg_cpmfetchvalue_wid;
+static int hf_mswsp_msg_cpmfetchvalue_cbsofar;
+static int hf_mswsp_msg_cpmfetchvalue_cbpropspec;
+static int hf_mswsp_msg_cpmfetchvalue_cbchunk;
+static int hf_mswsp_msg_cpmfetchvalue_cbvalue;
+static int hf_mswsp_msg_cpmfetchvalue_fmoreexists;
+static int hf_mswsp_msg_cpmfetchvalue_fvalueexists;
+static int hf_mswsp_msg_cpmfetchvalue_vvalue;
+static int hf_mswsp_msg_cpmquerystatusex_hcursor;
+static int hf_mswsp_msg_cpmquerystatusex_bmk;
+static int hf_mswsp_msg_cpmquerystatusex_qstatus;
+static int hf_mswsp_msg_cpmquerystatusex_cfiltereddocs;
+static int hf_mswsp_msg_cpmquerystatusex_cdocstofilter;
+static int hf_mswsp_msg_cpmquerystatusex_dwratiodenom;
+static int hf_mswsp_msg_cpmquerystatusex_dwrationumer;
+static int hf_mswsp_msg_cpmquerystatusex_irowbmk;
+static int hf_mswsp_msg_cpmquerystatusex_crowstotal;
+static int hf_mswsp_msg_cpmquerystatusex_maxrank;
+static int hf_mswsp_msg_cpmquerystatusex_cresultsfound;
+static int hf_mswsp_msg_cpmquerystatusex_whereid;
+static int hf_mswsp_msg_cpmrestartposition_hcursor;
+static int hf_mswsp_msg_cpmrestartposition_chapt;
+static int hf_mswsp_msg_cpmgetrowsetnotify_wid;
+static int hf_mswsp_msg_cpmgetrowsetnotify_moreevents;
+static int hf_mswsp_msg_cpmgetrowsetnotify_eventtype;
+static int hf_mswsp_msg_cpmgetrowsetnotify_rowsetitemstate;
+static int hf_mswsp_msg_cpmgetrowsetnotify_changeditemstate;
+static int hf_mswsp_msg_cpmgetrowsetnotify_rowsetevent;
+static int hf_mswsp_msg_cpmgetrowsetnotify_rowseteventdata1;
+static int hf_mswsp_msg_cpmgetrowsetnotify_rowseteventdata2;
+static int hf_mswsp_msg_cpmfindindices_cwids;
+static int hf_mswsp_msg_cpmfindindices_cdepthprev;
+static int hf_mswsp_msg_cpmfindindices_cdepthnext;
+static int hf_mswsp_msg_cpmsetscopeprioritization_priority;
+static int hf_mswsp_msg_cpmsetscopeprioritization_eventfreq;
+static int hf_mswsp_msg_cpmsetscopestatisics_dwindexitems;
+static int hf_mswsp_msg_cpmsetscopestatisics_dwoutstandingadds;
+static int hf_mswsp_msg_cpmsetscopestatisics_dwoutstandingmodifies;
+
+static gint ett_mswsp;
+static gint ett_mswsp_hdr;
+static gint ett_mswsp_msg;
+static gint ett_mswsp_pad;
+
+static gint ett_mswsp_property_restriction;
+static gint ett_CRestrictionArray;
+static gint ett_CBaseStorageVariant;
+static gint ett_CBaseStorageVariant_Vector;
+static gint ett_CBaseStorageVariant_Array;
+static gint ett_CDbColId;
+static gint ett_GUID;
+static gint ett_CDbProp;
+static gint ett_CDbPropSet;
+static gint ett_CDbPropSet_Array;
+static gint ett_CRestriction;
+static gint ett_CNodeRestriction;
+static gint ett_CPropertyRestriction;
+static gint ett_CCoercionRestriction;
+static gint ett_CContentRestriction;
+static gint ett_RANGEBOUNDARY;
+static gint ett_CRangeCategSpec;
+static gint ett_CCategSpec;
+static gint ett_CAggregSpec;
+static gint ett_CAggregSet;
+static gint ett_CCategorizationSpec;
+static gint ett_CAggregSortKey;
+static gint ett_CSortAggregSet;
+static gint ett_CInGroupSortAggregSet;
+static gint ett_CInGroupSortAggregSets;
+static gint ett_CRowsetProperties;
+static gint ett_CFullPropSpec;
+static gint ett_CPidMapper;
+static gint ett_CSort;
+static gint ett_CSortSet;
+static gint ett_CNatLanguageRestriction;
+static gint ett_CColumnGroup;
+static gint ett_CColumnGroupArray;
+static gint ett_LCID;
+static gint ett_CTableColumn;
+static gint ett_Array;
+static gint ett_SeekDescription;
+static gint ett_CRowsSeekNext;
+static gint ett_CRowsSeekAt;
+static gint ett_CRowsSeekAtRatio;
+static gint ett_CRowsSeekByBookmark;
+static gint ett_GetRowsRow;
+static gint ett_GetRowsColumn;
+static gint ett_CRowVariant;
+static gint ett_CRowVariant_Vector;
+static gint ett_mswsp_bool_options;
+static gint ett_mswsp_uin32_array;
+static gint ett_mswsp_msg_padding;
+static gint ett_mswsp_msg_creusewhere;
 
 static struct vtype_data *vType_get_type(guint16 t);
 
diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c
index 53f78ef572..389b79a09f 100644
--- a/epan/dissectors/packet-mtp2.c
+++ b/epan/dissectors/packet-mtp2.c
@@ -105,40 +105,40 @@ typedef struct mtp2_convo_data {
 } mtp2_convo_data_t;
 
 /* Initialize the protocol and registered fields */
-static int proto_mtp2        = -1;
-static int hf_mtp2_bsn       = -1;
-static int hf_mtp2_ext_bsn   = -1;
-static int hf_mtp2_ext_res   = -1;
-static int hf_mtp2_bib       = -1;
-static int hf_mtp2_ext_bib   = -1;
-static int hf_mtp2_fsn       = -1;
-static int hf_mtp2_ext_fsn   = -1;
-static int hf_mtp2_fib       = -1;
-static int hf_mtp2_ext_fib   = -1;
-static int hf_mtp2_li        = -1;
-static int hf_mtp2_ext_li    = -1;
-static int hf_mtp2_spare     = -1;
-static int hf_mtp2_ext_spare = -1;
-static int hf_mtp2_sf        = -1;
-static int hf_mtp2_sf_extra  = -1;
-static int hf_mtp2_fcs_16    = -1;
-static int hf_mtp2_fcs_16_status = -1;
-static int hf_mtp2_unexpect_end = -1;
-static int hf_mtp2_frame_reset = -1;
+static int proto_mtp2;
+static int hf_mtp2_bsn;
+static int hf_mtp2_ext_bsn;
+static int hf_mtp2_ext_res;
+static int hf_mtp2_bib;
+static int hf_mtp2_ext_bib;
+static int hf_mtp2_fsn;
+static int hf_mtp2_ext_fsn;
+static int hf_mtp2_fib;
+static int hf_mtp2_ext_fib;
+static int hf_mtp2_li;
+static int hf_mtp2_ext_li;
+static int hf_mtp2_spare;
+static int hf_mtp2_ext_spare;
+static int hf_mtp2_sf;
+static int hf_mtp2_sf_extra;
+static int hf_mtp2_fcs_16;
+static int hf_mtp2_fcs_16_status;
+static int hf_mtp2_unexpect_end;
+static int hf_mtp2_frame_reset;
 
 /* reassemble variables */
-static int hf_mtp2_fragments = -1;
-static int hf_mtp2_fragment = -1;
-static int hf_mtp2_fragment_overlap = -1;
-static int hf_mtp2_fragment_overlap_conflicts = -1;
-static int hf_mtp2_fragment_multiple_tails = -1;
-static int hf_mtp2_fragment_too_long_fragment = -1;
-static int hf_mtp2_fragment_error = -1;
-static int hf_mtp2_fragment_count = -1;
-static int hf_mtp2_reassembled_in = -1;
-static int hf_mtp2_reassembled_length = -1;
-static gint ett_mtp2_fragment = -1;
-static gint ett_mtp2_fragments = -1;
+static int hf_mtp2_fragments;
+static int hf_mtp2_fragment;
+static int hf_mtp2_fragment_overlap;
+static int hf_mtp2_fragment_overlap_conflicts;
+static int hf_mtp2_fragment_multiple_tails;
+static int hf_mtp2_fragment_too_long_fragment;
+static int hf_mtp2_fragment_error;
+static int hf_mtp2_fragment_count;
+static int hf_mtp2_reassembled_in;
+static int hf_mtp2_reassembled_length;
+static gint ett_mtp2_fragment;
+static gint ett_mtp2_fragments;
 
 /* local static const needed for reassembly */
 static const fragment_items mtp2_frag_items = {
@@ -164,11 +164,11 @@ static reassembly_table mtp2_reassembly_table;
 /* variables needed for property registration to wireshark menu */
 static gboolean reverse_bit_order_mtp2 = FALSE;
 
-static expert_field ei_mtp2_checksum_error = EI_INIT;
-static expert_field ei_mtp2_li_bad = EI_INIT;
+static expert_field ei_mtp2_checksum_error;
+static expert_field ei_mtp2_li_bad;
 
 /* Initialize the subtree pointers */
-static gint ett_mtp2       = -1;
+static gint ett_mtp2;
 
 static gboolean use_extended_sequence_numbers_default = FALSE;
 static gboolean capture_contains_fcs_crc_default = FALSE;
diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c
index de858a7605..1c91c9ed2d 100644
--- a/epan/dissectors/packet-mtp3.c
+++ b/epan/dissectors/packet-mtp3.c
@@ -41,7 +41,7 @@ void proto_register_mtp3(void);
 void proto_reg_handoff_mtp3(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_mtp3  = -1;
+static int proto_mtp3;
 
 static int mtp3_tap = -1;
 
@@ -49,46 +49,46 @@ static dissector_handle_t mtp3_handle;
 
 static module_t *mtp3_module;
 
-static int hf_mtp3_service_indicator = -1;
-static int hf_mtp3_network_indicator = -1;
-static int hf_mtp3_itu_spare = -1;
-static int hf_mtp3_itu_priority = -1;
-static int hf_mtp3_ansi_priority = -1;
-static int hf_mtp3_itu_pc = -1;
-static int hf_mtp3_24bit_pc = -1;
-static int hf_mtp3_itu_opc = -1;
-static int hf_mtp3_24bit_opc = -1;
-static int hf_mtp3_ansi_opc = -1;
-static int hf_mtp3_chinese_opc = -1;
-static int hf_mtp3_opc_network = -1;
-static int hf_mtp3_opc_cluster = -1;
-static int hf_mtp3_opc_member = -1;
-static int hf_mtp3_itu_dpc = -1;
-static int hf_mtp3_24bit_dpc = -1;
-static int hf_mtp3_ansi_dpc = -1;
-static int hf_mtp3_chinese_dpc = -1;
-static int hf_mtp3_dpc_network = -1;
-static int hf_mtp3_dpc_cluster = -1;
-static int hf_mtp3_dpc_member = -1;
-static int hf_mtp3_itu_sls = -1;
-static int hf_mtp3_ansi_5_bit_sls = -1;
-static int hf_mtp3_ansi_8_bit_sls = -1;
-static int hf_mtp3_chinese_itu_sls = -1;
-static int hf_mtp3_japan_dpc = -1;
-static int hf_mtp3_japan_opc = -1;
-static int hf_mtp3_japan_pc = -1;
-static int hf_mtp3_japan_4_bit_sls = -1;
-static int hf_mtp3_japan_4_bit_sls_spare = -1;
-static int hf_mtp3_japan_5_bit_sls = -1;
-static int hf_mtp3_japan_5_bit_sls_spare = -1;
-static int hf_mtp3_heuristic_standard = -1;
+static int hf_mtp3_service_indicator;
+static int hf_mtp3_network_indicator;
+static int hf_mtp3_itu_spare;
+static int hf_mtp3_itu_priority;
+static int hf_mtp3_ansi_priority;
+static int hf_mtp3_itu_pc;
+static int hf_mtp3_24bit_pc;
+static int hf_mtp3_itu_opc;
+static int hf_mtp3_24bit_opc;
+static int hf_mtp3_ansi_opc;
+static int hf_mtp3_chinese_opc;
+static int hf_mtp3_opc_network;
+static int hf_mtp3_opc_cluster;
+static int hf_mtp3_opc_member;
+static int hf_mtp3_itu_dpc;
+static int hf_mtp3_24bit_dpc;
+static int hf_mtp3_ansi_dpc;
+static int hf_mtp3_chinese_dpc;
+static int hf_mtp3_dpc_network;
+static int hf_mtp3_dpc_cluster;
+static int hf_mtp3_dpc_member;
+static int hf_mtp3_itu_sls;
+static int hf_mtp3_ansi_5_bit_sls;
+static int hf_mtp3_ansi_8_bit_sls;
+static int hf_mtp3_chinese_itu_sls;
+static int hf_mtp3_japan_dpc;
+static int hf_mtp3_japan_opc;
+static int hf_mtp3_japan_pc;
+static int hf_mtp3_japan_4_bit_sls;
+static int hf_mtp3_japan_4_bit_sls_spare;
+static int hf_mtp3_japan_5_bit_sls;
+static int hf_mtp3_japan_5_bit_sls_spare;
+static int hf_mtp3_heuristic_standard;
 
 /* Initialize the subtree pointers */
-static gint ett_mtp3 = -1;
-static gint ett_mtp3_sio = -1;
-static gint ett_mtp3_label = -1;
-static gint ett_mtp3_label_dpc = -1;
-static gint ett_mtp3_label_opc = -1;
+static gint ett_mtp3;
+static gint ett_mtp3_sio;
+static gint ett_mtp3_label;
+static gint ett_mtp3_label_dpc;
+static gint ett_mtp3_label_opc;
 
 static dissector_table_t mtp3_sio_dissector_table;
 
diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c
index 4c764842d6..2b8ce3aab3 100644
--- a/epan/dissectors/packet-mtp3mg.c
+++ b/epan/dissectors/packet-mtp3mg.c
@@ -353,68 +353,68 @@ static const value_string service_indicator_code_vals[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_mtp3mg  = -1;
-static int hf_mtp3mg_h0 = -1;
-static int hf_mtp3mg_chm_h1 = -1;
-static int hf_mtp3mg_ecm_h1 = -1;
-static int hf_mtp3mg_fcm_h1 = -1;
-static int hf_mtp3mg_tfm_h1 = -1;
-static int hf_mtp3mg_rsm_h1 = -1;
-static int hf_mtp3mg_mim_h1 = -1;
-static int hf_mtp3mg_trm_h1 = -1;
-static int hf_mtp3mg_dlm_h1 = -1;
-static int hf_mtp3mg_ufc_h1 = -1;
-static int hf_mtp3mg_coo_ansi_slc = -1;
-static int hf_mtp3mg_coo_ansi_fsn = -1;
-static int hf_mtp3mg_coo_itu_fsn = -1;
-static int hf_mtp3mg_xco_ansi_slc = -1;
-static int hf_mtp3mg_xco_ansi_fsn = -1;
-static int hf_mtp3mg_xco_itu_fsn = -1;
-static int hf_mtp3mg_cbd_ansi_slc = -1;
-static int hf_mtp3mg_cbd_ansi_cbc = -1;
-static int hf_mtp3mg_cbd_itu_cbc = -1;
-static int hf_mtp3mg_cbd_japan_cbc = -1;
-static int hf_mtp3mg_eco_ansi_slc = -1;
-static int hf_mtp3mg_ansi_apc = -1;
-static int hf_mtp3mg_apc_member = -1;
-static int hf_mtp3mg_apc_cluster = -1;
-static int hf_mtp3mg_apc_network = -1;
-static int hf_mtp3mg_tfc_ansi_status = -1;
-static int hf_mtp3mg_itu_apc = -1;
-static int hf_mtp3mg_tfc_itu_status = -1;
-static int hf_mtp3mg_chinese_apc = -1;
-static int hf_mtp3mg_tfc_japan_spare = -1;
-static int hf_mtp3mg_japan_apc = -1;
-static int hf_mtp3mg_tfc_japan_status = -1;
-static int hf_mtp3mg_tfc_japan_status_spare = -1;
-static int hf_mtp3mg_tfm_japan_count = -1;
-static int hf_mtp3mg_tfm_japan_spare = -1;
-static int hf_mtp3mg_rsm_japan_count = -1;
-static int hf_mtp3mg_rsm_japan_spare = -1;
-static int hf_mtp3mg_mim_ansi_slc = -1;
-static int hf_mtp3mg_dlc_ansi_slc = -1;
-static int hf_mtp3mg_dlc_ansi_link = -1;
-static int hf_mtp3mg_dlc_itu_link = -1;
-static int hf_mtp3mg_upu_user = -1;
-static int hf_mtp3mg_upu_cause = -1;
-static int hf_mtp3test_h0 = -1;
-static int hf_mtp3mg_test_h1 = -1;
-static int hf_mtp3mg_test_ansi_slc = -1;
-static int hf_mtp3mg_test_length = -1;
-static int hf_mtp3mg_japan_test = -1;
-static int hf_mtp3mg_japan_test_spare = -1;
-static int hf_mtp3mg_japan_test_pattern = -1;
-static int hf_mtp3mg_japan_spare = -1;
-static int hf_mtp3mg_test_pattern = -1;
+static int proto_mtp3mg;
+static int hf_mtp3mg_h0;
+static int hf_mtp3mg_chm_h1;
+static int hf_mtp3mg_ecm_h1;
+static int hf_mtp3mg_fcm_h1;
+static int hf_mtp3mg_tfm_h1;
+static int hf_mtp3mg_rsm_h1;
+static int hf_mtp3mg_mim_h1;
+static int hf_mtp3mg_trm_h1;
+static int hf_mtp3mg_dlm_h1;
+static int hf_mtp3mg_ufc_h1;
+static int hf_mtp3mg_coo_ansi_slc;
+static int hf_mtp3mg_coo_ansi_fsn;
+static int hf_mtp3mg_coo_itu_fsn;
+static int hf_mtp3mg_xco_ansi_slc;
+static int hf_mtp3mg_xco_ansi_fsn;
+static int hf_mtp3mg_xco_itu_fsn;
+static int hf_mtp3mg_cbd_ansi_slc;
+static int hf_mtp3mg_cbd_ansi_cbc;
+static int hf_mtp3mg_cbd_itu_cbc;
+static int hf_mtp3mg_cbd_japan_cbc;
+static int hf_mtp3mg_eco_ansi_slc;
+static int hf_mtp3mg_ansi_apc;
+static int hf_mtp3mg_apc_member;
+static int hf_mtp3mg_apc_cluster;
+static int hf_mtp3mg_apc_network;
+static int hf_mtp3mg_tfc_ansi_status;
+static int hf_mtp3mg_itu_apc;
+static int hf_mtp3mg_tfc_itu_status;
+static int hf_mtp3mg_chinese_apc;
+static int hf_mtp3mg_tfc_japan_spare;
+static int hf_mtp3mg_japan_apc;
+static int hf_mtp3mg_tfc_japan_status;
+static int hf_mtp3mg_tfc_japan_status_spare;
+static int hf_mtp3mg_tfm_japan_count;
+static int hf_mtp3mg_tfm_japan_spare;
+static int hf_mtp3mg_rsm_japan_count;
+static int hf_mtp3mg_rsm_japan_spare;
+static int hf_mtp3mg_mim_ansi_slc;
+static int hf_mtp3mg_dlc_ansi_slc;
+static int hf_mtp3mg_dlc_ansi_link;
+static int hf_mtp3mg_dlc_itu_link;
+static int hf_mtp3mg_upu_user;
+static int hf_mtp3mg_upu_cause;
+static int hf_mtp3test_h0;
+static int hf_mtp3mg_test_h1;
+static int hf_mtp3mg_test_ansi_slc;
+static int hf_mtp3mg_test_length;
+static int hf_mtp3mg_japan_test;
+static int hf_mtp3mg_japan_test_spare;
+static int hf_mtp3mg_japan_test_pattern;
+static int hf_mtp3mg_japan_spare;
+static int hf_mtp3mg_test_pattern;
 
 /* Initialize the subtree pointers */
-static gint ett_mtp3mg = -1;
-static gint ett_mtp3mg_fcm_apc = -1;
-static gint ett_mtp3mg_tfm_apc = -1;
-static gint ett_mtp3mg_rsm_apc = -1;
-static gint ett_mtp3mg_upu_apc = -1;
+static gint ett_mtp3mg;
+static gint ett_mtp3mg_fcm_apc;
+static gint ett_mtp3mg_tfm_apc;
+static gint ett_mtp3mg_rsm_apc;
+static gint ett_mtp3mg_upu_apc;
 
-static expert_field ei_mtp3mg_unknown_message = EI_INIT;
+static expert_field ei_mtp3mg_unknown_message;
 
 static dissector_handle_t mtp3mg_handle;
 
diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c
index 6a048f1011..10da428be7 100644
--- a/epan/dissectors/packet-multipart.c
+++ b/epan/dissectors/packet-multipart.c
@@ -62,23 +62,23 @@ void proto_reg_handoff_multipart(void);
 static dissector_table_t multipart_media_subdissector_table;
 
 /* Initialize the protocol and registered fields */
-static int proto_multipart = -1;
+static int proto_multipart;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_multipart_trailer = -1;
-static int hf_multipart_boundary = -1;
-static int hf_multipart_first_boundary = -1;
-static int hf_multipart_last_boundary = -1;
-static int hf_multipart_preamble = -1;
+static int hf_multipart_trailer;
+static int hf_multipart_boundary;
+static int hf_multipart_first_boundary;
+static int hf_multipart_last_boundary;
+static int hf_multipart_preamble;
 
 /* Initialize the subtree pointers */
-static gint ett_multipart = -1;
-static gint ett_multipart_main = -1;
-static gint ett_multipart_body = -1;
+static gint ett_multipart;
+static gint ett_multipart_main;
+static gint ett_multipart_body;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_multipart_no_required_parameter = EI_INIT;
-static expert_field ei_multipart_decryption_not_possible = EI_INIT;
+static expert_field ei_multipart_no_required_parameter;
+static expert_field ei_multipart_decryption_not_possible;
 
 /* Not sure that compact_name exists for multipart, but choose to keep
  * the structure from SIP dissector, all the content- is also from SIP */
@@ -113,9 +113,9 @@ static const multipart_header_t multipart_headers[] = {
 #define POS_ORIGINALCONTENT             9
 
 /* Initialize the header fields */
-static gint hf_multipart_type = -1;
-static gint hf_multipart_part = -1;
-static gint hf_multipart_sec_token_len = -1;
+static gint hf_multipart_type;
+static gint hf_multipart_part;
+static gint hf_multipart_sec_token_len;
 static gint hf_header_array[array_length(multipart_headers)];
 
 /* Define media_type/Content type table */
diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c
index 2f61a9c1d3..c0e426d5d2 100644
--- a/epan/dissectors/packet-mux27010.c
+++ b/epan/dissectors/packet-mux27010.c
@@ -94,7 +94,7 @@ void proto_reg_handoff_mux27010(void);
 
 
 /* Wireshark ID of the MUX27010 protocol */
-static int proto_mux27010 = -1;
+static int proto_mux27010;
 
 /* Handles of subdissectors */
 static dissector_handle_t ppp_handle;
@@ -169,119 +169,119 @@ struct controlchannel
 * proto_register_field_array() in proto_register_mux27010()
 */
 
-static gint hf_mux27010_extended_header = -1;
-static gint hf_mux27010_direction = -1;
-static gint hf_mux27010 = -1;
-static gint hf_mux27010_address = -1;
-static gint hf_mux27010_control = -1;
-static gint hf_mux27010_length = -1;
-static gint hf_mux27010_controlchannel = -1;
+static gint hf_mux27010_extended_header;
+static gint hf_mux27010_direction;
+static gint hf_mux27010;
+static gint hf_mux27010_address;
+static gint hf_mux27010_control;
+static gint hf_mux27010_length;
+static gint hf_mux27010_controlchannel;
 
 /*Extended Header*/
-static int hf_mux27010_extended_header_size = -1;
-static int hf_mux27010_extended_header_msg_number_I = -1;
-static int hf_mux27010_extended_header_freq_number_I = -1;
-static int hf_mux27010_extended_header_start_pos_I = -1;
-static int hf_mux27010_extended_header_start_byte_I = -1;
-static int hf_mux27010_extended_header_end_pos_I = -1;
-static int hf_mux27010_extended_header_end_byte_I = -1;
-static int hf_mux27010_extended_header_flag_ended_I = -1;
-
-static int hf_mux27010_extended_header_msg_number_II = -1;
-static int hf_mux27010_extended_header_freq_number_II = -1;
-static int hf_mux27010_extended_header_start_pos_II = -1;
-static int hf_mux27010_extended_header_start_byte_II = -1;
-static int hf_mux27010_extended_header_end_pos_II = -1;
-static int hf_mux27010_extended_header_end_byte_II = -1;
-static int hf_mux27010_extended_header_flag_ended_II = -1;
-
-static int hf_mux27010_extended_header_msg_number_III = -1;
-static int hf_mux27010_extended_header_freq_number_III = -1;
-static int hf_mux27010_extended_header_start_pos_III = -1;
-static int hf_mux27010_extended_header_start_byte_III = -1;
-static int hf_mux27010_extended_header_end_pos_III = -1;
-static int hf_mux27010_extended_header_end_byte_III = -1;
-static int hf_mux27010_extended_header_flag_ended_III = -1;
+static int hf_mux27010_extended_header_size;
+static int hf_mux27010_extended_header_msg_number_I;
+static int hf_mux27010_extended_header_freq_number_I;
+static int hf_mux27010_extended_header_start_pos_I;
+static int hf_mux27010_extended_header_start_byte_I;
+static int hf_mux27010_extended_header_end_pos_I;
+static int hf_mux27010_extended_header_end_byte_I;
+static int hf_mux27010_extended_header_flag_ended_I;
+
+static int hf_mux27010_extended_header_msg_number_II;
+static int hf_mux27010_extended_header_freq_number_II;
+static int hf_mux27010_extended_header_start_pos_II;
+static int hf_mux27010_extended_header_start_byte_II;
+static int hf_mux27010_extended_header_end_pos_II;
+static int hf_mux27010_extended_header_end_byte_II;
+static int hf_mux27010_extended_header_flag_ended_II;
+
+static int hf_mux27010_extended_header_msg_number_III;
+static int hf_mux27010_extended_header_freq_number_III;
+static int hf_mux27010_extended_header_start_pos_III;
+static int hf_mux27010_extended_header_start_byte_III;
+static int hf_mux27010_extended_header_end_pos_III;
+static int hf_mux27010_extended_header_end_byte_III;
+static int hf_mux27010_extended_header_flag_ended_III;
 
 /*Address*/
-static int hf_mux27010_dlciaddressflag = -1;
-static int hf_mux27010_eaaddressflag = -1;
-static int hf_mux27010_craddressflag = -1;
-/* static int hf_mux27010_addressdirection = -1; */
+static int hf_mux27010_dlciaddressflag;
+static int hf_mux27010_eaaddressflag;
+static int hf_mux27010_craddressflag;
+/* static int hf_mux27010_addressdirection; */
 /*Control*/
-static int hf_mux27010_controlframetype = -1;
-static int hf_mux27010_controlframetypens = -1;
-static int hf_mux27010_controlframetypenr = -1;
-static int hf_mux27010_pfcontrolflag = -1;
+static int hf_mux27010_controlframetype;
+static int hf_mux27010_controlframetypens;
+static int hf_mux27010_controlframetypenr;
+static int hf_mux27010_pfcontrolflag;
 /*Length*/
-static int hf_mux27010_ealengthflag = -1;
-static int hf_mux27010_lengthframesize = -1;
-static int hf_mux27010_lengthframesize_ea = -1;
+static int hf_mux27010_ealengthflag;
+static int hf_mux27010_lengthframesize;
+static int hf_mux27010_lengthframesize_ea;
 /*Control channel dlci = 0*/
-static int hf_mux27010_controlchannelframetype = -1;
-static int hf_mux27010_controlchanneleaframetype = -1;
-static int hf_mux27010_controlchannelcrframetype = -1;
-static int hf_mux27010_controlchannelframetypecommand = -1;
-static int hf_mux27010_controlchannellength = -1;
-static int hf_mux27010_controlchannelealength = -1;
-static int hf_mux27010_controlchannellengthfield = -1;
-static int hf_mux27010_controlchannelvalue = -1;
-static int hf_mux27010_controlchannel_iei_coding = -1;
-static int hf_mux27010_controlchanneldetailedvalue = -1;
-static int hf_mux27010_controlchannel_detailedvalue_response = -1;
-static int hf_mux27010_controlchanneldetailedvaluetestcommandversion = -1;
-static int hf_mux27010_controlchanneldetailedvaluemscdlci = -1;
-/* static int hf_mux27010_controlchanneldetailedvaluemscv24 = -1; */
-static int hf_mux27010_controlchanneldetailedvaluemscv24fc = -1;
-static int hf_mux27010_controlchanneldetailedvaluemscv24rtc = -1;
-static int hf_mux27010_controlchanneldetailedvaluemscv24rtr = -1;
-static int hf_mux27010_controlchanneldetailedvaluemscv24ring = -1;
-static int hf_mux27010_controlchanneldetailedvaluemscv24dcd = -1;
-static int hf_mux27010_controlchanneldetailedvaluemscbreak = -1;
-static int hf_mux27010_controlchanneldetailedvaluepndlci = -1;
-static int hf_mux27010_controlchanneldetailedvaluepnframetype = -1;
-static int hf_mux27010_controlchanneldetailedvaluepncl = -1;
-static int hf_mux27010_controlchanneldetailedvaluepnprio = -1;
-static int hf_mux27010_controlchanneldetailedvaluepntimer = -1;
-static int hf_mux27010_controlchanneldetailedvaluepnframesize = -1;
-static int hf_mux27010_controlchanneldetailedvaluepnna = -1;
-static int hf_mux27010_controlchanneldetailedvaluepnwinsize = -1;
+static int hf_mux27010_controlchannelframetype;
+static int hf_mux27010_controlchanneleaframetype;
+static int hf_mux27010_controlchannelcrframetype;
+static int hf_mux27010_controlchannelframetypecommand;
+static int hf_mux27010_controlchannellength;
+static int hf_mux27010_controlchannelealength;
+static int hf_mux27010_controlchannellengthfield;
+static int hf_mux27010_controlchannelvalue;
+static int hf_mux27010_controlchannel_iei_coding;
+static int hf_mux27010_controlchanneldetailedvalue;
+static int hf_mux27010_controlchannel_detailedvalue_response;
+static int hf_mux27010_controlchanneldetailedvaluetestcommandversion;
+static int hf_mux27010_controlchanneldetailedvaluemscdlci;
+/* static int hf_mux27010_controlchanneldetailedvaluemscv24; */
+static int hf_mux27010_controlchanneldetailedvaluemscv24fc;
+static int hf_mux27010_controlchanneldetailedvaluemscv24rtc;
+static int hf_mux27010_controlchanneldetailedvaluemscv24rtr;
+static int hf_mux27010_controlchanneldetailedvaluemscv24ring;
+static int hf_mux27010_controlchanneldetailedvaluemscv24dcd;
+static int hf_mux27010_controlchanneldetailedvaluemscbreak;
+static int hf_mux27010_controlchanneldetailedvaluepndlci;
+static int hf_mux27010_controlchanneldetailedvaluepnframetype;
+static int hf_mux27010_controlchanneldetailedvaluepncl;
+static int hf_mux27010_controlchanneldetailedvaluepnprio;
+static int hf_mux27010_controlchanneldetailedvaluepntimer;
+static int hf_mux27010_controlchanneldetailedvaluepnframesize;
+static int hf_mux27010_controlchanneldetailedvaluepnna;
+static int hf_mux27010_controlchanneldetailedvaluepnwinsize;
 /*Information*/
-static int hf_mux27010_information = -1;
-static int hf_mux27010_information_str = -1;
+static int hf_mux27010_information;
+static int hf_mux27010_information_str;
 /*Checksum*/
-static int hf_mux27010_checksum = -1;
-static int hf_mux27010_checksum_correct = -1;
+static int hf_mux27010_checksum;
+static int hf_mux27010_checksum_correct;
 
 /* These are the ids of the subtrees that we may be creating */
-static gint ett_mux27010_extended_header = -1;
-static gint ett_mux27010 = -1;
-static gint ett_mux27010_address = -1;
-static gint ett_mux27010_control = -1;
-static gint ett_mux27010_length = -1;
-static gint ett_mux27010_controlchannel = -1;
-static gint ett_mux27010_controlchannelframetype = -1;
-static gint ett_mux27010_controlchannellength = -1;
-static gint ett_mux27010_controlchannelvalue = -1;
-static gint ett_mux27010_information = -1;
-static gint ett_mux27010_checksum = -1;
-
-static expert_field ei_mux27010_message_illogical = EI_INIT;
-static expert_field ei_mux27010_checksum_incorrect = EI_INIT;
-
-static int hf_msg_fragments = -1;
-static int hf_msg_fragment = -1;
-static int hf_msg_fragment_overlap = -1;
-static int hf_msg_fragment_overlap_conflicts = -1;
-static int hf_msg_fragment_multiple_tails = -1;
-static int hf_msg_fragment_too_long_fragment = -1;
-static int hf_msg_fragment_error = -1;
-static int hf_msg_fragment_count = -1;
-static int hf_msg_reassembled_in = -1;
-static int hf_msg_reassembled_length = -1;
-
-static gint ett_msg_fragment = -1;
-static gint ett_msg_fragments = -1;
+static gint ett_mux27010_extended_header;
+static gint ett_mux27010;
+static gint ett_mux27010_address;
+static gint ett_mux27010_control;
+static gint ett_mux27010_length;
+static gint ett_mux27010_controlchannel;
+static gint ett_mux27010_controlchannelframetype;
+static gint ett_mux27010_controlchannellength;
+static gint ett_mux27010_controlchannelvalue;
+static gint ett_mux27010_information;
+static gint ett_mux27010_checksum;
+
+static expert_field ei_mux27010_message_illogical;
+static expert_field ei_mux27010_checksum_incorrect;
+
+static int hf_msg_fragments;
+static int hf_msg_fragment;
+static int hf_msg_fragment_overlap;
+static int hf_msg_fragment_overlap_conflicts;
+static int hf_msg_fragment_multiple_tails;
+static int hf_msg_fragment_too_long_fragment;
+static int hf_msg_fragment_error;
+static int hf_msg_fragment_count;
+static int hf_msg_reassembled_in;
+static int hf_msg_reassembled_length;
+
+static gint ett_msg_fragment;
+static gint ett_msg_fragments;
 
 static dissector_handle_t mux27010_handle;
 
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index e2c4ffdd14..5d70b8c86e 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -951,321 +951,321 @@ static const value_string mysql_response_code_vals[] = {
 };
 
 /* protocol id */
-static int proto_mysql = -1;
+static int proto_mysql;
 
 /* dissector configuration */
 static gboolean mysql_desegment = TRUE;
 static gboolean mysql_showquery = FALSE;
 
 /* expand-the-tree flags */
-static gint ett_mysql = -1;
-static gint ett_server_greeting = -1;
-static gint ett_login_request = -1;
-static gint ett_caps = -1;
-static gint ett_extcaps = -1;
-static gint ett_stat = -1;
-static gint ett_row_value = -1;
-static gint ett_request = -1;
-static gint ett_query_attributes = -1;
-static gint ett_refresh = -1;
-static gint ett_field_flags = -1;
-static gint ett_exec_param = -1;
-static gint ett_bulk_param = -1;
-static gint ett_session_track = -1;
-static gint ett_session_track_data = -1;
-static gint ett_extmeta = -1;
-static gint ett_extmeta_data = -1;
-static gint ett_connattrs = -1;
-static gint ett_connattrs_attr = -1;
-static gint ett_mysql_field = -1;
-static gint ett_binlog_event = -1;
-static gint ett_binlog_event_hb_v2 = -1;
+static gint ett_mysql;
+static gint ett_server_greeting;
+static gint ett_login_request;
+static gint ett_caps;
+static gint ett_extcaps;
+static gint ett_stat;
+static gint ett_row_value;
+static gint ett_request;
+static gint ett_query_attributes;
+static gint ett_refresh;
+static gint ett_field_flags;
+static gint ett_exec_param;
+static gint ett_bulk_param;
+static gint ett_session_track;
+static gint ett_session_track_data;
+static gint ett_extmeta;
+static gint ett_extmeta_data;
+static gint ett_connattrs;
+static gint ett_connattrs_attr;
+static gint ett_mysql_field;
+static gint ett_binlog_event;
+static gint ett_binlog_event_hb_v2;
 
 /* protocol fields */
-static int hf_mysql_caps_server = -1;
-static int hf_mysql_caps_client = -1;
-static int hf_mysql_cap_long_password = -1;
-static int hf_mysql_cap_found_rows = -1;
-static int hf_mysql_cap_long_flag = -1;
-static int hf_mysql_cap_connect_with_db = -1;
-static int hf_mysql_cap_no_schema = -1;
-static int hf_mysql_cap_compress = -1;
-static int hf_mysql_cap_odbc = -1;
-static int hf_mysql_cap_local_files = -1;
-static int hf_mysql_cap_ignore_space = -1;
-static int hf_mysql_cap_change_user = -1;
-static int hf_mysql_cap_interactive = -1;
-static int hf_mysql_cap_ssl = -1;
-static int hf_mysql_cap_ignore_sigpipe = -1;
-static int hf_mysql_cap_transactions = -1;
-static int hf_mysql_cap_reserved = -1;
-static int hf_mysql_cap_secure_connect = -1;
-static int hf_mysql_extcaps_server = -1;
-static int hf_mysql_extcaps_client = -1;
-static int hf_mysql_cap_multi_statements = -1;
-static int hf_mysql_cap_multi_results = -1;
-static int hf_mysql_cap_ps_multi_results = -1;
-static int hf_mysql_cap_plugin_auth = -1;
-static int hf_mysql_cap_connect_attrs = -1;
-static int hf_mysql_cap_plugin_auth_lenenc_client_data = -1;
-static int hf_mysql_cap_client_can_handle_expired_passwords = -1;
-static int hf_mysql_cap_session_track = -1;
-static int hf_mysql_cap_deprecate_eof = -1;
-static int hf_mysql_cap_optional_metadata = -1;
-static int hf_mysql_cap_compress_zstd = -1;
-static int hf_mysql_cap_query_attrs = -1;
-static int hf_mysql_cap_mf_auth = -1;
-static int hf_mysql_cap_cap_ext = -1;
-static int hf_mysql_cap_ssl_verify_server_cert = -1;
-static int hf_mysql_cap_unused = -1;
-static int hf_mysql_server_language = -1;
-static int hf_mysql_server_status = -1;
-static int hf_mysql_stat_it = -1;
-static int hf_mysql_stat_ac = -1;
-static int hf_mysql_stat_mr = -1;
-static int hf_mysql_stat_mu = -1;
-static int hf_mysql_stat_bi = -1;
-static int hf_mysql_stat_ni = -1;
-static int hf_mysql_stat_cr = -1;
-static int hf_mysql_stat_lr = -1;
-static int hf_mysql_stat_dr = -1;
-static int hf_mysql_stat_bs = -1;
-static int hf_mysql_stat_mc = -1;
-static int hf_mysql_stat_session_state_changed = -1;
-static int hf_mysql_stat_query_was_slow = -1;
-static int hf_mysql_stat_ps_out_params = -1;
-static int hf_mysql_stat_trans_readonly = -1;
-static int hf_mysql_refresh = -1;
-static int hf_mysql_rfsh_grants = -1;
-static int hf_mysql_rfsh_log = -1;
-static int hf_mysql_rfsh_tables = -1;
-static int hf_mysql_rfsh_hosts = -1;
-static int hf_mysql_rfsh_status = -1;
-static int hf_mysql_rfsh_threads = -1;
-static int hf_mysql_rfsh_slave = -1;
-static int hf_mysql_rfsh_master = -1;
-static int hf_mysql_packet_length = -1;
-static int hf_mysql_packet_number = -1;
-static int hf_mysql_request = -1;
-static int hf_mysql_command = -1;
-static int hf_mysql_response_code = -1;
-static int hf_mysql_error_code = -1;
-static int hf_mysql_error_string = -1;
-static int hf_mysql_sqlstate = -1;
-static int hf_mysql_message = -1;
-static int hf_mysql_payload = -1;
-static int hf_mysql_server_greeting = -1;
-static int hf_mysql_session_track = -1;
-static int hf_mysql_session_track_type = -1;
-static int hf_mysql_session_track_length = -1;
-static int hf_mysql_session_track_data = -1;
-static int hf_mysql_session_track_data_length = -1;
-static int hf_mysql_session_track_sysvar_length = -1;
-static int hf_mysql_session_track_sysvar_name = -1;
-static int hf_mysql_session_track_sysvar_value = -1;
-static int hf_mysql_session_track_schema = -1;
-static int hf_mysql_session_track_schema_length = -1;
-static int hf_mysql_session_state_change = -1;
-static int hf_mysql_session_track_gtids = -1;
-static int hf_mysql_session_track_gtids_encoding = -1;
-static int hf_mysql_session_track_gtids_length = -1;
-static int hf_mysql_session_track_transaction_characteristics = -1;
-static int hf_mysql_session_track_transaction_characteristics_length = -1;
-static int hf_mysql_session_track_transaction_state = -1;
-static int hf_mysql_session_track_transaction_state_length = -1;
-static int hf_mysql_protocol = -1;
-static int hf_mysql_version  = -1;
-static int hf_mysql_login_request = -1;
-static int hf_mysql_max_packet = -1;
-static int hf_mysql_user = -1;
-static int hf_mysql_table_name = -1;
-static int hf_mysql_schema = -1;
-static int hf_mysql_client_auth_plugin = -1;
-static int hf_mysql_connattrs = -1;
-static int hf_mysql_connattrs_length = -1;
-static int hf_mysql_connattrs_attr = -1;
-static int hf_mysql_connattrs_name_length = -1;
-static int hf_mysql_connattrs_name = -1;
-static int hf_mysql_connattrs_value_length = -1;
-static int hf_mysql_connattrs_value = -1;
-static int hf_mysql_zstd_compression_level = -1;
-static int hf_mysql_thread_id  = -1;
-static int hf_mysql_salt = -1;
-static int hf_mysql_salt2 = -1;
-static int hf_mysql_auth_plugin_length = -1;
-static int hf_mysql_auth_plugin = -1;
-static int hf_mysql_charset = -1;
-static int hf_mysql_passwd = -1;
-static int hf_mysql_unused = -1;
-static int hf_mysql_affected_rows = -1;
-static int hf_mysql_insert_id = -1;
-static int hf_mysql_num_warn = -1;
-static int hf_mysql_stmt_id = -1;
-static int hf_mysql_query_attributes = -1;
-static int hf_mysql_query_attributes_count = -1;
-static int hf_mysql_query_attributes_send_types_to_server = -1;
-static int hf_mysql_query_attribute_name_type = -1;
-static int hf_mysql_query_attribute_name = -1;
-static int hf_mysql_query_attribute_value = -1;
-static int hf_mysql_query = -1;
-static int hf_mysql_shutdown = -1;
-static int hf_mysql_option = -1;
-static int hf_mysql_num_rows = -1;
-static int hf_mysql_param = -1;
-static int hf_mysql_num_params = -1;
-static int hf_mysql_exec_flags4 = -1;
-static int hf_mysql_exec_flags5 = -1;
-static int hf_mysql_exec_iter = -1;
-static int hf_mysql_binlog_position = -1;
-static int hf_mysql_binlog_position8 = -1;
-static int hf_mysql_binlog_flags = -1;
-static int hf_mysql_binlog_server_id = -1;
-static int hf_mysql_binlog_file_name = -1;
-static int hf_mysql_binlog_file_name_length = -1;
-static int hf_mysql_binlog_slave_hostname_length = -1;
-static int hf_mysql_binlog_slave_hostname = -1;
-static int hf_mysql_binlog_slave_user_length = -1;
-static int hf_mysql_binlog_slave_user = -1;
-static int hf_mysql_binlog_slave_password_length = -1;
-static int hf_mysql_binlog_slave_password = -1;
-static int hf_mysql_binlog_slave_mysql_port = -1;
-static int hf_mysql_binlog_replication_rank = -1;
-static int hf_mysql_binlog_master_id = -1;
-static int hf_mysql_binlog_event_header_timestamp = -1;
-static int hf_mysql_binlog_event_header_event_type = -1;
-static int hf_mysql_binlog_event_header_server_id = -1;
-static int hf_mysql_binlog_event_header_event_size = -1;
-static int hf_mysql_binlog_event_header_log_position = -1;
-static int hf_mysql_binlog_event_header_flags = -1;
-static int hf_mysql_binlog_event_checksum = -1;
-static int hf_mysql_binlog_event_heartbeat_v2 = -1;
-static int hf_mysql_binlog_event_heartbeat_v2_otw = -1;
-static int hf_mysql_binlog_event_heartbeat_v2_otw_type = -1;
-static int hf_mysql_binlog_gtid_data = -1;
-static int hf_mysql_binlog_gtid_data_length = -1;
-static int hf_mysql_binlog_hb_event_filename = -1;
-static int hf_mysql_binlog_hb_event_log_position = -1;
-static int hf_mysql_clone_command_code = -1;
-static int hf_mysql_clone_response_code = -1;
-static int hf_mysql_eof = -1;
-static int hf_mysql_num_fields = -1;
-static int hf_mysql_extra = -1;
-static int hf_mysql_fld_catalog  = -1;
-static int hf_mysql_fld_db = -1;
-static int hf_mysql_fld_table = -1;
-static int hf_mysql_fld_org_table = -1;
-static int hf_mysql_fld_name = -1;
-static int hf_mysql_fld_org_name = -1;
-static int hf_mysql_fld_charsetnr = -1;
-static int hf_mysql_fld_length = -1;
-static int hf_mysql_fld_type = -1;
-static int hf_mysql_fld_flags = -1;
-static int hf_mysql_fld_not_null = -1;
-static int hf_mysql_fld_primary_key = -1;
-static int hf_mysql_fld_unique_key = -1;
-static int hf_mysql_fld_multiple_key = -1;
-static int hf_mysql_fld_blob = -1;
-static int hf_mysql_fld_unsigned = -1;
-static int hf_mysql_fld_zero_fill = -1;
-static int hf_mysql_exec_field_null = -1;
-static int hf_mysql_null_buffer = -1;
-static int hf_mysql_fld_enum = -1;
-static int hf_mysql_fld_auto_increment = -1;
-static int hf_mysql_fld_timestamp = -1;
-static int hf_mysql_fld_set = -1;
-static int hf_mysql_fld_decimals = -1;
-static int hf_mysql_fld_default = -1;
-static int hf_mysql_row_text = -1;
-static int hf_mysql_new_parameter_bound_flag = -1;
-static int hf_mysql_exec_param = -1;
-static int hf_mysql_exec_unsigned = -1;
-static int hf_mysql_exec_field_longlong = -1;
-static int hf_mysql_exec_field_unsigned_longlong = -1;
-static int hf_mysql_exec_field_string = -1;
-static int hf_mysql_exec_field_double = -1;
-static int hf_mysql_exec_field_datetime_length = -1;
-static int hf_mysql_exec_field_year = -1;
-static int hf_mysql_exec_field_month = -1;
-static int hf_mysql_exec_field_day = -1;
-static int hf_mysql_exec_field_hour = -1;
-static int hf_mysql_exec_field_minute = -1;
-static int hf_mysql_exec_field_second = -1;
-static int hf_mysql_exec_field_second_b = -1;
-static int hf_mysql_exec_field_long = -1;
-static int hf_mysql_exec_field_unsigned_long = -1;
-static int hf_mysql_exec_field_tiny = -1;
-static int hf_mysql_exec_field_unsigned_tiny = -1;
-static int hf_mysql_exec_field_short = -1;
-static int hf_mysql_exec_field_unsigned_short = -1;
-static int hf_mysql_exec_field_float = -1;
-static int hf_mysql_exec_field_time_length = -1;
-static int hf_mysql_exec_field_time_sign = -1;
-static int hf_mysql_exec_field_time_days = -1;
-static int hf_mysql_auth_switch_request_status = -1;
-static int hf_mysql_auth_switch_request_name = -1;
-static int hf_mysql_auth_switch_request_data = -1;
-static int hf_mysql_auth_switch_response_data = -1;
-static int hf_mysql_sha2_auth = -1;
-static int hf_mysql_sha2_response = -1;
-static int hf_mysql_pubkey = -1;
-static int hf_mysql_compressed_packet_length = -1;
-static int hf_mysql_compressed_packet_length_uncompressed = -1;
-static int hf_mysql_compressed_packet_number = -1;
-static int hf_mysql_loaddata_filename = -1;
-static int hf_mysql_loaddata_payload = -1;
-
-//static int hf_mariadb_fld_charsetnr = -1;
-static int hf_mariadb_server_language = -1;
-static int hf_mariadb_charset = -1;
-static int hf_mariadb_cap_progress = -1;
-static int hf_mariadb_cap_commulti = -1;
-static int hf_mariadb_cap_bulk = -1;
-static int hf_mariadb_cap_extmetadata = -1;
-static int hf_mariadb_cap_cache_metadata = -1;
-static int hf_mariadb_extcaps_server = -1;
-static int hf_mariadb_extcaps_client = -1;
-static int hf_mariadb_bulk_flag_autoid = -1;
-static int hf_mariadb_bulk_flag_sendtypes = -1;
-static int hf_mariadb_bulk_caps_flags = -1;
-static int hf_mariadb_bulk_paramtypes = -1;
-static int hf_mariadb_bulk_indicator = -1;
-static int hf_mariadb_bulk_row_nr = -1;
-static int hf_mariadb_send_meta = -1;
-static int hf_mariadb_extmeta = -1;
-static int hf_mariadb_extmeta_data = -1;
-static int hf_mariadb_extmeta_length = -1;
-static int hf_mariadb_extmeta_key = -1;
-static int hf_mariadb_extmeta_type = -1;
-static int hf_mariadb_extmeta_format = -1;
+static int hf_mysql_caps_server;
+static int hf_mysql_caps_client;
+static int hf_mysql_cap_long_password;
+static int hf_mysql_cap_found_rows;
+static int hf_mysql_cap_long_flag;
+static int hf_mysql_cap_connect_with_db;
+static int hf_mysql_cap_no_schema;
+static int hf_mysql_cap_compress;
+static int hf_mysql_cap_odbc;
+static int hf_mysql_cap_local_files;
+static int hf_mysql_cap_ignore_space;
+static int hf_mysql_cap_change_user;
+static int hf_mysql_cap_interactive;
+static int hf_mysql_cap_ssl;
+static int hf_mysql_cap_ignore_sigpipe;
+static int hf_mysql_cap_transactions;
+static int hf_mysql_cap_reserved;
+static int hf_mysql_cap_secure_connect;
+static int hf_mysql_extcaps_server;
+static int hf_mysql_extcaps_client;
+static int hf_mysql_cap_multi_statements;
+static int hf_mysql_cap_multi_results;
+static int hf_mysql_cap_ps_multi_results;
+static int hf_mysql_cap_plugin_auth;
+static int hf_mysql_cap_connect_attrs;
+static int hf_mysql_cap_plugin_auth_lenenc_client_data;
+static int hf_mysql_cap_client_can_handle_expired_passwords;
+static int hf_mysql_cap_session_track;
+static int hf_mysql_cap_deprecate_eof;
+static int hf_mysql_cap_optional_metadata;
+static int hf_mysql_cap_compress_zstd;
+static int hf_mysql_cap_query_attrs;
+static int hf_mysql_cap_mf_auth;
+static int hf_mysql_cap_cap_ext;
+static int hf_mysql_cap_ssl_verify_server_cert;
+static int hf_mysql_cap_unused;
+static int hf_mysql_server_language;
+static int hf_mysql_server_status;
+static int hf_mysql_stat_it;
+static int hf_mysql_stat_ac;
+static int hf_mysql_stat_mr;
+static int hf_mysql_stat_mu;
+static int hf_mysql_stat_bi;
+static int hf_mysql_stat_ni;
+static int hf_mysql_stat_cr;
+static int hf_mysql_stat_lr;
+static int hf_mysql_stat_dr;
+static int hf_mysql_stat_bs;
+static int hf_mysql_stat_mc;
+static int hf_mysql_stat_session_state_changed;
+static int hf_mysql_stat_query_was_slow;
+static int hf_mysql_stat_ps_out_params;
+static int hf_mysql_stat_trans_readonly;
+static int hf_mysql_refresh;
+static int hf_mysql_rfsh_grants;
+static int hf_mysql_rfsh_log;
+static int hf_mysql_rfsh_tables;
+static int hf_mysql_rfsh_hosts;
+static int hf_mysql_rfsh_status;
+static int hf_mysql_rfsh_threads;
+static int hf_mysql_rfsh_slave;
+static int hf_mysql_rfsh_master;
+static int hf_mysql_packet_length;
+static int hf_mysql_packet_number;
+static int hf_mysql_request;
+static int hf_mysql_command;
+static int hf_mysql_response_code;
+static int hf_mysql_error_code;
+static int hf_mysql_error_string;
+static int hf_mysql_sqlstate;
+static int hf_mysql_message;
+static int hf_mysql_payload;
+static int hf_mysql_server_greeting;
+static int hf_mysql_session_track;
+static int hf_mysql_session_track_type;
+static int hf_mysql_session_track_length;
+static int hf_mysql_session_track_data;
+static int hf_mysql_session_track_data_length;
+static int hf_mysql_session_track_sysvar_length;
+static int hf_mysql_session_track_sysvar_name;
+static int hf_mysql_session_track_sysvar_value;
+static int hf_mysql_session_track_schema;
+static int hf_mysql_session_track_schema_length;
+static int hf_mysql_session_state_change;
+static int hf_mysql_session_track_gtids;
+static int hf_mysql_session_track_gtids_encoding;
+static int hf_mysql_session_track_gtids_length;
+static int hf_mysql_session_track_transaction_characteristics;
+static int hf_mysql_session_track_transaction_characteristics_length;
+static int hf_mysql_session_track_transaction_state;
+static int hf_mysql_session_track_transaction_state_length;
+static int hf_mysql_protocol;
+static int hf_mysql_version;
+static int hf_mysql_login_request;
+static int hf_mysql_max_packet;
+static int hf_mysql_user;
+static int hf_mysql_table_name;
+static int hf_mysql_schema;
+static int hf_mysql_client_auth_plugin;
+static int hf_mysql_connattrs;
+static int hf_mysql_connattrs_length;
+static int hf_mysql_connattrs_attr;
+static int hf_mysql_connattrs_name_length;
+static int hf_mysql_connattrs_name;
+static int hf_mysql_connattrs_value_length;
+static int hf_mysql_connattrs_value;
+static int hf_mysql_zstd_compression_level;
+static int hf_mysql_thread_id;
+static int hf_mysql_salt;
+static int hf_mysql_salt2;
+static int hf_mysql_auth_plugin_length;
+static int hf_mysql_auth_plugin;
+static int hf_mysql_charset;
+static int hf_mysql_passwd;
+static int hf_mysql_unused;
+static int hf_mysql_affected_rows;
+static int hf_mysql_insert_id;
+static int hf_mysql_num_warn;
+static int hf_mysql_stmt_id;
+static int hf_mysql_query_attributes;
+static int hf_mysql_query_attributes_count;
+static int hf_mysql_query_attributes_send_types_to_server;
+static int hf_mysql_query_attribute_name_type;
+static int hf_mysql_query_attribute_name;
+static int hf_mysql_query_attribute_value;
+static int hf_mysql_query;
+static int hf_mysql_shutdown;
+static int hf_mysql_option;
+static int hf_mysql_num_rows;
+static int hf_mysql_param;
+static int hf_mysql_num_params;
+static int hf_mysql_exec_flags4;
+static int hf_mysql_exec_flags5;
+static int hf_mysql_exec_iter;
+static int hf_mysql_binlog_position;
+static int hf_mysql_binlog_position8;
+static int hf_mysql_binlog_flags;
+static int hf_mysql_binlog_server_id;
+static int hf_mysql_binlog_file_name;
+static int hf_mysql_binlog_file_name_length;
+static int hf_mysql_binlog_slave_hostname_length;
+static int hf_mysql_binlog_slave_hostname;
+static int hf_mysql_binlog_slave_user_length;
+static int hf_mysql_binlog_slave_user;
+static int hf_mysql_binlog_slave_password_length;
+static int hf_mysql_binlog_slave_password;
+static int hf_mysql_binlog_slave_mysql_port;
+static int hf_mysql_binlog_replication_rank;
+static int hf_mysql_binlog_master_id;
+static int hf_mysql_binlog_event_header_timestamp;
+static int hf_mysql_binlog_event_header_event_type;
+static int hf_mysql_binlog_event_header_server_id;
+static int hf_mysql_binlog_event_header_event_size;
+static int hf_mysql_binlog_event_header_log_position;
+static int hf_mysql_binlog_event_header_flags;
+static int hf_mysql_binlog_event_checksum;
+static int hf_mysql_binlog_event_heartbeat_v2;
+static int hf_mysql_binlog_event_heartbeat_v2_otw;
+static int hf_mysql_binlog_event_heartbeat_v2_otw_type;
+static int hf_mysql_binlog_gtid_data;
+static int hf_mysql_binlog_gtid_data_length;
+static int hf_mysql_binlog_hb_event_filename;
+static int hf_mysql_binlog_hb_event_log_position;
+static int hf_mysql_clone_command_code;
+static int hf_mysql_clone_response_code;
+static int hf_mysql_eof;
+static int hf_mysql_num_fields;
+static int hf_mysql_extra;
+static int hf_mysql_fld_catalog;
+static int hf_mysql_fld_db;
+static int hf_mysql_fld_table;
+static int hf_mysql_fld_org_table;
+static int hf_mysql_fld_name;
+static int hf_mysql_fld_org_name;
+static int hf_mysql_fld_charsetnr;
+static int hf_mysql_fld_length;
+static int hf_mysql_fld_type;
+static int hf_mysql_fld_flags;
+static int hf_mysql_fld_not_null;
+static int hf_mysql_fld_primary_key;
+static int hf_mysql_fld_unique_key;
+static int hf_mysql_fld_multiple_key;
+static int hf_mysql_fld_blob;
+static int hf_mysql_fld_unsigned;
+static int hf_mysql_fld_zero_fill;
+static int hf_mysql_exec_field_null;
+static int hf_mysql_null_buffer;
+static int hf_mysql_fld_enum;
+static int hf_mysql_fld_auto_increment;
+static int hf_mysql_fld_timestamp;
+static int hf_mysql_fld_set;
+static int hf_mysql_fld_decimals;
+static int hf_mysql_fld_default;
+static int hf_mysql_row_text;
+static int hf_mysql_new_parameter_bound_flag;
+static int hf_mysql_exec_param;
+static int hf_mysql_exec_unsigned;
+static int hf_mysql_exec_field_longlong;
+static int hf_mysql_exec_field_unsigned_longlong;
+static int hf_mysql_exec_field_string;
+static int hf_mysql_exec_field_double;
+static int hf_mysql_exec_field_datetime_length;
+static int hf_mysql_exec_field_year;
+static int hf_mysql_exec_field_month;
+static int hf_mysql_exec_field_day;
+static int hf_mysql_exec_field_hour;
+static int hf_mysql_exec_field_minute;
+static int hf_mysql_exec_field_second;
+static int hf_mysql_exec_field_second_b;
+static int hf_mysql_exec_field_long;
+static int hf_mysql_exec_field_unsigned_long;
+static int hf_mysql_exec_field_tiny;
+static int hf_mysql_exec_field_unsigned_tiny;
+static int hf_mysql_exec_field_short;
+static int hf_mysql_exec_field_unsigned_short;
+static int hf_mysql_exec_field_float;
+static int hf_mysql_exec_field_time_length;
+static int hf_mysql_exec_field_time_sign;
+static int hf_mysql_exec_field_time_days;
+static int hf_mysql_auth_switch_request_status;
+static int hf_mysql_auth_switch_request_name;
+static int hf_mysql_auth_switch_request_data;
+static int hf_mysql_auth_switch_response_data;
+static int hf_mysql_sha2_auth;
+static int hf_mysql_sha2_response;
+static int hf_mysql_pubkey;
+static int hf_mysql_compressed_packet_length;
+static int hf_mysql_compressed_packet_length_uncompressed;
+static int hf_mysql_compressed_packet_number;
+static int hf_mysql_loaddata_filename;
+static int hf_mysql_loaddata_payload;
+
+//static int hf_mariadb_fld_charsetnr;
+static int hf_mariadb_server_language;
+static int hf_mariadb_charset;
+static int hf_mariadb_cap_progress;
+static int hf_mariadb_cap_commulti;
+static int hf_mariadb_cap_bulk;
+static int hf_mariadb_cap_extmetadata;
+static int hf_mariadb_cap_cache_metadata;
+static int hf_mariadb_extcaps_server;
+static int hf_mariadb_extcaps_client;
+static int hf_mariadb_bulk_flag_autoid;
+static int hf_mariadb_bulk_flag_sendtypes;
+static int hf_mariadb_bulk_caps_flags;
+static int hf_mariadb_bulk_paramtypes;
+static int hf_mariadb_bulk_indicator;
+static int hf_mariadb_bulk_row_nr;
+static int hf_mariadb_send_meta;
+static int hf_mariadb_extmeta;
+static int hf_mariadb_extmeta_data;
+static int hf_mariadb_extmeta_length;
+static int hf_mariadb_extmeta_key;
+static int hf_mariadb_extmeta_type;
+static int hf_mariadb_extmeta_format;
 
 static dissector_handle_t mysql_handle;
 static dissector_handle_t decompressed_handle;
 static dissector_handle_t tls_handle;
 
-static expert_field ei_mysql_dissector_incomplete = EI_INIT;
-static expert_field ei_mysql_streamed_param = EI_INIT;
-static expert_field ei_mysql_prepare_response_needed = EI_INIT;
-static expert_field ei_mysql_unknown_response = EI_INIT;
-static expert_field ei_mysql_command = EI_INIT;
-static expert_field ei_mysql_invalid_length = EI_INIT;
-static expert_field ei_mysql_compression = EI_INIT;
+static expert_field ei_mysql_dissector_incomplete;
+static expert_field ei_mysql_streamed_param;
+static expert_field ei_mysql_prepare_response_needed;
+static expert_field ei_mysql_unknown_response;
+static expert_field ei_mysql_command;
+static expert_field ei_mysql_invalid_length;
+static expert_field ei_mysql_compression;
 
 /* Reassembly of decompressed packets in compressed packets {{{ */
 
-static int hf_mysql_fragments = -1;
-static int hf_mysql_fragment = -1;
-static int hf_mysql_fragment_overlap = -1;
-static int hf_mysql_fragment_overlap_conflicts = -1;
-static int hf_mysql_fragment_multiple_tails = -1;
-static int hf_mysql_fragment_too_long_fragment = -1;
-static int hf_mysql_fragment_error = -1;
-static int hf_mysql_fragment_count = -1;
-static int hf_mysql_reassembled_in = -1;
-static int hf_mysql_reassembled_length = -1;
-static int hf_mysql_fragment_data = -1;
-
-static gint ett_mysql_fragment = -1;
-static gint ett_mysql_fragments = -1;
+static int hf_mysql_fragments;
+static int hf_mysql_fragment;
+static int hf_mysql_fragment_overlap;
+static int hf_mysql_fragment_overlap_conflicts;
+static int hf_mysql_fragment_multiple_tails;
+static int hf_mysql_fragment_too_long_fragment;
+static int hf_mysql_fragment_error;
+static int hf_mysql_fragment_count;
+static int hf_mysql_reassembled_in;
+static int hf_mysql_reassembled_length;
+static int hf_mysql_fragment_data;
+
+static gint ett_mysql_fragment;
+static gint ett_mysql_fragments;
 
 static const fragment_items mysql_frag_items = {
 	&ett_mysql_fragment,
diff --git a/epan/dissectors/packet-nano.c b/epan/dissectors/packet-nano.c
index 4cde43e948..c0a203351d 100644
--- a/epan/dissectors/packet-nano.c
+++ b/epan/dissectors/packet-nano.c
@@ -28,62 +28,62 @@ void proto_register_nano(void);
 
 static dissector_handle_t nano_handle, nano_tcp_handle;
 
-static int proto_nano = -1;
-
-static int hf_nano_magic_number = -1;
-static int hf_nano_version_max = -1;
-static int hf_nano_version_using = -1;
-static int hf_nano_version_min = -1;
-static int hf_nano_packet_type = -1;
-static int hf_nano_extensions = -1;
-static int hf_nano_extensions_block_type = -1;
-static int hf_nano_keepalive_peer_ip = -1;
-static int hf_nano_keepalive_peer_port = -1;
-
-static int hf_nano_block_hash_previous = -1;
-static int hf_nano_block_hash_source = -1;
-static int hf_nano_block_signature = -1;
-static int hf_nano_block_work = -1;
-static int hf_nano_block_destination_account = -1;
-static int hf_nano_block_balance = -1;
-static int hf_nano_block_account = -1;
-static int hf_nano_block_representative_account = -1;
-static int hf_nano_block_link = -1;
-
-static int hf_nano_vote_account = -1;
-static int hf_nano_vote_signature = -1;
-static int hf_nano_vote_sequence = -1;
-
-static int hf_nano_bulk_pull_account = -1;
-static int hf_nano_bulk_pull_block_hash_end = -1;
-
-static int hf_nano_frontier_req_account = -1;
-static int hf_nano_frontier_req_age = -1;
-static int hf_nano_frontier_req_count = -1;
-
-static int hf_nano_bulk_pull_blocks_min_hash = -1;
-static int hf_nano_bulk_pull_blocks_max_hash = -1;
-static int hf_nano_bulk_pull_blocks_mode = -1;
-static int hf_nano_bulk_pull_blocks_max_count = -1;
-
-static int hf_nano_bulk_push_block_type = -1;
-
-static int hf_nano_bulk_pull_block_type = -1;
-
-static int hf_nano_frontier_account = -1;
-static int hf_nano_frontier_head_hash = -1;
-
-static gint ett_nano = -1;
-static gint ett_nano_header = -1;
-static gint ett_nano_extensions = -1;
-static gint ett_nano_peers = -1;
+static int proto_nano;
+
+static int hf_nano_magic_number;
+static int hf_nano_version_max;
+static int hf_nano_version_using;
+static int hf_nano_version_min;
+static int hf_nano_packet_type;
+static int hf_nano_extensions;
+static int hf_nano_extensions_block_type;
+static int hf_nano_keepalive_peer_ip;
+static int hf_nano_keepalive_peer_port;
+
+static int hf_nano_block_hash_previous;
+static int hf_nano_block_hash_source;
+static int hf_nano_block_signature;
+static int hf_nano_block_work;
+static int hf_nano_block_destination_account;
+static int hf_nano_block_balance;
+static int hf_nano_block_account;
+static int hf_nano_block_representative_account;
+static int hf_nano_block_link;
+
+static int hf_nano_vote_account;
+static int hf_nano_vote_signature;
+static int hf_nano_vote_sequence;
+
+static int hf_nano_bulk_pull_account;
+static int hf_nano_bulk_pull_block_hash_end;
+
+static int hf_nano_frontier_req_account;
+static int hf_nano_frontier_req_age;
+static int hf_nano_frontier_req_count;
+
+static int hf_nano_bulk_pull_blocks_min_hash;
+static int hf_nano_bulk_pull_blocks_max_hash;
+static int hf_nano_bulk_pull_blocks_mode;
+static int hf_nano_bulk_pull_blocks_max_count;
+
+static int hf_nano_bulk_push_block_type;
+
+static int hf_nano_bulk_pull_block_type;
+
+static int hf_nano_frontier_account;
+static int hf_nano_frontier_head_hash;
+
+static gint ett_nano;
+static gint ett_nano_header;
+static gint ett_nano_extensions;
+static gint ett_nano_peers;
 static gint ett_nano_peer_details[8];
-static gint ett_nano_block = -1;
-static gint ett_nano_vote = -1;
-static gint ett_nano_bulk_pull = -1;
-static gint ett_nano_frontier_req = -1;
-static gint ett_nano_bulk_pull_blocks = -1;
-static gint ett_nano_frontier = -1;
+static gint ett_nano_block;
+static gint ett_nano_vote;
+static gint ett_nano_bulk_pull;
+static gint ett_nano_frontier_req;
+static gint ett_nano_bulk_pull_blocks;
+static gint ett_nano_frontier;
 
 #define NANO_PACKET_TYPE_INVALID 0
 #define NANO_PACKET_TYPE_NOT_A_TYPE 1
diff --git a/epan/dissectors/packet-nas_5gs.c b/epan/dissectors/packet-nas_5gs.c
index 42a54b7130..ac315e4635 100644
--- a/epan/dissectors/packet-nas_5gs.c
+++ b/epan/dissectors/packet-nas_5gs.c
@@ -74,733 +74,733 @@ static dissector_handle_t ethernet_handle;
 #define PSNAME "NAS-5GS"
 #define PFNAME "nas-5gs"
 
-static int proto_json = -1;
-
-static int proto_nas_5gs = -1;
-
-int hf_nas_5gs_common_elem_id = -1;
-int hf_nas_5gs_mm_elem_id = -1;
-int hf_nas_5gs_sm_elem_id = -1;
-int hf_nas_5gs_updp_elem_id = -1;
-
-static int hf_nas_5gs_epd = -1;
-static int hf_nas_5gs_spare_bits = -1;
-static int hf_nas_5gs_spare_b7 = -1;
-static int hf_nas_5gs_spare_b6 = -1;
-static int hf_nas_5gs_spare_b5 = -1;
-static int hf_nas_5gs_spare_b4 = -1;
-static int hf_nas_5gs_spare_b3 = -1;
-static int hf_nas_5gs_spare_b2 = -1;
-static int hf_nas_5gs_spare_b1 = -1;
-static int hf_nas_5gs_spare_b0 = -1;
+static int proto_json;
+
+static int proto_nas_5gs;
+
+int hf_nas_5gs_common_elem_id;
+int hf_nas_5gs_mm_elem_id;
+int hf_nas_5gs_sm_elem_id;
+int hf_nas_5gs_updp_elem_id;
+
+static int hf_nas_5gs_epd;
+static int hf_nas_5gs_spare_bits;
+static int hf_nas_5gs_spare_b7;
+static int hf_nas_5gs_spare_b6;
+static int hf_nas_5gs_spare_b5;
+static int hf_nas_5gs_spare_b4;
+static int hf_nas_5gs_spare_b3;
+static int hf_nas_5gs_spare_b2;
+static int hf_nas_5gs_spare_b1;
+static int hf_nas_5gs_spare_b0;
 static int hf_nas_5gs_rfu_b2;
 static int hf_nas_5gs_rfu_b1;
 static int hf_nas_5gs_rfu_b0;
-static int hf_nas_5gs_security_header_type = -1;
-static int hf_nas_5gs_msg_auth_code = -1;
-static int hf_nas_5gs_seq_no = -1;
-static int hf_nas_5gs_mm_msg_type = -1;
-static int hf_nas_5gs_sm_msg_type = -1;
-static int hf_nas_5gs_updp_msg_type = -1;
-static int hf_nas_5gs_proc_trans_id = -1;
-static int hf_nas_5gs_spare_half_octet = -1;
-static int hf_nas_5gs_spare_octet = -1;
-static int hf_nas_5gs_pdu_session_id = -1;
-static int hf_nas_5gs_msg_elems = -1;
-static int hf_nas_5gs_mm_for = -1;
-static int hf_nas_5gs_cmn_add_info = -1;
-static int hf_nas_5gs_cmn_acc_type = -1;
-static int hf_nas_5gs_cmn_dnn = -1;
-static int hf_nas_5gs_cmn_service_level_aa_param_type = -1;
-static int hf_nas_5gs_cmn_service_level_aa_param_len = -1;
-static int hf_nas_5gs_cmn_service_level_aa_param_device_id = -1;
-static int hf_nas_5gs_cmn_service_level_aa_param_addr_type = -1;
-static int hf_nas_5gs_cmn_service_level_aa_param_addr_ipv4 = -1;
-static int hf_nas_5gs_cmn_service_level_aa_param_addr_ipv6 = -1;
-static int hf_nas_5gs_cmn_service_level_aa_param_addr_fqdn = -1;
-static int hf_nas_5gs_cmn_service_level_aa_param_resp_c2ar = -1;
-static int hf_nas_5gs_cmn_service_level_aa_param_resp_slar = -1;
-static int hf_nas_5gs_cmn_service_level_aa_param_payload_type = -1;
-static int hf_nas_5gs_cmn_service_level_aa_param_payload = -1;
-static int hf_nas_5gs_cmn_service_level_aa_param_pending_ind_slapi = -1;
-static int hf_nas_5gs_cmn_service_level_aa_param_service_status_ind_uas = -1;
-static int hf_nas_5gs_cmn_service_level_aa_param_unknown = -1;
-static int hf_nas_5gs_mm_sms_requested = -1;
-static int hf_nas_5gs_mm_ng_ran_rcu = -1;
-static int hf_nas_5gs_mm_5gs_pnb_ciot = -1;
-static int hf_nas_5gs_mm_eps_pnb_ciot = -1;
-static int hf_nas_5gs_mm_5gs_reg_type = -1;
-static int hf_nas_5gs_mm_tsc = -1;
-static int hf_nas_5gs_mm_nas_key_set_id = -1;
-static int hf_nas_5gs_mm_tsc_h1 = -1;
-static int hf_nas_5gs_mm_nas_key_set_id_h1 = -1;
-static int hf_nas_5gs_mm_5gmm_cause = -1;
-static int hf_nas_5gs_mm_pld_cont_type = -1;
-static int hf_nas_5gs_mm_sst = -1;
-static int hf_nas_5gs_mm_sd = -1;
-static int hf_nas_5gs_mm_mapped_hplmn_sst = -1;
-static int hf_nas_5gs_mm_mapped_hplmn_ssd = -1;
-static int hf_nas_5gs_mm_switch_off = -1;
-static int hf_nas_5gs_mm_re_reg_req = -1;
-static int hf_nas_5gs_mm_acc_type = -1;
-static int hf_nas_5gs_mm_raai_b0 = -1;
-static int hf_nas_5gs_mm_sprti_b1 = -1;
-static int hf_nas_5gs_mm_ma_pdu_session_info_value = -1;
-static int hf_nas_5gs_mm_len_of_mapped_s_nssai = -1;
-static int hf_nas_5gs_mm_conf_upd_ind_ack_b0 = -1;
-static int hf_nas_5gs_mm_conf_upd_ind_red_b1 = -1;
-static int hf_nas_5gs_mm_cag_info_entry_len = -1;
-static int hf_nas_5gs_mm_cag_info_entry_cag_only = -1;
-static int hf_nas_5gs_mm_cag_info_entry_cag_id = -1;
-static int hf_nas_5gs_mm_ciot_small_data_cont_data_type = -1;
-static int hf_nas_5gs_mm_ciot_small_data_cont_ddx = -1;
-static int hf_nas_5gs_mm_ciot_small_data_cont_pdu_session_id = -1;
-static int hf_nas_5gs_mm_ciot_small_data_cont_add_info_len = -1;
-static int hf_nas_5gs_mm_ciot_small_data_cont_add_info = -1;
-static int hf_nas_5gs_mm_ciot_small_data_cont_data_contents = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_1 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_2 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_3 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_4 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_5 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_6 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_7 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_8 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_1 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_2 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_3 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_4 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_5 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_6 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_7 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_8 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_9 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_10 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_11 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_12 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_13 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_14 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_15 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_16 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_17 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_18 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_19 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_20 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_21 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_22 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_23 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_24 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_25 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_3_1 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_4_1 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_5_1 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_1 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_2 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_3 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_4 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_5 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_6 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_7 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_8 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_1 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_2 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_3 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_4 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_5 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_6 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_7 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_8 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_9 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_10 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_11 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_12 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_13 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_14 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_15 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_16 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_17 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_18 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_19 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_20 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_21 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_22 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_23 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_3_1 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_4_1 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_5_1 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_6_1 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_6_2 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_6_3 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_ciphering_set_id = -1;
-static int hf_nas_5gs_mm_ciph_key_data_ciphering_key = -1;
-static int hf_nas_5gs_mm_ciph_key_data_c0_len = -1;
-static int hf_nas_5gs_mm_ciph_key_data_c0 = -1;
-static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_len = -1;
-static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_len = -1;
-static int hf_nas_5gs_mm_ciph_key_data_validity_start_time = -1;
-static int hf_nas_5gs_mm_ciph_key_data_validity_duration = -1;
-static int hf_nas_5gs_mm_ciph_key_data_tais_list_len = -1;
-static int hf_nas_5gs_mm_ctrl_plane_serv_type = -1;
-static int hf_nas_5gs_mm_nas_sec_algo_enc = -1;
-static int hf_nas_5gs_mm_nas_sec_algo_ip = -1;
-static int hf_nas_5gs_mm_s1_mode_b0 = -1;
-static int hf_nas_5gs_mm_ho_attach_b1 = -1;
-static int hf_nas_5gs_mm_lpp_cap_b2 = -1;
-static int hf_nas_5gs_mm_restrict_ec_b3 = -1;
-static int hf_nas_5gs_mm_5g_cp_ciot_b4 = -1;
-static int hf_nas_5gs_mm_n3_data_b5 = -1;
-static int hf_nas_5gs_mm_5g_iphc_cp_ciot_b6 = -1;
-static int hf_nas_5gs_mm_sgc_b7 = -1;
-static int hf_nas_5gs_mm_5g_srvcc_b0 = -1;
-static int hf_nas_5gs_mm_5g_up_ciot_b1 = -1;
-static int hf_nas_5gs_mm_v2x_b2 = -1;
-static int hf_nas_5gs_mm_v2xcepc5_b3 = -1;
-static int hf_nas_5gs_mm_v2xcnpc5_b4 = -1;
-static int hf_nas_5gs_mm_5g_lcs_b5 = -1;
-static int hf_nas_5gs_mm_nssaa_b6 = -1;
-static int hf_nas_5gs_mm_racs_b7 = -1;
-static int hf_nas_5gs_mm_cag_b0 = -1;
-static int hf_nas_5gs_mm_wsusa_b1 = -1;
-static int hf_nas_5gs_mm_multiple_up_b2 = -1;
-static int hf_nas_5gs_mm_5g_ehc_cp_ciot_b3 = -1;
-static int hf_nas_5gs_mm_er_nssai_b4 = -1;
-static int hf_nas_5gs_mm_5g_prose_dd_b5 = -1;
-static int hf_nas_5gs_mm_5g_prose_dc_b6 = -1;
-static int hf_nas_5gs_mm_5g_prose_l2relay_b7 = -1;
-static int hf_nas_5gs_mm_5g_prose_l3relay_b0 = -1;
-static int hf_nas_5gs_mm_5g_prose_l2rmt_b1 = -1;
-static int hf_nas_5gs_mm_5g_prose_l3rmt_b2 = -1;
-static int hf_nas_5gs_mm_nr_pssi_b3 = -1;
-static int hf_nas_5gs_mm_ncr_b4 = -1;
-static int hf_nas_5gs_mm_piv_b5 = -1;
-static int hf_nas_5gs_mm_rpr_b6 = -1;
-static int hf_nas_5gs_mm_pr_b7 = -1;
-static int hf_nas_5gs_mm_nssrg_b0 = -1;
-static int hf_nas_5gs_mm_mint_b1 = -1;
-static int hf_nas_5gs_mm_event_notif_b2 = -1;
-static int hf_nas_5gs_mm_ssnpnsi_b3 = -1;
-static int hf_nas_5gs_mm_ex_cag_b4 = -1;
-static int hf_nas_5gs_mm_nsag_b5 = -1;
-static int hf_nas_5gs_mm_uas_b6 = -1;
-static int hf_nas_5gs_mm_mpsiu_b7 = -1;
-static int hf_nas_5gs_mm_rcmap_b0 = -1;
-static int hf_nas_5gs_mm_rcman_b1 = -1;
-static int hf_nas_5gs_mm_type_id = -1;
-static int hf_nas_5gs_mm_odd_even = -1;
-static int hf_nas_5gs_mm_length = -1;
-static int hf_nas_5gs_mm_pld_cont = -1;
-static int hf_nas_5gs_mm_pld_cont_event_notif_ind_nb = -1;
-static int hf_nas_5gs_mm_pld_cont_event_notif_ind_type = -1;
-static int hf_nas_5gs_mm_pld_cont_event_notif_ind_len = -1;
-static int hf_nas_5gs_mm_pld_cont_event_notif_ind_val = -1;
-static int hf_nas_5gs_mm_pld_cont_nb_entries = -1;
-static int hf_nas_5gs_mm_pld_cont_pld_cont_len = -1;
-static int hf_nas_5gs_mm_pld_cont_nb_opt_ies = -1;
-static int hf_nas_5gs_mm_pld_cont_pld_cont_type = -1;
-static int hf_nas_5gs_mm_pld_cont_opt_ie_type = -1;
-static int hf_nas_5gs_mm_pld_cont_opt_ie_len = -1;
-static int hf_nas_5gs_mm_pld_cont_opt_ie_val = -1;
-static int hf_nas_5gs_mm_req_type = -1;
-static int hf_nas_5gs_mm_serv_type = -1;
-static int hf_nas_5gs_mm_5g_ea0 = -1;
-static int hf_nas_5gs_mm_128_5g_ea1 = -1;
-static int hf_nas_5gs_mm_128_5g_ea2 = -1;
-static int hf_nas_5gs_mm_128_5g_ea3 = -1;
-static int hf_nas_5gs_mm_5g_ea4 = -1;
-static int hf_nas_5gs_mm_5g_ea5 = -1;
-static int hf_nas_5gs_mm_5g_ea6 = -1;
-static int hf_nas_5gs_mm_5g_ea7 = -1;
-static int hf_nas_5gs_mm_5g_ia0 = -1;
-static int hf_nas_5gs_mm_5g_128_ia1 = -1;
-static int hf_nas_5gs_mm_5g_128_ia2 = -1;
-static int hf_nas_5gs_mm_5g_128_ia3 = -1;
-static int hf_nas_5gs_mm_5g_ia4 = -1;
-static int hf_nas_5gs_mm_5g_ia5 = -1;
-static int hf_nas_5gs_mm_5g_ia6 = -1;
-static int hf_nas_5gs_mm_5g_ia7 = -1;
-static int hf_nas_5gs_mm_eea0 = -1;
-static int hf_nas_5gs_mm_128eea1 = -1;
-static int hf_nas_5gs_mm_128eea2 = -1;
-static int hf_nas_5gs_mm_eea3 = -1;
-static int hf_nas_5gs_mm_eea4 = -1;
-static int hf_nas_5gs_mm_eea5 = -1;
-static int hf_nas_5gs_mm_eea6 = -1;
-static int hf_nas_5gs_mm_eea7 = -1;
-static int hf_nas_5gs_mm_eia0 = -1;
-static int hf_nas_5gs_mm_128eia1 = -1;
-static int hf_nas_5gs_mm_128eia2 = -1;
-static int hf_nas_5gs_mm_eia3 = -1;
-static int hf_nas_5gs_mm_eia4 = -1;
-static int hf_nas_5gs_mm_eia5 = -1;
-static int hf_nas_5gs_mm_eia6 = -1;
-static int hf_nas_5gs_mm_eia7 = -1;
-static int hf_nas_5gs_mm_n1_mode_reg_b1 = -1;
-static int hf_nas_5gs_mm_s1_mode_reg_b0 = -1;
-
-static int hf_nas_5gs_mm_sal_al_t = -1;
-static int hf_nas_5gs_mm_sal_t_li = -1;
-static int hf_nas_5gs_mm_sal_num_e = -1;
-
-static int hf_nas_5gs_pdu_ses_sts_psi_7_b7 = -1;
-static int hf_nas_5gs_pdu_ses_sts_psi_6_b6 = -1;
-static int hf_nas_5gs_pdu_ses_sts_psi_5_b5 = -1;
-static int hf_nas_5gs_pdu_ses_sts_psi_4_b4 = -1;
-static int hf_nas_5gs_pdu_ses_sts_psi_3_b3 = -1;
-static int hf_nas_5gs_pdu_ses_sts_psi_2_b2 = -1;
-static int hf_nas_5gs_pdu_ses_sts_psi_1_b1 = -1;
-static int hf_nas_5gs_pdu_ses_sts_psi_0_b0 = -1;
-
-static int hf_nas_5gs_pdu_ses_sts_psi_15_b7 = -1;
-static int hf_nas_5gs_pdu_ses_sts_psi_14_b6 = -1;
-static int hf_nas_5gs_pdu_ses_sts_psi_13_b5 = -1;
-static int hf_nas_5gs_pdu_ses_sts_psi_12_b4 = -1;
-static int hf_nas_5gs_pdu_ses_sts_psi_11_b3 = -1;
-static int hf_nas_5gs_pdu_ses_sts_psi_10_b2 = -1;
-static int hf_nas_5gs_pdu_ses_sts_psi_9_b1 = -1;
-static int hf_nas_5gs_pdu_ses_sts_psi_8_b0 = -1;
-
-static int hf_nas_5gs_pdu_ses_rect_res_psi_7_b7 = -1;
-static int hf_nas_5gs_pdu_ses_rect_res_psi_6_b6 = -1;
-static int hf_nas_5gs_pdu_ses_rect_res_psi_5_b5 = -1;
-static int hf_nas_5gs_pdu_ses_rect_res_psi_4_b4 = -1;
-static int hf_nas_5gs_pdu_ses_rect_res_psi_3_b3 = -1;
-static int hf_nas_5gs_pdu_ses_rect_res_psi_2_b2 = -1;
-static int hf_nas_5gs_pdu_ses_rect_res_psi_1_b1 = -1;
-static int hf_nas_5gs_pdu_ses_rect_res_psi_0_b0 = -1;
-
-static int hf_nas_5gs_pdu_ses_rect_res_psi_15_b7 = -1;
-static int hf_nas_5gs_pdu_ses_rect_res_psi_14_b6 = -1;
-static int hf_nas_5gs_pdu_ses_rect_res_psi_13_b5 = -1;
-static int hf_nas_5gs_pdu_ses_rect_res_psi_12_b4 = -1;
-static int hf_nas_5gs_pdu_ses_rect_res_psi_11_b3 = -1;
-static int hf_nas_5gs_pdu_ses_rect_res_psi_10_b2 = -1;
-static int hf_nas_5gs_pdu_ses_rect_res_psi_9_b1 = -1;
-static int hf_nas_5gs_pdu_ses_rect_res_psi_8_b0 = -1;
-
-static int hf_nas_5gs_ul_data_sts_psi_7_b7 = -1;
-static int hf_nas_5gs_ul_data_sts_psi_6_b6 = -1;
-static int hf_nas_5gs_ul_data_sts_psi_5_b5 = -1;
-static int hf_nas_5gs_ul_data_sts_psi_4_b4 = -1;
-static int hf_nas_5gs_ul_data_sts_psi_3_b3 = -1;
-static int hf_nas_5gs_ul_data_sts_psi_2_b2 = -1;
-static int hf_nas_5gs_ul_data_sts_psi_1_b1 = -1;
-static int hf_nas_5gs_ul_data_sts_psi_0_b0 = -1;
-
-static int hf_nas_5gs_ul_data_sts_psi_15_b7 = -1;
-static int hf_nas_5gs_ul_data_sts_psi_14_b6 = -1;
-static int hf_nas_5gs_ul_data_sts_psi_13_b5 = -1;
-static int hf_nas_5gs_ul_data_sts_psi_12_b4 = -1;
-static int hf_nas_5gs_ul_data_sts_psi_11_b3 = -1;
-static int hf_nas_5gs_ul_data_sts_psi_10_b2 = -1;
-static int hf_nas_5gs_ul_data_sts_psi_9_b1 = -1;
-static int hf_nas_5gs_ul_data_sts_psi_8_b0 = -1;
-
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_7_b7 = -1;
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_6_b6 = -1;
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_5_b5 = -1;
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_4_b4 = -1;
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_3_b3 = -1;
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_2_b2 = -1;
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_1_b1 = -1;
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_0_b0 = -1;
-
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_15_b7 = -1;
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_14_b6 = -1;
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_13_b5 = -1;
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_12_b4 = -1;
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_11_b3 = -1;
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_10_b2 = -1;
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_9_b1 = -1;
-static int hf_nas_5gs_allow_pdu_ses_sts_psi_8_b0 = -1;
-
-static int hf_nas_5gs_sm_pdu_session_type = -1;
-static int hf_nas_5gs_sm_sc_mode = -1;
-static int hf_nas_5gs_sm_eplmnc = -1;
-static int hf_nas_5gs_sm_ratc = -1;
-static int hf_nas_5gs_sm_ept_s1 = -1;
-static int hf_nas_5gs_sm_catbo = -1;
-static int hf_nas_5gs_sm_abo = -1;
-static int hf_nas_5gs_sm_atsss_cont = -1;
-static int hf_nas_5gs_sm_cpoi = -1;
-static int hf_nas_5gs_sm_ip_hdr_comp_config_p0104 = -1;
-static int hf_nas_5gs_sm_ip_hdr_comp_config_p0103 = -1;
-static int hf_nas_5gs_sm_ip_hdr_comp_config_p0102 = -1;
-static int hf_nas_5gs_sm_ip_hdr_comp_config_p0006 = -1;
-static int hf_nas_5gs_sm_ip_hdr_comp_config_p0004 = -1;
-static int hf_nas_5gs_sm_ip_hdr_comp_config_p0003 = -1;
-static int hf_nas_5gs_sm_ip_hdr_comp_config_p0002 = -1;
-static int hf_nas_5gs_sm_ip_hdr_comp_config_max_cid = -1;
-static int hf_nas_5gs_sm_ip_hdr_comp_config_add_ip_hdr_compr_cxt_setup_params_type = -1;
-static int hf_nas_5gs_sm_ip_hdr_comp_config_add_ip_hdr_compr_cxt_setup_params_cont = -1;
-static int hf_nas_5gs_sm_ds_tt_eth_port_mac_addr = -1;
-static int hf_nas_5gs_sm_ue_ds_tt_residence_time = -1;
-static int hf_nas_5gs_sm_port_mgmt_info_cont = -1;
-static int hf_nas_5gs_sm_eth_hdr_comp_config_cid_len = -1;
-static int hf_nas_5gs_sm_pdu_session_pair_id = -1;
-static int hf_nas_5gs_sm_pdu_session_rsn = -1;
-static int hf_nas_5gs_sm_sel_sc_mode = -1;
-static int hf_nas_5gs_sm_tpmic_b7 = -1;
-static int hf_nas_5gs_sm_atsss_st_b3_b6 = -1;
-static int hf_nas_5gs_sm_ept_s1_b2 = -1;
-static int hf_nas_5gs_sm_mh6_pdu_b1 = -1;
-static int hf_nas_5gs_sm_rqos_b0 = -1;
-static int hf_nas_5gs_sm_apmqf_b0 = -1;
-static int hf_nas_5gs_sm_5gsm_cause = -1;
-static int hf_nas_5gs_sm_apsi = -1;
-static int hf_nas_5gs_sm_apsr = -1;
-static int hf_nas_5gs_sm_int_prot_max_data_rate_ul = -1;
-static int hf_nas_5gs_sm_int_prot_max_data_rate_dl = -1;
-static int hf_nas_5gs_sm_si6lla = -1;
-static int hf_nas_5gs_sm_pdu_ses_type = -1;
-static int hf_nas_5gs_sm_pdu_addr_inf_ipv4 = -1;
-static int hf_nas_5gs_sm_pdu_addr_inf_ipv6 = -1;
-static int hf_nas_5gs_sm_smf_ipv6_lla = -1;
-static int hf_nas_5gs_sm_qos_rule_id = -1;
-static int hf_nas_5gs_sm_length = -1;
-static int hf_nas_5gs_sm_rop = -1;
-static int hf_nas_5gs_sm_dqr = -1;
-static int hf_nas_5gs_sm_nof_pkt_filters = -1;
-static int hf_nas_5gs_sm_pkt_flt_id = -1;
-static int hf_nas_5gs_sm_pkt_flt_dir = -1;
-static int hf_nas_5gs_sm_pf_len = -1;
-static int hf_nas_5gs_sm_pf_type = -1;
-static int hf_nas_5gs_sm_e = -1;
-static int hf_nas_5gs_sm_nof_params = -1;
-static int hf_nas_5gs_sm_param_id = -1;
-static int hf_nas_5gs_sm_param_len = -1;
-static int hf_nas_5gs_sm_qos_rule_precedence = -1;
-static int hf_nas_5gs_sm_segregation = -1;
-static int hf_nas_5gs_sm_param_cont = -1;
-static int hf_nas_5gs_sm_5qi = -1;
-static int hf_nas_5gs_sm_unit_for_gfbr_ul = -1;
-static int hf_nas_5gs_sm_gfbr_ul = -1;
-static int hf_nas_5gs_sm_unit_for_gfbr_dl = -1;
-static int hf_nas_5gs_sm_gfbr_dl = -1;
-static int hf_nas_5gs_sm_unit_for_mfbr_ul = -1;
-static int hf_nas_5gs_sm_mfbr_ul = -1;
-static int hf_nas_5gs_sm_unit_for_mfbr_dl = -1;
-static int hf_nas_5gs_sm_mfbr_dl = -1;
-static int hf_nas_5gs_sm_averaging_window = -1;
-static int hf_nas_5gs_sm_eps_bearer_id = -1;
-static int hf_nas_5gs_sm_qfi = -1;
-static int hf_nas_5gs_sm_mapd_eps_b_cont_id = -1;
-static int hf_nas_5gs_sm_mapd_eps_b_cont_opt_code = -1;
-static int hf_nas_5gs_sm_qos_des_flow_opt_code = -1;
-static int hf_nas_5gs_sm_mapd_eps_b_cont_E = -1;
-static int hf_nas_5gs_sm_mapd_eps_b_cont_num_eps_parms = -1;
-static int hf_nas_5gs_sm_mapd_eps_b_cont_E_mod = -1;
-static int hf_nas_5gs_sm_mapd_eps_b_cont_param_id = -1;
-
-static int hf_nas_5gs_sm_unit_for_session_ambr_dl = -1;
-static int hf_nas_5gs_sm_session_ambr_dl = -1;
-static int hf_nas_5gs_sm_unit_for_session_ambr_ul = -1;
-static int hf_nas_5gs_sm_session_ambr_ul = -1;
-static int hf_nas_5gs_sm_dm_spec_id = -1;
-static int hf_nas_5gs_sm_all_ssc_mode_b0 = -1;
-static int hf_nas_5gs_sm_all_ssc_mode_b1 = -1;
-static int hf_nas_5gs_sm_all_ssc_mode_b2 = -1;
-static int hf_nas_5gs_addr_mask_ipv4 = -1;
-static int hf_nas_5gs_ipv6 = -1;
-static int hf_nas_5gs_ipv6_prefix_len = -1;
-static int hf_nas_5gs_protocol_identifier_or_next_hd = -1;
-static int hf_nas_5gs_mm_rinmr = -1;
-static int hf_nas_5gs_mm_hdp = -1;
-static int hf_nas_5gs_mm_cipher_key = -1;
-static int hf_nas_5gs_mm_dcni = -1;
-static int hf_nas_5gs_mm_nssci = -1;
-static int hf_nas_5gs_mm_nssai_inc_mode = -1;
-static int hf_nas_5gs_mm_ue_usage_setting = -1;
-static int hf_nas_5gs_mm_5gs_drx_param = -1;
-static int hf_nas_5gs_sup_andsp = -1;
-static int hf_nas_5gs_nssui = -1;
-
-static int ett_nas_5gs = -1;
-static int ett_nas_5gs_mm_nssai = -1;
-static int ett_nas_5gs_mm_pdu_ses_id = -1;
-static int ett_nas_5gs_sm_qos_rules = -1;
-static int ett_nas_5gs_sm_qos_params = -1;
-static int ett_nas_5gs_plain = -1;
-static int ett_nas_5gs_sec = -1;
-static int ett_nas_5gs_mm_part_sal = -1;
-static int ett_nas_5gs_mm_part_tal = -1;
-static int ett_nas_5gs_sm_mapd_eps_b_cont = -1;
-static int ett_nas_5gs_sm_mapd_eps_b_cont_params_list = -1;
-static int ett_nas_5gs_enc = -1;
-static int ett_nas_5gs_mm_ladn_indic = -1;
-static int ett_nas_5gs_mm_sor = -1;
-static int ett_nas_5gs_sm_pkt_filter_components = -1;
-static int ett_nas_5gs_updp_ue_policy_section_mgm_lst = -1;
-static int ett_nas_5gs_updp_ue_policy_section_mgm_sublst = -1;
-static int ett_nas_5gs_ue_policies_ursp = -1;
-static int ett_nas_5gs_ursp_traff_desc = -1;
-static int ett_nas_5gs_usrp_r_sel_list = -1;
-static int ett_nas_5gs_usrp_r_sel = -1;
-static int ett_nas_5gs_ursp_r_sel_desc_cont = -1;
-static int ett_nas_5gs_updp_upsi_list = -1;
-static int ett_nas_5gs_mm_rej_nssai = -1;
-static int ett_nas_5gs_mm_scheme_output = -1;
-static int ett_nas_5gs_mm_pld_cont_pld_entry = -1;
-static int ett_nas_5gs_mm_pld_cont_opt_ie = -1;
-static int ett_nas_5gs_mm_cag_info_entry = -1;
-static int ett_nas_5gs_ciot_small_data_cont_data_contents = -1;
-static int ett_nas_5gs_user_data_cont = -1;
-static int ett_nas_5gs_ciph_data_set = -1;
-static int ett_nas_5gs_mm_mapped_nssai = -1;
-static int ett_nas_5gs_mm_partial_extended_rejected_nssai_list = -1;
-static int ett_nas_5gs_mm_ext_rej_nssai = -1;
-static int ett_nas_5gs_mm_op_def_acc_cat_def = -1;
-static int ett_nas_5gs_mm_op_def_acc_cat_criteria_component = -1;
-static int ett_nas_5gs_mm_op_def_acc_cat_criteria = -1;
-static int ett_nas_5gs_cmn_service_level_aa_cont_param = -1;
-static int ett_nas_5gs_mm_pld_cont_event_notif_ind = -1;
-static int ett_nas_5gs_mm_peips_assist_info = -1;
-static int ett_nas_5gs_mm_nssrg_info = -1;
-static int ett_nas_5gs_mm_plmns_list_disaster_cond = -1;
-static int ett_nas_5gs_mm_reg_wait_range = -1;
-static int ett_nas_5gs_mm_nsag_info = -1;
-
-static int hf_nas_5gs_mm_abba = -1;
-static int hf_nas_5gs_mm_supi_fmt = -1;
-static int hf_nas_5gs_mm_routing_indicator = -1;
-static int hf_nas_5gs_mm_prot_scheme_id = -1;
-static int hf_nas_5gs_mm_pki = -1;
-static int hf_nas_5gs_mm_suci_msin = -1;
-static int hf_nas_5gs_mm_scheme_output = -1;
-static int hf_nas_5gs_mm_scheme_output_ecc_public_key = -1;
-static int hf_nas_5gs_mm_scheme_output_ciphertext = -1;
-static int hf_nas_5gs_mm_scheme_output_mac_tag = -1;
-static int hf_nas_5gs_mm_suci_nai = -1;
-static int hf_nas_5gs_mm_imei = -1;
-static int hf_nas_5gs_mm_imeisv = -1;
-static int hf_nas_5gs_mm_mauri = -1;
-static int hf_nas_5gs_mm_mac_addr = -1;
-static int hf_nas_5gs_mm_eui_64 = -1;
-static int hf_nas_5gs_mm_reg_res_res = -1;
-static int hf_nas_5gs_mm_reg_res_sms_allowed = -1;
-static int hf_nas_5gs_mm_reg_res_nssaa_perf = -1;
-static int hf_nas_5gs_mm_reg_res_emergency_reg = -1;
-static int hf_nas_5gs_mm_reg_res_disaster_roaming_reg_res = -1;
-static int hf_nas_5gs_amf_region_id = -1;
-static int hf_nas_5gs_amf_set_id = -1;
-static int hf_nas_5gs_amf_pointer = -1;
-static int hf_nas_5gs_5g_tmsi = -1;
-static int hf_nas_5gs_mm_op_def_access_cat_len = -1;
-static int hf_nas_5gs_mm_op_def_access_cat_precedence = -1;
-static int hf_nas_5gs_mm_op_def_access_cat_psac = -1;
-static int hf_nas_5gs_mm_op_def_access_cat_number = -1;
-static int hf_nas_5gs_mm_op_def_access_cat_criteria_length = -1;
-static int hf_nas_5gs_mm_op_def_access_cat_criteria_type = -1;
-static int hf_nas_5gs_mm_op_def_access_cat_criteria_dnn_count = -1;
-static int hf_nas_5gs_mm_op_def_access_cat_criteria_dnn_len = -1;
-static int hf_nas_5gs_mm_op_def_access_cat_criteria_os_id_os_app_id_count = -1;
-static int hf_nas_5gs_mm_op_def_access_cat_criteria_os_id = -1;
-static int hf_nas_5gs_mm_op_def_access_cat_criteria_os_app_id_len = -1;
-static int hf_nas_5gs_mm_op_def_access_cat_criteria_os_app_id = -1;
-static int hf_nas_5gs_mm_op_def_access_cat_criteria_s_nssai_count = -1;
-static int hf_nas_5gs_mm_op_def_access_cat_criteria_s_nssai_len = -1;
-static int hf_nas_5gs_mm_op_def_access_cat_standardized_number = -1;
-static int hf_nas_5gs_mm_sms_indic_sai = -1;
-
-static int hf_nas_5gs_nw_feat_sup_mpsi_b7 = -1;
-static int hf_nas_5gs_nw_feat_sup_ims_iwk_n26_b6 = -1;
-static int hf_nas_5gs_nw_feat_sup_ims_emf_b5b4 = -1;
-static int hf_nas_5gs_nw_feat_sup_ims_emc_b3b2 = -1;
-static int hf_nas_5gs_nw_feat_sup_ims_vops_3gpp = -1;
-static int hf_nas_5gs_nw_feat_sup_ims_vops_n3gpp = -1;
-static int hf_nas_5gs_nw_feat_sup_emcn3 = -1;
-static int hf_nas_5gs_nw_feat_sup_mcsi = -1;
-static int hf_nas_5gs_nw_feat_sup_restrict_ec = -1;
-static int hf_nas_5gs_nw_feat_sup_5g_cp_ciot = -1;
-static int hf_nas_5gs_nw_feat_sup_n3_data = -1;
-static int hf_nas_5gs_nw_feat_sup_5g_iphc_cp_ciot = -1;
-static int hf_nas_5gs_nw_feat_sup_5g_ciot_up = -1;
-static int hf_nas_5gs_nw_feat_sup_5g_lcs = -1;
-static int hf_nas_5gs_nw_feat_sup_ats_ind = -1;
-static int hf_nas_5gs_nw_feat_sup_5g_ehc_cp_ciot = -1;
-static int hf_nas_5gs_nw_feat_sup_ncr = -1;
-static int hf_nas_5gs_nw_feat_sup_piv = -1;
-static int hf_nas_5gs_nw_feat_sup_rpr = -1;
-static int hf_nas_5gs_nw_feat_sup_pr = -1;
-
-static int hf_nas_5gs_tac = -1;
-
-static int hf_nas_5gs_mm_tal_t_li = -1;
-static int hf_nas_5gs_mm_tal_num_e = -1;
-static int hf_nas_5gs_sm_mapd_eps_b_cont_eps_param_cont = -1;
-
-static int hf_nas_5gs_sm_max_nb_sup_pkt_flt_nb = -1;
-static int hf_nas_5gs_sm_max_nb_sup_pkt_flt_spare = -1;
-
-static int hf_nas_5gs_kacf = -1;
-static int hf_nas_5gs_ncc = -1;
-
-static int hf_nas_5gs_sor_hdr0_ap = -1;
-static int hf_nas_5gs_sor_hdr0_ack = -1;
-static int hf_nas_5gs_sor_hdr0_list_type = -1;
-static int hf_nas_5gs_sor_hdr0_list_ind = -1;
-static int hf_nas_5gs_sor_hdr0_sor_data_type = -1;
-static int hf_nas_5gs_sor_mssnpnsi = -1;
-static int hf_nas_5gs_sor_hdr0_mssi = -1;
-static int hf_nas_5gs_sor_mac_iue = -1;
-static int hf_nas_5gs_sor_mac_iausf = -1;
-static int hf_nas_5gs_counter_sor = -1;
-static int hf_nas_5gs_sor_sec_pkt = -1;
-static int hf_nas_5gs_sor_sssi = -1;
-static int hf_nas_5gs_sor_sscmi = -1;
-static int hf_nas_5gs_sor_si = -1;
-static int hf_nas_5gs_sor_plmn_id_act_len = -1;
-static int hf_nas_5gs_sor_cmci_len = -1;
-static int hf_nas_5gs_sor_cmci_payload = -1;
-static int hf_nas_5gs_sor_snpn_si_len = -1;
-static int hf_nas_5gs_sor_snpn_si_payload = -1;
-
-static int hf_nas_5gs_access_tech_o1_b7 = -1;
-static int hf_nas_5gs_access_tech_o1_b6 = -1;
-static int hf_nas_5gs_access_tech_o1_b5 = -1;
-static int hf_nas_5gs_access_tech_o1_b4 = -1;
-static int hf_nas_5gs_access_tech_o1_b3 = -1;
-static int hf_nas_5gs_access_tech_o2_b7 = -1;
-static int hf_nas_5gs_access_tech_o2_b6 = -1;
-static int hf_nas_5gs_access_tech_o2_b5 = -1;
-static int hf_nas_5gs_access_tech_o2_b4 = -1;
-static int hf_nas_5gs_access_tech_o2_b3 = -1;
-static int hf_nas_5gs_access_tech_o2_b2 = -1;
-static int hf_nas_5gs_single_port_type = -1;
-static int hf_nas_5gs_port_range_type_low = -1;
-static int hf_nas_5gs_port_range_type_high = -1;
-static int hf_nas_5gs_sec_param_idx = -1;
-static int hf_nas_5gs_tos_tc_val = -1;
-static int hf_nas_5gs_tos_tc_mask = -1;
-static int hf_nas_5gs_flow_label = -1;
-static int hf_nas_5gs_mac_addr = -1;
-static int hf_nas_5gs_vlan_tag_vid = -1;
-static int hf_nas_5gs_vlan_tag_pcp = -1;
-static int hf_nas_5gs_vlan_tag_dei = -1;
-static int hf_nas_5gs_ethertype = -1;
-static int hf_nas_5gs_mac_addr_low = -1;
-static int hf_nas_5gs_mac_addr_high = -1;
-static int hf_nas_5gs_updp_ue_pol_sect_sublst_len = -1;
-static int hf_nas_5gs_updp_ue_pol_sect_subresult_len = -1;
-static int hf_nas_5gs_updp_instr_len = -1;
-static int hf_nas_5gs_updp_upsc = -1;
-static int hf_nas_5gs_updp_failed_instruction_order = -1;
-static int hf_nas_5gs_updp_policy_len = -1;
-static int hf_nas_5gs_updp_ue_policy_part_type = -1;
-static int hf_nas_5gs_updp_ue_policy_part_cont = -1;
-static int hf_nas_5gs_ursp_rule_len = -1;
-static int hf_nas_5gs_ursp_rule_prec = -1;
-static int hf_nas_5gs_ursp_traff_desc_lst_len = -1;
-static int hf_nas_5gs_ursp_traff_desc = -1;
-static int hf_nas_5gs_ursp_r_sel_desc_lst_len = -1;
-static int hf_nas_5gs_ursp_r_sel_desc_lst = -1;
-static int hf_nas_5gs_ursp_traff_desc_ipv4 = -1;
-static int hf_nas_5gs_ursp_traff_desc_ipv4_mask = -1;
-static int hf_nas_5gs_ursp_traff_desc_ipv6 = -1;
-static int hf_nas_5gs_ursp_traff_desc_ipv6_prefix_len = -1;
-static int hf_nas_5gs_ursp_traff_desc_next_hdr = -1;
-static int hf_nas_5gs_ursp_traff_desc_single_remote_port = -1;
-static int hf_nas_5gs_ursp_traff_desc_remote_port_range_low = -1;
-static int hf_nas_5gs_ursp_traff_desc_remote_port_range_high = -1;
-static int hf_nas_5gs_ursp_traff_desc_sec_param_index = -1;
-static int hf_nas_5gs_ursp_traff_desc_tos_tc = -1;
-static int hf_nas_5gs_ursp_traff_desc_tos_tc_mask = -1;
-static int hf_nas_5gs_ursp_traff_desc_flow_label = -1;
-static int hf_nas_5gs_ursp_traff_desc_dest_mac_addr = -1;
-static int hf_nas_5gs_ursp_traff_desc_ctag_vid = -1;
-static int hf_nas_5gs_ursp_traff_desc_stag_vid = -1;
-static int hf_nas_5gs_ursp_traff_desc_ctag_pcp= -1;
-static int hf_nas_5gs_ursp_traff_desc_ctag_dei = -1;
-static int hf_nas_5gs_ursp_traff_desc_stag_pcp = -1;
-static int hf_nas_5gs_ursp_traff_desc_stag_dei = -1;
-static int hf_nas_5gs_ursp_traff_desc_ethertype = -1;
-static int hf_nas_5gs_ursp_traff_desc_conn_cap_len = -1;
-static int hf_nas_5gs_ursp_traff_desc_conn_cap = -1;
-static int hf_nas_5gs_ursp_traff_desc_dest_fqdn_len = -1;
-static int hf_nas_5gs_ursp_traff_desc_dest_fqdn = -1;
-static int hf_nas_5gs_ursp_traff_desc_dest_mac_addr_range_low = -1;
-static int hf_nas_5gs_ursp_traff_desc_dest_mac_addr_range_high = -1;
-static int hf_nas_5gs_ursp_traff_desc_len = -1;
-static int hf_nas_5gs_ursp_r_sel_des_prec = -1;
-static int hf_nas_5gs_ursp_r_sel_des_cont_len = -1;
-static int hf_nas_5gs_ursp_ursp_r_sel_desc_comp_type = -1;
-static int hf_nas_5gs_dnn_len = -1;
-static int hf_nas_5gs_upsi_sublist_len = -1;
-static int hf_nas_5gs_upsc = -1;
-static int hf_nas_5gs_os_id = -1;
-static int hf_nas_5gs_upds_cause = -1;
-static int hf_nas_5gs_v2xuui = -1;
-static int hf_nas_5gs_v2xpc5i = -1;
-static int hf_nas_5gs_os_app_id_len = -1;
-static int hf_nas_5gs_os_app_id = -1;
-static int hf_nas_5gs_mm_len_of_rej_s_nssai = -1;
-static int hf_nas_5gs_mm_rej_s_nssai_cause = -1;
-static int hf_nas_5gs_mm_ue_radio_cap_id = -1;
-static int hf_nas_5gs_mm_ue_radio_cap_id_del_req = -1;
-static int hf_nas_5gs_mm_trunc_amf_set_id = -1;
-static int hf_nas_5gs_mm_trunc_amf_pointer = -1;
-static int hf_nas_5gs_mm_n5gcreg_b0 = -1;
-static int hf_nas_5gs_mm_nb_n1_drx_value = -1;
-static int hf_nas_5gs_mm_scmr = -1;
-static int hf_nas_5gs_mm_extended_rejected_s_nssai_number_of_element = -1;
-static int hf_nas_5gs_mm_extended_rejected_s_nssai_type_of_list = -1;
-static int hf_nas_5gs_mm_extended_rejected_s_nssai_spare = -1;
-static int hf_nas_5gs_mm_extended_rejected_s_nssai_back_off_timer = -1;
-static int hf_nas_5gs_mm_len_of_rejected_s_nssai = -1;
-static int hf_nas_5gs_mm_rejected_s_nssai_cause_value = -1;
-static int hf_nas_5gs_mm_paging_restriction_type = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_7 = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_6 = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_5 = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_4 = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_3 = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_2 = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_1 = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_0 = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_15 = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_14 = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_13 = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_12 = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_11 = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_10 = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_9 = -1;
-static int hf_nas_5gs_mm_paging_restriction_psi_8 = -1;
-static int hf_nas_5gs_mm_nid_assign_mode = -1;
-static int hf_nas_5gs_mm_nid_value = -1;
-static int hf_nas_5gs_mm_peips_assist_info_type = -1;
-static int hf_nas_5gs_mm_peips_assist_info_paging_subgroup_id = -1;
-static int hf_nas_5gs_mm_peips_assist_info_ue_paging_probability_info = -1;
-static int hf_nas_5gs_mm_add_req_res_prd = -1;
-static int hf_nas_5gs_mm_nssrg_info_len = -1;
-static int hf_nas_5gs_mm_nssrg_info_s_nssai_len = -1;
-static int hf_nas_5gs_mm_nssrg_info_nssrg = -1;
-static int hf_nas_5gs_mm_nsag_info_len = -1;
-static int hf_nas_5gs_mm_nsag_id = -1;
-static int hf_nas_5gs_mm_nsag_info_s_nssai_len = -1;
-static int hf_nas_5gs_mm_nsag_prio = -1;
-static int hf_nas_5gs_mm_nsag_tais_list_len = -1;
-static int hf_nas_5gs_mm_prose_relay_trans_id = -1;
-static int hf_nas_5gs_mm_relay_key_req_params_relay_service_code = -1;
-static int hf_nas_5gs_mm_relay_key_req_params_nonce_1 = -1;
-static int hf_nas_5gs_mm_relay_key_req_params_ruit = -1;
-static int hf_nas_5gs_mm_relay_key_req_params_remote_ue_id = -1;
-static int hf_nas_5gs_mm_relay_key_resp_params_key_knr_prose = -1;
-static int hf_nas_5gs_mm_relay_key_resp_params_nonce_2 = -1;
-static int hf_nas_5gs_mm_relay_key_resp_params_cp_pruk_id = -1;
-static int hf_nas_5gs_mm_prio_ind_mpsi = -1;
-static int hf_nas_5gs_ue_os_id = -1;
-
-static expert_field ei_nas_5gs_extraneous_data = EI_INIT;
-static expert_field ei_nas_5gs_unknown_pd = EI_INIT;
-static expert_field ei_nas_5gs_mm_unknown_msg_type = EI_INIT;
-static expert_field ei_nas_5gs_sm_unknown_msg_type = EI_INIT;
-static expert_field ei_nas_5gs_updp_unknown_msg_type = EI_INIT;
-static expert_field ei_nas_5gs_msg_not_dis = EI_INIT;
-static expert_field ei_nas_5gs_ie_not_dis = EI_INIT;
-static expert_field ei_nas_5gs_missing_mandatory_element = EI_INIT;
-static expert_field ei_nas_5gs_dnn_too_long = EI_INIT;
-static expert_field ei_nas_5gs_unknown_value = EI_INIT;
-static expert_field ei_nas_5gs_num_pkt_flt = EI_INIT;
-static expert_field ei_nas_5gs_not_diss = EI_INIT;
+static int hf_nas_5gs_security_header_type;
+static int hf_nas_5gs_msg_auth_code;
+static int hf_nas_5gs_seq_no;
+static int hf_nas_5gs_mm_msg_type;
+static int hf_nas_5gs_sm_msg_type;
+static int hf_nas_5gs_updp_msg_type;
+static int hf_nas_5gs_proc_trans_id;
+static int hf_nas_5gs_spare_half_octet;
+static int hf_nas_5gs_spare_octet;
+static int hf_nas_5gs_pdu_session_id;
+static int hf_nas_5gs_msg_elems;
+static int hf_nas_5gs_mm_for;
+static int hf_nas_5gs_cmn_add_info;
+static int hf_nas_5gs_cmn_acc_type;
+static int hf_nas_5gs_cmn_dnn;
+static int hf_nas_5gs_cmn_service_level_aa_param_type;
+static int hf_nas_5gs_cmn_service_level_aa_param_len;
+static int hf_nas_5gs_cmn_service_level_aa_param_device_id;
+static int hf_nas_5gs_cmn_service_level_aa_param_addr_type;
+static int hf_nas_5gs_cmn_service_level_aa_param_addr_ipv4;
+static int hf_nas_5gs_cmn_service_level_aa_param_addr_ipv6;
+static int hf_nas_5gs_cmn_service_level_aa_param_addr_fqdn;
+static int hf_nas_5gs_cmn_service_level_aa_param_resp_c2ar;
+static int hf_nas_5gs_cmn_service_level_aa_param_resp_slar;
+static int hf_nas_5gs_cmn_service_level_aa_param_payload_type;
+static int hf_nas_5gs_cmn_service_level_aa_param_payload;
+static int hf_nas_5gs_cmn_service_level_aa_param_pending_ind_slapi;
+static int hf_nas_5gs_cmn_service_level_aa_param_service_status_ind_uas;
+static int hf_nas_5gs_cmn_service_level_aa_param_unknown;
+static int hf_nas_5gs_mm_sms_requested;
+static int hf_nas_5gs_mm_ng_ran_rcu;
+static int hf_nas_5gs_mm_5gs_pnb_ciot;
+static int hf_nas_5gs_mm_eps_pnb_ciot;
+static int hf_nas_5gs_mm_5gs_reg_type;
+static int hf_nas_5gs_mm_tsc;
+static int hf_nas_5gs_mm_nas_key_set_id;
+static int hf_nas_5gs_mm_tsc_h1;
+static int hf_nas_5gs_mm_nas_key_set_id_h1;
+static int hf_nas_5gs_mm_5gmm_cause;
+static int hf_nas_5gs_mm_pld_cont_type;
+static int hf_nas_5gs_mm_sst;
+static int hf_nas_5gs_mm_sd;
+static int hf_nas_5gs_mm_mapped_hplmn_sst;
+static int hf_nas_5gs_mm_mapped_hplmn_ssd;
+static int hf_nas_5gs_mm_switch_off;
+static int hf_nas_5gs_mm_re_reg_req;
+static int hf_nas_5gs_mm_acc_type;
+static int hf_nas_5gs_mm_raai_b0;
+static int hf_nas_5gs_mm_sprti_b1;
+static int hf_nas_5gs_mm_ma_pdu_session_info_value;
+static int hf_nas_5gs_mm_len_of_mapped_s_nssai;
+static int hf_nas_5gs_mm_conf_upd_ind_ack_b0;
+static int hf_nas_5gs_mm_conf_upd_ind_red_b1;
+static int hf_nas_5gs_mm_cag_info_entry_len;
+static int hf_nas_5gs_mm_cag_info_entry_cag_only;
+static int hf_nas_5gs_mm_cag_info_entry_cag_id;
+static int hf_nas_5gs_mm_ciot_small_data_cont_data_type;
+static int hf_nas_5gs_mm_ciot_small_data_cont_ddx;
+static int hf_nas_5gs_mm_ciot_small_data_cont_pdu_session_id;
+static int hf_nas_5gs_mm_ciot_small_data_cont_add_info_len;
+static int hf_nas_5gs_mm_ciot_small_data_cont_add_info;
+static int hf_nas_5gs_mm_ciot_small_data_cont_data_contents;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_1;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_2;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_3;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_4;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_5;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_6;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_7;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_1_8;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_1;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_2;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_3;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_4;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_5;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_6;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_7;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_8;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_9;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_10;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_11;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_12;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_13;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_14;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_15;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_16;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_17;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_18;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_19;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_20;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_21;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_22;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_23;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_24;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_2_25;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_3_1;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_4_1;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_type_5_1;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_1;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_2;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_3;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_4;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_5;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_6;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_7;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_1_8;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_1;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_2;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_3;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_4;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_5;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_6;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_7;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_8;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_9;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_10;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_11;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_12;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_13;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_14;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_15;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_16;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_17;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_18;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_19;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_20;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_21;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_22;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_2_23;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_3_1;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_4_1;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_5_1;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_6_1;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_6_2;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_type_6_3;
+static int hf_nas_5gs_mm_ciph_key_data_ciphering_set_id;
+static int hf_nas_5gs_mm_ciph_key_data_ciphering_key;
+static int hf_nas_5gs_mm_ciph_key_data_c0_len;
+static int hf_nas_5gs_mm_ciph_key_data_c0;
+static int hf_nas_5gs_mm_ciph_key_data_eutra_pos_sib_len;
+static int hf_nas_5gs_mm_ciph_key_data_nr_pos_sib_len;
+static int hf_nas_5gs_mm_ciph_key_data_validity_start_time;
+static int hf_nas_5gs_mm_ciph_key_data_validity_duration;
+static int hf_nas_5gs_mm_ciph_key_data_tais_list_len;
+static int hf_nas_5gs_mm_ctrl_plane_serv_type;
+static int hf_nas_5gs_mm_nas_sec_algo_enc;
+static int hf_nas_5gs_mm_nas_sec_algo_ip;
+static int hf_nas_5gs_mm_s1_mode_b0;
+static int hf_nas_5gs_mm_ho_attach_b1;
+static int hf_nas_5gs_mm_lpp_cap_b2;
+static int hf_nas_5gs_mm_restrict_ec_b3;
+static int hf_nas_5gs_mm_5g_cp_ciot_b4;
+static int hf_nas_5gs_mm_n3_data_b5;
+static int hf_nas_5gs_mm_5g_iphc_cp_ciot_b6;
+static int hf_nas_5gs_mm_sgc_b7;
+static int hf_nas_5gs_mm_5g_srvcc_b0;
+static int hf_nas_5gs_mm_5g_up_ciot_b1;
+static int hf_nas_5gs_mm_v2x_b2;
+static int hf_nas_5gs_mm_v2xcepc5_b3;
+static int hf_nas_5gs_mm_v2xcnpc5_b4;
+static int hf_nas_5gs_mm_5g_lcs_b5;
+static int hf_nas_5gs_mm_nssaa_b6;
+static int hf_nas_5gs_mm_racs_b7;
+static int hf_nas_5gs_mm_cag_b0;
+static int hf_nas_5gs_mm_wsusa_b1;
+static int hf_nas_5gs_mm_multiple_up_b2;
+static int hf_nas_5gs_mm_5g_ehc_cp_ciot_b3;
+static int hf_nas_5gs_mm_er_nssai_b4;
+static int hf_nas_5gs_mm_5g_prose_dd_b5;
+static int hf_nas_5gs_mm_5g_prose_dc_b6;
+static int hf_nas_5gs_mm_5g_prose_l2relay_b7;
+static int hf_nas_5gs_mm_5g_prose_l3relay_b0;
+static int hf_nas_5gs_mm_5g_prose_l2rmt_b1;
+static int hf_nas_5gs_mm_5g_prose_l3rmt_b2;
+static int hf_nas_5gs_mm_nr_pssi_b3;
+static int hf_nas_5gs_mm_ncr_b4;
+static int hf_nas_5gs_mm_piv_b5;
+static int hf_nas_5gs_mm_rpr_b6;
+static int hf_nas_5gs_mm_pr_b7;
+static int hf_nas_5gs_mm_nssrg_b0;
+static int hf_nas_5gs_mm_mint_b1;
+static int hf_nas_5gs_mm_event_notif_b2;
+static int hf_nas_5gs_mm_ssnpnsi_b3;
+static int hf_nas_5gs_mm_ex_cag_b4;
+static int hf_nas_5gs_mm_nsag_b5;
+static int hf_nas_5gs_mm_uas_b6;
+static int hf_nas_5gs_mm_mpsiu_b7;
+static int hf_nas_5gs_mm_rcmap_b0;
+static int hf_nas_5gs_mm_rcman_b1;
+static int hf_nas_5gs_mm_type_id;
+static int hf_nas_5gs_mm_odd_even;
+static int hf_nas_5gs_mm_length;
+static int hf_nas_5gs_mm_pld_cont;
+static int hf_nas_5gs_mm_pld_cont_event_notif_ind_nb;
+static int hf_nas_5gs_mm_pld_cont_event_notif_ind_type;
+static int hf_nas_5gs_mm_pld_cont_event_notif_ind_len;
+static int hf_nas_5gs_mm_pld_cont_event_notif_ind_val;
+static int hf_nas_5gs_mm_pld_cont_nb_entries;
+static int hf_nas_5gs_mm_pld_cont_pld_cont_len;
+static int hf_nas_5gs_mm_pld_cont_nb_opt_ies;
+static int hf_nas_5gs_mm_pld_cont_pld_cont_type;
+static int hf_nas_5gs_mm_pld_cont_opt_ie_type;
+static int hf_nas_5gs_mm_pld_cont_opt_ie_len;
+static int hf_nas_5gs_mm_pld_cont_opt_ie_val;
+static int hf_nas_5gs_mm_req_type;
+static int hf_nas_5gs_mm_serv_type;
+static int hf_nas_5gs_mm_5g_ea0;
+static int hf_nas_5gs_mm_128_5g_ea1;
+static int hf_nas_5gs_mm_128_5g_ea2;
+static int hf_nas_5gs_mm_128_5g_ea3;
+static int hf_nas_5gs_mm_5g_ea4;
+static int hf_nas_5gs_mm_5g_ea5;
+static int hf_nas_5gs_mm_5g_ea6;
+static int hf_nas_5gs_mm_5g_ea7;
+static int hf_nas_5gs_mm_5g_ia0;
+static int hf_nas_5gs_mm_5g_128_ia1;
+static int hf_nas_5gs_mm_5g_128_ia2;
+static int hf_nas_5gs_mm_5g_128_ia3;
+static int hf_nas_5gs_mm_5g_ia4;
+static int hf_nas_5gs_mm_5g_ia5;
+static int hf_nas_5gs_mm_5g_ia6;
+static int hf_nas_5gs_mm_5g_ia7;
+static int hf_nas_5gs_mm_eea0;
+static int hf_nas_5gs_mm_128eea1;
+static int hf_nas_5gs_mm_128eea2;
+static int hf_nas_5gs_mm_eea3;
+static int hf_nas_5gs_mm_eea4;
+static int hf_nas_5gs_mm_eea5;
+static int hf_nas_5gs_mm_eea6;
+static int hf_nas_5gs_mm_eea7;
+static int hf_nas_5gs_mm_eia0;
+static int hf_nas_5gs_mm_128eia1;
+static int hf_nas_5gs_mm_128eia2;
+static int hf_nas_5gs_mm_eia3;
+static int hf_nas_5gs_mm_eia4;
+static int hf_nas_5gs_mm_eia5;
+static int hf_nas_5gs_mm_eia6;
+static int hf_nas_5gs_mm_eia7;
+static int hf_nas_5gs_mm_n1_mode_reg_b1;
+static int hf_nas_5gs_mm_s1_mode_reg_b0;
+
+static int hf_nas_5gs_mm_sal_al_t;
+static int hf_nas_5gs_mm_sal_t_li;
+static int hf_nas_5gs_mm_sal_num_e;
+
+static int hf_nas_5gs_pdu_ses_sts_psi_7_b7;
+static int hf_nas_5gs_pdu_ses_sts_psi_6_b6;
+static int hf_nas_5gs_pdu_ses_sts_psi_5_b5;
+static int hf_nas_5gs_pdu_ses_sts_psi_4_b4;
+static int hf_nas_5gs_pdu_ses_sts_psi_3_b3;
+static int hf_nas_5gs_pdu_ses_sts_psi_2_b2;
+static int hf_nas_5gs_pdu_ses_sts_psi_1_b1;
+static int hf_nas_5gs_pdu_ses_sts_psi_0_b0;
+
+static int hf_nas_5gs_pdu_ses_sts_psi_15_b7;
+static int hf_nas_5gs_pdu_ses_sts_psi_14_b6;
+static int hf_nas_5gs_pdu_ses_sts_psi_13_b5;
+static int hf_nas_5gs_pdu_ses_sts_psi_12_b4;
+static int hf_nas_5gs_pdu_ses_sts_psi_11_b3;
+static int hf_nas_5gs_pdu_ses_sts_psi_10_b2;
+static int hf_nas_5gs_pdu_ses_sts_psi_9_b1;
+static int hf_nas_5gs_pdu_ses_sts_psi_8_b0;
+
+static int hf_nas_5gs_pdu_ses_rect_res_psi_7_b7;
+static int hf_nas_5gs_pdu_ses_rect_res_psi_6_b6;
+static int hf_nas_5gs_pdu_ses_rect_res_psi_5_b5;
+static int hf_nas_5gs_pdu_ses_rect_res_psi_4_b4;
+static int hf_nas_5gs_pdu_ses_rect_res_psi_3_b3;
+static int hf_nas_5gs_pdu_ses_rect_res_psi_2_b2;
+static int hf_nas_5gs_pdu_ses_rect_res_psi_1_b1;
+static int hf_nas_5gs_pdu_ses_rect_res_psi_0_b0;
+
+static int hf_nas_5gs_pdu_ses_rect_res_psi_15_b7;
+static int hf_nas_5gs_pdu_ses_rect_res_psi_14_b6;
+static int hf_nas_5gs_pdu_ses_rect_res_psi_13_b5;
+static int hf_nas_5gs_pdu_ses_rect_res_psi_12_b4;
+static int hf_nas_5gs_pdu_ses_rect_res_psi_11_b3;
+static int hf_nas_5gs_pdu_ses_rect_res_psi_10_b2;
+static int hf_nas_5gs_pdu_ses_rect_res_psi_9_b1;
+static int hf_nas_5gs_pdu_ses_rect_res_psi_8_b0;
+
+static int hf_nas_5gs_ul_data_sts_psi_7_b7;
+static int hf_nas_5gs_ul_data_sts_psi_6_b6;
+static int hf_nas_5gs_ul_data_sts_psi_5_b5;
+static int hf_nas_5gs_ul_data_sts_psi_4_b4;
+static int hf_nas_5gs_ul_data_sts_psi_3_b3;
+static int hf_nas_5gs_ul_data_sts_psi_2_b2;
+static int hf_nas_5gs_ul_data_sts_psi_1_b1;
+static int hf_nas_5gs_ul_data_sts_psi_0_b0;
+
+static int hf_nas_5gs_ul_data_sts_psi_15_b7;
+static int hf_nas_5gs_ul_data_sts_psi_14_b6;
+static int hf_nas_5gs_ul_data_sts_psi_13_b5;
+static int hf_nas_5gs_ul_data_sts_psi_12_b4;
+static int hf_nas_5gs_ul_data_sts_psi_11_b3;
+static int hf_nas_5gs_ul_data_sts_psi_10_b2;
+static int hf_nas_5gs_ul_data_sts_psi_9_b1;
+static int hf_nas_5gs_ul_data_sts_psi_8_b0;
+
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_7_b7;
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_6_b6;
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_5_b5;
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_4_b4;
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_3_b3;
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_2_b2;
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_1_b1;
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_0_b0;
+
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_15_b7;
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_14_b6;
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_13_b5;
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_12_b4;
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_11_b3;
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_10_b2;
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_9_b1;
+static int hf_nas_5gs_allow_pdu_ses_sts_psi_8_b0;
+
+static int hf_nas_5gs_sm_pdu_session_type;
+static int hf_nas_5gs_sm_sc_mode;
+static int hf_nas_5gs_sm_eplmnc;
+static int hf_nas_5gs_sm_ratc;
+static int hf_nas_5gs_sm_ept_s1;
+static int hf_nas_5gs_sm_catbo;
+static int hf_nas_5gs_sm_abo;
+static int hf_nas_5gs_sm_atsss_cont;
+static int hf_nas_5gs_sm_cpoi;
+static int hf_nas_5gs_sm_ip_hdr_comp_config_p0104;
+static int hf_nas_5gs_sm_ip_hdr_comp_config_p0103;
+static int hf_nas_5gs_sm_ip_hdr_comp_config_p0102;
+static int hf_nas_5gs_sm_ip_hdr_comp_config_p0006;
+static int hf_nas_5gs_sm_ip_hdr_comp_config_p0004;
+static int hf_nas_5gs_sm_ip_hdr_comp_config_p0003;
+static int hf_nas_5gs_sm_ip_hdr_comp_config_p0002;
+static int hf_nas_5gs_sm_ip_hdr_comp_config_max_cid;
+static int hf_nas_5gs_sm_ip_hdr_comp_config_add_ip_hdr_compr_cxt_setup_params_type;
+static int hf_nas_5gs_sm_ip_hdr_comp_config_add_ip_hdr_compr_cxt_setup_params_cont;
+static int hf_nas_5gs_sm_ds_tt_eth_port_mac_addr;
+static int hf_nas_5gs_sm_ue_ds_tt_residence_time;
+static int hf_nas_5gs_sm_port_mgmt_info_cont;
+static int hf_nas_5gs_sm_eth_hdr_comp_config_cid_len;
+static int hf_nas_5gs_sm_pdu_session_pair_id;
+static int hf_nas_5gs_sm_pdu_session_rsn;
+static int hf_nas_5gs_sm_sel_sc_mode;
+static int hf_nas_5gs_sm_tpmic_b7;
+static int hf_nas_5gs_sm_atsss_st_b3_b6;
+static int hf_nas_5gs_sm_ept_s1_b2;
+static int hf_nas_5gs_sm_mh6_pdu_b1;
+static int hf_nas_5gs_sm_rqos_b0;
+static int hf_nas_5gs_sm_apmqf_b0;
+static int hf_nas_5gs_sm_5gsm_cause;
+static int hf_nas_5gs_sm_apsi;
+static int hf_nas_5gs_sm_apsr;
+static int hf_nas_5gs_sm_int_prot_max_data_rate_ul;
+static int hf_nas_5gs_sm_int_prot_max_data_rate_dl;
+static int hf_nas_5gs_sm_si6lla;
+static int hf_nas_5gs_sm_pdu_ses_type;
+static int hf_nas_5gs_sm_pdu_addr_inf_ipv4;
+static int hf_nas_5gs_sm_pdu_addr_inf_ipv6;
+static int hf_nas_5gs_sm_smf_ipv6_lla;
+static int hf_nas_5gs_sm_qos_rule_id;
+static int hf_nas_5gs_sm_length;
+static int hf_nas_5gs_sm_rop;
+static int hf_nas_5gs_sm_dqr;
+static int hf_nas_5gs_sm_nof_pkt_filters;
+static int hf_nas_5gs_sm_pkt_flt_id;
+static int hf_nas_5gs_sm_pkt_flt_dir;
+static int hf_nas_5gs_sm_pf_len;
+static int hf_nas_5gs_sm_pf_type;
+static int hf_nas_5gs_sm_e;
+static int hf_nas_5gs_sm_nof_params;
+static int hf_nas_5gs_sm_param_id;
+static int hf_nas_5gs_sm_param_len;
+static int hf_nas_5gs_sm_qos_rule_precedence;
+static int hf_nas_5gs_sm_segregation;
+static int hf_nas_5gs_sm_param_cont;
+static int hf_nas_5gs_sm_5qi;
+static int hf_nas_5gs_sm_unit_for_gfbr_ul;
+static int hf_nas_5gs_sm_gfbr_ul;
+static int hf_nas_5gs_sm_unit_for_gfbr_dl;
+static int hf_nas_5gs_sm_gfbr_dl;
+static int hf_nas_5gs_sm_unit_for_mfbr_ul;
+static int hf_nas_5gs_sm_mfbr_ul;
+static int hf_nas_5gs_sm_unit_for_mfbr_dl;
+static int hf_nas_5gs_sm_mfbr_dl;
+static int hf_nas_5gs_sm_averaging_window;
+static int hf_nas_5gs_sm_eps_bearer_id;
+static int hf_nas_5gs_sm_qfi;
+static int hf_nas_5gs_sm_mapd_eps_b_cont_id;
+static int hf_nas_5gs_sm_mapd_eps_b_cont_opt_code;
+static int hf_nas_5gs_sm_qos_des_flow_opt_code;
+static int hf_nas_5gs_sm_mapd_eps_b_cont_E;
+static int hf_nas_5gs_sm_mapd_eps_b_cont_num_eps_parms;
+static int hf_nas_5gs_sm_mapd_eps_b_cont_E_mod;
+static int hf_nas_5gs_sm_mapd_eps_b_cont_param_id;
+
+static int hf_nas_5gs_sm_unit_for_session_ambr_dl;
+static int hf_nas_5gs_sm_session_ambr_dl;
+static int hf_nas_5gs_sm_unit_for_session_ambr_ul;
+static int hf_nas_5gs_sm_session_ambr_ul;
+static int hf_nas_5gs_sm_dm_spec_id;
+static int hf_nas_5gs_sm_all_ssc_mode_b0;
+static int hf_nas_5gs_sm_all_ssc_mode_b1;
+static int hf_nas_5gs_sm_all_ssc_mode_b2;
+static int hf_nas_5gs_addr_mask_ipv4;
+static int hf_nas_5gs_ipv6;
+static int hf_nas_5gs_ipv6_prefix_len;
+static int hf_nas_5gs_protocol_identifier_or_next_hd;
+static int hf_nas_5gs_mm_rinmr;
+static int hf_nas_5gs_mm_hdp;
+static int hf_nas_5gs_mm_cipher_key;
+static int hf_nas_5gs_mm_dcni;
+static int hf_nas_5gs_mm_nssci;
+static int hf_nas_5gs_mm_nssai_inc_mode;
+static int hf_nas_5gs_mm_ue_usage_setting;
+static int hf_nas_5gs_mm_5gs_drx_param;
+static int hf_nas_5gs_sup_andsp;
+static int hf_nas_5gs_nssui;
+
+static int ett_nas_5gs;
+static int ett_nas_5gs_mm_nssai;
+static int ett_nas_5gs_mm_pdu_ses_id;
+static int ett_nas_5gs_sm_qos_rules;
+static int ett_nas_5gs_sm_qos_params;
+static int ett_nas_5gs_plain;
+static int ett_nas_5gs_sec;
+static int ett_nas_5gs_mm_part_sal;
+static int ett_nas_5gs_mm_part_tal;
+static int ett_nas_5gs_sm_mapd_eps_b_cont;
+static int ett_nas_5gs_sm_mapd_eps_b_cont_params_list;
+static int ett_nas_5gs_enc;
+static int ett_nas_5gs_mm_ladn_indic;
+static int ett_nas_5gs_mm_sor;
+static int ett_nas_5gs_sm_pkt_filter_components;
+static int ett_nas_5gs_updp_ue_policy_section_mgm_lst;
+static int ett_nas_5gs_updp_ue_policy_section_mgm_sublst;
+static int ett_nas_5gs_ue_policies_ursp;
+static int ett_nas_5gs_ursp_traff_desc;
+static int ett_nas_5gs_usrp_r_sel_list;
+static int ett_nas_5gs_usrp_r_sel;
+static int ett_nas_5gs_ursp_r_sel_desc_cont;
+static int ett_nas_5gs_updp_upsi_list;
+static int ett_nas_5gs_mm_rej_nssai;
+static int ett_nas_5gs_mm_scheme_output;
+static int ett_nas_5gs_mm_pld_cont_pld_entry;
+static int ett_nas_5gs_mm_pld_cont_opt_ie;
+static int ett_nas_5gs_mm_cag_info_entry;
+static int ett_nas_5gs_ciot_small_data_cont_data_contents;
+static int ett_nas_5gs_user_data_cont;
+static int ett_nas_5gs_ciph_data_set;
+static int ett_nas_5gs_mm_mapped_nssai;
+static int ett_nas_5gs_mm_partial_extended_rejected_nssai_list;
+static int ett_nas_5gs_mm_ext_rej_nssai;
+static int ett_nas_5gs_mm_op_def_acc_cat_def;
+static int ett_nas_5gs_mm_op_def_acc_cat_criteria_component;
+static int ett_nas_5gs_mm_op_def_acc_cat_criteria;
+static int ett_nas_5gs_cmn_service_level_aa_cont_param;
+static int ett_nas_5gs_mm_pld_cont_event_notif_ind;
+static int ett_nas_5gs_mm_peips_assist_info;
+static int ett_nas_5gs_mm_nssrg_info;
+static int ett_nas_5gs_mm_plmns_list_disaster_cond;
+static int ett_nas_5gs_mm_reg_wait_range;
+static int ett_nas_5gs_mm_nsag_info;
+
+static int hf_nas_5gs_mm_abba;
+static int hf_nas_5gs_mm_supi_fmt;
+static int hf_nas_5gs_mm_routing_indicator;
+static int hf_nas_5gs_mm_prot_scheme_id;
+static int hf_nas_5gs_mm_pki;
+static int hf_nas_5gs_mm_suci_msin;
+static int hf_nas_5gs_mm_scheme_output;
+static int hf_nas_5gs_mm_scheme_output_ecc_public_key;
+static int hf_nas_5gs_mm_scheme_output_ciphertext;
+static int hf_nas_5gs_mm_scheme_output_mac_tag;
+static int hf_nas_5gs_mm_suci_nai;
+static int hf_nas_5gs_mm_imei;
+static int hf_nas_5gs_mm_imeisv;
+static int hf_nas_5gs_mm_mauri;
+static int hf_nas_5gs_mm_mac_addr;
+static int hf_nas_5gs_mm_eui_64;
+static int hf_nas_5gs_mm_reg_res_res;
+static int hf_nas_5gs_mm_reg_res_sms_allowed;
+static int hf_nas_5gs_mm_reg_res_nssaa_perf;
+static int hf_nas_5gs_mm_reg_res_emergency_reg;
+static int hf_nas_5gs_mm_reg_res_disaster_roaming_reg_res;
+static int hf_nas_5gs_amf_region_id;
+static int hf_nas_5gs_amf_set_id;
+static int hf_nas_5gs_amf_pointer;
+static int hf_nas_5gs_5g_tmsi;
+static int hf_nas_5gs_mm_op_def_access_cat_len;
+static int hf_nas_5gs_mm_op_def_access_cat_precedence;
+static int hf_nas_5gs_mm_op_def_access_cat_psac;
+static int hf_nas_5gs_mm_op_def_access_cat_number;
+static int hf_nas_5gs_mm_op_def_access_cat_criteria_length;
+static int hf_nas_5gs_mm_op_def_access_cat_criteria_type;
+static int hf_nas_5gs_mm_op_def_access_cat_criteria_dnn_count;
+static int hf_nas_5gs_mm_op_def_access_cat_criteria_dnn_len;
+static int hf_nas_5gs_mm_op_def_access_cat_criteria_os_id_os_app_id_count;
+static int hf_nas_5gs_mm_op_def_access_cat_criteria_os_id;
+static int hf_nas_5gs_mm_op_def_access_cat_criteria_os_app_id_len;
+static int hf_nas_5gs_mm_op_def_access_cat_criteria_os_app_id;
+static int hf_nas_5gs_mm_op_def_access_cat_criteria_s_nssai_count;
+static int hf_nas_5gs_mm_op_def_access_cat_criteria_s_nssai_len;
+static int hf_nas_5gs_mm_op_def_access_cat_standardized_number;
+static int hf_nas_5gs_mm_sms_indic_sai;
+
+static int hf_nas_5gs_nw_feat_sup_mpsi_b7;
+static int hf_nas_5gs_nw_feat_sup_ims_iwk_n26_b6;
+static int hf_nas_5gs_nw_feat_sup_ims_emf_b5b4;
+static int hf_nas_5gs_nw_feat_sup_ims_emc_b3b2;
+static int hf_nas_5gs_nw_feat_sup_ims_vops_3gpp;
+static int hf_nas_5gs_nw_feat_sup_ims_vops_n3gpp;
+static int hf_nas_5gs_nw_feat_sup_emcn3;
+static int hf_nas_5gs_nw_feat_sup_mcsi;
+static int hf_nas_5gs_nw_feat_sup_restrict_ec;
+static int hf_nas_5gs_nw_feat_sup_5g_cp_ciot;
+static int hf_nas_5gs_nw_feat_sup_n3_data;
+static int hf_nas_5gs_nw_feat_sup_5g_iphc_cp_ciot;
+static int hf_nas_5gs_nw_feat_sup_5g_ciot_up;
+static int hf_nas_5gs_nw_feat_sup_5g_lcs;
+static int hf_nas_5gs_nw_feat_sup_ats_ind;
+static int hf_nas_5gs_nw_feat_sup_5g_ehc_cp_ciot;
+static int hf_nas_5gs_nw_feat_sup_ncr;
+static int hf_nas_5gs_nw_feat_sup_piv;
+static int hf_nas_5gs_nw_feat_sup_rpr;
+static int hf_nas_5gs_nw_feat_sup_pr;
+
+static int hf_nas_5gs_tac;
+
+static int hf_nas_5gs_mm_tal_t_li;
+static int hf_nas_5gs_mm_tal_num_e;
+static int hf_nas_5gs_sm_mapd_eps_b_cont_eps_param_cont;
+
+static int hf_nas_5gs_sm_max_nb_sup_pkt_flt_nb;
+static int hf_nas_5gs_sm_max_nb_sup_pkt_flt_spare;
+
+static int hf_nas_5gs_kacf;
+static int hf_nas_5gs_ncc;
+
+static int hf_nas_5gs_sor_hdr0_ap;
+static int hf_nas_5gs_sor_hdr0_ack;
+static int hf_nas_5gs_sor_hdr0_list_type;
+static int hf_nas_5gs_sor_hdr0_list_ind;
+static int hf_nas_5gs_sor_hdr0_sor_data_type;
+static int hf_nas_5gs_sor_mssnpnsi;
+static int hf_nas_5gs_sor_hdr0_mssi;
+static int hf_nas_5gs_sor_mac_iue;
+static int hf_nas_5gs_sor_mac_iausf;
+static int hf_nas_5gs_counter_sor;
+static int hf_nas_5gs_sor_sec_pkt;
+static int hf_nas_5gs_sor_sssi;
+static int hf_nas_5gs_sor_sscmi;
+static int hf_nas_5gs_sor_si;
+static int hf_nas_5gs_sor_plmn_id_act_len;
+static int hf_nas_5gs_sor_cmci_len;
+static int hf_nas_5gs_sor_cmci_payload;
+static int hf_nas_5gs_sor_snpn_si_len;
+static int hf_nas_5gs_sor_snpn_si_payload;
+
+static int hf_nas_5gs_access_tech_o1_b7;
+static int hf_nas_5gs_access_tech_o1_b6;
+static int hf_nas_5gs_access_tech_o1_b5;
+static int hf_nas_5gs_access_tech_o1_b4;
+static int hf_nas_5gs_access_tech_o1_b3;
+static int hf_nas_5gs_access_tech_o2_b7;
+static int hf_nas_5gs_access_tech_o2_b6;
+static int hf_nas_5gs_access_tech_o2_b5;
+static int hf_nas_5gs_access_tech_o2_b4;
+static int hf_nas_5gs_access_tech_o2_b3;
+static int hf_nas_5gs_access_tech_o2_b2;
+static int hf_nas_5gs_single_port_type;
+static int hf_nas_5gs_port_range_type_low;
+static int hf_nas_5gs_port_range_type_high;
+static int hf_nas_5gs_sec_param_idx;
+static int hf_nas_5gs_tos_tc_val;
+static int hf_nas_5gs_tos_tc_mask;
+static int hf_nas_5gs_flow_label;
+static int hf_nas_5gs_mac_addr;
+static int hf_nas_5gs_vlan_tag_vid;
+static int hf_nas_5gs_vlan_tag_pcp;
+static int hf_nas_5gs_vlan_tag_dei;
+static int hf_nas_5gs_ethertype;
+static int hf_nas_5gs_mac_addr_low;
+static int hf_nas_5gs_mac_addr_high;
+static int hf_nas_5gs_updp_ue_pol_sect_sublst_len;
+static int hf_nas_5gs_updp_ue_pol_sect_subresult_len;
+static int hf_nas_5gs_updp_instr_len;
+static int hf_nas_5gs_updp_upsc;
+static int hf_nas_5gs_updp_failed_instruction_order;
+static int hf_nas_5gs_updp_policy_len;
+static int hf_nas_5gs_updp_ue_policy_part_type;
+static int hf_nas_5gs_updp_ue_policy_part_cont;
+static int hf_nas_5gs_ursp_rule_len;
+static int hf_nas_5gs_ursp_rule_prec;
+static int hf_nas_5gs_ursp_traff_desc_lst_len;
+static int hf_nas_5gs_ursp_traff_desc;
+static int hf_nas_5gs_ursp_r_sel_desc_lst_len;
+static int hf_nas_5gs_ursp_r_sel_desc_lst;
+static int hf_nas_5gs_ursp_traff_desc_ipv4;
+static int hf_nas_5gs_ursp_traff_desc_ipv4_mask;
+static int hf_nas_5gs_ursp_traff_desc_ipv6;
+static int hf_nas_5gs_ursp_traff_desc_ipv6_prefix_len;
+static int hf_nas_5gs_ursp_traff_desc_next_hdr;
+static int hf_nas_5gs_ursp_traff_desc_single_remote_port;
+static int hf_nas_5gs_ursp_traff_desc_remote_port_range_low;
+static int hf_nas_5gs_ursp_traff_desc_remote_port_range_high;
+static int hf_nas_5gs_ursp_traff_desc_sec_param_index;
+static int hf_nas_5gs_ursp_traff_desc_tos_tc;
+static int hf_nas_5gs_ursp_traff_desc_tos_tc_mask;
+static int hf_nas_5gs_ursp_traff_desc_flow_label;
+static int hf_nas_5gs_ursp_traff_desc_dest_mac_addr;
+static int hf_nas_5gs_ursp_traff_desc_ctag_vid;
+static int hf_nas_5gs_ursp_traff_desc_stag_vid;
+static int hf_nas_5gs_ursp_traff_desc_ctag_pcp;
+static int hf_nas_5gs_ursp_traff_desc_ctag_dei;
+static int hf_nas_5gs_ursp_traff_desc_stag_pcp;
+static int hf_nas_5gs_ursp_traff_desc_stag_dei;
+static int hf_nas_5gs_ursp_traff_desc_ethertype;
+static int hf_nas_5gs_ursp_traff_desc_conn_cap_len;
+static int hf_nas_5gs_ursp_traff_desc_conn_cap;
+static int hf_nas_5gs_ursp_traff_desc_dest_fqdn_len;
+static int hf_nas_5gs_ursp_traff_desc_dest_fqdn;
+static int hf_nas_5gs_ursp_traff_desc_dest_mac_addr_range_low;
+static int hf_nas_5gs_ursp_traff_desc_dest_mac_addr_range_high;
+static int hf_nas_5gs_ursp_traff_desc_len;
+static int hf_nas_5gs_ursp_r_sel_des_prec;
+static int hf_nas_5gs_ursp_r_sel_des_cont_len;
+static int hf_nas_5gs_ursp_ursp_r_sel_desc_comp_type;
+static int hf_nas_5gs_dnn_len;
+static int hf_nas_5gs_upsi_sublist_len;
+static int hf_nas_5gs_upsc;
+static int hf_nas_5gs_os_id;
+static int hf_nas_5gs_upds_cause;
+static int hf_nas_5gs_v2xuui;
+static int hf_nas_5gs_v2xpc5i;
+static int hf_nas_5gs_os_app_id_len;
+static int hf_nas_5gs_os_app_id;
+static int hf_nas_5gs_mm_len_of_rej_s_nssai;
+static int hf_nas_5gs_mm_rej_s_nssai_cause;
+static int hf_nas_5gs_mm_ue_radio_cap_id;
+static int hf_nas_5gs_mm_ue_radio_cap_id_del_req;
+static int hf_nas_5gs_mm_trunc_amf_set_id;
+static int hf_nas_5gs_mm_trunc_amf_pointer;
+static int hf_nas_5gs_mm_n5gcreg_b0;
+static int hf_nas_5gs_mm_nb_n1_drx_value;
+static int hf_nas_5gs_mm_scmr;
+static int hf_nas_5gs_mm_extended_rejected_s_nssai_number_of_element;
+static int hf_nas_5gs_mm_extended_rejected_s_nssai_type_of_list;
+static int hf_nas_5gs_mm_extended_rejected_s_nssai_spare;
+static int hf_nas_5gs_mm_extended_rejected_s_nssai_back_off_timer;
+static int hf_nas_5gs_mm_len_of_rejected_s_nssai;
+static int hf_nas_5gs_mm_rejected_s_nssai_cause_value;
+static int hf_nas_5gs_mm_paging_restriction_type;
+static int hf_nas_5gs_mm_paging_restriction_psi_7;
+static int hf_nas_5gs_mm_paging_restriction_psi_6;
+static int hf_nas_5gs_mm_paging_restriction_psi_5;
+static int hf_nas_5gs_mm_paging_restriction_psi_4;
+static int hf_nas_5gs_mm_paging_restriction_psi_3;
+static int hf_nas_5gs_mm_paging_restriction_psi_2;
+static int hf_nas_5gs_mm_paging_restriction_psi_1;
+static int hf_nas_5gs_mm_paging_restriction_psi_0;
+static int hf_nas_5gs_mm_paging_restriction_psi_15;
+static int hf_nas_5gs_mm_paging_restriction_psi_14;
+static int hf_nas_5gs_mm_paging_restriction_psi_13;
+static int hf_nas_5gs_mm_paging_restriction_psi_12;
+static int hf_nas_5gs_mm_paging_restriction_psi_11;
+static int hf_nas_5gs_mm_paging_restriction_psi_10;
+static int hf_nas_5gs_mm_paging_restriction_psi_9;
+static int hf_nas_5gs_mm_paging_restriction_psi_8;
+static int hf_nas_5gs_mm_nid_assign_mode;
+static int hf_nas_5gs_mm_nid_value;
+static int hf_nas_5gs_mm_peips_assist_info_type;
+static int hf_nas_5gs_mm_peips_assist_info_paging_subgroup_id;
+static int hf_nas_5gs_mm_peips_assist_info_ue_paging_probability_info;
+static int hf_nas_5gs_mm_add_req_res_prd;
+static int hf_nas_5gs_mm_nssrg_info_len;
+static int hf_nas_5gs_mm_nssrg_info_s_nssai_len;
+static int hf_nas_5gs_mm_nssrg_info_nssrg;
+static int hf_nas_5gs_mm_nsag_info_len;
+static int hf_nas_5gs_mm_nsag_id;
+static int hf_nas_5gs_mm_nsag_info_s_nssai_len;
+static int hf_nas_5gs_mm_nsag_prio;
+static int hf_nas_5gs_mm_nsag_tais_list_len;
+static int hf_nas_5gs_mm_prose_relay_trans_id;
+static int hf_nas_5gs_mm_relay_key_req_params_relay_service_code;
+static int hf_nas_5gs_mm_relay_key_req_params_nonce_1;
+static int hf_nas_5gs_mm_relay_key_req_params_ruit;
+static int hf_nas_5gs_mm_relay_key_req_params_remote_ue_id;
+static int hf_nas_5gs_mm_relay_key_resp_params_key_knr_prose;
+static int hf_nas_5gs_mm_relay_key_resp_params_nonce_2;
+static int hf_nas_5gs_mm_relay_key_resp_params_cp_pruk_id;
+static int hf_nas_5gs_mm_prio_ind_mpsi;
+static int hf_nas_5gs_ue_os_id;
+
+static expert_field ei_nas_5gs_extraneous_data;
+static expert_field ei_nas_5gs_unknown_pd;
+static expert_field ei_nas_5gs_mm_unknown_msg_type;
+static expert_field ei_nas_5gs_sm_unknown_msg_type;
+static expert_field ei_nas_5gs_updp_unknown_msg_type;
+static expert_field ei_nas_5gs_msg_not_dis;
+static expert_field ei_nas_5gs_ie_not_dis;
+static expert_field ei_nas_5gs_missing_mandatory_element;
+static expert_field ei_nas_5gs_dnn_too_long;
+static expert_field ei_nas_5gs_unknown_value;
+static expert_field ei_nas_5gs_num_pkt_flt;
+static expert_field ei_nas_5gs_not_diss;
 
 #define NAS_5GS_PLAIN_NAS_MSG          0
 #define NAS_5GS_INTEG_NAS_MSG          1
diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c
index b1017afb23..1fa72bd7e3 100644
--- a/epan/dissectors/packet-nas_eps.c
+++ b/epan/dissectors/packet-nas_eps.c
@@ -36,7 +36,7 @@ void proto_reg_handoff_nas_eps(void);
 #define PFNAME "nas-eps"
 
 /* Initialize the protocol and registered fields */
-static int proto_nas_eps = -1;
+static int proto_nas_eps;
 
 /* Dissector handles */
 static dissector_handle_t gsm_a_dtap_handle;
@@ -51,403 +51,403 @@ static dissector_handle_t ethernet_handle;
 static void dissect_nas_eps_esm_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset);
 static void dissect_nas_eps_emm_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, gboolean second_header);
 
-static int hf_nas_eps_msg_emm_type = -1;
-int hf_nas_eps_common_elem_id = -1;
-int hf_nas_eps_emm_elem_id = -1;
-static int hf_nas_eps_bearer_id = -1;
-static int hf_nas_eps_spare_bits = -1;
-static int hf_nas_eps_spare_b7 = -1;
-static int hf_nas_eps_security_header_type = -1;
-static int hf_nas_eps_msg_auth_code = -1;
-static int hf_nas_eps_seq_no = -1;
-static int hf_nas_eps_ciphered_msg = -1;
-static int hf_nas_eps_msg_elems = -1;
-static int hf_nas_eps_seq_no_short = -1;
-static int hf_nas_eps_emm_ebi0 = -1;
-static int hf_nas_eps_emm_ebi1 = -1;
-static int hf_nas_eps_emm_ebi2 = -1;
-static int hf_nas_eps_emm_ebi3 = -1;
-static int hf_nas_eps_emm_ebi4 = -1;
-static int hf_nas_eps_emm_ebi5 = -1;
-static int hf_nas_eps_emm_ebi6 = -1;
-static int hf_nas_eps_emm_ebi7 = -1;
-static int hf_nas_eps_emm_ebi8 = -1;
-static int hf_nas_eps_emm_ebi9 = -1;
-static int hf_nas_eps_emm_ebi10 = -1;
-static int hf_nas_eps_emm_ebi11 = -1;
-static int hf_nas_eps_emm_ebi12 = -1;
-static int hf_nas_eps_emm_ebi13 = -1;
-static int hf_nas_eps_emm_ebi14 = -1;
-static int hf_nas_eps_emm_ebi15 = -1;
-static int hf_nas_eps_emm_dl_nas_cnt = -1;
-static int hf_nas_eps_emm_nonce_mme = -1;
-static int hf_nas_eps_emm_nonce = -1;
-static int hf_nas_eps_emm_paging_id = -1;
-static int hf_nas_eps_emm_nbiot_allowed_value = -1;
-static int hf_nas_eps_emm_eps_optim_info = -1;
-static int hf_nas_eps_emm_eutran_allowed_value = -1;
-static int hf_nas_eps_emm_eps_att_type = -1;
-static int hf_nas_eps_emm_cp_ciot = -1;
-static int hf_nas_eps_emm_er_wo_pdn = -1;
-static int hf_nas_eps_emm_esr_ps = -1;
-static int hf_nas_eps_emm_cs_lcs = -1;
-static int hf_nas_eps_emm_epc_lcs = -1;
-static int hf_nas_eps_emm_emc_bs = -1;
-static int hf_nas_eps_emm_ims_vops = -1;
-static int hf_nas_eps_emm_15_bearers = -1;
-static int hf_nas_eps_emm_iwkn26 = -1;
-static int hf_nas_eps_emm_restrict_dcnr = -1;
-static int hf_nas_eps_emm_restrict_ec = -1;
-static int hf_nas_eps_emm_epco = -1;
-static int hf_nas_eps_emm_hc_cp_ciot = -1;
-static int hf_nas_eps_emm_s1_u_data = -1;
-static int hf_nas_eps_emm_up_ciot = -1;
-static int hf_nas_eps_emm_ptcc = -1;
-static int hf_nas_eps_emm_pr = -1;
-static int hf_nas_eps_emm_rpr = -1;
-static int hf_nas_eps_emm_piv = -1;
-static int hf_nas_eps_emm_ncr = -1;
-static int hf_nas_eps_emm_nas_key_set_id = -1;
-static int hf_nas_eps_tsc = -1;
-static int hf_nas_eps_emm_odd_even = -1;
-static int hf_nas_eps_emm_type_of_id = -1;
-static int hf_nas_eps_emm_mme_grp_id = -1;
-static int hf_nas_eps_emm_imei = -1;
-static int hf_nas_eps_emm_mme_code = -1;
-static int hf_nas_eps_emm_m_tmsi = -1;
-static int hf_nas_eps_esm_msg_cont = -1;
-static int hf_nas_eps_esm_imeisv_req = -1;
-static int hf_nas_eps_emm_toi = -1;
-static int hf_nas_eps_emm_toc = -1;
-static int hf_nas_eps_emm_EPS_attach_result = -1;
-static int hf_nas_eps_emm_spare_half_octet = -1;
-static int hf_nas_eps_emm_add_upd_res = -1;
-static int hf_nas_eps_emm_pnb_ciot = -1;
-static int hf_nas_eps_emm_saf = -1;
-static int hf_nas_eps_emm_add_upd_type = -1;
-static int hf_nas_eps_emm_res = -1;
-static int hf_nas_eps_emm_sms_services_status = -1;
-static int hf_nas_eps_emm_csfb_resp = -1;
-static int hf_nas_eps_emm_cause = -1;
-static int hf_nas_eps_emm_id_type2 = -1;
-static int hf_nas_eps_emm_short_mac = -1;
-static int hf_nas_eps_emm_tai_tol = -1;
-static int hf_nas_eps_emm_tai_n_elem = -1;
-static int hf_nas_eps_emm_tai_tac = -1;
-static int hf_nas_eps_emm_eea0 = -1;
-static int hf_nas_eps_emm_128eea1 = -1;
-static int hf_nas_eps_emm_128eea2 = -1;
-static int hf_nas_eps_emm_eea3 = -1;
-static int hf_nas_eps_emm_eea4 = -1;
-static int hf_nas_eps_emm_eea5 = -1;
-static int hf_nas_eps_emm_eea6 = -1;
-static int hf_nas_eps_emm_eea7 = -1;
-static int hf_nas_eps_emm_eia0 = -1;
-static int hf_nas_eps_emm_128eia1 = -1;
-static int hf_nas_eps_emm_128eia2 = -1;
-static int hf_nas_eps_emm_eia3 = -1;
-static int hf_nas_eps_emm_eia4 = -1;
-static int hf_nas_eps_emm_eia5 = -1;
-static int hf_nas_eps_emm_eia6 = -1;
-static int hf_nas_eps_emm_eps_upip = -1;
-static int hf_nas_eps_emm_uea0 = -1;
-static int hf_nas_eps_emm_uea1 = -1;
-static int hf_nas_eps_emm_uea2 = -1;
-static int hf_nas_eps_emm_uea3 = -1;
-static int hf_nas_eps_emm_uea4 = -1;
-static int hf_nas_eps_emm_uea5 = -1;
-static int hf_nas_eps_emm_uea6 = -1;
-static int hf_nas_eps_emm_uea7 = -1;
-static int hf_nas_eps_emm_ucs2_supp = -1;
-static int hf_nas_eps_emm_uia1 = -1;
-static int hf_nas_eps_emm_uia2 = -1;
-static int hf_nas_eps_emm_uia3 = -1;
-static int hf_nas_eps_emm_uia4 = -1;
-static int hf_nas_eps_emm_uia5 = -1;
-static int hf_nas_eps_emm_uia6 = -1;
-static int hf_nas_eps_emm_uia7 = -1;
-static int hf_nas_eps_emm_gea1 = -1;
-static int hf_nas_eps_emm_gea2 = -1;
-static int hf_nas_eps_emm_gea3 = -1;
-static int hf_nas_eps_emm_gea4 = -1;
-static int hf_nas_eps_emm_gea5 = -1;
-static int hf_nas_eps_emm_gea6 = -1;
-static int hf_nas_eps_emm_gea7 = -1;
-static int hf_eps_emm_ext_emerg_num_list_eenlv = -1;
-static int hf_eps_emm_ext_emerg_num_list_emerg_num_len = -1;
-static int hf_eps_emm_ext_emerg_num_list_emerg_num = -1;
-static int hf_eps_emm_ext_emerg_num_list_sub_serv_field_len = -1;
-static int hf_eps_emm_ext_emerg_num_list_sub_serv_field = -1;
-static int hf_nas_eps_emm_prose_dd_cap = -1;
-static int hf_nas_eps_emm_prose_cap = -1;
-static int hf_nas_eps_emm_h245_ash_cap = -1;
-static int hf_nas_eps_emm_acc_csfb_cap = -1;
-static int hf_nas_eps_emm_lpp_cap = -1;
-static int hf_nas_eps_emm_lcs_cap = -1;
-static int hf_nas_eps_emm_1xsrvcc_cap = -1;
-static int hf_nas_eps_emm_nf_cap = -1;
-static int hf_nas_eps_emm_epco_cap = -1;
-static int hf_nas_eps_emm_hc_cp_ciot_cap = -1;
-static int hf_nas_eps_emm_er_wo_pdn_cap = -1;
-static int hf_nas_eps_emm_s1u_data_cap = -1;
-static int hf_nas_eps_emm_up_ciot_cap = -1;
-static int hf_nas_eps_emm_cp_ciot_cap = -1;
-static int hf_nas_eps_emm_prose_relay_cap = -1;
-static int hf_nas_eps_emm_prose_dc_cap = -1;
-static int hf_nas_eps_15_bearers_cap = -1;
-static int hf_nas_eps_sgc_cap = -1;
-static int hf_nas_eps_n1mode_cap = -1;
-static int hf_nas_eps_dcnr_cap = -1;
-static int hf_nas_eps_cp_backoff_cap = -1;
-static int hf_nas_eps_restrict_ec_cap = -1;
-static int hf_nas_eps_v2x_pc5_cap = -1;
-static int hf_nas_eps_multiple_drb_cap = -1;
-static int hf_nas_eps_rpr_cap = -1;
-static int hf_nas_eps_piv_cap = -1;
-static int hf_nas_eps_ncr_cap = -1;
-static int hf_nas_eps_v2x_nr_pc5_cap = -1;
-static int hf_nas_eps_up_mt_edt_cap = -1;
-static int hf_nas_eps_cp_mt_edt_cap = -1;
-static int hf_nas_eps_wsua_cap = -1;
-static int hf_nas_eps_racs_cap = -1;
-static int hf_nas_eps_ptcc_cap = -1;
-static int hf_nas_eps_pr_cap = -1;
-static int hf_nas_eps_emm_ue_ra_cap_inf_upd_need_flg = -1;
-static int hf_nas_eps_emm_ss_code = -1;
-static int hf_nas_eps_emm_lcs_ind = -1;
-static int hf_nas_eps_emm_gen_msg_cont_type = -1;
-static int hf_nas_eps_esm_apn_ambr_ul = -1;
-static int hf_nas_eps_esm_apn_ambr_dl = -1;
-static int hf_nas_eps_esm_apn_ambr_ul_ext = -1;
-static int hf_nas_eps_esm_apn_ambr_dl_ext = -1;
-static int hf_nas_eps_esm_apn_ambr_ul_ext2 = -1;
-static int hf_nas_eps_esm_apn_ambr_dl_ext2 = -1;
-static int hf_nas_eps_esm_apn_ambr_ul_total = -1;
-static int hf_nas_eps_esm_apn_ambr_dl_total = -1;
-static int hf_nas_eps_emm_guti_type = -1;
-static int hf_nas_eps_hash_mme = -1;
-static int hf_nas_eps_replayed_nas_msg_cont = -1;
-static int hf_nas_eps_redir_policy = -1;
-static int hf_nas_eps_emm_5g_ea0 = -1;
-static int hf_nas_eps_emm_128_5g_ea1 = -1;
-static int hf_nas_eps_emm_128_5g_ea2 = -1;
-static int hf_nas_eps_emm_128_5g_ea3 = -1;
-static int hf_nas_eps_emm_5g_ea4 = -1;
-static int hf_nas_eps_emm_5g_ea5 = -1;
-static int hf_nas_eps_emm_5g_ea6 = -1;
-static int hf_nas_eps_emm_5g_ea7 = -1;
-static int hf_nas_eps_emm_5g_ea8 = -1;
-static int hf_nas_eps_emm_5g_ea9 = -1;
-static int hf_nas_eps_emm_5g_ea10 = -1;
-static int hf_nas_eps_emm_5g_ea11 = -1;
-static int hf_nas_eps_emm_5g_ea12 = -1;
-static int hf_nas_eps_emm_5g_ea13 = -1;
-static int hf_nas_eps_emm_5g_ea14 = -1;
-static int hf_nas_eps_emm_5g_ea15 = -1;
-static int hf_nas_eps_emm_5g_ia0 = -1;
-static int hf_nas_eps_emm_128_5g_ia1 = -1;
-static int hf_nas_eps_emm_128_5g_ia2 = -1;
-static int hf_nas_eps_emm_128_5g_ia3 = -1;
-static int hf_nas_eps_emm_5g_ia4 = -1;
-static int hf_nas_eps_emm_5g_ia5 = -1;
-static int hf_nas_eps_emm_5g_ia6 = -1;
-static int hf_nas_eps_emm_5g_ia7 = -1;
-static int hf_nas_eps_emm_5g_ia8 = -1;
-static int hf_nas_eps_emm_5g_ia9 = -1;
-static int hf_nas_eps_emm_5g_ia10 = -1;
-static int hf_nas_eps_emm_5g_ia11 = -1;
-static int hf_nas_eps_emm_5g_ia12 = -1;
-static int hf_nas_eps_emm_5g_ia13 = -1;
-static int hf_nas_eps_emm_5g_ia14 = -1;
-static int hf_nas_eps_emm_5g_ia15 = -1;
-static int hf_nas_eps_emm_cipher_key = -1;
-static int hf_nas_eps_emm_ciph_key_data_ciphering_set_id = -1;
-static int hf_nas_eps_emm_ciph_key_data_ciphering_key = -1;
-static int hf_nas_eps_emm_ciph_key_data_c0_len = -1;
-static int hf_nas_eps_emm_ciph_key_data_c0 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_1_1 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_1_2 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_1_3 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_1_4 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_1_5 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_1_6 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_1_7 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_1 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_2 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_3 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_4 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_5 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_6 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_7 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_8 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_9 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_10 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_11 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_12 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_13 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_14 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_15 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_16 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_17 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_18 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_19 = -1;
-static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_3_1 = -1;
-static int hf_nas_eps_emm_ciph_key_data_validity_start_time = -1;
-static int hf_nas_eps_emm_ciph_key_data_validity_duration = -1;
-static int hf_nas_eps_emm_ciph_key_data_tais_list_len = -1;
-static int hf_nas_eps_emm_detach_req_UL = -1;
-static int hf_nas_eps_emm_detach_req_DL = -1;
-static int hf_nas_eps_emm_switch_off = -1;
-static int hf_nas_eps_emm_detach_type_UL = -1;
-static int hf_nas_eps_emm_detach_type_DL = -1;
-static int hf_nas_eps_emm_5g_ehc_cp_ciot = -1;
-static int hf_nas_eps_emm_5gs_pnb_ciot = -1;
-static int hf_nas_eps_emm_5g_up_ciot = -1;
-static int hf_nas_eps_emm_5g_hc_cp_ciot = -1;
-static int hf_nas_eps_emm_n3_data = -1;
-static int hf_nas_eps_emm_5g_cp_ciot = -1;
-static int hf_nas_eps_emm_ue_radio_cap_id_available = -1;
-static int hf_nas_eps_emm_ue_radio_cap_id_request = -1;
-static int hf_nas_eps_emm_wus_assist_info_type = -1;
-static int hf_nas_eps_emm_wus_assist_info_ue_paging_prob = -1;
-static int hf_nas_eps_emm_nb_s1_drx_param = -1;
-static int hf_nas_eps_emm_imsi_offset = -1;
-static int hf_nas_eps_emm_ue_request_type = -1;
-static int hf_nas_eps_emm_paging_restriction_type = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi7 = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi6 = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi5 = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi4 = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi3 = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi2 = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi1 = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi0 = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi15 = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi14 = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi13 = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi12 = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi11 = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi10 = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi9 = -1;
-static int hf_nas_eps_emm_paging_restriction_ebi8 = -1;
-static int hf_nas_eps_emm_paging_restriction_decision = -1;
-
-static int hf_nas_eps_esm_qci = -1;
-static int hf_nas_eps_esm_mbr_ul = -1;
-static int hf_nas_eps_esm_mbr_dl = -1;
-static int hf_nas_eps_esm_gbr_ul = -1;
-static int hf_nas_eps_esm_gbr_dl = -1;
-static int hf_nas_eps_esm_embr_ul = -1;
-static int hf_nas_eps_esm_embr_dl = -1;
-static int hf_nas_eps_esm_egbr_ul = -1;
-static int hf_nas_eps_esm_egbr_dl = -1;
-static int hf_nas_eps_esm_cause = -1;
-static int hf_nas_eps_esm_eit = -1;
-static int hf_nas_eps_esm_notif_ind = -1;
-static int hf_nas_eps_esm_pdn_type = -1;
-static int hf_nas_eps_esm_pdn_ipv4 = -1;
-static int hf_nas_eps_esm_pdn_ipv6_if_id = -1;
-static int hf_nas_eps_esm_eplmnc = -1;
-static int hf_nas_eps_esm_ratc = -1;
-static int hf_nas_eps_esm_linked_bearer_id = -1;
-static int hf_nas_eps_esm_nbifom_cont = -1;
-static int hf_nas_eps_esm_remote_ue_context_list_nb_ue_contexts = -1;
-static int hf_nas_eps_esm_remote_ue_context_list_ue_context_len = -1;
-static int hf_nas_eps_esm_remote_ue_context_list_ue_context_nb_user_id = -1;
-static int hf_nas_eps_esm_remote_ue_context_list_ue_context_user_id_len = -1;
-static int hf_nas_eps_esm_remote_ue_context_list_ue_context_odd_even_indic = -1;
-static int hf_nas_eps_esm_remote_ue_context_list_ue_context_user_id_type = -1;
-static int hf_nas_eps_esm_remote_ue_context_list_ue_context_encr_imsi = -1;
-static int hf_nas_eps_esm_remote_ue_context_list_ue_context_msisdn = -1;
-static int hf_nas_eps_esm_remote_ue_context_list_ue_context_imei = -1;
-static int hf_nas_eps_esm_remote_ue_context_list_ue_context_imeisv = -1;
-static int hf_nas_eps_esm_remote_ue_context_list_ue_context_address_type = -1;
-static int hf_nas_eps_esm_remote_ue_context_list_ue_context_ipv4 = -1;
-static int hf_nas_eps_esm_remote_ue_context_list_ue_context_port_number = -1;
-static int hf_nas_eps_esm_remote_ue_context_list_ue_context_ipv6_prefix = -1;
-static int hf_nas_eps_esm_pkmf_address_type = -1;
-static int hf_nas_eps_esm_pkmf_ipv4 = -1;
-static int hf_nas_eps_esm_pkmf_ipv6 = -1;
-static int hf_nas_eps_esm_hdr_comp_config_prof_0104 = -1;
-static int hf_nas_eps_esm_hdr_comp_config_prof_0103 = -1;
-static int hf_nas_eps_esm_hdr_comp_config_prof_0102 = -1;
-static int hf_nas_eps_esm_hdr_comp_config_prof_0006 = -1;
-static int hf_nas_eps_esm_hdr_comp_config_prof_0004 = -1;
-static int hf_nas_eps_esm_hdr_comp_config_prof_0003 = -1;
-static int hf_nas_eps_esm_hdr_comp_config_prof_0002 = -1;
-static int hf_nas_eps_esm_hdr_compr_config_max_cid = -1;
-static int hf_nas_eps_esm_hdr_compr_config_add_hdr_compr_cxt_setup_params_type = -1;
-static int hf_nas_eps_esm_hdr_compr_config_add_hdr_compr_cxt_setup_params_cont = -1;
-static int hf_nas_eps_esm_ctrl_plane_only_ind_cpoi = -1;
-static int hf_nas_eps_esm_user_data_cont = -1;
-static int hf_nas_eps_esm_rel_assist_ind_ddx = -1;
-static int hf_nas_eps_esm_hdr_compr_config_status_ebi7 = -1;
-static int hf_nas_eps_esm_hdr_compr_config_status_ebi6 = -1;
-static int hf_nas_eps_esm_hdr_compr_config_status_ebi5 = -1;
-static int hf_nas_eps_esm_hdr_compr_config_status_ebi4 = -1;
-static int hf_nas_eps_esm_hdr_compr_config_status_ebi3 = -1;
-static int hf_nas_eps_esm_hdr_compr_config_status_ebi2 = -1;
-static int hf_nas_eps_esm_hdr_compr_config_status_ebi1 = -1;
-static int hf_nas_eps_esm_spare_bits0x0100 = -1;
-static int hf_nas_eps_esm_hdr_compr_config_status_ebi15 = -1;
-static int hf_nas_eps_esm_hdr_compr_config_status_ebi14 = -1;
-static int hf_nas_eps_esm_hdr_compr_config_status_ebi13 = -1;
-static int hf_nas_eps_esm_hdr_compr_config_status_ebi12 = -1;
-static int hf_nas_eps_esm_hdr_compr_config_status_ebi11 = -1;
-static int hf_nas_eps_esm_hdr_compr_config_status_ebi10 = -1;
-static int hf_nas_eps_esm_hdr_compr_config_status_ebi9 = -1;
-static int hf_nas_eps_esm_hdr_compr_config_status_ebi8 = -1;
-static int hf_nas_eps_esm_serv_plmn_rate_ctrl_val = -1;
-static int hf_nas_eps_esm_ext_apn_ambr_dl_unit = -1;
-static int hf_nas_eps_esm_ext_apn_ambr_dl = -1;
-static int hf_nas_eps_esm_ext_apn_ambr_ul_unit = -1;
-static int hf_nas_eps_esm_ext_apn_ambr_ul = -1;
-static int hf_nas_eps_esm_ext_mbr_unit = -1;
-static int hf_nas_eps_esm_ext_mbr_ul = -1;
-static int hf_nas_eps_esm_ext_mbr_dl = -1;
-static int hf_nas_eps_esm_ext_gbr_unit = -1;
-static int hf_nas_eps_esm_ext_gbr_ul = -1;
-static int hf_nas_eps_esm_ext_gbr_dl = -1;
-
-static int hf_nas_eps_active_flg = -1;
-static int hf_nas_eps_ctrl_plane_serv_type = -1;
-static int hf_nas_eps_eps_update_result_value = -1;
-static int hf_nas_eps_eps_update_type_value = -1;
-static int hf_nas_eps_service_type = -1;
-
-static int hf_nas_eps_nas_msg_cont = -1;
-static int hf_nas_eps_gen_msg_cont = -1;
-
-static int hf_nas_eps_cmn_add_info = -1;
-static int hf_nas_eps_esm_request_type = -1;
+static int hf_nas_eps_msg_emm_type;
+int hf_nas_eps_common_elem_id;
+int hf_nas_eps_emm_elem_id;
+static int hf_nas_eps_bearer_id;
+static int hf_nas_eps_spare_bits;
+static int hf_nas_eps_spare_b7;
+static int hf_nas_eps_security_header_type;
+static int hf_nas_eps_msg_auth_code;
+static int hf_nas_eps_seq_no;
+static int hf_nas_eps_ciphered_msg;
+static int hf_nas_eps_msg_elems;
+static int hf_nas_eps_seq_no_short;
+static int hf_nas_eps_emm_ebi0;
+static int hf_nas_eps_emm_ebi1;
+static int hf_nas_eps_emm_ebi2;
+static int hf_nas_eps_emm_ebi3;
+static int hf_nas_eps_emm_ebi4;
+static int hf_nas_eps_emm_ebi5;
+static int hf_nas_eps_emm_ebi6;
+static int hf_nas_eps_emm_ebi7;
+static int hf_nas_eps_emm_ebi8;
+static int hf_nas_eps_emm_ebi9;
+static int hf_nas_eps_emm_ebi10;
+static int hf_nas_eps_emm_ebi11;
+static int hf_nas_eps_emm_ebi12;
+static int hf_nas_eps_emm_ebi13;
+static int hf_nas_eps_emm_ebi14;
+static int hf_nas_eps_emm_ebi15;
+static int hf_nas_eps_emm_dl_nas_cnt;
+static int hf_nas_eps_emm_nonce_mme;
+static int hf_nas_eps_emm_nonce;
+static int hf_nas_eps_emm_paging_id;
+static int hf_nas_eps_emm_nbiot_allowed_value;
+static int hf_nas_eps_emm_eps_optim_info;
+static int hf_nas_eps_emm_eutran_allowed_value;
+static int hf_nas_eps_emm_eps_att_type;
+static int hf_nas_eps_emm_cp_ciot;
+static int hf_nas_eps_emm_er_wo_pdn;
+static int hf_nas_eps_emm_esr_ps;
+static int hf_nas_eps_emm_cs_lcs;
+static int hf_nas_eps_emm_epc_lcs;
+static int hf_nas_eps_emm_emc_bs;
+static int hf_nas_eps_emm_ims_vops;
+static int hf_nas_eps_emm_15_bearers;
+static int hf_nas_eps_emm_iwkn26;
+static int hf_nas_eps_emm_restrict_dcnr;
+static int hf_nas_eps_emm_restrict_ec;
+static int hf_nas_eps_emm_epco;
+static int hf_nas_eps_emm_hc_cp_ciot;
+static int hf_nas_eps_emm_s1_u_data;
+static int hf_nas_eps_emm_up_ciot;
+static int hf_nas_eps_emm_ptcc;
+static int hf_nas_eps_emm_pr;
+static int hf_nas_eps_emm_rpr;
+static int hf_nas_eps_emm_piv;
+static int hf_nas_eps_emm_ncr;
+static int hf_nas_eps_emm_nas_key_set_id;
+static int hf_nas_eps_tsc;
+static int hf_nas_eps_emm_odd_even;
+static int hf_nas_eps_emm_type_of_id;
+static int hf_nas_eps_emm_mme_grp_id;
+static int hf_nas_eps_emm_imei;
+static int hf_nas_eps_emm_mme_code;
+static int hf_nas_eps_emm_m_tmsi;
+static int hf_nas_eps_esm_msg_cont;
+static int hf_nas_eps_esm_imeisv_req;
+static int hf_nas_eps_emm_toi;
+static int hf_nas_eps_emm_toc;
+static int hf_nas_eps_emm_EPS_attach_result;
+static int hf_nas_eps_emm_spare_half_octet;
+static int hf_nas_eps_emm_add_upd_res;
+static int hf_nas_eps_emm_pnb_ciot;
+static int hf_nas_eps_emm_saf;
+static int hf_nas_eps_emm_add_upd_type;
+static int hf_nas_eps_emm_res;
+static int hf_nas_eps_emm_sms_services_status;
+static int hf_nas_eps_emm_csfb_resp;
+static int hf_nas_eps_emm_cause;
+static int hf_nas_eps_emm_id_type2;
+static int hf_nas_eps_emm_short_mac;
+static int hf_nas_eps_emm_tai_tol;
+static int hf_nas_eps_emm_tai_n_elem;
+static int hf_nas_eps_emm_tai_tac;
+static int hf_nas_eps_emm_eea0;
+static int hf_nas_eps_emm_128eea1;
+static int hf_nas_eps_emm_128eea2;
+static int hf_nas_eps_emm_eea3;
+static int hf_nas_eps_emm_eea4;
+static int hf_nas_eps_emm_eea5;
+static int hf_nas_eps_emm_eea6;
+static int hf_nas_eps_emm_eea7;
+static int hf_nas_eps_emm_eia0;
+static int hf_nas_eps_emm_128eia1;
+static int hf_nas_eps_emm_128eia2;
+static int hf_nas_eps_emm_eia3;
+static int hf_nas_eps_emm_eia4;
+static int hf_nas_eps_emm_eia5;
+static int hf_nas_eps_emm_eia6;
+static int hf_nas_eps_emm_eps_upip;
+static int hf_nas_eps_emm_uea0;
+static int hf_nas_eps_emm_uea1;
+static int hf_nas_eps_emm_uea2;
+static int hf_nas_eps_emm_uea3;
+static int hf_nas_eps_emm_uea4;
+static int hf_nas_eps_emm_uea5;
+static int hf_nas_eps_emm_uea6;
+static int hf_nas_eps_emm_uea7;
+static int hf_nas_eps_emm_ucs2_supp;
+static int hf_nas_eps_emm_uia1;
+static int hf_nas_eps_emm_uia2;
+static int hf_nas_eps_emm_uia3;
+static int hf_nas_eps_emm_uia4;
+static int hf_nas_eps_emm_uia5;
+static int hf_nas_eps_emm_uia6;
+static int hf_nas_eps_emm_uia7;
+static int hf_nas_eps_emm_gea1;
+static int hf_nas_eps_emm_gea2;
+static int hf_nas_eps_emm_gea3;
+static int hf_nas_eps_emm_gea4;
+static int hf_nas_eps_emm_gea5;
+static int hf_nas_eps_emm_gea6;
+static int hf_nas_eps_emm_gea7;
+static int hf_eps_emm_ext_emerg_num_list_eenlv;
+static int hf_eps_emm_ext_emerg_num_list_emerg_num_len;
+static int hf_eps_emm_ext_emerg_num_list_emerg_num;
+static int hf_eps_emm_ext_emerg_num_list_sub_serv_field_len;
+static int hf_eps_emm_ext_emerg_num_list_sub_serv_field;
+static int hf_nas_eps_emm_prose_dd_cap;
+static int hf_nas_eps_emm_prose_cap;
+static int hf_nas_eps_emm_h245_ash_cap;
+static int hf_nas_eps_emm_acc_csfb_cap;
+static int hf_nas_eps_emm_lpp_cap;
+static int hf_nas_eps_emm_lcs_cap;
+static int hf_nas_eps_emm_1xsrvcc_cap;
+static int hf_nas_eps_emm_nf_cap;
+static int hf_nas_eps_emm_epco_cap;
+static int hf_nas_eps_emm_hc_cp_ciot_cap;
+static int hf_nas_eps_emm_er_wo_pdn_cap;
+static int hf_nas_eps_emm_s1u_data_cap;
+static int hf_nas_eps_emm_up_ciot_cap;
+static int hf_nas_eps_emm_cp_ciot_cap;
+static int hf_nas_eps_emm_prose_relay_cap;
+static int hf_nas_eps_emm_prose_dc_cap;
+static int hf_nas_eps_15_bearers_cap;
+static int hf_nas_eps_sgc_cap;
+static int hf_nas_eps_n1mode_cap;
+static int hf_nas_eps_dcnr_cap;
+static int hf_nas_eps_cp_backoff_cap;
+static int hf_nas_eps_restrict_ec_cap;
+static int hf_nas_eps_v2x_pc5_cap;
+static int hf_nas_eps_multiple_drb_cap;
+static int hf_nas_eps_rpr_cap;
+static int hf_nas_eps_piv_cap;
+static int hf_nas_eps_ncr_cap;
+static int hf_nas_eps_v2x_nr_pc5_cap;
+static int hf_nas_eps_up_mt_edt_cap;
+static int hf_nas_eps_cp_mt_edt_cap;
+static int hf_nas_eps_wsua_cap;
+static int hf_nas_eps_racs_cap;
+static int hf_nas_eps_ptcc_cap;
+static int hf_nas_eps_pr_cap;
+static int hf_nas_eps_emm_ue_ra_cap_inf_upd_need_flg;
+static int hf_nas_eps_emm_ss_code;
+static int hf_nas_eps_emm_lcs_ind;
+static int hf_nas_eps_emm_gen_msg_cont_type;
+static int hf_nas_eps_esm_apn_ambr_ul;
+static int hf_nas_eps_esm_apn_ambr_dl;
+static int hf_nas_eps_esm_apn_ambr_ul_ext;
+static int hf_nas_eps_esm_apn_ambr_dl_ext;
+static int hf_nas_eps_esm_apn_ambr_ul_ext2;
+static int hf_nas_eps_esm_apn_ambr_dl_ext2;
+static int hf_nas_eps_esm_apn_ambr_ul_total;
+static int hf_nas_eps_esm_apn_ambr_dl_total;
+static int hf_nas_eps_emm_guti_type;
+static int hf_nas_eps_hash_mme;
+static int hf_nas_eps_replayed_nas_msg_cont;
+static int hf_nas_eps_redir_policy;
+static int hf_nas_eps_emm_5g_ea0;
+static int hf_nas_eps_emm_128_5g_ea1;
+static int hf_nas_eps_emm_128_5g_ea2;
+static int hf_nas_eps_emm_128_5g_ea3;
+static int hf_nas_eps_emm_5g_ea4;
+static int hf_nas_eps_emm_5g_ea5;
+static int hf_nas_eps_emm_5g_ea6;
+static int hf_nas_eps_emm_5g_ea7;
+static int hf_nas_eps_emm_5g_ea8;
+static int hf_nas_eps_emm_5g_ea9;
+static int hf_nas_eps_emm_5g_ea10;
+static int hf_nas_eps_emm_5g_ea11;
+static int hf_nas_eps_emm_5g_ea12;
+static int hf_nas_eps_emm_5g_ea13;
+static int hf_nas_eps_emm_5g_ea14;
+static int hf_nas_eps_emm_5g_ea15;
+static int hf_nas_eps_emm_5g_ia0;
+static int hf_nas_eps_emm_128_5g_ia1;
+static int hf_nas_eps_emm_128_5g_ia2;
+static int hf_nas_eps_emm_128_5g_ia3;
+static int hf_nas_eps_emm_5g_ia4;
+static int hf_nas_eps_emm_5g_ia5;
+static int hf_nas_eps_emm_5g_ia6;
+static int hf_nas_eps_emm_5g_ia7;
+static int hf_nas_eps_emm_5g_ia8;
+static int hf_nas_eps_emm_5g_ia9;
+static int hf_nas_eps_emm_5g_ia10;
+static int hf_nas_eps_emm_5g_ia11;
+static int hf_nas_eps_emm_5g_ia12;
+static int hf_nas_eps_emm_5g_ia13;
+static int hf_nas_eps_emm_5g_ia14;
+static int hf_nas_eps_emm_5g_ia15;
+static int hf_nas_eps_emm_cipher_key;
+static int hf_nas_eps_emm_ciph_key_data_ciphering_set_id;
+static int hf_nas_eps_emm_ciph_key_data_ciphering_key;
+static int hf_nas_eps_emm_ciph_key_data_c0_len;
+static int hf_nas_eps_emm_ciph_key_data_c0;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_1_1;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_1_2;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_1_3;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_1_4;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_1_5;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_1_6;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_1_7;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_1;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_2;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_3;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_4;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_5;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_6;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_7;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_8;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_9;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_10;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_11;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_12;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_13;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_14;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_15;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_16;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_17;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_18;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_2_19;
+static int hf_nas_eps_emm_ciph_key_data_pos_sib_type_3_1;
+static int hf_nas_eps_emm_ciph_key_data_validity_start_time;
+static int hf_nas_eps_emm_ciph_key_data_validity_duration;
+static int hf_nas_eps_emm_ciph_key_data_tais_list_len;
+static int hf_nas_eps_emm_detach_req_UL;
+static int hf_nas_eps_emm_detach_req_DL;
+static int hf_nas_eps_emm_switch_off;
+static int hf_nas_eps_emm_detach_type_UL;
+static int hf_nas_eps_emm_detach_type_DL;
+static int hf_nas_eps_emm_5g_ehc_cp_ciot;
+static int hf_nas_eps_emm_5gs_pnb_ciot;
+static int hf_nas_eps_emm_5g_up_ciot;
+static int hf_nas_eps_emm_5g_hc_cp_ciot;
+static int hf_nas_eps_emm_n3_data;
+static int hf_nas_eps_emm_5g_cp_ciot;
+static int hf_nas_eps_emm_ue_radio_cap_id_available;
+static int hf_nas_eps_emm_ue_radio_cap_id_request;
+static int hf_nas_eps_emm_wus_assist_info_type;
+static int hf_nas_eps_emm_wus_assist_info_ue_paging_prob;
+static int hf_nas_eps_emm_nb_s1_drx_param;
+static int hf_nas_eps_emm_imsi_offset;
+static int hf_nas_eps_emm_ue_request_type;
+static int hf_nas_eps_emm_paging_restriction_type;
+static int hf_nas_eps_emm_paging_restriction_ebi7;
+static int hf_nas_eps_emm_paging_restriction_ebi6;
+static int hf_nas_eps_emm_paging_restriction_ebi5;
+static int hf_nas_eps_emm_paging_restriction_ebi4;
+static int hf_nas_eps_emm_paging_restriction_ebi3;
+static int hf_nas_eps_emm_paging_restriction_ebi2;
+static int hf_nas_eps_emm_paging_restriction_ebi1;
+static int hf_nas_eps_emm_paging_restriction_ebi0;
+static int hf_nas_eps_emm_paging_restriction_ebi15;
+static int hf_nas_eps_emm_paging_restriction_ebi14;
+static int hf_nas_eps_emm_paging_restriction_ebi13;
+static int hf_nas_eps_emm_paging_restriction_ebi12;
+static int hf_nas_eps_emm_paging_restriction_ebi11;
+static int hf_nas_eps_emm_paging_restriction_ebi10;
+static int hf_nas_eps_emm_paging_restriction_ebi9;
+static int hf_nas_eps_emm_paging_restriction_ebi8;
+static int hf_nas_eps_emm_paging_restriction_decision;
+
+static int hf_nas_eps_esm_qci;
+static int hf_nas_eps_esm_mbr_ul;
+static int hf_nas_eps_esm_mbr_dl;
+static int hf_nas_eps_esm_gbr_ul;
+static int hf_nas_eps_esm_gbr_dl;
+static int hf_nas_eps_esm_embr_ul;
+static int hf_nas_eps_esm_embr_dl;
+static int hf_nas_eps_esm_egbr_ul;
+static int hf_nas_eps_esm_egbr_dl;
+static int hf_nas_eps_esm_cause;
+static int hf_nas_eps_esm_eit;
+static int hf_nas_eps_esm_notif_ind;
+static int hf_nas_eps_esm_pdn_type;
+static int hf_nas_eps_esm_pdn_ipv4;
+static int hf_nas_eps_esm_pdn_ipv6_if_id;
+static int hf_nas_eps_esm_eplmnc;
+static int hf_nas_eps_esm_ratc;
+static int hf_nas_eps_esm_linked_bearer_id;
+static int hf_nas_eps_esm_nbifom_cont;
+static int hf_nas_eps_esm_remote_ue_context_list_nb_ue_contexts;
+static int hf_nas_eps_esm_remote_ue_context_list_ue_context_len;
+static int hf_nas_eps_esm_remote_ue_context_list_ue_context_nb_user_id;
+static int hf_nas_eps_esm_remote_ue_context_list_ue_context_user_id_len;
+static int hf_nas_eps_esm_remote_ue_context_list_ue_context_odd_even_indic;
+static int hf_nas_eps_esm_remote_ue_context_list_ue_context_user_id_type;
+static int hf_nas_eps_esm_remote_ue_context_list_ue_context_encr_imsi;
+static int hf_nas_eps_esm_remote_ue_context_list_ue_context_msisdn;
+static int hf_nas_eps_esm_remote_ue_context_list_ue_context_imei;
+static int hf_nas_eps_esm_remote_ue_context_list_ue_context_imeisv;
+static int hf_nas_eps_esm_remote_ue_context_list_ue_context_address_type;
+static int hf_nas_eps_esm_remote_ue_context_list_ue_context_ipv4;
+static int hf_nas_eps_esm_remote_ue_context_list_ue_context_port_number;
+static int hf_nas_eps_esm_remote_ue_context_list_ue_context_ipv6_prefix;
+static int hf_nas_eps_esm_pkmf_address_type;
+static int hf_nas_eps_esm_pkmf_ipv4;
+static int hf_nas_eps_esm_pkmf_ipv6;
+static int hf_nas_eps_esm_hdr_comp_config_prof_0104;
+static int hf_nas_eps_esm_hdr_comp_config_prof_0103;
+static int hf_nas_eps_esm_hdr_comp_config_prof_0102;
+static int hf_nas_eps_esm_hdr_comp_config_prof_0006;
+static int hf_nas_eps_esm_hdr_comp_config_prof_0004;
+static int hf_nas_eps_esm_hdr_comp_config_prof_0003;
+static int hf_nas_eps_esm_hdr_comp_config_prof_0002;
+static int hf_nas_eps_esm_hdr_compr_config_max_cid;
+static int hf_nas_eps_esm_hdr_compr_config_add_hdr_compr_cxt_setup_params_type;
+static int hf_nas_eps_esm_hdr_compr_config_add_hdr_compr_cxt_setup_params_cont;
+static int hf_nas_eps_esm_ctrl_plane_only_ind_cpoi;
+static int hf_nas_eps_esm_user_data_cont;
+static int hf_nas_eps_esm_rel_assist_ind_ddx;
+static int hf_nas_eps_esm_hdr_compr_config_status_ebi7;
+static int hf_nas_eps_esm_hdr_compr_config_status_ebi6;
+static int hf_nas_eps_esm_hdr_compr_config_status_ebi5;
+static int hf_nas_eps_esm_hdr_compr_config_status_ebi4;
+static int hf_nas_eps_esm_hdr_compr_config_status_ebi3;
+static int hf_nas_eps_esm_hdr_compr_config_status_ebi2;
+static int hf_nas_eps_esm_hdr_compr_config_status_ebi1;
+static int hf_nas_eps_esm_spare_bits0x0100;
+static int hf_nas_eps_esm_hdr_compr_config_status_ebi15;
+static int hf_nas_eps_esm_hdr_compr_config_status_ebi14;
+static int hf_nas_eps_esm_hdr_compr_config_status_ebi13;
+static int hf_nas_eps_esm_hdr_compr_config_status_ebi12;
+static int hf_nas_eps_esm_hdr_compr_config_status_ebi11;
+static int hf_nas_eps_esm_hdr_compr_config_status_ebi10;
+static int hf_nas_eps_esm_hdr_compr_config_status_ebi9;
+static int hf_nas_eps_esm_hdr_compr_config_status_ebi8;
+static int hf_nas_eps_esm_serv_plmn_rate_ctrl_val;
+static int hf_nas_eps_esm_ext_apn_ambr_dl_unit;
+static int hf_nas_eps_esm_ext_apn_ambr_dl;
+static int hf_nas_eps_esm_ext_apn_ambr_ul_unit;
+static int hf_nas_eps_esm_ext_apn_ambr_ul;
+static int hf_nas_eps_esm_ext_mbr_unit;
+static int hf_nas_eps_esm_ext_mbr_ul;
+static int hf_nas_eps_esm_ext_mbr_dl;
+static int hf_nas_eps_esm_ext_gbr_unit;
+static int hf_nas_eps_esm_ext_gbr_ul;
+static int hf_nas_eps_esm_ext_gbr_dl;
+
+static int hf_nas_eps_active_flg;
+static int hf_nas_eps_ctrl_plane_serv_type;
+static int hf_nas_eps_eps_update_result_value;
+static int hf_nas_eps_eps_update_type_value;
+static int hf_nas_eps_service_type;
+
+static int hf_nas_eps_nas_msg_cont;
+static int hf_nas_eps_gen_msg_cont;
+
+static int hf_nas_eps_cmn_add_info;
+static int hf_nas_eps_esm_request_type;
 
 /* ESM */
-static int hf_nas_eps_msg_esm_type = -1;
-int hf_nas_eps_esm_elem_id = -1;
-static int hf_nas_eps_esm_proc_trans_id = -1;
+static int hf_nas_eps_msg_esm_type;
+int hf_nas_eps_esm_elem_id;
+static int hf_nas_eps_esm_proc_trans_id;
 
 /* Initialize the subtree pointers */
-static int ett_nas_eps = -1;
-static int ett_nas_eps_esm_msg_cont = -1;
-static int ett_nas_eps_nas_msg_cont = -1;
-static int ett_nas_eps_gen_msg_cont = -1;
-static int ett_nas_eps_cmn_add_info = -1;
-static int ett_nas_eps_remote_ue_context = -1;
-static int ett_nas_eps_esm_user_data_cont = -1;
-static int ett_nas_eps_replayed_nas_msg_cont = -1;
-static int ett_nas_eps_ext_emerg_num = -1;
-static int ett_nas_eps_ciph_data_set = -1;
-static int ett_nas_eps_wus_assist_info_type = -1;
-
-static expert_field ei_nas_eps_extraneous_data = EI_INIT;
-static expert_field ei_nas_eps_unknown_identity = EI_INIT;
-static expert_field ei_nas_eps_unknown_type_of_list = EI_INIT;
-static expert_field ei_nas_eps_wrong_nb_of_elems = EI_INIT;
-static expert_field ei_nas_eps_unknown_msg_type = EI_INIT;
-static expert_field ei_nas_eps_unknown_pd = EI_INIT;
-static expert_field ei_nas_eps_esm_tp_not_integ_prot = EI_INIT;
-static expert_field ei_nas_eps_sec_hdr_wrong_pd = EI_INIT;
-static expert_field ei_nas_eps_missing_mandatory_elemen = EI_INIT;
+static int ett_nas_eps;
+static int ett_nas_eps_esm_msg_cont;
+static int ett_nas_eps_nas_msg_cont;
+static int ett_nas_eps_gen_msg_cont;
+static int ett_nas_eps_cmn_add_info;
+static int ett_nas_eps_remote_ue_context;
+static int ett_nas_eps_esm_user_data_cont;
+static int ett_nas_eps_replayed_nas_msg_cont;
+static int ett_nas_eps_ext_emerg_num;
+static int ett_nas_eps_ciph_data_set;
+static int ett_nas_eps_wus_assist_info_type;
+
+static expert_field ei_nas_eps_extraneous_data;
+static expert_field ei_nas_eps_unknown_identity;
+static expert_field ei_nas_eps_unknown_type_of_list;
+static expert_field ei_nas_eps_wrong_nb_of_elems;
+static expert_field ei_nas_eps_unknown_msg_type;
+static expert_field ei_nas_eps_unknown_pd;
+static expert_field ei_nas_eps_esm_tp_not_integ_prot;
+static expert_field ei_nas_eps_sec_hdr_wrong_pd;
+static expert_field ei_nas_eps_missing_mandatory_elemen;
 
 /* Global variables */
 static gboolean g_nas_eps_dissect_plain = FALSE;
diff --git a/epan/dissectors/packet-nasdaq-itch.c b/epan/dissectors/packet-nasdaq-itch.c
index 3b7005fd5d..d16f2d9931 100644
--- a/epan/dissectors/packet-nasdaq-itch.c
+++ b/epan/dissectors/packet-nasdaq-itch.c
@@ -100,40 +100,40 @@ static const value_string round_lots_only_val[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_nasdaq_itch = -1;
+static int proto_nasdaq_itch;
 
 /* Initialize the subtree pointers */
-static gint ett_nasdaq_itch = -1;
-
-static int hf_nasdaq_itch_version = -1;
-
-static int hf_nasdaq_itch_message_type = -1;
-static int hf_nasdaq_itch_market_category = -1;
-static int hf_nasdaq_itch_financial_status = -1;
-static int hf_nasdaq_itch_stock = -1;
-static int hf_nasdaq_itch_round_lot_size = -1;
-static int hf_nasdaq_itch_round_lots_only = -1;
-
-static int hf_nasdaq_itch_system_event = -1;
-static int hf_nasdaq_itch_second = -1;
-static int hf_nasdaq_itch_millisecond = -1;
-
-static int hf_nasdaq_itch_message = -1;
-
-static int hf_nasdaq_itch_trading_state = -1;
-static int hf_nasdaq_itch_reserved = -1;
-static int hf_nasdaq_itch_reason = -1;
-static int hf_nasdaq_itch_order_reference = -1;
-static int hf_nasdaq_itch_buy_sell = -1;
-static int hf_nasdaq_itch_shares = -1;
-static int hf_nasdaq_itch_price = -1;
-static int hf_nasdaq_itch_attribution = -1;
-static int hf_nasdaq_itch_executed = -1;
-static int hf_nasdaq_itch_match = -1;
-static int hf_nasdaq_itch_printable = -1;
-static int hf_nasdaq_itch_execution_price = -1;
-static int hf_nasdaq_itch_canceled = -1;
-static int hf_nasdaq_itch_cross = -1;
+static gint ett_nasdaq_itch;
+
+static int hf_nasdaq_itch_version;
+
+static int hf_nasdaq_itch_message_type;
+static int hf_nasdaq_itch_market_category;
+static int hf_nasdaq_itch_financial_status;
+static int hf_nasdaq_itch_stock;
+static int hf_nasdaq_itch_round_lot_size;
+static int hf_nasdaq_itch_round_lots_only;
+
+static int hf_nasdaq_itch_system_event;
+static int hf_nasdaq_itch_second;
+static int hf_nasdaq_itch_millisecond;
+
+static int hf_nasdaq_itch_message;
+
+static int hf_nasdaq_itch_trading_state;
+static int hf_nasdaq_itch_reserved;
+static int hf_nasdaq_itch_reason;
+static int hf_nasdaq_itch_order_reference;
+static int hf_nasdaq_itch_buy_sell;
+static int hf_nasdaq_itch_shares;
+static int hf_nasdaq_itch_price;
+static int hf_nasdaq_itch_attribution;
+static int hf_nasdaq_itch_executed;
+static int hf_nasdaq_itch_match;
+static int hf_nasdaq_itch_printable;
+static int hf_nasdaq_itch_execution_price;
+static int hf_nasdaq_itch_canceled;
+static int hf_nasdaq_itch_cross;
 
 /* ---------------------- */
 static int
diff --git a/epan/dissectors/packet-nasdaq-soup.c b/epan/dissectors/packet-nasdaq-soup.c
index a0b7e9aec0..afb584aee0 100644
--- a/epan/dissectors/packet-nasdaq-soup.c
+++ b/epan/dissectors/packet-nasdaq-soup.c
@@ -42,7 +42,7 @@ static const value_string reject_code_val[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_nasdaq_soup = -1;
+static int proto_nasdaq_soup;
 static dissector_handle_t nasdaq_soup_handle;
 static dissector_handle_t nasdaq_itch_handle;
 
@@ -50,17 +50,17 @@ static dissector_handle_t nasdaq_itch_handle;
 static gboolean nasdaq_soup_desegment = TRUE;
 
 /* Initialize the subtree pointers */
-static gint ett_nasdaq_soup = -1;
-
-static int hf_nasdaq_soup_packet_type = -1;
-static int hf_nasdaq_soup_message = -1;
-static int hf_nasdaq_soup_text = -1;
-static int hf_nasdaq_soup_packet_eol = -1;
-static int hf_nasdaq_soup_username = -1;
-static int hf_nasdaq_soup_password = -1;
-static int hf_nasdaq_soup_session = -1;
-static int hf_nasdaq_soup_seq_number = -1;
-static int hf_nasdaq_soup_reject_code = -1;
+static gint ett_nasdaq_soup;
+
+static int hf_nasdaq_soup_packet_type;
+static int hf_nasdaq_soup_message;
+static int hf_nasdaq_soup_text;
+static int hf_nasdaq_soup_packet_eol;
+static int hf_nasdaq_soup_username;
+static int hf_nasdaq_soup_password;
+static int hf_nasdaq_soup_session;
+static int hf_nasdaq_soup_seq_number;
+static int hf_nasdaq_soup_reject_code;
 
 static void
 dissect_nasdaq_soup_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, proto_tree *tree, int offset, int linelen)
diff --git a/epan/dissectors/packet-nat-pmp.c b/epan/dissectors/packet-nat-pmp.c
index 036bffd3f5..5036fca1de 100644
--- a/epan/dissectors/packet-nat-pmp.c
+++ b/epan/dissectors/packet-nat-pmp.c
@@ -61,87 +61,87 @@ static dissector_handle_t pcp_handle;
 #define OPT_PREFIX64            129
 #define OPT_PORT_SET            130
 
-static int proto_nat_pmp = -1;
-static int proto_pcp = -1;
-
-static int hf_version = -1;
-static int hf_opcode = -1;
-static int hf_result_code = -1;
-static int hf_sssoe = -1;
-static int hf_external_ip = -1;
-static int hf_reserved = -1;
-static int hf_internal_port = -1;
-static int hf_external_port_requested = -1;
-static int hf_external_port_mapped = -1;
-static int hf_rpmlis = -1;
-static int hf_pmlis = -1;
-
-static gint ett_nat_pmp = -1;
+static int proto_nat_pmp;
+static int proto_pcp;
+
+static int hf_version;
+static int hf_opcode;
+static int hf_result_code;
+static int hf_sssoe;
+static int hf_external_ip;
+static int hf_reserved;
+static int hf_internal_port;
+static int hf_external_port_requested;
+static int hf_external_port_mapped;
+static int hf_rpmlis;
+static int hf_pmlis;
+
+static gint ett_nat_pmp;
 
 /* Port Control Protocol */
-static int hf_pcp_version = -1;
-static int hf_request = -1;
-static int hf_response = -1;
-static int hf_pcp_r = -1;
-static int hf_pcp_opcode = -1;
-static int hf_pcp_result_code = -1;
-static int hf_reserved1 = -1;
-static int hf_reserved2 = -1;
-static int hf_reserved12 = -1;
-static int hf_req_lifetime = -1;
-static int hf_rsp_lifetime = -1;
-static int hf_client_ip = -1;
-static int hf_epoch_time = -1;
-static int hf_map_nonce = -1;
-static int hf_map_protocol = -1;
-static int hf_map_reserved1 = -1;
-static int hf_map_internal_port = -1;
-static int hf_map_req_sug_external_port = -1;
-static int hf_map_req_sug_ext_ip = -1;
-static int hf_map_rsp_assigned_external_port = -1;
-static int hf_map_rsp_assigned_ext_ip = -1;
-static int hf_peer_nonce = -1;
-static int hf_peer_protocol = -1;
-static int hf_peer_reserved = -1;
-static int hf_peer_internal_port = -1;
-static int hf_peer_req_sug_external_port = -1;
-static int hf_peer_req_sug_ext_ip = -1;
-static int hf_peer_remote_peer_port = -1;
-static int hf_peer_remote_peer_ip = -1;
-static int hf_peer_rsp_assigned_external_port = -1;
-static int hf_peer_rsp_assigned_ext_ip = -1;
-static int hf_options = -1;
-static int hf_option = -1;
-static int hf_option_code = -1;
-static int hf_option_reserved = -1;
-static int hf_option_length = -1;
-static int hf_option_third_party_internal_ip = -1;
-static int hf_option_filter_reserved = -1;
-static int hf_option_filter_prefix_length = -1;
-static int hf_option_filter_remote_peer_port = -1;
-static int hf_option_filter_remote_peer_ip = -1;
-static int hf_option_description = -1;
-static int hf_option_p64_length = -1;
-static int hf_option_p64_prefix64 = -1;
-static int hf_option_p64_suffix = -1;
-static int hf_option_p64_ipv4_prefix_count = -1;
-static int hf_option_p64_ipv4_prefix_length = -1;
-static int hf_option_p64_ipv4_address = -1;
-static int hf_option_portset_size = -1;
-static int hf_option_portset_first_suggested_port = -1;
-static int hf_option_portset_first_assigned_port = -1;
-static int hf_option_portset_reserved = -1;
-static int hf_option_portset_parity = -1;
-static int hf_option_padding = -1;
-
-static gint ett_pcp = -1;
-static gint ett_opcode = -1;
-static gint ett_option = -1;
-static gint ett_suboption = -1;
-
-static expert_field ei_natpmp_opcode_unknown = EI_INIT;
-static expert_field ei_pcp_opcode_unknown = EI_INIT;
-static expert_field ei_pcp_option_unknown = EI_INIT;
+static int hf_pcp_version;
+static int hf_request;
+static int hf_response;
+static int hf_pcp_r;
+static int hf_pcp_opcode;
+static int hf_pcp_result_code;
+static int hf_reserved1;
+static int hf_reserved2;
+static int hf_reserved12;
+static int hf_req_lifetime;
+static int hf_rsp_lifetime;
+static int hf_client_ip;
+static int hf_epoch_time;
+static int hf_map_nonce;
+static int hf_map_protocol;
+static int hf_map_reserved1;
+static int hf_map_internal_port;
+static int hf_map_req_sug_external_port;
+static int hf_map_req_sug_ext_ip;
+static int hf_map_rsp_assigned_external_port;
+static int hf_map_rsp_assigned_ext_ip;
+static int hf_peer_nonce;
+static int hf_peer_protocol;
+static int hf_peer_reserved;
+static int hf_peer_internal_port;
+static int hf_peer_req_sug_external_port;
+static int hf_peer_req_sug_ext_ip;
+static int hf_peer_remote_peer_port;
+static int hf_peer_remote_peer_ip;
+static int hf_peer_rsp_assigned_external_port;
+static int hf_peer_rsp_assigned_ext_ip;
+static int hf_options;
+static int hf_option;
+static int hf_option_code;
+static int hf_option_reserved;
+static int hf_option_length;
+static int hf_option_third_party_internal_ip;
+static int hf_option_filter_reserved;
+static int hf_option_filter_prefix_length;
+static int hf_option_filter_remote_peer_port;
+static int hf_option_filter_remote_peer_ip;
+static int hf_option_description;
+static int hf_option_p64_length;
+static int hf_option_p64_prefix64;
+static int hf_option_p64_suffix;
+static int hf_option_p64_ipv4_prefix_count;
+static int hf_option_p64_ipv4_prefix_length;
+static int hf_option_p64_ipv4_address;
+static int hf_option_portset_size;
+static int hf_option_portset_first_suggested_port;
+static int hf_option_portset_first_assigned_port;
+static int hf_option_portset_reserved;
+static int hf_option_portset_parity;
+static int hf_option_padding;
+
+static gint ett_pcp;
+static gint ett_opcode;
+static gint ett_option;
+static gint ett_suboption;
+
+static expert_field ei_natpmp_opcode_unknown;
+static expert_field ei_pcp_opcode_unknown;
+static expert_field ei_pcp_option_unknown;
 
 static const value_string opcode_vals[] = {
   { EXTERNAL_ADDRESS_REQUEST,  "External Address Request"   },
diff --git a/epan/dissectors/packet-nb_rtpmux.c b/epan/dissectors/packet-nb_rtpmux.c
index 3e87729571..9e3160ca90 100644
--- a/epan/dissectors/packet-nb_rtpmux.c
+++ b/epan/dissectors/packet-nb_rtpmux.c
@@ -17,20 +17,20 @@ void proto_register_nb_rtpmux(void);
 void proto_reg_handoff_nb_rtpmux(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_nb_rtpmux = -1;
-static int hf_nb_rtpmux_compressed = -1;
-static int hf_nb_rtpmux_dstport    = -1;
-static int hf_nb_rtpmux_length     = -1;
-static int hf_nb_r_bit             = -1;
-static int hf_nb_rtpmux_srcport    = -1;
-static int hf_nb_rtpmux_data       = -1;
-static int hf_nb_rtpmux_cmp_rtp_sequence_no   = -1;
-static int hf_nb_rtpmux_cmp_rtp_timestamp     = -1;
-static int hf_nb_rtpmux_cmp_rtp_data          = -1;
+static int proto_nb_rtpmux;
+static int hf_nb_rtpmux_compressed;
+static int hf_nb_rtpmux_dstport;
+static int hf_nb_rtpmux_length;
+static int hf_nb_r_bit;
+static int hf_nb_rtpmux_srcport;
+static int hf_nb_rtpmux_data;
+static int hf_nb_rtpmux_cmp_rtp_sequence_no;
+static int hf_nb_rtpmux_cmp_rtp_timestamp;
+static int hf_nb_rtpmux_cmp_rtp_data;
 
 /* Initialize the subtree pointers */
-static gint ett_nb_rtpmux = -1;
-static gint ett_nb_rtpmux_cmp_rtp_hdr = -1;
+static gint ett_nb_rtpmux;
+static gint ett_nb_rtpmux_cmp_rtp_hdr;
 
 static dissector_handle_t nb_rtpmux_handle;
 static dissector_handle_t rtpdissector;
diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c
index 25c1b03607..f09ca811ea 100644
--- a/epan/dissectors/packet-nbd.c
+++ b/epan/dissectors/packet-nbd.c
@@ -19,19 +19,19 @@
 void proto_register_nbd(void);
 void proto_reg_handoff_nbd(void);
 
-static gint proto_nbd = -1;
-static int hf_nbd_magic = -1;
-static int hf_nbd_type = -1;
-static int hf_nbd_error = -1;
-static int hf_nbd_handle = -1;
-static int hf_nbd_from = -1;
-static int hf_nbd_len = -1;
-static int hf_nbd_response_in = -1;
-static int hf_nbd_response_to = -1;
-static int hf_nbd_time = -1;
-static int hf_nbd_data = -1;
-
-static gint ett_nbd = -1;
+static gint proto_nbd;
+static int hf_nbd_magic;
+static int hf_nbd_type;
+static int hf_nbd_error;
+static int hf_nbd_handle;
+static int hf_nbd_from;
+static int hf_nbd_len;
+static int hf_nbd_response_in;
+static int hf_nbd_response_to;
+static int hf_nbd_time;
+static int hf_nbd_data;
+
+static gint ett_nbd;
 
 
 static gboolean nbd_desegment = TRUE;
diff --git a/epan/dissectors/packet-nbifom.c b/epan/dissectors/packet-nbifom.c
index c5ebae779b..d6a4dbb799 100644
--- a/epan/dissectors/packet-nbifom.c
+++ b/epan/dissectors/packet-nbifom.c
@@ -16,61 +16,61 @@
 
 void proto_register_nbifom(void);
 
-static int proto_nbifom = -1;
-static int hf_nbifom_param_id_ul = -1;
-static int hf_nbifom_param_id_dl = -1;
-static int hf_nbifom_param_contents_len = -1;
-static int hf_nbifom_param_contents_dflt_access = -1;
-static int hf_nbifom_param_contents_status = -1;
-static int hf_nbifom_param_contents_ran_rules_handling = -1;
-static int hf_nbifom_param_contents_ran_rules_status = -1;
-static int hf_nbifom_param_contents_access_use_ind_spare = -1;
-static int hf_nbifom_param_contents_access_use_ind_wlan_access_usable_val = -1;
-static int hf_nbifom_param_contents_access_use_ind_3gpp_access_usable_val = -1;
-static int hf_nbifom_param_contents_mode = -1;
-static int hf_nbifom_param_contents_rem_bytes = -1;
-static int hf_nbifom_routing_rule_len = -1;
-static int hf_nbifom_routing_rule_id = -1;
-static int hf_nbifom_routing_rule_routing_access = -1;
-static int hf_nbifom_routing_rule_spare = -1;
-static int hf_nbifom_routing_rule_op_code = -1;
-static int hf_nbifom_routing_rule_prio = -1;
-static int hf_nbifom_routing_rule_flags = -1;
-static int hf_nbifom_routing_rule_flags_prot_type_nxt_hdr = -1;
-static int hf_nbifom_routing_rule_flags_ipsec_spi = -1;
-static int hf_nbifom_routing_rule_flags_dst_addr_prefix_len = -1;
-static int hf_nbifom_routing_rule_flags_src_addr_prefix_len = -1;
-static int hf_nbifom_routing_rule_flags_dst_ipv6_addr = -1;
-static int hf_nbifom_routing_rule_flags_src_ipv6_addr = -1;
-static int hf_nbifom_routing_rule_flags_dst_ipv4_addr = -1;
-static int hf_nbifom_routing_rule_flags_src_ipv4_addr = -1;
-static int hf_nbifom_routing_rule_flags_spare_bits0xc0 = -1;
-static int hf_nbifom_routing_rule_flags_flow_label = -1;
-static int hf_nbifom_routing_rule_flags_tos = -1;
-static int hf_nbifom_routing_rule_flags_end_dst_port_range = -1;
-static int hf_nbifom_routing_rule_flags_start_dst_port_range = -1;
-static int hf_nbifom_routing_rule_flags_end_src_port_range = -1;
-static int hf_nbifom_routing_rule_flags_start_src_port_range = -1;
-static int hf_nbifom_routing_rule_flags_spare_bits0xffff = -1;
-static int hf_nbifom_routing_rule_src_ipv4_addr = -1;
-static int hf_nbifom_routing_rule_dst_ipv4_addr = -1;
-static int hf_nbifom_routing_rule_src_ipv6_addr = -1;
-static int hf_nbifom_routing_rule_dst_ipv6_addr = -1;
-static int hf_nbifom_routing_rule_src_addr_prefix_len = -1;
-static int hf_nbifom_routing_rule_dst_addr_prefix_len = -1;
-static int hf_nbifom_routing_rule_ipsec_spi = -1;
-static int hf_nbifom_routing_rule_prot_type_nxt_hdr = -1;
-static int hf_nbifom_routing_rule_start_src_port_range = -1;
-static int hf_nbifom_routing_rule_end_src_port_range = -1;
-static int hf_nbifom_routing_rule_start_dst_port_range = -1;
-static int hf_nbifom_routing_rule_end_dst_port_range = -1;
-static int hf_nbifom_routing_rule_tos = -1;
-static int hf_nbifom_routing_rule_flow_label = -1;
+static int proto_nbifom;
+static int hf_nbifom_param_id_ul;
+static int hf_nbifom_param_id_dl;
+static int hf_nbifom_param_contents_len;
+static int hf_nbifom_param_contents_dflt_access;
+static int hf_nbifom_param_contents_status;
+static int hf_nbifom_param_contents_ran_rules_handling;
+static int hf_nbifom_param_contents_ran_rules_status;
+static int hf_nbifom_param_contents_access_use_ind_spare;
+static int hf_nbifom_param_contents_access_use_ind_wlan_access_usable_val;
+static int hf_nbifom_param_contents_access_use_ind_3gpp_access_usable_val;
+static int hf_nbifom_param_contents_mode;
+static int hf_nbifom_param_contents_rem_bytes;
+static int hf_nbifom_routing_rule_len;
+static int hf_nbifom_routing_rule_id;
+static int hf_nbifom_routing_rule_routing_access;
+static int hf_nbifom_routing_rule_spare;
+static int hf_nbifom_routing_rule_op_code;
+static int hf_nbifom_routing_rule_prio;
+static int hf_nbifom_routing_rule_flags;
+static int hf_nbifom_routing_rule_flags_prot_type_nxt_hdr;
+static int hf_nbifom_routing_rule_flags_ipsec_spi;
+static int hf_nbifom_routing_rule_flags_dst_addr_prefix_len;
+static int hf_nbifom_routing_rule_flags_src_addr_prefix_len;
+static int hf_nbifom_routing_rule_flags_dst_ipv6_addr;
+static int hf_nbifom_routing_rule_flags_src_ipv6_addr;
+static int hf_nbifom_routing_rule_flags_dst_ipv4_addr;
+static int hf_nbifom_routing_rule_flags_src_ipv4_addr;
+static int hf_nbifom_routing_rule_flags_spare_bits0xc0;
+static int hf_nbifom_routing_rule_flags_flow_label;
+static int hf_nbifom_routing_rule_flags_tos;
+static int hf_nbifom_routing_rule_flags_end_dst_port_range;
+static int hf_nbifom_routing_rule_flags_start_dst_port_range;
+static int hf_nbifom_routing_rule_flags_end_src_port_range;
+static int hf_nbifom_routing_rule_flags_start_src_port_range;
+static int hf_nbifom_routing_rule_flags_spare_bits0xffff;
+static int hf_nbifom_routing_rule_src_ipv4_addr;
+static int hf_nbifom_routing_rule_dst_ipv4_addr;
+static int hf_nbifom_routing_rule_src_ipv6_addr;
+static int hf_nbifom_routing_rule_dst_ipv6_addr;
+static int hf_nbifom_routing_rule_src_addr_prefix_len;
+static int hf_nbifom_routing_rule_dst_addr_prefix_len;
+static int hf_nbifom_routing_rule_ipsec_spi;
+static int hf_nbifom_routing_rule_prot_type_nxt_hdr;
+static int hf_nbifom_routing_rule_start_src_port_range;
+static int hf_nbifom_routing_rule_end_src_port_range;
+static int hf_nbifom_routing_rule_start_dst_port_range;
+static int hf_nbifom_routing_rule_end_dst_port_range;
+static int hf_nbifom_routing_rule_tos;
+static int hf_nbifom_routing_rule_flow_label;
 
-static gint ett_nbifom = -1;
-static gint ett_nbifom_param_contents = -1;
-static gint ett_nbifom_routing_rule = -1;
-static gint ett_nbifom_routing_rule_flags = -1;
+static gint ett_nbifom;
+static gint ett_nbifom_param_contents;
+static gint ett_nbifom_routing_rule;
+static gint ett_nbifom_routing_rule_flags;
 
 static const value_string nbifom_param_id_ue_to_nw_vals[] = {
     { 0x00, "Not assigned" },
diff --git a/epan/dissectors/packet-nbipx.c b/epan/dissectors/packet-nbipx.c
index 566d5e1809..aad9d266c7 100644
--- a/epan/dissectors/packet-nbipx.c
+++ b/epan/dissectors/packet-nbipx.c
@@ -23,36 +23,36 @@ void proto_reg_handoff_nmpi(void);
 static dissector_handle_t nbipx_handle;
 static dissector_handle_t nmpi_handle;
 
-static int proto_nbipx = -1;
-static int hf_nbipx_packettype = -1;
-static int hf_nbipx_name_flags = -1;
-static int hf_nbipx_name_flags_group = -1;
-static int hf_nbipx_name_flags_in_use = -1;
-static int hf_nbipx_name_flags_registered = -1;
-static int hf_nbipx_name_flags_duplicated = -1;
-static int hf_nbipx_name_flags_deregistered = -1;
-static int hf_nbipx_conn_control = -1;
-static int hf_nbipx_conn_control_sys_packet = -1;
-static int hf_nbipx_conn_control_ack = -1;
-static int hf_nbipx_conn_control_attention = -1;
-static int hf_nbipx_conn_control_end_msg = -1;
-static int hf_nbipx_conn_control_resend = -1;
-static int hf_nbipx_session_src_conn_id = -1;
-static int hf_nbipx_session_dest_conn_id = -1;
-static int hf_nbipx_session_send_seq_number = -1;
-static int hf_nbipx_session_total_data_length = -1;
-static int hf_nbipx_session_offset = -1;
-static int hf_nbipx_session_data_length = -1;
-static int hf_nbipx_session_recv_seq_number = -1;
-static int hf_nbipx_session_bytes_received = -1;
-static int hf_nbipx_ipx_network = -1;
-static int hf_nbipx_opcode = -1;
-static int hf_nbipx_name_type = -1;
-static int hf_nbipx_messageid = -1;
-
-static gint ett_nbipx = -1;
-static gint ett_nbipx_conn_ctrl = -1;
-static gint ett_nbipx_name_type_flags = -1;
+static int proto_nbipx;
+static int hf_nbipx_packettype;
+static int hf_nbipx_name_flags;
+static int hf_nbipx_name_flags_group;
+static int hf_nbipx_name_flags_in_use;
+static int hf_nbipx_name_flags_registered;
+static int hf_nbipx_name_flags_duplicated;
+static int hf_nbipx_name_flags_deregistered;
+static int hf_nbipx_conn_control;
+static int hf_nbipx_conn_control_sys_packet;
+static int hf_nbipx_conn_control_ack;
+static int hf_nbipx_conn_control_attention;
+static int hf_nbipx_conn_control_end_msg;
+static int hf_nbipx_conn_control_resend;
+static int hf_nbipx_session_src_conn_id;
+static int hf_nbipx_session_dest_conn_id;
+static int hf_nbipx_session_send_seq_number;
+static int hf_nbipx_session_total_data_length;
+static int hf_nbipx_session_offset;
+static int hf_nbipx_session_data_length;
+static int hf_nbipx_session_recv_seq_number;
+static int hf_nbipx_session_bytes_received;
+static int hf_nbipx_ipx_network;
+static int hf_nbipx_opcode;
+static int hf_nbipx_name_type;
+static int hf_nbipx_messageid;
+
+static gint ett_nbipx;
+static gint ett_nbipx_conn_ctrl;
+static gint ett_nbipx_name_type_flags;
 
 static void dissect_conn_control(tvbuff_t *tvb, int offset, proto_tree *tree);
 
@@ -729,10 +729,10 @@ proto_reg_handoff_nbipx(void)
  *	INTYPE_WKGROUP	2
  *	INTYPE_BROWSER	3
  */
-static int proto_nmpi = -1;
+static int proto_nmpi;
 
-static gint ett_nmpi = -1;
-static gint ett_nmpi_name_type_flags = -1;
+static gint ett_nmpi;
+static gint ett_nmpi_name_type_flags;
 
 
 static int
diff --git a/epan/dissectors/packet-nbt.c b/epan/dissectors/packet-nbt.c
index c409bca51b..d1a47a66b5 100644
--- a/epan/dissectors/packet-nbt.c
+++ b/epan/dissectors/packet-nbt.c
@@ -29,105 +29,105 @@ void proto_reg_handoff_nbt(void);
 
 static dissector_handle_t nbns_handle, nbdgm_handle, nbss_handle;
 
-static int proto_nbns = -1;
-static int hf_nbns_flags = -1;
-static int hf_nbns_flags_response = -1;
-static int hf_nbns_flags_opcode = -1;
-static int hf_nbns_flags_authoritative = -1;
-static int hf_nbns_flags_truncated = -1;
-static int hf_nbns_flags_recdesired = -1;
-static int hf_nbns_flags_recavail = -1;
-static int hf_nbns_flags_broadcast = -1;
-static int hf_nbns_flags_rcode = -1;
-static int hf_nbns_transaction_id = -1;
-static int hf_nbns_count_questions = -1;
-static int hf_nbns_count_answers = -1;
-static int hf_nbns_count_auth_rr = -1;
-static int hf_nbns_count_add_rr = -1;
-static int hf_nbns_name_flags = -1;
-static int hf_nbns_name_flags_group = -1;
-static int hf_nbns_name_flags_ont = -1;
-static int hf_nbns_name_flags_drg = -1;
-static int hf_nbns_name_flags_cnf = -1;
-static int hf_nbns_name_flags_act = -1;
-static int hf_nbns_name_flags_prm = -1;
-static int hf_nbns_nb_flags = -1;
-static int hf_nbns_nb_flags_group = -1;
-static int hf_nbns_nb_flags_ont = -1;
-static int hf_nbns_name = -1;
-static int hf_nbns_type = -1;
-static int hf_nbns_class = -1;
+static int proto_nbns;
+static int hf_nbns_flags;
+static int hf_nbns_flags_response;
+static int hf_nbns_flags_opcode;
+static int hf_nbns_flags_authoritative;
+static int hf_nbns_flags_truncated;
+static int hf_nbns_flags_recdesired;
+static int hf_nbns_flags_recavail;
+static int hf_nbns_flags_broadcast;
+static int hf_nbns_flags_rcode;
+static int hf_nbns_transaction_id;
+static int hf_nbns_count_questions;
+static int hf_nbns_count_answers;
+static int hf_nbns_count_auth_rr;
+static int hf_nbns_count_add_rr;
+static int hf_nbns_name_flags;
+static int hf_nbns_name_flags_group;
+static int hf_nbns_name_flags_ont;
+static int hf_nbns_name_flags_drg;
+static int hf_nbns_name_flags_cnf;
+static int hf_nbns_name_flags_act;
+static int hf_nbns_name_flags_prm;
+static int hf_nbns_nb_flags;
+static int hf_nbns_nb_flags_group;
+static int hf_nbns_nb_flags_ont;
+static int hf_nbns_name;
+static int hf_nbns_type;
+static int hf_nbns_class;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_nbns_num_alignment_errors = -1;
-static int hf_nbns_data = -1;
-static int hf_nbns_unit_id = -1;
-static int hf_nbns_num_command_blocks = -1;
-static int hf_nbns_num_retransmits = -1;
-static int hf_nbns_period_of_statistics = -1;
-static int hf_nbns_addr = -1;
-static int hf_nbns_test_result = -1;
-static int hf_nbns_num_pending_sessions = -1;
-static int hf_nbns_num_no_resource_conditions = -1;
-static int hf_nbns_session_data_packet_size = -1;
-static int hf_nbns_version_number = -1;
-static int hf_nbns_max_num_pending_sessions = -1;
-static int hf_nbns_num_collisions = -1;
-static int hf_nbns_num_good_sends = -1;
-static int hf_nbns_num_send_aborts = -1;
-static int hf_nbns_number_of_names = -1;
-static int hf_nbns_num_crcs = -1;
-static int hf_nbns_num_good_receives = -1;
-static int hf_nbns_max_total_sessions_possible = -1;
-static int hf_nbns_jumpers = -1;
-static int hf_nbns_netbios_name = -1;
-static int hf_nbns_ttl = -1;
-static int hf_nbns_data_length = -1;
-
-static gint ett_nbns = -1;
-static gint ett_nbns_qd = -1;
-static gint ett_nbns_flags = -1;
-static gint ett_nbns_nb_flags = -1;
-static gint ett_nbns_name_flags = -1;
-static gint ett_nbns_rr = -1;
-static gint ett_nbns_qry = -1;
-static gint ett_nbns_ans = -1;
-
-static expert_field ei_nbns_incomplete_entry = EI_INIT;
-
-static int proto_nbdgm = -1;
-static int hf_nbdgm_type = -1;
-static int hf_nbdgm_flags = -1;
-static int hf_nbdgm_fragment = -1;
-static int hf_nbdgm_first = -1;
-static int hf_nbdgm_node_type = -1;
-static int hf_nbdgm_datagram_id = -1;
-static int hf_nbdgm_src_ip = -1;
-static int hf_nbdgm_src_port = -1;
-static int hf_nbdgm_datagram_length = -1;
-static int hf_nbdgm_packet_offset = -1;
-static int hf_nbdgm_error_code = -1;
-static int hf_nbdgm_source_name = -1;
-static int hf_nbdgm_destination_name = -1;
-
-static gint ett_nbdgm = -1;
-static gint ett_nbdgm_flags = -1;
-
-static int proto_nbss = -1;
-static int hf_nbss_type = -1;
-static int hf_nbss_flags = -1;
-static int hf_nbss_flags_e = -1;
-static int hf_nbss_length = -1;
-static int hf_nbss_cifs_length = -1;
-static int hf_nbss_error_code = -1;
-static int hf_nbss_retarget_ip_address = -1;
-static int hf_nbss_retarget_port = -1;
-static int hf_nbss_continuation_data = -1;
-static int hf_nbss_called_name = -1;
-static int hf_nbss_calling_name = -1;
-
-static gint ett_nbss = -1;
-static gint ett_nbss_flags = -1;
+static int hf_nbns_num_alignment_errors;
+static int hf_nbns_data;
+static int hf_nbns_unit_id;
+static int hf_nbns_num_command_blocks;
+static int hf_nbns_num_retransmits;
+static int hf_nbns_period_of_statistics;
+static int hf_nbns_addr;
+static int hf_nbns_test_result;
+static int hf_nbns_num_pending_sessions;
+static int hf_nbns_num_no_resource_conditions;
+static int hf_nbns_session_data_packet_size;
+static int hf_nbns_version_number;
+static int hf_nbns_max_num_pending_sessions;
+static int hf_nbns_num_collisions;
+static int hf_nbns_num_good_sends;
+static int hf_nbns_num_send_aborts;
+static int hf_nbns_number_of_names;
+static int hf_nbns_num_crcs;
+static int hf_nbns_num_good_receives;
+static int hf_nbns_max_total_sessions_possible;
+static int hf_nbns_jumpers;
+static int hf_nbns_netbios_name;
+static int hf_nbns_ttl;
+static int hf_nbns_data_length;
+
+static gint ett_nbns;
+static gint ett_nbns_qd;
+static gint ett_nbns_flags;
+static gint ett_nbns_nb_flags;
+static gint ett_nbns_name_flags;
+static gint ett_nbns_rr;
+static gint ett_nbns_qry;
+static gint ett_nbns_ans;
+
+static expert_field ei_nbns_incomplete_entry;
+
+static int proto_nbdgm;
+static int hf_nbdgm_type;
+static int hf_nbdgm_flags;
+static int hf_nbdgm_fragment;
+static int hf_nbdgm_first;
+static int hf_nbdgm_node_type;
+static int hf_nbdgm_datagram_id;
+static int hf_nbdgm_src_ip;
+static int hf_nbdgm_src_port;
+static int hf_nbdgm_datagram_length;
+static int hf_nbdgm_packet_offset;
+static int hf_nbdgm_error_code;
+static int hf_nbdgm_source_name;
+static int hf_nbdgm_destination_name;
+
+static gint ett_nbdgm;
+static gint ett_nbdgm_flags;
+
+static int proto_nbss;
+static int hf_nbss_type;
+static int hf_nbss_flags;
+static int hf_nbss_flags_e;
+static int hf_nbss_length;
+static int hf_nbss_cifs_length;
+static int hf_nbss_error_code;
+static int hf_nbss_retarget_ip_address;
+static int hf_nbss_retarget_port;
+static int hf_nbss_continuation_data;
+static int hf_nbss_called_name;
+static int hf_nbss_calling_name;
+
+static gint ett_nbss;
+static gint ett_nbss_flags;
 
 /* desegmentation of NBSS over TCP */
 static gboolean nbss_desegment = TRUE;
diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c
index 5e0802f7d6..fd9ae29fe6 100644
--- a/epan/dissectors/packet-ncp-nmas.c
+++ b/epan/dissectors/packet-ncp-nmas.c
@@ -18,42 +18,42 @@
 
 void proto_register_nmas(void);
 
-static gint ett_nmas = -1;
-
-static int proto_nmas = -1;
-/* static int hf_func = -1; */
-/* static int hf_subfunc = -1; */
-static int hf_ping_version = -1;
-static int hf_ping_flags = -1;
-static int hf_frag_handle = -1;
-static int hf_length = -1;
-static int hf_subverb = -1;
-static int hf_tree = -1;
-static int hf_user = -1;
-static int hf_nmas_version = -1;
-static int hf_msg_version = -1;
-static int hf_session_ident = -1;
-static int hf_verb = -1;
-static int hf_msg_verb = -1;
-/* static int hf_attribute = -1; */
-static int hf_clearance = -1;
-static int hf_login_sequence = -1;
-static int hf_opaque = -1;
-static int hf_data = -1;
-static int hf_return_code = -1;
-static int hf_lsm_verb = -1;
-static int hf_squeue_bytes = -1;
-static int hf_cqueue_bytes = -1;
-static int hf_num_creds = -1;
-static int hf_cred_type = -1;
-static int hf_login_state = -1;
-static int hf_enc_cred = -1;
-static int hf_enc_data = -1;
-static int hf_reply_buffer_size = -1;
-static int hf_encrypt_error = -1;
-
-static expert_field ei_encrypt_error = EI_INIT;
-static expert_field ei_return_error = EI_INIT;
+static gint ett_nmas;
+
+static int proto_nmas;
+/* static int hf_func; */
+/* static int hf_subfunc; */
+static int hf_ping_version;
+static int hf_ping_flags;
+static int hf_frag_handle;
+static int hf_length;
+static int hf_subverb;
+static int hf_tree;
+static int hf_user;
+static int hf_nmas_version;
+static int hf_msg_version;
+static int hf_session_ident;
+static int hf_verb;
+static int hf_msg_verb;
+/* static int hf_attribute; */
+static int hf_clearance;
+static int hf_login_sequence;
+static int hf_opaque;
+static int hf_data;
+static int hf_return_code;
+static int hf_lsm_verb;
+static int hf_squeue_bytes;
+static int hf_cqueue_bytes;
+static int hf_num_creds;
+static int hf_cred_type;
+static int hf_login_state;
+static int hf_enc_cred;
+static int hf_enc_data;
+static int hf_reply_buffer_size;
+static int hf_encrypt_error;
+
+static expert_field ei_encrypt_error;
+static expert_field ei_return_error;
 
 static const value_string nmas_func_enum[] = {
     { 0x01, "Ping" },
diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c
index 400017ac6c..493efcfc00 100644
--- a/epan/dissectors/packet-ncp-sss.c
+++ b/epan/dissectors/packet-ncp-sss.c
@@ -18,56 +18,56 @@
 
 void proto_register_sss(void);
 
-static gint ett_sss = -1;
-
-static int proto_sss = -1;
-static int hf_sss_buffer_size = -1;
-static int hf_sss_ping_version = -1;
-static int hf_sss_flags = -1;
-static int hf_sss_context = -1;
-static int hf_sss_frag_handle = -1;
-static int hf_sss_length = -1;
-static int hf_sss_verb = -1;
-static int hf_sss_user = -1;
-static int hf_sss_secret = -1;
-static int hf_sss_sss_version = -1;
-static int hf_sss_return_code = -1;
-static int hf_sss_enc_cred = -1;
-static int hf_sss_enc_data = -1;
-static int hf_sss_bit1 = -1;
-static int hf_sss_bit2 = -1;
-static int hf_sss_bit3 = -1;
-static int hf_sss_bit4 = -1;
-static int hf_sss_bit5 = -1;
-static int hf_sss_bit6 = -1;
-static int hf_sss_bit7 = -1;
-static int hf_sss_bit8 = -1;
-static int hf_sss_bit9 = -1;
-static int hf_sss_bit10 = -1;
-static int hf_sss_bit11 = -1;
-static int hf_sss_bit12 = -1;
-static int hf_sss_bit13 = -1;
-static int hf_sss_bit14 = -1;
-static int hf_sss_bit15 = -1;
-static int hf_sss_bit16 = -1;
-static int hf_sss_bit17 = -1;
-static int hf_sss_bit18 = -1;
-static int hf_sss_bit19 = -1;
-static int hf_sss_bit20 = -1;
-static int hf_sss_bit21 = -1;
-static int hf_sss_bit22 = -1;
-static int hf_sss_bit23 = -1;
-static int hf_sss_bit24 = -1;
-static int hf_sss_bit25 = -1;
-static int hf_sss_bit26 = -1;
-static int hf_sss_bit27 = -1;
-static int hf_sss_bit28 = -1;
-static int hf_sss_bit29 = -1;
-static int hf_sss_bit30 = -1;
-static int hf_sss_bit31 = -1;
-static int hf_sss_bit32 = -1;
-
-static expert_field ei_return_code = EI_INIT;
+static gint ett_sss;
+
+static int proto_sss;
+static int hf_sss_buffer_size;
+static int hf_sss_ping_version;
+static int hf_sss_flags;
+static int hf_sss_context;
+static int hf_sss_frag_handle;
+static int hf_sss_length;
+static int hf_sss_verb;
+static int hf_sss_user;
+static int hf_sss_secret;
+static int hf_sss_sss_version;
+static int hf_sss_return_code;
+static int hf_sss_enc_cred;
+static int hf_sss_enc_data;
+static int hf_sss_bit1;
+static int hf_sss_bit2;
+static int hf_sss_bit3;
+static int hf_sss_bit4;
+static int hf_sss_bit5;
+static int hf_sss_bit6;
+static int hf_sss_bit7;
+static int hf_sss_bit8;
+static int hf_sss_bit9;
+static int hf_sss_bit10;
+static int hf_sss_bit11;
+static int hf_sss_bit12;
+static int hf_sss_bit13;
+static int hf_sss_bit14;
+static int hf_sss_bit15;
+static int hf_sss_bit16;
+static int hf_sss_bit17;
+static int hf_sss_bit18;
+static int hf_sss_bit19;
+static int hf_sss_bit20;
+static int hf_sss_bit21;
+static int hf_sss_bit22;
+static int hf_sss_bit23;
+static int hf_sss_bit24;
+static int hf_sss_bit25;
+static int hf_sss_bit26;
+static int hf_sss_bit27;
+static int hf_sss_bit28;
+static int hf_sss_bit29;
+static int hf_sss_bit30;
+static int hf_sss_bit31;
+static int hf_sss_bit32;
+
+static expert_field ei_return_code;
 
 static const value_string sss_func_enum[] = {
     { 0x00000001, "Ping Server" },
diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c
index 3f968b5a35..a19b581542 100644
--- a/epan/dissectors/packet-ncp.c
+++ b/epan/dissectors/packet-ncp.c
@@ -75,58 +75,58 @@ void proto_reg_handoff_ncp(void);
 static dissector_handle_t ncp_handle;
 static dissector_handle_t ncp_tcp_handle;
 
-int proto_ncp = -1;
-static int hf_ncp_ip_ver = -1;
-static int hf_ncp_ip_length = -1;
-static int hf_ncp_ip_rplybufsize = -1;
-static int hf_ncp_ip_sig = -1;
-static int hf_ncp_ip_packetsig = -1;
-static int hf_ncp_type = -1;
-static int hf_ncp_seq = -1;
-static int hf_ncp_connection = -1;
-static int hf_ncp_task = -1;
-static int hf_ncp_stream_type = -1;
-static int hf_ncp_system_flags = -1;
-static int hf_ncp_system_flags_abt = -1;
-static int hf_ncp_system_flags_eob = -1;
-static int hf_ncp_system_flags_sys = -1;
-static int hf_ncp_system_flags_bsy = -1;
-static int hf_ncp_system_flags_lst = -1;
-static int hf_ncp_src_connection = -1;
-static int hf_ncp_dst_connection = -1;
-static int hf_ncp_packet_seqno = -1;
-static int hf_ncp_delay_time = -1;
-static int hf_ncp_burst_seqno = -1;
-static int hf_ncp_ack_seqno = -1;
-static int hf_ncp_burst_len = -1;
-static int hf_ncp_burst_offset = -1;
-static int hf_ncp_data_offset = -1;
-static int hf_ncp_data_bytes = -1;
-static int hf_ncp_missing_fraglist_count = -1;
-static int hf_ncp_missing_data_offset = -1;
-static int hf_ncp_missing_data_count = -1;
-static int hf_ncp_oplock_flag = -1;
-static int hf_ncp_oplock_handle = -1;
-static int hf_ncp_completion_code = -1;
-static int hf_ncp_connection_status = -1;
-static int hf_ncp_slot = -1;
-static int hf_ncp_signature_character = -1;
-/* static int hf_ncp_fragment_handle = -1; */
-static int hf_lip_echo_magic = -1;
-static int hf_lip_echo_payload = -1;
-static int hf_ncp_burst_command = -1;
-static int hf_ncp_burst_file_handle = -1;
-static int hf_ncp_burst_reserved = -1;
-
-gint ett_ncp = -1;
-gint ett_nds = -1;
-gint ett_nds_segments = -1;
-gint ett_nds_segment = -1;
-static gint ett_ncp_system_flags = -1;
-
-static expert_field ei_ncp_oplock_handle = EI_INIT;
-static expert_field ei_ncp_new_server_session = EI_INIT;
-static expert_field ei_ncp_type = EI_INIT;
+int proto_ncp;
+static int hf_ncp_ip_ver;
+static int hf_ncp_ip_length;
+static int hf_ncp_ip_rplybufsize;
+static int hf_ncp_ip_sig;
+static int hf_ncp_ip_packetsig;
+static int hf_ncp_type;
+static int hf_ncp_seq;
+static int hf_ncp_connection;
+static int hf_ncp_task;
+static int hf_ncp_stream_type;
+static int hf_ncp_system_flags;
+static int hf_ncp_system_flags_abt;
+static int hf_ncp_system_flags_eob;
+static int hf_ncp_system_flags_sys;
+static int hf_ncp_system_flags_bsy;
+static int hf_ncp_system_flags_lst;
+static int hf_ncp_src_connection;
+static int hf_ncp_dst_connection;
+static int hf_ncp_packet_seqno;
+static int hf_ncp_delay_time;
+static int hf_ncp_burst_seqno;
+static int hf_ncp_ack_seqno;
+static int hf_ncp_burst_len;
+static int hf_ncp_burst_offset;
+static int hf_ncp_data_offset;
+static int hf_ncp_data_bytes;
+static int hf_ncp_missing_fraglist_count;
+static int hf_ncp_missing_data_offset;
+static int hf_ncp_missing_data_count;
+static int hf_ncp_oplock_flag;
+static int hf_ncp_oplock_handle;
+static int hf_ncp_completion_code;
+static int hf_ncp_connection_status;
+static int hf_ncp_slot;
+static int hf_ncp_signature_character;
+/* static int hf_ncp_fragment_handle; */
+static int hf_lip_echo_magic;
+static int hf_lip_echo_payload;
+static int hf_ncp_burst_command;
+static int hf_ncp_burst_file_handle;
+static int hf_ncp_burst_reserved;
+
+gint ett_ncp;
+gint ett_nds;
+gint ett_nds_segments;
+gint ett_nds_segment;
+static gint ett_ncp_system_flags;
+
+static expert_field ei_ncp_oplock_handle;
+static expert_field ei_ncp_new_server_session;
+static expert_field ei_ncp_type;
 
 static struct novell_tap ncp_tap;
 static struct ncp_common_header     header;
diff --git a/epan/dissectors/packet-ncs.c b/epan/dissectors/packet-ncs.c
index 0a4fefa7b8..8aee1bcb0c 100644
--- a/epan/dissectors/packet-ncs.c
+++ b/epan/dissectors/packet-ncs.c
@@ -21,12 +21,12 @@ void proto_reg_handoff_ncs(void);
 
 static dissector_handle_t ncs_handle;
 
-static gint ett_ncs = -1;
+static gint ett_ncs;
 
-static int proto_ncs = -1;
+static int proto_ncs;
 
-static int hf_panning_id = -1;
-static int hf_incarnation = -1;
+static int hf_panning_id;
+static int hf_incarnation;
 
 static int
 dissect_ncs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-ncsi.c b/epan/dissectors/packet-ncsi.c
index 0421896157..71c46e72c1 100644
--- a/epan/dissectors/packet-ncsi.c
+++ b/epan/dissectors/packet-ncsi.c
@@ -32,197 +32,197 @@
 void proto_reg_handoff_ncsi(void);
 void proto_register_ncsi(void);
 
-static int proto_ncsi = -1;
+static int proto_ncsi;
 static dissector_handle_t ncsi_handle;
 
 /* Common header fields */
-static int hf_ncsi_mc_id = -1;
-static int hf_ncsi_revision = -1;
-static int hf_ncsi_iid = -1;
-static int hf_ncsi_type = -1;
-static int hf_ncsi_type_code = -1;
-static int hf_ncsi_type_code_masked = -1;
-static int hf_ncsi_type_resp = -1;
-static int hf_ncsi_chan = -1;
-static int hf_ncsi_plen = -1;
+static int hf_ncsi_mc_id;
+static int hf_ncsi_revision;
+static int hf_ncsi_iid;
+static int hf_ncsi_type;
+static int hf_ncsi_type_code;
+static int hf_ncsi_type_code_masked;
+static int hf_ncsi_type_resp;
+static int hf_ncsi_chan;
+static int hf_ncsi_plen;
 
 /* Decode the Package# and internal channel# */
-static int hf_ncsi_pkg = -1;
-static int hf_ncsi_ichan = -1;
+static int hf_ncsi_pkg;
+static int hf_ncsi_ichan;
 
 /* Response generics */
-static int hf_ncsi_resp = -1;
-static int hf_ncsi_reason = -1;
+static int hf_ncsi_resp;
+static int hf_ncsi_reason;
 
 /* Select package */
-static int hf_ncsi_sp_hwarb = -1;
+static int hf_ncsi_sp_hwarb;
 
 /* Disable channel */
-static int hf_ncsi_dc_ald = -1;
+static int hf_ncsi_dc_ald;
 
 /* AEN enable */
-static int hf_ncsi_aene_mc = -1;
+static int hf_ncsi_aene_mc;
 
 /* Set MAC Address */
-static int hf_ncsi_sm_mac = -1;
-static int hf_ncsi_sm_macno = -1;
-static int hf_ncsi_sm_at = -1;
-static int hf_ncsi_sm_e = -1;
+static int hf_ncsi_sm_mac;
+static int hf_ncsi_sm_macno;
+static int hf_ncsi_sm_at;
+static int hf_ncsi_sm_e;
 
 /* Broadcast filter */
-static int hf_ncsi_bf = -1;
-static int hf_ncsi_bf_arp = -1;
-static int hf_ncsi_bf_dhcpc = -1;
-static int hf_ncsi_bf_dhcps = -1;
-static int hf_ncsi_bf_netbios = -1;
+static int hf_ncsi_bf;
+static int hf_ncsi_bf_arp;
+static int hf_ncsi_bf_dhcpc;
+static int hf_ncsi_bf_dhcps;
+static int hf_ncsi_bf_netbios;
 
 /* AEN payload fields */
-static int hf_ncsi_aen_type = -1;
-static int hf_ncsi_aen_lsc_oemstat = -1;
-static int hf_ncsi_aen_hcds = -1;
-static int hf_ncsi_aen_drr_orig_type = -1;
-static int hf_ncsi_aen_drr_orig_iid = -1;
+static int hf_ncsi_aen_type;
+static int hf_ncsi_aen_lsc_oemstat;
+static int hf_ncsi_aen_hcds;
+static int hf_ncsi_aen_drr_orig_type;
+static int hf_ncsi_aen_drr_orig_iid;
 
 /* generic link status */
-static int hf_ncsi_lstat = -1;
-static int hf_ncsi_lstat_flag = -1;
-static int hf_ncsi_lstat_speed_duplex = -1;
-static int hf_ncsi_lstat_autoneg = -1;
-static int hf_ncsi_lstat_autoneg_complete = -1;
-static int hf_ncsi_lstat_parallel_detection = -1;
-static int hf_ncsi_lstat_1000TFD = -1;
-static int hf_ncsi_lstat_1000THD = -1;
-static int hf_ncsi_lstat_100T4 = -1;
-static int hf_ncsi_lstat_100TXFD = -1;
-static int hf_ncsi_lstat_100TXHD = -1;
-static int hf_ncsi_lstat_10TFD = -1;
-static int hf_ncsi_lstat_10THD = -1;
-static int hf_ncsi_lstat_tx_flow = -1;
-static int hf_ncsi_lstat_rx_flow = -1;
-static int hf_ncsi_lstat_partner_flow = -1;
-static int hf_ncsi_lstat_serdes = -1;
-static int hf_ncsi_lstat_oem_speed_valid = -1;
+static int hf_ncsi_lstat;
+static int hf_ncsi_lstat_flag;
+static int hf_ncsi_lstat_speed_duplex;
+static int hf_ncsi_lstat_autoneg;
+static int hf_ncsi_lstat_autoneg_complete;
+static int hf_ncsi_lstat_parallel_detection;
+static int hf_ncsi_lstat_1000TFD;
+static int hf_ncsi_lstat_1000THD;
+static int hf_ncsi_lstat_100T4;
+static int hf_ncsi_lstat_100TXFD;
+static int hf_ncsi_lstat_100TXHD;
+static int hf_ncsi_lstat_10TFD;
+static int hf_ncsi_lstat_10THD;
+static int hf_ncsi_lstat_tx_flow;
+static int hf_ncsi_lstat_rx_flow;
+static int hf_ncsi_lstat_partner_flow;
+static int hf_ncsi_lstat_serdes;
+static int hf_ncsi_lstat_oem_speed_valid;
 
 /* Set Link command (0x09) */
-static int hf_ncsi_ls = -1;
-static int hf_ncsi_ls_an = -1;
-static int hf_ncsi_ls_10m = -1;
-static int hf_ncsi_ls_100m = -1;
-static int hf_ncsi_ls_1g = -1;
-static int hf_ncsi_ls_10g = -1;
-static int hf_ncsi_ls_20g = -1;
-static int hf_ncsi_ls_25g = -1;
-static int hf_ncsi_ls_40g = -1;
-static int hf_ncsi_ls_hd = -1;
-static int hf_ncsi_ls_fd = -1;
-static int hf_ncsi_ls_pc = -1;
-static int hf_ncsi_ls_apc = -1;
-static int hf_ncsi_ls_50g = -1;
-static int hf_ncsi_ls_100g = -1;
-static int hf_ncsi_ls_2_5g = -1;
-static int hf_ncsi_ls_5g = -1;
-static int hf_ncsi_ls_rsv = -1;
-static int hf_ncsi_ls_oemls = -1;
+static int hf_ncsi_ls;
+static int hf_ncsi_ls_an;
+static int hf_ncsi_ls_10m;
+static int hf_ncsi_ls_100m;
+static int hf_ncsi_ls_1g;
+static int hf_ncsi_ls_10g;
+static int hf_ncsi_ls_20g;
+static int hf_ncsi_ls_25g;
+static int hf_ncsi_ls_40g;
+static int hf_ncsi_ls_hd;
+static int hf_ncsi_ls_fd;
+static int hf_ncsi_ls_pc;
+static int hf_ncsi_ls_apc;
+static int hf_ncsi_ls_50g;
+static int hf_ncsi_ls_100g;
+static int hf_ncsi_ls_2_5g;
+static int hf_ncsi_ls_5g;
+static int hf_ncsi_ls_rsv;
+static int hf_ncsi_ls_oemls;
 
 /*Get Capabilities*/
-static int hf_ncsi_cap_flag = -1;        /* Offset 20..23 Capabilities Flags */
-static int hf_ncsi_cap_flag_ha = -1;     /* bit 0 Hardware Arbitration  */
-static int hf_ncsi_cap_flag_op = -1;     /* bit 1 OS Presence  */
-static int hf_ncsi_cap_flag_n2mfc = -1;  /* bit 2 Network Controller to Management Controller Flow Control Support */
-static int hf_ncsi_cap_flag_m2nfc = -1;  /* bit 3 Management Controller to Network Controller Flow Control Support */
-static int hf_ncsi_cap_flag_ama = -1;    /* bit 4 All multicast addresses support */
-
-static int hf_ncsi_cap_bf = -1;          /* Offset 24..27 Broadcast Packet Filter Capabilities, the variable names are align with Broadcast filter above */
-static int hf_ncsi_cap_bf_arp = -1;
-static int hf_ncsi_cap_bf_dhcpc = -1;
-static int hf_ncsi_cap_bf_dhcps = -1;
-static int hf_ncsi_cap_bf_netbios = -1;
-
-static int hf_ncsi_cap_mf = -1;          /* Offset 28..31 Multicast Packet Filter Capabilities */
-static int hf_ncsi_cap_mf_v6na = -1;
-static int hf_ncsi_cap_mf_v6ra = -1;
-static int hf_ncsi_cap_mf_dhcpv6 = -1;
-
-static int hf_ncsi_cap_buf = -1;         /* Offset 32..35 Buffering Capability */
-
-static int hf_ncsi_cap_aen = -1;         /* Offset 36..39 AEN Control Support  */
-static int hf_ncsi_cap_aen_lstat = -1;   /* bit 0 Link Status Change AEN control */
-static int hf_ncsi_cap_aen_cfg = -1;     /* bit 1 Configuration Required AEN control */
-static int hf_ncsi_cap_aen_drv = -1;     /* bit 2 Host NC Driver Status Change AEN control */
-static int hf_ncsi_cap_aen_resv = -1;    /* bit 3..15 Reserved Reserved */
-static int hf_ncsi_cap_aen_oem = -1;     /* bit 16..31 OEM-specific AEN control OEM */
-
-static int hf_ncsi_cap_vcnt = -1;        /* VLAN Filter Count */
-static int hf_ncsi_cap_mixcnt = -1;      /* Mixed Filter Count */
-static int hf_ncsi_cap_mccnt = -1;       /* Multicast Filter Count */
-static int hf_ncsi_cap_uccnt = -1;       /* Unicast Filter Count */
-
-static int hf_ncsi_cap_vmode = -1;       /* VLAN Mode Support */
-static int hf_ncsi_cap_vmode_vo = -1;    /* bit 0 VLAN only  */
-static int hf_ncsi_cap_vmode_both = -1;  /* bit 1 VLAN + non-VLAN  */
-static int hf_ncsi_cap_vmode_any = -1;  /* bit 2 Any VLAN + non-VLAN  */
-static int hf_ncsi_cap_chcnt = -1;    /* Channel Count */
+static int hf_ncsi_cap_flag;        /* Offset 20..23 Capabilities Flags */
+static int hf_ncsi_cap_flag_ha;     /* bit 0 Hardware Arbitration  */
+static int hf_ncsi_cap_flag_op;     /* bit 1 OS Presence  */
+static int hf_ncsi_cap_flag_n2mfc;  /* bit 2 Network Controller to Management Controller Flow Control Support */
+static int hf_ncsi_cap_flag_m2nfc;  /* bit 3 Management Controller to Network Controller Flow Control Support */
+static int hf_ncsi_cap_flag_ama;    /* bit 4 All multicast addresses support */
+
+static int hf_ncsi_cap_bf;          /* Offset 24..27 Broadcast Packet Filter Capabilities, the variable names are align with Broadcast filter above */
+static int hf_ncsi_cap_bf_arp;
+static int hf_ncsi_cap_bf_dhcpc;
+static int hf_ncsi_cap_bf_dhcps;
+static int hf_ncsi_cap_bf_netbios;
+
+static int hf_ncsi_cap_mf;          /* Offset 28..31 Multicast Packet Filter Capabilities */
+static int hf_ncsi_cap_mf_v6na;
+static int hf_ncsi_cap_mf_v6ra;
+static int hf_ncsi_cap_mf_dhcpv6;
+
+static int hf_ncsi_cap_buf;         /* Offset 32..35 Buffering Capability */
+
+static int hf_ncsi_cap_aen;         /* Offset 36..39 AEN Control Support  */
+static int hf_ncsi_cap_aen_lstat;   /* bit 0 Link Status Change AEN control */
+static int hf_ncsi_cap_aen_cfg;     /* bit 1 Configuration Required AEN control */
+static int hf_ncsi_cap_aen_drv;     /* bit 2 Host NC Driver Status Change AEN control */
+static int hf_ncsi_cap_aen_resv;    /* bit 3..15 Reserved Reserved */
+static int hf_ncsi_cap_aen_oem;     /* bit 16..31 OEM-specific AEN control OEM */
+
+static int hf_ncsi_cap_vcnt;        /* VLAN Filter Count */
+static int hf_ncsi_cap_mixcnt;      /* Mixed Filter Count */
+static int hf_ncsi_cap_mccnt;       /* Multicast Filter Count */
+static int hf_ncsi_cap_uccnt;       /* Unicast Filter Count */
+
+static int hf_ncsi_cap_vmode;       /* VLAN Mode Support */
+static int hf_ncsi_cap_vmode_vo;    /* bit 0 VLAN only  */
+static int hf_ncsi_cap_vmode_both;  /* bit 1 VLAN + non-VLAN  */
+static int hf_ncsi_cap_vmode_any;  /* bit 2 Any VLAN + non-VLAN  */
+static int hf_ncsi_cap_chcnt;    /* Channel Count */
 
 /*Get Version ID*/
-static int hf_ncsi_ver = -1;
-static int hf_ncsi_fw_name = -1;
-static int hf_ncsi_fw_ver = -1;
-static int hf_ncsi_pci_did = -1;
-static int hf_ncsi_pci_vid = -1;
-static int hf_ncsi_pci_ssid = -1;
-static int hf_ncsi_iana = -1;
+static int hf_ncsi_ver;
+static int hf_ncsi_fw_name;
+static int hf_ncsi_fw_ver;
+static int hf_ncsi_pci_did;
+static int hf_ncsi_pci_vid;
+static int hf_ncsi_pci_ssid;
+static int hf_ncsi_iana;
 
 /* OEM ID */
-static int hf_ncsi_oem_id = -1;
+static int hf_ncsi_oem_id;
 /* OEM Mellanox Command, Parameter, Host number */
-static int hf_ncsi_mlnx_cmd = -1;
-static int hf_ncsi_mlnx_parm = -1;
-static int hf_ncsi_mlnx_host = -1;
+static int hf_ncsi_mlnx_cmd;
+static int hf_ncsi_mlnx_parm;
+static int hf_ncsi_mlnx_host;
 /* OEM Mellanox Set MC Affinity (Command = 0x1, parameter 0x7) */
-static int hf_ncsi_mlnx_rbt = -1; /* MC RBT address */
-static int hf_ncsi_mlnx_sms = -1;  /* Supported Medias Status */
-static int hf_ncsi_mlnx_sms_rbt = -1;
-static int hf_ncsi_mlnx_sms_smbus = -1;
-static int hf_ncsi_mlnx_sms_pcie = -1;
-static int hf_ncsi_mlnx_sms_rbts = -1;
-static int hf_ncsi_mlnx_sms_smbuss = -1;
-static int hf_ncsi_mlnx_sms_pcies = -1;
-
-static int hf_ncsi_mlnx_beid = -1; /* MC SMBus EID */
-static int hf_ncsi_mlnx_bidx = -1; /* SMBus INDX */
-static int hf_ncsi_mlnx_baddr = -1; /* MC SMBus Address */
-static int hf_ncsi_mlnx_peid = -1; /* MC PCIe EID */
-static int hf_ncsi_mlnx_pidx = -1; /* PCIe INDX */
-static int hf_ncsi_mlnx_paddr = -1; /* MC PCIe Address */
-static int hf_ncsi_mlnx_ifm = -1; /* IP Filter Mode */
-static int hf_ncsi_mlnx_ifm_byip = -1; /* Bits 1-0 - Filter by IP Address */
-static int hf_ncsi_mlnx_ifm_v4en = -1; /* Bit 2 - IPv4 Enable */
-static int hf_ncsi_mlnx_ifm_v6len = -1; /* Bit 3 - IPv6 Link Local Address Enable */
-static int hf_ncsi_mlnx_ifm_v6gen = -1; /* Bit 4 - IPv6 Global Address Enable */
-static int hf_ncsi_mlnx_v4addr = -1; /* MC IPv4 Address */
-static int hf_ncsi_mlnx_v6local = -1; /* MC IPv6 Link Local Address */
-static int hf_ncsi_mlnx_v6gbl = -1; /* MC IPv6 Global Address */
+static int hf_ncsi_mlnx_rbt; /* MC RBT address */
+static int hf_ncsi_mlnx_sms;  /* Supported Medias Status */
+static int hf_ncsi_mlnx_sms_rbt;
+static int hf_ncsi_mlnx_sms_smbus;
+static int hf_ncsi_mlnx_sms_pcie;
+static int hf_ncsi_mlnx_sms_rbts;
+static int hf_ncsi_mlnx_sms_smbuss;
+static int hf_ncsi_mlnx_sms_pcies;
+
+static int hf_ncsi_mlnx_beid; /* MC SMBus EID */
+static int hf_ncsi_mlnx_bidx; /* SMBus INDX */
+static int hf_ncsi_mlnx_baddr; /* MC SMBus Address */
+static int hf_ncsi_mlnx_peid; /* MC PCIe EID */
+static int hf_ncsi_mlnx_pidx; /* PCIe INDX */
+static int hf_ncsi_mlnx_paddr; /* MC PCIe Address */
+static int hf_ncsi_mlnx_ifm; /* IP Filter Mode */
+static int hf_ncsi_mlnx_ifm_byip; /* Bits 1-0 - Filter by IP Address */
+static int hf_ncsi_mlnx_ifm_v4en; /* Bit 2 - IPv4 Enable */
+static int hf_ncsi_mlnx_ifm_v6len; /* Bit 3 - IPv6 Link Local Address Enable */
+static int hf_ncsi_mlnx_ifm_v6gen; /* Bit 4 - IPv6 Global Address Enable */
+static int hf_ncsi_mlnx_v4addr; /* MC IPv4 Address */
+static int hf_ncsi_mlnx_v6local; /* MC IPv6 Link Local Address */
+static int hf_ncsi_mlnx_v6gbl; /* MC IPv6 Global Address */
 
 /* Get Allocated Management Address (Command = 0x0, Parameter 0x1B) */
-static int hf_ncsi_mlnx_gama_st = -1;  /*Get Allocated Management Address Status */
-static int hf_ncsi_mlnx_gama_mac = -1; /*Allocated MC MAC address */
-
-
-
-static gint ett_ncsi = -1;
-static gint ett_ncsi_type = -1;
-static gint ett_ncsi_chan = -1;
-static gint ett_ncsi_payload = -1;
-static gint ett_ncsi_lstat = -1;
-static gint ett_ncsi_cap_flag = -1;
-static gint ett_ncsi_cap_bf = -1;
-static gint ett_ncsi_cap_mf = -1;
-static gint ett_ncsi_cap_aen = -1;
-static gint ett_ncsi_cap_vmode = -1;
-static gint ett_ncsi_ls = -1;
-static gint ett_ncsi_mlnx = -1;
-static gint ett_ncsi_mlnx_sms = -1;
-static gint ett_ncsi_mlnx_ifm = -1;
+static int hf_ncsi_mlnx_gama_st;  /*Get Allocated Management Address Status */
+static int hf_ncsi_mlnx_gama_mac; /*Allocated MC MAC address */
+
+
+
+static gint ett_ncsi;
+static gint ett_ncsi_type;
+static gint ett_ncsi_chan;
+static gint ett_ncsi_payload;
+static gint ett_ncsi_lstat;
+static gint ett_ncsi_cap_flag;
+static gint ett_ncsi_cap_bf;
+static gint ett_ncsi_cap_mf;
+static gint ett_ncsi_cap_aen;
+static gint ett_ncsi_cap_vmode;
+static gint ett_ncsi_ls;
+static gint ett_ncsi_mlnx;
+static gint ett_ncsi_mlnx_sms;
+static gint ett_ncsi_mlnx_ifm;
 
 #define NCSI_MIN_LENGTH 8
 
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index 143928977c..575b2be8ad 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -35,226 +35,226 @@ void proto_reg_handoff_ndmp(void);
 
 static  dissector_handle_t ndmp_handle;
 
-static int proto_ndmp = -1;
-static int hf_ndmp_request_frame = -1;
-static int hf_ndmp_response_frame = -1;
-static int hf_ndmp_time = -1;
-static int hf_ndmp_lastfrag = -1;
-static int hf_ndmp_fraglen = -1;
-static int hf_ndmp_version = -1;
-static int hf_ndmp_header = -1;
-static int hf_ndmp_sequence = -1;
-static int hf_ndmp_reply_sequence = -1;
-static int hf_ndmp_timestamp = -1;
-static int hf_ndmp_msgtype = -1;
-static int hf_ndmp_msg = -1;
-static int hf_ndmp_error = -1;
-static int hf_ndmp_hostname = -1;
-static int hf_ndmp_os_type = -1;
-static int hf_ndmp_os_vers = -1;
-static int hf_ndmp_hostid = -1;
-static int hf_ndmp_addr_types = -1;
-static int hf_ndmp_addr_type = -1;
-static int hf_ndmp_auth_type = -1;
-static int hf_ndmp_auth_types = -1;
-static int hf_ndmp_auth_challenge = -1;
-static int hf_ndmp_auth_digest = -1;
-static int hf_ndmp_auth_id = -1;
-static int hf_ndmp_auth_password = -1;
-static int hf_ndmp_butype_info = -1;
-static int hf_ndmp_butype_name = -1;
-static int hf_ndmp_butype_default_env = -1;
-static int hf_ndmp_butype_attr = -1;
-static int hf_ndmp_butype_attr_backup_file_history = -1;
-static int hf_ndmp_butype_attr_backup_filelist = -1;
-static int hf_ndmp_butype_attr_recover_filelist = -1;
-static int hf_ndmp_butype_attr_backup_direct = -1;
-static int hf_ndmp_butype_attr_recover_direct = -1;
-static int hf_ndmp_butype_attr_backup_incremental = -1;
-static int hf_ndmp_butype_attr_recover_incremental = -1;
-static int hf_ndmp_butype_attr_backup_utf8 = -1;
-static int hf_ndmp_butype_attr_recover_utf8 = -1;
-static int hf_ndmp_butype_env_name = -1;
-static int hf_ndmp_butype_env_value = -1;
-static int hf_ndmp_tcp_env_name = -1;
-static int hf_ndmp_tcp_env_value = -1;
-static int hf_ndmp_tcp_default_env = -1;
-static int hf_ndmp_tcp_addr_list = -1;
-static int hf_ndmp_fs_info = -1;
-static int hf_ndmp_fs_invalid = -1;
-static int hf_ndmp_fs_invalid_total_size = -1;
-static int hf_ndmp_fs_invalid_used_size = -1;
-static int hf_ndmp_fs_invalid_avail_size = -1;
-static int hf_ndmp_fs_invalid_total_inodes = -1;
-static int hf_ndmp_fs_invalid_used_inodes = -1;
-static int hf_ndmp_fs_fs_type = -1;
-static int hf_ndmp_fs_logical_device = -1;
-static int hf_ndmp_fs_physical_device = -1;
-static int hf_ndmp_fs_total_size = -1;
-static int hf_ndmp_fs_used_size = -1;
-static int hf_ndmp_fs_avail_size = -1;
-static int hf_ndmp_fs_total_inodes = -1;
-static int hf_ndmp_fs_used_inodes = -1;
-static int hf_ndmp_fs_env = -1;
-static int hf_ndmp_fs_env_name = -1;
-static int hf_ndmp_fs_env_value = -1;
-static int hf_ndmp_fs_status = -1;
-static int hf_ndmp_tape_info = -1;
-static int hf_ndmp_tape_model = -1;
-static int hf_ndmp_tape_dev_cap = -1;
-static int hf_ndmp_tape_device = -1;
-static int hf_ndmp_tape_open_mode = -1;
-static int hf_ndmp_tape_attr = -1;
-static int hf_ndmp_tape_attr_rewind = -1;
-static int hf_ndmp_tape_attr_unload = -1;
-static int hf_ndmp_tape_capability = -1;
-static int hf_ndmp_tape_capability_name = -1;
-static int hf_ndmp_tape_capability_value = -1;
-static int hf_ndmp_scsi_info = -1;
-static int hf_ndmp_scsi_model = -1;
-static int hf_ndmp_server_vendor = -1;
-static int hf_ndmp_server_product = -1;
-static int hf_ndmp_server_revision = -1;
-static int hf_ndmp_scsi_device = -1;
-static int hf_ndmp_scsi_controller = -1;
-static int hf_ndmp_scsi_id = -1;
-static int hf_ndmp_scsi_lun = -1;
-static int hf_ndmp_execute_cdb_flags = -1;
-static int hf_ndmp_execute_cdb_flags_data_in = -1;
-static int hf_ndmp_execute_cdb_flags_data_out = -1;
-static int hf_ndmp_execute_cdb_timeout = -1;
-static int hf_ndmp_execute_cdb_datain_len = -1;
-static int hf_ndmp_execute_cdb_cdb_len = -1;
-/* static int hf_ndmp_execute_cdb_dataout = -1; */
-static int hf_ndmp_execute_cdb_status = -1;
-static int hf_ndmp_execute_cdb_dataout_len = -1;
-/* static int hf_ndmp_execute_cdb_datain = -1; */
-static int hf_ndmp_execute_cdb_sns_len = -1;
-static int hf_ndmp_tape_invalid = -1;
-static int hf_ndmp_tape_invalid_file_num = -1;
-static int hf_ndmp_tape_invalid_soft_errors = -1;
-static int hf_ndmp_tape_invalid_block_size = -1;
-static int hf_ndmp_tape_invalid_block_no = -1;
-static int hf_ndmp_tape_invalid_total_space = -1;
-static int hf_ndmp_tape_invalid_space_remain = -1;
-static int hf_ndmp_tape_invalid_partition = -1;
-static int hf_ndmp_tape_flags = -1;
-static int hf_ndmp_tape_flags_no_rewind = -1;
-static int hf_ndmp_tape_flags_write_protect = -1;
-static int hf_ndmp_tape_flags_error = -1;
-static int hf_ndmp_tape_flags_unload = -1;
-static int hf_ndmp_tape_file_num = -1;
-static int hf_ndmp_tape_soft_errors = -1;
-static int hf_ndmp_tape_block_size = -1;
-static int hf_ndmp_tape_block_no = -1;
-static int hf_ndmp_tape_total_space = -1;
-static int hf_ndmp_tape_space_remain = -1;
-static int hf_ndmp_tape_partition = -1;
-static int hf_ndmp_tape_mtio_op = -1;
-static int hf_ndmp_count = -1;
-static int hf_ndmp_resid_count = -1;
-static int hf_ndmp_mover_state = -1;
-static int hf_ndmp_mover_pause = -1;
-static int hf_ndmp_halt = -1;
-static int hf_ndmp_halt_reason = -1;
-static int hf_ndmp_record_size = -1;
-static int hf_ndmp_record_num = -1;
-static int hf_ndmp_data_written = -1;
-static int hf_ndmp_seek_position = -1;
-static int hf_ndmp_bytes_left_to_read = -1;
-static int hf_ndmp_window_offset = -1;
-static int hf_ndmp_window_length = -1;
-static int hf_ndmp_addr_ip = -1;
-static int hf_ndmp_addr_tcp = -1;
-static int hf_ndmp_addr_fcal_loop_id = -1;
-static int hf_ndmp_addr_ipc = -1;
-static int hf_ndmp_mover_mode = -1;
-static int hf_ndmp_file_name = -1;
-static int hf_ndmp_nt_file_name = -1;
-static int hf_ndmp_dos_file_name = -1;
-static int hf_ndmp_log_type = -1;
-static int hf_ndmp_log_message_id = -1;
-static int hf_ndmp_log_message = -1;
-static int hf_ndmp_connected = -1;
-static int hf_ndmp_connected_reason = -1;
-static int hf_ndmp_data = -1;
-static int hf_ndmp_files = -1;
-static int hf_ndmp_file_fs_type = -1;
-static int hf_ndmp_file_names = -1;
-static int hf_ndmp_file_stats = -1;
-static int hf_ndmp_file_node = -1;
-static int hf_ndmp_file_parent = -1;
-static int hf_ndmp_file_fh_info = -1;
-static int hf_ndmp_file_invalid = -1;
-static int hf_ndmp_file_invalid_atime = -1;
-static int hf_ndmp_file_invalid_ctime = -1;
-static int hf_ndmp_file_invalid_group = -1;
-static int hf_ndmp_file_type = -1;
-static int hf_ndmp_file_mtime = -1;
-static int hf_ndmp_file_atime = -1;
-static int hf_ndmp_file_ctime = -1;
-static int hf_ndmp_file_owner = -1;
-static int hf_ndmp_file_group = -1;
-static int hf_ndmp_file_fattr = -1;
-static int hf_ndmp_file_size = -1;
-static int hf_ndmp_file_links = -1;
-static int hf_ndmp_dirs = -1;
-static int hf_ndmp_nodes = -1;
-static int hf_ndmp_nlist = -1;
-static int hf_ndmp_bu_original_path = -1;
-static int hf_ndmp_bu_destination_dir = -1;
-static int hf_ndmp_bu_new_name = -1;
-static int hf_ndmp_bu_other_name = -1;
-static int hf_ndmp_state_invalid = -1;
-static int hf_ndmp_state_invalid_ebr = -1;
-static int hf_ndmp_state_invalid_etr = -1;
-static int hf_ndmp_bu_operation = -1;
-static int hf_ndmp_data_state = -1;
-static int hf_ndmp_data_halted = -1;
-static int hf_ndmp_data_bytes_processed = -1;
-static int hf_ndmp_data_est_bytes_remain = -1;
-static int hf_ndmp_data_est_time_remain = -1;
-static int hf_ndmp_ex_class_id = -1;
-static int hf_ndmp_class_list = -1;
-static int hf_ndmp_ext_version = -1;
-static int hf_ndmp_ext_version_list = -1;
-static int hf_ndmp_class_version = -1;
-static int hf_ndmp_ex_class_version = -1;
-
-static int hf_ndmp_fragment_data = -1;
-static int hf_ndmp_fragments = -1;
-static int hf_ndmp_fragment = -1;
-static int hf_ndmp_fragment_overlap = -1;
-static int hf_ndmp_fragment_overlap_conflicts = -1;
-static int hf_ndmp_fragment_multiple_tails = -1;
-static int hf_ndmp_fragment_too_long_fragment = -1;
-static int hf_ndmp_fragment_error = -1;
-static int hf_ndmp_fragment_count = -1;
-static int hf_ndmp_reassembled_in = -1;
-static int hf_ndmp_reassembled_length = -1;
-
-static gint ett_ndmp = -1;
-static gint ett_ndmp_fraghdr = -1;
-static gint ett_ndmp_header = -1;
-static gint ett_ndmp_butype_attrs = -1;
-static gint ett_ndmp_fs_invalid = -1;
-static gint ett_ndmp_tape_attr = -1;
-static gint ett_ndmp_execute_cdb_flags = -1;
-static gint ett_ndmp_execute_cdb_cdb = -1;
-static gint ett_ndmp_execute_cdb_sns = -1;
-static gint ett_ndmp_execute_cdb_payload = -1;
-static gint ett_ndmp_tape_invalid = -1;
-static gint ett_ndmp_tape_flags = -1;
-static gint ett_ndmp_addr = -1;
-static gint ett_ndmp_file = -1;
-static gint ett_ndmp_file_name = -1;
-static gint ett_ndmp_file_stats = -1;
-static gint ett_ndmp_file_invalids = -1;
-static gint ett_ndmp_state_invalids = -1;
-static gint ett_ndmp_fragment = -1;
-static gint ett_ndmp_fragments = -1;
-
-static expert_field ei_ndmp_msg = EI_INIT;
+static int proto_ndmp;
+static int hf_ndmp_request_frame;
+static int hf_ndmp_response_frame;
+static int hf_ndmp_time;
+static int hf_ndmp_lastfrag;
+static int hf_ndmp_fraglen;
+static int hf_ndmp_version;
+static int hf_ndmp_header;
+static int hf_ndmp_sequence;
+static int hf_ndmp_reply_sequence;
+static int hf_ndmp_timestamp;
+static int hf_ndmp_msgtype;
+static int hf_ndmp_msg;
+static int hf_ndmp_error;
+static int hf_ndmp_hostname;
+static int hf_ndmp_os_type;
+static int hf_ndmp_os_vers;
+static int hf_ndmp_hostid;
+static int hf_ndmp_addr_types;
+static int hf_ndmp_addr_type;
+static int hf_ndmp_auth_type;
+static int hf_ndmp_auth_types;
+static int hf_ndmp_auth_challenge;
+static int hf_ndmp_auth_digest;
+static int hf_ndmp_auth_id;
+static int hf_ndmp_auth_password;
+static int hf_ndmp_butype_info;
+static int hf_ndmp_butype_name;
+static int hf_ndmp_butype_default_env;
+static int hf_ndmp_butype_attr;
+static int hf_ndmp_butype_attr_backup_file_history;
+static int hf_ndmp_butype_attr_backup_filelist;
+static int hf_ndmp_butype_attr_recover_filelist;
+static int hf_ndmp_butype_attr_backup_direct;
+static int hf_ndmp_butype_attr_recover_direct;
+static int hf_ndmp_butype_attr_backup_incremental;
+static int hf_ndmp_butype_attr_recover_incremental;
+static int hf_ndmp_butype_attr_backup_utf8;
+static int hf_ndmp_butype_attr_recover_utf8;
+static int hf_ndmp_butype_env_name;
+static int hf_ndmp_butype_env_value;
+static int hf_ndmp_tcp_env_name;
+static int hf_ndmp_tcp_env_value;
+static int hf_ndmp_tcp_default_env;
+static int hf_ndmp_tcp_addr_list;
+static int hf_ndmp_fs_info;
+static int hf_ndmp_fs_invalid;
+static int hf_ndmp_fs_invalid_total_size;
+static int hf_ndmp_fs_invalid_used_size;
+static int hf_ndmp_fs_invalid_avail_size;
+static int hf_ndmp_fs_invalid_total_inodes;
+static int hf_ndmp_fs_invalid_used_inodes;
+static int hf_ndmp_fs_fs_type;
+static int hf_ndmp_fs_logical_device;
+static int hf_ndmp_fs_physical_device;
+static int hf_ndmp_fs_total_size;
+static int hf_ndmp_fs_used_size;
+static int hf_ndmp_fs_avail_size;
+static int hf_ndmp_fs_total_inodes;
+static int hf_ndmp_fs_used_inodes;
+static int hf_ndmp_fs_env;
+static int hf_ndmp_fs_env_name;
+static int hf_ndmp_fs_env_value;
+static int hf_ndmp_fs_status;
+static int hf_ndmp_tape_info;
+static int hf_ndmp_tape_model;
+static int hf_ndmp_tape_dev_cap;
+static int hf_ndmp_tape_device;
+static int hf_ndmp_tape_open_mode;
+static int hf_ndmp_tape_attr;
+static int hf_ndmp_tape_attr_rewind;
+static int hf_ndmp_tape_attr_unload;
+static int hf_ndmp_tape_capability;
+static int hf_ndmp_tape_capability_name;
+static int hf_ndmp_tape_capability_value;
+static int hf_ndmp_scsi_info;
+static int hf_ndmp_scsi_model;
+static int hf_ndmp_server_vendor;
+static int hf_ndmp_server_product;
+static int hf_ndmp_server_revision;
+static int hf_ndmp_scsi_device;
+static int hf_ndmp_scsi_controller;
+static int hf_ndmp_scsi_id;
+static int hf_ndmp_scsi_lun;
+static int hf_ndmp_execute_cdb_flags;
+static int hf_ndmp_execute_cdb_flags_data_in;
+static int hf_ndmp_execute_cdb_flags_data_out;
+static int hf_ndmp_execute_cdb_timeout;
+static int hf_ndmp_execute_cdb_datain_len;
+static int hf_ndmp_execute_cdb_cdb_len;
+/* static int hf_ndmp_execute_cdb_dataout; */
+static int hf_ndmp_execute_cdb_status;
+static int hf_ndmp_execute_cdb_dataout_len;
+/* static int hf_ndmp_execute_cdb_datain; */
+static int hf_ndmp_execute_cdb_sns_len;
+static int hf_ndmp_tape_invalid;
+static int hf_ndmp_tape_invalid_file_num;
+static int hf_ndmp_tape_invalid_soft_errors;
+static int hf_ndmp_tape_invalid_block_size;
+static int hf_ndmp_tape_invalid_block_no;
+static int hf_ndmp_tape_invalid_total_space;
+static int hf_ndmp_tape_invalid_space_remain;
+static int hf_ndmp_tape_invalid_partition;
+static int hf_ndmp_tape_flags;
+static int hf_ndmp_tape_flags_no_rewind;
+static int hf_ndmp_tape_flags_write_protect;
+static int hf_ndmp_tape_flags_error;
+static int hf_ndmp_tape_flags_unload;
+static int hf_ndmp_tape_file_num;
+static int hf_ndmp_tape_soft_errors;
+static int hf_ndmp_tape_block_size;
+static int hf_ndmp_tape_block_no;
+static int hf_ndmp_tape_total_space;
+static int hf_ndmp_tape_space_remain;
+static int hf_ndmp_tape_partition;
+static int hf_ndmp_tape_mtio_op;
+static int hf_ndmp_count;
+static int hf_ndmp_resid_count;
+static int hf_ndmp_mover_state;
+static int hf_ndmp_mover_pause;
+static int hf_ndmp_halt;
+static int hf_ndmp_halt_reason;
+static int hf_ndmp_record_size;
+static int hf_ndmp_record_num;
+static int hf_ndmp_data_written;
+static int hf_ndmp_seek_position;
+static int hf_ndmp_bytes_left_to_read;
+static int hf_ndmp_window_offset;
+static int hf_ndmp_window_length;
+static int hf_ndmp_addr_ip;
+static int hf_ndmp_addr_tcp;
+static int hf_ndmp_addr_fcal_loop_id;
+static int hf_ndmp_addr_ipc;
+static int hf_ndmp_mover_mode;
+static int hf_ndmp_file_name;
+static int hf_ndmp_nt_file_name;
+static int hf_ndmp_dos_file_name;
+static int hf_ndmp_log_type;
+static int hf_ndmp_log_message_id;
+static int hf_ndmp_log_message;
+static int hf_ndmp_connected;
+static int hf_ndmp_connected_reason;
+static int hf_ndmp_data;
+static int hf_ndmp_files;
+static int hf_ndmp_file_fs_type;
+static int hf_ndmp_file_names;
+static int hf_ndmp_file_stats;
+static int hf_ndmp_file_node;
+static int hf_ndmp_file_parent;
+static int hf_ndmp_file_fh_info;
+static int hf_ndmp_file_invalid;
+static int hf_ndmp_file_invalid_atime;
+static int hf_ndmp_file_invalid_ctime;
+static int hf_ndmp_file_invalid_group;
+static int hf_ndmp_file_type;
+static int hf_ndmp_file_mtime;
+static int hf_ndmp_file_atime;
+static int hf_ndmp_file_ctime;
+static int hf_ndmp_file_owner;
+static int hf_ndmp_file_group;
+static int hf_ndmp_file_fattr;
+static int hf_ndmp_file_size;
+static int hf_ndmp_file_links;
+static int hf_ndmp_dirs;
+static int hf_ndmp_nodes;
+static int hf_ndmp_nlist;
+static int hf_ndmp_bu_original_path;
+static int hf_ndmp_bu_destination_dir;
+static int hf_ndmp_bu_new_name;
+static int hf_ndmp_bu_other_name;
+static int hf_ndmp_state_invalid;
+static int hf_ndmp_state_invalid_ebr;
+static int hf_ndmp_state_invalid_etr;
+static int hf_ndmp_bu_operation;
+static int hf_ndmp_data_state;
+static int hf_ndmp_data_halted;
+static int hf_ndmp_data_bytes_processed;
+static int hf_ndmp_data_est_bytes_remain;
+static int hf_ndmp_data_est_time_remain;
+static int hf_ndmp_ex_class_id;
+static int hf_ndmp_class_list;
+static int hf_ndmp_ext_version;
+static int hf_ndmp_ext_version_list;
+static int hf_ndmp_class_version;
+static int hf_ndmp_ex_class_version;
+
+static int hf_ndmp_fragment_data;
+static int hf_ndmp_fragments;
+static int hf_ndmp_fragment;
+static int hf_ndmp_fragment_overlap;
+static int hf_ndmp_fragment_overlap_conflicts;
+static int hf_ndmp_fragment_multiple_tails;
+static int hf_ndmp_fragment_too_long_fragment;
+static int hf_ndmp_fragment_error;
+static int hf_ndmp_fragment_count;
+static int hf_ndmp_reassembled_in;
+static int hf_ndmp_reassembled_length;
+
+static gint ett_ndmp;
+static gint ett_ndmp_fraghdr;
+static gint ett_ndmp_header;
+static gint ett_ndmp_butype_attrs;
+static gint ett_ndmp_fs_invalid;
+static gint ett_ndmp_tape_attr;
+static gint ett_ndmp_execute_cdb_flags;
+static gint ett_ndmp_execute_cdb_cdb;
+static gint ett_ndmp_execute_cdb_sns;
+static gint ett_ndmp_execute_cdb_payload;
+static gint ett_ndmp_tape_invalid;
+static gint ett_ndmp_tape_flags;
+static gint ett_ndmp_addr;
+static gint ett_ndmp_file;
+static gint ett_ndmp_file_name;
+static gint ett_ndmp_file_stats;
+static gint ett_ndmp_file_invalids;
+static gint ett_ndmp_state_invalids;
+static gint ett_ndmp_fragment;
+static gint ett_ndmp_fragments;
+
+static expert_field ei_ndmp_msg;
 
 static const fragment_items ndmp_frag_items = {
 	/* Fragment subtrees */
diff --git a/epan/dissectors/packet-ndp.c b/epan/dissectors/packet-ndp.c
index dff04c41fa..2cf6a7ac21 100644
--- a/epan/dissectors/packet-ndp.c
+++ b/epan/dissectors/packet-ndp.c
@@ -243,15 +243,15 @@ static const value_string ndp_state_val[] =
 #define NDP_STATE	        9
 #define NDP_NUMBER_OF_LINKS    10
 
-static int proto_ndp = -1;
-static int hf_ndp_ip_address = -1;
-static int hf_ndp_segment_identifier = -1;
-static int hf_ndp_chassis_type = -1;
-static int hf_ndp_backplane_type = -1;
-static int hf_ndp_state = -1;
-static int hf_ndp_number_of_links = -1;
-
-static gint ett_ndp = -1;
+static int proto_ndp;
+static int hf_ndp_ip_address;
+static int hf_ndp_segment_identifier;
+static int hf_ndp_chassis_type;
+static int hf_ndp_backplane_type;
+static int hf_ndp_state;
+static int hf_ndp_number_of_links;
+
+static gint ett_ndp;
 
 static dissector_handle_t ndp_handle;
 
diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c
index 3eb89f49d0..cd0b128a28 100644
--- a/epan/dissectors/packet-ndps.c
+++ b/epan/dissectors/packet-ndps.c
@@ -51,305 +51,305 @@ static int dissect_ndps_request(tvbuff_t*, packet_info*, proto_tree*, guint32, g
 
 static int dissect_ndps_reply(tvbuff_t *, packet_info*, proto_tree*, int);
 
-static int hf_ndps_segments = -1;
-static int hf_ndps_segment = -1;
-static int hf_ndps_segment_overlap = -1;
-static int hf_ndps_segment_overlap_conflict = -1;
-static int hf_ndps_segment_multiple_tails = -1;
-static int hf_ndps_segment_too_long_segment = -1;
-static int hf_ndps_segment_error = -1;
-static int hf_ndps_segment_count = -1;
-static int hf_ndps_reassembled_length = -1;
-
-static gint ett_ndps_segments = -1;
-static gint ett_ndps_segment = -1;
-
-static int proto_ndps = -1;
-static int hf_ndps_record_mark = -1;
-static int hf_ndps_length = -1;
-static int hf_ndps_xid = -1;
-static int hf_ndps_packet_type = -1;
-static int hf_ndps_rpc_version = -1;
-/* static int hf_ndps_error = -1; */
-static int hf_ndps_num_objects = -1;
-static int hf_ndps_num_attributes = -1;
-/* static int hf_ndps_sbuffer = -1; */
-/* static int hf_ndps_rbuffer = -1; */
-static int hf_ndps_user_name = -1;
-static int hf_ndps_broker_name = -1;
-static int hf_ndps_num_results = -1;
-static int hf_ndps_num_options = -1;
-static int hf_ndps_num_jobs = -1;
-static int hf_ndps_pa_name = -1;
-static int hf_ndps_tree = -1;
-static int hf_ndps_reqframe = -1;
-static int hf_ndps_error_val = -1;
-static int hf_ndps_ext_error = -1;
-static int hf_ndps_object = -1;
-static int hf_ndps_cred_type = -1;
-static int hf_ndps_server_name = -1;
-static int hf_ndps_connection = -1;
-static int hf_ndps_auth_null = -1;
-static int hf_ndps_rpc_accept = -1;
-static int hf_ndps_rpc_acc_stat = -1;
-static int hf_ndps_rpc_rej_stat = -1;
-static int hf_ndps_rpc_acc_results = -1;
-static int hf_ndps_problem_type = -1;
-static int hf_security_problem_type = -1;
-static int hf_service_problem_type = -1;
-static int hf_access_problem_type = -1;
-static int hf_printer_problem_type = -1;
-static int hf_selection_problem_type = -1;
-static int hf_doc_access_problem_type = -1;
-static int hf_attribute_problem_type = -1;
-static int hf_update_problem_type = -1;
-static int hf_obj_id_type = -1;
-static int hf_oid_struct_size = -1;
-static int hf_object_name = -1;
-static int hf_ndps_document_number = -1;
-static int hf_ndps_nameorid = -1;
-static int hf_ndps_local_object_name = -1;
-static int hf_ndps_printer_name = -1;
-static int hf_ndps_qualified_name = -1;
-static int hf_ndps_item_count = -1;
-static int hf_ndps_num_passwords = -1;
-static int hf_ndps_num_servers = -1;
-static int hf_ndps_num_locations = -1;
-static int hf_ndps_num_areas = -1;
-static int hf_ndps_num_address_items = -1;
-static int hf_ndps_num_job_categories = -1;
-static int hf_ndps_num_page_selects = -1;
-static int hf_ndps_num_page_informations = -1;
-static int hf_ndps_num_names = -1;
-static int hf_ndps_num_categories = -1;
-static int hf_ndps_num_colorants = -1;
-static int hf_ndps_num_events = -1;
-static int hf_ndps_num_args = -1;
-static int hf_ndps_num_transfer_methods = -1;
-static int hf_ndps_num_doc_types = -1;
-static int hf_ndps_num_destinations = -1;
-static int hf_ndps_qualifier = -1;
-static int hf_ndps_lib_error = -1;
-static int hf_ndps_other_error = -1;
-static int hf_ndps_other_error_2 = -1;
-static int hf_ndps_session = -1;
-static int hf_ndps_abort_flag = -1;
-static int hf_ndps_obj_attribute_type = -1;
-static int hf_ndps_attribute_value = -1;
-static int hf_ndps_lower_range = -1;
-static int hf_ndps_upper_range = -1;
-static int hf_ndps_n64 = -1;
-static int hf_ndps_lower_range_n64 = -1;
-static int hf_ndps_upper_range_n64 = -1;
-static int hf_ndps_attrib_boolean = -1;
-static int hf_ndps_realization = -1;
-static int hf_ndps_xdimension_n64 = -1;
-static int hf_ndps_ydimension_n64 = -1;
-static int hf_ndps_dim_value = -1;
-static int hf_ndps_dim_flag = -1;
-static int hf_ndps_xydim_value = -1;
-static int hf_ndps_location_value = -1;
-static int hf_ndps_xmin_n64 = -1;
-static int hf_ndps_xmax_n64 = -1;
-static int hf_ndps_ymin_n64 = -1;
-static int hf_ndps_ymax_n64 = -1;
-static int hf_ndps_edge_value = -1;
-static int hf_ndps_cardinal_or_oid = -1;
-static int hf_ndps_cardinal_name_or_oid = -1;
-static int hf_ndps_integer_or_oid = -1;
-static int hf_ndps_profile_id = -1;
-static int hf_ndps_persistence = -1;
-static int hf_ndps_language_count = -1;
-static int hf_ndps_language_id = -1;
-static int hf_address_type = -1;
-static int hf_ndps_address = -1;
-static int hf_ndps_add_bytes = -1;
-static int hf_ndps_event_type = -1;
-static int hf_ndps_event_object_identifier = -1;
-static int hf_ndps_octet_string = -1;
-static int hf_ndps_scope = -1;
-static int hf_address_len = -1;
-static int hf_ndps_net = -1;
-static int hf_ndps_node = -1;
-static int hf_ndps_socket = -1;
-static int hf_ndps_port = -1;
-static int hf_ndps_ip = -1;
-static int hf_ndps_server_type = -1;
-static int hf_ndps_num_services = -1;
-static int hf_ndps_service_type = -1;
-static int hf_ndps_service_enabled = -1;
-static int hf_ndps_method_name = -1;
-static int hf_ndps_method_ver = -1;
-static int hf_ndps_file_name = -1;
-static int hf_ndps_admin_submit = -1;
-static int hf_ndps_oid = -1;
-static int hf_ndps_object_op = -1;
-static int hf_answer_time = -1;
-static int hf_oid_asn1_type = -1;
-static int hf_ndps_item_ptr = -1;
-static int hf_ndps_len = -1;
-static int hf_ndps_limit_enc = -1;
-static int hf_ndps_delivery_add_count = -1;
-/* static int hf_ndps_qualified_name2 = -1; */
-static int hf_ndps_delivery_add_type = -1;
-static int hf_ndps_criterion_type = -1;
-static int hf_ndps_num_ignored_attributes = -1;
-static int hf_ndps_ignored_type = -1;
-static int hf_ndps_num_resources = -1;
-static int hf_ndps_resource_type = -1;
-static int hf_ndps_identifier_type = -1;
-static int hf_ndps_page_flag = -1;
-static int hf_ndps_media_type = -1;
-static int hf_ndps_doc_content = -1;
-static int hf_ndps_page_size = -1;
-static int hf_ndps_direction = -1;
-static int hf_ndps_page_order = -1;
-static int hf_ndps_medium_size = -1;
-static int hf_ndps_long_edge_feeds = -1;
-static int hf_ndps_inc_across_feed = -1;
-static int hf_ndps_size_inc_in_feed = -1;
-static int hf_ndps_page_orientation = -1;
-static int hf_ndps_numbers_up = -1;
-static int hf_ndps_xdimension = -1;
-static int hf_ndps_ydimension = -1;
-static int hf_ndps_state_severity = -1;
-static int hf_ndps_training = -1;
-static int hf_ndps_colorant_set = -1;
-static int hf_ndps_card_enum_time = -1;
-static int hf_ndps_attrs_arg = -1;
-static int hf_ndps_context_len = -1;
-static int hf_ndps_context = -1;
-static int hf_ndps_filter = -1;
-/* static int hf_ndps_item_filter = -1; */
-/* static int hf_ndps_substring_match = -1; */
-static int hf_ndps_time_limit = -1;
-static int hf_ndps_count_limit = -1;
-static int hf_ndps_operator = -1;
-static int hf_ndps_password = -1;
-static int hf_ndps_retrieve_restrictions = -1;
-static int hf_ndps_bind_security_option_count = -1;
-static int hf_bind_security = -1;
-static int hf_ndps_max_items = -1;
-static int hf_ndps_status_flags = -1;
-static int hf_ndps_resource_list_type = -1;
-static int hf_os_count = -1;
-static int hf_os_type = -1;
-static int hf_ndps_printer_type_count = -1;
-static int hf_ndps_printer_type = -1;
-static int hf_ndps_printer_manuf = -1;
-static int hf_ndps_inf_file_name = -1;
-static int hf_ndps_vendor_dir = -1;
-static int hf_banner_type = -1;
-static int hf_font_type = -1;
-static int hf_printer_id = -1;
-static int hf_ndps_font_name = -1;
-static int hf_ndps_return_code = -1;
-/* static int hf_ndps_banner_count = -1; */
-static int hf_ndps_banner_name = -1;
-static int hf_ndps_font_type_count = -1;
-static int hf_font_type_name = -1;
-static int hf_ndps_font_file_count = -1;
-static int hf_font_file_name = -1;
-static int hf_ndps_printer_def_count = -1;
-static int hf_ndps_prn_file_name = -1;
-static int hf_ndps_prn_dir_name = -1;
-static int hf_ndps_def_file_name = -1;
-static int hf_ndps_num_win31_keys = -1;
-static int hf_ndps_num_win95_keys = -1;
-static int hf_ndps_num_windows_keys = -1;
-static int hf_ndps_windows_key = -1;
-static int hf_archive_type = -1;
-static int hf_archive_file_size = -1;
-static int hf_ndps_data = -1;
-static int hf_get_status_flag = -1;
-static int hf_res_type = -1;
-static int hf_file_timestamp = -1;
-static int hf_sub_complete = -1;
-static int hf_doc_content = -1;
-/* static int hf_ndps_doc_name = -1; */
-static int hf_print_arg = -1;
-static int hf_local_id = -1;
-static int hf_ndps_included_doc_len = -1;
-static int hf_ndps_included_doc = -1;
-static int hf_ndps_ref_name = -1;
-static int hf_interrupt_job_type = -1;
-static int hf_pause_job_type = -1;
-static int hf_ndps_force = -1;
-static int hf_resubmit_op_type = -1;
-static int hf_shutdown_type = -1;
-static int hf_ndps_supplier_flag = -1;
-static int hf_ndps_language_flag = -1;
-static int hf_ndps_method_flag = -1;
-static int hf_ndps_delivery_address_flag = -1;
-static int hf_ndps_list_profiles_type = -1;
-static int hf_ndps_list_profiles_choice_type = -1;
-static int hf_ndps_list_profiles_result_type = -1;
-static int hf_ndps_integer_type_flag = -1;
-static int hf_ndps_integer_type_value = -1;
-static int hf_ndps_continuation_option = -1;
-static int hf_ndps_ds_info_type = -1;
-static int hf_ndps_guid = -1;
-static int hf_ndps_list_services_type = -1;
-static int hf_ndps_item_bytes = -1;
-static int hf_ndps_certified = -1;
-static int hf_ndps_attribute_set = -1;
-static int hf_ndps_data_item_type = -1;
-static int hf_info_int = -1;
-static int hf_info_int16 = -1;
-static int hf_info_int32 = -1;
-static int hf_info_boolean = -1;
-static int hf_info_string = -1;
-/* static int hf_info_bytes = -1; */
-static int hf_ndps_list_local_servers_type = -1;
-static int hf_ndps_registry_name = -1;
-static int hf_ndps_client_server_type = -1;
-static int hf_ndps_session_type = -1;
-static int hf_time = -1;
-static int hf_ndps_supplier_name = -1;
-static int hf_ndps_message = -1;
-static int hf_ndps_delivery_method_count = -1;
-static int hf_delivery_method_type = -1;
-static int hf_ndps_get_session_type = -1;
-static int hf_packet_count = -1;
-static int hf_last_packet_flag = -1;
-static int hf_ndps_get_resman_session_type = -1;
-static int hf_problem_type = -1;
-static int hf_ndps_num_values = -1;
-static int hf_ndps_object_ids_7 = -1;
-static int hf_ndps_object_ids_8 = -1;
-static int hf_ndps_object_ids_9 = -1;
-static int hf_ndps_object_ids_10 = -1;
-static int hf_ndps_object_ids_11 = -1;
-static int hf_ndps_object_ids_12 = -1;
-static int hf_ndps_object_ids_13 = -1;
-static int hf_ndps_object_ids_14 = -1;
-static int hf_ndps_object_ids_15 = -1;
-static int hf_ndps_object_ids_16 = -1;
-/* static int hf_ndps_attribute_time = -1; */
-static int hf_print_security = -1;
-static int hf_notify_time_interval = -1;
-static int hf_notify_sequence_number = -1;
-static int hf_notify_lease_exp_time = -1;
-static int hf_notify_printer_uri = -1;
-static int hf_level = -1;
-static int hf_interval = -1;
-static int hf_ndps_other_error_string = -1;
-
-static int hf_spx_ndps_program = -1;
-static int hf_spx_ndps_version = -1;
-static int hf_spx_ndps_func_print = -1;
-static int hf_spx_ndps_func_registry = -1;
-static int hf_spx_ndps_func_notify = -1;
-static int hf_spx_ndps_func_resman = -1;
-static int hf_spx_ndps_func_delivery = -1;
-static int hf_spx_ndps_func_broker = -1;
-
-static gint ett_ndps = -1;
-
-static expert_field ei_ndps_problem_type = EI_INIT;
-static expert_field ei_ndps_return_code = EI_INIT;
-static expert_field ei_ndps_rpc_acc_stat = EI_INIT;
-static expert_field ei_ndps_truncated = EI_INIT;
+static int hf_ndps_segments;
+static int hf_ndps_segment;
+static int hf_ndps_segment_overlap;
+static int hf_ndps_segment_overlap_conflict;
+static int hf_ndps_segment_multiple_tails;
+static int hf_ndps_segment_too_long_segment;
+static int hf_ndps_segment_error;
+static int hf_ndps_segment_count;
+static int hf_ndps_reassembled_length;
+
+static gint ett_ndps_segments;
+static gint ett_ndps_segment;
+
+static int proto_ndps;
+static int hf_ndps_record_mark;
+static int hf_ndps_length;
+static int hf_ndps_xid;
+static int hf_ndps_packet_type;
+static int hf_ndps_rpc_version;
+/* static int hf_ndps_error; */
+static int hf_ndps_num_objects;
+static int hf_ndps_num_attributes;
+/* static int hf_ndps_sbuffer; */
+/* static int hf_ndps_rbuffer; */
+static int hf_ndps_user_name;
+static int hf_ndps_broker_name;
+static int hf_ndps_num_results;
+static int hf_ndps_num_options;
+static int hf_ndps_num_jobs;
+static int hf_ndps_pa_name;
+static int hf_ndps_tree;
+static int hf_ndps_reqframe;
+static int hf_ndps_error_val;
+static int hf_ndps_ext_error;
+static int hf_ndps_object;
+static int hf_ndps_cred_type;
+static int hf_ndps_server_name;
+static int hf_ndps_connection;
+static int hf_ndps_auth_null;
+static int hf_ndps_rpc_accept;
+static int hf_ndps_rpc_acc_stat;
+static int hf_ndps_rpc_rej_stat;
+static int hf_ndps_rpc_acc_results;
+static int hf_ndps_problem_type;
+static int hf_security_problem_type;
+static int hf_service_problem_type;
+static int hf_access_problem_type;
+static int hf_printer_problem_type;
+static int hf_selection_problem_type;
+static int hf_doc_access_problem_type;
+static int hf_attribute_problem_type;
+static int hf_update_problem_type;
+static int hf_obj_id_type;
+static int hf_oid_struct_size;
+static int hf_object_name;
+static int hf_ndps_document_number;
+static int hf_ndps_nameorid;
+static int hf_ndps_local_object_name;
+static int hf_ndps_printer_name;
+static int hf_ndps_qualified_name;
+static int hf_ndps_item_count;
+static int hf_ndps_num_passwords;
+static int hf_ndps_num_servers;
+static int hf_ndps_num_locations;
+static int hf_ndps_num_areas;
+static int hf_ndps_num_address_items;
+static int hf_ndps_num_job_categories;
+static int hf_ndps_num_page_selects;
+static int hf_ndps_num_page_informations;
+static int hf_ndps_num_names;
+static int hf_ndps_num_categories;
+static int hf_ndps_num_colorants;
+static int hf_ndps_num_events;
+static int hf_ndps_num_args;
+static int hf_ndps_num_transfer_methods;
+static int hf_ndps_num_doc_types;
+static int hf_ndps_num_destinations;
+static int hf_ndps_qualifier;
+static int hf_ndps_lib_error;
+static int hf_ndps_other_error;
+static int hf_ndps_other_error_2;
+static int hf_ndps_session;
+static int hf_ndps_abort_flag;
+static int hf_ndps_obj_attribute_type;
+static int hf_ndps_attribute_value;
+static int hf_ndps_lower_range;
+static int hf_ndps_upper_range;
+static int hf_ndps_n64;
+static int hf_ndps_lower_range_n64;
+static int hf_ndps_upper_range_n64;
+static int hf_ndps_attrib_boolean;
+static int hf_ndps_realization;
+static int hf_ndps_xdimension_n64;
+static int hf_ndps_ydimension_n64;
+static int hf_ndps_dim_value;
+static int hf_ndps_dim_flag;
+static int hf_ndps_xydim_value;
+static int hf_ndps_location_value;
+static int hf_ndps_xmin_n64;
+static int hf_ndps_xmax_n64;
+static int hf_ndps_ymin_n64;
+static int hf_ndps_ymax_n64;
+static int hf_ndps_edge_value;
+static int hf_ndps_cardinal_or_oid;
+static int hf_ndps_cardinal_name_or_oid;
+static int hf_ndps_integer_or_oid;
+static int hf_ndps_profile_id;
+static int hf_ndps_persistence;
+static int hf_ndps_language_count;
+static int hf_ndps_language_id;
+static int hf_address_type;
+static int hf_ndps_address;
+static int hf_ndps_add_bytes;
+static int hf_ndps_event_type;
+static int hf_ndps_event_object_identifier;
+static int hf_ndps_octet_string;
+static int hf_ndps_scope;
+static int hf_address_len;
+static int hf_ndps_net;
+static int hf_ndps_node;
+static int hf_ndps_socket;
+static int hf_ndps_port;
+static int hf_ndps_ip;
+static int hf_ndps_server_type;
+static int hf_ndps_num_services;
+static int hf_ndps_service_type;
+static int hf_ndps_service_enabled;
+static int hf_ndps_method_name;
+static int hf_ndps_method_ver;
+static int hf_ndps_file_name;
+static int hf_ndps_admin_submit;
+static int hf_ndps_oid;
+static int hf_ndps_object_op;
+static int hf_answer_time;
+static int hf_oid_asn1_type;
+static int hf_ndps_item_ptr;
+static int hf_ndps_len;
+static int hf_ndps_limit_enc;
+static int hf_ndps_delivery_add_count;
+/* static int hf_ndps_qualified_name2; */
+static int hf_ndps_delivery_add_type;
+static int hf_ndps_criterion_type;
+static int hf_ndps_num_ignored_attributes;
+static int hf_ndps_ignored_type;
+static int hf_ndps_num_resources;
+static int hf_ndps_resource_type;
+static int hf_ndps_identifier_type;
+static int hf_ndps_page_flag;
+static int hf_ndps_media_type;
+static int hf_ndps_doc_content;
+static int hf_ndps_page_size;
+static int hf_ndps_direction;
+static int hf_ndps_page_order;
+static int hf_ndps_medium_size;
+static int hf_ndps_long_edge_feeds;
+static int hf_ndps_inc_across_feed;
+static int hf_ndps_size_inc_in_feed;
+static int hf_ndps_page_orientation;
+static int hf_ndps_numbers_up;
+static int hf_ndps_xdimension;
+static int hf_ndps_ydimension;
+static int hf_ndps_state_severity;
+static int hf_ndps_training;
+static int hf_ndps_colorant_set;
+static int hf_ndps_card_enum_time;
+static int hf_ndps_attrs_arg;
+static int hf_ndps_context_len;
+static int hf_ndps_context;
+static int hf_ndps_filter;
+/* static int hf_ndps_item_filter; */
+/* static int hf_ndps_substring_match; */
+static int hf_ndps_time_limit;
+static int hf_ndps_count_limit;
+static int hf_ndps_operator;
+static int hf_ndps_password;
+static int hf_ndps_retrieve_restrictions;
+static int hf_ndps_bind_security_option_count;
+static int hf_bind_security;
+static int hf_ndps_max_items;
+static int hf_ndps_status_flags;
+static int hf_ndps_resource_list_type;
+static int hf_os_count;
+static int hf_os_type;
+static int hf_ndps_printer_type_count;
+static int hf_ndps_printer_type;
+static int hf_ndps_printer_manuf;
+static int hf_ndps_inf_file_name;
+static int hf_ndps_vendor_dir;
+static int hf_banner_type;
+static int hf_font_type;
+static int hf_printer_id;
+static int hf_ndps_font_name;
+static int hf_ndps_return_code;
+/* static int hf_ndps_banner_count; */
+static int hf_ndps_banner_name;
+static int hf_ndps_font_type_count;
+static int hf_font_type_name;
+static int hf_ndps_font_file_count;
+static int hf_font_file_name;
+static int hf_ndps_printer_def_count;
+static int hf_ndps_prn_file_name;
+static int hf_ndps_prn_dir_name;
+static int hf_ndps_def_file_name;
+static int hf_ndps_num_win31_keys;
+static int hf_ndps_num_win95_keys;
+static int hf_ndps_num_windows_keys;
+static int hf_ndps_windows_key;
+static int hf_archive_type;
+static int hf_archive_file_size;
+static int hf_ndps_data;
+static int hf_get_status_flag;
+static int hf_res_type;
+static int hf_file_timestamp;
+static int hf_sub_complete;
+static int hf_doc_content;
+/* static int hf_ndps_doc_name; */
+static int hf_print_arg;
+static int hf_local_id;
+static int hf_ndps_included_doc_len;
+static int hf_ndps_included_doc;
+static int hf_ndps_ref_name;
+static int hf_interrupt_job_type;
+static int hf_pause_job_type;
+static int hf_ndps_force;
+static int hf_resubmit_op_type;
+static int hf_shutdown_type;
+static int hf_ndps_supplier_flag;
+static int hf_ndps_language_flag;
+static int hf_ndps_method_flag;
+static int hf_ndps_delivery_address_flag;
+static int hf_ndps_list_profiles_type;
+static int hf_ndps_list_profiles_choice_type;
+static int hf_ndps_list_profiles_result_type;
+static int hf_ndps_integer_type_flag;
+static int hf_ndps_integer_type_value;
+static int hf_ndps_continuation_option;
+static int hf_ndps_ds_info_type;
+static int hf_ndps_guid;
+static int hf_ndps_list_services_type;
+static int hf_ndps_item_bytes;
+static int hf_ndps_certified;
+static int hf_ndps_attribute_set;
+static int hf_ndps_data_item_type;
+static int hf_info_int;
+static int hf_info_int16;
+static int hf_info_int32;
+static int hf_info_boolean;
+static int hf_info_string;
+/* static int hf_info_bytes; */
+static int hf_ndps_list_local_servers_type;
+static int hf_ndps_registry_name;
+static int hf_ndps_client_server_type;
+static int hf_ndps_session_type;
+static int hf_time;
+static int hf_ndps_supplier_name;
+static int hf_ndps_message;
+static int hf_ndps_delivery_method_count;
+static int hf_delivery_method_type;
+static int hf_ndps_get_session_type;
+static int hf_packet_count;
+static int hf_last_packet_flag;
+static int hf_ndps_get_resman_session_type;
+static int hf_problem_type;
+static int hf_ndps_num_values;
+static int hf_ndps_object_ids_7;
+static int hf_ndps_object_ids_8;
+static int hf_ndps_object_ids_9;
+static int hf_ndps_object_ids_10;
+static int hf_ndps_object_ids_11;
+static int hf_ndps_object_ids_12;
+static int hf_ndps_object_ids_13;
+static int hf_ndps_object_ids_14;
+static int hf_ndps_object_ids_15;
+static int hf_ndps_object_ids_16;
+/* static int hf_ndps_attribute_time; */
+static int hf_print_security;
+static int hf_notify_time_interval;
+static int hf_notify_sequence_number;
+static int hf_notify_lease_exp_time;
+static int hf_notify_printer_uri;
+static int hf_level;
+static int hf_interval;
+static int hf_ndps_other_error_string;
+
+static int hf_spx_ndps_program;
+static int hf_spx_ndps_version;
+static int hf_spx_ndps_func_print;
+static int hf_spx_ndps_func_registry;
+static int hf_spx_ndps_func_notify;
+static int hf_spx_ndps_func_resman;
+static int hf_spx_ndps_func_delivery;
+static int hf_spx_ndps_func_broker;
+
+static gint ett_ndps;
+
+static expert_field ei_ndps_problem_type;
+static expert_field ei_ndps_return_code;
+static expert_field ei_ndps_rpc_acc_stat;
+static expert_field ei_ndps_truncated;
 
 
 /* desegmentation of NDPS over TCP */
diff --git a/epan/dissectors/packet-negoex.c b/epan/dissectors/packet-negoex.c
index dab12ae7da..7e1a9ce2d4 100644
--- a/epan/dissectors/packet-negoex.c
+++ b/epan/dissectors/packet-negoex.c
@@ -22,45 +22,45 @@
 void proto_register_negoex(void);
 void proto_reg_handoff_negoex(void);
 
-static int proto_negoex = -1;
-static int hf_negoex_sig = -1;
-static int hf_negoex_message_type = -1;
-static int hf_negoex_sequence_num = -1;
-static int hf_negoex_header_len = -1;
-static int hf_negoex_message_len = -1;
-static int hf_negoex_conversation_id = -1;
-static int hf_negoex_random = -1;
-static int hf_negoex_proto_version = -1;
-static int hf_negoex_authscheme = -1;
-static int hf_negoex_authscheme_vector_offset = -1;
-static int hf_negoex_authscheme_vector_count = -1;
-static int hf_negoex_authscheme_vector_pad = -1;
-static int hf_negoex_extension = -1;
-static int hf_negoex_extension_vector_offset = -1;
-static int hf_negoex_extension_vector_count = -1;
-static int hf_negoex_extension_vector_pad = -1;
-static int hf_negoex_exchange_vector_offset = -1;
-static int hf_negoex_exchange_vector_count = -1;
-static int hf_negoex_exchange_vector_pad = -1;
-static int hf_negoex_exchange = -1;
-static int hf_negoex_checksum_scheme = -1;
-static int hf_negoex_checksum_type = -1;
-static int hf_negoex_checksum_vector_offset = -1;
-static int hf_negoex_checksum_vector_count = -1;
-static int hf_negoex_checksum_vector_pad = -1;
-static int hf_negoex_checksum = -1;
-static int hf_negoex_errorcode = -1;
-static int hf_negoex_data = -1;
-
-static gint ett_negoex = -1;
-static gint ett_negoex_msg = -1;
-static gint ett_negoex_hdr = -1;
-static gint ett_negoex_authscheme_vector = -1;
-static gint ett_negoex_extension_vector = -1;
-static gint ett_negoex_exchange = -1;
-static gint ett_negoex_checksum = -1;
-static gint ett_negoex_checksum_vector = -1;
-static gint ett_negoex_byte_vector = -1;
+static int proto_negoex;
+static int hf_negoex_sig;
+static int hf_negoex_message_type;
+static int hf_negoex_sequence_num;
+static int hf_negoex_header_len;
+static int hf_negoex_message_len;
+static int hf_negoex_conversation_id;
+static int hf_negoex_random;
+static int hf_negoex_proto_version;
+static int hf_negoex_authscheme;
+static int hf_negoex_authscheme_vector_offset;
+static int hf_negoex_authscheme_vector_count;
+static int hf_negoex_authscheme_vector_pad;
+static int hf_negoex_extension;
+static int hf_negoex_extension_vector_offset;
+static int hf_negoex_extension_vector_count;
+static int hf_negoex_extension_vector_pad;
+static int hf_negoex_exchange_vector_offset;
+static int hf_negoex_exchange_vector_count;
+static int hf_negoex_exchange_vector_pad;
+static int hf_negoex_exchange;
+static int hf_negoex_checksum_scheme;
+static int hf_negoex_checksum_type;
+static int hf_negoex_checksum_vector_offset;
+static int hf_negoex_checksum_vector_count;
+static int hf_negoex_checksum_vector_pad;
+static int hf_negoex_checksum;
+static int hf_negoex_errorcode;
+static int hf_negoex_data;
+
+static gint ett_negoex;
+static gint ett_negoex_msg;
+static gint ett_negoex_hdr;
+static gint ett_negoex_authscheme_vector;
+static gint ett_negoex_extension_vector;
+static gint ett_negoex_exchange;
+static gint ett_negoex_checksum;
+static gint ett_negoex_checksum_vector;
+static gint ett_negoex_byte_vector;
 
 static dissector_handle_t negoex_handle;
 
diff --git a/epan/dissectors/packet-netanalyzer.c b/epan/dissectors/packet-netanalyzer.c
index 84b510871d..6c0fc16495 100644
--- a/epan/dissectors/packet-netanalyzer.c
+++ b/epan/dissectors/packet-netanalyzer.c
@@ -128,27 +128,27 @@ static const value_string buf_source_vals[] = {
 
 static dissector_handle_t  eth_dissector_handle;
 
-static gint  proto_netanalyzer           = -1;
-
-static gint  hf_netanalyzer_gpio                     = -1;
-static gint  hf_netanalyzer_gpio_number              = -1;
-static gint  hf_netanalyzer_gpio_edge                = -1;
-static gint  hf_netanalyzer_eth                      = -1;
-static gint  hf_netanalyzer_port                     = -1;
-static gint  hf_netanalyzer_length                   = -1;
-static gint  hf_netanalyzer_status                   = -1;
-static gint  hf_netanalyzer_status_rx_err            = -1;
-static gint  hf_netanalyzer_status_align_err         = -1;
-static gint  hf_netanalyzer_status_fcs               = -1;
-static gint  hf_netanalyzer_status_too_long          = -1;
-static gint  hf_netanalyzer_status_sfd_error         = -1;
-static gint  hf_netanalyzer_status_short_frame       = -1;
-static gint  hf_netanalyzer_status_short_preamble    = -1;
-static gint  hf_netanalyzer_status_long_preamble     = -1;
-static gint  hf_netanalyzer_buf                      = -1;
-static gint  hf_netanalyzer_buf_state                = -1;
-static gint  hf_netanalyzer_buf_source               = -1;
-static gint  hf_netanalyzer_timetick                 = -1;
+static gint  proto_netanalyzer;
+
+static gint  hf_netanalyzer_gpio;
+static gint  hf_netanalyzer_gpio_number;
+static gint  hf_netanalyzer_gpio_edge;
+static gint  hf_netanalyzer_eth;
+static gint  hf_netanalyzer_port;
+static gint  hf_netanalyzer_length;
+static gint  hf_netanalyzer_status;
+static gint  hf_netanalyzer_status_rx_err;
+static gint  hf_netanalyzer_status_align_err;
+static gint  hf_netanalyzer_status_fcs;
+static gint  hf_netanalyzer_status_too_long;
+static gint  hf_netanalyzer_status_sfd_error;
+static gint  hf_netanalyzer_status_short_frame;
+static gint  hf_netanalyzer_status_short_preamble;
+static gint  hf_netanalyzer_status_long_preamble;
+static gint  hf_netanalyzer_buf;
+static gint  hf_netanalyzer_buf_state;
+static gint  hf_netanalyzer_buf_source;
+static gint  hf_netanalyzer_timetick;
 
 static int * const hfx_netanalyzer_status[] = {
   &hf_netanalyzer_status_rx_err,
@@ -162,18 +162,18 @@ static int * const hfx_netanalyzer_status[] = {
   NULL
 };
 
-static gint  ett_netanalyzer                         = -1;
-static gint  ett_netanalyzer_gpio                    = -1;
-static gint  ett_netanalyzer_status                  = -1;
-static gint  ett_netanalyzer_transparent             = -1;
-static gint  ett_netanalyzer_buf                     = -1;
-
-static expert_field ei_netanalyzer_header_wrong = EI_INIT;
-static expert_field ei_netanalyzer_gpio_def_none = EI_INIT;
-static expert_field ei_netanalyzer_header_none = EI_INIT;
-static expert_field ei_netanalyzer_transparent_frame = EI_INIT;
-static expert_field ei_netanalyzer_alignment_error = EI_INIT;
-static expert_field ei_netanalyzer_not_implemented = EI_INIT;
+static gint  ett_netanalyzer;
+static gint  ett_netanalyzer_gpio;
+static gint  ett_netanalyzer_status;
+static gint  ett_netanalyzer_transparent;
+static gint  ett_netanalyzer_buf;
+
+static expert_field ei_netanalyzer_header_wrong;
+static expert_field ei_netanalyzer_gpio_def_none;
+static expert_field ei_netanalyzer_header_none;
+static expert_field ei_netanalyzer_transparent_frame;
+static expert_field ei_netanalyzer_alignment_error;
+static expert_field ei_netanalyzer_not_implemented;
 
 /* common routine for Ethernet and transparent mode */
 static int
diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c
index f3d93ca1c4..e23200864a 100644
--- a/epan/dissectors/packet-netbios.c
+++ b/epan/dissectors/packet-netbios.c
@@ -70,62 +70,62 @@ static capture_dissector_handle_t netbios_cap_handle;
 #define	NB_SENDER_NAME		28
 
 
-static int proto_netbios = -1;
-static int hf_netb_cmd = -1;
-static int hf_netb_hdr_len = -1;
-static int hf_netb_delimiter = -1;
-static int hf_netb_xmit_corrl = -1;
-static int hf_netb_resp_corrl = -1;
-static int hf_netb_call_name_type = -1;
-static int hf_netb_version = -1;
-static int hf_netbios_no_receive_flags = -1;
-static int hf_netbios_no_receive_flags_send_no_ack = -1;
-static int hf_netb_largest_frame = -1;
-static int hf_netb_nb_name = -1;
-static int hf_netb_nb_name_type = -1;
-static int hf_netb_status_buffer_len = -1;
-static int hf_netb_status = -1;
-static int hf_netb_name_type = -1;
-static int hf_netb_max_data_recv_size = -1;
-static int hf_netb_termination_indicator = -1;
-static int hf_netb_num_data_bytes_accepted = -1;
-static int hf_netb_local_ses_no = -1;
-static int hf_netb_remote_ses_no = -1;
-static int hf_netb_flags = -1;
-static int hf_netb_flags_send_no_ack = -1;
-static int hf_netb_flags_ack = -1;
-static int hf_netb_flags_ack_with_data = -1;
-static int hf_netb_flags_ack_expected = -1;
-static int hf_netb_flags_recv_cont_req = -1;
-static int hf_netb_data2 = -1;
-static int hf_netb_data2_frame = -1;
-static int hf_netb_data2_user = -1;
-static int hf_netb_data2_status = -1;
-static int hf_netb_datagram_mac = -1;
-static int hf_netb_datagram_bcast_mac = -1;
-static int hf_netb_resync_indicator = -1;
-static int hf_netb_status_request = -1;
-static int hf_netb_local_session_no = -1;
-static int hf_netb_state_of_name = -1;
-static int hf_netb_status_response = -1;
-static int hf_netb_fragments = -1;
-static int hf_netb_fragment = -1;
-static int hf_netb_fragment_overlap = -1;
-static int hf_netb_fragment_overlap_conflict = -1;
-static int hf_netb_fragment_multiple_tails = -1;
-static int hf_netb_fragment_too_long_fragment = -1;
-static int hf_netb_fragment_error = -1;
-static int hf_netb_fragment_count = -1;
-static int hf_netb_reassembled_length = -1;
-
-static gint ett_netb = -1;
-static gint ett_netb_name = -1;
-static gint ett_netb_flags = -1;
-static gint ett_netb_status = -1;
-static gint ett_netb_fragments = -1;
-static gint ett_netb_fragment = -1;
-
-static expert_field ei_netb_unknown_command_data = EI_INIT;
+static int proto_netbios;
+static int hf_netb_cmd;
+static int hf_netb_hdr_len;
+static int hf_netb_delimiter;
+static int hf_netb_xmit_corrl;
+static int hf_netb_resp_corrl;
+static int hf_netb_call_name_type;
+static int hf_netb_version;
+static int hf_netbios_no_receive_flags;
+static int hf_netbios_no_receive_flags_send_no_ack;
+static int hf_netb_largest_frame;
+static int hf_netb_nb_name;
+static int hf_netb_nb_name_type;
+static int hf_netb_status_buffer_len;
+static int hf_netb_status;
+static int hf_netb_name_type;
+static int hf_netb_max_data_recv_size;
+static int hf_netb_termination_indicator;
+static int hf_netb_num_data_bytes_accepted;
+static int hf_netb_local_ses_no;
+static int hf_netb_remote_ses_no;
+static int hf_netb_flags;
+static int hf_netb_flags_send_no_ack;
+static int hf_netb_flags_ack;
+static int hf_netb_flags_ack_with_data;
+static int hf_netb_flags_ack_expected;
+static int hf_netb_flags_recv_cont_req;
+static int hf_netb_data2;
+static int hf_netb_data2_frame;
+static int hf_netb_data2_user;
+static int hf_netb_data2_status;
+static int hf_netb_datagram_mac;
+static int hf_netb_datagram_bcast_mac;
+static int hf_netb_resync_indicator;
+static int hf_netb_status_request;
+static int hf_netb_local_session_no;
+static int hf_netb_state_of_name;
+static int hf_netb_status_response;
+static int hf_netb_fragments;
+static int hf_netb_fragment;
+static int hf_netb_fragment_overlap;
+static int hf_netb_fragment_overlap_conflict;
+static int hf_netb_fragment_multiple_tails;
+static int hf_netb_fragment_too_long_fragment;
+static int hf_netb_fragment_error;
+static int hf_netb_fragment_count;
+static int hf_netb_reassembled_length;
+
+static gint ett_netb;
+static gint ett_netb_name;
+static gint ett_netb_flags;
+static gint ett_netb_status;
+static gint ett_netb_fragments;
+static gint ett_netb_fragment;
+
+static expert_field ei_netb_unknown_command_data;
 
 static const fragment_items netbios_frag_items = {
 	&ett_netb_fragment,
diff --git a/epan/dissectors/packet-netdump.c b/epan/dissectors/packet-netdump.c
index 20c3f26543..8fc161dfd7 100644
--- a/epan/dissectors/packet-netdump.c
+++ b/epan/dissectors/packet-netdump.c
@@ -19,19 +19,19 @@ void proto_reg_handoff_netdump(void);
 static dissector_handle_t netdump_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_netdump = -1;
-static int hf_netdump_magic_number = -1;
-static int hf_netdump_seq_nr = -1;
-static int hf_netdump_command = -1;
-static int hf_netdump_from = -1;
-static int hf_netdump_to = -1;
-static int hf_netdump_payload = -1;
-static int hf_netdump_code = -1;
-static int hf_netdump_info = -1;
-static int hf_netdump_version = -1;
+static int proto_netdump;
+static int hf_netdump_magic_number;
+static int hf_netdump_seq_nr;
+static int hf_netdump_command;
+static int hf_netdump_from;
+static int hf_netdump_to;
+static int hf_netdump_payload;
+static int hf_netdump_code;
+static int hf_netdump_info;
+static int hf_netdump_version;
 
 /* Initialize the subtree pointers */
-static gint ett_netdump = -1;
+static gint ett_netdump;
 
 static const value_string command_names[] = {
 	{ 0, "COMM_NONE" },
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index 3f18c12820..791a0e5cdb 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -2405,575 +2405,575 @@ static const value_string classification_engine_types[] = {
  * wireshark tree identifiers
  */
 
-static int      proto_netflow           = -1;
-
-static int      ett_netflow             = -1;
-static int      ett_unixtime            = -1;
-static int      ett_flow                = -1;
-static int      ett_flowtime            = -1;
-static int      ett_str_len             = -1;
-static int      ett_template            = -1;
-static int      ett_field               = -1;
-static int      ett_dataflowset         = -1;
-static int      ett_fwdstat             = -1;
-static int      ett_mpls_label          = -1;
-static int      ett_tcpflags            = -1;
-static int      ett_subtemplate_list    = -1;
-static int      ett_resiliency          = -1;
-static int      ett_data_link_frame_sec = -1;
-static int      ett_srhflagsipv6        = -1;
+static int      proto_netflow;
+
+static int      ett_netflow;
+static int      ett_unixtime;
+static int      ett_flow;
+static int      ett_flowtime;
+static int      ett_str_len;
+static int      ett_template;
+static int      ett_field;
+static int      ett_dataflowset;
+static int      ett_fwdstat;
+static int      ett_mpls_label;
+static int      ett_tcpflags;
+static int      ett_subtemplate_list;
+static int      ett_resiliency;
+static int      ett_data_link_frame_sec;
+static int      ett_srhflagsipv6;
 
 /*
  * cflow header
  */
 
-static int      hf_cflow_version        = -1;
-static int      hf_cflow_count          = -1;
-static int      hf_cflow_len            = -1;
-static int      hf_cflow_sysuptime      = -1;
-static int      hf_cflow_exporttime     = -1;
-static int      hf_cflow_unix_secs      = -1;
-static int      hf_cflow_unix_nsecs     = -1;
-static int      hf_cflow_timestamp      = -1;
-static int      hf_cflow_samplingmode   = -1;
-static int      hf_cflow_samplerate     = -1;
-
-static int      hf_cflow_unknown_field_type        = -1;
-static int      hf_cflow_padding        = -1;
-static int      hf_cflow_reserved       = -1;
-static int      hf_cflow_extra_packets  = -1;
+static int      hf_cflow_version;
+static int      hf_cflow_count;
+static int      hf_cflow_len;
+static int      hf_cflow_sysuptime;
+static int      hf_cflow_exporttime;
+static int      hf_cflow_unix_secs;
+static int      hf_cflow_unix_nsecs;
+static int      hf_cflow_timestamp;
+static int      hf_cflow_samplingmode;
+static int      hf_cflow_samplerate;
+
+static int      hf_cflow_unknown_field_type;
+static int      hf_cflow_padding;
+static int      hf_cflow_reserved;
+static int      hf_cflow_extra_packets;
 
 /*
  * cflow version specific info
  */
-static int      hf_cflow_sequence       = -1;
-static int      hf_cflow_engine_type    = -1;
-static int      hf_cflow_engine_id      = -1;
-static int      hf_cflow_source_id      = -1;
+static int      hf_cflow_sequence;
+static int      hf_cflow_engine_type;
+static int      hf_cflow_engine_id;
+static int      hf_cflow_source_id;
 
-static int      hf_cflow_aggmethod      = -1;
-static int      hf_cflow_aggversion     = -1;
+static int      hf_cflow_aggmethod;
+static int      hf_cflow_aggversion;
 
 /* Version 9 */
 
-static int      hf_cflow_flowset_id                = -1;
-static int      hf_cflow_flowset_length            = -1;
-static int      hf_cflow_template_id               = -1;
-static int      hf_cflow_template_field_count      = -1;
-static int      hf_cflow_template_field_type       = -1;
-static int      hf_cflow_template_field_length     = -1;
-static int      hf_cflow_option_scope_length       = -1;
-static int      hf_cflow_option_length             = -1;
-static int      hf_cflow_template_scope_field_type = -1;
-
-static int      hf_cflow_scope_system              = -1;
-static int      hf_cflow_scope_interface           = -1;
-static int      hf_cflow_scope_linecard            = -1;
-static int      hf_cflow_scope_cache               = -1;
-static int      hf_cflow_scope_template            = -1;
+static int      hf_cflow_flowset_id;
+static int      hf_cflow_flowset_length;
+static int      hf_cflow_template_id;
+static int      hf_cflow_template_field_count;
+static int      hf_cflow_template_field_type;
+static int      hf_cflow_template_field_length;
+static int      hf_cflow_option_scope_length;
+static int      hf_cflow_option_length;
+static int      hf_cflow_template_scope_field_type;
+
+static int      hf_cflow_scope_system;
+static int      hf_cflow_scope_interface;
+static int      hf_cflow_scope_linecard;
+static int      hf_cflow_scope_cache;
+static int      hf_cflow_scope_template;
 
 /* IPFIX */
-static int      hf_cflow_template_ipfix_total_field_count           = -1;
-static int      hf_cflow_template_ipfix_scope_field_count           = -1;
-static int      hf_cflow_template_ipfix_pen_provided                = -1;
-static int      hf_cflow_template_ipfix_field_type                  = -1;
-static int      hf_cflow_template_ipfix_field_type_enterprise       = -1;
-static int      hf_cflow_template_ipfix_field_pen                   = -1;
-static int      hf_cflow_subtemplate_id                             = -1;
-static int      hf_cflow_subtemplate_semantic                       = -1;
+static int      hf_cflow_template_ipfix_total_field_count;
+static int      hf_cflow_template_ipfix_scope_field_count;
+static int      hf_cflow_template_ipfix_pen_provided;
+static int      hf_cflow_template_ipfix_field_type;
+static int      hf_cflow_template_ipfix_field_type_enterprise;
+static int      hf_cflow_template_ipfix_field_pen;
+static int      hf_cflow_subtemplate_id;
+static int      hf_cflow_subtemplate_semantic;
 
 /* IPFIX / vendor */
-static int      hf_cflow_template_plixer_field_type                 = -1;
-static int      hf_cflow_template_ntop_field_type                   = -1;
-static int      hf_cflow_template_ixia_field_type                   = -1;
-static int      hf_cflow_template_netscaler_field_type              = -1;
-static int      hf_cflow_template_barracuda_field_type              = -1;
-static int      hf_cflow_template_gigamon_field_type                = -1;
-static int      hf_cflow_template_cisco_field_type                  = -1;
-static int      hf_cflow_template_niagara_networks_field_type       = -1;
-static int      hf_cflow_template_fastip_field_type                 = -1;
-static int      hf_cflow_template_juniper_field_type                = -1;
+static int      hf_cflow_template_plixer_field_type;
+static int      hf_cflow_template_ntop_field_type;
+static int      hf_cflow_template_ixia_field_type;
+static int      hf_cflow_template_netscaler_field_type;
+static int      hf_cflow_template_barracuda_field_type;
+static int      hf_cflow_template_gigamon_field_type;
+static int      hf_cflow_template_cisco_field_type;
+static int      hf_cflow_template_niagara_networks_field_type;
+static int      hf_cflow_template_fastip_field_type;
+static int      hf_cflow_template_juniper_field_type;
 
 
 /*
  * pdu storage
  */
-static int      hf_cflow_srcaddr                                    = -1;
-static int      hf_cflow_srcaddr_v6                                 = -1;
-static int      hf_cflow_srcnet                                     = -1;
-static int      hf_cflow_dstaddr                                    = -1;
-static int      hf_cflow_dstaddr_v6                                 = -1;
-static int      hf_cflow_dstnet                                     = -1;
-static int      hf_cflow_nexthop                                    = -1;
-static int      hf_cflow_nexthop_v6                                 = -1;
-static int      hf_cflow_bgpnexthop                                 = -1;
-static int      hf_cflow_bgpnexthop_v6                              = -1;
-static int      hf_cflow_inputint                                   = -1;
-static int      hf_cflow_outputint                                  = -1;
-static int      hf_cflow_flows                                      = -1;
-static int      hf_cflow_packets                                    = -1;
-static int      hf_cflow_octets                                     = -1;
-static int      hf_cflow_length_min                                 = -1;
-static int      hf_cflow_length_max                                 = -1;
-static int      hf_cflow_timedelta                                  = -1;
-static int      hf_cflow_sys_init_time                              = -1;
-static int      hf_cflow_timestart                                  = -1;
-static int      hf_cflow_timeend                                    = -1;
-static int      hf_cflow_srcport                                    = -1;
-static int      hf_cflow_dstport                                    = -1;
-static int      hf_cflow_prot                                       = -1;
-static int      hf_cflow_tos                                        = -1;
-static int      hf_cflow_marked_tos                                 = -1;
-static int      hf_cflow_flags                                      = -1;
-static int      hf_cflow_tcpflags                                   = -1;
-static int      hf_cflow_tcpflags16                                 = -1;
-static int      hf_cflow_tcpflags_fin                               = -1;
-static int      hf_cflow_tcpflags_syn                               = -1;
-static int      hf_cflow_tcpflags_rst                               = -1;
-static int      hf_cflow_tcpflags_psh                               = -1;
-static int      hf_cflow_tcpflags_ack                               = -1;
-static int      hf_cflow_tcpflags_urg                               = -1;
-static int      hf_cflow_tcpflags_ece                               = -1;
-static int      hf_cflow_tcpflags_cwr                               = -1;
-static int      hf_cflow_tcpflags16_fin                             = -1;
-static int      hf_cflow_tcpflags16_syn                             = -1;
-static int      hf_cflow_tcpflags16_rst                             = -1;
-static int      hf_cflow_tcpflags16_psh                             = -1;
-static int      hf_cflow_tcpflags16_ack                             = -1;
-static int      hf_cflow_tcpflags16_urg                             = -1;
-static int      hf_cflow_tcpflags16_ece                             = -1;
-static int      hf_cflow_tcpflags16_cwr                             = -1;
-static int      hf_cflow_tcpflags16_ns                              = -1;
-static int      hf_cflow_tcpflags_reserved                          = -1;
-static int      hf_cflow_tcpflags16_reserved                        = -1;
-static int      hf_cflow_tcpflags16_zero                            = -1;
-static int      hf_cflow_dstas                                      = -1;
-static int      hf_cflow_srcas                                      = -1;
-static int      hf_cflow_dstmask                                    = -1;
-static int      hf_cflow_dstmask_v6                                 = -1;
-static int      hf_cflow_srcmask                                    = -1;
-static int      hf_cflow_srcmask_v6                                 = -1;
-static int      hf_cflow_routersc                                   = -1;
-static int      hf_cflow_mulpackets                                 = -1;
-static int      hf_cflow_muloctets                                  = -1;
-static int      hf_cflow_octets_exp                                 = -1;
-static int      hf_cflow_packets_exp                                = -1;
-static int      hf_cflow_flows_exp                                  = -1;
-static int      hf_cflow_ipv4_router_sc                             = -1;
-static int      hf_cflow_srcprefix                                  = -1;
-static int      hf_cflow_dstprefix                                  = -1;
-static int      hf_cflow_flow_class                                 = -1;
-static int      hf_cflow_ttl_minimum                                = -1;
-static int      hf_cflow_ttl_maximum                                = -1;
-static int      hf_cflow_frag_id                                    = -1;
-static int      hf_cflow_ip_version                                 = -1;
-static int      hf_cflow_icmp_type_code_ipv4                        = -1;
-static int      hf_cflow_igmp_type                                  = -1;
-static int      hf_cflow_sampling_interval                          = -1;
-static int      hf_cflow_sampling_algorithm                         = -1;
-static int      hf_cflow_flow_active_timeout                        = -1;
-static int      hf_cflow_flow_inactive_timeout                      = -1;
-static int      hf_cflow_mpls_top_label_type                        = -1;
-static int      hf_cflow_mpls_pe_addr                               = -1;
-static int      hf_cflow_sampler_id                                 = -1;
-static int      hf_cflow_sampler_mode                               = -1;
-static int      hf_cflow_sampler_random_interval                    = -1;
-static int      hf_cflow_direction                                  = -1;
-static int      hf_cflow_if_name                                    = -1;
-static int      hf_cflow_if_descr                                   = -1;
-static int      hf_cflow_sampler_name                               = -1;
-static int      hf_cflow_forwarding_status                          = -1;
-static int      hf_cflow_forwarding_status_unknown_code             = -1;
-static int      hf_cflow_forwarding_status_forward_code             = -1;
-static int      hf_cflow_forwarding_status_consume_code             = -1;
-static int      hf_cflow_forwarding_status_drop_code                = -1;
-static int      hf_cflow_nbar_appl_desc                             = -1;
-static int      hf_cflow_nbar_appl_id_class_eng_id                  = -1;
-static int      hf_cflow_nbar_appl_id_selector_id                   = -1;
-static int      hf_cflow_nbar_appl_name                             = -1;
-static int      hf_cflow_peer_srcas                                 = -1;
-static int      hf_cflow_peer_dstas                                 = -1;
-static int      hf_cflow_flow_exporter                              = -1;
-static int      hf_cflow_icmp_ipv4_type                             = -1;
-static int      hf_cflow_icmp_ipv4_code                             = -1;
-static int      hf_cflow_icmp_ipv6_type                             = -1;
-static int      hf_cflow_icmp_ipv6_code                             = -1;
-static int      hf_cflow_tcp_window_size                            = -1;
-static int      hf_cflow_ipv4_total_length                          = -1;
-static int      hf_cflow_ip_ttl                                     = -1;
-static int      hf_cflow_mpls_payload_length                        = -1;
-static int      hf_cflow_ip_dscp                                    = -1;
-static int      hf_cflow_delta_octets_squared                       = -1;
-static int      hf_cflow_total_octets_squared                       = -1;
-static int      hf_cflow_udp_length                                 = -1;
-static int      hf_cflow_is_multicast                               = -1;
-static int      hf_cflow_ip_header_words                            = -1;
-static int      hf_cflow_option_map                                 = -1;
-static int      hf_cflow_section_header                             = -1;
-static int      hf_cflow_section_payload                            = -1;
+static int      hf_cflow_srcaddr;
+static int      hf_cflow_srcaddr_v6;
+static int      hf_cflow_srcnet;
+static int      hf_cflow_dstaddr;
+static int      hf_cflow_dstaddr_v6;
+static int      hf_cflow_dstnet;
+static int      hf_cflow_nexthop;
+static int      hf_cflow_nexthop_v6;
+static int      hf_cflow_bgpnexthop;
+static int      hf_cflow_bgpnexthop_v6;
+static int      hf_cflow_inputint;
+static int      hf_cflow_outputint;
+static int      hf_cflow_flows;
+static int      hf_cflow_packets;
+static int      hf_cflow_octets;
+static int      hf_cflow_length_min;
+static int      hf_cflow_length_max;
+static int      hf_cflow_timedelta;
+static int      hf_cflow_sys_init_time;
+static int      hf_cflow_timestart;
+static int      hf_cflow_timeend;
+static int      hf_cflow_srcport;
+static int      hf_cflow_dstport;
+static int      hf_cflow_prot;
+static int      hf_cflow_tos;
+static int      hf_cflow_marked_tos;
+static int      hf_cflow_flags;
+static int      hf_cflow_tcpflags;
+static int      hf_cflow_tcpflags16;
+static int      hf_cflow_tcpflags_fin;
+static int      hf_cflow_tcpflags_syn;
+static int      hf_cflow_tcpflags_rst;
+static int      hf_cflow_tcpflags_psh;
+static int      hf_cflow_tcpflags_ack;
+static int      hf_cflow_tcpflags_urg;
+static int      hf_cflow_tcpflags_ece;
+static int      hf_cflow_tcpflags_cwr;
+static int      hf_cflow_tcpflags16_fin;
+static int      hf_cflow_tcpflags16_syn;
+static int      hf_cflow_tcpflags16_rst;
+static int      hf_cflow_tcpflags16_psh;
+static int      hf_cflow_tcpflags16_ack;
+static int      hf_cflow_tcpflags16_urg;
+static int      hf_cflow_tcpflags16_ece;
+static int      hf_cflow_tcpflags16_cwr;
+static int      hf_cflow_tcpflags16_ns;
+static int      hf_cflow_tcpflags_reserved;
+static int      hf_cflow_tcpflags16_reserved;
+static int      hf_cflow_tcpflags16_zero;
+static int      hf_cflow_dstas;
+static int      hf_cflow_srcas;
+static int      hf_cflow_dstmask;
+static int      hf_cflow_dstmask_v6;
+static int      hf_cflow_srcmask;
+static int      hf_cflow_srcmask_v6;
+static int      hf_cflow_routersc;
+static int      hf_cflow_mulpackets;
+static int      hf_cflow_muloctets;
+static int      hf_cflow_octets_exp;
+static int      hf_cflow_packets_exp;
+static int      hf_cflow_flows_exp;
+static int      hf_cflow_ipv4_router_sc;
+static int      hf_cflow_srcprefix;
+static int      hf_cflow_dstprefix;
+static int      hf_cflow_flow_class;
+static int      hf_cflow_ttl_minimum;
+static int      hf_cflow_ttl_maximum;
+static int      hf_cflow_frag_id;
+static int      hf_cflow_ip_version;
+static int      hf_cflow_icmp_type_code_ipv4;
+static int      hf_cflow_igmp_type;
+static int      hf_cflow_sampling_interval;
+static int      hf_cflow_sampling_algorithm;
+static int      hf_cflow_flow_active_timeout;
+static int      hf_cflow_flow_inactive_timeout;
+static int      hf_cflow_mpls_top_label_type;
+static int      hf_cflow_mpls_pe_addr;
+static int      hf_cflow_sampler_id;
+static int      hf_cflow_sampler_mode;
+static int      hf_cflow_sampler_random_interval;
+static int      hf_cflow_direction;
+static int      hf_cflow_if_name;
+static int      hf_cflow_if_descr;
+static int      hf_cflow_sampler_name;
+static int      hf_cflow_forwarding_status;
+static int      hf_cflow_forwarding_status_unknown_code;
+static int      hf_cflow_forwarding_status_forward_code;
+static int      hf_cflow_forwarding_status_consume_code;
+static int      hf_cflow_forwarding_status_drop_code;
+static int      hf_cflow_nbar_appl_desc;
+static int      hf_cflow_nbar_appl_id_class_eng_id;
+static int      hf_cflow_nbar_appl_id_selector_id;
+static int      hf_cflow_nbar_appl_name;
+static int      hf_cflow_peer_srcas;
+static int      hf_cflow_peer_dstas;
+static int      hf_cflow_flow_exporter;
+static int      hf_cflow_icmp_ipv4_type;
+static int      hf_cflow_icmp_ipv4_code;
+static int      hf_cflow_icmp_ipv6_type;
+static int      hf_cflow_icmp_ipv6_code;
+static int      hf_cflow_tcp_window_size;
+static int      hf_cflow_ipv4_total_length;
+static int      hf_cflow_ip_ttl;
+static int      hf_cflow_mpls_payload_length;
+static int      hf_cflow_ip_dscp;
+static int      hf_cflow_delta_octets_squared;
+static int      hf_cflow_total_octets_squared;
+static int      hf_cflow_udp_length;
+static int      hf_cflow_is_multicast;
+static int      hf_cflow_ip_header_words;
+static int      hf_cflow_option_map;
+static int      hf_cflow_section_header;
+static int      hf_cflow_section_payload;
 /* IPFIX (version 10) Information Elements */
-static int      hf_cflow_post_octets                                = -1;
-static int      hf_cflow_post_packets                               = -1;
-static int      hf_cflow_ipv6_flowlabel                             = -1;
-static int      hf_cflow_post_tos                                   = -1;
-static int      hf_cflow_srcmac                                     = -1;
-static int      hf_cflow_post_dstmac                                = -1;
-static int      hf_cflow_vlanid                                     = -1;
-static int      hf_cflow_post_vlanid                                = -1;
-static int      hf_cflow_ipv6_exthdr                                = -1;
-static int      hf_cflow_dstmac                                     = -1;
-static int      hf_cflow_post_srcmac                                = -1;
-static int      hf_cflow_permanent_packets                          = -1;
-static int      hf_cflow_permanent_octets                           = -1;
-static int      hf_cflow_fragment_offset                            = -1;
-static int      hf_cflow_mpls_vpn_rd                                = -1;
-static int      hf_cflow_mpls_top_label_prefix_length               = -1; /* ID:  91 */
-static int      hf_cflow_src_traffic_index                          = -1; /* ID:  92 */
-static int      hf_cflow_dst_traffic_index                          = -1; /* ID:  93 */
-static int      hf_cflow_post_ip_diff_serv_code_point               = -1; /* ID:  98 */
-static int      hf_cflow_multicast_replication_factor               = -1; /* ID:  99 */
-static int      hf_cflow_classification_engine_id                   = -1; /* ID: 101 */
-static int      hf_cflow_exporter_addr                              = -1;
-static int      hf_cflow_exporter_addr_v6                           = -1;
-static int      hf_cflow_drop_octets                                = -1;
-static int      hf_cflow_drop_packets                               = -1;
-static int      hf_cflow_drop_total_octets                          = -1;
-static int      hf_cflow_drop_total_packets                         = -1;
-static int      hf_cflow_flow_end_reason                            = -1;
-static int      hf_cflow_common_properties_id                       = -1;
-static int      hf_cflow_observation_point_id                       = -1;
-static int      hf_cflow_mpls_pe_addr_v6                            = -1;
-static int      hf_cflow_port_id                                    = -1;
-static int      hf_cflow_mp_id                                      = -1;
-static int      hf_cflow_wlan_channel_id                            = -1;
-static int      hf_cflow_wlan_ssid                                  = -1;
-static int      hf_cflow_flow_id                                    = -1;
-static int      hf_cflow_od_id                                      = -1;
-static int      hf_cflow_abstimestart                               = -1;
-static int      hf_cflow_abstimeend                                 = -1;
-static int      hf_cflow_dstnet_v6                                  = -1;
-static int      hf_cflow_srcnet_v6                                  = -1;
-static int      hf_cflow_ignore_packets                             = -1;
-static int      hf_cflow_ignore_octets                              = -1;
-static int      hf_cflow_notsent_flows                              = -1;
-static int      hf_cflow_notsent_packets                            = -1;
-static int      hf_cflow_notsent_octets                             = -1;
-static int      hf_cflow_post_total_octets                          = -1;
-static int      hf_cflow_post_total_packets                         = -1;
-static int      hf_cflow_key                                        = -1;
-static int      hf_cflow_post_total_mulpackets                      = -1;
-static int      hf_cflow_post_total_muloctets                       = -1;
-static int      hf_cflow_tcp_seq_num                                = -1;
-static int      hf_cflow_tcp_ack_num                                = -1;
-static int      hf_cflow_tcp_urg_ptr                                = -1;
-static int      hf_cflow_tcp_header_length                          = -1;
-static int      hf_cflow_ip_header_length                           = -1;
-static int      hf_cflow_ipv6_payload_length                        = -1;
-static int      hf_cflow_ipv6_next_hdr                              = -1;
-static int      hf_cflow_ip_precedence                              = -1;
-static int      hf_cflow_ip_fragment_flags                          = -1;
-static int      hf_cflow_mpls_top_label_ttl                         = -1;
-static int      hf_cflow_mpls_label_length                          = -1;
-static int      hf_cflow_mpls_label_depth                           = -1;
-static int      hf_cflow_mpls_top_label_exp                         = -1;
-static int      hf_cflow_ip_payload_length                          = -1;
-static int      hf_cflow_tcp_option_map                             = -1;
-static int      hf_cflow_collector_addr                             = -1;
-static int      hf_cflow_collector_addr_v6                          = -1;
-static int      hf_cflow_export_interface                           = -1;
-static int      hf_cflow_export_protocol_version                    = -1;
-static int      hf_cflow_export_prot                                = -1;
-static int      hf_cflow_collector_port                             = -1;
-static int      hf_cflow_exporter_port                              = -1;
-static int      hf_cflow_total_tcp_syn                              = -1;
-static int      hf_cflow_total_tcp_fin                              = -1;
-static int      hf_cflow_total_tcp_rst                              = -1;
-static int      hf_cflow_total_tcp_psh                              = -1;
-static int      hf_cflow_total_tcp_ack                              = -1;
-static int      hf_cflow_total_tcp_urg                              = -1;
-static int      hf_cflow_ip_total_length                            = -1;
-static int      hf_cflow_post_natsource_ipv4_address                = -1;      /* ID: 225 */
-static int      hf_cflow_post_natdestination_ipv4_address           = -1;      /* ID: 226 */
-static int      hf_cflow_post_naptsource_transport_port             = -1;      /* ID: 227 */
-static int      hf_cflow_post_naptdestination_transport_port        = -1;      /* ID: 228 */
-static int      hf_cflow_nat_originating_address_realm              = -1;      /* ID: 229 */
-static int      hf_cflow_nat_event                                  = -1;      /* ID: 230 */
-static int      hf_cflow_initiator_octets                           = -1;      /* ID: 231 */
-static int      hf_cflow_responder_octets                           = -1;      /* ID: 232 */
-static int      hf_cflow_firewall_event                             = -1;      /* ID: 233 */
-static int      hf_cflow_ingress_vrfid                              = -1;      /* ID: 234 */
-static int      hf_cflow_egress_vrfid                               = -1;      /* ID: 235 */
-static int      hf_cflow_vrfname                                    = -1;      /* ID: 236 */
-static int      hf_cflow_post_mpls_top_label_exp                    = -1;      /* ID: 237 */
-static int      hf_cflow_tcp_window_scale                           = -1;      /* ID: 238 */
-static int      hf_cflow_biflow_direction                           = -1;
-static int      hf_cflow_ethernet_header_length                     = -1;      /* ID: 240 */
-static int      hf_cflow_ethernet_payload_length                    = -1;      /* ID: 241 */
-static int      hf_cflow_ethernet_total_length                      = -1;      /* ID: 242 */
-static int      hf_cflow_dot1q_vlan_id                              = -1;      /* ID: 243 */
-static int      hf_cflow_dot1q_priority                             = -1;      /* ID: 244 */
-static int      hf_cflow_dot1q_customer_vlan_id                     = -1;      /* ID: 245 */
-static int      hf_cflow_dot1q_customer_priority                    = -1;      /* ID: 246 */
-static int      hf_cflow_metro_evc_id                               = -1;      /* ID: 247 */
-static int      hf_cflow_metro_evc_type                             = -1;      /* ID: 248 */
-static int      hf_cflow_pseudo_wire_id                             = -1;      /* ID: 249 */
-static int      hf_cflow_pseudo_wire_type                           = -1;      /* ID: 250 */
-static int      hf_cflow_pseudo_wire_control_word                   = -1;      /* ID: 251 */
-static int      hf_cflow_ingress_physical_interface                 = -1;      /* ID: 252 */
-static int      hf_cflow_egress_physical_interface                  = -1;      /* ID: 253 */
-static int      hf_cflow_post_dot1q_vlan_id                         = -1;      /* ID: 254 */
-static int      hf_cflow_post_dot1q_customer_vlan_id                = -1;      /* ID: 255 */
-static int      hf_cflow_ethernet_type                              = -1;      /* ID: 256 */
-static int      hf_cflow_post_ip_precedence                         = -1;      /* ID: 257 */
-static int      hf_cflow_collection_time_milliseconds               = -1;      /* ID: 258 */
-static int      hf_cflow_export_sctp_stream_id                      = -1;      /* ID: 259 */
-static int      hf_cflow_max_export_seconds                         = -1;      /* ID: 260 */
-static int      hf_cflow_max_flow_end_seconds                       = -1;      /* ID: 261 */
-static int      hf_cflow_message_md5_checksum                       = -1;      /* ID: 262 */
-static int      hf_cflow_message_scope                              = -1;      /* ID: 263 */
-static int      hf_cflow_min_export_seconds                         = -1;      /* ID: 264 */
-static int      hf_cflow_min_flow_start_seconds                     = -1;      /* ID: 265 */
-static int      hf_cflow_opaque_octets                              = -1;      /* ID: 266 */
-static int      hf_cflow_session_scope                              = -1;      /* ID: 267 */
-static int      hf_cflow_max_flow_end_microseconds                  = -1;      /* ID: 268 */
-static int      hf_cflow_max_flow_end_milliseconds                  = -1;      /* ID: 269 */
-static int      hf_cflow_max_flow_end_nanoseconds                   = -1;      /* ID: 270 */
-static int      hf_cflow_min_flow_start_microseconds                = -1;      /* ID: 271 */
-static int      hf_cflow_min_flow_start_milliseconds                = -1;      /* ID: 272 */
-static int      hf_cflow_min_flow_start_nanoseconds                 = -1;      /* ID: 273 */
-static int      hf_cflow_collector_certificate                      = -1;      /* ID: 274 */
-static int      hf_cflow_exporter_certificate                       = -1;      /* ID: 275 */
-static int      hf_cflow_data_records_reliability                   = -1;      /* ID: 276 */
-static int      hf_cflow_observation_point_type                     = -1;      /* ID: 277 */
-static int      hf_cflow_new_connection_delta_count                 = -1;      /* ID: 278 */
-static int      hf_cflow_connection_sum_duration_seconds            = -1;      /* ID: 279 */
-static int      hf_cflow_connection_transaction_id                  = -1;      /* ID: 280 */
-static int      hf_cflow_post_nat_source_ipv6_address               = -1;      /* ID: 281 */
-static int      hf_cflow_post_nat_destination_ipv6_address          = -1;      /* ID: 282 */
-static int      hf_cflow_nat_pool_id                                = -1;      /* ID: 283 */
-static int      hf_cflow_nat_pool_name                              = -1;      /* ID: 284 */
-static int      hf_cflow_anonymization_flags                        = -1;      /* ID: 285 */
-static int      hf_cflow_anonymization_technique                    = -1;      /* ID: 286 */
-static int      hf_cflow_information_element_index                  = -1;      /* ID: 287 */
-static int      hf_cflow_p2p_technology                             = -1;      /* ID: 288 */
-static int      hf_cflow_tunnel_technology                          = -1;      /* ID: 289 */
-static int      hf_cflow_encrypted_technology                       = -1;      /* ID: 290 */
-static int      hf_cflow_subtemplate_list                           = -1;      /* ID: 292 */
-static int      hf_cflow_bgp_validity_state                         = -1;      /* ID: 294 */
-static int      hf_cflow_ipsec_spi                                  = -1;      /* ID: 295 */
-static int      hf_cflow_gre_key                                    = -1;      /* ID: 296 */
-static int      hf_cflow_nat_type                                   = -1;      /* ID: 297 */
-static int      hf_cflow_initiator_packets                          = -1;      /* ID: 298 */
-static int      hf_cflow_responder_packets                          = -1;      /* ID: 299 */
-static int      hf_cflow_observation_domain_name                    = -1;      /* ID: 300 */
-static int      hf_cflow_selection_sequence_id                      = -1;      /* ID: 301 */
-static int      hf_cflow_selector_id                                = -1;      /* ID: 302 */
-static int      hf_cflow_information_element_id                     = -1;      /* ID: 303 */
-static int      hf_cflow_selector_algorithm                         = -1;      /* ID: 304 */
-static int      hf_cflow_sampling_packet_interval                   = -1;      /* ID: 305 */
-static int      hf_cflow_sampling_packet_space                      = -1;      /* ID: 306 */
-static int      hf_cflow_sampling_time_interval                     = -1;      /* ID: 307 */
-static int      hf_cflow_sampling_time_space                        = -1;      /* ID: 308 */
-static int      hf_cflow_sampling_size                              = -1;      /* ID: 309 */
-static int      hf_cflow_sampling_population                        = -1;      /* ID: 310 */
-static int      hf_cflow_sampling_probability_float64               = -1;      /* ID: 311 */
-static int      hf_cflow_sampling_probability_float32               = -1;      /* ID: 311 */
-static int      hf_cflow_data_link_frame_size                       = -1;      /* ID: 312 */
-static int      hf_cflow_data_link_frame_section                    = -1;      /* ID: 315 */
-static int      hf_cflow_mpls_label_stack_section                   = -1;      /* ID: 316 */
-static int      hf_cflow_mpls_payload_packet_section                = -1;      /* ID: 317 */
-static int      hf_cflow_selector_id_total_pkts_observed            = -1;      /* ID: 318 */
-static int      hf_cflow_selector_id_total_pkts_selected            = -1;      /* ID: 319 */
-static int      hf_cflow_absolute_error_float32                     = -1;      /* ID: 320 */
-static int      hf_cflow_absolute_error_float64                     = -1;      /* ID: 320 */
-static int      hf_cflow_relative_error_float32                     = -1;      /* ID: 321 */
-static int      hf_cflow_relative_error_float64                     = -1;      /* ID: 321 */
-static int      hf_cflow_observation_time_seconds                   = -1;      /* ID: 322 */
-static int      hf_cflow_observation_time_milliseconds              = -1;      /* ID: 323 */
-static int      hf_cflow_observation_time_microseconds              = -1;      /* ID: 324 */
-static int      hf_cflow_observation_time_nanoseconds               = -1;      /* ID: 325 */
-static int      hf_cflow_digest_hash_value                          = -1;      /* ID: 326 */
-static int      hf_cflow_hash_ippayload_offset                      = -1;      /* ID: 327 */
-static int      hf_cflow_hash_ippayload_size                        = -1;      /* ID: 328 */
-static int      hf_cflow_hash_output_range_min                      = -1;      /* ID: 329 */
-static int      hf_cflow_hash_output_range_max                      = -1;      /* ID: 330 */
-static int      hf_cflow_hash_selected_range_min                    = -1;      /* ID: 331 */
-static int      hf_cflow_hash_selected_range_max                    = -1;      /* ID: 332 */
-static int      hf_cflow_hash_digest_output                         = -1;      /* ID: 333 */
-static int      hf_cflow_hash_initialiser_value                     = -1;      /* ID: 334 */
-static int      hf_cflow_selector_name                              = -1;      /* ID: 335 */
-static int      hf_cflow_upper_cilimit_float32                      = -1;      /* ID: 336 */
-static int      hf_cflow_upper_cilimit_float64                      = -1;      /* ID: 336 */
-static int      hf_cflow_lower_cilimit_float32                      = -1;      /* ID: 337 */
-static int      hf_cflow_lower_cilimit_float64                      = -1;      /* ID: 337 */
-static int      hf_cflow_confidence_level_float32                   = -1;      /* ID: 338 */
-static int      hf_cflow_confidence_level_float64                   = -1;      /* ID: 338 */
-static int      hf_cflow_information_element_data_type              = -1;      /* ID: 339 */
-static int      hf_cflow_information_element_description            = -1;      /* ID: 340 */
-static int      hf_cflow_information_element_name                   = -1;      /* ID: 341 */
-static int      hf_cflow_information_element_range_begin            = -1;      /* ID: 342 */
-static int      hf_cflow_information_element_range_end              = -1;      /* ID: 343 */
-static int      hf_cflow_information_element_semantics              = -1;      /* ID: 344 */
-static int      hf_cflow_information_element_units                  = -1;      /* ID: 345 */
-static int      hf_cflow_private_enterprise_number                  = -1;      /* ID: 346 */
-
-static int      hf_cflow_virtual_station_interface_id               = -1;      /* ID: 347 */
-static int      hf_cflow_virtual_station_interface_name             = -1;      /* ID: 348 */
-static int      hf_cflow_virtual_station_uuid                       = -1;      /* ID: 349 */
-static int      hf_cflow_virtual_station_name                       = -1;      /* ID: 350 */
-static int      hf_cflow_layer2_segment_id                          = -1;      /* ID: 351 */
-static int      hf_cflow_layer2_octet_delta_count                   = -1;      /* ID: 352 */
-static int      hf_cflow_layer2_octet_total_count                   = -1;      /* ID: 353 */
-static int      hf_cflow_ingress_unicast_packet_total_count         = -1;      /* ID: 354 */
-static int      hf_cflow_ingress_multicast_packet_total_count       = -1;      /* ID: 355 */
-static int      hf_cflow_ingress_broadcast_packet_total_count       = -1;      /* ID: 356 */
-static int      hf_cflow_egress_unicast_packet_total_count          = -1;      /* ID: 357 */
-static int      hf_cflow_egress_broadcast_packet_total_count        = -1;      /* ID: 358 */
-static int      hf_cflow_monitoring_interval_start_milliseconds     = -1;      /* ID: 359 */
-static int      hf_cflow_monitoring_interval_end_milliseconds       = -1;      /* ID: 360 */
-static int      hf_cflow_port_range_start                           = -1;      /* ID: 361 */
-static int      hf_cflow_port_range_end                             = -1;      /* ID: 362 */
-static int      hf_cflow_port_range_step_size                       = -1;      /* ID: 363 */
-static int      hf_cflow_port_range_num_ports                       = -1;      /* ID: 364 */
-static int      hf_cflow_sta_mac_address                            = -1;      /* ID: 365 */
-static int      hf_cflow_sta_ipv4_address                           = -1;      /* ID: 366 */
-static int      hf_cflow_wtp_mac_address                            = -1;      /* ID: 367 */
-static int      hf_cflow_ingress_interface_type                     = -1;      /* ID: 368 */
-static int      hf_cflow_egress_interface_type                      = -1;      /* ID: 369 */
-static int      hf_cflow_rtp_sequence_number                        = -1;      /* ID: 370 */
-static int      hf_cflow_user_name                                  = -1;      /* ID: 371 */
-static int      hf_cflow_application_category_name                  = -1;      /* ID: 372 */
-static int      hf_cflow_application_sub_category_name              = -1;      /* ID: 373 */
-static int      hf_cflow_application_group_name                     = -1;      /* ID: 374 */
-static int      hf_cflow_original_flows_present                     = -1;      /* ID: 375 */
-static int      hf_cflow_original_flows_initiated                   = -1;      /* ID: 376 */
-static int      hf_cflow_original_flows_completed                   = -1;      /* ID: 377 */
-static int      hf_cflow_distinct_count_of_source_ip_address        = -1;      /* ID: 378 */
-static int      hf_cflow_distinct_count_of_destinationip_address    = -1;      /* ID: 379 */
-static int      hf_cflow_distinct_count_of_source_ipv4_address      = -1;      /* ID: 380 */
-static int      hf_cflow_distinct_count_of_destination_ipv4_address = -1;      /* ID: 381 */
-static int      hf_cflow_distinct_count_of_source_ipv6_address      = -1;      /* ID: 382 */
-static int      hf_cflow_distinct_count_of_destination_ipv6_address = -1;      /* ID: 383 */
-static int      hf_cflow_value_distribution_method                  = -1;      /* ID: 384 */
-static int      hf_cflow_rfc3550_jitter_milliseconds                = -1;      /* ID: 385 */
-static int      hf_cflow_rfc3550_jitter_microseconds                = -1;      /* ID: 386 */
-static int      hf_cflow_rfc3550_jitter_nanoseconds                 = -1;      /* ID: 387 */
-static int      hf_cflow_dot1q_dei                                  = -1;      /* ID: 388 */
-static int      hf_cflow_dot1q_customer_dei                         = -1;      /* ID: 389 */
-static int      hf_cflow_flow_selector_algorithm                    = -1;      /* ID: 390 */
-static int      hf_cflow_flow_selected_octet_delta_count            = -1;      /* ID: 391 */
-static int      hf_cflow_flow_selected_packet_delta_count           = -1;      /* ID: 392 */
-static int      hf_cflow_flow_selected_flow_delta_count             = -1;      /* ID: 393 */
-static int      hf_cflow_selectorid_total_flows_observed            = -1;      /* ID: 394 */
-static int      hf_cflow_selectorid_total_flows_selected            = -1;      /* ID: 395 */
-static int      hf_cflow_sampling_flow_interval                     = -1;      /* ID: 396 */
-static int      hf_cflow_sampling_flow_spacing                      = -1;      /* ID: 397 */
-static int      hf_cflow_flow_sampling_time_interval                = -1;      /* ID: 398 */
-static int      hf_cflow_flow_sampling_time_spacing                 = -1;      /* ID: 399 */
-static int      hf_cflow_hash_flow_domain                           = -1;      /* ID: 400 */
-static int      hf_cflow_transport_octet_delta_count                = -1;      /* ID: 401 */
-static int      hf_cflow_transport_packet_delta_count               = -1;      /* ID: 402 */
-static int      hf_cflow_original_exporter_ipv4_address             = -1;      /* ID: 403 */
-static int      hf_cflow_original_exporter_ipv6_address             = -1;      /* ID: 404 */
-static int      hf_cflow_original_observation_domain_id             = -1;      /* ID: 405 */
-static int      hf_cflow_intermediate_process_id                    = -1;      /* ID: 406 */
-static int      hf_cflow_ignored_data_record_total_count            = -1;      /* ID: 407 */
-static int      hf_cflow_data_link_frame_type                       = -1;      /* ID: 408 */
-static int      hf_cflow_section_offset                             = -1;      /* ID: 409 */
-static int      hf_cflow_section_exported_octets                    = -1;      /* ID: 410 */
-static int      hf_cflow_dot1q_service_instance_tag                 = -1;      /* ID: 411 */
-static int      hf_cflow_dot1q_service_instance_id                  = -1;      /* ID: 412 */
-static int      hf_cflow_dot1q_service_instance_priority            = -1;      /* ID: 413 */
-static int      hf_cflow_dot1q_customer_source_mac_address          = -1;      /* ID: 414 */
-static int      hf_cflow_dot1q_customer_destination_mac_address     = -1;      /* ID: 415 */
-static int      hf_cflow_post_layer2_octet_delta_count              = -1;      /* ID: 417 */
-static int      hf_cflow_postm_cast_layer2_octet_delta_count        = -1;      /* ID: 418 */
-static int      hf_cflow_post_layer2_octet_total_count              = -1;      /* ID: 420 */
-static int      hf_cflow_postm_cast_layer2_octet_total_count        = -1;      /* ID: 421 */
-static int      hf_cflow_minimum_layer2_total_length                = -1;      /* ID: 422 */
-static int      hf_cflow_maximum_layer2_total_length                = -1;      /* ID: 423 */
-static int      hf_cflow_dropped_layer2_octet_delta_count           = -1;      /* ID: 424 */
-static int      hf_cflow_dropped_layer2_octet_total_count           = -1;      /* ID: 425 */
-static int      hf_cflow_ignored_layer2_octet_total_count           = -1;      /* ID: 426 */
-static int      hf_cflow_not_sent_layer2_octet_total_count          = -1;      /* ID: 427 */
-static int      hf_cflow_layer2_octet_delta_sum_of_squares          = -1;      /* ID: 428 */
-static int      hf_cflow_layer2_octet_total_sum_of_squares          = -1;      /* ID: 429 */
-static int      hf_cflow_layer2_frame_delta_count                   = -1;      /* ID: 430 */
-static int      hf_cflow_layer2_frame_total_count                   = -1;      /* ID: 431 */
-static int      hf_cflow_pseudo_wire_destination_ipv4_address       = -1;      /* ID: 432 */
-static int      hf_cflow_ignored_layer2_frame_total_count           = -1;      /* ID: 433 */
-static int      hf_cflow_mib_object_value_integer                   = -1;      /* ID: 434 */
-static int      hf_cflow_mib_object_value_octetstring               = -1;      /* ID: 435 */
-static int      hf_cflow_mib_object_value_oid                       = -1;      /* ID: 436 */
-static int      hf_cflow_mib_object_value_bits                      = -1;      /* ID: 437 */
-static int      hf_cflow_mib_object_value_ipaddress                 = -1;      /* ID: 438 */
-static int      hf_cflow_mib_object_value_counter                   = -1;      /* ID: 439 */
-static int      hf_cflow_mib_object_value_gauge                     = -1;      /* ID: 440 */
-static int      hf_cflow_mib_object_value_timeticks                 = -1;      /* ID: 441 */
-static int      hf_cflow_mib_object_value_unsigned                  = -1;      /* ID: 442 */
-static int      hf_cflow_mib_object_value_table                     = -1;      /* ID: 443 */
-static int      hf_cflow_mib_object_value_row                       = -1;      /* ID: 444 */
-static int      hf_cflow_mib_object_identifier                      = -1;      /* ID: 445 */
-static int      hf_cflow_mib_subidentifier                          = -1;      /* ID: 446 */
-static int      hf_cflow_mib_index_indicator                        = -1;      /* ID: 447 */
-static int      hf_cflow_mib_capture_time_semantics                 = -1;      /* ID: 448 */
-static int      hf_cflow_mib_context_engineid                       = -1;      /* ID: 449 */
-static int      hf_cflow_mib_context_name                           = -1;      /* ID: 450 */
-static int      hf_cflow_mib_object_name                            = -1;      /* ID: 451 */
-static int      hf_cflow_mib_object_description                     = -1;      /* ID: 452 */
-static int      hf_cflow_mib_object_syntax                          = -1;      /* ID: 453 */
-static int      hf_cflow_mib_module_name                            = -1;      /* ID: 454 */
-static int      hf_cflow_mobile_imsi                                = -1;      /* ID: 455 */
-static int      hf_cflow_mobile_msisdn                              = -1;      /* ID: 456 */
-static int      hf_cflow_http_statuscode                            = -1;      /* ID: 457 */
-static int      hf_cflow_source_transport_ports_limit               = -1;      /* ID: 458 */
-static int      hf_cflow_http_request_method                        = -1;      /* ID: 459 */
-static int      hf_cflow_http_request_host                          = -1;      /* ID: 460 */
-static int      hf_cflow_http_request_target                        = -1;      /* ID: 461 */
-static int      hf_cflow_http_message_version                       = -1;      /* ID: 462 */
-static int      hf_cflow_nat_instanceid                             = -1;      /* ID: 463 */
-static int      hf_cflow_internal_address_realm                     = -1;      /* ID: 464 */
-static int      hf_cflow_external_address_realm                     = -1;      /* ID: 465 */
-static int      hf_cflow_nat_quota_exceeded_event                   = -1;      /* ID: 466 */
-static int      hf_cflow_nat_threshold_event                        = -1;      /* ID: 467 */
-static int      hf_cflow_http_user_agent                            = -1;      /* ID: 468 */
-static int      hf_cflow_http_content_type                          = -1;      /* ID: 469 */
-static int      hf_cflow_http_reason_phrase                         = -1;      /* ID: 470 */
-static int      hf_cflow_max_session_entries                        = -1;      /* ID: 471 */
-static int      hf_cflow_max_bib_entries                            = -1;      /* ID: 472 */
-static int      hf_cflow_max_entries_per_user                       = -1;      /* ID: 473 */
-static int      hf_cflow_max_subscribers                            = -1;      /* ID: 474 */
-static int      hf_cflow_max_fragments_pending_reassembly           = -1;      /* ID: 475 */
-static int      hf_cflow_addresspool_highthreshold                  = -1;      /* ID: 476 */
-static int      hf_cflow_addresspool_lowthreshold                   = -1;      /* ID: 477 */
-static int      hf_cflow_addressport_mapping_highthreshold          = -1;      /* ID: 478 */
-static int      hf_cflow_addressport_mapping_lowthreshold           = -1;      /* ID: 479 */
-static int      hf_cflow_addressport_mapping_per_user_highthreshold = -1;      /* ID: 480 */
-static int      hf_cflow_global_addressmapping_highthreshold        = -1;      /* ID: 481 */
-static int      hf_cflow_vpn_identifier                             = -1;      /* ID: 482 */
-static int      hf_cflow_bgp_community                              = -1;      /* ID: 483 */
-static int      hf_cflow_bgp_source_community_list                  = -1;      /* ID: 484 */
-static int      hf_cflow_bgp_destination_community_list             = -1;      /* ID: 485 */
-static int      hf_cflow_bgp_extended_community                     = -1;      /* ID: 486 */
-static int      hf_cflow_bgp_source_extended_community_list         = -1;      /* ID: 487 */
-static int      hf_cflow_bgp_destination_extended_community_list    = -1;      /* ID: 488 */
-static int      hf_cflow_bgp_large_community                        = -1;      /* ID: 489 */
-static int      hf_cflow_bgp_source_large_community_list            = -1;      /* ID: 490 */
-static int      hf_cflow_bgp_destination_large_community_list       = -1;      /* ID: 491 */
-
-static int      hf_cflow_srh_flags_ipv6                             = -1;      /* ID: 492 */
-static int      hf_cflow_srh_flags_ipv6_reserved                    = -1;      /* Reserved / Unassigned RFC8754 */
-static int      hf_cflow_srh_flags_ipv6_oflag                       = -1;      /* O-Flag RFC9259 */
-static int      hf_cflow_srh_tag_ipv6                               = -1;      /* ID: 493 */
-static int      hf_cflow_srh_segment_ipv6                           = -1;      /* ID: 494 */
-static int      hf_cflow_srh_active_segment_ipv6                    = -1;      /* ID: 495 */
-static int      hf_cflow_srh_segment_ipv6_basic_list                = -1;      /* ID: 496 */
-static int      hf_cflow_srh_segment_ipv6_list_section              = -1;      /* ID: 497 */
-static int      hf_cflow_srh_segments_ipv6_left                     = -1;      /* ID: 498 */
-static int      hf_cflow_srh_ipv6_section                           = -1;      /* ID: 499 */
-static int      hf_cflow_srh_ipv6_active_segment_type               = -1;      /* ID: 500 */
-static int      hf_cflow_srh_segment_ipv6_locator_length            = -1;      /* ID: 501 */
-static int      hf_cflow_srh_segment_ipv6_endpoint_behaviour        = -1;      /* ID: 502 */
+static int      hf_cflow_post_octets;
+static int      hf_cflow_post_packets;
+static int      hf_cflow_ipv6_flowlabel;
+static int      hf_cflow_post_tos;
+static int      hf_cflow_srcmac;
+static int      hf_cflow_post_dstmac;
+static int      hf_cflow_vlanid;
+static int      hf_cflow_post_vlanid;
+static int      hf_cflow_ipv6_exthdr;
+static int      hf_cflow_dstmac;
+static int      hf_cflow_post_srcmac;
+static int      hf_cflow_permanent_packets;
+static int      hf_cflow_permanent_octets;
+static int      hf_cflow_fragment_offset;
+static int      hf_cflow_mpls_vpn_rd;
+static int      hf_cflow_mpls_top_label_prefix_length; /* ID:  91 */
+static int      hf_cflow_src_traffic_index; /* ID:  92 */
+static int      hf_cflow_dst_traffic_index; /* ID:  93 */
+static int      hf_cflow_post_ip_diff_serv_code_point; /* ID:  98 */
+static int      hf_cflow_multicast_replication_factor; /* ID:  99 */
+static int      hf_cflow_classification_engine_id; /* ID: 101 */
+static int      hf_cflow_exporter_addr;
+static int      hf_cflow_exporter_addr_v6;
+static int      hf_cflow_drop_octets;
+static int      hf_cflow_drop_packets;
+static int      hf_cflow_drop_total_octets;
+static int      hf_cflow_drop_total_packets;
+static int      hf_cflow_flow_end_reason;
+static int      hf_cflow_common_properties_id;
+static int      hf_cflow_observation_point_id;
+static int      hf_cflow_mpls_pe_addr_v6;
+static int      hf_cflow_port_id;
+static int      hf_cflow_mp_id;
+static int      hf_cflow_wlan_channel_id;
+static int      hf_cflow_wlan_ssid;
+static int      hf_cflow_flow_id;
+static int      hf_cflow_od_id;
+static int      hf_cflow_abstimestart;
+static int      hf_cflow_abstimeend;
+static int      hf_cflow_dstnet_v6;
+static int      hf_cflow_srcnet_v6;
+static int      hf_cflow_ignore_packets;
+static int      hf_cflow_ignore_octets;
+static int      hf_cflow_notsent_flows;
+static int      hf_cflow_notsent_packets;
+static int      hf_cflow_notsent_octets;
+static int      hf_cflow_post_total_octets;
+static int      hf_cflow_post_total_packets;
+static int      hf_cflow_key;
+static int      hf_cflow_post_total_mulpackets;
+static int      hf_cflow_post_total_muloctets;
+static int      hf_cflow_tcp_seq_num;
+static int      hf_cflow_tcp_ack_num;
+static int      hf_cflow_tcp_urg_ptr;
+static int      hf_cflow_tcp_header_length;
+static int      hf_cflow_ip_header_length;
+static int      hf_cflow_ipv6_payload_length;
+static int      hf_cflow_ipv6_next_hdr;
+static int      hf_cflow_ip_precedence;
+static int      hf_cflow_ip_fragment_flags;
+static int      hf_cflow_mpls_top_label_ttl;
+static int      hf_cflow_mpls_label_length;
+static int      hf_cflow_mpls_label_depth;
+static int      hf_cflow_mpls_top_label_exp;
+static int      hf_cflow_ip_payload_length;
+static int      hf_cflow_tcp_option_map;
+static int      hf_cflow_collector_addr;
+static int      hf_cflow_collector_addr_v6;
+static int      hf_cflow_export_interface;
+static int      hf_cflow_export_protocol_version;
+static int      hf_cflow_export_prot;
+static int      hf_cflow_collector_port;
+static int      hf_cflow_exporter_port;
+static int      hf_cflow_total_tcp_syn;
+static int      hf_cflow_total_tcp_fin;
+static int      hf_cflow_total_tcp_rst;
+static int      hf_cflow_total_tcp_psh;
+static int      hf_cflow_total_tcp_ack;
+static int      hf_cflow_total_tcp_urg;
+static int      hf_cflow_ip_total_length;
+static int      hf_cflow_post_natsource_ipv4_address;      /* ID: 225 */
+static int      hf_cflow_post_natdestination_ipv4_address;      /* ID: 226 */
+static int      hf_cflow_post_naptsource_transport_port;      /* ID: 227 */
+static int      hf_cflow_post_naptdestination_transport_port;      /* ID: 228 */
+static int      hf_cflow_nat_originating_address_realm;      /* ID: 229 */
+static int      hf_cflow_nat_event;      /* ID: 230 */
+static int      hf_cflow_initiator_octets;      /* ID: 231 */
+static int      hf_cflow_responder_octets;      /* ID: 232 */
+static int      hf_cflow_firewall_event;      /* ID: 233 */
+static int      hf_cflow_ingress_vrfid;      /* ID: 234 */
+static int      hf_cflow_egress_vrfid;      /* ID: 235 */
+static int      hf_cflow_vrfname;      /* ID: 236 */
+static int      hf_cflow_post_mpls_top_label_exp;      /* ID: 237 */
+static int      hf_cflow_tcp_window_scale;      /* ID: 238 */
+static int      hf_cflow_biflow_direction;
+static int      hf_cflow_ethernet_header_length;      /* ID: 240 */
+static int      hf_cflow_ethernet_payload_length;      /* ID: 241 */
+static int      hf_cflow_ethernet_total_length;      /* ID: 242 */
+static int      hf_cflow_dot1q_vlan_id;      /* ID: 243 */
+static int      hf_cflow_dot1q_priority;      /* ID: 244 */
+static int      hf_cflow_dot1q_customer_vlan_id;      /* ID: 245 */
+static int      hf_cflow_dot1q_customer_priority;      /* ID: 246 */
+static int      hf_cflow_metro_evc_id;      /* ID: 247 */
+static int      hf_cflow_metro_evc_type;      /* ID: 248 */
+static int      hf_cflow_pseudo_wire_id;      /* ID: 249 */
+static int      hf_cflow_pseudo_wire_type;      /* ID: 250 */
+static int      hf_cflow_pseudo_wire_control_word;      /* ID: 251 */
+static int      hf_cflow_ingress_physical_interface;      /* ID: 252 */
+static int      hf_cflow_egress_physical_interface;      /* ID: 253 */
+static int      hf_cflow_post_dot1q_vlan_id;      /* ID: 254 */
+static int      hf_cflow_post_dot1q_customer_vlan_id;      /* ID: 255 */
+static int      hf_cflow_ethernet_type;      /* ID: 256 */
+static int      hf_cflow_post_ip_precedence;      /* ID: 257 */
+static int      hf_cflow_collection_time_milliseconds;      /* ID: 258 */
+static int      hf_cflow_export_sctp_stream_id;      /* ID: 259 */
+static int      hf_cflow_max_export_seconds;      /* ID: 260 */
+static int      hf_cflow_max_flow_end_seconds;      /* ID: 261 */
+static int      hf_cflow_message_md5_checksum;      /* ID: 262 */
+static int      hf_cflow_message_scope;      /* ID: 263 */
+static int      hf_cflow_min_export_seconds;      /* ID: 264 */
+static int      hf_cflow_min_flow_start_seconds;      /* ID: 265 */
+static int      hf_cflow_opaque_octets;      /* ID: 266 */
+static int      hf_cflow_session_scope;      /* ID: 267 */
+static int      hf_cflow_max_flow_end_microseconds;      /* ID: 268 */
+static int      hf_cflow_max_flow_end_milliseconds;      /* ID: 269 */
+static int      hf_cflow_max_flow_end_nanoseconds;      /* ID: 270 */
+static int      hf_cflow_min_flow_start_microseconds;      /* ID: 271 */
+static int      hf_cflow_min_flow_start_milliseconds;      /* ID: 272 */
+static int      hf_cflow_min_flow_start_nanoseconds;      /* ID: 273 */
+static int      hf_cflow_collector_certificate;      /* ID: 274 */
+static int      hf_cflow_exporter_certificate;      /* ID: 275 */
+static int      hf_cflow_data_records_reliability;      /* ID: 276 */
+static int      hf_cflow_observation_point_type;      /* ID: 277 */
+static int      hf_cflow_new_connection_delta_count;      /* ID: 278 */
+static int      hf_cflow_connection_sum_duration_seconds;      /* ID: 279 */
+static int      hf_cflow_connection_transaction_id;      /* ID: 280 */
+static int      hf_cflow_post_nat_source_ipv6_address;      /* ID: 281 */
+static int      hf_cflow_post_nat_destination_ipv6_address;      /* ID: 282 */
+static int      hf_cflow_nat_pool_id;      /* ID: 283 */
+static int      hf_cflow_nat_pool_name;      /* ID: 284 */
+static int      hf_cflow_anonymization_flags;      /* ID: 285 */
+static int      hf_cflow_anonymization_technique;      /* ID: 286 */
+static int      hf_cflow_information_element_index;      /* ID: 287 */
+static int      hf_cflow_p2p_technology;      /* ID: 288 */
+static int      hf_cflow_tunnel_technology;      /* ID: 289 */
+static int      hf_cflow_encrypted_technology;      /* ID: 290 */
+static int      hf_cflow_subtemplate_list;      /* ID: 292 */
+static int      hf_cflow_bgp_validity_state;      /* ID: 294 */
+static int      hf_cflow_ipsec_spi;      /* ID: 295 */
+static int      hf_cflow_gre_key;      /* ID: 296 */
+static int      hf_cflow_nat_type;      /* ID: 297 */
+static int      hf_cflow_initiator_packets;      /* ID: 298 */
+static int      hf_cflow_responder_packets;      /* ID: 299 */
+static int      hf_cflow_observation_domain_name;      /* ID: 300 */
+static int      hf_cflow_selection_sequence_id;      /* ID: 301 */
+static int      hf_cflow_selector_id;      /* ID: 302 */
+static int      hf_cflow_information_element_id;      /* ID: 303 */
+static int      hf_cflow_selector_algorithm;      /* ID: 304 */
+static int      hf_cflow_sampling_packet_interval;      /* ID: 305 */
+static int      hf_cflow_sampling_packet_space;      /* ID: 306 */
+static int      hf_cflow_sampling_time_interval;      /* ID: 307 */
+static int      hf_cflow_sampling_time_space;      /* ID: 308 */
+static int      hf_cflow_sampling_size;      /* ID: 309 */
+static int      hf_cflow_sampling_population;      /* ID: 310 */
+static int      hf_cflow_sampling_probability_float64;      /* ID: 311 */
+static int      hf_cflow_sampling_probability_float32;      /* ID: 311 */
+static int      hf_cflow_data_link_frame_size;      /* ID: 312 */
+static int      hf_cflow_data_link_frame_section;      /* ID: 315 */
+static int      hf_cflow_mpls_label_stack_section;      /* ID: 316 */
+static int      hf_cflow_mpls_payload_packet_section;      /* ID: 317 */
+static int      hf_cflow_selector_id_total_pkts_observed;      /* ID: 318 */
+static int      hf_cflow_selector_id_total_pkts_selected;      /* ID: 319 */
+static int      hf_cflow_absolute_error_float32;      /* ID: 320 */
+static int      hf_cflow_absolute_error_float64;      /* ID: 320 */
+static int      hf_cflow_relative_error_float32;      /* ID: 321 */
+static int      hf_cflow_relative_error_float64;      /* ID: 321 */
+static int      hf_cflow_observation_time_seconds;      /* ID: 322 */
+static int      hf_cflow_observation_time_milliseconds;      /* ID: 323 */
+static int      hf_cflow_observation_time_microseconds;      /* ID: 324 */
+static int      hf_cflow_observation_time_nanoseconds;      /* ID: 325 */
+static int      hf_cflow_digest_hash_value;      /* ID: 326 */
+static int      hf_cflow_hash_ippayload_offset;      /* ID: 327 */
+static int      hf_cflow_hash_ippayload_size;      /* ID: 328 */
+static int      hf_cflow_hash_output_range_min;      /* ID: 329 */
+static int      hf_cflow_hash_output_range_max;      /* ID: 330 */
+static int      hf_cflow_hash_selected_range_min;      /* ID: 331 */
+static int      hf_cflow_hash_selected_range_max;      /* ID: 332 */
+static int      hf_cflow_hash_digest_output;      /* ID: 333 */
+static int      hf_cflow_hash_initialiser_value;      /* ID: 334 */
+static int      hf_cflow_selector_name;      /* ID: 335 */
+static int      hf_cflow_upper_cilimit_float32;      /* ID: 336 */
+static int      hf_cflow_upper_cilimit_float64;      /* ID: 336 */
+static int      hf_cflow_lower_cilimit_float32;      /* ID: 337 */
+static int      hf_cflow_lower_cilimit_float64;      /* ID: 337 */
+static int      hf_cflow_confidence_level_float32;      /* ID: 338 */
+static int      hf_cflow_confidence_level_float64;      /* ID: 338 */
+static int      hf_cflow_information_element_data_type;      /* ID: 339 */
+static int      hf_cflow_information_element_description;      /* ID: 340 */
+static int      hf_cflow_information_element_name;      /* ID: 341 */
+static int      hf_cflow_information_element_range_begin;      /* ID: 342 */
+static int      hf_cflow_information_element_range_end;      /* ID: 343 */
+static int      hf_cflow_information_element_semantics;      /* ID: 344 */
+static int      hf_cflow_information_element_units;      /* ID: 345 */
+static int      hf_cflow_private_enterprise_number;      /* ID: 346 */
+
+static int      hf_cflow_virtual_station_interface_id;      /* ID: 347 */
+static int      hf_cflow_virtual_station_interface_name;      /* ID: 348 */
+static int      hf_cflow_virtual_station_uuid;      /* ID: 349 */
+static int      hf_cflow_virtual_station_name;      /* ID: 350 */
+static int      hf_cflow_layer2_segment_id;      /* ID: 351 */
+static int      hf_cflow_layer2_octet_delta_count;      /* ID: 352 */
+static int      hf_cflow_layer2_octet_total_count;      /* ID: 353 */
+static int      hf_cflow_ingress_unicast_packet_total_count;      /* ID: 354 */
+static int      hf_cflow_ingress_multicast_packet_total_count;      /* ID: 355 */
+static int      hf_cflow_ingress_broadcast_packet_total_count;      /* ID: 356 */
+static int      hf_cflow_egress_unicast_packet_total_count;      /* ID: 357 */
+static int      hf_cflow_egress_broadcast_packet_total_count;      /* ID: 358 */
+static int      hf_cflow_monitoring_interval_start_milliseconds;      /* ID: 359 */
+static int      hf_cflow_monitoring_interval_end_milliseconds;      /* ID: 360 */
+static int      hf_cflow_port_range_start;      /* ID: 361 */
+static int      hf_cflow_port_range_end;      /* ID: 362 */
+static int      hf_cflow_port_range_step_size;      /* ID: 363 */
+static int      hf_cflow_port_range_num_ports;      /* ID: 364 */
+static int      hf_cflow_sta_mac_address;      /* ID: 365 */
+static int      hf_cflow_sta_ipv4_address;      /* ID: 366 */
+static int      hf_cflow_wtp_mac_address;      /* ID: 367 */
+static int      hf_cflow_ingress_interface_type;      /* ID: 368 */
+static int      hf_cflow_egress_interface_type;      /* ID: 369 */
+static int      hf_cflow_rtp_sequence_number;      /* ID: 370 */
+static int      hf_cflow_user_name;      /* ID: 371 */
+static int      hf_cflow_application_category_name;      /* ID: 372 */
+static int      hf_cflow_application_sub_category_name;      /* ID: 373 */
+static int      hf_cflow_application_group_name;      /* ID: 374 */
+static int      hf_cflow_original_flows_present;      /* ID: 375 */
+static int      hf_cflow_original_flows_initiated;      /* ID: 376 */
+static int      hf_cflow_original_flows_completed;      /* ID: 377 */
+static int      hf_cflow_distinct_count_of_source_ip_address;      /* ID: 378 */
+static int      hf_cflow_distinct_count_of_destinationip_address;      /* ID: 379 */
+static int      hf_cflow_distinct_count_of_source_ipv4_address;      /* ID: 380 */
+static int      hf_cflow_distinct_count_of_destination_ipv4_address;      /* ID: 381 */
+static int      hf_cflow_distinct_count_of_source_ipv6_address;      /* ID: 382 */
+static int      hf_cflow_distinct_count_of_destination_ipv6_address;      /* ID: 383 */
+static int      hf_cflow_value_distribution_method;      /* ID: 384 */
+static int      hf_cflow_rfc3550_jitter_milliseconds;      /* ID: 385 */
+static int      hf_cflow_rfc3550_jitter_microseconds;      /* ID: 386 */
+static int      hf_cflow_rfc3550_jitter_nanoseconds;      /* ID: 387 */
+static int      hf_cflow_dot1q_dei;      /* ID: 388 */
+static int      hf_cflow_dot1q_customer_dei;      /* ID: 389 */
+static int      hf_cflow_flow_selector_algorithm;      /* ID: 390 */
+static int      hf_cflow_flow_selected_octet_delta_count;      /* ID: 391 */
+static int      hf_cflow_flow_selected_packet_delta_count;      /* ID: 392 */
+static int      hf_cflow_flow_selected_flow_delta_count;      /* ID: 393 */
+static int      hf_cflow_selectorid_total_flows_observed;      /* ID: 394 */
+static int      hf_cflow_selectorid_total_flows_selected;      /* ID: 395 */
+static int      hf_cflow_sampling_flow_interval;      /* ID: 396 */
+static int      hf_cflow_sampling_flow_spacing;      /* ID: 397 */
+static int      hf_cflow_flow_sampling_time_interval;      /* ID: 398 */
+static int      hf_cflow_flow_sampling_time_spacing;      /* ID: 399 */
+static int      hf_cflow_hash_flow_domain;      /* ID: 400 */
+static int      hf_cflow_transport_octet_delta_count;      /* ID: 401 */
+static int      hf_cflow_transport_packet_delta_count;      /* ID: 402 */
+static int      hf_cflow_original_exporter_ipv4_address;      /* ID: 403 */
+static int      hf_cflow_original_exporter_ipv6_address;      /* ID: 404 */
+static int      hf_cflow_original_observation_domain_id;      /* ID: 405 */
+static int      hf_cflow_intermediate_process_id;      /* ID: 406 */
+static int      hf_cflow_ignored_data_record_total_count;      /* ID: 407 */
+static int      hf_cflow_data_link_frame_type;      /* ID: 408 */
+static int      hf_cflow_section_offset;      /* ID: 409 */
+static int      hf_cflow_section_exported_octets;      /* ID: 410 */
+static int      hf_cflow_dot1q_service_instance_tag;      /* ID: 411 */
+static int      hf_cflow_dot1q_service_instance_id;      /* ID: 412 */
+static int      hf_cflow_dot1q_service_instance_priority;      /* ID: 413 */
+static int      hf_cflow_dot1q_customer_source_mac_address;      /* ID: 414 */
+static int      hf_cflow_dot1q_customer_destination_mac_address;      /* ID: 415 */
+static int      hf_cflow_post_layer2_octet_delta_count;      /* ID: 417 */
+static int      hf_cflow_postm_cast_layer2_octet_delta_count;      /* ID: 418 */
+static int      hf_cflow_post_layer2_octet_total_count;      /* ID: 420 */
+static int      hf_cflow_postm_cast_layer2_octet_total_count;      /* ID: 421 */
+static int      hf_cflow_minimum_layer2_total_length;      /* ID: 422 */
+static int      hf_cflow_maximum_layer2_total_length;      /* ID: 423 */
+static int      hf_cflow_dropped_layer2_octet_delta_count;      /* ID: 424 */
+static int      hf_cflow_dropped_layer2_octet_total_count;      /* ID: 425 */
+static int      hf_cflow_ignored_layer2_octet_total_count;      /* ID: 426 */
+static int      hf_cflow_not_sent_layer2_octet_total_count;      /* ID: 427 */
+static int      hf_cflow_layer2_octet_delta_sum_of_squares;      /* ID: 428 */
+static int      hf_cflow_layer2_octet_total_sum_of_squares;      /* ID: 429 */
+static int      hf_cflow_layer2_frame_delta_count;      /* ID: 430 */
+static int      hf_cflow_layer2_frame_total_count;      /* ID: 431 */
+static int      hf_cflow_pseudo_wire_destination_ipv4_address;      /* ID: 432 */
+static int      hf_cflow_ignored_layer2_frame_total_count;      /* ID: 433 */
+static int      hf_cflow_mib_object_value_integer;      /* ID: 434 */
+static int      hf_cflow_mib_object_value_octetstring;      /* ID: 435 */
+static int      hf_cflow_mib_object_value_oid;      /* ID: 436 */
+static int      hf_cflow_mib_object_value_bits;      /* ID: 437 */
+static int      hf_cflow_mib_object_value_ipaddress;      /* ID: 438 */
+static int      hf_cflow_mib_object_value_counter;      /* ID: 439 */
+static int      hf_cflow_mib_object_value_gauge;      /* ID: 440 */
+static int      hf_cflow_mib_object_value_timeticks;      /* ID: 441 */
+static int      hf_cflow_mib_object_value_unsigned;      /* ID: 442 */
+static int      hf_cflow_mib_object_value_table;      /* ID: 443 */
+static int      hf_cflow_mib_object_value_row;      /* ID: 444 */
+static int      hf_cflow_mib_object_identifier;      /* ID: 445 */
+static int      hf_cflow_mib_subidentifier;      /* ID: 446 */
+static int      hf_cflow_mib_index_indicator;      /* ID: 447 */
+static int      hf_cflow_mib_capture_time_semantics;      /* ID: 448 */
+static int      hf_cflow_mib_context_engineid;      /* ID: 449 */
+static int      hf_cflow_mib_context_name;      /* ID: 450 */
+static int      hf_cflow_mib_object_name;      /* ID: 451 */
+static int      hf_cflow_mib_object_description;      /* ID: 452 */
+static int      hf_cflow_mib_object_syntax;      /* ID: 453 */
+static int      hf_cflow_mib_module_name;      /* ID: 454 */
+static int      hf_cflow_mobile_imsi;      /* ID: 455 */
+static int      hf_cflow_mobile_msisdn;      /* ID: 456 */
+static int      hf_cflow_http_statuscode;      /* ID: 457 */
+static int      hf_cflow_source_transport_ports_limit;      /* ID: 458 */
+static int      hf_cflow_http_request_method;      /* ID: 459 */
+static int      hf_cflow_http_request_host;      /* ID: 460 */
+static int      hf_cflow_http_request_target;      /* ID: 461 */
+static int      hf_cflow_http_message_version;      /* ID: 462 */
+static int      hf_cflow_nat_instanceid;      /* ID: 463 */
+static int      hf_cflow_internal_address_realm;      /* ID: 464 */
+static int      hf_cflow_external_address_realm;      /* ID: 465 */
+static int      hf_cflow_nat_quota_exceeded_event;      /* ID: 466 */
+static int      hf_cflow_nat_threshold_event;      /* ID: 467 */
+static int      hf_cflow_http_user_agent;      /* ID: 468 */
+static int      hf_cflow_http_content_type;      /* ID: 469 */
+static int      hf_cflow_http_reason_phrase;      /* ID: 470 */
+static int      hf_cflow_max_session_entries;      /* ID: 471 */
+static int      hf_cflow_max_bib_entries;      /* ID: 472 */
+static int      hf_cflow_max_entries_per_user;      /* ID: 473 */
+static int      hf_cflow_max_subscribers;      /* ID: 474 */
+static int      hf_cflow_max_fragments_pending_reassembly;      /* ID: 475 */
+static int      hf_cflow_addresspool_highthreshold;      /* ID: 476 */
+static int      hf_cflow_addresspool_lowthreshold;      /* ID: 477 */
+static int      hf_cflow_addressport_mapping_highthreshold;      /* ID: 478 */
+static int      hf_cflow_addressport_mapping_lowthreshold;      /* ID: 479 */
+static int      hf_cflow_addressport_mapping_per_user_highthreshold;      /* ID: 480 */
+static int      hf_cflow_global_addressmapping_highthreshold;      /* ID: 481 */
+static int      hf_cflow_vpn_identifier;      /* ID: 482 */
+static int      hf_cflow_bgp_community;      /* ID: 483 */
+static int      hf_cflow_bgp_source_community_list;      /* ID: 484 */
+static int      hf_cflow_bgp_destination_community_list;      /* ID: 485 */
+static int      hf_cflow_bgp_extended_community;      /* ID: 486 */
+static int      hf_cflow_bgp_source_extended_community_list;      /* ID: 487 */
+static int      hf_cflow_bgp_destination_extended_community_list;      /* ID: 488 */
+static int      hf_cflow_bgp_large_community;      /* ID: 489 */
+static int      hf_cflow_bgp_source_large_community_list;      /* ID: 490 */
+static int      hf_cflow_bgp_destination_large_community_list;      /* ID: 491 */
+
+static int      hf_cflow_srh_flags_ipv6;      /* ID: 492 */
+static int      hf_cflow_srh_flags_ipv6_reserved;      /* Reserved / Unassigned RFC8754 */
+static int      hf_cflow_srh_flags_ipv6_oflag;      /* O-Flag RFC9259 */
+static int      hf_cflow_srh_tag_ipv6;      /* ID: 493 */
+static int      hf_cflow_srh_segment_ipv6;      /* ID: 494 */
+static int      hf_cflow_srh_active_segment_ipv6;      /* ID: 495 */
+static int      hf_cflow_srh_segment_ipv6_basic_list;      /* ID: 496 */
+static int      hf_cflow_srh_segment_ipv6_list_section;      /* ID: 497 */
+static int      hf_cflow_srh_segments_ipv6_left;      /* ID: 498 */
+static int      hf_cflow_srh_ipv6_section;      /* ID: 499 */
+static int      hf_cflow_srh_ipv6_active_segment_type;      /* ID: 500 */
+static int      hf_cflow_srh_segment_ipv6_locator_length;      /* ID: 501 */
+static int      hf_cflow_srh_segment_ipv6_endpoint_behaviour;      /* ID: 502 */
 
 static int * const srh_flags_ipv6[] = {
         &hf_cflow_srh_flags_ipv6_reserved,
@@ -2981,1001 +2981,1001 @@ static int * const srh_flags_ipv6[] = {
         NULL
 };
 
-static int      hf_cflow_mpls_label                                 = -1;
-static int      hf_cflow_mpls_exp                                   = -1;
-static int      hf_cflow_mpls_bos                                   = -1;
+static int      hf_cflow_mpls_label;
+static int      hf_cflow_mpls_exp;
+static int      hf_cflow_mpls_bos;
 
 #if 0
-static int      hf_cflow_nic_id                                     = -1;      /* ID: 33625 */
+static int      hf_cflow_nic_id;      /* ID: 33625 */
 #endif
-static int      hf_cflow_cts_sgt_source_tag                         = -1;      /* ID: 34000 */
-static int      hf_cflow_cts_sgt_destination_tag                    = -1;      /* ID: 34001 */
-static int      hf_cflow_cts_sgt_source_name                        = -1;      /* ID: 34002 */
-static int      hf_cflow_cts_sgt_destination_name                   = -1;      /* ID: 34003 */
-static int      hf_cflow_packets_dropped                            = -1;      /* ID: 37000 */
-static int      hf_cflow_byte_rate                                  = -1;      /* ID: 37003 */
-static int      hf_cflow_application_media_bytes                    = -1;      /* ID: 37004 */
-static int      hf_cflow_application_media_byte_rate                = -1;      /* ID: 37006 */
-static int      hf_cflow_application_media_packets                  = -1;      /* ID: 37007 */
-static int      hf_cflow_application_media_packet_rate              = -1;      /* ID: 37009 */
-static int      hf_cflow_application_media_event                    = -1;      /* ID: 37011 */
-static int      hf_cflow_monitor_event                              = -1;      /* ID: 37012 */
-static int      hf_cflow_timestamp_interval                         = -1;      /* ID: 37013 */
-static int      hf_cflow_transport_packets_expected                 = -1;      /* ID: 37014 */
-static int      hf_cflow_transport_round_trip_time                  = -1;      /* ID: 37016 */
-static int      hf_cflow_transport_round_trip_time_string           = -1;      /* ID: 37016 */
-static int      hf_cflow_transport_event_packet_loss                = -1;      /* ID: 37017 */
-static int      hf_cflow_transport_packets_lost                     = -1;      /* ID: 37019 */
-static int      hf_cflow_transport_packets_lost_string              = -1;      /* ID: 37019 */
-static int      hf_cflow_transport_packets_lost_rate                = -1;      /* ID: 37021 */
-static int      hf_cflow_transport_packets_lost_rate_string         = -1;      /* ID: 37021 */
-static int      hf_cflow_transport_rtp_ssrc                         = -1;      /* ID: 37022 */
-static int      hf_cflow_transport_rtp_jitter_mean                  = -1;      /* ID: 37023 */
-static int      hf_cflow_transport_rtp_jitter_mean_string           = -1;      /* ID: 37023 */
-static int      hf_cflow_transport_rtp_jitter_min                   = -1;      /* ID: 37024 */
-static int      hf_cflow_transport_rtp_jitter_min_string            = -1;      /* ID: 37024 */
-static int      hf_cflow_transport_rtp_jitter_max                   = -1;      /* ID: 37025 */
-static int      hf_cflow_transport_rtp_jitter_max_string            = -1;      /* ID: 37025 */
-
-static int      hf_cflow_transport_rtp_payload_type                 = -1;      /* ID: 37041 */
-static int      hf_cflow_transport_rtp_payload_type_string          = -1;      /* ID: 37041 */
-static int      hf_cflow_transport_bytes_out_of_order               = -1;      /* ID: 37071 */
-/* static int      hf_cflow_transport_packets_out_of_order          = -1; */      /* ID: 37074 */
-static int      hf_cflow_transport_packets_out_of_order_string      = -1;      /* ID: 37074 */
-static int      hf_cflow_transport_tcp_window_size_min              = -1;      /* ID: 37083 */
-static int      hf_cflow_transport_tcp_window_size_min_string       = -1;      /* ID: 37083 */
-static int      hf_cflow_transport_tcp_window_size_max              = -1;      /* ID: 37084  */
-static int      hf_cflow_transport_tcp_window_size_max_string       = -1;      /* ID: 37084 */
-static int      hf_cflow_transport_tcp_window_size_mean             = -1;      /* ID: 37085  */
-static int      hf_cflow_transport_tcp_window_size_mean_string      = -1;      /* ID: 37085  */
-static int      hf_cflow_transport_tcp_maximum_segment_size         = -1;      /* ID: 37086  */
-static int      hf_cflow_transport_tcp_maximum_segment_size_string  = -1;      /* ID: 37086 */
+static int      hf_cflow_cts_sgt_source_tag;      /* ID: 34000 */
+static int      hf_cflow_cts_sgt_destination_tag;      /* ID: 34001 */
+static int      hf_cflow_cts_sgt_source_name;      /* ID: 34002 */
+static int      hf_cflow_cts_sgt_destination_name;      /* ID: 34003 */
+static int      hf_cflow_packets_dropped;      /* ID: 37000 */
+static int      hf_cflow_byte_rate;      /* ID: 37003 */
+static int      hf_cflow_application_media_bytes;      /* ID: 37004 */
+static int      hf_cflow_application_media_byte_rate;      /* ID: 37006 */
+static int      hf_cflow_application_media_packets;      /* ID: 37007 */
+static int      hf_cflow_application_media_packet_rate;      /* ID: 37009 */
+static int      hf_cflow_application_media_event;      /* ID: 37011 */
+static int      hf_cflow_monitor_event;      /* ID: 37012 */
+static int      hf_cflow_timestamp_interval;      /* ID: 37013 */
+static int      hf_cflow_transport_packets_expected;      /* ID: 37014 */
+static int      hf_cflow_transport_round_trip_time;      /* ID: 37016 */
+static int      hf_cflow_transport_round_trip_time_string;      /* ID: 37016 */
+static int      hf_cflow_transport_event_packet_loss;      /* ID: 37017 */
+static int      hf_cflow_transport_packets_lost;      /* ID: 37019 */
+static int      hf_cflow_transport_packets_lost_string;      /* ID: 37019 */
+static int      hf_cflow_transport_packets_lost_rate;      /* ID: 37021 */
+static int      hf_cflow_transport_packets_lost_rate_string;      /* ID: 37021 */
+static int      hf_cflow_transport_rtp_ssrc;      /* ID: 37022 */
+static int      hf_cflow_transport_rtp_jitter_mean;      /* ID: 37023 */
+static int      hf_cflow_transport_rtp_jitter_mean_string;      /* ID: 37023 */
+static int      hf_cflow_transport_rtp_jitter_min;      /* ID: 37024 */
+static int      hf_cflow_transport_rtp_jitter_min_string;      /* ID: 37024 */
+static int      hf_cflow_transport_rtp_jitter_max;      /* ID: 37025 */
+static int      hf_cflow_transport_rtp_jitter_max_string;      /* ID: 37025 */
+
+static int      hf_cflow_transport_rtp_payload_type;      /* ID: 37041 */
+static int      hf_cflow_transport_rtp_payload_type_string;      /* ID: 37041 */
+static int      hf_cflow_transport_bytes_out_of_order;      /* ID: 37071 */
+/* static int      hf_cflow_transport_packets_out_of_order; */      /* ID: 37074 */
+static int      hf_cflow_transport_packets_out_of_order_string;      /* ID: 37074 */
+static int      hf_cflow_transport_tcp_window_size_min;      /* ID: 37083 */
+static int      hf_cflow_transport_tcp_window_size_min_string;      /* ID: 37083 */
+static int      hf_cflow_transport_tcp_window_size_max;      /* ID: 37084  */
+static int      hf_cflow_transport_tcp_window_size_max_string;      /* ID: 37084 */
+static int      hf_cflow_transport_tcp_window_size_mean;      /* ID: 37085  */
+static int      hf_cflow_transport_tcp_window_size_mean_string;      /* ID: 37085  */
+static int      hf_cflow_transport_tcp_maximum_segment_size;      /* ID: 37086  */
+static int      hf_cflow_transport_tcp_maximum_segment_size_string;      /* ID: 37086 */
 
 /* Sequence analysis fields */
-static int      hf_cflow_sequence_analysis_expected_sn            = -1;
-static int      hf_cflow_sequence_analysis_previous_frame         = -1;
+static int      hf_cflow_sequence_analysis_expected_sn;
+static int      hf_cflow_sequence_analysis_previous_frame;
 
 /* Ericsson SE NAT Logging */
-static int      hf_cflow_nat_context_id         = -1;   /* ID: 24628 */
-static int      hf_cflow_nat_context_name       = -1;   /* ID: 24629 */
-static int      hf_cflow_nat_assign_time        = -1;   /* ID: 24630 */
-static int      hf_cflow_nat_unassign_time      = -1;   /* ID: 24631 */
-static int      hf_cflow_nat_int_addr           = -1;   /* ID: 24632 */
-static int      hf_cflow_nat_ext_addr           = -1;   /* ID: 24633 */
-static int      hf_cflow_nat_ext_port_first     = -1;   /* ID: 24634 */
-static int      hf_cflow_nat_ext_port_last      = -1;   /* ID: 24635 */
+static int      hf_cflow_nat_context_id;   /* ID: 24628 */
+static int      hf_cflow_nat_context_name;   /* ID: 24629 */
+static int      hf_cflow_nat_assign_time;   /* ID: 24630 */
+static int      hf_cflow_nat_unassign_time;   /* ID: 24631 */
+static int      hf_cflow_nat_int_addr;   /* ID: 24632 */
+static int      hf_cflow_nat_ext_addr;   /* ID: 24633 */
+static int      hf_cflow_nat_ext_port_first;   /* ID: 24634 */
+static int      hf_cflow_nat_ext_port_last;   /* ID: 24635 */
 
 
 /* Cisco ASA 5500 Series */
-static int      hf_cflow_ingress_acl_id = -1; /* NF_F_INGRESS_ACL_ID (33000) */
-static int      hf_cflow_egress_acl_id  = -1; /* NF_F_EGRESS_ACL_ID  (33001) */
-static int      hf_cflow_fw_ext_event   = -1; /* NF_F_FW_EXT_EVENT   (33002) */
-static int      hf_cflow_aaa_username   = -1; /* NF_F_USERNAME[_MAX] (40000) */
+static int      hf_cflow_ingress_acl_id; /* NF_F_INGRESS_ACL_ID (33000) */
+static int      hf_cflow_egress_acl_id; /* NF_F_EGRESS_ACL_ID  (33001) */
+static int      hf_cflow_fw_ext_event; /* NF_F_FW_EXT_EVENT   (33002) */
+static int      hf_cflow_aaa_username; /* NF_F_USERNAME[_MAX] (40000) */
 
-static int      hf_ipfix_enterprise_private_entry = -1;
+static int      hf_ipfix_enterprise_private_entry;
 
 /* pie = private information element */
 
-static int      hf_pie_cace                       = -1;
-static int      hf_pie_cace_local_ipv4_address   = -1;
-static int      hf_pie_cace_remote_ipv4_address  = -1;
-static int      hf_pie_cace_local_ipv6_address   = -1;
-static int      hf_pie_cace_remote_ipv6_address  = -1;
-static int      hf_pie_cace_local_port           = -1;
-static int      hf_pie_cace_remote_port          = -1;
-static int      hf_pie_cace_local_ipv4_id        = -1;
-static int      hf_pie_cace_local_icmp_id        = -1;
-static int      hf_pie_cace_local_uid            = -1;
-static int      hf_pie_cace_local_pid            = -1;
-static int      hf_pie_cace_local_username_len   = -1;
-static int      hf_pie_cace_local_username       = -1;
-static int      hf_pie_cace_local_cmd_len        = -1;
-static int      hf_pie_cace_local_cmd            = -1;
-
-static int      hf_pie_ntop                             = -1;
-static int      hf_pie_ntop_src_fragments               = -1;
-static int      hf_pie_ntop_dst_fragments               = -1;
-static int      hf_pie_ntop_src_to_dst_max_throughput   = -1;
-static int      hf_pie_ntop_src_to_dst_min_throughput   = -1;
-static int      hf_pie_ntop_src_to_dst_avg_throughput   = -1;
-static int      hf_pie_ntop_dst_to_src_max_throughput   = -1;
-static int      hf_pie_ntop_dst_to_src_min_throughput   = -1;
-static int      hf_pie_ntop_dst_to_src_avg_throughput   = -1;
-static int      hf_pie_ntop_num_pkts_up_to_128_bytes    = -1;
-static int      hf_pie_ntop_num_pkts_128_to_256_bytes   = -1;
-static int      hf_pie_ntop_num_pkts_256_to_512_bytes   = -1;
-static int      hf_pie_ntop_num_pkts_512_to_1024_bytes  = -1;
-static int      hf_pie_ntop_num_pkts_1024_to_1514_bytes = -1;
-static int      hf_pie_ntop_num_pkts_over_1514_bytes    = -1;
-static int      hf_pie_ntop_cumulative_icmp_type        = -1;
-static int      hf_pie_ntop_src_ip_country              = -1;
-static int      hf_pie_ntop_src_ip_city                 = -1;
-static int      hf_pie_ntop_dst_ip_country              = -1;
-static int      hf_pie_ntop_dst_ip_city                 = -1;
-static int      hf_pie_ntop_flow_proto_port             = -1;
-
-static int      hf_pie_ntop_upstream_tunnel_id       = -1;
-static int      hf_pie_ntop_longest_flow_pkt         = -1;
-static int      hf_pie_ntop_shortest_flow_pkt        = -1;
-static int      hf_pie_ntop_retransmitted_in_pkts    = -1;
-static int      hf_pie_ntop_retransmitted_out_pkts   = -1;
-static int      hf_pie_ntop_ooorder_in_pkts          = -1;
-static int      hf_pie_ntop_ooorder_out_pkts         = -1;
-static int      hf_pie_ntop_untunneled_protocol      = -1;
-static int      hf_pie_ntop_untunneled_ipv4_src_addr = -1;
-static int      hf_pie_ntop_untunneled_l4_src_port   = -1;
-static int      hf_pie_ntop_untunneled_ipv4_dst_addr = -1;
-static int      hf_pie_ntop_untunneled_l4_dst_port   = -1;
-
-static int      hf_pie_ntop_l7_proto                 = -1;
-static int      hf_pie_ntop_l7_proto_name            = -1;
-static int      hf_pie_ntop_downstram_tunnel_id      = -1;
-static int      hf_pie_ntop_flow_user_name           = -1;
-static int      hf_pie_ntop_flow_server_name         = -1;
-static int      hf_pie_ntop_client_nw_latency_ms     = -1;
-static int      hf_pie_ntop_server_nw_latency_ms     = -1;
-static int      hf_pie_ntop_appl_latency_ms          = -1;
-static int      hf_pie_ntop_plugin_name              = -1;
-static int      hf_pie_ntop_retransmitted_in_bytes   = -1;
-static int      hf_pie_ntop_retransmitted_out_bytes  = -1;
-static int      hf_pie_ntop_sip_call_id              = -1;
-static int      hf_pie_ntop_sip_calling_party        = -1;
-static int      hf_pie_ntop_sip_called_party         = -1;
-static int      hf_pie_ntop_sip_rtp_codecs           = -1;
-static int      hf_pie_ntop_sip_invite_time          = -1;
-static int      hf_pie_ntop_sip_trying_time          = -1;
-static int      hf_pie_ntop_sip_ringing_time         = -1;
-
-static int      hf_pie_ntop_sip_invite_ok_time       = -1;
-static int      hf_pie_ntop_sip_invite_failure_time  = -1;
-static int      hf_pie_ntop_sip_bye_time             = -1;
-static int      hf_pie_ntop_sip_bye_ok_time          = -1;
-static int      hf_pie_ntop_sip_cancel_time          = -1;
-static int      hf_pie_ntop_sip_cancel_ok_time       = -1;
-static int      hf_pie_ntop_sip_rtp_ipv4_src_addr    = -1;
-static int      hf_pie_ntop_sip_rtp_l4_src_port      = -1;
-static int      hf_pie_ntop_sip_rtp_ipv4_dst_addr    = -1;
-static int      hf_pie_ntop_sip_rtp_l4_dst_port      = -1;
-static int      hf_pie_ntop_sip_response_code        = -1;
-static int      hf_pie_ntop_sip_reason_cause         = -1;
-static int      hf_pie_ntop_rtp_first_seq            = -1;
-static int      hf_pie_ntop_rtp_first_ts             = -1;
-static int      hf_pie_ntop_rtp_last_seq             = -1;
-static int      hf_pie_ntop_rtp_last_ts              = -1;
-static int      hf_pie_ntop_rtp_in_jitter            = -1;
-static int      hf_pie_ntop_rtp_out_jitter           = -1;
-static int      hf_pie_ntop_rtp_in_pkt_lost          = -1;
-static int      hf_pie_ntop_rtp_out_pkt_lost         = -1;
-static int      hf_pie_ntop_rtp_out_payload_type     = -1;
-static int      hf_pie_ntop_rtp_in_max_delta         = -1;
-static int      hf_pie_ntop_rtp_out_max_delta        = -1;
-static int      hf_pie_ntop_rtp_in_payload_type      = -1;
-static int      hf_pie_ntop_src_proc_id              = -1;
-static int      hf_pie_ntop_src_proc_name            = -1;
-static int      hf_pie_ntop_http_url                 = -1;
-static int      hf_pie_ntop_http_ret_code            = -1;
-static int      hf_pie_ntop_http_referer             = -1;
-static int      hf_pie_ntop_http_ua                  = -1;
-static int      hf_pie_ntop_http_mime                = -1;
-static int      hf_pie_ntop_smtp_mail_from           = -1;
-static int      hf_pie_ntop_smtp_rcpt_to             = -1;
-static int      hf_pie_ntop_http_host                = -1;
-static int      hf_pie_ntop_ssl_server_name          = -1;
-static int      hf_pie_ntop_bittorrent_hash          = -1;
-
-static int      hf_pie_ntop_mysql_srv_version        = -1;
-static int      hf_pie_ntop_mysql_username           = -1;
-static int      hf_pie_ntop_mysql_db                 = -1;
-static int      hf_pie_ntop_mysql_query              = -1;
-static int      hf_pie_ntop_mysql_response           = -1;
-
-static int      hf_pie_ntop_oracle_username          = -1;
-static int      hf_pie_ntop_oracle_query             = -1;
-static int      hf_pie_ntop_oracle_resp_code         = -1;
-static int      hf_pie_ntop_oracle_resp_string       = -1;
-static int      hf_pie_ntop_oracle_query_duration    = -1;
-static int      hf_pie_ntop_dns_query                = -1;
-static int      hf_pie_ntop_dns_query_id             = -1;
-static int      hf_pie_ntop_dns_query_type           = -1;
-static int      hf_pie_ntop_dns_ret_code             = -1;
-static int      hf_pie_ntop_dns_num_answers          = -1;
-static int      hf_pie_ntop_pop_user                 = -1;
-
-static int      hf_pie_ntop_gtpv1_req_msg_type       = -1;
-static int      hf_pie_ntop_gtpv1_rsp_msg_type       = -1;
-static int      hf_pie_ntop_gtpv1_c2s_teid_data      = -1;
-static int      hf_pie_ntop_gtpv1_c2s_teid_ctrl      = -1;
-static int      hf_pie_ntop_gtpv1_s2c_teid_data      = -1;
-static int      hf_pie_ntop_gtpv1_s2c_teid_ctrl      = -1;
-static int      hf_pie_ntop_gtpv1_end_user_ip        = -1;
-static int      hf_pie_ntop_gtpv1_end_user_imsi      = -1;
-static int      hf_pie_ntop_gtpv1_end_user_msisdn    = -1;
-static int      hf_pie_ntop_gtpv1_end_user_imei      = -1;
-static int      hf_pie_ntop_gtpv1_apn_name           = -1;
-static int      hf_pie_ntop_gtpv1_rai_mcc            = -1;
-static int      hf_pie_ntop_gtpv1_rai_mnc            = -1;
-
-static int      hf_pie_ntop_gtpv1_uli_cell_lac       = -1;
-static int      hf_pie_ntop_gtpv1_uli_cell_ci        = -1;
-static int      hf_pie_ntop_gtpv1_uli_sac            = -1;
-static int      hf_pie_ntop_gtpv1_rai_type           = -1;
-static int      hf_pie_ntop_radius_req_msg_type         = -1;
-static int      hf_pie_ntop_radius_rsp_msg_type         = -1;
-static int      hf_pie_ntop_radius_user_name            = -1;
-static int      hf_pie_ntop_radius_calling_station_id   = -1;
-static int      hf_pie_ntop_radius_called_station_id    = -1;
-static int      hf_pie_ntop_radius_nas_ip_addr          = -1;
-static int      hf_pie_ntop_radius_nas_identifier       = -1;
-static int      hf_pie_ntop_radius_user_imsi            = -1;
-static int      hf_pie_ntop_radius_user_imei            = -1;
-static int      hf_pie_ntop_radius_framed_ip_addr       = -1;
-static int      hf_pie_ntop_radius_acct_session_id      = -1;
-static int      hf_pie_ntop_radius_acct_status_type     = -1;
-static int      hf_pie_ntop_radius_acct_in_octects      = -1;
-static int      hf_pie_ntop_radius_acct_out_octects     = -1;
-static int      hf_pie_ntop_radius_acct_in_pkts         = -1;
-static int      hf_pie_ntop_radius_acct_out_pkts        = -1;
-static int      hf_pie_ntop_imap_login                  = -1;
-
-static int      hf_pie_ntop_gtpv2_req_msg_type          = -1;
-static int      hf_pie_ntop_gtpv2_rsp_msg_type          = -1;
-static int      hf_pie_ntop_gtpv2_c2s_s1u_gtpu_teid     = -1;
-static int      hf_pie_ntop_gtpv2_c2s_s1u_gtpu_ip       = -1;
-static int      hf_pie_ntop_gtpv2_s2c_s1u_gtpu_teid     = -1;
-static int      hf_pie_ntop_gtpv2_s2c_s1u_gtpu_ip       = -1;
-static int      hf_pie_ntop_gtpv2_end_user_imsi         = -1;
-static int      hf_pie_ntop_gtpv2_and_user_msisdn       = -1;
-static int      hf_pie_ntop_gtpv2_apn_name              = -1;
-static int      hf_pie_ntop_gtpv2_uli_mcc               = -1;
-static int      hf_pie_ntop_gtpv2_uli_mnc               = -1;
-static int      hf_pie_ntop_gtpv2_uli_cell_tac          = -1;
-static int      hf_pie_ntop_gtpv2_uli_cell_id           = -1;
-static int      hf_pie_ntop_gtpv2_rat_type              = -1;
-static int      hf_pie_ntop_gtpv2_pdn_ip                = -1;
-static int      hf_pie_ntop_gtpv2_end_user_imei         = -1;
-
-static int      hf_pie_ntop_src_as_path_1          = -1;
-static int      hf_pie_ntop_src_as_path_2          = -1;
-static int      hf_pie_ntop_src_as_path_3          = -1;
-static int      hf_pie_ntop_src_as_path_4          = -1;
-static int      hf_pie_ntop_src_as_path_5          = -1;
-static int      hf_pie_ntop_src_as_path_6          = -1;
-static int      hf_pie_ntop_src_as_path_7          = -1;
-static int      hf_pie_ntop_src_as_path_8          = -1;
-static int      hf_pie_ntop_src_as_path_9          = -1;
-static int      hf_pie_ntop_src_as_path_10         = -1;
-static int      hf_pie_ntop_dst_as_path_1          = -1;
-static int      hf_pie_ntop_dst_as_path_2          = -1;
-static int      hf_pie_ntop_dst_as_path_3          = -1;
-static int      hf_pie_ntop_dst_as_path_4          = -1;
-static int      hf_pie_ntop_dst_as_path_5          = -1;
-static int      hf_pie_ntop_dst_as_path_6          = -1;
-static int      hf_pie_ntop_dst_as_path_7          = -1;
-static int      hf_pie_ntop_dst_as_path_8          = -1;
-static int      hf_pie_ntop_dst_as_path_9          = -1;
-static int      hf_pie_ntop_dst_as_path_10         = -1;
-
-static int      hf_pie_ntop_mysql_appl_latency_usec    = -1;
-static int      hf_pie_ntop_gtpv0_req_msg_type         = -1;
-static int      hf_pie_ntop_gtpv0_rsp_msg_type         = -1;
-static int      hf_pie_ntop_gtpv0_tid                  = -1;
-static int      hf_pie_ntop_gtpv0_end_user_ip          = -1;
-static int      hf_pie_ntop_gtpv0_end_user_msisdn      = -1;
-static int      hf_pie_ntop_gtpv0_apn_name             = -1;
-static int      hf_pie_ntop_gtpv0_rai_mcc              = -1;
-static int      hf_pie_ntop_gtpv0_rai_mnc              = -1;
-static int      hf_pie_ntop_gtpv0_rai_cell_lac         = -1;
-static int      hf_pie_ntop_gtpv0_rai_cell_rac         = -1;
-static int      hf_pie_ntop_gtpv0_response_cause       = -1;
-static int      hf_pie_ntop_gtpv1_response_cause       = -1;
-static int      hf_pie_ntop_gtpv2_response_cause       = -1;
-static int      hf_pie_ntop_num_pkts_ttl_5_32          = -1;
-static int      hf_pie_ntop_num_pkts_ttl_32_64         = -1;
-static int      hf_pie_ntop_num_pkts_ttl_64_96         = -1;
-static int      hf_pie_ntop_num_pkts_ttl_96_128        = -1;
-static int      hf_pie_ntop_num_pkts_ttl_128_160       = -1;
-static int      hf_pie_ntop_num_pkts_ttl_160_192       = -1;
-static int      hf_pie_ntop_num_pkts_ttl_192_224       = -1;
-static int      hf_pie_ntop_num_pkts_ttl_224_255       = -1;
-static int      hf_pie_ntop_gtpv1_rai_lac              = -1;
-static int      hf_pie_ntop_gtpv1_rai_rac              = -1;
-static int      hf_pie_ntop_gtpv1_uli_mcc              = -1;
-static int      hf_pie_ntop_gtpv1_uli_mnc              = -1;
-static int      hf_pie_ntop_num_pkts_ttl_2_5           = -1;
-static int      hf_pie_ntop_num_pkts_ttl_eq_1          = -1;
-static int      hf_pie_ntop_rtp_sip_call_id            = -1;
-static int      hf_pie_ntop_in_src_osi_sap             = -1;
-static int      hf_pie_ntop_out_dst_osi_sap            = -1;
-
-static int      hf_pie_ntop_whois_das_domain           = -1;
-static int      hf_pie_ntop_dns_ttl_answer             = -1;
-static int      hf_pie_ntop_dhcp_client_mac            = -1;
-static int      hf_pie_ntop_dhcp_client_ip             = -1;
-static int      hf_pie_ntop_dhcp_client_name           = -1;
-static int      hf_pie_ntop_ftp_login                  = -1;
-static int      hf_pie_ntop_ftp_password               = -1;
-static int      hf_pie_ntop_ftp_command                = -1;
-static int      hf_pie_ntop_ftp_command_ret_code       = -1;
-static int      hf_pie_ntop_http_method                = -1;
-static int      hf_pie_ntop_http_site                  = -1;
-static int      hf_pie_ntop_sip_c_ip                   = -1;
-static int      hf_pie_ntop_sip_call_state             = -1;
-static int      hf_pie_ntop_rtp_in_mos                 = -1;
-static int      hf_pie_ntop_rtp_in_r_factor            = -1;
-static int      hf_pie_ntop_src_proc_user_name         = -1;
-static int      hf_pie_ntop_src_father_proc_pid        = -1;
-static int      hf_pie_ntop_src_father_proc_name       = -1;
-static int      hf_pie_ntop_dst_proc_pid               = -1;
-static int      hf_pie_ntop_dst_proc_name              = -1;
-static int      hf_pie_ntop_dst_proc_user_name         = -1;
-static int      hf_pie_ntop_dst_father_proc_pid        = -1;
-static int      hf_pie_ntop_dst_father_proc_name       = -1;
-static int      hf_pie_ntop_rtp_rtt                    = -1;
-static int      hf_pie_ntop_rtp_in_transit             = -1;
-static int      hf_pie_ntop_rtp_out_transit            = -1;
-static int      hf_pie_ntop_src_proc_actual_memory     = -1;
-static int      hf_pie_ntop_src_proc_peak_memory       = -1;
-static int      hf_pie_ntop_src_proc_average_cpu_load  = -1;
-static int      hf_pie_ntop_src_proc_num_page_faults   = -1;
-static int      hf_pie_ntop_dst_proc_actual_memory     = -1;
-static int      hf_pie_ntop_dst_proc_peak_memory       = -1;
-static int      hf_pie_ntop_dst_proc_average_cpu_load  = -1;
-static int      hf_pie_ntop_dst_proc_num_page_faults   = -1;
-static int      hf_pie_ntop_duration_in                = -1;
-static int      hf_pie_ntop_duration_out               = -1;
-static int      hf_pie_ntop_src_proc_pctg_iowait       = -1;
-static int      hf_pie_ntop_dst_proc_pctg_iowait       = -1;
-static int      hf_pie_ntop_rtp_dtmf_tones             = -1;
-static int      hf_pie_ntop_untunneled_ipv6_src_addr   = -1;
-static int      hf_pie_ntop_untunneled_ipv6_dst_addr   = -1;
-static int      hf_pie_ntop_dns_response               = -1;
-
-static int      hf_pie_ntop_diameter_req_msg_type         = -1;
-static int      hf_pie_ntop_diameter_rsp_msg_type         = -1;
-static int      hf_pie_ntop_diameter_req_origin_host      = -1;
-static int      hf_pie_ntop_diameter_rsp_origin_host      = -1;
-static int      hf_pie_ntop_diameter_req_user_name        = -1;
-static int      hf_pie_ntop_diameter_rsp_result_code      = -1;
-static int      hf_pie_ntop_diameter_exp_res_vendor_id    = -1;
-static int      hf_pie_ntop_diameter_exp_res_result_code  = -1;
-
-static int      hf_pie_ntop_s1ap_enb_ue_s1ap_id             = -1;
-static int      hf_pie_ntop_s1ap_mme_ue_s1ap_id             = -1;
-static int      hf_pie_ntop_s1ap_msg_emm_type_mme_to_enb    = -1;
-static int      hf_pie_ntop_s1ap_msg_esm_type_mme_to_enb    = -1;
-static int      hf_pie_ntop_s1ap_msg_emm_type_enb_to_mme    = -1;
-static int      hf_pie_ntop_s1ap_msg_esm_type_enb_to_mme    = -1;
-static int      hf_pie_ntop_s1ap_cause_enb_to_mme           = -1;
-static int      hf_pie_ntop_s1ap_detailed_cause_enb_to_mme  = -1;
-
-static int      hf_pie_ntop_tcp_win_min_in             = -1;
-static int      hf_pie_ntop_tcp_win_max_in             = -1;
-static int      hf_pie_ntop_tcp_win_mss_in             = -1;
-static int      hf_pie_ntop_tcp_win_scale_in           = -1;
-static int      hf_pie_ntop_tcp_win_min_out            = -1;
-static int      hf_pie_ntop_tcp_win_max_out            = -1;
-static int      hf_pie_ntop_tcp_win_mss_out            = -1;
-static int      hf_pie_ntop_tcp_win_scale_out          = -1;
-static int      hf_pie_ntop_dhcp_remote_id             = -1;
-static int      hf_pie_ntop_dhcp_subscriber_id         = -1;
-static int      hf_pie_ntop_src_proc_uid               = -1;
-static int      hf_pie_ntop_dst_proc_uid               = -1;
-static int      hf_pie_ntop_application_name           = -1;
-static int      hf_pie_ntop_user_name                  = -1;
-static int      hf_pie_ntop_dhcp_message_type          = -1;
-static int      hf_pie_ntop_rtp_in_pkt_drop            = -1;
-static int      hf_pie_ntop_rtp_out_pkt_drop           = -1;
-static int      hf_pie_ntop_rtp_out_mos                = -1;
-static int      hf_pie_ntop_rtp_out_r_factor           = -1;
-static int      hf_pie_ntop_rtp_mos                    = -1;
-static int      hf_pie_ntop_gptv2_s5_s8_gtpc_teid      = -1;
-static int      hf_pie_ntop_rtp_r_factor               = -1;
-static int      hf_pie_ntop_rtp_ssrc                   = -1;
-static int      hf_pie_ntop_payload_hash               = -1;
-static int      hf_pie_ntop_gtpv2_c2s_s5_s8_gtpu_teid  = -1;
-static int      hf_pie_ntop_gtpv2_s2c_s5_s8_gtpu_teid  = -1;
-static int      hf_pie_ntop_gtpv2_c2s_s5_s8_gtpu_ip    = -1;
-static int      hf_pie_ntop_gtpv2_s2c_s5_s8_gtpu_ip    = -1;
-static int      hf_pie_ntop_src_as_map                 = -1;
-static int      hf_pie_ntop_dst_as_map                 = -1;
-static int      hf_pie_ntop_diameter_hop_by_hop_id     = -1;
-static int      hf_pie_ntop_upstream_session_id        = -1;
-static int      hf_pie_ntop_downstream_session_id      = -1;
-static int      hf_pie_ntop_src_ip_long                = -1;
-static int      hf_pie_ntop_src_ip_lat                 = -1;
-static int      hf_pie_ntop_dst_ip_long                = -1;
-static int      hf_pie_ntop_dst_ip_lat                 = -1;
-
-static int      hf_pie_ntop_diameter_clr_cancel_type        = -1;
-static int      hf_pie_ntop_diameter_clr_flags              = -1;
-static int      hf_pie_ntop_gtpv2_c2s_s5_s8_gtpc_ip         = -1;
-static int      hf_pie_ntop_gtpv2_s2c_s5_s8_gtpc_ip         = -1;
-static int      hf_pie_ntop_gtpv2_c2s_s5_s8_sgw_gtpu_teid   = -1;
-static int      hf_pie_ntop_gtpv2_s2c_s5_s8_sgw_gtpu_teid   = -1;
-static int      hf_pie_ntop_gtpv2_c2s_s5_s8_sgw_gtpu_ip     = -1;
-static int      hf_pie_ntop_gtpv2_s2c_s5_s8_sgw_gtpu_ip     = -1;
-
-static int      hf_pie_ntop_http_x_forwarded_for       = -1;
-static int      hf_pie_ntop_http_via                   = -1;
-static int      hf_pie_ntop_ssdp_host                  = -1;
-static int      hf_pie_ntop_ssdp_usn                   = -1;
-static int      hf_pie_ntop_netbios_query_name         = -1;
-static int      hf_pie_ntop_netbios_query_type         = -1;
-static int      hf_pie_ntop_netbios_response           = -1;
-static int      hf_pie_ntop_netbios_query_os           = -1;
-static int      hf_pie_ntop_ssdp_server                = -1;
-static int      hf_pie_ntop_ssdp_type                  = -1;
-static int      hf_pie_ntop_ssdp_method                = -1;
-static int      hf_pie_ntop_nprobe_ipv4_address        = -1;
-
-static int      hf_pie_plixer                         = -1;
-static int      hf_pie_plixer_client_ip_v4            = -1;
-static int      hf_pie_plixer_client_hostname         = -1;     /* string */
-static int      hf_pie_plixer_partner_name            = -1;     /* string */
-static int      hf_pie_plixer_server_hostname         = -1;     /* string */
-static int      hf_pie_plixer_server_ip_v4            = -1;
-static int      hf_pie_plixer_recipient_address       = -1;     /* string */
-static int      hf_pie_plixer_event_id                = -1;
-static int      hf_pie_plixer_msgid                   = -1;     /* string */
-
-static int      hf_pie_plixer_priority                = -1;
-static int      hf_pie_plixer_recipient_report_status = -1;
-static int      hf_pie_plixer_number_recipients       = -1;
-static int      hf_pie_plixer_origination_time        = -1;
-static int      hf_pie_plixer_encryption              = -1;     /* string */
-static int      hf_pie_plixer_service_version         = -1;     /* string */
-static int      hf_pie_plixer_linked_msgid            = -1;     /* string */
-static int      hf_pie_plixer_message_subject         = -1;     /* string */
-static int      hf_pie_plixer_sender_address          = -1;     /* string */
-static int      hf_pie_plixer_date_time               = -1;
-
-static int      hf_pie_ixia                             = -1;
-static int      hf_pie_ixia_l7_application_id           = -1;
-static int      hf_pie_ixia_l7_application_name         = -1;
-static int      hf_pie_ixia_source_ip_country_code      = -1;
-static int      hf_pie_ixia_source_ip_country_name      = -1;
-static int      hf_pie_ixia_source_ip_region_code       = -1;
-static int      hf_pie_ixia_source_ip_region_name       = -1;
-static int      hf_pie_ixia_source_ip_city_name         = -1;
-static int      hf_pie_ixia_source_ip_latitude          = -1;
-static int      hf_pie_ixia_source_ip_longitude         = -1;
-static int      hf_pie_ixia_destination_ip_country_code = -1;
-static int      hf_pie_ixia_destination_ip_country_name = -1;
-static int      hf_pie_ixia_destination_ip_region_code  = -1;
-static int      hf_pie_ixia_destination_ip_region_name  = -1;
-static int      hf_pie_ixia_destination_ip_city_name    = -1;
-static int      hf_pie_ixia_destination_ip_latitude     = -1;
-static int      hf_pie_ixia_destination_ip_longitude    = -1;
-static int      hf_pie_ixia_os_device_id                = -1;
-static int      hf_pie_ixia_os_device_name              = -1;
-static int      hf_pie_ixia_browser_id                  = -1;
-static int      hf_pie_ixia_browser_name                = -1;
-static int      hf_pie_ixia_reverse_octet_delta_count   = -1;
-static int      hf_pie_ixia_reverse_packet_delta_count  = -1;
-static int      hf_pie_ixia_conn_encryption_type        = -1;
-static int      hf_pie_ixia_encryption_cipher           = -1;
-static int      hf_pie_ixia_encryption_keylen           = -1;
-static int      hf_pie_ixia_imsi                        = -1;
-static int      hf_pie_ixia_user_agent                  = -1;
-static int      hf_pie_ixia_host_name                   = -1;
-static int      hf_pie_ixia_uri                         = -1;
-static int      hf_pie_ixia_dns_txt                     = -1;
-static int      hf_pie_ixia_source_as_name              = -1;
-static int      hf_pie_ixia_dest_as_name                = -1;
-static int      hf_pie_ixia_transaction_latency         = -1;
-static int      hf_pie_ixia_dns_query_names             = -1;
-static int      hf_pie_ixia_dns_answer_names            = -1;
-static int      hf_pie_ixia_dns_classes                 = -1;
-static int      hf_pie_ixia_threat_type                 = -1;
-static int      hf_pie_ixia_threat_ipv4                 = -1;
-static int      hf_pie_ixia_threat_ipv6                 = -1;
-static int      hf_pie_ixia_http_session                = -1;
-static int      hf_pie_ixia_request_time                = -1;
-static int      hf_pie_ixia_http_connection             = -1;
-static int      hf_pie_ixia_http_accept                 = -1;
-static int      hf_pie_ixia_http_accept_language        = -1;
-static int      hf_pie_ixia_http_accept_encoding        = -1;
-static int      hf_pie_ixia_http_reason                 = -1;
-static int      hf_pie_ixia_http_server                 = -1;
-static int      hf_pie_ixia_http_content_length         = -1;
-static int      hf_pie_ixia_http_referer                = -1;
-static int      hf_pie_ixia_http_useragent_cpu          = -1;
-static int      hf_pie_ixia_dns_records                 = -1;
-static int      hf_pie_ixia_dns_name                    = -1;
-static int      hf_pie_ixia_dns_ipv4                    = -1;
-static int      hf_pie_ixia_dns_ipv6                    = -1;
-static int      hf_pie_ixia_dns_packets                 = -1;
-static int      hf_pie_ixia_dns_transaction_id          = -1;
-static int      hf_pie_ixia_dns_opcode                  = -1;
-static int      hf_pie_ixia_dns_request_type            = -1;
-static int      hf_pie_ixia_dns_response_code           = -1;
-static int      hf_pie_ixia_dns_record_ttl              = -1;
-static int      hf_pie_ixia_dns_raw_rdata               = -1;
-static int      hf_pie_ixia_dns_response_type           = -1;
-static int      hf_pie_ixia_dns_qdcount                 = -1;
-static int      hf_pie_ixia_dns_ancount                 = -1;
-static int      hf_pie_ixia_dns_nscount                 = -1;
-static int      hf_pie_ixia_dns_arcount                 = -1;
-static int      hf_pie_ixia_dns_auth_answer             = -1;
-static int      hf_pie_ixia_dns_trucation               = -1;
-static int      hf_pie_ixia_dns_recursion_desired       = -1;
-static int      hf_pie_ixia_dns_recursion_avail         = -1;
-static int      hf_pie_ixia_dns_rdata_len               = -1;
-static int      hf_pie_ixia_dns_questions               = -1;
-static int      hf_pie_ixia_dns_query_type              = -1;
-static int      hf_pie_ixia_dns_query_name              = -1;
-static int      hf_pie_ixia_dns_section_type            = -1;
-static int      hf_pie_ixia_dns_qr_flag                 = -1;
-static int      hf_pie_ixia_dns_canonical_name          = -1;
-static int      hf_pie_ixia_dns_mx_domain               = -1;
-static int      hf_pie_ixia_tls_sni                     = -1;
-static int      hf_pie_ixia_tls_srvr_cert               = -1;
-static int      hf_pie_ixia_tls_srvr_cert_issuer        = -1;
-static int      hf_pie_ixia_tls_srvr_cert_issuer_attr   = -1;
-static int      hf_pie_ixia_tls_srvr_cert_issuer_val    = -1;
-static int      hf_pie_ixia_tls_srvr_cert_subject       = -1;
-static int      hf_pie_ixia_tls_srvr_cert_subject_attr  = -1;
-static int      hf_pie_ixia_tls_srvr_cert_subject_val   = -1;
-static int      hf_pie_ixia_tls_srvr_cert_vld_nt_bfr    = -1;
-static int      hf_pie_ixia_tls_srvr_cert_vld_nt_aftr   = -1;
-static int      hf_pie_ixia_tls_srvr_cert_srl_num       = -1;
-static int      hf_pie_ixia_tls_srvr_cert_sign_algo     = -1;
-static int      hf_pie_ixia_tls_srvr_cert_subj_pki_algo = -1;
-static int      hf_pie_ixia_tls_srvr_cert_altnames      = -1;
-static int      hf_pie_ixia_tls_srvr_cert_altnames_attr = -1;
-static int      hf_pie_ixia_tls_srvr_cert_altnames_val  = -1;
-static int      hf_pie_ixia_dhcp_client_id              = -1;
-static int      hf_pie_ixia_dhcp_client_mac             = -1;
-static int      hf_pie_ixia_dhcp_messages               = -1;
-static int      hf_pie_ixia_dhcp_message_timestamp      = -1;
-static int      hf_pie_ixia_dhcp_message_type           = -1;
-static int      hf_pie_ixia_dhcp_lease_duration         = -1;
-static int      hf_pie_ixia_dhcp_servername             = -1;
-static int      hf_pie_ixia_dhcp_agent_circuit_id       = -1;
-static int      hf_pie_ixia_radius_events               = -1;
-static int      hf_pie_ixia_radius_timestamp            = -1;
-static int      hf_pie_ixia_radius_event_timestamp      = -1;
-static int      hf_pie_ixia_radius_username             = -1;
-static int      hf_pie_ixia_radius_nas_ipv4             = -1;
-static int      hf_pie_ixia_radius_service_type         = -1;
-static int      hf_pie_ixia_radius_framed_protocol      = -1;
-static int      hf_pie_ixia_radius_framed_ip            = -1;
-static int      hf_pie_ixia_radius_filter_id            = -1;
-static int      hf_pie_ixia_radius_reply_message        = -1;
-static int      hf_pie_ixia_radius_called_station_id    = -1;
-static int      hf_pie_ixia_radius_calling_station_id   = -1;
-static int      hf_pie_ixia_email_messages              = -1;
-static int      hf_pie_ixia_email_msg_id                = -1;
-static int      hf_pie_ixia_email_msg_date              = -1;
-static int      hf_pie_ixia_email_msg_subject           = -1;
-static int      hf_pie_ixia_email_msg_to                = -1;
-static int      hf_pie_ixia_email_msg_from              = -1;
-static int      hf_pie_ixia_email_msg_cc                = -1;
-static int      hf_pie_ixia_email_msg_bcc               = -1;
-static int      hf_pie_ixia_email_msg_attachments       = -1;
-static int      hf_pie_ixia_ja3_fingerprint_string      = -1;
-static int      hf_pie_ixia_tcp_conn_setup_time         = -1;
-static int      hf_pie_ixia_tcp_app_response_time       = -1;
-static int      hf_pie_ixia_tcp_retrans_pkt_count       = -1;
-static int      hf_pie_ixia_conn_avg_rtt                = -1;
-static int      hf_pie_ixia_udpAppResponseTime          = -1;
-static int      hf_pie_ixia_quicConnSetupTime           = -1;
-static int      hf_pie_ixia_quicConnRTT                 = -1;
-static int      hf_pie_ixia_quicAppResponseTime         = -1;
-static int      hf_pie_ixia_matchedFilterName           = -1;
-static int      hf_pie_ixia_gtp_IMSI                    = -1;
-static int      hf_pie_ixia_gtp_ULI_SAI_SAC             = -1;
-static int      hf_pie_ixia_gtp_ULI_RAI_RAC             = -1;
-static int      hf_pie_ixia_gtp_ULI_TAC                 = -1;
-static int      hf_pie_ixia_gtp_ULI_ECGI_E_NODEB_ID     = -1;
-static int      hf_pie_ixia_gtp_ULI_CELL_ID             = -1;
-static int      hf_pie_ixia_gtp_ULI_LAC                 = -1;
-static int      hf_pie_ixia_gtp_ULI_MCC                 = -1;
-static int      hf_pie_ixia_gtp_ULI_MNC                 = -1;
-static int      hf_pie_ixia_gtp_MSISDN                  = -1;
-static int      hf_pie_ixia_gtp_IMEI                    = -1;
-static int      hf_pie_ixia_gtp_RAT_type                = -1;
-static int      hf_pie_ixia_gtp_ep_gen                  = -1;
-static int      hf_pie_ixia_gtp_up_TEID                 = -1;
-static int      hf_pie_ixia_gtp_down_TEID               = -1;
-static int      hf_pie_ixia_gtp_up_ipv4_addr            = -1;
-static int      hf_pie_ixia_gtp_down_ipv4_addr          = -1;
-static int      hf_pie_ixia_gtp_up_ipv6_addr            = -1;
-static int      hf_pie_ixia_gtp_down_ipv6_addr          = -1;
-static int      hf_pie_ixia_gtp_up_QCI_QFI              = -1;
-static int      hf_pie_ixia_gtp_down_QCI_QFI            = -1;
-static int      hf_pie_ixia_gtp_up_APN_DNN              = -1;
-static int      hf_pie_ixia_gtp_down_APN_DNN            = -1;
-static int      hf_pie_ixia_gtp_NSSAI_SD                = -1;
-static int      hf_pie_ixia_gtp_NSSAI_SST               = -1;
-static int      hf_pie_ixia_gtp_5QI_up                  = -1;
-static int      hf_pie_ixia_gtp_5QI_down                = -1;
-static int      hf_pie_ixia_stun_response               = -1;
-static int      hf_pie_ixia_stun_reflexive_ta_ipv4      = -1;
-static int      hf_pie_ixia_stun_reflexive_ta_ipv6      = -1;
-static int      hf_pie_ixia_stun_reflexive_ta_port      = -1;
-static int      hf_pie_ixia_http_alt_svc                = -1;
-static int      hf_pie_ixia_unidirectional              = -1;
-static int      hf_pie_ixia_http_tls_server_rand        = -1;
-static int      hf_pie_ixia_http_tls_session_id         = -1;
-static int      hf_pie_ixia_sip_to                      = -1;
-static int      hf_pie_ixia_sip_from                    = -1;
-static int      hf_pie_ixia_sip_call_id                 = -1;
-static int      hf_pie_ixia_sip_content_type            = -1;
-static int      hf_pie_ixia_sip_route                   = -1;
-static int      hf_pie_ixia_sip_geolocation             = -1;
-
-static int      hf_pie_netscaler                                         = -1;
-static int      hf_pie_netscaler_roundtriptime                           = -1;
-static int      hf_pie_netscaler_transactionid                           = -1;
-static int      hf_pie_netscaler_httprequrl                              = -1;
-static int      hf_pie_netscaler_httpreqcookie                           = -1;
-static int      hf_pie_netscaler_flowflags                               = -1;
-static int      hf_pie_netscaler_connectionid                            = -1;
-static int      hf_pie_netscaler_syslogpriority                          = -1;
-static int      hf_pie_netscaler_syslogmessage                           = -1;
-static int      hf_pie_netscaler_syslogtimestamp                         = -1;
-static int      hf_pie_netscaler_httpreqreferer                          = -1;
-static int      hf_pie_netscaler_httpreqmethod                           = -1;
-static int      hf_pie_netscaler_httpreqhost                             = -1;
-static int      hf_pie_netscaler_httprequseragent                        = -1;
-static int      hf_pie_netscaler_httprspstatus                           = -1;
-static int      hf_pie_netscaler_httprsplen                              = -1;
-static int      hf_pie_netscaler_serverttfb                              = -1;
-static int      hf_pie_netscaler_serverttlb                              = -1;
-static int      hf_pie_netscaler_appnameincarnationnumber                = -1;
-static int      hf_pie_netscaler_appnameappid                            = -1;
-static int      hf_pie_netscaler_appname                                 = -1;
-static int      hf_pie_netscaler_httpreqrcvfb                            = -1;
-static int      hf_pie_netscaler_httpreqforwfb                           = -1;
-static int      hf_pie_netscaler_httpresrcvfb                            = -1;
-static int      hf_pie_netscaler_httpresforwfb                           = -1;
-static int      hf_pie_netscaler_httpreqrcvlb                            = -1;
-static int      hf_pie_netscaler_httpreqforwlb                           = -1;
-static int      hf_pie_netscaler_mainpageid                              = -1;
-static int      hf_pie_netscaler_mainpagecoreid                          = -1;
-static int      hf_pie_netscaler_httpclientinteractionstarttime          = -1;
-static int      hf_pie_netscaler_httpclientrenderendtime                 = -1;
-static int      hf_pie_netscaler_httpclientrenderstarttime               = -1;
-static int      hf_pie_netscaler_apptemplatename                         = -1;
-static int      hf_pie_netscaler_httpclientinteractionendtime            = -1;
-static int      hf_pie_netscaler_httpresrcvlb                            = -1;
-static int      hf_pie_netscaler_httpresforwlb                           = -1;
-static int      hf_pie_netscaler_appunitnameappid                        = -1;
-static int      hf_pie_netscaler_dbloginflags                            = -1;
-static int      hf_pie_netscaler_dbreqtype                               = -1;
-static int      hf_pie_netscaler_dbprotocolname                          = -1;
-static int      hf_pie_netscaler_dbusername                              = -1;
-static int      hf_pie_netscaler_dbdatabasename                          = -1;
-static int      hf_pie_netscaler_dbclthostname                           = -1;
-static int      hf_pie_netscaler_dbreqstring                             = -1;
-static int      hf_pie_netscaler_dbrespstatusstring                      = -1;
-static int      hf_pie_netscaler_dbrespstatus                            = -1;
-static int      hf_pie_netscaler_dbresplength                            = -1;
-static int      hf_pie_netscaler_clientrtt                               = -1;
-static int      hf_pie_netscaler_httpcontenttype                         = -1;
-static int      hf_pie_netscaler_httpreqauthorization                    = -1;
-static int      hf_pie_netscaler_httpreqvia                              = -1;
-static int      hf_pie_netscaler_httpreslocation                         = -1;
-static int      hf_pie_netscaler_httpressetcookie                        = -1;
-static int      hf_pie_netscaler_httpressetcookie2                       = -1;
-static int      hf_pie_netscaler_httpreqxforwardedfor                    = -1;
-static int      hf_pie_netscaler_connectionchainid                       = -1;
-static int      hf_pie_netscaler_connectionchainhopcount                 = -1;
-static int      hf_pie_netscaler_icasessionguid                          = -1;
-static int      hf_pie_netscaler_icaclientversion                        = -1;
-static int      hf_pie_netscaler_icaclienttype                           = -1;
-static int      hf_pie_netscaler_icaclientip                             = -1;
-static int      hf_pie_netscaler_icaclienthostname                       = -1;
-static int      hf_pie_netscaler_aaausername                             = -1;
-static int      hf_pie_netscaler_icadomainname                           = -1;
-static int      hf_pie_netscaler_icaclientlauncher                       = -1;
-static int      hf_pie_netscaler_icasessionsetuptime                     = -1;
-static int      hf_pie_netscaler_icaservername                           = -1;
-static int      hf_pie_netscaler_icasessionreconnects                    = -1;
-static int      hf_pie_netscaler_icartt                                  = -1;
-static int      hf_pie_netscaler_icaclientsiderxbytes                    = -1;
-static int      hf_pie_netscaler_icaclientsidetxbytes                    = -1;
-static int      hf_pie_netscaler_icaclientsidepacketsretransmit          = -1;
-static int      hf_pie_netscaler_icaserversidepacketsretransmit          = -1;
-static int      hf_pie_netscaler_icaclientsidertt                        = -1;
-static int      hf_pie_netscaler_icaserversidertt                        = -1;
-static int      hf_pie_netscaler_icasessionupdatebeginsec                = -1;
-static int      hf_pie_netscaler_icasessionupdateendsec                  = -1;
-static int      hf_pie_netscaler_icachannelid1                           = -1;
-static int      hf_pie_netscaler_icachannelid1bytes                      = -1;
-static int      hf_pie_netscaler_icachannelid2                           = -1;
-static int      hf_pie_netscaler_icachannelid2bytes                      = -1;
-static int      hf_pie_netscaler_icachannelid3                           = -1;
-static int      hf_pie_netscaler_icachannelid3bytes                      = -1;
-static int      hf_pie_netscaler_icachannelid4                           = -1;
-static int      hf_pie_netscaler_icachannelid4bytes                      = -1;
-static int      hf_pie_netscaler_icachannelid5                           = -1;
-static int      hf_pie_netscaler_icachannelid5bytes                      = -1;
-static int      hf_pie_netscaler_icaconnectionpriority                   = -1;
-static int      hf_pie_netscaler_applicationstartupduration              = -1;
-static int      hf_pie_netscaler_icalaunchmechanism                      = -1;
-static int      hf_pie_netscaler_icaapplicationname                      = -1;
-static int      hf_pie_netscaler_applicationstartuptime                  = -1;
-static int      hf_pie_netscaler_icaapplicationterminationtype           = -1;
-static int      hf_pie_netscaler_icaapplicationterminationtime           = -1;
-static int      hf_pie_netscaler_icasessionendtime                       = -1;
-static int      hf_pie_netscaler_icaclientsidejitter                     = -1;
-static int      hf_pie_netscaler_icaserversidejitter                     = -1;
-static int      hf_pie_netscaler_icaappprocessid                         = -1;
-static int      hf_pie_netscaler_icaappmodulepath                        = -1;
-static int      hf_pie_netscaler_icadeviceserialno                       = -1;
-static int      hf_pie_netscaler_msiclientcookie                         = -1;
-static int      hf_pie_netscaler_icaflags                                = -1;
-static int      hf_pie_netscaler_icausername                             = -1;
-static int      hf_pie_netscaler_licensetype                             = -1;
-static int      hf_pie_netscaler_maxlicensecount                         = -1;
-static int      hf_pie_netscaler_currentlicenseconsumed                  = -1;
-static int      hf_pie_netscaler_icanetworkupdatestarttime               = -1;
-static int      hf_pie_netscaler_icanetworkupdateendtime                 = -1;
-static int      hf_pie_netscaler_icaclientsidesrtt                       = -1;
-static int      hf_pie_netscaler_icaserversidesrtt                       = -1;
-static int      hf_pie_netscaler_icaclientsidedelay                      = -1;
-static int      hf_pie_netscaler_icaserversidedelay                      = -1;
-static int      hf_pie_netscaler_icahostdelay                            = -1;
-static int      hf_pie_netscaler_icaclientsidewindowsize                 = -1;
-static int      hf_pie_netscaler_icaserversidewindowsize                 = -1;
-static int      hf_pie_netscaler_icaclientsidertocount                   = -1;
-static int      hf_pie_netscaler_icaserversidertocount                   = -1;
-static int      hf_pie_netscaler_ical7clientlatency                      = -1;
-static int      hf_pie_netscaler_ical7serverlatency                      = -1;
-static int      hf_pie_netscaler_httpdomainname                          = -1;
-static int      hf_pie_netscaler_cacheredirclientconnectioncoreid        = -1;
-static int      hf_pie_netscaler_cacheredirclientconnectiontransactionid = -1;
-
-
-static int      hf_pie_barracuda                                         = -1;
-static int      hf_pie_barracuda_timestamp                               = -1;
-static int      hf_pie_barracuda_logop                                   = -1;
-static int      hf_pie_barracuda_traffictype                             = -1;
-static int      hf_pie_barracuda_fwrule                                  = -1;
-static int      hf_pie_barracuda_servicename                             = -1;
-static int      hf_pie_barracuda_reason                                  = -1;
-static int      hf_pie_barracuda_reasontext                              = -1;
-static int      hf_pie_barracuda_bindipv4address                         = -1;
-static int      hf_pie_barracuda_bindtransportport                       = -1;
-static int      hf_pie_barracuda_connipv4address                         = -1;
-static int      hf_pie_barracuda_conntransportport                       = -1;
-static int      hf_pie_barracuda_auditcounter                            = -1;
-
-static int      hf_pie_gigamon                                   = -1;
-static int      hf_pie_gigamon_httprequrl                        = -1;
-static int      hf_pie_gigamon_httprspstatus                     = -1;
-static int      hf_pie_gigamon_sslcertificateissuercommonname    = -1;
-static int      hf_pie_gigamon_sslcertificatesubjectcommonname   = -1;
-static int      hf_pie_gigamon_sslcertificateissuer              = -1;
-static int      hf_pie_gigamon_sslcertificatesubject             = -1;
-static int      hf_pie_gigamon_sslcertificatevalidnotbefore      = -1;
-static int      hf_pie_gigamon_sslcertificatevalidnotafter       = -1;
-static int      hf_pie_gigamon_sslcertificateserialnumber         = -1;
-static int      hf_pie_gigamon_sslcertificatesignaturealgorithm  = -1;
-static int      hf_pie_gigamon_sslcertificatesubjectpubalgorithm = -1;
-static int      hf_pie_gigamon_sslcertificatesubjectpubkeysize   = -1;
-static int      hf_pie_gigamon_sslcertificatesubjectaltname      = -1;
-static int      hf_pie_gigamon_sslservernameindication           = -1;
-static int      hf_pie_gigamon_sslserverversion                  = -1;
-static int      hf_pie_gigamon_sslservercipher                   = -1;
-static int      hf_pie_gigamon_sslservercompressionmethod        = -1;
-static int      hf_pie_gigamon_sslserversessionid                = -1;
-static int      hf_pie_gigamon_dnsidentifier                     = -1;
-static int      hf_pie_gigamon_dnsopcode                         = -1;
-static int      hf_pie_gigamon_dnsresponsecode                   = -1;
-static int      hf_pie_gigamon_dnsqueryname                      = -1;
-static int      hf_pie_gigamon_dnsresponsename                   = -1;
-static int      hf_pie_gigamon_dnsresponsettl                    = -1;
-static int      hf_pie_gigamon_dnsresponseipv4address            = -1;
-static int      hf_pie_gigamon_dnsresponseipv6address            = -1;
-static int      hf_pie_gigamon_dnsbits                           = -1;
-static int      hf_pie_gigamon_dnsqdcount                        = -1;
-static int      hf_pie_gigamon_dnsancount                        = -1;
-static int      hf_pie_gigamon_dnsnscount                        = -1;
-static int      hf_pie_gigamon_dnsarcount                        = -1;
-static int      hf_pie_gigamon_dnsquerytype                      = -1;
-static int      hf_pie_gigamon_dnsqueryclass                     = -1;
-static int      hf_pie_gigamon_dnsresponsetype                   = -1;
-static int      hf_pie_gigamon_dnsresponseclass                  = -1;
-static int      hf_pie_gigamon_dnsresponserdlength               = -1;
-static int      hf_pie_gigamon_dnsresponserdata                  = -1;
-static int      hf_pie_gigamon_dnsauthorityname                  = -1;
-static int      hf_pie_gigamon_dnsauthoritytype                  = -1;
-static int      hf_pie_gigamon_dnsauthorityclass                 = -1;
-static int      hf_pie_gigamon_dnsauthorityttl                   = -1;
-static int      hf_pie_gigamon_dnsauthorityrdlength              = -1;
-static int      hf_pie_gigamon_dnsauthorityrdata                 = -1;
-static int      hf_pie_gigamon_dnsadditionalname                 = -1;
-static int      hf_pie_gigamon_dnsadditionaltype                 = -1;
-static int      hf_pie_gigamon_dnsadditionalclass                = -1;
-static int      hf_pie_gigamon_dnsadditionalttl                  = -1;
-static int      hf_pie_gigamon_dnsadditionalrdlength             = -1;
-static int      hf_pie_gigamon_dnsadditionalrdata                = -1;
-
-static int      hf_pie_cisco                                                     = -1;
-static int      hf_pie_cisco_transport_packets_lost_counter                      = -1;
-static int      hf_pie_cisco_transport_rtp_ssrc                                  = -1;
-static int      hf_pie_cisco_transport_rtp_jitter_maximum                        = -1;
-static int      hf_pie_cisco_transport_rtp_payload_type                          = -1;
-static int      hf_pie_cisco_transport_rtp_jitter_mean_sum                       = -1;
-static int      hf_pie_cisco_c3pl_class_cce_id                                   = -1;
-static int      hf_pie_cisco_c3pl_class_name                                     = -1;
-static int      hf_pie_cisco_c3pl_class_type                                     = -1;
-static int      hf_pie_cisco_c3pl_policy_cce_id                                  = -1;
-static int      hf_pie_cisco_c3pl_policy_name                                    = -1;
-static int      hf_pie_cisco_c3pl_policy_type                                    = -1;
-static int      hf_pie_cisco_connection_server_counter_responses                 = -1;
-static int      hf_pie_cisco_connection_client_counter_packets_retransmitted     = -1;
-static int      hf_pie_cisco_connection_transaction_counter_complete             = -1;
-static int      hf_pie_cisco_connection_transaction_duration_sum                 = -1;
-static int      hf_pie_cisco_connection_delay_response_to_server_histogram_late  = -1;
-static int      hf_pie_cisco_connection_delay_response_to_server_sum             = -1;
-static int      hf_pie_cisco_connection_delay_application_sum                    = -1;
-static int      hf_pie_cisco_connection_delay_application_max                    = -1;
-static int      hf_pie_cisco_connection_delay_response_client_to_server_sum      = -1;
-static int      hf_pie_cisco_connection_delay_network_client_to_server_sum       = -1;
-static int      hf_pie_cisco_connection_delay_network_to_client_sum              = -1;
-static int      hf_pie_cisco_connection_delay_network_to_server_sum              = -1;
-static int      hf_pie_cisco_services_waas_segment                               = -1;
-static int      hf_pie_cisco_services_waas_passthrough_reason                    = -1;
-static int      hf_pie_cisco_application_http_uri_statistics                     = -1;
-static int      hf_pie_cisco_application_http_uri_statistics_count               = -1;
-static int      hf_pie_cisco_application_category_name                           = -1;
-static int      hf_pie_cisco_application_sub_category_name                       = -1;
-static int      hf_pie_cisco_application_group_name                              = -1;
-static int      hf_pie_cisco_application_http_host                               = -1;
-static int      hf_pie_cisco_application_http_host_app_id                        = -1;
-static int      hf_pie_cisco_application_http_host_sub_app_id                    = -1;
-static int      hf_pie_cisco_connection_client_ipv4_address                      = -1;
-static int      hf_pie_cisco_connection_server_ipv4_address                      = -1;
-static int      hf_pie_cisco_connection_client_transport_port                    = -1;
-static int      hf_pie_cisco_connection_server_transport_port                    = -1;
-static int      hf_pie_cisco_connection_id                                       = -1;
-static int      hf_pie_cisco_application_traffic_class                           = -1;
-static int      hf_pie_cisco_application_business_relevance                      = -1;
-
-static int      hf_pie_niagara_networks                                             = -1;
-static int      hf_pie_niagara_networks_sslservernameindication                     = -1;
-static int      hf_pie_niagara_networks_sslserverversion                            = -1;
-static int      hf_pie_niagara_networks_sslserverversiontext                        = -1;
-static int      hf_pie_niagara_networks_sslservercipher                             = -1;
-static int      hf_pie_niagara_networks_sslserverciphertext                         = -1;
-static int      hf_pie_niagara_networks_sslconnectionencryptiontype                 = -1;
-static int      hf_pie_niagara_networks_sslservercompressionmethod                  = -1;
-static int      hf_pie_niagara_networks_sslserversessionid                          = -1;
-static int      hf_pie_niagara_networks_sslcertificateissuer                        = -1;
-static int      hf_pie_niagara_networks_sslcertificateissuername                    = -1;
-static int      hf_pie_niagara_networks_sslcertificatesubject                       = -1;
-static int      hf_pie_niagara_networks_sslcertificatesubjectname                   = -1;
-static int      hf_pie_niagara_networks_sslcertificatevalidnotbefore                = -1;
-static int      hf_pie_niagara_networks_sslcertificatevalidnotafter                 = -1;
-static int      hf_pie_niagara_networks_sslcertificateserialnumber                  = -1;
-static int      hf_pie_niagara_networks_sslcertificatesignaturealgorithm            = -1;
-static int      hf_pie_niagara_networks_sslcertificatesignaturealgorithmtext        = -1;
-static int      hf_pie_niagara_networks_sslcertificatesubjectpublickeysize          = -1;
-static int      hf_pie_niagara_networks_sslcertificatesubjectpublicalgorithm        = -1;
-static int      hf_pie_niagara_networks_sslcertificatesubjectpublicalgorithmtext    = -1;
-static int      hf_pie_niagara_networks_sslcertificatesubjectalgorithmtext          = -1;
-static int      hf_pie_niagara_networks_sslcertificatesubjectalternativename        = -1;
-static int      hf_pie_niagara_networks_sslcertificatesha1                          = -1;
-static int      hf_pie_niagara_networks_dnsidentifier                               = -1;
-static int      hf_pie_niagara_networks_dnsopcode                                   = -1;
-static int      hf_pie_niagara_networks_dnsresponsecode                             = -1;
-static int      hf_pie_niagara_networks_dnsqueryname                                = -1;
-static int      hf_pie_niagara_networks_dnsresponsename                             = -1;
-static int      hf_pie_niagara_networks_dnsresponsettl                              = -1;
-static int      hf_pie_niagara_networks_dnsresponseipv4addr                         = -1;
-static int      hf_pie_niagara_networks_dnsresponseipv4addrtext                     = -1;
-static int      hf_pie_niagara_networks_dnsresponseipv6addr                         = -1;
-static int      hf_pie_niagara_networks_dnsresponseipv6addrtext                     = -1;
-static int      hf_pie_niagara_networks_dnsbits                                     = -1;
-static int      hf_pie_niagara_networks_dnsqdcount                                  = -1;
-static int      hf_pie_niagara_networks_dnsancount                                  = -1;
-static int      hf_pie_niagara_networks_dnsnscount                                  = -1;
-static int      hf_pie_niagara_networks_dnsarcount                                  = -1;
-static int      hf_pie_niagara_networks_dnsquerytype                                = -1;
-static int      hf_pie_niagara_networks_dnsquerytypetext                            = -1;
-static int      hf_pie_niagara_networks_dnsqueryclass                               = -1;
-static int      hf_pie_niagara_networks_dnsqueryclasstext                           = -1;
-static int      hf_pie_niagara_networks_dnsresponsetype                             = -1;
-static int      hf_pie_niagara_networks_dnsresponsetypetext                         = -1;
-static int      hf_pie_niagara_networks_dnsresponseclass                            = -1;
-static int      hf_pie_niagara_networks_dnsresponseclasstext                        = -1;
-static int      hf_pie_niagara_networks_dnsresponserdlength                         = -1;
-static int      hf_pie_niagara_networks_dnsresponserdata                            = -1;
-static int      hf_pie_niagara_networks_dnsauthorityname                            = -1;
-static int      hf_pie_niagara_networks_dnsauthoritytype                            = -1;
-static int      hf_pie_niagara_networks_dnsauthoritytypetext                        = -1;
-static int      hf_pie_niagara_networks_dnsauthorityclass                           = -1;
-static int      hf_pie_niagara_networks_dnsauthorityclasstext                       = -1;
-static int      hf_pie_niagara_networks_dnsauthorityttl                             = -1;
-static int      hf_pie_niagara_networks_dnsauthorityrdlength                        = -1;
-static int      hf_pie_niagara_networks_dnsauthorityrdata                           = -1;
-static int      hf_pie_niagara_networks_dnsadditionalname                           = -1;
-static int      hf_pie_niagara_networks_dnsadditionaltype                           = -1;
-static int      hf_pie_niagara_networks_dnsadditionaltypetext                       = -1;
-static int      hf_pie_niagara_networks_dnsadditionalclass                          = -1;
-static int      hf_pie_niagara_networks_dnsadditionalclasstext                      = -1;
-static int      hf_pie_niagara_networks_dnsadditionalttl                            = -1;
-static int      hf_pie_niagara_networks_dnsadditionalrdlength                       = -1;
-static int      hf_pie_niagara_networks_dnsadditionalrdata                          = -1;
-static int      hf_pie_niagara_networks_radiuspackettypecode                        = -1;
-static int      hf_pie_niagara_networks_radiuspackettypecodetext                    = -1;
-static int      hf_pie_niagara_networks_radiuspacketidentifier                      = -1;
-static int      hf_pie_niagara_networks_radiusauthenticator                         = -1;
-static int      hf_pie_niagara_networks_radiususername                              = -1;
-static int      hf_pie_niagara_networks_radiuscallingstationid                      = -1;
-static int      hf_pie_niagara_networks_radiuscalledstationid                       = -1;
-static int      hf_pie_niagara_networks_radiusnasipaddress                          = -1;
-static int      hf_pie_niagara_networks_radiusnasipv6address                        = -1;
-static int      hf_pie_niagara_networks_radiusnasidentifier                         = -1;
-static int      hf_pie_niagara_networks_radiusframedipaddress                       = -1;
-static int      hf_pie_niagara_networks_radiusframedipv6address                     = -1;
-static int      hf_pie_niagara_networks_radiusacctsessionid                         = -1;
-static int      hf_pie_niagara_networks_radiusacctstatustype                        = -1;
-static int      hf_pie_niagara_networks_radiusacctinoctets                          = -1;
-static int      hf_pie_niagara_networks_radiusacctoutoctets                         = -1;
-static int      hf_pie_niagara_networks_radiusacctinpackets                         = -1;
-static int      hf_pie_niagara_networks_radiusacctoutpackets                        = -1;
-static int      hf_pie_niagara_networks_radiusvsavendorid                           = -1;
-static int      hf_pie_niagara_networks_radiusvsaname                               = -1;
-static int      hf_pie_niagara_networks_radiusvsaid                                 = -1;
-static int      hf_pie_niagara_networks_radiusvsavalue                              = -1;
-
-static int      hf_pie_fastip_meter_version                      = -1;
-static int      hf_pie_fastip_meter_os_sysname                   = -1;
-static int      hf_pie_fastip_meter_os_nodename                  = -1;
-static int      hf_pie_fastip_meter_os_release                   = -1;
-static int      hf_pie_fastip_meter_os_version                   = -1;
-static int      hf_pie_fastip_meter_os_machine                   = -1;
-static int      hf_pie_fastip_epoch_second                       = -1;
-static int      hf_pie_fastip_nic_name                           = -1;
-static int      hf_pie_fastip_nic_id                             = -1;
-static int      hf_pie_fastip_nic_mac                            = -1;
-static int      hf_pie_fastip_nic_ip                             = -1;
+static int      hf_pie_cace;
+static int      hf_pie_cace_local_ipv4_address;
+static int      hf_pie_cace_remote_ipv4_address;
+static int      hf_pie_cace_local_ipv6_address;
+static int      hf_pie_cace_remote_ipv6_address;
+static int      hf_pie_cace_local_port;
+static int      hf_pie_cace_remote_port;
+static int      hf_pie_cace_local_ipv4_id;
+static int      hf_pie_cace_local_icmp_id;
+static int      hf_pie_cace_local_uid;
+static int      hf_pie_cace_local_pid;
+static int      hf_pie_cace_local_username_len;
+static int      hf_pie_cace_local_username;
+static int      hf_pie_cace_local_cmd_len;
+static int      hf_pie_cace_local_cmd;
+
+static int      hf_pie_ntop;
+static int      hf_pie_ntop_src_fragments;
+static int      hf_pie_ntop_dst_fragments;
+static int      hf_pie_ntop_src_to_dst_max_throughput;
+static int      hf_pie_ntop_src_to_dst_min_throughput;
+static int      hf_pie_ntop_src_to_dst_avg_throughput;
+static int      hf_pie_ntop_dst_to_src_max_throughput;
+static int      hf_pie_ntop_dst_to_src_min_throughput;
+static int      hf_pie_ntop_dst_to_src_avg_throughput;
+static int      hf_pie_ntop_num_pkts_up_to_128_bytes;
+static int      hf_pie_ntop_num_pkts_128_to_256_bytes;
+static int      hf_pie_ntop_num_pkts_256_to_512_bytes;
+static int      hf_pie_ntop_num_pkts_512_to_1024_bytes;
+static int      hf_pie_ntop_num_pkts_1024_to_1514_bytes;
+static int      hf_pie_ntop_num_pkts_over_1514_bytes;
+static int      hf_pie_ntop_cumulative_icmp_type;
+static int      hf_pie_ntop_src_ip_country;
+static int      hf_pie_ntop_src_ip_city;
+static int      hf_pie_ntop_dst_ip_country;
+static int      hf_pie_ntop_dst_ip_city;
+static int      hf_pie_ntop_flow_proto_port;
+
+static int      hf_pie_ntop_upstream_tunnel_id;
+static int      hf_pie_ntop_longest_flow_pkt;
+static int      hf_pie_ntop_shortest_flow_pkt;
+static int      hf_pie_ntop_retransmitted_in_pkts;
+static int      hf_pie_ntop_retransmitted_out_pkts;
+static int      hf_pie_ntop_ooorder_in_pkts;
+static int      hf_pie_ntop_ooorder_out_pkts;
+static int      hf_pie_ntop_untunneled_protocol;
+static int      hf_pie_ntop_untunneled_ipv4_src_addr;
+static int      hf_pie_ntop_untunneled_l4_src_port;
+static int      hf_pie_ntop_untunneled_ipv4_dst_addr;
+static int      hf_pie_ntop_untunneled_l4_dst_port;
+
+static int      hf_pie_ntop_l7_proto;
+static int      hf_pie_ntop_l7_proto_name;
+static int      hf_pie_ntop_downstram_tunnel_id;
+static int      hf_pie_ntop_flow_user_name;
+static int      hf_pie_ntop_flow_server_name;
+static int      hf_pie_ntop_client_nw_latency_ms;
+static int      hf_pie_ntop_server_nw_latency_ms;
+static int      hf_pie_ntop_appl_latency_ms;
+static int      hf_pie_ntop_plugin_name;
+static int      hf_pie_ntop_retransmitted_in_bytes;
+static int      hf_pie_ntop_retransmitted_out_bytes;
+static int      hf_pie_ntop_sip_call_id;
+static int      hf_pie_ntop_sip_calling_party;
+static int      hf_pie_ntop_sip_called_party;
+static int      hf_pie_ntop_sip_rtp_codecs;
+static int      hf_pie_ntop_sip_invite_time;
+static int      hf_pie_ntop_sip_trying_time;
+static int      hf_pie_ntop_sip_ringing_time;
+
+static int      hf_pie_ntop_sip_invite_ok_time;
+static int      hf_pie_ntop_sip_invite_failure_time;
+static int      hf_pie_ntop_sip_bye_time;
+static int      hf_pie_ntop_sip_bye_ok_time;
+static int      hf_pie_ntop_sip_cancel_time;
+static int      hf_pie_ntop_sip_cancel_ok_time;
+static int      hf_pie_ntop_sip_rtp_ipv4_src_addr;
+static int      hf_pie_ntop_sip_rtp_l4_src_port;
+static int      hf_pie_ntop_sip_rtp_ipv4_dst_addr;
+static int      hf_pie_ntop_sip_rtp_l4_dst_port;
+static int      hf_pie_ntop_sip_response_code;
+static int      hf_pie_ntop_sip_reason_cause;
+static int      hf_pie_ntop_rtp_first_seq;
+static int      hf_pie_ntop_rtp_first_ts;
+static int      hf_pie_ntop_rtp_last_seq;
+static int      hf_pie_ntop_rtp_last_ts;
+static int      hf_pie_ntop_rtp_in_jitter;
+static int      hf_pie_ntop_rtp_out_jitter;
+static int      hf_pie_ntop_rtp_in_pkt_lost;
+static int      hf_pie_ntop_rtp_out_pkt_lost;
+static int      hf_pie_ntop_rtp_out_payload_type;
+static int      hf_pie_ntop_rtp_in_max_delta;
+static int      hf_pie_ntop_rtp_out_max_delta;
+static int      hf_pie_ntop_rtp_in_payload_type;
+static int      hf_pie_ntop_src_proc_id;
+static int      hf_pie_ntop_src_proc_name;
+static int      hf_pie_ntop_http_url;
+static int      hf_pie_ntop_http_ret_code;
+static int      hf_pie_ntop_http_referer;
+static int      hf_pie_ntop_http_ua;
+static int      hf_pie_ntop_http_mime;
+static int      hf_pie_ntop_smtp_mail_from;
+static int      hf_pie_ntop_smtp_rcpt_to;
+static int      hf_pie_ntop_http_host;
+static int      hf_pie_ntop_ssl_server_name;
+static int      hf_pie_ntop_bittorrent_hash;
+
+static int      hf_pie_ntop_mysql_srv_version;
+static int      hf_pie_ntop_mysql_username;
+static int      hf_pie_ntop_mysql_db;
+static int      hf_pie_ntop_mysql_query;
+static int      hf_pie_ntop_mysql_response;
+
+static int      hf_pie_ntop_oracle_username;
+static int      hf_pie_ntop_oracle_query;
+static int      hf_pie_ntop_oracle_resp_code;
+static int      hf_pie_ntop_oracle_resp_string;
+static int      hf_pie_ntop_oracle_query_duration;
+static int      hf_pie_ntop_dns_query;
+static int      hf_pie_ntop_dns_query_id;
+static int      hf_pie_ntop_dns_query_type;
+static int      hf_pie_ntop_dns_ret_code;
+static int      hf_pie_ntop_dns_num_answers;
+static int      hf_pie_ntop_pop_user;
+
+static int      hf_pie_ntop_gtpv1_req_msg_type;
+static int      hf_pie_ntop_gtpv1_rsp_msg_type;
+static int      hf_pie_ntop_gtpv1_c2s_teid_data;
+static int      hf_pie_ntop_gtpv1_c2s_teid_ctrl;
+static int      hf_pie_ntop_gtpv1_s2c_teid_data;
+static int      hf_pie_ntop_gtpv1_s2c_teid_ctrl;
+static int      hf_pie_ntop_gtpv1_end_user_ip;
+static int      hf_pie_ntop_gtpv1_end_user_imsi;
+static int      hf_pie_ntop_gtpv1_end_user_msisdn;
+static int      hf_pie_ntop_gtpv1_end_user_imei;
+static int      hf_pie_ntop_gtpv1_apn_name;
+static int      hf_pie_ntop_gtpv1_rai_mcc;
+static int      hf_pie_ntop_gtpv1_rai_mnc;
+
+static int      hf_pie_ntop_gtpv1_uli_cell_lac;
+static int      hf_pie_ntop_gtpv1_uli_cell_ci;
+static int      hf_pie_ntop_gtpv1_uli_sac;
+static int      hf_pie_ntop_gtpv1_rai_type;
+static int      hf_pie_ntop_radius_req_msg_type;
+static int      hf_pie_ntop_radius_rsp_msg_type;
+static int      hf_pie_ntop_radius_user_name;
+static int      hf_pie_ntop_radius_calling_station_id;
+static int      hf_pie_ntop_radius_called_station_id;
+static int      hf_pie_ntop_radius_nas_ip_addr;
+static int      hf_pie_ntop_radius_nas_identifier;
+static int      hf_pie_ntop_radius_user_imsi;
+static int      hf_pie_ntop_radius_user_imei;
+static int      hf_pie_ntop_radius_framed_ip_addr;
+static int      hf_pie_ntop_radius_acct_session_id;
+static int      hf_pie_ntop_radius_acct_status_type;
+static int      hf_pie_ntop_radius_acct_in_octects;
+static int      hf_pie_ntop_radius_acct_out_octects;
+static int      hf_pie_ntop_radius_acct_in_pkts;
+static int      hf_pie_ntop_radius_acct_out_pkts;
+static int      hf_pie_ntop_imap_login;
+
+static int      hf_pie_ntop_gtpv2_req_msg_type;
+static int      hf_pie_ntop_gtpv2_rsp_msg_type;
+static int      hf_pie_ntop_gtpv2_c2s_s1u_gtpu_teid;
+static int      hf_pie_ntop_gtpv2_c2s_s1u_gtpu_ip;
+static int      hf_pie_ntop_gtpv2_s2c_s1u_gtpu_teid;
+static int      hf_pie_ntop_gtpv2_s2c_s1u_gtpu_ip;
+static int      hf_pie_ntop_gtpv2_end_user_imsi;
+static int      hf_pie_ntop_gtpv2_and_user_msisdn;
+static int      hf_pie_ntop_gtpv2_apn_name;
+static int      hf_pie_ntop_gtpv2_uli_mcc;
+static int      hf_pie_ntop_gtpv2_uli_mnc;
+static int      hf_pie_ntop_gtpv2_uli_cell_tac;
+static int      hf_pie_ntop_gtpv2_uli_cell_id;
+static int      hf_pie_ntop_gtpv2_rat_type;
+static int      hf_pie_ntop_gtpv2_pdn_ip;
+static int      hf_pie_ntop_gtpv2_end_user_imei;
+
+static int      hf_pie_ntop_src_as_path_1;
+static int      hf_pie_ntop_src_as_path_2;
+static int      hf_pie_ntop_src_as_path_3;
+static int      hf_pie_ntop_src_as_path_4;
+static int      hf_pie_ntop_src_as_path_5;
+static int      hf_pie_ntop_src_as_path_6;
+static int      hf_pie_ntop_src_as_path_7;
+static int      hf_pie_ntop_src_as_path_8;
+static int      hf_pie_ntop_src_as_path_9;
+static int      hf_pie_ntop_src_as_path_10;
+static int      hf_pie_ntop_dst_as_path_1;
+static int      hf_pie_ntop_dst_as_path_2;
+static int      hf_pie_ntop_dst_as_path_3;
+static int      hf_pie_ntop_dst_as_path_4;
+static int      hf_pie_ntop_dst_as_path_5;
+static int      hf_pie_ntop_dst_as_path_6;
+static int      hf_pie_ntop_dst_as_path_7;
+static int      hf_pie_ntop_dst_as_path_8;
+static int      hf_pie_ntop_dst_as_path_9;
+static int      hf_pie_ntop_dst_as_path_10;
+
+static int      hf_pie_ntop_mysql_appl_latency_usec;
+static int      hf_pie_ntop_gtpv0_req_msg_type;
+static int      hf_pie_ntop_gtpv0_rsp_msg_type;
+static int      hf_pie_ntop_gtpv0_tid;
+static int      hf_pie_ntop_gtpv0_end_user_ip;
+static int      hf_pie_ntop_gtpv0_end_user_msisdn;
+static int      hf_pie_ntop_gtpv0_apn_name;
+static int      hf_pie_ntop_gtpv0_rai_mcc;
+static int      hf_pie_ntop_gtpv0_rai_mnc;
+static int      hf_pie_ntop_gtpv0_rai_cell_lac;
+static int      hf_pie_ntop_gtpv0_rai_cell_rac;
+static int      hf_pie_ntop_gtpv0_response_cause;
+static int      hf_pie_ntop_gtpv1_response_cause;
+static int      hf_pie_ntop_gtpv2_response_cause;
+static int      hf_pie_ntop_num_pkts_ttl_5_32;
+static int      hf_pie_ntop_num_pkts_ttl_32_64;
+static int      hf_pie_ntop_num_pkts_ttl_64_96;
+static int      hf_pie_ntop_num_pkts_ttl_96_128;
+static int      hf_pie_ntop_num_pkts_ttl_128_160;
+static int      hf_pie_ntop_num_pkts_ttl_160_192;
+static int      hf_pie_ntop_num_pkts_ttl_192_224;
+static int      hf_pie_ntop_num_pkts_ttl_224_255;
+static int      hf_pie_ntop_gtpv1_rai_lac;
+static int      hf_pie_ntop_gtpv1_rai_rac;
+static int      hf_pie_ntop_gtpv1_uli_mcc;
+static int      hf_pie_ntop_gtpv1_uli_mnc;
+static int      hf_pie_ntop_num_pkts_ttl_2_5;
+static int      hf_pie_ntop_num_pkts_ttl_eq_1;
+static int      hf_pie_ntop_rtp_sip_call_id;
+static int      hf_pie_ntop_in_src_osi_sap;
+static int      hf_pie_ntop_out_dst_osi_sap;
+
+static int      hf_pie_ntop_whois_das_domain;
+static int      hf_pie_ntop_dns_ttl_answer;
+static int      hf_pie_ntop_dhcp_client_mac;
+static int      hf_pie_ntop_dhcp_client_ip;
+static int      hf_pie_ntop_dhcp_client_name;
+static int      hf_pie_ntop_ftp_login;
+static int      hf_pie_ntop_ftp_password;
+static int      hf_pie_ntop_ftp_command;
+static int      hf_pie_ntop_ftp_command_ret_code;
+static int      hf_pie_ntop_http_method;
+static int      hf_pie_ntop_http_site;
+static int      hf_pie_ntop_sip_c_ip;
+static int      hf_pie_ntop_sip_call_state;
+static int      hf_pie_ntop_rtp_in_mos;
+static int      hf_pie_ntop_rtp_in_r_factor;
+static int      hf_pie_ntop_src_proc_user_name;
+static int      hf_pie_ntop_src_father_proc_pid;
+static int      hf_pie_ntop_src_father_proc_name;
+static int      hf_pie_ntop_dst_proc_pid;
+static int      hf_pie_ntop_dst_proc_name;
+static int      hf_pie_ntop_dst_proc_user_name;
+static int      hf_pie_ntop_dst_father_proc_pid;
+static int      hf_pie_ntop_dst_father_proc_name;
+static int      hf_pie_ntop_rtp_rtt;
+static int      hf_pie_ntop_rtp_in_transit;
+static int      hf_pie_ntop_rtp_out_transit;
+static int      hf_pie_ntop_src_proc_actual_memory;
+static int      hf_pie_ntop_src_proc_peak_memory;
+static int      hf_pie_ntop_src_proc_average_cpu_load;
+static int      hf_pie_ntop_src_proc_num_page_faults;
+static int      hf_pie_ntop_dst_proc_actual_memory;
+static int      hf_pie_ntop_dst_proc_peak_memory;
+static int      hf_pie_ntop_dst_proc_average_cpu_load;
+static int      hf_pie_ntop_dst_proc_num_page_faults;
+static int      hf_pie_ntop_duration_in;
+static int      hf_pie_ntop_duration_out;
+static int      hf_pie_ntop_src_proc_pctg_iowait;
+static int      hf_pie_ntop_dst_proc_pctg_iowait;
+static int      hf_pie_ntop_rtp_dtmf_tones;
+static int      hf_pie_ntop_untunneled_ipv6_src_addr;
+static int      hf_pie_ntop_untunneled_ipv6_dst_addr;
+static int      hf_pie_ntop_dns_response;
+
+static int      hf_pie_ntop_diameter_req_msg_type;
+static int      hf_pie_ntop_diameter_rsp_msg_type;
+static int      hf_pie_ntop_diameter_req_origin_host;
+static int      hf_pie_ntop_diameter_rsp_origin_host;
+static int      hf_pie_ntop_diameter_req_user_name;
+static int      hf_pie_ntop_diameter_rsp_result_code;
+static int      hf_pie_ntop_diameter_exp_res_vendor_id;
+static int      hf_pie_ntop_diameter_exp_res_result_code;
+
+static int      hf_pie_ntop_s1ap_enb_ue_s1ap_id;
+static int      hf_pie_ntop_s1ap_mme_ue_s1ap_id;
+static int      hf_pie_ntop_s1ap_msg_emm_type_mme_to_enb;
+static int      hf_pie_ntop_s1ap_msg_esm_type_mme_to_enb;
+static int      hf_pie_ntop_s1ap_msg_emm_type_enb_to_mme;
+static int      hf_pie_ntop_s1ap_msg_esm_type_enb_to_mme;
+static int      hf_pie_ntop_s1ap_cause_enb_to_mme;
+static int      hf_pie_ntop_s1ap_detailed_cause_enb_to_mme;
+
+static int      hf_pie_ntop_tcp_win_min_in;
+static int      hf_pie_ntop_tcp_win_max_in;
+static int      hf_pie_ntop_tcp_win_mss_in;
+static int      hf_pie_ntop_tcp_win_scale_in;
+static int      hf_pie_ntop_tcp_win_min_out;
+static int      hf_pie_ntop_tcp_win_max_out;
+static int      hf_pie_ntop_tcp_win_mss_out;
+static int      hf_pie_ntop_tcp_win_scale_out;
+static int      hf_pie_ntop_dhcp_remote_id;
+static int      hf_pie_ntop_dhcp_subscriber_id;
+static int      hf_pie_ntop_src_proc_uid;
+static int      hf_pie_ntop_dst_proc_uid;
+static int      hf_pie_ntop_application_name;
+static int      hf_pie_ntop_user_name;
+static int      hf_pie_ntop_dhcp_message_type;
+static int      hf_pie_ntop_rtp_in_pkt_drop;
+static int      hf_pie_ntop_rtp_out_pkt_drop;
+static int      hf_pie_ntop_rtp_out_mos;
+static int      hf_pie_ntop_rtp_out_r_factor;
+static int      hf_pie_ntop_rtp_mos;
+static int      hf_pie_ntop_gptv2_s5_s8_gtpc_teid;
+static int      hf_pie_ntop_rtp_r_factor;
+static int      hf_pie_ntop_rtp_ssrc;
+static int      hf_pie_ntop_payload_hash;
+static int      hf_pie_ntop_gtpv2_c2s_s5_s8_gtpu_teid;
+static int      hf_pie_ntop_gtpv2_s2c_s5_s8_gtpu_teid;
+static int      hf_pie_ntop_gtpv2_c2s_s5_s8_gtpu_ip;
+static int      hf_pie_ntop_gtpv2_s2c_s5_s8_gtpu_ip;
+static int      hf_pie_ntop_src_as_map;
+static int      hf_pie_ntop_dst_as_map;
+static int      hf_pie_ntop_diameter_hop_by_hop_id;
+static int      hf_pie_ntop_upstream_session_id;
+static int      hf_pie_ntop_downstream_session_id;
+static int      hf_pie_ntop_src_ip_long;
+static int      hf_pie_ntop_src_ip_lat;
+static int      hf_pie_ntop_dst_ip_long;
+static int      hf_pie_ntop_dst_ip_lat;
+
+static int      hf_pie_ntop_diameter_clr_cancel_type;
+static int      hf_pie_ntop_diameter_clr_flags;
+static int      hf_pie_ntop_gtpv2_c2s_s5_s8_gtpc_ip;
+static int      hf_pie_ntop_gtpv2_s2c_s5_s8_gtpc_ip;
+static int      hf_pie_ntop_gtpv2_c2s_s5_s8_sgw_gtpu_teid;
+static int      hf_pie_ntop_gtpv2_s2c_s5_s8_sgw_gtpu_teid;
+static int      hf_pie_ntop_gtpv2_c2s_s5_s8_sgw_gtpu_ip;
+static int      hf_pie_ntop_gtpv2_s2c_s5_s8_sgw_gtpu_ip;
+
+static int      hf_pie_ntop_http_x_forwarded_for;
+static int      hf_pie_ntop_http_via;
+static int      hf_pie_ntop_ssdp_host;
+static int      hf_pie_ntop_ssdp_usn;
+static int      hf_pie_ntop_netbios_query_name;
+static int      hf_pie_ntop_netbios_query_type;
+static int      hf_pie_ntop_netbios_response;
+static int      hf_pie_ntop_netbios_query_os;
+static int      hf_pie_ntop_ssdp_server;
+static int      hf_pie_ntop_ssdp_type;
+static int      hf_pie_ntop_ssdp_method;
+static int      hf_pie_ntop_nprobe_ipv4_address;
+
+static int      hf_pie_plixer;
+static int      hf_pie_plixer_client_ip_v4;
+static int      hf_pie_plixer_client_hostname;     /* string */
+static int      hf_pie_plixer_partner_name;     /* string */
+static int      hf_pie_plixer_server_hostname;     /* string */
+static int      hf_pie_plixer_server_ip_v4;
+static int      hf_pie_plixer_recipient_address;     /* string */
+static int      hf_pie_plixer_event_id;
+static int      hf_pie_plixer_msgid;     /* string */
+
+static int      hf_pie_plixer_priority;
+static int      hf_pie_plixer_recipient_report_status;
+static int      hf_pie_plixer_number_recipients;
+static int      hf_pie_plixer_origination_time;
+static int      hf_pie_plixer_encryption;     /* string */
+static int      hf_pie_plixer_service_version;     /* string */
+static int      hf_pie_plixer_linked_msgid;     /* string */
+static int      hf_pie_plixer_message_subject;     /* string */
+static int      hf_pie_plixer_sender_address;     /* string */
+static int      hf_pie_plixer_date_time;
+
+static int      hf_pie_ixia;
+static int      hf_pie_ixia_l7_application_id;
+static int      hf_pie_ixia_l7_application_name;
+static int      hf_pie_ixia_source_ip_country_code;
+static int      hf_pie_ixia_source_ip_country_name;
+static int      hf_pie_ixia_source_ip_region_code;
+static int      hf_pie_ixia_source_ip_region_name;
+static int      hf_pie_ixia_source_ip_city_name;
+static int      hf_pie_ixia_source_ip_latitude;
+static int      hf_pie_ixia_source_ip_longitude;
+static int      hf_pie_ixia_destination_ip_country_code;
+static int      hf_pie_ixia_destination_ip_country_name;
+static int      hf_pie_ixia_destination_ip_region_code;
+static int      hf_pie_ixia_destination_ip_region_name;
+static int      hf_pie_ixia_destination_ip_city_name;
+static int      hf_pie_ixia_destination_ip_latitude;
+static int      hf_pie_ixia_destination_ip_longitude;
+static int      hf_pie_ixia_os_device_id;
+static int      hf_pie_ixia_os_device_name;
+static int      hf_pie_ixia_browser_id;
+static int      hf_pie_ixia_browser_name;
+static int      hf_pie_ixia_reverse_octet_delta_count;
+static int      hf_pie_ixia_reverse_packet_delta_count;
+static int      hf_pie_ixia_conn_encryption_type;
+static int      hf_pie_ixia_encryption_cipher;
+static int      hf_pie_ixia_encryption_keylen;
+static int      hf_pie_ixia_imsi;
+static int      hf_pie_ixia_user_agent;
+static int      hf_pie_ixia_host_name;
+static int      hf_pie_ixia_uri;
+static int      hf_pie_ixia_dns_txt;
+static int      hf_pie_ixia_source_as_name;
+static int      hf_pie_ixia_dest_as_name;
+static int      hf_pie_ixia_transaction_latency;
+static int      hf_pie_ixia_dns_query_names;
+static int      hf_pie_ixia_dns_answer_names;
+static int      hf_pie_ixia_dns_classes;
+static int      hf_pie_ixia_threat_type;
+static int      hf_pie_ixia_threat_ipv4;
+static int      hf_pie_ixia_threat_ipv6;
+static int      hf_pie_ixia_http_session;
+static int      hf_pie_ixia_request_time;
+static int      hf_pie_ixia_http_connection;
+static int      hf_pie_ixia_http_accept;
+static int      hf_pie_ixia_http_accept_language;
+static int      hf_pie_ixia_http_accept_encoding;
+static int      hf_pie_ixia_http_reason;
+static int      hf_pie_ixia_http_server;
+static int      hf_pie_ixia_http_content_length;
+static int      hf_pie_ixia_http_referer;
+static int      hf_pie_ixia_http_useragent_cpu;
+static int      hf_pie_ixia_dns_records;
+static int      hf_pie_ixia_dns_name;
+static int      hf_pie_ixia_dns_ipv4;
+static int      hf_pie_ixia_dns_ipv6;
+static int      hf_pie_ixia_dns_packets;
+static int      hf_pie_ixia_dns_transaction_id;
+static int      hf_pie_ixia_dns_opcode;
+static int      hf_pie_ixia_dns_request_type;
+static int      hf_pie_ixia_dns_response_code;
+static int      hf_pie_ixia_dns_record_ttl;
+static int      hf_pie_ixia_dns_raw_rdata;
+static int      hf_pie_ixia_dns_response_type;
+static int      hf_pie_ixia_dns_qdcount;
+static int      hf_pie_ixia_dns_ancount;
+static int      hf_pie_ixia_dns_nscount;
+static int      hf_pie_ixia_dns_arcount;
+static int      hf_pie_ixia_dns_auth_answer;
+static int      hf_pie_ixia_dns_trucation;
+static int      hf_pie_ixia_dns_recursion_desired;
+static int      hf_pie_ixia_dns_recursion_avail;
+static int      hf_pie_ixia_dns_rdata_len;
+static int      hf_pie_ixia_dns_questions;
+static int      hf_pie_ixia_dns_query_type;
+static int      hf_pie_ixia_dns_query_name;
+static int      hf_pie_ixia_dns_section_type;
+static int      hf_pie_ixia_dns_qr_flag;
+static int      hf_pie_ixia_dns_canonical_name;
+static int      hf_pie_ixia_dns_mx_domain;
+static int      hf_pie_ixia_tls_sni;
+static int      hf_pie_ixia_tls_srvr_cert;
+static int      hf_pie_ixia_tls_srvr_cert_issuer;
+static int      hf_pie_ixia_tls_srvr_cert_issuer_attr;
+static int      hf_pie_ixia_tls_srvr_cert_issuer_val;
+static int      hf_pie_ixia_tls_srvr_cert_subject;
+static int      hf_pie_ixia_tls_srvr_cert_subject_attr;
+static int      hf_pie_ixia_tls_srvr_cert_subject_val;
+static int      hf_pie_ixia_tls_srvr_cert_vld_nt_bfr;
+static int      hf_pie_ixia_tls_srvr_cert_vld_nt_aftr;
+static int      hf_pie_ixia_tls_srvr_cert_srl_num;
+static int      hf_pie_ixia_tls_srvr_cert_sign_algo;
+static int      hf_pie_ixia_tls_srvr_cert_subj_pki_algo;
+static int      hf_pie_ixia_tls_srvr_cert_altnames;
+static int      hf_pie_ixia_tls_srvr_cert_altnames_attr;
+static int      hf_pie_ixia_tls_srvr_cert_altnames_val;
+static int      hf_pie_ixia_dhcp_client_id;
+static int      hf_pie_ixia_dhcp_client_mac;
+static int      hf_pie_ixia_dhcp_messages;
+static int      hf_pie_ixia_dhcp_message_timestamp;
+static int      hf_pie_ixia_dhcp_message_type;
+static int      hf_pie_ixia_dhcp_lease_duration;
+static int      hf_pie_ixia_dhcp_servername;
+static int      hf_pie_ixia_dhcp_agent_circuit_id;
+static int      hf_pie_ixia_radius_events;
+static int      hf_pie_ixia_radius_timestamp;
+static int      hf_pie_ixia_radius_event_timestamp;
+static int      hf_pie_ixia_radius_username;
+static int      hf_pie_ixia_radius_nas_ipv4;
+static int      hf_pie_ixia_radius_service_type;
+static int      hf_pie_ixia_radius_framed_protocol;
+static int      hf_pie_ixia_radius_framed_ip;
+static int      hf_pie_ixia_radius_filter_id;
+static int      hf_pie_ixia_radius_reply_message;
+static int      hf_pie_ixia_radius_called_station_id;
+static int      hf_pie_ixia_radius_calling_station_id;
+static int      hf_pie_ixia_email_messages;
+static int      hf_pie_ixia_email_msg_id;
+static int      hf_pie_ixia_email_msg_date;
+static int      hf_pie_ixia_email_msg_subject;
+static int      hf_pie_ixia_email_msg_to;
+static int      hf_pie_ixia_email_msg_from;
+static int      hf_pie_ixia_email_msg_cc;
+static int      hf_pie_ixia_email_msg_bcc;
+static int      hf_pie_ixia_email_msg_attachments;
+static int      hf_pie_ixia_ja3_fingerprint_string;
+static int      hf_pie_ixia_tcp_conn_setup_time;
+static int      hf_pie_ixia_tcp_app_response_time;
+static int      hf_pie_ixia_tcp_retrans_pkt_count;
+static int      hf_pie_ixia_conn_avg_rtt;
+static int      hf_pie_ixia_udpAppResponseTime;
+static int      hf_pie_ixia_quicConnSetupTime;
+static int      hf_pie_ixia_quicConnRTT;
+static int      hf_pie_ixia_quicAppResponseTime;
+static int      hf_pie_ixia_matchedFilterName;
+static int      hf_pie_ixia_gtp_IMSI;
+static int      hf_pie_ixia_gtp_ULI_SAI_SAC;
+static int      hf_pie_ixia_gtp_ULI_RAI_RAC;
+static int      hf_pie_ixia_gtp_ULI_TAC;
+static int      hf_pie_ixia_gtp_ULI_ECGI_E_NODEB_ID;
+static int      hf_pie_ixia_gtp_ULI_CELL_ID;
+static int      hf_pie_ixia_gtp_ULI_LAC;
+static int      hf_pie_ixia_gtp_ULI_MCC;
+static int      hf_pie_ixia_gtp_ULI_MNC;
+static int      hf_pie_ixia_gtp_MSISDN;
+static int      hf_pie_ixia_gtp_IMEI;
+static int      hf_pie_ixia_gtp_RAT_type;
+static int      hf_pie_ixia_gtp_ep_gen;
+static int      hf_pie_ixia_gtp_up_TEID;
+static int      hf_pie_ixia_gtp_down_TEID;
+static int      hf_pie_ixia_gtp_up_ipv4_addr;
+static int      hf_pie_ixia_gtp_down_ipv4_addr;
+static int      hf_pie_ixia_gtp_up_ipv6_addr;
+static int      hf_pie_ixia_gtp_down_ipv6_addr;
+static int      hf_pie_ixia_gtp_up_QCI_QFI;
+static int      hf_pie_ixia_gtp_down_QCI_QFI;
+static int      hf_pie_ixia_gtp_up_APN_DNN;
+static int      hf_pie_ixia_gtp_down_APN_DNN;
+static int      hf_pie_ixia_gtp_NSSAI_SD;
+static int      hf_pie_ixia_gtp_NSSAI_SST;
+static int      hf_pie_ixia_gtp_5QI_up;
+static int      hf_pie_ixia_gtp_5QI_down;
+static int      hf_pie_ixia_stun_response;
+static int      hf_pie_ixia_stun_reflexive_ta_ipv4;
+static int      hf_pie_ixia_stun_reflexive_ta_ipv6;
+static int      hf_pie_ixia_stun_reflexive_ta_port;
+static int      hf_pie_ixia_http_alt_svc;
+static int      hf_pie_ixia_unidirectional;
+static int      hf_pie_ixia_http_tls_server_rand;
+static int      hf_pie_ixia_http_tls_session_id;
+static int      hf_pie_ixia_sip_to;
+static int      hf_pie_ixia_sip_from;
+static int      hf_pie_ixia_sip_call_id;
+static int      hf_pie_ixia_sip_content_type;
+static int      hf_pie_ixia_sip_route;
+static int      hf_pie_ixia_sip_geolocation;
+
+static int      hf_pie_netscaler;
+static int      hf_pie_netscaler_roundtriptime;
+static int      hf_pie_netscaler_transactionid;
+static int      hf_pie_netscaler_httprequrl;
+static int      hf_pie_netscaler_httpreqcookie;
+static int      hf_pie_netscaler_flowflags;
+static int      hf_pie_netscaler_connectionid;
+static int      hf_pie_netscaler_syslogpriority;
+static int      hf_pie_netscaler_syslogmessage;
+static int      hf_pie_netscaler_syslogtimestamp;
+static int      hf_pie_netscaler_httpreqreferer;
+static int      hf_pie_netscaler_httpreqmethod;
+static int      hf_pie_netscaler_httpreqhost;
+static int      hf_pie_netscaler_httprequseragent;
+static int      hf_pie_netscaler_httprspstatus;
+static int      hf_pie_netscaler_httprsplen;
+static int      hf_pie_netscaler_serverttfb;
+static int      hf_pie_netscaler_serverttlb;
+static int      hf_pie_netscaler_appnameincarnationnumber;
+static int      hf_pie_netscaler_appnameappid;
+static int      hf_pie_netscaler_appname;
+static int      hf_pie_netscaler_httpreqrcvfb;
+static int      hf_pie_netscaler_httpreqforwfb;
+static int      hf_pie_netscaler_httpresrcvfb;
+static int      hf_pie_netscaler_httpresforwfb;
+static int      hf_pie_netscaler_httpreqrcvlb;
+static int      hf_pie_netscaler_httpreqforwlb;
+static int      hf_pie_netscaler_mainpageid;
+static int      hf_pie_netscaler_mainpagecoreid;
+static int      hf_pie_netscaler_httpclientinteractionstarttime;
+static int      hf_pie_netscaler_httpclientrenderendtime;
+static int      hf_pie_netscaler_httpclientrenderstarttime;
+static int      hf_pie_netscaler_apptemplatename;
+static int      hf_pie_netscaler_httpclientinteractionendtime;
+static int      hf_pie_netscaler_httpresrcvlb;
+static int      hf_pie_netscaler_httpresforwlb;
+static int      hf_pie_netscaler_appunitnameappid;
+static int      hf_pie_netscaler_dbloginflags;
+static int      hf_pie_netscaler_dbreqtype;
+static int      hf_pie_netscaler_dbprotocolname;
+static int      hf_pie_netscaler_dbusername;
+static int      hf_pie_netscaler_dbdatabasename;
+static int      hf_pie_netscaler_dbclthostname;
+static int      hf_pie_netscaler_dbreqstring;
+static int      hf_pie_netscaler_dbrespstatusstring;
+static int      hf_pie_netscaler_dbrespstatus;
+static int      hf_pie_netscaler_dbresplength;
+static int      hf_pie_netscaler_clientrtt;
+static int      hf_pie_netscaler_httpcontenttype;
+static int      hf_pie_netscaler_httpreqauthorization;
+static int      hf_pie_netscaler_httpreqvia;
+static int      hf_pie_netscaler_httpreslocation;
+static int      hf_pie_netscaler_httpressetcookie;
+static int      hf_pie_netscaler_httpressetcookie2;
+static int      hf_pie_netscaler_httpreqxforwardedfor;
+static int      hf_pie_netscaler_connectionchainid;
+static int      hf_pie_netscaler_connectionchainhopcount;
+static int      hf_pie_netscaler_icasessionguid;
+static int      hf_pie_netscaler_icaclientversion;
+static int      hf_pie_netscaler_icaclienttype;
+static int      hf_pie_netscaler_icaclientip;
+static int      hf_pie_netscaler_icaclienthostname;
+static int      hf_pie_netscaler_aaausername;
+static int      hf_pie_netscaler_icadomainname;
+static int      hf_pie_netscaler_icaclientlauncher;
+static int      hf_pie_netscaler_icasessionsetuptime;
+static int      hf_pie_netscaler_icaservername;
+static int      hf_pie_netscaler_icasessionreconnects;
+static int      hf_pie_netscaler_icartt;
+static int      hf_pie_netscaler_icaclientsiderxbytes;
+static int      hf_pie_netscaler_icaclientsidetxbytes;
+static int      hf_pie_netscaler_icaclientsidepacketsretransmit;
+static int      hf_pie_netscaler_icaserversidepacketsretransmit;
+static int      hf_pie_netscaler_icaclientsidertt;
+static int      hf_pie_netscaler_icaserversidertt;
+static int      hf_pie_netscaler_icasessionupdatebeginsec;
+static int      hf_pie_netscaler_icasessionupdateendsec;
+static int      hf_pie_netscaler_icachannelid1;
+static int      hf_pie_netscaler_icachannelid1bytes;
+static int      hf_pie_netscaler_icachannelid2;
+static int      hf_pie_netscaler_icachannelid2bytes;
+static int      hf_pie_netscaler_icachannelid3;
+static int      hf_pie_netscaler_icachannelid3bytes;
+static int      hf_pie_netscaler_icachannelid4;
+static int      hf_pie_netscaler_icachannelid4bytes;
+static int      hf_pie_netscaler_icachannelid5;
+static int      hf_pie_netscaler_icachannelid5bytes;
+static int      hf_pie_netscaler_icaconnectionpriority;
+static int      hf_pie_netscaler_applicationstartupduration;
+static int      hf_pie_netscaler_icalaunchmechanism;
+static int      hf_pie_netscaler_icaapplicationname;
+static int      hf_pie_netscaler_applicationstartuptime;
+static int      hf_pie_netscaler_icaapplicationterminationtype;
+static int      hf_pie_netscaler_icaapplicationterminationtime;
+static int      hf_pie_netscaler_icasessionendtime;
+static int      hf_pie_netscaler_icaclientsidejitter;
+static int      hf_pie_netscaler_icaserversidejitter;
+static int      hf_pie_netscaler_icaappprocessid;
+static int      hf_pie_netscaler_icaappmodulepath;
+static int      hf_pie_netscaler_icadeviceserialno;
+static int      hf_pie_netscaler_msiclientcookie;
+static int      hf_pie_netscaler_icaflags;
+static int      hf_pie_netscaler_icausername;
+static int      hf_pie_netscaler_licensetype;
+static int      hf_pie_netscaler_maxlicensecount;
+static int      hf_pie_netscaler_currentlicenseconsumed;
+static int      hf_pie_netscaler_icanetworkupdatestarttime;
+static int      hf_pie_netscaler_icanetworkupdateendtime;
+static int      hf_pie_netscaler_icaclientsidesrtt;
+static int      hf_pie_netscaler_icaserversidesrtt;
+static int      hf_pie_netscaler_icaclientsidedelay;
+static int      hf_pie_netscaler_icaserversidedelay;
+static int      hf_pie_netscaler_icahostdelay;
+static int      hf_pie_netscaler_icaclientsidewindowsize;
+static int      hf_pie_netscaler_icaserversidewindowsize;
+static int      hf_pie_netscaler_icaclientsidertocount;
+static int      hf_pie_netscaler_icaserversidertocount;
+static int      hf_pie_netscaler_ical7clientlatency;
+static int      hf_pie_netscaler_ical7serverlatency;
+static int      hf_pie_netscaler_httpdomainname;
+static int      hf_pie_netscaler_cacheredirclientconnectioncoreid;
+static int      hf_pie_netscaler_cacheredirclientconnectiontransactionid;
+
+
+static int      hf_pie_barracuda;
+static int      hf_pie_barracuda_timestamp;
+static int      hf_pie_barracuda_logop;
+static int      hf_pie_barracuda_traffictype;
+static int      hf_pie_barracuda_fwrule;
+static int      hf_pie_barracuda_servicename;
+static int      hf_pie_barracuda_reason;
+static int      hf_pie_barracuda_reasontext;
+static int      hf_pie_barracuda_bindipv4address;
+static int      hf_pie_barracuda_bindtransportport;
+static int      hf_pie_barracuda_connipv4address;
+static int      hf_pie_barracuda_conntransportport;
+static int      hf_pie_barracuda_auditcounter;
+
+static int      hf_pie_gigamon;
+static int      hf_pie_gigamon_httprequrl;
+static int      hf_pie_gigamon_httprspstatus;
+static int      hf_pie_gigamon_sslcertificateissuercommonname;
+static int      hf_pie_gigamon_sslcertificatesubjectcommonname;
+static int      hf_pie_gigamon_sslcertificateissuer;
+static int      hf_pie_gigamon_sslcertificatesubject;
+static int      hf_pie_gigamon_sslcertificatevalidnotbefore;
+static int      hf_pie_gigamon_sslcertificatevalidnotafter;
+static int      hf_pie_gigamon_sslcertificateserialnumber;
+static int      hf_pie_gigamon_sslcertificatesignaturealgorithm;
+static int      hf_pie_gigamon_sslcertificatesubjectpubalgorithm;
+static int      hf_pie_gigamon_sslcertificatesubjectpubkeysize;
+static int      hf_pie_gigamon_sslcertificatesubjectaltname;
+static int      hf_pie_gigamon_sslservernameindication;
+static int      hf_pie_gigamon_sslserverversion;
+static int      hf_pie_gigamon_sslservercipher;
+static int      hf_pie_gigamon_sslservercompressionmethod;
+static int      hf_pie_gigamon_sslserversessionid;
+static int      hf_pie_gigamon_dnsidentifier;
+static int      hf_pie_gigamon_dnsopcode;
+static int      hf_pie_gigamon_dnsresponsecode;
+static int      hf_pie_gigamon_dnsqueryname;
+static int      hf_pie_gigamon_dnsresponsename;
+static int      hf_pie_gigamon_dnsresponsettl;
+static int      hf_pie_gigamon_dnsresponseipv4address;
+static int      hf_pie_gigamon_dnsresponseipv6address;
+static int      hf_pie_gigamon_dnsbits;
+static int      hf_pie_gigamon_dnsqdcount;
+static int      hf_pie_gigamon_dnsancount;
+static int      hf_pie_gigamon_dnsnscount;
+static int      hf_pie_gigamon_dnsarcount;
+static int      hf_pie_gigamon_dnsquerytype;
+static int      hf_pie_gigamon_dnsqueryclass;
+static int      hf_pie_gigamon_dnsresponsetype;
+static int      hf_pie_gigamon_dnsresponseclass;
+static int      hf_pie_gigamon_dnsresponserdlength;
+static int      hf_pie_gigamon_dnsresponserdata;
+static int      hf_pie_gigamon_dnsauthorityname;
+static int      hf_pie_gigamon_dnsauthoritytype;
+static int      hf_pie_gigamon_dnsauthorityclass;
+static int      hf_pie_gigamon_dnsauthorityttl;
+static int      hf_pie_gigamon_dnsauthorityrdlength;
+static int      hf_pie_gigamon_dnsauthorityrdata;
+static int      hf_pie_gigamon_dnsadditionalname;
+static int      hf_pie_gigamon_dnsadditionaltype;
+static int      hf_pie_gigamon_dnsadditionalclass;
+static int      hf_pie_gigamon_dnsadditionalttl;
+static int      hf_pie_gigamon_dnsadditionalrdlength;
+static int      hf_pie_gigamon_dnsadditionalrdata;
+
+static int      hf_pie_cisco;
+static int      hf_pie_cisco_transport_packets_lost_counter;
+static int      hf_pie_cisco_transport_rtp_ssrc;
+static int      hf_pie_cisco_transport_rtp_jitter_maximum;
+static int      hf_pie_cisco_transport_rtp_payload_type;
+static int      hf_pie_cisco_transport_rtp_jitter_mean_sum;
+static int      hf_pie_cisco_c3pl_class_cce_id;
+static int      hf_pie_cisco_c3pl_class_name;
+static int      hf_pie_cisco_c3pl_class_type;
+static int      hf_pie_cisco_c3pl_policy_cce_id;
+static int      hf_pie_cisco_c3pl_policy_name;
+static int      hf_pie_cisco_c3pl_policy_type;
+static int      hf_pie_cisco_connection_server_counter_responses;
+static int      hf_pie_cisco_connection_client_counter_packets_retransmitted;
+static int      hf_pie_cisco_connection_transaction_counter_complete;
+static int      hf_pie_cisco_connection_transaction_duration_sum;
+static int      hf_pie_cisco_connection_delay_response_to_server_histogram_late;
+static int      hf_pie_cisco_connection_delay_response_to_server_sum;
+static int      hf_pie_cisco_connection_delay_application_sum;
+static int      hf_pie_cisco_connection_delay_application_max;
+static int      hf_pie_cisco_connection_delay_response_client_to_server_sum;
+static int      hf_pie_cisco_connection_delay_network_client_to_server_sum;
+static int      hf_pie_cisco_connection_delay_network_to_client_sum;
+static int      hf_pie_cisco_connection_delay_network_to_server_sum;
+static int      hf_pie_cisco_services_waas_segment;
+static int      hf_pie_cisco_services_waas_passthrough_reason;
+static int      hf_pie_cisco_application_http_uri_statistics;
+static int      hf_pie_cisco_application_http_uri_statistics_count;
+static int      hf_pie_cisco_application_category_name;
+static int      hf_pie_cisco_application_sub_category_name;
+static int      hf_pie_cisco_application_group_name;
+static int      hf_pie_cisco_application_http_host;
+static int      hf_pie_cisco_application_http_host_app_id;
+static int      hf_pie_cisco_application_http_host_sub_app_id;
+static int      hf_pie_cisco_connection_client_ipv4_address;
+static int      hf_pie_cisco_connection_server_ipv4_address;
+static int      hf_pie_cisco_connection_client_transport_port;
+static int      hf_pie_cisco_connection_server_transport_port;
+static int      hf_pie_cisco_connection_id;
+static int      hf_pie_cisco_application_traffic_class;
+static int      hf_pie_cisco_application_business_relevance;
+
+static int      hf_pie_niagara_networks;
+static int      hf_pie_niagara_networks_sslservernameindication;
+static int      hf_pie_niagara_networks_sslserverversion;
+static int      hf_pie_niagara_networks_sslserverversiontext;
+static int      hf_pie_niagara_networks_sslservercipher;
+static int      hf_pie_niagara_networks_sslserverciphertext;
+static int      hf_pie_niagara_networks_sslconnectionencryptiontype;
+static int      hf_pie_niagara_networks_sslservercompressionmethod;
+static int      hf_pie_niagara_networks_sslserversessionid;
+static int      hf_pie_niagara_networks_sslcertificateissuer;
+static int      hf_pie_niagara_networks_sslcertificateissuername;
+static int      hf_pie_niagara_networks_sslcertificatesubject;
+static int      hf_pie_niagara_networks_sslcertificatesubjectname;
+static int      hf_pie_niagara_networks_sslcertificatevalidnotbefore;
+static int      hf_pie_niagara_networks_sslcertificatevalidnotafter;
+static int      hf_pie_niagara_networks_sslcertificateserialnumber;
+static int      hf_pie_niagara_networks_sslcertificatesignaturealgorithm;
+static int      hf_pie_niagara_networks_sslcertificatesignaturealgorithmtext;
+static int      hf_pie_niagara_networks_sslcertificatesubjectpublickeysize;
+static int      hf_pie_niagara_networks_sslcertificatesubjectpublicalgorithm;
+static int      hf_pie_niagara_networks_sslcertificatesubjectpublicalgorithmtext;
+static int      hf_pie_niagara_networks_sslcertificatesubjectalgorithmtext;
+static int      hf_pie_niagara_networks_sslcertificatesubjectalternativename;
+static int      hf_pie_niagara_networks_sslcertificatesha1;
+static int      hf_pie_niagara_networks_dnsidentifier;
+static int      hf_pie_niagara_networks_dnsopcode;
+static int      hf_pie_niagara_networks_dnsresponsecode;
+static int      hf_pie_niagara_networks_dnsqueryname;
+static int      hf_pie_niagara_networks_dnsresponsename;
+static int      hf_pie_niagara_networks_dnsresponsettl;
+static int      hf_pie_niagara_networks_dnsresponseipv4addr;
+static int      hf_pie_niagara_networks_dnsresponseipv4addrtext;
+static int      hf_pie_niagara_networks_dnsresponseipv6addr;
+static int      hf_pie_niagara_networks_dnsresponseipv6addrtext;
+static int      hf_pie_niagara_networks_dnsbits;
+static int      hf_pie_niagara_networks_dnsqdcount;
+static int      hf_pie_niagara_networks_dnsancount;
+static int      hf_pie_niagara_networks_dnsnscount;
+static int      hf_pie_niagara_networks_dnsarcount;
+static int      hf_pie_niagara_networks_dnsquerytype;
+static int      hf_pie_niagara_networks_dnsquerytypetext;
+static int      hf_pie_niagara_networks_dnsqueryclass;
+static int      hf_pie_niagara_networks_dnsqueryclasstext;
+static int      hf_pie_niagara_networks_dnsresponsetype;
+static int      hf_pie_niagara_networks_dnsresponsetypetext;
+static int      hf_pie_niagara_networks_dnsresponseclass;
+static int      hf_pie_niagara_networks_dnsresponseclasstext;
+static int      hf_pie_niagara_networks_dnsresponserdlength;
+static int      hf_pie_niagara_networks_dnsresponserdata;
+static int      hf_pie_niagara_networks_dnsauthorityname;
+static int      hf_pie_niagara_networks_dnsauthoritytype;
+static int      hf_pie_niagara_networks_dnsauthoritytypetext;
+static int      hf_pie_niagara_networks_dnsauthorityclass;
+static int      hf_pie_niagara_networks_dnsauthorityclasstext;
+static int      hf_pie_niagara_networks_dnsauthorityttl;
+static int      hf_pie_niagara_networks_dnsauthorityrdlength;
+static int      hf_pie_niagara_networks_dnsauthorityrdata;
+static int      hf_pie_niagara_networks_dnsadditionalname;
+static int      hf_pie_niagara_networks_dnsadditionaltype;
+static int      hf_pie_niagara_networks_dnsadditionaltypetext;
+static int      hf_pie_niagara_networks_dnsadditionalclass;
+static int      hf_pie_niagara_networks_dnsadditionalclasstext;
+static int      hf_pie_niagara_networks_dnsadditionalttl;
+static int      hf_pie_niagara_networks_dnsadditionalrdlength;
+static int      hf_pie_niagara_networks_dnsadditionalrdata;
+static int      hf_pie_niagara_networks_radiuspackettypecode;
+static int      hf_pie_niagara_networks_radiuspackettypecodetext;
+static int      hf_pie_niagara_networks_radiuspacketidentifier;
+static int      hf_pie_niagara_networks_radiusauthenticator;
+static int      hf_pie_niagara_networks_radiususername;
+static int      hf_pie_niagara_networks_radiuscallingstationid;
+static int      hf_pie_niagara_networks_radiuscalledstationid;
+static int      hf_pie_niagara_networks_radiusnasipaddress;
+static int      hf_pie_niagara_networks_radiusnasipv6address;
+static int      hf_pie_niagara_networks_radiusnasidentifier;
+static int      hf_pie_niagara_networks_radiusframedipaddress;
+static int      hf_pie_niagara_networks_radiusframedipv6address;
+static int      hf_pie_niagara_networks_radiusacctsessionid;
+static int      hf_pie_niagara_networks_radiusacctstatustype;
+static int      hf_pie_niagara_networks_radiusacctinoctets;
+static int      hf_pie_niagara_networks_radiusacctoutoctets;
+static int      hf_pie_niagara_networks_radiusacctinpackets;
+static int      hf_pie_niagara_networks_radiusacctoutpackets;
+static int      hf_pie_niagara_networks_radiusvsavendorid;
+static int      hf_pie_niagara_networks_radiusvsaname;
+static int      hf_pie_niagara_networks_radiusvsaid;
+static int      hf_pie_niagara_networks_radiusvsavalue;
+
+static int      hf_pie_fastip_meter_version;
+static int      hf_pie_fastip_meter_os_sysname;
+static int      hf_pie_fastip_meter_os_nodename;
+static int      hf_pie_fastip_meter_os_release;
+static int      hf_pie_fastip_meter_os_version;
+static int      hf_pie_fastip_meter_os_machine;
+static int      hf_pie_fastip_epoch_second;
+static int      hf_pie_fastip_nic_name;
+static int      hf_pie_fastip_nic_id;
+static int      hf_pie_fastip_nic_mac;
+static int      hf_pie_fastip_nic_ip;
 /*
-static int      hf_pie_fastip_collisions                         = -1;
-static int      hf_pie_fastip_errors                             = -1;
+static int      hf_pie_fastip_collisions;
+static int      hf_pie_fastip_errors;
 */
-static int      hf_pie_fastip_nic_driver_name                    = -1;
-static int      hf_pie_fastip_nic_driver_version                 = -1;
-static int      hf_pie_fastip_nic_firmware_version               = -1;
-static int      hf_pie_fastip_meter_os_distribution              = -1;
+static int      hf_pie_fastip_nic_driver_name;
+static int      hf_pie_fastip_nic_driver_version;
+static int      hf_pie_fastip_nic_firmware_version;
+static int      hf_pie_fastip_meter_os_distribution;
 /*
-static int      hf_pie_fastip_bond_interface_mode                = -1;
-static int      hf_pie_fastip_bond_interface_physical_nic_count  = -1;
-static int      hf_pie_fastip_bond_interface_id                  = -1;
+static int      hf_pie_fastip_bond_interface_mode;
+static int      hf_pie_fastip_bond_interface_physical_nic_count;
+static int      hf_pie_fastip_bond_interface_id;
 */
-static int      hf_pie_fastip_tcp_flags                          = -1;
-static int      hf_pie_fastip_tcp_handshake_rtt_usec             = -1;
-static int      hf_pie_fastip_app_rtt_usec                       = -1;
-
-static int      hf_pie_juniper                                   = -1;
-static int      hf_pie_juniper_cpid_16bit                        = -1;
-static int      hf_pie_juniper_cpid_32bit                        = -1;
-static int      hf_pie_juniper_cpdesc_16bit                      = -1;
-static int      hf_pie_juniper_cpdesc_32bit                      = -1;
-
-static int      hf_string_len_short = -1;
-static int      hf_string_len_long  = -1;
-
-static int      hf_template_frame = -1;
-
-static expert_field ei_cflow_entries                                   = EI_INIT;
-static expert_field ei_cflow_options                                   = EI_INIT;
-static expert_field ei_cflow_flowset_length                            = EI_INIT;
-static expert_field ei_cflow_scopes                                    = EI_INIT;
-static expert_field ei_cflow_template_ipfix_scope_field_count_too_many = EI_INIT;
-static expert_field ei_cflow_template_ipfix_scope_field_count          = EI_INIT;
-static expert_field ei_cflow_no_flow_information                       = EI_INIT;
-static expert_field ei_cflow_mpls_label_bad_length                     = EI_INIT;
-static expert_field ei_cflow_flowsets_impossible                       = EI_INIT;
-static expert_field ei_cflow_no_template_found                         = EI_INIT;
-static expert_field ei_transport_bytes_out_of_order                    = EI_INIT;
-static expert_field ei_unexpected_sequence_number                      = EI_INIT;
-static expert_field ei_cflow_subtemplate_bad_length                    = EI_INIT;
+static int      hf_pie_fastip_tcp_flags;
+static int      hf_pie_fastip_tcp_handshake_rtt_usec;
+static int      hf_pie_fastip_app_rtt_usec;
+
+static int      hf_pie_juniper;
+static int      hf_pie_juniper_cpid_16bit;
+static int      hf_pie_juniper_cpid_32bit;
+static int      hf_pie_juniper_cpdesc_16bit;
+static int      hf_pie_juniper_cpdesc_32bit;
+
+static int      hf_string_len_short;
+static int      hf_string_len_long;
+
+static int      hf_template_frame;
+
+static expert_field ei_cflow_entries;
+static expert_field ei_cflow_options;
+static expert_field ei_cflow_flowset_length;
+static expert_field ei_cflow_scopes;
+static expert_field ei_cflow_template_ipfix_scope_field_count_too_many;
+static expert_field ei_cflow_template_ipfix_scope_field_count;
+static expert_field ei_cflow_no_flow_information;
+static expert_field ei_cflow_mpls_label_bad_length;
+static expert_field ei_cflow_flowsets_impossible;
+static expert_field ei_cflow_no_template_found;
+static expert_field ei_transport_bytes_out_of_order;
+static expert_field ei_unexpected_sequence_number;
+static expert_field ei_cflow_subtemplate_bad_length;
 
 static const value_string special_mpls_top_label_type[] = {
     {0, "Unknown"},
diff --git a/epan/dissectors/packet-netgear-ensemble.c b/epan/dissectors/packet-netgear-ensemble.c
index 43effaf07c..51ae43ee9c 100644
--- a/epan/dissectors/packet-netgear-ensemble.c
+++ b/epan/dissectors/packet-netgear-ensemble.c
@@ -21,26 +21,26 @@ static dissector_handle_t nge_handle;
 
 #define NETGEAR_ENSEMBLE_PORT 4554
 
-static int proto_nge = -1;
-
-static int hf_nge_version = -1;
-static int hf_nge_unknown = -1;
-static int hf_nge_unknown_int32 = -1;
-static int hf_nge_sequence = -1;
-static int hf_nge_tlv_length = -1;
-static int hf_nge_ensemble_name = -1;
-static int hf_nge_firmware_name = -1;
-static int hf_nge_region_name = -1;
-static int hf_nge_firmware_version = -1;
-static int hf_nge_ap_name = -1;
-static int hf_nge_uptime = -1;
-static int hf_nge_mac = -1;
-static int hf_nge_ip = -1;
-static int hf_nge_uuid = -1;
-
-static gint ett_nge = -1;
-static gint ett_nge_lv = -1;
-static gint ett_nge_ensemble = -1;
+static int proto_nge;
+
+static int hf_nge_version;
+static int hf_nge_unknown;
+static int hf_nge_unknown_int32;
+static int hf_nge_sequence;
+static int hf_nge_tlv_length;
+static int hf_nge_ensemble_name;
+static int hf_nge_firmware_name;
+static int hf_nge_region_name;
+static int hf_nge_firmware_version;
+static int hf_nge_ap_name;
+static int hf_nge_uptime;
+static int hf_nge_mac;
+static int hf_nge_ip;
+static int hf_nge_uuid;
+
+static gint ett_nge;
+static gint ett_nge_lv;
+static gint ett_nge_ensemble;
 
 
 static void
diff --git a/epan/dissectors/packet-netlink-generic.c b/epan/dissectors/packet-netlink-generic.c
index a57441772f..07adfa8cbd 100644
--- a/epan/dissectors/packet-netlink-generic.c
+++ b/epan/dissectors/packet-netlink-generic.c
@@ -129,37 +129,37 @@ static dissector_table_t genl_dissector_table;
 
 static int proto_netlink_generic;
 
-static int hf_genl_cmd = -1;
-static int hf_genl_ctrl_attr = -1;
-static int hf_genl_ctrl_cmd = -1;
-static int hf_genl_ctrl_family_id = -1;
-static int hf_genl_ctrl_family_name = -1;
-static int hf_genl_ctrl_group_id = -1;
-static int hf_genl_ctrl_group_name = -1;
-static int hf_genl_ctrl_groups_attr = -1;
-static int hf_genl_ctrl_hdrsize = -1;
-static int hf_genl_ctrl_maxattr = -1;
-static int hf_genl_ctrl_op_flags = -1;
-static int hf_genl_ctrl_op_flags_admin_perm = -1;
-static int hf_genl_ctrl_op_flags_cmd_cap_do = -1;
-static int hf_genl_ctrl_op_flags_cmd_cap_dump = -1;
-static int hf_genl_ctrl_op_flags_cmd_cap_haspol = -1;
-static int hf_genl_ctrl_op_flags_uns_admin_perm = -1;
-static int hf_genl_ctrl_op_id = -1;
-static int hf_genl_ctrl_ops_attr = -1;
-static int hf_genl_ctrl_version = -1;
-static int hf_genl_family_id = -1;
-static int hf_genl_reserved = -1;
-static int hf_genl_version = -1;
-
-static gint ett_netlink_generic = -1;
-static gint ett_genl_ctrl_attr = -1;
-static gint ett_genl_ctrl_ops = -1;
-static gint ett_genl_ctrl_ops_attr = -1;
-static gint ett_genl_ctrl_op_flags = -1;
-static gint ett_genl_ctrl_groups = -1;
-static gint ett_genl_ctrl_groups_attr = -1;
-static gint ett_genl_nested_attr = -1;
+static int hf_genl_cmd;
+static int hf_genl_ctrl_attr;
+static int hf_genl_ctrl_cmd;
+static int hf_genl_ctrl_family_id;
+static int hf_genl_ctrl_family_name;
+static int hf_genl_ctrl_group_id;
+static int hf_genl_ctrl_group_name;
+static int hf_genl_ctrl_groups_attr;
+static int hf_genl_ctrl_hdrsize;
+static int hf_genl_ctrl_maxattr;
+static int hf_genl_ctrl_op_flags;
+static int hf_genl_ctrl_op_flags_admin_perm;
+static int hf_genl_ctrl_op_flags_cmd_cap_do;
+static int hf_genl_ctrl_op_flags_cmd_cap_dump;
+static int hf_genl_ctrl_op_flags_cmd_cap_haspol;
+static int hf_genl_ctrl_op_flags_uns_admin_perm;
+static int hf_genl_ctrl_op_id;
+static int hf_genl_ctrl_ops_attr;
+static int hf_genl_ctrl_version;
+static int hf_genl_family_id;
+static int hf_genl_reserved;
+static int hf_genl_version;
+
+static gint ett_netlink_generic;
+static gint ett_genl_ctrl_attr;
+static gint ett_genl_ctrl_ops;
+static gint ett_genl_ctrl_ops_attr;
+static gint ett_genl_ctrl_op_flags;
+static gint ett_genl_ctrl_groups;
+static gint ett_genl_ctrl_groups_attr;
+static gint ett_genl_nested_attr;
 
 /*
  * Maps family IDs (integers) to family names (strings) within a capture file.
diff --git a/epan/dissectors/packet-netlink-net_dm.c b/epan/dissectors/packet-netlink-net_dm.c
index 5a2a9c2a39..d206145dbb 100644
--- a/epan/dissectors/packet-netlink-net_dm.c
+++ b/epan/dissectors/packet-netlink-net_dm.c
@@ -99,39 +99,39 @@ static dissector_handle_t netlink_net_dm_handle;
 static dissector_table_t sll_ltype_table;
 static dissector_table_t ethertype_table;
 
-static int proto_netlink_net_dm = -1;
-
-static int hf_net_dm_alert_mode = -1;
-static int hf_net_dm_attrs = -1;
-static int hf_net_dm_attrs_port = -1;
-static int hf_net_dm_attrs_stats = -1;
-static int hf_net_dm_commands = -1;
-static int hf_net_dm_flow_action_cookie = -1;
-static int hf_net_dm_hw = -1;
-static int hf_net_dm_hw_trap_count = -1;
-static int hf_net_dm_hw_trap_group_name = -1;
-static int hf_net_dm_hw_trap_name = -1;
-static int hf_net_dm_orig_len = -1;
-static int hf_net_dm_origin = -1;
-static int hf_net_dm_pc = -1;
-static int hf_net_dm_port_netdev_index = -1;
-static int hf_net_dm_port_netdev_name = -1;
-static int hf_net_dm_proto = -1;
-static int hf_net_dm_queue_len = -1;
-static int hf_net_dm_stats_dropped = -1;
-static int hf_net_dm_sw = -1;
-static int hf_net_dm_symbol = -1;
-static int hf_net_dm_timestamp = -1;
-static int hf_net_dm_trunc_len = -1;
-static int hf_net_dm_reason = -1;
-
-static gint ett_net_dm = -1;
-static gint ett_net_dm_attrs = -1;
-static gint ett_net_dm_attrs_in_port = -1;
-static gint ett_net_dm_attrs_stats = -1;
-static gint ett_net_dm_attrs_hw_stats = -1;
-static gint ett_net_dm_attrs_hw_entries = -1;
-static gint ett_net_dm_attrs_hw_entry = -1;
+static int proto_netlink_net_dm;
+
+static int hf_net_dm_alert_mode;
+static int hf_net_dm_attrs;
+static int hf_net_dm_attrs_port;
+static int hf_net_dm_attrs_stats;
+static int hf_net_dm_commands;
+static int hf_net_dm_flow_action_cookie;
+static int hf_net_dm_hw;
+static int hf_net_dm_hw_trap_count;
+static int hf_net_dm_hw_trap_group_name;
+static int hf_net_dm_hw_trap_name;
+static int hf_net_dm_orig_len;
+static int hf_net_dm_origin;
+static int hf_net_dm_pc;
+static int hf_net_dm_port_netdev_index;
+static int hf_net_dm_port_netdev_name;
+static int hf_net_dm_proto;
+static int hf_net_dm_queue_len;
+static int hf_net_dm_stats_dropped;
+static int hf_net_dm_sw;
+static int hf_net_dm_symbol;
+static int hf_net_dm_timestamp;
+static int hf_net_dm_trunc_len;
+static int hf_net_dm_reason;
+
+static gint ett_net_dm;
+static gint ett_net_dm_attrs;
+static gint ett_net_dm_attrs_in_port;
+static gint ett_net_dm_attrs_stats;
+static gint ett_net_dm_attrs_hw_stats;
+static gint ett_net_dm_attrs_hw_entries;
+static gint ett_net_dm_attrs_hw_entry;
 
 static const value_string ws_net_dm_commands_vals[] = {
 	{ WS_NET_DM_CMD_UNSPEC,			"Unspecified command" },
diff --git a/epan/dissectors/packet-netlink-netfilter.c b/epan/dissectors/packet-netlink-netfilter.c
index 861fb86269..9527914e66 100644
--- a/epan/dissectors/packet-netlink-netfilter.c
+++ b/epan/dissectors/packet-netlink-netfilter.c
@@ -374,119 +374,119 @@ enum ws_ipset_ip_attr {
 
 static int proto_netlink_netfilter;
 
-static int hf_ipset_adt_attr = -1;
-static int hf_ipset_adt_attr_comment = -1;
-static int hf_ipset_attr = -1;
-static int hf_ipset_attr_family = -1;
-static int hf_ipset_attr_flags = -1;
-static int hf_ipset_attr_setname = -1;
-static int hf_ipset_attr_typename = -1;
-static int hf_ipset_cadt_attr = -1;
-static int hf_ipset_cadt_attr_cadt_flags = -1;
-static int hf_ipset_cadt_attr_cidr = -1;
-static int hf_ipset_cadt_attr_timeout = -1;
-static int hf_ipset_command = -1;
-static int hf_ipset_ip_attr = -1;
-static int hf_ipset_ip_attr_ipv4 = -1;
-static int hf_ipset_ip_attr_ipv6 = -1;
-static int hf_netlink_netfilter_family = -1;
-static int hf_netlink_netfilter_resid = -1;
-static int hf_netlink_netfilter_subsys = -1;
-static int hf_netlink_netfilter_ulog_type = -1;
-static int hf_netlink_netfilter_version = -1;
-static int hf_nfct_attr = -1;
-static int hf_nfct_attr_id = -1;
-static int hf_nfct_attr_status = -1;
-static int hf_nfct_attr_status_flag_assured = -1;
-static int hf_nfct_attr_status_flag_confirmed = -1;
-static int hf_nfct_attr_status_flag_dst_nat = -1;
-static int hf_nfct_attr_status_flag_dst_nat_done = -1;
-static int hf_nfct_attr_status_flag_dying = -1;
-static int hf_nfct_attr_status_flag_expected = -1;
-static int hf_nfct_attr_status_flag_fixed_timeout = -1;
-static int hf_nfct_attr_status_flag_helper = -1;
-static int hf_nfct_attr_status_flag_hw_offload = -1;
-static int hf_nfct_attr_status_flag_offload = -1;
-static int hf_nfct_attr_status_flag_seen_reply = -1;
-static int hf_nfct_attr_status_flag_seq_adjust = -1;
-static int hf_nfct_attr_status_flag_src_nat = -1;
-static int hf_nfct_attr_status_flag_src_nat_done = -1;
-static int hf_nfct_attr_status_flag_template = -1;
-static int hf_nfct_attr_status_flag_untracked = -1;
-static int hf_nfct_attr_timeout = -1;
-static int hf_nfct_help_attr = -1;
-static int hf_nfct_help_attr_help_name = -1;
-static int hf_nfct_seqadj_attr = -1;
-static int hf_nfct_seqadj_attr_correction_pos = -1;
-static int hf_nfct_seqadj_attr_offset_after = -1;
-static int hf_nfct_seqadj_attr_offset_before = -1;
-static int hf_nfct_tuple_attr = -1;
-static int hf_nfct_tuple_ip_attr = -1;
-static int hf_nfct_tuple_ip_attr_ipv4 = -1;
-static int hf_nfct_tuple_ip_attr_ipv6 = -1;
-static int hf_nfct_tuple_proto_attr = -1;
-static int hf_nfct_tuple_proto_dst_port_attr = -1;
-static int hf_nfct_tuple_proto_num_attr = -1;
-static int hf_nfct_tuple_proto_src_port_attr = -1;
-static int hf_nfct_tuple_zone_attr = -1;
-static int hf_nfexp_attr = -1;
-static int hf_nfexp_attr_class = -1;
-static int hf_nfexp_attr_flag_inactive = -1;
-static int hf_nfexp_attr_flag_permanent = -1;
-static int hf_nfexp_attr_flag_userspace = -1;
-static int hf_nfexp_attr_flags = -1;
-static int hf_nfexp_attr_fn = -1;
-static int hf_nfexp_attr_id = -1;
-static int hf_nfexp_attr_timeout = -1;
-static int hf_nfexp_attr_zone = -1;
-static int hf_nfexp_nat_attr = -1;
-static int hf_nfexp_nat_attr_dir = -1;
-static int hf_nfexp_type = -1;
-static int hf_nfq_attr = -1;
-static int hf_nfq_caplen = -1;
-static int hf_nfq_config_attr = -1;
-static int hf_nfq_config_command_command = -1;
-static int hf_nfq_config_command_pf = -1;
-static int hf_nfq_config_flags = -1;
-static int hf_nfq_config_mask = -1;
-static int hf_nfq_config_params_copymode = -1;
-static int hf_nfq_config_params_copyrange = -1;
-static int hf_nfq_config_queue_maxlen = -1;
-static int hf_nfq_ctinfo = -1;
-static int hf_nfq_gid = -1;
-static int hf_nfq_hwaddr_addr = -1;
-static int hf_nfq_hwaddr_len = -1;
-static int hf_nfq_ifindex_indev = -1;
-static int hf_nfq_ifindex_outdev = -1;
-static int hf_nfq_ifindex_physindev = -1;
-static int hf_nfq_ifindex_physoutdev = -1;
-static int hf_nfq_nfmark = -1;
-static int hf_nfq_packet_hook = -1;
-static int hf_nfq_packet_hwprotocol = -1;
-static int hf_nfq_packet_id = -1;
-static int hf_nfq_timestamp = -1;
-static int hf_nfq_type = -1;
-static int hf_nfq_uid = -1;
-static int hf_nfq_verdict_id = -1;
-static int hf_nfq_verdict_verdict = -1;
-
-static int ett_netlink_netfilter = -1;
-static int ett_nfct_attr = -1;
-static int ett_nfct_help_attr = -1;
-static int ett_nfct_seqadj_attr = -1;
-static int ett_nfct_status_attr = -1;
-static int ett_nfct_tuple_attr = -1;
-static int ett_nfct_tuple_ip_attr = -1;
-static int ett_nfct_tuple_proto_attr = -1;
-static int ett_nfq_config_attr = -1;
-static int ett_nfq_attr = -1;
-static int ett_nfexp_attr = -1;
-static int ett_nfexp_flags_attr = -1;
-static int ett_nfexp_nat_attr = -1;
-static int ett_ipset_attr = -1;
-static int ett_ipset_cadt_attr = -1;
-static int ett_ipset_adt_attr = -1;
-static int ett_ipset_ip_attr = -1;
+static int hf_ipset_adt_attr;
+static int hf_ipset_adt_attr_comment;
+static int hf_ipset_attr;
+static int hf_ipset_attr_family;
+static int hf_ipset_attr_flags;
+static int hf_ipset_attr_setname;
+static int hf_ipset_attr_typename;
+static int hf_ipset_cadt_attr;
+static int hf_ipset_cadt_attr_cadt_flags;
+static int hf_ipset_cadt_attr_cidr;
+static int hf_ipset_cadt_attr_timeout;
+static int hf_ipset_command;
+static int hf_ipset_ip_attr;
+static int hf_ipset_ip_attr_ipv4;
+static int hf_ipset_ip_attr_ipv6;
+static int hf_netlink_netfilter_family;
+static int hf_netlink_netfilter_resid;
+static int hf_netlink_netfilter_subsys;
+static int hf_netlink_netfilter_ulog_type;
+static int hf_netlink_netfilter_version;
+static int hf_nfct_attr;
+static int hf_nfct_attr_id;
+static int hf_nfct_attr_status;
+static int hf_nfct_attr_status_flag_assured;
+static int hf_nfct_attr_status_flag_confirmed;
+static int hf_nfct_attr_status_flag_dst_nat;
+static int hf_nfct_attr_status_flag_dst_nat_done;
+static int hf_nfct_attr_status_flag_dying;
+static int hf_nfct_attr_status_flag_expected;
+static int hf_nfct_attr_status_flag_fixed_timeout;
+static int hf_nfct_attr_status_flag_helper;
+static int hf_nfct_attr_status_flag_hw_offload;
+static int hf_nfct_attr_status_flag_offload;
+static int hf_nfct_attr_status_flag_seen_reply;
+static int hf_nfct_attr_status_flag_seq_adjust;
+static int hf_nfct_attr_status_flag_src_nat;
+static int hf_nfct_attr_status_flag_src_nat_done;
+static int hf_nfct_attr_status_flag_template;
+static int hf_nfct_attr_status_flag_untracked;
+static int hf_nfct_attr_timeout;
+static int hf_nfct_help_attr;
+static int hf_nfct_help_attr_help_name;
+static int hf_nfct_seqadj_attr;
+static int hf_nfct_seqadj_attr_correction_pos;
+static int hf_nfct_seqadj_attr_offset_after;
+static int hf_nfct_seqadj_attr_offset_before;
+static int hf_nfct_tuple_attr;
+static int hf_nfct_tuple_ip_attr;
+static int hf_nfct_tuple_ip_attr_ipv4;
+static int hf_nfct_tuple_ip_attr_ipv6;
+static int hf_nfct_tuple_proto_attr;
+static int hf_nfct_tuple_proto_dst_port_attr;
+static int hf_nfct_tuple_proto_num_attr;
+static int hf_nfct_tuple_proto_src_port_attr;
+static int hf_nfct_tuple_zone_attr;
+static int hf_nfexp_attr;
+static int hf_nfexp_attr_class;
+static int hf_nfexp_attr_flag_inactive;
+static int hf_nfexp_attr_flag_permanent;
+static int hf_nfexp_attr_flag_userspace;
+static int hf_nfexp_attr_flags;
+static int hf_nfexp_attr_fn;
+static int hf_nfexp_attr_id;
+static int hf_nfexp_attr_timeout;
+static int hf_nfexp_attr_zone;
+static int hf_nfexp_nat_attr;
+static int hf_nfexp_nat_attr_dir;
+static int hf_nfexp_type;
+static int hf_nfq_attr;
+static int hf_nfq_caplen;
+static int hf_nfq_config_attr;
+static int hf_nfq_config_command_command;
+static int hf_nfq_config_command_pf;
+static int hf_nfq_config_flags;
+static int hf_nfq_config_mask;
+static int hf_nfq_config_params_copymode;
+static int hf_nfq_config_params_copyrange;
+static int hf_nfq_config_queue_maxlen;
+static int hf_nfq_ctinfo;
+static int hf_nfq_gid;
+static int hf_nfq_hwaddr_addr;
+static int hf_nfq_hwaddr_len;
+static int hf_nfq_ifindex_indev;
+static int hf_nfq_ifindex_outdev;
+static int hf_nfq_ifindex_physindev;
+static int hf_nfq_ifindex_physoutdev;
+static int hf_nfq_nfmark;
+static int hf_nfq_packet_hook;
+static int hf_nfq_packet_hwprotocol;
+static int hf_nfq_packet_id;
+static int hf_nfq_timestamp;
+static int hf_nfq_type;
+static int hf_nfq_uid;
+static int hf_nfq_verdict_id;
+static int hf_nfq_verdict_verdict;
+
+static int ett_netlink_netfilter;
+static int ett_nfct_attr;
+static int ett_nfct_help_attr;
+static int ett_nfct_seqadj_attr;
+static int ett_nfct_status_attr;
+static int ett_nfct_tuple_attr;
+static int ett_nfct_tuple_ip_attr;
+static int ett_nfct_tuple_proto_attr;
+static int ett_nfq_config_attr;
+static int ett_nfq_attr;
+static int ett_nfexp_attr;
+static int ett_nfexp_flags_attr;
+static int ett_nfexp_nat_attr;
+static int ett_ipset_attr;
+static int ett_ipset_cadt_attr;
+static int ett_ipset_adt_attr;
+static int ett_ipset_ip_attr;
 
 static int dissect_netlink_netfilter_header(tvbuff_t *tvb, proto_tree *tree, int offset)
 {
diff --git a/epan/dissectors/packet-netlink-nl80211.c b/epan/dissectors/packet-netlink-nl80211.c
index 77b461ad9d..9d5ca80aa8 100644
--- a/epan/dissectors/packet-netlink-nl80211.c
+++ b/epan/dissectors/packet-netlink-nl80211.c
@@ -3445,213 +3445,213 @@ static const value_string ws_nl80211_obss_pd_attributes_vals[] = {
 };
 static value_string_ext ws_nl80211_obss_pd_attributes_vals_ext = VALUE_STRING_EXT_INIT(ws_nl80211_obss_pd_attributes_vals);
 
-static gint hf_nl80211_commands = -1;
-static gint hf_nl80211_attrs = -1;
-static gint hf_nl80211_iftype = -1;
-static gint hf_nl80211_sta_flags = -1;
-static gint hf_nl80211_sta_p2p_ps_status = -1;
-static gint hf_nl80211_he_gi = -1;
-static gint hf_nl80211_he_ru_alloc = -1;
-static gint hf_nl80211_rate_info = -1;
-static gint hf_nl80211_sta_bss_param = -1;
-static gint hf_nl80211_sta_info = -1;
-static gint hf_nl80211_tid_stats = -1;
-static gint hf_nl80211_txq_stats = -1;
-static gint hf_nl80211_mpath_flags = -1;
-static gint hf_nl80211_mpath_info = -1;
-static gint hf_nl80211_band_iftype_attr = -1;
-static gint hf_nl80211_band_attr = -1;
-static gint hf_nl80211_wmm_rule = -1;
-static gint hf_nl80211_frequency_attr = -1;
-static gint hf_nl80211_bitrate_attr = -1;
-static gint hf_nl80211_reg_initiator = -1;
-static gint hf_nl80211_reg_type = -1;
-static gint hf_nl80211_reg_rule_attr = -1;
-static gint hf_nl80211_sched_scan_match_attr = -1;
-static gint hf_nl80211_reg_rule_flags = -1;
-static gint hf_nl80211_dfs_regions = -1;
-static gint hf_nl80211_user_reg_hint_type = -1;
-static gint hf_nl80211_survey_info = -1;
-static gint hf_nl80211_mntr_flags = -1;
-static gint hf_nl80211_mesh_power_mode = -1;
-static gint hf_nl80211_meshconf_params = -1;
-static gint hf_nl80211_mesh_setup_params = -1;
-static gint hf_nl80211_txq_attr = -1;
-static gint hf_nl80211_ac = -1;
-static gint hf_nl80211_channel_type = -1;
-static gint hf_nl80211_key_mode = -1;
-static gint hf_nl80211_chan_width = -1;
-static gint hf_nl80211_bss_scan_width = -1;
-static gint hf_nl80211_bss = -1;
-static gint hf_nl80211_bss_status = -1;
-static gint hf_nl80211_auth_type = -1;
-static gint hf_nl80211_key_type = -1;
-static gint hf_nl80211_mfp = -1;
-static gint hf_nl80211_wpa_versions = -1;
-static gint hf_nl80211_key_default_types = -1;
-static gint hf_nl80211_key_attributes = -1;
-static gint hf_nl80211_tx_rate_attributes = -1;
-static gint hf_nl80211_txrate_gi = -1;
-static gint hf_nl80211_band = -1;
-static gint hf_nl80211_ps_state = -1;
-static gint hf_nl80211_attr_cqm = -1;
-static gint hf_nl80211_cqm_rssi_threshold_event = -1;
-static gint hf_nl80211_tx_power_setting = -1;
-static gint hf_nl80211_packet_pattern_attr = -1;
-static gint hf_nl80211_wowlan_triggers = -1;
-static gint hf_nl80211_wowlan_tcp_attrs = -1;
-static gint hf_nl80211_attr_coalesce_rule = -1;
-static gint hf_nl80211_coalesce_condition = -1;
-static gint hf_nl80211_iface_limit_attrs = -1;
-static gint hf_nl80211_if_combination_attrs = -1;
-static gint hf_nl80211_plink_state = -1;
-static gint hf_plink_actions = -1;
-static gint hf_nl80211_rekey_data = -1;
-static gint hf_nl80211_hidden_ssid = -1;
-static gint hf_nl80211_sta_wme_attr = -1;
-static gint hf_nl80211_pmksa_candidate_attr = -1;
-static gint hf_nl80211_tdls_operation = -1;
-static gint hf_nl80211_feature_flags = -1;
-static gint hf_nl80211_ext_feature_index = -1;
-static gint hf_nl80211_probe_resp_offload_support_attr = -1;
-static gint hf_nl80211_connect_failed_reason = -1;
-static gint hf_nl80211_timeout_reason = -1;
-static gint hf_nl80211_scan_flags = -1;
-static gint hf_nl80211_acl_policy = -1;
-static gint hf_nl80211_smps_mode = -1;
-static gint hf_nl80211_radar_event = -1;
-static gint hf_nl80211_dfs_state = -1;
-static gint hf_nl80211_protocol_features = -1;
-static gint hf_nl80211_crit_proto_id = -1;
-static gint hf_nl80211_rxmgmt_flags = -1;
-static gint hf_nl80211_tdls_peer_capability = -1;
-static gint hf_nl80211_sched_scan_plan = -1;
-static gint hf_nl80211_bss_select_attr = -1;
-static gint hf_nl80211_nan_function_type = -1;
-static gint hf_nl80211_nan_publish_type = -1;
-static gint hf_nl80211_nan_func_term_reason = -1;
-static gint hf_nl80211_nan_func_attributes = -1;
-static gint hf_nl80211_nan_srf_attributes = -1;
-static gint hf_nl80211_nan_match_attributes = -1;
-static gint hf_nl80211_external_auth_action = -1;
-static gint hf_nl80211_ftm_responder_attributes = -1;
-static gint hf_nl80211_ftm_responder_stats = -1;
-static gint hf_nl80211_preamble = -1;
-static gint hf_nl80211_peer_measurement_type = -1;
-static gint hf_nl80211_peer_measurement_status = -1;
-static gint hf_nl80211_peer_measurement_req = -1;
-static gint hf_nl80211_peer_measurement_resp = -1;
-static gint hf_nl80211_peer_measurement_peer_attrs = -1;
-static gint hf_nl80211_peer_measurement_attrs = -1;
-static gint hf_nl80211_peer_measurement_ftm_capa = -1;
-static gint hf_nl80211_peer_measurement_ftm_req = -1;
-static gint hf_nl80211_peer_measurement_ftm_failure_reasons = -1;
-static gint hf_nl80211_peer_measurement_ftm_resp = -1;
-static gint hf_nl80211_obss_pd_attributes = -1;
-
-static gint ett_nl80211_commands = -1;
-static gint ett_nl80211_attrs = -1;
-static gint ett_nl80211_iftype = -1;
-static gint ett_nl80211_sta_flags = -1;
-static gint ett_nl80211_sta_p2p_ps_status = -1;
-static gint ett_nl80211_he_gi = -1;
-static gint ett_nl80211_he_ru_alloc = -1;
-static gint ett_nl80211_rate_info = -1;
-static gint ett_nl80211_sta_bss_param = -1;
-static gint ett_nl80211_sta_info = -1;
-static gint ett_nl80211_tid_stats = -1;
-static gint ett_nl80211_txq_stats = -1;
-static gint ett_nl80211_mpath_flags = -1;
-static gint ett_nl80211_mpath_info = -1;
-static gint ett_nl80211_band_iftype_attr = -1;
-static gint ett_nl80211_band_attr = -1;
-static gint ett_nl80211_wmm_rule = -1;
-static gint ett_nl80211_frequency_attr = -1;
-static gint ett_nl80211_bitrate_attr = -1;
-static gint ett_nl80211_reg_initiator = -1;
-static gint ett_nl80211_reg_type = -1;
-static gint ett_nl80211_reg_rule_attr = -1;
-static gint ett_nl80211_sched_scan_match_attr = -1;
-static gint ett_nl80211_reg_rule_flags = -1;
-static gint ett_nl80211_dfs_regions = -1;
-static gint ett_nl80211_user_reg_hint_type = -1;
-static gint ett_nl80211_survey_info = -1;
-static gint ett_nl80211_mntr_flags = -1;
-static gint ett_nl80211_mesh_power_mode = -1;
-static gint ett_nl80211_meshconf_params = -1;
-static gint ett_nl80211_mesh_setup_params = -1;
-static gint ett_nl80211_txq_attr = -1;
-static gint ett_nl80211_ac = -1;
-static gint ett_nl80211_channel_type = -1;
-static gint ett_nl80211_key_mode = -1;
-static gint ett_nl80211_chan_width = -1;
-static gint ett_nl80211_bss_scan_width = -1;
-static gint ett_nl80211_bss = -1;
-static gint ett_nl80211_bss_status = -1;
-static gint ett_nl80211_auth_type = -1;
-static gint ett_nl80211_key_type = -1;
-static gint ett_nl80211_mfp = -1;
-static gint ett_nl80211_wpa_versions = -1;
-static gint ett_nl80211_key_default_types = -1;
-static gint ett_nl80211_key_attributes = -1;
-static gint ett_nl80211_tx_rate_attributes = -1;
-static gint ett_nl80211_txrate_gi = -1;
-static gint ett_nl80211_band = -1;
-static gint ett_nl80211_ps_state = -1;
-static gint ett_nl80211_attr_cqm = -1;
-static gint ett_nl80211_cqm_rssi_threshold_event = -1;
-static gint ett_nl80211_tx_power_setting = -1;
-static gint ett_nl80211_packet_pattern_attr = -1;
-static gint ett_nl80211_wowlan_triggers = -1;
-static gint ett_nl80211_wowlan_tcp_attrs = -1;
-static gint ett_nl80211_attr_coalesce_rule = -1;
-static gint ett_nl80211_coalesce_condition = -1;
-static gint ett_nl80211_iface_limit_attrs = -1;
-static gint ett_nl80211_if_combination_attrs = -1;
-static gint ett_nl80211_plink_state = -1;
-static gint ett_plink_actions = -1;
-static gint ett_nl80211_rekey_data = -1;
-static gint ett_nl80211_hidden_ssid = -1;
-static gint ett_nl80211_sta_wme_attr = -1;
-static gint ett_nl80211_pmksa_candidate_attr = -1;
-static gint ett_nl80211_tdls_operation = -1;
-static gint ett_nl80211_feature_flags = -1;
-static gint ett_nl80211_ext_feature_index = -1;
-static gint ett_nl80211_probe_resp_offload_support_attr = -1;
-static gint ett_nl80211_connect_failed_reason = -1;
-static gint ett_nl80211_timeout_reason = -1;
-static gint ett_nl80211_scan_flags = -1;
-static gint ett_nl80211_acl_policy = -1;
-static gint ett_nl80211_smps_mode = -1;
-static gint ett_nl80211_radar_event = -1;
-static gint ett_nl80211_dfs_state = -1;
-static gint ett_nl80211_protocol_features = -1;
-static gint ett_nl80211_crit_proto_id = -1;
-static gint ett_nl80211_rxmgmt_flags = -1;
-static gint ett_nl80211_tdls_peer_capability = -1;
-static gint ett_nl80211_sched_scan_plan = -1;
-static gint ett_nl80211_bss_select_attr = -1;
-static gint ett_nl80211_nan_function_type = -1;
-static gint ett_nl80211_nan_publish_type = -1;
-static gint ett_nl80211_nan_func_term_reason = -1;
-static gint ett_nl80211_nan_func_attributes = -1;
-static gint ett_nl80211_nan_srf_attributes = -1;
-static gint ett_nl80211_nan_match_attributes = -1;
-static gint ett_nl80211_external_auth_action = -1;
-static gint ett_nl80211_ftm_responder_attributes = -1;
-static gint ett_nl80211_ftm_responder_stats = -1;
-static gint ett_nl80211_preamble = -1;
-static gint ett_nl80211_peer_measurement_type = -1;
-static gint ett_nl80211_peer_measurement_status = -1;
-static gint ett_nl80211_peer_measurement_req = -1;
-static gint ett_nl80211_peer_measurement_resp = -1;
-static gint ett_nl80211_peer_measurement_peer_attrs = -1;
-static gint ett_nl80211_peer_measurement_attrs = -1;
-static gint ett_nl80211_peer_measurement_ftm_capa = -1;
-static gint ett_nl80211_peer_measurement_ftm_req = -1;
-static gint ett_nl80211_peer_measurement_ftm_failure_reasons = -1;
-static gint ett_nl80211_peer_measurement_ftm_resp = -1;
-static gint ett_nl80211_obss_pd_attributes = -1;
+static gint hf_nl80211_commands;
+static gint hf_nl80211_attrs;
+static gint hf_nl80211_iftype;
+static gint hf_nl80211_sta_flags;
+static gint hf_nl80211_sta_p2p_ps_status;
+static gint hf_nl80211_he_gi;
+static gint hf_nl80211_he_ru_alloc;
+static gint hf_nl80211_rate_info;
+static gint hf_nl80211_sta_bss_param;
+static gint hf_nl80211_sta_info;
+static gint hf_nl80211_tid_stats;
+static gint hf_nl80211_txq_stats;
+static gint hf_nl80211_mpath_flags;
+static gint hf_nl80211_mpath_info;
+static gint hf_nl80211_band_iftype_attr;
+static gint hf_nl80211_band_attr;
+static gint hf_nl80211_wmm_rule;
+static gint hf_nl80211_frequency_attr;
+static gint hf_nl80211_bitrate_attr;
+static gint hf_nl80211_reg_initiator;
+static gint hf_nl80211_reg_type;
+static gint hf_nl80211_reg_rule_attr;
+static gint hf_nl80211_sched_scan_match_attr;
+static gint hf_nl80211_reg_rule_flags;
+static gint hf_nl80211_dfs_regions;
+static gint hf_nl80211_user_reg_hint_type;
+static gint hf_nl80211_survey_info;
+static gint hf_nl80211_mntr_flags;
+static gint hf_nl80211_mesh_power_mode;
+static gint hf_nl80211_meshconf_params;
+static gint hf_nl80211_mesh_setup_params;
+static gint hf_nl80211_txq_attr;
+static gint hf_nl80211_ac;
+static gint hf_nl80211_channel_type;
+static gint hf_nl80211_key_mode;
+static gint hf_nl80211_chan_width;
+static gint hf_nl80211_bss_scan_width;
+static gint hf_nl80211_bss;
+static gint hf_nl80211_bss_status;
+static gint hf_nl80211_auth_type;
+static gint hf_nl80211_key_type;
+static gint hf_nl80211_mfp;
+static gint hf_nl80211_wpa_versions;
+static gint hf_nl80211_key_default_types;
+static gint hf_nl80211_key_attributes;
+static gint hf_nl80211_tx_rate_attributes;
+static gint hf_nl80211_txrate_gi;
+static gint hf_nl80211_band;
+static gint hf_nl80211_ps_state;
+static gint hf_nl80211_attr_cqm;
+static gint hf_nl80211_cqm_rssi_threshold_event;
+static gint hf_nl80211_tx_power_setting;
+static gint hf_nl80211_packet_pattern_attr;
+static gint hf_nl80211_wowlan_triggers;
+static gint hf_nl80211_wowlan_tcp_attrs;
+static gint hf_nl80211_attr_coalesce_rule;
+static gint hf_nl80211_coalesce_condition;
+static gint hf_nl80211_iface_limit_attrs;
+static gint hf_nl80211_if_combination_attrs;
+static gint hf_nl80211_plink_state;
+static gint hf_plink_actions;
+static gint hf_nl80211_rekey_data;
+static gint hf_nl80211_hidden_ssid;
+static gint hf_nl80211_sta_wme_attr;
+static gint hf_nl80211_pmksa_candidate_attr;
+static gint hf_nl80211_tdls_operation;
+static gint hf_nl80211_feature_flags;
+static gint hf_nl80211_ext_feature_index;
+static gint hf_nl80211_probe_resp_offload_support_attr;
+static gint hf_nl80211_connect_failed_reason;
+static gint hf_nl80211_timeout_reason;
+static gint hf_nl80211_scan_flags;
+static gint hf_nl80211_acl_policy;
+static gint hf_nl80211_smps_mode;
+static gint hf_nl80211_radar_event;
+static gint hf_nl80211_dfs_state;
+static gint hf_nl80211_protocol_features;
+static gint hf_nl80211_crit_proto_id;
+static gint hf_nl80211_rxmgmt_flags;
+static gint hf_nl80211_tdls_peer_capability;
+static gint hf_nl80211_sched_scan_plan;
+static gint hf_nl80211_bss_select_attr;
+static gint hf_nl80211_nan_function_type;
+static gint hf_nl80211_nan_publish_type;
+static gint hf_nl80211_nan_func_term_reason;
+static gint hf_nl80211_nan_func_attributes;
+static gint hf_nl80211_nan_srf_attributes;
+static gint hf_nl80211_nan_match_attributes;
+static gint hf_nl80211_external_auth_action;
+static gint hf_nl80211_ftm_responder_attributes;
+static gint hf_nl80211_ftm_responder_stats;
+static gint hf_nl80211_preamble;
+static gint hf_nl80211_peer_measurement_type;
+static gint hf_nl80211_peer_measurement_status;
+static gint hf_nl80211_peer_measurement_req;
+static gint hf_nl80211_peer_measurement_resp;
+static gint hf_nl80211_peer_measurement_peer_attrs;
+static gint hf_nl80211_peer_measurement_attrs;
+static gint hf_nl80211_peer_measurement_ftm_capa;
+static gint hf_nl80211_peer_measurement_ftm_req;
+static gint hf_nl80211_peer_measurement_ftm_failure_reasons;
+static gint hf_nl80211_peer_measurement_ftm_resp;
+static gint hf_nl80211_obss_pd_attributes;
+
+static gint ett_nl80211_commands;
+static gint ett_nl80211_attrs;
+static gint ett_nl80211_iftype;
+static gint ett_nl80211_sta_flags;
+static gint ett_nl80211_sta_p2p_ps_status;
+static gint ett_nl80211_he_gi;
+static gint ett_nl80211_he_ru_alloc;
+static gint ett_nl80211_rate_info;
+static gint ett_nl80211_sta_bss_param;
+static gint ett_nl80211_sta_info;
+static gint ett_nl80211_tid_stats;
+static gint ett_nl80211_txq_stats;
+static gint ett_nl80211_mpath_flags;
+static gint ett_nl80211_mpath_info;
+static gint ett_nl80211_band_iftype_attr;
+static gint ett_nl80211_band_attr;
+static gint ett_nl80211_wmm_rule;
+static gint ett_nl80211_frequency_attr;
+static gint ett_nl80211_bitrate_attr;
+static gint ett_nl80211_reg_initiator;
+static gint ett_nl80211_reg_type;
+static gint ett_nl80211_reg_rule_attr;
+static gint ett_nl80211_sched_scan_match_attr;
+static gint ett_nl80211_reg_rule_flags;
+static gint ett_nl80211_dfs_regions;
+static gint ett_nl80211_user_reg_hint_type;
+static gint ett_nl80211_survey_info;
+static gint ett_nl80211_mntr_flags;
+static gint ett_nl80211_mesh_power_mode;
+static gint ett_nl80211_meshconf_params;
+static gint ett_nl80211_mesh_setup_params;
+static gint ett_nl80211_txq_attr;
+static gint ett_nl80211_ac;
+static gint ett_nl80211_channel_type;
+static gint ett_nl80211_key_mode;
+static gint ett_nl80211_chan_width;
+static gint ett_nl80211_bss_scan_width;
+static gint ett_nl80211_bss;
+static gint ett_nl80211_bss_status;
+static gint ett_nl80211_auth_type;
+static gint ett_nl80211_key_type;
+static gint ett_nl80211_mfp;
+static gint ett_nl80211_wpa_versions;
+static gint ett_nl80211_key_default_types;
+static gint ett_nl80211_key_attributes;
+static gint ett_nl80211_tx_rate_attributes;
+static gint ett_nl80211_txrate_gi;
+static gint ett_nl80211_band;
+static gint ett_nl80211_ps_state;
+static gint ett_nl80211_attr_cqm;
+static gint ett_nl80211_cqm_rssi_threshold_event;
+static gint ett_nl80211_tx_power_setting;
+static gint ett_nl80211_packet_pattern_attr;
+static gint ett_nl80211_wowlan_triggers;
+static gint ett_nl80211_wowlan_tcp_attrs;
+static gint ett_nl80211_attr_coalesce_rule;
+static gint ett_nl80211_coalesce_condition;
+static gint ett_nl80211_iface_limit_attrs;
+static gint ett_nl80211_if_combination_attrs;
+static gint ett_nl80211_plink_state;
+static gint ett_plink_actions;
+static gint ett_nl80211_rekey_data;
+static gint ett_nl80211_hidden_ssid;
+static gint ett_nl80211_sta_wme_attr;
+static gint ett_nl80211_pmksa_candidate_attr;
+static gint ett_nl80211_tdls_operation;
+static gint ett_nl80211_feature_flags;
+static gint ett_nl80211_ext_feature_index;
+static gint ett_nl80211_probe_resp_offload_support_attr;
+static gint ett_nl80211_connect_failed_reason;
+static gint ett_nl80211_timeout_reason;
+static gint ett_nl80211_scan_flags;
+static gint ett_nl80211_acl_policy;
+static gint ett_nl80211_smps_mode;
+static gint ett_nl80211_radar_event;
+static gint ett_nl80211_dfs_state;
+static gint ett_nl80211_protocol_features;
+static gint ett_nl80211_crit_proto_id;
+static gint ett_nl80211_rxmgmt_flags;
+static gint ett_nl80211_tdls_peer_capability;
+static gint ett_nl80211_sched_scan_plan;
+static gint ett_nl80211_bss_select_attr;
+static gint ett_nl80211_nan_function_type;
+static gint ett_nl80211_nan_publish_type;
+static gint ett_nl80211_nan_func_term_reason;
+static gint ett_nl80211_nan_func_attributes;
+static gint ett_nl80211_nan_srf_attributes;
+static gint ett_nl80211_nan_match_attributes;
+static gint ett_nl80211_external_auth_action;
+static gint ett_nl80211_ftm_responder_attributes;
+static gint ett_nl80211_ftm_responder_stats;
+static gint ett_nl80211_preamble;
+static gint ett_nl80211_peer_measurement_type;
+static gint ett_nl80211_peer_measurement_status;
+static gint ett_nl80211_peer_measurement_req;
+static gint ett_nl80211_peer_measurement_resp;
+static gint ett_nl80211_peer_measurement_peer_attrs;
+static gint ett_nl80211_peer_measurement_attrs;
+static gint ett_nl80211_peer_measurement_ftm_capa;
+static gint ett_nl80211_peer_measurement_ftm_req;
+static gint ett_nl80211_peer_measurement_ftm_failure_reasons;
+static gint ett_nl80211_peer_measurement_ftm_resp;
+static gint ett_nl80211_obss_pd_attributes;
 /* }}} */
 
 
@@ -3659,19 +3659,19 @@ static int proto_netlink_nl80211;
 
 static dissector_handle_t netlink_nl80211_handle;
 
-static int hf_nl80211_attr_value = -1;
-static int hf_nl80211_attr_value16 = -1;
-static int hf_nl80211_attr_value32 = -1;
-static int hf_nl80211_attr_value64 = -1;
-static int hf_nl80211_wiphy_name = -1;
-static int hf_nl80211_ifname = -1;
-static int hf_nl80211_mac = -1;
-static int hf_nl80211_alpha2 = -1;
-static int hf_nl80211_dbm = -1;
-
-static gint ett_nl80211 = -1;
-static gint ett_nl80211_frame = -1;
-static gint ett_nl80211_tag = -1;
+static int hf_nl80211_attr_value;
+static int hf_nl80211_attr_value16;
+static int hf_nl80211_attr_value32;
+static int hf_nl80211_attr_value64;
+static int hf_nl80211_wiphy_name;
+static int hf_nl80211_ifname;
+static int hf_nl80211_mac;
+static int hf_nl80211_alpha2;
+static int hf_nl80211_dbm;
+
+static gint ett_nl80211;
+static gint ett_nl80211_frame;
+static gint ett_nl80211_tag;
 
 static int
 dissect_nl80211_generic(tvbuff_t *tvb, void *data _U_, struct packet_netlink_data *nl_data, proto_tree *tree, int nla_type _U_, int offset, int len)
diff --git a/epan/dissectors/packet-netlink-psample.c b/epan/dissectors/packet-netlink-psample.c
index 8df5112f52..70b325dcf1 100644
--- a/epan/dissectors/packet-netlink-psample.c
+++ b/epan/dissectors/packet-netlink-psample.c
@@ -58,29 +58,29 @@ struct netlink_psample_info {
 	guint16 protocol; /* protocol for packet payload */
 };
 
-static int proto_netlink_psample = -1;
+static int proto_netlink_psample;
 
 static dissector_handle_t netlink_psample_handle;
 static dissector_table_t sll_ltype_table;
 
-static int hf_psample_attrs = -1;
-static int hf_psample_commands = -1;
-static int hf_psample_group_refcount = -1;
-static int hf_psample_group_seq = -1;
-static int hf_psample_iifindex = -1;
-static int hf_psample_latency = -1;
-static int hf_psample_oifindex = -1;
-static int hf_psample_origsize = -1;
-static int hf_psample_out_tc = -1;
-static int hf_psample_out_tc_occ = -1;
-static int hf_psample_proto = -1;
-static int hf_psample_sample_group = -1;
-static int hf_psample_sample_rate = -1;
-static int hf_psample_timestamp = -1;
-static int hf_psample_tunnel = -1;
-
-static gint ett_psample = -1;
-static gint ett_psample_attrs = -1;
+static int hf_psample_attrs;
+static int hf_psample_commands;
+static int hf_psample_group_refcount;
+static int hf_psample_group_seq;
+static int hf_psample_iifindex;
+static int hf_psample_latency;
+static int hf_psample_oifindex;
+static int hf_psample_origsize;
+static int hf_psample_out_tc;
+static int hf_psample_out_tc_occ;
+static int hf_psample_proto;
+static int hf_psample_sample_group;
+static int hf_psample_sample_rate;
+static int hf_psample_timestamp;
+static int hf_psample_tunnel;
+
+static gint ett_psample;
+static gint ett_psample_attrs;
 
 static const value_string ws_psample_commands_vals[] = {
 	{ WS_PSAMPLE_CMD_SAMPLE,		"Sample" },
diff --git a/epan/dissectors/packet-netlink-route.c b/epan/dissectors/packet-netlink-route.c
index 6c5889d13a..138e6a7eed 100644
--- a/epan/dissectors/packet-netlink-route.c
+++ b/epan/dissectors/packet-netlink-route.c
@@ -383,95 +383,95 @@ static int proto_netlink_route;
 
 static dissector_handle_t netlink_route_handle;
 
-static int hf_netlink_route_ifa_addr4 = -1;
-static int hf_netlink_route_ifa_addr6 = -1;
-static int hf_netlink_route_ifa_attr_type = -1;
-static int hf_netlink_route_ifa_family = -1;
-static int hf_netlink_route_ifa_flags = -1;
-static int hf_netlink_route_ifa_flags32 = -1;
-static int hf_netlink_route_ifa_index = -1;
-static int hf_netlink_route_ifa_label = -1;
-static int hf_netlink_route_ifa_prefixlen = -1;
-static int hf_netlink_route_ifa_scope = -1;
-static int hf_netlink_route_ifi_change = -1;
-static int hf_netlink_route_ifi_family = -1;
-static int hf_netlink_route_ifi_flags = -1;
-static int hf_netlink_route_ifi_flags_iff_broadcast = -1;
-static int hf_netlink_route_ifi_flags_iff_up = -1;
-static int hf_netlink_route_ifi_index = -1;
-static int hf_netlink_route_ifi_type = -1;
-static int hf_netlink_route_ifla_attr_type = -1;
-static int hf_netlink_route_ifla_broadcast = -1;
-static int hf_netlink_route_ifla_carrier = -1;
-static int hf_netlink_route_ifla_carrier_changes = -1;
-static int hf_netlink_route_ifla_carrier_down_count = -1;
-static int hf_netlink_route_ifla_carrier_up_count = -1;
-static int hf_netlink_route_ifla_group = -1;
-static int hf_netlink_route_ifla_gso_maxsegs = -1;
-static int hf_netlink_route_ifla_gso_maxsize = -1;
-static int hf_netlink_route_ifla_hwaddr = -1;
-static int hf_netlink_route_ifla_ifname = -1;
-static int hf_netlink_route_ifla_linkstats_collisions = -1;
-static int hf_netlink_route_ifla_linkstats_multicast = -1;
-static int hf_netlink_route_ifla_linkstats_rx_crc_errs = -1;
-static int hf_netlink_route_ifla_linkstats_rx_fifo_errs = -1;
-static int hf_netlink_route_ifla_linkstats_rx_frame_errs = -1;
-static int hf_netlink_route_ifla_linkstats_rx_len_errs = -1;
-static int hf_netlink_route_ifla_linkstats_rx_miss_errs = -1;
-static int hf_netlink_route_ifla_linkstats_rx_over_errs = -1;
-static int hf_netlink_route_ifla_linkstats_rxbytes = -1;
-static int hf_netlink_route_ifla_linkstats_rxdropped = -1;
-static int hf_netlink_route_ifla_linkstats_rxerrors = -1;
-static int hf_netlink_route_ifla_linkstats_rxpackets = -1;
-static int hf_netlink_route_ifla_linkstats_tx_abort_errs = -1;
-static int hf_netlink_route_ifla_linkstats_tx_carrier_errs = -1;
-static int hf_netlink_route_ifla_linkstats_tx_fifo_errs = -1;
-static int hf_netlink_route_ifla_linkstats_tx_heartbeat_errs = -1;
-static int hf_netlink_route_ifla_linkstats_tx_window_errs = -1;
-static int hf_netlink_route_ifla_linkstats_txbytes = -1;
-static int hf_netlink_route_ifla_linkstats_txdropped = -1;
-static int hf_netlink_route_ifla_linkstats_txerrors = -1;
-static int hf_netlink_route_ifla_linkstats_txpackets = -1;
-static int hf_netlink_route_ifla_map_baseaddr = -1;
-static int hf_netlink_route_ifla_map_dma = -1;
-static int hf_netlink_route_ifla_map_irq = -1;
-static int hf_netlink_route_ifla_map_memend = -1;
-static int hf_netlink_route_ifla_map_memstart = -1;
-static int hf_netlink_route_ifla_map_port = -1;
-static int hf_netlink_route_ifla_max_mtu = -1;
-static int hf_netlink_route_ifla_min_mtu = -1;
-static int hf_netlink_route_ifla_mtu = -1;
-static int hf_netlink_route_ifla_operstate = -1;
-static int hf_netlink_route_ifla_promiscuity = -1;
-static int hf_netlink_route_ifla_qdisc = -1;
-static int hf_netlink_route_ifla_rxqnum = -1;
-static int hf_netlink_route_ifla_txqlen = -1;
-static int hf_netlink_route_ifla_txqnum = -1;
-static int hf_netlink_route_nd_family = -1;
-static int hf_netlink_route_nd_flags = -1;
-static int hf_netlink_route_nd_index = -1;
-static int hf_netlink_route_nd_state = -1;
-static int hf_netlink_route_nd_type = -1;
-static int hf_netlink_route_nltype = -1;
-static int hf_netlink_route_rt_dst_len = -1;
-static int hf_netlink_route_rt_family = -1;
-static int hf_netlink_route_rt_flags = -1;
-static int hf_netlink_route_rt_protocol = -1;
-static int hf_netlink_route_rt_scope = -1;
-static int hf_netlink_route_rt_src_len = -1;
-static int hf_netlink_route_rt_table = -1;
-static int hf_netlink_route_rt_tos = -1;
-static int hf_netlink_route_rt_type = -1;
-static int hf_netlink_route_rta_attr_type = -1;
-static int hf_netlink_route_rta_iif = -1;
-static int hf_netlink_route_rta_oif = -1;
-
-static gint ett_netlink_route = -1;
-static gint ett_netlink_route_attr = -1;
-static gint ett_netlink_route_if_flags = -1;
-static gint ett_netlink_route_attr_linkstats = -1;
-static gint ett_netlink_route_attr_linkstats_rxerrs = -1;
-static gint ett_netlink_route_attr_linkstats_txerrs = -1;
+static int hf_netlink_route_ifa_addr4;
+static int hf_netlink_route_ifa_addr6;
+static int hf_netlink_route_ifa_attr_type;
+static int hf_netlink_route_ifa_family;
+static int hf_netlink_route_ifa_flags;
+static int hf_netlink_route_ifa_flags32;
+static int hf_netlink_route_ifa_index;
+static int hf_netlink_route_ifa_label;
+static int hf_netlink_route_ifa_prefixlen;
+static int hf_netlink_route_ifa_scope;
+static int hf_netlink_route_ifi_change;
+static int hf_netlink_route_ifi_family;
+static int hf_netlink_route_ifi_flags;
+static int hf_netlink_route_ifi_flags_iff_broadcast;
+static int hf_netlink_route_ifi_flags_iff_up;
+static int hf_netlink_route_ifi_index;
+static int hf_netlink_route_ifi_type;
+static int hf_netlink_route_ifla_attr_type;
+static int hf_netlink_route_ifla_broadcast;
+static int hf_netlink_route_ifla_carrier;
+static int hf_netlink_route_ifla_carrier_changes;
+static int hf_netlink_route_ifla_carrier_down_count;
+static int hf_netlink_route_ifla_carrier_up_count;
+static int hf_netlink_route_ifla_group;
+static int hf_netlink_route_ifla_gso_maxsegs;
+static int hf_netlink_route_ifla_gso_maxsize;
+static int hf_netlink_route_ifla_hwaddr;
+static int hf_netlink_route_ifla_ifname;
+static int hf_netlink_route_ifla_linkstats_collisions;
+static int hf_netlink_route_ifla_linkstats_multicast;
+static int hf_netlink_route_ifla_linkstats_rx_crc_errs;
+static int hf_netlink_route_ifla_linkstats_rx_fifo_errs;
+static int hf_netlink_route_ifla_linkstats_rx_frame_errs;
+static int hf_netlink_route_ifla_linkstats_rx_len_errs;
+static int hf_netlink_route_ifla_linkstats_rx_miss_errs;
+static int hf_netlink_route_ifla_linkstats_rx_over_errs;
+static int hf_netlink_route_ifla_linkstats_rxbytes;
+static int hf_netlink_route_ifla_linkstats_rxdropped;
+static int hf_netlink_route_ifla_linkstats_rxerrors;
+static int hf_netlink_route_ifla_linkstats_rxpackets;
+static int hf_netlink_route_ifla_linkstats_tx_abort_errs;
+static int hf_netlink_route_ifla_linkstats_tx_carrier_errs;
+static int hf_netlink_route_ifla_linkstats_tx_fifo_errs;
+static int hf_netlink_route_ifla_linkstats_tx_heartbeat_errs;
+static int hf_netlink_route_ifla_linkstats_tx_window_errs;
+static int hf_netlink_route_ifla_linkstats_txbytes;
+static int hf_netlink_route_ifla_linkstats_txdropped;
+static int hf_netlink_route_ifla_linkstats_txerrors;
+static int hf_netlink_route_ifla_linkstats_txpackets;
+static int hf_netlink_route_ifla_map_baseaddr;
+static int hf_netlink_route_ifla_map_dma;
+static int hf_netlink_route_ifla_map_irq;
+static int hf_netlink_route_ifla_map_memend;
+static int hf_netlink_route_ifla_map_memstart;
+static int hf_netlink_route_ifla_map_port;
+static int hf_netlink_route_ifla_max_mtu;
+static int hf_netlink_route_ifla_min_mtu;
+static int hf_netlink_route_ifla_mtu;
+static int hf_netlink_route_ifla_operstate;
+static int hf_netlink_route_ifla_promiscuity;
+static int hf_netlink_route_ifla_qdisc;
+static int hf_netlink_route_ifla_rxqnum;
+static int hf_netlink_route_ifla_txqlen;
+static int hf_netlink_route_ifla_txqnum;
+static int hf_netlink_route_nd_family;
+static int hf_netlink_route_nd_flags;
+static int hf_netlink_route_nd_index;
+static int hf_netlink_route_nd_state;
+static int hf_netlink_route_nd_type;
+static int hf_netlink_route_nltype;
+static int hf_netlink_route_rt_dst_len;
+static int hf_netlink_route_rt_family;
+static int hf_netlink_route_rt_flags;
+static int hf_netlink_route_rt_protocol;
+static int hf_netlink_route_rt_scope;
+static int hf_netlink_route_rt_src_len;
+static int hf_netlink_route_rt_table;
+static int hf_netlink_route_rt_tos;
+static int hf_netlink_route_rt_type;
+static int hf_netlink_route_rta_attr_type;
+static int hf_netlink_route_rta_iif;
+static int hf_netlink_route_rta_oif;
+
+static gint ett_netlink_route;
+static gint ett_netlink_route_attr;
+static gint ett_netlink_route_if_flags;
+static gint ett_netlink_route_attr_linkstats;
+static gint ett_netlink_route_attr_linkstats_rxerrs;
+static gint ett_netlink_route_attr_linkstats_txerrs;
 
 static void
 _fill_label_value_string_bitmask(char *label, guint32 value, const value_string *vals)
diff --git a/epan/dissectors/packet-netlink-sock_diag.c b/epan/dissectors/packet-netlink-sock_diag.c
index 231e460ea7..bb46f97e8c 100644
--- a/epan/dissectors/packet-netlink-sock_diag.c
+++ b/epan/dissectors/packet-netlink-sock_diag.c
@@ -158,64 +158,64 @@ enum {
 	WS_NEW_SYNC_RECV = 12
 };
 
-static int hf_netlink_sock_diag_cookie = -1;
-static int hf_netlink_sock_diag_family = -1;
-static int hf_netlink_sock_diag_fwd_alloc = -1;
-static int hf_netlink_sock_diag_inet_attr = -1;
-static int hf_netlink_sock_diag_inet_dport = -1;
-static int hf_netlink_sock_diag_inet_dst_ip4 = -1;
-static int hf_netlink_sock_diag_inet_dst_ip6 = -1;
-static int hf_netlink_sock_diag_inet_extended = -1;
-static int hf_netlink_sock_diag_inet_interface = -1;
-static int hf_netlink_sock_diag_inet_padding = -1;
-static int hf_netlink_sock_diag_inet_proto = -1;
-static int hf_netlink_sock_diag_inet_sport = -1;
-static int hf_netlink_sock_diag_inet_src_ip4 = -1;
-static int hf_netlink_sock_diag_inet_src_ip6 = -1;
-static int hf_netlink_sock_diag_inet_states = -1;
-static int hf_netlink_sock_diag_inode = -1;
-static int hf_netlink_sock_diag_netlink_attr = -1;
-static int hf_netlink_sock_diag_netlink_dst_port_id = -1;
-static int hf_netlink_sock_diag_netlink_port_id = -1;
-static int hf_netlink_sock_diag_netlink_proto = -1;
-static int hf_netlink_sock_diag_netlink_show = -1;
-static int hf_netlink_sock_diag_netlink_show_groups = -1;
-static int hf_netlink_sock_diag_netlink_show_meminfo = -1;
-static int hf_netlink_sock_diag_netlink_show_ring_cfg = -1;
-static int hf_netlink_sock_diag_nltype = -1;
-static int hf_netlink_sock_diag_packet_attr = -1;
-static int hf_netlink_sock_diag_packet_proto = -1;
-static int hf_netlink_sock_diag_packet_show = -1;
-static int hf_netlink_sock_diag_packet_show_fanout = -1;
-static int hf_netlink_sock_diag_packet_show_filter = -1;
-static int hf_netlink_sock_diag_packet_show_info = -1;
-static int hf_netlink_sock_diag_packet_show_mclist = -1;
-static int hf_netlink_sock_diag_packet_show_meminfo = -1;
-static int hf_netlink_sock_diag_packet_show_ring_cfg = -1;
-static int hf_netlink_sock_diag_rcvbuf = -1;
-static int hf_netlink_sock_diag_rmem_alloc = -1;
-static int hf_netlink_sock_diag_rqueue = -1;
-static int hf_netlink_sock_diag_shutdown = -1;
-static int hf_netlink_sock_diag_sndbuf = -1;
-static int hf_netlink_sock_diag_state = -1;
-static int hf_netlink_sock_diag_type = -1;
-static int hf_netlink_sock_diag_unix_attr = -1;
-static int hf_netlink_sock_diag_unix_name = -1;
-static int hf_netlink_sock_diag_unix_peer_inode = -1;
-static int hf_netlink_sock_diag_unix_show = -1;
-static int hf_netlink_sock_diag_unix_show_icons = -1;
-static int hf_netlink_sock_diag_unix_show_meminfo = -1;
-static int hf_netlink_sock_diag_unix_show_name = -1;
-static int hf_netlink_sock_diag_unix_show_peer = -1;
-static int hf_netlink_sock_diag_unix_show_rqlen = -1;
-static int hf_netlink_sock_diag_unix_show_vfs = -1;
-static int hf_netlink_sock_diag_wmem_alloc = -1;
-static int hf_netlink_sock_diag_wmem_queued = -1;
-static int hf_netlink_sock_diag_wqueue = -1;
-
-static int ett_netlink_sock_diag = -1;
-static int ett_netlink_sock_diag_show = -1;
-static int ett_netlink_sock_diag_attr = -1;
+static int hf_netlink_sock_diag_cookie;
+static int hf_netlink_sock_diag_family;
+static int hf_netlink_sock_diag_fwd_alloc;
+static int hf_netlink_sock_diag_inet_attr;
+static int hf_netlink_sock_diag_inet_dport;
+static int hf_netlink_sock_diag_inet_dst_ip4;
+static int hf_netlink_sock_diag_inet_dst_ip6;
+static int hf_netlink_sock_diag_inet_extended;
+static int hf_netlink_sock_diag_inet_interface;
+static int hf_netlink_sock_diag_inet_padding;
+static int hf_netlink_sock_diag_inet_proto;
+static int hf_netlink_sock_diag_inet_sport;
+static int hf_netlink_sock_diag_inet_src_ip4;
+static int hf_netlink_sock_diag_inet_src_ip6;
+static int hf_netlink_sock_diag_inet_states;
+static int hf_netlink_sock_diag_inode;
+static int hf_netlink_sock_diag_netlink_attr;
+static int hf_netlink_sock_diag_netlink_dst_port_id;
+static int hf_netlink_sock_diag_netlink_port_id;
+static int hf_netlink_sock_diag_netlink_proto;
+static int hf_netlink_sock_diag_netlink_show;
+static int hf_netlink_sock_diag_netlink_show_groups;
+static int hf_netlink_sock_diag_netlink_show_meminfo;
+static int hf_netlink_sock_diag_netlink_show_ring_cfg;
+static int hf_netlink_sock_diag_nltype;
+static int hf_netlink_sock_diag_packet_attr;
+static int hf_netlink_sock_diag_packet_proto;
+static int hf_netlink_sock_diag_packet_show;
+static int hf_netlink_sock_diag_packet_show_fanout;
+static int hf_netlink_sock_diag_packet_show_filter;
+static int hf_netlink_sock_diag_packet_show_info;
+static int hf_netlink_sock_diag_packet_show_mclist;
+static int hf_netlink_sock_diag_packet_show_meminfo;
+static int hf_netlink_sock_diag_packet_show_ring_cfg;
+static int hf_netlink_sock_diag_rcvbuf;
+static int hf_netlink_sock_diag_rmem_alloc;
+static int hf_netlink_sock_diag_rqueue;
+static int hf_netlink_sock_diag_shutdown;
+static int hf_netlink_sock_diag_sndbuf;
+static int hf_netlink_sock_diag_state;
+static int hf_netlink_sock_diag_type;
+static int hf_netlink_sock_diag_unix_attr;
+static int hf_netlink_sock_diag_unix_name;
+static int hf_netlink_sock_diag_unix_peer_inode;
+static int hf_netlink_sock_diag_unix_show;
+static int hf_netlink_sock_diag_unix_show_icons;
+static int hf_netlink_sock_diag_unix_show_meminfo;
+static int hf_netlink_sock_diag_unix_show_name;
+static int hf_netlink_sock_diag_unix_show_peer;
+static int hf_netlink_sock_diag_unix_show_rqlen;
+static int hf_netlink_sock_diag_unix_show_vfs;
+static int hf_netlink_sock_diag_wmem_alloc;
+static int hf_netlink_sock_diag_wmem_queued;
+static int hf_netlink_sock_diag_wqueue;
+
+static int ett_netlink_sock_diag;
+static int ett_netlink_sock_diag_show;
+static int ett_netlink_sock_diag_attr;
 
 static const true_false_string _tfs_show_do_not_show = { "Show", "Don't show" };
 
diff --git a/epan/dissectors/packet-netlink.c b/epan/dissectors/packet-netlink.c
index c12d959ea1..68fada038f 100644
--- a/epan/dissectors/packet-netlink.c
+++ b/epan/dissectors/packet-netlink.c
@@ -72,41 +72,41 @@ extern value_string_ext linux_negative_errno_vals_ext;
 
 static dissector_handle_t netlink_handle;
 
-static int proto_netlink = -1;
-
-static int hf_netlink_attr_data = -1;
-static int hf_netlink_attr_index = -1;
-static int hf_netlink_attr_len = -1;
-static int hf_netlink_attr_type = -1;
-static int hf_netlink_attr_type_nested = -1;
-static int hf_netlink_attr_type_net_byteorder = -1;
-static int hf_netlink_error = -1;
-static int hf_netlink_family = -1;
-static int hf_netlink_hatype = -1;
-static int hf_netlink_hdr_flag_ack = -1;
-static int hf_netlink_hdr_flag_append = -1;
-static int hf_netlink_hdr_flag_atomic = -1;
-static int hf_netlink_hdr_flag_create = -1;
-static int hf_netlink_hdr_flag_dumpfiltered = -1;
-static int hf_netlink_hdr_flag_dumpintr = -1;
-static int hf_netlink_hdr_flag_echo = -1;
-static int hf_netlink_hdr_flag_excl = -1;
-static int hf_netlink_hdr_flag_match = -1;
-static int hf_netlink_hdr_flag_multi = -1;
-static int hf_netlink_hdr_flag_replace = -1;
-static int hf_netlink_hdr_flag_request = -1;
-static int hf_netlink_hdr_flag_root = -1;
-static int hf_netlink_hdr_flags = -1;
-static int hf_netlink_hdr_len = -1;
-static int hf_netlink_hdr_pid = -1;
-static int hf_netlink_hdr_seq = -1;
-static int hf_netlink_hdr_type = -1;
-
-static gint ett_netlink_cooked = -1;
-static gint ett_netlink_msghdr = -1;
-static gint ett_netlink_msg = -1;
-static gint ett_netlink_hdr_flags = -1;
-static gint ett_netlink_attr_type = -1;
+static int proto_netlink;
+
+static int hf_netlink_attr_data;
+static int hf_netlink_attr_index;
+static int hf_netlink_attr_len;
+static int hf_netlink_attr_type;
+static int hf_netlink_attr_type_nested;
+static int hf_netlink_attr_type_net_byteorder;
+static int hf_netlink_error;
+static int hf_netlink_family;
+static int hf_netlink_hatype;
+static int hf_netlink_hdr_flag_ack;
+static int hf_netlink_hdr_flag_append;
+static int hf_netlink_hdr_flag_atomic;
+static int hf_netlink_hdr_flag_create;
+static int hf_netlink_hdr_flag_dumpfiltered;
+static int hf_netlink_hdr_flag_dumpintr;
+static int hf_netlink_hdr_flag_echo;
+static int hf_netlink_hdr_flag_excl;
+static int hf_netlink_hdr_flag_match;
+static int hf_netlink_hdr_flag_multi;
+static int hf_netlink_hdr_flag_replace;
+static int hf_netlink_hdr_flag_request;
+static int hf_netlink_hdr_flag_root;
+static int hf_netlink_hdr_flags;
+static int hf_netlink_hdr_len;
+static int hf_netlink_hdr_pid;
+static int hf_netlink_hdr_seq;
+static int hf_netlink_hdr_type;
+
+static gint ett_netlink_cooked;
+static gint ett_netlink_msghdr;
+static gint ett_netlink_msg;
+static gint ett_netlink_hdr_flags;
+static gint ett_netlink_attr_type;
 
 static dissector_table_t netlink_dissector_table;
 
diff --git a/epan/dissectors/packet-netmon.c b/epan/dissectors/packet-netmon.c
index b4d7782ce1..92aadb79db 100644
--- a/epan/dissectors/packet-netmon.c
+++ b/epan/dissectors/packet-netmon.c
@@ -71,277 +71,277 @@ static const range_string filter_types[] = {
 static dissector_table_t provider_id_table;
 
 /* Initialize the protocol and registered fields */
-static int proto_netmon_header = -1;
-static int proto_netmon_event = -1;
-static int proto_netmon_filter = -1;
-static int proto_netmon_network_info = -1;
-static int proto_netmon_system_trace = -1;
-static int proto_netmon_system_config = -1;
-static int proto_netmon_process = -1;
-
-static int hf_netmon_header_title_comment = -1;
-static int hf_netmon_header_description_comment = -1;
-
-static int hf_netmon_event_size = -1;
-static int hf_netmon_event_header_type = -1;
-static int hf_netmon_event_flags = -1;
-static int hf_netmon_event_flags_extended_info = -1;
-static int hf_netmon_event_flags_private_session = -1;
-static int hf_netmon_event_flags_string_only = -1;
-static int hf_netmon_event_flags_trace_message = -1;
-static int hf_netmon_event_flags_no_cputime = -1;
-static int hf_netmon_event_flags_32bit_header = -1;
-static int hf_netmon_event_flags_64bit_header = -1;
-static int hf_netmon_event_flags_classic_header = -1;
-static int hf_netmon_event_event_property = -1;
-static int hf_netmon_event_event_property_xml = -1;
-static int hf_netmon_event_event_property_forwarded_xml = -1;
-static int hf_netmon_event_event_property_legacy_eventlog = -1;
-static int hf_netmon_event_thread_id = -1;
-static int hf_netmon_event_process_id = -1;
-static int hf_netmon_event_timestamp = -1;
-static int hf_netmon_event_provider_id = -1;
-static int hf_netmon_event_event_desc_id = -1;
-static int hf_netmon_event_event_desc_version = -1;
-static int hf_netmon_event_event_desc_channel = -1;
-static int hf_netmon_event_event_desc_level = -1;
-static int hf_netmon_event_event_desc_opcode = -1;
-static int hf_netmon_event_event_desc_task = -1;
-static int hf_netmon_event_event_desc_keyword = -1;
-static int hf_netmon_event_kernel_time = -1;
-static int hf_netmon_event_user_time = -1;
-static int hf_netmon_event_processor_time = -1;
-static int hf_netmon_event_activity_id = -1;
-static int hf_netmon_event_processor_number = -1;
-static int hf_netmon_event_alignment = -1;
-static int hf_netmon_event_logger_id = -1;
-static int hf_netmon_event_extended_data_count = -1;
-static int hf_netmon_event_user_data_length = -1;
-static int hf_netmon_event_reassembled = -1;
-static int hf_netmon_event_extended_data_reserved = -1;
-static int hf_netmon_event_extended_data_type = -1;
-static int hf_netmon_event_extended_data_linkage = -1;
-static int hf_netmon_event_extended_data_reserved2 = -1;
-static int hf_netmon_event_extended_data_size = -1;
-static int hf_netmon_event_extended_data = -1;
-static int hf_netmon_event_user_data = -1;
-
-static int hf_netmon_filter_version = -1;
-static int hf_netmon_filter_type = -1;
-static int hf_netmon_filter_app_major_version = -1;
-static int hf_netmon_filter_app_minor_version = -1;
-static int hf_netmon_filter_app_name = -1;
-static int hf_netmon_filter_filter = -1;
-
-static int hf_netmon_network_info_version = -1;
-static int hf_netmon_network_info_adapter_count = -1;
-static int hf_netmon_network_info_computer_name = -1;
-static int hf_netmon_network_info_friendly_name = -1;
-static int hf_netmon_network_info_description = -1;
-static int hf_netmon_network_info_miniport_guid = -1;
-static int hf_netmon_network_info_media_type = -1;
-static int hf_netmon_network_info_mtu = -1;
-static int hf_netmon_network_info_link_speed = -1;
-static int hf_netmon_network_info_mac_address = -1;
-static int hf_netmon_network_info_ipv4_count = -1;
-static int hf_netmon_network_info_ipv6_count = -1;
-static int hf_netmon_network_info_gateway_count = -1;
-static int hf_netmon_network_info_dhcp_server_count = -1;
-static int hf_netmon_network_info_dns_ipv4_count = -1;
-static int hf_netmon_network_info_dns_ipv6_count = -1;
-static int hf_netmon_network_info_ipv4 = -1;
-static int hf_netmon_network_info_subnet = -1;
-static int hf_netmon_network_info_ipv6 = -1;
-static int hf_netmon_network_info_gateway = -1;
-static int hf_netmon_network_info_dhcp_server = -1;
-static int hf_netmon_network_info_dns_ipv4 = -1;
-static int hf_netmon_network_info_dns_ipv6 = -1;
-
-static int hf_netmon_system_trace_buffer_size = -1;
-static int hf_netmon_system_trace_version = -1;
-static int hf_netmon_system_trace_provider_version = -1;
-static int hf_netmon_system_trace_num_processors = -1;
-static int hf_netmon_system_trace_end_time = -1;
-static int hf_netmon_system_trace_timer_resolution = -1;
-static int hf_netmon_system_trace_max_file_size = -1;
-static int hf_netmon_system_trace_log_file_mode = -1;
-static int hf_netmon_system_trace_buffers_written = -1;
-static int hf_netmon_system_trace_start_buffers = -1;
-static int hf_netmon_system_trace_pointers_size = -1;
-static int hf_netmon_system_trace_events_lost = -1;
-static int hf_netmon_system_trace_cpu_speed = -1;
-static int hf_netmon_system_trace_logger_name = -1;
-static int hf_netmon_system_trace_log_file_name_ptr = -1;
-static int hf_netmon_system_trace_time_zone_info = -1;
-static int hf_netmon_system_trace_boot_time = -1;
-static int hf_netmon_system_trace_perf_freq = -1;
-static int hf_netmon_system_trace_start_time = -1;
-static int hf_netmon_system_trace_reserved_flags = -1;
-static int hf_netmon_system_trace_buffers_lost = -1;
-static int hf_netmon_system_trace_session_name = -1;
-static int hf_netmon_system_trace_log_file_name = -1;
-static int hf_netmon_system_trace_group_mask1 = -1;
-static int hf_netmon_system_trace_group_mask2 = -1;
-static int hf_netmon_system_trace_group_mask3 = -1;
-static int hf_netmon_system_trace_group_mask4 = -1;
-static int hf_netmon_system_trace_group_mask5 = -1;
-static int hf_netmon_system_trace_group_mask6 = -1;
-static int hf_netmon_system_trace_group_mask7 = -1;
-static int hf_netmon_system_trace_group_mask8 = -1;
-static int hf_netmon_system_trace_kernel_event_version = -1;
-
-static int hf_netmon_system_config_mhz = -1;
-static int hf_netmon_system_config_num_processors = -1;
-static int hf_netmon_system_config_mem_size = -1;
-static int hf_netmon_system_config_page_size = -1;
-static int hf_netmon_system_config_allocation_granularity = -1;
-static int hf_netmon_system_config_computer_name = -1;
-static int hf_netmon_system_config_domain_name = -1;
-static int hf_netmon_system_config_hyper_threading_flag = -1;
-static int hf_netmon_system_config_disk_number = -1;
-static int hf_netmon_system_config_bytes_per_sector = -1;
-static int hf_netmon_system_config_sectors_per_track = -1;
-static int hf_netmon_system_config_tracks_per_cylinder = -1;
-static int hf_netmon_system_config_cylinders = -1;
-static int hf_netmon_system_config_scsi_port = -1;
-static int hf_netmon_system_config_scsi_path = -1;
-static int hf_netmon_system_config_scsi_target = -1;
-static int hf_netmon_system_config_scsi_lun = -1;
-static int hf_netmon_system_config_manufacturer = -1;
-static int hf_netmon_system_config_partition_count = -1;
-static int hf_netmon_system_config_write_cache_enabled = -1;
-static int hf_netmon_system_config_pad = -1;
-static int hf_netmon_system_config_boot_drive_letter = -1;
-static int hf_netmon_system_config_spare = -1;
-static int hf_netmon_system_config_start_offset = -1;
-static int hf_netmon_system_config_partition_size = -1;
-static int hf_netmon_system_config_size = -1;
-static int hf_netmon_system_config_drive_type = -1;
-static int hf_netmon_system_config_drive_letter = -1;
-static int hf_netmon_system_config_partition_number = -1;
-static int hf_netmon_system_config_sectors_per_cluster = -1;
-static int hf_netmon_system_config_num_free_clusters = -1;
-static int hf_netmon_system_config_total_num_clusters = -1;
-static int hf_netmon_system_config_file_system = -1;
-static int hf_netmon_system_config_volume_ext = -1;
-static int hf_netmon_system_config_physical_addr = -1;
-static int hf_netmon_system_config_physical_addr_len = -1;
-static int hf_netmon_system_config_ipv4_index = -1;
-static int hf_netmon_system_config_ipv6_index = -1;
-static int hf_netmon_system_config_nic_description = -1;
-static int hf_netmon_system_config_ipaddresses = -1;
-static int hf_netmon_system_config_dns_server_addresses = -1;
-static int hf_netmon_system_config_memory_size = -1;
-static int hf_netmon_system_config_x_resolution = -1;
-static int hf_netmon_system_config_y_resolution = -1;
-static int hf_netmon_system_config_bits_per_pixel = -1;
-static int hf_netmon_system_config_vrefresh = -1;
-static int hf_netmon_system_config_chip_type = -1;
-static int hf_netmon_system_config_dac_type = -1;
-static int hf_netmon_system_config_adapter_string = -1;
-static int hf_netmon_system_config_bios_string = -1;
-static int hf_netmon_system_config_device_id = -1;
-static int hf_netmon_system_config_state_flags = -1;
-static int hf_netmon_system_config_process_id = -1;
-static int hf_netmon_system_config_service_state = -1;
-static int hf_netmon_system_config_sub_process_tag = -1;
-static int hf_netmon_system_config_service_name = -1;
-static int hf_netmon_system_config_display_name = -1;
-static int hf_netmon_system_config_process_name = -1;
-static int hf_netmon_system_config_s1 = -1;
-static int hf_netmon_system_config_s2 = -1;
-static int hf_netmon_system_config_s3 = -1;
-static int hf_netmon_system_config_s4 = -1;
-static int hf_netmon_system_config_s5 = -1;
-static int hf_netmon_system_config_tcb_table_partitions = -1;
-static int hf_netmon_system_config_max_hash_table_size = -1;
-static int hf_netmon_system_config_max_user_port = -1;
-static int hf_netmon_system_config_tcp_timed_wait_delay = -1;
-static int hf_netmon_system_config_irq_affinity = -1;
-static int hf_netmon_system_config_irq_num = -1;
-static int hf_netmon_system_config_device_desc_len = -1;
-static int hf_netmon_system_config_device_desc = -1;
-static int hf_netmon_system_config_device_id_len = -1;
-static int hf_netmon_system_config_friendly_name_len = -1;
-static int hf_netmon_system_config_friendly_name = -1;
-static int hf_netmon_system_config_target_id = -1;
-static int hf_netmon_system_config_device_type = -1;
-static int hf_netmon_system_config_device_timing_mode = -1;
-static int hf_netmon_system_config_location_information_len = -1;
-static int hf_netmon_system_config_location_information = -1;
-static int hf_netmon_system_config_system_manufacturer = -1;
-static int hf_netmon_system_config_system_product_name = -1;
-static int hf_netmon_system_config_bios_date = -1;
-static int hf_netmon_system_config_bios_version = -1;
-static int hf_netmon_system_config_load_order_group = -1;
-static int hf_netmon_system_config_svc_host_group = -1;
-static int hf_netmon_system_config_irq_group = -1;
-static int hf_netmon_system_config_pdo_name = -1;
-static int hf_netmon_system_config_nic_name = -1;
-static int hf_netmon_system_config_index = -1;
-static int hf_netmon_system_config_physical_addr_str = -1;
-static int hf_netmon_system_config_ip_address = -1;
-static int hf_netmon_system_config_subnet_mask = -1;
-static int hf_netmon_system_config_dhcp_server = -1;
-static int hf_netmon_system_config_gateway = -1;
-static int hf_netmon_system_config_primary_wins_server = -1;
-static int hf_netmon_system_config_secondary_wins_server = -1;
-static int hf_netmon_system_config_dns_server1 = -1;
-static int hf_netmon_system_config_dns_server2 = -1;
-static int hf_netmon_system_config_dns_server3 = -1;
-static int hf_netmon_system_config_dns_server4 = -1;
-static int hf_netmon_system_config_data = -1;
-
-
-
-static int hf_netmon_process_unique_process_key = -1;
-static int hf_netmon_process_process_id = -1;
-static int hf_netmon_process_parent_id = -1;
-static int hf_netmon_process_session_id = -1;
-static int hf_netmon_process_exit_status = -1;
-static int hf_netmon_process_directory_table_base = -1;
-static int hf_netmon_process_unknown = -1;
-static int hf_netmon_process_user_sid_revision = -1;
-static int hf_netmon_process_user_sid_subauth_count = -1;
-static int hf_netmon_process_user_sid_id = -1;
-static int hf_netmon_process_user_sid_authority = -1;
-static int hf_netmon_process_image_file_name = -1;
-static int hf_netmon_process_command_line = -1;
-static int hf_netmon_process_page_directory_base = -1;
-static int hf_netmon_process_page_fault_count = -1;
-static int hf_netmon_process_handle_count = -1;
-static int hf_netmon_process_reserved = -1;
-static int hf_netmon_process_peak_virtual_size = -1;
-static int hf_netmon_process_peak_working_set_size = -1;
-static int hf_netmon_process_peak_page_file_usage = -1;
-static int hf_netmon_process_quota_peak_paged_pool_usage = -1;
-static int hf_netmon_process_quota_peak_non_paged_pool_usage = -1;
-static int hf_netmon_process_virtual_size = -1;
-static int hf_netmon_process_workingset_size = -1;
-static int hf_netmon_process_pagefile_usage = -1;
-static int hf_netmon_process_quota_paged_pool_usage = -1;
-static int hf_netmon_process_quota_non_paged_pool_usage = -1;
-static int hf_netmon_process_private_page_count = -1;
-static int hf_netmon_process_directory_table_base32 = -1;
-
-
-static gint ett_netmon_header = -1;
-static gint ett_netmon_event = -1;
-static gint ett_netmon_event_desc = -1;
-static gint ett_netmon_event_flags = -1;
-static gint ett_netmon_event_property = -1;
-static gint ett_netmon_event_extended_data = -1;
-static gint ett_netmon_filter = -1;
-static gint ett_netmon_network_info = -1;
-static gint ett_netmon_network_info_list = -1;
-static gint ett_netmon_network_info_adapter = -1;
-static gint ett_netmon_system_trace = -1;
-static gint ett_netmon_event_buffer_context = -1;
-static gint ett_netmon_process = -1;
-static gint ett_netmon_sid = -1;
-static gint ett_netmon_system_config = -1;
-
-static expert_field ei_netmon_process_user_sid = EI_INIT;
+static int proto_netmon_header;
+static int proto_netmon_event;
+static int proto_netmon_filter;
+static int proto_netmon_network_info;
+static int proto_netmon_system_trace;
+static int proto_netmon_system_config;
+static int proto_netmon_process;
+
+static int hf_netmon_header_title_comment;
+static int hf_netmon_header_description_comment;
+
+static int hf_netmon_event_size;
+static int hf_netmon_event_header_type;
+static int hf_netmon_event_flags;
+static int hf_netmon_event_flags_extended_info;
+static int hf_netmon_event_flags_private_session;
+static int hf_netmon_event_flags_string_only;
+static int hf_netmon_event_flags_trace_message;
+static int hf_netmon_event_flags_no_cputime;
+static int hf_netmon_event_flags_32bit_header;
+static int hf_netmon_event_flags_64bit_header;
+static int hf_netmon_event_flags_classic_header;
+static int hf_netmon_event_event_property;
+static int hf_netmon_event_event_property_xml;
+static int hf_netmon_event_event_property_forwarded_xml;
+static int hf_netmon_event_event_property_legacy_eventlog;
+static int hf_netmon_event_thread_id;
+static int hf_netmon_event_process_id;
+static int hf_netmon_event_timestamp;
+static int hf_netmon_event_provider_id;
+static int hf_netmon_event_event_desc_id;
+static int hf_netmon_event_event_desc_version;
+static int hf_netmon_event_event_desc_channel;
+static int hf_netmon_event_event_desc_level;
+static int hf_netmon_event_event_desc_opcode;
+static int hf_netmon_event_event_desc_task;
+static int hf_netmon_event_event_desc_keyword;
+static int hf_netmon_event_kernel_time;
+static int hf_netmon_event_user_time;
+static int hf_netmon_event_processor_time;
+static int hf_netmon_event_activity_id;
+static int hf_netmon_event_processor_number;
+static int hf_netmon_event_alignment;
+static int hf_netmon_event_logger_id;
+static int hf_netmon_event_extended_data_count;
+static int hf_netmon_event_user_data_length;
+static int hf_netmon_event_reassembled;
+static int hf_netmon_event_extended_data_reserved;
+static int hf_netmon_event_extended_data_type;
+static int hf_netmon_event_extended_data_linkage;
+static int hf_netmon_event_extended_data_reserved2;
+static int hf_netmon_event_extended_data_size;
+static int hf_netmon_event_extended_data;
+static int hf_netmon_event_user_data;
+
+static int hf_netmon_filter_version;
+static int hf_netmon_filter_type;
+static int hf_netmon_filter_app_major_version;
+static int hf_netmon_filter_app_minor_version;
+static int hf_netmon_filter_app_name;
+static int hf_netmon_filter_filter;
+
+static int hf_netmon_network_info_version;
+static int hf_netmon_network_info_adapter_count;
+static int hf_netmon_network_info_computer_name;
+static int hf_netmon_network_info_friendly_name;
+static int hf_netmon_network_info_description;
+static int hf_netmon_network_info_miniport_guid;
+static int hf_netmon_network_info_media_type;
+static int hf_netmon_network_info_mtu;
+static int hf_netmon_network_info_link_speed;
+static int hf_netmon_network_info_mac_address;
+static int hf_netmon_network_info_ipv4_count;
+static int hf_netmon_network_info_ipv6_count;
+static int hf_netmon_network_info_gateway_count;
+static int hf_netmon_network_info_dhcp_server_count;
+static int hf_netmon_network_info_dns_ipv4_count;
+static int hf_netmon_network_info_dns_ipv6_count;
+static int hf_netmon_network_info_ipv4;
+static int hf_netmon_network_info_subnet;
+static int hf_netmon_network_info_ipv6;
+static int hf_netmon_network_info_gateway;
+static int hf_netmon_network_info_dhcp_server;
+static int hf_netmon_network_info_dns_ipv4;
+static int hf_netmon_network_info_dns_ipv6;
+
+static int hf_netmon_system_trace_buffer_size;
+static int hf_netmon_system_trace_version;
+static int hf_netmon_system_trace_provider_version;
+static int hf_netmon_system_trace_num_processors;
+static int hf_netmon_system_trace_end_time;
+static int hf_netmon_system_trace_timer_resolution;
+static int hf_netmon_system_trace_max_file_size;
+static int hf_netmon_system_trace_log_file_mode;
+static int hf_netmon_system_trace_buffers_written;
+static int hf_netmon_system_trace_start_buffers;
+static int hf_netmon_system_trace_pointers_size;
+static int hf_netmon_system_trace_events_lost;
+static int hf_netmon_system_trace_cpu_speed;
+static int hf_netmon_system_trace_logger_name;
+static int hf_netmon_system_trace_log_file_name_ptr;
+static int hf_netmon_system_trace_time_zone_info;
+static int hf_netmon_system_trace_boot_time;
+static int hf_netmon_system_trace_perf_freq;
+static int hf_netmon_system_trace_start_time;
+static int hf_netmon_system_trace_reserved_flags;
+static int hf_netmon_system_trace_buffers_lost;
+static int hf_netmon_system_trace_session_name;
+static int hf_netmon_system_trace_log_file_name;
+static int hf_netmon_system_trace_group_mask1;
+static int hf_netmon_system_trace_group_mask2;
+static int hf_netmon_system_trace_group_mask3;
+static int hf_netmon_system_trace_group_mask4;
+static int hf_netmon_system_trace_group_mask5;
+static int hf_netmon_system_trace_group_mask6;
+static int hf_netmon_system_trace_group_mask7;
+static int hf_netmon_system_trace_group_mask8;
+static int hf_netmon_system_trace_kernel_event_version;
+
+static int hf_netmon_system_config_mhz;
+static int hf_netmon_system_config_num_processors;
+static int hf_netmon_system_config_mem_size;
+static int hf_netmon_system_config_page_size;
+static int hf_netmon_system_config_allocation_granularity;
+static int hf_netmon_system_config_computer_name;
+static int hf_netmon_system_config_domain_name;
+static int hf_netmon_system_config_hyper_threading_flag;
+static int hf_netmon_system_config_disk_number;
+static int hf_netmon_system_config_bytes_per_sector;
+static int hf_netmon_system_config_sectors_per_track;
+static int hf_netmon_system_config_tracks_per_cylinder;
+static int hf_netmon_system_config_cylinders;
+static int hf_netmon_system_config_scsi_port;
+static int hf_netmon_system_config_scsi_path;
+static int hf_netmon_system_config_scsi_target;
+static int hf_netmon_system_config_scsi_lun;
+static int hf_netmon_system_config_manufacturer;
+static int hf_netmon_system_config_partition_count;
+static int hf_netmon_system_config_write_cache_enabled;
+static int hf_netmon_system_config_pad;
+static int hf_netmon_system_config_boot_drive_letter;
+static int hf_netmon_system_config_spare;
+static int hf_netmon_system_config_start_offset;
+static int hf_netmon_system_config_partition_size;
+static int hf_netmon_system_config_size;
+static int hf_netmon_system_config_drive_type;
+static int hf_netmon_system_config_drive_letter;
+static int hf_netmon_system_config_partition_number;
+static int hf_netmon_system_config_sectors_per_cluster;
+static int hf_netmon_system_config_num_free_clusters;
+static int hf_netmon_system_config_total_num_clusters;
+static int hf_netmon_system_config_file_system;
+static int hf_netmon_system_config_volume_ext;
+static int hf_netmon_system_config_physical_addr;
+static int hf_netmon_system_config_physical_addr_len;
+static int hf_netmon_system_config_ipv4_index;
+static int hf_netmon_system_config_ipv6_index;
+static int hf_netmon_system_config_nic_description;
+static int hf_netmon_system_config_ipaddresses;
+static int hf_netmon_system_config_dns_server_addresses;
+static int hf_netmon_system_config_memory_size;
+static int hf_netmon_system_config_x_resolution;
+static int hf_netmon_system_config_y_resolution;
+static int hf_netmon_system_config_bits_per_pixel;
+static int hf_netmon_system_config_vrefresh;
+static int hf_netmon_system_config_chip_type;
+static int hf_netmon_system_config_dac_type;
+static int hf_netmon_system_config_adapter_string;
+static int hf_netmon_system_config_bios_string;
+static int hf_netmon_system_config_device_id;
+static int hf_netmon_system_config_state_flags;
+static int hf_netmon_system_config_process_id;
+static int hf_netmon_system_config_service_state;
+static int hf_netmon_system_config_sub_process_tag;
+static int hf_netmon_system_config_service_name;
+static int hf_netmon_system_config_display_name;
+static int hf_netmon_system_config_process_name;
+static int hf_netmon_system_config_s1;
+static int hf_netmon_system_config_s2;
+static int hf_netmon_system_config_s3;
+static int hf_netmon_system_config_s4;
+static int hf_netmon_system_config_s5;
+static int hf_netmon_system_config_tcb_table_partitions;
+static int hf_netmon_system_config_max_hash_table_size;
+static int hf_netmon_system_config_max_user_port;
+static int hf_netmon_system_config_tcp_timed_wait_delay;
+static int hf_netmon_system_config_irq_affinity;
+static int hf_netmon_system_config_irq_num;
+static int hf_netmon_system_config_device_desc_len;
+static int hf_netmon_system_config_device_desc;
+static int hf_netmon_system_config_device_id_len;
+static int hf_netmon_system_config_friendly_name_len;
+static int hf_netmon_system_config_friendly_name;
+static int hf_netmon_system_config_target_id;
+static int hf_netmon_system_config_device_type;
+static int hf_netmon_system_config_device_timing_mode;
+static int hf_netmon_system_config_location_information_len;
+static int hf_netmon_system_config_location_information;
+static int hf_netmon_system_config_system_manufacturer;
+static int hf_netmon_system_config_system_product_name;
+static int hf_netmon_system_config_bios_date;
+static int hf_netmon_system_config_bios_version;
+static int hf_netmon_system_config_load_order_group;
+static int hf_netmon_system_config_svc_host_group;
+static int hf_netmon_system_config_irq_group;
+static int hf_netmon_system_config_pdo_name;
+static int hf_netmon_system_config_nic_name;
+static int hf_netmon_system_config_index;
+static int hf_netmon_system_config_physical_addr_str;
+static int hf_netmon_system_config_ip_address;
+static int hf_netmon_system_config_subnet_mask;
+static int hf_netmon_system_config_dhcp_server;
+static int hf_netmon_system_config_gateway;
+static int hf_netmon_system_config_primary_wins_server;
+static int hf_netmon_system_config_secondary_wins_server;
+static int hf_netmon_system_config_dns_server1;
+static int hf_netmon_system_config_dns_server2;
+static int hf_netmon_system_config_dns_server3;
+static int hf_netmon_system_config_dns_server4;
+static int hf_netmon_system_config_data;
+
+
+
+static int hf_netmon_process_unique_process_key;
+static int hf_netmon_process_process_id;
+static int hf_netmon_process_parent_id;
+static int hf_netmon_process_session_id;
+static int hf_netmon_process_exit_status;
+static int hf_netmon_process_directory_table_base;
+static int hf_netmon_process_unknown;
+static int hf_netmon_process_user_sid_revision;
+static int hf_netmon_process_user_sid_subauth_count;
+static int hf_netmon_process_user_sid_id;
+static int hf_netmon_process_user_sid_authority;
+static int hf_netmon_process_image_file_name;
+static int hf_netmon_process_command_line;
+static int hf_netmon_process_page_directory_base;
+static int hf_netmon_process_page_fault_count;
+static int hf_netmon_process_handle_count;
+static int hf_netmon_process_reserved;
+static int hf_netmon_process_peak_virtual_size;
+static int hf_netmon_process_peak_working_set_size;
+static int hf_netmon_process_peak_page_file_usage;
+static int hf_netmon_process_quota_peak_paged_pool_usage;
+static int hf_netmon_process_quota_peak_non_paged_pool_usage;
+static int hf_netmon_process_virtual_size;
+static int hf_netmon_process_workingset_size;
+static int hf_netmon_process_pagefile_usage;
+static int hf_netmon_process_quota_paged_pool_usage;
+static int hf_netmon_process_quota_non_paged_pool_usage;
+static int hf_netmon_process_private_page_count;
+static int hf_netmon_process_directory_table_base32;
+
+
+static gint ett_netmon_header;
+static gint ett_netmon_event;
+static gint ett_netmon_event_desc;
+static gint ett_netmon_event_flags;
+static gint ett_netmon_event_property;
+static gint ett_netmon_event_extended_data;
+static gint ett_netmon_filter;
+static gint ett_netmon_network_info;
+static gint ett_netmon_network_info_list;
+static gint ett_netmon_network_info_adapter;
+static gint ett_netmon_system_trace;
+static gint ett_netmon_event_buffer_context;
+static gint ett_netmon_process;
+static gint ett_netmon_sid;
+static gint ett_netmon_system_config;
+
+static expert_field ei_netmon_process_user_sid;
 
 static dissector_table_t wtap_encap_table;
 
diff --git a/epan/dissectors/packet-netperfmeter.c b/epan/dissectors/packet-netperfmeter.c
index 9e5349abfb..6e76f8478c 100644
--- a/epan/dissectors/packet-netperfmeter.c
+++ b/epan/dissectors/packet-netperfmeter.c
@@ -25,15 +25,15 @@ void proto_reg_handoff_npm(void);
 
 static dissector_handle_t npm_handle;
 
-static int proto_npm              = -1;
+static int proto_npm;
 static int tap_npm                = -1;
-static int ett_npm                = -1;
-static int ett_addflow_flags      = -1;
-static int ett_identifyflow_flags = -1;
-static int ett_start_flags        = -1;
-static int ett_data_flags         = -1;
-static int ett_results_flags      = -1;
-static int ett_onoffarray         = -1;
+static int ett_npm;
+static int ett_addflow_flags;
+static int ett_identifyflow_flags;
+static int ett_start_flags;
+static int ett_data_flags;
+static int ett_results_flags;
+static int ett_onoffarray;
 
 static guint64 npm_total_msgs     = 0;
 static guint64 npm_total_bytes    = 0;
@@ -66,83 +66,83 @@ static const value_string message_type_values[] = {
   { 0, NULL }
 };
 
-static int hf_message_type               = -1;
-static int hf_message_flags              = -1;
-static int hf_message_length             = -1;
-
-static int hf_acknowledge_flowid         = -1;
-static int hf_acknowledge_measurementid  = -1;
-static int hf_acknowledge_streamid       = -1;
-// static int hf_acknowledge_padding     = -1;
-static int hf_acknowledge_status         = -1;
-
-static int hf_addflow_flag_debug         = -1;
-static int hf_addflow_flag_nodelay       = -1;
-static int hf_addflow_flag_repeatonoff   = -1;
-static int hf_addflow_flowid             = -1;
-static int hf_addflow_measurementid      = -1;
-static int hf_addflow_streamid           = -1;
-static int hf_addflow_protocol           = -1;
-static int hf_addflow_flags              = -1;
-static int hf_addflow_description        = -1;
-static int hf_addflow_ordered            = -1;
-static int hf_addflow_reliable           = -1;
-static int hf_addflow_retranstrials      = -1;
-static int hf_addflow_framerate1         = -1;
-static int hf_addflow_framerate2         = -1;
-static int hf_addflow_framerate3         = -1;
-static int hf_addflow_framerate4         = -1;
-static int hf_addflow_framesize1         = -1;
-static int hf_addflow_framesize2         = -1;
-static int hf_addflow_framesize3         = -1;
-static int hf_addflow_framesize4         = -1;
-static int hf_addflow_frameraterng       = -1;
-static int hf_addflow_framesizerng       = -1;
-static int hf_addflow_rcvbuffersize      = -1;
-static int hf_addflow_sndbuffersize      = -1;
-static int hf_addflow_maxmsgsize         = -1;
-static int hf_addflow_cmt                = -1;
-static int hf_addflow_ccid               = -1;
-static int hf_addflow_onoffevents        = -1;
-static int hf_addflow_onoffeventarray    = -1;
-
-static int hf_removeflow_flowid          = -1;
-static int hf_removeflow_measurementid   = -1;
-static int hf_removeflow_streamid        = -1;
-
-static int hf_identifyflow_flag_compress_vectors = -1;
-static int hf_identifyflow_flag_no_vectors       = -1;
-static int hf_identifyflow_flowid        = -1;
-static int hf_identifyflow_magicnumber   = -1;
-static int hf_identifyflow_measurementid = -1;
-static int hf_identifyflow_streamid      = -1;
+static int hf_message_type;
+static int hf_message_flags;
+static int hf_message_length;
+
+static int hf_acknowledge_flowid;
+static int hf_acknowledge_measurementid;
+static int hf_acknowledge_streamid;
+// static int hf_acknowledge_padding;
+static int hf_acknowledge_status;
+
+static int hf_addflow_flag_debug;
+static int hf_addflow_flag_nodelay;
+static int hf_addflow_flag_repeatonoff;
+static int hf_addflow_flowid;
+static int hf_addflow_measurementid;
+static int hf_addflow_streamid;
+static int hf_addflow_protocol;
+static int hf_addflow_flags;
+static int hf_addflow_description;
+static int hf_addflow_ordered;
+static int hf_addflow_reliable;
+static int hf_addflow_retranstrials;
+static int hf_addflow_framerate1;
+static int hf_addflow_framerate2;
+static int hf_addflow_framerate3;
+static int hf_addflow_framerate4;
+static int hf_addflow_framesize1;
+static int hf_addflow_framesize2;
+static int hf_addflow_framesize3;
+static int hf_addflow_framesize4;
+static int hf_addflow_frameraterng;
+static int hf_addflow_framesizerng;
+static int hf_addflow_rcvbuffersize;
+static int hf_addflow_sndbuffersize;
+static int hf_addflow_maxmsgsize;
+static int hf_addflow_cmt;
+static int hf_addflow_ccid;
+static int hf_addflow_onoffevents;
+static int hf_addflow_onoffeventarray;
+
+static int hf_removeflow_flowid;
+static int hf_removeflow_measurementid;
+static int hf_removeflow_streamid;
+
+static int hf_identifyflow_flag_compress_vectors;
+static int hf_identifyflow_flag_no_vectors;
+static int hf_identifyflow_flowid;
+static int hf_identifyflow_magicnumber;
+static int hf_identifyflow_measurementid;
+static int hf_identifyflow_streamid;
 
 #define NETPERFMETER_IDENTIFY_FLOW_MAGIC_NUMBER 0x4bcdf3aa303c6774ULL
 
-static int hf_data_flag_frame_begin       = -1;
-static int hf_data_flag_frame_end         = -1;
-static int hf_data_flowid                 = -1;
-static int hf_data_measurementid          = -1;
-static int hf_data_streamid               = -1;
-static int hf_data_padding                = -1;
-static int hf_data_frameid                = -1;
-static int hf_data_packetseqnumber        = -1;
-static int hf_data_byteseqnumber          = -1;
-static int hf_data_timestamp              = -1;
-static int hf_data_payload                = -1;
-
-static int hf_start_flag_compress_vectors = -1;
-static int hf_start_flag_compress_scalars = -1;
-static int hf_start_flag_no_vectors       = -1;
-static int hf_start_flag_no_scalars       = -1;
-// static int hf_start_padding            = -1;
-static int hf_start_measurementid         = -1;
-
-// static int hf_stop_padding             = -1;
-static int hf_stop_measurementid          = -1;
-
-static int hf_results_flag_eof            = -1;
-static int hf_results_data                = -1;
+static int hf_data_flag_frame_begin;
+static int hf_data_flag_frame_end;
+static int hf_data_flowid;
+static int hf_data_measurementid;
+static int hf_data_streamid;
+static int hf_data_padding;
+static int hf_data_frameid;
+static int hf_data_packetseqnumber;
+static int hf_data_byteseqnumber;
+static int hf_data_timestamp;
+static int hf_data_payload;
+
+static int hf_start_flag_compress_vectors;
+static int hf_start_flag_compress_scalars;
+static int hf_start_flag_no_vectors;
+static int hf_start_flag_no_scalars;
+// static int hf_start_padding;
+static int hf_start_measurementid;
+
+// static int hf_stop_padding;
+static int hf_stop_measurementid;
+
+static int hf_results_flag_eof;
+static int hf_results_data;
 
 
 /* Setup list of Transport Layer protocol types */
diff --git a/epan/dissectors/packet-netrom.c b/epan/dissectors/packet-netrom.c
index 2610577709..8f415417b3 100644
--- a/epan/dissectors/packet-netrom.c
+++ b/epan/dissectors/packet-netrom.c
@@ -62,28 +62,28 @@ void proto_reg_handoff_netrom(void);
 static dissector_handle_t ip_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_netrom			= -1;
-static int hf_netrom_src		= -1;
-static int hf_netrom_dst		= -1;
-static int hf_netrom_ttl		= -1;
-static int hf_netrom_my_cct_index	= -1;
-static int hf_netrom_my_cct_id		= -1;
-static int hf_netrom_your_cct_index	= -1;
-static int hf_netrom_your_cct_id	= -1;
-static int hf_netrom_n_r		= -1;
-static int hf_netrom_n_s		= -1;
-static int hf_netrom_type		= -1;
-static int hf_netrom_op			= -1;
-static int hf_netrom_more		= -1;
-static int hf_netrom_nak		= -1;
-static int hf_netrom_choke		= -1;
-
-static int hf_netrom_user		= -1;
-static int hf_netrom_node		= -1;
-static int hf_netrom_pwindow		= -1;
-static int hf_netrom_awindow		= -1;
-
-static int hf_netrom_mnemonic		= -1;
+static int proto_netrom;
+static int hf_netrom_src;
+static int hf_netrom_dst;
+static int hf_netrom_ttl;
+static int hf_netrom_my_cct_index;
+static int hf_netrom_my_cct_id;
+static int hf_netrom_your_cct_index;
+static int hf_netrom_your_cct_id;
+static int hf_netrom_n_r;
+static int hf_netrom_n_s;
+static int hf_netrom_type;
+static int hf_netrom_op;
+static int hf_netrom_more;
+static int hf_netrom_nak;
+static int hf_netrom_choke;
+
+static int hf_netrom_user;
+static int hf_netrom_node;
+static int hf_netrom_pwindow;
+static int hf_netrom_awindow;
+
+static int hf_netrom_mnemonic;
 
 /*
  * Structure containing pointers to hf_ values for various subfields of
@@ -127,8 +127,8 @@ static const value_string op_code_vals_text[] = {
 };
 
 /* Initialize the subtree pointers */
-static gint ett_netrom      = -1;
-static gint ett_netrom_type = -1;
+static gint ett_netrom;
+static gint ett_netrom_type;
 
 static void
 dissect_netrom_type(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c
index e0ed1a77f8..fe874a2fa8 100644
--- a/epan/dissectors/packet-netsync.c
+++ b/epan/dissectors/packet-netsync.c
@@ -79,61 +79,61 @@ static const value_string netsync_cmd_vals[] = {
 #define NETSNYC_MERKLE_HASH_LENGTH 20
 
 /* Define the monotone netsync proto */
-static int proto_netsync = -1;
+static int proto_netsync;
 
-static int hf_netsync_version = -1;
-static int hf_netsync_command = -1;
-static int hf_netsync_size = -1;
-static int hf_netsync_data = -1;
-static int hf_netsync_checksum = -1;
+static int hf_netsync_version;
+static int hf_netsync_command;
+static int hf_netsync_size;
+static int hf_netsync_data;
+static int hf_netsync_checksum;
 
-static int hf_netsync_cmd_done_level = -1;
-static int hf_netsync_cmd_done_type = -1;
+static int hf_netsync_cmd_done_level;
+static int hf_netsync_cmd_done_type;
 
-static int hf_netsync_cmd_hello_keyname = -1;
-static int hf_netsync_cmd_hello_key = -1;
-static int hf_netsync_cmd_nonce = -1;
+static int hf_netsync_cmd_hello_keyname;
+static int hf_netsync_cmd_hello_key;
+static int hf_netsync_cmd_nonce;
 
-static int hf_netsync_cmd_anonymous_role = -1;
-static int hf_netsync_cmd_anonymous_collection = -1;
+static int hf_netsync_cmd_anonymous_role;
+static int hf_netsync_cmd_anonymous_collection;
 
-static int hf_netsync_cmd_send_data_type = -1;
-static int hf_netsync_cmd_send_data_id = -1;
+static int hf_netsync_cmd_send_data_type;
+static int hf_netsync_cmd_send_data_id;
 
-static int hf_netsync_cmd_error_msg = -1;
+static int hf_netsync_cmd_error_msg;
 
 
-static int hf_netsync_cmd_confirm_sig = -1;
+static int hf_netsync_cmd_confirm_sig;
 
-static int hf_netsync_cmd_auth_role = -1;
-static int hf_netsync_cmd_auth_collection = -1;
-static int hf_netsync_cmd_auth_id = -1;
-static int hf_netsync_cmd_auth_nonce1 = -1;
-static int hf_netsync_cmd_auth_nonce2 = -1;
-static int hf_netsync_cmd_auth_sig = -1;
+static int hf_netsync_cmd_auth_role;
+static int hf_netsync_cmd_auth_collection;
+static int hf_netsync_cmd_auth_id;
+static int hf_netsync_cmd_auth_nonce1;
+static int hf_netsync_cmd_auth_nonce2;
+static int hf_netsync_cmd_auth_sig;
 
-static int hf_netsync_cmd_data_type = -1;
-static int hf_netsync_cmd_data_id = -1;
-static int hf_netsync_cmd_data_compressed = -1;
-static int hf_netsync_cmd_data_payload = -1;
+static int hf_netsync_cmd_data_type;
+static int hf_netsync_cmd_data_id;
+static int hf_netsync_cmd_data_compressed;
+static int hf_netsync_cmd_data_payload;
 
-static int hf_netsync_cmd_delta_type = -1;
-static int hf_netsync_cmd_delta_base_id = -1;
-static int hf_netsync_cmd_delta_ident_id = -1;
-static int hf_netsync_cmd_delta_compressed = -1;
-static int hf_netsync_cmd_delta_payload = -1;
+static int hf_netsync_cmd_delta_type;
+static int hf_netsync_cmd_delta_base_id;
+static int hf_netsync_cmd_delta_ident_id;
+static int hf_netsync_cmd_delta_compressed;
+static int hf_netsync_cmd_delta_payload;
 
-static int hf_netsync_cmd_refine_tree_node = -1;
+static int hf_netsync_cmd_refine_tree_node;
 
-static int hf_netsync_cmd_send_delta_type = -1;
-static int hf_netsync_cmd_send_delta_base_id = -1;
-static int hf_netsync_cmd_send_delta_ident_id = -1;
+static int hf_netsync_cmd_send_delta_type;
+static int hf_netsync_cmd_send_delta_base_id;
+static int hf_netsync_cmd_send_delta_ident_id;
 
-static int hf_netsync_cmd_nonexistent_type = -1;
-static int hf_netsync_cmd_nonexistent_id = -1;
+static int hf_netsync_cmd_nonexistent_type;
+static int hf_netsync_cmd_nonexistent_id;
 
 /* Define the tree for netsync */
-static int ett_netsync = -1;
+static int ett_netsync;
 
 
 /*
diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c
index fd912395f6..ca01256253 100644
--- a/epan/dissectors/packet-nettl.c
+++ b/epan/dissectors/packet-nettl.c
@@ -24,13 +24,13 @@ void proto_reg_handoff_nettl(void);
 
 /* Initialize the protocol and registered fields */
 
-static int proto_nettl = -1;
+static int proto_nettl;
 
-static int hf_nettl_subsys = -1;
-static int hf_nettl_devid = -1;
-static int hf_nettl_kind = -1;
-static int hf_nettl_pid = -1;
-static int hf_nettl_uid = -1;
+static int hf_nettl_subsys;
+static int hf_nettl_devid;
+static int hf_nettl_kind;
+static int hf_nettl_pid;
+static int hf_nettl_uid;
 
 static dissector_handle_t nettl_handle;
 static dissector_handle_t eth_withoutfcs_handle;
@@ -47,7 +47,7 @@ static dissector_table_t tcp_subdissector_table;
 
 /* Initialize the subtree pointers */
 
-static gint ett_nettl = -1;
+static gint ett_nettl;
 
 /* General declarations and macros */
 
diff --git a/epan/dissectors/packet-newmail.c b/epan/dissectors/packet-newmail.c
index 03eb3e8a40..f1916fbefc 100644
--- a/epan/dissectors/packet-newmail.c
+++ b/epan/dissectors/packet-newmail.c
@@ -17,11 +17,11 @@ void proto_register_newmail(void);
 void proto_reg_handoff_newmail(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_newmail = -1;
-static int hf_newmail_payload = -1;
+static int proto_newmail;
+static int hf_newmail_payload;
 
 /* Initialize the subtree pointers */
-static gint ett_newmail = -1;
+static gint ett_newmail;
 
 static dissector_handle_t newmail_handle;
 
diff --git a/epan/dissectors/packet-nfapi.c b/epan/dissectors/packet-nfapi.c
index e2a36a15d1..8b2004af68 100644
--- a/epan/dissectors/packet-nfapi.c
+++ b/epan/dissectors/packet-nfapi.c
@@ -777,639 +777,639 @@ static const value_string arfcn_direction_vals[] = {
 	{ 0, NULL }
 };
 
-static int proto_nfapi = -1;
+static int proto_nfapi;
 
 /* These are for the subtrees */
-static gint ett_nfapi = -1;
-static gint ett_nfapi_p4_p5_message_header = -1;
-static gint ett_nfapi_p7_message_header = -1;
-static gint ett_nfapi_tlv_tree = -1;
-static gint ett_nfapi_tl = -1;
-static gint ett_nfapi_pnf_phy = -1;
-static gint ett_nfapi_pnf_phy_rel10 = -1;
-static gint ett_nfapi_pnf_phy_rel11 = -1;
-static gint ett_nfapi_pnf_phy_rel12 = -1;
-static gint ett_nfapi_pnf_phy_rel13 = -1;
-static gint ett_nfapi_pnf_phy_rf_config = -1;
-static gint ett_nfapi_rf_bands = -1;
-static gint ett_nfapi_tx_antenna_ports = -1;
-static gint ett_nfapi_harq_ack_nack_data = -1;
-static gint ett_nfapi_harq_data = -1;
-static gint ett_nfapi_cc = -1;
-static gint ett_nfapi_rbs = -1;
-static gint ett_nfapi_antennas = -1;
-static gint ett_nfapi_dl_config_request_pdu_list = -1;
-static gint ett_nfapi_ul_config_request_pdu_list = -1;
-static gint ett_nfapi_hi_dci0_request_pdu_list = -1;
-static gint ett_nfapi_tx_request_pdu_list = -1;
-static gint ett_nfapi_rx_indication_pdu_list = -1;
-static gint ett_nfapi_harq_indication_pdu_list = -1;
-static gint ett_nfapi_crc_indication_pdu_list = -1;
-static gint ett_nfapi_sr_indication_pdu_list = -1;
-static gint ett_nfapi_cqi_indication_pdu_list = -1;
-static gint ett_nfapi_preamble_indication_pdu_list = -1;
-static gint ett_nfapi_srs_indication_pdu_list = -1;
-static gint ett_nfapi_lbt_dl_config_pdu_list = -1;
-static gint ett_nfapi_lbt_dl_indication_pdu_list = -1;
-static gint ett_nfapi_subbands = -1;
-static gint ett_nfapi_bf_vector_antennas = -1;
-static gint ett_nfapi_bf_vectors = -1;
-static gint ett_nfapi_csi_rs_resource_configs = -1;
-static gint ett_nfapi_csi_rs_bf_vector = -1;
-static gint ett_nfapi_epdcch_prbs = -1;
-static gint ett_nfapi_precoding = -1;
-static gint ett_nfapi_earfcn_list = -1;
-static gint ett_nfapi_uarfcn_list = -1;
-static gint ett_nfapi_arfcn_list = -1;
-static gint ett_nfapi_rssi_list = -1;
-static gint ett_nfapi_pci_list = -1;
-static gint ett_nfapi_psc_list = -1;
-static gint ett_nfapi_lte_cells_found_list = -1;
-static gint ett_nfapi_utran_cells_found_list = -1;
-static gint ett_nfapi_geran_cells_found_list = -1;
-static gint ett_nfapi_si_periodicity_list = -1;
-static gint ett_nfapi_downlink_bandwidth_support = -1;
-static gint ett_nfapi_uplink_bandwidth_support = -1;
-static gint ett_nfapi_downlink_modulation_support = -1;
-static gint ett_nfapi_uplink_modulation_support = -1;
-static gint ett_nfapi_received_interference_power_mesurement_results = -1;
-static gint ett_nfapi_release_support = -1;
-static expert_field ei_invalid_range = EI_INIT;
-static expert_field ei_invalid_tlv_length = EI_INIT;
-
-static int hf_nfapi_p4_p5_message_header_phy_id = -1;
-static int hf_nfapi_p4_p5_message_header_message_id = -1;
-static int hf_nfapi_p4_p5_message_header_message_length = -1;
-static int hf_nfapi_p4_p5_message_header_spare = -1;
-static int hf_nfapi_p7_message_header_phy_id = -1;
-static int hf_nfapi_p7_message_header_message_id = -1;
-static int hf_nfapi_p7_message_header_message_length = -1;
-static int hf_nfapi_p7_message_header_m = -1;
-static int hf_nfapi_p7_message_header_segment = -1;
-static int hf_nfapi_p7_message_header_sequence_number = -1;
-static int hf_nfapi_p7_message_header_checksum = -1;
-static int hf_nfapi_p7_message_header_transmit_timestamp = -1;
-static int hf_nfapi_tl_tag = -1;
-static int hf_nfapi_tl_length = -1;
-static int hf_nfapi_sync_mode = -1;
-static int hf_nfapi_location_mode = -1;
-static int hf_nfapi_location_coordinates = -1;
-static int hf_nfapi_dl_config_timing = -1;
-static int hf_nfapi_tx_timing = -1;
-static int hf_nfapi_ul_config_timing = -1;
-static int hf_nfapi_hi_dci0_timing = -1;
-static int hf_nfapi_maximum_number_phys = -1;
-static int hf_nfapi_maximum_total_bandwidth = -1;
-static int hf_nfapi_maximum_total_number_dl_layers = -1;
-static int hf_nfapi_maximum_total_number_ul_layers = -1;
-static int hf_nfapi_shared_bands = -1;
-static int hf_nfapi_shared_pa = -1;
-static int hf_nfapi_maximum_total_power = -1;
-static int hf_nfapi_oui = -1;
-static int hf_nfapi_pdu = -1;
-static int hf_nfapi_pnf_phy_number_phy = -1;
-static int hf_nfapi_pnf_phy_config_index = -1;
-static int hf_nfapi_number_of_rf_exclusions = -1;
-static int hf_nfapi_dl_bandwidth_support = -1;
-static int hf_nfapi_dl_bandwidth_support_6 = -1;
-static int hf_nfapi_dl_bandwidth_support_15 = -1;
-static int hf_nfapi_dl_bandwidth_support_25 = -1;
-static int hf_nfapi_dl_bandwidth_support_50 = -1;
-static int hf_nfapi_dl_bandwidth_support_75 = -1;
-static int hf_nfapi_dl_bandwidth_support_100 = -1;
-static int hf_nfapi_ul_bandwidth_support = -1;
-static int hf_nfapi_ul_bandwidth_support_6 = -1;
-static int hf_nfapi_ul_bandwidth_support_15= -1;
-static int hf_nfapi_ul_bandwidth_support_25 = -1;
-static int hf_nfapi_ul_bandwidth_support_50 = -1;
-static int hf_nfapi_ul_bandwidth_support_75 = -1;
-static int hf_nfapi_ul_bandwidth_support_100 = -1;
-static int hf_nfapi_downlink_channel_bandwidth_supported = -1;
-static int hf_nfapi_uplink_channel_bandwidth_supported = -1;
-static int hf_nfapi_number_of_dl_layers_supported = -1;
-static int hf_nfapi_number_of_ul_layers_supported = -1;
-static int hf_nfapi_maximum_3gpp_release_supported = -1;
-static int hf_nfapi_maximum_3gpp_release_supported_rel8 = -1;
-static int hf_nfapi_maximum_3gpp_release_supported_rel9 = -1;
-static int hf_nfapi_maximum_3gpp_release_supported_rel10 = -1;
-static int hf_nfapi_maximum_3gpp_release_supported_rel11 = -1;
-static int hf_nfapi_maximum_3gpp_release_supported_rel12 = -1;
-static int hf_nfapi_maximum_3gpp_release_supported_rel13 = -1;
-static int hf_nfapi_nmm_modes_supported = -1;
-static int hf_nfapi_number_of_rfs = -1;
-static int hf_nfapi_rf_config_index = -1;
-static int hf_nfapi_band = -1;
-static int hf_nfapi_maximum_transmit_power = -1;
-static int hf_nfapi_maximum_transmit_power_2 = -1;
-static int hf_nfapi_earfcn = -1;
-static int hf_nfapi_minimum_transmit_power = -1;
-static int hf_nfapi_number_of_antennas_supported = -1;
-static int hf_nfapi_minimum_downlink_frequency = -1;
-static int hf_nfapi_maximum_downlink_frequency = -1;
-static int hf_nfapi_minimum_uplink_frequency = -1;
-static int hf_nfapi_maximum_uplink_frequency = -1;
-static int hf_nfapi_number_of_rf_bands = -1;
-static int hf_nfapi_nmm_uplink_rssi_supported = -1;
-static int hf_nfapi_phy_rf_config_info_phy_id = -1;
-static int hf_nfapi_transmission_mode7_supported = -1;
-static int hf_nfapi_transmission_mode8_supported = -1;
-static int hf_nfapi_two_antennas_ports_for_pucch = -1;
-static int hf_nfapi_transmission_mode_9_supported = -1;
-static int hf_nfapi_simultaneous_pucch_pusch = -1;
-static int hf_nfapi_four_layer_tx_with_tm3_and_tm4 = -1;
-static int hf_nfapi_epdcch_supported = -1;
-static int hf_nfapi_multi_ack_csi_reporting = -1;
-static int hf_nfapi_pucch_tx_diversity_with_channel_selection = -1;
-static int hf_nfapi_ul_comp_supported = -1;
-static int hf_nfapi_transmission_mode_5_supported = -1;
-static int hf_nfapi_csi_subframe_set = -1;
-static int hf_nfapi_enhanced_4tx_codebook = -1;
-static int hf_nfapi_drs_supported = -1;
-static int hf_nfapi_ul_64qam_supported = -1;
-static int hf_nfapi_transmission_mode_10_supported = -1;
-static int hf_nfapi_alternative_tbs_indices = -1;
-static int hf_nfapi_pucch_format_4_supported = -1;
-static int hf_nfapi_pucch_format_5_supported = -1;
-static int hf_nfapi_more_than_5_ca_supported = -1;
-static int hf_nfapi_laa_supported = -1;
-static int hf_nfapi_laa_ending_in_dwpts_supported = -1;
-static int hf_nfapi_laa_starting_in_second_slot_supported = -1;
-static int hf_nfapi_beamforming_supported = -1;
-static int hf_nfapi_csi_rs_enhancements_supported = -1;
-static int hf_nfapi_drms_enhancements_supported = -1;
-static int hf_nfapi_srs_enhancements_supported = -1;
-static int hf_nfapi_dl_rs_tx_power = -1;
-static int hf_nfapi_received_interference_power = -1;
-static int hf_nfapi_thermal_noise_power = -1;
-static int hf_nfapi_dl_rs_tx_power_measurement = -1;
-static int hf_nfapi_received_interference_power_measurement = -1;
-static int hf_nfapi_thermal_noise_power_measurement = -1;
+static gint ett_nfapi;
+static gint ett_nfapi_p4_p5_message_header;
+static gint ett_nfapi_p7_message_header;
+static gint ett_nfapi_tlv_tree;
+static gint ett_nfapi_tl;
+static gint ett_nfapi_pnf_phy;
+static gint ett_nfapi_pnf_phy_rel10;
+static gint ett_nfapi_pnf_phy_rel11;
+static gint ett_nfapi_pnf_phy_rel12;
+static gint ett_nfapi_pnf_phy_rel13;
+static gint ett_nfapi_pnf_phy_rf_config;
+static gint ett_nfapi_rf_bands;
+static gint ett_nfapi_tx_antenna_ports;
+static gint ett_nfapi_harq_ack_nack_data;
+static gint ett_nfapi_harq_data;
+static gint ett_nfapi_cc;
+static gint ett_nfapi_rbs;
+static gint ett_nfapi_antennas;
+static gint ett_nfapi_dl_config_request_pdu_list;
+static gint ett_nfapi_ul_config_request_pdu_list;
+static gint ett_nfapi_hi_dci0_request_pdu_list;
+static gint ett_nfapi_tx_request_pdu_list;
+static gint ett_nfapi_rx_indication_pdu_list;
+static gint ett_nfapi_harq_indication_pdu_list;
+static gint ett_nfapi_crc_indication_pdu_list;
+static gint ett_nfapi_sr_indication_pdu_list;
+static gint ett_nfapi_cqi_indication_pdu_list;
+static gint ett_nfapi_preamble_indication_pdu_list;
+static gint ett_nfapi_srs_indication_pdu_list;
+static gint ett_nfapi_lbt_dl_config_pdu_list;
+static gint ett_nfapi_lbt_dl_indication_pdu_list;
+static gint ett_nfapi_subbands;
+static gint ett_nfapi_bf_vector_antennas;
+static gint ett_nfapi_bf_vectors;
+static gint ett_nfapi_csi_rs_resource_configs;
+static gint ett_nfapi_csi_rs_bf_vector;
+static gint ett_nfapi_epdcch_prbs;
+static gint ett_nfapi_precoding;
+static gint ett_nfapi_earfcn_list;
+static gint ett_nfapi_uarfcn_list;
+static gint ett_nfapi_arfcn_list;
+static gint ett_nfapi_rssi_list;
+static gint ett_nfapi_pci_list;
+static gint ett_nfapi_psc_list;
+static gint ett_nfapi_lte_cells_found_list;
+static gint ett_nfapi_utran_cells_found_list;
+static gint ett_nfapi_geran_cells_found_list;
+static gint ett_nfapi_si_periodicity_list;
+static gint ett_nfapi_downlink_bandwidth_support;
+static gint ett_nfapi_uplink_bandwidth_support;
+static gint ett_nfapi_downlink_modulation_support;
+static gint ett_nfapi_uplink_modulation_support;
+static gint ett_nfapi_received_interference_power_mesurement_results;
+static gint ett_nfapi_release_support;
+static expert_field ei_invalid_range;
+static expert_field ei_invalid_tlv_length;
+
+static int hf_nfapi_p4_p5_message_header_phy_id;
+static int hf_nfapi_p4_p5_message_header_message_id;
+static int hf_nfapi_p4_p5_message_header_message_length;
+static int hf_nfapi_p4_p5_message_header_spare;
+static int hf_nfapi_p7_message_header_phy_id;
+static int hf_nfapi_p7_message_header_message_id;
+static int hf_nfapi_p7_message_header_message_length;
+static int hf_nfapi_p7_message_header_m;
+static int hf_nfapi_p7_message_header_segment;
+static int hf_nfapi_p7_message_header_sequence_number;
+static int hf_nfapi_p7_message_header_checksum;
+static int hf_nfapi_p7_message_header_transmit_timestamp;
+static int hf_nfapi_tl_tag;
+static int hf_nfapi_tl_length;
+static int hf_nfapi_sync_mode;
+static int hf_nfapi_location_mode;
+static int hf_nfapi_location_coordinates;
+static int hf_nfapi_dl_config_timing;
+static int hf_nfapi_tx_timing;
+static int hf_nfapi_ul_config_timing;
+static int hf_nfapi_hi_dci0_timing;
+static int hf_nfapi_maximum_number_phys;
+static int hf_nfapi_maximum_total_bandwidth;
+static int hf_nfapi_maximum_total_number_dl_layers;
+static int hf_nfapi_maximum_total_number_ul_layers;
+static int hf_nfapi_shared_bands;
+static int hf_nfapi_shared_pa;
+static int hf_nfapi_maximum_total_power;
+static int hf_nfapi_oui;
+static int hf_nfapi_pdu;
+static int hf_nfapi_pnf_phy_number_phy;
+static int hf_nfapi_pnf_phy_config_index;
+static int hf_nfapi_number_of_rf_exclusions;
+static int hf_nfapi_dl_bandwidth_support;
+static int hf_nfapi_dl_bandwidth_support_6;
+static int hf_nfapi_dl_bandwidth_support_15;
+static int hf_nfapi_dl_bandwidth_support_25;
+static int hf_nfapi_dl_bandwidth_support_50;
+static int hf_nfapi_dl_bandwidth_support_75;
+static int hf_nfapi_dl_bandwidth_support_100;
+static int hf_nfapi_ul_bandwidth_support;
+static int hf_nfapi_ul_bandwidth_support_6;
+static int hf_nfapi_ul_bandwidth_support_15;
+static int hf_nfapi_ul_bandwidth_support_25;
+static int hf_nfapi_ul_bandwidth_support_50;
+static int hf_nfapi_ul_bandwidth_support_75;
+static int hf_nfapi_ul_bandwidth_support_100;
+static int hf_nfapi_downlink_channel_bandwidth_supported;
+static int hf_nfapi_uplink_channel_bandwidth_supported;
+static int hf_nfapi_number_of_dl_layers_supported;
+static int hf_nfapi_number_of_ul_layers_supported;
+static int hf_nfapi_maximum_3gpp_release_supported;
+static int hf_nfapi_maximum_3gpp_release_supported_rel8;
+static int hf_nfapi_maximum_3gpp_release_supported_rel9;
+static int hf_nfapi_maximum_3gpp_release_supported_rel10;
+static int hf_nfapi_maximum_3gpp_release_supported_rel11;
+static int hf_nfapi_maximum_3gpp_release_supported_rel12;
+static int hf_nfapi_maximum_3gpp_release_supported_rel13;
+static int hf_nfapi_nmm_modes_supported;
+static int hf_nfapi_number_of_rfs;
+static int hf_nfapi_rf_config_index;
+static int hf_nfapi_band;
+static int hf_nfapi_maximum_transmit_power;
+static int hf_nfapi_maximum_transmit_power_2;
+static int hf_nfapi_earfcn;
+static int hf_nfapi_minimum_transmit_power;
+static int hf_nfapi_number_of_antennas_supported;
+static int hf_nfapi_minimum_downlink_frequency;
+static int hf_nfapi_maximum_downlink_frequency;
+static int hf_nfapi_minimum_uplink_frequency;
+static int hf_nfapi_maximum_uplink_frequency;
+static int hf_nfapi_number_of_rf_bands;
+static int hf_nfapi_nmm_uplink_rssi_supported;
+static int hf_nfapi_phy_rf_config_info_phy_id;
+static int hf_nfapi_transmission_mode7_supported;
+static int hf_nfapi_transmission_mode8_supported;
+static int hf_nfapi_two_antennas_ports_for_pucch;
+static int hf_nfapi_transmission_mode_9_supported;
+static int hf_nfapi_simultaneous_pucch_pusch;
+static int hf_nfapi_four_layer_tx_with_tm3_and_tm4;
+static int hf_nfapi_epdcch_supported;
+static int hf_nfapi_multi_ack_csi_reporting;
+static int hf_nfapi_pucch_tx_diversity_with_channel_selection;
+static int hf_nfapi_ul_comp_supported;
+static int hf_nfapi_transmission_mode_5_supported;
+static int hf_nfapi_csi_subframe_set;
+static int hf_nfapi_enhanced_4tx_codebook;
+static int hf_nfapi_drs_supported;
+static int hf_nfapi_ul_64qam_supported;
+static int hf_nfapi_transmission_mode_10_supported;
+static int hf_nfapi_alternative_tbs_indices;
+static int hf_nfapi_pucch_format_4_supported;
+static int hf_nfapi_pucch_format_5_supported;
+static int hf_nfapi_more_than_5_ca_supported;
+static int hf_nfapi_laa_supported;
+static int hf_nfapi_laa_ending_in_dwpts_supported;
+static int hf_nfapi_laa_starting_in_second_slot_supported;
+static int hf_nfapi_beamforming_supported;
+static int hf_nfapi_csi_rs_enhancements_supported;
+static int hf_nfapi_drms_enhancements_supported;
+static int hf_nfapi_srs_enhancements_supported;
+static int hf_nfapi_dl_rs_tx_power;
+static int hf_nfapi_received_interference_power;
+static int hf_nfapi_thermal_noise_power;
+static int hf_nfapi_dl_rs_tx_power_measurement;
+static int hf_nfapi_received_interference_power_measurement;
+static int hf_nfapi_thermal_noise_power_measurement;
 
 // P5 Message Structures
-static int hf_nfapi_error_code = -1;
-static int hf_nfapi_p4_error_code = -1;
-static int hf_nfapi_rat_type = -1;
-static int hf_nfapi_num_tlv = -1;
-static int hf_nfapi_phy_state = -1;
-static int hf_nfapi_phy_antenna_capability = -1;
-static int hf_nfapi_release_capability = -1;
-static int hf_nfapi_mbsfn_capability = -1;
-static int hf_nfapi_laa_capability = -1;
-static int hf_nfapi_pd_sensing_lbt_support = -1;
-static int hf_nfapi_multi_carrier_lbt_support = -1;
-static int hf_nfapi_partial_sf_support = -1;
-
-static int hf_nfapi_pnf_address_ipv4 = -1;
-static int hf_nfapi_pnf_address_ipv6 = -1;
-static int hf_nfapi_vnf_address_ipv4 = -1;
-static int hf_nfapi_vnf_address_ipv6 = -1;
-static int hf_nfapi_pnf_port = -1;
-static int hf_nfapi_vnf_port = -1;
-static int hf_nfapi_dl_ue_per_sf = -1;
-static int hf_nfapi_ul_ue_per_sf = -1;
-static int hf_nfapi_timing_window = -1;
-static int hf_nfapi_timing_info_mode = -1;
-static int hf_nfapi_timing_info_period = -1;
-static int hf_nfapi_duplex_mode = -1;
-static int hf_nfapi_pcfich_power_offset = -1;
-static int hf_nfapi_pb = -1;
-static int hf_nfapi_dl_cyclic_prefix_type = -1;
-static int hf_nfapi_ul_cyclic_prefix_type = -1;
-static int hf_nfapi_tx_antenna_ports = -1;
-static int hf_nfapi_rx_antenna_ports = -1;
-static int hf_nfapi_downlink_channel_bandwidth = -1;
-static int hf_nfapi_uplink_channel_bandwidth = -1;
-static int hf_nfapi_reference_signal_power = -1;
-static int hf_nfapi_phich_resource = -1;
-static int hf_nfapi_phich_duration = -1;
-static int hf_nfapi_phich_power_offset = -1;
-static int hf_nfapi_primary_synchronization_signal_epre_eprers = -1;
-static int hf_nfapi_secondary_synchronization_signal_epre_eprers = -1;
-static int hf_nfapi_physical_cell_id = -1;
-static int hf_nfapi_configuration_index = -1;
-static int hf_nfapi_root_sequence_index = -1;
-static int hf_nfapi_zero_correlation_zone_configuration = -1;
-static int hf_nfapi_high_speed_flag = -1;
-static int hf_nfapi_frequency_offset = -1;
-static int hf_nfapi_hopping_mode = -1;
-static int hf_nfapi_hopping_offset = -1;
-static int hf_nfapi_delta_pucch_shift = -1;
-static int hf_nfapi_n_cqi_rb = -1;
-static int hf_nfapi_n_an_cs = -1;
-static int hf_nfapi_n1_pucch_an = -1;
-static int hf_nfapi_bandwidth_configuration = -1;
-static int hf_nfapi_max_up_pts = -1;
-static int hf_nfapi_srs_subframe_configuration = -1;
-static int hf_nfapi_srs_acknack_srs_simultaneous_transmission = -1;
-static int hf_nfapi_uplink_rs_hopping = -1;
-static int hf_nfapi_group_assignment = -1;
-static int hf_nfapi_cyclic_shift_1_for_drms = -1;
-static int hf_nfapi_subframe_assignment = -1;
-static int hf_nfapi_special_subframe_patterns = -1;
-static int hf_nfapi_ed_threshold_for_lbt_for_pdsch = -1;
-static int hf_nfapi_ed_threshold_for_lbt_for_drs = -1;
-static int hf_nfapi_pd_threshold = -1;
-static int hf_nfapi_multi_carrier_type = -1;
-static int hf_nfapi_multi_carrier_tx = -1;
-static int hf_nfapi_multi_carrier_freeze = -1;
-static int hf_nfapi_tx_antenna_ports_for_drs = -1;
-static int hf_nfapi_transmission_power_for_drs = -1;
-static int hf_nfapi_pbch_repetitions_enabled_r13 = -1;
-static int hf_nfapi_prach_cat_m_root_sequence_index = -1;
-static int hf_nfapi_prach_cat_m_zero_correlation_zone_configuration = -1;
-static int hf_nfapi_prach_cat_m_high_speed_flag = -1;
-static int hf_nfapi_prach_ce_level_0_enable = -1;
-static int hf_nfapi_prach_ce_level_0_configuration_index = -1;
-static int hf_nfapi_prach_ce_level_0_frequency_offset = -1;
-static int hf_nfapi_prach_ce_level_0_number_of_repetitions_per_attempt = -1;
-static int hf_nfapi_prach_ce_level_0_starting_subframe_periodicity = -1;
-static int hf_nfapi_prach_ce_level_0_hopping_enabled = -1;
-static int hf_nfapi_prach_ce_level_0_hopping_offset = -1;
-static int hf_nfapi_prach_ce_level_1_enable = -1;
-static int hf_nfapi_prach_ce_level_1_configuration_index = -1;
-static int hf_nfapi_prach_ce_level_1_frequency_offset = -1;
-static int hf_nfapi_prach_ce_level_1_number_of_repetitions_per_attempt = -1;
-static int hf_nfapi_prach_ce_level_1_starting_subframe_periodicity = -1;
-static int hf_nfapi_prach_ce_level_1_hopping_enabled = -1;
-static int hf_nfapi_prach_ce_level_1_hopping_offset = -1;
-static int hf_nfapi_prach_ce_level_2_enable = -1;
-static int hf_nfapi_prach_ce_level_2_configuration_index = -1;
-static int hf_nfapi_prach_ce_level_2_frequency_offset = -1;
-static int hf_nfapi_prach_ce_level_2_number_of_repetitions_per_attempt = -1;
-static int hf_nfapi_prach_ce_level_2_starting_subframe_periodicity = -1;
-static int hf_nfapi_prach_ce_level_2_hopping_enabled = -1;
-static int hf_nfapi_prach_ce_level_2_hopping_offset = -1;
-static int hf_nfapi_prach_ce_level_3_enable = -1;
-static int hf_nfapi_prach_ce_level_3_configuration_index = -1;
-static int hf_nfapi_prach_ce_level_3_frequency_offset = -1;
-static int hf_nfapi_prach_ce_level_3_number_of_repetitions_per_attempt = -1;
-static int hf_nfapi_prach_ce_level_3_starting_subframe_periodicity = -1;
-static int hf_nfapi_prach_ce_level_3_hopping_enabled = -1;
-static int hf_nfapi_prach_ce_level_3_hopping_offset = -1;
-static int hf_nfapi_pucch_internal_ul_hopping_config_common_mode_b = -1;
-static int hf_nfapi_pucch_internal_ul_hopping_config_common_mode_a = -1;
-static int hf_nfapi_dl_modulation_support = -1;
-static int hf_nfapi_dl_modulation_support_qpsk = -1;
-static int hf_nfapi_dl_modulation_support_16qam = -1;
-static int hf_nfapi_dl_modulation_support_64qam = -1;
-static int hf_nfapi_dl_modulation_support_256qam = -1;
-static int hf_nfapi_ul_modulation_support = -1;
-static int hf_nfapi_ul_modulation_support_qpsk = -1;
-static int hf_nfapi_ul_modulation_support_16qam = -1;
-static int hf_nfapi_ul_modulation_support_64qam = -1;
-static int hf_nfapi_data_report_mode = -1;
-static int hf_nfapi_sfnsf = -1;
+static int hf_nfapi_error_code;
+static int hf_nfapi_p4_error_code;
+static int hf_nfapi_rat_type;
+static int hf_nfapi_num_tlv;
+static int hf_nfapi_phy_state;
+static int hf_nfapi_phy_antenna_capability;
+static int hf_nfapi_release_capability;
+static int hf_nfapi_mbsfn_capability;
+static int hf_nfapi_laa_capability;
+static int hf_nfapi_pd_sensing_lbt_support;
+static int hf_nfapi_multi_carrier_lbt_support;
+static int hf_nfapi_partial_sf_support;
+
+static int hf_nfapi_pnf_address_ipv4;
+static int hf_nfapi_pnf_address_ipv6;
+static int hf_nfapi_vnf_address_ipv4;
+static int hf_nfapi_vnf_address_ipv6;
+static int hf_nfapi_pnf_port;
+static int hf_nfapi_vnf_port;
+static int hf_nfapi_dl_ue_per_sf;
+static int hf_nfapi_ul_ue_per_sf;
+static int hf_nfapi_timing_window;
+static int hf_nfapi_timing_info_mode;
+static int hf_nfapi_timing_info_period;
+static int hf_nfapi_duplex_mode;
+static int hf_nfapi_pcfich_power_offset;
+static int hf_nfapi_pb;
+static int hf_nfapi_dl_cyclic_prefix_type;
+static int hf_nfapi_ul_cyclic_prefix_type;
+static int hf_nfapi_tx_antenna_ports;
+static int hf_nfapi_rx_antenna_ports;
+static int hf_nfapi_downlink_channel_bandwidth;
+static int hf_nfapi_uplink_channel_bandwidth;
+static int hf_nfapi_reference_signal_power;
+static int hf_nfapi_phich_resource;
+static int hf_nfapi_phich_duration;
+static int hf_nfapi_phich_power_offset;
+static int hf_nfapi_primary_synchronization_signal_epre_eprers;
+static int hf_nfapi_secondary_synchronization_signal_epre_eprers;
+static int hf_nfapi_physical_cell_id;
+static int hf_nfapi_configuration_index;
+static int hf_nfapi_root_sequence_index;
+static int hf_nfapi_zero_correlation_zone_configuration;
+static int hf_nfapi_high_speed_flag;
+static int hf_nfapi_frequency_offset;
+static int hf_nfapi_hopping_mode;
+static int hf_nfapi_hopping_offset;
+static int hf_nfapi_delta_pucch_shift;
+static int hf_nfapi_n_cqi_rb;
+static int hf_nfapi_n_an_cs;
+static int hf_nfapi_n1_pucch_an;
+static int hf_nfapi_bandwidth_configuration;
+static int hf_nfapi_max_up_pts;
+static int hf_nfapi_srs_subframe_configuration;
+static int hf_nfapi_srs_acknack_srs_simultaneous_transmission;
+static int hf_nfapi_uplink_rs_hopping;
+static int hf_nfapi_group_assignment;
+static int hf_nfapi_cyclic_shift_1_for_drms;
+static int hf_nfapi_subframe_assignment;
+static int hf_nfapi_special_subframe_patterns;
+static int hf_nfapi_ed_threshold_for_lbt_for_pdsch;
+static int hf_nfapi_ed_threshold_for_lbt_for_drs;
+static int hf_nfapi_pd_threshold;
+static int hf_nfapi_multi_carrier_type;
+static int hf_nfapi_multi_carrier_tx;
+static int hf_nfapi_multi_carrier_freeze;
+static int hf_nfapi_tx_antenna_ports_for_drs;
+static int hf_nfapi_transmission_power_for_drs;
+static int hf_nfapi_pbch_repetitions_enabled_r13;
+static int hf_nfapi_prach_cat_m_root_sequence_index;
+static int hf_nfapi_prach_cat_m_zero_correlation_zone_configuration;
+static int hf_nfapi_prach_cat_m_high_speed_flag;
+static int hf_nfapi_prach_ce_level_0_enable;
+static int hf_nfapi_prach_ce_level_0_configuration_index;
+static int hf_nfapi_prach_ce_level_0_frequency_offset;
+static int hf_nfapi_prach_ce_level_0_number_of_repetitions_per_attempt;
+static int hf_nfapi_prach_ce_level_0_starting_subframe_periodicity;
+static int hf_nfapi_prach_ce_level_0_hopping_enabled;
+static int hf_nfapi_prach_ce_level_0_hopping_offset;
+static int hf_nfapi_prach_ce_level_1_enable;
+static int hf_nfapi_prach_ce_level_1_configuration_index;
+static int hf_nfapi_prach_ce_level_1_frequency_offset;
+static int hf_nfapi_prach_ce_level_1_number_of_repetitions_per_attempt;
+static int hf_nfapi_prach_ce_level_1_starting_subframe_periodicity;
+static int hf_nfapi_prach_ce_level_1_hopping_enabled;
+static int hf_nfapi_prach_ce_level_1_hopping_offset;
+static int hf_nfapi_prach_ce_level_2_enable;
+static int hf_nfapi_prach_ce_level_2_configuration_index;
+static int hf_nfapi_prach_ce_level_2_frequency_offset;
+static int hf_nfapi_prach_ce_level_2_number_of_repetitions_per_attempt;
+static int hf_nfapi_prach_ce_level_2_starting_subframe_periodicity;
+static int hf_nfapi_prach_ce_level_2_hopping_enabled;
+static int hf_nfapi_prach_ce_level_2_hopping_offset;
+static int hf_nfapi_prach_ce_level_3_enable;
+static int hf_nfapi_prach_ce_level_3_configuration_index;
+static int hf_nfapi_prach_ce_level_3_frequency_offset;
+static int hf_nfapi_prach_ce_level_3_number_of_repetitions_per_attempt;
+static int hf_nfapi_prach_ce_level_3_starting_subframe_periodicity;
+static int hf_nfapi_prach_ce_level_3_hopping_enabled;
+static int hf_nfapi_prach_ce_level_3_hopping_offset;
+static int hf_nfapi_pucch_internal_ul_hopping_config_common_mode_b;
+static int hf_nfapi_pucch_internal_ul_hopping_config_common_mode_a;
+static int hf_nfapi_dl_modulation_support;
+static int hf_nfapi_dl_modulation_support_qpsk;
+static int hf_nfapi_dl_modulation_support_16qam;
+static int hf_nfapi_dl_modulation_support_64qam;
+static int hf_nfapi_dl_modulation_support_256qam;
+static int hf_nfapi_ul_modulation_support;
+static int hf_nfapi_ul_modulation_support_qpsk;
+static int hf_nfapi_ul_modulation_support_16qam;
+static int hf_nfapi_ul_modulation_support_64qam;
+static int hf_nfapi_data_report_mode;
+static int hf_nfapi_sfnsf;
 
 // P7 Sub Structures
-static int hf_nfapi_dl_dci_format = -1;
-static int hf_nfapi_ul_dci_format = -1;
-static int hf_nfapi_mpdcch_ul_dci_format = -1;
-static int hf_nfapi_cce_idx = -1;
-static int hf_nfapi_aggregation_level = -1;
-static int hf_nfapi_mcs_1 = -1;
-static int hf_nfapi_redundancy_version_1 = -1;
-static int hf_nfapi_new_data_indicator_1 = -1;
-static int hf_nfapi_mcs_2 = -1;
-static int hf_nfapi_redundancy_version_2 = -1;
-static int hf_nfapi_new_data_indicator_2 = -1;
-static int hf_nfapi_harq_process = -1;
-static int hf_nfapi_tpmi = -1;
-static int hf_nfapi_pmi = -1;
-static int hf_nfapi_precoding_information = -1;
-static int hf_nfapi_tpc = -1;
-static int hf_nfapi_downlink_assignment_index = -1;
-static int hf_nfapi_transport_block_size_index = -1;
-static int hf_nfapi_downlink_power_offset = -1;
-static int hf_nfapi_allocate_prach_flag = -1;
-static int hf_nfapi_preamble_index = -1;
-static int hf_nfapi_prach_mask_index = -1;
-static int hf_nfapi_rnti_type = -1;
-static int hf_nfapi_mpdcch_rnti_type = -1;
-static int hf_nfapi_mcch_flag = -1;
-static int hf_nfapi_mcch_change_notification = -1;
-static int hf_nfapi_scrambling_identity = -1;
-static int hf_nfapi_cross_carrier_scheduling_flag = -1;
-static int hf_nfapi_carrier_indicator = -1;
-static int hf_nfapi_srs_flag = -1;
-static int hf_nfapi_srs_request = -1;
-static int hf_nfapi_antenna_ports_scrambling_and_layers = -1;
-static int hf_nfapi_total_dci_length_including_padding = -1;
-static int hf_nfapi_harq_ack_resource_offset = -1;
-static int hf_nfapi_pdsch_re_mapping_and_quasi_co_location_indicator = -1;
-static int hf_nfapi_primary_cell_type = -1;
-static int hf_nfapi_ul_dl_configuration_flag = -1;
-static int hf_nfapi_number_of_ul_dl_configurations = -1;
-static int hf_nfapi_ul_dl_configuration_index = -1;
-static int hf_nfapi_laa_end_partial_sf_flag = -1;
-static int hf_nfapi_laa_end_partial_sf_configuration = -1;
-static int hf_nfapi_initial_lbt_sf = -1;
-static int hf_nfapi_codebooksize_determination_r13 = -1;
-static int hf_nfapi_rel13_drms_table_flag = -1;
-static int hf_nfapi_csi_rs_resource_config = -1;
-static int hf_nfapi_csi_rs_number_of_nzp_configurations = -1;
-static int hf_nfapi_pdsch_start = -1;
-static int hf_nfapi_drms_config_flag = -1;
-static int hf_nfapi_drms_scrambling = -1;
-static int hf_nfapi_csi_config_flag = -1;
-static int hf_nfapi_csi_scrambling = -1;
-static int hf_nfapi_pdsch_re_mapping_flag = -1;
-static int hf_nfapi_pdsch_re_mapping_antenna_ports = -1;
-static int hf_nfapi_pdsch_re_mapping_freq_shift = -1;
-static int hf_nfapi_alt_cqi_table_r12 = -1;
-static int hf_nfapi_max_layers = -1;
-static int hf_nfapi_n_dl_harq = -1;
-static int hf_nfapi_dwpts_symbols = -1;
-static int hf_nfapi_ue_type = -1;
-static int hf_nfapi_pdsch_payload_type = -1;
-static int hf_nfapi_initial_transmission_sf = -1;
-static int hf_nfapi_req13_drms_table_flag = -1;
-static int hf_nfapi_prnti = -1;
-static int hf_nfapi_mcs = -1;
-static int hf_nfapi_number_of_transport_blocks = -1;
-static int hf_nfapi_ue_mode = -1;
-static int hf_prs_bandwidth = -1;
-static int hf_prs_cyclic_prefix_type = -1;
-static int hf_prs_muting = -1;
-static int hf_nfapi_csi_rs_resource_index = -1;
-static int hf_nfapi_csi_rs_class = -1;
-static int hf_nfapi_cdm_type = -1;
-static int hf_nfapi_epdcch_prb_index = -1;
-static int hf_nfapi_epdcch_resource_assignment_flag = -1;
-static int hf_nfapi_epdcch_id = -1;
-static int hf_nfapi_epdcch_start_symbol = -1;
-static int hf_nfapi_epdcch_num_prb = -1;
-static int hf_nfapi_precoding_value = -1;
-static int hf_nfapi_mpdcch_narrowband = -1;
-static int hf_nfapi_number_of_prb_pairs = -1;
-static int hf_nfapi_resource_block_assignment = -1;
-static int hf_nfapi_start_symbol = -1;
-static int hf_nfapi_ecce_index = -1;
-static int hf_nfapi_ce_mode = -1;
-static int hf_nfapi_drms_scrabmling_init = -1;
-static int hf_nfapi_pdsch_reception_levels = -1;
-static int hf_nfapi_new_data_indicator = -1;
-static int hf_nfapi_tpmi_length = -1;
-static int hf_nfapi_pmi_flag = -1;
-static int hf_nfapi_harq_resource_offset = -1;
-static int hf_nfapi_dci_subframe_repetition_number = -1;
-static int hf_nfapi_downlink_assignment_index_length = -1;
-static int hf_nfapi_starting_ce_level = -1;
-static int hf_nfapi_antenna_ports_and_scrambling_identity_flag = -1;
-static int hf_nfapi_antenna_ports_and_scrambling_identity = -1;
-static int hf_nfapi_paging_direct_indication_differentiation_flag = -1;
-static int hf_nfapi_direct_indication = -1;
-static int hf_nfapi_number_of_tx_antenna_ports = -1;
+static int hf_nfapi_dl_dci_format;
+static int hf_nfapi_ul_dci_format;
+static int hf_nfapi_mpdcch_ul_dci_format;
+static int hf_nfapi_cce_idx;
+static int hf_nfapi_aggregation_level;
+static int hf_nfapi_mcs_1;
+static int hf_nfapi_redundancy_version_1;
+static int hf_nfapi_new_data_indicator_1;
+static int hf_nfapi_mcs_2;
+static int hf_nfapi_redundancy_version_2;
+static int hf_nfapi_new_data_indicator_2;
+static int hf_nfapi_harq_process;
+static int hf_nfapi_tpmi;
+static int hf_nfapi_pmi;
+static int hf_nfapi_precoding_information;
+static int hf_nfapi_tpc;
+static int hf_nfapi_downlink_assignment_index;
+static int hf_nfapi_transport_block_size_index;
+static int hf_nfapi_downlink_power_offset;
+static int hf_nfapi_allocate_prach_flag;
+static int hf_nfapi_preamble_index;
+static int hf_nfapi_prach_mask_index;
+static int hf_nfapi_rnti_type;
+static int hf_nfapi_mpdcch_rnti_type;
+static int hf_nfapi_mcch_flag;
+static int hf_nfapi_mcch_change_notification;
+static int hf_nfapi_scrambling_identity;
+static int hf_nfapi_cross_carrier_scheduling_flag;
+static int hf_nfapi_carrier_indicator;
+static int hf_nfapi_srs_flag;
+static int hf_nfapi_srs_request;
+static int hf_nfapi_antenna_ports_scrambling_and_layers;
+static int hf_nfapi_total_dci_length_including_padding;
+static int hf_nfapi_harq_ack_resource_offset;
+static int hf_nfapi_pdsch_re_mapping_and_quasi_co_location_indicator;
+static int hf_nfapi_primary_cell_type;
+static int hf_nfapi_ul_dl_configuration_flag;
+static int hf_nfapi_number_of_ul_dl_configurations;
+static int hf_nfapi_ul_dl_configuration_index;
+static int hf_nfapi_laa_end_partial_sf_flag;
+static int hf_nfapi_laa_end_partial_sf_configuration;
+static int hf_nfapi_initial_lbt_sf;
+static int hf_nfapi_codebooksize_determination_r13;
+static int hf_nfapi_rel13_drms_table_flag;
+static int hf_nfapi_csi_rs_resource_config;
+static int hf_nfapi_csi_rs_number_of_nzp_configurations;
+static int hf_nfapi_pdsch_start;
+static int hf_nfapi_drms_config_flag;
+static int hf_nfapi_drms_scrambling;
+static int hf_nfapi_csi_config_flag;
+static int hf_nfapi_csi_scrambling;
+static int hf_nfapi_pdsch_re_mapping_flag;
+static int hf_nfapi_pdsch_re_mapping_antenna_ports;
+static int hf_nfapi_pdsch_re_mapping_freq_shift;
+static int hf_nfapi_alt_cqi_table_r12;
+static int hf_nfapi_max_layers;
+static int hf_nfapi_n_dl_harq;
+static int hf_nfapi_dwpts_symbols;
+static int hf_nfapi_ue_type;
+static int hf_nfapi_pdsch_payload_type;
+static int hf_nfapi_initial_transmission_sf;
+static int hf_nfapi_req13_drms_table_flag;
+static int hf_nfapi_prnti;
+static int hf_nfapi_mcs;
+static int hf_nfapi_number_of_transport_blocks;
+static int hf_nfapi_ue_mode;
+static int hf_prs_bandwidth;
+static int hf_prs_cyclic_prefix_type;
+static int hf_prs_muting;
+static int hf_nfapi_csi_rs_resource_index;
+static int hf_nfapi_csi_rs_class;
+static int hf_nfapi_cdm_type;
+static int hf_nfapi_epdcch_prb_index;
+static int hf_nfapi_epdcch_resource_assignment_flag;
+static int hf_nfapi_epdcch_id;
+static int hf_nfapi_epdcch_start_symbol;
+static int hf_nfapi_epdcch_num_prb;
+static int hf_nfapi_precoding_value;
+static int hf_nfapi_mpdcch_narrowband;
+static int hf_nfapi_number_of_prb_pairs;
+static int hf_nfapi_resource_block_assignment;
+static int hf_nfapi_start_symbol;
+static int hf_nfapi_ecce_index;
+static int hf_nfapi_ce_mode;
+static int hf_nfapi_drms_scrabmling_init;
+static int hf_nfapi_pdsch_reception_levels;
+static int hf_nfapi_new_data_indicator;
+static int hf_nfapi_tpmi_length;
+static int hf_nfapi_pmi_flag;
+static int hf_nfapi_harq_resource_offset;
+static int hf_nfapi_dci_subframe_repetition_number;
+static int hf_nfapi_downlink_assignment_index_length;
+static int hf_nfapi_starting_ce_level;
+static int hf_nfapi_antenna_ports_and_scrambling_identity_flag;
+static int hf_nfapi_antenna_ports_and_scrambling_identity;
+static int hf_nfapi_paging_direct_indication_differentiation_flag;
+static int hf_nfapi_direct_indication;
+static int hf_nfapi_number_of_tx_antenna_ports;
 
 // P7 Message Structures
-static int hf_nfapi_dl_node_sync_t1 = -1;
-static int hf_nfapi_dl_node_sync_delta_sfn_sf = -1;
-static int hf_nfapi_ul_node_sync_t1 = -1;
-static int hf_nfapi_ul_node_sync_t2 = -1;
-static int hf_nfapi_ul_node_sync_t3 = -1;
-static int hf_nfapi_timing_info_last_sfn_sf = -1;
-static int hf_nfapi_timing_info_time_since_last_timing_info = -1;
-static int hf_nfapi_timing_info_dl_config_jitter = -1;
-static int hf_nfapi_timing_info_tx_request_jitter = -1;
-static int hf_nfapi_timing_info_ul_config_jitter = -1;
-static int hf_nfapi_timing_info_hi_dci0_jitter = -1;
-static int hf_nfapi_timing_info_dl_config_latest_delay = -1;
-static int hf_nfapi_timing_info_tx_request_latest_delay = -1;
-static int hf_nfapi_timing_info_ul_config_latest_delay = -1;
-static int hf_nfapi_timing_info_hi_dci0_latest_delay = -1;
-static int hf_nfapi_timing_info_dl_config_earliest_arrival = -1;
-static int hf_nfapi_timing_info_tx_request_earliest_arrival = -1;
-static int hf_nfapi_timing_info_ul_config_earliest_arrival = -1;
-static int hf_nfapi_timing_info_hi_dci0_earliest_arrival = -1;
-static int hf_nfapi_sfn_sf = -1;
-static int hf_nfapi_number_pdcch_ofdm_symbols = -1;
-static int hf_nfapi_number_dci = -1;
-static int hf_nfapi_number_pdus = -1;
-static int hf_nfapi_number_pdsch_rnti = -1;
-static int hf_nfapi_transmission_power_pcfich = -1;
-static int hf_nfapi_number_of_harqs = -1;
-static int hf_nfapi_number_of_crcs = -1;
-static int hf_nfapi_number_of_srs = -1;
-static int hf_nfapi_number_of_cqi = -1;
-static int hf_nfapi_number_of_preambles = -1;
-static int hf_nfapi_number_of_srss = -1;
-static int hf_nfapi_lbt_dl_req_pdu_type = -1;
-static int hf_nfapi_lbt_dl_ind_pdu_type = -1;
-static int hf_nfapi_dl_config_pdu_type = -1;
-static int hf_nfapi_pdu_size = -1;
-static int hf_nfapi_instance_length = -1;
+static int hf_nfapi_dl_node_sync_t1;
+static int hf_nfapi_dl_node_sync_delta_sfn_sf;
+static int hf_nfapi_ul_node_sync_t1;
+static int hf_nfapi_ul_node_sync_t2;
+static int hf_nfapi_ul_node_sync_t3;
+static int hf_nfapi_timing_info_last_sfn_sf;
+static int hf_nfapi_timing_info_time_since_last_timing_info;
+static int hf_nfapi_timing_info_dl_config_jitter;
+static int hf_nfapi_timing_info_tx_request_jitter;
+static int hf_nfapi_timing_info_ul_config_jitter;
+static int hf_nfapi_timing_info_hi_dci0_jitter;
+static int hf_nfapi_timing_info_dl_config_latest_delay;
+static int hf_nfapi_timing_info_tx_request_latest_delay;
+static int hf_nfapi_timing_info_ul_config_latest_delay;
+static int hf_nfapi_timing_info_hi_dci0_latest_delay;
+static int hf_nfapi_timing_info_dl_config_earliest_arrival;
+static int hf_nfapi_timing_info_tx_request_earliest_arrival;
+static int hf_nfapi_timing_info_ul_config_earliest_arrival;
+static int hf_nfapi_timing_info_hi_dci0_earliest_arrival;
+static int hf_nfapi_sfn_sf;
+static int hf_nfapi_number_pdcch_ofdm_symbols;
+static int hf_nfapi_number_dci;
+static int hf_nfapi_number_pdus;
+static int hf_nfapi_number_pdsch_rnti;
+static int hf_nfapi_transmission_power_pcfich;
+static int hf_nfapi_number_of_harqs;
+static int hf_nfapi_number_of_crcs;
+static int hf_nfapi_number_of_srs;
+static int hf_nfapi_number_of_cqi;
+static int hf_nfapi_number_of_preambles;
+static int hf_nfapi_number_of_srss;
+static int hf_nfapi_lbt_dl_req_pdu_type;
+static int hf_nfapi_lbt_dl_ind_pdu_type;
+static int hf_nfapi_dl_config_pdu_type;
+static int hf_nfapi_pdu_size;
+static int hf_nfapi_instance_length;
 static int hf_nfapi_length;
-static int hf_nfapi_pdu_index = -1;
-static int hf_nfapi_rnti = -1;
-static int hf_nfapi_resource_allocation_type = -1;
-static int hf_nfapi_virtual_resource_block_assignment_flag = -1;
-static int hf_nfapi_resource_block_coding = -1;
-static int hf_nfapi_modulation = -1;
-static int hf_nfapi_redundancy_version = -1;
-static int hf_nfapi_transport_blocks = -1;
-static int hf_nfapi_transport_block_to_codeword_swap_flag = -1;
-static int hf_nfapi_transmission_scheme = -1;
-static int hf_nfapi_ul_transmission_scheme = -1;
-static int hf_nfapi_number_of_layers = -1;
-static int hf_nfapi_number_of_subbands = -1;
-static int hf_nfapi_codebook_index = -1;
-static int hf_nfapi_ue_category_capacity = -1;
-static int hf_nfapi_pa = -1;
-static int hf_nfapi_delta_power_offset_index = -1;
-static int hf_nfapi_ngap = -1;
-static int hf_nfapi_nprb = -1;
-static int hf_nfapi_transmission_mode = -1;
-static int hf_nfapi_num_bf_prb_per_subband = -1;
-static int hf_nfapi_num_bf_vector = -1;
-static int hf_nfapi_bf_vector_subband_index = -1;
-static int hf_nfapi_bf_vector_num_antennas = -1;
-static int hf_nfapi_bf_vector_bf_value = -1;
-static int hf_nfapi_nscid = -1;
-static int hf_nfapi_csi_rs_flag = -1;
-static int hf_nfapi_csi_rs_resource_config_r10 = -1;
-static int hf_nfapi_csi_rs_zero_tx_power_resource_config_bitmap_r10 = -1;
-static int hf_nfapi_transmission_power = -1;
-static int hf_nfapi_mbsfn_area_id = -1;
-static int hf_nfapi_csi_rs_antenna_port_count_r10 = -1;
-static int hf_nfapi_ul_config_pdu_type = -1;
-static int hf_nfapi_rach_prach_frequency_resources = -1;
-static int hf_nfapi_srs_present = -1;
-static int hf_nfapi_handle = -1;
-static int hf_nfapi_pucch_index = -1;
-static int hf_nfapi_size = -1;
-static int hf_nfapi_resource_block_start = -1;
-static int hf_nfapi_number_of_resource_blocks = -1;
-static int hf_nfapi_cyclic_shift_2_for_drms = -1;
-static int hf_nfapi_frequency_hopping_enabled_flag = -1;
-static int hf_nfapi_frequency_hopping_bits = -1;
-static int hf_nfapi_new_data_indication = -1;
-static int hf_nfapi_harq_process_number = -1;
-static int hf_nfapi_ul_tx_mode = -1;
-static int hf_nfapi_current_tx_nb = -1;
-static int hf_nfapi_n_srs = -1;
-static int hf_nfapi_disable_sequence_hopping_flag = -1;
-static int hf_nfapi_dl_cqi_pmi_size_rank_1 = -1;
-static int hf_nfapi_dl_cqi_pmi_size_rank_greater_1 = -1;
-static int hf_nfapi_ri_size = -1;
-static int hf_nfapi_delta_offset_cqi = -1;
-static int hf_nfapi_delta_offset_ri = -1;
-static int hf_nfapi_harq_size = -1;
-static int hf_nfapi_delta_offset_harq = -1;
-static int hf_nfapi_tdd_ack_nack_mode = -1;
-static int hf_nfapi_fdd_ack_nack_mode = -1;
-static int hf_nfapi_n_srs_initial = -1;
-static int hf_nfapi_initial_number_of_resource_blocks = -1;
-static int hf_nfapi_dl_cqi_pmi_size = -1;
-static int hf_nfapi_report_type = -1;
-static int hf_nfapi_dl_cqi_ri_pmi_size = -1;
-static int hf_nfapi_control_type = -1;
-static int hf_nfapi_number_of_cc = -1;
-static int hf_nfapi_virtual_cell_id_enabled_flag = -1;
-static int hf_nfapi_npusch_identity = -1;
-static int hf_nfapi_ndrms_csh_identity = -1;
-static int hf_nfapi_total_number_of_repetitions = -1;
-static int hf_nfapi_repetition_number = -1;
-static int hf_nfapi_initial_sf_io = -1;
-static int hf_nfapi_empty_symbols_due_to_retunning = -1;
-static int hf_nfapi_dl_cqi_ri_pmi_size_2 = -1;
-static int hf_nfapi_npucch_identity = -1;
-static int hf_nfapi_harq_size_2 = -1;
-static int hf_nfapi_delta_offset_harq_2 = -1;
-static int hf_nfapi_empty_symbols = -1;
-static int hf_nfapi_csi_mode = -1;
-static int hf_nfapi_dl_cqi_pmi_size_2 = -1;
-static int hf_nfapi_statring_prb = -1;
-static int hf_nfapi_cdm_index = -1;
-static int hf_nfapi_nsrs = -1;
-static int hf_nfapi_num_ant_ports = -1;
-static int hf_nfapi_n_pucch_2_0 = -1;
-static int hf_nfapi_n_pucch_2_1 = -1;
-static int hf_nfapi_n_pucch_2_2 = -1;
-static int hf_nfapi_n_pucch_2_3 = -1;
-static int hf_nfapi_starting_prb = -1;
-static int hf_nfapi_antenna_port = -1;
-static int hf_nfapi_number_of_combs = -1;
-static int hf_nfapi_number_of_pucch_resource = -1;
-static int hf_nfapi_pucch_index_p1 = -1;
-static int hf_nfapi_n_pucch_1_0 = -1;
-static int hf_nfapi_n_pucch_1_1 = -1;
-static int hf_nfapi_n_pucch_1_2 = -1;
-static int hf_nfapi_n_pucch_1_3 = -1;
-static int hf_nfapi_srs_bandwidth = -1;
-static int hf_nfapi_frequency_domain_position = -1;
-static int hf_nfapi_srs_hopping_bandwidth = -1;
-static int hf_nfapi_transmission_comb = -1;
-static int hf_nfapi_i_srs = -1;
-static int hf_nfapi_sounding_reference_cyclic_shift = -1;
-static int hf_nfapi_pdu_length = -1;
-static int hf_nfapi_crc_flag = -1;
-static int hf_nfapi_number_of_hi_pdus = -1;
-static int hf_nfapi_number_of_dci_pdus = -1;
-static int hf_nfapi_hi_dci0_pdu_type = -1;
-static int hf_nfapi_hi_value = -1;
-static int hf_nfapi_i_phich = -1;
-static int hf_nfapi_flag_tb2 = -1;
-static int hf_nfapi_hi_value_2 = -1;
-static int hf_nfapi_ue_tx_antenna_selection = -1;
-static int hf_nfapi_cqi_csi_request = -1;
-static int hf_nfapi_ul_index = -1;
-static int hf_nfapi_dl_assignment_index = -1;
-static int hf_nfapi_tpc_bitmap = -1;
-static int hf_nfapi_new_data_indication_two = -1;
-static int hf_nfapi_size_of_cqi_csi_field = -1;
-static int hf_nfapi_resource_allocation_flag = -1;
-static int hf_nfapi_number_of_antenna_ports = -1;
-static int hf_nfapi_n_ul_rb = -1;
-static int hf_nfapi_pscch_resource = -1;
-static int hf_nfapi_time_resource_pattern = -1;
-static int hf_nfapi_mpdcch_transmission_type = -1;
-static int hf_nfapi_drms_scrambling_init = -1;
-static int hf_nfapi_pusch_repetition_levels = -1;
-static int hf_nfapi_frequency_hopping_flag = -1;
-static int hf_nfapi_csi_request = -1;
-static int hf_nfapi_dai_presence_flag = -1;
-static int hf_nfapi_total_dci_length_include_padding = -1;
-static int hf_nfapi_data_offset = -1;
-static int hf_nfapi_ul_cqi = -1;
-static int hf_nfapi_timing_advance_r9 = -1;
-static int hf_nfapi_timing_advance = -1;
-static int hf_nfapi_harq_data_value_0 = -1;
-static int hf_nfapi_harq_data_value_0_special = -1;
-static int hf_nfapi_harq_data_value_1 = -1;
-static int hf_nfapi_harq_data_value_2 = -1;
-static int hf_nfapi_harq_data_value_3 = -1;
-static int hf_nfapi_tdd_harq_mode = -1;
-static int hf_nfapi_fdd_harq_mode = -1;
-static int hf_nfapi_number_of_ack_nack = -1;
-static int hf_nfapi_harq_tb_1 = -1;
-static int hf_nfapi_harq_tb_2 = -1;
-static int hf_nfapi_harq_tb_n = -1;
-static int hf_nfapi_channel = -1;
-static int hf_nfapi_ri = -1;
-static int hf_nfapi_number_of_cc_reported = -1;
-static int hf_nfapi_preamble = -1;
-static int hf_nfapi_rach_resource_type = -1;
-static int hf_nfapi_snr = -1;
-static int hf_nfapi_doppler_estimation = -1;
-static int hf_nfapi_rb_start = -1;
-static int hf_nfapi_up_pts_symbol = -1;
-static int hf_nfapi_number_prb_per_subband = -1;
-static int hf_nfapi_number_antennas = -1;
-static int hf_nfapi_subband_index = -1;
-static int hf_nfapi_channel_coefficient = -1;
-static int hf_nfapi_ul_rtoa = -1;
-static int hf_nfapi_mp_cca = -1;
-static int hf_nfapi_n_cca = -1;
-static int hf_nfapi_offset = -1;
-static int hf_nfapi_lte_txop_sf = -1;
-static int hf_nfapi_txop_sfn_sf_end = -1;
-static int hf_nfapi_lbt_mode = -1;
-static int hf_nfapi_sfn_sf_end = -1;
-static int hf_nfapi_result = -1;
-static int hf_nfapi_txop_symbols = -1;
-static int hf_nfapi_initial_partial_sf = -1;
-static int hf_nfapi_frequency_band_indicator = -1;
-static int hf_nfapi_measurement_period = -1;
-static int hf_nfapi_bandwidth = -1;
-static int hf_nfapi_timeout = -1;
-static int hf_nfapi_number_of_earfcns = -1;
-static int hf_nfapi_uarfcn = -1;
-static int hf_nfapi_number_of_uarfcns = -1;
-static int hf_nfapi_arfcn = -1;
-static int hf_nfapi_arfcn_direction = -1;
-static int hf_nfapi_number_of_arfcns = -1;
-static int hf_nfapi_rssi = -1;
-static int hf_nfapi_number_of_rssi = -1;
-static int hf_nfapi_pci = -1;
-static int hf_nfapi_measurement_bandwidth = -1;
-static int hf_nfapi_exhaustive_search = -1;
-static int hf_nfapi_number_of_pci = -1;
-static int hf_nfapi_psc = -1;
-static int hf_nfapi_number_of_psc = -1;
-static int hf_nfapi_rsrp = -1;
-static int hf_nfapi_rsrq = -1;
-static int hf_nfapi_number_of_lte_cells_found = -1;
-static int hf_nfapi_rscp = -1;
-static int hf_nfapi_enco = -1;
-static int hf_nfapi_number_of_utran_cells_found = -1;
-static int hf_nfapi_bsic = -1;
-static int hf_nfapi_rxlev = -1;
-static int hf_nfapi_rxqual = -1;
-static int hf_nfapi_sfn_offset = -1;
-static int hf_nfapi_number_of_geran_cells_found = -1;
-static int hf_nfapi_number_of_tx_antenna = -1;
-static int hf_nfapi_mib = -1;
-static int hf_nfapi_phich_configuration = -1;
-static int hf_nfapi_retry_count = -1;
-static int hf_nfapi_sib1 = -1;
-static int hf_nfapi_si_periodicity = -1;
-static int hf_nfapi_si_index = -1;
-static int hf_nfapi_number_of_si_periodicity = -1;
-static int hf_nfapi_si_window_length = -1;
-static int hf_nfapi_sib_type = -1;
-static int hf_nfapi_sib = -1;
-static int hf_nfapi_si = -1;
-static int hf_nfapi_pnf_search_state = -1;
-static int hf_nfapi_pnf_broadcast_state = -1;
+static int hf_nfapi_pdu_index;
+static int hf_nfapi_rnti;
+static int hf_nfapi_resource_allocation_type;
+static int hf_nfapi_virtual_resource_block_assignment_flag;
+static int hf_nfapi_resource_block_coding;
+static int hf_nfapi_modulation;
+static int hf_nfapi_redundancy_version;
+static int hf_nfapi_transport_blocks;
+static int hf_nfapi_transport_block_to_codeword_swap_flag;
+static int hf_nfapi_transmission_scheme;
+static int hf_nfapi_ul_transmission_scheme;
+static int hf_nfapi_number_of_layers;
+static int hf_nfapi_number_of_subbands;
+static int hf_nfapi_codebook_index;
+static int hf_nfapi_ue_category_capacity;
+static int hf_nfapi_pa;
+static int hf_nfapi_delta_power_offset_index;
+static int hf_nfapi_ngap;
+static int hf_nfapi_nprb;
+static int hf_nfapi_transmission_mode;
+static int hf_nfapi_num_bf_prb_per_subband;
+static int hf_nfapi_num_bf_vector;
+static int hf_nfapi_bf_vector_subband_index;
+static int hf_nfapi_bf_vector_num_antennas;
+static int hf_nfapi_bf_vector_bf_value;
+static int hf_nfapi_nscid;
+static int hf_nfapi_csi_rs_flag;
+static int hf_nfapi_csi_rs_resource_config_r10;
+static int hf_nfapi_csi_rs_zero_tx_power_resource_config_bitmap_r10;
+static int hf_nfapi_transmission_power;
+static int hf_nfapi_mbsfn_area_id;
+static int hf_nfapi_csi_rs_antenna_port_count_r10;
+static int hf_nfapi_ul_config_pdu_type;
+static int hf_nfapi_rach_prach_frequency_resources;
+static int hf_nfapi_srs_present;
+static int hf_nfapi_handle;
+static int hf_nfapi_pucch_index;
+static int hf_nfapi_size;
+static int hf_nfapi_resource_block_start;
+static int hf_nfapi_number_of_resource_blocks;
+static int hf_nfapi_cyclic_shift_2_for_drms;
+static int hf_nfapi_frequency_hopping_enabled_flag;
+static int hf_nfapi_frequency_hopping_bits;
+static int hf_nfapi_new_data_indication;
+static int hf_nfapi_harq_process_number;
+static int hf_nfapi_ul_tx_mode;
+static int hf_nfapi_current_tx_nb;
+static int hf_nfapi_n_srs;
+static int hf_nfapi_disable_sequence_hopping_flag;
+static int hf_nfapi_dl_cqi_pmi_size_rank_1;
+static int hf_nfapi_dl_cqi_pmi_size_rank_greater_1;
+static int hf_nfapi_ri_size;
+static int hf_nfapi_delta_offset_cqi;
+static int hf_nfapi_delta_offset_ri;
+static int hf_nfapi_harq_size;
+static int hf_nfapi_delta_offset_harq;
+static int hf_nfapi_tdd_ack_nack_mode;
+static int hf_nfapi_fdd_ack_nack_mode;
+static int hf_nfapi_n_srs_initial;
+static int hf_nfapi_initial_number_of_resource_blocks;
+static int hf_nfapi_dl_cqi_pmi_size;
+static int hf_nfapi_report_type;
+static int hf_nfapi_dl_cqi_ri_pmi_size;
+static int hf_nfapi_control_type;
+static int hf_nfapi_number_of_cc;
+static int hf_nfapi_virtual_cell_id_enabled_flag;
+static int hf_nfapi_npusch_identity;
+static int hf_nfapi_ndrms_csh_identity;
+static int hf_nfapi_total_number_of_repetitions;
+static int hf_nfapi_repetition_number;
+static int hf_nfapi_initial_sf_io;
+static int hf_nfapi_empty_symbols_due_to_retunning;
+static int hf_nfapi_dl_cqi_ri_pmi_size_2;
+static int hf_nfapi_npucch_identity;
+static int hf_nfapi_harq_size_2;
+static int hf_nfapi_delta_offset_harq_2;
+static int hf_nfapi_empty_symbols;
+static int hf_nfapi_csi_mode;
+static int hf_nfapi_dl_cqi_pmi_size_2;
+static int hf_nfapi_statring_prb;
+static int hf_nfapi_cdm_index;
+static int hf_nfapi_nsrs;
+static int hf_nfapi_num_ant_ports;
+static int hf_nfapi_n_pucch_2_0;
+static int hf_nfapi_n_pucch_2_1;
+static int hf_nfapi_n_pucch_2_2;
+static int hf_nfapi_n_pucch_2_3;
+static int hf_nfapi_starting_prb;
+static int hf_nfapi_antenna_port;
+static int hf_nfapi_number_of_combs;
+static int hf_nfapi_number_of_pucch_resource;
+static int hf_nfapi_pucch_index_p1;
+static int hf_nfapi_n_pucch_1_0;
+static int hf_nfapi_n_pucch_1_1;
+static int hf_nfapi_n_pucch_1_2;
+static int hf_nfapi_n_pucch_1_3;
+static int hf_nfapi_srs_bandwidth;
+static int hf_nfapi_frequency_domain_position;
+static int hf_nfapi_srs_hopping_bandwidth;
+static int hf_nfapi_transmission_comb;
+static int hf_nfapi_i_srs;
+static int hf_nfapi_sounding_reference_cyclic_shift;
+static int hf_nfapi_pdu_length;
+static int hf_nfapi_crc_flag;
+static int hf_nfapi_number_of_hi_pdus;
+static int hf_nfapi_number_of_dci_pdus;
+static int hf_nfapi_hi_dci0_pdu_type;
+static int hf_nfapi_hi_value;
+static int hf_nfapi_i_phich;
+static int hf_nfapi_flag_tb2;
+static int hf_nfapi_hi_value_2;
+static int hf_nfapi_ue_tx_antenna_selection;
+static int hf_nfapi_cqi_csi_request;
+static int hf_nfapi_ul_index;
+static int hf_nfapi_dl_assignment_index;
+static int hf_nfapi_tpc_bitmap;
+static int hf_nfapi_new_data_indication_two;
+static int hf_nfapi_size_of_cqi_csi_field;
+static int hf_nfapi_resource_allocation_flag;
+static int hf_nfapi_number_of_antenna_ports;
+static int hf_nfapi_n_ul_rb;
+static int hf_nfapi_pscch_resource;
+static int hf_nfapi_time_resource_pattern;
+static int hf_nfapi_mpdcch_transmission_type;
+static int hf_nfapi_drms_scrambling_init;
+static int hf_nfapi_pusch_repetition_levels;
+static int hf_nfapi_frequency_hopping_flag;
+static int hf_nfapi_csi_request;
+static int hf_nfapi_dai_presence_flag;
+static int hf_nfapi_total_dci_length_include_padding;
+static int hf_nfapi_data_offset;
+static int hf_nfapi_ul_cqi;
+static int hf_nfapi_timing_advance_r9;
+static int hf_nfapi_timing_advance;
+static int hf_nfapi_harq_data_value_0;
+static int hf_nfapi_harq_data_value_0_special;
+static int hf_nfapi_harq_data_value_1;
+static int hf_nfapi_harq_data_value_2;
+static int hf_nfapi_harq_data_value_3;
+static int hf_nfapi_tdd_harq_mode;
+static int hf_nfapi_fdd_harq_mode;
+static int hf_nfapi_number_of_ack_nack;
+static int hf_nfapi_harq_tb_1;
+static int hf_nfapi_harq_tb_2;
+static int hf_nfapi_harq_tb_n;
+static int hf_nfapi_channel;
+static int hf_nfapi_ri;
+static int hf_nfapi_number_of_cc_reported;
+static int hf_nfapi_preamble;
+static int hf_nfapi_rach_resource_type;
+static int hf_nfapi_snr;
+static int hf_nfapi_doppler_estimation;
+static int hf_nfapi_rb_start;
+static int hf_nfapi_up_pts_symbol;
+static int hf_nfapi_number_prb_per_subband;
+static int hf_nfapi_number_antennas;
+static int hf_nfapi_subband_index;
+static int hf_nfapi_channel_coefficient;
+static int hf_nfapi_ul_rtoa;
+static int hf_nfapi_mp_cca;
+static int hf_nfapi_n_cca;
+static int hf_nfapi_offset;
+static int hf_nfapi_lte_txop_sf;
+static int hf_nfapi_txop_sfn_sf_end;
+static int hf_nfapi_lbt_mode;
+static int hf_nfapi_sfn_sf_end;
+static int hf_nfapi_result;
+static int hf_nfapi_txop_symbols;
+static int hf_nfapi_initial_partial_sf;
+static int hf_nfapi_frequency_band_indicator;
+static int hf_nfapi_measurement_period;
+static int hf_nfapi_bandwidth;
+static int hf_nfapi_timeout;
+static int hf_nfapi_number_of_earfcns;
+static int hf_nfapi_uarfcn;
+static int hf_nfapi_number_of_uarfcns;
+static int hf_nfapi_arfcn;
+static int hf_nfapi_arfcn_direction;
+static int hf_nfapi_number_of_arfcns;
+static int hf_nfapi_rssi;
+static int hf_nfapi_number_of_rssi;
+static int hf_nfapi_pci;
+static int hf_nfapi_measurement_bandwidth;
+static int hf_nfapi_exhaustive_search;
+static int hf_nfapi_number_of_pci;
+static int hf_nfapi_psc;
+static int hf_nfapi_number_of_psc;
+static int hf_nfapi_rsrp;
+static int hf_nfapi_rsrq;
+static int hf_nfapi_number_of_lte_cells_found;
+static int hf_nfapi_rscp;
+static int hf_nfapi_enco;
+static int hf_nfapi_number_of_utran_cells_found;
+static int hf_nfapi_bsic;
+static int hf_nfapi_rxlev;
+static int hf_nfapi_rxqual;
+static int hf_nfapi_sfn_offset;
+static int hf_nfapi_number_of_geran_cells_found;
+static int hf_nfapi_number_of_tx_antenna;
+static int hf_nfapi_mib;
+static int hf_nfapi_phich_configuration;
+static int hf_nfapi_retry_count;
+static int hf_nfapi_sib1;
+static int hf_nfapi_si_periodicity;
+static int hf_nfapi_si_index;
+static int hf_nfapi_number_of_si_periodicity;
+static int hf_nfapi_si_window_length;
+static int hf_nfapi_sib_type;
+static int hf_nfapi_sib;
+static int hf_nfapi_si;
+static int hf_nfapi_pnf_search_state;
+static int hf_nfapi_pnf_broadcast_state;
 
 static const value_string message_id_vals[] =
 {
@@ -8373,18 +8373,18 @@ static int dissect_p7_timing_info_msg_id(tvbuff_t *tvb, packet_info *pinfo, prot
 static reassembly_table ul_p7_reassemble_table;
 static reassembly_table dl_p7_reassemble_table;
 
-static int hf_msg_fragments = -1;
-static int hf_msg_fragment = -1;
-static int hf_msg_fragment_overlap = -1;
-static int hf_msg_fragment_overlap_conflicts = -1;
-static int hf_msg_fragment_multiple_tails = -1;
-static int hf_msg_fragment_too_long_fragment = -1;
-static int hf_msg_fragment_error = -1;
-static int hf_msg_fragment_count = -1;
-static int hf_msg_reassembled_in = -1;
-static int hf_msg_reassembled_length = -1;
-static gint ett_msg_fragment = -1;
-static gint ett_msg_fragments = -1;
+static int hf_msg_fragments;
+static int hf_msg_fragment;
+static int hf_msg_fragment_overlap;
+static int hf_msg_fragment_overlap_conflicts;
+static int hf_msg_fragment_multiple_tails;
+static int hf_msg_fragment_too_long_fragment;
+static int hf_msg_fragment_error;
+static int hf_msg_fragment_count;
+static int hf_msg_reassembled_in;
+static int hf_msg_reassembled_length;
+static gint ett_msg_fragment;
+static gint ett_msg_fragments;
 
 static const fragment_items msg_frag_items = {
 	/* Fragment subtrees */
diff --git a/epan/dissectors/packet-nflog.c b/epan/dissectors/packet-nflog.c
index 574d5f51c2..100746517d 100644
--- a/epan/dissectors/packet-nflog.c
+++ b/epan/dissectors/packet-nflog.c
@@ -63,28 +63,28 @@ static const value_string nflog_tlv_vals[] = {
     { 0, NULL }
 };
 
-static int proto_nflog = -1;
-
-static int hf_nflog_family = -1;
-static int hf_nflog_resid = -1;
-static int hf_nflog_tlv = -1;
-static int hf_nflog_tlv_gid = -1;
-static int hf_nflog_tlv_hook = -1;
-static int hf_nflog_tlv_hwprotocol = -1;
-static int hf_nflog_tlv_ifindex_indev = -1;
-static int hf_nflog_tlv_ifindex_outdev = -1;
-static int hf_nflog_tlv_ifindex_physindev = -1;
-static int hf_nflog_tlv_ifindex_physoutdev = -1;
-static int hf_nflog_tlv_length = -1;
-static int hf_nflog_tlv_prefix = -1;
-static int hf_nflog_tlv_timestamp = -1;
-static int hf_nflog_tlv_type = -1;
-static int hf_nflog_tlv_uid = -1;
-static int hf_nflog_tlv_unknown = -1;
-static int hf_nflog_version = -1;
-
-static int ett_nflog = -1;
-static int ett_nflog_tlv = -1;
+static int proto_nflog;
+
+static int hf_nflog_family;
+static int hf_nflog_resid;
+static int hf_nflog_tlv;
+static int hf_nflog_tlv_gid;
+static int hf_nflog_tlv_hook;
+static int hf_nflog_tlv_hwprotocol;
+static int hf_nflog_tlv_ifindex_indev;
+static int hf_nflog_tlv_ifindex_outdev;
+static int hf_nflog_tlv_ifindex_physindev;
+static int hf_nflog_tlv_ifindex_physoutdev;
+static int hf_nflog_tlv_length;
+static int hf_nflog_tlv_prefix;
+static int hf_nflog_tlv_timestamp;
+static int hf_nflog_tlv_type;
+static int hf_nflog_tlv_uid;
+static int hf_nflog_tlv_unknown;
+static int hf_nflog_version;
+
+static int ett_nflog;
+static int ett_nflog_tlv;
 
 static dissector_handle_t ip_handle;
 static dissector_handle_t ip6_handle;
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 661e782827..fffcecfe71 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -33,908 +33,908 @@ void proto_register_nfs(void);
 void proto_reg_handoff_nfs(void);
 
 /* NON-NFS-version-specific hf variables */
-static int proto_nfs = -1;
-static int proto_nfs_unknown = -1;
-static int proto_nfs_svr4 = -1;
-static int proto_nfs_knfsd_le = -1;
-static int proto_nfs_nfsd_le = -1;
-static int proto_nfs_knfsd_new = -1;
-static int proto_nfs_ontap_v3 = -1;
-static int proto_nfs_ontap_v4 = -1;
-static int proto_nfs_ontap_gx_v3 = -1;
-static int proto_nfs_celerra_vnx = -1;
-static int proto_nfs_gluster = -1;
-static int proto_nfs_dcache = -1;
-static int proto_nfs_primary_data = -1;
-static int proto_nfs_cb = -1;
-static int hf_nfs_access_check  = -1;
-static int hf_nfs_access_supported  = -1;
-static int hf_nfs_access_rights = -1;
-static int hf_nfs_access_supp_read = -1;
-static int hf_nfs_access_supp_lookup = -1;
-static int hf_nfs_access_supp_modify = -1;
-static int hf_nfs_access_supp_extend = -1;
-static int hf_nfs_access_supp_delete = -1;
-static int hf_nfs_access_supp_execute = -1;
-static int hf_nfs_access_supp_xattr_read = -1;
-static int hf_nfs_access_supp_xattr_write = -1;
-static int hf_nfs_access_supp_xattr_list = -1;
-static int hf_nfs_access_read = -1;
-static int hf_nfs_access_lookup = -1;
-static int hf_nfs_access_modify = -1;
-static int hf_nfs_access_extend = -1;
-static int hf_nfs_access_delete = -1;
-static int hf_nfs_access_execute = -1;
-static int hf_nfs_access_xattr_read = -1;
-static int hf_nfs_access_xattr_write = -1;
-static int hf_nfs_access_xattr_list = -1;
-static int hf_nfs_access_denied = -1;
-static int hf_nfs_fh_length = -1;
-static int hf_nfs_fh_hash = -1;
-static int hf_nfs_fh_fhandle_data = -1;
-static int hf_nfs_fh_mount_fileid = -1;
-static int hf_nfs_fh_mount_generation = -1;
-static int hf_nfs_fh_snapid = -1;
-static int hf_nfs_fh_unused = -1;
-static int hf_nfs_fh_flags = -1;
-static int hf_nfs_fh_fileid = -1;
-static int hf_nfs_fh_generation = -1;
-static int hf_nfs_fh_fsid = -1;
-static int hf_nfs_fh_export_fileid = -1;
-static int hf_nfs_fh_export_generation = -1;
-static int hf_nfs_fh_export_snapid = -1;
-static int hf_nfs_fh_exportid = -1;
-static int hf_nfs_fh_file_flag_mntpoint = -1;
-static int hf_nfs_fh_file_flag_snapdir = -1;
-static int hf_nfs_fh_file_flag_snapdir_ent = -1;
-static int hf_nfs_fh_file_flag_empty = -1;
-static int hf_nfs_fh_file_flag_vbn_access = -1;
-static int hf_nfs_fh_file_flag_multivolume = -1;
-static int hf_nfs_fh_file_flag_metadata = -1;
-static int hf_nfs_fh_file_flag_orphan = -1;
-static int hf_nfs_fh_file_flag_foster = -1;
-static int hf_nfs_fh_file_flag_named_attr = -1;
-static int hf_nfs_fh_file_flag_exp_snapdir = -1;
-static int hf_nfs_fh_file_flag_vfiler = -1;
-static int hf_nfs_fh_file_flag_aggr = -1;
-static int hf_nfs_fh_file_flag_striped = -1;
-static int hf_nfs_fh_file_flag_private = -1;
-static int hf_nfs_fh_file_flag_next_gen = -1;
-static int hf_nfs_fh_gfid = -1;
-static int hf_nfs_fh_handle_type = -1;
-static int hf_nfs_fh_fsid_major16_mask = -1;
-static int hf_nfs_fh_fsid_minor16_mask = -1;
-static int hf_nfs_fh_fsid_major16 = -1;
-static int hf_nfs_fh_fsid_minor16 = -1;
-static int hf_nfs_fh_fsid_major32 = -1;
-static int hf_nfs_fh_fsid_minor32 = -1;
-static int hf_nfs_fh_fsid_inode = -1;
-static int hf_nfs_fh_xfsid_major = -1;
-static int hf_nfs_fh_xfsid_minor = -1;
-static int hf_nfs_fh_fstype = -1;
-static int hf_nfs_fh_fn = -1;
-static int hf_nfs_fh_fn_len = -1;
-static int hf_nfs_fh_fn_inode = -1;
-static int hf_nfs_fh_fn_generation = -1;
-static int hf_nfs_fh_xfn = -1;
-static int hf_nfs_fh_xfn_len = -1;
-static int hf_nfs_fh_xfn_inode = -1;
-static int hf_nfs_fh_xfn_generation = -1;
-static int hf_nfs_fh_dentry = -1;
-/* static int hf_nfs_fh_dev = -1; */
-/* static int hf_nfs_fh_xdev = -1; */
-static int hf_nfs_fh_dirinode = -1;
-static int hf_nfs_fh_pinode = -1;
-static int hf_nfs_fh_hp_len = -1;
-static int hf_nfs_fh_hp_key = -1;
-static int hf_nfs_fh_version = -1;
-static int hf_nfs_fh_auth_type = -1;
-static int hf_nfs_fh_fsid_type = -1;
-static int hf_nfs_fh_fileid_type = -1;
-static int hf_nfs_fh_obj_id = -1;
-static int hf_nfs_fh_ro_node = -1;
-static int hf_nfs_fh_obj = -1;
-static int hf_nfs_fh_obj_fsid = -1;
-static int hf_nfs_fh_obj_treeid = -1;
-static int hf_nfs_fh_obj_kindid = -1;
-static int hf_nfs_fh_obj_inode = -1;
-static int hf_nfs_fh_obj_gen = -1;
-static int hf_nfs_fh_ex = -1;
-static int hf_nfs_fh_ex_fsid = -1;
-static int hf_nfs_fh_ex_treeid = -1;
-static int hf_nfs_fh_ex_kindid = -1;
-static int hf_nfs_fh_ex_inode = -1;
-static int hf_nfs_fh_ex_gen = -1;
-static int hf_nfs_fh_flag = -1;
-static int hf_nfs_fh_endianness = -1;
-static int hf_nfs_fh_dc_opaque = -1;
-static int hf_nfs_fh_dc_exportid = -1;
-static int hf_nfs_fh_dc_handle_type = -1;
-static int hf_nfs4_fh_pd_share = -1;
-static int hf_nfs4_fh_pd_flags = -1;
-static int hf_nfs4_fh_pd_flags_reserved = -1;
-static int hf_nfs4_fh_pd_flags_version = -1;
-static int hf_nfs4_fh_pd_container = -1;
-static int hf_nfs4_fh_pd_inum = -1;
-static int hf_nfs4_fh_pd_sites = -1;
-static int hf_nfs4_fh_pd_sites_inum = -1;
-static int hf_nfs4_fh_pd_sites_siteid = -1;
-static int hf_nfs4_fh_pd_spaces = -1;
-static int hf_nfs4_fh_pd_spaces_snapid = -1;
-static int hf_nfs4_fh_pd_spaces_container = -1;
-static int hf_nfs_full_name = -1;
-static int hf_nfs_name = -1;
-static int hf_nfs_data = -1;
-static int hf_nfs_symlink_to = -1;
-static int hf_nfs_readdir_eof = -1;
-static int hf_nfs_readdir_entry = -1;
-static int hf_nfs_atime = -1;
-static int hf_nfs_atime_sec = -1;
-static int hf_nfs_atime_nsec = -1;
-static int hf_nfs_atime_usec = -1;
-static int hf_nfs_mtime = -1;
-static int hf_nfs_mtime_sec = -1;
-static int hf_nfs_mtime_nsec = -1;
-static int hf_nfs_mtime_usec = -1;
-static int hf_nfs_ctime = -1;
-static int hf_nfs_ctime_sec = -1;
-static int hf_nfs_ctime_nsec = -1;
-static int hf_nfs_ctime_usec = -1;
-static int hf_nfs_dtime = -1;
-static int hf_nfs_dtime_sec = -1;
-static int hf_nfs_dtime_nsec = -1;
+static int proto_nfs;
+static int proto_nfs_unknown;
+static int proto_nfs_svr4;
+static int proto_nfs_knfsd_le;
+static int proto_nfs_nfsd_le;
+static int proto_nfs_knfsd_new;
+static int proto_nfs_ontap_v3;
+static int proto_nfs_ontap_v4;
+static int proto_nfs_ontap_gx_v3;
+static int proto_nfs_celerra_vnx;
+static int proto_nfs_gluster;
+static int proto_nfs_dcache;
+static int proto_nfs_primary_data;
+static int proto_nfs_cb;
+static int hf_nfs_access_check;
+static int hf_nfs_access_supported;
+static int hf_nfs_access_rights;
+static int hf_nfs_access_supp_read;
+static int hf_nfs_access_supp_lookup;
+static int hf_nfs_access_supp_modify;
+static int hf_nfs_access_supp_extend;
+static int hf_nfs_access_supp_delete;
+static int hf_nfs_access_supp_execute;
+static int hf_nfs_access_supp_xattr_read;
+static int hf_nfs_access_supp_xattr_write;
+static int hf_nfs_access_supp_xattr_list;
+static int hf_nfs_access_read;
+static int hf_nfs_access_lookup;
+static int hf_nfs_access_modify;
+static int hf_nfs_access_extend;
+static int hf_nfs_access_delete;
+static int hf_nfs_access_execute;
+static int hf_nfs_access_xattr_read;
+static int hf_nfs_access_xattr_write;
+static int hf_nfs_access_xattr_list;
+static int hf_nfs_access_denied;
+static int hf_nfs_fh_length;
+static int hf_nfs_fh_hash;
+static int hf_nfs_fh_fhandle_data;
+static int hf_nfs_fh_mount_fileid;
+static int hf_nfs_fh_mount_generation;
+static int hf_nfs_fh_snapid;
+static int hf_nfs_fh_unused;
+static int hf_nfs_fh_flags;
+static int hf_nfs_fh_fileid;
+static int hf_nfs_fh_generation;
+static int hf_nfs_fh_fsid;
+static int hf_nfs_fh_export_fileid;
+static int hf_nfs_fh_export_generation;
+static int hf_nfs_fh_export_snapid;
+static int hf_nfs_fh_exportid;
+static int hf_nfs_fh_file_flag_mntpoint;
+static int hf_nfs_fh_file_flag_snapdir;
+static int hf_nfs_fh_file_flag_snapdir_ent;
+static int hf_nfs_fh_file_flag_empty;
+static int hf_nfs_fh_file_flag_vbn_access;
+static int hf_nfs_fh_file_flag_multivolume;
+static int hf_nfs_fh_file_flag_metadata;
+static int hf_nfs_fh_file_flag_orphan;
+static int hf_nfs_fh_file_flag_foster;
+static int hf_nfs_fh_file_flag_named_attr;
+static int hf_nfs_fh_file_flag_exp_snapdir;
+static int hf_nfs_fh_file_flag_vfiler;
+static int hf_nfs_fh_file_flag_aggr;
+static int hf_nfs_fh_file_flag_striped;
+static int hf_nfs_fh_file_flag_private;
+static int hf_nfs_fh_file_flag_next_gen;
+static int hf_nfs_fh_gfid;
+static int hf_nfs_fh_handle_type;
+static int hf_nfs_fh_fsid_major16_mask;
+static int hf_nfs_fh_fsid_minor16_mask;
+static int hf_nfs_fh_fsid_major16;
+static int hf_nfs_fh_fsid_minor16;
+static int hf_nfs_fh_fsid_major32;
+static int hf_nfs_fh_fsid_minor32;
+static int hf_nfs_fh_fsid_inode;
+static int hf_nfs_fh_xfsid_major;
+static int hf_nfs_fh_xfsid_minor;
+static int hf_nfs_fh_fstype;
+static int hf_nfs_fh_fn;
+static int hf_nfs_fh_fn_len;
+static int hf_nfs_fh_fn_inode;
+static int hf_nfs_fh_fn_generation;
+static int hf_nfs_fh_xfn;
+static int hf_nfs_fh_xfn_len;
+static int hf_nfs_fh_xfn_inode;
+static int hf_nfs_fh_xfn_generation;
+static int hf_nfs_fh_dentry;
+/* static int hf_nfs_fh_dev; */
+/* static int hf_nfs_fh_xdev; */
+static int hf_nfs_fh_dirinode;
+static int hf_nfs_fh_pinode;
+static int hf_nfs_fh_hp_len;
+static int hf_nfs_fh_hp_key;
+static int hf_nfs_fh_version;
+static int hf_nfs_fh_auth_type;
+static int hf_nfs_fh_fsid_type;
+static int hf_nfs_fh_fileid_type;
+static int hf_nfs_fh_obj_id;
+static int hf_nfs_fh_ro_node;
+static int hf_nfs_fh_obj;
+static int hf_nfs_fh_obj_fsid;
+static int hf_nfs_fh_obj_treeid;
+static int hf_nfs_fh_obj_kindid;
+static int hf_nfs_fh_obj_inode;
+static int hf_nfs_fh_obj_gen;
+static int hf_nfs_fh_ex;
+static int hf_nfs_fh_ex_fsid;
+static int hf_nfs_fh_ex_treeid;
+static int hf_nfs_fh_ex_kindid;
+static int hf_nfs_fh_ex_inode;
+static int hf_nfs_fh_ex_gen;
+static int hf_nfs_fh_flag;
+static int hf_nfs_fh_endianness;
+static int hf_nfs_fh_dc_opaque;
+static int hf_nfs_fh_dc_exportid;
+static int hf_nfs_fh_dc_handle_type;
+static int hf_nfs4_fh_pd_share;
+static int hf_nfs4_fh_pd_flags;
+static int hf_nfs4_fh_pd_flags_reserved;
+static int hf_nfs4_fh_pd_flags_version;
+static int hf_nfs4_fh_pd_container;
+static int hf_nfs4_fh_pd_inum;
+static int hf_nfs4_fh_pd_sites;
+static int hf_nfs4_fh_pd_sites_inum;
+static int hf_nfs4_fh_pd_sites_siteid;
+static int hf_nfs4_fh_pd_spaces;
+static int hf_nfs4_fh_pd_spaces_snapid;
+static int hf_nfs4_fh_pd_spaces_container;
+static int hf_nfs_full_name;
+static int hf_nfs_name;
+static int hf_nfs_data;
+static int hf_nfs_symlink_to;
+static int hf_nfs_readdir_eof;
+static int hf_nfs_readdir_entry;
+static int hf_nfs_atime;
+static int hf_nfs_atime_sec;
+static int hf_nfs_atime_nsec;
+static int hf_nfs_atime_usec;
+static int hf_nfs_mtime;
+static int hf_nfs_mtime_sec;
+static int hf_nfs_mtime_nsec;
+static int hf_nfs_mtime_usec;
+static int hf_nfs_ctime;
+static int hf_nfs_ctime_sec;
+static int hf_nfs_ctime_nsec;
+static int hf_nfs_ctime_usec;
+static int hf_nfs_dtime;
+static int hf_nfs_dtime_sec;
+static int hf_nfs_dtime_nsec;
 
 /* Hidden field for v2, v3, and v4 status; also used in dissect-nfsacl.c */
-int hf_nfs_status = -1;
+int hf_nfs_status;
 
 /* NFSv2 RFC 1094 hf variables */
-static int hf_nfs2_procedure = -1;
-static int hf_nfs2_status = -1;
-static int hf_nfs2_readlink_data = -1;
-/* static int hf_nfs2_fattr_type = -1; */
-static int hf_nfs2_fattr_nlink = -1;
-static int hf_nfs2_fattr_uid = -1;
-static int hf_nfs2_fattr_gid = -1;
-static int hf_nfs2_fattr_size = -1;
-static int hf_nfs2_fattr_blocksize = -1;
-static int hf_nfs2_fattr_rdev = -1;
-static int hf_nfs2_fattr_blocks = -1;
-static int hf_nfs2_fattr_fsid = -1;
-static int hf_nfs2_fattr_fileid = -1;
-static int hf_nfs2_ftype = -1;
-static int hf_nfs2_mode = -1;
-static int hf_nfs2_mode_name = -1;
-static int hf_nfs2_mode_set_user_id = -1;
-static int hf_nfs2_mode_set_group_id = -1;
-static int hf_nfs2_mode_save_swap_text = -1;
-static int hf_nfs2_mode_read_owner = -1;
-static int hf_nfs2_mode_write_owner = -1;
-static int hf_nfs2_mode_exec_owner = -1;
-static int hf_nfs2_mode_read_group = -1;
-static int hf_nfs2_mode_write_group = -1;
-static int hf_nfs2_mode_exec_group = -1;
-static int hf_nfs2_mode_read_other = -1;
-static int hf_nfs2_mode_write_other = -1;
-static int hf_nfs2_mode_exec_other = -1;
-static int hf_nfs2_read_offset = -1;
-static int hf_nfs2_read_count = -1;
-static int hf_nfs2_read_totalcount = -1;
-static int hf_nfs2_write_beginoffset = -1;
-static int hf_nfs2_write_offset = -1;
-static int hf_nfs2_write_totalcount = -1;
-static int hf_nfs2_readdir_cookie = -1;
-static int hf_nfs2_readdir_count = -1;
-static int hf_nfs2_readdir_entry_fileid = -1;
-static int hf_nfs2_readdir_entry_name = -1;
-static int hf_nfs2_readdir_entry_cookie = -1;
-static int hf_nfs2_statfs_tsize = -1;
-static int hf_nfs2_statfs_bsize = -1;
-static int hf_nfs2_statfs_blocks = -1;
-static int hf_nfs2_statfs_bfree = -1;
-static int hf_nfs2_statfs_bavail = -1;
+static int hf_nfs2_procedure;
+static int hf_nfs2_status;
+static int hf_nfs2_readlink_data;
+/* static int hf_nfs2_fattr_type; */
+static int hf_nfs2_fattr_nlink;
+static int hf_nfs2_fattr_uid;
+static int hf_nfs2_fattr_gid;
+static int hf_nfs2_fattr_size;
+static int hf_nfs2_fattr_blocksize;
+static int hf_nfs2_fattr_rdev;
+static int hf_nfs2_fattr_blocks;
+static int hf_nfs2_fattr_fsid;
+static int hf_nfs2_fattr_fileid;
+static int hf_nfs2_ftype;
+static int hf_nfs2_mode;
+static int hf_nfs2_mode_name;
+static int hf_nfs2_mode_set_user_id;
+static int hf_nfs2_mode_set_group_id;
+static int hf_nfs2_mode_save_swap_text;
+static int hf_nfs2_mode_read_owner;
+static int hf_nfs2_mode_write_owner;
+static int hf_nfs2_mode_exec_owner;
+static int hf_nfs2_mode_read_group;
+static int hf_nfs2_mode_write_group;
+static int hf_nfs2_mode_exec_group;
+static int hf_nfs2_mode_read_other;
+static int hf_nfs2_mode_write_other;
+static int hf_nfs2_mode_exec_other;
+static int hf_nfs2_read_offset;
+static int hf_nfs2_read_count;
+static int hf_nfs2_read_totalcount;
+static int hf_nfs2_write_beginoffset;
+static int hf_nfs2_write_offset;
+static int hf_nfs2_write_totalcount;
+static int hf_nfs2_readdir_cookie;
+static int hf_nfs2_readdir_count;
+static int hf_nfs2_readdir_entry_fileid;
+static int hf_nfs2_readdir_entry_name;
+static int hf_nfs2_readdir_entry_cookie;
+static int hf_nfs2_statfs_tsize;
+static int hf_nfs2_statfs_bsize;
+static int hf_nfs2_statfs_blocks;
+static int hf_nfs2_statfs_bfree;
+static int hf_nfs2_statfs_bavail;
 
 /* NFSv3 RFC 1813 header format variables */
-static int hf_nfs3_procedure = -1;
-static int hf_nfs3_fattr_type = -1;
-static int hf_nfs3_fattr_nlink = -1;
-static int hf_nfs3_fattr_uid = -1;
-static int hf_nfs3_fattr_gid = -1;
-static int hf_nfs3_fattr_size = -1;
-static int hf_nfs3_fattr_used = -1;
-/* static int hf_nfs3_fattr_rdev = -1; */
-static int hf_nfs3_fattr_fsid = -1;
-static int hf_nfs3_fattr_fileid = -1;
-static int hf_nfs3_wcc_attr_size = -1;
-static int hf_nfs3_set_size = -1;
-static int hf_nfs3_cookie = -1;
-static int hf_nfs3_fsstat_resok_tbytes = -1;
-static int hf_nfs3_fsstat_resok_fbytes = -1;
-static int hf_nfs3_fsstat_resok_abytes = -1;
-static int hf_nfs3_fsstat_resok_tfiles = -1;
-static int hf_nfs3_fsstat_resok_ffiles = -1;
-static int hf_nfs3_fsstat_resok_afiles = -1;
-static int hf_nfs3_uid = -1;
-static int hf_nfs3_gid = -1;
-static int hf_nfs3_offset = -1;
-static int hf_nfs3_count = -1;
-static int hf_nfs3_count_maxcount = -1;
-static int hf_nfs3_count_dircount= -1;
-static int hf_nfs3_mode = -1;
-static int hf_nfs3_mode_suid = -1;
-static int hf_nfs3_mode_sgid = -1;
-static int hf_nfs3_mode_sticky = -1;
-static int hf_nfs3_mode_rusr = -1;
-static int hf_nfs3_mode_wusr = -1;
-static int hf_nfs3_mode_xusr = -1;
-static int hf_nfs3_mode_rgrp = -1;
-static int hf_nfs3_mode_wgrp = -1;
-static int hf_nfs3_mode_xgrp = -1;
-static int hf_nfs3_mode_roth = -1;
-static int hf_nfs3_mode_woth = -1;
-static int hf_nfs3_mode_xoth = -1;
-static int hf_nfs3_readdir_entry_fileid = -1;
-static int hf_nfs3_readdir_entry_name = -1;
-static int hf_nfs3_readdir_entry_cookie = -1;
-static int hf_nfs3_readdirplus_entry_fileid = -1;
-static int hf_nfs3_readdirplus_entry_name = -1;
-static int hf_nfs3_readdirplus_entry_cookie = -1;
-static int hf_nfs3_ftype = -1;
-static int hf_nfs3_status = -1;
-static int hf_nfs3_read_eof = -1;
-static int hf_nfs3_write_stable = -1;
-static int hf_nfs3_write_committed = -1;
-static int hf_nfs3_createmode = -1;
-static int hf_nfs3_fsstat_invarsec = -1;
-static int hf_nfs3_fsinfo_rtmax = -1;
-static int hf_nfs3_fsinfo_rtpref = -1;
-static int hf_nfs3_fsinfo_rtmult = -1;
-static int hf_nfs3_fsinfo_wtmax = -1;
-static int hf_nfs3_fsinfo_wtpref = -1;
-static int hf_nfs3_fsinfo_wtmult = -1;
-static int hf_nfs3_fsinfo_dtpref = -1;
-static int hf_nfs3_fsinfo_maxfilesize = -1;
-static int hf_nfs3_fsinfo_properties = -1;
-static int hf_nfs3_fsinfo_properties_setattr = -1;
-static int hf_nfs3_fsinfo_properties_pathconf = -1;
-static int hf_nfs3_fsinfo_properties_symlinks = -1;
-static int hf_nfs3_fsinfo_properties_hardlinks = -1;
-static int hf_nfs3_pathconf_linkmax = -1;
-static int hf_nfs3_pathconf_name_max = -1;
-static int hf_nfs3_pathconf_no_trunc = -1;
-static int hf_nfs3_pathconf_chown_restricted = -1;
-static int hf_nfs3_pathconf_case_insensitive = -1;
-static int hf_nfs3_pathconf_case_preserving = -1;
-static int hf_nfs3_gxfh_utlfield = -1;
-static int hf_nfs3_gxfh_utlfield_tree = -1;
-static int hf_nfs3_gxfh_utlfield_jun = -1;
-static int hf_nfs3_gxfh_utlfield_ver = -1;
-static int hf_nfs3_gxfh_volcnt = -1;
-static int hf_nfs3_gxfh_epoch = -1;
-static int hf_nfs3_gxfh_ldsid = -1;
-static int hf_nfs3_gxfh_cid = -1;
-static int hf_nfs3_gxfh_resv = -1;
-static int hf_nfs3_gxfh_sfhflags = -1;
-static int hf_nfs3_gxfh_sfhflags_resv1 = -1;
-static int hf_nfs3_gxfh_sfhflags_resv2 = -1;
-static int hf_nfs3_gxfh_sfhflags_ontap7G = -1;
-static int hf_nfs3_gxfh_sfhflags_ontapGX = -1;
-static int hf_nfs3_gxfh_sfhflags_striped = -1;
-static int hf_nfs3_gxfh_sfhflags_empty = -1;
-static int hf_nfs3_gxfh_sfhflags_snapdirent = -1;
-static int hf_nfs3_gxfh_sfhflags_snapdir = -1;
-static int hf_nfs3_gxfh_sfhflags_streamdir = -1;
-static int hf_nfs3_gxfh_spinfid = -1;
-static int hf_nfs3_gxfh_spinfuid = -1;
-static int hf_nfs3_gxfh_exportptid = -1;
-static int hf_nfs3_gxfh_exportptuid = -1;
-static int hf_nfs3_verifier = -1;
-static int hf_nfs3_specdata1 = -1;
-static int hf_nfs3_specdata2 = -1;
-static int hf_nfs3_attributes_follow = -1;
-static int hf_nfs3_handle_follow = -1;
-static int hf_nfs3_sattrguard3 = -1;
+static int hf_nfs3_procedure;
+static int hf_nfs3_fattr_type;
+static int hf_nfs3_fattr_nlink;
+static int hf_nfs3_fattr_uid;
+static int hf_nfs3_fattr_gid;
+static int hf_nfs3_fattr_size;
+static int hf_nfs3_fattr_used;
+/* static int hf_nfs3_fattr_rdev; */
+static int hf_nfs3_fattr_fsid;
+static int hf_nfs3_fattr_fileid;
+static int hf_nfs3_wcc_attr_size;
+static int hf_nfs3_set_size;
+static int hf_nfs3_cookie;
+static int hf_nfs3_fsstat_resok_tbytes;
+static int hf_nfs3_fsstat_resok_fbytes;
+static int hf_nfs3_fsstat_resok_abytes;
+static int hf_nfs3_fsstat_resok_tfiles;
+static int hf_nfs3_fsstat_resok_ffiles;
+static int hf_nfs3_fsstat_resok_afiles;
+static int hf_nfs3_uid;
+static int hf_nfs3_gid;
+static int hf_nfs3_offset;
+static int hf_nfs3_count;
+static int hf_nfs3_count_maxcount;
+static int hf_nfs3_count_dircount;
+static int hf_nfs3_mode;
+static int hf_nfs3_mode_suid;
+static int hf_nfs3_mode_sgid;
+static int hf_nfs3_mode_sticky;
+static int hf_nfs3_mode_rusr;
+static int hf_nfs3_mode_wusr;
+static int hf_nfs3_mode_xusr;
+static int hf_nfs3_mode_rgrp;
+static int hf_nfs3_mode_wgrp;
+static int hf_nfs3_mode_xgrp;
+static int hf_nfs3_mode_roth;
+static int hf_nfs3_mode_woth;
+static int hf_nfs3_mode_xoth;
+static int hf_nfs3_readdir_entry_fileid;
+static int hf_nfs3_readdir_entry_name;
+static int hf_nfs3_readdir_entry_cookie;
+static int hf_nfs3_readdirplus_entry_fileid;
+static int hf_nfs3_readdirplus_entry_name;
+static int hf_nfs3_readdirplus_entry_cookie;
+static int hf_nfs3_ftype;
+static int hf_nfs3_status;
+static int hf_nfs3_read_eof;
+static int hf_nfs3_write_stable;
+static int hf_nfs3_write_committed;
+static int hf_nfs3_createmode;
+static int hf_nfs3_fsstat_invarsec;
+static int hf_nfs3_fsinfo_rtmax;
+static int hf_nfs3_fsinfo_rtpref;
+static int hf_nfs3_fsinfo_rtmult;
+static int hf_nfs3_fsinfo_wtmax;
+static int hf_nfs3_fsinfo_wtpref;
+static int hf_nfs3_fsinfo_wtmult;
+static int hf_nfs3_fsinfo_dtpref;
+static int hf_nfs3_fsinfo_maxfilesize;
+static int hf_nfs3_fsinfo_properties;
+static int hf_nfs3_fsinfo_properties_setattr;
+static int hf_nfs3_fsinfo_properties_pathconf;
+static int hf_nfs3_fsinfo_properties_symlinks;
+static int hf_nfs3_fsinfo_properties_hardlinks;
+static int hf_nfs3_pathconf_linkmax;
+static int hf_nfs3_pathconf_name_max;
+static int hf_nfs3_pathconf_no_trunc;
+static int hf_nfs3_pathconf_chown_restricted;
+static int hf_nfs3_pathconf_case_insensitive;
+static int hf_nfs3_pathconf_case_preserving;
+static int hf_nfs3_gxfh_utlfield;
+static int hf_nfs3_gxfh_utlfield_tree;
+static int hf_nfs3_gxfh_utlfield_jun;
+static int hf_nfs3_gxfh_utlfield_ver;
+static int hf_nfs3_gxfh_volcnt;
+static int hf_nfs3_gxfh_epoch;
+static int hf_nfs3_gxfh_ldsid;
+static int hf_nfs3_gxfh_cid;
+static int hf_nfs3_gxfh_resv;
+static int hf_nfs3_gxfh_sfhflags;
+static int hf_nfs3_gxfh_sfhflags_resv1;
+static int hf_nfs3_gxfh_sfhflags_resv2;
+static int hf_nfs3_gxfh_sfhflags_ontap7G;
+static int hf_nfs3_gxfh_sfhflags_ontapGX;
+static int hf_nfs3_gxfh_sfhflags_striped;
+static int hf_nfs3_gxfh_sfhflags_empty;
+static int hf_nfs3_gxfh_sfhflags_snapdirent;
+static int hf_nfs3_gxfh_sfhflags_snapdir;
+static int hf_nfs3_gxfh_sfhflags_streamdir;
+static int hf_nfs3_gxfh_spinfid;
+static int hf_nfs3_gxfh_spinfuid;
+static int hf_nfs3_gxfh_exportptid;
+static int hf_nfs3_gxfh_exportptuid;
+static int hf_nfs3_verifier;
+static int hf_nfs3_specdata1;
+static int hf_nfs3_specdata2;
+static int hf_nfs3_attributes_follow;
+static int hf_nfs3_handle_follow;
+static int hf_nfs3_sattrguard3;
 
 
 /* NFSv4 RFC 5661 header format variables */
-static int hf_nfs4_procedure = -1;
-static int hf_nfs4_status = -1;
-static int hf_nfs4_op = -1;
-static int hf_nfs4_main_opcode = -1;
-static int hf_nfs4_linktext = -1;
-static int hf_nfs4_tag = -1;
-static int hf_nfs4_ops_count = -1;
-static int hf_nfs4_pathname_components = -1;
-static int hf_nfs4_component = -1;
-static int hf_nfs4_clientid = -1;
-/* static int hf_nfs4_ace = -1; */
-static int hf_nfs4_recall = -1;
-static int hf_nfs4_open_claim_type = -1;
-static int hf_nfs4_opentype = -1;
-static int hf_nfs4_state_protect_how = -1;
-static int hf_nfs4_limit_by = -1;
-static int hf_nfs4_open_delegation_type = -1;
-static int hf_nfs4_why_no_delegation = -1;
-static int hf_nfs4_ftype = -1;
-static int hf_nfs4_change_info_atomic = -1;
-static int hf_nfs4_open_share_access = -1;
-static int hf_nfs4_open_share_deny = -1;
-static int hf_nfs4_want_flags = -1;
-static int hf_nfs4_want_notify_flags = -1;
-static int hf_nfs4_want_signal_deleg_when_resrc_avail = -1;
-static int hf_nfs4_want_push_deleg_when_uncontended = -1;
-static int hf_nfs4_want_deleg_timestamps = -1;
-static int hf_nfs4_seqid = -1;
-static int hf_nfs4_lock_seqid = -1;
-static int hf_nfs4_reqd_attr = -1;
-static int hf_nfs4_reco_attr = -1;
-static int hf_nfs4_attr_mask = -1;
-static int hf_nfs4_attr_count = -1;
-static int hf_nfs4_set_it_value_follows = -1;
-static int hf_nfs4_time_how = -1;
-static int hf_nfs4_time_how4 = -1;
-static int hf_nfs4_fattr_link_support = -1;
-static int hf_nfs4_fattr_symlink_support = -1;
-static int hf_nfs4_fattr_named_attr = -1;
-static int hf_nfs4_fattr_unique_handles = -1;
-static int hf_nfs4_fattr_archive = -1;
-static int hf_nfs4_fattr_cansettime = -1;
-static int hf_nfs4_fattr_case_insensitive = -1;
-static int hf_nfs4_fattr_case_preserving = -1;
-static int hf_nfs4_fattr_chown_restricted = -1;
-static int hf_nfs4_fattr_fh_expire_type = -1;
-static int hf_nfs4_fattr_fh_expiry_noexpire_with_open = -1;
-static int hf_nfs4_fattr_fh_expiry_volatile_any = -1;
-static int hf_nfs4_fattr_fh_expiry_vol_migration = -1;
-static int hf_nfs4_fattr_fh_expiry_vol_rename = -1;
-static int hf_nfs4_fattr_hidden = -1;
-static int hf_nfs4_fattr_homogeneous = -1;
-static int hf_nfs4_fattr_mimetype = -1;
-static int hf_nfs4_fattr_no_trunc = -1;
-static int hf_nfs4_fattr_system = -1;
-static int hf_nfs4_fattr_owner = -1;
-static int hf_nfs4_fattr_owner_group = -1;
-static int hf_nfs4_fattr_size = -1;
-static int hf_nfs4_fattr_aclsupport = -1;
-static int hf_nfs4_aclsupport_allow_acl = -1;
-static int hf_nfs4_aclsupport_deny_acl = -1;
-static int hf_nfs4_aclsupport_audit_acl = -1;
-static int hf_nfs4_aclsupport_alarm_acl = -1;
-static int hf_nfs4_fattr_lease_time = -1;
-static int hf_nfs4_fattr_fs_charset_cap = -1;
-static int hf_nfs4_fs_charset_cap_nonutf8 = -1;
-static int hf_nfs4_fs_charset_cap_utf8 = -1;
-static int hf_nfs4_fattr_fileid = -1;
-static int hf_nfs4_fattr_files_avail = -1;
-static int hf_nfs4_fattr_files_free = -1;
-static int hf_nfs4_fattr_files_total = -1;
-static int hf_nfs4_fattr_maxfilesize = -1;
-static int hf_nfs4_fattr_maxlink = -1;
-static int hf_nfs4_fattr_maxname = -1;
-static int hf_nfs4_fattr_numlinks = -1;
-static int hf_nfs4_fattr_maxread = -1;
-static int hf_nfs4_fattr_maxwrite = -1;
-static int hf_nfs4_fattr_quota_hard = -1;
-static int hf_nfs4_fattr_quota_soft = -1;
-static int hf_nfs4_fattr_quota_used = -1;
-static int hf_nfs4_fattr_space_avail = -1;
-static int hf_nfs4_fattr_space_free = -1;
-static int hf_nfs4_fattr_space_total = -1;
-static int hf_nfs4_fattr_space_used = -1;
-static int hf_nfs4_fattr_mounted_on_fileid = -1;
-static int hf_nfs4_fattr_layout_blksize = -1;
-static int hf_nfs4_mdsthreshold_item = -1;
-static int hf_nfs4_mdsthreshold_hint_mask = -1;
-static int hf_nfs4_mdsthreshold_hint_count = -1;
-static int hf_nfs4_mdsthreshold_mask_count = -1;
-static int hf_nfs4_mdsthreshold_hint_file = -1;
-static int hf_nfs4_fattr_security_label_lfs = -1;
-static int hf_nfs4_fattr_security_label_pi = -1;
-static int hf_nfs4_fattr_security_label_context = -1;
-static int hf_nfs4_fattr_umask_mask = -1;
-static int hf_nfs4_fattr_xattr_support = -1;
-static int hf_nfs4_fattr_offline = -1;
-static int hf_nfs4_who = -1;
-static int hf_nfs4_server = -1;
-static int hf_nfs4_servers = -1;
-static int hf_nfs4_fslocation = -1;
-static int hf_nfs4_stable_how = -1;
-static int hf_nfs4_dirlist_eof = -1;
-static int hf_nfs4_offset = -1;
-static int hf_nfs4_specdata1 = -1;
-static int hf_nfs4_specdata2 = -1;
-static int hf_nfs4_lock_type = -1;
-static int hf_nfs4_open_rflags = -1;
-static int hf_nfs4_open_rflags_confirm = -1;
-static int hf_nfs4_open_rflags_locktype_posix = -1;
-static int hf_nfs4_open_rflags_preserve_unlinked = -1;
-static int hf_nfs4_open_rflags_may_notify_lock = -1;
-static int hf_nfs4_reclaim = -1;
-static int hf_nfs4_length = -1;
-static int hf_nfs4_changeid = -1;
-static int hf_nfs4_changeid_before = -1;
-static int hf_nfs4_changeid_after = -1;
-static int hf_nfs4_time_seconds = -1;
-static int hf_nfs4_time_nseconds = -1;
-static int hf_nfs4_fsid_major = -1;
-static int hf_nfs4_fsid_minor = -1;
-static int hf_nfs4_acetype = -1;
-static int hf_nfs4_aceflags = -1;
-static int hf_nfs4_aceflag_file_inherit = -1;
-static int hf_nfs4_aceflag_dir_inherit = -1;
-static int hf_nfs4_aceflag_no_prop_inherit = -1;
-static int hf_nfs4_aceflag_inherit_only = -1;
-static int hf_nfs4_aceflag_successful_access = -1;
-static int hf_nfs4_aceflag_failed_access = -1;
-static int hf_nfs4_aceflag_id_group = -1;
-static int hf_nfs4_aceflag_inherited_ace = -1;
-static int hf_nfs4_acemask = -1;
-static int hf_nfs4_ace_permission = -1;
-static int hf_nfs4_delegate_type = -1;
-static int hf_nfs4_secinfo_flavor = -1;
-static int hf_nfs4_secinfo_arr = -1;
-static int hf_nfs4_num_blocks = -1;
-static int hf_nfs4_bytes_per_block = -1;
-static int hf_nfs4_eof = -1;
-static int hf_nfs4_verifier = -1;
-static int hf_nfs4_value_follows = -1;
-static int hf_nfs4_cookie = -1;
-static int hf_nfs4_dir_entry_name = -1;
-static int hf_nfs4_cookie_verf = -1;
-static int hf_nfs4_cb_program = -1;
-/* static int hf_nfs4_cb_location = -1; */
-static int hf_nfs4_recall4 = -1;
-static int hf_nfs4_filesize = -1;
-static int hf_nfs4_count = -1;
-static int hf_nfs4_count_dircount = -1;
-static int hf_nfs4_count_maxcount = -1;
-static int hf_nfs4_minorversion = -1;
-static int hf_nfs4_open_owner = -1;
-static int hf_nfs4_lock_owner = -1;
-static int hf_nfs4_new_lock_owner = -1;
-static int hf_nfs4_sec_oid = -1;
-static int hf_nfs4_qop = -1;
-static int hf_nfs4_secinfo_rpcsec_gss_info_service = -1;
-static int hf_nfs4_attr_dir_create = -1;
-static int hf_nfs4_client_id = -1;
-static int hf_nfs4_stateid = -1;
-static int hf_nfs4_seqid_stateid = -1;
-static int hf_nfs4_stateid_other = -1;
-static int hf_nfs4_stateid_hash = -1;
-static int hf_nfs4_stateid_other_hash = -1;
-static int hf_nfs4_lock_reclaim = -1;
-static int hf_nfs4_aclflags = -1;
-static int hf_nfs4_aclflag_auto_inherit = -1;
-static int hf_nfs4_aclflag_protected = -1;
-static int hf_nfs4_aclflag_defaulted = -1;
-static int hf_nfs4_num_aces = -1;
-static int hf_nfs4_callback_ident = -1;
-static int hf_nfs4_r_netid = -1;
-static int hf_nfs4_gsshandle = -1;
-static int hf_nfs4_r_addr = -1;
-static int hf_nfs4_createmode = -1;
-static int hf_nfs4_op_mask = -1;
-static int hf_nfs4_read_data_length = -1;
-static int hf_nfs4_write_data_length = -1;
-static int hf_nfs4_length_minlength = -1;
-static int hf_nfs4_layout_type = -1;
-static int hf_nfs4_layout_return_type = -1;
-static int hf_nfs4_iomode = -1;
-/* static int hf_nfs4_stripetype = -1; */
-/* static int hf_nfs4_mdscommit = -1; */
-static int hf_nfs4_stripeunit = -1;
-static int hf_nfs4_newtime = -1;
-static int hf_nfs4_newoffset = -1;
-static int hf_nfs4_layout_avail = -1;
-static int hf_nfs4_newsize = -1;
-static int hf_nfs4_layoutupdate = -1;
-static int hf_nfs4_deviceid = -1;
-static int hf_nfs4_devicenum = -1;
-static int hf_nfs4_deviceidx = -1;
-static int hf_nfs4_layout = -1;
-/* static int hf_nfs4_stripedevs = -1; */
-/* static int hf_nfs4_devaddr = -1; */
-static int hf_nfs4_devaddr_ssv_start = -1;
-static int hf_nfs4_devaddr_ssv_length = -1;
-static int hf_nfs4_devaddr_scsi_vol_type = -1;
-static int hf_nfs4_devaddr_scsi_vol_index = -1;
-static int hf_nfs4_devaddr_scsi_vol_ref_index = -1;
-static int hf_nfs4_devaddr_ssv_stripe_unit = -1;
-static int hf_nfs4_devaddr_scsi_vpd_code_set = -1;
-static int hf_nfs4_devaddr_scsi_vpd_designator_type = -1;
-static int hf_nfs4_devaddr_scsi_vpd_designator = -1;
-static int hf_nfs4_devaddr_scsi_private_key = -1;
-static int hf_nfs4_scsil_ext_file_offset = -1;
-static int hf_nfs4_scsil_ext_length = -1;
-static int hf_nfs4_scsil_ext_vol_offset = -1;
-static int hf_nfs4_scsil_ext_state = -1;
-static int hf_nfs4_return_on_close = -1;
-static int hf_nfs4_slotid = -1;
-static int hf_nfs4_high_slotid = -1;
-static int hf_nfs4_target_high_slotid = -1;
-static int hf_nfs4_serverscope4 = -1;
-static int hf_nfs4_minorid = -1;
-static int hf_nfs4_majorid = -1;
-static int hf_nfs4_padsize = -1;
-/* static int hf_nfs4_cbrenforce = -1; */
-/* static int hf_nfs4_hashalg = -1; */
-/* static int hf_nfs4_ssvlen = -1; */
-static int hf_nfs4_maxreqsize = -1;
-static int hf_nfs4_maxrespsize = -1;
-static int hf_nfs4_maxrespsizecached = -1;
-static int hf_nfs4_maxops = -1;
-static int hf_nfs4_maxreqs = -1;
-static int hf_nfs4_rdmachanattrs = -1;
-static int hf_nfs4_machinename = -1;
-static int hf_nfs4_flavor = -1;
-static int hf_nfs4_stamp = -1;
-static int hf_nfs4_uid = -1;
-static int hf_nfs4_gid = -1;
-static int hf_nfs4_service = -1;
-static int hf_nfs4_sessionid = -1;
-static int hf_nfs4_exchid_call_flags = -1;
-static int hf_nfs4_exchid_reply_flags = -1;
-static int hf_nfs4_exchid_flags_moved_refer = -1;
-static int hf_nfs4_exchid_flags_moved_migr = -1;
-static int hf_nfs4_exchid_flags_bind_princ = -1;
-static int hf_nfs4_exchid_flags_non_pnfs = -1;
-static int hf_nfs4_exchid_flags_pnfs_mds = -1;
-static int hf_nfs4_exchid_flags_pnfs_ds = -1;
-static int hf_nfs4_exchid_flags_upd_conf_rec_a = -1;
-static int hf_nfs4_exchid_flags_confirmed_r = -1;
-static int hf_nfs4_state_protect_window = -1;
-static int hf_nfs4_state_protect_num_gss_handles = -1;
-static int hf_nfs4_sp_parms_hash_algs = -1;
-static int hf_nfs4_sp_parms_encr_algs = -1;
-static int hf_nfs4_prot_info_spi_window = -1;
-static int hf_nfs4_prot_info_svv_length = -1;
-static int hf_nfs4_prot_info_encr_alg = -1;
-static int hf_nfs4_prot_info_hash_alg = -1;
-static int hf_nfs4_nii_domain = -1;
-static int hf_nfs4_nii_name = -1;
-static int hf_nfs4_create_session_flags_csa = -1;
-static int hf_nfs4_create_session_flags_csr = -1;
-static int hf_nfs4_create_session_flags_persist = -1;
-static int hf_nfs4_create_session_flags_conn_back_chan = -1;
-static int hf_nfs4_create_session_flags_conn_rdma = -1;
-static int hf_nfs4_cachethis = -1;
-/* static int hf_nfs4_util = -1; */
-/* static int hf_nfs4_first_stripe_idx = -1; */
-/* static int hf_nfs4_layout_count = -1; */
-/* static int hf_nfs4_pattern_offset = -1; */
-static int hf_nfs4_notification_mask = -1;
-static int hf_nfs4_notification_type = -1;
-static int hf_nfs4_lrs_present = -1;
-static int hf_nfs4_nfl_mirrors = -1;
-static int hf_nfs4_nfl_util = -1;
-static int hf_nfs4_nfl_util_stripe_size = -1;
-static int hf_nfs4_nfl_util_commit_thru_mds = -1;
-static int hf_nfs4_nfl_util_dense = -1;
-static int hf_nfs4_nfl_fhs = -1;
-static int hf_nfs4_mirror_eff = -1;
-static int hf_nfs4_nfl_first_stripe_index = -1;
-static int hf_nfs4_lrf_body_content = -1;
-static int hf_nfs4_reclaim_one_fs = -1;
-static int hf_nfs4_bctsa_dir = -1;
-static int hf_nfs4_bctsa_use_conn_in_rdma_mode = -1;
-static int hf_nfs4_bctsr_dir = -1;
-static int hf_nfs4_bctsr_use_conn_in_rdma_mode = -1;
-static int hf_nfs4_sequence_status_flags = -1;
-static int hf_nfs4_sequence_status_flags_cb_path_down = -1;
-static int hf_nfs4_sequence_status_flags_cb_gss_contexts_expiring = -1;
-static int hf_nfs4_sequence_status_flags_cb_gss_contexts_expired = -1;
-static int hf_nfs4_sequence_status_flags_expired_all_state_revoked = -1;
-static int hf_nfs4_sequence_status_flags_expired_some_state_revoked = -1;
-static int hf_nfs4_sequence_status_flags_admin_state_revoked = -1;
-static int hf_nfs4_sequence_status_flags_recallable_state_revoked = -1;
-static int hf_nfs4_sequence_status_flags_lease_moved = -1;
-static int hf_nfs4_sequence_status_flags_restart_reclaim_needed = -1;
-static int hf_nfs4_sequence_status_flags_cb_path_down_session = -1;
-static int hf_nfs4_sequence_status_flags_backchannel_fault = -1;
-static int hf_nfs4_sequence_status_flags_devid_changed = -1;
-static int hf_nfs4_sequence_status_flags_devid_deleted = -1;
-static int hf_nfs4_secinfo_style = -1;
-static int hf_nfs4_test_stateid_arg = -1;
-static int hf_nfs4_test_stateid_res = -1;
-static int hf_nfs4_seek_data_content = -1;
-/* static int hf_nfs4_impl_id_len = -1; */
-static int hf_nfs4_bitmap_data = -1;
-static int hf_nfs4_huge_bitmap_length = -1;
-static int hf_nfs4_universal_address_ipv4 = -1;
-static int hf_nfs4_universal_address_ipv6 = -1;
-static int hf_nfs4_getdevinfo = -1;
-static int hf_nfs4_ff_version = -1;
-static int hf_nfs4_ff_minorversion = -1;
-static int hf_nfs4_ff_tightly_coupled = -1;
-static int hf_nfs4_ff_rsize = -1;
-static int hf_nfs4_ff_wsize = -1;
-static int hf_nfs4_fattr_clone_blocksize = -1;
-static int hf_nfs4_fattr_space_freed = -1;
-static int hf_nfs4_fattr_change_attr_type = -1;
-static int hf_nfs4_ff_layout_flags = -1;
-static int hf_nfs4_ff_layout_flags_no_layoutcommit = -1;
-static int hf_nfs4_ff_layout_flags_no_io_thru_mds = -1;
-static int hf_nfs4_ff_layout_flags_no_read_io = -1;
-static int hf_nfs4_ff_stats_collect_hint = -1;
-static int hf_nfs4_ff_synthetic_owner = -1;
-static int hf_nfs4_ff_synthetic_owner_group = -1;
-static int hf_nfs4_ff_bytes_completed = -1;
-static int hf_nfs4_ff_bytes_not_delivered = -1;
-static int hf_nfs4_ff_bytes_requested = -1;
-static int hf_nfs4_ff_local = -1;
-static int hf_nfs4_ff_ops_completed = -1;
-static int hf_nfs4_ff_ops_requested = -1;
-static int hf_nfs4_io_bytes = -1;
-static int hf_nfs4_io_count = -1;
-static int hf_nfs4_layoutstats = -1;
-static int hf_nfs4_callback_stateids = -1;
-static int hf_nfs4_callback_stateids_index = -1;
-static int hf_nfs4_num_offload_status = -1;
-static int hf_nfs4_offload_status_index = -1;
-static int hf_nfs4_consecutive = -1;
-static int hf_nfs4_netloc = -1;
-static int hf_nfs4_netloc_type = -1;
-static int hf_nfs4_nl_name = -1;
-static int hf_nfs4_nl_url = -1;
-static int hf_nfs4_source_server_index = -1;
-static int hf_nfs4_source_servers = -1;
-static int hf_nfs4_synchronous = -1;
-static int hf_nfs4_device_error_count = -1;
-static int hf_nfs4_device_errors_index = -1;
-static int hf_nfs4_ff_ioerrs_count = -1;
-static int hf_nfs4_ff_ioerrs_index = -1;
-static int hf_nfs4_ff_ioerrs_length = -1;
-static int hf_nfs4_ff_ioerrs_offset = -1;
-static int hf_nfs4_ff_iostats_count = -1;
-static int hf_nfs4_ff_iostats_index = -1;
-static int hf_nfs4_io_error_op = -1;
-static int hf_nfs4_io_hints_mask = -1;
-static int hf_nfs4_io_hint_count = -1;
-static int hf_nfs4_io_advise_hint = -1;
-static int hf_nfs4_cb_recall_any_objs = -1;
-static int hf_nfs4_cb_recall_any_count = -1;
-static int hf_nfs4_cb_recall_any_mask = -1;
-static int hf_nfs4_cb_recall_any_item = -1;
-static int hf_nfs4_bytes_copied = -1;
-static int hf_nfs4_read_plus_contents = -1;
-static int hf_nfs4_read_plus_content_type = -1;
-static int hf_nfs4_block_size = -1;
-static int hf_nfs4_block_count = -1;
-static int hf_nfs4_reloff_blocknum = -1;
-static int hf_nfs4_blocknum = -1;
-static int hf_nfs4_reloff_pattern = -1;
-static int hf_nfs4_pattern_hash = -1;
-static int hf_nfs4_setxattr_options = -1;
-static int hf_nfs4_listxattr_maxcount = -1;
-static int hf_nfs4_listxattr_cookie = -1;
-static int hf_nfs4_listxattr_names_len = -1;
-static int hf_nfs4_xattrkey = -1;
-static int hf_nfs4_listxattr_eof = -1;
-
-static gint ett_nfs = -1;
-static gint ett_nfs_fh_encoding = -1;
-static gint ett_nfs_fh_mount = -1;
-static gint ett_nfs_fh_file = -1;
-static gint ett_nfs_fh_export = -1;
-static gint ett_nfs_fh_fsid = -1;
-static gint ett_nfs_fh_xfsid = -1;
-static gint ett_nfs_fh_fn = -1;
-static gint ett_nfs_fh_xfn = -1;
-static gint ett_nfs_fh_hp = -1;
-static gint ett_nfs_fh_auth = -1;
-static gint ett_nfs_fhandle = -1;
-static gint ett_nfs_timeval = -1;
-static gint ett_nfs_fattr = -1;
-static gint ett_nfs_readdir_entry = -1;
-static gint ett_nfs_fh_obj = -1;
-static gint ett_nfs_fh_ex = -1;
-static gint ett_nfs_utf8string = -1;
-
-static gint ett_nfs2_mode = -1;
-static gint ett_nfs2_sattr = -1;
-static gint ett_nfs2_diropargs = -1;
-
-static gint ett_nfs3_mode = -1;
-static gint ett_nfs3_specdata = -1;
-static gint ett_nfs3_fh = -1;
-static gint ett_nfs3_nfstime = -1;
-static gint ett_nfs3_fattr = -1;
-static gint ett_nfs3_post_op_fh = -1;
-static gint ett_nfs3_sattr = -1;
-static gint ett_nfs3_diropargs = -1;
-static gint ett_nfs3_sattrguard = -1;
-static gint ett_nfs3_set_mode = -1;
-static gint ett_nfs3_set_uid = -1;
-static gint ett_nfs3_set_gid = -1;
-static gint ett_nfs3_set_size = -1;
-static gint ett_nfs3_set_atime = -1;
-static gint ett_nfs3_set_mtime = -1;
-static gint ett_nfs3_pre_op_attr = -1;
-static gint ett_nfs3_post_op_attr = -1;
-static gint ett_nfs3_wcc_attr = -1;
-static gint ett_nfs3_wcc_data = -1;
-static gint ett_nfs3_access = -1;
-static gint ett_nfs3_fsinfo_properties = -1;
-static gint ett_nfs3_gxfh_utlfield = -1;
-static gint ett_nfs3_gxfh_sfhfield = -1;
-static gint ett_nfs3_gxfh_sfhflags = -1;
-static gint ett_nfs4_fh_pd_flags = -1;
-static gint ett_nfs4_fh_pd_sites = -1;
-static gint ett_nfs4_fh_pd_spaces = -1;
-
-static gint ett_nfs4_compound_call = -1;
-static gint ett_nfs4_request_op = -1;
-static gint ett_nfs4_response_op = -1;
-static gint ett_nfs4_access = -1;
-static gint ett_nfs4_access_supp = -1;
-static gint ett_nfs4_close = -1;
-static gint ett_nfs4_commit = -1;
-static gint ett_nfs4_create = -1;
-static gint ett_nfs4_delegpurge = -1;
-static gint ett_nfs4_delegreturn = -1;
-static gint ett_nfs4_getattr = -1;
-static gint ett_nfs4_getattr_args = -1;
-static gint ett_nfs4_getattr_resp = -1;
-static gint ett_nfs4_resok4 = -1;
-static gint ett_nfs4_obj_attrs = -1;
-static gint ett_nfs4_fattr_new_attr_vals = -1;
-static gint ett_nfs4_fattr4_attrmask = -1;
-static gint ett_nfs4_attribute = -1;
-static gint ett_nfs4_getfh = -1;
-static gint ett_nfs4_link = -1;
-static gint ett_nfs4_lock = -1;
-static gint ett_nfs4_lockt = -1;
-static gint ett_nfs4_locku = -1;
-static gint ett_nfs4_lookup = -1;
-static gint ett_nfs4_lookupp = -1;
-static gint ett_nfs4_nverify = -1;
-static gint ett_nfs4_open = -1;
-static gint ett_nfs4_openattr = -1;
-static gint ett_nfs4_open_confirm = -1;
-static gint ett_nfs4_open_downgrade = -1;
-static gint ett_nfs4_putfh = -1;
-static gint ett_nfs4_putpubfh = -1;
-static gint ett_nfs4_putrootfh = -1;
-static gint ett_nfs4_read = -1;
-static gint ett_nfs4_readdir = -1;
-static gint ett_nfs4_readlink = -1;
-static gint ett_nfs4_remove = -1;
-static gint ett_nfs4_rename = -1;
-static gint ett_nfs4_renew = -1;
-static gint ett_nfs4_restorefh = -1;
-static gint ett_nfs4_savefh = -1;
-static gint ett_nfs4_secinfo = -1;
-static gint ett_nfs4_setattr = -1;
-static gint ett_nfs4_setclientid = -1;
-static gint ett_nfs4_setclientid_confirm = -1;
-static gint ett_nfs4_verify = -1;
-static gint ett_nfs4_write = -1;
-static gint ett_nfs4_release_lockowner = -1;
-static gint ett_nfs4_backchannel_ctl = -1;
-static gint ett_nfs4_illegal = -1;
-static gint ett_nfs4_verifier = -1;
-static gint ett_nfs4_dirlist = -1;
-static gint ett_nfs4_dir_entry = -1;
-static gint ett_nfs4_pathname = -1;
-static gint ett_nfs4_change_info = -1;
-static gint ett_nfs4_open_delegation = -1;
-static gint ett_nfs4_open_claim = -1;
-static gint ett_nfs4_opentype = -1;
-static gint ett_nfs4_lock_owner = -1;
-static gint ett_nfs4_cb_client = -1;
-static gint ett_nfs4_client_id = -1;
-static gint ett_nfs4_clientowner = -1;
-static gint ett_nfs4_exchangeid_call_flags = -1;
-static gint ett_nfs4_exchangeid_reply_flags = -1;
-static gint ett_nfs4_server_owner = -1;
-static gint ett_nfs4_bitmap = -1;
-static gint ett_nfs4_attr_request = -1;
-static gint ett_nfs4_fattr = -1;
-static gint ett_nfs4_fsid = -1;
-static gint ett_nfs4_fs_locations = -1;
-static gint ett_nfs4_fs_location = -1;
-static gint ett_nfs4_open_result_flags = -1;
-static gint ett_nfs4_secinfo_flavor_info = -1;
-static gint ett_nfs4_stateid = -1;
-static gint ett_nfs4_fattr_fh_expire_type = -1;
-static gint ett_nfs4_fattr_fs_charset_cap = -1;
-static gint ett_nfs4_fattr_aclsupport = -1;
-static gint ett_nfs4_aclflag = -1;
-static gint ett_nfs4_ace = -1;
-static gint ett_nfs4_clientaddr = -1;
-static gint ett_nfs4_aceflag = -1;
-static gint ett_nfs4_acemask = -1;
-static gint ett_nfs4_create_session_flags = -1;
-static gint ett_nfs4_sequence_status_flags = -1;
-static gint ett_nfs4_fh_file   = -1;
-static gint ett_nfs4_fh_file_flags = -1;
-static gint ett_nfs4_fh_export = -1;
-static gint ett_nfs4_layoutget = -1;
-static gint ett_nfs4_layoutcommit = -1;
-static gint ett_nfs4_layoutreturn = -1;
-static gint ett_nfs4_getdevinfo = -1;
-static gint ett_nfs4_getdevlist = -1;
-static gint ett_nfs4_bind_conn_to_session = -1;
-static gint ett_nfs4_exchange_id = -1;
-static gint ett_nfs4_create_session = -1;
-static gint ett_nfs4_destroy_session = -1;
-static gint ett_nfs4_free_stateid = -1;
-static gint ett_nfs4_secinfo_no_name = -1;
-static gint ett_nfs4_sequence = -1;
-static gint ett_nfs4_slotid = -1;
-static gint ett_nfs4_sr_status = -1;
-static gint ett_nfs4_serverscope = -1;
-static gint ett_nfs4_minorid = -1;
-static gint ett_nfs4_majorid = -1;
-static gint ett_nfs4_persist = -1;
-static gint ett_nfs4_backchan = -1;
-static gint ett_nfs4_rdmamode = -1;
-static gint ett_nfs4_padsize = -1;
-static gint ett_nfs4_cbrenforce = -1;
-static gint ett_nfs4_hashalg = -1;
-static gint ett_nfs4_ssvlen = -1;
-static gint ett_nfs4_maxreqsize = -1;
-static gint ett_nfs4_maxrespsize = -1;
-static gint ett_nfs4_maxrespsizecached = -1;
-static gint ett_nfs4_maxops = -1;
-static gint ett_nfs4_maxreqs = -1;
-static gint ett_nfs4_streamchanattrs = -1;
-static gint ett_nfs4_rdmachanattrs = -1;
-static gint ett_nfs4_machinename = -1;
-static gint ett_nfs4_flavor = -1;
-static gint ett_nfs4_stamp = -1;
-static gint ett_nfs4_uid = -1;
-static gint ett_nfs4_gid = -1;
-static gint ett_nfs4_service = -1;
-static gint ett_nfs4_sessionid = -1;
-static gint ett_nfs4_layoutseg = -1;
-static gint ett_nfs4_layoutseg_sub = -1;
-static gint ett_nfs4_nfl_util = -1;
-static gint ett_nfs4_test_stateid = -1;
-static gint ett_nfs4_destroy_clientid = -1;
-static gint ett_nfs4_reclaim_complete = -1;
-static gint ett_nfs4_allocate = -1;
-static gint ett_nfs4_deallocate = -1;
-static gint ett_nfs4_seek = -1;
-static gint ett_nfs4_chan_attrs = -1;
-static gint ett_nfs4_want_notify_flags = -1;
-static gint ett_nfs4_ff_layout_flags = -1;
-static gint ett_nfs4_scsi_layout_vol = -1;
-static gint ett_nfs4_scsi_layout_vol_indices = -1;
-static gint ett_nfs4_layoutstats = -1;
-static gint ett_nfs4_io_info = -1;
-static gint ett_nfs4_io_latency = -1;
-static gint ett_nfs4_io_time = -1;
-static gint ett_nfs4_callback_stateids_sub = -1;
-static gint ett_nfs4_source_servers_sub = -1;
-static gint ett_nfs4_copy = -1;
-static gint ett_nfs4_copy_notify = -1;
-static gint ett_nfs4_device_errors_sub = -1;
-static gint ett_nfs4_layouterror = -1;
-static gint ett_nfs4_ff_ioerrs_sub = -1;
-static gint ett_nfs4_ff_iostats_sub = -1;
-static gint ett_nfs4_clone = -1;
-static gint ett_nfs4_getxattr = -1;
-static gint ett_nfs4_setxattr = -1;
-static gint ett_nfs4_listxattr = -1;
-static gint ett_nfs4_removexattr = -1;
-static gint ett_nfs4_offload_cancel = -1;
-static gint ett_nfs4_offload_status = -1;
-static gint ett_nfs4_osr_complete_sub = -1;
-static gint ett_nfs4_io_advise = -1;
-static gint ett_nfs4_read_plus = -1;
-static gint ett_nfs4_read_plus_content_sub = -1;
-static gint ett_nfs4_write_same = -1;
-static gint ett_nfs4_listxattr_names = -1;
-
-static expert_field ei_nfs_too_many_ops = EI_INIT;
-static expert_field ei_nfs_not_vnx_file = EI_INIT;
-static expert_field ei_protocol_violation = EI_INIT;
-static expert_field ei_nfs_too_many_bitmaps = EI_INIT;
-static expert_field ei_nfs_bitmap_no_dissector = EI_INIT;
-static expert_field ei_nfs_bitmap_skip_value = EI_INIT;
-static expert_field ei_nfs_bitmap_undissected_data = EI_INIT;
-static expert_field ei_nfs4_stateid_deprecated = EI_INIT;
-static expert_field ei_nfs_file_system_cycle = EI_INIT;
+static int hf_nfs4_procedure;
+static int hf_nfs4_status;
+static int hf_nfs4_op;
+static int hf_nfs4_main_opcode;
+static int hf_nfs4_linktext;
+static int hf_nfs4_tag;
+static int hf_nfs4_ops_count;
+static int hf_nfs4_pathname_components;
+static int hf_nfs4_component;
+static int hf_nfs4_clientid;
+/* static int hf_nfs4_ace; */
+static int hf_nfs4_recall;
+static int hf_nfs4_open_claim_type;
+static int hf_nfs4_opentype;
+static int hf_nfs4_state_protect_how;
+static int hf_nfs4_limit_by;
+static int hf_nfs4_open_delegation_type;
+static int hf_nfs4_why_no_delegation;
+static int hf_nfs4_ftype;
+static int hf_nfs4_change_info_atomic;
+static int hf_nfs4_open_share_access;
+static int hf_nfs4_open_share_deny;
+static int hf_nfs4_want_flags;
+static int hf_nfs4_want_notify_flags;
+static int hf_nfs4_want_signal_deleg_when_resrc_avail;
+static int hf_nfs4_want_push_deleg_when_uncontended;
+static int hf_nfs4_want_deleg_timestamps;
+static int hf_nfs4_seqid;
+static int hf_nfs4_lock_seqid;
+static int hf_nfs4_reqd_attr;
+static int hf_nfs4_reco_attr;
+static int hf_nfs4_attr_mask;
+static int hf_nfs4_attr_count;
+static int hf_nfs4_set_it_value_follows;
+static int hf_nfs4_time_how;
+static int hf_nfs4_time_how4;
+static int hf_nfs4_fattr_link_support;
+static int hf_nfs4_fattr_symlink_support;
+static int hf_nfs4_fattr_named_attr;
+static int hf_nfs4_fattr_unique_handles;
+static int hf_nfs4_fattr_archive;
+static int hf_nfs4_fattr_cansettime;
+static int hf_nfs4_fattr_case_insensitive;
+static int hf_nfs4_fattr_case_preserving;
+static int hf_nfs4_fattr_chown_restricted;
+static int hf_nfs4_fattr_fh_expire_type;
+static int hf_nfs4_fattr_fh_expiry_noexpire_with_open;
+static int hf_nfs4_fattr_fh_expiry_volatile_any;
+static int hf_nfs4_fattr_fh_expiry_vol_migration;
+static int hf_nfs4_fattr_fh_expiry_vol_rename;
+static int hf_nfs4_fattr_hidden;
+static int hf_nfs4_fattr_homogeneous;
+static int hf_nfs4_fattr_mimetype;
+static int hf_nfs4_fattr_no_trunc;
+static int hf_nfs4_fattr_system;
+static int hf_nfs4_fattr_owner;
+static int hf_nfs4_fattr_owner_group;
+static int hf_nfs4_fattr_size;
+static int hf_nfs4_fattr_aclsupport;
+static int hf_nfs4_aclsupport_allow_acl;
+static int hf_nfs4_aclsupport_deny_acl;
+static int hf_nfs4_aclsupport_audit_acl;
+static int hf_nfs4_aclsupport_alarm_acl;
+static int hf_nfs4_fattr_lease_time;
+static int hf_nfs4_fattr_fs_charset_cap;
+static int hf_nfs4_fs_charset_cap_nonutf8;
+static int hf_nfs4_fs_charset_cap_utf8;
+static int hf_nfs4_fattr_fileid;
+static int hf_nfs4_fattr_files_avail;
+static int hf_nfs4_fattr_files_free;
+static int hf_nfs4_fattr_files_total;
+static int hf_nfs4_fattr_maxfilesize;
+static int hf_nfs4_fattr_maxlink;
+static int hf_nfs4_fattr_maxname;
+static int hf_nfs4_fattr_numlinks;
+static int hf_nfs4_fattr_maxread;
+static int hf_nfs4_fattr_maxwrite;
+static int hf_nfs4_fattr_quota_hard;
+static int hf_nfs4_fattr_quota_soft;
+static int hf_nfs4_fattr_quota_used;
+static int hf_nfs4_fattr_space_avail;
+static int hf_nfs4_fattr_space_free;
+static int hf_nfs4_fattr_space_total;
+static int hf_nfs4_fattr_space_used;
+static int hf_nfs4_fattr_mounted_on_fileid;
+static int hf_nfs4_fattr_layout_blksize;
+static int hf_nfs4_mdsthreshold_item;
+static int hf_nfs4_mdsthreshold_hint_mask;
+static int hf_nfs4_mdsthreshold_hint_count;
+static int hf_nfs4_mdsthreshold_mask_count;
+static int hf_nfs4_mdsthreshold_hint_file;
+static int hf_nfs4_fattr_security_label_lfs;
+static int hf_nfs4_fattr_security_label_pi;
+static int hf_nfs4_fattr_security_label_context;
+static int hf_nfs4_fattr_umask_mask;
+static int hf_nfs4_fattr_xattr_support;
+static int hf_nfs4_fattr_offline;
+static int hf_nfs4_who;
+static int hf_nfs4_server;
+static int hf_nfs4_servers;
+static int hf_nfs4_fslocation;
+static int hf_nfs4_stable_how;
+static int hf_nfs4_dirlist_eof;
+static int hf_nfs4_offset;
+static int hf_nfs4_specdata1;
+static int hf_nfs4_specdata2;
+static int hf_nfs4_lock_type;
+static int hf_nfs4_open_rflags;
+static int hf_nfs4_open_rflags_confirm;
+static int hf_nfs4_open_rflags_locktype_posix;
+static int hf_nfs4_open_rflags_preserve_unlinked;
+static int hf_nfs4_open_rflags_may_notify_lock;
+static int hf_nfs4_reclaim;
+static int hf_nfs4_length;
+static int hf_nfs4_changeid;
+static int hf_nfs4_changeid_before;
+static int hf_nfs4_changeid_after;
+static int hf_nfs4_time_seconds;
+static int hf_nfs4_time_nseconds;
+static int hf_nfs4_fsid_major;
+static int hf_nfs4_fsid_minor;
+static int hf_nfs4_acetype;
+static int hf_nfs4_aceflags;
+static int hf_nfs4_aceflag_file_inherit;
+static int hf_nfs4_aceflag_dir_inherit;
+static int hf_nfs4_aceflag_no_prop_inherit;
+static int hf_nfs4_aceflag_inherit_only;
+static int hf_nfs4_aceflag_successful_access;
+static int hf_nfs4_aceflag_failed_access;
+static int hf_nfs4_aceflag_id_group;
+static int hf_nfs4_aceflag_inherited_ace;
+static int hf_nfs4_acemask;
+static int hf_nfs4_ace_permission;
+static int hf_nfs4_delegate_type;
+static int hf_nfs4_secinfo_flavor;
+static int hf_nfs4_secinfo_arr;
+static int hf_nfs4_num_blocks;
+static int hf_nfs4_bytes_per_block;
+static int hf_nfs4_eof;
+static int hf_nfs4_verifier;
+static int hf_nfs4_value_follows;
+static int hf_nfs4_cookie;
+static int hf_nfs4_dir_entry_name;
+static int hf_nfs4_cookie_verf;
+static int hf_nfs4_cb_program;
+/* static int hf_nfs4_cb_location; */
+static int hf_nfs4_recall4;
+static int hf_nfs4_filesize;
+static int hf_nfs4_count;
+static int hf_nfs4_count_dircount;
+static int hf_nfs4_count_maxcount;
+static int hf_nfs4_minorversion;
+static int hf_nfs4_open_owner;
+static int hf_nfs4_lock_owner;
+static int hf_nfs4_new_lock_owner;
+static int hf_nfs4_sec_oid;
+static int hf_nfs4_qop;
+static int hf_nfs4_secinfo_rpcsec_gss_info_service;
+static int hf_nfs4_attr_dir_create;
+static int hf_nfs4_client_id;
+static int hf_nfs4_stateid;
+static int hf_nfs4_seqid_stateid;
+static int hf_nfs4_stateid_other;
+static int hf_nfs4_stateid_hash;
+static int hf_nfs4_stateid_other_hash;
+static int hf_nfs4_lock_reclaim;
+static int hf_nfs4_aclflags;
+static int hf_nfs4_aclflag_auto_inherit;
+static int hf_nfs4_aclflag_protected;
+static int hf_nfs4_aclflag_defaulted;
+static int hf_nfs4_num_aces;
+static int hf_nfs4_callback_ident;
+static int hf_nfs4_r_netid;
+static int hf_nfs4_gsshandle;
+static int hf_nfs4_r_addr;
+static int hf_nfs4_createmode;
+static int hf_nfs4_op_mask;
+static int hf_nfs4_read_data_length;
+static int hf_nfs4_write_data_length;
+static int hf_nfs4_length_minlength;
+static int hf_nfs4_layout_type;
+static int hf_nfs4_layout_return_type;
+static int hf_nfs4_iomode;
+/* static int hf_nfs4_stripetype; */
+/* static int hf_nfs4_mdscommit; */
+static int hf_nfs4_stripeunit;
+static int hf_nfs4_newtime;
+static int hf_nfs4_newoffset;
+static int hf_nfs4_layout_avail;
+static int hf_nfs4_newsize;
+static int hf_nfs4_layoutupdate;
+static int hf_nfs4_deviceid;
+static int hf_nfs4_devicenum;
+static int hf_nfs4_deviceidx;
+static int hf_nfs4_layout;
+/* static int hf_nfs4_stripedevs; */
+/* static int hf_nfs4_devaddr; */
+static int hf_nfs4_devaddr_ssv_start;
+static int hf_nfs4_devaddr_ssv_length;
+static int hf_nfs4_devaddr_scsi_vol_type;
+static int hf_nfs4_devaddr_scsi_vol_index;
+static int hf_nfs4_devaddr_scsi_vol_ref_index;
+static int hf_nfs4_devaddr_ssv_stripe_unit;
+static int hf_nfs4_devaddr_scsi_vpd_code_set;
+static int hf_nfs4_devaddr_scsi_vpd_designator_type;
+static int hf_nfs4_devaddr_scsi_vpd_designator;
+static int hf_nfs4_devaddr_scsi_private_key;
+static int hf_nfs4_scsil_ext_file_offset;
+static int hf_nfs4_scsil_ext_length;
+static int hf_nfs4_scsil_ext_vol_offset;
+static int hf_nfs4_scsil_ext_state;
+static int hf_nfs4_return_on_close;
+static int hf_nfs4_slotid;
+static int hf_nfs4_high_slotid;
+static int hf_nfs4_target_high_slotid;
+static int hf_nfs4_serverscope4;
+static int hf_nfs4_minorid;
+static int hf_nfs4_majorid;
+static int hf_nfs4_padsize;
+/* static int hf_nfs4_cbrenforce; */
+/* static int hf_nfs4_hashalg; */
+/* static int hf_nfs4_ssvlen; */
+static int hf_nfs4_maxreqsize;
+static int hf_nfs4_maxrespsize;
+static int hf_nfs4_maxrespsizecached;
+static int hf_nfs4_maxops;
+static int hf_nfs4_maxreqs;
+static int hf_nfs4_rdmachanattrs;
+static int hf_nfs4_machinename;
+static int hf_nfs4_flavor;
+static int hf_nfs4_stamp;
+static int hf_nfs4_uid;
+static int hf_nfs4_gid;
+static int hf_nfs4_service;
+static int hf_nfs4_sessionid;
+static int hf_nfs4_exchid_call_flags;
+static int hf_nfs4_exchid_reply_flags;
+static int hf_nfs4_exchid_flags_moved_refer;
+static int hf_nfs4_exchid_flags_moved_migr;
+static int hf_nfs4_exchid_flags_bind_princ;
+static int hf_nfs4_exchid_flags_non_pnfs;
+static int hf_nfs4_exchid_flags_pnfs_mds;
+static int hf_nfs4_exchid_flags_pnfs_ds;
+static int hf_nfs4_exchid_flags_upd_conf_rec_a;
+static int hf_nfs4_exchid_flags_confirmed_r;
+static int hf_nfs4_state_protect_window;
+static int hf_nfs4_state_protect_num_gss_handles;
+static int hf_nfs4_sp_parms_hash_algs;
+static int hf_nfs4_sp_parms_encr_algs;
+static int hf_nfs4_prot_info_spi_window;
+static int hf_nfs4_prot_info_svv_length;
+static int hf_nfs4_prot_info_encr_alg;
+static int hf_nfs4_prot_info_hash_alg;
+static int hf_nfs4_nii_domain;
+static int hf_nfs4_nii_name;
+static int hf_nfs4_create_session_flags_csa;
+static int hf_nfs4_create_session_flags_csr;
+static int hf_nfs4_create_session_flags_persist;
+static int hf_nfs4_create_session_flags_conn_back_chan;
+static int hf_nfs4_create_session_flags_conn_rdma;
+static int hf_nfs4_cachethis;
+/* static int hf_nfs4_util; */
+/* static int hf_nfs4_first_stripe_idx; */
+/* static int hf_nfs4_layout_count; */
+/* static int hf_nfs4_pattern_offset; */
+static int hf_nfs4_notification_mask;
+static int hf_nfs4_notification_type;
+static int hf_nfs4_lrs_present;
+static int hf_nfs4_nfl_mirrors;
+static int hf_nfs4_nfl_util;
+static int hf_nfs4_nfl_util_stripe_size;
+static int hf_nfs4_nfl_util_commit_thru_mds;
+static int hf_nfs4_nfl_util_dense;
+static int hf_nfs4_nfl_fhs;
+static int hf_nfs4_mirror_eff;
+static int hf_nfs4_nfl_first_stripe_index;
+static int hf_nfs4_lrf_body_content;
+static int hf_nfs4_reclaim_one_fs;
+static int hf_nfs4_bctsa_dir;
+static int hf_nfs4_bctsa_use_conn_in_rdma_mode;
+static int hf_nfs4_bctsr_dir;
+static int hf_nfs4_bctsr_use_conn_in_rdma_mode;
+static int hf_nfs4_sequence_status_flags;
+static int hf_nfs4_sequence_status_flags_cb_path_down;
+static int hf_nfs4_sequence_status_flags_cb_gss_contexts_expiring;
+static int hf_nfs4_sequence_status_flags_cb_gss_contexts_expired;
+static int hf_nfs4_sequence_status_flags_expired_all_state_revoked;
+static int hf_nfs4_sequence_status_flags_expired_some_state_revoked;
+static int hf_nfs4_sequence_status_flags_admin_state_revoked;
+static int hf_nfs4_sequence_status_flags_recallable_state_revoked;
+static int hf_nfs4_sequence_status_flags_lease_moved;
+static int hf_nfs4_sequence_status_flags_restart_reclaim_needed;
+static int hf_nfs4_sequence_status_flags_cb_path_down_session;
+static int hf_nfs4_sequence_status_flags_backchannel_fault;
+static int hf_nfs4_sequence_status_flags_devid_changed;
+static int hf_nfs4_sequence_status_flags_devid_deleted;
+static int hf_nfs4_secinfo_style;
+static int hf_nfs4_test_stateid_arg;
+static int hf_nfs4_test_stateid_res;
+static int hf_nfs4_seek_data_content;
+/* static int hf_nfs4_impl_id_len; */
+static int hf_nfs4_bitmap_data;
+static int hf_nfs4_huge_bitmap_length;
+static int hf_nfs4_universal_address_ipv4;
+static int hf_nfs4_universal_address_ipv6;
+static int hf_nfs4_getdevinfo;
+static int hf_nfs4_ff_version;
+static int hf_nfs4_ff_minorversion;
+static int hf_nfs4_ff_tightly_coupled;
+static int hf_nfs4_ff_rsize;
+static int hf_nfs4_ff_wsize;
+static int hf_nfs4_fattr_clone_blocksize;
+static int hf_nfs4_fattr_space_freed;
+static int hf_nfs4_fattr_change_attr_type;
+static int hf_nfs4_ff_layout_flags;
+static int hf_nfs4_ff_layout_flags_no_layoutcommit;
+static int hf_nfs4_ff_layout_flags_no_io_thru_mds;
+static int hf_nfs4_ff_layout_flags_no_read_io;
+static int hf_nfs4_ff_stats_collect_hint;
+static int hf_nfs4_ff_synthetic_owner;
+static int hf_nfs4_ff_synthetic_owner_group;
+static int hf_nfs4_ff_bytes_completed;
+static int hf_nfs4_ff_bytes_not_delivered;
+static int hf_nfs4_ff_bytes_requested;
+static int hf_nfs4_ff_local;
+static int hf_nfs4_ff_ops_completed;
+static int hf_nfs4_ff_ops_requested;
+static int hf_nfs4_io_bytes;
+static int hf_nfs4_io_count;
+static int hf_nfs4_layoutstats;
+static int hf_nfs4_callback_stateids;
+static int hf_nfs4_callback_stateids_index;
+static int hf_nfs4_num_offload_status;
+static int hf_nfs4_offload_status_index;
+static int hf_nfs4_consecutive;
+static int hf_nfs4_netloc;
+static int hf_nfs4_netloc_type;
+static int hf_nfs4_nl_name;
+static int hf_nfs4_nl_url;
+static int hf_nfs4_source_server_index;
+static int hf_nfs4_source_servers;
+static int hf_nfs4_synchronous;
+static int hf_nfs4_device_error_count;
+static int hf_nfs4_device_errors_index;
+static int hf_nfs4_ff_ioerrs_count;
+static int hf_nfs4_ff_ioerrs_index;
+static int hf_nfs4_ff_ioerrs_length;
+static int hf_nfs4_ff_ioerrs_offset;
+static int hf_nfs4_ff_iostats_count;
+static int hf_nfs4_ff_iostats_index;
+static int hf_nfs4_io_error_op;
+static int hf_nfs4_io_hints_mask;
+static int hf_nfs4_io_hint_count;
+static int hf_nfs4_io_advise_hint;
+static int hf_nfs4_cb_recall_any_objs;
+static int hf_nfs4_cb_recall_any_count;
+static int hf_nfs4_cb_recall_any_mask;
+static int hf_nfs4_cb_recall_any_item;
+static int hf_nfs4_bytes_copied;
+static int hf_nfs4_read_plus_contents;
+static int hf_nfs4_read_plus_content_type;
+static int hf_nfs4_block_size;
+static int hf_nfs4_block_count;
+static int hf_nfs4_reloff_blocknum;
+static int hf_nfs4_blocknum;
+static int hf_nfs4_reloff_pattern;
+static int hf_nfs4_pattern_hash;
+static int hf_nfs4_setxattr_options;
+static int hf_nfs4_listxattr_maxcount;
+static int hf_nfs4_listxattr_cookie;
+static int hf_nfs4_listxattr_names_len;
+static int hf_nfs4_xattrkey;
+static int hf_nfs4_listxattr_eof;
+
+static gint ett_nfs;
+static gint ett_nfs_fh_encoding;
+static gint ett_nfs_fh_mount;
+static gint ett_nfs_fh_file;
+static gint ett_nfs_fh_export;
+static gint ett_nfs_fh_fsid;
+static gint ett_nfs_fh_xfsid;
+static gint ett_nfs_fh_fn;
+static gint ett_nfs_fh_xfn;
+static gint ett_nfs_fh_hp;
+static gint ett_nfs_fh_auth;
+static gint ett_nfs_fhandle;
+static gint ett_nfs_timeval;
+static gint ett_nfs_fattr;
+static gint ett_nfs_readdir_entry;
+static gint ett_nfs_fh_obj;
+static gint ett_nfs_fh_ex;
+static gint ett_nfs_utf8string;
+
+static gint ett_nfs2_mode;
+static gint ett_nfs2_sattr;
+static gint ett_nfs2_diropargs;
+
+static gint ett_nfs3_mode;
+static gint ett_nfs3_specdata;
+static gint ett_nfs3_fh;
+static gint ett_nfs3_nfstime;
+static gint ett_nfs3_fattr;
+static gint ett_nfs3_post_op_fh;
+static gint ett_nfs3_sattr;
+static gint ett_nfs3_diropargs;
+static gint ett_nfs3_sattrguard;
+static gint ett_nfs3_set_mode;
+static gint ett_nfs3_set_uid;
+static gint ett_nfs3_set_gid;
+static gint ett_nfs3_set_size;
+static gint ett_nfs3_set_atime;
+static gint ett_nfs3_set_mtime;
+static gint ett_nfs3_pre_op_attr;
+static gint ett_nfs3_post_op_attr;
+static gint ett_nfs3_wcc_attr;
+static gint ett_nfs3_wcc_data;
+static gint ett_nfs3_access;
+static gint ett_nfs3_fsinfo_properties;
+static gint ett_nfs3_gxfh_utlfield;
+static gint ett_nfs3_gxfh_sfhfield;
+static gint ett_nfs3_gxfh_sfhflags;
+static gint ett_nfs4_fh_pd_flags;
+static gint ett_nfs4_fh_pd_sites;
+static gint ett_nfs4_fh_pd_spaces;
+
+static gint ett_nfs4_compound_call;
+static gint ett_nfs4_request_op;
+static gint ett_nfs4_response_op;
+static gint ett_nfs4_access;
+static gint ett_nfs4_access_supp;
+static gint ett_nfs4_close;
+static gint ett_nfs4_commit;
+static gint ett_nfs4_create;
+static gint ett_nfs4_delegpurge;
+static gint ett_nfs4_delegreturn;
+static gint ett_nfs4_getattr;
+static gint ett_nfs4_getattr_args;
+static gint ett_nfs4_getattr_resp;
+static gint ett_nfs4_resok4;
+static gint ett_nfs4_obj_attrs;
+static gint ett_nfs4_fattr_new_attr_vals;
+static gint ett_nfs4_fattr4_attrmask;
+static gint ett_nfs4_attribute;
+static gint ett_nfs4_getfh;
+static gint ett_nfs4_link;
+static gint ett_nfs4_lock;
+static gint ett_nfs4_lockt;
+static gint ett_nfs4_locku;
+static gint ett_nfs4_lookup;
+static gint ett_nfs4_lookupp;
+static gint ett_nfs4_nverify;
+static gint ett_nfs4_open;
+static gint ett_nfs4_openattr;
+static gint ett_nfs4_open_confirm;
+static gint ett_nfs4_open_downgrade;
+static gint ett_nfs4_putfh;
+static gint ett_nfs4_putpubfh;
+static gint ett_nfs4_putrootfh;
+static gint ett_nfs4_read;
+static gint ett_nfs4_readdir;
+static gint ett_nfs4_readlink;
+static gint ett_nfs4_remove;
+static gint ett_nfs4_rename;
+static gint ett_nfs4_renew;
+static gint ett_nfs4_restorefh;
+static gint ett_nfs4_savefh;
+static gint ett_nfs4_secinfo;
+static gint ett_nfs4_setattr;
+static gint ett_nfs4_setclientid;
+static gint ett_nfs4_setclientid_confirm;
+static gint ett_nfs4_verify;
+static gint ett_nfs4_write;
+static gint ett_nfs4_release_lockowner;
+static gint ett_nfs4_backchannel_ctl;
+static gint ett_nfs4_illegal;
+static gint ett_nfs4_verifier;
+static gint ett_nfs4_dirlist;
+static gint ett_nfs4_dir_entry;
+static gint ett_nfs4_pathname;
+static gint ett_nfs4_change_info;
+static gint ett_nfs4_open_delegation;
+static gint ett_nfs4_open_claim;
+static gint ett_nfs4_opentype;
+static gint ett_nfs4_lock_owner;
+static gint ett_nfs4_cb_client;
+static gint ett_nfs4_client_id;
+static gint ett_nfs4_clientowner;
+static gint ett_nfs4_exchangeid_call_flags;
+static gint ett_nfs4_exchangeid_reply_flags;
+static gint ett_nfs4_server_owner;
+static gint ett_nfs4_bitmap;
+static gint ett_nfs4_attr_request;
+static gint ett_nfs4_fattr;
+static gint ett_nfs4_fsid;
+static gint ett_nfs4_fs_locations;
+static gint ett_nfs4_fs_location;
+static gint ett_nfs4_open_result_flags;
+static gint ett_nfs4_secinfo_flavor_info;
+static gint ett_nfs4_stateid;
+static gint ett_nfs4_fattr_fh_expire_type;
+static gint ett_nfs4_fattr_fs_charset_cap;
+static gint ett_nfs4_fattr_aclsupport;
+static gint ett_nfs4_aclflag;
+static gint ett_nfs4_ace;
+static gint ett_nfs4_clientaddr;
+static gint ett_nfs4_aceflag;
+static gint ett_nfs4_acemask;
+static gint ett_nfs4_create_session_flags;
+static gint ett_nfs4_sequence_status_flags;
+static gint ett_nfs4_fh_file;
+static gint ett_nfs4_fh_file_flags;
+static gint ett_nfs4_fh_export;
+static gint ett_nfs4_layoutget;
+static gint ett_nfs4_layoutcommit;
+static gint ett_nfs4_layoutreturn;
+static gint ett_nfs4_getdevinfo;
+static gint ett_nfs4_getdevlist;
+static gint ett_nfs4_bind_conn_to_session;
+static gint ett_nfs4_exchange_id;
+static gint ett_nfs4_create_session;
+static gint ett_nfs4_destroy_session;
+static gint ett_nfs4_free_stateid;
+static gint ett_nfs4_secinfo_no_name;
+static gint ett_nfs4_sequence;
+static gint ett_nfs4_slotid;
+static gint ett_nfs4_sr_status;
+static gint ett_nfs4_serverscope;
+static gint ett_nfs4_minorid;
+static gint ett_nfs4_majorid;
+static gint ett_nfs4_persist;
+static gint ett_nfs4_backchan;
+static gint ett_nfs4_rdmamode;
+static gint ett_nfs4_padsize;
+static gint ett_nfs4_cbrenforce;
+static gint ett_nfs4_hashalg;
+static gint ett_nfs4_ssvlen;
+static gint ett_nfs4_maxreqsize;
+static gint ett_nfs4_maxrespsize;
+static gint ett_nfs4_maxrespsizecached;
+static gint ett_nfs4_maxops;
+static gint ett_nfs4_maxreqs;
+static gint ett_nfs4_streamchanattrs;
+static gint ett_nfs4_rdmachanattrs;
+static gint ett_nfs4_machinename;
+static gint ett_nfs4_flavor;
+static gint ett_nfs4_stamp;
+static gint ett_nfs4_uid;
+static gint ett_nfs4_gid;
+static gint ett_nfs4_service;
+static gint ett_nfs4_sessionid;
+static gint ett_nfs4_layoutseg;
+static gint ett_nfs4_layoutseg_sub;
+static gint ett_nfs4_nfl_util;
+static gint ett_nfs4_test_stateid;
+static gint ett_nfs4_destroy_clientid;
+static gint ett_nfs4_reclaim_complete;
+static gint ett_nfs4_allocate;
+static gint ett_nfs4_deallocate;
+static gint ett_nfs4_seek;
+static gint ett_nfs4_chan_attrs;
+static gint ett_nfs4_want_notify_flags;
+static gint ett_nfs4_ff_layout_flags;
+static gint ett_nfs4_scsi_layout_vol;
+static gint ett_nfs4_scsi_layout_vol_indices;
+static gint ett_nfs4_layoutstats;
+static gint ett_nfs4_io_info;
+static gint ett_nfs4_io_latency;
+static gint ett_nfs4_io_time;
+static gint ett_nfs4_callback_stateids_sub;
+static gint ett_nfs4_source_servers_sub;
+static gint ett_nfs4_copy;
+static gint ett_nfs4_copy_notify;
+static gint ett_nfs4_device_errors_sub;
+static gint ett_nfs4_layouterror;
+static gint ett_nfs4_ff_ioerrs_sub;
+static gint ett_nfs4_ff_iostats_sub;
+static gint ett_nfs4_clone;
+static gint ett_nfs4_getxattr;
+static gint ett_nfs4_setxattr;
+static gint ett_nfs4_listxattr;
+static gint ett_nfs4_removexattr;
+static gint ett_nfs4_offload_cancel;
+static gint ett_nfs4_offload_status;
+static gint ett_nfs4_osr_complete_sub;
+static gint ett_nfs4_io_advise;
+static gint ett_nfs4_read_plus;
+static gint ett_nfs4_read_plus_content_sub;
+static gint ett_nfs4_write_same;
+static gint ett_nfs4_listxattr_names;
+
+static expert_field ei_nfs_too_many_ops;
+static expert_field ei_nfs_not_vnx_file;
+static expert_field ei_protocol_violation;
+static expert_field ei_nfs_too_many_bitmaps;
+static expert_field ei_nfs_bitmap_no_dissector;
+static expert_field ei_nfs_bitmap_skip_value;
+static expert_field ei_nfs_bitmap_undissected_data;
+static expert_field ei_nfs4_stateid_deprecated;
+static expert_field ei_nfs_file_system_cycle;
 
 static const true_false_string tfs_read_write = { "Read", "Write" };
 
@@ -11487,29 +11487,29 @@ static const value_string layoutrecall_names[] = {
 };
 
 /* NFS Callback */
-static int hf_nfs4_cb_procedure = -1;
-static int hf_nfs4_cb_op = -1;
-static int hf_nfs4_cb_truncate = -1;
-static int hf_nfs4_cb_layoutrecall_type = -1;
-static int hf_nfs4_cb_clorachanged = -1;
-
-static gint ett_nfs4_cb_request_op = -1;
-static gint ett_nfs4_cb_resop = -1;
-static gint ett_nfs4_cb_getattr = -1;
-static gint ett_nfs4_cb_recall = -1;
-static gint ett_nfs4_cb_layoutrecall = -1;
-static gint ett_nfs4_cb_pushdeleg = -1;
-static gint ett_nfs4_cb_recallany = -1;
-static gint ett_nfs4_cb_recallableobjavail = -1;
-static gint ett_nfs4_cb_recallslot = -1;
-static gint ett_nfs4_cb_sequence = -1;
-static gint ett_nfs4_cb_wantscancelled = -1;
-static gint ett_nfs4_cb_notifylock = -1;
-static gint ett_nfs4_cb_notifydeviceid = -1;
-static gint ett_nfs4_cb_notify = -1;
-static gint ett_nfs4_cb_reflists = -1;
-static gint ett_nfs4_cb_refcalls = -1;
-static gint ett_nfs4_cb_illegal = -1;
+static int hf_nfs4_cb_procedure;
+static int hf_nfs4_cb_op;
+static int hf_nfs4_cb_truncate;
+static int hf_nfs4_cb_layoutrecall_type;
+static int hf_nfs4_cb_clorachanged;
+
+static gint ett_nfs4_cb_request_op;
+static gint ett_nfs4_cb_resop;
+static gint ett_nfs4_cb_getattr;
+static gint ett_nfs4_cb_recall;
+static gint ett_nfs4_cb_layoutrecall;
+static gint ett_nfs4_cb_pushdeleg;
+static gint ett_nfs4_cb_recallany;
+static gint ett_nfs4_cb_recallableobjavail;
+static gint ett_nfs4_cb_recallslot;
+static gint ett_nfs4_cb_sequence;
+static gint ett_nfs4_cb_wantscancelled;
+static gint ett_nfs4_cb_notifylock;
+static gint ett_nfs4_cb_notifydeviceid;
+static gint ett_nfs4_cb_notify;
+static gint ett_nfs4_cb_reflists;
+static gint ett_nfs4_cb_refcalls;
+static gint ett_nfs4_cb_illegal;
 
 static const value_string names_nfs_cb_operation[] = {
 	{ NFS4_OP_CB_GETATTR,		   "CB_GETATTR" },
diff --git a/epan/dissectors/packet-nfsacl.c b/epan/dissectors/packet-nfsacl.c
index 470b209227..46c0d67fc7 100644
--- a/epan/dissectors/packet-nfsacl.c
+++ b/epan/dissectors/packet-nfsacl.c
@@ -19,33 +19,33 @@
 void proto_register_nfsacl(void);
 void proto_reg_handoff_nfsacl(void);
 
-static int proto_nfsacl = -1;
-static int hf_nfsacl_mask = -1;
-static int hf_nfsacl_mask_acl_entry = -1;
-static int hf_nfsacl_mask_acl_count = -1;
-static int hf_nfsacl_mask_default_acl_entry = -1;
-static int hf_nfsacl_mask_default_acl_count = -1;
-static int hf_nfsacl_procedure_v1 = -1;
-static int hf_nfsacl_procedure_v2 = -1;
-static int hf_nfsacl_procedure_v3 = -1;
-static int hf_nfsacl_entry = -1;
-static int hf_nfsacl_aclcnt = -1;
-static int hf_nfsacl_dfaclcnt = -1;
-static int hf_nfsacl_aclent = -1;
-static int hf_nfsacl_aclent_type = -1;
-static int hf_nfsacl_aclent_uid = -1;
-static int hf_nfsacl_aclent_perm = -1;
-static int hf_nfsacl_aclent_perm_read = -1;
-static int hf_nfsacl_aclent_perm_write = -1;
-static int hf_nfsacl_aclent_perm_exec = -1;
-static int hf_nfsacl_create = -1;
-
-static gint ett_nfsacl = -1;
-static gint ett_nfsacl_mask = -1;
-static gint ett_nfsacl_entry = -1;
-static gint ett_nfsacl_aclent = -1;
-static gint ett_nfsacl_aclent_perm = -1;
-static gint ett_nfsacl_aclent_entries = -1;
+static int proto_nfsacl;
+static int hf_nfsacl_mask;
+static int hf_nfsacl_mask_acl_entry;
+static int hf_nfsacl_mask_acl_count;
+static int hf_nfsacl_mask_default_acl_entry;
+static int hf_nfsacl_mask_default_acl_count;
+static int hf_nfsacl_procedure_v1;
+static int hf_nfsacl_procedure_v2;
+static int hf_nfsacl_procedure_v3;
+static int hf_nfsacl_entry;
+static int hf_nfsacl_aclcnt;
+static int hf_nfsacl_dfaclcnt;
+static int hf_nfsacl_aclent;
+static int hf_nfsacl_aclent_type;
+static int hf_nfsacl_aclent_uid;
+static int hf_nfsacl_aclent_perm;
+static int hf_nfsacl_aclent_perm_read;
+static int hf_nfsacl_aclent_perm_write;
+static int hf_nfsacl_aclent_perm_exec;
+static int hf_nfsacl_create;
+
+static gint ett_nfsacl;
+static gint ett_nfsacl_mask;
+static gint ett_nfsacl_entry;
+static gint ett_nfsacl_aclent;
+static gint ett_nfsacl_aclent_perm;
+static gint ett_nfsacl_aclent_entries;
 
 #define NFSACL_PROGRAM	100227
 
diff --git a/epan/dissectors/packet-nfsauth.c b/epan/dissectors/packet-nfsauth.c
index 51906a0a99..3d9dafebc5 100644
--- a/epan/dissectors/packet-nfsauth.c
+++ b/epan/dissectors/packet-nfsauth.c
@@ -17,10 +17,10 @@
 void proto_register_nfsauth(void);
 void proto_reg_handoff_nfsauth(void);
 
-static int proto_nfsauth = -1;
-static int hf_nfsauth_procedure_v1 = -1;
+static int proto_nfsauth;
+static int hf_nfsauth_procedure_v1;
 
-static gint ett_nfsauth = -1;
+static gint ett_nfsauth;
 
 #define NFSAUTH_PROGRAM	100231
 
diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c
index 44edaebbeb..88d66e4f89 100644
--- a/epan/dissectors/packet-nhrp.c
+++ b/epan/dissectors/packet-nhrp.c
@@ -42,111 +42,111 @@ static dissector_handle_t nhrp_handle;
 static void _dissect_nhrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     gboolean nested, gboolean codeinfo);
 
-static int proto_nhrp = -1;
-static int hf_nhrp_hdr_afn = -1;
-static int hf_nhrp_hdr_pro_type = -1;
-static int hf_nhrp_hdr_pro_snap_oui = -1;
-static int hf_nhrp_hdr_pro_snap_pid = -1;
-static int hf_nhrp_hdr_hopcnt = -1;
-static int hf_nhrp_hdr_pktsz = -1;
-static int hf_nhrp_hdr_chksum = -1;
-static int hf_nhrp_hdr_chksum_status = -1;
-static int hf_nhrp_hdr_extoff = -1;
-static int hf_nhrp_hdr_version = -1;
-static int hf_nhrp_hdr_op_type = -1;
-static int hf_nhrp_hdr_shtl = -1;
-static int hf_nhrp_hdr_shtl_type = -1;
-static int hf_nhrp_hdr_shtl_len = -1;
-static int hf_nhrp_hdr_sstl = -1;
-static int hf_nhrp_hdr_sstl_type = -1;
-static int hf_nhrp_hdr_sstl_len = -1;
-
-static int hf_nhrp_src_proto_len = -1;
-static int hf_nhrp_dst_proto_len = -1;
-static int hf_nhrp_flags = -1;
-static int hf_nhrp_flag_Q = -1;
-static int hf_nhrp_flag_N = -1;
-static int hf_nhrp_flag_A = -1;
-static int hf_nhrp_flag_D = -1;
-static int hf_nhrp_flag_U1 = -1;
-static int hf_nhrp_flag_U2 = -1;
-static int hf_nhrp_flag_S = -1;
-static int hf_nhrp_flag_NAT = -1;
-static int hf_nhrp_src_nbma_addr = -1;
-static int hf_nhrp_src_nbma_saddr = -1;
-static int hf_nhrp_src_prot_addr = -1;
-static int hf_nhrp_dst_prot_addr = -1;
-static int hf_nhrp_request_id = -1;
-
-static int hf_nhrp_code = -1;
-static int hf_nhrp_prefix_len = -1;
-static int hf_nhrp_unused = -1;
-static int hf_nhrp_mtu = -1;
-static int hf_nhrp_holding_time = -1;
-static int hf_nhrp_cli_addr_tl = -1;
-static int hf_nhrp_cli_addr_tl_type = -1;
-static int hf_nhrp_cli_addr_tl_len = -1;
-static int hf_nhrp_cli_saddr_tl = -1;
-static int hf_nhrp_cli_saddr_tl_type = -1;
-static int hf_nhrp_cli_saddr_tl_len = -1;
-static int hf_nhrp_cli_prot_len = -1;
-static int hf_nhrp_pref = -1;
-static int hf_nhrp_client_nbma_addr = -1;
-static int hf_nhrp_client_nbma_saddr = -1;
-static int hf_nhrp_client_prot_addr = -1;
-static int hf_nhrp_ext_C = -1;
-static int hf_nhrp_ext_type = -1;
-static int hf_nhrp_ext_len = -1;
-/* static int hf_nhrp_ext_value = -1; */          /* TBD: Not used */
-static int hf_nhrp_error_code = -1;
-static int hf_nhrp_error_offset = -1;
-static int hf_nhrp_traffic_code = -1;
-/* static int hf_nhrp_error_packet = -1; */       /* TBD: Not used */
-
-static int hf_nhrp_auth_ext_reserved = -1;
-static int hf_nhrp_auth_ext_spi = -1;
-static int hf_nhrp_auth_ext_src_addr = -1;
-static int hf_nhrp_vendor_ext_id = -1;
-static int hf_nhrp_devcap_ext_srccap = -1;
-static int hf_nhrp_devcap_ext_srccap_V = -1;
-static int hf_nhrp_devcap_ext_dstcap = -1;
-static int hf_nhrp_devcap_ext_dstcap_V = -1;
-static int hf_nhrp_unknown_ext_value = -1;
+static int proto_nhrp;
+static int hf_nhrp_hdr_afn;
+static int hf_nhrp_hdr_pro_type;
+static int hf_nhrp_hdr_pro_snap_oui;
+static int hf_nhrp_hdr_pro_snap_pid;
+static int hf_nhrp_hdr_hopcnt;
+static int hf_nhrp_hdr_pktsz;
+static int hf_nhrp_hdr_chksum;
+static int hf_nhrp_hdr_chksum_status;
+static int hf_nhrp_hdr_extoff;
+static int hf_nhrp_hdr_version;
+static int hf_nhrp_hdr_op_type;
+static int hf_nhrp_hdr_shtl;
+static int hf_nhrp_hdr_shtl_type;
+static int hf_nhrp_hdr_shtl_len;
+static int hf_nhrp_hdr_sstl;
+static int hf_nhrp_hdr_sstl_type;
+static int hf_nhrp_hdr_sstl_len;
+
+static int hf_nhrp_src_proto_len;
+static int hf_nhrp_dst_proto_len;
+static int hf_nhrp_flags;
+static int hf_nhrp_flag_Q;
+static int hf_nhrp_flag_N;
+static int hf_nhrp_flag_A;
+static int hf_nhrp_flag_D;
+static int hf_nhrp_flag_U1;
+static int hf_nhrp_flag_U2;
+static int hf_nhrp_flag_S;
+static int hf_nhrp_flag_NAT;
+static int hf_nhrp_src_nbma_addr;
+static int hf_nhrp_src_nbma_saddr;
+static int hf_nhrp_src_prot_addr;
+static int hf_nhrp_dst_prot_addr;
+static int hf_nhrp_request_id;
+
+static int hf_nhrp_code;
+static int hf_nhrp_prefix_len;
+static int hf_nhrp_unused;
+static int hf_nhrp_mtu;
+static int hf_nhrp_holding_time;
+static int hf_nhrp_cli_addr_tl;
+static int hf_nhrp_cli_addr_tl_type;
+static int hf_nhrp_cli_addr_tl_len;
+static int hf_nhrp_cli_saddr_tl;
+static int hf_nhrp_cli_saddr_tl_type;
+static int hf_nhrp_cli_saddr_tl_len;
+static int hf_nhrp_cli_prot_len;
+static int hf_nhrp_pref;
+static int hf_nhrp_client_nbma_addr;
+static int hf_nhrp_client_nbma_saddr;
+static int hf_nhrp_client_prot_addr;
+static int hf_nhrp_ext_C;
+static int hf_nhrp_ext_type;
+static int hf_nhrp_ext_len;
+/* static int hf_nhrp_ext_value; */          /* TBD: Not used */
+static int hf_nhrp_error_code;
+static int hf_nhrp_error_offset;
+static int hf_nhrp_traffic_code;
+/* static int hf_nhrp_error_packet; */       /* TBD: Not used */
+
+static int hf_nhrp_auth_ext_reserved;
+static int hf_nhrp_auth_ext_spi;
+static int hf_nhrp_auth_ext_src_addr;
+static int hf_nhrp_vendor_ext_id;
+static int hf_nhrp_devcap_ext_srccap;
+static int hf_nhrp_devcap_ext_srccap_V;
+static int hf_nhrp_devcap_ext_dstcap;
+static int hf_nhrp_devcap_ext_dstcap_V;
+static int hf_nhrp_unknown_ext_value;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_nhrp_dst_prot_addr_bytes = -1;
-static int hf_nhrp_auth_ext_src_addr_bytes = -1;
-static int hf_nhrp_vendor_ext_data = -1;
-static int hf_nhrp_protocol_type = -1;
-static int hf_nhrp_src_nbma_addr_bytes = -1;
-static int hf_nhrp_client_nbma_address_bytes = -1;
-static int hf_nhrp_client_prot_addr_bytes = -1;
-static int hf_nhrp_auth_data = -1;
-static int hf_nhrp_src_prot_addr_bytes = -1;
-
-static gint ett_nhrp = -1;
-static gint ett_nhrp_hdr = -1;
-static gint ett_nhrp_hdr_shtl = -1;
-static gint ett_nhrp_hdr_sstl = -1;
-static gint ett_nhrp_mand = -1;
-static gint ett_nhrp_ext = -1;
-static gint ett_nhrp_mand_flag = -1;
-static gint ett_nhrp_cie = -1;
-static gint ett_nhrp_cie_cli_addr_tl = -1;
-static gint ett_nhrp_cie_cli_saddr_tl = -1;
-static gint ett_nhrp_indication = -1;
-static gint ett_nhrp_auth_ext = -1;
-static gint ett_nhrp_vendor_ext = -1;
-static gint ett_nhrp_devcap_ext = -1;
-static gint ett_nhrp_devcap_ext_srccap = -1;
-static gint ett_nhrp_devcap_ext_dstcap = -1;
-
-static expert_field ei_nhrp_hdr_pktsz = EI_INIT;
-static expert_field ei_nhrp_hdr_extoff = EI_INIT;
-static expert_field ei_nhrp_hdr_chksum = EI_INIT;
-static expert_field ei_nhrp_ext_not_allowed = EI_INIT;
-static expert_field ei_nhrp_ext_malformed = EI_INIT;
-static expert_field ei_nhrp_ext_extra = EI_INIT;
+static int hf_nhrp_dst_prot_addr_bytes;
+static int hf_nhrp_auth_ext_src_addr_bytes;
+static int hf_nhrp_vendor_ext_data;
+static int hf_nhrp_protocol_type;
+static int hf_nhrp_src_nbma_addr_bytes;
+static int hf_nhrp_client_nbma_address_bytes;
+static int hf_nhrp_client_prot_addr_bytes;
+static int hf_nhrp_auth_data;
+static int hf_nhrp_src_prot_addr_bytes;
+
+static gint ett_nhrp;
+static gint ett_nhrp_hdr;
+static gint ett_nhrp_hdr_shtl;
+static gint ett_nhrp_hdr_sstl;
+static gint ett_nhrp_mand;
+static gint ett_nhrp_ext;
+static gint ett_nhrp_mand_flag;
+static gint ett_nhrp_cie;
+static gint ett_nhrp_cie_cli_addr_tl;
+static gint ett_nhrp_cie_cli_saddr_tl;
+static gint ett_nhrp_indication;
+static gint ett_nhrp_auth_ext;
+static gint ett_nhrp_vendor_ext;
+static gint ett_nhrp_devcap_ext;
+static gint ett_nhrp_devcap_ext_srccap;
+static gint ett_nhrp_devcap_ext_dstcap;
+
+static expert_field ei_nhrp_hdr_pktsz;
+static expert_field ei_nhrp_hdr_extoff;
+static expert_field ei_nhrp_hdr_chksum;
+static expert_field ei_nhrp_ext_not_allowed;
+static expert_field ei_nhrp_ext_malformed;
+static expert_field ei_nhrp_ext_extra;
 
 static gboolean pref_auth_ext_has_addr = TRUE;
 
diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c
index 0c78d88a36..df22d30f12 100644
--- a/epan/dissectors/packet-nisplus.c
+++ b/epan/dissectors/packet-nisplus.c
@@ -19,141 +19,141 @@ void proto_reg_handoff_nis(void);
 void proto_register_niscb(void);
 void proto_reg_handoff_niscb(void);
 
-static int proto_nisplus = -1;
-static int hf_nisplus_procedure_v3 = -1;
-static int hf_nisplus_object = -1;
-static int hf_nisplus_oid = -1;
-static int hf_nisplus_object_ctime = -1;
-static int hf_nisplus_object_mtime = -1;
-static int hf_nisplus_object_name = -1;
-static int hf_nisplus_object_owner = -1;
-static int hf_nisplus_object_group = -1;
-static int hf_nisplus_object_domain = -1;
-static int hf_nisplus_object_ttl = -1;
-static int hf_nisplus_object_type = -1;
-static int hf_nisplus_object_private = -1;
-static int hf_nisplus_directory = -1;
-static int hf_nisplus_directory_name = -1;
-static int hf_nisplus_directory_type = -1;
-static int hf_nisplus_directory_ttl = -1;
-static int hf_nisplus_directory_mask = -1;
-static int hf_nisplus_directory_mask_list = -1;
-static int hf_nisplus_access_mask = -1;
-static int hf_nisplus_mask_world_read = -1;
-static int hf_nisplus_mask_world_modify = -1;
-static int hf_nisplus_mask_world_create = -1;
-static int hf_nisplus_mask_world_destroy = -1;
-static int hf_nisplus_mask_group_read = -1;
-static int hf_nisplus_mask_group_modify = -1;
-static int hf_nisplus_mask_group_create = -1;
-static int hf_nisplus_mask_group_destroy = -1;
-static int hf_nisplus_mask_owner_read = -1;
-static int hf_nisplus_mask_owner_modify = -1;
-static int hf_nisplus_mask_owner_create = -1;
-static int hf_nisplus_mask_owner_destroy = -1;
-static int hf_nisplus_mask_nobody_read = -1;
-static int hf_nisplus_mask_nobody_modify = -1;
-static int hf_nisplus_mask_nobody_create = -1;
-static int hf_nisplus_mask_nobody_destroy = -1;
-static int hf_nisplus_server_name = -1;
-static int hf_nisplus_key_type = -1;
-static int hf_nisplus_key_data = -1;
-static int hf_nisplus_servers = -1;
-static int hf_nisplus_cbservers = -1;
-static int hf_nisplus_server = -1;
-static int hf_nisplus_endpoints = -1;
-static int hf_nisplus_endpoint = -1;
-static int hf_nisplus_endpoint_uaddr = -1;
-static int hf_nisplus_endpoint_family = -1;
-static int hf_nisplus_endpoint_proto = -1;
-static int hf_nisplus_link = -1;
-static int hf_nisplus_attrs_array = -1;
-static int hf_nisplus_attr = -1;
-static int hf_nisplus_attr_name = -1;
-static int hf_nisplus_attr_val = -1;
-static int hf_nisplus_entry = -1;
-static int hf_nisplus_entry_type = -1;
-static int hf_nisplus_entry_cols = -1;
-static int hf_nisplus_entry_col = -1;
-/* static int hf_nisplus_entry_flags = -1; */
-static int hf_nisplus_entry_val = -1;
-static int hf_nisplus_entry_mask = -1;
-static int hf_nisplus_entry_mask_binary = -1;
-static int hf_nisplus_entry_mask_crypt = -1;
-static int hf_nisplus_entry_mask_xdr = -1;
-static int hf_nisplus_entry_mask_modified = -1;
-static int hf_nisplus_entry_mask_asn = -1;
-static int hf_nisplus_table = -1;
-static int hf_nisplus_table_type = -1;
-static int hf_nisplus_table_maxcol = -1;
-static int hf_nisplus_table_sep = -1;
-static int hf_nisplus_table_cols = -1;
-static int hf_nisplus_table_col = -1;
-static int hf_nisplus_table_path = -1;
-static int hf_nisplus_table_col_name = -1;
-static int hf_nisplus_table_col_mask = -1;
-static int hf_nisplus_table_col_mask_binary = -1;
-static int hf_nisplus_table_col_mask_encrypted = -1;
-static int hf_nisplus_table_col_mask_xdr = -1;
-static int hf_nisplus_table_col_mask_searchable = -1;
-static int hf_nisplus_table_col_mask_casesensitive = -1;
-static int hf_nisplus_table_col_mask_modified = -1;
-static int hf_nisplus_table_col_mask_asn = -1;
-static int hf_nisplus_group = -1;
-static int hf_nisplus_group_flags = -1;
-static int hf_nisplus_grps = -1;
-static int hf_nisplus_group_name = -1;
-static int hf_nisplus_ib_flags = -1;
-static int hf_nisplus_ib_bufsize = -1;
-static int hf_nisplus_cookie = -1;
-static int hf_nisplus_fd_dirname = -1;
-static int hf_nisplus_fd_requester = -1;
-static int hf_nisplus_taglist = -1;
-static int hf_nisplus_tag = -1;
-static int hf_nisplus_tag_type = -1;
-static int hf_nisplus_tag_val = -1;
-static int hf_nisplus_dump_dir = -1;
-static int hf_nisplus_dump_time = -1;
-static int hf_nisplus_dummy = -1;
-static int hf_nisplus_ping_dir = -1;
-static int hf_nisplus_ping_time = -1;
-static int hf_nisplus_error = -1;
-static int hf_nisplus_dir_data = -1;
-static int hf_nisplus_signature = -1;
-static int hf_nisplus_log_entries = -1;
-static int hf_nisplus_log_entry = -1;
-static int hf_nisplus_log_type = -1;
-static int hf_nisplus_log_time = -1;
-static int hf_nisplus_log_principal = -1;
-static int hf_nisplus_callback_status = -1;
-static int hf_nisplus_cp_status = -1;
-static int hf_nisplus_cp_zticks = -1;
-static int hf_nisplus_cp_dticks = -1;
-static int hf_nisplus_zticks = -1;
-static int hf_nisplus_dticks = -1;
-static int hf_nisplus_aticks = -1;
-static int hf_nisplus_cticks = -1;
-
-static gint ett_nisplus = -1;
-static gint ett_nisplus_object = -1;
-static gint ett_nisplus_oid = -1;
-static gint ett_nisplus_directory = -1;
-static gint ett_nisplus_directory_mask = -1;
-static gint ett_nisplus_access_mask = -1;
-static gint ett_nisplus_server = -1;
-static gint ett_nisplus_endpoint = -1;
-static gint ett_nisplus_link = -1;
-static gint ett_nisplus_attr = -1;
-static gint ett_nisplus_entry = -1;
-static gint ett_nisplus_entry_col = -1;
-static gint ett_nisplus_entry_mask = -1;
-static gint ett_nisplus_table = -1;
-static gint ett_nisplus_table_col = -1;
-static gint ett_nisplus_table_col_mask = -1;
-static gint ett_nisplus_group = -1;
-static gint ett_nisplus_grps = -1;
-static gint ett_nisplus_tag = -1;
-static gint ett_nisplus_log_entry = -1;
+static int proto_nisplus;
+static int hf_nisplus_procedure_v3;
+static int hf_nisplus_object;
+static int hf_nisplus_oid;
+static int hf_nisplus_object_ctime;
+static int hf_nisplus_object_mtime;
+static int hf_nisplus_object_name;
+static int hf_nisplus_object_owner;
+static int hf_nisplus_object_group;
+static int hf_nisplus_object_domain;
+static int hf_nisplus_object_ttl;
+static int hf_nisplus_object_type;
+static int hf_nisplus_object_private;
+static int hf_nisplus_directory;
+static int hf_nisplus_directory_name;
+static int hf_nisplus_directory_type;
+static int hf_nisplus_directory_ttl;
+static int hf_nisplus_directory_mask;
+static int hf_nisplus_directory_mask_list;
+static int hf_nisplus_access_mask;
+static int hf_nisplus_mask_world_read;
+static int hf_nisplus_mask_world_modify;
+static int hf_nisplus_mask_world_create;
+static int hf_nisplus_mask_world_destroy;
+static int hf_nisplus_mask_group_read;
+static int hf_nisplus_mask_group_modify;
+static int hf_nisplus_mask_group_create;
+static int hf_nisplus_mask_group_destroy;
+static int hf_nisplus_mask_owner_read;
+static int hf_nisplus_mask_owner_modify;
+static int hf_nisplus_mask_owner_create;
+static int hf_nisplus_mask_owner_destroy;
+static int hf_nisplus_mask_nobody_read;
+static int hf_nisplus_mask_nobody_modify;
+static int hf_nisplus_mask_nobody_create;
+static int hf_nisplus_mask_nobody_destroy;
+static int hf_nisplus_server_name;
+static int hf_nisplus_key_type;
+static int hf_nisplus_key_data;
+static int hf_nisplus_servers;
+static int hf_nisplus_cbservers;
+static int hf_nisplus_server;
+static int hf_nisplus_endpoints;
+static int hf_nisplus_endpoint;
+static int hf_nisplus_endpoint_uaddr;
+static int hf_nisplus_endpoint_family;
+static int hf_nisplus_endpoint_proto;
+static int hf_nisplus_link;
+static int hf_nisplus_attrs_array;
+static int hf_nisplus_attr;
+static int hf_nisplus_attr_name;
+static int hf_nisplus_attr_val;
+static int hf_nisplus_entry;
+static int hf_nisplus_entry_type;
+static int hf_nisplus_entry_cols;
+static int hf_nisplus_entry_col;
+/* static int hf_nisplus_entry_flags; */
+static int hf_nisplus_entry_val;
+static int hf_nisplus_entry_mask;
+static int hf_nisplus_entry_mask_binary;
+static int hf_nisplus_entry_mask_crypt;
+static int hf_nisplus_entry_mask_xdr;
+static int hf_nisplus_entry_mask_modified;
+static int hf_nisplus_entry_mask_asn;
+static int hf_nisplus_table;
+static int hf_nisplus_table_type;
+static int hf_nisplus_table_maxcol;
+static int hf_nisplus_table_sep;
+static int hf_nisplus_table_cols;
+static int hf_nisplus_table_col;
+static int hf_nisplus_table_path;
+static int hf_nisplus_table_col_name;
+static int hf_nisplus_table_col_mask;
+static int hf_nisplus_table_col_mask_binary;
+static int hf_nisplus_table_col_mask_encrypted;
+static int hf_nisplus_table_col_mask_xdr;
+static int hf_nisplus_table_col_mask_searchable;
+static int hf_nisplus_table_col_mask_casesensitive;
+static int hf_nisplus_table_col_mask_modified;
+static int hf_nisplus_table_col_mask_asn;
+static int hf_nisplus_group;
+static int hf_nisplus_group_flags;
+static int hf_nisplus_grps;
+static int hf_nisplus_group_name;
+static int hf_nisplus_ib_flags;
+static int hf_nisplus_ib_bufsize;
+static int hf_nisplus_cookie;
+static int hf_nisplus_fd_dirname;
+static int hf_nisplus_fd_requester;
+static int hf_nisplus_taglist;
+static int hf_nisplus_tag;
+static int hf_nisplus_tag_type;
+static int hf_nisplus_tag_val;
+static int hf_nisplus_dump_dir;
+static int hf_nisplus_dump_time;
+static int hf_nisplus_dummy;
+static int hf_nisplus_ping_dir;
+static int hf_nisplus_ping_time;
+static int hf_nisplus_error;
+static int hf_nisplus_dir_data;
+static int hf_nisplus_signature;
+static int hf_nisplus_log_entries;
+static int hf_nisplus_log_entry;
+static int hf_nisplus_log_type;
+static int hf_nisplus_log_time;
+static int hf_nisplus_log_principal;
+static int hf_nisplus_callback_status;
+static int hf_nisplus_cp_status;
+static int hf_nisplus_cp_zticks;
+static int hf_nisplus_cp_dticks;
+static int hf_nisplus_zticks;
+static int hf_nisplus_dticks;
+static int hf_nisplus_aticks;
+static int hf_nisplus_cticks;
+
+static gint ett_nisplus;
+static gint ett_nisplus_object;
+static gint ett_nisplus_oid;
+static gint ett_nisplus_directory;
+static gint ett_nisplus_directory_mask;
+static gint ett_nisplus_access_mask;
+static gint ett_nisplus_server;
+static gint ett_nisplus_endpoint;
+static gint ett_nisplus_link;
+static gint ett_nisplus_attr;
+static gint ett_nisplus_entry;
+static gint ett_nisplus_entry_col;
+static gint ett_nisplus_entry_mask;
+static gint ett_nisplus_table;
+static gint ett_nisplus_table_col;
+static gint ett_nisplus_table_col_mask;
+static gint ett_nisplus_group;
+static gint ett_nisplus_grps;
+static gint ett_nisplus_tag;
+static gint ett_nisplus_log_entry;
 
 
 #define NIS_MASK_TABLE_BINARY   0x00000001
@@ -1834,13 +1834,13 @@ proto_reg_handoff_nis(void)
    callback protocol for NIS+
    xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx */
 
-static int proto_nispluscb = -1;
-static int hf_nispluscb_procedure_v1 = -1;
-static int hf_nispluscb_entries = -1;
-static int hf_nispluscb_entry = -1;
+static int proto_nispluscb;
+static int hf_nispluscb_procedure_v1;
+static int hf_nispluscb_entries;
+static int hf_nispluscb_entry;
 
-static gint ett_nispluscb = -1;
-static gint ett_nispluscb_entry = -1;
+static gint ett_nispluscb;
+static gint ett_nispluscb_entry;
 
 static int
 dissect_cb_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-nlm.c b/epan/dissectors/packet-nlm.c
index 1b7251d06e..43b4197ae2 100644
--- a/epan/dissectors/packet-nlm.c
+++ b/epan/dissectors/packet-nlm.c
@@ -39,39 +39,39 @@ void proto_reg_handoff_nlm(void);
  * and follow the links to the HTML version of the document.
  */
 
-static int proto_nlm = -1;
-static int hf_nlm_procedure_v1 = -1;
-static int hf_nlm_procedure_v2 = -1;
-static int hf_nlm_procedure_v3 = -1;
-static int hf_nlm_procedure_v4 = -1;
-static int hf_nlm_cookie = -1;
-static int hf_nlm_block = -1;
-static int hf_nlm_exclusive = -1;
-static int hf_nlm_lock = -1;
-static int hf_nlm_lock_caller_name = -1;
-static int hf_nlm_lock_owner = -1;
-static int hf_nlm_lock_svid = -1;
-static int hf_nlm_lock_l_offset = -1;
-static int hf_nlm_lock_l_offset64 = -1;
-static int hf_nlm_lock_l_len = -1;
-static int hf_nlm_lock_l_len64 = -1;
-static int hf_nlm_reclaim = -1;
-static int hf_nlm_stat = -1;
-static int hf_nlm_state = -1;
-static int hf_nlm_test_stat = -1;
-static int hf_nlm_test_stat_stat = -1;
-static int hf_nlm_holder = -1;
-static int hf_nlm_share = -1;
-static int hf_nlm_share_mode = -1;
-static int hf_nlm_share_access = -1;
-static int hf_nlm_share_name = -1;
-static int hf_nlm_sequence = -1;
-static int hf_nlm_request_in = -1;
-static int hf_nlm_reply_in = -1;
-static int hf_nlm_time = -1;
-
-static gint ett_nlm = -1;
-static gint ett_nlm_lock = -1;
+static int proto_nlm;
+static int hf_nlm_procedure_v1;
+static int hf_nlm_procedure_v2;
+static int hf_nlm_procedure_v3;
+static int hf_nlm_procedure_v4;
+static int hf_nlm_cookie;
+static int hf_nlm_block;
+static int hf_nlm_exclusive;
+static int hf_nlm_lock;
+static int hf_nlm_lock_caller_name;
+static int hf_nlm_lock_owner;
+static int hf_nlm_lock_svid;
+static int hf_nlm_lock_l_offset;
+static int hf_nlm_lock_l_offset64;
+static int hf_nlm_lock_l_len;
+static int hf_nlm_lock_l_len64;
+static int hf_nlm_reclaim;
+static int hf_nlm_stat;
+static int hf_nlm_state;
+static int hf_nlm_test_stat;
+static int hf_nlm_test_stat_stat;
+static int hf_nlm_holder;
+static int hf_nlm_share;
+static int hf_nlm_share_mode;
+static int hf_nlm_share_access;
+static int hf_nlm_share_name;
+static int hf_nlm_sequence;
+static int hf_nlm_request_in;
+static int hf_nlm_reply_in;
+static int hf_nlm_time;
+
+static gint ett_nlm;
+static gint ett_nlm_lock;
 
 
 
diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c
index f331beea9e..b4668841f0 100644
--- a/epan/dissectors/packet-nlsp.c
+++ b/epan/dissectors/packet-nlsp.c
@@ -23,110 +23,110 @@ void proto_reg_handoff_nlsp(void);
 static dissector_handle_t nlsp_handle;
 
 /* NLSP base header */
-static int proto_nlsp                    = -1;
-
-static int hf_nlsp_irpd                  = -1;
-static int hf_nlsp_header_length         = -1;
-static int hf_nlsp_minor_version         = -1;
-static int hf_nlsp_nr                    = -1;
-static int hf_nlsp_type                  = -1;
-static int hf_nlsp_major_version         = -1;
-static int hf_nlsp_packet_length         = -1;
-static int hf_nlsp_hello_state           = -1;
-static int hf_nlsp_hello_multicast       = -1;
-static int hf_nlsp_hello_circuit_type    = -1;
-static int hf_nlsp_hello_holding_timer   = -1;
-static int hf_nlsp_hello_priority        = -1;
-static int hf_nlsp_lsp_sequence_number   = -1;
-static int hf_nlsp_lsp_checksum          = -1;
-static int hf_nlsp_lsp_p                 = -1;
-static int hf_nlsp_lsp_attached_flag     = -1;
-static int hf_nlsp_lsp_lspdbol           = -1;
-static int hf_nlsp_lsp_router_type       = -1;
-static int hf_nlsp_lsp_link_info_clv_flags_cost_present = -1;
-static int hf_nlsp_lsp_link_info_clv_flags_cost_metric = -1;
-static int hf_nlsp_lsp_link_info_clv_flags_cost = -1;
+static int proto_nlsp;
+
+static int hf_nlsp_irpd;
+static int hf_nlsp_header_length;
+static int hf_nlsp_minor_version;
+static int hf_nlsp_nr;
+static int hf_nlsp_type;
+static int hf_nlsp_major_version;
+static int hf_nlsp_packet_length;
+static int hf_nlsp_hello_state;
+static int hf_nlsp_hello_multicast;
+static int hf_nlsp_hello_circuit_type;
+static int hf_nlsp_hello_holding_timer;
+static int hf_nlsp_hello_priority;
+static int hf_nlsp_lsp_sequence_number;
+static int hf_nlsp_lsp_checksum;
+static int hf_nlsp_lsp_p;
+static int hf_nlsp_lsp_attached_flag;
+static int hf_nlsp_lsp_lspdbol;
+static int hf_nlsp_lsp_router_type;
+static int hf_nlsp_lsp_link_info_clv_flags_cost_present;
+static int hf_nlsp_lsp_link_info_clv_flags_cost_metric;
+static int hf_nlsp_lsp_link_info_clv_flags_cost;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_nlsp_psnp_lsp_checksum = -1;
-static int hf_nlsp_csnp_start_lsp_id_source_id = -1;
-static int hf_nlsp_svcs_info_node_number = -1;
-static int hf_nlsp_ext_routes_rip_delay = -1;
-static int hf_nlsp_psnp_source_id_system_id = -1;
-static int hf_nlsp_svcs_info_socket = -1;
-static int hf_nlsp_hello_sending_router_system_id = -1;
-static int hf_nlsp_csnp_start_lsp_id_lsp_number = -1;
-static int hf_nlsp_lsp_id_system_id = -1;
-static int hf_nlsp_psnp_lsp_id_pseudonode_id = -1;
-static int hf_nlsp_csnp_end_lsp_id_lsp_number = -1;
-static int hf_nlsp_remaining_lifetime = -1;
-static int hf_nlsp_csnp_remaining_lifetime = -1;
-static int hf_nlsp_psnp_lsp_id_source_id = -1;
-static int hf_nlsp_ext_routes_hops = -1;
-static int hf_nlsp_hello_local_mtu_mtu_size = -1;
-static int hf_nlsp_link_info_throughput = -1;
-static int hf_nlsp_link_info_media_type = -1;
-static int hf_nlsp_mgt_info_name = -1;
-static int hf_nlsp_mgt_info_node_number = -1;
-static int hf_nlsp_csnp_end_lsp_id_source_id = -1;
-static int hf_nlsp_csnp_lsp_id_pseudonode_id = -1;
-static int hf_nlsp_psnp_lsp_sequence_number = -1;
-static int hf_nlsp_link_info_mtu_size = -1;
-static int hf_nlsp_lsp_id_lsp_number = -1;
-static int hf_nlsp_unknown_code = -1;
-static int hf_nlsp_mgt_info_ipx_version_number = -1;
-static int hf_nlsp_link_info_router_pseudonode_id = -1;
-static int hf_nlsp_psnp_source_id_pseudonode_id = -1;
-static int hf_nlsp_csnp_lsp_id_lsp_number = -1;
-static int hf_nlsp_csnp_source_id_pseudonode_id = -1;
-static int hf_nlsp_csnp_end_lsp_id_pseudonode_id = -1;
-static int hf_nlsp_csnp_lsp_sequence_number = -1;
-static int hf_nlsp_link_info_router_system_id = -1;
-static int hf_nlsp_svcs_info_type = -1;
-static int hf_nlsp_csnp_lsp_checksum = -1;
-static int hf_nlsp_hello_local_wan_circuit_id = -1;
-static int hf_nlsp_svcs_info_service_name = -1;
-static int hf_nlsp_mgt_info_name_length = -1;
-static int hf_nlsp_neighbor = -1;
-static int hf_nlsp_area_address_network_number = -1;
-static int hf_nlsp_link_info_delay = -1;
-static int hf_nlsp_csnp_start_lsp_id_pseudonode_id = -1;
-static int hf_nlsp_svcs_info_network_number = -1;
-static int hf_nlsp_csnp_source_id_system_id = -1;
-static int hf_nlsp_mgt_info_network_number = -1;
-static int hf_nlsp_hello_designated_router_pseudonode_id = -1;
-static int hf_nlsp_lsp_id_pseudonode_id = -1;
-static int hf_nlsp_csnp_lsp_id_source_id = -1;
-static int hf_nlsp_psnp_remaining_lifetime = -1;
-static int hf_nlsp_area_address_mask = -1;
-static int hf_nlsp_hello_designated_router_system_id = -1;
-static int hf_nlsp_svcs_info_hops_to_reach_the_service = -1;
-static int hf_nlsp_psnp_lsp_id_lsp_number = -1;
-static int hf_nlsp_ext_routes_network_number = -1;
-
-static expert_field ei_nlsp_short_packet = EI_INIT;
-static expert_field ei_nlsp_long_packet = EI_INIT;
-static expert_field ei_nlsp_major_version = EI_INIT;
-static expert_field ei_nlsp_type = EI_INIT;
-
-static gint ett_nlsp                     = -1;
-static gint ett_nlsp_hello_clv_area_addr = -1;
-static gint ett_nlsp_hello_clv_neighbors = -1;
-static gint ett_nlsp_hello_local_mtu     = -1;
-static gint ett_nlsp_hello_clv_unknown   = -1;
-static gint ett_nlsp_lsp_info            = -1;
-static gint ett_nlsp_lsp_clv_area_addr   = -1;
-static gint ett_nlsp_lsp_clv_mgt_info    = -1;
-static gint ett_nlsp_lsp_clv_link_info   = -1;
-static gint ett_nlsp_lsp_clv_svcs_info   = -1;
-static gint ett_nlsp_lsp_clv_ext_routes  = -1;
-static gint ett_nlsp_lsp_clv_unknown     = -1;
-static gint ett_nlsp_csnp_lsp_entries    = -1;
-static gint ett_nlsp_csnp_lsp_entry      = -1;
-static gint ett_nlsp_csnp_clv_unknown    = -1;
-static gint ett_nlsp_psnp_lsp_entries    = -1;
-static gint ett_nlsp_psnp_lsp_entry      = -1;
-static gint ett_nlsp_psnp_clv_unknown    = -1;
+static int hf_nlsp_psnp_lsp_checksum;
+static int hf_nlsp_csnp_start_lsp_id_source_id;
+static int hf_nlsp_svcs_info_node_number;
+static int hf_nlsp_ext_routes_rip_delay;
+static int hf_nlsp_psnp_source_id_system_id;
+static int hf_nlsp_svcs_info_socket;
+static int hf_nlsp_hello_sending_router_system_id;
+static int hf_nlsp_csnp_start_lsp_id_lsp_number;
+static int hf_nlsp_lsp_id_system_id;
+static int hf_nlsp_psnp_lsp_id_pseudonode_id;
+static int hf_nlsp_csnp_end_lsp_id_lsp_number;
+static int hf_nlsp_remaining_lifetime;
+static int hf_nlsp_csnp_remaining_lifetime;
+static int hf_nlsp_psnp_lsp_id_source_id;
+static int hf_nlsp_ext_routes_hops;
+static int hf_nlsp_hello_local_mtu_mtu_size;
+static int hf_nlsp_link_info_throughput;
+static int hf_nlsp_link_info_media_type;
+static int hf_nlsp_mgt_info_name;
+static int hf_nlsp_mgt_info_node_number;
+static int hf_nlsp_csnp_end_lsp_id_source_id;
+static int hf_nlsp_csnp_lsp_id_pseudonode_id;
+static int hf_nlsp_psnp_lsp_sequence_number;
+static int hf_nlsp_link_info_mtu_size;
+static int hf_nlsp_lsp_id_lsp_number;
+static int hf_nlsp_unknown_code;
+static int hf_nlsp_mgt_info_ipx_version_number;
+static int hf_nlsp_link_info_router_pseudonode_id;
+static int hf_nlsp_psnp_source_id_pseudonode_id;
+static int hf_nlsp_csnp_lsp_id_lsp_number;
+static int hf_nlsp_csnp_source_id_pseudonode_id;
+static int hf_nlsp_csnp_end_lsp_id_pseudonode_id;
+static int hf_nlsp_csnp_lsp_sequence_number;
+static int hf_nlsp_link_info_router_system_id;
+static int hf_nlsp_svcs_info_type;
+static int hf_nlsp_csnp_lsp_checksum;
+static int hf_nlsp_hello_local_wan_circuit_id;
+static int hf_nlsp_svcs_info_service_name;
+static int hf_nlsp_mgt_info_name_length;
+static int hf_nlsp_neighbor;
+static int hf_nlsp_area_address_network_number;
+static int hf_nlsp_link_info_delay;
+static int hf_nlsp_csnp_start_lsp_id_pseudonode_id;
+static int hf_nlsp_svcs_info_network_number;
+static int hf_nlsp_csnp_source_id_system_id;
+static int hf_nlsp_mgt_info_network_number;
+static int hf_nlsp_hello_designated_router_pseudonode_id;
+static int hf_nlsp_lsp_id_pseudonode_id;
+static int hf_nlsp_csnp_lsp_id_source_id;
+static int hf_nlsp_psnp_remaining_lifetime;
+static int hf_nlsp_area_address_mask;
+static int hf_nlsp_hello_designated_router_system_id;
+static int hf_nlsp_svcs_info_hops_to_reach_the_service;
+static int hf_nlsp_psnp_lsp_id_lsp_number;
+static int hf_nlsp_ext_routes_network_number;
+
+static expert_field ei_nlsp_short_packet;
+static expert_field ei_nlsp_long_packet;
+static expert_field ei_nlsp_major_version;
+static expert_field ei_nlsp_type;
+
+static gint ett_nlsp;
+static gint ett_nlsp_hello_clv_area_addr;
+static gint ett_nlsp_hello_clv_neighbors;
+static gint ett_nlsp_hello_local_mtu;
+static gint ett_nlsp_hello_clv_unknown;
+static gint ett_nlsp_lsp_info;
+static gint ett_nlsp_lsp_clv_area_addr;
+static gint ett_nlsp_lsp_clv_mgt_info;
+static gint ett_nlsp_lsp_clv_link_info;
+static gint ett_nlsp_lsp_clv_svcs_info;
+static gint ett_nlsp_lsp_clv_ext_routes;
+static gint ett_nlsp_lsp_clv_unknown;
+static gint ett_nlsp_csnp_lsp_entries;
+static gint ett_nlsp_csnp_lsp_entry;
+static gint ett_nlsp_csnp_clv_unknown;
+static gint ett_nlsp_psnp_lsp_entries;
+static gint ett_nlsp_psnp_lsp_entry;
+static gint ett_nlsp_psnp_clv_unknown;
 
 #define PACKET_TYPE_MASK	0x1f
 
diff --git a/epan/dissectors/packet-nntp.c b/epan/dissectors/packet-nntp.c
index 4ccd8cba36..add915b784 100644
--- a/epan/dissectors/packet-nntp.c
+++ b/epan/dissectors/packet-nntp.c
@@ -18,11 +18,11 @@
 void proto_register_nntp(void);
 void proto_reg_handoff_nntp(void);
 
-static int proto_nntp = -1;
-static int hf_nntp_response = -1;
-static int hf_nntp_request = -1;
+static int proto_nntp;
+static int hf_nntp_response;
+static int hf_nntp_request;
 
-static gint ett_nntp = -1;
+static gint ett_nntp;
 
 static dissector_handle_t nntp_handle;
 static dissector_handle_t tls_handle;
diff --git a/epan/dissectors/packet-noe.c b/epan/dissectors/packet-noe.c
index 4d3e58219d..363d0f7982 100644
--- a/epan/dissectors/packet-noe.c
+++ b/epan/dissectors/packet-noe.c
@@ -682,43 +682,43 @@ static guint bool_properties[] = {
 /*-----------------------------------------------------------------------------
   globals
   ---------------------------------------------------------------------------*/
-static int  proto_noe           = -1;
-static gint ett_noe             = -1;
-static gint ett_body            = -1;
-static gint ett_property        = -1;
-static gint ett_value           = -1;
-
-static int  hf_noe_length               = -1;
-static int  hf_noe_server               = -1;
-static int  hf_noe_method_ack           = -1;
-static int  hf_noe_method               = -1;
-static int  hf_noe_class                = -1;
-static int  hf_noe_event                = -1;
-static int  hf_noe_objectid             = -1;
-static int  hf_noe_method_index         = -1;
-static int  hf_noe_pcode                = -1;
-static int  hf_noe_psize                = -1;
-static int  hf_noe_aindx                = -1;
-static int  hf_noe_errcode              = -1;
-static int  hf_noe_value                = -1;
-static int  hf_noe_message              = -1;
-static int  hf_noe_key_name             = -1;
-static int  hf_noe_bonded               = -1;
-static int  hf_noe_property_item_bool   = -1;
-static int  hf_noe_property_item_u8     = -1;
-static int  hf_noe_property_item_u16    = -1;
-static int  hf_noe_property_item_u24    = -1;
-static int  hf_noe_property_item_u32    = -1;
-static int  hf_noe_property_item_bytes  = -1;
-static int  hf_noe_property_item_utf8   = -1;
-static int  hf_event_bt_key             = -1;
-static int  hf_event_context_switch     = -1;
-static int  hf_evt_locappl_enable       = -1;
-static int  hf_evt_locappl_interruptible= -1;
-static int  hf_evt_locappl_identifier   = -1;
-static int  hf_evt_dev_presence_value   = -1;
-static int  hf_evt_dev_presence_state   = -1;
-static int  hf_event_widget_gc          = -1;
+static int  proto_noe;
+static gint ett_noe;
+static gint ett_body;
+static gint ett_property;
+static gint ett_value;
+
+static int  hf_noe_length;
+static int  hf_noe_server;
+static int  hf_noe_method_ack;
+static int  hf_noe_method;
+static int  hf_noe_class;
+static int  hf_noe_event;
+static int  hf_noe_objectid;
+static int  hf_noe_method_index;
+static int  hf_noe_pcode;
+static int  hf_noe_psize;
+static int  hf_noe_aindx;
+static int  hf_noe_errcode;
+static int  hf_noe_value;
+static int  hf_noe_message;
+static int  hf_noe_key_name;
+static int  hf_noe_bonded;
+static int  hf_noe_property_item_bool;
+static int  hf_noe_property_item_u8;
+static int  hf_noe_property_item_u16;
+static int  hf_noe_property_item_u24;
+static int  hf_noe_property_item_u32;
+static int  hf_noe_property_item_bytes;
+static int  hf_noe_property_item_utf8;
+static int  hf_event_bt_key;
+static int  hf_event_context_switch;
+static int  hf_evt_locappl_enable;
+static int  hf_evt_locappl_interruptible;
+static int  hf_evt_locappl_identifier;
+static int  hf_evt_dev_presence_value;
+static int  hf_evt_dev_presence_state;
+static int  hf_event_widget_gc;
 
 static const value_string servers_vals[] = {
     {0x15,  "Call Server"},
diff --git a/epan/dissectors/packet-nordic_ble.c b/epan/dissectors/packet-nordic_ble.c
index 6e0c65d72c..1c0a9028c7 100644
--- a/epan/dissectors/packet-nordic_ble.c
+++ b/epan/dissectors/packet-nordic_ble.c
@@ -214,46 +214,46 @@ void proto_register_nordic_ble(void);
 static dissector_handle_t nordic_ble_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_nordic_ble = -1;
+static int proto_nordic_ble;
 
 /* Initialize the subtree pointers */
-static gint ett_nordic_ble = -1;
-static gint ett_packet_header = -1;
-static gint ett_flags = -1;
-
-static int hf_nordic_ble_board_id = -1;
-static int hf_nordic_ble_legacy_marker = -1;
-static int hf_nordic_ble_header = -1;
-static int hf_nordic_ble_header_length = -1;
-static int hf_nordic_ble_payload_length = -1;
-static int hf_nordic_ble_protover = -1;
-static int hf_nordic_ble_packet_counter = -1;
-static int hf_nordic_ble_packet_id = -1;
-static int hf_nordic_ble_packet_length = -1;
-static int hf_nordic_ble_flags = -1;
-static int hf_nordic_ble_crcok = -1;
-static int hf_nordic_ble_encrypted = -1;
-static int hf_nordic_ble_micok = -1;
-static int hf_nordic_ble_mic_not_relevant = -1;
-static int hf_nordic_ble_aux_type = -1;
-static int hf_nordic_ble_flag_reserved1 = -1;
-static int hf_nordic_ble_flag_reserved2 = -1;
-static int hf_nordic_ble_address_resolved = -1;
-static int hf_nordic_ble_flag_reserved7 = -1;
-static int hf_nordic_ble_le_phy = -1;
-static int hf_nordic_ble_direction = -1;
-static int hf_nordic_ble_channel = -1;
-static int hf_nordic_ble_rssi = -1;
-static int hf_nordic_ble_event_counter = -1;
-static int hf_nordic_ble_time = -1;
-static int hf_nordic_ble_delta_time = -1;
-static int hf_nordic_ble_delta_time_ss = -1;
-static int hf_nordic_ble_packet_time = -1;
-
-static expert_field ei_nordic_ble_bad_crc = EI_INIT;
-static expert_field ei_nordic_ble_bad_mic = EI_INIT;
-static expert_field ei_nordic_ble_bad_length = EI_INIT;
-static expert_field ei_nordic_ble_unknown_version = EI_INIT;
+static gint ett_nordic_ble;
+static gint ett_packet_header;
+static gint ett_flags;
+
+static int hf_nordic_ble_board_id;
+static int hf_nordic_ble_legacy_marker;
+static int hf_nordic_ble_header;
+static int hf_nordic_ble_header_length;
+static int hf_nordic_ble_payload_length;
+static int hf_nordic_ble_protover;
+static int hf_nordic_ble_packet_counter;
+static int hf_nordic_ble_packet_id;
+static int hf_nordic_ble_packet_length;
+static int hf_nordic_ble_flags;
+static int hf_nordic_ble_crcok;
+static int hf_nordic_ble_encrypted;
+static int hf_nordic_ble_micok;
+static int hf_nordic_ble_mic_not_relevant;
+static int hf_nordic_ble_aux_type;
+static int hf_nordic_ble_flag_reserved1;
+static int hf_nordic_ble_flag_reserved2;
+static int hf_nordic_ble_address_resolved;
+static int hf_nordic_ble_flag_reserved7;
+static int hf_nordic_ble_le_phy;
+static int hf_nordic_ble_direction;
+static int hf_nordic_ble_channel;
+static int hf_nordic_ble_rssi;
+static int hf_nordic_ble_event_counter;
+static int hf_nordic_ble_time;
+static int hf_nordic_ble_delta_time;
+static int hf_nordic_ble_delta_time_ss;
+static int hf_nordic_ble_packet_time;
+
+static expert_field ei_nordic_ble_bad_crc;
+static expert_field ei_nordic_ble_bad_mic;
+static expert_field ei_nordic_ble_bad_length;
+static expert_field ei_nordic_ble_unknown_version;
 
 static const true_false_string direction_tfs =
 {
diff --git a/epan/dissectors/packet-ns-ha.c b/epan/dissectors/packet-ns-ha.c
index 48139462da..bcaf4bc378 100644
--- a/epan/dissectors/packet-ns-ha.c
+++ b/epan/dissectors/packet-ns-ha.c
@@ -18,28 +18,28 @@ void proto_reg_handoff_ns_ha(void);
 
 static dissector_handle_t nsha_handle;
 
-static int proto_ns_ha = -1;
-static gint ett_nsha = -1;
-static gint ett_nsha_flags = -1;
-
-static int hf_nsha_signature = -1;
-static int hf_nsha_version = -1;
-static int hf_nsha_app = -1;
-static int hf_nsha_type = -1;
-static int hf_nsha_state = -1;
-static int hf_nsha_startime = -1;
-static int hf_nsha_masterstate = -1;
-static int hf_nsha_release = -1;
-static int hf_nsha_inc = -1;
-static int hf_nsha_syncstate = -1;
-static int hf_nsha_drinc = -1;
-static int hf_nsha_flags = -1;
-static int hf_nsha_flags_vm = -1;
-static int hf_nsha_flags_sp = -1;
-static int hf_nsha_flags_propdis = -1;
-static int hf_nsha_flags_inc = -1;
-static int hf_nsha_flags_sslfail = -1;
-static int hf_nsha_flags_nossl = -1;
+static int proto_ns_ha;
+static gint ett_nsha;
+static gint ett_nsha_flags;
+
+static int hf_nsha_signature;
+static int hf_nsha_version;
+static int hf_nsha_app;
+static int hf_nsha_type;
+static int hf_nsha_state;
+static int hf_nsha_startime;
+static int hf_nsha_masterstate;
+static int hf_nsha_release;
+static int hf_nsha_inc;
+static int hf_nsha_syncstate;
+static int hf_nsha_drinc;
+static int hf_nsha_flags;
+static int hf_nsha_flags_vm;
+static int hf_nsha_flags_sp;
+static int hf_nsha_flags_propdis;
+static int hf_nsha_flags_inc;
+static int hf_nsha_flags_sslfail;
+static int hf_nsha_flags_nossl;
 
 static const value_string ns_ha_app_vals[] = {
 	{ 0x00, "BASE" },
diff --git a/epan/dissectors/packet-ns-mep.c b/epan/dissectors/packet-ns-mep.c
index 2ea04c381a..f4ee04d357 100644
--- a/epan/dissectors/packet-ns-mep.c
+++ b/epan/dissectors/packet-ns-mep.c
@@ -20,70 +20,70 @@ void proto_reg_handoff_ns_mep(void);
 
 static dissector_handle_t nsmep_handle;
 
-static int proto_ns_mep = -1;
-
-static gint ett_nsmep = -1;
-static gint ett_nsmep_mfu = -1;
-static gint ett_nsmep_nwu = -1;
-
-static int hf_nsmep_majver = -1;
-static int hf_nsmep_minver = -1;
-static int hf_nsmep_msgtype = -1;
-static int hf_nsmep_msglen = -1;
-static int hf_nsmep_errcode = -1;
-static int hf_nsmep_mfu_state = -1;
-
-
-static int hf_ns_metricUpdate = -1;
-static int hf_ns_forceUpdateRequest = -1;
-static int hf_ns_forceUpdateResp = -1;
-static int hf_ns_currentOpenConn = -1;
-static int hf_ns_currentSurgeCount = -1;
-static int hf_ns_currentIOHCount = -1;
-static int hf_ns_currentReusePool  = -1;
-static int hf_ns_currentServerConn = -1;
-static int hf_ns_currentClientConn  = -1;
-static int hf_ns_TotalReq = -1;
-static int hf_ns_TotalReqBytes = -1;
-static int hf_ns_TotalResp = -1;
-static int hf_ns_TotalRespBytes = -1;
-static int hf_ns_networkMetrics = -1;
-static int hf_ns_roundTripTime = -1;
-static int hf_ns_hops = -1;
-static int hf_ns_persistenceInfo = -1;
-static int hf_ns_persistenceGslbServIp = -1;
-static int hf_ns_persistenceGslbServPort = -1;
-static int hf_ns_persistenceId = -1;
-static int hf_ns_sitePersistenceDom  = -1;
-static int hf_ns_gslbDomNamelen  = -1;
-static int hf_ns_gslbServPreflen  = -1;
-static int hf_ns_gslbCookieDomNamelen  = -1;
-static int hf_ns_gslbCookieTimeout = -1;
-static int hf_ns_gslbVidlen = -1;
-static int hf_ns_gslbFlags = -1;
-static int hf_ns_gslbCookieDomName = -1;
-static int hf_ns_gslbVs = -1;
-static int hf_ns_gslbPrefix = -1;
-static int hf_ns_sitePersistenceFlushDom = -1;
-static int hf_ns_gslbDomName = -1;
-static int hf_ns_sitePersistenceFlushServ = -1;
-static int hf_ns_sitePersisGetServReq = -1;
-static int hf_ns_siteDomTTL = -1;
-static int hf_ns_sitePersistenceGetServResp = -1;
-
-
-
-static int hf_nsmep_mfu_ip = -1;
-static int hf_nsmep_mfu_port = -1;
-static int hf_nsmep_mfu_svctype = -1;
-static int hf_nsmep_mfu_eff_state = -1;
-static int hf_nsmep_mfu_mepflag = -1;
-static int hf_nsmep_mfu_reqflag = -1;
-
-static int hf_nsmep_adv_ip = -1;
-
-static int hf_nsmep_ldns_ip = -1;
-static int hf_nsmep_site_persistence = -1;
+static int proto_ns_mep;
+
+static gint ett_nsmep;
+static gint ett_nsmep_mfu;
+static gint ett_nsmep_nwu;
+
+static int hf_nsmep_majver;
+static int hf_nsmep_minver;
+static int hf_nsmep_msgtype;
+static int hf_nsmep_msglen;
+static int hf_nsmep_errcode;
+static int hf_nsmep_mfu_state;
+
+
+static int hf_ns_metricUpdate;
+static int hf_ns_forceUpdateRequest;
+static int hf_ns_forceUpdateResp;
+static int hf_ns_currentOpenConn;
+static int hf_ns_currentSurgeCount;
+static int hf_ns_currentIOHCount;
+static int hf_ns_currentReusePool;
+static int hf_ns_currentServerConn;
+static int hf_ns_currentClientConn;
+static int hf_ns_TotalReq;
+static int hf_ns_TotalReqBytes;
+static int hf_ns_TotalResp;
+static int hf_ns_TotalRespBytes;
+static int hf_ns_networkMetrics;
+static int hf_ns_roundTripTime;
+static int hf_ns_hops;
+static int hf_ns_persistenceInfo;
+static int hf_ns_persistenceGslbServIp;
+static int hf_ns_persistenceGslbServPort;
+static int hf_ns_persistenceId;
+static int hf_ns_sitePersistenceDom;
+static int hf_ns_gslbDomNamelen;
+static int hf_ns_gslbServPreflen;
+static int hf_ns_gslbCookieDomNamelen;
+static int hf_ns_gslbCookieTimeout;
+static int hf_ns_gslbVidlen;
+static int hf_ns_gslbFlags;
+static int hf_ns_gslbCookieDomName;
+static int hf_ns_gslbVs;
+static int hf_ns_gslbPrefix;
+static int hf_ns_sitePersistenceFlushDom;
+static int hf_ns_gslbDomName;
+static int hf_ns_sitePersistenceFlushServ;
+static int hf_ns_sitePersisGetServReq;
+static int hf_ns_siteDomTTL;
+static int hf_ns_sitePersistenceGetServResp;
+
+
+
+static int hf_nsmep_mfu_ip;
+static int hf_nsmep_mfu_port;
+static int hf_nsmep_mfu_svctype;
+static int hf_nsmep_mfu_eff_state;
+static int hf_nsmep_mfu_mepflag;
+static int hf_nsmep_mfu_reqflag;
+
+static int hf_nsmep_adv_ip;
+
+static int hf_nsmep_ldns_ip;
+static int hf_nsmep_site_persistence;
 dissector_handle_t nsrpc_handle;
 
 /*GSLB MEP message types */
diff --git a/epan/dissectors/packet-ns-rpc.c b/epan/dissectors/packet-ns-rpc.c
index 5475e71d1c..8d541a62c2 100644
--- a/epan/dissectors/packet-ns-rpc.c
+++ b/epan/dissectors/packet-ns-rpc.c
@@ -16,14 +16,14 @@
 void proto_register_ns_rpc(void);
 void proto_reg_handoff_ns_rpc(void);
 
-static int proto_ns_rpc = -1;
-static gint ett_nsrpc = -1;
+static int proto_ns_rpc;
+static gint ett_nsrpc;
 
-static int hf_nsrpc_dlen = -1;
-static int hf_nsrpc_cmd = -1;
-static int hf_nsrpc_errcode = -1;
+static int hf_nsrpc_dlen;
+static int hf_nsrpc_cmd;
+static int hf_nsrpc_errcode;
 
-static int hf_ns_remoteIOCTL = -1;
+static int hf_ns_remoteIOCTL;
 
 
 static const value_string ns_rpc_cmd_vals[] = {
diff --git a/epan/dissectors/packet-nsh.c b/epan/dissectors/packet-nsh.c
index 21f633782f..083dfcc3e7 100644
--- a/epan/dissectors/packet-nsh.c
+++ b/epan/dissectors/packet-nsh.c
@@ -48,26 +48,26 @@ static const value_string nsh_next_protocols[] = {
 };
 
 
-static int proto_nsh = -1;
-static int hf_nsh_version = -1;
-static int hf_nsh_oam = -1;
-static int hf_nsh_critical_metadata = -1;
-static int hf_nsh_ttl = -1;
-static int hf_nsh_length = -1;
-static int hf_nsh_md_type = -1;
-static int hf_nsh_next_proto = -1;
-static int hf_nsh_service_pathID = -1;
-static int hf_nsh_service_index = -1;
-static int hf_nsh_context_header = -1;
-static int hf_nsh_metadata_class = -1;
-static int hf_nsh_metadata_type = -1;
-static int hf_nsh_metadata_unassignedbit = -1;
-static int hf_nsh_metadata_length = -1;
-static int hf_nsh_metadata = -1;
-
-static expert_field ei_nsh_length_invalid = EI_INIT;
-
-static gint ett_nsh = -1;
+static int proto_nsh;
+static int hf_nsh_version;
+static int hf_nsh_oam;
+static int hf_nsh_critical_metadata;
+static int hf_nsh_ttl;
+static int hf_nsh_length;
+static int hf_nsh_md_type;
+static int hf_nsh_next_proto;
+static int hf_nsh_service_pathID;
+static int hf_nsh_service_index;
+static int hf_nsh_context_header;
+static int hf_nsh_metadata_class;
+static int hf_nsh_metadata_type;
+static int hf_nsh_metadata_unassignedbit;
+static int hf_nsh_metadata_length;
+static int hf_nsh_metadata;
+
+static expert_field ei_nsh_length_invalid;
+
+static gint ett_nsh;
 
 static dissector_table_t subdissector_table;
 
diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c
index 16f1d45dc1..4fee1966a2 100644
--- a/epan/dissectors/packet-nsip.c
+++ b/epan/dissectors/packet-nsip.c
@@ -28,47 +28,47 @@ void proto_reg_handoff_nsip(void);
 #define DEFAULT_NSIP_PORT_RANGE "2157,19999" /* Not IANA registered */
 
 /* Initialize the protocol and registered fields */
-static int proto_nsip = -1;
-
-static int hf_nsip_cause = -1;
-static int hf_nsip_ns_vci = -1;
-static int hf_nsip_pdu_type = -1;
-static int hf_nsip_bvci = -1;
-static int hf_nsip_nsei = -1;
-/* static int hf_nsip_ip4_elements = -1; */
-/* static int hf_nsip_ip6_elements = -1; */
-static int hf_nsip_max_num_ns_vc = -1;
-static int hf_nsip_num_ip4_endpoints = -1;
-static int hf_nsip_num_ip6_endpoints = -1;
-static int hf_nsip_reset_flag = -1;
-static int hf_nsip_reset_flag_bit = -1;
-static int hf_nsip_reset_flag_spare = -1;
-static int hf_nsip_ip_address_type = -1;
-static int hf_nsip_ip_address_ipv4 = -1;
-static int hf_nsip_ip_address_ipv6 = -1;
-static int hf_nsip_end_flag = -1;
-static int hf_nsip_end_flag_bit = -1;
-static int hf_nsip_end_flag_spare = -1;
-static int hf_nsip_control_bits = -1;
-static int hf_nsip_control_bits_r = -1;
-static int hf_nsip_control_bits_c = -1;
-static int hf_nsip_control_bits_spare = -1;
-static int hf_nsip_transaction_id = -1;
-/* static int hf_nsip_ip_element_ip_address_ipv4 = -1; */
-/* static int hf_nsip_ip_element_ip_address_ipv6 = -1; */
-static int hf_nsip_ip_element_udp_port = -1;
-static int hf_nsip_ip_element_signalling_weight = -1;
-static int hf_nsip_ip_element_data_weight = -1;
-static int hf_nsip_ns_pdu = -1;
-static int hf_nsip_ns_sdu = -1;
+static int proto_nsip;
+
+static int hf_nsip_cause;
+static int hf_nsip_ns_vci;
+static int hf_nsip_pdu_type;
+static int hf_nsip_bvci;
+static int hf_nsip_nsei;
+/* static int hf_nsip_ip4_elements; */
+/* static int hf_nsip_ip6_elements; */
+static int hf_nsip_max_num_ns_vc;
+static int hf_nsip_num_ip4_endpoints;
+static int hf_nsip_num_ip6_endpoints;
+static int hf_nsip_reset_flag;
+static int hf_nsip_reset_flag_bit;
+static int hf_nsip_reset_flag_spare;
+static int hf_nsip_ip_address_type;
+static int hf_nsip_ip_address_ipv4;
+static int hf_nsip_ip_address_ipv6;
+static int hf_nsip_end_flag;
+static int hf_nsip_end_flag_bit;
+static int hf_nsip_end_flag_spare;
+static int hf_nsip_control_bits;
+static int hf_nsip_control_bits_r;
+static int hf_nsip_control_bits_c;
+static int hf_nsip_control_bits_spare;
+static int hf_nsip_transaction_id;
+/* static int hf_nsip_ip_element_ip_address_ipv4; */
+/* static int hf_nsip_ip_element_ip_address_ipv6; */
+static int hf_nsip_ip_element_udp_port;
+static int hf_nsip_ip_element_signalling_weight;
+static int hf_nsip_ip_element_data_weight;
+static int hf_nsip_ns_pdu;
+static int hf_nsip_ns_sdu;
 
 /* Initialize the subtree pointers */
-static gint ett_nsip = -1;
-static gint ett_nsip_control_bits = -1;
-static gint ett_nsip_reset_flag = -1;
-static gint ett_nsip_end_flag = -1;
-static gint ett_nsip_ip_element = -1;
-static gint ett_nsip_ip_element_list = -1;
+static gint ett_nsip;
+static gint ett_nsip_control_bits;
+static gint ett_nsip_reset_flag;
+static gint ett_nsip_end_flag;
+static gint ett_nsip_ip_element;
+static gint ett_nsip_ip_element_list;
 
 /* PDU type coding, v5.3.0, table 10.3.7.1, p 51 */
 #define NSIP_PDU_NS_UNITDATA        0x00
diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c
index 42e531a521..144280b32f 100644
--- a/epan/dissectors/packet-nsrp.c
+++ b/epan/dissectors/packet-nsrp.c
@@ -43,42 +43,42 @@ static dissector_handle_t nsrp_handle;
 #define NSRP_MIN_LEN    32
 
 /* Initialize the protocol and registered fields */
-static int proto_nsrp       = -1;
-
-static int hf_nsrp_version       = -1;
-static int hf_nsrp_msg_type      = -1;
-static int hf_nsrp_clust_id      = -1;
-static int hf_nsrp_msg_flag      = -1;
-static int hf_nsrp_len           = -1;
-static int hf_nsrp_ha_port       = -1;
-static int hf_nsrp_not_used      = -1;
-static int hf_nsrp_dst_unit      = -1;
-static int hf_nsrp_src_unit      = -1;
-static int hf_nsrp_msgtype       = -1;
-static int hf_nsrp_wst_group     = -1;
-static int hf_nsrp_hst_group     = -1;
-static int hf_nsrp_msgflag     = -1;
-static int hf_nsrp_authflag      = -1;
-static int hf_nsrp_priority      = -1;
-static int hf_nsrp_dummy         = -1;
-static int hf_nsrp_authchecksum  = -1;
-static int hf_nsrp_ifnum         = -1;
+static int proto_nsrp;
+
+static int hf_nsrp_version;
+static int hf_nsrp_msg_type;
+static int hf_nsrp_clust_id;
+static int hf_nsrp_msg_flag;
+static int hf_nsrp_len;
+static int hf_nsrp_ha_port;
+static int hf_nsrp_not_used;
+static int hf_nsrp_dst_unit;
+static int hf_nsrp_src_unit;
+static int hf_nsrp_msgtype;
+static int hf_nsrp_wst_group;
+static int hf_nsrp_hst_group;
+static int hf_nsrp_msgflag;
+static int hf_nsrp_authflag;
+static int hf_nsrp_priority;
+static int hf_nsrp_dummy;
+static int hf_nsrp_authchecksum;
+static int hf_nsrp_ifnum;
 
 
 /* Dada defined for HA Message */
-static int hf_nsrp_msglen      = -1;
-static int hf_nsrp_encflag      = -1;
-/* static int hf_nsrp_notused = -1; */
+static int hf_nsrp_msglen;
+static int hf_nsrp_encflag;
+/* static int hf_nsrp_notused; */
 
-static int hf_nsrp_total_size = -1;
+static int hf_nsrp_total_size;
 
-static int hf_nsrp_ns = -1;
-static int hf_nsrp_nr = -1;
+static int hf_nsrp_ns;
+static int hf_nsrp_nr;
 
-static int hf_nsrp_no_used = -1;
-static int hf_nsrp_checksum = -1;
+static int hf_nsrp_no_used;
+static int hf_nsrp_checksum;
 
-static int hf_nsrp_data = -1;
+static int hf_nsrp_data;
 
 
 static const value_string nsrp_msg_type_vals[] = {
@@ -132,7 +132,7 @@ static const value_string nsrp_encflag_vals[] = {
 
 
 /* Initialize the subtree pointers */
-static gint ett_nsrp = -1;
+static gint ett_nsrp;
 
 /* Code to actually dissect the packets */
 static int
diff --git a/epan/dissectors/packet-nstrace.c b/epan/dissectors/packet-nstrace.c
index d02862b6d6..99688dfb19 100644
--- a/epan/dissectors/packet-nstrace.c
+++ b/epan/dissectors/packet-nstrace.c
@@ -110,184 +110,184 @@
 void proto_register_ns(void);
 void proto_reg_handoff_ns(void);
 
-static int proto_nstrace = -1;
-
-static int hf_ns_nicno = -1;
-static int hf_ns_src_vm = -1;
-static int hf_ns_dst_vm = -1;
-static int hf_ns_dir = -1;
-static int hf_ns_pcbdevno = -1;
-static int hf_ns_l_pcbdevno = -1;
-static int hf_ns_devno = -1;
-static int hf_ns_vlantag = -1;
-static int hf_ns_coreid = -1;
-
-static int hf_ns_errorcode = -1;
-static int hf_ns_app = -1;
-
-static int hf_ns_snode = -1;
-static int hf_ns_dnode = -1;
-static int hf_ns_clflags = -1;
-static int hf_ns_clflags_res = -1;
-static int hf_ns_clflags_rssh = -1;
-static int hf_ns_clflags_rss = -1;
-static int hf_ns_clflags_dfd = -1;
-static int hf_ns_clflags_fr = -1;
-static int hf_ns_clflags_fp = -1;
-
-static int hf_ns_activity = -1;
-static int hf_ns_activity_perf_collection = -1;
-static int hf_ns_activity_pcb_zombie  = -1;
-static int hf_ns_activity_natpcb_zombie  = -1;
-static int hf_ns_activity_lbstats_sync  = -1;
-static int hf_ns_activity_stats_req  = -1;
-
-static int hf_ns_capflags           = -1;
-static int hf_ns_capflags_dbg       = -1;
-static int hf_ns_capflags_int       = -1;
-static int hf_ns_capflags_skipnwhdr = -1;
-
-static int hf_ns_tcpdbg          = -1;
-static int hf_ns_tcpdbg_cwnd     = -1;
-static int hf_ns_tcpdbg_rtrtt    = -1;
-static int hf_ns_tcpdbg_tsrecent = -1;
-static int hf_ns_tcpdbg_httpabort = -1;
-
-static int hf_ns_tcpdbg2             = -1;
-static int hf_ns_tcpdbg2_sndCwnd     = -1;
-static int hf_ns_tcpdbg2_ssthresh    = -1;
-static int hf_ns_tcpdbg2_sndbuf      = -1;
-static int hf_ns_tcpdbg2_max_rcvbuf  = -1;
-static int hf_ns_tcpdbg2_bw_estimate = -1;
-static int hf_ns_tcpdbg2_rtt         = -1;
-static int hf_ns_tcpdbg2_tcpos_pktcnt = -1;
-static int hf_ns_tcpdbg2_ts_recent = -1;
-static int hf_ns_tcpdbg2_tcp_cfgsndbuf = -1;
-static int hf_ns_tcpdbg2_tcp_flvr    = -1;
-static int hf_ns_trcdbg = -1;
-static int hf_ns_trcdbg_val1 = -1;
-static int hf_ns_trcdbg_val1_PRR = -1;
-static int hf_ns_trcdbg_val1_NILE = -1;
-static int hf_ns_trcdbg_val1_RTT = -1;
-static int hf_ns_trcdbg_val1_BURST = -1;
-static int hf_ns_trcdbg_val2 = -1;
-static int hf_ns_trcdbg_val2_PRR = -1;
-static int hf_ns_trcdbg_val2_NILE = -1;
-static int hf_ns_trcdbg_val2_RTT = -1;
-static int hf_ns_trcdbg_val3 = -1;
-static int hf_ns_trcdbg_val3_PRR = -1;
-static int hf_ns_trcdbg_val3_NILE = -1;
-static int hf_ns_trcdbg_val3_RTT = -1;
-static int hf_ns_trcdbg_val4 = -1;
-static int hf_ns_trcdbg_val4_PRR = -1;
-static int hf_ns_trcdbg_val4_NILE = -1;
-static int hf_ns_trcdbg_val4_RTT = -1;
-static int hf_ns_trcdbg_val5 = -1;
-static int hf_ns_trcdbg_val5_DRB_APP = -1;
-static int hf_ns_trcdbg_val5_NILE = -1;
-static int hf_ns_trcdbg_val5_RTT = -1;
-static int hf_ns_trcdbg_val6 = -1;
-static int hf_ns_trcdbg_val6_DRB_APP = -1;
-static int hf_ns_trcdbg_val6_NILE = -1;
-static int hf_ns_trcdbg_val6_RTT = -1;
-static int hf_ns_trcdbg_val7 = -1;
-static int hf_ns_trcdbg_val7_DRB = -1;
-static int hf_ns_trcdbg_val7_NILE = -1;
-static int hf_ns_trcdbg_val7_DRB_APP = -1;
-static int hf_ns_trcdbg_val8 = -1;
-static int hf_ns_trcdbg_val8_DRB = -1;
-static int hf_ns_trcdbg_val8_NILE = -1;
-static int hf_ns_trcdbg_val8_DRB_APP = -1;
-static int hf_ns_trcdbg_val9 = -1;
-static int hf_ns_trcdbg_val9_DRB = -1;
-static int hf_ns_trcdbg_val9_NILE = -1;
-static int hf_ns_trcdbg_val10 = -1;
-static int hf_ns_trcdbg_val10_DRB = -1;
-static int hf_ns_trcdbg_val10_NILE = -1;
-static int hf_ns_trcdbg_val11 = -1;
-static int hf_ns_trcdbg_val11_RTT = -1;
-static int hf_ns_trcdbg_val11_DRB = -1;
-static int hf_ns_trcdbg_val11_DRB_APP = -1;
-static int hf_ns_trcdbg_val11_NILE = -1;
-static int hf_ns_trcdbg_val11_BURST = -1;
-static int hf_ns_trcdbg_val12 = -1;
-static int hf_ns_trcdbg_val12_NILE = -1;
-static int hf_ns_trcdbg_val12_RTT = -1;
-static int hf_ns_trcdbg_val13 = -1;
-static int hf_ns_trcdbg_val13_DRB = -1;
-static int hf_ns_trcdbg_val13_NILE = -1;
-static int hf_ns_trcdbg_val14 = -1;
-static int hf_ns_trcdbg_val14_NILE = -1;
-static int hf_ns_trcdbg_val15 = -1;
-static int hf_ns_httpInfo = -1;
-static int hf_ns_httpInfo_httpabort = -1;
-
-static int hf_ns_tcpcc = -1;
-static int hf_ns_tcpcc_last_max_cwnd = -1;
-static int hf_ns_tcpcc_loss_cwnd = -1;
-static int hf_ns_tcpcc_last_time = -1;
-static int hf_ns_tcpcc_last_cwnd = -1;
-static int hf_ns_tcpcc_delay_min = -1;
-static int hf_ns_tcpcc_ack_cnt = -1;
-static int hf_ns_tcpcc_last_ack = -1;
-static int hf_ns_tcpcc_round_start = -1;
-static int hf_ns_tcpcc_end_seq = -1;
-static int hf_ns_tcpcc_curr_rtt = -1;
-static int hf_ns_tcpcc_rtt_min = -1;
-static int hf_ns_tcpcc_alpha = -1;
-static int hf_ns_tcpcc_beta_val = -1;
-static int hf_ns_tcpcc_rtt_low = -1;
-static int hf_ns_tcpcc_rtt_above = -1;
-static int hf_ns_tcpcc_max_rtt = -1;
-static int hf_ns_tcpcc_base_rtt = -1;
-static int hf_ns_unknownrec = -1;
-static int hf_ns_unknowndata = -1;
-
-static int hf_ns_inforec = -1;
-static int hf_ns_inforec_info = -1;
-
-static int hf_ns_sslrec = -1;
-static int hf_ns_sslrec_seq = -1;
-
-static int hf_ns_mptcprec = -1;
-static int hf_ns_mptcprec_subflowid  = -1;
-
-static int hf_ns_vmnamerec           = -1;
-static int hf_ns_vmnamerec_srcvmname = -1;
-static int hf_ns_vmnamerec_dstvmname = -1;
-
-static int hf_ns_clusterrec = -1;
-static int hf_ns_clu_snode = -1;
-static int hf_ns_clu_dnode = -1;
-static int hf_ns_clu_clflags = -1;
-static int hf_ns_clu_clflags_res = -1;
-static int hf_ns_clu_clflags_rssh = -1;
-static int hf_ns_clu_clflags_rss = -1;
-static int hf_ns_clu_clflags_dfd = -1;
-static int hf_ns_clu_clflags_fr = -1;
-static int hf_ns_clu_clflags_fp = -1;
-
-static gint ett_ns = -1;
-static gint ett_ns_flags = -1;
-static gint ett_ns_activity_flags = -1;
-static gint ett_ns_tcpdebug = -1;
-static gint ett_ns_tcpdebug2 = -1;
-static gint ett_ns_trcdbg = -1;
-static gint ett_ns_httpInfo = -1;
-static gint ett_ns_tcpcc = -1;
-static gint ett_ns_inforec  = -1;
-static gint ett_ns_sslrec  = -1;
-static gint ett_ns_mptcprec  = -1;
-static gint ett_ns_vmnamerec  = -1;
-static gint ett_ns_clusterrec  = -1;
-static gint ett_ns_clu_clflags  = -1;
-static gint ett_ns_unknownrec = -1;
-static gint ett_ns_capflags = -1;
-
-static int hf_ns_snd_cwnd = -1;
-static int hf_ns_realtime_rtt = -1;
-static int hf_ns_ts_recent = -1;
-static int hf_ns_http_abort_tracking_reason = -1;
+static int proto_nstrace;
+
+static int hf_ns_nicno;
+static int hf_ns_src_vm;
+static int hf_ns_dst_vm;
+static int hf_ns_dir;
+static int hf_ns_pcbdevno;
+static int hf_ns_l_pcbdevno;
+static int hf_ns_devno;
+static int hf_ns_vlantag;
+static int hf_ns_coreid;
+
+static int hf_ns_errorcode;
+static int hf_ns_app;
+
+static int hf_ns_snode;
+static int hf_ns_dnode;
+static int hf_ns_clflags;
+static int hf_ns_clflags_res;
+static int hf_ns_clflags_rssh;
+static int hf_ns_clflags_rss;
+static int hf_ns_clflags_dfd;
+static int hf_ns_clflags_fr;
+static int hf_ns_clflags_fp;
+
+static int hf_ns_activity;
+static int hf_ns_activity_perf_collection;
+static int hf_ns_activity_pcb_zombie;
+static int hf_ns_activity_natpcb_zombie;
+static int hf_ns_activity_lbstats_sync;
+static int hf_ns_activity_stats_req;
+
+static int hf_ns_capflags;
+static int hf_ns_capflags_dbg;
+static int hf_ns_capflags_int;
+static int hf_ns_capflags_skipnwhdr;
+
+static int hf_ns_tcpdbg;
+static int hf_ns_tcpdbg_cwnd;
+static int hf_ns_tcpdbg_rtrtt;
+static int hf_ns_tcpdbg_tsrecent;
+static int hf_ns_tcpdbg_httpabort;
+
+static int hf_ns_tcpdbg2;
+static int hf_ns_tcpdbg2_sndCwnd;
+static int hf_ns_tcpdbg2_ssthresh;
+static int hf_ns_tcpdbg2_sndbuf;
+static int hf_ns_tcpdbg2_max_rcvbuf;
+static int hf_ns_tcpdbg2_bw_estimate;
+static int hf_ns_tcpdbg2_rtt;
+static int hf_ns_tcpdbg2_tcpos_pktcnt;
+static int hf_ns_tcpdbg2_ts_recent;
+static int hf_ns_tcpdbg2_tcp_cfgsndbuf;
+static int hf_ns_tcpdbg2_tcp_flvr;
+static int hf_ns_trcdbg;
+static int hf_ns_trcdbg_val1;
+static int hf_ns_trcdbg_val1_PRR;
+static int hf_ns_trcdbg_val1_NILE;
+static int hf_ns_trcdbg_val1_RTT;
+static int hf_ns_trcdbg_val1_BURST;
+static int hf_ns_trcdbg_val2;
+static int hf_ns_trcdbg_val2_PRR;
+static int hf_ns_trcdbg_val2_NILE;
+static int hf_ns_trcdbg_val2_RTT;
+static int hf_ns_trcdbg_val3;
+static int hf_ns_trcdbg_val3_PRR;
+static int hf_ns_trcdbg_val3_NILE;
+static int hf_ns_trcdbg_val3_RTT;
+static int hf_ns_trcdbg_val4;
+static int hf_ns_trcdbg_val4_PRR;
+static int hf_ns_trcdbg_val4_NILE;
+static int hf_ns_trcdbg_val4_RTT;
+static int hf_ns_trcdbg_val5;
+static int hf_ns_trcdbg_val5_DRB_APP;
+static int hf_ns_trcdbg_val5_NILE;
+static int hf_ns_trcdbg_val5_RTT;
+static int hf_ns_trcdbg_val6;
+static int hf_ns_trcdbg_val6_DRB_APP;
+static int hf_ns_trcdbg_val6_NILE;
+static int hf_ns_trcdbg_val6_RTT;
+static int hf_ns_trcdbg_val7;
+static int hf_ns_trcdbg_val7_DRB;
+static int hf_ns_trcdbg_val7_NILE;
+static int hf_ns_trcdbg_val7_DRB_APP;
+static int hf_ns_trcdbg_val8;
+static int hf_ns_trcdbg_val8_DRB;
+static int hf_ns_trcdbg_val8_NILE;
+static int hf_ns_trcdbg_val8_DRB_APP;
+static int hf_ns_trcdbg_val9;
+static int hf_ns_trcdbg_val9_DRB;
+static int hf_ns_trcdbg_val9_NILE;
+static int hf_ns_trcdbg_val10;
+static int hf_ns_trcdbg_val10_DRB;
+static int hf_ns_trcdbg_val10_NILE;
+static int hf_ns_trcdbg_val11;
+static int hf_ns_trcdbg_val11_RTT;
+static int hf_ns_trcdbg_val11_DRB;
+static int hf_ns_trcdbg_val11_DRB_APP;
+static int hf_ns_trcdbg_val11_NILE;
+static int hf_ns_trcdbg_val11_BURST;
+static int hf_ns_trcdbg_val12;
+static int hf_ns_trcdbg_val12_NILE;
+static int hf_ns_trcdbg_val12_RTT;
+static int hf_ns_trcdbg_val13;
+static int hf_ns_trcdbg_val13_DRB;
+static int hf_ns_trcdbg_val13_NILE;
+static int hf_ns_trcdbg_val14;
+static int hf_ns_trcdbg_val14_NILE;
+static int hf_ns_trcdbg_val15;
+static int hf_ns_httpInfo;
+static int hf_ns_httpInfo_httpabort;
+
+static int hf_ns_tcpcc;
+static int hf_ns_tcpcc_last_max_cwnd;
+static int hf_ns_tcpcc_loss_cwnd;
+static int hf_ns_tcpcc_last_time;
+static int hf_ns_tcpcc_last_cwnd;
+static int hf_ns_tcpcc_delay_min;
+static int hf_ns_tcpcc_ack_cnt;
+static int hf_ns_tcpcc_last_ack;
+static int hf_ns_tcpcc_round_start;
+static int hf_ns_tcpcc_end_seq;
+static int hf_ns_tcpcc_curr_rtt;
+static int hf_ns_tcpcc_rtt_min;
+static int hf_ns_tcpcc_alpha;
+static int hf_ns_tcpcc_beta_val;
+static int hf_ns_tcpcc_rtt_low;
+static int hf_ns_tcpcc_rtt_above;
+static int hf_ns_tcpcc_max_rtt;
+static int hf_ns_tcpcc_base_rtt;
+static int hf_ns_unknownrec;
+static int hf_ns_unknowndata;
+
+static int hf_ns_inforec;
+static int hf_ns_inforec_info;
+
+static int hf_ns_sslrec;
+static int hf_ns_sslrec_seq;
+
+static int hf_ns_mptcprec;
+static int hf_ns_mptcprec_subflowid;
+
+static int hf_ns_vmnamerec;
+static int hf_ns_vmnamerec_srcvmname;
+static int hf_ns_vmnamerec_dstvmname;
+
+static int hf_ns_clusterrec;
+static int hf_ns_clu_snode;
+static int hf_ns_clu_dnode;
+static int hf_ns_clu_clflags;
+static int hf_ns_clu_clflags_res;
+static int hf_ns_clu_clflags_rssh;
+static int hf_ns_clu_clflags_rss;
+static int hf_ns_clu_clflags_dfd;
+static int hf_ns_clu_clflags_fr;
+static int hf_ns_clu_clflags_fp;
+
+static gint ett_ns;
+static gint ett_ns_flags;
+static gint ett_ns_activity_flags;
+static gint ett_ns_tcpdebug;
+static gint ett_ns_tcpdebug2;
+static gint ett_ns_trcdbg;
+static gint ett_ns_httpInfo;
+static gint ett_ns_tcpcc;
+static gint ett_ns_inforec;
+static gint ett_ns_sslrec;
+static gint ett_ns_mptcprec;
+static gint ett_ns_vmnamerec;
+static gint ett_ns_clusterrec;
+static gint ett_ns_clu_clflags;
+static gint ett_ns_unknownrec;
+static gint ett_ns_capflags;
+
+static int hf_ns_snd_cwnd;
+static int hf_ns_realtime_rtt;
+static int hf_ns_ts_recent;
+static int hf_ns_http_abort_tracking_reason;
 
 static const value_string ns_errorcode_vals[] = {
   { ERR_NONE,  "No Error" },
diff --git a/epan/dissectors/packet-nt-oui.c b/epan/dissectors/packet-nt-oui.c
index c65d838851..8397c93d9b 100644
--- a/epan/dissectors/packet-nt-oui.c
+++ b/epan/dissectors/packet-nt-oui.c
@@ -16,7 +16,7 @@
 
 void proto_register_nortel_oui(void);
 
-static int hf_llc_nortel_pid = -1;
+static int hf_llc_nortel_pid;
 
 static const value_string nortel_pid_vals[] = {
 	{ 0x01a1,	"NDP flatnet hello" },
diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c
index acf0a887ab..904d0884cc 100644
--- a/epan/dissectors/packet-nt-tpcp.c
+++ b/epan/dissectors/packet-nt-tpcp.c
@@ -68,25 +68,25 @@ static const value_string type_vals[] = {
 #define TPCP_VER_2_LENGTH 28
 
 /* things we can do filters on */
-static int hf_tpcp_version = -1;
-static int hf_tpcp_type = -1;
-static int hf_tpcp_flags = -1;
-static int hf_tpcp_flags_tcp = -1;
-static int hf_tpcp_flags_redir = -1;
-static int hf_tpcp_flags_xon = -1;
-static int hf_tpcp_flags_xoff = -1;
-static int hf_tpcp_id = -1;
-static int hf_tpcp_cport = -1;
-static int hf_tpcp_caddr = -1;
-static int hf_tpcp_saddr = -1;
-static int hf_tpcp_vaddr = -1;
-static int hf_tpcp_rasaddr = -1;
-static int hf_tpcp_signature = -1;
-
-static int proto_tpcp = -1;
-
-static gint ett_tpcp = -1;
-static gint ett_tpcp_flags = -1;
+static int hf_tpcp_version;
+static int hf_tpcp_type;
+static int hf_tpcp_flags;
+static int hf_tpcp_flags_tcp;
+static int hf_tpcp_flags_redir;
+static int hf_tpcp_flags_xon;
+static int hf_tpcp_flags_xoff;
+static int hf_tpcp_id;
+static int hf_tpcp_cport;
+static int hf_tpcp_caddr;
+static int hf_tpcp_saddr;
+static int hf_tpcp_vaddr;
+static int hf_tpcp_rasaddr;
+static int hf_tpcp_signature;
+
+static int proto_tpcp;
+
+static gint ett_tpcp;
+static gint ett_tpcp_flags;
 
 
 static int
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c
index 85ec0e9aa4..a5f91288e6 100644
--- a/epan/dissectors/packet-ntlmssp.c
+++ b/epan/dissectors/packet-ntlmssp.c
@@ -132,158 +132,158 @@ static GHashTable* hash_packet = NULL;
 #define NTLMSSP_NEGOTIATE_KEY_EXCH                 0x40000000 // V
 #define NTLMSSP_NEGOTIATE_56                       0x80000000 // W
 
-static int proto_ntlmssp = -1;
-static int hf_ntlmssp_auth = -1;
-static int hf_ntlmssp_message_type = -1;
-static int hf_ntlmssp_negotiate_flags = -1;
-static int hf_ntlmssp_negotiate_flags_01 = -1;
-static int hf_ntlmssp_negotiate_flags_02 = -1;
-static int hf_ntlmssp_negotiate_flags_04 = -1;
-static int hf_ntlmssp_negotiate_flags_08 = -1;
-static int hf_ntlmssp_negotiate_flags_10 = -1;
-static int hf_ntlmssp_negotiate_flags_20 = -1;
-static int hf_ntlmssp_negotiate_flags_40 = -1;
-static int hf_ntlmssp_negotiate_flags_80 = -1;
-static int hf_ntlmssp_negotiate_flags_100 = -1;
-static int hf_ntlmssp_negotiate_flags_200 = -1;
-static int hf_ntlmssp_negotiate_flags_400 = -1;
-static int hf_ntlmssp_negotiate_flags_800 = -1;
-static int hf_ntlmssp_negotiate_flags_1000 = -1;
-static int hf_ntlmssp_negotiate_flags_2000 = -1;
-static int hf_ntlmssp_negotiate_flags_4000 = -1;
-static int hf_ntlmssp_negotiate_flags_8000 = -1;
-static int hf_ntlmssp_negotiate_flags_10000 = -1;
-static int hf_ntlmssp_negotiate_flags_20000 = -1;
-static int hf_ntlmssp_negotiate_flags_40000 = -1;
-static int hf_ntlmssp_negotiate_flags_80000 = -1;
-static int hf_ntlmssp_negotiate_flags_100000 = -1;
-static int hf_ntlmssp_negotiate_flags_200000 = -1;
-static int hf_ntlmssp_negotiate_flags_400000 = -1;
-static int hf_ntlmssp_negotiate_flags_800000 = -1;
-static int hf_ntlmssp_negotiate_flags_1000000 = -1;
-static int hf_ntlmssp_negotiate_flags_2000000 = -1;
-static int hf_ntlmssp_negotiate_flags_4000000 = -1;
-static int hf_ntlmssp_negotiate_flags_8000000 = -1;
-static int hf_ntlmssp_negotiate_flags_10000000 = -1;
-static int hf_ntlmssp_negotiate_flags_20000000 = -1;
-static int hf_ntlmssp_negotiate_flags_40000000 = -1;
-static int hf_ntlmssp_negotiate_flags_80000000 = -1;
-/* static int hf_ntlmssp_negotiate_workstation_strlen = -1; */
-/* static int hf_ntlmssp_negotiate_workstation_maxlen = -1; */
-/* static int hf_ntlmssp_negotiate_workstation_buffer = -1; */
-static int hf_ntlmssp_negotiate_workstation = -1;
-/* static int hf_ntlmssp_negotiate_domain_strlen = -1; */
-/* static int hf_ntlmssp_negotiate_domain_maxlen = -1; */
-/* static int hf_ntlmssp_negotiate_domain_buffer = -1; */
-static int hf_ntlmssp_negotiate_domain = -1;
-static int hf_ntlmssp_ntlm_server_challenge = -1;
-static int hf_ntlmssp_ntlm_client_challenge = -1;
-static int hf_ntlmssp_reserved = -1;
-static int hf_ntlmssp_challenge_target_name = -1;
-static int hf_ntlmssp_auth_username = -1;
-static int hf_ntlmssp_auth_domain = -1;
-static int hf_ntlmssp_auth_hostname = -1;
-static int hf_ntlmssp_auth_lmresponse = -1;
-static int hf_ntlmssp_auth_ntresponse = -1;
-static int hf_ntlmssp_auth_sesskey = -1;
-static int hf_ntlmssp_string_len = -1;
-static int hf_ntlmssp_string_maxlen = -1;
-static int hf_ntlmssp_string_offset = -1;
-static int hf_ntlmssp_blob_len = -1;
-static int hf_ntlmssp_blob_maxlen = -1;
-static int hf_ntlmssp_blob_offset = -1;
-static int hf_ntlmssp_version = -1;
-static int hf_ntlmssp_version_major = -1;
-static int hf_ntlmssp_version_minor = -1;
-static int hf_ntlmssp_version_build_number = -1;
-static int hf_ntlmssp_version_ntlm_current_revision = -1;
-
-static int hf_ntlmssp_challenge_target_info = -1;
-static int hf_ntlmssp_challenge_target_info_len = -1;
-static int hf_ntlmssp_challenge_target_info_maxlen = -1;
-static int hf_ntlmssp_challenge_target_info_offset = -1;
-
-static int hf_ntlmssp_challenge_target_info_item_type = -1;
-static int hf_ntlmssp_challenge_target_info_item_len = -1;
-
-static int hf_ntlmssp_challenge_target_info_end = -1;
-static int hf_ntlmssp_challenge_target_info_nb_computer_name = -1;
-static int hf_ntlmssp_challenge_target_info_nb_domain_name = -1;
-static int hf_ntlmssp_challenge_target_info_dns_computer_name = -1;
-static int hf_ntlmssp_challenge_target_info_dns_domain_name = -1;
-static int hf_ntlmssp_challenge_target_info_dns_tree_name = -1;
-static int hf_ntlmssp_challenge_target_info_flags = -1;
-static int hf_ntlmssp_challenge_target_info_timestamp = -1;
-static int hf_ntlmssp_challenge_target_info_restrictions = -1;
-static int hf_ntlmssp_challenge_target_info_target_name =-1;
-static int hf_ntlmssp_challenge_target_info_channel_bindings =-1;
-
-static int hf_ntlmssp_ntlmv2_response_item_type = -1;
-static int hf_ntlmssp_ntlmv2_response_item_len = -1;
-
-static int hf_ntlmssp_ntlmv2_response_end = -1;
-static int hf_ntlmssp_ntlmv2_response_nb_computer_name = -1;
-static int hf_ntlmssp_ntlmv2_response_nb_domain_name = -1;
-static int hf_ntlmssp_ntlmv2_response_dns_computer_name = -1;
-static int hf_ntlmssp_ntlmv2_response_dns_domain_name = -1;
-static int hf_ntlmssp_ntlmv2_response_dns_tree_name = -1;
-static int hf_ntlmssp_ntlmv2_response_flags = -1;
-static int hf_ntlmssp_ntlmv2_response_timestamp = -1;
-static int hf_ntlmssp_ntlmv2_response_restrictions = -1;
-static int hf_ntlmssp_ntlmv2_response_target_name =-1;
-static int hf_ntlmssp_ntlmv2_response_channel_bindings =-1;
-
-static int hf_ntlmssp_message_integrity_code = -1;
-static int hf_ntlmssp_verf = -1;
-static int hf_ntlmssp_verf_vers = -1;
-static int hf_ntlmssp_verf_body = -1;
-static int hf_ntlmssp_verf_randompad = -1;
-static int hf_ntlmssp_verf_hmacmd5 = -1;
-static int hf_ntlmssp_verf_crc32 = -1;
-static int hf_ntlmssp_verf_sequence = -1;
-/* static int hf_ntlmssp_decrypted_payload = -1; */
-
-static int hf_ntlmssp_ntlmv2_response = -1;
-static int hf_ntlmssp_ntlmv2_response_ntproofstr = -1;
-static int hf_ntlmssp_ntlmv2_response_rversion = -1;
-static int hf_ntlmssp_ntlmv2_response_hirversion = -1;
-static int hf_ntlmssp_ntlmv2_response_z = -1;
-static int hf_ntlmssp_ntlmv2_response_pad = -1;
-static int hf_ntlmssp_ntlmv2_response_time = -1;
-static int hf_ntlmssp_ntlmv2_response_chal = -1;
-
-static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL = -1;
-static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_Version = -1;
-static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_Flags = -1;
-static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_FLAG_LM_PRESENT = -1;
-static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_FLAG_NT_PRESENT = -1;
-static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_FLAG_REMOVED = -1;
-static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_FLAG_CREDKEY_PRESENT = -1;
-static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_FLAG_SHA_PRESENT = -1;
-static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_CredentialKey = -1;
-static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_CredentialKeyType = -1;
-static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_EncryptedCredsSize = -1;
-static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_EncryptedCreds = -1;
-
-static gint ett_ntlmssp = -1;
-static gint ett_ntlmssp_negotiate_flags = -1;
-static gint ett_ntlmssp_string = -1;
-static gint ett_ntlmssp_blob = -1;
-static gint ett_ntlmssp_version = -1;
-static gint ett_ntlmssp_challenge_target_info = -1;
-static gint ett_ntlmssp_challenge_target_info_item = -1;
-static gint ett_ntlmssp_ntlmv2_response = -1;
-static gint ett_ntlmssp_ntlmv2_response_item = -1;
-static gint ett_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL = -1;
-
-static expert_field ei_ntlmssp_v2_key_too_long = EI_INIT;
-static expert_field ei_ntlmssp_blob_len_too_long = EI_INIT;
-static expert_field ei_ntlmssp_target_info_attr = EI_INIT;
-static expert_field ei_ntlmssp_target_info_invalid = EI_INIT;
-static expert_field ei_ntlmssp_message_type = EI_INIT;
-static expert_field ei_ntlmssp_auth_nthash = EI_INIT;
-static expert_field ei_ntlmssp_sessionbasekey = EI_INIT;
-static expert_field ei_ntlmssp_sessionkey = EI_INIT;
+static int proto_ntlmssp;
+static int hf_ntlmssp_auth;
+static int hf_ntlmssp_message_type;
+static int hf_ntlmssp_negotiate_flags;
+static int hf_ntlmssp_negotiate_flags_01;
+static int hf_ntlmssp_negotiate_flags_02;
+static int hf_ntlmssp_negotiate_flags_04;
+static int hf_ntlmssp_negotiate_flags_08;
+static int hf_ntlmssp_negotiate_flags_10;
+static int hf_ntlmssp_negotiate_flags_20;
+static int hf_ntlmssp_negotiate_flags_40;
+static int hf_ntlmssp_negotiate_flags_80;
+static int hf_ntlmssp_negotiate_flags_100;
+static int hf_ntlmssp_negotiate_flags_200;
+static int hf_ntlmssp_negotiate_flags_400;
+static int hf_ntlmssp_negotiate_flags_800;
+static int hf_ntlmssp_negotiate_flags_1000;
+static int hf_ntlmssp_negotiate_flags_2000;
+static int hf_ntlmssp_negotiate_flags_4000;
+static int hf_ntlmssp_negotiate_flags_8000;
+static int hf_ntlmssp_negotiate_flags_10000;
+static int hf_ntlmssp_negotiate_flags_20000;
+static int hf_ntlmssp_negotiate_flags_40000;
+static int hf_ntlmssp_negotiate_flags_80000;
+static int hf_ntlmssp_negotiate_flags_100000;
+static int hf_ntlmssp_negotiate_flags_200000;
+static int hf_ntlmssp_negotiate_flags_400000;
+static int hf_ntlmssp_negotiate_flags_800000;
+static int hf_ntlmssp_negotiate_flags_1000000;
+static int hf_ntlmssp_negotiate_flags_2000000;
+static int hf_ntlmssp_negotiate_flags_4000000;
+static int hf_ntlmssp_negotiate_flags_8000000;
+static int hf_ntlmssp_negotiate_flags_10000000;
+static int hf_ntlmssp_negotiate_flags_20000000;
+static int hf_ntlmssp_negotiate_flags_40000000;
+static int hf_ntlmssp_negotiate_flags_80000000;
+/* static int hf_ntlmssp_negotiate_workstation_strlen; */
+/* static int hf_ntlmssp_negotiate_workstation_maxlen; */
+/* static int hf_ntlmssp_negotiate_workstation_buffer; */
+static int hf_ntlmssp_negotiate_workstation;
+/* static int hf_ntlmssp_negotiate_domain_strlen; */
+/* static int hf_ntlmssp_negotiate_domain_maxlen; */
+/* static int hf_ntlmssp_negotiate_domain_buffer; */
+static int hf_ntlmssp_negotiate_domain;
+static int hf_ntlmssp_ntlm_server_challenge;
+static int hf_ntlmssp_ntlm_client_challenge;
+static int hf_ntlmssp_reserved;
+static int hf_ntlmssp_challenge_target_name;
+static int hf_ntlmssp_auth_username;
+static int hf_ntlmssp_auth_domain;
+static int hf_ntlmssp_auth_hostname;
+static int hf_ntlmssp_auth_lmresponse;
+static int hf_ntlmssp_auth_ntresponse;
+static int hf_ntlmssp_auth_sesskey;
+static int hf_ntlmssp_string_len;
+static int hf_ntlmssp_string_maxlen;
+static int hf_ntlmssp_string_offset;
+static int hf_ntlmssp_blob_len;
+static int hf_ntlmssp_blob_maxlen;
+static int hf_ntlmssp_blob_offset;
+static int hf_ntlmssp_version;
+static int hf_ntlmssp_version_major;
+static int hf_ntlmssp_version_minor;
+static int hf_ntlmssp_version_build_number;
+static int hf_ntlmssp_version_ntlm_current_revision;
+
+static int hf_ntlmssp_challenge_target_info;
+static int hf_ntlmssp_challenge_target_info_len;
+static int hf_ntlmssp_challenge_target_info_maxlen;
+static int hf_ntlmssp_challenge_target_info_offset;
+
+static int hf_ntlmssp_challenge_target_info_item_type;
+static int hf_ntlmssp_challenge_target_info_item_len;
+
+static int hf_ntlmssp_challenge_target_info_end;
+static int hf_ntlmssp_challenge_target_info_nb_computer_name;
+static int hf_ntlmssp_challenge_target_info_nb_domain_name;
+static int hf_ntlmssp_challenge_target_info_dns_computer_name;
+static int hf_ntlmssp_challenge_target_info_dns_domain_name;
+static int hf_ntlmssp_challenge_target_info_dns_tree_name;
+static int hf_ntlmssp_challenge_target_info_flags;
+static int hf_ntlmssp_challenge_target_info_timestamp;
+static int hf_ntlmssp_challenge_target_info_restrictions;
+static int hf_ntlmssp_challenge_target_info_target_name;
+static int hf_ntlmssp_challenge_target_info_channel_bindings;
+
+static int hf_ntlmssp_ntlmv2_response_item_type;
+static int hf_ntlmssp_ntlmv2_response_item_len;
+
+static int hf_ntlmssp_ntlmv2_response_end;
+static int hf_ntlmssp_ntlmv2_response_nb_computer_name;
+static int hf_ntlmssp_ntlmv2_response_nb_domain_name;
+static int hf_ntlmssp_ntlmv2_response_dns_computer_name;
+static int hf_ntlmssp_ntlmv2_response_dns_domain_name;
+static int hf_ntlmssp_ntlmv2_response_dns_tree_name;
+static int hf_ntlmssp_ntlmv2_response_flags;
+static int hf_ntlmssp_ntlmv2_response_timestamp;
+static int hf_ntlmssp_ntlmv2_response_restrictions;
+static int hf_ntlmssp_ntlmv2_response_target_name;
+static int hf_ntlmssp_ntlmv2_response_channel_bindings;
+
+static int hf_ntlmssp_message_integrity_code;
+static int hf_ntlmssp_verf;
+static int hf_ntlmssp_verf_vers;
+static int hf_ntlmssp_verf_body;
+static int hf_ntlmssp_verf_randompad;
+static int hf_ntlmssp_verf_hmacmd5;
+static int hf_ntlmssp_verf_crc32;
+static int hf_ntlmssp_verf_sequence;
+/* static int hf_ntlmssp_decrypted_payload; */
+
+static int hf_ntlmssp_ntlmv2_response;
+static int hf_ntlmssp_ntlmv2_response_ntproofstr;
+static int hf_ntlmssp_ntlmv2_response_rversion;
+static int hf_ntlmssp_ntlmv2_response_hirversion;
+static int hf_ntlmssp_ntlmv2_response_z;
+static int hf_ntlmssp_ntlmv2_response_pad;
+static int hf_ntlmssp_ntlmv2_response_time;
+static int hf_ntlmssp_ntlmv2_response_chal;
+
+static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL;
+static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_Version;
+static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_Flags;
+static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_FLAG_LM_PRESENT;
+static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_FLAG_NT_PRESENT;
+static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_FLAG_REMOVED;
+static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_FLAG_CREDKEY_PRESENT;
+static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_FLAG_SHA_PRESENT;
+static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_CredentialKey;
+static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_CredentialKeyType;
+static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_EncryptedCredsSize;
+static int hf_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL_EncryptedCreds;
+
+static gint ett_ntlmssp;
+static gint ett_ntlmssp_negotiate_flags;
+static gint ett_ntlmssp_string;
+static gint ett_ntlmssp_blob;
+static gint ett_ntlmssp_version;
+static gint ett_ntlmssp_challenge_target_info;
+static gint ett_ntlmssp_challenge_target_info_item;
+static gint ett_ntlmssp_ntlmv2_response;
+static gint ett_ntlmssp_ntlmv2_response_item;
+static gint ett_ntlmssp_NTLM_REMOTE_SUPPLEMENTAL_CREDENTIAL;
+
+static expert_field ei_ntlmssp_v2_key_too_long;
+static expert_field ei_ntlmssp_blob_len_too_long;
+static expert_field ei_ntlmssp_target_info_attr;
+static expert_field ei_ntlmssp_target_info_invalid;
+static expert_field ei_ntlmssp_message_type;
+static expert_field ei_ntlmssp_auth_nthash;
+static expert_field ei_ntlmssp_sessionbasekey;
+static expert_field ei_ntlmssp_sessionkey;
 
 static dissector_handle_t ntlmssp_handle, ntlmssp_wrap_handle;
 
diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c
index 2b1be72f85..2ac236e32c 100644
--- a/epan/dissectors/packet-ntp.c
+++ b/epan/dissectors/packet-ntp.c
@@ -637,322 +637,322 @@ typedef struct {
 } ntp_conv_info_t;
 
 
-static int proto_ntp = -1;
-
-static int hf_ntp_flags = -1;
-static int hf_ntp_flags_li = -1;
-static int hf_ntp_flags_vn = -1;
-static int hf_ntp_flags_mode = -1;
-static int hf_ntp_stratum = -1;
-static int hf_ntp_ppoll = -1;
-static int hf_ntp_precision = -1;
-static int hf_ntp_rootdelay = -1;
-static int hf_ntp_rootdispersion = -1;
-static int hf_ntp_refid = -1;
-static int hf_ntp_reftime = -1;
-static int hf_ntp_org = -1;
-static int hf_ntp_rec = -1;
-static int hf_ntp_xmt = -1;
-static int hf_ntp_keyid = -1;
-static int hf_ntp_mac = -1;
-static int hf_ntp_padding = -1;
-static int hf_ntp_key_type = -1;
-static int hf_ntp_key_index = -1;
-static int hf_ntp_key_signature = -1;
-static int hf_ntp_response_in = -1;
-static int hf_ntp_request_in = -1;
-static int hf_ntp_delta_time = -1;
-
-static int hf_ntp_ext = -1;
-static int hf_ntp_ext_type = -1;
-static int hf_ntp_ext_length = -1;
-static int hf_ntp_ext_value = -1;
-
-static int hf_ntpctrl_flags2 = -1;
-static int hf_ntpctrl_flags2_r = -1;
-static int hf_ntpctrl_flags2_error = -1;
-static int hf_ntpctrl_flags2_more = -1;
-static int hf_ntpctrl_flags2_opcode = -1;
-static int hf_ntpctrl_sequence = -1;
-static int hf_ntpctrl_status = -1;
-static int hf_ntpctrl_error_status_word = -1;
-static int hf_ntpctrl_sys_status_li = -1;
-static int hf_ntpctrl_sys_status_clksrc = -1;
-static int hf_ntpctrl_sys_status_count = -1;
-static int hf_ntpctrl_sys_status_code = -1;
-static int hf_ntpctrl_peer_status_b0 = -1;
-static int hf_ntpctrl_peer_status_b1 = -1;
-static int hf_ntpctrl_peer_status_b2 = -1;
-static int hf_ntpctrl_peer_status_b3 = -1;
-static int hf_ntpctrl_peer_status_b4 = -1;
-static int hf_ntpctrl_peer_status_selection = -1;
-static int hf_ntpctrl_peer_status_count = -1;
-static int hf_ntpctrl_peer_status_code = -1;
-static int hf_ntpctrl_clk_status = -1;
-static int hf_ntpctrl_clk_status_code = -1;
-static int hf_ntpctrl_associd = -1;
-static int hf_ntpctrl_offset = -1;
-static int hf_ntpctrl_count = -1;
-static int hf_ntpctrl_data = -1;
-static int hf_ntpctrl_item = -1;
-static int hf_ntpctrl_trapmsg = -1;
-static int hf_ntpctrl_ordlist = -1;
-static int hf_ntpctrl_configuration = -1;
-static int hf_ntpctrl_mru = -1;
-static int hf_ntpctrl_nonce = -1;
-
-static int hf_ntppriv_flags_r = -1;
-static int hf_ntppriv_flags_more = -1;
-static int hf_ntppriv_auth_seq = -1;
-static int hf_ntppriv_auth = -1;
-static int hf_ntppriv_seq = -1;
-static int hf_ntppriv_impl = -1;
-static int hf_ntppriv_reqcode = -1;
-static int hf_ntppriv_errcode = -1;
-static int hf_ntppriv_numitems = -1;
-static int hf_ntppriv_mbz = -1;
-static int hf_ntppriv_mode7_item = -1;
-static int hf_ntppriv_itemsize = -1;
-static int hf_ntppriv_avgint = -1;
-static int hf_ntppriv_lsint = -1;
-static int hf_ntppriv_count = -1;
-static int hf_ntppriv_restr = -1;
-static int hf_ntppriv_addr = -1;
-static int hf_ntppriv_daddr = -1;
-static int hf_ntppriv_flags = -1;
-static int hf_ntppriv_port = -1;
-static int hf_ntppriv_mode = -1;
-static int hf_ntppriv_version = -1;
-static int hf_ntppriv_v6_flag = -1;
-static int hf_ntppriv_unused = -1;
-static int hf_ntppriv_addr6 = -1;
-static int hf_ntppriv_daddr6 = -1;
-static int hf_ntppriv_tstamp = -1;
-static int hf_ntppriv_mode7_addr = -1;
-static int hf_ntppriv_mode7_mask = -1;
-static int hf_ntppriv_mode7_bcast = -1;
-static int hf_ntppriv_mode7_port = -1;
-static int hf_ntppriv_mode7_hmode = -1;
-static int hf_ntppriv_mode7_peer_flags = -1;
-static int hf_ntppriv_mode7_v6_flag = -1;
-static int hf_ntppriv_mode7_unused = -1;
-static int hf_ntppriv_mode7_addr6 = -1;
-static int hf_ntppriv_mode7_mask6 = -1;
-static int hf_ntppriv_mode7_bcast6 = -1;
-static int hf_ntppriv_mode7_peer_flags_config = -1;
-static int hf_ntppriv_mode7_peer_flags_syspeer = -1;
-static int hf_ntppriv_mode7_peer_flags_burst = -1;
-static int hf_ntppriv_mode7_peer_flags_refclock = -1;
-static int hf_ntppriv_mode7_peer_flags_prefer = -1;
-static int hf_ntppriv_mode7_peer_flags_authenable = -1;
-static int hf_ntppriv_mode7_peer_flags_sel_candidate = -1;
-static int hf_ntppriv_mode7_peer_flags_shortlist = -1;
-static int hf_ntppriv_mode7_dstaddr = -1;
-static int hf_ntppriv_mode7_srcaddr = -1;
-static int hf_ntppriv_mode7_srcport = -1;
-static int hf_ntppriv_mode7_count = -1;
-static int hf_ntppriv_mode7_hpoll = -1;
-static int hf_ntppriv_mode7_reach = -1;
-static int hf_ntppriv_mode7_delay = -1;
-static int hf_ntppriv_mode7_offset = -1;
-static int hf_ntppriv_mode7_dispersion = -1;
-static int hf_ntppriv_mode7_dstaddr6 = -1;
-static int hf_ntppriv_mode7_srcaddr6 = -1;
-static int hf_ntppriv_mode7_leap = -1;
-static int hf_ntppriv_mode7_pmode = -1;
-static int hf_ntppriv_mode7_version = -1;
-static int hf_ntppriv_mode7_unreach = -1;
-static int hf_ntppriv_mode7_flash = -1;
-static int hf_ntppriv_mode7_ttl = -1;
-static int hf_ntppriv_mode7_flash2 = -1;
-static int hf_ntppriv_mode7_associd = -1;
-static int hf_ntppriv_mode7_pkeyid = -1;
-static int hf_ntppriv_mode7_timer = -1;
-static int hf_ntppriv_mode7_filtdelay = -1;
-static int hf_ntppriv_mode7_filtoffset = -1;
-static int hf_ntppriv_mode7_order = -1;
-static int hf_ntppriv_mode7_selectdis = -1;
-static int hf_ntppriv_mode7_estbdelay = -1;
-static int hf_ntppriv_mode7_bdelay = -1;
-static int hf_ntppriv_mode7_authdelay = -1;
-static int hf_ntppriv_mode7_stability = -1;
-static int hf_ntppriv_mode7_timeup = -1;
-static int hf_ntppriv_mode7_timereset = -1;
-static int hf_ntppriv_mode7_timereceived = -1;
-static int hf_ntppriv_mode7_timetosend = -1;
-static int hf_ntppriv_mode7_timereachable = -1;
-static int hf_ntppriv_mode7_sent = -1;
-static int hf_ntppriv_mode7_processed = -1;
-static int hf_ntppriv_mode7_badauth = -1;
-static int hf_ntppriv_mode7_bogusorg = -1;
-static int hf_ntppriv_mode7_oldpkt = -1;
-static int hf_ntppriv_mode7_seldisp = -1;
-static int hf_ntppriv_mode7_selbroken = -1;
-static int hf_ntppriv_mode7_candidate = -1;
-static int hf_ntppriv_mode7_minpoll = -1;
-static int hf_ntppriv_mode7_maxpoll = -1;
-static int hf_ntppriv_mode7_config_flags = -1;
-static int hf_ntppriv_mode7_config_flags_auth = -1;
-static int hf_ntppriv_mode7_config_flags_prefer = -1;
-static int hf_ntppriv_mode7_config_flags_burst = -1;
-static int hf_ntppriv_mode7_config_flags_iburst = -1;
-static int hf_ntppriv_mode7_config_flags_noselect = -1;
-static int hf_ntppriv_mode7_config_flags_skey = -1;
-static int hf_ntppriv_mode7_key_file = -1;
-static int hf_ntppriv_mode7_sys_flags = -1;
-static int hf_ntppriv_mode7_sys_flags8 = -1;
-static int hf_ntppriv_mode7_sys_flags_bclient = -1;
-static int hf_ntppriv_mode7_sys_flags_pps = -1;
-static int hf_ntppriv_mode7_sys_flags_ntp = -1;
-static int hf_ntppriv_mode7_sys_flags_kernel = -1;
-static int hf_ntppriv_mode7_sys_flags_monitor = -1;
-static int hf_ntppriv_mode7_sys_flags_filegen = -1;
-static int hf_ntppriv_mode7_sys_flags_auth = -1;
-static int hf_ntppriv_mode7_sys_flags_cal = -1;
-static int hf_ntppriv_mode7_reset_stats_flags = -1;
-static int hf_ntppriv_mode7_reset_stats_flags_allpeers = -1;
-static int hf_ntppriv_mode7_reset_stats_flags_io = -1;
-static int hf_ntppriv_mode7_reset_stats_flags_sys = -1;
-static int hf_ntppriv_mode7_reset_stats_flags_mem = -1;
-static int hf_ntppriv_mode7_reset_stats_flags_timer = -1;
-static int hf_ntppriv_mode7_reset_stats_flags_auth = -1;
-static int hf_ntppriv_mode7_reset_stats_flags_ctl = -1;
-static int hf_ntppriv_mode7_req = -1;
-static int hf_ntppriv_mode7_badpkts = -1;
-static int hf_ntppriv_mode7_responses = -1;
-static int hf_ntppriv_mode7_frags = -1;
-static int hf_ntppriv_mode7_errors = -1;
-static int hf_ntppriv_mode7_tooshort = -1;
-static int hf_ntppriv_mode7_inputresp = -1;
-static int hf_ntppriv_mode7_inputfrag = -1;
-static int hf_ntppriv_mode7_inputerr = -1;
-static int hf_ntppriv_mode7_badoffset = -1;
-static int hf_ntppriv_mode7_badversion = -1;
-static int hf_ntppriv_mode7_datatooshort = -1;
-static int hf_ntppriv_mode7_badop = -1;
-static int hf_ntppriv_mode7_asyncmsgs = -1;
-static int hf_ntppriv_mode7_type = -1;
-static int hf_ntppriv_mode7_clock_flags = -1;
-static int hf_ntppriv_mode7_lastevent = -1;
-static int hf_ntppriv_mode7_currentstatus = -1;
-static int hf_ntppriv_mode7_polls = -1;
-static int hf_ntppriv_mode7_noresponse = -1;
-static int hf_ntppriv_mode7_badformat = -1;
-static int hf_ntppriv_mode7_baddata = -1;
-static int hf_ntppriv_mode7_timestarted = -1;
-static int hf_ntppriv_mode7_fudgetime1 = -1;
-static int hf_ntppriv_mode7_fudgetime2 = -1;
-static int hf_ntppriv_mode7_fudgeval1 = -1;
-static int hf_ntppriv_mode7_fudgeval2 = -1;
-static int hf_ntppriv_mode7_kernel_offset = -1;
-static int hf_ntppriv_mode7_freq = -1;
-static int hf_ntppriv_mode7_maxerror = -1;
-static int hf_ntppriv_mode7_esterror = -1;
-static int hf_ntppriv_mode7_status = -1;
-static int hf_ntppriv_mode7_shift = -1;
-static int hf_ntppriv_mode7_constant = -1;
-static int hf_ntppriv_mode7_precision = -1;
-static int hf_ntppriv_mode7_tolerance = -1;
-static int hf_ntppriv_mode7_ppsfreq = -1;
-static int hf_ntppriv_mode7_jitter = -1;
-static int hf_ntppriv_mode7_stabil = -1;
-static int hf_ntppriv_mode7_jitcnt = -1;
-static int hf_ntppriv_mode7_calcnt = -1;
-static int hf_ntppriv_mode7_errcnt = -1;
-static int hf_ntppriv_mode7_stbcnt = -1;
-static int hf_ntppriv_mode7_key = -1;
-static int hf_ntppriv_mode7_numkeys = -1;
-static int hf_ntppriv_mode7_numfreekeys = -1;
-static int hf_ntppriv_mode7_keylookups = -1;
-static int hf_ntppriv_mode7_keynotfound = -1;
-static int hf_ntppriv_mode7_encryptions = -1;
-static int hf_ntppriv_mode7_decryptions = -1;
-static int hf_ntppriv_mode7_expired = -1;
-static int hf_ntppriv_mode7_keyuncached = -1;
-static int hf_ntppriv_mode7_local_addr = -1;
-static int hf_ntppriv_mode7_trap_addr = -1;
-static int hf_ntppriv_mode7_trap_port = -1;
-static int hf_ntppriv_mode7_sequence = -1;
-static int hf_ntppriv_mode7_settime = -1;
-static int hf_ntppriv_mode7_origtime = -1;
-static int hf_ntppriv_mode7_resets = -1;
-static int hf_ntppriv_traps_flags = -1;
-static int hf_ntppriv_mode7_local_addr6 = -1;
-static int hf_ntppriv_mode7_trap_addr6 = -1;
-static int hf_ntppriv_mode7_last_offset = -1;
-static int hf_ntppriv_mode7_drift_comp = -1;
-static int hf_ntppriv_mode7_compliance = -1;
-static int hf_ntppriv_mode7_watchdog_timer = -1;
-static int hf_ntppriv_mode7_poll32 = -1;
-static int hf_ntppriv_mode7_denied = -1;
-static int hf_ntppriv_mode7_oldversion = -1;
-static int hf_ntppriv_mode7_newversion = -1;
-static int hf_ntppriv_mode7_badlength = -1;
-static int hf_ntppriv_mode7_limitrejected = -1;
-static int hf_ntppriv_mode7_lamport = -1;
-static int hf_ntppriv_mode7_tsrounding = -1;
-static int hf_ntppriv_mode7_totalmem = -1;
-static int hf_ntppriv_mode7_freemem = -1;
-static int hf_ntppriv_mode7_findpeer_calls = -1;
-static int hf_ntppriv_mode7_allocations = -1;
-static int hf_ntppriv_mode7_demobilizations = -1;
-static int hf_ntppriv_mode7_hashcount = -1;
-static int hf_ntppriv_mode7_totalrecvbufs = -1;
-static int hf_ntppriv_mode7_freerecvbufs = -1;
-static int hf_ntppriv_mode7_fullrecvbufs = -1;
-static int hf_ntppriv_mode7_lowwater = -1;
-static int hf_ntppriv_mode7_dropped = -1;
-static int hf_ntppriv_mode7_ignored = -1;
-static int hf_ntppriv_mode7_received = -1;
-static int hf_ntppriv_mode7_notsent = -1;
-static int hf_ntppriv_mode7_interrupts = -1;
-static int hf_ntppriv_mode7_int_received = -1;
-static int hf_ntppriv_mode7_alarms = -1;
-static int hf_ntppriv_mode7_overflows = -1;
-static int hf_ntppriv_mode7_xmtcalls = -1;
-static int hf_ntppriv_mode7_rflags = -1;
-static int hf_ntppriv_mode7_mflags = -1;
-static int hf_ntppriv_mode7_int_name = -1;
-static int hf_ntppriv_mode7_int_flags = -1;
-static int hf_ntppriv_mode7_last_ttl = -1;
-static int hf_ntppriv_mode7_num_mcast = -1;
-static int hf_ntppriv_mode7_uptime = -1;
-static int hf_ntppriv_mode7_scopeid = -1;
-static int hf_ntppriv_mode7_ifindex = -1;
-static int hf_ntppriv_mode7_ifnum = -1;
-static int hf_ntppriv_mode7_peercnt = -1;
-static int hf_ntppriv_mode7_family = -1;
-static int hf_ntppriv_mode7_ignore_pkt = -1;
-static int hf_ntppriv_mode7_action = -1;
-static int hf_ntppriv_mode7_nvalues = -1;
-static int hf_ntppriv_mode7_ntimes = -1;
-static int hf_ntppriv_mode7_svalues = -1;
-static int hf_ntppriv_mode7_stimes = -1;
-static int hf_ntppriv_mode7_values = -1;
-static int hf_ntppriv_mode7_times = -1;
-static int hf_ntppriv_mode7_which = -1;
-static int hf_ntppriv_mode7_fudgetime = -1;
-static int hf_ntppriv_mode7_fudgeval_flags = -1;
-static int hf_ntppriv_mode7_ippeerlimit = -1;
-static int hf_ntppriv_mode7_restrict_flags = -1;
-
-static gint ett_ntp = -1;
-static gint ett_ntp_flags = -1;
-static gint ett_ntp_ext = -1;
-static gint ett_ntp_ext_flags = -1;
-static gint ett_ntpctrl_flags2 = -1;
-static gint ett_ntpctrl_status = -1;
-static gint ett_ntpctrl_data = -1;
-static gint ett_ntpctrl_item = -1;
-static gint ett_ntppriv_auth_seq = -1;
-static gint ett_mode7_item = -1;
-static gint ett_ntp_authenticator = -1;
-static gint ett_ntppriv_peer_list_flags = -1;
-static gint ett_ntppriv_config_flags = -1;
-static gint ett_ntppriv_sys_flag_flags = -1;
-static gint ett_ntppriv_reset_stats_flags = -1;
-
-static expert_field ei_ntp_ext = EI_INIT;
+static int proto_ntp;
+
+static int hf_ntp_flags;
+static int hf_ntp_flags_li;
+static int hf_ntp_flags_vn;
+static int hf_ntp_flags_mode;
+static int hf_ntp_stratum;
+static int hf_ntp_ppoll;
+static int hf_ntp_precision;
+static int hf_ntp_rootdelay;
+static int hf_ntp_rootdispersion;
+static int hf_ntp_refid;
+static int hf_ntp_reftime;
+static int hf_ntp_org;
+static int hf_ntp_rec;
+static int hf_ntp_xmt;
+static int hf_ntp_keyid;
+static int hf_ntp_mac;
+static int hf_ntp_padding;
+static int hf_ntp_key_type;
+static int hf_ntp_key_index;
+static int hf_ntp_key_signature;
+static int hf_ntp_response_in;
+static int hf_ntp_request_in;
+static int hf_ntp_delta_time;
+
+static int hf_ntp_ext;
+static int hf_ntp_ext_type;
+static int hf_ntp_ext_length;
+static int hf_ntp_ext_value;
+
+static int hf_ntpctrl_flags2;
+static int hf_ntpctrl_flags2_r;
+static int hf_ntpctrl_flags2_error;
+static int hf_ntpctrl_flags2_more;
+static int hf_ntpctrl_flags2_opcode;
+static int hf_ntpctrl_sequence;
+static int hf_ntpctrl_status;
+static int hf_ntpctrl_error_status_word;
+static int hf_ntpctrl_sys_status_li;
+static int hf_ntpctrl_sys_status_clksrc;
+static int hf_ntpctrl_sys_status_count;
+static int hf_ntpctrl_sys_status_code;
+static int hf_ntpctrl_peer_status_b0;
+static int hf_ntpctrl_peer_status_b1;
+static int hf_ntpctrl_peer_status_b2;
+static int hf_ntpctrl_peer_status_b3;
+static int hf_ntpctrl_peer_status_b4;
+static int hf_ntpctrl_peer_status_selection;
+static int hf_ntpctrl_peer_status_count;
+static int hf_ntpctrl_peer_status_code;
+static int hf_ntpctrl_clk_status;
+static int hf_ntpctrl_clk_status_code;
+static int hf_ntpctrl_associd;
+static int hf_ntpctrl_offset;
+static int hf_ntpctrl_count;
+static int hf_ntpctrl_data;
+static int hf_ntpctrl_item;
+static int hf_ntpctrl_trapmsg;
+static int hf_ntpctrl_ordlist;
+static int hf_ntpctrl_configuration;
+static int hf_ntpctrl_mru;
+static int hf_ntpctrl_nonce;
+
+static int hf_ntppriv_flags_r;
+static int hf_ntppriv_flags_more;
+static int hf_ntppriv_auth_seq;
+static int hf_ntppriv_auth;
+static int hf_ntppriv_seq;
+static int hf_ntppriv_impl;
+static int hf_ntppriv_reqcode;
+static int hf_ntppriv_errcode;
+static int hf_ntppriv_numitems;
+static int hf_ntppriv_mbz;
+static int hf_ntppriv_mode7_item;
+static int hf_ntppriv_itemsize;
+static int hf_ntppriv_avgint;
+static int hf_ntppriv_lsint;
+static int hf_ntppriv_count;
+static int hf_ntppriv_restr;
+static int hf_ntppriv_addr;
+static int hf_ntppriv_daddr;
+static int hf_ntppriv_flags;
+static int hf_ntppriv_port;
+static int hf_ntppriv_mode;
+static int hf_ntppriv_version;
+static int hf_ntppriv_v6_flag;
+static int hf_ntppriv_unused;
+static int hf_ntppriv_addr6;
+static int hf_ntppriv_daddr6;
+static int hf_ntppriv_tstamp;
+static int hf_ntppriv_mode7_addr;
+static int hf_ntppriv_mode7_mask;
+static int hf_ntppriv_mode7_bcast;
+static int hf_ntppriv_mode7_port;
+static int hf_ntppriv_mode7_hmode;
+static int hf_ntppriv_mode7_peer_flags;
+static int hf_ntppriv_mode7_v6_flag;
+static int hf_ntppriv_mode7_unused;
+static int hf_ntppriv_mode7_addr6;
+static int hf_ntppriv_mode7_mask6;
+static int hf_ntppriv_mode7_bcast6;
+static int hf_ntppriv_mode7_peer_flags_config;
+static int hf_ntppriv_mode7_peer_flags_syspeer;
+static int hf_ntppriv_mode7_peer_flags_burst;
+static int hf_ntppriv_mode7_peer_flags_refclock;
+static int hf_ntppriv_mode7_peer_flags_prefer;
+static int hf_ntppriv_mode7_peer_flags_authenable;
+static int hf_ntppriv_mode7_peer_flags_sel_candidate;
+static int hf_ntppriv_mode7_peer_flags_shortlist;
+static int hf_ntppriv_mode7_dstaddr;
+static int hf_ntppriv_mode7_srcaddr;
+static int hf_ntppriv_mode7_srcport;
+static int hf_ntppriv_mode7_count;
+static int hf_ntppriv_mode7_hpoll;
+static int hf_ntppriv_mode7_reach;
+static int hf_ntppriv_mode7_delay;
+static int hf_ntppriv_mode7_offset;
+static int hf_ntppriv_mode7_dispersion;
+static int hf_ntppriv_mode7_dstaddr6;
+static int hf_ntppriv_mode7_srcaddr6;
+static int hf_ntppriv_mode7_leap;
+static int hf_ntppriv_mode7_pmode;
+static int hf_ntppriv_mode7_version;
+static int hf_ntppriv_mode7_unreach;
+static int hf_ntppriv_mode7_flash;
+static int hf_ntppriv_mode7_ttl;
+static int hf_ntppriv_mode7_flash2;
+static int hf_ntppriv_mode7_associd;
+static int hf_ntppriv_mode7_pkeyid;
+static int hf_ntppriv_mode7_timer;
+static int hf_ntppriv_mode7_filtdelay;
+static int hf_ntppriv_mode7_filtoffset;
+static int hf_ntppriv_mode7_order;
+static int hf_ntppriv_mode7_selectdis;
+static int hf_ntppriv_mode7_estbdelay;
+static int hf_ntppriv_mode7_bdelay;
+static int hf_ntppriv_mode7_authdelay;
+static int hf_ntppriv_mode7_stability;
+static int hf_ntppriv_mode7_timeup;
+static int hf_ntppriv_mode7_timereset;
+static int hf_ntppriv_mode7_timereceived;
+static int hf_ntppriv_mode7_timetosend;
+static int hf_ntppriv_mode7_timereachable;
+static int hf_ntppriv_mode7_sent;
+static int hf_ntppriv_mode7_processed;
+static int hf_ntppriv_mode7_badauth;
+static int hf_ntppriv_mode7_bogusorg;
+static int hf_ntppriv_mode7_oldpkt;
+static int hf_ntppriv_mode7_seldisp;
+static int hf_ntppriv_mode7_selbroken;
+static int hf_ntppriv_mode7_candidate;
+static int hf_ntppriv_mode7_minpoll;
+static int hf_ntppriv_mode7_maxpoll;
+static int hf_ntppriv_mode7_config_flags;
+static int hf_ntppriv_mode7_config_flags_auth;
+static int hf_ntppriv_mode7_config_flags_prefer;
+static int hf_ntppriv_mode7_config_flags_burst;
+static int hf_ntppriv_mode7_config_flags_iburst;
+static int hf_ntppriv_mode7_config_flags_noselect;
+static int hf_ntppriv_mode7_config_flags_skey;
+static int hf_ntppriv_mode7_key_file;
+static int hf_ntppriv_mode7_sys_flags;
+static int hf_ntppriv_mode7_sys_flags8;
+static int hf_ntppriv_mode7_sys_flags_bclient;
+static int hf_ntppriv_mode7_sys_flags_pps;
+static int hf_ntppriv_mode7_sys_flags_ntp;
+static int hf_ntppriv_mode7_sys_flags_kernel;
+static int hf_ntppriv_mode7_sys_flags_monitor;
+static int hf_ntppriv_mode7_sys_flags_filegen;
+static int hf_ntppriv_mode7_sys_flags_auth;
+static int hf_ntppriv_mode7_sys_flags_cal;
+static int hf_ntppriv_mode7_reset_stats_flags;
+static int hf_ntppriv_mode7_reset_stats_flags_allpeers;
+static int hf_ntppriv_mode7_reset_stats_flags_io;
+static int hf_ntppriv_mode7_reset_stats_flags_sys;
+static int hf_ntppriv_mode7_reset_stats_flags_mem;
+static int hf_ntppriv_mode7_reset_stats_flags_timer;
+static int hf_ntppriv_mode7_reset_stats_flags_auth;
+static int hf_ntppriv_mode7_reset_stats_flags_ctl;
+static int hf_ntppriv_mode7_req;
+static int hf_ntppriv_mode7_badpkts;
+static int hf_ntppriv_mode7_responses;
+static int hf_ntppriv_mode7_frags;
+static int hf_ntppriv_mode7_errors;
+static int hf_ntppriv_mode7_tooshort;
+static int hf_ntppriv_mode7_inputresp;
+static int hf_ntppriv_mode7_inputfrag;
+static int hf_ntppriv_mode7_inputerr;
+static int hf_ntppriv_mode7_badoffset;
+static int hf_ntppriv_mode7_badversion;
+static int hf_ntppriv_mode7_datatooshort;
+static int hf_ntppriv_mode7_badop;
+static int hf_ntppriv_mode7_asyncmsgs;
+static int hf_ntppriv_mode7_type;
+static int hf_ntppriv_mode7_clock_flags;
+static int hf_ntppriv_mode7_lastevent;
+static int hf_ntppriv_mode7_currentstatus;
+static int hf_ntppriv_mode7_polls;
+static int hf_ntppriv_mode7_noresponse;
+static int hf_ntppriv_mode7_badformat;
+static int hf_ntppriv_mode7_baddata;
+static int hf_ntppriv_mode7_timestarted;
+static int hf_ntppriv_mode7_fudgetime1;
+static int hf_ntppriv_mode7_fudgetime2;
+static int hf_ntppriv_mode7_fudgeval1;
+static int hf_ntppriv_mode7_fudgeval2;
+static int hf_ntppriv_mode7_kernel_offset;
+static int hf_ntppriv_mode7_freq;
+static int hf_ntppriv_mode7_maxerror;
+static int hf_ntppriv_mode7_esterror;
+static int hf_ntppriv_mode7_status;
+static int hf_ntppriv_mode7_shift;
+static int hf_ntppriv_mode7_constant;
+static int hf_ntppriv_mode7_precision;
+static int hf_ntppriv_mode7_tolerance;
+static int hf_ntppriv_mode7_ppsfreq;
+static int hf_ntppriv_mode7_jitter;
+static int hf_ntppriv_mode7_stabil;
+static int hf_ntppriv_mode7_jitcnt;
+static int hf_ntppriv_mode7_calcnt;
+static int hf_ntppriv_mode7_errcnt;
+static int hf_ntppriv_mode7_stbcnt;
+static int hf_ntppriv_mode7_key;
+static int hf_ntppriv_mode7_numkeys;
+static int hf_ntppriv_mode7_numfreekeys;
+static int hf_ntppriv_mode7_keylookups;
+static int hf_ntppriv_mode7_keynotfound;
+static int hf_ntppriv_mode7_encryptions;
+static int hf_ntppriv_mode7_decryptions;
+static int hf_ntppriv_mode7_expired;
+static int hf_ntppriv_mode7_keyuncached;
+static int hf_ntppriv_mode7_local_addr;
+static int hf_ntppriv_mode7_trap_addr;
+static int hf_ntppriv_mode7_trap_port;
+static int hf_ntppriv_mode7_sequence;
+static int hf_ntppriv_mode7_settime;
+static int hf_ntppriv_mode7_origtime;
+static int hf_ntppriv_mode7_resets;
+static int hf_ntppriv_traps_flags;
+static int hf_ntppriv_mode7_local_addr6;
+static int hf_ntppriv_mode7_trap_addr6;
+static int hf_ntppriv_mode7_last_offset;
+static int hf_ntppriv_mode7_drift_comp;
+static int hf_ntppriv_mode7_compliance;
+static int hf_ntppriv_mode7_watchdog_timer;
+static int hf_ntppriv_mode7_poll32;
+static int hf_ntppriv_mode7_denied;
+static int hf_ntppriv_mode7_oldversion;
+static int hf_ntppriv_mode7_newversion;
+static int hf_ntppriv_mode7_badlength;
+static int hf_ntppriv_mode7_limitrejected;
+static int hf_ntppriv_mode7_lamport;
+static int hf_ntppriv_mode7_tsrounding;
+static int hf_ntppriv_mode7_totalmem;
+static int hf_ntppriv_mode7_freemem;
+static int hf_ntppriv_mode7_findpeer_calls;
+static int hf_ntppriv_mode7_allocations;
+static int hf_ntppriv_mode7_demobilizations;
+static int hf_ntppriv_mode7_hashcount;
+static int hf_ntppriv_mode7_totalrecvbufs;
+static int hf_ntppriv_mode7_freerecvbufs;
+static int hf_ntppriv_mode7_fullrecvbufs;
+static int hf_ntppriv_mode7_lowwater;
+static int hf_ntppriv_mode7_dropped;
+static int hf_ntppriv_mode7_ignored;
+static int hf_ntppriv_mode7_received;
+static int hf_ntppriv_mode7_notsent;
+static int hf_ntppriv_mode7_interrupts;
+static int hf_ntppriv_mode7_int_received;
+static int hf_ntppriv_mode7_alarms;
+static int hf_ntppriv_mode7_overflows;
+static int hf_ntppriv_mode7_xmtcalls;
+static int hf_ntppriv_mode7_rflags;
+static int hf_ntppriv_mode7_mflags;
+static int hf_ntppriv_mode7_int_name;
+static int hf_ntppriv_mode7_int_flags;
+static int hf_ntppriv_mode7_last_ttl;
+static int hf_ntppriv_mode7_num_mcast;
+static int hf_ntppriv_mode7_uptime;
+static int hf_ntppriv_mode7_scopeid;
+static int hf_ntppriv_mode7_ifindex;
+static int hf_ntppriv_mode7_ifnum;
+static int hf_ntppriv_mode7_peercnt;
+static int hf_ntppriv_mode7_family;
+static int hf_ntppriv_mode7_ignore_pkt;
+static int hf_ntppriv_mode7_action;
+static int hf_ntppriv_mode7_nvalues;
+static int hf_ntppriv_mode7_ntimes;
+static int hf_ntppriv_mode7_svalues;
+static int hf_ntppriv_mode7_stimes;
+static int hf_ntppriv_mode7_values;
+static int hf_ntppriv_mode7_times;
+static int hf_ntppriv_mode7_which;
+static int hf_ntppriv_mode7_fudgetime;
+static int hf_ntppriv_mode7_fudgeval_flags;
+static int hf_ntppriv_mode7_ippeerlimit;
+static int hf_ntppriv_mode7_restrict_flags;
+
+static gint ett_ntp;
+static gint ett_ntp_flags;
+static gint ett_ntp_ext;
+static gint ett_ntp_ext_flags;
+static gint ett_ntpctrl_flags2;
+static gint ett_ntpctrl_status;
+static gint ett_ntpctrl_data;
+static gint ett_ntpctrl_item;
+static gint ett_ntppriv_auth_seq;
+static gint ett_mode7_item;
+static gint ett_ntp_authenticator;
+static gint ett_ntppriv_peer_list_flags;
+static gint ett_ntppriv_config_flags;
+static gint ett_ntppriv_sys_flag_flags;
+static gint ett_ntppriv_reset_stats_flags;
+
+static expert_field ei_ntp_ext;
 
 static const char *mon_names[12] = {
 	"Jan",
diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c
index 0ff004c760..73b7960741 100644
--- a/epan/dissectors/packet-null.c
+++ b/epan/dissectors/packet-null.c
@@ -28,11 +28,11 @@ static dissector_table_t null_dissector_table;
 static dissector_table_t ethertype_dissector_table;
 
 /* protocols and header fields */
-static int proto_null = -1;
-static int hf_null_etype = -1;
-static int hf_null_family = -1;
+static int proto_null;
+static int hf_null_etype;
+static int hf_null_family;
 
-static gint ett_null = -1;
+static gint ett_null;
 
 /* Null/loopback structs and definitions */
 
diff --git a/epan/dissectors/packet-nvme-mi.c b/epan/dissectors/packet-nvme-mi.c
index dabfcd91c5..2261ada14a 100644
--- a/epan/dissectors/packet-nvme-mi.c
+++ b/epan/dissectors/packet-nvme-mi.c
@@ -26,59 +26,59 @@
 void proto_register_nvme_mi(void);
 void proto_reg_handoff_nvme_mi(void);
 
-static int proto_nvme_mi = -1;
-
-static int hf_nvme_mi_mctp_mt = -1;
-static int hf_nvme_mi_mctp_ic = -1;
-static int hf_nvme_mi_csi = -1;
-static int hf_nvme_mi_type = -1;
-static int hf_nvme_mi_ror = -1;
-static int hf_nvme_mi_meb = -1;
-static int hf_nvme_mi_mic = -1;
-
-static int hf_nvme_mi_mi_opcode = -1;
-static int hf_nvme_mi_mi_cdw0 = -1;
-static int hf_nvme_mi_mi_cdw1 = -1;
-static int hf_nvme_mi_mi_status = -1;
-static int hf_nvme_mi_mi_nmresp = -1;
-static int hf_nvme_mi_mi_data = -1;
-
-static int hf_nvme_mi_admin_opcode = -1;
-static int hf_nvme_mi_admin_status = -1;
-static int hf_nvme_mi_admin_flags = -1;
-static int hf_nvme_mi_admin_flags_doff = -1;
-static int hf_nvme_mi_admin_flags_dlen = -1;
-static int hf_nvme_mi_admin_ctrl_id = -1;
-static int hf_nvme_mi_admin_sqe1 = -1;
-static int hf_nvme_mi_admin_sqe2 = -1;
-static int hf_nvme_mi_admin_sqe3 = -1;
-static int hf_nvme_mi_admin_sqe4 = -1;
-static int hf_nvme_mi_admin_sqe5 = -1;
-static int hf_nvme_mi_admin_doff = -1;
-static int hf_nvme_mi_admin_dlen = -1;
-static int hf_nvme_mi_admin_resv0 = -1;
-static int hf_nvme_mi_admin_resv1 = -1;
-static int hf_nvme_mi_admin_sqe10 = -1;
-static int hf_nvme_mi_admin_sqe11 = -1;
-static int hf_nvme_mi_admin_sqe12 = -1;
-static int hf_nvme_mi_admin_sqe13 = -1;
-static int hf_nvme_mi_admin_sqe14 = -1;
-static int hf_nvme_mi_admin_sqe15 = -1;
-static int hf_nvme_mi_admin_data = -1;
-static int hf_nvme_mi_admin_cqe1 = -1;
-static int hf_nvme_mi_admin_cqe2 = -1;
-static int hf_nvme_mi_admin_cqe3 = -1;
-
-static int hf_nvme_mi_response_in = -1;
-static int hf_nvme_mi_response_to = -1;
-static int hf_nvme_mi_response_time = -1;
-
-
-static gint ett_nvme_mi = -1;
-static gint ett_nvme_mi_hdr = -1;
-static gint ett_nvme_mi_mi = -1;
-static gint ett_nvme_mi_admin = -1;
-static gint ett_nvme_mi_admin_flags = -1;
+static int proto_nvme_mi;
+
+static int hf_nvme_mi_mctp_mt;
+static int hf_nvme_mi_mctp_ic;
+static int hf_nvme_mi_csi;
+static int hf_nvme_mi_type;
+static int hf_nvme_mi_ror;
+static int hf_nvme_mi_meb;
+static int hf_nvme_mi_mic;
+
+static int hf_nvme_mi_mi_opcode;
+static int hf_nvme_mi_mi_cdw0;
+static int hf_nvme_mi_mi_cdw1;
+static int hf_nvme_mi_mi_status;
+static int hf_nvme_mi_mi_nmresp;
+static int hf_nvme_mi_mi_data;
+
+static int hf_nvme_mi_admin_opcode;
+static int hf_nvme_mi_admin_status;
+static int hf_nvme_mi_admin_flags;
+static int hf_nvme_mi_admin_flags_doff;
+static int hf_nvme_mi_admin_flags_dlen;
+static int hf_nvme_mi_admin_ctrl_id;
+static int hf_nvme_mi_admin_sqe1;
+static int hf_nvme_mi_admin_sqe2;
+static int hf_nvme_mi_admin_sqe3;
+static int hf_nvme_mi_admin_sqe4;
+static int hf_nvme_mi_admin_sqe5;
+static int hf_nvme_mi_admin_doff;
+static int hf_nvme_mi_admin_dlen;
+static int hf_nvme_mi_admin_resv0;
+static int hf_nvme_mi_admin_resv1;
+static int hf_nvme_mi_admin_sqe10;
+static int hf_nvme_mi_admin_sqe11;
+static int hf_nvme_mi_admin_sqe12;
+static int hf_nvme_mi_admin_sqe13;
+static int hf_nvme_mi_admin_sqe14;
+static int hf_nvme_mi_admin_sqe15;
+static int hf_nvme_mi_admin_data;
+static int hf_nvme_mi_admin_cqe1;
+static int hf_nvme_mi_admin_cqe2;
+static int hf_nvme_mi_admin_cqe3;
+
+static int hf_nvme_mi_response_in;
+static int hf_nvme_mi_response_to;
+static int hf_nvme_mi_response_time;
+
+
+static gint ett_nvme_mi;
+static gint ett_nvme_mi_hdr;
+static gint ett_nvme_mi_mi;
+static gint ett_nvme_mi_admin;
+static gint ett_nvme_mi_admin_flags;
 
 enum nvme_mi_type {
     NVME_MI_TYPE_CONTROL = 0x0,
diff --git a/epan/dissectors/packet-nvme-rdma.c b/epan/dissectors/packet-nvme-rdma.c
index 548f304fe9..f226b6d48a 100644
--- a/epan/dissectors/packet-nvme-rdma.c
+++ b/epan/dissectors/packet-nvme-rdma.c
@@ -107,47 +107,47 @@ struct nvme_rdma_cmd_ctx {
 void proto_reg_handoff_nvme_rdma(void);
 void proto_register_nvme_rdma(void);
 
-static int proto_nvme_rdma = -1;
+static int proto_nvme_rdma;
 static dissector_handle_t ib_handler;
-static int proto_ib = -1;
+static int proto_ib;
 
 /* NVMe Fabrics RDMA CM Private data */
-static int hf_nvmeof_rdma_cm_req_recfmt = -1;
-static int hf_nvmeof_rdma_cm_req_qid = -1;
-static int hf_nvmeof_rdma_cm_req_hrqsize = -1;
-static int hf_nvmeof_rdma_cm_req_hsqsize = -1;
-static int hf_nvmeof_rdma_cm_req_cntlid = -1;
-static int hf_nvmeof_rdma_cm_req_reserved = -1;
+static int hf_nvmeof_rdma_cm_req_recfmt;
+static int hf_nvmeof_rdma_cm_req_qid;
+static int hf_nvmeof_rdma_cm_req_hrqsize;
+static int hf_nvmeof_rdma_cm_req_hsqsize;
+static int hf_nvmeof_rdma_cm_req_cntlid;
+static int hf_nvmeof_rdma_cm_req_reserved;
 
-static int hf_nvmeof_rdma_cm_rsp_recfmt = -1;
-static int hf_nvmeof_rdma_cm_rsp_crqsize = -1;
-static int hf_nvmeof_rdma_cm_rsp_reserved = -1;
+static int hf_nvmeof_rdma_cm_rsp_recfmt;
+static int hf_nvmeof_rdma_cm_rsp_crqsize;
+static int hf_nvmeof_rdma_cm_rsp_reserved;
 
-static int hf_nvmeof_rdma_cm_rej_recfmt = -1;
-static int hf_nvmeof_rdma_cm_rej_status = -1;
+static int hf_nvmeof_rdma_cm_rej_recfmt;
+static int hf_nvmeof_rdma_cm_rej_status;
 
 /* Data Transfers */
-static int hf_nvmeof_from_host_unknown_data = -1;
-static int hf_nvmeof_read_to_host_req = -1;
-static int hf_nvmeof_read_to_host_unmatched = -1;
-static int hf_nvmeof_read_from_host_resp = -1;
-static int hf_nvmeof_read_from_host_prev = -1;
-static int hf_nvmeof_read_from_host_next = -1;
-static int hf_nvmeof_read_from_host_unmatched = -1;
-static int hf_nvmeof_write_to_host_req = -1;
-static int hf_nvmeof_write_to_host_prev = -1;
-static int hf_nvmeof_write_to_host_next = -1;
-static int hf_nvmeof_write_to_host_unmatched = -1;
-static int hf_nvmeof_to_host_unknown_data = -1;
+static int hf_nvmeof_from_host_unknown_data;
+static int hf_nvmeof_read_to_host_req;
+static int hf_nvmeof_read_to_host_unmatched;
+static int hf_nvmeof_read_from_host_resp;
+static int hf_nvmeof_read_from_host_prev;
+static int hf_nvmeof_read_from_host_next;
+static int hf_nvmeof_read_from_host_unmatched;
+static int hf_nvmeof_write_to_host_req;
+static int hf_nvmeof_write_to_host_prev;
+static int hf_nvmeof_write_to_host_next;
+static int hf_nvmeof_write_to_host_unmatched;
+static int hf_nvmeof_to_host_unknown_data;
 
 /* Tracking commands, transfers and CQEs */
-static int hf_nvmeof_data_resp = -1;
-static int hf_nvmeof_cmd_qid = -1;
+static int hf_nvmeof_data_resp;
+static int hf_nvmeof_cmd_qid;
 
 
 /* Initialize the subtree pointers */
-static gint ett_cm = -1;
-static gint ett_data = -1;
+static gint ett_cm;
+static gint ett_data;
 
 static range_t *gPORT_RANGE;
 
diff --git a/epan/dissectors/packet-nvme-tcp.c b/epan/dissectors/packet-nvme-tcp.c
index c75fbc969c..687d072950 100644
--- a/epan/dissectors/packet-nvme-tcp.c
+++ b/epan/dissectors/packet-nvme-tcp.c
@@ -46,7 +46,7 @@
 #include "packet-tls.h"
 #include "packet-tls-utils.h"
 
-static int proto_nvme_tcp = -1;
+static int proto_nvme_tcp;
 static dissector_handle_t nvmet_tcp_handle;
 static dissector_handle_t nvmet_tls_handle;
 
@@ -137,12 +137,12 @@ void proto_reg_handoff_nvme_tcp(void);
 void proto_register_nvme_tcp(void);
 
 
-static int hf_nvme_tcp_type = -1;
-static int hf_nvme_tcp_flags = -1;
-static int hf_pdu_flags_hdgst = -1;
-static int hf_pdu_flags_ddgst = -1;
-static int hf_pdu_flags_data_last = -1;
-static int hf_pdu_flags_data_success = -1;
+static int hf_nvme_tcp_type;
+static int hf_nvme_tcp_flags;
+static int hf_pdu_flags_hdgst;
+static int hf_pdu_flags_ddgst;
+static int hf_pdu_flags_data_last;
+static int hf_pdu_flags_data_success;
 
 static int * const nvme_tcp_pdu_flags[] = {
     &hf_pdu_flags_hdgst,
@@ -152,66 +152,66 @@ static int * const nvme_tcp_pdu_flags[] = {
     NULL
 };
 
-static int hf_nvme_tcp_hdgst = -1;
-static int hf_nvme_tcp_ddgst = -1;
-static int hf_nvme_tcp_hlen = -1;
-static int hf_nvme_tcp_pdo = -1;
-static int hf_nvme_tcp_plen = -1;
-static int hf_nvme_tcp_hdgst_status = -1;
-static int hf_nvme_tcp_ddgst_status = -1;
+static int hf_nvme_tcp_hdgst;
+static int hf_nvme_tcp_ddgst;
+static int hf_nvme_tcp_hlen;
+static int hf_nvme_tcp_pdo;
+static int hf_nvme_tcp_plen;
+static int hf_nvme_tcp_hdgst_status;
+static int hf_nvme_tcp_ddgst_status;
 
 /* NVMe tcp icreq/icresp fields */
-static int hf_nvme_tcp_icreq = -1;
-static int hf_nvme_tcp_icreq_pfv = -1;
-static int hf_nvme_tcp_icreq_maxr2t = -1;
-static int hf_nvme_tcp_icreq_hpda = -1;
-static int hf_nvme_tcp_icreq_digest = -1;
-static int hf_nvme_tcp_icresp = -1;
-static int hf_nvme_tcp_icresp_pfv = -1;
-static int hf_nvme_tcp_icresp_cpda = -1;
-static int hf_nvme_tcp_icresp_digest = -1;
-static int hf_nvme_tcp_icresp_maxdata = -1;
+static int hf_nvme_tcp_icreq;
+static int hf_nvme_tcp_icreq_pfv;
+static int hf_nvme_tcp_icreq_maxr2t;
+static int hf_nvme_tcp_icreq_hpda;
+static int hf_nvme_tcp_icreq_digest;
+static int hf_nvme_tcp_icresp;
+static int hf_nvme_tcp_icresp_pfv;
+static int hf_nvme_tcp_icresp_cpda;
+static int hf_nvme_tcp_icresp_digest;
+static int hf_nvme_tcp_icresp_maxdata;
 
 /* NVMe tcp c2h/h2c termreq fields */
-static int hf_nvme_tcp_c2htermreq = -1;
-static int hf_nvme_tcp_c2htermreq_fes = -1;
-static int hf_nvme_tcp_c2htermreq_phfo = -1;
-static int hf_nvme_tcp_c2htermreq_phd = -1;
-static int hf_nvme_tcp_c2htermreq_upfo = -1;
-static int hf_nvme_tcp_c2htermreq_reserved = -1;
-static int hf_nvme_tcp_c2htermreq_data = -1;
-static int hf_nvme_tcp_h2ctermreq = -1;
-static int hf_nvme_tcp_h2ctermreq_fes = -1;
-static int hf_nvme_tcp_h2ctermreq_phfo = -1;
-static int hf_nvme_tcp_h2ctermreq_phd = -1;
-static int hf_nvme_tcp_h2ctermreq_upfo = -1;
-static int hf_nvme_tcp_h2ctermreq_reserved = -1;
-static int hf_nvme_tcp_h2ctermreq_data = -1;
+static int hf_nvme_tcp_c2htermreq;
+static int hf_nvme_tcp_c2htermreq_fes;
+static int hf_nvme_tcp_c2htermreq_phfo;
+static int hf_nvme_tcp_c2htermreq_phd;
+static int hf_nvme_tcp_c2htermreq_upfo;
+static int hf_nvme_tcp_c2htermreq_reserved;
+static int hf_nvme_tcp_c2htermreq_data;
+static int hf_nvme_tcp_h2ctermreq;
+static int hf_nvme_tcp_h2ctermreq_fes;
+static int hf_nvme_tcp_h2ctermreq_phfo;
+static int hf_nvme_tcp_h2ctermreq_phd;
+static int hf_nvme_tcp_h2ctermreq_upfo;
+static int hf_nvme_tcp_h2ctermreq_reserved;
+static int hf_nvme_tcp_h2ctermreq_data;
 
 /* NVMe fabrics command */
-static int hf_nvme_fabrics_cmd_cid = -1;
+static int hf_nvme_fabrics_cmd_cid;
 
 /* NVMe fabrics command data*/
-static int hf_nvme_fabrics_cmd_data = -1;
-static int hf_nvme_tcp_unknown_data = -1;
+static int hf_nvme_fabrics_cmd_data;
+static int hf_nvme_tcp_unknown_data;
 
-static int hf_nvme_tcp_r2t_pdu = -1;
-static int hf_nvme_tcp_r2t_offset = -1;
-static int hf_nvme_tcp_r2t_length = -1;
-static int hf_nvme_tcp_r2t_resvd = -1;
+static int hf_nvme_tcp_r2t_pdu;
+static int hf_nvme_tcp_r2t_offset;
+static int hf_nvme_tcp_r2t_length;
+static int hf_nvme_tcp_r2t_resvd;
 
 /* tracking Cmd and its respective CQE */
-static int hf_nvme_tcp_cmd_pkt = -1;
-static int hf_nvme_fabrics_cmd_qid = -1;
+static int hf_nvme_tcp_cmd_pkt;
+static int hf_nvme_fabrics_cmd_qid;
 
 /* Data response fields */
-static int hf_nvme_tcp_data_pdu = -1;
-static int hf_nvme_tcp_pdu_ttag = -1;
-static int hf_nvme_tcp_data_pdu_data_offset = -1;
-static int hf_nvme_tcp_data_pdu_data_length = -1;
-static int hf_nvme_tcp_data_pdu_data_resvd = -1;
+static int hf_nvme_tcp_data_pdu;
+static int hf_nvme_tcp_pdu_ttag;
+static int hf_nvme_tcp_data_pdu_data_offset;
+static int hf_nvme_tcp_data_pdu_data_length;
+static int hf_nvme_tcp_data_pdu_data_resvd;
 
-static gint ett_nvme_tcp = -1;
+static gint ett_nvme_tcp;
 
 static guint
 get_nvme_tcp_pdu_len(packet_info *pinfo _U_,
diff --git a/epan/dissectors/packet-nvme.c b/epan/dissectors/packet-nvme.c
index 9b7964025e..c9febe1757 100644
--- a/epan/dissectors/packet-nvme.c
+++ b/epan/dissectors/packet-nvme.c
@@ -27,60 +27,60 @@
 
 void proto_register_nvme(void);
 
-static int proto_nvme = -1;
+static int proto_nvme;
 
 
 /* NVMeOF fields */
 /* NVMe Fabric Cmd */
-static int hf_nvmeof_cmd = -1;
-static int hf_nvmeof_cmd_opc = -1;
-static int hf_nvmeof_cmd_rsvd = -1;
-static int hf_nvmeof_cmd_cid = -1;
-static int hf_nvmeof_cmd_fctype = -1;
-static int hf_nvmeof_cmd_connect_rsvd1 = -1;
-static int hf_nvmeof_cmd_connect_sgl1 = -1;
-static int hf_nvmeof_cmd_connect_recfmt = -1;
-static int hf_nvmeof_cmd_connect_qid = -1;
-static int hf_nvmeof_cmd_connect_sqsize = -1;
+static int hf_nvmeof_cmd;
+static int hf_nvmeof_cmd_opc;
+static int hf_nvmeof_cmd_rsvd;
+static int hf_nvmeof_cmd_cid;
+static int hf_nvmeof_cmd_fctype;
+static int hf_nvmeof_cmd_connect_rsvd1;
+static int hf_nvmeof_cmd_connect_sgl1;
+static int hf_nvmeof_cmd_connect_recfmt;
+static int hf_nvmeof_cmd_connect_qid;
+static int hf_nvmeof_cmd_connect_sqsize;
 static int hf_nvmeof_cmd_connect_cattr[5];
-static int hf_nvmeof_cmd_connect_rsvd2 = -1;
-static int hf_nvmeof_cmd_connect_kato = -1;
-static int hf_nvmeof_cmd_connect_rsvd3 = -1;
-static int hf_nvmeof_cmd_connect_data_hostid = -1;
-static int hf_nvmeof_cmd_connect_data_cntlid = -1;
-static int hf_nvmeof_cmd_connect_data_rsvd0 = -1;
-static int hf_nvmeof_cmd_connect_data_subnqn = -1;
-static int hf_nvmeof_cmd_connect_data_hostnqn = -1;
-static int hf_nvmeof_cmd_connect_data_rsvd1 = -1;
-
-static int hf_nvmeof_cmd_auth_rsdv1 = -1;
-static int hf_nvmeof_cmd_auth_sgl1 = -1;
-static int hf_nvmeof_cmd_auth_rsdv2 = -1;
-static int hf_nvmeof_cmd_auth_spsp0 = -1;
-static int hf_nvmeof_cmd_auth_spsp1 = -1;
-static int hf_nvmeof_cmd_auth_secp = -1;
-static int hf_nvmeof_cmd_auth_al = -1;
-static int hf_nvmeof_cmd_auth_rsdv3 = -1;
-
-static int hf_nvmeof_cmd_disconnect_rsvd0 = -1;
-static int hf_nvmeof_cmd_disconnect_recfmt = -1;
-static int hf_nvmeof_cmd_disconnect_rsvd1 = -1;
-
-static int hf_nvmeof_cmd_prop_get_set_rsvd0 = -1;
+static int hf_nvmeof_cmd_connect_rsvd2;
+static int hf_nvmeof_cmd_connect_kato;
+static int hf_nvmeof_cmd_connect_rsvd3;
+static int hf_nvmeof_cmd_connect_data_hostid;
+static int hf_nvmeof_cmd_connect_data_cntlid;
+static int hf_nvmeof_cmd_connect_data_rsvd0;
+static int hf_nvmeof_cmd_connect_data_subnqn;
+static int hf_nvmeof_cmd_connect_data_hostnqn;
+static int hf_nvmeof_cmd_connect_data_rsvd1;
+
+static int hf_nvmeof_cmd_auth_rsdv1;
+static int hf_nvmeof_cmd_auth_sgl1;
+static int hf_nvmeof_cmd_auth_rsdv2;
+static int hf_nvmeof_cmd_auth_spsp0;
+static int hf_nvmeof_cmd_auth_spsp1;
+static int hf_nvmeof_cmd_auth_secp;
+static int hf_nvmeof_cmd_auth_al;
+static int hf_nvmeof_cmd_auth_rsdv3;
+
+static int hf_nvmeof_cmd_disconnect_rsvd0;
+static int hf_nvmeof_cmd_disconnect_recfmt;
+static int hf_nvmeof_cmd_disconnect_rsvd1;
+
+static int hf_nvmeof_cmd_prop_get_set_rsvd0;
 static int hf_nvmeof_cmd_prop_get_set_attrib[3];
-static int hf_nvmeof_cmd_prop_get_set_rsvd1 = -1;
-static int hf_nvmeof_cmd_prop_get_set_offset = -1;
-static int hf_nvmeof_cmd_prop_get_rsvd2 = -1;
+static int hf_nvmeof_cmd_prop_get_set_rsvd1;
+static int hf_nvmeof_cmd_prop_get_set_offset;
+static int hf_nvmeof_cmd_prop_get_rsvd2;
 
-static int hf_nvmeof_cmd_prop_set_rsvd = -1;
+static int hf_nvmeof_cmd_prop_set_rsvd;
 
-static int hf_nvmeof_cmd_generic_rsvd1 = -1;
-static int hf_nvmeof_cmd_generic_field = -1;
+static int hf_nvmeof_cmd_generic_rsvd1;
+static int hf_nvmeof_cmd_generic_field;
 
-static int hf_nvmeof_prop_get_set_data = -1;
-static int hf_nvmeof_prop_get_set_data_4B = -1;
-static int hf_nvmeof_prop_get_set_data_4B_rsvd = -1;
-static int hf_nvmeof_prop_get_set_data_8B= -1;
+static int hf_nvmeof_prop_get_set_data;
+static int hf_nvmeof_prop_get_set_data_4B;
+static int hf_nvmeof_prop_get_set_data_4B_rsvd;
+static int hf_nvmeof_prop_get_set_data_8B;
 static int hf_nvmeof_prop_get_set_cc[10];
 static int hf_nvmeof_prop_get_set_csts[7];
 static int hf_nvmeof_prop_get_set_nssr[2];
@@ -89,20 +89,20 @@ static int hf_nvmeof_prop_get_ccap[17];
 
 
 /* NVMe Fabric CQE */
-static int hf_nvmeof_cqe = -1;
-static int hf_nvmeof_cqe_sts = -1;
+static int hf_nvmeof_cqe;
+static int hf_nvmeof_cqe_sts;
 
-static int hf_nvmeof_cqe_connect_cntlid = -1;
-static int hf_nvmeof_cqe_connect_authreq = -1;
-static int hf_nvmeof_cqe_connect_rsvd = -1;
-static int hf_nvmeof_cqe_prop_set_rsvd = -1;
+static int hf_nvmeof_cqe_connect_cntlid;
+static int hf_nvmeof_cqe_connect_authreq;
+static int hf_nvmeof_cqe_connect_rsvd;
+static int hf_nvmeof_cqe_prop_set_rsvd;
 
 /* tracking Cmd and its respective CQE */
-int hf_nvmeof_cmd_pkt = -1;
-int hf_nvmeof_data_req = -1;
+int hf_nvmeof_cmd_pkt;
+int hf_nvmeof_data_req;
 static int hf_nvmeof_data_tr[NVME_CMD_MAX_TRS];
-static int hf_nvmeof_cqe_pkt = -1;
-static int hf_nvmeof_cmd_latency = -1;
+static int hf_nvmeof_cqe_pkt;
+static int hf_nvmeof_cmd_latency;
 
 static const value_string fctype_tbl[] = {
     { NVME_FCTYPE_PROP_SET,      "Property Set" },
@@ -179,55 +179,55 @@ static const value_string shst_table[] = {
 };
 
 /* NVMe Cmd fields */
-static int hf_nvme_cmd_opc = -1;
-static int hf_nvme_cmd_rsvd = -1;
-static int hf_nvme_cmd_cid = -1;
-static int hf_nvme_cmd_fuse_op = -1;
-static int hf_nvme_cmd_psdt = -1;
-static int hf_nvme_cmd_nsid = -1;
-static int hf_nvme_cmd_rsvd1 = -1;
-static int hf_nvme_cmd_mptr = -1;
-static int hf_nvme_cmd_sgl = -1;
-static int hf_nvme_cmd_sgl_desc_type = -1;
-static int hf_nvme_cmd_sgl_desc_sub_type = -1;
-static int hf_nvme_cmd_sgl_desc_addr = -1;
-static int hf_nvme_cmd_sgl_desc_addr_rsvd = -1;
-static int hf_nvme_cmd_sgl_desc_len = -1;
-static int hf_nvme_cmd_sgl_desc_rsvd = -1;
-static int hf_nvme_cmd_sgl_desc_key = -1;
-static int hf_nvme_cmd_dword10 = -1;
-static int hf_nvme_cmd_dword11 = -1;
-static int hf_nvme_cmd_dword12 = -1;
-static int hf_nvme_cmd_dword13 = -1;
-static int hf_nvme_cmd_dword14 = -1;
-static int hf_nvme_cmd_dword15 = -1;
-static int hf_nvme_cmd_slba = -1;
-static int hf_nvme_cmd_nlb = -1;
-static int hf_nvme_cmd_rsvd2 = -1;
-static int hf_nvme_cmd_prinfo = -1;
-static int hf_nvme_cmd_prinfo_prchk_lbrtag = -1;
-static int hf_nvme_cmd_prinfo_prchk_apptag = -1;
-static int hf_nvme_cmd_prinfo_prchk_guard = -1;
-static int hf_nvme_cmd_prinfo_pract = -1;
-static int hf_nvme_cmd_fua = -1;
-static int hf_nvme_cmd_lr = -1;
-static int hf_nvme_cmd_eilbrt = -1;
-static int hf_nvme_cmd_elbat = -1;
-static int hf_nvme_cmd_elbatm = -1;
-static int hf_nvme_cmd_dsm = -1;
-static int hf_nvme_cmd_dsm_access_freq = -1;
-static int hf_nvme_cmd_dsm_access_lat = -1;
-static int hf_nvme_cmd_dsm_seq_req = -1;
-static int hf_nvme_cmd_dsm_incompressible = -1;
-static int hf_nvme_cmd_rsvd3 = -1;
+static int hf_nvme_cmd_opc;
+static int hf_nvme_cmd_rsvd;
+static int hf_nvme_cmd_cid;
+static int hf_nvme_cmd_fuse_op;
+static int hf_nvme_cmd_psdt;
+static int hf_nvme_cmd_nsid;
+static int hf_nvme_cmd_rsvd1;
+static int hf_nvme_cmd_mptr;
+static int hf_nvme_cmd_sgl;
+static int hf_nvme_cmd_sgl_desc_type;
+static int hf_nvme_cmd_sgl_desc_sub_type;
+static int hf_nvme_cmd_sgl_desc_addr;
+static int hf_nvme_cmd_sgl_desc_addr_rsvd;
+static int hf_nvme_cmd_sgl_desc_len;
+static int hf_nvme_cmd_sgl_desc_rsvd;
+static int hf_nvme_cmd_sgl_desc_key;
+static int hf_nvme_cmd_dword10;
+static int hf_nvme_cmd_dword11;
+static int hf_nvme_cmd_dword12;
+static int hf_nvme_cmd_dword13;
+static int hf_nvme_cmd_dword14;
+static int hf_nvme_cmd_dword15;
+static int hf_nvme_cmd_slba;
+static int hf_nvme_cmd_nlb;
+static int hf_nvme_cmd_rsvd2;
+static int hf_nvme_cmd_prinfo;
+static int hf_nvme_cmd_prinfo_prchk_lbrtag;
+static int hf_nvme_cmd_prinfo_prchk_apptag;
+static int hf_nvme_cmd_prinfo_prchk_guard;
+static int hf_nvme_cmd_prinfo_pract;
+static int hf_nvme_cmd_fua;
+static int hf_nvme_cmd_lr;
+static int hf_nvme_cmd_eilbrt;
+static int hf_nvme_cmd_elbat;
+static int hf_nvme_cmd_elbatm;
+static int hf_nvme_cmd_dsm;
+static int hf_nvme_cmd_dsm_access_freq;
+static int hf_nvme_cmd_dsm_access_lat;
+static int hf_nvme_cmd_dsm_seq_req;
+static int hf_nvme_cmd_dsm_incompressible;
+static int hf_nvme_cmd_rsvd3;
 static int hf_nvme_identify_dword10[4];
 static int hf_nvme_identify_dword11[3];
 static int hf_nvme_identify_dword14[3];
 
 static int hf_nvme_get_logpage_dword10[6];
-static int hf_nvme_get_logpage_numd = -1;
+static int hf_nvme_get_logpage_numd;
 static int hf_nvme_get_logpage_dword11[3];
-static int hf_nvme_get_logpage_lpo = -1;
+static int hf_nvme_get_logpage_lpo;
 static int hf_nvme_get_logpage_dword14[3];
 static int hf_nvme_set_features_dword10[4];
 static int hf_nvme_set_features_dword14[3];
@@ -260,350 +260,350 @@ static int hf_nvme_cmd_set_features_dword11_hid[3];
 static int hf_nvme_cmd_set_features_dword11_rsrvn[6];
 static int hf_nvme_cmd_set_features_dword11_rsrvp[3];
 static int hf_nvme_cmd_set_features_dword11_nswp[3];
-static int hf_nvme_set_features_tr_lbart = -1;
-static int hf_nvme_set_features_tr_lbart_type = -1;
+static int hf_nvme_set_features_tr_lbart;
+static int hf_nvme_set_features_tr_lbart_type;
 static int hf_nvme_set_features_tr_lbart_attr[4];
-static int hf_nvme_set_features_tr_lbart_rsvd0 = -1;
-static int hf_nvme_set_features_tr_lbart_slba = -1;
-static int hf_nvme_set_features_tr_lbart_nlb = -1;
-static int hf_nvme_set_features_tr_lbart_guid = -1;
-static int hf_nvme_set_features_tr_lbart_rsvd1 = -1;
+static int hf_nvme_set_features_tr_lbart_rsvd0;
+static int hf_nvme_set_features_tr_lbart_slba;
+static int hf_nvme_set_features_tr_lbart_nlb;
+static int hf_nvme_set_features_tr_lbart_guid;
+static int hf_nvme_set_features_tr_lbart_rsvd1;
 static int hf_nvme_set_features_tr_apst[5];
 static int hf_nvme_set_features_tr_tst[3];
-static int hf_nvme_set_features_tr_plmc = - 1;
+static int hf_nvme_set_features_tr_plmc;
 static int hf_nvme_set_features_tr_plmc_ee[7];
-static int hf_nvme_set_features_tr_plmc_rsvd0 = - 1;
-static int hf_nvme_set_features_tr_plmc_dtwinrt = -1;
-static int hf_nvme_set_features_tr_plmc_dtwinwt = -1;
-static int hf_nvme_set_features_tr_plmc_dtwintt = -1;
-static int hf_nvme_set_features_tr_plmc_rsvd1 = -1;
-static int hf_nvme_set_features_tr_hbs = -1;
-static int hf_nvme_set_features_tr_hbs_acre = -1;
-static int hf_nvme_set_features_tr_hbs_rsvd = -1;
+static int hf_nvme_set_features_tr_plmc_rsvd0;
+static int hf_nvme_set_features_tr_plmc_dtwinrt;
+static int hf_nvme_set_features_tr_plmc_dtwinwt;
+static int hf_nvme_set_features_tr_plmc_dtwintt;
+static int hf_nvme_set_features_tr_plmc_rsvd1;
+static int hf_nvme_set_features_tr_hbs;
+static int hf_nvme_set_features_tr_hbs_acre;
+static int hf_nvme_set_features_tr_hbs_rsvd;
 static int hf_nvme_get_features_dword10[4];
 static int hf_nvme_get_features_dword14[3];
 static int hf_nvme_cmd_get_features_dword11_rrl[3];
 static int hf_nvme_cmd_get_features_dword11_plmc[3];
 static int hf_nvme_cmd_get_features_dword11_plmw[3];
-static int hf_nvme_identify_ns_nsze = -1;
-static int hf_nvme_identify_ns_ncap = -1;
-static int hf_nvme_identify_ns_nuse = -1;
-static int hf_nvme_identify_ns_nsfeat = -1;
-static int hf_nvme_identify_ns_nlbaf = -1;
-static int hf_nvme_identify_ns_flbas = -1;
-static int hf_nvme_identify_ns_mc = -1;
-static int hf_nvme_identify_ns_dpc = -1;
-static int hf_nvme_identify_ns_dps = -1;
-static int hf_nvme_identify_ns_nmic = -1;
-static int hf_nvme_identify_ns_nguid = -1;
-static int hf_nvme_identify_ns_eui64 = -1;
-static int hf_nvme_identify_ns_lbafs = -1;
-static int hf_nvme_identify_ns_lbaf = -1;
-static int hf_nvme_identify_ns_rsvd = -1;
-static int hf_nvme_identify_ns_vs = -1;
-static int hf_nvme_identify_ctrl_vid = -1;
-static int hf_nvme_identify_ctrl_ssvid = -1;
-static int hf_nvme_identify_ctrl_sn = -1;
-static int hf_nvme_identify_ctrl_mn = -1;
-static int hf_nvme_identify_ctrl_fr = -1;
-static int hf_nvme_identify_ctrl_rab = -1;
-static int hf_nvme_identify_ctrl_ieee = -1;
+static int hf_nvme_identify_ns_nsze;
+static int hf_nvme_identify_ns_ncap;
+static int hf_nvme_identify_ns_nuse;
+static int hf_nvme_identify_ns_nsfeat;
+static int hf_nvme_identify_ns_nlbaf;
+static int hf_nvme_identify_ns_flbas;
+static int hf_nvme_identify_ns_mc;
+static int hf_nvme_identify_ns_dpc;
+static int hf_nvme_identify_ns_dps;
+static int hf_nvme_identify_ns_nmic;
+static int hf_nvme_identify_ns_nguid;
+static int hf_nvme_identify_ns_eui64;
+static int hf_nvme_identify_ns_lbafs;
+static int hf_nvme_identify_ns_lbaf;
+static int hf_nvme_identify_ns_rsvd;
+static int hf_nvme_identify_ns_vs;
+static int hf_nvme_identify_ctrl_vid;
+static int hf_nvme_identify_ctrl_ssvid;
+static int hf_nvme_identify_ctrl_sn;
+static int hf_nvme_identify_ctrl_mn;
+static int hf_nvme_identify_ctrl_fr;
+static int hf_nvme_identify_ctrl_rab;
+static int hf_nvme_identify_ctrl_ieee;
 static int hf_nvme_identify_ctrl_cmic[6];
-static int hf_nvme_identify_ctrl_mdts = -1;
-static int hf_nvme_identify_ctrl_cntlid = -1;
-static int hf_nvme_identify_ctrl_ver = -1;
-static int hf_nvme_identify_ctrl_ver_min = -1;
-static int hf_nvme_identify_ctrl_ver_mjr = -1;
-static int hf_nvme_identify_ctrl_ver_ter = -1;
-static int hf_nvme_identify_ctrl_rtd3r = -1;
-static int hf_nvme_identify_ctrl_rtd3e = -1;
+static int hf_nvme_identify_ctrl_mdts;
+static int hf_nvme_identify_ctrl_cntlid;
+static int hf_nvme_identify_ctrl_ver;
+static int hf_nvme_identify_ctrl_ver_min;
+static int hf_nvme_identify_ctrl_ver_mjr;
+static int hf_nvme_identify_ctrl_ver_ter;
+static int hf_nvme_identify_ctrl_rtd3r;
+static int hf_nvme_identify_ctrl_rtd3e;
 static int hf_nvme_identify_ctrl_oaes[10];
 static int hf_nvme_identify_ctrl_ctratt[12];
 static int hf_nvme_identify_ctrl_rrls[17];
-static int hf_nvme_identify_ctrl_rsvd0 = -1;
-static int hf_nvme_identify_ctrl_cntrltype = -1;
-static int hf_nvme_identify_ctrl_fguid = -1;
-static int hf_nvme_identify_ctrl_fguid_vse = -1;
-static int hf_nvme_identify_ctrl_fguid_oui = -1;
-static int hf_nvme_identify_ctrl_fguid_ei = -1;
-static int hf_nvme_identify_ctrl_crdt1 = -1;
-static int hf_nvme_identify_ctrl_crdt2 = -1;
-static int hf_nvme_identify_ctrl_crdt3 = -1;
-static int hf_nvme_identify_ctrl_rsvd1 = -1;
-static int hf_nvme_identify_ctrl_mi = -1;
-static int hf_nvme_identify_ctrl_mi_rsvd = -1;
+static int hf_nvme_identify_ctrl_rsvd0;
+static int hf_nvme_identify_ctrl_cntrltype;
+static int hf_nvme_identify_ctrl_fguid;
+static int hf_nvme_identify_ctrl_fguid_vse;
+static int hf_nvme_identify_ctrl_fguid_oui;
+static int hf_nvme_identify_ctrl_fguid_ei;
+static int hf_nvme_identify_ctrl_crdt1;
+static int hf_nvme_identify_ctrl_crdt2;
+static int hf_nvme_identify_ctrl_crdt3;
+static int hf_nvme_identify_ctrl_rsvd1;
+static int hf_nvme_identify_ctrl_mi;
+static int hf_nvme_identify_ctrl_mi_rsvd;
 static int hf_nvme_identify_ctrl_mi_nvmsr[4];
 static int hf_nvme_identify_ctrl_mi_vwci[3];
 static int hf_nvme_identify_ctrl_mi_mec[4];
 static int hf_nvme_identify_ctrl_oacs[12];
-static int hf_nvme_identify_ctrl_acl = -1;
-static int hf_nvme_identify_ctrl_aerl = -1;
+static int hf_nvme_identify_ctrl_acl;
+static int hf_nvme_identify_ctrl_aerl;
 static int hf_nvme_identify_ctrl_frmw[5];
 static int hf_nvme_identify_ctrl_lpa[7];
-static int hf_nvme_identify_ctrl_elpe = -1;
-static int hf_nvme_identify_ctrl_npss = -1;
+static int hf_nvme_identify_ctrl_elpe;
+static int hf_nvme_identify_ctrl_npss;
 static int hf_nvme_identify_ctrl_avscc[3];
 static int hf_nvme_identify_ctrl_apsta[3];
-static int hf_nvme_identify_ctrl_wctemp = -1;
-static int hf_nvme_identify_ctrl_cctemp = -1;
-static int hf_nvme_identify_ctrl_mtfa = -1;
-static int hf_nvme_identify_ctrl_hmpre = -1;
-static int hf_nvme_identify_ctrl_hmmin = -1;
-static int hf_nvme_identify_ctrl_tnvmcap = -1;
-static int  hf_nvme_identify_ctrl_unvmcap = -1;
+static int hf_nvme_identify_ctrl_wctemp;
+static int hf_nvme_identify_ctrl_cctemp;
+static int hf_nvme_identify_ctrl_mtfa;
+static int hf_nvme_identify_ctrl_hmpre;
+static int hf_nvme_identify_ctrl_hmmin;
+static int hf_nvme_identify_ctrl_tnvmcap;
+static int  hf_nvme_identify_ctrl_unvmcap;
 static int hf_nvme_identify_ctrl_rpmbs[6];
-static int hf_nvme_identify_ctrl_edstt = -1;
+static int hf_nvme_identify_ctrl_edstt;
 static int hf_nvme_identify_ctrl_dsto[3];
-static int hf_nvme_identify_ctrl_fwug = -1;
-static int hf_nvme_identify_ctrl_kas = -1;
+static int hf_nvme_identify_ctrl_fwug;
+static int hf_nvme_identify_ctrl_kas;
 static int hf_nvme_identify_ctrl_hctma[3];
-static int hf_nvme_identify_ctrl_mntmt = -1;
-static int hf_nvme_identify_ctrl_mxtmt = -1;
+static int hf_nvme_identify_ctrl_mntmt;
+static int hf_nvme_identify_ctrl_mxtmt;
 static int hf_nvme_identify_ctrl_sanicap[7];
-static int hf_nvme_identify_ctrl_hmmminds = -1;
-static int hf_nvme_identify_ctrl_hmmaxd = -1;
-static int hf_nvme_identify_ctrl_nsetidmax = -1;
-static int hf_nvme_identify_ctrl_endgidmax = -1;
-static int hf_nvme_identify_ctrl_anatt = -1;
+static int hf_nvme_identify_ctrl_hmmminds;
+static int hf_nvme_identify_ctrl_hmmaxd;
+static int hf_nvme_identify_ctrl_nsetidmax;
+static int hf_nvme_identify_ctrl_endgidmax;
+static int hf_nvme_identify_ctrl_anatt;
 static int hf_nvme_identify_ctrl_anacap[9];
-static int hf_nvme_identify_ctrl_anagrpmax = -1;
-static int hf_nvme_identify_ctrl_nanagrpid = -1;
-static int hf_nvme_identify_ctrl_pels = -1;
-static int hf_nvme_identify_ctrl_rsvd2 = -1;
+static int hf_nvme_identify_ctrl_anagrpmax;
+static int hf_nvme_identify_ctrl_nanagrpid;
+static int hf_nvme_identify_ctrl_pels;
+static int hf_nvme_identify_ctrl_rsvd2;
 static int hf_nvme_identify_ctrl_sqes[3];
 static int hf_nvme_identify_ctrl_cqes[3];
-static int hf_nvme_identify_ctrl_maxcmd = -1;
-static int hf_nvme_identify_ctrl_nn = -1;
+static int hf_nvme_identify_ctrl_maxcmd;
+static int hf_nvme_identify_ctrl_nn;
 static int hf_nvme_identify_ctrl_oncs[10];
 static int hf_nvme_identify_ctrl_fuses[3];
 static int hf_nvme_identify_ctrl_fna[5];
 static int hf_nvme_identify_ctrl_vwc[4];
-static int hf_nvme_identify_ctrl_awun = -1;
-static int hf_nvme_identify_ctrl_awupf = -1;
+static int hf_nvme_identify_ctrl_awun;
+static int hf_nvme_identify_ctrl_awupf;
 static int hf_nvme_identify_ctrl_nvscc[3];
 static int hf_nvme_identify_ctrl_nwpc[5];
-static int hf_nvme_identify_ctrl_acwu = -1;
-static int hf_nvme_identify_ctrl_rsvd3 = -1;
+static int hf_nvme_identify_ctrl_acwu;
+static int hf_nvme_identify_ctrl_rsvd3;
 static int hf_nvme_identify_ctrl_sgls[11];
-static int hf_nvme_identify_ctrl_mnan = -1;
-static int hf_nvme_identify_ctrl_rsvd4 = -1;
-static int hf_nvme_identify_ctrl_subnqn = -1;
-static int hf_nvme_identify_ctrl_rsvd5 = -1;
-static int hf_nvme_identify_ctrl_nvmeof = -1;
-static int hf_nvme_identify_ctrl_nvmeof_ioccsz = -1;
-static int hf_nvme_identify_ctrl_nvmeof_iorcsz = -1;
-static int hf_nvme_identify_ctrl_nvmeof_icdoff = -1;
+static int hf_nvme_identify_ctrl_mnan;
+static int hf_nvme_identify_ctrl_rsvd4;
+static int hf_nvme_identify_ctrl_subnqn;
+static int hf_nvme_identify_ctrl_rsvd5;
+static int hf_nvme_identify_ctrl_nvmeof;
+static int hf_nvme_identify_ctrl_nvmeof_ioccsz;
+static int hf_nvme_identify_ctrl_nvmeof_iorcsz;
+static int hf_nvme_identify_ctrl_nvmeof_icdoff;
 static int hf_nvme_identify_ctrl_nvmeof_fcatt[3];
-static int hf_nvme_identify_ctrl_nvmeof_msdbd = -1;
+static int hf_nvme_identify_ctrl_nvmeof_msdbd;
 static int hf_nvme_identify_ctrl_nvmeof_ofcs[3];
-static int hf_nvme_identify_ctrl_nvmeof_rsvd = -1;
-static int hf_nvme_identify_ctrl_psds = -1;
-static int hf_nvme_identify_ctrl_psd = -1;
-static int hf_nvme_identify_ctrl_psd_mp = -1;
-static int hf_nvme_identify_ctrl_psd_rsvd0 = -1;
-static int hf_nvme_identify_ctrl_psd_mxps = -1;
-static int hf_nvme_identify_ctrl_psd_nops = -1;
-static int hf_nvme_identify_ctrl_psd_rsvd1 = -1;
-static int hf_nvme_identify_ctrl_psd_enlat = -1;
-static int hf_nvme_identify_ctrl_psd_exlat = -1;
-static int hf_nvme_identify_ctrl_psd_rrt = -1;
-static int hf_nvme_identify_ctrl_psd_rsvd2 = -1;
-static int hf_nvme_identify_ctrl_psd_rrl = -1;
-static int hf_nvme_identify_ctrl_psd_rsvd3 = -1;
-static int hf_nvme_identify_ctrl_psd_rwt = -1;
-static int hf_nvme_identify_ctrl_psd_rsvd4 = -1;
-static int hf_nvme_identify_ctrl_psd_rwl = -1;
-static int hf_nvme_identify_ctrl_psd_rsvd5 = -1;
-static int hf_nvme_identify_ctrl_psd_idlp = -1;
-static int hf_nvme_identify_ctrl_psd_rsvd6 = -1;
-static int hf_nvme_identify_ctrl_psd_ips = -1;
-static int hf_nvme_identify_ctrl_psd_rsvd7 = -1;
-static int hf_nvme_identify_ctrl_psd_actp = -1;
-static int hf_nvme_identify_ctrl_psd_apw = -1;
-static int hf_nvme_identify_ctrl_psd_rsvd8 = -1;
-static int hf_nvme_identify_ctrl_psd_aps = -1;
-static int hf_nvme_identify_ctrl_psd_rsvd9 = -1;
-static int hf_nvme_identify_ctrl_vs = - 1;
-
-static int hf_nvme_identify_nslist_nsid = -1;
+static int hf_nvme_identify_ctrl_nvmeof_rsvd;
+static int hf_nvme_identify_ctrl_psds;
+static int hf_nvme_identify_ctrl_psd;
+static int hf_nvme_identify_ctrl_psd_mp;
+static int hf_nvme_identify_ctrl_psd_rsvd0;
+static int hf_nvme_identify_ctrl_psd_mxps;
+static int hf_nvme_identify_ctrl_psd_nops;
+static int hf_nvme_identify_ctrl_psd_rsvd1;
+static int hf_nvme_identify_ctrl_psd_enlat;
+static int hf_nvme_identify_ctrl_psd_exlat;
+static int hf_nvme_identify_ctrl_psd_rrt;
+static int hf_nvme_identify_ctrl_psd_rsvd2;
+static int hf_nvme_identify_ctrl_psd_rrl;
+static int hf_nvme_identify_ctrl_psd_rsvd3;
+static int hf_nvme_identify_ctrl_psd_rwt;
+static int hf_nvme_identify_ctrl_psd_rsvd4;
+static int hf_nvme_identify_ctrl_psd_rwl;
+static int hf_nvme_identify_ctrl_psd_rsvd5;
+static int hf_nvme_identify_ctrl_psd_idlp;
+static int hf_nvme_identify_ctrl_psd_rsvd6;
+static int hf_nvme_identify_ctrl_psd_ips;
+static int hf_nvme_identify_ctrl_psd_rsvd7;
+static int hf_nvme_identify_ctrl_psd_actp;
+static int hf_nvme_identify_ctrl_psd_apw;
+static int hf_nvme_identify_ctrl_psd_rsvd8;
+static int hf_nvme_identify_ctrl_psd_aps;
+static int hf_nvme_identify_ctrl_psd_rsvd9;
+static int hf_nvme_identify_ctrl_vs;
+
+static int hf_nvme_identify_nslist_nsid;
 
 /* get logpage response */
-static int hf_nvme_get_logpage_ify_genctr = -1;
-static int hf_nvme_get_logpage_ify_numrec = -1;
-static int hf_nvme_get_logpage_ify_recfmt = -1;
-static int hf_nvme_get_logpage_ify_rsvd = -1;
-static int hf_nvme_get_logpage_ify_rcrd = -1;
-static int hf_nvme_get_logpage_ify_rcrd_trtype = -1;
-static int hf_nvme_get_logpage_ify_rcrd_adrfam = - 1;
-static int hf_nvme_get_logpage_ify_rcrd_subtype = -1;
+static int hf_nvme_get_logpage_ify_genctr;
+static int hf_nvme_get_logpage_ify_numrec;
+static int hf_nvme_get_logpage_ify_recfmt;
+static int hf_nvme_get_logpage_ify_rsvd;
+static int hf_nvme_get_logpage_ify_rcrd;
+static int hf_nvme_get_logpage_ify_rcrd_trtype;
+static int hf_nvme_get_logpage_ify_rcrd_adrfam;
+static int hf_nvme_get_logpage_ify_rcrd_subtype;
 static int hf_nvme_get_logpage_ify_rcrd_treq[4];
-static int hf_nvme_get_logpage_ify_rcrd_portid = -1;
-static int hf_nvme_get_logpage_ify_rcrd_cntlid = -1;
-static int hf_nvme_get_logpage_ify_rcrd_asqsz = -1;
-static int hf_nvme_get_logpage_ify_rcrd_rsvd0 = -1;
-static int hf_nvme_get_logpage_ify_rcrd_trsvcid = -1;
-static int hf_nvme_get_logpage_ify_rcrd_rsvd1 = -1;
-static int hf_nvme_get_logpage_ify_rcrd_subnqn = -1;
-static int hf_nvme_get_logpage_ify_rcrd_traddr = -1;
-static int hf_nvme_get_logpage_ify_rcrd_tsas = -1;
-static int hf_nvme_get_logpage_ify_rcrd_tsas_rdma_qptype = -1;
-static int hf_nvme_get_logpage_ify_rcrd_tsas_rdma_prtype = -1;
-static int hf_nvme_get_logpage_ify_rcrd_tsas_rdma_cms = -1;
-static int hf_nvme_get_logpage_ify_rcrd_tsas_rdma_rsvd0 = -1;
-static int hf_nvme_get_logpage_ify_rcrd_tsas_rdma_pkey = -1;
-static int hf_nvme_get_logpage_ify_rcrd_tsas_rdma_rsvd1 = -1;
-static int hf_nvme_get_logpage_ify_rcrd_tsas_tcp_sectype = -1;
-static int hf_nvme_get_logpage_ify_rcrd_tsas_tcp_rsvd = -1;
-static int hf_nvme_get_logpage_errinf_errcnt = -1;
-static int hf_nvme_get_logpage_errinf_sqid = -1;
-static int hf_nvme_get_logpage_errinf_cid = -1;
+static int hf_nvme_get_logpage_ify_rcrd_portid;
+static int hf_nvme_get_logpage_ify_rcrd_cntlid;
+static int hf_nvme_get_logpage_ify_rcrd_asqsz;
+static int hf_nvme_get_logpage_ify_rcrd_rsvd0;
+static int hf_nvme_get_logpage_ify_rcrd_trsvcid;
+static int hf_nvme_get_logpage_ify_rcrd_rsvd1;
+static int hf_nvme_get_logpage_ify_rcrd_subnqn;
+static int hf_nvme_get_logpage_ify_rcrd_traddr;
+static int hf_nvme_get_logpage_ify_rcrd_tsas;
+static int hf_nvme_get_logpage_ify_rcrd_tsas_rdma_qptype;
+static int hf_nvme_get_logpage_ify_rcrd_tsas_rdma_prtype;
+static int hf_nvme_get_logpage_ify_rcrd_tsas_rdma_cms;
+static int hf_nvme_get_logpage_ify_rcrd_tsas_rdma_rsvd0;
+static int hf_nvme_get_logpage_ify_rcrd_tsas_rdma_pkey;
+static int hf_nvme_get_logpage_ify_rcrd_tsas_rdma_rsvd1;
+static int hf_nvme_get_logpage_ify_rcrd_tsas_tcp_sectype;
+static int hf_nvme_get_logpage_ify_rcrd_tsas_tcp_rsvd;
+static int hf_nvme_get_logpage_errinf_errcnt;
+static int hf_nvme_get_logpage_errinf_sqid;
+static int hf_nvme_get_logpage_errinf_cid;
 static int hf_nvme_get_logpage_errinf_sf[3];
 static int hf_nvme_get_logpage_errinf_pel[4];
-static int hf_nvme_get_logpage_errinf_lba = -1;
-static int hf_nvme_get_logpage_errinf_ns = -1;
-static int hf_nvme_get_logpage_errinf_vsi = -1;
-static int hf_nvme_get_logpage_errinf_trtype = -1;
-static int hf_nvme_get_logpage_errinf_rsvd0 = -1;
-static int hf_nvme_get_logpage_errinf_csi = -1;
-static int hf_nvme_get_logpage_errinf_tsi = -1;
-static int hf_nvme_get_logpage_errinf_rsvd1 = -1;
+static int hf_nvme_get_logpage_errinf_lba;
+static int hf_nvme_get_logpage_errinf_ns;
+static int hf_nvme_get_logpage_errinf_vsi;
+static int hf_nvme_get_logpage_errinf_trtype;
+static int hf_nvme_get_logpage_errinf_rsvd0;
+static int hf_nvme_get_logpage_errinf_csi;
+static int hf_nvme_get_logpage_errinf_tsi;
+static int hf_nvme_get_logpage_errinf_rsvd1;
 static int hf_nvme_get_logpage_smart_cw[8];
-static int hf_nvme_get_logpage_smart_ct = -1;
-static int hf_nvme_get_logpage_smart_asc = -1;
-static int hf_nvme_get_logpage_smart_ast = -1;
-static int hf_nvme_get_logpage_smart_lpu = -1;
+static int hf_nvme_get_logpage_smart_ct;
+static int hf_nvme_get_logpage_smart_asc;
+static int hf_nvme_get_logpage_smart_ast;
+static int hf_nvme_get_logpage_smart_lpu;
 static int hf_nvme_get_logpage_smart_egcws[6];
-static int hf_nvme_get_logpage_smart_rsvd0 = -1;
-static int hf_nvme_get_logpage_smart_dur = -1;
-static int hf_nvme_get_logpage_smart_duw = -1;
-static int hf_nvme_get_logpage_smart_hrc = -1;
-static int hf_nvme_get_logpage_smart_hwc = -1;
-static int hf_nvme_get_logpage_smart_cbt = -1;
-static int hf_nvme_get_logpage_smart_pc = -1;
-static int hf_nvme_get_logpage_smart_poh = -1;
-static int hf_nvme_get_logpage_smart_us = -1;
-static int hf_nvme_get_logpage_smart_mie = -1;
-static int hf_nvme_get_logpage_smart_ele = -1;
-static int hf_nvme_get_logpage_smart_wctt = -1;
-static int hf_nvme_get_logpage_smart_cctt = -1;
+static int hf_nvme_get_logpage_smart_rsvd0;
+static int hf_nvme_get_logpage_smart_dur;
+static int hf_nvme_get_logpage_smart_duw;
+static int hf_nvme_get_logpage_smart_hrc;
+static int hf_nvme_get_logpage_smart_hwc;
+static int hf_nvme_get_logpage_smart_cbt;
+static int hf_nvme_get_logpage_smart_pc;
+static int hf_nvme_get_logpage_smart_poh;
+static int hf_nvme_get_logpage_smart_us;
+static int hf_nvme_get_logpage_smart_mie;
+static int hf_nvme_get_logpage_smart_ele;
+static int hf_nvme_get_logpage_smart_wctt;
+static int hf_nvme_get_logpage_smart_cctt;
 static int hf_nvme_get_logpage_smart_ts[9];
-static int hf_nvme_get_logpage_smart_tmt1c = -1;
-static int hf_nvme_get_logpage_smart_tmt2c = -1;
-static int hf_nvme_get_logpage_smart_tmt1t = -1;
-static int hf_nvme_get_logpage_smart_tmt2t = -1;
-static int hf_nvme_get_logpage_smart_rsvd1 = -1;
+static int hf_nvme_get_logpage_smart_tmt1c;
+static int hf_nvme_get_logpage_smart_tmt2c;
+static int hf_nvme_get_logpage_smart_tmt1t;
+static int hf_nvme_get_logpage_smart_tmt2t;
+static int hf_nvme_get_logpage_smart_rsvd1;
 static int hf_nvme_get_logpage_fw_slot_afi[5];
-static int hf_nvme_get_logpage_fw_slot_rsvd0 = -1;
+static int hf_nvme_get_logpage_fw_slot_rsvd0;
 static int hf_nvme_get_logpage_fw_slot_frs[8];
-static int hf_nvme_get_logpage_fw_slot_rsvd1 = -1;
-static int hf_nvme_get_logpage_changed_nslist = -1;
-static int hf_nvme_get_logpage_cmd_and_eff_cs = -1;
+static int hf_nvme_get_logpage_fw_slot_rsvd1;
+static int hf_nvme_get_logpage_changed_nslist;
+static int hf_nvme_get_logpage_cmd_and_eff_cs;
 static int hf_nvme_get_logpage_cmd_and_eff_cseds[10];
 static int hf_nvme_get_logpage_selftest_csto[3];
 static int hf_nvme_get_logpage_selftest_cstc[3];
-static int hf_nvme_get_logpage_selftest_rsvd = -1;
-static int hf_nvme_get_logpage_selftest_res = -1;
+static int hf_nvme_get_logpage_selftest_rsvd;
+static int hf_nvme_get_logpage_selftest_res;
 static int hf_nvme_get_logpage_selftest_res_status[3];
-static int hf_nvme_get_logpage_selftest_res_sn = -1;
+static int hf_nvme_get_logpage_selftest_res_sn;
 static int hf_nvme_get_logpage_selftest_res_vdi[6];
-static int hf_nvme_get_logpage_selftest_res_rsvd = -1;
-static int hf_nvme_get_logpage_selftest_res_poh = -1;
-static int hf_nvme_get_logpage_selftest_res_nsid = -1;
-static int hf_nvme_get_logpage_selftest_res_flba = -1;
+static int hf_nvme_get_logpage_selftest_res_rsvd;
+static int hf_nvme_get_logpage_selftest_res_poh;
+static int hf_nvme_get_logpage_selftest_res_nsid;
+static int hf_nvme_get_logpage_selftest_res_flba;
 static int hf_nvme_get_logpage_selftest_res_sct[3];
-static int hf_nvme_get_logpage_selftest_res_sc = -1;
-static int hf_nvme_get_logpage_selftest_res_vs = -1;
-static int hf_nvme_get_logpage_telemetry_li = -1;
-static int hf_nvme_get_logpage_telemetry_rsvd0 = -1;
-static int hf_nvme_get_logpage_telemetry_ieee = -1;
-static int hf_nvme_get_logpage_telemetry_da1lb = -1;
-static int hf_nvme_get_logpage_telemetry_da2lb = -1;
-static int hf_nvme_get_logpage_telemetry_da3lb = -1;
-static int hf_nvme_get_logpage_telemetry_rsvd1 = -1;
-static int hf_nvme_get_logpage_telemetry_da = -1;
-static int hf_nvme_get_logpage_telemetry_dgn = -1;
-static int hf_nvme_get_logpage_telemetry_ri = -1;
-static int hf_nvme_get_logpage_telemetry_db = -1;
+static int hf_nvme_get_logpage_selftest_res_sc;
+static int hf_nvme_get_logpage_selftest_res_vs;
+static int hf_nvme_get_logpage_telemetry_li;
+static int hf_nvme_get_logpage_telemetry_rsvd0;
+static int hf_nvme_get_logpage_telemetry_ieee;
+static int hf_nvme_get_logpage_telemetry_da1lb;
+static int hf_nvme_get_logpage_telemetry_da2lb;
+static int hf_nvme_get_logpage_telemetry_da3lb;
+static int hf_nvme_get_logpage_telemetry_rsvd1;
+static int hf_nvme_get_logpage_telemetry_da;
+static int hf_nvme_get_logpage_telemetry_dgn;
+static int hf_nvme_get_logpage_telemetry_ri;
+static int hf_nvme_get_logpage_telemetry_db;
 static int hf_nvme_get_logpage_egroup_cw[6];
-static int hf_nvme_get_logpage_egroup_rsvd0 = -1;
-static int hf_nvme_get_logpage_egroup_as = -1;
-static int hf_nvme_get_logpage_egroup_ast = -1;
-static int hf_nvme_get_logpage_egroup_pu = -1;
-static int hf_nvme_get_logpage_egroup_rsvd1 = -1;
-static int hf_nvme_get_logpage_egroup_ee = -1;
-static int hf_nvme_get_logpage_egroup_dur = -1;
-static int hf_nvme_get_logpage_egroup_duw = -1;
-static int hf_nvme_get_logpage_egroup_muw = -1;
-static int hf_nvme_get_logpage_egroup_hrc = -1;
-static int hf_nvme_get_logpage_egroup_hwc = -1;
-static int hf_nvme_get_logpage_egroup_mdie = -1;
-static int hf_nvme_get_logpage_egroup_ele = -1;
-static int hf_nvme_get_logpage_egroup_rsvd2 = -1;
+static int hf_nvme_get_logpage_egroup_rsvd0;
+static int hf_nvme_get_logpage_egroup_as;
+static int hf_nvme_get_logpage_egroup_ast;
+static int hf_nvme_get_logpage_egroup_pu;
+static int hf_nvme_get_logpage_egroup_rsvd1;
+static int hf_nvme_get_logpage_egroup_ee;
+static int hf_nvme_get_logpage_egroup_dur;
+static int hf_nvme_get_logpage_egroup_duw;
+static int hf_nvme_get_logpage_egroup_muw;
+static int hf_nvme_get_logpage_egroup_hrc;
+static int hf_nvme_get_logpage_egroup_hwc;
+static int hf_nvme_get_logpage_egroup_mdie;
+static int hf_nvme_get_logpage_egroup_ele;
+static int hf_nvme_get_logpage_egroup_rsvd2;
 static int hf_nvme_get_logpage_pred_lat_status[3];
-static int hf_nvme_get_logpage_pred_lat_rsvd0 = -1;
+static int hf_nvme_get_logpage_pred_lat_rsvd0;
 static int hf_nvme_get_logpage_pred_lat_etype[7];
-static int hf_nvme_get_logpage_pred_lat_rsvd1 = -1;
-static int hf_nvme_get_logpage_pred_lat_dtwin_rt = -1;
-static int hf_nvme_get_logpage_pred_lat_dtwin_wt = -1;
-static int hf_nvme_get_logpage_pred_lat_dtwin_tm = -1;
-static int hf_nvme_get_logpage_pred_lat_ndwin_tmh = -1;
-static int hf_nvme_get_logpage_pred_lat_ndwin_tml = -1;
-static int hf_nvme_get_logpage_pred_lat_rsvd2 = -1;
-static int hf_nvme_get_logpage_pred_lat_dtwin_re = -1;
-static int hf_nvme_get_logpage_pred_lat_dtwin_we = -1;
-static int hf_nvme_get_logpage_pred_lat_dtwin_te = -1;
-static int hf_nvme_get_logpage_pred_lat_rsvd3 = -1;
-static int hf_nvme_get_logpage_pred_lat_aggreg_ne = -1;
-static int hf_nvme_get_logpage_pred_lat_aggreg_nset = -1;
-static int hf_nvme_get_logpage_ana_chcnt = -1;
-static int hf_nvme_get_logpage_ana_ngd = -1;
-static int hf_nvme_get_logpage_ana_rsvd = -1;
-static int hf_nvme_get_logpage_ana_grp = -1;
-static int hf_nvme_get_logpage_ana_grp_id = -1;
-static int hf_nvme_get_logpage_ana_grp_nns = -1;
-static int hf_nvme_get_logpage_ana_grp_chcnt = -1;
+static int hf_nvme_get_logpage_pred_lat_rsvd1;
+static int hf_nvme_get_logpage_pred_lat_dtwin_rt;
+static int hf_nvme_get_logpage_pred_lat_dtwin_wt;
+static int hf_nvme_get_logpage_pred_lat_dtwin_tm;
+static int hf_nvme_get_logpage_pred_lat_ndwin_tmh;
+static int hf_nvme_get_logpage_pred_lat_ndwin_tml;
+static int hf_nvme_get_logpage_pred_lat_rsvd2;
+static int hf_nvme_get_logpage_pred_lat_dtwin_re;
+static int hf_nvme_get_logpage_pred_lat_dtwin_we;
+static int hf_nvme_get_logpage_pred_lat_dtwin_te;
+static int hf_nvme_get_logpage_pred_lat_rsvd3;
+static int hf_nvme_get_logpage_pred_lat_aggreg_ne;
+static int hf_nvme_get_logpage_pred_lat_aggreg_nset;
+static int hf_nvme_get_logpage_ana_chcnt;
+static int hf_nvme_get_logpage_ana_ngd;
+static int hf_nvme_get_logpage_ana_rsvd;
+static int hf_nvme_get_logpage_ana_grp;
+static int hf_nvme_get_logpage_ana_grp_id;
+static int hf_nvme_get_logpage_ana_grp_nns;
+static int hf_nvme_get_logpage_ana_grp_chcnt;
 static int hf_nvme_get_logpage_ana_grp_anas[3];
-static int hf_nvme_get_logpage_ana_grp_rsvd = -1;
-static int hf_nvme_get_logpage_ana_grp_nsid = -1;
-static int hf_nvme_get_logpage_lba_status_lslplen = -1;
-static int hf_nvme_get_logpage_lba_status_nlslne = -1;
-static int hf_nvme_get_logpage_lba_status_estulb = -1;
-static int hf_nvme_get_logpage_lba_status_rsvd = -1;
-static int hf_nvme_get_logpage_lba_status_lsgc = -1;
-static int hf_nvme_get_logpage_lba_status_nel = -1;
-static int hf_nvme_get_logpage_lba_status_nel_ne = -1;
-static int hf_nvme_get_logpage_lba_status_nel_ne_neid = -1;
-static int hf_nvme_get_logpage_lba_status_nel_ne_nlrd = -1;
-static int hf_nvme_get_logpage_lba_status_nel_ne_ratype = -1;
-static int hf_nvme_get_logpage_lba_status_nel_ne_rsvd = -1;
-static int hf_nvme_get_logpage_lba_status_nel_ne_rd = -1;
-static int hf_nvme_get_logpage_lba_status_nel_ne_rd_rslba = -1;
-static int hf_nvme_get_logpage_lba_status_nel_ne_rd_rnlb = -1;
-static int hf_nvme_get_logpage_lba_status_nel_ne_rd_rsvd = -1;
-static int hf_nvme_get_logpage_egroup_aggreg_ne = -1;
-static int hf_nvme_get_logpage_egroup_aggreg_eg = -1;
-static int hf_nvme_get_logpage_reserv_notif_lpc = -1;
-static int hf_nvme_get_logpage_reserv_notif_lpt = -1;
-static int hf_nvme_get_logpage_reserv_notif_nalp = -1;
-static int hf_nvme_get_logpage_reserv_notif_rsvd0 = -1;
-static int hf_nvme_get_logpage_reserv_notif_nsid = -1;
-static int hf_nvme_get_logpage_reserv_notif_rsvd1 = -1;
-static int hf_nvme_get_logpage_sanitize_sprog = -1;
+static int hf_nvme_get_logpage_ana_grp_rsvd;
+static int hf_nvme_get_logpage_ana_grp_nsid;
+static int hf_nvme_get_logpage_lba_status_lslplen;
+static int hf_nvme_get_logpage_lba_status_nlslne;
+static int hf_nvme_get_logpage_lba_status_estulb;
+static int hf_nvme_get_logpage_lba_status_rsvd;
+static int hf_nvme_get_logpage_lba_status_lsgc;
+static int hf_nvme_get_logpage_lba_status_nel;
+static int hf_nvme_get_logpage_lba_status_nel_ne;
+static int hf_nvme_get_logpage_lba_status_nel_ne_neid;
+static int hf_nvme_get_logpage_lba_status_nel_ne_nlrd;
+static int hf_nvme_get_logpage_lba_status_nel_ne_ratype;
+static int hf_nvme_get_logpage_lba_status_nel_ne_rsvd;
+static int hf_nvme_get_logpage_lba_status_nel_ne_rd;
+static int hf_nvme_get_logpage_lba_status_nel_ne_rd_rslba;
+static int hf_nvme_get_logpage_lba_status_nel_ne_rd_rnlb;
+static int hf_nvme_get_logpage_lba_status_nel_ne_rd_rsvd;
+static int hf_nvme_get_logpage_egroup_aggreg_ne;
+static int hf_nvme_get_logpage_egroup_aggreg_eg;
+static int hf_nvme_get_logpage_reserv_notif_lpc;
+static int hf_nvme_get_logpage_reserv_notif_lpt;
+static int hf_nvme_get_logpage_reserv_notif_nalp;
+static int hf_nvme_get_logpage_reserv_notif_rsvd0;
+static int hf_nvme_get_logpage_reserv_notif_nsid;
+static int hf_nvme_get_logpage_reserv_notif_rsvd1;
+static int hf_nvme_get_logpage_sanitize_sprog;
 static int hf_nvme_get_logpage_sanitize_sstat[5];
-static int hf_nvme_get_logpage_sanitize_scdw10 = -1;
-static int hf_nvme_get_logpage_sanitize_eto = -1;
-static int hf_nvme_get_logpage_sanitize_etbe = -1;
-static int hf_nvme_get_logpage_sanitize_etce = -1;
-static int hf_nvme_get_logpage_sanitize_etond = -1;
-static int hf_nvme_get_logpage_sanitize_etbend = -1;
-static int hf_nvme_get_logpage_sanitize_etcend = -1;
-static int hf_nvme_get_logpage_sanitize_rsvd = -1;
+static int hf_nvme_get_logpage_sanitize_scdw10;
+static int hf_nvme_get_logpage_sanitize_eto;
+static int hf_nvme_get_logpage_sanitize_etbe;
+static int hf_nvme_get_logpage_sanitize_etce;
+static int hf_nvme_get_logpage_sanitize_etond;
+static int hf_nvme_get_logpage_sanitize_etbend;
+static int hf_nvme_get_logpage_sanitize_etcend;
+static int hf_nvme_get_logpage_sanitize_rsvd;
 
 /* NVMe CQE fields */
-static int hf_nvme_cqe_dword0 = -1;
+static int hf_nvme_cqe_dword0;
 static int hf_nvme_cqe_aev_dword0[6];
 static int hf_nvme_cqe_dword0_sf_nq[3];
-static int hf_nvme_cqe_dword0_sf_err = -1;
+static int hf_nvme_cqe_dword0_sf_err;
 
 static int hf_nvme_cqe_get_features_dword0_arb[6];
 static int hf_nvme_cqe_get_features_dword0_pm[4];
@@ -632,24 +632,24 @@ static int hf_nvme_cqe_get_features_dword0_rsrvn[6];
 static int hf_nvme_cqe_get_features_dword0_rsrvp[3];
 static int hf_nvme_cqe_get_features_dword0_nswp[3];
 
-static int hf_nvme_cqe_dword1 = -1;
-static int hf_nvme_cqe_sqhd = -1;
-static int hf_nvme_cqe_sqid = -1;
-static int hf_nvme_cqe_cid = -1;
+static int hf_nvme_cqe_dword1;
+static int hf_nvme_cqe_sqhd;
+static int hf_nvme_cqe_sqid;
+static int hf_nvme_cqe_cid;
 static int hf_nvme_cqe_status[7];
-static int hf_nvme_cqe_status_rsvd = -1;
+static int hf_nvme_cqe_status_rsvd;
 
 /* tracking Cmd and its respective CQE */
-static int hf_nvme_cmd_pkt = -1;
-static int hf_nvme_data_req = -1;
+static int hf_nvme_cmd_pkt;
+static int hf_nvme_data_req;
 static int hf_nvme_data_tr[NVME_CMD_MAX_TRS];
-static int hf_nvme_cqe_pkt = -1;
-static int hf_nvme_cmd_latency = -1;
+static int hf_nvme_cqe_pkt;
+static int hf_nvme_cmd_latency;
 
 /* Data response fields */
-static int hf_nvme_gen_data = -1;
+static int hf_nvme_gen_data;
 /* Initialize the subtree pointers */
-static gint ett_data = -1;
+static gint ett_data;
 
 #define NVME_AQ_OPC_DELETE_SQ           0x0
 #define NVME_AQ_OPC_CREATE_SQ           0x1
diff --git a/epan/dissectors/packet-nwmtp.c b/epan/dissectors/packet-nwmtp.c
index 4ab1ade8c9..376e364fb6 100644
--- a/epan/dissectors/packet-nwmtp.c
+++ b/epan/dissectors/packet-nwmtp.c
@@ -18,16 +18,16 @@ void proto_register_mwmtp(void);
 void proto_reg_handoff_nwmtp(void);
 
 static dissector_handle_t mtp_handle;
-static gint proto_nwmtp = -1;
+static gint proto_nwmtp;
 
-static int hf_nwmtp_transp_type = -1;
-static int hf_nwmtp_user_context = -1;
-static int hf_nwmtp_data_type = -1;
-static int hf_nwmtp_data_index = -1;
-static int hf_nwmtp_data_length = -1;
+static int hf_nwmtp_transp_type;
+static int hf_nwmtp_user_context;
+static int hf_nwmtp_data_type;
+static int hf_nwmtp_data_index;
+static int hf_nwmtp_data_length;
 
 /* subtree pointer */
-static gint ett_mwmtp = -1;
+static gint ett_mwmtp;
 
 static dissector_handle_t nwmtp_handle;
 
diff --git a/epan/dissectors/packet-nwp.c b/epan/dissectors/packet-nwp.c
index 89b8ae528b..b4e8a7df3f 100644
--- a/epan/dissectors/packet-nwp.c
+++ b/epan/dissectors/packet-nwp.c
@@ -21,32 +21,32 @@
 void proto_register_nwp(void);
 void proto_reg_handoff_nwp(void);
 
-static gint proto_nwp		= -1;
+static gint proto_nwp;
 
 /* Header fields for all NWP headers. */
-static gint hf_nwp_version	= -1;
-static gint hf_nwp_type		= -1;
-static gint hf_nwp_hid_count	= -1;
-static gint hf_nwp_haddr_len	= -1;
+static gint hf_nwp_version;
+static gint hf_nwp_type;
+static gint hf_nwp_hid_count;
+static gint hf_nwp_haddr_len;
 
 /* Header fields for NWP Announcement packets. */
-static gint hf_nwp_ann_haddr	= -1;
-static gint hf_nwp_ann_hids	= -1;
-static gint hf_nwp_ann_hid	= -1;
+static gint hf_nwp_ann_haddr;
+static gint hf_nwp_ann_hids;
+static gint hf_nwp_ann_hid;
 
 /* Header fields for NWP Neighbor List packets. */
-static gint hf_nwp_neigh_list	= -1;
-static gint hf_nwp_neigh	= -1;
-static gint hf_nwp_neigh_hid	= -1;
-static gint hf_nwp_neigh_num	= -1;
-static gint hf_nwp_neigh_haddr	= -1;
-
-static gint ett_nwp_tree		= -1;
-static gint ett_nwp_ann_hid_tree	= -1;
-static gint ett_nwp_neigh_list_tree	= -1;
-static gint ett_nwp_neigh_tree		= -1;
-
-static expert_field ei_nwp_bad_type = EI_INIT;
+static gint hf_nwp_neigh_list;
+static gint hf_nwp_neigh;
+static gint hf_nwp_neigh_hid;
+static gint hf_nwp_neigh_num;
+static gint hf_nwp_neigh_haddr;
+
+static gint ett_nwp_tree;
+static gint ett_nwp_ann_hid_tree;
+static gint ett_nwp_neigh_list_tree;
+static gint ett_nwp_neigh_tree;
+
+static expert_field ei_nwp_bad_type;
 
 static dissector_handle_t nwp_handle;
 
diff --git a/epan/dissectors/packet-nxp_802154_sniffer.c b/epan/dissectors/packet-nxp_802154_sniffer.c
index 2a69e9e2d6..03825e317f 100644
--- a/epan/dissectors/packet-nxp_802154_sniffer.c
+++ b/epan/dissectors/packet-nxp_802154_sniffer.c
@@ -33,15 +33,15 @@
 void proto_reg_handoff_nxp_802154_sniffer(void);
 void proto_register_nxp_802154_sniffer(void);
 
-static int proto_nxp_802154_sniffer = -1;
+static int proto_nxp_802154_sniffer;
 
-static int hf_nxp_802154_sniffer_timestamp = -1;
-static int hf_nxp_802154_sniffer_id = -1;
-static int hf_nxp_802154_sniffer_channel = -1;
-static int hf_nxp_802154_sniffer_lqi = -1;
-static int hf_nxp_802154_sniffer_length = -1;
+static int hf_nxp_802154_sniffer_timestamp;
+static int hf_nxp_802154_sniffer_id;
+static int hf_nxp_802154_sniffer_channel;
+static int hf_nxp_802154_sniffer_lqi;
+static int hf_nxp_802154_sniffer_length;
 
-static gint ett_nxp_802154_sniffer = -1;
+static gint ett_nxp_802154_sniffer;
 
 static dissector_handle_t nxp_802154_sniffer_handle;
 static dissector_handle_t ieee802154_handle;
diff --git a/epan/dissectors/packet-oampdu.c b/epan/dissectors/packet-oampdu.c
index 27f417a4ee..5f2d1aa345 100644
--- a/epan/dissectors/packet-oampdu.c
+++ b/epan/dissectors/packet-oampdu.c
@@ -997,203 +997,203 @@ static dgt_set_t Dgt0_9_bcd = {
 };
 
 /* Initialise the protocol and registered fields */
-static int proto_oampdu = -1;
-
-static int hf_oampdu_flags = -1;
-static int hf_oampdu_flags_link_fault = -1;
-static int hf_oampdu_flags_dying_gasp = -1;
-static int hf_oampdu_flags_critical_event = -1;
-static int hf_oampdu_flags_local_evaluating = -1;
-static int hf_oampdu_flags_local_stable = -1;
-static int hf_oampdu_flags_remote_evaluating = -1;
-static int hf_oampdu_flags_remote_stable = -1;
-static int hf_oampdu_code = -1;
-
-static int hf_oampdu_info_type = -1;
-static int hf_oampdu_info_len = -1;
-static int hf_oampdu_info_version = -1;
-static int hf_oampdu_info_revision = -1;
-static int hf_oampdu_info_state = -1;
-static int hf_oampdu_info_oamConfig = -1;
-static int hf_oampdu_info_oampduConfig = -1;
-static int hf_oampdu_info_oui = -1;
-static int hf_oampdu_info_vendor = -1;
-/* static int hf_oampdu_info_dpoe_oam_version = -1; */
-static int hf_oampdu_info_state_parser = -1;
-static int hf_oampdu_info_state_mux = -1;
-
-static int hf_oampdu_info_oamConfig_mode = -1;
-static int hf_oampdu_info_oamConfig_uni = -1;
-static int hf_oampdu_info_oamConfig_lpbk = -1;
-static int hf_oampdu_info_oamConfig_event = -1;
-static int hf_oampdu_info_oamConfig_var = -1;
-
-static int hf_oampdu_event_type = -1;
-static int hf_oampdu_event_sequence = -1;
-static int hf_oampdu_event_length = -1;
-static int hf_oampdu_event_timeStamp = -1;
-
-static int hf_oampdu_event_espeWindow = -1;
-static int hf_oampdu_event_espeThreshold = -1;
-static int hf_oampdu_event_espeErrors = -1;
-static int hf_oampdu_event_espeTotalErrors = -1;
-static int hf_oampdu_event_espeTotalEvents = -1;
-
-static int hf_oampdu_event_efeWindow = -1;
-static int hf_oampdu_event_efeThreshold = -1;
-static int hf_oampdu_event_efeErrors = -1;
-static int hf_oampdu_event_efeTotalErrors = -1;
-static int hf_oampdu_event_efeTotalEvents = -1;
-
-static int hf_oampdu_event_efpeWindow = -1;
-static int hf_oampdu_event_efpeThreshold = -1;
-static int hf_oampdu_event_efpeErrors = -1;
-static int hf_oampdu_event_efpeTotalErrors = -1;
-static int hf_oampdu_event_efpeTotalEvents = -1;
-
-static int hf_oampdu_event_efsseWindow = -1;
-static int hf_oampdu_event_efsseThreshold = -1;
-static int hf_oampdu_event_efsseErrors = -1;
-static int hf_oampdu_event_efsseTotalErrors = -1;
-static int hf_oampdu_event_efsseTotalEvents = -1;
-
-static int hf_oampdu_variable_branch = -1;
-static int hf_oampdu_variable_object = -1;
-static int hf_oampdu_variable_package = -1;
-static int hf_oampdu_variable_binding = -1;
-static int hf_oampdu_variable_attribute = -1;
-static int hf_oampdu_variable_width = -1;
-static int hf_oampdu_variable_indication = -1;
-static int hf_oampdu_variable_value = -1;
-/* static int hf_oampdu_vendor_specific_opcode = -1; */
-static int hf_oampdu_vendor_specific_dpoe_opcode = -1;
-static int hf_oampdu_vendor_specific_dpoe_evt_code = -1;
-static int hf_oampdu_vendor_specific_dpoe_evt_raised = -1;
-static int hf_oampdu_vendor_specific_dpoe_evt_object_type = -1;
-static int hf_dpoe_variable_descriptor = -1;
-static int hf_dpoe_variable_response_code = -1;
-static int hf_oam_dpoe_response_eth = -1;
-static int hf_oam_dpoe_response_int = -1;
-
-static int hf_oam_dpoe_fw_info_boot_version = -1;
-static int hf_oam_dpoe_fw_info_boot_crc = -1;
-static int hf_oam_dpoe_fw_info_fw_version = -1;
-static int hf_oam_dpoe_fw_info_fw_crc = -1;
-static int hf_oam_dpoe_date_of_manufacture = -1;
-static int hf_oam_dpoe_chipset_jedec_id = -1;
-static int hf_oam_dpoe_chipset_chip_model = -1;
-static int hf_oam_dpoe_chipset_chip_version = -1;
-static int hf_oam_dpoe_mfg_info_serial_number = -1;
-static int hf_oam_dpoe_mfg_info_vendor_specific = -1;
-static int hf_oam_dpoe_mll_b = -1;
-static int hf_oam_dpoe_mll_do = -1;
-static int hf_oam_dpoe_pkt_buffer_us_queues = -1;
-static int hf_oam_dpoe_pkt_buffer_us_queues_max_per_link = -1;
-static int hf_oam_dpoe_pkt_buffer_us_queue_inc = -1;
-static int hf_oam_dpoe_pkt_buffer_ds_queues = -1;
-static int hf_oam_dpoe_pkt_buffer_ds_queues_max_per_link = -1;
-static int hf_oam_dpoe_pkt_buffer_ds_queue_inc = -1;
-static int hf_oam_dpoe_pkt_buffer_total_memory = -1;
-static int hf_oam_dpoe_pkt_buffer_us_memory_max = -1;
-static int hf_oam_dpoe_pkt_buffer_ds_memory_max = -1;
-static int hf_oam_dpoe_frame_rate_minimum = -1;
-static int hf_oam_dpoe_frame_rate_maximum = -1;
-static int hf_oam_dpoe_mfg_org_name = -1;
-static int hf_oam_dpoe_tvc_code_access_start = -1;
-static int hf_oam_dpoe_tvc_cvc_access_start = -1;
-static int hf_oam_dpoe_vendor_name = -1;
-static int hf_oam_dpoe_model_number = -1;
-static int hf_oam_dpoe_hw_version = -1;
-static int hf_oam_dpoe_sw_bundle = -1;
-static int hf_oam_dpoe_repthr_nqs = -1;
-static int hf_oam_dpoe_repthr_rvpqs = -1;
-static int hf_oam_dpoe_report_threshold = -1;
-static int hf_oam_dpoe_ll_fwd_state = -1;
-static int hf_oam_dpoe_s1_autoneg = -1;
-static int hf_oam_dpoe_s1_autoneg_hd = -1;
-static int hf_oam_dpoe_s1_autoneg_fd = -1;
-static int hf_oam_dpoe_s1_autoneg_10 = -1;
-static int hf_oam_dpoe_s1_autoneg_100 = -1;
-static int hf_oam_dpoe_s1_autoneg_1000 = -1;
-static int hf_oam_dpoe_s1_autoneg_10000 = -1;
-static int hf_oam_dpoe_s1_autoneg_fc = -1;
-static int hf_oam_dpoe_s1_autoneg_mdi = -1;
-static int hf_oam_dpoe_user_port_object = -1;
-static int hf_oam_dpoe_user_port_object_subtype = -1;
-static int hf_oam_dpoe_user_port_object_header_precedence = -1;
-static int hf_oam_dpoe_user_port_object_clause_fc = -1;
-static int hf_oam_dpoe_user_port_object_clause_fi = -1;
-static int hf_oam_dpoe_user_port_object_clause_msbm = -1;
-static int hf_oam_dpoe_user_port_object_clause_lsbm = -1;
-static int hf_oam_dpoe_user_port_object_clause_operator = -1;
-static int hf_oam_dpoe_user_port_object_clause_mvl = -1;
-static int hf_oam_dpoe_user_port_object_clause_mv = -1;
-static int hf_oam_dpoe_user_port_object_result_rr = -1;
-static int hf_oam_dpoe_user_port_object_result_rr_queue_obj_type = -1;
-static int hf_oam_dpoe_user_port_object_result_rr_queue_obj_inst = -1;
-static int hf_oam_dpoe_user_port_object_result_rr_queue_queue_index = -1;
-static int hf_oam_dpoe_user_port_object_result_rr_set_fc = -1;
-static int hf_oam_dpoe_user_port_object_result_rr_set_fi = -1;
-static int hf_oam_dpoe_user_port_object_result_rr_copy = -1;
-static int hf_oam_dpoe_user_port_object_result_rr_delete = -1;
-static int hf_oam_dpoe_user_port_object_result_rr_insert = -1;
-static int hf_oam_dpoe_user_port_object_result_rr_replace = -1;
-static int hf_oam_dpoe_user_port_object_result_rr_cd = -1;
-static int hf_oam_dpoe_user_port_object_result_rr_ci = -1;
-static int hf_oam_dpoe_qc_ll_u = -1;
-static int hf_oam_dpoe_qc_ports_d = -1;
-static int hf_oam_dpoe_qc_nq = -1;
-static int hf_oam_dpoe_qc_queue_size = -1;
-static int hf_oam_dpoe_fw_filename = -1;
-static int hf_oam_dpoe_onu_port_config_llid_count = -1;
-static int hf_oam_dpoe_onu_port_config_uni_count = -1;
-
-static int hf_oam_dpoe_1904_1_mac_enable_status = -1;
-static int hf_oam_dpoe_1904_1_a_phy_type = -1;
-static int hf_oam_dpoe_1904_1_media_available = -1;
-static int hf_oam_dpoe_1904_1_autoneg_admstate = -1;
-static int hf_oam_dpoe_1904_1_duplex_status = -1;
-static int hf_oam_dpoe_1904_1_mac_control_functions_supported = -1;
-static int hf_oam_dpoe_1904_1_cfg_mcast_llid_action = -1;
-static int hf_oam_dpoe_1904_1_cfg_mcast_llid_value = -1;
-static int hf_oam_dpoe_1904_1_read_write_mac_address = -1;
-static int hf_oam_dpoe_1904_1_qc_queue_size = -1;
-
-static int hf_oampdu_lpbk = -1;
-static int hf_oampdu_lpbk_enable = -1;
-static int hf_oampdu_lpbk_disable = -1;
-
-static gint ett_oampdu_vendor_specific = -1;
-static gint ett_dpoe_opcode = -1;
-static gint ett_dpoe_opcode_response = -1;
-static gint ett_oam_dpoe_s1_autoneg = -1;
-static gint ett_oam_dpoe_qc_u = -1;
-static gint ett_oam_dpoe_qc_d = -1;
-static gint ett_oam_dpoe_qc_nq = -1;
+static int proto_oampdu;
+
+static int hf_oampdu_flags;
+static int hf_oampdu_flags_link_fault;
+static int hf_oampdu_flags_dying_gasp;
+static int hf_oampdu_flags_critical_event;
+static int hf_oampdu_flags_local_evaluating;
+static int hf_oampdu_flags_local_stable;
+static int hf_oampdu_flags_remote_evaluating;
+static int hf_oampdu_flags_remote_stable;
+static int hf_oampdu_code;
+
+static int hf_oampdu_info_type;
+static int hf_oampdu_info_len;
+static int hf_oampdu_info_version;
+static int hf_oampdu_info_revision;
+static int hf_oampdu_info_state;
+static int hf_oampdu_info_oamConfig;
+static int hf_oampdu_info_oampduConfig;
+static int hf_oampdu_info_oui;
+static int hf_oampdu_info_vendor;
+/* static int hf_oampdu_info_dpoe_oam_version; */
+static int hf_oampdu_info_state_parser;
+static int hf_oampdu_info_state_mux;
+
+static int hf_oampdu_info_oamConfig_mode;
+static int hf_oampdu_info_oamConfig_uni;
+static int hf_oampdu_info_oamConfig_lpbk;
+static int hf_oampdu_info_oamConfig_event;
+static int hf_oampdu_info_oamConfig_var;
+
+static int hf_oampdu_event_type;
+static int hf_oampdu_event_sequence;
+static int hf_oampdu_event_length;
+static int hf_oampdu_event_timeStamp;
+
+static int hf_oampdu_event_espeWindow;
+static int hf_oampdu_event_espeThreshold;
+static int hf_oampdu_event_espeErrors;
+static int hf_oampdu_event_espeTotalErrors;
+static int hf_oampdu_event_espeTotalEvents;
+
+static int hf_oampdu_event_efeWindow;
+static int hf_oampdu_event_efeThreshold;
+static int hf_oampdu_event_efeErrors;
+static int hf_oampdu_event_efeTotalErrors;
+static int hf_oampdu_event_efeTotalEvents;
+
+static int hf_oampdu_event_efpeWindow;
+static int hf_oampdu_event_efpeThreshold;
+static int hf_oampdu_event_efpeErrors;
+static int hf_oampdu_event_efpeTotalErrors;
+static int hf_oampdu_event_efpeTotalEvents;
+
+static int hf_oampdu_event_efsseWindow;
+static int hf_oampdu_event_efsseThreshold;
+static int hf_oampdu_event_efsseErrors;
+static int hf_oampdu_event_efsseTotalErrors;
+static int hf_oampdu_event_efsseTotalEvents;
+
+static int hf_oampdu_variable_branch;
+static int hf_oampdu_variable_object;
+static int hf_oampdu_variable_package;
+static int hf_oampdu_variable_binding;
+static int hf_oampdu_variable_attribute;
+static int hf_oampdu_variable_width;
+static int hf_oampdu_variable_indication;
+static int hf_oampdu_variable_value;
+/* static int hf_oampdu_vendor_specific_opcode; */
+static int hf_oampdu_vendor_specific_dpoe_opcode;
+static int hf_oampdu_vendor_specific_dpoe_evt_code;
+static int hf_oampdu_vendor_specific_dpoe_evt_raised;
+static int hf_oampdu_vendor_specific_dpoe_evt_object_type;
+static int hf_dpoe_variable_descriptor;
+static int hf_dpoe_variable_response_code;
+static int hf_oam_dpoe_response_eth;
+static int hf_oam_dpoe_response_int;
+
+static int hf_oam_dpoe_fw_info_boot_version;
+static int hf_oam_dpoe_fw_info_boot_crc;
+static int hf_oam_dpoe_fw_info_fw_version;
+static int hf_oam_dpoe_fw_info_fw_crc;
+static int hf_oam_dpoe_date_of_manufacture;
+static int hf_oam_dpoe_chipset_jedec_id;
+static int hf_oam_dpoe_chipset_chip_model;
+static int hf_oam_dpoe_chipset_chip_version;
+static int hf_oam_dpoe_mfg_info_serial_number;
+static int hf_oam_dpoe_mfg_info_vendor_specific;
+static int hf_oam_dpoe_mll_b;
+static int hf_oam_dpoe_mll_do;
+static int hf_oam_dpoe_pkt_buffer_us_queues;
+static int hf_oam_dpoe_pkt_buffer_us_queues_max_per_link;
+static int hf_oam_dpoe_pkt_buffer_us_queue_inc;
+static int hf_oam_dpoe_pkt_buffer_ds_queues;
+static int hf_oam_dpoe_pkt_buffer_ds_queues_max_per_link;
+static int hf_oam_dpoe_pkt_buffer_ds_queue_inc;
+static int hf_oam_dpoe_pkt_buffer_total_memory;
+static int hf_oam_dpoe_pkt_buffer_us_memory_max;
+static int hf_oam_dpoe_pkt_buffer_ds_memory_max;
+static int hf_oam_dpoe_frame_rate_minimum;
+static int hf_oam_dpoe_frame_rate_maximum;
+static int hf_oam_dpoe_mfg_org_name;
+static int hf_oam_dpoe_tvc_code_access_start;
+static int hf_oam_dpoe_tvc_cvc_access_start;
+static int hf_oam_dpoe_vendor_name;
+static int hf_oam_dpoe_model_number;
+static int hf_oam_dpoe_hw_version;
+static int hf_oam_dpoe_sw_bundle;
+static int hf_oam_dpoe_repthr_nqs;
+static int hf_oam_dpoe_repthr_rvpqs;
+static int hf_oam_dpoe_report_threshold;
+static int hf_oam_dpoe_ll_fwd_state;
+static int hf_oam_dpoe_s1_autoneg;
+static int hf_oam_dpoe_s1_autoneg_hd;
+static int hf_oam_dpoe_s1_autoneg_fd;
+static int hf_oam_dpoe_s1_autoneg_10;
+static int hf_oam_dpoe_s1_autoneg_100;
+static int hf_oam_dpoe_s1_autoneg_1000;
+static int hf_oam_dpoe_s1_autoneg_10000;
+static int hf_oam_dpoe_s1_autoneg_fc;
+static int hf_oam_dpoe_s1_autoneg_mdi;
+static int hf_oam_dpoe_user_port_object;
+static int hf_oam_dpoe_user_port_object_subtype;
+static int hf_oam_dpoe_user_port_object_header_precedence;
+static int hf_oam_dpoe_user_port_object_clause_fc;
+static int hf_oam_dpoe_user_port_object_clause_fi;
+static int hf_oam_dpoe_user_port_object_clause_msbm;
+static int hf_oam_dpoe_user_port_object_clause_lsbm;
+static int hf_oam_dpoe_user_port_object_clause_operator;
+static int hf_oam_dpoe_user_port_object_clause_mvl;
+static int hf_oam_dpoe_user_port_object_clause_mv;
+static int hf_oam_dpoe_user_port_object_result_rr;
+static int hf_oam_dpoe_user_port_object_result_rr_queue_obj_type;
+static int hf_oam_dpoe_user_port_object_result_rr_queue_obj_inst;
+static int hf_oam_dpoe_user_port_object_result_rr_queue_queue_index;
+static int hf_oam_dpoe_user_port_object_result_rr_set_fc;
+static int hf_oam_dpoe_user_port_object_result_rr_set_fi;
+static int hf_oam_dpoe_user_port_object_result_rr_copy;
+static int hf_oam_dpoe_user_port_object_result_rr_delete;
+static int hf_oam_dpoe_user_port_object_result_rr_insert;
+static int hf_oam_dpoe_user_port_object_result_rr_replace;
+static int hf_oam_dpoe_user_port_object_result_rr_cd;
+static int hf_oam_dpoe_user_port_object_result_rr_ci;
+static int hf_oam_dpoe_qc_ll_u;
+static int hf_oam_dpoe_qc_ports_d;
+static int hf_oam_dpoe_qc_nq;
+static int hf_oam_dpoe_qc_queue_size;
+static int hf_oam_dpoe_fw_filename;
+static int hf_oam_dpoe_onu_port_config_llid_count;
+static int hf_oam_dpoe_onu_port_config_uni_count;
+
+static int hf_oam_dpoe_1904_1_mac_enable_status;
+static int hf_oam_dpoe_1904_1_a_phy_type;
+static int hf_oam_dpoe_1904_1_media_available;
+static int hf_oam_dpoe_1904_1_autoneg_admstate;
+static int hf_oam_dpoe_1904_1_duplex_status;
+static int hf_oam_dpoe_1904_1_mac_control_functions_supported;
+static int hf_oam_dpoe_1904_1_cfg_mcast_llid_action;
+static int hf_oam_dpoe_1904_1_cfg_mcast_llid_value;
+static int hf_oam_dpoe_1904_1_read_write_mac_address;
+static int hf_oam_dpoe_1904_1_qc_queue_size;
+
+static int hf_oampdu_lpbk;
+static int hf_oampdu_lpbk_enable;
+static int hf_oampdu_lpbk_disable;
+
+static gint ett_oampdu_vendor_specific;
+static gint ett_dpoe_opcode;
+static gint ett_dpoe_opcode_response;
+static gint ett_oam_dpoe_s1_autoneg;
+static gint ett_oam_dpoe_qc_u;
+static gint ett_oam_dpoe_qc_d;
+static gint ett_oam_dpoe_qc_nq;
 
 /* Initialise the subtree pointers */
 
-static gint ett_oampdu = -1;
-static gint ett_oampdu_flags = -1;
+static gint ett_oampdu;
+static gint ett_oampdu_flags;
 
-static gint ett_oampdu_local_info = -1;
-static gint ett_oampdu_local_info_state = -1;
-static gint ett_oampdu_local_info_config = -1;
-static gint ett_oampdu_remote_info = -1;
-static gint ett_oampdu_remote_info_state = -1;
-static gint ett_oampdu_remote_info_config = -1;
-static gint ett_oampdu_org_info = -1;
+static gint ett_oampdu_local_info;
+static gint ett_oampdu_local_info_state;
+static gint ett_oampdu_local_info_config;
+static gint ett_oampdu_remote_info;
+static gint ett_oampdu_remote_info_state;
+static gint ett_oampdu_remote_info_config;
+static gint ett_oampdu_org_info;
 
-static gint ett_oampdu_event_espe = -1;
-static gint ett_oampdu_event_efe = -1;
-static gint ett_oampdu_event_efpe = -1;
-static gint ett_oampdu_event_efsse = -1;
-static gint ett_oampdu_event_ose = -1;
+static gint ett_oampdu_event_espe;
+static gint ett_oampdu_event_efe;
+static gint ett_oampdu_event_efpe;
+static gint ett_oampdu_event_efsse;
+static gint ett_oampdu_event_ose;
 
-static gint ett_oampdu_lpbk_ctrl = -1;
+static gint ett_oampdu_lpbk_ctrl;
 
-static expert_field ei_oampdu_event_length_bad = EI_INIT;
-static expert_field ei_oampdu_mvl_length_zero = EI_INIT;
+static expert_field ei_oampdu_event_length_bad;
+static expert_field ei_oampdu_mvl_length_zero;
 
 static void
 dissect_oampdu_information(tvbuff_t *tvb, proto_tree *tree);
diff --git a/epan/dissectors/packet-obd-ii.c b/epan/dissectors/packet-obd-ii.c
index 7e156a9837..a1fe6d0a60 100644
--- a/epan/dissectors/packet-obd-ii.c
+++ b/epan/dissectors/packet-obd-ii.c
@@ -26,88 +26,88 @@ void proto_reg_handoff_obdii(void);
 
 static dissector_handle_t obdii_handle;
 
-static int proto_obdii = -1;
-
-static int ett_obdii = -1;
-
-static int hf_obdii_mode = -1;
-static int hf_obdii_raw_value = -1;
-
-static int hf_obdii_mode01_pid = -1;
-static int hf_obdii_mode01_supported_pid = -1;
-static int hf_obdii_mode01_unsupported_pid = -1;
-static int hf_obdii_mode01_fuel_system1_status = -1;
-static int hf_obdii_mode01_fuel_system2_status = -1;
-static int hf_obdii_mode01_engine_load = -1;
-static int hf_obdii_mode01_engine_coolant_temp = -1;
-static int hf_obdii_mode01_short_term_fuel_bank1 = -1;
-static int hf_obdii_mode01_long_term_fuel_bank1 = -1;
-static int hf_obdii_mode01_short_term_fuel_bank2 = -1;
-static int hf_obdii_mode01_long_term_fuel_bank2 = -1;
-static int hf_obdii_mode01_fuel_pressure = -1;
-static int hf_obdii_mode01_engine_rpm = -1;
-static int hf_obdii_mode01_vehicle_speed = -1;
-static int hf_obdii_mode01_timing_advance = -1;
-static int hf_obdii_mode01_intake_air_temp = -1;
-static int hf_obdii_mode01_maf_air_flow_rate = -1;
-static int hf_obdii_mode01_throttle_position = -1;
-static int hf_obdii_mode01_secondary_air_status = -1;
-static int hf_obdii_mode01_obd_standards = -1;
-static int hf_obdii_mode01_engine_uptime = -1;
-static int hf_obdii_mode01_fuel_rail_pressure = -1;
-static int hf_obdii_mode01_fuel_rail_gauge_pressure = -1;
-static int hf_obdii_mode01_fuel_rail_absolute_pressure = -1;
-static int hf_obdii_mode01_commanded_egr = -1;
-static int hf_obdii_mode01_egr_error = -1;
-static int hf_obdii_mode01_commanded_evap_purge = -1;
-static int hf_obdii_mode01_fuel_tank_level_input = -1;
-static int hf_obdii_mode01_warm_ups = -1;
-static int hf_obdii_mode01_evap_system_vapor_pressure = -1;
-static int hf_obdii_mode01_absolute_barometric_pressure = -1;
-static int hf_obdii_mode01_intake_manifold_absolute_pressure = -1;
-static int hf_obdii_mode01_oxygen_sensor_id = -1;
-static int hf_obdii_mode01_oxygen_sensor_fuel_air_ratio = -1;
-static int hf_obdii_mode01_oxygen_sensor_voltage = -1;
-static int hf_obdii_mode01_oxygen_sensor_current = -1;
-static int hf_obdii_mode01_distance_traveled_with_mil = -1;
-static int hf_obdii_mode01_distance_traveled_since_code_clear = -1;
-static int hf_obdii_mode01_time_run_with_mil = -1;
-static int hf_obdii_mode01_time_since_trouble_code_clear = -1;
-static int hf_obdii_mode01_catalyst_temp_11 = -1;
-static int hf_obdii_mode01_catalyst_temp_21 = -1;
-static int hf_obdii_mode01_catalyst_temp_12 = -1;
-static int hf_obdii_mode01_catalyst_temp_22 = -1;
-static int hf_obdii_mode01_ambient_air_temp = -1;
-static int hf_obdii_mode01_absolute_throttle_position_B = -1;
-static int hf_obdii_mode01_absolute_throttle_position_C = -1;
-static int hf_obdii_mode01_accelerator_pedal_position_D = -1;
-static int hf_obdii_mode01_accelerator_pedal_position_E = -1;
-static int hf_obdii_mode01_accelerator_pedal_position_F = -1;
-static int hf_obdii_mode01_commanded_throttle_actuator = -1;
-static int hf_obdii_mode01_fuel_type = -1;
-static int hf_obdii_mode01_control_module_voltage = -1;
-static int hf_obdii_mode01_absolute_load_value = -1;
-static int hf_obdii_mode01_fuel_air_commanded_equiv_ratio = -1;
-static int hf_obdii_mode01_relative_throttle_position = -1;
-static int hf_obdii_mode01_ethanol_fuel = -1;
-static int hf_obdii_mode01_absolute_evap_system_vapor_pressure = -1;
-static int hf_obdii_mode01_relative_accelerator_pedal_position = -1;
-static int hf_obdii_mode01_hybrid_battery_remaining_life = -1;
-static int hf_obdii_mode01_engine_oil_temp = -1;
-static int hf_obdii_mode01_fuel_injection_timing = -1;
-static int hf_obdii_mode01_engine_fuel_rate = -1;
-static int hf_obdii_mode01_torque_driver_demand_engine = -1;
-static int hf_obdii_mode01_torque_actual_engine = -1;
-static int hf_obdii_mode01_torque_reference_engine = -1;
-
-static int hf_obdii_mode09_pid = -1;
-static int hf_obdii_mode09_supported_pid = -1;
-static int hf_obdii_mode09_unsupported_pid = -1;
-
-static int hf_obdii_vin = -1;
-static int hf_obdii_ecu_name = -1;
-
-static expert_field ei_obdii_padding = EI_INIT;
+static int proto_obdii;
+
+static int ett_obdii;
+
+static int hf_obdii_mode;
+static int hf_obdii_raw_value;
+
+static int hf_obdii_mode01_pid;
+static int hf_obdii_mode01_supported_pid;
+static int hf_obdii_mode01_unsupported_pid;
+static int hf_obdii_mode01_fuel_system1_status;
+static int hf_obdii_mode01_fuel_system2_status;
+static int hf_obdii_mode01_engine_load;
+static int hf_obdii_mode01_engine_coolant_temp;
+static int hf_obdii_mode01_short_term_fuel_bank1;
+static int hf_obdii_mode01_long_term_fuel_bank1;
+static int hf_obdii_mode01_short_term_fuel_bank2;
+static int hf_obdii_mode01_long_term_fuel_bank2;
+static int hf_obdii_mode01_fuel_pressure;
+static int hf_obdii_mode01_engine_rpm;
+static int hf_obdii_mode01_vehicle_speed;
+static int hf_obdii_mode01_timing_advance;
+static int hf_obdii_mode01_intake_air_temp;
+static int hf_obdii_mode01_maf_air_flow_rate;
+static int hf_obdii_mode01_throttle_position;
+static int hf_obdii_mode01_secondary_air_status;
+static int hf_obdii_mode01_obd_standards;
+static int hf_obdii_mode01_engine_uptime;
+static int hf_obdii_mode01_fuel_rail_pressure;
+static int hf_obdii_mode01_fuel_rail_gauge_pressure;
+static int hf_obdii_mode01_fuel_rail_absolute_pressure;
+static int hf_obdii_mode01_commanded_egr;
+static int hf_obdii_mode01_egr_error;
+static int hf_obdii_mode01_commanded_evap_purge;
+static int hf_obdii_mode01_fuel_tank_level_input;
+static int hf_obdii_mode01_warm_ups;
+static int hf_obdii_mode01_evap_system_vapor_pressure;
+static int hf_obdii_mode01_absolute_barometric_pressure;
+static int hf_obdii_mode01_intake_manifold_absolute_pressure;
+static int hf_obdii_mode01_oxygen_sensor_id;
+static int hf_obdii_mode01_oxygen_sensor_fuel_air_ratio;
+static int hf_obdii_mode01_oxygen_sensor_voltage;
+static int hf_obdii_mode01_oxygen_sensor_current;
+static int hf_obdii_mode01_distance_traveled_with_mil;
+static int hf_obdii_mode01_distance_traveled_since_code_clear;
+static int hf_obdii_mode01_time_run_with_mil;
+static int hf_obdii_mode01_time_since_trouble_code_clear;
+static int hf_obdii_mode01_catalyst_temp_11;
+static int hf_obdii_mode01_catalyst_temp_21;
+static int hf_obdii_mode01_catalyst_temp_12;
+static int hf_obdii_mode01_catalyst_temp_22;
+static int hf_obdii_mode01_ambient_air_temp;
+static int hf_obdii_mode01_absolute_throttle_position_B;
+static int hf_obdii_mode01_absolute_throttle_position_C;
+static int hf_obdii_mode01_accelerator_pedal_position_D;
+static int hf_obdii_mode01_accelerator_pedal_position_E;
+static int hf_obdii_mode01_accelerator_pedal_position_F;
+static int hf_obdii_mode01_commanded_throttle_actuator;
+static int hf_obdii_mode01_fuel_type;
+static int hf_obdii_mode01_control_module_voltage;
+static int hf_obdii_mode01_absolute_load_value;
+static int hf_obdii_mode01_fuel_air_commanded_equiv_ratio;
+static int hf_obdii_mode01_relative_throttle_position;
+static int hf_obdii_mode01_ethanol_fuel;
+static int hf_obdii_mode01_absolute_evap_system_vapor_pressure;
+static int hf_obdii_mode01_relative_accelerator_pedal_position;
+static int hf_obdii_mode01_hybrid_battery_remaining_life;
+static int hf_obdii_mode01_engine_oil_temp;
+static int hf_obdii_mode01_fuel_injection_timing;
+static int hf_obdii_mode01_engine_fuel_rate;
+static int hf_obdii_mode01_torque_driver_demand_engine;
+static int hf_obdii_mode01_torque_actual_engine;
+static int hf_obdii_mode01_torque_reference_engine;
+
+static int hf_obdii_mode09_pid;
+static int hf_obdii_mode09_supported_pid;
+static int hf_obdii_mode09_unsupported_pid;
+
+static int hf_obdii_vin;
+static int hf_obdii_ecu_name;
+
+static expert_field ei_obdii_padding;
 
 /* OBD-II CAN IDs have three aspects.
    - IDs are either standard 11bit format (SFF) or extended 29bit format (EFF)
diff --git a/epan/dissectors/packet-obex.c b/epan/dissectors/packet-obex.c
index 2c22aab766..5cfd968f3d 100644
--- a/epan/dissectors/packet-obex.c
+++ b/epan/dissectors/packet-obex.c
@@ -25,230 +25,230 @@
 #include "packet-btsdp.h"
 
 /* Initialize the protocol and registered fields */
-static int proto_obex = -1;
-static int hf_opcode = -1;
-static int hf_response_code = -1;
-static int hf_final_flag = -1;
-static int hf_length = -1;
-static int hf_version = -1;
-static int hf_flags = -1;
-static int hf_constants = -1;
-static int hf_max_pkt_len = -1;
-static int hf_set_path_flags_0 = -1;
-static int hf_set_path_flags_1 = -1;
-static int hf_headers = -1;
-static int hf_header = -1;
-static int hf_hdr_id = -1;
-static int hf_hdr_id_encoding = -1;
-static int hf_hdr_id_meaning = -1;
-static int hf_hdr_length = -1;
-static int hf_hdr_val_unicode = -1;
-static int hf_hdr_val_byte_seq = -1;
-static int hf_hdr_val_byte = -1;
-static int hf_hdr_val_long = -1;
-static int hf_authentication_parameter = -1;
-static int hf_authentication_parameter_data = -1;
-static int hf_authentication_challenge_tag = -1;
-static int hf_authentication_response_tag = -1;
-static int hf_authentication_key = -1;
-static int hf_authentication_result_key = -1;
-static int hf_authentication_user_id = -1;
-static int hf_authentication_length = -1;
-static int hf_authentication_info_charset = -1;
-static int hf_authentication_info = -1;
-static int hf_authentication_option_reserved = -1;
-static int hf_authentication_option_user_id = -1;
-static int hf_authentication_option_read_only = -1;
-static int hf_application_parameter = -1;
-static int hf_application_parameter_id = -1;
-static int hf_application_parameter_length = -1;
-static int hf_application_parameter_data = -1;
-static int hf_bpp_application_parameter_id = -1;
-static int hf_bpp_application_parameter_data_offset = -1;
-static int hf_bpp_application_parameter_data_count = -1;
-static int hf_bpp_application_parameter_data_job_id = -1;
-static int hf_bpp_application_parameter_data_file_size = -1;
-static int hf_bip_application_parameter_id = -1;
-static int hf_bip_application_parameter_data_number_of_returned_handles = -1;
-static int hf_bip_application_parameter_data_list_start_offset = -1;
-static int hf_bip_application_parameter_data_latest_captured_images = -1;
-static int hf_bip_application_parameter_data_partial_file_length = -1;
-static int hf_bip_application_parameter_data_partial_file_start_offset = -1;
-static int hf_bip_application_parameter_data_total_file_size = -1;
-static int hf_bip_application_parameter_data_end_flag = -1;
-static int hf_bip_application_parameter_data_remote_display = -1;
-static int hf_bip_application_parameter_data_service_id = -1;
-static int hf_bip_application_parameter_data_store_flag = -1;
-static int hf_pbap_application_parameter_id = -1;
-static int hf_pbap_application_parameter_data_order = -1;
-static int hf_pbap_application_parameter_data_search_value = -1;
-static int hf_pbap_application_parameter_data_search_attribute = -1;
-static int hf_pbap_application_parameter_data_max_list_count = -1;
-static int hf_pbap_application_parameter_data_list_start_offset = -1;
-static int hf_pbap_application_parameter_data_filter = -1;
-static int hf_pbap_application_parameter_vcard_selector = -1;
-static int hf_pbap_application_parameter_data_filter_version = -1;
-static int hf_pbap_application_parameter_data_filter_fn = -1;
-static int hf_pbap_application_parameter_data_filter_n = -1;
-static int hf_pbap_application_parameter_data_filter_photo = -1;
-static int hf_pbap_application_parameter_data_filter_birthday = -1;
-static int hf_pbap_application_parameter_data_filter_adr = -1;
-static int hf_pbap_application_parameter_data_filter_label = -1;
-static int hf_pbap_application_parameter_data_filter_tel = -1;
-static int hf_pbap_application_parameter_data_filter_email = -1;
-static int hf_pbap_application_parameter_data_filter_mailer = -1;
-static int hf_pbap_application_parameter_data_filter_time_zone = -1;
-static int hf_pbap_application_parameter_data_filter_geographic_position = -1;
-static int hf_pbap_application_parameter_data_filter_title = -1;
-static int hf_pbap_application_parameter_data_filter_role = -1;
-static int hf_pbap_application_parameter_data_filter_logo = -1;
-static int hf_pbap_application_parameter_data_filter_agent = -1;
-static int hf_pbap_application_parameter_data_filter_name_of_organization = -1;
-static int hf_pbap_application_parameter_data_filter_comments = -1;
-static int hf_pbap_application_parameter_data_filter_revision = -1;
-static int hf_pbap_application_parameter_data_filter_pronunciation_of_name = -1;
-static int hf_pbap_application_parameter_data_filter_url = -1;
-static int hf_pbap_application_parameter_data_filter_uid = -1;
-static int hf_pbap_application_parameter_data_filter_key = -1;
-static int hf_pbap_application_parameter_data_filter_nickname = -1;
-static int hf_pbap_application_parameter_data_filter_categories = -1;
-static int hf_pbap_application_parameter_data_filter_product_id = -1;
-static int hf_pbap_application_parameter_data_filter_class = -1;
-static int hf_pbap_application_parameter_data_filter_sort_string = -1;
-static int hf_pbap_application_parameter_data_filter_timestamp = -1;
-static int hf_pbap_application_parameter_data_filter_reserved_29_31 = -1;
-static int hf_pbap_application_parameter_data_filter_reserved_32_38 = -1;
-static int hf_pbap_application_parameter_data_filter_proprietary_filter = -1;
-static int hf_pbap_application_parameter_data_filter_reserved_for_proprietary_filter_usage = -1;
-static int hf_pbap_application_parameter_data_format = -1;
-static int hf_pbap_application_parameter_data_phonebook_size = -1;
-static int hf_pbap_application_parameter_data_new_missed_calls = -1;
-static int hf_pbap_application_parameter_data_primary_version_counter = -1;
-static int hf_pbap_application_parameter_data_secondary_version_counter = -1;
-static int hf_pbap_application_parameter_data_database_identifier = -1;
-static int hf_pbap_application_parameter_data_vcard_selector_operator = -1;
-static int hf_pbap_application_parameter_data_reset_new_missed_calls = -1;
-static int hf_pbap_application_parameter_data_supported_features = -1;
-static int hf_pbap_application_parameter_data_supported_features_reserved = -1;
-static int hf_pbap_application_parameter_data_supported_features_download = -1;
-static int hf_pbap_application_parameter_data_supported_features_browsing = -1;
-static int hf_pbap_application_parameter_data_supported_features_database_identifier = -1;
-static int hf_pbap_application_parameter_data_supported_features_folder_version_counters = -1;
-static int hf_pbap_application_parameter_data_supported_features_vcard_selecting = -1;
-static int hf_pbap_application_parameter_data_supported_features_enhanced_missed_calls = -1;
-static int hf_pbap_application_parameter_data_supported_features_x_bt_uci_vcard_property = -1;
-static int hf_pbap_application_parameter_data_supported_features_x_bt_uid_vcard_property = -1;
-static int hf_pbap_application_parameter_data_supported_features_contact_referencing = -1;
-static int hf_pbap_application_parameter_data_supported_features_default_contact_image_format = -1;
-static int hf_map_application_parameter_id = -1;
-static int hf_map_application_parameter_data_max_list_count = -1;
-static int hf_map_application_parameter_data_start_offset = -1;
-static int hf_map_application_parameter_data_filter_message_type_reserved = -1;
-static int hf_map_application_parameter_data_filter_message_type_mms = -1;
-static int hf_map_application_parameter_data_filter_message_type_email = -1;
-static int hf_map_application_parameter_data_filter_message_type_sms_cdma = -1;
-static int hf_map_application_parameter_data_filter_message_type_sms_gsm = -1;
-static int hf_map_application_parameter_data_filter_period_begin = -1;
-static int hf_map_application_parameter_data_filter_period_end = -1;
-static int hf_map_application_parameter_data_filter_read_status_reserved_6 = -1;
-static int hf_map_application_parameter_data_filter_read_status_get_read = -1;
-static int hf_map_application_parameter_data_filter_read_status_get_unread = -1;
-static int hf_map_application_parameter_data_filter_recipient = -1;
-static int hf_map_application_parameter_data_filter_originator = -1;
-static int hf_map_application_parameter_data_filter_priority_reserved_6 = -1;
-static int hf_map_application_parameter_data_filter_priority_get_high = -1;
-static int hf_map_application_parameter_data_filter_priority_non_high = -1;
-static int hf_map_application_parameter_data_reserved_7 = -1;
-static int hf_map_application_parameter_data_attachment = -1;
-static int hf_map_application_parameter_data_transparent = -1;
-static int hf_map_application_parameter_data_retry = -1;
-static int hf_map_application_parameter_data_new_message = -1;
-static int hf_map_application_parameter_data_notification_status = -1;
-static int hf_map_application_parameter_data_mas_instance_id = -1;
-static int hf_map_application_parameter_data_parameter_mask_reserved = -1;
-static int hf_map_application_parameter_data_parameter_mask_reply_to_addressing = -1;
-static int hf_map_application_parameter_data_parameter_mask_protected = -1;
-static int hf_map_application_parameter_data_parameter_mask_sent = -1;
-static int hf_map_application_parameter_data_parameter_mask_read = -1;
-static int hf_map_application_parameter_data_parameter_mask_priority = -1;
-static int hf_map_application_parameter_data_parameter_mask_attachment_size = -1;
-static int hf_map_application_parameter_data_parameter_mask_text = -1;
-static int hf_map_application_parameter_data_parameter_mask_reception_status = -1;
-static int hf_map_application_parameter_data_parameter_mask_size = -1;
-static int hf_map_application_parameter_data_parameter_mask_type = -1;
-static int hf_map_application_parameter_data_parameter_mask_recipient_addressing = -1;
-static int hf_map_application_parameter_data_parameter_mask_recipient_name = -1;
-static int hf_map_application_parameter_data_parameter_mask_sender_addressing = -1;
-static int hf_map_application_parameter_data_parameter_mask_sender_name = -1;
-static int hf_map_application_parameter_data_parameter_mask_datetime = -1;
-static int hf_map_application_parameter_data_parameter_mask_subject = -1;
-static int hf_map_application_parameter_data_folder_listing_size = -1;
-static int hf_map_application_parameter_data_messages_listing_size = -1;
-static int hf_map_application_parameter_data_subject_length = -1;
-static int hf_map_application_parameter_data_charset = -1;
-static int hf_map_application_parameter_data_fraction_request = -1;
-static int hf_map_application_parameter_data_fraction_deliver = -1;
-static int hf_map_application_parameter_data_status_indicator = -1;
-static int hf_map_application_parameter_data_status_value = -1;
-static int hf_map_application_parameter_data_mse_time = -1;
-static int hf_gpp_application_parameter_id = -1;
-static int hf_gpp_application_parameter_data_max_list_count = -1;
-static int hf_gpp_application_parameter_data_list_start_offset = -1;
-static int hf_gpp_application_parameter_data_reserved_7 = -1;
-static int hf_gpp_application_parameter_data_notification_status = -1;
-static int hf_gpp_application_parameter_data_instance_id = -1;
-static int hf_gpp_application_parameter_data_listing_size = -1;
-static int hf_ctn_application_parameter_id = -1;
-static int hf_ctn_application_parameter_data_acoustic_alarm_status = -1;
-static int hf_ctn_application_parameter_data_attachment = -1;
-static int hf_ctn_application_parameter_data_send = -1;
-static int hf_ctn_application_parameter_data_filter_period_begin = -1;
-static int hf_ctn_application_parameter_data_filter_period_end = -1;
-static int hf_ctn_application_parameter_data_parameter_mask = -1;
-static int hf_ctn_application_parameter_data_parameter_mask_reserved = -1;
-static int hf_ctn_application_parameter_data_parameter_mask_recurrent = -1;
-static int hf_ctn_application_parameter_data_parameter_mask_send_status = -1;
-static int hf_ctn_application_parameter_data_parameter_mask_alarm_status = -1;
-static int hf_ctn_application_parameter_data_parameter_mask_pstatus = -1;
-static int hf_ctn_application_parameter_data_parameter_mask_priority = -1;
-static int hf_ctn_application_parameter_data_parameter_mask_originator_address = -1;
-static int hf_ctn_application_parameter_data_parameter_mask_originator_name = -1;
-static int hf_ctn_application_parameter_data_parameter_mask_end_time = -1;
-static int hf_ctn_application_parameter_data_parameter_mask_summary = -1;
-static int hf_ctn_application_parameter_data_parameter_mask_attachment = -1;
-static int hf_ctn_application_parameter_data_status_indicator = -1;
-static int hf_ctn_application_parameter_data_status_value = -1;
-static int hf_ctn_application_parameter_data_postpone_val = -1;
-static int hf_ctn_application_parameter_data_email_uri = -1;
-static int hf_ctn_application_parameter_data_cse_time = -1;
-static int hf_ctn_application_parameter_data_recurrent = -1;
-static int hf_ctn_application_parameter_data_attach_id = -1;
-static int hf_ctn_application_parameter_data_last_update = -1;
-static int hf_profile = -1;
-static int hf_type = -1;
-static int hf_object_class = -1;
-static int hf_time_iso8601 = -1;
-static int hf_wan_uuid = -1;
-static int hf_hdr_val_action = -1;
-static int hf_hdr_val_single_response_mode = -1;
-static int hf_hdr_val_single_response_mode_parameter = -1;
-static int hf_session_parameter = -1;
-static int hf_session_parameter_tag = -1;
-static int hf_session_parameter_length = -1;
-static int hf_session_parameter_data = -1;
-static int hf_session_parameter_nonce = -1;
-static int hf_session_parameter_session_id = -1;
-static int hf_session_parameter_next_sequence_number = -1;
-static int hf_session_parameter_timeout = -1;
-static int hf_session_parameter_opcode = -1;
-static int hf_sender_bd_addr = -1;
-static int hf_count = -1;
-static int hf_data_length = -1;
-static int hf_connection_id = -1;
-static int hf_name = -1;
-static int hf_current_path = -1;
-static int hf_request_in_frame = -1;
-static int hf_response_in_frame = -1;
+static int proto_obex;
+static int hf_opcode;
+static int hf_response_code;
+static int hf_final_flag;
+static int hf_length;
+static int hf_version;
+static int hf_flags;
+static int hf_constants;
+static int hf_max_pkt_len;
+static int hf_set_path_flags_0;
+static int hf_set_path_flags_1;
+static int hf_headers;
+static int hf_header;
+static int hf_hdr_id;
+static int hf_hdr_id_encoding;
+static int hf_hdr_id_meaning;
+static int hf_hdr_length;
+static int hf_hdr_val_unicode;
+static int hf_hdr_val_byte_seq;
+static int hf_hdr_val_byte;
+static int hf_hdr_val_long;
+static int hf_authentication_parameter;
+static int hf_authentication_parameter_data;
+static int hf_authentication_challenge_tag;
+static int hf_authentication_response_tag;
+static int hf_authentication_key;
+static int hf_authentication_result_key;
+static int hf_authentication_user_id;
+static int hf_authentication_length;
+static int hf_authentication_info_charset;
+static int hf_authentication_info;
+static int hf_authentication_option_reserved;
+static int hf_authentication_option_user_id;
+static int hf_authentication_option_read_only;
+static int hf_application_parameter;
+static int hf_application_parameter_id;
+static int hf_application_parameter_length;
+static int hf_application_parameter_data;
+static int hf_bpp_application_parameter_id;
+static int hf_bpp_application_parameter_data_offset;
+static int hf_bpp_application_parameter_data_count;
+static int hf_bpp_application_parameter_data_job_id;
+static int hf_bpp_application_parameter_data_file_size;
+static int hf_bip_application_parameter_id;
+static int hf_bip_application_parameter_data_number_of_returned_handles;
+static int hf_bip_application_parameter_data_list_start_offset;
+static int hf_bip_application_parameter_data_latest_captured_images;
+static int hf_bip_application_parameter_data_partial_file_length;
+static int hf_bip_application_parameter_data_partial_file_start_offset;
+static int hf_bip_application_parameter_data_total_file_size;
+static int hf_bip_application_parameter_data_end_flag;
+static int hf_bip_application_parameter_data_remote_display;
+static int hf_bip_application_parameter_data_service_id;
+static int hf_bip_application_parameter_data_store_flag;
+static int hf_pbap_application_parameter_id;
+static int hf_pbap_application_parameter_data_order;
+static int hf_pbap_application_parameter_data_search_value;
+static int hf_pbap_application_parameter_data_search_attribute;
+static int hf_pbap_application_parameter_data_max_list_count;
+static int hf_pbap_application_parameter_data_list_start_offset;
+static int hf_pbap_application_parameter_data_filter;
+static int hf_pbap_application_parameter_vcard_selector;
+static int hf_pbap_application_parameter_data_filter_version;
+static int hf_pbap_application_parameter_data_filter_fn;
+static int hf_pbap_application_parameter_data_filter_n;
+static int hf_pbap_application_parameter_data_filter_photo;
+static int hf_pbap_application_parameter_data_filter_birthday;
+static int hf_pbap_application_parameter_data_filter_adr;
+static int hf_pbap_application_parameter_data_filter_label;
+static int hf_pbap_application_parameter_data_filter_tel;
+static int hf_pbap_application_parameter_data_filter_email;
+static int hf_pbap_application_parameter_data_filter_mailer;
+static int hf_pbap_application_parameter_data_filter_time_zone;
+static int hf_pbap_application_parameter_data_filter_geographic_position;
+static int hf_pbap_application_parameter_data_filter_title;
+static int hf_pbap_application_parameter_data_filter_role;
+static int hf_pbap_application_parameter_data_filter_logo;
+static int hf_pbap_application_parameter_data_filter_agent;
+static int hf_pbap_application_parameter_data_filter_name_of_organization;
+static int hf_pbap_application_parameter_data_filter_comments;
+static int hf_pbap_application_parameter_data_filter_revision;
+static int hf_pbap_application_parameter_data_filter_pronunciation_of_name;
+static int hf_pbap_application_parameter_data_filter_url;
+static int hf_pbap_application_parameter_data_filter_uid;
+static int hf_pbap_application_parameter_data_filter_key;
+static int hf_pbap_application_parameter_data_filter_nickname;
+static int hf_pbap_application_parameter_data_filter_categories;
+static int hf_pbap_application_parameter_data_filter_product_id;
+static int hf_pbap_application_parameter_data_filter_class;
+static int hf_pbap_application_parameter_data_filter_sort_string;
+static int hf_pbap_application_parameter_data_filter_timestamp;
+static int hf_pbap_application_parameter_data_filter_reserved_29_31;
+static int hf_pbap_application_parameter_data_filter_reserved_32_38;
+static int hf_pbap_application_parameter_data_filter_proprietary_filter;
+static int hf_pbap_application_parameter_data_filter_reserved_for_proprietary_filter_usage;
+static int hf_pbap_application_parameter_data_format;
+static int hf_pbap_application_parameter_data_phonebook_size;
+static int hf_pbap_application_parameter_data_new_missed_calls;
+static int hf_pbap_application_parameter_data_primary_version_counter;
+static int hf_pbap_application_parameter_data_secondary_version_counter;
+static int hf_pbap_application_parameter_data_database_identifier;
+static int hf_pbap_application_parameter_data_vcard_selector_operator;
+static int hf_pbap_application_parameter_data_reset_new_missed_calls;
+static int hf_pbap_application_parameter_data_supported_features;
+static int hf_pbap_application_parameter_data_supported_features_reserved;
+static int hf_pbap_application_parameter_data_supported_features_download;
+static int hf_pbap_application_parameter_data_supported_features_browsing;
+static int hf_pbap_application_parameter_data_supported_features_database_identifier;
+static int hf_pbap_application_parameter_data_supported_features_folder_version_counters;
+static int hf_pbap_application_parameter_data_supported_features_vcard_selecting;
+static int hf_pbap_application_parameter_data_supported_features_enhanced_missed_calls;
+static int hf_pbap_application_parameter_data_supported_features_x_bt_uci_vcard_property;
+static int hf_pbap_application_parameter_data_supported_features_x_bt_uid_vcard_property;
+static int hf_pbap_application_parameter_data_supported_features_contact_referencing;
+static int hf_pbap_application_parameter_data_supported_features_default_contact_image_format;
+static int hf_map_application_parameter_id;
+static int hf_map_application_parameter_data_max_list_count;
+static int hf_map_application_parameter_data_start_offset;
+static int hf_map_application_parameter_data_filter_message_type_reserved;
+static int hf_map_application_parameter_data_filter_message_type_mms;
+static int hf_map_application_parameter_data_filter_message_type_email;
+static int hf_map_application_parameter_data_filter_message_type_sms_cdma;
+static int hf_map_application_parameter_data_filter_message_type_sms_gsm;
+static int hf_map_application_parameter_data_filter_period_begin;
+static int hf_map_application_parameter_data_filter_period_end;
+static int hf_map_application_parameter_data_filter_read_status_reserved_6;
+static int hf_map_application_parameter_data_filter_read_status_get_read;
+static int hf_map_application_parameter_data_filter_read_status_get_unread;
+static int hf_map_application_parameter_data_filter_recipient;
+static int hf_map_application_parameter_data_filter_originator;
+static int hf_map_application_parameter_data_filter_priority_reserved_6;
+static int hf_map_application_parameter_data_filter_priority_get_high;
+static int hf_map_application_parameter_data_filter_priority_non_high;
+static int hf_map_application_parameter_data_reserved_7;
+static int hf_map_application_parameter_data_attachment;
+static int hf_map_application_parameter_data_transparent;
+static int hf_map_application_parameter_data_retry;
+static int hf_map_application_parameter_data_new_message;
+static int hf_map_application_parameter_data_notification_status;
+static int hf_map_application_parameter_data_mas_instance_id;
+static int hf_map_application_parameter_data_parameter_mask_reserved;
+static int hf_map_application_parameter_data_parameter_mask_reply_to_addressing;
+static int hf_map_application_parameter_data_parameter_mask_protected;
+static int hf_map_application_parameter_data_parameter_mask_sent;
+static int hf_map_application_parameter_data_parameter_mask_read;
+static int hf_map_application_parameter_data_parameter_mask_priority;
+static int hf_map_application_parameter_data_parameter_mask_attachment_size;
+static int hf_map_application_parameter_data_parameter_mask_text;
+static int hf_map_application_parameter_data_parameter_mask_reception_status;
+static int hf_map_application_parameter_data_parameter_mask_size;
+static int hf_map_application_parameter_data_parameter_mask_type;
+static int hf_map_application_parameter_data_parameter_mask_recipient_addressing;
+static int hf_map_application_parameter_data_parameter_mask_recipient_name;
+static int hf_map_application_parameter_data_parameter_mask_sender_addressing;
+static int hf_map_application_parameter_data_parameter_mask_sender_name;
+static int hf_map_application_parameter_data_parameter_mask_datetime;
+static int hf_map_application_parameter_data_parameter_mask_subject;
+static int hf_map_application_parameter_data_folder_listing_size;
+static int hf_map_application_parameter_data_messages_listing_size;
+static int hf_map_application_parameter_data_subject_length;
+static int hf_map_application_parameter_data_charset;
+static int hf_map_application_parameter_data_fraction_request;
+static int hf_map_application_parameter_data_fraction_deliver;
+static int hf_map_application_parameter_data_status_indicator;
+static int hf_map_application_parameter_data_status_value;
+static int hf_map_application_parameter_data_mse_time;
+static int hf_gpp_application_parameter_id;
+static int hf_gpp_application_parameter_data_max_list_count;
+static int hf_gpp_application_parameter_data_list_start_offset;
+static int hf_gpp_application_parameter_data_reserved_7;
+static int hf_gpp_application_parameter_data_notification_status;
+static int hf_gpp_application_parameter_data_instance_id;
+static int hf_gpp_application_parameter_data_listing_size;
+static int hf_ctn_application_parameter_id;
+static int hf_ctn_application_parameter_data_acoustic_alarm_status;
+static int hf_ctn_application_parameter_data_attachment;
+static int hf_ctn_application_parameter_data_send;
+static int hf_ctn_application_parameter_data_filter_period_begin;
+static int hf_ctn_application_parameter_data_filter_period_end;
+static int hf_ctn_application_parameter_data_parameter_mask;
+static int hf_ctn_application_parameter_data_parameter_mask_reserved;
+static int hf_ctn_application_parameter_data_parameter_mask_recurrent;
+static int hf_ctn_application_parameter_data_parameter_mask_send_status;
+static int hf_ctn_application_parameter_data_parameter_mask_alarm_status;
+static int hf_ctn_application_parameter_data_parameter_mask_pstatus;
+static int hf_ctn_application_parameter_data_parameter_mask_priority;
+static int hf_ctn_application_parameter_data_parameter_mask_originator_address;
+static int hf_ctn_application_parameter_data_parameter_mask_originator_name;
+static int hf_ctn_application_parameter_data_parameter_mask_end_time;
+static int hf_ctn_application_parameter_data_parameter_mask_summary;
+static int hf_ctn_application_parameter_data_parameter_mask_attachment;
+static int hf_ctn_application_parameter_data_status_indicator;
+static int hf_ctn_application_parameter_data_status_value;
+static int hf_ctn_application_parameter_data_postpone_val;
+static int hf_ctn_application_parameter_data_email_uri;
+static int hf_ctn_application_parameter_data_cse_time;
+static int hf_ctn_application_parameter_data_recurrent;
+static int hf_ctn_application_parameter_data_attach_id;
+static int hf_ctn_application_parameter_data_last_update;
+static int hf_profile;
+static int hf_type;
+static int hf_object_class;
+static int hf_time_iso8601;
+static int hf_wan_uuid;
+static int hf_hdr_val_action;
+static int hf_hdr_val_single_response_mode;
+static int hf_hdr_val_single_response_mode_parameter;
+static int hf_session_parameter;
+static int hf_session_parameter_tag;
+static int hf_session_parameter_length;
+static int hf_session_parameter_data;
+static int hf_session_parameter_nonce;
+static int hf_session_parameter_session_id;
+static int hf_session_parameter_next_sequence_number;
+static int hf_session_parameter_timeout;
+static int hf_session_parameter_opcode;
+static int hf_sender_bd_addr;
+static int hf_count;
+static int hf_data_length;
+static int hf_connection_id;
+static int hf_name;
+static int hf_current_path;
+static int hf_request_in_frame;
+static int hf_response_in_frame;
 
 static int * const hfx_hdr_id[] = {
     &hf_hdr_id_encoding,
@@ -327,9 +327,9 @@ static int * const hfx_ctn_application_parameter_data_parameter_mask[] = {
     NULL
 };
 
-static expert_field ei_unexpected_data = EI_INIT;
-static expert_field ei_application_parameter_length_bad = EI_INIT;
-static expert_field ei_decoded_as_profile = EI_INIT;
+static expert_field ei_unexpected_data;
+static expert_field ei_application_parameter_length_bad;
+static expert_field ei_decoded_as_profile;
 
 static dissector_table_t obex_profile_table;
 static dissector_table_t media_type_dissector_table;
@@ -338,19 +338,19 @@ static dissector_table_t media_type_dissector_table;
 /* ************************************************************************* */
 /*                   Header values for reassembly                            */
 /* ************************************************************************* */
-static int hf_obex_fragments = -1;
-static int hf_obex_fragment = -1;
-static int hf_obex_fragment_overlap = -1;
-static int hf_obex_fragment_overlap_conflict = -1;
-static int hf_obex_fragment_multiple_tails = -1;
-static int hf_obex_fragment_too_long_fragment = -1;
-static int hf_obex_fragment_error = -1;
-static int hf_obex_fragment_count = -1;
-static int hf_obex_reassembled_in = -1;
-static int hf_obex_reassembled_length = -1;
-
-static gint ett_obex_fragment = -1;
-static gint ett_obex_fragments = -1;
+static int hf_obex_fragments;
+static int hf_obex_fragment;
+static int hf_obex_fragment_overlap;
+static int hf_obex_fragment_overlap_conflict;
+static int hf_obex_fragment_multiple_tails;
+static int hf_obex_fragment_too_long_fragment;
+static int hf_obex_fragment_error;
+static int hf_obex_fragment_count;
+static int hf_obex_reassembled_in;
+static int hf_obex_reassembled_length;
+
+static gint ett_obex_fragment;
+static gint ett_obex_fragments;
 
 static dissector_handle_t obex_handle;
 static dissector_handle_t raw_application_parameters_handle;
@@ -382,15 +382,15 @@ static const fragment_items obex_frag_items = {
 };
 
 /* Initialize the subtree pointers */
-static gint ett_obex = -1;
-static gint ett_obex_hdrs = -1;
-static gint ett_obex_hdr = -1;
-static gint ett_obex_hdr_id = -1;
-static gint ett_obex_filter = -1;
-static gint ett_obex_parameter = -1;
-static gint ett_obex_session_parameters = -1;
-static gint ett_obex_application_parameters = -1;
-static gint ett_obex_authentication_parameters = -1;
+static gint ett_obex;
+static gint ett_obex_hdrs;
+static gint ett_obex_hdr;
+static gint ett_obex_hdr_id;
+static gint ett_obex_filter;
+static gint ett_obex_parameter;
+static gint ett_obex_session_parameters;
+static gint ett_obex_application_parameters;
+static gint ett_obex_authentication_parameters;
 
 static wmem_tree_t *obex_path = NULL;
 static wmem_tree_t *obex_profile = NULL;
diff --git a/epan/dissectors/packet-ocfs2.c b/epan/dissectors/packet-ocfs2.c
index 153d7db8f0..9ef4439d8e 100644
--- a/epan/dissectors/packet-ocfs2.c
+++ b/epan/dissectors/packet-ocfs2.c
@@ -26,101 +26,101 @@ void proto_reg_handoff_ocfs2(void);
 
 static dissector_handle_t ocfs2_handle;
 
-static gint ett_ocfs2 = -1;
-static gint ett_dtm_lock_flags = -1;
-static gint ett_mres_flags = -1;
-static gint ett_migrate_lockres_locks = -1;
-static gint ett_query_nodeinfo = -1;
-
-static int proto_ocfs2 = -1;
-static int hf_msg_magic = -1;
-static int hf_msg_data_len = -1;
-static int hf_msg_msg_type = -1;
-static int hf_msg_sys_status = -1;
-static int hf_msg_status = -1;
-static int hf_msg_key = -1;
-static int hf_msg_msg_num = -1;
-static int hf_msg_pad = -1;
-
-static int hf_dlm_node_idx = -1;
-static int hf_dlm_lock_flags = -1;
-static int hf_dlm_lock_flag_unused1 = -1;
-static int hf_dlm_lock_flag_orphan = -1;
-static int hf_dlm_lock_flag_parentable = -1;
-static int hf_dlm_lock_flag_block = -1;
-static int hf_dlm_lock_flag_local = -1;
-static int hf_dlm_lock_flag_valblk = -1;
-static int hf_dlm_lock_flag_noqueue = -1;
-static int hf_dlm_lock_flag_convert = -1;
-static int hf_dlm_lock_flag_nodlckwt = -1;
-static int hf_dlm_lock_flag_unlock = -1;
-static int hf_dlm_lock_flag_cancel = -1;
-static int hf_dlm_lock_flag_deqall = -1;
-static int hf_dlm_lock_flag_invvalblk = -1;
-static int hf_dlm_lock_flag_syncsts = -1;
-static int hf_dlm_lock_flag_timeout = -1;
-static int hf_dlm_lock_flag_sngldlck = -1;
-static int hf_dlm_lock_flag_findlocal = -1;
-static int hf_dlm_lock_flag_proc_owned = -1;
-static int hf_dlm_lock_flag_xid = -1;
-static int hf_dlm_lock_flag_xid_conflict = -1;
-static int hf_dlm_lock_flag_force = -1;
-static int hf_dlm_lock_flag_revvalblk = -1;
-static int hf_dlm_lock_flag_unused2 = -1;
-static int hf_dlm_lock_flag_migration = -1;
-static int hf_dlm_lock_flag_put_lvb = -1;
-static int hf_dlm_lock_flag_get_lvb = -1;
-static int hf_dlm_lock_flag_recovery = -1;
-static int hf_dlm_am_flags = -1;
-static int hf_dlm_fr_flags = -1;
-static int hf_dlm_namelen = -1;
-static int hf_dlm_name = -1;
-static int hf_dlm_cookie = -1;
-static int hf_dlm_requested_type = -1;
-static int hf_dlm_lvb1 = -1;
-static int hf_dlm_lvb2 = -1;
-static int hf_dlm_lvb3 = -1;
-static int hf_dlm_ast_type = -1;
-static int hf_dlm_blocked_type = -1;
-static int hf_dlm_dead_node = -1;
-static int hf_dlm_domain_name_len = -1;
-static int hf_dlm_domain_name = -1;
-static int hf_dlm_proto_ver = -1;
-static int hf_dlm_fs_proto_ver = -1;
-static int hf_dlm_node_map = -1;
-static int hf_dlm_master = -1;
-static int hf_dlm_new_master = -1;
-static int hf_dlm_mres_num_locks = -1;
-static int hf_dlm_mres_flags = -1;
-static int hf_dlm_mres_flag_recovery = -1;
-static int hf_dlm_mres_flag_migration = -1;
-static int hf_dlm_mres_flag_all_done = -1;
-static int hf_dlm_mres_total_locks = -1;
-static int hf_dlm_mres_mig_cookie = -1;
-static int hf_dlm_mres_list = -1;
-static int hf_dlm_mres_ml_flags = -1;
-static int hf_dlm_mres_type = -1;
-static int hf_dlm_mres_convert_type = -1;
-static int hf_dlm_mres_highest_blocked = -1;
-static int hf_dlm_mres_node = -1;
-static int hf_dlm_qr_node = -1;
-static int hf_dlm_qr_numregions = -1;
-static int hf_dlm_qr_namelen = -1;
-static int hf_dlm_qr_domain = -1;
-static int hf_dlm_qr_region = -1;
-static int hf_dlm_qn_nodenum = -1;
-static int hf_dlm_qn_numnodes = -1;
-static int hf_dlm_qn_namelen = -1;
-static int hf_dlm_qn_domain = -1;
-static int hf_dlm_qn_node = -1;
-static int hf_dlm_qn_port = -1;
-static int hf_dlm_qn_ip = -1;
-static int hf_dlm_reco_lvb = -1;
-static int hf_dlm_pad8 = -1;
-static int hf_dlm_pad16 = -1;
-static int hf_dlm_pad32 = -1;
-static int hf_dlm_flags = -1;
-static int hf_dlm_payload = -1;
+static gint ett_ocfs2;
+static gint ett_dtm_lock_flags;
+static gint ett_mres_flags;
+static gint ett_migrate_lockres_locks;
+static gint ett_query_nodeinfo;
+
+static int proto_ocfs2;
+static int hf_msg_magic;
+static int hf_msg_data_len;
+static int hf_msg_msg_type;
+static int hf_msg_sys_status;
+static int hf_msg_status;
+static int hf_msg_key;
+static int hf_msg_msg_num;
+static int hf_msg_pad;
+
+static int hf_dlm_node_idx;
+static int hf_dlm_lock_flags;
+static int hf_dlm_lock_flag_unused1;
+static int hf_dlm_lock_flag_orphan;
+static int hf_dlm_lock_flag_parentable;
+static int hf_dlm_lock_flag_block;
+static int hf_dlm_lock_flag_local;
+static int hf_dlm_lock_flag_valblk;
+static int hf_dlm_lock_flag_noqueue;
+static int hf_dlm_lock_flag_convert;
+static int hf_dlm_lock_flag_nodlckwt;
+static int hf_dlm_lock_flag_unlock;
+static int hf_dlm_lock_flag_cancel;
+static int hf_dlm_lock_flag_deqall;
+static int hf_dlm_lock_flag_invvalblk;
+static int hf_dlm_lock_flag_syncsts;
+static int hf_dlm_lock_flag_timeout;
+static int hf_dlm_lock_flag_sngldlck;
+static int hf_dlm_lock_flag_findlocal;
+static int hf_dlm_lock_flag_proc_owned;
+static int hf_dlm_lock_flag_xid;
+static int hf_dlm_lock_flag_xid_conflict;
+static int hf_dlm_lock_flag_force;
+static int hf_dlm_lock_flag_revvalblk;
+static int hf_dlm_lock_flag_unused2;
+static int hf_dlm_lock_flag_migration;
+static int hf_dlm_lock_flag_put_lvb;
+static int hf_dlm_lock_flag_get_lvb;
+static int hf_dlm_lock_flag_recovery;
+static int hf_dlm_am_flags;
+static int hf_dlm_fr_flags;
+static int hf_dlm_namelen;
+static int hf_dlm_name;
+static int hf_dlm_cookie;
+static int hf_dlm_requested_type;
+static int hf_dlm_lvb1;
+static int hf_dlm_lvb2;
+static int hf_dlm_lvb3;
+static int hf_dlm_ast_type;
+static int hf_dlm_blocked_type;
+static int hf_dlm_dead_node;
+static int hf_dlm_domain_name_len;
+static int hf_dlm_domain_name;
+static int hf_dlm_proto_ver;
+static int hf_dlm_fs_proto_ver;
+static int hf_dlm_node_map;
+static int hf_dlm_master;
+static int hf_dlm_new_master;
+static int hf_dlm_mres_num_locks;
+static int hf_dlm_mres_flags;
+static int hf_dlm_mres_flag_recovery;
+static int hf_dlm_mres_flag_migration;
+static int hf_dlm_mres_flag_all_done;
+static int hf_dlm_mres_total_locks;
+static int hf_dlm_mres_mig_cookie;
+static int hf_dlm_mres_list;
+static int hf_dlm_mres_ml_flags;
+static int hf_dlm_mres_type;
+static int hf_dlm_mres_convert_type;
+static int hf_dlm_mres_highest_blocked;
+static int hf_dlm_mres_node;
+static int hf_dlm_qr_node;
+static int hf_dlm_qr_numregions;
+static int hf_dlm_qr_namelen;
+static int hf_dlm_qr_domain;
+static int hf_dlm_qr_region;
+static int hf_dlm_qn_nodenum;
+static int hf_dlm_qn_numnodes;
+static int hf_dlm_qn_namelen;
+static int hf_dlm_qn_domain;
+static int hf_dlm_qn_node;
+static int hf_dlm_qn_port;
+static int hf_dlm_qn_ip;
+static int hf_dlm_reco_lvb;
+static int hf_dlm_pad8;
+static int hf_dlm_pad16;
+static int hf_dlm_pad32;
+static int hf_dlm_flags;
+static int hf_dlm_payload;
 
 #define O2NM_MAX_NAME_LEN	64
 #define O2NM_NODE_MAP_IN_BYTES	32
diff --git a/epan/dissectors/packet-ocp1.c b/epan/dissectors/packet-ocp1.c
index 4f27f3a75e..a0cc040f81 100644
--- a/epan/dissectors/packet-ocp1.c
+++ b/epan/dissectors/packet-ocp1.c
@@ -59,125 +59,125 @@ void proto_reg_handoff_ocp1(void);
 static dissector_handle_t ocp1_tcp_handle;
 static dissector_handle_t ocp1_udp_handle;
 
-static int proto_ocp1 = -1;
+static int proto_ocp1;
 expert_module_t* expert_ocp1;
 
 /* Header Fields */
-static int hf_ocp1_sync_value = -1;
-static int hf_ocp1_protocol_version = -1;
-static int hf_ocp1_pdu_size = -1;
-static int hf_ocp1_pdu_type = -1;
-static int hf_ocp1_message_count = -1;
+static int hf_ocp1_sync_value;
+static int hf_ocp1_protocol_version;
+static int hf_ocp1_pdu_size;
+static int hf_ocp1_pdu_type;
+static int hf_ocp1_message_count;
 
 /* Keep-Alive Fields */
-static int hf_ocp1_heartbeat_time_s = -1;
-static int hf_ocp1_heartbeat_time_ms = -1;
+static int hf_ocp1_heartbeat_time_s;
+static int hf_ocp1_heartbeat_time_ms;
 
 /* Common Fields */
-static int hf_ocp1_message_size = -1;
-static int hf_ocp1_message_handle = -1;
-static int hf_ocp1_message_target_ono = -1;
-static int hf_ocp1_message_emitter_ono = -1;
-static int hf_ocp1_message_occ = -1;
-static int hf_ocp1_message_method_id = -1;
-static int hf_ocp1_message_method_tree_level = -1;
-static int hf_ocp1_message_method_index = -1;
-static int hf_ocp1_message_event_id = -1;
-static int hf_ocp1_message_event_tree_level = -1;
-static int hf_ocp1_message_event_index = -1;
-static int hf_ocp1_message_parameter_count = -1;
-static int hf_ocp1_message_status_code = -1;
-static int hf_ocp1_response_in = -1;
-static int hf_ocp1_response_to = -1;
+static int hf_ocp1_message_size;
+static int hf_ocp1_message_handle;
+static int hf_ocp1_message_target_ono;
+static int hf_ocp1_message_emitter_ono;
+static int hf_ocp1_message_occ;
+static int hf_ocp1_message_method_id;
+static int hf_ocp1_message_method_tree_level;
+static int hf_ocp1_message_method_index;
+static int hf_ocp1_message_event_id;
+static int hf_ocp1_message_event_tree_level;
+static int hf_ocp1_message_event_index;
+static int hf_ocp1_message_parameter_count;
+static int hf_ocp1_message_status_code;
+static int hf_ocp1_response_in;
+static int hf_ocp1_response_to;
 
 /* Notification Fields */
-static int hf_ocp1_notification_parameter_context = -1;
+static int hf_ocp1_notification_parameter_context;
 
 /* Parameters */
-static int hf_ocp1_params = -1;
-static int hf_ocp1_params_bool = -1;
-static int hf_ocp1_params_ono = -1;
-static int hf_ocp1_params_event_id = -1;
-static int hf_ocp1_params_event_tree_level = -1;
-static int hf_ocp1_params_event_index = -1;
-static int hf_ocp1_params_method_id = -1;
-static int hf_ocp1_params_method_tree_level = -1;
-static int hf_ocp1_params_method_index = -1;
-static int hf_ocp1_params_property_id = -1;
-static int hf_ocp1_params_property_tree_level = -1;
-static int hf_ocp1_params_property_index = -1;
-static int hf_ocp1_params_blob = -1;
-static int hf_ocp1_params_blob_datasize = -1;
-static int hf_ocp1_params_blob_data = -1;
-static int hf_ocp1_params_string = -1;
-static int hf_ocp1_params_string_length = -1;
-static int hf_ocp1_params_string_value = -1;
-static int hf_ocp1_params_ntf_delivery_mode = -1;
-static int hf_ocp1_params_list_count = -1;
-static int hf_ocp1_params_map_count = -1;
-static int hf_ocp1_params_imageid = -1;
-static int hf_ocp1_params_classid = -1;
-static int hf_ocp1_params_classid_fields = -1;
-static int hf_ocp1_params_class_version = -1;
-static int hf_ocp1_params_oca_version = -1;
-static int hf_ocp1_params_reset_cause = -1;
-static int hf_ocp1_params_power_state = -1;
-static int hf_ocp1_params_media_clock_type = -1;
-static int hf_ocp1_params_component = -1;
-static int hf_ocp1_params_devicestate = -1;
-static int hf_ocp1_params_devicestate_oper = -1;
-static int hf_ocp1_params_devicestate_disabled = -1;
-static int hf_ocp1_params_devicestate_error = -1;
-static int hf_ocp1_params_devicestate_init = -1;
-static int hf_ocp1_params_devicestate_updating = -1;
-static int hf_ocp1_params_ocaver_major = -1;
-static int hf_ocp1_params_ocaver_minor = -1;
-static int hf_ocp1_params_ocaver_build = -1;
-static int hf_ocp1_params_ocaver_comp = -1;
-static int hf_ocp1_params_subscriber_ctx_len = -1;
-static int hf_ocp1_params_libvol_id = -1;
-static int hf_ocp1_params_libvoltype_id = -1;
-static int hf_ocp1_params_library_count = -1;
-static int hf_ocp1_params_time_ntp = -1;
-static int hf_ocp1_params_time_ptp = -1;
-static int hf_ocp1_params_time_ptp_negative = -1;
-static int hf_ocp1_params_time_ptp_seconds = -1;
-static int hf_ocp1_params_time_ptp_nanoseconds = -1;
-static int hf_ocp1_params_time_mode = -1;
-static int hf_ocp1_params_time_units = -1;
-static int hf_ocp1_params_task_id = -1;
-static int hf_ocp1_params_task_group_id = -1;
-static int hf_ocp1_params_time_interval = -1;
-static int hf_ocp1_params_start_time = -1;
-static int hf_ocp1_params_task_command = -1;
-static int hf_ocp1_params_task_manager_state = -1;
-static int hf_ocp1_params_task_state = -1;
-static int hf_ocp1_params_task_status_error_code = -1;
-static int hf_ocp1_params_media_coding_scheme_id = -1;
+static int hf_ocp1_params;
+static int hf_ocp1_params_bool;
+static int hf_ocp1_params_ono;
+static int hf_ocp1_params_event_id;
+static int hf_ocp1_params_event_tree_level;
+static int hf_ocp1_params_event_index;
+static int hf_ocp1_params_method_id;
+static int hf_ocp1_params_method_tree_level;
+static int hf_ocp1_params_method_index;
+static int hf_ocp1_params_property_id;
+static int hf_ocp1_params_property_tree_level;
+static int hf_ocp1_params_property_index;
+static int hf_ocp1_params_blob;
+static int hf_ocp1_params_blob_datasize;
+static int hf_ocp1_params_blob_data;
+static int hf_ocp1_params_string;
+static int hf_ocp1_params_string_length;
+static int hf_ocp1_params_string_value;
+static int hf_ocp1_params_ntf_delivery_mode;
+static int hf_ocp1_params_list_count;
+static int hf_ocp1_params_map_count;
+static int hf_ocp1_params_imageid;
+static int hf_ocp1_params_classid;
+static int hf_ocp1_params_classid_fields;
+static int hf_ocp1_params_class_version;
+static int hf_ocp1_params_oca_version;
+static int hf_ocp1_params_reset_cause;
+static int hf_ocp1_params_power_state;
+static int hf_ocp1_params_media_clock_type;
+static int hf_ocp1_params_component;
+static int hf_ocp1_params_devicestate;
+static int hf_ocp1_params_devicestate_oper;
+static int hf_ocp1_params_devicestate_disabled;
+static int hf_ocp1_params_devicestate_error;
+static int hf_ocp1_params_devicestate_init;
+static int hf_ocp1_params_devicestate_updating;
+static int hf_ocp1_params_ocaver_major;
+static int hf_ocp1_params_ocaver_minor;
+static int hf_ocp1_params_ocaver_build;
+static int hf_ocp1_params_ocaver_comp;
+static int hf_ocp1_params_subscriber_ctx_len;
+static int hf_ocp1_params_libvol_id;
+static int hf_ocp1_params_libvoltype_id;
+static int hf_ocp1_params_library_count;
+static int hf_ocp1_params_time_ntp;
+static int hf_ocp1_params_time_ptp;
+static int hf_ocp1_params_time_ptp_negative;
+static int hf_ocp1_params_time_ptp_seconds;
+static int hf_ocp1_params_time_ptp_nanoseconds;
+static int hf_ocp1_params_time_mode;
+static int hf_ocp1_params_time_units;
+static int hf_ocp1_params_task_id;
+static int hf_ocp1_params_task_group_id;
+static int hf_ocp1_params_time_interval;
+static int hf_ocp1_params_start_time;
+static int hf_ocp1_params_task_command;
+static int hf_ocp1_params_task_manager_state;
+static int hf_ocp1_params_task_state;
+static int hf_ocp1_params_task_status_error_code;
+static int hf_ocp1_params_media_coding_scheme_id;
 
 /* Expert fields */
-static expert_field ei_ocp1_handle_fail = EI_INIT;
-static expert_field ei_ocp1_bad_status_code = EI_INIT;
+static expert_field ei_ocp1_handle_fail;
+static expert_field ei_ocp1_bad_status_code;
 
 /* Trees */
-static gint ett_ocp1 = -1;
-static gint ett_ocp1_pdu = -1;
-static gint ett_ocp1_keepalive = -1;
-static gint ett_ocp1_message_method = -1;
-static gint ett_ocp1_context = -1;
-static gint ett_ocp1_event_data = -1;
-static gint ett_ocp1_event_method = -1;
-static gint ett_ocp1_params = -1;
-static gint ett_ocp1_params_event = -1;
-static gint ett_ocp1_params_method = -1;
-static gint ett_ocp1_params_property = -1;
-static gint ett_ocp1_params_blob = -1;
-static gint ett_ocp1_params_string = -1;
-static gint ett_ocp1_params_manager_desc = -1;
-static gint ett_ocp1_params_devicestate = -1;
-static gint ett_ocp1_params_compversion = -1;
-static gint ett_ocp1_params_ocaver = -1;
-static gint ett_ocp1_params_ptp = -1;
+static gint ett_ocp1;
+static gint ett_ocp1_pdu;
+static gint ett_ocp1_keepalive;
+static gint ett_ocp1_message_method;
+static gint ett_ocp1_context;
+static gint ett_ocp1_event_data;
+static gint ett_ocp1_event_method;
+static gint ett_ocp1_params;
+static gint ett_ocp1_params_event;
+static gint ett_ocp1_params_method;
+static gint ett_ocp1_params_property;
+static gint ett_ocp1_params_blob;
+static gint ett_ocp1_params_string;
+static gint ett_ocp1_params_manager_desc;
+static gint ett_ocp1_params_devicestate;
+static gint ett_ocp1_params_compversion;
+static gint ett_ocp1_params_ocaver;
+static gint ett_ocp1_params_ptp;
 
 /* PDU Types */
 static const value_string pdu_type_vals[] = {
diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c
index 76319b4bf4..3a9f579588 100644
--- a/epan/dissectors/packet-ocsp.c
+++ b/epan/dissectors/packet-ocsp.c
@@ -38,7 +38,7 @@ static dissector_handle_t ocsp_request_handle;
 static dissector_handle_t ocsp_response_handle;
 
 /* Initialize the protocol and registered fields */
-int proto_ocsp = -1;
+int proto_ocsp;
 static int hf_ocsp_responseType_id;
 static int hf_ocsp_BasicOCSPResponse_PDU;         /* BasicOCSPResponse */
 static int hf_ocsp_ArchiveCutoff_PDU;             /* ArchiveCutoff */
diff --git a/epan/dissectors/packet-oer.c b/epan/dissectors/packet-oer.c
index a23a1b9640..619cae2494 100644
--- a/epan/dissectors/packet-oer.c
+++ b/epan/dissectors/packet-oer.c
@@ -31,23 +31,23 @@ void proto_register_oer(void);
 void proto_reg_handoff_oer(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_oer = -1;
+static int proto_oer;
 
-static int hf_oer_optional_field_bit = -1;
-static int hf_oer_class = -1;
-static int hf_oer_tag = -1;
-static int hf_oer_length_determinant = -1;
+static int hf_oer_optional_field_bit;
+static int hf_oer_class;
+static int hf_oer_tag;
+static int hf_oer_length_determinant;
 static int hf_oer_extension_present_bit;
-static int hf_oer_open_type_length = -1;
+static int hf_oer_open_type_length;
 
 /* Initialize the subtree pointers */
-static int ett_oer = -1;
-static int ett_oer_sequence_of_item = -1;
-static int ett_oer_open_type = -1;
+static int ett_oer;
+static int ett_oer_sequence_of_item;
+static int ett_oer_open_type;
 
-static expert_field ei_oer_not_decoded_yet = EI_INIT;
-static expert_field ei_oer_undecoded = EI_INIT;
-static expert_field ei_oer_open_type = EI_INIT;
+static expert_field ei_oer_not_decoded_yet;
+static expert_field ei_oer_undecoded;
+static expert_field ei_oer_open_type;
 
 /* whether the OER helpers should put the internal OER fields into the tree or not. */
 static gboolean display_internal_oer_fields = FALSE;
diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c
index 6e192f011e..8a6feac502 100644
--- a/epan/dissectors/packet-oicq.c
+++ b/epan/dissectors/packet-oicq.c
@@ -40,17 +40,17 @@ static dissector_handle_t oicq_handle;
 /* By default, but can be completely different */
 #define UDP_PORT_OICQ	8000 /* Not IANA regisrered */
 
-static int proto_oicq = -1;
+static int proto_oicq;
 
-static int hf_oicq_flag = -1;
-static int hf_oicq_version = -1;
-static int hf_oicq_command = -1;
-static int hf_oicq_seq = -1;
-static int hf_oicq_qqid = -1;
-static int hf_oicq_data = -1;
+static int hf_oicq_flag;
+static int hf_oicq_version;
+static int hf_oicq_command;
+static int hf_oicq_seq;
+static int hf_oicq_qqid;
+static int hf_oicq_data;
 
 
-static gint ett_oicq = -1;
+static gint ett_oicq;
 
 static const value_string oicq_flag_vals[] = {
 	{ 0x02,	"Oicq packet" },
diff --git a/epan/dissectors/packet-oipf.c b/epan/dissectors/packet-oipf.c
index 30c3545ca2..4723aaeeae 100644
--- a/epan/dissectors/packet-oipf.c
+++ b/epan/dissectors/packet-oipf.c
@@ -22,17 +22,17 @@ void proto_reg_handoff_oipf(void);
 
 static dissector_handle_t oipf_ciplus_handle;
 
-static int proto_oipf_ciplus = -1;
+static int proto_oipf_ciplus;
 
-static gint ett_oipf_ciplus = -1;
+static gint ett_oipf_ciplus;
 
-static int hf_oipf_ciplus_cmd_id = -1;
-static int hf_oipf_ciplus_ca_sys_id = -1;
-static int hf_oipf_ciplus_trx_id = -1;
-static int hf_oipf_ciplus_send_datatype_nbr = -1;
-static int hf_oipf_ciplus_dat_id = -1;
-static int hf_oipf_ciplus_dat_len = -1;
-static int hf_oipf_ciplus_data = -1;
+static int hf_oipf_ciplus_cmd_id;
+static int hf_oipf_ciplus_ca_sys_id;
+static int hf_oipf_ciplus_trx_id;
+static int hf_oipf_ciplus_send_datatype_nbr;
+static int hf_oipf_ciplus_dat_id;
+static int hf_oipf_ciplus_dat_len;
+static int hf_oipf_ciplus_data;
 
 /* the application id for this protocol in the CI+ SAS resource
    this is actually a 64bit hex number, we can't use a 64bit number as a key
diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c
index f3c2fa31f3..d9d79ef068 100644
--- a/epan/dissectors/packet-olsr.c
+++ b/epan/dissectors/packet-olsr.c
@@ -40,68 +40,68 @@ static dissector_handle_t olsr_handle;
 #define NRLOLSR_TC_EXTRA     241
 
 /* Initialize the protocol and registered fields */
-static int proto_olsr = -1;
-
-static int hf_olsr_packet_len = -1;
-static int hf_olsr_packet_seq_num = -1;
-
-static int hf_olsr_message = -1;
-static int hf_olsr_message_type = -1;
-static int hf_olsr_vtime = -1;
-static int hf_olsr_message_size = -1;
-static int hf_olsr_ttl = -1;
-static int hf_olsr_hop_count = -1;
-static int hf_olsr_message_seq_num = -1;
-
-static int hf_olsr_htime = -1;
-static int hf_olsr_willingness = -1;
-
-static int hf_olsr_link_type = -1;
-static int hf_olsr_link_message_size = -1;
-static int hf_olsr_ansn = -1;
-
-static int hf_olsr_neighbor = -1;
-static int hf_olsr_origin_addr = -1;
-static int hf_olsr_neighbor_addr = -1;
-static int hf_olsr_interface_addr = -1;
-static int hf_olsr_netmask = -1;
-static int hf_olsr_network_addr = -1;
-
-/* static int hf_olsr_neighbor6 = -1; */
-static int hf_olsr_origin6_addr = -1;
-static int hf_olsr_neighbor6_addr = -1;
-static int hf_olsr_interface6_addr = -1;
-static int hf_olsr_netmask6 = -1;
-static int hf_olsr_network6_addr = -1;
-
-static int hf_olsrorg_lq = -1;
-static int hf_olsrorg_nlq = -1;
-static int hf_nrlolsr_f1 = -1;
-static int hf_nrlolsr_f2 = -1;
-
-static int hf_olsrorg_ns_version = -1;
-static int hf_olsrorg_ns_count = -1;
-
-static int hf_olsrorg_ns = -1;
-static int hf_olsrorg_ns_type = -1;
-static int hf_olsrorg_ns_length = -1;
-static int hf_olsrorg_ns_ip = -1;
-static int hf_olsrorg_ns_ip6 = -1;
-static int hf_olsrorg_ns_content = -1;
-
-static int hf_olsr_data = -1;
+static int proto_olsr;
+
+static int hf_olsr_packet_len;
+static int hf_olsr_packet_seq_num;
+
+static int hf_olsr_message;
+static int hf_olsr_message_type;
+static int hf_olsr_vtime;
+static int hf_olsr_message_size;
+static int hf_olsr_ttl;
+static int hf_olsr_hop_count;
+static int hf_olsr_message_seq_num;
+
+static int hf_olsr_htime;
+static int hf_olsr_willingness;
+
+static int hf_olsr_link_type;
+static int hf_olsr_link_message_size;
+static int hf_olsr_ansn;
+
+static int hf_olsr_neighbor;
+static int hf_olsr_origin_addr;
+static int hf_olsr_neighbor_addr;
+static int hf_olsr_interface_addr;
+static int hf_olsr_netmask;
+static int hf_olsr_network_addr;
+
+/* static int hf_olsr_neighbor6; */
+static int hf_olsr_origin6_addr;
+static int hf_olsr_neighbor6_addr;
+static int hf_olsr_interface6_addr;
+static int hf_olsr_netmask6;
+static int hf_olsr_network6_addr;
+
+static int hf_olsrorg_lq;
+static int hf_olsrorg_nlq;
+static int hf_nrlolsr_f1;
+static int hf_nrlolsr_f2;
+
+static int hf_olsrorg_ns_version;
+static int hf_olsrorg_ns_count;
+
+static int hf_olsrorg_ns;
+static int hf_olsrorg_ns_type;
+static int hf_olsrorg_ns_length;
+static int hf_olsrorg_ns_ip;
+static int hf_olsrorg_ns_ip6;
+static int hf_olsrorg_ns_content;
+
+static int hf_olsr_data;
 
 /* Initialize the subtree pointers*/
-static gint ett_olsr = -1;
+static gint ett_olsr;
 static gint ett_olsr_message[G_MAXUINT8 + 1];
-static gint ett_olsr_message_linktype = -1;
-static gint ett_olsr_message_neigh = -1;
-static gint ett_olsr_message_neigh6 = -1;
-static gint ett_olsr_message_ns = -1;
-
-static expert_field ei_olsr_not_enough_bytes = EI_INIT;
-static expert_field ei_olsrorg_ns_version = EI_INIT;
-static expert_field ei_olsr_data_misaligned = EI_INIT;
+static gint ett_olsr_message_linktype;
+static gint ett_olsr_message_neigh;
+static gint ett_olsr_message_neigh6;
+static gint ett_olsr_message_ns;
+
+static expert_field ei_olsr_not_enough_bytes;
+static expert_field ei_olsrorg_ns_version;
+static expert_field ei_olsr_data_misaligned;
 
 static const value_string message_type_vals[] = {
     { HELLO,                "HELLO" },
diff --git a/epan/dissectors/packet-omapi.c b/epan/dissectors/packet-omapi.c
index 7c43a3ea23..add56a6b7c 100644
--- a/epan/dissectors/packet-omapi.c
+++ b/epan/dissectors/packet-omapi.c
@@ -41,32 +41,32 @@ void proto_reg_handoff_omapi(void);
 
 static dissector_handle_t omapi_handle;
 
-static int proto_omapi = -1;
-static int hf_omapi_version = -1;
-static int hf_omapi_hlength = -1;
-static int hf_omapi_auth_id = -1;
-static int hf_omapi_auth_len = -1;
-static int hf_omapi_opcode = -1;
-static int hf_omapi_handle = -1;
-static int hf_omapi_id = -1;
-static int hf_omapi_rid = -1;
-static int hf_omapi_msg_name_len = -1; /* 16bit */
-static int hf_omapi_msg_name = -1;
-static int hf_omapi_msg_value_len = -1;
-static int hf_omapi_msg_value = -1;
-static int hf_omapi_obj_name_len = -1; /* 16bit */
-static int hf_omapi_obj_name = -1;
-static int hf_omapi_obj_value_len = -1;
-static int hf_omapi_obj_value = -1;
-static int hf_omapi_signature = -1;
+static int proto_omapi;
+static int hf_omapi_version;
+static int hf_omapi_hlength;
+static int hf_omapi_auth_id;
+static int hf_omapi_auth_len;
+static int hf_omapi_opcode;
+static int hf_omapi_handle;
+static int hf_omapi_id;
+static int hf_omapi_rid;
+static int hf_omapi_msg_name_len; /* 16bit */
+static int hf_omapi_msg_name;
+static int hf_omapi_msg_value_len;
+static int hf_omapi_msg_value;
+static int hf_omapi_obj_name_len; /* 16bit */
+static int hf_omapi_obj_name;
+static int hf_omapi_obj_value_len;
+static int hf_omapi_obj_value;
+static int hf_omapi_signature;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_omapi_empty_string = -1;
-static int hf_omapi_object_end_tag = -1;
-static int hf_omapi_message_end_tag = -1;
-static int hf_omapi_no_value = -1;
+static int hf_omapi_empty_string;
+static int hf_omapi_object_end_tag;
+static int hf_omapi_message_end_tag;
+static int hf_omapi_no_value;
 
-static gint ett_omapi = -1;
+static gint ett_omapi;
 
 #define OMAPI_PORT 7911 /* Not IANA registered */
 
diff --git a/epan/dissectors/packet-omron-fins.c b/epan/dissectors/packet-omron-fins.c
index ce528bd749..d81979b115 100644
--- a/epan/dissectors/packet-omron-fins.c
+++ b/epan/dissectors/packet-omron-fins.c
@@ -33,402 +33,402 @@ static dissector_handle_t omron_fins_udp_handle;
 #define OMRON_FINS_UDP_PORT 9600 /* Not IANA registered */
 #define OMRON_FINS_TCP_MAGIC_BYTES 0x46494e53 /* ASCII 'FINS' */
 
-static int proto_omron_fins = -1;
-static gint ett_omron = -1;
-static gint ett_omron_tcp_header = -1;
-static gint ett_omron_header = -1;
-static gint ett_omron_icf_fields = -1;
-static gint ett_omron_command_data = -1;
-static gint ett_area_data = -1;
-static gint ett_cpu_bus = -1;
-static gint ett_io_data = -1;
-static gint ett_pc_status_fields = -1;
-static gint ett_fatal_fields = -1;
-static gint ett_non_fatal_fields = -1;
-static gint ett_message_fields = -1;
-static gint ett_omron_error_log_data = -1;
-static gint ett_omron_disk_data = -1;
-static gint ett_omron_file_data = -1;
-static gint ett_omron_data_type = -1;
-static gint ett_omron_block_record = -1;
-static gint ett_omron_status_block = -1;
-static gint ett_omron_cyclic_fields = -1;
-static gint ett_omron_netw_nodes_sts = -1;
-static gint ett_omron_netw_node_sts = -1;
-static gint ett_omron_netw_nodes_non_fatal_err_sts = -1;
-static gint ett_omron_netw_nodes_cyclic_err_ctrs = -1;
-static gint ett_omron_data_link_status_tree = -1;
+static int proto_omron_fins;
+static gint ett_omron;
+static gint ett_omron_tcp_header;
+static gint ett_omron_header;
+static gint ett_omron_icf_fields;
+static gint ett_omron_command_data;
+static gint ett_area_data;
+static gint ett_cpu_bus;
+static gint ett_io_data;
+static gint ett_pc_status_fields;
+static gint ett_fatal_fields;
+static gint ett_non_fatal_fields;
+static gint ett_message_fields;
+static gint ett_omron_error_log_data;
+static gint ett_omron_disk_data;
+static gint ett_omron_file_data;
+static gint ett_omron_data_type;
+static gint ett_omron_block_record;
+static gint ett_omron_status_block;
+static gint ett_omron_cyclic_fields;
+static gint ett_omron_netw_nodes_sts;
+static gint ett_omron_netw_node_sts;
+static gint ett_omron_netw_nodes_non_fatal_err_sts;
+static gint ett_omron_netw_nodes_cyclic_err_ctrs;
+static gint ett_omron_data_link_status_tree;
 
 #if 0
 static gboolean gPREF_HEX = FALSE;
 #endif
 
 /* TCP Header fields */
-static int hf_omron_tcp_magic = -1;
-static int hf_omron_tcp_length = -1;
-static int hf_omron_tcp_command = -1;
-static int hf_omron_tcp_error_code = -1;
-static int hf_omron_tcp_client_node_address = -1;
-static int hf_omron_tcp_server_node_address = -1;
+static int hf_omron_tcp_magic;
+static int hf_omron_tcp_length;
+static int hf_omron_tcp_command;
+static int hf_omron_tcp_error_code;
+static int hf_omron_tcp_client_node_address;
+static int hf_omron_tcp_server_node_address;
 
 /* Omron-FINS Header fields */
-static int hf_omron_icf = -1;
-
-static int hf_omron_icf_gwb = -1; /* Gateway usage (0: don't use; 1: use) should be 1 */
-static int hf_omron_icf_dtb = -1; /* Data type (0: command 1: response) */
-static int hf_omron_icf_rb0 = -1; /* Reserved should be 0 */
-static int hf_omron_icf_rb1 = -1; /* Reserved should be 0 */
-static int hf_omron_icf_rb2 = -1; /* Reserved should be 0 */
-static int hf_omron_icf_rb3 = -1; /* Reserved should be 0 */
-static int hf_omron_icf_rb4 = -1; /* Reserved should be 0 */
-static int hf_omron_icf_rsb = -1; /* Response setting (0: response required; 1: response not required) */
-
-static int hf_omron_rsv = -1;
-static int hf_omron_gct = -1;
-static int hf_omron_dna = -1;
-static int hf_omron_da1 = -1;
-static int hf_omron_da2 = -1;
-static int hf_omron_sna = -1;
-static int hf_omron_sa1 = -1;
-static int hf_omron_sa2 = -1;
-static int hf_omron_sid = -1;
-
-static int hf_omron_command                  = -1;
-static int hf_omron_command_data             = -1;
-static int hf_omron_command_memory_area_code = -1;
-static int hf_omron_response_code            = -1;
-
-static int hf_omron_address      = -1;
-static int hf_omron_address_bits = -1;
-static int hf_omron_num_items    = -1;
-
-static int hf_omron_response_data       = -1;
-static int hf_omron_parameter_area_code = -1;
-
-static int hf_omron_beginning_word = -1;
-static int hf_omron_num_words = -1;
-
-static int hf_omron_program_number = -1;
-static int hf_omron_protect_code   = -1;
-static int hf_omron_begin_word     = -1;
-static int hf_omron_last_word      = -1;
-static int hf_omron_password       = -1;
-
-static int hf_omron_clear_code    = -1;
-static int hf_omron_mode_code     = -1;
-static int hf_omron_monitor_label = -1;
-
-static int hf_omron_controller_model   = -1;
-static int hf_omron_controller_version = -1;
-static int hf_omron_for_system_use     = -1;
-
-static int hf_omron_program_area_size    = -1;
-static int hf_omron_iom_size             = -1;
-static int hf_omron_num_dm_words         = -1;
-static int hf_omron_timer_counter_size   = -1;
-static int hf_omron_expansion_dm_size    = -1;
-static int hf_omron_num_step_transitions = -1;
-static int hf_omron_kind_memory_card     = -1;
-static int hf_omron_memory_card_size     = -1;
-
-static int hf_omron_cpu_bus_unit_0   = -1;
-static int hf_omron_cpu_bus_unit_1   = -1;
-static int hf_omron_cpu_bus_unit_2   = -1;
-static int hf_omron_cpu_bus_unit_3   = -1;
-static int hf_omron_cpu_bus_unit_4   = -1;
-static int hf_omron_cpu_bus_unit_5   = -1;
-static int hf_omron_cpu_bus_unit_6   = -1;
-static int hf_omron_cpu_bus_unit_7   = -1;
-static int hf_omron_cpu_bus_unit_8   = -1;
-static int hf_omron_cpu_bus_unit_9   = -1;
-static int hf_omron_cpu_bus_unit_10  = -1;
-static int hf_omron_cpu_bus_unit_11  = -1;
-static int hf_omron_cpu_bus_unit_12  = -1;
-static int hf_omron_cpu_bus_unit_13  = -1;
-static int hf_omron_cpu_bus_unit_14  = -1;
-static int hf_omron_cpu_bus_unit_15  = -1;
-static int hf_omron_cpu_bus_reserved = -1;
-
-static int hf_omron_io_data_num_sysmac_1 = -1;
-static int hf_omron_io_data_num_sysmac_2 = -1;
-
-static int hf_omron_pc_status          = -1;
-static int hf_omron_pc_status_pdc      = -1;
-static int hf_omron_pc_status_hi       = -1;
-static int hf_omron_pc_status_r1       = -1;
-static int hf_omron_pc_status_r2       = -1;
-static int hf_omron_pc_status_rack_num = -1;
-
-static int hf_omron_unit_address = -1;
-static int hf_omron_num_units    = -1;
-static int hf_omron_model_number = -1;
-
-static int hf_omron_status                      = -1;
-static int hf_omron_fatal_error_data            = -1;
-static int hf_omron_fatal_fals_error            = -1;
-static int hf_omron_fatal_sfc_error             = -1;
-static int hf_omron_fatal_cycle_time_over       = -1;
-static int hf_omron_fatal_program_error         = -1;
-static int hf_omron_fatal_io_setting_error      = -1;
-static int hf_omron_fatal_io_point_overflow     = -1;
-static int hf_omron_fatal_cpu_bus_error         = -1;
-static int hf_omron_fatal_duplication_error     = -1;
-static int hf_omron_fatal_io_bus_error          = -1;
-static int hf_omron_fatal_memory_error          = -1;
-static int hf_omron_fatal_rv_1                  = -1;
-static int hf_omron_fatal_rv_2                  = -1;
-static int hf_omron_fatal_rv_3                  = -1;
-static int hf_omron_fatal_rv_4                  = -1;
-static int hf_omron_fatal_rv_5                  = -1;
-static int hf_omron_fatal_watch_dog_timer_error = -1;
-
-static int hf_omron_non_fatal_error_data                 = -1;
-static int hf_omron_non_fatal_rv1                        = -1;
-static int hf_omron_non_fatal_rv2                        = -1;
-static int hf_omron_non_fatal_power_interruption         = -1;
-static int hf_omron_non_fatal_cpu_bus_unit_setting_error = -1;
-static int hf_omron_non_fatal_battery_error              = -1;
-static int hf_omron_non_fatal_sysmac_bus_error           = -1;
-static int hf_omron_non_fatal_sysmac_bus2_error          = -1;
-static int hf_omron_non_fatal_cpu_bus_unit_error         = -1;
-static int hf_omron_non_fatal_rv3                        = -1;
-static int hf_omron_non_fatal_io_verification_error      = -1;
-static int hf_omron_non_fatal_rv4                        = -1;
-static int hf_omron_non_fatal_sfc_error                  = -1;
-static int hf_omron_non_fatal_indirect_dm_error          = -1;
-static int hf_omron_non_fatal_jmp_error                  = -1;
-static int hf_omron_non_fatal_rv5                        = -1;
-static int hf_omron_non_fatal_fal_error                  = -1;
-
-static int hf_omron_message = -1;
-static int hf_omron_message_no_0 = -1;
-static int hf_omron_message_no_1 = -1;
-static int hf_omron_message_no_2 = -1;
-static int hf_omron_message_no_3 = -1;
-static int hf_omron_message_no_4 = -1;
-static int hf_omron_message_no_5 = -1;
-static int hf_omron_message_no_6 = -1;
-static int hf_omron_message_no_7 = -1;
-static int hf_omron_message_rv_0 = -1;
-static int hf_omron_message_rv_1 = -1;
-static int hf_omron_message_rv_2 = -1;
-static int hf_omron_message_rv_3 = -1;
-static int hf_omron_message_rv_4 = -1;
-static int hf_omron_message_rv_5 = -1;
-static int hf_omron_message_rv_6 = -1;
-static int hf_omron_message_rv_7 = -1;
-
-static int hf_omron_fals          = -1;
-static int hf_omron_error_message = -1;
-
-static int hf_omron_parameter      = -1;
-static int hf_omron_avg_cycle_time = -1;
-static int hf_omron_max_cycle_time = -1;
-static int hf_omron_min_cycle_time = -1;
-
-static int hf_omron_year   = -1;
-static int hf_omron_month  = -1;
-static int hf_omron_date   = -1;
-static int hf_omron_hour   = -1;
-static int hf_omron_minute = -1;
-static int hf_omron_second = -1;
-static int hf_omron_day    = -1;
-
-static int hf_omron_read_message = -1;
-
-static int hf_omron_node_number     = -1;
-static int hf_omron_network_address = -1;
-
-static int hf_omron_error_reset_fals_no = -1;
-
-static int hf_omron_beginning_record_no      = -1;
-static int hf_omron_no_of_records            = -1;
-static int hf_omron_max_no_of_stored_records = -1;
-static int hf_omron_no_of_stored_records     = -1;
-
-static int hf_omron_disk_no                 = -1;
-static int hf_omron_beginning_file_position = -1;
-static int hf_omron_no_of_files             = -1;
-
-static int hf_omron_volume_label    = -1;
-static int hf_omron_date_year       = -1;
-static int hf_omron_date_month      = -1;
-static int hf_omron_date_day        = -1;
-static int hf_omron_date_hour       = -1;
-static int hf_omron_date_minute     = -1;
-static int hf_omron_date_second     = -1;
-static int hf_omron_total_capacity  = -1;
-static int hf_omron_unused_capacity = -1;
-static int hf_omron_total_no_files  = -1;
-static int hf_omron_no_files        = -1;
-static int hf_omron_filename        = -1;
-static int hf_omron_file_capacity   = -1;
-
-static int hf_omron_file_position       = -1;
-static int hf_omron_data_length         = -1;
-static int hf_omron_file_data           = -1;
-static int hf_omron_file_parameter_code = -1;
-
-static int hf_omron_volume_parameter_code   = -1;
-static int hf_omron_transfer_parameter_code = -1;
-
-static int hf_omron_transfer_beginning_address = -1;
-static int hf_omron_number_of_bytes            = -1;
-
-static int hf_omron_number_of_bits_flags    = -1;
-static int hf_omron_set_reset_specification = -1;
-static int hf_omron_bit_flag                = -1;
-
-static int hf_omron_data = -1;
-
-static int hf_omron_beginning_block_num  = -1;
-static int hf_omron_num_blocks           = -1;
-static int hf_omron_num_blocks_remaining = -1;
-static int hf_omron_total_num_blocks     = -1;
-static int hf_omron_type                 = -1;
-static int hf_omron_data_type            = -1;
-static int hf_omron_data_type_type       = -1;
-static int hf_omron_data_type_rv         = -1;
-static int hf_omron_data_type_protected  = -1;
-static int hf_omron_data_type_end        = -1;
-static int hf_omron_control_data         = -1;
-
-static int hf_omron_block_num       = -1;
-static int hf_omron_num_unit_uint16 = -1;
-
-static int hf_omron_fixed                           = -1;
-static int hf_omron_intelligent_id_no               = -1;
-static int hf_omron_first_word                      = -1;
-static int hf_omron_read_len                        = -1;
-static int hf_omron_no_of_link_nodes                = -1;
-static int hf_omron_block_record_node_num_status    = -1;
-static int hf_omron_block_record_node_num_num_nodes = -1;
-static int hf_omron_block_record_cio_area           = -1;
-static int hf_omron_block_record_kind_of_dm         = -1;
-static int hf_omron_block_record_dm_area_first_word = -1;
-static int hf_omron_block_record_no_of_total_words  = -1;
-
-static int hf_omron_status_flags              = -1;
-static int hf_omron_status_flags_slave_master = -1;
-static int hf_omron_status_flags_data_link    = -1;
-static int hf_omron_master_node_number        = -1;
-static int hf_omron_status_node_0             = -1;
-static int hf_omron_status_node_1             = -1;
-static int hf_omron_status_node_2             = -1;
-static int hf_omron_status_node_3             = -1;
-static int hf_omron_status_node_4             = -1;
-static int hf_omron_status_node_5             = -1;
-static int hf_omron_status_node_6             = -1;
-static int hf_omron_status_node_7             = -1;
-static int hf_omron_status_1_node_0           = -1;
-static int hf_omron_status_1_node_1           = -1;
-static int hf_omron_status_1_node_2           = -1;
-static int hf_omron_status_1_node_3           = -1;
-static int hf_omron_status_1_node_4           = -1;
-static int hf_omron_status_1_node_5           = -1;
-static int hf_omron_status_1_node_6           = -1;
-static int hf_omron_status_1_node_7           = -1;
-static int hf_omron_status_2_node_0           = -1;
-static int hf_omron_status_2_node_1           = -1;
-static int hf_omron_status_2_node_2           = -1;
-static int hf_omron_status_2_node_3           = -1;
-static int hf_omron_status_2_node_4           = -1;
-static int hf_omron_status_2_node_5           = -1;
-static int hf_omron_status_2_node_6           = -1;
-static int hf_omron_status_2_node_7           = -1;
-
-static int hf_omron_name_data = -1;
-
-static int hf_omron_num_receptions = -1;
-
-static int hf_omron_netw_node_sts_low_0   = -1;
-static int hf_omron_netw_node_sts_low_1   = -1;
-static int hf_omron_netw_node_sts_low_2   = -1;
-static int hf_omron_netw_node_sts_low_3   = -1;
-static int hf_omron_netw_node_sts_high_0  = -1;
-static int hf_omron_netw_node_sts_high_1  = -1;
-static int hf_omron_netw_node_sts_high_2  = -1;
-static int hf_omron_netw_node_sts_high_3  = -1;
-static int hf_omron_com_cycle_time        = -1;
-static int hf_omron_polling_unit_node_num = -1;
-static int hf_omron_cyclic_operation      = -1;
-static int hf_omron_cyclic_trans_status   = -1;
-
-static int hf_omron_cyclic_label_1   = -1;
-static int hf_omron_cyclic_7         = -1;
-static int hf_omron_cyclic_6         = -1;
-static int hf_omron_cyclic_5         = -1;
-static int hf_omron_cyclic_4         = -1;
-static int hf_omron_cyclic_3         = -1;
-static int hf_omron_cyclic_2         = -1;
-static int hf_omron_cyclic_1         = -1;
-static int hf_omron_cyclic_label_2   = -1;
-static int hf_omron_cyclic_15        = -1;
-static int hf_omron_cyclic_14        = -1;
-static int hf_omron_cyclic_13        = -1;
-static int hf_omron_cyclic_12        = -1;
-static int hf_omron_cyclic_11        = -1;
-static int hf_omron_cyclic_10        = -1;
-static int hf_omron_cyclic_9         = -1;
-static int hf_omron_cyclic_8         = -1;
-static int hf_omron_cyclic_label_3   = -1;
-static int hf_omron_cyclic_23        = -1;
-static int hf_omron_cyclic_22        = -1;
-static int hf_omron_cyclic_21        = -1;
-static int hf_omron_cyclic_20        = -1;
-static int hf_omron_cyclic_19        = -1;
-static int hf_omron_cyclic_18        = -1;
-static int hf_omron_cyclic_17        = -1;
-static int hf_omron_cyclic_16        = -1;
-static int hf_omron_cyclic_label_4   = -1;
-static int hf_omron_cyclic_31        = -1;
-static int hf_omron_cyclic_30        = -1;
-static int hf_omron_cyclic_29        = -1;
-static int hf_omron_cyclic_28        = -1;
-static int hf_omron_cyclic_27        = -1;
-static int hf_omron_cyclic_26        = -1;
-static int hf_omron_cyclic_25        = -1;
-static int hf_omron_cyclic_24        = -1;
-static int hf_omron_cyclic_label_5   = -1;
-static int hf_omron_cyclic_39        = -1;
-static int hf_omron_cyclic_38        = -1;
-static int hf_omron_cyclic_37        = -1;
-static int hf_omron_cyclic_36        = -1;
-static int hf_omron_cyclic_35        = -1;
-static int hf_omron_cyclic_34        = -1;
-static int hf_omron_cyclic_33        = -1;
-static int hf_omron_cyclic_32        = -1;
-static int hf_omron_cyclic_label_6   = -1;
-static int hf_omron_cyclic_47        = -1;
-static int hf_omron_cyclic_46        = -1;
-static int hf_omron_cyclic_45        = -1;
-static int hf_omron_cyclic_44        = -1;
-static int hf_omron_cyclic_43        = -1;
-static int hf_omron_cyclic_42        = -1;
-static int hf_omron_cyclic_41        = -1;
-static int hf_omron_cyclic_40        = -1;
-static int hf_omron_cyclic_label_7   = -1;
-static int hf_omron_cyclic_55        = -1;
-static int hf_omron_cyclic_54        = -1;
-static int hf_omron_cyclic_53        = -1;
-static int hf_omron_cyclic_52        = -1;
-static int hf_omron_cyclic_51        = -1;
-static int hf_omron_cyclic_50        = -1;
-static int hf_omron_cyclic_49        = -1;
-static int hf_omron_cyclic_48        = -1;
-static int hf_omron_cyclic_label_8   = -1;
-static int hf_omron_cyclic_62        = -1;
-static int hf_omron_cyclic_61        = -1;
-static int hf_omron_cyclic_60        = -1;
-static int hf_omron_cyclic_59        = -1;
-static int hf_omron_cyclic_58        = -1;
-static int hf_omron_cyclic_57        = -1;
-static int hf_omron_cyclic_56        = -1;
-static int hf_omron_node_error_count = -1;
-
-static expert_field ei_omron_command_code = EI_INIT;
-static expert_field ei_omron_bad_length = EI_INIT;
-static expert_field ei_oomron_command_memory_area_code = EI_INIT;
+static int hf_omron_icf;
+
+static int hf_omron_icf_gwb; /* Gateway usage (0: don't use; 1: use) should be 1 */
+static int hf_omron_icf_dtb; /* Data type (0: command 1: response) */
+static int hf_omron_icf_rb0; /* Reserved should be 0 */
+static int hf_omron_icf_rb1; /* Reserved should be 0 */
+static int hf_omron_icf_rb2; /* Reserved should be 0 */
+static int hf_omron_icf_rb3; /* Reserved should be 0 */
+static int hf_omron_icf_rb4; /* Reserved should be 0 */
+static int hf_omron_icf_rsb; /* Response setting (0: response required; 1: response not required) */
+
+static int hf_omron_rsv;
+static int hf_omron_gct;
+static int hf_omron_dna;
+static int hf_omron_da1;
+static int hf_omron_da2;
+static int hf_omron_sna;
+static int hf_omron_sa1;
+static int hf_omron_sa2;
+static int hf_omron_sid;
+
+static int hf_omron_command;
+static int hf_omron_command_data;
+static int hf_omron_command_memory_area_code;
+static int hf_omron_response_code;
+
+static int hf_omron_address;
+static int hf_omron_address_bits;
+static int hf_omron_num_items;
+
+static int hf_omron_response_data;
+static int hf_omron_parameter_area_code;
+
+static int hf_omron_beginning_word;
+static int hf_omron_num_words;
+
+static int hf_omron_program_number;
+static int hf_omron_protect_code;
+static int hf_omron_begin_word;
+static int hf_omron_last_word;
+static int hf_omron_password;
+
+static int hf_omron_clear_code;
+static int hf_omron_mode_code;
+static int hf_omron_monitor_label;
+
+static int hf_omron_controller_model;
+static int hf_omron_controller_version;
+static int hf_omron_for_system_use;
+
+static int hf_omron_program_area_size;
+static int hf_omron_iom_size;
+static int hf_omron_num_dm_words;
+static int hf_omron_timer_counter_size;
+static int hf_omron_expansion_dm_size;
+static int hf_omron_num_step_transitions;
+static int hf_omron_kind_memory_card;
+static int hf_omron_memory_card_size;
+
+static int hf_omron_cpu_bus_unit_0;
+static int hf_omron_cpu_bus_unit_1;
+static int hf_omron_cpu_bus_unit_2;
+static int hf_omron_cpu_bus_unit_3;
+static int hf_omron_cpu_bus_unit_4;
+static int hf_omron_cpu_bus_unit_5;
+static int hf_omron_cpu_bus_unit_6;
+static int hf_omron_cpu_bus_unit_7;
+static int hf_omron_cpu_bus_unit_8;
+static int hf_omron_cpu_bus_unit_9;
+static int hf_omron_cpu_bus_unit_10;
+static int hf_omron_cpu_bus_unit_11;
+static int hf_omron_cpu_bus_unit_12;
+static int hf_omron_cpu_bus_unit_13;
+static int hf_omron_cpu_bus_unit_14;
+static int hf_omron_cpu_bus_unit_15;
+static int hf_omron_cpu_bus_reserved;
+
+static int hf_omron_io_data_num_sysmac_1;
+static int hf_omron_io_data_num_sysmac_2;
+
+static int hf_omron_pc_status;
+static int hf_omron_pc_status_pdc;
+static int hf_omron_pc_status_hi;
+static int hf_omron_pc_status_r1;
+static int hf_omron_pc_status_r2;
+static int hf_omron_pc_status_rack_num;
+
+static int hf_omron_unit_address;
+static int hf_omron_num_units;
+static int hf_omron_model_number;
+
+static int hf_omron_status;
+static int hf_omron_fatal_error_data;
+static int hf_omron_fatal_fals_error;
+static int hf_omron_fatal_sfc_error;
+static int hf_omron_fatal_cycle_time_over;
+static int hf_omron_fatal_program_error;
+static int hf_omron_fatal_io_setting_error;
+static int hf_omron_fatal_io_point_overflow;
+static int hf_omron_fatal_cpu_bus_error;
+static int hf_omron_fatal_duplication_error;
+static int hf_omron_fatal_io_bus_error;
+static int hf_omron_fatal_memory_error;
+static int hf_omron_fatal_rv_1;
+static int hf_omron_fatal_rv_2;
+static int hf_omron_fatal_rv_3;
+static int hf_omron_fatal_rv_4;
+static int hf_omron_fatal_rv_5;
+static int hf_omron_fatal_watch_dog_timer_error;
+
+static int hf_omron_non_fatal_error_data;
+static int hf_omron_non_fatal_rv1;
+static int hf_omron_non_fatal_rv2;
+static int hf_omron_non_fatal_power_interruption;
+static int hf_omron_non_fatal_cpu_bus_unit_setting_error;
+static int hf_omron_non_fatal_battery_error;
+static int hf_omron_non_fatal_sysmac_bus_error;
+static int hf_omron_non_fatal_sysmac_bus2_error;
+static int hf_omron_non_fatal_cpu_bus_unit_error;
+static int hf_omron_non_fatal_rv3;
+static int hf_omron_non_fatal_io_verification_error;
+static int hf_omron_non_fatal_rv4;
+static int hf_omron_non_fatal_sfc_error;
+static int hf_omron_non_fatal_indirect_dm_error;
+static int hf_omron_non_fatal_jmp_error;
+static int hf_omron_non_fatal_rv5;
+static int hf_omron_non_fatal_fal_error;
+
+static int hf_omron_message;
+static int hf_omron_message_no_0;
+static int hf_omron_message_no_1;
+static int hf_omron_message_no_2;
+static int hf_omron_message_no_3;
+static int hf_omron_message_no_4;
+static int hf_omron_message_no_5;
+static int hf_omron_message_no_6;
+static int hf_omron_message_no_7;
+static int hf_omron_message_rv_0;
+static int hf_omron_message_rv_1;
+static int hf_omron_message_rv_2;
+static int hf_omron_message_rv_3;
+static int hf_omron_message_rv_4;
+static int hf_omron_message_rv_5;
+static int hf_omron_message_rv_6;
+static int hf_omron_message_rv_7;
+
+static int hf_omron_fals;
+static int hf_omron_error_message;
+
+static int hf_omron_parameter;
+static int hf_omron_avg_cycle_time;
+static int hf_omron_max_cycle_time;
+static int hf_omron_min_cycle_time;
+
+static int hf_omron_year;
+static int hf_omron_month;
+static int hf_omron_date;
+static int hf_omron_hour;
+static int hf_omron_minute;
+static int hf_omron_second;
+static int hf_omron_day;
+
+static int hf_omron_read_message;
+
+static int hf_omron_node_number;
+static int hf_omron_network_address;
+
+static int hf_omron_error_reset_fals_no;
+
+static int hf_omron_beginning_record_no;
+static int hf_omron_no_of_records;
+static int hf_omron_max_no_of_stored_records;
+static int hf_omron_no_of_stored_records;
+
+static int hf_omron_disk_no;
+static int hf_omron_beginning_file_position;
+static int hf_omron_no_of_files;
+
+static int hf_omron_volume_label;
+static int hf_omron_date_year;
+static int hf_omron_date_month;
+static int hf_omron_date_day;
+static int hf_omron_date_hour;
+static int hf_omron_date_minute;
+static int hf_omron_date_second;
+static int hf_omron_total_capacity;
+static int hf_omron_unused_capacity;
+static int hf_omron_total_no_files;
+static int hf_omron_no_files;
+static int hf_omron_filename;
+static int hf_omron_file_capacity;
+
+static int hf_omron_file_position;
+static int hf_omron_data_length;
+static int hf_omron_file_data;
+static int hf_omron_file_parameter_code;
+
+static int hf_omron_volume_parameter_code;
+static int hf_omron_transfer_parameter_code;
+
+static int hf_omron_transfer_beginning_address;
+static int hf_omron_number_of_bytes;
+
+static int hf_omron_number_of_bits_flags;
+static int hf_omron_set_reset_specification;
+static int hf_omron_bit_flag;
+
+static int hf_omron_data;
+
+static int hf_omron_beginning_block_num;
+static int hf_omron_num_blocks;
+static int hf_omron_num_blocks_remaining;
+static int hf_omron_total_num_blocks;
+static int hf_omron_type;
+static int hf_omron_data_type;
+static int hf_omron_data_type_type;
+static int hf_omron_data_type_rv;
+static int hf_omron_data_type_protected;
+static int hf_omron_data_type_end;
+static int hf_omron_control_data;
+
+static int hf_omron_block_num;
+static int hf_omron_num_unit_uint16;
+
+static int hf_omron_fixed;
+static int hf_omron_intelligent_id_no;
+static int hf_omron_first_word;
+static int hf_omron_read_len;
+static int hf_omron_no_of_link_nodes;
+static int hf_omron_block_record_node_num_status;
+static int hf_omron_block_record_node_num_num_nodes;
+static int hf_omron_block_record_cio_area;
+static int hf_omron_block_record_kind_of_dm;
+static int hf_omron_block_record_dm_area_first_word;
+static int hf_omron_block_record_no_of_total_words;
+
+static int hf_omron_status_flags;
+static int hf_omron_status_flags_slave_master;
+static int hf_omron_status_flags_data_link;
+static int hf_omron_master_node_number;
+static int hf_omron_status_node_0;
+static int hf_omron_status_node_1;
+static int hf_omron_status_node_2;
+static int hf_omron_status_node_3;
+static int hf_omron_status_node_4;
+static int hf_omron_status_node_5;
+static int hf_omron_status_node_6;
+static int hf_omron_status_node_7;
+static int hf_omron_status_1_node_0;
+static int hf_omron_status_1_node_1;
+static int hf_omron_status_1_node_2;
+static int hf_omron_status_1_node_3;
+static int hf_omron_status_1_node_4;
+static int hf_omron_status_1_node_5;
+static int hf_omron_status_1_node_6;
+static int hf_omron_status_1_node_7;
+static int hf_omron_status_2_node_0;
+static int hf_omron_status_2_node_1;
+static int hf_omron_status_2_node_2;
+static int hf_omron_status_2_node_3;
+static int hf_omron_status_2_node_4;
+static int hf_omron_status_2_node_5;
+static int hf_omron_status_2_node_6;
+static int hf_omron_status_2_node_7;
+
+static int hf_omron_name_data;
+
+static int hf_omron_num_receptions;
+
+static int hf_omron_netw_node_sts_low_0;
+static int hf_omron_netw_node_sts_low_1;
+static int hf_omron_netw_node_sts_low_2;
+static int hf_omron_netw_node_sts_low_3;
+static int hf_omron_netw_node_sts_high_0;
+static int hf_omron_netw_node_sts_high_1;
+static int hf_omron_netw_node_sts_high_2;
+static int hf_omron_netw_node_sts_high_3;
+static int hf_omron_com_cycle_time;
+static int hf_omron_polling_unit_node_num;
+static int hf_omron_cyclic_operation;
+static int hf_omron_cyclic_trans_status;
+
+static int hf_omron_cyclic_label_1;
+static int hf_omron_cyclic_7;
+static int hf_omron_cyclic_6;
+static int hf_omron_cyclic_5;
+static int hf_omron_cyclic_4;
+static int hf_omron_cyclic_3;
+static int hf_omron_cyclic_2;
+static int hf_omron_cyclic_1;
+static int hf_omron_cyclic_label_2;
+static int hf_omron_cyclic_15;
+static int hf_omron_cyclic_14;
+static int hf_omron_cyclic_13;
+static int hf_omron_cyclic_12;
+static int hf_omron_cyclic_11;
+static int hf_omron_cyclic_10;
+static int hf_omron_cyclic_9;
+static int hf_omron_cyclic_8;
+static int hf_omron_cyclic_label_3;
+static int hf_omron_cyclic_23;
+static int hf_omron_cyclic_22;
+static int hf_omron_cyclic_21;
+static int hf_omron_cyclic_20;
+static int hf_omron_cyclic_19;
+static int hf_omron_cyclic_18;
+static int hf_omron_cyclic_17;
+static int hf_omron_cyclic_16;
+static int hf_omron_cyclic_label_4;
+static int hf_omron_cyclic_31;
+static int hf_omron_cyclic_30;
+static int hf_omron_cyclic_29;
+static int hf_omron_cyclic_28;
+static int hf_omron_cyclic_27;
+static int hf_omron_cyclic_26;
+static int hf_omron_cyclic_25;
+static int hf_omron_cyclic_24;
+static int hf_omron_cyclic_label_5;
+static int hf_omron_cyclic_39;
+static int hf_omron_cyclic_38;
+static int hf_omron_cyclic_37;
+static int hf_omron_cyclic_36;
+static int hf_omron_cyclic_35;
+static int hf_omron_cyclic_34;
+static int hf_omron_cyclic_33;
+static int hf_omron_cyclic_32;
+static int hf_omron_cyclic_label_6;
+static int hf_omron_cyclic_47;
+static int hf_omron_cyclic_46;
+static int hf_omron_cyclic_45;
+static int hf_omron_cyclic_44;
+static int hf_omron_cyclic_43;
+static int hf_omron_cyclic_42;
+static int hf_omron_cyclic_41;
+static int hf_omron_cyclic_40;
+static int hf_omron_cyclic_label_7;
+static int hf_omron_cyclic_55;
+static int hf_omron_cyclic_54;
+static int hf_omron_cyclic_53;
+static int hf_omron_cyclic_52;
+static int hf_omron_cyclic_51;
+static int hf_omron_cyclic_50;
+static int hf_omron_cyclic_49;
+static int hf_omron_cyclic_48;
+static int hf_omron_cyclic_label_8;
+static int hf_omron_cyclic_62;
+static int hf_omron_cyclic_61;
+static int hf_omron_cyclic_60;
+static int hf_omron_cyclic_59;
+static int hf_omron_cyclic_58;
+static int hf_omron_cyclic_57;
+static int hf_omron_cyclic_56;
+static int hf_omron_node_error_count;
+
+static expert_field ei_omron_command_code;
+static expert_field ei_omron_bad_length;
+static expert_field ei_oomron_command_memory_area_code;
 
 
 /* Defines */
diff --git a/epan/dissectors/packet-opa-fe.c b/epan/dissectors/packet-opa-fe.c
index 584a7ebdb8..edd2967f3e 100644
--- a/epan/dissectors/packet-opa-fe.c
+++ b/epan/dissectors/packet-opa-fe.c
@@ -26,17 +26,17 @@ void proto_register_opa_fe(void);
 #define OPA_FE_HEADER_LEN 24
 
 /* Wireshark ID */
-static gint proto_opa_fe = -1;
+static gint proto_opa_fe;
 
 /* Variables to hold expansion values between packets */
-static gint ett_fe = -1;
+static gint ett_fe;
 
 /* SnC Fields */
-static gint hf_opa_fe_magicnumber = -1;
-static gint hf_opa_fe_length_oob = -1;
-static gint hf_opa_fe_headerversion = -1;
-static gint hf_opa_fe_length = -1;
-static gint hf_opa_fe_Reserved64 = -1;
+static gint hf_opa_fe_magicnumber;
+static gint hf_opa_fe_length_oob;
+static gint hf_opa_fe_headerversion;
+static gint hf_opa_fe_length;
+static gint hf_opa_fe_Reserved64;
 
 /* Dissector Declarations */
 static dissector_handle_t opa_fe_handle;
diff --git a/epan/dissectors/packet-opa-mad.c b/epan/dissectors/packet-opa-mad.c
index 95c822c90d..8686443b42 100644
--- a/epan/dissectors/packet-opa-mad.c
+++ b/epan/dissectors/packet-opa-mad.c
@@ -799,220 +799,220 @@ static const value_string FocusPortFlags[] = {
 #define PM_ERR_BUCKETS 5
 
 /* Wireshark ID */
-static gint proto_opa_mad = -1;
+static gint proto_opa_mad;
 
 /* Variables to hold expansion values between packets */
-static gint ett_payload = -1;
-static gint ett_sm_lid = -1;
-static gint ett_sm_dr = -1;
-static gint ett_sa = -1;
-static gint ett_pm = -1;
-static gint ett_pa = -1;
-static gint ett_mad = -1;
-static gint ett_mad_status = -1;
-static gint ett_mad_attributemod = -1;
-static gint ett_rmpp = -1;
-static gint ett_rmpp_fragment = -1;
-static gint ett_rmpp_fragments = -1;
-static gint ett_rmpp_sa_record = -1;
+static gint ett_payload;
+static gint ett_sm_lid;
+static gint ett_sm_dr;
+static gint ett_sa;
+static gint ett_pm;
+static gint ett_pa;
+static gint ett_mad;
+static gint ett_mad_status;
+static gint ett_mad_attributemod;
+static gint ett_rmpp;
+static gint ett_rmpp_fragment;
+static gint ett_rmpp_fragments;
+static gint ett_rmpp_sa_record;
 /* Common */
-static gint ett_noticestraps = -1;
-static gint ett_datadetails = -1;
-static gint ett_datadetails_trap259datavalid = -1;
-static gint ett_informinfo = -1;
-static gint ett_classportinfo = -1;
-static gint ett_classportinfo_redirect = -1;
-static gint ett_classportinfo_trap = -1;
+static gint ett_noticestraps;
+static gint ett_datadetails;
+static gint ett_datadetails_trap259datavalid;
+static gint ett_informinfo;
+static gint ett_classportinfo;
+static gint ett_classportinfo_redirect;
+static gint ett_classportinfo_trap;
 /* SM */
-static gint ett_nodedescription = -1;
-static gint ett_nodeinfo = -1;
-static gint ett_switchinfo = -1;
-static gint ett_switchinfo_switchcapabilitymask = -1;
-static gint ett_portinfo = -1;
-static gint ett_portinfo_vl = -1;
-static gint ett_portinfo_link = -1;
-static gint ett_portinfo_portmode = -1;
-static gint ett_portinfo_flitcontrol = -1;
-static gint ett_portinfo_porterroraction = -1;
-static gint ett_portinfo_neighbormtu = -1;
-static gint ett_portinfo_xmitq = -1;
-static gint ett_portinfo_capmask = -1;
-static gint ett_portinfo_capmask3 = -1;
-static gint ett_portstates = -1;
-static gint ett_pkeytable = -1;
-static gint ett_pkeytable_block = -1;
-static gint ett_sltoscmapping = -1;
-static gint ett_sltoscmapping_block = -1;
-static gint ett_sctoscmapping = -1;
-static gint ett_sctoscmapping_block = -1;
-static gint ett_sctoslmapping = -1;
-static gint ett_sctoslmapping_block = -1;
-static gint ett_sctovlxmappingtable = -1;
-static gint ett_sctovlxmappingtable_block = -1;
-static gint ett_vlarbitrationtable = -1;
-static gint ett_vlarbitrationtable_port = -1;
-static gint ett_linearforwardingtable = -1;
-static gint ett_linearforwardingtable_block = -1;
-static gint ett_multicastforwardingtable = -1;
-static gint ett_multicastforwardingtable_block = -1;
-static gint ett_portgroupforwardingtable = -1;
-static gint ett_portgroupforwardingtable_block = -1;
-static gint ett_portgrouptable = -1;
-static gint ett_portgrouptable_block = -1;
-static gint ett_sminfo = -1;
-static gint ett_ledinfo = -1;
-static gint ett_cableinfo = -1;
-static gint ett_aggregate = -1;
-static gint ett_buffercontroltable = -1;
-static gint ett_congestioninfo = -1;
-static gint ett_switchcongestionlog = -1;
-static gint ett_switchcongestionlog_entry = -1;
-static gint ett_switchcongestionsetting = -1;
-static gint ett_switchportcongestionsetting = -1;
-static gint ett_switchportcongestionsetting_port = -1;
-static gint ett_hficongestionlog = -1;
-static gint ett_hficongestionlog_entry = -1;
-static gint ett_hficongestionsetting = -1;
-static gint ett_hficongestioncontroltable = -1;
-static gint ett_hficongestioncontroltable_block = -1;
+static gint ett_nodedescription;
+static gint ett_nodeinfo;
+static gint ett_switchinfo;
+static gint ett_switchinfo_switchcapabilitymask;
+static gint ett_portinfo;
+static gint ett_portinfo_vl;
+static gint ett_portinfo_link;
+static gint ett_portinfo_portmode;
+static gint ett_portinfo_flitcontrol;
+static gint ett_portinfo_porterroraction;
+static gint ett_portinfo_neighbormtu;
+static gint ett_portinfo_xmitq;
+static gint ett_portinfo_capmask;
+static gint ett_portinfo_capmask3;
+static gint ett_portstates;
+static gint ett_pkeytable;
+static gint ett_pkeytable_block;
+static gint ett_sltoscmapping;
+static gint ett_sltoscmapping_block;
+static gint ett_sctoscmapping;
+static gint ett_sctoscmapping_block;
+static gint ett_sctoslmapping;
+static gint ett_sctoslmapping_block;
+static gint ett_sctovlxmappingtable;
+static gint ett_sctovlxmappingtable_block;
+static gint ett_vlarbitrationtable;
+static gint ett_vlarbitrationtable_port;
+static gint ett_linearforwardingtable;
+static gint ett_linearforwardingtable_block;
+static gint ett_multicastforwardingtable;
+static gint ett_multicastforwardingtable_block;
+static gint ett_portgroupforwardingtable;
+static gint ett_portgroupforwardingtable_block;
+static gint ett_portgrouptable;
+static gint ett_portgrouptable_block;
+static gint ett_sminfo;
+static gint ett_ledinfo;
+static gint ett_cableinfo;
+static gint ett_aggregate;
+static gint ett_buffercontroltable;
+static gint ett_congestioninfo;
+static gint ett_switchcongestionlog;
+static gint ett_switchcongestionlog_entry;
+static gint ett_switchcongestionsetting;
+static gint ett_switchportcongestionsetting;
+static gint ett_switchportcongestionsetting_port;
+static gint ett_hficongestionlog;
+static gint ett_hficongestionlog_entry;
+static gint ett_hficongestionsetting;
+static gint ett_hficongestioncontroltable;
+static gint ett_hficongestioncontroltable_block;
 /* SA */
-static gint ett_portinforecord_linkdownreason = -1;
-static gint ett_portinforecord_linkdownreason_entry = -1;
-static gint ett_scmappingrecord = -1;
-static gint ett_lftrecord = -1;
-static gint ett_linkrecord = -1;
-static gint ett_servicerecord = -1;
-static gint ett_pathrecord = -1;
-static gint ett_pathrecord_dgid = -1;
-static gint ett_pathrecord_sgid = -1;
-static gint ett_mcmemberrecord = -1;
-static gint ett_tracerecord = -1;
-static gint ett_multipathrecord_gid = -1;
-static gint ett_multipathrecord_guid = -1;
-static gint ett_multipathrecord_lid = -1;
-static gint ett_cableinforecord = -1;
-static gint ett_serviceassocrecord = -1;
-static gint ett_sctoslmappingtablerecord = -1;
-static gint ett_portgroupforwardingtablerecord = -1;
-static gint ett_vfinforecord = -1;
-static gint ett_quarantinednoderecord = -1;
-static gint ett_fabricinforecord = -1;
+static gint ett_portinforecord_linkdownreason;
+static gint ett_portinforecord_linkdownreason_entry;
+static gint ett_scmappingrecord;
+static gint ett_lftrecord;
+static gint ett_linkrecord;
+static gint ett_servicerecord;
+static gint ett_pathrecord;
+static gint ett_pathrecord_dgid;
+static gint ett_pathrecord_sgid;
+static gint ett_mcmemberrecord;
+static gint ett_tracerecord;
+static gint ett_multipathrecord_gid;
+static gint ett_multipathrecord_guid;
+static gint ett_multipathrecord_lid;
+static gint ett_cableinforecord;
+static gint ett_serviceassocrecord;
+static gint ett_sctoslmappingtablerecord;
+static gint ett_portgroupforwardingtablerecord;
+static gint ett_vfinforecord;
+static gint ett_quarantinednoderecord;
+static gint ett_fabricinforecord;
 /* PM */
-static gint ett_portstatus = -1;
-static gint ett_portstatus_vl = -1;
-static gint ett_clearportstatus = -1;
-static gint ett_clearportstatus_counterselectmask = -1;
-static gint ett_dataportcounters = -1;
-static gint ett_dataportcounters_port = -1;
-static gint ett_dataportcounters_vl = -1;
-static gint ett_errorportcounters = -1;
-static gint ett_errorportcounters_port = -1;
-static gint ett_errorportinfo = -1;
-static gint ett_errorportinfoport = -1;
-static gint ett_errorportinfo_portrcverrorinfo = -1;
-static gint ett_errorportinfo_excessivebufferoverruninfo = -1;
-static gint ett_errorportinfo_portxmitconstrainterrorinfo = -1;
-static gint ett_errorportinfo_portrcvconstrainterrorinfo = -1;
-static gint ett_errorportinfo_portrcvswitchrelayerrorinfo = -1;
-static gint ett_errorportinfo_uncorrectableerrorinfo = -1;
-static gint ett_errorportinfo_fmconfigerrorinfo = -1;
+static gint ett_portstatus;
+static gint ett_portstatus_vl;
+static gint ett_clearportstatus;
+static gint ett_clearportstatus_counterselectmask;
+static gint ett_dataportcounters;
+static gint ett_dataportcounters_port;
+static gint ett_dataportcounters_vl;
+static gint ett_errorportcounters;
+static gint ett_errorportcounters_port;
+static gint ett_errorportinfo;
+static gint ett_errorportinfoport;
+static gint ett_errorportinfo_portrcverrorinfo;
+static gint ett_errorportinfo_excessivebufferoverruninfo;
+static gint ett_errorportinfo_portxmitconstrainterrorinfo;
+static gint ett_errorportinfo_portrcvconstrainterrorinfo;
+static gint ett_errorportinfo_portrcvswitchrelayerrorinfo;
+static gint ett_errorportinfo_uncorrectableerrorinfo;
+static gint ett_errorportinfo_fmconfigerrorinfo;
 /* PA */
-static gint ett_getgrouplist = -1;
-static gint ett_getgroupinfo = -1;
-static gint ett_getgroupinfoutilstats = -1;
-static gint ett_getgroupinfoutilbuckets = -1;
-static gint ett_getgroupinfoerrorsummary = -1;
-static gint ett_getgroupinfoerrintegritybucket = -1;
-static gint ett_getgroupinfoerrcongestionbucket = -1;
-static gint ett_getgroupinfoerrsmacongestionbucket = -1;
-static gint ett_getgroupinfoerrbubblebucket = -1;
-static gint ett_getgroupinfoerrsecuritybucket = -1;
-static gint ett_getgroupinfoerrroutingbucket = -1;
-static gint ett_getportcounters = -1;
-static gint ett_clearportcounters = -1;
-static gint ett_clearportcounters_counterselectmask = -1;
-static gint ett_clearallportcounters = -1;
-static gint ett_clearallportcounters_counterselectmask = -1;
-static gint ett_pmconfig = -1;
-static gint ett_getgroupconfig = -1;
-static gint ett_getgroupconfigport = -1;
-static gint ett_movefreezeframeold = -1;
-static gint ett_movefreezeframenew = -1;
-static gint ett_getfocusports = -1;
-static gint ett_getfocusportsport = -1;
-static gint ett_getimageinfo = -1;
-static gint ett_getimageinfosm = -1;
-static gint ett_getvflist = -1;
-static gint ett_getvfinfo = -1;
-static gint ett_getvfinfoutilstats = -1;
-static gint ett_getvfinfoutilbuckets = -1;
-static gint ett_getvfinfoerrorsummary = -1;
-static gint ett_getvfinfoerrintegritybucket = -1;
-static gint ett_getvfinfoerrcongestionbucket = -1;
-static gint ett_getvfinfoerrsmacongestionbucket = -1;
-static gint ett_getvfinfoerrbubblebucket = -1;
-static gint ett_getvfinfoerrsecuritybucket = -1;
-static gint ett_getvfinfoerrroutingbucket = -1;
-static gint ett_getvfconfig = -1;
-static gint ett_getvfconfigport = -1;
-static gint ett_getvffocusports = -1;
-static gint ett_getvffocusportsport = -1;
-static gint ett_getvfportcounters = -1;
-static gint ett_clearvfportcounters = -1;
-static gint ett_clearvfportcounters_counterselectmask = -1;
+static gint ett_getgrouplist;
+static gint ett_getgroupinfo;
+static gint ett_getgroupinfoutilstats;
+static gint ett_getgroupinfoutilbuckets;
+static gint ett_getgroupinfoerrorsummary;
+static gint ett_getgroupinfoerrintegritybucket;
+static gint ett_getgroupinfoerrcongestionbucket;
+static gint ett_getgroupinfoerrsmacongestionbucket;
+static gint ett_getgroupinfoerrbubblebucket;
+static gint ett_getgroupinfoerrsecuritybucket;
+static gint ett_getgroupinfoerrroutingbucket;
+static gint ett_getportcounters;
+static gint ett_clearportcounters;
+static gint ett_clearportcounters_counterselectmask;
+static gint ett_clearallportcounters;
+static gint ett_clearallportcounters_counterselectmask;
+static gint ett_pmconfig;
+static gint ett_getgroupconfig;
+static gint ett_getgroupconfigport;
+static gint ett_movefreezeframeold;
+static gint ett_movefreezeframenew;
+static gint ett_getfocusports;
+static gint ett_getfocusportsport;
+static gint ett_getimageinfo;
+static gint ett_getimageinfosm;
+static gint ett_getvflist;
+static gint ett_getvfinfo;
+static gint ett_getvfinfoutilstats;
+static gint ett_getvfinfoutilbuckets;
+static gint ett_getvfinfoerrorsummary;
+static gint ett_getvfinfoerrintegritybucket;
+static gint ett_getvfinfoerrcongestionbucket;
+static gint ett_getvfinfoerrsmacongestionbucket;
+static gint ett_getvfinfoerrbubblebucket;
+static gint ett_getvfinfoerrsecuritybucket;
+static gint ett_getvfinfoerrroutingbucket;
+static gint ett_getvfconfig;
+static gint ett_getvfconfigport;
+static gint ett_getvffocusports;
+static gint ett_getvffocusportsport;
+static gint ett_getvfportcounters;
+static gint ett_clearvfportcounters;
+static gint ett_clearvfportcounters_counterselectmask;
 
 /* Reserved Fields */
-static gint hf_opa_reserved8 = -1;
-static gint hf_opa_reserved16 = -1;
-static gint hf_opa_reserved24 = -1;
-static gint hf_opa_reserved32 = -1;
-static gint hf_opa_reserved64 = -1;
+static gint hf_opa_reserved8;
+static gint hf_opa_reserved16;
+static gint hf_opa_reserved24;
+static gint hf_opa_reserved32;
+static gint hf_opa_reserved64;
 /* opa_MAD Dissector */
-static gint hf_opa_etype = -1;
-static gint hf_opa_etype_reserved16 = -1;
+static gint hf_opa_etype;
+static gint hf_opa_etype_reserved16;
 /* SM Header - Lid Routed*/
-static gint hf_opa_sm_lid = -1;
-static gint hf_opa_sm_m_key = -1;
+static gint hf_opa_sm_lid;
+static gint hf_opa_sm_m_key;
 /* SM Header - Directed Route */
-static gint hf_opa_sm_dr = -1;
-static gint hf_opa_sm_dr_slid = -1;
-static gint hf_opa_sm_dr_dlid = -1;
-static gint hf_opa_sm_dr_initial_path = -1;
-static gint hf_opa_sm_dr_return_path = -1;
-static gint hf_opa_sm_dr_reserved64 = -1;
+static gint hf_opa_sm_dr;
+static gint hf_opa_sm_dr_slid;
+static gint hf_opa_sm_dr_dlid;
+static gint hf_opa_sm_dr_initial_path;
+static gint hf_opa_sm_dr_return_path;
+static gint hf_opa_sm_dr_reserved64;
 /* SA Header */
-static gint hf_opa_sa = -1;
-static gint hf_opa_sa_sm_key = -1;
-static gint hf_opa_sa_attribute_offset = -1;
-static gint hf_opa_sa_component_mask = -1;
+static gint hf_opa_sa;
+static gint hf_opa_sa_sm_key;
+static gint hf_opa_sa_attribute_offset;
+static gint hf_opa_sa_component_mask;
 /* PM Header / PA Header */
-static gint hf_opa_pm = -1;
-static gint hf_opa_pa = -1;
-static gint hf_opa_pa_sm_key = -1;
-static gint hf_opa_pa_attribute_offset = -1;
-static gint hf_opa_pa_component_mask = -1;
+static gint hf_opa_pm;
+static gint hf_opa_pa;
+static gint hf_opa_pa_sm_key;
+static gint hf_opa_pa_attribute_offset;
+static gint hf_opa_pa_component_mask;
 /* Other Vendor Header */
-static gint hf_opa_vendor = -1;
-static gint hf_opa_application = -1;
-static gint hf_opa_reservedmclass = -1;
-static gint hf_opa_unknown = -1;
+static gint hf_opa_vendor;
+static gint hf_opa_application;
+static gint hf_opa_reservedmclass;
+static gint hf_opa_unknown;
 
 /* MAD Header */
-static gint hf_opa_mad = -1;
-static gint hf_opa_mad_base_version = -1;
-static gint hf_opa_mad_mgmt_class = -1;
-static gint hf_opa_mad_class_version = -1;
-static gint hf_opa_mad_method = -1;
-static gint hf_opa_mad_status = -1;
-static gint hf_opa_mad_status_DR_D = -1;
-static gint hf_opa_mad_status_DR_status = -1;
-static gint hf_opa_mad_status_DR_Hop_Pointer = -1;
-static gint hf_opa_mad_status_DR_Hop_Count = -1;
-static gint hf_opa_mad_status_NM_ClassSpecific = -1;
-static gint hf_opa_mad_status_NM_reserved1 = -1;
-static gint hf_opa_mad_status_NM_InvalidField = -1;
-static gint hf_opa_mad_status_NM_RedirectRqrd = -1;
-static gint hf_opa_mad_status_NM_Busy = -1;
+static gint hf_opa_mad;
+static gint hf_opa_mad_base_version;
+static gint hf_opa_mad_mgmt_class;
+static gint hf_opa_mad_class_version;
+static gint hf_opa_mad_method;
+static gint hf_opa_mad_status;
+static gint hf_opa_mad_status_DR_D;
+static gint hf_opa_mad_status_DR_status;
+static gint hf_opa_mad_status_DR_Hop_Pointer;
+static gint hf_opa_mad_status_DR_Hop_Count;
+static gint hf_opa_mad_status_NM_ClassSpecific;
+static gint hf_opa_mad_status_NM_reserved1;
+static gint hf_opa_mad_status_NM_InvalidField;
+static gint hf_opa_mad_status_NM_RedirectRqrd;
+static gint hf_opa_mad_status_NM_Busy;
 static int * const _mad_status[] = {
     &hf_opa_mad_status_NM_ClassSpecific,
     &hf_opa_mad_status_NM_reserved1,
@@ -1021,32 +1021,32 @@ static int * const _mad_status[] = {
     &hf_opa_mad_status_NM_Busy,
     NULL
 };
-static gint hf_opa_mad_transaction_id = -1;
-static gint hf_opa_mad_attribute_id = -1;
-static gint hf_opa_attribute_modifier = -1;
-static gint hf_opa_attribute_modifier_A = -1;
-static gint hf_opa_attribute_modifier_A2 = -1;
-static gint hf_opa_attribute_modifier_A3 = -1;
-static gint hf_opa_attribute_modifier_A4 = -1;
-static gint hf_opa_attribute_modifier_A5 = -1;
-static gint hf_opa_attribute_modifier_A6 = -1;
-static gint hf_opa_attribute_modifier_B = -1;
-static gint hf_opa_attribute_modifier_B2 = -1;
-static gint hf_opa_attribute_modifier_B3 = -1;
-static gint hf_opa_attribute_modifier_B4 = -1;
-static gint hf_opa_attribute_modifier_B5 = -1;
-static gint hf_opa_attribute_modifier_E = -1;
-static gint hf_opa_attribute_modifier_I = -1;
-static gint hf_opa_attribute_modifier_L = -1;
-static gint hf_opa_attribute_modifier_NP = -1;
-static gint hf_opa_attribute_modifier_NB = -1;
-static gint hf_opa_attribute_modifier_N2 = -1;
-static gint hf_opa_attribute_modifier_P = -1;
-static gint hf_opa_attribute_modifier_P2 = -1;
-static gint hf_opa_attribute_modifier_P3 = -1;
-static gint hf_opa_attribute_modifier_S = -1;
-static gint hf_opa_attribute_modifier_S2 = -1;
-static gint hf_opa_attribute_modifier_Y = -1;
+static gint hf_opa_mad_transaction_id;
+static gint hf_opa_mad_attribute_id;
+static gint hf_opa_attribute_modifier;
+static gint hf_opa_attribute_modifier_A;
+static gint hf_opa_attribute_modifier_A2;
+static gint hf_opa_attribute_modifier_A3;
+static gint hf_opa_attribute_modifier_A4;
+static gint hf_opa_attribute_modifier_A5;
+static gint hf_opa_attribute_modifier_A6;
+static gint hf_opa_attribute_modifier_B;
+static gint hf_opa_attribute_modifier_B2;
+static gint hf_opa_attribute_modifier_B3;
+static gint hf_opa_attribute_modifier_B4;
+static gint hf_opa_attribute_modifier_B5;
+static gint hf_opa_attribute_modifier_E;
+static gint hf_opa_attribute_modifier_I;
+static gint hf_opa_attribute_modifier_L;
+static gint hf_opa_attribute_modifier_NP;
+static gint hf_opa_attribute_modifier_NB;
+static gint hf_opa_attribute_modifier_N2;
+static gint hf_opa_attribute_modifier_P;
+static gint hf_opa_attribute_modifier_P2;
+static gint hf_opa_attribute_modifier_P3;
+static gint hf_opa_attribute_modifier_S;
+static gint hf_opa_attribute_modifier_S2;
+static gint hf_opa_attribute_modifier_Y;
 static int * const _attribute_modifier_Nps2AP[] = {
     &hf_opa_attribute_modifier_NP,
     &hf_opa_attribute_modifier_S2,
@@ -1131,96 +1131,96 @@ static int * const _attribute_modifier_NbP3A6B5[] = {
     NULL
 };
 /* RMPP Header */
-static gint hf_opa_rmpp = -1;
-static gint hf_opa_rmpp_version = -1;
-static gint hf_opa_rmpp_type = -1;
-static gint hf_opa_rmpp_r_resp_time = -1;
-static gint hf_opa_rmpp_flags_last = -1;
-static gint hf_opa_rmpp_flags_first = -1;
-static gint hf_opa_rmpp_flags_active = -1;
-static gint hf_opa_rmpp_status = -1;
-static gint hf_opa_rmpp_data1 = -1;
-static gint hf_opa_rmpp_data2 = -1;
-static gint hf_opa_rmpp_segment_number = -1;
-static gint hf_opa_rmpp_payload_length32 = -1;
-static gint hf_opa_rmpp_new_window_last = -1;
+static gint hf_opa_rmpp;
+static gint hf_opa_rmpp_version;
+static gint hf_opa_rmpp_type;
+static gint hf_opa_rmpp_r_resp_time;
+static gint hf_opa_rmpp_flags_last;
+static gint hf_opa_rmpp_flags_first;
+static gint hf_opa_rmpp_flags_active;
+static gint hf_opa_rmpp_status;
+static gint hf_opa_rmpp_data1;
+static gint hf_opa_rmpp_data2;
+static gint hf_opa_rmpp_segment_number;
+static gint hf_opa_rmpp_payload_length32;
+static gint hf_opa_rmpp_new_window_last;
 /* SA Packets */
 /* SA RID */
-static gint hf_opa_sa_Lid = -1;
-static gint hf_opa_sa_EndportLID = -1;
-static gint hf_opa_sa_PortNum = -1;
-static gint hf_opa_sa_InputPortNum = -1;
-static gint hf_opa_sa_OutputPortNum = -1;
-static gint hf_opa_sa_Port = -1;
-static gint hf_opa_sa_reserved14 = -1;
-static gint hf_opa_sa_BlockNum_18b = -1;
-static gint hf_opa_sa_Position = -1;
-static gint hf_opa_sa_Position_16b = -1;
-static gint hf_opa_sa_reserved9 = -1;
-static gint hf_opa_sa_reserved9_16b = -1;
-static gint hf_opa_sa_BlockNum_21b = -1;
-static gint hf_opa_sa_BlockNum_8b = -1;
-static gint hf_opa_sa_BlockNum_16b = -1;
-static gint hf_opa_sa_BlockNum_5b = -1;
-static gint hf_opa_sa_SubscriberLID = -1;
-static gint hf_opa_sa_Enum = -1;
-static gint hf_opa_sa_FromLID = -1;
-static gint hf_opa_sa_FromPort = -1;
-static gint hf_opa_sa_ServiceID = -1;
-static gint hf_opa_sa_ServiceLID = -1;
-static gint hf_opa_sa_ServiceP_Key = -1;
-static gint hf_opa_sa_ServiceGID = -1;
-static gint hf_opa_sa_MGID = -1;
-static gint hf_opa_sa_PortGID = -1;
+static gint hf_opa_sa_Lid;
+static gint hf_opa_sa_EndportLID;
+static gint hf_opa_sa_PortNum;
+static gint hf_opa_sa_InputPortNum;
+static gint hf_opa_sa_OutputPortNum;
+static gint hf_opa_sa_Port;
+static gint hf_opa_sa_reserved14;
+static gint hf_opa_sa_BlockNum_18b;
+static gint hf_opa_sa_Position;
+static gint hf_opa_sa_Position_16b;
+static gint hf_opa_sa_reserved9;
+static gint hf_opa_sa_reserved9_16b;
+static gint hf_opa_sa_BlockNum_21b;
+static gint hf_opa_sa_BlockNum_8b;
+static gint hf_opa_sa_BlockNum_16b;
+static gint hf_opa_sa_BlockNum_5b;
+static gint hf_opa_sa_SubscriberLID;
+static gint hf_opa_sa_Enum;
+static gint hf_opa_sa_FromLID;
+static gint hf_opa_sa_FromPort;
+static gint hf_opa_sa_ServiceID;
+static gint hf_opa_sa_ServiceLID;
+static gint hf_opa_sa_ServiceP_Key;
+static gint hf_opa_sa_ServiceGID;
+static gint hf_opa_sa_MGID;
+static gint hf_opa_sa_PortGID;
 
 /* Attribute Specfic Fields */
-static gint hf_opa_Notice = -1;
-static gint hf_opa_Notice_IsGeneric = -1;
-static gint hf_opa_Notice_Type = -1;
-static gint hf_opa_Notice_ProducerType = -1;
-static gint hf_opa_Notice_TrapNumber = -1;
-static gint hf_opa_Notice_VendorID = -1;
-static gint hf_opa_Notice_DeviceID = -1;
-static gint hf_opa_Notice_IssuerLID = -1;
-static gint hf_opa_Notice_IssuerGID = -1;
-static gint hf_opa_Notice_Toggle = -1;
-static gint hf_opa_Notice_Count = -1;
-static gint hf_opa_Notice_ClassDataDetails = -1;
-static gint hf_opa_Trap = -1;
-static gint hf_opa_Trap_GID = -1;
-static gint hf_opa_Trap_LID = -1;
-static gint hf_opa_Trap_PORTNO = -1;
-static gint hf_opa_Trap_CAPABILITYMASK = -1;
-static gint hf_opa_Trap_CAPABILITYMASK3 = -1;
-static gint hf_opa_Trap_144_reserved = -1;
-static gint hf_opa_Trap_LinkWidthDowngradeEnabledChange = -1;
-static gint hf_opa_Trap_LinkSpeecEnabledChange = -1;
-static gint hf_opa_Trap_LinkWidthEnabledChange = -1;
-static gint hf_opa_Trap_NodeDescriptionChange = -1;
-static gint hf_opa_Trap_SystemImageGUID = -1;
-static gint hf_opa_Trap_DRSLID = -1;
-static gint hf_opa_Trap_Method = -1;
-static gint hf_opa_Trap_AttributeID = -1;
-static gint hf_opa_Trap_AttributeModifier = -1;
-static gint hf_opa_Trap_MKey = -1;
-static gint hf_opa_Trap_DRNotice = -1;
-static gint hf_opa_Trap_DRPathTruncated = -1;
-static gint hf_opa_Trap_DRHopCount = -1;
-static gint hf_opa_Trap_DRNoticeReturnPath = -1;
-static gint hf_opa_Trap_Key = -1;
-static gint hf_opa_Trap_SL = -1;
-static gint hf_opa_Trap_SL_reserved = -1;
-static gint hf_opa_Trap_QP = -1;
-static gint hf_opa_Trap_DataValid = -1;
-static gint hf_opa_Trap_DataValid_Lid1 = -1;
-static gint hf_opa_Trap_DataValid_Lid2 = -1;
-static gint hf_opa_Trap_DataValid_PKey = -1;
-static gint hf_opa_Trap_DataValid_SL = -1;
-static gint hf_opa_Trap_DataValid_QP1 = -1;
-static gint hf_opa_Trap_DataValid_QP2 = -1;
-static gint hf_opa_Trap_DataValid_Gid1 = -1;
-static gint hf_opa_Trap_DataValid_Gid2 = -1;
-static gint hf_opa_Trap_DataValid_Reserved = -1;
+static gint hf_opa_Notice;
+static gint hf_opa_Notice_IsGeneric;
+static gint hf_opa_Notice_Type;
+static gint hf_opa_Notice_ProducerType;
+static gint hf_opa_Notice_TrapNumber;
+static gint hf_opa_Notice_VendorID;
+static gint hf_opa_Notice_DeviceID;
+static gint hf_opa_Notice_IssuerLID;
+static gint hf_opa_Notice_IssuerGID;
+static gint hf_opa_Notice_Toggle;
+static gint hf_opa_Notice_Count;
+static gint hf_opa_Notice_ClassDataDetails;
+static gint hf_opa_Trap;
+static gint hf_opa_Trap_GID;
+static gint hf_opa_Trap_LID;
+static gint hf_opa_Trap_PORTNO;
+static gint hf_opa_Trap_CAPABILITYMASK;
+static gint hf_opa_Trap_CAPABILITYMASK3;
+static gint hf_opa_Trap_144_reserved;
+static gint hf_opa_Trap_LinkWidthDowngradeEnabledChange;
+static gint hf_opa_Trap_LinkSpeecEnabledChange;
+static gint hf_opa_Trap_LinkWidthEnabledChange;
+static gint hf_opa_Trap_NodeDescriptionChange;
+static gint hf_opa_Trap_SystemImageGUID;
+static gint hf_opa_Trap_DRSLID;
+static gint hf_opa_Trap_Method;
+static gint hf_opa_Trap_AttributeID;
+static gint hf_opa_Trap_AttributeModifier;
+static gint hf_opa_Trap_MKey;
+static gint hf_opa_Trap_DRNotice;
+static gint hf_opa_Trap_DRPathTruncated;
+static gint hf_opa_Trap_DRHopCount;
+static gint hf_opa_Trap_DRNoticeReturnPath;
+static gint hf_opa_Trap_Key;
+static gint hf_opa_Trap_SL;
+static gint hf_opa_Trap_SL_reserved;
+static gint hf_opa_Trap_QP;
+static gint hf_opa_Trap_DataValid;
+static gint hf_opa_Trap_DataValid_Lid1;
+static gint hf_opa_Trap_DataValid_Lid2;
+static gint hf_opa_Trap_DataValid_PKey;
+static gint hf_opa_Trap_DataValid_SL;
+static gint hf_opa_Trap_DataValid_QP1;
+static gint hf_opa_Trap_DataValid_QP2;
+static gint hf_opa_Trap_DataValid_Gid1;
+static gint hf_opa_Trap_DataValid_Gid2;
+static gint hf_opa_Trap_DataValid_Reserved;
 static int * const _Trap_DataValid[] = {
     &hf_opa_Trap_DataValid_Lid1,
     &hf_opa_Trap_DataValid_Lid2,
@@ -1233,94 +1233,94 @@ static int * const _Trap_DataValid[] = {
     &hf_opa_Trap_DataValid_Reserved,
     NULL
 };
-static gint hf_opa_Trap_PKey = -1;
-static gint hf_opa_ClassPortInfo = -1;
-static gint hf_opa_ClassPortInfo_BaseVersion = -1;
-static gint hf_opa_ClassPortInfo_ClassVersion = -1;
-static gint hf_opa_ClassPortInfo_CapMask = -1;
-static gint hf_opa_ClassPortInfo_CapMask2 = -1;
-static gint hf_opa_ClassPortInfo_RespTimeValue = -1;
-static gint hf_opa_ClassPortInfo_Redirect_GID = -1;
-static gint hf_opa_ClassPortInfo_Redirect_TClass = -1;
-static gint hf_opa_ClassPortInfo_Redirect_SL = -1;
-static gint hf_opa_ClassPortInfo_Redirect_reserved = -1;
-static gint hf_opa_ClassPortInfo_Redirect_FlowLabel = -1;
-static gint hf_opa_ClassPortInfo_Redirect_LID = -1;
-static gint hf_opa_ClassPortInfo_Redirect_reserved2 = -1;
-static gint hf_opa_ClassPortInfo_Redirect_QP = -1;
-static gint hf_opa_ClassPortInfo_Redirect_Q_Key = -1;
-static gint hf_opa_ClassPortInfo_Trap_GID = -1;
-static gint hf_opa_ClassPortInfo_Trap_TClass = -1;
-static gint hf_opa_ClassPortInfo_Trap_reserved = -1;
-static gint hf_opa_ClassPortInfo_Trap_FlowLabel = -1;
-static gint hf_opa_ClassPortInfo_Trap_LID = -1;
-static gint hf_opa_ClassPortInfo_Trap_HopLimit = -1;
-static gint hf_opa_ClassPortInfo_Trap_QP = -1;
-static gint hf_opa_ClassPortInfo_Trap_Q_Key = -1;
-static gint hf_opa_ClassPortInfo_Trap_P_Key = -1;
-static gint hf_opa_ClassPortInfo_Redirect_P_Key = -1;
-static gint hf_opa_ClassPortInfo_Trap_SL = -1;
-static gint hf_opa_ClassPortInfo_Trap_reserved2 = -1;
-static gint hf_opa_InformInfo = -1;
-static gint hf_opa_InformInfo_GID = -1;
-static gint hf_opa_InformInfo_LIDRangeBegin = -1;
-static gint hf_opa_InformInfo_LIDRangeEnd = -1;
-static gint hf_opa_InformInfo_IsGeneric = -1;
-static gint hf_opa_InformInfo_Subscribe = -1;
-static gint hf_opa_InformInfo_Type = -1;
-static gint hf_opa_InformInfo_TrapNumber = -1;
-static gint hf_opa_InformInfo_DeviceID = -1;
-static gint hf_opa_InformInfo_QPN = -1;
-static gint hf_opa_InformInfo_reserved = -1;
-static gint hf_opa_InformInfo_RespTimeValue = -1;
-static gint hf_opa_InformInfo_ProducerType = -1;
-static gint hf_opa_InformInfo_VendorID = -1;
+static gint hf_opa_Trap_PKey;
+static gint hf_opa_ClassPortInfo;
+static gint hf_opa_ClassPortInfo_BaseVersion;
+static gint hf_opa_ClassPortInfo_ClassVersion;
+static gint hf_opa_ClassPortInfo_CapMask;
+static gint hf_opa_ClassPortInfo_CapMask2;
+static gint hf_opa_ClassPortInfo_RespTimeValue;
+static gint hf_opa_ClassPortInfo_Redirect_GID;
+static gint hf_opa_ClassPortInfo_Redirect_TClass;
+static gint hf_opa_ClassPortInfo_Redirect_SL;
+static gint hf_opa_ClassPortInfo_Redirect_reserved;
+static gint hf_opa_ClassPortInfo_Redirect_FlowLabel;
+static gint hf_opa_ClassPortInfo_Redirect_LID;
+static gint hf_opa_ClassPortInfo_Redirect_reserved2;
+static gint hf_opa_ClassPortInfo_Redirect_QP;
+static gint hf_opa_ClassPortInfo_Redirect_Q_Key;
+static gint hf_opa_ClassPortInfo_Trap_GID;
+static gint hf_opa_ClassPortInfo_Trap_TClass;
+static gint hf_opa_ClassPortInfo_Trap_reserved;
+static gint hf_opa_ClassPortInfo_Trap_FlowLabel;
+static gint hf_opa_ClassPortInfo_Trap_LID;
+static gint hf_opa_ClassPortInfo_Trap_HopLimit;
+static gint hf_opa_ClassPortInfo_Trap_QP;
+static gint hf_opa_ClassPortInfo_Trap_Q_Key;
+static gint hf_opa_ClassPortInfo_Trap_P_Key;
+static gint hf_opa_ClassPortInfo_Redirect_P_Key;
+static gint hf_opa_ClassPortInfo_Trap_SL;
+static gint hf_opa_ClassPortInfo_Trap_reserved2;
+static gint hf_opa_InformInfo;
+static gint hf_opa_InformInfo_GID;
+static gint hf_opa_InformInfo_LIDRangeBegin;
+static gint hf_opa_InformInfo_LIDRangeEnd;
+static gint hf_opa_InformInfo_IsGeneric;
+static gint hf_opa_InformInfo_Subscribe;
+static gint hf_opa_InformInfo_Type;
+static gint hf_opa_InformInfo_TrapNumber;
+static gint hf_opa_InformInfo_DeviceID;
+static gint hf_opa_InformInfo_QPN;
+static gint hf_opa_InformInfo_reserved;
+static gint hf_opa_InformInfo_RespTimeValue;
+static gint hf_opa_InformInfo_ProducerType;
+static gint hf_opa_InformInfo_VendorID;
 /* SM */
-static gint hf_opa_NodeDescription = -1;
-static gint hf_opa_NodeDescription_NodeString = -1;
-static gint hf_opa_NodeInfo = -1;
-static gint hf_opa_NodeInfo_BaseVersion = -1;
-static gint hf_opa_NodeInfo_ClassVersion = -1;
-static gint hf_opa_NodeInfo_NodeType = -1;
-static gint hf_opa_NodeInfo_NumPorts = -1;
-static gint hf_opa_NodeInfo_SystemImageGUID = -1;
-static gint hf_opa_NodeInfo_NodeGUID = -1;
-static gint hf_opa_NodeInfo_PortGUID = -1;
-static gint hf_opa_NodeInfo_PartitionCap = -1;
-static gint hf_opa_NodeInfo_DeviceID = -1;
-static gint hf_opa_NodeInfo_Revision = -1;
-static gint hf_opa_NodeInfo_LocalPortNum = -1;
-static gint hf_opa_NodeInfo_VendorID = -1;
-static gint hf_opa_SwitchInfo = -1;
-static gint hf_opa_SwitchInfo_LinearFDBCap = -1;
-static gint hf_opa_SwitchInfo_MulticastFDBCap = -1;
-static gint hf_opa_SwitchInfo_LinearFDBTop = -1;
-static gint hf_opa_SwitchInfo_MulticastFDBTop = -1;
-static gint hf_opa_SwitchInfo_CollectiveCap = -1;
-static gint hf_opa_SwitchInfo_CollectiveTop = -1;
-static gint hf_opa_SwitchInfo_IPAddrIPv6 = -1;
-static gint hf_opa_SwitchInfo_IPAddrIPv4 = -1;
-static gint hf_opa_SwitchInfo_LifeTimeValue = -1;
-static gint hf_opa_SwitchInfo_PortStateChange = -1;
-static gint hf_opa_SwitchInfo_reserved2 = -1;
-static gint hf_opa_SwitchInfo_PartitionEnforcementCap = -1;
-static gint hf_opa_SwitchInfo_PortGroupCap = -1;
-static gint hf_opa_SwitchInfo_PortGroupTop = -1;
-static gint hf_opa_SwitchInfo_SupportedRoutingMode = -1;
-static gint hf_opa_SwitchInfo_EnabledRoutingMode = -1;
-static gint hf_opa_SwitchInfo_reserved3 = -1;
-static gint hf_opa_SwitchInfo_EnhancedPortZero = -1;
-static gint hf_opa_SwitchInfo_reserved4 = -1;
-static gint hf_opa_SwitchInfo_reserved5 = -1;
-static gint hf_opa_SwitchInfo_CollectiveMask = -1;
-static gint hf_opa_SwitchInfo_MulticastMask = -1;
-static gint hf_opa_SwitchInfo_AdaptiveRoutingEnable = -1;
-static gint hf_opa_SwitchInfo_AdaptiveRoutingPause = -1;
-static gint hf_opa_SwitchInfo_AdaptiveRoutingAlgorithm = -1;
-static gint hf_opa_SwitchInfo_AdaptiveRoutingFrequency = -1;
-static gint hf_opa_SwitchInfo_AdaptiveRoutingLostRoutesOnly = -1;
-static gint hf_opa_SwitchInfo_AdaptiveRoutingThreshold = -1;
-static gint hf_opa_SwitchInfo_reserved6 = -1;
+static gint hf_opa_NodeDescription;
+static gint hf_opa_NodeDescription_NodeString;
+static gint hf_opa_NodeInfo;
+static gint hf_opa_NodeInfo_BaseVersion;
+static gint hf_opa_NodeInfo_ClassVersion;
+static gint hf_opa_NodeInfo_NodeType;
+static gint hf_opa_NodeInfo_NumPorts;
+static gint hf_opa_NodeInfo_SystemImageGUID;
+static gint hf_opa_NodeInfo_NodeGUID;
+static gint hf_opa_NodeInfo_PortGUID;
+static gint hf_opa_NodeInfo_PartitionCap;
+static gint hf_opa_NodeInfo_DeviceID;
+static gint hf_opa_NodeInfo_Revision;
+static gint hf_opa_NodeInfo_LocalPortNum;
+static gint hf_opa_NodeInfo_VendorID;
+static gint hf_opa_SwitchInfo;
+static gint hf_opa_SwitchInfo_LinearFDBCap;
+static gint hf_opa_SwitchInfo_MulticastFDBCap;
+static gint hf_opa_SwitchInfo_LinearFDBTop;
+static gint hf_opa_SwitchInfo_MulticastFDBTop;
+static gint hf_opa_SwitchInfo_CollectiveCap;
+static gint hf_opa_SwitchInfo_CollectiveTop;
+static gint hf_opa_SwitchInfo_IPAddrIPv6;
+static gint hf_opa_SwitchInfo_IPAddrIPv4;
+static gint hf_opa_SwitchInfo_LifeTimeValue;
+static gint hf_opa_SwitchInfo_PortStateChange;
+static gint hf_opa_SwitchInfo_reserved2;
+static gint hf_opa_SwitchInfo_PartitionEnforcementCap;
+static gint hf_opa_SwitchInfo_PortGroupCap;
+static gint hf_opa_SwitchInfo_PortGroupTop;
+static gint hf_opa_SwitchInfo_SupportedRoutingMode;
+static gint hf_opa_SwitchInfo_EnabledRoutingMode;
+static gint hf_opa_SwitchInfo_reserved3;
+static gint hf_opa_SwitchInfo_EnhancedPortZero;
+static gint hf_opa_SwitchInfo_reserved4;
+static gint hf_opa_SwitchInfo_reserved5;
+static gint hf_opa_SwitchInfo_CollectiveMask;
+static gint hf_opa_SwitchInfo_MulticastMask;
+static gint hf_opa_SwitchInfo_AdaptiveRoutingEnable;
+static gint hf_opa_SwitchInfo_AdaptiveRoutingPause;
+static gint hf_opa_SwitchInfo_AdaptiveRoutingAlgorithm;
+static gint hf_opa_SwitchInfo_AdaptiveRoutingFrequency;
+static gint hf_opa_SwitchInfo_AdaptiveRoutingLostRoutesOnly;
+static gint hf_opa_SwitchInfo_AdaptiveRoutingThreshold;
+static gint hf_opa_SwitchInfo_reserved6;
 static int * const _SwitchInfo_AdaptiveRouting[] = {
     &hf_opa_SwitchInfo_AdaptiveRoutingEnable,
     &hf_opa_SwitchInfo_AdaptiveRoutingPause,
@@ -1331,11 +1331,11 @@ static int * const _SwitchInfo_AdaptiveRouting[] = {
     &hf_opa_SwitchInfo_reserved6,
     NULL
 };
-static gint hf_opa_SwitchInfo_SwitchCapabilityMask = -1;
-static gint hf_opa_SwitchInfo_SwitchCapabilityMask_reserved = -1;
-static gint hf_opa_SwitchInfo_SwitchCapabilityMask_IsAddrRangeConfigSupported = -1;
-static gint hf_opa_SwitchInfo_SwitchCapabilityMask_reserved2 = -1;
-static gint hf_opa_SwitchInfo_SwitchCapabilityMask_IsAdaptiveRoutingSupported = -1;
+static gint hf_opa_SwitchInfo_SwitchCapabilityMask;
+static gint hf_opa_SwitchInfo_SwitchCapabilityMask_reserved;
+static gint hf_opa_SwitchInfo_SwitchCapabilityMask_IsAddrRangeConfigSupported;
+static gint hf_opa_SwitchInfo_SwitchCapabilityMask_reserved2;
+static gint hf_opa_SwitchInfo_SwitchCapabilityMask_IsAdaptiveRoutingSupported;
 static int * const _SwitchInfo_SwitchCapabilityMask[] = {
     &hf_opa_SwitchInfo_SwitchCapabilityMask_reserved,
     &hf_opa_SwitchInfo_SwitchCapabilityMask_IsAddrRangeConfigSupported,
@@ -1343,74 +1343,74 @@ static int * const _SwitchInfo_SwitchCapabilityMask[] = {
     &hf_opa_SwitchInfo_SwitchCapabilityMask_IsAdaptiveRoutingSupported,
     NULL
 };
-static gint hf_opa_SwitchInfo_CapabilityMaskCollectives = -1;
-static gint hf_opa_PortInfo = -1;
-static gint hf_opa_PortInfo_LID = -1;
-static gint hf_opa_PortInfo_FlowControlMask = -1;
-static gint hf_opa_PortInfo_VL_PreemptCap = -1;
-static gint hf_opa_PortInfo_VL_reserved = -1;
-static gint hf_opa_PortInfo_VL_Cap = -1;
-static gint hf_opa_PortInfo_VL_HighLimit = -1;
-static gint hf_opa_PortInfo_VL_PreemptingLimit = -1;
-static gint hf_opa_PortInfo_VL_ArbitrationHighCap = -1;
-static gint hf_opa_PortInfo_VL_ArbitrationLowCap = -1;
-static gint hf_opa_PortInfo_PortPhysConfig_reserved = -1;
-static gint hf_opa_PortInfo_PortPhysConfig_PortType = -1;
-static gint hf_opa_PortInfo_MultiCollectMask_reserved = -1;
-static gint hf_opa_PortInfo_MultiCollectMask_CollectiveMask = -1;
-static gint hf_opa_PortInfo_MultiCollectMask_MulticastMask = -1;
-static gint hf_opa_PortInfo_M_KeyProtectBits = -1;
-static gint hf_opa_PortInfo_S1_reserved = -1;
-static gint hf_opa_PortInfo_LMC = -1;
-static gint hf_opa_PortInfo_S2_reserved = -1;
-static gint hf_opa_PortInfo_MasterSMSL = -1;
-static gint hf_opa_PortInfo_LinkInitReason = -1;
-static gint hf_opa_PortInfo_PartitionEnforcementInbound = -1;
-static gint hf_opa_PortInfo_PartitionEnforcementOutbound = -1;
-static gint hf_opa_PortInfo_S3_reserved2 = -1;
-static gint hf_opa_PortInfo_S4_reserved = -1;
-static gint hf_opa_PortInfo_OperationalVL = -1;
-static gint hf_opa_PortInfo_P_Keys_P_Key_8B = -1;
-static gint hf_opa_PortInfo_P_Keys_P_Key_10B = -1;
-static gint hf_opa_PortInfo_M_KeyViolations = -1;
-static gint hf_opa_PortInfo_P_KeyViolations = -1;
-static gint hf_opa_PortInfo_Q_KeyViolations = -1;
-static gint hf_opa_PortInfo_TrapQueuePair_reserved = -1;
-static gint hf_opa_PortInfo_TrapQueuePair = -1;
-static gint hf_opa_PortInfo_SAQueuePair_reserved = -1;
-static gint hf_opa_PortInfo_SAQueuePair = -1;
-static gint hf_opa_PortInfo_NeighborPortNum = -1;
-static gint hf_opa_PortInfo_LinkDownReason = -1;
-static gint hf_opa_PortInfo_NeighborLinkDownReason = -1;
-static gint hf_opa_PortInfo_ClientReregister = -1;
-static gint hf_opa_PortInfo_MulticastPKeyTrapSuppressEnabled = -1;
-static gint hf_opa_PortInfo_Timeout = -1;
-static gint hf_opa_PortInfo_LinkSpeedSupported = -1;
-static gint hf_opa_PortInfo_LinkSpeedEnabled = -1;
-static gint hf_opa_PortInfo_LinkSpeedActive = -1;
-static gint hf_opa_PortInfo_LinkWidthSupported = -1;
-static gint hf_opa_PortInfo_LinkWidthEnabled = -1;
-static gint hf_opa_PortInfo_LinkWidthActive = -1;
-static gint hf_opa_PortInfo_LinkWidthDowngrade_Supported = -1;
-static gint hf_opa_PortInfo_LinkWidthDowngrade_Enabled = -1;
-static gint hf_opa_PortInfo_LinkWidthDowngrade_TxActive = -1;
-static gint hf_opa_PortInfo_LinkWidthDowngrade_RxActive = -1;
-static gint hf_opa_PortInfo_PortLinkMode_reserved = -1;
-static gint hf_opa_PortInfo_PortLinkMode_Supported = -1;
-static gint hf_opa_PortInfo_PortLinkMode_Enabled = -1;
-static gint hf_opa_PortInfo_PortLinkMode_Active = -1;
-static gint hf_opa_PortInfo_PortLTPCRCMode_reserved = -1;
-static gint hf_opa_PortInfo_PortLTPCRCMode_Supported = -1;
-static gint hf_opa_PortInfo_PortLTPCRCMode_Enabled = -1;
-static gint hf_opa_PortInfo_PortLTPCRCMode_Active = -1;
-static gint hf_opa_PortInfo_PortMode = -1;
-static gint hf_opa_PortInfo_PortMode_reserved = -1;
-static gint hf_opa_PortInfo_PortMode_IsActiveOptimizeEnabled = -1;
-static gint hf_opa_PortInfo_PortMode_IsPassThroughEnabled = -1;
-static gint hf_opa_PortInfo_PortMode_IsVLMarkerEnabled = -1;
-static gint hf_opa_PortInfo_PortMode_reserved2 = -1;
-static gint hf_opa_PortInfo_PortMode_Is16BTrapQueryEnabled = -1;
-static gint hf_opa_PortInfo_PortMode_reserved3 = -1;
+static gint hf_opa_SwitchInfo_CapabilityMaskCollectives;
+static gint hf_opa_PortInfo;
+static gint hf_opa_PortInfo_LID;
+static gint hf_opa_PortInfo_FlowControlMask;
+static gint hf_opa_PortInfo_VL_PreemptCap;
+static gint hf_opa_PortInfo_VL_reserved;
+static gint hf_opa_PortInfo_VL_Cap;
+static gint hf_opa_PortInfo_VL_HighLimit;
+static gint hf_opa_PortInfo_VL_PreemptingLimit;
+static gint hf_opa_PortInfo_VL_ArbitrationHighCap;
+static gint hf_opa_PortInfo_VL_ArbitrationLowCap;
+static gint hf_opa_PortInfo_PortPhysConfig_reserved;
+static gint hf_opa_PortInfo_PortPhysConfig_PortType;
+static gint hf_opa_PortInfo_MultiCollectMask_reserved;
+static gint hf_opa_PortInfo_MultiCollectMask_CollectiveMask;
+static gint hf_opa_PortInfo_MultiCollectMask_MulticastMask;
+static gint hf_opa_PortInfo_M_KeyProtectBits;
+static gint hf_opa_PortInfo_S1_reserved;
+static gint hf_opa_PortInfo_LMC;
+static gint hf_opa_PortInfo_S2_reserved;
+static gint hf_opa_PortInfo_MasterSMSL;
+static gint hf_opa_PortInfo_LinkInitReason;
+static gint hf_opa_PortInfo_PartitionEnforcementInbound;
+static gint hf_opa_PortInfo_PartitionEnforcementOutbound;
+static gint hf_opa_PortInfo_S3_reserved2;
+static gint hf_opa_PortInfo_S4_reserved;
+static gint hf_opa_PortInfo_OperationalVL;
+static gint hf_opa_PortInfo_P_Keys_P_Key_8B;
+static gint hf_opa_PortInfo_P_Keys_P_Key_10B;
+static gint hf_opa_PortInfo_M_KeyViolations;
+static gint hf_opa_PortInfo_P_KeyViolations;
+static gint hf_opa_PortInfo_Q_KeyViolations;
+static gint hf_opa_PortInfo_TrapQueuePair_reserved;
+static gint hf_opa_PortInfo_TrapQueuePair;
+static gint hf_opa_PortInfo_SAQueuePair_reserved;
+static gint hf_opa_PortInfo_SAQueuePair;
+static gint hf_opa_PortInfo_NeighborPortNum;
+static gint hf_opa_PortInfo_LinkDownReason;
+static gint hf_opa_PortInfo_NeighborLinkDownReason;
+static gint hf_opa_PortInfo_ClientReregister;
+static gint hf_opa_PortInfo_MulticastPKeyTrapSuppressEnabled;
+static gint hf_opa_PortInfo_Timeout;
+static gint hf_opa_PortInfo_LinkSpeedSupported;
+static gint hf_opa_PortInfo_LinkSpeedEnabled;
+static gint hf_opa_PortInfo_LinkSpeedActive;
+static gint hf_opa_PortInfo_LinkWidthSupported;
+static gint hf_opa_PortInfo_LinkWidthEnabled;
+static gint hf_opa_PortInfo_LinkWidthActive;
+static gint hf_opa_PortInfo_LinkWidthDowngrade_Supported;
+static gint hf_opa_PortInfo_LinkWidthDowngrade_Enabled;
+static gint hf_opa_PortInfo_LinkWidthDowngrade_TxActive;
+static gint hf_opa_PortInfo_LinkWidthDowngrade_RxActive;
+static gint hf_opa_PortInfo_PortLinkMode_reserved;
+static gint hf_opa_PortInfo_PortLinkMode_Supported;
+static gint hf_opa_PortInfo_PortLinkMode_Enabled;
+static gint hf_opa_PortInfo_PortLinkMode_Active;
+static gint hf_opa_PortInfo_PortLTPCRCMode_reserved;
+static gint hf_opa_PortInfo_PortLTPCRCMode_Supported;
+static gint hf_opa_PortInfo_PortLTPCRCMode_Enabled;
+static gint hf_opa_PortInfo_PortLTPCRCMode_Active;
+static gint hf_opa_PortInfo_PortMode;
+static gint hf_opa_PortInfo_PortMode_reserved;
+static gint hf_opa_PortInfo_PortMode_IsActiveOptimizeEnabled;
+static gint hf_opa_PortInfo_PortMode_IsPassThroughEnabled;
+static gint hf_opa_PortInfo_PortMode_IsVLMarkerEnabled;
+static gint hf_opa_PortInfo_PortMode_reserved2;
+static gint hf_opa_PortInfo_PortMode_Is16BTrapQueryEnabled;
+static gint hf_opa_PortInfo_PortMode_reserved3;
 static int * const _PortInfo_PortMode[] = {
     &hf_opa_PortInfo_PortMode_reserved,
     &hf_opa_PortInfo_PortMode_IsActiveOptimizeEnabled,
@@ -1421,45 +1421,45 @@ static int * const _PortInfo_PortMode[] = {
     &hf_opa_PortInfo_PortMode_reserved3,
     NULL
 };
-static gint hf_opa_PortInfo_PortPacketFormats_Supported = -1;
-static gint hf_opa_PortInfo_PortPacketFormats_Enabled = -1;
-static gint hf_opa_PortInfo_FlitControl_Interleave_reserved = -1;
-static gint hf_opa_PortInfo_FlitControl_Interleave_DistanceSupported = -1;
-static gint hf_opa_PortInfo_FlitControl_Interleave_DistanceEnabled = -1;
-static gint hf_opa_PortInfo_FlitControl_Interleave_MaxNestLevelTxEnabled = -1;
-static gint hf_opa_PortInfo_FlitControl_Interleave_MaxNestLevelRxSupported = -1;
-static gint hf_opa_PortInfo_FlitControl_Preemption_MinInitial = -1;
-static gint hf_opa_PortInfo_FlitControl_Preemption_MinTail = -1;
-static gint hf_opa_PortInfo_FlitControl_Preemption_LargePacketLimit = -1;
-static gint hf_opa_PortInfo_FlitControl_Preemption_SmallPacketLimit = -1;
-static gint hf_opa_PortInfo_FlitControl_Preemption_MaxSmallPacketLimit = -1;
-static gint hf_opa_PortInfo_FlitControl_Preemption_PreemptionLimit = -1;
-static gint hf_opa_PortInfo_PortErrorAction = -1;
-static gint hf_opa_PortInfo_PortErrorAction_ExcessiveBufferOverrun = -1;
-static gint hf_opa_PortInfo_PortErrorAction_reserved = -1;
-static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorExceedMulticastLimit = -1;
-static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorBadControlFlit = -1;
-static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorBadPreempt = -1;
-static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorBadVLMarker = -1;
-static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorBadCrdtAck = -1;
-static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorBadCtrlDist = -1;
-static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorBadTailDist = -1;
-static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorBadHeadDist = -1;
-static gint hf_opa_PortInfo_PortErrorAction_reserved2 = -1;
-static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorBadVLMarker = -1;
-static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorPreemptVL15 = -1;
-static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorPreemptError = -1;
-static gint hf_opa_PortInfo_PortErrorAction_reserved3 = -1;
-static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorBadMidTail = -1;
-static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorReserved = -1;
-static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorBadSC = -1;
-static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorBadL2 = -1;
-static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorBadDLID = -1;
-static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorBadSLID = -1;
-static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorPktLenTooShort = -1;
-static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorPktLenTooLong = -1;
-static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorBadPktLen = -1;
-static gint hf_opa_PortInfo_PortErrorAction_reserved4 = -1;
+static gint hf_opa_PortInfo_PortPacketFormats_Supported;
+static gint hf_opa_PortInfo_PortPacketFormats_Enabled;
+static gint hf_opa_PortInfo_FlitControl_Interleave_reserved;
+static gint hf_opa_PortInfo_FlitControl_Interleave_DistanceSupported;
+static gint hf_opa_PortInfo_FlitControl_Interleave_DistanceEnabled;
+static gint hf_opa_PortInfo_FlitControl_Interleave_MaxNestLevelTxEnabled;
+static gint hf_opa_PortInfo_FlitControl_Interleave_MaxNestLevelRxSupported;
+static gint hf_opa_PortInfo_FlitControl_Preemption_MinInitial;
+static gint hf_opa_PortInfo_FlitControl_Preemption_MinTail;
+static gint hf_opa_PortInfo_FlitControl_Preemption_LargePacketLimit;
+static gint hf_opa_PortInfo_FlitControl_Preemption_SmallPacketLimit;
+static gint hf_opa_PortInfo_FlitControl_Preemption_MaxSmallPacketLimit;
+static gint hf_opa_PortInfo_FlitControl_Preemption_PreemptionLimit;
+static gint hf_opa_PortInfo_PortErrorAction;
+static gint hf_opa_PortInfo_PortErrorAction_ExcessiveBufferOverrun;
+static gint hf_opa_PortInfo_PortErrorAction_reserved;
+static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorExceedMulticastLimit;
+static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorBadControlFlit;
+static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorBadPreempt;
+static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorBadVLMarker;
+static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorBadCrdtAck;
+static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorBadCtrlDist;
+static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorBadTailDist;
+static gint hf_opa_PortInfo_PortErrorAction_FmConfigErrorBadHeadDist;
+static gint hf_opa_PortInfo_PortErrorAction_reserved2;
+static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorBadVLMarker;
+static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorPreemptVL15;
+static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorPreemptError;
+static gint hf_opa_PortInfo_PortErrorAction_reserved3;
+static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorBadMidTail;
+static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorReserved;
+static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorBadSC;
+static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorBadL2;
+static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorBadDLID;
+static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorBadSLID;
+static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorPktLenTooShort;
+static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorPktLenTooLong;
+static gint hf_opa_PortInfo_PortErrorAction_PortRcvErrorBadPktLen;
+static gint hf_opa_PortInfo_PortErrorAction_reserved4;
 static int * const _PortInfo_PortErrorAction[] = {
     &hf_opa_PortInfo_PortErrorAction_ExcessiveBufferOverrun,
     &hf_opa_PortInfo_PortErrorAction_reserved,
@@ -1488,38 +1488,38 @@ static int * const _PortInfo_PortErrorAction[] = {
     &hf_opa_PortInfo_PortErrorAction_reserved4,
     NULL
 };
-static gint hf_opa_PortInfo_PassThroughControl_EgressPort = -1;
-static gint hf_opa_PortInfo_PassThroughControl_reserved = -1;
-static gint hf_opa_PortInfo_PassThroughControl_DRControl = -1;
-static gint hf_opa_PortInfo_M_KeyLeasePeriod = -1;
-static gint hf_opa_PortInfo_BufferUnits_reserved = -1;
-static gint hf_opa_PortInfo_BufferUnits_VL15Init = -1;
-static gint hf_opa_PortInfo_BufferUnits_VL15CreditRate = -1;
-static gint hf_opa_PortInfo_BufferUnits_CreditAck = -1;
-static gint hf_opa_PortInfo_BufferUnits_BufferAlloc = -1;
-static gint hf_opa_PortInfo_MasterSMLID = -1;
-static gint hf_opa_PortInfo_M_Key = -1;
-static gint hf_opa_PortInfo_SubnetPrefix = -1;
-static gint hf_opa_PortInfo_VL1 = -1;
-static gint hf_opa_PortInfo_VL2 = -1;
-static gint hf_opa_PortInfo_XmitQ_VLStallCount = -1;
-static gint hf_opa_PortInfo_XmitQ_HOQLife = -1;
-static gint hf_opa_PortInfo_IPAddrIPv6 = -1;
-static gint hf_opa_PortInfo_IPAddrIPv4 = -1;
-static gint hf_opa_PortInfo_NeighborNodeGUID = -1;
-static gint hf_opa_PortInfo_CapabilityMask = -1;
-static gint hf_opa_PortInfo_CapabilityMask_reserved = -1;
-static gint hf_opa_PortInfo_CapabilityMask_IsCapabilityMaskNoticeSupported = -1;
-static gint hf_opa_PortInfo_CapabilityMask_reserved2 = -1;
-static gint hf_opa_PortInfo_CapabilityMask_IsVendorClassSupported = -1;
-static gint hf_opa_PortInfo_CapabilityMask_IsDeviceManagementSupported = -1;
-static gint hf_opa_PortInfo_CapabilityMask_reserved3 = -1;
-static gint hf_opa_PortInfo_CapabilityMask_IsConnectionManagementSupported = -1;
-static gint hf_opa_PortInfo_CapabilityMask_reserved4 = -1;
-static gint hf_opa_PortInfo_CapabilityMask_IsAutomaticMigrationSupported = -1;
-static gint hf_opa_PortInfo_CapabilityMask_reserved5 = -1;
-static gint hf_opa_PortInfo_CapabilityMask_IsSM = -1;
-static gint hf_opa_PortInfo_CapabilityMask_reserved6 = -1;
+static gint hf_opa_PortInfo_PassThroughControl_EgressPort;
+static gint hf_opa_PortInfo_PassThroughControl_reserved;
+static gint hf_opa_PortInfo_PassThroughControl_DRControl;
+static gint hf_opa_PortInfo_M_KeyLeasePeriod;
+static gint hf_opa_PortInfo_BufferUnits_reserved;
+static gint hf_opa_PortInfo_BufferUnits_VL15Init;
+static gint hf_opa_PortInfo_BufferUnits_VL15CreditRate;
+static gint hf_opa_PortInfo_BufferUnits_CreditAck;
+static gint hf_opa_PortInfo_BufferUnits_BufferAlloc;
+static gint hf_opa_PortInfo_MasterSMLID;
+static gint hf_opa_PortInfo_M_Key;
+static gint hf_opa_PortInfo_SubnetPrefix;
+static gint hf_opa_PortInfo_VL1;
+static gint hf_opa_PortInfo_VL2;
+static gint hf_opa_PortInfo_XmitQ_VLStallCount;
+static gint hf_opa_PortInfo_XmitQ_HOQLife;
+static gint hf_opa_PortInfo_IPAddrIPv6;
+static gint hf_opa_PortInfo_IPAddrIPv4;
+static gint hf_opa_PortInfo_NeighborNodeGUID;
+static gint hf_opa_PortInfo_CapabilityMask;
+static gint hf_opa_PortInfo_CapabilityMask_reserved;
+static gint hf_opa_PortInfo_CapabilityMask_IsCapabilityMaskNoticeSupported;
+static gint hf_opa_PortInfo_CapabilityMask_reserved2;
+static gint hf_opa_PortInfo_CapabilityMask_IsVendorClassSupported;
+static gint hf_opa_PortInfo_CapabilityMask_IsDeviceManagementSupported;
+static gint hf_opa_PortInfo_CapabilityMask_reserved3;
+static gint hf_opa_PortInfo_CapabilityMask_IsConnectionManagementSupported;
+static gint hf_opa_PortInfo_CapabilityMask_reserved4;
+static gint hf_opa_PortInfo_CapabilityMask_IsAutomaticMigrationSupported;
+static gint hf_opa_PortInfo_CapabilityMask_reserved5;
+static gint hf_opa_PortInfo_CapabilityMask_IsSM;
+static gint hf_opa_PortInfo_CapabilityMask_reserved6;
 static int * const _PortInfo_CapabilityMask[] = {
     &hf_opa_PortInfo_CapabilityMask_reserved,
     &hf_opa_PortInfo_CapabilityMask_IsCapabilityMaskNoticeSupported,
@@ -1535,16 +1535,16 @@ static int * const _PortInfo_CapabilityMask[] = {
     &hf_opa_PortInfo_CapabilityMask_reserved6,
     NULL
 };
-static gint hf_opa_PortInfo_CapabilityMask3 = -1;
-static gint hf_opa_PortInfo_CapabilityMask3_reserved = -1;
-static gint hf_opa_PortInfo_CapabilityMask3_IsSnoopSupported = -1;
-static gint hf_opa_PortInfo_CapabilityMask3_IsAsyncSCtoVLSupported = -1;
-static gint hf_opa_PortInfo_CapabilityMask3_IsAddrRangeConfigSupported = -1;
-static gint hf_opa_PortInfo_CapabilityMask3_IsPassThroughSupported = -1;
-static gint hf_opa_PortInfo_CapabilityMask3_IsSharedSpaceSupported = -1;
-static gint hf_opa_PortInfo_CapabilityMask3_reserved2 = -1;
-static gint hf_opa_PortInfo_CapabilityMask3_IsVLMarkerSupported = -1;
-static gint hf_opa_PortInfo_CapabilityMask3_IsVLrSupported = -1;
+static gint hf_opa_PortInfo_CapabilityMask3;
+static gint hf_opa_PortInfo_CapabilityMask3_reserved;
+static gint hf_opa_PortInfo_CapabilityMask3_IsSnoopSupported;
+static gint hf_opa_PortInfo_CapabilityMask3_IsAsyncSCtoVLSupported;
+static gint hf_opa_PortInfo_CapabilityMask3_IsAddrRangeConfigSupported;
+static gint hf_opa_PortInfo_CapabilityMask3_IsPassThroughSupported;
+static gint hf_opa_PortInfo_CapabilityMask3_IsSharedSpaceSupported;
+static gint hf_opa_PortInfo_CapabilityMask3_reserved2;
+static gint hf_opa_PortInfo_CapabilityMask3_IsVLMarkerSupported;
+static gint hf_opa_PortInfo_CapabilityMask3_IsVLrSupported;
 static int * const _PortInfo_CapabilityMask3[] = {
     &hf_opa_PortInfo_CapabilityMask3_reserved,
     &hf_opa_PortInfo_CapabilityMask3_IsSnoopSupported,
@@ -1557,29 +1557,29 @@ static int * const _PortInfo_CapabilityMask3[] = {
     &hf_opa_PortInfo_CapabilityMask3_IsVLrSupported,
     NULL
 };
-static gint hf_opa_PortInfo_OverallBufferSpace = -1;
-static gint hf_opa_PortInfo_DiagCode = -1;
-static gint hf_opa_PortInfo_ReplayDepth_BufferDepth = -1;
-static gint hf_opa_PortInfo_ReplayDepth_WireDepth = -1;
-static gint hf_opa_PortInfo_PortNeighborMode_reserved = -1;
-static gint hf_opa_PortInfo_PortNeighborMode_MgmtAllowed = -1;
-static gint hf_opa_PortInfo_PortNeighborMode_NeighborFWAuthenBypass = -1;
-static gint hf_opa_PortInfo_PortNeighborMode_NeighborNodeType = -1;
-static gint hf_opa_PortInfo_MTU_reserved = -1;
-static gint hf_opa_PortInfo_MTU_Cap = -1;
-static gint hf_opa_PortInfo_Resp_reserved = -1;
-static gint hf_opa_PortInfo_Resp_TimeValue = -1;
-static gint hf_opa_PortInfo_LocalPortNum = -1;
-static gint hf_opa_PortStates = -1;
-static gint hf_opa_PortStates_reserved = -1;
-static gint hf_opa_PortStates_LEDEnabled = -1;
-static gint hf_opa_PortStates_IsSMConfigurationStarted = -1;
-static gint hf_opa_PortStates_NeighborNormal = -1;
-static gint hf_opa_PortStates_OfflineDisabledReason = -1;
-static gint hf_opa_PortStates_PortUnsleepState = -1;
-static gint hf_opa_PortStates_DownDefaultState = -1;
-static gint hf_opa_PortStates_PortPhysicalState = -1;
-static gint hf_opa_PortStates_PortState = -1;
+static gint hf_opa_PortInfo_OverallBufferSpace;
+static gint hf_opa_PortInfo_DiagCode;
+static gint hf_opa_PortInfo_ReplayDepth_BufferDepth;
+static gint hf_opa_PortInfo_ReplayDepth_WireDepth;
+static gint hf_opa_PortInfo_PortNeighborMode_reserved;
+static gint hf_opa_PortInfo_PortNeighborMode_MgmtAllowed;
+static gint hf_opa_PortInfo_PortNeighborMode_NeighborFWAuthenBypass;
+static gint hf_opa_PortInfo_PortNeighborMode_NeighborNodeType;
+static gint hf_opa_PortInfo_MTU_reserved;
+static gint hf_opa_PortInfo_MTU_Cap;
+static gint hf_opa_PortInfo_Resp_reserved;
+static gint hf_opa_PortInfo_Resp_TimeValue;
+static gint hf_opa_PortInfo_LocalPortNum;
+static gint hf_opa_PortStates;
+static gint hf_opa_PortStates_reserved;
+static gint hf_opa_PortStates_LEDEnabled;
+static gint hf_opa_PortStates_IsSMConfigurationStarted;
+static gint hf_opa_PortStates_NeighborNormal;
+static gint hf_opa_PortStates_OfflineDisabledReason;
+static gint hf_opa_PortStates_PortUnsleepState;
+static gint hf_opa_PortStates_DownDefaultState;
+static gint hf_opa_PortStates_PortPhysicalState;
+static gint hf_opa_PortStates_PortState;
 static int * const _PortStates[] = {
     &hf_opa_PortStates_reserved,
     &hf_opa_PortStates_LEDEnabled,
@@ -1592,355 +1592,355 @@ static int * const _PortStates[] = {
     &hf_opa_PortStates_PortState,
     NULL
 };
-static gint hf_opa_PortStates_LinkWidthDowngradeTxActive = -1;
-static gint hf_opa_PortStates_LinkWidthDowngradeRxActive = -1;
-static gint hf_opa_P_KeyTable = -1;
-static gint hf_opa_P_KeyTable_MembershipType = -1;
-static gint hf_opa_P_KeyTable_P_KeyBase = -1;
-static gint hf_opa_SLtoSCMappingTable = -1;
-static gint hf_opa_SLtoSCMappingTable_SLtoSC_HighBits = -1;
-static gint hf_opa_SLtoSCMappingTable_SLtoSC_LowBits = -1;
-static gint hf_opa_SCtoSCMappingTable = -1;
-static gint hf_opa_SCtoSCMappingTable_SCtoSC_HighBits = -1;
-static gint hf_opa_SCtoSCMappingTable_SCtoSC_LowBits = -1;
-static gint hf_opa_SCtoSLMappingTable = -1;
-static gint hf_opa_SCtoSLMappingTable_SCtoSL_HighBits = -1;
-static gint hf_opa_SCtoSLMappingTable_SCtoSL_LowBits = -1;
-static gint hf_opa_SCtoVLxMappingTable = -1;
-static gint hf_opa_SCtoVLxMappingTable_SCtoVLx_HighBits = -1;
-static gint hf_opa_SCtoVLxMappingTable_SCtoVLx_LowBits = -1;
-static gint hf_opa_VLArbitrationTable = -1;
-static gint hf_opa_VLArbitrationTable_reserved = -1;
-static gint hf_opa_VLArbitrationTable_VL = -1;
-static gint hf_opa_VLArbitrationTable_Weight = -1;
-static gint hf_opa_VLArbitrationTable_Matrix = -1;
-static gint hf_opa_LinearForwardingTable = -1;
-static gint hf_opa_LinearForwardingTable_Port = -1;
-static gint hf_opa_MulticastForwardingTable = -1;
-static gint hf_opa_MulticastForwardingTable_PortMask = -1;
-static gint hf_opa_PortGroupForwardingTable = -1;
-static gint hf_opa_PortGroupForwardingTable_Port = -1;
-static gint hf_opa_PortGroupTable = -1;
-static gint hf_opa_PortGroupTable_PortMask = -1;
-static gint hf_opa_SMInfo = -1;
-static gint hf_opa_SMInfo_GUID = -1;
-static gint hf_opa_SMInfo_SM_Key = -1;
-static gint hf_opa_SMInfo_ActCount = -1;
-static gint hf_opa_SMInfo_ElapsedTime = -1;
-static gint hf_opa_SMInfo_Priority = -1;
-static gint hf_opa_SMInfo_ElevatedPriority = -1;
-static gint hf_opa_SMInfo_InitialPriority = -1;
-static gint hf_opa_SMInfo_SMState = -1;
-static gint hf_opa_LedInfo = -1;
-static gint hf_opa_LedInfo_LedMask = -1;
-static gint hf_opa_LedInfo_reserved = -1;
-static gint hf_opa_CableInfo = -1;
-static gint hf_opa_CableInfo_Data = -1;
-static gint hf_opa_CableInfo_DataStream = -1;
-static gint hf_opa_Aggregate = -1;
-static gint hf_opa_Aggregate_AttributeID = -1;
-static gint hf_opa_Aggregate_Error = -1;
-static gint hf_opa_Aggregate_RequestLength = -1;
-static gint hf_opa_BufferControlTable = -1;
-static gint hf_opa_BufferControlTable_TxOverallSharedLimit = -1;
-static gint hf_opa_BufferControlTable_TxDedicatedLimit = -1;
-static gint hf_opa_BufferControlTable_TxSharedLimit = -1;
-static gint hf_opa_CongestionInfo = -1;
-static gint hf_opa_CongestionInfo_CongestionInfo = -1;
-static gint hf_opa_CongestionInfo_ControlTableCap = -1;
-static gint hf_opa_CongestionInfo_CongestionLogLength = -1;
-static gint hf_opa_SwitchCongestionLog = -1;
-static gint hf_opa_SwitchCongestionLog_LogType = -1;
-static gint hf_opa_SwitchCongestionLog_CongestionFlags = -1;
-static gint hf_opa_SwitchCongestionLog_LogEventsCounter = -1;
-static gint hf_opa_SwitchCongestionLog_CurrentTimeStamp = -1;
-static gint hf_opa_SwitchCongestionLog_PortMap = -1;
-static gint hf_opa_SwitchCongestionLog_SLID = -1;
-static gint hf_opa_SwitchCongestionLog_DLID = -1;
-static gint hf_opa_SwitchCongestionLog_SC = -1;
-static gint hf_opa_SwitchCongestionLog_reserved = -1;
-static gint hf_opa_SwitchCongestionLog_TimeStamp = -1;
-static gint hf_opa_SwitchCongestionSetting = -1;
-static gint hf_opa_SwitchCongestionSetting_Control_Map = -1;
-static gint hf_opa_SwitchCongestionSetting_Victim_Mask = -1;
-static gint hf_opa_SwitchCongestionSetting_Credit_Mask = -1;
-static gint hf_opa_SwitchCongestionSetting_Threshold = -1;
-static gint hf_opa_SwitchCongestionSetting_reserved1 = -1;
-static gint hf_opa_SwitchCongestionSetting_Packet_Size = -1;
-static gint hf_opa_SwitchCongestionSetting_CS_Threshold = -1;
-static gint hf_opa_SwitchCongestionSetting_reserved2 = -1;
-static gint hf_opa_SwitchCongestionSetting_CS_ReturnDelay = -1;
-static gint hf_opa_SwitchCongestionSetting_Marking_Rate = -1;
-static gint hf_opa_SwitchPortCongestionSetting = -1;
-static gint hf_opa_SwitchPortCongestionSetting_Valid = -1;
-static gint hf_opa_SwitchPortCongestionSetting_Control_Type = -1;
-static gint hf_opa_SwitchPortCongestionSetting_reserved = -1;
-static gint hf_opa_SwitchPortCongestionSetting_Threshold = -1;
-static gint hf_opa_SwitchPortCongestionSetting_Packet_Size = -1;
-static gint hf_opa_SwitchPortCongestionSetting_Marking_Rate = -1;
-static gint hf_opa_HFICongestionLog = -1;
-static gint hf_opa_HFICongestionLog_LogType = -1;
-static gint hf_opa_HFICongestionLog_CongestionFlags = -1;
-static gint hf_opa_HFICongestionLog_ThresholdEventCounter = -1;
-static gint hf_opa_HFICongestionLog_CurrentTimeStamp = -1;
-static gint hf_opa_HFICongestionLog_ThresholdCongestionEventMap = -1;
-static gint hf_opa_HFICongestionLog_Local_QP_CN_Entry = -1;
-static gint hf_opa_HFICongestionLog_Remote_QP_Number_CN_Entry = -1;
-static gint hf_opa_HFICongestionLog_SL_CN_Entry = -1;
-static gint hf_opa_HFICongestionLog_Service_Type_CN_Entry = -1;
-static gint hf_opa_HFICongestionLog_Remote_LID_CN_Entry = -1;
-static gint hf_opa_HFICongestionLog_TimeStamp_CN_Entry = -1;
-static gint hf_opa_HFICongestionSetting = -1;
-static gint hf_opa_HFICongestionSetting_Control_Map = -1;
-static gint hf_opa_HFICongestionSetting_Port_Control = -1;
-static gint hf_opa_HFICongestionSetting_CCTI_Increase = -1;
-static gint hf_opa_HFICongestionSetting_CCTI_Timer = -1;
-static gint hf_opa_HFICongestionSetting_TriggerThreshold = -1;
-static gint hf_opa_HFICongestionSetting_CCTI_Min = -1;
-static gint hf_opa_HFICongestionControlTable = -1;
-static gint hf_opa_HFICongestionControlTable_CCTI_Limit = -1;
-static gint hf_opa_HFICongestionControlTable_CCT_Shift = -1;
-static gint hf_opa_HFICongestionControlTable_CCT_Multiplier = -1;
+static gint hf_opa_PortStates_LinkWidthDowngradeTxActive;
+static gint hf_opa_PortStates_LinkWidthDowngradeRxActive;
+static gint hf_opa_P_KeyTable;
+static gint hf_opa_P_KeyTable_MembershipType;
+static gint hf_opa_P_KeyTable_P_KeyBase;
+static gint hf_opa_SLtoSCMappingTable;
+static gint hf_opa_SLtoSCMappingTable_SLtoSC_HighBits;
+static gint hf_opa_SLtoSCMappingTable_SLtoSC_LowBits;
+static gint hf_opa_SCtoSCMappingTable;
+static gint hf_opa_SCtoSCMappingTable_SCtoSC_HighBits;
+static gint hf_opa_SCtoSCMappingTable_SCtoSC_LowBits;
+static gint hf_opa_SCtoSLMappingTable;
+static gint hf_opa_SCtoSLMappingTable_SCtoSL_HighBits;
+static gint hf_opa_SCtoSLMappingTable_SCtoSL_LowBits;
+static gint hf_opa_SCtoVLxMappingTable;
+static gint hf_opa_SCtoVLxMappingTable_SCtoVLx_HighBits;
+static gint hf_opa_SCtoVLxMappingTable_SCtoVLx_LowBits;
+static gint hf_opa_VLArbitrationTable;
+static gint hf_opa_VLArbitrationTable_reserved;
+static gint hf_opa_VLArbitrationTable_VL;
+static gint hf_opa_VLArbitrationTable_Weight;
+static gint hf_opa_VLArbitrationTable_Matrix;
+static gint hf_opa_LinearForwardingTable;
+static gint hf_opa_LinearForwardingTable_Port;
+static gint hf_opa_MulticastForwardingTable;
+static gint hf_opa_MulticastForwardingTable_PortMask;
+static gint hf_opa_PortGroupForwardingTable;
+static gint hf_opa_PortGroupForwardingTable_Port;
+static gint hf_opa_PortGroupTable;
+static gint hf_opa_PortGroupTable_PortMask;
+static gint hf_opa_SMInfo;
+static gint hf_opa_SMInfo_GUID;
+static gint hf_opa_SMInfo_SM_Key;
+static gint hf_opa_SMInfo_ActCount;
+static gint hf_opa_SMInfo_ElapsedTime;
+static gint hf_opa_SMInfo_Priority;
+static gint hf_opa_SMInfo_ElevatedPriority;
+static gint hf_opa_SMInfo_InitialPriority;
+static gint hf_opa_SMInfo_SMState;
+static gint hf_opa_LedInfo;
+static gint hf_opa_LedInfo_LedMask;
+static gint hf_opa_LedInfo_reserved;
+static gint hf_opa_CableInfo;
+static gint hf_opa_CableInfo_Data;
+static gint hf_opa_CableInfo_DataStream;
+static gint hf_opa_Aggregate;
+static gint hf_opa_Aggregate_AttributeID;
+static gint hf_opa_Aggregate_Error;
+static gint hf_opa_Aggregate_RequestLength;
+static gint hf_opa_BufferControlTable;
+static gint hf_opa_BufferControlTable_TxOverallSharedLimit;
+static gint hf_opa_BufferControlTable_TxDedicatedLimit;
+static gint hf_opa_BufferControlTable_TxSharedLimit;
+static gint hf_opa_CongestionInfo;
+static gint hf_opa_CongestionInfo_CongestionInfo;
+static gint hf_opa_CongestionInfo_ControlTableCap;
+static gint hf_opa_CongestionInfo_CongestionLogLength;
+static gint hf_opa_SwitchCongestionLog;
+static gint hf_opa_SwitchCongestionLog_LogType;
+static gint hf_opa_SwitchCongestionLog_CongestionFlags;
+static gint hf_opa_SwitchCongestionLog_LogEventsCounter;
+static gint hf_opa_SwitchCongestionLog_CurrentTimeStamp;
+static gint hf_opa_SwitchCongestionLog_PortMap;
+static gint hf_opa_SwitchCongestionLog_SLID;
+static gint hf_opa_SwitchCongestionLog_DLID;
+static gint hf_opa_SwitchCongestionLog_SC;
+static gint hf_opa_SwitchCongestionLog_reserved;
+static gint hf_opa_SwitchCongestionLog_TimeStamp;
+static gint hf_opa_SwitchCongestionSetting;
+static gint hf_opa_SwitchCongestionSetting_Control_Map;
+static gint hf_opa_SwitchCongestionSetting_Victim_Mask;
+static gint hf_opa_SwitchCongestionSetting_Credit_Mask;
+static gint hf_opa_SwitchCongestionSetting_Threshold;
+static gint hf_opa_SwitchCongestionSetting_reserved1;
+static gint hf_opa_SwitchCongestionSetting_Packet_Size;
+static gint hf_opa_SwitchCongestionSetting_CS_Threshold;
+static gint hf_opa_SwitchCongestionSetting_reserved2;
+static gint hf_opa_SwitchCongestionSetting_CS_ReturnDelay;
+static gint hf_opa_SwitchCongestionSetting_Marking_Rate;
+static gint hf_opa_SwitchPortCongestionSetting;
+static gint hf_opa_SwitchPortCongestionSetting_Valid;
+static gint hf_opa_SwitchPortCongestionSetting_Control_Type;
+static gint hf_opa_SwitchPortCongestionSetting_reserved;
+static gint hf_opa_SwitchPortCongestionSetting_Threshold;
+static gint hf_opa_SwitchPortCongestionSetting_Packet_Size;
+static gint hf_opa_SwitchPortCongestionSetting_Marking_Rate;
+static gint hf_opa_HFICongestionLog;
+static gint hf_opa_HFICongestionLog_LogType;
+static gint hf_opa_HFICongestionLog_CongestionFlags;
+static gint hf_opa_HFICongestionLog_ThresholdEventCounter;
+static gint hf_opa_HFICongestionLog_CurrentTimeStamp;
+static gint hf_opa_HFICongestionLog_ThresholdCongestionEventMap;
+static gint hf_opa_HFICongestionLog_Local_QP_CN_Entry;
+static gint hf_opa_HFICongestionLog_Remote_QP_Number_CN_Entry;
+static gint hf_opa_HFICongestionLog_SL_CN_Entry;
+static gint hf_opa_HFICongestionLog_Service_Type_CN_Entry;
+static gint hf_opa_HFICongestionLog_Remote_LID_CN_Entry;
+static gint hf_opa_HFICongestionLog_TimeStamp_CN_Entry;
+static gint hf_opa_HFICongestionSetting;
+static gint hf_opa_HFICongestionSetting_Control_Map;
+static gint hf_opa_HFICongestionSetting_Port_Control;
+static gint hf_opa_HFICongestionSetting_CCTI_Increase;
+static gint hf_opa_HFICongestionSetting_CCTI_Timer;
+static gint hf_opa_HFICongestionSetting_TriggerThreshold;
+static gint hf_opa_HFICongestionSetting_CCTI_Min;
+static gint hf_opa_HFICongestionControlTable;
+static gint hf_opa_HFICongestionControlTable_CCTI_Limit;
+static gint hf_opa_HFICongestionControlTable_CCT_Shift;
+static gint hf_opa_HFICongestionControlTable_CCT_Multiplier;
 /* SA */
-static gint hf_opa_PortInfoRecord_LinkDownReason_NeighborLinkDownReason = -1;
-static gint hf_opa_PortInfoRecord_LinkDownReason_LinkDownReason = -1;
-static gint hf_opa_PortInfoRecord_LinkDownReason_Timestamp = -1;
-static gint hf_opa_LinkRecord = -1;
-static gint hf_opa_LinkRecord_ToPort = -1;
-static gint hf_opa_LinkRecord_ToLID = -1;
-static gint hf_opa_ServiceRecord = -1;
-static gint hf_opa_ServiceRecord_ServiceLease = -1;
-static gint hf_opa_ServiceRecord_ServiceKey = -1;
-static gint hf_opa_ServiceRecord_ServiceName = -1;
-static gint hf_opa_ServiceRecord_ServiceData = -1;
-static gint hf_opa_ServiceAssociationRecord_ServiceKey = -1;
-static gint hf_opa_ServiceAssociationRecord_ServiceName = -1;
-static gint hf_opa_PathRecord = -1;
-static gint hf_opa_PathRecord_DGID = -1;
-static gint hf_opa_PathRecord_SGID = -1;
-static gint hf_opa_PathRecord_DLID = -1;
-static gint hf_opa_PathRecord_SLID = -1;
-static gint hf_opa_PathRecord_RawTraffic = -1;
-static gint hf_opa_PathRecord_reserved = -1;
-static gint hf_opa_PathRecord_FlowLabel = -1;
-static gint hf_opa_PathRecord_HopLimit = -1;
-static gint hf_opa_PathRecord_TClass = -1;
-static gint hf_opa_PathRecord_Reversible = -1;
-static gint hf_opa_PathRecord_NumbPath = -1;
-static gint hf_opa_PathRecord_P_Key = -1;
-static gint hf_opa_PathRecord_QosType = -1;
-static gint hf_opa_PathRecord_reserved2 = -1;
-static gint hf_opa_PathRecord_QosPriority = -1;
-static gint hf_opa_PathRecord_SL = -1;
-static gint hf_opa_PathRecord_MTUSelector = -1;
-static gint hf_opa_PathRecord_MTU = -1;
-static gint hf_opa_PathRecord_RateSelector = -1;
-static gint hf_opa_PathRecord_Rate = -1;
-static gint hf_opa_PathRecord_PacketLifeTimeSelector = -1;
-static gint hf_opa_PathRecord_PacketLifeTime = -1;
-static gint hf_opa_PathRecord_Preference = -1;
-static gint hf_opa_MCMemberRecord = -1;
-static gint hf_opa_MCMemberRecord_Q_Key = -1;
-static gint hf_opa_MCMemberRecord_MLID = -1;
-static gint hf_opa_MCMemberRecord_MTUSelector = -1;
-static gint hf_opa_MCMemberRecord_MTU = -1;
-static gint hf_opa_MCMemberRecord_TClass = -1;
-static gint hf_opa_MCMemberRecord_P_Key = -1;
-static gint hf_opa_MCMemberRecord_RateSelector = -1;
-static gint hf_opa_MCMemberRecord_Rate = -1;
-static gint hf_opa_MCMemberRecord_PacketLifeTimeSelector = -1;
-static gint hf_opa_MCMemberRecord_PacketLifeTime = -1;
-static gint hf_opa_MCMemberRecord_SL = -1;
-static gint hf_opa_MCMemberRecord_reserved = -1;
-static gint hf_opa_MCMemberRecord_HopLimit = -1;
-static gint hf_opa_MCMemberRecord_Scope = -1;
-static gint hf_opa_MCMemberRecord_reserved2 = -1;
-static gint hf_opa_MCMemberRecord_JoinSendOnlyMember = -1;
-static gint hf_opa_MCMemberRecord_JoinNonMember = -1;
-static gint hf_opa_MCMemberRecord_JoinFullMember = -1;
-static gint hf_opa_MCMemberRecord_ProxyJoin = -1;
-static gint hf_opa_MCMemberRecord_reserved3 = -1;
-static gint hf_opa_TraceRecord = -1;
-static gint hf_opa_TraceRecord_IDGeneration = -1;
-static gint hf_opa_TraceRecord_NodeType = -1;
-static gint hf_opa_TraceRecord_NodeID = -1;
-static gint hf_opa_TraceRecord_ChassisID = -1;
-static gint hf_opa_TraceRecord_EntryPortID = -1;
-static gint hf_opa_TraceRecord_ExitPortID = -1;
-static gint hf_opa_TraceRecord_EntryPort = -1;
-static gint hf_opa_TraceRecord_ExitPort = -1;
-static gint hf_opa_MultiPathRecord = -1;
-static gint hf_opa_MultiPathRecord_reserved = -1;
-static gint hf_opa_MultiPathRecord_FlowLabel = -1;
-static gint hf_opa_MultiPathRecord_HopLimit = -1;
-static gint hf_opa_MultiPathRecord_TClass = -1;
-static gint hf_opa_MultiPathRecord_Reversible = -1;
-static gint hf_opa_MultiPathRecord_NumbPath = -1;
-static gint hf_opa_MultiPathRecord_P_Key = -1;
-static gint hf_opa_MultiPathRecord_QoSType = -1;
-static gint hf_opa_MultiPathRecord_QoSPriority = -1;
-static gint hf_opa_MultiPathRecord_reserved2 = -1;
-static gint hf_opa_MultiPathRecord_SL = -1;
-static gint hf_opa_MultiPathRecord_MTUSelector = -1;
-static gint hf_opa_MultiPathRecord_MTU = -1;
-static gint hf_opa_MultiPathRecord_RateSelector = -1;
-static gint hf_opa_MultiPathRecord_Rate = -1;
-static gint hf_opa_MultiPathRecord_PacketLifeTimeSelector = -1;
-static gint hf_opa_MultiPathRecord_PacketLifeTime = -1;
-static gint hf_opa_MultiPathRecord_IndependenceSelector = -1;
-static gint hf_opa_MultiPathRecord_SGIDScope = -1;
-static gint hf_opa_MultiPathRecord_DGIDScope = -1;
-static gint hf_opa_MultiPathRecord_SGIDCount = -1;
-static gint hf_opa_MultiPathRecord_DGIDCount = -1;
-static gint hf_opa_MultiPathRecord_SGID = -1;
-static gint hf_opa_MultiPathRecord_DGID = -1;
-static gint hf_opa_MultiPathRecord_L2_8B = -1;
-static gint hf_opa_MultiPathRecord_L2_10B = -1;
-static gint hf_opa_MultiPathRecord_L2_9B = -1;
-static gint hf_opa_MultiPathRecord_L2_16B = -1;
-static gint hf_opa_MultiPathRecord_reserved3 = -1;
-static gint hf_opa_MultiPathRecord_SGUIDScope = -1;
-static gint hf_opa_MultiPathRecord_DGUIDScope = -1;
-static gint hf_opa_MultiPathRecord_SGUIDCount = -1;
-static gint hf_opa_MultiPathRecord_DGUIDCount = -1;
-static gint hf_opa_MultiPathRecord_SGUID = -1;
-static gint hf_opa_MultiPathRecord_DGUID = -1;
-static gint hf_opa_MultiPathRecord_ServiceID = -1;
-static gint hf_opa_MultiPathRecord_SubnetPrefix = -1;
-static gint hf_opa_MultiPathRecord_SLIDCount = -1;
-static gint hf_opa_MultiPathRecord_DLIDCount = -1;
-static gint hf_opa_MultiPathRecord_SLID = -1;
-static gint hf_opa_MultiPathRecord_DLID = -1;
-static gint hf_opa_CableInfoRecord = -1;
-static gint hf_opa_CableInfoRecord_Lid = -1;
-static gint hf_opa_CableInfoRecord_Port = -1;
-static gint hf_opa_CableInfoRecord_Length = -1;
-static gint hf_opa_CableInfoRecord_reserved = -1;
-static gint hf_opa_CableInfoRecord_Address = -1;
-static gint hf_opa_CableInfoRecord_PortType = -1;
-static gint hf_opa_CableInfoRecord_Data = -1;
-static gint hf_opa_VFInfoRecord = -1;
-static gint hf_opa_VFInfoRecord_vfIndex = -1;
-static gint hf_opa_VFInfoRecord_pKey = -1;
-static gint hf_opa_VFInfoRecord_vfName = -1;
-static gint hf_opa_VFInfoRecord_MGID = -1;
-static gint hf_opa_VFInfoRecord_SelectFlags = -1;
-static gint hf_opa_VFInfoRecord_reserved = -1;
-static gint hf_opa_VFInfoRecord_SL = -1;
-static gint hf_opa_VFInfoRecord_MTUSpecified = -1;
-static gint hf_opa_VFInfoRecord_reserved2 = -1;
-static gint hf_opa_VFInfoRecord_MTU = -1;
-static gint hf_opa_VFInfoRecord_RateSpecified = -1;
-static gint hf_opa_VFInfoRecord_reserved4 = -1;
-static gint hf_opa_VFInfoRecord_Rate = -1;
-static gint hf_opa_VFInfoRecord_PktLifeSpecified = -1;
-static gint hf_opa_VFInfoRecord_reserved5 = -1;
-static gint hf_opa_VFInfoRecord_PktLifeTimeInc = -1;
-static gint hf_opa_VFInfoRecord_OptionFlags = -1;
-static gint hf_opa_VFInfoRecord_BandwidthPercent = -1;
-static gint hf_opa_VFInfoRecord_reserved6 = -1;
-static gint hf_opa_VFInfoRecord_Priority = -1;
-static gint hf_opa_VFInfoRecord_RoutingSLs = -1;
-static gint hf_opa_VFInfoRecord_reserved7 = -1;
-static gint hf_opa_QuarantinedNodeRecord = -1;
-static gint hf_opa_QuarantinedNodeRecord_TrustedLid = -1;
-static gint hf_opa_QuarantinedNodeRecord_TrustedNodeGUID = -1;
-static gint hf_opa_QuarantinedNodeRecord_TrustedPortNum = -1;
-static gint hf_opa_QuarantinedNodeRecord_TrustedNeighborNodeGUID = -1;
-static gint hf_opa_QuarantinedNodeRecord_QuarantineReasons = -1;
-static gint hf_opa_QuarantinedNodeRecord_ExpectedNodeDesc = -1;
-static gint hf_opa_QuarantinedNodeRecord_ExpectedNodeGUID = -1;
-static gint hf_opa_QuarantinedNodeRecord_ExpectedPortGUID = -1;
-static gint hf_opa_FabricInfoRecord = -1;
-static gint hf_opa_FabricInfoRecord_NumHFIs = -1;
-static gint hf_opa_FabricInfoRecord_NumSwitches = -1;
-static gint hf_opa_FabricInfoRecord_NumInternalHFILinks = -1;
-static gint hf_opa_FabricInfoRecord_NumExternalHFILinks = -1;
-static gint hf_opa_FabricInfoRecord_NumInternalISLs = -1;
-static gint hf_opa_FabricInfoRecord_NumExternalISLs = -1;
-static gint hf_opa_FabricInfoRecord_NumDegradedHFILinks = -1;
-static gint hf_opa_FabricInfoRecord_NumDegradedISLs = -1;
-static gint hf_opa_FabricInfoRecord_NumOmittedHFILinks = -1;
-static gint hf_opa_FabricInfoRecord_NumOmittedISLs = -1;
-static gint hf_opa_FabricInfoRecord_Reserved = -1;
+static gint hf_opa_PortInfoRecord_LinkDownReason_NeighborLinkDownReason;
+static gint hf_opa_PortInfoRecord_LinkDownReason_LinkDownReason;
+static gint hf_opa_PortInfoRecord_LinkDownReason_Timestamp;
+static gint hf_opa_LinkRecord;
+static gint hf_opa_LinkRecord_ToPort;
+static gint hf_opa_LinkRecord_ToLID;
+static gint hf_opa_ServiceRecord;
+static gint hf_opa_ServiceRecord_ServiceLease;
+static gint hf_opa_ServiceRecord_ServiceKey;
+static gint hf_opa_ServiceRecord_ServiceName;
+static gint hf_opa_ServiceRecord_ServiceData;
+static gint hf_opa_ServiceAssociationRecord_ServiceKey;
+static gint hf_opa_ServiceAssociationRecord_ServiceName;
+static gint hf_opa_PathRecord;
+static gint hf_opa_PathRecord_DGID;
+static gint hf_opa_PathRecord_SGID;
+static gint hf_opa_PathRecord_DLID;
+static gint hf_opa_PathRecord_SLID;
+static gint hf_opa_PathRecord_RawTraffic;
+static gint hf_opa_PathRecord_reserved;
+static gint hf_opa_PathRecord_FlowLabel;
+static gint hf_opa_PathRecord_HopLimit;
+static gint hf_opa_PathRecord_TClass;
+static gint hf_opa_PathRecord_Reversible;
+static gint hf_opa_PathRecord_NumbPath;
+static gint hf_opa_PathRecord_P_Key;
+static gint hf_opa_PathRecord_QosType;
+static gint hf_opa_PathRecord_reserved2;
+static gint hf_opa_PathRecord_QosPriority;
+static gint hf_opa_PathRecord_SL;
+static gint hf_opa_PathRecord_MTUSelector;
+static gint hf_opa_PathRecord_MTU;
+static gint hf_opa_PathRecord_RateSelector;
+static gint hf_opa_PathRecord_Rate;
+static gint hf_opa_PathRecord_PacketLifeTimeSelector;
+static gint hf_opa_PathRecord_PacketLifeTime;
+static gint hf_opa_PathRecord_Preference;
+static gint hf_opa_MCMemberRecord;
+static gint hf_opa_MCMemberRecord_Q_Key;
+static gint hf_opa_MCMemberRecord_MLID;
+static gint hf_opa_MCMemberRecord_MTUSelector;
+static gint hf_opa_MCMemberRecord_MTU;
+static gint hf_opa_MCMemberRecord_TClass;
+static gint hf_opa_MCMemberRecord_P_Key;
+static gint hf_opa_MCMemberRecord_RateSelector;
+static gint hf_opa_MCMemberRecord_Rate;
+static gint hf_opa_MCMemberRecord_PacketLifeTimeSelector;
+static gint hf_opa_MCMemberRecord_PacketLifeTime;
+static gint hf_opa_MCMemberRecord_SL;
+static gint hf_opa_MCMemberRecord_reserved;
+static gint hf_opa_MCMemberRecord_HopLimit;
+static gint hf_opa_MCMemberRecord_Scope;
+static gint hf_opa_MCMemberRecord_reserved2;
+static gint hf_opa_MCMemberRecord_JoinSendOnlyMember;
+static gint hf_opa_MCMemberRecord_JoinNonMember;
+static gint hf_opa_MCMemberRecord_JoinFullMember;
+static gint hf_opa_MCMemberRecord_ProxyJoin;
+static gint hf_opa_MCMemberRecord_reserved3;
+static gint hf_opa_TraceRecord;
+static gint hf_opa_TraceRecord_IDGeneration;
+static gint hf_opa_TraceRecord_NodeType;
+static gint hf_opa_TraceRecord_NodeID;
+static gint hf_opa_TraceRecord_ChassisID;
+static gint hf_opa_TraceRecord_EntryPortID;
+static gint hf_opa_TraceRecord_ExitPortID;
+static gint hf_opa_TraceRecord_EntryPort;
+static gint hf_opa_TraceRecord_ExitPort;
+static gint hf_opa_MultiPathRecord;
+static gint hf_opa_MultiPathRecord_reserved;
+static gint hf_opa_MultiPathRecord_FlowLabel;
+static gint hf_opa_MultiPathRecord_HopLimit;
+static gint hf_opa_MultiPathRecord_TClass;
+static gint hf_opa_MultiPathRecord_Reversible;
+static gint hf_opa_MultiPathRecord_NumbPath;
+static gint hf_opa_MultiPathRecord_P_Key;
+static gint hf_opa_MultiPathRecord_QoSType;
+static gint hf_opa_MultiPathRecord_QoSPriority;
+static gint hf_opa_MultiPathRecord_reserved2;
+static gint hf_opa_MultiPathRecord_SL;
+static gint hf_opa_MultiPathRecord_MTUSelector;
+static gint hf_opa_MultiPathRecord_MTU;
+static gint hf_opa_MultiPathRecord_RateSelector;
+static gint hf_opa_MultiPathRecord_Rate;
+static gint hf_opa_MultiPathRecord_PacketLifeTimeSelector;
+static gint hf_opa_MultiPathRecord_PacketLifeTime;
+static gint hf_opa_MultiPathRecord_IndependenceSelector;
+static gint hf_opa_MultiPathRecord_SGIDScope;
+static gint hf_opa_MultiPathRecord_DGIDScope;
+static gint hf_opa_MultiPathRecord_SGIDCount;
+static gint hf_opa_MultiPathRecord_DGIDCount;
+static gint hf_opa_MultiPathRecord_SGID;
+static gint hf_opa_MultiPathRecord_DGID;
+static gint hf_opa_MultiPathRecord_L2_8B;
+static gint hf_opa_MultiPathRecord_L2_10B;
+static gint hf_opa_MultiPathRecord_L2_9B;
+static gint hf_opa_MultiPathRecord_L2_16B;
+static gint hf_opa_MultiPathRecord_reserved3;
+static gint hf_opa_MultiPathRecord_SGUIDScope;
+static gint hf_opa_MultiPathRecord_DGUIDScope;
+static gint hf_opa_MultiPathRecord_SGUIDCount;
+static gint hf_opa_MultiPathRecord_DGUIDCount;
+static gint hf_opa_MultiPathRecord_SGUID;
+static gint hf_opa_MultiPathRecord_DGUID;
+static gint hf_opa_MultiPathRecord_ServiceID;
+static gint hf_opa_MultiPathRecord_SubnetPrefix;
+static gint hf_opa_MultiPathRecord_SLIDCount;
+static gint hf_opa_MultiPathRecord_DLIDCount;
+static gint hf_opa_MultiPathRecord_SLID;
+static gint hf_opa_MultiPathRecord_DLID;
+static gint hf_opa_CableInfoRecord;
+static gint hf_opa_CableInfoRecord_Lid;
+static gint hf_opa_CableInfoRecord_Port;
+static gint hf_opa_CableInfoRecord_Length;
+static gint hf_opa_CableInfoRecord_reserved;
+static gint hf_opa_CableInfoRecord_Address;
+static gint hf_opa_CableInfoRecord_PortType;
+static gint hf_opa_CableInfoRecord_Data;
+static gint hf_opa_VFInfoRecord;
+static gint hf_opa_VFInfoRecord_vfIndex;
+static gint hf_opa_VFInfoRecord_pKey;
+static gint hf_opa_VFInfoRecord_vfName;
+static gint hf_opa_VFInfoRecord_MGID;
+static gint hf_opa_VFInfoRecord_SelectFlags;
+static gint hf_opa_VFInfoRecord_reserved;
+static gint hf_opa_VFInfoRecord_SL;
+static gint hf_opa_VFInfoRecord_MTUSpecified;
+static gint hf_opa_VFInfoRecord_reserved2;
+static gint hf_opa_VFInfoRecord_MTU;
+static gint hf_opa_VFInfoRecord_RateSpecified;
+static gint hf_opa_VFInfoRecord_reserved4;
+static gint hf_opa_VFInfoRecord_Rate;
+static gint hf_opa_VFInfoRecord_PktLifeSpecified;
+static gint hf_opa_VFInfoRecord_reserved5;
+static gint hf_opa_VFInfoRecord_PktLifeTimeInc;
+static gint hf_opa_VFInfoRecord_OptionFlags;
+static gint hf_opa_VFInfoRecord_BandwidthPercent;
+static gint hf_opa_VFInfoRecord_reserved6;
+static gint hf_opa_VFInfoRecord_Priority;
+static gint hf_opa_VFInfoRecord_RoutingSLs;
+static gint hf_opa_VFInfoRecord_reserved7;
+static gint hf_opa_QuarantinedNodeRecord;
+static gint hf_opa_QuarantinedNodeRecord_TrustedLid;
+static gint hf_opa_QuarantinedNodeRecord_TrustedNodeGUID;
+static gint hf_opa_QuarantinedNodeRecord_TrustedPortNum;
+static gint hf_opa_QuarantinedNodeRecord_TrustedNeighborNodeGUID;
+static gint hf_opa_QuarantinedNodeRecord_QuarantineReasons;
+static gint hf_opa_QuarantinedNodeRecord_ExpectedNodeDesc;
+static gint hf_opa_QuarantinedNodeRecord_ExpectedNodeGUID;
+static gint hf_opa_QuarantinedNodeRecord_ExpectedPortGUID;
+static gint hf_opa_FabricInfoRecord;
+static gint hf_opa_FabricInfoRecord_NumHFIs;
+static gint hf_opa_FabricInfoRecord_NumSwitches;
+static gint hf_opa_FabricInfoRecord_NumInternalHFILinks;
+static gint hf_opa_FabricInfoRecord_NumExternalHFILinks;
+static gint hf_opa_FabricInfoRecord_NumInternalISLs;
+static gint hf_opa_FabricInfoRecord_NumExternalISLs;
+static gint hf_opa_FabricInfoRecord_NumDegradedHFILinks;
+static gint hf_opa_FabricInfoRecord_NumDegradedISLs;
+static gint hf_opa_FabricInfoRecord_NumOmittedHFILinks;
+static gint hf_opa_FabricInfoRecord_NumOmittedISLs;
+static gint hf_opa_FabricInfoRecord_Reserved;
 /* PM */
-static gint hf_opa_PortStatus = -1;
-static gint hf_opa_PortStatus_PortNumber = -1;
-static gint hf_opa_PortStatus_VLSelectMask = -1;
-static gint hf_opa_PortStatus_PortXmitData = -1;
-static gint hf_opa_PortStatus_PortRcvData = -1;
-static gint hf_opa_PortStatus_PortXmitPkts = -1;
-static gint hf_opa_PortStatus_PortRcvPkts = -1;
-static gint hf_opa_PortStatus_PortMulticastXmitPkts = -1;
-static gint hf_opa_PortStatus_PortMulticastRcvPkts = -1;
-static gint hf_opa_PortStatus_PortXmitWait = -1;
-static gint hf_opa_PortStatus_SwPortCongestion = -1;
-static gint hf_opa_PortStatus_PortRcvFECN = -1;
-static gint hf_opa_PortStatus_PortRcvBECN = -1;
-static gint hf_opa_PortStatus_PortXmitTimeCong = -1;
-static gint hf_opa_PortStatus_PortXmitWastedBW = -1;
-static gint hf_opa_PortStatus_PortXmitWaitData = -1;
-static gint hf_opa_PortStatus_PortRcvBubble = -1;
-static gint hf_opa_PortStatus_PortMarkFECN = -1;
-static gint hf_opa_PortStatus_PortRcvConstraintErrors = -1;
-static gint hf_opa_PortStatus_PortRcvSwitchRelayErrors = -1;
-static gint hf_opa_PortStatus_PortXmitDiscards = -1;
-static gint hf_opa_PortStatus_PortXmitConstraintErrors = -1;
-static gint hf_opa_PortStatus_PortRcvRemotePhysicalErrors = -1;
-static gint hf_opa_PortStatus_LocalLinkIntegrityErrors = -1;
-static gint hf_opa_PortStatus_PortRcvErrors = -1;
-static gint hf_opa_PortStatus_ExcessiveBufferOverruns = -1;
-static gint hf_opa_PortStatus_FMConfigErrors = -1;
-static gint hf_opa_PortStatus_LinkErrorRecovery = -1;
-static gint hf_opa_PortStatus_LinkDowned = -1;
-static gint hf_opa_PortStatus_UncorrectableErrors = -1;
-static gint hf_opa_PortStatus_reserved = -1;
-static gint hf_opa_PortStatus_LinkQualityIndicator = -1;
-static gint hf_opa_PortStatus_PortVLXmitData = -1;
-static gint hf_opa_PortStatus_PortVLRcvData = -1;
-static gint hf_opa_PortStatus_PortVLXmitPkts = -1;
-static gint hf_opa_PortStatus_PortVLRcvPkts = -1;
-static gint hf_opa_PortStatus_PortVLXmitWait = -1;
-static gint hf_opa_PortStatus_SwPortVLCongestion = -1;
-static gint hf_opa_PortStatus_PortVLRcvFECN = -1;
-static gint hf_opa_PortStatus_PortVLRcvBECN = -1;
-static gint hf_opa_PortStatus_PortVLXmitTimeCong = -1;
-static gint hf_opa_PortStatus_PortVLXmitWastedBW = -1;
-static gint hf_opa_PortStatus_PortVLXmitWaitData = -1;
-static gint hf_opa_PortStatus_PortVLRcvBubble = -1;
-static gint hf_opa_PortStatus_PortVLMarkFECN = -1;
-static gint hf_opa_PortStatus_PortVLXmitDiscards = -1;
-static gint hf_opa_ClearPortStatus = -1;
-static gint hf_opa_ClearPortStatus_PortSelectMask = -1;
-static gint hf_opa_ClearPortStatus_PortXmitData = -1;
-static gint hf_opa_ClearPortStatus_PortRcvData = -1;
-static gint hf_opa_ClearPortStatus_PortXmitPkts = -1;
-static gint hf_opa_ClearPortStatus_PortRcvPkts = -1;
-static gint hf_opa_ClearPortStatus_PortMulticastXmitPkts = -1;
-static gint hf_opa_ClearPortStatus_PortMulticastRcvPkts = -1;
-static gint hf_opa_ClearPortStatus_PortXmitWait = -1;
-static gint hf_opa_ClearPortStatus_SwPortCongestion = -1;
-static gint hf_opa_ClearPortStatus_PortRcvFECN = -1;
-static gint hf_opa_ClearPortStatus_PortRcvBECN = -1;
-static gint hf_opa_ClearPortStatus_PortXmitTimeCong = -1;
-static gint hf_opa_ClearPortStatus_PortXmitWastedBW = -1;
-static gint hf_opa_ClearPortStatus_PortXmitWaitData = -1;
-static gint hf_opa_ClearPortStatus_PortRcvBubble = -1;
-static gint hf_opa_ClearPortStatus_PortMarkFECN = -1;
-static gint hf_opa_ClearPortStatus_PortRcvConstraintErrors = -1;
-static gint hf_opa_ClearPortStatus_PortRcvSwitchRelayErrors = -1;
-static gint hf_opa_ClearPortStatus_PortXmitDiscards = -1;
-static gint hf_opa_ClearPortStatus_PortXmitConstraintErrors = -1;
-static gint hf_opa_ClearPortStatus_PortRcvRemotePhysicalErrors = -1;
-static gint hf_opa_ClearPortStatus_LocalLinkIntegrityErrors = -1;
-static gint hf_opa_ClearPortStatus_PortRcvErrors = -1;
-static gint hf_opa_ClearPortStatus_ExcessiveBufferOverruns = -1;
-static gint hf_opa_ClearPortStatus_FMConfigErrors = -1;
-static gint hf_opa_ClearPortStatus_LinkErrorRecovery = -1;
-static gint hf_opa_ClearPortStatus_LinkDowned = -1;
-static gint hf_opa_ClearPortStatus_UncorrectableErrors = -1;
-static gint hf_opa_ClearPortStatus_reserved = -1;
-static gint hf_opa_ClearPortStatus_CounterSelectMask = -1;
+static gint hf_opa_PortStatus;
+static gint hf_opa_PortStatus_PortNumber;
+static gint hf_opa_PortStatus_VLSelectMask;
+static gint hf_opa_PortStatus_PortXmitData;
+static gint hf_opa_PortStatus_PortRcvData;
+static gint hf_opa_PortStatus_PortXmitPkts;
+static gint hf_opa_PortStatus_PortRcvPkts;
+static gint hf_opa_PortStatus_PortMulticastXmitPkts;
+static gint hf_opa_PortStatus_PortMulticastRcvPkts;
+static gint hf_opa_PortStatus_PortXmitWait;
+static gint hf_opa_PortStatus_SwPortCongestion;
+static gint hf_opa_PortStatus_PortRcvFECN;
+static gint hf_opa_PortStatus_PortRcvBECN;
+static gint hf_opa_PortStatus_PortXmitTimeCong;
+static gint hf_opa_PortStatus_PortXmitWastedBW;
+static gint hf_opa_PortStatus_PortXmitWaitData;
+static gint hf_opa_PortStatus_PortRcvBubble;
+static gint hf_opa_PortStatus_PortMarkFECN;
+static gint hf_opa_PortStatus_PortRcvConstraintErrors;
+static gint hf_opa_PortStatus_PortRcvSwitchRelayErrors;
+static gint hf_opa_PortStatus_PortXmitDiscards;
+static gint hf_opa_PortStatus_PortXmitConstraintErrors;
+static gint hf_opa_PortStatus_PortRcvRemotePhysicalErrors;
+static gint hf_opa_PortStatus_LocalLinkIntegrityErrors;
+static gint hf_opa_PortStatus_PortRcvErrors;
+static gint hf_opa_PortStatus_ExcessiveBufferOverruns;
+static gint hf_opa_PortStatus_FMConfigErrors;
+static gint hf_opa_PortStatus_LinkErrorRecovery;
+static gint hf_opa_PortStatus_LinkDowned;
+static gint hf_opa_PortStatus_UncorrectableErrors;
+static gint hf_opa_PortStatus_reserved;
+static gint hf_opa_PortStatus_LinkQualityIndicator;
+static gint hf_opa_PortStatus_PortVLXmitData;
+static gint hf_opa_PortStatus_PortVLRcvData;
+static gint hf_opa_PortStatus_PortVLXmitPkts;
+static gint hf_opa_PortStatus_PortVLRcvPkts;
+static gint hf_opa_PortStatus_PortVLXmitWait;
+static gint hf_opa_PortStatus_SwPortVLCongestion;
+static gint hf_opa_PortStatus_PortVLRcvFECN;
+static gint hf_opa_PortStatus_PortVLRcvBECN;
+static gint hf_opa_PortStatus_PortVLXmitTimeCong;
+static gint hf_opa_PortStatus_PortVLXmitWastedBW;
+static gint hf_opa_PortStatus_PortVLXmitWaitData;
+static gint hf_opa_PortStatus_PortVLRcvBubble;
+static gint hf_opa_PortStatus_PortVLMarkFECN;
+static gint hf_opa_PortStatus_PortVLXmitDiscards;
+static gint hf_opa_ClearPortStatus;
+static gint hf_opa_ClearPortStatus_PortSelectMask;
+static gint hf_opa_ClearPortStatus_PortXmitData;
+static gint hf_opa_ClearPortStatus_PortRcvData;
+static gint hf_opa_ClearPortStatus_PortXmitPkts;
+static gint hf_opa_ClearPortStatus_PortRcvPkts;
+static gint hf_opa_ClearPortStatus_PortMulticastXmitPkts;
+static gint hf_opa_ClearPortStatus_PortMulticastRcvPkts;
+static gint hf_opa_ClearPortStatus_PortXmitWait;
+static gint hf_opa_ClearPortStatus_SwPortCongestion;
+static gint hf_opa_ClearPortStatus_PortRcvFECN;
+static gint hf_opa_ClearPortStatus_PortRcvBECN;
+static gint hf_opa_ClearPortStatus_PortXmitTimeCong;
+static gint hf_opa_ClearPortStatus_PortXmitWastedBW;
+static gint hf_opa_ClearPortStatus_PortXmitWaitData;
+static gint hf_opa_ClearPortStatus_PortRcvBubble;
+static gint hf_opa_ClearPortStatus_PortMarkFECN;
+static gint hf_opa_ClearPortStatus_PortRcvConstraintErrors;
+static gint hf_opa_ClearPortStatus_PortRcvSwitchRelayErrors;
+static gint hf_opa_ClearPortStatus_PortXmitDiscards;
+static gint hf_opa_ClearPortStatus_PortXmitConstraintErrors;
+static gint hf_opa_ClearPortStatus_PortRcvRemotePhysicalErrors;
+static gint hf_opa_ClearPortStatus_LocalLinkIntegrityErrors;
+static gint hf_opa_ClearPortStatus_PortRcvErrors;
+static gint hf_opa_ClearPortStatus_ExcessiveBufferOverruns;
+static gint hf_opa_ClearPortStatus_FMConfigErrors;
+static gint hf_opa_ClearPortStatus_LinkErrorRecovery;
+static gint hf_opa_ClearPortStatus_LinkDowned;
+static gint hf_opa_ClearPortStatus_UncorrectableErrors;
+static gint hf_opa_ClearPortStatus_reserved;
+static gint hf_opa_ClearPortStatus_CounterSelectMask;
 static int * const _ClearPortStatus_CounterSelectMask[] = {
     &hf_opa_ClearPortStatus_PortXmitData,
     &hf_opa_ClearPortStatus_PortRcvData,
@@ -1972,71 +1972,71 @@ static int * const _ClearPortStatus_CounterSelectMask[] = {
     &hf_opa_ClearPortStatus_reserved,
     NULL
 };
-static gint hf_opa_DataPortCounters = -1;
-static gint hf_opa_DataPortCounters_PortSelectMask = -1;
-static gint hf_opa_DataPortCounters_VLSelectMask = -1;
-static gint hf_opa_DataPortCounters_resolution_reserved = -1;
-static gint hf_opa_DataPortCounters_LocalLinkIntegrityResolution = -1;
-static gint hf_opa_DataPortCounters_LinkErrorRecoveryResolution = -1;
-static gint hf_opa_DataPortCounters_PortNumber = -1;
-static gint hf_opa_DataPortCounters_lqi_reserved = -1;
-static gint hf_opa_DataPortCounters_LinkQualityIndicator = -1;
-static gint hf_opa_DataPortCounters_PortXmitData = -1;
-static gint hf_opa_DataPortCounters_PortRcvData = -1;
-static gint hf_opa_DataPortCounters_PortXmitPkts = -1;
-static gint hf_opa_DataPortCounters_PortRcvPkts = -1;
-static gint hf_opa_DataPortCounters_PortMulticastXmitPkts = -1;
-static gint hf_opa_DataPortCounters_PortMulticastRcvPkts = -1;
-static gint hf_opa_DataPortCounters_PortXmitWait = -1;
-static gint hf_opa_DataPortCounters_SwPortCongestion = -1;
-static gint hf_opa_DataPortCounters_PortRcvFECN = -1;
-static gint hf_opa_DataPortCounters_PortRcvBECN = -1;
-static gint hf_opa_DataPortCounters_PortXmitTimeCong = -1;
-static gint hf_opa_DataPortCounters_PortXmitWastedBW = -1;
-static gint hf_opa_DataPortCounters_PortXmitWaitData = -1;
-static gint hf_opa_DataPortCounters_PortRcvBubble = -1;
-static gint hf_opa_DataPortCounters_PortMarkFECN = -1;
-static gint hf_opa_DataPortCounters_PortErrorCounterSummary = -1;
-static gint hf_opa_DataPortCounters_PortVLXmitData = -1;
-static gint hf_opa_DataPortCounters_PortVLRcvData = -1;
-static gint hf_opa_DataPortCounters_PortVLXmitPkts = -1;
-static gint hf_opa_DataPortCounters_PortVLRcvPkts = -1;
-static gint hf_opa_DataPortCounters_PortVLXmitWait = -1;
-static gint hf_opa_DataPortCounters_SwPortVLCongestion = -1;
-static gint hf_opa_DataPortCounters_PortVLRcvFECN = -1;
-static gint hf_opa_DataPortCounters_PortVLRcvBECN = -1;
-static gint hf_opa_DataPortCounters_PortVLXmitTimeCong = -1;
-static gint hf_opa_DataPortCounters_PortVLXmitWastedBW = -1;
-static gint hf_opa_DataPortCounters_PortVLXmitWaitData = -1;
-static gint hf_opa_DataPortCounters_PortVLRcvBubble = -1;
-static gint hf_opa_DataPortCounters_PortVLMarkFECN = -1;
-static gint hf_opa_ErrorPortCounters = -1;
-static gint hf_opa_ErrorPortCounters_PortSelectMask = -1;
-static gint hf_opa_ErrorPortCounters_VLSelectMask = -1;
-static gint hf_opa_ErrorPortCounters_PortNumber = -1;
-static gint hf_opa_ErrorPortCounters_PortRcvConstraintErrors = -1;
-static gint hf_opa_ErrorPortCounters_PortRcvSwitchRelayErrors = -1;
-static gint hf_opa_ErrorPortCounters_PortXmitDiscards = -1;
-static gint hf_opa_ErrorPortCounters_PortXmitConstraintErrors = -1;
-static gint hf_opa_ErrorPortCounters_PortRcvRemotePhysicalErrors = -1;
-static gint hf_opa_ErrorPortCounters_LocalLinkIntegrityErrors = -1;
-static gint hf_opa_ErrorPortCounters_PortRcvErrors = -1;
-static gint hf_opa_ErrorPortCounters_ExcessiveBufferOverruns = -1;
-static gint hf_opa_ErrorPortCounters_FMConfigErrors = -1;
-static gint hf_opa_ErrorPortCounters_LinkErrorRecovery = -1;
-static gint hf_opa_ErrorPortCounters_LinkDowned = -1;
-static gint hf_opa_ErrorPortCounters_UncorrectableErrors = -1;
-static gint hf_opa_ErrorPortCounters_PortVLXmitDiscards = -1;
-static gint hf_opa_ErrorPortInfo = -1;
-static gint hf_opa_ErrorPortInfo_PortSelectMask = -1;
-static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_PortRcvErrorInfo = -1;
-static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_ExcessiveBufferOverrunInfo = -1;
-static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_PortXmitConstraintErrorInfo = -1;
-static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_PortRcvConstraintErrorInfo = -1;
-static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_PortRcvSwitchRelayErrorInfo = -1;
-static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_UncorrectableErrorInfo = -1;
-static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_FMConfigErrorInfo = -1;
-static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_reserved = -1;
+static gint hf_opa_DataPortCounters;
+static gint hf_opa_DataPortCounters_PortSelectMask;
+static gint hf_opa_DataPortCounters_VLSelectMask;
+static gint hf_opa_DataPortCounters_resolution_reserved;
+static gint hf_opa_DataPortCounters_LocalLinkIntegrityResolution;
+static gint hf_opa_DataPortCounters_LinkErrorRecoveryResolution;
+static gint hf_opa_DataPortCounters_PortNumber;
+static gint hf_opa_DataPortCounters_lqi_reserved;
+static gint hf_opa_DataPortCounters_LinkQualityIndicator;
+static gint hf_opa_DataPortCounters_PortXmitData;
+static gint hf_opa_DataPortCounters_PortRcvData;
+static gint hf_opa_DataPortCounters_PortXmitPkts;
+static gint hf_opa_DataPortCounters_PortRcvPkts;
+static gint hf_opa_DataPortCounters_PortMulticastXmitPkts;
+static gint hf_opa_DataPortCounters_PortMulticastRcvPkts;
+static gint hf_opa_DataPortCounters_PortXmitWait;
+static gint hf_opa_DataPortCounters_SwPortCongestion;
+static gint hf_opa_DataPortCounters_PortRcvFECN;
+static gint hf_opa_DataPortCounters_PortRcvBECN;
+static gint hf_opa_DataPortCounters_PortXmitTimeCong;
+static gint hf_opa_DataPortCounters_PortXmitWastedBW;
+static gint hf_opa_DataPortCounters_PortXmitWaitData;
+static gint hf_opa_DataPortCounters_PortRcvBubble;
+static gint hf_opa_DataPortCounters_PortMarkFECN;
+static gint hf_opa_DataPortCounters_PortErrorCounterSummary;
+static gint hf_opa_DataPortCounters_PortVLXmitData;
+static gint hf_opa_DataPortCounters_PortVLRcvData;
+static gint hf_opa_DataPortCounters_PortVLXmitPkts;
+static gint hf_opa_DataPortCounters_PortVLRcvPkts;
+static gint hf_opa_DataPortCounters_PortVLXmitWait;
+static gint hf_opa_DataPortCounters_SwPortVLCongestion;
+static gint hf_opa_DataPortCounters_PortVLRcvFECN;
+static gint hf_opa_DataPortCounters_PortVLRcvBECN;
+static gint hf_opa_DataPortCounters_PortVLXmitTimeCong;
+static gint hf_opa_DataPortCounters_PortVLXmitWastedBW;
+static gint hf_opa_DataPortCounters_PortVLXmitWaitData;
+static gint hf_opa_DataPortCounters_PortVLRcvBubble;
+static gint hf_opa_DataPortCounters_PortVLMarkFECN;
+static gint hf_opa_ErrorPortCounters;
+static gint hf_opa_ErrorPortCounters_PortSelectMask;
+static gint hf_opa_ErrorPortCounters_VLSelectMask;
+static gint hf_opa_ErrorPortCounters_PortNumber;
+static gint hf_opa_ErrorPortCounters_PortRcvConstraintErrors;
+static gint hf_opa_ErrorPortCounters_PortRcvSwitchRelayErrors;
+static gint hf_opa_ErrorPortCounters_PortXmitDiscards;
+static gint hf_opa_ErrorPortCounters_PortXmitConstraintErrors;
+static gint hf_opa_ErrorPortCounters_PortRcvRemotePhysicalErrors;
+static gint hf_opa_ErrorPortCounters_LocalLinkIntegrityErrors;
+static gint hf_opa_ErrorPortCounters_PortRcvErrors;
+static gint hf_opa_ErrorPortCounters_ExcessiveBufferOverruns;
+static gint hf_opa_ErrorPortCounters_FMConfigErrors;
+static gint hf_opa_ErrorPortCounters_LinkErrorRecovery;
+static gint hf_opa_ErrorPortCounters_LinkDowned;
+static gint hf_opa_ErrorPortCounters_UncorrectableErrors;
+static gint hf_opa_ErrorPortCounters_PortVLXmitDiscards;
+static gint hf_opa_ErrorPortInfo;
+static gint hf_opa_ErrorPortInfo_PortSelectMask;
+static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_PortRcvErrorInfo;
+static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_ExcessiveBufferOverrunInfo;
+static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_PortXmitConstraintErrorInfo;
+static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_PortRcvConstraintErrorInfo;
+static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_PortRcvSwitchRelayErrorInfo;
+static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_UncorrectableErrorInfo;
+static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_FMConfigErrorInfo;
+static gint hf_opa_ErrorPortInfo_ErrorInfoSelectMask_reserved;
 static int * const _ErrorPortInfo_ErrorInfoSelectMask[] = {
     &hf_opa_ErrorPortInfo_ErrorInfoSelectMask_PortRcvErrorInfo,
     &hf_opa_ErrorPortInfo_ErrorInfoSelectMask_ExcessiveBufferOverrunInfo,
@@ -2048,153 +2048,153 @@ static int * const _ErrorPortInfo_ErrorInfoSelectMask[] = {
     &hf_opa_ErrorPortInfo_ErrorInfoSelectMask_reserved,
     NULL
 };
-static gint hf_opa_ErrorPortInfo_PortNumber = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_Status = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_reserved = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_ErrorCode = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_PacketFlit1 = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_PacketFlit2 = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_Flit1Bits = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_Flit2Bits = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_reserved2 = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_PacketBytes = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_FlitBits = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_reserved3 = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_reserved4 = -1;
-static gint hf_opa_ErrorPortInfo_ExcessiveBufferOverrunErrorInfo_Status = -1;
-static gint hf_opa_ErrorPortInfo_ExcessiveBufferOverrunErrorInfo_SC = -1;
-static gint hf_opa_ErrorPortInfo_ExcessiveBufferOverrunErrorInfo_reserved = -1;
-static gint hf_opa_ErrorPortInfo_PortXmitConstraintErrorInfo_Status = -1;
-static gint hf_opa_ErrorPortInfo_PortXmitConstraintErrorInfo_reserved = -1;
-static gint hf_opa_ErrorPortInfo_PortXmitConstraintErrorInfo_P_Key = -1;
-static gint hf_opa_ErrorPortInfo_PortXmitConstraintErrorInfo_SLID = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvConstraintErrorInfo_Status = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvConstraintErrorInfo_reserved = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvConstraintErrorInfo_P_Key = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvConstraintErrorInfo_SLID = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvSwitchRelayErrorInfo_Status = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvSwitchRelayErrorInfo_reserved = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvSwitchRelayErrorInfo_ErrorCode = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvSwitchRelayErrorInfo_DLID = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvSwitchRelayErrorInfo_EgressPortNum = -1;
-static gint hf_opa_ErrorPortInfo_PortRcvSwitchRelayErrorInfo_SC = -1;
-static gint hf_opa_ErrorPortInfo_UncorrectableErrorInfo_Status = -1;
-static gint hf_opa_ErrorPortInfo_UncorrectableErrorInfo_reserved = -1;
-static gint hf_opa_ErrorPortInfo_UncorrectableErrorInfo_ErrorCode = -1;
-static gint hf_opa_ErrorPortInfo_FMConfigErrorInfo_Status = -1;
-static gint hf_opa_ErrorPortInfo_FMConfigErrorInfo_reserved = -1;
-static gint hf_opa_ErrorPortInfo_FMConfigErrorInfo_ErrorCode = -1;
-static gint hf_opa_ErrorPortInfo_FMConfigErrorInfo_VL = -1;
-static gint hf_opa_ErrorPortInfo_FMConfigErrorInfo_Distance = -1;
-static gint hf_opa_ErrorPortInfo_FMConfigErrorInfo_BadFlitBits = -1;
-static gint hf_opa_ErrorPortInfo_FMConfigErrorInfo_SC = -1;
+static gint hf_opa_ErrorPortInfo_PortNumber;
+static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_Status;
+static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_reserved;
+static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_ErrorCode;
+static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_PacketFlit1;
+static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_PacketFlit2;
+static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_Flit1Bits;
+static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_Flit2Bits;
+static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_reserved2;
+static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_PacketBytes;
+static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_FlitBits;
+static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_reserved3;
+static gint hf_opa_ErrorPortInfo_PortRcvErrorInfo_reserved4;
+static gint hf_opa_ErrorPortInfo_ExcessiveBufferOverrunErrorInfo_Status;
+static gint hf_opa_ErrorPortInfo_ExcessiveBufferOverrunErrorInfo_SC;
+static gint hf_opa_ErrorPortInfo_ExcessiveBufferOverrunErrorInfo_reserved;
+static gint hf_opa_ErrorPortInfo_PortXmitConstraintErrorInfo_Status;
+static gint hf_opa_ErrorPortInfo_PortXmitConstraintErrorInfo_reserved;
+static gint hf_opa_ErrorPortInfo_PortXmitConstraintErrorInfo_P_Key;
+static gint hf_opa_ErrorPortInfo_PortXmitConstraintErrorInfo_SLID;
+static gint hf_opa_ErrorPortInfo_PortRcvConstraintErrorInfo_Status;
+static gint hf_opa_ErrorPortInfo_PortRcvConstraintErrorInfo_reserved;
+static gint hf_opa_ErrorPortInfo_PortRcvConstraintErrorInfo_P_Key;
+static gint hf_opa_ErrorPortInfo_PortRcvConstraintErrorInfo_SLID;
+static gint hf_opa_ErrorPortInfo_PortRcvSwitchRelayErrorInfo_Status;
+static gint hf_opa_ErrorPortInfo_PortRcvSwitchRelayErrorInfo_reserved;
+static gint hf_opa_ErrorPortInfo_PortRcvSwitchRelayErrorInfo_ErrorCode;
+static gint hf_opa_ErrorPortInfo_PortRcvSwitchRelayErrorInfo_DLID;
+static gint hf_opa_ErrorPortInfo_PortRcvSwitchRelayErrorInfo_EgressPortNum;
+static gint hf_opa_ErrorPortInfo_PortRcvSwitchRelayErrorInfo_SC;
+static gint hf_opa_ErrorPortInfo_UncorrectableErrorInfo_Status;
+static gint hf_opa_ErrorPortInfo_UncorrectableErrorInfo_reserved;
+static gint hf_opa_ErrorPortInfo_UncorrectableErrorInfo_ErrorCode;
+static gint hf_opa_ErrorPortInfo_FMConfigErrorInfo_Status;
+static gint hf_opa_ErrorPortInfo_FMConfigErrorInfo_reserved;
+static gint hf_opa_ErrorPortInfo_FMConfigErrorInfo_ErrorCode;
+static gint hf_opa_ErrorPortInfo_FMConfigErrorInfo_VL;
+static gint hf_opa_ErrorPortInfo_FMConfigErrorInfo_Distance;
+static gint hf_opa_ErrorPortInfo_FMConfigErrorInfo_BadFlitBits;
+static gint hf_opa_ErrorPortInfo_FMConfigErrorInfo_SC;
 /* PA */
-static gint hf_opa_ImageID_imageNumber = -1;
-static gint hf_opa_ImageID_imageOffset = -1;
-static gint hf_opa_GetGroupList = -1;
-static gint hf_opa_GetGroupList_groupName = -1;
-static gint hf_opa_GetGroupInfo = -1;
-static gint hf_opa_GetGroupInfo_groupName = -1;
-static gint hf_opa_GetGroupInfo_numInternalPorts = -1;
-static gint hf_opa_GetGroupInfo_numExternalPorts = -1;
-static gint hf_opa_GetGroupInfo_totalMBps = -1;
-static gint hf_opa_GetGroupInfo_totalKPps = -1;
-static gint hf_opa_GetGroupInfo_avgMBps = -1;
-static gint hf_opa_GetGroupInfo_minMBps = -1;
-static gint hf_opa_GetGroupInfo_maxMBps = -1;
-static gint hf_opa_GetGroupInfo_numBWBuckets = -1;
-static gint hf_opa_GetGroupInfo_BWBuckets = -1;
-static gint hf_opa_GetGroupInfo_avgKPps = -1;
-static gint hf_opa_GetGroupInfo_minKPps = -1;
-static gint hf_opa_GetGroupInfo_maxKPps = -1;
-static gint hf_opa_GetGroupInfo_pmaFailedPorts = -1;
-static gint hf_opa_GetGroupInfo_topoFailedPorts = -1;
-static gint hf_opa_GetGroupInfo_integrityErrors = -1;
-static gint hf_opa_GetGroupInfo_congestionErrors = -1;
-static gint hf_opa_GetGroupInfo_smaCongestionErrors = -1;
-static gint hf_opa_GetGroupInfo_bubbleErrors = -1;
-static gint hf_opa_GetGroupInfo_securityErrors = -1;
-static gint hf_opa_GetGroupInfo_routingErrors = -1;
-static gint hf_opa_GetGroupInfo_utilizationPct10 = -1;
-static gint hf_opa_GetGroupInfo_discardsPct10 = -1;
-static gint hf_opa_GetGroupInfo_maxInternalRate = -1;
-static gint hf_opa_GetGroupInfo_minInternalRate = -1;
-static gint hf_opa_GetGroupInfo_maxExternalRate = -1;
-static gint hf_opa_GetGroupInfo_minExternalRate = -1;
-static gint hf_opa_GetGroupInfo_maxInternalMBps = -1;
-static gint hf_opa_GetGroupInfo_maxExternalMBps = -1;
-static gint hf_opa_GetGroupConfig = -1;
-static gint hf_opa_GetGroupConfig_groupName = -1;
-static gint hf_opa_GetGroupConfig_Port_NodeGUID = -1;
-static gint hf_opa_GetGroupConfig_Port_nodeDesc = -1;
-static gint hf_opa_GetGroupConfig_Port_NodeLID = -1;
-static gint hf_opa_GetGroupConfig_Port_PortNumber = -1;
-static gint hf_opa_GetPortCounters = -1;
-static gint hf_opa_GetPortCounters_nodeLID = -1;
-static gint hf_opa_GetPortCounters_PortNumber = -1;
-static gint hf_opa_GetPortCounters_flags = -1;
-static gint hf_opa_GetPortCounters_PortXmitData = -1;
-static gint hf_opa_GetPortCounters_PortRcvData = -1;
-static gint hf_opa_GetPortCounters_PortXmitPkts = -1;
-static gint hf_opa_GetPortCounters_PortRcvPkts = -1;
-static gint hf_opa_GetPortCounters_PortMulticastXmitPkts = -1;
-static gint hf_opa_GetPortCounters_PortMulticastRcvPkts = -1;
-static gint hf_opa_GetPortCounters_LocalLinkIntegrityErrors = -1;
-static gint hf_opa_GetPortCounters_FMConfigErrors = -1;
-static gint hf_opa_GetPortCounters_PortRcvErrors = -1;
-static gint hf_opa_GetPortCounters_ExcessiveBufferOverruns = -1;
-static gint hf_opa_GetPortCounters_PortRcvConstraintErrors = -1;
-static gint hf_opa_GetPortCounters_PortRcvSwitchRelayErrors = -1;
-static gint hf_opa_GetPortCounters_PortXmitDiscards = -1;
-static gint hf_opa_GetPortCounters_PortXmitConstraintErrors = -1;
-static gint hf_opa_GetPortCounters_PortRcvRemotePhysicalErrors = -1;
-static gint hf_opa_GetPortCounters_SwPortCongestion = -1;
-static gint hf_opa_GetPortCounters_PortXmitWait = -1;
-static gint hf_opa_GetPortCounters_PortRcvFECN = -1;
-static gint hf_opa_GetPortCounters_PortRcvBECN = -1;
-static gint hf_opa_GetPortCounters_PortXmitTimeCong = -1;
-static gint hf_opa_GetPortCounters_PortXmitWastedBW = -1;
-static gint hf_opa_GetPortCounters_PortXmitWaitData = -1;
-static gint hf_opa_GetPortCounters_PortRcvBubble = -1;
-static gint hf_opa_GetPortCounters_PortMarkFECN = -1;
-static gint hf_opa_GetPortCounters_LinkErrorRecovery = -1;
-static gint hf_opa_GetPortCounters_LinkDowned = -1;
-static gint hf_opa_GetPortCounters_UncorrectableErrors = -1;
-static gint hf_opa_GetPortCounters_NumLanesDown = -1;
-static gint hf_opa_GetPortCounters_reserved = -1;
-static gint hf_opa_GetPortCounters_LinkQualityIndicator = -1;
-static gint hf_opa_ClearPortCounters = -1;
-static gint hf_opa_ClearPortCounters_nodeLID = -1;
-static gint hf_opa_ClearPortCounters_PortNumber = -1;
-static gint hf_opa_ClearPortCounters_PortXmitData = -1;
-static gint hf_opa_ClearPortCounters_PortRcvData = -1;
-static gint hf_opa_ClearPortCounters_PortXmitPkts = -1;
-static gint hf_opa_ClearPortCounters_PortRcvPkts = -1;
-static gint hf_opa_ClearPortCounters_PortMulticastXmitPkts = -1;
-static gint hf_opa_ClearPortCounters_PortMulticastRcvPkts = -1;
-static gint hf_opa_ClearPortCounters_LocalLinkIntegrityErrors = -1;
-static gint hf_opa_ClearPortCounters_FMConfigErrors = -1;
-static gint hf_opa_ClearPortCounters_PortRcvErrors = -1;
-static gint hf_opa_ClearPortCounters_ExcessiveBufferOverruns = -1;
-static gint hf_opa_ClearPortCounters_PortRcvConstraintErrors = -1;
-static gint hf_opa_ClearPortCounters_PortRcvSwitchRelayErrors = -1;
-static gint hf_opa_ClearPortCounters_PortXmitDiscards = -1;
-static gint hf_opa_ClearPortCounters_PortXmitConstraintErrors = -1;
-static gint hf_opa_ClearPortCounters_PortRcvRemotePhysicalErrors = -1;
-static gint hf_opa_ClearPortCounters_SwPortCongestion = -1;
-static gint hf_opa_ClearPortCounters_PortXmitWait = -1;
-static gint hf_opa_ClearPortCounters_PortRcvFECN = -1;
-static gint hf_opa_ClearPortCounters_PortRcvBECN = -1;
-static gint hf_opa_ClearPortCounters_PortXmitTimeCong = -1;
-static gint hf_opa_ClearPortCounters_PortXmitWastedBW = -1;
-static gint hf_opa_ClearPortCounters_PortXmitWaitData = -1;
-static gint hf_opa_ClearPortCounters_PortRcvBubble = -1;
-static gint hf_opa_ClearPortCounters_PortMarkFECN = -1;
-static gint hf_opa_ClearPortCounters_LinkErrorRecovery = -1;
-static gint hf_opa_ClearPortCounters_LinkDowned = -1;
-static gint hf_opa_ClearPortCounters_UncorrectableErrors = -1;
-static gint hf_opa_ClearPortCounters_reserved = -1;
-static gint hf_opa_ClearPortCounters_CounterSelectMask = -1;
+static gint hf_opa_ImageID_imageNumber;
+static gint hf_opa_ImageID_imageOffset;
+static gint hf_opa_GetGroupList;
+static gint hf_opa_GetGroupList_groupName;
+static gint hf_opa_GetGroupInfo;
+static gint hf_opa_GetGroupInfo_groupName;
+static gint hf_opa_GetGroupInfo_numInternalPorts;
+static gint hf_opa_GetGroupInfo_numExternalPorts;
+static gint hf_opa_GetGroupInfo_totalMBps;
+static gint hf_opa_GetGroupInfo_totalKPps;
+static gint hf_opa_GetGroupInfo_avgMBps;
+static gint hf_opa_GetGroupInfo_minMBps;
+static gint hf_opa_GetGroupInfo_maxMBps;
+static gint hf_opa_GetGroupInfo_numBWBuckets;
+static gint hf_opa_GetGroupInfo_BWBuckets;
+static gint hf_opa_GetGroupInfo_avgKPps;
+static gint hf_opa_GetGroupInfo_minKPps;
+static gint hf_opa_GetGroupInfo_maxKPps;
+static gint hf_opa_GetGroupInfo_pmaFailedPorts;
+static gint hf_opa_GetGroupInfo_topoFailedPorts;
+static gint hf_opa_GetGroupInfo_integrityErrors;
+static gint hf_opa_GetGroupInfo_congestionErrors;
+static gint hf_opa_GetGroupInfo_smaCongestionErrors;
+static gint hf_opa_GetGroupInfo_bubbleErrors;
+static gint hf_opa_GetGroupInfo_securityErrors;
+static gint hf_opa_GetGroupInfo_routingErrors;
+static gint hf_opa_GetGroupInfo_utilizationPct10;
+static gint hf_opa_GetGroupInfo_discardsPct10;
+static gint hf_opa_GetGroupInfo_maxInternalRate;
+static gint hf_opa_GetGroupInfo_minInternalRate;
+static gint hf_opa_GetGroupInfo_maxExternalRate;
+static gint hf_opa_GetGroupInfo_minExternalRate;
+static gint hf_opa_GetGroupInfo_maxInternalMBps;
+static gint hf_opa_GetGroupInfo_maxExternalMBps;
+static gint hf_opa_GetGroupConfig;
+static gint hf_opa_GetGroupConfig_groupName;
+static gint hf_opa_GetGroupConfig_Port_NodeGUID;
+static gint hf_opa_GetGroupConfig_Port_nodeDesc;
+static gint hf_opa_GetGroupConfig_Port_NodeLID;
+static gint hf_opa_GetGroupConfig_Port_PortNumber;
+static gint hf_opa_GetPortCounters;
+static gint hf_opa_GetPortCounters_nodeLID;
+static gint hf_opa_GetPortCounters_PortNumber;
+static gint hf_opa_GetPortCounters_flags;
+static gint hf_opa_GetPortCounters_PortXmitData;
+static gint hf_opa_GetPortCounters_PortRcvData;
+static gint hf_opa_GetPortCounters_PortXmitPkts;
+static gint hf_opa_GetPortCounters_PortRcvPkts;
+static gint hf_opa_GetPortCounters_PortMulticastXmitPkts;
+static gint hf_opa_GetPortCounters_PortMulticastRcvPkts;
+static gint hf_opa_GetPortCounters_LocalLinkIntegrityErrors;
+static gint hf_opa_GetPortCounters_FMConfigErrors;
+static gint hf_opa_GetPortCounters_PortRcvErrors;
+static gint hf_opa_GetPortCounters_ExcessiveBufferOverruns;
+static gint hf_opa_GetPortCounters_PortRcvConstraintErrors;
+static gint hf_opa_GetPortCounters_PortRcvSwitchRelayErrors;
+static gint hf_opa_GetPortCounters_PortXmitDiscards;
+static gint hf_opa_GetPortCounters_PortXmitConstraintErrors;
+static gint hf_opa_GetPortCounters_PortRcvRemotePhysicalErrors;
+static gint hf_opa_GetPortCounters_SwPortCongestion;
+static gint hf_opa_GetPortCounters_PortXmitWait;
+static gint hf_opa_GetPortCounters_PortRcvFECN;
+static gint hf_opa_GetPortCounters_PortRcvBECN;
+static gint hf_opa_GetPortCounters_PortXmitTimeCong;
+static gint hf_opa_GetPortCounters_PortXmitWastedBW;
+static gint hf_opa_GetPortCounters_PortXmitWaitData;
+static gint hf_opa_GetPortCounters_PortRcvBubble;
+static gint hf_opa_GetPortCounters_PortMarkFECN;
+static gint hf_opa_GetPortCounters_LinkErrorRecovery;
+static gint hf_opa_GetPortCounters_LinkDowned;
+static gint hf_opa_GetPortCounters_UncorrectableErrors;
+static gint hf_opa_GetPortCounters_NumLanesDown;
+static gint hf_opa_GetPortCounters_reserved;
+static gint hf_opa_GetPortCounters_LinkQualityIndicator;
+static gint hf_opa_ClearPortCounters;
+static gint hf_opa_ClearPortCounters_nodeLID;
+static gint hf_opa_ClearPortCounters_PortNumber;
+static gint hf_opa_ClearPortCounters_PortXmitData;
+static gint hf_opa_ClearPortCounters_PortRcvData;
+static gint hf_opa_ClearPortCounters_PortXmitPkts;
+static gint hf_opa_ClearPortCounters_PortRcvPkts;
+static gint hf_opa_ClearPortCounters_PortMulticastXmitPkts;
+static gint hf_opa_ClearPortCounters_PortMulticastRcvPkts;
+static gint hf_opa_ClearPortCounters_LocalLinkIntegrityErrors;
+static gint hf_opa_ClearPortCounters_FMConfigErrors;
+static gint hf_opa_ClearPortCounters_PortRcvErrors;
+static gint hf_opa_ClearPortCounters_ExcessiveBufferOverruns;
+static gint hf_opa_ClearPortCounters_PortRcvConstraintErrors;
+static gint hf_opa_ClearPortCounters_PortRcvSwitchRelayErrors;
+static gint hf_opa_ClearPortCounters_PortXmitDiscards;
+static gint hf_opa_ClearPortCounters_PortXmitConstraintErrors;
+static gint hf_opa_ClearPortCounters_PortRcvRemotePhysicalErrors;
+static gint hf_opa_ClearPortCounters_SwPortCongestion;
+static gint hf_opa_ClearPortCounters_PortXmitWait;
+static gint hf_opa_ClearPortCounters_PortRcvFECN;
+static gint hf_opa_ClearPortCounters_PortRcvBECN;
+static gint hf_opa_ClearPortCounters_PortXmitTimeCong;
+static gint hf_opa_ClearPortCounters_PortXmitWastedBW;
+static gint hf_opa_ClearPortCounters_PortXmitWaitData;
+static gint hf_opa_ClearPortCounters_PortRcvBubble;
+static gint hf_opa_ClearPortCounters_PortMarkFECN;
+static gint hf_opa_ClearPortCounters_LinkErrorRecovery;
+static gint hf_opa_ClearPortCounters_LinkDowned;
+static gint hf_opa_ClearPortCounters_UncorrectableErrors;
+static gint hf_opa_ClearPortCounters_reserved;
+static gint hf_opa_ClearPortCounters_CounterSelectMask;
 static int * const _ClearPortCounters_CounterSelectMask[] = {
     &hf_opa_ClearPortCounters_PortXmitData,
     &hf_opa_ClearPortCounters_PortRcvData,
@@ -2226,36 +2226,36 @@ static int * const _ClearPortCounters_CounterSelectMask[] = {
     &hf_opa_ClearPortCounters_reserved,
     NULL
 };
-static gint hf_opa_ClearAllPortCounters = -1;
-static gint hf_opa_ClearAllPortCounters_PortXmitData = -1;
-static gint hf_opa_ClearAllPortCounters_PortRcvData = -1;
-static gint hf_opa_ClearAllPortCounters_PortXmitPkts = -1;
-static gint hf_opa_ClearAllPortCounters_PortRcvPkts = -1;
-static gint hf_opa_ClearAllPortCounters_PortMulticastXmitPkts = -1;
-static gint hf_opa_ClearAllPortCounters_PortMulticastRcvPkts = -1;
-static gint hf_opa_ClearAllPortCounters_LocalLinkIntegrityErrors = -1;
-static gint hf_opa_ClearAllPortCounters_FMConfigErrors = -1;
-static gint hf_opa_ClearAllPortCounters_PortRcvErrors = -1;
-static gint hf_opa_ClearAllPortCounters_ExcessiveBufferOverruns = -1;
-static gint hf_opa_ClearAllPortCounters_PortRcvConstraintErrors = -1;
-static gint hf_opa_ClearAllPortCounters_PortRcvSwitchRelayErrors = -1;
-static gint hf_opa_ClearAllPortCounters_PortXmitDiscards = -1;
-static gint hf_opa_ClearAllPortCounters_PortXmitConstraintErrors = -1;
-static gint hf_opa_ClearAllPortCounters_PortRcvRemotePhysicalErrors = -1;
-static gint hf_opa_ClearAllPortCounters_SwPortCongestion = -1;
-static gint hf_opa_ClearAllPortCounters_PortXmitWait = -1;
-static gint hf_opa_ClearAllPortCounters_PortRcvFECN = -1;
-static gint hf_opa_ClearAllPortCounters_PortRcvBECN = -1;
-static gint hf_opa_ClearAllPortCounters_PortXmitTimeCong = -1;
-static gint hf_opa_ClearAllPortCounters_PortXmitWastedBW = -1;
-static gint hf_opa_ClearAllPortCounters_PortXmitWaitData = -1;
-static gint hf_opa_ClearAllPortCounters_PortRcvBubble = -1;
-static gint hf_opa_ClearAllPortCounters_PortMarkFECN = -1;
-static gint hf_opa_ClearAllPortCounters_LinkErrorRecovery = -1;
-static gint hf_opa_ClearAllPortCounters_LinkDowned = -1;
-static gint hf_opa_ClearAllPortCounters_UncorrectableErrors = -1;
-static gint hf_opa_ClearAllPortCounters_reserved = -1;
-static gint hf_opa_ClearAllPortCounters_CounterSelectMask = -1;
+static gint hf_opa_ClearAllPortCounters;
+static gint hf_opa_ClearAllPortCounters_PortXmitData;
+static gint hf_opa_ClearAllPortCounters_PortRcvData;
+static gint hf_opa_ClearAllPortCounters_PortXmitPkts;
+static gint hf_opa_ClearAllPortCounters_PortRcvPkts;
+static gint hf_opa_ClearAllPortCounters_PortMulticastXmitPkts;
+static gint hf_opa_ClearAllPortCounters_PortMulticastRcvPkts;
+static gint hf_opa_ClearAllPortCounters_LocalLinkIntegrityErrors;
+static gint hf_opa_ClearAllPortCounters_FMConfigErrors;
+static gint hf_opa_ClearAllPortCounters_PortRcvErrors;
+static gint hf_opa_ClearAllPortCounters_ExcessiveBufferOverruns;
+static gint hf_opa_ClearAllPortCounters_PortRcvConstraintErrors;
+static gint hf_opa_ClearAllPortCounters_PortRcvSwitchRelayErrors;
+static gint hf_opa_ClearAllPortCounters_PortXmitDiscards;
+static gint hf_opa_ClearAllPortCounters_PortXmitConstraintErrors;
+static gint hf_opa_ClearAllPortCounters_PortRcvRemotePhysicalErrors;
+static gint hf_opa_ClearAllPortCounters_SwPortCongestion;
+static gint hf_opa_ClearAllPortCounters_PortXmitWait;
+static gint hf_opa_ClearAllPortCounters_PortRcvFECN;
+static gint hf_opa_ClearAllPortCounters_PortRcvBECN;
+static gint hf_opa_ClearAllPortCounters_PortXmitTimeCong;
+static gint hf_opa_ClearAllPortCounters_PortXmitWastedBW;
+static gint hf_opa_ClearAllPortCounters_PortXmitWaitData;
+static gint hf_opa_ClearAllPortCounters_PortRcvBubble;
+static gint hf_opa_ClearAllPortCounters_PortMarkFECN;
+static gint hf_opa_ClearAllPortCounters_LinkErrorRecovery;
+static gint hf_opa_ClearAllPortCounters_LinkDowned;
+static gint hf_opa_ClearAllPortCounters_UncorrectableErrors;
+static gint hf_opa_ClearAllPortCounters_reserved;
+static gint hf_opa_ClearAllPortCounters_CounterSelectMask;
 static int * const _ClearAllPortCounters_CounterSelectMask[] = {
     &hf_opa_ClearAllPortCounters_PortXmitData,
     &hf_opa_ClearAllPortCounters_PortRcvData,
@@ -2287,159 +2287,159 @@ static int * const _ClearAllPortCounters_CounterSelectMask[] = {
     &hf_opa_ClearAllPortCounters_reserved,
     NULL
 };
-static gint hf_opa_PMConfig = -1;
-static gint hf_opa_PMConfig_sweepInterval = -1;
-static gint hf_opa_PMConfig_maxClients = -1;
-static gint hf_opa_PMConfig_sizeHistory = -1;
-static gint hf_opa_PMConfig_sizeFreeze = -1;
-static gint hf_opa_PMConfig_lease = -1;
-static gint hf_opa_PMConfig_pmFlags = -1;
-static gint hf_opa_PMConfig_PortXmitWait = -1;
-static gint hf_opa_PMConfig_SwPortCongestion = -1;
-static gint hf_opa_PMConfig_PortRcvFECN = -1;
-static gint hf_opa_PMConfig_PortRcvBECN = -1;
-static gint hf_opa_PMConfig_PortXmitTimeCong = -1;
-static gint hf_opa_PMConfig_PortMarkFECN = -1;
-static gint hf_opa_PMConfig_integrityErrors = -1;
-static gint hf_opa_PMConfig_congestionErrors = -1;
-static gint hf_opa_PMConfig_smaCongestionErrors = -1;
-static gint hf_opa_PMConfig_bubbleErrors = -1;
-static gint hf_opa_PMConfig_securityErrors = -1;
-static gint hf_opa_PMConfig_routingErrors = -1;
-static gint hf_opa_PMConfig_LocalLinkIntegrityErrors = -1;
-static gint hf_opa_PMConfig_PortRcvErrors = -1;
-static gint hf_opa_PMConfig_ExcessiveBufferOverrunErrors = -1;
-static gint hf_opa_PMConfig_LinkErrorRecovery = -1;
-static gint hf_opa_PMConfig_LinkDowned = -1;
-static gint hf_opa_PMConfig_UncorrectableErrors = -1;
-static gint hf_opa_PMConfig_FMConfigErrors = -1;
-static gint hf_opa_PMConfig_LinkQualityIndicator = -1;
-static gint hf_opa_PMConfig_LinkWidthDowngrade = -1;
-static gint hf_opa_PMConfig_memoryFootprint = -1;
-static gint hf_opa_PMConfig_maxAttempts = -1;
-static gint hf_opa_PMConfig_respTimeout = -1;
-static gint hf_opa_PMConfig_minRespTimeout = -1;
-static gint hf_opa_PMConfig_maxParallelNodes = -1;
-static gint hf_opa_PMConfig_pmaBatchSize = -1;
-static gint hf_opa_PMConfig_errorClear = -1;
-static gint hf_opa_MoveFreezeFrame_old = -1;
-static gint hf_opa_MoveFreezeFrame_new = -1;
-static gint hf_opa_GetFocusPorts = -1;
-static gint hf_opa_GetFocusPorts_groupName = -1;
-static gint hf_opa_GetFocusPorts_select = -1;
-static gint hf_opa_GetFocusPorts_start = -1;
-static gint hf_opa_GetFocusPorts_range = -1;
-static gint hf_opa_GetFocusPorts_nodeLID = -1;
-static gint hf_opa_GetFocusPorts_portNumber = -1;
-static gint hf_opa_GetFocusPorts_rate = -1;
-static gint hf_opa_GetFocusPorts_mtu = -1;
-static gint hf_opa_GetFocusPorts_localFlags = -1;
-static gint hf_opa_GetFocusPorts_neighborFlags = -1;
-static gint hf_opa_GetFocusPorts_value = -1;
-static gint hf_opa_GetFocusPorts_nodeGUID = -1;
-static gint hf_opa_GetFocusPorts_nodeDesc = -1;
-static gint hf_opa_GetFocusPorts_neighborLid = -1;
-static gint hf_opa_GetFocusPorts_neighborPortNumber = -1;
-static gint hf_opa_GetFocusPorts_neighborValue = -1;
-static gint hf_opa_GetFocusPorts_neighborGuid = -1;
-static gint hf_opa_GetFocusPorts_neighborNodeDesc = -1;
-static gint hf_opa_GetImageInfo = -1;
-static gint hf_opa_GetImageInfo_sweepStart = -1;
-static gint hf_opa_GetImageInfo_sweepDuration = -1;
-static gint hf_opa_GetImageInfo_numHFIPorts = -1;
-static gint hf_opa_GetImageInfo_numSwitchNodes = -1;
-static gint hf_opa_GetImageInfo_numSwitchPorts = -1;
-static gint hf_opa_GetImageInfo_numLinks = -1;
-static gint hf_opa_GetImageInfo_numSMs = -1;
-static gint hf_opa_GetImageInfo_numFailedNodes = -1;
-static gint hf_opa_GetImageInfo_numFailedPorts = -1;
-static gint hf_opa_GetImageInfo_numSkippedNodes = -1;
-static gint hf_opa_GetImageInfo_numSkippedPorts = -1;
-static gint hf_opa_GetImageInfo_numUnexpectedClearPorts = -1;
-static gint hf_opa_GetImageInfo_imageInterval = -1;
-static gint hf_opa_GetImageInfo_smPortGuid = -1;
-static gint hf_opa_GetImageInfo_smNodeDesc = -1;
-static gint hf_opa_GetImageInfo_lid = -1;
-static gint hf_opa_GetImageInfo_state = -1;
-static gint hf_opa_GetImageInfo_priority = -1;
-static gint hf_opa_GetImageInfo_portNumber = -1;
-static gint hf_opa_GetVFList = -1;
-static gint hf_opa_GetVFList_vfName = -1;
-
-static gint hf_opa_GetVFInfo = -1;
-static gint hf_opa_GetVFInfo_vfName = -1;
-static gint hf_opa_GetVFInfo_numPorts = -1;
-static gint hf_opa_GetVFInfo_totalMBps = -1;
-static gint hf_opa_GetVFInfo_totalKPps = -1;
-static gint hf_opa_GetVFInfo_avgMBps = -1;
-static gint hf_opa_GetVFInfo_minMBps = -1;
-static gint hf_opa_GetVFInfo_maxMBps = -1;
-static gint hf_opa_GetVFInfo_numBWBuckets = -1;
-static gint hf_opa_GetVFInfo_BWBuckets = -1;
-static gint hf_opa_GetVFInfo_avgKPps = -1;
-static gint hf_opa_GetVFInfo_minKPps = -1;
-static gint hf_opa_GetVFInfo_maxKPps = -1;
-static gint hf_opa_GetVFInfo_pmaFailedPorts = -1;
-static gint hf_opa_GetVFInfo_topoFailedPorts = -1;
-static gint hf_opa_GetVFInfo_integrityErrors = -1;
-static gint hf_opa_GetVFInfo_congestionErrors = -1;
-static gint hf_opa_GetVFInfo_smaCongestionErrors = -1;
-static gint hf_opa_GetVFInfo_bubbleErrors = -1;
-static gint hf_opa_GetVFInfo_securityErrors = -1;
-static gint hf_opa_GetVFInfo_routingErrors = -1;
-static gint hf_opa_GetVFInfo_utilizationPct10 = -1;
-static gint hf_opa_GetVFInfo_discardsPct10 = -1;
-static gint hf_opa_GetVFInfo_maxInternalRate = -1;
-static gint hf_opa_GetVFInfo_minInternalRate = -1;
-static gint hf_opa_GetVFInfo_maxInternalMBps = -1;
-
-static gint hf_opa_GetVFConfig = -1;
-static gint hf_opa_GetVFConfig_vfName = -1;
-static gint hf_opa_GetVFConfig_Port_NodeGUID = -1;
-static gint hf_opa_GetVFConfig_Port_nodeDesc = -1;
-static gint hf_opa_GetVFConfig_Port_NodeLID = -1;
-static gint hf_opa_GetVFConfig_Port_PortNumber = -1;
-
-static gint hf_opa_GetVFPortCounters = -1;
-static gint hf_opa_GetVFPortCounters_vfName = -1;
-static gint hf_opa_GetVFPortCounters_nodeLID = -1;
-static gint hf_opa_GetVFPortCounters_PortNumber = -1;
-static gint hf_opa_GetVFPortCounters_flags = -1;
-static gint hf_opa_GetVFPortCounters_PortVFXmitData = -1;
-static gint hf_opa_GetVFPortCounters_PortVFRcvData = -1;
-static gint hf_opa_GetVFPortCounters_PortVFXmitPkts = -1;
-static gint hf_opa_GetVFPortCounters_PortVFRcvPkts = -1;
-static gint hf_opa_GetVFPortCounters_PortVFXmitDiscards = -1;
-static gint hf_opa_GetVFPortCounters_SwPortVFCongestion = -1;
-static gint hf_opa_GetVFPortCounters_PortVFXmitWait = -1;
-static gint hf_opa_GetVFPortCounters_PortVFRcvFECN = -1;
-static gint hf_opa_GetVFPortCounters_PortVFRcvBECN = -1;
-static gint hf_opa_GetVFPortCounters_PortVFXmitTimeCong = -1;
-static gint hf_opa_GetVFPortCounters_PortVFXmitWastedBW = -1;
-static gint hf_opa_GetVFPortCounters_PortVFXmitWaitData = -1;
-static gint hf_opa_GetVFPortCounters_PortVFRcvBubble = -1;
-static gint hf_opa_GetVFPortCounters_PortVFMarkFECN = -1;
-
-static gint hf_opa_ClearVFPortCounters = -1;
-static gint hf_opa_ClearVFPortCounters_vfName = -1;
-static gint hf_opa_ClearVFPortCounters_nodeLID = -1;
-static gint hf_opa_ClearVFPortCounters_PortNumber = -1;
-static gint hf_opa_ClearVFPortCounters_PortVFXmitData = -1;
-static gint hf_opa_ClearVFPortCounters_PortVFRcvData = -1;
-static gint hf_opa_ClearVFPortCounters_PortVFXmitPkts = -1;
-static gint hf_opa_ClearVFPortCounters_PortVFRcvPkts = -1;
-static gint hf_opa_ClearVFPortCounters_PortVFXmitDiscards = -1;
-static gint hf_opa_ClearVFPortCounters_SwPortVFCongestion = -1;
-static gint hf_opa_ClearVFPortCounters_PortVFXmitWait = -1;
-static gint hf_opa_ClearVFPortCounters_PortVFRcvFECN = -1;
-static gint hf_opa_ClearVFPortCounters_PortVFRcvBECN = -1;
-static gint hf_opa_ClearVFPortCounters_PortVFXmitTimeCong = -1;
-static gint hf_opa_ClearVFPortCounters_PortVFXmitWastedBW = -1;
-static gint hf_opa_ClearVFPortCounters_PortVFXmitWaitData = -1;
-static gint hf_opa_ClearVFPortCounters_PortVFRcvBubble = -1;
-static gint hf_opa_ClearVFPortCounters_PortVFMarkFECN = -1;
-static gint hf_opa_ClearVFPortCounters_reserved = -1;
-static gint hf_opa_ClearVFPortCounters_CounterSelectMask = -1;
+static gint hf_opa_PMConfig;
+static gint hf_opa_PMConfig_sweepInterval;
+static gint hf_opa_PMConfig_maxClients;
+static gint hf_opa_PMConfig_sizeHistory;
+static gint hf_opa_PMConfig_sizeFreeze;
+static gint hf_opa_PMConfig_lease;
+static gint hf_opa_PMConfig_pmFlags;
+static gint hf_opa_PMConfig_PortXmitWait;
+static gint hf_opa_PMConfig_SwPortCongestion;
+static gint hf_opa_PMConfig_PortRcvFECN;
+static gint hf_opa_PMConfig_PortRcvBECN;
+static gint hf_opa_PMConfig_PortXmitTimeCong;
+static gint hf_opa_PMConfig_PortMarkFECN;
+static gint hf_opa_PMConfig_integrityErrors;
+static gint hf_opa_PMConfig_congestionErrors;
+static gint hf_opa_PMConfig_smaCongestionErrors;
+static gint hf_opa_PMConfig_bubbleErrors;
+static gint hf_opa_PMConfig_securityErrors;
+static gint hf_opa_PMConfig_routingErrors;
+static gint hf_opa_PMConfig_LocalLinkIntegrityErrors;
+static gint hf_opa_PMConfig_PortRcvErrors;
+static gint hf_opa_PMConfig_ExcessiveBufferOverrunErrors;
+static gint hf_opa_PMConfig_LinkErrorRecovery;
+static gint hf_opa_PMConfig_LinkDowned;
+static gint hf_opa_PMConfig_UncorrectableErrors;
+static gint hf_opa_PMConfig_FMConfigErrors;
+static gint hf_opa_PMConfig_LinkQualityIndicator;
+static gint hf_opa_PMConfig_LinkWidthDowngrade;
+static gint hf_opa_PMConfig_memoryFootprint;
+static gint hf_opa_PMConfig_maxAttempts;
+static gint hf_opa_PMConfig_respTimeout;
+static gint hf_opa_PMConfig_minRespTimeout;
+static gint hf_opa_PMConfig_maxParallelNodes;
+static gint hf_opa_PMConfig_pmaBatchSize;
+static gint hf_opa_PMConfig_errorClear;
+static gint hf_opa_MoveFreezeFrame_old;
+static gint hf_opa_MoveFreezeFrame_new;
+static gint hf_opa_GetFocusPorts;
+static gint hf_opa_GetFocusPorts_groupName;
+static gint hf_opa_GetFocusPorts_select;
+static gint hf_opa_GetFocusPorts_start;
+static gint hf_opa_GetFocusPorts_range;
+static gint hf_opa_GetFocusPorts_nodeLID;
+static gint hf_opa_GetFocusPorts_portNumber;
+static gint hf_opa_GetFocusPorts_rate;
+static gint hf_opa_GetFocusPorts_mtu;
+static gint hf_opa_GetFocusPorts_localFlags;
+static gint hf_opa_GetFocusPorts_neighborFlags;
+static gint hf_opa_GetFocusPorts_value;
+static gint hf_opa_GetFocusPorts_nodeGUID;
+static gint hf_opa_GetFocusPorts_nodeDesc;
+static gint hf_opa_GetFocusPorts_neighborLid;
+static gint hf_opa_GetFocusPorts_neighborPortNumber;
+static gint hf_opa_GetFocusPorts_neighborValue;
+static gint hf_opa_GetFocusPorts_neighborGuid;
+static gint hf_opa_GetFocusPorts_neighborNodeDesc;
+static gint hf_opa_GetImageInfo;
+static gint hf_opa_GetImageInfo_sweepStart;
+static gint hf_opa_GetImageInfo_sweepDuration;
+static gint hf_opa_GetImageInfo_numHFIPorts;
+static gint hf_opa_GetImageInfo_numSwitchNodes;
+static gint hf_opa_GetImageInfo_numSwitchPorts;
+static gint hf_opa_GetImageInfo_numLinks;
+static gint hf_opa_GetImageInfo_numSMs;
+static gint hf_opa_GetImageInfo_numFailedNodes;
+static gint hf_opa_GetImageInfo_numFailedPorts;
+static gint hf_opa_GetImageInfo_numSkippedNodes;
+static gint hf_opa_GetImageInfo_numSkippedPorts;
+static gint hf_opa_GetImageInfo_numUnexpectedClearPorts;
+static gint hf_opa_GetImageInfo_imageInterval;
+static gint hf_opa_GetImageInfo_smPortGuid;
+static gint hf_opa_GetImageInfo_smNodeDesc;
+static gint hf_opa_GetImageInfo_lid;
+static gint hf_opa_GetImageInfo_state;
+static gint hf_opa_GetImageInfo_priority;
+static gint hf_opa_GetImageInfo_portNumber;
+static gint hf_opa_GetVFList;
+static gint hf_opa_GetVFList_vfName;
+
+static gint hf_opa_GetVFInfo;
+static gint hf_opa_GetVFInfo_vfName;
+static gint hf_opa_GetVFInfo_numPorts;
+static gint hf_opa_GetVFInfo_totalMBps;
+static gint hf_opa_GetVFInfo_totalKPps;
+static gint hf_opa_GetVFInfo_avgMBps;
+static gint hf_opa_GetVFInfo_minMBps;
+static gint hf_opa_GetVFInfo_maxMBps;
+static gint hf_opa_GetVFInfo_numBWBuckets;
+static gint hf_opa_GetVFInfo_BWBuckets;
+static gint hf_opa_GetVFInfo_avgKPps;
+static gint hf_opa_GetVFInfo_minKPps;
+static gint hf_opa_GetVFInfo_maxKPps;
+static gint hf_opa_GetVFInfo_pmaFailedPorts;
+static gint hf_opa_GetVFInfo_topoFailedPorts;
+static gint hf_opa_GetVFInfo_integrityErrors;
+static gint hf_opa_GetVFInfo_congestionErrors;
+static gint hf_opa_GetVFInfo_smaCongestionErrors;
+static gint hf_opa_GetVFInfo_bubbleErrors;
+static gint hf_opa_GetVFInfo_securityErrors;
+static gint hf_opa_GetVFInfo_routingErrors;
+static gint hf_opa_GetVFInfo_utilizationPct10;
+static gint hf_opa_GetVFInfo_discardsPct10;
+static gint hf_opa_GetVFInfo_maxInternalRate;
+static gint hf_opa_GetVFInfo_minInternalRate;
+static gint hf_opa_GetVFInfo_maxInternalMBps;
+
+static gint hf_opa_GetVFConfig;
+static gint hf_opa_GetVFConfig_vfName;
+static gint hf_opa_GetVFConfig_Port_NodeGUID;
+static gint hf_opa_GetVFConfig_Port_nodeDesc;
+static gint hf_opa_GetVFConfig_Port_NodeLID;
+static gint hf_opa_GetVFConfig_Port_PortNumber;
+
+static gint hf_opa_GetVFPortCounters;
+static gint hf_opa_GetVFPortCounters_vfName;
+static gint hf_opa_GetVFPortCounters_nodeLID;
+static gint hf_opa_GetVFPortCounters_PortNumber;
+static gint hf_opa_GetVFPortCounters_flags;
+static gint hf_opa_GetVFPortCounters_PortVFXmitData;
+static gint hf_opa_GetVFPortCounters_PortVFRcvData;
+static gint hf_opa_GetVFPortCounters_PortVFXmitPkts;
+static gint hf_opa_GetVFPortCounters_PortVFRcvPkts;
+static gint hf_opa_GetVFPortCounters_PortVFXmitDiscards;
+static gint hf_opa_GetVFPortCounters_SwPortVFCongestion;
+static gint hf_opa_GetVFPortCounters_PortVFXmitWait;
+static gint hf_opa_GetVFPortCounters_PortVFRcvFECN;
+static gint hf_opa_GetVFPortCounters_PortVFRcvBECN;
+static gint hf_opa_GetVFPortCounters_PortVFXmitTimeCong;
+static gint hf_opa_GetVFPortCounters_PortVFXmitWastedBW;
+static gint hf_opa_GetVFPortCounters_PortVFXmitWaitData;
+static gint hf_opa_GetVFPortCounters_PortVFRcvBubble;
+static gint hf_opa_GetVFPortCounters_PortVFMarkFECN;
+
+static gint hf_opa_ClearVFPortCounters;
+static gint hf_opa_ClearVFPortCounters_vfName;
+static gint hf_opa_ClearVFPortCounters_nodeLID;
+static gint hf_opa_ClearVFPortCounters_PortNumber;
+static gint hf_opa_ClearVFPortCounters_PortVFXmitData;
+static gint hf_opa_ClearVFPortCounters_PortVFRcvData;
+static gint hf_opa_ClearVFPortCounters_PortVFXmitPkts;
+static gint hf_opa_ClearVFPortCounters_PortVFRcvPkts;
+static gint hf_opa_ClearVFPortCounters_PortVFXmitDiscards;
+static gint hf_opa_ClearVFPortCounters_SwPortVFCongestion;
+static gint hf_opa_ClearVFPortCounters_PortVFXmitWait;
+static gint hf_opa_ClearVFPortCounters_PortVFRcvFECN;
+static gint hf_opa_ClearVFPortCounters_PortVFRcvBECN;
+static gint hf_opa_ClearVFPortCounters_PortVFXmitTimeCong;
+static gint hf_opa_ClearVFPortCounters_PortVFXmitWastedBW;
+static gint hf_opa_ClearVFPortCounters_PortVFXmitWaitData;
+static gint hf_opa_ClearVFPortCounters_PortVFRcvBubble;
+static gint hf_opa_ClearVFPortCounters_PortVFMarkFECN;
+static gint hf_opa_ClearVFPortCounters_reserved;
+static gint hf_opa_ClearVFPortCounters_CounterSelectMask;
 static int * const _ClearVFPortCounters_CounterSelectMask[] = {
     &hf_opa_ClearVFPortCounters_PortVFXmitData,
     &hf_opa_ClearVFPortCounters_PortVFRcvData,
@@ -2459,44 +2459,44 @@ static int * const _ClearVFPortCounters_CounterSelectMask[] = {
     NULL
 };
 
-static gint hf_opa_GetVFFocusPorts = -1;
-static gint hf_opa_GetVFFocusPorts_vfName = -1;
-static gint hf_opa_GetVFFocusPorts_select = -1;
-static gint hf_opa_GetVFFocusPorts_start = -1;
-static gint hf_opa_GetVFFocusPorts_range = -1;
-static gint hf_opa_GetVFFocusPorts_nodeLID = -1;
-static gint hf_opa_GetVFFocusPorts_portNumber = -1;
-static gint hf_opa_GetVFFocusPorts_rate = -1;
-static gint hf_opa_GetVFFocusPorts_mtu = -1;
-static gint hf_opa_GetVFFocusPorts_localFlags = -1;
-static gint hf_opa_GetVFFocusPorts_neighborFlags = -1;
-static gint hf_opa_GetVFFocusPorts_value = -1;
-static gint hf_opa_GetVFFocusPorts_nodeGUID = -1;
-static gint hf_opa_GetVFFocusPorts_nodeDesc = -1;
-static gint hf_opa_GetVFFocusPorts_neighborLid = -1;
-static gint hf_opa_GetVFFocusPorts_neighborPortNumber = -1;
-static gint hf_opa_GetVFFocusPorts_neighborValue = -1;
-static gint hf_opa_GetVFFocusPorts_neighborGuid = -1;
-static gint hf_opa_GetVFFocusPorts_neighborNodeDesc = -1;
+static gint hf_opa_GetVFFocusPorts;
+static gint hf_opa_GetVFFocusPorts_vfName;
+static gint hf_opa_GetVFFocusPorts_select;
+static gint hf_opa_GetVFFocusPorts_start;
+static gint hf_opa_GetVFFocusPorts_range;
+static gint hf_opa_GetVFFocusPorts_nodeLID;
+static gint hf_opa_GetVFFocusPorts_portNumber;
+static gint hf_opa_GetVFFocusPorts_rate;
+static gint hf_opa_GetVFFocusPorts_mtu;
+static gint hf_opa_GetVFFocusPorts_localFlags;
+static gint hf_opa_GetVFFocusPorts_neighborFlags;
+static gint hf_opa_GetVFFocusPorts_value;
+static gint hf_opa_GetVFFocusPorts_nodeGUID;
+static gint hf_opa_GetVFFocusPorts_nodeDesc;
+static gint hf_opa_GetVFFocusPorts_neighborLid;
+static gint hf_opa_GetVFFocusPorts_neighborPortNumber;
+static gint hf_opa_GetVFFocusPorts_neighborValue;
+static gint hf_opa_GetVFFocusPorts_neighborGuid;
+static gint hf_opa_GetVFFocusPorts_neighborNodeDesc;
 
 /* Expert Info */
-static expert_field ei_opa_mad_error = EI_INIT;
-static expert_field ei_opa_mad_no_attribute_dissector = EI_INIT;
-static expert_field ei_opa_mad_attribute_modifier_error_nonzero = EI_INIT;
-static expert_field ei_opa_rmpp_undecoded = EI_INIT;
-static expert_field ei_opa_aggregate_error = EI_INIT;
+static expert_field ei_opa_mad_error;
+static expert_field ei_opa_mad_no_attribute_dissector;
+static expert_field ei_opa_mad_attribute_modifier_error_nonzero;
+static expert_field ei_opa_rmpp_undecoded;
+static expert_field ei_opa_aggregate_error;
 
 /* Fragments */
-static gint hf_opa_rmpp_fragments = -1;
-static gint hf_opa_rmpp_fragment = -1;
-static gint hf_opa_rmpp_fragment_overlap = -1;
-static gint hf_opa_rmpp_fragment_overlap_conflicts = -1;
-static gint hf_opa_rmpp_fragment_multiple_tails = -1;
-static gint hf_opa_rmpp_fragment_too_long_fragment = -1;
-static gint hf_opa_rmpp_fragment_error = -1;
-static gint hf_opa_rmpp_fragment_count = -1;
-static gint hf_opa_rmpp_reassembled_in = -1;
-static gint hf_opa_rmpp_reassembled_length = -1;
+static gint hf_opa_rmpp_fragments;
+static gint hf_opa_rmpp_fragment;
+static gint hf_opa_rmpp_fragment_overlap;
+static gint hf_opa_rmpp_fragment_overlap_conflicts;
+static gint hf_opa_rmpp_fragment_multiple_tails;
+static gint hf_opa_rmpp_fragment_too_long_fragment;
+static gint hf_opa_rmpp_fragment_error;
+static gint hf_opa_rmpp_fragment_count;
+static gint hf_opa_rmpp_reassembled_in;
+static gint hf_opa_rmpp_reassembled_length;
 
 static const fragment_items opa_rmpp_frag_items = {
     &ett_rmpp_fragment,
diff --git a/epan/dissectors/packet-opa-snc.c b/epan/dissectors/packet-opa-snc.c
index 9ca2fdb281..7d05e29e47 100644
--- a/epan/dissectors/packet-opa-snc.c
+++ b/epan/dissectors/packet-opa-snc.c
@@ -58,33 +58,33 @@ static const value_string vals_opa_snc_rhf_rcvtype[] = {
 };
 
 /* Wireshark ID */
-static gint proto_opa_snc = -1;
+static gint proto_opa_snc;
 
 /* Variables to hold expansion values between packets */
-static gint ett_snc = -1;
-static gint ett_sncpbc = -1;
-static gint ett_sncrhf = -1;
+static gint ett_snc;
+static gint ett_sncpbc;
+static gint ett_sncrhf;
 
 /* SnC Fields */
-static gint hf_opa_snc_direction = -1;
-static gint hf_opa_snc_portnumber = -1;
-static gint hf_opa_snc_Reserved16 = -1;
-static gint hf_opa_snc_Reserved32 = -1;
-static gint hf_opa_snc_Reserved64 = -1;
-static gint hf_opa_snc_pbc_reserved_63_48 = -1;
-static gint hf_opa_snc_pbc_pbcstaticratecontrolcnt = -1;
-static gint hf_opa_snc_pbc_pbcintr = -1;
-static gint hf_opa_snc_pbc_pbcdcinfo = -1;
-static gint hf_opa_snc_pbc_pbctestebp = -1;
-static gint hf_opa_snc_pbc_pbcpacketbypass = -1;
-static gint hf_opa_snc_pbc_pbcinserthcrc = -1;
-static gint hf_opa_snc_pbc_pbccreditreturn = -1;
-static gint hf_opa_snc_pbc_pbcinsertbypassicrc = -1;
-static gint hf_opa_snc_pbc_pbctestbadicrc = -1;
-static gint hf_opa_snc_pbc_pbcfecn = -1;
-static gint hf_opa_snc_pbc_reserved_21_16 = -1;
-static gint hf_opa_snc_pbc_pbcvl = -1;
-static gint hf_opa_snc_pbc_pbclengthdws = -1;
+static gint hf_opa_snc_direction;
+static gint hf_opa_snc_portnumber;
+static gint hf_opa_snc_Reserved16;
+static gint hf_opa_snc_Reserved32;
+static gint hf_opa_snc_Reserved64;
+static gint hf_opa_snc_pbc_reserved_63_48;
+static gint hf_opa_snc_pbc_pbcstaticratecontrolcnt;
+static gint hf_opa_snc_pbc_pbcintr;
+static gint hf_opa_snc_pbc_pbcdcinfo;
+static gint hf_opa_snc_pbc_pbctestebp;
+static gint hf_opa_snc_pbc_pbcpacketbypass;
+static gint hf_opa_snc_pbc_pbcinserthcrc;
+static gint hf_opa_snc_pbc_pbccreditreturn;
+static gint hf_opa_snc_pbc_pbcinsertbypassicrc;
+static gint hf_opa_snc_pbc_pbctestbadicrc;
+static gint hf_opa_snc_pbc_pbcfecn;
+static gint hf_opa_snc_pbc_reserved_21_16;
+static gint hf_opa_snc_pbc_pbcvl;
+static gint hf_opa_snc_pbc_pbclengthdws;
 static int * const _snc_pbc_1[] = {
     &hf_opa_snc_pbc_reserved_63_48,
     &hf_opa_snc_pbc_pbcstaticratecontrolcnt,
@@ -105,23 +105,23 @@ static int * const _snc_pbc_2[] = {
     &hf_opa_snc_pbc_pbclengthdws,
     NULL
 };
-static gint hf_opa_snc_rhf_icrcerr = -1;
-static gint hf_opa_snc_rhf_reserved_62 = -1;
-static gint hf_opa_snc_rhf_eccerr = -1;
-static gint hf_opa_snc_rhf_lenerr = -1;
-static gint hf_opa_snc_rhf_tiderr = -1;
-static gint hf_opa_snc_rhf_rcvtypeerr = -1;
-static gint hf_opa_snc_rhf_dcerr = -1;
-static gint hf_opa_snc_rhf_dcuncerr = -1;
-static gint hf_opa_snc_rhf_khdrlenerr = -1;
-static gint hf_opa_snc_rhf_hdrqoffset = -1;
-static gint hf_opa_snc_rhf_egroffset = -1;
-static gint hf_opa_snc_rhf_rcvseq = -1;
-static gint hf_opa_snc_rhf_dcinfo = -1;
-static gint hf_opa_snc_rhf_egrindex = -1;
-static gint hf_opa_snc_rhf_useegrbfr = -1;
-static gint hf_opa_snc_rhf_rcvtype = -1;
-static gint hf_opa_snc_rhf_pktlen = -1;
+static gint hf_opa_snc_rhf_icrcerr;
+static gint hf_opa_snc_rhf_reserved_62;
+static gint hf_opa_snc_rhf_eccerr;
+static gint hf_opa_snc_rhf_lenerr;
+static gint hf_opa_snc_rhf_tiderr;
+static gint hf_opa_snc_rhf_rcvtypeerr;
+static gint hf_opa_snc_rhf_dcerr;
+static gint hf_opa_snc_rhf_dcuncerr;
+static gint hf_opa_snc_rhf_khdrlenerr;
+static gint hf_opa_snc_rhf_hdrqoffset;
+static gint hf_opa_snc_rhf_egroffset;
+static gint hf_opa_snc_rhf_rcvseq;
+static gint hf_opa_snc_rhf_dcinfo;
+static gint hf_opa_snc_rhf_egrindex;
+static gint hf_opa_snc_rhf_useegrbfr;
+static gint hf_opa_snc_rhf_rcvtype;
+static gint hf_opa_snc_rhf_pktlen;
 static int * const _snc_rhf_1[] = {
     &hf_opa_snc_rhf_icrcerr,
     &hf_opa_snc_rhf_reserved_62,
@@ -146,7 +146,7 @@ static int * const _snc_rhf_2[] = {
     NULL
 };
 
-static expert_field ei_opa_snc_nobypass = EI_INIT;
+static expert_field ei_opa_snc_nobypass;
 
 static void cf_opa_snc_dw_to_b(gchar *buf, guint32 value)
 {
diff --git a/epan/dissectors/packet-opa.c b/epan/dissectors/packet-opa.c
index 7b2c7c7064..96ea3f37ac 100644
--- a/epan/dissectors/packet-opa.c
+++ b/epan/dissectors/packet-opa.c
@@ -389,99 +389,99 @@ static const true_false_string tfs_opa_kdeth_offset_32_64 = {
     "64 Byte Words"
 };
 /* Wireshark ID */
-static gint proto_opa_9b = -1;
+static gint proto_opa_9b;
 
 /* Variables to hold expansion values between packets */
-static gint ett_all_headers = -1;
-static gint ett_9b = -1;
-static gint ett_grh = -1;
-static gint ett_bth = -1;
-static gint ett_rdeth = -1;
-static gint ett_deth = -1;
-static gint ett_reth = -1;
-static gint ett_atomiceth = -1;
-static gint ett_aeth = -1;
-static gint ett_atomicacketh = -1;
-static gint ett_immdt = -1;
-static gint ett_ieth = -1;
-static gint ett_kdeth = -1;
-static gint ett_psm = -1;
-static gint ett_tidrdma = -1;
+static gint ett_all_headers;
+static gint ett_9b;
+static gint ett_grh;
+static gint ett_bth;
+static gint ett_rdeth;
+static gint ett_deth;
+static gint ett_reth;
+static gint ett_atomiceth;
+static gint ett_aeth;
+static gint ett_atomicacketh;
+static gint ett_immdt;
+static gint ett_ieth;
+static gint ett_kdeth;
+static gint ett_psm;
+static gint ett_tidrdma;
 
 /* 9B Header Fields */
-static gint hf_opa_9B = -1;
-static gint hf_opa_9B_service_channel = -1;
-static gint hf_opa_9B_link_version = -1;
-static gint hf_opa_9B_service_level = -1;
-static gint hf_opa_9B_reserved2 = -1;
-static gint hf_opa_9B_lnh = -1;
-static gint hf_opa_9B_dlid = -1;
-static gint hf_opa_9B_reserved3 = -1;
-static gint hf_opa_9B_packet_length = -1;
-static gint hf_opa_9B_slid = -1;
+static gint hf_opa_9B;
+static gint hf_opa_9B_service_channel;
+static gint hf_opa_9B_link_version;
+static gint hf_opa_9B_service_level;
+static gint hf_opa_9B_reserved2;
+static gint hf_opa_9B_lnh;
+static gint hf_opa_9B_dlid;
+static gint hf_opa_9B_reserved3;
+static gint hf_opa_9B_packet_length;
+static gint hf_opa_9B_slid;
 /* ICRC */
-static gint hf_opa_9b_ICRC = -1;
+static gint hf_opa_9b_ICRC;
 
 /* GRH */
-static gint hf_opa_grh = -1;
-static gint hf_opa_grh_ip_version = -1;
-static gint hf_opa_grh_traffic_class = -1;
-static gint hf_opa_grh_flow_label = -1;
-static gint hf_opa_grh_payload_length = -1;
-static gint hf_opa_grh_next_header = -1;
-static gint hf_opa_grh_hop_limit = -1;
-static gint hf_opa_grh_source_gid = -1;
-static gint hf_opa_grh_destination_gid = -1;
+static gint hf_opa_grh;
+static gint hf_opa_grh_ip_version;
+static gint hf_opa_grh_traffic_class;
+static gint hf_opa_grh_flow_label;
+static gint hf_opa_grh_payload_length;
+static gint hf_opa_grh_next_header;
+static gint hf_opa_grh_hop_limit;
+static gint hf_opa_grh_source_gid;
+static gint hf_opa_grh_destination_gid;
 
 /* BTH */
-static gint hf_opa_bth = -1;
-static gint hf_opa_bth_opcode = -1;
-static gint hf_opa_bth_solicited_event = -1;
-static gint hf_opa_bth_migreq = -1;
-static gint hf_opa_bth_pad_count = -1;
-static gint hf_opa_bth_transport_header_version = -1;
-static gint hf_opa_bth_partition_key = -1;
-static gint hf_opa_bth_fcn = -1;
-static gint hf_opa_bth_bcn = -1;
-static gint hf_opa_bth_Reserved8a = -1;
-static gint hf_opa_bth_destination_qp = -1;
-static gint hf_opa_bth_acknowledge_request = -1;
-static gint hf_opa_bth_packet_sequence_number = -1;
+static gint hf_opa_bth;
+static gint hf_opa_bth_opcode;
+static gint hf_opa_bth_solicited_event;
+static gint hf_opa_bth_migreq;
+static gint hf_opa_bth_pad_count;
+static gint hf_opa_bth_transport_header_version;
+static gint hf_opa_bth_partition_key;
+static gint hf_opa_bth_fcn;
+static gint hf_opa_bth_bcn;
+static gint hf_opa_bth_Reserved8a;
+static gint hf_opa_bth_destination_qp;
+static gint hf_opa_bth_acknowledge_request;
+static gint hf_opa_bth_packet_sequence_number;
 
 /* XXETH */
-static gint hf_opa_RDETH = -1;
-static gint hf_opa_RDETH_reserved8 = -1;
-static gint hf_opa_RDETH_ee_context = -1;
-static gint hf_opa_DETH = -1;
-static gint hf_opa_DETH_queue_key = -1;
-static gint hf_opa_DETH_reserved8 = -1;
-static gint hf_opa_DETH_source_qp = -1;
-static gint hf_opa_RETH = -1;
-static gint hf_opa_RETH_virtual_address = -1;
-static gint hf_opa_RETH_remote_key = -1;
-static gint hf_opa_RETH_dma_length = -1;
-static gint hf_opa_AtomicETH = -1;
-static gint hf_opa_AtomicETH_virtual_address = -1;
-static gint hf_opa_AtomicETH_remote_key = -1;
-static gint hf_opa_AtomicETH_swap_or_add_data = -1;
-static gint hf_opa_AtomicETH_compare_data = -1;
-static gint hf_opa_AETH = -1;
-static gint hf_opa_AETH_syndrome = -1;
-static gint hf_opa_AETH_message_sequence_number = -1;
-static gint hf_opa_AtomicAckETH = -1;
-static gint hf_opa_AtomicAckETH_original_remote_data = -1;
-static gint hf_opa_IMMDT = -1;
-static gint hf_opa_IMMDT_data = -1;
-static gint hf_opa_IETH = -1;
-static gint hf_opa_IETH_r_key = -1;
-static gint hf_opa_KDETH = -1;
-static gint hf_opa_KDETH_kver = -1;
-static gint hf_opa_KDETH_sh = -1;
-static gint hf_opa_KDETH_intr = -1;
-static gint hf_opa_KDETH_tidctrl = -1;
-static gint hf_opa_KDETH_tid = -1;
-static gint hf_opa_KDETH_offset_mode = -1;
-static gint hf_opa_KDETH_offset = -1;
+static gint hf_opa_RDETH;
+static gint hf_opa_RDETH_reserved8;
+static gint hf_opa_RDETH_ee_context;
+static gint hf_opa_DETH;
+static gint hf_opa_DETH_queue_key;
+static gint hf_opa_DETH_reserved8;
+static gint hf_opa_DETH_source_qp;
+static gint hf_opa_RETH;
+static gint hf_opa_RETH_virtual_address;
+static gint hf_opa_RETH_remote_key;
+static gint hf_opa_RETH_dma_length;
+static gint hf_opa_AtomicETH;
+static gint hf_opa_AtomicETH_virtual_address;
+static gint hf_opa_AtomicETH_remote_key;
+static gint hf_opa_AtomicETH_swap_or_add_data;
+static gint hf_opa_AtomicETH_compare_data;
+static gint hf_opa_AETH;
+static gint hf_opa_AETH_syndrome;
+static gint hf_opa_AETH_message_sequence_number;
+static gint hf_opa_AtomicAckETH;
+static gint hf_opa_AtomicAckETH_original_remote_data;
+static gint hf_opa_IMMDT;
+static gint hf_opa_IMMDT_data;
+static gint hf_opa_IETH;
+static gint hf_opa_IETH_r_key;
+static gint hf_opa_KDETH;
+static gint hf_opa_KDETH_kver;
+static gint hf_opa_KDETH_sh;
+static gint hf_opa_KDETH_intr;
+static gint hf_opa_KDETH_tidctrl;
+static gint hf_opa_KDETH_tid;
+static gint hf_opa_KDETH_offset_mode;
+static gint hf_opa_KDETH_offset;
 static int * const _opa_KDETH_word1[] = {
     &hf_opa_KDETH_kver,
     &hf_opa_KDETH_sh,
@@ -492,50 +492,50 @@ static int * const _opa_KDETH_word1[] = {
     &hf_opa_KDETH_offset,
     NULL
 };
-static gint hf_opa_KDETH_hcrc = -1;
-static gint hf_opa_KDETH_j_key = -1;
+static gint hf_opa_KDETH_hcrc;
+static gint hf_opa_KDETH_j_key;
 static int * const _opa_KDETH_word2[] = {
     &hf_opa_KDETH_hcrc,
     &hf_opa_KDETH_j_key,
     NULL
 };
 /* PSM */
-static gint hf_opa_psm = -1;
-static gint hf_opa_psm_a = -1;
-static gint hf_opa_psm_ackpsn = -1;
-static gint hf_opa_psm_flags = -1;
-static gint hf_opa_psm_commidx = -1;
-static gint hf_opa_psm_flowid = -1;
-static gint hf_opa_psm_msglen = -1;
-static gint hf_opa_psm_msgseq = -1;
-static gint hf_opa_psm_tag = -1;
-static gint hf_opa_psm_msgdata = -1;
-static gint hf_opa_psm_short_msglen = -1;
-static gint hf_opa_psm_paylen = -1;
-static gint hf_opa_psm_offset = -1;
-static gint hf_opa_psm_sreqidx = -1;
-static gint hf_opa_psm_rreqidx = -1;
-static gint hf_opa_psm_rdescid = -1;
-static gint hf_opa_psm_sdescid = -1;
-static gint hf_opa_psm_psn = -1;
-static gint hf_opa_psm_hostipv4 = -1;
-static gint hf_opa_psm_hostpid = -1;
-static gint hf_opa_psm_dlen = -1;
-static gint hf_opa_psm_nargs = -1;
-static gint hf_opa_psm_hidx = -1;
-static gint hf_opa_psm_arg = -1;
-static gint hf_opa_psm_payload = -1;
+static gint hf_opa_psm;
+static gint hf_opa_psm_a;
+static gint hf_opa_psm_ackpsn;
+static gint hf_opa_psm_flags;
+static gint hf_opa_psm_commidx;
+static gint hf_opa_psm_flowid;
+static gint hf_opa_psm_msglen;
+static gint hf_opa_psm_msgseq;
+static gint hf_opa_psm_tag;
+static gint hf_opa_psm_msgdata;
+static gint hf_opa_psm_short_msglen;
+static gint hf_opa_psm_paylen;
+static gint hf_opa_psm_offset;
+static gint hf_opa_psm_sreqidx;
+static gint hf_opa_psm_rreqidx;
+static gint hf_opa_psm_rdescid;
+static gint hf_opa_psm_sdescid;
+static gint hf_opa_psm_psn;
+static gint hf_opa_psm_hostipv4;
+static gint hf_opa_psm_hostpid;
+static gint hf_opa_psm_dlen;
+static gint hf_opa_psm_nargs;
+static gint hf_opa_psm_hidx;
+static gint hf_opa_psm_arg;
+static gint hf_opa_psm_payload;
 /* TID RDMA */
-static gint hf_opa_TIDRDMA = -1;
-static gint hf_opa_TIDRDMA_reserved = -1;
-static gint hf_opa_TIDRDMA_TIDFlowPSN_reserved = -1;
-static gint hf_opa_TIDRDMA_TIDFlowPSN = -1;
-static gint hf_opa_TIDRDMA_TIDFlowQP_reserved = -1;
-static gint hf_opa_TIDRDMA_TIDFlowQP = -1;
-static gint hf_opa_TIDRDMA_VerbsPSN_reserved = -1;
-static gint hf_opa_TIDRDMA_VerbsPSN = -1;
-static gint hf_opa_TIDRDMA_VerbsQP_reserved = -1;
-static gint hf_opa_TIDRDMA_VerbsQP = -1;
+static gint hf_opa_TIDRDMA;
+static gint hf_opa_TIDRDMA_reserved;
+static gint hf_opa_TIDRDMA_TIDFlowPSN_reserved;
+static gint hf_opa_TIDRDMA_TIDFlowPSN;
+static gint hf_opa_TIDRDMA_TIDFlowQP_reserved;
+static gint hf_opa_TIDRDMA_TIDFlowQP;
+static gint hf_opa_TIDRDMA_VerbsPSN_reserved;
+static gint hf_opa_TIDRDMA_VerbsPSN;
+static gint hf_opa_TIDRDMA_VerbsQP_reserved;
+static gint hf_opa_TIDRDMA_VerbsQP;
 
 
 /* Custom Functions */
diff --git a/epan/dissectors/packet-openflow.c b/epan/dissectors/packet-openflow.c
index 8b21ed55df..8ef18926dd 100644
--- a/epan/dissectors/packet-openflow.c
+++ b/epan/dissectors/packet-openflow.c
@@ -35,10 +35,10 @@ static dissector_handle_t openflow_v5_handle;
 static dissector_handle_t openflow_v6_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_openflow = -1;
-static int hf_openflow_version = -1;
+static int proto_openflow;
+static int hf_openflow_version;
 
-static expert_field ei_openflow_version = EI_INIT;
+static expert_field ei_openflow_version;
 
 static gboolean openflow_desegment = TRUE;
 
diff --git a/epan/dissectors/packet-openflow_v1.c b/epan/dissectors/packet-openflow_v1.c
index 49d3a204bd..ec4bde5500 100644
--- a/epan/dissectors/packet-openflow_v1.c
+++ b/epan/dissectors/packet-openflow_v1.c
@@ -23,140 +23,140 @@ void proto_reg_handoff_openflow_v1(void);
 static dissector_handle_t eth_withoutfcs_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_openflow_v1 = -1;
-static int hf_openflow_version = -1;
-static int hf_openflow_1_0_type = -1;
-static int hf_openflow_length = -1;
-static int hf_openflow_xid = -1;
-
-static int hf_openflow_datapath_id = -1;
-static int hf_openflow_datapath_mac = -1;
-static int hf_openflow_datapath_impl = -1;
-static int hf_openflow_n_buffers = -1;
-static int hf_openflow_n_tables = -1;
-/* static int hf_openflow_auxiliary_id = -1; */
-static int hf_openflow_capabilities = -1;
-static int hf_openflow_actions = -1;
-/* static int hf_openflow_reserved32 = -1; */
-static int hf_openflow_cap_flow_stats = -1;
-static int hf_openflow_table_stats = -1;
-static int hf_openflow_port_stats = -1;
-static int hf_openflow_group_stats = -1;
-static int hf_openflow_ip_reasm = -1;
-static int hf_openflow_queue_stats = -1;
-static int hf_openflow_port_blocked = -1;
-
-static int hf_openflow_output = -1; /* Output to switch port. */
-static int hf_openflow_set_vlan_vid = -1; /* Set the 802.1q VLAN id. */
-static int hf_openflow_set_vlan_pcp = -1; /* Set the 802.1q priority. */
-static int hf_openflow_strip_vlan = -1; /* Strip the 802.1q header. */
-static int hf_openflow_set_dl_src = -1; /* Ethernet source address. */
-static int hf_openflow_set_dl_dst = -1; /* Ethernet destination address. */
-static int hf_openflow_set_nw_src = -1; /* IP source address. */
-static int hf_openflow_set_nw_dst = -1; /* IP destination address. */
-static int hf_openflow_set_nw_tos = -1; /* IP ToS (DSCP field, 6 bits). */
-static int hf_openflow_set_tp_src = -1; /* TCP/UDP source port. */
-static int hf_openflow_set_tp_dst = -1; /* TCP/UDP destination port. */
-static int hf_openflow_enqueue = -1; /* Output to queue. */
-
-static int hf_openflow_port_no = -1;
-static int hf_openflow_hw_addr = -1;
-static int hf_openflow_port_name = -1;
-
-
-static int hf_openflow_port_config = -1;
-static int hf_openflow_port_state = -1;
-static int hf_openflow_port_curr = -1;
-static int hf_openflow_port_advertised = -1;
-static int hf_openflow_port_supported = -1;
-static int hf_openflow_port_peer = -1;
-
-static int hf_openflow_port_down = -1;    /* Port is administratively down. */
-static int hf_openflow_no_stp = -1;       /* Disable 802.1D spanning tree on port. */
-static int hf_openflow_no_recv = -1;      /* Drop all packets except 802.1D spanning tree packets. */
-static int hf_openflow_no_recv_stp = -1;  /* Drop received 802.1D STP packets. */
-static int hf_openflow_no_flood = -1;     /* Do not include this port when flooding. */
-static int hf_openflow_no_fwd = -1;       /* Drop packets forwarded to port. */
-static int hf_openflow_no_packet_in = -1; /* Do not send packet-in msgs for port. */
-
-static int hf_openflow_link_down = -1;    /* No physical link present. */
-
-static int hf_openflow_10mb_hd = -1;      /* 10 Mb half-duplex rate support. */
-static int hf_openflow_10mb_fd = -1;      /* 10 Mb full-duplex rate support. */
-static int hf_openflow_100mb_hd = -1;     /* 100 Mb half-duplex rate support. */
-static int hf_openflow_100mb_fd = -1;     /* 100 Mb full-duplex rate support. */
-static int hf_openflow_1gb_hd = -1;       /* 1 Gb half-duplex rate support. */
-static int hf_openflow_1gb_fd = -1;       /* 1 Gb full-duplex rate support. */
-static int hf_openflow_10gb_fd = -1;      /* 10 Gb full-duplex rate support. */
-static int hf_openflow_copper = -1;       /* Copper medium. */
-static int hf_openflow_fiber = -1;        /* Fiber medium. */
-static int hf_openflow_autoneg = -1;      /* Auto-negotiation. */
-static int hf_openflow_pause = -1;        /* Pause. */
-static int hf_openflow_pause_asym = -1;   /* Asymmetric pause. */
-
-static int hf_openflow_config_flags = -1;
-static int hf_openflow_miss_send_len = -1;
-
-static int hf_openflow_buffer_id = -1;
-static int hf_openflow_total_len = -1;
-static int hf_openflow_in_port = -1;
-static int hf_openflow_reason = -1;
-static int hf_openflow_pkt_in_pad = -1;
-static int hf_openflow_flow_removed_cookie = -1;
-static int hf_openflow_flow_removed_priority = -1;
-static int hf_openflow_flow_removed_reason = -1;
-static int hf_openflow_flow_removed_pad1 = -1;
-static int hf_openflow_flow_removed_duration_sec = -1;
-static int hf_openflow_flow_removed_duration_nsec = -1;
-static int hf_openflow_flow_removed_idle_timeout = -1;
-static int hf_openflow_flow_removed_pad2 = -1;
-static int hf_openflow_flow_removed_packet_count = -1;
-static int hf_openflow_flow_removed_byte_count = -1;
-static int hf_openflow_table_id = -1;
-static int hf_openflow_cookie = -1;
-/* static int hf_openflow_cookie_mask = -1; */
-static int hf_openflow_features_reply_pad = -1;
-static int hf_openflow_actions_len = -1;
-static int hf_openflow_action_type = -1;
-static int hf_openflow_action_len = -1;
-static int hf_openflow_output_port = -1;
-static int hf_openflow_max_len = -1;
-static int hf_openflow_wildcards = -1;
-static int hf_openflow_command = -1;
-static int hf_openflow_eth_src = -1;
-static int hf_openflow_eth_dst = -1;
-static int hf_openflow_dl_vlan = -1;
-static int hf_openflow_dl_vlan_pcp = -1;
-static int hf_openflow_ofp_match_pad = -1;
-static int hf_openflow_match_dl_type = -1;
-static int hf_openflow_ofp_match_tos = -1;
-static int hf_openflow_ofp_match_nw_proto = -1;
-static int hf_openflow_ofp_source_addr = -1;
-static int hf_openflow_ofp_dest_addr = -1;
-static int hf_openflow_ofp_source_port = -1;
-static int hf_openflow_ofp_dest_port = -1;
-static int hf_openflow_idle_timeout = -1;
-static int hf_openflow_hard_timeout = -1;
-static int hf_openflow_priority = -1;
-static int hf_openflow_out_port = -1;
-/* static int hf_openflow_out_group = -1; */
-static int hf_openflow_flags = -1;
-static int hf_openflow_v1_stats_type = -1;
-static int hf_openflow_v1_flow_stats_request_pad = -1;
+static int proto_openflow_v1;
+static int hf_openflow_version;
+static int hf_openflow_1_0_type;
+static int hf_openflow_length;
+static int hf_openflow_xid;
+
+static int hf_openflow_datapath_id;
+static int hf_openflow_datapath_mac;
+static int hf_openflow_datapath_impl;
+static int hf_openflow_n_buffers;
+static int hf_openflow_n_tables;
+/* static int hf_openflow_auxiliary_id; */
+static int hf_openflow_capabilities;
+static int hf_openflow_actions;
+/* static int hf_openflow_reserved32; */
+static int hf_openflow_cap_flow_stats;
+static int hf_openflow_table_stats;
+static int hf_openflow_port_stats;
+static int hf_openflow_group_stats;
+static int hf_openflow_ip_reasm;
+static int hf_openflow_queue_stats;
+static int hf_openflow_port_blocked;
+
+static int hf_openflow_output; /* Output to switch port. */
+static int hf_openflow_set_vlan_vid; /* Set the 802.1q VLAN id. */
+static int hf_openflow_set_vlan_pcp; /* Set the 802.1q priority. */
+static int hf_openflow_strip_vlan; /* Strip the 802.1q header. */
+static int hf_openflow_set_dl_src; /* Ethernet source address. */
+static int hf_openflow_set_dl_dst; /* Ethernet destination address. */
+static int hf_openflow_set_nw_src; /* IP source address. */
+static int hf_openflow_set_nw_dst; /* IP destination address. */
+static int hf_openflow_set_nw_tos; /* IP ToS (DSCP field, 6 bits). */
+static int hf_openflow_set_tp_src; /* TCP/UDP source port. */
+static int hf_openflow_set_tp_dst; /* TCP/UDP destination port. */
+static int hf_openflow_enqueue; /* Output to queue. */
+
+static int hf_openflow_port_no;
+static int hf_openflow_hw_addr;
+static int hf_openflow_port_name;
+
+
+static int hf_openflow_port_config;
+static int hf_openflow_port_state;
+static int hf_openflow_port_curr;
+static int hf_openflow_port_advertised;
+static int hf_openflow_port_supported;
+static int hf_openflow_port_peer;
+
+static int hf_openflow_port_down;    /* Port is administratively down. */
+static int hf_openflow_no_stp;       /* Disable 802.1D spanning tree on port. */
+static int hf_openflow_no_recv;      /* Drop all packets except 802.1D spanning tree packets. */
+static int hf_openflow_no_recv_stp;  /* Drop received 802.1D STP packets. */
+static int hf_openflow_no_flood;     /* Do not include this port when flooding. */
+static int hf_openflow_no_fwd;       /* Drop packets forwarded to port. */
+static int hf_openflow_no_packet_in; /* Do not send packet-in msgs for port. */
+
+static int hf_openflow_link_down;    /* No physical link present. */
+
+static int hf_openflow_10mb_hd;      /* 10 Mb half-duplex rate support. */
+static int hf_openflow_10mb_fd;      /* 10 Mb full-duplex rate support. */
+static int hf_openflow_100mb_hd;     /* 100 Mb half-duplex rate support. */
+static int hf_openflow_100mb_fd;     /* 100 Mb full-duplex rate support. */
+static int hf_openflow_1gb_hd;       /* 1 Gb half-duplex rate support. */
+static int hf_openflow_1gb_fd;       /* 1 Gb full-duplex rate support. */
+static int hf_openflow_10gb_fd;      /* 10 Gb full-duplex rate support. */
+static int hf_openflow_copper;       /* Copper medium. */
+static int hf_openflow_fiber;        /* Fiber medium. */
+static int hf_openflow_autoneg;      /* Auto-negotiation. */
+static int hf_openflow_pause;        /* Pause. */
+static int hf_openflow_pause_asym;   /* Asymmetric pause. */
+
+static int hf_openflow_config_flags;
+static int hf_openflow_miss_send_len;
+
+static int hf_openflow_buffer_id;
+static int hf_openflow_total_len;
+static int hf_openflow_in_port;
+static int hf_openflow_reason;
+static int hf_openflow_pkt_in_pad;
+static int hf_openflow_flow_removed_cookie;
+static int hf_openflow_flow_removed_priority;
+static int hf_openflow_flow_removed_reason;
+static int hf_openflow_flow_removed_pad1;
+static int hf_openflow_flow_removed_duration_sec;
+static int hf_openflow_flow_removed_duration_nsec;
+static int hf_openflow_flow_removed_idle_timeout;
+static int hf_openflow_flow_removed_pad2;
+static int hf_openflow_flow_removed_packet_count;
+static int hf_openflow_flow_removed_byte_count;
+static int hf_openflow_table_id;
+static int hf_openflow_cookie;
+/* static int hf_openflow_cookie_mask; */
+static int hf_openflow_features_reply_pad;
+static int hf_openflow_actions_len;
+static int hf_openflow_action_type;
+static int hf_openflow_action_len;
+static int hf_openflow_output_port;
+static int hf_openflow_max_len;
+static int hf_openflow_wildcards;
+static int hf_openflow_command;
+static int hf_openflow_eth_src;
+static int hf_openflow_eth_dst;
+static int hf_openflow_dl_vlan;
+static int hf_openflow_dl_vlan_pcp;
+static int hf_openflow_ofp_match_pad;
+static int hf_openflow_match_dl_type;
+static int hf_openflow_ofp_match_tos;
+static int hf_openflow_ofp_match_nw_proto;
+static int hf_openflow_ofp_source_addr;
+static int hf_openflow_ofp_dest_addr;
+static int hf_openflow_ofp_source_port;
+static int hf_openflow_ofp_dest_port;
+static int hf_openflow_idle_timeout;
+static int hf_openflow_hard_timeout;
+static int hf_openflow_priority;
+static int hf_openflow_out_port;
+/* static int hf_openflow_out_group; */
+static int hf_openflow_flags;
+static int hf_openflow_v1_stats_type;
+static int hf_openflow_v1_flow_stats_request_pad;
 
 /* Initialize the subtree pointers */
-static gint ett_openflow = -1;
-static gint ett_openflow_path_id = -1;
-static gint ett_openflow_cap = -1;
-static gint ett_openflow_act = -1;
-static gint ett_openflow_port = -1;
-static gint ett_openflow_port_cnf = -1;
-static gint ett_openflow_port_state = -1;
-static gint ett_openflow_port_cf = -1;
-
-/* static expert_field ei_openflow_undecoded_data = EI_INIT; */
-static expert_field ei_openflow_action_type = EI_INIT;
-static expert_field ei_openflow_1_0_type = EI_INIT;
+static gint ett_openflow;
+static gint ett_openflow_path_id;
+static gint ett_openflow_cap;
+static gint ett_openflow_act;
+static gint ett_openflow_port;
+static gint ett_openflow_port_cnf;
+static gint ett_openflow_port_state;
+static gint ett_openflow_port_cf;
+
+/* static expert_field ei_openflow_undecoded_data; */
+static expert_field ei_openflow_action_type;
+static expert_field ei_openflow_1_0_type;
 
 static const value_string openflow_version_values[] = {
     { 0x01, "1.0" },
diff --git a/epan/dissectors/packet-openflow_v4.c b/epan/dissectors/packet-openflow_v4.c
index a4c47044dd..5c277a5d30 100644
--- a/epan/dissectors/packet-openflow_v4.c
+++ b/epan/dissectors/packet-openflow_v4.c
@@ -25,652 +25,652 @@ static int dissect_openflow_message_v4(tvbuff_t *, packet_info *, proto_tree *,
 
 static dissector_handle_t eth_withoutfcs_handle;
 
-static int proto_openflow_v4 = -1;
-static int hf_openflow_v4_version = -1;
-static int hf_openflow_v4_type = -1;
-static int hf_openflow_v4_length = -1;
-static int hf_openflow_v4_xid = -1;
-static int hf_openflow_v4_oxm_class = -1;
-static int hf_openflow_v4_oxm_field = -1;
-static int hf_openflow_v4_oxm_field_basic = -1;
-static int hf_openflow_v4_oxm_hm = -1;
-static int hf_openflow_v4_oxm_length = -1;
-static int hf_openflow_v4_oxm_experimenter_experimenter = -1;
-static int hf_openflow_v4_oxm_experimenter_value = -1;
-static int hf_openflow_v4_oxm_value = -1;
-static int hf_openflow_v4_oxm_value_etheraddr = -1;
-static int hf_openflow_v4_oxm_value_vlan_present = -1;
-static int hf_openflow_v4_oxm_value_vlan_vid = -1;
-static int hf_openflow_v4_oxm_value_ethertype = -1;
-static int hf_openflow_v4_oxm_value_ipv4addr = -1;
-static int hf_openflow_v4_oxm_value_ipv6addr = -1;
-static int hf_openflow_v4_oxm_value_ipproto = -1;
-static int hf_openflow_v4_oxm_value_uint16 = -1;
-static int hf_openflow_v4_oxm_value_uint24 = -1;
-static int hf_openflow_v4_oxm_value_uint32 = -1;
-static int hf_openflow_v4_oxm_mask = -1;
-static int hf_openflow_v4_oxm_mask_etheraddr = -1;
-static int hf_openflow_v4_oxm_mask_ipv4addr = -1;
-static int hf_openflow_v4_oxm_mask_ipv6addr = -1;
-static int hf_openflow_v4_oxm_mask_vlan = -1;
-static int hf_openflow_v4_match_type = -1;
-static int hf_openflow_v4_match_length = -1;
-static int hf_openflow_v4_match_pad = -1;
-static int hf_openflow_v4_action_type = -1;
-static int hf_openflow_v4_action_length = -1;
-static int hf_openflow_v4_action_experimenter_experimenter = -1;
-static int hf_openflow_v4_action_output_port = -1;
-static int hf_openflow_v4_action_output_max_len = -1;
-static int hf_openflow_v4_action_output_pad = -1;
-static int hf_openflow_v4_action_copy_ttl_out_pad = -1;
-static int hf_openflow_v4_action_copy_ttl_in_pad = -1;
-static int hf_openflow_v4_action_set_mpls_ttl_ttl = -1;
-static int hf_openflow_v4_action_set_mpls_ttl_pad = -1;
-static int hf_openflow_v4_action_dec_mpls_ttl_pad = -1;
-static int hf_openflow_v4_action_push_vlan_ethertype = -1;
-static int hf_openflow_v4_action_push_vlan_pad = -1;
-static int hf_openflow_v4_action_pop_vlan_pad = -1;
-static int hf_openflow_v4_action_push_mpls_ethertype = -1;
-static int hf_openflow_v4_action_push_mpls_pad = -1;
-static int hf_openflow_v4_action_pop_mpls_ethertype = -1;
-static int hf_openflow_v4_action_pop_mpls_pad = -1;
-static int hf_openflow_v4_action_set_queue_queue_id = -1;
-static int hf_openflow_v4_action_group_group_id = -1;
-static int hf_openflow_v4_action_set_nw_ttl_ttl = -1;
-static int hf_openflow_v4_action_set_nw_ttl_pad = -1;
-static int hf_openflow_v4_action_dec_nw_ttl_pad = -1;
-static int hf_openflow_v4_action_set_field_pad = -1;
-static int hf_openflow_v4_action_push_pbb_ethertype = -1;
-static int hf_openflow_v4_action_push_pbb_pad = -1;
-static int hf_openflow_v4_action_pop_pbb_pad = -1;
-static int hf_openflow_v4_instruction_type = -1;
-static int hf_openflow_v4_instruction_length = -1;
-static int hf_openflow_v4_instruction_experimenter_experimenter = -1;
-static int hf_openflow_v4_instruction_goto_table_table_id = -1;
-static int hf_openflow_v4_instruction_goto_table_pad = -1;
-static int hf_openflow_v4_instruction_write_metadata_pad = -1;
-static int hf_openflow_v4_instruction_write_metadata_value = -1;
-static int hf_openflow_v4_instruction_write_metadata_mask = -1;
-static int hf_openflow_v4_instruction_actions_pad = -1;
-static int hf_openflow_v4_instruction_meter_meter_id = -1;
-static int hf_openflow_v4_port_port_no = -1;
-static int hf_openflow_v4_port_pad = -1;
-static int hf_openflow_v4_port_hw_addr = -1;
-static int hf_openflow_v4_port_pad2 = -1;
-static int hf_openflow_v4_port_name = -1;
-static int hf_openflow_v4_port_config = -1;
-static int hf_openflow_v4_port_config_port_down = -1;
-static int hf_openflow_v4_port_config_no_recv = -1;
-static int hf_openflow_v4_port_config_no_fwd = -1;
-static int hf_openflow_v4_port_config_no_packet_in = -1;
-static int hf_openflow_v4_port_state = -1;
-static int hf_openflow_v4_port_state_link_down = -1;
-static int hf_openflow_v4_port_state_blocked = -1;
-static int hf_openflow_v4_port_state_live = -1;
-static int hf_openflow_v4_port_current = -1;
-static int hf_openflow_v4_port_current_10mb_hd = -1;
-static int hf_openflow_v4_port_current_10mb_fd = -1;
-static int hf_openflow_v4_port_current_100mb_hd = -1;
-static int hf_openflow_v4_port_current_100mb_fd = -1;
-static int hf_openflow_v4_port_current_1gb_hd = -1;
-static int hf_openflow_v4_port_current_1gb_fd = -1;
-static int hf_openflow_v4_port_current_10gb_fd = -1;
-static int hf_openflow_v4_port_current_40gb_fd = -1;
-static int hf_openflow_v4_port_current_100gb_fd = -1;
-static int hf_openflow_v4_port_current_1tb_fd = -1;
-static int hf_openflow_v4_port_current_other = -1;
-static int hf_openflow_v4_port_current_copper = -1;
-static int hf_openflow_v4_port_current_fiber = -1;
-static int hf_openflow_v4_port_current_autoneg = -1;
-static int hf_openflow_v4_port_current_pause = -1;
-static int hf_openflow_v4_port_current_pause_asym = -1;
-static int hf_openflow_v4_port_advertised = -1;
-static int hf_openflow_v4_port_advertised_10mb_hd = -1;
-static int hf_openflow_v4_port_advertised_10mb_fd = -1;
-static int hf_openflow_v4_port_advertised_100mb_hd = -1;
-static int hf_openflow_v4_port_advertised_100mb_fd = -1;
-static int hf_openflow_v4_port_advertised_1gb_hd = -1;
-static int hf_openflow_v4_port_advertised_1gb_fd = -1;
-static int hf_openflow_v4_port_advertised_10gb_fd = -1;
-static int hf_openflow_v4_port_advertised_40gb_fd = -1;
-static int hf_openflow_v4_port_advertised_100gb_fd = -1;
-static int hf_openflow_v4_port_advertised_1tb_fd = -1;
-static int hf_openflow_v4_port_advertised_other = -1;
-static int hf_openflow_v4_port_advertised_copper = -1;
-static int hf_openflow_v4_port_advertised_fiber = -1;
-static int hf_openflow_v4_port_advertised_autoneg = -1;
-static int hf_openflow_v4_port_advertised_pause = -1;
-static int hf_openflow_v4_port_advertised_pause_asym = -1;
-static int hf_openflow_v4_port_supported = -1;
-static int hf_openflow_v4_port_supported_10mb_hd = -1;
-static int hf_openflow_v4_port_supported_10mb_fd = -1;
-static int hf_openflow_v4_port_supported_100mb_hd = -1;
-static int hf_openflow_v4_port_supported_100mb_fd = -1;
-static int hf_openflow_v4_port_supported_1gb_hd = -1;
-static int hf_openflow_v4_port_supported_1gb_fd = -1;
-static int hf_openflow_v4_port_supported_10gb_fd = -1;
-static int hf_openflow_v4_port_supported_40gb_fd = -1;
-static int hf_openflow_v4_port_supported_100gb_fd = -1;
-static int hf_openflow_v4_port_supported_1tb_fd = -1;
-static int hf_openflow_v4_port_supported_other = -1;
-static int hf_openflow_v4_port_supported_copper = -1;
-static int hf_openflow_v4_port_supported_fiber = -1;
-static int hf_openflow_v4_port_supported_autoneg = -1;
-static int hf_openflow_v4_port_supported_pause = -1;
-static int hf_openflow_v4_port_supported_pause_asym = -1;
-static int hf_openflow_v4_port_peer = -1;
-static int hf_openflow_v4_port_peer_10mb_hd = -1;
-static int hf_openflow_v4_port_peer_10mb_fd = -1;
-static int hf_openflow_v4_port_peer_100mb_hd = -1;
-static int hf_openflow_v4_port_peer_100mb_fd = -1;
-static int hf_openflow_v4_port_peer_1gb_hd = -1;
-static int hf_openflow_v4_port_peer_1gb_fd = -1;
-static int hf_openflow_v4_port_peer_10gb_fd = -1;
-static int hf_openflow_v4_port_peer_40gb_fd = -1;
-static int hf_openflow_v4_port_peer_100gb_fd = -1;
-static int hf_openflow_v4_port_peer_1tb_fd = -1;
-static int hf_openflow_v4_port_peer_other = -1;
-static int hf_openflow_v4_port_peer_copper = -1;
-static int hf_openflow_v4_port_peer_fiber = -1;
-static int hf_openflow_v4_port_peer_autoneg = -1;
-static int hf_openflow_v4_port_peer_pause = -1;
-static int hf_openflow_v4_port_peer_pause_asym = -1;
-static int hf_openflow_v4_port_curr_speed = -1;
-static int hf_openflow_v4_port_max_speed = -1;
-static int hf_openflow_v4_meter_band_type = -1;
-static int hf_openflow_v4_meter_band_len = -1;
-static int hf_openflow_v4_meter_band_rate = -1;
-static int hf_openflow_v4_meter_band_burst_size = -1;
-static int hf_openflow_v4_meter_band_drop_pad = -1;
-static int hf_openflow_v4_meter_band_dscp_remark_prec_level = -1;
-static int hf_openflow_v4_meter_band_dscp_remark_pad= -1;
-static int hf_openflow_v4_meter_band_experimenter_experimenter = -1;
-static int hf_openflow_v4_hello_element_type = -1;
-static int hf_openflow_v4_hello_element_length = -1;
-static int hf_openflow_v4_hello_element_version_bitmap = -1;
-static int hf_openflow_v4_hello_element_pad = -1;
-static int hf_openflow_v4_error_type = -1;
-static int hf_openflow_v4_error_hello_failed_code = -1;
-static int hf_openflow_v4_error_bad_request_code = -1;
-static int hf_openflow_v4_error_bad_action_code = -1;
-static int hf_openflow_v4_error_bad_instruction_code = -1;
-static int hf_openflow_v4_error_bad_match_code = -1;
-static int hf_openflow_v4_error_flow_mod_failed_code = -1;
-static int hf_openflow_v4_error_group_mod_failed_code = -1;
-static int hf_openflow_v4_error_port_mod_failed_code = -1;
-static int hf_openflow_v4_error_table_mod_failed_code = -1;
-static int hf_openflow_v4_error_queue_op_failed_code = -1;
-static int hf_openflow_v4_error_switch_config_failed_code = -1;
-static int hf_openflow_v4_error_role_request_failed_code = -1;
-static int hf_openflow_v4_error_meter_mod_failed_code = -1;
-static int hf_openflow_v4_error_table_features_failed_code = -1;
-static int hf_openflow_v4_error_code = -1;
-static int hf_openflow_v4_error_data_text = -1;
-static int hf_openflow_v4_error_data_body = -1;
-static int hf_openflow_v4_error_experimenter = -1;
-static int hf_openflow_v4_echo_data = -1;
-static int hf_openflow_v4_experimenter_experimenter = -1;
-static int hf_openflow_v4_experimenter_exp_type = -1;
-static int hf_openflow_v4_switch_features_datapath_id = -1;
-static int hf_openflow_v4_switch_features_n_buffers = -1;
-static int hf_openflow_v4_switch_features_n_tables = -1;
-static int hf_openflow_v4_switch_features_auxiliary_id = -1;
-static int hf_openflow_v4_switch_features_pad = -1;
-static int hf_openflow_v4_switch_features_capabilities = -1;
-static int hf_openflow_v4_switch_features_capabilities_flow_stats = -1;
-static int hf_openflow_v4_switch_features_capabilities_table_stats = -1;
-static int hf_openflow_v4_switch_features_capabilities_port_stats = -1;
-static int hf_openflow_v4_switch_features_capabilities_group_stats = -1;
-static int hf_openflow_v4_switch_features_capabilities_ip_reasm = -1;
-static int hf_openflow_v4_switch_features_capabilities_queue_stats = -1;
-static int hf_openflow_v4_switch_features_capabilities_port_blocked = -1;
-static int hf_openflow_v4_switch_features_reserved = -1;
-static int hf_openflow_v4_switch_config_flags = -1;
-static int hf_openflow_v4_switch_config_flags_fragments = -1;
-static int hf_openflow_v4_switch_config_miss_send_len = -1;
-static int hf_openflow_v4_packet_in_buffer_id = -1;
-static int hf_openflow_v4_packet_in_total_len = -1;
-static int hf_openflow_v4_packet_in_reason = -1;
-static int hf_openflow_v4_packet_in_table_id = -1;
-static int hf_openflow_v4_packet_in_cookie = -1;
-static int hf_openflow_v4_packet_in_pad = -1;
-static int hf_openflow_v4_flow_removed_cookie = -1;
-static int hf_openflow_v4_flow_removed_priority = -1;
-static int hf_openflow_v4_flow_removed_reason = -1;
-static int hf_openflow_v4_flow_removed_table_id = -1;
-static int hf_openflow_v4_flow_removed_duration_sec = -1;
-static int hf_openflow_v4_flow_removed_duration_nsec = -1;
-static int hf_openflow_v4_flow_removed_idle_timeout = -1;
-static int hf_openflow_v4_flow_removed_hard_timeout = -1;
-static int hf_openflow_v4_flow_removed_packet_count = -1;
-static int hf_openflow_v4_flow_removed_byte_count = -1;
-static int hf_openflow_v4_port_status_reason = -1;
-static int hf_openflow_v4_port_status_pad = -1;
-static int hf_openflow_v4_packet_out_buffer_id = -1;
-static int hf_openflow_v4_packet_out_in_port = -1;
-static int hf_openflow_v4_packet_out_acts_len = -1;
-static int hf_openflow_v4_packet_out_pad = -1;
-static int hf_openflow_v4_flowmod_cookie = -1;
-static int hf_openflow_v4_flowmod_cookie_mask = -1;
-static int hf_openflow_v4_flowmod_table_id = -1;
-static int hf_openflow_v4_flowmod_command = -1;
-static int hf_openflow_v4_flowmod_idle_timeout = -1;
-static int hf_openflow_v4_flowmod_hard_timeout = -1;
-static int hf_openflow_v4_flowmod_priority = -1;
-static int hf_openflow_v4_flowmod_buffer_id = -1;
-static int hf_openflow_v4_flowmod_out_port = -1;
-static int hf_openflow_v4_flowmod_out_group = -1;
-static int hf_openflow_v4_flowmod_flags = -1;
-static int hf_openflow_v4_flowmod_flags_send_flow_rem = -1;
-static int hf_openflow_v4_flowmod_flags_check_overlap = -1;
-static int hf_openflow_v4_flowmod_flags_reset_counts = -1;
-static int hf_openflow_v4_flowmod_flags_no_packet_counts = -1;
-static int hf_openflow_v4_flowmod_flags_no_byte_counts = -1;
-static int hf_openflow_v4_flowmod_pad = -1;
-static int hf_openflow_v4_bucket_length = -1;
-static int hf_openflow_v4_bucket_weight = -1;
-static int hf_openflow_v4_bucket_watch_port = -1;
-static int hf_openflow_v4_bucket_watch_group = -1;
-static int hf_openflow_v4_bucket_pad = -1;
-static int hf_openflow_v4_groupmod_command = -1;
-static int hf_openflow_v4_groupmod_type = -1;
-static int hf_openflow_v4_groupmod_pad = -1;
-static int hf_openflow_v4_groupmod_group_id = -1;
-static int hf_openflow_v4_portmod_port_no = -1;
-static int hf_openflow_v4_portmod_pad = -1;
-static int hf_openflow_v4_portmod_hw_addr = -1;
-static int hf_openflow_v4_portmod_pad2 = -1;
-static int hf_openflow_v4_portmod_config = -1;
-static int hf_openflow_v4_portmod_config_port_down = -1;
-static int hf_openflow_v4_portmod_config_no_recv = -1;
-static int hf_openflow_v4_portmod_config_no_fwd = -1;
-static int hf_openflow_v4_portmod_config_no_packet_in = -1;
-static int hf_openflow_v4_portmod_mask = -1;
-static int hf_openflow_v4_portmod_mask_port_down = -1;
-static int hf_openflow_v4_portmod_mask_no_recv = -1;
-static int hf_openflow_v4_portmod_mask_no_fwd = -1;
-static int hf_openflow_v4_portmod_mask_no_packet_in = -1;
-static int hf_openflow_v4_portmod_advertise = -1;
-static int hf_openflow_v4_portmod_advertise_10mb_hd = -1;
-static int hf_openflow_v4_portmod_advertise_10mb_fd = -1;
-static int hf_openflow_v4_portmod_advertise_100mb_hd = -1;
-static int hf_openflow_v4_portmod_advertise_100mb_fd = -1;
-static int hf_openflow_v4_portmod_advertise_1gb_hd = -1;
-static int hf_openflow_v4_portmod_advertise_1gb_fd = -1;
-static int hf_openflow_v4_portmod_advertise_10gb_fd = -1;
-static int hf_openflow_v4_portmod_advertise_40gb_fd = -1;
-static int hf_openflow_v4_portmod_advertise_100gb_fd = -1;
-static int hf_openflow_v4_portmod_advertise_1tb_fd = -1;
-static int hf_openflow_v4_portmod_advertise_other = -1;
-static int hf_openflow_v4_portmod_advertise_copper = -1;
-static int hf_openflow_v4_portmod_advertise_fiber = -1;
-static int hf_openflow_v4_portmod_advertise_autoneg = -1;
-static int hf_openflow_v4_portmod_advertise_pause = -1;
-static int hf_openflow_v4_portmod_advertise_pause_asym = -1;
-static int hf_openflow_v4_portmod_pad3 = -1;
-static int hf_openflow_v4_tablemod_table_id = -1;
-static int hf_openflow_v4_tablemod_pad = -1;
-static int hf_openflow_v4_tablemod_config = -1;
-static int hf_openflow_v4_flow_stats_request_table_id = -1;
-static int hf_openflow_v4_flow_stats_request_pad = -1;
-static int hf_openflow_v4_flow_stats_request_out_port = -1;
-static int hf_openflow_v4_flow_stats_request_out_group = -1;
-static int hf_openflow_v4_flow_stats_request_pad2 = -1;
-static int hf_openflow_v4_flow_stats_request_cookie = -1;
-static int hf_openflow_v4_flow_stats_request_cookie_mask = -1;
-static int hf_openflow_v4_aggregate_stats_request_table_id = -1;
-static int hf_openflow_v4_aggregate_stats_request_pad = -1;
-static int hf_openflow_v4_aggregate_stats_request_out_port = -1;
-static int hf_openflow_v4_aggregate_stats_request_out_group = -1;
-static int hf_openflow_v4_aggregate_stats_request_pad2 = -1;
-static int hf_openflow_v4_aggregate_stats_request_cookie = -1;
-static int hf_openflow_v4_aggregate_stats_request_cookie_mask = -1;
-static int hf_openflow_v4_table_feature_prop_type = -1;
-static int hf_openflow_v4_table_feature_prop_length = -1;
-static int hf_openflow_v4_table_feature_prop_next_tables_next_table_id = -1;
-static int hf_openflow_v4_table_feature_prop_experimenter_experimenter = -1;
-static int hf_openflow_v4_table_feature_prop_experimenter_exp_type = -1;
-static int hf_openflow_v4_table_feature_prop_pad = -1;
-static int hf_openflow_v4_table_features_length = -1;
-static int hf_openflow_v4_table_features_table_id = -1;
-static int hf_openflow_v4_table_features_pad = -1;
-static int hf_openflow_v4_table_features_name = -1;
-static int hf_openflow_v4_table_features_metadata_match = -1;
-static int hf_openflow_v4_table_features_metadata_write = -1;
-static int hf_openflow_v4_table_features_config = -1;
-static int hf_openflow_v4_table_features_max_entries = -1;
-static int hf_openflow_v4_port_stats_request_port_no = -1;
-static int hf_openflow_v4_port_stats_request_pad = -1;
-static int hf_openflow_v4_queue_stats_request_port_no = -1;
-static int hf_openflow_v4_queue_stats_request_queue_id = -1;
-static int hf_openflow_v4_group_stats_request_group_id = -1;
-static int hf_openflow_v4_group_stats_request_pad = -1;
-static int hf_openflow_v4_meter_stats_request_meter_id = -1;
-static int hf_openflow_v4_meter_stats_request_pad = -1;
-static int hf_openflow_v4_meter_config_request_meter_id = -1;
-static int hf_openflow_v4_meter_config_request_pad = -1;
-static int hf_openflow_v4_multipart_request_type = -1;
-static int hf_openflow_v4_multipart_request_flags = -1;
-static int hf_openflow_v4_multipart_request_flags_more = -1;
-static int hf_openflow_v4_multipart_request_pad = -1;
-static int hf_openflow_v4_multipart_request_experimenter_experimenter = -1;
-static int hf_openflow_v4_multipart_request_experimenter_exp_type = -1;
-static int hf_openflow_v4_switch_description_mfr_desc = -1;
-static int hf_openflow_v4_switch_description_hw_desc = -1;
-static int hf_openflow_v4_switch_description_sw_desc = -1;
-static int hf_openflow_v4_switch_description_serial_num = -1;
-static int hf_openflow_v4_switch_description_dp_desc = -1;
-static int hf_openflow_v4_flow_stats_length = -1;
-static int hf_openflow_v4_flow_stats_table_id = -1;
-static int hf_openflow_v4_flow_stats_pad = -1;
-static int hf_openflow_v4_flow_stats_duration_sec = -1;
-static int hf_openflow_v4_flow_stats_duration_nsec = -1;
-static int hf_openflow_v4_flow_stats_priority = -1;
-static int hf_openflow_v4_flow_stats_idle_timeout = -1;
-static int hf_openflow_v4_flow_stats_hard_timeout = -1;
-static int hf_openflow_v4_flow_stats_flags = -1;
-static int hf_openflow_v4_flow_stats_flags_send_flow_rem = -1;
-static int hf_openflow_v4_flow_stats_flags_check_overlap = -1;
-static int hf_openflow_v4_flow_stats_flags_reset_counts = -1;
-static int hf_openflow_v4_flow_stats_flags_no_packet_counts = -1;
-static int hf_openflow_v4_flow_stats_flags_no_byte_counts = -1;
-static int hf_openflow_v4_flow_stats_pad2 = -1;
-static int hf_openflow_v4_flow_stats_cookie = -1;
-static int hf_openflow_v4_flow_stats_packet_count = -1;
-static int hf_openflow_v4_flow_stats_byte_count = -1;
-static int hf_openflow_v4_aggregate_stats_packet_count = -1;
-static int hf_openflow_v4_aggregate_stats_byte_count = -1;
-static int hf_openflow_v4_aggregate_stats_flow_count = -1;
-static int hf_openflow_v4_aggregate_stats_pad = -1;
-static int hf_openflow_v4_table_stats_table_id = -1;
-static int hf_openflow_v4_table_stats_pad = -1;
-static int hf_openflow_v4_table_stats_active_count = -1;
-static int hf_openflow_v4_table_stats_lookup_count = -1;
-static int hf_openflow_v4_table_stats_match_count = -1;
-static int hf_openflow_v4_port_stats_port_no = -1;
-static int hf_openflow_v4_port_stats_pad = -1;
-static int hf_openflow_v4_port_stats_rx_packets = -1;
-static int hf_openflow_v4_port_stats_tx_packets = -1;
-static int hf_openflow_v4_port_stats_rx_bytes = -1;
-static int hf_openflow_v4_port_stats_tx_bytes = -1;
-static int hf_openflow_v4_port_stats_rx_dropped = -1;
-static int hf_openflow_v4_port_stats_tx_dropped = -1;
-static int hf_openflow_v4_port_stats_rx_errors = -1;
-static int hf_openflow_v4_port_stats_tx_errors = -1;
-static int hf_openflow_v4_port_stats_rx_frame_error = -1;
-static int hf_openflow_v4_port_stats_rx_over_error = -1;
-static int hf_openflow_v4_port_stats_rx_crc_error = -1;
-static int hf_openflow_v4_port_stats_collisions = -1;
-static int hf_openflow_v4_port_stats_duration_sec = -1;
-static int hf_openflow_v4_port_stats_duration_nsec = -1;
-static int hf_openflow_v4_queue_stats_port_no = -1;
-static int hf_openflow_v4_queue_stats_queue_id = -1;
-static int hf_openflow_v4_queue_stats_tx_bytes = -1;
-static int hf_openflow_v4_queue_stats_tx_packets = -1;
-static int hf_openflow_v4_queue_stats_tx_errors = -1;
-static int hf_openflow_v4_queue_stats_duration_sec = -1;
-static int hf_openflow_v4_queue_stats_duration_nsec = -1;
-static int hf_openflow_v4_bucket_counter_packet_count = -1;
-static int hf_openflow_v4_bucket_counter_byte_count = -1;
-static int hf_openflow_v4_group_stats_length = -1;
-static int hf_openflow_v4_group_stats_pad = -1;
-static int hf_openflow_v4_group_stats_group_id = -1;
-static int hf_openflow_v4_group_stats_ref_count = -1;
-static int hf_openflow_v4_group_stats_pad2 = -1;
-static int hf_openflow_v4_group_stats_packet_count = -1;
-static int hf_openflow_v4_group_stats_byte_count = -1;
-static int hf_openflow_v4_group_desc_length = -1;
-static int hf_openflow_v4_group_desc_type = -1;
-static int hf_openflow_v4_group_desc_pad = -1;
-static int hf_openflow_v4_group_desc_group_id = -1;
-static int hf_openflow_v4_group_features_types = -1;
-static int hf_openflow_v4_group_features_types_all = -1;
-static int hf_openflow_v4_group_features_types_select = -1;
-static int hf_openflow_v4_group_features_types_indirect = -1;
-static int hf_openflow_v4_group_features_types_ff = -1;
-static int hf_openflow_v4_group_features_capabilities = -1;
-static int hf_openflow_v4_group_features_capabilities_select_weight = -1;
-static int hf_openflow_v4_group_features_capabilities_select_liveness = -1;
-static int hf_openflow_v4_group_features_capabilities_chaining = -1;
-static int hf_openflow_v4_group_features_capabilities_chaining_checks = -1;
-static int hf_openflow_v4_group_features_max_groups_all = -1;
-static int hf_openflow_v4_group_features_max_groups_select = -1;
-static int hf_openflow_v4_group_features_max_groups_indirect = -1;
-static int hf_openflow_v4_group_features_max_groups_ff = -1;
-static int hf_openflow_v4_group_features_actions_all = -1;
-static int hf_openflow_v4_group_features_actions_all_output = -1;
-static int hf_openflow_v4_group_features_actions_all_copy_ttl_out = -1;
-static int hf_openflow_v4_group_features_actions_all_copy_ttl_in = -1;
-static int hf_openflow_v4_group_features_actions_all_set_mpls_ttl = -1;
-static int hf_openflow_v4_group_features_actions_all_dec_mpls_ttl = -1;
-static int hf_openflow_v4_group_features_actions_all_push_vlan = -1;
-static int hf_openflow_v4_group_features_actions_all_pop_vlan = -1;
-static int hf_openflow_v4_group_features_actions_all_push_mpls = -1;
-static int hf_openflow_v4_group_features_actions_all_pop_mpls = -1;
-static int hf_openflow_v4_group_features_actions_all_set_queue = -1;
-static int hf_openflow_v4_group_features_actions_all_group = -1;
-static int hf_openflow_v4_group_features_actions_all_set_nw_ttl = -1;
-static int hf_openflow_v4_group_features_actions_all_dec_nw_ttl = -1;
-static int hf_openflow_v4_group_features_actions_all_set_field = -1;
-static int hf_openflow_v4_group_features_actions_all_push_pbb = -1;
-static int hf_openflow_v4_group_features_actions_all_pop_pbb = -1;
-static int hf_openflow_v4_group_features_actions_select = -1;
-static int hf_openflow_v4_group_features_actions_select_output = -1;
-static int hf_openflow_v4_group_features_actions_select_copy_ttl_out = -1;
-static int hf_openflow_v4_group_features_actions_select_copy_ttl_in = -1;
-static int hf_openflow_v4_group_features_actions_select_set_mpls_ttl = -1;
-static int hf_openflow_v4_group_features_actions_select_dec_mpls_ttl = -1;
-static int hf_openflow_v4_group_features_actions_select_push_vlan = -1;
-static int hf_openflow_v4_group_features_actions_select_pop_vlan = -1;
-static int hf_openflow_v4_group_features_actions_select_push_mpls = -1;
-static int hf_openflow_v4_group_features_actions_select_pop_mpls = -1;
-static int hf_openflow_v4_group_features_actions_select_set_queue = -1;
-static int hf_openflow_v4_group_features_actions_select_group = -1;
-static int hf_openflow_v4_group_features_actions_select_set_nw_ttl = -1;
-static int hf_openflow_v4_group_features_actions_select_dec_nw_ttl = -1;
-static int hf_openflow_v4_group_features_actions_select_set_field = -1;
-static int hf_openflow_v4_group_features_actions_select_push_pbb = -1;
-static int hf_openflow_v4_group_features_actions_select_pop_pbb = -1;
-static int hf_openflow_v4_group_features_actions_indirect = -1;
-static int hf_openflow_v4_group_features_actions_indirect_output = -1;
-static int hf_openflow_v4_group_features_actions_indirect_copy_ttl_out = -1;
-static int hf_openflow_v4_group_features_actions_indirect_copy_ttl_in = -1;
-static int hf_openflow_v4_group_features_actions_indirect_set_mpls_ttl = -1;
-static int hf_openflow_v4_group_features_actions_indirect_dec_mpls_ttl = -1;
-static int hf_openflow_v4_group_features_actions_indirect_push_vlan = -1;
-static int hf_openflow_v4_group_features_actions_indirect_pop_vlan = -1;
-static int hf_openflow_v4_group_features_actions_indirect_push_mpls = -1;
-static int hf_openflow_v4_group_features_actions_indirect_pop_mpls = -1;
-static int hf_openflow_v4_group_features_actions_indirect_set_queue = -1;
-static int hf_openflow_v4_group_features_actions_indirect_group = -1;
-static int hf_openflow_v4_group_features_actions_indirect_set_nw_ttl = -1;
-static int hf_openflow_v4_group_features_actions_indirect_dec_nw_ttl = -1;
-static int hf_openflow_v4_group_features_actions_indirect_set_field = -1;
-static int hf_openflow_v4_group_features_actions_indirect_push_pbb = -1;
-static int hf_openflow_v4_group_features_actions_indirect_pop_pbb = -1;
-static int hf_openflow_v4_group_features_actions_ff = -1;
-static int hf_openflow_v4_group_features_actions_ff_output = -1;
-static int hf_openflow_v4_group_features_actions_ff_copy_ttl_out = -1;
-static int hf_openflow_v4_group_features_actions_ff_copy_ttl_in = -1;
-static int hf_openflow_v4_group_features_actions_ff_set_mpls_ttl = -1;
-static int hf_openflow_v4_group_features_actions_ff_dec_mpls_ttl = -1;
-static int hf_openflow_v4_group_features_actions_ff_push_vlan = -1;
-static int hf_openflow_v4_group_features_actions_ff_pop_vlan = -1;
-static int hf_openflow_v4_group_features_actions_ff_push_mpls = -1;
-static int hf_openflow_v4_group_features_actions_ff_pop_mpls = -1;
-static int hf_openflow_v4_group_features_actions_ff_set_queue = -1;
-static int hf_openflow_v4_group_features_actions_ff_group = -1;
-static int hf_openflow_v4_group_features_actions_ff_set_nw_ttl = -1;
-static int hf_openflow_v4_group_features_actions_ff_dec_nw_ttl = -1;
-static int hf_openflow_v4_group_features_actions_ff_set_field = -1;
-static int hf_openflow_v4_group_features_actions_ff_push_pbb = -1;
-static int hf_openflow_v4_group_features_actions_ff_pop_pbb = -1;
-static int hf_openflow_v4_meter_band_stats_packet_band_count = -1;
-static int hf_openflow_v4_meter_band_stats_byte_band_count = -1;
-static int hf_openflow_v4_meter_stats_meter_id = -1;
-static int hf_openflow_v4_meter_stats_len = -1;
-static int hf_openflow_v4_meter_stats_pad = -1;
-static int hf_openflow_v4_meter_stats_flow_count = -1;
-static int hf_openflow_v4_meter_stats_packet_in_count = -1;
-static int hf_openflow_v4_meter_stats_byte_in_count = -1;
-static int hf_openflow_v4_meter_stats_duration_sec = -1;
-static int hf_openflow_v4_meter_stats_duration_nsec = -1;
-static int hf_openflow_v4_meter_config_len = -1;
-static int hf_openflow_v4_meter_config_flags = -1;
-static int hf_openflow_v4_meter_config_flags_kbps = -1;
-static int hf_openflow_v4_meter_config_flags_pktps = -1;
-static int hf_openflow_v4_meter_config_flags_burst = -1;
-static int hf_openflow_v4_meter_config_flags_stats = -1;
-static int hf_openflow_v4_meter_config_meter_id = -1;
-static int hf_openflow_v4_meter_features_max_meter = -1;
-static int hf_openflow_v4_meter_features_band_types = -1;
-static int hf_openflow_v4_meter_features_band_types_drop = -1;
-static int hf_openflow_v4_meter_features_band_types_dscp_remark = -1;
-static int hf_openflow_v4_meter_features_capabilities = -1;
-static int hf_openflow_v4_meter_features_capabilities_kbps = -1;
-static int hf_openflow_v4_meter_features_capabilities_pktps = -1;
-static int hf_openflow_v4_meter_features_capabilities_burst = -1;
-static int hf_openflow_v4_meter_features_capabilities_stats = -1;
-static int hf_openflow_v4_meter_features_max_bands = -1;
-static int hf_openflow_v4_meter_features_max_color = -1;
-static int hf_openflow_v4_meter_features_pad = -1;
-static int hf_openflow_v4_multipart_reply_type = -1;
-static int hf_openflow_v4_multipart_reply_flags = -1;
-static int hf_openflow_v4_multipart_reply_flags_more = -1;
-static int hf_openflow_v4_multipart_reply_pad = -1;
-static int hf_openflow_v4_multipart_reply_experimenter_experimenter = -1;
-static int hf_openflow_v4_multipart_reply_experimenter_exp_type = -1;
-static int hf_openflow_v4_queue_get_config_request_port = -1;
-static int hf_openflow_v4_queue_get_config_request_pad = -1;
-static int hf_openflow_v4_queue_prop_property = -1;
-static int hf_openflow_v4_queue_prop_len = -1;
-static int hf_openflow_v4_queue_prop_pad = -1;
-static int hf_openflow_v4_queue_prop_min_rate_rate = -1;
-static int hf_openflow_v4_queue_prop_min_rate_pad = -1;
-static int hf_openflow_v4_queue_prop_max_rate_rate = -1;
-static int hf_openflow_v4_queue_prop_max_rate_pad = -1;
-static int hf_openflow_v4_queue_prop_experimenter_experimenter = -1;
-static int hf_openflow_v4_queue_prop_experimenter_pad = -1;
-static int hf_openflow_v4_packet_queue_queue_id = -1;
-static int hf_openflow_v4_packet_queue_port = -1;
-static int hf_openflow_v4_packet_queue_len = -1;
-static int hf_openflow_v4_packet_queue_pad = -1;
-static int hf_openflow_v4_queue_get_config_reply_port = -1;
-static int hf_openflow_v4_queue_get_config_reply_pad = -1;
-static int hf_openflow_v4_role_request_role = -1;
-static int hf_openflow_v4_role_request_pad = -1;
-static int hf_openflow_v4_role_request_generation_id = -1;
-static int hf_openflow_v4_role_reply_role = -1;
-static int hf_openflow_v4_role_reply_pad = -1;
-static int hf_openflow_v4_role_reply_generation_id = -1;
-static int hf_openflow_v4_async_config_packet_in_mask_master = -1;
-static int hf_openflow_v4_async_config_packet_in_mask_master_no_match = -1;
-static int hf_openflow_v4_async_config_packet_in_mask_master_action = -1;
-static int hf_openflow_v4_async_config_packet_in_mask_master_invalid_ttl = -1;
-static int hf_openflow_v4_async_config_packet_in_mask_slave = -1;
-static int hf_openflow_v4_async_config_packet_in_mask_slave_no_match = -1;
-static int hf_openflow_v4_async_config_packet_in_mask_slave_action = -1;
-static int hf_openflow_v4_async_config_packet_in_mask_slave_invalid_ttl = -1;
-static int hf_openflow_v4_async_config_port_status_mask_master = -1;
-static int hf_openflow_v4_async_config_port_status_mask_master_add = -1;
-static int hf_openflow_v4_async_config_port_status_mask_master_delete = -1;
-static int hf_openflow_v4_async_config_port_status_mask_master_modify = -1;
-static int hf_openflow_v4_async_config_port_status_mask_slave = -1;
-static int hf_openflow_v4_async_config_port_status_mask_slave_add = -1;
-static int hf_openflow_v4_async_config_port_status_mask_slave_delete = -1;
-static int hf_openflow_v4_async_config_port_status_mask_slave_modify = -1;
-static int hf_openflow_v4_async_config_flow_removed_mask_master = -1;
-static int hf_openflow_v4_async_config_flow_removed_mask_master_idle_timeout = -1;
-static int hf_openflow_v4_async_config_flow_removed_mask_master_hard_timeout = -1;
-static int hf_openflow_v4_async_config_flow_removed_mask_master_delete = -1;
-static int hf_openflow_v4_async_config_flow_removed_mask_master_group_delete = -1;
-static int hf_openflow_v4_async_config_flow_removed_mask_slave = -1;
-static int hf_openflow_v4_async_config_flow_removed_mask_slave_idle_timeout = -1;
-static int hf_openflow_v4_async_config_flow_removed_mask_slave_hard_timeout = -1;
-static int hf_openflow_v4_async_config_flow_removed_mask_slave_delete = -1;
-static int hf_openflow_v4_async_config_flow_removed_mask_slave_group_delete = -1;
-static int hf_openflow_v4_metermod_command = -1;
-static int hf_openflow_v4_metermod_flags = -1;
-static int hf_openflow_v4_metermod_flags_kbps = -1;
-static int hf_openflow_v4_metermod_flags_pktps = -1;
-static int hf_openflow_v4_metermod_flags_burst = -1;
-static int hf_openflow_v4_metermod_flags_stats = -1;
-static int hf_openflow_v4_metermod_meter_id = -1;
-
-static gint ett_openflow_v4 = -1;
-static gint ett_openflow_v4_flowmod_flags = -1;
-static gint ett_openflow_v4_bucket = -1;
-static gint ett_openflow_v4_oxm = -1;
-static gint ett_openflow_v4_match = -1;
-static gint ett_openflow_v4_action = -1;
-static gint ett_openflow_v4_instruction = -1;
-static gint ett_openflow_v4_port = -1;
-static gint ett_openflow_v4_port_config = -1;
-static gint ett_openflow_v4_port_state = -1;
-static gint ett_openflow_v4_port_current = -1;
-static gint ett_openflow_v4_port_advertised = -1;
-static gint ett_openflow_v4_port_supported = -1;
-static gint ett_openflow_v4_port_peer = -1;
-static gint ett_openflow_v4_meter_band  = -1;
-static gint ett_openflow_v4_hello_element = -1;
-static gint ett_openflow_v4_error_data = -1;
-static gint ett_openflow_v4_switch_features_capabilities = -1;
-static gint ett_openflow_v4_switch_config_flags = -1;
-static gint ett_openflow_v4_packet_in_data = -1;
-static gint ett_openflow_v4_packet_out_data = -1;
-static gint ett_openflow_v4_portmod_config = -1;
-static gint ett_openflow_v4_portmod_mask = -1;
-static gint ett_openflow_v4_portmod_advertise = -1;
-static gint ett_openflow_v4_table_features = -1;
-static gint ett_openflow_v4_table_feature_prop = -1;
-static gint ett_openflow_v4_table_feature_prop_instruction_id = -1;
-static gint ett_openflow_v4_table_feature_prop_action_id = -1;
-static gint ett_openflow_v4_table_feature_prop_oxm_id = -1;
-static gint ett_openflow_v4_multipart_request_flags = -1;
-static gint ett_openflow_v4_flow_stats = -1;
-static gint ett_openflow_v4_flow_stats_flags = -1;
-static gint ett_openflow_v4_table_stats = -1;
-static gint ett_openflow_v4_port_stats = -1;
-static gint ett_openflow_v4_queue_stats = -1;
-static gint ett_openflow_v4_bucket_counter = -1;
-static gint ett_openflow_v4_group_stats = -1;
-static gint ett_openflow_v4_group_desc = -1;
-static gint ett_openflow_v4_group_features_types = -1;
-static gint ett_openflow_v4_group_features_capabilities = -1;
-static gint ett_openflow_v4_group_features_actions_all = -1;
-static gint ett_openflow_v4_group_features_actions_select = -1;
-static gint ett_openflow_v4_group_features_actions_indirect = -1;
-static gint ett_openflow_v4_group_features_actions_ff = -1;
-static gint ett_openflow_v4_meter_band_stats = -1;
-static gint ett_openflow_v4_meter_stats = -1;
-static gint ett_openflow_v4_meter_config = -1;
-static gint ett_openflow_v4_meter_config_flags = -1;
-static gint ett_openflow_v4_meter_features_band_types = -1;
-static gint ett_openflow_v4_meter_features_capabilities = -1;
-static gint ett_openflow_v4_multipart_reply_flags = -1;
-static gint ett_openflow_v4_queue_prop = -1;
-static gint ett_openflow_v4_packet_queue = -1;
-static gint ett_openflow_v4_async_config_packet_in_mask_master = -1;
-static gint ett_openflow_v4_async_config_packet_in_mask_slave = -1;
-static gint ett_openflow_v4_async_config_port_status_mask_master = -1;
-static gint ett_openflow_v4_async_config_port_status_mask_slave = -1;
-static gint ett_openflow_v4_async_config_flow_removed_mask_master = -1;
-static gint ett_openflow_v4_async_config_flow_removed_mask_slave = -1;
-static gint ett_openflow_v4_metermod_flags = -1;
-
-static expert_field ei_openflow_v4_match_undecoded = EI_INIT;
-static expert_field ei_openflow_v4_oxm_undecoded = EI_INIT;
-static expert_field ei_openflow_v4_action_undecoded = EI_INIT;
-static expert_field ei_openflow_v4_instruction_undecoded = EI_INIT;
-static expert_field ei_openflow_v4_meter_band_undecoded = EI_INIT;
-static expert_field ei_openflow_v4_hello_element_undecoded = EI_INIT;
-static expert_field ei_openflow_v4_error_undecoded = EI_INIT;
-static expert_field ei_openflow_v4_experimenter_undecoded = EI_INIT;
-static expert_field ei_openflow_v4_table_feature_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v4_multipart_request_undecoded = EI_INIT;
-static expert_field ei_openflow_v4_multipart_reply_undecoded = EI_INIT;
-static expert_field ei_openflow_v4_queue_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v4_message_undecoded = EI_INIT;
+static int proto_openflow_v4;
+static int hf_openflow_v4_version;
+static int hf_openflow_v4_type;
+static int hf_openflow_v4_length;
+static int hf_openflow_v4_xid;
+static int hf_openflow_v4_oxm_class;
+static int hf_openflow_v4_oxm_field;
+static int hf_openflow_v4_oxm_field_basic;
+static int hf_openflow_v4_oxm_hm;
+static int hf_openflow_v4_oxm_length;
+static int hf_openflow_v4_oxm_experimenter_experimenter;
+static int hf_openflow_v4_oxm_experimenter_value;
+static int hf_openflow_v4_oxm_value;
+static int hf_openflow_v4_oxm_value_etheraddr;
+static int hf_openflow_v4_oxm_value_vlan_present;
+static int hf_openflow_v4_oxm_value_vlan_vid;
+static int hf_openflow_v4_oxm_value_ethertype;
+static int hf_openflow_v4_oxm_value_ipv4addr;
+static int hf_openflow_v4_oxm_value_ipv6addr;
+static int hf_openflow_v4_oxm_value_ipproto;
+static int hf_openflow_v4_oxm_value_uint16;
+static int hf_openflow_v4_oxm_value_uint24;
+static int hf_openflow_v4_oxm_value_uint32;
+static int hf_openflow_v4_oxm_mask;
+static int hf_openflow_v4_oxm_mask_etheraddr;
+static int hf_openflow_v4_oxm_mask_ipv4addr;
+static int hf_openflow_v4_oxm_mask_ipv6addr;
+static int hf_openflow_v4_oxm_mask_vlan;
+static int hf_openflow_v4_match_type;
+static int hf_openflow_v4_match_length;
+static int hf_openflow_v4_match_pad;
+static int hf_openflow_v4_action_type;
+static int hf_openflow_v4_action_length;
+static int hf_openflow_v4_action_experimenter_experimenter;
+static int hf_openflow_v4_action_output_port;
+static int hf_openflow_v4_action_output_max_len;
+static int hf_openflow_v4_action_output_pad;
+static int hf_openflow_v4_action_copy_ttl_out_pad;
+static int hf_openflow_v4_action_copy_ttl_in_pad;
+static int hf_openflow_v4_action_set_mpls_ttl_ttl;
+static int hf_openflow_v4_action_set_mpls_ttl_pad;
+static int hf_openflow_v4_action_dec_mpls_ttl_pad;
+static int hf_openflow_v4_action_push_vlan_ethertype;
+static int hf_openflow_v4_action_push_vlan_pad;
+static int hf_openflow_v4_action_pop_vlan_pad;
+static int hf_openflow_v4_action_push_mpls_ethertype;
+static int hf_openflow_v4_action_push_mpls_pad;
+static int hf_openflow_v4_action_pop_mpls_ethertype;
+static int hf_openflow_v4_action_pop_mpls_pad;
+static int hf_openflow_v4_action_set_queue_queue_id;
+static int hf_openflow_v4_action_group_group_id;
+static int hf_openflow_v4_action_set_nw_ttl_ttl;
+static int hf_openflow_v4_action_set_nw_ttl_pad;
+static int hf_openflow_v4_action_dec_nw_ttl_pad;
+static int hf_openflow_v4_action_set_field_pad;
+static int hf_openflow_v4_action_push_pbb_ethertype;
+static int hf_openflow_v4_action_push_pbb_pad;
+static int hf_openflow_v4_action_pop_pbb_pad;
+static int hf_openflow_v4_instruction_type;
+static int hf_openflow_v4_instruction_length;
+static int hf_openflow_v4_instruction_experimenter_experimenter;
+static int hf_openflow_v4_instruction_goto_table_table_id;
+static int hf_openflow_v4_instruction_goto_table_pad;
+static int hf_openflow_v4_instruction_write_metadata_pad;
+static int hf_openflow_v4_instruction_write_metadata_value;
+static int hf_openflow_v4_instruction_write_metadata_mask;
+static int hf_openflow_v4_instruction_actions_pad;
+static int hf_openflow_v4_instruction_meter_meter_id;
+static int hf_openflow_v4_port_port_no;
+static int hf_openflow_v4_port_pad;
+static int hf_openflow_v4_port_hw_addr;
+static int hf_openflow_v4_port_pad2;
+static int hf_openflow_v4_port_name;
+static int hf_openflow_v4_port_config;
+static int hf_openflow_v4_port_config_port_down;
+static int hf_openflow_v4_port_config_no_recv;
+static int hf_openflow_v4_port_config_no_fwd;
+static int hf_openflow_v4_port_config_no_packet_in;
+static int hf_openflow_v4_port_state;
+static int hf_openflow_v4_port_state_link_down;
+static int hf_openflow_v4_port_state_blocked;
+static int hf_openflow_v4_port_state_live;
+static int hf_openflow_v4_port_current;
+static int hf_openflow_v4_port_current_10mb_hd;
+static int hf_openflow_v4_port_current_10mb_fd;
+static int hf_openflow_v4_port_current_100mb_hd;
+static int hf_openflow_v4_port_current_100mb_fd;
+static int hf_openflow_v4_port_current_1gb_hd;
+static int hf_openflow_v4_port_current_1gb_fd;
+static int hf_openflow_v4_port_current_10gb_fd;
+static int hf_openflow_v4_port_current_40gb_fd;
+static int hf_openflow_v4_port_current_100gb_fd;
+static int hf_openflow_v4_port_current_1tb_fd;
+static int hf_openflow_v4_port_current_other;
+static int hf_openflow_v4_port_current_copper;
+static int hf_openflow_v4_port_current_fiber;
+static int hf_openflow_v4_port_current_autoneg;
+static int hf_openflow_v4_port_current_pause;
+static int hf_openflow_v4_port_current_pause_asym;
+static int hf_openflow_v4_port_advertised;
+static int hf_openflow_v4_port_advertised_10mb_hd;
+static int hf_openflow_v4_port_advertised_10mb_fd;
+static int hf_openflow_v4_port_advertised_100mb_hd;
+static int hf_openflow_v4_port_advertised_100mb_fd;
+static int hf_openflow_v4_port_advertised_1gb_hd;
+static int hf_openflow_v4_port_advertised_1gb_fd;
+static int hf_openflow_v4_port_advertised_10gb_fd;
+static int hf_openflow_v4_port_advertised_40gb_fd;
+static int hf_openflow_v4_port_advertised_100gb_fd;
+static int hf_openflow_v4_port_advertised_1tb_fd;
+static int hf_openflow_v4_port_advertised_other;
+static int hf_openflow_v4_port_advertised_copper;
+static int hf_openflow_v4_port_advertised_fiber;
+static int hf_openflow_v4_port_advertised_autoneg;
+static int hf_openflow_v4_port_advertised_pause;
+static int hf_openflow_v4_port_advertised_pause_asym;
+static int hf_openflow_v4_port_supported;
+static int hf_openflow_v4_port_supported_10mb_hd;
+static int hf_openflow_v4_port_supported_10mb_fd;
+static int hf_openflow_v4_port_supported_100mb_hd;
+static int hf_openflow_v4_port_supported_100mb_fd;
+static int hf_openflow_v4_port_supported_1gb_hd;
+static int hf_openflow_v4_port_supported_1gb_fd;
+static int hf_openflow_v4_port_supported_10gb_fd;
+static int hf_openflow_v4_port_supported_40gb_fd;
+static int hf_openflow_v4_port_supported_100gb_fd;
+static int hf_openflow_v4_port_supported_1tb_fd;
+static int hf_openflow_v4_port_supported_other;
+static int hf_openflow_v4_port_supported_copper;
+static int hf_openflow_v4_port_supported_fiber;
+static int hf_openflow_v4_port_supported_autoneg;
+static int hf_openflow_v4_port_supported_pause;
+static int hf_openflow_v4_port_supported_pause_asym;
+static int hf_openflow_v4_port_peer;
+static int hf_openflow_v4_port_peer_10mb_hd;
+static int hf_openflow_v4_port_peer_10mb_fd;
+static int hf_openflow_v4_port_peer_100mb_hd;
+static int hf_openflow_v4_port_peer_100mb_fd;
+static int hf_openflow_v4_port_peer_1gb_hd;
+static int hf_openflow_v4_port_peer_1gb_fd;
+static int hf_openflow_v4_port_peer_10gb_fd;
+static int hf_openflow_v4_port_peer_40gb_fd;
+static int hf_openflow_v4_port_peer_100gb_fd;
+static int hf_openflow_v4_port_peer_1tb_fd;
+static int hf_openflow_v4_port_peer_other;
+static int hf_openflow_v4_port_peer_copper;
+static int hf_openflow_v4_port_peer_fiber;
+static int hf_openflow_v4_port_peer_autoneg;
+static int hf_openflow_v4_port_peer_pause;
+static int hf_openflow_v4_port_peer_pause_asym;
+static int hf_openflow_v4_port_curr_speed;
+static int hf_openflow_v4_port_max_speed;
+static int hf_openflow_v4_meter_band_type;
+static int hf_openflow_v4_meter_band_len;
+static int hf_openflow_v4_meter_band_rate;
+static int hf_openflow_v4_meter_band_burst_size;
+static int hf_openflow_v4_meter_band_drop_pad;
+static int hf_openflow_v4_meter_band_dscp_remark_prec_level;
+static int hf_openflow_v4_meter_band_dscp_remark_pad;
+static int hf_openflow_v4_meter_band_experimenter_experimenter;
+static int hf_openflow_v4_hello_element_type;
+static int hf_openflow_v4_hello_element_length;
+static int hf_openflow_v4_hello_element_version_bitmap;
+static int hf_openflow_v4_hello_element_pad;
+static int hf_openflow_v4_error_type;
+static int hf_openflow_v4_error_hello_failed_code;
+static int hf_openflow_v4_error_bad_request_code;
+static int hf_openflow_v4_error_bad_action_code;
+static int hf_openflow_v4_error_bad_instruction_code;
+static int hf_openflow_v4_error_bad_match_code;
+static int hf_openflow_v4_error_flow_mod_failed_code;
+static int hf_openflow_v4_error_group_mod_failed_code;
+static int hf_openflow_v4_error_port_mod_failed_code;
+static int hf_openflow_v4_error_table_mod_failed_code;
+static int hf_openflow_v4_error_queue_op_failed_code;
+static int hf_openflow_v4_error_switch_config_failed_code;
+static int hf_openflow_v4_error_role_request_failed_code;
+static int hf_openflow_v4_error_meter_mod_failed_code;
+static int hf_openflow_v4_error_table_features_failed_code;
+static int hf_openflow_v4_error_code;
+static int hf_openflow_v4_error_data_text;
+static int hf_openflow_v4_error_data_body;
+static int hf_openflow_v4_error_experimenter;
+static int hf_openflow_v4_echo_data;
+static int hf_openflow_v4_experimenter_experimenter;
+static int hf_openflow_v4_experimenter_exp_type;
+static int hf_openflow_v4_switch_features_datapath_id;
+static int hf_openflow_v4_switch_features_n_buffers;
+static int hf_openflow_v4_switch_features_n_tables;
+static int hf_openflow_v4_switch_features_auxiliary_id;
+static int hf_openflow_v4_switch_features_pad;
+static int hf_openflow_v4_switch_features_capabilities;
+static int hf_openflow_v4_switch_features_capabilities_flow_stats;
+static int hf_openflow_v4_switch_features_capabilities_table_stats;
+static int hf_openflow_v4_switch_features_capabilities_port_stats;
+static int hf_openflow_v4_switch_features_capabilities_group_stats;
+static int hf_openflow_v4_switch_features_capabilities_ip_reasm;
+static int hf_openflow_v4_switch_features_capabilities_queue_stats;
+static int hf_openflow_v4_switch_features_capabilities_port_blocked;
+static int hf_openflow_v4_switch_features_reserved;
+static int hf_openflow_v4_switch_config_flags;
+static int hf_openflow_v4_switch_config_flags_fragments;
+static int hf_openflow_v4_switch_config_miss_send_len;
+static int hf_openflow_v4_packet_in_buffer_id;
+static int hf_openflow_v4_packet_in_total_len;
+static int hf_openflow_v4_packet_in_reason;
+static int hf_openflow_v4_packet_in_table_id;
+static int hf_openflow_v4_packet_in_cookie;
+static int hf_openflow_v4_packet_in_pad;
+static int hf_openflow_v4_flow_removed_cookie;
+static int hf_openflow_v4_flow_removed_priority;
+static int hf_openflow_v4_flow_removed_reason;
+static int hf_openflow_v4_flow_removed_table_id;
+static int hf_openflow_v4_flow_removed_duration_sec;
+static int hf_openflow_v4_flow_removed_duration_nsec;
+static int hf_openflow_v4_flow_removed_idle_timeout;
+static int hf_openflow_v4_flow_removed_hard_timeout;
+static int hf_openflow_v4_flow_removed_packet_count;
+static int hf_openflow_v4_flow_removed_byte_count;
+static int hf_openflow_v4_port_status_reason;
+static int hf_openflow_v4_port_status_pad;
+static int hf_openflow_v4_packet_out_buffer_id;
+static int hf_openflow_v4_packet_out_in_port;
+static int hf_openflow_v4_packet_out_acts_len;
+static int hf_openflow_v4_packet_out_pad;
+static int hf_openflow_v4_flowmod_cookie;
+static int hf_openflow_v4_flowmod_cookie_mask;
+static int hf_openflow_v4_flowmod_table_id;
+static int hf_openflow_v4_flowmod_command;
+static int hf_openflow_v4_flowmod_idle_timeout;
+static int hf_openflow_v4_flowmod_hard_timeout;
+static int hf_openflow_v4_flowmod_priority;
+static int hf_openflow_v4_flowmod_buffer_id;
+static int hf_openflow_v4_flowmod_out_port;
+static int hf_openflow_v4_flowmod_out_group;
+static int hf_openflow_v4_flowmod_flags;
+static int hf_openflow_v4_flowmod_flags_send_flow_rem;
+static int hf_openflow_v4_flowmod_flags_check_overlap;
+static int hf_openflow_v4_flowmod_flags_reset_counts;
+static int hf_openflow_v4_flowmod_flags_no_packet_counts;
+static int hf_openflow_v4_flowmod_flags_no_byte_counts;
+static int hf_openflow_v4_flowmod_pad;
+static int hf_openflow_v4_bucket_length;
+static int hf_openflow_v4_bucket_weight;
+static int hf_openflow_v4_bucket_watch_port;
+static int hf_openflow_v4_bucket_watch_group;
+static int hf_openflow_v4_bucket_pad;
+static int hf_openflow_v4_groupmod_command;
+static int hf_openflow_v4_groupmod_type;
+static int hf_openflow_v4_groupmod_pad;
+static int hf_openflow_v4_groupmod_group_id;
+static int hf_openflow_v4_portmod_port_no;
+static int hf_openflow_v4_portmod_pad;
+static int hf_openflow_v4_portmod_hw_addr;
+static int hf_openflow_v4_portmod_pad2;
+static int hf_openflow_v4_portmod_config;
+static int hf_openflow_v4_portmod_config_port_down;
+static int hf_openflow_v4_portmod_config_no_recv;
+static int hf_openflow_v4_portmod_config_no_fwd;
+static int hf_openflow_v4_portmod_config_no_packet_in;
+static int hf_openflow_v4_portmod_mask;
+static int hf_openflow_v4_portmod_mask_port_down;
+static int hf_openflow_v4_portmod_mask_no_recv;
+static int hf_openflow_v4_portmod_mask_no_fwd;
+static int hf_openflow_v4_portmod_mask_no_packet_in;
+static int hf_openflow_v4_portmod_advertise;
+static int hf_openflow_v4_portmod_advertise_10mb_hd;
+static int hf_openflow_v4_portmod_advertise_10mb_fd;
+static int hf_openflow_v4_portmod_advertise_100mb_hd;
+static int hf_openflow_v4_portmod_advertise_100mb_fd;
+static int hf_openflow_v4_portmod_advertise_1gb_hd;
+static int hf_openflow_v4_portmod_advertise_1gb_fd;
+static int hf_openflow_v4_portmod_advertise_10gb_fd;
+static int hf_openflow_v4_portmod_advertise_40gb_fd;
+static int hf_openflow_v4_portmod_advertise_100gb_fd;
+static int hf_openflow_v4_portmod_advertise_1tb_fd;
+static int hf_openflow_v4_portmod_advertise_other;
+static int hf_openflow_v4_portmod_advertise_copper;
+static int hf_openflow_v4_portmod_advertise_fiber;
+static int hf_openflow_v4_portmod_advertise_autoneg;
+static int hf_openflow_v4_portmod_advertise_pause;
+static int hf_openflow_v4_portmod_advertise_pause_asym;
+static int hf_openflow_v4_portmod_pad3;
+static int hf_openflow_v4_tablemod_table_id;
+static int hf_openflow_v4_tablemod_pad;
+static int hf_openflow_v4_tablemod_config;
+static int hf_openflow_v4_flow_stats_request_table_id;
+static int hf_openflow_v4_flow_stats_request_pad;
+static int hf_openflow_v4_flow_stats_request_out_port;
+static int hf_openflow_v4_flow_stats_request_out_group;
+static int hf_openflow_v4_flow_stats_request_pad2;
+static int hf_openflow_v4_flow_stats_request_cookie;
+static int hf_openflow_v4_flow_stats_request_cookie_mask;
+static int hf_openflow_v4_aggregate_stats_request_table_id;
+static int hf_openflow_v4_aggregate_stats_request_pad;
+static int hf_openflow_v4_aggregate_stats_request_out_port;
+static int hf_openflow_v4_aggregate_stats_request_out_group;
+static int hf_openflow_v4_aggregate_stats_request_pad2;
+static int hf_openflow_v4_aggregate_stats_request_cookie;
+static int hf_openflow_v4_aggregate_stats_request_cookie_mask;
+static int hf_openflow_v4_table_feature_prop_type;
+static int hf_openflow_v4_table_feature_prop_length;
+static int hf_openflow_v4_table_feature_prop_next_tables_next_table_id;
+static int hf_openflow_v4_table_feature_prop_experimenter_experimenter;
+static int hf_openflow_v4_table_feature_prop_experimenter_exp_type;
+static int hf_openflow_v4_table_feature_prop_pad;
+static int hf_openflow_v4_table_features_length;
+static int hf_openflow_v4_table_features_table_id;
+static int hf_openflow_v4_table_features_pad;
+static int hf_openflow_v4_table_features_name;
+static int hf_openflow_v4_table_features_metadata_match;
+static int hf_openflow_v4_table_features_metadata_write;
+static int hf_openflow_v4_table_features_config;
+static int hf_openflow_v4_table_features_max_entries;
+static int hf_openflow_v4_port_stats_request_port_no;
+static int hf_openflow_v4_port_stats_request_pad;
+static int hf_openflow_v4_queue_stats_request_port_no;
+static int hf_openflow_v4_queue_stats_request_queue_id;
+static int hf_openflow_v4_group_stats_request_group_id;
+static int hf_openflow_v4_group_stats_request_pad;
+static int hf_openflow_v4_meter_stats_request_meter_id;
+static int hf_openflow_v4_meter_stats_request_pad;
+static int hf_openflow_v4_meter_config_request_meter_id;
+static int hf_openflow_v4_meter_config_request_pad;
+static int hf_openflow_v4_multipart_request_type;
+static int hf_openflow_v4_multipart_request_flags;
+static int hf_openflow_v4_multipart_request_flags_more;
+static int hf_openflow_v4_multipart_request_pad;
+static int hf_openflow_v4_multipart_request_experimenter_experimenter;
+static int hf_openflow_v4_multipart_request_experimenter_exp_type;
+static int hf_openflow_v4_switch_description_mfr_desc;
+static int hf_openflow_v4_switch_description_hw_desc;
+static int hf_openflow_v4_switch_description_sw_desc;
+static int hf_openflow_v4_switch_description_serial_num;
+static int hf_openflow_v4_switch_description_dp_desc;
+static int hf_openflow_v4_flow_stats_length;
+static int hf_openflow_v4_flow_stats_table_id;
+static int hf_openflow_v4_flow_stats_pad;
+static int hf_openflow_v4_flow_stats_duration_sec;
+static int hf_openflow_v4_flow_stats_duration_nsec;
+static int hf_openflow_v4_flow_stats_priority;
+static int hf_openflow_v4_flow_stats_idle_timeout;
+static int hf_openflow_v4_flow_stats_hard_timeout;
+static int hf_openflow_v4_flow_stats_flags;
+static int hf_openflow_v4_flow_stats_flags_send_flow_rem;
+static int hf_openflow_v4_flow_stats_flags_check_overlap;
+static int hf_openflow_v4_flow_stats_flags_reset_counts;
+static int hf_openflow_v4_flow_stats_flags_no_packet_counts;
+static int hf_openflow_v4_flow_stats_flags_no_byte_counts;
+static int hf_openflow_v4_flow_stats_pad2;
+static int hf_openflow_v4_flow_stats_cookie;
+static int hf_openflow_v4_flow_stats_packet_count;
+static int hf_openflow_v4_flow_stats_byte_count;
+static int hf_openflow_v4_aggregate_stats_packet_count;
+static int hf_openflow_v4_aggregate_stats_byte_count;
+static int hf_openflow_v4_aggregate_stats_flow_count;
+static int hf_openflow_v4_aggregate_stats_pad;
+static int hf_openflow_v4_table_stats_table_id;
+static int hf_openflow_v4_table_stats_pad;
+static int hf_openflow_v4_table_stats_active_count;
+static int hf_openflow_v4_table_stats_lookup_count;
+static int hf_openflow_v4_table_stats_match_count;
+static int hf_openflow_v4_port_stats_port_no;
+static int hf_openflow_v4_port_stats_pad;
+static int hf_openflow_v4_port_stats_rx_packets;
+static int hf_openflow_v4_port_stats_tx_packets;
+static int hf_openflow_v4_port_stats_rx_bytes;
+static int hf_openflow_v4_port_stats_tx_bytes;
+static int hf_openflow_v4_port_stats_rx_dropped;
+static int hf_openflow_v4_port_stats_tx_dropped;
+static int hf_openflow_v4_port_stats_rx_errors;
+static int hf_openflow_v4_port_stats_tx_errors;
+static int hf_openflow_v4_port_stats_rx_frame_error;
+static int hf_openflow_v4_port_stats_rx_over_error;
+static int hf_openflow_v4_port_stats_rx_crc_error;
+static int hf_openflow_v4_port_stats_collisions;
+static int hf_openflow_v4_port_stats_duration_sec;
+static int hf_openflow_v4_port_stats_duration_nsec;
+static int hf_openflow_v4_queue_stats_port_no;
+static int hf_openflow_v4_queue_stats_queue_id;
+static int hf_openflow_v4_queue_stats_tx_bytes;
+static int hf_openflow_v4_queue_stats_tx_packets;
+static int hf_openflow_v4_queue_stats_tx_errors;
+static int hf_openflow_v4_queue_stats_duration_sec;
+static int hf_openflow_v4_queue_stats_duration_nsec;
+static int hf_openflow_v4_bucket_counter_packet_count;
+static int hf_openflow_v4_bucket_counter_byte_count;
+static int hf_openflow_v4_group_stats_length;
+static int hf_openflow_v4_group_stats_pad;
+static int hf_openflow_v4_group_stats_group_id;
+static int hf_openflow_v4_group_stats_ref_count;
+static int hf_openflow_v4_group_stats_pad2;
+static int hf_openflow_v4_group_stats_packet_count;
+static int hf_openflow_v4_group_stats_byte_count;
+static int hf_openflow_v4_group_desc_length;
+static int hf_openflow_v4_group_desc_type;
+static int hf_openflow_v4_group_desc_pad;
+static int hf_openflow_v4_group_desc_group_id;
+static int hf_openflow_v4_group_features_types;
+static int hf_openflow_v4_group_features_types_all;
+static int hf_openflow_v4_group_features_types_select;
+static int hf_openflow_v4_group_features_types_indirect;
+static int hf_openflow_v4_group_features_types_ff;
+static int hf_openflow_v4_group_features_capabilities;
+static int hf_openflow_v4_group_features_capabilities_select_weight;
+static int hf_openflow_v4_group_features_capabilities_select_liveness;
+static int hf_openflow_v4_group_features_capabilities_chaining;
+static int hf_openflow_v4_group_features_capabilities_chaining_checks;
+static int hf_openflow_v4_group_features_max_groups_all;
+static int hf_openflow_v4_group_features_max_groups_select;
+static int hf_openflow_v4_group_features_max_groups_indirect;
+static int hf_openflow_v4_group_features_max_groups_ff;
+static int hf_openflow_v4_group_features_actions_all;
+static int hf_openflow_v4_group_features_actions_all_output;
+static int hf_openflow_v4_group_features_actions_all_copy_ttl_out;
+static int hf_openflow_v4_group_features_actions_all_copy_ttl_in;
+static int hf_openflow_v4_group_features_actions_all_set_mpls_ttl;
+static int hf_openflow_v4_group_features_actions_all_dec_mpls_ttl;
+static int hf_openflow_v4_group_features_actions_all_push_vlan;
+static int hf_openflow_v4_group_features_actions_all_pop_vlan;
+static int hf_openflow_v4_group_features_actions_all_push_mpls;
+static int hf_openflow_v4_group_features_actions_all_pop_mpls;
+static int hf_openflow_v4_group_features_actions_all_set_queue;
+static int hf_openflow_v4_group_features_actions_all_group;
+static int hf_openflow_v4_group_features_actions_all_set_nw_ttl;
+static int hf_openflow_v4_group_features_actions_all_dec_nw_ttl;
+static int hf_openflow_v4_group_features_actions_all_set_field;
+static int hf_openflow_v4_group_features_actions_all_push_pbb;
+static int hf_openflow_v4_group_features_actions_all_pop_pbb;
+static int hf_openflow_v4_group_features_actions_select;
+static int hf_openflow_v4_group_features_actions_select_output;
+static int hf_openflow_v4_group_features_actions_select_copy_ttl_out;
+static int hf_openflow_v4_group_features_actions_select_copy_ttl_in;
+static int hf_openflow_v4_group_features_actions_select_set_mpls_ttl;
+static int hf_openflow_v4_group_features_actions_select_dec_mpls_ttl;
+static int hf_openflow_v4_group_features_actions_select_push_vlan;
+static int hf_openflow_v4_group_features_actions_select_pop_vlan;
+static int hf_openflow_v4_group_features_actions_select_push_mpls;
+static int hf_openflow_v4_group_features_actions_select_pop_mpls;
+static int hf_openflow_v4_group_features_actions_select_set_queue;
+static int hf_openflow_v4_group_features_actions_select_group;
+static int hf_openflow_v4_group_features_actions_select_set_nw_ttl;
+static int hf_openflow_v4_group_features_actions_select_dec_nw_ttl;
+static int hf_openflow_v4_group_features_actions_select_set_field;
+static int hf_openflow_v4_group_features_actions_select_push_pbb;
+static int hf_openflow_v4_group_features_actions_select_pop_pbb;
+static int hf_openflow_v4_group_features_actions_indirect;
+static int hf_openflow_v4_group_features_actions_indirect_output;
+static int hf_openflow_v4_group_features_actions_indirect_copy_ttl_out;
+static int hf_openflow_v4_group_features_actions_indirect_copy_ttl_in;
+static int hf_openflow_v4_group_features_actions_indirect_set_mpls_ttl;
+static int hf_openflow_v4_group_features_actions_indirect_dec_mpls_ttl;
+static int hf_openflow_v4_group_features_actions_indirect_push_vlan;
+static int hf_openflow_v4_group_features_actions_indirect_pop_vlan;
+static int hf_openflow_v4_group_features_actions_indirect_push_mpls;
+static int hf_openflow_v4_group_features_actions_indirect_pop_mpls;
+static int hf_openflow_v4_group_features_actions_indirect_set_queue;
+static int hf_openflow_v4_group_features_actions_indirect_group;
+static int hf_openflow_v4_group_features_actions_indirect_set_nw_ttl;
+static int hf_openflow_v4_group_features_actions_indirect_dec_nw_ttl;
+static int hf_openflow_v4_group_features_actions_indirect_set_field;
+static int hf_openflow_v4_group_features_actions_indirect_push_pbb;
+static int hf_openflow_v4_group_features_actions_indirect_pop_pbb;
+static int hf_openflow_v4_group_features_actions_ff;
+static int hf_openflow_v4_group_features_actions_ff_output;
+static int hf_openflow_v4_group_features_actions_ff_copy_ttl_out;
+static int hf_openflow_v4_group_features_actions_ff_copy_ttl_in;
+static int hf_openflow_v4_group_features_actions_ff_set_mpls_ttl;
+static int hf_openflow_v4_group_features_actions_ff_dec_mpls_ttl;
+static int hf_openflow_v4_group_features_actions_ff_push_vlan;
+static int hf_openflow_v4_group_features_actions_ff_pop_vlan;
+static int hf_openflow_v4_group_features_actions_ff_push_mpls;
+static int hf_openflow_v4_group_features_actions_ff_pop_mpls;
+static int hf_openflow_v4_group_features_actions_ff_set_queue;
+static int hf_openflow_v4_group_features_actions_ff_group;
+static int hf_openflow_v4_group_features_actions_ff_set_nw_ttl;
+static int hf_openflow_v4_group_features_actions_ff_dec_nw_ttl;
+static int hf_openflow_v4_group_features_actions_ff_set_field;
+static int hf_openflow_v4_group_features_actions_ff_push_pbb;
+static int hf_openflow_v4_group_features_actions_ff_pop_pbb;
+static int hf_openflow_v4_meter_band_stats_packet_band_count;
+static int hf_openflow_v4_meter_band_stats_byte_band_count;
+static int hf_openflow_v4_meter_stats_meter_id;
+static int hf_openflow_v4_meter_stats_len;
+static int hf_openflow_v4_meter_stats_pad;
+static int hf_openflow_v4_meter_stats_flow_count;
+static int hf_openflow_v4_meter_stats_packet_in_count;
+static int hf_openflow_v4_meter_stats_byte_in_count;
+static int hf_openflow_v4_meter_stats_duration_sec;
+static int hf_openflow_v4_meter_stats_duration_nsec;
+static int hf_openflow_v4_meter_config_len;
+static int hf_openflow_v4_meter_config_flags;
+static int hf_openflow_v4_meter_config_flags_kbps;
+static int hf_openflow_v4_meter_config_flags_pktps;
+static int hf_openflow_v4_meter_config_flags_burst;
+static int hf_openflow_v4_meter_config_flags_stats;
+static int hf_openflow_v4_meter_config_meter_id;
+static int hf_openflow_v4_meter_features_max_meter;
+static int hf_openflow_v4_meter_features_band_types;
+static int hf_openflow_v4_meter_features_band_types_drop;
+static int hf_openflow_v4_meter_features_band_types_dscp_remark;
+static int hf_openflow_v4_meter_features_capabilities;
+static int hf_openflow_v4_meter_features_capabilities_kbps;
+static int hf_openflow_v4_meter_features_capabilities_pktps;
+static int hf_openflow_v4_meter_features_capabilities_burst;
+static int hf_openflow_v4_meter_features_capabilities_stats;
+static int hf_openflow_v4_meter_features_max_bands;
+static int hf_openflow_v4_meter_features_max_color;
+static int hf_openflow_v4_meter_features_pad;
+static int hf_openflow_v4_multipart_reply_type;
+static int hf_openflow_v4_multipart_reply_flags;
+static int hf_openflow_v4_multipart_reply_flags_more;
+static int hf_openflow_v4_multipart_reply_pad;
+static int hf_openflow_v4_multipart_reply_experimenter_experimenter;
+static int hf_openflow_v4_multipart_reply_experimenter_exp_type;
+static int hf_openflow_v4_queue_get_config_request_port;
+static int hf_openflow_v4_queue_get_config_request_pad;
+static int hf_openflow_v4_queue_prop_property;
+static int hf_openflow_v4_queue_prop_len;
+static int hf_openflow_v4_queue_prop_pad;
+static int hf_openflow_v4_queue_prop_min_rate_rate;
+static int hf_openflow_v4_queue_prop_min_rate_pad;
+static int hf_openflow_v4_queue_prop_max_rate_rate;
+static int hf_openflow_v4_queue_prop_max_rate_pad;
+static int hf_openflow_v4_queue_prop_experimenter_experimenter;
+static int hf_openflow_v4_queue_prop_experimenter_pad;
+static int hf_openflow_v4_packet_queue_queue_id;
+static int hf_openflow_v4_packet_queue_port;
+static int hf_openflow_v4_packet_queue_len;
+static int hf_openflow_v4_packet_queue_pad;
+static int hf_openflow_v4_queue_get_config_reply_port;
+static int hf_openflow_v4_queue_get_config_reply_pad;
+static int hf_openflow_v4_role_request_role;
+static int hf_openflow_v4_role_request_pad;
+static int hf_openflow_v4_role_request_generation_id;
+static int hf_openflow_v4_role_reply_role;
+static int hf_openflow_v4_role_reply_pad;
+static int hf_openflow_v4_role_reply_generation_id;
+static int hf_openflow_v4_async_config_packet_in_mask_master;
+static int hf_openflow_v4_async_config_packet_in_mask_master_no_match;
+static int hf_openflow_v4_async_config_packet_in_mask_master_action;
+static int hf_openflow_v4_async_config_packet_in_mask_master_invalid_ttl;
+static int hf_openflow_v4_async_config_packet_in_mask_slave;
+static int hf_openflow_v4_async_config_packet_in_mask_slave_no_match;
+static int hf_openflow_v4_async_config_packet_in_mask_slave_action;
+static int hf_openflow_v4_async_config_packet_in_mask_slave_invalid_ttl;
+static int hf_openflow_v4_async_config_port_status_mask_master;
+static int hf_openflow_v4_async_config_port_status_mask_master_add;
+static int hf_openflow_v4_async_config_port_status_mask_master_delete;
+static int hf_openflow_v4_async_config_port_status_mask_master_modify;
+static int hf_openflow_v4_async_config_port_status_mask_slave;
+static int hf_openflow_v4_async_config_port_status_mask_slave_add;
+static int hf_openflow_v4_async_config_port_status_mask_slave_delete;
+static int hf_openflow_v4_async_config_port_status_mask_slave_modify;
+static int hf_openflow_v4_async_config_flow_removed_mask_master;
+static int hf_openflow_v4_async_config_flow_removed_mask_master_idle_timeout;
+static int hf_openflow_v4_async_config_flow_removed_mask_master_hard_timeout;
+static int hf_openflow_v4_async_config_flow_removed_mask_master_delete;
+static int hf_openflow_v4_async_config_flow_removed_mask_master_group_delete;
+static int hf_openflow_v4_async_config_flow_removed_mask_slave;
+static int hf_openflow_v4_async_config_flow_removed_mask_slave_idle_timeout;
+static int hf_openflow_v4_async_config_flow_removed_mask_slave_hard_timeout;
+static int hf_openflow_v4_async_config_flow_removed_mask_slave_delete;
+static int hf_openflow_v4_async_config_flow_removed_mask_slave_group_delete;
+static int hf_openflow_v4_metermod_command;
+static int hf_openflow_v4_metermod_flags;
+static int hf_openflow_v4_metermod_flags_kbps;
+static int hf_openflow_v4_metermod_flags_pktps;
+static int hf_openflow_v4_metermod_flags_burst;
+static int hf_openflow_v4_metermod_flags_stats;
+static int hf_openflow_v4_metermod_meter_id;
+
+static gint ett_openflow_v4;
+static gint ett_openflow_v4_flowmod_flags;
+static gint ett_openflow_v4_bucket;
+static gint ett_openflow_v4_oxm;
+static gint ett_openflow_v4_match;
+static gint ett_openflow_v4_action;
+static gint ett_openflow_v4_instruction;
+static gint ett_openflow_v4_port;
+static gint ett_openflow_v4_port_config;
+static gint ett_openflow_v4_port_state;
+static gint ett_openflow_v4_port_current;
+static gint ett_openflow_v4_port_advertised;
+static gint ett_openflow_v4_port_supported;
+static gint ett_openflow_v4_port_peer;
+static gint ett_openflow_v4_meter_band;
+static gint ett_openflow_v4_hello_element;
+static gint ett_openflow_v4_error_data;
+static gint ett_openflow_v4_switch_features_capabilities;
+static gint ett_openflow_v4_switch_config_flags;
+static gint ett_openflow_v4_packet_in_data;
+static gint ett_openflow_v4_packet_out_data;
+static gint ett_openflow_v4_portmod_config;
+static gint ett_openflow_v4_portmod_mask;
+static gint ett_openflow_v4_portmod_advertise;
+static gint ett_openflow_v4_table_features;
+static gint ett_openflow_v4_table_feature_prop;
+static gint ett_openflow_v4_table_feature_prop_instruction_id;
+static gint ett_openflow_v4_table_feature_prop_action_id;
+static gint ett_openflow_v4_table_feature_prop_oxm_id;
+static gint ett_openflow_v4_multipart_request_flags;
+static gint ett_openflow_v4_flow_stats;
+static gint ett_openflow_v4_flow_stats_flags;
+static gint ett_openflow_v4_table_stats;
+static gint ett_openflow_v4_port_stats;
+static gint ett_openflow_v4_queue_stats;
+static gint ett_openflow_v4_bucket_counter;
+static gint ett_openflow_v4_group_stats;
+static gint ett_openflow_v4_group_desc;
+static gint ett_openflow_v4_group_features_types;
+static gint ett_openflow_v4_group_features_capabilities;
+static gint ett_openflow_v4_group_features_actions_all;
+static gint ett_openflow_v4_group_features_actions_select;
+static gint ett_openflow_v4_group_features_actions_indirect;
+static gint ett_openflow_v4_group_features_actions_ff;
+static gint ett_openflow_v4_meter_band_stats;
+static gint ett_openflow_v4_meter_stats;
+static gint ett_openflow_v4_meter_config;
+static gint ett_openflow_v4_meter_config_flags;
+static gint ett_openflow_v4_meter_features_band_types;
+static gint ett_openflow_v4_meter_features_capabilities;
+static gint ett_openflow_v4_multipart_reply_flags;
+static gint ett_openflow_v4_queue_prop;
+static gint ett_openflow_v4_packet_queue;
+static gint ett_openflow_v4_async_config_packet_in_mask_master;
+static gint ett_openflow_v4_async_config_packet_in_mask_slave;
+static gint ett_openflow_v4_async_config_port_status_mask_master;
+static gint ett_openflow_v4_async_config_port_status_mask_slave;
+static gint ett_openflow_v4_async_config_flow_removed_mask_master;
+static gint ett_openflow_v4_async_config_flow_removed_mask_slave;
+static gint ett_openflow_v4_metermod_flags;
+
+static expert_field ei_openflow_v4_match_undecoded;
+static expert_field ei_openflow_v4_oxm_undecoded;
+static expert_field ei_openflow_v4_action_undecoded;
+static expert_field ei_openflow_v4_instruction_undecoded;
+static expert_field ei_openflow_v4_meter_band_undecoded;
+static expert_field ei_openflow_v4_hello_element_undecoded;
+static expert_field ei_openflow_v4_error_undecoded;
+static expert_field ei_openflow_v4_experimenter_undecoded;
+static expert_field ei_openflow_v4_table_feature_prop_undecoded;
+static expert_field ei_openflow_v4_multipart_request_undecoded;
+static expert_field ei_openflow_v4_multipart_reply_undecoded;
+static expert_field ei_openflow_v4_queue_prop_undecoded;
+static expert_field ei_openflow_v4_message_undecoded;
 
 static const value_string openflow_v4_version_values[] = {
     { 0x04, "1.3" },
diff --git a/epan/dissectors/packet-openflow_v5.c b/epan/dissectors/packet-openflow_v5.c
index ffe2f56bcb..7ace5533db 100644
--- a/epan/dissectors/packet-openflow_v5.c
+++ b/epan/dissectors/packet-openflow_v5.c
@@ -25,821 +25,821 @@ static int dissect_openflow_message_v5(tvbuff_t *, packet_info *, proto_tree *,
 
 static dissector_handle_t eth_withoutfcs_handle;
 
-static int proto_openflow_v5 = -1;
-static int hf_openflow_v5_version = -1;
-static int hf_openflow_v5_type = -1;
-static int hf_openflow_v5_length = -1;
-static int hf_openflow_v5_xid = -1;
-static int hf_openflow_v5_oxm_class = -1;
-static int hf_openflow_v5_oxm_field = -1;
-static int hf_openflow_v5_oxm_field_basic = -1;
-static int hf_openflow_v5_oxm_hm = -1;
-static int hf_openflow_v5_oxm_length = -1;
-static int hf_openflow_v5_oxm_experimenter_experimenter = -1;
-static int hf_openflow_v5_oxm_value = -1;
-static int hf_openflow_v5_oxm_value_etheraddr = -1;
-static int hf_openflow_v5_oxm_value_vlan_present = -1;
-static int hf_openflow_v5_oxm_value_vlan_vid = -1;
-static int hf_openflow_v5_oxm_value_ethertype = -1;
-static int hf_openflow_v5_oxm_value_ipv4addr = -1;
-static int hf_openflow_v5_oxm_value_ipv6addr = -1;
-static int hf_openflow_v5_oxm_value_ipproto = -1;
-static int hf_openflow_v5_oxm_value_uint16 = -1;
-static int hf_openflow_v5_oxm_value_uint24 = -1;
-static int hf_openflow_v5_oxm_value_uint32 = -1;
-static int hf_openflow_v5_oxm_mask = -1;
-static int hf_openflow_v5_oxm_mask_etheraddr = -1;
-static int hf_openflow_v5_oxm_mask_ipv4addr = -1;
-static int hf_openflow_v5_oxm_mask_ipv6addr = -1;
-static int hf_openflow_v5_oxm_mask_vlan = -1;
-static int hf_openflow_v5_match_type = -1;
-static int hf_openflow_v5_match_length = -1;
-static int hf_openflow_v5_match_pad = -1;
-static int hf_openflow_v5_action_type = -1;
-static int hf_openflow_v5_action_length = -1;
-static int hf_openflow_v5_action_experimenter_experimenter = -1;
-static int hf_openflow_v5_oxm_experimenter_value = -1;
-static int hf_openflow_v5_action_output_port = -1;
-static int hf_openflow_v5_action_output_max_len = -1;
-static int hf_openflow_v5_action_output_pad = -1;
-static int hf_openflow_v5_action_copy_ttl_out_pad = -1;
-static int hf_openflow_v5_action_copy_ttl_in_pad = -1;
-static int hf_openflow_v5_action_set_mpls_ttl_ttl = -1;
-static int hf_openflow_v5_action_set_mpls_ttl_pad = -1;
-static int hf_openflow_v5_action_dec_mpls_ttl_pad = -1;
-static int hf_openflow_v5_action_push_vlan_ethertype = -1;
-static int hf_openflow_v5_action_push_vlan_pad = -1;
-static int hf_openflow_v5_action_pop_vlan_pad = -1;
-static int hf_openflow_v5_action_push_mpls_ethertype = -1;
-static int hf_openflow_v5_action_push_mpls_pad = -1;
-static int hf_openflow_v5_action_pop_mpls_ethertype = -1;
-static int hf_openflow_v5_action_pop_mpls_pad = -1;
-static int hf_openflow_v5_action_set_queue_queue_id = -1;
-static int hf_openflow_v5_action_group_group_id = -1;
-static int hf_openflow_v5_action_set_nw_ttl_ttl = -1;
-static int hf_openflow_v5_action_set_nw_ttl_pad = -1;
-static int hf_openflow_v5_action_dec_nw_ttl_pad = -1;
-static int hf_openflow_v5_action_set_field_pad = -1;
-static int hf_openflow_v5_action_push_pbb_ethertype = -1;
-static int hf_openflow_v5_action_push_pbb_pad = -1;
-static int hf_openflow_v5_action_pop_pbb_pad = -1;
-static int hf_openflow_v5_instruction_type = -1;
-static int hf_openflow_v5_instruction_length = -1;
-static int hf_openflow_v5_instruction_experimenter_experimenter = -1;
-static int hf_openflow_v5_instruction_goto_table_table_id = -1;
-static int hf_openflow_v5_instruction_goto_table_pad = -1;
-static int hf_openflow_v5_instruction_write_metadata_pad = -1;
-static int hf_openflow_v5_instruction_write_metadata_value = -1;
-static int hf_openflow_v5_instruction_write_metadata_mask = -1;
-static int hf_openflow_v5_instruction_actions_pad = -1;
-static int hf_openflow_v5_instruction_meter_meter_id = -1;
-static int hf_openflow_v5_port_desc_prop_type = -1;
-static int hf_openflow_v5_port_desc_prop_length = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_pad = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_10mb_hd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_10mb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_100mb_hd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_100mb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_1gb_hd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_1gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_10gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_40gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_100gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_1tb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_other = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_copper = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_fiber = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_autoneg = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_pause = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_current_pause_asym = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_10mb_hd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_10mb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_100mb_hd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_100mb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_1gb_hd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_1gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_10gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_40gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_100gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_1tb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_other = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_copper = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_fiber = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_autoneg = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_pause = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_advertised_pause_asym = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_10mb_hd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_10mb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_100mb_hd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_100mb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_1gb_hd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_1gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_10gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_40gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_100gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_1tb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_other = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_copper = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_fiber = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_autoneg = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_pause = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_supported_pause_asym = -1;
-static int hf_openflow_v5_port_desc_prop_optical_pad = -1;
-static int hf_openflow_v5_port_desc_prop_optical_supported = -1;
-static int hf_openflow_v5_port_desc_prop_optical_supported_rx_tune = -1;
-static int hf_openflow_v5_port_desc_prop_optical_supported_tx_tune = -1;
-static int hf_openflow_v5_port_desc_prop_optical_supported_tx_pwr = -1;
-static int hf_openflow_v5_port_desc_prop_optical_supported_use_freq = -1;
-static int hf_openflow_v5_port_desc_prop_optical_tx_min_freq_lmda = -1;
-static int hf_openflow_v5_port_desc_prop_optical_tx_max_freq_lmda = -1;
-static int hf_openflow_v5_port_desc_prop_optical_tx_grid_freq_lmda = -1;
-static int hf_openflow_v5_port_desc_prop_optical_rx_min_freq_lmda = -1;
-static int hf_openflow_v5_port_desc_prop_optical_rx_max_freq_lmda = -1;
-static int hf_openflow_v5_port_desc_prop_optical_rx_grid_freq_lmda = -1;
-static int hf_openflow_v5_port_desc_prop_optical_tx_pwr_min = -1;
-static int hf_openflow_v5_port_desc_prop_optical_tx_pwr_max = -1;
-static int hf_openflow_v5_port_desc_prop_experimenter_experimenter = -1;
-static int hf_openflow_v5_port_desc_prop_experimenter_exp_type = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_10mb_hd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_10mb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_100mb_hd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_100mb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_1gb_hd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_1gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_10gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_40gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_100gb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_1tb_fd = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_other = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_copper = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_fiber = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_autoneg = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_pause = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_peer_pause_asym = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_curr_speed = -1;
-static int hf_openflow_v5_port_desc_prop_ethernet_max_speed = -1;
-static int hf_openflow_v5_port_stats_prop_type = -1;
-static int hf_openflow_v5_port_stats_prop_length = -1;
-static int hf_openflow_v5_port_stats_prop_ethernet_pad = -1;
-static int hf_openflow_v5_port_stats_prop_ethernet_rx_frame_err = -1;
-static int hf_openflow_v5_port_stats_prop_ethernet_rx_over_err = -1;
-static int hf_openflow_v5_port_stats_prop_ethernet_rx_crc_err = -1;
-static int hf_openflow_v5_port_stats_prop_ethernet_collisions = -1;
-static int hf_openflow_v5_port_stats_prop_optical_pad = -1;
-static int hf_openflow_v5_port_stats_prop_optical_flags = -1;
-static int hf_openflow_v5_port_stats_prop_optical_flags_rx_tune = -1;
-static int hf_openflow_v5_port_stats_prop_optical_flags_tx_tune = -1;
-static int hf_openflow_v5_port_stats_prop_optical_flags_tx_pwr = -1;
-static int hf_openflow_v5_port_stats_prop_optical_flags_rx_pwr = -1;
-static int hf_openflow_v5_port_stats_prop_optical_flags_tx_bias = -1;
-static int hf_openflow_v5_port_stats_prop_optical_flags_tx_temp = -1;
-static int hf_openflow_v5_port_stats_prop_optical_tx_freq_lmda = -1;
-static int hf_openflow_v5_port_stats_prop_optical_tx_offset = -1;
-static int hf_openflow_v5_port_stats_prop_optical_tx_grid_span = -1;
-static int hf_openflow_v5_port_stats_prop_optical_rx_freq_lmda = -1;
-static int hf_openflow_v5_port_stats_prop_optical_rx_offset = -1;
-static int hf_openflow_v5_port_stats_prop_optical_rx_grid_span = -1;
-static int hf_openflow_v5_port_stats_prop_optical_tx_pwr = -1;
-static int hf_openflow_v5_port_stats_prop_optical_rx_pwr = -1;
-static int hf_openflow_v5_port_stats_prop_optical_bias_current = -1;
-static int hf_openflow_v5_port_stats_prop_optical_temperature = -1;
-static int hf_openflow_v5_port_stats_prop_experimenter_experimenter = -1;
-static int hf_openflow_v5_port_stats_prop_experimenter_exp_type = -1;
-static int hf_openflow_v5_port_port_no = -1;
-static int hf_openflow_v5_port_length = -1;
-static int hf_openflow_v5_port_pad = -1;
-static int hf_openflow_v5_port_hw_addr = -1;
-static int hf_openflow_v5_port_pad2 = -1;
-static int hf_openflow_v5_port_name = -1;
-static int hf_openflow_v5_port_config = -1;
-static int hf_openflow_v5_port_config_port_down = -1;
-static int hf_openflow_v5_port_config_no_recv = -1;
-static int hf_openflow_v5_port_config_no_fwd = -1;
-static int hf_openflow_v5_port_config_no_packet_in = -1;
-static int hf_openflow_v5_port_state = -1;
-static int hf_openflow_v5_port_state_link_down = -1;
-static int hf_openflow_v5_port_state_blocked = -1;
-static int hf_openflow_v5_port_state_live = -1;
-static int hf_openflow_v5_meter_band_type = -1;
-static int hf_openflow_v5_meter_band_len = -1;
-static int hf_openflow_v5_meter_band_rate = -1;
-static int hf_openflow_v5_meter_band_burst_size = -1;
-static int hf_openflow_v5_meter_band_drop_pad = -1;
-static int hf_openflow_v5_meter_band_dscp_remark_prec_level = -1;
-static int hf_openflow_v5_meter_band_dscp_remark_pad= -1;
-static int hf_openflow_v5_meter_band_experimenter_experimenter = -1;
-static int hf_openflow_v5_hello_element_type = -1;
-static int hf_openflow_v5_hello_element_length = -1;
-static int hf_openflow_v5_hello_element_version_bitmap = -1;
-static int hf_openflow_v5_hello_element_pad = -1;
-static int hf_openflow_v5_error_type = -1;
-static int hf_openflow_v5_error_hello_failed_code = -1;
-static int hf_openflow_v5_error_bad_request_code = -1;
-static int hf_openflow_v5_error_bad_action_code = -1;
-static int hf_openflow_v5_error_bad_instruction_code = -1;
-static int hf_openflow_v5_error_bad_match_code = -1;
-static int hf_openflow_v5_error_flow_mod_failed_code = -1;
-static int hf_openflow_v5_error_group_mod_failed_code = -1;
-static int hf_openflow_v5_error_port_mod_failed_code = -1;
-static int hf_openflow_v5_error_table_mod_failed_code = -1;
-static int hf_openflow_v5_error_queue_op_failed_code = -1;
-static int hf_openflow_v5_error_switch_config_failed_code = -1;
-static int hf_openflow_v5_error_role_request_failed_code = -1;
-static int hf_openflow_v5_error_meter_mod_failed_code = -1;
-static int hf_openflow_v5_error_table_features_failed_code = -1;
-static int hf_openflow_v5_error_bad_property_code = -1;
-static int hf_openflow_v5_error_async_config_failed_code = -1;
-static int hf_openflow_v5_error_flow_monitor_failed_code = -1;
-static int hf_openflow_v5_error_bundle_failed_code = -1;
-static int hf_openflow_v5_error_code = -1;
-static int hf_openflow_v5_error_data_text = -1;
-static int hf_openflow_v5_error_data_body = -1;
-static int hf_openflow_v5_error_experimenter = -1;
-static int hf_openflow_v5_echo_data = -1;
-static int hf_openflow_v5_experimenter_experimenter = -1;
-static int hf_openflow_v5_experimenter_exp_type = -1;
-static int hf_openflow_v5_switch_features_datapath_id = -1;
-static int hf_openflow_v5_switch_features_n_buffers = -1;
-static int hf_openflow_v5_switch_features_n_tables = -1;
-static int hf_openflow_v5_switch_features_auxiliary_id = -1;
-static int hf_openflow_v5_switch_features_pad = -1;
-static int hf_openflow_v5_switch_features_capabilities = -1;
-static int hf_openflow_v5_switch_features_capabilities_flow_stats = -1;
-static int hf_openflow_v5_switch_features_capabilities_table_stats = -1;
-static int hf_openflow_v5_switch_features_capabilities_port_stats = -1;
-static int hf_openflow_v5_switch_features_capabilities_group_stats = -1;
-static int hf_openflow_v5_switch_features_capabilities_ip_reasm = -1;
-static int hf_openflow_v5_switch_features_capabilities_queue_stats = -1;
-static int hf_openflow_v5_switch_features_capabilities_port_blocked = -1;
-static int hf_openflow_v5_switch_features_reserved = -1;
-static int hf_openflow_v5_switch_config_flags = -1;
-static int hf_openflow_v5_switch_config_flags_fragments = -1;
-static int hf_openflow_v5_switch_config_miss_send_len = -1;
-static int hf_openflow_v5_packet_in_buffer_id = -1;
-static int hf_openflow_v5_packet_in_total_len = -1;
-static int hf_openflow_v5_packet_in_reason = -1;
-static int hf_openflow_v5_packet_in_table_id = -1;
-static int hf_openflow_v5_packet_in_cookie = -1;
-static int hf_openflow_v5_packet_in_pad = -1;
-static int hf_openflow_v5_flow_removed_cookie = -1;
-static int hf_openflow_v5_flow_removed_priority = -1;
-static int hf_openflow_v5_flow_removed_reason = -1;
-static int hf_openflow_v5_flow_removed_table_id = -1;
-static int hf_openflow_v5_flow_removed_duration_sec = -1;
-static int hf_openflow_v5_flow_removed_duration_nsec = -1;
-static int hf_openflow_v5_flow_removed_idle_timeout = -1;
-static int hf_openflow_v5_flow_removed_hard_timeout = -1;
-static int hf_openflow_v5_flow_removed_packet_count = -1;
-static int hf_openflow_v5_flow_removed_byte_count = -1;
-static int hf_openflow_v5_port_status_reason = -1;
-static int hf_openflow_v5_port_status_pad = -1;
-static int hf_openflow_v5_packet_out_buffer_id = -1;
-static int hf_openflow_v5_packet_out_in_port = -1;
-static int hf_openflow_v5_packet_out_acts_len = -1;
-static int hf_openflow_v5_packet_out_pad = -1;
-static int hf_openflow_v5_flowmod_cookie = -1;
-static int hf_openflow_v5_flowmod_cookie_mask = -1;
-static int hf_openflow_v5_flowmod_table_id = -1;
-static int hf_openflow_v5_flowmod_command = -1;
-static int hf_openflow_v5_flowmod_idle_timeout = -1;
-static int hf_openflow_v5_flowmod_hard_timeout = -1;
-static int hf_openflow_v5_flowmod_priority = -1;
-static int hf_openflow_v5_flowmod_buffer_id = -1;
-static int hf_openflow_v5_flowmod_out_port = -1;
-static int hf_openflow_v5_flowmod_out_group = -1;
-static int hf_openflow_v5_flowmod_flags = -1;
-static int hf_openflow_v5_flowmod_flags_send_flow_rem = -1;
-static int hf_openflow_v5_flowmod_flags_check_overlap = -1;
-static int hf_openflow_v5_flowmod_flags_reset_counts = -1;
-static int hf_openflow_v5_flowmod_flags_no_packet_counts = -1;
-static int hf_openflow_v5_flowmod_flags_no_byte_counts = -1;
-static int hf_openflow_v5_flowmod_importance = -1;
-static int hf_openflow_v5_bucket_length = -1;
-static int hf_openflow_v5_bucket_weight = -1;
-static int hf_openflow_v5_bucket_watch_port = -1;
-static int hf_openflow_v5_bucket_watch_group = -1;
-static int hf_openflow_v5_bucket_pad = -1;
-static int hf_openflow_v5_groupmod_command = -1;
-static int hf_openflow_v5_groupmod_type = -1;
-static int hf_openflow_v5_groupmod_pad = -1;
-static int hf_openflow_v5_groupmod_group_id = -1;
-static int hf_openflow_v5_portmod_prop_type = -1;
-static int hf_openflow_v5_portmod_prop_length = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_10mb_hd = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_10mb_fd = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_100mb_hd = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_100mb_fd = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_1gb_hd = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_1gb_fd = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_10gb_fd = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_40gb_fd = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_100gb_fd = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_1tb_fd = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_other = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_copper = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_fiber = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_autoneg = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_pause = -1;
-static int hf_openflow_v5_portmod_prop_ethernet_advertise_pause_asym = -1;
-static int hf_openflow_v5_portmod_prop_optical_configure = -1;
-static int hf_openflow_v5_portmod_prop_optical_configure_rx_tune = -1;
-static int hf_openflow_v5_portmod_prop_optical_configure_tx_tune = -1;
-static int hf_openflow_v5_portmod_prop_optical_configure_tx_pwr = -1;
-static int hf_openflow_v5_portmod_prop_optical_configure_use_freq = -1;
-static int hf_openflow_v5_portmod_prop_optical_freq_lmda = -1;
-static int hf_openflow_v5_portmod_prop_optical_fl_offset = -1;
-static int hf_openflow_v5_portmod_prop_optical_grid_span = -1;
-static int hf_openflow_v5_portmod_prop_optical_tx_pwr = -1;
-static int hf_openflow_v5_portmod_prop_experimenter_experimenter = -1;
-static int hf_openflow_v5_portmod_prop_experimenter_exp_type = -1;
-static int hf_openflow_v5_portmod_port_no = -1;
-static int hf_openflow_v5_portmod_pad = -1;
-static int hf_openflow_v5_portmod_hw_addr = -1;
-static int hf_openflow_v5_portmod_pad2 = -1;
-static int hf_openflow_v5_portmod_config = -1;
-static int hf_openflow_v5_portmod_config_port_down = -1;
-static int hf_openflow_v5_portmod_config_no_recv = -1;
-static int hf_openflow_v5_portmod_config_no_fwd = -1;
-static int hf_openflow_v5_portmod_config_no_packet_in = -1;
-static int hf_openflow_v5_portmod_mask = -1;
-static int hf_openflow_v5_portmod_mask_port_down = -1;
-static int hf_openflow_v5_portmod_mask_no_recv = -1;
-static int hf_openflow_v5_portmod_mask_no_fwd = -1;
-static int hf_openflow_v5_portmod_mask_no_packet_in = -1;
-static int hf_openflow_v5_tablemod_table_id = -1;
-static int hf_openflow_v5_tablemod_pad = -1;
-static int hf_openflow_v5_tablemod_config = -1;
-static int hf_openflow_v5_tablemod_config_eviction = -1;
-static int hf_openflow_v5_tablemod_config_vacancy_events = -1;
-static int hf_openflow_v5_tablemod_prop_type = -1;
-static int hf_openflow_v5_tablemod_prop_length = -1;
-static int hf_openflow_v5_tablemod_prop_eviction_flags = -1;
-static int hf_openflow_v5_tablemod_prop_eviction_flags_other = -1;
-static int hf_openflow_v5_tablemod_prop_eviction_flags_importance = -1;
-static int hf_openflow_v5_tablemod_prop_eviction_flags_lifetime = -1;
-static int hf_openflow_v5_tablemod_prop_vacancy_vacancy_down = -1;
-static int hf_openflow_v5_tablemod_prop_vacancy_vacancy_up = -1;
-static int hf_openflow_v5_tablemod_prop_vacancy_vacancy = -1;
-static int hf_openflow_v5_tablemod_prop_vacancy_pad = -1;
-static int hf_openflow_v5_tablemod_prop_experimenter_experimenter = -1;
-static int hf_openflow_v5_tablemod_prop_experimenter_exp_type = -1;
-static int hf_openflow_v5_flow_stats_request_table_id = -1;
-static int hf_openflow_v5_flow_stats_request_pad = -1;
-static int hf_openflow_v5_flow_stats_request_out_port = -1;
-static int hf_openflow_v5_flow_stats_request_out_group = -1;
-static int hf_openflow_v5_flow_stats_request_pad2 = -1;
-static int hf_openflow_v5_flow_stats_request_cookie = -1;
-static int hf_openflow_v5_flow_stats_request_cookie_mask = -1;
-static int hf_openflow_v5_aggregate_stats_request_table_id = -1;
-static int hf_openflow_v5_aggregate_stats_request_pad = -1;
-static int hf_openflow_v5_aggregate_stats_request_out_port = -1;
-static int hf_openflow_v5_aggregate_stats_request_out_group = -1;
-static int hf_openflow_v5_aggregate_stats_request_pad2 = -1;
-static int hf_openflow_v5_aggregate_stats_request_cookie = -1;
-static int hf_openflow_v5_aggregate_stats_request_cookie_mask = -1;
-static int hf_openflow_v5_table_feature_prop_type = -1;
-static int hf_openflow_v5_table_feature_prop_length = -1;
-static int hf_openflow_v5_table_feature_prop_next_tables_next_table_id = -1;
-static int hf_openflow_v5_table_feature_prop_table_sync_from_table_id = -1;
-static int hf_openflow_v5_table_feature_prop_experimenter_experimenter = -1;
-static int hf_openflow_v5_table_feature_prop_experimenter_exp_type = -1;
-static int hf_openflow_v5_table_feature_prop_pad = -1;
-static int hf_openflow_v5_table_features_length = -1;
-static int hf_openflow_v5_table_features_table_id = -1;
-static int hf_openflow_v5_table_features_pad = -1;
-static int hf_openflow_v5_table_features_name = -1;
-static int hf_openflow_v5_table_features_metadata_match = -1;
-static int hf_openflow_v5_table_features_metadata_write = -1;
-static int hf_openflow_v5_table_features_capabilities = -1;
-static int hf_openflow_v5_table_features_capabilities_eviction = -1;
-static int hf_openflow_v5_table_features_capabilities_vacancy_events = -1;
-static int hf_openflow_v5_table_features_max_entries = -1;
-static int hf_openflow_v5_port_stats_request_port_no = -1;
-static int hf_openflow_v5_port_stats_request_pad = -1;
-static int hf_openflow_v5_queue_stats_request_port_no = -1;
-static int hf_openflow_v5_queue_stats_request_queue_id = -1;
-static int hf_openflow_v5_group_stats_request_group_id = -1;
-static int hf_openflow_v5_group_stats_request_pad = -1;
-static int hf_openflow_v5_meter_stats_request_meter_id = -1;
-static int hf_openflow_v5_meter_stats_request_pad = -1;
-static int hf_openflow_v5_meter_config_request_meter_id = -1;
-static int hf_openflow_v5_meter_config_request_pad = -1;
-static int hf_openflow_v5_queue_desc_request_port_no = -1;
-static int hf_openflow_v5_queue_desc_request_queue_id = -1;
-static int hf_openflow_v5_flow_monitor_request_monitor_id = -1;
-static int hf_openflow_v5_flow_monitor_request_out_port = -1;
-static int hf_openflow_v5_flow_monitor_request_out_group = -1;
-static int hf_openflow_v5_flow_monitor_request_flags = -1;
-static int hf_openflow_v5_flow_monitor_request_flags_initial = -1;
-static int hf_openflow_v5_flow_monitor_request_flags_add = -1;
-static int hf_openflow_v5_flow_monitor_request_flags_removed = -1;
-static int hf_openflow_v5_flow_monitor_request_flags_modify = -1;
-static int hf_openflow_v5_flow_monitor_request_flags_instructions = -1;
-static int hf_openflow_v5_flow_monitor_request_flags_no_abbrev = -1;
-static int hf_openflow_v5_flow_monitor_request_flags_only_own = -1;
-static int hf_openflow_v5_flow_monitor_request_table_id = -1;
-static int hf_openflow_v5_flow_monitor_request_command = -1;
-static int hf_openflow_v5_multipart_request_type = -1;
-static int hf_openflow_v5_multipart_request_flags = -1;
-static int hf_openflow_v5_multipart_request_flags_more = -1;
-static int hf_openflow_v5_multipart_request_pad = -1;
-static int hf_openflow_v5_multipart_request_experimenter_experimenter = -1;
-static int hf_openflow_v5_multipart_request_experimenter_exp_type = -1;
-static int hf_openflow_v5_switch_description_mfr_desc = -1;
-static int hf_openflow_v5_switch_description_hw_desc = -1;
-static int hf_openflow_v5_switch_description_sw_desc = -1;
-static int hf_openflow_v5_switch_description_serial_num = -1;
-static int hf_openflow_v5_switch_description_dp_desc = -1;
-static int hf_openflow_v5_flow_stats_length = -1;
-static int hf_openflow_v5_flow_stats_table_id = -1;
-static int hf_openflow_v5_flow_stats_pad = -1;
-static int hf_openflow_v5_flow_stats_duration_sec = -1;
-static int hf_openflow_v5_flow_stats_duration_nsec = -1;
-static int hf_openflow_v5_flow_stats_priority = -1;
-static int hf_openflow_v5_flow_stats_idle_timeout = -1;
-static int hf_openflow_v5_flow_stats_hard_timeout = -1;
-static int hf_openflow_v5_flow_stats_flags = -1;
-static int hf_openflow_v5_flow_stats_flags_send_flow_rem = -1;
-static int hf_openflow_v5_flow_stats_flags_check_overlap = -1;
-static int hf_openflow_v5_flow_stats_flags_reset_counts = -1;
-static int hf_openflow_v5_flow_stats_flags_no_packet_counts = -1;
-static int hf_openflow_v5_flow_stats_flags_no_byte_counts = -1;
-static int hf_openflow_v5_flow_stats_importance = -1;
-static int hf_openflow_v5_flow_stats_pad2 = -1;
-static int hf_openflow_v5_flow_stats_cookie = -1;
-static int hf_openflow_v5_flow_stats_packet_count = -1;
-static int hf_openflow_v5_flow_stats_byte_count = -1;
-static int hf_openflow_v5_aggregate_stats_packet_count = -1;
-static int hf_openflow_v5_aggregate_stats_byte_count = -1;
-static int hf_openflow_v5_aggregate_stats_flow_count = -1;
-static int hf_openflow_v5_aggregate_stats_pad = -1;
-static int hf_openflow_v5_table_stats_table_id = -1;
-static int hf_openflow_v5_table_stats_pad = -1;
-static int hf_openflow_v5_table_stats_active_count = -1;
-static int hf_openflow_v5_table_stats_lookup_count = -1;
-static int hf_openflow_v5_table_stats_match_count = -1;
-static int hf_openflow_v5_port_stats_length = -1;
-static int hf_openflow_v5_port_stats_pad = -1;
-static int hf_openflow_v5_port_stats_port_no = -1;
-static int hf_openflow_v5_port_stats_duration_sec = -1;
-static int hf_openflow_v5_port_stats_duration_nsec = -1;
-static int hf_openflow_v5_port_stats_rx_packets = -1;
-static int hf_openflow_v5_port_stats_tx_packets = -1;
-static int hf_openflow_v5_port_stats_rx_bytes = -1;
-static int hf_openflow_v5_port_stats_tx_bytes = -1;
-static int hf_openflow_v5_port_stats_rx_dropped = -1;
-static int hf_openflow_v5_port_stats_tx_dropped = -1;
-static int hf_openflow_v5_port_stats_rx_errors = -1;
-static int hf_openflow_v5_port_stats_tx_errors = -1;
-static int hf_openflow_v5_queue_stats_length = -1;
-static int hf_openflow_v5_queue_stats_pad = -1;
-static int hf_openflow_v5_queue_stats_port_no = -1;
-static int hf_openflow_v5_queue_stats_queue_id = -1;
-static int hf_openflow_v5_queue_stats_tx_bytes = -1;
-static int hf_openflow_v5_queue_stats_tx_packets = -1;
-static int hf_openflow_v5_queue_stats_tx_errors = -1;
-static int hf_openflow_v5_queue_stats_duration_sec = -1;
-static int hf_openflow_v5_queue_stats_duration_nsec = -1;
-static int hf_openflow_v5_queue_stats_prop_type = -1;
-static int hf_openflow_v5_queue_stats_prop_length = -1;
-static int hf_openflow_v5_queue_stats_prop_experimenter_experimenter = -1;
-static int hf_openflow_v5_queue_stats_prop_experimenter_exp_type = -1;
-static int hf_openflow_v5_bucket_counter_packet_count = -1;
-static int hf_openflow_v5_bucket_counter_byte_count = -1;
-static int hf_openflow_v5_group_stats_length = -1;
-static int hf_openflow_v5_group_stats_pad = -1;
-static int hf_openflow_v5_group_stats_group_id = -1;
-static int hf_openflow_v5_group_stats_ref_count = -1;
-static int hf_openflow_v5_group_stats_pad2 = -1;
-static int hf_openflow_v5_group_stats_packet_count = -1;
-static int hf_openflow_v5_group_stats_byte_count = -1;
-static int hf_openflow_v5_group_desc_length = -1;
-static int hf_openflow_v5_group_desc_type = -1;
-static int hf_openflow_v5_group_desc_pad = -1;
-static int hf_openflow_v5_group_desc_group_id = -1;
-static int hf_openflow_v5_group_features_types = -1;
-static int hf_openflow_v5_group_features_types_all = -1;
-static int hf_openflow_v5_group_features_types_select = -1;
-static int hf_openflow_v5_group_features_types_indirect = -1;
-static int hf_openflow_v5_group_features_types_ff = -1;
-static int hf_openflow_v5_group_features_capabilities = -1;
-static int hf_openflow_v5_group_features_capabilities_select_weight = -1;
-static int hf_openflow_v5_group_features_capabilities_select_liveness = -1;
-static int hf_openflow_v5_group_features_capabilities_chaining = -1;
-static int hf_openflow_v5_group_features_capabilities_chaining_checks = -1;
-static int hf_openflow_v5_group_features_max_groups_all = -1;
-static int hf_openflow_v5_group_features_max_groups_select = -1;
-static int hf_openflow_v5_group_features_max_groups_indirect = -1;
-static int hf_openflow_v5_group_features_max_groups_ff = -1;
-static int hf_openflow_v5_group_features_actions_all = -1;
-static int hf_openflow_v5_group_features_actions_all_output = -1;
-static int hf_openflow_v5_group_features_actions_all_copy_ttl_out = -1;
-static int hf_openflow_v5_group_features_actions_all_copy_ttl_in = -1;
-static int hf_openflow_v5_group_features_actions_all_set_mpls_ttl = -1;
-static int hf_openflow_v5_group_features_actions_all_dec_mpls_ttl = -1;
-static int hf_openflow_v5_group_features_actions_all_push_vlan = -1;
-static int hf_openflow_v5_group_features_actions_all_pop_vlan = -1;
-static int hf_openflow_v5_group_features_actions_all_push_mpls = -1;
-static int hf_openflow_v5_group_features_actions_all_pop_mpls = -1;
-static int hf_openflow_v5_group_features_actions_all_set_queue = -1;
-static int hf_openflow_v5_group_features_actions_all_group = -1;
-static int hf_openflow_v5_group_features_actions_all_set_nw_ttl = -1;
-static int hf_openflow_v5_group_features_actions_all_dec_nw_ttl = -1;
-static int hf_openflow_v5_group_features_actions_all_set_field = -1;
-static int hf_openflow_v5_group_features_actions_all_push_pbb = -1;
-static int hf_openflow_v5_group_features_actions_all_pop_pbb = -1;
-static int hf_openflow_v5_group_features_actions_select = -1;
-static int hf_openflow_v5_group_features_actions_select_output = -1;
-static int hf_openflow_v5_group_features_actions_select_copy_ttl_out = -1;
-static int hf_openflow_v5_group_features_actions_select_copy_ttl_in = -1;
-static int hf_openflow_v5_group_features_actions_select_set_mpls_ttl = -1;
-static int hf_openflow_v5_group_features_actions_select_dec_mpls_ttl = -1;
-static int hf_openflow_v5_group_features_actions_select_push_vlan = -1;
-static int hf_openflow_v5_group_features_actions_select_pop_vlan = -1;
-static int hf_openflow_v5_group_features_actions_select_push_mpls = -1;
-static int hf_openflow_v5_group_features_actions_select_pop_mpls = -1;
-static int hf_openflow_v5_group_features_actions_select_set_queue = -1;
-static int hf_openflow_v5_group_features_actions_select_group = -1;
-static int hf_openflow_v5_group_features_actions_select_set_nw_ttl = -1;
-static int hf_openflow_v5_group_features_actions_select_dec_nw_ttl = -1;
-static int hf_openflow_v5_group_features_actions_select_set_field = -1;
-static int hf_openflow_v5_group_features_actions_select_push_pbb = -1;
-static int hf_openflow_v5_group_features_actions_select_pop_pbb = -1;
-static int hf_openflow_v5_group_features_actions_indirect = -1;
-static int hf_openflow_v5_group_features_actions_indirect_output = -1;
-static int hf_openflow_v5_group_features_actions_indirect_copy_ttl_out = -1;
-static int hf_openflow_v5_group_features_actions_indirect_copy_ttl_in = -1;
-static int hf_openflow_v5_group_features_actions_indirect_set_mpls_ttl = -1;
-static int hf_openflow_v5_group_features_actions_indirect_dec_mpls_ttl = -1;
-static int hf_openflow_v5_group_features_actions_indirect_push_vlan = -1;
-static int hf_openflow_v5_group_features_actions_indirect_pop_vlan = -1;
-static int hf_openflow_v5_group_features_actions_indirect_push_mpls = -1;
-static int hf_openflow_v5_group_features_actions_indirect_pop_mpls = -1;
-static int hf_openflow_v5_group_features_actions_indirect_set_queue = -1;
-static int hf_openflow_v5_group_features_actions_indirect_group = -1;
-static int hf_openflow_v5_group_features_actions_indirect_set_nw_ttl = -1;
-static int hf_openflow_v5_group_features_actions_indirect_dec_nw_ttl = -1;
-static int hf_openflow_v5_group_features_actions_indirect_set_field = -1;
-static int hf_openflow_v5_group_features_actions_indirect_push_pbb = -1;
-static int hf_openflow_v5_group_features_actions_indirect_pop_pbb = -1;
-static int hf_openflow_v5_group_features_actions_ff = -1;
-static int hf_openflow_v5_group_features_actions_ff_output = -1;
-static int hf_openflow_v5_group_features_actions_ff_copy_ttl_out = -1;
-static int hf_openflow_v5_group_features_actions_ff_copy_ttl_in = -1;
-static int hf_openflow_v5_group_features_actions_ff_set_mpls_ttl = -1;
-static int hf_openflow_v5_group_features_actions_ff_dec_mpls_ttl = -1;
-static int hf_openflow_v5_group_features_actions_ff_push_vlan = -1;
-static int hf_openflow_v5_group_features_actions_ff_pop_vlan = -1;
-static int hf_openflow_v5_group_features_actions_ff_push_mpls = -1;
-static int hf_openflow_v5_group_features_actions_ff_pop_mpls = -1;
-static int hf_openflow_v5_group_features_actions_ff_set_queue = -1;
-static int hf_openflow_v5_group_features_actions_ff_group = -1;
-static int hf_openflow_v5_group_features_actions_ff_set_nw_ttl = -1;
-static int hf_openflow_v5_group_features_actions_ff_dec_nw_ttl = -1;
-static int hf_openflow_v5_group_features_actions_ff_set_field = -1;
-static int hf_openflow_v5_group_features_actions_ff_push_pbb = -1;
-static int hf_openflow_v5_group_features_actions_ff_pop_pbb = -1;
-static int hf_openflow_v5_meter_band_stats_packet_band_count = -1;
-static int hf_openflow_v5_meter_band_stats_byte_band_count = -1;
-static int hf_openflow_v5_meter_stats_meter_id = -1;
-static int hf_openflow_v5_meter_stats_len = -1;
-static int hf_openflow_v5_meter_stats_pad = -1;
-static int hf_openflow_v5_meter_stats_flow_count = -1;
-static int hf_openflow_v5_meter_stats_packet_in_count = -1;
-static int hf_openflow_v5_meter_stats_byte_in_count = -1;
-static int hf_openflow_v5_meter_stats_duration_sec = -1;
-static int hf_openflow_v5_meter_stats_duration_nsec = -1;
-static int hf_openflow_v5_meter_config_len = -1;
-static int hf_openflow_v5_meter_config_flags = -1;
-static int hf_openflow_v5_meter_config_flags_kbps = -1;
-static int hf_openflow_v5_meter_config_flags_pktps = -1;
-static int hf_openflow_v5_meter_config_flags_burst = -1;
-static int hf_openflow_v5_meter_config_flags_stats = -1;
-static int hf_openflow_v5_meter_config_meter_id = -1;
-static int hf_openflow_v5_meter_features_max_meter = -1;
-static int hf_openflow_v5_meter_features_band_types = -1;
-static int hf_openflow_v5_meter_features_band_types_drop = -1;
-static int hf_openflow_v5_meter_features_band_types_dscp_remark = -1;
-static int hf_openflow_v5_meter_features_capabilities = -1;
-static int hf_openflow_v5_meter_features_capabilities_kbps = -1;
-static int hf_openflow_v5_meter_features_capabilities_pktps = -1;
-static int hf_openflow_v5_meter_features_capabilities_burst = -1;
-static int hf_openflow_v5_meter_features_capabilities_stats = -1;
-static int hf_openflow_v5_meter_features_max_bands = -1;
-static int hf_openflow_v5_meter_features_max_color = -1;
-static int hf_openflow_v5_meter_features_pad = -1;
-static int hf_openflow_v5_flow_update_length = -1;
-static int hf_openflow_v5_flow_update_event = -1;
-static int hf_openflow_v5_flow_update_full_table_id = -1;
-static int hf_openflow_v5_flow_update_full_reason = -1;
-static int hf_openflow_v5_flow_update_full_zero = -1;
-static int hf_openflow_v5_flow_update_full_idle_timeout = -1;
-static int hf_openflow_v5_flow_update_full_hard_timeout = -1;
-static int hf_openflow_v5_flow_update_full_priority = -1;
-static int hf_openflow_v5_flow_update_full_zeros = -1;
-static int hf_openflow_v5_flow_update_full_cookie = -1;
-static int hf_openflow_v5_flow_update_abbrev_xid = -1;
-static int hf_openflow_v5_flow_update_paused_zeros = -1;
-static int hf_openflow_v5_multipart_reply_type = -1;
-static int hf_openflow_v5_multipart_reply_flags = -1;
-static int hf_openflow_v5_multipart_reply_flags_more = -1;
-static int hf_openflow_v5_multipart_reply_pad = -1;
-static int hf_openflow_v5_multipart_reply_experimenter_experimenter = -1;
-static int hf_openflow_v5_multipart_reply_experimenter_exp_type = -1;
-static int hf_openflow_v5_table_desc_length = -1;
-static int hf_openflow_v5_table_desc_table_id = -1;
-static int hf_openflow_v5_table_desc_pad = -1;
-static int hf_openflow_v5_table_desc_config = -1;
-static int hf_openflow_v5_table_desc_config_eviction = -1;
-static int hf_openflow_v5_table_desc_config_vacancy_events = -1;
-static int hf_openflow_v5_queue_desc_port_no = -1;
-static int hf_openflow_v5_queue_desc_queue_id = -1;
-static int hf_openflow_v5_queue_desc_len = -1;
-static int hf_openflow_v5_queue_desc_pad = -1;
-static int hf_openflow_v5_queue_desc_prop_property = -1;
-static int hf_openflow_v5_queue_desc_prop_len = -1;
-static int hf_openflow_v5_queue_desc_prop_pad = -1;
-static int hf_openflow_v5_queue_desc_prop_min_rate_rate = -1;
-static int hf_openflow_v5_queue_desc_prop_min_rate_pad = -1;
-static int hf_openflow_v5_queue_desc_prop_max_rate_rate = -1;
-static int hf_openflow_v5_queue_desc_prop_max_rate_pad = -1;
-static int hf_openflow_v5_queue_desc_prop_experimenter_experimenter = -1;
-static int hf_openflow_v5_queue_desc_prop_experimenter_exp_type = -1;
-static int hf_openflow_v5_role_request_role = -1;
-static int hf_openflow_v5_role_request_pad = -1;
-static int hf_openflow_v5_role_request_generation_id = -1;
-static int hf_openflow_v5_role_reply_role = -1;
-static int hf_openflow_v5_role_reply_pad = -1;
-static int hf_openflow_v5_role_reply_generation_id = -1;
-static int hf_openflow_v5_async_config_prop_type = -1;
-static int hf_openflow_v5_async_config_prop_length = -1;
-static int hf_openflow_v5_async_config_prop_reason_packet_in_mask = -1;
-static int hf_openflow_v5_async_config_prop_reason_packet_in_mask_table_miss = -1;
-static int hf_openflow_v5_async_config_prop_reason_packet_in_mask_apply_action = -1;
-static int hf_openflow_v5_async_config_prop_reason_packet_in_mask_invalid_ttl = -1;
-static int hf_openflow_v5_async_config_prop_reason_packet_in_mask_action_set = -1;
-static int hf_openflow_v5_async_config_prop_reason_packet_in_mask_group = -1;
-static int hf_openflow_v5_async_config_prop_reason_packet_in_mask_packet_out = -1;
-static int hf_openflow_v5_async_config_prop_reason_port_status_mask = -1;
-static int hf_openflow_v5_async_config_prop_reason_port_status_mask_add = -1;
-static int hf_openflow_v5_async_config_prop_reason_port_status_mask_delete = -1;
-static int hf_openflow_v5_async_config_prop_reason_port_status_mask_modify = -1;
-static int hf_openflow_v5_async_config_prop_reason_flow_removed_mask = -1;
-static int hf_openflow_v5_async_config_prop_reason_flow_removed_mask_idle_timeout = -1;
-static int hf_openflow_v5_async_config_prop_reason_flow_removed_mask_hard_timeout = -1;
-static int hf_openflow_v5_async_config_prop_reason_flow_removed_mask_delete = -1;
-static int hf_openflow_v5_async_config_prop_reason_flow_removed_mask_group_delete = -1;
-static int hf_openflow_v5_async_config_prop_reason_flow_removed_mask_meter_delete = -1;
-static int hf_openflow_v5_async_config_prop_reason_flow_removed_mask_eviction = -1;
-static int hf_openflow_v5_async_config_prop_reason_role_status_mask = -1;
-static int hf_openflow_v5_async_config_prop_reason_role_status_mask_master_request = -1;
-static int hf_openflow_v5_async_config_prop_reason_role_status_mask_config = -1;
-static int hf_openflow_v5_async_config_prop_reason_role_status_mask_experimenter = -1;
-static int hf_openflow_v5_async_config_prop_reason_table_status_mask = -1;
-static int hf_openflow_v5_async_config_prop_reason_table_status_mask_vacancy_down = -1;
-static int hf_openflow_v5_async_config_prop_reason_table_status_mask_vacancy_up = -1;
-static int hf_openflow_v5_async_config_prop_reason_requestforward_mask = -1;
-static int hf_openflow_v5_async_config_prop_reason_requestforward_mask_group_mod = -1;
-static int hf_openflow_v5_async_config_prop_reason_requestforward_mask_meter_mod = -1;
-static int hf_openflow_v5_async_config_prop_experimenter_experimenter = -1;
-static int hf_openflow_v5_async_config_prop_experimenter_exp_type = -1;
-static int hf_openflow_v5_metermod_command = -1;
-static int hf_openflow_v5_metermod_flags = -1;
-static int hf_openflow_v5_metermod_flags_kbps = -1;
-static int hf_openflow_v5_metermod_flags_pktps = -1;
-static int hf_openflow_v5_metermod_flags_burst = -1;
-static int hf_openflow_v5_metermod_flags_stats = -1;
-static int hf_openflow_v5_metermod_meter_id = -1;
-static int hf_openflow_v5_role_status_role = -1;
-static int hf_openflow_v5_role_status_reason = -1;
-static int hf_openflow_v5_role_status_pad = -1;
-static int hf_openflow_v5_role_status_generation_id = -1;
-static int hf_openflow_v5_table_status_reason = -1;
-static int hf_openflow_v5_table_status_pad = -1;
-static int hf_openflow_v5_bundle_control_bundle_id = -1;
-static int hf_openflow_v5_bundle_control_type = -1;
-static int hf_openflow_v5_bundle_control_flags = -1;
-static int hf_openflow_v5_bundle_control_flags_atomic = -1;
-static int hf_openflow_v5_bundle_control_flags_ordered = -1;
-static int hf_openflow_v5_bundle_prop_type = -1;
-static int hf_openflow_v5_bundle_prop_length = -1;
-static int hf_openflow_v5_bundle_prop_experimenter_experimenter = -1;
-static int hf_openflow_v5_bundle_prop_experimenter_exp_type = -1;
-static int hf_openflow_v5_bundle_add_bundle_id = -1;
-static int hf_openflow_v5_bundle_add_pad = -1;
-static int hf_openflow_v5_bundle_add_flags = -1;
-static int hf_openflow_v5_bundle_add_flags_atomic = -1;
-static int hf_openflow_v5_bundle_add_flags_ordered = -1;
-
-static gint ett_openflow_v5 = -1;
-static gint ett_openflow_v5_flowmod_flags = -1;
-static gint ett_openflow_v5_bucket = -1;
-static gint ett_openflow_v5_oxm = -1;
-static gint ett_openflow_v5_match = -1;
-static gint ett_openflow_v5_action = -1;
-static gint ett_openflow_v5_instruction = -1;
-static gint ett_openflow_v5_port_desc_prop = -1;
-static gint ett_openflow_v5_port_desc_prop_ethernet_current = -1;
-static gint ett_openflow_v5_port_desc_prop_ethernet_advertised = -1;
-static gint ett_openflow_v5_port_desc_prop_ethernet_supported = -1;
-static gint ett_openflow_v5_port_desc_prop_ethernet_peer = -1;
-static gint ett_openflow_v5_port_desc_prop_optical_supported = -1;
-static gint ett_openflow_v5_port_stats_prop = -1;
-static gint ett_openflow_v5_port_stats_prop_optical_flags = -1;
-static gint ett_openflow_v5_port = -1;
-static gint ett_openflow_v5_port_config = -1;
-static gint ett_openflow_v5_port_state = -1;
-static gint ett_openflow_v5_meter_band  = -1;
-static gint ett_openflow_v5_hello_element = -1;
-static gint ett_openflow_v5_error_data = -1;
-static gint ett_openflow_v5_switch_features_capabilities = -1;
-static gint ett_openflow_v5_switch_config_flags = -1;
-static gint ett_openflow_v5_packet_in_data = -1;
-static gint ett_openflow_v5_packet_out_data = -1;
-static gint ett_openflow_v5_portmod_prop = -1;
-static gint ett_openflow_v5_portmod_prop_ethernet_advertise = -1;
-static gint ett_openflow_v5_portmod_prop_optical_configure = -1;
-static gint ett_openflow_v5_portmod_config = -1;
-static gint ett_openflow_v5_portmod_mask = -1;
-static gint ett_openflow_v5_tablemod_config = -1;
-static gint ett_openflow_v5_tablemod_prop = -1;
-static gint ett_openflow_v5_tablemod_prop_eviction_flags = -1;
-static gint ett_openflow_v5_table_features = -1;
-static gint ett_openflow_v5_table_features_capabilities = -1;
-static gint ett_openflow_v5_table_feature_prop = -1;
-static gint ett_openflow_v5_table_feature_prop_instruction_id = -1;
-static gint ett_openflow_v5_table_feature_prop_action_id = -1;
-static gint ett_openflow_v5_table_feature_prop_oxm_id = -1;
-static gint ett_openflow_v5_flow_monitor_request_flags = -1;
-static gint ett_openflow_v5_multipart_request_flags = -1;
-static gint ett_openflow_v5_flow_stats = -1;
-static gint ett_openflow_v5_flow_stats_flags = -1;
-static gint ett_openflow_v5_table_stats = -1;
-static gint ett_openflow_v5_port_stats = -1;
-static gint ett_openflow_v5_queue_stats = -1;
-static gint ett_openflow_v5_queue_stats_prop = -1;
-static gint ett_openflow_v5_bucket_counter = -1;
-static gint ett_openflow_v5_group_stats = -1;
-static gint ett_openflow_v5_group_desc = -1;
-static gint ett_openflow_v5_group_features_types = -1;
-static gint ett_openflow_v5_group_features_capabilities = -1;
-static gint ett_openflow_v5_group_features_actions_all = -1;
-static gint ett_openflow_v5_group_features_actions_select = -1;
-static gint ett_openflow_v5_group_features_actions_indirect = -1;
-static gint ett_openflow_v5_group_features_actions_ff = -1;
-static gint ett_openflow_v5_meter_band_stats = -1;
-static gint ett_openflow_v5_meter_stats = -1;
-static gint ett_openflow_v5_meter_config = -1;
-static gint ett_openflow_v5_meter_config_flags = -1;
-static gint ett_openflow_v5_meter_features_band_types = -1;
-static gint ett_openflow_v5_meter_features_capabilities = -1;
-static gint ett_openflow_v5_flow_update = -1;
-static gint ett_openflow_v5_multipart_reply_flags = -1;
-static gint ett_openflow_v5_table_desc = -1;
-static gint ett_openflow_v5_table_desc_config = -1;
-static gint ett_openflow_v5_queue_desc = -1;
-static gint ett_openflow_v5_queue_desc_prop = -1;
-static gint ett_openflow_v5_async_config_prop = -1;
-static gint ett_openflow_v5_async_config_prop_reason_packet_in_mask = -1;
-static gint ett_openflow_v5_async_config_prop_reason_port_status_mask = -1;
-static gint ett_openflow_v5_async_config_prop_reason_flow_removed_mask = -1;
-static gint ett_openflow_v5_async_config_prop_reason_role_status_mask = -1;
-static gint ett_openflow_v5_async_config_prop_reason_table_status_mask = -1;
-static gint ett_openflow_v5_async_config_prop_reason_requestforward_mask = -1;
-static gint ett_openflow_v5_metermod_flags = -1;
-static gint ett_openflow_v5_requestforward_request = -1;
-static gint ett_openflow_v5_bundle_control_flags = -1;
-static gint ett_openflow_v5_bundle_prop = -1;
-static gint ett_openflow_v5_bundle_add_flags = -1;
-static gint ett_openflow_v5_bundle_add_message = -1;
-
-static expert_field ei_openflow_v5_match_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_oxm_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_action_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_instruction_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_port_desc_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_port_stats_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_meter_band_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_hello_element_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_error_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_experimenter_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_portmod_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_tablemod_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_table_feature_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_multipart_request_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_queue_stats_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_flow_update_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_multipart_reply_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_queue_desc_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_async_config_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_bundle_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_message_undecoded = EI_INIT;
-static expert_field ei_openflow_v5_length_too_short = EI_INIT;
+static int proto_openflow_v5;
+static int hf_openflow_v5_version;
+static int hf_openflow_v5_type;
+static int hf_openflow_v5_length;
+static int hf_openflow_v5_xid;
+static int hf_openflow_v5_oxm_class;
+static int hf_openflow_v5_oxm_field;
+static int hf_openflow_v5_oxm_field_basic;
+static int hf_openflow_v5_oxm_hm;
+static int hf_openflow_v5_oxm_length;
+static int hf_openflow_v5_oxm_experimenter_experimenter;
+static int hf_openflow_v5_oxm_value;
+static int hf_openflow_v5_oxm_value_etheraddr;
+static int hf_openflow_v5_oxm_value_vlan_present;
+static int hf_openflow_v5_oxm_value_vlan_vid;
+static int hf_openflow_v5_oxm_value_ethertype;
+static int hf_openflow_v5_oxm_value_ipv4addr;
+static int hf_openflow_v5_oxm_value_ipv6addr;
+static int hf_openflow_v5_oxm_value_ipproto;
+static int hf_openflow_v5_oxm_value_uint16;
+static int hf_openflow_v5_oxm_value_uint24;
+static int hf_openflow_v5_oxm_value_uint32;
+static int hf_openflow_v5_oxm_mask;
+static int hf_openflow_v5_oxm_mask_etheraddr;
+static int hf_openflow_v5_oxm_mask_ipv4addr;
+static int hf_openflow_v5_oxm_mask_ipv6addr;
+static int hf_openflow_v5_oxm_mask_vlan;
+static int hf_openflow_v5_match_type;
+static int hf_openflow_v5_match_length;
+static int hf_openflow_v5_match_pad;
+static int hf_openflow_v5_action_type;
+static int hf_openflow_v5_action_length;
+static int hf_openflow_v5_action_experimenter_experimenter;
+static int hf_openflow_v5_oxm_experimenter_value;
+static int hf_openflow_v5_action_output_port;
+static int hf_openflow_v5_action_output_max_len;
+static int hf_openflow_v5_action_output_pad;
+static int hf_openflow_v5_action_copy_ttl_out_pad;
+static int hf_openflow_v5_action_copy_ttl_in_pad;
+static int hf_openflow_v5_action_set_mpls_ttl_ttl;
+static int hf_openflow_v5_action_set_mpls_ttl_pad;
+static int hf_openflow_v5_action_dec_mpls_ttl_pad;
+static int hf_openflow_v5_action_push_vlan_ethertype;
+static int hf_openflow_v5_action_push_vlan_pad;
+static int hf_openflow_v5_action_pop_vlan_pad;
+static int hf_openflow_v5_action_push_mpls_ethertype;
+static int hf_openflow_v5_action_push_mpls_pad;
+static int hf_openflow_v5_action_pop_mpls_ethertype;
+static int hf_openflow_v5_action_pop_mpls_pad;
+static int hf_openflow_v5_action_set_queue_queue_id;
+static int hf_openflow_v5_action_group_group_id;
+static int hf_openflow_v5_action_set_nw_ttl_ttl;
+static int hf_openflow_v5_action_set_nw_ttl_pad;
+static int hf_openflow_v5_action_dec_nw_ttl_pad;
+static int hf_openflow_v5_action_set_field_pad;
+static int hf_openflow_v5_action_push_pbb_ethertype;
+static int hf_openflow_v5_action_push_pbb_pad;
+static int hf_openflow_v5_action_pop_pbb_pad;
+static int hf_openflow_v5_instruction_type;
+static int hf_openflow_v5_instruction_length;
+static int hf_openflow_v5_instruction_experimenter_experimenter;
+static int hf_openflow_v5_instruction_goto_table_table_id;
+static int hf_openflow_v5_instruction_goto_table_pad;
+static int hf_openflow_v5_instruction_write_metadata_pad;
+static int hf_openflow_v5_instruction_write_metadata_value;
+static int hf_openflow_v5_instruction_write_metadata_mask;
+static int hf_openflow_v5_instruction_actions_pad;
+static int hf_openflow_v5_instruction_meter_meter_id;
+static int hf_openflow_v5_port_desc_prop_type;
+static int hf_openflow_v5_port_desc_prop_length;
+static int hf_openflow_v5_port_desc_prop_ethernet_pad;
+static int hf_openflow_v5_port_desc_prop_ethernet_current;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_10mb_hd;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_10mb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_100mb_hd;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_100mb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_1gb_hd;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_1gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_10gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_40gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_100gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_1tb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_other;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_copper;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_fiber;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_autoneg;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_pause;
+static int hf_openflow_v5_port_desc_prop_ethernet_current_pause_asym;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_10mb_hd;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_10mb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_100mb_hd;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_100mb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_1gb_hd;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_1gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_10gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_40gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_100gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_1tb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_other;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_copper;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_fiber;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_autoneg;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_pause;
+static int hf_openflow_v5_port_desc_prop_ethernet_advertised_pause_asym;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_10mb_hd;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_10mb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_100mb_hd;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_100mb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_1gb_hd;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_1gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_10gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_40gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_100gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_1tb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_other;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_copper;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_fiber;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_autoneg;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_pause;
+static int hf_openflow_v5_port_desc_prop_ethernet_supported_pause_asym;
+static int hf_openflow_v5_port_desc_prop_optical_pad;
+static int hf_openflow_v5_port_desc_prop_optical_supported;
+static int hf_openflow_v5_port_desc_prop_optical_supported_rx_tune;
+static int hf_openflow_v5_port_desc_prop_optical_supported_tx_tune;
+static int hf_openflow_v5_port_desc_prop_optical_supported_tx_pwr;
+static int hf_openflow_v5_port_desc_prop_optical_supported_use_freq;
+static int hf_openflow_v5_port_desc_prop_optical_tx_min_freq_lmda;
+static int hf_openflow_v5_port_desc_prop_optical_tx_max_freq_lmda;
+static int hf_openflow_v5_port_desc_prop_optical_tx_grid_freq_lmda;
+static int hf_openflow_v5_port_desc_prop_optical_rx_min_freq_lmda;
+static int hf_openflow_v5_port_desc_prop_optical_rx_max_freq_lmda;
+static int hf_openflow_v5_port_desc_prop_optical_rx_grid_freq_lmda;
+static int hf_openflow_v5_port_desc_prop_optical_tx_pwr_min;
+static int hf_openflow_v5_port_desc_prop_optical_tx_pwr_max;
+static int hf_openflow_v5_port_desc_prop_experimenter_experimenter;
+static int hf_openflow_v5_port_desc_prop_experimenter_exp_type;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_10mb_hd;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_10mb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_100mb_hd;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_100mb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_1gb_hd;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_1gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_10gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_40gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_100gb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_1tb_fd;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_other;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_copper;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_fiber;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_autoneg;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_pause;
+static int hf_openflow_v5_port_desc_prop_ethernet_peer_pause_asym;
+static int hf_openflow_v5_port_desc_prop_ethernet_curr_speed;
+static int hf_openflow_v5_port_desc_prop_ethernet_max_speed;
+static int hf_openflow_v5_port_stats_prop_type;
+static int hf_openflow_v5_port_stats_prop_length;
+static int hf_openflow_v5_port_stats_prop_ethernet_pad;
+static int hf_openflow_v5_port_stats_prop_ethernet_rx_frame_err;
+static int hf_openflow_v5_port_stats_prop_ethernet_rx_over_err;
+static int hf_openflow_v5_port_stats_prop_ethernet_rx_crc_err;
+static int hf_openflow_v5_port_stats_prop_ethernet_collisions;
+static int hf_openflow_v5_port_stats_prop_optical_pad;
+static int hf_openflow_v5_port_stats_prop_optical_flags;
+static int hf_openflow_v5_port_stats_prop_optical_flags_rx_tune;
+static int hf_openflow_v5_port_stats_prop_optical_flags_tx_tune;
+static int hf_openflow_v5_port_stats_prop_optical_flags_tx_pwr;
+static int hf_openflow_v5_port_stats_prop_optical_flags_rx_pwr;
+static int hf_openflow_v5_port_stats_prop_optical_flags_tx_bias;
+static int hf_openflow_v5_port_stats_prop_optical_flags_tx_temp;
+static int hf_openflow_v5_port_stats_prop_optical_tx_freq_lmda;
+static int hf_openflow_v5_port_stats_prop_optical_tx_offset;
+static int hf_openflow_v5_port_stats_prop_optical_tx_grid_span;
+static int hf_openflow_v5_port_stats_prop_optical_rx_freq_lmda;
+static int hf_openflow_v5_port_stats_prop_optical_rx_offset;
+static int hf_openflow_v5_port_stats_prop_optical_rx_grid_span;
+static int hf_openflow_v5_port_stats_prop_optical_tx_pwr;
+static int hf_openflow_v5_port_stats_prop_optical_rx_pwr;
+static int hf_openflow_v5_port_stats_prop_optical_bias_current;
+static int hf_openflow_v5_port_stats_prop_optical_temperature;
+static int hf_openflow_v5_port_stats_prop_experimenter_experimenter;
+static int hf_openflow_v5_port_stats_prop_experimenter_exp_type;
+static int hf_openflow_v5_port_port_no;
+static int hf_openflow_v5_port_length;
+static int hf_openflow_v5_port_pad;
+static int hf_openflow_v5_port_hw_addr;
+static int hf_openflow_v5_port_pad2;
+static int hf_openflow_v5_port_name;
+static int hf_openflow_v5_port_config;
+static int hf_openflow_v5_port_config_port_down;
+static int hf_openflow_v5_port_config_no_recv;
+static int hf_openflow_v5_port_config_no_fwd;
+static int hf_openflow_v5_port_config_no_packet_in;
+static int hf_openflow_v5_port_state;
+static int hf_openflow_v5_port_state_link_down;
+static int hf_openflow_v5_port_state_blocked;
+static int hf_openflow_v5_port_state_live;
+static int hf_openflow_v5_meter_band_type;
+static int hf_openflow_v5_meter_band_len;
+static int hf_openflow_v5_meter_band_rate;
+static int hf_openflow_v5_meter_band_burst_size;
+static int hf_openflow_v5_meter_band_drop_pad;
+static int hf_openflow_v5_meter_band_dscp_remark_prec_level;
+static int hf_openflow_v5_meter_band_dscp_remark_pad;
+static int hf_openflow_v5_meter_band_experimenter_experimenter;
+static int hf_openflow_v5_hello_element_type;
+static int hf_openflow_v5_hello_element_length;
+static int hf_openflow_v5_hello_element_version_bitmap;
+static int hf_openflow_v5_hello_element_pad;
+static int hf_openflow_v5_error_type;
+static int hf_openflow_v5_error_hello_failed_code;
+static int hf_openflow_v5_error_bad_request_code;
+static int hf_openflow_v5_error_bad_action_code;
+static int hf_openflow_v5_error_bad_instruction_code;
+static int hf_openflow_v5_error_bad_match_code;
+static int hf_openflow_v5_error_flow_mod_failed_code;
+static int hf_openflow_v5_error_group_mod_failed_code;
+static int hf_openflow_v5_error_port_mod_failed_code;
+static int hf_openflow_v5_error_table_mod_failed_code;
+static int hf_openflow_v5_error_queue_op_failed_code;
+static int hf_openflow_v5_error_switch_config_failed_code;
+static int hf_openflow_v5_error_role_request_failed_code;
+static int hf_openflow_v5_error_meter_mod_failed_code;
+static int hf_openflow_v5_error_table_features_failed_code;
+static int hf_openflow_v5_error_bad_property_code;
+static int hf_openflow_v5_error_async_config_failed_code;
+static int hf_openflow_v5_error_flow_monitor_failed_code;
+static int hf_openflow_v5_error_bundle_failed_code;
+static int hf_openflow_v5_error_code;
+static int hf_openflow_v5_error_data_text;
+static int hf_openflow_v5_error_data_body;
+static int hf_openflow_v5_error_experimenter;
+static int hf_openflow_v5_echo_data;
+static int hf_openflow_v5_experimenter_experimenter;
+static int hf_openflow_v5_experimenter_exp_type;
+static int hf_openflow_v5_switch_features_datapath_id;
+static int hf_openflow_v5_switch_features_n_buffers;
+static int hf_openflow_v5_switch_features_n_tables;
+static int hf_openflow_v5_switch_features_auxiliary_id;
+static int hf_openflow_v5_switch_features_pad;
+static int hf_openflow_v5_switch_features_capabilities;
+static int hf_openflow_v5_switch_features_capabilities_flow_stats;
+static int hf_openflow_v5_switch_features_capabilities_table_stats;
+static int hf_openflow_v5_switch_features_capabilities_port_stats;
+static int hf_openflow_v5_switch_features_capabilities_group_stats;
+static int hf_openflow_v5_switch_features_capabilities_ip_reasm;
+static int hf_openflow_v5_switch_features_capabilities_queue_stats;
+static int hf_openflow_v5_switch_features_capabilities_port_blocked;
+static int hf_openflow_v5_switch_features_reserved;
+static int hf_openflow_v5_switch_config_flags;
+static int hf_openflow_v5_switch_config_flags_fragments;
+static int hf_openflow_v5_switch_config_miss_send_len;
+static int hf_openflow_v5_packet_in_buffer_id;
+static int hf_openflow_v5_packet_in_total_len;
+static int hf_openflow_v5_packet_in_reason;
+static int hf_openflow_v5_packet_in_table_id;
+static int hf_openflow_v5_packet_in_cookie;
+static int hf_openflow_v5_packet_in_pad;
+static int hf_openflow_v5_flow_removed_cookie;
+static int hf_openflow_v5_flow_removed_priority;
+static int hf_openflow_v5_flow_removed_reason;
+static int hf_openflow_v5_flow_removed_table_id;
+static int hf_openflow_v5_flow_removed_duration_sec;
+static int hf_openflow_v5_flow_removed_duration_nsec;
+static int hf_openflow_v5_flow_removed_idle_timeout;
+static int hf_openflow_v5_flow_removed_hard_timeout;
+static int hf_openflow_v5_flow_removed_packet_count;
+static int hf_openflow_v5_flow_removed_byte_count;
+static int hf_openflow_v5_port_status_reason;
+static int hf_openflow_v5_port_status_pad;
+static int hf_openflow_v5_packet_out_buffer_id;
+static int hf_openflow_v5_packet_out_in_port;
+static int hf_openflow_v5_packet_out_acts_len;
+static int hf_openflow_v5_packet_out_pad;
+static int hf_openflow_v5_flowmod_cookie;
+static int hf_openflow_v5_flowmod_cookie_mask;
+static int hf_openflow_v5_flowmod_table_id;
+static int hf_openflow_v5_flowmod_command;
+static int hf_openflow_v5_flowmod_idle_timeout;
+static int hf_openflow_v5_flowmod_hard_timeout;
+static int hf_openflow_v5_flowmod_priority;
+static int hf_openflow_v5_flowmod_buffer_id;
+static int hf_openflow_v5_flowmod_out_port;
+static int hf_openflow_v5_flowmod_out_group;
+static int hf_openflow_v5_flowmod_flags;
+static int hf_openflow_v5_flowmod_flags_send_flow_rem;
+static int hf_openflow_v5_flowmod_flags_check_overlap;
+static int hf_openflow_v5_flowmod_flags_reset_counts;
+static int hf_openflow_v5_flowmod_flags_no_packet_counts;
+static int hf_openflow_v5_flowmod_flags_no_byte_counts;
+static int hf_openflow_v5_flowmod_importance;
+static int hf_openflow_v5_bucket_length;
+static int hf_openflow_v5_bucket_weight;
+static int hf_openflow_v5_bucket_watch_port;
+static int hf_openflow_v5_bucket_watch_group;
+static int hf_openflow_v5_bucket_pad;
+static int hf_openflow_v5_groupmod_command;
+static int hf_openflow_v5_groupmod_type;
+static int hf_openflow_v5_groupmod_pad;
+static int hf_openflow_v5_groupmod_group_id;
+static int hf_openflow_v5_portmod_prop_type;
+static int hf_openflow_v5_portmod_prop_length;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_10mb_hd;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_10mb_fd;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_100mb_hd;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_100mb_fd;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_1gb_hd;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_1gb_fd;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_10gb_fd;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_40gb_fd;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_100gb_fd;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_1tb_fd;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_other;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_copper;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_fiber;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_autoneg;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_pause;
+static int hf_openflow_v5_portmod_prop_ethernet_advertise_pause_asym;
+static int hf_openflow_v5_portmod_prop_optical_configure;
+static int hf_openflow_v5_portmod_prop_optical_configure_rx_tune;
+static int hf_openflow_v5_portmod_prop_optical_configure_tx_tune;
+static int hf_openflow_v5_portmod_prop_optical_configure_tx_pwr;
+static int hf_openflow_v5_portmod_prop_optical_configure_use_freq;
+static int hf_openflow_v5_portmod_prop_optical_freq_lmda;
+static int hf_openflow_v5_portmod_prop_optical_fl_offset;
+static int hf_openflow_v5_portmod_prop_optical_grid_span;
+static int hf_openflow_v5_portmod_prop_optical_tx_pwr;
+static int hf_openflow_v5_portmod_prop_experimenter_experimenter;
+static int hf_openflow_v5_portmod_prop_experimenter_exp_type;
+static int hf_openflow_v5_portmod_port_no;
+static int hf_openflow_v5_portmod_pad;
+static int hf_openflow_v5_portmod_hw_addr;
+static int hf_openflow_v5_portmod_pad2;
+static int hf_openflow_v5_portmod_config;
+static int hf_openflow_v5_portmod_config_port_down;
+static int hf_openflow_v5_portmod_config_no_recv;
+static int hf_openflow_v5_portmod_config_no_fwd;
+static int hf_openflow_v5_portmod_config_no_packet_in;
+static int hf_openflow_v5_portmod_mask;
+static int hf_openflow_v5_portmod_mask_port_down;
+static int hf_openflow_v5_portmod_mask_no_recv;
+static int hf_openflow_v5_portmod_mask_no_fwd;
+static int hf_openflow_v5_portmod_mask_no_packet_in;
+static int hf_openflow_v5_tablemod_table_id;
+static int hf_openflow_v5_tablemod_pad;
+static int hf_openflow_v5_tablemod_config;
+static int hf_openflow_v5_tablemod_config_eviction;
+static int hf_openflow_v5_tablemod_config_vacancy_events;
+static int hf_openflow_v5_tablemod_prop_type;
+static int hf_openflow_v5_tablemod_prop_length;
+static int hf_openflow_v5_tablemod_prop_eviction_flags;
+static int hf_openflow_v5_tablemod_prop_eviction_flags_other;
+static int hf_openflow_v5_tablemod_prop_eviction_flags_importance;
+static int hf_openflow_v5_tablemod_prop_eviction_flags_lifetime;
+static int hf_openflow_v5_tablemod_prop_vacancy_vacancy_down;
+static int hf_openflow_v5_tablemod_prop_vacancy_vacancy_up;
+static int hf_openflow_v5_tablemod_prop_vacancy_vacancy;
+static int hf_openflow_v5_tablemod_prop_vacancy_pad;
+static int hf_openflow_v5_tablemod_prop_experimenter_experimenter;
+static int hf_openflow_v5_tablemod_prop_experimenter_exp_type;
+static int hf_openflow_v5_flow_stats_request_table_id;
+static int hf_openflow_v5_flow_stats_request_pad;
+static int hf_openflow_v5_flow_stats_request_out_port;
+static int hf_openflow_v5_flow_stats_request_out_group;
+static int hf_openflow_v5_flow_stats_request_pad2;
+static int hf_openflow_v5_flow_stats_request_cookie;
+static int hf_openflow_v5_flow_stats_request_cookie_mask;
+static int hf_openflow_v5_aggregate_stats_request_table_id;
+static int hf_openflow_v5_aggregate_stats_request_pad;
+static int hf_openflow_v5_aggregate_stats_request_out_port;
+static int hf_openflow_v5_aggregate_stats_request_out_group;
+static int hf_openflow_v5_aggregate_stats_request_pad2;
+static int hf_openflow_v5_aggregate_stats_request_cookie;
+static int hf_openflow_v5_aggregate_stats_request_cookie_mask;
+static int hf_openflow_v5_table_feature_prop_type;
+static int hf_openflow_v5_table_feature_prop_length;
+static int hf_openflow_v5_table_feature_prop_next_tables_next_table_id;
+static int hf_openflow_v5_table_feature_prop_table_sync_from_table_id;
+static int hf_openflow_v5_table_feature_prop_experimenter_experimenter;
+static int hf_openflow_v5_table_feature_prop_experimenter_exp_type;
+static int hf_openflow_v5_table_feature_prop_pad;
+static int hf_openflow_v5_table_features_length;
+static int hf_openflow_v5_table_features_table_id;
+static int hf_openflow_v5_table_features_pad;
+static int hf_openflow_v5_table_features_name;
+static int hf_openflow_v5_table_features_metadata_match;
+static int hf_openflow_v5_table_features_metadata_write;
+static int hf_openflow_v5_table_features_capabilities;
+static int hf_openflow_v5_table_features_capabilities_eviction;
+static int hf_openflow_v5_table_features_capabilities_vacancy_events;
+static int hf_openflow_v5_table_features_max_entries;
+static int hf_openflow_v5_port_stats_request_port_no;
+static int hf_openflow_v5_port_stats_request_pad;
+static int hf_openflow_v5_queue_stats_request_port_no;
+static int hf_openflow_v5_queue_stats_request_queue_id;
+static int hf_openflow_v5_group_stats_request_group_id;
+static int hf_openflow_v5_group_stats_request_pad;
+static int hf_openflow_v5_meter_stats_request_meter_id;
+static int hf_openflow_v5_meter_stats_request_pad;
+static int hf_openflow_v5_meter_config_request_meter_id;
+static int hf_openflow_v5_meter_config_request_pad;
+static int hf_openflow_v5_queue_desc_request_port_no;
+static int hf_openflow_v5_queue_desc_request_queue_id;
+static int hf_openflow_v5_flow_monitor_request_monitor_id;
+static int hf_openflow_v5_flow_monitor_request_out_port;
+static int hf_openflow_v5_flow_monitor_request_out_group;
+static int hf_openflow_v5_flow_monitor_request_flags;
+static int hf_openflow_v5_flow_monitor_request_flags_initial;
+static int hf_openflow_v5_flow_monitor_request_flags_add;
+static int hf_openflow_v5_flow_monitor_request_flags_removed;
+static int hf_openflow_v5_flow_monitor_request_flags_modify;
+static int hf_openflow_v5_flow_monitor_request_flags_instructions;
+static int hf_openflow_v5_flow_monitor_request_flags_no_abbrev;
+static int hf_openflow_v5_flow_monitor_request_flags_only_own;
+static int hf_openflow_v5_flow_monitor_request_table_id;
+static int hf_openflow_v5_flow_monitor_request_command;
+static int hf_openflow_v5_multipart_request_type;
+static int hf_openflow_v5_multipart_request_flags;
+static int hf_openflow_v5_multipart_request_flags_more;
+static int hf_openflow_v5_multipart_request_pad;
+static int hf_openflow_v5_multipart_request_experimenter_experimenter;
+static int hf_openflow_v5_multipart_request_experimenter_exp_type;
+static int hf_openflow_v5_switch_description_mfr_desc;
+static int hf_openflow_v5_switch_description_hw_desc;
+static int hf_openflow_v5_switch_description_sw_desc;
+static int hf_openflow_v5_switch_description_serial_num;
+static int hf_openflow_v5_switch_description_dp_desc;
+static int hf_openflow_v5_flow_stats_length;
+static int hf_openflow_v5_flow_stats_table_id;
+static int hf_openflow_v5_flow_stats_pad;
+static int hf_openflow_v5_flow_stats_duration_sec;
+static int hf_openflow_v5_flow_stats_duration_nsec;
+static int hf_openflow_v5_flow_stats_priority;
+static int hf_openflow_v5_flow_stats_idle_timeout;
+static int hf_openflow_v5_flow_stats_hard_timeout;
+static int hf_openflow_v5_flow_stats_flags;
+static int hf_openflow_v5_flow_stats_flags_send_flow_rem;
+static int hf_openflow_v5_flow_stats_flags_check_overlap;
+static int hf_openflow_v5_flow_stats_flags_reset_counts;
+static int hf_openflow_v5_flow_stats_flags_no_packet_counts;
+static int hf_openflow_v5_flow_stats_flags_no_byte_counts;
+static int hf_openflow_v5_flow_stats_importance;
+static int hf_openflow_v5_flow_stats_pad2;
+static int hf_openflow_v5_flow_stats_cookie;
+static int hf_openflow_v5_flow_stats_packet_count;
+static int hf_openflow_v5_flow_stats_byte_count;
+static int hf_openflow_v5_aggregate_stats_packet_count;
+static int hf_openflow_v5_aggregate_stats_byte_count;
+static int hf_openflow_v5_aggregate_stats_flow_count;
+static int hf_openflow_v5_aggregate_stats_pad;
+static int hf_openflow_v5_table_stats_table_id;
+static int hf_openflow_v5_table_stats_pad;
+static int hf_openflow_v5_table_stats_active_count;
+static int hf_openflow_v5_table_stats_lookup_count;
+static int hf_openflow_v5_table_stats_match_count;
+static int hf_openflow_v5_port_stats_length;
+static int hf_openflow_v5_port_stats_pad;
+static int hf_openflow_v5_port_stats_port_no;
+static int hf_openflow_v5_port_stats_duration_sec;
+static int hf_openflow_v5_port_stats_duration_nsec;
+static int hf_openflow_v5_port_stats_rx_packets;
+static int hf_openflow_v5_port_stats_tx_packets;
+static int hf_openflow_v5_port_stats_rx_bytes;
+static int hf_openflow_v5_port_stats_tx_bytes;
+static int hf_openflow_v5_port_stats_rx_dropped;
+static int hf_openflow_v5_port_stats_tx_dropped;
+static int hf_openflow_v5_port_stats_rx_errors;
+static int hf_openflow_v5_port_stats_tx_errors;
+static int hf_openflow_v5_queue_stats_length;
+static int hf_openflow_v5_queue_stats_pad;
+static int hf_openflow_v5_queue_stats_port_no;
+static int hf_openflow_v5_queue_stats_queue_id;
+static int hf_openflow_v5_queue_stats_tx_bytes;
+static int hf_openflow_v5_queue_stats_tx_packets;
+static int hf_openflow_v5_queue_stats_tx_errors;
+static int hf_openflow_v5_queue_stats_duration_sec;
+static int hf_openflow_v5_queue_stats_duration_nsec;
+static int hf_openflow_v5_queue_stats_prop_type;
+static int hf_openflow_v5_queue_stats_prop_length;
+static int hf_openflow_v5_queue_stats_prop_experimenter_experimenter;
+static int hf_openflow_v5_queue_stats_prop_experimenter_exp_type;
+static int hf_openflow_v5_bucket_counter_packet_count;
+static int hf_openflow_v5_bucket_counter_byte_count;
+static int hf_openflow_v5_group_stats_length;
+static int hf_openflow_v5_group_stats_pad;
+static int hf_openflow_v5_group_stats_group_id;
+static int hf_openflow_v5_group_stats_ref_count;
+static int hf_openflow_v5_group_stats_pad2;
+static int hf_openflow_v5_group_stats_packet_count;
+static int hf_openflow_v5_group_stats_byte_count;
+static int hf_openflow_v5_group_desc_length;
+static int hf_openflow_v5_group_desc_type;
+static int hf_openflow_v5_group_desc_pad;
+static int hf_openflow_v5_group_desc_group_id;
+static int hf_openflow_v5_group_features_types;
+static int hf_openflow_v5_group_features_types_all;
+static int hf_openflow_v5_group_features_types_select;
+static int hf_openflow_v5_group_features_types_indirect;
+static int hf_openflow_v5_group_features_types_ff;
+static int hf_openflow_v5_group_features_capabilities;
+static int hf_openflow_v5_group_features_capabilities_select_weight;
+static int hf_openflow_v5_group_features_capabilities_select_liveness;
+static int hf_openflow_v5_group_features_capabilities_chaining;
+static int hf_openflow_v5_group_features_capabilities_chaining_checks;
+static int hf_openflow_v5_group_features_max_groups_all;
+static int hf_openflow_v5_group_features_max_groups_select;
+static int hf_openflow_v5_group_features_max_groups_indirect;
+static int hf_openflow_v5_group_features_max_groups_ff;
+static int hf_openflow_v5_group_features_actions_all;
+static int hf_openflow_v5_group_features_actions_all_output;
+static int hf_openflow_v5_group_features_actions_all_copy_ttl_out;
+static int hf_openflow_v5_group_features_actions_all_copy_ttl_in;
+static int hf_openflow_v5_group_features_actions_all_set_mpls_ttl;
+static int hf_openflow_v5_group_features_actions_all_dec_mpls_ttl;
+static int hf_openflow_v5_group_features_actions_all_push_vlan;
+static int hf_openflow_v5_group_features_actions_all_pop_vlan;
+static int hf_openflow_v5_group_features_actions_all_push_mpls;
+static int hf_openflow_v5_group_features_actions_all_pop_mpls;
+static int hf_openflow_v5_group_features_actions_all_set_queue;
+static int hf_openflow_v5_group_features_actions_all_group;
+static int hf_openflow_v5_group_features_actions_all_set_nw_ttl;
+static int hf_openflow_v5_group_features_actions_all_dec_nw_ttl;
+static int hf_openflow_v5_group_features_actions_all_set_field;
+static int hf_openflow_v5_group_features_actions_all_push_pbb;
+static int hf_openflow_v5_group_features_actions_all_pop_pbb;
+static int hf_openflow_v5_group_features_actions_select;
+static int hf_openflow_v5_group_features_actions_select_output;
+static int hf_openflow_v5_group_features_actions_select_copy_ttl_out;
+static int hf_openflow_v5_group_features_actions_select_copy_ttl_in;
+static int hf_openflow_v5_group_features_actions_select_set_mpls_ttl;
+static int hf_openflow_v5_group_features_actions_select_dec_mpls_ttl;
+static int hf_openflow_v5_group_features_actions_select_push_vlan;
+static int hf_openflow_v5_group_features_actions_select_pop_vlan;
+static int hf_openflow_v5_group_features_actions_select_push_mpls;
+static int hf_openflow_v5_group_features_actions_select_pop_mpls;
+static int hf_openflow_v5_group_features_actions_select_set_queue;
+static int hf_openflow_v5_group_features_actions_select_group;
+static int hf_openflow_v5_group_features_actions_select_set_nw_ttl;
+static int hf_openflow_v5_group_features_actions_select_dec_nw_ttl;
+static int hf_openflow_v5_group_features_actions_select_set_field;
+static int hf_openflow_v5_group_features_actions_select_push_pbb;
+static int hf_openflow_v5_group_features_actions_select_pop_pbb;
+static int hf_openflow_v5_group_features_actions_indirect;
+static int hf_openflow_v5_group_features_actions_indirect_output;
+static int hf_openflow_v5_group_features_actions_indirect_copy_ttl_out;
+static int hf_openflow_v5_group_features_actions_indirect_copy_ttl_in;
+static int hf_openflow_v5_group_features_actions_indirect_set_mpls_ttl;
+static int hf_openflow_v5_group_features_actions_indirect_dec_mpls_ttl;
+static int hf_openflow_v5_group_features_actions_indirect_push_vlan;
+static int hf_openflow_v5_group_features_actions_indirect_pop_vlan;
+static int hf_openflow_v5_group_features_actions_indirect_push_mpls;
+static int hf_openflow_v5_group_features_actions_indirect_pop_mpls;
+static int hf_openflow_v5_group_features_actions_indirect_set_queue;
+static int hf_openflow_v5_group_features_actions_indirect_group;
+static int hf_openflow_v5_group_features_actions_indirect_set_nw_ttl;
+static int hf_openflow_v5_group_features_actions_indirect_dec_nw_ttl;
+static int hf_openflow_v5_group_features_actions_indirect_set_field;
+static int hf_openflow_v5_group_features_actions_indirect_push_pbb;
+static int hf_openflow_v5_group_features_actions_indirect_pop_pbb;
+static int hf_openflow_v5_group_features_actions_ff;
+static int hf_openflow_v5_group_features_actions_ff_output;
+static int hf_openflow_v5_group_features_actions_ff_copy_ttl_out;
+static int hf_openflow_v5_group_features_actions_ff_copy_ttl_in;
+static int hf_openflow_v5_group_features_actions_ff_set_mpls_ttl;
+static int hf_openflow_v5_group_features_actions_ff_dec_mpls_ttl;
+static int hf_openflow_v5_group_features_actions_ff_push_vlan;
+static int hf_openflow_v5_group_features_actions_ff_pop_vlan;
+static int hf_openflow_v5_group_features_actions_ff_push_mpls;
+static int hf_openflow_v5_group_features_actions_ff_pop_mpls;
+static int hf_openflow_v5_group_features_actions_ff_set_queue;
+static int hf_openflow_v5_group_features_actions_ff_group;
+static int hf_openflow_v5_group_features_actions_ff_set_nw_ttl;
+static int hf_openflow_v5_group_features_actions_ff_dec_nw_ttl;
+static int hf_openflow_v5_group_features_actions_ff_set_field;
+static int hf_openflow_v5_group_features_actions_ff_push_pbb;
+static int hf_openflow_v5_group_features_actions_ff_pop_pbb;
+static int hf_openflow_v5_meter_band_stats_packet_band_count;
+static int hf_openflow_v5_meter_band_stats_byte_band_count;
+static int hf_openflow_v5_meter_stats_meter_id;
+static int hf_openflow_v5_meter_stats_len;
+static int hf_openflow_v5_meter_stats_pad;
+static int hf_openflow_v5_meter_stats_flow_count;
+static int hf_openflow_v5_meter_stats_packet_in_count;
+static int hf_openflow_v5_meter_stats_byte_in_count;
+static int hf_openflow_v5_meter_stats_duration_sec;
+static int hf_openflow_v5_meter_stats_duration_nsec;
+static int hf_openflow_v5_meter_config_len;
+static int hf_openflow_v5_meter_config_flags;
+static int hf_openflow_v5_meter_config_flags_kbps;
+static int hf_openflow_v5_meter_config_flags_pktps;
+static int hf_openflow_v5_meter_config_flags_burst;
+static int hf_openflow_v5_meter_config_flags_stats;
+static int hf_openflow_v5_meter_config_meter_id;
+static int hf_openflow_v5_meter_features_max_meter;
+static int hf_openflow_v5_meter_features_band_types;
+static int hf_openflow_v5_meter_features_band_types_drop;
+static int hf_openflow_v5_meter_features_band_types_dscp_remark;
+static int hf_openflow_v5_meter_features_capabilities;
+static int hf_openflow_v5_meter_features_capabilities_kbps;
+static int hf_openflow_v5_meter_features_capabilities_pktps;
+static int hf_openflow_v5_meter_features_capabilities_burst;
+static int hf_openflow_v5_meter_features_capabilities_stats;
+static int hf_openflow_v5_meter_features_max_bands;
+static int hf_openflow_v5_meter_features_max_color;
+static int hf_openflow_v5_meter_features_pad;
+static int hf_openflow_v5_flow_update_length;
+static int hf_openflow_v5_flow_update_event;
+static int hf_openflow_v5_flow_update_full_table_id;
+static int hf_openflow_v5_flow_update_full_reason;
+static int hf_openflow_v5_flow_update_full_zero;
+static int hf_openflow_v5_flow_update_full_idle_timeout;
+static int hf_openflow_v5_flow_update_full_hard_timeout;
+static int hf_openflow_v5_flow_update_full_priority;
+static int hf_openflow_v5_flow_update_full_zeros;
+static int hf_openflow_v5_flow_update_full_cookie;
+static int hf_openflow_v5_flow_update_abbrev_xid;
+static int hf_openflow_v5_flow_update_paused_zeros;
+static int hf_openflow_v5_multipart_reply_type;
+static int hf_openflow_v5_multipart_reply_flags;
+static int hf_openflow_v5_multipart_reply_flags_more;
+static int hf_openflow_v5_multipart_reply_pad;
+static int hf_openflow_v5_multipart_reply_experimenter_experimenter;
+static int hf_openflow_v5_multipart_reply_experimenter_exp_type;
+static int hf_openflow_v5_table_desc_length;
+static int hf_openflow_v5_table_desc_table_id;
+static int hf_openflow_v5_table_desc_pad;
+static int hf_openflow_v5_table_desc_config;
+static int hf_openflow_v5_table_desc_config_eviction;
+static int hf_openflow_v5_table_desc_config_vacancy_events;
+static int hf_openflow_v5_queue_desc_port_no;
+static int hf_openflow_v5_queue_desc_queue_id;
+static int hf_openflow_v5_queue_desc_len;
+static int hf_openflow_v5_queue_desc_pad;
+static int hf_openflow_v5_queue_desc_prop_property;
+static int hf_openflow_v5_queue_desc_prop_len;
+static int hf_openflow_v5_queue_desc_prop_pad;
+static int hf_openflow_v5_queue_desc_prop_min_rate_rate;
+static int hf_openflow_v5_queue_desc_prop_min_rate_pad;
+static int hf_openflow_v5_queue_desc_prop_max_rate_rate;
+static int hf_openflow_v5_queue_desc_prop_max_rate_pad;
+static int hf_openflow_v5_queue_desc_prop_experimenter_experimenter;
+static int hf_openflow_v5_queue_desc_prop_experimenter_exp_type;
+static int hf_openflow_v5_role_request_role;
+static int hf_openflow_v5_role_request_pad;
+static int hf_openflow_v5_role_request_generation_id;
+static int hf_openflow_v5_role_reply_role;
+static int hf_openflow_v5_role_reply_pad;
+static int hf_openflow_v5_role_reply_generation_id;
+static int hf_openflow_v5_async_config_prop_type;
+static int hf_openflow_v5_async_config_prop_length;
+static int hf_openflow_v5_async_config_prop_reason_packet_in_mask;
+static int hf_openflow_v5_async_config_prop_reason_packet_in_mask_table_miss;
+static int hf_openflow_v5_async_config_prop_reason_packet_in_mask_apply_action;
+static int hf_openflow_v5_async_config_prop_reason_packet_in_mask_invalid_ttl;
+static int hf_openflow_v5_async_config_prop_reason_packet_in_mask_action_set;
+static int hf_openflow_v5_async_config_prop_reason_packet_in_mask_group;
+static int hf_openflow_v5_async_config_prop_reason_packet_in_mask_packet_out;
+static int hf_openflow_v5_async_config_prop_reason_port_status_mask;
+static int hf_openflow_v5_async_config_prop_reason_port_status_mask_add;
+static int hf_openflow_v5_async_config_prop_reason_port_status_mask_delete;
+static int hf_openflow_v5_async_config_prop_reason_port_status_mask_modify;
+static int hf_openflow_v5_async_config_prop_reason_flow_removed_mask;
+static int hf_openflow_v5_async_config_prop_reason_flow_removed_mask_idle_timeout;
+static int hf_openflow_v5_async_config_prop_reason_flow_removed_mask_hard_timeout;
+static int hf_openflow_v5_async_config_prop_reason_flow_removed_mask_delete;
+static int hf_openflow_v5_async_config_prop_reason_flow_removed_mask_group_delete;
+static int hf_openflow_v5_async_config_prop_reason_flow_removed_mask_meter_delete;
+static int hf_openflow_v5_async_config_prop_reason_flow_removed_mask_eviction;
+static int hf_openflow_v5_async_config_prop_reason_role_status_mask;
+static int hf_openflow_v5_async_config_prop_reason_role_status_mask_master_request;
+static int hf_openflow_v5_async_config_prop_reason_role_status_mask_config;
+static int hf_openflow_v5_async_config_prop_reason_role_status_mask_experimenter;
+static int hf_openflow_v5_async_config_prop_reason_table_status_mask;
+static int hf_openflow_v5_async_config_prop_reason_table_status_mask_vacancy_down;
+static int hf_openflow_v5_async_config_prop_reason_table_status_mask_vacancy_up;
+static int hf_openflow_v5_async_config_prop_reason_requestforward_mask;
+static int hf_openflow_v5_async_config_prop_reason_requestforward_mask_group_mod;
+static int hf_openflow_v5_async_config_prop_reason_requestforward_mask_meter_mod;
+static int hf_openflow_v5_async_config_prop_experimenter_experimenter;
+static int hf_openflow_v5_async_config_prop_experimenter_exp_type;
+static int hf_openflow_v5_metermod_command;
+static int hf_openflow_v5_metermod_flags;
+static int hf_openflow_v5_metermod_flags_kbps;
+static int hf_openflow_v5_metermod_flags_pktps;
+static int hf_openflow_v5_metermod_flags_burst;
+static int hf_openflow_v5_metermod_flags_stats;
+static int hf_openflow_v5_metermod_meter_id;
+static int hf_openflow_v5_role_status_role;
+static int hf_openflow_v5_role_status_reason;
+static int hf_openflow_v5_role_status_pad;
+static int hf_openflow_v5_role_status_generation_id;
+static int hf_openflow_v5_table_status_reason;
+static int hf_openflow_v5_table_status_pad;
+static int hf_openflow_v5_bundle_control_bundle_id;
+static int hf_openflow_v5_bundle_control_type;
+static int hf_openflow_v5_bundle_control_flags;
+static int hf_openflow_v5_bundle_control_flags_atomic;
+static int hf_openflow_v5_bundle_control_flags_ordered;
+static int hf_openflow_v5_bundle_prop_type;
+static int hf_openflow_v5_bundle_prop_length;
+static int hf_openflow_v5_bundle_prop_experimenter_experimenter;
+static int hf_openflow_v5_bundle_prop_experimenter_exp_type;
+static int hf_openflow_v5_bundle_add_bundle_id;
+static int hf_openflow_v5_bundle_add_pad;
+static int hf_openflow_v5_bundle_add_flags;
+static int hf_openflow_v5_bundle_add_flags_atomic;
+static int hf_openflow_v5_bundle_add_flags_ordered;
+
+static gint ett_openflow_v5;
+static gint ett_openflow_v5_flowmod_flags;
+static gint ett_openflow_v5_bucket;
+static gint ett_openflow_v5_oxm;
+static gint ett_openflow_v5_match;
+static gint ett_openflow_v5_action;
+static gint ett_openflow_v5_instruction;
+static gint ett_openflow_v5_port_desc_prop;
+static gint ett_openflow_v5_port_desc_prop_ethernet_current;
+static gint ett_openflow_v5_port_desc_prop_ethernet_advertised;
+static gint ett_openflow_v5_port_desc_prop_ethernet_supported;
+static gint ett_openflow_v5_port_desc_prop_ethernet_peer;
+static gint ett_openflow_v5_port_desc_prop_optical_supported;
+static gint ett_openflow_v5_port_stats_prop;
+static gint ett_openflow_v5_port_stats_prop_optical_flags;
+static gint ett_openflow_v5_port;
+static gint ett_openflow_v5_port_config;
+static gint ett_openflow_v5_port_state;
+static gint ett_openflow_v5_meter_band;
+static gint ett_openflow_v5_hello_element;
+static gint ett_openflow_v5_error_data;
+static gint ett_openflow_v5_switch_features_capabilities;
+static gint ett_openflow_v5_switch_config_flags;
+static gint ett_openflow_v5_packet_in_data;
+static gint ett_openflow_v5_packet_out_data;
+static gint ett_openflow_v5_portmod_prop;
+static gint ett_openflow_v5_portmod_prop_ethernet_advertise;
+static gint ett_openflow_v5_portmod_prop_optical_configure;
+static gint ett_openflow_v5_portmod_config;
+static gint ett_openflow_v5_portmod_mask;
+static gint ett_openflow_v5_tablemod_config;
+static gint ett_openflow_v5_tablemod_prop;
+static gint ett_openflow_v5_tablemod_prop_eviction_flags;
+static gint ett_openflow_v5_table_features;
+static gint ett_openflow_v5_table_features_capabilities;
+static gint ett_openflow_v5_table_feature_prop;
+static gint ett_openflow_v5_table_feature_prop_instruction_id;
+static gint ett_openflow_v5_table_feature_prop_action_id;
+static gint ett_openflow_v5_table_feature_prop_oxm_id;
+static gint ett_openflow_v5_flow_monitor_request_flags;
+static gint ett_openflow_v5_multipart_request_flags;
+static gint ett_openflow_v5_flow_stats;
+static gint ett_openflow_v5_flow_stats_flags;
+static gint ett_openflow_v5_table_stats;
+static gint ett_openflow_v5_port_stats;
+static gint ett_openflow_v5_queue_stats;
+static gint ett_openflow_v5_queue_stats_prop;
+static gint ett_openflow_v5_bucket_counter;
+static gint ett_openflow_v5_group_stats;
+static gint ett_openflow_v5_group_desc;
+static gint ett_openflow_v5_group_features_types;
+static gint ett_openflow_v5_group_features_capabilities;
+static gint ett_openflow_v5_group_features_actions_all;
+static gint ett_openflow_v5_group_features_actions_select;
+static gint ett_openflow_v5_group_features_actions_indirect;
+static gint ett_openflow_v5_group_features_actions_ff;
+static gint ett_openflow_v5_meter_band_stats;
+static gint ett_openflow_v5_meter_stats;
+static gint ett_openflow_v5_meter_config;
+static gint ett_openflow_v5_meter_config_flags;
+static gint ett_openflow_v5_meter_features_band_types;
+static gint ett_openflow_v5_meter_features_capabilities;
+static gint ett_openflow_v5_flow_update;
+static gint ett_openflow_v5_multipart_reply_flags;
+static gint ett_openflow_v5_table_desc;
+static gint ett_openflow_v5_table_desc_config;
+static gint ett_openflow_v5_queue_desc;
+static gint ett_openflow_v5_queue_desc_prop;
+static gint ett_openflow_v5_async_config_prop;
+static gint ett_openflow_v5_async_config_prop_reason_packet_in_mask;
+static gint ett_openflow_v5_async_config_prop_reason_port_status_mask;
+static gint ett_openflow_v5_async_config_prop_reason_flow_removed_mask;
+static gint ett_openflow_v5_async_config_prop_reason_role_status_mask;
+static gint ett_openflow_v5_async_config_prop_reason_table_status_mask;
+static gint ett_openflow_v5_async_config_prop_reason_requestforward_mask;
+static gint ett_openflow_v5_metermod_flags;
+static gint ett_openflow_v5_requestforward_request;
+static gint ett_openflow_v5_bundle_control_flags;
+static gint ett_openflow_v5_bundle_prop;
+static gint ett_openflow_v5_bundle_add_flags;
+static gint ett_openflow_v5_bundle_add_message;
+
+static expert_field ei_openflow_v5_match_undecoded;
+static expert_field ei_openflow_v5_oxm_undecoded;
+static expert_field ei_openflow_v5_action_undecoded;
+static expert_field ei_openflow_v5_instruction_undecoded;
+static expert_field ei_openflow_v5_port_desc_prop_undecoded;
+static expert_field ei_openflow_v5_port_stats_prop_undecoded;
+static expert_field ei_openflow_v5_meter_band_undecoded;
+static expert_field ei_openflow_v5_hello_element_undecoded;
+static expert_field ei_openflow_v5_error_undecoded;
+static expert_field ei_openflow_v5_experimenter_undecoded;
+static expert_field ei_openflow_v5_portmod_prop_undecoded;
+static expert_field ei_openflow_v5_tablemod_prop_undecoded;
+static expert_field ei_openflow_v5_table_feature_prop_undecoded;
+static expert_field ei_openflow_v5_multipart_request_undecoded;
+static expert_field ei_openflow_v5_queue_stats_prop_undecoded;
+static expert_field ei_openflow_v5_flow_update_undecoded;
+static expert_field ei_openflow_v5_multipart_reply_undecoded;
+static expert_field ei_openflow_v5_queue_desc_prop_undecoded;
+static expert_field ei_openflow_v5_async_config_prop_undecoded;
+static expert_field ei_openflow_v5_bundle_prop_undecoded;
+static expert_field ei_openflow_v5_message_undecoded;
+static expert_field ei_openflow_v5_length_too_short;
 
 static const value_string openflow_v5_version_values[] = {
     { 0x05, "1.4" },
diff --git a/epan/dissectors/packet-openflow_v6.c b/epan/dissectors/packet-openflow_v6.c
index 12e2be1407..2ff7423e85 100644
--- a/epan/dissectors/packet-openflow_v6.c
+++ b/epan/dissectors/packet-openflow_v6.c
@@ -27,886 +27,886 @@ static int dissect_openflow_message_v6(tvbuff_t *, packet_info *, proto_tree *,
 
 static dissector_handle_t eth_withoutfcs_handle;
 
-static int proto_openflow_v6 = -1;
-static int hf_openflow_v6_version = -1;
-static int hf_openflow_v6_type = -1;
-static int hf_openflow_v6_length = -1;
-static int hf_openflow_v6_xid = -1;
-static int hf_openflow_v6_oxm_class = -1;
-static int hf_openflow_v6_oxm_field = -1;
-static int hf_openflow_v6_oxm_field_basic = -1;
-static int hf_openflow_v6_oxm_hm = -1;
-static int hf_openflow_v6_oxm_length = -1;
-static int hf_openflow_v6_oxm_experimenter_experimenter = -1;
-static int hf_openflow_v6_oxm_value = -1;
-static int hf_openflow_v6_oxm_value_etheraddr = -1;
-static int hf_openflow_v6_oxm_value_vlan_present = -1;
-static int hf_openflow_v6_oxm_value_vlan_vid = -1;
-static int hf_openflow_v6_oxm_value_ethertype = -1;
-static int hf_openflow_v6_oxm_value_ipv4addr = -1;
-static int hf_openflow_v6_oxm_value_ipv6addr = -1;
-static int hf_openflow_v6_oxm_value_ipproto = -1;
-static int hf_openflow_v6_oxm_value_uint16 = -1;
-static int hf_openflow_v6_oxm_value_uint24 = -1;
-static int hf_openflow_v6_oxm_value_uint32 = -1;
-static int hf_openflow_v6_oxm_mask = -1;
-static int hf_openflow_v6_oxm_mask_etheraddr = -1;
-static int hf_openflow_v6_oxm_mask_ipv4addr = -1;
-static int hf_openflow_v6_oxm_mask_ipv6addr = -1;
-static int hf_openflow_v6_oxm_mask_vlan = -1;
-static int hf_openflow_v6_match_type = -1;
-static int hf_openflow_v6_match_length = -1;
-static int hf_openflow_v6_match_pad = -1;
-static int hf_openflow_v6_action_type = -1;
-static int hf_openflow_v6_action_length = -1;
-static int hf_openflow_v6_action_experimenter_experimenter = -1;
-static int hf_openflow_v6_oxm_experimenter_value = -1;
-static int hf_openflow_v6_oxm_register = -1;
-static int hf_openflow_v6_action_output_port = -1;
-static int hf_openflow_v6_action_output_max_len = -1;
-static int hf_openflow_v6_action_output_pad = -1;
-static int hf_openflow_v6_action_copy_ttl_out_pad = -1;
-static int hf_openflow_v6_action_copy_ttl_in_pad = -1;
-static int hf_openflow_v6_action_set_mpls_ttl_ttl = -1;
-static int hf_openflow_v6_action_set_mpls_ttl_pad = -1;
-static int hf_openflow_v6_action_dec_mpls_ttl_pad = -1;
-static int hf_openflow_v6_action_push_vlan_ethertype = -1;
-static int hf_openflow_v6_action_push_vlan_pad = -1;
-static int hf_openflow_v6_action_pop_vlan_pad = -1;
-static int hf_openflow_v6_action_push_mpls_ethertype = -1;
-static int hf_openflow_v6_action_push_mpls_pad = -1;
-static int hf_openflow_v6_action_pop_mpls_ethertype = -1;
-static int hf_openflow_v6_action_pop_mpls_pad = -1;
-static int hf_openflow_v6_action_set_queue_queue_id = -1;
-static int hf_openflow_v6_action_group_group_id = -1;
-static int hf_openflow_v6_action_set_nw_ttl_ttl = -1;
-static int hf_openflow_v6_action_set_nw_ttl_pad = -1;
-static int hf_openflow_v6_action_dec_nw_ttl_pad = -1;
-static int hf_openflow_v6_action_set_field_pad = -1;
-static int hf_openflow_v6_action_push_pbb_ethertype = -1;
-static int hf_openflow_v6_action_push_pbb_pad = -1;
-static int hf_openflow_v6_action_pop_pbb_pad = -1;
-static int hf_openflow_v6_action_copy_field_n_bits = -1;
-static int hf_openflow_v6_action_copy_field_src_offset = -1;
-static int hf_openflow_v6_action_copy_field_dst_offset = -1;
-static int hf_openflow_v6_action_copy_field_pad = -1;
-static int hf_openflow_v6_action_meter_id = -1;
-static int hf_openflow_v6_instruction_type = -1;
-static int hf_openflow_v6_instruction_length = -1;
-static int hf_openflow_v6_instruction_experimenter_experimenter = -1;
-static int hf_openflow_v6_instruction_goto_table_table_id = -1;
-static int hf_openflow_v6_instruction_goto_table_pad = -1;
-static int hf_openflow_v6_instruction_write_metadata_pad = -1;
-static int hf_openflow_v6_instruction_write_metadata_value = -1;
-static int hf_openflow_v6_instruction_write_metadata_mask = -1;
-static int hf_openflow_v6_instruction_actions_pad = -1;
-static int hf_openflow_v6_port_desc_prop_type = -1;
-static int hf_openflow_v6_port_desc_prop_length = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_pad = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_10mb_hd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_10mb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_100mb_hd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_100mb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_1gb_hd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_1gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_10gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_40gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_100gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_1tb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_other = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_copper = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_fiber = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_autoneg = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_pause = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_pause_asym = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_current_reserved = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_10mb_hd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_10mb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_100mb_hd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_100mb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_1gb_hd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_1gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_10gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_40gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_100gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_1tb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_other = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_copper = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_fiber = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_autoneg = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_pause = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_pause_asym = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_advertised_reserved = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_10mb_hd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_10mb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_100mb_hd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_100mb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_1gb_hd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_1gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_10gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_40gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_100gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_1tb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_other = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_copper = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_fiber = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_autoneg = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_pause = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_pause_asym = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_supported_reserved = -1;
-static int hf_openflow_v6_port_desc_prop_optical_pad = -1;
-static int hf_openflow_v6_port_desc_prop_optical_supported = -1;
-static int hf_openflow_v6_port_desc_prop_optical_supported_rx_tune = -1;
-static int hf_openflow_v6_port_desc_prop_optical_supported_tx_tune = -1;
-static int hf_openflow_v6_port_desc_prop_optical_supported_tx_pwr = -1;
-static int hf_openflow_v6_port_desc_prop_optical_supported_use_freq = -1;
-static int hf_openflow_v6_port_desc_prop_optical_tx_min_freq_lmda = -1;
-static int hf_openflow_v6_port_desc_prop_optical_tx_max_freq_lmda = -1;
-static int hf_openflow_v6_port_desc_prop_optical_tx_grid_freq_lmda = -1;
-static int hf_openflow_v6_port_desc_prop_optical_rx_min_freq_lmda = -1;
-static int hf_openflow_v6_port_desc_prop_optical_rx_max_freq_lmda = -1;
-static int hf_openflow_v6_port_desc_prop_optical_rx_grid_freq_lmda = -1;
-static int hf_openflow_v6_port_desc_prop_optical_tx_pwr_min = -1;
-static int hf_openflow_v6_port_desc_prop_optical_tx_pwr_max = -1;
-static int hf_openflow_v6_port_desc_prop_experimenter_experimenter = -1;
-static int hf_openflow_v6_port_desc_prop_experimenter_exp_type = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_10mb_hd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_10mb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_100mb_hd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_100mb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_1gb_hd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_1gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_10gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_40gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_100gb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_1tb_fd = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_other = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_copper = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_fiber = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_autoneg = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_pause = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_pause_asym = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_peer_reserved = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_curr_speed = -1;
-static int hf_openflow_v6_port_desc_prop_ethernet_max_speed = -1;
-static int hf_openflow_v6_port_stats_prop_type = -1;
-static int hf_openflow_v6_port_stats_prop_length = -1;
-static int hf_openflow_v6_port_stats_prop_ethernet_pad = -1;
-static int hf_openflow_v6_port_stats_prop_ethernet_rx_frame_err = -1;
-static int hf_openflow_v6_port_stats_prop_ethernet_rx_over_err = -1;
-static int hf_openflow_v6_port_stats_prop_ethernet_rx_crc_err = -1;
-static int hf_openflow_v6_port_stats_prop_ethernet_collisions = -1;
-static int hf_openflow_v6_port_stats_prop_optical_pad = -1;
-static int hf_openflow_v6_port_stats_prop_optical_flags = -1;
-static int hf_openflow_v6_port_stats_prop_optical_flags_rx_tune = -1;
-static int hf_openflow_v6_port_stats_prop_optical_flags_tx_tune = -1;
-static int hf_openflow_v6_port_stats_prop_optical_flags_tx_pwr = -1;
-static int hf_openflow_v6_port_stats_prop_optical_flags_rx_pwr = -1;
-static int hf_openflow_v6_port_stats_prop_optical_flags_tx_bias = -1;
-static int hf_openflow_v6_port_stats_prop_optical_flags_tx_temp = -1;
-static int hf_openflow_v6_port_stats_prop_optical_tx_freq_lmda = -1;
-static int hf_openflow_v6_port_stats_prop_optical_tx_offset = -1;
-static int hf_openflow_v6_port_stats_prop_optical_tx_grid_span = -1;
-static int hf_openflow_v6_port_stats_prop_optical_rx_freq_lmda = -1;
-static int hf_openflow_v6_port_stats_prop_optical_rx_offset = -1;
-static int hf_openflow_v6_port_stats_prop_optical_rx_grid_span = -1;
-static int hf_openflow_v6_port_stats_prop_optical_tx_pwr = -1;
-static int hf_openflow_v6_port_stats_prop_optical_rx_pwr = -1;
-static int hf_openflow_v6_port_stats_prop_optical_bias_current = -1;
-static int hf_openflow_v6_port_stats_prop_optical_temperature = -1;
-static int hf_openflow_v6_port_stats_prop_experimenter_experimenter = -1;
-static int hf_openflow_v6_port_stats_prop_experimenter_exp_type = -1;
-static int hf_openflow_v6_port_port_no = -1;
-static int hf_openflow_v6_port_length = -1;
-static int hf_openflow_v6_port_pad = -1;
-static int hf_openflow_v6_port_hw_addr = -1;
-static int hf_openflow_v6_port_pad2 = -1;
-static int hf_openflow_v6_port_name = -1;
-static int hf_openflow_v6_port_config = -1;
-static int hf_openflow_v6_port_config_port_down = -1;
-static int hf_openflow_v6_port_config_no_recv = -1;
-static int hf_openflow_v6_port_config_no_fwd = -1;
-static int hf_openflow_v6_port_config_no_packet_in = -1;
-static int hf_openflow_v6_port_state = -1;
-static int hf_openflow_v6_port_state_link_down = -1;
-static int hf_openflow_v6_port_state_blocked = -1;
-static int hf_openflow_v6_port_state_live = -1;
-static int hf_openflow_v6_meter_band_type = -1;
-static int hf_openflow_v6_meter_band_len = -1;
-static int hf_openflow_v6_meter_band_rate = -1;
-static int hf_openflow_v6_meter_band_burst_size = -1;
-static int hf_openflow_v6_meter_band_drop_pad = -1;
-static int hf_openflow_v6_meter_band_dscp_remark_prec_level = -1;
-static int hf_openflow_v6_meter_band_dscp_remark_pad= -1;
-static int hf_openflow_v6_meter_band_experimenter_experimenter = -1;
-static int hf_openflow_v6_hello_element_type = -1;
-static int hf_openflow_v6_hello_element_length = -1;
-static int hf_openflow_v6_hello_element_version_bitmap = -1;
-static int hf_openflow_v6_hello_element_pad = -1;
-static int hf_openflow_v6_error_type = -1;
-static int hf_openflow_v6_error_hello_failed_code = -1;
-static int hf_openflow_v6_error_bad_request_code = -1;
-static int hf_openflow_v6_error_bad_action_code = -1;
-static int hf_openflow_v6_error_bad_instruction_code = -1;
-static int hf_openflow_v6_error_bad_match_code = -1;
-static int hf_openflow_v6_error_flow_mod_failed_code = -1;
-static int hf_openflow_v6_error_group_mod_failed_code = -1;
-static int hf_openflow_v6_error_port_mod_failed_code = -1;
-static int hf_openflow_v6_error_table_mod_failed_code = -1;
-static int hf_openflow_v6_error_queue_op_failed_code = -1;
-static int hf_openflow_v6_error_switch_config_failed_code = -1;
-static int hf_openflow_v6_error_role_request_failed_code = -1;
-static int hf_openflow_v6_error_meter_mod_failed_code = -1;
-static int hf_openflow_v6_error_table_features_failed_code = -1;
-static int hf_openflow_v6_error_bad_property_code = -1;
-static int hf_openflow_v6_error_async_config_failed_code = -1;
-static int hf_openflow_v6_error_flow_monitor_failed_code = -1;
-static int hf_openflow_v6_error_bundle_failed_code = -1;
-static int hf_openflow_v6_error_code = -1;
-static int hf_openflow_v6_error_data_text = -1;
-static int hf_openflow_v6_error_data_body = -1;
-static int hf_openflow_v6_error_experimenter = -1;
-static int hf_openflow_v6_echo_data = -1;
-static int hf_openflow_v6_experimenter_experimenter = -1;
-static int hf_openflow_v6_experimenter_exp_type = -1;
-static int hf_openflow_v6_switch_features_datapath_id = -1;
-static int hf_openflow_v6_switch_features_n_buffers = -1;
-static int hf_openflow_v6_switch_features_n_tables = -1;
-static int hf_openflow_v6_switch_features_auxiliary_id = -1;
-static int hf_openflow_v6_switch_features_pad = -1;
-static int hf_openflow_v6_switch_features_capabilities = -1;
-static int hf_openflow_v6_switch_features_capabilities_flow_stats = -1;
-static int hf_openflow_v6_switch_features_capabilities_table_stats = -1;
-static int hf_openflow_v6_switch_features_capabilities_port_stats = -1;
-static int hf_openflow_v6_switch_features_capabilities_group_stats = -1;
-static int hf_openflow_v6_switch_features_capabilities_ip_reasm = -1;
-static int hf_openflow_v6_switch_features_capabilities_queue_stats = -1;
-static int hf_openflow_v6_switch_features_capabilities_port_blocked = -1;
-static int hf_openflow_v6_switch_features_capabilities_bundles = -1;
-static int hf_openflow_v6_switch_features_capabilities_flow_monitoring = -1;
-static int hf_openflow_v6_switch_features_reserved = -1;
-static int hf_openflow_v6_switch_config_flags = -1;
-static int hf_openflow_v6_switch_config_flags_fragments = -1;
-static int hf_openflow_v6_switch_config_miss_send_len = -1;
-static int hf_openflow_v6_packet_in_buffer_id = -1;
-static int hf_openflow_v6_packet_in_total_len = -1;
-static int hf_openflow_v6_packet_in_reason = -1;
-static int hf_openflow_v6_packet_in_table_id = -1;
-static int hf_openflow_v6_packet_in_cookie = -1;
-static int hf_openflow_v6_packet_in_pad = -1;
-static int hf_openflow_v6_flow_removed_cookie = -1;
-static int hf_openflow_v6_flow_removed_priority = -1;
-static int hf_openflow_v6_flow_removed_reason = -1;
-static int hf_openflow_v6_flow_removed_table_id = -1;
-static int hf_openflow_v6_flow_removed_idle_timeout = -1;
-static int hf_openflow_v6_flow_removed_hard_timeout = -1;
-static int hf_openflow_v6_port_status_reason = -1;
-static int hf_openflow_v6_port_status_pad = -1;
-static int hf_openflow_v6_packet_out_buffer_id = -1;
-static int hf_openflow_v6_packet_out_acts_len = -1;
-static int hf_openflow_v6_packet_out_pad = -1;
-static int hf_openflow_v6_flowmod_cookie = -1;
-static int hf_openflow_v6_flowmod_cookie_mask = -1;
-static int hf_openflow_v6_flowmod_table_id = -1;
-static int hf_openflow_v6_flowmod_command = -1;
-static int hf_openflow_v6_flowmod_idle_timeout = -1;
-static int hf_openflow_v6_flowmod_hard_timeout = -1;
-static int hf_openflow_v6_flowmod_priority = -1;
-static int hf_openflow_v6_flowmod_buffer_id = -1;
-static int hf_openflow_v6_flowmod_out_port = -1;
-static int hf_openflow_v6_flowmod_out_group = -1;
-static int hf_openflow_v6_flowmod_flags = -1;
-static int hf_openflow_v6_flowmod_flags_send_flow_rem = -1;
-static int hf_openflow_v6_flowmod_flags_check_overlap = -1;
-static int hf_openflow_v6_flowmod_flags_reset_counts = -1;
-static int hf_openflow_v6_flowmod_flags_no_packet_counts = -1;
-static int hf_openflow_v6_flowmod_flags_no_byte_counts = -1;
-static int hf_openflow_v6_flowmod_importance = -1;
-static int hf_openflow_v6_bucket_length = -1;
-static int hf_openflow_v6_bucket_weight = -1;
-static int hf_openflow_v6_bucket_watch_port = -1;
-static int hf_openflow_v6_bucket_watch_group = -1;
-static int hf_openflow_v6_bucket_pad = -1;
-static int hf_openflow_v6_groupmod_command = -1;
-static int hf_openflow_v6_groupmod_type = -1;
-static int hf_openflow_v6_groupmod_pad = -1;
-static int hf_openflow_v6_groupmod_group_id = -1;
-static int hf_openflow_v6_groupmod_bucket_array_len = -1;
-static int hf_openflow_v6_groupmod_command_bucket_id = -1;
-static int hf_openflow_v6_portmod_prop_type = -1;
-static int hf_openflow_v6_portmod_prop_length = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_10mb_hd = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_10mb_fd = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_100mb_hd = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_100mb_fd = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_1gb_hd = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_1gb_fd = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_10gb_fd = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_40gb_fd = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_100gb_fd = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_1tb_fd = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_other = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_copper = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_fiber = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_autoneg = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_pause = -1;
-static int hf_openflow_v6_portmod_prop_ethernet_advertise_pause_asym = -1;
-static int hf_openflow_v6_portmod_prop_optical_configure = -1;
-static int hf_openflow_v6_portmod_prop_optical_configure_rx_tune = -1;
-static int hf_openflow_v6_portmod_prop_optical_configure_tx_tune = -1;
-static int hf_openflow_v6_portmod_prop_optical_configure_tx_pwr = -1;
-static int hf_openflow_v6_portmod_prop_optical_configure_use_freq = -1;
-static int hf_openflow_v6_portmod_prop_optical_freq_lmda = -1;
-static int hf_openflow_v6_portmod_prop_optical_fl_offset = -1;
-static int hf_openflow_v6_portmod_prop_optical_grid_span = -1;
-static int hf_openflow_v6_portmod_prop_optical_tx_pwr = -1;
-static int hf_openflow_v6_portmod_prop_experimenter_experimenter = -1;
-static int hf_openflow_v6_portmod_prop_experimenter_exp_type = -1;
-static int hf_openflow_v6_portmod_port_no = -1;
-static int hf_openflow_v6_portmod_pad = -1;
-static int hf_openflow_v6_portmod_hw_addr = -1;
-static int hf_openflow_v6_portmod_pad2 = -1;
-static int hf_openflow_v6_portmod_config = -1;
-static int hf_openflow_v6_portmod_config_port_down = -1;
-static int hf_openflow_v6_portmod_config_no_recv = -1;
-static int hf_openflow_v6_portmod_config_no_fwd = -1;
-static int hf_openflow_v6_portmod_config_no_packet_in = -1;
-static int hf_openflow_v6_portmod_mask = -1;
-static int hf_openflow_v6_portmod_mask_port_down = -1;
-static int hf_openflow_v6_portmod_mask_no_recv = -1;
-static int hf_openflow_v6_portmod_mask_no_fwd = -1;
-static int hf_openflow_v6_portmod_mask_no_packet_in = -1;
-static int hf_openflow_v6_tablemod_table_id = -1;
-static int hf_openflow_v6_tablemod_pad = -1;
-static int hf_openflow_v6_tablemod_config = -1;
-static int hf_openflow_v6_tablemod_config_eviction = -1;
-static int hf_openflow_v6_tablemod_config_vacancy_events = -1;
-static int hf_openflow_v6_tablemod_prop_type = -1;
-static int hf_openflow_v6_tablemod_prop_length = -1;
-static int hf_openflow_v6_tablemod_prop_eviction_flags = -1;
-static int hf_openflow_v6_tablemod_prop_eviction_flags_other = -1;
-static int hf_openflow_v6_tablemod_prop_eviction_flags_importance = -1;
-static int hf_openflow_v6_tablemod_prop_eviction_flags_lifetime = -1;
-static int hf_openflow_v6_tablemod_prop_vacancy_vacancy_down = -1;
-static int hf_openflow_v6_tablemod_prop_vacancy_vacancy_up = -1;
-static int hf_openflow_v6_tablemod_prop_vacancy_vacancy = -1;
-static int hf_openflow_v6_tablemod_prop_vacancy_pad = -1;
-static int hf_openflow_v6_tablemod_prop_experimenter_experimenter = -1;
-static int hf_openflow_v6_tablemod_prop_experimenter_exp_type = -1;
-static int hf_openflow_v6_flow_stats_request_table_id = -1;
-static int hf_openflow_v6_flow_stats_request_pad = -1;
-static int hf_openflow_v6_flow_stats_request_out_port = -1;
-static int hf_openflow_v6_flow_stats_request_out_group = -1;
-static int hf_openflow_v6_flow_stats_request_pad2 = -1;
-static int hf_openflow_v6_flow_stats_request_cookie = -1;
-static int hf_openflow_v6_flow_stats_request_cookie_mask = -1;
-static int hf_openflow_v6_aggregate_stats_request_table_id = -1;
-static int hf_openflow_v6_aggregate_stats_request_pad = -1;
-static int hf_openflow_v6_aggregate_stats_request_out_port = -1;
-static int hf_openflow_v6_aggregate_stats_request_out_group = -1;
-static int hf_openflow_v6_aggregate_stats_request_pad2 = -1;
-static int hf_openflow_v6_aggregate_stats_request_cookie = -1;
-static int hf_openflow_v6_aggregate_stats_request_cookie_mask = -1;
-static int hf_openflow_v6_table_feature_prop_type = -1;
-static int hf_openflow_v6_table_feature_prop_length = -1;
-static int hf_openflow_v6_table_feature_prop_next_tables_next_table_id = -1;
-static int hf_openflow_v6_table_feature_prop_table_sync_from_table_id = -1;
-static int hf_openflow_v6_table_feature_prop_experimenter_experimenter = -1;
-static int hf_openflow_v6_table_feature_prop_experimenter_exp_type = -1;
-static int hf_openflow_v6_table_feature_prop_pad = -1;
-static int hf_openflow_v6_table_features_length = -1;
-static int hf_openflow_v6_table_features_table_id = -1;
-static int hf_openflow_v6_table_features_pad = -1;
-static int hf_openflow_v6_table_features_name = -1;
-static int hf_openflow_v6_table_features_metadata_match = -1;
-static int hf_openflow_v6_table_features_metadata_write = -1;
-static int hf_openflow_v6_table_features_capabilities = -1;
-static int hf_openflow_v6_table_features_capabilities_eviction = -1;
-static int hf_openflow_v6_table_features_capabilities_vacancy_events = -1;
-static int hf_openflow_v6_table_features_max_entries = -1;
-static int hf_openflow_v6_port_stats_request_port_no = -1;
-static int hf_openflow_v6_port_stats_request_pad = -1;
-static int hf_openflow_v6_queue_stats_request_port_no = -1;
-static int hf_openflow_v6_queue_stats_request_queue_id = -1;
-static int hf_openflow_v6_group_stats_request_group_id = -1;
-static int hf_openflow_v6_group_stats_request_pad = -1;
-static int hf_openflow_v6_meter_stats_request_meter_id = -1;
-static int hf_openflow_v6_meter_stats_request_pad = -1;
-static int hf_openflow_v6_meter_desc_request_meter_id = -1;
-static int hf_openflow_v6_meter_desc_request_pad = -1;
-static int hf_openflow_v6_queue_desc_request_port_no = -1;
-static int hf_openflow_v6_queue_desc_request_queue_id = -1;
-static int hf_openflow_v6_flow_monitor_request_monitor_id = -1;
-static int hf_openflow_v6_flow_monitor_request_out_port = -1;
-static int hf_openflow_v6_flow_monitor_request_out_group = -1;
-static int hf_openflow_v6_flow_monitor_request_flags = -1;
-static int hf_openflow_v6_flow_monitor_request_flags_initial = -1;
-static int hf_openflow_v6_flow_monitor_request_flags_add = -1;
-static int hf_openflow_v6_flow_monitor_request_flags_removed = -1;
-static int hf_openflow_v6_flow_monitor_request_flags_modify = -1;
-static int hf_openflow_v6_flow_monitor_request_flags_instructions = -1;
-static int hf_openflow_v6_flow_monitor_request_flags_no_abbrev = -1;
-static int hf_openflow_v6_flow_monitor_request_flags_only_own = -1;
-static int hf_openflow_v6_flow_monitor_request_table_id = -1;
-static int hf_openflow_v6_flow_monitor_request_command = -1;
-static int hf_openflow_v6_multipart_request_type = -1;
-static int hf_openflow_v6_multipart_request_flags = -1;
-static int hf_openflow_v6_multipart_request_flags_more = -1;
-static int hf_openflow_v6_multipart_request_pad = -1;
-static int hf_openflow_v6_multipart_request_experimenter_experimenter = -1;
-static int hf_openflow_v6_multipart_request_experimenter_exp_type = -1;
-static int hf_openflow_v6_switch_description_mfr_desc = -1;
-static int hf_openflow_v6_switch_description_hw_desc = -1;
-static int hf_openflow_v6_switch_description_sw_desc = -1;
-static int hf_openflow_v6_switch_description_serial_num = -1;
-static int hf_openflow_v6_switch_description_dp_desc = -1;
-static int hf_openflow_v6_flow_stats_length = -1;
-static int hf_openflow_v6_flow_stats_table_id = -1;
-static int hf_openflow_v6_flow_stats_duration_sec = -1;
-static int hf_openflow_v6_flow_stats_duration_nsec = -1;
-static int hf_openflow_v6_flow_stats_priority = -1;
-static int hf_openflow_v6_flow_stats_pad2 = -1;
-static int hf_openflow_v6_table_stats_table_id = -1;
-static int hf_openflow_v6_table_stats_pad = -1;
-static int hf_openflow_v6_table_stats_active_count = -1;
-static int hf_openflow_v6_table_stats_lookup_count = -1;
-static int hf_openflow_v6_table_stats_match_count = -1;
-static int hf_openflow_v6_port_stats_length = -1;
-static int hf_openflow_v6_port_stats_pad = -1;
-static int hf_openflow_v6_port_stats_port_no = -1;
-static int hf_openflow_v6_port_stats_duration_sec = -1;
-static int hf_openflow_v6_port_stats_duration_nsec = -1;
-static int hf_openflow_v6_port_stats_rx_packets = -1;
-static int hf_openflow_v6_port_stats_tx_packets = -1;
-static int hf_openflow_v6_port_stats_rx_bytes = -1;
-static int hf_openflow_v6_port_stats_tx_bytes = -1;
-static int hf_openflow_v6_port_stats_rx_dropped = -1;
-static int hf_openflow_v6_port_stats_tx_dropped = -1;
-static int hf_openflow_v6_port_stats_rx_errors = -1;
-static int hf_openflow_v6_port_stats_tx_errors = -1;
-static int hf_openflow_v6_queue_stats_length = -1;
-static int hf_openflow_v6_queue_stats_pad = -1;
-static int hf_openflow_v6_queue_stats_port_no = -1;
-static int hf_openflow_v6_queue_stats_queue_id = -1;
-static int hf_openflow_v6_queue_stats_tx_bytes = -1;
-static int hf_openflow_v6_queue_stats_tx_packets = -1;
-static int hf_openflow_v6_queue_stats_tx_errors = -1;
-static int hf_openflow_v6_queue_stats_duration_sec = -1;
-static int hf_openflow_v6_queue_stats_duration_nsec = -1;
-static int hf_openflow_v6_queue_stats_prop_type = -1;
-static int hf_openflow_v6_queue_stats_prop_length = -1;
-static int hf_openflow_v6_queue_stats_prop_experimenter_experimenter = -1;
-static int hf_openflow_v6_queue_stats_prop_experimenter_exp_type = -1;
-static int hf_openflow_v6_bucket_counter_packet_count = -1;
-static int hf_openflow_v6_bucket_counter_byte_count = -1;
-static int hf_openflow_v6_group_stats_length = -1;
-static int hf_openflow_v6_group_stats_pad = -1;
-static int hf_openflow_v6_group_stats_group_id = -1;
-static int hf_openflow_v6_group_stats_ref_count = -1;
-static int hf_openflow_v6_group_stats_pad2 = -1;
-static int hf_openflow_v6_group_stats_packet_count = -1;
-static int hf_openflow_v6_group_stats_byte_count = -1;
-static int hf_openflow_v6_group_desc_length = -1;
-static int hf_openflow_v6_group_desc_type = -1;
-static int hf_openflow_v6_group_desc_pad = -1;
-static int hf_openflow_v6_group_desc_group_id = -1;
-static int hf_openflow_v6_group_features_types = -1;
-static int hf_openflow_v6_group_features_types_all = -1;
-static int hf_openflow_v6_group_features_types_select = -1;
-static int hf_openflow_v6_group_features_types_indirect = -1;
-static int hf_openflow_v6_group_features_types_ff = -1;
-static int hf_openflow_v6_group_features_capabilities = -1;
-static int hf_openflow_v6_group_features_capabilities_select_weight = -1;
-static int hf_openflow_v6_group_features_capabilities_select_liveness = -1;
-static int hf_openflow_v6_group_features_capabilities_chaining = -1;
-static int hf_openflow_v6_group_features_capabilities_chaining_checks = -1;
-static int hf_openflow_v6_group_features_max_groups_all = -1;
-static int hf_openflow_v6_group_features_max_groups_select = -1;
-static int hf_openflow_v6_group_features_max_groups_indirect = -1;
-static int hf_openflow_v6_group_features_max_groups_ff = -1;
-static int hf_openflow_v6_group_features_actions_all = -1;
-static int hf_openflow_v6_group_features_actions_all_output = -1;
-static int hf_openflow_v6_group_features_actions_all_copy_ttl_out = -1;
-static int hf_openflow_v6_group_features_actions_all_copy_ttl_in = -1;
-static int hf_openflow_v6_group_features_actions_all_set_mpls_ttl = -1;
-static int hf_openflow_v6_group_features_actions_all_dec_mpls_ttl = -1;
-static int hf_openflow_v6_group_features_actions_all_push_vlan = -1;
-static int hf_openflow_v6_group_features_actions_all_pop_vlan = -1;
-static int hf_openflow_v6_group_features_actions_all_push_mpls = -1;
-static int hf_openflow_v6_group_features_actions_all_pop_mpls = -1;
-static int hf_openflow_v6_group_features_actions_all_set_queue = -1;
-static int hf_openflow_v6_group_features_actions_all_group = -1;
-static int hf_openflow_v6_group_features_actions_all_set_nw_ttl = -1;
-static int hf_openflow_v6_group_features_actions_all_dec_nw_ttl = -1;
-static int hf_openflow_v6_group_features_actions_all_set_field = -1;
-static int hf_openflow_v6_group_features_actions_all_push_pbb = -1;
-static int hf_openflow_v6_group_features_actions_all_pop_pbb = -1;
-static int hf_openflow_v6_group_features_actions_all_copy_field = -1;
-static int hf_openflow_v6_group_features_actions_all_meter = -1;
-static int hf_openflow_v6_group_features_actions_select = -1;
-static int hf_openflow_v6_group_features_actions_select_output = -1;
-static int hf_openflow_v6_group_features_actions_select_copy_ttl_out = -1;
-static int hf_openflow_v6_group_features_actions_select_copy_ttl_in = -1;
-static int hf_openflow_v6_group_features_actions_select_set_mpls_ttl = -1;
-static int hf_openflow_v6_group_features_actions_select_dec_mpls_ttl = -1;
-static int hf_openflow_v6_group_features_actions_select_push_vlan = -1;
-static int hf_openflow_v6_group_features_actions_select_pop_vlan = -1;
-static int hf_openflow_v6_group_features_actions_select_push_mpls = -1;
-static int hf_openflow_v6_group_features_actions_select_pop_mpls = -1;
-static int hf_openflow_v6_group_features_actions_select_set_queue = -1;
-static int hf_openflow_v6_group_features_actions_select_group = -1;
-static int hf_openflow_v6_group_features_actions_select_set_nw_ttl = -1;
-static int hf_openflow_v6_group_features_actions_select_dec_nw_ttl = -1;
-static int hf_openflow_v6_group_features_actions_select_set_field = -1;
-static int hf_openflow_v6_group_features_actions_select_push_pbb = -1;
-static int hf_openflow_v6_group_features_actions_select_pop_pbb = -1;
-static int hf_openflow_v6_group_features_actions_select_copy_field = -1;
-static int hf_openflow_v6_group_features_actions_select_meter = -1;
-static int hf_openflow_v6_group_features_actions_indirect = -1;
-static int hf_openflow_v6_group_features_actions_indirect_output = -1;
-static int hf_openflow_v6_group_features_actions_indirect_copy_ttl_out = -1;
-static int hf_openflow_v6_group_features_actions_indirect_copy_ttl_in = -1;
-static int hf_openflow_v6_group_features_actions_indirect_set_mpls_ttl = -1;
-static int hf_openflow_v6_group_features_actions_indirect_dec_mpls_ttl = -1;
-static int hf_openflow_v6_group_features_actions_indirect_push_vlan = -1;
-static int hf_openflow_v6_group_features_actions_indirect_pop_vlan = -1;
-static int hf_openflow_v6_group_features_actions_indirect_push_mpls = -1;
-static int hf_openflow_v6_group_features_actions_indirect_pop_mpls = -1;
-static int hf_openflow_v6_group_features_actions_indirect_set_queue = -1;
-static int hf_openflow_v6_group_features_actions_indirect_group = -1;
-static int hf_openflow_v6_group_features_actions_indirect_set_nw_ttl = -1;
-static int hf_openflow_v6_group_features_actions_indirect_dec_nw_ttl = -1;
-static int hf_openflow_v6_group_features_actions_indirect_set_field = -1;
-static int hf_openflow_v6_group_features_actions_indirect_push_pbb = -1;
-static int hf_openflow_v6_group_features_actions_indirect_pop_pbb = -1;
-static int hf_openflow_v6_group_features_actions_indirect_copy_field = -1;
-static int hf_openflow_v6_group_features_actions_indirect_meter = -1;
-static int hf_openflow_v6_group_features_actions_ff = -1;
-static int hf_openflow_v6_group_features_actions_ff_output = -1;
-static int hf_openflow_v6_group_features_actions_ff_copy_ttl_out = -1;
-static int hf_openflow_v6_group_features_actions_ff_copy_ttl_in = -1;
-static int hf_openflow_v6_group_features_actions_ff_set_mpls_ttl = -1;
-static int hf_openflow_v6_group_features_actions_ff_dec_mpls_ttl = -1;
-static int hf_openflow_v6_group_features_actions_ff_push_vlan = -1;
-static int hf_openflow_v6_group_features_actions_ff_pop_vlan = -1;
-static int hf_openflow_v6_group_features_actions_ff_push_mpls = -1;
-static int hf_openflow_v6_group_features_actions_ff_pop_mpls = -1;
-static int hf_openflow_v6_group_features_actions_ff_set_queue = -1;
-static int hf_openflow_v6_group_features_actions_ff_group = -1;
-static int hf_openflow_v6_group_features_actions_ff_set_nw_ttl = -1;
-static int hf_openflow_v6_group_features_actions_ff_dec_nw_ttl = -1;
-static int hf_openflow_v6_group_features_actions_ff_set_field = -1;
-static int hf_openflow_v6_group_features_actions_ff_push_pbb = -1;
-static int hf_openflow_v6_group_features_actions_ff_pop_pbb = -1;
-static int hf_openflow_v6_group_features_actions_ff_copy_field = -1;
-static int hf_openflow_v6_group_features_actions_ff_meter = -1;
-static int hf_openflow_v6_meter_band_stats_packet_band_count = -1;
-static int hf_openflow_v6_meter_band_stats_byte_band_count = -1;
-static int hf_openflow_v6_meter_stats_meter_id = -1;
-static int hf_openflow_v6_meter_stats_len = -1;
-static int hf_openflow_v6_meter_stats_pad = -1;
-static int hf_openflow_v6_meter_stats_flow_count = -1;
-static int hf_openflow_v6_meter_stats_packet_in_count = -1;
-static int hf_openflow_v6_meter_stats_byte_in_count = -1;
-static int hf_openflow_v6_meter_stats_duration_sec = -1;
-static int hf_openflow_v6_meter_stats_duration_nsec = -1;
-static int hf_openflow_v6_meter_desc_len = -1;
-static int hf_openflow_v6_meter_desc_flags = -1;
-static int hf_openflow_v6_meter_desc_flags_kbps = -1;
-static int hf_openflow_v6_meter_desc_flags_pktps = -1;
-static int hf_openflow_v6_meter_desc_flags_burst = -1;
-static int hf_openflow_v6_meter_desc_flags_stats = -1;
-static int hf_openflow_v6_meter_desc_meter_id = -1;
-static int hf_openflow_v6_meter_features_max_meter = -1;
-static int hf_openflow_v6_meter_features_band_types = -1;
-static int hf_openflow_v6_meter_features_band_types_drop = -1;
-static int hf_openflow_v6_meter_features_band_types_dscp_remark = -1;
-static int hf_openflow_v6_meter_features_capabilities = -1;
-static int hf_openflow_v6_meter_features_capabilities_kbps = -1;
-static int hf_openflow_v6_meter_features_capabilities_pktps = -1;
-static int hf_openflow_v6_meter_features_capabilities_burst = -1;
-static int hf_openflow_v6_meter_features_capabilities_stats = -1;
-static int hf_openflow_v6_meter_features_max_bands = -1;
-static int hf_openflow_v6_meter_features_max_color = -1;
-static int hf_openflow_v6_meter_features_pad = -1;
-static int hf_openflow_v6_flow_update_length = -1;
-static int hf_openflow_v6_flow_update_event = -1;
-static int hf_openflow_v6_flow_update_full_table_id = -1;
-static int hf_openflow_v6_flow_update_full_reason = -1;
-static int hf_openflow_v6_flow_update_full_zero = -1;
-static int hf_openflow_v6_flow_update_full_idle_timeout = -1;
-static int hf_openflow_v6_flow_update_full_hard_timeout = -1;
-static int hf_openflow_v6_flow_update_full_priority = -1;
-static int hf_openflow_v6_flow_update_full_zeros = -1;
-static int hf_openflow_v6_flow_update_full_cookie = -1;
-static int hf_openflow_v6_flow_update_abbrev_xid = -1;
-static int hf_openflow_v6_flow_update_paused_zeros = -1;
-static int hf_openflow_v6_multipart_reply_type = -1;
-static int hf_openflow_v6_multipart_reply_flags = -1;
-static int hf_openflow_v6_multipart_reply_flags_more = -1;
-static int hf_openflow_v6_multipart_reply_pad = -1;
-static int hf_openflow_v6_multipart_reply_experimenter_experimenter = -1;
-static int hf_openflow_v6_multipart_reply_experimenter_exp_type = -1;
-static int hf_openflow_v6_table_desc_length = -1;
-static int hf_openflow_v6_table_desc_table_id = -1;
-static int hf_openflow_v6_table_desc_pad = -1;
-static int hf_openflow_v6_table_desc_config = -1;
-static int hf_openflow_v6_table_desc_config_eviction = -1;
-static int hf_openflow_v6_table_desc_config_vacancy_events = -1;
-static int hf_openflow_v6_queue_desc_port_no = -1;
-static int hf_openflow_v6_queue_desc_queue_id = -1;
-static int hf_openflow_v6_queue_desc_len = -1;
-static int hf_openflow_v6_queue_desc_pad = -1;
-static int hf_openflow_v6_queue_desc_prop_property = -1;
-static int hf_openflow_v6_queue_desc_prop_len = -1;
-static int hf_openflow_v6_queue_desc_prop_pad = -1;
-static int hf_openflow_v6_queue_desc_prop_min_rate_rate = -1;
-static int hf_openflow_v6_queue_desc_prop_min_rate_pad = -1;
-static int hf_openflow_v6_queue_desc_prop_max_rate_rate = -1;
-static int hf_openflow_v6_queue_desc_prop_max_rate_pad = -1;
-static int hf_openflow_v6_queue_desc_prop_experimenter_experimenter = -1;
-static int hf_openflow_v6_queue_desc_prop_experimenter_exp_type = -1;
-static int hf_openflow_v6_role_request_role = -1;
-static int hf_openflow_v6_role_request_pad = -1;
-static int hf_openflow_v6_role_request_generation_id = -1;
-static int hf_openflow_v6_role_reply_role = -1;
-static int hf_openflow_v6_role_reply_pad = -1;
-static int hf_openflow_v6_role_reply_generation_id = -1;
-static int hf_openflow_v6_async_config_prop_type = -1;
-static int hf_openflow_v6_async_config_prop_length = -1;
-static int hf_openflow_v6_async_config_prop_reason_packet_in_mask = -1;
-static int hf_openflow_v6_async_config_prop_reason_packet_in_mask_table_miss = -1;
-static int hf_openflow_v6_async_config_prop_reason_packet_in_mask_apply_action = -1;
-static int hf_openflow_v6_async_config_prop_reason_packet_in_mask_invalid_ttl = -1;
-static int hf_openflow_v6_async_config_prop_reason_packet_in_mask_action_set = -1;
-static int hf_openflow_v6_async_config_prop_reason_packet_in_mask_group = -1;
-static int hf_openflow_v6_async_config_prop_reason_packet_in_mask_packet_out = -1;
-static int hf_openflow_v6_async_config_prop_reason_port_status_mask = -1;
-static int hf_openflow_v6_async_config_prop_reason_port_status_mask_add = -1;
-static int hf_openflow_v6_async_config_prop_reason_port_status_mask_delete = -1;
-static int hf_openflow_v6_async_config_prop_reason_port_status_mask_modify = -1;
-static int hf_openflow_v6_async_config_prop_reason_flow_removed_mask = -1;
-static int hf_openflow_v6_async_config_prop_reason_flow_removed_mask_idle_timeout = -1;
-static int hf_openflow_v6_async_config_prop_reason_flow_removed_mask_hard_timeout = -1;
-static int hf_openflow_v6_async_config_prop_reason_flow_removed_mask_delete = -1;
-static int hf_openflow_v6_async_config_prop_reason_flow_removed_mask_group_delete = -1;
-static int hf_openflow_v6_async_config_prop_reason_flow_removed_mask_meter_delete = -1;
-static int hf_openflow_v6_async_config_prop_reason_flow_removed_mask_eviction = -1;
-static int hf_openflow_v6_async_config_prop_reason_role_status_mask = -1;
-static int hf_openflow_v6_async_config_prop_reason_role_status_mask_master_request = -1;
-static int hf_openflow_v6_async_config_prop_reason_role_status_mask_config = -1;
-static int hf_openflow_v6_async_config_prop_reason_role_status_mask_experimenter = -1;
-static int hf_openflow_v6_async_config_prop_reason_table_status_mask = -1;
-static int hf_openflow_v6_async_config_prop_reason_table_status_mask_vacancy_down = -1;
-static int hf_openflow_v6_async_config_prop_reason_table_status_mask_vacancy_up = -1;
-static int hf_openflow_v6_async_config_prop_reason_requestforward_mask = -1;
-static int hf_openflow_v6_async_config_prop_reason_requestforward_mask_group_mod = -1;
-static int hf_openflow_v6_async_config_prop_reason_requestforward_mask_meter_mod = -1;
-static int hf_openflow_v6_async_config_prop_experimenter_experimenter = -1;
-static int hf_openflow_v6_async_config_prop_experimenter_exp_type = -1;
-static int hf_openflow_v6_metermod_command = -1;
-static int hf_openflow_v6_metermod_flags = -1;
-static int hf_openflow_v6_metermod_flags_kbps = -1;
-static int hf_openflow_v6_metermod_flags_pktps = -1;
-static int hf_openflow_v6_metermod_flags_burst = -1;
-static int hf_openflow_v6_metermod_flags_stats = -1;
-static int hf_openflow_v6_metermod_meter_id = -1;
-static int hf_openflow_v6_role_status_role = -1;
-static int hf_openflow_v6_role_status_reason = -1;
-static int hf_openflow_v6_role_status_pad = -1;
-static int hf_openflow_v6_role_status_generation_id = -1;
-static int hf_openflow_v6_table_status_reason = -1;
-static int hf_openflow_v6_table_status_pad = -1;
-static int hf_openflow_v6_bundle_control_bundle_id = -1;
-static int hf_openflow_v6_bundle_control_type = -1;
-static int hf_openflow_v6_bundle_control_flags = -1;
-static int hf_openflow_v6_bundle_control_flags_atomic = -1;
-static int hf_openflow_v6_bundle_control_flags_ordered = -1;
-static int hf_openflow_v6_bundle_prop_type = -1;
-static int hf_openflow_v6_bundle_prop_length = -1;
-static int hf_openflow_v6_bundle_prop_experimenter_experimenter = -1;
-static int hf_openflow_v6_bundle_prop_experimenter_exp_type = -1;
-static int hf_openflow_v6_bundle_add_bundle_id = -1;
-static int hf_openflow_v6_bundle_add_pad = -1;
-static int hf_openflow_v6_bundle_add_flags = -1;
-static int hf_openflow_v6_bundle_add_flags_atomic = -1;
-static int hf_openflow_v6_bundle_add_flags_ordered = -1;
-static int hf_openflow_v6_oxs_class = -1;
-static int hf_openflow_v6_oxs_field = -1;
-static int hf_openflow_v6_oxs_reserved = -1;
-static int hf_openflow_v6_oxs_length = -1;
-static int hf_openflow_v6_oxs_basic_duration_sec = -1;
-static int hf_openflow_v6_oxs_basic_duration_nsec = -1;
-static int hf_openflow_v6_oxs_basic_idle_sec = -1;
-static int hf_openflow_v6_oxs_basic_idle_nsec = -1;
-static int hf_openflow_v6_oxs_basic_flow_count = -1;
-static int hf_openflow_v6_oxs_basic_packet_count = -1;
-static int hf_openflow_v6_oxs_basic_byte_count = -1;
-static int hf_openflow_v6_oxs_experimenter_experimenter = -1;
-static int hf_openflow_v6_oxs_experimenter_value = -1;
-static int hf_openflow_v6_instruction_stat_trigger_flags = -1;
-static int hf_openflow_v6_instruction_stat_triffer_flags_periodic = -1;
-static int hf_openflow_v6_instruction_stat_triffer_flags_only_first = -1;
-static int hf_openflow_v6_instruction_stat_triffer_flags_reserved = -1;
-static int hf_openflow_v6_port_desc_prop_recirculate_port_no = -1;
-static int hf_openflow_v6_bundle_features_request_flags = -1;
-static int hf_openflow_v6_bundle_features_request_pad = -1;
-static int hf_openflow_v6_stats_reserved = -1;
-static int hf_openflow_v6_stats_length = -1;
-static int hf_openflow_v6_stats_pad = -1;
-static int hf_openflow_v6_flow_desc_length = -1;
-static int hf_openflow_v6_flow_desc_pad2 = -1;
-static int hf_openflow_v6_flow_desc_table_id = -1;
-static int hf_openflow_v6_flow_desc_pad = -1;
-static int hf_openflow_v6_flow_desc_priority = -1;
-static int hf_openflow_v6_flow_desc_idle_timeout = -1;
-static int hf_openflow_v6_flow_desc_hard_timeout = -1;
-static int hf_openflow_v6_flow_desc_flags = -1;
-static int hf_openflow_v6_flow_desc_flags_send_flow_rem = -1;
-static int hf_openflow_v6_flow_desc_flags_check_overlap = -1;
-static int hf_openflow_v6_flow_desc_flags_reset_counts = -1;
-static int hf_openflow_v6_flow_desc_flags_no_packet_counts = -1;
-static int hf_openflow_v6_flow_desc_flags_no_byte_counts = -1;
-static int hf_openflow_v6_flow_desc_importance = -1;
-static int hf_openflow_v6_flow_desc_cookie = -1;
-static int hf_openflow_v6_controller_status_length = -1;
-static int hf_openflow_v6_controller_status_short_id = -1;
-static int hf_openflow_v6_controller_status_role = -1;
-static int hf_openflow_v6_controller_status_reason = -1;
-static int hf_openflow_v6_controller_status_channel_status = -1;
-static int hf_openflow_v6_controller_status_pad = -1;
-static int hf_openflow_v6_time_seconds = -1;
-static int hf_openflow_v6_time_nanoseconds = -1;
-static int hf_openflow_v6_time_pad = -1;
-static int hf_openflow_v6_bundle_feature_prop_type = -1;
-static int hf_openflow_v6_bundle_feature_prop_length = -1;
-static int hf_openflow_v6_bundle_feature_prop_time_pad = -1;
-static int hf_openflow_v6_bundle_feature_prop_experimenter_experimenter = -1;
-static int hf_openflow_v6_bundle_feature_prop_experimenter_exp_type = -1;
-static int hf_openflow_v6_bundle_feature_prop_pad = -1;
-static int hf_openflow_v6_controller_status_prop_type = -1;
-static int hf_openflow_v6_controller_status_prop_length = -1;
-static int hf_openflow_v6_controller_status_prop_experimenter_experimenter = -1;
-static int hf_openflow_v6_controller_status_prop_experimenter_exp_type = -1;
-static int hf_openflow_v6_controller_status_prop_pad = -1;
-static int hf_openflow_v6_flow_stats_reason = -1;
-static int hf_openflow_v6_controller_status_prop_uri = -1;
-
-static gint ett_openflow_v6 = -1;
-static gint ett_openflow_v6_flowmod_flags = -1;
-static gint ett_openflow_v6_bucket = -1;
-static gint ett_openflow_v6_oxm = -1;
-static gint ett_openflow_v6_match = -1;
-static gint ett_openflow_v6_action = -1;
-static gint ett_openflow_v6_instruction = -1;
-static gint ett_openflow_v6_port_desc_prop = -1;
-static gint ett_openflow_v6_port_desc_prop_ethernet_current = -1;
-static gint ett_openflow_v6_port_desc_prop_ethernet_advertised = -1;
-static gint ett_openflow_v6_port_desc_prop_ethernet_supported = -1;
-static gint ett_openflow_v6_port_desc_prop_ethernet_peer = -1;
-static gint ett_openflow_v6_port_desc_prop_optical_supported = -1;
-static gint ett_openflow_v6_port_stats_prop = -1;
-static gint ett_openflow_v6_port_stats_prop_optical_flags = -1;
-static gint ett_openflow_v6_port = -1;
-static gint ett_openflow_v6_port_config = -1;
-static gint ett_openflow_v6_port_state = -1;
-static gint ett_openflow_v6_meter_band  = -1;
-static gint ett_openflow_v6_hello_element = -1;
-static gint ett_openflow_v6_error_data = -1;
-static gint ett_openflow_v6_switch_features_capabilities = -1;
-static gint ett_openflow_v6_switch_config_flags = -1;
-static gint ett_openflow_v6_packet_in_data = -1;
-static gint ett_openflow_v6_packet_out_data = -1;
-static gint ett_openflow_v6_portmod_prop = -1;
-static gint ett_openflow_v6_portmod_prop_ethernet_advertise = -1;
-static gint ett_openflow_v6_portmod_prop_optical_configure = -1;
-static gint ett_openflow_v6_portmod_config = -1;
-static gint ett_openflow_v6_portmod_mask = -1;
-static gint ett_openflow_v6_tablemod_config = -1;
-static gint ett_openflow_v6_tablemod_prop = -1;
-static gint ett_openflow_v6_tablemod_prop_eviction_flags = -1;
-static gint ett_openflow_v6_table_features = -1;
-static gint ett_openflow_v6_table_features_capabilities = -1;
-static gint ett_openflow_v6_table_feature_prop = -1;
-static gint ett_openflow_v6_table_feature_prop_instruction_id = -1;
-static gint ett_openflow_v6_table_feature_prop_action_id = -1;
-static gint ett_openflow_v6_table_feature_prop_oxm_id = -1;
-static gint ett_openflow_v6_flow_monitor_request_flags = -1;
-static gint ett_openflow_v6_multipart_request_flags = -1;
-static gint ett_openflow_v6_flow_stats = -1;
-static gint ett_openflow_v6_table_stats = -1;
-static gint ett_openflow_v6_port_stats = -1;
-static gint ett_openflow_v6_queue_stats = -1;
-static gint ett_openflow_v6_queue_stats_prop = -1;
-static gint ett_openflow_v6_bucket_counter = -1;
-static gint ett_openflow_v6_group_stats = -1;
-static gint ett_openflow_v6_group_desc = -1;
-static gint ett_openflow_v6_group_features_types = -1;
-static gint ett_openflow_v6_group_features_capabilities = -1;
-static gint ett_openflow_v6_group_features_actions_all = -1;
-static gint ett_openflow_v6_group_features_actions_select = -1;
-static gint ett_openflow_v6_group_features_actions_indirect = -1;
-static gint ett_openflow_v6_group_features_actions_ff = -1;
-static gint ett_openflow_v6_meter_band_stats = -1;
-static gint ett_openflow_v6_meter_stats = -1;
-static gint ett_openflow_v6_meter_desc = -1;
-static gint ett_openflow_v6_meter_desc_flags = -1;
-static gint ett_openflow_v6_meter_features_band_types = -1;
-static gint ett_openflow_v6_meter_features_capabilities = -1;
-static gint ett_openflow_v6_flow_update = -1;
-static gint ett_openflow_v6_multipart_reply_flags = -1;
-static gint ett_openflow_v6_table_desc = -1;
-static gint ett_openflow_v6_table_desc_config = -1;
-static gint ett_openflow_v6_queue_desc = -1;
-static gint ett_openflow_v6_queue_desc_prop = -1;
-static gint ett_openflow_v6_async_config_prop = -1;
-static gint ett_openflow_v6_async_config_prop_reason_packet_in_mask = -1;
-static gint ett_openflow_v6_async_config_prop_reason_port_status_mask = -1;
-static gint ett_openflow_v6_async_config_prop_reason_flow_removed_mask = -1;
-static gint ett_openflow_v6_async_config_prop_reason_role_status_mask = -1;
-static gint ett_openflow_v6_async_config_prop_reason_table_status_mask = -1;
-static gint ett_openflow_v6_async_config_prop_reason_requestforward_mask = -1;
-static gint ett_openflow_v6_metermod_flags = -1;
-static gint ett_openflow_v6_requestforward_request = -1;
-static gint ett_openflow_v6_bundle_control_flags = -1;
-static gint ett_openflow_v6_bundle_prop = -1;
-static gint ett_openflow_v6_bundle_add_flags = -1;
-static gint ett_openflow_v6_bundle_add_message = -1;
-static gint ett_openflow_v6_instruction_stat_trigger_flags = -1;
-static gint ett_openflow_v6_flow_desc = -1;
-static gint ett_openflow_v6_flow_desc_flags = -1;
-static gint ett_openflow_v6_bundle_feature_prop = -1;
-static gint ett_openflow_v6_controller_status_prop = -1;
-
-static expert_field ei_openflow_v6_match_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_oxm_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_action_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_instruction_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_port_desc_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_port_stats_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_meter_band_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_hello_element_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_error_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_experimenter_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_portmod_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_tablemod_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_table_feature_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_multipart_request_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_queue_stats_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_flow_update_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_multipart_reply_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_queue_desc_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_async_config_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_bundle_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_message_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_length_too_short = EI_INIT;
-static expert_field ei_openflow_v6_bundle_feature_prop_undecoded = EI_INIT;
-static expert_field ei_openflow_v6_controller_status_prop_undecoded = EI_INIT;
+static int proto_openflow_v6;
+static int hf_openflow_v6_version;
+static int hf_openflow_v6_type;
+static int hf_openflow_v6_length;
+static int hf_openflow_v6_xid;
+static int hf_openflow_v6_oxm_class;
+static int hf_openflow_v6_oxm_field;
+static int hf_openflow_v6_oxm_field_basic;
+static int hf_openflow_v6_oxm_hm;
+static int hf_openflow_v6_oxm_length;
+static int hf_openflow_v6_oxm_experimenter_experimenter;
+static int hf_openflow_v6_oxm_value;
+static int hf_openflow_v6_oxm_value_etheraddr;
+static int hf_openflow_v6_oxm_value_vlan_present;
+static int hf_openflow_v6_oxm_value_vlan_vid;
+static int hf_openflow_v6_oxm_value_ethertype;
+static int hf_openflow_v6_oxm_value_ipv4addr;
+static int hf_openflow_v6_oxm_value_ipv6addr;
+static int hf_openflow_v6_oxm_value_ipproto;
+static int hf_openflow_v6_oxm_value_uint16;
+static int hf_openflow_v6_oxm_value_uint24;
+static int hf_openflow_v6_oxm_value_uint32;
+static int hf_openflow_v6_oxm_mask;
+static int hf_openflow_v6_oxm_mask_etheraddr;
+static int hf_openflow_v6_oxm_mask_ipv4addr;
+static int hf_openflow_v6_oxm_mask_ipv6addr;
+static int hf_openflow_v6_oxm_mask_vlan;
+static int hf_openflow_v6_match_type;
+static int hf_openflow_v6_match_length;
+static int hf_openflow_v6_match_pad;
+static int hf_openflow_v6_action_type;
+static int hf_openflow_v6_action_length;
+static int hf_openflow_v6_action_experimenter_experimenter;
+static int hf_openflow_v6_oxm_experimenter_value;
+static int hf_openflow_v6_oxm_register;
+static int hf_openflow_v6_action_output_port;
+static int hf_openflow_v6_action_output_max_len;
+static int hf_openflow_v6_action_output_pad;
+static int hf_openflow_v6_action_copy_ttl_out_pad;
+static int hf_openflow_v6_action_copy_ttl_in_pad;
+static int hf_openflow_v6_action_set_mpls_ttl_ttl;
+static int hf_openflow_v6_action_set_mpls_ttl_pad;
+static int hf_openflow_v6_action_dec_mpls_ttl_pad;
+static int hf_openflow_v6_action_push_vlan_ethertype;
+static int hf_openflow_v6_action_push_vlan_pad;
+static int hf_openflow_v6_action_pop_vlan_pad;
+static int hf_openflow_v6_action_push_mpls_ethertype;
+static int hf_openflow_v6_action_push_mpls_pad;
+static int hf_openflow_v6_action_pop_mpls_ethertype;
+static int hf_openflow_v6_action_pop_mpls_pad;
+static int hf_openflow_v6_action_set_queue_queue_id;
+static int hf_openflow_v6_action_group_group_id;
+static int hf_openflow_v6_action_set_nw_ttl_ttl;
+static int hf_openflow_v6_action_set_nw_ttl_pad;
+static int hf_openflow_v6_action_dec_nw_ttl_pad;
+static int hf_openflow_v6_action_set_field_pad;
+static int hf_openflow_v6_action_push_pbb_ethertype;
+static int hf_openflow_v6_action_push_pbb_pad;
+static int hf_openflow_v6_action_pop_pbb_pad;
+static int hf_openflow_v6_action_copy_field_n_bits;
+static int hf_openflow_v6_action_copy_field_src_offset;
+static int hf_openflow_v6_action_copy_field_dst_offset;
+static int hf_openflow_v6_action_copy_field_pad;
+static int hf_openflow_v6_action_meter_id;
+static int hf_openflow_v6_instruction_type;
+static int hf_openflow_v6_instruction_length;
+static int hf_openflow_v6_instruction_experimenter_experimenter;
+static int hf_openflow_v6_instruction_goto_table_table_id;
+static int hf_openflow_v6_instruction_goto_table_pad;
+static int hf_openflow_v6_instruction_write_metadata_pad;
+static int hf_openflow_v6_instruction_write_metadata_value;
+static int hf_openflow_v6_instruction_write_metadata_mask;
+static int hf_openflow_v6_instruction_actions_pad;
+static int hf_openflow_v6_port_desc_prop_type;
+static int hf_openflow_v6_port_desc_prop_length;
+static int hf_openflow_v6_port_desc_prop_ethernet_pad;
+static int hf_openflow_v6_port_desc_prop_ethernet_current;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_10mb_hd;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_10mb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_100mb_hd;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_100mb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_1gb_hd;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_1gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_10gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_40gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_100gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_1tb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_other;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_copper;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_fiber;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_autoneg;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_pause;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_pause_asym;
+static int hf_openflow_v6_port_desc_prop_ethernet_current_reserved;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_10mb_hd;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_10mb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_100mb_hd;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_100mb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_1gb_hd;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_1gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_10gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_40gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_100gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_1tb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_other;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_copper;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_fiber;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_autoneg;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_pause;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_pause_asym;
+static int hf_openflow_v6_port_desc_prop_ethernet_advertised_reserved;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_10mb_hd;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_10mb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_100mb_hd;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_100mb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_1gb_hd;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_1gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_10gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_40gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_100gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_1tb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_other;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_copper;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_fiber;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_autoneg;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_pause;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_pause_asym;
+static int hf_openflow_v6_port_desc_prop_ethernet_supported_reserved;
+static int hf_openflow_v6_port_desc_prop_optical_pad;
+static int hf_openflow_v6_port_desc_prop_optical_supported;
+static int hf_openflow_v6_port_desc_prop_optical_supported_rx_tune;
+static int hf_openflow_v6_port_desc_prop_optical_supported_tx_tune;
+static int hf_openflow_v6_port_desc_prop_optical_supported_tx_pwr;
+static int hf_openflow_v6_port_desc_prop_optical_supported_use_freq;
+static int hf_openflow_v6_port_desc_prop_optical_tx_min_freq_lmda;
+static int hf_openflow_v6_port_desc_prop_optical_tx_max_freq_lmda;
+static int hf_openflow_v6_port_desc_prop_optical_tx_grid_freq_lmda;
+static int hf_openflow_v6_port_desc_prop_optical_rx_min_freq_lmda;
+static int hf_openflow_v6_port_desc_prop_optical_rx_max_freq_lmda;
+static int hf_openflow_v6_port_desc_prop_optical_rx_grid_freq_lmda;
+static int hf_openflow_v6_port_desc_prop_optical_tx_pwr_min;
+static int hf_openflow_v6_port_desc_prop_optical_tx_pwr_max;
+static int hf_openflow_v6_port_desc_prop_experimenter_experimenter;
+static int hf_openflow_v6_port_desc_prop_experimenter_exp_type;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_10mb_hd;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_10mb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_100mb_hd;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_100mb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_1gb_hd;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_1gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_10gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_40gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_100gb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_1tb_fd;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_other;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_copper;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_fiber;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_autoneg;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_pause;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_pause_asym;
+static int hf_openflow_v6_port_desc_prop_ethernet_peer_reserved;
+static int hf_openflow_v6_port_desc_prop_ethernet_curr_speed;
+static int hf_openflow_v6_port_desc_prop_ethernet_max_speed;
+static int hf_openflow_v6_port_stats_prop_type;
+static int hf_openflow_v6_port_stats_prop_length;
+static int hf_openflow_v6_port_stats_prop_ethernet_pad;
+static int hf_openflow_v6_port_stats_prop_ethernet_rx_frame_err;
+static int hf_openflow_v6_port_stats_prop_ethernet_rx_over_err;
+static int hf_openflow_v6_port_stats_prop_ethernet_rx_crc_err;
+static int hf_openflow_v6_port_stats_prop_ethernet_collisions;
+static int hf_openflow_v6_port_stats_prop_optical_pad;
+static int hf_openflow_v6_port_stats_prop_optical_flags;
+static int hf_openflow_v6_port_stats_prop_optical_flags_rx_tune;
+static int hf_openflow_v6_port_stats_prop_optical_flags_tx_tune;
+static int hf_openflow_v6_port_stats_prop_optical_flags_tx_pwr;
+static int hf_openflow_v6_port_stats_prop_optical_flags_rx_pwr;
+static int hf_openflow_v6_port_stats_prop_optical_flags_tx_bias;
+static int hf_openflow_v6_port_stats_prop_optical_flags_tx_temp;
+static int hf_openflow_v6_port_stats_prop_optical_tx_freq_lmda;
+static int hf_openflow_v6_port_stats_prop_optical_tx_offset;
+static int hf_openflow_v6_port_stats_prop_optical_tx_grid_span;
+static int hf_openflow_v6_port_stats_prop_optical_rx_freq_lmda;
+static int hf_openflow_v6_port_stats_prop_optical_rx_offset;
+static int hf_openflow_v6_port_stats_prop_optical_rx_grid_span;
+static int hf_openflow_v6_port_stats_prop_optical_tx_pwr;
+static int hf_openflow_v6_port_stats_prop_optical_rx_pwr;
+static int hf_openflow_v6_port_stats_prop_optical_bias_current;
+static int hf_openflow_v6_port_stats_prop_optical_temperature;
+static int hf_openflow_v6_port_stats_prop_experimenter_experimenter;
+static int hf_openflow_v6_port_stats_prop_experimenter_exp_type;
+static int hf_openflow_v6_port_port_no;
+static int hf_openflow_v6_port_length;
+static int hf_openflow_v6_port_pad;
+static int hf_openflow_v6_port_hw_addr;
+static int hf_openflow_v6_port_pad2;
+static int hf_openflow_v6_port_name;
+static int hf_openflow_v6_port_config;
+static int hf_openflow_v6_port_config_port_down;
+static int hf_openflow_v6_port_config_no_recv;
+static int hf_openflow_v6_port_config_no_fwd;
+static int hf_openflow_v6_port_config_no_packet_in;
+static int hf_openflow_v6_port_state;
+static int hf_openflow_v6_port_state_link_down;
+static int hf_openflow_v6_port_state_blocked;
+static int hf_openflow_v6_port_state_live;
+static int hf_openflow_v6_meter_band_type;
+static int hf_openflow_v6_meter_band_len;
+static int hf_openflow_v6_meter_band_rate;
+static int hf_openflow_v6_meter_band_burst_size;
+static int hf_openflow_v6_meter_band_drop_pad;
+static int hf_openflow_v6_meter_band_dscp_remark_prec_level;
+static int hf_openflow_v6_meter_band_dscp_remark_pad;
+static int hf_openflow_v6_meter_band_experimenter_experimenter;
+static int hf_openflow_v6_hello_element_type;
+static int hf_openflow_v6_hello_element_length;
+static int hf_openflow_v6_hello_element_version_bitmap;
+static int hf_openflow_v6_hello_element_pad;
+static int hf_openflow_v6_error_type;
+static int hf_openflow_v6_error_hello_failed_code;
+static int hf_openflow_v6_error_bad_request_code;
+static int hf_openflow_v6_error_bad_action_code;
+static int hf_openflow_v6_error_bad_instruction_code;
+static int hf_openflow_v6_error_bad_match_code;
+static int hf_openflow_v6_error_flow_mod_failed_code;
+static int hf_openflow_v6_error_group_mod_failed_code;
+static int hf_openflow_v6_error_port_mod_failed_code;
+static int hf_openflow_v6_error_table_mod_failed_code;
+static int hf_openflow_v6_error_queue_op_failed_code;
+static int hf_openflow_v6_error_switch_config_failed_code;
+static int hf_openflow_v6_error_role_request_failed_code;
+static int hf_openflow_v6_error_meter_mod_failed_code;
+static int hf_openflow_v6_error_table_features_failed_code;
+static int hf_openflow_v6_error_bad_property_code;
+static int hf_openflow_v6_error_async_config_failed_code;
+static int hf_openflow_v6_error_flow_monitor_failed_code;
+static int hf_openflow_v6_error_bundle_failed_code;
+static int hf_openflow_v6_error_code;
+static int hf_openflow_v6_error_data_text;
+static int hf_openflow_v6_error_data_body;
+static int hf_openflow_v6_error_experimenter;
+static int hf_openflow_v6_echo_data;
+static int hf_openflow_v6_experimenter_experimenter;
+static int hf_openflow_v6_experimenter_exp_type;
+static int hf_openflow_v6_switch_features_datapath_id;
+static int hf_openflow_v6_switch_features_n_buffers;
+static int hf_openflow_v6_switch_features_n_tables;
+static int hf_openflow_v6_switch_features_auxiliary_id;
+static int hf_openflow_v6_switch_features_pad;
+static int hf_openflow_v6_switch_features_capabilities;
+static int hf_openflow_v6_switch_features_capabilities_flow_stats;
+static int hf_openflow_v6_switch_features_capabilities_table_stats;
+static int hf_openflow_v6_switch_features_capabilities_port_stats;
+static int hf_openflow_v6_switch_features_capabilities_group_stats;
+static int hf_openflow_v6_switch_features_capabilities_ip_reasm;
+static int hf_openflow_v6_switch_features_capabilities_queue_stats;
+static int hf_openflow_v6_switch_features_capabilities_port_blocked;
+static int hf_openflow_v6_switch_features_capabilities_bundles;
+static int hf_openflow_v6_switch_features_capabilities_flow_monitoring;
+static int hf_openflow_v6_switch_features_reserved;
+static int hf_openflow_v6_switch_config_flags;
+static int hf_openflow_v6_switch_config_flags_fragments;
+static int hf_openflow_v6_switch_config_miss_send_len;
+static int hf_openflow_v6_packet_in_buffer_id;
+static int hf_openflow_v6_packet_in_total_len;
+static int hf_openflow_v6_packet_in_reason;
+static int hf_openflow_v6_packet_in_table_id;
+static int hf_openflow_v6_packet_in_cookie;
+static int hf_openflow_v6_packet_in_pad;
+static int hf_openflow_v6_flow_removed_cookie;
+static int hf_openflow_v6_flow_removed_priority;
+static int hf_openflow_v6_flow_removed_reason;
+static int hf_openflow_v6_flow_removed_table_id;
+static int hf_openflow_v6_flow_removed_idle_timeout;
+static int hf_openflow_v6_flow_removed_hard_timeout;
+static int hf_openflow_v6_port_status_reason;
+static int hf_openflow_v6_port_status_pad;
+static int hf_openflow_v6_packet_out_buffer_id;
+static int hf_openflow_v6_packet_out_acts_len;
+static int hf_openflow_v6_packet_out_pad;
+static int hf_openflow_v6_flowmod_cookie;
+static int hf_openflow_v6_flowmod_cookie_mask;
+static int hf_openflow_v6_flowmod_table_id;
+static int hf_openflow_v6_flowmod_command;
+static int hf_openflow_v6_flowmod_idle_timeout;
+static int hf_openflow_v6_flowmod_hard_timeout;
+static int hf_openflow_v6_flowmod_priority;
+static int hf_openflow_v6_flowmod_buffer_id;
+static int hf_openflow_v6_flowmod_out_port;
+static int hf_openflow_v6_flowmod_out_group;
+static int hf_openflow_v6_flowmod_flags;
+static int hf_openflow_v6_flowmod_flags_send_flow_rem;
+static int hf_openflow_v6_flowmod_flags_check_overlap;
+static int hf_openflow_v6_flowmod_flags_reset_counts;
+static int hf_openflow_v6_flowmod_flags_no_packet_counts;
+static int hf_openflow_v6_flowmod_flags_no_byte_counts;
+static int hf_openflow_v6_flowmod_importance;
+static int hf_openflow_v6_bucket_length;
+static int hf_openflow_v6_bucket_weight;
+static int hf_openflow_v6_bucket_watch_port;
+static int hf_openflow_v6_bucket_watch_group;
+static int hf_openflow_v6_bucket_pad;
+static int hf_openflow_v6_groupmod_command;
+static int hf_openflow_v6_groupmod_type;
+static int hf_openflow_v6_groupmod_pad;
+static int hf_openflow_v6_groupmod_group_id;
+static int hf_openflow_v6_groupmod_bucket_array_len;
+static int hf_openflow_v6_groupmod_command_bucket_id;
+static int hf_openflow_v6_portmod_prop_type;
+static int hf_openflow_v6_portmod_prop_length;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_10mb_hd;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_10mb_fd;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_100mb_hd;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_100mb_fd;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_1gb_hd;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_1gb_fd;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_10gb_fd;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_40gb_fd;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_100gb_fd;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_1tb_fd;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_other;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_copper;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_fiber;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_autoneg;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_pause;
+static int hf_openflow_v6_portmod_prop_ethernet_advertise_pause_asym;
+static int hf_openflow_v6_portmod_prop_optical_configure;
+static int hf_openflow_v6_portmod_prop_optical_configure_rx_tune;
+static int hf_openflow_v6_portmod_prop_optical_configure_tx_tune;
+static int hf_openflow_v6_portmod_prop_optical_configure_tx_pwr;
+static int hf_openflow_v6_portmod_prop_optical_configure_use_freq;
+static int hf_openflow_v6_portmod_prop_optical_freq_lmda;
+static int hf_openflow_v6_portmod_prop_optical_fl_offset;
+static int hf_openflow_v6_portmod_prop_optical_grid_span;
+static int hf_openflow_v6_portmod_prop_optical_tx_pwr;
+static int hf_openflow_v6_portmod_prop_experimenter_experimenter;
+static int hf_openflow_v6_portmod_prop_experimenter_exp_type;
+static int hf_openflow_v6_portmod_port_no;
+static int hf_openflow_v6_portmod_pad;
+static int hf_openflow_v6_portmod_hw_addr;
+static int hf_openflow_v6_portmod_pad2;
+static int hf_openflow_v6_portmod_config;
+static int hf_openflow_v6_portmod_config_port_down;
+static int hf_openflow_v6_portmod_config_no_recv;
+static int hf_openflow_v6_portmod_config_no_fwd;
+static int hf_openflow_v6_portmod_config_no_packet_in;
+static int hf_openflow_v6_portmod_mask;
+static int hf_openflow_v6_portmod_mask_port_down;
+static int hf_openflow_v6_portmod_mask_no_recv;
+static int hf_openflow_v6_portmod_mask_no_fwd;
+static int hf_openflow_v6_portmod_mask_no_packet_in;
+static int hf_openflow_v6_tablemod_table_id;
+static int hf_openflow_v6_tablemod_pad;
+static int hf_openflow_v6_tablemod_config;
+static int hf_openflow_v6_tablemod_config_eviction;
+static int hf_openflow_v6_tablemod_config_vacancy_events;
+static int hf_openflow_v6_tablemod_prop_type;
+static int hf_openflow_v6_tablemod_prop_length;
+static int hf_openflow_v6_tablemod_prop_eviction_flags;
+static int hf_openflow_v6_tablemod_prop_eviction_flags_other;
+static int hf_openflow_v6_tablemod_prop_eviction_flags_importance;
+static int hf_openflow_v6_tablemod_prop_eviction_flags_lifetime;
+static int hf_openflow_v6_tablemod_prop_vacancy_vacancy_down;
+static int hf_openflow_v6_tablemod_prop_vacancy_vacancy_up;
+static int hf_openflow_v6_tablemod_prop_vacancy_vacancy;
+static int hf_openflow_v6_tablemod_prop_vacancy_pad;
+static int hf_openflow_v6_tablemod_prop_experimenter_experimenter;
+static int hf_openflow_v6_tablemod_prop_experimenter_exp_type;
+static int hf_openflow_v6_flow_stats_request_table_id;
+static int hf_openflow_v6_flow_stats_request_pad;
+static int hf_openflow_v6_flow_stats_request_out_port;
+static int hf_openflow_v6_flow_stats_request_out_group;
+static int hf_openflow_v6_flow_stats_request_pad2;
+static int hf_openflow_v6_flow_stats_request_cookie;
+static int hf_openflow_v6_flow_stats_request_cookie_mask;
+static int hf_openflow_v6_aggregate_stats_request_table_id;
+static int hf_openflow_v6_aggregate_stats_request_pad;
+static int hf_openflow_v6_aggregate_stats_request_out_port;
+static int hf_openflow_v6_aggregate_stats_request_out_group;
+static int hf_openflow_v6_aggregate_stats_request_pad2;
+static int hf_openflow_v6_aggregate_stats_request_cookie;
+static int hf_openflow_v6_aggregate_stats_request_cookie_mask;
+static int hf_openflow_v6_table_feature_prop_type;
+static int hf_openflow_v6_table_feature_prop_length;
+static int hf_openflow_v6_table_feature_prop_next_tables_next_table_id;
+static int hf_openflow_v6_table_feature_prop_table_sync_from_table_id;
+static int hf_openflow_v6_table_feature_prop_experimenter_experimenter;
+static int hf_openflow_v6_table_feature_prop_experimenter_exp_type;
+static int hf_openflow_v6_table_feature_prop_pad;
+static int hf_openflow_v6_table_features_length;
+static int hf_openflow_v6_table_features_table_id;
+static int hf_openflow_v6_table_features_pad;
+static int hf_openflow_v6_table_features_name;
+static int hf_openflow_v6_table_features_metadata_match;
+static int hf_openflow_v6_table_features_metadata_write;
+static int hf_openflow_v6_table_features_capabilities;
+static int hf_openflow_v6_table_features_capabilities_eviction;
+static int hf_openflow_v6_table_features_capabilities_vacancy_events;
+static int hf_openflow_v6_table_features_max_entries;
+static int hf_openflow_v6_port_stats_request_port_no;
+static int hf_openflow_v6_port_stats_request_pad;
+static int hf_openflow_v6_queue_stats_request_port_no;
+static int hf_openflow_v6_queue_stats_request_queue_id;
+static int hf_openflow_v6_group_stats_request_group_id;
+static int hf_openflow_v6_group_stats_request_pad;
+static int hf_openflow_v6_meter_stats_request_meter_id;
+static int hf_openflow_v6_meter_stats_request_pad;
+static int hf_openflow_v6_meter_desc_request_meter_id;
+static int hf_openflow_v6_meter_desc_request_pad;
+static int hf_openflow_v6_queue_desc_request_port_no;
+static int hf_openflow_v6_queue_desc_request_queue_id;
+static int hf_openflow_v6_flow_monitor_request_monitor_id;
+static int hf_openflow_v6_flow_monitor_request_out_port;
+static int hf_openflow_v6_flow_monitor_request_out_group;
+static int hf_openflow_v6_flow_monitor_request_flags;
+static int hf_openflow_v6_flow_monitor_request_flags_initial;
+static int hf_openflow_v6_flow_monitor_request_flags_add;
+static int hf_openflow_v6_flow_monitor_request_flags_removed;
+static int hf_openflow_v6_flow_monitor_request_flags_modify;
+static int hf_openflow_v6_flow_monitor_request_flags_instructions;
+static int hf_openflow_v6_flow_monitor_request_flags_no_abbrev;
+static int hf_openflow_v6_flow_monitor_request_flags_only_own;
+static int hf_openflow_v6_flow_monitor_request_table_id;
+static int hf_openflow_v6_flow_monitor_request_command;
+static int hf_openflow_v6_multipart_request_type;
+static int hf_openflow_v6_multipart_request_flags;
+static int hf_openflow_v6_multipart_request_flags_more;
+static int hf_openflow_v6_multipart_request_pad;
+static int hf_openflow_v6_multipart_request_experimenter_experimenter;
+static int hf_openflow_v6_multipart_request_experimenter_exp_type;
+static int hf_openflow_v6_switch_description_mfr_desc;
+static int hf_openflow_v6_switch_description_hw_desc;
+static int hf_openflow_v6_switch_description_sw_desc;
+static int hf_openflow_v6_switch_description_serial_num;
+static int hf_openflow_v6_switch_description_dp_desc;
+static int hf_openflow_v6_flow_stats_length;
+static int hf_openflow_v6_flow_stats_table_id;
+static int hf_openflow_v6_flow_stats_duration_sec;
+static int hf_openflow_v6_flow_stats_duration_nsec;
+static int hf_openflow_v6_flow_stats_priority;
+static int hf_openflow_v6_flow_stats_pad2;
+static int hf_openflow_v6_table_stats_table_id;
+static int hf_openflow_v6_table_stats_pad;
+static int hf_openflow_v6_table_stats_active_count;
+static int hf_openflow_v6_table_stats_lookup_count;
+static int hf_openflow_v6_table_stats_match_count;
+static int hf_openflow_v6_port_stats_length;
+static int hf_openflow_v6_port_stats_pad;
+static int hf_openflow_v6_port_stats_port_no;
+static int hf_openflow_v6_port_stats_duration_sec;
+static int hf_openflow_v6_port_stats_duration_nsec;
+static int hf_openflow_v6_port_stats_rx_packets;
+static int hf_openflow_v6_port_stats_tx_packets;
+static int hf_openflow_v6_port_stats_rx_bytes;
+static int hf_openflow_v6_port_stats_tx_bytes;
+static int hf_openflow_v6_port_stats_rx_dropped;
+static int hf_openflow_v6_port_stats_tx_dropped;
+static int hf_openflow_v6_port_stats_rx_errors;
+static int hf_openflow_v6_port_stats_tx_errors;
+static int hf_openflow_v6_queue_stats_length;
+static int hf_openflow_v6_queue_stats_pad;
+static int hf_openflow_v6_queue_stats_port_no;
+static int hf_openflow_v6_queue_stats_queue_id;
+static int hf_openflow_v6_queue_stats_tx_bytes;
+static int hf_openflow_v6_queue_stats_tx_packets;
+static int hf_openflow_v6_queue_stats_tx_errors;
+static int hf_openflow_v6_queue_stats_duration_sec;
+static int hf_openflow_v6_queue_stats_duration_nsec;
+static int hf_openflow_v6_queue_stats_prop_type;
+static int hf_openflow_v6_queue_stats_prop_length;
+static int hf_openflow_v6_queue_stats_prop_experimenter_experimenter;
+static int hf_openflow_v6_queue_stats_prop_experimenter_exp_type;
+static int hf_openflow_v6_bucket_counter_packet_count;
+static int hf_openflow_v6_bucket_counter_byte_count;
+static int hf_openflow_v6_group_stats_length;
+static int hf_openflow_v6_group_stats_pad;
+static int hf_openflow_v6_group_stats_group_id;
+static int hf_openflow_v6_group_stats_ref_count;
+static int hf_openflow_v6_group_stats_pad2;
+static int hf_openflow_v6_group_stats_packet_count;
+static int hf_openflow_v6_group_stats_byte_count;
+static int hf_openflow_v6_group_desc_length;
+static int hf_openflow_v6_group_desc_type;
+static int hf_openflow_v6_group_desc_pad;
+static int hf_openflow_v6_group_desc_group_id;
+static int hf_openflow_v6_group_features_types;
+static int hf_openflow_v6_group_features_types_all;
+static int hf_openflow_v6_group_features_types_select;
+static int hf_openflow_v6_group_features_types_indirect;
+static int hf_openflow_v6_group_features_types_ff;
+static int hf_openflow_v6_group_features_capabilities;
+static int hf_openflow_v6_group_features_capabilities_select_weight;
+static int hf_openflow_v6_group_features_capabilities_select_liveness;
+static int hf_openflow_v6_group_features_capabilities_chaining;
+static int hf_openflow_v6_group_features_capabilities_chaining_checks;
+static int hf_openflow_v6_group_features_max_groups_all;
+static int hf_openflow_v6_group_features_max_groups_select;
+static int hf_openflow_v6_group_features_max_groups_indirect;
+static int hf_openflow_v6_group_features_max_groups_ff;
+static int hf_openflow_v6_group_features_actions_all;
+static int hf_openflow_v6_group_features_actions_all_output;
+static int hf_openflow_v6_group_features_actions_all_copy_ttl_out;
+static int hf_openflow_v6_group_features_actions_all_copy_ttl_in;
+static int hf_openflow_v6_group_features_actions_all_set_mpls_ttl;
+static int hf_openflow_v6_group_features_actions_all_dec_mpls_ttl;
+static int hf_openflow_v6_group_features_actions_all_push_vlan;
+static int hf_openflow_v6_group_features_actions_all_pop_vlan;
+static int hf_openflow_v6_group_features_actions_all_push_mpls;
+static int hf_openflow_v6_group_features_actions_all_pop_mpls;
+static int hf_openflow_v6_group_features_actions_all_set_queue;
+static int hf_openflow_v6_group_features_actions_all_group;
+static int hf_openflow_v6_group_features_actions_all_set_nw_ttl;
+static int hf_openflow_v6_group_features_actions_all_dec_nw_ttl;
+static int hf_openflow_v6_group_features_actions_all_set_field;
+static int hf_openflow_v6_group_features_actions_all_push_pbb;
+static int hf_openflow_v6_group_features_actions_all_pop_pbb;
+static int hf_openflow_v6_group_features_actions_all_copy_field;
+static int hf_openflow_v6_group_features_actions_all_meter;
+static int hf_openflow_v6_group_features_actions_select;
+static int hf_openflow_v6_group_features_actions_select_output;
+static int hf_openflow_v6_group_features_actions_select_copy_ttl_out;
+static int hf_openflow_v6_group_features_actions_select_copy_ttl_in;
+static int hf_openflow_v6_group_features_actions_select_set_mpls_ttl;
+static int hf_openflow_v6_group_features_actions_select_dec_mpls_ttl;
+static int hf_openflow_v6_group_features_actions_select_push_vlan;
+static int hf_openflow_v6_group_features_actions_select_pop_vlan;
+static int hf_openflow_v6_group_features_actions_select_push_mpls;
+static int hf_openflow_v6_group_features_actions_select_pop_mpls;
+static int hf_openflow_v6_group_features_actions_select_set_queue;
+static int hf_openflow_v6_group_features_actions_select_group;
+static int hf_openflow_v6_group_features_actions_select_set_nw_ttl;
+static int hf_openflow_v6_group_features_actions_select_dec_nw_ttl;
+static int hf_openflow_v6_group_features_actions_select_set_field;
+static int hf_openflow_v6_group_features_actions_select_push_pbb;
+static int hf_openflow_v6_group_features_actions_select_pop_pbb;
+static int hf_openflow_v6_group_features_actions_select_copy_field;
+static int hf_openflow_v6_group_features_actions_select_meter;
+static int hf_openflow_v6_group_features_actions_indirect;
+static int hf_openflow_v6_group_features_actions_indirect_output;
+static int hf_openflow_v6_group_features_actions_indirect_copy_ttl_out;
+static int hf_openflow_v6_group_features_actions_indirect_copy_ttl_in;
+static int hf_openflow_v6_group_features_actions_indirect_set_mpls_ttl;
+static int hf_openflow_v6_group_features_actions_indirect_dec_mpls_ttl;
+static int hf_openflow_v6_group_features_actions_indirect_push_vlan;
+static int hf_openflow_v6_group_features_actions_indirect_pop_vlan;
+static int hf_openflow_v6_group_features_actions_indirect_push_mpls;
+static int hf_openflow_v6_group_features_actions_indirect_pop_mpls;
+static int hf_openflow_v6_group_features_actions_indirect_set_queue;
+static int hf_openflow_v6_group_features_actions_indirect_group;
+static int hf_openflow_v6_group_features_actions_indirect_set_nw_ttl;
+static int hf_openflow_v6_group_features_actions_indirect_dec_nw_ttl;
+static int hf_openflow_v6_group_features_actions_indirect_set_field;
+static int hf_openflow_v6_group_features_actions_indirect_push_pbb;
+static int hf_openflow_v6_group_features_actions_indirect_pop_pbb;
+static int hf_openflow_v6_group_features_actions_indirect_copy_field;
+static int hf_openflow_v6_group_features_actions_indirect_meter;
+static int hf_openflow_v6_group_features_actions_ff;
+static int hf_openflow_v6_group_features_actions_ff_output;
+static int hf_openflow_v6_group_features_actions_ff_copy_ttl_out;
+static int hf_openflow_v6_group_features_actions_ff_copy_ttl_in;
+static int hf_openflow_v6_group_features_actions_ff_set_mpls_ttl;
+static int hf_openflow_v6_group_features_actions_ff_dec_mpls_ttl;
+static int hf_openflow_v6_group_features_actions_ff_push_vlan;
+static int hf_openflow_v6_group_features_actions_ff_pop_vlan;
+static int hf_openflow_v6_group_features_actions_ff_push_mpls;
+static int hf_openflow_v6_group_features_actions_ff_pop_mpls;
+static int hf_openflow_v6_group_features_actions_ff_set_queue;
+static int hf_openflow_v6_group_features_actions_ff_group;
+static int hf_openflow_v6_group_features_actions_ff_set_nw_ttl;
+static int hf_openflow_v6_group_features_actions_ff_dec_nw_ttl;
+static int hf_openflow_v6_group_features_actions_ff_set_field;
+static int hf_openflow_v6_group_features_actions_ff_push_pbb;
+static int hf_openflow_v6_group_features_actions_ff_pop_pbb;
+static int hf_openflow_v6_group_features_actions_ff_copy_field;
+static int hf_openflow_v6_group_features_actions_ff_meter;
+static int hf_openflow_v6_meter_band_stats_packet_band_count;
+static int hf_openflow_v6_meter_band_stats_byte_band_count;
+static int hf_openflow_v6_meter_stats_meter_id;
+static int hf_openflow_v6_meter_stats_len;
+static int hf_openflow_v6_meter_stats_pad;
+static int hf_openflow_v6_meter_stats_flow_count;
+static int hf_openflow_v6_meter_stats_packet_in_count;
+static int hf_openflow_v6_meter_stats_byte_in_count;
+static int hf_openflow_v6_meter_stats_duration_sec;
+static int hf_openflow_v6_meter_stats_duration_nsec;
+static int hf_openflow_v6_meter_desc_len;
+static int hf_openflow_v6_meter_desc_flags;
+static int hf_openflow_v6_meter_desc_flags_kbps;
+static int hf_openflow_v6_meter_desc_flags_pktps;
+static int hf_openflow_v6_meter_desc_flags_burst;
+static int hf_openflow_v6_meter_desc_flags_stats;
+static int hf_openflow_v6_meter_desc_meter_id;
+static int hf_openflow_v6_meter_features_max_meter;
+static int hf_openflow_v6_meter_features_band_types;
+static int hf_openflow_v6_meter_features_band_types_drop;
+static int hf_openflow_v6_meter_features_band_types_dscp_remark;
+static int hf_openflow_v6_meter_features_capabilities;
+static int hf_openflow_v6_meter_features_capabilities_kbps;
+static int hf_openflow_v6_meter_features_capabilities_pktps;
+static int hf_openflow_v6_meter_features_capabilities_burst;
+static int hf_openflow_v6_meter_features_capabilities_stats;
+static int hf_openflow_v6_meter_features_max_bands;
+static int hf_openflow_v6_meter_features_max_color;
+static int hf_openflow_v6_meter_features_pad;
+static int hf_openflow_v6_flow_update_length;
+static int hf_openflow_v6_flow_update_event;
+static int hf_openflow_v6_flow_update_full_table_id;
+static int hf_openflow_v6_flow_update_full_reason;
+static int hf_openflow_v6_flow_update_full_zero;
+static int hf_openflow_v6_flow_update_full_idle_timeout;
+static int hf_openflow_v6_flow_update_full_hard_timeout;
+static int hf_openflow_v6_flow_update_full_priority;
+static int hf_openflow_v6_flow_update_full_zeros;
+static int hf_openflow_v6_flow_update_full_cookie;
+static int hf_openflow_v6_flow_update_abbrev_xid;
+static int hf_openflow_v6_flow_update_paused_zeros;
+static int hf_openflow_v6_multipart_reply_type;
+static int hf_openflow_v6_multipart_reply_flags;
+static int hf_openflow_v6_multipart_reply_flags_more;
+static int hf_openflow_v6_multipart_reply_pad;
+static int hf_openflow_v6_multipart_reply_experimenter_experimenter;
+static int hf_openflow_v6_multipart_reply_experimenter_exp_type;
+static int hf_openflow_v6_table_desc_length;
+static int hf_openflow_v6_table_desc_table_id;
+static int hf_openflow_v6_table_desc_pad;
+static int hf_openflow_v6_table_desc_config;
+static int hf_openflow_v6_table_desc_config_eviction;
+static int hf_openflow_v6_table_desc_config_vacancy_events;
+static int hf_openflow_v6_queue_desc_port_no;
+static int hf_openflow_v6_queue_desc_queue_id;
+static int hf_openflow_v6_queue_desc_len;
+static int hf_openflow_v6_queue_desc_pad;
+static int hf_openflow_v6_queue_desc_prop_property;
+static int hf_openflow_v6_queue_desc_prop_len;
+static int hf_openflow_v6_queue_desc_prop_pad;
+static int hf_openflow_v6_queue_desc_prop_min_rate_rate;
+static int hf_openflow_v6_queue_desc_prop_min_rate_pad;
+static int hf_openflow_v6_queue_desc_prop_max_rate_rate;
+static int hf_openflow_v6_queue_desc_prop_max_rate_pad;
+static int hf_openflow_v6_queue_desc_prop_experimenter_experimenter;
+static int hf_openflow_v6_queue_desc_prop_experimenter_exp_type;
+static int hf_openflow_v6_role_request_role;
+static int hf_openflow_v6_role_request_pad;
+static int hf_openflow_v6_role_request_generation_id;
+static int hf_openflow_v6_role_reply_role;
+static int hf_openflow_v6_role_reply_pad;
+static int hf_openflow_v6_role_reply_generation_id;
+static int hf_openflow_v6_async_config_prop_type;
+static int hf_openflow_v6_async_config_prop_length;
+static int hf_openflow_v6_async_config_prop_reason_packet_in_mask;
+static int hf_openflow_v6_async_config_prop_reason_packet_in_mask_table_miss;
+static int hf_openflow_v6_async_config_prop_reason_packet_in_mask_apply_action;
+static int hf_openflow_v6_async_config_prop_reason_packet_in_mask_invalid_ttl;
+static int hf_openflow_v6_async_config_prop_reason_packet_in_mask_action_set;
+static int hf_openflow_v6_async_config_prop_reason_packet_in_mask_group;
+static int hf_openflow_v6_async_config_prop_reason_packet_in_mask_packet_out;
+static int hf_openflow_v6_async_config_prop_reason_port_status_mask;
+static int hf_openflow_v6_async_config_prop_reason_port_status_mask_add;
+static int hf_openflow_v6_async_config_prop_reason_port_status_mask_delete;
+static int hf_openflow_v6_async_config_prop_reason_port_status_mask_modify;
+static int hf_openflow_v6_async_config_prop_reason_flow_removed_mask;
+static int hf_openflow_v6_async_config_prop_reason_flow_removed_mask_idle_timeout;
+static int hf_openflow_v6_async_config_prop_reason_flow_removed_mask_hard_timeout;
+static int hf_openflow_v6_async_config_prop_reason_flow_removed_mask_delete;
+static int hf_openflow_v6_async_config_prop_reason_flow_removed_mask_group_delete;
+static int hf_openflow_v6_async_config_prop_reason_flow_removed_mask_meter_delete;
+static int hf_openflow_v6_async_config_prop_reason_flow_removed_mask_eviction;
+static int hf_openflow_v6_async_config_prop_reason_role_status_mask;
+static int hf_openflow_v6_async_config_prop_reason_role_status_mask_master_request;
+static int hf_openflow_v6_async_config_prop_reason_role_status_mask_config;
+static int hf_openflow_v6_async_config_prop_reason_role_status_mask_experimenter;
+static int hf_openflow_v6_async_config_prop_reason_table_status_mask;
+static int hf_openflow_v6_async_config_prop_reason_table_status_mask_vacancy_down;
+static int hf_openflow_v6_async_config_prop_reason_table_status_mask_vacancy_up;
+static int hf_openflow_v6_async_config_prop_reason_requestforward_mask;
+static int hf_openflow_v6_async_config_prop_reason_requestforward_mask_group_mod;
+static int hf_openflow_v6_async_config_prop_reason_requestforward_mask_meter_mod;
+static int hf_openflow_v6_async_config_prop_experimenter_experimenter;
+static int hf_openflow_v6_async_config_prop_experimenter_exp_type;
+static int hf_openflow_v6_metermod_command;
+static int hf_openflow_v6_metermod_flags;
+static int hf_openflow_v6_metermod_flags_kbps;
+static int hf_openflow_v6_metermod_flags_pktps;
+static int hf_openflow_v6_metermod_flags_burst;
+static int hf_openflow_v6_metermod_flags_stats;
+static int hf_openflow_v6_metermod_meter_id;
+static int hf_openflow_v6_role_status_role;
+static int hf_openflow_v6_role_status_reason;
+static int hf_openflow_v6_role_status_pad;
+static int hf_openflow_v6_role_status_generation_id;
+static int hf_openflow_v6_table_status_reason;
+static int hf_openflow_v6_table_status_pad;
+static int hf_openflow_v6_bundle_control_bundle_id;
+static int hf_openflow_v6_bundle_control_type;
+static int hf_openflow_v6_bundle_control_flags;
+static int hf_openflow_v6_bundle_control_flags_atomic;
+static int hf_openflow_v6_bundle_control_flags_ordered;
+static int hf_openflow_v6_bundle_prop_type;
+static int hf_openflow_v6_bundle_prop_length;
+static int hf_openflow_v6_bundle_prop_experimenter_experimenter;
+static int hf_openflow_v6_bundle_prop_experimenter_exp_type;
+static int hf_openflow_v6_bundle_add_bundle_id;
+static int hf_openflow_v6_bundle_add_pad;
+static int hf_openflow_v6_bundle_add_flags;
+static int hf_openflow_v6_bundle_add_flags_atomic;
+static int hf_openflow_v6_bundle_add_flags_ordered;
+static int hf_openflow_v6_oxs_class;
+static int hf_openflow_v6_oxs_field;
+static int hf_openflow_v6_oxs_reserved;
+static int hf_openflow_v6_oxs_length;
+static int hf_openflow_v6_oxs_basic_duration_sec;
+static int hf_openflow_v6_oxs_basic_duration_nsec;
+static int hf_openflow_v6_oxs_basic_idle_sec;
+static int hf_openflow_v6_oxs_basic_idle_nsec;
+static int hf_openflow_v6_oxs_basic_flow_count;
+static int hf_openflow_v6_oxs_basic_packet_count;
+static int hf_openflow_v6_oxs_basic_byte_count;
+static int hf_openflow_v6_oxs_experimenter_experimenter;
+static int hf_openflow_v6_oxs_experimenter_value;
+static int hf_openflow_v6_instruction_stat_trigger_flags;
+static int hf_openflow_v6_instruction_stat_triffer_flags_periodic;
+static int hf_openflow_v6_instruction_stat_triffer_flags_only_first;
+static int hf_openflow_v6_instruction_stat_triffer_flags_reserved;
+static int hf_openflow_v6_port_desc_prop_recirculate_port_no;
+static int hf_openflow_v6_bundle_features_request_flags;
+static int hf_openflow_v6_bundle_features_request_pad;
+static int hf_openflow_v6_stats_reserved;
+static int hf_openflow_v6_stats_length;
+static int hf_openflow_v6_stats_pad;
+static int hf_openflow_v6_flow_desc_length;
+static int hf_openflow_v6_flow_desc_pad2;
+static int hf_openflow_v6_flow_desc_table_id;
+static int hf_openflow_v6_flow_desc_pad;
+static int hf_openflow_v6_flow_desc_priority;
+static int hf_openflow_v6_flow_desc_idle_timeout;
+static int hf_openflow_v6_flow_desc_hard_timeout;
+static int hf_openflow_v6_flow_desc_flags;
+static int hf_openflow_v6_flow_desc_flags_send_flow_rem;
+static int hf_openflow_v6_flow_desc_flags_check_overlap;
+static int hf_openflow_v6_flow_desc_flags_reset_counts;
+static int hf_openflow_v6_flow_desc_flags_no_packet_counts;
+static int hf_openflow_v6_flow_desc_flags_no_byte_counts;
+static int hf_openflow_v6_flow_desc_importance;
+static int hf_openflow_v6_flow_desc_cookie;
+static int hf_openflow_v6_controller_status_length;
+static int hf_openflow_v6_controller_status_short_id;
+static int hf_openflow_v6_controller_status_role;
+static int hf_openflow_v6_controller_status_reason;
+static int hf_openflow_v6_controller_status_channel_status;
+static int hf_openflow_v6_controller_status_pad;
+static int hf_openflow_v6_time_seconds;
+static int hf_openflow_v6_time_nanoseconds;
+static int hf_openflow_v6_time_pad;
+static int hf_openflow_v6_bundle_feature_prop_type;
+static int hf_openflow_v6_bundle_feature_prop_length;
+static int hf_openflow_v6_bundle_feature_prop_time_pad;
+static int hf_openflow_v6_bundle_feature_prop_experimenter_experimenter;
+static int hf_openflow_v6_bundle_feature_prop_experimenter_exp_type;
+static int hf_openflow_v6_bundle_feature_prop_pad;
+static int hf_openflow_v6_controller_status_prop_type;
+static int hf_openflow_v6_controller_status_prop_length;
+static int hf_openflow_v6_controller_status_prop_experimenter_experimenter;
+static int hf_openflow_v6_controller_status_prop_experimenter_exp_type;
+static int hf_openflow_v6_controller_status_prop_pad;
+static int hf_openflow_v6_flow_stats_reason;
+static int hf_openflow_v6_controller_status_prop_uri;
+
+static gint ett_openflow_v6;
+static gint ett_openflow_v6_flowmod_flags;
+static gint ett_openflow_v6_bucket;
+static gint ett_openflow_v6_oxm;
+static gint ett_openflow_v6_match;
+static gint ett_openflow_v6_action;
+static gint ett_openflow_v6_instruction;
+static gint ett_openflow_v6_port_desc_prop;
+static gint ett_openflow_v6_port_desc_prop_ethernet_current;
+static gint ett_openflow_v6_port_desc_prop_ethernet_advertised;
+static gint ett_openflow_v6_port_desc_prop_ethernet_supported;
+static gint ett_openflow_v6_port_desc_prop_ethernet_peer;
+static gint ett_openflow_v6_port_desc_prop_optical_supported;
+static gint ett_openflow_v6_port_stats_prop;
+static gint ett_openflow_v6_port_stats_prop_optical_flags;
+static gint ett_openflow_v6_port;
+static gint ett_openflow_v6_port_config;
+static gint ett_openflow_v6_port_state;
+static gint ett_openflow_v6_meter_band;
+static gint ett_openflow_v6_hello_element;
+static gint ett_openflow_v6_error_data;
+static gint ett_openflow_v6_switch_features_capabilities;
+static gint ett_openflow_v6_switch_config_flags;
+static gint ett_openflow_v6_packet_in_data;
+static gint ett_openflow_v6_packet_out_data;
+static gint ett_openflow_v6_portmod_prop;
+static gint ett_openflow_v6_portmod_prop_ethernet_advertise;
+static gint ett_openflow_v6_portmod_prop_optical_configure;
+static gint ett_openflow_v6_portmod_config;
+static gint ett_openflow_v6_portmod_mask;
+static gint ett_openflow_v6_tablemod_config;
+static gint ett_openflow_v6_tablemod_prop;
+static gint ett_openflow_v6_tablemod_prop_eviction_flags;
+static gint ett_openflow_v6_table_features;
+static gint ett_openflow_v6_table_features_capabilities;
+static gint ett_openflow_v6_table_feature_prop;
+static gint ett_openflow_v6_table_feature_prop_instruction_id;
+static gint ett_openflow_v6_table_feature_prop_action_id;
+static gint ett_openflow_v6_table_feature_prop_oxm_id;
+static gint ett_openflow_v6_flow_monitor_request_flags;
+static gint ett_openflow_v6_multipart_request_flags;
+static gint ett_openflow_v6_flow_stats;
+static gint ett_openflow_v6_table_stats;
+static gint ett_openflow_v6_port_stats;
+static gint ett_openflow_v6_queue_stats;
+static gint ett_openflow_v6_queue_stats_prop;
+static gint ett_openflow_v6_bucket_counter;
+static gint ett_openflow_v6_group_stats;
+static gint ett_openflow_v6_group_desc;
+static gint ett_openflow_v6_group_features_types;
+static gint ett_openflow_v6_group_features_capabilities;
+static gint ett_openflow_v6_group_features_actions_all;
+static gint ett_openflow_v6_group_features_actions_select;
+static gint ett_openflow_v6_group_features_actions_indirect;
+static gint ett_openflow_v6_group_features_actions_ff;
+static gint ett_openflow_v6_meter_band_stats;
+static gint ett_openflow_v6_meter_stats;
+static gint ett_openflow_v6_meter_desc;
+static gint ett_openflow_v6_meter_desc_flags;
+static gint ett_openflow_v6_meter_features_band_types;
+static gint ett_openflow_v6_meter_features_capabilities;
+static gint ett_openflow_v6_flow_update;
+static gint ett_openflow_v6_multipart_reply_flags;
+static gint ett_openflow_v6_table_desc;
+static gint ett_openflow_v6_table_desc_config;
+static gint ett_openflow_v6_queue_desc;
+static gint ett_openflow_v6_queue_desc_prop;
+static gint ett_openflow_v6_async_config_prop;
+static gint ett_openflow_v6_async_config_prop_reason_packet_in_mask;
+static gint ett_openflow_v6_async_config_prop_reason_port_status_mask;
+static gint ett_openflow_v6_async_config_prop_reason_flow_removed_mask;
+static gint ett_openflow_v6_async_config_prop_reason_role_status_mask;
+static gint ett_openflow_v6_async_config_prop_reason_table_status_mask;
+static gint ett_openflow_v6_async_config_prop_reason_requestforward_mask;
+static gint ett_openflow_v6_metermod_flags;
+static gint ett_openflow_v6_requestforward_request;
+static gint ett_openflow_v6_bundle_control_flags;
+static gint ett_openflow_v6_bundle_prop;
+static gint ett_openflow_v6_bundle_add_flags;
+static gint ett_openflow_v6_bundle_add_message;
+static gint ett_openflow_v6_instruction_stat_trigger_flags;
+static gint ett_openflow_v6_flow_desc;
+static gint ett_openflow_v6_flow_desc_flags;
+static gint ett_openflow_v6_bundle_feature_prop;
+static gint ett_openflow_v6_controller_status_prop;
+
+static expert_field ei_openflow_v6_match_undecoded;
+static expert_field ei_openflow_v6_oxm_undecoded;
+static expert_field ei_openflow_v6_action_undecoded;
+static expert_field ei_openflow_v6_instruction_undecoded;
+static expert_field ei_openflow_v6_port_desc_prop_undecoded;
+static expert_field ei_openflow_v6_port_stats_prop_undecoded;
+static expert_field ei_openflow_v6_meter_band_undecoded;
+static expert_field ei_openflow_v6_hello_element_undecoded;
+static expert_field ei_openflow_v6_error_undecoded;
+static expert_field ei_openflow_v6_experimenter_undecoded;
+static expert_field ei_openflow_v6_portmod_prop_undecoded;
+static expert_field ei_openflow_v6_tablemod_prop_undecoded;
+static expert_field ei_openflow_v6_table_feature_prop_undecoded;
+static expert_field ei_openflow_v6_multipart_request_undecoded;
+static expert_field ei_openflow_v6_queue_stats_prop_undecoded;
+static expert_field ei_openflow_v6_flow_update_undecoded;
+static expert_field ei_openflow_v6_multipart_reply_undecoded;
+static expert_field ei_openflow_v6_queue_desc_prop_undecoded;
+static expert_field ei_openflow_v6_async_config_prop_undecoded;
+static expert_field ei_openflow_v6_bundle_prop_undecoded;
+static expert_field ei_openflow_v6_message_undecoded;
+static expert_field ei_openflow_v6_length_too_short;
+static expert_field ei_openflow_v6_bundle_feature_prop_undecoded;
+static expert_field ei_openflow_v6_controller_status_prop_undecoded;
 
 static const value_string openflow_v6_version_values[] = {
     { 0x06, "1.5" },
diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c
index d56d3fda60..b0e6d4486a 100644
--- a/epan/dissectors/packet-opensafety.c
+++ b/epan/dissectors/packet-opensafety.c
@@ -90,148 +90,148 @@
 #define OSS_FRAME_ID_T(f, offset)          (tvb_get_guint8(f, OSS_FRAME_POS_ID + offset) & 0xFC)
 #define OSS_FRAME_LENGTH_T(f, offset)      (tvb_get_guint8(f, OSS_FRAME_POS_LEN + offset))
 
-static int proto_opensafety = -1;
-
-static gint ett_opensafety = -1;
-static gint ett_opensafety_checksum = -1;
-static gint ett_opensafety_snmt = -1;
-static gint ett_opensafety_ssdo = -1;
-static gint ett_opensafety_spdo = -1;
-static gint ett_opensafety_spdo_flags = -1;
-static gint ett_opensafety_ssdo_sacmd = -1;
-static gint ett_opensafety_ssdo_payload = -1;
-static gint ett_opensafety_ssdo_sodentry = -1;
-static gint ett_opensafety_ssdo_extpar = -1;
-static gint ett_opensafety_sod_mapping = -1;
-static gint ett_opensafety_node = -1;
-
-static expert_field ei_payload_length_not_positive = EI_INIT;
-static expert_field ei_payload_unknown_format = EI_INIT;
-static expert_field ei_crc_slimssdo_instead_of_spdo = EI_INIT;
-static expert_field ei_crc_frame_1_invalid = EI_INIT;
-static expert_field ei_crc_frame_1_valid_frame2_invalid = EI_INIT;
-static expert_field ei_crc_frame_2_invalid = EI_INIT;
-static expert_field ei_crc_frame_2_unknown_scm_udid = EI_INIT;
-static expert_field ei_crc_frame_2_scm_udid_encoded = EI_INIT;
-static expert_field ei_message_unknown_type = EI_INIT;
-static expert_field ei_message_reassembly_size_differs_from_header = EI_INIT;
-static expert_field ei_message_spdo_address_invalid = EI_INIT;
-static expert_field ei_message_id_field_mismatch = EI_INIT;
-static expert_field ei_scmudid_autodetected = EI_INIT;
-static expert_field ei_scmudid_invalid_preference = EI_INIT;
-static expert_field ei_scmudid_unknown = EI_INIT;
-static expert_field ei_40bit_default_domain = EI_INIT;
-
-static int hf_oss_msg = -1;
-static int hf_oss_msg_direction = -1;
-static int hf_oss_msg_category = -1;
-static int hf_oss_msg_node = -1;
-static int hf_oss_msg_network = -1;
-static int hf_oss_msg_sender = -1;
-static int hf_oss_msg_receiver = -1;
-static int hf_oss_length= -1;
-static int hf_oss_crc = -1;
-static int hf_oss_byte_offset = -1;
-
-static int hf_oss_crc_valid = -1;
-static int hf_oss_crc2_valid = -1;
-static int hf_oss_crc_type  = -1;
-
-static int hf_oss_snmt_slave = -1;
-static int hf_oss_snmt_master = -1;
-static int hf_oss_snmt_udid = -1;
-static int hf_oss_snmt_scm = -1;
-static int hf_oss_snmt_tool = -1;
-static int hf_oss_snmt_service_id = -1;
-static int hf_oss_snmt_error_group = -1;
-static int hf_oss_snmt_error_code = -1;
-static int hf_oss_snmt_param_type = -1;
-static int hf_oss_snmt_ext_addsaddr = -1;
-static int hf_oss_snmt_ext_addtxspdo = -1;
-static int hf_oss_snmt_ext_initct = -1;
-
-static int hf_oss_ssdo_server = -1;
-static int hf_oss_ssdo_client = -1;
-static int hf_oss_ssdo_sano = -1;
-static int hf_oss_ssdo_sacmd = -1;
-static int hf_oss_ssdo_sod_index = -1;
-static int hf_oss_ssdo_sod_subindex = -1;
-static int hf_oss_ssdo_payload = -1;
-static int hf_oss_ssdo_payload_size = -1;
-static int hf_oss_ssdo_sodentry_size = -1;
-static int hf_oss_ssdo_sodentry_data = -1;
-static int hf_oss_ssdo_abort_code = -1;
-static int hf_oss_ssdo_preload_queue = -1;
-static int hf_oss_ssdo_preload_error = -1;
-
-static int hf_oss_sod_par_timestamp = -1;
-static int hf_oss_sod_par_checksum = -1;
-static int hf_oss_ssdo_sodmapping = -1;
-static int hf_oss_ssdo_sodmapping_bits = -1;
-
-static int hf_oss_ssdo_sacmd_access_type = -1;
-static int hf_oss_ssdo_sacmd_preload = -1;
-static int hf_oss_ssdo_sacmd_abort_transfer = -1;
-static int hf_oss_ssdo_sacmd_segmentation = -1;
-static int hf_oss_ssdo_sacmd_toggle = -1;
-static int hf_oss_ssdo_sacmd_initiate = -1;
-static int hf_oss_ssdo_sacmd_end_segment = -1;
+static int proto_opensafety;
+
+static gint ett_opensafety;
+static gint ett_opensafety_checksum;
+static gint ett_opensafety_snmt;
+static gint ett_opensafety_ssdo;
+static gint ett_opensafety_spdo;
+static gint ett_opensafety_spdo_flags;
+static gint ett_opensafety_ssdo_sacmd;
+static gint ett_opensafety_ssdo_payload;
+static gint ett_opensafety_ssdo_sodentry;
+static gint ett_opensafety_ssdo_extpar;
+static gint ett_opensafety_sod_mapping;
+static gint ett_opensafety_node;
+
+static expert_field ei_payload_length_not_positive;
+static expert_field ei_payload_unknown_format;
+static expert_field ei_crc_slimssdo_instead_of_spdo;
+static expert_field ei_crc_frame_1_invalid;
+static expert_field ei_crc_frame_1_valid_frame2_invalid;
+static expert_field ei_crc_frame_2_invalid;
+static expert_field ei_crc_frame_2_unknown_scm_udid;
+static expert_field ei_crc_frame_2_scm_udid_encoded;
+static expert_field ei_message_unknown_type;
+static expert_field ei_message_reassembly_size_differs_from_header;
+static expert_field ei_message_spdo_address_invalid;
+static expert_field ei_message_id_field_mismatch;
+static expert_field ei_scmudid_autodetected;
+static expert_field ei_scmudid_invalid_preference;
+static expert_field ei_scmudid_unknown;
+static expert_field ei_40bit_default_domain;
+
+static int hf_oss_msg;
+static int hf_oss_msg_direction;
+static int hf_oss_msg_category;
+static int hf_oss_msg_node;
+static int hf_oss_msg_network;
+static int hf_oss_msg_sender;
+static int hf_oss_msg_receiver;
+static int hf_oss_length;
+static int hf_oss_crc;
+static int hf_oss_byte_offset;
+
+static int hf_oss_crc_valid;
+static int hf_oss_crc2_valid;
+static int hf_oss_crc_type;
+
+static int hf_oss_snmt_slave;
+static int hf_oss_snmt_master;
+static int hf_oss_snmt_udid;
+static int hf_oss_snmt_scm;
+static int hf_oss_snmt_tool;
+static int hf_oss_snmt_service_id;
+static int hf_oss_snmt_error_group;
+static int hf_oss_snmt_error_code;
+static int hf_oss_snmt_param_type;
+static int hf_oss_snmt_ext_addsaddr;
+static int hf_oss_snmt_ext_addtxspdo;
+static int hf_oss_snmt_ext_initct;
+
+static int hf_oss_ssdo_server;
+static int hf_oss_ssdo_client;
+static int hf_oss_ssdo_sano;
+static int hf_oss_ssdo_sacmd;
+static int hf_oss_ssdo_sod_index;
+static int hf_oss_ssdo_sod_subindex;
+static int hf_oss_ssdo_payload;
+static int hf_oss_ssdo_payload_size;
+static int hf_oss_ssdo_sodentry_size;
+static int hf_oss_ssdo_sodentry_data;
+static int hf_oss_ssdo_abort_code;
+static int hf_oss_ssdo_preload_queue;
+static int hf_oss_ssdo_preload_error;
+
+static int hf_oss_sod_par_timestamp;
+static int hf_oss_sod_par_checksum;
+static int hf_oss_ssdo_sodmapping;
+static int hf_oss_ssdo_sodmapping_bits;
+
+static int hf_oss_ssdo_sacmd_access_type;
+static int hf_oss_ssdo_sacmd_preload;
+static int hf_oss_ssdo_sacmd_abort_transfer;
+static int hf_oss_ssdo_sacmd_segmentation;
+static int hf_oss_ssdo_sacmd_toggle;
+static int hf_oss_ssdo_sacmd_initiate;
+static int hf_oss_ssdo_sacmd_end_segment;
 #if 0
-static int hf_oss_ssdo_sacmd_reserved = -1;
+static int hf_oss_ssdo_sacmd_reserved;
 #endif
 
-static int hf_oss_ssdo_extpar_parset = -1;
-static int hf_oss_ssdo_extpar_version = -1;
-static int hf_oss_ssdo_extpar_saddr = -1;
-static int hf_oss_ssdo_extpar_length = -1;
-static int hf_oss_ssdo_extpar_crc = -1;
-static int hf_oss_ssdo_extpar_tstamp = -1;
-static int hf_oss_ssdo_extpar_data = -1;
-static int hf_oss_ssdo_extpar = -1;
-
-static int hf_oss_scm_udid = -1;
-static int hf_oss_scm_udid_auto = -1;
-static int hf_oss_scm_udid_valid = -1;
-
-static int hf_oss_spdo_direction = -1;
-static int hf_oss_spdo_connection_valid = -1;
-static int hf_oss_spdo_ct = -1;
-static int hf_oss_spdo_ct_40bit = -1;
-static int hf_oss_spdo_time_request = -1;
-static int hf_oss_spdo_time_request_to = -1;
-static int hf_oss_spdo_time_request_from = -1;
-static int hf_oss_spdo_feature_flags = -1;
-static int hf_oss_spdo_feature_flag_40bit_available = -1;
-static int hf_oss_spdo_feature_flag_40bit_used = -1;
-
-static int hf_oss_fragments = -1;
-static int hf_oss_fragment = -1;
-static int hf_oss_fragment_overlap = -1;
-static int hf_oss_fragment_overlap_conflicts = -1;
-static int hf_oss_fragment_multiple_tails = -1;
-static int hf_oss_fragment_too_long_fragment = -1;
-static int hf_oss_fragment_error = -1;
-static int hf_oss_fragment_count = -1;
-static int hf_oss_reassembled_in = -1;
-static int hf_oss_reassembled_length = -1;
-static int hf_oss_reassembled_data = -1;
-
-static gint ett_opensafety_ssdo_fragment = -1;
-static gint ett_opensafety_ssdo_fragments = -1;
+static int hf_oss_ssdo_extpar_parset;
+static int hf_oss_ssdo_extpar_version;
+static int hf_oss_ssdo_extpar_saddr;
+static int hf_oss_ssdo_extpar_length;
+static int hf_oss_ssdo_extpar_crc;
+static int hf_oss_ssdo_extpar_tstamp;
+static int hf_oss_ssdo_extpar_data;
+static int hf_oss_ssdo_extpar;
+
+static int hf_oss_scm_udid;
+static int hf_oss_scm_udid_auto;
+static int hf_oss_scm_udid_valid;
+
+static int hf_oss_spdo_direction;
+static int hf_oss_spdo_connection_valid;
+static int hf_oss_spdo_ct;
+static int hf_oss_spdo_ct_40bit;
+static int hf_oss_spdo_time_request;
+static int hf_oss_spdo_time_request_to;
+static int hf_oss_spdo_time_request_from;
+static int hf_oss_spdo_feature_flags;
+static int hf_oss_spdo_feature_flag_40bit_available;
+static int hf_oss_spdo_feature_flag_40bit_used;
+
+static int hf_oss_fragments;
+static int hf_oss_fragment;
+static int hf_oss_fragment_overlap;
+static int hf_oss_fragment_overlap_conflicts;
+static int hf_oss_fragment_multiple_tails;
+static int hf_oss_fragment_too_long_fragment;
+static int hf_oss_fragment_error;
+static int hf_oss_fragment_count;
+static int hf_oss_reassembled_in;
+static int hf_oss_reassembled_length;
+static int hf_oss_reassembled_data;
+
+static gint ett_opensafety_ssdo_fragment;
+static gint ett_opensafety_ssdo_fragments;
 
 /* Definitions for the openSAFETY ov. UDP transport protocol */
 static dissector_handle_t opensafety_udptransport_handle = NULL;
 
-static int proto_oss_udp_transport = -1;
+static int proto_oss_udp_transport;
 
-static int hf_oss_udp_transport_version = -1;
-static int hf_oss_udp_transport_flags_type = -1;
-static int hf_oss_udp_transport_counter = -1;
-static int hf_oss_udp_transport_sender = -1;
-static int hf_oss_udp_transport_datapoint = -1;
-static int hf_oss_udp_transport_length= -1;
+static int hf_oss_udp_transport_version;
+static int hf_oss_udp_transport_flags_type;
+static int hf_oss_udp_transport_counter;
+static int hf_oss_udp_transport_sender;
+static int hf_oss_udp_transport_datapoint;
+static int hf_oss_udp_transport_length;
 
-static gint ett_oss_udp_transport = -1;
+static gint ett_oss_udp_transport;
 
 static const true_false_string tfs_udp_transport_cyclic_acyclic = { "Cyclic", "ACyclic" };
 static guint global_network_oss_udp_port = OPENSAFETY_UDP_PORT;
diff --git a/epan/dissectors/packet-openthread.c b/epan/dissectors/packet-openthread.c
index 2d73573d9d..246f56bbfb 100644
--- a/epan/dissectors/packet-openthread.c
+++ b/epan/dissectors/packet-openthread.c
@@ -18,15 +18,15 @@
 void proto_register_openthread(void);
 void proto_reg_handoff_openthread(void);
 
-static int proto_openthread = -1;
+static int proto_openthread;
 
 static dissector_handle_t openthread_handle;
 static dissector_handle_t wpan_handle;
 
-static int hf_openthread_channel = -1;
-/* static int hf_openthread_psdu = -1; */
+static int hf_openthread_channel;
+/* static int hf_openthread_psdu; */
 
-static gint ett_openthread = -1;
+static gint ett_openthread;
 
 static int
 dissect_openthread(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
diff --git a/epan/dissectors/packet-openvpn.c b/epan/dissectors/packet-openvpn.c
index 17e59e5067..546f48b106 100644
--- a/epan/dissectors/packet-openvpn.c
+++ b/epan/dissectors/packet-openvpn.c
@@ -50,29 +50,29 @@ void proto_reg_handoff_openvpn(void);
 #define P_CONTROL_HARD_RESET_CLIENT_V3  10
 #define P_CONTROL_WKC_V1                11
 
-static gint ett_openvpn = -1;
-static gint ett_openvpn_data = -1;
-static gint ett_openvpn_packetarray = -1;
-static gint ett_openvpn_type = -1;
-static gint ett_openvpn_wkc = -1;
-static gint hf_openvpn_data = -1;
-static gint hf_openvpn_wkc_data = -1;
-static gint hf_openvpn_wkc_length = -1;
-static gint hf_openvpn_fragment_bytes = -1;
-static gint hf_openvpn_hmac = -1;
-static gint hf_openvpn_keyid = -1;
-static gint hf_openvpn_mpid = -1;
-static gint hf_openvpn_mpid_arrayelement = -1;
-static gint hf_openvpn_mpid_arraylength = -1;
-static gint hf_openvpn_net_time = -1;
-static gint hf_openvpn_opcode = -1;
-static gint hf_openvpn_pdu_type = -1;
-static gint hf_openvpn_pid = -1;
-static gint hf_openvpn_plen = -1;
-static gint hf_openvpn_rsessionid = -1;
-static gint hf_openvpn_sessionid = -1;
-static gint hf_openvpn_peerid = -1;
-static gint proto_openvpn = -1;
+static gint ett_openvpn;
+static gint ett_openvpn_data;
+static gint ett_openvpn_packetarray;
+static gint ett_openvpn_type;
+static gint ett_openvpn_wkc;
+static gint hf_openvpn_data;
+static gint hf_openvpn_wkc_data;
+static gint hf_openvpn_wkc_length;
+static gint hf_openvpn_fragment_bytes;
+static gint hf_openvpn_hmac;
+static gint hf_openvpn_keyid;
+static gint hf_openvpn_mpid;
+static gint hf_openvpn_mpid_arrayelement;
+static gint hf_openvpn_mpid_arraylength;
+static gint hf_openvpn_net_time;
+static gint hf_openvpn_opcode;
+static gint hf_openvpn_pdu_type;
+static gint hf_openvpn_pid;
+static gint hf_openvpn_plen;
+static gint hf_openvpn_rsessionid;
+static gint hf_openvpn_sessionid;
+static gint hf_openvpn_peerid;
+static gint proto_openvpn;
 
 static dissector_handle_t openvpn_udp_handle;
 static dissector_handle_t openvpn_tcp_handle;
@@ -105,18 +105,18 @@ static const value_string openvpn_message_types[] =
 /* everything used during the reassembly process */
 static reassembly_table msg_reassembly_table;
 
-static gint ett_openvpn_fragment = -1;
-static gint ett_openvpn_fragments = -1;
-static gint hf_openvpn_fragment = -1;
-static gint hf_openvpn_fragment_count = -1;
-static gint hf_openvpn_fragment_error = -1;
-static gint hf_openvpn_fragment_multiple_tails = -1;
-static gint hf_openvpn_fragment_overlap = -1;
-static gint hf_openvpn_fragment_overlap_conflicts = -1;
-static gint hf_openvpn_fragment_too_long_fragment = -1;
-static gint hf_openvpn_fragments = -1;
-static gint hf_openvpn_reassembled_in = -1;
-static gint hf_openvpn_reassembled_length = -1;
+static gint ett_openvpn_fragment;
+static gint ett_openvpn_fragments;
+static gint hf_openvpn_fragment;
+static gint hf_openvpn_fragment_count;
+static gint hf_openvpn_fragment_error;
+static gint hf_openvpn_fragment_multiple_tails;
+static gint hf_openvpn_fragment_overlap;
+static gint hf_openvpn_fragment_overlap_conflicts;
+static gint hf_openvpn_fragment_too_long_fragment;
+static gint hf_openvpn_fragments;
+static gint hf_openvpn_reassembled_in;
+static gint hf_openvpn_reassembled_length;
 
 static const fragment_items openvpn_frag_items = {
   /* Fragment subtrees */
diff --git a/epan/dissectors/packet-openwire.c b/epan/dissectors/packet-openwire.c
index a057d7d96c..16826f5176 100644
--- a/epan/dissectors/packet-openwire.c
+++ b/epan/dissectors/packet-openwire.c
@@ -36,234 +36,234 @@
 void proto_register_openwire(void);
 void proto_reg_handoff_openwire(void);
 
-static int proto_openwire = -1;
-static int hf_openwire_none = -1;
-static int hf_openwire_length = -1;
-static int hf_openwire_command = -1;
-
-static int hf_openwire_command_id = -1;
-static int hf_openwire_command_response_required = -1;
-
-static int hf_openwire_response_correlationid = -1;
-
-static int hf_openwire_dataresponse_data = -1;
-
-static int hf_openwire_exceptionresponse_exception = -1;
-
-static int hf_openwire_connectionerror_exception = -1;
-static int hf_openwire_connectionerror_connectionid = -1;
-
-static int hf_openwire_controlcommand_command = -1;
-
-static int hf_openwire_wireformatinfo_magic = -1;
-static int hf_openwire_wireformatinfo_version = -1;
-static int hf_openwire_wireformatinfo_data = -1;
-static int hf_openwire_wireformatinfo_length = -1;
-
-static int hf_openwire_sessioninfo_sessionid = -1;
-
-static int hf_openwire_connectioninfo_connectionid = -1;
-static int hf_openwire_connectioninfo_clientid = -1;
-static int hf_openwire_connectioninfo_password = -1;
-static int hf_openwire_connectioninfo_username = -1;
-static int hf_openwire_connectioninfo_brokerpath = -1;
-static int hf_openwire_connectioninfo_brokermasterconnector = -1;
-static int hf_openwire_connectioninfo_manageable = -1;
-static int hf_openwire_connectioninfo_clientmaster = -1;
-static int hf_openwire_connectioninfo_faulttolerant = -1;
-static int hf_openwire_connectioninfo_failoverreconnect = -1;
-
-static int hf_openwire_destinationinfo_connectionid = -1;
-static int hf_openwire_destinationinfo_destination = -1;
-static int hf_openwire_destinationinfo_operationtype = -1;
-static int hf_openwire_destinationinfo_timeout = -1;
-static int hf_openwire_destinationinfo_brokerpath = -1;
-
-static int hf_openwire_brokerinfo_brokerid = -1;
-static int hf_openwire_brokerinfo_brokerurl = -1;
-static int hf_openwire_brokerinfo_peerbrokerinfos = -1;
-static int hf_openwire_brokerinfo_brokername = -1;
-static int hf_openwire_brokerinfo_slavebroker = -1;
-static int hf_openwire_brokerinfo_masterbroker = -1;
-static int hf_openwire_brokerinfo_faulttolerantconfiguration = -1;
-static int hf_openwire_brokerinfo_duplexconnection = -1;
-static int hf_openwire_brokerinfo_networkconnection = -1;
-static int hf_openwire_brokerinfo_connectionid = -1;
-static int hf_openwire_brokerinfo_brokeruploadurl = -1;
-static int hf_openwire_brokerinfo_networkproperties = -1;
-
-static int hf_openwire_connectioncontrol_close = -1;
-static int hf_openwire_connectioncontrol_exit = -1;
-static int hf_openwire_connectioncontrol_faulttolerant = -1;
-static int hf_openwire_connectioncontrol_resume = -1;
-static int hf_openwire_connectioncontrol_suspend = -1;
-static int hf_openwire_connectioncontrol_connectedbrokers = -1;
-static int hf_openwire_connectioncontrol_reconnectto = -1;
-static int hf_openwire_connectioncontrol_rebalanceconnection = -1;
-
-static int hf_openwire_consumercontrol_destination = -1;
-static int hf_openwire_consumercontrol_close = -1;
-static int hf_openwire_consumercontrol_consumerid = -1;
-static int hf_openwire_consumercontrol_prefetch = -1;
-static int hf_openwire_consumercontrol_flush = -1;
-static int hf_openwire_consumercontrol_start = -1;
-static int hf_openwire_consumercontrol_stop = -1;
-
-static int hf_openwire_consumerinfo_consumerid = -1;
-static int hf_openwire_consumerinfo_browser = -1;
-static int hf_openwire_consumerinfo_destination = -1;
-static int hf_openwire_consumerinfo_prefetchsize = -1;
-static int hf_openwire_consumerinfo_maximumpendingmessagelimit = -1;
-static int hf_openwire_consumerinfo_dispatchasync = -1;
-static int hf_openwire_consumerinfo_selector = -1;
-static int hf_openwire_consumerinfo_subscriptionname = -1;
-static int hf_openwire_consumerinfo_nolocal = -1;
-static int hf_openwire_consumerinfo_exclusive = -1;
-static int hf_openwire_consumerinfo_retroactive = -1;
-static int hf_openwire_consumerinfo_priority = -1;
-static int hf_openwire_consumerinfo_brokerpath = -1;
-static int hf_openwire_consumerinfo_additionalpredicate = -1;
-static int hf_openwire_consumerinfo_networksubscription = -1;
-static int hf_openwire_consumerinfo_optimizedacknowledge = -1;
-static int hf_openwire_consumerinfo_norangeacks = -1;
-static int hf_openwire_consumerinfo_networkconsumerpath = -1;
-
-static int hf_openwire_producerinfo_producerid = -1;
-static int hf_openwire_producerinfo_destination = -1;
-static int hf_openwire_producerinfo_brokerpath = -1;
-static int hf_openwire_producerinfo_dispatchasync = -1;
-static int hf_openwire_producerinfo_windowsize = -1;
-
-static int hf_openwire_removeinfo_objectid = -1;
-static int hf_openwire_removeinfo_lastdeliveredsequenceid = -1;
-
-static int hf_openwire_removesubscriptioninfo_connectionid = -1;
-static int hf_openwire_removesubscriptioninfo_subscriptionname = -1;
-static int hf_openwire_removesubscriptioninfo_clientid = -1;
-
-static int hf_openwire_transactioninfo_connectionid = -1;
-static int hf_openwire_transactioninfo_transactionid = -1;
-static int hf_openwire_transactioninfo_type = -1;
-
-static int hf_openwire_producerack_producerid = -1;
-static int hf_openwire_producerack_size = -1;
-
-
-static int hf_openwire_messagedispatch_consumerid = -1;
-static int hf_openwire_messagedispatch_destination = -1;
-static int hf_openwire_messagedispatch_message = -1;
-static int hf_openwire_messagedispatch_redeliverycounter = -1;
-
-static int hf_openwire_messageack_destination = -1;
-static int hf_openwire_messageack_transactionid = -1;
-static int hf_openwire_messageack_consumerid = -1;
-static int hf_openwire_messageack_acktype = -1;
-static int hf_openwire_messageack_firstmessageid = -1;
-static int hf_openwire_messageack_lastmessageid = -1;
-static int hf_openwire_messageack_messagecount = -1;
-
-static int hf_openwire_messagepull_consumerid = -1;
-static int hf_openwire_messagepull_destinationid = -1;
-static int hf_openwire_messagepull_timeout = -1;
-static int hf_openwire_messagepull_correlationid = -1;
-static int hf_openwire_messagepull_messageid = -1;
-
-static int hf_openwire_message_producerid = -1;
-static int hf_openwire_message_destination = -1;
-static int hf_openwire_message_transactionid = -1;
-static int hf_openwire_message_originaldestination = -1;
-static int hf_openwire_message_messageid = -1;
-static int hf_openwire_message_originaldestinationid = -1;
-static int hf_openwire_message_groupid = -1;
-static int hf_openwire_message_groupsequence = -1;
-static int hf_openwire_message_correlationid = -1;
-static int hf_openwire_message_persistent = -1;
-static int hf_openwire_message_expiration = -1;
-static int hf_openwire_message_priority = -1;
-static int hf_openwire_message_replyto = -1;
-static int hf_openwire_message_timestamp = -1;
-static int hf_openwire_message_type = -1;
-static int hf_openwire_message_body = -1;
-static int hf_openwire_message_properties = -1;
-static int hf_openwire_message_datastructure = -1;
-static int hf_openwire_message_targetconsumerid = -1;
-static int hf_openwire_message_compressed = -1;
-static int hf_openwire_message_redeliverycount = -1;
-static int hf_openwire_message_brokerpath = -1;
-static int hf_openwire_message_arrival = -1;
-static int hf_openwire_message_userid = -1;
-static int hf_openwire_message_receivedbydfbridge = -1;
-static int hf_openwire_message_droppable = -1;
-static int hf_openwire_message_cluster = -1;
-static int hf_openwire_message_brokerintime = -1;
-static int hf_openwire_message_brokerouttime = -1;
-
-static int hf_openwire_producerid_connectionid = -1;
-static int hf_openwire_producerid_value = -1;
-static int hf_openwire_producerid_sessionid = -1;
-
-static int hf_openwire_consumerid_connectionid = -1;
-static int hf_openwire_consumerid_value = -1;
-static int hf_openwire_consumerid_sessionid = -1;
-
-static int hf_openwire_destination_name = -1;
-
-static int hf_openwire_messageid_producerid = -1;
-static int hf_openwire_messageid_producersequenceid = -1;
-static int hf_openwire_messageid_brokersequenceid = -1;
-
-static int hf_openwire_connectionid_value = -1;
-
-static int hf_openwire_sessionid_connectionid = -1;
-static int hf_openwire_sessionid_value = -1;
-
-static int hf_openwire_brokerid_value = -1;
-
-static int hf_openwire_localtransactionid_value = -1;
-static int hf_openwire_localtransactionid_connectionid = -1;
-
-static int hf_openwire_xatransactionid_formatid = -1;
-static int hf_openwire_xatransactionid_globaltransactionid = -1;
-static int hf_openwire_xatransactionid_branchqualifier = -1;
-
-static int hf_openwire_map_length = -1;
-static int hf_openwire_map_key = -1;
-static int hf_openwire_map_entry = -1;
-
-static int hf_openwire_throwable_class = -1;
-static int hf_openwire_throwable_message = -1;
-static int hf_openwire_throwable_element = -1;
-static int hf_openwire_throwable_classname = -1;
-static int hf_openwire_throwable_methodname = -1;
-static int hf_openwire_throwable_filename = -1;
-static int hf_openwire_throwable_linenumber = -1;
-
-static int hf_openwire_type_integer = -1;
-static int hf_openwire_type_short = -1;
-static int hf_openwire_type_string = -1;
-static int hf_openwire_type_bytes = -1;
-static int hf_openwire_type_boolean = -1;
-static int hf_openwire_type_byte = -1;
-static int hf_openwire_type_char = -1;
-static int hf_openwire_type_notnull = -1;
-static int hf_openwire_type_long = -1;
-static int hf_openwire_type_float = -1;
-static int hf_openwire_type_double = -1;
-static int hf_openwire_type_object = -1;
-static int hf_openwire_type = -1;
-
-static int hf_openwire_cached_inlined = -1;
-static int hf_openwire_cached_id = -1;
-static int hf_openwire_cached_enabled = -1;
-
-static gint ett_openwire = -1;
-static gint ett_openwire_type = -1;
-
-static expert_field ei_openwire_tight_encoding_not_supported = EI_INIT;
-static expert_field ei_openwire_encoding_not_supported = EI_INIT;
-static expert_field ei_openwire_type_not_supported = EI_INIT;
-static expert_field ei_openwire_command_not_supported = EI_INIT;
-static expert_field ei_openwire_body_type_not_supported = EI_INIT;
+static int proto_openwire;
+static int hf_openwire_none;
+static int hf_openwire_length;
+static int hf_openwire_command;
+
+static int hf_openwire_command_id;
+static int hf_openwire_command_response_required;
+
+static int hf_openwire_response_correlationid;
+
+static int hf_openwire_dataresponse_data;
+
+static int hf_openwire_exceptionresponse_exception;
+
+static int hf_openwire_connectionerror_exception;
+static int hf_openwire_connectionerror_connectionid;
+
+static int hf_openwire_controlcommand_command;
+
+static int hf_openwire_wireformatinfo_magic;
+static int hf_openwire_wireformatinfo_version;
+static int hf_openwire_wireformatinfo_data;
+static int hf_openwire_wireformatinfo_length;
+
+static int hf_openwire_sessioninfo_sessionid;
+
+static int hf_openwire_connectioninfo_connectionid;
+static int hf_openwire_connectioninfo_clientid;
+static int hf_openwire_connectioninfo_password;
+static int hf_openwire_connectioninfo_username;
+static int hf_openwire_connectioninfo_brokerpath;
+static int hf_openwire_connectioninfo_brokermasterconnector;
+static int hf_openwire_connectioninfo_manageable;
+static int hf_openwire_connectioninfo_clientmaster;
+static int hf_openwire_connectioninfo_faulttolerant;
+static int hf_openwire_connectioninfo_failoverreconnect;
+
+static int hf_openwire_destinationinfo_connectionid;
+static int hf_openwire_destinationinfo_destination;
+static int hf_openwire_destinationinfo_operationtype;
+static int hf_openwire_destinationinfo_timeout;
+static int hf_openwire_destinationinfo_brokerpath;
+
+static int hf_openwire_brokerinfo_brokerid;
+static int hf_openwire_brokerinfo_brokerurl;
+static int hf_openwire_brokerinfo_peerbrokerinfos;
+static int hf_openwire_brokerinfo_brokername;
+static int hf_openwire_brokerinfo_slavebroker;
+static int hf_openwire_brokerinfo_masterbroker;
+static int hf_openwire_brokerinfo_faulttolerantconfiguration;
+static int hf_openwire_brokerinfo_duplexconnection;
+static int hf_openwire_brokerinfo_networkconnection;
+static int hf_openwire_brokerinfo_connectionid;
+static int hf_openwire_brokerinfo_brokeruploadurl;
+static int hf_openwire_brokerinfo_networkproperties;
+
+static int hf_openwire_connectioncontrol_close;
+static int hf_openwire_connectioncontrol_exit;
+static int hf_openwire_connectioncontrol_faulttolerant;
+static int hf_openwire_connectioncontrol_resume;
+static int hf_openwire_connectioncontrol_suspend;
+static int hf_openwire_connectioncontrol_connectedbrokers;
+static int hf_openwire_connectioncontrol_reconnectto;
+static int hf_openwire_connectioncontrol_rebalanceconnection;
+
+static int hf_openwire_consumercontrol_destination;
+static int hf_openwire_consumercontrol_close;
+static int hf_openwire_consumercontrol_consumerid;
+static int hf_openwire_consumercontrol_prefetch;
+static int hf_openwire_consumercontrol_flush;
+static int hf_openwire_consumercontrol_start;
+static int hf_openwire_consumercontrol_stop;
+
+static int hf_openwire_consumerinfo_consumerid;
+static int hf_openwire_consumerinfo_browser;
+static int hf_openwire_consumerinfo_destination;
+static int hf_openwire_consumerinfo_prefetchsize;
+static int hf_openwire_consumerinfo_maximumpendingmessagelimit;
+static int hf_openwire_consumerinfo_dispatchasync;
+static int hf_openwire_consumerinfo_selector;
+static int hf_openwire_consumerinfo_subscriptionname;
+static int hf_openwire_consumerinfo_nolocal;
+static int hf_openwire_consumerinfo_exclusive;
+static int hf_openwire_consumerinfo_retroactive;
+static int hf_openwire_consumerinfo_priority;
+static int hf_openwire_consumerinfo_brokerpath;
+static int hf_openwire_consumerinfo_additionalpredicate;
+static int hf_openwire_consumerinfo_networksubscription;
+static int hf_openwire_consumerinfo_optimizedacknowledge;
+static int hf_openwire_consumerinfo_norangeacks;
+static int hf_openwire_consumerinfo_networkconsumerpath;
+
+static int hf_openwire_producerinfo_producerid;
+static int hf_openwire_producerinfo_destination;
+static int hf_openwire_producerinfo_brokerpath;
+static int hf_openwire_producerinfo_dispatchasync;
+static int hf_openwire_producerinfo_windowsize;
+
+static int hf_openwire_removeinfo_objectid;
+static int hf_openwire_removeinfo_lastdeliveredsequenceid;
+
+static int hf_openwire_removesubscriptioninfo_connectionid;
+static int hf_openwire_removesubscriptioninfo_subscriptionname;
+static int hf_openwire_removesubscriptioninfo_clientid;
+
+static int hf_openwire_transactioninfo_connectionid;
+static int hf_openwire_transactioninfo_transactionid;
+static int hf_openwire_transactioninfo_type;
+
+static int hf_openwire_producerack_producerid;
+static int hf_openwire_producerack_size;
+
+
+static int hf_openwire_messagedispatch_consumerid;
+static int hf_openwire_messagedispatch_destination;
+static int hf_openwire_messagedispatch_message;
+static int hf_openwire_messagedispatch_redeliverycounter;
+
+static int hf_openwire_messageack_destination;
+static int hf_openwire_messageack_transactionid;
+static int hf_openwire_messageack_consumerid;
+static int hf_openwire_messageack_acktype;
+static int hf_openwire_messageack_firstmessageid;
+static int hf_openwire_messageack_lastmessageid;
+static int hf_openwire_messageack_messagecount;
+
+static int hf_openwire_messagepull_consumerid;
+static int hf_openwire_messagepull_destinationid;
+static int hf_openwire_messagepull_timeout;
+static int hf_openwire_messagepull_correlationid;
+static int hf_openwire_messagepull_messageid;
+
+static int hf_openwire_message_producerid;
+static int hf_openwire_message_destination;
+static int hf_openwire_message_transactionid;
+static int hf_openwire_message_originaldestination;
+static int hf_openwire_message_messageid;
+static int hf_openwire_message_originaldestinationid;
+static int hf_openwire_message_groupid;
+static int hf_openwire_message_groupsequence;
+static int hf_openwire_message_correlationid;
+static int hf_openwire_message_persistent;
+static int hf_openwire_message_expiration;
+static int hf_openwire_message_priority;
+static int hf_openwire_message_replyto;
+static int hf_openwire_message_timestamp;
+static int hf_openwire_message_type;
+static int hf_openwire_message_body;
+static int hf_openwire_message_properties;
+static int hf_openwire_message_datastructure;
+static int hf_openwire_message_targetconsumerid;
+static int hf_openwire_message_compressed;
+static int hf_openwire_message_redeliverycount;
+static int hf_openwire_message_brokerpath;
+static int hf_openwire_message_arrival;
+static int hf_openwire_message_userid;
+static int hf_openwire_message_receivedbydfbridge;
+static int hf_openwire_message_droppable;
+static int hf_openwire_message_cluster;
+static int hf_openwire_message_brokerintime;
+static int hf_openwire_message_brokerouttime;
+
+static int hf_openwire_producerid_connectionid;
+static int hf_openwire_producerid_value;
+static int hf_openwire_producerid_sessionid;
+
+static int hf_openwire_consumerid_connectionid;
+static int hf_openwire_consumerid_value;
+static int hf_openwire_consumerid_sessionid;
+
+static int hf_openwire_destination_name;
+
+static int hf_openwire_messageid_producerid;
+static int hf_openwire_messageid_producersequenceid;
+static int hf_openwire_messageid_brokersequenceid;
+
+static int hf_openwire_connectionid_value;
+
+static int hf_openwire_sessionid_connectionid;
+static int hf_openwire_sessionid_value;
+
+static int hf_openwire_brokerid_value;
+
+static int hf_openwire_localtransactionid_value;
+static int hf_openwire_localtransactionid_connectionid;
+
+static int hf_openwire_xatransactionid_formatid;
+static int hf_openwire_xatransactionid_globaltransactionid;
+static int hf_openwire_xatransactionid_branchqualifier;
+
+static int hf_openwire_map_length;
+static int hf_openwire_map_key;
+static int hf_openwire_map_entry;
+
+static int hf_openwire_throwable_class;
+static int hf_openwire_throwable_message;
+static int hf_openwire_throwable_element;
+static int hf_openwire_throwable_classname;
+static int hf_openwire_throwable_methodname;
+static int hf_openwire_throwable_filename;
+static int hf_openwire_throwable_linenumber;
+
+static int hf_openwire_type_integer;
+static int hf_openwire_type_short;
+static int hf_openwire_type_string;
+static int hf_openwire_type_bytes;
+static int hf_openwire_type_boolean;
+static int hf_openwire_type_byte;
+static int hf_openwire_type_char;
+static int hf_openwire_type_notnull;
+static int hf_openwire_type_long;
+static int hf_openwire_type_float;
+static int hf_openwire_type_double;
+static int hf_openwire_type_object;
+static int hf_openwire_type;
+
+static int hf_openwire_cached_inlined;
+static int hf_openwire_cached_id;
+static int hf_openwire_cached_enabled;
+
+static gint ett_openwire;
+static gint ett_openwire_type;
+
+static expert_field ei_openwire_tight_encoding_not_supported;
+static expert_field ei_openwire_encoding_not_supported;
+static expert_field ei_openwire_type_not_supported;
+static expert_field ei_openwire_command_not_supported;
+static expert_field ei_openwire_body_type_not_supported;
 
 static dissector_handle_t openwire_tcp_handle;
 
diff --git a/epan/dissectors/packet-opsi.c b/epan/dissectors/packet-opsi.c
index f270143701..df8d59ee96 100644
--- a/epan/dissectors/packet-opsi.c
+++ b/epan/dissectors/packet-opsi.c
@@ -124,91 +124,91 @@ static void decode_time_attribute(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 /******* *******/
 
 /* Initialize the protocol and registered fields */
-static int proto_opsi 			= -1;
-static int hf_opsi_major_version 	= -1;
-static int hf_opsi_minor_version 	= -1;
-static int hf_opsi_opcode	 	= -1;
-static int hf_opsi_hook_id	 	= -1;
-static int hf_opsi_length	 	= -1;
-static int hf_opsi_session_id	 	= -1;
-static int hf_user_name_att		= -1;
-static int hf_password_att		= -1;
-static int hf_chap_password_att		= -1;
-static int hf_nas_ip_add_att		= -1;
-static int hf_nas_port_att		= -1;
-static int hf_service_type_att		= -1;
-static int hf_framed_protocol_att	= -1;
-static int hf_framed_address_att	= -1;
-static int hf_framed_netmask_att	= -1;
-static int hf_framed_routing_att	= -1;
-static int hf_framed_filter_att		= -1;
-static int hf_framed_mtu_att		= -1;
-static int hf_framed_compression_att	= -1;
-static int hf_called_station_att	= -1;
-static int hf_calling_station_att	= -1;
-static int hf_nas_identifier_att	= -1;
-static int hf_accounting_att		= -1;
-static int hf_acct_session_id_att	= -1;
-static int hf_chap_challenge_att	= -1;
-static int hf_nas_port_type_att		= -1;
-static int hf_designation_num_att	= -1;
-static int hf_nas_port_id_att		= -1;
-static int hf_smc_aaa_id_att		= -1;
-static int hf_smc_vpn_id_att		= -1;
-static int hf_smc_vpn_name_att		= -1;
-static int hf_smc_ran_id_att		= -1;
-static int hf_smc_ran_ip_att		= -1;
-static int hf_smc_ran_name_att		= -1;
-static int hf_smc_pop_id_att		= -1;
-static int hf_smc_pop_name_att		= -1;
-static int hf_smc_id_att		= -1;
-static int hf_smc_receive_time_att	= -1;
-static int hf_smc_stat_time_att		= -1;
-static int hf_opsi_flags_att		= -1;
-static int hf_opsi_application_name_att	= -1;
-static int hf_opsi_attribute_length = -1;
+static int proto_opsi;
+static int hf_opsi_major_version;
+static int hf_opsi_minor_version;
+static int hf_opsi_opcode;
+static int hf_opsi_hook_id;
+static int hf_opsi_length;
+static int hf_opsi_session_id;
+static int hf_user_name_att;
+static int hf_password_att;
+static int hf_chap_password_att;
+static int hf_nas_ip_add_att;
+static int hf_nas_port_att;
+static int hf_service_type_att;
+static int hf_framed_protocol_att;
+static int hf_framed_address_att;
+static int hf_framed_netmask_att;
+static int hf_framed_routing_att;
+static int hf_framed_filter_att;
+static int hf_framed_mtu_att;
+static int hf_framed_compression_att;
+static int hf_called_station_att;
+static int hf_calling_station_att;
+static int hf_nas_identifier_att;
+static int hf_accounting_att;
+static int hf_acct_session_id_att;
+static int hf_chap_challenge_att;
+static int hf_nas_port_type_att;
+static int hf_designation_num_att;
+static int hf_nas_port_id_att;
+static int hf_smc_aaa_id_att;
+static int hf_smc_vpn_id_att;
+static int hf_smc_vpn_name_att;
+static int hf_smc_ran_id_att;
+static int hf_smc_ran_ip_att;
+static int hf_smc_ran_name_att;
+static int hf_smc_pop_id_att;
+static int hf_smc_pop_name_att;
+static int hf_smc_id_att;
+static int hf_smc_receive_time_att;
+static int hf_smc_stat_time_att;
+static int hf_opsi_flags_att;
+static int hf_opsi_application_name_att;
+static int hf_opsi_attribute_length;
 
 /* Initialize the subtree pointers */
-static gint ett_opsi 			= -1;
-static gint ett_opsi_user_name		= -1;
-static gint ett_opsi_user_password	= -1;
-static gint ett_opsi_chap_password	= -1;
-static gint ett_opsi_nas_ip_address	= -1;
-static gint ett_opsi_nas_port		= -1;
-static gint ett_opsi_service_type	= -1;
-static gint ett_opsi_framed_protocol	= -1;
-static gint ett_opsi_framed_address	= -1;
-static gint ett_opsi_framed_netmask	= -1;
-static gint ett_opsi_framed_routing	= -1;
-static gint ett_opsi_framed_filter	= -1;
-static gint ett_opsi_framed_mtu		= -1;
-static gint ett_opsi_framed_compression	= -1;
-static gint ett_opsi_called_station_id	= -1;
-static gint ett_opsi_calling_station_id	= -1;
-static gint ett_opsi_nas_identifier	= -1;
-static gint ett_opsi_accounting		= -1;
-static gint ett_opsi_acct_session_id	= -1;
-static gint ett_opsi_chap_challenge	= -1;
-static gint ett_opsi_nas_port_type	= -1;
-static gint ett_opsi_designation_number	= -1;
-static gint ett_opsi_nas_port_id	= -1;
-static gint ett_opsi_smc_aaa_id		= -1;
-static gint ett_opsi_smc_vpn_id		= -1;
-static gint ett_opsi_smc_vpn_name	= -1;
-static gint ett_opsi_smc_ran_id		= -1;
-static gint ett_opsi_smc_ran_ip		= -1;
-static gint ett_opsi_smc_ran_name	= -1;
-static gint ett_opsi_smc_pop_id		= -1;
-static gint ett_opsi_smc_pop_name	= -1;
-static gint ett_opsi_smc_id		= -1;
-static gint ett_opsi_smc_receive_time	= -1;
-static gint ett_opsi_smc_stat_time	= -1;
-static gint ett_opsi_flags		= -1;
-static gint ett_opsi_application_name	= -1;
-
-static expert_field ei_opsi_unknown_attribute = EI_INIT;
-static expert_field ei_opsi_short_attribute = EI_INIT;
-static expert_field ei_opsi_short_frame = EI_INIT;
+static gint ett_opsi;
+static gint ett_opsi_user_name;
+static gint ett_opsi_user_password;
+static gint ett_opsi_chap_password;
+static gint ett_opsi_nas_ip_address;
+static gint ett_opsi_nas_port;
+static gint ett_opsi_service_type;
+static gint ett_opsi_framed_protocol;
+static gint ett_opsi_framed_address;
+static gint ett_opsi_framed_netmask;
+static gint ett_opsi_framed_routing;
+static gint ett_opsi_framed_filter;
+static gint ett_opsi_framed_mtu;
+static gint ett_opsi_framed_compression;
+static gint ett_opsi_called_station_id;
+static gint ett_opsi_calling_station_id;
+static gint ett_opsi_nas_identifier;
+static gint ett_opsi_accounting;
+static gint ett_opsi_acct_session_id;
+static gint ett_opsi_chap_challenge;
+static gint ett_opsi_nas_port_type;
+static gint ett_opsi_designation_number;
+static gint ett_opsi_nas_port_id;
+static gint ett_opsi_smc_aaa_id;
+static gint ett_opsi_smc_vpn_id;
+static gint ett_opsi_smc_vpn_name;
+static gint ett_opsi_smc_ran_id;
+static gint ett_opsi_smc_ran_ip;
+static gint ett_opsi_smc_ran_name;
+static gint ett_opsi_smc_pop_id;
+static gint ett_opsi_smc_pop_name;
+static gint ett_opsi_smc_id;
+static gint ett_opsi_smc_receive_time;
+static gint ett_opsi_smc_stat_time;
+static gint ett_opsi_flags;
+static gint ett_opsi_application_name;
+
+static expert_field ei_opsi_unknown_attribute;
+static expert_field ei_opsi_short_attribute;
+static expert_field ei_opsi_short_frame;
 
 /* Code mapping */
 static const value_string opsi_opcode[] = {
diff --git a/epan/dissectors/packet-optommp.c b/epan/dissectors/packet-optommp.c
index 67d210e2dc..e6d838a434 100644
--- a/epan/dissectors/packet-optommp.c
+++ b/epan/dissectors/packet-optommp.c
@@ -26,26 +26,26 @@
 #define OPTOMMP_READ_BLOCK_RESPONSE 7
 
 /* Initialize the protocol and registered fields */
-static gint proto_optommp = -1;
+static gint proto_optommp;
 static dissector_handle_t optommp_tcp_handle;
 static dissector_handle_t optommp_udp_handle;
-static gint hf_optommp_nodest_id = -1;
-static gint hf_optommp_dest_id = -1;
-static gint hf_optommp_boot_id = -1;
-static gint hf_optommp_tl = -1;
-static gint hf_optommp_tcode = -1;
-static gint hf_optommp_source_ID = -1;
-static gint hf_optommp_rcode = -1;
-static gint hf_optommp_quadlet_data = -1;
-static gint hf_optommp_data_length = -1;
-static gint hf_optommp_dest_offset  = -1;
-static gint hf_optommp_data_block_byte  = -1;
-static gint hf_optommp_data_block_quadlet  = -1;
+static gint hf_optommp_nodest_id;
+static gint hf_optommp_dest_id;
+static gint hf_optommp_boot_id;
+static gint hf_optommp_tl;
+static gint hf_optommp_tcode;
+static gint hf_optommp_source_ID;
+static gint hf_optommp_rcode;
+static gint hf_optommp_quadlet_data;
+static gint hf_optommp_data_length;
+static gint hf_optommp_dest_offset;
+static gint hf_optommp_data_block_byte;
+static gint hf_optommp_data_block_quadlet;
 /* Initialize the subtree pointers */
-static gint ett_optommp = -1;
-static gint ett_dest_id = -1;
-static gint ett_data_block_q = -1;
-static gint ett_data_block_b = -1;
+static gint ett_optommp;
+static gint ett_dest_id;
+static gint ett_data_block_q;
+static gint ett_data_block_b;
 
 static const value_string optommp_tcode_names[] = {
     { 0, "Write Quadlet Request" },
diff --git a/epan/dissectors/packet-opus.c b/epan/dissectors/packet-opus.c
index 2ee9779fc2..777bd8bb4b 100644
--- a/epan/dissectors/packet-opus.c
+++ b/epan/dissectors/packet-opus.c
@@ -28,29 +28,29 @@ void proto_register_opus(void);
 static dissector_handle_t opus_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_opus = -1;
-static int hf_opus_toc_config = -1;
-static int hf_opus_toc_s = -1;
-static int hf_opus_toc_c = -1;
-static int hf_opus_frame = -1;
-static int hf_opus_frame_size = -1;
-static int hf_opus_frame_count_v = -1;
-static int hf_opus_frame_count_p = -1;
-static int hf_opus_frame_count_m = -1;
-static int hf_opus_padding = -1;
-static int hf_opus_padding_size = -1;
+static int proto_opus;
+static int hf_opus_toc_config;
+static int hf_opus_toc_s;
+static int hf_opus_toc_c;
+static int hf_opus_frame;
+static int hf_opus_frame_size;
+static int hf_opus_frame_count_v;
+static int hf_opus_frame_count_p;
+static int hf_opus_frame_count_m;
+static int hf_opus_padding;
+static int hf_opus_padding_size;
 
 /* Initialize the subtree pointers */
-static gint ett_opus = -1;
-
-static expert_field ei_opus_err_r1 = EI_INIT;
-static expert_field ei_opus_err_r2 = EI_INIT;
-static expert_field ei_opus_err_r3 = EI_INIT;
-static expert_field ei_opus_err_r4 = EI_INIT;
-static expert_field ei_opus_err_r5 = EI_INIT;
-static expert_field ei_opus_err_r6 = EI_INIT;
-static expert_field ei_opus_err_r7 = EI_INIT;
-static expert_field ei_opus_padding_nonzero = EI_INIT;
+static gint ett_opus;
+
+static expert_field ei_opus_err_r1;
+static expert_field ei_opus_err_r2;
+static expert_field ei_opus_err_r3;
+static expert_field ei_opus_err_r4;
+static expert_field ei_opus_err_r5;
+static expert_field ei_opus_err_r6;
+static expert_field ei_opus_err_r7;
+static expert_field ei_opus_padding_nonzero;
 
 /* From RFC6716 chapter 3.1
  * The top five bits of the TOC byte, labeled "config", encode one of 32
diff --git a/epan/dissectors/packet-oran.c b/epan/dissectors/packet-oran.c
index e495a55ea2..aa1281ca1f 100644
--- a/epan/dissectors/packet-oran.c
+++ b/epan/dissectors/packet-oran.c
@@ -42,226 +42,226 @@ void proto_reg_handoff_oran(void);
 void proto_register_oran(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_oran = -1;
-
-static int hf_oran_du_port_id = -1;
-static int hf_oran_bandsector_id = -1;
-static int hf_oran_cc_id = -1;
-static int hf_oran_ru_port_id = -1;
-static int hf_oran_sequence_id = -1;
-static int hf_oran_e_bit = -1;
-static int hf_oran_subsequence_id = -1;
-
-static int hf_oran_data_direction = -1;
-static int hf_oran_payload_version = -1;
-static int hf_oran_filter_index = -1;
-static int hf_oran_frame_id = -1;
-static int hf_oran_subframe_id = -1;
-static int hf_oran_slot_id = -1;
-static int hf_oran_slot_within_frame = -1;
-static int hf_oran_start_symbol_id = -1;
-static int hf_oran_numberOfSections = -1;
-static int hf_oran_sectionType = -1;
-
-static int hf_oran_udCompHdr = -1;
-static int hf_oran_udCompHdrIqWidth = -1;
-static int hf_oran_udCompHdrIqWidth_pref = -1;
-static int hf_oran_udCompHdrMeth = -1;
-static int hf_oran_udCompHdrMeth_pref = -1;
-static int hf_oran_numberOfUEs = -1;
-static int hf_oran_timeOffset = -1;
-static int hf_oran_frameStructure_fft = -1;
-static int hf_oran_frameStructure_subcarrier_spacing = -1;
-static int hf_oran_cpLength = -1;
-static int hf_oran_section_id = -1;
-static int hf_oran_rb = -1;
-static int hf_oran_symInc = -1;
-static int hf_oran_startPrbc = -1;
-static int hf_oran_reMask = -1;
-static int hf_oran_numPrbc = -1;
-static int hf_oran_numSymbol = -1;
-static int hf_oran_ef = -1;
-static int hf_oran_beamId = -1;
-
-static int hf_oran_extension = -1;
-static int hf_oran_exttype = -1;
-static int hf_oran_extlen = -1;
-
-static int hf_oran_bfw_bundle = -1;
-static int hf_oran_bfw_bundle_id = -1;
-static int hf_oran_bfw = -1;
-static int hf_oran_bfw_i = -1;
-static int hf_oran_bfw_q = -1;
-
-static int hf_oran_ueId = -1;
-static int hf_oran_freqOffset = -1;
-static int hf_oran_regularizationFactor = -1;
-static int hf_oran_laaMsgType = -1;
-static int hf_oran_laaMsgLen = -1;
-static int hf_oran_lbtHandle = -1;
-static int hf_oran_lbtDeferFactor = -1;
-static int hf_oran_lbtBackoffCounter = -1;
-static int hf_oran_lbtOffset = -1;
-static int hf_oran_MCOT = -1;
-static int hf_oran_lbtMode = -1;
-static int hf_oran_sfnSfEnd = -1;
-static int hf_oran_lbtPdschRes = -1;
-static int hf_oran_sfStatus = -1;
-static int hf_oran_initialPartialSF = -1;
-static int hf_oran_lbtDrsRes = -1;
-static int hf_oran_lbtBufErr = -1;
-static int hf_oran_lbtTrafficClass = -1;
-static int hf_oran_lbtCWConfig_H = -1;
-static int hf_oran_lbtCWConfig_T = -1;
-static int hf_oran_lbtCWR_Rst = -1;
-
-static int hf_oran_reserved = -1;
-static int hf_oran_reserved_1bit = -1;
-static int hf_oran_reserved_2bits = -1;
-static int hf_oran_reserved_4bits = -1;
-static int hf_oran_reserved_6bits = -1;
-
-static int hf_oran_ext11_reserved = -1;
-
-static int hf_oran_bfwCompHdr = -1;
-static int hf_oran_bfwCompHdr_iqWidth = -1;
-static int hf_oran_bfwCompHdr_compMeth = -1;
-static int hf_oran_symbolId = -1;
-static int hf_oran_startPrbu = -1;
-static int hf_oran_numPrbu = -1;
-/* static int hf_oran_udCompParam = -1; */
-
-static int hf_oran_bfwCompParam = -1;
-
-static int hf_oran_iSample = -1;
-static int hf_oran_qSample = -1;
-
-static int hf_oran_blockScaler = -1;
-static int hf_oran_compBitWidth = -1;
-static int hf_oran_compShift = -1;
-
-static int hf_oran_repetition = -1;
-static int hf_oran_rbgSize = -1;
-static int hf_oran_rbgMask = -1;
-static int hf_oran_noncontig_priority = -1;
-static int hf_oran_symbolMask = -1;
-
-static int hf_oran_rsvd8 = -1;
-static int hf_oran_rsvd16 = -1;
-static int hf_oran_exponent = -1;
-static int hf_oran_iq_user_data = -1;
-
-static int hf_oran_disable_bfws = -1;
-static int hf_oran_rad = -1;
-static int hf_oran_num_bund_prbs = -1;
-static int hf_oran_beam_id = -1;
-static int hf_oran_num_weights_per_bundle = -1;
-
-static int hf_oran_ack_nack_req_id = -1;
-
-static int hf_oran_off_start_prb_num_prb_pair = -1;
-static int hf_oran_off_start_prb = -1;
-static int hf_oran_num_prb = -1;
-
-static int hf_oran_samples_prb = -1;
-static int hf_oran_ciSample = -1;
-static int hf_oran_ciIsample = -1;
-static int hf_oran_ciQsample = -1;
-
-static int hf_oran_beamGroupType = -1;
-static int hf_oran_numPortc = -1;
-
-static int hf_oran_csf = -1;
-static int hf_oran_modcompscaler = -1;
-
-static int hf_oran_modcomp_param_set = -1;
-static int hf_oran_mc_scale_re_mask = -1;
-static int hf_oran_mc_scale_offset = -1;
-
-static int hf_oran_eAxC_mask = -1;
-static int hf_oran_technology = -1;
-static int hf_oran_nullLayerInd = -1;
-
-static int hf_oran_portReMask = -1;
-static int hf_oran_portSymbolMask = -1;
-
-static int hf_oran_ext19_port = -1;
-
-static int hf_oran_prb_allocation = -1;
-static int hf_oran_nextSymbolId = -1;
-static int hf_oran_nextStartPrbc = -1;
-
-static int hf_oran_puncPattern = -1;
-static int hf_oran_numPuncPatterns = -1;
-static int hf_oran_symbolMask_ext20 = -1;
-static int hf_oran_startPuncPrb = -1;
-static int hf_oran_numPuncPrb = -1;
-static int hf_oran_puncReMask = -1;
-static int hf_oran_RbgIncl = -1;
-
-static int hf_oran_ci_prb_group_size = -1;
-
-static int hf_oran_num_ueid = -1;
-
-static int hf_oran_antMask = -1;
-
-static int hf_oran_transmissionWindowOffset = -1;
-static int hf_oran_transmissionWindowSize = -1;
-static int hf_oran_toT = -1;
-
-static int hf_oran_bfaCompHdr = -1;
-static int hf_oran_bfAzPtWidth = -1;
-static int hf_oran_bfZePtWidth = -1;
-static int hf_oran_bfAz3ddWidth = -1;
-static int hf_oran_bfZe3ddWidth = -1;
-static int hf_oran_bfAzPt = -1;
-static int hf_oran_bfZePt = -1;
-static int hf_oran_bfAz3dd = -1;
-static int hf_oran_bfZe3dd = -1;
-static int hf_oran_bfAzSl = -1;
-static int hf_oran_bfZeSl = -1;
+static int proto_oran;
+
+static int hf_oran_du_port_id;
+static int hf_oran_bandsector_id;
+static int hf_oran_cc_id;
+static int hf_oran_ru_port_id;
+static int hf_oran_sequence_id;
+static int hf_oran_e_bit;
+static int hf_oran_subsequence_id;
+
+static int hf_oran_data_direction;
+static int hf_oran_payload_version;
+static int hf_oran_filter_index;
+static int hf_oran_frame_id;
+static int hf_oran_subframe_id;
+static int hf_oran_slot_id;
+static int hf_oran_slot_within_frame;
+static int hf_oran_start_symbol_id;
+static int hf_oran_numberOfSections;
+static int hf_oran_sectionType;
+
+static int hf_oran_udCompHdr;
+static int hf_oran_udCompHdrIqWidth;
+static int hf_oran_udCompHdrIqWidth_pref;
+static int hf_oran_udCompHdrMeth;
+static int hf_oran_udCompHdrMeth_pref;
+static int hf_oran_numberOfUEs;
+static int hf_oran_timeOffset;
+static int hf_oran_frameStructure_fft;
+static int hf_oran_frameStructure_subcarrier_spacing;
+static int hf_oran_cpLength;
+static int hf_oran_section_id;
+static int hf_oran_rb;
+static int hf_oran_symInc;
+static int hf_oran_startPrbc;
+static int hf_oran_reMask;
+static int hf_oran_numPrbc;
+static int hf_oran_numSymbol;
+static int hf_oran_ef;
+static int hf_oran_beamId;
+
+static int hf_oran_extension;
+static int hf_oran_exttype;
+static int hf_oran_extlen;
+
+static int hf_oran_bfw_bundle;
+static int hf_oran_bfw_bundle_id;
+static int hf_oran_bfw;
+static int hf_oran_bfw_i;
+static int hf_oran_bfw_q;
+
+static int hf_oran_ueId;
+static int hf_oran_freqOffset;
+static int hf_oran_regularizationFactor;
+static int hf_oran_laaMsgType;
+static int hf_oran_laaMsgLen;
+static int hf_oran_lbtHandle;
+static int hf_oran_lbtDeferFactor;
+static int hf_oran_lbtBackoffCounter;
+static int hf_oran_lbtOffset;
+static int hf_oran_MCOT;
+static int hf_oran_lbtMode;
+static int hf_oran_sfnSfEnd;
+static int hf_oran_lbtPdschRes;
+static int hf_oran_sfStatus;
+static int hf_oran_initialPartialSF;
+static int hf_oran_lbtDrsRes;
+static int hf_oran_lbtBufErr;
+static int hf_oran_lbtTrafficClass;
+static int hf_oran_lbtCWConfig_H;
+static int hf_oran_lbtCWConfig_T;
+static int hf_oran_lbtCWR_Rst;
+
+static int hf_oran_reserved;
+static int hf_oran_reserved_1bit;
+static int hf_oran_reserved_2bits;
+static int hf_oran_reserved_4bits;
+static int hf_oran_reserved_6bits;
+
+static int hf_oran_ext11_reserved;
+
+static int hf_oran_bfwCompHdr;
+static int hf_oran_bfwCompHdr_iqWidth;
+static int hf_oran_bfwCompHdr_compMeth;
+static int hf_oran_symbolId;
+static int hf_oran_startPrbu;
+static int hf_oran_numPrbu;
+/* static int hf_oran_udCompParam; */
+
+static int hf_oran_bfwCompParam;
+
+static int hf_oran_iSample;
+static int hf_oran_qSample;
+
+static int hf_oran_blockScaler;
+static int hf_oran_compBitWidth;
+static int hf_oran_compShift;
+
+static int hf_oran_repetition;
+static int hf_oran_rbgSize;
+static int hf_oran_rbgMask;
+static int hf_oran_noncontig_priority;
+static int hf_oran_symbolMask;
+
+static int hf_oran_rsvd8;
+static int hf_oran_rsvd16;
+static int hf_oran_exponent;
+static int hf_oran_iq_user_data;
+
+static int hf_oran_disable_bfws;
+static int hf_oran_rad;
+static int hf_oran_num_bund_prbs;
+static int hf_oran_beam_id;
+static int hf_oran_num_weights_per_bundle;
+
+static int hf_oran_ack_nack_req_id;
+
+static int hf_oran_off_start_prb_num_prb_pair;
+static int hf_oran_off_start_prb;
+static int hf_oran_num_prb;
+
+static int hf_oran_samples_prb;
+static int hf_oran_ciSample;
+static int hf_oran_ciIsample;
+static int hf_oran_ciQsample;
+
+static int hf_oran_beamGroupType;
+static int hf_oran_numPortc;
+
+static int hf_oran_csf;
+static int hf_oran_modcompscaler;
+
+static int hf_oran_modcomp_param_set;
+static int hf_oran_mc_scale_re_mask;
+static int hf_oran_mc_scale_offset;
+
+static int hf_oran_eAxC_mask;
+static int hf_oran_technology;
+static int hf_oran_nullLayerInd;
+
+static int hf_oran_portReMask;
+static int hf_oran_portSymbolMask;
+
+static int hf_oran_ext19_port;
+
+static int hf_oran_prb_allocation;
+static int hf_oran_nextSymbolId;
+static int hf_oran_nextStartPrbc;
+
+static int hf_oran_puncPattern;
+static int hf_oran_numPuncPatterns;
+static int hf_oran_symbolMask_ext20;
+static int hf_oran_startPuncPrb;
+static int hf_oran_numPuncPrb;
+static int hf_oran_puncReMask;
+static int hf_oran_RbgIncl;
+
+static int hf_oran_ci_prb_group_size;
+
+static int hf_oran_num_ueid;
+
+static int hf_oran_antMask;
+
+static int hf_oran_transmissionWindowOffset;
+static int hf_oran_transmissionWindowSize;
+static int hf_oran_toT;
+
+static int hf_oran_bfaCompHdr;
+static int hf_oran_bfAzPtWidth;
+static int hf_oran_bfZePtWidth;
+static int hf_oran_bfAz3ddWidth;
+static int hf_oran_bfZe3ddWidth;
+static int hf_oran_bfAzPt;
+static int hf_oran_bfZePt;
+static int hf_oran_bfAz3dd;
+static int hf_oran_bfZe3dd;
+static int hf_oran_bfAzSl;
+static int hf_oran_bfZeSl;
 
 
 /* Computed fields */
-static int hf_oran_c_eAxC_ID = -1;
-static int hf_oran_refa = -1;
+static int hf_oran_c_eAxC_ID;
+static int hf_oran_refa;
 
 /* Initialize the subtree pointers */
-static gint ett_oran = -1;
-static gint ett_oran_ecpri_rtcid = -1;
-static gint ett_oran_ecpri_pcid = -1;
-static gint ett_oran_ecpri_seqid = -1;
-static gint ett_oran_section = -1;
-static gint ett_oran_section_type = -1;
-static gint ett_oran_u_timing = -1;
-static gint ett_oran_u_section = -1;
-static gint ett_oran_u_prb = -1;
-static gint ett_oran_iq = -1;
-static gint ett_oran_c_section_extension = -1;
-static gint ett_oran_bfw_bundle = -1;
-static gint ett_oran_bfw = -1;
-static gint ett_oran_offset_start_prb_num_prb = -1;
-static gint ett_oran_prb_cisamples = -1;
-static gint ett_oran_cisample = -1;
-static gint ett_oran_udcomphdr = -1;
-static gint ett_oran_bfwcomphdr = -1;
-static gint ett_oran_bfwcompparam = -1;
-static gint ett_oran_ext19_port = -1;
-static gint ett_oran_prb_allocation = -1;
-static gint ett_oran_punc_pattern = -1;
-static gint ett_oran_bfacomphdr = -1;
-static gint ett_oran_modcomp_param_set = -1;
+static gint ett_oran;
+static gint ett_oran_ecpri_rtcid;
+static gint ett_oran_ecpri_pcid;
+static gint ett_oran_ecpri_seqid;
+static gint ett_oran_section;
+static gint ett_oran_section_type;
+static gint ett_oran_u_timing;
+static gint ett_oran_u_section;
+static gint ett_oran_u_prb;
+static gint ett_oran_iq;
+static gint ett_oran_c_section_extension;
+static gint ett_oran_bfw_bundle;
+static gint ett_oran_bfw;
+static gint ett_oran_offset_start_prb_num_prb;
+static gint ett_oran_prb_cisamples;
+static gint ett_oran_cisample;
+static gint ett_oran_udcomphdr;
+static gint ett_oran_bfwcomphdr;
+static gint ett_oran_bfwcompparam;
+static gint ett_oran_ext19_port;
+static gint ett_oran_prb_allocation;
+static gint ett_oran_punc_pattern;
+static gint ett_oran_bfacomphdr;
+static gint ett_oran_modcomp_param_set;
 
 
 /* Expert info */
-static expert_field ei_oran_unsupported_bfw_compression_method = EI_INIT;
-static expert_field ei_oran_invalid_sample_bit_width = EI_INIT;
-static expert_field ei_oran_reserved_numBundPrb = EI_INIT;
-static expert_field ei_oran_extlen_wrong = EI_INIT;
-static expert_field ei_oran_invalid_eaxc_bit_width = EI_INIT;
-static expert_field ei_oran_extlen_zero = EI_INIT;
-static expert_field ei_oran_rbg_size_reserved = EI_INIT;
-static expert_field ei_oran_frame_length = EI_INIT;
+static expert_field ei_oran_unsupported_bfw_compression_method;
+static expert_field ei_oran_invalid_sample_bit_width;
+static expert_field ei_oran_reserved_numBundPrb;
+static expert_field ei_oran_extlen_wrong;
+static expert_field ei_oran_invalid_eaxc_bit_width;
+static expert_field ei_oran_extlen_zero;
+static expert_field ei_oran_rbg_size_reserved;
+static expert_field ei_oran_frame_length;
 
 
 /* These are the message types handled by this dissector */
diff --git a/epan/dissectors/packet-osc.c b/epan/dissectors/packet-osc.c
index 2abef37cd0..2e8feb1a42 100644
--- a/epan/dissectors/packet-osc.c
+++ b/epan/dissectors/packet-osc.c
@@ -298,64 +298,64 @@ static const char *bundle_str = "#bundle";
 static dissector_handle_t osc_udp_handle = NULL;
 static dissector_handle_t osc_tcp_handle = NULL;
 
-static int proto_osc = -1;
-
-static int hf_osc_bundle_type = -1;
-static int hf_osc_message_type = -1;
-static int hf_osc_message_header_type = -1;
-static int hf_osc_message_blob_type = -1;
-static int hf_osc_message_midi_type = -1;
-static int hf_osc_message_rgba_type = -1;
-
-static int hf_osc_bundle_timetag_type = -1;
-static int hf_osc_bundle_element_size_type = -1;
-
-static int hf_osc_message_path_type = -1;
-static int hf_osc_message_format_type = -1;
-
-static int hf_osc_message_int32_type = -1;
-static int hf_osc_message_float_type = -1;
-static int hf_osc_message_string_type = -1;
-static int hf_osc_message_blob_size_type = -1;
-static int hf_osc_message_blob_data_type = -1;
-
-static int hf_osc_message_true_type = -1;
-static int hf_osc_message_false_type = -1;
-static int hf_osc_message_nil_type = -1;
-static int hf_osc_message_bang_type = -1;
-
-static int hf_osc_message_int64_type = -1;
-static int hf_osc_message_double_type = -1;
-static int hf_osc_message_timetag_type = -1;
-
-static int hf_osc_message_symbol_type = -1;
-static int hf_osc_message_char_type = -1;
-
-static int hf_osc_message_rgba_red_type = -1;
-static int hf_osc_message_rgba_green_type = -1;
-static int hf_osc_message_rgba_blue_type = -1;
-static int hf_osc_message_rgba_alpha_type = -1;
-
-static int hf_osc_message_midi_port_type = -1;
-static int hf_osc_message_midi_system_type = -1;
-static int hf_osc_message_midi_channel_type = -1;
-static int hf_osc_message_midi_status_type = -1;
-static int hf_osc_message_midi_data1_type = -1;
-static int hf_osc_message_midi_data2_type = -1;
-static int hf_osc_message_midi_velocity_type = -1;
-static int hf_osc_message_midi_pressure_type = -1;
-static int hf_osc_message_midi_note_type = -1;
-static int hf_osc_message_midi_controller_type = -1;
-static int hf_osc_message_midi_bender_type = -1;
+static int proto_osc;
+
+static int hf_osc_bundle_type;
+static int hf_osc_message_type;
+static int hf_osc_message_header_type;
+static int hf_osc_message_blob_type;
+static int hf_osc_message_midi_type;
+static int hf_osc_message_rgba_type;
+
+static int hf_osc_bundle_timetag_type;
+static int hf_osc_bundle_element_size_type;
+
+static int hf_osc_message_path_type;
+static int hf_osc_message_format_type;
+
+static int hf_osc_message_int32_type;
+static int hf_osc_message_float_type;
+static int hf_osc_message_string_type;
+static int hf_osc_message_blob_size_type;
+static int hf_osc_message_blob_data_type;
+
+static int hf_osc_message_true_type;
+static int hf_osc_message_false_type;
+static int hf_osc_message_nil_type;
+static int hf_osc_message_bang_type;
+
+static int hf_osc_message_int64_type;
+static int hf_osc_message_double_type;
+static int hf_osc_message_timetag_type;
+
+static int hf_osc_message_symbol_type;
+static int hf_osc_message_char_type;
+
+static int hf_osc_message_rgba_red_type;
+static int hf_osc_message_rgba_green_type;
+static int hf_osc_message_rgba_blue_type;
+static int hf_osc_message_rgba_alpha_type;
+
+static int hf_osc_message_midi_port_type;
+static int hf_osc_message_midi_system_type;
+static int hf_osc_message_midi_channel_type;
+static int hf_osc_message_midi_status_type;
+static int hf_osc_message_midi_data1_type;
+static int hf_osc_message_midi_data2_type;
+static int hf_osc_message_midi_velocity_type;
+static int hf_osc_message_midi_pressure_type;
+static int hf_osc_message_midi_note_type;
+static int hf_osc_message_midi_controller_type;
+static int hf_osc_message_midi_bender_type;
 
 /* Initialize the subtree pointers */
-static int ett_osc_packet = -1;
-static int ett_osc_bundle = -1;
-static int ett_osc_message = -1;
-static int ett_osc_message_header = -1;
-static int ett_osc_blob = -1;
-static int ett_osc_rgba = -1;
-static int ett_osc_midi = -1;
+static int ett_osc_packet;
+static int ett_osc_bundle;
+static int ett_osc_message;
+static int ett_osc_message_header;
+static int ett_osc_blob;
+static int ett_osc_rgba;
+static int ett_osc_midi;
 
 /* check for valid path string */
 static gboolean
diff --git a/epan/dissectors/packet-oscore.c b/epan/dissectors/packet-oscore.c
index baf1fb0bb7..889b5c93b2 100644
--- a/epan/dissectors/packet-oscore.c
+++ b/epan/dissectors/packet-oscore.c
@@ -45,25 +45,25 @@ void proto_reg_handoff_oscore(void);
 void proto_register_oscore(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_oscore                             = -1;
-static int proto_coap                               = -1;
+static int proto_oscore;
+static int proto_coap;
 
-static int hf_oscore_tag                            = -1;
+static int hf_oscore_tag;
 
 static COAP_COMMON_LIST_T(dissect_oscore_hf);
 
-static expert_field ei_oscore_partial_iv_not_found    = EI_INIT;
-static expert_field ei_oscore_context_not_set         = EI_INIT;
-static expert_field ei_oscore_message_too_small       = EI_INIT;
-static expert_field ei_oscore_truncated               = EI_INIT;
-static expert_field ei_oscore_tag_check_failed        = EI_INIT;
-static expert_field ei_oscore_decrypt_error           = EI_INIT;
-static expert_field ei_oscore_cbc_mac_failed          = EI_INIT;
-static expert_field ei_oscore_piv_len_invalid         = EI_INIT;
-static expert_field ei_oscore_info_fetch_failed       = EI_INIT;
+static expert_field ei_oscore_partial_iv_not_found;
+static expert_field ei_oscore_context_not_set;
+static expert_field ei_oscore_message_too_small;
+static expert_field ei_oscore_truncated;
+static expert_field ei_oscore_tag_check_failed;
+static expert_field ei_oscore_decrypt_error;
+static expert_field ei_oscore_cbc_mac_failed;
+static expert_field ei_oscore_piv_len_invalid;
+static expert_field ei_oscore_info_fetch_failed;
 
 /* Initialize the subtree pointers */
-static gint ett_oscore                                = -1;
+static gint ett_oscore;
 
 /* UAT variables */
 static uat_t            *oscore_context_uat = NULL;
diff --git a/epan/dissectors/packet-osi-options.c b/epan/dissectors/packet-osi-options.c
index c4adc7c6fa..49a24bccde 100644
--- a/epan/dissectors/packet-osi-options.c
+++ b/epan/dissectors/packet-osi-options.c
@@ -110,39 +110,39 @@ extern int hf_clnp_atntt; /* as defined in packet-clnp.c */
 extern int hf_clnp_atnsc; /* as defined in packet-clnp.c */
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_osi_options_address_mask = -1;
-static int hf_osi_options_transit_delay_vs_cost = -1;
-static int hf_osi_options_rtd_general = -1;
-static int hf_osi_options_residual_error_prob_vs_transit_delay = -1;
-static int hf_osi_options_qos_sequencing_vs_transit_delay = -1;
-static int hf_osi_options_rtd_address = -1;
-static int hf_osi_options_congestion_experienced = -1;
-static int hf_osi_options_esct = -1;
-static int hf_osi_options_rtd_reassembly = -1;
-static int hf_osi_options_qos_maintenance = -1;
-static int hf_osi_options_security_type = -1;
-static int hf_osi_options_route_recording = -1;
-static int hf_osi_options_last_hop = -1;
-static int hf_osi_options_route = -1;
-static int hf_osi_options_rtd_lifetime = -1;
-static int hf_osi_options_rtd_source_routing = -1;
-static int hf_osi_options_padding = -1;
-static int hf_osi_options_rfd_error_class = -1;
-static int hf_osi_options_snpa_mask = -1;
-static int hf_osi_options_source_routing = -1;
-static int hf_osi_options_priority = -1;
-static int hf_osi_options_qos_reserved = -1;
-static int hf_osi_options_residual_error_prob_vs_cost = -1;
-static int hf_osi_options_rtd_pdu_discarded = -1;
-static int hf_osi_options_rfd_field = -1;
-
-static gint ett_osi_options       = -1;
-static gint ett_osi_qos           = -1;
-static gint ett_osi_route         = -1;
-static gint ett_osi_redirect      = -1;
-
-static expert_field ei_osi_options_none = EI_INIT;
-static expert_field ei_osi_options_rfd_error_class = EI_INIT;
+static int hf_osi_options_address_mask;
+static int hf_osi_options_transit_delay_vs_cost;
+static int hf_osi_options_rtd_general;
+static int hf_osi_options_residual_error_prob_vs_transit_delay;
+static int hf_osi_options_qos_sequencing_vs_transit_delay;
+static int hf_osi_options_rtd_address;
+static int hf_osi_options_congestion_experienced;
+static int hf_osi_options_esct;
+static int hf_osi_options_rtd_reassembly;
+static int hf_osi_options_qos_maintenance;
+static int hf_osi_options_security_type;
+static int hf_osi_options_route_recording;
+static int hf_osi_options_last_hop;
+static int hf_osi_options_route;
+static int hf_osi_options_rtd_lifetime;
+static int hf_osi_options_rtd_source_routing;
+static int hf_osi_options_padding;
+static int hf_osi_options_rfd_error_class;
+static int hf_osi_options_snpa_mask;
+static int hf_osi_options_source_routing;
+static int hf_osi_options_priority;
+static int hf_osi_options_qos_reserved;
+static int hf_osi_options_residual_error_prob_vs_cost;
+static int hf_osi_options_rtd_pdu_discarded;
+static int hf_osi_options_rfd_field;
+
+static gint ett_osi_options;
+static gint ett_osi_qos;
+static gint ett_osi_route;
+static gint ett_osi_redirect;
+
+static expert_field ei_osi_options_none;
+static expert_field ei_osi_options_rfd_error_class;
 
 static const guchar atn_security_registration_val[] = {
   0x06, 0x04, 0x2b, 0x1b, 0x00, 0x00
diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c
index d5436f35ea..684a57dedc 100644
--- a/epan/dissectors/packet-osi.c
+++ b/epan/dissectors/packet-osi.c
@@ -29,9 +29,9 @@
 void proto_reg_handoff_osi(void);
 void proto_register_osi(void);
 
-int  proto_osi         = -1;
+int  proto_osi;
 
-static int hf_osi_nlpid = -1;
+static int hf_osi_nlpid;
 
 static dissector_handle_t osi_handle;
 static dissector_handle_t osi_tpkt_handle;
diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c
index 19f262a1fe..b2f3adfc96 100644
--- a/epan/dissectors/packet-ositp.c
+++ b/epan/dissectors/packet-ositp.c
@@ -34,93 +34,93 @@ void proto_reg_handoff_cotp(void);
 
 static int  proto_clnp;
 
-static int  proto_cotp         = -1;
-static gint ett_cotp           = -1;
-static gint ett_cotp_segments  = -1;
-static gint ett_cotp_segment   = -1;
-
-static int hf_cotp_li          = -1;
-static int hf_cotp_type        = -1;
-static int hf_cotp_srcref      = -1;
-static int hf_cotp_destref     = -1;
-static int hf_cotp_class       = -1;
-static int hf_cotp_opts_extended_formats = -1;
-static int hf_cotp_opts_no_explicit_flow_control = -1;
-static int hf_cotp_tpdu_number = -1;
-static int hf_cotp_tpdu_number_extended = -1;
-static int hf_cotp_next_tpdu_number = -1;
-static int hf_cotp_next_tpdu_number_extended = -1;
-static int hf_cotp_eot          = -1;
-static int hf_cotp_eot_extended = -1;
+static int  proto_cotp;
+static gint ett_cotp;
+static gint ett_cotp_segments;
+static gint ett_cotp_segment;
+
+static int hf_cotp_li;
+static int hf_cotp_type;
+static int hf_cotp_srcref;
+static int hf_cotp_destref;
+static int hf_cotp_class;
+static int hf_cotp_opts_extended_formats;
+static int hf_cotp_opts_no_explicit_flow_control;
+static int hf_cotp_tpdu_number;
+static int hf_cotp_tpdu_number_extended;
+static int hf_cotp_next_tpdu_number;
+static int hf_cotp_next_tpdu_number_extended;
+static int hf_cotp_eot;
+static int hf_cotp_eot_extended;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_cotp_parameter_code = -1;
-static int hf_cotp_parameter_length = -1;
-static int hf_cotp_parameter_value = -1;
-static int hf_cotp_atn_extended_checksum16 = -1;
-static int hf_cotp_atn_extended_checksum32 = -1;
-static int hf_cotp_atn_extended_checksum_status = -1;
-static int hf_cotp_ack_time = -1;
-static int hf_cotp_res_error_rate_target_value = -1;
-static int hf_cotp_res_error_rate_min_accept = -1;
-static int hf_cotp_res_error_rate_tdsu = -1;
-static int hf_cotp_vp_priority = -1;
-static int hf_cotp_transit_delay_targ_calling_called = -1;
-static int hf_cotp_transit_delay_max_accept_calling_called = -1;
-static int hf_cotp_transit_delay_targ_called_calling = -1;
-static int hf_cotp_transit_delay_max_accept_called_calling = -1;
-static int hf_cotp_max_throughput_targ_calling_called = -1;
-static int hf_cotp_max_throughput_min_accept_calling_called = -1;
-static int hf_cotp_max_throughput_targ_called_calling = -1;
-static int hf_cotp_max_throughput_min_accept_called_calling = -1;
-static int hf_cotp_avg_throughput_targ_calling_called = -1;
-static int hf_cotp_avg_throughput_min_accept_calling_called = -1;
-static int hf_cotp_avg_throughput_targ_called_calling = -1;
-static int hf_cotp_avg_throughput_min_accept_called_calling = -1;
-static int hf_cotp_sequence_number = -1;
-static int hf_cotp_reassignment_time = -1;
-static int hf_cotp_lower_window_edge = -1;
-static int hf_cotp_credit = -1;
-static int hf_cotp_tpdu_size = -1;
-static int hf_cotp_checksum = -1;
-static int hf_cotp_checksum_status = -1;
-static int hf_cotp_vp_version_nr = -1;
-static int hf_cotp_network_expedited_data = -1;
-static int hf_cotp_vp_opt_sel_class1_use = -1;
-static int hf_cotp_use_16_bit_checksum = -1;
-static int hf_cotp_transport_expedited_data_transfer = -1;
-static int hf_cotp_preferred_maximum_tpdu_size = -1;
-static int hf_cotp_inactivity_timer = -1;
-static int hf_cotp_cause = -1;
-static int hf_cotp_segment_data = -1;
-static int hf_cotp_credit_cdt = -1;
-static int hf_cotp_reject_cause = -1;
-
-static int hf_cotp_segments    = -1;
-static int hf_cotp_segment     = -1;
-static int hf_cotp_segment_overlap = -1;
-static int hf_cotp_segment_overlap_conflict = -1;
-static int hf_cotp_segment_multiple_tails = -1;
-static int hf_cotp_segment_too_long_segment = -1;
-static int hf_cotp_segment_error = -1;
-static int hf_cotp_segment_count = -1;
-static int hf_cotp_reassembled_in = -1;
-static int hf_cotp_reassembled_length = -1;
-
-static expert_field ei_cotp_disconnect_confirm = EI_INIT;
-static expert_field ei_cotp_multiple_tpdus = EI_INIT;
-static expert_field ei_cotp_reject = EI_INIT;
-static expert_field ei_cotp_connection = EI_INIT;
-static expert_field ei_cotp_disconnect_request = EI_INIT;
-static expert_field ei_cotp_preferred_maximum_tpdu_size = EI_INIT;
-static expert_field ei_cotp_atn_extended_checksum = EI_INIT;
-static expert_field ei_cotp_checksum = EI_INIT;
-
-
-static int  proto_cltp         = -1;
-static gint ett_cltp           = -1;
-
-static int hf_cltp_li = -1;
-static int hf_cltp_type = -1;
+static int hf_cotp_parameter_code;
+static int hf_cotp_parameter_length;
+static int hf_cotp_parameter_value;
+static int hf_cotp_atn_extended_checksum16;
+static int hf_cotp_atn_extended_checksum32;
+static int hf_cotp_atn_extended_checksum_status;
+static int hf_cotp_ack_time;
+static int hf_cotp_res_error_rate_target_value;
+static int hf_cotp_res_error_rate_min_accept;
+static int hf_cotp_res_error_rate_tdsu;
+static int hf_cotp_vp_priority;
+static int hf_cotp_transit_delay_targ_calling_called;
+static int hf_cotp_transit_delay_max_accept_calling_called;
+static int hf_cotp_transit_delay_targ_called_calling;
+static int hf_cotp_transit_delay_max_accept_called_calling;
+static int hf_cotp_max_throughput_targ_calling_called;
+static int hf_cotp_max_throughput_min_accept_calling_called;
+static int hf_cotp_max_throughput_targ_called_calling;
+static int hf_cotp_max_throughput_min_accept_called_calling;
+static int hf_cotp_avg_throughput_targ_calling_called;
+static int hf_cotp_avg_throughput_min_accept_calling_called;
+static int hf_cotp_avg_throughput_targ_called_calling;
+static int hf_cotp_avg_throughput_min_accept_called_calling;
+static int hf_cotp_sequence_number;
+static int hf_cotp_reassignment_time;
+static int hf_cotp_lower_window_edge;
+static int hf_cotp_credit;
+static int hf_cotp_tpdu_size;
+static int hf_cotp_checksum;
+static int hf_cotp_checksum_status;
+static int hf_cotp_vp_version_nr;
+static int hf_cotp_network_expedited_data;
+static int hf_cotp_vp_opt_sel_class1_use;
+static int hf_cotp_use_16_bit_checksum;
+static int hf_cotp_transport_expedited_data_transfer;
+static int hf_cotp_preferred_maximum_tpdu_size;
+static int hf_cotp_inactivity_timer;
+static int hf_cotp_cause;
+static int hf_cotp_segment_data;
+static int hf_cotp_credit_cdt;
+static int hf_cotp_reject_cause;
+
+static int hf_cotp_segments;
+static int hf_cotp_segment;
+static int hf_cotp_segment_overlap;
+static int hf_cotp_segment_overlap_conflict;
+static int hf_cotp_segment_multiple_tails;
+static int hf_cotp_segment_too_long_segment;
+static int hf_cotp_segment_error;
+static int hf_cotp_segment_count;
+static int hf_cotp_reassembled_in;
+static int hf_cotp_reassembled_length;
+
+static expert_field ei_cotp_disconnect_confirm;
+static expert_field ei_cotp_multiple_tpdus;
+static expert_field ei_cotp_reject;
+static expert_field ei_cotp_connection;
+static expert_field ei_cotp_disconnect_request;
+static expert_field ei_cotp_preferred_maximum_tpdu_size;
+static expert_field ei_cotp_atn_extended_checksum;
+static expert_field ei_cotp_checksum;
+
+
+static int  proto_cltp;
+static gint ett_cltp;
+
+static int hf_cltp_li;
+static int hf_cltp_type;
 
 static const fragment_items cotp_frag_items = {
   &ett_cotp_segment,
@@ -315,10 +315,10 @@ static const value_string tp_vpart_type_vals[] = {
   { 0,                      NULL }
 };
 
-static int hf_cotp_vp_src_tsap = -1;
-static int hf_cotp_vp_dst_tsap = -1;
-static int hf_cotp_vp_src_tsap_bytes = -1;
-static int hf_cotp_vp_dst_tsap_bytes = -1;
+static int hf_cotp_vp_src_tsap;
+static int hf_cotp_vp_dst_tsap;
+static int hf_cotp_vp_src_tsap_bytes;
+static int hf_cotp_vp_dst_tsap_bytes;
 
 /* global variables */
 
diff --git a/epan/dissectors/packet-osmo_trx.c b/epan/dissectors/packet-osmo_trx.c
index b6ac3b416b..c64b5aace2 100644
--- a/epan/dissectors/packet-osmo_trx.c
+++ b/epan/dissectors/packet-osmo_trx.c
@@ -30,72 +30,72 @@ static dissector_handle_t otrxd_handle;
 static dissector_handle_t otrxc_handle;
 
 /* Which kind of message it is */
-static int proto_otrxd = -1;
-static int proto_otrxc = -1;
+static int proto_otrxd;
+static int proto_otrxc;
 
 /* Generated fields */
-static int hf_otrxd_burst_dir = -1;
-static int hf_otrxc_msg_dir = -1;
+static int hf_otrxd_burst_dir;
+static int hf_otrxc_msg_dir;
 
 /* TRXD PDU version */
-static int hf_otrxd_pdu_ver = -1;
+static int hf_otrxd_pdu_ver;
 
 /* TRXD common fields */
-static int hf_otrxd_chdr_reserved = -1;
-static int hf_otrxd_shadow_ind = -1;
-static int hf_otrxd_batch_ind = -1;
-static int hf_otrxd_trx_num = -1;
-static int hf_otrxd_tdma_tn = -1;
-static int hf_otrxd_tdma_fn = -1;
+static int hf_otrxd_chdr_reserved;
+static int hf_otrxd_shadow_ind;
+static int hf_otrxd_batch_ind;
+static int hf_otrxd_trx_num;
+static int hf_otrxd_tdma_tn;
+static int hf_otrxd_tdma_fn;
 
 /* MTS (Modulation and Training Sequence) fields */
-static int hf_otrxd_nope_ind = -1;
-static int hf_otrxd_nope_ind_pad = -1;
-static int hf_otrxd_mod_2b = -1; /* 2 bit field */
-static int hf_otrxd_mod_3b = -1; /* 3 bit field */
-static int hf_otrxd_mod_4b = -1; /* 4 bit field */
-static int hf_otrxd_tsc_set_x4 = -1;
-static int hf_otrxd_tsc_set_x2 = -1;
-static int hf_otrxd_tsc = -1;
+static int hf_otrxd_nope_ind;
+static int hf_otrxd_nope_ind_pad;
+static int hf_otrxd_mod_2b; /* 2 bit field */
+static int hf_otrxd_mod_3b; /* 3 bit field */
+static int hf_otrxd_mod_4b; /* 4 bit field */
+static int hf_otrxd_tsc_set_x4;
+static int hf_otrxd_tsc_set_x2;
+static int hf_otrxd_tsc;
 
 /* TRXD Rx header fields */
-static int hf_otrxd_rssi = -1;
-static int hf_otrxd_toa256 = -1;
-static int hf_otrxd_ci = -1;
+static int hf_otrxd_rssi;
+static int hf_otrxd_toa256;
+static int hf_otrxd_ci;
 
 /* TRXD Tx header fields */
-static int hf_otrxd_tx_att = -1;
-static int hf_otrxd_tx_scpir = -1;
-static int hf_otrxd_tx_rfu = -1;
+static int hf_otrxd_tx_att;
+static int hf_otrxd_tx_scpir;
+static int hf_otrxd_tx_rfu;
 
 /* Burst soft (255 .. 0) / hard (1 or 0) bits */
-static int hf_otrxd_soft_symbols = -1;
-static int hf_otrxd_hard_symbols = -1;
-static int hf_otrxd_burst_pad = -1;
+static int hf_otrxd_soft_symbols;
+static int hf_otrxd_hard_symbols;
+static int hf_otrxd_burst_pad;
 
 /* TRXC - Control and Clock protocol */
-static int hf_otrxc_type = -1;
-static int hf_otrxc_delimiter = -1;
-static int hf_otrxc_verb = -1;
-static int hf_otrxc_params = -1;
-static int hf_otrxc_status = -1;
-
-static gint ett_otrxd = -1;
-static gint ett_otrxc = -1;
-
-static gint ett_otrxd_rx_pdu = -1;
-static gint ett_otrxd_tx_pdu = -1;
-
-static expert_field ei_otrxd_unknown_pdu_ver = EI_INIT;
-static expert_field ei_otrxd_injected_msg = EI_INIT;
-static expert_field ei_otrxd_unknown_dir = EI_INIT;
-static expert_field ei_otrxd_tail_octets = EI_INIT;
-
-static expert_field ei_otrxc_unknown_msg_type = EI_INIT;
-static expert_field ei_otrxc_bad_delimiter = EI_INIT;
-static expert_field ei_otrxc_rsp_no_code = EI_INIT;
-static expert_field ei_otrxc_injected_msg = EI_INIT;
-static expert_field ei_otrxc_unknown_dir = EI_INIT;
+static int hf_otrxc_type;
+static int hf_otrxc_delimiter;
+static int hf_otrxc_verb;
+static int hf_otrxc_params;
+static int hf_otrxc_status;
+
+static gint ett_otrxd;
+static gint ett_otrxc;
+
+static gint ett_otrxd_rx_pdu;
+static gint ett_otrxd_tx_pdu;
+
+static expert_field ei_otrxd_unknown_pdu_ver;
+static expert_field ei_otrxd_injected_msg;
+static expert_field ei_otrxd_unknown_dir;
+static expert_field ei_otrxd_tail_octets;
+
+static expert_field ei_otrxc_unknown_msg_type;
+static expert_field ei_otrxc_bad_delimiter;
+static expert_field ei_otrxc_rsp_no_code;
+static expert_field ei_otrxc_injected_msg;
+static expert_field ei_otrxc_unknown_dir;
 
 /* Custom units */
 static const unit_name_string otrx_units_toa256 = { " (1/256 of a symbol)", NULL };
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c
index 1b94d6b01c..e75b76324e 100644
--- a/epan/dissectors/packet-ospf.c
+++ b/epan/dissectors/packet-ospf.c
@@ -592,83 +592,83 @@ static const value_string ext_link_stlv_type_vals[] = {
     {0, NULL}
 };
 
-static int proto_ospf = -1;
-
-static gint ett_ospf = -1;
-static gint ett_ospf_at = -1;
-static gint ett_ospf_hdr = -1;
-static gint ett_ospf_hello = -1;
-static gint ett_ospf_desc = -1;
-static gint ett_ospf_lsr = -1;
-static gint ett_ospf_lsa = -1;
-static gint ett_ospf_lsa_router_link = -1;
-static gint ett_ospf_lsa_upd = -1;
-static gint ett_ospf_v2_options = -1;
-static gint ett_ospf_ri_options = -1;
-static gint ett_ospf_v3_options = -1;
-static gint ett_ospf_dbd = -1;
-static gint ett_ospf_lls_data_block = -1;
-static gint ett_ospf_lls_tlv = -1;
-static gint ett_ospf_lls_ext_options = -1;
-static gint ett_ospf_v3_lls_ext_options_tlv = -1;
-static gint ett_ospf_v3_lls_ext_options = -1;
-static gint ett_ospf_v3_lls_state_tlv = -1;
-static gint ett_ospf_v3_lls_state_scs = -1;
-static gint ett_ospf_v3_lls_state_options = -1;
-static gint ett_ospf_v3_lls_drop_tlv = -1;
-static gint ett_ospf_v3_lls_relay_tlv = -1;
-static gint ett_ospf_v3_lls_relay_added = -1;
-static gint ett_ospf_v3_lls_relay_options = -1;
-static gint ett_ospf_v3_lls_willingness_tlv = -1;
-static gint ett_ospf_v3_lls_willingness = -1;
-static gint ett_ospf_v3_lls_rf_tlv = -1;
-static gint ett_ospf_v3_lls_fsf_tlv = -1;
-static gint ett_ospf_v2_router_lsa_flags = -1;
-static gint ett_ospf_v3_router_lsa_flags = -1;
-static gint ett_ospf_v3_as_external_flags = -1;
-static gint ett_ospf_v3_prefix_options = -1;
-static gint ett_ospf_v3_router_interface = -1;
-static gint ett_ospf_v3_router_interface_entry = -1;
-static gint ett_ospf_mpls_pri = -1;
-static gint ett_ospf_mpls_bitmap = -1;
+static int proto_ospf;
+
+static gint ett_ospf;
+static gint ett_ospf_at;
+static gint ett_ospf_hdr;
+static gint ett_ospf_hello;
+static gint ett_ospf_desc;
+static gint ett_ospf_lsr;
+static gint ett_ospf_lsa;
+static gint ett_ospf_lsa_router_link;
+static gint ett_ospf_lsa_upd;
+static gint ett_ospf_v2_options;
+static gint ett_ospf_ri_options;
+static gint ett_ospf_v3_options;
+static gint ett_ospf_dbd;
+static gint ett_ospf_lls_data_block;
+static gint ett_ospf_lls_tlv;
+static gint ett_ospf_lls_ext_options;
+static gint ett_ospf_v3_lls_ext_options_tlv;
+static gint ett_ospf_v3_lls_ext_options;
+static gint ett_ospf_v3_lls_state_tlv;
+static gint ett_ospf_v3_lls_state_scs;
+static gint ett_ospf_v3_lls_state_options;
+static gint ett_ospf_v3_lls_drop_tlv;
+static gint ett_ospf_v3_lls_relay_tlv;
+static gint ett_ospf_v3_lls_relay_added;
+static gint ett_ospf_v3_lls_relay_options;
+static gint ett_ospf_v3_lls_willingness_tlv;
+static gint ett_ospf_v3_lls_willingness;
+static gint ett_ospf_v3_lls_rf_tlv;
+static gint ett_ospf_v3_lls_fsf_tlv;
+static gint ett_ospf_v2_router_lsa_flags;
+static gint ett_ospf_v3_router_lsa_flags;
+static gint ett_ospf_v3_as_external_flags;
+static gint ett_ospf_v3_prefix_options;
+static gint ett_ospf_v3_router_interface;
+static gint ett_ospf_v3_router_interface_entry;
+static gint ett_ospf_mpls_pri;
+static gint ett_ospf_mpls_bitmap;
 
 /* Trees for opaque LSAs */
-static gint ett_ospf_lsa_mpls = -1;
-static gint ett_ospf_lsa_mpls_bandwidth_sstlv = -1;
-static gint ett_ospf_lsa_mpls_base_label = -1;
-static gint ett_ospf_lsa_mpls_router = -1;
-static gint ett_ospf_lsa_mpls_link = -1;
-static gint ett_ospf_lsa_mpls_link_stlv = -1;
-static gint ett_ospf_lsa_mpls_link_stlv_admingrp = -1;
-static gint ett_ospf_lsa_oif_tna = -1;
-static gint ett_ospf_lsa_oif_tna_stlv = -1;
-static gint ett_ospf_lsa_grace_tlv = -1;
-static gint ett_ospf_lsa_opaque_ri = -1;
-static gint ett_ospf_lsa_ri_tlv = -1;
-static gint ett_ospf_lsa_dh_tlv = -1;
-static gint ett_ospf_lsa_sa_tlv = -1;
-static gint ett_ospf_lsa_slr_tlv = -1;
-static gint ett_ospf_lsa_slr_stlv = -1;
-static gint ett_ospf_lsa_srms_tlv = -1;
-static gint ett_ospf_lsa_node_msd_tlv = -1;
-static gint ett_ospf_lsa_fad_tlv = -1;
-static gint ett_ospf_lsa_fad_stlv = -1;
-static gint ett_ospf_lsa_elink = -1;
-static gint ett_ospf_lsa_epfx = -1;
-static gint ett_ospf_lsa_elink_tlv = -1;
-static gint ett_ospf_lsa_elink_stlv = -1;
-static gint ett_ospf_lsa_epfx_tlv = -1;
-static gint ett_ospf_lsa_epfx_flags = -1;
-static gint ett_ospf_lsa_epfx_stlv = -1;
-static gint ett_ospf_lsa_epfx_range_flags = -1;
-static gint ett_ospf_lsa_pfxsid_flags = -1;
-static gint ett_ospf_lsa_adjsid_flags = -1;
-static gint ett_ospf_lsa_app_sabm_bits = -1;
-static gint ett_ospf_lsa_app_link_attrs_stlv = -1;
-static gint ett_ospf_lsa_unidir_link_flags = -1;
-static gint ett_ospf_lsa_unknown_tlv = -1;
-
-static gint ett_ospf_lsa_type = -1;
+static gint ett_ospf_lsa_mpls;
+static gint ett_ospf_lsa_mpls_bandwidth_sstlv;
+static gint ett_ospf_lsa_mpls_base_label;
+static gint ett_ospf_lsa_mpls_router;
+static gint ett_ospf_lsa_mpls_link;
+static gint ett_ospf_lsa_mpls_link_stlv;
+static gint ett_ospf_lsa_mpls_link_stlv_admingrp;
+static gint ett_ospf_lsa_oif_tna;
+static gint ett_ospf_lsa_oif_tna_stlv;
+static gint ett_ospf_lsa_grace_tlv;
+static gint ett_ospf_lsa_opaque_ri;
+static gint ett_ospf_lsa_ri_tlv;
+static gint ett_ospf_lsa_dh_tlv;
+static gint ett_ospf_lsa_sa_tlv;
+static gint ett_ospf_lsa_slr_tlv;
+static gint ett_ospf_lsa_slr_stlv;
+static gint ett_ospf_lsa_srms_tlv;
+static gint ett_ospf_lsa_node_msd_tlv;
+static gint ett_ospf_lsa_fad_tlv;
+static gint ett_ospf_lsa_fad_stlv;
+static gint ett_ospf_lsa_elink;
+static gint ett_ospf_lsa_epfx;
+static gint ett_ospf_lsa_elink_tlv;
+static gint ett_ospf_lsa_elink_stlv;
+static gint ett_ospf_lsa_epfx_tlv;
+static gint ett_ospf_lsa_epfx_flags;
+static gint ett_ospf_lsa_epfx_stlv;
+static gint ett_ospf_lsa_epfx_range_flags;
+static gint ett_ospf_lsa_pfxsid_flags;
+static gint ett_ospf_lsa_adjsid_flags;
+static gint ett_ospf_lsa_app_sabm_bits;
+static gint ett_ospf_lsa_app_link_attrs_stlv;
+static gint ett_ospf_lsa_unidir_link_flags;
+static gint ett_ospf_lsa_unknown_tlv;
+
+static gint ett_ospf_lsa_type;
 
 
 /* The Options field in the first TLV of the Opaque RI LSA with type field set to "4" for OSPFv2
@@ -684,11 +684,11 @@ static const true_false_string tfs_v3_as_external_flags_e = {
  *-----------------------------------------------------------------------*/
 
 /* OSPF MSG Type */
-static int hf_ospf_msg_hello = -1;
-static int hf_ospf_msg_db_desc = -1;
-static int hf_ospf_msg_ls_req = -1;
-static int hf_ospf_msg_ls_upd = -1;
-static int hf_ospf_msg_ls_ack = -1;
+static int hf_ospf_msg_hello;
+static int hf_ospf_msg_db_desc;
+static int hf_ospf_msg_ls_req;
+static int hf_ospf_msg_ls_upd;
+static int hf_ospf_msg_ls_ack;
 
 static int *hf_ospf_msg_type_array[] = {
         &hf_ospf_msg_hello,
@@ -698,37 +698,37 @@ static int *hf_ospf_msg_type_array[] = {
         &hf_ospf_msg_ls_ack,
 };
 
-static int hf_ospf_ls_type = -1;
-static int hf_ospf_ls_age = -1;
-static int hf_ospf_ls_donotage = -1;
-static int hf_ospf_ls_id = -1;
-static int hf_ospf_ls_seqnum = -1;
-static int hf_ospf_ls_chksum = -1;
-static int hf_ospf_ls_length = -1;
-static int hf_ospf_ls_opaque_type = -1;
-static int hf_ospf_ls_mpls_te_instance = -1;
+static int hf_ospf_ls_type;
+static int hf_ospf_ls_age;
+static int hf_ospf_ls_donotage;
+static int hf_ospf_ls_id;
+static int hf_ospf_ls_seqnum;
+static int hf_ospf_ls_chksum;
+static int hf_ospf_ls_length;
+static int hf_ospf_ls_opaque_type;
+static int hf_ospf_ls_mpls_te_instance;
 
 /* OSPF V2 LSA Type  */
-static int hf_ospf_ls_router = -1;
-static int hf_ospf_ls_router_linktype = -1;
-static int hf_ospf_ls_router_linkid = -1;
-static int hf_ospf_ls_router_linkdata = -1;
-static int hf_ospf_ls_router_nummetrics = -1;
-static int hf_ospf_ls_router_metric0 = -1;
-static int hf_ospf_ls_network = -1;
-static int hf_ospf_ls_network_netmask = -1;
-static int hf_ospf_ls_network_attachrtr = -1;
-static int hf_ospf_ls_summary = -1;
-static int hf_ospf_ls_asbr = -1;
-static int hf_ospf_ls_asbr_netmask = -1;
-static int hf_ospf_ls_asext = -1;
-static int hf_ospf_ls_asext_netmask = -1;
-static int hf_ospf_ls_asext_fwdaddr = -1;
-static int hf_ospf_ls_asext_extrtrtag = -1;
-static int hf_ospf_ls_grpmember = -1;
-static int hf_ospf_ls_asext7 = -1;
-static int hf_ospf_ls_extattr = -1;
-static int hf_ospf_ls_opaque = -1;
+static int hf_ospf_ls_router;
+static int hf_ospf_ls_router_linktype;
+static int hf_ospf_ls_router_linkid;
+static int hf_ospf_ls_router_linkdata;
+static int hf_ospf_ls_router_nummetrics;
+static int hf_ospf_ls_router_metric0;
+static int hf_ospf_ls_network;
+static int hf_ospf_ls_network_netmask;
+static int hf_ospf_ls_network_attachrtr;
+static int hf_ospf_ls_summary;
+static int hf_ospf_ls_asbr;
+static int hf_ospf_ls_asbr_netmask;
+static int hf_ospf_ls_asext;
+static int hf_ospf_ls_asext_netmask;
+static int hf_ospf_ls_asext_fwdaddr;
+static int hf_ospf_ls_asext_extrtrtag;
+static int hf_ospf_ls_grpmember;
+static int hf_ospf_ls_asext7;
+static int hf_ospf_ls_extattr;
+static int hf_ospf_ls_opaque;
 
 static int *hf_ospf_ls_type_array[] = {
         &hf_ospf_ls_router,
@@ -742,22 +742,22 @@ static int *hf_ospf_ls_type_array[] = {
         &hf_ospf_ls_opaque
 };
 
-static int hf_ospf_v3_ls_type = -1;
-static int hf_ospf_v3_ls_type_u = -1;
-static int hf_ospf_v3_ls_type_s12 = -1;
-static int hf_ospf_v3_ls_type_fc = -1;
+static int hf_ospf_v3_ls_type;
+static int hf_ospf_v3_ls_type_u;
+static int hf_ospf_v3_ls_type_s12;
+static int hf_ospf_v3_ls_type_fc;
 
 /* OSPF V3 LSA Type */
-static int hf_ospf_v3_ls_router = -1;
-static int hf_ospf_v3_ls_network = -1;
-static int hf_ospf_v3_ls_inter_area_prefix = -1;
-static int hf_ospf_v3_ls_inter_area_router = -1;
-static int hf_ospf_v3_ls_as_external = -1;
-static int hf_ospf_v3_ls_group_membership = -1;
-static int hf_ospf_v3_ls_nssa = -1;
-static int hf_ospf_v3_ls_link = -1;
-static int hf_ospf_v3_ls_intra_area_prefix = -1;
-static int hf_ospf_v3_ls_opaque_ri = -1;
+static int hf_ospf_v3_ls_router;
+static int hf_ospf_v3_ls_network;
+static int hf_ospf_v3_ls_inter_area_prefix;
+static int hf_ospf_v3_ls_inter_area_router;
+static int hf_ospf_v3_ls_as_external;
+static int hf_ospf_v3_ls_group_membership;
+static int hf_ospf_v3_ls_nssa;
+static int hf_ospf_v3_ls_link;
+static int hf_ospf_v3_ls_intra_area_prefix;
+static int hf_ospf_v3_ls_opaque_ri;
 
 static int *hf_ospf_v3_ls_type_array[] = {
         &hf_ospf_v3_ls_router,
@@ -772,308 +772,308 @@ static int *hf_ospf_v3_ls_type_array[] = {
         &hf_ospf_v3_ls_opaque_ri
 };
 
-static int hf_ospf_adv_router = -1;
-static int hf_ospf_ls_mpls = -1;
-static int hf_ospf_ls_mpls_routerid = -1;
-static int hf_ospf_ls_mpls_linktype = -1;
-static int hf_ospf_ls_mpls_linkid = -1;
-static int hf_ospf_ls_mpls_local_addr = -1;
-static int hf_ospf_ls_mpls_remote_addr = -1;
-static int hf_ospf_ls_mpls_local_ifid = -1;
-static int hf_ospf_ls_mpls_remote_ifid = -1;
-static int hf_ospf_ls_mpls_te_metric = -1;
-static int hf_ospf_ls_mpls_linkcolor = -1;
-static int hf_ospf_ls_mpls_group = -1;
-static int hf_ospf_ls_mpls_link_max_bw = -1;
-static int hf_ospf_ls_mpls_bc_model_id = -1;
-static int hf_ospf_ls_oif_local_node_id = -1;
-static int hf_ospf_ls_oif_remote_node_id = -1;
-static int hf_ospf_v2_options = -1;
-static int hf_ospf_v2_options_mt = -1;
-static int hf_ospf_v2_options_e = -1;
-static int hf_ospf_v2_options_mc = -1;
-static int hf_ospf_v2_options_n = -1;
-static int hf_ospf_v2_options_p = -1;
-static int hf_ospf_v2_options_l = -1;
-static int hf_ospf_v2_options_dc = -1;
-static int hf_ospf_v2_options_o = -1;
-static int hf_ospf_v2_options_dn = -1;
-
-static int hf_ospf_tlv_type_opaque = -1;
-
-static int hf_ospf_ri_options = -1;
+static int hf_ospf_adv_router;
+static int hf_ospf_ls_mpls;
+static int hf_ospf_ls_mpls_routerid;
+static int hf_ospf_ls_mpls_linktype;
+static int hf_ospf_ls_mpls_linkid;
+static int hf_ospf_ls_mpls_local_addr;
+static int hf_ospf_ls_mpls_remote_addr;
+static int hf_ospf_ls_mpls_local_ifid;
+static int hf_ospf_ls_mpls_remote_ifid;
+static int hf_ospf_ls_mpls_te_metric;
+static int hf_ospf_ls_mpls_linkcolor;
+static int hf_ospf_ls_mpls_group;
+static int hf_ospf_ls_mpls_link_max_bw;
+static int hf_ospf_ls_mpls_bc_model_id;
+static int hf_ospf_ls_oif_local_node_id;
+static int hf_ospf_ls_oif_remote_node_id;
+static int hf_ospf_v2_options;
+static int hf_ospf_v2_options_mt;
+static int hf_ospf_v2_options_e;
+static int hf_ospf_v2_options_mc;
+static int hf_ospf_v2_options_n;
+static int hf_ospf_v2_options_p;
+static int hf_ospf_v2_options_l;
+static int hf_ospf_v2_options_dc;
+static int hf_ospf_v2_options_o;
+static int hf_ospf_v2_options_dn;
+
+static int hf_ospf_tlv_type_opaque;
+
+static int hf_ospf_ri_options;
 /* OSPF Router Informational Capabilities Options */
-static int hf_ospf_ri_options_grc = -1;
-static int hf_ospf_ri_options_grh = -1;
-static int hf_ospf_ri_options_srs = -1;
-static int hf_ospf_ri_options_tes = -1;
-static int hf_ospf_ri_options_p2plan = -1;
-static int hf_ospf_ri_options_ete = -1;
-static int hf_ospf_ri_options_host = -1;
+static int hf_ospf_ri_options_grc;
+static int hf_ospf_ri_options_grh;
+static int hf_ospf_ri_options_srs;
+static int hf_ospf_ri_options_tes;
+static int hf_ospf_ri_options_p2plan;
+static int hf_ospf_ri_options_ete;
+static int hf_ospf_ri_options_host;
 
 /* OSPF Extended Link Opaque LSA */
-static int hf_ospf_ls_elink_tlv = -1;
-static int hf_ospf_ls_elink_stlv = -1;
-static int hf_ospf_ls_elink_mt_id = -1;
-static int hf_ospf_ls_elink_weight = -1;
-static int hf_ospf_ls_elink_nbr = -1;
-static int hf_ospf_ls_pfxsid_flags = -1;
-static int hf_ospf_ls_pfxsid_flag_np = -1;
-static int hf_ospf_ls_pfxsid_flag_m = -1;
-static int hf_ospf_ls_pfxsid_flag_e = -1;
-static int hf_ospf_ls_pfxsid_flag_v= -1;
-static int hf_ospf_ls_pfxsid_flag_l= -1;
-static int hf_ospf_ls_pfxsid_flag_unknown = -1;
-static int hf_ospf_ls_adjsid_flags = -1;
-static int hf_ospf_ls_adjsid_flag_b = -1;
-static int hf_ospf_ls_adjsid_flag_v = -1;
-static int hf_ospf_ls_adjsid_flag_l = -1;
-static int hf_ospf_ls_adjsid_flag_g = -1;
-static int hf_ospf_ls_adjsid_flag_p = -1;
-static int hf_ospf_ls_adjsid_flag_unknown = -1;
-static int hf_ospf_ls_app_sabm_length = -1;
-static int hf_ospf_ls_app_udabm_length = -1;
-static int hf_ospf_ls_app_sabm_bits = -1;
-static int hf_ospf_ls_app_sabm_bits_r = -1;
-static int hf_ospf_ls_app_sabm_bits_s = -1;
-static int hf_ospf_ls_app_sabm_bits_f = -1;
-static int hf_ospf_ls_app_sabm_bits_x = -1;
-static int hf_ospf_ls_app_udabm_bits = -1;
-static int hf_ospf_ls_app_link_attrs_stlv = -1;
-static int hf_ospf_ls_admin_group = -1;
-static int hf_ospf_ls_ext_admin_group = -1;
-static int hf_ospf_ls_unidir_link_flags = -1;
-static int hf_ospf_ls_unidir_link_flags_a = -1;
-static int hf_ospf_ls_unidir_link_flags_reserved = -1;
-static int hf_ospf_ls_unidir_link_delay = -1;
-static int hf_ospf_ls_unidir_link_reserved = -1;
-static int hf_ospf_ls_unidir_link_delay_min = -1;
-static int hf_ospf_ls_unidir_link_delay_max = -1;
-static int hf_ospf_ls_unidir_delay_variation = -1;
+static int hf_ospf_ls_elink_tlv;
+static int hf_ospf_ls_elink_stlv;
+static int hf_ospf_ls_elink_mt_id;
+static int hf_ospf_ls_elink_weight;
+static int hf_ospf_ls_elink_nbr;
+static int hf_ospf_ls_pfxsid_flags;
+static int hf_ospf_ls_pfxsid_flag_np;
+static int hf_ospf_ls_pfxsid_flag_m;
+static int hf_ospf_ls_pfxsid_flag_e;
+static int hf_ospf_ls_pfxsid_flag_v;
+static int hf_ospf_ls_pfxsid_flag_l;
+static int hf_ospf_ls_pfxsid_flag_unknown;
+static int hf_ospf_ls_adjsid_flags;
+static int hf_ospf_ls_adjsid_flag_b;
+static int hf_ospf_ls_adjsid_flag_v;
+static int hf_ospf_ls_adjsid_flag_l;
+static int hf_ospf_ls_adjsid_flag_g;
+static int hf_ospf_ls_adjsid_flag_p;
+static int hf_ospf_ls_adjsid_flag_unknown;
+static int hf_ospf_ls_app_sabm_length;
+static int hf_ospf_ls_app_udabm_length;
+static int hf_ospf_ls_app_sabm_bits;
+static int hf_ospf_ls_app_sabm_bits_r;
+static int hf_ospf_ls_app_sabm_bits_s;
+static int hf_ospf_ls_app_sabm_bits_f;
+static int hf_ospf_ls_app_sabm_bits_x;
+static int hf_ospf_ls_app_udabm_bits;
+static int hf_ospf_ls_app_link_attrs_stlv;
+static int hf_ospf_ls_admin_group;
+static int hf_ospf_ls_ext_admin_group;
+static int hf_ospf_ls_unidir_link_flags;
+static int hf_ospf_ls_unidir_link_flags_a;
+static int hf_ospf_ls_unidir_link_flags_reserved;
+static int hf_ospf_ls_unidir_link_delay;
+static int hf_ospf_ls_unidir_link_reserved;
+static int hf_ospf_ls_unidir_link_delay_min;
+static int hf_ospf_ls_unidir_link_delay_max;
+static int hf_ospf_ls_unidir_delay_variation;
 
 /* OSPF Extended Prefix Opaque LSA */
-static int hf_ospf_ls_epfx_tlv = -1;
-static int hf_ospf_ls_epfx_stlv = -1;
-static int hf_ospf_ls_epfx_route_type = -1;
-static int hf_ospf_ls_epfx_af = -1;
-static int hf_ospf_ls_epfx_flags = -1;
-static int hf_ospf_ls_epfx_flag_a = -1;
-static int hf_ospf_ls_epfx_flag_n = -1;
-static int hf_ospf_ls_epfx_flag_unknown = -1;
-static int hf_ospf_ls_epfx_range_flags = -1;
-static int hf_ospf_ls_epfx_range_flag_ia = -1;
-static int hf_ospf_ls_epfx_range_flag_unknown = -1;
+static int hf_ospf_ls_epfx_tlv;
+static int hf_ospf_ls_epfx_stlv;
+static int hf_ospf_ls_epfx_route_type;
+static int hf_ospf_ls_epfx_af;
+static int hf_ospf_ls_epfx_flags;
+static int hf_ospf_ls_epfx_flag_a;
+static int hf_ospf_ls_epfx_flag_n;
+static int hf_ospf_ls_epfx_flag_unknown;
+static int hf_ospf_ls_epfx_range_flags;
+static int hf_ospf_ls_epfx_range_flag_ia;
+static int hf_ospf_ls_epfx_range_flag_unknown;
 
 /* OSPF Dynamic Hostname support (RFC5642) */
-static int hf_ospf_v3_options = -1;
-static int hf_ospf_v3_options_v6 = -1;
-static int hf_ospf_v3_options_e = -1;
-static int hf_ospf_v3_options_mc = -1;
-static int hf_ospf_v3_options_n = -1;
-static int hf_ospf_v3_options_r = -1;
-static int hf_ospf_v3_options_dc = -1;
-static int hf_ospf_v3_options_af = -1;
-static int hf_ospf_v3_options_l = -1;
-static int hf_ospf_v3_options_at = -1;
-static int hf_ospf_dbd = -1;
-static int hf_ospf_dbd_r = -1;
-static int hf_ospf_dbd_i = -1;
-static int hf_ospf_dbd_m = -1;
-static int hf_ospf_dbd_ms = -1;
-static int hf_ospf_lls_ext_options = -1;
-static int hf_ospf_lls_ext_options_lr = -1;
-static int hf_ospf_lls_ext_options_rs = -1;
-static int hf_ospf_v2_router_lsa_flag = -1;
-static int hf_ospf_v2_router_lsa_flag_b = -1;
-static int hf_ospf_v2_router_lsa_flag_e = -1;
-static int hf_ospf_v2_router_lsa_flag_v = -1;
-static int hf_ospf_v2_router_lsa_flag_w = -1;
-static int hf_ospf_v2_router_lsa_flag_n = -1;
-static int hf_ospf_v2_router_lsa_flag_s = -1;
-static int hf_ospf_v2_router_lsa_flag_h = -1;
-static int hf_ospf_v3_router_lsa_flag = -1;
-static int hf_ospf_v3_router_lsa_flag_b = -1;
-static int hf_ospf_v3_router_lsa_flag_e = -1;
-static int hf_ospf_v3_router_lsa_flag_v = -1;
-static int hf_ospf_v3_router_lsa_flag_w = -1;
-static int hf_ospf_v3_as_external_flag = -1;
-static int hf_ospf_v3_as_external_flag_t = -1;
-static int hf_ospf_v3_as_external_flag_f = -1;
-static int hf_ospf_v3_as_external_flag_e = -1;
-static int hf_ospf_v3_prefix_option = -1;
-static int hf_ospf_v3_prefix_option_nu = -1;
-static int hf_ospf_v3_prefix_option_la = -1;
-static int hf_ospf_v3_prefix_option_mc = -1;
-static int hf_ospf_v3_prefix_option_p = -1;
-static int hf_ospf_dyn_hostname = -1;
-static int hf_ospf_lsa_sa = -1;
-static int hf_ospf_ls_slr_stlv = -1;
-static int hf_ospf_ls_range_size = -1;
-static int hf_ospf_ls_sid_label = -1;
-static int hf_ospf_ls_preference = -1;
-static int hf_ospf_ls_igp_msd_type = -1;
-static int hf_ospf_ls_igp_msd_value = -1;
-static int hf_ospf_ls_remote_ipv4_addr = -1;
-static int hf_ospf_ls_local_interface_id = -1;
-static int hf_ospf_ls_remote_interface_id = -1;
-static int hf_ospf_ls_fad_flex_algorithm = -1;
-static int hf_ospf_ls_fad_metric_type = -1;
-static int hf_ospf_ls_fad_calc_type = -1;
-static int hf_ospf_ls_fad_priority = -1;
-static int hf_ospf_ls_fad_stlv = -1;
-static int hf_ospf_unknown_tlv = -1;
-static int hf_ospf_v2_grace_tlv = -1;
-static int hf_ospf_v2_grace_period = -1;
-static int hf_ospf_v2_grace_reason = -1;
-static int hf_ospf_v2_grace_ip = -1;
-static int hf_ospf_v3_lls_ext_options_tlv = -1;
-static int hf_ospf_v3_lls_ext_options = -1;
-static int hf_ospf_v3_lls_ext_options_lr = -1;
-static int hf_ospf_v3_lls_ext_options_rs = -1;
-static int hf_ospf_v3_lls_state_tlv = -1;
-static int hf_ospf_v3_lls_state_scs = -1;
-static int hf_ospf_v3_lls_state_options = -1;
-static int hf_ospf_v3_lls_state_options_r = -1;
-static int hf_ospf_v3_lls_state_options_a = -1;
-static int hf_ospf_v3_lls_state_options_n = -1;
-static int hf_ospf_v3_lls_drop_tlv = -1;
-static int hf_ospf_v3_lls_relay_tlv = -1;
-static int hf_ospf_v3_lls_relay_added = -1;
-static int hf_ospf_v3_lls_relay_options = -1;
-static int hf_ospf_v3_lls_relay_options_a = -1;
-static int hf_ospf_v3_lls_relay_options_n = -1;
-static int hf_ospf_v3_lls_willingness_tlv = -1;
-static int hf_ospf_v3_lls_willingness = -1;
-static int hf_ospf_v3_lls_rf_tlv = -1;
-static int hf_ospf_v3_lls_fsf_tlv = -1;
-
-static int hf_ospf_header = -1;
-static int hf_ospf_header_version = -1;
-static int hf_ospf_header_msg_type = -1;
-static int hf_ospf_header_packet_length = -1;
-static int hf_ospf_header_src_router = -1;
-static int hf_ospf_header_area_id = -1;
-static int hf_ospf_header_checksum = -1;
-static int hf_ospf_tlv_type = -1;
-static int hf_ospf_tlv_length = -1;
+static int hf_ospf_v3_options;
+static int hf_ospf_v3_options_v6;
+static int hf_ospf_v3_options_e;
+static int hf_ospf_v3_options_mc;
+static int hf_ospf_v3_options_n;
+static int hf_ospf_v3_options_r;
+static int hf_ospf_v3_options_dc;
+static int hf_ospf_v3_options_af;
+static int hf_ospf_v3_options_l;
+static int hf_ospf_v3_options_at;
+static int hf_ospf_dbd;
+static int hf_ospf_dbd_r;
+static int hf_ospf_dbd_i;
+static int hf_ospf_dbd_m;
+static int hf_ospf_dbd_ms;
+static int hf_ospf_lls_ext_options;
+static int hf_ospf_lls_ext_options_lr;
+static int hf_ospf_lls_ext_options_rs;
+static int hf_ospf_v2_router_lsa_flag;
+static int hf_ospf_v2_router_lsa_flag_b;
+static int hf_ospf_v2_router_lsa_flag_e;
+static int hf_ospf_v2_router_lsa_flag_v;
+static int hf_ospf_v2_router_lsa_flag_w;
+static int hf_ospf_v2_router_lsa_flag_n;
+static int hf_ospf_v2_router_lsa_flag_s;
+static int hf_ospf_v2_router_lsa_flag_h;
+static int hf_ospf_v3_router_lsa_flag;
+static int hf_ospf_v3_router_lsa_flag_b;
+static int hf_ospf_v3_router_lsa_flag_e;
+static int hf_ospf_v3_router_lsa_flag_v;
+static int hf_ospf_v3_router_lsa_flag_w;
+static int hf_ospf_v3_as_external_flag;
+static int hf_ospf_v3_as_external_flag_t;
+static int hf_ospf_v3_as_external_flag_f;
+static int hf_ospf_v3_as_external_flag_e;
+static int hf_ospf_v3_prefix_option;
+static int hf_ospf_v3_prefix_option_nu;
+static int hf_ospf_v3_prefix_option_la;
+static int hf_ospf_v3_prefix_option_mc;
+static int hf_ospf_v3_prefix_option_p;
+static int hf_ospf_dyn_hostname;
+static int hf_ospf_lsa_sa;
+static int hf_ospf_ls_slr_stlv;
+static int hf_ospf_ls_range_size;
+static int hf_ospf_ls_sid_label;
+static int hf_ospf_ls_preference;
+static int hf_ospf_ls_igp_msd_type;
+static int hf_ospf_ls_igp_msd_value;
+static int hf_ospf_ls_remote_ipv4_addr;
+static int hf_ospf_ls_local_interface_id;
+static int hf_ospf_ls_remote_interface_id;
+static int hf_ospf_ls_fad_flex_algorithm;
+static int hf_ospf_ls_fad_metric_type;
+static int hf_ospf_ls_fad_calc_type;
+static int hf_ospf_ls_fad_priority;
+static int hf_ospf_ls_fad_stlv;
+static int hf_ospf_unknown_tlv;
+static int hf_ospf_v2_grace_tlv;
+static int hf_ospf_v2_grace_period;
+static int hf_ospf_v2_grace_reason;
+static int hf_ospf_v2_grace_ip;
+static int hf_ospf_v3_lls_ext_options_tlv;
+static int hf_ospf_v3_lls_ext_options;
+static int hf_ospf_v3_lls_ext_options_lr;
+static int hf_ospf_v3_lls_ext_options_rs;
+static int hf_ospf_v3_lls_state_tlv;
+static int hf_ospf_v3_lls_state_scs;
+static int hf_ospf_v3_lls_state_options;
+static int hf_ospf_v3_lls_state_options_r;
+static int hf_ospf_v3_lls_state_options_a;
+static int hf_ospf_v3_lls_state_options_n;
+static int hf_ospf_v3_lls_drop_tlv;
+static int hf_ospf_v3_lls_relay_tlv;
+static int hf_ospf_v3_lls_relay_added;
+static int hf_ospf_v3_lls_relay_options;
+static int hf_ospf_v3_lls_relay_options_a;
+static int hf_ospf_v3_lls_relay_options_n;
+static int hf_ospf_v3_lls_willingness_tlv;
+static int hf_ospf_v3_lls_willingness;
+static int hf_ospf_v3_lls_rf_tlv;
+static int hf_ospf_v3_lls_fsf_tlv;
+
+static int hf_ospf_header;
+static int hf_ospf_header_version;
+static int hf_ospf_header_msg_type;
+static int hf_ospf_header_packet_length;
+static int hf_ospf_header_src_router;
+static int hf_ospf_header_area_id;
+static int hf_ospf_header_checksum;
+static int hf_ospf_tlv_type;
+static int hf_ospf_tlv_length;
 
 
 /* Header OSPF v2 auth */
-static int hf_ospf_header_auth_type = -1;
-static int hf_ospf_header_auth_data_none = -1;
-static int hf_ospf_header_auth_data_simple = -1;
-static int hf_ospf_header_auth_crypt_key_id = -1;
-static int hf_ospf_header_auth_crypt_data_length = -1;
-static int hf_ospf_header_auth_crypt_seq_nbr = -1;
-static int hf_ospf_header_auth_crypt_data = -1;
-static int hf_ospf_header_auth_data_unknown = -1;
+static int hf_ospf_header_auth_type;
+static int hf_ospf_header_auth_data_none;
+static int hf_ospf_header_auth_data_simple;
+static int hf_ospf_header_auth_crypt_key_id;
+static int hf_ospf_header_auth_crypt_data_length;
+static int hf_ospf_header_auth_crypt_seq_nbr;
+static int hf_ospf_header_auth_crypt_data;
+static int hf_ospf_header_auth_data_unknown;
 
 /* Header OSPF v3 */
-static int hf_ospf_header_instance_id = -1;
-static int hf_ospf_header_reserved = -1;
+static int hf_ospf_header_instance_id;
+static int hf_ospf_header_reserved;
 
 /* Hello */
-static int hf_ospf_hello = -1;
-static int hf_ospf_hello_network_mask = -1;
-static int hf_ospf_hello_interface_id = -1;
-static int hf_ospf_hello_hello_interval = -1;
-static int hf_ospf_hello_router_priority = -1;
-static int hf_ospf_hello_router_dead_interval = -1;
-static int hf_ospf_hello_designated_router = -1;
-static int hf_ospf_hello_backup_designated_router = -1;
-static int hf_ospf_hello_active_neighbor = -1;
+static int hf_ospf_hello;
+static int hf_ospf_hello_network_mask;
+static int hf_ospf_hello_interface_id;
+static int hf_ospf_hello_hello_interval;
+static int hf_ospf_hello_router_priority;
+static int hf_ospf_hello_router_dead_interval;
+static int hf_ospf_hello_designated_router;
+static int hf_ospf_hello_backup_designated_router;
+static int hf_ospf_hello_active_neighbor;
 
 /* Authentication Trailer RFC6506 */
-static int hf_ospf_at = -1;
-static int hf_ospf_at_auth_type = -1;
-static int hf_ospf_at_auth_data_len = -1;
-static int hf_ospf_at_reserved = -1;
-static int hf_ospf_at_sa_id = -1;
-static int hf_ospf_at_crypto_seq_nbr = -1;
-static int hf_ospf_at_auth_data = -1;
+static int hf_ospf_at;
+static int hf_ospf_at_auth_type;
+static int hf_ospf_at_auth_data_len;
+static int hf_ospf_at_reserved;
+static int hf_ospf_at_sa_id;
+static int hf_ospf_at_crypto_seq_nbr;
+static int hf_ospf_at_auth_data;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_ospf_referenced_advertising_router = -1;
-static int hf_ospf_v3_lsa_referenced_link_state_id = -1;
-static int hf_ospf_mpls_protection_capability = -1;
-static int hf_ospf_oif_encoding = -1;
-static int hf_ospf_ls_id_te_lsa_reserved = -1;
-static int hf_ospf_db_interface_mtu = -1;
-static int hf_ospf_v3_lls_full_state_for = -1;
-static int hf_ospf_v3_lsa_interface_id = -1;
-static int hf_ospf_v3_lsa_router_priority = -1;
-static int hf_ospf_v3_lsa_forwarding_address_ipv6 = -1;
-static int hf_ospf_v3_lls_dropped_neighbor = -1;
-static int hf_ospf_v3_lsa_external_route_tag = -1;
-static int hf_ospf_tna_addr = -1;
-static int hf_ospf_v3_lsa_neighbor_router_id = -1;
-static int hf_ospf_mpls_switching_type = -1;
-static int hf_ospf_oif_tna_addr_length = -1;
-static int hf_ospf_oif_tna_addr_ipv4 = -1;
-static int hf_ospf_link_state_id = -1;
-static int hf_ospf_ls_id_opaque_id = -1;
-static int hf_ospf_v2_lls_sequence_number = -1;
-static int hf_ospf_v3_lsa_do_not_age = -1;
-static int hf_ospf_lls_data_length = -1;
-static int hf_ospf_mpls_shared_risk_link_group = -1;
-static int hf_ospf_db_dd_sequence = -1;
-static int hf_ospf_v3_lsa_destination_router_id = -1;
-static int hf_ospf_tna_addr_ipv6 = -1;
-static int hf_ospf_v3_lsa_link_local_interface_address = -1;
-static int hf_ospf_mpls_interface_mtu = -1;
-static int hf_ospf_v3_lsa_neighbor_interface_id = -1;
-static int hf_ospf_lsa_number_of_links = -1;
-static int hf_ospf_v2_lls_auth_data = -1;
-static int hf_ospf_v2_lls_li_id = -1;
-static int hf_ospf_oif_switching_cap = -1;
-static int hf_ospf_ls_number_of_lsas = -1;
-static int hf_ospf_v3_lls_neighbor = -1;
-static int hf_ospf_v3_lls_request_from = -1;
-static int hf_ospf_lls_checksum = -1;
-static int hf_ospf_v3_lsa_attached_router = -1;
-static int hf_ospf_v3_lsa_referenced_ls_type = -1;
-static int hf_ospf_mpls_encoding = -1;
-static int hf_ospf_mpls_num_labels = -1;
-static int hf_ospf_lsa_external_type = -1;
-static int hf_ospf_lsa_tos = -1;
-static int hf_ospf_lsa_external_tos = -1;
-static int hf_ospf_v3_lsa_type = -1;
-static int hf_ospf_metric = -1;
-static int hf_ospf_prefix_length = -1;
-static int hf_ospf_ls_mpls_pri = -1;
-static int hf_ospf_ls_mpls_bc = -1;
-static int hf_ospf_mpls_action = -1;
-static int hf_ospf_mpls_bandwidth_type = -1;
-static int hf_ospf_mpls_bitmap = -1;
-static int hf_ospf_mpls_grid = -1;
-static int hf_ospf_mpls_cs2 = -1;
-static int hf_ospf_mpls_n = -1;
-static int hf_ospf_mpls_cs = -1;
-static int hf_ospf_mpls_length = -1;
-static int hf_ospf_mpls_minimum_lsp_bandwidth = -1;
-static int hf_ospf_mpls_pri = -1;
-static int hf_ospf_mpls_sonet_sdh = -1;
-static int hf_ospf_mpls_starting = -1;
-static int hf_ospf_mpls_no_effective_bits = -1;
-static int hf_ospf_mpls_type = -1;
-static int hf_ospf_oif_signal_type = -1;
-static int hf_ospf_tlv_value = -1;
-static int hf_ospf_oif_node_id = -1;
-static int hf_ospf_pad_bytes = -1;
-static int hf_ospf_ls_metric = -1;
-static int hf_ospf_v3_lsa_forwarding_address_ipv4 = -1;
-static int hf_ospf_link_local_interface_address_ipv4 = -1;
-static int hf_ospf_v3_lsa_num_prefixes = -1;
-static int hf_ospf_v3_address_prefix_ipv6 = -1;
-static int hf_ospf_v3_address_prefix_ipv4 = -1;
-
-static expert_field ei_ospf_header_reserved = EI_INIT;
-static expert_field ei_ospf_lsa_bad_length = EI_INIT;
-static expert_field ei_ospf_lsa_constraint_missing = EI_INIT;
-static expert_field ei_ospf_lsa_bc_error = EI_INIT;
-static expert_field ei_ospf_lsa_unknown_type = EI_INIT;
-static expert_field ei_ospf_unknown_link_subtype = EI_INIT;
-static expert_field ei_ospf_stlv_length_invalid = EI_INIT;
+static int hf_ospf_referenced_advertising_router;
+static int hf_ospf_v3_lsa_referenced_link_state_id;
+static int hf_ospf_mpls_protection_capability;
+static int hf_ospf_oif_encoding;
+static int hf_ospf_ls_id_te_lsa_reserved;
+static int hf_ospf_db_interface_mtu;
+static int hf_ospf_v3_lls_full_state_for;
+static int hf_ospf_v3_lsa_interface_id;
+static int hf_ospf_v3_lsa_router_priority;
+static int hf_ospf_v3_lsa_forwarding_address_ipv6;
+static int hf_ospf_v3_lls_dropped_neighbor;
+static int hf_ospf_v3_lsa_external_route_tag;
+static int hf_ospf_tna_addr;
+static int hf_ospf_v3_lsa_neighbor_router_id;
+static int hf_ospf_mpls_switching_type;
+static int hf_ospf_oif_tna_addr_length;
+static int hf_ospf_oif_tna_addr_ipv4;
+static int hf_ospf_link_state_id;
+static int hf_ospf_ls_id_opaque_id;
+static int hf_ospf_v2_lls_sequence_number;
+static int hf_ospf_v3_lsa_do_not_age;
+static int hf_ospf_lls_data_length;
+static int hf_ospf_mpls_shared_risk_link_group;
+static int hf_ospf_db_dd_sequence;
+static int hf_ospf_v3_lsa_destination_router_id;
+static int hf_ospf_tna_addr_ipv6;
+static int hf_ospf_v3_lsa_link_local_interface_address;
+static int hf_ospf_mpls_interface_mtu;
+static int hf_ospf_v3_lsa_neighbor_interface_id;
+static int hf_ospf_lsa_number_of_links;
+static int hf_ospf_v2_lls_auth_data;
+static int hf_ospf_v2_lls_li_id;
+static int hf_ospf_oif_switching_cap;
+static int hf_ospf_ls_number_of_lsas;
+static int hf_ospf_v3_lls_neighbor;
+static int hf_ospf_v3_lls_request_from;
+static int hf_ospf_lls_checksum;
+static int hf_ospf_v3_lsa_attached_router;
+static int hf_ospf_v3_lsa_referenced_ls_type;
+static int hf_ospf_mpls_encoding;
+static int hf_ospf_mpls_num_labels;
+static int hf_ospf_lsa_external_type;
+static int hf_ospf_lsa_tos;
+static int hf_ospf_lsa_external_tos;
+static int hf_ospf_v3_lsa_type;
+static int hf_ospf_metric;
+static int hf_ospf_prefix_length;
+static int hf_ospf_ls_mpls_pri;
+static int hf_ospf_ls_mpls_bc;
+static int hf_ospf_mpls_action;
+static int hf_ospf_mpls_bandwidth_type;
+static int hf_ospf_mpls_bitmap;
+static int hf_ospf_mpls_grid;
+static int hf_ospf_mpls_cs2;
+static int hf_ospf_mpls_n;
+static int hf_ospf_mpls_cs;
+static int hf_ospf_mpls_length;
+static int hf_ospf_mpls_minimum_lsp_bandwidth;
+static int hf_ospf_mpls_pri;
+static int hf_ospf_mpls_sonet_sdh;
+static int hf_ospf_mpls_starting;
+static int hf_ospf_mpls_no_effective_bits;
+static int hf_ospf_mpls_type;
+static int hf_ospf_oif_signal_type;
+static int hf_ospf_tlv_value;
+static int hf_ospf_oif_node_id;
+static int hf_ospf_pad_bytes;
+static int hf_ospf_ls_metric;
+static int hf_ospf_v3_lsa_forwarding_address_ipv4;
+static int hf_ospf_link_local_interface_address_ipv4;
+static int hf_ospf_v3_lsa_num_prefixes;
+static int hf_ospf_v3_address_prefix_ipv6;
+static int hf_ospf_v3_address_prefix_ipv4;
+
+static expert_field ei_ospf_header_reserved;
+static expert_field ei_ospf_lsa_bad_length;
+static expert_field ei_ospf_lsa_constraint_missing;
+static expert_field ei_ospf_lsa_bc_error;
+static expert_field ei_ospf_lsa_unknown_type;
+static expert_field ei_ospf_unknown_link_subtype;
+static expert_field ei_ospf_stlv_length_invalid;
 
 static gint ospf_msg_type_to_filter (guint8 msg_type)
 {
diff --git a/epan/dissectors/packet-ossp.c b/epan/dissectors/packet-ossp.c
index 2a8a0671d4..22b6a17f14 100644
--- a/epan/dissectors/packet-ossp.c
+++ b/epan/dissectors/packet-ossp.c
@@ -181,46 +181,46 @@ static const value_string *esmc_quality_level_vals_short[] = {
 };
 
 /* Initialise the protocol and registered fields */
-static int proto_ossp = -1;
-
-static int hf_ossp_oui = -1;
-static int hf_itu_subtype = -1;
-static int hf_esmc_version = -1;
-static int hf_esmc_event_flag = -1;
-static int hf_esmc_reserved_bits = -1;
-static int hf_esmc_reserved_octets = -1;
-static int hf_esmc_tlv = -1;
-static int hf_esmc_tlv_type = -1;
-static int hf_esmc_tlv_length = -1;
-static int hf_esmc_tlv_ql_unused = -1;
-static int hf_esmc_tlv_ql_ssm = -1;
-static int hf_esmc_tlv_ext_ql_essm = -1;
-static int hf_esmc_tlv_ext_ql_clockid = -1;
-static int hf_esmc_tlv_ext_ql_flag_reserved = -1;
-static int hf_esmc_tlv_ext_ql_flag_chain = -1;
-static int hf_esmc_tlv_ext_ql_flag_mixed = -1;
-static int hf_esmc_tlv_ext_ql_eeec = -1;
-static int hf_esmc_tlv_ext_ql_eec = -1;
-static int hf_esmc_tlv_ext_ql_reserved = -1;
-static int hf_esmc_quality_level = -1;
-static int hf_esmc_padding = -1;
+static int proto_ossp;
+
+static int hf_ossp_oui;
+static int hf_itu_subtype;
+static int hf_esmc_version;
+static int hf_esmc_event_flag;
+static int hf_esmc_reserved_bits;
+static int hf_esmc_reserved_octets;
+static int hf_esmc_tlv;
+static int hf_esmc_tlv_type;
+static int hf_esmc_tlv_length;
+static int hf_esmc_tlv_ql_unused;
+static int hf_esmc_tlv_ql_ssm;
+static int hf_esmc_tlv_ext_ql_essm;
+static int hf_esmc_tlv_ext_ql_clockid;
+static int hf_esmc_tlv_ext_ql_flag_reserved;
+static int hf_esmc_tlv_ext_ql_flag_chain;
+static int hf_esmc_tlv_ext_ql_flag_mixed;
+static int hf_esmc_tlv_ext_ql_eeec;
+static int hf_esmc_tlv_ext_ql_eec;
+static int hf_esmc_tlv_ext_ql_reserved;
+static int hf_esmc_quality_level;
+static int hf_esmc_padding;
 
 /* Initialise the subtree pointers */
 
-static gint ett_ossppdu = -1;
-static gint ett_itu_ossp = -1;
+static gint ett_ossppdu;
+static gint ett_itu_ossp;
 
-static gint ett_esmc = -1;
+static gint ett_esmc;
 
-static expert_field ei_esmc_tlv_type_ql_type_not_first = EI_INIT;
-static expert_field ei_esmc_tlv_type_not_ext_ql = EI_INIT;
-static expert_field ei_esmc_quality_level_invalid = EI_INIT;
-static expert_field ei_esmc_tlv_ql_unused_not_zero = EI_INIT;
-static expert_field ei_esmc_tlv_type_decoded_as_ext_ql = EI_INIT;
-static expert_field ei_esmc_tlv_type_decoded_as_ql_type = EI_INIT;
-static expert_field ei_esmc_version_compliance = EI_INIT;
-static expert_field ei_esmc_tlv_length_bad = EI_INIT;
-static expert_field ei_esmc_reserved_not_zero = EI_INIT;
+static expert_field ei_esmc_tlv_type_ql_type_not_first;
+static expert_field ei_esmc_tlv_type_not_ext_ql;
+static expert_field ei_esmc_quality_level_invalid;
+static expert_field ei_esmc_tlv_ql_unused_not_zero;
+static expert_field ei_esmc_tlv_type_decoded_as_ext_ql;
+static expert_field ei_esmc_tlv_type_decoded_as_ql_type;
+static expert_field ei_esmc_version_compliance;
+static expert_field ei_esmc_tlv_length_bad;
+static expert_field ei_esmc_reserved_not_zero;
 
 static gint pref_option_network = 1;
 static const enum_val_t pref_option_network_vals[] =
diff --git a/epan/dissectors/packet-ouch.c b/epan/dissectors/packet-ouch.c
index 41fee46294..6bc04efee8 100644
--- a/epan/dissectors/packet-ouch.c
+++ b/epan/dissectors/packet-ouch.c
@@ -257,49 +257,49 @@ static const value_string ouch_trade_correction_reason_val[] = {
 
 
 /* Initialize the protocol and registered fields */
-static int proto_ouch = -1;
+static int proto_ouch;
 static dissector_handle_t ouch_handle;
 
 /* Initialize the subtree pointers */
-static gint ett_ouch = -1;
-
-static int hf_ouch_bbo_weight_indicator = -1;
-static int hf_ouch_broken_trade_reason = -1;
-static int hf_ouch_buy_sell_indicator = -1;
-static int hf_ouch_cancel_reason = -1;
-static int hf_ouch_capacity = -1;
-static int hf_ouch_cross_type = -1;
-static int hf_ouch_customer_type = -1;
-static int hf_ouch_decrement_shares = -1;
-static int hf_ouch_display = -1;
-static int hf_ouch_event_code = -1;
-static int hf_ouch_executed_shares = -1;
-static int hf_ouch_execution_price = -1;
-static int hf_ouch_existing_order_token = -1;
-static int hf_ouch_firm = -1;
-static int hf_ouch_iso_eligible = -1;
-static int hf_ouch_liquidity_flag = -1;
-static int hf_ouch_match_number = -1;
-static int hf_ouch_message = -1;
-static int hf_ouch_min_quantity = -1;
-static int hf_ouch_new_execution_price = -1;
-static int hf_ouch_order_reference_number = -1;
-static int hf_ouch_order_state = -1;
-static int hf_ouch_order_token = -1;
-static int hf_ouch_packet_type = -1;
-static int hf_ouch_previous_order_token = -1;
-static int hf_ouch_price = -1;
-static int hf_ouch_price_correction_reason = -1;
-static int hf_ouch_quantity_prevented_from_trading = -1;
-static int hf_ouch_reference_price = -1;
-static int hf_ouch_reference_price_type = -1;
-static int hf_ouch_reject_reason = -1;
-static int hf_ouch_replacement_order_token = -1;
-static int hf_ouch_shares = -1;
-static int hf_ouch_stock = -1;
-static int hf_ouch_tif = -1;
-static int hf_ouch_timestamp = -1;
-static int hf_ouch_trade_correction_reason = -1;
+static gint ett_ouch;
+
+static int hf_ouch_bbo_weight_indicator;
+static int hf_ouch_broken_trade_reason;
+static int hf_ouch_buy_sell_indicator;
+static int hf_ouch_cancel_reason;
+static int hf_ouch_capacity;
+static int hf_ouch_cross_type;
+static int hf_ouch_customer_type;
+static int hf_ouch_decrement_shares;
+static int hf_ouch_display;
+static int hf_ouch_event_code;
+static int hf_ouch_executed_shares;
+static int hf_ouch_execution_price;
+static int hf_ouch_existing_order_token;
+static int hf_ouch_firm;
+static int hf_ouch_iso_eligible;
+static int hf_ouch_liquidity_flag;
+static int hf_ouch_match_number;
+static int hf_ouch_message;
+static int hf_ouch_min_quantity;
+static int hf_ouch_new_execution_price;
+static int hf_ouch_order_reference_number;
+static int hf_ouch_order_state;
+static int hf_ouch_order_token;
+static int hf_ouch_packet_type;
+static int hf_ouch_previous_order_token;
+static int hf_ouch_price;
+static int hf_ouch_price_correction_reason;
+static int hf_ouch_quantity_prevented_from_trading;
+static int hf_ouch_reference_price;
+static int hf_ouch_reference_price_type;
+static int hf_ouch_reject_reason;
+static int hf_ouch_replacement_order_token;
+static int hf_ouch_shares;
+static int hf_ouch_stock;
+static int hf_ouch_tif;
+static int hf_ouch_timestamp;
+static int hf_ouch_trade_correction_reason;
 
 
 /** Format an OUCH timestamp into a useful string
diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c
index 9a8ec9f8a4..51b6389a89 100644
--- a/epan/dissectors/packet-p_mul.c
+++ b/epan/dissectors/packet-p_mul.c
@@ -67,105 +67,105 @@ void proto_reg_handoff_p_mul(void);
 #define DECODE_BER       1
 #define DECODE_CDT       2
 
-static int proto_p_mul = -1;
-
-static int hf_length = -1;
-static int hf_priority = -1;
-static int hf_map_first = -1;
-static int hf_map_last = -1;
-static int hf_map_unused = -1;
-static int hf_pdu_type = -1;
-static int hf_pdu_type_value = -1;
-static int hf_no_pdus = -1;
-static int hf_seq_no = -1;
-static int hf_unused8 = -1;
-static int hf_unused16 = -1;
-static int hf_checksum = -1;
-static int hf_checksum_good = -1;
-static int hf_checksum_bad = -1;
-static int hf_source_id_ack = -1;
-static int hf_source_id = -1;
-static int hf_message_id = -1;
-static int hf_expiry_time = -1;
-static int hf_mc_group = -1;
-static int hf_ann_mc_group = -1;
-static int hf_fec_len = -1;
-static int hf_fec_id = -1;
-static int hf_fec_parameters = -1;
-static int hf_count_of_dest = -1;
-static int hf_length_of_res = -1;
-static int hf_ack_count = -1;
-static int hf_ack_entry = -1;
-static int hf_ack_length = -1;
-static int hf_miss_seq_no = -1;
-static int hf_miss_seq_range = -1;
-static int hf_miss_seq_range_from = -1;
-static int hf_miss_seq_range_delimiter = -1;
-static int hf_miss_seq_range_to = -1;
-static int hf_tot_miss_seq_no = -1;
-static int hf_timestamp_option = -1;
-static int hf_dest_entry = -1;
-static int hf_dest_id = -1;
-static int hf_msg_seq_no = -1;
-static int hf_sym_key = -1;
-static int hf_data_fragment = -1;
-
-static int hf_msg_fragments = -1;
-static int hf_msg_fragment = -1;
-static int hf_msg_fragment_overlap = -1;
-static int hf_msg_fragment_overlap_conflicts = -1;
-static int hf_msg_fragment_multiple_tails = -1;
-static int hf_msg_fragment_too_long_fragment = -1;
-static int hf_msg_fragment_error = -1;
-static int hf_msg_fragment_count = -1;
-static int hf_msg_reassembled_in = -1;
-static int hf_msg_reassembled_length = -1;
-
-static int hf_analysis_ack_time = -1;
-static int hf_analysis_trans_time = -1;
-static int hf_analysis_retrans_time = -1;
-static int hf_analysis_total_retrans_time = -1;
-static int hf_analysis_last_pdu_num = -1;
-static int hf_analysis_addr_pdu_num = -1;
-static int hf_analysis_acks_addr_pdu_num = -1;
-static int hf_analysis_acks_acked_addr_pdu_num = -1;
-static int hf_analysis_addr_pdu_time = -1;
-static int hf_analysis_prev_pdu_num = -1;
-static int hf_analysis_prev_pdu_time = -1;
-static int hf_analysis_retrans_no = -1;
-static int hf_analysis_ack_num = -1;
-static int hf_analysis_ack_missing = -1;
-static int hf_analysis_ack_dup_no = -1;
-static int hf_analysis_msg_resend_from = -1;
-static int hf_analysis_ack_resend_from = -1;
-static int hf_analysis_total_time = -1;
-
-static gint ett_p_mul = -1;
-static gint ett_pdu_type = -1;
-static gint ett_dest_entry = -1;
-static gint ett_ack_entry = -1;
-static gint ett_range_entry = -1;
-static gint ett_checksum = -1;
-static gint ett_seq_analysis = -1;
-static gint ett_ack_analysis = -1;
-static gint ett_seq_ack_analysis = -1;
-static gint ett_msg_fragment = -1;
-static gint ett_msg_fragments = -1;
-
-static expert_field ei_more_data = EI_INIT;
-static expert_field ei_checksum_bad = EI_INIT;
-static expert_field ei_illegal_seq_no = EI_INIT;
-static expert_field ei_tot_miss_seq_no = EI_INIT;
-static expert_field ei_miss_seq_no = EI_INIT;
-static expert_field ei_analysis_ack_missing = EI_INIT;
-static expert_field ei_miss_seq_range = EI_INIT;
-static expert_field ei_address_pdu_missing = EI_INIT;
-static expert_field ei_analysis_ack_dup_no = EI_INIT;
-static expert_field ei_length = EI_INIT;
-static expert_field ei_analysis_prev_pdu_missing = EI_INIT;
-static expert_field ei_message_discarded = EI_INIT;
-static expert_field ei_ack_length = EI_INIT;
-static expert_field ei_analysis_retrans_no = EI_INIT;
+static int proto_p_mul;
+
+static int hf_length;
+static int hf_priority;
+static int hf_map_first;
+static int hf_map_last;
+static int hf_map_unused;
+static int hf_pdu_type;
+static int hf_pdu_type_value;
+static int hf_no_pdus;
+static int hf_seq_no;
+static int hf_unused8;
+static int hf_unused16;
+static int hf_checksum;
+static int hf_checksum_good;
+static int hf_checksum_bad;
+static int hf_source_id_ack;
+static int hf_source_id;
+static int hf_message_id;
+static int hf_expiry_time;
+static int hf_mc_group;
+static int hf_ann_mc_group;
+static int hf_fec_len;
+static int hf_fec_id;
+static int hf_fec_parameters;
+static int hf_count_of_dest;
+static int hf_length_of_res;
+static int hf_ack_count;
+static int hf_ack_entry;
+static int hf_ack_length;
+static int hf_miss_seq_no;
+static int hf_miss_seq_range;
+static int hf_miss_seq_range_from;
+static int hf_miss_seq_range_delimiter;
+static int hf_miss_seq_range_to;
+static int hf_tot_miss_seq_no;
+static int hf_timestamp_option;
+static int hf_dest_entry;
+static int hf_dest_id;
+static int hf_msg_seq_no;
+static int hf_sym_key;
+static int hf_data_fragment;
+
+static int hf_msg_fragments;
+static int hf_msg_fragment;
+static int hf_msg_fragment_overlap;
+static int hf_msg_fragment_overlap_conflicts;
+static int hf_msg_fragment_multiple_tails;
+static int hf_msg_fragment_too_long_fragment;
+static int hf_msg_fragment_error;
+static int hf_msg_fragment_count;
+static int hf_msg_reassembled_in;
+static int hf_msg_reassembled_length;
+
+static int hf_analysis_ack_time;
+static int hf_analysis_trans_time;
+static int hf_analysis_retrans_time;
+static int hf_analysis_total_retrans_time;
+static int hf_analysis_last_pdu_num;
+static int hf_analysis_addr_pdu_num;
+static int hf_analysis_acks_addr_pdu_num;
+static int hf_analysis_acks_acked_addr_pdu_num;
+static int hf_analysis_addr_pdu_time;
+static int hf_analysis_prev_pdu_num;
+static int hf_analysis_prev_pdu_time;
+static int hf_analysis_retrans_no;
+static int hf_analysis_ack_num;
+static int hf_analysis_ack_missing;
+static int hf_analysis_ack_dup_no;
+static int hf_analysis_msg_resend_from;
+static int hf_analysis_ack_resend_from;
+static int hf_analysis_total_time;
+
+static gint ett_p_mul;
+static gint ett_pdu_type;
+static gint ett_dest_entry;
+static gint ett_ack_entry;
+static gint ett_range_entry;
+static gint ett_checksum;
+static gint ett_seq_analysis;
+static gint ett_ack_analysis;
+static gint ett_seq_ack_analysis;
+static gint ett_msg_fragment;
+static gint ett_msg_fragments;
+
+static expert_field ei_more_data;
+static expert_field ei_checksum_bad;
+static expert_field ei_illegal_seq_no;
+static expert_field ei_tot_miss_seq_no;
+static expert_field ei_miss_seq_no;
+static expert_field ei_analysis_ack_missing;
+static expert_field ei_miss_seq_range;
+static expert_field ei_address_pdu_missing;
+static expert_field ei_analysis_ack_dup_no;
+static expert_field ei_length;
+static expert_field ei_analysis_prev_pdu_missing;
+static expert_field ei_message_discarded;
+static expert_field ei_ack_length;
+static expert_field ei_analysis_retrans_no;
 
 static dissector_handle_t p_mul_handle = NULL;
 
diff --git a/epan/dissectors/packet-pa-hbbackup.c b/epan/dissectors/packet-pa-hbbackup.c
index b51bca5fcf..6055e97b96 100644
--- a/epan/dissectors/packet-pa-hbbackup.c
+++ b/epan/dissectors/packet-pa-hbbackup.c
@@ -28,12 +28,12 @@ void proto_register_hbbak(void);
 
 #define HBBAK_SIZE 8
 
-static int proto_hbbak = -1;
-static int hf_hbbak_unknown1 = -1;
-static int hf_hbbak_etype_outer = -1;
-static int hf_hbbak_trailer = -1;
+static int proto_hbbak;
+static int hf_hbbak_unknown1;
+static int hf_hbbak_etype_outer;
+static int hf_hbbak_trailer;
 
-static gint ett_hbbak = -1;
+static gint ett_hbbak;
 
 static dissector_handle_t hbbak_handle;
 static dissector_handle_t ethertype_handle;
diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c
index 95ba6475c1..ec84c6d3ab 100644
--- a/epan/dissectors/packet-packetbb.c
+++ b/epan/dissectors/packet-packetbb.c
@@ -171,102 +171,102 @@ static const value_string nbraddrtype_vals[] = {
   { 3, "ROUTABLE_ORIG"                  },
   { 0, NULL                             }};
 
-static int proto_packetbb = -1;
+static int proto_packetbb;
 
 #define PACKETBB_PORT 269 /* Not IANA registered */
 
-static int hf_packetbb_header = -1;
-static int hf_packetbb_version = -1;
-static int hf_packetbb_header_flags = -1;
-static int hf_packetbb_header_flags_phasseqnum = -1;
-static int hf_packetbb_header_flags_phastlv = -1;
-static int hf_packetbb_seqnr = -1;
-static int hf_packetbb_msg = -1;
-static int hf_packetbb_msgheader = -1;
-static int hf_packetbb_msgheader_type = -1;
-static int hf_packetbb_msgheader_flags = -1;
-static int hf_packetbb_msgheader_flags_mhasorig = -1;
-static int hf_packetbb_msgheader_flags_mhashoplimit = -1;
-static int hf_packetbb_msgheader_flags_mhashopcount = -1;
-static int hf_packetbb_msgheader_flags_mhasseqnr = -1;
-static int hf_packetbb_msgheader_addresssize = -1;
-static int hf_packetbb_msgheader_size = -1;
-static int hf_packetbb_msgheader_origaddripv4 = -1;
-static int hf_packetbb_msgheader_origaddripv6 = -1;
-static int hf_packetbb_msgheader_origaddrmac = -1;
-static int hf_packetbb_msgheader_origaddrcustom = -1;
-static int hf_packetbb_msgheader_hoplimit = -1;
-static int hf_packetbb_msgheader_hopcount = -1;
-static int hf_packetbb_msgheader_seqnr = -1;
-static int hf_packetbb_addr = -1;
-static int hf_packetbb_addr_num = -1;
-static int hf_packetbb_addr_flags = -1;
-static int hf_packetbb_addr_flags_hashead = -1;
-static int hf_packetbb_addr_flags_hasfulltail = -1;
-static int hf_packetbb_addr_flags_haszerotail = -1;
-static int hf_packetbb_addr_flags_hassingleprelen = -1;
-static int hf_packetbb_addr_flags_hasmultiprelen = -1;
-static int hf_packetbb_addr_head = -1;
-static int hf_packetbb_addr_tail = -1;
+static int hf_packetbb_header;
+static int hf_packetbb_version;
+static int hf_packetbb_header_flags;
+static int hf_packetbb_header_flags_phasseqnum;
+static int hf_packetbb_header_flags_phastlv;
+static int hf_packetbb_seqnr;
+static int hf_packetbb_msg;
+static int hf_packetbb_msgheader;
+static int hf_packetbb_msgheader_type;
+static int hf_packetbb_msgheader_flags;
+static int hf_packetbb_msgheader_flags_mhasorig;
+static int hf_packetbb_msgheader_flags_mhashoplimit;
+static int hf_packetbb_msgheader_flags_mhashopcount;
+static int hf_packetbb_msgheader_flags_mhasseqnr;
+static int hf_packetbb_msgheader_addresssize;
+static int hf_packetbb_msgheader_size;
+static int hf_packetbb_msgheader_origaddripv4;
+static int hf_packetbb_msgheader_origaddripv6;
+static int hf_packetbb_msgheader_origaddrmac;
+static int hf_packetbb_msgheader_origaddrcustom;
+static int hf_packetbb_msgheader_hoplimit;
+static int hf_packetbb_msgheader_hopcount;
+static int hf_packetbb_msgheader_seqnr;
+static int hf_packetbb_addr;
+static int hf_packetbb_addr_num;
+static int hf_packetbb_addr_flags;
+static int hf_packetbb_addr_flags_hashead;
+static int hf_packetbb_addr_flags_hasfulltail;
+static int hf_packetbb_addr_flags_haszerotail;
+static int hf_packetbb_addr_flags_hassingleprelen;
+static int hf_packetbb_addr_flags_hasmultiprelen;
+static int hf_packetbb_addr_head;
+static int hf_packetbb_addr_tail;
 static int hf_packetbb_addr_value[4];
-static int hf_packetbb_addr_value_mid = -1;
-static int hf_packetbb_addr_value_prefix = -1;
-static int hf_packetbb_tlvblock = -1;
-static int hf_packetbb_tlvblock_length = -1;
-static int hf_packetbb_tlv = -1;
-static int hf_packetbb_pkttlv_type = -1;
-static int hf_packetbb_msgtlv_type = -1;
-static int hf_packetbb_addrtlv_type = -1;
-static int hf_packetbb_tlv_flags = -1;
-static int hf_packetbb_tlv_flags_hastypext = -1;
-static int hf_packetbb_tlv_flags_hassingleindex = -1;
-static int hf_packetbb_tlv_flags_hasmultiindex = -1;
-static int hf_packetbb_tlv_flags_hasvalue = -1;
-static int hf_packetbb_tlv_flags_hasextlen = -1;
-static int hf_packetbb_tlv_flags_hasmultivalue = -1;
-static int hf_packetbb_tlv_typeext = -1;
-static int hf_packetbb_tlv_indexstart = -1;
-static int hf_packetbb_tlv_indexend = -1;
-static int hf_packetbb_tlv_length = -1;
-static int hf_packetbb_tlv_value = -1;
-static int hf_packetbb_tlv_multivalue = -1;
-static int hf_packetbb_tlv_intervaltime = -1;
-static int hf_packetbb_tlv_validitytime = -1;
-static int hf_packetbb_tlv_localifs = -1;
-static int hf_packetbb_tlv_linkstatus = -1;
-static int hf_packetbb_tlv_otherneigh = -1;
-static int hf_packetbb_tlv_icv = -1;
-static int hf_packetbb_tlv_timestamp = -1;
-static int hf_packetbb_tlv_linkmetric_flags_linkin = -1;
-static int hf_packetbb_tlv_linkmetric_flags_linkout = -1;
-static int hf_packetbb_tlv_linkmetric_flags_neighin = -1;
-static int hf_packetbb_tlv_linkmetric_flags_neighout = -1;
-static int hf_packetbb_tlv_linkmetric_value = -1;
-static int hf_packetbb_tlv_mpr = -1;
-static int hf_packetbb_tlv_nbraddrtype = -1;
-static int hf_packetbb_tlv_gateway = -1;
-static int hf_packetbb_tlv_mprwillingness = -1;
-static int hf_packetbb_tlv_mprwillingness_flooding = -1;
-static int hf_packetbb_tlv_mprwillingness_routing = -1;
-static int hf_packetbb_tlv_contseqnum = -1;
-
-static gint ett_packetbb = -1;
-static gint ett_packetbb_header = -1;
-static gint ett_packetbb_header_flags = -1;
+static int hf_packetbb_addr_value_mid;
+static int hf_packetbb_addr_value_prefix;
+static int hf_packetbb_tlvblock;
+static int hf_packetbb_tlvblock_length;
+static int hf_packetbb_tlv;
+static int hf_packetbb_pkttlv_type;
+static int hf_packetbb_msgtlv_type;
+static int hf_packetbb_addrtlv_type;
+static int hf_packetbb_tlv_flags;
+static int hf_packetbb_tlv_flags_hastypext;
+static int hf_packetbb_tlv_flags_hassingleindex;
+static int hf_packetbb_tlv_flags_hasmultiindex;
+static int hf_packetbb_tlv_flags_hasvalue;
+static int hf_packetbb_tlv_flags_hasextlen;
+static int hf_packetbb_tlv_flags_hasmultivalue;
+static int hf_packetbb_tlv_typeext;
+static int hf_packetbb_tlv_indexstart;
+static int hf_packetbb_tlv_indexend;
+static int hf_packetbb_tlv_length;
+static int hf_packetbb_tlv_value;
+static int hf_packetbb_tlv_multivalue;
+static int hf_packetbb_tlv_intervaltime;
+static int hf_packetbb_tlv_validitytime;
+static int hf_packetbb_tlv_localifs;
+static int hf_packetbb_tlv_linkstatus;
+static int hf_packetbb_tlv_otherneigh;
+static int hf_packetbb_tlv_icv;
+static int hf_packetbb_tlv_timestamp;
+static int hf_packetbb_tlv_linkmetric_flags_linkin;
+static int hf_packetbb_tlv_linkmetric_flags_linkout;
+static int hf_packetbb_tlv_linkmetric_flags_neighin;
+static int hf_packetbb_tlv_linkmetric_flags_neighout;
+static int hf_packetbb_tlv_linkmetric_value;
+static int hf_packetbb_tlv_mpr;
+static int hf_packetbb_tlv_nbraddrtype;
+static int hf_packetbb_tlv_gateway;
+static int hf_packetbb_tlv_mprwillingness;
+static int hf_packetbb_tlv_mprwillingness_flooding;
+static int hf_packetbb_tlv_mprwillingness_routing;
+static int hf_packetbb_tlv_contseqnum;
+
+static gint ett_packetbb;
+static gint ett_packetbb_header;
+static gint ett_packetbb_header_flags;
 static gint ett_packetbb_msg[PACKETBB_MSG_TLV_LENGTH];
-static gint ett_packetbb_msgheader = -1;
-static gint ett_packetbb_msgheader_flags = -1;
-static gint ett_packetbb_addr = -1;
-static gint ett_packetbb_addr_flags = -1;
-static gint ett_packetbb_addr_value = -1;
-static gint ett_packetbb_tlvblock = -1;
+static gint ett_packetbb_msgheader;
+static gint ett_packetbb_msgheader_flags;
+static gint ett_packetbb_addr;
+static gint ett_packetbb_addr_flags;
+static gint ett_packetbb_addr_value;
+static gint ett_packetbb_tlvblock;
 static gint ett_packetbb_tlv[PACKETBB_MSG_TLV_LENGTH];
-static gint ett_packetbb_tlv_flags = -1;
-static gint ett_packetbb_tlv_value = -1;
-static gint ett_packetbb_tlv_mprwillingness = -1;
-static gint ett_packetbb_tlv_linkmetric = -1;
+static gint ett_packetbb_tlv_flags;
+static gint ett_packetbb_tlv_value;
+static gint ett_packetbb_tlv_mprwillingness;
+static gint ett_packetbb_tlv_linkmetric;
 
-static expert_field ei_packetbb_error = EI_INIT;
+static expert_field ei_packetbb_error;
 
 /* Link metric of RFC7181 */
 static guint32 uncompress_metric(guint16 val16) {
diff --git a/epan/dissectors/packet-packetlogger.c b/epan/dissectors/packet-packetlogger.c
index a5e710fe1a..b4608e147f 100644
--- a/epan/dissectors/packet-packetlogger.c
+++ b/epan/dissectors/packet-packetlogger.c
@@ -24,21 +24,21 @@ void proto_reg_handoff_packetlogger(void);
 #define PSNAME "PKTLOG"
 #define PFNAME "packetlogger"
 
-static int proto_packetlogger = -1;
-
-static int hf_type = -1;
-static int hf_info = -1;
-static int hf_syslog = -1;
-static int hf_syslog_process_id = -1;
-static int hf_syslog_message_type = -1;
-static int hf_syslog_process = -1;
-static int hf_syslog_sender = -1;
-static int hf_syslog_subsystem = -1;
-static int hf_syslog_category = -1;
-static int hf_syslog_message = -1;
-
-static gint ett_packetlogger = -1;
-static gint ett_syslog = -1;
+static int proto_packetlogger;
+
+static int hf_type;
+static int hf_info;
+static int hf_syslog;
+static int hf_syslog_process_id;
+static int hf_syslog_message_type;
+static int hf_syslog_process;
+static int hf_syslog_sender;
+static int hf_syslog_subsystem;
+static int hf_syslog_category;
+static int hf_syslog_message;
+
+static gint ett_packetlogger;
+static gint ett_syslog;
 
 static dissector_handle_t packetlogger_handle;
 static dissector_table_t hci_h1_table;
diff --git a/epan/dissectors/packet-pagp.c b/epan/dissectors/packet-pagp.c
index ca4474f026..1569a7d87d 100644
--- a/epan/dissectors/packet-pagp.c
+++ b/epan/dissectors/packet-pagp.c
@@ -70,45 +70,45 @@ static dissector_handle_t pagp_handle;
 
 /* Initialise the protocol and registered fields */
 
-static int proto_pagp = -1;
-
-static int hf_pagp_version_number = -1;
-
-static int hf_pagp_flags = -1;
-static int hf_pagp_flags_slow_hello = -1;
-static int hf_pagp_flags_auto_mode = -1;
-static int hf_pagp_flags_consistent_state = -1;
-static int hf_pagp_local_device_id = -1;
-static int hf_pagp_local_learn_cap = -1;
-static int hf_pagp_local_port_priority = -1;
-static int hf_pagp_local_sent_port_ifindex = -1;
-static int hf_pagp_local_group_capability = -1;
-static int hf_pagp_local_group_ifindex = -1;
-static int hf_pagp_partner_device_id = -1;
-static int hf_pagp_partner_learn_cap = -1;
-static int hf_pagp_partner_port_priority = -1;
-static int hf_pagp_partner_sent_port_ifindex = -1;
-static int hf_pagp_partner_group_capability = -1;
-static int hf_pagp_partner_group_ifindex = -1;
-static int hf_pagp_partner_count = -1;
-static int hf_pagp_num_tlvs = -1;
-static int hf_pagp_tlv = -1;
-static int hf_pagp_tlv_length = -1;
-static int hf_pagp_tlv_device_name = -1;
-static int hf_pagp_tlv_port_name = -1;
-static int hf_pagp_tlv_agport_mac = -1;
-
-static int hf_pagp_flush_local_device_id = -1;
-static int hf_pagp_flush_partner_device_id = -1;
-static int hf_pagp_flush_transaction_id = -1;
+static int proto_pagp;
+
+static int hf_pagp_version_number;
+
+static int hf_pagp_flags;
+static int hf_pagp_flags_slow_hello;
+static int hf_pagp_flags_auto_mode;
+static int hf_pagp_flags_consistent_state;
+static int hf_pagp_local_device_id;
+static int hf_pagp_local_learn_cap;
+static int hf_pagp_local_port_priority;
+static int hf_pagp_local_sent_port_ifindex;
+static int hf_pagp_local_group_capability;
+static int hf_pagp_local_group_ifindex;
+static int hf_pagp_partner_device_id;
+static int hf_pagp_partner_learn_cap;
+static int hf_pagp_partner_port_priority;
+static int hf_pagp_partner_sent_port_ifindex;
+static int hf_pagp_partner_group_capability;
+static int hf_pagp_partner_group_ifindex;
+static int hf_pagp_partner_count;
+static int hf_pagp_num_tlvs;
+static int hf_pagp_tlv;
+static int hf_pagp_tlv_length;
+static int hf_pagp_tlv_device_name;
+static int hf_pagp_tlv_port_name;
+static int hf_pagp_tlv_agport_mac;
+
+static int hf_pagp_flush_local_device_id;
+static int hf_pagp_flush_partner_device_id;
+static int hf_pagp_flush_transaction_id;
 
 /* Initialise the subtree pointers */
 
-static gint ett_pagp = -1;
-static gint ett_pagp_flags = -1;
-static gint ett_pagp_tlvs = -1;
+static gint ett_pagp;
+static gint ett_pagp_flags;
+static gint ett_pagp_tlvs;
 
-static expert_field ei_pagp_tlv_length = EI_INIT;
+static expert_field ei_pagp_tlv_length;
 
 /* General declarations and macros */
 
diff --git a/epan/dissectors/packet-paltalk.c b/epan/dissectors/packet-paltalk.c
index c19cd6948e..bd1b874596 100644
--- a/epan/dissectors/packet-paltalk.c
+++ b/epan/dissectors/packet-paltalk.c
@@ -27,14 +27,14 @@ void proto_reg_handoff_paltalk(void);
 
 #define PALTALK_HEADER_LENGTH 6
 
-static int proto_paltalk = -1;
+static int proto_paltalk;
 
-static int hf_paltalk_pdu_type = -1;
-static int hf_paltalk_version = -1;
-static int hf_paltalk_length = -1;
-static int hf_paltalk_content = -1;
+static int hf_paltalk_pdu_type;
+static int hf_paltalk_version;
+static int hf_paltalk_length;
+static int hf_paltalk_content;
 
-static gint ett_paltalk = -1;
+static gint ett_paltalk;
 
 static guint
 dissect_paltalk_get_len(packet_info *pinfo _U_, tvbuff_t *tvb,
diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c
index dc64b6822a..4523dcd9be 100644
--- a/epan/dissectors/packet-pana.c
+++ b/epan/dissectors/packet-pana.c
@@ -72,37 +72,37 @@ static dissector_handle_t pana_handle;
 static dissector_handle_t eap_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_pana = -1;
-static int hf_pana_reserved_type = -1;
-static int hf_pana_length_type = -1;
-static int hf_pana_msg_type = -1;
-static int hf_pana_session_id = -1;
-static int hf_pana_seqnumber = -1;
-static int hf_pana_response_in = -1;
-static int hf_pana_response_to = -1;
-static int hf_pana_response_time = -1;
-
-static int hf_pana_flags = -1;
-static int hf_pana_flag_r = -1;
-static int hf_pana_flag_s = -1;
-static int hf_pana_flag_c = -1;
-static int hf_pana_flag_a = -1;
-static int hf_pana_flag_p = -1;
-static int hf_pana_flag_i = -1;
-static int hf_pana_avp_code = -1;
-static int hf_pana_avp_data_length = -1;
-static int hf_pana_avp_flags = -1;
-static int hf_pana_avp_flag_v = -1;
-static int hf_pana_avp_reserved = -1;
-static int hf_pana_avp_vendorid = -1;
-
-static int hf_pana_avp_data_uint64 = -1;
-static int hf_pana_avp_data_int64 = -1;
-static int hf_pana_avp_data_uint32 = -1;
-static int hf_pana_avp_data_int32 = -1;
-static int hf_pana_avp_data_bytes = -1;
-static int hf_pana_avp_data_string = -1;
-static int hf_pana_avp_data_enumerated = -1;
+static int proto_pana;
+static int hf_pana_reserved_type;
+static int hf_pana_length_type;
+static int hf_pana_msg_type;
+static int hf_pana_session_id;
+static int hf_pana_seqnumber;
+static int hf_pana_response_in;
+static int hf_pana_response_to;
+static int hf_pana_response_time;
+
+static int hf_pana_flags;
+static int hf_pana_flag_r;
+static int hf_pana_flag_s;
+static int hf_pana_flag_c;
+static int hf_pana_flag_a;
+static int hf_pana_flag_p;
+static int hf_pana_flag_i;
+static int hf_pana_avp_code;
+static int hf_pana_avp_data_length;
+static int hf_pana_avp_flags;
+static int hf_pana_avp_flag_v;
+static int hf_pana_avp_reserved;
+static int hf_pana_avp_vendorid;
+
+static int hf_pana_avp_data_uint64;
+static int hf_pana_avp_data_int64;
+static int hf_pana_avp_data_uint32;
+static int hf_pana_avp_data_int32;
+static int hf_pana_avp_data_bytes;
+static int hf_pana_avp_data_string;
+static int hf_pana_avp_data_enumerated;
 
 #define MSG_TYPE_MAX 5
 static const value_string msg_type_names[] = {
@@ -184,11 +184,11 @@ static const value_string avp_type_names[]={
 
 
 /* Initialize the subtree pointers */
-static gint ett_pana = -1;
-static gint ett_pana_flags = -1;
-static gint ett_pana_avp = -1;
-static gint ett_pana_avp_info = -1;
-static gint ett_pana_avp_flags = -1;
+static gint ett_pana;
+static gint ett_pana_flags;
+static gint ett_pana_avp;
+static gint ett_pana_avp_info;
+static gint ett_pana_avp_flags;
 
 
 typedef struct _pana_transaction_t {
diff --git a/epan/dissectors/packet-parlay.c b/epan/dissectors/packet-parlay.c
index 6bfea078ba..a2c9ad58e2 100644
--- a/epan/dissectors/packet-parlay.c
+++ b/epan/dissectors/packet-parlay.c
@@ -45,2957 +45,2957 @@ void proto_register_giop_parlay(void);
 void proto_reg_handoff_giop_parlay(void);
 
 /* Initialise the protocol and subtree pointers */
-static int proto_parlay = -1;
-static gint ett_parlay = -1;
+static int proto_parlay;
+static gint ett_parlay;
 
 
 /* Initialise the initial Alignment */
 static guint32  boundary = GIOP_HEADER_SIZE;  /* initial value */
 
-static int hf_operationrequest = -1;/* Request_Operation field */
+static int hf_operationrequest;/* Request_Operation field */
 
         /* Operation filters */
-static int hf_org_csapi_IpService_setCallbackWithSessionID_sessionID = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpInitial_initiateAuthentication_authType = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpInitial_initiateAuthenticationWithVersion_authType = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpInitial_initiateAuthenticationWithVersion_frameworkVersion = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAuthentication_requestAccess_accessType = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAccess_terminateAccess_terminationText = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAccess_terminateAccess_signingAlgorithm = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAccess_terminateAccess_digitalSignature_loop = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAccess_terminateAccess_digitalSignature = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_obtainInterface_interfaceName = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_obtainInterfaceWithCallback_interfaceName = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_endAccess_endAccessProperties_loop = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_listInterfaces_return_loop = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_listInterfaces_return = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_releaseInterface_interfaceName = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_selectSigningAlgorithm_return = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_selectSigningAlgorithm_signingAlgorithmCaps = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_terminateAccess_terminationText = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_terminateAccess_digitalSignature_loop = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_terminateAccess_digitalSignature = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_relinquishInterface_interfaceName = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_relinquishInterface_terminationText = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_relinquishInterface_digitalSignature_loop = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_relinquishInterface_digitalSignature = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_authenticate_return_loop = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_authenticate_return = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_authenticate_challenge_loop = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_authenticate_challenge = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_challenge_return_loop = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_challenge_return = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_challenge_challenge_loop = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_challenge_challenge = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_selectEncryptionMethod_return = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_selectEncryptionMethod_encryptionCaps = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_authenticate_return_loop = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_authenticate_return = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_authenticate_challenge_loop = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_authenticate_challenge = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_selectAuthenticationMechanism_return = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_selectAuthenticationMechanism_authMechanismList = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_challenge_return_loop = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_challenge_return = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_challenge_challenge_loop = -1;
-static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_challenge_challenge = -1;
-static int hf_org_csapi_fw_fw_application_notification_IpAppEventNotification_reportNotification_assignmentID = -1;
-static int hf_org_csapi_fw_fw_application_notification_IpEventNotification_createNotification_return = -1;
-static int hf_org_csapi_fw_fw_application_notification_IpEventNotification_destroyNotification_assignmentID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_activityTestRes_activityTestID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_activityTestRes_activityTestResult = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_appActivityTestReq_activityTestID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_fwFaultReportInd_fault = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_fwFaultRecoveryInd_fault = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_svcUnavailableInd_serviceID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_svcUnavailableInd_reason = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_genFaultStatsRecordRes_serviceIDs_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_genFaultStatsRecordRes_serviceIDs = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_fwUnavailableInd_reason = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_activityTestErr_activityTestID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_genFaultStatsRecordErr_faultStatisticsError = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_genFaultStatsRecordErr_serviceIDs_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_genFaultStatsRecordErr_serviceIDs = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_appUnavailableInd_serviceID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_svcAvailStatusInd_serviceID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_svcAvailStatusInd_reason = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordRes_faultStatsReqID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordRes_serviceIDs_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordRes_serviceIDs = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordErr_faultStatsReqID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordErr_faultStatistics_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordErr_faultStatistics = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordErr_serviceIDs_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordErr_serviceIDs = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordReq_faultStatsReqID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_fwAvailStatusInd_reason = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryLoadRes_loadStatistics_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryLoadErr_loadStatisticsError = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_loadLevelNotification_loadStatistics_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryAppLoadStatsReq_loadStatsReqID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryLoadStatsRes_loadStatsReqID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryLoadStatsRes_loadStatistics_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryLoadStatsErr_loadStatsReqID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryLoadStatsErr_loadStatisticsError = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_reportLoad_loadLevel = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryLoadReq_serviceIDs_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryLoadReq_serviceIDs = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryAppLoadRes_loadStatistics_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryAppLoadErr_loadStatisticsError = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_createLoadLevelNotification_serviceIDs_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_createLoadLevelNotification_serviceIDs = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_destroyLoadLevelNotification_serviceIDs_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_destroyLoadLevelNotification_serviceIDs = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_resumeNotification_serviceIDs_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_resumeNotification_serviceIDs = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_suspendNotification_serviceIDs_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_suspendNotification_serviceIDs = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryLoadStatsReq_loadStatsReqID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryLoadStatsReq_serviceIDs_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryLoadStatsReq_serviceIDs = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryAppLoadStatsRes_loadStatsReqID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryAppLoadStatsRes_loadStatistics_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryAppLoadStatsErr_loadStatsReqID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryAppLoadStatsErr_loadStatisticsError = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppOAM_systemDateTimeQuery_return = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppOAM_systemDateTimeQuery_systemDateAndTime = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpOAM_systemDateTimeQuery_return = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpOAM_systemDateTimeQuery_clientDateAndTime = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_activityTestReq_activityTestID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_activityTestReq_svcID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_appActivityTestRes_activityTestID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_appActivityTestRes_activityTestResult = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_svcUnavailableInd_serviceID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_genFaultStatsRecordReq_serviceIDs_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_genFaultStatsRecordReq_serviceIDs = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_appActivityTestErr_activityTestID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_appUnavailableInd_serviceID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_genFaultStatsRecordErr_faultStatisticsError = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_appAvailStatusInd_reason = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_generateFaultStatisticsRecordReq_faultStatsReqID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_generateFaultStatisticsRecordReq_serviceIDs_loop = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_generateFaultStatisticsRecordReq_serviceIDs = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_generateFaultStatisticsRecordRes_faultStatsReqID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_generateFaultStatisticsRecordErr_faultStatsReqID = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_generateFaultStatisticsRecordErr_faultStatisticsError = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpHeartBeatMgmt_enableHeartBeat_interval = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpHeartBeatMgmt_changeInterval_interval = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppHeartBeatMgmt_enableAppHeartBeat_interval = -1;
-static int hf_org_csapi_fw_fw_application_integrity_IpAppHeartBeatMgmt_changeInterval_interval = -1;
-static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_listServiceTypes_return_loop = -1;
-static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_listServiceTypes_return = -1;
-static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_describeServiceType_name = -1;
-static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_discoverService_return_loop = -1;
-static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_discoverService_serviceTypeName = -1;
-static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_discoverService_desiredPropertyList_loop = -1;
-static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_discoverService_max = -1;
-static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_listSubscribedServices_return_loop = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_signServiceAgreement_return_loop = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_signServiceAgreement_return = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_signServiceAgreement_serviceToken = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_signServiceAgreement_agreementText = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_signServiceAgreement_signingAlgorithm = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_terminateServiceAgreement_serviceToken = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_terminateServiceAgreement_terminationText = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_terminateServiceAgreement_digitalSignature_loop = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_terminateServiceAgreement_digitalSignature = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_signServiceAgreement_serviceToken = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_signServiceAgreement_agreementText = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_signServiceAgreement_signingAlgorithm = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_terminateServiceAgreement_serviceToken = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_terminateServiceAgreement_terminationText = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_terminateServiceAgreement_digitalSignature_loop = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_terminateServiceAgreement_digitalSignature = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_selectService_return = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_selectService_serviceID = -1;
-static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_initiateSignServiceAgreement_serviceToken = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileManagement_createServiceProfile_return = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileManagement_deleteServiceProfile_serviceProfileID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileManagement_assign_sagID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileManagement_assign_serviceProfileID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileManagement_deassign_sagID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileManagement_deassign_serviceProfileID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileManagement_requestConflictInfo_return_loop = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileInfoQuery_listServiceProfiles_return_loop = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileInfoQuery_listServiceProfiles_return = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileInfoQuery_describeServiceProfile_serviceProfileID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileInfoQuery_listAssignedMembers_return_loop = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileInfoQuery_listAssignedMembers_return = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileInfoQuery_listAssignedMembers_serviceProfileID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractManagement_createServiceContract_return = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractManagement_deleteServiceContract_serviceContractID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractInfoQuery_describeServiceContract_serviceContractID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractInfoQuery_listServiceContracts_return_loop = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractInfoQuery_listServiceContracts_return = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractInfoQuery_listServiceProfiles_return_loop = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractInfoQuery_listServiceProfiles_return = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractInfoQuery_listServiceProfiles_serviceContractID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpEntOpAccountManagement_modifyEntOpAccount_enterpriseOperatorProperties_loop = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_deleteClientApp_clientAppID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_createSAG_clientAppIDs_loop = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_createSAG_clientAppIDs = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_deleteSAG_sagID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_addSAGMembers_sagID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_addSAGMembers_clientAppIDs_loop = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_addSAGMembers_clientAppIDs = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_removeSAGMembers_sagID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_removeSAGMembers_clientAppIDList_loop = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_removeSAGMembers_clientAppIDList = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_requestConflictInfo_return_loop = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_describeClientApp_clientAppID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listClientApps_return_loop = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listClientApps_return = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_describeSAG_return = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_describeSAG_sagID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listSAGs_return_loop = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listSAGs_return = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listSAGMembers_return_loop = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listSAGMembers_return = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listSAGMembers_sagID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listClientAppMembership_return_loop = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listClientAppMembership_return = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listClientAppMembership_clientAppID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_notification_IpClientEventNotification_reportNotification_assignmentID = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_notification_IpEventNotification_createNotification_return = -1;
-static int hf_org_csapi_fw_fw_enterprise_operator_notification_IpEventNotification_destroyNotification_assignmentID = -1;
-static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_listServiceTypes_return_loop = -1;
-static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_listServiceTypes_return = -1;
-static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_describeServiceType_name = -1;
-static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_discoverService_return_loop = -1;
-static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_discoverService_serviceTypeName = -1;
-static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_discoverService_desiredPropertyList_loop = -1;
-static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_discoverService_max = -1;
-static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_listRegisteredServices_return_loop = -1;
-static int hf_org_csapi_fw_fw_service_service_lifecycle_IpServiceInstanceLifecycleManager_createServiceManager_application = -1;
-static int hf_org_csapi_fw_fw_service_service_lifecycle_IpServiceInstanceLifecycleManager_createServiceManager_serviceProperties_loop = -1;
-static int hf_org_csapi_fw_fw_service_service_lifecycle_IpServiceInstanceLifecycleManager_createServiceManager_serviceInstanceID = -1;
-static int hf_org_csapi_fw_fw_service_service_lifecycle_IpServiceInstanceLifecycleManager_destroyServiceManager_serviceInstance = -1;
-static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_registerService_return = -1;
-static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_registerService_serviceTypeName = -1;
-static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_registerService_servicePropertyList_loop = -1;
-static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_announceServiceAvailability_serviceID = -1;
-static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_unregisterService_serviceID = -1;
-static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_describeService_serviceID = -1;
-static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_unannounceService_serviceID = -1;
-static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_registerServiceSubType_return = -1;
-static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_registerServiceSubType_serviceTypeName = -1;
-static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_registerServiceSubType_servicePropertyList_loop = -1;
-static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_registerServiceSubType_extendedServicePropertyList_loop = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_queryLoadRes_loadStatistics_loop = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_queryLoadErr_loadStatisticsError = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_loadLevelNotification_loadStatistics_loop = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_querySvcLoadStatsReq_loadStatsReqID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_queryLoadStatsRes_loadStatsReqID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_queryLoadStatsRes_loadStatistics_loop = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_queryLoadStatsErr_loadStatsReqID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_queryLoadStatsErr_loadStatisticsError = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_reportLoad_loadLevel = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_queryLoadReq_querySubject = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_querySvcLoadRes_loadStatistics_loop = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_querySvcLoadErr_loadStatisticError = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_createLoadLevelNotification_notificationSubject = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_destroyLoadLevelNotification_notificationSubject = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_suspendNotification_notificationSubject = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_resumeNotification_notificationSubject = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_queryLoadStatsReq_loadStatsReqID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_queryLoadStatsReq_querySubject = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_querySvcLoadStatsRes_loadStatsReqID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_querySvcLoadStatsRes_loadStatistics_loop = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_querySvcLoadStatsErr_loadStatsReqID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_querySvcLoadStatsErr_loadStatisticError = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_activityTestRes_activityTestID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_activityTestRes_activityTestResult = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_svcActivityTestReq_activityTestID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_fwFaultReportInd_fault = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_fwFaultRecoveryInd_fault = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_fwUnavailableInd_reason = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_genFaultStatsRecordRes_recordSubject = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_activityTestErr_activityTestID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_genFaultStatsRecordErr_faultStatisticsError = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_genFaultStatsRecordErr_recordSubject = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_genFaultStatsRecordReq_serviceIDs_loop = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_genFaultStatsRecordReq_serviceIDs = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_appAvailStatusInd_reason = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_generateFaultStatisticsRecordRes_faultStatsReqID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_generateFaultStatisticsRecordRes_recordSubject = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_generateFaultStatisticsRecordErr_faultStatsReqID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_generateFaultStatisticsRecordErr_faultStatisticsError = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_generateFaultStatisticsRecordErr_recordSubject = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_generateFaultStatisticsRecordReq_faultStatsReqID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_fwAvailStatusInd_reason = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_activityTestReq_activityTestID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_activityTestReq_testSubject = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_svcActivityTestRes_activityTestID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_svcActivityTestRes_activityTestResult = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_genFaultStatsRecordReq_recordSubject = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_svcUnavailableInd_reason = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_svcActivityTestErr_activityTestID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_genFaultStatsRecordRes_serviceIDs_loop = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_genFaultStatsRecordRes_serviceIDs = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_genFaultStatsRecordErr_faultStatisticsError = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_genFaultStatsRecordErr_serviceIDs_loop = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_genFaultStatsRecordErr_serviceIDs = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_generateFaultStatsRecordErr_faultStatisticsError = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_svcAvailStatusInd_reason = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_generateFaultStatisticsRecordReq_faultStatsReqID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_generateFaultStatisticsRecordReq_recordSubject = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_generateFaultStatisticsRecordRes_faultStatsReqID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_generateFaultStatisticsRecordErr_faultStatsReqID = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_generateFaultStatisticsRecordErr_faultStatisticsError = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcOAM_systemDateTimeQuery_return = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcOAM_systemDateTimeQuery_systemDateAndTime = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwOAM_systemDateTimeQuery_return = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwOAM_systemDateTimeQuery_clientDateAndTime = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwHeartBeatMgmt_enableHeartBeat_interval = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpFwHeartBeatMgmt_changeInterval_interval = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcHeartBeatMgmt_enableSvcHeartBeat_interval = -1;
-static int hf_org_csapi_fw_fw_service_integrity_IpSvcHeartBeatMgmt_changeInterval_interval = -1;
-static int hf_org_csapi_fw_fw_service_notification_IpFwEventNotification_createNotification_return = -1;
-static int hf_org_csapi_fw_fw_service_notification_IpFwEventNotification_destroyNotification_assignmentID = -1;
-static int hf_org_csapi_fw_fw_service_notification_IpSvcEventNotification_reportNotification_assignmentID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_routeRes_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_routeRes_callLegSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_routeErr_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_routeErr_callLegSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_getCallInfoRes_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_getCallInfoErr_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_superviseCallRes_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_superviseCallRes_report = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_superviseCallRes_usedTime = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_superviseCallErr_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_callFaultDetected_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_callFaultDetected_fault = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_getMoreDialledDigitsRes_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_getMoreDialledDigitsRes_digits = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_getMoreDialledDigitsErr_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCall_callEnded_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpCall_routeReq_return = -1;
-static int hf_org_csapi_cc_gccs_IpCall_routeReq_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpCall_routeReq_responseRequested_loop = -1;
-static int hf_org_csapi_cc_gccs_IpCall_routeReq_appInfo_loop = -1;
-static int hf_org_csapi_cc_gccs_IpCall_release_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpCall_deassignCall_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpCall_getCallInfoReq_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpCall_getCallInfoReq_callInfoRequested = -1;
-static int hf_org_csapi_cc_gccs_IpCall_setCallChargePlan_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpCall_setAdviceOfCharge_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpCall_setAdviceOfCharge_tariffSwitch = -1;
-static int hf_org_csapi_cc_gccs_IpCall_getMoreDialledDigitsReq_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpCall_getMoreDialledDigitsReq_length = -1;
-static int hf_org_csapi_cc_gccs_IpCall_superviseCallReq_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpCall_superviseCallReq_time = -1;
-static int hf_org_csapi_cc_gccs_IpCall_superviseCallReq_treatment = -1;
-static int hf_org_csapi_cc_gccs_IpCall_continueProcessing_callSessionID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCallControlManager_callAborted_callReference = -1;
-static int hf_org_csapi_cc_gccs_IpAppCallControlManager_callEventNotify_assignmentID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCallControlManager_callOverloadEncountered_assignmentID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCallControlManager_callOverloadCeased_assignmentID = -1;
-static int hf_org_csapi_cc_gccs_IpAppCallControlManager_abortMultipleCalls_callReferenceSet_loop = -1;
-static int hf_org_csapi_cc_gccs_IpAppCallControlManager_abortMultipleCalls_callReferenceSet = -1;
-static int hf_org_csapi_cc_gccs_IpCallControlManager_enableCallNotification_return = -1;
-static int hf_org_csapi_cc_gccs_IpCallControlManager_disableCallNotification_assignmentID = -1;
-static int hf_org_csapi_cc_gccs_IpCallControlManager_setCallLoadControl_return = -1;
-static int hf_org_csapi_cc_gccs_IpCallControlManager_setCallLoadControl_duration = -1;
-static int hf_org_csapi_cc_gccs_IpCallControlManager_changeCallNotification_assignmentID = -1;
-static int hf_org_csapi_cc_gccs_IpCallControlManager_getCriteria_return_loop = -1;
-static int hf_org_csapi_cc_mpccs_IpAppCallLeg_eventReportRes_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppCallLeg_eventReportErr_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppCallLeg_attachMediaRes_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppCallLeg_attachMediaErr_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppCallLeg_detachMediaRes_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppCallLeg_detachMediaErr_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppCallLeg_getInfoRes_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppCallLeg_getInfoErr_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppCallLeg_routeErr_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppCallLeg_superviseRes_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppCallLeg_superviseRes_report = -1;
-static int hf_org_csapi_cc_mpccs_IpAppCallLeg_superviseRes_usedTime = -1;
-static int hf_org_csapi_cc_mpccs_IpAppCallLeg_superviseErr_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppCallLeg_callLegEnded_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppCallLeg_callLegEnded_cause = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_createNotification_return = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_destroyNotification_assignmentID = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_changeNotification_assignmentID = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_getNotification_return_loop = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_setCallLoadControl_return = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_setCallLoadControl_duration = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_enableNotifications_return = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_getNextNotification_reset = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_routeReq_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_routeReq_appInfo_loop = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_eventReportReq_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_eventReportReq_eventsRequested_loop = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_release_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_release_cause = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_getInfoReq_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_getInfoReq_callLegInfoRequested = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_getCall_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_attachMediaReq_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_detachMediaReq_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_getCurrentDestinationAddress_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_continueProcessing_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_setChargePlan_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_setAdviceOfCharge_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_setAdviceOfCharge_tariffSwitch = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_superviseReq_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_superviseReq_time = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_superviseReq_treatment = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_deassign_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_getProperties_return_loop = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_getProperties_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_getProperties_propertyNames_loop = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_getProperties_propertyNames = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_setProperties_callLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpCallLeg_setProperties_properties_loop = -1;
-static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_getInfoRes_callSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_getInfoErr_callSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_superviseRes_callSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_superviseRes_report = -1;
-static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_superviseRes_usedTime = -1;
-static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_superviseErr_callSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_callEnded_callSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_createAndRouteCallLegErr_callSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_getCallLegs_return_loop = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_getCallLegs_callSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_createCallLeg_callSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_createAndRouteCallLegReq_callSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_createAndRouteCallLegReq_eventsRequested_loop = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_createAndRouteCallLegReq_appInfo_loop = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_release_callSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_release_cause = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_deassignCall_callSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_getInfoReq_callSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_getInfoReq_callInfoRequested = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_setChargePlan_callSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_setAdviceOfCharge_callSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_setAdviceOfCharge_tariffSwitch = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_superviseReq_callSessionID = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_superviseReq_time = -1;
-static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_superviseReq_treatment = -1;
-static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCallControlManager_reportNotification_callLegReferenceSet_loop = -1;
-static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCallControlManager_reportNotification_assignmentID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCallControlManager_callAborted_callReference = -1;
-static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCallControlManager_callOverloadEncountered_assignmentID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCallControlManager_callOverloadCeased_assignmentID = -1;
-static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCallControlManager_abortMultipleCalls_callReferenceSet_loop = -1;
-static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCallControlManager_abortMultipleCalls_callReferenceSet = -1;
-static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCall_superviseVolumeRes_callSessionID = -1;
-static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCall_superviseVolumeRes_report = -1;
-static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCall_superviseVolumeRes_qualityOfService = -1;
-static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCall_superviseVolumeErr_callSessionID = -1;
-static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallLeg_mediaStreamMonitorRes_callLegSessionID = -1;
-static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallLeg_mediaStreamMonitorRes_streams_loop = -1;
-static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallLeg_mediaStreamMonitorRes_type = -1;
-static int hf_org_csapi_cc_mmccs_IpMultiMediaStream_subtract_mediaStreamSessionID = -1;
-static int hf_org_csapi_cc_mmccs_IpMultiMediaCallLeg_mediaStreamAllow_callLegSessionID = -1;
-static int hf_org_csapi_cc_mmccs_IpMultiMediaCallLeg_mediaStreamAllow_mediaStreamList_loop = -1;
-static int hf_org_csapi_cc_mmccs_IpMultiMediaCallLeg_mediaStreamAllow_mediaStreamList = -1;
-static int hf_org_csapi_cc_mmccs_IpMultiMediaCallLeg_mediaStreamMonitorReq_callLegSessionID = -1;
-static int hf_org_csapi_cc_mmccs_IpMultiMediaCallLeg_mediaStreamMonitorReq_mediaStreamEventCriteria_loop = -1;
-static int hf_org_csapi_cc_mmccs_IpMultiMediaCallLeg_getMediaStreams_return_loop = -1;
-static int hf_org_csapi_cc_mmccs_IpMultiMediaCallLeg_getMediaStreams_callLegSessionID = -1;
-static int hf_org_csapi_cc_mmccs_IpMultiMediaCall_superviseVolumeReq_callSessionID = -1;
-static int hf_org_csapi_cc_mmccs_IpMultiMediaCall_superviseVolumeReq_treatment = -1;
-static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallControlManager_reportMediaNotification_callLegReferenceSet_loop = -1;
-static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallControlManager_reportMediaNotification_mediaStreams_loop = -1;
-static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallControlManager_reportMediaNotification_type = -1;
-static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallControlManager_reportMediaNotification_qualityOfService = -1;
-static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallControlManager_reportMediaNotification_assignmentID = -1;
-static int hf_org_csapi_cc_mmccs_IpMultiMediaCallControlManager_createMediaNotification_return = -1;
-static int hf_org_csapi_cc_mmccs_IpMultiMediaCallControlManager_destroyMediaNotification_assignmentID = -1;
-static int hf_org_csapi_cc_mmccs_IpMultiMediaCallControlManager_changeMediaNotification_assignmentID = -1;
-static int hf_org_csapi_cc_mmccs_IpMultiMediaCallControlManager_getMediaNotification_return_loop = -1;
-static int hf_org_csapi_cc_cccs_IpAppSubConfCall_chairSelection_subConferenceSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpAppSubConfCall_chairSelection_callLegSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpAppSubConfCall_floorRequest_subConferenceSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpAppSubConfCall_floorRequest_callLegSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpAppConfCall_partyJoined_conferenceSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpAppConfCall_leaveMonitorRes_conferenceSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpAppConfCall_leaveMonitorRes_callLeg = -1;
-static int hf_org_csapi_cc_cccs_IpConfCallControlManager_createConference_numberOfSubConferences = -1;
-static int hf_org_csapi_cc_cccs_IpConfCallControlManager_createConference_numberOfParticipants = -1;
-static int hf_org_csapi_cc_cccs_IpConfCallControlManager_createConference_duration = -1;
-static int hf_org_csapi_cc_cccs_IpConfCallControlManager_reserveResources_startTime = -1;
-static int hf_org_csapi_cc_cccs_IpConfCallControlManager_reserveResources_numberOfParticipants = -1;
-static int hf_org_csapi_cc_cccs_IpConfCallControlManager_reserveResources_duration = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_splitSubConference_subConferenceSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_splitSubConference_callLegList_loop = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_splitSubConference_callLegList = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_mergeSubConference_subConferenceCallSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_mergeSubConference_targetSubConferenceCall = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_moveCallLeg_subConferenceCallSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_moveCallLeg_targetSubConferenceCall = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_moveCallLeg_callLeg = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_inspectVideo_subConferenceSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_inspectVideo_inspectedCallLeg = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_inspectVideoCancel_subConferenceSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_appointSpeaker_subConferenceSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_appointSpeaker_speakerCallLeg = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_chairSelection_subConferenceSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_chairSelection_chairCallLeg = -1;
-static int hf_org_csapi_cc_cccs_IpSubConfCall_changeConferencePolicy_subConferenceSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpConfCall_getSubConferences_return_loop = -1;
-static int hf_org_csapi_cc_cccs_IpConfCall_getSubConferences_conferenceSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpConfCall_createSubConference_conferenceSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpConfCall_leaveMonitorReq_conferenceSessionID = -1;
-static int hf_org_csapi_cc_cccs_IpConfCall_getConferenceAddress_conferenceSessionID = -1;
-static int hf_org_csapi_ui_IpAppUI_sendInfoRes_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUI_sendInfoRes_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUI_sendInfoRes_response = -1;
-static int hf_org_csapi_ui_IpAppUI_sendInfoErr_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUI_sendInfoErr_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUI_sendInfoErr_error = -1;
-static int hf_org_csapi_ui_IpAppUI_sendInfoAndCollectRes_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUI_sendInfoAndCollectRes_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUI_sendInfoAndCollectRes_response = -1;
-static int hf_org_csapi_ui_IpAppUI_sendInfoAndCollectRes_collectedInfo = -1;
-static int hf_org_csapi_ui_IpAppUI_sendInfoAndCollectErr_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUI_sendInfoAndCollectErr_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUI_sendInfoAndCollectErr_error = -1;
-static int hf_org_csapi_ui_IpAppUI_userInteractionFaultDetected_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUI_userInteractionFaultDetected_fault = -1;
-static int hf_org_csapi_ui_IpAppUICall_recordMessageRes_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUICall_recordMessageRes_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUICall_recordMessageRes_response = -1;
-static int hf_org_csapi_ui_IpAppUICall_recordMessageRes_messageID = -1;
-static int hf_org_csapi_ui_IpAppUICall_recordMessageErr_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUICall_recordMessageErr_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUICall_recordMessageErr_error = -1;
-static int hf_org_csapi_ui_IpAppUICall_deleteMessageRes_usrInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUICall_deleteMessageRes_response = -1;
-static int hf_org_csapi_ui_IpAppUICall_deleteMessageRes_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUICall_deleteMessageErr_usrInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUICall_deleteMessageErr_error = -1;
-static int hf_org_csapi_ui_IpAppUICall_deleteMessageErr_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUICall_abortActionRes_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUICall_abortActionRes_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUICall_abortActionErr_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUICall_abortActionErr_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUICall_abortActionErr_error = -1;
-static int hf_org_csapi_ui_IpAppUICall_getMessageRes_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUICall_getMessageRes_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUICall_getMessageErr_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUICall_getMessageErr_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUICall_getMessageErr_error = -1;
-static int hf_org_csapi_ui_IpAppUIManager_reportEventNotification_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUIManager_abortMultipleUserInteractions_userInteractionSet_loop = -1;
-static int hf_org_csapi_ui_IpUI_sendInfoReq_return = -1;
-static int hf_org_csapi_ui_IpUI_sendInfoReq_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpUI_sendInfoReq_language = -1;
-static int hf_org_csapi_ui_IpUI_sendInfoReq_variableInfo_loop = -1;
-static int hf_org_csapi_ui_IpUI_sendInfoReq_repeatIndicator = -1;
-static int hf_org_csapi_ui_IpUI_sendInfoReq_responseRequested = -1;
-static int hf_org_csapi_ui_IpUI_sendInfoAndCollectReq_return = -1;
-static int hf_org_csapi_ui_IpUI_sendInfoAndCollectReq_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpUI_sendInfoAndCollectReq_language = -1;
-static int hf_org_csapi_ui_IpUI_sendInfoAndCollectReq_variableInfo_loop = -1;
-static int hf_org_csapi_ui_IpUI_sendInfoAndCollectReq_responseRequested = -1;
-static int hf_org_csapi_ui_IpUI_release_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpUI_setOriginatingAddress_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpUI_setOriginatingAddress_origin = -1;
-static int hf_org_csapi_ui_IpUI_getOriginatingAddress_return = -1;
-static int hf_org_csapi_ui_IpUI_getOriginatingAddress_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpUICall_recordMessageReq_return = -1;
-static int hf_org_csapi_ui_IpUICall_recordMessageReq_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpUICall_deleteMessageReq_return = -1;
-static int hf_org_csapi_ui_IpUICall_deleteMessageReq_usrInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpUICall_deleteMessageReq_messageID = -1;
-static int hf_org_csapi_ui_IpUICall_abortActionReq_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpUICall_abortActionReq_assignmentID = -1;
-static int hf_org_csapi_ui_IpUICall_getMessageReq_return = -1;
-static int hf_org_csapi_ui_IpUICall_getMessageReq_userInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpUICall_getMessageReq_messageID = -1;
-static int hf_org_csapi_ui_IpUIManager_createNotification_return = -1;
-static int hf_org_csapi_ui_IpUIManager_destroyNotification_assignmentID = -1;
-static int hf_org_csapi_ui_IpUIManager_changeNotification_assignmentID = -1;
-static int hf_org_csapi_ui_IpUIManager_getNotification_return_loop = -1;
-static int hf_org_csapi_ui_IpUIManager_enableNotifications_return = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageRes_usrInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageRes_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageErr_usrInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageErr_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageErr_error = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_deleteMessageRes_usrInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_deleteMessageRes_response = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_deleteMessageRes_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_deleteMessageErr_usrInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_deleteMessageErr_error = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_deleteMessageErr_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_putMessageRes_usrInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_putMessageRes_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_putMessageRes_messageID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_putMessageErr_usrInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_putMessageErr_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_putMessageErr_error = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListRes_usrInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListRes_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListRes_messageIDList_loop = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListRes_messageIDList = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListRes_final = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListErr_usrInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListErr_assignmentID = -1;
-static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListErr_error = -1;
-static int hf_org_csapi_ui_IpUIAdminManager_getMessageReq_return = -1;
-static int hf_org_csapi_ui_IpUIAdminManager_getMessageReq_usrInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpUIAdminManager_getMessageReq_messageID = -1;
-static int hf_org_csapi_ui_IpUIAdminManager_putMessageReq_return = -1;
-static int hf_org_csapi_ui_IpUIAdminManager_putMessageReq_usrInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpUIAdminManager_deleteMessageReq_return = -1;
-static int hf_org_csapi_ui_IpUIAdminManager_deleteMessageReq_usrInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpUIAdminManager_deleteMessageReq_messageID = -1;
-static int hf_org_csapi_ui_IpUIAdminManager_getMessageListReq_return = -1;
-static int hf_org_csapi_ui_IpUIAdminManager_getMessageListReq_usrInteractionSessionID = -1;
-static int hf_org_csapi_ui_IpUIAdminManager_getMessageListReq_reset = -1;
-static int hf_org_csapi_mm_ul_IpAppUserLocation_locationReportRes_assignmentId = -1;
-static int hf_org_csapi_mm_ul_IpAppUserLocation_locationReportRes_locations_loop = -1;
-static int hf_org_csapi_mm_ul_IpAppUserLocation_locationReportErr_assignmentId = -1;
-static int hf_org_csapi_mm_ul_IpAppUserLocation_locationReportErr_cause = -1;
-static int hf_org_csapi_mm_ul_IpAppUserLocation_locationReportErr_diagnostic = -1;
-static int hf_org_csapi_mm_ul_IpAppUserLocation_extendedLocationReportRes_assignmentId = -1;
-static int hf_org_csapi_mm_ul_IpAppUserLocation_extendedLocationReportRes_locations_loop = -1;
-static int hf_org_csapi_mm_ul_IpAppUserLocation_extendedLocationReportErr_assignmentId = -1;
-static int hf_org_csapi_mm_ul_IpAppUserLocation_extendedLocationReportErr_cause = -1;
-static int hf_org_csapi_mm_ul_IpAppUserLocation_extendedLocationReportErr_diagnostic = -1;
-static int hf_org_csapi_mm_ul_IpAppUserLocation_periodicLocationReport_assignmentId = -1;
-static int hf_org_csapi_mm_ul_IpAppUserLocation_periodicLocationReport_locations_loop = -1;
-static int hf_org_csapi_mm_ul_IpAppUserLocation_periodicLocationReportErr_assignmentId = -1;
-static int hf_org_csapi_mm_ul_IpAppUserLocation_periodicLocationReportErr_cause = -1;
-static int hf_org_csapi_mm_ul_IpAppUserLocation_periodicLocationReportErr_diagnostic = -1;
-static int hf_org_csapi_mm_ul_IpUserLocation_locationReportReq_return = -1;
-static int hf_org_csapi_mm_ul_IpUserLocation_locationReportReq_users_loop = -1;
-static int hf_org_csapi_mm_ul_IpUserLocation_extendedLocationReportReq_return = -1;
-static int hf_org_csapi_mm_ul_IpUserLocation_extendedLocationReportReq_users_loop = -1;
-static int hf_org_csapi_mm_ul_IpUserLocation_periodicLocationReportingStartReq_return = -1;
-static int hf_org_csapi_mm_ul_IpUserLocation_periodicLocationReportingStartReq_users_loop = -1;
-static int hf_org_csapi_mm_ul_IpUserLocation_periodicLocationReportingStartReq_reportingInterval = -1;
-static int hf_org_csapi_mm_ul_IpUserLocation_getNextPeriodicLocationRequest_reset = -1;
-static int hf_org_csapi_mm_ul_IpAppTriggeredUserLocation_triggeredLocationReport_assignmentId = -1;
-static int hf_org_csapi_mm_ul_IpAppTriggeredUserLocation_triggeredLocationReport_criterion = -1;
-static int hf_org_csapi_mm_ul_IpAppTriggeredUserLocation_triggeredLocationReportErr_assignmentId = -1;
-static int hf_org_csapi_mm_ul_IpAppTriggeredUserLocation_triggeredLocationReportErr_cause = -1;
-static int hf_org_csapi_mm_ul_IpAppTriggeredUserLocation_triggeredLocationReportErr_diagnostic = -1;
-static int hf_org_csapi_mm_ul_IpTriggeredUserLocation_triggeredLocationReportingStartReq_return = -1;
-static int hf_org_csapi_mm_ul_IpTriggeredUserLocation_triggeredLocationReportingStartReq_users_loop = -1;
-static int hf_org_csapi_mm_ul_IpTriggeredUserLocation_triggeredLocationReportingStartReq_triggers_loop = -1;
-static int hf_org_csapi_mm_ul_IpTriggeredUserLocation_getNextTriggeredLocationRequest_reset = -1;
-static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_locationReportRes_assignmentId = -1;
-static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_locationReportRes_locations_loop = -1;
-static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_locationReportErr_assignmentId = -1;
-static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_locationReportErr_cause = -1;
-static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_locationReportErr_diagnostic = -1;
-static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_periodicLocationReport_assignmentId = -1;
-static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_periodicLocationReport_locations_loop = -1;
-static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_periodicLocationReportErr_assignmentId = -1;
-static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_periodicLocationReportErr_cause = -1;
-static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_periodicLocationReportErr_diagnostic = -1;
-static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_triggeredLocationReport_assignmentId = -1;
-static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_triggeredLocationReportErr_assignmentId = -1;
-static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_triggeredLocationReportErr_cause = -1;
-static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_triggeredLocationReportErr_diagnostic = -1;
-static int hf_org_csapi_mm_ulc_IpUserLocationCamel_locationReportReq_return = -1;
-static int hf_org_csapi_mm_ulc_IpUserLocationCamel_locationReportReq_users_loop = -1;
-static int hf_org_csapi_mm_ulc_IpUserLocationCamel_periodicLocationReportingStartReq_return = -1;
-static int hf_org_csapi_mm_ulc_IpUserLocationCamel_periodicLocationReportingStartReq_users_loop = -1;
-static int hf_org_csapi_mm_ulc_IpUserLocationCamel_periodicLocationReportingStartReq_reportingInterval = -1;
-static int hf_org_csapi_mm_ulc_IpUserLocationCamel_triggeredLocationReportingStartReq_return = -1;
-static int hf_org_csapi_mm_ulc_IpUserLocationCamel_triggeredLocationReportingStartReq_users_loop = -1;
-static int hf_org_csapi_mm_ulc_IpUserLocationCamel_getNextPeriodicLocationRequest_reset = -1;
-static int hf_org_csapi_mm_ulc_IpUserLocationCamel_getNextTriggeredLocationRequest_reset = -1;
-static int hf_org_csapi_mm_ule_IpAppUserLocationEmergency_emergencyLocationReport_assignmentId = -1;
-static int hf_org_csapi_mm_ule_IpAppUserLocationEmergency_emergencyLocationReportErr_assignmentId = -1;
-static int hf_org_csapi_mm_ule_IpAppUserLocationEmergency_emergencyLocationReportErr_cause = -1;
-static int hf_org_csapi_mm_ule_IpAppUserLocationEmergency_emergencyLocationReportErr_diagnostic = -1;
-static int hf_org_csapi_mm_ule_IpUserLocationEmergency_emergencyLocationReportReq_return = -1;
-static int hf_org_csapi_mm_ule_IpUserLocationEmergency_subscribeEmergencyLocationReports_return = -1;
-static int hf_org_csapi_mm_ule_IpUserLocationEmergency_unSubscribeEmergencyLocationReports_assignmentId = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_statusReportRes_assignmentId = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_statusReportRes_status_loop = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_statusReportErr_assignmentId = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_statusReportErr_cause = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_statusReportErr_diagnostic = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_triggeredStatusReport_assignmentId = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_triggeredStatusReportErr_assignmentId = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_triggeredStatusReportErr_cause = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_triggeredStatusReportErr_diagnostic = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_extendedStatusReportRes_assignmentId = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_extendedStatusReportRes_status_loop = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_extendedStatusReportErr_assignmentId = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_extendedStatusReportErr_cause = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_extendedStatusReportErr_diagnostic = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_extTriggeredStatusReport_assignmentId = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_extTriggeredStatusReportErr_assignmentId = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_extTriggeredStatusReportErr_cause = -1;
-static int hf_org_csapi_mm_us_IpAppUserStatus_extTriggeredStatusReportErr_diagnostic = -1;
-static int hf_org_csapi_mm_us_IpUserStatus_statusReportReq_return = -1;
-static int hf_org_csapi_mm_us_IpUserStatus_statusReportReq_users_loop = -1;
-static int hf_org_csapi_mm_us_IpUserStatus_triggeredStatusReportingStartReq_return = -1;
-static int hf_org_csapi_mm_us_IpUserStatus_triggeredStatusReportingStartReq_users_loop = -1;
-static int hf_org_csapi_mm_us_IpUserStatus_getNextTriggeredStatusRequest_reset = -1;
-static int hf_org_csapi_mm_us_IpUserStatus_extendedStatusReportReq_return = -1;
-static int hf_org_csapi_mm_us_IpUserStatus_extendedStatusReportReq_users_loop = -1;
-static int hf_org_csapi_mm_us_IpUserStatus_extTriggeredStatusReportingStartReq_return = -1;
-static int hf_org_csapi_mm_us_IpUserStatus_extTriggeredStatusReportingStartReq_users_loop = -1;
-static int hf_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification_return_loop = -1;
-static int hf_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification_assignmentId = -1;
-static int hf_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification_contactInformation_loop = -1;
-static int hf_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotificationStartErr_assignmentId = -1;
-static int hf_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotificationStartErr_cause = -1;
-static int hf_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotificationStartErr_diagnostic = -1;
-static int hf_org_csapi_mm_ub_IpUserBinding_triggeredBindingRequestNotificationStartReq_return = -1;
-static int hf_org_csapi_mm_ub_IpUserBinding_triggeredBindingRequestNotificationStartReq_users_loop = -1;
-static int hf_org_csapi_mm_ub_IpUserBinding_triggeredBindingRequestNotificationStartReq_criteria_loop = -1;
-static int hf_org_csapi_mm_ub_IpUserBinding_triggeredBindingRequestNotificationStop_assignmentId = -1;
-static int hf_org_csapi_termcap_IpTerminalCapabilities_getTerminalCapabilities_terminalIdentity = -1;
-static int hf_org_csapi_termcap_IpAppExtendedTerminalCapabilities_triggeredTerminalCapabilityReport_assignmentID = -1;
-static int hf_org_csapi_termcap_IpAppExtendedTerminalCapabilities_triggeredTerminalCapabilityReport_terminals_loop = -1;
-static int hf_org_csapi_termcap_IpAppExtendedTerminalCapabilities_triggeredTerminalCapabilityReport_criteria = -1;
-static int hf_org_csapi_termcap_IpAppExtendedTerminalCapabilities_triggeredTerminalCapabilityReportErr_assignmentId = -1;
-static int hf_org_csapi_termcap_IpAppExtendedTerminalCapabilities_triggeredTerminalCapabilityReportErr_terminals_loop = -1;
-static int hf_org_csapi_termcap_IpAppExtendedTerminalCapabilities_triggeredTerminalCapabilityReportErr_cause = -1;
-static int hf_org_csapi_termcap_IpExtendedTerminalCapabilities_triggeredTerminalCapabilityStartReq_return = -1;
-static int hf_org_csapi_termcap_IpExtendedTerminalCapabilities_triggeredTerminalCapabilityStartReq_terminals_loop = -1;
-static int hf_org_csapi_termcap_IpExtendedTerminalCapabilities_triggeredTerminalCapabilityStartReq_criteria = -1;
-static int hf_org_csapi_termcap_IpExtendedTerminalCapabilities_triggeredTerminalCapabilityStop_assignmentID = -1;
-static int hf_org_csapi_dsc_IpAppDataSession_connectRes_dataSessionID = -1;
-static int hf_org_csapi_dsc_IpAppDataSession_connectRes_assignmentID = -1;
-static int hf_org_csapi_dsc_IpAppDataSession_connectErr_dataSessionID = -1;
-static int hf_org_csapi_dsc_IpAppDataSession_connectErr_assignmentID = -1;
-static int hf_org_csapi_dsc_IpAppDataSession_superviseDataSessionRes_dataSessionID = -1;
-static int hf_org_csapi_dsc_IpAppDataSession_superviseDataSessionRes_report = -1;
-static int hf_org_csapi_dsc_IpAppDataSession_superviseDataSessionRes_qualityOfService = -1;
-static int hf_org_csapi_dsc_IpAppDataSession_superviseDataSessionErr_dataSessionID = -1;
-static int hf_org_csapi_dsc_IpAppDataSession_dataSessionFaultDetected_dataSessionID = -1;
-static int hf_org_csapi_dsc_IpAppDataSession_dataSessionFaultDetected_fault = -1;
-static int hf_org_csapi_dsc_IpAppDataSessionControlManager_dataSessionAborted_dataSession = -1;
-static int hf_org_csapi_dsc_IpAppDataSessionControlManager_reportNotification_assignmentID = -1;
-static int hf_org_csapi_dsc_IpAppDataSessionControlManager_abortMultipleDataSessions_dataSessionSet_loop = -1;
-static int hf_org_csapi_dsc_IpAppDataSessionControlManager_abortMultipleDataSessions_dataSessionSet = -1;
-static int hf_org_csapi_dsc_IpDataSession_connectReq_return = -1;
-static int hf_org_csapi_dsc_IpDataSession_connectReq_dataSessionID = -1;
-static int hf_org_csapi_dsc_IpDataSession_connectReq_responseRequested_loop = -1;
-static int hf_org_csapi_dsc_IpDataSession_release_dataSessionID = -1;
-static int hf_org_csapi_dsc_IpDataSession_superviseDataSessionReq_dataSessionID = -1;
-static int hf_org_csapi_dsc_IpDataSession_superviseDataSessionReq_treatment = -1;
-static int hf_org_csapi_dsc_IpDataSession_setDataSessionChargePlan_dataSessionID = -1;
-static int hf_org_csapi_dsc_IpDataSession_setAdviceOfCharge_dataSessionID = -1;
-static int hf_org_csapi_dsc_IpDataSession_setAdviceOfCharge_tariffSwitch = -1;
-static int hf_org_csapi_dsc_IpDataSession_deassignDataSession_dataSessionID = -1;
-static int hf_org_csapi_dsc_IpDataSession_continueProcessing_dataSessionID = -1;
-static int hf_org_csapi_dsc_IpDataSessionControlManager_createNotification_return = -1;
-static int hf_org_csapi_dsc_IpDataSessionControlManager_destroyNotification_assignmentID = -1;
-static int hf_org_csapi_dsc_IpDataSessionControlManager_changeNotification_assignmentID = -1;
-static int hf_org_csapi_dsc_IpDataSessionControlManager_enableNotifications_return = -1;
-static int hf_org_csapi_dsc_IpDataSessionControlManager_getNotifications_return_loop = -1;
-static int hf_org_csapi_dsc_IpDataSessionControlManager_createNotifications_return = -1;
-static int hf_org_csapi_gms_IpMessagingManager_openMailbox_authenticationInfo = -1;
-static int hf_org_csapi_gms_IpMessagingManager_enableMessagingNotification_return = -1;
-static int hf_org_csapi_gms_IpMessagingManager_disableMessagingNotification_assignmentID = -1;
-static int hf_org_csapi_gms_IpAppMessagingManager_mailboxTerminated_mailboxSessionID = -1;
-static int hf_org_csapi_gms_IpAppMessagingManager_mailboxFaultDetected_mailboxSessionID = -1;
-static int hf_org_csapi_gms_IpAppMessagingManager_mailboxFaultDetected_fault = -1;
-static int hf_org_csapi_gms_IpAppMessagingManager_messagingEventNotify_assignmentID = -1;
-static int hf_org_csapi_gms_IpMailbox_close_mailboxSessionID = -1;
-static int hf_org_csapi_gms_IpMailbox_lock_mailboxSessionID = -1;
-static int hf_org_csapi_gms_IpMailbox_unlock_mailboxSessionID = -1;
-static int hf_org_csapi_gms_IpMailbox_getInfoAmount_return = -1;
-static int hf_org_csapi_gms_IpMailbox_getInfoAmount_mailboxSessionID = -1;
-static int hf_org_csapi_gms_IpMailbox_getInfoProperties_return_loop = -1;
-static int hf_org_csapi_gms_IpMailbox_getInfoProperties_mailboxSessionID = -1;
-static int hf_org_csapi_gms_IpMailbox_getInfoProperties_firstProperty = -1;
-static int hf_org_csapi_gms_IpMailbox_getInfoProperties_numberOfProperties = -1;
-static int hf_org_csapi_gms_IpMailbox_setInfoProperties_mailboxSessionID = -1;
-static int hf_org_csapi_gms_IpMailbox_setInfoProperties_firstProperty = -1;
-static int hf_org_csapi_gms_IpMailbox_setInfoProperties_mailboxInfoProperties_loop = -1;
-static int hf_org_csapi_gms_IpMailbox_openFolder_mailboxSessionID = -1;
-static int hf_org_csapi_gms_IpMailbox_openFolder_folderID = -1;
-static int hf_org_csapi_gms_IpMailbox_createFolder_mailboxSessionID = -1;
-static int hf_org_csapi_gms_IpMailbox_createFolder_folderID = -1;
-static int hf_org_csapi_gms_IpMailbox_remove_authenticationInfo = -1;
-static int hf_org_csapi_gms_IpMessage_getInfoAmount_return = -1;
-static int hf_org_csapi_gms_IpMessage_getInfoAmount_folderSessionID = -1;
-static int hf_org_csapi_gms_IpMessage_getInfoAmount_messageID = -1;
-static int hf_org_csapi_gms_IpMessage_getInfoProperties_return_loop = -1;
-static int hf_org_csapi_gms_IpMessage_getInfoProperties_folderSessionID = -1;
-static int hf_org_csapi_gms_IpMessage_getInfoProperties_messageID = -1;
-static int hf_org_csapi_gms_IpMessage_getInfoProperties_firstProperty = -1;
-static int hf_org_csapi_gms_IpMessage_getInfoProperties_numberOfProperties = -1;
-static int hf_org_csapi_gms_IpMessage_setInfoProperties_folderSessionID = -1;
-static int hf_org_csapi_gms_IpMessage_setInfoProperties_messageID = -1;
-static int hf_org_csapi_gms_IpMessage_setInfoProperties_firstProperty = -1;
-static int hf_org_csapi_gms_IpMessage_setInfoProperties_messageInfoProperties_loop = -1;
-static int hf_org_csapi_gms_IpMessage_remove_folderSessionID = -1;
-static int hf_org_csapi_gms_IpMessage_remove_messageID = -1;
-static int hf_org_csapi_gms_IpMessage_getContent_return = -1;
-static int hf_org_csapi_gms_IpMessage_getContent_folderSessionID = -1;
-static int hf_org_csapi_gms_IpMessage_getContent_messageID = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_getInfoAmount_return = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_getInfoAmount_folderSessionID = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_getInfoProperties_return_loop = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_getInfoProperties_folderSessionID = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_getInfoProperties_firstProperty = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_getInfoProperties_numberOfProperties = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_setInfoProperties_folderSessionID = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_setInfoProperties_firstProperty = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_setInfoProperties_folderInfoProperties_loop = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_putMessage_folderSessionID = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_putMessage_message = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_putMessage_messageInfoProperties_loop = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_getMessage_folderSessionID = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_getMessage_messageID = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_close_mailboxSessionID = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_close_folderSessionID = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_remove_mailboxSessionID = -1;
-static int hf_org_csapi_gms_IpMailboxFolder_remove_folderID = -1;
-static int hf_org_csapi_cm_IpVPrP_getVPrPID_return = -1;
-static int hf_org_csapi_cm_IpVPrP_getSlaID_return = -1;
-static int hf_org_csapi_cm_IpVPrP_getStatus_return = -1;
-static int hf_org_csapi_cm_IpVPrN_getVPrPList_return_loop = -1;
-static int hf_org_csapi_cm_IpVPrN_getVPrPList_return = -1;
-static int hf_org_csapi_cm_IpVPrN_getVPrP_vPrPID = -1;
-static int hf_org_csapi_cm_IpVPrN_deleteVPrP_vPrPID = -1;
-static int hf_org_csapi_cm_IpQoSMenu_getTemplate_templateType = -1;
-static int hf_org_csapi_cm_IpQoSMenu_getTemplateList_return_loop = -1;
-static int hf_org_csapi_cm_IpQoSMenu_getTemplateList_return = -1;
-static int hf_org_csapi_cm_IpQoSTemplate_getTemplateType_return = -1;
-static int hf_org_csapi_cm_IpQoSTemplate_getDescription_return = -1;
-static int hf_org_csapi_cm_IpQoSTemplate_setSlaID_slaID = -1;
-static int hf_org_csapi_cm_IpEnterpriseNetwork_getSiteList_return_loop = -1;
-static int hf_org_csapi_cm_IpEnterpriseNetwork_getSiteList_return = -1;
-static int hf_org_csapi_cm_IpEnterpriseNetwork_getSite_siteID = -1;
-static int hf_org_csapi_cm_IpEnterpriseNetworkSite_getSAPList_return_loop = -1;
-static int hf_org_csapi_cm_IpEnterpriseNetworkSite_getSAPList_return = -1;
-static int hf_org_csapi_cm_IpEnterpriseNetworkSite_getSiteID_return = -1;
-static int hf_org_csapi_cm_IpEnterpriseNetworkSite_getSiteLocation_return = -1;
-static int hf_org_csapi_cm_IpEnterpriseNetworkSite_getSiteDescription_return = -1;
-static int hf_org_csapi_cm_IpEnterpriseNetworkSite_getSAPIPSubnet_sapID = -1;
-static int hf_org_csapi_am_IpAppAccountManager_reportNotification_assignmentId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryBalanceRes_queryId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryBalanceRes_balances_loop = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryBalanceErr_queryId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryBalanceErr_cause = -1;
-static int hf_org_csapi_am_IpAppAccountManager_retrieveTransactionHistoryRes_retrievalID = -1;
-static int hf_org_csapi_am_IpAppAccountManager_retrieveTransactionHistoryRes_transactionHistory_loop = -1;
-static int hf_org_csapi_am_IpAppAccountManager_retrieveTransactionHistoryErr_retrievalID = -1;
-static int hf_org_csapi_am_IpAppAccountManager_retrieveTransactionHistoryErr_transactionHistoryError = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryBalanceExpiryDateRes_queryId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryBalanceExpiryDateRes_dates_loop = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryBalanceExpiryDateErr_queryId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryBalanceExpiryDateErr_cause = -1;
-static int hf_org_csapi_am_IpAppAccountManager_updateBalanceRes_requestId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_updateBalanceErr_requestId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_updateBalanceErr_cause = -1;
-static int hf_org_csapi_am_IpAppAccountManager_createVoucherRes_requestId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_createVoucherRes_voucherId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_createVoucherErr_requestId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_createVoucherErr_cause = -1;
-static int hf_org_csapi_am_IpAppAccountManager_destroyVoucherRes_requestId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_destroyVoucherRes_voucherId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_destroyVoucherErr_requestId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_destroyVoucherErr_voucherId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_destroyVoucherErr_cause = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryVoucherRes_queryId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryVoucherErr_queryId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryVoucherErr_voucherId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryVoucherErr_cause = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryUserVouchersRes_queryId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryUserVouchersRes_vouchers_loop = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryUserVouchersErr_queryId = -1;
-static int hf_org_csapi_am_IpAppAccountManager_queryUserVouchersErr_cause = -1;
-static int hf_org_csapi_am_IpAccountManager_createNotification_return = -1;
-static int hf_org_csapi_am_IpAccountManager_destroyNotification_assignmentId = -1;
-static int hf_org_csapi_am_IpAccountManager_queryBalanceReq_return = -1;
-static int hf_org_csapi_am_IpAccountManager_queryBalanceReq_users_loop = -1;
-static int hf_org_csapi_am_IpAccountManager_changeNotification_assignmentID = -1;
-static int hf_org_csapi_am_IpAccountManager_getNotification_return_loop = -1;
-static int hf_org_csapi_am_IpAccountManager_retrieveTransactionHistoryReq_return = -1;
-static int hf_org_csapi_am_IpAccountManager_enableNotifications_return = -1;
-static int hf_org_csapi_am_IpAccountManager_queryBalanceExpiryDateReq_return = -1;
-static int hf_org_csapi_am_IpAccountManager_queryBalanceExpiryDateReq_users_loop = -1;
-static int hf_org_csapi_am_IpAccountManager_updateBalanceReq_return = -1;
-static int hf_org_csapi_am_IpAccountManager_updateBalanceReq_debit = -1;
-static int hf_org_csapi_am_IpAccountManager_updateBalanceReq_period = -1;
-static int hf_org_csapi_am_IpAccountManager_createVoucherReq_return = -1;
-static int hf_org_csapi_am_IpAccountManager_destroyVoucherReq_return = -1;
-static int hf_org_csapi_am_IpAccountManager_destroyVoucherReq_voucherId = -1;
-static int hf_org_csapi_am_IpAccountManager_queryVoucherReq_return = -1;
-static int hf_org_csapi_am_IpAccountManager_queryVoucherReq_voucherId = -1;
-static int hf_org_csapi_am_IpAccountManager_queryUserVouchersReq_return = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditAmountErr_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditAmountErr_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditAmountErr_error = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditAmountErr_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditAmountRes_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditAmountRes_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditAmountRes_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditUnitErr_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditUnitErr_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditUnitErr_error = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditUnitErr_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditUnitRes_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditUnitRes_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditUnitRes_creditedVolumes_loop = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditUnitRes_reservedUnitsLeft_loop = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_creditUnitRes_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitAmountErr_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitAmountErr_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitAmountErr_error = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitAmountErr_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitAmountRes_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitAmountRes_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitAmountRes_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitUnitErr_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitUnitErr_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitUnitErr_error = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitUnitErr_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitUnitRes_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitUnitRes_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitUnitRes_debitedVolumes_loop = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitUnitRes_reservedUnitsLeft_loop = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_debitUnitRes_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directCreditAmountErr_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directCreditAmountErr_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directCreditAmountErr_error = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directCreditAmountErr_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directCreditAmountRes_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directCreditAmountRes_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directCreditAmountRes_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitErr_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitErr_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitErr_error = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitErr_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitRes_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitRes_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitRes_creditedVolumes_loop = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitRes_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directDebitAmountErr_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directDebitAmountErr_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directDebitAmountErr_error = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directDebitAmountErr_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directDebitAmountRes_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directDebitAmountRes_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directDebitAmountRes_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitErr_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitErr_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitErr_error = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitErr_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitRes_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitRes_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitRes_debitedVolumes_loop = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitRes_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_extendLifeTimeErr_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_extendLifeTimeErr_error = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_extendLifeTimeRes_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_extendLifeTimeRes_sessionTimeLeft = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_rateErr_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_rateErr_error = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_rateRes_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_rateRes_rates_loop = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_rateRes_validityTimeLeft = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountErr_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountErr_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountErr_error = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountErr_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountRes_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountRes_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountRes_sessionTimeLeft = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountRes_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitErr_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitErr_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitErr_error = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitErr_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitRes_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitRes_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitRes_reservedUnits_loop = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitRes_sessionTimeLeft = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitRes_requestNumberNextRequest = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_sessionEnded_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingSession_sessionEnded_report = -1;
-static int hf_org_csapi_cs_IpChargingSession_creditAmountReq_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_creditAmountReq_closeReservation = -1;
-static int hf_org_csapi_cs_IpChargingSession_creditAmountReq_requestNumber = -1;
-static int hf_org_csapi_cs_IpChargingSession_creditUnitReq_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_creditUnitReq_volumes_loop = -1;
-static int hf_org_csapi_cs_IpChargingSession_creditUnitReq_closeReservation = -1;
-static int hf_org_csapi_cs_IpChargingSession_creditUnitReq_requestNumber = -1;
-static int hf_org_csapi_cs_IpChargingSession_debitAmountReq_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_debitAmountReq_closeReservation = -1;
-static int hf_org_csapi_cs_IpChargingSession_debitAmountReq_requestNumber = -1;
-static int hf_org_csapi_cs_IpChargingSession_debitUnitReq_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_debitUnitReq_volumes_loop = -1;
-static int hf_org_csapi_cs_IpChargingSession_debitUnitReq_closeReservation = -1;
-static int hf_org_csapi_cs_IpChargingSession_debitUnitReq_requestNumber = -1;
-static int hf_org_csapi_cs_IpChargingSession_directCreditAmountReq_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_directCreditAmountReq_chargingParameters_loop = -1;
-static int hf_org_csapi_cs_IpChargingSession_directCreditAmountReq_requestNumber = -1;
-static int hf_org_csapi_cs_IpChargingSession_directCreditUnitReq_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_directCreditUnitReq_chargingParameters_loop = -1;
-static int hf_org_csapi_cs_IpChargingSession_directCreditUnitReq_volumes_loop = -1;
-static int hf_org_csapi_cs_IpChargingSession_directCreditUnitReq_requestNumber = -1;
-static int hf_org_csapi_cs_IpChargingSession_directDebitAmountReq_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_directDebitAmountReq_chargingParameters_loop = -1;
-static int hf_org_csapi_cs_IpChargingSession_directDebitAmountReq_requestNumber = -1;
-static int hf_org_csapi_cs_IpChargingSession_directDebitUnitReq_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_directDebitUnitReq_chargingParameters_loop = -1;
-static int hf_org_csapi_cs_IpChargingSession_directDebitUnitReq_volumes_loop = -1;
-static int hf_org_csapi_cs_IpChargingSession_directDebitUnitReq_requestNumber = -1;
-static int hf_org_csapi_cs_IpChargingSession_extendLifeTimeReq_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_getAmountLeft_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_getLifeTimeLeft_return = -1;
-static int hf_org_csapi_cs_IpChargingSession_getLifeTimeLeft_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_getUnitLeft_return_loop = -1;
-static int hf_org_csapi_cs_IpChargingSession_getUnitLeft_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_rateReq_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_rateReq_chargingParameters_loop = -1;
-static int hf_org_csapi_cs_IpChargingSession_release_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_release_requestNumber = -1;
-static int hf_org_csapi_cs_IpChargingSession_reserveAmountReq_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_reserveAmountReq_chargingParameters_loop = -1;
-static int hf_org_csapi_cs_IpChargingSession_reserveAmountReq_requestNumber = -1;
-static int hf_org_csapi_cs_IpChargingSession_reserveUnitReq_sessionID = -1;
-static int hf_org_csapi_cs_IpChargingSession_reserveUnitReq_chargingParameters_loop = -1;
-static int hf_org_csapi_cs_IpChargingSession_reserveUnitReq_volumes_loop = -1;
-static int hf_org_csapi_cs_IpChargingSession_reserveUnitReq_requestNumber = -1;
-static int hf_org_csapi_cs_IpAppChargingManager_sessionAborted_sessionID = -1;
-static int hf_org_csapi_cs_IpAppChargingManager_abortMultipleChargingSessions_chargingSessionSet_loop = -1;
-static int hf_org_csapi_cs_IpAppChargingManager_abortMultipleChargingSessions_chargingSessionSet = -1;
-static int hf_org_csapi_cs_IpChargingManager_createChargingSession_sessionDescription = -1;
-static int hf_org_csapi_cs_IpChargingManager_createSplitChargingSession_sessionDescription = -1;
-static int hf_org_csapi_cs_IpChargingManager_createSplitChargingSession_users_loop = -1;
-static int hf_org_csapi_policy_evaluation_IpAppPolicyDomain_reportNotification_assignmentID = -1;
-static int hf_org_csapi_policy_evaluation_IpAppPolicyDomain_evalPolicyRes_assignmentID = -1;
-static int hf_org_csapi_policy_evaluation_IpAppPolicyDomain_evalPolicyRes_outputVariables_loop = -1;
-static int hf_org_csapi_policy_evaluation_IpAppPolicyDomain_evalPolicyErr_assignmentID = -1;
-static int hf_org_csapi_policy_evaluation_IpAppPolicyDomain_evalPolicyErr_error = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicy_return_loop = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicy_domainName = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicy_signatureName = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicy_inputVariables_loop = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicyReq_return = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicyReq_domainName = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicyReq_signatureName = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicyReq_inputVariables_loop = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_abortEvalPolicyReq_domainName = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_abortEvalPolicyReq_assignmentID = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_generateEvent_domainName = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_generateEvent_eventDefinitionName = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_generateEvent_attributes_loop = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_createNotification_return = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_createNotification_domainName = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_createNotification_events_loop = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_createNotification_events = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_destroyNotification_assignmentID = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_destroyNotification_events_loop = -1;
-static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_destroyNotification_events = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicy_getAttribute_attributeName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicy_getAttributes_return_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicy_getAttributes_attributeNames_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicy_getAttributes_attributeNames = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicy_setAttributes_targetAttributes_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyIterator_getList_return_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyIterator_getList_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyIterator_getList_startIndex = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyIterator_getList_numberRequested = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_createRepository_repositoryName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_getRepository_repositoryName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_removeRepository_repositoryName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_getRepositoryCount_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_createCondition_conditionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_createCondition_conditionType = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_createCondition_conditionAttributes_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_getCondition_conditionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_removeCondition_conditionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_getConditionCount_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_createAction_actionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_createAction_actionType = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_createAction_actionAttributes_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_getAction_actionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_removeAction_actionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRepository_getActionCount_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_createCondition_conditionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_createCondition_conditionType = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_createCondition_conditionAttributes_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_getCondition_conditionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_removeCondition_conditionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_getConditionCount_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_createAction_actionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_createAction_actionType = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_createAction_actionAttributes_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_getAction_actionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_removeAction_actionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_getActionCount_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_setValidityPeriodConditionByName_conditionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_setConditionList_conditionList_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_getConditionList_return_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_setActionList_actionList_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyRule_getActionList_return_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyManager_createDomain_domainName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyManager_getDomain_domainName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyManager_removeDomain_domainName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyManager_getDomainCount_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyManager_findMatchingDomains_return_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyManager_findMatchingDomains_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyManager_findMatchingDomains_matchingAttributes_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyManager_createRepository_repositoryName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyManager_getRepository_repositoryName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyManager_removeRepository_repositoryName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyManager_getRepositoryCount_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyManager_commitTransaction_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyGroup_createGroup_groupName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyGroup_getGroup_groupName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyGroup_removeGroup_groupName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyGroup_getGroupCount_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyGroup_createRule_ruleName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyGroup_getRule_ruleName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyGroup_removeRule_ruleName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyGroup_getRuleCount_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyEventDefinition_setRequiredAttributes_requiredAttributes_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyEventDefinition_setOptionalAttributes_optionalAttributes_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyEventDefinition_getRequiredAttributes_return_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyEventDefinition_getOptionalAttributes_return_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_setInputVariables_inputVariables_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_setInputVariables_inputVariables = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_setOutputVariables_outputVariables_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_setOutputVariables_outputVariables = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_getInputVariables_return_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_getInputVariables_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_getOutputVariables_return_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_getOutputVariables_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_setGroupNames_groupNames_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_setGroupNames_groupNames = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_setPolicyRoles_roleNames_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_setPolicyRoles_roleNames = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_getGroupNames_return_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_getGroupNames_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_getPolicyRoles_return_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicySignature_getPolicyRoles_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createDomain_domainName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getDomain_domainName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeDomain_domainName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getDomainCount_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createGroup_groupName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getGroup_groupName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeGroup_groupName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getGroupCount_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createRule_ruleName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getRule_ruleName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeRule_ruleName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getRuleCount_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createEventDefinition_eventDefinitionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createEventDefinition_requiredAttributes_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createEventDefinition_requiredAttributes = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createEventDefinition_optionalAttributes_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createEventDefinition_optionalAttributes = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getEventDefinition_eventDefinitionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeEventDefinition_eventDefinitionName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getEventDefinitionCount_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createVariableSet_variableSetName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariableSet_return_loop = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariableSet_variableSetName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeVariableSet_variableSetName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariableSetCount_return = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createVariable_variableSetName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createVariable_variableName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_setVariableValue_variableSetName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_setVariableValue_variableName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariableType_variableSetName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariableType_variableName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariableValue_variableSetName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariableValue_variableName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariable_variableSetName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariable_variableName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeVariable_variablSetName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeVariable_variableName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createSignature_signatureName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getSignature_signatureName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeSignature_signatureName = -1;
-static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getSignatureCount_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createIdentity_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createIdentity_identityTypes_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createIdentity_identityTypes = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createIdentity_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createIdentity_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_deleteIdentity_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_deleteIdentity_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_deleteIdentity_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isIdentity_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isIdentity_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isIdentity_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isIdentity_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createGroupIdentity_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createGroupIdentity_identityTypes_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createGroupIdentity_identityTypes = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createGroupIdentity_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createGroupIdentity_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_deleteGroupIdentity_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_deleteGroupIdentity_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_deleteGroupIdentity_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addToGroup_group = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addToGroup_member = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addToGroup_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addToGroup_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeFromGroup_group = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeFromGroup_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeFromGroup_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeFromGroup_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listMembers_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listMembers_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listMembers_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listMembers_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listMembers_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isGroupIdentity_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isGroupIdentity_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isGroupIdentity_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isGroupIdentity_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listGroupMembership_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listGroupMembership_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listGroupMembership_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listGroupMembership_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listGroupMembership_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addAlias_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addAlias_alias = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addAlias_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addAlias_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeAliases_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeAliases_alias = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeAliases_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeAliases_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listAliases_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listAliases_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listAliases_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listAliases_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listAliases_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_lookupByAlias_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_lookupByAlias_alias = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_lookupByAlias_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_lookupByAlias_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_associateTypes_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_associateTypes_identityTypes_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_associateTypes_identityTypes = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_associateTypes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_associateTypes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_disassociateTypes_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_disassociateTypes_identityTypes_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_disassociateTypes_identityTypes = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_disassociateTypes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_disassociateTypes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listTypesOfIdentity_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listTypesOfIdentity_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listTypesOfIdentity_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listTypesOfIdentity_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listTypesOfIdentity_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_hasType_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_hasType_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_hasType_typeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_hasType_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_hasType_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_getIdentityAttributes_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_getIdentityAttributes_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_getIdentityAttributes_identityType = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_getIdentityAttributes_attributeNames_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_getIdentityAttributes_attributeNames = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_getIdentityAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_getIdentityAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_setIdentityAttributes_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_setIdentityAttributes_identityType = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_setIdentityAttributes_attributes_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_setIdentityAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_setIdentityAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_createAgent_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_createAgent_agentTypes_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_createAgent_agentTypes = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_createAgent_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_createAgent_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_deleteAgent_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_deleteAgent_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_deleteAgent_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isAgent_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isAgent_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isAgent_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isAgent_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_enableCapabilities_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_enableCapabilities_capabilities_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_enableCapabilities_capabilities = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_enableCapabilities_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_enableCapabilities_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disableCapabilities_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disableCapabilities_capabilities_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disableCapabilities_capabilities = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disableCapabilities_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disableCapabilities_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listEnabledCapabilities_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listEnabledCapabilities_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listEnabledCapabilities_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listEnabledCapabilities_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listEnabledCapabilities_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listAllCapabilities_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listAllCapabilities_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listAllCapabilities_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listAllCapabilities_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listAllCapabilities_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isCapableOf_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isCapableOf_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isCapableOf_capability = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isCapableOf_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isCapableOf_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_associateTypes_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_associateTypes_agentTypes_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_associateTypes_agentTypes = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_associateTypes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_associateTypes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disassociateTypes_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disassociateTypes_agentTypes_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disassociateTypes_agentTypes = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disassociateTypes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disassociateTypes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listTypesOfAgent_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listTypesOfAgent_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listTypesOfAgent_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listTypesOfAgent_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listTypesOfAgent_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_hasType_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_hasType_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_hasType_typeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_hasType_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_hasType_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_getAgentAttributes_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_getAgentAttributes_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_getAgentAttributes_agentType = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_getAgentAttributes_attributeNames_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_getAgentAttributes_attributeNames = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_getAgentAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_getAgentAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_setAgentAttributes_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_setAgentAttributes_agentType = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_setAgentAttributes_attributes_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_setAgentAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_setAgentAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_assignAgent_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_assignAgent_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_assignAgent_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_assignAgent_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_unassignAgent_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_unassignAgent_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_unassignAgent_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_unassignAgent_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgents_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgents_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgents_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgents_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgents_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssociatedIdentitiesOfAgent_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssociatedIdentitiesOfAgent_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssociatedIdentitiesOfAgent_agentName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssociatedIdentitiesOfAgent_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssociatedIdentitiesOfAgent_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgentsByCapability_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgentsByCapability_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgentsByCapability_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgentsByCapability_capability = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgentsByCapability_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgentsByCapability_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listCapabilitiesOfIdentity_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listCapabilitiesOfIdentity_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listCapabilitiesOfIdentity_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listCapabilitiesOfIdentity_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listCapabilitiesOfIdentity_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_isIdentityCapableOf_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_isIdentityCapableOf_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_isIdentityCapableOf_capability = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_isIdentityCapableOf_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_isIdentityCapableOf_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_createIdentityAttribute_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_createIdentityAttribute_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_deleteIdentityAttribute_attributeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_deleteIdentityAttribute_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_deleteIdentityAttribute_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_getIdentityAttributeDefinition_attributeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_getIdentityAttributeDefinition_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_getIdentityAttributeDefinition_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listAllIdentityAttributes_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listAllIdentityAttributes_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listAllIdentityAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listAllIdentityAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_createIdentityType_typeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_createIdentityType_attributeNames_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_createIdentityType_attributeNames = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_createIdentityType_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_createIdentityType_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_deleteIdentityType_typeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_deleteIdentityType_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_deleteIdentityType_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypes_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypes_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_addIdentityTypeAttributes_typeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_addIdentityTypeAttributes_attributeNames_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_addIdentityTypeAttributes_attributeNames = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_addIdentityTypeAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_addIdentityTypeAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_removeIdentityTypeAttributes_typeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_removeIdentityTypeAttributes_attributeNames_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_removeIdentityTypeAttributes_attributeNames = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_removeIdentityTypeAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_removeIdentityTypeAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypeAttributes_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypeAttributes_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypeAttributes_typeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypeAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypeAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_createAgentAttribute_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_createAgentAttribute_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_deleteAgentAttribute_attributeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_deleteAgentAttribute_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_deleteAgentAttribute_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_getAgentAttributeDefinition_attributeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_getAgentAttributeDefinition_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_getAgentAttributeDefinition_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAllAgentAttributes_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAllAgentAttributes_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAllAgentAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAllAgentAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_createAgentType_typeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_createAgentType_attributeNames_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_createAgentType_attributeNames = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_createAgentType_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_createAgentType_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_deleteAgentType_typeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_deleteAgentType_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_deleteAgentType_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypes_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypes_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_addAgentTypeAttributes_typeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_addAgentTypeAttributes_attributeNames_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_addAgentTypeAttributes_attributeNames = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_addAgentTypeAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_addAgentTypeAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_removeAgentTypeAttributes_typeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_removeAgentTypeAttributes_attributeNames_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_removeAgentTypeAttributes_attributeNames = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_removeAgentTypeAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_removeAgentTypeAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypeAttributes_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypeAttributes_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypeAttributes_typeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypeAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypeAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_createCapabilityAttribute_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_createCapabilityAttribute_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_deleteCapabilityAttribute_attributeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_deleteCapabilityAttribute_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_deleteCapabilityAttribute_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_getCapabilityAttributeDefinition_attributeName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_getCapabilityAttributeDefinition_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_getCapabilityAttributeDefinition_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listAllCapabilityAttributes_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listAllCapabilityAttributes_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listAllCapabilityAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listAllCapabilityAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_createCapability_capabilityName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_createCapability_attributeNames_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_createCapability_attributeNames = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_createCapability_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_createCapability_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_deleteCapability_capabilityName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_deleteCapability_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_deleteCapability_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilities_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilities_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilities_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilities_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_addCapabilityAttributes_capabilityName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_addCapabilityAttributes_attributeNames_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_addCapabilityAttributes_attributeNames = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_addCapabilityAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_addCapabilityAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_removeCapabilityAttributes_capabilityName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_removeCapabilityAttributes_attributeNames_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_removeCapabilityAttributes_attributeNames = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_removeCapabilityAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_removeCapabilityAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilityAttributes_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilityAttributes_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilityAttributes_capabilityName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilityAttributes_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilityAttributes_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_assignCapabilitiesToType_agentType = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_assignCapabilitiesToType_capabilities_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_assignCapabilitiesToType_capabilities = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_assignCapabilitiesToType_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_assignCapabilitiesToType_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_unassignCapabilitiesFromType_agentType = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_unassignCapabilitiesFromType_capabilities_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_unassignCapabilitiesFromType_capabilities = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_unassignCapabilitiesFromType_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_unassignCapabilitiesFromType_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilitiesOfType_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilitiesOfType_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilitiesOfType_agentType = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilitiesOfType_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilitiesOfType_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_getAuthToken_return_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_getAuthToken_return = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_getAuthToken_askerData_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_obtainInterface_interfaceName = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_getAccessControl_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_getAccessControl_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_getAccessControl_authToken = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_setAccessControl_identity = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_setAccessControl_operation = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_setAccessControl_authToken_loop = -1;
-static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_setAccessControl_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresence_identity = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresence_identityType = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresence_attributes_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresence_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresence_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenceExpiration_identity = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenceExpiration_identityType = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenceExpiration_attributeNames_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenceExpiration_attributeNames = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenceExpiration_expiresIn = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenceExpiration_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenceExpiration_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_getIdentityPresence_return_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_getIdentityPresence_identity = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_getIdentityPresence_identityType = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_getIdentityPresence_attributeNames_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_getIdentityPresence_attributeNames = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_getIdentityPresence_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMIdentityPresence_getIdentityPresence_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresence_agent = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresence_agentType = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresence_attributes_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresence_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresence_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresence_agent = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresence_capability = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresence_attributes_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresence_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresence_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpiration_agent = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpiration_agentType = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpiration_attributeNames_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpiration_attributeNames = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpiration_expiresIn = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpiration_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpiration_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresenceExpiration_agent = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresenceExpiration_capability = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresenceExpiration_attributeNames_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresenceExpiration_attributeNames = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresenceExpiration_expiresIn = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresenceExpiration_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresenceExpiration_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_getAgentPresence_return_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_getAgentPresence_agent = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_getAgentPresence_agentType = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_getAgentPresence_attributeNames_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_getAgentPresence_attributeNames = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_getAgentPresence_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_getAgentPresence_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_getCapabilityPresence_return_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_getCapabilityPresence_agent = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_getCapabilityPresence_capability = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_getCapabilityPresence_attributeNames_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_getCapabilityPresence_attributeNames = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_getCapabilityPresence_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAgentPresence_getCapabilityPresence_authToken = -1;
-static int hf_org_csapi_pam_access_IpAppPAMPreferenceCheck_computeAvailability_return_loop = -1;
-static int hf_org_csapi_pam_access_IpAppPAMPreferenceCheck_computeAvailability_identity = -1;
-static int hf_org_csapi_pam_access_IpAppPAMPreferenceCheck_computeAvailability_attributeNames_loop = -1;
-static int hf_org_csapi_pam_access_IpAppPAMPreferenceCheck_computeAvailability_attributeNames = -1;
-static int hf_org_csapi_pam_access_IpAppPAMPreferenceCheck_computeAvailability_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpAppPAMPreferenceCheck_computeAvailability_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMAvailability_getAvailability_return_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAvailability_getAvailability_identity = -1;
-static int hf_org_csapi_pam_access_IpPAMAvailability_getAvailability_attributeNames_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAvailability_getAvailability_attributeNames = -1;
-static int hf_org_csapi_pam_access_IpPAMAvailability_getAvailability_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAvailability_getAvailability_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMAvailability_getPreference_identity = -1;
-static int hf_org_csapi_pam_access_IpPAMAvailability_getPreference_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAvailability_getPreference_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMAvailability_setPreference_identity = -1;
-static int hf_org_csapi_pam_access_IpPAMAvailability_setPreference_operation = -1;
-static int hf_org_csapi_pam_access_IpPAMAvailability_setPreference_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMAvailability_setPreference_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_getAuthToken_return_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_getAuthToken_return = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_getAuthToken_askerData_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_obtainInterface_interfaceName = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_getAccessControl_identity = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_getAccessControl_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_getAccessControl_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_setAccessControl_identity = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_setAccessControl_operation = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_setAccessControl_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_setAccessControl_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_activateService_identity = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_activateService_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_activateService_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_deactivateService_identity = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_deactivateService_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_deactivateService_authToken = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_isActiveIdentity_return = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_isActiveIdentity_identity = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_isActiveIdentity_authToken_loop = -1;
-static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_isActiveIdentity_authToken = -1;
-static int hf_org_csapi_pam_event_IpAppPAMEventHandler_eventNotify_eventID = -1;
-static int hf_org_csapi_pam_event_IpAppPAMEventHandler_eventNotify_eventInfo_loop = -1;
-static int hf_org_csapi_pam_event_IpAppPAMEventHandler_eventNotifyErr_eventID = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_isRegistered_return = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_isRegistered_clientID = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_isRegistered_authToken_loop = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_isRegistered_authToken = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_registerAppInterface_return = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_registerAppInterface_authToken_loop = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_registerAppInterface_authToken = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_return = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_clientID = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_eventList_loop = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_validFor = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_authToken_loop = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_authToken = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_deregisterAppInterface_clientID = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_deregisterAppInterface_authToken_loop = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_deregisterAppInterface_authToken = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_deregisterFromEvent_eventID = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_deregisterFromEvent_authToken_loop = -1;
-static int hf_org_csapi_pam_event_IpPAMEventHandler_deregisterFromEvent_authToken = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_getAuthToken_return_loop = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_getAuthToken_return = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_getAuthToken_askerData_loop = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_obtainInterface_interfaceName = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_getAccessControl_identity = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_getAccessControl_authToken_loop = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_getAccessControl_authToken = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_setAccessControl_identity = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_setAccessControl_operation = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_setAccessControl_authToken_loop = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_setAccessControl_authToken = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_activateService_identity = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_activateService_authToken_loop = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_activateService_authToken = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_deactivateService_identity = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_deactivateService_authToken_loop = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_deactivateService_authToken = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_isActiveIdentity_return = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_isActiveIdentity_identity = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_isActiveIdentity_authToken_loop = -1;
-static int hf_org_csapi_pam_event_IpPAMEventManager_isActiveIdentity_authToken = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessagingManager_reportNotification_assignmentID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessagingManager_reportNotification_eventInfo_loop = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessagingManager_terminateMultipleMailboxes_mailboxSet_loop = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessagingManager_terminateMultipleMultiMediaMessagingSessions_multiMediaMessagingSet_loop = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_openMailbox_mailboxID = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_openMailbox_authenticationInfo = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_createNotification_return = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_createNotification_eventCriteria_loop = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_destroyNotification_assignmentID = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_changeNotification_assignmentID = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_changeNotification_eventCriteria_loop = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_getNextNotification_reset = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_enableNotifications_return = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_createFolderRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_createFolderRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_createFolderRes_folderID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_createFolderErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_createFolderErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_createFolderErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_createFolderErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFoldersRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFoldersRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFoldersRes_folderID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFoldersRes_folderNames_loop = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFoldersRes_folderNames = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFoldersErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFoldersErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFoldersErr_folderID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFoldersErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFoldersErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_deleteFolderRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_deleteFolderRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_deleteFolderErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_deleteFolderErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_deleteFolderErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_deleteFolderErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_copyFolderRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_copyFolderRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_copyFolderErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_copyFolderErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_copyFolderErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_copyFolderErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_moveFolderRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_moveFolderRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_moveFolderErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_moveFolderErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_moveFolderErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_moveFolderErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_putMessageRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_putMessageRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_putMessageRes_messageID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_putMessageErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_putMessageErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_putMessageErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_putMessageErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_copyMessageRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_copyMessageRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_copyMessageErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_copyMessageErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_copyMessageErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_copyMessageErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_moveMessageRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_moveMessageRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_moveMessageErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_moveMessageErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_moveMessageErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_moveMessageErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_deleteMessageRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_deleteMessageRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_deleteMessageErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_deleteMessageErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_deleteMessageErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_deleteMessageErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_listMessagesRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_listMessagesRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_listMessagesRes_messageList_loop = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_listMessagesRes_final = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_listMessagesErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_listMessagesErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_listMessagesErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_listMessagesErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_listMessageBodyPartsRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_listMessageBodyPartsRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_listMessageBodyPartsRes_partsList_loop = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_listMessageBodyPartsErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_listMessageBodyPartsErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_listMessageBodyPartsErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_listMessageBodyPartsErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageBodyPartsRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageBodyPartsRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageBodyPartsRes_bodyParts_loop = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageBodyPartsErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageBodyPartsErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageBodyPartsErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageBodyPartsErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageHeadersRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageHeadersRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageHeadersRes_headers_loop = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageHeadersErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageHeadersErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageHeadersErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageHeadersErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentRes_contentType = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentRes_contentTransferEncoding = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentRes_content_loop = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentRes_content = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageRes_message_loop = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageRes_message = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesRes_returnedProperties_loop = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesRes_folderID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesRes_returnedProperties_loop = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesRes_messageID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesRes_returnedProperties_loop = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesRes_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesRes_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesRes_messageID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesRes_propertiesUpdated_loop = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesErr_messageID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesErr_propertiesNotUpdated_loop = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesErr_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesErr_requestID = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpMailbox_close_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_createFolderReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_createFolderReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_createFolderReq_folderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getFoldersReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_getFoldersReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getFoldersReq_folderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_deleteFolderReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_deleteFolderReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_deleteFolderReq_folderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_copyFolderReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_copyFolderReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_copyFolderReq_sourceFolderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_copyFolderReq_destinationFolderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_moveFolderReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_moveFolderReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_moveFolderReq_sourceFolderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_moveFolderReq_destinationFolderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_putMessageReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_putMessageReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_putMessageReq_folderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_putMessageReq_message_loop = -1;
-static int hf_org_csapi_mmm_IpMailbox_putMessageReq_message = -1;
-static int hf_org_csapi_mmm_IpMailbox_copyMessageReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_copyMessageReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_copyMessageReq_fromFolderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_copyMessageReq_toFolderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_copyMessageReq_messageID = -1;
-static int hf_org_csapi_mmm_IpMailbox_moveMessageReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_moveMessageReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_moveMessageReq_fromFolderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_moveMessageReq_toFolderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_moveMessageReq_messageID = -1;
-static int hf_org_csapi_mmm_IpMailbox_deleteMessageReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_deleteMessageReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_deleteMessageReq_fromFolderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_deleteMessageReq_messageID = -1;
-static int hf_org_csapi_mmm_IpMailbox_listMessagesReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_listMessagesReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_listMessagesReq_folderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_listMessagesReq_reset = -1;
-static int hf_org_csapi_mmm_IpMailbox_listMessageBodyPartsReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_listMessageBodyPartsReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_listMessageBodyPartsReq_folderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_listMessageBodyPartsReq_messageID = -1;
-static int hf_org_csapi_mmm_IpMailbox_listMessageBodyPartsReq_maxNestingLevel = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageBodyPartsReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageBodyPartsReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageBodyPartsReq_folderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageBodyPartsReq_messageID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageBodyPartsReq_partIDs_loop = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageBodyPartsReq_partIDs = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageHeadersReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageHeadersReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageHeadersReq_folderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageHeadersReq_messageID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageContentReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageContentReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageContentReq_folderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageContentReq_messageID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getFullMessageReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_getFullMessageReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getFullMessageReq_folderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getFullMessageReq_messageID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMailboxInfoPropertiesReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMailboxInfoPropertiesReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getFolderInfoPropertiesReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_getFolderInfoPropertiesReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getFolderInfoPropertiesReq_folderID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageInfoPropertiesReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageInfoPropertiesReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_getMessageInfoPropertiesReq_messageID = -1;
-static int hf_org_csapi_mmm_IpMailbox_setMessageInfoPropertiesReq_return = -1;
-static int hf_org_csapi_mmm_IpMailbox_setMessageInfoPropertiesReq_mailboxSessionID = -1;
-static int hf_org_csapi_mmm_IpMailbox_setMessageInfoPropertiesReq_messageID = -1;
-static int hf_org_csapi_mmm_IpMailbox_setMessageInfoPropertiesReq_properties_loop = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_sendMessageRes_sessionID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_sendMessageRes_assignmentID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_sendMessageErr_sessionID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_sendMessageErr_assignmentID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_sendMessageErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_sendMessageErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_cancelMessageRes_sessionID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_cancelMessageRes_assignmentID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_cancelMessageErr_sessionID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_cancelMessageErr_assignmentID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_cancelMessageErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_cancelMessageErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_queryStatusRes_sessionID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_queryStatusRes_assignmentID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_queryStatusRes_result_loop = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_queryStatusErr_sessionID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_queryStatusErr_assignmentID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_queryStatusErr_error = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_queryStatusErr_errorDetails = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageStatusReport_sessionID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageStatusReport_assignmentID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageStatusReport_deliveryReportType = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageStatusReport_deliveryReportInfo = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageReceived_sessionID = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageReceived_message_loop = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageReceived_message = -1;
-static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageReceived_headers_loop = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_return = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_sessionID = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_deliveryType = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_messageTreatment_loop = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_message_loop = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_message = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_additionalHeaders_loop = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessaging_cancelMessageReq_sessionID = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessaging_cancelMessageReq_assignmentID = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessaging_queryStatusReq_sessionID = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessaging_queryStatusReq_assignmentID = -1;
-static int hf_org_csapi_mmm_IpMultiMediaMessaging_close_sessionID = -1;
+static int hf_org_csapi_IpService_setCallbackWithSessionID_sessionID;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpInitial_initiateAuthentication_authType;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpInitial_initiateAuthenticationWithVersion_authType;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpInitial_initiateAuthenticationWithVersion_frameworkVersion;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAuthentication_requestAccess_accessType;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAccess_terminateAccess_terminationText;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAccess_terminateAccess_signingAlgorithm;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAccess_terminateAccess_digitalSignature_loop;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAccess_terminateAccess_digitalSignature;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_obtainInterface_interfaceName;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_obtainInterfaceWithCallback_interfaceName;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_endAccess_endAccessProperties_loop;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_listInterfaces_return_loop;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_listInterfaces_return;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_releaseInterface_interfaceName;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_selectSigningAlgorithm_return;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_selectSigningAlgorithm_signingAlgorithmCaps;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_terminateAccess_terminationText;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_terminateAccess_digitalSignature_loop;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_terminateAccess_digitalSignature;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_relinquishInterface_interfaceName;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_relinquishInterface_terminationText;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_relinquishInterface_digitalSignature_loop;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAccess_relinquishInterface_digitalSignature;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_authenticate_return_loop;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_authenticate_return;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_authenticate_challenge_loop;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_authenticate_challenge;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_challenge_return_loop;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_challenge_return;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_challenge_challenge_loop;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpClientAPILevelAuthentication_challenge_challenge;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_selectEncryptionMethod_return;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_selectEncryptionMethod_encryptionCaps;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_authenticate_return_loop;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_authenticate_return;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_authenticate_challenge_loop;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_authenticate_challenge;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_selectAuthenticationMechanism_return;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_selectAuthenticationMechanism_authMechanismList;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_challenge_return_loop;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_challenge_return;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_challenge_challenge_loop;
+static int hf_org_csapi_fw_fw_access_trust_and_security_IpAPILevelAuthentication_challenge_challenge;
+static int hf_org_csapi_fw_fw_application_notification_IpAppEventNotification_reportNotification_assignmentID;
+static int hf_org_csapi_fw_fw_application_notification_IpEventNotification_createNotification_return;
+static int hf_org_csapi_fw_fw_application_notification_IpEventNotification_destroyNotification_assignmentID;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_activityTestRes_activityTestID;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_activityTestRes_activityTestResult;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_appActivityTestReq_activityTestID;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_fwFaultReportInd_fault;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_fwFaultRecoveryInd_fault;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_svcUnavailableInd_serviceID;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_svcUnavailableInd_reason;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_genFaultStatsRecordRes_serviceIDs_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_genFaultStatsRecordRes_serviceIDs;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_fwUnavailableInd_reason;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_activityTestErr_activityTestID;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_genFaultStatsRecordErr_faultStatisticsError;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_genFaultStatsRecordErr_serviceIDs_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_genFaultStatsRecordErr_serviceIDs;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_appUnavailableInd_serviceID;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_svcAvailStatusInd_serviceID;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_svcAvailStatusInd_reason;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordRes_faultStatsReqID;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordRes_serviceIDs_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordRes_serviceIDs;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordErr_faultStatsReqID;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordErr_faultStatistics_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordErr_faultStatistics;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordErr_serviceIDs_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordErr_serviceIDs;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_generateFaultStatisticsRecordReq_faultStatsReqID;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppFaultManager_fwAvailStatusInd_reason;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryLoadRes_loadStatistics_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryLoadErr_loadStatisticsError;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_loadLevelNotification_loadStatistics_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryAppLoadStatsReq_loadStatsReqID;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryLoadStatsRes_loadStatsReqID;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryLoadStatsRes_loadStatistics_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryLoadStatsErr_loadStatsReqID;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppLoadManager_queryLoadStatsErr_loadStatisticsError;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_reportLoad_loadLevel;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryLoadReq_serviceIDs_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryLoadReq_serviceIDs;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryAppLoadRes_loadStatistics_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryAppLoadErr_loadStatisticsError;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_createLoadLevelNotification_serviceIDs_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_createLoadLevelNotification_serviceIDs;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_destroyLoadLevelNotification_serviceIDs_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_destroyLoadLevelNotification_serviceIDs;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_resumeNotification_serviceIDs_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_resumeNotification_serviceIDs;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_suspendNotification_serviceIDs_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_suspendNotification_serviceIDs;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryLoadStatsReq_loadStatsReqID;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryLoadStatsReq_serviceIDs_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryLoadStatsReq_serviceIDs;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryAppLoadStatsRes_loadStatsReqID;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryAppLoadStatsRes_loadStatistics_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryAppLoadStatsErr_loadStatsReqID;
+static int hf_org_csapi_fw_fw_application_integrity_IpLoadManager_queryAppLoadStatsErr_loadStatisticsError;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppOAM_systemDateTimeQuery_return;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppOAM_systemDateTimeQuery_systemDateAndTime;
+static int hf_org_csapi_fw_fw_application_integrity_IpOAM_systemDateTimeQuery_return;
+static int hf_org_csapi_fw_fw_application_integrity_IpOAM_systemDateTimeQuery_clientDateAndTime;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_activityTestReq_activityTestID;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_activityTestReq_svcID;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_appActivityTestRes_activityTestID;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_appActivityTestRes_activityTestResult;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_svcUnavailableInd_serviceID;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_genFaultStatsRecordReq_serviceIDs_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_genFaultStatsRecordReq_serviceIDs;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_appActivityTestErr_activityTestID;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_appUnavailableInd_serviceID;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_genFaultStatsRecordErr_faultStatisticsError;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_appAvailStatusInd_reason;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_generateFaultStatisticsRecordReq_faultStatsReqID;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_generateFaultStatisticsRecordReq_serviceIDs_loop;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_generateFaultStatisticsRecordReq_serviceIDs;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_generateFaultStatisticsRecordRes_faultStatsReqID;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_generateFaultStatisticsRecordErr_faultStatsReqID;
+static int hf_org_csapi_fw_fw_application_integrity_IpFaultManager_generateFaultStatisticsRecordErr_faultStatisticsError;
+static int hf_org_csapi_fw_fw_application_integrity_IpHeartBeatMgmt_enableHeartBeat_interval;
+static int hf_org_csapi_fw_fw_application_integrity_IpHeartBeatMgmt_changeInterval_interval;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppHeartBeatMgmt_enableAppHeartBeat_interval;
+static int hf_org_csapi_fw_fw_application_integrity_IpAppHeartBeatMgmt_changeInterval_interval;
+static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_listServiceTypes_return_loop;
+static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_listServiceTypes_return;
+static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_describeServiceType_name;
+static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_discoverService_return_loop;
+static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_discoverService_serviceTypeName;
+static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_discoverService_desiredPropertyList_loop;
+static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_discoverService_max;
+static int hf_org_csapi_fw_fw_application_discovery_IpServiceDiscovery_listSubscribedServices_return_loop;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_signServiceAgreement_return_loop;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_signServiceAgreement_return;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_signServiceAgreement_serviceToken;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_signServiceAgreement_agreementText;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_signServiceAgreement_signingAlgorithm;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_terminateServiceAgreement_serviceToken;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_terminateServiceAgreement_terminationText;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_terminateServiceAgreement_digitalSignature_loop;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpAppServiceAgreementManagement_terminateServiceAgreement_digitalSignature;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_signServiceAgreement_serviceToken;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_signServiceAgreement_agreementText;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_signServiceAgreement_signingAlgorithm;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_terminateServiceAgreement_serviceToken;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_terminateServiceAgreement_terminationText;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_terminateServiceAgreement_digitalSignature_loop;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_terminateServiceAgreement_digitalSignature;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_selectService_return;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_selectService_serviceID;
+static int hf_org_csapi_fw_fw_application_service_agreement_IpServiceAgreementManagement_initiateSignServiceAgreement_serviceToken;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileManagement_createServiceProfile_return;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileManagement_deleteServiceProfile_serviceProfileID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileManagement_assign_sagID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileManagement_assign_serviceProfileID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileManagement_deassign_sagID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileManagement_deassign_serviceProfileID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileManagement_requestConflictInfo_return_loop;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileInfoQuery_listServiceProfiles_return_loop;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileInfoQuery_listServiceProfiles_return;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileInfoQuery_describeServiceProfile_serviceProfileID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileInfoQuery_listAssignedMembers_return_loop;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileInfoQuery_listAssignedMembers_return;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceProfileInfoQuery_listAssignedMembers_serviceProfileID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractManagement_createServiceContract_return;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractManagement_deleteServiceContract_serviceContractID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractInfoQuery_describeServiceContract_serviceContractID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractInfoQuery_listServiceContracts_return_loop;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractInfoQuery_listServiceContracts_return;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractInfoQuery_listServiceProfiles_return_loop;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractInfoQuery_listServiceProfiles_return;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpServiceContractInfoQuery_listServiceProfiles_serviceContractID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpEntOpAccountManagement_modifyEntOpAccount_enterpriseOperatorProperties_loop;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_deleteClientApp_clientAppID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_createSAG_clientAppIDs_loop;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_createSAG_clientAppIDs;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_deleteSAG_sagID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_addSAGMembers_sagID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_addSAGMembers_clientAppIDs_loop;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_addSAGMembers_clientAppIDs;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_removeSAGMembers_sagID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_removeSAGMembers_clientAppIDList_loop;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_removeSAGMembers_clientAppIDList;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppManagement_requestConflictInfo_return_loop;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_describeClientApp_clientAppID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listClientApps_return_loop;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listClientApps_return;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_describeSAG_return;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_describeSAG_sagID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listSAGs_return_loop;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listSAGs_return;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listSAGMembers_return_loop;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listSAGMembers_return;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listSAGMembers_sagID;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listClientAppMembership_return_loop;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listClientAppMembership_return;
+static int hf_org_csapi_fw_fw_enterprise_operator_service_subscription_IpClientAppInfoQuery_listClientAppMembership_clientAppID;
+static int hf_org_csapi_fw_fw_enterprise_operator_notification_IpClientEventNotification_reportNotification_assignmentID;
+static int hf_org_csapi_fw_fw_enterprise_operator_notification_IpEventNotification_createNotification_return;
+static int hf_org_csapi_fw_fw_enterprise_operator_notification_IpEventNotification_destroyNotification_assignmentID;
+static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_listServiceTypes_return_loop;
+static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_listServiceTypes_return;
+static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_describeServiceType_name;
+static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_discoverService_return_loop;
+static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_discoverService_serviceTypeName;
+static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_discoverService_desiredPropertyList_loop;
+static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_discoverService_max;
+static int hf_org_csapi_fw_fw_service_discovery_IpFwServiceDiscovery_listRegisteredServices_return_loop;
+static int hf_org_csapi_fw_fw_service_service_lifecycle_IpServiceInstanceLifecycleManager_createServiceManager_application;
+static int hf_org_csapi_fw_fw_service_service_lifecycle_IpServiceInstanceLifecycleManager_createServiceManager_serviceProperties_loop;
+static int hf_org_csapi_fw_fw_service_service_lifecycle_IpServiceInstanceLifecycleManager_createServiceManager_serviceInstanceID;
+static int hf_org_csapi_fw_fw_service_service_lifecycle_IpServiceInstanceLifecycleManager_destroyServiceManager_serviceInstance;
+static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_registerService_return;
+static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_registerService_serviceTypeName;
+static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_registerService_servicePropertyList_loop;
+static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_announceServiceAvailability_serviceID;
+static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_unregisterService_serviceID;
+static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_describeService_serviceID;
+static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_unannounceService_serviceID;
+static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_registerServiceSubType_return;
+static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_registerServiceSubType_serviceTypeName;
+static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_registerServiceSubType_servicePropertyList_loop;
+static int hf_org_csapi_fw_fw_service_service_registration_IpFwServiceRegistration_registerServiceSubType_extendedServicePropertyList_loop;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_queryLoadRes_loadStatistics_loop;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_queryLoadErr_loadStatisticsError;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_loadLevelNotification_loadStatistics_loop;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_querySvcLoadStatsReq_loadStatsReqID;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_queryLoadStatsRes_loadStatsReqID;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_queryLoadStatsRes_loadStatistics_loop;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_queryLoadStatsErr_loadStatsReqID;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcLoadManager_queryLoadStatsErr_loadStatisticsError;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_reportLoad_loadLevel;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_queryLoadReq_querySubject;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_querySvcLoadRes_loadStatistics_loop;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_querySvcLoadErr_loadStatisticError;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_createLoadLevelNotification_notificationSubject;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_destroyLoadLevelNotification_notificationSubject;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_suspendNotification_notificationSubject;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_resumeNotification_notificationSubject;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_queryLoadStatsReq_loadStatsReqID;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_queryLoadStatsReq_querySubject;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_querySvcLoadStatsRes_loadStatsReqID;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_querySvcLoadStatsRes_loadStatistics_loop;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_querySvcLoadStatsErr_loadStatsReqID;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwLoadManager_querySvcLoadStatsErr_loadStatisticError;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_activityTestRes_activityTestID;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_activityTestRes_activityTestResult;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_svcActivityTestReq_activityTestID;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_fwFaultReportInd_fault;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_fwFaultRecoveryInd_fault;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_fwUnavailableInd_reason;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_genFaultStatsRecordRes_recordSubject;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_activityTestErr_activityTestID;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_genFaultStatsRecordErr_faultStatisticsError;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_genFaultStatsRecordErr_recordSubject;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_genFaultStatsRecordReq_serviceIDs_loop;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_genFaultStatsRecordReq_serviceIDs;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_appAvailStatusInd_reason;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_generateFaultStatisticsRecordRes_faultStatsReqID;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_generateFaultStatisticsRecordRes_recordSubject;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_generateFaultStatisticsRecordErr_faultStatsReqID;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_generateFaultStatisticsRecordErr_faultStatisticsError;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_generateFaultStatisticsRecordErr_recordSubject;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_generateFaultStatisticsRecordReq_faultStatsReqID;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcFaultManager_fwAvailStatusInd_reason;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_activityTestReq_activityTestID;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_activityTestReq_testSubject;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_svcActivityTestRes_activityTestID;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_svcActivityTestRes_activityTestResult;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_genFaultStatsRecordReq_recordSubject;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_svcUnavailableInd_reason;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_svcActivityTestErr_activityTestID;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_genFaultStatsRecordRes_serviceIDs_loop;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_genFaultStatsRecordRes_serviceIDs;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_genFaultStatsRecordErr_faultStatisticsError;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_genFaultStatsRecordErr_serviceIDs_loop;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_genFaultStatsRecordErr_serviceIDs;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_generateFaultStatsRecordErr_faultStatisticsError;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_svcAvailStatusInd_reason;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_generateFaultStatisticsRecordReq_faultStatsReqID;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_generateFaultStatisticsRecordReq_recordSubject;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_generateFaultStatisticsRecordRes_faultStatsReqID;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_generateFaultStatisticsRecordErr_faultStatsReqID;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwFaultManager_generateFaultStatisticsRecordErr_faultStatisticsError;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcOAM_systemDateTimeQuery_return;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcOAM_systemDateTimeQuery_systemDateAndTime;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwOAM_systemDateTimeQuery_return;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwOAM_systemDateTimeQuery_clientDateAndTime;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwHeartBeatMgmt_enableHeartBeat_interval;
+static int hf_org_csapi_fw_fw_service_integrity_IpFwHeartBeatMgmt_changeInterval_interval;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcHeartBeatMgmt_enableSvcHeartBeat_interval;
+static int hf_org_csapi_fw_fw_service_integrity_IpSvcHeartBeatMgmt_changeInterval_interval;
+static int hf_org_csapi_fw_fw_service_notification_IpFwEventNotification_createNotification_return;
+static int hf_org_csapi_fw_fw_service_notification_IpFwEventNotification_destroyNotification_assignmentID;
+static int hf_org_csapi_fw_fw_service_notification_IpSvcEventNotification_reportNotification_assignmentID;
+static int hf_org_csapi_cc_gccs_IpAppCall_routeRes_callSessionID;
+static int hf_org_csapi_cc_gccs_IpAppCall_routeRes_callLegSessionID;
+static int hf_org_csapi_cc_gccs_IpAppCall_routeErr_callSessionID;
+static int hf_org_csapi_cc_gccs_IpAppCall_routeErr_callLegSessionID;
+static int hf_org_csapi_cc_gccs_IpAppCall_getCallInfoRes_callSessionID;
+static int hf_org_csapi_cc_gccs_IpAppCall_getCallInfoErr_callSessionID;
+static int hf_org_csapi_cc_gccs_IpAppCall_superviseCallRes_callSessionID;
+static int hf_org_csapi_cc_gccs_IpAppCall_superviseCallRes_report;
+static int hf_org_csapi_cc_gccs_IpAppCall_superviseCallRes_usedTime;
+static int hf_org_csapi_cc_gccs_IpAppCall_superviseCallErr_callSessionID;
+static int hf_org_csapi_cc_gccs_IpAppCall_callFaultDetected_callSessionID;
+static int hf_org_csapi_cc_gccs_IpAppCall_callFaultDetected_fault;
+static int hf_org_csapi_cc_gccs_IpAppCall_getMoreDialledDigitsRes_callSessionID;
+static int hf_org_csapi_cc_gccs_IpAppCall_getMoreDialledDigitsRes_digits;
+static int hf_org_csapi_cc_gccs_IpAppCall_getMoreDialledDigitsErr_callSessionID;
+static int hf_org_csapi_cc_gccs_IpAppCall_callEnded_callSessionID;
+static int hf_org_csapi_cc_gccs_IpCall_routeReq_return;
+static int hf_org_csapi_cc_gccs_IpCall_routeReq_callSessionID;
+static int hf_org_csapi_cc_gccs_IpCall_routeReq_responseRequested_loop;
+static int hf_org_csapi_cc_gccs_IpCall_routeReq_appInfo_loop;
+static int hf_org_csapi_cc_gccs_IpCall_release_callSessionID;
+static int hf_org_csapi_cc_gccs_IpCall_deassignCall_callSessionID;
+static int hf_org_csapi_cc_gccs_IpCall_getCallInfoReq_callSessionID;
+static int hf_org_csapi_cc_gccs_IpCall_getCallInfoReq_callInfoRequested;
+static int hf_org_csapi_cc_gccs_IpCall_setCallChargePlan_callSessionID;
+static int hf_org_csapi_cc_gccs_IpCall_setAdviceOfCharge_callSessionID;
+static int hf_org_csapi_cc_gccs_IpCall_setAdviceOfCharge_tariffSwitch;
+static int hf_org_csapi_cc_gccs_IpCall_getMoreDialledDigitsReq_callSessionID;
+static int hf_org_csapi_cc_gccs_IpCall_getMoreDialledDigitsReq_length;
+static int hf_org_csapi_cc_gccs_IpCall_superviseCallReq_callSessionID;
+static int hf_org_csapi_cc_gccs_IpCall_superviseCallReq_time;
+static int hf_org_csapi_cc_gccs_IpCall_superviseCallReq_treatment;
+static int hf_org_csapi_cc_gccs_IpCall_continueProcessing_callSessionID;
+static int hf_org_csapi_cc_gccs_IpAppCallControlManager_callAborted_callReference;
+static int hf_org_csapi_cc_gccs_IpAppCallControlManager_callEventNotify_assignmentID;
+static int hf_org_csapi_cc_gccs_IpAppCallControlManager_callOverloadEncountered_assignmentID;
+static int hf_org_csapi_cc_gccs_IpAppCallControlManager_callOverloadCeased_assignmentID;
+static int hf_org_csapi_cc_gccs_IpAppCallControlManager_abortMultipleCalls_callReferenceSet_loop;
+static int hf_org_csapi_cc_gccs_IpAppCallControlManager_abortMultipleCalls_callReferenceSet;
+static int hf_org_csapi_cc_gccs_IpCallControlManager_enableCallNotification_return;
+static int hf_org_csapi_cc_gccs_IpCallControlManager_disableCallNotification_assignmentID;
+static int hf_org_csapi_cc_gccs_IpCallControlManager_setCallLoadControl_return;
+static int hf_org_csapi_cc_gccs_IpCallControlManager_setCallLoadControl_duration;
+static int hf_org_csapi_cc_gccs_IpCallControlManager_changeCallNotification_assignmentID;
+static int hf_org_csapi_cc_gccs_IpCallControlManager_getCriteria_return_loop;
+static int hf_org_csapi_cc_mpccs_IpAppCallLeg_eventReportRes_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppCallLeg_eventReportErr_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppCallLeg_attachMediaRes_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppCallLeg_attachMediaErr_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppCallLeg_detachMediaRes_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppCallLeg_detachMediaErr_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppCallLeg_getInfoRes_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppCallLeg_getInfoErr_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppCallLeg_routeErr_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppCallLeg_superviseRes_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppCallLeg_superviseRes_report;
+static int hf_org_csapi_cc_mpccs_IpAppCallLeg_superviseRes_usedTime;
+static int hf_org_csapi_cc_mpccs_IpAppCallLeg_superviseErr_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppCallLeg_callLegEnded_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppCallLeg_callLegEnded_cause;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_createNotification_return;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_destroyNotification_assignmentID;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_changeNotification_assignmentID;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_getNotification_return_loop;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_setCallLoadControl_return;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_setCallLoadControl_duration;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_enableNotifications_return;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_getNextNotification_reset;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_routeReq_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_routeReq_appInfo_loop;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_eventReportReq_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_eventReportReq_eventsRequested_loop;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_release_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_release_cause;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_getInfoReq_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_getInfoReq_callLegInfoRequested;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_getCall_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_attachMediaReq_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_detachMediaReq_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_getCurrentDestinationAddress_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_continueProcessing_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_setChargePlan_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_setAdviceOfCharge_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_setAdviceOfCharge_tariffSwitch;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_superviseReq_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_superviseReq_time;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_superviseReq_treatment;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_deassign_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_getProperties_return_loop;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_getProperties_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_getProperties_propertyNames_loop;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_getProperties_propertyNames;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_setProperties_callLegSessionID;
+static int hf_org_csapi_cc_mpccs_IpCallLeg_setProperties_properties_loop;
+static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_getInfoRes_callSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_getInfoErr_callSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_superviseRes_callSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_superviseRes_report;
+static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_superviseRes_usedTime;
+static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_superviseErr_callSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_callEnded_callSessionID;
+static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCall_createAndRouteCallLegErr_callSessionID;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_getCallLegs_return_loop;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_getCallLegs_callSessionID;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_createCallLeg_callSessionID;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_createAndRouteCallLegReq_callSessionID;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_createAndRouteCallLegReq_eventsRequested_loop;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_createAndRouteCallLegReq_appInfo_loop;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_release_callSessionID;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_release_cause;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_deassignCall_callSessionID;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_getInfoReq_callSessionID;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_getInfoReq_callInfoRequested;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_setChargePlan_callSessionID;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_setAdviceOfCharge_callSessionID;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_setAdviceOfCharge_tariffSwitch;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_superviseReq_callSessionID;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_superviseReq_time;
+static int hf_org_csapi_cc_mpccs_IpMultiPartyCall_superviseReq_treatment;
+static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCallControlManager_reportNotification_callLegReferenceSet_loop;
+static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCallControlManager_reportNotification_assignmentID;
+static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCallControlManager_callAborted_callReference;
+static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCallControlManager_callOverloadEncountered_assignmentID;
+static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCallControlManager_callOverloadCeased_assignmentID;
+static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCallControlManager_abortMultipleCalls_callReferenceSet_loop;
+static int hf_org_csapi_cc_mpccs_IpAppMultiPartyCallControlManager_abortMultipleCalls_callReferenceSet;
+static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCall_superviseVolumeRes_callSessionID;
+static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCall_superviseVolumeRes_report;
+static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCall_superviseVolumeRes_qualityOfService;
+static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCall_superviseVolumeErr_callSessionID;
+static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallLeg_mediaStreamMonitorRes_callLegSessionID;
+static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallLeg_mediaStreamMonitorRes_streams_loop;
+static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallLeg_mediaStreamMonitorRes_type;
+static int hf_org_csapi_cc_mmccs_IpMultiMediaStream_subtract_mediaStreamSessionID;
+static int hf_org_csapi_cc_mmccs_IpMultiMediaCallLeg_mediaStreamAllow_callLegSessionID;
+static int hf_org_csapi_cc_mmccs_IpMultiMediaCallLeg_mediaStreamAllow_mediaStreamList_loop;
+static int hf_org_csapi_cc_mmccs_IpMultiMediaCallLeg_mediaStreamAllow_mediaStreamList;
+static int hf_org_csapi_cc_mmccs_IpMultiMediaCallLeg_mediaStreamMonitorReq_callLegSessionID;
+static int hf_org_csapi_cc_mmccs_IpMultiMediaCallLeg_mediaStreamMonitorReq_mediaStreamEventCriteria_loop;
+static int hf_org_csapi_cc_mmccs_IpMultiMediaCallLeg_getMediaStreams_return_loop;
+static int hf_org_csapi_cc_mmccs_IpMultiMediaCallLeg_getMediaStreams_callLegSessionID;
+static int hf_org_csapi_cc_mmccs_IpMultiMediaCall_superviseVolumeReq_callSessionID;
+static int hf_org_csapi_cc_mmccs_IpMultiMediaCall_superviseVolumeReq_treatment;
+static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallControlManager_reportMediaNotification_callLegReferenceSet_loop;
+static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallControlManager_reportMediaNotification_mediaStreams_loop;
+static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallControlManager_reportMediaNotification_type;
+static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallControlManager_reportMediaNotification_qualityOfService;
+static int hf_org_csapi_cc_mmccs_IpAppMultiMediaCallControlManager_reportMediaNotification_assignmentID;
+static int hf_org_csapi_cc_mmccs_IpMultiMediaCallControlManager_createMediaNotification_return;
+static int hf_org_csapi_cc_mmccs_IpMultiMediaCallControlManager_destroyMediaNotification_assignmentID;
+static int hf_org_csapi_cc_mmccs_IpMultiMediaCallControlManager_changeMediaNotification_assignmentID;
+static int hf_org_csapi_cc_mmccs_IpMultiMediaCallControlManager_getMediaNotification_return_loop;
+static int hf_org_csapi_cc_cccs_IpAppSubConfCall_chairSelection_subConferenceSessionID;
+static int hf_org_csapi_cc_cccs_IpAppSubConfCall_chairSelection_callLegSessionID;
+static int hf_org_csapi_cc_cccs_IpAppSubConfCall_floorRequest_subConferenceSessionID;
+static int hf_org_csapi_cc_cccs_IpAppSubConfCall_floorRequest_callLegSessionID;
+static int hf_org_csapi_cc_cccs_IpAppConfCall_partyJoined_conferenceSessionID;
+static int hf_org_csapi_cc_cccs_IpAppConfCall_leaveMonitorRes_conferenceSessionID;
+static int hf_org_csapi_cc_cccs_IpAppConfCall_leaveMonitorRes_callLeg;
+static int hf_org_csapi_cc_cccs_IpConfCallControlManager_createConference_numberOfSubConferences;
+static int hf_org_csapi_cc_cccs_IpConfCallControlManager_createConference_numberOfParticipants;
+static int hf_org_csapi_cc_cccs_IpConfCallControlManager_createConference_duration;
+static int hf_org_csapi_cc_cccs_IpConfCallControlManager_reserveResources_startTime;
+static int hf_org_csapi_cc_cccs_IpConfCallControlManager_reserveResources_numberOfParticipants;
+static int hf_org_csapi_cc_cccs_IpConfCallControlManager_reserveResources_duration;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_splitSubConference_subConferenceSessionID;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_splitSubConference_callLegList_loop;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_splitSubConference_callLegList;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_mergeSubConference_subConferenceCallSessionID;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_mergeSubConference_targetSubConferenceCall;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_moveCallLeg_subConferenceCallSessionID;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_moveCallLeg_targetSubConferenceCall;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_moveCallLeg_callLeg;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_inspectVideo_subConferenceSessionID;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_inspectVideo_inspectedCallLeg;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_inspectVideoCancel_subConferenceSessionID;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_appointSpeaker_subConferenceSessionID;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_appointSpeaker_speakerCallLeg;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_chairSelection_subConferenceSessionID;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_chairSelection_chairCallLeg;
+static int hf_org_csapi_cc_cccs_IpSubConfCall_changeConferencePolicy_subConferenceSessionID;
+static int hf_org_csapi_cc_cccs_IpConfCall_getSubConferences_return_loop;
+static int hf_org_csapi_cc_cccs_IpConfCall_getSubConferences_conferenceSessionID;
+static int hf_org_csapi_cc_cccs_IpConfCall_createSubConference_conferenceSessionID;
+static int hf_org_csapi_cc_cccs_IpConfCall_leaveMonitorReq_conferenceSessionID;
+static int hf_org_csapi_cc_cccs_IpConfCall_getConferenceAddress_conferenceSessionID;
+static int hf_org_csapi_ui_IpAppUI_sendInfoRes_userInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUI_sendInfoRes_assignmentID;
+static int hf_org_csapi_ui_IpAppUI_sendInfoRes_response;
+static int hf_org_csapi_ui_IpAppUI_sendInfoErr_userInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUI_sendInfoErr_assignmentID;
+static int hf_org_csapi_ui_IpAppUI_sendInfoErr_error;
+static int hf_org_csapi_ui_IpAppUI_sendInfoAndCollectRes_userInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUI_sendInfoAndCollectRes_assignmentID;
+static int hf_org_csapi_ui_IpAppUI_sendInfoAndCollectRes_response;
+static int hf_org_csapi_ui_IpAppUI_sendInfoAndCollectRes_collectedInfo;
+static int hf_org_csapi_ui_IpAppUI_sendInfoAndCollectErr_userInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUI_sendInfoAndCollectErr_assignmentID;
+static int hf_org_csapi_ui_IpAppUI_sendInfoAndCollectErr_error;
+static int hf_org_csapi_ui_IpAppUI_userInteractionFaultDetected_userInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUI_userInteractionFaultDetected_fault;
+static int hf_org_csapi_ui_IpAppUICall_recordMessageRes_userInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUICall_recordMessageRes_assignmentID;
+static int hf_org_csapi_ui_IpAppUICall_recordMessageRes_response;
+static int hf_org_csapi_ui_IpAppUICall_recordMessageRes_messageID;
+static int hf_org_csapi_ui_IpAppUICall_recordMessageErr_userInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUICall_recordMessageErr_assignmentID;
+static int hf_org_csapi_ui_IpAppUICall_recordMessageErr_error;
+static int hf_org_csapi_ui_IpAppUICall_deleteMessageRes_usrInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUICall_deleteMessageRes_response;
+static int hf_org_csapi_ui_IpAppUICall_deleteMessageRes_assignmentID;
+static int hf_org_csapi_ui_IpAppUICall_deleteMessageErr_usrInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUICall_deleteMessageErr_error;
+static int hf_org_csapi_ui_IpAppUICall_deleteMessageErr_assignmentID;
+static int hf_org_csapi_ui_IpAppUICall_abortActionRes_userInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUICall_abortActionRes_assignmentID;
+static int hf_org_csapi_ui_IpAppUICall_abortActionErr_userInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUICall_abortActionErr_assignmentID;
+static int hf_org_csapi_ui_IpAppUICall_abortActionErr_error;
+static int hf_org_csapi_ui_IpAppUICall_getMessageRes_userInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUICall_getMessageRes_assignmentID;
+static int hf_org_csapi_ui_IpAppUICall_getMessageErr_userInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUICall_getMessageErr_assignmentID;
+static int hf_org_csapi_ui_IpAppUICall_getMessageErr_error;
+static int hf_org_csapi_ui_IpAppUIManager_reportEventNotification_assignmentID;
+static int hf_org_csapi_ui_IpAppUIManager_abortMultipleUserInteractions_userInteractionSet_loop;
+static int hf_org_csapi_ui_IpUI_sendInfoReq_return;
+static int hf_org_csapi_ui_IpUI_sendInfoReq_userInteractionSessionID;
+static int hf_org_csapi_ui_IpUI_sendInfoReq_language;
+static int hf_org_csapi_ui_IpUI_sendInfoReq_variableInfo_loop;
+static int hf_org_csapi_ui_IpUI_sendInfoReq_repeatIndicator;
+static int hf_org_csapi_ui_IpUI_sendInfoReq_responseRequested;
+static int hf_org_csapi_ui_IpUI_sendInfoAndCollectReq_return;
+static int hf_org_csapi_ui_IpUI_sendInfoAndCollectReq_userInteractionSessionID;
+static int hf_org_csapi_ui_IpUI_sendInfoAndCollectReq_language;
+static int hf_org_csapi_ui_IpUI_sendInfoAndCollectReq_variableInfo_loop;
+static int hf_org_csapi_ui_IpUI_sendInfoAndCollectReq_responseRequested;
+static int hf_org_csapi_ui_IpUI_release_userInteractionSessionID;
+static int hf_org_csapi_ui_IpUI_setOriginatingAddress_userInteractionSessionID;
+static int hf_org_csapi_ui_IpUI_setOriginatingAddress_origin;
+static int hf_org_csapi_ui_IpUI_getOriginatingAddress_return;
+static int hf_org_csapi_ui_IpUI_getOriginatingAddress_userInteractionSessionID;
+static int hf_org_csapi_ui_IpUICall_recordMessageReq_return;
+static int hf_org_csapi_ui_IpUICall_recordMessageReq_userInteractionSessionID;
+static int hf_org_csapi_ui_IpUICall_deleteMessageReq_return;
+static int hf_org_csapi_ui_IpUICall_deleteMessageReq_usrInteractionSessionID;
+static int hf_org_csapi_ui_IpUICall_deleteMessageReq_messageID;
+static int hf_org_csapi_ui_IpUICall_abortActionReq_userInteractionSessionID;
+static int hf_org_csapi_ui_IpUICall_abortActionReq_assignmentID;
+static int hf_org_csapi_ui_IpUICall_getMessageReq_return;
+static int hf_org_csapi_ui_IpUICall_getMessageReq_userInteractionSessionID;
+static int hf_org_csapi_ui_IpUICall_getMessageReq_messageID;
+static int hf_org_csapi_ui_IpUIManager_createNotification_return;
+static int hf_org_csapi_ui_IpUIManager_destroyNotification_assignmentID;
+static int hf_org_csapi_ui_IpUIManager_changeNotification_assignmentID;
+static int hf_org_csapi_ui_IpUIManager_getNotification_return_loop;
+static int hf_org_csapi_ui_IpUIManager_enableNotifications_return;
+static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageRes_usrInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageRes_assignmentID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageErr_usrInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageErr_assignmentID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageErr_error;
+static int hf_org_csapi_ui_IpAppUIAdminManager_deleteMessageRes_usrInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_deleteMessageRes_response;
+static int hf_org_csapi_ui_IpAppUIAdminManager_deleteMessageRes_assignmentID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_deleteMessageErr_usrInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_deleteMessageErr_error;
+static int hf_org_csapi_ui_IpAppUIAdminManager_deleteMessageErr_assignmentID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_putMessageRes_usrInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_putMessageRes_assignmentID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_putMessageRes_messageID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_putMessageErr_usrInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_putMessageErr_assignmentID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_putMessageErr_error;
+static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListRes_usrInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListRes_assignmentID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListRes_messageIDList_loop;
+static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListRes_messageIDList;
+static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListRes_final;
+static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListErr_usrInteractionSessionID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListErr_assignmentID;
+static int hf_org_csapi_ui_IpAppUIAdminManager_getMessageListErr_error;
+static int hf_org_csapi_ui_IpUIAdminManager_getMessageReq_return;
+static int hf_org_csapi_ui_IpUIAdminManager_getMessageReq_usrInteractionSessionID;
+static int hf_org_csapi_ui_IpUIAdminManager_getMessageReq_messageID;
+static int hf_org_csapi_ui_IpUIAdminManager_putMessageReq_return;
+static int hf_org_csapi_ui_IpUIAdminManager_putMessageReq_usrInteractionSessionID;
+static int hf_org_csapi_ui_IpUIAdminManager_deleteMessageReq_return;
+static int hf_org_csapi_ui_IpUIAdminManager_deleteMessageReq_usrInteractionSessionID;
+static int hf_org_csapi_ui_IpUIAdminManager_deleteMessageReq_messageID;
+static int hf_org_csapi_ui_IpUIAdminManager_getMessageListReq_return;
+static int hf_org_csapi_ui_IpUIAdminManager_getMessageListReq_usrInteractionSessionID;
+static int hf_org_csapi_ui_IpUIAdminManager_getMessageListReq_reset;
+static int hf_org_csapi_mm_ul_IpAppUserLocation_locationReportRes_assignmentId;
+static int hf_org_csapi_mm_ul_IpAppUserLocation_locationReportRes_locations_loop;
+static int hf_org_csapi_mm_ul_IpAppUserLocation_locationReportErr_assignmentId;
+static int hf_org_csapi_mm_ul_IpAppUserLocation_locationReportErr_cause;
+static int hf_org_csapi_mm_ul_IpAppUserLocation_locationReportErr_diagnostic;
+static int hf_org_csapi_mm_ul_IpAppUserLocation_extendedLocationReportRes_assignmentId;
+static int hf_org_csapi_mm_ul_IpAppUserLocation_extendedLocationReportRes_locations_loop;
+static int hf_org_csapi_mm_ul_IpAppUserLocation_extendedLocationReportErr_assignmentId;
+static int hf_org_csapi_mm_ul_IpAppUserLocation_extendedLocationReportErr_cause;
+static int hf_org_csapi_mm_ul_IpAppUserLocation_extendedLocationReportErr_diagnostic;
+static int hf_org_csapi_mm_ul_IpAppUserLocation_periodicLocationReport_assignmentId;
+static int hf_org_csapi_mm_ul_IpAppUserLocation_periodicLocationReport_locations_loop;
+static int hf_org_csapi_mm_ul_IpAppUserLocation_periodicLocationReportErr_assignmentId;
+static int hf_org_csapi_mm_ul_IpAppUserLocation_periodicLocationReportErr_cause;
+static int hf_org_csapi_mm_ul_IpAppUserLocation_periodicLocationReportErr_diagnostic;
+static int hf_org_csapi_mm_ul_IpUserLocation_locationReportReq_return;
+static int hf_org_csapi_mm_ul_IpUserLocation_locationReportReq_users_loop;
+static int hf_org_csapi_mm_ul_IpUserLocation_extendedLocationReportReq_return;
+static int hf_org_csapi_mm_ul_IpUserLocation_extendedLocationReportReq_users_loop;
+static int hf_org_csapi_mm_ul_IpUserLocation_periodicLocationReportingStartReq_return;
+static int hf_org_csapi_mm_ul_IpUserLocation_periodicLocationReportingStartReq_users_loop;
+static int hf_org_csapi_mm_ul_IpUserLocation_periodicLocationReportingStartReq_reportingInterval;
+static int hf_org_csapi_mm_ul_IpUserLocation_getNextPeriodicLocationRequest_reset;
+static int hf_org_csapi_mm_ul_IpAppTriggeredUserLocation_triggeredLocationReport_assignmentId;
+static int hf_org_csapi_mm_ul_IpAppTriggeredUserLocation_triggeredLocationReport_criterion;
+static int hf_org_csapi_mm_ul_IpAppTriggeredUserLocation_triggeredLocationReportErr_assignmentId;
+static int hf_org_csapi_mm_ul_IpAppTriggeredUserLocation_triggeredLocationReportErr_cause;
+static int hf_org_csapi_mm_ul_IpAppTriggeredUserLocation_triggeredLocationReportErr_diagnostic;
+static int hf_org_csapi_mm_ul_IpTriggeredUserLocation_triggeredLocationReportingStartReq_return;
+static int hf_org_csapi_mm_ul_IpTriggeredUserLocation_triggeredLocationReportingStartReq_users_loop;
+static int hf_org_csapi_mm_ul_IpTriggeredUserLocation_triggeredLocationReportingStartReq_triggers_loop;
+static int hf_org_csapi_mm_ul_IpTriggeredUserLocation_getNextTriggeredLocationRequest_reset;
+static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_locationReportRes_assignmentId;
+static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_locationReportRes_locations_loop;
+static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_locationReportErr_assignmentId;
+static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_locationReportErr_cause;
+static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_locationReportErr_diagnostic;
+static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_periodicLocationReport_assignmentId;
+static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_periodicLocationReport_locations_loop;
+static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_periodicLocationReportErr_assignmentId;
+static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_periodicLocationReportErr_cause;
+static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_periodicLocationReportErr_diagnostic;
+static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_triggeredLocationReport_assignmentId;
+static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_triggeredLocationReportErr_assignmentId;
+static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_triggeredLocationReportErr_cause;
+static int hf_org_csapi_mm_ulc_IpAppUserLocationCamel_triggeredLocationReportErr_diagnostic;
+static int hf_org_csapi_mm_ulc_IpUserLocationCamel_locationReportReq_return;
+static int hf_org_csapi_mm_ulc_IpUserLocationCamel_locationReportReq_users_loop;
+static int hf_org_csapi_mm_ulc_IpUserLocationCamel_periodicLocationReportingStartReq_return;
+static int hf_org_csapi_mm_ulc_IpUserLocationCamel_periodicLocationReportingStartReq_users_loop;
+static int hf_org_csapi_mm_ulc_IpUserLocationCamel_periodicLocationReportingStartReq_reportingInterval;
+static int hf_org_csapi_mm_ulc_IpUserLocationCamel_triggeredLocationReportingStartReq_return;
+static int hf_org_csapi_mm_ulc_IpUserLocationCamel_triggeredLocationReportingStartReq_users_loop;
+static int hf_org_csapi_mm_ulc_IpUserLocationCamel_getNextPeriodicLocationRequest_reset;
+static int hf_org_csapi_mm_ulc_IpUserLocationCamel_getNextTriggeredLocationRequest_reset;
+static int hf_org_csapi_mm_ule_IpAppUserLocationEmergency_emergencyLocationReport_assignmentId;
+static int hf_org_csapi_mm_ule_IpAppUserLocationEmergency_emergencyLocationReportErr_assignmentId;
+static int hf_org_csapi_mm_ule_IpAppUserLocationEmergency_emergencyLocationReportErr_cause;
+static int hf_org_csapi_mm_ule_IpAppUserLocationEmergency_emergencyLocationReportErr_diagnostic;
+static int hf_org_csapi_mm_ule_IpUserLocationEmergency_emergencyLocationReportReq_return;
+static int hf_org_csapi_mm_ule_IpUserLocationEmergency_subscribeEmergencyLocationReports_return;
+static int hf_org_csapi_mm_ule_IpUserLocationEmergency_unSubscribeEmergencyLocationReports_assignmentId;
+static int hf_org_csapi_mm_us_IpAppUserStatus_statusReportRes_assignmentId;
+static int hf_org_csapi_mm_us_IpAppUserStatus_statusReportRes_status_loop;
+static int hf_org_csapi_mm_us_IpAppUserStatus_statusReportErr_assignmentId;
+static int hf_org_csapi_mm_us_IpAppUserStatus_statusReportErr_cause;
+static int hf_org_csapi_mm_us_IpAppUserStatus_statusReportErr_diagnostic;
+static int hf_org_csapi_mm_us_IpAppUserStatus_triggeredStatusReport_assignmentId;
+static int hf_org_csapi_mm_us_IpAppUserStatus_triggeredStatusReportErr_assignmentId;
+static int hf_org_csapi_mm_us_IpAppUserStatus_triggeredStatusReportErr_cause;
+static int hf_org_csapi_mm_us_IpAppUserStatus_triggeredStatusReportErr_diagnostic;
+static int hf_org_csapi_mm_us_IpAppUserStatus_extendedStatusReportRes_assignmentId;
+static int hf_org_csapi_mm_us_IpAppUserStatus_extendedStatusReportRes_status_loop;
+static int hf_org_csapi_mm_us_IpAppUserStatus_extendedStatusReportErr_assignmentId;
+static int hf_org_csapi_mm_us_IpAppUserStatus_extendedStatusReportErr_cause;
+static int hf_org_csapi_mm_us_IpAppUserStatus_extendedStatusReportErr_diagnostic;
+static int hf_org_csapi_mm_us_IpAppUserStatus_extTriggeredStatusReport_assignmentId;
+static int hf_org_csapi_mm_us_IpAppUserStatus_extTriggeredStatusReportErr_assignmentId;
+static int hf_org_csapi_mm_us_IpAppUserStatus_extTriggeredStatusReportErr_cause;
+static int hf_org_csapi_mm_us_IpAppUserStatus_extTriggeredStatusReportErr_diagnostic;
+static int hf_org_csapi_mm_us_IpUserStatus_statusReportReq_return;
+static int hf_org_csapi_mm_us_IpUserStatus_statusReportReq_users_loop;
+static int hf_org_csapi_mm_us_IpUserStatus_triggeredStatusReportingStartReq_return;
+static int hf_org_csapi_mm_us_IpUserStatus_triggeredStatusReportingStartReq_users_loop;
+static int hf_org_csapi_mm_us_IpUserStatus_getNextTriggeredStatusRequest_reset;
+static int hf_org_csapi_mm_us_IpUserStatus_extendedStatusReportReq_return;
+static int hf_org_csapi_mm_us_IpUserStatus_extendedStatusReportReq_users_loop;
+static int hf_org_csapi_mm_us_IpUserStatus_extTriggeredStatusReportingStartReq_return;
+static int hf_org_csapi_mm_us_IpUserStatus_extTriggeredStatusReportingStartReq_users_loop;
+static int hf_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification_return_loop;
+static int hf_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification_assignmentId;
+static int hf_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification_contactInformation_loop;
+static int hf_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotificationStartErr_assignmentId;
+static int hf_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotificationStartErr_cause;
+static int hf_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotificationStartErr_diagnostic;
+static int hf_org_csapi_mm_ub_IpUserBinding_triggeredBindingRequestNotificationStartReq_return;
+static int hf_org_csapi_mm_ub_IpUserBinding_triggeredBindingRequestNotificationStartReq_users_loop;
+static int hf_org_csapi_mm_ub_IpUserBinding_triggeredBindingRequestNotificationStartReq_criteria_loop;
+static int hf_org_csapi_mm_ub_IpUserBinding_triggeredBindingRequestNotificationStop_assignmentId;
+static int hf_org_csapi_termcap_IpTerminalCapabilities_getTerminalCapabilities_terminalIdentity;
+static int hf_org_csapi_termcap_IpAppExtendedTerminalCapabilities_triggeredTerminalCapabilityReport_assignmentID;
+static int hf_org_csapi_termcap_IpAppExtendedTerminalCapabilities_triggeredTerminalCapabilityReport_terminals_loop;
+static int hf_org_csapi_termcap_IpAppExtendedTerminalCapabilities_triggeredTerminalCapabilityReport_criteria;
+static int hf_org_csapi_termcap_IpAppExtendedTerminalCapabilities_triggeredTerminalCapabilityReportErr_assignmentId;
+static int hf_org_csapi_termcap_IpAppExtendedTerminalCapabilities_triggeredTerminalCapabilityReportErr_terminals_loop;
+static int hf_org_csapi_termcap_IpAppExtendedTerminalCapabilities_triggeredTerminalCapabilityReportErr_cause;
+static int hf_org_csapi_termcap_IpExtendedTerminalCapabilities_triggeredTerminalCapabilityStartReq_return;
+static int hf_org_csapi_termcap_IpExtendedTerminalCapabilities_triggeredTerminalCapabilityStartReq_terminals_loop;
+static int hf_org_csapi_termcap_IpExtendedTerminalCapabilities_triggeredTerminalCapabilityStartReq_criteria;
+static int hf_org_csapi_termcap_IpExtendedTerminalCapabilities_triggeredTerminalCapabilityStop_assignmentID;
+static int hf_org_csapi_dsc_IpAppDataSession_connectRes_dataSessionID;
+static int hf_org_csapi_dsc_IpAppDataSession_connectRes_assignmentID;
+static int hf_org_csapi_dsc_IpAppDataSession_connectErr_dataSessionID;
+static int hf_org_csapi_dsc_IpAppDataSession_connectErr_assignmentID;
+static int hf_org_csapi_dsc_IpAppDataSession_superviseDataSessionRes_dataSessionID;
+static int hf_org_csapi_dsc_IpAppDataSession_superviseDataSessionRes_report;
+static int hf_org_csapi_dsc_IpAppDataSession_superviseDataSessionRes_qualityOfService;
+static int hf_org_csapi_dsc_IpAppDataSession_superviseDataSessionErr_dataSessionID;
+static int hf_org_csapi_dsc_IpAppDataSession_dataSessionFaultDetected_dataSessionID;
+static int hf_org_csapi_dsc_IpAppDataSession_dataSessionFaultDetected_fault;
+static int hf_org_csapi_dsc_IpAppDataSessionControlManager_dataSessionAborted_dataSession;
+static int hf_org_csapi_dsc_IpAppDataSessionControlManager_reportNotification_assignmentID;
+static int hf_org_csapi_dsc_IpAppDataSessionControlManager_abortMultipleDataSessions_dataSessionSet_loop;
+static int hf_org_csapi_dsc_IpAppDataSessionControlManager_abortMultipleDataSessions_dataSessionSet;
+static int hf_org_csapi_dsc_IpDataSession_connectReq_return;
+static int hf_org_csapi_dsc_IpDataSession_connectReq_dataSessionID;
+static int hf_org_csapi_dsc_IpDataSession_connectReq_responseRequested_loop;
+static int hf_org_csapi_dsc_IpDataSession_release_dataSessionID;
+static int hf_org_csapi_dsc_IpDataSession_superviseDataSessionReq_dataSessionID;
+static int hf_org_csapi_dsc_IpDataSession_superviseDataSessionReq_treatment;
+static int hf_org_csapi_dsc_IpDataSession_setDataSessionChargePlan_dataSessionID;
+static int hf_org_csapi_dsc_IpDataSession_setAdviceOfCharge_dataSessionID;
+static int hf_org_csapi_dsc_IpDataSession_setAdviceOfCharge_tariffSwitch;
+static int hf_org_csapi_dsc_IpDataSession_deassignDataSession_dataSessionID;
+static int hf_org_csapi_dsc_IpDataSession_continueProcessing_dataSessionID;
+static int hf_org_csapi_dsc_IpDataSessionControlManager_createNotification_return;
+static int hf_org_csapi_dsc_IpDataSessionControlManager_destroyNotification_assignmentID;
+static int hf_org_csapi_dsc_IpDataSessionControlManager_changeNotification_assignmentID;
+static int hf_org_csapi_dsc_IpDataSessionControlManager_enableNotifications_return;
+static int hf_org_csapi_dsc_IpDataSessionControlManager_getNotifications_return_loop;
+static int hf_org_csapi_dsc_IpDataSessionControlManager_createNotifications_return;
+static int hf_org_csapi_gms_IpMessagingManager_openMailbox_authenticationInfo;
+static int hf_org_csapi_gms_IpMessagingManager_enableMessagingNotification_return;
+static int hf_org_csapi_gms_IpMessagingManager_disableMessagingNotification_assignmentID;
+static int hf_org_csapi_gms_IpAppMessagingManager_mailboxTerminated_mailboxSessionID;
+static int hf_org_csapi_gms_IpAppMessagingManager_mailboxFaultDetected_mailboxSessionID;
+static int hf_org_csapi_gms_IpAppMessagingManager_mailboxFaultDetected_fault;
+static int hf_org_csapi_gms_IpAppMessagingManager_messagingEventNotify_assignmentID;
+static int hf_org_csapi_gms_IpMailbox_close_mailboxSessionID;
+static int hf_org_csapi_gms_IpMailbox_lock_mailboxSessionID;
+static int hf_org_csapi_gms_IpMailbox_unlock_mailboxSessionID;
+static int hf_org_csapi_gms_IpMailbox_getInfoAmount_return;
+static int hf_org_csapi_gms_IpMailbox_getInfoAmount_mailboxSessionID;
+static int hf_org_csapi_gms_IpMailbox_getInfoProperties_return_loop;
+static int hf_org_csapi_gms_IpMailbox_getInfoProperties_mailboxSessionID;
+static int hf_org_csapi_gms_IpMailbox_getInfoProperties_firstProperty;
+static int hf_org_csapi_gms_IpMailbox_getInfoProperties_numberOfProperties;
+static int hf_org_csapi_gms_IpMailbox_setInfoProperties_mailboxSessionID;
+static int hf_org_csapi_gms_IpMailbox_setInfoProperties_firstProperty;
+static int hf_org_csapi_gms_IpMailbox_setInfoProperties_mailboxInfoProperties_loop;
+static int hf_org_csapi_gms_IpMailbox_openFolder_mailboxSessionID;
+static int hf_org_csapi_gms_IpMailbox_openFolder_folderID;
+static int hf_org_csapi_gms_IpMailbox_createFolder_mailboxSessionID;
+static int hf_org_csapi_gms_IpMailbox_createFolder_folderID;
+static int hf_org_csapi_gms_IpMailbox_remove_authenticationInfo;
+static int hf_org_csapi_gms_IpMessage_getInfoAmount_return;
+static int hf_org_csapi_gms_IpMessage_getInfoAmount_folderSessionID;
+static int hf_org_csapi_gms_IpMessage_getInfoAmount_messageID;
+static int hf_org_csapi_gms_IpMessage_getInfoProperties_return_loop;
+static int hf_org_csapi_gms_IpMessage_getInfoProperties_folderSessionID;
+static int hf_org_csapi_gms_IpMessage_getInfoProperties_messageID;
+static int hf_org_csapi_gms_IpMessage_getInfoProperties_firstProperty;
+static int hf_org_csapi_gms_IpMessage_getInfoProperties_numberOfProperties;
+static int hf_org_csapi_gms_IpMessage_setInfoProperties_folderSessionID;
+static int hf_org_csapi_gms_IpMessage_setInfoProperties_messageID;
+static int hf_org_csapi_gms_IpMessage_setInfoProperties_firstProperty;
+static int hf_org_csapi_gms_IpMessage_setInfoProperties_messageInfoProperties_loop;
+static int hf_org_csapi_gms_IpMessage_remove_folderSessionID;
+static int hf_org_csapi_gms_IpMessage_remove_messageID;
+static int hf_org_csapi_gms_IpMessage_getContent_return;
+static int hf_org_csapi_gms_IpMessage_getContent_folderSessionID;
+static int hf_org_csapi_gms_IpMessage_getContent_messageID;
+static int hf_org_csapi_gms_IpMailboxFolder_getInfoAmount_return;
+static int hf_org_csapi_gms_IpMailboxFolder_getInfoAmount_folderSessionID;
+static int hf_org_csapi_gms_IpMailboxFolder_getInfoProperties_return_loop;
+static int hf_org_csapi_gms_IpMailboxFolder_getInfoProperties_folderSessionID;
+static int hf_org_csapi_gms_IpMailboxFolder_getInfoProperties_firstProperty;
+static int hf_org_csapi_gms_IpMailboxFolder_getInfoProperties_numberOfProperties;
+static int hf_org_csapi_gms_IpMailboxFolder_setInfoProperties_folderSessionID;
+static int hf_org_csapi_gms_IpMailboxFolder_setInfoProperties_firstProperty;
+static int hf_org_csapi_gms_IpMailboxFolder_setInfoProperties_folderInfoProperties_loop;
+static int hf_org_csapi_gms_IpMailboxFolder_putMessage_folderSessionID;
+static int hf_org_csapi_gms_IpMailboxFolder_putMessage_message;
+static int hf_org_csapi_gms_IpMailboxFolder_putMessage_messageInfoProperties_loop;
+static int hf_org_csapi_gms_IpMailboxFolder_getMessage_folderSessionID;
+static int hf_org_csapi_gms_IpMailboxFolder_getMessage_messageID;
+static int hf_org_csapi_gms_IpMailboxFolder_close_mailboxSessionID;
+static int hf_org_csapi_gms_IpMailboxFolder_close_folderSessionID;
+static int hf_org_csapi_gms_IpMailboxFolder_remove_mailboxSessionID;
+static int hf_org_csapi_gms_IpMailboxFolder_remove_folderID;
+static int hf_org_csapi_cm_IpVPrP_getVPrPID_return;
+static int hf_org_csapi_cm_IpVPrP_getSlaID_return;
+static int hf_org_csapi_cm_IpVPrP_getStatus_return;
+static int hf_org_csapi_cm_IpVPrN_getVPrPList_return_loop;
+static int hf_org_csapi_cm_IpVPrN_getVPrPList_return;
+static int hf_org_csapi_cm_IpVPrN_getVPrP_vPrPID;
+static int hf_org_csapi_cm_IpVPrN_deleteVPrP_vPrPID;
+static int hf_org_csapi_cm_IpQoSMenu_getTemplate_templateType;
+static int hf_org_csapi_cm_IpQoSMenu_getTemplateList_return_loop;
+static int hf_org_csapi_cm_IpQoSMenu_getTemplateList_return;
+static int hf_org_csapi_cm_IpQoSTemplate_getTemplateType_return;
+static int hf_org_csapi_cm_IpQoSTemplate_getDescription_return;
+static int hf_org_csapi_cm_IpQoSTemplate_setSlaID_slaID;
+static int hf_org_csapi_cm_IpEnterpriseNetwork_getSiteList_return_loop;
+static int hf_org_csapi_cm_IpEnterpriseNetwork_getSiteList_return;
+static int hf_org_csapi_cm_IpEnterpriseNetwork_getSite_siteID;
+static int hf_org_csapi_cm_IpEnterpriseNetworkSite_getSAPList_return_loop;
+static int hf_org_csapi_cm_IpEnterpriseNetworkSite_getSAPList_return;
+static int hf_org_csapi_cm_IpEnterpriseNetworkSite_getSiteID_return;
+static int hf_org_csapi_cm_IpEnterpriseNetworkSite_getSiteLocation_return;
+static int hf_org_csapi_cm_IpEnterpriseNetworkSite_getSiteDescription_return;
+static int hf_org_csapi_cm_IpEnterpriseNetworkSite_getSAPIPSubnet_sapID;
+static int hf_org_csapi_am_IpAppAccountManager_reportNotification_assignmentId;
+static int hf_org_csapi_am_IpAppAccountManager_queryBalanceRes_queryId;
+static int hf_org_csapi_am_IpAppAccountManager_queryBalanceRes_balances_loop;
+static int hf_org_csapi_am_IpAppAccountManager_queryBalanceErr_queryId;
+static int hf_org_csapi_am_IpAppAccountManager_queryBalanceErr_cause;
+static int hf_org_csapi_am_IpAppAccountManager_retrieveTransactionHistoryRes_retrievalID;
+static int hf_org_csapi_am_IpAppAccountManager_retrieveTransactionHistoryRes_transactionHistory_loop;
+static int hf_org_csapi_am_IpAppAccountManager_retrieveTransactionHistoryErr_retrievalID;
+static int hf_org_csapi_am_IpAppAccountManager_retrieveTransactionHistoryErr_transactionHistoryError;
+static int hf_org_csapi_am_IpAppAccountManager_queryBalanceExpiryDateRes_queryId;
+static int hf_org_csapi_am_IpAppAccountManager_queryBalanceExpiryDateRes_dates_loop;
+static int hf_org_csapi_am_IpAppAccountManager_queryBalanceExpiryDateErr_queryId;
+static int hf_org_csapi_am_IpAppAccountManager_queryBalanceExpiryDateErr_cause;
+static int hf_org_csapi_am_IpAppAccountManager_updateBalanceRes_requestId;
+static int hf_org_csapi_am_IpAppAccountManager_updateBalanceErr_requestId;
+static int hf_org_csapi_am_IpAppAccountManager_updateBalanceErr_cause;
+static int hf_org_csapi_am_IpAppAccountManager_createVoucherRes_requestId;
+static int hf_org_csapi_am_IpAppAccountManager_createVoucherRes_voucherId;
+static int hf_org_csapi_am_IpAppAccountManager_createVoucherErr_requestId;
+static int hf_org_csapi_am_IpAppAccountManager_createVoucherErr_cause;
+static int hf_org_csapi_am_IpAppAccountManager_destroyVoucherRes_requestId;
+static int hf_org_csapi_am_IpAppAccountManager_destroyVoucherRes_voucherId;
+static int hf_org_csapi_am_IpAppAccountManager_destroyVoucherErr_requestId;
+static int hf_org_csapi_am_IpAppAccountManager_destroyVoucherErr_voucherId;
+static int hf_org_csapi_am_IpAppAccountManager_destroyVoucherErr_cause;
+static int hf_org_csapi_am_IpAppAccountManager_queryVoucherRes_queryId;
+static int hf_org_csapi_am_IpAppAccountManager_queryVoucherErr_queryId;
+static int hf_org_csapi_am_IpAppAccountManager_queryVoucherErr_voucherId;
+static int hf_org_csapi_am_IpAppAccountManager_queryVoucherErr_cause;
+static int hf_org_csapi_am_IpAppAccountManager_queryUserVouchersRes_queryId;
+static int hf_org_csapi_am_IpAppAccountManager_queryUserVouchersRes_vouchers_loop;
+static int hf_org_csapi_am_IpAppAccountManager_queryUserVouchersErr_queryId;
+static int hf_org_csapi_am_IpAppAccountManager_queryUserVouchersErr_cause;
+static int hf_org_csapi_am_IpAccountManager_createNotification_return;
+static int hf_org_csapi_am_IpAccountManager_destroyNotification_assignmentId;
+static int hf_org_csapi_am_IpAccountManager_queryBalanceReq_return;
+static int hf_org_csapi_am_IpAccountManager_queryBalanceReq_users_loop;
+static int hf_org_csapi_am_IpAccountManager_changeNotification_assignmentID;
+static int hf_org_csapi_am_IpAccountManager_getNotification_return_loop;
+static int hf_org_csapi_am_IpAccountManager_retrieveTransactionHistoryReq_return;
+static int hf_org_csapi_am_IpAccountManager_enableNotifications_return;
+static int hf_org_csapi_am_IpAccountManager_queryBalanceExpiryDateReq_return;
+static int hf_org_csapi_am_IpAccountManager_queryBalanceExpiryDateReq_users_loop;
+static int hf_org_csapi_am_IpAccountManager_updateBalanceReq_return;
+static int hf_org_csapi_am_IpAccountManager_updateBalanceReq_debit;
+static int hf_org_csapi_am_IpAccountManager_updateBalanceReq_period;
+static int hf_org_csapi_am_IpAccountManager_createVoucherReq_return;
+static int hf_org_csapi_am_IpAccountManager_destroyVoucherReq_return;
+static int hf_org_csapi_am_IpAccountManager_destroyVoucherReq_voucherId;
+static int hf_org_csapi_am_IpAccountManager_queryVoucherReq_return;
+static int hf_org_csapi_am_IpAccountManager_queryVoucherReq_voucherId;
+static int hf_org_csapi_am_IpAccountManager_queryUserVouchersReq_return;
+static int hf_org_csapi_cs_IpAppChargingSession_creditAmountErr_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_creditAmountErr_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_creditAmountErr_error;
+static int hf_org_csapi_cs_IpAppChargingSession_creditAmountErr_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_creditAmountRes_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_creditAmountRes_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_creditAmountRes_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_creditUnitErr_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_creditUnitErr_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_creditUnitErr_error;
+static int hf_org_csapi_cs_IpAppChargingSession_creditUnitErr_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_creditUnitRes_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_creditUnitRes_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_creditUnitRes_creditedVolumes_loop;
+static int hf_org_csapi_cs_IpAppChargingSession_creditUnitRes_reservedUnitsLeft_loop;
+static int hf_org_csapi_cs_IpAppChargingSession_creditUnitRes_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_debitAmountErr_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_debitAmountErr_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_debitAmountErr_error;
+static int hf_org_csapi_cs_IpAppChargingSession_debitAmountErr_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_debitAmountRes_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_debitAmountRes_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_debitAmountRes_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_debitUnitErr_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_debitUnitErr_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_debitUnitErr_error;
+static int hf_org_csapi_cs_IpAppChargingSession_debitUnitErr_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_debitUnitRes_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_debitUnitRes_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_debitUnitRes_debitedVolumes_loop;
+static int hf_org_csapi_cs_IpAppChargingSession_debitUnitRes_reservedUnitsLeft_loop;
+static int hf_org_csapi_cs_IpAppChargingSession_debitUnitRes_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_directCreditAmountErr_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_directCreditAmountErr_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_directCreditAmountErr_error;
+static int hf_org_csapi_cs_IpAppChargingSession_directCreditAmountErr_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_directCreditAmountRes_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_directCreditAmountRes_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_directCreditAmountRes_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitErr_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitErr_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitErr_error;
+static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitErr_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitRes_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitRes_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitRes_creditedVolumes_loop;
+static int hf_org_csapi_cs_IpAppChargingSession_directCreditUnitRes_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_directDebitAmountErr_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_directDebitAmountErr_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_directDebitAmountErr_error;
+static int hf_org_csapi_cs_IpAppChargingSession_directDebitAmountErr_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_directDebitAmountRes_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_directDebitAmountRes_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_directDebitAmountRes_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitErr_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitErr_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitErr_error;
+static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitErr_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitRes_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitRes_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitRes_debitedVolumes_loop;
+static int hf_org_csapi_cs_IpAppChargingSession_directDebitUnitRes_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_extendLifeTimeErr_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_extendLifeTimeErr_error;
+static int hf_org_csapi_cs_IpAppChargingSession_extendLifeTimeRes_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_extendLifeTimeRes_sessionTimeLeft;
+static int hf_org_csapi_cs_IpAppChargingSession_rateErr_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_rateErr_error;
+static int hf_org_csapi_cs_IpAppChargingSession_rateRes_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_rateRes_rates_loop;
+static int hf_org_csapi_cs_IpAppChargingSession_rateRes_validityTimeLeft;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountErr_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountErr_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountErr_error;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountErr_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountRes_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountRes_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountRes_sessionTimeLeft;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveAmountRes_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitErr_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitErr_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitErr_error;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitErr_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitRes_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitRes_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitRes_reservedUnits_loop;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitRes_sessionTimeLeft;
+static int hf_org_csapi_cs_IpAppChargingSession_reserveUnitRes_requestNumberNextRequest;
+static int hf_org_csapi_cs_IpAppChargingSession_sessionEnded_sessionID;
+static int hf_org_csapi_cs_IpAppChargingSession_sessionEnded_report;
+static int hf_org_csapi_cs_IpChargingSession_creditAmountReq_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_creditAmountReq_closeReservation;
+static int hf_org_csapi_cs_IpChargingSession_creditAmountReq_requestNumber;
+static int hf_org_csapi_cs_IpChargingSession_creditUnitReq_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_creditUnitReq_volumes_loop;
+static int hf_org_csapi_cs_IpChargingSession_creditUnitReq_closeReservation;
+static int hf_org_csapi_cs_IpChargingSession_creditUnitReq_requestNumber;
+static int hf_org_csapi_cs_IpChargingSession_debitAmountReq_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_debitAmountReq_closeReservation;
+static int hf_org_csapi_cs_IpChargingSession_debitAmountReq_requestNumber;
+static int hf_org_csapi_cs_IpChargingSession_debitUnitReq_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_debitUnitReq_volumes_loop;
+static int hf_org_csapi_cs_IpChargingSession_debitUnitReq_closeReservation;
+static int hf_org_csapi_cs_IpChargingSession_debitUnitReq_requestNumber;
+static int hf_org_csapi_cs_IpChargingSession_directCreditAmountReq_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_directCreditAmountReq_chargingParameters_loop;
+static int hf_org_csapi_cs_IpChargingSession_directCreditAmountReq_requestNumber;
+static int hf_org_csapi_cs_IpChargingSession_directCreditUnitReq_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_directCreditUnitReq_chargingParameters_loop;
+static int hf_org_csapi_cs_IpChargingSession_directCreditUnitReq_volumes_loop;
+static int hf_org_csapi_cs_IpChargingSession_directCreditUnitReq_requestNumber;
+static int hf_org_csapi_cs_IpChargingSession_directDebitAmountReq_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_directDebitAmountReq_chargingParameters_loop;
+static int hf_org_csapi_cs_IpChargingSession_directDebitAmountReq_requestNumber;
+static int hf_org_csapi_cs_IpChargingSession_directDebitUnitReq_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_directDebitUnitReq_chargingParameters_loop;
+static int hf_org_csapi_cs_IpChargingSession_directDebitUnitReq_volumes_loop;
+static int hf_org_csapi_cs_IpChargingSession_directDebitUnitReq_requestNumber;
+static int hf_org_csapi_cs_IpChargingSession_extendLifeTimeReq_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_getAmountLeft_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_getLifeTimeLeft_return;
+static int hf_org_csapi_cs_IpChargingSession_getLifeTimeLeft_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_getUnitLeft_return_loop;
+static int hf_org_csapi_cs_IpChargingSession_getUnitLeft_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_rateReq_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_rateReq_chargingParameters_loop;
+static int hf_org_csapi_cs_IpChargingSession_release_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_release_requestNumber;
+static int hf_org_csapi_cs_IpChargingSession_reserveAmountReq_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_reserveAmountReq_chargingParameters_loop;
+static int hf_org_csapi_cs_IpChargingSession_reserveAmountReq_requestNumber;
+static int hf_org_csapi_cs_IpChargingSession_reserveUnitReq_sessionID;
+static int hf_org_csapi_cs_IpChargingSession_reserveUnitReq_chargingParameters_loop;
+static int hf_org_csapi_cs_IpChargingSession_reserveUnitReq_volumes_loop;
+static int hf_org_csapi_cs_IpChargingSession_reserveUnitReq_requestNumber;
+static int hf_org_csapi_cs_IpAppChargingManager_sessionAborted_sessionID;
+static int hf_org_csapi_cs_IpAppChargingManager_abortMultipleChargingSessions_chargingSessionSet_loop;
+static int hf_org_csapi_cs_IpAppChargingManager_abortMultipleChargingSessions_chargingSessionSet;
+static int hf_org_csapi_cs_IpChargingManager_createChargingSession_sessionDescription;
+static int hf_org_csapi_cs_IpChargingManager_createSplitChargingSession_sessionDescription;
+static int hf_org_csapi_cs_IpChargingManager_createSplitChargingSession_users_loop;
+static int hf_org_csapi_policy_evaluation_IpAppPolicyDomain_reportNotification_assignmentID;
+static int hf_org_csapi_policy_evaluation_IpAppPolicyDomain_evalPolicyRes_assignmentID;
+static int hf_org_csapi_policy_evaluation_IpAppPolicyDomain_evalPolicyRes_outputVariables_loop;
+static int hf_org_csapi_policy_evaluation_IpAppPolicyDomain_evalPolicyErr_assignmentID;
+static int hf_org_csapi_policy_evaluation_IpAppPolicyDomain_evalPolicyErr_error;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicy_return_loop;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicy_domainName;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicy_signatureName;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicy_inputVariables_loop;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicyReq_return;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicyReq_domainName;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicyReq_signatureName;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_evalPolicyReq_inputVariables_loop;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_abortEvalPolicyReq_domainName;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_abortEvalPolicyReq_assignmentID;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_generateEvent_domainName;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_generateEvent_eventDefinitionName;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_generateEvent_attributes_loop;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_createNotification_return;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_createNotification_domainName;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_createNotification_events_loop;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_createNotification_events;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_destroyNotification_assignmentID;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_destroyNotification_events_loop;
+static int hf_org_csapi_policy_evaluation_IpPolicyEvalManager_destroyNotification_events;
+static int hf_org_csapi_policy_provisioning_IpPolicy_getAttribute_attributeName;
+static int hf_org_csapi_policy_provisioning_IpPolicy_getAttributes_return_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicy_getAttributes_attributeNames_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicy_getAttributes_attributeNames;
+static int hf_org_csapi_policy_provisioning_IpPolicy_setAttributes_targetAttributes_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyIterator_getList_return_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyIterator_getList_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyIterator_getList_startIndex;
+static int hf_org_csapi_policy_provisioning_IpPolicyIterator_getList_numberRequested;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_createRepository_repositoryName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_getRepository_repositoryName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_removeRepository_repositoryName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_getRepositoryCount_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_createCondition_conditionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_createCondition_conditionType;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_createCondition_conditionAttributes_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_getCondition_conditionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_removeCondition_conditionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_getConditionCount_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_createAction_actionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_createAction_actionType;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_createAction_actionAttributes_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_getAction_actionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_removeAction_actionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRepository_getActionCount_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_createCondition_conditionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_createCondition_conditionType;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_createCondition_conditionAttributes_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_getCondition_conditionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_removeCondition_conditionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_getConditionCount_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_createAction_actionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_createAction_actionType;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_createAction_actionAttributes_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_getAction_actionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_removeAction_actionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_getActionCount_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_setValidityPeriodConditionByName_conditionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_setConditionList_conditionList_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_getConditionList_return_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_setActionList_actionList_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyRule_getActionList_return_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyManager_createDomain_domainName;
+static int hf_org_csapi_policy_provisioning_IpPolicyManager_getDomain_domainName;
+static int hf_org_csapi_policy_provisioning_IpPolicyManager_removeDomain_domainName;
+static int hf_org_csapi_policy_provisioning_IpPolicyManager_getDomainCount_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyManager_findMatchingDomains_return_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyManager_findMatchingDomains_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyManager_findMatchingDomains_matchingAttributes_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyManager_createRepository_repositoryName;
+static int hf_org_csapi_policy_provisioning_IpPolicyManager_getRepository_repositoryName;
+static int hf_org_csapi_policy_provisioning_IpPolicyManager_removeRepository_repositoryName;
+static int hf_org_csapi_policy_provisioning_IpPolicyManager_getRepositoryCount_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyManager_commitTransaction_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyGroup_createGroup_groupName;
+static int hf_org_csapi_policy_provisioning_IpPolicyGroup_getGroup_groupName;
+static int hf_org_csapi_policy_provisioning_IpPolicyGroup_removeGroup_groupName;
+static int hf_org_csapi_policy_provisioning_IpPolicyGroup_getGroupCount_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyGroup_createRule_ruleName;
+static int hf_org_csapi_policy_provisioning_IpPolicyGroup_getRule_ruleName;
+static int hf_org_csapi_policy_provisioning_IpPolicyGroup_removeRule_ruleName;
+static int hf_org_csapi_policy_provisioning_IpPolicyGroup_getRuleCount_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyEventDefinition_setRequiredAttributes_requiredAttributes_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyEventDefinition_setOptionalAttributes_optionalAttributes_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyEventDefinition_getRequiredAttributes_return_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyEventDefinition_getOptionalAttributes_return_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_setInputVariables_inputVariables_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_setInputVariables_inputVariables;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_setOutputVariables_outputVariables_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_setOutputVariables_outputVariables;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_getInputVariables_return_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_getInputVariables_return;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_getOutputVariables_return_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_getOutputVariables_return;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_setGroupNames_groupNames_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_setGroupNames_groupNames;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_setPolicyRoles_roleNames_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_setPolicyRoles_roleNames;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_getGroupNames_return_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_getGroupNames_return;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_getPolicyRoles_return_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicySignature_getPolicyRoles_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createDomain_domainName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getDomain_domainName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeDomain_domainName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getDomainCount_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createGroup_groupName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getGroup_groupName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeGroup_groupName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getGroupCount_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createRule_ruleName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getRule_ruleName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeRule_ruleName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getRuleCount_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createEventDefinition_eventDefinitionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createEventDefinition_requiredAttributes_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createEventDefinition_requiredAttributes;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createEventDefinition_optionalAttributes_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createEventDefinition_optionalAttributes;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getEventDefinition_eventDefinitionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeEventDefinition_eventDefinitionName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getEventDefinitionCount_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createVariableSet_variableSetName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariableSet_return_loop;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariableSet_variableSetName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeVariableSet_variableSetName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariableSetCount_return;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createVariable_variableSetName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createVariable_variableName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_setVariableValue_variableSetName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_setVariableValue_variableName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariableType_variableSetName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariableType_variableName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariableValue_variableSetName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariableValue_variableName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariable_variableSetName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getVariable_variableName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeVariable_variablSetName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeVariable_variableName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_createSignature_signatureName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getSignature_signatureName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_removeSignature_signatureName;
+static int hf_org_csapi_policy_provisioning_IpPolicyDomain_getSignatureCount_return;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createIdentity_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createIdentity_identityTypes_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createIdentity_identityTypes;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createIdentity_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createIdentity_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_deleteIdentity_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_deleteIdentity_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_deleteIdentity_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isIdentity_return;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isIdentity_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isIdentity_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isIdentity_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createGroupIdentity_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createGroupIdentity_identityTypes_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createGroupIdentity_identityTypes;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createGroupIdentity_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_createGroupIdentity_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_deleteGroupIdentity_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_deleteGroupIdentity_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_deleteGroupIdentity_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addToGroup_group;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addToGroup_member;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addToGroup_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addToGroup_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeFromGroup_group;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeFromGroup_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeFromGroup_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeFromGroup_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listMembers_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listMembers_return;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listMembers_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listMembers_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listMembers_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isGroupIdentity_return;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isGroupIdentity_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isGroupIdentity_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_isGroupIdentity_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listGroupMembership_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listGroupMembership_return;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listGroupMembership_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listGroupMembership_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listGroupMembership_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addAlias_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addAlias_alias;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addAlias_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_addAlias_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeAliases_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeAliases_alias;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeAliases_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_removeAliases_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listAliases_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listAliases_return;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listAliases_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listAliases_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listAliases_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_lookupByAlias_return;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_lookupByAlias_alias;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_lookupByAlias_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_lookupByAlias_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_associateTypes_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_associateTypes_identityTypes_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_associateTypes_identityTypes;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_associateTypes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_associateTypes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_disassociateTypes_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_disassociateTypes_identityTypes_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_disassociateTypes_identityTypes;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_disassociateTypes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_disassociateTypes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listTypesOfIdentity_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listTypesOfIdentity_return;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listTypesOfIdentity_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listTypesOfIdentity_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_listTypesOfIdentity_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_hasType_return;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_hasType_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_hasType_typeName;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_hasType_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_hasType_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_getIdentityAttributes_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_getIdentityAttributes_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_getIdentityAttributes_identityType;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_getIdentityAttributes_attributeNames_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_getIdentityAttributes_attributeNames;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_getIdentityAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_getIdentityAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_setIdentityAttributes_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_setIdentityAttributes_identityType;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_setIdentityAttributes_attributes_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_setIdentityAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityManagement_setIdentityAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_createAgent_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_createAgent_agentTypes_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_createAgent_agentTypes;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_createAgent_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_createAgent_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_deleteAgent_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_deleteAgent_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_deleteAgent_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isAgent_return;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isAgent_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isAgent_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isAgent_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_enableCapabilities_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_enableCapabilities_capabilities_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_enableCapabilities_capabilities;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_enableCapabilities_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_enableCapabilities_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disableCapabilities_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disableCapabilities_capabilities_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disableCapabilities_capabilities;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disableCapabilities_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disableCapabilities_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listEnabledCapabilities_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listEnabledCapabilities_return;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listEnabledCapabilities_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listEnabledCapabilities_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listEnabledCapabilities_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listAllCapabilities_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listAllCapabilities_return;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listAllCapabilities_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listAllCapabilities_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listAllCapabilities_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isCapableOf_return;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isCapableOf_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isCapableOf_capability;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isCapableOf_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_isCapableOf_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_associateTypes_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_associateTypes_agentTypes_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_associateTypes_agentTypes;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_associateTypes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_associateTypes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disassociateTypes_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disassociateTypes_agentTypes_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disassociateTypes_agentTypes;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disassociateTypes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_disassociateTypes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listTypesOfAgent_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listTypesOfAgent_return;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listTypesOfAgent_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listTypesOfAgent_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_listTypesOfAgent_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_hasType_return;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_hasType_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_hasType_typeName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_hasType_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_hasType_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_getAgentAttributes_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_getAgentAttributes_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_getAgentAttributes_agentType;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_getAgentAttributes_attributeNames_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_getAgentAttributes_attributeNames;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_getAgentAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_getAgentAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_setAgentAttributes_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_setAgentAttributes_agentType;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_setAgentAttributes_attributes_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_setAgentAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentManagement_setAgentAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_assignAgent_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_assignAgent_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_assignAgent_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_assignAgent_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_unassignAgent_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_unassignAgent_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_unassignAgent_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_unassignAgent_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgents_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgents_return;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgents_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgents_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgents_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssociatedIdentitiesOfAgent_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssociatedIdentitiesOfAgent_return;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssociatedIdentitiesOfAgent_agentName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssociatedIdentitiesOfAgent_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssociatedIdentitiesOfAgent_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgentsByCapability_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgentsByCapability_return;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgentsByCapability_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgentsByCapability_capability;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgentsByCapability_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listAssignedAgentsByCapability_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listCapabilitiesOfIdentity_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listCapabilitiesOfIdentity_return;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listCapabilitiesOfIdentity_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listCapabilitiesOfIdentity_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_listCapabilitiesOfIdentity_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_isIdentityCapableOf_return;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_isIdentityCapableOf_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_isIdentityCapableOf_capability;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_isIdentityCapableOf_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentAssignment_isIdentityCapableOf_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_createIdentityAttribute_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_createIdentityAttribute_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_deleteIdentityAttribute_attributeName;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_deleteIdentityAttribute_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_deleteIdentityAttribute_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_getIdentityAttributeDefinition_attributeName;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_getIdentityAttributeDefinition_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_getIdentityAttributeDefinition_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listAllIdentityAttributes_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listAllIdentityAttributes_return;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listAllIdentityAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listAllIdentityAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_createIdentityType_typeName;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_createIdentityType_attributeNames_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_createIdentityType_attributeNames;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_createIdentityType_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_createIdentityType_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_deleteIdentityType_typeName;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_deleteIdentityType_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_deleteIdentityType_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypes_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypes_return;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_addIdentityTypeAttributes_typeName;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_addIdentityTypeAttributes_attributeNames_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_addIdentityTypeAttributes_attributeNames;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_addIdentityTypeAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_addIdentityTypeAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_removeIdentityTypeAttributes_typeName;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_removeIdentityTypeAttributes_attributeNames_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_removeIdentityTypeAttributes_attributeNames;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_removeIdentityTypeAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_removeIdentityTypeAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypeAttributes_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypeAttributes_return;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypeAttributes_typeName;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypeAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMIdentityTypeManagement_listIdentityTypeAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_createAgentAttribute_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_createAgentAttribute_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_deleteAgentAttribute_attributeName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_deleteAgentAttribute_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_deleteAgentAttribute_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_getAgentAttributeDefinition_attributeName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_getAgentAttributeDefinition_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_getAgentAttributeDefinition_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAllAgentAttributes_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAllAgentAttributes_return;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAllAgentAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAllAgentAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_createAgentType_typeName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_createAgentType_attributeNames_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_createAgentType_attributeNames;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_createAgentType_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_createAgentType_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_deleteAgentType_typeName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_deleteAgentType_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_deleteAgentType_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypes_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypes_return;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_addAgentTypeAttributes_typeName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_addAgentTypeAttributes_attributeNames_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_addAgentTypeAttributes_attributeNames;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_addAgentTypeAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_addAgentTypeAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_removeAgentTypeAttributes_typeName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_removeAgentTypeAttributes_attributeNames_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_removeAgentTypeAttributes_attributeNames;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_removeAgentTypeAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_removeAgentTypeAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypeAttributes_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypeAttributes_return;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypeAttributes_typeName;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypeAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMAgentTypeManagement_listAgentTypeAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_createCapabilityAttribute_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_createCapabilityAttribute_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_deleteCapabilityAttribute_attributeName;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_deleteCapabilityAttribute_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_deleteCapabilityAttribute_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_getCapabilityAttributeDefinition_attributeName;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_getCapabilityAttributeDefinition_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_getCapabilityAttributeDefinition_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listAllCapabilityAttributes_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listAllCapabilityAttributes_return;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listAllCapabilityAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listAllCapabilityAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_createCapability_capabilityName;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_createCapability_attributeNames_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_createCapability_attributeNames;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_createCapability_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_createCapability_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_deleteCapability_capabilityName;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_deleteCapability_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_deleteCapability_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilities_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilities_return;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilities_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilities_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_addCapabilityAttributes_capabilityName;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_addCapabilityAttributes_attributeNames_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_addCapabilityAttributes_attributeNames;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_addCapabilityAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_addCapabilityAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_removeCapabilityAttributes_capabilityName;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_removeCapabilityAttributes_attributeNames_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_removeCapabilityAttributes_attributeNames;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_removeCapabilityAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_removeCapabilityAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilityAttributes_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilityAttributes_return;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilityAttributes_capabilityName;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilityAttributes_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilityAttributes_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_assignCapabilitiesToType_agentType;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_assignCapabilitiesToType_capabilities_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_assignCapabilitiesToType_capabilities;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_assignCapabilitiesToType_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_assignCapabilitiesToType_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_unassignCapabilitiesFromType_agentType;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_unassignCapabilitiesFromType_capabilities_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_unassignCapabilitiesFromType_capabilities;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_unassignCapabilitiesFromType_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_unassignCapabilitiesFromType_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilitiesOfType_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilitiesOfType_return;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilitiesOfType_agentType;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilitiesOfType_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMCapabilityManagement_listCapabilitiesOfType_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_getAuthToken_return_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_getAuthToken_return;
+static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_getAuthToken_askerData_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_obtainInterface_interfaceName;
+static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_getAccessControl_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_getAccessControl_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_getAccessControl_authToken;
+static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_setAccessControl_identity;
+static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_setAccessControl_operation;
+static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_setAccessControl_authToken_loop;
+static int hf_org_csapi_pam_provisioning_IpPAMProvisioningManager_setAccessControl_authToken;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresence_identity;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresence_identityType;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresence_attributes_loop;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresence_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresence_authToken;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenceExpiration_identity;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenceExpiration_identityType;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenceExpiration_attributeNames_loop;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenceExpiration_attributeNames;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenceExpiration_expiresIn;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenceExpiration_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenceExpiration_authToken;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_getIdentityPresence_return_loop;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_getIdentityPresence_identity;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_getIdentityPresence_identityType;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_getIdentityPresence_attributeNames_loop;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_getIdentityPresence_attributeNames;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_getIdentityPresence_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMIdentityPresence_getIdentityPresence_authToken;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresence_agent;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresence_agentType;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresence_attributes_loop;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresence_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresence_authToken;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresence_agent;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresence_capability;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresence_attributes_loop;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresence_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresence_authToken;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpiration_agent;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpiration_agentType;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpiration_attributeNames_loop;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpiration_attributeNames;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpiration_expiresIn;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpiration_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpiration_authToken;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresenceExpiration_agent;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresenceExpiration_capability;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresenceExpiration_attributeNames_loop;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresenceExpiration_attributeNames;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresenceExpiration_expiresIn;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresenceExpiration_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresenceExpiration_authToken;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_getAgentPresence_return_loop;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_getAgentPresence_agent;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_getAgentPresence_agentType;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_getAgentPresence_attributeNames_loop;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_getAgentPresence_attributeNames;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_getAgentPresence_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_getAgentPresence_authToken;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_getCapabilityPresence_return_loop;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_getCapabilityPresence_agent;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_getCapabilityPresence_capability;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_getCapabilityPresence_attributeNames_loop;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_getCapabilityPresence_attributeNames;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_getCapabilityPresence_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMAgentPresence_getCapabilityPresence_authToken;
+static int hf_org_csapi_pam_access_IpAppPAMPreferenceCheck_computeAvailability_return_loop;
+static int hf_org_csapi_pam_access_IpAppPAMPreferenceCheck_computeAvailability_identity;
+static int hf_org_csapi_pam_access_IpAppPAMPreferenceCheck_computeAvailability_attributeNames_loop;
+static int hf_org_csapi_pam_access_IpAppPAMPreferenceCheck_computeAvailability_attributeNames;
+static int hf_org_csapi_pam_access_IpAppPAMPreferenceCheck_computeAvailability_authToken_loop;
+static int hf_org_csapi_pam_access_IpAppPAMPreferenceCheck_computeAvailability_authToken;
+static int hf_org_csapi_pam_access_IpPAMAvailability_getAvailability_return_loop;
+static int hf_org_csapi_pam_access_IpPAMAvailability_getAvailability_identity;
+static int hf_org_csapi_pam_access_IpPAMAvailability_getAvailability_attributeNames_loop;
+static int hf_org_csapi_pam_access_IpPAMAvailability_getAvailability_attributeNames;
+static int hf_org_csapi_pam_access_IpPAMAvailability_getAvailability_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMAvailability_getAvailability_authToken;
+static int hf_org_csapi_pam_access_IpPAMAvailability_getPreference_identity;
+static int hf_org_csapi_pam_access_IpPAMAvailability_getPreference_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMAvailability_getPreference_authToken;
+static int hf_org_csapi_pam_access_IpPAMAvailability_setPreference_identity;
+static int hf_org_csapi_pam_access_IpPAMAvailability_setPreference_operation;
+static int hf_org_csapi_pam_access_IpPAMAvailability_setPreference_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMAvailability_setPreference_authToken;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_getAuthToken_return_loop;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_getAuthToken_return;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_getAuthToken_askerData_loop;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_obtainInterface_interfaceName;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_getAccessControl_identity;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_getAccessControl_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_getAccessControl_authToken;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_setAccessControl_identity;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_setAccessControl_operation;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_setAccessControl_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_setAccessControl_authToken;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_activateService_identity;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_activateService_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_activateService_authToken;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_deactivateService_identity;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_deactivateService_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_deactivateService_authToken;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_isActiveIdentity_return;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_isActiveIdentity_identity;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_isActiveIdentity_authToken_loop;
+static int hf_org_csapi_pam_access_IpPAMPresenceAvailabilityManager_isActiveIdentity_authToken;
+static int hf_org_csapi_pam_event_IpAppPAMEventHandler_eventNotify_eventID;
+static int hf_org_csapi_pam_event_IpAppPAMEventHandler_eventNotify_eventInfo_loop;
+static int hf_org_csapi_pam_event_IpAppPAMEventHandler_eventNotifyErr_eventID;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_isRegistered_return;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_isRegistered_clientID;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_isRegistered_authToken_loop;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_isRegistered_authToken;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_registerAppInterface_return;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_registerAppInterface_authToken_loop;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_registerAppInterface_authToken;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_return;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_clientID;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_eventList_loop;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_validFor;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_authToken_loop;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_authToken;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_deregisterAppInterface_clientID;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_deregisterAppInterface_authToken_loop;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_deregisterAppInterface_authToken;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_deregisterFromEvent_eventID;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_deregisterFromEvent_authToken_loop;
+static int hf_org_csapi_pam_event_IpPAMEventHandler_deregisterFromEvent_authToken;
+static int hf_org_csapi_pam_event_IpPAMEventManager_getAuthToken_return_loop;
+static int hf_org_csapi_pam_event_IpPAMEventManager_getAuthToken_return;
+static int hf_org_csapi_pam_event_IpPAMEventManager_getAuthToken_askerData_loop;
+static int hf_org_csapi_pam_event_IpPAMEventManager_obtainInterface_interfaceName;
+static int hf_org_csapi_pam_event_IpPAMEventManager_getAccessControl_identity;
+static int hf_org_csapi_pam_event_IpPAMEventManager_getAccessControl_authToken_loop;
+static int hf_org_csapi_pam_event_IpPAMEventManager_getAccessControl_authToken;
+static int hf_org_csapi_pam_event_IpPAMEventManager_setAccessControl_identity;
+static int hf_org_csapi_pam_event_IpPAMEventManager_setAccessControl_operation;
+static int hf_org_csapi_pam_event_IpPAMEventManager_setAccessControl_authToken_loop;
+static int hf_org_csapi_pam_event_IpPAMEventManager_setAccessControl_authToken;
+static int hf_org_csapi_pam_event_IpPAMEventManager_activateService_identity;
+static int hf_org_csapi_pam_event_IpPAMEventManager_activateService_authToken_loop;
+static int hf_org_csapi_pam_event_IpPAMEventManager_activateService_authToken;
+static int hf_org_csapi_pam_event_IpPAMEventManager_deactivateService_identity;
+static int hf_org_csapi_pam_event_IpPAMEventManager_deactivateService_authToken_loop;
+static int hf_org_csapi_pam_event_IpPAMEventManager_deactivateService_authToken;
+static int hf_org_csapi_pam_event_IpPAMEventManager_isActiveIdentity_return;
+static int hf_org_csapi_pam_event_IpPAMEventManager_isActiveIdentity_identity;
+static int hf_org_csapi_pam_event_IpPAMEventManager_isActiveIdentity_authToken_loop;
+static int hf_org_csapi_pam_event_IpPAMEventManager_isActiveIdentity_authToken;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessagingManager_reportNotification_assignmentID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessagingManager_reportNotification_eventInfo_loop;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessagingManager_terminateMultipleMailboxes_mailboxSet_loop;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessagingManager_terminateMultipleMultiMediaMessagingSessions_multiMediaMessagingSet_loop;
+static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_openMailbox_mailboxID;
+static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_openMailbox_authenticationInfo;
+static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_createNotification_return;
+static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_createNotification_eventCriteria_loop;
+static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_destroyNotification_assignmentID;
+static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_changeNotification_assignmentID;
+static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_changeNotification_eventCriteria_loop;
+static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_getNextNotification_reset;
+static int hf_org_csapi_mmm_IpMultiMediaMessagingManager_enableNotifications_return;
+static int hf_org_csapi_mmm_IpAppMailbox_createFolderRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_createFolderRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_createFolderRes_folderID;
+static int hf_org_csapi_mmm_IpAppMailbox_createFolderErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_createFolderErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_createFolderErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_createFolderErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_getFoldersRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getFoldersRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getFoldersRes_folderID;
+static int hf_org_csapi_mmm_IpAppMailbox_getFoldersRes_folderNames_loop;
+static int hf_org_csapi_mmm_IpAppMailbox_getFoldersRes_folderNames;
+static int hf_org_csapi_mmm_IpAppMailbox_getFoldersErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getFoldersErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getFoldersErr_folderID;
+static int hf_org_csapi_mmm_IpAppMailbox_getFoldersErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_getFoldersErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_deleteFolderRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_deleteFolderRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_deleteFolderErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_deleteFolderErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_deleteFolderErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_deleteFolderErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_copyFolderRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_copyFolderRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_copyFolderErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_copyFolderErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_copyFolderErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_copyFolderErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_moveFolderRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_moveFolderRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_moveFolderErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_moveFolderErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_moveFolderErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_moveFolderErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_putMessageRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_putMessageRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_putMessageRes_messageID;
+static int hf_org_csapi_mmm_IpAppMailbox_putMessageErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_putMessageErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_putMessageErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_putMessageErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_copyMessageRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_copyMessageRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_copyMessageErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_copyMessageErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_copyMessageErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_copyMessageErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_moveMessageRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_moveMessageRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_moveMessageErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_moveMessageErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_moveMessageErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_moveMessageErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_deleteMessageRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_deleteMessageRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_deleteMessageErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_deleteMessageErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_deleteMessageErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_deleteMessageErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_listMessagesRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_listMessagesRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_listMessagesRes_messageList_loop;
+static int hf_org_csapi_mmm_IpAppMailbox_listMessagesRes_final;
+static int hf_org_csapi_mmm_IpAppMailbox_listMessagesErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_listMessagesErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_listMessagesErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_listMessagesErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_listMessageBodyPartsRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_listMessageBodyPartsRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_listMessageBodyPartsRes_partsList_loop;
+static int hf_org_csapi_mmm_IpAppMailbox_listMessageBodyPartsErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_listMessageBodyPartsErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_listMessageBodyPartsErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_listMessageBodyPartsErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageBodyPartsRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageBodyPartsRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageBodyPartsRes_bodyParts_loop;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageBodyPartsErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageBodyPartsErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageBodyPartsErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageBodyPartsErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageHeadersRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageHeadersRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageHeadersRes_headers_loop;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageHeadersErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageHeadersErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageHeadersErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageHeadersErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentRes_contentType;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentRes_contentTransferEncoding;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentRes_content_loop;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentRes_content;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageContentErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageRes_message_loop;
+static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageRes_message;
+static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_getFullMessageErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesRes_returnedProperties_loop;
+static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesRes_folderID;
+static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesRes_returnedProperties_loop;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesRes_messageID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesRes_returnedProperties_loop;
+static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesRes_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesRes_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesRes_messageID;
+static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesRes_propertiesUpdated_loop;
+static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesErr_messageID;
+static int hf_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesErr_propertiesNotUpdated_loop;
+static int hf_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesErr_mailboxSessionID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesErr_requestID;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesErr_error;
+static int hf_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesErr_errorDetails;
+static int hf_org_csapi_mmm_IpMailbox_close_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_createFolderReq_return;
+static int hf_org_csapi_mmm_IpMailbox_createFolderReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_createFolderReq_folderID;
+static int hf_org_csapi_mmm_IpMailbox_getFoldersReq_return;
+static int hf_org_csapi_mmm_IpMailbox_getFoldersReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_getFoldersReq_folderID;
+static int hf_org_csapi_mmm_IpMailbox_deleteFolderReq_return;
+static int hf_org_csapi_mmm_IpMailbox_deleteFolderReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_deleteFolderReq_folderID;
+static int hf_org_csapi_mmm_IpMailbox_copyFolderReq_return;
+static int hf_org_csapi_mmm_IpMailbox_copyFolderReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_copyFolderReq_sourceFolderID;
+static int hf_org_csapi_mmm_IpMailbox_copyFolderReq_destinationFolderID;
+static int hf_org_csapi_mmm_IpMailbox_moveFolderReq_return;
+static int hf_org_csapi_mmm_IpMailbox_moveFolderReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_moveFolderReq_sourceFolderID;
+static int hf_org_csapi_mmm_IpMailbox_moveFolderReq_destinationFolderID;
+static int hf_org_csapi_mmm_IpMailbox_putMessageReq_return;
+static int hf_org_csapi_mmm_IpMailbox_putMessageReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_putMessageReq_folderID;
+static int hf_org_csapi_mmm_IpMailbox_putMessageReq_message_loop;
+static int hf_org_csapi_mmm_IpMailbox_putMessageReq_message;
+static int hf_org_csapi_mmm_IpMailbox_copyMessageReq_return;
+static int hf_org_csapi_mmm_IpMailbox_copyMessageReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_copyMessageReq_fromFolderID;
+static int hf_org_csapi_mmm_IpMailbox_copyMessageReq_toFolderID;
+static int hf_org_csapi_mmm_IpMailbox_copyMessageReq_messageID;
+static int hf_org_csapi_mmm_IpMailbox_moveMessageReq_return;
+static int hf_org_csapi_mmm_IpMailbox_moveMessageReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_moveMessageReq_fromFolderID;
+static int hf_org_csapi_mmm_IpMailbox_moveMessageReq_toFolderID;
+static int hf_org_csapi_mmm_IpMailbox_moveMessageReq_messageID;
+static int hf_org_csapi_mmm_IpMailbox_deleteMessageReq_return;
+static int hf_org_csapi_mmm_IpMailbox_deleteMessageReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_deleteMessageReq_fromFolderID;
+static int hf_org_csapi_mmm_IpMailbox_deleteMessageReq_messageID;
+static int hf_org_csapi_mmm_IpMailbox_listMessagesReq_return;
+static int hf_org_csapi_mmm_IpMailbox_listMessagesReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_listMessagesReq_folderID;
+static int hf_org_csapi_mmm_IpMailbox_listMessagesReq_reset;
+static int hf_org_csapi_mmm_IpMailbox_listMessageBodyPartsReq_return;
+static int hf_org_csapi_mmm_IpMailbox_listMessageBodyPartsReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_listMessageBodyPartsReq_folderID;
+static int hf_org_csapi_mmm_IpMailbox_listMessageBodyPartsReq_messageID;
+static int hf_org_csapi_mmm_IpMailbox_listMessageBodyPartsReq_maxNestingLevel;
+static int hf_org_csapi_mmm_IpMailbox_getMessageBodyPartsReq_return;
+static int hf_org_csapi_mmm_IpMailbox_getMessageBodyPartsReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_getMessageBodyPartsReq_folderID;
+static int hf_org_csapi_mmm_IpMailbox_getMessageBodyPartsReq_messageID;
+static int hf_org_csapi_mmm_IpMailbox_getMessageBodyPartsReq_partIDs_loop;
+static int hf_org_csapi_mmm_IpMailbox_getMessageBodyPartsReq_partIDs;
+static int hf_org_csapi_mmm_IpMailbox_getMessageHeadersReq_return;
+static int hf_org_csapi_mmm_IpMailbox_getMessageHeadersReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_getMessageHeadersReq_folderID;
+static int hf_org_csapi_mmm_IpMailbox_getMessageHeadersReq_messageID;
+static int hf_org_csapi_mmm_IpMailbox_getMessageContentReq_return;
+static int hf_org_csapi_mmm_IpMailbox_getMessageContentReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_getMessageContentReq_folderID;
+static int hf_org_csapi_mmm_IpMailbox_getMessageContentReq_messageID;
+static int hf_org_csapi_mmm_IpMailbox_getFullMessageReq_return;
+static int hf_org_csapi_mmm_IpMailbox_getFullMessageReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_getFullMessageReq_folderID;
+static int hf_org_csapi_mmm_IpMailbox_getFullMessageReq_messageID;
+static int hf_org_csapi_mmm_IpMailbox_getMailboxInfoPropertiesReq_return;
+static int hf_org_csapi_mmm_IpMailbox_getMailboxInfoPropertiesReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_getFolderInfoPropertiesReq_return;
+static int hf_org_csapi_mmm_IpMailbox_getFolderInfoPropertiesReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_getFolderInfoPropertiesReq_folderID;
+static int hf_org_csapi_mmm_IpMailbox_getMessageInfoPropertiesReq_return;
+static int hf_org_csapi_mmm_IpMailbox_getMessageInfoPropertiesReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_getMessageInfoPropertiesReq_messageID;
+static int hf_org_csapi_mmm_IpMailbox_setMessageInfoPropertiesReq_return;
+static int hf_org_csapi_mmm_IpMailbox_setMessageInfoPropertiesReq_mailboxSessionID;
+static int hf_org_csapi_mmm_IpMailbox_setMessageInfoPropertiesReq_messageID;
+static int hf_org_csapi_mmm_IpMailbox_setMessageInfoPropertiesReq_properties_loop;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_sendMessageRes_sessionID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_sendMessageRes_assignmentID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_sendMessageErr_sessionID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_sendMessageErr_assignmentID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_sendMessageErr_error;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_sendMessageErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_cancelMessageRes_sessionID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_cancelMessageRes_assignmentID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_cancelMessageErr_sessionID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_cancelMessageErr_assignmentID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_cancelMessageErr_error;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_cancelMessageErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_queryStatusRes_sessionID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_queryStatusRes_assignmentID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_queryStatusRes_result_loop;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_queryStatusErr_sessionID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_queryStatusErr_assignmentID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_queryStatusErr_error;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_queryStatusErr_errorDetails;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageStatusReport_sessionID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageStatusReport_assignmentID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageStatusReport_deliveryReportType;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageStatusReport_deliveryReportInfo;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageReceived_sessionID;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageReceived_message_loop;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageReceived_message;
+static int hf_org_csapi_mmm_IpAppMultiMediaMessaging_messageReceived_headers_loop;
+static int hf_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_return;
+static int hf_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_sessionID;
+static int hf_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_deliveryType;
+static int hf_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_messageTreatment_loop;
+static int hf_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_message_loop;
+static int hf_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_message;
+static int hf_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_additionalHeaders_loop;
+static int hf_org_csapi_mmm_IpMultiMediaMessaging_cancelMessageReq_sessionID;
+static int hf_org_csapi_mmm_IpMultiMediaMessaging_cancelMessageReq_assignmentID;
+static int hf_org_csapi_mmm_IpMultiMediaMessaging_queryStatusReq_sessionID;
+static int hf_org_csapi_mmm_IpMultiMediaMessaging_queryStatusReq_assignmentID;
+static int hf_org_csapi_mmm_IpMultiMediaMessaging_close_sessionID;
         /* Struct filters */
-static int hf_org_csapi_TpAddress_Plan = -1;
-static int hf_org_csapi_TpAddress_AddrString = -1;
-static int hf_org_csapi_TpAddress_Name = -1;
-static int hf_org_csapi_TpAddress_Presentation = -1;
-static int hf_org_csapi_TpAddress_Screening = -1;
-static int hf_org_csapi_TpAddress_SubAddressString = -1;
-static int hf_org_csapi_TpAddressRange_Plan = -1;
-static int hf_org_csapi_TpAddressRange_AddrString = -1;
-static int hf_org_csapi_TpAddressRange_Name = -1;
-static int hf_org_csapi_TpAddressRange_SubAddressString = -1;
-static int hf_org_csapi_TpCAIElements_UnitsPerInterval = -1;
-static int hf_org_csapi_TpCAIElements_SecondsPerTimeInterval = -1;
-static int hf_org_csapi_TpCAIElements_ScalingFactor = -1;
-static int hf_org_csapi_TpCAIElements_UnitIncrement = -1;
-static int hf_org_csapi_TpCAIElements_UnitsPerDataInterval = -1;
-static int hf_org_csapi_TpCAIElements_SegmentsPerDataInterval = -1;
-static int hf_org_csapi_TpCAIElements_InitialSecsPerTimeInterval = -1;
-static int hf_org_csapi_TpChargePerTime_InitialCharge = -1;
-static int hf_org_csapi_TpChargePerTime_CurrentChargePerMinute = -1;
-static int hf_org_csapi_TpChargePerTime_NextChargePerMinute = -1;
-static int hf_org_csapi_TpAoCInfo_Currency = -1;
-static int hf_org_csapi_TpTimeInterval_StartTime = -1;
-static int hf_org_csapi_TpTimeInterval_StopTime = -1;
-static int hf_org_csapi_TpStructuredAttributeValue_Type = -1;
-static int hf_org_csapi_TpAttribute_AttributeName = -1;
-static int hf_org_csapi_fw_TpFaultStats_Fault = -1;
-static int hf_org_csapi_fw_TpFaultStats_Occurrences = -1;
-static int hf_org_csapi_fw_TpFaultStats_MaxDuration = -1;
-static int hf_org_csapi_fw_TpFaultStats_TotalDuration = -1;
-static int hf_org_csapi_fw_TpFaultStats_NumberOfClientsAffected = -1;
-static int hf_org_csapi_fw_TpFaultStatsRecord_FaultStatsSet_loop = -1;
-static int hf_org_csapi_fw_TpLoadPolicy_LoadPolicy = -1;
-static int hf_org_csapi_fw_TpLoadStatisticData_LoadValue = -1;
-static int hf_org_csapi_fw_TpLoadStatisticData_LoadLevel = -1;
-static int hf_org_csapi_fw_TpLoadThreshold_LoadThreshold = -1;
-static int hf_org_csapi_fw_TpLoadInitVal_LoadLevel = -1;
-static int hf_org_csapi_fw_TpProperty_PropertyName = -1;
-static int hf_org_csapi_fw_TpProperty_PropertyValue = -1;
-static int hf_org_csapi_fw_TpClientAppDescription_ClientAppID = -1;
-static int hf_org_csapi_fw_TpClientAppDescription_ClientAppProperties_loop = -1;
-static int hf_org_csapi_fw_TpClientAppDescription_HasAccessSession = -1;
-static int hf_org_csapi_fw_TpClientAppDescription_HasServiceInstances = -1;
-static int hf_org_csapi_fw_TpEntOp_EntOpID = -1;
-static int hf_org_csapi_fw_TpEntOp_EntOpProperties_loop = -1;
-static int hf_org_csapi_fw_TpSag_SagID = -1;
-static int hf_org_csapi_fw_TpSag_SagDescription = -1;
-static int hf_org_csapi_fw_TpServiceProperty_ServicePropertyName = -1;
-static int hf_org_csapi_fw_TpServiceProperty_ServicePropertyValueList_loop = -1;
-static int hf_org_csapi_fw_TpServiceProperty_ServicePropertyValueList = -1;
-static int hf_org_csapi_fw_TpServiceDescription_ServiceTypeName = -1;
-static int hf_org_csapi_fw_TpServiceDescription_ServicePropertyList_loop = -1;
-static int hf_org_csapi_fw_TpService_ServiceID = -1;
-static int hf_org_csapi_fw_TpServiceProfileDescription_ServiceContractID = -1;
-static int hf_org_csapi_fw_TpServiceProfileDescription_ServiceStartDate = -1;
-static int hf_org_csapi_fw_TpServiceProfileDescription_ServiceEndDate = -1;
-static int hf_org_csapi_fw_TpServiceProfileDescription_ServiceTypeName = -1;
-static int hf_org_csapi_fw_TpServiceProfileDescription_ServiceSubscriptionProperties_loop = -1;
-static int hf_org_csapi_fw_TpServiceProfileDescription_InUse = -1;
-static int hf_org_csapi_fw_TpServiceProfileDescription_ServiceID = -1;
-static int hf_org_csapi_fw_TpServiceTypeProperty_ServicePropertyName = -1;
-static int hf_org_csapi_fw_TpServiceTypeProperty_ServiceTypePropertyMode = -1;
-static int hf_org_csapi_fw_TpServiceTypeProperty_ServicePropertyTypeName = -1;
-static int hf_org_csapi_fw_TpServiceTypeDescription_ServiceTypePropertyList_loop = -1;
-static int hf_org_csapi_fw_TpServiceTypeDescription_ServiceTypeNameList_loop = -1;
-static int hf_org_csapi_fw_TpServiceTypeDescription_ServiceTypeNameList = -1;
-static int hf_org_csapi_fw_TpServiceTypeDescription_AvailableOrUnavailable = -1;
-static int hf_org_csapi_fw_TpSignatureAndServiceMgr_DigitalSignature_loop = -1;
-static int hf_org_csapi_fw_TpSignatureAndServiceMgr_DigitalSignature = -1;
-static int hf_org_csapi_fw_TpPerson_PersonName = -1;
-static int hf_org_csapi_fw_TpPerson_PostalAddress = -1;
-static int hf_org_csapi_fw_TpPerson_TelephoneNumber = -1;
-static int hf_org_csapi_fw_TpPerson_Email = -1;
-static int hf_org_csapi_fw_TpPerson_HomePage = -1;
-static int hf_org_csapi_fw_TpPerson_PersonProperties_loop = -1;
-static int hf_org_csapi_fw_TpServiceContractDescription_ServiceStartDate = -1;
-static int hf_org_csapi_fw_TpServiceContractDescription_ServiceEndDate = -1;
-static int hf_org_csapi_fw_TpServiceContractDescription_ServiceTypeName = -1;
-static int hf_org_csapi_fw_TpServiceContractDescription_ServiceID = -1;
-static int hf_org_csapi_fw_TpServiceContractDescription_ServiceSubscriptionProperties_loop = -1;
-static int hf_org_csapi_fw_TpServiceContractDescription_InUse = -1;
-static int hf_org_csapi_fw_TpLoadStatistic_TimeStamp = -1;
-static int hf_org_csapi_fw_TpServiceContract_ServiceContractID = -1;
-static int hf_org_csapi_fw_TpServiceProfile_ServiceProfileID = -1;
-static int hf_org_csapi_fw_TpSagProfilePair_Sag = -1;
-static int hf_org_csapi_fw_TpSagProfilePair_ServiceProfile = -1;
-static int hf_org_csapi_fw_TpAddSagMembersConflict_ClientApplication = -1;
-static int hf_org_csapi_fw_TpAddSagMembersConflict_Service = -1;
-static int hf_org_csapi_fw_TpAssignSagToServiceProfileConflict_ClientApplication = -1;
-static int hf_org_csapi_fw_TpAssignSagToServiceProfileConflict_Service = -1;
-static int hf_org_csapi_fw_TpServiceTypePropertyValue_ServicePropertyName = -1;
-static int hf_org_csapi_fw_TpServiceTypePropertyValue_ServiceTypePropertyMode = -1;
-static int hf_org_csapi_fw_TpServiceTypePropertyValue_ServicePropertyTypeName = -1;
-static int hf_org_csapi_fw_TpServiceTypePropertyValue_ServicePropertyValueList_loop = -1;
-static int hf_org_csapi_fw_TpServiceTypePropertyValue_ServicePropertyValueList = -1;
-static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_ServiceType = -1;
-static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_ServiceID = -1;
-static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_CompatibleServiceID = -1;
-static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_BackwardCompatibilityLevel = -1;
-static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_MigrationRequired = -1;
-static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_DataMigrated = -1;
-static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_MigrationDataAndTime = -1;
-static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_MigrationAdditionalInfo_loop = -1;
-static int hf_org_csapi_fw_TpFwAgreementInfo_ClientApplicationID = -1;
-static int hf_org_csapi_fw_TpFwAgreementInfo_ServiceID = -1;
-static int hf_org_csapi_fw_TpFwAgreementInfo_ServiceContractID = -1;
-static int hf_org_csapi_fw_TpFwAgreementInfo_ServiceProfileID = -1;
-static int hf_org_csapi_ui_TpUIMessageCriteria_EndSequence = -1;
-static int hf_org_csapi_ui_TpUIMessageCriteria_MaxMessageTime = -1;
-static int hf_org_csapi_ui_TpUIMessageCriteria_MaxMessageSize = -1;
-static int hf_org_csapi_ui_TpUIEventInfo_ServiceCode = -1;
-static int hf_org_csapi_ui_TpUIEventInfo_DataTypeIndication = -1;
-static int hf_org_csapi_ui_TpUIEventInfo_DataString = -1;
-static int hf_org_csapi_ui_TpUIEventCriteria_ServiceCode = -1;
-static int hf_org_csapi_ui_TpUIEventCriteriaResult_AssignmentID = -1;
-static int hf_org_csapi_ui_TpUIEventNotificationInfo_ServiceCode = -1;
-static int hf_org_csapi_ui_TpUIEventNotificationInfo_DataTypeIndication = -1;
-static int hf_org_csapi_ui_TpUIEventNotificationInfo_UIEventData_loop = -1;
-static int hf_org_csapi_ui_TpUIEventNotificationInfo_UIEventData = -1;
-static int hf_org_csapi_ui_TpUIRecognitionProperty_PropertyName = -1;
-static int hf_org_csapi_ui_TpUIRecognitionProperty_PropertyValue = -1;
-static int hf_org_csapi_ui_TpUIRecognitionCriteria_SpeakerID = -1;
-static int hf_org_csapi_ui_TpUIRecognitionCriteria_Properties_loop = -1;
-static int hf_org_csapi_ui_TpUIRecognitionCriteria_Grammar = -1;
-static int hf_org_csapi_ui_TpUICollectCriteria_MinLength = -1;
-static int hf_org_csapi_ui_TpUICollectCriteria_MaxLength = -1;
-static int hf_org_csapi_ui_TpUICollectCriteria_EndSequence = -1;
-static int hf_org_csapi_ui_TpUICollectCriteria_StartTimeout = -1;
-static int hf_org_csapi_ui_TpUICollectCriteria_InterCharTimeout = -1;
-static int hf_org_csapi_ui_TpUICollectCriteria_CollectMode = -1;
-static int hf_org_csapi_ui_TpUIWordOverride_Spelling = -1;
-static int hf_org_csapi_ui_TpUIWordOverride_PronounceType = -1;
-static int hf_org_csapi_ui_TpUIWordOverride_PronounceAs = -1;
-static int hf_org_csapi_ui_TpUISynthesisInfoData_SpeakerGender = -1;
-static int hf_org_csapi_ui_TpUISynthesisInfoData_SpeakerAge = -1;
-static int hf_org_csapi_ui_TpUISynthesisInfoData_SpeakerRate = -1;
-static int hf_org_csapi_ui_TpUISynthesisInfoData_SpeakerRange = -1;
-static int hf_org_csapi_ui_TpUISynthesisInfoData_TextData = -1;
-static int hf_org_csapi_ui_TpUISynthesisInfoData_WordOverrideSet_loop = -1;
-static int hf_org_csapi_cc_TpCallError_ErrorTime = -1;
-static int hf_org_csapi_cc_TpCallError_ErrorType = -1;
-static int hf_org_csapi_cc_TpCallEndedReport_CallLegSessionID = -1;
-static int hf_org_csapi_cc_TpCallEndedReport_Cause = -1;
-static int hf_org_csapi_cc_TpCallInfoReport_CallInfoType = -1;
-static int hf_org_csapi_cc_TpCallInfoReport_CallInitiationStartTime = -1;
-static int hf_org_csapi_cc_TpCallInfoReport_CallConnectedToResourceTime = -1;
-static int hf_org_csapi_cc_TpCallInfoReport_CallConnectedToDestinationTime = -1;
-static int hf_org_csapi_cc_TpCallInfoReport_CallEndTime = -1;
-static int hf_org_csapi_cc_TpCallInfoReport_Cause = -1;
-static int hf_org_csapi_cc_TpCallServiceCode_CallServiceCodeType = -1;
-static int hf_org_csapi_cc_TpCallServiceCode_ServiceCodeValue = -1;
-static int hf_org_csapi_cc_TpCallTreatment_CallTreatmentType = -1;
-static int hf_org_csapi_cc_TpCallTreatment_ReleaseCause = -1;
-static int hf_org_csapi_cc_TpCallChargePlan_ChargeOrderType = -1;
-static int hf_org_csapi_cc_TpCallChargePlan_TransparentCharge_loop = -1;
-static int hf_org_csapi_cc_TpCallChargePlan_TransparentCharge = -1;
-static int hf_org_csapi_cc_TpCallChargePlan_ChargePlan = -1;
-static int hf_org_csapi_cc_TpCallChargePlan_AdditionalInfo_loop = -1;
-static int hf_org_csapi_cc_TpCallChargePlan_AdditionalInfo = -1;
-static int hf_org_csapi_cc_TpCallChargePlan_PartyToCharge = -1;
-static int hf_org_csapi_cc_gccs_TpCallEventCriteria_CallEventName = -1;
-static int hf_org_csapi_cc_gccs_TpCallEventCriteria_CallNotificationType = -1;
-static int hf_org_csapi_cc_gccs_TpCallEventCriteria_MonitorMode = -1;
-static int hf_org_csapi_cc_gccs_TpCallEventCriteriaResult_AssignmentID = -1;
-static int hf_org_csapi_cc_gccs_TpCallReleaseCause_Value = -1;
-static int hf_org_csapi_cc_gccs_TpCallReleaseCause_Location = -1;
-static int hf_org_csapi_cc_gccs_TpCallReport_MonitorMode = -1;
-static int hf_org_csapi_cc_gccs_TpCallReport_CallEventTime = -1;
-static int hf_org_csapi_cc_gccs_TpCallReport_CallReportType = -1;
-static int hf_org_csapi_cc_gccs_TpCallReportRequest_MonitorMode = -1;
-static int hf_org_csapi_cc_gccs_TpCallReportRequest_CallReportType = -1;
-static int hf_org_csapi_cc_gccs_TpCallEventInfo_CallAppInfo_loop = -1;
-static int hf_org_csapi_cc_gccs_TpCallEventInfo_CallEventName = -1;
-static int hf_org_csapi_cc_gccs_TpCallEventInfo_CallNotificationType = -1;
-static int hf_org_csapi_cc_gccs_TpCallEventInfo_MonitorMode = -1;
-static int hf_org_csapi_cc_gccs_TpCallEndedReport_CallLegSessionID = -1;
-static int hf_org_csapi_cc_gccs_TpCallInfoReport_CallInfoType = -1;
-static int hf_org_csapi_cc_gccs_TpCallInfoReport_CallInitiationStartTime = -1;
-static int hf_org_csapi_cc_gccs_TpCallInfoReport_CallConnectedToResourceTime = -1;
-static int hf_org_csapi_cc_gccs_TpCallInfoReport_CallConnectedToDestinationTime = -1;
-static int hf_org_csapi_cc_gccs_TpCallInfoReport_CallEndTime = -1;
-static int hf_org_csapi_cc_gccs_TpCallTreatment_CallTreatmentType = -1;
-static int hf_org_csapi_cc_gccs_TpCallIdentifier_CallSessionID = -1;
-static int hf_org_csapi_cc_TpCallEventRequest_CallEventType = -1;
-static int hf_org_csapi_cc_TpCallEventRequest_CallMonitorMode = -1;
-static int hf_org_csapi_cc_TpCallNotificationRequest_CallEventsRequested_loop = -1;
-static int hf_org_csapi_cc_TpNotificationRequested_AssignmentID = -1;
-static int hf_org_csapi_cc_TpCallLegConnectionProperties_AttachMechanism = -1;
-static int hf_org_csapi_cc_TpCallEventInfo_CallEventType = -1;
-static int hf_org_csapi_cc_TpCallEventInfo_CallMonitorMode = -1;
-static int hf_org_csapi_cc_TpCallEventInfo_CallEventTime = -1;
-static int hf_org_csapi_cc_TpNotificationRequestedSetEntry_NotificationRequestSet_loop = -1;
-static int hf_org_csapi_cc_TpNotificationRequestedSetEntry_Final = -1;
-static int hf_org_csapi_cc_TpCarrier_CarrierID_loop = -1;
-static int hf_org_csapi_cc_TpCarrier_CarrierID = -1;
-static int hf_org_csapi_cc_TpCarrier_CarrierSelectionField = -1;
-static int hf_org_csapi_cc_TpCallNotificationInfo_CallAppInfo_loop = -1;
-static int hf_org_csapi_cc_TpCallLegInfoReport_CallLegInfoType = -1;
-static int hf_org_csapi_cc_TpCallLegInfoReport_CallLegStartTime = -1;
-static int hf_org_csapi_cc_TpCallLegInfoReport_CallLegConnectedToResourceTime = -1;
-static int hf_org_csapi_cc_TpCallLegInfoReport_CallLegConnectedToAddressTime = -1;
-static int hf_org_csapi_cc_TpCallLegInfoReport_CallLegEndTime = -1;
-static int hf_org_csapi_cc_TpCallLegInfoReport_CallLegReleaseCause = -1;
-static int hf_org_csapi_cc_TpCallLegInfoReport_CallAppInfo_loop = -1;
-static int hf_org_csapi_cc_TpCallLegProperty_CallLegPropertyName = -1;
-static int hf_org_csapi_cc_TpCallLegProperty_CallLegPropertyValue = -1;
-static int hf_org_csapi_cc_mpccs_TpMultiPartyCallIdentifier_CallSessionID = -1;
-static int hf_org_csapi_cc_mpccs_TpCallLegIdentifier_CallLegSessionID = -1;
-static int hf_org_csapi_cc_mpccs_TpAppCallLegCallBack_AppCallLegSet_loop = -1;
-static int hf_org_csapi_cc_mmccs_TpCallSuperviseVolume_VolumeQuantity = -1;
-static int hf_org_csapi_cc_mmccs_TpCallSuperviseVolume_VolumeUnit = -1;
-static int hf_org_csapi_cc_mmccs_TpMediaStreamRequest_Direction = -1;
-static int hf_org_csapi_cc_mmccs_TpMediaStreamRequest_MediaMonitorMode = -1;
-static int hf_org_csapi_cc_mmccs_TpMediaStreamRequest_EventType = -1;
-static int hf_org_csapi_cc_mmccs_TpMediaStream_Direction = -1;
-static int hf_org_csapi_cc_mmccs_TpMediaStream_ChannelSessionID = -1;
-static int hf_org_csapi_cc_mmccs_TpNotificationMediaRequest_MediaStreamsRequested_loop = -1;
-static int hf_org_csapi_cc_mmccs_TpMediaNotificationRequested_AssignmentID = -1;
-static int hf_org_csapi_cc_mmccs_TpMultiMediaCallIdentifier_MMCallSessionID = -1;
-static int hf_org_csapi_cc_mmccs_TpMultiMediaCallLegIdentifier_MMCallLegSessionID = -1;
-static int hf_org_csapi_cc_mmccs_TpAppMultiMediaCallLegCallBack_AppCallLegSet_loop = -1;
-static int hf_org_csapi_cc_cccs_TpMonoMediaConfPolicy_JoinAllowed = -1;
-static int hf_org_csapi_cc_cccs_TpJoinEventInfo_CallAppInfo_loop = -1;
-static int hf_org_csapi_cc_cccs_TpConfSearchCriteria_StartSearch = -1;
-static int hf_org_csapi_cc_cccs_TpConfSearchCriteria_StopSearch = -1;
-static int hf_org_csapi_cc_cccs_TpConfSearchCriteria_RequestedResources = -1;
-static int hf_org_csapi_cc_cccs_TpConfSearchCriteria_RequestedDuration = -1;
-static int hf_org_csapi_cc_cccs_TpConfSearchResult_MatchFound = -1;
-static int hf_org_csapi_cc_cccs_TpConfSearchResult_ActualStartTime = -1;
-static int hf_org_csapi_cc_cccs_TpConfSearchResult_ActualResources = -1;
-static int hf_org_csapi_cc_cccs_TpConfSearchResult_ActualDuration = -1;
-static int hf_org_csapi_cc_cccs_TpMultiMediaConfPolicy_JoinAllowed = -1;
-static int hf_org_csapi_cc_cccs_TpMultiMediaConfPolicy_MediaAllowed = -1;
-static int hf_org_csapi_cc_cccs_TpMultiMediaConfPolicy_Chaired = -1;
-static int hf_org_csapi_cc_cccs_TpMultiMediaConfPolicy_VideoHandling = -1;
-static int hf_org_csapi_cc_cccs_TpResourceReservation_ReservationID = -1;
-static int hf_org_csapi_cc_cccs_TpConfCallIdentifier_ConfCallSessionID = -1;
-static int hf_org_csapi_cc_cccs_TpSubConfCallIdentifier_SubConfCallSessionID = -1;
-static int hf_org_csapi_ui_TpUIIdentifier_UserInteractionSessionID = -1;
-static int hf_org_csapi_ui_TpUICallIdentifier_UserInteractionSessionID = -1;
-static int hf_org_csapi_mm_TpLocationResponseTime_ResponseTime = -1;
-static int hf_org_csapi_mm_TpLocationResponseTime_TimerValue = -1;
-static int hf_org_csapi_mm_TpLocationTrigger_Longitude = -1;
-static int hf_org_csapi_mm_TpLocationTrigger_Latitude = -1;
-static int hf_org_csapi_mm_TpLocationTrigger_AreaSemiMajor = -1;
-static int hf_org_csapi_mm_TpLocationTrigger_AreaSemiMinor = -1;
-static int hf_org_csapi_mm_TpLocationTrigger_AngleOfSemiMajor = -1;
-static int hf_org_csapi_mm_TpLocationTrigger_Criterion = -1;
-static int hf_org_csapi_mm_TpLocationTrigger_ReportingInterval = -1;
-static int hf_org_csapi_mm_TpLocationRequest_RequestedAccuracy = -1;
-static int hf_org_csapi_mm_TpLocationRequest_AltitudeRequested = -1;
-static int hf_org_csapi_mm_TpLocationRequest_Type = -1;
-static int hf_org_csapi_mm_TpLocationRequest_Priority = -1;
-static int hf_org_csapi_mm_TpLocationRequest_RequestedLocationMethod = -1;
-static int hf_org_csapi_mm_TpGeographicalPosition_Longitude = -1;
-static int hf_org_csapi_mm_TpGeographicalPosition_Latitude = -1;
-static int hf_org_csapi_mm_TpGeographicalPosition_TypeOfUncertaintyShape = -1;
-static int hf_org_csapi_mm_TpGeographicalPosition_UncertaintyInnerSemiMajor = -1;
-static int hf_org_csapi_mm_TpGeographicalPosition_UncertaintyOuterSemiMajor = -1;
-static int hf_org_csapi_mm_TpGeographicalPosition_UncertaintyInnerSemiMinor = -1;
-static int hf_org_csapi_mm_TpGeographicalPosition_UncertaintyOuterSemiMinor = -1;
-static int hf_org_csapi_mm_TpGeographicalPosition_AngleOfSemiMajor = -1;
-static int hf_org_csapi_mm_TpGeographicalPosition_SegmentStartAngle = -1;
-static int hf_org_csapi_mm_TpGeographicalPosition_SegmentEndAngle = -1;
-static int hf_org_csapi_mm_TpMobilityStopAssignmentData_AssignmentId = -1;
-static int hf_org_csapi_mm_TpMobilityStopAssignmentData_StopScope = -1;
-static int hf_org_csapi_mm_TpMobilityStopAssignmentData_Users_loop = -1;
-static int hf_org_csapi_mm_TpUlExtendedData_TerminalType = -1;
-static int hf_org_csapi_mm_TpUlExtendedData_AltitudePresent = -1;
-static int hf_org_csapi_mm_TpUlExtendedData_Altitude = -1;
-static int hf_org_csapi_mm_TpUlExtendedData_UncertaintyAltitude = -1;
-static int hf_org_csapi_mm_TpUlExtendedData_TimestampPresent = -1;
-static int hf_org_csapi_mm_TpUlExtendedData_Timestamp = -1;
-static int hf_org_csapi_mm_TpUlExtendedData_UsedLocationMethod = -1;
-static int hf_org_csapi_mm_TpUserLocation_StatusCode = -1;
-static int hf_org_csapi_mm_TpUserLocationExtended_StatusCode = -1;
-static int hf_org_csapi_mm_TpUserLocationExtended_Locations_loop = -1;
-static int hf_org_csapi_mm_TpLocationTriggerCamel_UpdateInsideVlr = -1;
-static int hf_org_csapi_mm_TpLocationTriggerCamel_UpdateOutsideVlr = -1;
-static int hf_org_csapi_mm_TpUserLocationCamel_StatusCode = -1;
-static int hf_org_csapi_mm_TpUserLocationCamel_GeographicalPositionPresent = -1;
-static int hf_org_csapi_mm_TpUserLocationCamel_TimestampPresent = -1;
-static int hf_org_csapi_mm_TpUserLocationCamel_Timestamp = -1;
-static int hf_org_csapi_mm_TpUserLocationCamel_VlrNumberPresent = -1;
-static int hf_org_csapi_mm_TpUserLocationCamel_LocationNumberPresent = -1;
-static int hf_org_csapi_mm_TpUserLocationCamel_CellIdOrLaiPresent = -1;
-static int hf_org_csapi_mm_TpUserLocationCamel_CellIdOrLai = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergencyRequest_UserAddressPresent = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergencyRequest_NaEsrdPresent = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergencyRequest_NaEsrd = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergencyRequest_NaEsrkPresent = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergencyRequest_NaEsrk = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergencyRequest_ImeiPresent = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergencyRequest_Imei = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_StatusCode = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_UserIdPresent = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_NaEsrdPresent = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_NaEsrd = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_NaEsrkPresent = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_NaEsrk = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_ImeiPresent = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_Imei = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_TriggeringEvent = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_GeographicalPositionPresent = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_AltitudePresent = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_Altitude = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_UncertaintyAltitude = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_TimestampPresent = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_Timestamp = -1;
-static int hf_org_csapi_mm_TpUserLocationEmergency_UsedLocationMethod = -1;
-static int hf_org_csapi_mm_TpUserStatus_StatusCode = -1;
-static int hf_org_csapi_mm_TpUserStatus_Status = -1;
-static int hf_org_csapi_mm_TpUserStatus_TerminalType = -1;
-static int hf_org_csapi_mm_TpTriggeredStatusRequest_Users_loop = -1;
-static int hf_org_csapi_mm_TpTriggeredStatusRequest_AssignmentID = -1;
-static int hf_org_csapi_mm_TpTriggeredStatusRequestSetEntry_Requests_loop = -1;
-static int hf_org_csapi_mm_TpTriggeredStatusRequestSetEntry_Final = -1;
-static int hf_org_csapi_mm_TpPeriodicLocationRequest_Users_loop = -1;
-static int hf_org_csapi_mm_TpPeriodicLocationRequest_ReportingInterval = -1;
-static int hf_org_csapi_mm_TpPeriodicLocationRequest_AssignmentID = -1;
-static int hf_org_csapi_mm_TpPeriodicLocationRequestSetEntry_Requests_loop = -1;
-static int hf_org_csapi_mm_TpPeriodicLocationRequestSetEntry_Final = -1;
-static int hf_org_csapi_mm_TpTriggeredLocationRequest_Users_loop = -1;
-static int hf_org_csapi_mm_TpTriggeredLocationRequest_AssignmentID = -1;
-static int hf_org_csapi_mm_TpTriggeredLocationRequestSetEntry_Requests_loop = -1;
-static int hf_org_csapi_mm_TpTriggeredLocationRequestSetEntry_Final = -1;
-static int hf_org_csapi_mm_TpUserStatusIndicatorExtended_UserStatusIndicator = -1;
-static int hf_org_csapi_mm_TpUserStatusIndicatorExtended_PDPContextActive = -1;
-static int hf_org_csapi_mm_TpUserInfo_UserName = -1;
-static int hf_org_csapi_mm_TpUserInfo_Password = -1;
-static int hf_org_csapi_mm_TpNetworkStatusIndicator_CountryCode = -1;
-static int hf_org_csapi_mm_TpNetworkStatusIndicator_MobileNetworkCode = -1;
-static int hf_org_csapi_mm_TpNetworkStatusIndicator_AccessTechnology = -1;
-static int hf_org_csapi_mm_TpNetworkStatusIndicator_RoamingStatus = -1;
-static int hf_org_csapi_mm_TpUserStatusExtended_UserID = -1;
-static int hf_org_csapi_mm_TpUserStatusExtended_StatusCode = -1;
-static int hf_org_csapi_mm_TpUserStatusExtended_TerminalType = -1;
-static int hf_org_csapi_mm_TpUserStatusExtended_AuthenticationStatus = -1;
-static int hf_org_csapi_mm_TpUserStatusExtended_UserIPAddress = -1;
-static int hf_org_csapi_mm_TpUserStatusExtended_UserMSISDN = -1;
-static int hf_org_csapi_mm_TpUserStatusExtended_UserConnectionID = -1;
-static int hf_org_csapi_mm_TpUserStatusExtended_AccessPointName = -1;
-static int hf_org_csapi_mm_TpBindingNotificationCriteria_NotificationCriteriaType = -1;
-static int hf_org_csapi_mm_TpBindingNotificationCriteria_ContactAddressSet_loop = -1;
-static int hf_org_csapi_termcap_TpTerminalCapabilities_TerminalCapabilities = -1;
-static int hf_org_csapi_termcap_TpTerminalCapabilities_StatusCode = -1;
-static int hf_org_csapi_termcap_TpTerminalCapabilityScope_ScopeType = -1;
-static int hf_org_csapi_termcap_TpTerminalCapabilityScope_Scope = -1;
-static int hf_org_csapi_dsc_TpChargePerVolume_InitialCharge = -1;
-static int hf_org_csapi_dsc_TpChargePerVolume_CurrentChargePerKilobyte = -1;
-static int hf_org_csapi_dsc_TpChargePerVolume_NextChargePerKilobyte = -1;
-static int hf_org_csapi_dsc_TpDataSessionChargePlan_Currency = -1;
-static int hf_org_csapi_dsc_TpDataSessionChargePlan_AdditionalInfo = -1;
-static int hf_org_csapi_dsc_TpDataSessionError_ErrorTime = -1;
-static int hf_org_csapi_dsc_TpDataSessionError_ErrorType = -1;
-static int hf_org_csapi_dsc_TpDataSessionEventCriteria_DataSessionEventName = -1;
-static int hf_org_csapi_dsc_TpDataSessionEventCriteria_MonitorMode = -1;
-static int hf_org_csapi_dsc_TpDataSessionEventInfo_DataSessionEventName = -1;
-static int hf_org_csapi_dsc_TpDataSessionEventInfo_MonitorMode = -1;
-static int hf_org_csapi_dsc_TpDataSessionEventInfo_QoSClass = -1;
-static int hf_org_csapi_dsc_TpDataSessionReleaseCause_Value = -1;
-static int hf_org_csapi_dsc_TpDataSessionReleaseCause_Location = -1;
-static int hf_org_csapi_dsc_TpDataSessionReport_MonitorMode = -1;
-static int hf_org_csapi_dsc_TpDataSessionReport_DataSessionEventTime = -1;
-static int hf_org_csapi_dsc_TpDataSessionReport_DataSessionReportType = -1;
-static int hf_org_csapi_dsc_TpDataSessionReportRequest_MonitorMode = -1;
-static int hf_org_csapi_dsc_TpDataSessionReportRequest_DataSessionReportType = -1;
-static int hf_org_csapi_dsc_TpDataSessionSuperviseVolume_VolumeQuantity = -1;
-static int hf_org_csapi_dsc_TpDataSessionSuperviseVolume_VolumeUnit = -1;
-static int hf_org_csapi_dsc_TpDataSessionEventCriteriaResult_AssignmentID = -1;
-static int hf_org_csapi_dsc_TpDataSessionIdentifier_DataSessionID = -1;
-static int hf_org_csapi_gms_TpGMSNewMessageArrivedInfo_FolderID = -1;
-static int hf_org_csapi_gms_TpGMSNewMessageArrivedInfo_MessageID = -1;
-static int hf_org_csapi_gms_TpGMSNewMessageArrivedInfo_NumberOfProperties = -1;
-static int hf_org_csapi_gms_TpGMSNewMessageArrivedCriteria_AuthenticationInfo = -1;
-static int hf_org_csapi_gms_TpMailboxIdentifier_SessionID = -1;
-static int hf_org_csapi_gms_TpMailboxFolderIdentifier_SessionID = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagTimePeriod_duration = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagTimeOfDay_name = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagTimeOfDay_description = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagTimeOfDay_tag = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagTimeOfDay_value = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagString_name = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagString_description = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagString_tag = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagString_value = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagMonth_name = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagMonth_description = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagMonth_tag = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagMonth_value = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagInt_name = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagInt_description = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagInt_tag = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagInt_value = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagDir_name = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagDir_description = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagDir_tag = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagDir_value = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagDayOfWeek_name = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagDayOfWeek_description = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagDayOfWeek_tag = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagDayOfWeek_value = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagDateTime_name = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagDateTime_description = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagDateTime_tag = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagDateTime_value = -1;
-static int hf_org_csapi_cm_TpEndpoint_type = -1;
-static int hf_org_csapi_cm_TpEndpoint_id = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagExcessLoadAction_name = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagExcessLoadAction_description = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagExcessLoadAction_tag = -1;
-static int hf_org_csapi_cm_TpNameDescrpTagExcessLoadAction_value = -1;
-static int hf_org_csapi_cm_TpDsCodepoint_match = -1;
-static int hf_org_csapi_cm_TpDsCodepoint_mask = -1;
-static int hf_org_csapi_cm_TpIPSubnet_subnetNumber = -1;
-static int hf_org_csapi_cm_TpIPSubnet_subnetMask = -1;
-static int hf_org_csapi_cm_TpIPSubnet_addressType = -1;
-static int hf_org_csapi_cm_TpIPSubnet_IPVersionSupport = -1;
-static int hf_org_csapi_am_TpBalanceInfo_Currency = -1;
-static int hf_org_csapi_am_TpBalanceInfo_ValuePartA = -1;
-static int hf_org_csapi_am_TpBalanceInfo_ValuePartB = -1;
-static int hf_org_csapi_am_TpBalanceInfo_Exponent = -1;
-static int hf_org_csapi_am_TpBalanceInfo_AdditionalInfo = -1;
-static int hf_org_csapi_am_TpChargingEventInfo_ChargingEventName = -1;
-static int hf_org_csapi_am_TpChargingEventInfo_ChargingEventTime = -1;
-static int hf_org_csapi_am_TpBalance_StatusCode = -1;
-static int hf_org_csapi_am_TpTransactionHistory_TransactionID = -1;
-static int hf_org_csapi_am_TpTransactionHistory_TimeStamp = -1;
-static int hf_org_csapi_am_TpTransactionHistory_AdditionalInfo = -1;
-static int hf_org_csapi_am_TpChargingEventCriteria_ChargingEvents_loop = -1;
-static int hf_org_csapi_am_TpChargingEventCriteria_ChargingEvents = -1;
-static int hf_org_csapi_am_TpChargingEventCriteria_Users_loop = -1;
-static int hf_org_csapi_am_TpChargingEventCriteriaResult_AssignmentID = -1;
-static int hf_org_csapi_am_TpBalanceExpiryDate_StatusCode = -1;
-static int hf_org_csapi_am_TpBalanceExpiryDate_ExpiryDate = -1;
-static int hf_org_csapi_am_TpVoucher_VoucherID = -1;
-static int hf_org_csapi_cs_TpMerchantAccountID_MerchantID = -1;
-static int hf_org_csapi_cs_TpMerchantAccountID_AccountID = -1;
-static int hf_org_csapi_cs_TpCorrelationID_CorrelationID = -1;
-static int hf_org_csapi_cs_TpCorrelationID_CorrelationType = -1;
-static int hf_org_csapi_cs_TpAmount_Number = -1;
-static int hf_org_csapi_cs_TpAmount_Exponent = -1;
-static int hf_org_csapi_cs_TpChargingPrice_Currency = -1;
-static int hf_org_csapi_cs_TpVolume_Unit = -1;
-static int hf_org_csapi_cs_TpChargingSessionID_ChargingSessionID = -1;
-static int hf_org_csapi_cs_TpChargingSessionID_RequestNumberFirstRequest = -1;
-static int hf_org_csapi_cs_TpApplicationDescription_Text = -1;
-static int hf_org_csapi_cs_TpApplicationDescription_AppInformation_loop = -1;
-static int hf_org_csapi_cs_TpChargingParameter_ParameterID = -1;
-static int hf_org_csapi_policy_TpPolicyEvent_EventID = -1;
-static int hf_org_csapi_policy_TpPolicyEvent_TimeGenerated = -1;
-static int hf_org_csapi_policy_TpPolicyEvent_Attributes_loop = -1;
-static int hf_org_csapi_policy_TpPolicyEvent_EventDefinitionName = -1;
-static int hf_org_csapi_policy_TpPolicyEvent_EventDomainName = -1;
-static int hf_org_csapi_policy_TpPolicyNameValue_Name = -1;
-static int hf_org_csapi_policy_TpPolicyType_TpPolicyRecordType_Names_loop = -1;
-static int hf_org_csapi_policy_TpPolicyType_TpPolicyRecordType_Names = -1;
-static int hf_org_csapi_policy_TpPolicyType_TpPolicyRecordType_Types_loop = -1;
-static int hf_org_csapi_policy_TpPolicyType_TpPolicyListType_ElementType_loop = -1;
-static int hf_org_csapi_policy_TpPolicyVar_VarName = -1;
-static int hf_org_csapi_policy_TpPolicyConditionListElement_GroupNumber = -1;
-static int hf_org_csapi_policy_TpPolicyConditionListElement_Negated = -1;
-static int hf_org_csapi_policy_TpPolicyActionListElement_SequenceNumber = -1;
-static int hf_org_csapi_pam_TpPAMAttributeDef_Name = -1;
-static int hf_org_csapi_pam_TpPAMAttributeDef_Type = -1;
-static int hf_org_csapi_pam_TpPAMAttributeDef_IsStatic = -1;
-static int hf_org_csapi_pam_TpPAMAttributeDef_IsRevertOnExpiration = -1;
-static int hf_org_csapi_pam_TpPAMAttribute_AttributeName = -1;
-static int hf_org_csapi_pam_TpPAMAttribute_ExpiresIn = -1;
-static int hf_org_csapi_pam_TpPAMPresenceData_Name = -1;
-static int hf_org_csapi_pam_TpPAMPresenceData_subscriberStatus = -1;
-static int hf_org_csapi_pam_TpPAMPresenceData_networkStatus = -1;
-static int hf_org_csapi_pam_TpPAMPresenceData_communicationMeans = -1;
-static int hf_org_csapi_pam_TpPAMPresenceData_subscriberProvidedLocation = -1;
-static int hf_org_csapi_pam_TpPAMPresenceData_networkProvidedLocation = -1;
-static int hf_org_csapi_pam_TpPAMPresenceData_Priority = -1;
-static int hf_org_csapi_pam_TpPAMPresenceData_otherInfo = -1;
-static int hf_org_csapi_pam_TpPAMAvailabilityProfile_PrivacyCode = -1;
-static int hf_org_csapi_pam_TpPAMCommunicationContext_CommunicationCapability = -1;
-static int hf_org_csapi_pam_TpPAMContext_AskerData_loop = -1;
-static int hf_org_csapi_pam_TpPAMAccessControlData_DefaultPolicy = -1;
-static int hf_org_csapi_pam_TpPAMAccessControlData_AllowList_loop = -1;
-static int hf_org_csapi_pam_TpPAMAccessControlData_AllowList = -1;
-static int hf_org_csapi_pam_TpPAMAccessControlData_DenyList_loop = -1;
-static int hf_org_csapi_pam_TpPAMAccessControlData_DenyList = -1;
-static int hf_org_csapi_pam_TpPAMICEventData_IdentityType_loop = -1;
-static int hf_org_csapi_pam_TpPAMICEventData_IdentityType = -1;
-static int hf_org_csapi_pam_TpPAMICNotificationData_Identities_loop = -1;
-static int hf_org_csapi_pam_TpPAMICNotificationData_Identities = -1;
-static int hf_org_csapi_pam_TpPAMIDEventData_IdentityName_loop = -1;
-static int hf_org_csapi_pam_TpPAMIDEventData_IdentityName = -1;
-static int hf_org_csapi_pam_TpPAMIDEventData_IdentityType_loop = -1;
-static int hf_org_csapi_pam_TpPAMIDEventData_IdentityType = -1;
-static int hf_org_csapi_pam_TpPAMIDNotificationData_Identities_loop = -1;
-static int hf_org_csapi_pam_TpPAMIDNotificationData_Identities = -1;
-static int hf_org_csapi_pam_TpPAMGMCEventData_GroupName_loop = -1;
-static int hf_org_csapi_pam_TpPAMGMCEventData_GroupName = -1;
-static int hf_org_csapi_pam_TpPAMGMCEventData_GroupType_loop = -1;
-static int hf_org_csapi_pam_TpPAMGMCEventData_GroupType = -1;
-static int hf_org_csapi_pam_TpPAMGMCNotificationData_Groups_loop = -1;
-static int hf_org_csapi_pam_TpPAMGMCNotificationData_Groups = -1;
-static int hf_org_csapi_pam_TpPAMACEventData_AgentType_loop = -1;
-static int hf_org_csapi_pam_TpPAMACEventData_AgentType = -1;
-static int hf_org_csapi_pam_TpPAMACNotificationData_Agents_loop = -1;
-static int hf_org_csapi_pam_TpPAMACNotificationData_Agents = -1;
-static int hf_org_csapi_pam_TpPAMADEventData_AgentName_loop = -1;
-static int hf_org_csapi_pam_TpPAMADEventData_AgentName = -1;
-static int hf_org_csapi_pam_TpPAMADEventData_AgentType_loop = -1;
-static int hf_org_csapi_pam_TpPAMADEventData_AgentType = -1;
-static int hf_org_csapi_pam_TpPAMADNotificationData_Agents_loop = -1;
-static int hf_org_csapi_pam_TpPAMADNotificationData_Agents = -1;
-static int hf_org_csapi_pam_TpPAMAAEventData_IdentityName_loop = -1;
-static int hf_org_csapi_pam_TpPAMAAEventData_IdentityName = -1;
-static int hf_org_csapi_pam_TpPAMAAEventData_IdentityType_loop = -1;
-static int hf_org_csapi_pam_TpPAMAAEventData_IdentityType = -1;
-static int hf_org_csapi_pam_TpPAMAAEventData_AgentName_loop = -1;
-static int hf_org_csapi_pam_TpPAMAAEventData_AgentName = -1;
-static int hf_org_csapi_pam_TpPAMAAEventData_AgentType_loop = -1;
-static int hf_org_csapi_pam_TpPAMAAEventData_AgentType = -1;
-static int hf_org_csapi_pam_TpPAMAANotificationData_Identity = -1;
-static int hf_org_csapi_pam_TpPAMAANotificationData_Agent = -1;
-static int hf_org_csapi_pam_TpPAMAUEventData_IdentityName_loop = -1;
-static int hf_org_csapi_pam_TpPAMAUEventData_IdentityName = -1;
-static int hf_org_csapi_pam_TpPAMAUEventData_IdentityType_loop = -1;
-static int hf_org_csapi_pam_TpPAMAUEventData_IdentityType = -1;
-static int hf_org_csapi_pam_TpPAMAUEventData_AgentName_loop = -1;
-static int hf_org_csapi_pam_TpPAMAUEventData_AgentName = -1;
-static int hf_org_csapi_pam_TpPAMAUEventData_AgentType_loop = -1;
-static int hf_org_csapi_pam_TpPAMAUEventData_AgentType = -1;
-static int hf_org_csapi_pam_TpPAMAUNotificationData_Identity = -1;
-static int hf_org_csapi_pam_TpPAMAUNotificationData_Agent = -1;
-static int hf_org_csapi_pam_TpPAMCCEventData_IdentityName_loop = -1;
-static int hf_org_csapi_pam_TpPAMCCEventData_IdentityName = -1;
-static int hf_org_csapi_pam_TpPAMCCEventData_IdentityType_loop = -1;
-static int hf_org_csapi_pam_TpPAMCCEventData_IdentityType = -1;
-static int hf_org_csapi_pam_TpPAMCCEventData_Capabilities_loop = -1;
-static int hf_org_csapi_pam_TpPAMCCEventData_Capabilities = -1;
-static int hf_org_csapi_pam_TpPAMCCNotificationData_Identity = -1;
-static int hf_org_csapi_pam_TpPAMCCNotificationData_Capabilities_loop = -1;
-static int hf_org_csapi_pam_TpPAMCCNotificationData_Capabilities = -1;
-static int hf_org_csapi_pam_TpPAMACPSEventData_AgentName_loop = -1;
-static int hf_org_csapi_pam_TpPAMACPSEventData_AgentName = -1;
-static int hf_org_csapi_pam_TpPAMACPSEventData_AgentType_loop = -1;
-static int hf_org_csapi_pam_TpPAMACPSEventData_AgentType = -1;
-static int hf_org_csapi_pam_TpPAMACPSEventData_Capabilities_loop = -1;
-static int hf_org_csapi_pam_TpPAMACPSEventData_Capabilities = -1;
-static int hf_org_csapi_pam_TpPAMACPSEventData_AttributeNames_loop = -1;
-static int hf_org_csapi_pam_TpPAMACPSEventData_AttributeNames = -1;
-static int hf_org_csapi_pam_TpPAMACPSEventData_ReportingPeriod = -1;
-static int hf_org_csapi_pam_TpPAMACPSNotificationData_Agent = -1;
-static int hf_org_csapi_pam_TpPAMACPSNotificationData_Capability = -1;
-static int hf_org_csapi_pam_TpPAMACPSNotificationData_AttributeNames_loop = -1;
-static int hf_org_csapi_pam_TpPAMACPSNotificationData_AttributeNames = -1;
-static int hf_org_csapi_pam_TpPAMAPSEventData_AgentName_loop = -1;
-static int hf_org_csapi_pam_TpPAMAPSEventData_AgentName = -1;
-static int hf_org_csapi_pam_TpPAMAPSEventData_AgentType_loop = -1;
-static int hf_org_csapi_pam_TpPAMAPSEventData_AgentType = -1;
-static int hf_org_csapi_pam_TpPAMAPSEventData_AttributeNames_loop = -1;
-static int hf_org_csapi_pam_TpPAMAPSEventData_AttributeNames = -1;
-static int hf_org_csapi_pam_TpPAMAPSEventData_ReportingPeriod = -1;
-static int hf_org_csapi_pam_TpPAMAPSNotificationData_Agent = -1;
-static int hf_org_csapi_pam_TpPAMAPSNotificationData_AttributeNames_loop = -1;
-static int hf_org_csapi_pam_TpPAMAPSNotificationData_AttributeNames = -1;
-static int hf_org_csapi_pam_TpPAMIPSEventData_IdentityName_loop = -1;
-static int hf_org_csapi_pam_TpPAMIPSEventData_IdentityName = -1;
-static int hf_org_csapi_pam_TpPAMIPSEventData_IdentityType_loop = -1;
-static int hf_org_csapi_pam_TpPAMIPSEventData_IdentityType = -1;
-static int hf_org_csapi_pam_TpPAMIPSEventData_AttributeNames_loop = -1;
-static int hf_org_csapi_pam_TpPAMIPSEventData_AttributeNames = -1;
-static int hf_org_csapi_pam_TpPAMIPSEventData_ReportingPeriod = -1;
-static int hf_org_csapi_pam_TpPAMIPSNotificationData_Identity = -1;
-static int hf_org_csapi_pam_TpPAMIPSNotificationData_Attributes_loop = -1;
-static int hf_org_csapi_pam_TpPAMAVCEventData_IdentityName_loop = -1;
-static int hf_org_csapi_pam_TpPAMAVCEventData_IdentityName = -1;
-static int hf_org_csapi_pam_TpPAMAVCEventData_IdentityType_loop = -1;
-static int hf_org_csapi_pam_TpPAMAVCEventData_IdentityType = -1;
-static int hf_org_csapi_pam_TpPAMAVCEventData_PAMContext_loop = -1;
-static int hf_org_csapi_pam_TpPAMAVCEventData_AttributeNames_loop = -1;
-static int hf_org_csapi_pam_TpPAMAVCEventData_AttributeNames = -1;
-static int hf_org_csapi_pam_TpPAMAVCEventData_ReportingPeriod = -1;
-static int hf_org_csapi_pam_TpPAMAVCNotificationData_Identity = -1;
-static int hf_org_csapi_pam_TpPAMAVCNotificationData_Availability_loop = -1;
-static int hf_org_csapi_pam_TpPAMWCEventData_Events_loop = -1;
-static int hf_org_csapi_pam_TpPAMWCEventData_Events = -1;
-static int hf_org_csapi_pam_TpPAMWCEventData_IdentityName_loop = -1;
-static int hf_org_csapi_pam_TpPAMWCEventData_IdentityName = -1;
-static int hf_org_csapi_pam_TpPAMWCEventData_IdentityType_loop = -1;
-static int hf_org_csapi_pam_TpPAMWCEventData_IdentityType = -1;
-static int hf_org_csapi_pam_TpPAMWCEventData_ReportingPeriod = -1;
-static int hf_org_csapi_pam_TpPAMWCNotificationData_Event = -1;
-static int hf_org_csapi_pam_TpPAMWCNotificationData_ChangeType = -1;
-static int hf_org_csapi_pam_TpPAMWCNotificationData_Identity = -1;
-static int hf_org_csapi_pam_TpPAMWCNotificationData_Watchers_loop = -1;
-static int hf_org_csapi_pam_TpPAMWCNotificationData_Watchers = -1;
-static int hf_org_csapi_pam_TpPAMErrorInfo_Cause = -1;
-static int hf_org_csapi_mmm_TpMailboxIdentifier_SessionID = -1;
-static int hf_org_csapi_mmm_TpMultiMediaMessagingIdentifier_SessionID = -1;
-static int hf_org_csapi_mmm_TpListMessagesCriteria_OnlyUnreadMessages = -1;
-static int hf_org_csapi_mmm_TpMailboxFolderStatusInformation_TotalMessageCount = -1;
-static int hf_org_csapi_mmm_TpMessageDescription_MessageID = -1;
-static int hf_org_csapi_mmm_TpMessageDescription_To_loop = -1;
-static int hf_org_csapi_mmm_TpMessageDescription_Subject = -1;
-static int hf_org_csapi_mmm_TpMessageDescription_ReceivedDate = -1;
-static int hf_org_csapi_mmm_TpMessageDescription_Size = -1;
-static int hf_org_csapi_mmm_TpBodyPartDescription_ContentDescription = -1;
-static int hf_org_csapi_mmm_TpBodyPartDescription_ContentSize = -1;
-static int hf_org_csapi_mmm_TpBodyPartDescription_ContentType = -1;
-static int hf_org_csapi_mmm_TpBodyPartDescription_ContentTransferEncoding = -1;
-static int hf_org_csapi_mmm_TpBodyPartDescription_ContentID = -1;
-static int hf_org_csapi_mmm_TpBodyPartDescription_ContentDisposition = -1;
-static int hf_org_csapi_mmm_TpBodyPartDescription_PartID = -1;
-static int hf_org_csapi_mmm_TpBodyPartDescription_NestingLevel = -1;
-static int hf_org_csapi_mmm_TpBodyPart_BodyPartContent_loop = -1;
-static int hf_org_csapi_mmm_TpBodyPart_BodyPartContent = -1;
-static int hf_org_csapi_mmm_TpGenericHeaderField_FieldName = -1;
-static int hf_org_csapi_mmm_TpGenericHeaderField_FieldValue = -1;
-static int hf_org_csapi_mmm_TpMessageInfoPropertyError_MessagePropertyName = -1;
-static int hf_org_csapi_mmm_TpMessageInfoPropertyError_Error = -1;
-static int hf_org_csapi_mmm_TpNewMailboxMessageArrivedCriteria_MailboxID = -1;
-static int hf_org_csapi_mmm_TpNewMailboxMessageArrivedCriteria_AuthenticationInfo = -1;
-static int hf_org_csapi_mmm_TpNewMailboxMessageArrivedInfo_MailboxID = -1;
-static int hf_org_csapi_mmm_TpNewMailboxMessageArrivedInfo_FolderID = -1;
-static int hf_org_csapi_mmm_TpNewMailboxMessageArrivedInfo_MessageDescription_loop = -1;
-static int hf_org_csapi_mmm_TpNewMailboxMessageArrivedInfo_ExtendedHeaderInformation_loop = -1;
-static int hf_org_csapi_mmm_TpQueryStatusReport_ReportedStatus = -1;
-static int hf_org_csapi_mmm_TpTerminatingAddressList_ToAddressList_loop = -1;
-static int hf_org_csapi_mmm_TpTerminatingAddressList_CcAddressList_loop = -1;
-static int hf_org_csapi_mmm_TpTerminatingAddressList_BccAddressList_loop = -1;
-static int hf_org_csapi_mmm_TpNewMessageArrivedCriteria_CreateMultiMediaMessagingSession = -1;
-static int hf_org_csapi_mmm_TpMessagingNotificationRequested_EventCriteria_loop = -1;
-static int hf_org_csapi_mmm_TpMessagingNotificationRequested_AssignmentID = -1;
-static int hf_org_csapi_mmm_TpMessagingNotificationRequestedSetEntry_MessagingNotificationRequestedSet_loop = -1;
-static int hf_org_csapi_mmm_TpMessagingNotificationRequestedSetEntry_Final = -1;
-static int hf_org_csapi_mmm_TpNewMessageArrivedInfo_DestinationAddressSet_loop = -1;
-static int hf_org_csapi_mmm_TpNewMessageArrivedInfo_Message_loop = -1;
-static int hf_org_csapi_mmm_TpNewMessageArrivedInfo_Message = -1;
-static int hf_org_csapi_mmm_TpNewMessageArrivedInfo_Headers_loop = -1;
+static int hf_org_csapi_TpAddress_Plan;
+static int hf_org_csapi_TpAddress_AddrString;
+static int hf_org_csapi_TpAddress_Name;
+static int hf_org_csapi_TpAddress_Presentation;
+static int hf_org_csapi_TpAddress_Screening;
+static int hf_org_csapi_TpAddress_SubAddressString;
+static int hf_org_csapi_TpAddressRange_Plan;
+static int hf_org_csapi_TpAddressRange_AddrString;
+static int hf_org_csapi_TpAddressRange_Name;
+static int hf_org_csapi_TpAddressRange_SubAddressString;
+static int hf_org_csapi_TpCAIElements_UnitsPerInterval;
+static int hf_org_csapi_TpCAIElements_SecondsPerTimeInterval;
+static int hf_org_csapi_TpCAIElements_ScalingFactor;
+static int hf_org_csapi_TpCAIElements_UnitIncrement;
+static int hf_org_csapi_TpCAIElements_UnitsPerDataInterval;
+static int hf_org_csapi_TpCAIElements_SegmentsPerDataInterval;
+static int hf_org_csapi_TpCAIElements_InitialSecsPerTimeInterval;
+static int hf_org_csapi_TpChargePerTime_InitialCharge;
+static int hf_org_csapi_TpChargePerTime_CurrentChargePerMinute;
+static int hf_org_csapi_TpChargePerTime_NextChargePerMinute;
+static int hf_org_csapi_TpAoCInfo_Currency;
+static int hf_org_csapi_TpTimeInterval_StartTime;
+static int hf_org_csapi_TpTimeInterval_StopTime;
+static int hf_org_csapi_TpStructuredAttributeValue_Type;
+static int hf_org_csapi_TpAttribute_AttributeName;
+static int hf_org_csapi_fw_TpFaultStats_Fault;
+static int hf_org_csapi_fw_TpFaultStats_Occurrences;
+static int hf_org_csapi_fw_TpFaultStats_MaxDuration;
+static int hf_org_csapi_fw_TpFaultStats_TotalDuration;
+static int hf_org_csapi_fw_TpFaultStats_NumberOfClientsAffected;
+static int hf_org_csapi_fw_TpFaultStatsRecord_FaultStatsSet_loop;
+static int hf_org_csapi_fw_TpLoadPolicy_LoadPolicy;
+static int hf_org_csapi_fw_TpLoadStatisticData_LoadValue;
+static int hf_org_csapi_fw_TpLoadStatisticData_LoadLevel;
+static int hf_org_csapi_fw_TpLoadThreshold_LoadThreshold;
+static int hf_org_csapi_fw_TpLoadInitVal_LoadLevel;
+static int hf_org_csapi_fw_TpProperty_PropertyName;
+static int hf_org_csapi_fw_TpProperty_PropertyValue;
+static int hf_org_csapi_fw_TpClientAppDescription_ClientAppID;
+static int hf_org_csapi_fw_TpClientAppDescription_ClientAppProperties_loop;
+static int hf_org_csapi_fw_TpClientAppDescription_HasAccessSession;
+static int hf_org_csapi_fw_TpClientAppDescription_HasServiceInstances;
+static int hf_org_csapi_fw_TpEntOp_EntOpID;
+static int hf_org_csapi_fw_TpEntOp_EntOpProperties_loop;
+static int hf_org_csapi_fw_TpSag_SagID;
+static int hf_org_csapi_fw_TpSag_SagDescription;
+static int hf_org_csapi_fw_TpServiceProperty_ServicePropertyName;
+static int hf_org_csapi_fw_TpServiceProperty_ServicePropertyValueList_loop;
+static int hf_org_csapi_fw_TpServiceProperty_ServicePropertyValueList;
+static int hf_org_csapi_fw_TpServiceDescription_ServiceTypeName;
+static int hf_org_csapi_fw_TpServiceDescription_ServicePropertyList_loop;
+static int hf_org_csapi_fw_TpService_ServiceID;
+static int hf_org_csapi_fw_TpServiceProfileDescription_ServiceContractID;
+static int hf_org_csapi_fw_TpServiceProfileDescription_ServiceStartDate;
+static int hf_org_csapi_fw_TpServiceProfileDescription_ServiceEndDate;
+static int hf_org_csapi_fw_TpServiceProfileDescription_ServiceTypeName;
+static int hf_org_csapi_fw_TpServiceProfileDescription_ServiceSubscriptionProperties_loop;
+static int hf_org_csapi_fw_TpServiceProfileDescription_InUse;
+static int hf_org_csapi_fw_TpServiceProfileDescription_ServiceID;
+static int hf_org_csapi_fw_TpServiceTypeProperty_ServicePropertyName;
+static int hf_org_csapi_fw_TpServiceTypeProperty_ServiceTypePropertyMode;
+static int hf_org_csapi_fw_TpServiceTypeProperty_ServicePropertyTypeName;
+static int hf_org_csapi_fw_TpServiceTypeDescription_ServiceTypePropertyList_loop;
+static int hf_org_csapi_fw_TpServiceTypeDescription_ServiceTypeNameList_loop;
+static int hf_org_csapi_fw_TpServiceTypeDescription_ServiceTypeNameList;
+static int hf_org_csapi_fw_TpServiceTypeDescription_AvailableOrUnavailable;
+static int hf_org_csapi_fw_TpSignatureAndServiceMgr_DigitalSignature_loop;
+static int hf_org_csapi_fw_TpSignatureAndServiceMgr_DigitalSignature;
+static int hf_org_csapi_fw_TpPerson_PersonName;
+static int hf_org_csapi_fw_TpPerson_PostalAddress;
+static int hf_org_csapi_fw_TpPerson_TelephoneNumber;
+static int hf_org_csapi_fw_TpPerson_Email;
+static int hf_org_csapi_fw_TpPerson_HomePage;
+static int hf_org_csapi_fw_TpPerson_PersonProperties_loop;
+static int hf_org_csapi_fw_TpServiceContractDescription_ServiceStartDate;
+static int hf_org_csapi_fw_TpServiceContractDescription_ServiceEndDate;
+static int hf_org_csapi_fw_TpServiceContractDescription_ServiceTypeName;
+static int hf_org_csapi_fw_TpServiceContractDescription_ServiceID;
+static int hf_org_csapi_fw_TpServiceContractDescription_ServiceSubscriptionProperties_loop;
+static int hf_org_csapi_fw_TpServiceContractDescription_InUse;
+static int hf_org_csapi_fw_TpLoadStatistic_TimeStamp;
+static int hf_org_csapi_fw_TpServiceContract_ServiceContractID;
+static int hf_org_csapi_fw_TpServiceProfile_ServiceProfileID;
+static int hf_org_csapi_fw_TpSagProfilePair_Sag;
+static int hf_org_csapi_fw_TpSagProfilePair_ServiceProfile;
+static int hf_org_csapi_fw_TpAddSagMembersConflict_ClientApplication;
+static int hf_org_csapi_fw_TpAddSagMembersConflict_Service;
+static int hf_org_csapi_fw_TpAssignSagToServiceProfileConflict_ClientApplication;
+static int hf_org_csapi_fw_TpAssignSagToServiceProfileConflict_Service;
+static int hf_org_csapi_fw_TpServiceTypePropertyValue_ServicePropertyName;
+static int hf_org_csapi_fw_TpServiceTypePropertyValue_ServiceTypePropertyMode;
+static int hf_org_csapi_fw_TpServiceTypePropertyValue_ServicePropertyTypeName;
+static int hf_org_csapi_fw_TpServiceTypePropertyValue_ServicePropertyValueList_loop;
+static int hf_org_csapi_fw_TpServiceTypePropertyValue_ServicePropertyValueList;
+static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_ServiceType;
+static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_ServiceID;
+static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_CompatibleServiceID;
+static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_BackwardCompatibilityLevel;
+static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_MigrationRequired;
+static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_DataMigrated;
+static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_MigrationDataAndTime;
+static int hf_org_csapi_fw_TpFwMigrationServiceAvailableInfo_MigrationAdditionalInfo_loop;
+static int hf_org_csapi_fw_TpFwAgreementInfo_ClientApplicationID;
+static int hf_org_csapi_fw_TpFwAgreementInfo_ServiceID;
+static int hf_org_csapi_fw_TpFwAgreementInfo_ServiceContractID;
+static int hf_org_csapi_fw_TpFwAgreementInfo_ServiceProfileID;
+static int hf_org_csapi_ui_TpUIMessageCriteria_EndSequence;
+static int hf_org_csapi_ui_TpUIMessageCriteria_MaxMessageTime;
+static int hf_org_csapi_ui_TpUIMessageCriteria_MaxMessageSize;
+static int hf_org_csapi_ui_TpUIEventInfo_ServiceCode;
+static int hf_org_csapi_ui_TpUIEventInfo_DataTypeIndication;
+static int hf_org_csapi_ui_TpUIEventInfo_DataString;
+static int hf_org_csapi_ui_TpUIEventCriteria_ServiceCode;
+static int hf_org_csapi_ui_TpUIEventCriteriaResult_AssignmentID;
+static int hf_org_csapi_ui_TpUIEventNotificationInfo_ServiceCode;
+static int hf_org_csapi_ui_TpUIEventNotificationInfo_DataTypeIndication;
+static int hf_org_csapi_ui_TpUIEventNotificationInfo_UIEventData_loop;
+static int hf_org_csapi_ui_TpUIEventNotificationInfo_UIEventData;
+static int hf_org_csapi_ui_TpUIRecognitionProperty_PropertyName;
+static int hf_org_csapi_ui_TpUIRecognitionProperty_PropertyValue;
+static int hf_org_csapi_ui_TpUIRecognitionCriteria_SpeakerID;
+static int hf_org_csapi_ui_TpUIRecognitionCriteria_Properties_loop;
+static int hf_org_csapi_ui_TpUIRecognitionCriteria_Grammar;
+static int hf_org_csapi_ui_TpUICollectCriteria_MinLength;
+static int hf_org_csapi_ui_TpUICollectCriteria_MaxLength;
+static int hf_org_csapi_ui_TpUICollectCriteria_EndSequence;
+static int hf_org_csapi_ui_TpUICollectCriteria_StartTimeout;
+static int hf_org_csapi_ui_TpUICollectCriteria_InterCharTimeout;
+static int hf_org_csapi_ui_TpUICollectCriteria_CollectMode;
+static int hf_org_csapi_ui_TpUIWordOverride_Spelling;
+static int hf_org_csapi_ui_TpUIWordOverride_PronounceType;
+static int hf_org_csapi_ui_TpUIWordOverride_PronounceAs;
+static int hf_org_csapi_ui_TpUISynthesisInfoData_SpeakerGender;
+static int hf_org_csapi_ui_TpUISynthesisInfoData_SpeakerAge;
+static int hf_org_csapi_ui_TpUISynthesisInfoData_SpeakerRate;
+static int hf_org_csapi_ui_TpUISynthesisInfoData_SpeakerRange;
+static int hf_org_csapi_ui_TpUISynthesisInfoData_TextData;
+static int hf_org_csapi_ui_TpUISynthesisInfoData_WordOverrideSet_loop;
+static int hf_org_csapi_cc_TpCallError_ErrorTime;
+static int hf_org_csapi_cc_TpCallError_ErrorType;
+static int hf_org_csapi_cc_TpCallEndedReport_CallLegSessionID;
+static int hf_org_csapi_cc_TpCallEndedReport_Cause;
+static int hf_org_csapi_cc_TpCallInfoReport_CallInfoType;
+static int hf_org_csapi_cc_TpCallInfoReport_CallInitiationStartTime;
+static int hf_org_csapi_cc_TpCallInfoReport_CallConnectedToResourceTime;
+static int hf_org_csapi_cc_TpCallInfoReport_CallConnectedToDestinationTime;
+static int hf_org_csapi_cc_TpCallInfoReport_CallEndTime;
+static int hf_org_csapi_cc_TpCallInfoReport_Cause;
+static int hf_org_csapi_cc_TpCallServiceCode_CallServiceCodeType;
+static int hf_org_csapi_cc_TpCallServiceCode_ServiceCodeValue;
+static int hf_org_csapi_cc_TpCallTreatment_CallTreatmentType;
+static int hf_org_csapi_cc_TpCallTreatment_ReleaseCause;
+static int hf_org_csapi_cc_TpCallChargePlan_ChargeOrderType;
+static int hf_org_csapi_cc_TpCallChargePlan_TransparentCharge_loop;
+static int hf_org_csapi_cc_TpCallChargePlan_TransparentCharge;
+static int hf_org_csapi_cc_TpCallChargePlan_ChargePlan;
+static int hf_org_csapi_cc_TpCallChargePlan_AdditionalInfo_loop;
+static int hf_org_csapi_cc_TpCallChargePlan_AdditionalInfo;
+static int hf_org_csapi_cc_TpCallChargePlan_PartyToCharge;
+static int hf_org_csapi_cc_gccs_TpCallEventCriteria_CallEventName;
+static int hf_org_csapi_cc_gccs_TpCallEventCriteria_CallNotificationType;
+static int hf_org_csapi_cc_gccs_TpCallEventCriteria_MonitorMode;
+static int hf_org_csapi_cc_gccs_TpCallEventCriteriaResult_AssignmentID;
+static int hf_org_csapi_cc_gccs_TpCallReleaseCause_Value;
+static int hf_org_csapi_cc_gccs_TpCallReleaseCause_Location;
+static int hf_org_csapi_cc_gccs_TpCallReport_MonitorMode;
+static int hf_org_csapi_cc_gccs_TpCallReport_CallEventTime;
+static int hf_org_csapi_cc_gccs_TpCallReport_CallReportType;
+static int hf_org_csapi_cc_gccs_TpCallReportRequest_MonitorMode;
+static int hf_org_csapi_cc_gccs_TpCallReportRequest_CallReportType;
+static int hf_org_csapi_cc_gccs_TpCallEventInfo_CallAppInfo_loop;
+static int hf_org_csapi_cc_gccs_TpCallEventInfo_CallEventName;
+static int hf_org_csapi_cc_gccs_TpCallEventInfo_CallNotificationType;
+static int hf_org_csapi_cc_gccs_TpCallEventInfo_MonitorMode;
+static int hf_org_csapi_cc_gccs_TpCallEndedReport_CallLegSessionID;
+static int hf_org_csapi_cc_gccs_TpCallInfoReport_CallInfoType;
+static int hf_org_csapi_cc_gccs_TpCallInfoReport_CallInitiationStartTime;
+static int hf_org_csapi_cc_gccs_TpCallInfoReport_CallConnectedToResourceTime;
+static int hf_org_csapi_cc_gccs_TpCallInfoReport_CallConnectedToDestinationTime;
+static int hf_org_csapi_cc_gccs_TpCallInfoReport_CallEndTime;
+static int hf_org_csapi_cc_gccs_TpCallTreatment_CallTreatmentType;
+static int hf_org_csapi_cc_gccs_TpCallIdentifier_CallSessionID;
+static int hf_org_csapi_cc_TpCallEventRequest_CallEventType;
+static int hf_org_csapi_cc_TpCallEventRequest_CallMonitorMode;
+static int hf_org_csapi_cc_TpCallNotificationRequest_CallEventsRequested_loop;
+static int hf_org_csapi_cc_TpNotificationRequested_AssignmentID;
+static int hf_org_csapi_cc_TpCallLegConnectionProperties_AttachMechanism;
+static int hf_org_csapi_cc_TpCallEventInfo_CallEventType;
+static int hf_org_csapi_cc_TpCallEventInfo_CallMonitorMode;
+static int hf_org_csapi_cc_TpCallEventInfo_CallEventTime;
+static int hf_org_csapi_cc_TpNotificationRequestedSetEntry_NotificationRequestSet_loop;
+static int hf_org_csapi_cc_TpNotificationRequestedSetEntry_Final;
+static int hf_org_csapi_cc_TpCarrier_CarrierID_loop;
+static int hf_org_csapi_cc_TpCarrier_CarrierID;
+static int hf_org_csapi_cc_TpCarrier_CarrierSelectionField;
+static int hf_org_csapi_cc_TpCallNotificationInfo_CallAppInfo_loop;
+static int hf_org_csapi_cc_TpCallLegInfoReport_CallLegInfoType;
+static int hf_org_csapi_cc_TpCallLegInfoReport_CallLegStartTime;
+static int hf_org_csapi_cc_TpCallLegInfoReport_CallLegConnectedToResourceTime;
+static int hf_org_csapi_cc_TpCallLegInfoReport_CallLegConnectedToAddressTime;
+static int hf_org_csapi_cc_TpCallLegInfoReport_CallLegEndTime;
+static int hf_org_csapi_cc_TpCallLegInfoReport_CallLegReleaseCause;
+static int hf_org_csapi_cc_TpCallLegInfoReport_CallAppInfo_loop;
+static int hf_org_csapi_cc_TpCallLegProperty_CallLegPropertyName;
+static int hf_org_csapi_cc_TpCallLegProperty_CallLegPropertyValue;
+static int hf_org_csapi_cc_mpccs_TpMultiPartyCallIdentifier_CallSessionID;
+static int hf_org_csapi_cc_mpccs_TpCallLegIdentifier_CallLegSessionID;
+static int hf_org_csapi_cc_mpccs_TpAppCallLegCallBack_AppCallLegSet_loop;
+static int hf_org_csapi_cc_mmccs_TpCallSuperviseVolume_VolumeQuantity;
+static int hf_org_csapi_cc_mmccs_TpCallSuperviseVolume_VolumeUnit;
+static int hf_org_csapi_cc_mmccs_TpMediaStreamRequest_Direction;
+static int hf_org_csapi_cc_mmccs_TpMediaStreamRequest_MediaMonitorMode;
+static int hf_org_csapi_cc_mmccs_TpMediaStreamRequest_EventType;
+static int hf_org_csapi_cc_mmccs_TpMediaStream_Direction;
+static int hf_org_csapi_cc_mmccs_TpMediaStream_ChannelSessionID;
+static int hf_org_csapi_cc_mmccs_TpNotificationMediaRequest_MediaStreamsRequested_loop;
+static int hf_org_csapi_cc_mmccs_TpMediaNotificationRequested_AssignmentID;
+static int hf_org_csapi_cc_mmccs_TpMultiMediaCallIdentifier_MMCallSessionID;
+static int hf_org_csapi_cc_mmccs_TpMultiMediaCallLegIdentifier_MMCallLegSessionID;
+static int hf_org_csapi_cc_mmccs_TpAppMultiMediaCallLegCallBack_AppCallLegSet_loop;
+static int hf_org_csapi_cc_cccs_TpMonoMediaConfPolicy_JoinAllowed;
+static int hf_org_csapi_cc_cccs_TpJoinEventInfo_CallAppInfo_loop;
+static int hf_org_csapi_cc_cccs_TpConfSearchCriteria_StartSearch;
+static int hf_org_csapi_cc_cccs_TpConfSearchCriteria_StopSearch;
+static int hf_org_csapi_cc_cccs_TpConfSearchCriteria_RequestedResources;
+static int hf_org_csapi_cc_cccs_TpConfSearchCriteria_RequestedDuration;
+static int hf_org_csapi_cc_cccs_TpConfSearchResult_MatchFound;
+static int hf_org_csapi_cc_cccs_TpConfSearchResult_ActualStartTime;
+static int hf_org_csapi_cc_cccs_TpConfSearchResult_ActualResources;
+static int hf_org_csapi_cc_cccs_TpConfSearchResult_ActualDuration;
+static int hf_org_csapi_cc_cccs_TpMultiMediaConfPolicy_JoinAllowed;
+static int hf_org_csapi_cc_cccs_TpMultiMediaConfPolicy_MediaAllowed;
+static int hf_org_csapi_cc_cccs_TpMultiMediaConfPolicy_Chaired;
+static int hf_org_csapi_cc_cccs_TpMultiMediaConfPolicy_VideoHandling;
+static int hf_org_csapi_cc_cccs_TpResourceReservation_ReservationID;
+static int hf_org_csapi_cc_cccs_TpConfCallIdentifier_ConfCallSessionID;
+static int hf_org_csapi_cc_cccs_TpSubConfCallIdentifier_SubConfCallSessionID;
+static int hf_org_csapi_ui_TpUIIdentifier_UserInteractionSessionID;
+static int hf_org_csapi_ui_TpUICallIdentifier_UserInteractionSessionID;
+static int hf_org_csapi_mm_TpLocationResponseTime_ResponseTime;
+static int hf_org_csapi_mm_TpLocationResponseTime_TimerValue;
+static int hf_org_csapi_mm_TpLocationTrigger_Longitude;
+static int hf_org_csapi_mm_TpLocationTrigger_Latitude;
+static int hf_org_csapi_mm_TpLocationTrigger_AreaSemiMajor;
+static int hf_org_csapi_mm_TpLocationTrigger_AreaSemiMinor;
+static int hf_org_csapi_mm_TpLocationTrigger_AngleOfSemiMajor;
+static int hf_org_csapi_mm_TpLocationTrigger_Criterion;
+static int hf_org_csapi_mm_TpLocationTrigger_ReportingInterval;
+static int hf_org_csapi_mm_TpLocationRequest_RequestedAccuracy;
+static int hf_org_csapi_mm_TpLocationRequest_AltitudeRequested;
+static int hf_org_csapi_mm_TpLocationRequest_Type;
+static int hf_org_csapi_mm_TpLocationRequest_Priority;
+static int hf_org_csapi_mm_TpLocationRequest_RequestedLocationMethod;
+static int hf_org_csapi_mm_TpGeographicalPosition_Longitude;
+static int hf_org_csapi_mm_TpGeographicalPosition_Latitude;
+static int hf_org_csapi_mm_TpGeographicalPosition_TypeOfUncertaintyShape;
+static int hf_org_csapi_mm_TpGeographicalPosition_UncertaintyInnerSemiMajor;
+static int hf_org_csapi_mm_TpGeographicalPosition_UncertaintyOuterSemiMajor;
+static int hf_org_csapi_mm_TpGeographicalPosition_UncertaintyInnerSemiMinor;
+static int hf_org_csapi_mm_TpGeographicalPosition_UncertaintyOuterSemiMinor;
+static int hf_org_csapi_mm_TpGeographicalPosition_AngleOfSemiMajor;
+static int hf_org_csapi_mm_TpGeographicalPosition_SegmentStartAngle;
+static int hf_org_csapi_mm_TpGeographicalPosition_SegmentEndAngle;
+static int hf_org_csapi_mm_TpMobilityStopAssignmentData_AssignmentId;
+static int hf_org_csapi_mm_TpMobilityStopAssignmentData_StopScope;
+static int hf_org_csapi_mm_TpMobilityStopAssignmentData_Users_loop;
+static int hf_org_csapi_mm_TpUlExtendedData_TerminalType;
+static int hf_org_csapi_mm_TpUlExtendedData_AltitudePresent;
+static int hf_org_csapi_mm_TpUlExtendedData_Altitude;
+static int hf_org_csapi_mm_TpUlExtendedData_UncertaintyAltitude;
+static int hf_org_csapi_mm_TpUlExtendedData_TimestampPresent;
+static int hf_org_csapi_mm_TpUlExtendedData_Timestamp;
+static int hf_org_csapi_mm_TpUlExtendedData_UsedLocationMethod;
+static int hf_org_csapi_mm_TpUserLocation_StatusCode;
+static int hf_org_csapi_mm_TpUserLocationExtended_StatusCode;
+static int hf_org_csapi_mm_TpUserLocationExtended_Locations_loop;
+static int hf_org_csapi_mm_TpLocationTriggerCamel_UpdateInsideVlr;
+static int hf_org_csapi_mm_TpLocationTriggerCamel_UpdateOutsideVlr;
+static int hf_org_csapi_mm_TpUserLocationCamel_StatusCode;
+static int hf_org_csapi_mm_TpUserLocationCamel_GeographicalPositionPresent;
+static int hf_org_csapi_mm_TpUserLocationCamel_TimestampPresent;
+static int hf_org_csapi_mm_TpUserLocationCamel_Timestamp;
+static int hf_org_csapi_mm_TpUserLocationCamel_VlrNumberPresent;
+static int hf_org_csapi_mm_TpUserLocationCamel_LocationNumberPresent;
+static int hf_org_csapi_mm_TpUserLocationCamel_CellIdOrLaiPresent;
+static int hf_org_csapi_mm_TpUserLocationCamel_CellIdOrLai;
+static int hf_org_csapi_mm_TpUserLocationEmergencyRequest_UserAddressPresent;
+static int hf_org_csapi_mm_TpUserLocationEmergencyRequest_NaEsrdPresent;
+static int hf_org_csapi_mm_TpUserLocationEmergencyRequest_NaEsrd;
+static int hf_org_csapi_mm_TpUserLocationEmergencyRequest_NaEsrkPresent;
+static int hf_org_csapi_mm_TpUserLocationEmergencyRequest_NaEsrk;
+static int hf_org_csapi_mm_TpUserLocationEmergencyRequest_ImeiPresent;
+static int hf_org_csapi_mm_TpUserLocationEmergencyRequest_Imei;
+static int hf_org_csapi_mm_TpUserLocationEmergency_StatusCode;
+static int hf_org_csapi_mm_TpUserLocationEmergency_UserIdPresent;
+static int hf_org_csapi_mm_TpUserLocationEmergency_NaEsrdPresent;
+static int hf_org_csapi_mm_TpUserLocationEmergency_NaEsrd;
+static int hf_org_csapi_mm_TpUserLocationEmergency_NaEsrkPresent;
+static int hf_org_csapi_mm_TpUserLocationEmergency_NaEsrk;
+static int hf_org_csapi_mm_TpUserLocationEmergency_ImeiPresent;
+static int hf_org_csapi_mm_TpUserLocationEmergency_Imei;
+static int hf_org_csapi_mm_TpUserLocationEmergency_TriggeringEvent;
+static int hf_org_csapi_mm_TpUserLocationEmergency_GeographicalPositionPresent;
+static int hf_org_csapi_mm_TpUserLocationEmergency_AltitudePresent;
+static int hf_org_csapi_mm_TpUserLocationEmergency_Altitude;
+static int hf_org_csapi_mm_TpUserLocationEmergency_UncertaintyAltitude;
+static int hf_org_csapi_mm_TpUserLocationEmergency_TimestampPresent;
+static int hf_org_csapi_mm_TpUserLocationEmergency_Timestamp;
+static int hf_org_csapi_mm_TpUserLocationEmergency_UsedLocationMethod;
+static int hf_org_csapi_mm_TpUserStatus_StatusCode;
+static int hf_org_csapi_mm_TpUserStatus_Status;
+static int hf_org_csapi_mm_TpUserStatus_TerminalType;
+static int hf_org_csapi_mm_TpTriggeredStatusRequest_Users_loop;
+static int hf_org_csapi_mm_TpTriggeredStatusRequest_AssignmentID;
+static int hf_org_csapi_mm_TpTriggeredStatusRequestSetEntry_Requests_loop;
+static int hf_org_csapi_mm_TpTriggeredStatusRequestSetEntry_Final;
+static int hf_org_csapi_mm_TpPeriodicLocationRequest_Users_loop;
+static int hf_org_csapi_mm_TpPeriodicLocationRequest_ReportingInterval;
+static int hf_org_csapi_mm_TpPeriodicLocationRequest_AssignmentID;
+static int hf_org_csapi_mm_TpPeriodicLocationRequestSetEntry_Requests_loop;
+static int hf_org_csapi_mm_TpPeriodicLocationRequestSetEntry_Final;
+static int hf_org_csapi_mm_TpTriggeredLocationRequest_Users_loop;
+static int hf_org_csapi_mm_TpTriggeredLocationRequest_AssignmentID;
+static int hf_org_csapi_mm_TpTriggeredLocationRequestSetEntry_Requests_loop;
+static int hf_org_csapi_mm_TpTriggeredLocationRequestSetEntry_Final;
+static int hf_org_csapi_mm_TpUserStatusIndicatorExtended_UserStatusIndicator;
+static int hf_org_csapi_mm_TpUserStatusIndicatorExtended_PDPContextActive;
+static int hf_org_csapi_mm_TpUserInfo_UserName;
+static int hf_org_csapi_mm_TpUserInfo_Password;
+static int hf_org_csapi_mm_TpNetworkStatusIndicator_CountryCode;
+static int hf_org_csapi_mm_TpNetworkStatusIndicator_MobileNetworkCode;
+static int hf_org_csapi_mm_TpNetworkStatusIndicator_AccessTechnology;
+static int hf_org_csapi_mm_TpNetworkStatusIndicator_RoamingStatus;
+static int hf_org_csapi_mm_TpUserStatusExtended_UserID;
+static int hf_org_csapi_mm_TpUserStatusExtended_StatusCode;
+static int hf_org_csapi_mm_TpUserStatusExtended_TerminalType;
+static int hf_org_csapi_mm_TpUserStatusExtended_AuthenticationStatus;
+static int hf_org_csapi_mm_TpUserStatusExtended_UserIPAddress;
+static int hf_org_csapi_mm_TpUserStatusExtended_UserMSISDN;
+static int hf_org_csapi_mm_TpUserStatusExtended_UserConnectionID;
+static int hf_org_csapi_mm_TpUserStatusExtended_AccessPointName;
+static int hf_org_csapi_mm_TpBindingNotificationCriteria_NotificationCriteriaType;
+static int hf_org_csapi_mm_TpBindingNotificationCriteria_ContactAddressSet_loop;
+static int hf_org_csapi_termcap_TpTerminalCapabilities_TerminalCapabilities;
+static int hf_org_csapi_termcap_TpTerminalCapabilities_StatusCode;
+static int hf_org_csapi_termcap_TpTerminalCapabilityScope_ScopeType;
+static int hf_org_csapi_termcap_TpTerminalCapabilityScope_Scope;
+static int hf_org_csapi_dsc_TpChargePerVolume_InitialCharge;
+static int hf_org_csapi_dsc_TpChargePerVolume_CurrentChargePerKilobyte;
+static int hf_org_csapi_dsc_TpChargePerVolume_NextChargePerKilobyte;
+static int hf_org_csapi_dsc_TpDataSessionChargePlan_Currency;
+static int hf_org_csapi_dsc_TpDataSessionChargePlan_AdditionalInfo;
+static int hf_org_csapi_dsc_TpDataSessionError_ErrorTime;
+static int hf_org_csapi_dsc_TpDataSessionError_ErrorType;
+static int hf_org_csapi_dsc_TpDataSessionEventCriteria_DataSessionEventName;
+static int hf_org_csapi_dsc_TpDataSessionEventCriteria_MonitorMode;
+static int hf_org_csapi_dsc_TpDataSessionEventInfo_DataSessionEventName;
+static int hf_org_csapi_dsc_TpDataSessionEventInfo_MonitorMode;
+static int hf_org_csapi_dsc_TpDataSessionEventInfo_QoSClass;
+static int hf_org_csapi_dsc_TpDataSessionReleaseCause_Value;
+static int hf_org_csapi_dsc_TpDataSessionReleaseCause_Location;
+static int hf_org_csapi_dsc_TpDataSessionReport_MonitorMode;
+static int hf_org_csapi_dsc_TpDataSessionReport_DataSessionEventTime;
+static int hf_org_csapi_dsc_TpDataSessionReport_DataSessionReportType;
+static int hf_org_csapi_dsc_TpDataSessionReportRequest_MonitorMode;
+static int hf_org_csapi_dsc_TpDataSessionReportRequest_DataSessionReportType;
+static int hf_org_csapi_dsc_TpDataSessionSuperviseVolume_VolumeQuantity;
+static int hf_org_csapi_dsc_TpDataSessionSuperviseVolume_VolumeUnit;
+static int hf_org_csapi_dsc_TpDataSessionEventCriteriaResult_AssignmentID;
+static int hf_org_csapi_dsc_TpDataSessionIdentifier_DataSessionID;
+static int hf_org_csapi_gms_TpGMSNewMessageArrivedInfo_FolderID;
+static int hf_org_csapi_gms_TpGMSNewMessageArrivedInfo_MessageID;
+static int hf_org_csapi_gms_TpGMSNewMessageArrivedInfo_NumberOfProperties;
+static int hf_org_csapi_gms_TpGMSNewMessageArrivedCriteria_AuthenticationInfo;
+static int hf_org_csapi_gms_TpMailboxIdentifier_SessionID;
+static int hf_org_csapi_gms_TpMailboxFolderIdentifier_SessionID;
+static int hf_org_csapi_cm_TpNameDescrpTagTimePeriod_duration;
+static int hf_org_csapi_cm_TpNameDescrpTagTimeOfDay_name;
+static int hf_org_csapi_cm_TpNameDescrpTagTimeOfDay_description;
+static int hf_org_csapi_cm_TpNameDescrpTagTimeOfDay_tag;
+static int hf_org_csapi_cm_TpNameDescrpTagTimeOfDay_value;
+static int hf_org_csapi_cm_TpNameDescrpTagString_name;
+static int hf_org_csapi_cm_TpNameDescrpTagString_description;
+static int hf_org_csapi_cm_TpNameDescrpTagString_tag;
+static int hf_org_csapi_cm_TpNameDescrpTagString_value;
+static int hf_org_csapi_cm_TpNameDescrpTagMonth_name;
+static int hf_org_csapi_cm_TpNameDescrpTagMonth_description;
+static int hf_org_csapi_cm_TpNameDescrpTagMonth_tag;
+static int hf_org_csapi_cm_TpNameDescrpTagMonth_value;
+static int hf_org_csapi_cm_TpNameDescrpTagInt_name;
+static int hf_org_csapi_cm_TpNameDescrpTagInt_description;
+static int hf_org_csapi_cm_TpNameDescrpTagInt_tag;
+static int hf_org_csapi_cm_TpNameDescrpTagInt_value;
+static int hf_org_csapi_cm_TpNameDescrpTagDir_name;
+static int hf_org_csapi_cm_TpNameDescrpTagDir_description;
+static int hf_org_csapi_cm_TpNameDescrpTagDir_tag;
+static int hf_org_csapi_cm_TpNameDescrpTagDir_value;
+static int hf_org_csapi_cm_TpNameDescrpTagDayOfWeek_name;
+static int hf_org_csapi_cm_TpNameDescrpTagDayOfWeek_description;
+static int hf_org_csapi_cm_TpNameDescrpTagDayOfWeek_tag;
+static int hf_org_csapi_cm_TpNameDescrpTagDayOfWeek_value;
+static int hf_org_csapi_cm_TpNameDescrpTagDateTime_name;
+static int hf_org_csapi_cm_TpNameDescrpTagDateTime_description;
+static int hf_org_csapi_cm_TpNameDescrpTagDateTime_tag;
+static int hf_org_csapi_cm_TpNameDescrpTagDateTime_value;
+static int hf_org_csapi_cm_TpEndpoint_type;
+static int hf_org_csapi_cm_TpEndpoint_id;
+static int hf_org_csapi_cm_TpNameDescrpTagExcessLoadAction_name;
+static int hf_org_csapi_cm_TpNameDescrpTagExcessLoadAction_description;
+static int hf_org_csapi_cm_TpNameDescrpTagExcessLoadAction_tag;
+static int hf_org_csapi_cm_TpNameDescrpTagExcessLoadAction_value;
+static int hf_org_csapi_cm_TpDsCodepoint_match;
+static int hf_org_csapi_cm_TpDsCodepoint_mask;
+static int hf_org_csapi_cm_TpIPSubnet_subnetNumber;
+static int hf_org_csapi_cm_TpIPSubnet_subnetMask;
+static int hf_org_csapi_cm_TpIPSubnet_addressType;
+static int hf_org_csapi_cm_TpIPSubnet_IPVersionSupport;
+static int hf_org_csapi_am_TpBalanceInfo_Currency;
+static int hf_org_csapi_am_TpBalanceInfo_ValuePartA;
+static int hf_org_csapi_am_TpBalanceInfo_ValuePartB;
+static int hf_org_csapi_am_TpBalanceInfo_Exponent;
+static int hf_org_csapi_am_TpBalanceInfo_AdditionalInfo;
+static int hf_org_csapi_am_TpChargingEventInfo_ChargingEventName;
+static int hf_org_csapi_am_TpChargingEventInfo_ChargingEventTime;
+static int hf_org_csapi_am_TpBalance_StatusCode;
+static int hf_org_csapi_am_TpTransactionHistory_TransactionID;
+static int hf_org_csapi_am_TpTransactionHistory_TimeStamp;
+static int hf_org_csapi_am_TpTransactionHistory_AdditionalInfo;
+static int hf_org_csapi_am_TpChargingEventCriteria_ChargingEvents_loop;
+static int hf_org_csapi_am_TpChargingEventCriteria_ChargingEvents;
+static int hf_org_csapi_am_TpChargingEventCriteria_Users_loop;
+static int hf_org_csapi_am_TpChargingEventCriteriaResult_AssignmentID;
+static int hf_org_csapi_am_TpBalanceExpiryDate_StatusCode;
+static int hf_org_csapi_am_TpBalanceExpiryDate_ExpiryDate;
+static int hf_org_csapi_am_TpVoucher_VoucherID;
+static int hf_org_csapi_cs_TpMerchantAccountID_MerchantID;
+static int hf_org_csapi_cs_TpMerchantAccountID_AccountID;
+static int hf_org_csapi_cs_TpCorrelationID_CorrelationID;
+static int hf_org_csapi_cs_TpCorrelationID_CorrelationType;
+static int hf_org_csapi_cs_TpAmount_Number;
+static int hf_org_csapi_cs_TpAmount_Exponent;
+static int hf_org_csapi_cs_TpChargingPrice_Currency;
+static int hf_org_csapi_cs_TpVolume_Unit;
+static int hf_org_csapi_cs_TpChargingSessionID_ChargingSessionID;
+static int hf_org_csapi_cs_TpChargingSessionID_RequestNumberFirstRequest;
+static int hf_org_csapi_cs_TpApplicationDescription_Text;
+static int hf_org_csapi_cs_TpApplicationDescription_AppInformation_loop;
+static int hf_org_csapi_cs_TpChargingParameter_ParameterID;
+static int hf_org_csapi_policy_TpPolicyEvent_EventID;
+static int hf_org_csapi_policy_TpPolicyEvent_TimeGenerated;
+static int hf_org_csapi_policy_TpPolicyEvent_Attributes_loop;
+static int hf_org_csapi_policy_TpPolicyEvent_EventDefinitionName;
+static int hf_org_csapi_policy_TpPolicyEvent_EventDomainName;
+static int hf_org_csapi_policy_TpPolicyNameValue_Name;
+static int hf_org_csapi_policy_TpPolicyType_TpPolicyRecordType_Names_loop;
+static int hf_org_csapi_policy_TpPolicyType_TpPolicyRecordType_Names;
+static int hf_org_csapi_policy_TpPolicyType_TpPolicyRecordType_Types_loop;
+static int hf_org_csapi_policy_TpPolicyType_TpPolicyListType_ElementType_loop;
+static int hf_org_csapi_policy_TpPolicyVar_VarName;
+static int hf_org_csapi_policy_TpPolicyConditionListElement_GroupNumber;
+static int hf_org_csapi_policy_TpPolicyConditionListElement_Negated;
+static int hf_org_csapi_policy_TpPolicyActionListElement_SequenceNumber;
+static int hf_org_csapi_pam_TpPAMAttributeDef_Name;
+static int hf_org_csapi_pam_TpPAMAttributeDef_Type;
+static int hf_org_csapi_pam_TpPAMAttributeDef_IsStatic;
+static int hf_org_csapi_pam_TpPAMAttributeDef_IsRevertOnExpiration;
+static int hf_org_csapi_pam_TpPAMAttribute_AttributeName;
+static int hf_org_csapi_pam_TpPAMAttribute_ExpiresIn;
+static int hf_org_csapi_pam_TpPAMPresenceData_Name;
+static int hf_org_csapi_pam_TpPAMPresenceData_subscriberStatus;
+static int hf_org_csapi_pam_TpPAMPresenceData_networkStatus;
+static int hf_org_csapi_pam_TpPAMPresenceData_communicationMeans;
+static int hf_org_csapi_pam_TpPAMPresenceData_subscriberProvidedLocation;
+static int hf_org_csapi_pam_TpPAMPresenceData_networkProvidedLocation;
+static int hf_org_csapi_pam_TpPAMPresenceData_Priority;
+static int hf_org_csapi_pam_TpPAMPresenceData_otherInfo;
+static int hf_org_csapi_pam_TpPAMAvailabilityProfile_PrivacyCode;
+static int hf_org_csapi_pam_TpPAMCommunicationContext_CommunicationCapability;
+static int hf_org_csapi_pam_TpPAMContext_AskerData_loop;
+static int hf_org_csapi_pam_TpPAMAccessControlData_DefaultPolicy;
+static int hf_org_csapi_pam_TpPAMAccessControlData_AllowList_loop;
+static int hf_org_csapi_pam_TpPAMAccessControlData_AllowList;
+static int hf_org_csapi_pam_TpPAMAccessControlData_DenyList_loop;
+static int hf_org_csapi_pam_TpPAMAccessControlData_DenyList;
+static int hf_org_csapi_pam_TpPAMICEventData_IdentityType_loop;
+static int hf_org_csapi_pam_TpPAMICEventData_IdentityType;
+static int hf_org_csapi_pam_TpPAMICNotificationData_Identities_loop;
+static int hf_org_csapi_pam_TpPAMICNotificationData_Identities;
+static int hf_org_csapi_pam_TpPAMIDEventData_IdentityName_loop;
+static int hf_org_csapi_pam_TpPAMIDEventData_IdentityName;
+static int hf_org_csapi_pam_TpPAMIDEventData_IdentityType_loop;
+static int hf_org_csapi_pam_TpPAMIDEventData_IdentityType;
+static int hf_org_csapi_pam_TpPAMIDNotificationData_Identities_loop;
+static int hf_org_csapi_pam_TpPAMIDNotificationData_Identities;
+static int hf_org_csapi_pam_TpPAMGMCEventData_GroupName_loop;
+static int hf_org_csapi_pam_TpPAMGMCEventData_GroupName;
+static int hf_org_csapi_pam_TpPAMGMCEventData_GroupType_loop;
+static int hf_org_csapi_pam_TpPAMGMCEventData_GroupType;
+static int hf_org_csapi_pam_TpPAMGMCNotificationData_Groups_loop;
+static int hf_org_csapi_pam_TpPAMGMCNotificationData_Groups;
+static int hf_org_csapi_pam_TpPAMACEventData_AgentType_loop;
+static int hf_org_csapi_pam_TpPAMACEventData_AgentType;
+static int hf_org_csapi_pam_TpPAMACNotificationData_Agents_loop;
+static int hf_org_csapi_pam_TpPAMACNotificationData_Agents;
+static int hf_org_csapi_pam_TpPAMADEventData_AgentName_loop;
+static int hf_org_csapi_pam_TpPAMADEventData_AgentName;
+static int hf_org_csapi_pam_TpPAMADEventData_AgentType_loop;
+static int hf_org_csapi_pam_TpPAMADEventData_AgentType;
+static int hf_org_csapi_pam_TpPAMADNotificationData_Agents_loop;
+static int hf_org_csapi_pam_TpPAMADNotificationData_Agents;
+static int hf_org_csapi_pam_TpPAMAAEventData_IdentityName_loop;
+static int hf_org_csapi_pam_TpPAMAAEventData_IdentityName;
+static int hf_org_csapi_pam_TpPAMAAEventData_IdentityType_loop;
+static int hf_org_csapi_pam_TpPAMAAEventData_IdentityType;
+static int hf_org_csapi_pam_TpPAMAAEventData_AgentName_loop;
+static int hf_org_csapi_pam_TpPAMAAEventData_AgentName;
+static int hf_org_csapi_pam_TpPAMAAEventData_AgentType_loop;
+static int hf_org_csapi_pam_TpPAMAAEventData_AgentType;
+static int hf_org_csapi_pam_TpPAMAANotificationData_Identity;
+static int hf_org_csapi_pam_TpPAMAANotificationData_Agent;
+static int hf_org_csapi_pam_TpPAMAUEventData_IdentityName_loop;
+static int hf_org_csapi_pam_TpPAMAUEventData_IdentityName;
+static int hf_org_csapi_pam_TpPAMAUEventData_IdentityType_loop;
+static int hf_org_csapi_pam_TpPAMAUEventData_IdentityType;
+static int hf_org_csapi_pam_TpPAMAUEventData_AgentName_loop;
+static int hf_org_csapi_pam_TpPAMAUEventData_AgentName;
+static int hf_org_csapi_pam_TpPAMAUEventData_AgentType_loop;
+static int hf_org_csapi_pam_TpPAMAUEventData_AgentType;
+static int hf_org_csapi_pam_TpPAMAUNotificationData_Identity;
+static int hf_org_csapi_pam_TpPAMAUNotificationData_Agent;
+static int hf_org_csapi_pam_TpPAMCCEventData_IdentityName_loop;
+static int hf_org_csapi_pam_TpPAMCCEventData_IdentityName;
+static int hf_org_csapi_pam_TpPAMCCEventData_IdentityType_loop;
+static int hf_org_csapi_pam_TpPAMCCEventData_IdentityType;
+static int hf_org_csapi_pam_TpPAMCCEventData_Capabilities_loop;
+static int hf_org_csapi_pam_TpPAMCCEventData_Capabilities;
+static int hf_org_csapi_pam_TpPAMCCNotificationData_Identity;
+static int hf_org_csapi_pam_TpPAMCCNotificationData_Capabilities_loop;
+static int hf_org_csapi_pam_TpPAMCCNotificationData_Capabilities;
+static int hf_org_csapi_pam_TpPAMACPSEventData_AgentName_loop;
+static int hf_org_csapi_pam_TpPAMACPSEventData_AgentName;
+static int hf_org_csapi_pam_TpPAMACPSEventData_AgentType_loop;
+static int hf_org_csapi_pam_TpPAMACPSEventData_AgentType;
+static int hf_org_csapi_pam_TpPAMACPSEventData_Capabilities_loop;
+static int hf_org_csapi_pam_TpPAMACPSEventData_Capabilities;
+static int hf_org_csapi_pam_TpPAMACPSEventData_AttributeNames_loop;
+static int hf_org_csapi_pam_TpPAMACPSEventData_AttributeNames;
+static int hf_org_csapi_pam_TpPAMACPSEventData_ReportingPeriod;
+static int hf_org_csapi_pam_TpPAMACPSNotificationData_Agent;
+static int hf_org_csapi_pam_TpPAMACPSNotificationData_Capability;
+static int hf_org_csapi_pam_TpPAMACPSNotificationData_AttributeNames_loop;
+static int hf_org_csapi_pam_TpPAMACPSNotificationData_AttributeNames;
+static int hf_org_csapi_pam_TpPAMAPSEventData_AgentName_loop;
+static int hf_org_csapi_pam_TpPAMAPSEventData_AgentName;
+static int hf_org_csapi_pam_TpPAMAPSEventData_AgentType_loop;
+static int hf_org_csapi_pam_TpPAMAPSEventData_AgentType;
+static int hf_org_csapi_pam_TpPAMAPSEventData_AttributeNames_loop;
+static int hf_org_csapi_pam_TpPAMAPSEventData_AttributeNames;
+static int hf_org_csapi_pam_TpPAMAPSEventData_ReportingPeriod;
+static int hf_org_csapi_pam_TpPAMAPSNotificationData_Agent;
+static int hf_org_csapi_pam_TpPAMAPSNotificationData_AttributeNames_loop;
+static int hf_org_csapi_pam_TpPAMAPSNotificationData_AttributeNames;
+static int hf_org_csapi_pam_TpPAMIPSEventData_IdentityName_loop;
+static int hf_org_csapi_pam_TpPAMIPSEventData_IdentityName;
+static int hf_org_csapi_pam_TpPAMIPSEventData_IdentityType_loop;
+static int hf_org_csapi_pam_TpPAMIPSEventData_IdentityType;
+static int hf_org_csapi_pam_TpPAMIPSEventData_AttributeNames_loop;
+static int hf_org_csapi_pam_TpPAMIPSEventData_AttributeNames;
+static int hf_org_csapi_pam_TpPAMIPSEventData_ReportingPeriod;
+static int hf_org_csapi_pam_TpPAMIPSNotificationData_Identity;
+static int hf_org_csapi_pam_TpPAMIPSNotificationData_Attributes_loop;
+static int hf_org_csapi_pam_TpPAMAVCEventData_IdentityName_loop;
+static int hf_org_csapi_pam_TpPAMAVCEventData_IdentityName;
+static int hf_org_csapi_pam_TpPAMAVCEventData_IdentityType_loop;
+static int hf_org_csapi_pam_TpPAMAVCEventData_IdentityType;
+static int hf_org_csapi_pam_TpPAMAVCEventData_PAMContext_loop;
+static int hf_org_csapi_pam_TpPAMAVCEventData_AttributeNames_loop;
+static int hf_org_csapi_pam_TpPAMAVCEventData_AttributeNames;
+static int hf_org_csapi_pam_TpPAMAVCEventData_ReportingPeriod;
+static int hf_org_csapi_pam_TpPAMAVCNotificationData_Identity;
+static int hf_org_csapi_pam_TpPAMAVCNotificationData_Availability_loop;
+static int hf_org_csapi_pam_TpPAMWCEventData_Events_loop;
+static int hf_org_csapi_pam_TpPAMWCEventData_Events;
+static int hf_org_csapi_pam_TpPAMWCEventData_IdentityName_loop;
+static int hf_org_csapi_pam_TpPAMWCEventData_IdentityName;
+static int hf_org_csapi_pam_TpPAMWCEventData_IdentityType_loop;
+static int hf_org_csapi_pam_TpPAMWCEventData_IdentityType;
+static int hf_org_csapi_pam_TpPAMWCEventData_ReportingPeriod;
+static int hf_org_csapi_pam_TpPAMWCNotificationData_Event;
+static int hf_org_csapi_pam_TpPAMWCNotificationData_ChangeType;
+static int hf_org_csapi_pam_TpPAMWCNotificationData_Identity;
+static int hf_org_csapi_pam_TpPAMWCNotificationData_Watchers_loop;
+static int hf_org_csapi_pam_TpPAMWCNotificationData_Watchers;
+static int hf_org_csapi_pam_TpPAMErrorInfo_Cause;
+static int hf_org_csapi_mmm_TpMailboxIdentifier_SessionID;
+static int hf_org_csapi_mmm_TpMultiMediaMessagingIdentifier_SessionID;
+static int hf_org_csapi_mmm_TpListMessagesCriteria_OnlyUnreadMessages;
+static int hf_org_csapi_mmm_TpMailboxFolderStatusInformation_TotalMessageCount;
+static int hf_org_csapi_mmm_TpMessageDescription_MessageID;
+static int hf_org_csapi_mmm_TpMessageDescription_To_loop;
+static int hf_org_csapi_mmm_TpMessageDescription_Subject;
+static int hf_org_csapi_mmm_TpMessageDescription_ReceivedDate;
+static int hf_org_csapi_mmm_TpMessageDescription_Size;
+static int hf_org_csapi_mmm_TpBodyPartDescription_ContentDescription;
+static int hf_org_csapi_mmm_TpBodyPartDescription_ContentSize;
+static int hf_org_csapi_mmm_TpBodyPartDescription_ContentType;
+static int hf_org_csapi_mmm_TpBodyPartDescription_ContentTransferEncoding;
+static int hf_org_csapi_mmm_TpBodyPartDescription_ContentID;
+static int hf_org_csapi_mmm_TpBodyPartDescription_ContentDisposition;
+static int hf_org_csapi_mmm_TpBodyPartDescription_PartID;
+static int hf_org_csapi_mmm_TpBodyPartDescription_NestingLevel;
+static int hf_org_csapi_mmm_TpBodyPart_BodyPartContent_loop;
+static int hf_org_csapi_mmm_TpBodyPart_BodyPartContent;
+static int hf_org_csapi_mmm_TpGenericHeaderField_FieldName;
+static int hf_org_csapi_mmm_TpGenericHeaderField_FieldValue;
+static int hf_org_csapi_mmm_TpMessageInfoPropertyError_MessagePropertyName;
+static int hf_org_csapi_mmm_TpMessageInfoPropertyError_Error;
+static int hf_org_csapi_mmm_TpNewMailboxMessageArrivedCriteria_MailboxID;
+static int hf_org_csapi_mmm_TpNewMailboxMessageArrivedCriteria_AuthenticationInfo;
+static int hf_org_csapi_mmm_TpNewMailboxMessageArrivedInfo_MailboxID;
+static int hf_org_csapi_mmm_TpNewMailboxMessageArrivedInfo_FolderID;
+static int hf_org_csapi_mmm_TpNewMailboxMessageArrivedInfo_MessageDescription_loop;
+static int hf_org_csapi_mmm_TpNewMailboxMessageArrivedInfo_ExtendedHeaderInformation_loop;
+static int hf_org_csapi_mmm_TpQueryStatusReport_ReportedStatus;
+static int hf_org_csapi_mmm_TpTerminatingAddressList_ToAddressList_loop;
+static int hf_org_csapi_mmm_TpTerminatingAddressList_CcAddressList_loop;
+static int hf_org_csapi_mmm_TpTerminatingAddressList_BccAddressList_loop;
+static int hf_org_csapi_mmm_TpNewMessageArrivedCriteria_CreateMultiMediaMessagingSession;
+static int hf_org_csapi_mmm_TpMessagingNotificationRequested_EventCriteria_loop;
+static int hf_org_csapi_mmm_TpMessagingNotificationRequested_AssignmentID;
+static int hf_org_csapi_mmm_TpMessagingNotificationRequestedSetEntry_MessagingNotificationRequestedSet_loop;
+static int hf_org_csapi_mmm_TpMessagingNotificationRequestedSetEntry_Final;
+static int hf_org_csapi_mmm_TpNewMessageArrivedInfo_DestinationAddressSet_loop;
+static int hf_org_csapi_mmm_TpNewMessageArrivedInfo_Message_loop;
+static int hf_org_csapi_mmm_TpNewMessageArrivedInfo_Message;
+static int hf_org_csapi_mmm_TpNewMessageArrivedInfo_Headers_loop;
         /* User exception filters */
-static int hf_org_csapi_TpCommonExceptions_ExceptionType = -1;
-static int hf_org_csapi_TpCommonExceptions_ExtraInformation = -1;
-static int hf_org_csapi_P_INVALID_INTERFACE_TYPE_ExtraInformation = -1;
-static int hf_org_csapi_P_INVALID_SESSION_ID_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_DOMAIN_ID_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_AUTH_TYPE_ExtraInformation = -1;
-static int hf_org_csapi_P_INVALID_VERSION_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_ACCESS_DENIED_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_ACCESS_TYPE_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_SIGNING_ALGORITHM_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_SIGNATURE_ExtraInformation = -1;
-static int hf_org_csapi_P_INVALID_INTERFACE_NAME_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_PROPERTY_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_NO_ACCEPTABLE_SIGNING_ALGORITHM_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_NO_ACCEPTABLE_ENCRYPTION_CAPABILITY_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_NO_ACCEPTABLE_AUTHENTICATION_MECHANISM_ExtraInformation = -1;
-static int hf_org_csapi_P_INVALID_CRITERIA_ExtraInformation = -1;
-static int hf_org_csapi_P_INVALID_EVENT_TYPE_ExtraInformation = -1;
-static int hf_org_csapi_P_INVALID_ASSIGNMENT_ID_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_SERVICE_ID_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_SERVICE_NOT_ENABLED_ExtraInformation = -1;
-static int hf_org_csapi_P_UNAUTHORISED_PARAMETER_VALUE_ExtraInformation = -1;
-static int hf_org_csapi_P_INVALID_TIME_AND_DATE_FORMAT_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_ACTIVITY_TEST_ID_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_ILLEGAL_SERVICE_TYPE_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_UNKNOWN_SERVICE_TYPE_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_AGREEMENT_TEXT_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_SERVICE_TOKEN_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_SERVICE_ACCESS_DENIED_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_SERVICE_PROFILE_ID_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_SAG_ID_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_SAG_TO_SERVICE_PROFILE_ASSIGNMENT_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_SERVICE_CONTRACT_ID_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_CLIENT_APP_ID_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_INVALID_ADDITION_TO_SAG_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_PROPERTY_TYPE_MISMATCH_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_DUPLICATE_PROPERTY_NAME_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_MISSING_MANDATORY_PROPERTY_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_SERVICE_TYPE_UNAVAILABLE_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_ILLEGAL_SERVICE_ID_ExtraInformation = -1;
-static int hf_org_csapi_fw_P_UNKNOWN_SERVICE_ID_ExtraInformation = -1;
-static int hf_org_csapi_P_INVALID_ADDRESS_ExtraInformation = -1;
-static int hf_org_csapi_P_UNSUPPORTED_ADDRESS_PLAN_ExtraInformation = -1;
-static int hf_org_csapi_P_INVALID_NETWORK_STATE_ExtraInformation = -1;
-static int hf_org_csapi_P_INVALID_CURRENCY_ExtraInformation = -1;
-static int hf_org_csapi_P_INVALID_AMOUNT_ExtraInformation = -1;
-static int hf_org_csapi_P_INFORMATION_NOT_AVAILABLE_ExtraInformation = -1;
-static int hf_org_csapi_ui_P_ILLEGAL_ID_ExtraInformation = -1;
-static int hf_org_csapi_ui_P_ID_NOT_FOUND_ExtraInformation = -1;
-static int hf_org_csapi_ui_P_ILLEGAL_RANGE_ExtraInformation = -1;
-static int hf_org_csapi_ui_P_INVALID_COLLECTION_CRITERIA_ExtraInformation = -1;
-static int hf_org_csapi_P_APPLICATION_NOT_ACTIVATED_ExtraInformation = -1;
-static int hf_org_csapi_mm_P_REQUESTED_ACCURACY_CANNOT_BE_DELIVERED_ExtraInformation = -1;
-static int hf_org_csapi_mm_P_REQUESTED_RESPONSE_TIME_CANNOT_BE_DELIVERED_ExtraInformation = -1;
-static int hf_org_csapi_mm_P_INVALID_REPORTING_INTERVAL_ExtraInformation = -1;
-static int hf_org_csapi_mm_P_TRIGGER_CONDITIONS_NOT_SUBSCRIBED_ExtraInformation = -1;
-static int hf_org_csapi_P_UNKNOWN_SUBSCRIBER_ExtraInformation = -1;
-static int hf_org_csapi_termcap_P_INVALID_TERMINAL_ID_ExtraInformation = -1;
-static int hf_org_csapi_gms_P_GMS_INVALID_MAILBOX_ExtraInformation = -1;
-static int hf_org_csapi_gms_P_GMS_INVALID_AUTHENTICATION_INFORMATION_ExtraInformation = -1;
-static int hf_org_csapi_gms_P_GMS_LOCKING_LOCKED_MAILBOX_ExtraInformation = -1;
-static int hf_org_csapi_gms_P_GMS_UNLOCKING_UNLOCKED_MAILBOX_ExtraInformation = -1;
-static int hf_org_csapi_gms_P_GMS_CANNOT_UNLOCK_MAILBOX_ExtraInformation = -1;
-static int hf_org_csapi_gms_P_GMS_NUMBER_NOT_POSITIVE_ExtraInformation = -1;
-static int hf_org_csapi_gms_P_GMS_PROPERTY_NOT_SET_ExtraInformation = -1;
-static int hf_org_csapi_gms_P_GMS_MAILBOX_LOCKED_ExtraInformation = -1;
-static int hf_org_csapi_gms_P_GMS_FOLDER_IS_OPEN_ExtraInformation = -1;
-static int hf_org_csapi_gms_P_GMS_INVALID_FOLDER_ID_ExtraInformation = -1;
-static int hf_org_csapi_gms_P_GMS_INSUFFICIENT_PRIVILEGE_ExtraInformation = -1;
-static int hf_org_csapi_gms_P_GMS_MAILBOX_OPEN_ExtraInformation = -1;
-static int hf_org_csapi_gms_P_GMS_INVALID_MESSAGE_ID_ExtraInformation = -1;
-static int hf_org_csapi_gms_P_GMS_MESSAGE_NOT_REMOVED_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_VPRP_ID_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_SLA_ID_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_STATUS_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_QOS_INFO_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_VALIDITY_INFO_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_PIPEQOSINFO_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_DSCODEPOINT_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_VPRP_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_ILLEGAL_VPRPID_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_ILLEGAL_REF_VALUE_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_INTERFACE_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_CANT_DELETE_VPRP_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_TEMPLATES_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_MENU_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_ENTERPRISE_NETWORK_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_TEMPLATE_TYPE_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_DESCRIPTION_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_ILLEGAL_SLA_ID_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_ILLEGAL_TAG_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_ILLEGAL_VALUE_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_ILLEGAL_COMBINATION_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_SITES_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_VPRN_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_ILLEGAL_SITE_ID_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_SITE_ID_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_SAPS_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_SITE_LOCATION_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_SITE_DESCRIPTION_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_IPSUBNET_ExtraInformation = -1;
-static int hf_org_csapi_cm_P_UNKNOWN_SAP_ExtraInformation = -1;
-static int hf_org_csapi_am_P_UNAUTHORIZED_APPLICATION_ExtraInformation = -1;
-static int hf_org_csapi_cs_P_INVALID_REQUEST_NUMBER_ExtraInformation = -1;
-static int hf_org_csapi_cs_P_INVALID_VOLUME_ExtraInformation = -1;
-static int hf_org_csapi_cs_P_INVALID_USER_ExtraInformation = -1;
-static int hf_org_csapi_cs_P_INVALID_ACCOUNT_ExtraInformation = -1;
-static int hf_org_csapi_policy_P_ACCESS_VIOLATION_ExtraInformation = -1;
-static int hf_org_csapi_policy_P_SYNTAX_ERROR_ExtraInformation = -1;
-static int hf_org_csapi_policy_P_NAME_SPACE_ERROR_ExtraInformation = -1;
-static int hf_org_csapi_policy_P_NO_TRANSACTION_IN_PROCESS_ExtraInformation = -1;
-static int hf_org_csapi_policy_P_TRANSACTION_IN_PROCESS_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_IDENTITY_EXISTS_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_UNKNOWN_TYPE_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_INVALID_CREDENTIAL_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_UNKNOWN_IDENTITY_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_MEMBER_EXISTS_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_UNKNOWN_GROUP_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_UNKNOWN_MEMBER_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_IS_CYCLIC_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_NOT_MEMBER_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_ALIAS_EXISTS_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_ALIAS_NOT_UNIQUE_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_UNASSIGNED_ALIAS_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_UNKNOWN_ALIAS_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_TYPE_ASSOCIATED_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_DISASSOCIATED_TYPE_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_UNKNOWN_ATTRIBUTE_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_UNKNOWN_ATTRIBUTES_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_AGENT_EXISTS_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_UNKNOWN_AGENT_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_NO_CAPABILITY_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_UNKNOWN_ASSIGNMENT_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_ATTRIBUTE_EXISTS_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_TYPE_EXISTS_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_UNKNOWN_CAPABILITY_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_UNAVAILABLE_INTERFACE_ExtraInformation = -1;
-static int hf_org_csapi_pam_P_PAM_NOT_REGISTERED_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_INVALID_MAILBOX_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_INVALID_AUTHENTICATION_INFORMATION_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_INVALID_FOLDER_ID_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_MAX_MESSAGE_SIZE_EXCEEDED_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_INVALID_MESSAGE_ID_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_INVALID_PART_ID_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_INVALID_PROPERTY_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_INVALID_DELIVERY_TYPE_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_DELIVERY_TYPE_ADDRESS_TYPE_MISMATCH_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_DELIVERY_TYPE_MESSAGE_TYPE_MISMATCH_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_INVALID_DELIVERY_TIME_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_INVALID_VALIDITY_TIME_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_MAX_SUBJECT_SIZE_EXCEEDED_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_INVALID_HEADER_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_CANNOT_CANCEL_ExtraInformation = -1;
-static int hf_org_csapi_mmm_P_MMM_INFORMATION_NOT_AVAILABLE_ExtraInformation = -1;
+static int hf_org_csapi_TpCommonExceptions_ExceptionType;
+static int hf_org_csapi_TpCommonExceptions_ExtraInformation;
+static int hf_org_csapi_P_INVALID_INTERFACE_TYPE_ExtraInformation;
+static int hf_org_csapi_P_INVALID_SESSION_ID_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_DOMAIN_ID_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_AUTH_TYPE_ExtraInformation;
+static int hf_org_csapi_P_INVALID_VERSION_ExtraInformation;
+static int hf_org_csapi_fw_P_ACCESS_DENIED_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_ACCESS_TYPE_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_SIGNING_ALGORITHM_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_SIGNATURE_ExtraInformation;
+static int hf_org_csapi_P_INVALID_INTERFACE_NAME_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_PROPERTY_ExtraInformation;
+static int hf_org_csapi_fw_P_NO_ACCEPTABLE_SIGNING_ALGORITHM_ExtraInformation;
+static int hf_org_csapi_fw_P_NO_ACCEPTABLE_ENCRYPTION_CAPABILITY_ExtraInformation;
+static int hf_org_csapi_fw_P_NO_ACCEPTABLE_AUTHENTICATION_MECHANISM_ExtraInformation;
+static int hf_org_csapi_P_INVALID_CRITERIA_ExtraInformation;
+static int hf_org_csapi_P_INVALID_EVENT_TYPE_ExtraInformation;
+static int hf_org_csapi_P_INVALID_ASSIGNMENT_ID_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_SERVICE_ID_ExtraInformation;
+static int hf_org_csapi_fw_P_SERVICE_NOT_ENABLED_ExtraInformation;
+static int hf_org_csapi_P_UNAUTHORISED_PARAMETER_VALUE_ExtraInformation;
+static int hf_org_csapi_P_INVALID_TIME_AND_DATE_FORMAT_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_ACTIVITY_TEST_ID_ExtraInformation;
+static int hf_org_csapi_fw_P_ILLEGAL_SERVICE_TYPE_ExtraInformation;
+static int hf_org_csapi_fw_P_UNKNOWN_SERVICE_TYPE_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_AGREEMENT_TEXT_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_SERVICE_TOKEN_ExtraInformation;
+static int hf_org_csapi_fw_P_SERVICE_ACCESS_DENIED_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_SERVICE_PROFILE_ID_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_SAG_ID_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_SAG_TO_SERVICE_PROFILE_ASSIGNMENT_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_SERVICE_CONTRACT_ID_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_CLIENT_APP_ID_ExtraInformation;
+static int hf_org_csapi_fw_P_INVALID_ADDITION_TO_SAG_ExtraInformation;
+static int hf_org_csapi_fw_P_PROPERTY_TYPE_MISMATCH_ExtraInformation;
+static int hf_org_csapi_fw_P_DUPLICATE_PROPERTY_NAME_ExtraInformation;
+static int hf_org_csapi_fw_P_MISSING_MANDATORY_PROPERTY_ExtraInformation;
+static int hf_org_csapi_fw_P_SERVICE_TYPE_UNAVAILABLE_ExtraInformation;
+static int hf_org_csapi_fw_P_ILLEGAL_SERVICE_ID_ExtraInformation;
+static int hf_org_csapi_fw_P_UNKNOWN_SERVICE_ID_ExtraInformation;
+static int hf_org_csapi_P_INVALID_ADDRESS_ExtraInformation;
+static int hf_org_csapi_P_UNSUPPORTED_ADDRESS_PLAN_ExtraInformation;
+static int hf_org_csapi_P_INVALID_NETWORK_STATE_ExtraInformation;
+static int hf_org_csapi_P_INVALID_CURRENCY_ExtraInformation;
+static int hf_org_csapi_P_INVALID_AMOUNT_ExtraInformation;
+static int hf_org_csapi_P_INFORMATION_NOT_AVAILABLE_ExtraInformation;
+static int hf_org_csapi_ui_P_ILLEGAL_ID_ExtraInformation;
+static int hf_org_csapi_ui_P_ID_NOT_FOUND_ExtraInformation;
+static int hf_org_csapi_ui_P_ILLEGAL_RANGE_ExtraInformation;
+static int hf_org_csapi_ui_P_INVALID_COLLECTION_CRITERIA_ExtraInformation;
+static int hf_org_csapi_P_APPLICATION_NOT_ACTIVATED_ExtraInformation;
+static int hf_org_csapi_mm_P_REQUESTED_ACCURACY_CANNOT_BE_DELIVERED_ExtraInformation;
+static int hf_org_csapi_mm_P_REQUESTED_RESPONSE_TIME_CANNOT_BE_DELIVERED_ExtraInformation;
+static int hf_org_csapi_mm_P_INVALID_REPORTING_INTERVAL_ExtraInformation;
+static int hf_org_csapi_mm_P_TRIGGER_CONDITIONS_NOT_SUBSCRIBED_ExtraInformation;
+static int hf_org_csapi_P_UNKNOWN_SUBSCRIBER_ExtraInformation;
+static int hf_org_csapi_termcap_P_INVALID_TERMINAL_ID_ExtraInformation;
+static int hf_org_csapi_gms_P_GMS_INVALID_MAILBOX_ExtraInformation;
+static int hf_org_csapi_gms_P_GMS_INVALID_AUTHENTICATION_INFORMATION_ExtraInformation;
+static int hf_org_csapi_gms_P_GMS_LOCKING_LOCKED_MAILBOX_ExtraInformation;
+static int hf_org_csapi_gms_P_GMS_UNLOCKING_UNLOCKED_MAILBOX_ExtraInformation;
+static int hf_org_csapi_gms_P_GMS_CANNOT_UNLOCK_MAILBOX_ExtraInformation;
+static int hf_org_csapi_gms_P_GMS_NUMBER_NOT_POSITIVE_ExtraInformation;
+static int hf_org_csapi_gms_P_GMS_PROPERTY_NOT_SET_ExtraInformation;
+static int hf_org_csapi_gms_P_GMS_MAILBOX_LOCKED_ExtraInformation;
+static int hf_org_csapi_gms_P_GMS_FOLDER_IS_OPEN_ExtraInformation;
+static int hf_org_csapi_gms_P_GMS_INVALID_FOLDER_ID_ExtraInformation;
+static int hf_org_csapi_gms_P_GMS_INSUFFICIENT_PRIVILEGE_ExtraInformation;
+static int hf_org_csapi_gms_P_GMS_MAILBOX_OPEN_ExtraInformation;
+static int hf_org_csapi_gms_P_GMS_INVALID_MESSAGE_ID_ExtraInformation;
+static int hf_org_csapi_gms_P_GMS_MESSAGE_NOT_REMOVED_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_VPRP_ID_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_SLA_ID_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_STATUS_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_QOS_INFO_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_VALIDITY_INFO_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_PIPEQOSINFO_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_DSCODEPOINT_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_VPRP_ExtraInformation;
+static int hf_org_csapi_cm_P_ILLEGAL_VPRPID_ExtraInformation;
+static int hf_org_csapi_cm_P_ILLEGAL_REF_VALUE_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_INTERFACE_ExtraInformation;
+static int hf_org_csapi_cm_P_CANT_DELETE_VPRP_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_TEMPLATES_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_MENU_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_ENTERPRISE_NETWORK_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_TEMPLATE_TYPE_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_DESCRIPTION_ExtraInformation;
+static int hf_org_csapi_cm_P_ILLEGAL_SLA_ID_ExtraInformation;
+static int hf_org_csapi_cm_P_ILLEGAL_TAG_ExtraInformation;
+static int hf_org_csapi_cm_P_ILLEGAL_VALUE_ExtraInformation;
+static int hf_org_csapi_cm_P_ILLEGAL_COMBINATION_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_SITES_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_VPRN_ExtraInformation;
+static int hf_org_csapi_cm_P_ILLEGAL_SITE_ID_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_SITE_ID_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_SAPS_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_SITE_LOCATION_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_SITE_DESCRIPTION_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_IPSUBNET_ExtraInformation;
+static int hf_org_csapi_cm_P_UNKNOWN_SAP_ExtraInformation;
+static int hf_org_csapi_am_P_UNAUTHORIZED_APPLICATION_ExtraInformation;
+static int hf_org_csapi_cs_P_INVALID_REQUEST_NUMBER_ExtraInformation;
+static int hf_org_csapi_cs_P_INVALID_VOLUME_ExtraInformation;
+static int hf_org_csapi_cs_P_INVALID_USER_ExtraInformation;
+static int hf_org_csapi_cs_P_INVALID_ACCOUNT_ExtraInformation;
+static int hf_org_csapi_policy_P_ACCESS_VIOLATION_ExtraInformation;
+static int hf_org_csapi_policy_P_SYNTAX_ERROR_ExtraInformation;
+static int hf_org_csapi_policy_P_NAME_SPACE_ERROR_ExtraInformation;
+static int hf_org_csapi_policy_P_NO_TRANSACTION_IN_PROCESS_ExtraInformation;
+static int hf_org_csapi_policy_P_TRANSACTION_IN_PROCESS_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_IDENTITY_EXISTS_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_UNKNOWN_TYPE_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_INVALID_CREDENTIAL_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_UNKNOWN_IDENTITY_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_MEMBER_EXISTS_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_UNKNOWN_GROUP_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_UNKNOWN_MEMBER_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_IS_CYCLIC_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_NOT_MEMBER_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_ALIAS_EXISTS_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_ALIAS_NOT_UNIQUE_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_UNASSIGNED_ALIAS_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_UNKNOWN_ALIAS_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_TYPE_ASSOCIATED_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_DISASSOCIATED_TYPE_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_UNKNOWN_ATTRIBUTE_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_UNKNOWN_ATTRIBUTES_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_AGENT_EXISTS_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_UNKNOWN_AGENT_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_NO_CAPABILITY_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_UNKNOWN_ASSIGNMENT_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_ATTRIBUTE_EXISTS_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_TYPE_EXISTS_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_UNKNOWN_CAPABILITY_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_UNAVAILABLE_INTERFACE_ExtraInformation;
+static int hf_org_csapi_pam_P_PAM_NOT_REGISTERED_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_INVALID_MAILBOX_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_INVALID_AUTHENTICATION_INFORMATION_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_INVALID_FOLDER_ID_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_MAX_MESSAGE_SIZE_EXCEEDED_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_INVALID_MESSAGE_ID_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_INVALID_PART_ID_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_INVALID_PROPERTY_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_INVALID_DELIVERY_TYPE_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_DELIVERY_TYPE_ADDRESS_TYPE_MISMATCH_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_DELIVERY_TYPE_MESSAGE_TYPE_MISMATCH_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_INVALID_DELIVERY_TIME_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_INVALID_VALIDITY_TIME_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_MAX_SUBJECT_SIZE_EXCEEDED_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_INVALID_HEADER_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_CANNOT_CANCEL_ExtraInformation;
+static int hf_org_csapi_mmm_P_MMM_INFORMATION_NOT_AVAILABLE_ExtraInformation;
         /* Union filters */
-static int hf_org_csapi_TpAoCOrder_TpAoCOrder = -1;
-static int hf_org_csapi_TpAoCOrder_NetworkCharge = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_TpSimpleAttributeValue = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_BooleanValue = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_OctetValue = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_CharValue = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_WCharValue_len = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_WCharValue = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_StringValue = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_WStringValue = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_Int16Value = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_UnsignedInt16Value = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_Int32Value = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_UnsignedInt32Value = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_Int64Value = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_UnsignedInt64Value = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_FloatValue = -1;
-static int hf_org_csapi_TpSimpleAttributeValue_DoubleValue = -1;
-static int hf_org_csapi_TpAttributeValue_TpAttributeValue = -1;
-static int hf_org_csapi_TpAttributeValue_XMLValue = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_TpFwEventCriteria = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_EventNameUndefined = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_ServiceTypeNameList_loop = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_ServiceTypeNameList = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_UnavailableServiceTypeNameList_loop = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_UnavailableServiceTypeNameList = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_CompatibleServiceTypeNameList_loop = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_CompatibleServiceTypeNameList = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_SessionCreatedList_loop = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_SessionCreatedList = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_SessionTerminatedList_loop = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_SessionTerminatedList = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_AgreementSignedList_loop = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_AgreementSignedList = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_AgreementEndedList_loop = -1;
-static int hf_org_csapi_fw_TpFwEventCriteria_AgreementEndedList = -1;
-static int hf_org_csapi_fw_TpLoadStatisticEntityID_TpLoadStatisticEntityID = -1;
-static int hf_org_csapi_fw_TpLoadStatisticEntityID_FrameworkID = -1;
-static int hf_org_csapi_fw_TpLoadStatisticEntityID_ServiceID = -1;
-static int hf_org_csapi_fw_TpLoadStatisticEntityID_ClientAppID = -1;
-static int hf_org_csapi_fw_TpLoadStatisticInfo_TpLoadStatisticInfo = -1;
-static int hf_org_csapi_fw_TpLoadStatisticInfo_LoadStatisticError = -1;
-static int hf_org_csapi_fw_TpDomainID_TpDomainID = -1;
-static int hf_org_csapi_fw_TpDomainID_FwID = -1;
-static int hf_org_csapi_fw_TpDomainID_ClientAppID = -1;
-static int hf_org_csapi_fw_TpDomainID_EntOpID = -1;
-static int hf_org_csapi_fw_TpDomainID_ServiceID = -1;
-static int hf_org_csapi_fw_TpDomainID_ServiceSupplierID = -1;
-static int hf_org_csapi_fw_TpMigrationAdditionalInfo_TpMigrationAdditionalInfo = -1;
-static int hf_org_csapi_fw_TpMigrationAdditionalInfo_Dummy = -1;
-static int hf_org_csapi_fw_TpFwEventInfo_TpFwEventInfo = -1;
-static int hf_org_csapi_fw_TpFwEventInfo_EventNameUndefined = -1;
-static int hf_org_csapi_fw_TpFwEventInfo_ServiceIDList_loop = -1;
-static int hf_org_csapi_fw_TpFwEventInfo_ServiceIDList = -1;
-static int hf_org_csapi_fw_TpFwEventInfo_UnavailableServiceIDList_loop = -1;
-static int hf_org_csapi_fw_TpFwEventInfo_UnavailableServiceIDList = -1;
-static int hf_org_csapi_fw_TpFwEventInfo_AppSessionCreated = -1;
-static int hf_org_csapi_fw_TpFwEventInfo_AppSessionTerminated = -1;
-static int hf_org_csapi_ui_TpUIVariableInfo_TpUIVariableInfo = -1;
-static int hf_org_csapi_ui_TpUIVariableInfo_VariablePartInteger = -1;
-static int hf_org_csapi_ui_TpUIVariableInfo_VariablePartAddress = -1;
-static int hf_org_csapi_ui_TpUIVariableInfo_VariablePartTime = -1;
-static int hf_org_csapi_ui_TpUIVariableInfo_VariablePartDate = -1;
-static int hf_org_csapi_ui_TpUIVariableInfo_VariablePartPrice = -1;
-static int hf_org_csapi_ui_TpUIInfo_TpUIInfo = -1;
-static int hf_org_csapi_ui_TpUIInfo_InfoID = -1;
-static int hf_org_csapi_ui_TpUIInfo_InfoData = -1;
-static int hf_org_csapi_ui_TpUIInfo_InfoAddress = -1;
-static int hf_org_csapi_ui_TpUIInfo_InfoBinData_loop = -1;
-static int hf_org_csapi_ui_TpUIInfo_InfoBinData = -1;
-static int hf_org_csapi_ui_TpUIInfo_InfoUUEncData = -1;
-static int hf_org_csapi_ui_TpUIInfo_InfoMimeData_loop = -1;
-static int hf_org_csapi_ui_TpUIInfo_InfoMimeData = -1;
-static int hf_org_csapi_ui_TpUIInfo_InfoWaveData_loop = -1;
-static int hf_org_csapi_ui_TpUIInfo_InfoWaveData = -1;
-static int hf_org_csapi_ui_TpUIInfo_InfoAuData_loop = -1;
-static int hf_org_csapi_ui_TpUIInfo_InfoAuData = -1;
-static int hf_org_csapi_ui_TpUIInfo_InfoVXMLData = -1;
-static int hf_org_csapi_cc_TpCallAdditionalErrorInfo_TpCallAdditionalErrorInfo = -1;
-static int hf_org_csapi_cc_TpCallAdditionalErrorInfo_CallErrorInvalidAddress = -1;
-static int hf_org_csapi_cc_TpCallAdditionalErrorInfo_Dummy = -1;
-static int hf_org_csapi_cc_TpCallLoadControlMechanism_TpCallLoadControlMechanism = -1;
-static int hf_org_csapi_cc_TpCallLoadControlMechanism_CallLoadControlPerInterval = -1;
-static int hf_org_csapi_cc_TpCallAdditionalTreatmentInfo_TpCallAdditionalTreatmentInfo = -1;
-static int hf_org_csapi_cc_TpCallAdditionalTreatmentInfo_Dummy = -1;
-static int hf_org_csapi_cc_TpCallPartyToChargeAdditionalInfo_TpCallPartyToChargeAdditionalInfo = -1;
-static int hf_org_csapi_cc_TpCallPartyToChargeAdditionalInfo_Dummy = -1;
-static int hf_org_csapi_cc_gccs_TpCallAppInfo_TpCallAppInfo = -1;
-static int hf_org_csapi_cc_gccs_TpCallAppInfo_CallAppAlertingMechanism = -1;
-static int hf_org_csapi_cc_gccs_TpCallAppInfo_CallAppNetworkAccessType = -1;
-static int hf_org_csapi_cc_gccs_TpCallAppInfo_CallAppTeleService = -1;
-static int hf_org_csapi_cc_gccs_TpCallAppInfo_CallAppBearerService = -1;
-static int hf_org_csapi_cc_gccs_TpCallAppInfo_CallAppPartyCategory = -1;
-static int hf_org_csapi_cc_gccs_TpCallAppInfo_CallAppGenericInfo = -1;
-static int hf_org_csapi_cc_gccs_TpCallAppInfo_Dummy = -1;
-static int hf_org_csapi_cc_gccs_TpCallAdditionalReportInfo_TpCallAdditionalReportInfo = -1;
-static int hf_org_csapi_cc_gccs_TpCallAdditionalReportInfo_QueueStatus = -1;
-static int hf_org_csapi_cc_gccs_TpCallAdditionalReportInfo_Dummy = -1;
-static int hf_org_csapi_cc_gccs_TpCallAdditionalReportCriteria_TpCallAdditionalReportCriteria = -1;
-static int hf_org_csapi_cc_gccs_TpCallAdditionalReportCriteria_NoAnswerDuration = -1;
-static int hf_org_csapi_cc_gccs_TpCallAdditionalReportCriteria_Dummy = -1;
-static int hf_org_csapi_cc_TpCallAdditionalEventInfo_TpCallAdditionalEventInfo = -1;
-static int hf_org_csapi_cc_TpCallAdditionalEventInfo_OriginatingReleaseCause = -1;
-static int hf_org_csapi_cc_TpCallAdditionalEventInfo_TerminatingReleaseCause = -1;
-static int hf_org_csapi_cc_TpCallAdditionalEventInfo_Dummy = -1;
-static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_TpAdditionalCallEventCriteria = -1;
-static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_MinAddressLength = -1;
-static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_OriginatingServiceCode_loop = -1;
-static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_OriginatingReleaseCauseSet_loop = -1;
-static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_OriginatingReleaseCauseSet = -1;
-static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_TerminatingReleaseCauseSet_loop = -1;
-static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_TerminatingReleaseCauseSet = -1;
-static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_TerminatingServiceCode_loop = -1;
-static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_Dummy = -1;
-static int hf_org_csapi_cc_TpCallAppInfo_TpCallAppInfo = -1;
-static int hf_org_csapi_cc_TpCallAppInfo_CallAppAlertingMechanism = -1;
-static int hf_org_csapi_cc_TpCallAppInfo_CallAppNetworkAccessType = -1;
-static int hf_org_csapi_cc_TpCallAppInfo_CallAppTeleService = -1;
-static int hf_org_csapi_cc_TpCallAppInfo_CallAppBearerService = -1;
-static int hf_org_csapi_cc_TpCallAppInfo_CallAppPartyCategory = -1;
-static int hf_org_csapi_cc_TpCallAppInfo_CallAppGenericInfo = -1;
-static int hf_org_csapi_cc_TpCallAppInfo_CallHighProbabilityCompletion = -1;
-static int hf_org_csapi_cc_TpCallAppInfo_CallAppCarrier_loop = -1;
-static int hf_org_csapi_cc_TpCallAppInfo_Dummy = -1;
-static int hf_org_csapi_cc_mpccs_TpAppMultiPartyCallBack_TpAppMultiPartyCallBack = -1;
-static int hf_org_csapi_cc_mpccs_TpAppMultiPartyCallBack_Dummy = -1;
-static int hf_org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest_TpMediaStreamDataTypeRequest = -1;
-static int hf_org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest_Audio = -1;
-static int hf_org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest_Video = -1;
-static int hf_org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest_Data = -1;
-static int hf_org_csapi_cc_mmccs_TpAppMultiMediaCallBack_TpAppMultiMediaCallBack = -1;
-static int hf_org_csapi_cc_mmccs_TpAppMultiMediaCallBack_Dummy = -1;
-static int hf_org_csapi_cc_cccs_TpConfPolicy_TpConfPolicy = -1;
-static int hf_org_csapi_cc_cccs_TpConfPolicy_Dummy = -1;
-static int hf_org_csapi_ui_TpUITargetObject_TpUITargetObject = -1;
-static int hf_org_csapi_mm_TpBindingEntry_TpBindingEntry = -1;
-static int hf_org_csapi_mm_TpBindingEntry_UBExpires = -1;
-static int hf_org_csapi_mm_TpBindingEntry_UBPreference = -1;
-static int hf_org_csapi_mm_TpBindingEntry_Dummy = -1;
-static int hf_org_csapi_dsc_TpDataSessionChargeOrder_TpDataSessionChargeOrder = -1;
-static int hf_org_csapi_dsc_TpDataSessionChargeOrder_NetworkCharge = -1;
-static int hf_org_csapi_dsc_TpDataSessionAdditionalErrorInfo_TpDataSessionAdditionalErrorInfo = -1;
-static int hf_org_csapi_dsc_TpDataSessionAdditionalErrorInfo_DataSessionErrorInvalidAddress = -1;
-static int hf_org_csapi_dsc_TpDataSessionAdditionalErrorInfo_Dummy = -1;
-static int hf_org_csapi_dsc_TpDataSessionAdditionalReportInfo_TpDataSessionAdditionalReportInfo = -1;
-static int hf_org_csapi_dsc_TpDataSessionAdditionalReportInfo_Dummy = -1;
-static int hf_org_csapi_gms_TpMessageInfoProperty_TpMessageInfoProperty = -1;
-static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageID = -1;
-static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageSubject = -1;
-static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageDateSent = -1;
-static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageDateReceived = -1;
-static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageDateChanged = -1;
-static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageSize = -1;
-static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessagePriority = -1;
-static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageFormat = -1;
-static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageFolder = -1;
-static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageStatus = -1;
-static int hf_org_csapi_gms_TpMessageInfoProperty_Dummy = -1;
-static int hf_org_csapi_gms_TpMailboxInfoProperty_TpMailboxInfoProperty = -1;
-static int hf_org_csapi_gms_TpMailboxInfoProperty_MessagingMailboxOwner = -1;
-static int hf_org_csapi_gms_TpMailboxInfoProperty_MessagingMailboxFolder = -1;
-static int hf_org_csapi_gms_TpMailboxInfoProperty_MessagingMailboxDateCreated = -1;
-static int hf_org_csapi_gms_TpMailboxInfoProperty_MessagingMailboxDateChanged = -1;
-static int hf_org_csapi_gms_TpMailboxInfoProperty_Dummy = -1;
-static int hf_org_csapi_gms_TpMessagingEventInfo_TpMessagingEventInfo = -1;
-static int hf_org_csapi_gms_TpMessagingEventInfo_EventNameUndefined = -1;
-static int hf_org_csapi_gms_TpMessagingEventCriteria_TpMessagingEventCriteria = -1;
-static int hf_org_csapi_gms_TpMessagingEventCriteria_Dummy = -1;
-static int hf_org_csapi_gms_TpFolderInfoProperty_TpFolderInfoProperty = -1;
-static int hf_org_csapi_gms_TpFolderInfoProperty_MessagingFolderID = -1;
-static int hf_org_csapi_gms_TpFolderInfoProperty_MessagingFolderMessage = -1;
-static int hf_org_csapi_gms_TpFolderInfoProperty_MessagingFolderSubfolder = -1;
-static int hf_org_csapi_gms_TpFolderInfoProperty_MessagingFolderDateCreated = -1;
-static int hf_org_csapi_gms_TpFolderInfoProperty_MessagingFolderDateChanged = -1;
-static int hf_org_csapi_gms_TpFolderInfoProperty_Dummy = -1;
-static int hf_org_csapi_cs_TpChargingParameterValue_TpChargingParameterValue = -1;
-static int hf_org_csapi_cs_TpChargingParameterValue_IntValue = -1;
-static int hf_org_csapi_cs_TpChargingParameterValue_FloatValue = -1;
-static int hf_org_csapi_cs_TpChargingParameterValue_StringValue = -1;
-static int hf_org_csapi_cs_TpChargingParameterValue_BooleanValue = -1;
-static int hf_org_csapi_cs_TpChargingParameterValue_OctetValue_loop = -1;
-static int hf_org_csapi_cs_TpChargingParameterValue_OctetValue = -1;
-static int hf_org_csapi_cs_TpAppInformation_TpAppInformation = -1;
-static int hf_org_csapi_cs_TpAppInformation_Timestamp = -1;
-static int hf_org_csapi_policy_TpPolicyType_TpPolicyType = -1;
-static int hf_org_csapi_policy_TpPolicyType_SimpleType = -1;
-static int hf_org_csapi_policy_TpPolicyType_StructuredType = -1;
-static int hf_org_csapi_policy_TpPolicyType_XMLString = -1;
-static int hf_org_csapi_pam_TpPAMContextData_TpPAMContextData = -1;
-static int hf_org_csapi_pam_TpPAMContextData_Dummy = -1;
-static int hf_org_csapi_pam_TpPAMEventInfo_TpPAMEventInfo = -1;
-static int hf_org_csapi_pam_TpPAMNotificationInfo_TpPAMNotificationInfo = -1;
-static int hf_org_csapi_pam_TpPAMPreferenceData_TpPAMPreferenceData = -1;
-static int hf_org_csapi_pam_TpPAMPreferenceData_Dummy = -1;
-static int hf_org_csapi_mmm_TpFolderInfoProperty_TpFolderInfoProperty = -1;
-static int hf_org_csapi_mmm_TpFolderInfoProperty_FolderDateCreated = -1;
-static int hf_org_csapi_mmm_TpFolderInfoProperty_FolderDateChanged = -1;
-static int hf_org_csapi_mmm_TpFolderInfoProperty_FolderSize = -1;
-static int hf_org_csapi_mmm_TpFolderInfoProperty_FolderNumberOfMessages = -1;
-static int hf_org_csapi_mmm_TpFolderInfoProperty_Dummy = -1;
-static int hf_org_csapi_mmm_TpMailboxInfoProperty_TpMailboxInfoProperty = -1;
-static int hf_org_csapi_mmm_TpMailboxInfoProperty_MailboxOwner = -1;
-static int hf_org_csapi_mmm_TpMailboxInfoProperty_MailboxDateCreated = -1;
-static int hf_org_csapi_mmm_TpMailboxInfoProperty_MailboxDateChanged = -1;
-static int hf_org_csapi_mmm_TpMailboxInfoProperty_MailboxSize = -1;
-static int hf_org_csapi_mmm_TpMailboxInfoProperty_Dummy = -1;
-static int hf_org_csapi_mmm_TpMessageInfoProperty_TpMessageInfoProperty = -1;
-static int hf_org_csapi_mmm_TpMessageInfoProperty_MessageDateCreated = -1;
-static int hf_org_csapi_mmm_TpMessageInfoProperty_MessageDateReceived = -1;
-static int hf_org_csapi_mmm_TpMessageInfoProperty_MessageDateChanged = -1;
-static int hf_org_csapi_mmm_TpMessageInfoProperty_MessageSize = -1;
-static int hf_org_csapi_mmm_TpMessageInfoProperty_MessageStatus = -1;
-static int hf_org_csapi_mmm_TpMessageInfoProperty_Dummy = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_TpMessageHeaderField = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_DateSent = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_From_loop = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_ReplyTo_loop = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_To_loop = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_Cc_loop = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_Bcc_loop = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_RFC822MessageID = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_InReplyTo_loop = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_InReplyTo = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_References_loop = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_References = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_Subject = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_Comments = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_Keywords_loop = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_Keywords = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_MimeVersion = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_MimeContent = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_MimeEncoding = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_MimeID = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_MimeDescription = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_MimeDisposition = -1;
-static int hf_org_csapi_mmm_TpMessageHeaderField_Priority = -1;
-static int hf_org_csapi_mmm_TpDeliveryTime_TpDeliveryTime = -1;
-static int hf_org_csapi_mmm_TpDeliveryTime_DeliveryTime = -1;
-static int hf_org_csapi_mmm_TpDeliveryTime_Dummy = -1;
-static int hf_org_csapi_mmm_TpMessageTreatment_TpMessageTreatment = -1;
-static int hf_org_csapi_mmm_TpMessageTreatment_DeliveryReport = -1;
-static int hf_org_csapi_mmm_TpMessageTreatment_BillingID = -1;
-static int hf_org_csapi_mmm_TpMessageTreatment_ValidityTime = -1;
-static int hf_org_csapi_mmm_TpMessagingEventCriteria_TpMessagingEventCriteria = -1;
-static int hf_org_csapi_mmm_TpMessagingEventCriteria_Dummy = -1;
-static int hf_org_csapi_mmm_TpMessagingEventInfo_TpMessagingEventInfo = -1;
-static int hf_org_csapi_mmm_TpMessagingEventInfo_EventNameUndefined = -1;
+static int hf_org_csapi_TpAoCOrder_TpAoCOrder;
+static int hf_org_csapi_TpAoCOrder_NetworkCharge;
+static int hf_org_csapi_TpSimpleAttributeValue_TpSimpleAttributeValue;
+static int hf_org_csapi_TpSimpleAttributeValue_BooleanValue;
+static int hf_org_csapi_TpSimpleAttributeValue_OctetValue;
+static int hf_org_csapi_TpSimpleAttributeValue_CharValue;
+static int hf_org_csapi_TpSimpleAttributeValue_WCharValue_len;
+static int hf_org_csapi_TpSimpleAttributeValue_WCharValue;
+static int hf_org_csapi_TpSimpleAttributeValue_StringValue;
+static int hf_org_csapi_TpSimpleAttributeValue_WStringValue;
+static int hf_org_csapi_TpSimpleAttributeValue_Int16Value;
+static int hf_org_csapi_TpSimpleAttributeValue_UnsignedInt16Value;
+static int hf_org_csapi_TpSimpleAttributeValue_Int32Value;
+static int hf_org_csapi_TpSimpleAttributeValue_UnsignedInt32Value;
+static int hf_org_csapi_TpSimpleAttributeValue_Int64Value;
+static int hf_org_csapi_TpSimpleAttributeValue_UnsignedInt64Value;
+static int hf_org_csapi_TpSimpleAttributeValue_FloatValue;
+static int hf_org_csapi_TpSimpleAttributeValue_DoubleValue;
+static int hf_org_csapi_TpAttributeValue_TpAttributeValue;
+static int hf_org_csapi_TpAttributeValue_XMLValue;
+static int hf_org_csapi_fw_TpFwEventCriteria_TpFwEventCriteria;
+static int hf_org_csapi_fw_TpFwEventCriteria_EventNameUndefined;
+static int hf_org_csapi_fw_TpFwEventCriteria_ServiceTypeNameList_loop;
+static int hf_org_csapi_fw_TpFwEventCriteria_ServiceTypeNameList;
+static int hf_org_csapi_fw_TpFwEventCriteria_UnavailableServiceTypeNameList_loop;
+static int hf_org_csapi_fw_TpFwEventCriteria_UnavailableServiceTypeNameList;
+static int hf_org_csapi_fw_TpFwEventCriteria_CompatibleServiceTypeNameList_loop;
+static int hf_org_csapi_fw_TpFwEventCriteria_CompatibleServiceTypeNameList;
+static int hf_org_csapi_fw_TpFwEventCriteria_SessionCreatedList_loop;
+static int hf_org_csapi_fw_TpFwEventCriteria_SessionCreatedList;
+static int hf_org_csapi_fw_TpFwEventCriteria_SessionTerminatedList_loop;
+static int hf_org_csapi_fw_TpFwEventCriteria_SessionTerminatedList;
+static int hf_org_csapi_fw_TpFwEventCriteria_AgreementSignedList_loop;
+static int hf_org_csapi_fw_TpFwEventCriteria_AgreementSignedList;
+static int hf_org_csapi_fw_TpFwEventCriteria_AgreementEndedList_loop;
+static int hf_org_csapi_fw_TpFwEventCriteria_AgreementEndedList;
+static int hf_org_csapi_fw_TpLoadStatisticEntityID_TpLoadStatisticEntityID;
+static int hf_org_csapi_fw_TpLoadStatisticEntityID_FrameworkID;
+static int hf_org_csapi_fw_TpLoadStatisticEntityID_ServiceID;
+static int hf_org_csapi_fw_TpLoadStatisticEntityID_ClientAppID;
+static int hf_org_csapi_fw_TpLoadStatisticInfo_TpLoadStatisticInfo;
+static int hf_org_csapi_fw_TpLoadStatisticInfo_LoadStatisticError;
+static int hf_org_csapi_fw_TpDomainID_TpDomainID;
+static int hf_org_csapi_fw_TpDomainID_FwID;
+static int hf_org_csapi_fw_TpDomainID_ClientAppID;
+static int hf_org_csapi_fw_TpDomainID_EntOpID;
+static int hf_org_csapi_fw_TpDomainID_ServiceID;
+static int hf_org_csapi_fw_TpDomainID_ServiceSupplierID;
+static int hf_org_csapi_fw_TpMigrationAdditionalInfo_TpMigrationAdditionalInfo;
+static int hf_org_csapi_fw_TpMigrationAdditionalInfo_Dummy;
+static int hf_org_csapi_fw_TpFwEventInfo_TpFwEventInfo;
+static int hf_org_csapi_fw_TpFwEventInfo_EventNameUndefined;
+static int hf_org_csapi_fw_TpFwEventInfo_ServiceIDList_loop;
+static int hf_org_csapi_fw_TpFwEventInfo_ServiceIDList;
+static int hf_org_csapi_fw_TpFwEventInfo_UnavailableServiceIDList_loop;
+static int hf_org_csapi_fw_TpFwEventInfo_UnavailableServiceIDList;
+static int hf_org_csapi_fw_TpFwEventInfo_AppSessionCreated;
+static int hf_org_csapi_fw_TpFwEventInfo_AppSessionTerminated;
+static int hf_org_csapi_ui_TpUIVariableInfo_TpUIVariableInfo;
+static int hf_org_csapi_ui_TpUIVariableInfo_VariablePartInteger;
+static int hf_org_csapi_ui_TpUIVariableInfo_VariablePartAddress;
+static int hf_org_csapi_ui_TpUIVariableInfo_VariablePartTime;
+static int hf_org_csapi_ui_TpUIVariableInfo_VariablePartDate;
+static int hf_org_csapi_ui_TpUIVariableInfo_VariablePartPrice;
+static int hf_org_csapi_ui_TpUIInfo_TpUIInfo;
+static int hf_org_csapi_ui_TpUIInfo_InfoID;
+static int hf_org_csapi_ui_TpUIInfo_InfoData;
+static int hf_org_csapi_ui_TpUIInfo_InfoAddress;
+static int hf_org_csapi_ui_TpUIInfo_InfoBinData_loop;
+static int hf_org_csapi_ui_TpUIInfo_InfoBinData;
+static int hf_org_csapi_ui_TpUIInfo_InfoUUEncData;
+static int hf_org_csapi_ui_TpUIInfo_InfoMimeData_loop;
+static int hf_org_csapi_ui_TpUIInfo_InfoMimeData;
+static int hf_org_csapi_ui_TpUIInfo_InfoWaveData_loop;
+static int hf_org_csapi_ui_TpUIInfo_InfoWaveData;
+static int hf_org_csapi_ui_TpUIInfo_InfoAuData_loop;
+static int hf_org_csapi_ui_TpUIInfo_InfoAuData;
+static int hf_org_csapi_ui_TpUIInfo_InfoVXMLData;
+static int hf_org_csapi_cc_TpCallAdditionalErrorInfo_TpCallAdditionalErrorInfo;
+static int hf_org_csapi_cc_TpCallAdditionalErrorInfo_CallErrorInvalidAddress;
+static int hf_org_csapi_cc_TpCallAdditionalErrorInfo_Dummy;
+static int hf_org_csapi_cc_TpCallLoadControlMechanism_TpCallLoadControlMechanism;
+static int hf_org_csapi_cc_TpCallLoadControlMechanism_CallLoadControlPerInterval;
+static int hf_org_csapi_cc_TpCallAdditionalTreatmentInfo_TpCallAdditionalTreatmentInfo;
+static int hf_org_csapi_cc_TpCallAdditionalTreatmentInfo_Dummy;
+static int hf_org_csapi_cc_TpCallPartyToChargeAdditionalInfo_TpCallPartyToChargeAdditionalInfo;
+static int hf_org_csapi_cc_TpCallPartyToChargeAdditionalInfo_Dummy;
+static int hf_org_csapi_cc_gccs_TpCallAppInfo_TpCallAppInfo;
+static int hf_org_csapi_cc_gccs_TpCallAppInfo_CallAppAlertingMechanism;
+static int hf_org_csapi_cc_gccs_TpCallAppInfo_CallAppNetworkAccessType;
+static int hf_org_csapi_cc_gccs_TpCallAppInfo_CallAppTeleService;
+static int hf_org_csapi_cc_gccs_TpCallAppInfo_CallAppBearerService;
+static int hf_org_csapi_cc_gccs_TpCallAppInfo_CallAppPartyCategory;
+static int hf_org_csapi_cc_gccs_TpCallAppInfo_CallAppGenericInfo;
+static int hf_org_csapi_cc_gccs_TpCallAppInfo_Dummy;
+static int hf_org_csapi_cc_gccs_TpCallAdditionalReportInfo_TpCallAdditionalReportInfo;
+static int hf_org_csapi_cc_gccs_TpCallAdditionalReportInfo_QueueStatus;
+static int hf_org_csapi_cc_gccs_TpCallAdditionalReportInfo_Dummy;
+static int hf_org_csapi_cc_gccs_TpCallAdditionalReportCriteria_TpCallAdditionalReportCriteria;
+static int hf_org_csapi_cc_gccs_TpCallAdditionalReportCriteria_NoAnswerDuration;
+static int hf_org_csapi_cc_gccs_TpCallAdditionalReportCriteria_Dummy;
+static int hf_org_csapi_cc_TpCallAdditionalEventInfo_TpCallAdditionalEventInfo;
+static int hf_org_csapi_cc_TpCallAdditionalEventInfo_OriginatingReleaseCause;
+static int hf_org_csapi_cc_TpCallAdditionalEventInfo_TerminatingReleaseCause;
+static int hf_org_csapi_cc_TpCallAdditionalEventInfo_Dummy;
+static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_TpAdditionalCallEventCriteria;
+static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_MinAddressLength;
+static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_OriginatingServiceCode_loop;
+static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_OriginatingReleaseCauseSet_loop;
+static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_OriginatingReleaseCauseSet;
+static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_TerminatingReleaseCauseSet_loop;
+static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_TerminatingReleaseCauseSet;
+static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_TerminatingServiceCode_loop;
+static int hf_org_csapi_cc_TpAdditionalCallEventCriteria_Dummy;
+static int hf_org_csapi_cc_TpCallAppInfo_TpCallAppInfo;
+static int hf_org_csapi_cc_TpCallAppInfo_CallAppAlertingMechanism;
+static int hf_org_csapi_cc_TpCallAppInfo_CallAppNetworkAccessType;
+static int hf_org_csapi_cc_TpCallAppInfo_CallAppTeleService;
+static int hf_org_csapi_cc_TpCallAppInfo_CallAppBearerService;
+static int hf_org_csapi_cc_TpCallAppInfo_CallAppPartyCategory;
+static int hf_org_csapi_cc_TpCallAppInfo_CallAppGenericInfo;
+static int hf_org_csapi_cc_TpCallAppInfo_CallHighProbabilityCompletion;
+static int hf_org_csapi_cc_TpCallAppInfo_CallAppCarrier_loop;
+static int hf_org_csapi_cc_TpCallAppInfo_Dummy;
+static int hf_org_csapi_cc_mpccs_TpAppMultiPartyCallBack_TpAppMultiPartyCallBack;
+static int hf_org_csapi_cc_mpccs_TpAppMultiPartyCallBack_Dummy;
+static int hf_org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest_TpMediaStreamDataTypeRequest;
+static int hf_org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest_Audio;
+static int hf_org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest_Video;
+static int hf_org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest_Data;
+static int hf_org_csapi_cc_mmccs_TpAppMultiMediaCallBack_TpAppMultiMediaCallBack;
+static int hf_org_csapi_cc_mmccs_TpAppMultiMediaCallBack_Dummy;
+static int hf_org_csapi_cc_cccs_TpConfPolicy_TpConfPolicy;
+static int hf_org_csapi_cc_cccs_TpConfPolicy_Dummy;
+static int hf_org_csapi_ui_TpUITargetObject_TpUITargetObject;
+static int hf_org_csapi_mm_TpBindingEntry_TpBindingEntry;
+static int hf_org_csapi_mm_TpBindingEntry_UBExpires;
+static int hf_org_csapi_mm_TpBindingEntry_UBPreference;
+static int hf_org_csapi_mm_TpBindingEntry_Dummy;
+static int hf_org_csapi_dsc_TpDataSessionChargeOrder_TpDataSessionChargeOrder;
+static int hf_org_csapi_dsc_TpDataSessionChargeOrder_NetworkCharge;
+static int hf_org_csapi_dsc_TpDataSessionAdditionalErrorInfo_TpDataSessionAdditionalErrorInfo;
+static int hf_org_csapi_dsc_TpDataSessionAdditionalErrorInfo_DataSessionErrorInvalidAddress;
+static int hf_org_csapi_dsc_TpDataSessionAdditionalErrorInfo_Dummy;
+static int hf_org_csapi_dsc_TpDataSessionAdditionalReportInfo_TpDataSessionAdditionalReportInfo;
+static int hf_org_csapi_dsc_TpDataSessionAdditionalReportInfo_Dummy;
+static int hf_org_csapi_gms_TpMessageInfoProperty_TpMessageInfoProperty;
+static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageID;
+static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageSubject;
+static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageDateSent;
+static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageDateReceived;
+static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageDateChanged;
+static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageSize;
+static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessagePriority;
+static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageFormat;
+static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageFolder;
+static int hf_org_csapi_gms_TpMessageInfoProperty_MessagingMessageStatus;
+static int hf_org_csapi_gms_TpMessageInfoProperty_Dummy;
+static int hf_org_csapi_gms_TpMailboxInfoProperty_TpMailboxInfoProperty;
+static int hf_org_csapi_gms_TpMailboxInfoProperty_MessagingMailboxOwner;
+static int hf_org_csapi_gms_TpMailboxInfoProperty_MessagingMailboxFolder;
+static int hf_org_csapi_gms_TpMailboxInfoProperty_MessagingMailboxDateCreated;
+static int hf_org_csapi_gms_TpMailboxInfoProperty_MessagingMailboxDateChanged;
+static int hf_org_csapi_gms_TpMailboxInfoProperty_Dummy;
+static int hf_org_csapi_gms_TpMessagingEventInfo_TpMessagingEventInfo;
+static int hf_org_csapi_gms_TpMessagingEventInfo_EventNameUndefined;
+static int hf_org_csapi_gms_TpMessagingEventCriteria_TpMessagingEventCriteria;
+static int hf_org_csapi_gms_TpMessagingEventCriteria_Dummy;
+static int hf_org_csapi_gms_TpFolderInfoProperty_TpFolderInfoProperty;
+static int hf_org_csapi_gms_TpFolderInfoProperty_MessagingFolderID;
+static int hf_org_csapi_gms_TpFolderInfoProperty_MessagingFolderMessage;
+static int hf_org_csapi_gms_TpFolderInfoProperty_MessagingFolderSubfolder;
+static int hf_org_csapi_gms_TpFolderInfoProperty_MessagingFolderDateCreated;
+static int hf_org_csapi_gms_TpFolderInfoProperty_MessagingFolderDateChanged;
+static int hf_org_csapi_gms_TpFolderInfoProperty_Dummy;
+static int hf_org_csapi_cs_TpChargingParameterValue_TpChargingParameterValue;
+static int hf_org_csapi_cs_TpChargingParameterValue_IntValue;
+static int hf_org_csapi_cs_TpChargingParameterValue_FloatValue;
+static int hf_org_csapi_cs_TpChargingParameterValue_StringValue;
+static int hf_org_csapi_cs_TpChargingParameterValue_BooleanValue;
+static int hf_org_csapi_cs_TpChargingParameterValue_OctetValue_loop;
+static int hf_org_csapi_cs_TpChargingParameterValue_OctetValue;
+static int hf_org_csapi_cs_TpAppInformation_TpAppInformation;
+static int hf_org_csapi_cs_TpAppInformation_Timestamp;
+static int hf_org_csapi_policy_TpPolicyType_TpPolicyType;
+static int hf_org_csapi_policy_TpPolicyType_SimpleType;
+static int hf_org_csapi_policy_TpPolicyType_StructuredType;
+static int hf_org_csapi_policy_TpPolicyType_XMLString;
+static int hf_org_csapi_pam_TpPAMContextData_TpPAMContextData;
+static int hf_org_csapi_pam_TpPAMContextData_Dummy;
+static int hf_org_csapi_pam_TpPAMEventInfo_TpPAMEventInfo;
+static int hf_org_csapi_pam_TpPAMNotificationInfo_TpPAMNotificationInfo;
+static int hf_org_csapi_pam_TpPAMPreferenceData_TpPAMPreferenceData;
+static int hf_org_csapi_pam_TpPAMPreferenceData_Dummy;
+static int hf_org_csapi_mmm_TpFolderInfoProperty_TpFolderInfoProperty;
+static int hf_org_csapi_mmm_TpFolderInfoProperty_FolderDateCreated;
+static int hf_org_csapi_mmm_TpFolderInfoProperty_FolderDateChanged;
+static int hf_org_csapi_mmm_TpFolderInfoProperty_FolderSize;
+static int hf_org_csapi_mmm_TpFolderInfoProperty_FolderNumberOfMessages;
+static int hf_org_csapi_mmm_TpFolderInfoProperty_Dummy;
+static int hf_org_csapi_mmm_TpMailboxInfoProperty_TpMailboxInfoProperty;
+static int hf_org_csapi_mmm_TpMailboxInfoProperty_MailboxOwner;
+static int hf_org_csapi_mmm_TpMailboxInfoProperty_MailboxDateCreated;
+static int hf_org_csapi_mmm_TpMailboxInfoProperty_MailboxDateChanged;
+static int hf_org_csapi_mmm_TpMailboxInfoProperty_MailboxSize;
+static int hf_org_csapi_mmm_TpMailboxInfoProperty_Dummy;
+static int hf_org_csapi_mmm_TpMessageInfoProperty_TpMessageInfoProperty;
+static int hf_org_csapi_mmm_TpMessageInfoProperty_MessageDateCreated;
+static int hf_org_csapi_mmm_TpMessageInfoProperty_MessageDateReceived;
+static int hf_org_csapi_mmm_TpMessageInfoProperty_MessageDateChanged;
+static int hf_org_csapi_mmm_TpMessageInfoProperty_MessageSize;
+static int hf_org_csapi_mmm_TpMessageInfoProperty_MessageStatus;
+static int hf_org_csapi_mmm_TpMessageInfoProperty_Dummy;
+static int hf_org_csapi_mmm_TpMessageHeaderField_TpMessageHeaderField;
+static int hf_org_csapi_mmm_TpMessageHeaderField_DateSent;
+static int hf_org_csapi_mmm_TpMessageHeaderField_From_loop;
+static int hf_org_csapi_mmm_TpMessageHeaderField_ReplyTo_loop;
+static int hf_org_csapi_mmm_TpMessageHeaderField_To_loop;
+static int hf_org_csapi_mmm_TpMessageHeaderField_Cc_loop;
+static int hf_org_csapi_mmm_TpMessageHeaderField_Bcc_loop;
+static int hf_org_csapi_mmm_TpMessageHeaderField_RFC822MessageID;
+static int hf_org_csapi_mmm_TpMessageHeaderField_InReplyTo_loop;
+static int hf_org_csapi_mmm_TpMessageHeaderField_InReplyTo;
+static int hf_org_csapi_mmm_TpMessageHeaderField_References_loop;
+static int hf_org_csapi_mmm_TpMessageHeaderField_References;
+static int hf_org_csapi_mmm_TpMessageHeaderField_Subject;
+static int hf_org_csapi_mmm_TpMessageHeaderField_Comments;
+static int hf_org_csapi_mmm_TpMessageHeaderField_Keywords_loop;
+static int hf_org_csapi_mmm_TpMessageHeaderField_Keywords;
+static int hf_org_csapi_mmm_TpMessageHeaderField_MimeVersion;
+static int hf_org_csapi_mmm_TpMessageHeaderField_MimeContent;
+static int hf_org_csapi_mmm_TpMessageHeaderField_MimeEncoding;
+static int hf_org_csapi_mmm_TpMessageHeaderField_MimeID;
+static int hf_org_csapi_mmm_TpMessageHeaderField_MimeDescription;
+static int hf_org_csapi_mmm_TpMessageHeaderField_MimeDisposition;
+static int hf_org_csapi_mmm_TpMessageHeaderField_Priority;
+static int hf_org_csapi_mmm_TpDeliveryTime_TpDeliveryTime;
+static int hf_org_csapi_mmm_TpDeliveryTime_DeliveryTime;
+static int hf_org_csapi_mmm_TpDeliveryTime_Dummy;
+static int hf_org_csapi_mmm_TpMessageTreatment_TpMessageTreatment;
+static int hf_org_csapi_mmm_TpMessageTreatment_DeliveryReport;
+static int hf_org_csapi_mmm_TpMessageTreatment_BillingID;
+static int hf_org_csapi_mmm_TpMessageTreatment_ValidityTime;
+static int hf_org_csapi_mmm_TpMessagingEventCriteria_TpMessagingEventCriteria;
+static int hf_org_csapi_mmm_TpMessagingEventCriteria_Dummy;
+static int hf_org_csapi_mmm_TpMessagingEventInfo_TpMessagingEventInfo;
+static int hf_org_csapi_mmm_TpMessagingEventInfo_EventNameUndefined;
         /* Expert info filters */
-static expert_field ei_parlay_unknown_giop_msg = EI_INIT;
-static expert_field ei_parlay_unknown_exception = EI_INIT;
-static expert_field ei_parlay_unknown_reply_status = EI_INIT;
+static expert_field ei_parlay_unknown_giop_msg;
+static expert_field ei_parlay_unknown_exception;
+static expert_field ei_parlay_unknown_reply_status;
 
 
 static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset);
diff --git a/epan/dissectors/packet-pathport.c b/epan/dissectors/packet-pathport.c
index 1f0bc613bf..3d66bce13e 100644
--- a/epan/dissectors/packet-pathport.c
+++ b/epan/dissectors/packet-pathport.c
@@ -34,39 +34,39 @@ void proto_register_pathport(void);
 static dissector_handle_t pathport_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_pathport = -1;
+static int proto_pathport;
 
 /* Initialize the subtree pointers */
-static gint ett_pathport = -1;
-static gint ett_pp_pdu = -1;
-static gint ett_pp_tlv = -1;
-static gint ett_pp_data = -1;
-
-static int hf_pp_prot = -1;
-static int hf_pp_reserved = -1;
-static int hf_pp_version = -1;
-static int hf_pp_seq = -1;
-static int hf_pp_src = -1;
-static int hf_pp_dst = -1;
-static int hf_pp_data_encoding = -1;
-static int hf_pp_data_len = -1;
-static int hf_pp_data_start_code = -1;
-static int hf_pp_data_dst = -1;
-static int hf_pp_data_levels = -1;
-static int hf_pp_arp_id = -1;
-static int hf_pp_arp_manuf = -1;
-static int hf_pp_arp_class = -1;
-static int hf_pp_arp_type = -1;
-static int hf_pp_arp_numdmx = -1;
-static int hf_pp_arp_ip = -1;
-static int hf_pp_get_type = -1;
-static int hf_pp_pdu_type = -1;
-static int hf_pp_pdu_len = -1;
-static int hf_pp_pdu_payload = -1;
-static int hf_pp_pid_type = -1;
-static int hf_pp_pid_len = -1;
-static int hf_pp_pid_value = -1;
-static int hf_pp_pid_pad_bytes = -1;
+static gint ett_pathport;
+static gint ett_pp_pdu;
+static gint ett_pp_tlv;
+static gint ett_pp_data;
+
+static int hf_pp_prot;
+static int hf_pp_reserved;
+static int hf_pp_version;
+static int hf_pp_seq;
+static int hf_pp_src;
+static int hf_pp_dst;
+static int hf_pp_data_encoding;
+static int hf_pp_data_len;
+static int hf_pp_data_start_code;
+static int hf_pp_data_dst;
+static int hf_pp_data_levels;
+static int hf_pp_arp_id;
+static int hf_pp_arp_manuf;
+static int hf_pp_arp_class;
+static int hf_pp_arp_type;
+static int hf_pp_arp_numdmx;
+static int hf_pp_arp_ip;
+static int hf_pp_get_type;
+static int hf_pp_pdu_type;
+static int hf_pp_pdu_len;
+static int hf_pp_pdu_payload;
+static int hf_pp_pid_type;
+static int hf_pp_pid_len;
+static int hf_pp_pid_value;
+static int hf_pp_pid_pad_bytes;
 
 /* Begin field and constant declarations */
 #define PP_ID_BCAST        0xffffffff
diff --git a/epan/dissectors/packet-pcap_pktdata.c b/epan/dissectors/packet-pcap_pktdata.c
index e94c61753d..c39da7a264 100644
--- a/epan/dissectors/packet-pcap_pktdata.c
+++ b/epan/dissectors/packet-pcap_pktdata.c
@@ -23,16 +23,16 @@
 void proto_register_pcap_pktdata(void);
 void proto_reg_handoff_pcap_pktdata(void);
 
-static int proto_pcap_pktdata = -1;
+static int proto_pcap_pktdata;
 
-static int hf_pcap_pktdata_pseudoheader = -1;
-static int hf_pcap_pktdata_pseudoheader_bluetooth_direction = -1;
-static int hf_pcap_pktdata_undecoded_data = -1;
+static int hf_pcap_pktdata_pseudoheader;
+static int hf_pcap_pktdata_pseudoheader_bluetooth_direction;
+static int hf_pcap_pktdata_undecoded_data;
 
-static gint ett_pcap_pktdata_pseudoheader = -1;
+static gint ett_pcap_pktdata_pseudoheader;
 
-static expert_field ei_pcap_pktdata_linktype_unknown = EI_INIT;
-static expert_field ei_pcap_pktdata_cant_generate_phdr = EI_INIT;
+static expert_field ei_pcap_pktdata_linktype_unknown;
+static expert_field ei_pcap_pktdata_cant_generate_phdr;
 
 static dissector_table_t wtap_encap_table;
 
diff --git a/epan/dissectors/packet-pcaplog.c b/epan/dissectors/packet-pcaplog.c
index ac4cab5762..4753a3def9 100644
--- a/epan/dissectors/packet-pcaplog.c
+++ b/epan/dissectors/packet-pcaplog.c
@@ -24,16 +24,16 @@
 void proto_reg_handoff_pcaplog(void);
 void proto_register_pcaplog(void);
 
-static int proto_pcaplog = -1;
-static int hf_pcaplog_type = -1;
-static int hf_pcaplog_length = -1;
-static int hf_pcaplog_data = -1;
+static int proto_pcaplog;
+static int hf_pcaplog_type;
+static int hf_pcaplog_length;
+static int hf_pcaplog_data;
 
 static dissector_handle_t pcaplog_handle;
 static dissector_handle_t xml_handle;
 
-static int ett_pcaplog = -1;
-static int ett_pcaplog_data = -1;
+static int ett_pcaplog;
+static int ett_pcaplog_data;
 
 static int
 dissect_pcaplog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
diff --git a/epan/dissectors/packet-pcapng_block.c b/epan/dissectors/packet-pcapng_block.c
index 34212b6f56..d7a2b9ac37 100644
--- a/epan/dissectors/packet-pcapng_block.c
+++ b/epan/dissectors/packet-pcapng_block.c
@@ -19,7 +19,7 @@ void proto_reg_handoff_pcapng_block(void);
 
 static dissector_handle_t pcapng_block_handle;
 
-static int proto_pcapng_block = -1;
+static int proto_pcapng_block;
 
 static dissector_table_t pcapng_block_type_dissector_table;
 
diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c
index 684b7a3b72..3145e3d93f 100644
--- a/epan/dissectors/packet-pcep.c
+++ b/epan/dissectors/packet-pcep.c
@@ -330,503 +330,503 @@ static dissector_handle_t pcep_handle;
 #define PCEP_SUBOBJ_SRV6_FLAGS_T    0x004
 #define PCEP_SUBOBJ_SRV6_FLAGS_V    0x008
 
-static int proto_pcep = -1;
-
-static gint hf_pcep_endpoint_p2mp_leaf= -1;
-static gint hf_pcep_hdr_msg_flags_reserved= -1;
-static gint hf_pcep_hdr_obj_flags = -1;
-static gint hf_pcep_hdr_obj_flags_reserved= -1;
-static gint hf_pcep_hdr_obj_flags_p= -1;
-static gint hf_pcep_hdr_obj_flags_i= -1;
-static gint hf_pcep_open_flags_res = -1;
-static gint hf_pcep_rp_flags_pri = -1;
-static gint hf_pcep_rp_flags_r = -1;
-static gint hf_pcep_rp_flags_b = -1;
-static gint hf_pcep_rp_flags_o = -1;
-static gint hf_pcep_rp_flags_v = -1;
-static gint hf_pcep_rp_flags_s = -1;
-static gint hf_pcep_rp_flags_p = -1;
-static gint hf_pcep_rp_flags_d = -1;
-static gint hf_pcep_rp_flags_m = -1;
-static gint hf_pcep_rp_flags_e = -1;
-static gint hf_pcep_rp_flags_n = -1;
-static gint hf_pcep_rp_flags_f = -1;
-static gint hf_pcep_rp_flags_c = -1;
-static gint hf_pcep_rp_flags_reserved = -1;
-static gint hf_pcep_no_path_flags_c = -1;
-static gint hf_pcep_metric_flags_c = -1;
-static gint hf_pcep_metric_flags_b = -1;
-static gint hf_pcep_lspa_flags_l = -1;
-static gint hf_pcep_svec_flags_l = -1;
-static gint hf_pcep_svec_flags_n = -1;
-static gint hf_pcep_svec_flags_s = -1;
-static gint hf_pcep_svec_flags_d = -1;
-static gint hf_pcep_svec_flags_p = -1;
-static gint hf_pcep_xro_flags_f = -1;
-static gint hf_pcep_obj_monitoring_flags_reserved = -1;
-static gint hf_pcep_obj_monitoring_flags_l= -1;
-static gint hf_pcep_obj_monitoring_flags_g= -1;
-static gint hf_pcep_obj_monitoring_flags_p= -1;
-static gint hf_pcep_obj_monitoring_flags_c= -1;
-static gint hf_pcep_obj_monitoring_flags_i= -1;
-static gint hf_pcep_obj_monitoring_monitoring_id_number = -1;
-static gint hf_pcep_obj_pcc_id_req_ipv4 = -1;
-static gint hf_pcep_obj_pcc_id_req_ipv6 = -1;
-static gint hf_pcep_obj_pce_id_ipv4 = -1;
-static gint hf_pcep_obj_pce_id_ipv6 = -1;
-static gint hf_pcep_obj_proc_time_flags_reserved = -1;
-static gint hf_pcep_obj_proc_time_flags_e = -1;
-static gint hf_pcep_obj_proc_time_cur_proc_time = -1;
-static gint hf_pcep_obj_proc_time_min_proc_time = -1;
-static gint hf_pcep_obj_proc_time_max_proc_time = -1;
-static gint hf_pcep_obj_proc_time_ave_proc_time = -1;
-static gint hf_pcep_obj_proc_time_var_proc_time = -1;
-static gint hf_pcep_obj_overload_duration = -1;
-static gint hf_pcep_subobj_flags_lpa= -1;
-static gint hf_pcep_subobj_flags_lpu= -1;
-static gint hf_pcep_subobj_label_flags_gl= -1;
-static gint hf_pcep_no_path_tlvs_pce = -1;
-static gint hf_pcep_no_path_tlvs_unk_dest = -1;
-static gint hf_pcep_no_path_tlvs_unk_src = -1;
-static gint hf_pcep_no_path_tlvs_brpc = -1;
-static gint hf_pcep_no_path_tlvs_pks = -1;
-static gint hf_pcep_no_path_tlvs_no_gco_migr = -1;
-static gint hf_pcep_no_path_tlvs_no_gco_soln = -1;
-static gint hf_pcep_no_path_tlvs_p2mp = -1;
-static gint hf_PCEPF_MSG = -1;
-static gint hf_PCEPF_OBJECT_CLASS = -1;
-static gint hf_PCEPF_OBJ_OPEN = -1;
-static gint hf_PCEPF_OBJ_RP = -1;
-static gint hf_PCEPF_OBJ_NO_PATH = -1;
-static gint hf_PCEPF_OBJ_END_POINT = -1;
-static gint hf_PCEPF_OBJ_BANDWIDTH = -1;
-static gint hf_PCEPF_OBJ_METRIC = -1;
-static gint hf_PCEPF_OBJ_EXPLICIT_ROUTE = -1;
-static gint hf_PCEPF_OBJ_RECORD_ROUTE = -1;
-static gint hf_PCEPF_OBJ_LSPA = -1;
-static gint hf_PCEPF_OBJ_IRO = -1;
-static gint hf_PCEPF_OBJ_SVEC = -1;
-static gint hf_PCEPF_OBJ_NOTIFICATION = -1;
-static gint hf_PCEPF_OBJ_PCEP_ERROR = -1;
-static gint hf_PCEPF_OBJ_LOAD_BALANCING = -1;
-static gint hf_PCEPF_OBJ_CLOSE = -1;
-static gint hf_PCEPF_OBJ_PATH_KEY = -1;
-static gint hf_PCEPF_OBJ_XRO = -1;
-static gint hf_PCEPF_OBJ_MONITORING = -1;
-static gint hf_PCEPF_OBJ_PCC_ID_REQ = -1;
-static gint hf_PCEPF_OBJ_OF = -1;
-static gint hf_PCEPF_OBJ_CLASSTYPE = -1;
-static gint hf_PCEPF_OBJ_GLOBAL_CONSTRAINTS = -1;
-static gint hf_PCEPF_OBJ_PCE_ID = -1;
-static gint hf_PCEPF_OBJ_PROC_TIME = -1;
-static gint hf_PCEPF_OBJ_OVERLOAD = -1;
-static gint hf_PCEPF_OBJ_UNREACH_DESTINATION = -1;
-static gint hf_PCEPF_OBJ_SERO = -1;
-static gint hf_PCEPF_OBJ_SRRO = -1;
-static gint hf_PCEPF_OBJ_BRANCH_NODE_CAPABILITY = -1;
-static gint hf_PCEPF_OBJ_LSP = -1;
-static gint hf_PCEPF_OBJ_SRP = -1;
-static gint hf_PCEPF_OBJ_VENDOR_INFORMATION = -1;
-static gint hf_PCEPF_OBJ_BU = -1;
-static gint hf_PCEPF_OBJ_INTER_LAYER = -1;
-static gint hf_PCEPF_OBJ_SWITCH_LAYER = -1;
-static gint hf_PCEPF_OBJ_REQ_ADAP_CAP = -1;
-static gint hf_PCEPF_OBJ_SERVER_IND = -1;
-static gint hf_PCEPF_OBJ_ASSOCIATION = -1;
-static gint hf_PCEPF_OBJ_S2LS = -1;
-static gint hf_PCEPF_OBJ_WA = -1;
-static gint hf_PCEPF_OBJ_FLOWSPEC = -1;
-static gint hf_PCEPF_OBJ_CCI_TYPE = -1;
-static gint hf_PCEPF_OBJ_PATH_ATTRIB = -1;
-static gint hf_PCEPF_OBJ_UNKNOWN_TYPE = -1;
-static gint hf_PCEPF_NOTI_TYPE = -1;
-static gint hf_PCEPF_NOTI_VAL1 = -1;
-static gint hf_PCEPF_NOTI_VAL2 = -1;
-static gint hf_PCEPF_ERROR_TYPE = -1;
-static gint hf_PCEPF_ERROR_VALUE = -1;
-static gint hf_PCEPF_SUBOBJ = -1;
-static gint hf_PCEPF_SUBOBJ_7F = -1;
-static gint hf_PCEPF_SUBOBJ_IPv4 = -1;
-static gint hf_PCEPF_SUBOBJ_IPv6 = -1;
-static gint hf_PCEPF_SUBOBJ_LABEL_CONTROL = -1;
-static gint hf_PCEPF_SUBOBJ_UNNUM_INTERFACEID = -1;
-static gint hf_PCEPF_SUBOBJ_AUTONOMOUS_SYS_NUM = -1;
-static gint hf_PCEPF_SUBOBJ_SRLG = -1;
-static gint hf_PCEPF_SUBOBJ_EXRS = -1;
-static gint hf_PCEPF_SUBOBJ_PKSv4 = -1;
-static gint hf_PCEPF_SUBOBJ_PKSv6 = -1;
-static gint hf_PCEPF_SUBOBJ_XRO = -1;
-static gint hf_PCEPF_SUBOBJ_SR = -1;
-static gint hf_PCEPF_SUBOBJ_SRv6 = -1;
+static int proto_pcep;
+
+static gint hf_pcep_endpoint_p2mp_leaf;
+static gint hf_pcep_hdr_msg_flags_reserved;
+static gint hf_pcep_hdr_obj_flags;
+static gint hf_pcep_hdr_obj_flags_reserved;
+static gint hf_pcep_hdr_obj_flags_p;
+static gint hf_pcep_hdr_obj_flags_i;
+static gint hf_pcep_open_flags_res;
+static gint hf_pcep_rp_flags_pri;
+static gint hf_pcep_rp_flags_r;
+static gint hf_pcep_rp_flags_b;
+static gint hf_pcep_rp_flags_o;
+static gint hf_pcep_rp_flags_v;
+static gint hf_pcep_rp_flags_s;
+static gint hf_pcep_rp_flags_p;
+static gint hf_pcep_rp_flags_d;
+static gint hf_pcep_rp_flags_m;
+static gint hf_pcep_rp_flags_e;
+static gint hf_pcep_rp_flags_n;
+static gint hf_pcep_rp_flags_f;
+static gint hf_pcep_rp_flags_c;
+static gint hf_pcep_rp_flags_reserved;
+static gint hf_pcep_no_path_flags_c;
+static gint hf_pcep_metric_flags_c;
+static gint hf_pcep_metric_flags_b;
+static gint hf_pcep_lspa_flags_l;
+static gint hf_pcep_svec_flags_l;
+static gint hf_pcep_svec_flags_n;
+static gint hf_pcep_svec_flags_s;
+static gint hf_pcep_svec_flags_d;
+static gint hf_pcep_svec_flags_p;
+static gint hf_pcep_xro_flags_f;
+static gint hf_pcep_obj_monitoring_flags_reserved;
+static gint hf_pcep_obj_monitoring_flags_l;
+static gint hf_pcep_obj_monitoring_flags_g;
+static gint hf_pcep_obj_monitoring_flags_p;
+static gint hf_pcep_obj_monitoring_flags_c;
+static gint hf_pcep_obj_monitoring_flags_i;
+static gint hf_pcep_obj_monitoring_monitoring_id_number;
+static gint hf_pcep_obj_pcc_id_req_ipv4;
+static gint hf_pcep_obj_pcc_id_req_ipv6;
+static gint hf_pcep_obj_pce_id_ipv4;
+static gint hf_pcep_obj_pce_id_ipv6;
+static gint hf_pcep_obj_proc_time_flags_reserved;
+static gint hf_pcep_obj_proc_time_flags_e;
+static gint hf_pcep_obj_proc_time_cur_proc_time;
+static gint hf_pcep_obj_proc_time_min_proc_time;
+static gint hf_pcep_obj_proc_time_max_proc_time;
+static gint hf_pcep_obj_proc_time_ave_proc_time;
+static gint hf_pcep_obj_proc_time_var_proc_time;
+static gint hf_pcep_obj_overload_duration;
+static gint hf_pcep_subobj_flags_lpa;
+static gint hf_pcep_subobj_flags_lpu;
+static gint hf_pcep_subobj_label_flags_gl;
+static gint hf_pcep_no_path_tlvs_pce;
+static gint hf_pcep_no_path_tlvs_unk_dest;
+static gint hf_pcep_no_path_tlvs_unk_src;
+static gint hf_pcep_no_path_tlvs_brpc;
+static gint hf_pcep_no_path_tlvs_pks;
+static gint hf_pcep_no_path_tlvs_no_gco_migr;
+static gint hf_pcep_no_path_tlvs_no_gco_soln;
+static gint hf_pcep_no_path_tlvs_p2mp;
+static gint hf_PCEPF_MSG;
+static gint hf_PCEPF_OBJECT_CLASS;
+static gint hf_PCEPF_OBJ_OPEN;
+static gint hf_PCEPF_OBJ_RP;
+static gint hf_PCEPF_OBJ_NO_PATH;
+static gint hf_PCEPF_OBJ_END_POINT;
+static gint hf_PCEPF_OBJ_BANDWIDTH;
+static gint hf_PCEPF_OBJ_METRIC;
+static gint hf_PCEPF_OBJ_EXPLICIT_ROUTE;
+static gint hf_PCEPF_OBJ_RECORD_ROUTE;
+static gint hf_PCEPF_OBJ_LSPA;
+static gint hf_PCEPF_OBJ_IRO;
+static gint hf_PCEPF_OBJ_SVEC;
+static gint hf_PCEPF_OBJ_NOTIFICATION;
+static gint hf_PCEPF_OBJ_PCEP_ERROR;
+static gint hf_PCEPF_OBJ_LOAD_BALANCING;
+static gint hf_PCEPF_OBJ_CLOSE;
+static gint hf_PCEPF_OBJ_PATH_KEY;
+static gint hf_PCEPF_OBJ_XRO;
+static gint hf_PCEPF_OBJ_MONITORING;
+static gint hf_PCEPF_OBJ_PCC_ID_REQ;
+static gint hf_PCEPF_OBJ_OF;
+static gint hf_PCEPF_OBJ_CLASSTYPE;
+static gint hf_PCEPF_OBJ_GLOBAL_CONSTRAINTS;
+static gint hf_PCEPF_OBJ_PCE_ID;
+static gint hf_PCEPF_OBJ_PROC_TIME;
+static gint hf_PCEPF_OBJ_OVERLOAD;
+static gint hf_PCEPF_OBJ_UNREACH_DESTINATION;
+static gint hf_PCEPF_OBJ_SERO;
+static gint hf_PCEPF_OBJ_SRRO;
+static gint hf_PCEPF_OBJ_BRANCH_NODE_CAPABILITY;
+static gint hf_PCEPF_OBJ_LSP;
+static gint hf_PCEPF_OBJ_SRP;
+static gint hf_PCEPF_OBJ_VENDOR_INFORMATION;
+static gint hf_PCEPF_OBJ_BU;
+static gint hf_PCEPF_OBJ_INTER_LAYER;
+static gint hf_PCEPF_OBJ_SWITCH_LAYER;
+static gint hf_PCEPF_OBJ_REQ_ADAP_CAP;
+static gint hf_PCEPF_OBJ_SERVER_IND;
+static gint hf_PCEPF_OBJ_ASSOCIATION;
+static gint hf_PCEPF_OBJ_S2LS;
+static gint hf_PCEPF_OBJ_WA;
+static gint hf_PCEPF_OBJ_FLOWSPEC;
+static gint hf_PCEPF_OBJ_CCI_TYPE;
+static gint hf_PCEPF_OBJ_PATH_ATTRIB;
+static gint hf_PCEPF_OBJ_UNKNOWN_TYPE;
+static gint hf_PCEPF_NOTI_TYPE;
+static gint hf_PCEPF_NOTI_VAL1;
+static gint hf_PCEPF_NOTI_VAL2;
+static gint hf_PCEPF_ERROR_TYPE;
+static gint hf_PCEPF_ERROR_VALUE;
+static gint hf_PCEPF_SUBOBJ;
+static gint hf_PCEPF_SUBOBJ_7F;
+static gint hf_PCEPF_SUBOBJ_IPv4;
+static gint hf_PCEPF_SUBOBJ_IPv6;
+static gint hf_PCEPF_SUBOBJ_LABEL_CONTROL;
+static gint hf_PCEPF_SUBOBJ_UNNUM_INTERFACEID;
+static gint hf_PCEPF_SUBOBJ_AUTONOMOUS_SYS_NUM;
+static gint hf_PCEPF_SUBOBJ_SRLG;
+static gint hf_PCEPF_SUBOBJ_EXRS;
+static gint hf_PCEPF_SUBOBJ_PKSv4;
+static gint hf_PCEPF_SUBOBJ_PKSv6;
+static gint hf_PCEPF_SUBOBJ_XRO;
+static gint hf_PCEPF_SUBOBJ_SR;
+static gint hf_PCEPF_SUBOBJ_SRv6;
 #if 0
-static gint hf_PCEPF_SUB_XRO_ATTRIB = -1;
+static gint hf_PCEPF_SUB_XRO_ATTRIB;
 #endif
 
-static gint hf_pcep_obj_open_type = -1;
-static gint hf_pcep_obj_rp_type = -1;
-static gint hf_pcep_obj_no_path_type = -1;
-static gint hf_pcep_obj_end_point_type = -1;
-static gint hf_pcep_obj_bandwidth_type = -1;
-static gint hf_pcep_obj_metric_type = -1;
-static gint hf_pcep_obj_explicit_route_type = -1;
-static gint hf_pcep_obj_record_route_type = -1;
-static gint hf_pcep_obj_lspa_type = -1;
-static gint hf_pcep_obj_iro_type = -1;
-static gint hf_pcep_obj_svec_type = -1;
-static gint hf_pcep_obj_notification_type = -1;
-static gint hf_pcep_obj_pcep_error_type = -1;
-static gint hf_pcep_obj_load_balancing_type = -1;
-static gint hf_pcep_obj_close_type = -1;
-static gint hf_pcep_obj_path_key_type = -1;
-static gint hf_pcep_obj_xro_type = -1;
-static gint hf_pcep_obj_monitoring_type = -1;
-static gint hf_pcep_obj_pcc_id_req_type = -1;
-static gint hf_pcep_obj_of_type = -1;
-static gint hf_pcep_obj_classtype = -1;
-static gint hf_pcep_obj_global_constraints = -1;
-static gint hf_pcep_obj_pce_id_type = -1;
-static gint hf_pcep_obj_proc_time_type = -1;
-static gint hf_pcep_obj_overload_type = -1;
-static gint hf_pcep_obj_unreach_destination_type = -1;
-static gint hf_pcep_obj_sero_type = -1;
-static gint hf_pcep_obj_srro_type = -1;
-static gint hf_pcep_obj_branch_node_capability_type = -1;
-static gint hf_pcep_obj_lsp_type = -1;
-static gint hf_pcep_obj_srp_type = -1;
-static gint hf_pcep_obj_vendor_information_type = -1;
-static gint hf_pcep_obj_bu_type = -1;
-static gint hf_pcep_obj_inter_layer_type = -1;
-static gint hf_pcep_obj_switch_layer_type = -1;
-static gint hf_pcep_obj_req_adap_cap_type = -1;
-static gint hf_pcep_obj_server_ind_type = -1;
-static gint hf_pcep_obj_association_type = -1;
-static gint hf_pcep_obj_s2ls_type = -1;
-static gint hf_pcep_obj_wa_type = -1;
-static gint hf_pcep_obj_flowspec_type = -1;
-static gint hf_pcep_obj_cci_type = -1;
-static gint hf_pcep_obj_path_attrib_type = -1;
+static gint hf_pcep_obj_open_type;
+static gint hf_pcep_obj_rp_type;
+static gint hf_pcep_obj_no_path_type;
+static gint hf_pcep_obj_end_point_type;
+static gint hf_pcep_obj_bandwidth_type;
+static gint hf_pcep_obj_metric_type;
+static gint hf_pcep_obj_explicit_route_type;
+static gint hf_pcep_obj_record_route_type;
+static gint hf_pcep_obj_lspa_type;
+static gint hf_pcep_obj_iro_type;
+static gint hf_pcep_obj_svec_type;
+static gint hf_pcep_obj_notification_type;
+static gint hf_pcep_obj_pcep_error_type;
+static gint hf_pcep_obj_load_balancing_type;
+static gint hf_pcep_obj_close_type;
+static gint hf_pcep_obj_path_key_type;
+static gint hf_pcep_obj_xro_type;
+static gint hf_pcep_obj_monitoring_type;
+static gint hf_pcep_obj_pcc_id_req_type;
+static gint hf_pcep_obj_of_type;
+static gint hf_pcep_obj_classtype;
+static gint hf_pcep_obj_global_constraints;
+static gint hf_pcep_obj_pce_id_type;
+static gint hf_pcep_obj_proc_time_type;
+static gint hf_pcep_obj_overload_type;
+static gint hf_pcep_obj_unreach_destination_type;
+static gint hf_pcep_obj_sero_type;
+static gint hf_pcep_obj_srro_type;
+static gint hf_pcep_obj_branch_node_capability_type;
+static gint hf_pcep_obj_lsp_type;
+static gint hf_pcep_obj_srp_type;
+static gint hf_pcep_obj_vendor_information_type;
+static gint hf_pcep_obj_bu_type;
+static gint hf_pcep_obj_inter_layer_type;
+static gint hf_pcep_obj_switch_layer_type;
+static gint hf_pcep_obj_req_adap_cap_type;
+static gint hf_pcep_obj_server_ind_type;
+static gint hf_pcep_obj_association_type;
+static gint hf_pcep_obj_s2ls_type;
+static gint hf_pcep_obj_wa_type;
+static gint hf_pcep_obj_flowspec_type;
+static gint hf_pcep_obj_cci_type;
+static gint hf_pcep_obj_path_attrib_type;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_pcep_xro_obj_flags = -1;
-static int hf_pcep_open_obj_keepalive = -1;
-static int hf_pcep_request_id = -1;
-static int hf_pcep_lspa_obj_reserved = -1;
-static int hf_pcep_rp_obj_reserved = -1;
-static int hf_pcep_svec_obj_reserved = -1;
-static int hf_pcep_rp_obj_flags = -1;
-static int hf_pcep_lspa_obj_exclude_any = -1;
-static int hf_pcep_subobj_srlg_attribute = -1;
-static int hf_pcep_end_point_obj_destination_ipv4_address = -1;
-static int hf_pcep_subobj_unnumb_interfaceID_reserved_xroobj = -1;
-static int hf_pcep_balancing_obj_flags = -1;
-static int hf_pcep_subobj_unnumb_interfaceID_reserved = -1;
-static int hf_pcep_lspa_obj_setup_priority = -1;
-static int hf_pcep_svec_obj_request_id_number = -1;
-static int hf_pcep_end_point_obj_source_ipv4_address = -1;
-static int hf_pcep_open_obj_sid = -1;
-static int hf_pcep_subobj_ipv6_padding = -1;
-static int hf_pcep_notification_obj_reserved = -1;
-static int hf_pcep_close_obj_reason = -1;
-static int hf_pcep_subobj_ipv4_attribute = -1;
-static int hf_pcep_obj_overload_flags = -1;
-static int hf_pcep_balancing_obj_maximum_number_of_te_lsps = -1;
-static int hf_pcep_subobj_exrs_reserved = -1;
-static int hf_pcep_subobj_label_control_length = -1;
-static int hf_pcep_subobj_ipv4_length = -1;
-static int hf_pcep_subobj_ipv6_ipv6 = -1;
-static int hf_pcep_lspa_obj_holding_priority = -1;
-static int hf_pcep_rp_obj_requested_id_number = -1;
-static int hf_pcep_subobj_pksv6_path_key = -1;
-static int hf_pcep_subobj_unnumb_interfaceID_router_id = -1;
-static int hf_pcep_subobj_pksv6_pce_id = -1;
-static int hf_pcep_tlv_padding = -1;
-static int hf_pcep_subobj_unnumb_interfaceID_flags = -1;
-static int hf_pcep_subobj_unnumb_interfaceID_length = -1;
-static int hf_pcep_obj_proc_time_reserved = -1;
-static int hf_pcep_object_type = -1;
-static int hf_pcep_subobj_pksv4_length = -1;
-static int hf_pcep_subobj_ipv6_prefix_length = -1;
-static int hf_pcep_subobj_ipv6_length = -1;
-static int hf_pcep_flags = -1;
-static int hf_pcep_no_path_obj_reserved = -1;
-static int hf_pcep_subobj_unnumb_interfaceID_interface_id = -1;
-static int hf_pcep_close_obj_flags = -1;
-static int hf_pcep_error_obj_flags = -1;
-static int hf_pcep_metric_obj_flags = -1;
-static int hf_pcep_subobj_autonomous_sys_num_reserved = -1;
-static int hf_pcep_subobj_pksv4_path_key = -1;
-static int hf_pcep_subobj_label_control_flags = -1;
-static int hf_pcep_notification_obj_value = -1;
-static int hf_pcep_subobj_label_control_label = -1;
-static int hf_pcep_metric_obj_metric_value = -1;
-static int hf_pcep_no_path_obj_flags = -1;
-static int hf_pcep_obj_monitoring_reserved = -1;
-static int hf_pcep_obj_of_code = -1;
-static int hf_pcep_subobj_label_control_u = -1;
-static int hf_pcep_subobj_autonomous_sys_num_length = -1;
-static int hf_pcep_message_length = -1;
-static int hf_pcep_subobj_ipv4_prefix_length = -1;
-static int hf_pcep_xro_obj_reserved = -1;
-static int hf_pcep_subobj_pksv4_pce_id = -1;
-static int hf_pcep_subobj_pksv6_length = -1;
-static int hf_pcep_end_point_obj_destination_ipv6_address = -1;
-static int hf_pcep_subobj_autonomous_sys_num_as_number = -1;
-static int hf_pcep_notification_obj_flags = -1;
-static int hf_pcep_subobj_unnumb_interfaceID_attribute = -1;
-static int hf_pcep_object_length = -1;
-static int hf_pcep_tlv_data = -1;
-static int hf_pcep_balancing_obj_reserved = -1;
-static int hf_pcep_subobj_ipv4_flags = -1;
-static int hf_pcep_subobj_ipv6_attribute = -1;
-static int hf_pcep_subobj_srlg_id = -1;
-static int hf_pcep_balancing_obj_minimum_bandwidth = -1;
-static int hf_pcep_subobj_unnumb_interfaceID_reserved_rrobj = -1;
-static int hf_pcep_error_obj_reserved = -1;
-static int hf_pcep_obj_overload_reserved = -1;
-static int hf_pcep_notification_obj_type = -1;
-static int hf_pcep_subobj_ipv6_flags = -1;
-static int hf_pcep_obj_monitoring_flags = -1;
-static int hf_pcep_subobj_exrs_length = -1;
-static int hf_pcep_obj_proc_time_flags = -1;
-static int hf_pcep_subobj_label_control_reserved = -1;
-static int hf_pcep_version = -1;
-static int hf_pcep_lspa_obj_flags = -1;
-static int hf_pcep_subobj_ipv4_ipv4 = -1;
-static int hf_pcep_tlv_type = -1;
-static int hf_pcep_subobj_autonomous_sys_num_optional_as_number_high_octets = -1;
-static int hf_pcep_open_obj_deadtime = -1;
-static int hf_pcep_bandwidth = -1;
-static int hf_pcep_tlv_length = -1;
-static int hf_pcep_subobj_srlg_reserved = -1;
-static int hf_pcep_metric_obj_type = -1;
-static int hf_pcep_metric_obj_reserved = -1;
-static int hf_pcep_svec_obj_flags = -1;
-static int hf_pcep_open_obj_pcep_version = -1;
-static int hf_pcep_open_obj_flags = -1;
-static int hf_pcep_end_point_obj_source_ipv6_address = -1;
-static int hf_pcep_lspa_obj_include_any = -1;
-static int hf_pcep_lspa_obj_include_all = -1;
-static int hf_pcep_subobj_ipv4_padding = -1;
-static int hf_pcep_subobj_srlg_length = -1;
-static int hf_pcep_subobj_autonomous_sys_num_attribute = -1;
-static int hf_pcep_close_obj_reserved = -1;
-static int hf_pcep_subobj_label_control_c_type = -1;
-static int hf_pcep_subobj_iro_autonomous_sys_num_l = -1;
-static int hf_pcep_subobj_autonomous_sys_num_x = -1;
-static int hf_pcep_subobj_label_control_l = -1;
-static int hf_pcep_subobj_exrs_l = -1;
-static int hf_pcep_subobj_unnumb_interfaceID_x = -1;
-static int hf_pcep_subobj_autonomous_sys_num_l = -1;
-static int hf_pcep_subobj_pksv6_l = -1;
-static int hf_pcep_subobj_srlg_x = -1;
-static int hf_pcep_subobj_ipv4_x = -1;
-static int hf_pcep_subobj_iro_unnumb_interfaceID_l = -1;
-static int hf_pcep_subobj_exrs_type = -1;
-static int hf_pcep_subobj_ipv4_l = -1;
-static int hf_pcep_of_code = -1;
-static int hf_pcep_subobj_ipv6_x = -1;
-static int hf_pcep_no_path_obj_nature_of_issue = -1;
-static int hf_pcep_subobj_ipv6_l = -1;
-static int hf_pcep_subobj_pksv4_l = -1;
-static int hf_pcep_subobj_iro_ipv6_l = -1;
-static int hf_pcep_subobj_unnumb_interfaceID_l = -1;
-static int hf_pcep_subobj_iro_ipv4_l = -1;
-static int hf_pcep_subobj_sr_l = -1;
-static int hf_pcep_subobj_sr_length = -1;
-static int hf_pcep_subobj_sr_nt = -1;
-static int hf_pcep_subobj_sr_flags = -1;
-static int hf_pcep_subobj_sr_flags_m = -1;
-static int hf_pcep_subobj_sr_flags_c = -1;
-static int hf_pcep_subobj_sr_flags_s = -1;
-static int hf_pcep_subobj_sr_flags_f = -1;
-static int hf_pcep_subobj_sr_sid = -1;
-static int hf_pcep_subobj_sr_sid_label = -1;
-static int hf_pcep_subobj_sr_sid_tc = -1;
-static int hf_pcep_subobj_sr_sid_s = -1;
-static int hf_pcep_subobj_sr_sid_ttl = -1;
-static int hf_pcep_subobj_sr_nai_ipv4_node = -1;
-static int hf_pcep_subobj_sr_nai_ipv6_node = -1;
-static int hf_pcep_subobj_sr_nai_local_ipv4_addr = -1;
-static int hf_pcep_subobj_sr_nai_remote_ipv4_addr = -1;
-static int hf_pcep_subobj_sr_nai_local_ipv6_addr = -1;
-static int hf_pcep_subobj_sr_nai_remote_ipv6_addr = -1;
-static int hf_pcep_subobj_sr_nai_local_node_id = -1;
-static int hf_pcep_subobj_sr_nai_local_interface_id = -1;
-static int hf_pcep_subobj_sr_nai_remote_node_id = -1;
-static int hf_pcep_subobj_sr_nai_remote_interface_id = -1;
-static int hf_pcep_subobj_srv6_l = -1;
-static int hf_pcep_subobj_srv6_length = -1;
-static int hf_pcep_subobj_srv6_nt = -1;
-static int hf_pcep_subobj_srv6_flags = -1;
-static int hf_pcep_subobj_srv6_flags_s = -1;
-static int hf_pcep_subobj_srv6_flags_f = -1;
-static int hf_pcep_subobj_srv6_flags_t = -1;
-static int hf_pcep_subobj_srv6_flags_v = -1;
-static int hf_pcep_subobj_srv6_reserved = -1;
-static int hf_pcep_subobj_srv6_endpoint_behavior = -1;
-static int hf_pcep_subobj_srv6_sid = -1;
-static int hf_pcep_subobj_srv6_nai = -1;
-static int hf_pcep_subobj_srv6_nai_ipv6_node = -1;
-static int hf_pcep_subobj_srv6_nai_local_ipv6_addr = -1;
-static int hf_pcep_subobj_srv6_nai_remote_ipv6_addr = -1;
-static int hf_pcep_subobj_srv6_nai_local_interface_id = -1;
-static int hf_pcep_subobj_srv6_nai_remote_interface_id = -1;
-static int hf_pcep_subobj_srv6_sid_struct = -1;
-static int hf_pcep_subobj_srv6_sid_struct_lb_len = -1;
-static int hf_pcep_subobj_srv6_sid_struct_ln_len = -1;
-static int hf_pcep_subobj_srv6_sid_struct_fun_len = -1;
-static int hf_pcep_subobj_srv6_sid_struct_arg_len = -1;
-static int hf_pcep_subobj_srv6_sid_struct_reserved = -1;
-static int hf_pcep_subobj_srv6_sid_struct_flags = -1;
-
-static int hf_pcep_stateful_pce_capability_flags = -1;
-static int hf_pcep_lsp_update_capability = -1;
-static int hf_pcep_include_db_version = -1;
-static int hf_pcep_lsp_instantiation_capability = -1;
-static int hf_pcep_triggered_resync = -1;
-static int hf_pcep_delta_lsp_sync_capability = -1;
-static int hf_pcep_triggered_initial_sync = -1;
-static int hf_pcep_obj_lsp_flags = -1;
-static int hf_pcep_obj_lsp_plsp_id = -1;
-static int hf_pcep_obj_lsp_flags_d = -1;
-static int hf_pcep_obj_lsp_flags_s = -1;
-static int hf_pcep_obj_lsp_flags_r = -1;
-static int hf_pcep_obj_lsp_flags_a = -1;
-static int hf_pcep_obj_lsp_flags_o = -1;
-static int hf_pcep_obj_lsp_flags_c = -1;
-static int hf_pcep_obj_lsp_flags_reserved = -1;
-static int hf_pcep_obj_srp_flags = -1;
-static int hf_pcep_obj_srp_flags_r = -1;
-static int hf_pcep_obj_srp_id_number = -1;
-static int hf_pcep_symbolic_path_name = -1;
-static int hf_pcep_ipv4_lsp_id_tunnel_sender_address = -1;
-static int hf_pcep_ipv4_lsp_id_lsp_id = -1;
-static int hf_pcep_ipv4_lsp_id_tunnel_id = -1;
-static int hf_pcep_ipv4_lsp_id_extended_tunnel_id = -1;
-static int hf_pcep_ipv4_lsp_id_tunnel_endpoint_address = -1;
-static int hf_pcep_ipv6_lsp_id_tunnel_sender_address = -1;
-static int hf_pcep_ipv6_lsp_id_lsp_id = -1;
-static int hf_pcep_ipv6_lsp_id_tunnel_id = -1;
-static int hf_pcep_ipv6_lsp_id_extended_tunnel_id = -1;
-static int hf_pcep_ipv6_lsp_id_tunnel_endpoint_address = -1;
-static int hf_pcep_lsp_error_code = -1;
-static int hf_pcep_rsvp_user_error_spec = -1;
-static int hf_pcep_lsp_state_db_version_number = -1;
-static int hf_pcep_speaker_entity_id = -1;
-static int hf_pcep_path_setup_type_reserved24 = -1;
-static int hf_pcep_path_setup_type = -1;
-static int hf_pcep_path_setup_type_capability_reserved24 = -1;
-static int hf_pcep_path_setup_type_capability_psts = -1;
-static int hf_pcep_path_setup_type_capability_pst = -1;
-static int hf_pcep_sr_pce_capability_reserved = -1; //deprecated
-static int hf_pcep_sr_pce_capability_sub_tlv_reserved = -1;
-static int hf_pcep_sr_pce_capability_flags = -1; //deprecated
-static int hf_pcep_sr_pce_capability_sub_tlv_flags = -1;
-static int hf_pcep_sr_pce_capability_flags_l = -1; //deprecated
-static int hf_pcep_sr_pce_capability_sub_tlv_flags_x = -1;
-static int hf_pcep_sr_pce_capability_sub_tlv_flags_n = -1;
-static int hf_pcep_sr_pce_capability_msd = -1; //deprecated
-static int hf_pcep_sr_pce_capability_sub_tlv_msd = -1;
-static int hf_pcep_association_reserved = -1;
-static int hf_pcep_association_flags = -1;
-static int hf_pcep_association_flags_r = -1;
-static int hf_pcep_association_type = -1;
-static int hf_pcep_association_id = -1;
-static int hf_pcep_association_source_ipv4 = -1;
-static int hf_pcep_association_source_ipv6 = -1;
-static int hf_pcep_association_source_global = -1;
-static int hf_pcep_association_id_extended = -1;
-
-static int hf_pcep_association_id_extended_color = -1;
-static int hf_pcep_association_id_extended_ipv4_endpoint = -1;
-static int hf_pcep_association_id_extended_ipv6_endpoint = -1;
-static int hf_pcep_unreach_destination_obj_ipv4_address = -1;
-static int hf_pcep_unreach_destination_obj_ipv6_address = -1;
-
-static int hf_pcep_op_conf_assoc_range_reserved = -1;
-static int hf_pcep_op_conf_assoc_range_assoc_type = -1;
-static int hf_pcep_op_conf_assoc_range_start_assoc = -1;
-static int hf_pcep_op_conf_assoc_range_range = -1;
-
-static int hf_pcep_srcpag_info_color = -1;
-static int hf_pcep_srcpag_info_destination_endpoint = -1;
-static int hf_pcep_srcpag_info_preference = -1;
-
-
-static int hf_pcep_sr_policy_name = -1;
-static int hf_pcep_sr_policy_cpath_id_proto_origin = -1;
-static int hf_pcep_sr_policy_cpath_id_originator_asn = -1;
-static int hf_pcep_sr_policy_cpath_id_originator_address = -1;
-static int hf_pcep_sr_policy_cpath_id_discriminator = -1;
-static int hf_pcep_sr_policy_cpath_name = -1;
-static int hf_pcep_sr_policy_cpath_preference = -1;
-
-static int hf_pcep_enterprise_number = -1;
-static int hf_pcep_enterprise_specific_info = -1;
-static int hf_pcep_tlv_enterprise_number = -1;
-static int hf_pcep_tlv_enterprise_specific_info = -1;
-
-static int hf_pcep_bu_reserved = -1;
-static int hf_pcep_bu_butype = -1;
-static int hf_pcep_bu_utilization = -1;
-
-static int hf_pcep_path_setup_type_capability_sub_tlv_type = -1;
-static int hf_pcep_path_setup_type_capability_sub_tlv_length = -1;
-
-static gint ett_pcep = -1;
-static gint ett_pcep_hdr = -1;
-static gint ett_pcep_obj_open = -1;
-static gint ett_pcep_obj_request_parameters = -1;
-static gint ett_pcep_obj_no_path = -1;
-static gint ett_pcep_obj_end_point = -1;
-static gint ett_pcep_obj_bandwidth = -1;
-static gint ett_pcep_obj_metric = -1;
-static gint ett_pcep_obj_explicit_route = -1;
-static gint ett_pcep_obj_record_route = -1;
-static gint ett_pcep_obj_lspa = -1;
-static gint ett_pcep_obj_iro = -1;
-static gint ett_pcep_obj_svec = -1;
-static gint ett_pcep_obj_notification = -1;
-static gint ett_pcep_obj_error = -1;
-static gint ett_pcep_obj_load_balancing = -1;
-static gint ett_pcep_obj_close = -1;
-static gint ett_pcep_obj_path_key = -1;
-static gint ett_pcep_obj_xro = -1;
-static gint ett_pcep_obj_monitoring = -1;
-static gint ett_pcep_obj_pcc_id_req = -1;
-static gint ett_pcep_obj_of = -1;
-static gint ett_pcep_obj_classtype = -1;
-static gint ett_pcep_obj_global_constraints = -1;
-static gint ett_pcep_obj_pce_id = -1;
-static gint ett_pcep_obj_proc_time = -1;
-static gint ett_pcep_obj_overload = -1;
-static gint ett_pcep_obj_unreach_destination = -1;
-static gint ett_pcep_obj_sero = -1;
-static gint ett_pcep_obj_srro = -1;
-static gint ett_pcep_obj_branch_node_capability = -1;
-static gint ett_pcep_obj_lsp = -1;
-static gint ett_pcep_obj_srp = -1;
-static gint ett_pcep_obj_vendor_information = -1;
-static gint ett_pcep_obj_bu = -1;
-static gint ett_pcep_obj_inter_layer = -1;
-static gint ett_pcep_obj_switch_layer = -1;
-static gint ett_pcep_obj_req_adap_cap = -1;
-static gint ett_pcep_obj_server_ind = -1;
-static gint ett_pcep_obj_association = - 1;
-static gint ett_pcep_obj_s2ls = -1;
-static gint ett_pcep_obj_wa = -1;
-static gint ett_pcep_obj_flowspec = -1;
-static gint ett_pcep_obj_cci_type = -1;
-static gint ett_pcep_obj_path_attrib = -1;
-static gint ett_pcep_obj_unknown = -1;
+static int hf_pcep_xro_obj_flags;
+static int hf_pcep_open_obj_keepalive;
+static int hf_pcep_request_id;
+static int hf_pcep_lspa_obj_reserved;
+static int hf_pcep_rp_obj_reserved;
+static int hf_pcep_svec_obj_reserved;
+static int hf_pcep_rp_obj_flags;
+static int hf_pcep_lspa_obj_exclude_any;
+static int hf_pcep_subobj_srlg_attribute;
+static int hf_pcep_end_point_obj_destination_ipv4_address;
+static int hf_pcep_subobj_unnumb_interfaceID_reserved_xroobj;
+static int hf_pcep_balancing_obj_flags;
+static int hf_pcep_subobj_unnumb_interfaceID_reserved;
+static int hf_pcep_lspa_obj_setup_priority;
+static int hf_pcep_svec_obj_request_id_number;
+static int hf_pcep_end_point_obj_source_ipv4_address;
+static int hf_pcep_open_obj_sid;
+static int hf_pcep_subobj_ipv6_padding;
+static int hf_pcep_notification_obj_reserved;
+static int hf_pcep_close_obj_reason;
+static int hf_pcep_subobj_ipv4_attribute;
+static int hf_pcep_obj_overload_flags;
+static int hf_pcep_balancing_obj_maximum_number_of_te_lsps;
+static int hf_pcep_subobj_exrs_reserved;
+static int hf_pcep_subobj_label_control_length;
+static int hf_pcep_subobj_ipv4_length;
+static int hf_pcep_subobj_ipv6_ipv6;
+static int hf_pcep_lspa_obj_holding_priority;
+static int hf_pcep_rp_obj_requested_id_number;
+static int hf_pcep_subobj_pksv6_path_key;
+static int hf_pcep_subobj_unnumb_interfaceID_router_id;
+static int hf_pcep_subobj_pksv6_pce_id;
+static int hf_pcep_tlv_padding;
+static int hf_pcep_subobj_unnumb_interfaceID_flags;
+static int hf_pcep_subobj_unnumb_interfaceID_length;
+static int hf_pcep_obj_proc_time_reserved;
+static int hf_pcep_object_type;
+static int hf_pcep_subobj_pksv4_length;
+static int hf_pcep_subobj_ipv6_prefix_length;
+static int hf_pcep_subobj_ipv6_length;
+static int hf_pcep_flags;
+static int hf_pcep_no_path_obj_reserved;
+static int hf_pcep_subobj_unnumb_interfaceID_interface_id;
+static int hf_pcep_close_obj_flags;
+static int hf_pcep_error_obj_flags;
+static int hf_pcep_metric_obj_flags;
+static int hf_pcep_subobj_autonomous_sys_num_reserved;
+static int hf_pcep_subobj_pksv4_path_key;
+static int hf_pcep_subobj_label_control_flags;
+static int hf_pcep_notification_obj_value;
+static int hf_pcep_subobj_label_control_label;
+static int hf_pcep_metric_obj_metric_value;
+static int hf_pcep_no_path_obj_flags;
+static int hf_pcep_obj_monitoring_reserved;
+static int hf_pcep_obj_of_code;
+static int hf_pcep_subobj_label_control_u;
+static int hf_pcep_subobj_autonomous_sys_num_length;
+static int hf_pcep_message_length;
+static int hf_pcep_subobj_ipv4_prefix_length;
+static int hf_pcep_xro_obj_reserved;
+static int hf_pcep_subobj_pksv4_pce_id;
+static int hf_pcep_subobj_pksv6_length;
+static int hf_pcep_end_point_obj_destination_ipv6_address;
+static int hf_pcep_subobj_autonomous_sys_num_as_number;
+static int hf_pcep_notification_obj_flags;
+static int hf_pcep_subobj_unnumb_interfaceID_attribute;
+static int hf_pcep_object_length;
+static int hf_pcep_tlv_data;
+static int hf_pcep_balancing_obj_reserved;
+static int hf_pcep_subobj_ipv4_flags;
+static int hf_pcep_subobj_ipv6_attribute;
+static int hf_pcep_subobj_srlg_id;
+static int hf_pcep_balancing_obj_minimum_bandwidth;
+static int hf_pcep_subobj_unnumb_interfaceID_reserved_rrobj;
+static int hf_pcep_error_obj_reserved;
+static int hf_pcep_obj_overload_reserved;
+static int hf_pcep_notification_obj_type;
+static int hf_pcep_subobj_ipv6_flags;
+static int hf_pcep_obj_monitoring_flags;
+static int hf_pcep_subobj_exrs_length;
+static int hf_pcep_obj_proc_time_flags;
+static int hf_pcep_subobj_label_control_reserved;
+static int hf_pcep_version;
+static int hf_pcep_lspa_obj_flags;
+static int hf_pcep_subobj_ipv4_ipv4;
+static int hf_pcep_tlv_type;
+static int hf_pcep_subobj_autonomous_sys_num_optional_as_number_high_octets;
+static int hf_pcep_open_obj_deadtime;
+static int hf_pcep_bandwidth;
+static int hf_pcep_tlv_length;
+static int hf_pcep_subobj_srlg_reserved;
+static int hf_pcep_metric_obj_type;
+static int hf_pcep_metric_obj_reserved;
+static int hf_pcep_svec_obj_flags;
+static int hf_pcep_open_obj_pcep_version;
+static int hf_pcep_open_obj_flags;
+static int hf_pcep_end_point_obj_source_ipv6_address;
+static int hf_pcep_lspa_obj_include_any;
+static int hf_pcep_lspa_obj_include_all;
+static int hf_pcep_subobj_ipv4_padding;
+static int hf_pcep_subobj_srlg_length;
+static int hf_pcep_subobj_autonomous_sys_num_attribute;
+static int hf_pcep_close_obj_reserved;
+static int hf_pcep_subobj_label_control_c_type;
+static int hf_pcep_subobj_iro_autonomous_sys_num_l;
+static int hf_pcep_subobj_autonomous_sys_num_x;
+static int hf_pcep_subobj_label_control_l;
+static int hf_pcep_subobj_exrs_l;
+static int hf_pcep_subobj_unnumb_interfaceID_x;
+static int hf_pcep_subobj_autonomous_sys_num_l;
+static int hf_pcep_subobj_pksv6_l;
+static int hf_pcep_subobj_srlg_x;
+static int hf_pcep_subobj_ipv4_x;
+static int hf_pcep_subobj_iro_unnumb_interfaceID_l;
+static int hf_pcep_subobj_exrs_type;
+static int hf_pcep_subobj_ipv4_l;
+static int hf_pcep_of_code;
+static int hf_pcep_subobj_ipv6_x;
+static int hf_pcep_no_path_obj_nature_of_issue;
+static int hf_pcep_subobj_ipv6_l;
+static int hf_pcep_subobj_pksv4_l;
+static int hf_pcep_subobj_iro_ipv6_l;
+static int hf_pcep_subobj_unnumb_interfaceID_l;
+static int hf_pcep_subobj_iro_ipv4_l;
+static int hf_pcep_subobj_sr_l;
+static int hf_pcep_subobj_sr_length;
+static int hf_pcep_subobj_sr_nt;
+static int hf_pcep_subobj_sr_flags;
+static int hf_pcep_subobj_sr_flags_m;
+static int hf_pcep_subobj_sr_flags_c;
+static int hf_pcep_subobj_sr_flags_s;
+static int hf_pcep_subobj_sr_flags_f;
+static int hf_pcep_subobj_sr_sid;
+static int hf_pcep_subobj_sr_sid_label;
+static int hf_pcep_subobj_sr_sid_tc;
+static int hf_pcep_subobj_sr_sid_s;
+static int hf_pcep_subobj_sr_sid_ttl;
+static int hf_pcep_subobj_sr_nai_ipv4_node;
+static int hf_pcep_subobj_sr_nai_ipv6_node;
+static int hf_pcep_subobj_sr_nai_local_ipv4_addr;
+static int hf_pcep_subobj_sr_nai_remote_ipv4_addr;
+static int hf_pcep_subobj_sr_nai_local_ipv6_addr;
+static int hf_pcep_subobj_sr_nai_remote_ipv6_addr;
+static int hf_pcep_subobj_sr_nai_local_node_id;
+static int hf_pcep_subobj_sr_nai_local_interface_id;
+static int hf_pcep_subobj_sr_nai_remote_node_id;
+static int hf_pcep_subobj_sr_nai_remote_interface_id;
+static int hf_pcep_subobj_srv6_l;
+static int hf_pcep_subobj_srv6_length;
+static int hf_pcep_subobj_srv6_nt;
+static int hf_pcep_subobj_srv6_flags;
+static int hf_pcep_subobj_srv6_flags_s;
+static int hf_pcep_subobj_srv6_flags_f;
+static int hf_pcep_subobj_srv6_flags_t;
+static int hf_pcep_subobj_srv6_flags_v;
+static int hf_pcep_subobj_srv6_reserved;
+static int hf_pcep_subobj_srv6_endpoint_behavior;
+static int hf_pcep_subobj_srv6_sid;
+static int hf_pcep_subobj_srv6_nai;
+static int hf_pcep_subobj_srv6_nai_ipv6_node;
+static int hf_pcep_subobj_srv6_nai_local_ipv6_addr;
+static int hf_pcep_subobj_srv6_nai_remote_ipv6_addr;
+static int hf_pcep_subobj_srv6_nai_local_interface_id;
+static int hf_pcep_subobj_srv6_nai_remote_interface_id;
+static int hf_pcep_subobj_srv6_sid_struct;
+static int hf_pcep_subobj_srv6_sid_struct_lb_len;
+static int hf_pcep_subobj_srv6_sid_struct_ln_len;
+static int hf_pcep_subobj_srv6_sid_struct_fun_len;
+static int hf_pcep_subobj_srv6_sid_struct_arg_len;
+static int hf_pcep_subobj_srv6_sid_struct_reserved;
+static int hf_pcep_subobj_srv6_sid_struct_flags;
+
+static int hf_pcep_stateful_pce_capability_flags;
+static int hf_pcep_lsp_update_capability;
+static int hf_pcep_include_db_version;
+static int hf_pcep_lsp_instantiation_capability;
+static int hf_pcep_triggered_resync;
+static int hf_pcep_delta_lsp_sync_capability;
+static int hf_pcep_triggered_initial_sync;
+static int hf_pcep_obj_lsp_flags;
+static int hf_pcep_obj_lsp_plsp_id;
+static int hf_pcep_obj_lsp_flags_d;
+static int hf_pcep_obj_lsp_flags_s;
+static int hf_pcep_obj_lsp_flags_r;
+static int hf_pcep_obj_lsp_flags_a;
+static int hf_pcep_obj_lsp_flags_o;
+static int hf_pcep_obj_lsp_flags_c;
+static int hf_pcep_obj_lsp_flags_reserved;
+static int hf_pcep_obj_srp_flags;
+static int hf_pcep_obj_srp_flags_r;
+static int hf_pcep_obj_srp_id_number;
+static int hf_pcep_symbolic_path_name;
+static int hf_pcep_ipv4_lsp_id_tunnel_sender_address;
+static int hf_pcep_ipv4_lsp_id_lsp_id;
+static int hf_pcep_ipv4_lsp_id_tunnel_id;
+static int hf_pcep_ipv4_lsp_id_extended_tunnel_id;
+static int hf_pcep_ipv4_lsp_id_tunnel_endpoint_address;
+static int hf_pcep_ipv6_lsp_id_tunnel_sender_address;
+static int hf_pcep_ipv6_lsp_id_lsp_id;
+static int hf_pcep_ipv6_lsp_id_tunnel_id;
+static int hf_pcep_ipv6_lsp_id_extended_tunnel_id;
+static int hf_pcep_ipv6_lsp_id_tunnel_endpoint_address;
+static int hf_pcep_lsp_error_code;
+static int hf_pcep_rsvp_user_error_spec;
+static int hf_pcep_lsp_state_db_version_number;
+static int hf_pcep_speaker_entity_id;
+static int hf_pcep_path_setup_type_reserved24;
+static int hf_pcep_path_setup_type;
+static int hf_pcep_path_setup_type_capability_reserved24;
+static int hf_pcep_path_setup_type_capability_psts;
+static int hf_pcep_path_setup_type_capability_pst;
+static int hf_pcep_sr_pce_capability_reserved; //deprecated
+static int hf_pcep_sr_pce_capability_sub_tlv_reserved;
+static int hf_pcep_sr_pce_capability_flags; //deprecated
+static int hf_pcep_sr_pce_capability_sub_tlv_flags;
+static int hf_pcep_sr_pce_capability_flags_l; //deprecated
+static int hf_pcep_sr_pce_capability_sub_tlv_flags_x;
+static int hf_pcep_sr_pce_capability_sub_tlv_flags_n;
+static int hf_pcep_sr_pce_capability_msd; //deprecated
+static int hf_pcep_sr_pce_capability_sub_tlv_msd;
+static int hf_pcep_association_reserved;
+static int hf_pcep_association_flags;
+static int hf_pcep_association_flags_r;
+static int hf_pcep_association_type;
+static int hf_pcep_association_id;
+static int hf_pcep_association_source_ipv4;
+static int hf_pcep_association_source_ipv6;
+static int hf_pcep_association_source_global;
+static int hf_pcep_association_id_extended;
+
+static int hf_pcep_association_id_extended_color;
+static int hf_pcep_association_id_extended_ipv4_endpoint;
+static int hf_pcep_association_id_extended_ipv6_endpoint;
+static int hf_pcep_unreach_destination_obj_ipv4_address;
+static int hf_pcep_unreach_destination_obj_ipv6_address;
+
+static int hf_pcep_op_conf_assoc_range_reserved;
+static int hf_pcep_op_conf_assoc_range_assoc_type;
+static int hf_pcep_op_conf_assoc_range_start_assoc;
+static int hf_pcep_op_conf_assoc_range_range;
+
+static int hf_pcep_srcpag_info_color;
+static int hf_pcep_srcpag_info_destination_endpoint;
+static int hf_pcep_srcpag_info_preference;
+
+
+static int hf_pcep_sr_policy_name;
+static int hf_pcep_sr_policy_cpath_id_proto_origin;
+static int hf_pcep_sr_policy_cpath_id_originator_asn;
+static int hf_pcep_sr_policy_cpath_id_originator_address;
+static int hf_pcep_sr_policy_cpath_id_discriminator;
+static int hf_pcep_sr_policy_cpath_name;
+static int hf_pcep_sr_policy_cpath_preference;
+
+static int hf_pcep_enterprise_number;
+static int hf_pcep_enterprise_specific_info;
+static int hf_pcep_tlv_enterprise_number;
+static int hf_pcep_tlv_enterprise_specific_info;
+
+static int hf_pcep_bu_reserved;
+static int hf_pcep_bu_butype;
+static int hf_pcep_bu_utilization;
+
+static int hf_pcep_path_setup_type_capability_sub_tlv_type;
+static int hf_pcep_path_setup_type_capability_sub_tlv_length;
+
+static gint ett_pcep;
+static gint ett_pcep_hdr;
+static gint ett_pcep_obj_open;
+static gint ett_pcep_obj_request_parameters;
+static gint ett_pcep_obj_no_path;
+static gint ett_pcep_obj_end_point;
+static gint ett_pcep_obj_bandwidth;
+static gint ett_pcep_obj_metric;
+static gint ett_pcep_obj_explicit_route;
+static gint ett_pcep_obj_record_route;
+static gint ett_pcep_obj_lspa;
+static gint ett_pcep_obj_iro;
+static gint ett_pcep_obj_svec;
+static gint ett_pcep_obj_notification;
+static gint ett_pcep_obj_error;
+static gint ett_pcep_obj_load_balancing;
+static gint ett_pcep_obj_close;
+static gint ett_pcep_obj_path_key;
+static gint ett_pcep_obj_xro;
+static gint ett_pcep_obj_monitoring;
+static gint ett_pcep_obj_pcc_id_req;
+static gint ett_pcep_obj_of;
+static gint ett_pcep_obj_classtype;
+static gint ett_pcep_obj_global_constraints;
+static gint ett_pcep_obj_pce_id;
+static gint ett_pcep_obj_proc_time;
+static gint ett_pcep_obj_overload;
+static gint ett_pcep_obj_unreach_destination;
+static gint ett_pcep_obj_sero;
+static gint ett_pcep_obj_srro;
+static gint ett_pcep_obj_branch_node_capability;
+static gint ett_pcep_obj_lsp;
+static gint ett_pcep_obj_srp;
+static gint ett_pcep_obj_vendor_information;
+static gint ett_pcep_obj_bu;
+static gint ett_pcep_obj_inter_layer;
+static gint ett_pcep_obj_switch_layer;
+static gint ett_pcep_obj_req_adap_cap;
+static gint ett_pcep_obj_server_ind;
+static gint ett_pcep_obj_association;
+static gint ett_pcep_obj_s2ls;
+static gint ett_pcep_obj_wa;
+static gint ett_pcep_obj_flowspec;
+static gint ett_pcep_obj_cci_type;
+static gint ett_pcep_obj_path_attrib;
+static gint ett_pcep_obj_unknown;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_pcep_pcep_object_body_non_defined = EI_INIT;
-static expert_field ei_pcep_non_defined_object = EI_INIT;
-static expert_field ei_pcep_object_length = EI_INIT;
-static expert_field ei_pcep_subobject_bad_length = EI_INIT;
-static expert_field ei_pcep_non_defined_subobject = EI_INIT;
-static expert_field ei_pcep_unknown_type_object = EI_INIT;
+static expert_field ei_pcep_pcep_object_body_non_defined;
+static expert_field ei_pcep_non_defined_object;
+static expert_field ei_pcep_object_length;
+static expert_field ei_pcep_subobject_bad_length;
+static expert_field ei_pcep_non_defined_subobject;
+static expert_field ei_pcep_unknown_type_object;
 
 /* PCEP message types.*/
 typedef enum {
diff --git a/epan/dissectors/packet-pcli.c b/epan/dissectors/packet-pcli.c
index 78da68a57d..9897776e3f 100644
--- a/epan/dissectors/packet-pcli.c
+++ b/epan/dissectors/packet-pcli.c
@@ -64,21 +64,21 @@ static dissector_handle_t pcli_handle, pcli_handle8, pcli_handle12, pcli_handle2
 
 /* Define the pcli proto */
 
-static int proto_pcli = -1;
-static int proto_pcli8 = -1;
-static int proto_pcli12 = -1;
-static int proto_pcli20 = -1;
+static int proto_pcli;
+static int proto_pcli8;
+static int proto_pcli12;
+static int proto_pcli20;
 
 /* Define headers for pcli */
 
-static int hf_pcli_cccid = -1;
-static int hf_pcli_header = -1;
-static int hf_pcli_timestamp = -1;
-static int hf_pcli_case_id = -1;
+static int hf_pcli_cccid;
+static int hf_pcli_header;
+static int hf_pcli_timestamp;
+static int hf_pcli_case_id;
 
 /* Define the tree for pcli */
 
-static int ett_pcli = -1;
+static int ett_pcli;
 
 /*
  * Here are the global variables associated with the preferences
diff --git a/epan/dissectors/packet-pcnfsd.c b/epan/dissectors/packet-pcnfsd.c
index 7bb2b41663..5ff16c1bbc 100644
--- a/epan/dissectors/packet-pcnfsd.c
+++ b/epan/dissectors/packet-pcnfsd.c
@@ -26,31 +26,31 @@ Protocol information comes from the book
 void proto_register_pcnfsd(void);
 void proto_reg_handoff_pcnfsd(void);
 
-static int proto_pcnfsd = -1;
-static int hf_pcnfsd_procedure_v1 = -1;
-static int hf_pcnfsd_procedure_v2 = -1;
-static int hf_pcnfsd_auth_client = -1;
-static int hf_pcnfsd_auth_ident_obscure = -1;
-static int hf_pcnfsd_auth_ident_clear = -1;
-static int hf_pcnfsd_auth_password = -1;
-static int hf_pcnfsd_auth_password_obscure = -1;
-static int hf_pcnfsd_auth_password_clear = -1;
-static int hf_pcnfsd_comment = -1;
-static int hf_pcnfsd_status = -1;
-static int hf_pcnfsd_uid = -1;
-static int hf_pcnfsd_gid = -1;
-static int hf_pcnfsd_gids_count = -1;
-static int hf_pcnfsd_homedir = -1;
-static int hf_pcnfsd_def_umask = -1;
-static int hf_pcnfsd_mapreq = -1;
-static int hf_pcnfsd_mapreq_status = -1;
-static int hf_pcnfsd_username = -1;
-
-
-static gint ett_pcnfsd = -1;
-static gint ett_pcnfsd_auth_ident = -1;
-static gint ett_pcnfsd_auth_password = -1;
-static gint ett_pcnfsd_gids = -1;
+static int proto_pcnfsd;
+static int hf_pcnfsd_procedure_v1;
+static int hf_pcnfsd_procedure_v2;
+static int hf_pcnfsd_auth_client;
+static int hf_pcnfsd_auth_ident_obscure;
+static int hf_pcnfsd_auth_ident_clear;
+static int hf_pcnfsd_auth_password;
+static int hf_pcnfsd_auth_password_obscure;
+static int hf_pcnfsd_auth_password_clear;
+static int hf_pcnfsd_comment;
+static int hf_pcnfsd_status;
+static int hf_pcnfsd_uid;
+static int hf_pcnfsd_gid;
+static int hf_pcnfsd_gids_count;
+static int hf_pcnfsd_homedir;
+static int hf_pcnfsd_def_umask;
+static int hf_pcnfsd_mapreq;
+static int hf_pcnfsd_mapreq_status;
+static int hf_pcnfsd_username;
+
+
+static gint ett_pcnfsd;
+static gint ett_pcnfsd_auth_ident;
+static gint ett_pcnfsd_auth_password;
+static gint ett_pcnfsd_gids;
 
 static int
 dissect_pcnfsd_username(tvbuff_t *tvb, int offset, proto_tree *tree)
diff --git a/epan/dissectors/packet-pcomtcp.c b/epan/dissectors/packet-pcomtcp.c
index 1d2921aa42..60985259ae 100644
--- a/epan/dissectors/packet-pcomtcp.c
+++ b/epan/dissectors/packet-pcomtcp.c
@@ -25,51 +25,51 @@ void proto_reg_handoff_pcomtcp(void);
 void proto_register_pcomtcp(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_pcomtcp = -1;
-static int proto_pcomascii = -1;
-static int proto_pcombinary = -1;
-
-static int hf_pcomtcp_transid = -1;
-static int hf_pcomtcp_protocol = -1;
-static int hf_pcomtcp_reserved = -1;
-static int hf_pcomtcp_length = -1;
-
-static int hf_pcomascii_stx = -1;
-static int hf_pcomascii_unitid = -1;
-static int hf_pcomascii_command_code = -1;
-static int hf_pcomascii_address = -1;
-static int hf_pcomascii_length = -1;
-static int hf_pcomascii_address_value = -1;
-static int hf_pcomascii_command = -1;
-static int hf_pcomascii_checksum = -1;
-static int hf_pcomascii_etx = -1;
-
-static int hf_pcombinary_stx = -1;
-static int hf_pcombinary_id = -1;
-static int hf_pcombinary_reserved1 = -1;
-static int hf_pcombinary_reserved2 = -1;
-static int hf_pcombinary_reserved3 = -1;
-static int hf_pcombinary_command = -1;
-static int hf_pcombinary_reserved4 = -1;
-static int hf_pcombinary_command_specific = -1;
-static int hf_pcombinary_data_length = -1;
-static int hf_pcombinary_header_checksum = -1;
-static int hf_pcombinary_data = -1;
-static int hf_pcombinary_footer_checksum = -1;
-static int hf_pcombinary_etx = -1;
-
-static expert_field ei_pcomtcp_reserved_bad_value = EI_INIT;
-static expert_field ei_pcomascii_command_unsupported = EI_INIT;
-static expert_field ei_pcombinary_reserved1_bad_value = EI_INIT;
-static expert_field ei_pcombinary_reserved2_bad_value = EI_INIT;
-static expert_field ei_pcombinary_reserved3_bad_value = EI_INIT;
-static expert_field ei_pcombinary_reserved4_bad_value = EI_INIT;
-static expert_field ei_pcombinary_command_unsupported = EI_INIT;
+static int proto_pcomtcp;
+static int proto_pcomascii;
+static int proto_pcombinary;
+
+static int hf_pcomtcp_transid;
+static int hf_pcomtcp_protocol;
+static int hf_pcomtcp_reserved;
+static int hf_pcomtcp_length;
+
+static int hf_pcomascii_stx;
+static int hf_pcomascii_unitid;
+static int hf_pcomascii_command_code;
+static int hf_pcomascii_address;
+static int hf_pcomascii_length;
+static int hf_pcomascii_address_value;
+static int hf_pcomascii_command;
+static int hf_pcomascii_checksum;
+static int hf_pcomascii_etx;
+
+static int hf_pcombinary_stx;
+static int hf_pcombinary_id;
+static int hf_pcombinary_reserved1;
+static int hf_pcombinary_reserved2;
+static int hf_pcombinary_reserved3;
+static int hf_pcombinary_command;
+static int hf_pcombinary_reserved4;
+static int hf_pcombinary_command_specific;
+static int hf_pcombinary_data_length;
+static int hf_pcombinary_header_checksum;
+static int hf_pcombinary_data;
+static int hf_pcombinary_footer_checksum;
+static int hf_pcombinary_etx;
+
+static expert_field ei_pcomtcp_reserved_bad_value;
+static expert_field ei_pcomascii_command_unsupported;
+static expert_field ei_pcombinary_reserved1_bad_value;
+static expert_field ei_pcombinary_reserved2_bad_value;
+static expert_field ei_pcombinary_reserved3_bad_value;
+static expert_field ei_pcombinary_reserved4_bad_value;
+static expert_field ei_pcombinary_command_unsupported;
 
 /* Initialize the subtree pointers */
-static gint ett_pcomtcp = -1;
-static gint ett_pcomascii = -1;
-static gint ett_pcombinary = -1;
+static gint ett_pcomtcp;
+static gint ett_pcomascii;
+static gint ett_pcombinary;
 
 static dissector_handle_t pcomtcp_handle;
 static dissector_handle_t pcomascii_handle;
diff --git a/epan/dissectors/packet-pcp.c b/epan/dissectors/packet-pcp.c
index f53ec9b577..ca4820839c 100644
--- a/epan/dissectors/packet-pcp.c
+++ b/epan/dissectors/packet-pcp.c
@@ -26,230 +26,230 @@ void proto_reg_handoff_pcp(void);
 
 static dissector_handle_t pcp_handle;
 
-static int proto_pcp = -1;
-static int hf_pcp_pdu_length = -1;
-static int hf_pcp_pdu_type = -1;
-static int hf_pcp_pdu_pid = -1;
-static int hf_pcp_pdu_error = -1;
-static int hf_pcp_pdu_padding = -1;
-static int hf_pcp_creds_number_of = -1;
-static int hf_pcp_creds_type = -1;
-static int hf_pcp_creds_version = -1;
-static int hf_pcp_start = -1;
-static int hf_pcp_start_status = -1;
-static int hf_pcp_start_zero = -1;
-static int hf_pcp_start_version = -1;
-static int hf_pcp_start_licensed = -1;
-static int hf_pcp_features_flags = -1;
-static int hf_pcp_features_flags_secure = -1;
-static int hf_pcp_features_flags_compress = -1;
-static int hf_pcp_features_flags_auth = -1;
-static int hf_pcp_features_flags_creds_reqd = -1;
-static int hf_pcp_features_flags_secure_ack = -1;
-static int hf_pcp_features_flags_no_nss_init = -1;
-static int hf_pcp_features_flags_container = -1;
-static int hf_pcp_features_flags_cert_reqd = -1;
-static int hf_pcp_features_flags_bad_label = -1;
-static int hf_pcp_features_flags_labels = -1;
-static int hf_pcp_pmns_traverse = -1;
-static int hf_pcp_pmns_subtype = -1;
-static int hf_pcp_pmns_namelen = -1;
-static int hf_pcp_pmns_name = -1;
-static int hf_pcp_pmns_names = -1;
-static int hf_pcp_pmns_names_nstrbytes = -1;
-static int hf_pcp_pmns_names_numstatus = -1;
-static int hf_pcp_pmns_names_numnames = -1;
-static int hf_pcp_pmns_names_nametree = -1;
-static int hf_pcp_pmns_names_nametree_status = -1;
-static int hf_pcp_pmns_names_nametree_namelen = -1;
-static int hf_pcp_pmns_names_nametree_name = -1;
-static int hf_pcp_pmns_ids = -1;
-static int hf_pcp_pmns_ids_status = -1;
-static int hf_pcp_pmns_ids_numids = -1;
-static int hf_pcp_pmns_child = -1;
-static int hf_pcp_pmid = -1;
-static int hf_pcp_pmid_flag = -1;
-static int hf_pcp_pmid_domain = -1;
-static int hf_pcp_pmid_cluster = -1;
-static int hf_pcp_pmid_item = -1;
-static int hf_pcp_pmid_type = -1;
-static int hf_pcp_pmid_sem = -1;
-static int hf_pcp_pmid_inst = -1;
-static int hf_pcp_profile = -1;
-static int hf_pcp_ctxnum = -1;
-static int hf_pcp_profile_g_state = -1;
-static int hf_pcp_profile_numprof = -1;
-static int hf_pcp_profile_profile = -1;
-static int hf_pcp_profile_profile_state = -1;
-static int hf_pcp_profile_profile_numinst = -1;
-static int hf_pcp_fetch = -1;
-static int hf_pcp_fetch_numpmid = -1;
-static int hf_pcp_when = -1;
-static int hf_pcp_when_sec = -1;
-static int hf_pcp_when_usec = -1;
-static int hf_pcp_desc = -1;
-static int hf_pcp_desc_req = -1;
-static int hf_pcp_units = -1;
-static int hf_pcp_units_dimspace = -1;
-static int hf_pcp_units_dimtime = -1;
-static int hf_pcp_units_dimcount = -1;
-static int hf_pcp_units_scalespace = -1;
-static int hf_pcp_units_scaletime = -1;
-static int hf_pcp_units_scalecount = -1;
-static int hf_pcp_instance = -1;
-static int hf_pcp_instance_req = -1;
-static int hf_pcp_instance_namelen = -1;
-static int hf_pcp_instance_name = -1;
-static int hf_pcp_instance_indom = -1;
-static int hf_pcp_instance_valoffset = -1;
-static int hf_pcp_instance_vallength = -1;
-static int hf_pcp_instance_value_insitu = -1;
-static int hf_pcp_instance_value_ptr = -1;
-static int hf_pcp_instance_value_int = -1;
-static int hf_pcp_instance_value_uint = -1;
-static int hf_pcp_instance_value_int64 = -1;
-static int hf_pcp_instance_value_uint64 = -1;
-static int hf_pcp_instance_value_float = -1;
-static int hf_pcp_instance_value_double = -1;
-static int hf_pcp_instance_value_aggr = -1;
-static int hf_pcp_instances = -1;
-static int hf_pcp_instances_numinst = -1;
-static int hf_pcp_results = -1;
-static int hf_pcp_results_numpmid = -1;
-static int hf_pcp_result = -1;
-static int hf_pcp_result_numval = -1;
-static int hf_pcp_result_valfmt = -1;
-static int hf_pcp_text_req = -1;
-static int hf_pcp_text_type = -1;
-static int hf_pcp_text_type_format = -1;
-static int hf_pcp_text_type_ident = -1;
-static int hf_pcp_text = -1;
-static int hf_pcp_text_ident = -1;
-static int hf_pcp_text_buflen = -1;
-static int hf_pcp_text_buffer = -1;
-static int hf_pcp_user_auth_payload = -1;
-static int hf_pcp_label_req = -1;
-static int hf_pcp_label = -1;
-static int hf_pcp_label_ident = -1;
-static int hf_pcp_label_type = -1;
-static int hf_pcp_label_padding = -1;
-static int hf_pcp_label_nsets = -1;
-static int hf_pcp_label_sets = -1;
-static int hf_pcp_label_sets_inst = -1;
-static int hf_pcp_label_sets_nlabels = -1;
-static int hf_pcp_label_sets_json = -1;
-static int hf_pcp_label_sets_jsonlen = -1;
-static int hf_pcp_label_sets_labels = -1;
-static int hf_pcp_label_sets_labels_nameoffset = -1;
-static int hf_pcp_label_sets_labels_namelen = -1;
-static int hf_pcp_label_sets_labels_flags = -1;
-static int hf_pcp_label_sets_labels_valueoffset = -1;
-static int hf_pcp_label_sets_labels_valuelen = -1;
-static int hf_pcp_label_sets_labels_name = -1;
-static int hf_pcp_label_sets_labels_value = -1;
-
-static gint ett_pcp = -1;
-static gint ett_pcp_pdu_length = -1;
-static gint ett_pcp_pdu_type = -1;
-static gint ett_pcp_pdu_pid = -1;
-static gint ett_pcp_pdu_error = -1;
-static gint ett_pcp_pdu_padding = -1;
-static gint ett_pcp_creds_number_of = -1;
-static gint ett_pcp_creds_type = -1;
-static gint ett_pcp_creds_vala = -1;
-static gint ett_pcp_creds_valb = -1;
-static gint ett_pcp_creds_valc = -1;
-static gint ett_pcp_start = -1;
-static gint ett_pcp_start_status = -1;
-static gint ett_pcp_start_zero = -1;
-static gint ett_pcp_start_version = -1;
-static gint ett_pcp_start_licensed = -1;
-static gint ett_pcp_start_features = -1;
-static gint ett_pcp_pmns_traverse = -1;
-static gint ett_pcp_pmns_subtype = -1;
-static gint ett_pcp_pmns_namelen = -1;
-static gint ett_pcp_pmns_name = -1;
-static gint ett_pcp_pmns_names = -1;
-static gint ett_pcp_pmns_names_nstrbytes = -1;
-static gint ett_pcp_pmns_names_numstatus = -1;
-static gint ett_pcp_pmns_names_numnames = -1;
-static gint ett_pcp_pmns_names_nametree = -1;
-static gint ett_pcp_pmns_names_nametree_status = -1;
-static gint ett_pcp_pmns_names_nametree_namelen = -1;
-static gint ett_pcp_pmns_names_nametree_name = -1;
-static gint ett_pcp_pmns_ids = -1;
-static gint ett_pcp_pmns_ids_status = -1;
-static gint ett_pcp_pmns_ids_numids = -1;
-static gint ett_pcp_pmns_child = -1;
-static gint ett_pcp_pmid = -1;
-static gint ett_pcp_pmid_flag = -1;
-static gint ett_pcp_pmid_domain = -1;
-static gint ett_pcp_pmid_cluster = -1;
-static gint ett_pcp_pmid_item = -1;
-static gint ett_pcp_pmid_type = -1;
-static gint ett_pcp_pmid_sem = -1;
-static gint ett_pcp_profile = -1;
-static gint ett_pcp_ctxnum = -1;
-static gint ett_pcp_profile_g_state = -1;
-static gint ett_pcp_profile_numprof = -1;
-static gint ett_pcp_profile_profile = -1;
-static gint ett_pcp_profile_profile_state = -1;
-static gint ett_pcp_profile_profile_numinst = -1;
-static gint ett_pcp_fetch = -1;
-static gint ett_pcp_fetch_numpmid = -1;
-static gint ett_pcp_when = -1;
-static gint ett_pcp_when_sec = -1;
-static gint ett_pcp_when_usec = -1;
-static gint ett_pcp_desc_req = -1;
-static gint ett_pcp_units = -1;
-static gint ett_pcp_units_dimspace = -1;
-static gint ett_pcp_units_dimtime = -1;
-static gint ett_pcp_units_dimcount = -1;
-static gint ett_pcp_units_scalespace = -1;
-static gint ett_pcp_units_scaletime = -1;
-static gint ett_pcp_units_scalecount = -1;
-static gint ett_pcp_instance = -1;
-static gint ett_pcp_instance_req = -1;
-static gint ett_pcp_instance_namelen = -1;
-static gint ett_pcp_instance_name = -1;
-static gint ett_pcp_instance_inst = -1;
-static gint ett_pcp_instance_indom = -1;
-static gint ett_pcp_instance_valoffset = -1;
-static gint ett_pcp_instance_vallength = -1;
-static gint ett_pcp_instance_value_insitu = -1;
-static gint ett_pcp_instance_value_ptr = -1;
-static gint ett_pcp_instance_value_int = -1;
-static gint ett_pcp_instance_value_uint = -1;
-static gint ett_pcp_instance_value_int64 = -1;
-static gint ett_pcp_instance_value_uint64 = -1;
-static gint ett_pcp_instance_value_float = -1;
-static gint ett_pcp_instance_value_double = -1;
-static gint ett_pcp_instance_value_aggr = -1;
-static gint ett_pcp_instances = -1;
-static gint ett_pcp_instances_numinst = -1;
-static gint ett_pcp_results = -1;
-static gint ett_pcp_results_numpmid = -1;
-static gint ett_pcp_result = -1;
-static gint ett_pcp_result_numval = -1;
-static gint ett_pcp_result_valfmt = -1;
-static gint ett_pcp_text_req = -1;
-static gint ett_pcp_text_type = -1;
-static gint ett_pcp_text_type_format = -1;
-static gint ett_pcp_text_type_ident = -1;
-static gint ett_pcp_text = -1;
-static gint ett_pcp_text_ident = -1;
-static gint ett_pcp_text_buflen = -1;
-static gint ett_pcp_text_buffer = -1;
-
-static expert_field ei_pcp_type_event_unimplemented = EI_INIT;
-static expert_field ei_pcp_type_nosupport_unsupported = EI_INIT;
-static expert_field ei_pcp_type_unknown_unknown_value = EI_INIT;
-static expert_field ei_pcp_unimplemented_value = EI_INIT;
-static expert_field ei_pcp_unimplemented_packet_type = EI_INIT;
-static expert_field ei_pcp_ssl_upgrade = EI_INIT;
-static expert_field ei_pcp_ssl_upgrade_failed = EI_INIT;
-static expert_field ei_pcp_label_error = EI_INIT;
-static expert_field ei_pcp_label_error_endianness = EI_INIT;
+static int proto_pcp;
+static int hf_pcp_pdu_length;
+static int hf_pcp_pdu_type;
+static int hf_pcp_pdu_pid;
+static int hf_pcp_pdu_error;
+static int hf_pcp_pdu_padding;
+static int hf_pcp_creds_number_of;
+static int hf_pcp_creds_type;
+static int hf_pcp_creds_version;
+static int hf_pcp_start;
+static int hf_pcp_start_status;
+static int hf_pcp_start_zero;
+static int hf_pcp_start_version;
+static int hf_pcp_start_licensed;
+static int hf_pcp_features_flags;
+static int hf_pcp_features_flags_secure;
+static int hf_pcp_features_flags_compress;
+static int hf_pcp_features_flags_auth;
+static int hf_pcp_features_flags_creds_reqd;
+static int hf_pcp_features_flags_secure_ack;
+static int hf_pcp_features_flags_no_nss_init;
+static int hf_pcp_features_flags_container;
+static int hf_pcp_features_flags_cert_reqd;
+static int hf_pcp_features_flags_bad_label;
+static int hf_pcp_features_flags_labels;
+static int hf_pcp_pmns_traverse;
+static int hf_pcp_pmns_subtype;
+static int hf_pcp_pmns_namelen;
+static int hf_pcp_pmns_name;
+static int hf_pcp_pmns_names;
+static int hf_pcp_pmns_names_nstrbytes;
+static int hf_pcp_pmns_names_numstatus;
+static int hf_pcp_pmns_names_numnames;
+static int hf_pcp_pmns_names_nametree;
+static int hf_pcp_pmns_names_nametree_status;
+static int hf_pcp_pmns_names_nametree_namelen;
+static int hf_pcp_pmns_names_nametree_name;
+static int hf_pcp_pmns_ids;
+static int hf_pcp_pmns_ids_status;
+static int hf_pcp_pmns_ids_numids;
+static int hf_pcp_pmns_child;
+static int hf_pcp_pmid;
+static int hf_pcp_pmid_flag;
+static int hf_pcp_pmid_domain;
+static int hf_pcp_pmid_cluster;
+static int hf_pcp_pmid_item;
+static int hf_pcp_pmid_type;
+static int hf_pcp_pmid_sem;
+static int hf_pcp_pmid_inst;
+static int hf_pcp_profile;
+static int hf_pcp_ctxnum;
+static int hf_pcp_profile_g_state;
+static int hf_pcp_profile_numprof;
+static int hf_pcp_profile_profile;
+static int hf_pcp_profile_profile_state;
+static int hf_pcp_profile_profile_numinst;
+static int hf_pcp_fetch;
+static int hf_pcp_fetch_numpmid;
+static int hf_pcp_when;
+static int hf_pcp_when_sec;
+static int hf_pcp_when_usec;
+static int hf_pcp_desc;
+static int hf_pcp_desc_req;
+static int hf_pcp_units;
+static int hf_pcp_units_dimspace;
+static int hf_pcp_units_dimtime;
+static int hf_pcp_units_dimcount;
+static int hf_pcp_units_scalespace;
+static int hf_pcp_units_scaletime;
+static int hf_pcp_units_scalecount;
+static int hf_pcp_instance;
+static int hf_pcp_instance_req;
+static int hf_pcp_instance_namelen;
+static int hf_pcp_instance_name;
+static int hf_pcp_instance_indom;
+static int hf_pcp_instance_valoffset;
+static int hf_pcp_instance_vallength;
+static int hf_pcp_instance_value_insitu;
+static int hf_pcp_instance_value_ptr;
+static int hf_pcp_instance_value_int;
+static int hf_pcp_instance_value_uint;
+static int hf_pcp_instance_value_int64;
+static int hf_pcp_instance_value_uint64;
+static int hf_pcp_instance_value_float;
+static int hf_pcp_instance_value_double;
+static int hf_pcp_instance_value_aggr;
+static int hf_pcp_instances;
+static int hf_pcp_instances_numinst;
+static int hf_pcp_results;
+static int hf_pcp_results_numpmid;
+static int hf_pcp_result;
+static int hf_pcp_result_numval;
+static int hf_pcp_result_valfmt;
+static int hf_pcp_text_req;
+static int hf_pcp_text_type;
+static int hf_pcp_text_type_format;
+static int hf_pcp_text_type_ident;
+static int hf_pcp_text;
+static int hf_pcp_text_ident;
+static int hf_pcp_text_buflen;
+static int hf_pcp_text_buffer;
+static int hf_pcp_user_auth_payload;
+static int hf_pcp_label_req;
+static int hf_pcp_label;
+static int hf_pcp_label_ident;
+static int hf_pcp_label_type;
+static int hf_pcp_label_padding;
+static int hf_pcp_label_nsets;
+static int hf_pcp_label_sets;
+static int hf_pcp_label_sets_inst;
+static int hf_pcp_label_sets_nlabels;
+static int hf_pcp_label_sets_json;
+static int hf_pcp_label_sets_jsonlen;
+static int hf_pcp_label_sets_labels;
+static int hf_pcp_label_sets_labels_nameoffset;
+static int hf_pcp_label_sets_labels_namelen;
+static int hf_pcp_label_sets_labels_flags;
+static int hf_pcp_label_sets_labels_valueoffset;
+static int hf_pcp_label_sets_labels_valuelen;
+static int hf_pcp_label_sets_labels_name;
+static int hf_pcp_label_sets_labels_value;
+
+static gint ett_pcp;
+static gint ett_pcp_pdu_length;
+static gint ett_pcp_pdu_type;
+static gint ett_pcp_pdu_pid;
+static gint ett_pcp_pdu_error;
+static gint ett_pcp_pdu_padding;
+static gint ett_pcp_creds_number_of;
+static gint ett_pcp_creds_type;
+static gint ett_pcp_creds_vala;
+static gint ett_pcp_creds_valb;
+static gint ett_pcp_creds_valc;
+static gint ett_pcp_start;
+static gint ett_pcp_start_status;
+static gint ett_pcp_start_zero;
+static gint ett_pcp_start_version;
+static gint ett_pcp_start_licensed;
+static gint ett_pcp_start_features;
+static gint ett_pcp_pmns_traverse;
+static gint ett_pcp_pmns_subtype;
+static gint ett_pcp_pmns_namelen;
+static gint ett_pcp_pmns_name;
+static gint ett_pcp_pmns_names;
+static gint ett_pcp_pmns_names_nstrbytes;
+static gint ett_pcp_pmns_names_numstatus;
+static gint ett_pcp_pmns_names_numnames;
+static gint ett_pcp_pmns_names_nametree;
+static gint ett_pcp_pmns_names_nametree_status;
+static gint ett_pcp_pmns_names_nametree_namelen;
+static gint ett_pcp_pmns_names_nametree_name;
+static gint ett_pcp_pmns_ids;
+static gint ett_pcp_pmns_ids_status;
+static gint ett_pcp_pmns_ids_numids;
+static gint ett_pcp_pmns_child;
+static gint ett_pcp_pmid;
+static gint ett_pcp_pmid_flag;
+static gint ett_pcp_pmid_domain;
+static gint ett_pcp_pmid_cluster;
+static gint ett_pcp_pmid_item;
+static gint ett_pcp_pmid_type;
+static gint ett_pcp_pmid_sem;
+static gint ett_pcp_profile;
+static gint ett_pcp_ctxnum;
+static gint ett_pcp_profile_g_state;
+static gint ett_pcp_profile_numprof;
+static gint ett_pcp_profile_profile;
+static gint ett_pcp_profile_profile_state;
+static gint ett_pcp_profile_profile_numinst;
+static gint ett_pcp_fetch;
+static gint ett_pcp_fetch_numpmid;
+static gint ett_pcp_when;
+static gint ett_pcp_when_sec;
+static gint ett_pcp_when_usec;
+static gint ett_pcp_desc_req;
+static gint ett_pcp_units;
+static gint ett_pcp_units_dimspace;
+static gint ett_pcp_units_dimtime;
+static gint ett_pcp_units_dimcount;
+static gint ett_pcp_units_scalespace;
+static gint ett_pcp_units_scaletime;
+static gint ett_pcp_units_scalecount;
+static gint ett_pcp_instance;
+static gint ett_pcp_instance_req;
+static gint ett_pcp_instance_namelen;
+static gint ett_pcp_instance_name;
+static gint ett_pcp_instance_inst;
+static gint ett_pcp_instance_indom;
+static gint ett_pcp_instance_valoffset;
+static gint ett_pcp_instance_vallength;
+static gint ett_pcp_instance_value_insitu;
+static gint ett_pcp_instance_value_ptr;
+static gint ett_pcp_instance_value_int;
+static gint ett_pcp_instance_value_uint;
+static gint ett_pcp_instance_value_int64;
+static gint ett_pcp_instance_value_uint64;
+static gint ett_pcp_instance_value_float;
+static gint ett_pcp_instance_value_double;
+static gint ett_pcp_instance_value_aggr;
+static gint ett_pcp_instances;
+static gint ett_pcp_instances_numinst;
+static gint ett_pcp_results;
+static gint ett_pcp_results_numpmid;
+static gint ett_pcp_result;
+static gint ett_pcp_result_numval;
+static gint ett_pcp_result_valfmt;
+static gint ett_pcp_text_req;
+static gint ett_pcp_text_type;
+static gint ett_pcp_text_type_format;
+static gint ett_pcp_text_type_ident;
+static gint ett_pcp_text;
+static gint ett_pcp_text_ident;
+static gint ett_pcp_text_buflen;
+static gint ett_pcp_text_buffer;
+
+static expert_field ei_pcp_type_event_unimplemented;
+static expert_field ei_pcp_type_nosupport_unsupported;
+static expert_field ei_pcp_type_unknown_unknown_value;
+static expert_field ei_pcp_unimplemented_value;
+static expert_field ei_pcp_unimplemented_packet_type;
+static expert_field ei_pcp_ssl_upgrade;
+static expert_field ei_pcp_ssl_upgrade_failed;
+static expert_field ei_pcp_label_error;
+static expert_field ei_pcp_label_error_endianness;
 
 /* Magic numbers */
 #define PCP_SECURE_ACK_SUCCESSFUL 0
diff --git a/epan/dissectors/packet-pdc.c b/epan/dissectors/packet-pdc.c
index 1bc4a5f272..66593b8b1e 100644
--- a/epan/dissectors/packet-pdc.c
+++ b/epan/dissectors/packet-pdc.c
@@ -46,34 +46,34 @@ static dissector_handle_t pdc_tcp_handle;
 /* global handle for calling asterix decoder if required */
 static dissector_handle_t asterix_handle;
 
-static int		  proto_pdc	     = -1;
+static int		  proto_pdc;
 
 /*HF Declarations*/
-static gint hf_pdc_len = -1;
-static gint hf_pdc_mpdu_code = -1;
-static gint hf_pdc_credit = -1;
-static gint hf_pdc_simpdu_state = -1;
-static gint hf_pdc_yr_admu_nr =-1;
-static gint hf_pdc_akmpdu_mns = -1;
-static gint hf_pdc_akmpdu_cdt = -1;
-static gint hf_pdc_simpdu_var = -1;
-static gint hf_pdc_simpdu_var_len = -1;
-static gint hf_pdc_simpdu_param = -1;
-static gint hf_pdc_simpdu_var_version = -1;
-static gint hf_pdc_simpdu_var_REFSRC = -1;
-static gint hf_pdc_simpdu_var_REFDEST = -1;
-static gint hf_pdc_simpdu_var_TSEL = -1;
-static gint hf_pdc_drmpdu_abort = -1;
-static gint hf_pdc_drmpdu_reason = -1;
-static gint hf_pdc_drmpdu_mode = -1;
-static gint hf_pdc_drmpdu_init = -1;
-static gint hf_pdc_dtmpdu_user_size =-1;
-static gint hf_pdc_admpdu_admpdunr = -1;
-static gint hf_pdc_admpdu_size = -1;
+static gint hf_pdc_len;
+static gint hf_pdc_mpdu_code;
+static gint hf_pdc_credit;
+static gint hf_pdc_simpdu_state;
+static gint hf_pdc_yr_admu_nr;
+static gint hf_pdc_akmpdu_mns;
+static gint hf_pdc_akmpdu_cdt;
+static gint hf_pdc_simpdu_var;
+static gint hf_pdc_simpdu_var_len;
+static gint hf_pdc_simpdu_param;
+static gint hf_pdc_simpdu_var_version;
+static gint hf_pdc_simpdu_var_REFSRC;
+static gint hf_pdc_simpdu_var_REFDEST;
+static gint hf_pdc_simpdu_var_TSEL;
+static gint hf_pdc_drmpdu_abort;
+static gint hf_pdc_drmpdu_reason;
+static gint hf_pdc_drmpdu_mode;
+static gint hf_pdc_drmpdu_init;
+static gint hf_pdc_dtmpdu_user_size;
+static gint hf_pdc_admpdu_admpdunr;
+static gint hf_pdc_admpdu_size;
 
 /*Tree Declarations*/
-static gint ett_pdc = -1;
-static gint ett_pdc_simpdu_var = -1;
+static gint ett_pdc;
+static gint ett_pdc_simpdu_var;
 
 
 /*Value String Declarations*/
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index ccd99a675f..b9b5dcf7bc 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -53,102 +53,102 @@ void proto_reg_handoff_pdcp_lte(void);
 
 
 /* Initialize the protocol and registered fields. */
-int proto_pdcp_lte = -1;
+int proto_pdcp_lte;
 
 extern int proto_rlc_lte;
 
 /* Configuration (info known outside of PDU) */
-static int hf_pdcp_lte_configuration = -1;
-static int hf_pdcp_lte_direction = -1;
-static int hf_pdcp_lte_ueid = -1;
-static int hf_pdcp_lte_channel_type = -1;
-static int hf_pdcp_lte_channel_id = -1;
-
-static int hf_pdcp_lte_rohc_compression = -1;
-static int hf_pdcp_lte_rohc_mode = -1;
-static int hf_pdcp_lte_rohc_rnd = -1;
-static int hf_pdcp_lte_rohc_udp_checksum_present = -1;
-static int hf_pdcp_lte_rohc_profile = -1;
-
-static int hf_pdcp_lte_no_header_pdu = -1;
-static int hf_pdcp_lte_plane = -1;
-static int hf_pdcp_lte_seqnum_length = -1;
-static int hf_pdcp_lte_cid_inclusion_info = -1;
-static int hf_pdcp_lte_large_cid_present = -1;
+static int hf_pdcp_lte_configuration;
+static int hf_pdcp_lte_direction;
+static int hf_pdcp_lte_ueid;
+static int hf_pdcp_lte_channel_type;
+static int hf_pdcp_lte_channel_id;
+
+static int hf_pdcp_lte_rohc_compression;
+static int hf_pdcp_lte_rohc_mode;
+static int hf_pdcp_lte_rohc_rnd;
+static int hf_pdcp_lte_rohc_udp_checksum_present;
+static int hf_pdcp_lte_rohc_profile;
+
+static int hf_pdcp_lte_no_header_pdu;
+static int hf_pdcp_lte_plane;
+static int hf_pdcp_lte_seqnum_length;
+static int hf_pdcp_lte_cid_inclusion_info;
+static int hf_pdcp_lte_large_cid_present;
 
 /* PDCP header fields */
-static int hf_pdcp_lte_control_plane_reserved = -1;
-static int hf_pdcp_lte_seq_num_5 = -1;
-static int hf_pdcp_lte_seq_num_7 = -1;
-static int hf_pdcp_lte_reserved3 = -1;
-static int hf_pdcp_lte_seq_num_12 = -1;
-static int hf_pdcp_lte_seq_num_15 = -1;
-static int hf_pdcp_lte_polling = -1;
-static int hf_pdcp_lte_reserved5 = -1;
-static int hf_pdcp_lte_seq_num_18 = -1;
-static int hf_pdcp_lte_signalling_data = -1;
-static int hf_pdcp_lte_mac = -1;
-static int hf_pdcp_lte_data_control = -1;
-static int hf_pdcp_lte_user_plane_data = -1;
-static int hf_pdcp_lte_control_pdu_type = -1;
-static int hf_pdcp_lte_fms = -1;
-static int hf_pdcp_lte_reserved4 = -1;
-static int hf_pdcp_lte_fms2 = -1;
-static int hf_pdcp_lte_reserved6 = -1;
-static int hf_pdcp_lte_fms3 = -1;
-static int hf_pdcp_lte_bitmap = -1;
-static int hf_pdcp_lte_bitmap_byte = -1;
-static int hf_pdcp_lte_hrw = -1;
-static int hf_pdcp_lte_nmp = -1;
-static int hf_pdcp_lte_reserved7 = -1;
-static int hf_pdcp_lte_hrw2 = -1;
-static int hf_pdcp_lte_nmp2 = -1;
-static int hf_pdcp_lte_hrw3 = -1;
-static int hf_pdcp_lte_reserved8 = -1;
-static int hf_pdcp_lte_nmp3 = -1;
-static int hf_pdcp_lte_lsn = -1;
-static int hf_pdcp_lte_lsn2 = -1;
-static int hf_pdcp_lte_lsn3 = -1;
+static int hf_pdcp_lte_control_plane_reserved;
+static int hf_pdcp_lte_seq_num_5;
+static int hf_pdcp_lte_seq_num_7;
+static int hf_pdcp_lte_reserved3;
+static int hf_pdcp_lte_seq_num_12;
+static int hf_pdcp_lte_seq_num_15;
+static int hf_pdcp_lte_polling;
+static int hf_pdcp_lte_reserved5;
+static int hf_pdcp_lte_seq_num_18;
+static int hf_pdcp_lte_signalling_data;
+static int hf_pdcp_lte_mac;
+static int hf_pdcp_lte_data_control;
+static int hf_pdcp_lte_user_plane_data;
+static int hf_pdcp_lte_control_pdu_type;
+static int hf_pdcp_lte_fms;
+static int hf_pdcp_lte_reserved4;
+static int hf_pdcp_lte_fms2;
+static int hf_pdcp_lte_reserved6;
+static int hf_pdcp_lte_fms3;
+static int hf_pdcp_lte_bitmap;
+static int hf_pdcp_lte_bitmap_byte;
+static int hf_pdcp_lte_hrw;
+static int hf_pdcp_lte_nmp;
+static int hf_pdcp_lte_reserved7;
+static int hf_pdcp_lte_hrw2;
+static int hf_pdcp_lte_nmp2;
+static int hf_pdcp_lte_hrw3;
+static int hf_pdcp_lte_reserved8;
+static int hf_pdcp_lte_nmp3;
+static int hf_pdcp_lte_lsn;
+static int hf_pdcp_lte_lsn2;
+static int hf_pdcp_lte_lsn3;
 
 /* Sequence Analysis */
-static int hf_pdcp_lte_sequence_analysis = -1;
-static int hf_pdcp_lte_sequence_analysis_ok = -1;
-static int hf_pdcp_lte_sequence_analysis_previous_frame = -1;
-static int hf_pdcp_lte_sequence_analysis_next_frame = -1;
-static int hf_pdcp_lte_sequence_analysis_expected_sn = -1;
+static int hf_pdcp_lte_sequence_analysis;
+static int hf_pdcp_lte_sequence_analysis_ok;
+static int hf_pdcp_lte_sequence_analysis_previous_frame;
+static int hf_pdcp_lte_sequence_analysis_next_frame;
+static int hf_pdcp_lte_sequence_analysis_expected_sn;
 
-static int hf_pdcp_lte_sequence_analysis_repeated = -1;
-static int hf_pdcp_lte_sequence_analysis_skipped = -1;
+static int hf_pdcp_lte_sequence_analysis_repeated;
+static int hf_pdcp_lte_sequence_analysis_skipped;
 
 /* Security Settings */
-static int hf_pdcp_lte_security = -1;
-static int hf_pdcp_lte_security_setup_frame = -1;
-static int hf_pdcp_lte_security_integrity_algorithm = -1;
-static int hf_pdcp_lte_security_ciphering_algorithm = -1;
+static int hf_pdcp_lte_security;
+static int hf_pdcp_lte_security_setup_frame;
+static int hf_pdcp_lte_security_integrity_algorithm;
+static int hf_pdcp_lte_security_ciphering_algorithm;
 
-static int hf_pdcp_lte_security_bearer = -1;
-static int hf_pdcp_lte_security_direction = -1;
-static int hf_pdcp_lte_security_count = -1;
-static int hf_pdcp_lte_security_cipher_key = -1;
-static int hf_pdcp_lte_security_integrity_key = -1;
+static int hf_pdcp_lte_security_bearer;
+static int hf_pdcp_lte_security_direction;
+static int hf_pdcp_lte_security_count;
+static int hf_pdcp_lte_security_cipher_key;
+static int hf_pdcp_lte_security_integrity_key;
 
-static int hf_pdcp_lte_security_deciphered_data = -1;
+static int hf_pdcp_lte_security_deciphered_data;
 
 /* Protocol subtree. */
-static int ett_pdcp = -1;
-static int ett_pdcp_configuration = -1;
-static int ett_pdcp_packet = -1;
-static int ett_pdcp_lte_sequence_analysis = -1;
-static int ett_pdcp_report_bitmap = -1;
-static int ett_pdcp_security = -1;
-
-static expert_field ei_pdcp_lte_sequence_analysis_wrong_sequence_number = EI_INIT;
-static expert_field ei_pdcp_lte_reserved_bits_not_zero = EI_INIT;
-static expert_field ei_pdcp_lte_sequence_analysis_sn_repeated = EI_INIT;
-static expert_field ei_pdcp_lte_sequence_analysis_sn_missing = EI_INIT;
-static expert_field ei_pdcp_lte_digest_wrong = EI_INIT;
-static expert_field ei_pdcp_lte_unknown_udp_framing_tag = EI_INIT;
-static expert_field ei_pdcp_lte_missing_udp_framing_tag = EI_INIT;
+static int ett_pdcp;
+static int ett_pdcp_configuration;
+static int ett_pdcp_packet;
+static int ett_pdcp_lte_sequence_analysis;
+static int ett_pdcp_report_bitmap;
+static int ett_pdcp_security;
+
+static expert_field ei_pdcp_lte_sequence_analysis_wrong_sequence_number;
+static expert_field ei_pdcp_lte_reserved_bits_not_zero;
+static expert_field ei_pdcp_lte_sequence_analysis_sn_repeated;
+static expert_field ei_pdcp_lte_sequence_analysis_sn_missing;
+static expert_field ei_pdcp_lte_digest_wrong;
+static expert_field ei_pdcp_lte_unknown_udp_framing_tag;
+static expert_field ei_pdcp_lte_missing_udp_framing_tag;
 
 
 /*-------------------------------------
diff --git a/epan/dissectors/packet-pdcp-nr.c b/epan/dissectors/packet-pdcp-nr.c
index 199d8d03f7..e411bdef40 100644
--- a/epan/dissectors/packet-pdcp-nr.c
+++ b/epan/dissectors/packet-pdcp-nr.c
@@ -48,89 +48,89 @@ void proto_reg_handoff_pdcp_nr(void);
 
 
 /* Initialize the protocol and registered fields. */
-int proto_pdcp_nr = -1;
+int proto_pdcp_nr;
 
 extern int proto_rlc_nr;
 
 /* Configuration (info known outside of PDU) */
-static int hf_pdcp_nr_configuration = -1;
-static int hf_pdcp_nr_direction = -1;
-static int hf_pdcp_nr_ueid = -1;
-static int hf_pdcp_nr_bearer_type = -1;
-static int hf_pdcp_nr_bearer_id = -1;
-static int hf_pdcp_nr_plane = -1;
-static int hf_pdcp_nr_seqnum_length = -1;
-static int hf_pdcp_nr_maci_present = -1;
-static int hf_pdcp_nr_sdap = -1;
-static int hf_pdcp_nr_ciphering_disabled = -1;
-
-static int hf_pdcp_nr_rohc_compression = -1;
-static int hf_pdcp_nr_rohc_mode = -1;
-static int hf_pdcp_nr_rohc_rnd = -1;
-static int hf_pdcp_nr_rohc_udp_checksum_present = -1;
-static int hf_pdcp_nr_rohc_profile = -1;
-static int hf_pdcp_nr_cid_inclusion_info = -1;
-static int hf_pdcp_nr_large_cid_present = -1;
+static int hf_pdcp_nr_configuration;
+static int hf_pdcp_nr_direction;
+static int hf_pdcp_nr_ueid;
+static int hf_pdcp_nr_bearer_type;
+static int hf_pdcp_nr_bearer_id;
+static int hf_pdcp_nr_plane;
+static int hf_pdcp_nr_seqnum_length;
+static int hf_pdcp_nr_maci_present;
+static int hf_pdcp_nr_sdap;
+static int hf_pdcp_nr_ciphering_disabled;
+
+static int hf_pdcp_nr_rohc_compression;
+static int hf_pdcp_nr_rohc_mode;
+static int hf_pdcp_nr_rohc_rnd;
+static int hf_pdcp_nr_rohc_udp_checksum_present;
+static int hf_pdcp_nr_rohc_profile;
+static int hf_pdcp_nr_cid_inclusion_info;
+static int hf_pdcp_nr_large_cid_present;
 
 /* PDCP header fields */
-static int hf_pdcp_nr_control_plane_reserved = -1;
-static int hf_pdcp_nr_reserved3 = -1;
-static int hf_pdcp_nr_seq_num_12 = -1;
-static int hf_pdcp_nr_reserved5 = -1;
-static int hf_pdcp_nr_seq_num_18 = -1;
-static int hf_pdcp_nr_signalling_data = -1;
-static int hf_pdcp_nr_mac = -1;
-static int hf_pdcp_nr_data_control = -1;
-static int hf_pdcp_nr_user_plane_data = -1;
-static int hf_pdcp_nr_control_pdu_type = -1;
-static int hf_pdcp_nr_fmc = -1;
-static int hf_pdcp_nr_reserved4 = -1;
-static int hf_pdcp_nr_bitmap = -1;
-static int hf_pdcp_nr_bitmap_byte = -1;
+static int hf_pdcp_nr_control_plane_reserved;
+static int hf_pdcp_nr_reserved3;
+static int hf_pdcp_nr_seq_num_12;
+static int hf_pdcp_nr_reserved5;
+static int hf_pdcp_nr_seq_num_18;
+static int hf_pdcp_nr_signalling_data;
+static int hf_pdcp_nr_mac;
+static int hf_pdcp_nr_data_control;
+static int hf_pdcp_nr_user_plane_data;
+static int hf_pdcp_nr_control_pdu_type;
+static int hf_pdcp_nr_fmc;
+static int hf_pdcp_nr_reserved4;
+static int hf_pdcp_nr_bitmap;
+static int hf_pdcp_nr_bitmap_byte;
 
 /* Sequence Analysis */
-static int hf_pdcp_nr_sequence_analysis = -1;
-static int hf_pdcp_nr_sequence_analysis_ok = -1;
-static int hf_pdcp_nr_sequence_analysis_previous_frame = -1;
-static int hf_pdcp_nr_sequence_analysis_next_frame = -1;
-static int hf_pdcp_nr_sequence_analysis_expected_sn = -1;
-static int hf_pdcp_nr_sequence_analysis_repeated = -1;
-static int hf_pdcp_nr_sequence_analysis_skipped = -1;
+static int hf_pdcp_nr_sequence_analysis;
+static int hf_pdcp_nr_sequence_analysis_ok;
+static int hf_pdcp_nr_sequence_analysis_previous_frame;
+static int hf_pdcp_nr_sequence_analysis_next_frame;
+static int hf_pdcp_nr_sequence_analysis_expected_sn;
+static int hf_pdcp_nr_sequence_analysis_repeated;
+static int hf_pdcp_nr_sequence_analysis_skipped;
 
 /* Security Settings */
-static int hf_pdcp_nr_security = -1;
-static int hf_pdcp_nr_security_setup_frame = -1;
-static int hf_pdcp_nr_security_integrity_algorithm = -1;
-static int hf_pdcp_nr_security_ciphering_algorithm = -1;
+static int hf_pdcp_nr_security;
+static int hf_pdcp_nr_security_setup_frame;
+static int hf_pdcp_nr_security_integrity_algorithm;
+static int hf_pdcp_nr_security_ciphering_algorithm;
 
-static int hf_pdcp_nr_security_bearer = -1;
-static int hf_pdcp_nr_security_direction = -1;
-static int hf_pdcp_nr_security_count = -1;
-static int hf_pdcp_nr_security_cipher_key = -1;
-static int hf_pdcp_nr_security_integrity_key = -1;
-static int hf_pdcp_nr_security_cipher_key_setup_frame = -1;
-static int hf_pdcp_nr_security_integrity_key_setup_frame = -1;
-static int hf_pdcp_nr_security_deciphered_data = -1;
+static int hf_pdcp_nr_security_bearer;
+static int hf_pdcp_nr_security_direction;
+static int hf_pdcp_nr_security_count;
+static int hf_pdcp_nr_security_cipher_key;
+static int hf_pdcp_nr_security_integrity_key;
+static int hf_pdcp_nr_security_cipher_key_setup_frame;
+static int hf_pdcp_nr_security_integrity_key_setup_frame;
+static int hf_pdcp_nr_security_deciphered_data;
 
 
 /* Protocol subtree. */
-static int ett_pdcp = -1;
-static int ett_pdcp_configuration = -1;
-static int ett_pdcp_packet = -1;
-static int ett_pdcp_nr_sequence_analysis = -1;
-static int ett_pdcp_report_bitmap = -1;
-static int ett_pdcp_security = -1;
-
-static expert_field ei_pdcp_nr_sequence_analysis_wrong_sequence_number_ul = EI_INIT;
-static expert_field ei_pdcp_nr_sequence_analysis_wrong_sequence_number_dl = EI_INIT;
-static expert_field ei_pdcp_nr_reserved_bits_not_zero = EI_INIT;
-static expert_field ei_pdcp_nr_sequence_analysis_sn_repeated_ul = EI_INIT;
-static expert_field ei_pdcp_nr_sequence_analysis_sn_repeated_dl = EI_INIT;
-static expert_field ei_pdcp_nr_sequence_analysis_sn_missing_ul = EI_INIT;
-static expert_field ei_pdcp_nr_sequence_analysis_sn_missing_dl = EI_INIT;
-static expert_field ei_pdcp_nr_digest_wrong = EI_INIT;
-static expert_field ei_pdcp_nr_unknown_udp_framing_tag = EI_INIT;
-static expert_field ei_pdcp_nr_missing_udp_framing_tag = EI_INIT;
+static int ett_pdcp;
+static int ett_pdcp_configuration;
+static int ett_pdcp_packet;
+static int ett_pdcp_nr_sequence_analysis;
+static int ett_pdcp_report_bitmap;
+static int ett_pdcp_security;
+
+static expert_field ei_pdcp_nr_sequence_analysis_wrong_sequence_number_ul;
+static expert_field ei_pdcp_nr_sequence_analysis_wrong_sequence_number_dl;
+static expert_field ei_pdcp_nr_reserved_bits_not_zero;
+static expert_field ei_pdcp_nr_sequence_analysis_sn_repeated_ul;
+static expert_field ei_pdcp_nr_sequence_analysis_sn_repeated_dl;
+static expert_field ei_pdcp_nr_sequence_analysis_sn_missing_ul;
+static expert_field ei_pdcp_nr_sequence_analysis_sn_missing_dl;
+static expert_field ei_pdcp_nr_digest_wrong;
+static expert_field ei_pdcp_nr_unknown_udp_framing_tag;
+static expert_field ei_pdcp_nr_missing_udp_framing_tag;
 
 /*-------------------------------------
  * UAT for UE Keys
@@ -521,13 +521,13 @@ static const value_string ciphering_algorithm_vals[] = {
 
 
 /* SDAP header fields and tree */
-static int proto_sdap = -1;
-static int hf_sdap_rdi = -1;
-static int hf_sdap_rqi = -1;
-static int hf_sdap_qfi = -1;
-static int hf_sdap_data_control = -1;
-static int hf_sdap_reserved = -1;
-static gint ett_sdap = -1;
+static int proto_sdap;
+static int hf_sdap_rdi;
+static int hf_sdap_rqi;
+static int hf_sdap_qfi;
+static int hf_sdap_data_control;
+static int hf_sdap_reserved;
+static gint ett_sdap;
 
 static const true_false_string sdap_rdi = {
     "To store QoS flow to DRB mapping rule",
diff --git a/epan/dissectors/packet-pdu-transport.c b/epan/dissectors/packet-pdu-transport.c
index 4e98696ba4..1bb0d4c4f1 100644
--- a/epan/dissectors/packet-pdu-transport.c
+++ b/epan/dissectors/packet-pdu-transport.c
@@ -42,7 +42,7 @@
 void proto_register_pdu_transport(void);
 void proto_reg_handoff_pdu_transport(void);
 
-static int proto_pdu_transport = -1;
+static int proto_pdu_transport;
 static dissector_handle_t pdu_transport_handle_udp = NULL;
 static dissector_handle_t pdu_transport_handle_tcp = NULL;
 
@@ -52,15 +52,15 @@ static dissector_table_t subdissector_table = NULL;
 #define PDU_TRANSPORT_HDR_LEN 8
 
 /* header field */
-static int hf_pdu_transport_id = -1;
-static int hf_pdu_transport_length = -1;
-static int hf_pdu_transport_payload = -1;
+static int hf_pdu_transport_id;
+static int hf_pdu_transport_length;
+static int hf_pdu_transport_payload;
 
 /* protocol tree items */
-static gint ett_pdu_transport = -1;
+static gint ett_pdu_transport;
 
 /* expert info items */
-static expert_field ei_pdu_transport_message_truncated = EI_INIT;
+static expert_field ei_pdu_transport_message_truncated;
 
 /********* UATs *********/
 
diff --git a/epan/dissectors/packet-peap.c b/epan/dissectors/packet-peap.c
index 69980ffd84..dfdb4c0c38 100644
--- a/epan/dissectors/packet-peap.c
+++ b/epan/dissectors/packet-peap.c
@@ -22,8 +22,8 @@
 void proto_register_peap(void);
 void proto_reg_handoff_peap(void);
 
-static int proto_peap = -1;
-static int proto_eap = -1;
+static int proto_peap;
+static int proto_eap;
 
 static dissector_handle_t peap_handle;
 static dissector_handle_t eap_handle;
diff --git a/epan/dissectors/packet-peekremote.c b/epan/dissectors/packet-peekremote.c
index beecd95fb9..89f6a1c010 100644
--- a/epan/dissectors/packet-peekremote.c
+++ b/epan/dissectors/packet-peekremote.c
@@ -171,65 +171,65 @@ static const value_string peekremote_type_vals[] = {
 #define EXT_FLAG_160MHZ                         0x00040000
 #define EXT_FLAGS_RESERVED                      0xFFFC0000
 
-static int hf_peekremote_band = -1;
-static int hf_peekremote_channel = -1;
-static int hf_peekremote_extflags = -1;
-static int hf_peekremote_extflags_11ac = -1;
-static int hf_peekremote_extflags_160mhz = -1;
-static int hf_peekremote_extflags_20mhz_lower = -1;
-static int hf_peekremote_extflags_20mhz_upper = -1;
-static int hf_peekremote_extflags_40mhz = -1;
-static int hf_peekremote_extflags_80mhz = -1;
-static int hf_peekremote_extflags_ampdu = -1;
-static int hf_peekremote_extflags_amsdu = -1;
-static int hf_peekremote_extflags_full_gi = -1;
-static int hf_peekremote_extflags_future_use = -1;
-static int hf_peekremote_extflags_half_gi = -1;
-static int hf_peekremote_extflags_heflag = -1;
-static int hf_peekremote_extflags_reserved = -1;
-static int hf_peekremote_extflags_shortpreamble = -1;
-static int hf_peekremote_extflags_spatialstreams = -1;
-static int hf_peekremote_flags = -1;
-static int hf_peekremote_flags_control_frame = -1;
-static int hf_peekremote_flags_crc_error = -1;
-static int hf_peekremote_flags_frame_error = -1;
-static int hf_peekremote_flags_reserved = -1;
-static int hf_peekremote_frequency = -1;
-static int hf_peekremote_header_size = -1;
-static int hf_peekremote_header_version = -1;
-static int hf_peekremote_magic_number = -1;
-static int hf_peekremote_mcs_index = -1;
-static int hf_peekremote_mcs_index_ac = -1;
-static int hf_peekremote_noise_1_dbm = -1;
-static int hf_peekremote_noise_2_dbm = -1;
-static int hf_peekremote_noise_3_dbm = -1;
-static int hf_peekremote_noise_4_dbm = -1;
-static int hf_peekremote_noise_dbm = -1;
-static int hf_peekremote_noise_percent = -1;
-static int hf_peekremote_packetlength = -1;
-static int hf_peekremote_signal_1_dbm = -1;
-static int hf_peekremote_signal_2_dbm = -1;
-static int hf_peekremote_signal_3_dbm = -1;
-static int hf_peekremote_signal_4_dbm = -1;
-static int hf_peekremote_signal_dbm = -1;
-static int hf_peekremote_signal_percent = -1;
-static int hf_peekremote_slicelength = -1;
-static int hf_peekremote_speed = -1;
-static int hf_peekremote_status = -1;
-static int hf_peekremote_status_protected = -1;
-static int hf_peekremote_status_reserved = -1;
-static int hf_peekremote_status_with_decrypt_error = -1;
-static int hf_peekremote_status_with_short_preamble = -1;
-static int hf_peekremote_timestamp = -1;
-static int hf_peekremote_type = -1;
-
-static expert_field ei_peekremote_unknown_header_version = EI_INIT;
-static expert_field ei_peekremote_invalid_header_size = EI_INIT;
-
-static gint ett_peekremote = -1;
-static gint ett_peekremote_flags = -1;
-static gint ett_peekremote_status = -1;
-static gint ett_peekremote_extflags = -1;
+static int hf_peekremote_band;
+static int hf_peekremote_channel;
+static int hf_peekremote_extflags;
+static int hf_peekremote_extflags_11ac;
+static int hf_peekremote_extflags_160mhz;
+static int hf_peekremote_extflags_20mhz_lower;
+static int hf_peekremote_extflags_20mhz_upper;
+static int hf_peekremote_extflags_40mhz;
+static int hf_peekremote_extflags_80mhz;
+static int hf_peekremote_extflags_ampdu;
+static int hf_peekremote_extflags_amsdu;
+static int hf_peekremote_extflags_full_gi;
+static int hf_peekremote_extflags_future_use;
+static int hf_peekremote_extflags_half_gi;
+static int hf_peekremote_extflags_heflag;
+static int hf_peekremote_extflags_reserved;
+static int hf_peekremote_extflags_shortpreamble;
+static int hf_peekremote_extflags_spatialstreams;
+static int hf_peekremote_flags;
+static int hf_peekremote_flags_control_frame;
+static int hf_peekremote_flags_crc_error;
+static int hf_peekremote_flags_frame_error;
+static int hf_peekremote_flags_reserved;
+static int hf_peekremote_frequency;
+static int hf_peekremote_header_size;
+static int hf_peekremote_header_version;
+static int hf_peekremote_magic_number;
+static int hf_peekremote_mcs_index;
+static int hf_peekremote_mcs_index_ac;
+static int hf_peekremote_noise_1_dbm;
+static int hf_peekremote_noise_2_dbm;
+static int hf_peekremote_noise_3_dbm;
+static int hf_peekremote_noise_4_dbm;
+static int hf_peekremote_noise_dbm;
+static int hf_peekremote_noise_percent;
+static int hf_peekremote_packetlength;
+static int hf_peekremote_signal_1_dbm;
+static int hf_peekremote_signal_2_dbm;
+static int hf_peekremote_signal_3_dbm;
+static int hf_peekremote_signal_4_dbm;
+static int hf_peekremote_signal_dbm;
+static int hf_peekremote_signal_percent;
+static int hf_peekremote_slicelength;
+static int hf_peekremote_speed;
+static int hf_peekremote_status;
+static int hf_peekremote_status_protected;
+static int hf_peekremote_status_reserved;
+static int hf_peekremote_status_with_decrypt_error;
+static int hf_peekremote_status_with_short_preamble;
+static int hf_peekremote_timestamp;
+static int hf_peekremote_type;
+
+static expert_field ei_peekremote_unknown_header_version;
+static expert_field ei_peekremote_invalid_header_size;
+
+static gint ett_peekremote;
+static gint ett_peekremote_flags;
+static gint ett_peekremote_status;
+static gint ett_peekremote_extflags;
 
 static dissector_handle_t wlan_radio_handle;
 
diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c
index 137ca579b8..0f7f46c659 100644
--- a/epan/dissectors/packet-per.c
+++ b/epan/dissectors/packet-per.c
@@ -29,59 +29,59 @@ proper helper routines
 
 void proto_register_per(void);
 
-static int proto_per = -1;
-static int hf_per_GeneralString_length = -1;
-static int hf_per_extension_bit = -1;
-static int hf_per_extension_present_bit = -1;
-static int hf_per_choice_index = -1;
-static int hf_per_choice_extension_index = -1;
-static int hf_per_enum_index = -1;
-static int hf_per_enum_extension_index = -1;
-static int hf_per_num_sequence_extensions = -1;
-static int hf_per_small_number_bit = -1;
-static int hf_per_optional_field_bit = -1;
-static int hf_per_sequence_of_length = -1;
-static int hf_per_object_identifier_length = -1;
-static int hf_per_open_type_length = -1;
-static int hf_per_real_length = -1;
-static int hf_per_octet_string_length = -1;
-static int hf_per_bit_string_length = -1;
-static int hf_per_normally_small_nonnegative_whole_number_length = -1;
-static int hf_per_const_int_len = -1;
-static int hf_per_direct_reference = -1; /* T_direct_reference */
-static int hf_per_indirect_reference = -1; /* T_indirect_reference */
-static int hf_per_data_value_descriptor = -1; /* T_data_value_descriptor */
-static int hf_per_encoding = -1; /* External_encoding */
-static int hf_per_single_ASN1_type = -1; /* T_single_ASN1_type */
-static int hf_per_octet_aligned = -1; /* T_octet_aligned */
-static int hf_per_arbitrary = -1; /* T_arbitrary */
-static int hf_per_integer_length = -1; /* Show integer length if "show internal per fields" */
-/* static int hf_per_debug_pos = -1; */
-static int hf_per_internal_range = -1;
-static int hf_per_internal_num_bits = -1;
-static int hf_per_internal_min = -1;
-static int hf_per_internal_value = -1;
-static int hf_per_encoding_boiler_plate = -1;
-
-static gint ett_per_open_type = -1;
-static gint ett_per_containing = -1;
-static gint ett_per_sequence_of_item = -1;
-static gint ett_per_External = -1;
-static gint ett_per_External_encoding = -1;
-static gint ett_per_named_bits = -1;
-
-static expert_field ei_per_size_constraint_value = EI_INIT;
-static expert_field ei_per_size_constraint_too_few = EI_INIT;
-static expert_field ei_per_size_constraint_too_many = EI_INIT;
-static expert_field ei_per_choice_extension_unknown = EI_INIT;
-static expert_field ei_per_sequence_extension_unknown = EI_INIT;
-static expert_field ei_per_encoding_error = EI_INIT;
-static expert_field ei_per_oid_not_implemented = EI_INIT;
-static expert_field ei_per_undecoded = EI_INIT;
-static expert_field ei_per_field_not_integer = EI_INIT;
-static expert_field ei_per_external_type = EI_INIT;
-static expert_field ei_per_open_type = EI_INIT;
-static expert_field ei_per_open_type_len = EI_INIT;
+static int proto_per;
+static int hf_per_GeneralString_length;
+static int hf_per_extension_bit;
+static int hf_per_extension_present_bit;
+static int hf_per_choice_index;
+static int hf_per_choice_extension_index;
+static int hf_per_enum_index;
+static int hf_per_enum_extension_index;
+static int hf_per_num_sequence_extensions;
+static int hf_per_small_number_bit;
+static int hf_per_optional_field_bit;
+static int hf_per_sequence_of_length;
+static int hf_per_object_identifier_length;
+static int hf_per_open_type_length;
+static int hf_per_real_length;
+static int hf_per_octet_string_length;
+static int hf_per_bit_string_length;
+static int hf_per_normally_small_nonnegative_whole_number_length;
+static int hf_per_const_int_len;
+static int hf_per_direct_reference; /* T_direct_reference */
+static int hf_per_indirect_reference; /* T_indirect_reference */
+static int hf_per_data_value_descriptor; /* T_data_value_descriptor */
+static int hf_per_encoding; /* External_encoding */
+static int hf_per_single_ASN1_type; /* T_single_ASN1_type */
+static int hf_per_octet_aligned; /* T_octet_aligned */
+static int hf_per_arbitrary; /* T_arbitrary */
+static int hf_per_integer_length; /* Show integer length if "show internal per fields" */
+/* static int hf_per_debug_pos; */
+static int hf_per_internal_range;
+static int hf_per_internal_num_bits;
+static int hf_per_internal_min;
+static int hf_per_internal_value;
+static int hf_per_encoding_boiler_plate;
+
+static gint ett_per_open_type;
+static gint ett_per_containing;
+static gint ett_per_sequence_of_item;
+static gint ett_per_External;
+static gint ett_per_External_encoding;
+static gint ett_per_named_bits;
+
+static expert_field ei_per_size_constraint_value;
+static expert_field ei_per_size_constraint_too_few;
+static expert_field ei_per_size_constraint_too_many;
+static expert_field ei_per_choice_extension_unknown;
+static expert_field ei_per_sequence_extension_unknown;
+static expert_field ei_per_encoding_error;
+static expert_field ei_per_oid_not_implemented;
+static expert_field ei_per_undecoded;
+static expert_field ei_per_field_not_integer;
+static expert_field ei_per_external_type;
+static expert_field ei_per_open_type;
+static expert_field ei_per_open_type_len;
 
 static dissector_table_t per_oid_dissector_table = NULL;
 
diff --git a/epan/dissectors/packet-pfcp.c b/epan/dissectors/packet-pfcp.c
index bdeb719050..c837c09270 100644
--- a/epan/dissectors/packet-pfcp.c
+++ b/epan/dissectors/packet-pfcp.c
@@ -37,1216 +37,1216 @@ static dissector_handle_t pfcp_handle;
 
 #define UDP_PORT_PFCP  8805 /* IANA-registered */
 
-static int proto_pfcp = -1;
-
-static int hf_pfcp_msg_type = -1;
-static int hf_pfcp_msg_length = -1;
-static int hf_pfcp_hdr_flags = -1;
-static int hf_pfcp_version = -1;
-static int hf_pfcp_fo_flag = -1;
-static int hf_pfcp_mp_flag = -1;
-static int hf_pfcp_s_flag = -1;
-static int hf_pfcp_seid = -1;
-static int hf_pfcp_seqno = -1;
-static int hf_pfcp_mp = -1;
-
-static int hf_pfcp2_ie = -1;
-static int hf_pfcp2_ie_len = -1;
-static int hf_pfcp2_enterprise_ie = -1;
-static int hf_pfcp_enterprise_id = -1;
-static int hf_pfcp_enterprise_data = -1;
-
-static int hf_pfcp_response_in = -1;
-static int hf_pfcp_response_to = -1;
-static int hf_pfcp_response_time = -1;
-
-static int hf_pfcp_session = -1;
-
-static int hf_pfcp_spare_b0 = -1;
-static int hf_pfcp_spare_b1 = -1;
-static int hf_pfcp_spare_b2 = -1;
-static int hf_pfcp_spare_b3 = -1;
-static int hf_pfcp_spare_b4 = -1;
-static int hf_pfcp_spare_b5 = -1;
-static int hf_pfcp_spare_b6 = -1;
-static int hf_pfcp_spare_b7 = -1;
-static int hf_pfcp_spare_b7_b6 = -1;
-static int hf_pfcp_spare_b7_b5 = -1;
-static int hf_pfcp_spare_b7_b4 = -1;
-static int hf_pfcp_spare_b7_b3 = -1;
-static int hf_pfcp_spare_b7_b2 = -1;
-static int hf_pfcp_spare_b7_b1 = -1;
-static int hf_pfcp_spare_h0 = -1;
-static int hf_pfcp_spare_h1 = -1;
-static int hf_pfcp_spare_oct = -1;
-static int hf_pfcp_spare = -1;
-
-static int hf_pfcp2_cause = -1;
-static int hf_pfcp_node_id_type = -1;
-static int hf_pfcp_node_id_ipv4 = -1;
-static int hf_pfcp_node_id_ipv6 = -1;
-static int hf_pfcp_node_id_fqdn = -1;
-static int hf_pfcp_recovery_time_stamp = -1;
-static int hf_pfcp_b0_v6 = -1;
-static int hf_pfcp_b1_v4 = -1;
-static int hf_pfcp_f_seid_ipv4 = -1;
-static int hf_pfcp_f_seid_ipv6 = -1;
-static int hf_pfcp_pdr_id = -1;
-static int hf_pfcp_precedence = -1;
-static int hf_pfcp_source_interface = -1;
-static int hf_pfcp_fteid_flg_spare = -1;
-static int hf_pfcp_fteid_flg_b3_ch_id = -1;
-static int hf_pfcp_fteid_flg_b2_ch = -1;
-static int hf_pfcp_fteid_flg_b1_v6 = -1;
-static int hf_pfcp_fteid_flg_b0_v4 = -1;
-static int hf_pfcp_f_teid_ch_id = -1;
-static int hf_pfcp_f_teid_teid = -1;
-static int hf_pfcp_f_teid_ipv4 = -1;
-static int hf_pfcp_f_teid_ipv6 = -1;
-static int hf_pfcp_network_instance = -1;
-static int hf_pfcp_pdn_type = -1;
-static int hf_pfcp_failed_rule_id_type = -1;
-static int hf_pfcp_time_quota_mechanism_bti_type = -1;
-static int hf_pfcp_time_quota_mechanism_bti = -1;
-static int hf_pfcp_multiplier_value_digits = -1;
-static int hf_pfcp_multiplier_exponent = -1;
-
-static int hf_pfcp_ue_ip_address_flag_b0_v6 = -1;
-static int hf_pfcp_ue_ip_address_flag_b1_v4 = -1;
-static int hf_pfcp_ue_ip_address_flag_b2_sd = -1;
-static int hf_pfcp_ue_ip_address_flag_b3_v6d = -1;
-static int hf_pfcp_ue_ip_address_flag_b4_chv4 = -1;
-static int hf_pfcp_ue_ip_address_flag_b5_chv6 = -1;
-static int hf_pfcp_ue_ip_address_flag_b6_v6pl = -1;
-static int hf_pfcp_ue_ip_addr_ipv4 = -1;
-static int hf_pfcp_ue_ip_add_ipv6 = -1;
-static int hf_pfcp_ue_ip_add_ipv6_prefix_delegation_bits = -1;
-static int hf_pfcp_ue_ip_add_ipv6_prefix_length = -1;
-static int hf_pfcp_application_id = -1;
-static int hf_pfcp_application_id_str = -1;
-
-static int hf_pfcp_sdf_filter_flags_b0_fd = -1;
-static int hf_pfcp_sdf_filter_flags_b1_ttc = -1;
-static int hf_pfcp_sdf_filter_flags_b2_spi = -1;
-static int hf_pfcp_sdf_filter_flags_b3_fl = -1;
-static int hf_pfcp_sdf_filter_flags_b4_bid = -1;
-
-static int hf_pfcp_flow_desc_len = -1;
-static int hf_pfcp_flow_desc = -1;
-static int hf_pfcp_traffic_class = -1;
-static int hf_pfcp_traffic_mask = -1;
-static int hf_pfcp_traffic_dscp = -1;
-static int hf_pfcp_spi = -1;
-static int hf_pfcp_flow_label_spare_bit = -1;
-static int hf_pfcp_flow_label = -1;
-static int hf_pfcp_sdf_filter_id = -1;
-
-static int hf_pfcp_out_hdr_desc = -1;
-static int hf_pfcp_gtpu_ext_hdr_del_b0_pdu_sess_cont = -1;
-static int hf_pfcp_far_id_flg = -1;
-static int hf_pfcp_far_id = -1;
-static int hf_pfcp_urr_id_flg = -1;
-static int hf_pfcp_urr_id = -1;
-static int hf_pfcp_qer_id_flg = -1;
-static int hf_pfcp_qer_id = -1;
-static int hf_pfcp_predef_rules_name = -1;
-
-
-
-static int hf_pfcp_apply_action_flags_o6_b4_mbsu = -1;
-static int hf_pfcp_apply_action_flags_o6_b3_fssm = -1;
-static int hf_pfcp_apply_action_flags_o6_b2_ddpn = -1;
-static int hf_pfcp_apply_action_flags_o6_b1_bdpn = -1;
-static int hf_pfcp_apply_action_flags_o6_b0_edrt = -1;
-static int hf_pfcp_apply_action_flags_o5_b7_dfrt = -1;
-static int hf_pfcp_apply_action_flags_o5_b6_ipmd = -1;
-static int hf_pfcp_apply_action_flags_o5_b5_ipma = -1;
-static int hf_pfcp_apply_action_flags_o5_b4_dupl = -1;
-static int hf_pfcp_apply_action_flags_o5_b3_nocp = -1;
-static int hf_pfcp_apply_action_flags_o5_b2_buff = -1;
-static int hf_pfcp_apply_action_flags_o5_b1_forw = -1;
-static int hf_pfcp_apply_action_flags_o5_b0_drop = -1;
-
-static int hf_pfcp_bar_id = -1;
-static int hf_pfcp_fq_csid_node_id_type = -1;
-static int hf_pfcp_num_csid = -1;
-static int hf_pfcp_fq_csid_node_id_ipv4 = -1;
-static int hf_pfcp_fq_csid_node_id_ipv6 = -1;
-static int hf_pfcp_fq_csid_node_id_mcc_mnc = -1;
-static int hf_pfcp_fq_csid_node_id_int = -1;
-static int hf_pfcp_fq_csid = -1;
-static int hf_pfcp_fq_csid_node_type = -1;
-static int hf_pfcp_measurement_period = -1;
-static int hf_pfcp_duration_measurement = -1;
-static int hf_pfcp_time_of_first_packet = -1;
-static int hf_pfcp_time_of_last_packet = -1;
-static int hf_pfcp_dst_interface = -1;
-static int hf_pfcp_redirect_address_type = -1;
-static int hf_pfcp_redirect_server_addr_len = -1;
-static int hf_pfcp_redirect_server_address = -1;
-static int hf_pfcp_other_redirect_server_addr_len = -1;
-static int hf_pfcp_other_redirect_server_address = -1;
-static int hf_pfcp_redirect_port = -1;
-static int hf_pfcp_outer_hdr_desc_o5_b0_gtp_udp_ipv4 = -1;
-static int hf_pfcp_outer_hdr_desc_o5_b1_gtp_udp_ipv6 = -1;
-static int hf_pfcp_outer_hdr_desc_o5_b2_udp_ipv4 = -1;
-static int hf_pfcp_outer_hdr_desc_o5_b3_udp_ipv6 = -1;
-static int hf_pfcp_outer_hdr_desc_o5_b4_ipv4 = -1;
-static int hf_pfcp_outer_hdr_desc_o5_b5_ipv6 = -1;
-static int hf_pfcp_outer_hdr_desc_o5_b6_ctag = -1;
-static int hf_pfcp_outer_hdr_desc_o5_b7_stag = -1;
-static int hf_pfcp_outer_hdr_desc_o6_b0_n19 = -1;
-static int hf_pfcp_outer_hdr_desc_o6_b1_n6 = -1;
-static int hf_pfcp_outer_hdr_desc_o6_b2_ssm_cteid = -1;
-static int hf_pfcp_outer_hdr_desc_o6_spare = -1;
-static int hf_pfcp_outer_hdr_creation_teid = -1;
-static int hf_pfcp_outer_hdr_creation_ipv4 = -1;
-static int hf_pfcp_outer_hdr_creation_ipv6 = -1;
-static int hf_pfcp_outer_hdr_creation_port = -1;
-static int hf_pfcp_time_threshold = -1;
-static int hf_pfcp_forwarding_policy_id_len = -1;
-static int hf_pfcp_forwarding_policy_id = -1;
-
-static int hf_pfcp_measurement_method_flags_b0_durat = -1;
-static int hf_pfcp_measurement_method_flags_b1_volume = -1;
-static int hf_pfcp_measurement_method_flags_b2_event = -1;
-
-static int hf_pfcp_subsequent_time_threshold = -1;
-static int hf_pfcp_inactivity_detection_time = -1;
-static int hf_pfcp_monitoring_time = -1;
-
-static int hf_pfcp_reporting_triggers_o5_b7_liusa = -1;
-static int hf_pfcp_reporting_triggers_o5_b6_droth = -1;
-static int hf_pfcp_reporting_triggers_o5_b5_stopt = -1;
-static int hf_pfcp_reporting_triggers_o5_b4_start = -1;
-static int hf_pfcp_reporting_triggers_o5_b3_quhti = -1;
-static int hf_pfcp_reporting_triggers_o5_b2_timth = -1;
-static int hf_pfcp_reporting_triggers_o5_b1_volth = -1;
-static int hf_pfcp_reporting_triggers_o5_b0_perio = -1;
-static int hf_pfcp_reporting_triggers_o6_b7_quvti = -1;
-static int hf_pfcp_reporting_triggers_o6_b6_ipmjl = -1;
-static int hf_pfcp_reporting_triggers_o6_b5_evequ = -1;
-static int hf_pfcp_reporting_triggers_o6_b4_eveth = -1;
-static int hf_pfcp_reporting_triggers_o6_b3_macar = -1;
-static int hf_pfcp_reporting_triggers_o6_b2_envcl = -1;
-static int hf_pfcp_reporting_triggers_o6_b1_timqu = -1;
-static int hf_pfcp_reporting_triggers_o6_b0_volqu = -1;
-static int hf_pfcp_reporting_triggers_o7_b1_upint = -1;
-static int hf_pfcp_reporting_triggers_o7_b0_reemr = -1;
-
-static int hf_pfcp_volume_threshold_b2_dlvol = -1;
-static int hf_pfcp_volume_threshold_b1_ulvol = -1;
-static int hf_pfcp_volume_threshold_b0_tovol = -1;
-static int hf_pfcp_volume_threshold_tovol = -1;
-static int hf_pfcp_volume_threshold_ulvol = -1;
-static int hf_pfcp_volume_threshold_dlvol = -1;
-
-static int hf_pfcp_volume_quota_b2_dlvol = -1;
-static int hf_pfcp_volume_quota_b1_ulvol = -1;
-static int hf_pfcp_volume_quota_b0_tovol = -1;
-static int hf_pfcp_volume_quota_tovol = -1;
-static int hf_pfcp_volume_quota_ulvol = -1;
-static int hf_pfcp_volume_quota_dlvol = -1;
-
-static int hf_pfcp_subseq_volume_threshold_b2_dlvol = -1;
-static int hf_pfcp_subseq_volume_threshold_b1_ulvol = -1;
-static int hf_pfcp_subseq_volume_threshold_b0_tovol = -1;
-static int hf_pfcp_subseq_volume_threshold_tovol = -1;
-static int hf_pfcp_subseq_volume_threshold_ulvol = -1;
-static int hf_pfcp_subseq_volume_threshold_dlvol = -1;
-
-static int hf_pfcp_time_quota = -1;
-static int hf_pfcp_start_time = -1;
-static int hf_pfcp_end_time = -1;
-static int hf_pfcp_quota_holding_time = -1;
-static int hf_pfcp_dropped_dl_traffic_threshold_b1_dlby = -1;
-static int hf_pfcp_dropped_dl_traffic_threshold_b0_dlpa = -1;
-static int hf_pfcp_downlink_packets = -1;
-static int hf_pfcp_bytes_downlink_data = -1;
-static int hf_pfcp_qer_correlation_id = -1;
-static int hf_pfcp_gate_status_b0b1_dlgate = -1;
-static int hf_pfcp_gate_status_b3b2_ulgate = -1;
-static int hf_pfcp_ul_mbr = -1;
-static int hf_pfcp_dl_mbr = -1;
-static int hf_pfcp_ul_gbr = -1;
-static int hf_pfcp_dl_gbr = -1;
-
-static int hf_pfcp_report_type_b6_uisr = -1;
-static int hf_pfcp_report_type_b5_sesr = -1;
-static int hf_pfcp_report_type_b4_tmir = -1;
-static int hf_pfcp_report_type_b3_upir = -1;
-static int hf_pfcp_report_type_b2_erir = -1;
-static int hf_pfcp_report_type_b1_usar = -1;
-static int hf_pfcp_report_type_b0_dldr = -1;
-
-static int hf_pfcp_offending_ie = -1;
-static int hf_pfcp_offending_ie_value = -1;
-
-static int hf_pfcp_up_function_features_o13_b2_qmdrm = -1;
-static int hf_pfcp_up_function_features_o13_b1_cntl = -1;
-static int hf_pfcp_up_function_features_o13_b0_pdusm = -1;
-static int hf_pfcp_up_function_features_o12_b7_eml4s = -1;
-static int hf_pfcp_up_function_features_o12_b6_detnet = -1;
-static int hf_pfcp_up_function_features_o12_b5_qmcon = -1;
-static int hf_pfcp_up_function_features_o12_b4_n6jedb = -1;
-static int hf_pfcp_up_function_features_o12_b3_drtsc = -1;
-static int hf_pfcp_up_function_features_o12_b2_tscts = -1;
-static int hf_pfcp_up_function_features_o12_b1_dbdm = -1;
-static int hf_pfcp_up_function_features_o12_b0_redsm = -1;
-static int hf_pfcp_up_function_features_o11_b7_mpquic = -1;
-static int hf_pfcp_up_function_features_o11_b6_afsfc = -1;
-static int hf_pfcp_up_function_features_o11_b5_upidp = -1;
-static int hf_pfcp_up_function_features_o11_b4_ratp = -1;
-static int hf_pfcp_up_function_features_o11_b3_eppi = -1;
-static int hf_pfcp_up_function_features_o11_b2_psuprm = -1;
-static int hf_pfcp_up_function_features_o11_b1_mbsn4 = -1;
-static int hf_pfcp_up_function_features_o11_b0_drqos = -1;
-static int hf_pfcp_up_function_features_o10_b7_dnsts = -1;
-static int hf_pfcp_up_function_features_o10_b6_iprep = -1;
-static int hf_pfcp_up_function_features_o10_b5_resps = -1;
-static int hf_pfcp_up_function_features_o10_b4_upber = -1;
-static int hf_pfcp_up_function_features_o10_b3_l2tp = -1;
-static int hf_pfcp_up_function_features_o10_b2_nspoc = -1;
-static int hf_pfcp_up_function_features_o10_b1_quasf = -1;
-static int hf_pfcp_up_function_features_o10_b0_rttwp = -1;
-static int hf_pfcp_up_function_features_o9_b7_rds = -1;
-static int hf_pfcp_up_function_features_o9_b6_ddds = -1;
-static int hf_pfcp_up_function_features_o9_b5_ethar = -1;
-static int hf_pfcp_up_function_features_o9_b4_ciot = -1;
-static int hf_pfcp_up_function_features_o9_b3_mt_edt = -1;
-static int hf_pfcp_up_function_features_o9_b2_gpqm = -1;
-static int hf_pfcp_up_function_features_o9_b1_qfqm = -1;
-static int hf_pfcp_up_function_features_o9_b0_atsss_ll = -1;
-static int hf_pfcp_up_function_features_o8_b7_mptcp = -1;
-static int hf_pfcp_up_function_features_o8_b6_tsn = -1;
-static int hf_pfcp_up_function_features_o8_b5_ip6pl = -1;
-static int hf_pfcp_up_function_features_o8_b4_iptv = -1;
-static int hf_pfcp_up_function_features_o8_b3_norp = -1;
-static int hf_pfcp_up_function_features_o8_b2_vtime = -1;
-static int hf_pfcp_up_function_features_o8_b1_rttl = -1;
-static int hf_pfcp_up_function_features_o8_b0_mpas = -1;
-static int hf_pfcp_up_function_features_o7_b7_gcom = -1;
-static int hf_pfcp_up_function_features_o7_b6_bundl = -1;
-static int hf_pfcp_up_function_features_o7_b5_mte_n4 = -1;
-static int hf_pfcp_up_function_features_o7_b4_mnop = -1;
-static int hf_pfcp_up_function_features_o7_b3_sset = -1;
-static int hf_pfcp_up_function_features_o7_b2_ueip = -1;
-static int hf_pfcp_up_function_features_o7_b1_adpdp = -1;
-static int hf_pfcp_up_function_features_o7_b0_dpdra = -1;
-static int hf_pfcp_up_function_features_o6_b7_epfar = -1;
-static int hf_pfcp_up_function_features_o6_b6_pfde = -1;
-static int hf_pfcp_up_function_features_o6_b5_frrt = -1;
-static int hf_pfcp_up_function_features_o6_b4_trace = -1;
-static int hf_pfcp_up_function_features_o6_b3_quoac = -1;
-static int hf_pfcp_up_function_features_o6_b2_udbc = -1;
-static int hf_pfcp_up_function_features_o6_b1_pdiu = -1;
-static int hf_pfcp_up_function_features_o6_b0_empu = -1;
-static int hf_pfcp_up_function_features_o5_b7_treu = -1;
-static int hf_pfcp_up_function_features_o5_b6_heeu = -1;
-static int hf_pfcp_up_function_features_o5_b5_pfdm = -1;
-static int hf_pfcp_up_function_features_o5_b4_ftup = -1;
-static int hf_pfcp_up_function_features_o5_b3_trst = -1;
-static int hf_pfcp_up_function_features_o5_b2_dlbd = -1;
-static int hf_pfcp_up_function_features_o5_b1_ddnd = -1;
-static int hf_pfcp_up_function_features_o5_b0_bucp = -1;
-
-static int hf_pfcp_sequence_number = -1;
-static int hf_pfcp_metric = -1;
-static int hf_pfcp_timer_unit = -1;
-static int hf_pfcp_timer_value = -1;
-
-static int hf_pfcp_usage_report_trigger_o5_b7_immer = -1;
-static int hf_pfcp_usage_report_trigger_o5_b6_droth = -1;
-static int hf_pfcp_usage_report_trigger_o5_b5_stopt = -1;
-static int hf_pfcp_usage_report_trigger_o5_b4_start = -1;
-static int hf_pfcp_usage_report_trigger_o5_b3_quhti = -1;
-static int hf_pfcp_usage_report_trigger_o5_b2_timth = -1;
-static int hf_pfcp_usage_report_trigger_o5_b1_volth = -1;
-static int hf_pfcp_usage_report_trigger_o5_b0_perio = -1;
-static int hf_pfcp_usage_report_trigger_o6_b7_eveth = -1;
-static int hf_pfcp_usage_report_trigger_o6_b6_macar = -1;
-static int hf_pfcp_usage_report_trigger_o6_b5_envcl = -1;
-static int hf_pfcp_usage_report_trigger_o6_b4_monit = -1;
-static int hf_pfcp_usage_report_trigger_o6_b3_termr = -1;
-static int hf_pfcp_usage_report_trigger_o6_b2_liusa = -1;
-static int hf_pfcp_usage_report_trigger_o6_b1_timqu = -1;
-static int hf_pfcp_usage_report_trigger_o6_b0_volqu = -1;
-static int hf_pfcp_usage_report_trigger_o7_b5_upint = -1;
-static int hf_pfcp_usage_report_trigger_o7_b4_emrre = -1;
-static int hf_pfcp_usage_report_trigger_o7_b3_quvti = -1;
-static int hf_pfcp_usage_report_trigger_o7_b2_ipmjl = -1;
-static int hf_pfcp_usage_report_trigger_o7_b1_tebur = -1;
-static int hf_pfcp_usage_report_trigger_o7_b0_evequ = -1;
-
-static int hf_pfcp_volume_measurement_b5_dlnop = -1;
-static int hf_pfcp_volume_measurement_b4_ulnop = -1;
-static int hf_pfcp_volume_measurement_b3_tonop = -1;
-static int hf_pfcp_volume_measurement_b2_dlvol = -1;
-static int hf_pfcp_volume_measurement_b1_ulvol = -1;
-static int hf_pfcp_volume_measurement_b0_tovol = -1;
-static int hf_pfcp_vol_meas_tovol = -1;
-static int hf_pfcp_vol_meas_ulvol = -1;
-static int hf_pfcp_vol_meas_dlvol = -1;
-static int hf_pfcp_vol_meas_tonop = -1;
-static int hf_pfcp_vol_meas_ulnop = -1;
-static int hf_pfcp_vol_meas_dlnop = -1;
-
-static int hf_pfcp_cp_function_features_o6_b1_rpgur = -1;
-static int hf_pfcp_cp_function_features_o6_b0_psucc = -1;
-static int hf_pfcp_cp_function_features_o5_b7_uiaur = -1;
-static int hf_pfcp_cp_function_features_o5_b6_ardr = -1;
-static int hf_pfcp_cp_function_features_o5_b5_mpas = -1;
-static int hf_pfcp_cp_function_features_o5_b4_bundl = -1;
-static int hf_pfcp_cp_function_features_o5_b3_sset = -1;
-static int hf_pfcp_cp_function_features_o5_b2_epfar = -1;
-static int hf_pfcp_cp_function_features_o5_b1_ovrl = -1;
-static int hf_pfcp_cp_function_features_o5_b0_load = -1;
-
-static int hf_pfcp_usage_information_b3_ube = -1;
-static int hf_pfcp_usage_information_b2_uae = -1;
-static int hf_pfcp_usage_information_b1_aft = -1;
-static int hf_pfcp_usage_information_b0_bef = -1;
-
-static int hf_pfcp_application_instance_id = -1;
-static int hf_pfcp_application_instance_id_str = -1;
-static int hf_pfcp_flow_dir = -1;
-static int hf_pfcp_packet_rate_b0_ulpr = -1;
-static int hf_pfcp_packet_rate_b1_dlpr = -1;
-static int hf_pfcp_packet_rate_b2_aprc = -1;
-static int hf_pfcp_ul_time_unit = -1;
-static int hf_pfcp_max_ul_pr = -1;
-static int hf_pfcp_dl_time_unit = -1;
-static int hf_pfcp_max_dl_pr = -1;
-static int hf_pfcp_a_ul_time_unit = -1;
-static int hf_pfcp_a_max_ul_pr = -1;
-static int hf_pfcp_a_dl_time_unit = -1;
-static int hf_pfcp_a_max_dl_pr = -1;
-
-static int hf_pfcp_dl_flow_level_marking_b0_ttc = -1;
-static int hf_pfcp_dl_flow_level_marking_b1_sci = -1;
-
-static int hf_pfcp_sci = -1;
-static int hf_pfcp_dl_data_notification_delay = -1;
-static int hf_pfcp_packet_count = -1;
-static int hf_pfcp_dl_data_service_inf_b0_ppi = -1;
-static int hf_pfcp_dl_data_service_inf_b1_qfii = -1;
-static int hf_pfcp_ppi = -1;
-
-static int hf_pfcp_pfcpsmreq_flags_b0_drobu = -1;
-static int hf_pfcp_pfcpsmreq_flags_b1_sndem = -1;
-static int hf_pfcp_pfcpsmreq_flags_b2_qaurr = -1;
-static int hf_pfcp_pfcpsmreq_flags_b3_sumpc = -1;
-static int hf_pfcp_pfcpsmreq_flags_b4_rumuc = -1;
-static int hf_pfcp_pfcpsmreq_flags_b5_deteid = -1;
-
-static int hf_pfcp_pfcpsrrsp_flags_b0_drobu = -1;
-
-static int hf_pfcp_pfd_contents_flags_b7_adnp = -1;
-static int hf_pfcp_pfd_contents_flags_b6_aurl = -1;
-static int hf_pfcp_pfd_contents_flags_b5_afd = -1;
-static int hf_pfcp_pfd_contents_flags_b4_dnp = -1;
-static int hf_pfcp_pfd_contents_flags_b3_cp = -1;
-static int hf_pfcp_pfd_contents_flags_b2_dn = -1;
-static int hf_pfcp_pfd_contents_flags_b1_url = -1;
-static int hf_pfcp_pfd_contents_flags_b0_fd = -1;
-
-static int hf_pfcp_url_len = -1;
-static int hf_pfcp_url = -1;
-static int hf_pfcp_dn_len = -1;
-static int hf_pfcp_dn = -1;
-static int hf_pfcp_cp_len = -1;
-static int hf_pfcp_cp = -1;
-static int hf_pfcp_dnp_len = -1;
-static int hf_pfcp_dnp = -1;
-static int hf_pfcp_afd_len = -1;
-static int hf_pfcp_aurl_len = -1;
-static int hf_pfcp_adnp_len = -1;
-static int hf_pfcp_header_type = -1;
-static int hf_pfcp_hf_len = -1;
-static int hf_pfcp_hf_name = -1;
-static int hf_pfcp_hf_val_len = -1;
-static int hf_pfcp_hf_val = -1;
-
-static int hf_pfcp_measurement_info_b0_mbqe = -1;
-static int hf_pfcp_measurement_info_b1_inam = -1;
-static int hf_pfcp_measurement_info_b2_radi = -1;
-static int hf_pfcp_measurement_info_b3_istm = -1;
-static int hf_pfcp_measurement_info_b4_mnop = -1;
-static int hf_pfcp_measurement_info_b5_sspoc = -1;
-static int hf_pfcp_measurement_info_b6_aspoc = -1;
-static int hf_pfcp_measurement_info_b7_ciam = -1;
-
-static int hf_pfcp_node_report_type_b0_upfr = -1;
-static int hf_pfcp_node_report_type_b1_uprr = -1;
-static int hf_pfcp_node_report_type_b2_ckdr = -1;
-static int hf_pfcp_node_report_type_b3_gpqr = -1;
-static int hf_pfcp_node_report_type_b4_purr = -1;
-static int hf_pfcp_node_report_type_b5_vsr = -1;
-
-static int hf_pfcp_remote_gtp_u_peer_flags_b0_v6 = -1;
-static int hf_pfcp_remote_gtp_u_peer_flags_b1_v4 = -1;
-static int hf_pfcp_remote_gtp_u_peer_flags_b2_di = -1;
-static int hf_pfcp_remote_gtp_u_peer_flags_b3_ni = -1;
-static int hf_pfcp_remote_gtp_u_peer_ipv4 = -1;
-static int hf_pfcp_remote_gtp_u_peer_ipv6 = -1;
-static int hf_pfcp_remote_gtp_u_peer_length_di = -1;
-static int hf_pfcp_remote_gtp_u_peer_length_ni = -1;
-static int hf_pfcp_ur_seqn = -1;
-
-static int hf_pfcp_oci_flags_b0_aoci = -1;
-
-static int hf_pfcp_pfcp_assoc_rel_req_b0_sarr = -1;
-static int hf_pfcp_pfcp_assoc_rel_req_b1_urss = -1;
-
-static int hf_pfcp_upiri_flags_b0_v4 = -1;
-static int hf_pfcp_upiri_flags_b1_v6 = -1;
-static int hf_pfcp_upiri_flg_b6_assosi = -1;
-static int hf_pfcp_upiri_flg_b5_assoni = -1;
-static int hf_pfcp_upiri_flg_b2b4_teidri = -1;
-static int hf_pfcp_upiri_teidri = -1;
-static int hf_pfcp_upiri_teid_range = -1;
-static int hf_pfcp_upiri_ipv4 = -1;
-static int hf_pfcp_upiri_ipv6 = -1;
-
-static int hf_pfcp_user_plane_inactivity_timer = -1;
-
-static int hf_pfcp_subsequent_volume_quota_b2_dlvol = -1;
-static int hf_pfcp_subsequent_volume_quota_b1_ulvol = -1;
-static int hf_pfcp_subsequent_volume_quota_b0_tovol = -1;
-static int hf_pfcp_subsequent_volume_quota_tovol = -1;
-static int hf_pfcp_subsequent_volume_quota_ulvol = -1;
-static int hf_pfcp_subsequent_volume_quota_dlvol = -1;
-
-static int hf_pfcp_subsequent_time_quota = -1;
-
-static int hf_pfcp_rqi_flag = -1;
-static int hf_pfcp_qfi = -1;
-static int hf_pfcp_query_urr_reference = -1;
-static int hf_pfcp_additional_usage_reports_information_b14_b0_number_value = -1;
-static int hf_pfcp_additional_usage_reports_information_b15_auri = -1;
-static int hf_pfcp_traffic_endpoint_id = -1;
-
-static int hf_pfcp_mac_address_flags_b3_udes = -1;
-static int hf_pfcp_mac_address_flags_b2_usou = -1;
-static int hf_pfcp_mac_address_flags_b1_dest = -1;
-static int hf_pfcp_mac_address_flags_b0_sour = -1;
-static int hf_pfcp_mac_address_upper_dest_mac_address = -1;
-static int hf_pfcp_mac_address_upper_source_mac_address = -1;
-static int hf_pfcp_mac_address_dest_mac_address = -1;
-static int hf_pfcp_mac_address_source_mac_address = -1;
-
-static int hf_pfcp_c_tag_flags_b2_vid = -1;
-static int hf_pfcp_c_tag_flags_b1_dei = -1;
-static int hf_pfcp_c_tag_flags_b0_pcp = -1;
-static int hf_pfcp_c_tag_cvid = -1;
-static int hf_pfcp_c_tag_dei_flag = -1;
-static int hf_pfcp_c_tag_pcp_value = -1;
-
-static int hf_pfcp_s_tag_flags_b2_vid = -1;
-static int hf_pfcp_s_tag_flags_b1_dei = -1;
-static int hf_pfcp_s_tag_flags_b0_pcp = -1;
-static int hf_pfcp_s_tag_svid = -1;
-static int hf_pfcp_s_tag_dei_flag = -1;
-static int hf_pfcp_s_tag_pcp_value = -1;
-
-static int hf_pfcp_ethertype = -1;
-
-static int hf_pfcp_proxying_flags_b1_ins = -1;
-static int hf_pfcp_proxying_flags_b0_arp = -1;
-
-static int hf_pfcp_ethertype_filter_id = -1;
-
-static int hf_pfcp_ethertype_filter_properties_flags_b0_bide = -1;
-
-static int hf_pfcp_suggested_buffering_packets_count_packet_count = -1;
-
-static int hf_pfcp_user_id_flags_b6_peif = -1;
-static int hf_pfcp_user_id_flags_b5_gpsif = -1;
-static int hf_pfcp_user_id_flags_b4_supif = -1;
-static int hf_pfcp_user_id_flags_b3_naif = -1;
-static int hf_pfcp_user_id_flags_b2_msisdnf = -1;
-static int hf_pfcp_user_id_flags_b1_imeif = -1;
-static int hf_pfcp_user_id_flags_b0_imsif = -1;
-static int hf_pfcp_user_id_length_of_imsi = -1;
-static int hf_pfcp_user_id_length_of_imei = -1;
-static int hf_pfcp_user_id_imei = -1;
-static int hf_pfcp_user_id_length_of_msisdn = -1;
-static int hf_pfcp_user_id_length_of_nai = -1;
-static int hf_pfcp_user_id_nai = -1;
-static int hf_pfcp_user_id_length_of_supi = -1;
-static int hf_pfcp_user_id_supi = -1;
-static int hf_pfcp_user_id_length_of_gpsi = -1;
-static int hf_pfcp_user_id_gpsi = -1;
-static int hf_pfcp_user_id_length_of_pei = -1;
-static int hf_pfcp_user_id_pei = -1;
-
-static int hf_pfcp_ethernet_pdu_session_information_flags_b0_ethi = -1;
-
-static int hf_pfcp_mac_addresses_detected_number_of_mac_addresses = -1;
-static int hf_pfcp_mac_addresses_detected_mac_address = -1;
-static int hf_pfcp_mac_addresses_detected_length_of_ctag = -1;
-static int hf_pfcp_mac_addresses_detected_length_of_stag = -1;
-
-static int hf_pfcp_mac_addresses_removed_number_of_mac_addresses = -1;
-static int hf_pfcp_mac_addresses_removed_mac_address = -1;
-static int hf_pfcp_mac_addresses_removed_length_of_ctag = -1;
-static int hf_pfcp_mac_addresses_removed_length_of_stag = -1;
+static int proto_pfcp;
+
+static int hf_pfcp_msg_type;
+static int hf_pfcp_msg_length;
+static int hf_pfcp_hdr_flags;
+static int hf_pfcp_version;
+static int hf_pfcp_fo_flag;
+static int hf_pfcp_mp_flag;
+static int hf_pfcp_s_flag;
+static int hf_pfcp_seid;
+static int hf_pfcp_seqno;
+static int hf_pfcp_mp;
+
+static int hf_pfcp2_ie;
+static int hf_pfcp2_ie_len;
+static int hf_pfcp2_enterprise_ie;
+static int hf_pfcp_enterprise_id;
+static int hf_pfcp_enterprise_data;
+
+static int hf_pfcp_response_in;
+static int hf_pfcp_response_to;
+static int hf_pfcp_response_time;
+
+static int hf_pfcp_session;
+
+static int hf_pfcp_spare_b0;
+static int hf_pfcp_spare_b1;
+static int hf_pfcp_spare_b2;
+static int hf_pfcp_spare_b3;
+static int hf_pfcp_spare_b4;
+static int hf_pfcp_spare_b5;
+static int hf_pfcp_spare_b6;
+static int hf_pfcp_spare_b7;
+static int hf_pfcp_spare_b7_b6;
+static int hf_pfcp_spare_b7_b5;
+static int hf_pfcp_spare_b7_b4;
+static int hf_pfcp_spare_b7_b3;
+static int hf_pfcp_spare_b7_b2;
+static int hf_pfcp_spare_b7_b1;
+static int hf_pfcp_spare_h0;
+static int hf_pfcp_spare_h1;
+static int hf_pfcp_spare_oct;
+static int hf_pfcp_spare;
+
+static int hf_pfcp2_cause;
+static int hf_pfcp_node_id_type;
+static int hf_pfcp_node_id_ipv4;
+static int hf_pfcp_node_id_ipv6;
+static int hf_pfcp_node_id_fqdn;
+static int hf_pfcp_recovery_time_stamp;
+static int hf_pfcp_b0_v6;
+static int hf_pfcp_b1_v4;
+static int hf_pfcp_f_seid_ipv4;
+static int hf_pfcp_f_seid_ipv6;
+static int hf_pfcp_pdr_id;
+static int hf_pfcp_precedence;
+static int hf_pfcp_source_interface;
+static int hf_pfcp_fteid_flg_spare;
+static int hf_pfcp_fteid_flg_b3_ch_id;
+static int hf_pfcp_fteid_flg_b2_ch;
+static int hf_pfcp_fteid_flg_b1_v6;
+static int hf_pfcp_fteid_flg_b0_v4;
+static int hf_pfcp_f_teid_ch_id;
+static int hf_pfcp_f_teid_teid;
+static int hf_pfcp_f_teid_ipv4;
+static int hf_pfcp_f_teid_ipv6;
+static int hf_pfcp_network_instance;
+static int hf_pfcp_pdn_type;
+static int hf_pfcp_failed_rule_id_type;
+static int hf_pfcp_time_quota_mechanism_bti_type;
+static int hf_pfcp_time_quota_mechanism_bti;
+static int hf_pfcp_multiplier_value_digits;
+static int hf_pfcp_multiplier_exponent;
+
+static int hf_pfcp_ue_ip_address_flag_b0_v6;
+static int hf_pfcp_ue_ip_address_flag_b1_v4;
+static int hf_pfcp_ue_ip_address_flag_b2_sd;
+static int hf_pfcp_ue_ip_address_flag_b3_v6d;
+static int hf_pfcp_ue_ip_address_flag_b4_chv4;
+static int hf_pfcp_ue_ip_address_flag_b5_chv6;
+static int hf_pfcp_ue_ip_address_flag_b6_v6pl;
+static int hf_pfcp_ue_ip_addr_ipv4;
+static int hf_pfcp_ue_ip_add_ipv6;
+static int hf_pfcp_ue_ip_add_ipv6_prefix_delegation_bits;
+static int hf_pfcp_ue_ip_add_ipv6_prefix_length;
+static int hf_pfcp_application_id;
+static int hf_pfcp_application_id_str;
+
+static int hf_pfcp_sdf_filter_flags_b0_fd;
+static int hf_pfcp_sdf_filter_flags_b1_ttc;
+static int hf_pfcp_sdf_filter_flags_b2_spi;
+static int hf_pfcp_sdf_filter_flags_b3_fl;
+static int hf_pfcp_sdf_filter_flags_b4_bid;
+
+static int hf_pfcp_flow_desc_len;
+static int hf_pfcp_flow_desc;
+static int hf_pfcp_traffic_class;
+static int hf_pfcp_traffic_mask;
+static int hf_pfcp_traffic_dscp;
+static int hf_pfcp_spi;
+static int hf_pfcp_flow_label_spare_bit;
+static int hf_pfcp_flow_label;
+static int hf_pfcp_sdf_filter_id;
+
+static int hf_pfcp_out_hdr_desc;
+static int hf_pfcp_gtpu_ext_hdr_del_b0_pdu_sess_cont;
+static int hf_pfcp_far_id_flg;
+static int hf_pfcp_far_id;
+static int hf_pfcp_urr_id_flg;
+static int hf_pfcp_urr_id;
+static int hf_pfcp_qer_id_flg;
+static int hf_pfcp_qer_id;
+static int hf_pfcp_predef_rules_name;
+
+
+
+static int hf_pfcp_apply_action_flags_o6_b4_mbsu;
+static int hf_pfcp_apply_action_flags_o6_b3_fssm;
+static int hf_pfcp_apply_action_flags_o6_b2_ddpn;
+static int hf_pfcp_apply_action_flags_o6_b1_bdpn;
+static int hf_pfcp_apply_action_flags_o6_b0_edrt;
+static int hf_pfcp_apply_action_flags_o5_b7_dfrt;
+static int hf_pfcp_apply_action_flags_o5_b6_ipmd;
+static int hf_pfcp_apply_action_flags_o5_b5_ipma;
+static int hf_pfcp_apply_action_flags_o5_b4_dupl;
+static int hf_pfcp_apply_action_flags_o5_b3_nocp;
+static int hf_pfcp_apply_action_flags_o5_b2_buff;
+static int hf_pfcp_apply_action_flags_o5_b1_forw;
+static int hf_pfcp_apply_action_flags_o5_b0_drop;
+
+static int hf_pfcp_bar_id;
+static int hf_pfcp_fq_csid_node_id_type;
+static int hf_pfcp_num_csid;
+static int hf_pfcp_fq_csid_node_id_ipv4;
+static int hf_pfcp_fq_csid_node_id_ipv6;
+static int hf_pfcp_fq_csid_node_id_mcc_mnc;
+static int hf_pfcp_fq_csid_node_id_int;
+static int hf_pfcp_fq_csid;
+static int hf_pfcp_fq_csid_node_type;
+static int hf_pfcp_measurement_period;
+static int hf_pfcp_duration_measurement;
+static int hf_pfcp_time_of_first_packet;
+static int hf_pfcp_time_of_last_packet;
+static int hf_pfcp_dst_interface;
+static int hf_pfcp_redirect_address_type;
+static int hf_pfcp_redirect_server_addr_len;
+static int hf_pfcp_redirect_server_address;
+static int hf_pfcp_other_redirect_server_addr_len;
+static int hf_pfcp_other_redirect_server_address;
+static int hf_pfcp_redirect_port;
+static int hf_pfcp_outer_hdr_desc_o5_b0_gtp_udp_ipv4;
+static int hf_pfcp_outer_hdr_desc_o5_b1_gtp_udp_ipv6;
+static int hf_pfcp_outer_hdr_desc_o5_b2_udp_ipv4;
+static int hf_pfcp_outer_hdr_desc_o5_b3_udp_ipv6;
+static int hf_pfcp_outer_hdr_desc_o5_b4_ipv4;
+static int hf_pfcp_outer_hdr_desc_o5_b5_ipv6;
+static int hf_pfcp_outer_hdr_desc_o5_b6_ctag;
+static int hf_pfcp_outer_hdr_desc_o5_b7_stag;
+static int hf_pfcp_outer_hdr_desc_o6_b0_n19;
+static int hf_pfcp_outer_hdr_desc_o6_b1_n6;
+static int hf_pfcp_outer_hdr_desc_o6_b2_ssm_cteid;
+static int hf_pfcp_outer_hdr_desc_o6_spare;
+static int hf_pfcp_outer_hdr_creation_teid;
+static int hf_pfcp_outer_hdr_creation_ipv4;
+static int hf_pfcp_outer_hdr_creation_ipv6;
+static int hf_pfcp_outer_hdr_creation_port;
+static int hf_pfcp_time_threshold;
+static int hf_pfcp_forwarding_policy_id_len;
+static int hf_pfcp_forwarding_policy_id;
+
+static int hf_pfcp_measurement_method_flags_b0_durat;
+static int hf_pfcp_measurement_method_flags_b1_volume;
+static int hf_pfcp_measurement_method_flags_b2_event;
+
+static int hf_pfcp_subsequent_time_threshold;
+static int hf_pfcp_inactivity_detection_time;
+static int hf_pfcp_monitoring_time;
+
+static int hf_pfcp_reporting_triggers_o5_b7_liusa;
+static int hf_pfcp_reporting_triggers_o5_b6_droth;
+static int hf_pfcp_reporting_triggers_o5_b5_stopt;
+static int hf_pfcp_reporting_triggers_o5_b4_start;
+static int hf_pfcp_reporting_triggers_o5_b3_quhti;
+static int hf_pfcp_reporting_triggers_o5_b2_timth;
+static int hf_pfcp_reporting_triggers_o5_b1_volth;
+static int hf_pfcp_reporting_triggers_o5_b0_perio;
+static int hf_pfcp_reporting_triggers_o6_b7_quvti;
+static int hf_pfcp_reporting_triggers_o6_b6_ipmjl;
+static int hf_pfcp_reporting_triggers_o6_b5_evequ;
+static int hf_pfcp_reporting_triggers_o6_b4_eveth;
+static int hf_pfcp_reporting_triggers_o6_b3_macar;
+static int hf_pfcp_reporting_triggers_o6_b2_envcl;
+static int hf_pfcp_reporting_triggers_o6_b1_timqu;
+static int hf_pfcp_reporting_triggers_o6_b0_volqu;
+static int hf_pfcp_reporting_triggers_o7_b1_upint;
+static int hf_pfcp_reporting_triggers_o7_b0_reemr;
+
+static int hf_pfcp_volume_threshold_b2_dlvol;
+static int hf_pfcp_volume_threshold_b1_ulvol;
+static int hf_pfcp_volume_threshold_b0_tovol;
+static int hf_pfcp_volume_threshold_tovol;
+static int hf_pfcp_volume_threshold_ulvol;
+static int hf_pfcp_volume_threshold_dlvol;
+
+static int hf_pfcp_volume_quota_b2_dlvol;
+static int hf_pfcp_volume_quota_b1_ulvol;
+static int hf_pfcp_volume_quota_b0_tovol;
+static int hf_pfcp_volume_quota_tovol;
+static int hf_pfcp_volume_quota_ulvol;
+static int hf_pfcp_volume_quota_dlvol;
+
+static int hf_pfcp_subseq_volume_threshold_b2_dlvol;
+static int hf_pfcp_subseq_volume_threshold_b1_ulvol;
+static int hf_pfcp_subseq_volume_threshold_b0_tovol;
+static int hf_pfcp_subseq_volume_threshold_tovol;
+static int hf_pfcp_subseq_volume_threshold_ulvol;
+static int hf_pfcp_subseq_volume_threshold_dlvol;
+
+static int hf_pfcp_time_quota;
+static int hf_pfcp_start_time;
+static int hf_pfcp_end_time;
+static int hf_pfcp_quota_holding_time;
+static int hf_pfcp_dropped_dl_traffic_threshold_b1_dlby;
+static int hf_pfcp_dropped_dl_traffic_threshold_b0_dlpa;
+static int hf_pfcp_downlink_packets;
+static int hf_pfcp_bytes_downlink_data;
+static int hf_pfcp_qer_correlation_id;
+static int hf_pfcp_gate_status_b0b1_dlgate;
+static int hf_pfcp_gate_status_b3b2_ulgate;
+static int hf_pfcp_ul_mbr;
+static int hf_pfcp_dl_mbr;
+static int hf_pfcp_ul_gbr;
+static int hf_pfcp_dl_gbr;
+
+static int hf_pfcp_report_type_b6_uisr;
+static int hf_pfcp_report_type_b5_sesr;
+static int hf_pfcp_report_type_b4_tmir;
+static int hf_pfcp_report_type_b3_upir;
+static int hf_pfcp_report_type_b2_erir;
+static int hf_pfcp_report_type_b1_usar;
+static int hf_pfcp_report_type_b0_dldr;
+
+static int hf_pfcp_offending_ie;
+static int hf_pfcp_offending_ie_value;
+
+static int hf_pfcp_up_function_features_o13_b2_qmdrm;
+static int hf_pfcp_up_function_features_o13_b1_cntl;
+static int hf_pfcp_up_function_features_o13_b0_pdusm;
+static int hf_pfcp_up_function_features_o12_b7_eml4s;
+static int hf_pfcp_up_function_features_o12_b6_detnet;
+static int hf_pfcp_up_function_features_o12_b5_qmcon;
+static int hf_pfcp_up_function_features_o12_b4_n6jedb;
+static int hf_pfcp_up_function_features_o12_b3_drtsc;
+static int hf_pfcp_up_function_features_o12_b2_tscts;
+static int hf_pfcp_up_function_features_o12_b1_dbdm;
+static int hf_pfcp_up_function_features_o12_b0_redsm;
+static int hf_pfcp_up_function_features_o11_b7_mpquic;
+static int hf_pfcp_up_function_features_o11_b6_afsfc;
+static int hf_pfcp_up_function_features_o11_b5_upidp;
+static int hf_pfcp_up_function_features_o11_b4_ratp;
+static int hf_pfcp_up_function_features_o11_b3_eppi;
+static int hf_pfcp_up_function_features_o11_b2_psuprm;
+static int hf_pfcp_up_function_features_o11_b1_mbsn4;
+static int hf_pfcp_up_function_features_o11_b0_drqos;
+static int hf_pfcp_up_function_features_o10_b7_dnsts;
+static int hf_pfcp_up_function_features_o10_b6_iprep;
+static int hf_pfcp_up_function_features_o10_b5_resps;
+static int hf_pfcp_up_function_features_o10_b4_upber;
+static int hf_pfcp_up_function_features_o10_b3_l2tp;
+static int hf_pfcp_up_function_features_o10_b2_nspoc;
+static int hf_pfcp_up_function_features_o10_b1_quasf;
+static int hf_pfcp_up_function_features_o10_b0_rttwp;
+static int hf_pfcp_up_function_features_o9_b7_rds;
+static int hf_pfcp_up_function_features_o9_b6_ddds;
+static int hf_pfcp_up_function_features_o9_b5_ethar;
+static int hf_pfcp_up_function_features_o9_b4_ciot;
+static int hf_pfcp_up_function_features_o9_b3_mt_edt;
+static int hf_pfcp_up_function_features_o9_b2_gpqm;
+static int hf_pfcp_up_function_features_o9_b1_qfqm;
+static int hf_pfcp_up_function_features_o9_b0_atsss_ll;
+static int hf_pfcp_up_function_features_o8_b7_mptcp;
+static int hf_pfcp_up_function_features_o8_b6_tsn;
+static int hf_pfcp_up_function_features_o8_b5_ip6pl;
+static int hf_pfcp_up_function_features_o8_b4_iptv;
+static int hf_pfcp_up_function_features_o8_b3_norp;
+static int hf_pfcp_up_function_features_o8_b2_vtime;
+static int hf_pfcp_up_function_features_o8_b1_rttl;
+static int hf_pfcp_up_function_features_o8_b0_mpas;
+static int hf_pfcp_up_function_features_o7_b7_gcom;
+static int hf_pfcp_up_function_features_o7_b6_bundl;
+static int hf_pfcp_up_function_features_o7_b5_mte_n4;
+static int hf_pfcp_up_function_features_o7_b4_mnop;
+static int hf_pfcp_up_function_features_o7_b3_sset;
+static int hf_pfcp_up_function_features_o7_b2_ueip;
+static int hf_pfcp_up_function_features_o7_b1_adpdp;
+static int hf_pfcp_up_function_features_o7_b0_dpdra;
+static int hf_pfcp_up_function_features_o6_b7_epfar;
+static int hf_pfcp_up_function_features_o6_b6_pfde;
+static int hf_pfcp_up_function_features_o6_b5_frrt;
+static int hf_pfcp_up_function_features_o6_b4_trace;
+static int hf_pfcp_up_function_features_o6_b3_quoac;
+static int hf_pfcp_up_function_features_o6_b2_udbc;
+static int hf_pfcp_up_function_features_o6_b1_pdiu;
+static int hf_pfcp_up_function_features_o6_b0_empu;
+static int hf_pfcp_up_function_features_o5_b7_treu;
+static int hf_pfcp_up_function_features_o5_b6_heeu;
+static int hf_pfcp_up_function_features_o5_b5_pfdm;
+static int hf_pfcp_up_function_features_o5_b4_ftup;
+static int hf_pfcp_up_function_features_o5_b3_trst;
+static int hf_pfcp_up_function_features_o5_b2_dlbd;
+static int hf_pfcp_up_function_features_o5_b1_ddnd;
+static int hf_pfcp_up_function_features_o5_b0_bucp;
+
+static int hf_pfcp_sequence_number;
+static int hf_pfcp_metric;
+static int hf_pfcp_timer_unit;
+static int hf_pfcp_timer_value;
+
+static int hf_pfcp_usage_report_trigger_o5_b7_immer;
+static int hf_pfcp_usage_report_trigger_o5_b6_droth;
+static int hf_pfcp_usage_report_trigger_o5_b5_stopt;
+static int hf_pfcp_usage_report_trigger_o5_b4_start;
+static int hf_pfcp_usage_report_trigger_o5_b3_quhti;
+static int hf_pfcp_usage_report_trigger_o5_b2_timth;
+static int hf_pfcp_usage_report_trigger_o5_b1_volth;
+static int hf_pfcp_usage_report_trigger_o5_b0_perio;
+static int hf_pfcp_usage_report_trigger_o6_b7_eveth;
+static int hf_pfcp_usage_report_trigger_o6_b6_macar;
+static int hf_pfcp_usage_report_trigger_o6_b5_envcl;
+static int hf_pfcp_usage_report_trigger_o6_b4_monit;
+static int hf_pfcp_usage_report_trigger_o6_b3_termr;
+static int hf_pfcp_usage_report_trigger_o6_b2_liusa;
+static int hf_pfcp_usage_report_trigger_o6_b1_timqu;
+static int hf_pfcp_usage_report_trigger_o6_b0_volqu;
+static int hf_pfcp_usage_report_trigger_o7_b5_upint;
+static int hf_pfcp_usage_report_trigger_o7_b4_emrre;
+static int hf_pfcp_usage_report_trigger_o7_b3_quvti;
+static int hf_pfcp_usage_report_trigger_o7_b2_ipmjl;
+static int hf_pfcp_usage_report_trigger_o7_b1_tebur;
+static int hf_pfcp_usage_report_trigger_o7_b0_evequ;
+
+static int hf_pfcp_volume_measurement_b5_dlnop;
+static int hf_pfcp_volume_measurement_b4_ulnop;
+static int hf_pfcp_volume_measurement_b3_tonop;
+static int hf_pfcp_volume_measurement_b2_dlvol;
+static int hf_pfcp_volume_measurement_b1_ulvol;
+static int hf_pfcp_volume_measurement_b0_tovol;
+static int hf_pfcp_vol_meas_tovol;
+static int hf_pfcp_vol_meas_ulvol;
+static int hf_pfcp_vol_meas_dlvol;
+static int hf_pfcp_vol_meas_tonop;
+static int hf_pfcp_vol_meas_ulnop;
+static int hf_pfcp_vol_meas_dlnop;
+
+static int hf_pfcp_cp_function_features_o6_b1_rpgur;
+static int hf_pfcp_cp_function_features_o6_b0_psucc;
+static int hf_pfcp_cp_function_features_o5_b7_uiaur;
+static int hf_pfcp_cp_function_features_o5_b6_ardr;
+static int hf_pfcp_cp_function_features_o5_b5_mpas;
+static int hf_pfcp_cp_function_features_o5_b4_bundl;
+static int hf_pfcp_cp_function_features_o5_b3_sset;
+static int hf_pfcp_cp_function_features_o5_b2_epfar;
+static int hf_pfcp_cp_function_features_o5_b1_ovrl;
+static int hf_pfcp_cp_function_features_o5_b0_load;
+
+static int hf_pfcp_usage_information_b3_ube;
+static int hf_pfcp_usage_information_b2_uae;
+static int hf_pfcp_usage_information_b1_aft;
+static int hf_pfcp_usage_information_b0_bef;
+
+static int hf_pfcp_application_instance_id;
+static int hf_pfcp_application_instance_id_str;
+static int hf_pfcp_flow_dir;
+static int hf_pfcp_packet_rate_b0_ulpr;
+static int hf_pfcp_packet_rate_b1_dlpr;
+static int hf_pfcp_packet_rate_b2_aprc;
+static int hf_pfcp_ul_time_unit;
+static int hf_pfcp_max_ul_pr;
+static int hf_pfcp_dl_time_unit;
+static int hf_pfcp_max_dl_pr;
+static int hf_pfcp_a_ul_time_unit;
+static int hf_pfcp_a_max_ul_pr;
+static int hf_pfcp_a_dl_time_unit;
+static int hf_pfcp_a_max_dl_pr;
+
+static int hf_pfcp_dl_flow_level_marking_b0_ttc;
+static int hf_pfcp_dl_flow_level_marking_b1_sci;
+
+static int hf_pfcp_sci;
+static int hf_pfcp_dl_data_notification_delay;
+static int hf_pfcp_packet_count;
+static int hf_pfcp_dl_data_service_inf_b0_ppi;
+static int hf_pfcp_dl_data_service_inf_b1_qfii;
+static int hf_pfcp_ppi;
+
+static int hf_pfcp_pfcpsmreq_flags_b0_drobu;
+static int hf_pfcp_pfcpsmreq_flags_b1_sndem;
+static int hf_pfcp_pfcpsmreq_flags_b2_qaurr;
+static int hf_pfcp_pfcpsmreq_flags_b3_sumpc;
+static int hf_pfcp_pfcpsmreq_flags_b4_rumuc;
+static int hf_pfcp_pfcpsmreq_flags_b5_deteid;
+
+static int hf_pfcp_pfcpsrrsp_flags_b0_drobu;
+
+static int hf_pfcp_pfd_contents_flags_b7_adnp;
+static int hf_pfcp_pfd_contents_flags_b6_aurl;
+static int hf_pfcp_pfd_contents_flags_b5_afd;
+static int hf_pfcp_pfd_contents_flags_b4_dnp;
+static int hf_pfcp_pfd_contents_flags_b3_cp;
+static int hf_pfcp_pfd_contents_flags_b2_dn;
+static int hf_pfcp_pfd_contents_flags_b1_url;
+static int hf_pfcp_pfd_contents_flags_b0_fd;
+
+static int hf_pfcp_url_len;
+static int hf_pfcp_url;
+static int hf_pfcp_dn_len;
+static int hf_pfcp_dn;
+static int hf_pfcp_cp_len;
+static int hf_pfcp_cp;
+static int hf_pfcp_dnp_len;
+static int hf_pfcp_dnp;
+static int hf_pfcp_afd_len;
+static int hf_pfcp_aurl_len;
+static int hf_pfcp_adnp_len;
+static int hf_pfcp_header_type;
+static int hf_pfcp_hf_len;
+static int hf_pfcp_hf_name;
+static int hf_pfcp_hf_val_len;
+static int hf_pfcp_hf_val;
+
+static int hf_pfcp_measurement_info_b0_mbqe;
+static int hf_pfcp_measurement_info_b1_inam;
+static int hf_pfcp_measurement_info_b2_radi;
+static int hf_pfcp_measurement_info_b3_istm;
+static int hf_pfcp_measurement_info_b4_mnop;
+static int hf_pfcp_measurement_info_b5_sspoc;
+static int hf_pfcp_measurement_info_b6_aspoc;
+static int hf_pfcp_measurement_info_b7_ciam;
+
+static int hf_pfcp_node_report_type_b0_upfr;
+static int hf_pfcp_node_report_type_b1_uprr;
+static int hf_pfcp_node_report_type_b2_ckdr;
+static int hf_pfcp_node_report_type_b3_gpqr;
+static int hf_pfcp_node_report_type_b4_purr;
+static int hf_pfcp_node_report_type_b5_vsr;
+
+static int hf_pfcp_remote_gtp_u_peer_flags_b0_v6;
+static int hf_pfcp_remote_gtp_u_peer_flags_b1_v4;
+static int hf_pfcp_remote_gtp_u_peer_flags_b2_di;
+static int hf_pfcp_remote_gtp_u_peer_flags_b3_ni;
+static int hf_pfcp_remote_gtp_u_peer_ipv4;
+static int hf_pfcp_remote_gtp_u_peer_ipv6;
+static int hf_pfcp_remote_gtp_u_peer_length_di;
+static int hf_pfcp_remote_gtp_u_peer_length_ni;
+static int hf_pfcp_ur_seqn;
+
+static int hf_pfcp_oci_flags_b0_aoci;
+
+static int hf_pfcp_pfcp_assoc_rel_req_b0_sarr;
+static int hf_pfcp_pfcp_assoc_rel_req_b1_urss;
+
+static int hf_pfcp_upiri_flags_b0_v4;
+static int hf_pfcp_upiri_flags_b1_v6;
+static int hf_pfcp_upiri_flg_b6_assosi;
+static int hf_pfcp_upiri_flg_b5_assoni;
+static int hf_pfcp_upiri_flg_b2b4_teidri;
+static int hf_pfcp_upiri_teidri;
+static int hf_pfcp_upiri_teid_range;
+static int hf_pfcp_upiri_ipv4;
+static int hf_pfcp_upiri_ipv6;
+
+static int hf_pfcp_user_plane_inactivity_timer;
+
+static int hf_pfcp_subsequent_volume_quota_b2_dlvol;
+static int hf_pfcp_subsequent_volume_quota_b1_ulvol;
+static int hf_pfcp_subsequent_volume_quota_b0_tovol;
+static int hf_pfcp_subsequent_volume_quota_tovol;
+static int hf_pfcp_subsequent_volume_quota_ulvol;
+static int hf_pfcp_subsequent_volume_quota_dlvol;
+
+static int hf_pfcp_subsequent_time_quota;
+
+static int hf_pfcp_rqi_flag;
+static int hf_pfcp_qfi;
+static int hf_pfcp_query_urr_reference;
+static int hf_pfcp_additional_usage_reports_information_b14_b0_number_value;
+static int hf_pfcp_additional_usage_reports_information_b15_auri;
+static int hf_pfcp_traffic_endpoint_id;
+
+static int hf_pfcp_mac_address_flags_b3_udes;
+static int hf_pfcp_mac_address_flags_b2_usou;
+static int hf_pfcp_mac_address_flags_b1_dest;
+static int hf_pfcp_mac_address_flags_b0_sour;
+static int hf_pfcp_mac_address_upper_dest_mac_address;
+static int hf_pfcp_mac_address_upper_source_mac_address;
+static int hf_pfcp_mac_address_dest_mac_address;
+static int hf_pfcp_mac_address_source_mac_address;
+
+static int hf_pfcp_c_tag_flags_b2_vid;
+static int hf_pfcp_c_tag_flags_b1_dei;
+static int hf_pfcp_c_tag_flags_b0_pcp;
+static int hf_pfcp_c_tag_cvid;
+static int hf_pfcp_c_tag_dei_flag;
+static int hf_pfcp_c_tag_pcp_value;
+
+static int hf_pfcp_s_tag_flags_b2_vid;
+static int hf_pfcp_s_tag_flags_b1_dei;
+static int hf_pfcp_s_tag_flags_b0_pcp;
+static int hf_pfcp_s_tag_svid;
+static int hf_pfcp_s_tag_dei_flag;
+static int hf_pfcp_s_tag_pcp_value;
+
+static int hf_pfcp_ethertype;
+
+static int hf_pfcp_proxying_flags_b1_ins;
+static int hf_pfcp_proxying_flags_b0_arp;
+
+static int hf_pfcp_ethertype_filter_id;
+
+static int hf_pfcp_ethertype_filter_properties_flags_b0_bide;
+
+static int hf_pfcp_suggested_buffering_packets_count_packet_count;
+
+static int hf_pfcp_user_id_flags_b6_peif;
+static int hf_pfcp_user_id_flags_b5_gpsif;
+static int hf_pfcp_user_id_flags_b4_supif;
+static int hf_pfcp_user_id_flags_b3_naif;
+static int hf_pfcp_user_id_flags_b2_msisdnf;
+static int hf_pfcp_user_id_flags_b1_imeif;
+static int hf_pfcp_user_id_flags_b0_imsif;
+static int hf_pfcp_user_id_length_of_imsi;
+static int hf_pfcp_user_id_length_of_imei;
+static int hf_pfcp_user_id_imei;
+static int hf_pfcp_user_id_length_of_msisdn;
+static int hf_pfcp_user_id_length_of_nai;
+static int hf_pfcp_user_id_nai;
+static int hf_pfcp_user_id_length_of_supi;
+static int hf_pfcp_user_id_supi;
+static int hf_pfcp_user_id_length_of_gpsi;
+static int hf_pfcp_user_id_gpsi;
+static int hf_pfcp_user_id_length_of_pei;
+static int hf_pfcp_user_id_pei;
+
+static int hf_pfcp_ethernet_pdu_session_information_flags_b0_ethi;
+
+static int hf_pfcp_mac_addresses_detected_number_of_mac_addresses;
+static int hf_pfcp_mac_addresses_detected_mac_address;
+static int hf_pfcp_mac_addresses_detected_length_of_ctag;
+static int hf_pfcp_mac_addresses_detected_length_of_stag;
+
+static int hf_pfcp_mac_addresses_removed_number_of_mac_addresses;
+static int hf_pfcp_mac_addresses_removed_mac_address;
+static int hf_pfcp_mac_addresses_removed_length_of_ctag;
+static int hf_pfcp_mac_addresses_removed_length_of_stag;
 
-static int hf_pfcp_ethernet_inactivity_timer = -1;
+static int hf_pfcp_ethernet_inactivity_timer;
 
-static int hf_pfcp_subsequent_event_quota = -1;
+static int hf_pfcp_subsequent_event_quota;
 
-static int hf_pfcp_subsequent_event_threshold = -1;
+static int hf_pfcp_subsequent_event_threshold;
 
-static int hf_pfcp_trace_information_trace_id = -1;
-static int hf_pfcp_trace_information_length_trigger_events = -1;
-static int hf_pfcp_trace_information_trigger_events = -1;
-static int hf_pfcp_trace_information_session_trace_depth = -1;
-static int hf_pfcp_trace_information_length_list_interfaces = -1;
-static int hf_pfcp_trace_information_list_interfaces = -1;
-static int hf_pfcp_trace_information_length_ipaddress = -1;
-static int hf_pfcp_trace_information_ipv4 = -1;
-static int hf_pfcp_trace_information_ipv6 = -1;
+static int hf_pfcp_trace_information_trace_id;
+static int hf_pfcp_trace_information_length_trigger_events;
+static int hf_pfcp_trace_information_trigger_events;
+static int hf_pfcp_trace_information_session_trace_depth;
+static int hf_pfcp_trace_information_length_list_interfaces;
+static int hf_pfcp_trace_information_list_interfaces;
+static int hf_pfcp_trace_information_length_ipaddress;
+static int hf_pfcp_trace_information_ipv4;
+static int hf_pfcp_trace_information_ipv6;
 
-static int hf_pfcp_framed_route = -1;
-static int hf_pfcp_framed_routing = -1;
-static int hf_pfcp_framed_ipv6_route = -1;
+static int hf_pfcp_framed_route;
+static int hf_pfcp_framed_routing;
+static int hf_pfcp_framed_ipv6_route;
 
-static int hf_pfcp_event_quota = -1;
+static int hf_pfcp_event_quota;
 
-static int hf_pfcp_event_threshold = -1;
+static int hf_pfcp_event_threshold;
 
-static int hf_pfcp_time_stamp = -1;
+static int hf_pfcp_time_stamp;
 
-static int hf_pfcp_averaging_window = -1;
+static int hf_pfcp_averaging_window;
 
-static int hf_pfcp_paging_policy_indicator = -1;
+static int hf_pfcp_paging_policy_indicator;
 
-static int hf_pfcp_apn_dnn = -1;
+static int hf_pfcp_apn_dnn;
 
-static int hf_pfcp_tgpp_interface_type = -1;
+static int hf_pfcp_tgpp_interface_type;
 
-static int hf_pfcp_pfcpsrreq_flags_b0_psdbu = -1;
+static int hf_pfcp_pfcpsrreq_flags_b0_psdbu;
 
-static int hf_pfcp_pfcpaureq_flags_b0_parps = -1;
+static int hf_pfcp_pfcpaureq_flags_b0_parps;
 
-static int hf_pfcp_activation_time = -1;
-static int hf_pfcp_deactivation_time = -1;
+static int hf_pfcp_activation_time;
+static int hf_pfcp_deactivation_time;
 
-static int hf_pfcp_mar_id = -1;
+static int hf_pfcp_mar_id;
 
-static int hf_pfcp_steering_functionality = -1;
-static int hf_pfcp_steering_mode = -1;
+static int hf_pfcp_steering_functionality;
+static int hf_pfcp_steering_mode;
 
-static int hf_pfcp_weight = -1;
-static int hf_pfcp_priority = -1;
+static int hf_pfcp_weight;
+static int hf_pfcp_priority;
 
-static int hf_pfcp_ue_ip_address_pool_length = -1;
-static int hf_pfcp_ue_ip_address_pool_identity = -1;
+static int hf_pfcp_ue_ip_address_pool_length;
+static int hf_pfcp_ue_ip_address_pool_identity;
 
-static int hf_pfcp_alternative_smf_ip_address_flags_ppe = -1;
-static int hf_pfcp_alternative_smf_ip_address_ipv4 = -1;
-static int hf_pfcp_alternative_smf_ip_address_ipv6 = -1;
+static int hf_pfcp_alternative_smf_ip_address_flags_ppe;
+static int hf_pfcp_alternative_smf_ip_address_ipv4;
+static int hf_pfcp_alternative_smf_ip_address_ipv6;
 
-static int hf_pfcp_packet_replication_and_detection_carry_on_information_flags_b3_dcaroni = -1;
-static int hf_pfcp_packet_replication_and_detection_carry_on_information_flags_b2_prin6i = -1;
-static int hf_pfcp_packet_replication_and_detection_carry_on_information_flags_b1_prin19i = -1;
-static int hf_pfcp_packet_replication_and_detection_carry_on_information_flags_b0_priueai = -1;
+static int hf_pfcp_packet_replication_and_detection_carry_on_information_flags_b3_dcaroni;
+static int hf_pfcp_packet_replication_and_detection_carry_on_information_flags_b2_prin6i;
+static int hf_pfcp_packet_replication_and_detection_carry_on_information_flags_b1_prin19i;
+static int hf_pfcp_packet_replication_and_detection_carry_on_information_flags_b0_priueai;
 
-static int hf_pfcp_validity_time_value = -1;
-static int hf_pfcp_validity_time_str = -1;
+static int hf_pfcp_validity_time_value;
+static int hf_pfcp_validity_time_str;
 
-static int hf_pfcp_number_of_reports = -1;
+static int hf_pfcp_number_of_reports;
 
-static int hf_pfcp_pfcpasrsp_flags_flags_b1_uupsi = -1;
-static int hf_pfcp_pfcpasrsp_flags_flags_b0_psrei = -1;
+static int hf_pfcp_pfcpasrsp_flags_flags_b1_uupsi;
+static int hf_pfcp_pfcpasrsp_flags_flags_b0_psrei;
 
-static int hf_pfcp_cp_pfcp_entity_ip_address_ipv4 = -1;
-static int hf_pfcp_cp_pfcp_entity_ip_address_ipv6 = -1;
+static int hf_pfcp_cp_pfcp_entity_ip_address_ipv4;
+static int hf_pfcp_cp_pfcp_entity_ip_address_ipv6;
 
-static int hf_pfcp_pfcpsereq_flags_flags_b1_sumpc = -1;
-static int hf_pfcp_pfcpsereq_flags_flags_b0_resti = -1;
+static int hf_pfcp_pfcpsereq_flags_flags_b1_sumpc;
+static int hf_pfcp_pfcpsereq_flags_flags_b0_resti;
 
-static int hf_pfcp_ip_multicast_address_flags_b3_any = -1;
-static int hf_pfcp_ip_multicast_address_flags_b2_range = -1;
-static int hf_pfcp_ip_multicast_address_start_ipv4 = -1;
-static int hf_pfcp_ip_multicast_address_start_ipv6 = -1;
-static int hf_pfcp_ip_multicast_address_end_ipv4 = -1;
-static int hf_pfcp_ip_multicast_address_end_ipv6 = -1;
+static int hf_pfcp_ip_multicast_address_flags_b3_any;
+static int hf_pfcp_ip_multicast_address_flags_b2_range;
+static int hf_pfcp_ip_multicast_address_start_ipv4;
+static int hf_pfcp_ip_multicast_address_start_ipv6;
+static int hf_pfcp_ip_multicast_address_end_ipv4;
+static int hf_pfcp_ip_multicast_address_end_ipv6;
 
-static int hf_pfcp_source_ip_address_flags_b2_mpl = -1;
-static int hf_pfcp_source_ip_address_ipv4 = -1;
-static int hf_pfcp_source_ip_address_ipv6 = -1;
-static int hf_pfcp_source_ip_address_mask_prefix_lengt = -1;
+static int hf_pfcp_source_ip_address_flags_b2_mpl;
+static int hf_pfcp_source_ip_address_ipv4;
+static int hf_pfcp_source_ip_address_ipv6;
+static int hf_pfcp_source_ip_address_mask_prefix_lengt;
 
-static int hf_pfcp_packet_rate_status_flags_b2_apr = -1;
-static int hf_pfcp_packet_rate_status_flags_b1_dl = -1;
-static int hf_pfcp_packet_rate_status_flags_b0_ul = -1;
-static int hf_pfcp_packet_rate_status_ul = -1;
-static int hf_pfcp_packet_rate_status_dl = -1;
-static int hf_pfcp_packet_rate_status_apr_ul = -1;
-static int hf_pfcp_packet_rate_status_apr_dl = -1;
-static int hf_pfcp_packet_rate_status_validity_time = -1;
+static int hf_pfcp_packet_rate_status_flags_b2_apr;
+static int hf_pfcp_packet_rate_status_flags_b1_dl;
+static int hf_pfcp_packet_rate_status_flags_b0_ul;
+static int hf_pfcp_packet_rate_status_ul;
+static int hf_pfcp_packet_rate_status_dl;
+static int hf_pfcp_packet_rate_status_apr_ul;
+static int hf_pfcp_packet_rate_status_apr_dl;
+static int hf_pfcp_packet_rate_status_validity_time;
 
-static int hf_pfcp_create_bridge_router_info_flags_b1_rii = -1;
-static int hf_pfcp_create_bridge_router_info_flags_b0_bii = -1;
+static int hf_pfcp_create_bridge_router_info_flags_b1_rii;
+static int hf_pfcp_create_bridge_router_info_flags_b0_bii;
 
-static int hf_pfcp_port_number = -1;
+static int hf_pfcp_port_number;
 
-static int hf_pfcp_nw_tt_port_number = -1;
+static int hf_pfcp_nw_tt_port_number;
 
-static int hf_pfcp_5gs_user_plane_node_id_flags_b0_bid = -1;
-static int hf_pfcp_5gs_user_plane_node_id_value = -1;
+static int hf_pfcp_5gs_user_plane_node_id_flags_b0_bid;
+static int hf_pfcp_5gs_user_plane_node_id_value;
 
-static int hf_pfcp_port_management_information = -1;
+static int hf_pfcp_port_management_information;
 
-static int hf_pfcp_requested_clock_drift_control_information_flags_b1_rrcr = -1;
-static int hf_pfcp_requested_clock_drift_control_information_flags_b0_rrto = -1;
+static int hf_pfcp_requested_clock_drift_control_information_flags_b1_rrcr;
+static int hf_pfcp_requested_clock_drift_control_information_flags_b0_rrto;
 
-static int hf_pfcp_time_domain_number_value = -1;
+static int hf_pfcp_time_domain_number_value;
 
-static int hf_pfcp_time_offset_threshold = -1;
+static int hf_pfcp_time_offset_threshold;
 
-static int hf_pfcp_cumulative_rate_ratio_threshold = -1;
+static int hf_pfcp_cumulative_rate_ratio_threshold;
 
-static int hf_pfcp_time_offset_measurement = -1;
+static int hf_pfcp_time_offset_measurement;
 
-static int hf_pfcp_cumulative_rate_ratio_measurement = -1;
+static int hf_pfcp_cumulative_rate_ratio_measurement;
 
-static int hf_pfcp_srr_id = -1;
+static int hf_pfcp_srr_id;
 
-static int hf_pfcp_requested_access_availability_control_information_flags_b0_rrca = -1;
+static int hf_pfcp_requested_access_availability_control_information_flags_b0_rrca;
 
-static int hf_pfcp_availability_status = -1;
-static int hf_pfcp_availability_type = -1;
+static int hf_pfcp_availability_status;
+static int hf_pfcp_availability_type;
 
-static int hf_pfcp_mptcp_control_information_flags_b0_tci = -1;
+static int hf_pfcp_mptcp_control_information_flags_b0_tci;
 
-static int hf_pfcp_atsss_ll_control_information_flags_b0_lli = -1;
+static int hf_pfcp_atsss_ll_control_information_flags_b0_lli;
 
-static int hf_pfcp_pmf_control_information_flags_b2_pqpm = -1;
-static int hf_pfcp_pmf_control_information_flags_b1_drtti = -1;
-static int hf_pfcp_pmf_control_information_flags_b0_pmfi = -1;
-static int hf_pfcp_pmf_control_information_number_of_qfi = -1;
+static int hf_pfcp_pmf_control_information_flags_b2_pqpm;
+static int hf_pfcp_pmf_control_information_flags_b1_drtti;
+static int hf_pfcp_pmf_control_information_flags_b0_pmfi;
+static int hf_pfcp_pmf_control_information_number_of_qfi;
 
-static int hf_pfcp_mptcp_address_information_flags_b1_v6 = -1;
-static int hf_pfcp_mptcp_address_information_flags_b0_v4 = -1;
-static int hf_pfcp_mptcp_proxy_type = -1;
-static int hf_pfcp_mptcp_proxy_port = -1;
-static int hf_pfcp_mptcp_proxy_ip_address_ipv4 = -1;
-static int hf_pfcp_mptcp_proxy_ip_address_ipv6 = -1;
+static int hf_pfcp_mptcp_address_information_flags_b1_v6;
+static int hf_pfcp_mptcp_address_information_flags_b0_v4;
+static int hf_pfcp_mptcp_proxy_type;
+static int hf_pfcp_mptcp_proxy_port;
+static int hf_pfcp_mptcp_proxy_ip_address_ipv4;
+static int hf_pfcp_mptcp_proxy_ip_address_ipv6;
 
-static int hf_pfcp_link_specific_multipath_ip_address_flags_b3_nv6 = -1;
-static int hf_pfcp_link_specific_multipath_ip_address_flags_b2_nv4 = -1;
-static int hf_pfcp_link_specific_multipath_ip_address_flags_b1_v6 = -1;
-static int hf_pfcp_link_specific_multipath_ip_address_flags_b0_v4 = -1;
-static int hf_pfcp_link_specific_multipath_ip_address_3gpp_ipv4 = -1;
-static int hf_pfcp_link_specific_multipath_ip_address_3gpp_ipv6 = -1;
-static int hf_pfcp_link_specific_multipath_ip_address_non3gpp_ipv4 = -1;
-static int hf_pfcp_link_specific_multipath_ip_address_non3gpp_ipv6 = -1;
+static int hf_pfcp_link_specific_multipath_ip_address_flags_b3_nv6;
+static int hf_pfcp_link_specific_multipath_ip_address_flags_b2_nv4;
+static int hf_pfcp_link_specific_multipath_ip_address_flags_b1_v6;
+static int hf_pfcp_link_specific_multipath_ip_address_flags_b0_v4;
+static int hf_pfcp_link_specific_multipath_ip_address_3gpp_ipv4;
+static int hf_pfcp_link_specific_multipath_ip_address_3gpp_ipv6;
+static int hf_pfcp_link_specific_multipath_ip_address_non3gpp_ipv4;
+static int hf_pfcp_link_specific_multipath_ip_address_non3gpp_ipv6;
 
-static int hf_pfcp_pmf_address_information_flags_b2_mac = -1;
-static int hf_pfcp_pmf_address_information_flags_b1_v6 = -1;
-static int hf_pfcp_pmf_address_information_flags_b0_v4 = -1;
-static int hf_pfcp_pmf_address_ipv4 = -1;
-static int hf_pfcp_pmf_address_ipv6 = -1;
-static int hf_pfcp_pmf_port_3gpp = -1;
-static int hf_pfcp_pmf_port_non3gpp = -1;
-static int hf_pfcp_pmf_mac_address_3gpp = -1;
-static int hf_pfcp_pmf_mac_address_non3gpp = -1;
+static int hf_pfcp_pmf_address_information_flags_b2_mac;
+static int hf_pfcp_pmf_address_information_flags_b1_v6;
+static int hf_pfcp_pmf_address_information_flags_b0_v4;
+static int hf_pfcp_pmf_address_ipv4;
+static int hf_pfcp_pmf_address_ipv6;
+static int hf_pfcp_pmf_port_3gpp;
+static int hf_pfcp_pmf_port_non3gpp;
+static int hf_pfcp_pmf_mac_address_3gpp;
+static int hf_pfcp_pmf_mac_address_non3gpp;
 
-static int hf_pfcp_atsss_ll_information_flags_b0_lli = -1;
+static int hf_pfcp_atsss_ll_information_flags_b0_lli;
 
-static int hf_pfcp_data_network_access_identifier = -1;
+static int hf_pfcp_data_network_access_identifier;
 
-static int hf_pfcp_packet_delay_milliseconds = -1;
+static int hf_pfcp_packet_delay_milliseconds;
 
-static int hf_pfcp_qos_report_trigger_flags_b2_ire = -1;
-static int hf_pfcp_qos_report_trigger_flags_b1_thr = -1;
-static int hf_pfcp_qos_report_trigger_flags_b0_per = -1;
+static int hf_pfcp_qos_report_trigger_flags_b2_ire;
+static int hf_pfcp_qos_report_trigger_flags_b1_thr;
+static int hf_pfcp_qos_report_trigger_flags_b0_per;
 
-static int hf_pfcp_gtp_u_path_interface_type_flags_b1_n3 = -1;
-static int hf_pfcp_gtp_u_path_interface_type_flags_b0_n9 = -1;
+static int hf_pfcp_gtp_u_path_interface_type_flags_b1_n3;
+static int hf_pfcp_gtp_u_path_interface_type_flags_b0_n9;
 
-static int hf_pfcp_requested_qos_monitoring_flags_b7_ulpr = -1;
-static int hf_pfcp_requested_qos_monitoring_flags_b6_dlpr = -1;
-static int hf_pfcp_requested_qos_monitoring_flags_b5_ulci = -1;
-static int hf_pfcp_requested_qos_monitoring_flags_b4_dlci = -1;
-static int hf_pfcp_requested_qos_monitoring_flags_b3_gtpupm = -1;
-static int hf_pfcp_requested_qos_monitoring_flags_b2_rppd = -1;
-static int hf_pfcp_requested_qos_monitoring_flags_b1_ulpd = -1;
-static int hf_pfcp_requested_qos_monitoring_flags_b0_dlpd = -1;
+static int hf_pfcp_requested_qos_monitoring_flags_b7_ulpr;
+static int hf_pfcp_requested_qos_monitoring_flags_b6_dlpr;
+static int hf_pfcp_requested_qos_monitoring_flags_b5_ulci;
+static int hf_pfcp_requested_qos_monitoring_flags_b4_dlci;
+static int hf_pfcp_requested_qos_monitoring_flags_b3_gtpupm;
+static int hf_pfcp_requested_qos_monitoring_flags_b2_rppd;
+static int hf_pfcp_requested_qos_monitoring_flags_b1_ulpd;
+static int hf_pfcp_requested_qos_monitoring_flags_b0_dlpd;
 
-static int hf_pfcp_reporting_frequency_flags_b2_sesrl = -1;
-static int hf_pfcp_reporting_frequency_flags_b1_perio = -1;
-static int hf_pfcp_reporting_frequency_flags_b0_evett = -1;
+static int hf_pfcp_reporting_frequency_flags_b2_sesrl;
+static int hf_pfcp_reporting_frequency_flags_b1_perio;
+static int hf_pfcp_reporting_frequency_flags_b0_evett;
 
-static int hf_pfcp_packet_delay_thresholds_flags_b2_rp = -1;
-static int hf_pfcp_packet_delay_thresholds_flags_b1_ul = -1;
-static int hf_pfcp_packet_delay_thresholds_flags_b0_dl = -1;
-static int hf_pfcp_packet_delay_thresholds_downlink = -1;
-static int hf_pfcp_packet_delay_thresholds_uplink = -1;
-static int hf_pfcp_packet_delay_thresholds_roundtrip = -1;
+static int hf_pfcp_packet_delay_thresholds_flags_b2_rp;
+static int hf_pfcp_packet_delay_thresholds_flags_b1_ul;
+static int hf_pfcp_packet_delay_thresholds_flags_b0_dl;
+static int hf_pfcp_packet_delay_thresholds_downlink;
+static int hf_pfcp_packet_delay_thresholds_uplink;
+static int hf_pfcp_packet_delay_thresholds_roundtrip;
 
-static int hf_pfcp_minimum_wait_time_seconds = -1;
+static int hf_pfcp_minimum_wait_time_seconds;
 
-static int hf_pfcp_qos_monitoring_measurement_flags_b5_ulci = -1;
-static int hf_pfcp_qos_monitoring_measurement_flags_b4_dlci = -1;
-static int hf_pfcp_qos_monitoring_measurement_flags_b3_plmf = -1;
-static int hf_pfcp_qos_monitoring_measurement_flags_b2_rppd = -1;
-static int hf_pfcp_qos_monitoring_measurement_flags_b1_ulpd = -1;
-static int hf_pfcp_qos_monitoring_measurement_flags_b0_dlpd = -1;
-static int hf_pfcp_qos_monitoring_measurement_downlink_packet_delay = -1;
-static int hf_pfcp_qos_monitoring_measurement_uplink_packet_delay = -1;
-static int hf_pfcp_qos_monitoring_measurement_roundtrip = -1;
-static int hf_pfcp_qos_monitoring_measurement_downlink_congestion_information = -1;
-static int hf_pfcp_qos_monitoring_measurement_uplink_congestion_information = -1;
-static int hf_pfcp_qos_monitoring_measurement_downlink_packet_rate = -1;
-static int hf_pfcp_qos_monitoring_measurement_uplink_packet_rate = -1;
+static int hf_pfcp_qos_monitoring_measurement_flags_b5_ulci;
+static int hf_pfcp_qos_monitoring_measurement_flags_b4_dlci;
+static int hf_pfcp_qos_monitoring_measurement_flags_b3_plmf;
+static int hf_pfcp_qos_monitoring_measurement_flags_b2_rppd;
+static int hf_pfcp_qos_monitoring_measurement_flags_b1_ulpd;
+static int hf_pfcp_qos_monitoring_measurement_flags_b0_dlpd;
+static int hf_pfcp_qos_monitoring_measurement_downlink_packet_delay;
+static int hf_pfcp_qos_monitoring_measurement_uplink_packet_delay;
+static int hf_pfcp_qos_monitoring_measurement_roundtrip;
+static int hf_pfcp_qos_monitoring_measurement_downlink_congestion_information;
+static int hf_pfcp_qos_monitoring_measurement_uplink_congestion_information;
+static int hf_pfcp_qos_monitoring_measurement_downlink_packet_rate;
+static int hf_pfcp_qos_monitoring_measurement_uplink_packet_rate;
 
-static int hf_pfcp_mt_edt_control_information_flags_b0_rdsi = -1;
+static int hf_pfcp_mt_edt_control_information_flags_b0_rdsi;
 
-static int hf_pfcp_dl_data_packets_size = -1;
+static int hf_pfcp_dl_data_packets_size;
 
-static int hf_pfcp_qer_control_indications_o5_b0_rcsr = -1;
+static int hf_pfcp_qer_control_indications_o5_b0_rcsr;
 
-static int hf_pfcp_nf_instance_id = -1;
+static int hf_pfcp_nf_instance_id;
 
-static int hf_pfcp_s_nssai_sst = -1;
-static int hf_pfcp_s_nssai_sd = -1;
-
-static int hf_pfcp_ip_version_flags_b1_v6 = -1;
-static int hf_pfcp_ip_version_flags_b0_v4 = -1;
-
-static int hf_pfcp_pfcpasreq_flags_flags_b0_uupsi = -1;
-
-static int hf_pfcp_data_status_flags_b1_buff = -1;
-static int hf_pfcp_data_status_flags_b0_drop = -1;
-
-static int hf_pfcp_rds_configuration_information_flags_b0_rds = -1;
-
-static int hf_pfcp_multipath_application_indication_flags_b1_mqai = -1;
-static int hf_pfcp_multipath_application_indication_flags_b0_mtai = -1;
-
-static int hf_pfcp_user_plane_node_management_information_container = -1;
-
-static int hf_pfcp_number_of_ue_ip_addresses_b1_ipv6 = -1;
-static int hf_pfcp_number_of_ue_ip_addresses_b0_ipv4 = -1;
-static int hf_pfcp_number_of_ue_ip_addresses_ipv6 = -1;
-static int hf_pfcp_number_of_ue_ip_addresses_ipv4 = -1;
-
-static int hf_pfcp_validity_timer = -1;
-
-static int hf_pfcp_rattype = -1;
-
-static int hf_pfcp_l2tp_user_authentication_proxy_authen_type_value = -1;
-static int hf_pfcp_l2tp_user_authentication_b3_pai = -1;
-static int hf_pfcp_l2tp_user_authentication_b2_par = -1;
-static int hf_pfcp_l2tp_user_authentication_b1_pac = -1;
-static int hf_pfcp_l2tp_user_authentication_b0_pan = -1;
-static int hf_pfcp_l2tp_user_authentication_proxy_authen_name_len = -1;
-static int hf_pfcp_l2tp_user_authentication_proxy_authen_name = -1;
-static int hf_pfcp_l2tp_user_authentication_proxy_authen_challenge_len = -1;
-static int hf_pfcp_l2tp_user_authentication_proxy_authen_challenge = -1;
-static int hf_pfcp_l2tp_user_authentication_proxy_authen_response_len = -1;
-static int hf_pfcp_l2tp_user_authentication_proxy_authen_response = -1;
-static int hf_pfcp_l2tp_user_authentication_proxy_authen_id = -1;
+static int hf_pfcp_s_nssai_sst;
+static int hf_pfcp_s_nssai_sd;
+
+static int hf_pfcp_ip_version_flags_b1_v6;
+static int hf_pfcp_ip_version_flags_b0_v4;
+
+static int hf_pfcp_pfcpasreq_flags_flags_b0_uupsi;
+
+static int hf_pfcp_data_status_flags_b1_buff;
+static int hf_pfcp_data_status_flags_b0_drop;
+
+static int hf_pfcp_rds_configuration_information_flags_b0_rds;
+
+static int hf_pfcp_multipath_application_indication_flags_b1_mqai;
+static int hf_pfcp_multipath_application_indication_flags_b0_mtai;
+
+static int hf_pfcp_user_plane_node_management_information_container;
+
+static int hf_pfcp_number_of_ue_ip_addresses_b1_ipv6;
+static int hf_pfcp_number_of_ue_ip_addresses_b0_ipv4;
+static int hf_pfcp_number_of_ue_ip_addresses_ipv6;
+static int hf_pfcp_number_of_ue_ip_addresses_ipv4;
+
+static int hf_pfcp_validity_timer;
+
+static int hf_pfcp_rattype;
+
+static int hf_pfcp_l2tp_user_authentication_proxy_authen_type_value;
+static int hf_pfcp_l2tp_user_authentication_b3_pai;
+static int hf_pfcp_l2tp_user_authentication_b2_par;
+static int hf_pfcp_l2tp_user_authentication_b1_pac;
+static int hf_pfcp_l2tp_user_authentication_b0_pan;
+static int hf_pfcp_l2tp_user_authentication_proxy_authen_name_len;
+static int hf_pfcp_l2tp_user_authentication_proxy_authen_name;
+static int hf_pfcp_l2tp_user_authentication_proxy_authen_challenge_len;
+static int hf_pfcp_l2tp_user_authentication_proxy_authen_challenge;
+static int hf_pfcp_l2tp_user_authentication_proxy_authen_response_len;
+static int hf_pfcp_l2tp_user_authentication_proxy_authen_response;
+static int hf_pfcp_l2tp_user_authentication_proxy_authen_id;
 
-static int hf_pfcp_lns_address_ipv4 = -1;
-static int hf_pfcp_lns_address_ipv6 = -1;
+static int hf_pfcp_lns_address_ipv4;
+static int hf_pfcp_lns_address_ipv6;
 
-static int hf_pfcp_tunnel_preference_value = -1;
+static int hf_pfcp_tunnel_preference_value;
 
-static int hf_pfcp_calling_number_value = -1;
-static int hf_pfcp_called_number_value = -1;
+static int hf_pfcp_calling_number_value;
+static int hf_pfcp_called_number_value;
 
-static int hf_pfcp_l2tp_session_indications_o5_b2_rensa = -1;
-static int hf_pfcp_l2tp_session_indications_o5_b1_redsa = -1;
-static int hf_pfcp_l2tp_session_indications_o5_b0_reuia = -1;
+static int hf_pfcp_l2tp_session_indications_o5_b2_rensa;
+static int hf_pfcp_l2tp_session_indications_o5_b1_redsa;
+static int hf_pfcp_l2tp_session_indications_o5_b0_reuia;
 
-static int hf_pfcp_maximum_receive_unit = -1;
+static int hf_pfcp_maximum_receive_unit;
 
-static int hf_pfcp_thresholds_flags_b1_plr = -1;
-static int hf_pfcp_thresholds_flags_b0_rtt = -1;
-static int hf_pfcp_thresholds_rtt = -1;
-static int hf_pfcp_thresholds_plr = -1;
+static int hf_pfcp_thresholds_flags_b1_plr;
+static int hf_pfcp_thresholds_flags_b0_rtt;
+static int hf_pfcp_thresholds_rtt;
+static int hf_pfcp_thresholds_plr;
 
-static int hf_pfcp_l2tp_steering_mode_indications_o5_b1_ueai = -1;
-static int hf_pfcp_l2tp_steering_mode_indications_o5_b0_albi = -1;
+static int hf_pfcp_l2tp_steering_mode_indications_o5_b1_ueai;
+static int hf_pfcp_l2tp_steering_mode_indications_o5_b0_albi;
 
-static int hf_pfcp_group_id = -1;
+static int hf_pfcp_group_id;
 
-static int hf_pfcp_cp_ip_address_ipv4 = -1;
-static int hf_pfcp_cp_ip_address_ipv6 = -1;
+static int hf_pfcp_cp_ip_address_ipv4;
+static int hf_pfcp_cp_ip_address_ipv6;
 
-static int hf_pfcp_ip_address_and_port_number_replacement_flag_b0_v4 = -1;
-static int hf_pfcp_ip_address_and_port_number_replacement_flag_b1_v6 = -1;
-static int hf_pfcp_ip_address_and_port_number_replacement_flag_b2_dpn = -1;
-static int hf_pfcp_ip_address_and_port_number_replacement_flag_b3_sipv4 = -1;
-static int hf_pfcp_ip_address_and_port_number_replacement_flag_b4_sipv6 = -1;
-static int hf_pfcp_ip_address_and_port_number_replacement_flag_b5_spn = -1;
-static int hf_pfcp_ip_address_and_port_number_replacement_destination_ipv4 = -1;
-static int hf_pfcp_ip_address_and_port_number_replacement_destination_ipv6 = -1;
-static int hf_pfcp_ip_address_and_port_number_replacement_destination_port = -1;
-static int hf_pfcp_ip_address_and_port_number_replacement_source_ipv4 = -1;
-static int hf_pfcp_ip_address_and_port_number_replacement_source_ipv6 = -1;
-static int hf_pfcp_ip_address_and_port_number_replacement_source_port = -1;
+static int hf_pfcp_ip_address_and_port_number_replacement_flag_b0_v4;
+static int hf_pfcp_ip_address_and_port_number_replacement_flag_b1_v6;
+static int hf_pfcp_ip_address_and_port_number_replacement_flag_b2_dpn;
+static int hf_pfcp_ip_address_and_port_number_replacement_flag_b3_sipv4;
+static int hf_pfcp_ip_address_and_port_number_replacement_flag_b4_sipv6;
+static int hf_pfcp_ip_address_and_port_number_replacement_flag_b5_spn;
+static int hf_pfcp_ip_address_and_port_number_replacement_destination_ipv4;
+static int hf_pfcp_ip_address_and_port_number_replacement_destination_ipv6;
+static int hf_pfcp_ip_address_and_port_number_replacement_destination_port;
+static int hf_pfcp_ip_address_and_port_number_replacement_source_ipv4;
+static int hf_pfcp_ip_address_and_port_number_replacement_source_ipv6;
+static int hf_pfcp_ip_address_and_port_number_replacement_source_port;
 
-static int hf_pfcp_dns_query_filter_pattern_len = -1;
-static int hf_pfcp_dns_query_filter_pattern = -1;
+static int hf_pfcp_dns_query_filter_pattern_len;
+static int hf_pfcp_dns_query_filter_pattern;
 
-static int hf_pfcp_event_notification_uri = -1;
+static int hf_pfcp_event_notification_uri;
 
-static int hf_pfcp_notification_correlation_id = -1;
+static int hf_pfcp_notification_correlation_id;
 
-static int hf_pfcp_reporting_flags_o5_b0_dupl = -1;
+static int hf_pfcp_reporting_flags_o5_b0_dupl;
 
-static int hf_pfcp_mbs_session_identifier_flag_b0_tmgi = -1;
-static int hf_pfcp_mbs_session_identifier_flag_b1_ssmi = -1;
-static int hf_pfcp_mbs_session_identifier_flag_b2_nidi = -1;
-static int hf_pfcp_mbs_session_identifier_tmgi = -1;
-static int hf_pfcp_mbs_session_identifier_nidi = -1;
-static int hf_pfcp_mbs_session_identifier_source_address_type = -1;
-static int hf_pfcp_mbs_session_identifier_source_address_length = -1;
-static int hf_pfcp_mbs_session_identifier_source_address_ipv4 = -1;
-static int hf_pfcp_mbs_session_identifier_source_address_ipv6 = -1;
+static int hf_pfcp_mbs_session_identifier_flag_b0_tmgi;
+static int hf_pfcp_mbs_session_identifier_flag_b1_ssmi;
+static int hf_pfcp_mbs_session_identifier_flag_b2_nidi;
+static int hf_pfcp_mbs_session_identifier_tmgi;
+static int hf_pfcp_mbs_session_identifier_nidi;
+static int hf_pfcp_mbs_session_identifier_source_address_type;
+static int hf_pfcp_mbs_session_identifier_source_address_length;
+static int hf_pfcp_mbs_session_identifier_source_address_ipv4;
+static int hf_pfcp_mbs_session_identifier_source_address_ipv6;
 
-static int hf_pfcp_multicast_transport_information_endpoint_identifier = -1;
-static int hf_pfcp_multicast_transport_information_distribution_address_type = -1;
-static int hf_pfcp_multicast_transport_information_distribution_address_length = -1;
-static int hf_pfcp_multicast_transport_information_distribution_address_ipv4 = -1;
-static int hf_pfcp_multicast_transport_information_distribution_address_ipv6 = -1;
-static int hf_pfcp_multicast_transport_information_source_address_type = -1;
-static int hf_pfcp_multicast_transport_information_source_address_length = -1;
-static int hf_pfcp_multicast_transport_information_source_address_ipv4 = -1;
-static int hf_pfcp_multicast_transport_information_source_address_ipv6 = -1;
+static int hf_pfcp_multicast_transport_information_endpoint_identifier;
+static int hf_pfcp_multicast_transport_information_distribution_address_type;
+static int hf_pfcp_multicast_transport_information_distribution_address_length;
+static int hf_pfcp_multicast_transport_information_distribution_address_ipv4;
+static int hf_pfcp_multicast_transport_information_distribution_address_ipv6;
+static int hf_pfcp_multicast_transport_information_source_address_type;
+static int hf_pfcp_multicast_transport_information_source_address_length;
+static int hf_pfcp_multicast_transport_information_source_address_ipv4;
+static int hf_pfcp_multicast_transport_information_source_address_ipv6;
 
-static int hf_pfcp_mbsn4mbreq_flags_o5_b2_mbs_resti = -1;
-static int hf_pfcp_mbsn4mbreq_flags_o5_b1_jmbssm = -1;
-static int hf_pfcp_mbsn4mbreq_flags_o5_b0_pllssm = -1;
+static int hf_pfcp_mbsn4mbreq_flags_o5_b2_mbs_resti;
+static int hf_pfcp_mbsn4mbreq_flags_o5_b1_jmbssm;
+static int hf_pfcp_mbsn4mbreq_flags_o5_b0_pllssm;
 
-static int hf_pfcp_local_ingress_tunnel_flags_b2_ch = -1;
-static int hf_pfcp_local_ingress_tunnel_flags_b1_v6 = -1;
-static int hf_pfcp_local_ingress_tunnel_flags_b0_v4 = -1;
-static int hf_pfcp_local_ingress_tunnel_udp_port = -1;
-static int hf_pfcp_local_ingress_tunnel_ipv4 = -1;
-static int hf_pfcp_local_ingress_tunnel_ipv6 = -1;
+static int hf_pfcp_local_ingress_tunnel_flags_b2_ch;
+static int hf_pfcp_local_ingress_tunnel_flags_b1_v6;
+static int hf_pfcp_local_ingress_tunnel_flags_b0_v4;
+static int hf_pfcp_local_ingress_tunnel_udp_port;
+static int hf_pfcp_local_ingress_tunnel_ipv4;
+static int hf_pfcp_local_ingress_tunnel_ipv6;
 
-static int hf_pfcp_mbs_unicast_parameters_id = -1;
+static int hf_pfcp_mbs_unicast_parameters_id;
 
-static int hf_pfcp_mbsn4resp_flags_o5_b2_n19dtr = -1;
-static int hf_pfcp_mbsn4resp_flags_o5_b1_jmti = -1;
-static int hf_pfcp_mbsn4resp_flags_o5_b0_nn19dt = -1;
+static int hf_pfcp_mbsn4resp_flags_o5_b2_n19dtr;
+static int hf_pfcp_mbsn4resp_flags_o5_b1_jmti;
+static int hf_pfcp_mbsn4resp_flags_o5_b0_nn19dt;
 
-static int hf_pfcp_tunnel_password_value = -1;
+static int hf_pfcp_tunnel_password_value;
 
-static int hf_pfcp_area_session_id_value = -1;
+static int hf_pfcp_area_session_id_value;
 
-static int hf_pfcp_dscp_to_ppi_mapping_info_ppi_value = -1;
-static int hf_pfcp_dscp_to_ppi_mapping_info_dscp_value = -1;
+static int hf_pfcp_dscp_to_ppi_mapping_info_ppi_value;
+static int hf_pfcp_dscp_to_ppi_mapping_info_dscp_value;
 
-static int hf_pfcp_pfcpsdrsp_flags_b0_puru = -1;
+static int hf_pfcp_pfcpsdrsp_flags_b0_puru;
 
-static int hf_pfcp_qer_indications_flags_b3_pdusm = -1;
-static int hf_pfcp_qer_indications_flags_b2_eml4s = -1;
-static int hf_pfcp_qer_indications_flags_b1_edbmi = -1;
-static int hf_pfcp_qer_indications_flags_b0_iqfis = -1;
+static int hf_pfcp_qer_indications_flags_b3_pdusm;
+static int hf_pfcp_qer_indications_flags_b2_eml4s;
+static int hf_pfcp_qer_indications_flags_b1_edbmi;
+static int hf_pfcp_qer_indications_flags_b0_iqfis;
 
-static int hf_pfcp_configured_time_domain_flags_b0_ctdi = -1;
+static int hf_pfcp_configured_time_domain_flags_b0_ctdi;
 
-static int hf_pfcp_metadata = -1;
-static int hf_pfcp_metadata_binary_metadata = -1;
+static int hf_pfcp_metadata;
+static int hf_pfcp_metadata_binary_metadata;
 
-static int hf_pfcp_traffic_parameter_threshold_flags_b0_dl = -1;
-static int hf_pfcp_traffic_parameter_threshold_downlink_n6_jitter_threshold = -1;
+static int hf_pfcp_traffic_parameter_threshold_flags_b0_dl;
+static int hf_pfcp_traffic_parameter_threshold_downlink_n6_jitter_threshold;
 
-static int hf_pfcp_dl_periodicity_value = -1;
+static int hf_pfcp_dl_periodicity_value;
 
-static int hf_pfcp_n6_jitter_measurement_flags_b0_dl = -1;
-static int hf_pfcp_n6_jitter_measurement_dl_periodicity = -1;
-static int hf_pfcp_n6_jitter_measurement_lower_dl_jitter_measurement = -1;
-static int hf_pfcp_n6_jitter_measurement_higher_dl_jitter_measurement = -1;
+static int hf_pfcp_n6_jitter_measurement_flags_b0_dl;
+static int hf_pfcp_n6_jitter_measurement_dl_periodicity;
+static int hf_pfcp_n6_jitter_measurement_lower_dl_jitter_measurement;
+static int hf_pfcp_n6_jitter_measurement_higher_dl_jitter_measurement;
 
 
-static int hf_pfcp_traffic_parameter_measurement_indication_flags_b2_n6jmi = -1;
-static int hf_pfcp_traffic_parameter_measurement_indication_flags_b1_dlpmi = -1;
-static int hf_pfcp_traffic_parameter_measurement_indication_flags_b0_ulpmi = -1;
+static int hf_pfcp_traffic_parameter_measurement_indication_flags_b2_n6jmi;
+static int hf_pfcp_traffic_parameter_measurement_indication_flags_b1_dlpmi;
+static int hf_pfcp_traffic_parameter_measurement_indication_flags_b0_ulpmi;
 
-static int hf_pfcp_ul_periodicity_value = -1;
+static int hf_pfcp_ul_periodicity_value;
 
-static int hf_pfcp_mpquic_control_information_flags_b0_cupd = -1;
+static int hf_pfcp_mpquic_control_information_flags_b0_cupd;
 
-static int hf_pfcp_mpquic_address_information_flags_b1_v6 = -1;
-static int hf_pfcp_mpquic_address_information_flags_b0_v4 = -1;
-static int hf_pfcp_mpquic_address_information_type = -1;
-static int hf_pfcp_mpquic_address_information_port = -1;
-static int hf_pfcp_mpquic_address_information_address_ipv4 = -1;
-static int hf_pfcp_mpquic_address_information_address_ipv6 = -1;
+static int hf_pfcp_mpquic_address_information_flags_b1_v6;
+static int hf_pfcp_mpquic_address_information_flags_b0_v4;
+static int hf_pfcp_mpquic_address_information_type;
+static int hf_pfcp_mpquic_address_information_port;
+static int hf_pfcp_mpquic_address_information_address_ipv4;
+static int hf_pfcp_mpquic_address_information_address_ipv6;
 
-static int hf_pfcp_transport_mode_value = -1;
+static int hf_pfcp_transport_mode_value;
 
-static int hf_pfcp_protocol_description_flags_b2_srtp = -1;
-static int hf_pfcp_protocol_description_flags_b1_rtp = -1;
-static int hf_pfcp_protocol_description_flags_b0_h264 = -1;
+static int hf_pfcp_protocol_description_flags_b2_srtp;
+static int hf_pfcp_protocol_description_flags_b1_rtp;
+static int hf_pfcp_protocol_description_flags_b0_h264;
 
-static int hf_pfcp_reporting_suggestion_info_flags_b0_rurg = -1;
+static int hf_pfcp_reporting_suggestion_info_flags_b0_rurg;
 
-static int hf_pfcp_tl_container = -1;
+static int hf_pfcp_tl_container;
 
 /* Enterprise IEs */
 /* BBF */
-static int hf_pfcp_bbf_up_function_features_o7_b7_nat_up = -1;
-static int hf_pfcp_bbf_up_function_features_o7_b6_nat_cp = -1;
-static int hf_pfcp_bbf_up_function_features_o7_b5_iptv = -1;
-static int hf_pfcp_bbf_up_function_features_o7_b4_lcp_keepalive_offload = -1;
-static int hf_pfcp_bbf_up_function_features_o7_b3_lns = -1;
-static int hf_pfcp_bbf_up_function_features_o7_b2_lac = -1;
-static int hf_pfcp_bbf_up_function_features_o7_b1_ipoe = -1;
-static int hf_pfcp_bbf_up_function_features_o7_b0_pppoe = -1;
+static int hf_pfcp_bbf_up_function_features_o7_b7_nat_up;
+static int hf_pfcp_bbf_up_function_features_o7_b6_nat_cp;
+static int hf_pfcp_bbf_up_function_features_o7_b5_iptv;
+static int hf_pfcp_bbf_up_function_features_o7_b4_lcp_keepalive_offload;
+static int hf_pfcp_bbf_up_function_features_o7_b3_lns;
+static int hf_pfcp_bbf_up_function_features_o7_b2_lac;
+static int hf_pfcp_bbf_up_function_features_o7_b1_ipoe;
+static int hf_pfcp_bbf_up_function_features_o7_b0_pppoe;
 
-static int hf_pfcp_bbf_logical_port_id = -1;
-static int hf_pfcp_bbf_logical_port_id_str = -1;
+static int hf_pfcp_bbf_logical_port_id;
+static int hf_pfcp_bbf_logical_port_id_str;
 
-static int hf_pfcp_bbf_outer_hdr_desc = -1;
-static int hf_pfcp_bbf_outer_hdr_creation_tunnel_id = -1;
-static int hf_pfcp_bbf_outer_hdr_creation_session_id = -1;
+static int hf_pfcp_bbf_outer_hdr_desc;
+static int hf_pfcp_bbf_outer_hdr_creation_tunnel_id;
+static int hf_pfcp_bbf_outer_hdr_creation_session_id;
 
-static int hf_pfcp_bbf_out_hdr_desc = -1;
+static int hf_pfcp_bbf_out_hdr_desc;
 
-static int hf_pfcp_bbf_pppoe_session_id = -1;
+static int hf_pfcp_bbf_pppoe_session_id;
 
-static int hf_pfcp_bbf_ppp_protocol_flags = -1;
-static int hf_pfcp_bbf_ppp_protocol_b2_control = -1;
-static int hf_pfcp_bbf_ppp_protocol_b1_data = -1;
-static int hf_pfcp_bbf_ppp_protocol_b0_specific = -1;
-static int hf_pfcp_bbf_ppp_protocol = -1;
+static int hf_pfcp_bbf_ppp_protocol_flags;
+static int hf_pfcp_bbf_ppp_protocol_b2_control;
+static int hf_pfcp_bbf_ppp_protocol_b1_data;
+static int hf_pfcp_bbf_ppp_protocol_b0_specific;
+static int hf_pfcp_bbf_ppp_protocol;
 
-static int hf_pfcp_bbf_verification_timer_interval = -1;
-static int hf_pfcp_bbf_verification_timer_count = -1;
+static int hf_pfcp_bbf_verification_timer_interval;
+static int hf_pfcp_bbf_verification_timer_count;
 
-static int hf_pfcp_bbf_ppp_lcp_magic_number_tx = -1;
-static int hf_pfcp_bbf_ppp_lcp_magic_number_rx = -1;
+static int hf_pfcp_bbf_ppp_lcp_magic_number_tx;
+static int hf_pfcp_bbf_ppp_lcp_magic_number_rx;
 
-static int hf_pfcp_bbf_mtu = -1;
+static int hf_pfcp_bbf_mtu;
 
-static int hf_pfcp_bbf_l2tp_endp_flags = -1;
-static int hf_pfcp_bbf_l2tp_endp_flags_b2_ch = -1;
-static int hf_pfcp_bbf_l2tp_endp_flags_b1_v6 = -1;
-static int hf_pfcp_bbf_l2tp_endp_flags_b0_v4 = -1;
-static int hf_pfcp_bbf_l2tp_endp_id_tunnel_id = -1;
-static int hf_pfcp_bbf_l2tp_endp_id_ipv4 = -1;
-static int hf_pfcp_bbf_l2tp_endp_id_ipv6 = -1;
+static int hf_pfcp_bbf_l2tp_endp_flags;
+static int hf_pfcp_bbf_l2tp_endp_flags_b2_ch;
+static int hf_pfcp_bbf_l2tp_endp_flags_b1_v6;
+static int hf_pfcp_bbf_l2tp_endp_flags_b0_v4;
+static int hf_pfcp_bbf_l2tp_endp_id_tunnel_id;
+static int hf_pfcp_bbf_l2tp_endp_id_ipv4;
+static int hf_pfcp_bbf_l2tp_endp_id_ipv6;
 
-static int hf_pfcp_bbf_l2tp_session_id = -1;
+static int hf_pfcp_bbf_l2tp_session_id;
 
-static int hf_pfcp_bbf_l2tp_type_flags = -1;
-static int hf_pfcp_bbf_l2tp_type_flags_b0_t = -1;
+static int hf_pfcp_bbf_l2tp_type_flags;
+static int hf_pfcp_bbf_l2tp_type_flags_b0_t;
 
-static int hf_pfcp_bbf_multicast_flags_o7_b1_routeralertoff = -1;
-static int hf_pfcp_bbf_multicast_flags_o7_b0_fastleave = -1;
+static int hf_pfcp_bbf_multicast_flags_o7_b1_routeralertoff;
+static int hf_pfcp_bbf_multicast_flags_o7_b0_fastleave;
 
-static int hf_pfcp_bbf_multicast_query_param_robustness = -1;
-static int hf_pfcp_bbf_multicast_query_param_query_interval = -1;
-static int hf_pfcp_bbf_multicast_query_param_query_response_interval = -1;
-static int hf_pfcp_bbf_multicast_query_param_group_query_interval = -1;
+static int hf_pfcp_bbf_multicast_query_param_robustness;
+static int hf_pfcp_bbf_multicast_query_param_query_interval;
+static int hf_pfcp_bbf_multicast_query_param_query_response_interval;
+static int hf_pfcp_bbf_multicast_query_param_group_query_interval;
 
-static int hf_pfcp_bbf_multicast_group_limit_max_joins = -1;
+static int hf_pfcp_bbf_multicast_group_limit_max_joins;
 
-static int hf_pfcp_bbf_apply_action_flags_b0_nat = -1;
+static int hf_pfcp_bbf_apply_action_flags_b0_nat;
 
-static int hf_pfcp_bbf_nat_external_port_range_start = -1;
-static int hf_pfcp_bbf_nat_external_port_range_end = -1;
+static int hf_pfcp_bbf_nat_external_port_range_start;
+static int hf_pfcp_bbf_nat_external_port_range_end;
 
-static int hf_pfcp_bbf_nat_port_forward = -1;
-static int hf_pfcp_bbf_nat_port_forward_inside_ip = -1;
-static int hf_pfcp_bbf_nat_port_forward_inside_port = -1;
-static int hf_pfcp_bbf_nat_port_forward_outside_port = -1;
-static int hf_pfcp_bbf_nat_port_forward_protocol = -1;
+static int hf_pfcp_bbf_nat_port_forward;
+static int hf_pfcp_bbf_nat_port_forward_inside_ip;
+static int hf_pfcp_bbf_nat_port_forward_inside_port;
+static int hf_pfcp_bbf_nat_port_forward_outside_port;
+static int hf_pfcp_bbf_nat_port_forward_protocol;
 
-static int hf_pfcp_bbf_reporting_trigger = -1;
+static int hf_pfcp_bbf_reporting_trigger;
 
-static int hf_pfcp_bbf_dynamic_nat_block_port_range_start_port = -1;
-static int hf_pfcp_bbf_dynamic_nat_block_port_range_end_port = -1;
+static int hf_pfcp_bbf_dynamic_nat_block_port_range_start_port;
+static int hf_pfcp_bbf_dynamic_nat_block_port_range_end_port;
 
-static int hf_pfcp_bbf_event_time_stamp = -1;
+static int hf_pfcp_bbf_event_time_stamp;
 
 /* Travelping */
-static int hf_pfcp_enterprise_travelping_packet_measurement = -1;
-static int hf_pfcp_enterprise_travelping_packet_measurement_b2_dlnop = -1;
-static int hf_pfcp_enterprise_travelping_packet_measurement_b1_ulnop = -1;
-static int hf_pfcp_enterprise_travelping_packet_measurement_b0_tonop = -1;
-static int hf_pfcp_travelping_pkt_meas_tonop = -1;
-static int hf_pfcp_travelping_pkt_meas_ulnop = -1;
-static int hf_pfcp_travelping_pkt_meas_dlnop = -1;
-
-static int hf_pfcp_travelping_build_id = -1;
-static int hf_pfcp_travelping_build_id_str = -1;
-static int hf_pfcp_travelping_now = -1;
-static int hf_pfcp_travelping_error_message = -1;
-static int hf_pfcp_travelping_error_message_str = -1;
-static int hf_pfcp_travelping_file_name = -1;
-static int hf_pfcp_travelping_file_name_str = -1;
-static int hf_pfcp_travelping_line_number = -1;
-static int hf_pfcp_travelping_ipfix_policy = -1;
-static int hf_pfcp_travelping_ipfix_policy_str = -1;
-static int hf_pfcp_travelping_trace_parent = -1;
-static int hf_pfcp_travelping_trace_parent_str = -1;
-static int hf_pfcp_travelping_trace_state = -1;
-static int hf_pfcp_travelping_trace_state_str = -1;
+static int hf_pfcp_enterprise_travelping_packet_measurement;
+static int hf_pfcp_enterprise_travelping_packet_measurement_b2_dlnop;
+static int hf_pfcp_enterprise_travelping_packet_measurement_b1_ulnop;
+static int hf_pfcp_enterprise_travelping_packet_measurement_b0_tonop;
+static int hf_pfcp_travelping_pkt_meas_tonop;
+static int hf_pfcp_travelping_pkt_meas_ulnop;
+static int hf_pfcp_travelping_pkt_meas_dlnop;
+
+static int hf_pfcp_travelping_build_id;
+static int hf_pfcp_travelping_build_id_str;
+static int hf_pfcp_travelping_now;
+static int hf_pfcp_travelping_error_message;
+static int hf_pfcp_travelping_error_message_str;
+static int hf_pfcp_travelping_file_name;
+static int hf_pfcp_travelping_file_name_str;
+static int hf_pfcp_travelping_line_number;
+static int hf_pfcp_travelping_ipfix_policy;
+static int hf_pfcp_travelping_ipfix_policy_str;
+static int hf_pfcp_travelping_trace_parent;
+static int hf_pfcp_travelping_trace_parent_str;
+static int hf_pfcp_travelping_trace_state;
+static int hf_pfcp_travelping_trace_state_str;
 
 /* Nokia */
 
-static int hf_pfcp_nokia_sap_template = -1;
-static int hf_pfcp_nokia_group_iface_template = -1;
-static int hf_pfcp_nokia_session_state_id = -1;
-static int hf_pfcp_nokia_detailed_stats_key = -1;
-static int hf_pfcp_nokia_detailed_stats_key_direction = -1;
-static int hf_pfcp_nokia_detailed_stats_key_object_id = -1;
-static int hf_pfcp_nokia_detailed_stats_key_stat_mode = -1;
-static int hf_pfcp_nokia_detailed_stats_key_type = -1;
-static int hf_pfcp_nokia_detailed_stats_bitmap_item = -1;
-static int hf_pfcp_nokia_detailed_stats_octets = -1;
-static int hf_pfcp_nokia_detailed_error = -1;
-static int hf_pfcp_nokia_qos_override = -1;
-static int hf_pfcp_nokia_measurement_info = -1;
-static int hf_pfcp_nokia_measurement_info_b0_det = -1;
-static int hf_pfcp_nokia_pfcpsmreq_flags = -1;
-static int hf_pfcp_nokia_pfcpsmreq_flags_b0_abs = -1;
-static int hf_pfcp_nokia_pfcpsmreq_flags_b1_audit = -1;
-static int hf_pfcp_nokia_up_function_features_bulk_audit = -1;
-static int hf_pfcp_nokia_up_function_features_sssg = -1;
-static int hf_pfcp_nokia_filter_override_type = -1;
-static int hf_pfcp_nokia_filter_override_name = -1;
-static int hf_pfcp_nokia_intermediate_destination = -1;
-static int hf_pfcp_nokia_nat_isa_members = -1;
-static int hf_pfcp_nokia_pfcphb_flags = -1;
-static int hf_pfcp_nokia_pfcphb_flags_b0_aud_r = -1;
-static int hf_pfcp_nokia_pfcphb_flags_b1_aud_s = -1;
-static int hf_pfcp_nokia_pfcphb_flags_b2_aud_e = -1;
-static int hf_pfcp_nokia_l2tp_lcp_request = -1;
-static int hf_pfcp_nokia_l2tp_auth_type = -1;
-static int hf_pfcp_nokia_l2tp_auth_name = -1;
-static int hf_pfcp_nokia_l2tp_auth_id = -1;
-static int hf_pfcp_nokia_l2tp_auth_challenge = -1;
-static int hf_pfcp_nokia_l2tp_auth_response = -1;
-static int hf_pfcp_nokia_l2tp_tunnel_endpoint_ipv4_address = -1;
-static int hf_pfcp_nokia_l2tp_tunnel_endpoint_ipv6_address = -1;
-static int hf_pfcp_nokia_l2tp_client_auth_id = -1;
-static int hf_pfcp_nokia_l2tp_server_auth_id = -1;
-static int hf_pfcp_nokia_l2tp_password = -1;
-static int hf_pfcp_nokia_l2tp_assignment_id = -1;
-static int hf_pfcp_nokia_l2tp_private_group_id = -1;
-static int hf_pfcp_nokia_l2tp_tunnel_params_flags = -1;
-static int hf_pfcp_nokia_l2tp_params_flags_b31_hello_interval = -1;
-static int hf_pfcp_nokia_l2tp_params_flags_b30_idle_timeout = -1;
-static int hf_pfcp_nokia_l2tp_params_flags_b29_session_limit = -1;
-static int hf_pfcp_nokia_l2tp_params_flags_b28_preference = -1;
-static int hf_pfcp_nokia_l2tp_params_flags_b27_df_bit = -1;
-static int hf_pfcp_nokia_l2tp_params_flags_b26_challenge = -1;
-static int hf_pfcp_nokia_l2tp_params_flags_b25_avp_hiding = -1;
-static int hf_pfcp_nokia_l2tp_params_flags_b24_algorithm = -1;
-static int hf_pfcp_nokia_l2tp_params_flags_b19_rx_window_size = -1;
-static int hf_pfcp_nokia_l2tp_params_flags_b18_max_retries_not_estab = -1;
-static int hf_pfcp_nokia_l2tp_params_flags_b17_max_retries_estab = -1;
-static int hf_pfcp_nokia_l2tp_params_flags_b16_destruct_timeout = -1;
-static int hf_pfcp_nokia_l2tp_params_hello_interval = -1;
-static int hf_pfcp_nokia_l2tp_params_idle_timeout = -1;
-static int hf_pfcp_nokia_l2tp_params_session_limit = -1;
-static int hf_pfcp_nokia_l2tp_params_preference = -1;
-static int hf_pfcp_nokia_l2tp_params_df_bit = -1;
-static int hf_pfcp_nokia_l2tp_params_challenge = -1;
-static int hf_pfcp_nokia_l2tp_params_avp_hiding = -1;
-static int hf_pfcp_nokia_l2tp_params_algorithm = -1;
-static int hf_pfcp_nokia_l2tp_params_rx_window_size = -1;
-static int hf_pfcp_nokia_l2tp_params_max_retries_not_estab = -1;
-static int hf_pfcp_nokia_l2tp_params_max_retries_estab = -1;
-static int hf_pfcp_nokia_l2tp_params_destruct_timeout = -1;
-static int hf_pfcp_nokia_l2tp_local_tunnel_id = -1;
-static int hf_pfcp_nokia_l2tp_remote_tunnel_id = -1;
-static int hf_pfcp_nokia_l2tp_local_session_id = -1;
-static int hf_pfcp_nokia_l2tp_remote_session_id = -1;
-static int hf_pfcp_nokia_l2tp_call_serial_num = -1;
-static int hf_pfcp_nokia_snat_inside_ipv4_address = -1;
-static int hf_pfcp_nokia_access_line_circuit_id = -1;
-static int hf_pfcp_nokia_access_line_remote_id = -1;
-static int hf_pfcp_nokia_access_line_params_flags = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b24_act_up = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b25_act_down = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b26_min_up = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b27_min_down = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b28_att_up = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b29_att_down = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b30_max_up = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b31_max_down = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b16_min_up_lp = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b17_min_down_lp = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b18_max_inter_delay_up = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b19_act_inter_delay_up = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b20_max_inter_delay_down = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b21_act_inter_delay_down = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b22_access_loop_encap = -1;
-static int hf_pfcp_nokia_access_line_params_flags_b23_iw_session = -1;
-static int hf_pfcp_nokia_access_line_params_act_up = -1;
-static int hf_pfcp_nokia_access_line_params_act_down = -1;
-static int hf_pfcp_nokia_access_line_params_min_up = -1;
-static int hf_pfcp_nokia_access_line_params_min_down = -1;
-static int hf_pfcp_nokia_access_line_params_att_up = -1;
-static int hf_pfcp_nokia_access_line_params_att_down = -1;
-static int hf_pfcp_nokia_access_line_params_max_up = -1;
-static int hf_pfcp_nokia_access_line_params_max_down = -1;
-static int hf_pfcp_nokia_access_line_params_min_up_lp = -1;
-static int hf_pfcp_nokia_access_line_params_min_down_lp = -1;
-static int hf_pfcp_nokia_access_line_params_max_inter_delay_up = -1;
-static int hf_pfcp_nokia_access_line_params_act_inter_delay_up = -1;
-static int hf_pfcp_nokia_access_line_params_max_inter_delay_down = -1;
-static int hf_pfcp_nokia_access_line_params_act_inter_delay_down = -1;
-static int hf_pfcp_nokia_access_line_params_access_loop_encap = -1;
-static int hf_pfcp_nokia_acct_session_id = -1;
-static int hf_pfcp_nokia_fsg_template_name = -1;
-
-
-static int ett_pfcp = -1;
-static int ett_pfcp_flags = -1;
-static int ett_pfcp_ie = -1;
-static int ett_pfcp_unknown_enterprise_ie = -1;
-static int ett_pfcp_grouped_ie = -1;
-static int ett_pfcp_reporting_triggers = -1;
-static int ett_pfcp_up_function_features = -1;
-static int ett_pfcp_report_trigger = -1;
-static int ett_pfcp_flow_desc = -1;
-static int ett_pfcp_tos = -1;
-static int ett_pfcp_spi = -1;
-static int ett_pfcp_flow_label = -1;
-static int ett_pfcp_sdf_filter_id = -1;
-static int ett_pfcp_adf = -1;
-static int ett_pfcp_aurl = -1;
-static int ett_pfcp_adnp = -1;
-
-static int ett_pfcp_enterprise_travelping_packet_measurement = -1;
-static int ett_pfcp_enterprise_travelping_error_report = -1;
-static int ett_pfcp_enterprise_travelping_created_nat_binding = -1;
-static int ett_pfcp_enterprise_travelping_trace_info = -1;
-
-static int ett_pfcp_bbf_ppp_protocol_flags = -1;
-static int ett_pfcp_bbf_l2tp_endp_flags = -1;
-static int ett_pfcp_bbf_l2tp_type_flags = -1;
-static int ett_pfcp_bbf_ppp_lcp_connectivity = -1;
-static int ett_pfcp_bbf_l2tp_tunnel = -1;
-static int ett_pfcp_bbf_nat_port_forward_list = -1;
-
-static int ett_pfcp_nokia_detailed_stats_key = -1;
-static int ett_pfcp_nokia_detailed_stats_bitmap = -1;
-static int ett_pfcp_nokia_measurement_info = -1;
-static int ett_pfcp_nokia_pfcpsmreq_flags = -1;
-static int ett_pfcp_nokia_pfcphb_flags = -1;
-static int ett_pfcp_nokia_l2tp_tunnel_params_flags = -1;
-static int ett_pfcp_nokia_access_line_params_flags = -1;
-
-static expert_field ei_pfcp_ie_reserved = EI_INIT;
-static expert_field ei_pfcp_ie_data_not_decoded = EI_INIT;
-static expert_field ei_pfcp_ie_not_decoded_null = EI_INIT;
-static expert_field ei_pfcp_ie_not_decoded_too_large = EI_INIT;
-static expert_field ei_pfcp_ie_encoding_error = EI_INIT;
+static int hf_pfcp_nokia_sap_template;
+static int hf_pfcp_nokia_group_iface_template;
+static int hf_pfcp_nokia_session_state_id;
+static int hf_pfcp_nokia_detailed_stats_key;
+static int hf_pfcp_nokia_detailed_stats_key_direction;
+static int hf_pfcp_nokia_detailed_stats_key_object_id;
+static int hf_pfcp_nokia_detailed_stats_key_stat_mode;
+static int hf_pfcp_nokia_detailed_stats_key_type;
+static int hf_pfcp_nokia_detailed_stats_bitmap_item;
+static int hf_pfcp_nokia_detailed_stats_octets;
+static int hf_pfcp_nokia_detailed_error;
+static int hf_pfcp_nokia_qos_override;
+static int hf_pfcp_nokia_measurement_info;
+static int hf_pfcp_nokia_measurement_info_b0_det;
+static int hf_pfcp_nokia_pfcpsmreq_flags;
+static int hf_pfcp_nokia_pfcpsmreq_flags_b0_abs;
+static int hf_pfcp_nokia_pfcpsmreq_flags_b1_audit;
+static int hf_pfcp_nokia_up_function_features_bulk_audit;
+static int hf_pfcp_nokia_up_function_features_sssg;
+static int hf_pfcp_nokia_filter_override_type;
+static int hf_pfcp_nokia_filter_override_name;
+static int hf_pfcp_nokia_intermediate_destination;
+static int hf_pfcp_nokia_nat_isa_members;
+static int hf_pfcp_nokia_pfcphb_flags;
+static int hf_pfcp_nokia_pfcphb_flags_b0_aud_r;
+static int hf_pfcp_nokia_pfcphb_flags_b1_aud_s;
+static int hf_pfcp_nokia_pfcphb_flags_b2_aud_e;
+static int hf_pfcp_nokia_l2tp_lcp_request;
+static int hf_pfcp_nokia_l2tp_auth_type;
+static int hf_pfcp_nokia_l2tp_auth_name;
+static int hf_pfcp_nokia_l2tp_auth_id;
+static int hf_pfcp_nokia_l2tp_auth_challenge;
+static int hf_pfcp_nokia_l2tp_auth_response;
+static int hf_pfcp_nokia_l2tp_tunnel_endpoint_ipv4_address;
+static int hf_pfcp_nokia_l2tp_tunnel_endpoint_ipv6_address;
+static int hf_pfcp_nokia_l2tp_client_auth_id;
+static int hf_pfcp_nokia_l2tp_server_auth_id;
+static int hf_pfcp_nokia_l2tp_password;
+static int hf_pfcp_nokia_l2tp_assignment_id;
+static int hf_pfcp_nokia_l2tp_private_group_id;
+static int hf_pfcp_nokia_l2tp_tunnel_params_flags;
+static int hf_pfcp_nokia_l2tp_params_flags_b31_hello_interval;
+static int hf_pfcp_nokia_l2tp_params_flags_b30_idle_timeout;
+static int hf_pfcp_nokia_l2tp_params_flags_b29_session_limit;
+static int hf_pfcp_nokia_l2tp_params_flags_b28_preference;
+static int hf_pfcp_nokia_l2tp_params_flags_b27_df_bit;
+static int hf_pfcp_nokia_l2tp_params_flags_b26_challenge;
+static int hf_pfcp_nokia_l2tp_params_flags_b25_avp_hiding;
+static int hf_pfcp_nokia_l2tp_params_flags_b24_algorithm;
+static int hf_pfcp_nokia_l2tp_params_flags_b19_rx_window_size;
+static int hf_pfcp_nokia_l2tp_params_flags_b18_max_retries_not_estab;
+static int hf_pfcp_nokia_l2tp_params_flags_b17_max_retries_estab;
+static int hf_pfcp_nokia_l2tp_params_flags_b16_destruct_timeout;
+static int hf_pfcp_nokia_l2tp_params_hello_interval;
+static int hf_pfcp_nokia_l2tp_params_idle_timeout;
+static int hf_pfcp_nokia_l2tp_params_session_limit;
+static int hf_pfcp_nokia_l2tp_params_preference;
+static int hf_pfcp_nokia_l2tp_params_df_bit;
+static int hf_pfcp_nokia_l2tp_params_challenge;
+static int hf_pfcp_nokia_l2tp_params_avp_hiding;
+static int hf_pfcp_nokia_l2tp_params_algorithm;
+static int hf_pfcp_nokia_l2tp_params_rx_window_size;
+static int hf_pfcp_nokia_l2tp_params_max_retries_not_estab;
+static int hf_pfcp_nokia_l2tp_params_max_retries_estab;
+static int hf_pfcp_nokia_l2tp_params_destruct_timeout;
+static int hf_pfcp_nokia_l2tp_local_tunnel_id;
+static int hf_pfcp_nokia_l2tp_remote_tunnel_id;
+static int hf_pfcp_nokia_l2tp_local_session_id;
+static int hf_pfcp_nokia_l2tp_remote_session_id;
+static int hf_pfcp_nokia_l2tp_call_serial_num;
+static int hf_pfcp_nokia_snat_inside_ipv4_address;
+static int hf_pfcp_nokia_access_line_circuit_id;
+static int hf_pfcp_nokia_access_line_remote_id;
+static int hf_pfcp_nokia_access_line_params_flags;
+static int hf_pfcp_nokia_access_line_params_flags_b24_act_up;
+static int hf_pfcp_nokia_access_line_params_flags_b25_act_down;
+static int hf_pfcp_nokia_access_line_params_flags_b26_min_up;
+static int hf_pfcp_nokia_access_line_params_flags_b27_min_down;
+static int hf_pfcp_nokia_access_line_params_flags_b28_att_up;
+static int hf_pfcp_nokia_access_line_params_flags_b29_att_down;
+static int hf_pfcp_nokia_access_line_params_flags_b30_max_up;
+static int hf_pfcp_nokia_access_line_params_flags_b31_max_down;
+static int hf_pfcp_nokia_access_line_params_flags_b16_min_up_lp;
+static int hf_pfcp_nokia_access_line_params_flags_b17_min_down_lp;
+static int hf_pfcp_nokia_access_line_params_flags_b18_max_inter_delay_up;
+static int hf_pfcp_nokia_access_line_params_flags_b19_act_inter_delay_up;
+static int hf_pfcp_nokia_access_line_params_flags_b20_max_inter_delay_down;
+static int hf_pfcp_nokia_access_line_params_flags_b21_act_inter_delay_down;
+static int hf_pfcp_nokia_access_line_params_flags_b22_access_loop_encap;
+static int hf_pfcp_nokia_access_line_params_flags_b23_iw_session;
+static int hf_pfcp_nokia_access_line_params_act_up;
+static int hf_pfcp_nokia_access_line_params_act_down;
+static int hf_pfcp_nokia_access_line_params_min_up;
+static int hf_pfcp_nokia_access_line_params_min_down;
+static int hf_pfcp_nokia_access_line_params_att_up;
+static int hf_pfcp_nokia_access_line_params_att_down;
+static int hf_pfcp_nokia_access_line_params_max_up;
+static int hf_pfcp_nokia_access_line_params_max_down;
+static int hf_pfcp_nokia_access_line_params_min_up_lp;
+static int hf_pfcp_nokia_access_line_params_min_down_lp;
+static int hf_pfcp_nokia_access_line_params_max_inter_delay_up;
+static int hf_pfcp_nokia_access_line_params_act_inter_delay_up;
+static int hf_pfcp_nokia_access_line_params_max_inter_delay_down;
+static int hf_pfcp_nokia_access_line_params_act_inter_delay_down;
+static int hf_pfcp_nokia_access_line_params_access_loop_encap;
+static int hf_pfcp_nokia_acct_session_id;
+static int hf_pfcp_nokia_fsg_template_name;
+
+
+static int ett_pfcp;
+static int ett_pfcp_flags;
+static int ett_pfcp_ie;
+static int ett_pfcp_unknown_enterprise_ie;
+static int ett_pfcp_grouped_ie;
+static int ett_pfcp_reporting_triggers;
+static int ett_pfcp_up_function_features;
+static int ett_pfcp_report_trigger;
+static int ett_pfcp_flow_desc;
+static int ett_pfcp_tos;
+static int ett_pfcp_spi;
+static int ett_pfcp_flow_label;
+static int ett_pfcp_sdf_filter_id;
+static int ett_pfcp_adf;
+static int ett_pfcp_aurl;
+static int ett_pfcp_adnp;
+
+static int ett_pfcp_enterprise_travelping_packet_measurement;
+static int ett_pfcp_enterprise_travelping_error_report;
+static int ett_pfcp_enterprise_travelping_created_nat_binding;
+static int ett_pfcp_enterprise_travelping_trace_info;
+
+static int ett_pfcp_bbf_ppp_protocol_flags;
+static int ett_pfcp_bbf_l2tp_endp_flags;
+static int ett_pfcp_bbf_l2tp_type_flags;
+static int ett_pfcp_bbf_ppp_lcp_connectivity;
+static int ett_pfcp_bbf_l2tp_tunnel;
+static int ett_pfcp_bbf_nat_port_forward_list;
+
+static int ett_pfcp_nokia_detailed_stats_key;
+static int ett_pfcp_nokia_detailed_stats_bitmap;
+static int ett_pfcp_nokia_measurement_info;
+static int ett_pfcp_nokia_pfcpsmreq_flags;
+static int ett_pfcp_nokia_pfcphb_flags;
+static int ett_pfcp_nokia_l2tp_tunnel_params_flags;
+static int ett_pfcp_nokia_access_line_params_flags;
+
+static expert_field ei_pfcp_ie_reserved;
+static expert_field ei_pfcp_ie_data_not_decoded;
+static expert_field ei_pfcp_ie_not_decoded_null;
+static expert_field ei_pfcp_ie_not_decoded_too_large;
+static expert_field ei_pfcp_ie_encoding_error;
 
 
 static gboolean g_pfcp_session = FALSE;
diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c
index 5d9f95714f..6fe3c399f6 100644
--- a/epan/dissectors/packet-pflog.c
+++ b/epan/dissectors/packet-pflog.c
@@ -61,44 +61,44 @@ static dissector_handle_t pflog_handle;
 static dissector_handle_t  ip_handle, ipv6_handle;
 
 /* header fields */
-static int proto_pflog = -1;
-static int hf_pflog_length = -1;
-static int hf_pflog_af = -1;
-static int hf_pflog_action = -1;
-static int hf_pflog_reason = -1;
-static int hf_pflog_ifname = -1;
-static int hf_pflog_ruleset = -1;
-static int hf_pflog_rulenr = -1;
-static int hf_pflog_subrulenr = -1;
-static int hf_pflog_uid = -1;
-static int hf_pflog_pid = -1;
-static int hf_pflog_rule_uid = -1;
-static int hf_pflog_rule_pid = -1;
-static int hf_pflog_dir = -1;
-static int hf_pflog_rewritten = -1;
-static int hf_pflog_pad = -1;
-static int hf_pflog_saddr_ipv4 = -1;
-static int hf_pflog_daddr_ipv4 = -1;
-static int hf_pflog_saddr_ipv6 = -1;
-static int hf_pflog_daddr_ipv6 = -1;
-static int hf_pflog_saddr = -1;
-static int hf_pflog_daddr = -1;
-static int hf_pflog_sport = -1;
-static int hf_pflog_dport = -1;
-static gint ett_pflog = -1;
-
-static expert_field ei_pflog_invalid_header_length = EI_INIT;
+static int proto_pflog;
+static int hf_pflog_length;
+static int hf_pflog_af;
+static int hf_pflog_action;
+static int hf_pflog_reason;
+static int hf_pflog_ifname;
+static int hf_pflog_ruleset;
+static int hf_pflog_rulenr;
+static int hf_pflog_subrulenr;
+static int hf_pflog_uid;
+static int hf_pflog_pid;
+static int hf_pflog_rule_uid;
+static int hf_pflog_rule_pid;
+static int hf_pflog_dir;
+static int hf_pflog_rewritten;
+static int hf_pflog_pad;
+static int hf_pflog_saddr_ipv4;
+static int hf_pflog_daddr_ipv4;
+static int hf_pflog_saddr_ipv6;
+static int hf_pflog_daddr_ipv6;
+static int hf_pflog_saddr;
+static int hf_pflog_daddr;
+static int hf_pflog_sport;
+static int hf_pflog_dport;
+static gint ett_pflog;
+
+static expert_field ei_pflog_invalid_header_length;
 
 /* old header */
-static int proto_old_pflog = -1;
-static int hf_old_pflog_af = -1;
-static int hf_old_pflog_ifname = -1;
-static int hf_old_pflog_rnr = -1;
-static int hf_old_pflog_reason = -1;
-static int hf_old_pflog_action = -1;
-static int hf_old_pflog_dir = -1;
-
-static gint ett_old_pflog = -1;
+static int proto_old_pflog;
+static int hf_old_pflog_af;
+static int hf_old_pflog_ifname;
+static int hf_old_pflog_rnr;
+static int hf_old_pflog_reason;
+static int hf_old_pflog_action;
+static int hf_old_pflog_dir;
+
+static gint ett_old_pflog;
 
 /*
  * Because ENC_HOST_ENDIAN is either equal to ENC_BIG_ENDIAN or
diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c
index 1291475fbe..a90f89936c 100644
--- a/epan/dissectors/packet-pgm.c
+++ b/epan/dissectors/packet-pgm.c
@@ -137,132 +137,132 @@ static gboolean pgm_check_checksum = TRUE;
 #define PGM_OPT_REDIRECT_SIZE 12
 #define PGM_OPT_FRAGMENT_SIZE 16
 
-static int proto_pgm = -1;
-static int ett_pgm = -1;
-static int ett_pgm_optbits = -1;
-static int ett_pgm_opts = -1;
-static int ett_pgm_spm = -1;
-static int ett_pgm_data = -1;
-static int ett_pgm_nak = -1;
-static int ett_pgm_poll = -1;
-static int ett_pgm_polr = -1;
-static int ett_pgm_ack = -1;
-static int ett_pgm_opts_join = -1;
-static int ett_pgm_opts_parityprm = -1;
-static int ett_pgm_opts_paritygrp = -1;
-static int ett_pgm_opts_naklist = -1;
-static int ett_pgm_opts_ccdata = -1;
-static int ett_pgm_opts_nak_bo_ivl = -1;
-static int ett_pgm_opts_nak_bo_rng = -1;
-static int ett_pgm_opts_redirect = -1;
-static int ett_pgm_opts_fragment = -1;
-
-static int hf_pgm_main_sport = -1;
-static int hf_pgm_main_dport = -1;
-static int hf_pgm_port = -1;
-static int hf_pgm_main_type = -1;
-static int hf_pgm_main_opts = -1;
-static int hf_pgm_main_opts_opt = -1;
-static int hf_pgm_main_opts_netsig = -1;
-static int hf_pgm_main_opts_varlen = -1;
-static int hf_pgm_main_opts_parity = -1;
-static int hf_pgm_main_cksum = -1;
-static int hf_pgm_main_cksum_status = -1;
-static int hf_pgm_main_gsi = -1;
-static int hf_pgm_main_tsdulen = -1;
-static int hf_pgm_spm_sqn = -1;
-static int hf_pgm_spm_lead = -1;
-static int hf_pgm_spm_trail = -1;
-static int hf_pgm_spm_pathafi = -1;
-static int hf_pgm_spm_res = -1;
-static int hf_pgm_spm_path = -1;
-static int hf_pgm_spm_path6 = -1;
-/* static int hf_pgm_data_sqn = -1; */
-/* static int hf_pgm_data_trail = -1; */
-static int hf_pgm_nak_sqn = -1;
-static int hf_pgm_nak_srcafi = -1;
-static int hf_pgm_nak_srcres = -1;
-static int hf_pgm_nak_src = -1;
-static int hf_pgm_nak_src6 = -1;
-static int hf_pgm_nak_grpafi = -1;
-static int hf_pgm_nak_grpres = -1;
-static int hf_pgm_nak_grp = -1;
-static int hf_pgm_nak_grp6 = -1;
-static int hf_pgm_poll_sqn = -1;
-static int hf_pgm_poll_round = -1;
-static int hf_pgm_poll_subtype = -1;
-static int hf_pgm_poll_pathafi = -1;
-static int hf_pgm_poll_res = -1;
-static int hf_pgm_poll_path = -1;
-static int hf_pgm_poll_path6 = -1;
-static int hf_pgm_poll_backoff_ivl = -1;
-static int hf_pgm_poll_rand_str = -1;
-static int hf_pgm_poll_matching_bmask = -1;
-static int hf_pgm_polr_sqn = -1;
-static int hf_pgm_polr_round = -1;
-static int hf_pgm_polr_res = -1;
-static int hf_pgm_ack_sqn = -1;
-static int hf_pgm_ack_bitmap = -1;
-
-static int hf_pgm_opt_type = -1;
-static int hf_pgm_opt_len = -1;
-static int hf_pgm_opt_tlen = -1;
-
-static int hf_pgm_genopt_end = -1;
-static int hf_pgm_genopt_type = -1;
-static int hf_pgm_genopt_len = -1;
-static int hf_pgm_genopt_opx = -1;
-
-static int hf_pgm_opt_join_res = -1;
-static int hf_pgm_opt_join_minjoin = -1;
-
-static int hf_pgm_opt_parity_prm_po = -1;
-static int hf_pgm_opt_parity_prm_prmtgsz = -1;
-
-static int hf_pgm_opt_parity_grp_res = -1;
-static int hf_pgm_opt_parity_grp_prmgrp = -1;
-
-static int hf_pgm_opt_nak_res = -1;
-static int hf_pgm_opt_nak_list = -1;
-
-static int hf_pgm_opt_ccdata_res = -1;
-static int hf_pgm_opt_ccdata_tsp = -1;
-static int hf_pgm_opt_ccdata_afi = -1;
-static int hf_pgm_opt_ccdata_res2 = -1;
-static int hf_pgm_opt_ccdata_acker = -1;
-static int hf_pgm_opt_ccdata_acker6 = -1;
-
-static int hf_pgm_opt_ccfeedbk_res = -1;
-static int hf_pgm_opt_ccfeedbk_tsp = -1;
-static int hf_pgm_opt_ccfeedbk_afi = -1;
-static int hf_pgm_opt_ccfeedbk_lossrate = -1;
-static int hf_pgm_opt_ccfeedbk_acker = -1;
-static int hf_pgm_opt_ccfeedbk_acker6 = -1;
-
-static int hf_pgm_opt_nak_bo_ivl_res = -1;
-static int hf_pgm_opt_nak_bo_ivl_bo_ivl = -1;
-static int hf_pgm_opt_nak_bo_ivl_bo_ivl_sqn = -1;
-
-static int hf_pgm_opt_nak_bo_rng_res = -1;
-static int hf_pgm_opt_nak_bo_rng_min_bo_ivl = -1;
-static int hf_pgm_opt_nak_bo_rng_max_bo_ivl = -1;
-
-static int hf_pgm_opt_redirect_res = -1;
-static int hf_pgm_opt_redirect_afi = -1;
-static int hf_pgm_opt_redirect_res2 = -1;
-static int hf_pgm_opt_redirect_dlr = -1;
-static int hf_pgm_opt_redirect_dlr6 = -1;
-
-static int hf_pgm_opt_fragment_res = -1;
-static int hf_pgm_opt_fragment_first_sqn = -1;
-static int hf_pgm_opt_fragment_offset = -1;
-static int hf_pgm_opt_fragment_total_length = -1;
-
-static expert_field ei_pgm_genopt_len = EI_INIT;
-static expert_field ei_pgm_opt_tlen = EI_INIT;
-static expert_field ei_pgm_opt_type = EI_INIT;
-static expert_field ei_address_format_invalid = EI_INIT;
-static expert_field ei_pgm_main_cksum = EI_INIT;
+static int proto_pgm;
+static int ett_pgm;
+static int ett_pgm_optbits;
+static int ett_pgm_opts;
+static int ett_pgm_spm;
+static int ett_pgm_data;
+static int ett_pgm_nak;
+static int ett_pgm_poll;
+static int ett_pgm_polr;
+static int ett_pgm_ack;
+static int ett_pgm_opts_join;
+static int ett_pgm_opts_parityprm;
+static int ett_pgm_opts_paritygrp;
+static int ett_pgm_opts_naklist;
+static int ett_pgm_opts_ccdata;
+static int ett_pgm_opts_nak_bo_ivl;
+static int ett_pgm_opts_nak_bo_rng;
+static int ett_pgm_opts_redirect;
+static int ett_pgm_opts_fragment;
+
+static int hf_pgm_main_sport;
+static int hf_pgm_main_dport;
+static int hf_pgm_port;
+static int hf_pgm_main_type;
+static int hf_pgm_main_opts;
+static int hf_pgm_main_opts_opt;
+static int hf_pgm_main_opts_netsig;
+static int hf_pgm_main_opts_varlen;
+static int hf_pgm_main_opts_parity;
+static int hf_pgm_main_cksum;
+static int hf_pgm_main_cksum_status;
+static int hf_pgm_main_gsi;
+static int hf_pgm_main_tsdulen;
+static int hf_pgm_spm_sqn;
+static int hf_pgm_spm_lead;
+static int hf_pgm_spm_trail;
+static int hf_pgm_spm_pathafi;
+static int hf_pgm_spm_res;
+static int hf_pgm_spm_path;
+static int hf_pgm_spm_path6;
+/* static int hf_pgm_data_sqn; */
+/* static int hf_pgm_data_trail; */
+static int hf_pgm_nak_sqn;
+static int hf_pgm_nak_srcafi;
+static int hf_pgm_nak_srcres;
+static int hf_pgm_nak_src;
+static int hf_pgm_nak_src6;
+static int hf_pgm_nak_grpafi;
+static int hf_pgm_nak_grpres;
+static int hf_pgm_nak_grp;
+static int hf_pgm_nak_grp6;
+static int hf_pgm_poll_sqn;
+static int hf_pgm_poll_round;
+static int hf_pgm_poll_subtype;
+static int hf_pgm_poll_pathafi;
+static int hf_pgm_poll_res;
+static int hf_pgm_poll_path;
+static int hf_pgm_poll_path6;
+static int hf_pgm_poll_backoff_ivl;
+static int hf_pgm_poll_rand_str;
+static int hf_pgm_poll_matching_bmask;
+static int hf_pgm_polr_sqn;
+static int hf_pgm_polr_round;
+static int hf_pgm_polr_res;
+static int hf_pgm_ack_sqn;
+static int hf_pgm_ack_bitmap;
+
+static int hf_pgm_opt_type;
+static int hf_pgm_opt_len;
+static int hf_pgm_opt_tlen;
+
+static int hf_pgm_genopt_end;
+static int hf_pgm_genopt_type;
+static int hf_pgm_genopt_len;
+static int hf_pgm_genopt_opx;
+
+static int hf_pgm_opt_join_res;
+static int hf_pgm_opt_join_minjoin;
+
+static int hf_pgm_opt_parity_prm_po;
+static int hf_pgm_opt_parity_prm_prmtgsz;
+
+static int hf_pgm_opt_parity_grp_res;
+static int hf_pgm_opt_parity_grp_prmgrp;
+
+static int hf_pgm_opt_nak_res;
+static int hf_pgm_opt_nak_list;
+
+static int hf_pgm_opt_ccdata_res;
+static int hf_pgm_opt_ccdata_tsp;
+static int hf_pgm_opt_ccdata_afi;
+static int hf_pgm_opt_ccdata_res2;
+static int hf_pgm_opt_ccdata_acker;
+static int hf_pgm_opt_ccdata_acker6;
+
+static int hf_pgm_opt_ccfeedbk_res;
+static int hf_pgm_opt_ccfeedbk_tsp;
+static int hf_pgm_opt_ccfeedbk_afi;
+static int hf_pgm_opt_ccfeedbk_lossrate;
+static int hf_pgm_opt_ccfeedbk_acker;
+static int hf_pgm_opt_ccfeedbk_acker6;
+
+static int hf_pgm_opt_nak_bo_ivl_res;
+static int hf_pgm_opt_nak_bo_ivl_bo_ivl;
+static int hf_pgm_opt_nak_bo_ivl_bo_ivl_sqn;
+
+static int hf_pgm_opt_nak_bo_rng_res;
+static int hf_pgm_opt_nak_bo_rng_min_bo_ivl;
+static int hf_pgm_opt_nak_bo_rng_max_bo_ivl;
+
+static int hf_pgm_opt_redirect_res;
+static int hf_pgm_opt_redirect_afi;
+static int hf_pgm_opt_redirect_res2;
+static int hf_pgm_opt_redirect_dlr;
+static int hf_pgm_opt_redirect_dlr6;
+
+static int hf_pgm_opt_fragment_res;
+static int hf_pgm_opt_fragment_first_sqn;
+static int hf_pgm_opt_fragment_offset;
+static int hf_pgm_opt_fragment_total_length;
+
+static expert_field ei_pgm_genopt_len;
+static expert_field ei_pgm_opt_tlen;
+static expert_field ei_pgm_opt_type;
+static expert_field ei_address_format_invalid;
+static expert_field ei_pgm_main_cksum;
 
 static dissector_table_t subdissector_table;
 static heur_dissector_list_t heur_subdissector_list;
diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c
index d73100d683..7f2bb6119f 100644
--- a/epan/dissectors/packet-pgsql.c
+++ b/epan/dissectors/packet-pgsql.c
@@ -27,70 +27,70 @@ static dissector_handle_t tls_handle;
 static dissector_handle_t gssapi_handle;
 static dissector_handle_t ntlmssp_handle;
 
-static int proto_pgsql = -1;
-static int hf_frontend = -1;
-static int hf_type = -1;
-static int hf_length = -1;
-static int hf_version_major = -1;
-static int hf_version_minor = -1;
-static int hf_request_code = -1;
-static int hf_supported_minor_version = -1;
-static int hf_number_nonsupported_options = -1;
-static int hf_nonsupported_option = -1;
-static int hf_parameter_name = -1;
-static int hf_parameter_value = -1;
-static int hf_query = -1;
-static int hf_authtype = -1;
-static int hf_passwd = -1;
-static int hf_salt = -1;
-static int hf_gssapi_sspi_data = -1;
-static int hf_sasl_auth_mech = -1;
-static int hf_sasl_auth_data = -1;
-static int hf_sasl_auth_data_length = -1;
-static int hf_statement = -1;
-static int hf_portal = -1;
-static int hf_return = -1;
-static int hf_tag = -1;
-static int hf_status = -1;
-static int hf_copydata = -1;
-static int hf_error = -1;
-static int hf_pid = -1;
-static int hf_key = -1;
-static int hf_condition = -1;
-static int hf_text = -1;
-static int hf_tableoid = -1;
-static int hf_typeoid = -1;
-static int hf_oid = -1;
-static int hf_format = -1;
-static int hf_field_count = -1;
-static int hf_val_name = -1;
-static int hf_val_idx = -1;
-static int hf_val_length = -1;
-static int hf_val_data = -1;
-static int hf_val_mod = -1;
-static int hf_severity = -1;
-static int hf_code = -1;
-static int hf_message = -1;
-static int hf_detail = -1;
-static int hf_hint = -1;
-static int hf_position = -1;
-static int hf_internal_position = -1;
-static int hf_internal_query = -1;
-static int hf_where = -1;
-static int hf_schema_name = -1;
-static int hf_table_name = -1;
-static int hf_column_name = -1;
-static int hf_type_name = -1;
-static int hf_constraint_name = -1;
-static int hf_file = -1;
-static int hf_line = -1;
-static int hf_routine = -1;
-static int hf_ssl_response = -1;
-static int hf_gssenc_response = -1;
-static int hf_gssapi_encrypted_payload = -1;
-
-static gint ett_pgsql = -1;
-static gint ett_values = -1;
+static int proto_pgsql;
+static int hf_frontend;
+static int hf_type;
+static int hf_length;
+static int hf_version_major;
+static int hf_version_minor;
+static int hf_request_code;
+static int hf_supported_minor_version;
+static int hf_number_nonsupported_options;
+static int hf_nonsupported_option;
+static int hf_parameter_name;
+static int hf_parameter_value;
+static int hf_query;
+static int hf_authtype;
+static int hf_passwd;
+static int hf_salt;
+static int hf_gssapi_sspi_data;
+static int hf_sasl_auth_mech;
+static int hf_sasl_auth_data;
+static int hf_sasl_auth_data_length;
+static int hf_statement;
+static int hf_portal;
+static int hf_return;
+static int hf_tag;
+static int hf_status;
+static int hf_copydata;
+static int hf_error;
+static int hf_pid;
+static int hf_key;
+static int hf_condition;
+static int hf_text;
+static int hf_tableoid;
+static int hf_typeoid;
+static int hf_oid;
+static int hf_format;
+static int hf_field_count;
+static int hf_val_name;
+static int hf_val_idx;
+static int hf_val_length;
+static int hf_val_data;
+static int hf_val_mod;
+static int hf_severity;
+static int hf_code;
+static int hf_message;
+static int hf_detail;
+static int hf_hint;
+static int hf_position;
+static int hf_internal_position;
+static int hf_internal_query;
+static int hf_where;
+static int hf_schema_name;
+static int hf_table_name;
+static int hf_column_name;
+static int hf_type_name;
+static int hf_constraint_name;
+static int hf_file;
+static int hf_line;
+static int hf_routine;
+static int hf_ssl_response;
+static int hf_gssenc_response;
+static int hf_gssapi_encrypted_payload;
+
+static gint ett_pgsql;
+static gint ett_values;
 
 #define PGSQL_PORT 5432
 static gboolean pgsql_desegment = TRUE;
diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c
index 1277cbbd4c..8fbacc9f0a 100644
--- a/epan/dissectors/packet-pim.c
+++ b/epan/dissectors/packet-pim.c
@@ -198,129 +198,129 @@ enum pimv2_addrtype {
     pimv2_unicast, pimv2_group, pimv2_source
 };
 
-static int proto_pim = -1;
-static int hf_pim_version = -1;
-static int hf_pim_type = -1;
-static int hf_pim_code = -1;
-static int hf_pim_igmp_type = -1;
-static int hf_pim_df_elect_subtype = -1;
-static int hf_pim_df_elect_rsvd = -1;
-static int hf_pim_cksum = -1;
-static int hf_pim_cksum_status = -1;
-static int hf_pim_res_bytes = -1;
+static int proto_pim;
+static int hf_pim_version;
+static int hf_pim_type;
+static int hf_pim_code;
+static int hf_pim_igmp_type;
+static int hf_pim_df_elect_subtype;
+static int hf_pim_df_elect_rsvd;
+static int hf_pim_cksum;
+static int hf_pim_cksum_status;
+static int hf_pim_res_bytes;
 /* PIM Hello options (RFC 4601, section 4.9.2 and RFC 3973, section 4.7.5) */
-static int hf_pim_option = -1;
-static int hf_pim_optiontype = -1;
-static int hf_pim_optionlength = -1;
-static int hf_pim_optionvalue = -1;
-static int hf_pim_register_flag = -1;
-static int hf_pim_register_flag_border = -1;
-static int hf_pim_register_flag_null_register = -1;
-static int hf_pim_mode = -1;
-static int hf_pim_holdtime = -1;
-static int hf_pim_holdtime_t = -1;
-static int hf_pim_numgroups = -1;
-static int hf_pim_numjoins = -1;
-static int hf_pim_numprunes = -1;
-static int hf_pim_t = -1;
-static int hf_pim_propagation_delay = -1;
-static int hf_pim_override_interval = -1;
-static int hf_pim_dr_priority = -1;
-static int hf_pim_generation_id = -1;
-static int hf_pim_state_refresh_version = -1;
-static int hf_pim_state_refresh_interval = -1;
-static int hf_pim_state_refresh_reserved = -1;
+static int hf_pim_option;
+static int hf_pim_optiontype;
+static int hf_pim_optionlength;
+static int hf_pim_optionvalue;
+static int hf_pim_register_flag;
+static int hf_pim_register_flag_border;
+static int hf_pim_register_flag_null_register;
+static int hf_pim_mode;
+static int hf_pim_holdtime;
+static int hf_pim_holdtime_t;
+static int hf_pim_numgroups;
+static int hf_pim_numjoins;
+static int hf_pim_numprunes;
+static int hf_pim_t;
+static int hf_pim_propagation_delay;
+static int hf_pim_override_interval;
+static int hf_pim_dr_priority;
+static int hf_pim_generation_id;
+static int hf_pim_state_refresh_version;
+static int hf_pim_state_refresh_interval;
+static int hf_pim_state_refresh_reserved;
 /* Assert fields */
-static int hf_pim_rpt = -1;
-static int hf_pim_metric_pref = -1;
-static int hf_pim_df_metric_pref = -1;
-static int hf_pim_metric = -1;
-static int hf_pim_prune_indicator = -1;
-static int hf_pim_prune_now = -1;
-static int hf_pim_assert_override = -1;
-static int hf_pim_ip_version = -1;
-static int hf_pim_dummy_header = -1;
-static int hf_pim_source_ip4 = -1;
-static int hf_pim_source_ip6 = -1;
-static int hf_pim_group_ip4 = -1;
-static int hf_pim_group_ip6 = -1;
-static int hf_pim_group_mask_ip4 = -1;
-static int hf_pim_upstream_neighbor_ip4 = -1;
-static int hf_pim_upstream_neighbor_ip6 = -1;
-static int hf_pim_join_ip4 = -1;
-static int hf_pim_join_ip6 = -1;
-static int hf_pim_prune_ip4 = -1;
-static int hf_pim_prune_ip6 = -1;
-static int hf_pim_address_list_ip4 = -1;
-static int hf_pim_address_list_ip6 = -1;
-static int hf_pim_bsr_ip4 = -1;
-static int hf_pim_bsr_ip6 = -1;
-static int hf_pim_rp_ip4 = -1;
-static int hf_pim_rp_ip6 = -1;
-static int hf_pim_bd_bo_offer_ip4 = -1;
-static int hf_pim_bd_bo_offer_ip6 = -1;
-static int hf_pim_bd_offer_metric_pref = -1;
-static int hf_pim_bd_offer_metric = -1;
-static int hf_pim_bd_offer_interval = -1;
-static int hf_pim_bd_pass_ip4 = -1;
-static int hf_pim_bd_pass_ip6 = -1;
-static int hf_pim_bd_pass_metric_pref = -1;
-static int hf_pim_bd_pass_metric = -1;
-static int hf_pim_originator_ip4 = -1;
-static int hf_pim_originator_ip6 = -1;
-static int hf_pim_group_address_ip4 = -1;
-static int hf_pim_fragment_tag = -1;
-static int hf_pim_hash_mask_len = -1;
-static int hf_pim_bsr_priority = -1;
-static int hf_pim_rp_count = -1;
-static int hf_pim_frp_count = -1;
-static int hf_pim_priority = -1;
-static int hf_pim_prefix_count = -1;
-static int hf_pim_addr_len = -1;
-static int hf_pim_src_flags_a = -1;
-static int hf_pim_src_flags_s = -1;
-static int hf_pim_src_flags_w = -1;
-static int hf_pim_src_flags_r = -1;
-static int hf_pim_src_flags_rsv = -1;
-static int hf_pim_mask_len = -1;
-static int hf_pim_addr_af = -1;
-static int hf_pim_addr_et = -1;
-static int hf_pim_unicast_addr_ipv4 = -1;
-static int hf_pim_unicast_addr_ipv6 = -1;
-static int hf_pim_rloc_addr_ipv4 = -1;
-static int hf_pim_rloc_addr_ipv6 = -1;
-static int hf_pim_attribute_transport_mode = -1;
-static int hf_pim_group = -1;
-static int hf_pim_group_addr_flags = -1;
-static int hf_pim_group_addr_flags_b = -1;
-static int hf_pim_group_addr_flags_reserved = -1;
-static int hf_pim_group_addr_flags_z = -1;
-static int hf_pim_source_addr_flags = -1;
-static int hf_pim_source_addr_flags_reserved = -1;
-static int hf_pim_source_addr_flags_s = -1;
-static int hf_pim_source_addr_flags_w = -1;
-static int hf_pim_source_addr_flags_r = -1;
-static int hf_pim_source_join_attribute = -1;
-static int hf_pim_source_ja_flags = -1;
-static int hf_pim_source_ja_flags_f = -1;
-static int hf_pim_source_ja_flags_e = -1;
-static int hf_pim_source_ja_flags_attr_type = -1;
-static int hf_pim_source_ja_length = -1;
-static int hf_pim_source_ja_value = -1;
-static int hf_pim_ttl = -1;
-static int hf_pim_interval = -1;
-static int hf_pim_srcount = -1;
-static int hf_pim_srcholdt = -1;
-static int hf_pim_transitivetype = -1;
-static int hf_pim_optiontype1 = -1;
-static int hf_pfm_no_forward_bit = -1;
-
-static gint ett_pim = -1;
-static gint ett_pim_opts = -1;
-static gint ett_pim_opt = -1;
-static gint ett_pim_addr_flags = -1;
-
-static expert_field ei_pim_cksum = EI_INIT;
+static int hf_pim_rpt;
+static int hf_pim_metric_pref;
+static int hf_pim_df_metric_pref;
+static int hf_pim_metric;
+static int hf_pim_prune_indicator;
+static int hf_pim_prune_now;
+static int hf_pim_assert_override;
+static int hf_pim_ip_version;
+static int hf_pim_dummy_header;
+static int hf_pim_source_ip4;
+static int hf_pim_source_ip6;
+static int hf_pim_group_ip4;
+static int hf_pim_group_ip6;
+static int hf_pim_group_mask_ip4;
+static int hf_pim_upstream_neighbor_ip4;
+static int hf_pim_upstream_neighbor_ip6;
+static int hf_pim_join_ip4;
+static int hf_pim_join_ip6;
+static int hf_pim_prune_ip4;
+static int hf_pim_prune_ip6;
+static int hf_pim_address_list_ip4;
+static int hf_pim_address_list_ip6;
+static int hf_pim_bsr_ip4;
+static int hf_pim_bsr_ip6;
+static int hf_pim_rp_ip4;
+static int hf_pim_rp_ip6;
+static int hf_pim_bd_bo_offer_ip4;
+static int hf_pim_bd_bo_offer_ip6;
+static int hf_pim_bd_offer_metric_pref;
+static int hf_pim_bd_offer_metric;
+static int hf_pim_bd_offer_interval;
+static int hf_pim_bd_pass_ip4;
+static int hf_pim_bd_pass_ip6;
+static int hf_pim_bd_pass_metric_pref;
+static int hf_pim_bd_pass_metric;
+static int hf_pim_originator_ip4;
+static int hf_pim_originator_ip6;
+static int hf_pim_group_address_ip4;
+static int hf_pim_fragment_tag;
+static int hf_pim_hash_mask_len;
+static int hf_pim_bsr_priority;
+static int hf_pim_rp_count;
+static int hf_pim_frp_count;
+static int hf_pim_priority;
+static int hf_pim_prefix_count;
+static int hf_pim_addr_len;
+static int hf_pim_src_flags_a;
+static int hf_pim_src_flags_s;
+static int hf_pim_src_flags_w;
+static int hf_pim_src_flags_r;
+static int hf_pim_src_flags_rsv;
+static int hf_pim_mask_len;
+static int hf_pim_addr_af;
+static int hf_pim_addr_et;
+static int hf_pim_unicast_addr_ipv4;
+static int hf_pim_unicast_addr_ipv6;
+static int hf_pim_rloc_addr_ipv4;
+static int hf_pim_rloc_addr_ipv6;
+static int hf_pim_attribute_transport_mode;
+static int hf_pim_group;
+static int hf_pim_group_addr_flags;
+static int hf_pim_group_addr_flags_b;
+static int hf_pim_group_addr_flags_reserved;
+static int hf_pim_group_addr_flags_z;
+static int hf_pim_source_addr_flags;
+static int hf_pim_source_addr_flags_reserved;
+static int hf_pim_source_addr_flags_s;
+static int hf_pim_source_addr_flags_w;
+static int hf_pim_source_addr_flags_r;
+static int hf_pim_source_join_attribute;
+static int hf_pim_source_ja_flags;
+static int hf_pim_source_ja_flags_f;
+static int hf_pim_source_ja_flags_e;
+static int hf_pim_source_ja_flags_attr_type;
+static int hf_pim_source_ja_length;
+static int hf_pim_source_ja_value;
+static int hf_pim_ttl;
+static int hf_pim_interval;
+static int hf_pim_srcount;
+static int hf_pim_srcholdt;
+static int hf_pim_transitivetype;
+static int hf_pim_optiontype1;
+static int hf_pfm_no_forward_bit;
+
+static gint ett_pim;
+static gint ett_pim_opts;
+static gint ett_pim_opt;
+static gint ett_pim_addr_flags;
+
+static expert_field ei_pim_cksum;
 
 static dissector_handle_t pim_handle;
 static dissector_handle_t pimv1_handle;
diff --git a/epan/dissectors/packet-pingpongprotocol.c b/epan/dissectors/packet-pingpongprotocol.c
index 5a6d5c78c4..3af6273feb 100644
--- a/epan/dissectors/packet-pingpongprotocol.c
+++ b/epan/dissectors/packet-pingpongprotocol.c
@@ -29,17 +29,17 @@ void proto_reg_handoff_pingpongprotocol(void);
 static dissector_handle_t pingpongprotocol_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_pingpongprotocol         = -1;
+static int proto_pingpongprotocol;
 static int tap_pingpongprotocol           = -1;
-static int ett_pingpongprotocol           = -1;
-static int hf_message_type                = -1;
-static int hf_message_flags               = -1;
-static int hf_message_length              = -1;
-static int hf_ping_messageno              = -1;
-static int hf_ping_data                   = -1;
-static int hf_pong_messageno              = -1;
-static int hf_pong_replyno                = -1;
-static int hf_pong_data                   = -1;
+static int ett_pingpongprotocol;
+static int hf_message_type;
+static int hf_message_flags;
+static int hf_message_length;
+static int hf_ping_messageno;
+static int hf_ping_data;
+static int hf_pong_messageno;
+static int hf_pong_replyno;
+static int hf_pong_data;
 
 static guint64 pingpongprotocol_total_msgs  = 0;
 static guint64 pingpongprotocol_total_bytes = 0;
diff --git a/epan/dissectors/packet-pktap.c b/epan/dissectors/packet-pktap.c
index b4dc188594..8e55d2f28f 100644
--- a/epan/dissectors/packet-pktap.c
+++ b/epan/dissectors/packet-pktap.c
@@ -43,27 +43,27 @@ void proto_reg_handoff_pktap(void);
 #define PKT_REC_PACKET	1	/* a packet follows the header */
 
 /* Protocol */
-static int proto_pktap = -1;
-
-static int hf_pktap_hdrlen = -1;
-static int hf_pktap_rectype = -1;
-static int hf_pktap_dlt = -1;
-static int hf_pktap_ifname = -1;
-static int hf_pktap_flags = -1;
-static int hf_pktap_pfamily = -1;
-static int hf_pktap_llhdrlen = -1;
-static int hf_pktap_lltrlrlen = -1;
-static int hf_pktap_pid = -1;
-static int hf_pktap_cmdname = -1;
-static int hf_pktap_svc_class = -1;
-static int hf_pktap_iftype = -1;
-static int hf_pktap_ifunit = -1;
-static int hf_pktap_epid = -1;
-static int hf_pktap_ecmdname = -1;
-
-static gint ett_pktap = -1;
-
-static expert_field ei_pktap_hdrlen_too_short = EI_INIT;
+static int proto_pktap;
+
+static int hf_pktap_hdrlen;
+static int hf_pktap_rectype;
+static int hf_pktap_dlt;
+static int hf_pktap_ifname;
+static int hf_pktap_flags;
+static int hf_pktap_pfamily;
+static int hf_pktap_llhdrlen;
+static int hf_pktap_lltrlrlen;
+static int hf_pktap_pid;
+static int hf_pktap_cmdname;
+static int hf_pktap_svc_class;
+static int hf_pktap_iftype;
+static int hf_pktap_ifunit;
+static int hf_pktap_epid;
+static int hf_pktap_ecmdname;
+
+static gint ett_pktap;
+
+static expert_field ei_pktap_hdrlen_too_short;
 
 static dissector_handle_t pktap_handle;
 static capture_dissector_handle_t eth_cap_handle;
diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c
index 420ddcd1d1..b52d6af853 100644
--- a/epan/dissectors/packet-pktc.c
+++ b/epan/dissectors/packet-pktc.c
@@ -39,55 +39,55 @@ void proto_reg_handoff_pktc_mtafqdn(void);
 static dissector_handle_t pktc_handle;
 static dissector_handle_t pktc_mtafqdn_handle;
 
-static int proto_pktc = -1;
-static int proto_pktc_mtafqdn = -1;
-static gint hf_pktc_app_spec_data = -1;
-static gint hf_pktc_list_of_ciphersuites = -1;
-static gint hf_pktc_list_of_ciphersuites_len = -1;
-static gint hf_pktc_kmmid = -1;
-static gint hf_pktc_doi = -1;
-static gint hf_pktc_version_major = -1;
-static gint hf_pktc_version_minor = -1;
-static gint hf_pktc_server_nonce = -1;
-static gint hf_pktc_server_principal = -1;
-static gint hf_pktc_timestamp = -1;
-static gint hf_pktc_snmpEngineID_len = -1;
-static gint hf_pktc_snmpEngineID = -1;
-static gint hf_pktc_snmpEngineBoots = -1;
-static gint hf_pktc_snmpEngineTime = -1;
-static gint hf_pktc_usmUserName_len = -1;
-static gint hf_pktc_usmUserName = -1;
-static gint hf_pktc_ipsec_spi = -1;
-static gint hf_pktc_snmpAuthenticationAlgorithm = -1;
-static gint hf_pktc_snmpEncryptionTransformID = -1;
-static gint hf_pktc_ipsecAuthenticationAlgorithm = -1;
-static gint hf_pktc_ipsecEncryptionTransformID = -1;
-static gint hf_pktc_reestablish_flag = -1;
-static gint hf_pktc_ack_required_flag = -1;
-static gint hf_pktc_sha1_hmac = -1;
-static gint hf_pktc_sec_param_lifetime = -1;
-static gint hf_pktc_grace_period = -1;
-
-static gint hf_pktc_mtafqdn_msgtype = -1;
-static gint hf_pktc_mtafqdn_enterprise = -1;
-static gint hf_pktc_mtafqdn_version = -1;
-static gint hf_pktc_mtafqdn_mac = -1;
-static gint hf_pktc_mtafqdn_pub_key_hash = -1;
-static gint hf_pktc_mtafqdn_manu_cert_revoked = -1;
-static gint hf_pktc_mtafqdn_fqdn = -1;
-static gint hf_pktc_mtafqdn_ip = -1;
-
-static gint ett_pktc = -1;
-static gint ett_pktc_app_spec_data = -1;
-static gint ett_pktc_list_of_ciphersuites = -1;
-static gint ett_pktc_engineid = -1;
-static gint ett_pktc_version = -1;
-
-static gint ett_pktc_mtafqdn = -1;
-
-static expert_field ei_pktc_unknown_kmmid = EI_INIT;
-static expert_field ei_pktc_unknown_doi = EI_INIT;
-static expert_field ei_pktc_unknown_kerberos_application = EI_INIT;
+static int proto_pktc;
+static int proto_pktc_mtafqdn;
+static gint hf_pktc_app_spec_data;
+static gint hf_pktc_list_of_ciphersuites;
+static gint hf_pktc_list_of_ciphersuites_len;
+static gint hf_pktc_kmmid;
+static gint hf_pktc_doi;
+static gint hf_pktc_version_major;
+static gint hf_pktc_version_minor;
+static gint hf_pktc_server_nonce;
+static gint hf_pktc_server_principal;
+static gint hf_pktc_timestamp;
+static gint hf_pktc_snmpEngineID_len;
+static gint hf_pktc_snmpEngineID;
+static gint hf_pktc_snmpEngineBoots;
+static gint hf_pktc_snmpEngineTime;
+static gint hf_pktc_usmUserName_len;
+static gint hf_pktc_usmUserName;
+static gint hf_pktc_ipsec_spi;
+static gint hf_pktc_snmpAuthenticationAlgorithm;
+static gint hf_pktc_snmpEncryptionTransformID;
+static gint hf_pktc_ipsecAuthenticationAlgorithm;
+static gint hf_pktc_ipsecEncryptionTransformID;
+static gint hf_pktc_reestablish_flag;
+static gint hf_pktc_ack_required_flag;
+static gint hf_pktc_sha1_hmac;
+static gint hf_pktc_sec_param_lifetime;
+static gint hf_pktc_grace_period;
+
+static gint hf_pktc_mtafqdn_msgtype;
+static gint hf_pktc_mtafqdn_enterprise;
+static gint hf_pktc_mtafqdn_version;
+static gint hf_pktc_mtafqdn_mac;
+static gint hf_pktc_mtafqdn_pub_key_hash;
+static gint hf_pktc_mtafqdn_manu_cert_revoked;
+static gint hf_pktc_mtafqdn_fqdn;
+static gint hf_pktc_mtafqdn_ip;
+
+static gint ett_pktc;
+static gint ett_pktc_app_spec_data;
+static gint ett_pktc_list_of_ciphersuites;
+static gint ett_pktc_engineid;
+static gint ett_pktc_version;
+
+static gint ett_pktc_mtafqdn;
+
+static expert_field ei_pktc_unknown_kmmid;
+static expert_field ei_pktc_unknown_doi;
+static expert_field ei_pktc_unknown_kerberos_application;
 
 #define KMMID_WAKEUP            0x01
 #define KMMID_AP_REQUEST        0x02
diff --git a/epan/dissectors/packet-pktgen.c b/epan/dissectors/packet-pktgen.c
index ef1439eed7..5ac91f16fc 100644
--- a/epan/dissectors/packet-pktgen.c
+++ b/epan/dissectors/packet-pktgen.c
@@ -26,17 +26,17 @@ void proto_reg_handoff_pktgen(void);
 #define PKTGEN_MAGIC 0xbe9be955
 
 /* Initialize the protocol and registered fields */
-static int proto_pktgen = -1;
+static int proto_pktgen;
 
 /* pktgen header */
-static int hf_pktgen_magic = -1;
-static int hf_pktgen_seqnum = -1;
-static int hf_pktgen_tvsec = -1;
-static int hf_pktgen_tvusec = -1;
-static int hf_pktgen_timestamp = -1;
+static int hf_pktgen_magic;
+static int hf_pktgen_seqnum;
+static int hf_pktgen_tvsec;
+static int hf_pktgen_tvusec;
+static int hf_pktgen_timestamp;
 
 /* Initialize the subtree pointer */
-static gint ett_pktgen = -1;
+static gint ett_pktgen;
 
 /* entry point */
 static gboolean dissect_pktgen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
diff --git a/epan/dissectors/packet-pmproxy.c b/epan/dissectors/packet-pmproxy.c
index 5843f8092a..b59273747f 100644
--- a/epan/dissectors/packet-pmproxy.c
+++ b/epan/dissectors/packet-pmproxy.c
@@ -23,14 +23,14 @@
 static dissector_handle_t pmproxy_handle;
 static dissector_handle_t pcp_handle;
 
-static int proto_pmproxy = -1;
+static int proto_pmproxy;
 
-static int hf_pmproxy_host = -1;
-static int hf_pmproxy_port = -1;
-static int hf_pmproxy_client_version = -1;
-static int hf_pmproxy_server_version = -1;
+static int hf_pmproxy_host;
+static int hf_pmproxy_port;
+static int hf_pmproxy_client_version;
+static int hf_pmproxy_server_version;
 
-static gint ett_pmproxy = -1;
+static gint ett_pmproxy;
 
 typedef struct pmproxy_conversation_info_t {
     guint32 last_proxy_frame;
diff --git a/epan/dissectors/packet-pnrp.c b/epan/dissectors/packet-pnrp.c
index f97cf9b9fa..f4223de128 100644
--- a/epan/dissectors/packet-pnrp.c
+++ b/epan/dissectors/packet-pnrp.c
@@ -110,7 +110,7 @@ static void dissect_signature_structure(tvbuff_t *tvb, gint offset, gint length,
 
 /* Define global variables
  ----------------------------*/
-static int proto_pnrp = -1;
+static int proto_pnrp;
 
 /* Define FieldIDs */
 static const value_string fieldID[] = {
@@ -177,28 +177,28 @@ static const value_string reasonCode[] = {
 
 /* Define IDs for subcomponents */
 /* Message Header */
-static gint hf_pnrp_header = -1;
-static gint hf_pnrp_header_fieldID = -1;
-static gint hf_pnrp_header_length = -1;
-static gint hf_pnrp_header_ident = -1;
-static gint hf_pnrp_header_versionMajor = -1;
-static gint hf_pnrp_header_versionMinor = -1;
-static gint hf_pnrp_header_messageType = -1;
-static gint hf_pnrp_header_messageID = -1;
+static gint hf_pnrp_header;
+static gint hf_pnrp_header_fieldID;
+static gint hf_pnrp_header_length;
+static gint hf_pnrp_header_ident;
+static gint hf_pnrp_header_versionMajor;
+static gint hf_pnrp_header_versionMinor;
+static gint hf_pnrp_header_messageType;
+static gint hf_pnrp_header_messageID;
 /* Message Body */
-static gint hf_pnrp_message_type = -1;
-static gint hf_pnrp_message_length = -1;
-static gint hf_pnrp_message_headerack = -1;
-static gint hf_pnrp_message_pnrpID = -1;    /* Generic variable to display pnrp ID in various situations */
+static gint hf_pnrp_message_type;
+static gint hf_pnrp_message_length;
+static gint hf_pnrp_message_headerack;
+static gint hf_pnrp_message_pnrpID;    /* Generic variable to display pnrp ID in various situations */
 /* Inquire Message Flags */
-static gint hf_pnrp_message_inquire_flags = -1;
-static gint hf_pnrp_message_inquire_flags_reserved1 = -1;
-static gint hf_pnrp_message_inquire_flags_Abit = -1;
-static gint hf_pnrp_message_inquire_flags_Xbit = -1;
-static gint hf_pnrp_message_inquire_flags_Cbit = -1;
-static gint hf_pnrp_message_inquire_flags_reserved2 = -1;
+static gint hf_pnrp_message_inquire_flags;
+static gint hf_pnrp_message_inquire_flags_reserved1;
+static gint hf_pnrp_message_inquire_flags_Abit;
+static gint hf_pnrp_message_inquire_flags_Xbit;
+static gint hf_pnrp_message_inquire_flags_Cbit;
+static gint hf_pnrp_message_inquire_flags_reserved2;
 
-static gint hf_pnrp_padding = -1;
+static gint hf_pnrp_padding;
 
 static int * const inquire_flags[] = {
     &hf_pnrp_message_inquire_flags_reserved1,
@@ -210,27 +210,27 @@ static int * const inquire_flags[] = {
 };
 
 /* Classifier */
-static gint hf_pnrp_message_classifier_unicodeCount = -1;
-static gint hf_pnrp_message_classifier_arrayLength = -1;
-static gint hf_pnrp_message_classifier_entryLength = -1;
-static gint hf_pnrp_message_classifier_string = -1;
+static gint hf_pnrp_message_classifier_unicodeCount;
+static gint hf_pnrp_message_classifier_arrayLength;
+static gint hf_pnrp_message_classifier_entryLength;
+static gint hf_pnrp_message_classifier_string;
 /* ACK Message Flags */
-static gint hf_pnrp_message_ack_flags_reserved = -1;
-static gint hf_pnrp_message_ack_flags_Nbit = -1;
+static gint hf_pnrp_message_ack_flags_reserved;
+static gint hf_pnrp_message_ack_flags_Nbit;
 /* SplitControls */
-static gint hf_pnrp_message_splitControls_authorityBuffer = -1;
+static gint hf_pnrp_message_splitControls_authorityBuffer;
 /* IPv6 Endpoint Array */
-static gint hf_pnrp_message_ipv6EndpointArray_NumberOfEntries = -1;
-static gint hf_pnrp_message_ipv6EndpointArray_ArrayLength = -1;
-static gint hf_pnrp_message_ipv6EndpointArray_EntryLength = -1;
+static gint hf_pnrp_message_ipv6EndpointArray_NumberOfEntries;
+static gint hf_pnrp_message_ipv6EndpointArray_ArrayLength;
+static gint hf_pnrp_message_ipv6EndpointArray_EntryLength;
 /* AUTHORITY Message Flags */
-static gint hf_pnrp_message_authority_flags = -1;
-static gint hf_pnrp_message_authority_flags_reserved1 = -1;
-static gint hf_pnrp_message_authority_flags_Lbit = -1;
-static gint hf_pnrp_message_authority_flags_reserved2 = -1;
-static gint hf_pnrp_message_authority_flags_Bbit = -1;
-static gint hf_pnrp_message_authority_flags_reserved3= -1;
-static gint hf_pnrp_message_authority_flags_Nbit = -1;
+static gint hf_pnrp_message_authority_flags;
+static gint hf_pnrp_message_authority_flags_reserved1;
+static gint hf_pnrp_message_authority_flags_Lbit;
+static gint hf_pnrp_message_authority_flags_reserved2;
+static gint hf_pnrp_message_authority_flags_Bbit;
+static gint hf_pnrp_message_authority_flags_reserved3;
+static gint hf_pnrp_message_authority_flags_Nbit;
 
 static int * const authority_flags[] = {
     &hf_pnrp_message_authority_flags_reserved1,
@@ -243,34 +243,34 @@ static int * const authority_flags[] = {
 };
 
 /* Flood Control Flags */
-static gint hf_pnrp_message_flood_flags_reserved1 = -1;
-static gint hf_pnrp_message_flood_flags_Dbit = -1;
+static gint hf_pnrp_message_flood_flags_reserved1;
+static gint hf_pnrp_message_flood_flags_Dbit;
 
 /* PNRP ID Array */
-static gint hf_pnrp_message_idArray_NumEntries = -1;
-static gint hf_pnrp_message_idArray_Length = -1;
-static gint hf_pnrp_message_ElementFieldType = -1;
-static gint hf_pnrp_message_idarray_Entrylength = -1;
+static gint hf_pnrp_message_idArray_NumEntries;
+static gint hf_pnrp_message_idArray_Length;
+static gint hf_pnrp_message_ElementFieldType;
+static gint hf_pnrp_message_idarray_Entrylength;
 
-static gint hf_pnrp_message_solicitType = -1;
-static gint hf_pnrp_message_certChain = -1;
-static gint hf_pnrp_message_nonce = -1;
-static gint hf_pnrp_message_hashednonce = -1;
-static gint hf_pnrp_message_ipv6 = -1;
+static gint hf_pnrp_message_solicitType;
+static gint hf_pnrp_message_certChain;
+static gint hf_pnrp_message_nonce;
+static gint hf_pnrp_message_hashednonce;
+static gint hf_pnrp_message_ipv6;
 
 /* Encoded CPA */
-static gint hf_pnrp_encodedCPA = -1;
-static gint hf_pnrp_encodedCPA_length = -1;
-static gint hf_pnrp_encodedCPA_minorVersion = -1;
-static gint hf_pnrp_encodedCPA_majorVersion = -1;
-static gint hf_pnrp_encodedCPA_flags = -1;
-static gint hf_pnrp_encodedCPA_flags_reserved = -1;
-static gint hf_pnrp_encodedCPA_flags_Xbit = -1;
-static gint hf_pnrp_encodedCPA_flags_Fbit = -1;
-static gint hf_pnrp_encodedCPA_flags_Cbit = -1;
-static gint hf_pnrp_encodedCPA_flags_Abit = -1;
-static gint hf_pnrp_encodedCPA_flags_Ubit = -1;
-static gint hf_pnrp_encodedCPA_flags_Rbit = -1;
+static gint hf_pnrp_encodedCPA;
+static gint hf_pnrp_encodedCPA_length;
+static gint hf_pnrp_encodedCPA_minorVersion;
+static gint hf_pnrp_encodedCPA_majorVersion;
+static gint hf_pnrp_encodedCPA_flags;
+static gint hf_pnrp_encodedCPA_flags_reserved;
+static gint hf_pnrp_encodedCPA_flags_Xbit;
+static gint hf_pnrp_encodedCPA_flags_Fbit;
+static gint hf_pnrp_encodedCPA_flags_Cbit;
+static gint hf_pnrp_encodedCPA_flags_Abit;
+static gint hf_pnrp_encodedCPA_flags_Ubit;
+static gint hf_pnrp_encodedCPA_flags_Rbit;
 static int * const encodedCPA_flags[] = {
     &hf_pnrp_encodedCPA_flags_reserved,
     &hf_pnrp_encodedCPA_flags_Xbit,
@@ -281,92 +281,92 @@ static int * const encodedCPA_flags[] = {
     &hf_pnrp_encodedCPA_flags_Rbit,
     NULL
 };
-static gint hf_pnrp_encodedCPA_notAfter = -1;
-static gint hf_pnrp_encodedCPA_serviceLocation = -1;
-static gint hf_pnrp_encodedCPA_binaryAuthority = -1;
-static gint hf_pnrp_encodedCPA_classifierHash = -1;
-static gint hf_pnrp_encodedCPA_friendlyName = -1;
+static gint hf_pnrp_encodedCPA_notAfter;
+static gint hf_pnrp_encodedCPA_serviceLocation;
+static gint hf_pnrp_encodedCPA_binaryAuthority;
+static gint hf_pnrp_encodedCPA_classifierHash;
+static gint hf_pnrp_encodedCPA_friendlyName;
 
 /* Lookup Controls */
-static gint hf_pnrp_message_lookupControls_flags = -1;
-static gint hf_pnrp_message_lookupControls_flags_reserved = -1;
-static gint hf_pnrp_message_lookupControls_flags_Abit = -1;
-static gint hf_pnrp_message_lookupControls_flags_0bit = -1;
+static gint hf_pnrp_message_lookupControls_flags;
+static gint hf_pnrp_message_lookupControls_flags_reserved;
+static gint hf_pnrp_message_lookupControls_flags_Abit;
+static gint hf_pnrp_message_lookupControls_flags_0bit;
 static int * const lookupControls_flags[] = {
     &hf_pnrp_message_lookupControls_flags_reserved,
     &hf_pnrp_message_lookupControls_flags_Abit,
     &hf_pnrp_message_lookupControls_flags_0bit,
     NULL
 };
-static gint hf_pnrp_message_lookupControls_precision =-1;
-static gint hf_pnrp_message_lookupControls_resolveCriteria =-1;
-static gint hf_pnrp_message_lookupControls_reasonCode =-1;
+static gint hf_pnrp_message_lookupControls_precision;
+static gint hf_pnrp_message_lookupControls_resolveCriteria;
+static gint hf_pnrp_message_lookupControls_reasonCode;
 
 /* Dissect Route Entry */
-static gint hf_pnrp_message_routeEntry_portNumber = -1;
-static gint hf_pnrp_message_routeEntry_flags = -1;
-static gint hf_pnrp_message_routeEntry_addressCount = -1;
+static gint hf_pnrp_message_routeEntry_portNumber;
+static gint hf_pnrp_message_routeEntry_flags;
+static gint hf_pnrp_message_routeEntry_addressCount;
 
 /* Public Key Structure */
-static gint hf_pnrp_publicKey_objID = -1;
-static gint hf_pnrp_publicKey_publicKeyData = -1;
+static gint hf_pnrp_publicKey_objID;
+static gint hf_pnrp_publicKey_publicKeyData;
 
 /* Signature Structure */
-static gint hf_pnrp_signature_signatureData = -1;
+static gint hf_pnrp_signature_signatureData;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_pnrp_payload_port = -1;
-static int hf_pnrp_signature_length = -1;
-static int hf_pnrp_signature_structure_length = -1;
-static int hf_pnrp_encodedCPA_total_bytes_of_payload = -1;
-static int hf_pnrp_signature_hash_id = -1;
-static int hf_pnrp_message_flags = -1;
-static int hf_pnrp_encodedCPA_number_of_service_addresses = -1;
-static int hf_pnrp_payload_iana_proto = -1;
-static int hf_pnrp_reserved8 = -1;
-static int hf_pnrp_reserved16 = -1;
-static int hf_pnrp_encodedCPA_service_address_length = -1;
-static int hf_pnrp_message_data = -1;
-static int hf_pnrp_publicKey_length_of_structure = -1;
-static int hf_pnrp_publicKey_size_of_cbdata = -1;
-static int hf_pnrp_payload_type = -1;
-static int hf_pnrp_publicKey_size_of_algorithm_oid = -1;
-static int hf_pnrp_message_port_number = -1;
-static int hf_pnrp_publicKey_reserved = -1;
-static int hf_pnrp_encodedCPA_friendlyName_length = -1;
-static int hf_pnrp_message_offset = -1;
-static int hf_pnrp_publicKey_unused_bits = -1;
-static int hf_pnrp_length_of_data = -1;
-static int hf_pnrp_encodedCPA_number_of_payload_structures = -1;
+static int hf_pnrp_payload_port;
+static int hf_pnrp_signature_length;
+static int hf_pnrp_signature_structure_length;
+static int hf_pnrp_encodedCPA_total_bytes_of_payload;
+static int hf_pnrp_signature_hash_id;
+static int hf_pnrp_message_flags;
+static int hf_pnrp_encodedCPA_number_of_service_addresses;
+static int hf_pnrp_payload_iana_proto;
+static int hf_pnrp_reserved8;
+static int hf_pnrp_reserved16;
+static int hf_pnrp_encodedCPA_service_address_length;
+static int hf_pnrp_message_data;
+static int hf_pnrp_publicKey_length_of_structure;
+static int hf_pnrp_publicKey_size_of_cbdata;
+static int hf_pnrp_payload_type;
+static int hf_pnrp_publicKey_size_of_algorithm_oid;
+static int hf_pnrp_message_port_number;
+static int hf_pnrp_publicKey_reserved;
+static int hf_pnrp_encodedCPA_friendlyName_length;
+static int hf_pnrp_message_offset;
+static int hf_pnrp_publicKey_unused_bits;
+static int hf_pnrp_length_of_data;
+static int hf_pnrp_encodedCPA_number_of_payload_structures;
 
 /* Reassembly */
-static int hf_pnrp_fragments = -1;
-static int hf_pnrp_fragment = -1;
-static int hf_pnrp_fragment_overlap = -1;
-static int hf_pnrp_fragment_overlap_conflict = -1;
-static int hf_pnrp_fragment_multiple_tails = -1;
-static int hf_pnrp_fragment_too_long_fragment = -1;
-static int hf_pnrp_fragment_error = -1;
-static int hf_pnrp_fragment_count = -1;
-static int hf_pnrp_reassembled_in = -1;
-static int hf_pnrp_reassembled_length = -1;
-static int hf_pnrp_reassembled_data = -1;
-static int hf_pnrp_fragmented_payload = -1;
+static int hf_pnrp_fragments;
+static int hf_pnrp_fragment;
+static int hf_pnrp_fragment_overlap;
+static int hf_pnrp_fragment_overlap_conflict;
+static int hf_pnrp_fragment_multiple_tails;
+static int hf_pnrp_fragment_too_long_fragment;
+static int hf_pnrp_fragment_error;
+static int hf_pnrp_fragment_count;
+static int hf_pnrp_reassembled_in;
+static int hf_pnrp_reassembled_length;
+static int hf_pnrp_reassembled_data;
+static int hf_pnrp_fragmented_payload;
 
 /* Define variables to reference subtrees */
-static gint ett_pnrp = -1;
-static gint ett_pnrp_header = -1;
-static gint ett_pnrp_message = -1;
-static gint ett_pnrp_message_inquire_flags = -1;
-static gint ett_pnrp_message_authority_flags = -1;
-static gint ett_pnrp_message_encodedCPA = -1;
-static gint ett_pnrp_message_encodedCPA_flags = -1;
-static gint ett_pnrp_message_lookupControls_flags = -1;
-static gint ett_pnrp_message_payloadStructure = -1;
-static gint ett_pnrp_message_publicKeyStructure = -1;
-static gint ett_pnrp_message_signatureStructure = -1;
-static gint ett_pnrp_fragment = -1;
-static gint ett_pnrp_fragments = -1;
+static gint ett_pnrp;
+static gint ett_pnrp_header;
+static gint ett_pnrp_message;
+static gint ett_pnrp_message_inquire_flags;
+static gint ett_pnrp_message_authority_flags;
+static gint ett_pnrp_message_encodedCPA;
+static gint ett_pnrp_message_encodedCPA_flags;
+static gint ett_pnrp_message_lookupControls_flags;
+static gint ett_pnrp_message_payloadStructure;
+static gint ett_pnrp_message_publicKeyStructure;
+static gint ett_pnrp_message_signatureStructure;
+static gint ett_pnrp_fragment;
+static gint ett_pnrp_fragments;
 
 static reassembly_table pnrp_reassembly_table;
 
diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c
index f7af76c1d1..280a201e61 100644
--- a/epan/dissectors/packet-pop.c
+++ b/epan/dissectors/packet-pop.c
@@ -36,38 +36,38 @@
 void proto_register_pop(void);
 void proto_reg_handoff_pop(void);
 
-static int proto_pop = -1;
+static int proto_pop;
 
 static int credentials_tap = -1;
 
-static int hf_pop_response = -1;
-static int hf_pop_response_indicator = -1;
-static int hf_pop_response_description = -1;
-static int hf_pop_response_data = -1;
-
-static int hf_pop_request = -1;
-static int hf_pop_request_command = -1;
-static int hf_pop_request_parameter = -1;
-static int hf_pop_request_data = -1;
-
-static int hf_pop_data_fragments = -1;
-static int hf_pop_data_fragment = -1;
-static int hf_pop_data_fragment_overlap = -1;
-static int hf_pop_data_fragment_overlap_conflicts = -1;
-static int hf_pop_data_fragment_multiple_tails = -1;
-static int hf_pop_data_fragment_too_long_fragment = -1;
-static int hf_pop_data_fragment_error = -1;
-static int hf_pop_data_fragment_count = -1;
-static int hf_pop_data_reassembled_in = -1;
-static int hf_pop_data_reassembled_length = -1;
-
-static expert_field ei_pop_resp_tot_len_invalid = EI_INIT;
-
-static gint ett_pop = -1;
-static gint ett_pop_reqresp = -1;
-
-static gint ett_pop_data_fragment = -1;
-static gint ett_pop_data_fragments = -1;
+static int hf_pop_response;
+static int hf_pop_response_indicator;
+static int hf_pop_response_description;
+static int hf_pop_response_data;
+
+static int hf_pop_request;
+static int hf_pop_request_command;
+static int hf_pop_request_parameter;
+static int hf_pop_request_data;
+
+static int hf_pop_data_fragments;
+static int hf_pop_data_fragment;
+static int hf_pop_data_fragment_overlap;
+static int hf_pop_data_fragment_overlap_conflicts;
+static int hf_pop_data_fragment_multiple_tails;
+static int hf_pop_data_fragment_too_long_fragment;
+static int hf_pop_data_fragment_error;
+static int hf_pop_data_fragment_count;
+static int hf_pop_data_reassembled_in;
+static int hf_pop_data_reassembled_length;
+
+static expert_field ei_pop_resp_tot_len_invalid;
+
+static gint ett_pop;
+static gint ett_pop_reqresp;
+
+static gint ett_pop_data_fragment;
+static gint ett_pop_data_fragments;
 
 static dissector_handle_t pop_handle;
 static dissector_handle_t imf_handle;
diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c
index 6dd62c3a1a..3f014376be 100644
--- a/epan/dissectors/packet-portmap.c
+++ b/epan/dissectors/packet-portmap.c
@@ -26,31 +26,31 @@
 void proto_register_portmap(void);
 void proto_reg_handoff_portmap(void);
 
-static int proto_portmap = -1;
-static int hf_portmap_procedure_v1 = -1;
-static int hf_portmap_procedure_v2 = -1;
-static int hf_portmap_procedure_v3 = -1;
-static int hf_portmap_procedure_v4 = -1;
-static int hf_portmap_proto = -1;
-static int hf_portmap_prog = -1;
-static int hf_portmap_proc = -1;
-static int hf_portmap_version = -1;
-static int hf_portmap_port = -1;
-static int hf_portmap_answer = -1;
-static int hf_portmap_args = -1;
-static int hf_portmap_result = -1;
-static int hf_portmap_rpcb = -1;
-static int hf_portmap_rpcb_prog = -1;
-static int hf_portmap_rpcb_version = -1;
-static int hf_portmap_rpcb_netid = -1;
-static int hf_portmap_rpcb_addr = -1;
-static int hf_portmap_rpcb_owner = -1;
-static int hf_portmap_uaddr = -1;
-
-
-static gint ett_portmap = -1;
-static gint ett_portmap_rpcb = -1;
-static gint ett_portmap_entry = -1;
+static int proto_portmap;
+static int hf_portmap_procedure_v1;
+static int hf_portmap_procedure_v2;
+static int hf_portmap_procedure_v3;
+static int hf_portmap_procedure_v4;
+static int hf_portmap_proto;
+static int hf_portmap_prog;
+static int hf_portmap_proc;
+static int hf_portmap_version;
+static int hf_portmap_port;
+static int hf_portmap_answer;
+static int hf_portmap_args;
+static int hf_portmap_result;
+static int hf_portmap_rpcb;
+static int hf_portmap_rpcb_prog;
+static int hf_portmap_rpcb_version;
+static int hf_portmap_rpcb_netid;
+static int hf_portmap_rpcb_addr;
+static int hf_portmap_rpcb_owner;
+static int hf_portmap_uaddr;
+
+
+static gint ett_portmap;
+static gint ett_portmap_rpcb;
+static gint ett_portmap_entry;
 
 static dissector_handle_t rpc_handle;
 
diff --git a/epan/dissectors/packet-ppcap.c b/epan/dissectors/packet-ppcap.c
index fd6339688f..5d61fefce0 100644
--- a/epan/dissectors/packet-ppcap.c
+++ b/epan/dissectors/packet-ppcap.c
@@ -38,9 +38,9 @@ static mtp3_addr_pc_t* mtp3_addr_dpc;
 
 static int ss7pc_address_type = -1;
 
-static gint ett_ppcap = -1;
-static gint ett_ppcap1 = -1;
-static gint ett_ppcap_new = -1;
+static gint ett_ppcap;
+static gint ett_ppcap1;
+static gint ett_ppcap_new;
 
 static const value_string payload_tag_values[] = {
 	{  1,	"Payload Type"},
@@ -67,32 +67,32 @@ static const value_string address_type_values[] = {
 
 /* Initialise the header fields */
 
-static int proto_ppcap= -1;
-static int hf_ppcap_length = -1;
-static int hf_ppcap_payload_type = -1;
-static int hf_ppcap_ssn = -1;
-static int hf_ppcap_spc = -1;
-static int hf_ppcap_ssn1 = -1;
-static int hf_ppcap_spc1 = -1;
-static int hf_ppcap_opc = -1;
-static int hf_ppcap_dpc = -1;
-static int hf_ppcap_source_nodeid = -1;
-static int hf_ppcap_destination_nodeid = -1;
-/*static int hf_ppcap_source_address_type = -1; */
-/*static int hf_ppcap_destination_address_type = -1; */
-static int hf_ppcap_address_type = -1;
-static int hf_ppcap_source_ip_address1 = -1;
-static int hf_ppcap_source_ip_address2 = -1;
-static int hf_ppcap_destination_ip_address1 = -1;
-static int hf_ppcap_destination_ip_address2 = -1;
-static int hf_ppcap_reserved = -1;
-static int hf_ppcap_destreserved = -1;
-static int hf_ppcap_info = -1;
-static int hf_ppcap_payload_data = -1;
-static int hf_ppcap_local_port = -1;
-static int hf_ppcap_remote_port = -1;
-static int hf_ppcap_transport_prot = -1;
-static int hf_ppcap_sctp_assoc = -1;
+static int proto_ppcap;
+static int hf_ppcap_length;
+static int hf_ppcap_payload_type;
+static int hf_ppcap_ssn;
+static int hf_ppcap_spc;
+static int hf_ppcap_ssn1;
+static int hf_ppcap_spc1;
+static int hf_ppcap_opc;
+static int hf_ppcap_dpc;
+static int hf_ppcap_source_nodeid;
+static int hf_ppcap_destination_nodeid;
+/*static int hf_ppcap_source_address_type; */
+/*static int hf_ppcap_destination_address_type; */
+static int hf_ppcap_address_type;
+static int hf_ppcap_source_ip_address1;
+static int hf_ppcap_source_ip_address2;
+static int hf_ppcap_destination_ip_address1;
+static int hf_ppcap_destination_ip_address2;
+static int hf_ppcap_reserved;
+static int hf_ppcap_destreserved;
+static int hf_ppcap_info;
+static int hf_ppcap_payload_data;
+static int hf_ppcap_local_port;
+static int hf_ppcap_remote_port;
+static int hf_ppcap_transport_prot;
+static int hf_ppcap_sctp_assoc;
 
 /* Initiliaze the subtree pointers*/
 
diff --git a/epan/dissectors/packet-ppi-antenna.c b/epan/dissectors/packet-ppi-antenna.c
index f65b82825b..40b2af75c1 100644
--- a/epan/dissectors/packet-ppi-antenna.c
+++ b/epan/dissectors/packet-ppi-antenna.c
@@ -38,57 +38,57 @@ enum ppi_antenna_type {
 void proto_register_ppi_antenna(void);
 
 /* protocol */
-static int proto_ppi_antenna = -1;
-
-static int hf_ppi_antenna_version = -1;
-static int hf_ppi_antenna_pad = -1;
-static int hf_ppi_antenna_length = -1;
-static int hf_ppi_antenna_present = -1;
-static int hf_ppi_antenna_flags = -1;
-static int hf_ppi_antenna_gaindb = -1;
-static int hf_ppi_antenna_horizbw = -1;
-static int hf_ppi_antenna_vertbw = -1;
-static int hf_ppi_antenna_pgain= -1;
-static int hf_ppi_antenna_beamid= -1;
-static int hf_ppi_antenna_serialnum= -1;
-static int hf_ppi_antenna_modelname = -1;
-static int hf_ppi_antenna_descstr = -1;
-static int hf_ppi_antenna_appspecific_num = -1; /* 4-byte tag no */
-static int hf_ppi_antenna_appspecific_data = -1; /* 60 byte arbitrary data */
+static int proto_ppi_antenna;
+
+static int hf_ppi_antenna_version;
+static int hf_ppi_antenna_pad;
+static int hf_ppi_antenna_length;
+static int hf_ppi_antenna_present;
+static int hf_ppi_antenna_flags;
+static int hf_ppi_antenna_gaindb;
+static int hf_ppi_antenna_horizbw;
+static int hf_ppi_antenna_vertbw;
+static int hf_ppi_antenna_pgain;
+static int hf_ppi_antenna_beamid;
+static int hf_ppi_antenna_serialnum;
+static int hf_ppi_antenna_modelname;
+static int hf_ppi_antenna_descstr;
+static int hf_ppi_antenna_appspecific_num; /* 4-byte tag no */
+static int hf_ppi_antenna_appspecific_data; /* 60 byte arbitrary data */
 
 
 /* "Present" flags */
 /* These represent decoded-bits in the gui */
-static int hf_ppi_antenna_present_flags= -1;
-static int hf_ppi_antenna_present_gaindb = -1;
-static int hf_ppi_antenna_present_horizbw = -1;
-static int hf_ppi_antenna_present_vertbw= -1;
-static int hf_ppi_antenna_present_pgain= -1;
-static int hf_ppi_antenna_present_beamid= -1;
-static int hf_ppi_antenna_present_serialnum= -1;
-static int hf_ppi_antenna_present_modelname = -1;
-static int hf_ppi_antenna_present_descstr = -1;
-static int hf_ppi_antenna_present_appspecific_num = -1;
-static int hf_ppi_antenna_present_appspecific_data = -1;
-static int hf_ppi_antenna_present_ext = -1;
+static int hf_ppi_antenna_present_flags;
+static int hf_ppi_antenna_present_gaindb;
+static int hf_ppi_antenna_present_horizbw;
+static int hf_ppi_antenna_present_vertbw;
+static int hf_ppi_antenna_present_pgain;
+static int hf_ppi_antenna_present_beamid;
+static int hf_ppi_antenna_present_serialnum;
+static int hf_ppi_antenna_present_modelname;
+static int hf_ppi_antenna_present_descstr;
+static int hf_ppi_antenna_present_appspecific_num;
+static int hf_ppi_antenna_present_appspecific_data;
+static int hf_ppi_antenna_present_ext;
 
 /*These are the few defined AntennaFlags bits*/
-static int hf_ppi_antennaflags_mimo= -1;
-static int hf_ppi_antennaflags_horizpol= -1;
-static int hf_ppi_antennaflags_vertpol= -1;
-static int hf_ppi_antennaflags_circpol_l= -1;
-static int hf_ppi_antennaflags_circpol_r= -1;
-static int hf_ppi_antennaflags_steer_elec= -1;
-static int hf_ppi_antennaflags_steer_mech= -1;
+static int hf_ppi_antennaflags_mimo;
+static int hf_ppi_antennaflags_horizpol;
+static int hf_ppi_antennaflags_vertpol;
+static int hf_ppi_antennaflags_circpol_l;
+static int hf_ppi_antennaflags_circpol_r;
+static int hf_ppi_antennaflags_steer_elec;
+static int hf_ppi_antennaflags_steer_mech;
 
 /* These represent arrow-dropdownthings in the gui */
-static gint ett_ppi_antenna = -1;
-static gint ett_ppi_antenna_present = -1;
-static gint ett_ppi_antennaflags= -1;
+static gint ett_ppi_antenna;
+static gint ett_ppi_antenna_present;
+static gint ett_ppi_antennaflags;
 
-static expert_field ei_ppi_antenna_present_bit = EI_INIT;
-static expert_field ei_ppi_antenna_version = EI_INIT;
-static expert_field ei_ppi_antenna_length = EI_INIT;
+static expert_field ei_ppi_antenna_present_bit;
+static expert_field ei_ppi_antenna_version;
+static expert_field ei_ppi_antenna_length;
 
 static int
 dissect_ppi_antenna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) {
diff --git a/epan/dissectors/packet-ppi-gps.c b/epan/dissectors/packet-ppi-gps.c
index 17cd36fe47..2fa60d1d4c 100644
--- a/epan/dissectors/packet-ppi-gps.c
+++ b/epan/dissectors/packet-ppi-gps.c
@@ -56,60 +56,60 @@ enum ppi_geotagging_type {
 void proto_register_ppi_gps(void);
 
 /* protocol */
-static int proto_ppi_gps = -1;
-
-static int hf_ppi_gps_version = -1;
-static int hf_ppi_gps_pad = -1;
-static int hf_ppi_gps_length = -1;
-static int hf_ppi_gps_present = -1;
-static int hf_ppi_gps_gpsflags_flags = -1;
-static int hf_ppi_gps_lon = -1;
-static int hf_ppi_gps_lat = -1;
-static int hf_ppi_gps_alt = -1;
-static int hf_ppi_gps_alt_gnd = -1;
-static int hf_ppi_gps_gpstime = -1;
-static int hf_ppi_gps_fractime = -1;
-static int hf_ppi_gps_eph = -1;
-static int hf_ppi_gps_epv = -1;
-static int hf_ppi_gps_ept = -1;
-static int hf_ppi_gps_descstr = -1;
-static int hf_ppi_gps_appspecific_num = -1; /* 4-byte tag no */
-static int hf_ppi_gps_appspecific_data = -1; /* 60 byte arbitrary data */
+static int proto_ppi_gps;
+
+static int hf_ppi_gps_version;
+static int hf_ppi_gps_pad;
+static int hf_ppi_gps_length;
+static int hf_ppi_gps_present;
+static int hf_ppi_gps_gpsflags_flags;
+static int hf_ppi_gps_lon;
+static int hf_ppi_gps_lat;
+static int hf_ppi_gps_alt;
+static int hf_ppi_gps_alt_gnd;
+static int hf_ppi_gps_gpstime;
+static int hf_ppi_gps_fractime;
+static int hf_ppi_gps_eph;
+static int hf_ppi_gps_epv;
+static int hf_ppi_gps_ept;
+static int hf_ppi_gps_descstr;
+static int hf_ppi_gps_appspecific_num; /* 4-byte tag no */
+static int hf_ppi_gps_appspecific_data; /* 60 byte arbitrary data */
 /* "Present" flags, tese represent decoded-bits in the gui */
-static int hf_ppi_gps_present_gpsflags_flags = -1;
-static int hf_ppi_gps_present_lon = -1;
-static int hf_ppi_gps_present_lat = -1;
-static int hf_ppi_gps_present_alt = -1;
-static int hf_ppi_gps_present_alt_gnd = -1;
-static int hf_ppi_gps_present_gpstime = -1;
-static int hf_ppi_gps_present_fractime = -1;
-static int hf_ppi_gps_present_eph = -1;
-static int hf_ppi_gps_present_epv = -1;
-static int hf_ppi_gps_present_ept = -1;
-static int hf_ppi_gps_present_descr = -1;
-static int hf_ppi_gps_present_appspecific_num = -1;
-static int hf_ppi_gps_present_appspecific_data = -1;
-static int hf_ppi_gps_present_ext = -1;
+static int hf_ppi_gps_present_gpsflags_flags;
+static int hf_ppi_gps_present_lon;
+static int hf_ppi_gps_present_lat;
+static int hf_ppi_gps_present_alt;
+static int hf_ppi_gps_present_alt_gnd;
+static int hf_ppi_gps_present_gpstime;
+static int hf_ppi_gps_present_fractime;
+static int hf_ppi_gps_present_eph;
+static int hf_ppi_gps_present_epv;
+static int hf_ppi_gps_present_ept;
+static int hf_ppi_gps_present_descr;
+static int hf_ppi_gps_present_appspecific_num;
+static int hf_ppi_gps_present_appspecific_data;
+static int hf_ppi_gps_present_ext;
 
 /* Devicetype flags. not to be confused with "present" flags. These are optional */
-static int hf_ppi_gps_gpsflags_flag0_nofix = -1;
-static int hf_ppi_gps_gpsflags_flag1_gpsfix = -1;
-static int hf_ppi_gps_gpsflags_flag2_diffgps = -1;
-static int hf_ppi_gps_gpsflags_flag3_PPS = -1;
-static int hf_ppi_gps_gpsflags_flag4_RTK = -1;
-static int hf_ppi_gps_gpsflags_flag5_floatRTK = -1;
-static int hf_ppi_gps_gpsflags_flag6_dead_reck = -1;
-static int hf_ppi_gps_gpsflags_flag7_manual = -1;
-static int hf_ppi_gps_gpsflags_flag8_sim = -1;
+static int hf_ppi_gps_gpsflags_flag0_nofix;
+static int hf_ppi_gps_gpsflags_flag1_gpsfix;
+static int hf_ppi_gps_gpsflags_flag2_diffgps;
+static int hf_ppi_gps_gpsflags_flag3_PPS;
+static int hf_ppi_gps_gpsflags_flag4_RTK;
+static int hf_ppi_gps_gpsflags_flag5_floatRTK;
+static int hf_ppi_gps_gpsflags_flag6_dead_reck;
+static int hf_ppi_gps_gpsflags_flag7_manual;
+static int hf_ppi_gps_gpsflags_flag8_sim;
 
 /* These represent arrow-dropdownthings in the gui */
-static gint ett_ppi_gps = -1;
-static gint ett_ppi_gps_present = -1;
-static gint ett_ppi_gps_gpsflags_flags= -1;
+static gint ett_ppi_gps;
+static gint ett_ppi_gps_present;
+static gint ett_ppi_gps_gpsflags_flags;
 
-static expert_field ei_ppi_gps_present_bit = EI_INIT;
-static expert_field ei_ppi_gps_version = EI_INIT;
-static expert_field ei_ppi_gps_length = EI_INIT;
+static expert_field ei_ppi_gps_present_bit;
+static expert_field ei_ppi_gps_version;
+static expert_field ei_ppi_gps_length;
 
 static int
 dissect_ppi_gps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) {
diff --git a/epan/dissectors/packet-ppi-sensor.c b/epan/dissectors/packet-ppi-sensor.c
index 527a0aba2d..65dcbb15c7 100644
--- a/epan/dissectors/packet-ppi-sensor.c
+++ b/epan/dissectors/packet-ppi-sensor.c
@@ -79,46 +79,46 @@ static const value_string sensor_unit_str[] = {
 
 void proto_register_ppi_sensor(void);
 /* protocol */
-static int proto_ppi_sensor = -1;
-
-static int hf_ppi_sensor_version = -1;
-static int hf_ppi_sensor_pad = -1;
-static int hf_ppi_sensor_length = -1;
-static int hf_ppi_sensor_present = -1;
-static int hf_ppi_sensor_sensortype = -1;
-static int hf_ppi_sensor_scalefactor = -1;
-static int hf_ppi_sensor_val_x = -1;
-static int hf_ppi_sensor_val_y= -1;
-static int hf_ppi_sensor_val_z= -1;
-static int hf_ppi_sensor_val_t= -1;
-static int hf_ppi_sensor_val_e = -1;
-static int hf_ppi_sensor_descstr = -1;
-static int hf_ppi_sensor_appspecific_num = -1; /* 4-byte tag no */
-static int hf_ppi_sensor_appspecific_data = -1; /* 60 byte arbitrary data */
+static int proto_ppi_sensor;
+
+static int hf_ppi_sensor_version;
+static int hf_ppi_sensor_pad;
+static int hf_ppi_sensor_length;
+static int hf_ppi_sensor_present;
+static int hf_ppi_sensor_sensortype;
+static int hf_ppi_sensor_scalefactor;
+static int hf_ppi_sensor_val_x;
+static int hf_ppi_sensor_val_y;
+static int hf_ppi_sensor_val_z;
+static int hf_ppi_sensor_val_t;
+static int hf_ppi_sensor_val_e;
+static int hf_ppi_sensor_descstr;
+static int hf_ppi_sensor_appspecific_num; /* 4-byte tag no */
+static int hf_ppi_sensor_appspecific_data; /* 60 byte arbitrary data */
 
 
 /* "Present" flags */
 /* These represent decoded-bits in the gui */
-static int hf_ppi_sensor_present_sensortype = -1;
-static int hf_ppi_sensor_present_scalefactor = -1;
-static int hf_ppi_sensor_present_val_x= -1;
-static int hf_ppi_sensor_present_val_y= -1;
-static int hf_ppi_sensor_present_val_z= -1;
-static int hf_ppi_sensor_present_val_t= -1;
-static int hf_ppi_sensor_present_val_e = -1;
-static int hf_ppi_sensor_present_descstr = -1;
-static int hf_ppi_sensor_present_appspecific_num = -1;
-static int hf_ppi_sensor_present_appspecific_data = -1;
-static int hf_ppi_sensor_present_ext = -1;
+static int hf_ppi_sensor_present_sensortype;
+static int hf_ppi_sensor_present_scalefactor;
+static int hf_ppi_sensor_present_val_x;
+static int hf_ppi_sensor_present_val_y;
+static int hf_ppi_sensor_present_val_z;
+static int hf_ppi_sensor_present_val_t;
+static int hf_ppi_sensor_present_val_e;
+static int hf_ppi_sensor_present_descstr;
+static int hf_ppi_sensor_present_appspecific_num;
+static int hf_ppi_sensor_present_appspecific_data;
+static int hf_ppi_sensor_present_ext;
 
 
 /* These represent arrow-dropdownthings in the gui */
-static gint ett_ppi_sensor = -1;
-static gint ett_ppi_sensor_present = -1;
+static gint ett_ppi_sensor;
+static gint ett_ppi_sensor_present;
 
-static expert_field ei_ppi_sensor_present_bit = EI_INIT;
-static expert_field ei_ppi_sensor_version = EI_INIT;
-static expert_field ei_ppi_sensor_length = EI_INIT;
+static expert_field ei_ppi_sensor_present_bit;
+static expert_field ei_ppi_sensor_version;
+static expert_field ei_ppi_sensor_length;
 
 /* used with ScaleFactor */
 static gdouble
diff --git a/epan/dissectors/packet-ppi-vector.c b/epan/dissectors/packet-ppi-vector.c
index 28e64c681c..50a7cc5dd2 100644
--- a/epan/dissectors/packet-ppi-vector.c
+++ b/epan/dissectors/packet-ppi-vector.c
@@ -137,124 +137,124 @@ static const value_string relativeto_string[] = {
 void proto_register_ppi_vector(void);
 
 /* protocol */
-static int proto_ppi_vector = -1;
+static int proto_ppi_vector;
 
 /* "top" level fields */
-static int hf_ppi_vector_version = -1;
-static int hf_ppi_vector_pad = -1;
-static int hf_ppi_vector_length = -1;
-static int hf_ppi_vector_present = -1;
-static int hf_ppi_vector_vflags = -1;
-static int hf_ppi_vector_vchars = -1;
-static int hf_ppi_vector_rot_x = -1;
-static int hf_ppi_vector_rot_y = -1;
-static int hf_ppi_vector_rot_z = -1;
+static int hf_ppi_vector_version;
+static int hf_ppi_vector_pad;
+static int hf_ppi_vector_length;
+static int hf_ppi_vector_present;
+static int hf_ppi_vector_vflags;
+static int hf_ppi_vector_vchars;
+static int hf_ppi_vector_rot_x;
+static int hf_ppi_vector_rot_y;
+static int hf_ppi_vector_rot_z;
 
 /* V1 */
-static int hf_ppi_vector_off_r = -1;
-static int hf_ppi_vector_off_f = -1;
-static int hf_ppi_vector_off_u = -1;
-static int hf_ppi_vector_vel_r = -1;
-static int hf_ppi_vector_vel_f = -1;
-static int hf_ppi_vector_vel_u = -1;
-static int hf_ppi_vector_vel_t = -1;
-static int hf_ppi_vector_acc_r = -1;
-static int hf_ppi_vector_acc_f = -1;
-static int hf_ppi_vector_acc_u = -1;
-static int hf_ppi_vector_acc_t = -1;
+static int hf_ppi_vector_off_r;
+static int hf_ppi_vector_off_f;
+static int hf_ppi_vector_off_u;
+static int hf_ppi_vector_vel_r;
+static int hf_ppi_vector_vel_f;
+static int hf_ppi_vector_vel_u;
+static int hf_ppi_vector_vel_t;
+static int hf_ppi_vector_acc_r;
+static int hf_ppi_vector_acc_f;
+static int hf_ppi_vector_acc_u;
+static int hf_ppi_vector_acc_t;
 
 /* V2 */
-static int hf_ppi_vector_off_x = -1;
-static int hf_ppi_vector_off_y = -1;
-static int hf_ppi_vector_off_z = -1;
+static int hf_ppi_vector_off_x;
+static int hf_ppi_vector_off_y;
+static int hf_ppi_vector_off_z;
 
-static int hf_ppi_vector_err_rot= -1;
-static int hf_ppi_vector_err_off= -1;
+static int hf_ppi_vector_err_rot;
+static int hf_ppi_vector_err_off;
 
 /* V1 only */
-static int hf_ppi_vector_err_vel= -1;
-static int hf_ppi_vector_err_acc= -1;
+static int hf_ppi_vector_err_vel;
+static int hf_ppi_vector_err_acc;
 
-static int hf_ppi_vector_descstr= -1;
-static int hf_ppi_vector_appspecific_num = -1;
-static int hf_ppi_vector_appspecific_data = -1;
+static int hf_ppi_vector_descstr;
+static int hf_ppi_vector_appspecific_num;
+static int hf_ppi_vector_appspecific_data;
 
 /* "Present" flags */
-static int hf_ppi_vector_present_vflags = -1;
-static int hf_ppi_vector_present_vchars = -1;
-static int hf_ppi_vector_present_val_x = -1;
-static int hf_ppi_vector_present_val_y = -1;
-static int hf_ppi_vector_present_val_z = -1;
+static int hf_ppi_vector_present_vflags;
+static int hf_ppi_vector_present_vchars;
+static int hf_ppi_vector_present_val_x;
+static int hf_ppi_vector_present_val_y;
+static int hf_ppi_vector_present_val_z;
 
 /* V1 */
-static int hf_ppi_vector_present_off_r = -1;
-static int hf_ppi_vector_present_off_f = -1;
-static int hf_ppi_vector_present_off_u = -1;
-static int hf_ppi_vector_present_vel_r = -1;
-static int hf_ppi_vector_present_vel_f = -1;
-static int hf_ppi_vector_present_vel_u = -1;
-static int hf_ppi_vector_present_vel_t = -1;
-static int hf_ppi_vector_present_acc_r = -1;
-static int hf_ppi_vector_present_acc_f = -1;
-static int hf_ppi_vector_present_acc_u = -1;
-static int hf_ppi_vector_present_acc_t = -1;
+static int hf_ppi_vector_present_off_r;
+static int hf_ppi_vector_present_off_f;
+static int hf_ppi_vector_present_off_u;
+static int hf_ppi_vector_present_vel_r;
+static int hf_ppi_vector_present_vel_f;
+static int hf_ppi_vector_present_vel_u;
+static int hf_ppi_vector_present_vel_t;
+static int hf_ppi_vector_present_acc_r;
+static int hf_ppi_vector_present_acc_f;
+static int hf_ppi_vector_present_acc_u;
+static int hf_ppi_vector_present_acc_t;
 
 /* V2 */
-static int hf_ppi_vector_present_off_x = -1;
-static int hf_ppi_vector_present_off_y = -1;
-static int hf_ppi_vector_present_off_z = -1;
+static int hf_ppi_vector_present_off_x;
+static int hf_ppi_vector_present_off_y;
+static int hf_ppi_vector_present_off_z;
 
-static int hf_ppi_vector_present_err_rot = -1;
-static int hf_ppi_vector_present_err_off = -1;
+static int hf_ppi_vector_present_err_rot;
+static int hf_ppi_vector_present_err_off;
 
 /* V1 only */
-static int hf_ppi_vector_present_err_vel = -1;
-static int hf_ppi_vector_present_err_acc = -1;
+static int hf_ppi_vector_present_err_vel;
+static int hf_ppi_vector_present_err_acc;
 
-static int hf_ppi_vector_present_descstr= -1;
-static int hf_ppi_vector_presenappsecific_num = -1;
-static int hf_ppi_vector_present_appspecific_data = -1;
-static int hf_ppi_vector_present_ext = -1;
+static int hf_ppi_vector_present_descstr;
+static int hf_ppi_vector_presenappsecific_num;
+static int hf_ppi_vector_present_appspecific_data;
+static int hf_ppi_vector_present_ext;
 
 /* VectorFlags bits */
 /* There are currently only three bits and two fields defined in vector flags.
 *  These control the units/interpretation of a vector
 */
-static int hf_ppi_vector_vflags_defines_forward = -1; /* bit 0 */
+static int hf_ppi_vector_vflags_defines_forward; /* bit 0 */
 
 /* V1 */
-static int hf_ppi_vector_vflags_rots_absolute = -1; /* different ways to display the same bit, hi or low */
-static int hf_ppi_vector_vflags_offsets_from_gps = -1; /* these are different ways to display the same bit, hi or low */
+static int hf_ppi_vector_vflags_rots_absolute; /* different ways to display the same bit, hi or low */
+static int hf_ppi_vector_vflags_offsets_from_gps; /* these are different ways to display the same bit, hi or low */
 
 /* V2 */
-static int hf_ppi_vector_vflags_relative_to= -1; /* bits 1 and 2 */
+static int hf_ppi_vector_vflags_relative_to; /* bits 1 and 2 */
 
 /*  There are currently eight vector characteristics.
 *  These are purely descriptive (no mathematical importance)
 */
-static int hf_ppi_vector_vchars_antenna = -1;
-static int hf_ppi_vector_vchars_dir_of_travel = -1;
-static int hf_ppi_vector_vchars_front_of_veh = -1;
+static int hf_ppi_vector_vchars_antenna;
+static int hf_ppi_vector_vchars_dir_of_travel;
+static int hf_ppi_vector_vchars_front_of_veh;
 
 /* V2 only */
-static int hf_ppi_vector_vchars_angle_of_arrival= -1;
-static int hf_ppi_vector_vchars_transmitter_pos= -1;
+static int hf_ppi_vector_vchars_angle_of_arrival;
+static int hf_ppi_vector_vchars_transmitter_pos;
 
-static int hf_ppi_vector_vchars_gps_derived = -1;
-static int hf_ppi_vector_vchars_ins_derived = -1;
-static int hf_ppi_vector_vchars_compass_derived = -1;
-static int hf_ppi_vector_vchars_accelerometer_derived = -1;
-static int hf_ppi_vector_vchars_human_derived = -1;
-static int hf_ppi_vector_unknown_data = -1;
+static int hf_ppi_vector_vchars_gps_derived;
+static int hf_ppi_vector_vchars_ins_derived;
+static int hf_ppi_vector_vchars_compass_derived;
+static int hf_ppi_vector_vchars_accelerometer_derived;
+static int hf_ppi_vector_vchars_human_derived;
+static int hf_ppi_vector_unknown_data;
 
 /*These represent arrow-dropdownthings in the gui */
-static gint ett_ppi_vector = -1;
-static gint ett_ppi_vector_present = -1;
-static gint ett_ppi_vectorflags= -1;
-static gint ett_ppi_vectorchars= -1;
+static gint ett_ppi_vector;
+static gint ett_ppi_vector_present;
+static gint ett_ppi_vectorflags;
+static gint ett_ppi_vectorchars;
 
-static expert_field ei_ppi_vector_present_bit = EI_INIT;
-static expert_field ei_ppi_vector_length = EI_INIT;
+static expert_field ei_ppi_vector_present_bit;
+static expert_field ei_ppi_vector_length;
 
 
 /* We want to abbreviate this field into a single line. Does so without any string manipulation */
diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c
index 9205cbc423..958a8de1b8 100644
--- a/epan/dissectors/packet-ppi.c
+++ b/epan/dissectors/packet-ppi.c
@@ -174,147 +174,147 @@ typedef enum {
 } ppi_field_type;
 
 /* Protocol */
-static int proto_ppi = -1;
+static int proto_ppi;
 
 /* Packet header */
-static int hf_ppi_head_version = -1;
-static int hf_ppi_head_flags = -1;
-static int hf_ppi_head_flag_alignment = -1;
-static int hf_ppi_head_flag_reserved = -1;
-static int hf_ppi_head_len = -1;
-static int hf_ppi_head_dlt = -1;
+static int hf_ppi_head_version;
+static int hf_ppi_head_flags;
+static int hf_ppi_head_flag_alignment;
+static int hf_ppi_head_flag_reserved;
+static int hf_ppi_head_len;
+static int hf_ppi_head_dlt;
 
 /* Field header */
-static int hf_ppi_field_type = -1;
-static int hf_ppi_field_len = -1;
+static int hf_ppi_field_type;
+static int hf_ppi_field_len;
 
 /* 802.11 Common */
-static int hf_80211_common_tsft = -1;
-static int hf_80211_common_flags = -1;
-static int hf_80211_common_flags_fcs = -1;
-static int hf_80211_common_flags_tsft = -1;
-static int hf_80211_common_flags_fcs_valid = -1;
-static int hf_80211_common_flags_phy_err = -1;
-static int hf_80211_common_rate = -1;
-static int hf_80211_common_chan_freq = -1;
-static int hf_80211_common_chan_flags = -1;
-
-static int hf_80211_common_chan_flags_turbo = -1;
-static int hf_80211_common_chan_flags_cck = -1;
-static int hf_80211_common_chan_flags_ofdm = -1;
-static int hf_80211_common_chan_flags_2ghz = -1;
-static int hf_80211_common_chan_flags_5ghz = -1;
-static int hf_80211_common_chan_flags_passive = -1;
-static int hf_80211_common_chan_flags_dynamic = -1;
-static int hf_80211_common_chan_flags_gfsk = -1;
-
-static int hf_80211_common_fhss_hopset = -1;
-static int hf_80211_common_fhss_pattern = -1;
-static int hf_80211_common_dbm_antsignal = -1;
-static int hf_80211_common_dbm_antnoise = -1;
+static int hf_80211_common_tsft;
+static int hf_80211_common_flags;
+static int hf_80211_common_flags_fcs;
+static int hf_80211_common_flags_tsft;
+static int hf_80211_common_flags_fcs_valid;
+static int hf_80211_common_flags_phy_err;
+static int hf_80211_common_rate;
+static int hf_80211_common_chan_freq;
+static int hf_80211_common_chan_flags;
+
+static int hf_80211_common_chan_flags_turbo;
+static int hf_80211_common_chan_flags_cck;
+static int hf_80211_common_chan_flags_ofdm;
+static int hf_80211_common_chan_flags_2ghz;
+static int hf_80211_common_chan_flags_5ghz;
+static int hf_80211_common_chan_flags_passive;
+static int hf_80211_common_chan_flags_dynamic;
+static int hf_80211_common_chan_flags_gfsk;
+
+static int hf_80211_common_fhss_hopset;
+static int hf_80211_common_fhss_pattern;
+static int hf_80211_common_dbm_antsignal;
+static int hf_80211_common_dbm_antnoise;
 
 /* 802.11n MAC */
-static int hf_80211n_mac_flags = -1;
-static int hf_80211n_mac_flags_greenfield = -1;
-static int hf_80211n_mac_flags_ht20_40 = -1;
-static int hf_80211n_mac_flags_rx_guard_interval = -1;
-static int hf_80211n_mac_flags_duplicate_rx = -1;
-static int hf_80211n_mac_flags_more_aggregates = -1;
-static int hf_80211n_mac_flags_aggregate = -1;
-static int hf_80211n_mac_flags_delimiter_crc_after = -1;
-static int hf_80211n_mac_ampdu_id = -1;
-static int hf_80211n_mac_num_delimiters = -1;
-static int hf_80211n_mac_reserved = -1;
+static int hf_80211n_mac_flags;
+static int hf_80211n_mac_flags_greenfield;
+static int hf_80211n_mac_flags_ht20_40;
+static int hf_80211n_mac_flags_rx_guard_interval;
+static int hf_80211n_mac_flags_duplicate_rx;
+static int hf_80211n_mac_flags_more_aggregates;
+static int hf_80211n_mac_flags_aggregate;
+static int hf_80211n_mac_flags_delimiter_crc_after;
+static int hf_80211n_mac_ampdu_id;
+static int hf_80211n_mac_num_delimiters;
+static int hf_80211n_mac_reserved;
 
 /* 802.11n MAC+PHY */
-static int hf_80211n_mac_phy_mcs = -1;
-static int hf_80211n_mac_phy_num_streams = -1;
-static int hf_80211n_mac_phy_rssi_combined = -1;
-static int hf_80211n_mac_phy_rssi_ant0_ctl = -1;
-static int hf_80211n_mac_phy_rssi_ant1_ctl = -1;
-static int hf_80211n_mac_phy_rssi_ant2_ctl = -1;
-static int hf_80211n_mac_phy_rssi_ant3_ctl = -1;
-static int hf_80211n_mac_phy_rssi_ant0_ext = -1;
-static int hf_80211n_mac_phy_rssi_ant1_ext = -1;
-static int hf_80211n_mac_phy_rssi_ant2_ext = -1;
-static int hf_80211n_mac_phy_rssi_ant3_ext = -1;
-static int hf_80211n_mac_phy_ext_chan_freq = -1;
-static int hf_80211n_mac_phy_ext_chan_flags = -1;
-static int hf_80211n_mac_phy_ext_chan_flags_turbo = -1;
-static int hf_80211n_mac_phy_ext_chan_flags_cck = -1;
-static int hf_80211n_mac_phy_ext_chan_flags_ofdm = -1;
-static int hf_80211n_mac_phy_ext_chan_flags_2ghz = -1;
-static int hf_80211n_mac_phy_ext_chan_flags_5ghz = -1;
-static int hf_80211n_mac_phy_ext_chan_flags_passive = -1;
-static int hf_80211n_mac_phy_ext_chan_flags_dynamic = -1;
-static int hf_80211n_mac_phy_ext_chan_flags_gfsk = -1;
-static int hf_80211n_mac_phy_dbm_ant0signal = -1;
-static int hf_80211n_mac_phy_dbm_ant0noise = -1;
-static int hf_80211n_mac_phy_dbm_ant1signal = -1;
-static int hf_80211n_mac_phy_dbm_ant1noise = -1;
-static int hf_80211n_mac_phy_dbm_ant2signal = -1;
-static int hf_80211n_mac_phy_dbm_ant2noise = -1;
-static int hf_80211n_mac_phy_dbm_ant3signal = -1;
-static int hf_80211n_mac_phy_dbm_ant3noise = -1;
-static int hf_80211n_mac_phy_evm0 = -1;
-static int hf_80211n_mac_phy_evm1 = -1;
-static int hf_80211n_mac_phy_evm2 = -1;
-static int hf_80211n_mac_phy_evm3 = -1;
+static int hf_80211n_mac_phy_mcs;
+static int hf_80211n_mac_phy_num_streams;
+static int hf_80211n_mac_phy_rssi_combined;
+static int hf_80211n_mac_phy_rssi_ant0_ctl;
+static int hf_80211n_mac_phy_rssi_ant1_ctl;
+static int hf_80211n_mac_phy_rssi_ant2_ctl;
+static int hf_80211n_mac_phy_rssi_ant3_ctl;
+static int hf_80211n_mac_phy_rssi_ant0_ext;
+static int hf_80211n_mac_phy_rssi_ant1_ext;
+static int hf_80211n_mac_phy_rssi_ant2_ext;
+static int hf_80211n_mac_phy_rssi_ant3_ext;
+static int hf_80211n_mac_phy_ext_chan_freq;
+static int hf_80211n_mac_phy_ext_chan_flags;
+static int hf_80211n_mac_phy_ext_chan_flags_turbo;
+static int hf_80211n_mac_phy_ext_chan_flags_cck;
+static int hf_80211n_mac_phy_ext_chan_flags_ofdm;
+static int hf_80211n_mac_phy_ext_chan_flags_2ghz;
+static int hf_80211n_mac_phy_ext_chan_flags_5ghz;
+static int hf_80211n_mac_phy_ext_chan_flags_passive;
+static int hf_80211n_mac_phy_ext_chan_flags_dynamic;
+static int hf_80211n_mac_phy_ext_chan_flags_gfsk;
+static int hf_80211n_mac_phy_dbm_ant0signal;
+static int hf_80211n_mac_phy_dbm_ant0noise;
+static int hf_80211n_mac_phy_dbm_ant1signal;
+static int hf_80211n_mac_phy_dbm_ant1noise;
+static int hf_80211n_mac_phy_dbm_ant2signal;
+static int hf_80211n_mac_phy_dbm_ant2noise;
+static int hf_80211n_mac_phy_dbm_ant3signal;
+static int hf_80211n_mac_phy_dbm_ant3noise;
+static int hf_80211n_mac_phy_evm0;
+static int hf_80211n_mac_phy_evm1;
+static int hf_80211n_mac_phy_evm2;
+static int hf_80211n_mac_phy_evm3;
 
 /* 802.11n-Extensions A-MPDU fragments */
-static int hf_ampdu_reassembled_in = -1;
-/* static int hf_ampdu_segments = -1; */
-static int hf_ampdu_segment = -1;
-static int hf_ampdu_count  = -1;
+static int hf_ampdu_reassembled_in;
+/* static int hf_ampdu_segments; */
+static int hf_ampdu_segment;
+static int hf_ampdu_count;
 
 /* Spectrum-Map */
-static int hf_spectrum_map = -1;
+static int hf_spectrum_map;
 
 /* Process-Info */
-static int hf_process_info = -1;
+static int hf_process_info;
 
 /* Capture-Info */
-static int hf_capture_info = -1;
+static int hf_capture_info;
 
 /* Aggregation Extension */
-static int hf_aggregation_extension_interface_id = -1;
+static int hf_aggregation_extension_interface_id;
 
 /* 802.3 Extension */
-static int hf_8023_extension_flags = -1;
-static int hf_8023_extension_flags_fcs_present = -1;
-static int hf_8023_extension_errors = -1;
-static int hf_8023_extension_errors_fcs = -1;
-static int hf_8023_extension_errors_sequence = -1;
-static int hf_8023_extension_errors_symbol = -1;
-static int hf_8023_extension_errors_data = -1;
+static int hf_8023_extension_flags;
+static int hf_8023_extension_flags_fcs_present;
+static int hf_8023_extension_errors;
+static int hf_8023_extension_errors_fcs;
+static int hf_8023_extension_errors_sequence;
+static int hf_8023_extension_errors_symbol;
+static int hf_8023_extension_errors_data;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_ppi_antenna = -1;
-static int hf_ppi_harris = -1;
-static int hf_ppi_reserved = -1;
-static int hf_ppi_vector = -1;
-static int hf_ppi_fnet = -1;
-static int hf_ppi_gps = -1;
-
-static gint ett_ppi_pph = -1;
-static gint ett_ppi_flags = -1;
-static gint ett_dot11_common = -1;
-static gint ett_dot11_common_flags = -1;
-static gint ett_dot11_common_channel_flags = -1;
-static gint ett_dot11n_mac = -1;
-static gint ett_dot11n_mac_flags = -1;
-static gint ett_dot11n_mac_phy = -1;
-static gint ett_dot11n_mac_phy_ext_channel_flags = -1;
-static gint ett_ampdu_segments = -1;
-static gint ett_ampdu = -1;
-static gint ett_ampdu_segment  = -1;
-static gint ett_aggregation_extension = -1;
-static gint ett_8023_extension = -1;
-static gint ett_8023_extension_flags = -1;
-static gint ett_8023_extension_errors = -1;
+static int hf_ppi_antenna;
+static int hf_ppi_harris;
+static int hf_ppi_reserved;
+static int hf_ppi_vector;
+static int hf_ppi_fnet;
+static int hf_ppi_gps;
+
+static gint ett_ppi_pph;
+static gint ett_ppi_flags;
+static gint ett_dot11_common;
+static gint ett_dot11_common_flags;
+static gint ett_dot11_common_channel_flags;
+static gint ett_dot11n_mac;
+static gint ett_dot11n_mac_flags;
+static gint ett_dot11n_mac_phy;
+static gint ett_dot11n_mac_phy_ext_channel_flags;
+static gint ett_ampdu_segments;
+static gint ett_ampdu;
+static gint ett_ampdu_segment;
+static gint ett_aggregation_extension;
+static gint ett_8023_extension;
+static gint ett_8023_extension_flags;
+static gint ett_8023_extension_errors;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_ppi_invalid_length = EI_INIT;
+static expert_field ei_ppi_invalid_length;
 
 static dissector_handle_t ppi_handle;
 
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index ac104d26f7..8efd36f249 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -85,180 +85,180 @@ void proto_reg_handoff_ipv6cp(void);
 void proto_register_iphc_crtp(void);
 void proto_reg_handoff_iphc_crtp(void);
 
-static int proto_ppp = -1;
-static int hf_ppp_direction = -1;
-static int hf_ppp_address = -1;
-static int hf_ppp_control = -1;
-static int hf_ppp_protocol = -1;
-static int hf_ppp_code = -1;
-static int hf_ppp_identifier = -1;
-static int hf_ppp_length = -1;
-static int hf_ppp_magic_number = -1;
-static int hf_ppp_oui = -1;
-static int hf_ppp_kind = -1;
-static int hf_ppp_data = -1;
-static int hf_ppp_fcs_16 = -1;
-static int hf_ppp_fcs_32 = -1;
-static int hf_ppp_fcs_status = -1;
-
-static gint ett_ppp = -1;
-static gint ett_ppp_opt_type = -1;
-static gint ett_ppp_unknown_opt = -1;
-
-static expert_field ei_ppp_opt_len_invalid = EI_INIT;
-static expert_field ei_ppp_fcs = EI_INIT;
-
-static int proto_ppp_hdlc = -1;
+static int proto_ppp;
+static int hf_ppp_direction;
+static int hf_ppp_address;
+static int hf_ppp_control;
+static int hf_ppp_protocol;
+static int hf_ppp_code;
+static int hf_ppp_identifier;
+static int hf_ppp_length;
+static int hf_ppp_magic_number;
+static int hf_ppp_oui;
+static int hf_ppp_kind;
+static int hf_ppp_data;
+static int hf_ppp_fcs_16;
+static int hf_ppp_fcs_32;
+static int hf_ppp_fcs_status;
+
+static gint ett_ppp;
+static gint ett_ppp_opt_type;
+static gint ett_ppp_unknown_opt;
+
+static expert_field ei_ppp_opt_len_invalid;
+static expert_field ei_ppp_fcs;
+
+static int proto_ppp_hdlc;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_ppp_hdlc_data = -1;
-static int hf_ppp_hdlc_fragment = -1;
-
-static gint ett_ppp_hdlc_data = -1;
-
-static int proto_lcp = -1;
-static int proto_lcp_option_vendor = -1;
-static int proto_lcp_option_mru = -1;
-static int proto_lcp_option_async_map = -1;
-static int proto_lcp_option_authprot = -1;
-static int proto_lcp_option_qualprot = -1;
-static int proto_lcp_option_magicnumber = -1;
-static int proto_lcp_option_linkqualmon = -1;
-static int proto_lcp_option_field_compress = -1;
-static int proto_lcp_option_addr_field_compress = -1;
-static int proto_lcp_option_fcs_alternatives = -1;
-static int proto_lcp_option_self_desc_pad = -1;
-static int proto_lcp_option_numbered_mode = -1;
-static int proto_lcp_option_callback = -1;
-static int proto_lcp_option_compound_frames = -1;
-static int proto_lcp_option_nomdataencap = -1;
-static int proto_lcp_option_multilink_mrru = -1;
-static int proto_lcp_option_multilink_ssnh = -1;
-static int proto_lcp_option_multilink_ep_disc = -1;
-static int proto_lcp_option_dce_identifier = -1;
-static int proto_lcp_option_multilink_pp = -1;
-static int proto_lcp_option_link_discrim = -1;
-static int proto_lcp_option_auth = -1;
-static int proto_lcp_option_cobs = -1;
-static int proto_lcp_option_prefix_elision = -1;
-static int proto_lcp_option_multilink_hdr_fmt = -1;
-static int proto_lcp_option_internationalization = -1;
-static int proto_lcp_option_sonet_sdh = -1;
-
-static gint ett_lcp = -1;
-static gint ett_lcp_options = -1;
-static gint ett_lcp_vendor_opt = -1;
-static gint ett_lcp_mru_opt = -1;
-static gint ett_lcp_asyncmap_opt = -1;
-static gint ett_lcp_authprot_opt = -1;
-static gint ett_lcp_qualprot_opt = -1;
-static gint ett_lcp_magicnumber_opt = -1;
-static gint ett_lcp_linkqualmon_opt = -1;
-static gint ett_lcp_pcomp_opt = -1;
-static gint ett_lcp_acccomp_opt = -1;
-static gint ett_lcp_fcs_alternatives_opt = -1;
-static gint ett_lcp_self_desc_pad_opt = -1;
-static gint ett_lcp_numbered_mode_opt = -1;
-static gint ett_lcp_callback_opt = -1;
-static gint ett_lcp_compound_frames_opt = -1;
-static gint ett_lcp_nomdataencap_opt = -1;
-static gint ett_lcp_multilink_mrru_opt = -1;
-static gint ett_lcp_multilink_ssnh_opt = -1;
-static gint ett_lcp_multilink_ep_disc_opt = -1;
-static gint ett_lcp_magic_block = -1;
-static gint ett_lcp_dce_identifier_opt = -1;
-static gint ett_lcp_multilink_pp_opt = -1;
-static gint ett_lcp_bacp_link_discrim_opt = -1;
-static gint ett_lcp_auth_opt = -1;
-static gint ett_lcp_cobs_opt = -1;
-static gint ett_lcp_prefix_elision_opt = -1;
-static gint ett_multilink_hdr_fmt_opt = -1;
-static gint ett_lcp_internationalization_opt = -1;
-static gint ett_lcp_sonet_sdh_opt = -1;
+static int hf_ppp_hdlc_data;
+static int hf_ppp_hdlc_fragment;
+
+static gint ett_ppp_hdlc_data;
+
+static int proto_lcp;
+static int proto_lcp_option_vendor;
+static int proto_lcp_option_mru;
+static int proto_lcp_option_async_map;
+static int proto_lcp_option_authprot;
+static int proto_lcp_option_qualprot;
+static int proto_lcp_option_magicnumber;
+static int proto_lcp_option_linkqualmon;
+static int proto_lcp_option_field_compress;
+static int proto_lcp_option_addr_field_compress;
+static int proto_lcp_option_fcs_alternatives;
+static int proto_lcp_option_self_desc_pad;
+static int proto_lcp_option_numbered_mode;
+static int proto_lcp_option_callback;
+static int proto_lcp_option_compound_frames;
+static int proto_lcp_option_nomdataencap;
+static int proto_lcp_option_multilink_mrru;
+static int proto_lcp_option_multilink_ssnh;
+static int proto_lcp_option_multilink_ep_disc;
+static int proto_lcp_option_dce_identifier;
+static int proto_lcp_option_multilink_pp;
+static int proto_lcp_option_link_discrim;
+static int proto_lcp_option_auth;
+static int proto_lcp_option_cobs;
+static int proto_lcp_option_prefix_elision;
+static int proto_lcp_option_multilink_hdr_fmt;
+static int proto_lcp_option_internationalization;
+static int proto_lcp_option_sonet_sdh;
+
+static gint ett_lcp;
+static gint ett_lcp_options;
+static gint ett_lcp_vendor_opt;
+static gint ett_lcp_mru_opt;
+static gint ett_lcp_asyncmap_opt;
+static gint ett_lcp_authprot_opt;
+static gint ett_lcp_qualprot_opt;
+static gint ett_lcp_magicnumber_opt;
+static gint ett_lcp_linkqualmon_opt;
+static gint ett_lcp_pcomp_opt;
+static gint ett_lcp_acccomp_opt;
+static gint ett_lcp_fcs_alternatives_opt;
+static gint ett_lcp_self_desc_pad_opt;
+static gint ett_lcp_numbered_mode_opt;
+static gint ett_lcp_callback_opt;
+static gint ett_lcp_compound_frames_opt;
+static gint ett_lcp_nomdataencap_opt;
+static gint ett_lcp_multilink_mrru_opt;
+static gint ett_lcp_multilink_ssnh_opt;
+static gint ett_lcp_multilink_ep_disc_opt;
+static gint ett_lcp_magic_block;
+static gint ett_lcp_dce_identifier_opt;
+static gint ett_lcp_multilink_pp_opt;
+static gint ett_lcp_bacp_link_discrim_opt;
+static gint ett_lcp_auth_opt;
+static gint ett_lcp_cobs_opt;
+static gint ett_lcp_prefix_elision_opt;
+static gint ett_multilink_hdr_fmt_opt;
+static gint ett_lcp_internationalization_opt;
+static gint ett_lcp_sonet_sdh_opt;
 
 static dissector_table_t lcp_option_table;
 
-static int proto_ipcp = -1;
-static int proto_ipcp_option_addrs = -1;
-static int proto_ipcp_option_compress = -1;
-static int proto_ipcp_option_addr = -1;
-static int proto_ipcp_option_mobileipv4 = -1;
-static int proto_ipcp_option_pri_dns = -1;
-static int proto_ipcp_option_pri_nbns = -1;
-static int proto_ipcp_option_sec_dns = -1;
-static int proto_ipcp_option_sec_nbns = -1;
-static int proto_ipcp_rohc_option_profiles = -1;
-static int proto_ipcp_iphc_option_rtp_compress = -1;
-static int proto_ipcp_iphc_option_enhanced_rtp_compress = -1;
-static int proto_ipcp_iphc_option_neghdrcomp = -1;
-
-static gint ett_ipcp = -1;
-static gint ett_ipcp_options = -1;
-static gint ett_ipcp_ipaddrs_opt = -1;
-static gint ett_ipcp_compress_opt = -1;
-static gint ett_ipcp_ipaddr_opt = -1;
-static gint ett_ipcp_mobileipv4_opt = -1;
-static gint ett_ipcp_pridns_opt = -1;
-static gint ett_ipcp_secdns_opt = -1;
-static gint ett_ipcp_prinbns_opt = -1;
-static gint ett_ipcp_secnbns_opt = -1;
-
-static gint ett_ipcp_iphc_rtp_compress_opt = -1;
-static gint ett_ipcp_iphc_enhanced_rtp_compress_opt = -1;
-static gint ett_ipcp_iphc_neghdrcomp_opt = -1;
-static gint ett_ipcp_rohc_profiles_opt = -1;
+static int proto_ipcp;
+static int proto_ipcp_option_addrs;
+static int proto_ipcp_option_compress;
+static int proto_ipcp_option_addr;
+static int proto_ipcp_option_mobileipv4;
+static int proto_ipcp_option_pri_dns;
+static int proto_ipcp_option_pri_nbns;
+static int proto_ipcp_option_sec_dns;
+static int proto_ipcp_option_sec_nbns;
+static int proto_ipcp_rohc_option_profiles;
+static int proto_ipcp_iphc_option_rtp_compress;
+static int proto_ipcp_iphc_option_enhanced_rtp_compress;
+static int proto_ipcp_iphc_option_neghdrcomp;
+
+static gint ett_ipcp;
+static gint ett_ipcp_options;
+static gint ett_ipcp_ipaddrs_opt;
+static gint ett_ipcp_compress_opt;
+static gint ett_ipcp_ipaddr_opt;
+static gint ett_ipcp_mobileipv4_opt;
+static gint ett_ipcp_pridns_opt;
+static gint ett_ipcp_secdns_opt;
+static gint ett_ipcp_prinbns_opt;
+static gint ett_ipcp_secnbns_opt;
+
+static gint ett_ipcp_iphc_rtp_compress_opt;
+static gint ett_ipcp_iphc_enhanced_rtp_compress_opt;
+static gint ett_ipcp_iphc_neghdrcomp_opt;
+static gint ett_ipcp_rohc_profiles_opt;
 
 static dissector_table_t ipcp_option_table;
 static dissector_table_t ipcp_rohc_suboption_table;
 static dissector_table_t ipcp_iphc_suboption_table;
 
-static int proto_vsncp = -1;
-static int proto_vsncp_option_pdnid = -1;
-static int proto_vsncp_option_apname = -1;
-static int proto_vsncp_option_pdntype = -1;
-static int proto_vsncp_option_pdnaddress = -1;
-static int proto_vsncp_option_pco = -1;
-static int proto_vsncp_option_errorcode = -1;
-static int proto_vsncp_option_attachtype = -1;
-static int proto_vsncp_option_ipv4address = -1;
-static int proto_vsncp_option_addressalloc = -1;
-static int proto_vsncp_option_apn_ambr = -1;
-static int proto_vsncp_option_ipv6_hsgw_lla_iid = -1;
-
-static int hf_vsncp_opt_type = -1;
-static int hf_vsncp_opt_length = -1;
+static int proto_vsncp;
+static int proto_vsncp_option_pdnid;
+static int proto_vsncp_option_apname;
+static int proto_vsncp_option_pdntype;
+static int proto_vsncp_option_pdnaddress;
+static int proto_vsncp_option_pco;
+static int proto_vsncp_option_errorcode;
+static int proto_vsncp_option_attachtype;
+static int proto_vsncp_option_ipv4address;
+static int proto_vsncp_option_addressalloc;
+static int proto_vsncp_option_apn_ambr;
+static int proto_vsncp_option_ipv6_hsgw_lla_iid;
+
+static int hf_vsncp_opt_type;
+static int hf_vsncp_opt_length;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_vsncp_protocol_configuration_length = -1;
-static int hf_vsncp_error_code = -1;
-static int hf_vsncp_identifier = -1;
-static int hf_vsncp_attach_type = -1;
-static int hf_vsncp_protocol_configuration_data = -1;
-static int hf_vsncp_default_router_address = -1;
-static int hf_vsncp_pdn_identifier = -1;
-static int hf_vsncp_address_allocation_cause = -1;
-static int hf_vsncp_length = -1;
-static int hf_vsncp_code = -1;
-static int hf_vsncp_protocol = -1;
-static int hf_vsncp_pdn_type = -1;
-static int hf_vsncp_ipv6_interface_identifier = -1;
-static int hf_vsncp_pdn_ipv4 = -1;
-static int hf_vsncp_access_point_name = -1;
-static int hf_vsncp_ambr_data = -1;
-static int hf_vsncp_pdn_ipv6 = -1;
-
-static gint ett_vsncp = -1;
-static gint ett_vsncp_options = -1;
-static gint ett_vsncp_pdnid_opt = -1;
-static gint ett_vsncp_apname_opt = -1;
-static gint ett_vsncp_pdntype_opt = -1;
-static gint ett_vsncp_pdnaddress_opt = -1;
-static gint ett_vsncp_pco_opt = -1;
-static gint ett_vsncp_errorcode_opt = -1;
-static gint ett_vsncp_attachtype_opt = -1;
-static gint ett_vsncp_ipv4address_opt = -1;
-static gint ett_vsncp_addressalloc_opt = -1;
-static gint ett_vsncp_apn_ambr_opt = -1;
-static gint ett_vsncp_ipv6_hsgw_lla_iid_opt = -1;
+static int hf_vsncp_protocol_configuration_length;
+static int hf_vsncp_error_code;
+static int hf_vsncp_identifier;
+static int hf_vsncp_attach_type;
+static int hf_vsncp_protocol_configuration_data;
+static int hf_vsncp_default_router_address;
+static int hf_vsncp_pdn_identifier;
+static int hf_vsncp_address_allocation_cause;
+static int hf_vsncp_length;
+static int hf_vsncp_code;
+static int hf_vsncp_protocol;
+static int hf_vsncp_pdn_type;
+static int hf_vsncp_ipv6_interface_identifier;
+static int hf_vsncp_pdn_ipv4;
+static int hf_vsncp_access_point_name;
+static int hf_vsncp_ambr_data;
+static int hf_vsncp_pdn_ipv6;
+
+static gint ett_vsncp;
+static gint ett_vsncp_options;
+static gint ett_vsncp_pdnid_opt;
+static gint ett_vsncp_apname_opt;
+static gint ett_vsncp_pdntype_opt;
+static gint ett_vsncp_pdnaddress_opt;
+static gint ett_vsncp_pco_opt;
+static gint ett_vsncp_errorcode_opt;
+static gint ett_vsncp_attachtype_opt;
+static gint ett_vsncp_ipv4address_opt;
+static gint ett_vsncp_addressalloc_opt;
+static gint ett_vsncp_apn_ambr_opt;
+static gint ett_vsncp_ipv6_hsgw_lla_iid_opt;
 
 static dissector_table_t vsncp_option_table;
 
@@ -271,195 +271,195 @@ static dissector_table_t vsncp_option_table;
 #define OUI_3GPP 0xCF0002   /* 3GPP X.S0057-0 */
 
 static guint32 vsnp_oui = -1;
-static int proto_vsnp = -1;
+static int proto_vsnp;
 
 /* 3GPP Variables */
-static gint hf_vsnp_3gpp_pdnid = -1;
+static gint hf_vsnp_3gpp_pdnid;
 
 /* BBF Variables */
 /* TO DO */
 
-static gint ett_vsnp =-1;
+static gint ett_vsnp;
 
-static int proto_osinlcp = -1;
-static int proto_osinlcp_option_align_npdu = -1;
+static int proto_osinlcp;
+static int proto_osinlcp_option_align_npdu;
 
-static gint ett_osinlcp = -1;
-static gint ett_osinlcp_options = -1;
-static gint ett_osinlcp_align_npdu_opt = -1;
+static gint ett_osinlcp;
+static gint ett_osinlcp_options;
+static gint ett_osinlcp_align_npdu_opt;
 
 static dissector_table_t osinlcp_option_table;
 
-static int proto_bcp_bpdu = -1;
-static int hf_bcp_bpdu_flags = -1;
-static int hf_bcp_bpdu_fcs_present = -1;
-static int hf_bcp_bpdu_zeropad = -1;
-static int hf_bcp_bpdu_bcontrol = -1;
-static int hf_bcp_bpdu_pads = -1;
-static int hf_bcp_bpdu_mac_type = -1;
-static int hf_bcp_bpdu_pad = -1;
-
-static gint ett_bcp_bpdu = -1;
-static gint ett_bcp_bpdu_flags = -1;
-
-static int proto_bcp_ncp = -1;
-static int proto_bcp_ncp_option_bridge_id = -1;
-static int proto_bcp_ncp_option_line_id = -1;
-static int proto_bcp_ncp_option_mac_sup = -1;
-static int proto_bcp_ncp_option_tinygram_comp = -1;
-static int proto_bcp_ncp_option_lan_id = -1;
-static int proto_bcp_ncp_option_mac_addr = -1;
-static int proto_bcp_ncp_option_stp = -1;
-static int proto_bcp_ncp_option_ieee_802_tagged_frame = -1;
-static int proto_bcp_ncp_option_management_inline = -1;
-static int proto_bcp_ncp_option_bcp_ind = -1;
-
-static int hf_bcp_ncp_opt_type = -1;
-static int hf_bcp_ncp_opt_length = -1;
-static int hf_bcp_ncp_lan_seg_no = -1;
-static int hf_bcp_ncp_bridge_no = -1;
-static int hf_bcp_ncp_tinygram_comp = -1;
-static int hf_bcp_ncp_mac = -1;
-static int hf_bcp_ncp_mac_l = -1;
-static int hf_bcp_ncp_mac_m = -1;
-static int hf_bcp_ncp_stp_prot = -1;
-static int hf_bcp_ncp_ieee_802_tagged_frame = -1;
-
-static gint ett_bcp_ncp = -1;
-static gint ett_bcp_ncp_options = -1;
-static gint ett_bcp_ncp_ieee_802_tagged_frame_opt = -1;
-static gint ett_bcp_ncp_management_inline_opt = -1;
-static gint ett_bcp_ncp_bcp_ind_opt = -1;
-static gint ett_bcp_ncp_bridge_id_opt = -1;
-static gint ett_bcp_ncp_line_id_opt = -1;
-static gint ett_bcp_ncp_mac_sup_opt = -1;
-static gint ett_bcp_ncp_tinygram_comp_opt = -1;
-static gint ett_bcp_ncp_lan_id_opt = -1;
-static gint ett_bcp_ncp_mac_addr_opt = -1;
-static gint ett_bcp_ncp_stp_opt = -1;
+static int proto_bcp_bpdu;
+static int hf_bcp_bpdu_flags;
+static int hf_bcp_bpdu_fcs_present;
+static int hf_bcp_bpdu_zeropad;
+static int hf_bcp_bpdu_bcontrol;
+static int hf_bcp_bpdu_pads;
+static int hf_bcp_bpdu_mac_type;
+static int hf_bcp_bpdu_pad;
+
+static gint ett_bcp_bpdu;
+static gint ett_bcp_bpdu_flags;
+
+static int proto_bcp_ncp;
+static int proto_bcp_ncp_option_bridge_id;
+static int proto_bcp_ncp_option_line_id;
+static int proto_bcp_ncp_option_mac_sup;
+static int proto_bcp_ncp_option_tinygram_comp;
+static int proto_bcp_ncp_option_lan_id;
+static int proto_bcp_ncp_option_mac_addr;
+static int proto_bcp_ncp_option_stp;
+static int proto_bcp_ncp_option_ieee_802_tagged_frame;
+static int proto_bcp_ncp_option_management_inline;
+static int proto_bcp_ncp_option_bcp_ind;
+
+static int hf_bcp_ncp_opt_type;
+static int hf_bcp_ncp_opt_length;
+static int hf_bcp_ncp_lan_seg_no;
+static int hf_bcp_ncp_bridge_no;
+static int hf_bcp_ncp_tinygram_comp;
+static int hf_bcp_ncp_mac;
+static int hf_bcp_ncp_mac_l;
+static int hf_bcp_ncp_mac_m;
+static int hf_bcp_ncp_stp_prot;
+static int hf_bcp_ncp_ieee_802_tagged_frame;
+
+static gint ett_bcp_ncp;
+static gint ett_bcp_ncp_options;
+static gint ett_bcp_ncp_ieee_802_tagged_frame_opt;
+static gint ett_bcp_ncp_management_inline_opt;
+static gint ett_bcp_ncp_bcp_ind_opt;
+static gint ett_bcp_ncp_bridge_id_opt;
+static gint ett_bcp_ncp_line_id_opt;
+static gint ett_bcp_ncp_mac_sup_opt;
+static gint ett_bcp_ncp_tinygram_comp_opt;
+static gint ett_bcp_ncp_lan_id_opt;
+static gint ett_bcp_ncp_mac_addr_opt;
+static gint ett_bcp_ncp_stp_opt;
 
 static dissector_table_t bcp_ncp_option_table;
 
-static int proto_ccp = -1;
-static int proto_ccp_option_oui = -1;
-static int proto_ccp_option_predict1 = -1;
-static int proto_ccp_option_predict2 = -1;
-static int proto_ccp_option_puddle = -1;
-static int proto_ccp_option_hpppc = -1;
-static int proto_ccp_option_stac = -1;
-static int proto_ccp_option_stac_ascend = -1;
-static int proto_ccp_option_mppe = -1;
-static int proto_ccp_option_gfza = -1;
-static int proto_ccp_option_v42bis = -1;
-static int proto_ccp_option_bsdcomp = -1;
-static int proto_ccp_option_lzsdcp = -1;
-static int proto_ccp_option_mvrca = -1;
-static int proto_ccp_option_dce = -1;
-static int proto_ccp_option_deflate = -1;
-static int proto_ccp_option_v44lzjh = -1;
-
-static gint ett_ccp = -1;
-static gint ett_ccp_options = -1;
-static gint ett_ccp_oui_opt = -1;
-static gint ett_ccp_predict1_opt = -1;
-static gint ett_ccp_predict2_opt = -1;
-static gint ett_ccp_puddle_opt = -1;
-static gint ett_ccp_hpppc_opt = -1;
-static gint ett_ccp_stac_opt = -1;
-static gint ett_ccp_stac_opt_check_mode = -1;
-static gint ett_ccp_mppe_opt = -1;
-static gint ett_ccp_mppe_opt_supp_bits = -1;
-static gint ett_ccp_gfza_opt = -1;
-static gint ett_ccp_v42bis_opt = -1;
-static gint ett_ccp_bsdcomp_opt = -1;
-static gint ett_ccp_lzsdcp_opt = -1;
-static gint ett_ccp_mvrca_opt = -1;
-static gint ett_ccp_dce_opt = -1;
-static gint ett_ccp_deflate_opt = -1;
-static gint ett_ccp_v44lzjh_opt = -1;
+static int proto_ccp;
+static int proto_ccp_option_oui;
+static int proto_ccp_option_predict1;
+static int proto_ccp_option_predict2;
+static int proto_ccp_option_puddle;
+static int proto_ccp_option_hpppc;
+static int proto_ccp_option_stac;
+static int proto_ccp_option_stac_ascend;
+static int proto_ccp_option_mppe;
+static int proto_ccp_option_gfza;
+static int proto_ccp_option_v42bis;
+static int proto_ccp_option_bsdcomp;
+static int proto_ccp_option_lzsdcp;
+static int proto_ccp_option_mvrca;
+static int proto_ccp_option_dce;
+static int proto_ccp_option_deflate;
+static int proto_ccp_option_v44lzjh;
+
+static gint ett_ccp;
+static gint ett_ccp_options;
+static gint ett_ccp_oui_opt;
+static gint ett_ccp_predict1_opt;
+static gint ett_ccp_predict2_opt;
+static gint ett_ccp_puddle_opt;
+static gint ett_ccp_hpppc_opt;
+static gint ett_ccp_stac_opt;
+static gint ett_ccp_stac_opt_check_mode;
+static gint ett_ccp_mppe_opt;
+static gint ett_ccp_mppe_opt_supp_bits;
+static gint ett_ccp_gfza_opt;
+static gint ett_ccp_v42bis_opt;
+static gint ett_ccp_bsdcomp_opt;
+static gint ett_ccp_lzsdcp_opt;
+static gint ett_ccp_mvrca_opt;
+static gint ett_ccp_dce_opt;
+static gint ett_ccp_deflate_opt;
+static gint ett_ccp_v44lzjh_opt;
 
 static dissector_table_t ccp_option_table;
 
-static int proto_cbcp = -1;
-static int proto_cbcp_option_no_callback = -1;
-static int proto_cbcp_option_callback_user = -1;
-static int proto_cbcp_option_callback_admin = -1;
-static int proto_cbcp_option_callback_list = -1;
+static int proto_cbcp;
+static int proto_cbcp_option_no_callback;
+static int proto_cbcp_option_callback_user;
+static int proto_cbcp_option_callback_admin;
+static int proto_cbcp_option_callback_list;
 
-static int hf_cbcp_opt_type = -1;
-static int hf_cbcp_opt_length = -1;
+static int hf_cbcp_opt_type;
+static int hf_cbcp_opt_length;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_cbcp_address_type = -1;
-static int hf_cbcp_address = -1;
-static int hf_cbcp_callback_delay = -1;
-static int hf_cbcp_no_callback = -1;
-
-static gint ett_cbcp = -1;
-static gint ett_cbcp_options = -1;
-static gint ett_cbcp_callback_opt = -1;
-static gint ett_cbcp_callback_opt_addr = -1;
-static gint ett_cbcp_no_callback = -1;
-static gint ett_cbcp_callback_user = -1;
-static gint ett_cbcp_callback_admin = -1;
-static gint ett_cbcp_callback_list = -1;
-
-static expert_field ei_cbcp_address = EI_INIT;
+static int hf_cbcp_address_type;
+static int hf_cbcp_address;
+static int hf_cbcp_callback_delay;
+static int hf_cbcp_no_callback;
+
+static gint ett_cbcp;
+static gint ett_cbcp_options;
+static gint ett_cbcp_callback_opt;
+static gint ett_cbcp_callback_opt_addr;
+static gint ett_cbcp_no_callback;
+static gint ett_cbcp_callback_user;
+static gint ett_cbcp_callback_admin;
+static gint ett_cbcp_callback_list;
+
+static expert_field ei_cbcp_address;
 
 static dissector_table_t cbcp_option_table;
 
-static int proto_bacp = -1;
-static int proto_bacp_option_favored_peer = -1;
+static int proto_bacp;
+static int proto_bacp_option_favored_peer;
 
-static int hf_bacp_opt_type = -1;
-static int hf_bacp_opt_length = -1;
+static int hf_bacp_opt_type;
+static int hf_bacp_opt_length;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_bacp_link_speed = -1;
-static int hf_bacp_magic_number = -1;
-static int hf_bacp_link_type = -1;
+static int hf_bacp_link_speed;
+static int hf_bacp_magic_number;
+static int hf_bacp_link_type;
 
-static gint ett_bacp = -1;
-static gint ett_bacp_options = -1;
-static gint ett_bacp_favored_peer_opt = -1;
+static gint ett_bacp;
+static gint ett_bacp_options;
+static gint ett_bacp_favored_peer_opt;
 
 static dissector_table_t bacp_option_table;
 
-static int proto_bap = -1;
-static int proto_bap_option_link_type = -1;
-static int proto_bap_option_phone_delta = -1;
-static int proto_bap_option_no_phone = -1;
-static int proto_bap_option_reason = -1;
-static int proto_bap_option_link_disc = -1;
-static int proto_bap_option_call_status = -1;
+static int proto_bap;
+static int proto_bap_option_link_type;
+static int proto_bap_option_phone_delta;
+static int proto_bap_option_no_phone;
+static int proto_bap_option_reason;
+static int proto_bap_option_link_disc;
+static int proto_bap_option_call_status;
 
-static int hf_bap_opt_type = -1;
-static int hf_bap_opt_length = -1;
+static int hf_bap_opt_type;
+static int hf_bap_opt_length;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_bap_sub_option_length = -1;
-static int hf_bap_call_status = -1;
-static int hf_bap_unknown_option_data = -1;
-static int hf_bap_sub_option_type = -1;
-static int hf_bap_reason = -1;
-static int hf_bap_link_discriminator = -1;
-static int hf_bap_unique_digit = -1;
-static int hf_bap_type = -1;
-static int hf_bap_identifier = -1;
-static int hf_bap_subscriber_number = -1;
-static int hf_bap_phone_number_sub_address = -1;
-static int hf_bap_response_code = -1;
-static int hf_bap_call_action = -1;
-static int hf_bap_length = -1;
-
-static gint ett_bap = -1;
-static gint ett_bap_options = -1;
-static gint ett_bap_link_type_opt = -1;
-static gint ett_bap_phone_delta_opt = -1;
-static gint ett_bap_phone_delta_subopt = -1;
-static gint ett_bap_call_status_opt = -1;
-static gint ett_bap_no_phone_opt = -1;
-static gint ett_bap_reason_opt = -1;
-static gint ett_bap_link_disc_opt = -1;
-
-static expert_field ei_bap_sub_option_length = EI_INIT;
+static int hf_bap_sub_option_length;
+static int hf_bap_call_status;
+static int hf_bap_unknown_option_data;
+static int hf_bap_sub_option_type;
+static int hf_bap_reason;
+static int hf_bap_link_discriminator;
+static int hf_bap_unique_digit;
+static int hf_bap_type;
+static int hf_bap_identifier;
+static int hf_bap_subscriber_number;
+static int hf_bap_phone_number_sub_address;
+static int hf_bap_response_code;
+static int hf_bap_call_action;
+static int hf_bap_length;
+
+static gint ett_bap;
+static gint ett_bap_options;
+static gint ett_bap_link_type_opt;
+static gint ett_bap_phone_delta_opt;
+static gint ett_bap_phone_delta_subopt;
+static gint ett_bap_call_status_opt;
+static gint ett_bap_no_phone_opt;
+static gint ett_bap_reason_opt;
+static gint ett_bap_link_disc_opt;
+
+static expert_field ei_bap_sub_option_length;
 
 static dissector_table_t bap_option_table;
 
@@ -492,66 +492,66 @@ static dissector_handle_t cs_handle;
 static dissector_handle_t cntcp_handle;
 
 
-static int proto_comp_data = -1;
+static int proto_comp_data;
 
 #if 0  /* see dissect_comp_data() */
-static gint ett_comp_data = -1;
+static gint ett_comp_data;
 #endif
-static int proto_pppmuxcp = -1;
-static int proto_pppmuxcp_option_def_pid = -1;
+static int proto_pppmuxcp;
+static int proto_pppmuxcp_option_def_pid;
 
-static int hf_pppmux_flags_pid = -1;
-static int hf_pppmux_flags_field_length = -1;
-static int hf_pppmuxcp_opt_type = -1;
-static int hf_pppmuxcp_opt_length = -1;
+static int hf_pppmux_flags_pid;
+static int hf_pppmux_flags_field_length;
+static int hf_pppmuxcp_opt_type;
+static int hf_pppmuxcp_opt_length;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_pppmux_sub_frame_length = -1;
-static int hf_pppmux_flags = -1;
-static int hf_pppmux_def_prot_id = -1;
+static int hf_pppmux_sub_frame_length;
+static int hf_pppmux_flags;
+static int hf_pppmux_def_prot_id;
 
-static gint ett_pppmuxcp = -1;
-static gint ett_pppmuxcp_options = -1;
-static gint ett_pppmuxcp_def_pid_opt = -1;
+static gint ett_pppmuxcp;
+static gint ett_pppmuxcp_options;
+static gint ett_pppmuxcp_def_pid_opt;
 
 static dissector_table_t pppmuxcp_option_table;
 
-static int proto_pppmux = -1;
-static int hf_pppmux_protocol = -1;
+static int proto_pppmux;
+static int hf_pppmux_protocol;
 
-static gint ett_pppmux = -1;
-static gint ett_pppmux_subframe = -1;
-static gint ett_pppmux_subframe_hdr = -1;
-static gint ett_pppmux_subframe_flags = -1;
-static gint ett_pppmux_subframe_info = -1;
+static gint ett_pppmux;
+static gint ett_pppmux_subframe;
+static gint ett_pppmux_subframe_hdr;
+static gint ett_pppmux_subframe_flags;
+static gint ett_pppmux_subframe_info;
 
 static reassembly_table mp_reassembly_table;
 
-static int proto_mp = -1;
-static int hf_mp_frag = -1;
-static int hf_mp_frag_short = -1;
-static int hf_mp_frag_first = -1;
-static int hf_mp_frag_last = -1;
-static int hf_mp_sequence_num = -1;
-static int hf_mp_sequence_num_cls = -1;
-static int hf_mp_sequence_num_reserved = -1;
-static int hf_mp_short_sequence_num = -1;
-static int hf_mp_short_sequence_num_cls = -1;
-static int hf_mp_payload = -1;
-static gint hf_mp_fragments = -1;
-static gint hf_mp_fragment = -1;
-static gint hf_mp_fragment_overlap = -1;
-static gint hf_mp_fragment_overlap_conflicts = -1;
-static gint hf_mp_fragment_multiple_tails = -1;
-static gint hf_mp_fragment_too_long_fragment = -1;
-static gint hf_mp_fragment_error = -1;
-static gint hf_mp_fragment_count = -1;
-static gint hf_mp_reassembled_in = -1;
-static gint hf_mp_reassembled_length = -1;
-
-static int ett_mp = -1;
-static int ett_mp_flags = -1;
-static gint ett_mp_fragment = -1;
-static gint ett_mp_fragments = -1;
+static int proto_mp;
+static int hf_mp_frag;
+static int hf_mp_frag_short;
+static int hf_mp_frag_first;
+static int hf_mp_frag_last;
+static int hf_mp_sequence_num;
+static int hf_mp_sequence_num_cls;
+static int hf_mp_sequence_num_reserved;
+static int hf_mp_short_sequence_num;
+static int hf_mp_short_sequence_num_cls;
+static int hf_mp_payload;
+static gint hf_mp_fragments;
+static gint hf_mp_fragment;
+static gint hf_mp_fragment_overlap;
+static gint hf_mp_fragment_overlap_conflicts;
+static gint hf_mp_fragment_multiple_tails;
+static gint hf_mp_fragment_too_long_fragment;
+static gint hf_mp_fragment_error;
+static gint hf_mp_fragment_count;
+static gint hf_mp_reassembled_in;
+static gint hf_mp_reassembled_length;
+
+static int ett_mp;
+static int ett_mp_flags;
+static gint ett_mp_fragment;
+static gint ett_mp_fragments;
 
 static const fragment_items mp_frag_items = {
     /* Fragment subtrees */
@@ -576,88 +576,88 @@ static const fragment_items mp_frag_items = {
     "Message fragments"
 };
 
-static int proto_mplscp = -1;
-static gint ett_mplscp = -1;
-static gint ett_mplscp_options  = -1;
-
-static int proto_cdpcp = -1;
-static gint ett_cdpcp = -1;
-static gint ett_cdpcp_options   = -1;
-
-static int proto_pap = -1;           /* PAP vars */
-static gint ett_pap = -1;
-static gint ett_pap_data = -1;
-
-static gint hf_pap_code = -1;
-static gint hf_pap_identifier = -1;
-static gint hf_pap_length = -1;
-static gint hf_pap_data = -1;
-static gint hf_pap_peer_id = -1;
-static gint hf_pap_peer_id_length = -1;
-static gint hf_pap_password = -1;
-static gint hf_pap_password_length = -1;
-static gint hf_pap_message = -1;
-static gint hf_pap_message_length = -1;
-static gint hf_pap_stuff = -1;
-
-static int proto_chap = -1;           /* CHAP vars */
-static gint ett_chap = -1;
-static gint ett_chap_data = -1;
-
-
-static gint hf_chap_code = -1;
-static gint hf_chap_identifier = -1;
-static gint hf_chap_length = -1;
-static gint hf_chap_data = -1;
-static gint hf_chap_value_size = -1;
-static gint hf_chap_value = -1;
-static gint hf_chap_name = -1;
-static gint hf_chap_message = -1;
-static int hf_chap_stuff = -1;
-
-static int proto_ipv6cp = -1;  /* IPv6CP vars */
-static int proto_ipv6cp_option_if_id = -1;
-static int proto_ipv6cp_option_compress = -1;
+static int proto_mplscp;
+static gint ett_mplscp;
+static gint ett_mplscp_options;
+
+static int proto_cdpcp;
+static gint ett_cdpcp;
+static gint ett_cdpcp_options;
+
+static int proto_pap;           /* PAP vars */
+static gint ett_pap;
+static gint ett_pap_data;
+
+static gint hf_pap_code;
+static gint hf_pap_identifier;
+static gint hf_pap_length;
+static gint hf_pap_data;
+static gint hf_pap_peer_id;
+static gint hf_pap_peer_id_length;
+static gint hf_pap_password;
+static gint hf_pap_password_length;
+static gint hf_pap_message;
+static gint hf_pap_message_length;
+static gint hf_pap_stuff;
+
+static int proto_chap;           /* CHAP vars */
+static gint ett_chap;
+static gint ett_chap_data;
+
+
+static gint hf_chap_code;
+static gint hf_chap_identifier;
+static gint hf_chap_length;
+static gint hf_chap_data;
+static gint hf_chap_value_size;
+static gint hf_chap_value;
+static gint hf_chap_name;
+static gint hf_chap_message;
+static int hf_chap_stuff;
+
+static int proto_ipv6cp;  /* IPv6CP vars */
+static int proto_ipv6cp_option_if_id;
+static int proto_ipv6cp_option_compress;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_ipv6cp_opt_type = -1;
-static int hf_ipv6cp_opt_length = -1;
-static int hf_ipv6cp_interface_identifier = -1;
+static int hf_ipv6cp_opt_type;
+static int hf_ipv6cp_opt_length;
+static int hf_ipv6cp_interface_identifier;
 
-static gint ett_ipv6cp = -1;
-static gint ett_ipv6cp_options = -1;
-static gint ett_ipv6cp_if_id_opt = -1;
-static gint ett_ipv6cp_compress_opt = -1;
+static gint ett_ipv6cp;
+static gint ett_ipv6cp_options;
+static gint ett_ipv6cp_if_id_opt;
+static gint ett_ipv6cp_compress_opt;
 
 static dissector_table_t ipv6cp_option_table;
 
-static int proto_iphc_crtp = -1;            /* CRTP vars */
-static int proto_iphc_crtp_cudp16 = -1;
-static int proto_iphc_crtp_cudp8 = -1;
-static int proto_iphc_crtp_cs = -1;
-static int proto_iphc_crtp_cntcp = -1;
-
-static int hf_iphc_crtp_cid8 = -1;
-static int hf_iphc_crtp_cid16 = -1;
-static int hf_iphc_crtp_gen = -1;
-static int hf_iphc_crtp_seq = -1;
-static int hf_iphc_crtp_fh_flags = -1;
-static int hf_iphc_crtp_fh_cidlenflag = -1;
-static int hf_iphc_crtp_fh_dataflag = -1;
-static int hf_iphc_crtp_cs_flags = -1;
-static int hf_iphc_crtp_cs_cnt = -1;
-static int hf_iphc_crtp_cs_invalid = -1;
-static int hf_iphc_crtp_ip_id = -1;
-static int hf_iphc_crtp_data = -1;
-
-static gint ett_iphc_crtp = -1;
-static gint ett_iphc_crtp_hdr = -1;
-static gint ett_iphc_crtp_info = -1;
-static gint ett_iphc_crtp_fh_flags = -1;
-
-static expert_field ei_iphc_crtp_ip_version = EI_INIT;
-static expert_field ei_iphc_crtp_next_protocol = EI_INIT;
-static expert_field ei_iphc_crtp_seq_nonzero = EI_INIT;
+static int proto_iphc_crtp;            /* CRTP vars */
+static int proto_iphc_crtp_cudp16;
+static int proto_iphc_crtp_cudp8;
+static int proto_iphc_crtp_cs;
+static int proto_iphc_crtp_cntcp;
+
+static int hf_iphc_crtp_cid8;
+static int hf_iphc_crtp_cid16;
+static int hf_iphc_crtp_gen;
+static int hf_iphc_crtp_seq;
+static int hf_iphc_crtp_fh_flags;
+static int hf_iphc_crtp_fh_cidlenflag;
+static int hf_iphc_crtp_fh_dataflag;
+static int hf_iphc_crtp_cs_flags;
+static int hf_iphc_crtp_cs_cnt;
+static int hf_iphc_crtp_cs_invalid;
+static int hf_iphc_crtp_ip_id;
+static int hf_iphc_crtp_data;
+
+static gint ett_iphc_crtp;
+static gint ett_iphc_crtp_hdr;
+static gint ett_iphc_crtp_info;
+static gint ett_iphc_crtp_fh_flags;
+
+static expert_field ei_iphc_crtp_ip_version;
+static expert_field ei_iphc_crtp_next_protocol;
+static expert_field ei_iphc_crtp_seq_nonzero;
 
 static dissector_table_t ppp_subdissector_table;
 static dissector_handle_t chdlc_handle;
@@ -1184,84 +1184,84 @@ static const value_string dce_mode_vals[] = {
                                        why do they bother specifically
                                        mentioning this one, I wonder? */
 
-static int hf_lcp_magic_number = -1;
-static int hf_lcp_data = -1;
-static int hf_lcp_message = -1;
-static int hf_lcp_secs_remaining = -1;
-static int hf_lcp_rej_proto = -1;
-static int hf_lcp_opt_type = -1;
-static int hf_lcp_opt_length = -1;
-static int hf_lcp_opt_oui = -1;
-static int hf_lcp_opt_kind = -1;
-static int hf_lcp_opt_data = -1;
-static int hf_lcp_opt_mru = -1;
-static int hf_lcp_opt_asyncmap = -1;
-static int hf_lcp_opt_asyncmap_nul = -1;
-static int hf_lcp_opt_asyncmap_soh = -1;
-static int hf_lcp_opt_asyncmap_stx = -1;
-static int hf_lcp_opt_asyncmap_etx = -1;
-static int hf_lcp_opt_asyncmap_eot = -1;
-static int hf_lcp_opt_asyncmap_enq = -1;
-static int hf_lcp_opt_asyncmap_ack = -1;
-static int hf_lcp_opt_asyncmap_bel = -1;
-static int hf_lcp_opt_asyncmap_bs = -1;
-static int hf_lcp_opt_asyncmap_ht = -1;
-static int hf_lcp_opt_asyncmap_lf = -1;
-static int hf_lcp_opt_asyncmap_vt = -1;
-static int hf_lcp_opt_asyncmap_ff = -1;
-static int hf_lcp_opt_asyncmap_cr = -1;
-static int hf_lcp_opt_asyncmap_so = -1;
-static int hf_lcp_opt_asyncmap_si = -1;
-static int hf_lcp_opt_asyncmap_dle = -1;
-static int hf_lcp_opt_asyncmap_dc1 = -1;
-static int hf_lcp_opt_asyncmap_dc2 = -1;
-static int hf_lcp_opt_asyncmap_dc3 = -1;
-static int hf_lcp_opt_asyncmap_dc4 = -1;
-static int hf_lcp_opt_asyncmap_nak = -1;
-static int hf_lcp_opt_asyncmap_syn = -1;
-static int hf_lcp_opt_asyncmap_etb = -1;
-static int hf_lcp_opt_asyncmap_can = -1;
-static int hf_lcp_opt_asyncmap_em = -1;
-static int hf_lcp_opt_asyncmap_sub = -1;
-static int hf_lcp_opt_asyncmap_esc = -1;
-static int hf_lcp_opt_asyncmap_fs = -1;
-static int hf_lcp_opt_asyncmap_gs = -1;
-static int hf_lcp_opt_asyncmap_rs = -1;
-static int hf_lcp_opt_asyncmap_us = -1;
-static int hf_lcp_opt_auth_protocol = -1;
-static int hf_lcp_opt_algorithm = -1;
-static int hf_lcp_opt_quality_protocol = -1;
-static int hf_lcp_opt_magic_number = -1;
-static int hf_lcp_opt_reportingperiod = -1;
-static int hf_lcp_opt_fcs_alternatives = -1;
-static int hf_lcp_opt_fcs_alternatives_null = -1;
-static int hf_lcp_opt_fcs_alternatives_ccitt16 = -1;
-static int hf_lcp_opt_fcs_alternatives_ccitt32 = -1;
-static int hf_lcp_opt_maximum = -1;
-static int hf_lcp_opt_window = -1;
-static int hf_lcp_opt_hdlc_address = -1;
-static int hf_lcp_opt_operation = -1;
-static int hf_lcp_opt_message = -1;
-static int hf_lcp_opt_mrru = -1;
-static int hf_lcp_opt_ep_disc_class = -1;
-static int hf_lcp_opt_ip_address = -1;
-static int hf_lcp_opt_802_1_address = -1;
-static int hf_lcp_opt_magic_block = -1;
-static int hf_lcp_opt_psndn = -1;
-static int hf_lcp_opt_mode = -1;
-static int hf_lcp_opt_unused = -1;
-static int hf_lcp_opt_link_discrim = -1;
-static int hf_lcp_opt_id = -1;
-static int hf_lcp_opt_cobs_flags = -1;
-static int hf_lcp_opt_cobs_flags_res = -1;
-static int hf_lcp_opt_cobs_flags_pre = -1;
-static int hf_lcp_opt_cobs_flags_zxe = -1;
-static int hf_lcp_opt_class = -1;
-static int hf_lcp_opt_prefix = -1;
-static int hf_lcp_opt_code = -1;
-static int hf_lcp_opt_max_susp_classes = -1;
-static int hf_lcp_opt_MIBenum = -1;
-static int hf_lcp_opt_language_tag = -1;
+static int hf_lcp_magic_number;
+static int hf_lcp_data;
+static int hf_lcp_message;
+static int hf_lcp_secs_remaining;
+static int hf_lcp_rej_proto;
+static int hf_lcp_opt_type;
+static int hf_lcp_opt_length;
+static int hf_lcp_opt_oui;
+static int hf_lcp_opt_kind;
+static int hf_lcp_opt_data;
+static int hf_lcp_opt_mru;
+static int hf_lcp_opt_asyncmap;
+static int hf_lcp_opt_asyncmap_nul;
+static int hf_lcp_opt_asyncmap_soh;
+static int hf_lcp_opt_asyncmap_stx;
+static int hf_lcp_opt_asyncmap_etx;
+static int hf_lcp_opt_asyncmap_eot;
+static int hf_lcp_opt_asyncmap_enq;
+static int hf_lcp_opt_asyncmap_ack;
+static int hf_lcp_opt_asyncmap_bel;
+static int hf_lcp_opt_asyncmap_bs;
+static int hf_lcp_opt_asyncmap_ht;
+static int hf_lcp_opt_asyncmap_lf;
+static int hf_lcp_opt_asyncmap_vt;
+static int hf_lcp_opt_asyncmap_ff;
+static int hf_lcp_opt_asyncmap_cr;
+static int hf_lcp_opt_asyncmap_so;
+static int hf_lcp_opt_asyncmap_si;
+static int hf_lcp_opt_asyncmap_dle;
+static int hf_lcp_opt_asyncmap_dc1;
+static int hf_lcp_opt_asyncmap_dc2;
+static int hf_lcp_opt_asyncmap_dc3;
+static int hf_lcp_opt_asyncmap_dc4;
+static int hf_lcp_opt_asyncmap_nak;
+static int hf_lcp_opt_asyncmap_syn;
+static int hf_lcp_opt_asyncmap_etb;
+static int hf_lcp_opt_asyncmap_can;
+static int hf_lcp_opt_asyncmap_em;
+static int hf_lcp_opt_asyncmap_sub;
+static int hf_lcp_opt_asyncmap_esc;
+static int hf_lcp_opt_asyncmap_fs;
+static int hf_lcp_opt_asyncmap_gs;
+static int hf_lcp_opt_asyncmap_rs;
+static int hf_lcp_opt_asyncmap_us;
+static int hf_lcp_opt_auth_protocol;
+static int hf_lcp_opt_algorithm;
+static int hf_lcp_opt_quality_protocol;
+static int hf_lcp_opt_magic_number;
+static int hf_lcp_opt_reportingperiod;
+static int hf_lcp_opt_fcs_alternatives;
+static int hf_lcp_opt_fcs_alternatives_null;
+static int hf_lcp_opt_fcs_alternatives_ccitt16;
+static int hf_lcp_opt_fcs_alternatives_ccitt32;
+static int hf_lcp_opt_maximum;
+static int hf_lcp_opt_window;
+static int hf_lcp_opt_hdlc_address;
+static int hf_lcp_opt_operation;
+static int hf_lcp_opt_message;
+static int hf_lcp_opt_mrru;
+static int hf_lcp_opt_ep_disc_class;
+static int hf_lcp_opt_ip_address;
+static int hf_lcp_opt_802_1_address;
+static int hf_lcp_opt_magic_block;
+static int hf_lcp_opt_psndn;
+static int hf_lcp_opt_mode;
+static int hf_lcp_opt_unused;
+static int hf_lcp_opt_link_discrim;
+static int hf_lcp_opt_id;
+static int hf_lcp_opt_cobs_flags;
+static int hf_lcp_opt_cobs_flags_res;
+static int hf_lcp_opt_cobs_flags_pre;
+static int hf_lcp_opt_cobs_flags_zxe;
+static int hf_lcp_opt_class;
+static int hf_lcp_opt_prefix;
+static int hf_lcp_opt_code;
+static int hf_lcp_opt_max_susp_classes;
+static int hf_lcp_opt_MIBenum;
+static int hf_lcp_opt_language_tag;
 
 static gboolean
 ppp_option_len_check(proto_tree* tree, packet_info *pinfo, tvbuff_t *tvb, int proto, guint len, guint optlen)
@@ -1467,34 +1467,34 @@ static const range_string chap_alg_rvals[] = {
 #define CI_SEC_DNS          131     /* Secondary DNS value (RFC 1877) */
 #define CI_SEC_NBNS         132     /* Secondary NBNS value (RFC 1877) */
 
-static int hf_ipcp_opt_type = -1;
-static int hf_ipcp_opt_length = -1;
-static int hf_ipcp_opt_src_address = -1;
-static int hf_ipcp_opt_dst_address = -1;
-static int hf_ipcp_opt_compress_proto = -1;
-static int hf_ipcp_opt_max_cid = -1;
-static int hf_ipcp_opt_mrru = -1;
-static int hf_ipcp_opt_max_slot_id = -1;
-static int hf_ipcp_opt_comp_slot_id = -1;
-static int hf_ipcp_opt_tcp_space = -1;
-static int hf_ipcp_opt_non_tcp_space = -1;
-static int hf_ipcp_opt_f_max_period = -1;
-static int hf_ipcp_opt_f_max_time = -1;
-static int hf_ipcp_opt_max_header = -1;
-static int hf_ipcp_data = -1;
-static int hf_ipcp_opt_ip_address = -1;
-static int hf_ipcp_opt_mobilenodehomeaddr = -1;
-static int hf_ipcp_opt_pri_dns_address = -1;
-static int hf_ipcp_opt_pri_nbns_address = -1;
-static int hf_ipcp_opt_sec_dns_address = -1;
-static int hf_ipcp_opt_sec_nbns_address = -1;
-
-static int hf_ipcp_opt_rohc_type = -1;
-static int hf_ipcp_opt_rohc_length = -1;
-static int hf_ipcp_opt_rohc_profile = -1;
-static int hf_ipcp_opt_iphc_type = -1;
-static int hf_ipcp_opt_iphc_length = -1;
-static int hf_ipcp_opt_iphc_param = -1;
+static int hf_ipcp_opt_type;
+static int hf_ipcp_opt_length;
+static int hf_ipcp_opt_src_address;
+static int hf_ipcp_opt_dst_address;
+static int hf_ipcp_opt_compress_proto;
+static int hf_ipcp_opt_max_cid;
+static int hf_ipcp_opt_mrru;
+static int hf_ipcp_opt_max_slot_id;
+static int hf_ipcp_opt_comp_slot_id;
+static int hf_ipcp_opt_tcp_space;
+static int hf_ipcp_opt_non_tcp_space;
+static int hf_ipcp_opt_f_max_period;
+static int hf_ipcp_opt_f_max_time;
+static int hf_ipcp_opt_max_header;
+static int hf_ipcp_data;
+static int hf_ipcp_opt_ip_address;
+static int hf_ipcp_opt_mobilenodehomeaddr;
+static int hf_ipcp_opt_pri_dns_address;
+static int hf_ipcp_opt_pri_nbns_address;
+static int hf_ipcp_opt_sec_dns_address;
+static int hf_ipcp_opt_sec_nbns_address;
+
+static int hf_ipcp_opt_rohc_type;
+static int hf_ipcp_opt_rohc_length;
+static int hf_ipcp_opt_rohc_profile;
+static int hf_ipcp_opt_iphc_type;
+static int hf_ipcp_opt_iphc_length;
+static int hf_ipcp_opt_iphc_param;
 
 /*
  * IP Compression options
@@ -1565,9 +1565,9 @@ static const value_string ipcp_rohc_profile_vals[] = {
  */
 #define CI_OSINLCP_ALIGN_NPDU    1  /* Alignment of the OSI NPDU (RFC 1377) */
 
-static int hf_osinlcp_opt_type = -1;
-static int hf_osinlcp_opt_length = -1;
-static int hf_osinlcp_opt_alignment = -1;
+static int hf_osinlcp_opt_type;
+static int hf_osinlcp_opt_length;
+static int hf_osinlcp_opt_alignment;
 
 /*
  * Options.  (CCP)
@@ -1589,41 +1589,41 @@ static int hf_osinlcp_opt_alignment = -1;
 #define CI_CCP_V44LZJH  27      /* V.44/LZJH (https://tools.ietf.org/html/draft-heath-ppp-v44-01) */
 #define CI_CCP_RESERVED 255     /* Reserved (RFC1962) */
 
-static int hf_ccp_opt_type = -1;
-static int hf_ccp_opt_length = -1;
-static int hf_ccp_opt_oui = -1;
-static int hf_ccp_opt_subtype = -1;
-static int hf_ccp_opt_data = -1;
-static int hf_ccp_opt_history_count = -1;
-static int hf_ccp_opt_cm = -1;
-static int hf_ccp_opt_cm_reserved = -1;
-static int hf_ccp_opt_cm_check_mode = -1;
-static int hf_ccp_opt_supported_bits = -1;
-static int hf_ccp_opt_supported_bits_h = -1;
-static int hf_ccp_opt_supported_bits_m = -1;
-static int hf_ccp_opt_supported_bits_s = -1;
-static int hf_ccp_opt_supported_bits_l = -1;
-static int hf_ccp_opt_supported_bits_d = -1;
-static int hf_ccp_opt_supported_bits_c = -1;
-static int hf_ccp_opt_history = -1;
-static int hf_ccp_opt_version = -1;
-static int hf_ccp_opt_vd = -1;
-static int hf_ccp_opt_vd_vers = -1;
-static int hf_ccp_opt_vd_dict = -1;
-static int hf_ccp_opt_check_mode = -1;
-static int hf_ccp_opt_process_mode = -1;
-static int hf_ccp_opt_fe = -1;
-static int hf_ccp_opt_p = -1;
-static int hf_ccp_opt_History = -1; /* Different than hf_ccp_opt_history */
-static int hf_ccp_opt_contexts = -1;
-static int hf_ccp_opt_mode = -1;
-static int hf_ccp_opt_window = -1;
-static int hf_ccp_opt_method = -1;
-static int hf_ccp_opt_mbz = -1;
-static int hf_ccp_opt_chk = -1;
-static int hf_ccp_opt_mode_dictcount = -1;
-static int hf_ccp_opt_dict_size = -1;
-static int hf_ccp_opt_history_length = -1;
+static int hf_ccp_opt_type;
+static int hf_ccp_opt_length;
+static int hf_ccp_opt_oui;
+static int hf_ccp_opt_subtype;
+static int hf_ccp_opt_data;
+static int hf_ccp_opt_history_count;
+static int hf_ccp_opt_cm;
+static int hf_ccp_opt_cm_reserved;
+static int hf_ccp_opt_cm_check_mode;
+static int hf_ccp_opt_supported_bits;
+static int hf_ccp_opt_supported_bits_h;
+static int hf_ccp_opt_supported_bits_m;
+static int hf_ccp_opt_supported_bits_s;
+static int hf_ccp_opt_supported_bits_l;
+static int hf_ccp_opt_supported_bits_d;
+static int hf_ccp_opt_supported_bits_c;
+static int hf_ccp_opt_history;
+static int hf_ccp_opt_version;
+static int hf_ccp_opt_vd;
+static int hf_ccp_opt_vd_vers;
+static int hf_ccp_opt_vd_dict;
+static int hf_ccp_opt_check_mode;
+static int hf_ccp_opt_process_mode;
+static int hf_ccp_opt_fe;
+static int hf_ccp_opt_p;
+static int hf_ccp_opt_History; /* Different than hf_ccp_opt_history */
+static int hf_ccp_opt_contexts;
+static int hf_ccp_opt_mode;
+static int hf_ccp_opt_window;
+static int hf_ccp_opt_method;
+static int hf_ccp_opt_mbz;
+static int hf_ccp_opt_chk;
+static int hf_ccp_opt_mode_dictcount;
+static int hf_ccp_opt_dict_size;
+static int hf_ccp_opt_history_length;
 
 /*
  * Options.  (CBCP)
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c
index e0b54a95c7..0335d27cf7 100644
--- a/epan/dissectors/packet-pppoe.c
+++ b/epan/dissectors/packet-pppoe.c
@@ -27,97 +27,97 @@ void proto_reg_handoff_pppoes(void);
 static dissector_handle_t pppoed_handle;
 static dissector_handle_t pppoes_handle;
 
-static int proto_pppoed = -1;
+static int proto_pppoed;
 
 /* Common to session and discovery protocols */
-static gint hf_pppoe_version = -1;
-static gint hf_pppoe_type = -1;
-static gint hf_pppoe_code = -1;
-static gint hf_pppoe_session_id = -1;
-static gint hf_pppoe_payload_length = -1;
+static gint hf_pppoe_version;
+static gint hf_pppoe_type;
+static gint hf_pppoe_code;
+static gint hf_pppoe_session_id;
+static gint hf_pppoe_payload_length;
 
 /* Discovery protocol fields */
-static gint hf_pppoed_tags = -1;
-static gint hf_pppoed_tag = -1;
-static gint hf_pppoed_tag_length = -1;
-static gint hf_pppoed_tag_length_8 = -1;
-static gint hf_pppoed_tag_unknown_data = -1;
-static gint hf_pppoed_tag_service_name = -1;
-static gint hf_pppoed_tag_ac_name = -1;
-static gint hf_pppoed_tag_host_uniq = -1;
-static gint hf_pppoed_tag_ac_cookie = -1;
-static gint hf_pppoed_tag_vendor_id = -1;
-static gint hf_pppoed_tag_vendor_unspecified = -1;
-static gint hf_pppoed_tag_vspec_tags = -1;
-static gint hf_pppoed_tag_vspec_tag = -1;
-static gint hf_pppoed_tag_vspec_circuit_id = -1;
-static gint hf_pppoed_tag_vspec_remote_id = -1;
-static gint hf_pppoed_tag_vspec_act_data_rate_up = -1;
-static gint hf_pppoed_tag_vspec_act_data_rate_down = -1;
-static gint hf_pppoed_tag_vspec_min_data_rate_up = -1;
-static gint hf_pppoed_tag_vspec_min_data_rate_down = -1;
-static gint hf_pppoed_tag_vspec_attainable_data_rate_up = -1;
-static gint hf_pppoed_tag_vspec_attainable_data_rate_down = -1;
-static gint hf_pppoed_tag_vspec_max_data_rate_up = -1;
-static gint hf_pppoed_tag_vspec_max_data_rate_down = -1;
-static gint hf_pppoed_tag_vspec_min_data_rate_up_lp = -1;
-static gint hf_pppoed_tag_vspec_min_data_rate_down_lp = -1;
-static gint hf_pppoed_tag_vspec_max_int_delay_up = -1;
-static gint hf_pppoed_tag_vspec_act_int_delay_up = -1;
-static gint hf_pppoed_tag_vspec_max_int_delay_down = -1;
-static gint hf_pppoed_tag_vspec_act_int_delay_down = -1;
-static gint hf_pppoed_tag_vspec_access_loop_encapsulation = -1;
-static gint hf_pppoed_tag_vspec_access_loop_encap_data_link = -1;
-static gint hf_pppoed_tag_vspec_access_loop_encap_encap_1 = -1;
-static gint hf_pppoed_tag_vspec_access_loop_encap_encap_2 = -1;
-static gint hf_pppoed_tag_credits = -1;
-static gint hf_pppoed_tag_credits_fcn = -1;
-static gint hf_pppoed_tag_credits_bcn = -1;
-static gint hf_pppoed_tag_metrics = -1;
-static gint hf_pppoed_tag_metrics_r = -1;
-static gint hf_pppoed_tag_metrics_rlq = -1;
-static gint hf_pppoed_tag_metrics_resource = -1;
-static gint hf_pppoed_tag_metrics_latency = -1;
-static gint hf_pppoed_tag_metrics_curr_drate = -1;
-static gint hf_pppoed_tag_metrics_max_drate = -1;
-static gint hf_pppoed_tag_mdr_units = -1;
-static gint hf_pppoed_tag_cdr_units = -1;
-static gint hf_pppoed_tag_seq_num = -1;
-static gint hf_pppoed_tag_cred_scale = -1;
-static gint hf_pppoed_tag_relay_session_id = -1;
-static gint hf_pppoed_tag_hurl = -1;
-static gint hf_pppoed_tag_motm = -1;
-static gint hf_pppoed_tag_max_payload = -1;
-static gint hf_pppoed_tag_ip_route_add = -1;
-static gint hf_pppoed_tag_service_name_error = -1;
-static gint hf_pppoed_tag_ac_system_error = -1;
-static gint hf_pppoed_tag_generic_error = -1;
+static gint hf_pppoed_tags;
+static gint hf_pppoed_tag;
+static gint hf_pppoed_tag_length;
+static gint hf_pppoed_tag_length_8;
+static gint hf_pppoed_tag_unknown_data;
+static gint hf_pppoed_tag_service_name;
+static gint hf_pppoed_tag_ac_name;
+static gint hf_pppoed_tag_host_uniq;
+static gint hf_pppoed_tag_ac_cookie;
+static gint hf_pppoed_tag_vendor_id;
+static gint hf_pppoed_tag_vendor_unspecified;
+static gint hf_pppoed_tag_vspec_tags;
+static gint hf_pppoed_tag_vspec_tag;
+static gint hf_pppoed_tag_vspec_circuit_id;
+static gint hf_pppoed_tag_vspec_remote_id;
+static gint hf_pppoed_tag_vspec_act_data_rate_up;
+static gint hf_pppoed_tag_vspec_act_data_rate_down;
+static gint hf_pppoed_tag_vspec_min_data_rate_up;
+static gint hf_pppoed_tag_vspec_min_data_rate_down;
+static gint hf_pppoed_tag_vspec_attainable_data_rate_up;
+static gint hf_pppoed_tag_vspec_attainable_data_rate_down;
+static gint hf_pppoed_tag_vspec_max_data_rate_up;
+static gint hf_pppoed_tag_vspec_max_data_rate_down;
+static gint hf_pppoed_tag_vspec_min_data_rate_up_lp;
+static gint hf_pppoed_tag_vspec_min_data_rate_down_lp;
+static gint hf_pppoed_tag_vspec_max_int_delay_up;
+static gint hf_pppoed_tag_vspec_act_int_delay_up;
+static gint hf_pppoed_tag_vspec_max_int_delay_down;
+static gint hf_pppoed_tag_vspec_act_int_delay_down;
+static gint hf_pppoed_tag_vspec_access_loop_encapsulation;
+static gint hf_pppoed_tag_vspec_access_loop_encap_data_link;
+static gint hf_pppoed_tag_vspec_access_loop_encap_encap_1;
+static gint hf_pppoed_tag_vspec_access_loop_encap_encap_2;
+static gint hf_pppoed_tag_credits;
+static gint hf_pppoed_tag_credits_fcn;
+static gint hf_pppoed_tag_credits_bcn;
+static gint hf_pppoed_tag_metrics;
+static gint hf_pppoed_tag_metrics_r;
+static gint hf_pppoed_tag_metrics_rlq;
+static gint hf_pppoed_tag_metrics_resource;
+static gint hf_pppoed_tag_metrics_latency;
+static gint hf_pppoed_tag_metrics_curr_drate;
+static gint hf_pppoed_tag_metrics_max_drate;
+static gint hf_pppoed_tag_mdr_units;
+static gint hf_pppoed_tag_cdr_units;
+static gint hf_pppoed_tag_seq_num;
+static gint hf_pppoed_tag_cred_scale;
+static gint hf_pppoed_tag_relay_session_id;
+static gint hf_pppoed_tag_hurl;
+static gint hf_pppoed_tag_motm;
+static gint hf_pppoed_tag_max_payload;
+static gint hf_pppoed_tag_ip_route_add;
+static gint hf_pppoed_tag_service_name_error;
+static gint hf_pppoed_tag_ac_system_error;
+static gint hf_pppoed_tag_generic_error;
 
 /* Session protocol fields */
-static gint hf_pppoes_tags = -1;
-/* static gint hf_pppoes_tag = -1; */
-/* static gint hf_pppoes_tag_credits = -1; */
-static gint hf_pppoes_tag_credits_fcn = -1;
-static gint hf_pppoes_tag_credits_bcn = -1;
+static gint hf_pppoes_tags;
+/* static gint hf_pppoes_tag; */
+/* static gint hf_pppoes_tag_credits; */
+static gint hf_pppoes_tag_credits_fcn;
+static gint hf_pppoes_tag_credits_bcn;
 
 /* Session protocol fields */
 
-static gint ett_pppoed = -1;
-static gint ett_pppoed_tags = -1;
-static gint ett_pppoed_tag_vspec_dslf_access_loop_encaps = -1;
+static gint ett_pppoed;
+static gint ett_pppoed_tags;
+static gint ett_pppoed_tag_vspec_dslf_access_loop_encaps;
 
-static int proto_pppoes = -1;
+static int proto_pppoes;
 
-static gint ett_pppoes = -1;
-static gint ett_pppoes_tags = -1;
+static gint ett_pppoes;
+static gint ett_pppoes_tags;
 
-static expert_field ei_pppoe_payload_length = EI_INIT;
-static expert_field ei_pppoe_tag_length = EI_INIT;
+static expert_field ei_pppoe_payload_length;
+static expert_field ei_pppoe_tag_length;
 
 /* PPPoE parent fields */
 
-static int proto_pppoe = -1;
-static gint ett_pppoe = -1;
+static int proto_pppoe;
+static gint ett_pppoe;
 
 
 /* Handle for calling for ppp dissector to handle session data */
diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c
index 191118e05e..dc8d173f6e 100644
--- a/epan/dissectors/packet-pptp.c
+++ b/epan/dissectors/packet-pptp.c
@@ -22,60 +22,60 @@ void proto_reg_handoff_pptp(void);
 
 static dissector_handle_t pptp_handle;
 
-static int proto_pptp = -1;
-static int hf_pptp_length = -1;
-static int hf_pptp_message_type = -1;
-static int hf_pptp_magic_cookie = -1;
-static int hf_pptp_control_message_type = -1;
-static int hf_pptp_reserved = -1;
-static int hf_pptp_protocol_version = -1;
-static int hf_pptp_framing_capabilities = -1;
-static int hf_pptp_bearer_capabilities = -1;
-static int hf_pptp_maximum_channels = -1;
-static int hf_pptp_firmware_revision = -1;
-static int hf_pptp_host_name = -1;
-static int hf_pptp_vendor_name = -1;
-static int hf_pptp_control_result = -1;
-static int hf_pptp_error = -1;
-static int hf_pptp_reason = -1;
-static int hf_pptp_stop_result = -1;
-static int hf_pptp_identifier = -1;
-static int hf_pptp_echo_result = -1;
-static int hf_pptp_call_id = -1;
-static int hf_pptp_call_serial_number = -1;
-static int hf_pptp_minimum_bps = -1;
-static int hf_pptp_maximum_bps = -1;
-static int hf_pptp_bearer_type = -1;
-static int hf_pptp_framing_type = -1;
-static int hf_pptp_packet_receive_window_size = -1;
-static int hf_pptp_packet_processing_delay = -1;
-static int hf_pptp_phone_number_length = -1;
-static int hf_pptp_phone_number = -1;
-static int hf_pptp_subaddress = -1;
-static int hf_pptp_peer_call_id = -1;
-static int hf_pptp_out_result = -1;
-static int hf_pptp_cause = -1;
-static int hf_pptp_connect_speed = -1;
-static int hf_pptp_physical_channel_id = -1;
-static int hf_pptp_dialed_number_length = -1;
-static int hf_pptp_dialed_number = -1;
-static int hf_pptp_dialing_number_length = -1;
-static int hf_pptp_dialing_number = -1;
-static int hf_pptp_in_result = -1;
-static int hf_pptp_disc_result = -1;
-static int hf_pptp_call_statistics = -1;
-static int hf_pptp_crc_errors = -1;
-static int hf_pptp_framing_errors = -1;
-static int hf_pptp_hardware_overruns = -1;
-static int hf_pptp_buffer_overruns = -1;
-static int hf_pptp_timeout_errors = -1;
-static int hf_pptp_alignment_errors = -1;
-static int hf_pptp_send_accm = -1;
-static int hf_pptp_receive_accm = -1;
-
-static gint ett_pptp = -1;
-
-static expert_field ei_pptp_incorrect_magic_cookie = EI_INIT;
+static int proto_pptp;
+static int hf_pptp_length;
+static int hf_pptp_message_type;
+static int hf_pptp_magic_cookie;
+static int hf_pptp_control_message_type;
+static int hf_pptp_reserved;
+static int hf_pptp_protocol_version;
+static int hf_pptp_framing_capabilities;
+static int hf_pptp_bearer_capabilities;
+static int hf_pptp_maximum_channels;
+static int hf_pptp_firmware_revision;
+static int hf_pptp_host_name;
+static int hf_pptp_vendor_name;
+static int hf_pptp_control_result;
+static int hf_pptp_error;
+static int hf_pptp_reason;
+static int hf_pptp_stop_result;
+static int hf_pptp_identifier;
+static int hf_pptp_echo_result;
+static int hf_pptp_call_id;
+static int hf_pptp_call_serial_number;
+static int hf_pptp_minimum_bps;
+static int hf_pptp_maximum_bps;
+static int hf_pptp_bearer_type;
+static int hf_pptp_framing_type;
+static int hf_pptp_packet_receive_window_size;
+static int hf_pptp_packet_processing_delay;
+static int hf_pptp_phone_number_length;
+static int hf_pptp_phone_number;
+static int hf_pptp_subaddress;
+static int hf_pptp_peer_call_id;
+static int hf_pptp_out_result;
+static int hf_pptp_cause;
+static int hf_pptp_connect_speed;
+static int hf_pptp_physical_channel_id;
+static int hf_pptp_dialed_number_length;
+static int hf_pptp_dialed_number;
+static int hf_pptp_dialing_number_length;
+static int hf_pptp_dialing_number;
+static int hf_pptp_in_result;
+static int hf_pptp_disc_result;
+static int hf_pptp_call_statistics;
+static int hf_pptp_crc_errors;
+static int hf_pptp_framing_errors;
+static int hf_pptp_hardware_overruns;
+static int hf_pptp_buffer_overruns;
+static int hf_pptp_timeout_errors;
+static int hf_pptp_alignment_errors;
+static int hf_pptp_send_accm;
+static int hf_pptp_receive_accm;
+
+static gint ett_pptp;
+
+static expert_field ei_pptp_incorrect_magic_cookie;
 
 #define TCP_PORT_PPTP           1723
 
diff --git a/epan/dissectors/packet-protobuf.c b/epan/dissectors/packet-protobuf.c
index 8dfdecbe6f..347e339d8c 100644
--- a/epan/dissectors/packet-protobuf.c
+++ b/epan/dissectors/packet-protobuf.c
@@ -100,52 +100,52 @@ void proto_reg_handoff_protobuf(void);
 
 static void protobuf_reinit(int target);
 
-static int proto_protobuf = -1;
-static int proto_protobuf_json_mapping = -1;
+static int proto_protobuf;
+static int proto_protobuf_json_mapping;
 
 static gboolean protobuf_dissector_called = FALSE;
 
 /* information get from *.proto files */
-static int hf_protobuf_message_name = -1;
-static int hf_protobuf_field_name = -1;
-static int hf_protobuf_field_type = -1;
+static int hf_protobuf_message_name;
+static int hf_protobuf_field_name;
+static int hf_protobuf_field_type;
 
 /* field tag */
-static int hf_protobuf_field_number = -1;
-static int hf_protobuf_wire_type = -1;
+static int hf_protobuf_field_number;
+static int hf_protobuf_wire_type;
 
 /* field value */
-static int hf_protobuf_value_length = -1; /* only Length-delimited field has */
-static int hf_protobuf_value_data = -1;
-static int hf_protobuf_value_double = -1;
-static int hf_protobuf_value_float = -1;
-static int hf_protobuf_value_int64 = -1;
-static int hf_protobuf_value_uint64 = -1;
-static int hf_protobuf_value_int32 = -1;
-static int hf_protobuf_value_uint32 = -1;
-static int hf_protobuf_value_bool = -1;
-static int hf_protobuf_value_string = -1;
-static int hf_protobuf_value_repeated = -1;
-static int hf_json_mapping_line = -1;
+static int hf_protobuf_value_length; /* only Length-delimited field has */
+static int hf_protobuf_value_data;
+static int hf_protobuf_value_double;
+static int hf_protobuf_value_float;
+static int hf_protobuf_value_int64;
+static int hf_protobuf_value_uint64;
+static int hf_protobuf_value_int32;
+static int hf_protobuf_value_uint32;
+static int hf_protobuf_value_bool;
+static int hf_protobuf_value_string;
+static int hf_protobuf_value_repeated;
+static int hf_json_mapping_line;
 
 /* expert */
-static expert_field ei_protobuf_failed_parse_tag = EI_INIT;
-static expert_field ei_protobuf_failed_parse_length_delimited_field = EI_INIT;
-static expert_field ei_protobuf_failed_parse_field = EI_INIT;
-static expert_field ei_protobuf_wire_type_invalid = EI_INIT;
-static expert_field ei_protobuf_message_type_not_found = EI_INIT;
-static expert_field ei_protobuf_wire_type_not_support_packed_repeated = EI_INIT;
-static expert_field ei_protobuf_failed_parse_packed_repeated_field = EI_INIT;
-static expert_field ei_protobuf_missing_required_field = EI_INIT;
-static expert_field ei_protobuf_default_value_error = EI_INIT;
+static expert_field ei_protobuf_failed_parse_tag;
+static expert_field ei_protobuf_failed_parse_length_delimited_field;
+static expert_field ei_protobuf_failed_parse_field;
+static expert_field ei_protobuf_wire_type_invalid;
+static expert_field ei_protobuf_message_type_not_found;
+static expert_field ei_protobuf_wire_type_not_support_packed_repeated;
+static expert_field ei_protobuf_failed_parse_packed_repeated_field;
+static expert_field ei_protobuf_missing_required_field;
+static expert_field ei_protobuf_default_value_error;
 
 /* trees */
-static int ett_protobuf = -1;
-static int ett_protobuf_message = -1;
-static int ett_protobuf_field = -1;
-static int ett_protobuf_value = -1;
-static int ett_protobuf_packed_repeated = -1;
-static int ett_protobuf_json = -1;
+static int ett_protobuf;
+static int ett_protobuf_message;
+static int ett_protobuf_field;
+static int ett_protobuf_value;
+static int ett_protobuf_packed_repeated;
+static int ett_protobuf_json;
 
 /* preferences */
 static gboolean try_dissect_as_string = FALSE;
diff --git a/epan/dissectors/packet-proxy.c b/epan/dissectors/packet-proxy.c
index b45eb87217..98b5bacde3 100644
--- a/epan/dissectors/packet-proxy.c
+++ b/epan/dissectors/packet-proxy.c
@@ -35,55 +35,55 @@
 void proto_reg_handoff_proxy(void);
 void proto_register_proxy(void);
 
-static int proto_proxy = -1;
+static int proto_proxy;
 
-static int hf_proxy_version = -1;
+static int hf_proxy_version;
 
-static int hf_proxy_src_ipv4 = -1;
-static int hf_proxy_dst_ipv4 = -1;
-static int hf_proxy_src_ipv6 = -1;
-static int hf_proxy_dst_ipv6 = -1;
-static int hf_proxy_srcport = -1;
-static int hf_proxy_dstport = -1;
+static int hf_proxy_src_ipv4;
+static int hf_proxy_dst_ipv4;
+static int hf_proxy_src_ipv6;
+static int hf_proxy_dst_ipv6;
+static int hf_proxy_srcport;
+static int hf_proxy_dstport;
 
 /* V1 */
-static int hf_proxy1_magic = -1;
-static int hf_proxy1_proto = -1;
-static int hf_proxy1_unknown = -1;
+static int hf_proxy1_magic;
+static int hf_proxy1_proto;
+static int hf_proxy1_unknown;
 
 /* V2 */
-static int hf_proxy2_magic = -1;
-static int hf_proxy2_ver = -1;
-static int hf_proxy2_cmd = -1;
-static int hf_proxy2_addr_family = -1;
-static int hf_proxy2_protocol = -1;
-static int hf_proxy2_addr_family_protocol = -1;
-static int hf_proxy2_len = -1;
-static int hf_proxy2_src_unix = -1;
-static int hf_proxy2_dst_unix = -1;
-
-static int hf_proxy2_unknown = -1;
-
-static int hf_proxy2_tlv = -1;
-static int hf_proxy2_tlv_type = -1;
-static int hf_proxy2_tlv_length = -1;
-static int hf_proxy2_tlv_value = -1;
-static int hf_proxy2_tlv_ssl_client = -1;
-static int hf_proxy2_tlv_ssl_verify = -1;
-static int hf_proxy2_tlv_ssl_version = -1;
-static int hf_proxy2_tlv_ssl_cn = -1;
-static int hf_proxy2_tlv_ssl_cipher = -1;
-static int hf_proxy2_tlv_ssl_sig_alg = -1;
-static int hf_proxy2_tlv_ssl_key_alg = -1;
-
-static expert_field ei_proxy_header_length_too_small = EI_INIT;
-static expert_field ei_proxy_bad_format = EI_INIT;
-
-
-static gint ett_proxy1 = -1;
-static gint ett_proxy2 = -1;
-static gint ett_proxy2_fampro = -1;
-static gint ett_proxy2_tlv = -1;
+static int hf_proxy2_magic;
+static int hf_proxy2_ver;
+static int hf_proxy2_cmd;
+static int hf_proxy2_addr_family;
+static int hf_proxy2_protocol;
+static int hf_proxy2_addr_family_protocol;
+static int hf_proxy2_len;
+static int hf_proxy2_src_unix;
+static int hf_proxy2_dst_unix;
+
+static int hf_proxy2_unknown;
+
+static int hf_proxy2_tlv;
+static int hf_proxy2_tlv_type;
+static int hf_proxy2_tlv_length;
+static int hf_proxy2_tlv_value;
+static int hf_proxy2_tlv_ssl_client;
+static int hf_proxy2_tlv_ssl_verify;
+static int hf_proxy2_tlv_ssl_version;
+static int hf_proxy2_tlv_ssl_cn;
+static int hf_proxy2_tlv_ssl_cipher;
+static int hf_proxy2_tlv_ssl_sig_alg;
+static int hf_proxy2_tlv_ssl_key_alg;
+
+static expert_field ei_proxy_header_length_too_small;
+static expert_field ei_proxy_bad_format;
+
+
+static gint ett_proxy1;
+static gint ett_proxy2;
+static gint ett_proxy2_fampro;
+static gint ett_proxy2_tlv;
 
 static dissector_handle_t proxy_v1_handle;
 static dissector_handle_t proxy_v2_handle;
diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c
index 40a5040cd3..6165e66b94 100644
--- a/epan/dissectors/packet-prp.c
+++ b/epan/dissectors/packet-prp.c
@@ -32,19 +32,19 @@ static const value_string prp_lan_vals[] = {
 
 void proto_register_prp(void);
 
-static int proto_prp = -1;
+static int proto_prp;
 
 
 /* Initialize trailer fields */
-static int hf_prp_redundancy_control_trailer_sequence_nr = -1;
-static int hf_prp_redundancy_control_trailer_lan = -1;
-static int hf_prp_redundancy_control_trailer_size = -1;
-static int hf_prp_redundancy_control_trailer_suffix = -1;
-static int hf_prp_redundancy_control_trailer_version = -1;
+static int hf_prp_redundancy_control_trailer_sequence_nr;
+static int hf_prp_redundancy_control_trailer_lan;
+static int hf_prp_redundancy_control_trailer_size;
+static int hf_prp_redundancy_control_trailer_suffix;
+static int hf_prp_redundancy_control_trailer_version;
 
 
 /* Initialize the subtree pointers */
-static gint ett_prp_redundancy_control_trailer = -1;
+static gint ett_prp_redundancy_control_trailer;
 
 
 /* Code to actually dissect the packets */
diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c
index 09d499b839..a2d87ed416 100644
--- a/epan/dissectors/packet-ptp.c
+++ b/epan/dissectors/packet-ptp.c
@@ -68,7 +68,7 @@
 void proto_register_ptp(void);
 void proto_reg_handoff_ptp(void);
 
-static int proto_ptp = -1;
+static int proto_ptp;
 /* To keep the decimal point based on locale */
 static char * decimal_point;
 
@@ -491,201 +491,201 @@ static const value_string ptp_messagetype_vals[] = {
 /* Initialize the protocol and registered fields          */
 /**********************************************************/
 
-static int hf_ptp_versionptp = -1;
-static int hf_ptp_versionnetwork = -1;
-static int hf_ptp_subdomain = -1;
-static int hf_ptp_messagetype = -1;
-static int hf_ptp_sourcecommunicationtechnology = -1;
-static int hf_ptp_sourceuuid = -1;
-static int hf_ptp_sourceportid = -1;
-static int hf_ptp_sequenceid = -1;
-static int hf_ptp_controlfield = -1;
-static int hf_ptp_flags = -1;
-static int hf_ptp_flags_li61 = -1;
-static int hf_ptp_flags_li59 = -1;
-static int hf_ptp_flags_boundary_clock = -1;
-static int hf_ptp_flags_assist = -1;
-static int hf_ptp_flags_ext_sync = -1;
-static int hf_ptp_flags_parent = -1;
-static int hf_ptp_flags_sync_burst = -1;
+static int hf_ptp_versionptp;
+static int hf_ptp_versionnetwork;
+static int hf_ptp_subdomain;
+static int hf_ptp_messagetype;
+static int hf_ptp_sourcecommunicationtechnology;
+static int hf_ptp_sourceuuid;
+static int hf_ptp_sourceportid;
+static int hf_ptp_sequenceid;
+static int hf_ptp_controlfield;
+static int hf_ptp_flags;
+static int hf_ptp_flags_li61;
+static int hf_ptp_flags_li59;
+static int hf_ptp_flags_boundary_clock;
+static int hf_ptp_flags_assist;
+static int hf_ptp_flags_ext_sync;
+static int hf_ptp_flags_parent;
+static int hf_ptp_flags_sync_burst;
 
 /* Fields for ptp_sync and delay_req (=sdr) messages */
-static int hf_ptp_sdr_origintimestamp = -1; /* Field for seconds & nanoseconds */
-static int hf_ptp_sdr_origintimestamp_seconds = -1;
-static int hf_ptp_sdr_origintimestamp_nanoseconds = -1;
-static int hf_ptp_sdr_epochnumber = -1;
-static int hf_ptp_sdr_currentutcoffset = -1;
-static int hf_ptp_sdr_grandmastercommunicationtechnology = -1;
-static int hf_ptp_sdr_grandmasterclockuuid = -1;
-static int hf_ptp_sdr_grandmasterportid = -1;
-static int hf_ptp_sdr_grandmastersequenceid = -1;
-static int hf_ptp_sdr_grandmasterclockstratum = -1;
-static int hf_ptp_sdr_grandmasterclockidentifier = -1;
-static int hf_ptp_sdr_grandmasterclockvariance = -1;
-static int hf_ptp_sdr_grandmasterpreferred = -1;
-static int hf_ptp_sdr_grandmasterisboundaryclock = -1;
-static int hf_ptp_sdr_syncinterval = -1;
-static int hf_ptp_sdr_localclockvariance = -1;
-static int hf_ptp_sdr_localstepsremoved = -1;
-static int hf_ptp_sdr_localclockstratum = -1;
-static int hf_ptp_sdr_localclockidentifier = -1;
-static int hf_ptp_sdr_parentcommunicationtechnology = -1;
-static int hf_ptp_sdr_parentuuid = -1;
-static int hf_ptp_sdr_parentportfield = -1;
-static int hf_ptp_sdr_estimatedmastervariance = -1;
-static int hf_ptp_sdr_estimatedmasterdrift = -1;
-static int hf_ptp_sdr_utcreasonable = -1;
+static int hf_ptp_sdr_origintimestamp; /* Field for seconds & nanoseconds */
+static int hf_ptp_sdr_origintimestamp_seconds;
+static int hf_ptp_sdr_origintimestamp_nanoseconds;
+static int hf_ptp_sdr_epochnumber;
+static int hf_ptp_sdr_currentutcoffset;
+static int hf_ptp_sdr_grandmastercommunicationtechnology;
+static int hf_ptp_sdr_grandmasterclockuuid;
+static int hf_ptp_sdr_grandmasterportid;
+static int hf_ptp_sdr_grandmastersequenceid;
+static int hf_ptp_sdr_grandmasterclockstratum;
+static int hf_ptp_sdr_grandmasterclockidentifier;
+static int hf_ptp_sdr_grandmasterclockvariance;
+static int hf_ptp_sdr_grandmasterpreferred;
+static int hf_ptp_sdr_grandmasterisboundaryclock;
+static int hf_ptp_sdr_syncinterval;
+static int hf_ptp_sdr_localclockvariance;
+static int hf_ptp_sdr_localstepsremoved;
+static int hf_ptp_sdr_localclockstratum;
+static int hf_ptp_sdr_localclockidentifier;
+static int hf_ptp_sdr_parentcommunicationtechnology;
+static int hf_ptp_sdr_parentuuid;
+static int hf_ptp_sdr_parentportfield;
+static int hf_ptp_sdr_estimatedmastervariance;
+static int hf_ptp_sdr_estimatedmasterdrift;
+static int hf_ptp_sdr_utcreasonable;
 
 /* Fields for follow_up (=fu) messages */
-static int hf_ptp_fu_associatedsequenceid = -1;
-static int hf_ptp_fu_preciseorigintimestamp = -1;
-static int hf_ptp_fu_preciseorigintimestamp_seconds = -1;
-static int hf_ptp_fu_preciseorigintimestamp_nanoseconds = -1;
+static int hf_ptp_fu_associatedsequenceid;
+static int hf_ptp_fu_preciseorigintimestamp;
+static int hf_ptp_fu_preciseorigintimestamp_seconds;
+static int hf_ptp_fu_preciseorigintimestamp_nanoseconds;
 
 /* Fields for delay_resp (=dr) messages */
-static int hf_ptp_dr_delayreceipttimestamp = -1;
-static int hf_ptp_dr_delayreceipttimestamp_seconds = -1;
-static int hf_ptp_dr_delayreceipttimestamp_nanoseconds = -1;
-static int hf_ptp_dr_requestingsourcecommunicationtechnology = -1;
-static int hf_ptp_dr_requestingsourceuuid = -1;
-static int hf_ptp_dr_requestingsourceportid = -1;
-static int hf_ptp_dr_requestingsourcesequenceid = -1;
+static int hf_ptp_dr_delayreceipttimestamp;
+static int hf_ptp_dr_delayreceipttimestamp_seconds;
+static int hf_ptp_dr_delayreceipttimestamp_nanoseconds;
+static int hf_ptp_dr_requestingsourcecommunicationtechnology;
+static int hf_ptp_dr_requestingsourceuuid;
+static int hf_ptp_dr_requestingsourceportid;
+static int hf_ptp_dr_requestingsourcesequenceid;
 
 /* Fields for management (=mm) messages */
-static int hf_ptp_mm_targetcommunicationtechnology = -1;
-static int hf_ptp_mm_targetuuid = -1;
-static int hf_ptp_mm_targetportid = -1;
-static int hf_ptp_mm_startingboundaryhops = -1;
-static int hf_ptp_mm_boundaryhops = -1;
-static int hf_ptp_mm_managementmessagekey = -1;
-static int hf_ptp_mm_parameterlength = -1;
+static int hf_ptp_mm_targetcommunicationtechnology;
+static int hf_ptp_mm_targetuuid;
+static int hf_ptp_mm_targetportid;
+static int hf_ptp_mm_startingboundaryhops;
+static int hf_ptp_mm_boundaryhops;
+static int hf_ptp_mm_managementmessagekey;
+static int hf_ptp_mm_parameterlength;
     /* parameterlength > 0 */
-/* static int hf_ptp_mm_messageparameters = -1; */
+/* static int hf_ptp_mm_messageparameters; */
     /* ptp_mm_clock_identity (parameterlength = 64) */
-static int hf_ptp_mm_clock_identity_clockcommunicationtechnology = -1;
-static int hf_ptp_mm_clock_identity_clockuuidfield = -1;
-static int hf_ptp_mm_clock_identity_clockportfield = -1;
-static int hf_ptp_mm_clock_identity_manufactureridentity = -1;
+static int hf_ptp_mm_clock_identity_clockcommunicationtechnology;
+static int hf_ptp_mm_clock_identity_clockuuidfield;
+static int hf_ptp_mm_clock_identity_clockportfield;
+static int hf_ptp_mm_clock_identity_manufactureridentity;
 
     /* ptp_mm_initialize_clock (parameterlength = 4) */
-static int hf_ptp_mm_initialize_clock_initialisationkey = -1;
+static int hf_ptp_mm_initialize_clock_initialisationkey;
 
     /* ptp_mm_set_subdomain (parameterlength = 16) */
-static int hf_ptp_mm_set_subdomain_subdomainname = -1;
+static int hf_ptp_mm_set_subdomain_subdomainname;
 
     /* ptp_mm_default_data_set (parameterlength = 76) */
-static int hf_ptp_mm_default_data_set_clockcommunicationtechnology = -1;
-static int hf_ptp_mm_default_data_set_clockuuidfield = -1;
-static int hf_ptp_mm_default_data_set_clockportfield = -1;
-static int hf_ptp_mm_default_data_set_clockstratum = -1;
-static int hf_ptp_mm_default_data_set_clockidentifier = -1;
-static int hf_ptp_mm_default_data_set_clockvariance = -1;
-static int hf_ptp_mm_default_data_set_clockfollowupcapable = -1;
-static int hf_ptp_mm_default_data_set_preferred = -1;
-static int hf_ptp_mm_default_data_set_initializable = -1;
-static int hf_ptp_mm_default_data_set_externaltiming = -1;
-static int hf_ptp_mm_default_data_set_isboundaryclock = -1;
-static int hf_ptp_mm_default_data_set_syncinterval = -1;
-static int hf_ptp_mm_default_data_set_subdomainname = -1;
-static int hf_ptp_mm_default_data_set_numberports = -1;
-static int hf_ptp_mm_default_data_set_numberforeignrecords = -1;
+static int hf_ptp_mm_default_data_set_clockcommunicationtechnology;
+static int hf_ptp_mm_default_data_set_clockuuidfield;
+static int hf_ptp_mm_default_data_set_clockportfield;
+static int hf_ptp_mm_default_data_set_clockstratum;
+static int hf_ptp_mm_default_data_set_clockidentifier;
+static int hf_ptp_mm_default_data_set_clockvariance;
+static int hf_ptp_mm_default_data_set_clockfollowupcapable;
+static int hf_ptp_mm_default_data_set_preferred;
+static int hf_ptp_mm_default_data_set_initializable;
+static int hf_ptp_mm_default_data_set_externaltiming;
+static int hf_ptp_mm_default_data_set_isboundaryclock;
+static int hf_ptp_mm_default_data_set_syncinterval;
+static int hf_ptp_mm_default_data_set_subdomainname;
+static int hf_ptp_mm_default_data_set_numberports;
+static int hf_ptp_mm_default_data_set_numberforeignrecords;
 
     /* ptp_mm_update_default_data_set (parameterlength = 36) */
-static int hf_ptp_mm_update_default_data_set_clockstratum = -1;
-static int hf_ptp_mm_update_default_data_set_clockidentifier = -1;
-static int hf_ptp_mm_update_default_data_set_clockvariance = -1;
-static int hf_ptp_mm_update_default_data_set_preferred = -1;
-static int hf_ptp_mm_update_default_data_set_syncinterval = -1;
-static int hf_ptp_mm_update_default_data_set_subdomainname = -1;
+static int hf_ptp_mm_update_default_data_set_clockstratum;
+static int hf_ptp_mm_update_default_data_set_clockidentifier;
+static int hf_ptp_mm_update_default_data_set_clockvariance;
+static int hf_ptp_mm_update_default_data_set_preferred;
+static int hf_ptp_mm_update_default_data_set_syncinterval;
+static int hf_ptp_mm_update_default_data_set_subdomainname;
 
     /* ptp_mm_current_data_set (parameterlength = 20) */
-static int hf_ptp_mm_current_data_set_stepsremoved = -1;
-static int hf_ptp_mm_current_data_set_offsetfrommaster = -1;
-static int hf_ptp_mm_current_data_set_offsetfrommasterseconds = -1;
-static int hf_ptp_mm_current_data_set_offsetfrommasternanoseconds = -1;
-static int hf_ptp_mm_current_data_set_onewaydelay = -1;
-static int hf_ptp_mm_current_data_set_onewaydelayseconds = -1;
-static int hf_ptp_mm_current_data_set_onewaydelaynanoseconds = -1;
+static int hf_ptp_mm_current_data_set_stepsremoved;
+static int hf_ptp_mm_current_data_set_offsetfrommaster;
+static int hf_ptp_mm_current_data_set_offsetfrommasterseconds;
+static int hf_ptp_mm_current_data_set_offsetfrommasternanoseconds;
+static int hf_ptp_mm_current_data_set_onewaydelay;
+static int hf_ptp_mm_current_data_set_onewaydelayseconds;
+static int hf_ptp_mm_current_data_set_onewaydelaynanoseconds;
 
     /* ptp_mm_parent_data_set (parameterlength = 90) */
-static int hf_ptp_mm_parent_data_set_parentcommunicationtechnology = -1;
-static int hf_ptp_mm_parent_data_set_parentuuid = -1;
-static int hf_ptp_mm_parent_data_set_parentportid = -1;
-static int hf_ptp_mm_parent_data_set_parentlastsyncsequencenumber = -1;
-static int hf_ptp_mm_parent_data_set_parentfollowupcapable = -1;
-static int hf_ptp_mm_parent_data_set_parentexternaltiming = -1;
-static int hf_ptp_mm_parent_data_set_parentvariance = -1;
-static int hf_ptp_mm_parent_data_set_parentstats = -1;
-static int hf_ptp_mm_parent_data_set_observedvariance = -1;
-static int hf_ptp_mm_parent_data_set_observeddrift = -1;
-static int hf_ptp_mm_parent_data_set_utcreasonable = -1;
-static int hf_ptp_mm_parent_data_set_grandmastercommunicationtechnology = -1;
-static int hf_ptp_mm_parent_data_set_grandmasteruuidfield = -1;
-static int hf_ptp_mm_parent_data_set_grandmasterportidfield = -1;
-static int hf_ptp_mm_parent_data_set_grandmasterstratum = -1;
-static int hf_ptp_mm_parent_data_set_grandmasteridentifier = -1;
-static int hf_ptp_mm_parent_data_set_grandmastervariance = -1;
-static int hf_ptp_mm_parent_data_set_grandmasterpreferred = -1;
-static int hf_ptp_mm_parent_data_set_grandmasterisboundaryclock = -1;
-static int hf_ptp_mm_parent_data_set_grandmastersequencenumber = -1;
+static int hf_ptp_mm_parent_data_set_parentcommunicationtechnology;
+static int hf_ptp_mm_parent_data_set_parentuuid;
+static int hf_ptp_mm_parent_data_set_parentportid;
+static int hf_ptp_mm_parent_data_set_parentlastsyncsequencenumber;
+static int hf_ptp_mm_parent_data_set_parentfollowupcapable;
+static int hf_ptp_mm_parent_data_set_parentexternaltiming;
+static int hf_ptp_mm_parent_data_set_parentvariance;
+static int hf_ptp_mm_parent_data_set_parentstats;
+static int hf_ptp_mm_parent_data_set_observedvariance;
+static int hf_ptp_mm_parent_data_set_observeddrift;
+static int hf_ptp_mm_parent_data_set_utcreasonable;
+static int hf_ptp_mm_parent_data_set_grandmastercommunicationtechnology;
+static int hf_ptp_mm_parent_data_set_grandmasteruuidfield;
+static int hf_ptp_mm_parent_data_set_grandmasterportidfield;
+static int hf_ptp_mm_parent_data_set_grandmasterstratum;
+static int hf_ptp_mm_parent_data_set_grandmasteridentifier;
+static int hf_ptp_mm_parent_data_set_grandmastervariance;
+static int hf_ptp_mm_parent_data_set_grandmasterpreferred;
+static int hf_ptp_mm_parent_data_set_grandmasterisboundaryclock;
+static int hf_ptp_mm_parent_data_set_grandmastersequencenumber;
 
     /* ptp_mm_port_data_set (parameterlength = 52) */
-static int hf_ptp_mm_port_data_set_returnedportnumber = -1;
-static int hf_ptp_mm_port_data_set_portstate = -1;
-static int hf_ptp_mm_port_data_set_lastsynceventsequencenumber = -1;
-static int hf_ptp_mm_port_data_set_lastgeneraleventsequencenumber = -1;
-static int hf_ptp_mm_port_data_set_portcommunicationtechnology = -1;
-static int hf_ptp_mm_port_data_set_portuuidfield = -1;
-static int hf_ptp_mm_port_data_set_portidfield = -1;
-static int hf_ptp_mm_port_data_set_burstenabled = -1;
-static int hf_ptp_mm_port_data_set_subdomainaddressoctets = -1;
-static int hf_ptp_mm_port_data_set_eventportaddressoctets = -1;
-static int hf_ptp_mm_port_data_set_generalportaddressoctets = -1;
-static int hf_ptp_mm_port_data_set_subdomainaddress = -1;
-static int hf_ptp_mm_port_data_set_eventportaddress = -1;
-static int hf_ptp_mm_port_data_set_generalportaddress = -1;
+static int hf_ptp_mm_port_data_set_returnedportnumber;
+static int hf_ptp_mm_port_data_set_portstate;
+static int hf_ptp_mm_port_data_set_lastsynceventsequencenumber;
+static int hf_ptp_mm_port_data_set_lastgeneraleventsequencenumber;
+static int hf_ptp_mm_port_data_set_portcommunicationtechnology;
+static int hf_ptp_mm_port_data_set_portuuidfield;
+static int hf_ptp_mm_port_data_set_portidfield;
+static int hf_ptp_mm_port_data_set_burstenabled;
+static int hf_ptp_mm_port_data_set_subdomainaddressoctets;
+static int hf_ptp_mm_port_data_set_eventportaddressoctets;
+static int hf_ptp_mm_port_data_set_generalportaddressoctets;
+static int hf_ptp_mm_port_data_set_subdomainaddress;
+static int hf_ptp_mm_port_data_set_eventportaddress;
+static int hf_ptp_mm_port_data_set_generalportaddress;
 
     /* ptp_mm_global_time_data_set (parameterlength = 24) */
-static int hf_ptp_mm_global_time_data_set_localtime = -1;
-static int hf_ptp_mm_global_time_data_set_localtimeseconds = -1;
-static int hf_ptp_mm_global_time_data_set_localtimenanoseconds = -1;
-static int hf_ptp_mm_global_time_data_set_currentutcoffset = -1;
-static int hf_ptp_mm_global_time_data_set_leap59 = -1;
-static int hf_ptp_mm_global_time_data_set_leap61 = -1;
-static int hf_ptp_mm_global_time_data_set_epochnumber = -1;
+static int hf_ptp_mm_global_time_data_set_localtime;
+static int hf_ptp_mm_global_time_data_set_localtimeseconds;
+static int hf_ptp_mm_global_time_data_set_localtimenanoseconds;
+static int hf_ptp_mm_global_time_data_set_currentutcoffset;
+static int hf_ptp_mm_global_time_data_set_leap59;
+static int hf_ptp_mm_global_time_data_set_leap61;
+static int hf_ptp_mm_global_time_data_set_epochnumber;
 
     /* ptp_mm_update_global_time_properties (parameterlength = 16) */
-static int hf_ptp_mm_update_global_time_properties_currentutcoffset = -1;
-static int hf_ptp_mm_update_global_time_properties_leap59 = -1;
-static int hf_ptp_mm_update_global_time_properties_leap61 = -1;
-/* static int hf_ptp_mm_update_global_time_properties_epochnumber = -1; */
+static int hf_ptp_mm_update_global_time_properties_currentutcoffset;
+static int hf_ptp_mm_update_global_time_properties_leap59;
+static int hf_ptp_mm_update_global_time_properties_leap61;
+/* static int hf_ptp_mm_update_global_time_properties_epochnumber; */
 
     /* ptp_mm_get_foreign_data_set (parameterlength = 4) */
-static int hf_ptp_mm_get_foreign_data_set_recordkey = -1;
+static int hf_ptp_mm_get_foreign_data_set_recordkey;
 
     /* ptp_mm_foreign_data_set (parameterlength = 28) */
-static int hf_ptp_mm_foreign_data_set_returnedportnumber = -1;
-static int hf_ptp_mm_foreign_data_set_returnedrecordnumber = -1;
-static int hf_ptp_mm_foreign_data_set_foreignmastercommunicationtechnology = -1;
-static int hf_ptp_mm_foreign_data_set_foreignmasteruuidfield = -1;
-static int hf_ptp_mm_foreign_data_set_foreignmasterportidfield = -1;
-static int hf_ptp_mm_foreign_data_set_foreignmastersyncs = -1;
+static int hf_ptp_mm_foreign_data_set_returnedportnumber;
+static int hf_ptp_mm_foreign_data_set_returnedrecordnumber;
+static int hf_ptp_mm_foreign_data_set_foreignmastercommunicationtechnology;
+static int hf_ptp_mm_foreign_data_set_foreignmasteruuidfield;
+static int hf_ptp_mm_foreign_data_set_foreignmasterportidfield;
+static int hf_ptp_mm_foreign_data_set_foreignmastersyncs;
 
     /* ptp_mm_set_sync_interval (parameterlength = 4) */
-static int hf_ptp_mm_set_sync_interval_syncinterval = -1;
+static int hf_ptp_mm_set_sync_interval_syncinterval;
 
     /* ptp_mm_set_time (parameterlength = 8) */
-static int hf_ptp_mm_set_time_localtime = -1;
-static int hf_ptp_mm_set_time_localtimeseconds = -1;
-static int hf_ptp_mm_set_time_localtimenanoseconds = -1;
+static int hf_ptp_mm_set_time_localtime;
+static int hf_ptp_mm_set_time_localtimeseconds;
+static int hf_ptp_mm_set_time_localtimenanoseconds;
 
 /* END Initialize the protocol and registered fields */
 
 /* Initialize the subtree pointers */
-static gint ett_ptp = -1;
-static gint ett_ptp_flags = -1;
-static gint ett_ptp_time = -1;
-static gint ett_ptp_time2 = -1;
+static gint ett_ptp;
+static gint ett_ptp_flags;
+static gint ett_ptp_time;
+static gint ett_ptp_time2;
 
 /* END Definitions and fields for PTPv1 dissection. */
 
@@ -1508,426 +1508,426 @@ static const value_string ptpv2_majorsdoid_vals[] = {
 /* Initialize the protocol and registered fields          */
 /**********************************************************/
 
-static int hf_ptp_v2_majorsdoid = -1;
-static int hf_ptp_v2_messagetype = -1;
-static int hf_ptp_v2_minorversionptp = -1;
-static int hf_ptp_v2_versionptp = -1;
-static int hf_ptp_v2_messagelength = -1;
-static int hf_ptp_v2_minorsdoid = -1;
-static int hf_ptp_v2_domainnumber = -1;
-static int hf_ptp_v2_flags = -1;
-static int hf_ptp_v2_flags_alternatemaster = -1;
-static int hf_ptp_v2_flags_twostep = -1;
-static int hf_ptp_v2_flags_unicast = -1;
-static int hf_ptp_v2_flags_specific1 = -1;
-static int hf_ptp_v2_flags_specific2 = -1;
-static int hf_ptp_v2_flags_security = -1;
-static int hf_ptp_v2_flags_li61 = -1;
-static int hf_ptp_v2_flags_li59 = -1;
-static int hf_ptp_v2_flags_utcoffsetvalid = -1;
-static int hf_ptp_v2_flags_ptptimescale = -1;
-static int hf_ptp_v2_flags_timetraceable = -1;
-static int hf_ptp_v2_flags_frequencytraceable = -1;
-static int hf_ptp_v2_correction = -1;
-static int hf_ptp_v2_correctionsubns = -1;
-static int hf_ptp_v2_messagetypespecific = -1;
-static int hf_ptp_v2_clockidentity = -1;
-static int hf_ptp_v2_clockidentity_manuf = -1;
-static int hf_ptp_v2_sourceportid = -1;
-static int hf_ptp_v2_sequenceid = -1;
-static int hf_ptp_v2_controlfield = -1;
-static int hf_ptp_v2_controlfield_default = -1;
-static int hf_ptp_v2_logmessageperiod = -1;
-static int hf_ptp_v2_flags_synchronizationUncertain = -1;
+static int hf_ptp_v2_majorsdoid;
+static int hf_ptp_v2_messagetype;
+static int hf_ptp_v2_minorversionptp;
+static int hf_ptp_v2_versionptp;
+static int hf_ptp_v2_messagelength;
+static int hf_ptp_v2_minorsdoid;
+static int hf_ptp_v2_domainnumber;
+static int hf_ptp_v2_flags;
+static int hf_ptp_v2_flags_alternatemaster;
+static int hf_ptp_v2_flags_twostep;
+static int hf_ptp_v2_flags_unicast;
+static int hf_ptp_v2_flags_specific1;
+static int hf_ptp_v2_flags_specific2;
+static int hf_ptp_v2_flags_security;
+static int hf_ptp_v2_flags_li61;
+static int hf_ptp_v2_flags_li59;
+static int hf_ptp_v2_flags_utcoffsetvalid;
+static int hf_ptp_v2_flags_ptptimescale;
+static int hf_ptp_v2_flags_timetraceable;
+static int hf_ptp_v2_flags_frequencytraceable;
+static int hf_ptp_v2_correction;
+static int hf_ptp_v2_correctionsubns;
+static int hf_ptp_v2_messagetypespecific;
+static int hf_ptp_v2_clockidentity;
+static int hf_ptp_v2_clockidentity_manuf;
+static int hf_ptp_v2_sourceportid;
+static int hf_ptp_v2_sequenceid;
+static int hf_ptp_v2_controlfield;
+static int hf_ptp_v2_controlfield_default;
+static int hf_ptp_v2_logmessageperiod;
+static int hf_ptp_v2_flags_synchronizationUncertain;
 
 
 /* Fields for PTP_Announce (=an) messages */
-/* static int hf_ptp_v2_an_origintimestamp = -1; */   /* Field for seconds & nanoseconds */
-static int hf_ptp_v2_an_origintimestamp_seconds = -1;
-static int hf_ptp_v2_an_origintimestamp_nanoseconds = -1;
-static int hf_ptp_v2_an_origincurrentutcoffset = -1;
-static int hf_ptp_v2_an_timesource = -1;
-static int hf_ptp_v2_an_localstepsremoved = -1;
-static int hf_ptp_v2_an_grandmasterclockidentity = -1;
-static int hf_ptp_v2_an_grandmasterclockclass = -1;
-static int hf_ptp_v2_an_grandmasterclockaccuracy = -1;
-static int hf_ptp_v2_an_grandmasterclockvariance = -1;
-static int hf_ptp_v2_an_priority1 = -1;
-static int hf_ptp_v2_an_priority2 = -1;
+/* static int hf_ptp_v2_an_origintimestamp; */   /* Field for seconds & nanoseconds */
+static int hf_ptp_v2_an_origintimestamp_seconds;
+static int hf_ptp_v2_an_origintimestamp_nanoseconds;
+static int hf_ptp_v2_an_origincurrentutcoffset;
+static int hf_ptp_v2_an_timesource;
+static int hf_ptp_v2_an_localstepsremoved;
+static int hf_ptp_v2_an_grandmasterclockidentity;
+static int hf_ptp_v2_an_grandmasterclockclass;
+static int hf_ptp_v2_an_grandmasterclockaccuracy;
+static int hf_ptp_v2_an_grandmasterclockvariance;
+static int hf_ptp_v2_an_priority1;
+static int hf_ptp_v2_an_priority2;
 
 /* Fields for PTP_Announce TLVs */
-static int hf_ptp_v2_an_tlv_tlvtype = -1;
-static int hf_ptp_v2_an_tlv_lengthfield = -1;
+static int hf_ptp_v2_an_tlv_tlvtype;
+static int hf_ptp_v2_an_tlv_lengthfield;
 /* Fields for the ORGANIZATION_EXTENSION TLV */
-static int hf_ptp_v2_oe_tlv_organizationid = -1;
-static int hf_ptp_v2_oe_tlv_organizationsubtype = -1;
-static int hf_ptp_v2_oe_tlv_2017_organizationsubtype = -1;
-static int hf_ptp_v2_oe_tlv_datafield = -1;
+static int hf_ptp_v2_oe_tlv_organizationid;
+static int hf_ptp_v2_oe_tlv_organizationsubtype;
+static int hf_ptp_v2_oe_tlv_2017_organizationsubtype;
+static int hf_ptp_v2_oe_tlv_datafield;
 
 /* Fields for CERN White Rabbit TLV (OE TLV subtype) */
-static int hf_ptp_v2_an_tlv_oe_cern_subtype = -1;
-static int hf_ptp_v2_an_tlv_oe_cern_wrMessageID = -1;
-static int hf_ptp_v2_an_tlv_oe_cern_wrFlags = -1;
-static int hf_ptp_v2_an_tlv_oe_cern_wrFlags_wrConfig = -1;
-static int hf_ptp_v2_an_tlv_oe_cern_wrFlags_calibrated = -1;
-static int hf_ptp_v2_an_tlv_oe_cern_wrFlags_wrModeOn = -1;
+static int hf_ptp_v2_an_tlv_oe_cern_subtype;
+static int hf_ptp_v2_an_tlv_oe_cern_wrMessageID;
+static int hf_ptp_v2_an_tlv_oe_cern_wrFlags;
+static int hf_ptp_v2_an_tlv_oe_cern_wrFlags_wrConfig;
+static int hf_ptp_v2_an_tlv_oe_cern_wrFlags_calibrated;
+static int hf_ptp_v2_an_tlv_oe_cern_wrFlags_wrModeOn;
 
 /* Fields for IEEE_C37_238 TLV (OE TLV subtype) */
-static int hf_ptp_v2_oe_tlv_subtype_c37238tlv_grandmasterid = -1;
-static int hf_ptp_v2_oe_tlv_subtype_c37238tlv_grandmastertimeinaccuracy = -1;
-static int hf_ptp_v2_oe_tlv_subtype_c37238tlv_networktimeinaccuracy = -1;
-static int hf_ptp_v2_oe_tlv_subtype_c37238tlv_reserved = -1;
+static int hf_ptp_v2_oe_tlv_subtype_c37238tlv_grandmasterid;
+static int hf_ptp_v2_oe_tlv_subtype_c37238tlv_grandmastertimeinaccuracy;
+static int hf_ptp_v2_oe_tlv_subtype_c37238tlv_networktimeinaccuracy;
+static int hf_ptp_v2_oe_tlv_subtype_c37238tlv_reserved;
 
 /* Additional Fields for IEEE_C37_238-2017 TLV (OE TLV subtype) */
-static int hf_ptp_v2_oe_tlv_subtype_c372382017tlv_reserved = -1;
-static int hf_ptp_v2_oe_tlv_subtype_c37238tlv_totaltimeinaccuracy = -1;
+static int hf_ptp_v2_oe_tlv_subtype_c372382017tlv_reserved;
+static int hf_ptp_v2_oe_tlv_subtype_c37238tlv_totaltimeinaccuracy;
 
 /* Fields for SMPTE TLV (OE TLV subtype) */
-static int hf_ptp_v2_oe_tlv_smpte_subtype = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_data = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_defaultsystemframerate = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_defaultsystemframerate_numerator = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_defaultsystemframerate_denominator = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_masterlockingstatus = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_timeaddressflags = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_timeaddressflags_drop = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_timeaddressflags_color = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_currentlocaloffset = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_jumpseconds = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_timeofnextjump = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_timeofnextjam = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_timeofpreviousjam = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_previousjamlocaloffset = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_daylightsaving = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_daylightsaving_current = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_daylightsaving_next = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_daylightsaving_previous = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_leapsecondjump = -1;
-static int hf_ptp_v2_oe_tlv_subtype_smpte_leapsecondjump_change = -1;
+static int hf_ptp_v2_oe_tlv_smpte_subtype;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_data;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_defaultsystemframerate;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_defaultsystemframerate_numerator;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_defaultsystemframerate_denominator;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_masterlockingstatus;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_timeaddressflags;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_timeaddressflags_drop;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_timeaddressflags_color;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_currentlocaloffset;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_jumpseconds;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_timeofnextjump;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_timeofnextjam;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_timeofpreviousjam;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_previousjamlocaloffset;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_daylightsaving;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_daylightsaving_current;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_daylightsaving_next;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_daylightsaving_previous;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_leapsecondjump;
+static int hf_ptp_v2_oe_tlv_subtype_smpte_leapsecondjump_change;
 /* Fields for the ALTERNATE_TIME_OFFSET_INDICATOR TLV */
-static int hf_ptp_v2_atoi_tlv_keyfield = -1;
-static int hf_ptp_v2_atoi_tlv_currentoffset = -1;
-static int hf_ptp_v2_atoi_tlv_jumpseconds = -1;
-static int hf_ptp_v2_atoi_tlv_timeofnextjump = -1;
-static int hf_ptp_v2_atoi_tlv_displayname = -1;
-static int hf_ptp_v2_atoi_tlv_displayname_length = -1;
+static int hf_ptp_v2_atoi_tlv_keyfield;
+static int hf_ptp_v2_atoi_tlv_currentoffset;
+static int hf_ptp_v2_atoi_tlv_jumpseconds;
+static int hf_ptp_v2_atoi_tlv_timeofnextjump;
+static int hf_ptp_v2_atoi_tlv_displayname;
+static int hf_ptp_v2_atoi_tlv_displayname_length;
 /* Field for the PATH TRACE TLV */
-static int hf_ptp_v2_an_tlv_pathsequence = -1;
+static int hf_ptp_v2_an_tlv_pathsequence;
 
 /* Fields for an undissected TLV */
-static int hf_ptp_v2_an_tlv_data = -1;
+static int hf_ptp_v2_an_tlv_data;
 
 /* Fields for PTP_Sync AND PTP_DelayRequest (=sdr) messages */
-/* static int hf_ptp_v2_sdr_origintimestamp = -1; */  /* Field for seconds & nanoseconds */
-static int hf_ptp_v2_sdr_origintimestamp_seconds = -1;
-static int hf_ptp_v2_sdr_origintimestamp_nanoseconds = -1;
-static int hf_ptp_v2_sync_reserved = -1;
+/* static int hf_ptp_v2_sdr_origintimestamp; */  /* Field for seconds & nanoseconds */
+static int hf_ptp_v2_sdr_origintimestamp_seconds;
+static int hf_ptp_v2_sdr_origintimestamp_nanoseconds;
+static int hf_ptp_v2_sync_reserved;
 
 
 /* Fields for PTP_Follow_Up (=fu) messages */
-/* static int hf_ptp_v2_fu_preciseorigintimestamp = -1; */    /* Field for seconds & nanoseconds */
-static int hf_ptp_v2_fu_preciseorigintimestamp_seconds = -1;
-static int hf_ptp_v2_fu_preciseorigintimestamp_nanoseconds = -1;
-static int hf_ptp_v2_fu_preciseorigintimestamp_32bit = -1;
+/* static int hf_ptp_v2_fu_preciseorigintimestamp; */    /* Field for seconds & nanoseconds */
+static int hf_ptp_v2_fu_preciseorigintimestamp_seconds;
+static int hf_ptp_v2_fu_preciseorigintimestamp_nanoseconds;
+static int hf_ptp_v2_fu_preciseorigintimestamp_32bit;
 /* Fields for the Follow_Up Information TLV */
-static int hf_ptp_as_fu_tlv_tlvtype = -1;
-static int hf_ptp_as_fu_tlv_lengthfield = -1;
-static int hf_ptp_as_fu_tlv_organization_id = -1;
-static int hf_ptp_as_fu_tlv_organization_subtype = -1;
-static int hf_ptp_as_fu_tlv_cumulative_offset = -1;
-static int hf_ptp_as_fu_tlv_gm_base_indicator = -1;
-static int hf_ptp_as_fu_tlv_last_gm_phase_change = -1;
-static int hf_ptp_as_fu_tlv_scaled_last_gm_freq_change = -1;
+static int hf_ptp_as_fu_tlv_tlvtype;
+static int hf_ptp_as_fu_tlv_lengthfield;
+static int hf_ptp_as_fu_tlv_organization_id;
+static int hf_ptp_as_fu_tlv_organization_subtype;
+static int hf_ptp_as_fu_tlv_cumulative_offset;
+static int hf_ptp_as_fu_tlv_gm_base_indicator;
+static int hf_ptp_as_fu_tlv_last_gm_phase_change;
+static int hf_ptp_as_fu_tlv_scaled_last_gm_freq_change;
 
 /* Fields for PTP_DelayResponse (=dr) messages */
-/* static int hf_ptp_v2_dr_receivetimestamp = -1; */ /* Field for seconds & nanoseconds */
-static int hf_ptp_v2_dr_receivetimestamp_seconds = -1;
-static int hf_ptp_v2_dr_receivetimestamp_nanoseconds = -1;
-static int hf_ptp_v2_dr_requestingportidentity = -1;
-static int hf_ptp_v2_dr_requestingsourceportid = -1;
+/* static int hf_ptp_v2_dr_receivetimestamp; */ /* Field for seconds & nanoseconds */
+static int hf_ptp_v2_dr_receivetimestamp_seconds;
+static int hf_ptp_v2_dr_receivetimestamp_nanoseconds;
+static int hf_ptp_v2_dr_requestingportidentity;
+static int hf_ptp_v2_dr_requestingsourceportid;
 
 
 /* Fields for PTP_PDelayRequest (=pdrq) messages */
-/* static int hf_ptp_v2_pdrq_origintimestamp = -1; */ /* Field for seconds & nanoseconds */
-static int hf_ptp_v2_pdrq_origintimestamp_seconds = -1;
-static int hf_ptp_v2_pdrq_origintimestamp_nanoseconds = -1;
+/* static int hf_ptp_v2_pdrq_origintimestamp; */ /* Field for seconds & nanoseconds */
+static int hf_ptp_v2_pdrq_origintimestamp_seconds;
+static int hf_ptp_v2_pdrq_origintimestamp_nanoseconds;
 
 
 /* Fields for PTP_PDelayResponse (=pdrs) messages */
-/* static int hf_ptp_v2_pdrs_requestreceipttimestamp = -1; */ /* Field for seconds & nanoseconds */
-static int hf_ptp_v2_pdrs_requestreceipttimestamp_seconds = -1;
-static int hf_ptp_v2_pdrs_requestreceipttimestamp_nanoseconds = -1;
-static int hf_ptp_v2_pdrs_requestingportidentity = -1;
-static int hf_ptp_v2_pdrs_requestingsourceportid = -1;
+/* static int hf_ptp_v2_pdrs_requestreceipttimestamp; */ /* Field for seconds & nanoseconds */
+static int hf_ptp_v2_pdrs_requestreceipttimestamp_seconds;
+static int hf_ptp_v2_pdrs_requestreceipttimestamp_nanoseconds;
+static int hf_ptp_v2_pdrs_requestingportidentity;
+static int hf_ptp_v2_pdrs_requestingsourceportid;
 
 
 /* Fields for PTP_PDelayResponseFollowUp (=pdfu) messages */
-/* static int hf_ptp_v2_pdfu_responseorigintimestamp = -1; */ /* Field for seconds & nanoseconds */
-static int hf_ptp_v2_pdfu_responseorigintimestamp_seconds = -1;
-static int hf_ptp_v2_pdfu_responseorigintimestamp_nanoseconds = -1;
-static int hf_ptp_v2_pdfu_requestingportidentity = -1;
-static int hf_ptp_v2_pdfu_requestingsourceportid = -1;
+/* static int hf_ptp_v2_pdfu_responseorigintimestamp; */ /* Field for seconds & nanoseconds */
+static int hf_ptp_v2_pdfu_responseorigintimestamp_seconds;
+static int hf_ptp_v2_pdfu_responseorigintimestamp_nanoseconds;
+static int hf_ptp_v2_pdfu_requestingportidentity;
+static int hf_ptp_v2_pdfu_requestingsourceportid;
 
 
 /* Fields for PTP_Signalling (=sig) messages */
-static int hf_ptp_v2_sig_targetportidentity         = -1;
-static int hf_ptp_v2_sig_targetportid               = -1;
-static int hf_ptp_v2_sig_tlv_tlvType                = -1;
-static int hf_ptp_v2_sig_tlv_lengthField            = -1;
-static int hf_ptp_v2_sig_tlv_data                   = -1;
-static int hf_ptp_v2_sig_tlv_messageType            = -1;
-static int hf_ptp_v2_sig_tlv_logInterMessagePeriod  = -1;
-static int hf_ptp_v2_sig_tlv_logInterMessagePeriod_period   = -1;
-static int hf_ptp_v2_sig_tlv_logInterMessagePeriod_rate     = -1;
-static int hf_ptp_v2_sig_tlv_durationField          = -1;
-static int hf_ptp_v2_sig_tlv_renewalInvited         = -1;
+static int hf_ptp_v2_sig_targetportidentity;
+static int hf_ptp_v2_sig_targetportid;
+static int hf_ptp_v2_sig_tlv_tlvType;
+static int hf_ptp_v2_sig_tlv_lengthField;
+static int hf_ptp_v2_sig_tlv_data;
+static int hf_ptp_v2_sig_tlv_messageType;
+static int hf_ptp_v2_sig_tlv_logInterMessagePeriod;
+static int hf_ptp_v2_sig_tlv_logInterMessagePeriod_period;
+static int hf_ptp_v2_sig_tlv_logInterMessagePeriod_rate;
+static int hf_ptp_v2_sig_tlv_durationField;
+static int hf_ptp_v2_sig_tlv_renewalInvited;
 
 /* Fields for the Message Interval Request TLV */
-static int hf_ptp_as_sig_tlv_tlvtype = -1;
-static int hf_ptp_as_sig_tlv_lengthfield = -1;
-static int hf_ptp_as_sig_tlv_organization_id = -1;
-static int hf_ptp_as_sig_tlv_organization_subtype = -1;
-static int hf_ptp_as_sig_tlv_link_delay_interval = -1;
-static int hf_ptp_as_sig_tlv_time_sync_interval = -1;
-static int hf_ptp_as_sig_tlv_announce_interval = -1;
-static int hf_ptp_as_sig_tlv_flags = -1;
-static int hf_ptp_as_sig_tlv_flags_comp_rate_ratio = -1;
-static int hf_ptp_as_sig_tlv_flags_comp_mean_link_delay = -1;
-static int hf_ptp_as_sig_tlv_flags_one_step_receive_capable = -1;
-static int hf_ptp_as_sig_tlv_gptp_capable_message_interval = -1;
+static int hf_ptp_as_sig_tlv_tlvtype;
+static int hf_ptp_as_sig_tlv_lengthfield;
+static int hf_ptp_as_sig_tlv_organization_id;
+static int hf_ptp_as_sig_tlv_organization_subtype;
+static int hf_ptp_as_sig_tlv_link_delay_interval;
+static int hf_ptp_as_sig_tlv_time_sync_interval;
+static int hf_ptp_as_sig_tlv_announce_interval;
+static int hf_ptp_as_sig_tlv_flags;
+static int hf_ptp_as_sig_tlv_flags_comp_rate_ratio;
+static int hf_ptp_as_sig_tlv_flags_comp_mean_link_delay;
+static int hf_ptp_as_sig_tlv_flags_one_step_receive_capable;
+static int hf_ptp_as_sig_tlv_gptp_capable_message_interval;
 
 /* Fields for L1SYNC TLV */
-static int hf_ptp_v2_sig_tlv_flags2 = -1;
-static int hf_ptp_v2_sig_tlv_flags3 = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags2_reserved = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags3_reserved = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags2_tcr = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags3_tcr = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags2_rcr = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags3_rcr = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags2_cr = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags3_cr = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags2_ope = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags3_ope = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags2_itc = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags3_itc = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags2_irc = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags3_irc = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags2_ic = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags3_ic = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags3_tct = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags3_pov = -1;
-static int hf_ptp_v2_sig_tlv_l1sync_flags3_fov = -1;
-static int hf_ptp_v2_sig_tlv_l1syncext_phaseOffsetTx_ns = -1;
-static int hf_ptp_v2_sig_tlv_l1syncext_phaseOffsetTx_subns = -1;
-static int hf_ptp_v2_sig_tlv_l1syncext_phaseOffsetTxTimestamp_s = -1;
-static int hf_ptp_v2_sig_tlv_l1syncext_phaseOffsetTxTimestamp_ns = -1;
-static int hf_ptp_v2_sig_tlv_l1syncext_freqOffsetTx_ns = -1;
-static int hf_ptp_v2_sig_tlv_l1syncext_freqOffsetTx_subns = -1;
-static int hf_ptp_v2_sig_tlv_l1syncext_freqOffsetTxTimestamp_s = -1;
-static int hf_ptp_v2_sig_tlv_l1syncext_freqOffsetTxTimestamp_ns = -1;
+static int hf_ptp_v2_sig_tlv_flags2;
+static int hf_ptp_v2_sig_tlv_flags3;
+static int hf_ptp_v2_sig_tlv_l1sync_flags2_reserved;
+static int hf_ptp_v2_sig_tlv_l1sync_flags3_reserved;
+static int hf_ptp_v2_sig_tlv_l1sync_flags2_tcr;
+static int hf_ptp_v2_sig_tlv_l1sync_flags3_tcr;
+static int hf_ptp_v2_sig_tlv_l1sync_flags2_rcr;
+static int hf_ptp_v2_sig_tlv_l1sync_flags3_rcr;
+static int hf_ptp_v2_sig_tlv_l1sync_flags2_cr;
+static int hf_ptp_v2_sig_tlv_l1sync_flags3_cr;
+static int hf_ptp_v2_sig_tlv_l1sync_flags2_ope;
+static int hf_ptp_v2_sig_tlv_l1sync_flags3_ope;
+static int hf_ptp_v2_sig_tlv_l1sync_flags2_itc;
+static int hf_ptp_v2_sig_tlv_l1sync_flags3_itc;
+static int hf_ptp_v2_sig_tlv_l1sync_flags2_irc;
+static int hf_ptp_v2_sig_tlv_l1sync_flags3_irc;
+static int hf_ptp_v2_sig_tlv_l1sync_flags2_ic;
+static int hf_ptp_v2_sig_tlv_l1sync_flags3_ic;
+static int hf_ptp_v2_sig_tlv_l1sync_flags3_tct;
+static int hf_ptp_v2_sig_tlv_l1sync_flags3_pov;
+static int hf_ptp_v2_sig_tlv_l1sync_flags3_fov;
+static int hf_ptp_v2_sig_tlv_l1syncext_phaseOffsetTx_ns;
+static int hf_ptp_v2_sig_tlv_l1syncext_phaseOffsetTx_subns;
+static int hf_ptp_v2_sig_tlv_l1syncext_phaseOffsetTxTimestamp_s;
+static int hf_ptp_v2_sig_tlv_l1syncext_phaseOffsetTxTimestamp_ns;
+static int hf_ptp_v2_sig_tlv_l1syncext_freqOffsetTx_ns;
+static int hf_ptp_v2_sig_tlv_l1syncext_freqOffsetTx_subns;
+static int hf_ptp_v2_sig_tlv_l1syncext_freqOffsetTxTimestamp_s;
+static int hf_ptp_v2_sig_tlv_l1syncext_freqOffsetTxTimestamp_ns;
 
 /* Fields for CERN White Rabbit TLV (OE TLV subtype) */
-static int hf_ptp_v2_sig_oe_tlv_cern_subtype = -1;
-static int hf_ptp_v2_sig_oe_tlv_cern_wrMessageID = -1;
+static int hf_ptp_v2_sig_oe_tlv_cern_subtype;
+static int hf_ptp_v2_sig_oe_tlv_cern_wrMessageID;
 
-static int hf_ptp_v2_sig_oe_tlv_cern_calSendPattern = -1;
-static int hf_ptp_v2_sig_oe_tlv_cern_calRety = -1;
-static int hf_ptp_v2_sig_oe_tlv_cern_calPeriod = -1;
-static int hf_ptp_v2_sig_oe_tlv_cern_deltaTx = -1;
-static int hf_ptp_v2_sig_oe_tlv_cern_deltaRx = -1;
+static int hf_ptp_v2_sig_oe_tlv_cern_calSendPattern;
+static int hf_ptp_v2_sig_oe_tlv_cern_calRety;
+static int hf_ptp_v2_sig_oe_tlv_cern_calPeriod;
+static int hf_ptp_v2_sig_oe_tlv_cern_deltaTx;
+static int hf_ptp_v2_sig_oe_tlv_cern_deltaRx;
 
-static int hf_ptp_v2_sig_oe_tlv_itut_subtype = -1;
-static int hf_ptp_v2_sig_tlv_interface_bit_period = -1;
-static int hf_ptp_v2_sig_tlv_numberbits_before_timestamp = -1;
-static int hf_ptp_v2_sig_tlv_numberbits_after_timestamp = -1;
+static int hf_ptp_v2_sig_oe_tlv_itut_subtype;
+static int hf_ptp_v2_sig_tlv_interface_bit_period;
+static int hf_ptp_v2_sig_tlv_numberbits_before_timestamp;
+static int hf_ptp_v2_sig_tlv_numberbits_after_timestamp;
 
 /* Fields for PTP_Management (=mm) messages */
-static int hf_ptp_v2_mm_targetportidentity = -1;
-static int hf_ptp_v2_mm_targetportid = -1;
-static int hf_ptp_v2_mm_startingboundaryhops = -1;
-static int hf_ptp_v2_mm_boundaryhops = -1;
-static int hf_ptp_v2_mm_action = -1;
+static int hf_ptp_v2_mm_targetportidentity;
+static int hf_ptp_v2_mm_targetportid;
+static int hf_ptp_v2_mm_startingboundaryhops;
+static int hf_ptp_v2_mm_boundaryhops;
+static int hf_ptp_v2_mm_action;
 
 /* management TLV */
-static int hf_ptp_v2_mm_tlvType = -1;
-static int hf_ptp_v2_mm_lengthField = -1;
-static int hf_ptp_v2_mm_managementId = -1;
-static int hf_ptp_v2_mm_data = -1;
+static int hf_ptp_v2_mm_tlvType;
+static int hf_ptp_v2_mm_lengthField;
+static int hf_ptp_v2_mm_managementId;
+static int hf_ptp_v2_mm_data;
 /* Management dataField  */
 
-static int hf_ptp_v2_mm_clockType = -1;
-static int hf_ptp_v2_mm_clockType_ordinaryClock = -1;
-static int hf_ptp_v2_mm_clockType_boundaryClock = -1;
-static int hf_ptp_v2_mm_clockType_p2p_transparentClock = -1;
-static int hf_ptp_v2_mm_clockType_e2e_transparentClock = -1;
-static int hf_ptp_v2_mm_clockType_managementNode = -1;
-static int hf_ptp_v2_mm_clockType_reserved = -1;
-static int hf_ptp_v2_mm_physicalLayerProtocol = -1;
-static int hf_ptp_v2_mm_physicalLayerProtocol_length = -1;
-static int hf_ptp_v2_mm_physicalAddressLength = -1;
-static int hf_ptp_v2_mm_physicalAddress = -1;
-static int hf_ptp_v2_mm_protocolAddress = -1;
-static int hf_ptp_v2_mm_protocolAddress_networkProtocol = -1;
-static int hf_ptp_v2_mm_protocolAddress_length = -1;
-static int hf_ptp_v2_mm_manufacturerIdentity = -1;
-
-static int hf_ptp_v2_mm_reserved = -1;
-static int hf_ptp_v2_mm_productDescription = -1;
-static int hf_ptp_v2_mm_productDescription_length = -1;
-static int hf_ptp_v2_mm_revisionData = -1;
-static int hf_ptp_v2_mm_revisionData_length = -1;
-static int hf_ptp_v2_mm_userDescription = -1;
-static int hf_ptp_v2_mm_userDescription_length = -1;
-static int hf_ptp_v2_mm_profileIdentity = -1;
-static int hf_ptp_v2_mm_pad = -1;
-
-static int hf_ptp_v2_mm_numberOfFaultRecords = -1;
-/* static int hf_ptp_v2_mm_faultRecord = -1; */
-
-static int hf_ptp_v2_mm_initializationKey = -1;
-static int hf_ptp_v2_mm_severityCode = -1;
-static int hf_ptp_v2_mm_faultRecordLength = -1;
-/* static int hf_ptp_v2_mm_faultTime = -1; */
-static int hf_ptp_v2_mm_faultTime_s = -1;
-static int hf_ptp_v2_mm_faultTime_ns = -1;
-static int hf_ptp_v2_mm_faultValue = -1;
-static int hf_ptp_v2_mm_faultName = -1;
-static int hf_ptp_v2_mm_faultName_length = -1;
-static int hf_ptp_v2_mm_faultValue_length = -1;
-static int hf_ptp_v2_mm_faultDescription = -1;
-static int hf_ptp_v2_mm_faultDescription_length = -1;
-static int hf_ptp_v2_mm_currentTime_s = -1;
-static int hf_ptp_v2_mm_currentTime_ns = -1;
-static int hf_ptp_v2_mm_clockAccuracy = -1;
-static int hf_ptp_v2_mm_priority1 = -1;
-static int hf_ptp_v2_mm_priority2 = -1;
-static int hf_ptp_v2_mm_dds_SO = -1;
-static int hf_ptp_v2_mm_TSC = -1;
-static int hf_ptp_v2_mm_numberPorts = -1;
-static int hf_ptp_v2_mm_clockclass = -1;
-static int hf_ptp_v2_mm_clockaccuracy = -1;
-static int hf_ptp_v2_mm_clockvariance = -1;
-static int hf_ptp_v2_mm_clockidentity = -1;
-static int hf_ptp_v2_mm_domainNumber = -1;
-static int hf_ptp_v2_mm_SO = -1;
-static int hf_ptp_v2_mm_stepsRemoved = -1;
-static int hf_ptp_v2_mm_parentIdentity = -1;
-static int hf_ptp_v2_mm_parentPort = -1;
-static int hf_ptp_v2_mm_parentStats = -1;
-static int hf_ptp_v2_mm_observedParentOffsetScaledLogVariance = -1;
-static int hf_ptp_v2_mm_observedParentClockPhaseChangeRate = -1;
-static int hf_ptp_v2_mm_grandmasterPriority1 = -1;
-static int hf_ptp_v2_mm_grandmasterPriority2 = -1;
-static int hf_ptp_v2_mm_grandmasterclockclass = -1;
-static int hf_ptp_v2_mm_grandmasterclockaccuracy = -1;
-static int hf_ptp_v2_mm_grandmasterclockvariance = -1;
-static int hf_ptp_v2_mm_grandmasterIdentity = -1;
-static int hf_ptp_v2_mm_currentUtcOffset = -1;
-static int hf_ptp_v2_mm_LI_61 = -1;
-static int hf_ptp_v2_mm_LI_59 = -1;
-static int hf_ptp_v2_mm_UTCV = -1;
-static int hf_ptp_v2_mm_PTP = -1;
-static int hf_ptp_v2_mm_TTRA = -1;
-static int hf_ptp_v2_mm_FTRA = -1;
-static int hf_ptp_v2_mm_timesource = -1;
-static int hf_ptp_v2_mm_offset_ns = -1;
-static int hf_ptp_v2_mm_pathDelay_ns = -1;
-static int hf_ptp_v2_mm_offset_subns = -1;
-static int hf_ptp_v2_mm_pathDelay_subns = -1;
-static int hf_ptp_v2_mm_PortNumber = -1;
-static int hf_ptp_v2_mm_portState = -1;
-static int hf_ptp_v2_mm_logMinDelayReqInterval = -1;
-static int hf_ptp_v2_mm_peerMeanPathDelay_ns = -1;
-static int hf_ptp_v2_mm_peerMeanPathDelay_subns = -1;
-static int hf_ptp_v2_mm_logAnnounceInterval = -1;
-static int hf_ptp_v2_mm_announceReceiptTimeout = -1;
-static int hf_ptp_v2_mm_logSyncInterval = -1;
-static int hf_ptp_v2_mm_delayMechanism = -1;
-static int hf_ptp_v2_mm_logMinPdelayReqInterval = -1;
-static int hf_ptp_v2_mm_versionNumber = -1;
-static int hf_ptp_v2_mm_primaryDomain = -1;
-static int hf_ptp_v2_mm_faultyFlag = -1;
-static int hf_ptp_v2_mm_managementErrorId = -1;
-static int hf_ptp_v2_mm_displayData = -1;
-static int hf_ptp_v2_mm_displayData_length = -1;
-static int hf_ptp_v2_mm_ucEN = -1;
-static int hf_ptp_v2_mm_ptEN = -1;
-static int hf_ptp_v2_mm_atEN = -1;
-static int hf_ptp_v2_mm_keyField = -1;
-static int hf_ptp_v2_mm_displayName = -1;
-static int hf_ptp_v2_mm_displayName_length = -1;
-static int hf_ptp_v2_mm_maxKey = -1;
-static int hf_ptp_v2_mm_currentOffset = -1;
-static int hf_ptp_v2_mm_jumpSeconds = -1;
-static int hf_ptp_v2_mm_nextjumpSeconds = -1;
-static int hf_ptp_v2_mm_logAlternateMulticastSyncInterval = -1;
-static int hf_ptp_v2_mm_numberOfAlternateMasters = -1;
-static int hf_ptp_v2_mm_transmitAlternateMulticastSync = -1;
+static int hf_ptp_v2_mm_clockType;
+static int hf_ptp_v2_mm_clockType_ordinaryClock;
+static int hf_ptp_v2_mm_clockType_boundaryClock;
+static int hf_ptp_v2_mm_clockType_p2p_transparentClock;
+static int hf_ptp_v2_mm_clockType_e2e_transparentClock;
+static int hf_ptp_v2_mm_clockType_managementNode;
+static int hf_ptp_v2_mm_clockType_reserved;
+static int hf_ptp_v2_mm_physicalLayerProtocol;
+static int hf_ptp_v2_mm_physicalLayerProtocol_length;
+static int hf_ptp_v2_mm_physicalAddressLength;
+static int hf_ptp_v2_mm_physicalAddress;
+static int hf_ptp_v2_mm_protocolAddress;
+static int hf_ptp_v2_mm_protocolAddress_networkProtocol;
+static int hf_ptp_v2_mm_protocolAddress_length;
+static int hf_ptp_v2_mm_manufacturerIdentity;
+
+static int hf_ptp_v2_mm_reserved;
+static int hf_ptp_v2_mm_productDescription;
+static int hf_ptp_v2_mm_productDescription_length;
+static int hf_ptp_v2_mm_revisionData;
+static int hf_ptp_v2_mm_revisionData_length;
+static int hf_ptp_v2_mm_userDescription;
+static int hf_ptp_v2_mm_userDescription_length;
+static int hf_ptp_v2_mm_profileIdentity;
+static int hf_ptp_v2_mm_pad;
+
+static int hf_ptp_v2_mm_numberOfFaultRecords;
+/* static int hf_ptp_v2_mm_faultRecord; */
+
+static int hf_ptp_v2_mm_initializationKey;
+static int hf_ptp_v2_mm_severityCode;
+static int hf_ptp_v2_mm_faultRecordLength;
+/* static int hf_ptp_v2_mm_faultTime; */
+static int hf_ptp_v2_mm_faultTime_s;
+static int hf_ptp_v2_mm_faultTime_ns;
+static int hf_ptp_v2_mm_faultValue;
+static int hf_ptp_v2_mm_faultName;
+static int hf_ptp_v2_mm_faultName_length;
+static int hf_ptp_v2_mm_faultValue_length;
+static int hf_ptp_v2_mm_faultDescription;
+static int hf_ptp_v2_mm_faultDescription_length;
+static int hf_ptp_v2_mm_currentTime_s;
+static int hf_ptp_v2_mm_currentTime_ns;
+static int hf_ptp_v2_mm_clockAccuracy;
+static int hf_ptp_v2_mm_priority1;
+static int hf_ptp_v2_mm_priority2;
+static int hf_ptp_v2_mm_dds_SO;
+static int hf_ptp_v2_mm_TSC;
+static int hf_ptp_v2_mm_numberPorts;
+static int hf_ptp_v2_mm_clockclass;
+static int hf_ptp_v2_mm_clockaccuracy;
+static int hf_ptp_v2_mm_clockvariance;
+static int hf_ptp_v2_mm_clockidentity;
+static int hf_ptp_v2_mm_domainNumber;
+static int hf_ptp_v2_mm_SO;
+static int hf_ptp_v2_mm_stepsRemoved;
+static int hf_ptp_v2_mm_parentIdentity;
+static int hf_ptp_v2_mm_parentPort;
+static int hf_ptp_v2_mm_parentStats;
+static int hf_ptp_v2_mm_observedParentOffsetScaledLogVariance;
+static int hf_ptp_v2_mm_observedParentClockPhaseChangeRate;
+static int hf_ptp_v2_mm_grandmasterPriority1;
+static int hf_ptp_v2_mm_grandmasterPriority2;
+static int hf_ptp_v2_mm_grandmasterclockclass;
+static int hf_ptp_v2_mm_grandmasterclockaccuracy;
+static int hf_ptp_v2_mm_grandmasterclockvariance;
+static int hf_ptp_v2_mm_grandmasterIdentity;
+static int hf_ptp_v2_mm_currentUtcOffset;
+static int hf_ptp_v2_mm_LI_61;
+static int hf_ptp_v2_mm_LI_59;
+static int hf_ptp_v2_mm_UTCV;
+static int hf_ptp_v2_mm_PTP;
+static int hf_ptp_v2_mm_TTRA;
+static int hf_ptp_v2_mm_FTRA;
+static int hf_ptp_v2_mm_timesource;
+static int hf_ptp_v2_mm_offset_ns;
+static int hf_ptp_v2_mm_pathDelay_ns;
+static int hf_ptp_v2_mm_offset_subns;
+static int hf_ptp_v2_mm_pathDelay_subns;
+static int hf_ptp_v2_mm_PortNumber;
+static int hf_ptp_v2_mm_portState;
+static int hf_ptp_v2_mm_logMinDelayReqInterval;
+static int hf_ptp_v2_mm_peerMeanPathDelay_ns;
+static int hf_ptp_v2_mm_peerMeanPathDelay_subns;
+static int hf_ptp_v2_mm_logAnnounceInterval;
+static int hf_ptp_v2_mm_announceReceiptTimeout;
+static int hf_ptp_v2_mm_logSyncInterval;
+static int hf_ptp_v2_mm_delayMechanism;
+static int hf_ptp_v2_mm_logMinPdelayReqInterval;
+static int hf_ptp_v2_mm_versionNumber;
+static int hf_ptp_v2_mm_primaryDomain;
+static int hf_ptp_v2_mm_faultyFlag;
+static int hf_ptp_v2_mm_managementErrorId;
+static int hf_ptp_v2_mm_displayData;
+static int hf_ptp_v2_mm_displayData_length;
+static int hf_ptp_v2_mm_ucEN;
+static int hf_ptp_v2_mm_ptEN;
+static int hf_ptp_v2_mm_atEN;
+static int hf_ptp_v2_mm_keyField;
+static int hf_ptp_v2_mm_displayName;
+static int hf_ptp_v2_mm_displayName_length;
+static int hf_ptp_v2_mm_maxKey;
+static int hf_ptp_v2_mm_currentOffset;
+static int hf_ptp_v2_mm_jumpSeconds;
+static int hf_ptp_v2_mm_nextjumpSeconds;
+static int hf_ptp_v2_mm_logAlternateMulticastSyncInterval;
+static int hf_ptp_v2_mm_numberOfAlternateMasters;
+static int hf_ptp_v2_mm_transmitAlternateMulticastSync;
 
 /* Fields for analysis code*/
-static int hf_ptp_v2_analysis_sync_to_followup = -1;
-static int hf_ptp_v2_analysis_followup_to_sync = -1;
-static int hf_ptp_v2_analysis_pdelayreq_to_pdelayres = -1;
-static int hf_ptp_v2_analysis_pdelayres_to_pdelayreq = -1;
-static int hf_ptp_v2_analysis_pdelayres_to_pdelayfup = -1;
-static int hf_ptp_v2_analysis_pdelayfup_to_pdelayres = -1;
-static int hf_ptp_v2_analysis_sync_timestamp = -1;
-static int hf_ptp_v2_analysis_sync_timestamp_seconds = -1;
-static int hf_ptp_v2_analysis_sync_timestamp_nanoseconds = -1;
-static int hf_ptp_v2_analysis_sync_period = -1;
-static int hf_ptp_v2_analysis_sync_rateRatio = -1;
-static int hf_ptp_v2_analysis_sync_rateRatio_ppm = -1;
-static int hf_ptp_v2_analysis_pdelay_mpd_unscaled = -1;
-static int hf_ptp_v2_analysis_pdelay_mpd_unscaled_seconds = -1;
-static int hf_ptp_v2_analysis_pdelay_mpd_unscaled_nanoseconds = -1;
-static int hf_ptp_v2_analysis_pdelay_mpd_scaled = -1;
-static int hf_ptp_v2_analysis_pdelay_period = -1;
-static int hf_ptp_v2_analysis_pdelay_neighRateRatio = -1;
-static int hf_ptp_v2_analysis_pdelay_neighRateRatio_ppm = -1;
+static int hf_ptp_v2_analysis_sync_to_followup;
+static int hf_ptp_v2_analysis_followup_to_sync;
+static int hf_ptp_v2_analysis_pdelayreq_to_pdelayres;
+static int hf_ptp_v2_analysis_pdelayres_to_pdelayreq;
+static int hf_ptp_v2_analysis_pdelayres_to_pdelayfup;
+static int hf_ptp_v2_analysis_pdelayfup_to_pdelayres;
+static int hf_ptp_v2_analysis_sync_timestamp;
+static int hf_ptp_v2_analysis_sync_timestamp_seconds;
+static int hf_ptp_v2_analysis_sync_timestamp_nanoseconds;
+static int hf_ptp_v2_analysis_sync_period;
+static int hf_ptp_v2_analysis_sync_rateRatio;
+static int hf_ptp_v2_analysis_sync_rateRatio_ppm;
+static int hf_ptp_v2_analysis_pdelay_mpd_unscaled;
+static int hf_ptp_v2_analysis_pdelay_mpd_unscaled_seconds;
+static int hf_ptp_v2_analysis_pdelay_mpd_unscaled_nanoseconds;
+static int hf_ptp_v2_analysis_pdelay_mpd_scaled;
+static int hf_ptp_v2_analysis_pdelay_period;
+static int hf_ptp_v2_analysis_pdelay_neighRateRatio;
+static int hf_ptp_v2_analysis_pdelay_neighRateRatio_ppm;
 
 /* Initialize the subtree pointers */
-static gint ett_ptp_v2 = -1;
-static gint ett_ptp_v2_flags = -1;
-static gint ett_ptp_v2_clockidentity = -1;
-static gint ett_ptp_v2_correction = -1;
-static gint ett_ptp_v2_time = -1;
-static gint ett_ptp_v2_time2 = -1;
-static gint ett_ptp_v2_managementData = -1;
-static gint ett_ptp_v2_clockType = -1;
-static gint ett_ptp_v2_physicalLayerProtocol = -1;
-static gint ett_ptp_v2_protocolAddress = -1;
-static gint ett_ptp_v2_faultRecord = -1;
-static gint ett_ptp_v2_ptptext = -1;
-static gint ett_ptp_v2_timeInterval = -1;
-static gint ett_ptp_v2_tlv = -1;
-static gint ett_ptp_v2_tlv_log_period = -1;
-static gint ett_ptp_v2_sig_l1sync_flags = -1;
-static gint ett_ptp_as_sig_tlv_flags = -1;
-static gint ett_ptp_oe_wr_flags = -1;
-static gint ett_ptp_oe_smpte_data = -1;
-static gint ett_ptp_oe_smpte_framerate = -1;
-static gint ett_ptp_oe_smpte_timeaddress = -1;
-static gint ett_ptp_oe_smpte_daylightsaving = -1;
-static gint ett_ptp_oe_smpte_leapsecondjump = -1;
-static gint ett_ptp_analysis_timestamp = -1;
-static gint ett_ptp_analysis_mean_propagation_delay = -1;
-
-/* static gint ett_ptp_v2_timesource = -1;
-static gint ett_ptp_v2_priority = -1; */
-static gint ett_ptp_v2_majorsdoid = -1;
-
-static expert_field ei_ptp_v2_msg_len_too_large = EI_INIT;
-static expert_field ei_ptp_v2_msg_len_too_small = EI_INIT;
-static expert_field ei_ptp_v2_sync_no_followup  = EI_INIT;
-static expert_field ei_ptp_v2_sync_no_fup_tlv   = EI_INIT;
-static expert_field ei_ptp_v2_followup_no_sync  = EI_INIT;
-static expert_field ei_ptp_v2_pdreq_no_pdresp   = EI_INIT;
-static expert_field ei_ptp_v2_pdresp_no_pdreq   = EI_INIT;
-static expert_field ei_ptp_v2_pdresp_no_pdfup   = EI_INIT;
-static expert_field ei_ptp_v2_pdresp_twostep    = EI_INIT;
-static expert_field ei_ptp_v2_pdfup_no_pdresp   = EI_INIT;
-static expert_field ei_ptp_v2_period_invalid    = EI_INIT;
+static gint ett_ptp_v2;
+static gint ett_ptp_v2_flags;
+static gint ett_ptp_v2_clockidentity;
+static gint ett_ptp_v2_correction;
+static gint ett_ptp_v2_time;
+static gint ett_ptp_v2_time2;
+static gint ett_ptp_v2_managementData;
+static gint ett_ptp_v2_clockType;
+static gint ett_ptp_v2_physicalLayerProtocol;
+static gint ett_ptp_v2_protocolAddress;
+static gint ett_ptp_v2_faultRecord;
+static gint ett_ptp_v2_ptptext;
+static gint ett_ptp_v2_timeInterval;
+static gint ett_ptp_v2_tlv;
+static gint ett_ptp_v2_tlv_log_period;
+static gint ett_ptp_v2_sig_l1sync_flags;
+static gint ett_ptp_as_sig_tlv_flags;
+static gint ett_ptp_oe_wr_flags;
+static gint ett_ptp_oe_smpte_data;
+static gint ett_ptp_oe_smpte_framerate;
+static gint ett_ptp_oe_smpte_timeaddress;
+static gint ett_ptp_oe_smpte_daylightsaving;
+static gint ett_ptp_oe_smpte_leapsecondjump;
+static gint ett_ptp_analysis_timestamp;
+static gint ett_ptp_analysis_mean_propagation_delay;
+
+/* static gint ett_ptp_v2_timesource;
+static gint ett_ptp_v2_priority; */
+static gint ett_ptp_v2_majorsdoid;
+
+static expert_field ei_ptp_v2_msg_len_too_large;
+static expert_field ei_ptp_v2_msg_len_too_small;
+static expert_field ei_ptp_v2_sync_no_followup;
+static expert_field ei_ptp_v2_sync_no_fup_tlv;
+static expert_field ei_ptp_v2_followup_no_sync;
+static expert_field ei_ptp_v2_pdreq_no_pdresp;
+static expert_field ei_ptp_v2_pdresp_no_pdreq;
+static expert_field ei_ptp_v2_pdresp_no_pdfup;
+static expert_field ei_ptp_v2_pdresp_twostep;
+static expert_field ei_ptp_v2_pdfup_no_pdresp;
+static expert_field ei_ptp_v2_period_invalid;
 
 /* END Definitions and fields for PTPv2 dissection. */
 
diff --git a/epan/dissectors/packet-ptpip.c b/epan/dissectors/packet-ptpip.c
index 6e5f7e523b..a278b9e8ee 100644
--- a/epan/dissectors/packet-ptpip.c
+++ b/epan/dissectors/packet-ptpip.c
@@ -31,30 +31,30 @@
 #define PTPIP_MAX_PARAM_COUNT     5  /* [1] Section 2.3.6 */
 
 /* trees */
-static gint ett_ptpIP =  -1;
-static gint ett_ptpIP_hdr = -1;
+static gint ett_ptpIP;
+static gint ett_ptpIP_hdr;
 
 /* PTP/IP Fields */
-static int proto_ptpIP = -1;
-static int hf_ptpIP_len = -1; /* [1] Section 2.3 */
-static int hf_ptpIP_pktType = -1; /* [1] Section 2.3 */
-static int hf_ptpIP_guid = -1;
-static int hf_ptpIP_name = -1;
-static int hf_ptpIP_version = -1;
-static int hf_ptpIP_connectionNumber = -1;
-static int hf_ptpIP_dataPhaseInfo = -1;
+static int proto_ptpIP;
+static int hf_ptpIP_len; /* [1] Section 2.3 */
+static int hf_ptpIP_pktType; /* [1] Section 2.3 */
+static int hf_ptpIP_guid;
+static int hf_ptpIP_name;
+static int hf_ptpIP_version;
+static int hf_ptpIP_connectionNumber;
+static int hf_ptpIP_dataPhaseInfo;
 
 /* note: separating the fields to make it easier to divide this code later. */
 
 /* PTP Fields */
 /* picking hf_ptp for now. Might need to change later for namespace issues with Precision Time Protocol. */
-static int hf_ptp_opCode = -1;
-static int hf_ptp_vendor_opCode = -1;
-static int hf_ptp_respCode = -1;
-static int hf_ptp_eventCode = -1;
-static int hf_ptp_transactionID = -1;
-static int hf_ptp_totalDataLength = -1;
-static int hf_ptp_opCode_param_sessionID = -1;
+static int hf_ptp_opCode;
+static int hf_ptp_vendor_opCode;
+static int hf_ptp_respCode;
+static int hf_ptp_eventCode;
+static int hf_ptp_transactionID;
+static int hf_ptp_totalDataLength;
+static int hf_ptp_opCode_param_sessionID;
 
 /* function declarations */
 static int dissect_ptpIP (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_);
diff --git a/epan/dissectors/packet-pulse.c b/epan/dissectors/packet-pulse.c
index 29388b1c29..862daad024 100644
--- a/epan/dissectors/packet-pulse.c
+++ b/epan/dissectors/packet-pulse.c
@@ -25,9 +25,9 @@ void proto_reg_handoff_pulse(void);
 
 static dissector_handle_t pulse_handle;
 
-static int  proto_pulse    = -1;
-static int  hf_pulse_magic = -1;
-static gint ett_pulse      = -1;
+static int  proto_pulse;
+static int  hf_pulse_magic;
+static gint ett_pulse;
 
 /* piranha/pulse.c */
 #define PULSE_HEARTBEAT_RUNNING_MAGIC     0xbdaddbda
diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c
index 47ccf2fedf..1ee3fd320d 100644
--- a/epan/dissectors/packet-pvfs2.c
+++ b/epan/dissectors/packet-pvfs2.c
@@ -49,149 +49,149 @@ void proto_reg_handoff_pvfs(void);
 static dissector_handle_t pvfs_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_pvfs = -1;
-static int hf_pvfs_magic_nr = -1;
-static int hf_pvfs_uid = -1;
-static int hf_pvfs_gid = -1;
-static int hf_pvfs_mode = -1;
-static int hf_pvfs_tag = -1;
-static int hf_pvfs_size = -1;
-static int hf_pvfs_release_number = -1;
-static int hf_pvfs_encoding = -1;
-static int hf_pvfs_server_op = -1;
-/* static int hf_pvfs_handle = -1; */
-static int hf_pvfs_fs_id = -1;
-static int hf_pvfs_attrmask = -1;
-static int hf_pvfs_attr = -1;
-static int hf_pvfs_ds_type = -1;
-static int hf_pvfs_error = -1;
-static int hf_pvfs_atime = -1;
-static int hf_pvfs_atime_sec = -1;
-static int hf_pvfs_atime_nsec = -1;
-static int hf_pvfs_mtime = -1;
-static int hf_pvfs_mtime_sec = -1;
-static int hf_pvfs_mtime_nsec = -1;
-static int hf_pvfs_ctime = -1;
-static int hf_pvfs_ctime_sec = -1;
-static int hf_pvfs_ctime_nsec = -1;
-static int hf_pvfs_parent_atime = -1;
-static int hf_pvfs_parent_atime_sec = -1;
-static int hf_pvfs_parent_atime_nsec = -1;
-static int hf_pvfs_parent_mtime = -1;
-static int hf_pvfs_parent_mtime_sec = -1;
-static int hf_pvfs_parent_mtime_nsec = -1;
-static int hf_pvfs_parent_ctime = -1;
-static int hf_pvfs_parent_ctime_sec = -1;
-static int hf_pvfs_parent_ctime_nsec = -1;
-static int hf_pvfs_distribution = -1;
-static int hf_pvfs_dfile_count = -1;
-static int hf_pvfs_dirent_count = -1;
-static int hf_pvfs_directory_version = -1;
-static int hf_pvfs_path = -1;
-static int hf_pvfs_total_completed = -1;
-static int hf_pvfs_io_dist = -1;
-static int hf_pvfs_aggregate_size = -1;
-static int hf_pvfs_io_type = -1;
-static int hf_pvfs_flowproto_type = -1;
-static int hf_pvfs_server_param = -1;
-static int hf_pvfs_prev_value = -1;
-/* static int hf_pvfs_ram_free_bytes = -1; */
-static int hf_pvfs_bytes_available = -1;
-static int hf_pvfs_bytes_total = -1;
-static int hf_pvfs_ram_bytes_total = -1;
-static int hf_pvfs_ram_bytes_free = -1;
-static int hf_pvfs_load_average_1s = -1;
-static int hf_pvfs_load_average_5s = -1;
-static int hf_pvfs_load_average_15s = -1;
-static int hf_pvfs_uptime_seconds = -1;
-static int hf_pvfs_handles_available = -1;
-static int hf_pvfs_handles_total = -1;
-static int hf_pvfs_unused = -1;
-static int hf_pvfs_context_id = -1;
-static int hf_pvfs_offset = -1;
-static int hf_pvfs_stride = -1;
-static int hf_pvfs_lb = -1;
-static int hf_pvfs_ub = -1;
-static int hf_pvfs_end_time_ms = -1;
-static int hf_pvfs_cur_time_ms = -1;
-static int hf_pvfs_start_time_ms = -1;
-static int hf_pvfs_bytes_written = -1;
-static int hf_pvfs_bytes_read = -1;
-static int hf_pvfs_metadata_write = -1;
-static int hf_pvfs_metadata_read = -1;
-static int hf_pvfs_b_size = -1;
-static int hf_pvfs_k_size = -1;
-static int hf_pvfs_id_gen_t = -1;
-static int hf_pvfs_attribute_key = -1;
-static int hf_pvfs_attribute_value = -1;
-static int hf_pvfs_strip_size = -1;
-static int hf_pvfs_ereg = -1;
-static int hf_pvfs_sreg = -1;
-static int hf_pvfs_num_eregs = -1;
-static int hf_pvfs_num_blocks = -1;
-static int hf_pvfs_num_contig_chunks = -1;
-static int hf_pvfs_server_nr = -1;
-static int hf_pvfs_server_count = -1;
-static int hf_pvfs_fh_length = -1;
-static int hf_pvfs_fh_hash = -1;
-static int hf_pvfs_permissions = -1;
-static int hf_pvfs_server_mode = -1;
-static int hf_pvfs_depth = -1;
-static int hf_pvfs_num_nested_req = -1;
-static int hf_pvfs_committed = -1;
-static int hf_pvfs_refcount = -1;
-static int hf_pvfs_numreq = -1;
-static int hf_pvfs_truncate_request_flags = -1;
-static int hf_pvfs_ds_position = -1;
-static int hf_pvfs_dirent_limit = -1;
-static int hf_pvfs_flush_request_flags = -1;
-static int hf_pvfs_next_id = -1;
-static int hf_pvfs_mgmt_perf_mon_request_count = -1;
-static int hf_pvfs_mgmt_perf_mon_request_event_count = -1;
-static int hf_pvfs_lookup_path_response_handle_count = -1;
-static int hf_pvfs_getconfig_response_total_bytes = -1;
-static int hf_pvfs_getconfig_response_lines = -1;
-static int hf_pvfs_getconfig_response_config_bytes = -1;
-static int hf_pvfs_mgmt_perf_mon_response_suggested_next_id = -1;
-static int hf_pvfs_mgmt_perf_stat_valid_flag = -1;
-static int hf_pvfs_mgmt_perf_stat_id = -1;
-static int hf_pvfs_mgmt_perf_mon_response_perf_array_count = -1;
-static int hf_pvfs_mgmt_iterate_handles_response_ds_position = -1;
-static int hf_pvfs_mgmt_iterate_handles_response_handle_count = -1;
-static int hf_pvfs_mgmt_dspace_info_list_response_dspace_info_count = -1;
-static int hf_pvfs_mgmt_event_mon_response_api = -1;
-static int hf_pvfs_mgmt_event_mon_response_operation = -1;
-static int hf_pvfs_mgmt_event_mon_response_value = -1;
-static int hf_pvfs_mgmt_event_mon_response_flags = -1;
-static int hf_pvfs_mgmt_event_mon_response_tv_sec = -1;
-static int hf_pvfs_mgmt_event_mon_response_tv_usec = -1;
-static int hf_pvfs_fill_bytes = -1;
-static int hf_pvfs_target_path_len = -1;
-static int hf_pvfs_version2 = -1;
-static int hf_pvfs_flow_data = -1;
-static int hf_pvfs_getconfig_response_entry = -1;
-static int hf_fhandle_data = -1;
-static int hf_pvfs_opaque_length = -1;
+static int proto_pvfs;
+static int hf_pvfs_magic_nr;
+static int hf_pvfs_uid;
+static int hf_pvfs_gid;
+static int hf_pvfs_mode;
+static int hf_pvfs_tag;
+static int hf_pvfs_size;
+static int hf_pvfs_release_number;
+static int hf_pvfs_encoding;
+static int hf_pvfs_server_op;
+/* static int hf_pvfs_handle; */
+static int hf_pvfs_fs_id;
+static int hf_pvfs_attrmask;
+static int hf_pvfs_attr;
+static int hf_pvfs_ds_type;
+static int hf_pvfs_error;
+static int hf_pvfs_atime;
+static int hf_pvfs_atime_sec;
+static int hf_pvfs_atime_nsec;
+static int hf_pvfs_mtime;
+static int hf_pvfs_mtime_sec;
+static int hf_pvfs_mtime_nsec;
+static int hf_pvfs_ctime;
+static int hf_pvfs_ctime_sec;
+static int hf_pvfs_ctime_nsec;
+static int hf_pvfs_parent_atime;
+static int hf_pvfs_parent_atime_sec;
+static int hf_pvfs_parent_atime_nsec;
+static int hf_pvfs_parent_mtime;
+static int hf_pvfs_parent_mtime_sec;
+static int hf_pvfs_parent_mtime_nsec;
+static int hf_pvfs_parent_ctime;
+static int hf_pvfs_parent_ctime_sec;
+static int hf_pvfs_parent_ctime_nsec;
+static int hf_pvfs_distribution;
+static int hf_pvfs_dfile_count;
+static int hf_pvfs_dirent_count;
+static int hf_pvfs_directory_version;
+static int hf_pvfs_path;
+static int hf_pvfs_total_completed;
+static int hf_pvfs_io_dist;
+static int hf_pvfs_aggregate_size;
+static int hf_pvfs_io_type;
+static int hf_pvfs_flowproto_type;
+static int hf_pvfs_server_param;
+static int hf_pvfs_prev_value;
+/* static int hf_pvfs_ram_free_bytes; */
+static int hf_pvfs_bytes_available;
+static int hf_pvfs_bytes_total;
+static int hf_pvfs_ram_bytes_total;
+static int hf_pvfs_ram_bytes_free;
+static int hf_pvfs_load_average_1s;
+static int hf_pvfs_load_average_5s;
+static int hf_pvfs_load_average_15s;
+static int hf_pvfs_uptime_seconds;
+static int hf_pvfs_handles_available;
+static int hf_pvfs_handles_total;
+static int hf_pvfs_unused;
+static int hf_pvfs_context_id;
+static int hf_pvfs_offset;
+static int hf_pvfs_stride;
+static int hf_pvfs_lb;
+static int hf_pvfs_ub;
+static int hf_pvfs_end_time_ms;
+static int hf_pvfs_cur_time_ms;
+static int hf_pvfs_start_time_ms;
+static int hf_pvfs_bytes_written;
+static int hf_pvfs_bytes_read;
+static int hf_pvfs_metadata_write;
+static int hf_pvfs_metadata_read;
+static int hf_pvfs_b_size;
+static int hf_pvfs_k_size;
+static int hf_pvfs_id_gen_t;
+static int hf_pvfs_attribute_key;
+static int hf_pvfs_attribute_value;
+static int hf_pvfs_strip_size;
+static int hf_pvfs_ereg;
+static int hf_pvfs_sreg;
+static int hf_pvfs_num_eregs;
+static int hf_pvfs_num_blocks;
+static int hf_pvfs_num_contig_chunks;
+static int hf_pvfs_server_nr;
+static int hf_pvfs_server_count;
+static int hf_pvfs_fh_length;
+static int hf_pvfs_fh_hash;
+static int hf_pvfs_permissions;
+static int hf_pvfs_server_mode;
+static int hf_pvfs_depth;
+static int hf_pvfs_num_nested_req;
+static int hf_pvfs_committed;
+static int hf_pvfs_refcount;
+static int hf_pvfs_numreq;
+static int hf_pvfs_truncate_request_flags;
+static int hf_pvfs_ds_position;
+static int hf_pvfs_dirent_limit;
+static int hf_pvfs_flush_request_flags;
+static int hf_pvfs_next_id;
+static int hf_pvfs_mgmt_perf_mon_request_count;
+static int hf_pvfs_mgmt_perf_mon_request_event_count;
+static int hf_pvfs_lookup_path_response_handle_count;
+static int hf_pvfs_getconfig_response_total_bytes;
+static int hf_pvfs_getconfig_response_lines;
+static int hf_pvfs_getconfig_response_config_bytes;
+static int hf_pvfs_mgmt_perf_mon_response_suggested_next_id;
+static int hf_pvfs_mgmt_perf_stat_valid_flag;
+static int hf_pvfs_mgmt_perf_stat_id;
+static int hf_pvfs_mgmt_perf_mon_response_perf_array_count;
+static int hf_pvfs_mgmt_iterate_handles_response_ds_position;
+static int hf_pvfs_mgmt_iterate_handles_response_handle_count;
+static int hf_pvfs_mgmt_dspace_info_list_response_dspace_info_count;
+static int hf_pvfs_mgmt_event_mon_response_api;
+static int hf_pvfs_mgmt_event_mon_response_operation;
+static int hf_pvfs_mgmt_event_mon_response_value;
+static int hf_pvfs_mgmt_event_mon_response_flags;
+static int hf_pvfs_mgmt_event_mon_response_tv_sec;
+static int hf_pvfs_mgmt_event_mon_response_tv_usec;
+static int hf_pvfs_fill_bytes;
+static int hf_pvfs_target_path_len;
+static int hf_pvfs_version2;
+static int hf_pvfs_flow_data;
+static int hf_pvfs_getconfig_response_entry;
+static int hf_fhandle_data;
+static int hf_pvfs_opaque_length;
 
 /* Initialize the subtree pointers */
-static gint ett_pvfs = -1;
-static gint ett_pvfs_hdr = -1;
-static gint ett_pvfs_credentials = -1;
-static gint ett_pvfs_server_config = -1;
-static gint ett_pvfs_server_config_branch = -1;
-static gint ett_pvfs_attrmask = -1;
-static gint ett_pvfs_time = -1;
-static gint ett_pvfs_extent_array_tree = -1;
-static gint ett_pvfs_extent_item = -1;
-static gint ett_pvfs_string = -1;
-static gint ett_pvfs_attr_tree = -1;
-static gint ett_pvfs_distribution = -1;
-static gint ett_pvfs_mgmt_perf_stat = -1;
-static gint ett_pvfs_mgmt_dspace_info = -1;
-static gint ett_pvfs_attr = -1;
-static gint ett_pvfs_fh = -1;
-
-static expert_field ei_pvfs_malformed = EI_INIT;
+static gint ett_pvfs;
+static gint ett_pvfs_hdr;
+static gint ett_pvfs_credentials;
+static gint ett_pvfs_server_config;
+static gint ett_pvfs_server_config_branch;
+static gint ett_pvfs_attrmask;
+static gint ett_pvfs_time;
+static gint ett_pvfs_extent_array_tree;
+static gint ett_pvfs_extent_item;
+static gint ett_pvfs_string;
+static gint ett_pvfs_attr_tree;
+static gint ett_pvfs_distribution;
+static gint ett_pvfs_mgmt_perf_stat;
+static gint ett_pvfs_mgmt_dspace_info;
+static gint ett_pvfs_attr;
+static gint ett_pvfs_fh;
+
+static expert_field ei_pvfs_malformed;
 
 #define BMI_MAGIC_NR 51903
 
diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c
index 908444604d..ff22ab730b 100644
--- a/epan/dissectors/packet-pw-atm.c
+++ b/epan/dissectors/packet-pw-atm.c
@@ -41,69 +41,69 @@ void proto_reg_handoff_pw_atm_ata(void);
 void proto_register_pw_atm(void);
 void proto_reg_handoff_pw_atm(void);
 
-static gint proto_n1_nocw = -1;
-static gint proto_n1_cw = -1;
-static gint proto_11_or_aal5_pdu = -1;
-static gint proto_aal5_sdu = -1;
+static gint proto_n1_nocw;
+static gint proto_n1_cw;
+static gint proto_11_or_aal5_pdu;
+static gint proto_aal5_sdu;
 /* subordinate dissectors: */
-static gint proto_control_word = -1;
-static gint proto_cell_header = -1;
-static gint proto_cell = -1;
-
-static gint ett_encaps = -1;
-static gint ett_cw = -1;
-static gint ett_cell_header = -1;
-static gint ett_cell = -1;
-
-static int hf_pw_type_n1_cw = -1;
-static int hf_pw_type_n1_nocw = -1;
-static int hf_pw_type_11_vcc = -1;
-static int hf_pw_type_11_vpc = -1;
-static int hf_pw_type_aal5_sdu = -1;
-static int hf_pw_type_aal5_pdu = -1;
-
-static int hf_cell_h_vpi = -1;
-static int hf_cell_h_vci = -1;
-static int hf_cell_h_pti = -1;
-static int hf_cell_h_clp = -1;
-static int hf_cell_h_m = -1;
-static int hf_cell_h_v = -1;
-static int hf_cell_h_rsv = -1;
-static int hf_aal5_pdu_rsv = -1;
-static int hf_aal5_pdu_u = -1;
-static int hf_aal5_pdu_e = -1;
-
-static int hf_cw_bits03 = -1;
-static int hf_pref_cw_rsv = -1;
-static int hf_generic_cw_rsv = -1;
-static int hf_pref_cw_flags = -1;
-static int hf_pref_cw_a5s_t = -1;
-static int hf_pref_cw_a5s_e = -1;
-static int hf_pref_cw_a5s_c = -1;
-static int hf_pref_cw_a5s_u = -1;
-static int hf_pref_cw_len = -1;
-static int hf_pref_cw_rsvlen = -1;
-static int hf_cw_seq = -1;
-static int hf_n1_cw_ncells = -1;
-static int hf_n1_nocw_ncells = -1;
-static int hf_11_ncells = -1;
-static int hf_gen_cw_atmbyte = -1;
-static int hf_cell_payload_len = -1;
-
-static expert_field ei_cell_h_v_not_one = EI_INIT;
-static expert_field ei_cell_h_pti_undecoded = EI_INIT;
-static expert_field ei_pref_cw_flags = EI_INIT;
-static expert_field ei_cell_h_v_not_zero = EI_INIT;
-static expert_field ei_pw_payload_size_invalid_note = EI_INIT;
-static expert_field ei_pw_payload_size_invalid_error = EI_INIT;
-static expert_field ei_cell_h_pti_malformed = EI_INIT;
-static expert_field ei_cell_h_rsv = EI_INIT;
-static expert_field ei_cell_broken = EI_INIT;
-static expert_field ei_cell_h_m = EI_INIT;
-static expert_field ei_cw_bits03 = EI_INIT;
-static expert_field ei_pw_packet_size_too_small = EI_INIT;
-static expert_field ei_pref_cw_len = EI_INIT;
-static expert_field ei_gen_cw_atmbyte = EI_INIT;
+static gint proto_control_word;
+static gint proto_cell_header;
+static gint proto_cell;
+
+static gint ett_encaps;
+static gint ett_cw;
+static gint ett_cell_header;
+static gint ett_cell;
+
+static int hf_pw_type_n1_cw;
+static int hf_pw_type_n1_nocw;
+static int hf_pw_type_11_vcc;
+static int hf_pw_type_11_vpc;
+static int hf_pw_type_aal5_sdu;
+static int hf_pw_type_aal5_pdu;
+
+static int hf_cell_h_vpi;
+static int hf_cell_h_vci;
+static int hf_cell_h_pti;
+static int hf_cell_h_clp;
+static int hf_cell_h_m;
+static int hf_cell_h_v;
+static int hf_cell_h_rsv;
+static int hf_aal5_pdu_rsv;
+static int hf_aal5_pdu_u;
+static int hf_aal5_pdu_e;
+
+static int hf_cw_bits03;
+static int hf_pref_cw_rsv;
+static int hf_generic_cw_rsv;
+static int hf_pref_cw_flags;
+static int hf_pref_cw_a5s_t;
+static int hf_pref_cw_a5s_e;
+static int hf_pref_cw_a5s_c;
+static int hf_pref_cw_a5s_u;
+static int hf_pref_cw_len;
+static int hf_pref_cw_rsvlen;
+static int hf_cw_seq;
+static int hf_n1_cw_ncells;
+static int hf_n1_nocw_ncells;
+static int hf_11_ncells;
+static int hf_gen_cw_atmbyte;
+static int hf_cell_payload_len;
+
+static expert_field ei_cell_h_v_not_one;
+static expert_field ei_cell_h_pti_undecoded;
+static expert_field ei_pref_cw_flags;
+static expert_field ei_cell_h_v_not_zero;
+static expert_field ei_pw_payload_size_invalid_note;
+static expert_field ei_pw_payload_size_invalid_error;
+static expert_field ei_cell_h_pti_malformed;
+static expert_field ei_cell_h_rsv;
+static expert_field ei_cell_broken;
+static expert_field ei_cell_h_m;
+static expert_field ei_cw_bits03;
+static expert_field ei_pw_packet_size_too_small;
+static expert_field ei_pref_cw_len;
+static expert_field ei_gen_cw_atmbyte;
 
 
 static dissector_handle_t dh_cell;
diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c
index b5f58ae86a..330a7158e6 100644
--- a/epan/dissectors/packet-pw-cesopsn.c
+++ b/epan/dissectors/packet-pw-cesopsn.c
@@ -30,25 +30,25 @@ void proto_register_pw_cesopsn(void);
 void proto_reg_handoff_pw_cesopsn(void);
 
 static gint proto = -1;
-static gint ett_pw_cesopsn = -1;
-
-static int hf_cw = -1;
-static int hf_cw_bits03 = -1;
-static int hf_cw_lm = -1;
-static int hf_cw_r = -1;
-static int hf_cw_frg = -1;
-static int hf_cw_len = -1;
-static int hf_cw_seq = -1;
-static int hf_payload = -1;
-static int hf_payload_l = -1;
-
-static expert_field ei_payload_size_invalid_undecoded = EI_INIT;
-static expert_field ei_cw_frg = EI_INIT;
-static expert_field ei_payload_size_invalid_error = EI_INIT;
-static expert_field ei_cw_bits03 = EI_INIT;
-static expert_field ei_pref_cw_len = EI_INIT;
-static expert_field ei_cw_lm = EI_INIT;
-static expert_field ei_packet_size_too_small = EI_INIT;
+static gint ett_pw_cesopsn;
+
+static int hf_cw;
+static int hf_cw_bits03;
+static int hf_cw_lm;
+static int hf_cw_r;
+static int hf_cw_frg;
+static int hf_cw_len;
+static int hf_cw_seq;
+static int hf_payload;
+static int hf_payload_l;
+
+static expert_field ei_payload_size_invalid_undecoded;
+static expert_field ei_cw_frg;
+static expert_field ei_payload_size_invalid_error;
+static expert_field ei_cw_bits03;
+static expert_field ei_pref_cw_len;
+static expert_field ei_cw_lm;
+static expert_field ei_packet_size_too_small;
 
 static dissector_handle_t pw_padding_handle;
 static dissector_handle_t pw_cesopsn_udp_handle;
diff --git a/epan/dissectors/packet-pw-common.c b/epan/dissectors/packet-pw-common.c
index a8a855d29b..24683639f9 100644
--- a/epan/dissectors/packet-pw-common.c
+++ b/epan/dissectors/packet-pw-common.c
@@ -71,9 +71,9 @@ void pwc_item_append_text_n_items(proto_item* item, const int n, const char * co
 }
 
 
-static gint proto_pw_padding = -1;
-static gint ett_pw_common = -1;
-static int hf_padding_len = -1;
+static gint proto_pw_padding;
+static gint ett_pw_common;
+static int hf_padding_len;
 
 static
 int dissect_pw_padding(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_)
diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c
index aec7b662d3..08a4074584 100644
--- a/epan/dissectors/packet-pw-eth.c
+++ b/epan/dissectors/packet-pw-eth.c
@@ -22,15 +22,15 @@
 void proto_register_pw_eth(void);
 void proto_reg_handoff_pw_eth(void);
 
-static gint proto_pw_eth_cw = -1;
-static gint proto_pw_eth_nocw = -1;
-static gint proto_pw_eth_heuristic = -1;
+static gint proto_pw_eth_cw;
+static gint proto_pw_eth_nocw;
+static gint proto_pw_eth_heuristic;
 
-static gint ett_pw_eth = -1;
+static gint ett_pw_eth;
 
-static int hf_pw_eth = -1;
-static int hf_pw_eth_cw = -1;
-static int hf_pw_eth_cw_sequence_number = -1;
+static int hf_pw_eth;
+static int hf_pw_eth_cw;
+static int hf_pw_eth_cw_sequence_number;
 
 static dissector_handle_t eth_withoutfcs_handle;
 static dissector_handle_t pw_eth_handle_cw;
diff --git a/epan/dissectors/packet-pw-fr.c b/epan/dissectors/packet-pw-fr.c
index 7c00fe411e..e874ecc5f7 100644
--- a/epan/dissectors/packet-pw-fr.c
+++ b/epan/dissectors/packet-pw-fr.c
@@ -27,23 +27,23 @@
 void proto_register_pw_fr(void);
 void proto_reg_handoff_pw_fr(void);
 
-static gint proto_encaps = -1;
-static gint ett_encaps = -1;
-
-/* static int hf_pw_fr = -1; */
-static int hf_cw_bits03 = -1;
-static int hf_cw_fecn = -1;
-static int hf_cw_becn = -1;
-static int hf_cw_de = -1;
-static int hf_cw_cr = -1;
-static int hf_cw_frg = -1;
-static int hf_cw_len = -1;
-static int hf_cw_seq = -1;
-static int hf_cw_padding = -1;
-
-static expert_field ei_payload_size_invalid = EI_INIT;
-static expert_field ei_cw_bits03 = EI_INIT;
-static expert_field ei_cw_packet_size_too_small = EI_INIT;
+static gint proto_encaps;
+static gint ett_encaps;
+
+/* static int hf_pw_fr; */
+static int hf_cw_bits03;
+static int hf_cw_fecn;
+static int hf_cw_becn;
+static int hf_cw_de;
+static int hf_cw_cr;
+static int hf_cw_frg;
+static int hf_cw_len;
+static int hf_cw_seq;
+static int hf_cw_padding;
+
+static expert_field ei_payload_size_invalid;
+static expert_field ei_cw_bits03;
+static expert_field ei_cw_packet_size_too_small;
 
 static const value_string vals_frg[] = {
 	{ 0x0,	"Unfragmented" },
diff --git a/epan/dissectors/packet-pw-hdlc.c b/epan/dissectors/packet-pw-hdlc.c
index 80995ca6a2..e5d05ef254 100644
--- a/epan/dissectors/packet-pw-hdlc.c
+++ b/epan/dissectors/packet-pw-hdlc.c
@@ -33,19 +33,19 @@ static dissector_handle_t fr_handle;
 static dissector_handle_t pw_hdlc_nocw_fr_handle;
 static dissector_handle_t pw_ppp_handle;
 
-static gint proto_pw_hdlc_nocw_fr = -1;
-static gint proto_pw_hdlc_nocw_hdlc_ppp = -1;
-
-static gint ett_pw_hdlc = -1;
-
-/* static int hf_pw_hdlc = -1; */
-static int hf_pw_hdlc_address_field = -1;
-static int hf_pw_hdlc_address = -1;
-static int hf_pw_hdlc_cr_bit = -1;
-static int hf_pw_hdlc_control_field = -1;
-static int hf_pw_hdlc_pf_bit = -1;
-static int hf_pw_hdlc_modifier = -1;
-static int hf_pw_hdlc_frame = -1;
+static gint proto_pw_hdlc_nocw_fr;
+static gint proto_pw_hdlc_nocw_hdlc_ppp;
+
+static gint ett_pw_hdlc;
+
+/* static int hf_pw_hdlc; */
+static int hf_pw_hdlc_address_field;
+static int hf_pw_hdlc_address;
+static int hf_pw_hdlc_cr_bit;
+static int hf_pw_hdlc_control_field;
+static int hf_pw_hdlc_pf_bit;
+static int hf_pw_hdlc_modifier;
+static int hf_pw_hdlc_frame;
 
 static const value_string pw_hdlc_modifier_vals[] = {
 	{0x00, "UI - Unnumbered information" },
diff --git a/epan/dissectors/packet-pw-oam.c b/epan/dissectors/packet-pw-oam.c
index dfbfe614f6..e6e1999fba 100644
--- a/epan/dissectors/packet-pw-oam.c
+++ b/epan/dissectors/packet-pw-oam.c
@@ -22,19 +22,19 @@ void proto_reg_handoff_pw_oam(void);
 static dissector_handle_t pw_oam_handle;
 
 /* MPLS-TP FM protocol specific variables */
-static gint proto_pw_oam             = -1;
-static gint ett_pw_oam               = -1;
-static gint ett_pw_oam_flags         = -1;
-static gint ett_pw_oam_tlv_tree      = -1;
-
-static int hf_pw_oam_tlv_reserved    = -1;
-static int hf_pw_oam_tlv_type        = -1;
-static int hf_pw_oam_total_tlv_len   = -1;
-static int hf_pw_oam_code            = -1;
-static int hf_pw_oam_flags           = -1;
-static int hf_pw_oam_flags_a         = -1;
-static int hf_pw_oam_refresh_timer   = -1;
-static int hf_pw_oam_tlv_len         = -1;
+static gint proto_pw_oam;
+static gint ett_pw_oam;
+static gint ett_pw_oam_flags;
+static gint ett_pw_oam_tlv_tree;
+
+static int hf_pw_oam_tlv_reserved;
+static int hf_pw_oam_tlv_type;
+static int hf_pw_oam_total_tlv_len;
+static int hf_pw_oam_code;
+static int hf_pw_oam_flags;
+static int hf_pw_oam_flags_a;
+static int hf_pw_oam_refresh_timer;
+static int hf_pw_oam_tlv_len;
 
 static const value_string pw_oam_code[] = {
   {0x00000002, "Local Attachment Circuit(ingress) Receive Fault"},
diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c
index 1c81483713..0d17d52761 100644
--- a/epan/dissectors/packet-pw-satop.c
+++ b/epan/dissectors/packet-pw-satop.c
@@ -31,25 +31,25 @@ void proto_register_pw_satop(void);
 void proto_reg_handoff_pw_satop(void);
 
 static gint proto = -1;
-static gint ett_pw_satop = -1;
-
-static int hf_cw = -1;
-static int hf_cw_bits03 = -1;
-static int hf_cw_l = -1;
-static int hf_cw_r = -1;
-static int hf_cw_rsv = -1;
-static int hf_cw_frg = -1;
-static int hf_cw_len = -1;
-static int hf_cw_seq = -1;
-static int hf_payload = -1;
-static int hf_payload_l = -1;
-
-static expert_field ei_cw_rsv = EI_INIT;
-static expert_field ei_payload_size_invalid_undecoded = EI_INIT;
-static expert_field ei_payload_size_invalid = EI_INIT;
-static expert_field ei_cw_frg = EI_INIT;
-static expert_field ei_cw_bits03 = EI_INIT;
-static expert_field ei_cw_packet_size_too_small = EI_INIT;
+static gint ett_pw_satop;
+
+static int hf_cw;
+static int hf_cw_bits03;
+static int hf_cw_l;
+static int hf_cw_r;
+static int hf_cw_rsv;
+static int hf_cw_frg;
+static int hf_cw_len;
+static int hf_cw_seq;
+static int hf_payload;
+static int hf_payload_l;
+
+static expert_field ei_cw_rsv;
+static expert_field ei_payload_size_invalid_undecoded;
+static expert_field ei_payload_size_invalid;
+static expert_field ei_cw_frg;
+static expert_field ei_cw_bits03;
+static expert_field ei_cw_packet_size_too_small;
 
 static dissector_handle_t pw_padding_handle;
 static dissector_handle_t pw_satop_udp_handle;
diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c
index 68486c9ffb..61e73fe533 100644
--- a/epan/dissectors/packet-q2931.c
+++ b/epan/dissectors/packet-q2931.c
@@ -32,127 +32,127 @@
 
 void proto_register_q2931(void);
 
-static int proto_q2931 = -1;
-static int hf_q2931_discriminator = -1;
-static int hf_q2931_call_ref_len = -1;
-static int hf_q2931_call_ref_flag = -1;
-static int hf_q2931_call_ref = -1;
-static int hf_q2931_message_type = -1;
-static int hf_q2931_message_type_ext = -1;
-static int hf_q2931_message_flag = -1;
-static int hf_q2931_message_action_indicator = -1;
-static int hf_q2931_message_len = -1;
-static int hf_q2931_ie_handling_instructions = -1;
-static int hf_q2931_ie_coding_standard = -1;
-static int hf_q2931_ie_action_indicator = -1;
+static int proto_q2931;
+static int hf_q2931_discriminator;
+static int hf_q2931_call_ref_len;
+static int hf_q2931_call_ref_flag;
+static int hf_q2931_call_ref;
+static int hf_q2931_message_type;
+static int hf_q2931_message_type_ext;
+static int hf_q2931_message_flag;
+static int hf_q2931_message_action_indicator;
+static int hf_q2931_message_len;
+static int hf_q2931_ie_handling_instructions;
+static int hf_q2931_ie_coding_standard;
+static int hf_q2931_ie_action_indicator;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_q2931_number_bytes = -1;
-static int hf_q2931_conn_id_vci = -1;
-static int hf_q2931_restart_indicator = -1;
-static int hf_q2931_conn_id_vpci = -1;
-static int hf_q2931_bband_low_layer_info_mode = -1;
-static int hf_q2931_cause_rejection_insufficient_information_element = -1;
-static int hf_q2931_bband_low_layer_info_user_info_l3_proto = -1;
-static int hf_q2931_number_string = -1;
-static int hf_q2931_aal1_backward_max_cpcs_sdu_size = -1;
-static int hf_q2931_user_plane_connection_configuration = -1;
-static int hf_q2931_party_subaddr_subaddress = -1;
-static int hf_q2931_aal1_mode = -1;
-static int hf_q2931_cause_location = -1;
-static int hf_q2931_bband_low_layer_info_user_specified_l2_proto = -1;
-static int hf_q2931_information_element = -1;
-static int hf_q2931_conn_id_preferred_exclusive = -1;
-static int hf_q2931_cause_vci = -1;
-static int hf_q2931_cause_information_element = -1;
-static int hf_q2931_oam_traffic_descriptor_backward_f5_flow_indicator = -1;
-static int hf_q2931_cause_rejection_reason = -1;
-static int hf_q2931_ethernet_type = -1;
-static int hf_q2931_cause_value = -1;
-static int hf_q2931_information_element_length = -1;
-static int hf_q2931_cause_rejection_user_specific_diagnostic = -1;
-static int hf_q2931_transit_network_sel_type = -1;
-static int hf_q2931_user_defined_aal_information = -1;
-static int hf_q2931_aal1_forward_max_cpcs_sdu_size = -1;
-static int hf_q2931_atm_transfer_capability = -1;
-static int hf_q2931_aal1_subtype = -1;
-static int hf_q2931_information_element_extension = -1;
-static int hf_q2931_party_subaddr_type_of_subaddress = -1;
-static int hf_q2931_number_plan = -1;
-static int hf_q2931_aal1_error_correction_method = -1;
-static int hf_q2931_call_state = -1;
-static int hf_q2931_bearer_class = -1;
-static int hf_q2931_protocol_id = -1;
-static int hf_q2931_information_element_data = -1;
-static int hf_q2931_aal1_partially_filled_cells_method = -1;
-static int hf_q2931_lane_protocol_id = -1;
-static int hf_q2931_party_subaddr_odd_even_indicator = -1;
-static int hf_q2931_qos_class_backward = -1;
-static int hf_q2931_cause_rejection_condition = -1;
-static int hf_q2931_aal1_source_clock_frequency_recovery_method = -1;
-static int hf_q2931_broadband_repeat_indicator = -1;
-static int hf_q2931_cause_rejection_missing_information_element = -1;
-static int hf_q2931_e2e_transit_delay_maximum_end_to_end = -1;
-static int hf_q2931_endpoint_reference_flag = -1;
-static int hf_q2931_endpoint_reference_identifier_value = -1;
-static int hf_q2931_cause_vpci = -1;
-static int hf_q2931_endpoint_state = -1;
-static int hf_q2931_high_layer_information_type = -1;
-static int hf_q2931_transit_network_sel_network_id = -1;
-static int hf_q2931_aal1_sscs_type = -1;
-static int hf_q2931_bband_low_layer_info_packet_window_size = -1;
-static int hf_q2931_aal1_structured_data_transfer_block_size = -1;
-static int hf_q2931_cause_timer = -1;
-static int hf_q2931_cause_message_type = -1;
-static int hf_q2931_e2e_transit_delay_cumulative = -1;
-static int hf_q2931_oam_traffic_descriptor_shaping_indicator = -1;
-static int hf_q2931_oam_end_to_end_f5_flow = -1;
-static int hf_q2931_oam_traffic_descriptor_forward_f5_flow_indicator = -1;
-static int hf_q2931_organization_code = -1;
-static int hf_q2931_bband_low_layer_info_additional_l3_proto = -1;
-static int hf_q2931_transit_network_sel_plan = -1;
-static int hf_q2931_bband_low_layer_info_user_info_l2_proto = -1;
-static int hf_q2931_aal1_multiplier = -1;
-static int hf_q2931_aal_type = -1;
-static int hf_q2931_aal1_cbr_rate = -1;
-static int hf_q2931_number_type = -1;
-static int hf_q2931_cause_rejection_diagnostic = -1;
-static int hf_q2931_bband_low_layer_info_default_packet_size = -1;
-static int hf_q2931_susceptibility_to_clipping = -1;
-static int hf_q2931_oam_traffic_descriptor_management_indicator = -1;
-static int hf_q2931_qos_class_forward = -1;
-static int hf_q2931_endpoint_reference_type = -1;
-static int hf_q2931_number_presentation_indicator = -1;
-static int hf_q2931_bband_low_layer_info_user_info_l1_proto = -1;
-static int hf_q2931_number_screening_indicator = -1;
-static int hf_q2931_bband_low_layer_info_window_size = -1;
-static int hf_q2931_conn_id_vp_associated_signalling = -1;
-static int hf_q2931_cause_cell_rate_subfield_identifier = -1;
-static int hf_q2931_frame_discard_forward_dir = -1;
-static int hf_q2931_frame_discard_backward_dir = -1;
-static int hf_q2931_tagging_backward_dir = -1;
-static int hf_q2931_tagging_forward_dir = -1;
-static int hf_q2931_midrange = -1;
-static int hf_q2931_cause_network_service = -1;
-static int hf_q2931_cause_network_behavior = -1;
-static int hf_q2931_nsap_address_number_short = -1;
-static int hf_q2931_atm_identifier = -1;
-static int hf_q2931_atm_identifier_value = -1;
-static int hf_q2931_aal_parameter_identifier = -1;
-static int hf_q2931_e2e_transit_delay_identifier = -1;
-static int hf_q2931_bband_sending_complete_id = -1;
-static int hf_q2931_bband_sending_complete = -1;
-static int hf_q2931_locking_codeset = -1;
-
-static gint ett_q2931 = -1;
-static gint ett_q2931_ext = -1;
-static gint ett_q2931_ie = -1;
-static gint ett_q2931_ie_ext = -1;
-static gint ett_q2931_nsap = -1;
-
-static expert_field ei_q2931_atm_identifier = EI_INIT;
-static expert_field ei_q2931_aal_parameter_identifier = EI_INIT;
-static expert_field ei_q2931_e2e_transit_delay_identifier = EI_INIT;
-static expert_field ei_q2931_bband_sending_complete_id = EI_INIT;
+static int hf_q2931_number_bytes;
+static int hf_q2931_conn_id_vci;
+static int hf_q2931_restart_indicator;
+static int hf_q2931_conn_id_vpci;
+static int hf_q2931_bband_low_layer_info_mode;
+static int hf_q2931_cause_rejection_insufficient_information_element;
+static int hf_q2931_bband_low_layer_info_user_info_l3_proto;
+static int hf_q2931_number_string;
+static int hf_q2931_aal1_backward_max_cpcs_sdu_size;
+static int hf_q2931_user_plane_connection_configuration;
+static int hf_q2931_party_subaddr_subaddress;
+static int hf_q2931_aal1_mode;
+static int hf_q2931_cause_location;
+static int hf_q2931_bband_low_layer_info_user_specified_l2_proto;
+static int hf_q2931_information_element;
+static int hf_q2931_conn_id_preferred_exclusive;
+static int hf_q2931_cause_vci;
+static int hf_q2931_cause_information_element;
+static int hf_q2931_oam_traffic_descriptor_backward_f5_flow_indicator;
+static int hf_q2931_cause_rejection_reason;
+static int hf_q2931_ethernet_type;
+static int hf_q2931_cause_value;
+static int hf_q2931_information_element_length;
+static int hf_q2931_cause_rejection_user_specific_diagnostic;
+static int hf_q2931_transit_network_sel_type;
+static int hf_q2931_user_defined_aal_information;
+static int hf_q2931_aal1_forward_max_cpcs_sdu_size;
+static int hf_q2931_atm_transfer_capability;
+static int hf_q2931_aal1_subtype;
+static int hf_q2931_information_element_extension;
+static int hf_q2931_party_subaddr_type_of_subaddress;
+static int hf_q2931_number_plan;
+static int hf_q2931_aal1_error_correction_method;
+static int hf_q2931_call_state;
+static int hf_q2931_bearer_class;
+static int hf_q2931_protocol_id;
+static int hf_q2931_information_element_data;
+static int hf_q2931_aal1_partially_filled_cells_method;
+static int hf_q2931_lane_protocol_id;
+static int hf_q2931_party_subaddr_odd_even_indicator;
+static int hf_q2931_qos_class_backward;
+static int hf_q2931_cause_rejection_condition;
+static int hf_q2931_aal1_source_clock_frequency_recovery_method;
+static int hf_q2931_broadband_repeat_indicator;
+static int hf_q2931_cause_rejection_missing_information_element;
+static int hf_q2931_e2e_transit_delay_maximum_end_to_end;
+static int hf_q2931_endpoint_reference_flag;
+static int hf_q2931_endpoint_reference_identifier_value;
+static int hf_q2931_cause_vpci;
+static int hf_q2931_endpoint_state;
+static int hf_q2931_high_layer_information_type;
+static int hf_q2931_transit_network_sel_network_id;
+static int hf_q2931_aal1_sscs_type;
+static int hf_q2931_bband_low_layer_info_packet_window_size;
+static int hf_q2931_aal1_structured_data_transfer_block_size;
+static int hf_q2931_cause_timer;
+static int hf_q2931_cause_message_type;
+static int hf_q2931_e2e_transit_delay_cumulative;
+static int hf_q2931_oam_traffic_descriptor_shaping_indicator;
+static int hf_q2931_oam_end_to_end_f5_flow;
+static int hf_q2931_oam_traffic_descriptor_forward_f5_flow_indicator;
+static int hf_q2931_organization_code;
+static int hf_q2931_bband_low_layer_info_additional_l3_proto;
+static int hf_q2931_transit_network_sel_plan;
+static int hf_q2931_bband_low_layer_info_user_info_l2_proto;
+static int hf_q2931_aal1_multiplier;
+static int hf_q2931_aal_type;
+static int hf_q2931_aal1_cbr_rate;
+static int hf_q2931_number_type;
+static int hf_q2931_cause_rejection_diagnostic;
+static int hf_q2931_bband_low_layer_info_default_packet_size;
+static int hf_q2931_susceptibility_to_clipping;
+static int hf_q2931_oam_traffic_descriptor_management_indicator;
+static int hf_q2931_qos_class_forward;
+static int hf_q2931_endpoint_reference_type;
+static int hf_q2931_number_presentation_indicator;
+static int hf_q2931_bband_low_layer_info_user_info_l1_proto;
+static int hf_q2931_number_screening_indicator;
+static int hf_q2931_bband_low_layer_info_window_size;
+static int hf_q2931_conn_id_vp_associated_signalling;
+static int hf_q2931_cause_cell_rate_subfield_identifier;
+static int hf_q2931_frame_discard_forward_dir;
+static int hf_q2931_frame_discard_backward_dir;
+static int hf_q2931_tagging_backward_dir;
+static int hf_q2931_tagging_forward_dir;
+static int hf_q2931_midrange;
+static int hf_q2931_cause_network_service;
+static int hf_q2931_cause_network_behavior;
+static int hf_q2931_nsap_address_number_short;
+static int hf_q2931_atm_identifier;
+static int hf_q2931_atm_identifier_value;
+static int hf_q2931_aal_parameter_identifier;
+static int hf_q2931_e2e_transit_delay_identifier;
+static int hf_q2931_bband_sending_complete_id;
+static int hf_q2931_bband_sending_complete;
+static int hf_q2931_locking_codeset;
+
+static gint ett_q2931;
+static gint ett_q2931_ext;
+static gint ett_q2931_ie;
+static gint ett_q2931_ie_ext;
+static gint ett_q2931_nsap;
+
+static expert_field ei_q2931_atm_identifier;
+static expert_field ei_q2931_aal_parameter_identifier;
+static expert_field ei_q2931_e2e_transit_delay_identifier;
+static expert_field ei_q2931_bband_sending_complete_id;
 
 static void dissect_q2931_ie(tvbuff_t *tvb, packet_info* pinfo, int offset, int len,
 			     proto_tree *tree, guint8 info_element, guint8 info_element_ext);
diff --git a/epan/dissectors/packet-q708.c b/epan/dissectors/packet-q708.c
index b0d0037bb0..ba5f6ac80c 100644
--- a/epan/dissectors/packet-q708.c
+++ b/epan/dissectors/packet-q708.c
@@ -17,10 +17,10 @@
 
 void proto_register_q708(void);
 
-static int proto_q708 = -1;
-static int hf_q708_sanc = -1;
-static int hf_q708_ispc_name = -1;
-static int hf_q708_ispc_operator_name = -1;
+static int proto_q708;
+static int hf_q708_sanc;
+static int hf_q708_ispc_name;
+static int hf_q708_ispc_operator_name;
 
 /*
  * List of Signalling Area/Network Codes (SANC)
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c
index fbc99623e0..ca9c9a22c0 100644
--- a/epan/dissectors/packet-q931.c
+++ b/epan/dissectors/packet-q931.c
@@ -47,179 +47,179 @@ static int q931_tap = -1;
 static dissector_handle_t q931_handle;
 static dissector_handle_t q931_over_ip_handle;
 
-static int proto_q931                                   = -1;
-static int hf_q931_discriminator                        = -1;
-static int hf_q931_coding_standard                      = -1;
-static int hf_q931_interpretation                       = -1;
-static int hf_q931_pres_meth_prot_prof                  = -1;
-static int hf_q931_high_layer_characteristics           = -1;
-static int hf_q931_extended_high_layer_characteristics  = -1;
-static int hf_q931_extended_audiovisual_characteristics = -1;
-static int hf_q931_information_transfer_capability      = -1;
-static int hf_q931_transfer_mode                        = -1;
-static int hf_q931_information_transfer_rate            = -1;
-static int hf_q931_layer_ident                          = -1;
-static int hf_q931_uil1                                 = -1;
-static int hf_q931_call_ref_len                         = -1;
-static int hf_q931_call_ref_flag                        = -1;
-static int hf_q931_call_ref                             = -1;
-static int hf_q931_message_type                         = -1;
-static int hf_q931_maintenance_message_type             = -1;
-static int hf_q931_segment_type                         = -1;
-static int hf_q931_cause_location                       = -1;
-static int hf_q931_cause_value                          = -1;
-static int hf_q931_number_type                          = -1;
-static int hf_q931_numbering_plan                       = -1;
-static int hf_q931_extension_ind                        = -1;
-static int hf_q931_extension_ind_preference             = -1;
-static int hf_q931_extension_ind_new_status             = -1;
-static int hf_q931_calling_party_number                 = -1;
-static int hf_q931_called_party_number                  = -1;
-static int hf_q931_connected_number                     = -1;
-static int hf_q931_redirecting_number                   = -1;
-static int hf_q931_screening_ind                        = -1;
-static int hf_q931_presentation_ind                     = -1;
+static int proto_q931;
+static int hf_q931_discriminator;
+static int hf_q931_coding_standard;
+static int hf_q931_interpretation;
+static int hf_q931_pres_meth_prot_prof;
+static int hf_q931_high_layer_characteristics;
+static int hf_q931_extended_high_layer_characteristics;
+static int hf_q931_extended_audiovisual_characteristics;
+static int hf_q931_information_transfer_capability;
+static int hf_q931_transfer_mode;
+static int hf_q931_information_transfer_rate;
+static int hf_q931_layer_ident;
+static int hf_q931_uil1;
+static int hf_q931_call_ref_len;
+static int hf_q931_call_ref_flag;
+static int hf_q931_call_ref;
+static int hf_q931_message_type;
+static int hf_q931_maintenance_message_type;
+static int hf_q931_segment_type;
+static int hf_q931_cause_location;
+static int hf_q931_cause_value;
+static int hf_q931_number_type;
+static int hf_q931_numbering_plan;
+static int hf_q931_extension_ind;
+static int hf_q931_extension_ind_preference;
+static int hf_q931_extension_ind_new_status;
+static int hf_q931_calling_party_number;
+static int hf_q931_called_party_number;
+static int hf_q931_connected_number;
+static int hf_q931_redirecting_number;
+static int hf_q931_screening_ind;
+static int hf_q931_presentation_ind;
 
 /* fields for Channel Indentification IE */
-static int hf_q931_channel_interface_explicit           = -1;
-static int hf_q931_channel_interface_type               = -1;
-static int hf_q931_channel_exclusive                    = -1;
-static int hf_q931_channel_dchan                        = -1;
-static int hf_q931_channel_selection_bri                = -1;
-static int hf_q931_channel_selection_pri                = -1;
-static int hf_q931_channel_map                          = -1;
-static int hf_q931_channel_element_type                 = -1;
-static int hf_q931_channel_number                       = -1;
-
-
-static int hf_q931_segments = -1;
-static int hf_q931_segment = -1;
-static int hf_q931_segment_overlap = -1;
-static int hf_q931_segment_overlap_conflict = -1;
-static int hf_q931_segment_multiple_tails = -1;
-static int hf_q931_segment_too_long_segment = -1;
-static int hf_q931_segment_error = -1;
-static int hf_q931_segment_count = -1;
-static int hf_q931_reassembled_in = -1;
-static int hf_q931_reassembled_length = -1;
+static int hf_q931_channel_interface_explicit;
+static int hf_q931_channel_interface_type;
+static int hf_q931_channel_exclusive;
+static int hf_q931_channel_dchan;
+static int hf_q931_channel_selection_bri;
+static int hf_q931_channel_selection_pri;
+static int hf_q931_channel_map;
+static int hf_q931_channel_element_type;
+static int hf_q931_channel_number;
+
+
+static int hf_q931_segments;
+static int hf_q931_segment;
+static int hf_q931_segment_overlap;
+static int hf_q931_segment_overlap_conflict;
+static int hf_q931_segment_multiple_tails;
+static int hf_q931_segment_too_long_segment;
+static int hf_q931_segment_error;
+static int hf_q931_segment_count;
+static int hf_q931_reassembled_in;
+static int hf_q931_reassembled_length;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_q931_user_information_bytes = -1;
-static int hf_q931_restart_indicator = -1;
-static int hf_q931_call_state_data = -1;
-static int hf_q931_first_segment = -1;
-static int hf_q931_packet_size_backward_value = -1;
-static int hf_q931_packet_size_forward_value = -1;
-static int hf_q931_information_rate_minimum_outgoing = -1;
-static int hf_q931_bearer_capability_data = -1;
-static int hf_q931_uil2_info = -1;
-static int hf_q931_netid_facility_specification = -1;
-static int hf_q931_bearer_capability_stop_bits = -1;
-static int hf_q931_netid_length = -1;
-static int hf_q931_channel_data = -1;
-static int hf_q931_call_state = -1;
-static int hf_q931_party_subaddr_type = -1;
-static int hf_q931_uil3 = -1;
-static int hf_q931_user_information_str = -1;
-static int hf_q931_bearer_capability_user_rate = -1;
-static int hf_q931_channel_slot_map = -1;
-static int hf_q931_bearer_capability_modem_type = -1;
-static int hf_q931_cause_data = -1;
-static int hf_q931_cause_recommendation = -1;
-static int hf_q931_bearer_capability_parity = -1;
-static int hf_q931_cause_call_rejection_reason = -1;
-static int hf_q931_party_category = -1;
-static int hf_q931_progress_indicator_location = -1;
-static int hf_q931_bearer_capability_packet_window_size = -1;
-static int hf_q931_extension_reason = -1;
-static int hf_q931_information_rate_minimum_incoming = -1;
-static int hf_q931_user_protocol_discriminator = -1;
-static int hf_q931_uil2 = -1;
-static int hf_q931_progress_indicator_description = -1;
-static int hf_q931_bearer_capability_mode = -1;
-static int hf_q931_not_first_segment = -1;
-static int hf_q931_fast_select = -1;
-static int hf_q931_netid_plan = -1;
-static int hf_q931_cause_call_message_type = -1;
-static int hf_q931_reverse_charging_ind = -1;
-static int hf_q931_high_layer_compat_data = -1;
-static int hf_q931_progress_indicator_data = -1;
-static int hf_q931_pl_window_size_forward_value = -1;
-static int hf_q931_cause_call_rec_timer = -1;
-static int hf_q931_bearer_capability_window_size = -1;
-static int hf_q931_cause_call_user_specific_diagnostic = -1;
-static int hf_q931_channel_interface_id = -1;
-static int hf_q931_uil3_additional = -1;
-static int hf_q931_party_subaddr = -1;
-static int hf_q931_bearer_capability_rate_multiplier = -1;
-static int hf_q931_bearer_capability_data_bits = -1;
-static int hf_q931_cug_index_code = -1;
-static int hf_q931_bearer_capability_default_packet_size = -1;
-static int hf_q931_notification_description = -1;
-static int hf_q931_information_rate_outgoing = -1;
-static int hf_q931_user_information_len = -1;
-static int hf_q931_pl_window_size_backward_value = -1;
-static int hf_q931_repeat_indicator = -1;
-static int hf_q931_cause_call_diagnostic = -1;
-static int hf_q931_netid = -1;
-static int hf_q931_cause_call_condition = -1;
-static int hf_q931_signal = -1;
-static int hf_q931_congestion_level = -1;
-static int hf_q931_bearer_capability_intermediate_rate = -1;
-static int hf_q931_netid_type = -1;
-static int hf_q931_information_rate_incoming = -1;
-static int hf_q931_party_subaddr_odd_even_indicator = -1;
-static int hf_q931_cug_indication = -1;
-static int hf_q931_multiple_frame_establishment = -1;
-static int hf_q931_message_originator = -1;
-static int hf_q931_out_band_negotiation = -1;
-static int hf_q931_negotiation_is_done = -1;
-static int hf_q931_layer_1 = -1;
-static int hf_q931_accept_data_flow_control = -1;
-static int hf_q931_mode_of_operation = -1;
-static int hf_q931_extension_condition_type = -1;
-static int hf_q931_pl_binary_confirmation = -1;
-static int hf_q931_pl_request = -1;
-static int hf_q931_pl_modulus = -1;
-static int hf_q931_network_service = -1;
-static int hf_q931_extension_condition = -1;
-static int hf_q931_rate_adaption_header = -1;
-static int hf_q931_send_data_net_independent_clock = -1;
-static int hf_q931_bearer_capability_duplex = -1;
-static int hf_q931_accept_data_net_independent_clock = -1;
-static int hf_q931_send_data_flow_control = -1;
-static int hf_q931_data = -1;
-static int hf_q931_layer_1_in_band_negotiation = -1;
-static int hf_q931_information_element = -1;
-static int hf_q931_information_element_len = -1;
-static int hf_q931_date_time = -1;
-static int hf_q931_more_data = -1;
-static int hf_q931_sending_complete = -1;
-static int hf_q931_message_segment = -1;
-static int hf_q931_missing_info_element = -1;
-static int hf_q931_insufficient_info_element = -1;
-static int hf_q931_cumulative_transit_delay = -1;
-static int hf_q931_requested_end_to_end_transit_delay = -1;
-static int hf_q931_maximum_end_to_end_transit_delay = -1;
-static int hf_q931_transit_delay = -1;
-static int hf_q931_display_information = -1;
-static int hf_q931_keypad_facility = -1;
-static int hf_q931_avaya_display = -1;
-static int hf_q931_locking_codeset = -1;
-static int hf_q931_protocol_negotiation = -1;
-
-
-static gint ett_q931                    = -1;
+static int hf_q931_user_information_bytes;
+static int hf_q931_restart_indicator;
+static int hf_q931_call_state_data;
+static int hf_q931_first_segment;
+static int hf_q931_packet_size_backward_value;
+static int hf_q931_packet_size_forward_value;
+static int hf_q931_information_rate_minimum_outgoing;
+static int hf_q931_bearer_capability_data;
+static int hf_q931_uil2_info;
+static int hf_q931_netid_facility_specification;
+static int hf_q931_bearer_capability_stop_bits;
+static int hf_q931_netid_length;
+static int hf_q931_channel_data;
+static int hf_q931_call_state;
+static int hf_q931_party_subaddr_type;
+static int hf_q931_uil3;
+static int hf_q931_user_information_str;
+static int hf_q931_bearer_capability_user_rate;
+static int hf_q931_channel_slot_map;
+static int hf_q931_bearer_capability_modem_type;
+static int hf_q931_cause_data;
+static int hf_q931_cause_recommendation;
+static int hf_q931_bearer_capability_parity;
+static int hf_q931_cause_call_rejection_reason;
+static int hf_q931_party_category;
+static int hf_q931_progress_indicator_location;
+static int hf_q931_bearer_capability_packet_window_size;
+static int hf_q931_extension_reason;
+static int hf_q931_information_rate_minimum_incoming;
+static int hf_q931_user_protocol_discriminator;
+static int hf_q931_uil2;
+static int hf_q931_progress_indicator_description;
+static int hf_q931_bearer_capability_mode;
+static int hf_q931_not_first_segment;
+static int hf_q931_fast_select;
+static int hf_q931_netid_plan;
+static int hf_q931_cause_call_message_type;
+static int hf_q931_reverse_charging_ind;
+static int hf_q931_high_layer_compat_data;
+static int hf_q931_progress_indicator_data;
+static int hf_q931_pl_window_size_forward_value;
+static int hf_q931_cause_call_rec_timer;
+static int hf_q931_bearer_capability_window_size;
+static int hf_q931_cause_call_user_specific_diagnostic;
+static int hf_q931_channel_interface_id;
+static int hf_q931_uil3_additional;
+static int hf_q931_party_subaddr;
+static int hf_q931_bearer_capability_rate_multiplier;
+static int hf_q931_bearer_capability_data_bits;
+static int hf_q931_cug_index_code;
+static int hf_q931_bearer_capability_default_packet_size;
+static int hf_q931_notification_description;
+static int hf_q931_information_rate_outgoing;
+static int hf_q931_user_information_len;
+static int hf_q931_pl_window_size_backward_value;
+static int hf_q931_repeat_indicator;
+static int hf_q931_cause_call_diagnostic;
+static int hf_q931_netid;
+static int hf_q931_cause_call_condition;
+static int hf_q931_signal;
+static int hf_q931_congestion_level;
+static int hf_q931_bearer_capability_intermediate_rate;
+static int hf_q931_netid_type;
+static int hf_q931_information_rate_incoming;
+static int hf_q931_party_subaddr_odd_even_indicator;
+static int hf_q931_cug_indication;
+static int hf_q931_multiple_frame_establishment;
+static int hf_q931_message_originator;
+static int hf_q931_out_band_negotiation;
+static int hf_q931_negotiation_is_done;
+static int hf_q931_layer_1;
+static int hf_q931_accept_data_flow_control;
+static int hf_q931_mode_of_operation;
+static int hf_q931_extension_condition_type;
+static int hf_q931_pl_binary_confirmation;
+static int hf_q931_pl_request;
+static int hf_q931_pl_modulus;
+static int hf_q931_network_service;
+static int hf_q931_extension_condition;
+static int hf_q931_rate_adaption_header;
+static int hf_q931_send_data_net_independent_clock;
+static int hf_q931_bearer_capability_duplex;
+static int hf_q931_accept_data_net_independent_clock;
+static int hf_q931_send_data_flow_control;
+static int hf_q931_data;
+static int hf_q931_layer_1_in_band_negotiation;
+static int hf_q931_information_element;
+static int hf_q931_information_element_len;
+static int hf_q931_date_time;
+static int hf_q931_more_data;
+static int hf_q931_sending_complete;
+static int hf_q931_message_segment;
+static int hf_q931_missing_info_element;
+static int hf_q931_insufficient_info_element;
+static int hf_q931_cumulative_transit_delay;
+static int hf_q931_requested_end_to_end_transit_delay;
+static int hf_q931_maximum_end_to_end_transit_delay;
+static int hf_q931_transit_delay;
+static int hf_q931_display_information;
+static int hf_q931_keypad_facility;
+static int hf_q931_avaya_display;
+static int hf_q931_locking_codeset;
+static int hf_q931_protocol_negotiation;
+
+
+static gint ett_q931;
 #define NUM_IE  256
 static gint ett_q931_ie[NUM_IE];
 
-static gint ett_q931_segments = -1;
-static gint ett_q931_segment = -1;
+static gint ett_q931_segments;
+static gint ett_q931_segment;
 
-static expert_field ei_q931_invalid_length = EI_INIT;
-static expert_field ei_q931_date_time = EI_INIT;
-static expert_field ei_q931_information_element = EI_INIT;
-static expert_field ei_q931_incomplete_ie = EI_INIT;
+static expert_field ei_q931_invalid_length;
+static expert_field ei_q931_date_time;
+static expert_field ei_q931_information_element;
+static expert_field ei_q931_incomplete_ie;
 
 static const fragment_items q931_frag_items = {
     &ett_q931_segment,
diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c
index c9024d430a..18b718536b 100644
--- a/epan/dissectors/packet-q933.c
+++ b/epan/dissectors/packet-q933.c
@@ -19,116 +19,116 @@
 void proto_register_q933(void);
 void proto_reg_handoff_q933(void);
 
-static int proto_q933 					= -1;
-static int hf_q933_discriminator			= -1;
-static int hf_q933_coding_standard			= -1;
-static int hf_q933_information_transfer_capability	= -1;
-static int hf_q933_transfer_mode			= -1;
-static int hf_q933_uil1					= -1;
-static int hf_q933_call_ref_len 			= -1;
-static int hf_q933_call_ref_flag 			= -1;
-static int hf_q933_call_ref 				= -1;
-static int hf_q933_message_type 			= -1;
-static int hf_q933_cause_location			= -1;
-static int hf_q933_cause_value 				= -1;
-static int hf_q933_number_type				= -1;
-static int hf_q933_numbering_plan			= -1;
-static int hf_q933_extension_ind			= -1;
-static int hf_q933_calling_party_number 		= -1;
-static int hf_q933_called_party_number 			= -1;
-static int hf_q933_connected_number 			= -1;
-/* static int hf_q933_redirecting_number 			= -1; */
-static int hf_q933_screening_ind			= -1;
-static int hf_q933_presentation_ind			= -1;
-static int hf_q933_report_type				= -1;
-static int hf_q933_link_verf_txseq		       	= -1;
-static int hf_q933_link_verf_rxseq		       	= -1;
-static int hf_q933_data		       	        = -1;
+static int proto_q933;
+static int hf_q933_discriminator;
+static int hf_q933_coding_standard;
+static int hf_q933_information_transfer_capability;
+static int hf_q933_transfer_mode;
+static int hf_q933_uil1;
+static int hf_q933_call_ref_len;
+static int hf_q933_call_ref_flag;
+static int hf_q933_call_ref;
+static int hf_q933_message_type;
+static int hf_q933_cause_location;
+static int hf_q933_cause_value;
+static int hf_q933_number_type;
+static int hf_q933_numbering_plan;
+static int hf_q933_extension_ind;
+static int hf_q933_calling_party_number;
+static int hf_q933_called_party_number;
+static int hf_q933_connected_number;
+/* static int hf_q933_redirecting_number; */
+static int hf_q933_screening_ind;
+static int hf_q933_presentation_ind;
+static int hf_q933_report_type;
+static int hf_q933_link_verf_txseq;
+static int hf_q933_link_verf_rxseq;
+static int hf_q933_data;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_q933_user_information_layer_3_protocol = -1;
-static int hf_q933_additional_layer_3_protocol_information = -1;
-static int hf_q933_network_identification_plan = -1;
-static int hf_q933_map_element_type = -1;
-static int hf_q933_channel_type = -1;
-static int hf_q933_channel_indicated_by = -1;
-static int hf_q933_extended_audiovisual_characteristics_id = -1;
-static int hf_q933_location = -1;
-static int hf_q933_subaddress = -1;
-static int hf_q933_type_of_network_identification = -1;
-static int hf_q933_address_inclusion = -1;
-static int hf_q933_odd_even_indicator = -1;
-static int hf_q933_reverse_charging_indication = -1;
-static int hf_q933_call_state = -1;
-static int hf_q933_user_information_layer_2_protocol = -1;
-static int hf_q933_packet_window_size = -1;
-static int hf_q933_locking_shift_to_codeset = -1;
-static int hf_q933_non_locking_shift_to_codeset = -1;
-static int hf_q933_not_first_segment = -1;
-static int hf_q933_user_rate = -1;
-static int hf_q933_indicated_channel_required = -1;
-static int hf_q933_high_layer_characteristics_identification = -1;
-static int hf_q933_rejection_reason = -1;
-static int hf_q933_progress_description = -1;
-static int hf_q933_parity = -1;
-static int hf_q933_extended_high_layer_characteristics_id = -1;
-static int hf_q933_dlci = -1;
-static int hf_q933_recommendation = -1;
-static int hf_q933_mode = -1;
-static int hf_q933_user_information_str = -1;
-static int hf_q933_network_service = -1;
-static int hf_q933_interface_basic = -1;
-static int hf_q933_missing_information_element = -1;
-static int hf_q933_information_element = -1;
-static int hf_q933_condition_normal = -1;
-static int hf_q933_not_channel_selection = -1;
-static int hf_q933_network_identification_length = -1;
-static int hf_q933_segmented_message_type = -1;
-static int hf_q933_diagnostic = -1;
-static int hf_q933_user_specified_layer_2_protocol_information = -1;
-static int hf_q933_interface_identified = -1;
-static int hf_q933_network_specific_facility_specification = -1;
-static int hf_q933_data_bits = -1;
-static int hf_q933_default_packet_size = -1;
-static int hf_q933_insufficient_information_element = -1;
-static int hf_q933_modem_type = -1;
-static int hf_q933_user_information_bytes = -1;
-static int hf_q933_multiple_frame_establishment = -1;
-static int hf_q933_duplex = -1;
-static int hf_q933_mode_of_operation = -1;
-static int hf_q933_condition = -1;
-static int hf_q933_status = -1;
-static int hf_q933_repeat_indicator = -1;
-static int hf_q933_confirmation = -1;
-static int hf_q933_default_packet_size_0F = -1;
-static int hf_q933_interface_identifier = -1;
-static int hf_q933_stop_bits = -1;
-static int hf_q933_indicated_channel_d_channel = -1;
-static int hf_q933_channel_selection = -1;
-static int hf_q933_user_specific_diagnostic = -1;
-static int hf_q933_timer = -1;
-static int hf_q933_first_segment = -1;
-static int hf_q933_network_identification = -1;
-static int hf_q933_out_band_negotiation = -1;
-static int hf_q933_layer_1 = -1;
-static int hf_q933_type_of_subaddress = -1;
-static int hf_q933_protocol_discriminator = -1;
-static int hf_q933_rate_adaption_header = -1;
-static int hf_q933_reason_for_redirection = -1;
-static int hf_q933_length = -1;
-static int hf_q933_diagnostics = -1;
-static int hf_q933_display_information = -1;
-static int hf_q933_cumulative_transit_delay = -1;
-static int hf_q933_requested_end_to_end_transit_delay = -1;
-static int hf_q933_max_end_to_end_transit_delay = -1;
-static int hf_q933_transit_delay = -1;
-static int hf_q933_request = -1;
-
-static gint ett_q933 					= -1;
-static gint ett_q933_ie 				= -1;
-
-static expert_field ei_q933_invalid_length = EI_INIT;
-static expert_field ei_q933_information_element = EI_INIT;
+static int hf_q933_user_information_layer_3_protocol;
+static int hf_q933_additional_layer_3_protocol_information;
+static int hf_q933_network_identification_plan;
+static int hf_q933_map_element_type;
+static int hf_q933_channel_type;
+static int hf_q933_channel_indicated_by;
+static int hf_q933_extended_audiovisual_characteristics_id;
+static int hf_q933_location;
+static int hf_q933_subaddress;
+static int hf_q933_type_of_network_identification;
+static int hf_q933_address_inclusion;
+static int hf_q933_odd_even_indicator;
+static int hf_q933_reverse_charging_indication;
+static int hf_q933_call_state;
+static int hf_q933_user_information_layer_2_protocol;
+static int hf_q933_packet_window_size;
+static int hf_q933_locking_shift_to_codeset;
+static int hf_q933_non_locking_shift_to_codeset;
+static int hf_q933_not_first_segment;
+static int hf_q933_user_rate;
+static int hf_q933_indicated_channel_required;
+static int hf_q933_high_layer_characteristics_identification;
+static int hf_q933_rejection_reason;
+static int hf_q933_progress_description;
+static int hf_q933_parity;
+static int hf_q933_extended_high_layer_characteristics_id;
+static int hf_q933_dlci;
+static int hf_q933_recommendation;
+static int hf_q933_mode;
+static int hf_q933_user_information_str;
+static int hf_q933_network_service;
+static int hf_q933_interface_basic;
+static int hf_q933_missing_information_element;
+static int hf_q933_information_element;
+static int hf_q933_condition_normal;
+static int hf_q933_not_channel_selection;
+static int hf_q933_network_identification_length;
+static int hf_q933_segmented_message_type;
+static int hf_q933_diagnostic;
+static int hf_q933_user_specified_layer_2_protocol_information;
+static int hf_q933_interface_identified;
+static int hf_q933_network_specific_facility_specification;
+static int hf_q933_data_bits;
+static int hf_q933_default_packet_size;
+static int hf_q933_insufficient_information_element;
+static int hf_q933_modem_type;
+static int hf_q933_user_information_bytes;
+static int hf_q933_multiple_frame_establishment;
+static int hf_q933_duplex;
+static int hf_q933_mode_of_operation;
+static int hf_q933_condition;
+static int hf_q933_status;
+static int hf_q933_repeat_indicator;
+static int hf_q933_confirmation;
+static int hf_q933_default_packet_size_0F;
+static int hf_q933_interface_identifier;
+static int hf_q933_stop_bits;
+static int hf_q933_indicated_channel_d_channel;
+static int hf_q933_channel_selection;
+static int hf_q933_user_specific_diagnostic;
+static int hf_q933_timer;
+static int hf_q933_first_segment;
+static int hf_q933_network_identification;
+static int hf_q933_out_band_negotiation;
+static int hf_q933_layer_1;
+static int hf_q933_type_of_subaddress;
+static int hf_q933_protocol_discriminator;
+static int hf_q933_rate_adaption_header;
+static int hf_q933_reason_for_redirection;
+static int hf_q933_length;
+static int hf_q933_diagnostics;
+static int hf_q933_display_information;
+static int hf_q933_cumulative_transit_delay;
+static int hf_q933_requested_end_to_end_transit_delay;
+static int hf_q933_max_end_to_end_transit_delay;
+static int hf_q933_transit_delay;
+static int hf_q933_request;
+
+static gint ett_q933;
+static gint ett_q933_ie;
+
+static expert_field ei_q933_invalid_length;
+static expert_field ei_q933_information_element;
 
 static dissector_handle_t q933_handle;
 
diff --git a/epan/dissectors/packet-qllc.c b/epan/dissectors/packet-qllc.c
index cf7fee3f7d..12febcf70d 100644
--- a/epan/dissectors/packet-qllc.c
+++ b/epan/dissectors/packet-qllc.c
@@ -16,11 +16,11 @@
 void proto_register_qllc(void);
 void proto_reg_handoff_qllc(void);
 
-static int proto_qllc = -1;
-static int hf_qllc_address = -1;
-static int hf_qllc_control = -1;
+static int proto_qllc;
+static int hf_qllc_address;
+static int hf_qllc_control;
 
-static gint ett_qllc = -1;
+static gint ett_qllc;
 
 static dissector_handle_t sna_handle;
 
diff --git a/epan/dissectors/packet-qnet6.c b/epan/dissectors/packet-qnet6.c
index e081b9e04b..f012f1e59d 100644
--- a/epan/dissectors/packet-qnet6.c
+++ b/epan/dissectors/packet-qnet6.c
@@ -24,493 +24,493 @@ void proto_register_qnet6(void);
 
 static dissector_handle_t qnet6_handle;
 
-static int proto_qnet6_l4 = -1;
-static int proto_qnet6_qos = -1;
-static int proto_qnet6_lr = -1;
-static int proto_qnet6_kif = -1;
-static int proto_qnet6_nr = -1;
-
-static int hf_qnet6_l4_padding = -1;
-static int hf_qnet6_l4_ver = -1;
-static int hf_qnet6_l4_type = -1;
-static int hf_qnet6_l4_flags = -1;
-static int hf_qnet6_l4_flags_first = -1;
-static int hf_qnet6_l4_flags_last = -1;
-static int hf_qnet6_l4_flags_crc = -1;
-static int hf_qnet6_l4_qos_info = -1;
-static int hf_qnet6_l4_qos_src_nd_for_dst = -1;
-static int hf_qnet6_l4_qos_dst_nd_for_src = -1;
-static int hf_qnet6_l4_qos_src_conn_id = -1;
-static int hf_qnet6_l4_qos_dst_conn_id = -1;
-static int hf_qnet6_l4_qos_src_seq_num = -1;
-static int hf_qnet6_l4_qos_qos_type = -1;
-static int hf_qnet6_l4_qos_src_qos_idx = -1;
-static int hf_qnet6_l4_layer = -1;
-static int hf_qnet6_l4_offset = -1;
-static int hf_qnet6_l4_length = -1;
-static int hf_qnet6_l4_crc = -1;
-
-static int hf_qnet6_qos_tcs_src_name_off = -1;
-static int hf_qnet6_qos_tcs_src_name_generated = -1;
-static int hf_qnet6_qos_tcs_src_domain_off = -1;
-static int hf_qnet6_qos_tcs_src_domain_generated = -1;
-static int hf_qnet6_qos_tcs_dst_name_off = -1;
-static int hf_qnet6_qos_tcs_dst_name_generated = -1;
-static int hf_qnet6_qos_tcs_dst_domain_off = -1;
-static int hf_qnet6_qos_tcs_dst_domain_generated = -1;
-
-static int hf_qnet6_lr_ver = -1;
-static int hf_qnet6_lr_type = -1;
-static int hf_qnet6_lr_total_len = -1;
-static int hf_qnet6_lr_src = -1;
-static int hf_qnet6_lr_src_name_off = -1;
-static int hf_qnet6_lr_src_name_len = -1;
-static int hf_qnet6_lr_src_name_generated = -1;
-static int hf_qnet6_lr_src_domain_off = -1;
-static int hf_qnet6_lr_src_domain_len = -1;
-static int hf_qnet6_lr_src_domain_generated = -1;
-static int hf_qnet6_lr_src_addr_off = -1;
-static int hf_qnet6_lr_src_addr_len = -1;
-static int hf_qnet6_lr_src_addr_generated = -1;
-static int hf_qnet6_lr_dst = -1;
-static int hf_qnet6_lr_dst_name_off = -1;
-static int hf_qnet6_lr_dst_name_len = -1;
-static int hf_qnet6_lr_dst_name_generated = -1;
-static int hf_qnet6_lr_dst_domain_off = -1;
-static int hf_qnet6_lr_dst_domain_len = -1;
-static int hf_qnet6_lr_dst_domain_generated = -1;
-static int hf_qnet6_lr_dst_addr_off = -1;
-static int hf_qnet6_lr_dst_addr_len = -1;
-static int hf_qnet6_lr_dst_addr_generated = -1;
-
-static int hf_qnet6_kif_msgtype = -1;
-static int hf_qnet6_kif_size = -1;
-
-static int hf_qnet6_kif_version = -1;
-static int hf_qnet6_kif_client_info = -1;
-static int hf_qnet6_kif_zero = -1;
+static int proto_qnet6_l4;
+static int proto_qnet6_qos;
+static int proto_qnet6_lr;
+static int proto_qnet6_kif;
+static int proto_qnet6_nr;
+
+static int hf_qnet6_l4_padding;
+static int hf_qnet6_l4_ver;
+static int hf_qnet6_l4_type;
+static int hf_qnet6_l4_flags;
+static int hf_qnet6_l4_flags_first;
+static int hf_qnet6_l4_flags_last;
+static int hf_qnet6_l4_flags_crc;
+static int hf_qnet6_l4_qos_info;
+static int hf_qnet6_l4_qos_src_nd_for_dst;
+static int hf_qnet6_l4_qos_dst_nd_for_src;
+static int hf_qnet6_l4_qos_src_conn_id;
+static int hf_qnet6_l4_qos_dst_conn_id;
+static int hf_qnet6_l4_qos_src_seq_num;
+static int hf_qnet6_l4_qos_qos_type;
+static int hf_qnet6_l4_qos_src_qos_idx;
+static int hf_qnet6_l4_layer;
+static int hf_qnet6_l4_offset;
+static int hf_qnet6_l4_length;
+static int hf_qnet6_l4_crc;
+
+static int hf_qnet6_qos_tcs_src_name_off;
+static int hf_qnet6_qos_tcs_src_name_generated;
+static int hf_qnet6_qos_tcs_src_domain_off;
+static int hf_qnet6_qos_tcs_src_domain_generated;
+static int hf_qnet6_qos_tcs_dst_name_off;
+static int hf_qnet6_qos_tcs_dst_name_generated;
+static int hf_qnet6_qos_tcs_dst_domain_off;
+static int hf_qnet6_qos_tcs_dst_domain_generated;
+
+static int hf_qnet6_lr_ver;
+static int hf_qnet6_lr_type;
+static int hf_qnet6_lr_total_len;
+static int hf_qnet6_lr_src;
+static int hf_qnet6_lr_src_name_off;
+static int hf_qnet6_lr_src_name_len;
+static int hf_qnet6_lr_src_name_generated;
+static int hf_qnet6_lr_src_domain_off;
+static int hf_qnet6_lr_src_domain_len;
+static int hf_qnet6_lr_src_domain_generated;
+static int hf_qnet6_lr_src_addr_off;
+static int hf_qnet6_lr_src_addr_len;
+static int hf_qnet6_lr_src_addr_generated;
+static int hf_qnet6_lr_dst;
+static int hf_qnet6_lr_dst_name_off;
+static int hf_qnet6_lr_dst_name_len;
+static int hf_qnet6_lr_dst_name_generated;
+static int hf_qnet6_lr_dst_domain_off;
+static int hf_qnet6_lr_dst_domain_len;
+static int hf_qnet6_lr_dst_domain_generated;
+static int hf_qnet6_lr_dst_addr_off;
+static int hf_qnet6_lr_dst_addr_len;
+static int hf_qnet6_lr_dst_addr_generated;
+
+static int hf_qnet6_kif_msgtype;
+static int hf_qnet6_kif_size;
+
+static int hf_qnet6_kif_version;
+static int hf_qnet6_kif_client_info;
+static int hf_qnet6_kif_zero;
 
 /*
  * client_info
  */
-static int hf_qnet6_kif_client_info_nd = -1;
-static int hf_qnet6_kif_client_info_pid = -1;
-static int hf_qnet6_kif_client_info_sid = -1;
-static int hf_qnet6_kif_client_info_flags = -1;
-static int hf_qnet6_kif_client_info_cred = -1;
-static int hf_qnet6_kif_client_info_cred_ruid = -1;
-static int hf_qnet6_kif_client_info_cred_euid = -1;
-static int hf_qnet6_kif_client_info_cred_suid = -1;
-static int hf_qnet6_kif_client_info_cred_rgid = -1;
-static int hf_qnet6_kif_client_info_cred_egid = -1;
-static int hf_qnet6_kif_client_info_cred_sgid = -1;
-static int hf_qnet6_kif_client_info_cred_ngroups = -1;
-static int hf_qnet6_kif_client_info_cred_grouplist = -1;
+static int hf_qnet6_kif_client_info_nd;
+static int hf_qnet6_kif_client_info_pid;
+static int hf_qnet6_kif_client_info_sid;
+static int hf_qnet6_kif_client_info_flags;
+static int hf_qnet6_kif_client_info_cred;
+static int hf_qnet6_kif_client_info_cred_ruid;
+static int hf_qnet6_kif_client_info_cred_euid;
+static int hf_qnet6_kif_client_info_cred_suid;
+static int hf_qnet6_kif_client_info_cred_rgid;
+static int hf_qnet6_kif_client_info_cred_egid;
+static int hf_qnet6_kif_client_info_cred_sgid;
+static int hf_qnet6_kif_client_info_cred_ngroups;
+static int hf_qnet6_kif_client_info_cred_grouplist;
 
 /*
  * connect message
  */
-static int hf_qnet6_kif_connect = -1;
-static int hf_qnet6_kif_connect_server_pid = -1;
-static int hf_qnet6_kif_connect_server_chid = -1;
-static int hf_qnet6_kif_connect_client_id = -1;
-static int hf_qnet6_kif_connect_client_pid = -1;
+static int hf_qnet6_kif_connect;
+static int hf_qnet6_kif_connect_server_pid;
+static int hf_qnet6_kif_connect_server_chid;
+static int hf_qnet6_kif_connect_client_id;
+static int hf_qnet6_kif_connect_client_pid;
 /*
  * connect success message
  */
-static int hf_qnet6_kif_connects_client_id = -1;
-static int hf_qnet6_kif_connects_server_id = -1;
-static int hf_qnet6_kif_connects_scoid = -1;
-static int hf_qnet6_kif_connects_nbytes = -1;
+static int hf_qnet6_kif_connects_client_id;
+static int hf_qnet6_kif_connects_server_id;
+static int hf_qnet6_kif_connects_scoid;
+static int hf_qnet6_kif_connects_nbytes;
 /*
  * connect fail message
  */
-static int hf_qnet6_kif_connectf_client_id = -1;
-static int hf_qnet6_kif_connectf_status = -1;
+static int hf_qnet6_kif_connectf_client_id;
+static int hf_qnet6_kif_connectf_status;
 /*
  * connect death message
  */
-static int hf_qnet6_kif_connectd_client_id = -1;
+static int hf_qnet6_kif_connectd_client_id;
 /*
  * msgsend message
  */
-static int hf_qnet6_kif_msgsend = -1;
-static int hf_qnet6_kif_msgsend_server_id = -1;
-static int hf_qnet6_kif_msgsend_client_handle = -1;
-static int hf_qnet6_kif_msgsend_vinfo = -1;
-static int hf_qnet6_kif_msgsend_nbytes = -1;
+static int hf_qnet6_kif_msgsend;
+static int hf_qnet6_kif_msgsend_server_id;
+static int hf_qnet6_kif_msgsend_client_handle;
+static int hf_qnet6_kif_msgsend_vinfo;
+static int hf_qnet6_kif_msgsend_nbytes;
 /*
  * msgread message
  */
-static int hf_qnet6_kif_msgread_msgread_handle = -1;
-static int hf_qnet6_kif_msgread_client_handle = -1;
-static int hf_qnet6_kif_msgread_offset = -1;
-static int hf_qnet6_kif_msgread_nbytes = -1;
+static int hf_qnet6_kif_msgread_msgread_handle;
+static int hf_qnet6_kif_msgread_client_handle;
+static int hf_qnet6_kif_msgread_offset;
+static int hf_qnet6_kif_msgread_nbytes;
 /*
  * msgwrite message
  */
-static int hf_qnet6_kif_msgwrite_status = -1;
-static int hf_qnet6_kif_msgwrite_handle = -1;
-static int hf_qnet6_kif_msgwrite_offset = -1;
-static int hf_qnet6_kif_msgwrite_nbytes = -1;
-static int hf_qnet6_kif_msgwrite_data = -1;
+static int hf_qnet6_kif_msgwrite_status;
+static int hf_qnet6_kif_msgwrite_handle;
+static int hf_qnet6_kif_msgwrite_offset;
+static int hf_qnet6_kif_msgwrite_nbytes;
+static int hf_qnet6_kif_msgwrite_data;
 /*
  * unblock message
  */
-static int hf_qnet6_kif_unblock_server_id = -1;
-static int hf_qnet6_kif_unblock_client_handle = -1;
-static int hf_qnet6_kif_unblock_tid = -1;
+static int hf_qnet6_kif_unblock_server_id;
+static int hf_qnet6_kif_unblock_client_handle;
+static int hf_qnet6_kif_unblock_tid;
 /*
  * event message
  */
-static int hf_qnet6_kif_event_client_handle = -1;
-static int hf_qnet6_kif_event_event = -1;
-static int hf_qnet6_kif_event_notify = -1;
-static int hf_qnet6_kif_event_union1 = -1;
-static int hf_qnet6_kif_event_value = -1;
-static int hf_qnet6_kif_event_union2 = -1;
+static int hf_qnet6_kif_event_client_handle;
+static int hf_qnet6_kif_event_event;
+static int hf_qnet6_kif_event_notify;
+static int hf_qnet6_kif_event_union1;
+static int hf_qnet6_kif_event_value;
+static int hf_qnet6_kif_event_union2;
 
 /*
  * pulse message
  */
 #if 0
-static int hf_qnet6_kif_pulse_server_id = -1;
-static int hf_qnet6_kif_pulse_client_handle = -1;
-static int hf_qnet6_kif_pulse_vinfo = -1;
+static int hf_qnet6_kif_pulse_server_id;
+static int hf_qnet6_kif_pulse_client_handle;
+static int hf_qnet6_kif_pulse_vinfo;
 #endif
-static int hf_qnet6_kif_pulse_pulse = -1;
-static int hf_qnet6_kif_pulse_priority = -1;
+static int hf_qnet6_kif_pulse_pulse;
+static int hf_qnet6_kif_pulse_priority;
 /*
  * signal message
  */
-static int hf_qnet6_kif_signal_client_handle = -1;
-static int hf_qnet6_kif_signal_pid = -1;
-static int hf_qnet6_kif_signal_tid = -1;
-static int hf_qnet6_kif_signal_signo = -1;
-static int hf_qnet6_kif_signal_code = -1;
-static int hf_qnet6_kif_signal_value = -1;
+static int hf_qnet6_kif_signal_client_handle;
+static int hf_qnet6_kif_signal_pid;
+static int hf_qnet6_kif_signal_tid;
+static int hf_qnet6_kif_signal_signo;
+static int hf_qnet6_kif_signal_code;
+static int hf_qnet6_kif_signal_value;
 /*
  * disconnect message
  */
-static int hf_qnet6_kif_disconnect_server_id = -1;
+static int hf_qnet6_kif_disconnect_server_id;
 
 /*
  * vinfo
  */
-static int hf_qnet6_kif_vtid_info_tid = -1;
-static int hf_qnet6_kif_vtid_info_coid = -1;
-static int hf_qnet6_kif_vtid_info_priority = -1;
-static int hf_qnet6_kif_vtid_info_srcmsglen = -1;
-static int hf_qnet6_kif_vtid_info_keydata = -1;
-static int hf_qnet6_kif_vtid_info_srcnd = -1;
-static int hf_qnet6_kif_vtid_info_dstmsglen = -1;
-static int hf_qnet6_kif_vtid_info_zero = -1;
+static int hf_qnet6_kif_vtid_info_tid;
+static int hf_qnet6_kif_vtid_info_coid;
+static int hf_qnet6_kif_vtid_info_priority;
+static int hf_qnet6_kif_vtid_info_srcmsglen;
+static int hf_qnet6_kif_vtid_info_keydata;
+static int hf_qnet6_kif_vtid_info_srcnd;
+static int hf_qnet6_kif_vtid_info_dstmsglen;
+static int hf_qnet6_kif_vtid_info_zero;
 /*
  * pulse
  */
-static int hf_qnet6_kif_pulse_pulse_type = -1;
-static int hf_qnet6_kif_pulse_pulse_subtype = -1;
-static int hf_qnet6_kif_pulse_pulse_code = -1;
-static int hf_qnet6_kif_pulse_pulse_reserved = -1;
-static int hf_qnet6_kif_pulse_pulse_value = -1;
-static int hf_qnet6_kif_pulse_pulse_scoid = -1;
+static int hf_qnet6_kif_pulse_pulse_type;
+static int hf_qnet6_kif_pulse_pulse_subtype;
+static int hf_qnet6_kif_pulse_pulse_code;
+static int hf_qnet6_kif_pulse_pulse_reserved;
+static int hf_qnet6_kif_pulse_pulse_value;
+static int hf_qnet6_kif_pulse_pulse_scoid;
 /*
  * message
  */
-static int hf_qnet6_kif_msg = -1;
-static int hf_qnet6_kif_msg_type = -1;
-static int hf_qnet6_kif_msg_connect_subtype = -1;
-static int hf_qnet6_kif_msg_connect_filetype = -1;
-static int hf_qnet6_kif_msg_connect_replymax = -1;
-static int hf_qnet6_kif_msg_connect_entrymax = -1;
-static int hf_qnet6_kif_msg_connect_key = -1;
-static int hf_qnet6_kif_msg_connect_handle = -1;
-
-static int hf_qnet6_kif_msg_connect_ioflag = -1;
-
-static int hf_qnet6_kif_msg_connect_ioflag_access = -1;
-static int hf_qnet6_kif_msg_connect_ioflag_append = -1;
-static int hf_qnet6_kif_msg_connect_ioflag_dsync = -1;
-static int hf_qnet6_kif_msg_connect_ioflag_sync = -1;
-static int hf_qnet6_kif_msg_connect_ioflag_rsync = -1;
-static int hf_qnet6_kif_msg_connect_ioflag_nonblock = -1;
-static int hf_qnet6_kif_msg_connect_ioflag_creat = -1;
-static int hf_qnet6_kif_msg_connect_ioflag_truncate = -1;
-static int hf_qnet6_kif_msg_connect_ioflag_exclusive = -1;
-static int hf_qnet6_kif_msg_connect_ioflag_noctrltty = -1;
-static int hf_qnet6_kif_msg_connect_ioflag_closexec = -1;
-static int hf_qnet6_kif_msg_connect_ioflag_realids = -1;
-static int hf_qnet6_kif_msg_connect_ioflag_largefile = -1;
-static int hf_qnet6_kif_msg_connect_ioflag_async = -1;
-
-static int hf_qnet6_kif_msg_connect_mode = -1;
-static int hf_qnet6_kif_msg_connect_mode_other_exe = -1;
-static int hf_qnet6_kif_msg_connect_mode_other_read = -1;
-static int hf_qnet6_kif_msg_connect_mode_other_write = -1;
-static int hf_qnet6_kif_msg_connect_mode_group_read = -1;
-static int hf_qnet6_kif_msg_connect_mode_group_write = -1;
-static int hf_qnet6_kif_msg_connect_mode_group_exe = -1;
-static int hf_qnet6_kif_msg_connect_mode_owner_read = -1;
-static int hf_qnet6_kif_msg_connect_mode_owner_write = -1;
-static int hf_qnet6_kif_msg_connect_mode_owner_exe = -1;
-static int hf_qnet6_kif_msg_connect_mode_setuid = -1;
-static int hf_qnet6_kif_msg_connect_mode_setgid = -1;
-static int hf_qnet6_kif_msg_connect_mode_sticky = -1;
-static int hf_qnet6_kif_msg_connect_mode_format = -1;
-
-static int hf_qnet6_kif_msg_connect_sflag = -1;
-static int hf_qnet6_kif_msg_connect_access = -1;
-static int hf_qnet6_kif_msg_connect_zero = -1;
-static int hf_qnet6_kif_msg_connect_pathlen = -1;
-static int hf_qnet6_kif_msg_connect_eflag = -1;
-static int hf_qnet6_kif_msg_connect_eflag_dir = -1;
-static int hf_qnet6_kif_msg_connect_eflag_dot = -1;
-static int hf_qnet6_kif_msg_connect_eflag_dotdot = -1;
-static int hf_qnet6_kif_msg_connect_extratype = -1;
-static int hf_qnet6_kif_msg_connect_extralen = -1;
-static int hf_qnet6_kif_msg_connect_path = -1;
-static int hf_qnet6_kif_msg_connect_pad_data = -1;
-static int hf_qnet6_kif_msg_connect_extra_symlink_path = -1;
-static int hf_qnet6_kif_msg_connect_extra_rename_path = -1;
-static int hf_qnet6_kif_msg_connect_extra_mount = -1;
-static int hf_qnet6_kif_msg_connect_extra_data = -1;
-static int hf_qnet6_kif_msg_connect_extra_link_ocb = -1;
+static int hf_qnet6_kif_msg;
+static int hf_qnet6_kif_msg_type;
+static int hf_qnet6_kif_msg_connect_subtype;
+static int hf_qnet6_kif_msg_connect_filetype;
+static int hf_qnet6_kif_msg_connect_replymax;
+static int hf_qnet6_kif_msg_connect_entrymax;
+static int hf_qnet6_kif_msg_connect_key;
+static int hf_qnet6_kif_msg_connect_handle;
+
+static int hf_qnet6_kif_msg_connect_ioflag;
+
+static int hf_qnet6_kif_msg_connect_ioflag_access;
+static int hf_qnet6_kif_msg_connect_ioflag_append;
+static int hf_qnet6_kif_msg_connect_ioflag_dsync;
+static int hf_qnet6_kif_msg_connect_ioflag_sync;
+static int hf_qnet6_kif_msg_connect_ioflag_rsync;
+static int hf_qnet6_kif_msg_connect_ioflag_nonblock;
+static int hf_qnet6_kif_msg_connect_ioflag_creat;
+static int hf_qnet6_kif_msg_connect_ioflag_truncate;
+static int hf_qnet6_kif_msg_connect_ioflag_exclusive;
+static int hf_qnet6_kif_msg_connect_ioflag_noctrltty;
+static int hf_qnet6_kif_msg_connect_ioflag_closexec;
+static int hf_qnet6_kif_msg_connect_ioflag_realids;
+static int hf_qnet6_kif_msg_connect_ioflag_largefile;
+static int hf_qnet6_kif_msg_connect_ioflag_async;
+
+static int hf_qnet6_kif_msg_connect_mode;
+static int hf_qnet6_kif_msg_connect_mode_other_exe;
+static int hf_qnet6_kif_msg_connect_mode_other_read;
+static int hf_qnet6_kif_msg_connect_mode_other_write;
+static int hf_qnet6_kif_msg_connect_mode_group_read;
+static int hf_qnet6_kif_msg_connect_mode_group_write;
+static int hf_qnet6_kif_msg_connect_mode_group_exe;
+static int hf_qnet6_kif_msg_connect_mode_owner_read;
+static int hf_qnet6_kif_msg_connect_mode_owner_write;
+static int hf_qnet6_kif_msg_connect_mode_owner_exe;
+static int hf_qnet6_kif_msg_connect_mode_setuid;
+static int hf_qnet6_kif_msg_connect_mode_setgid;
+static int hf_qnet6_kif_msg_connect_mode_sticky;
+static int hf_qnet6_kif_msg_connect_mode_format;
+
+static int hf_qnet6_kif_msg_connect_sflag;
+static int hf_qnet6_kif_msg_connect_access;
+static int hf_qnet6_kif_msg_connect_zero;
+static int hf_qnet6_kif_msg_connect_pathlen;
+static int hf_qnet6_kif_msg_connect_eflag;
+static int hf_qnet6_kif_msg_connect_eflag_dir;
+static int hf_qnet6_kif_msg_connect_eflag_dot;
+static int hf_qnet6_kif_msg_connect_eflag_dotdot;
+static int hf_qnet6_kif_msg_connect_extratype;
+static int hf_qnet6_kif_msg_connect_extralen;
+static int hf_qnet6_kif_msg_connect_path;
+static int hf_qnet6_kif_msg_connect_pad_data;
+static int hf_qnet6_kif_msg_connect_extra_symlink_path;
+static int hf_qnet6_kif_msg_connect_extra_rename_path;
+static int hf_qnet6_kif_msg_connect_extra_mount;
+static int hf_qnet6_kif_msg_connect_extra_data;
+static int hf_qnet6_kif_msg_connect_extra_link_ocb;
 /*
  * devctl
  */
-static int hf_qnet6_kif_msg_io_combine_len = -1;
-static int hf_qnet6_kif_msg_devctl_dcmd = -1;
-static int hf_qnet6_kif_msg_devctl_dcmd_cmd = -1;
-static int hf_qnet6_kif_msg_devctl_dcmd_ccmd = -1;
-static int hf_qnet6_kif_msg_devctl_dcmd_size = -1;
-static int hf_qnet6_kif_msg_devctl_dcmd_class = -1;
-static int hf_qnet6_kif_msg_devctl_dcmd_from = -1;
-static int hf_qnet6_kif_msg_devctl_dcmd_to = -1;
-
-static int hf_qnet6_kif_msg_devctl_nbytes = -1;
-static int hf_qnet6_kif_msg_devctl_zero = -1;
+static int hf_qnet6_kif_msg_io_combine_len;
+static int hf_qnet6_kif_msg_devctl_dcmd;
+static int hf_qnet6_kif_msg_devctl_dcmd_cmd;
+static int hf_qnet6_kif_msg_devctl_dcmd_ccmd;
+static int hf_qnet6_kif_msg_devctl_dcmd_size;
+static int hf_qnet6_kif_msg_devctl_dcmd_class;
+static int hf_qnet6_kif_msg_devctl_dcmd_from;
+static int hf_qnet6_kif_msg_devctl_dcmd_to;
+
+static int hf_qnet6_kif_msg_devctl_nbytes;
+static int hf_qnet6_kif_msg_devctl_zero;
 /*
  * stat
  */
 /*
  * read
  */
-static int hf_qnet6_kif_msg_io_read_nbytes = -1;
-static int hf_qnet6_kif_msg_io_read_xtypes = -1;
-static int hf_qnet6_kif_msg_io_read_xtypes_0_7 = -1;
-static int hf_qnet6_kif_msg_io_read_xtypes_8 = -1;
-static int hf_qnet6_kif_msg_io_read_xtypes_14 = -1;
-static int hf_qnet6_kif_msg_io_read_xtypes_15 = -1;
-static int hf_qnet6_kif_msg_io_read_xoffset = -1;
-static int hf_qnet6_kif_msg_io_read_cond_min = -1;
-static int hf_qnet6_kif_msg_io_read_cond_time = -1;
-static int hf_qnet6_kif_msg_io_read_cond_timeout = -1;
+static int hf_qnet6_kif_msg_io_read_nbytes;
+static int hf_qnet6_kif_msg_io_read_xtypes;
+static int hf_qnet6_kif_msg_io_read_xtypes_0_7;
+static int hf_qnet6_kif_msg_io_read_xtypes_8;
+static int hf_qnet6_kif_msg_io_read_xtypes_14;
+static int hf_qnet6_kif_msg_io_read_xtypes_15;
+static int hf_qnet6_kif_msg_io_read_xoffset;
+static int hf_qnet6_kif_msg_io_read_cond_min;
+static int hf_qnet6_kif_msg_io_read_cond_time;
+static int hf_qnet6_kif_msg_io_read_cond_timeout;
 /*
  * write
  */
-static int hf_qnet6_kif_msg_io_write_data = -1;
-static int hf_qnet6_kif_msg_io_write_nbytes = -1;
-static int hf_qnet6_kif_msg_io_write_xtypes = -1;
-static int hf_qnet6_kif_msg_io_write_xtypes_0_7 = -1;
-static int hf_qnet6_kif_msg_io_write_xtypes_8 = -1;
-static int hf_qnet6_kif_msg_io_write_xtypes_14 = -1;
-static int hf_qnet6_kif_msg_io_write_xtypes_15 = -1;
-static int hf_qnet6_kif_msg_io_write_xoffset = -1;
+static int hf_qnet6_kif_msg_io_write_data;
+static int hf_qnet6_kif_msg_io_write_nbytes;
+static int hf_qnet6_kif_msg_io_write_xtypes;
+static int hf_qnet6_kif_msg_io_write_xtypes_0_7;
+static int hf_qnet6_kif_msg_io_write_xtypes_8;
+static int hf_qnet6_kif_msg_io_write_xtypes_14;
+static int hf_qnet6_kif_msg_io_write_xtypes_15;
+static int hf_qnet6_kif_msg_io_write_xoffset;
 
 /*
  * seek
  */
-static int hf_qnet6_kif_msg_seek_whence = -1;
-static int hf_qnet6_kif_msg_seek_offset = -1;
+static int hf_qnet6_kif_msg_seek_whence;
+static int hf_qnet6_kif_msg_seek_offset;
 /*
  * pathconf
  */
-static int hf_qnet6_kif_msg_pathconf_name = -1;
+static int hf_qnet6_kif_msg_pathconf_name;
 /*
  * chmod
  */
-static int hf_qnet6_kif_msg_io_chmod = -1;
-static int hf_qnet6_kif_msg_io_chmod_other_exe = -1;
-static int hf_qnet6_kif_msg_io_chmod_other_read = -1;
-static int hf_qnet6_kif_msg_io_chmod_other_write = -1;
-static int hf_qnet6_kif_msg_io_chmod_group_read = -1;
-static int hf_qnet6_kif_msg_io_chmod_group_write = -1;
-static int hf_qnet6_kif_msg_io_chmod_group_exe = -1;
-static int hf_qnet6_kif_msg_io_chmod_owner_read = -1;
-static int hf_qnet6_kif_msg_io_chmod_owner_write = -1;
-static int hf_qnet6_kif_msg_io_chmod_owner_exe = -1;
-static int hf_qnet6_kif_msg_io_chmod_setuid = -1;
-static int hf_qnet6_kif_msg_io_chmod_setgid = -1;
-static int hf_qnet6_kif_msg_io_chmod_sticky = -1;
+static int hf_qnet6_kif_msg_io_chmod;
+static int hf_qnet6_kif_msg_io_chmod_other_exe;
+static int hf_qnet6_kif_msg_io_chmod_other_read;
+static int hf_qnet6_kif_msg_io_chmod_other_write;
+static int hf_qnet6_kif_msg_io_chmod_group_read;
+static int hf_qnet6_kif_msg_io_chmod_group_write;
+static int hf_qnet6_kif_msg_io_chmod_group_exe;
+static int hf_qnet6_kif_msg_io_chmod_owner_read;
+static int hf_qnet6_kif_msg_io_chmod_owner_write;
+static int hf_qnet6_kif_msg_io_chmod_owner_exe;
+static int hf_qnet6_kif_msg_io_chmod_setuid;
+static int hf_qnet6_kif_msg_io_chmod_setgid;
+static int hf_qnet6_kif_msg_io_chmod_sticky;
 /*
  * chown
  */
-static int hf_qnet6_kif_msg_io_chown_gid = -1;
-static int hf_qnet6_kif_msg_io_chown_uid = -1;
+static int hf_qnet6_kif_msg_io_chown_gid;
+static int hf_qnet6_kif_msg_io_chown_uid;
 /*
  * sync
  */
-static int hf_qnet6_kif_msg_io_sync = -1;
-static int hf_qnet6_kif_msg_syncflag_dsync = -1;
-static int hf_qnet6_kif_msg_syncflag_sync = -1;
-static int hf_qnet6_kif_msg_syncflag_rsync = -1;
+static int hf_qnet6_kif_msg_io_sync;
+static int hf_qnet6_kif_msg_syncflag_dsync;
+static int hf_qnet6_kif_msg_syncflag_sync;
+static int hf_qnet6_kif_msg_syncflag_rsync;
 /*
  * utime
  */
-static int hf_qnet6_kif_msg_io_utime_curflag = -1;
-static int hf_qnet6_kif_msg_io_utime_actime = -1;
-static int hf_qnet6_kif_msg_io_utime_modtime = -1;
+static int hf_qnet6_kif_msg_io_utime_curflag;
+static int hf_qnet6_kif_msg_io_utime_actime;
+static int hf_qnet6_kif_msg_io_utime_modtime;
 /*
  * fdinfo
  */
-static int hf_qnet6_kif_msg_io_fdinfo_flags = -1;
-static int hf_qnet6_kif_msg_io_fdinfo_path_len = -1;
-static int hf_qnet6_kif_msg_io_fdinfo_reserved = -1;
+static int hf_qnet6_kif_msg_io_fdinfo_flags;
+static int hf_qnet6_kif_msg_io_fdinfo_path_len;
+static int hf_qnet6_kif_msg_io_fdinfo_reserved;
 /*
  * lock
  */
-static int hf_qnet6_kif_msg_io_lock_subtype = -1;
-static int hf_qnet6_kif_msg_io_lock_nbytes = -1;
+static int hf_qnet6_kif_msg_io_lock_subtype;
+static int hf_qnet6_kif_msg_io_lock_nbytes;
 /*
  * space
  */
-static int hf_qnet6_kif_msg_io_space_subtype = -1;
-static int hf_qnet6_kif_msg_io_space_whence = -1;
-static int hf_qnet6_kif_msg_io_space_start = -1;
-static int hf_qnet6_kif_msg_io_space_len = -1;
+static int hf_qnet6_kif_msg_io_space_subtype;
+static int hf_qnet6_kif_msg_io_space_whence;
+static int hf_qnet6_kif_msg_io_space_start;
+static int hf_qnet6_kif_msg_io_space_len;
 
-static int hf_qnet6_kif_msgsend_extra = -1;
+static int hf_qnet6_kif_msgsend_extra;
 /*
  * msginfo
  */
-static int hf_qnet6_kif_msg_msginfo_nd = -1;
-static int hf_qnet6_kif_msg_msginfo_srcnd = -1;
-static int hf_qnet6_kif_msg_msginfo_pid = -1;
-static int hf_qnet6_kif_msg_msginfo_tid = -1;
-static int hf_qnet6_kif_msg_msginfo_chid = -1;
-static int hf_qnet6_kif_msg_msginfo_scoid = -1;
-static int hf_qnet6_kif_msg_msginfo_coid = -1;
-static int hf_qnet6_kif_msg_msginfo_msglen = -1;
-static int hf_qnet6_kif_msg_msginfo_srcmsglen = -1;
-static int hf_qnet6_kif_msg_msginfo_dstmsglen = -1;
-static int hf_qnet6_kif_msg_msginfo_priority = -1;
-static int hf_qnet6_kif_msg_msginfo_flags = -1;
-static int hf_qnet6_kif_msg_msginfo_reserved = -1;
+static int hf_qnet6_kif_msg_msginfo_nd;
+static int hf_qnet6_kif_msg_msginfo_srcnd;
+static int hf_qnet6_kif_msg_msginfo_pid;
+static int hf_qnet6_kif_msg_msginfo_tid;
+static int hf_qnet6_kif_msg_msginfo_chid;
+static int hf_qnet6_kif_msg_msginfo_scoid;
+static int hf_qnet6_kif_msg_msginfo_coid;
+static int hf_qnet6_kif_msg_msginfo_msglen;
+static int hf_qnet6_kif_msg_msginfo_srcmsglen;
+static int hf_qnet6_kif_msg_msginfo_dstmsglen;
+static int hf_qnet6_kif_msg_msginfo_priority;
+static int hf_qnet6_kif_msg_msginfo_flags;
+static int hf_qnet6_kif_msg_msginfo_reserved;
 /*
  * openfd
  */
-static int hf_qnet6_kif_msg_openfd_reserved = -1;
-static int hf_qnet6_kif_msg_openfd_key = -1;
-static int hf_qnet6_kif_msg_openfd_ioflag = -1;
-
-static int hf_qnet6_kif_msg_openfd_ioflag_access = -1;
-static int hf_qnet6_kif_msg_openfd_ioflag_append = -1;
-static int hf_qnet6_kif_msg_openfd_ioflag_dsync = -1;
-static int hf_qnet6_kif_msg_openfd_ioflag_sync = -1;
-static int hf_qnet6_kif_msg_openfd_ioflag_rsync = -1;
-static int hf_qnet6_kif_msg_openfd_ioflag_nonblock = -1;
-static int hf_qnet6_kif_msg_openfd_ioflag_creat = -1;
-static int hf_qnet6_kif_msg_openfd_ioflag_truncate = -1;
-static int hf_qnet6_kif_msg_openfd_ioflag_exclusive = -1;
-static int hf_qnet6_kif_msg_openfd_ioflag_noctrltty = -1;
-static int hf_qnet6_kif_msg_openfd_ioflag_closexec = -1;
-static int hf_qnet6_kif_msg_openfd_ioflag_realids = -1;
-static int hf_qnet6_kif_msg_openfd_ioflag_largefile = -1;
-static int hf_qnet6_kif_msg_openfd_ioflag_async = -1;
-static int hf_qnet6_kif_msg_openfd_xtype = -1;
-static int hf_qnet6_kif_msg_openfd_sflag = -1;
+static int hf_qnet6_kif_msg_openfd_reserved;
+static int hf_qnet6_kif_msg_openfd_key;
+static int hf_qnet6_kif_msg_openfd_ioflag;
+
+static int hf_qnet6_kif_msg_openfd_ioflag_access;
+static int hf_qnet6_kif_msg_openfd_ioflag_append;
+static int hf_qnet6_kif_msg_openfd_ioflag_dsync;
+static int hf_qnet6_kif_msg_openfd_ioflag_sync;
+static int hf_qnet6_kif_msg_openfd_ioflag_rsync;
+static int hf_qnet6_kif_msg_openfd_ioflag_nonblock;
+static int hf_qnet6_kif_msg_openfd_ioflag_creat;
+static int hf_qnet6_kif_msg_openfd_ioflag_truncate;
+static int hf_qnet6_kif_msg_openfd_ioflag_exclusive;
+static int hf_qnet6_kif_msg_openfd_ioflag_noctrltty;
+static int hf_qnet6_kif_msg_openfd_ioflag_closexec;
+static int hf_qnet6_kif_msg_openfd_ioflag_realids;
+static int hf_qnet6_kif_msg_openfd_ioflag_largefile;
+static int hf_qnet6_kif_msg_openfd_ioflag_async;
+static int hf_qnet6_kif_msg_openfd_xtype;
+static int hf_qnet6_kif_msg_openfd_sflag;
 /*
  * dup
  */
-static int hf_qnet6_kif_msg_io_dup_reserved = -1;
-static int hf_qnet6_kif_msg_io_dup_key = -1;
+static int hf_qnet6_kif_msg_io_dup_reserved;
+static int hf_qnet6_kif_msg_io_dup_key;
 /*
  * msg
  */
-static int hf_qnet6_kif_msg_io_msg_mgrid = -1;
-static int hf_qnet6_kif_msg_io_msg_subtype = -1;
+static int hf_qnet6_kif_msg_io_msg_mgrid;
+static int hf_qnet6_kif_msg_io_msg_subtype;
 /*
  * mmap
  */
-static int hf_qnet6_kif_msg_io_mmap_prot = -1;
-static int hf_qnet6_kif_msg_io_mmap_prot_read = -1;
-static int hf_qnet6_kif_msg_io_mmap_prot_write = -1;
-static int hf_qnet6_kif_msg_io_mmap_prot_exec = -1;
-static int hf_qnet6_kif_msg_io_mmap_offset = -1;
+static int hf_qnet6_kif_msg_io_mmap_prot;
+static int hf_qnet6_kif_msg_io_mmap_prot_read;
+static int hf_qnet6_kif_msg_io_mmap_prot_write;
+static int hf_qnet6_kif_msg_io_mmap_prot_exec;
+static int hf_qnet6_kif_msg_io_mmap_offset;
 /*
  * notify
  */
-static int hf_qnet6_kif_msg_io_notify_action = -1;
-static int hf_qnet6_kif_msg_io_notify_flags = -1;
-static int hf_qnet6_kif_msg_io_notify_flags_31 = -1;
-static int hf_qnet6_kif_msg_io_notify_flags_30 = -1;
-static int hf_qnet6_kif_msg_io_notify_flags_29 = -1;
-static int hf_qnet6_kif_msg_io_notify_flags_28 = -1;
-static int hf_qnet6_kif_msg_io_notify_mgr = -1;
-static int hf_qnet6_kif_msg_io_notify_flags_extra_mask = -1;
-static int hf_qnet6_kif_msg_io_notify_flags_exten = -1;
-static int hf_qnet6_kif_msg_io_notify_nfds = -1;
-static int hf_qnet6_kif_msg_io_notify_fd_first = -1;
-static int hf_qnet6_kif_msg_io_notify_nfds_ready = -1;
-static int hf_qnet6_kif_msg_io_notify_timo = -1;
-static int hf_qnet6_kif_msg_io_notify_fds = -1;
+static int hf_qnet6_kif_msg_io_notify_action;
+static int hf_qnet6_kif_msg_io_notify_flags;
+static int hf_qnet6_kif_msg_io_notify_flags_31;
+static int hf_qnet6_kif_msg_io_notify_flags_30;
+static int hf_qnet6_kif_msg_io_notify_flags_29;
+static int hf_qnet6_kif_msg_io_notify_flags_28;
+static int hf_qnet6_kif_msg_io_notify_mgr;
+static int hf_qnet6_kif_msg_io_notify_flags_extra_mask;
+static int hf_qnet6_kif_msg_io_notify_flags_exten;
+static int hf_qnet6_kif_msg_io_notify_nfds;
+static int hf_qnet6_kif_msg_io_notify_fd_first;
+static int hf_qnet6_kif_msg_io_notify_nfds_ready;
+static int hf_qnet6_kif_msg_io_notify_timo;
+static int hf_qnet6_kif_msg_io_notify_fds;
 /*
  * NR
  */
 /*
  * sys/lsm/qnet/nr_msg.h
  */
-static int hf_qnet6_nr_type = -1;
-static int hf_qnet6_nr_remote_req_len = -1;
-static int hf_qnet6_nr_remote_req_id = -1;
-static int hf_qnet6_nr_remote_req_name = -1;
-static int hf_qnet6_nr_remote_rep_spare = -1;
-static int hf_qnet6_nr_remote_rep_id = -1;      /* remote_answer id */
-static int hf_qnet6_nr_remote_rep_nd = -1;      /* remote_answer nd */
-static int hf_qnet6_nr_remote_rep_status = -1;  /* remote_error * status */
+static int hf_qnet6_nr_type;
+static int hf_qnet6_nr_remote_req_len;
+static int hf_qnet6_nr_remote_req_id;
+static int hf_qnet6_nr_remote_req_name;
+static int hf_qnet6_nr_remote_rep_spare;
+static int hf_qnet6_nr_remote_rep_id;      /* remote_answer id */
+static int hf_qnet6_nr_remote_rep_nd;      /* remote_answer nd */
+static int hf_qnet6_nr_remote_rep_status;  /* remote_error * status */
 
 /*
  * Initialize the subtree pointers
  */
-static gint ett_qnet6_l4 = -1;
-static gint ett_qnet6_qos = -1;
-static gint ett_qnet6_flags = -1;
-static gint ett_qnet6_qos_info = -1;
-
-static gint ett_qnet6_lr = -1;
-static gint ett_qnet6_lr_src = -1;
-static gint ett_qnet6_lr_src_name_subtree = -1;
-static gint ett_qnet6_lr_src_domain_subtree = -1;
-static gint ett_qnet6_lr_src_addr_subtree = -1;
-static gint ett_qnet6_lr_dst_name_subtree = -1;
-static gint ett_qnet6_lr_dst_domain_subtree = -1;
-static gint ett_qnet6_lr_dst_addr_subtree = -1;
-static gint ett_qnet6_lr_dst = -1;
-
-static gint ett_qnet6_kif = -1;
-static gint ett_qnet6_kif_vinfo = -1;
-static gint ett_qnet6_kif_pulse = -1;
-static gint ett_qnet6_kif_event = -1;
-static gint ett_qnet6_kif_msg = -1;
-static gint ett_qnet6_kif_msg_ioflag = -1;
-static gint ett_qnet6_kif_msg_mode = -1;
-static gint ett_qnet6_kif_msg_eflag = -1;
-static gint ett_qnet6_kif_connect = -1;
-static gint ett_qnet6_kif_chmod_mode = -1;
-static gint ett_qnet6_kif_msgsend = -1;
-static gint ett_qnet6_kif_client_info = -1;
-static gint ett_qnet6_kif_client_info_cred = -1;
-static gint ett_qnet6_kif_client_info_cred_group = -1;
-static gint ett_qnet6_kif_msg_devctl_dcmd = -1;
-static gint ett_qnet6_kif_msg_read_xtypes = -1;
-static gint ett_qnet6_kif_msg_write_xtypes = -1;
-static gint ett_qnet6_kif_msg_sync = -1;
-static gint ett_qnet6_kif_msg_openfd_ioflag = -1;
-static gint ett_qnet6_kif_msg_msginfo = -1;
-static gint ett_qnet6_kif_msg_prot = -1;
-static gint ett_qnet6_kif_msg_notify_flags = -1;
-static gint ett_qnet6_kif_msg_notify_fds = -1;
-static gint ett_qnet6_nr = -1;
+static gint ett_qnet6_l4;
+static gint ett_qnet6_qos;
+static gint ett_qnet6_flags;
+static gint ett_qnet6_qos_info;
+
+static gint ett_qnet6_lr;
+static gint ett_qnet6_lr_src;
+static gint ett_qnet6_lr_src_name_subtree;
+static gint ett_qnet6_lr_src_domain_subtree;
+static gint ett_qnet6_lr_src_addr_subtree;
+static gint ett_qnet6_lr_dst_name_subtree;
+static gint ett_qnet6_lr_dst_domain_subtree;
+static gint ett_qnet6_lr_dst_addr_subtree;
+static gint ett_qnet6_lr_dst;
+
+static gint ett_qnet6_kif;
+static gint ett_qnet6_kif_vinfo;
+static gint ett_qnet6_kif_pulse;
+static gint ett_qnet6_kif_event;
+static gint ett_qnet6_kif_msg;
+static gint ett_qnet6_kif_msg_ioflag;
+static gint ett_qnet6_kif_msg_mode;
+static gint ett_qnet6_kif_msg_eflag;
+static gint ett_qnet6_kif_connect;
+static gint ett_qnet6_kif_chmod_mode;
+static gint ett_qnet6_kif_msgsend;
+static gint ett_qnet6_kif_client_info;
+static gint ett_qnet6_kif_client_info_cred;
+static gint ett_qnet6_kif_client_info_cred_group;
+static gint ett_qnet6_kif_msg_devctl_dcmd;
+static gint ett_qnet6_kif_msg_read_xtypes;
+static gint ett_qnet6_kif_msg_write_xtypes;
+static gint ett_qnet6_kif_msg_sync;
+static gint ett_qnet6_kif_msg_openfd_ioflag;
+static gint ett_qnet6_kif_msg_msginfo;
+static gint ett_qnet6_kif_msg_prot;
+static gint ett_qnet6_kif_msg_notify_flags;
+static gint ett_qnet6_kif_msg_notify_fds;
+static gint ett_qnet6_nr;
 
 /*
  * struct qnet6_lr_pkt { guint8 version; guint8 pad0; guint8 type; guint8
diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c
index ea9e559101..a8b4d92d40 100644
--- a/epan/dissectors/packet-quake.c
+++ b/epan/dissectors/packet-quake.c
@@ -20,47 +20,47 @@
 
 void proto_register_quake(void);
 
-static int proto_quake = -1;
-static int hf_quake_header_flags = -1;
-static int hf_quake_header_flags_data = -1;
-static int hf_quake_header_flags_ack = -1;
-static int hf_quake_header_flags_no_ack = -1;
-static int hf_quake_header_flags_endmsg = -1;
-static int hf_quake_header_flags_unreliable = -1;
-static int hf_quake_header_flags_control = -1;
-static int hf_quake_header_length = -1;
-static int hf_quake_header_sequence = -1;
-static int hf_quake_control_command = -1;
-
-static int hf_quake_CCREQ_CONNECT_game = -1;
-static int hf_quake_CCREQ_CONNECT_version = -1;
-static int hf_quake_CCREQ_SERVER_INFO_game = -1;
-static int hf_quake_CCREQ_SERVER_INFO_version = -1;
-static int hf_quake_CCREQ_PLAYER_INFO_player = -1;
-static int hf_quake_CCREQ_RULE_INFO_lastrule = -1;
-
-static int hf_quake_CCREP_ACCEPT_port = -1;
-static int hf_quake_CCREP_REJECT_reason = -1;
-static int hf_quake_CCREP_SERVER_INFO_address = -1;
-static int hf_quake_CCREP_SERVER_INFO_server = -1;
-static int hf_quake_CCREP_SERVER_INFO_map = -1;
-static int hf_quake_CCREP_SERVER_INFO_num_player = -1;
-static int hf_quake_CCREP_SERVER_INFO_max_player = -1;
-static int hf_quake_CCREP_PLAYER_INFO_name = -1;
-static int hf_quake_CCREP_PLAYER_INFO_colors = -1;
-static int hf_quake_CCREP_PLAYER_INFO_colors_shirt = -1;
-static int hf_quake_CCREP_PLAYER_INFO_colors_pants = -1;
-static int hf_quake_CCREP_PLAYER_INFO_frags = -1;
-static int hf_quake_CCREP_PLAYER_INFO_connect_time = -1;
-static int hf_quake_CCREP_PLAYER_INFO_address = -1;
-static int hf_quake_CCREP_RULE_INFO_rule = -1;
-static int hf_quake_CCREP_RULE_INFO_value = -1;
-
-
-static gint ett_quake = -1;
-static gint ett_quake_control = -1;
-static gint ett_quake_control_colors = -1;
-static gint ett_quake_flags = -1;
+static int proto_quake;
+static int hf_quake_header_flags;
+static int hf_quake_header_flags_data;
+static int hf_quake_header_flags_ack;
+static int hf_quake_header_flags_no_ack;
+static int hf_quake_header_flags_endmsg;
+static int hf_quake_header_flags_unreliable;
+static int hf_quake_header_flags_control;
+static int hf_quake_header_length;
+static int hf_quake_header_sequence;
+static int hf_quake_control_command;
+
+static int hf_quake_CCREQ_CONNECT_game;
+static int hf_quake_CCREQ_CONNECT_version;
+static int hf_quake_CCREQ_SERVER_INFO_game;
+static int hf_quake_CCREQ_SERVER_INFO_version;
+static int hf_quake_CCREQ_PLAYER_INFO_player;
+static int hf_quake_CCREQ_RULE_INFO_lastrule;
+
+static int hf_quake_CCREP_ACCEPT_port;
+static int hf_quake_CCREP_REJECT_reason;
+static int hf_quake_CCREP_SERVER_INFO_address;
+static int hf_quake_CCREP_SERVER_INFO_server;
+static int hf_quake_CCREP_SERVER_INFO_map;
+static int hf_quake_CCREP_SERVER_INFO_num_player;
+static int hf_quake_CCREP_SERVER_INFO_max_player;
+static int hf_quake_CCREP_PLAYER_INFO_name;
+static int hf_quake_CCREP_PLAYER_INFO_colors;
+static int hf_quake_CCREP_PLAYER_INFO_colors_shirt;
+static int hf_quake_CCREP_PLAYER_INFO_colors_pants;
+static int hf_quake_CCREP_PLAYER_INFO_frags;
+static int hf_quake_CCREP_PLAYER_INFO_connect_time;
+static int hf_quake_CCREP_PLAYER_INFO_address;
+static int hf_quake_CCREP_RULE_INFO_rule;
+static int hf_quake_CCREP_RULE_INFO_value;
+
+
+static gint ett_quake;
+static gint ett_quake_control;
+static gint ett_quake_control_colors;
+static gint ett_quake_flags;
 
 static dissector_handle_t quake_handle;
 
diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c
index 432f024782..29bd93fec0 100644
--- a/epan/dissectors/packet-quake2.c
+++ b/epan/dissectors/packet-quake2.c
@@ -26,48 +26,48 @@ void proto_reg_handoff_quake2(void);
 
 static dissector_handle_t quake2_handle;
 
-static int proto_quake2 = -1;
-
-static int hf_quake2_s2c = -1;
-static int hf_quake2_c2s = -1;
-static int hf_quake2_connectionless = -1;
-static int hf_quake2_game = -1;
-static int hf_quake2_userinfo = -1;
-static int hf_quake2_command = -1;
-static int hf_quake2_connectionless_marker = -1;
-static int hf_quake2_connectionless_text = -1;
-static int hf_quake2_game_seq1 = -1;
-static int hf_quake2_game_rel1 = -1;
-static int hf_quake2_game_seq2 = -1;
-static int hf_quake2_game_rel2 = -1;
-static int hf_quake2_game_qport = -1;
-static int hf_quake2_game_client_command = -1;
-static int hf_quake2_game_server_command = -1;
-static int hf_quake2_game_client_command_move = -1;
-static int hf_quake2_game_client_command_move_chksum = -1;
-static int hf_quake2_game_client_command_move_lframe = -1;
-static int hf_quake2_game_client_command_move_bitfield_angles1 = -1;
-static int hf_quake2_game_client_command_move_bitfield_angles2 = -1;
-static int hf_quake2_game_client_command_move_bitfield_angles3 = -1;
-static int hf_quake2_game_client_command_move_bitfield_movement_fwd = -1;
-static int hf_quake2_game_client_command_move_bitfield_movement_side = -1;
-static int hf_quake2_game_client_command_move_bitfield_movement_up = -1;
-static int hf_quake2_game_client_command_move_bitfield_buttons = -1;
-static int hf_quake2_game_client_command_move_bitfield_impulse = -1;
-static int hf_quake2_game_client_command_move_msec = -1;
-static int hf_quake2_game_client_command_move_lightlevel = -1;
-
-static gint ett_quake2 = -1;
-static gint ett_quake2_connectionless = -1;
-static gint ett_quake2_game = -1;
-static gint ett_quake2_game_seq1 = -1;
-static gint ett_quake2_game_seq2 = -1;
-static gint ett_quake2_game_clc = -1;
-static gint ett_quake2_game_svc = -1;
-static gint ett_quake2_game_clc_cmd = -1;
-static gint ett_quake2_game_svc_cmd = -1;
-static gint ett_quake2_game_clc_cmd_move_bitfield = -1;
-static gint ett_quake2_game_clc_cmd_move_moves = -1;
+static int proto_quake2;
+
+static int hf_quake2_s2c;
+static int hf_quake2_c2s;
+static int hf_quake2_connectionless;
+static int hf_quake2_game;
+static int hf_quake2_userinfo;
+static int hf_quake2_command;
+static int hf_quake2_connectionless_marker;
+static int hf_quake2_connectionless_text;
+static int hf_quake2_game_seq1;
+static int hf_quake2_game_rel1;
+static int hf_quake2_game_seq2;
+static int hf_quake2_game_rel2;
+static int hf_quake2_game_qport;
+static int hf_quake2_game_client_command;
+static int hf_quake2_game_server_command;
+static int hf_quake2_game_client_command_move;
+static int hf_quake2_game_client_command_move_chksum;
+static int hf_quake2_game_client_command_move_lframe;
+static int hf_quake2_game_client_command_move_bitfield_angles1;
+static int hf_quake2_game_client_command_move_bitfield_angles2;
+static int hf_quake2_game_client_command_move_bitfield_angles3;
+static int hf_quake2_game_client_command_move_bitfield_movement_fwd;
+static int hf_quake2_game_client_command_move_bitfield_movement_side;
+static int hf_quake2_game_client_command_move_bitfield_movement_up;
+static int hf_quake2_game_client_command_move_bitfield_buttons;
+static int hf_quake2_game_client_command_move_bitfield_impulse;
+static int hf_quake2_game_client_command_move_msec;
+static int hf_quake2_game_client_command_move_lightlevel;
+
+static gint ett_quake2;
+static gint ett_quake2_connectionless;
+static gint ett_quake2_game;
+static gint ett_quake2_game_seq1;
+static gint ett_quake2_game_seq2;
+static gint ett_quake2_game_clc;
+static gint ett_quake2_game_svc;
+static gint ett_quake2_game_clc_cmd;
+static gint ett_quake2_game_svc_cmd;
+static gint ett_quake2_game_clc_cmd_move_bitfield;
+static gint ett_quake2_game_clc_cmd_move_moves;
 
 
 #define PORT_MASTER 27910 /* Not IANA registered */
diff --git a/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c
index f9a7077f66..49e51ae9b1 100644
--- a/epan/dissectors/packet-quake3.c
+++ b/epan/dissectors/packet-quake3.c
@@ -31,31 +31,31 @@
 
 void proto_register_quake3(void);
 static dissector_handle_t quake3_handle;
-static int proto_quake3 = -1;
-
-static int hf_quake3_direction = -1;
-static int hf_quake3_connectionless = -1;
-static int hf_quake3_game = -1;
-static int hf_quake3_connectionless_marker = -1;
-static int hf_quake3_connectionless_text = -1;
-static int hf_quake3_connectionless_command = -1;
-static int hf_quake3_server_addr = -1;
-static int hf_quake3_server_port = -1;
-static int hf_quake3_game_seq1 = -1;
-static int hf_quake3_game_rel1 = -1;
-static int hf_quake3_game_seq2 = -1;
-static int hf_quake3_game_rel2 = -1;
-static int hf_quake3_game_qport = -1;
-
-static gint ett_quake3 = -1;
-static gint ett_quake3_connectionless = -1;
-static gint ett_quake3_connectionless_text = -1;
-static gint ett_quake3_server = -1;
-static gint ett_quake3_game = -1;
-static gint ett_quake3_game_seq1 = -1;
-static gint ett_quake3_game_seq2 = -1;
-static gint ett_quake3_game_clc = -1;
-static gint ett_quake3_game_svc = -1;
+static int proto_quake3;
+
+static int hf_quake3_direction;
+static int hf_quake3_connectionless;
+static int hf_quake3_game;
+static int hf_quake3_connectionless_marker;
+static int hf_quake3_connectionless_text;
+static int hf_quake3_connectionless_command;
+static int hf_quake3_server_addr;
+static int hf_quake3_server_port;
+static int hf_quake3_game_seq1;
+static int hf_quake3_game_rel1;
+static int hf_quake3_game_seq2;
+static int hf_quake3_game_rel2;
+static int hf_quake3_game_qport;
+
+static gint ett_quake3;
+static gint ett_quake3_connectionless;
+static gint ett_quake3_connectionless_text;
+static gint ett_quake3_server;
+static gint ett_quake3_game;
+static gint ett_quake3_game_seq1;
+static gint ett_quake3_game_seq2;
+static gint ett_quake3_game_clc;
+static gint ett_quake3_game_svc;
 
 #define QUAKE3_SERVER_PORT 27960
 #define QUAKE3_MASTER_PORT 27950
diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c
index e69806c948..c433515f38 100644
--- a/epan/dissectors/packet-quakeworld.c
+++ b/epan/dissectors/packet-quakeworld.c
@@ -27,44 +27,44 @@ void proto_reg_handoff_quakeworld(void);
 
 static dissector_handle_t quakeworld_handle;
 
-static int proto_quakeworld = -1;
-
-static int hf_quakeworld_s2c = -1;
-static int hf_quakeworld_c2s = -1;
-static int hf_quakeworld_connectionless = -1;
-static int hf_quakeworld_game = -1;
-static int hf_quakeworld_connectionless_marker = -1;
-static int hf_quakeworld_connectionless_text = -1;
-static int hf_quakeworld_connectionless_command = -1;
-static int hf_quakeworld_connectionless_arguments = -1;
-static int hf_quakeworld_connectionless_connect_version = -1;
-static int hf_quakeworld_connectionless_connect_qport = -1;
-static int hf_quakeworld_connectionless_connect_challenge = -1;
-static int hf_quakeworld_connectionless_connect_infostring = -1;
-static int hf_quakeworld_connectionless_connect_infostring_key_value = -1;
-static int hf_quakeworld_connectionless_connect_infostring_key = -1;
-static int hf_quakeworld_connectionless_connect_infostring_value = -1;
-static int hf_quakeworld_connectionless_rcon_password = -1;
-static int hf_quakeworld_connectionless_rcon_command = -1;
-static int hf_quakeworld_game_seq1 = -1;
-static int hf_quakeworld_game_rel1 = -1;
-static int hf_quakeworld_game_seq2 = -1;
-static int hf_quakeworld_game_rel2 = -1;
-static int hf_quakeworld_game_qport = -1;
-
-static gint ett_quakeworld = -1;
-static gint ett_quakeworld_connectionless = -1;
-static gint ett_quakeworld_connectionless_text = -1;
-static gint ett_quakeworld_connectionless_arguments = -1;
-static gint ett_quakeworld_connectionless_connect_infostring = -1;
-static gint ett_quakeworld_connectionless_connect_infostring_key_value = -1;
-static gint ett_quakeworld_game = -1;
-static gint ett_quakeworld_game_seq1 = -1;
-static gint ett_quakeworld_game_seq2 = -1;
-static gint ett_quakeworld_game_clc = -1;
-static gint ett_quakeworld_game_svc = -1;
-
-static expert_field ei_quakeworld_connectionless_command_invalid = EI_INIT;
+static int proto_quakeworld;
+
+static int hf_quakeworld_s2c;
+static int hf_quakeworld_c2s;
+static int hf_quakeworld_connectionless;
+static int hf_quakeworld_game;
+static int hf_quakeworld_connectionless_marker;
+static int hf_quakeworld_connectionless_text;
+static int hf_quakeworld_connectionless_command;
+static int hf_quakeworld_connectionless_arguments;
+static int hf_quakeworld_connectionless_connect_version;
+static int hf_quakeworld_connectionless_connect_qport;
+static int hf_quakeworld_connectionless_connect_challenge;
+static int hf_quakeworld_connectionless_connect_infostring;
+static int hf_quakeworld_connectionless_connect_infostring_key_value;
+static int hf_quakeworld_connectionless_connect_infostring_key;
+static int hf_quakeworld_connectionless_connect_infostring_value;
+static int hf_quakeworld_connectionless_rcon_password;
+static int hf_quakeworld_connectionless_rcon_command;
+static int hf_quakeworld_game_seq1;
+static int hf_quakeworld_game_rel1;
+static int hf_quakeworld_game_seq2;
+static int hf_quakeworld_game_rel2;
+static int hf_quakeworld_game_qport;
+
+static gint ett_quakeworld;
+static gint ett_quakeworld_connectionless;
+static gint ett_quakeworld_connectionless_text;
+static gint ett_quakeworld_connectionless_arguments;
+static gint ett_quakeworld_connectionless_connect_infostring;
+static gint ett_quakeworld_connectionless_connect_infostring_key_value;
+static gint ett_quakeworld_game;
+static gint ett_quakeworld_game_seq1;
+static gint ett_quakeworld_game_seq2;
+static gint ett_quakeworld_game_clc;
+static gint ett_quakeworld_game_svc;
+
+static expert_field ei_quakeworld_connectionless_command_invalid;
 
 /*
 	helper functions, they may ave to go somewhere else
diff --git a/epan/dissectors/packet-quic.c b/epan/dissectors/packet-quic.c
index 563b4098d9..9375a1514c 100644
--- a/epan/dissectors/packet-quic.c
+++ b/epan/dissectors/packet-quic.c
@@ -72,168 +72,168 @@ void proto_register_quic(void);
 static int quic_follow_tap = -1;
 
 /* Initialize the protocol and registered fields */
-static int proto_quic = -1;
-static int hf_quic_connection_number = -1;
-static int hf_quic_packet_length = -1;
-static int hf_quic_header_form = -1;
-static int hf_quic_long_packet_type = -1;
-static int hf_quic_long_packet_type_v2 = -1;
-static int hf_quic_long_reserved = -1;
-static int hf_quic_packet_number_length = -1;
-static int hf_quic_dcid = -1;
-static int hf_quic_scid = -1;
-static int hf_quic_dcil = -1;
-static int hf_quic_scil = -1;
-static int hf_quic_token_length = -1;
-static int hf_quic_token = -1;
-static int hf_quic_length = -1;
-static int hf_quic_packet_number = -1;
-static int hf_quic_version = -1;
-static int hf_quic_supported_version = -1;
-static int hf_quic_vn_unused = -1;
-static int hf_quic_short = -1;
-static int hf_quic_fixed_bit = -1;
-static int hf_quic_spin_bit = -1;
-static int hf_quic_short_reserved = -1;
-static int hf_quic_q_bit = -1;
-static int hf_quic_l_bit = -1;
-static int hf_quic_key_phase = -1;
-static int hf_quic_payload = -1;
-static int hf_quic_protected_payload = -1;
-static int hf_quic_remaining_payload = -1;
-static int hf_quic_odcil = -1;
-static int hf_quic_odcid = -1;
-static int hf_quic_retry_token = -1;
-static int hf_quic_retry_integrity_tag = -1;
-
-static int hf_quic_frame = -1;
-static int hf_quic_frame_type = -1;
-
-static int hf_quic_padding_length = -1;
-static int hf_quic_ack_largest_acknowledged = -1;
-static int hf_quic_ack_ack_delay = -1;
-static int hf_quic_ack_ack_range_count = -1;
-static int hf_quic_ack_first_ack_range = -1;
-static int hf_quic_ack_gap = -1;
-static int hf_quic_ack_ack_range = -1;
-static int hf_quic_ack_ect0_count = -1;
-static int hf_quic_ack_ect1_count = -1;
-static int hf_quic_ack_ecn_ce_count = -1;
-static int hf_quic_rsts_stream_id = -1;
-static int hf_quic_rsts_application_error_code = -1;
-static int hf_quic_rsts_final_size = -1;
-static int hf_quic_ss_stream_id = -1;
-static int hf_quic_ss_application_error_code = -1;
-static int hf_quic_crypto_offset = -1;
-static int hf_quic_crypto_length = -1;
-static int hf_quic_crypto_crypto_data = -1;
-static int hf_quic_nt_length = -1;
-static int hf_quic_nt_token = -1;
-static int hf_quic_stream_fin = -1;
-static int hf_quic_stream_len = -1;
-static int hf_quic_stream_off = -1;
-static int hf_quic_stream_stream_id = -1;
-static int hf_quic_stream_initiator = -1;
-static int hf_quic_stream_direction = -1;
-static int hf_quic_stream_offset = -1;
-static int hf_quic_stream_length = -1;
-static int hf_quic_stream_data = -1;
-static int hf_quic_md_maximum_data = -1;
-static int hf_quic_msd_stream_id = -1;
-static int hf_quic_msd_maximum_stream_data = -1;
-static int hf_quic_ms_max_streams = -1;
-static int hf_quic_db_stream_data_limit = -1;
-static int hf_quic_sdb_stream_id = -1;
-static int hf_quic_sdb_stream_data_limit = -1;
-static int hf_quic_sb_stream_limit = -1;
-static int hf_quic_nci_retire_prior_to = -1;
-static int hf_quic_nci_sequence = -1;
-static int hf_quic_nci_connection_id_length = -1;
-static int hf_quic_nci_connection_id = -1;
-static int hf_quic_nci_stateless_reset_token = -1;
-static int hf_quic_rci_sequence = -1;
-static int hf_quic_path_challenge_data = -1;
-static int hf_quic_path_response_data = -1;
-static int hf_quic_cc_error_code = -1;
-static int hf_quic_cc_error_code_app = -1;
-static int hf_quic_cc_error_code_tls_alert = -1;
-static int hf_quic_cc_frame_type = -1;
-static int hf_quic_cc_reason_phrase_length = -1;
-static int hf_quic_cc_reason_phrase = -1;
-static int hf_quic_dg_length = -1;
-static int hf_quic_dg = -1;
-static int hf_quic_af_sequence_number = -1;
-static int hf_quic_af_ack_eliciting_threshold = -1;
-static int hf_quic_af_request_max_ack_delay = -1;
-static int hf_quic_af_reordering_threshold = -1;
-//static int hf_quic_af_ignore_order = -1;
-//static int hf_quic_af_ignore_ce = -1;
-static int hf_quic_ts = -1;
-static int hf_quic_unpredictable_bits = -1;
-static int hf_quic_stateless_reset_token = -1;
-static int hf_quic_reassembled_in = -1;
-static int hf_quic_reassembled_length = -1;
-static int hf_quic_reassembled_data = -1;
-static int hf_quic_fragments = -1;
-static int hf_quic_fragment = -1;
-static int hf_quic_fragment_overlap = -1;
-static int hf_quic_fragment_overlap_conflict = -1;
-static int hf_quic_fragment_multiple_tails = -1;
-static int hf_quic_fragment_too_long_fragment = -1;
-static int hf_quic_fragment_error = -1;
-static int hf_quic_fragment_count = -1;
-
-static int hf_quic_crypto_reassembled_in = -1;
-static int hf_quic_crypto_fragments = -1;
-static int hf_quic_crypto_fragment = -1;
-static int hf_quic_crypto_fragment_count = -1;
-
-static int hf_quic_mp_add_address_first_byte	= -1;
-static int hf_quic_mp_add_address_reserved = -1;
-static int hf_quic_mp_add_address_port_present = -1;
-static int hf_quic_mp_add_address_ip_version = -1;
-static int hf_quic_mp_add_address_id = -1;
-static int hf_quic_mp_add_address_sq_number = -1;
-static int hf_quic_mp_add_address_interface_type = -1;
-static int hf_quic_mp_add_address_ip_address = -1;
-static int hf_quic_mp_add_address_ip_address_v6 = -1;
-static int hf_quic_mp_add_address_port = -1;
-static int hf_quic_mp_uniflow_id = -1;
-static int hf_quic_mp_receiving_uniflows = -1;
-static int hf_quic_mp_active_sending_uniflows = -1;
-static int hf_quic_mp_add_local_address_id = -1;
-static int hf_quic_mp_uniflow_info_section = -1;
-static int hf_quic_mp_receiving_uniflow_info_section = -1;
-static int hf_quic_mp_active_sending_uniflows_info_section = -1;
+static int proto_quic;
+static int hf_quic_connection_number;
+static int hf_quic_packet_length;
+static int hf_quic_header_form;
+static int hf_quic_long_packet_type;
+static int hf_quic_long_packet_type_v2;
+static int hf_quic_long_reserved;
+static int hf_quic_packet_number_length;
+static int hf_quic_dcid;
+static int hf_quic_scid;
+static int hf_quic_dcil;
+static int hf_quic_scil;
+static int hf_quic_token_length;
+static int hf_quic_token;
+static int hf_quic_length;
+static int hf_quic_packet_number;
+static int hf_quic_version;
+static int hf_quic_supported_version;
+static int hf_quic_vn_unused;
+static int hf_quic_short;
+static int hf_quic_fixed_bit;
+static int hf_quic_spin_bit;
+static int hf_quic_short_reserved;
+static int hf_quic_q_bit;
+static int hf_quic_l_bit;
+static int hf_quic_key_phase;
+static int hf_quic_payload;
+static int hf_quic_protected_payload;
+static int hf_quic_remaining_payload;
+static int hf_quic_odcil;
+static int hf_quic_odcid;
+static int hf_quic_retry_token;
+static int hf_quic_retry_integrity_tag;
+
+static int hf_quic_frame;
+static int hf_quic_frame_type;
+
+static int hf_quic_padding_length;
+static int hf_quic_ack_largest_acknowledged;
+static int hf_quic_ack_ack_delay;
+static int hf_quic_ack_ack_range_count;
+static int hf_quic_ack_first_ack_range;
+static int hf_quic_ack_gap;
+static int hf_quic_ack_ack_range;
+static int hf_quic_ack_ect0_count;
+static int hf_quic_ack_ect1_count;
+static int hf_quic_ack_ecn_ce_count;
+static int hf_quic_rsts_stream_id;
+static int hf_quic_rsts_application_error_code;
+static int hf_quic_rsts_final_size;
+static int hf_quic_ss_stream_id;
+static int hf_quic_ss_application_error_code;
+static int hf_quic_crypto_offset;
+static int hf_quic_crypto_length;
+static int hf_quic_crypto_crypto_data;
+static int hf_quic_nt_length;
+static int hf_quic_nt_token;
+static int hf_quic_stream_fin;
+static int hf_quic_stream_len;
+static int hf_quic_stream_off;
+static int hf_quic_stream_stream_id;
+static int hf_quic_stream_initiator;
+static int hf_quic_stream_direction;
+static int hf_quic_stream_offset;
+static int hf_quic_stream_length;
+static int hf_quic_stream_data;
+static int hf_quic_md_maximum_data;
+static int hf_quic_msd_stream_id;
+static int hf_quic_msd_maximum_stream_data;
+static int hf_quic_ms_max_streams;
+static int hf_quic_db_stream_data_limit;
+static int hf_quic_sdb_stream_id;
+static int hf_quic_sdb_stream_data_limit;
+static int hf_quic_sb_stream_limit;
+static int hf_quic_nci_retire_prior_to;
+static int hf_quic_nci_sequence;
+static int hf_quic_nci_connection_id_length;
+static int hf_quic_nci_connection_id;
+static int hf_quic_nci_stateless_reset_token;
+static int hf_quic_rci_sequence;
+static int hf_quic_path_challenge_data;
+static int hf_quic_path_response_data;
+static int hf_quic_cc_error_code;
+static int hf_quic_cc_error_code_app;
+static int hf_quic_cc_error_code_tls_alert;
+static int hf_quic_cc_frame_type;
+static int hf_quic_cc_reason_phrase_length;
+static int hf_quic_cc_reason_phrase;
+static int hf_quic_dg_length;
+static int hf_quic_dg;
+static int hf_quic_af_sequence_number;
+static int hf_quic_af_ack_eliciting_threshold;
+static int hf_quic_af_request_max_ack_delay;
+static int hf_quic_af_reordering_threshold;
+//static int hf_quic_af_ignore_order;
+//static int hf_quic_af_ignore_ce;
+static int hf_quic_ts;
+static int hf_quic_unpredictable_bits;
+static int hf_quic_stateless_reset_token;
+static int hf_quic_reassembled_in;
+static int hf_quic_reassembled_length;
+static int hf_quic_reassembled_data;
+static int hf_quic_fragments;
+static int hf_quic_fragment;
+static int hf_quic_fragment_overlap;
+static int hf_quic_fragment_overlap_conflict;
+static int hf_quic_fragment_multiple_tails;
+static int hf_quic_fragment_too_long_fragment;
+static int hf_quic_fragment_error;
+static int hf_quic_fragment_count;
+
+static int hf_quic_crypto_reassembled_in;
+static int hf_quic_crypto_fragments;
+static int hf_quic_crypto_fragment;
+static int hf_quic_crypto_fragment_count;
+
+static int hf_quic_mp_add_address_first_byte;
+static int hf_quic_mp_add_address_reserved;
+static int hf_quic_mp_add_address_port_present;
+static int hf_quic_mp_add_address_ip_version;
+static int hf_quic_mp_add_address_id;
+static int hf_quic_mp_add_address_sq_number;
+static int hf_quic_mp_add_address_interface_type;
+static int hf_quic_mp_add_address_ip_address;
+static int hf_quic_mp_add_address_ip_address_v6;
+static int hf_quic_mp_add_address_port;
+static int hf_quic_mp_uniflow_id;
+static int hf_quic_mp_receiving_uniflows;
+static int hf_quic_mp_active_sending_uniflows;
+static int hf_quic_mp_add_local_address_id;
+static int hf_quic_mp_uniflow_info_section;
+static int hf_quic_mp_receiving_uniflow_info_section;
+static int hf_quic_mp_active_sending_uniflows_info_section;
 
 /* multipath*/
-static int hf_quic_mp_ack_dcid_sequence_number = -1;
-static int hf_quic_mp_pa_dcid_sequence_number = -1;
-static int hf_quic_mp_ps_dcid_sequence_number = -1;
-static int hf_quic_mp_ps_path_status_sequence_number = -1;
-static int hf_quic_mp_ps_path_status = -1;
-
-static expert_field ei_quic_connection_unknown = EI_INIT;
-static expert_field ei_quic_ft_unknown = EI_INIT;
-static expert_field ei_quic_decryption_failed = EI_INIT;
-static expert_field ei_quic_protocol_violation = EI_INIT;
-static expert_field ei_quic_bad_retry = EI_INIT;
-static expert_field ei_quic_coalesced_padding_data = EI_INIT;
-static expert_field ei_quic_retransmission = EI_INIT;
-static expert_field ei_quic_overlap = EI_INIT;
-static expert_field ei_quic_data_after_forcing_vn = EI_INIT;
-
-static gint ett_quic = -1;
-static gint ett_quic_af = -1;
-static gint ett_quic_short_header = -1;
-static gint ett_quic_connection_info = -1;
-static gint ett_quic_ft = -1;
-static gint ett_quic_ftflags = -1;
-static gint ett_quic_ftid = -1;
-static gint ett_quic_fragments = -1;
-static gint ett_quic_fragment = -1;
-static gint ett_quic_crypto_fragments = -1;
-static gint ett_quic_crypto_fragment = -1;
+static int hf_quic_mp_ack_dcid_sequence_number;
+static int hf_quic_mp_pa_dcid_sequence_number;
+static int hf_quic_mp_ps_dcid_sequence_number;
+static int hf_quic_mp_ps_path_status_sequence_number;
+static int hf_quic_mp_ps_path_status;
+
+static expert_field ei_quic_connection_unknown;
+static expert_field ei_quic_ft_unknown;
+static expert_field ei_quic_decryption_failed;
+static expert_field ei_quic_protocol_violation;
+static expert_field ei_quic_bad_retry;
+static expert_field ei_quic_coalesced_padding_data;
+static expert_field ei_quic_retransmission;
+static expert_field ei_quic_overlap;
+static expert_field ei_quic_data_after_forcing_vn;
+
+static gint ett_quic;
+static gint ett_quic_af;
+static gint ett_quic_short_header;
+static gint ett_quic_connection_info;
+static gint ett_quic_ft;
+static gint ett_quic_ftflags;
+static gint ett_quic_ftid;
+static gint ett_quic_fragments;
+static gint ett_quic_fragment;
+static gint ett_quic_crypto_fragments;
+static gint ett_quic_crypto_fragment;
 
 static dissector_handle_t quic_handle;
 static dissector_handle_t tls13_handshake_handle;
diff --git a/epan/dissectors/packet-r09.c b/epan/dissectors/packet-r09.c
index f9a6b9cf59..8dd48bd02a 100644
--- a/epan/dissectors/packet-r09.c
+++ b/epan/dissectors/packet-r09.c
@@ -24,24 +24,24 @@ void proto_reg_handoff_r09(void);
 #define PSNAME "R09"
 #define PFNAME "r09"
 
-static int proto_r09 = -1;
-static int hf_r09_modus = -1;
-static int hf_r09_ty = -1;
-static int hf_r09_tl = -1;
-static int hf_r09_zv = -1;
-static int hf_r09_zw = -1;
-static int hf_r09_mp8 = -1;
-static int hf_r09_mp16 = -1;
-static int hf_r09_pr = -1;
-static int hf_r09_ha = -1;
-static int hf_r09_ln = -1;
-static int hf_r09_kn = -1;
-static int hf_r09_zn = -1;
-static int hf_r09_zl = -1;
-static int hf_r09_fn = -1;
-static int hf_r09_un = -1;
-
-static gint ett_r09 = -1;
+static int proto_r09;
+static int hf_r09_modus;
+static int hf_r09_ty;
+static int hf_r09_tl;
+static int hf_r09_zv;
+static int hf_r09_zw;
+static int hf_r09_mp8;
+static int hf_r09_mp16;
+static int hf_r09_pr;
+static int hf_r09_ha;
+static int hf_r09_ln;
+static int hf_r09_kn;
+static int hf_r09_zn;
+static int hf_r09_zl;
+static int hf_r09_fn;
+static int hf_r09_un;
+
+static gint ett_r09;
 
 static dissector_handle_t r09_handle;
 
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 3ba1002665..f433caff49 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -109,87 +109,87 @@ typedef struct _radius_info_t
 
 static radius_dictionary_t *dict = NULL;
 
-static int proto_radius = -1;
-
-static int hf_radius_req = -1;
-static int hf_radius_rsp = -1;
-static int hf_radius_req_frame = -1;
-static int hf_radius_rsp_frame = -1;
-static int hf_radius_time = -1;
-
-static int hf_radius_dup = -1;
-static int hf_radius_req_dup = -1;
-static int hf_radius_rsp_dup = -1;
-
-static int hf_radius_id = -1;
-static int hf_radius_code = -1;
-static int hf_radius_length = -1;
-static int hf_radius_authenticator = -1;
-static int hf_radius_authenticator_valid = -1;
-static int hf_radius_authenticator_invalid = -1;
-static int hf_radius_message_authenticator_valid = -1;
-static int hf_radius_message_authenticator_invalid = -1;
-
-static int hf_radius_chap_password = -1;
-static int hf_radius_chap_ident = -1;
-static int hf_radius_chap_string = -1;
-static int hf_radius_framed_ip_address = -1;
-
-static int hf_radius_login_ip_host = -1;
-static int hf_radius_framed_ipx_network = -1;
-
-static int hf_radius_cosine_vpi = -1;
-static int hf_radius_cosine_vci = -1;
-
-static int hf_radius_ascend_data_filter = -1;
-static int hf_radius_ascend_data_filter_type = -1;
-static int hf_radius_ascend_data_filter_filteror = -1;
-static int hf_radius_ascend_data_filter_inout = -1;
-static int hf_radius_ascend_data_filter_spare = -1;
-static int hf_radius_ascend_data_filter_src_ipv4 = -1;
-static int hf_radius_ascend_data_filter_dst_ipv4 = -1;
-static int hf_radius_ascend_data_filter_src_ipv6 = -1;
-static int hf_radius_ascend_data_filter_dst_ipv6 = -1;
-static int hf_radius_ascend_data_filter_src_ip_prefix = -1;
-static int hf_radius_ascend_data_filter_dst_ip_prefix = -1;
-static int hf_radius_ascend_data_filter_protocol = -1;
-static int hf_radius_ascend_data_filter_established = -1;
-static int hf_radius_ascend_data_filter_src_port = -1;
-static int hf_radius_ascend_data_filter_dst_port = -1;
-static int hf_radius_ascend_data_filter_src_port_qualifier = -1;
-static int hf_radius_ascend_data_filter_dst_port_qualifier = -1;
-static int hf_radius_ascend_data_filter_reserved = -1;
-
-static int hf_radius_vsa_fragment = -1;
-static int hf_radius_eap_fragment = -1;
-static int hf_radius_avp = -1;
-static int hf_radius_avp_length = -1;
-static int hf_radius_avp_type = -1;
-static int hf_radius_avp_vendor_id = -1;
-static int hf_radius_avp_vendor_type = -1;
-static int hf_radius_avp_vendor_len = -1;
-static int hf_radius_avp_extended_type = -1;
-static int hf_radius_avp_extended_more = -1;
-static int hf_radius_3gpp_ms_tmime_zone = -1;
-
-static int hf_radius_egress_vlanid_tag = -1;
-static int hf_radius_egress_vlanid_pad = -1;
-static int hf_radius_egress_vlanid = -1;
-
-static int hf_radius_egress_vlan_name_tag = -1;
-static int hf_radius_egress_vlan_name = -1;
-
-
-static gint ett_radius = -1;
-static gint ett_radius_avp = -1;
-
-static gint ett_radius_authenticator = -1;
-static gint ett_radius_ascend = -1;
-
-static gint ett_eap = -1;
-static gint ett_chap = -1;
-
-static expert_field ei_radius_invalid_length = EI_INIT;
+static int proto_radius;
+
+static int hf_radius_req;
+static int hf_radius_rsp;
+static int hf_radius_req_frame;
+static int hf_radius_rsp_frame;
+static int hf_radius_time;
+
+static int hf_radius_dup;
+static int hf_radius_req_dup;
+static int hf_radius_rsp_dup;
+
+static int hf_radius_id;
+static int hf_radius_code;
+static int hf_radius_length;
+static int hf_radius_authenticator;
+static int hf_radius_authenticator_valid;
+static int hf_radius_authenticator_invalid;
+static int hf_radius_message_authenticator_valid;
+static int hf_radius_message_authenticator_invalid;
+
+static int hf_radius_chap_password;
+static int hf_radius_chap_ident;
+static int hf_radius_chap_string;
+static int hf_radius_framed_ip_address;
+
+static int hf_radius_login_ip_host;
+static int hf_radius_framed_ipx_network;
+
+static int hf_radius_cosine_vpi;
+static int hf_radius_cosine_vci;
+
+static int hf_radius_ascend_data_filter;
+static int hf_radius_ascend_data_filter_type;
+static int hf_radius_ascend_data_filter_filteror;
+static int hf_radius_ascend_data_filter_inout;
+static int hf_radius_ascend_data_filter_spare;
+static int hf_radius_ascend_data_filter_src_ipv4;
+static int hf_radius_ascend_data_filter_dst_ipv4;
+static int hf_radius_ascend_data_filter_src_ipv6;
+static int hf_radius_ascend_data_filter_dst_ipv6;
+static int hf_radius_ascend_data_filter_src_ip_prefix;
+static int hf_radius_ascend_data_filter_dst_ip_prefix;
+static int hf_radius_ascend_data_filter_protocol;
+static int hf_radius_ascend_data_filter_established;
+static int hf_radius_ascend_data_filter_src_port;
+static int hf_radius_ascend_data_filter_dst_port;
+static int hf_radius_ascend_data_filter_src_port_qualifier;
+static int hf_radius_ascend_data_filter_dst_port_qualifier;
+static int hf_radius_ascend_data_filter_reserved;
+
+static int hf_radius_vsa_fragment;
+static int hf_radius_eap_fragment;
+static int hf_radius_avp;
+static int hf_radius_avp_length;
+static int hf_radius_avp_type;
+static int hf_radius_avp_vendor_id;
+static int hf_radius_avp_vendor_type;
+static int hf_radius_avp_vendor_len;
+static int hf_radius_avp_extended_type;
+static int hf_radius_avp_extended_more;
+static int hf_radius_3gpp_ms_tmime_zone;
+
+static int hf_radius_egress_vlanid_tag;
+static int hf_radius_egress_vlanid_pad;
+static int hf_radius_egress_vlanid;
+
+static int hf_radius_egress_vlan_name_tag;
+static int hf_radius_egress_vlan_name;
+
+
+static gint ett_radius;
+static gint ett_radius_avp;
+
+static gint ett_radius_authenticator;
+static gint ett_radius_ascend;
+
+static gint ett_eap;
+static gint ett_chap;
+
+static expert_field ei_radius_invalid_length;
 
 /*
  * Define the tap for radius
diff --git a/epan/dissectors/packet-radius_packetcable.c b/epan/dissectors/packet-radius_packetcable.c
index 83ed4f2c8e..03680ea24f 100644
--- a/epan/dissectors/packet-radius_packetcable.c
+++ b/epan/dissectors/packet-radius_packetcable.c
@@ -38,79 +38,79 @@
 void proto_register_packetcable(void);
 void proto_reg_handoff_packetcable(void);
 
-static int proto_packetcable = -1;
-
-static int hf_packetcable_em_header_version_id = -1;
-static int hf_packetcable_bcid_timestamp = -1;
-static int hf_packetcable_bcid_event_counter = -1;
-static int hf_packetcable_em_header_event_message_type = -1;
-static int hf_packetcable_em_header_element_type = -1;
-static int hf_packetcable_em_header_sequence_number = -1;
-static int hf_packetcable_em_header_status = -1;
-static int hf_packetcable_em_header_status_error_indicator = -1;
-static int hf_packetcable_em_header_status_event_origin = -1;
-static int hf_packetcable_em_header_status_event_message_proxied = -1;
-static int hf_packetcable_em_header_priority = -1;
-static int hf_packetcable_em_header_attribute_count = -1;
-static int hf_packetcable_em_header_event_object = -1;
-static int hf_packetcable_call_termination_cause_source_document = -1;
-static int hf_packetcable_call_termination_cause_code = -1;
-static int hf_packetcable_trunk_group_id_trunk_type = -1;
-static int hf_packetcable_trunk_group_id_trunk_number = -1;
-static int hf_packetcable_qos_status = -1;
-static int hf_packetcable_qos_status_indication = -1;
-static int hf_packetcable_time_adjustment = -1;
-static int hf_packetcable_redirected_from_info_number_of_redirections = -1;
-static int hf_packetcable_electronic_surveillance_indication_df_cdc_address = -1;
-static int hf_packetcable_electronic_surveillance_indication_df_ccc_address = -1;
-static int hf_packetcable_electronic_surveillance_indication_cdc_port = -1;
-static int hf_packetcable_electronic_surveillance_indication_ccc_port = -1;
-static int hf_packetcable_terminal_display_info_terminal_display_status_bitmask = -1;
-static int hf_packetcable_terminal_display_info_sbm_general_display = -1;
-static int hf_packetcable_terminal_display_info_sbm_calling_number = -1;
-static int hf_packetcable_terminal_display_info_sbm_calling_name = -1;
-static int hf_packetcable_terminal_display_info_sbm_message_waiting = -1;
-static int hf_packetcable_terminal_display_info_general_display = -1;
-static int hf_packetcable_terminal_display_info_calling_number = -1;
-static int hf_packetcable_terminal_display_info_calling_name = -1;
-static int hf_packetcable_terminal_display_info_message_waiting = -1;
-static int hf_packetcable_qos_desc_flags_sfst = -1;
-static int hf_packetcable_qos_desc_flags_gi = -1;
-static int hf_packetcable_qos_desc_flags_tgj = -1;
-static int hf_packetcable_qos_desc_flags_gpi = -1;
-static int hf_packetcable_qos_desc_flags_ugs = -1;
-static int hf_packetcable_qos_desc_flags_tp = -1;
-static int hf_packetcable_qos_desc_flags_msr = -1;
-static int hf_packetcable_qos_desc_flags_mtb = -1;
-static int hf_packetcable_qos_desc_flags_mrtr = -1;
-static int hf_packetcable_qos_desc_flags_mps = -1;
-static int hf_packetcable_qos_desc_flags_mcb = -1;
-static int hf_packetcable_qos_desc_flags_srtp = -1;
-static int hf_packetcable_qos_desc_flags_npi = -1;
-static int hf_packetcable_qos_desc_flags_tpj = -1;
-static int hf_packetcable_qos_desc_flags_toso = -1;
-static int hf_packetcable_qos_desc_flags_mdl = -1;
+static int proto_packetcable;
+
+static int hf_packetcable_em_header_version_id;
+static int hf_packetcable_bcid_timestamp;
+static int hf_packetcable_bcid_event_counter;
+static int hf_packetcable_em_header_event_message_type;
+static int hf_packetcable_em_header_element_type;
+static int hf_packetcable_em_header_sequence_number;
+static int hf_packetcable_em_header_status;
+static int hf_packetcable_em_header_status_error_indicator;
+static int hf_packetcable_em_header_status_event_origin;
+static int hf_packetcable_em_header_status_event_message_proxied;
+static int hf_packetcable_em_header_priority;
+static int hf_packetcable_em_header_attribute_count;
+static int hf_packetcable_em_header_event_object;
+static int hf_packetcable_call_termination_cause_source_document;
+static int hf_packetcable_call_termination_cause_code;
+static int hf_packetcable_trunk_group_id_trunk_type;
+static int hf_packetcable_trunk_group_id_trunk_number;
+static int hf_packetcable_qos_status;
+static int hf_packetcable_qos_status_indication;
+static int hf_packetcable_time_adjustment;
+static int hf_packetcable_redirected_from_info_number_of_redirections;
+static int hf_packetcable_electronic_surveillance_indication_df_cdc_address;
+static int hf_packetcable_electronic_surveillance_indication_df_ccc_address;
+static int hf_packetcable_electronic_surveillance_indication_cdc_port;
+static int hf_packetcable_electronic_surveillance_indication_ccc_port;
+static int hf_packetcable_terminal_display_info_terminal_display_status_bitmask;
+static int hf_packetcable_terminal_display_info_sbm_general_display;
+static int hf_packetcable_terminal_display_info_sbm_calling_number;
+static int hf_packetcable_terminal_display_info_sbm_calling_name;
+static int hf_packetcable_terminal_display_info_sbm_message_waiting;
+static int hf_packetcable_terminal_display_info_general_display;
+static int hf_packetcable_terminal_display_info_calling_number;
+static int hf_packetcable_terminal_display_info_calling_name;
+static int hf_packetcable_terminal_display_info_message_waiting;
+static int hf_packetcable_qos_desc_flags_sfst;
+static int hf_packetcable_qos_desc_flags_gi;
+static int hf_packetcable_qos_desc_flags_tgj;
+static int hf_packetcable_qos_desc_flags_gpi;
+static int hf_packetcable_qos_desc_flags_ugs;
+static int hf_packetcable_qos_desc_flags_tp;
+static int hf_packetcable_qos_desc_flags_msr;
+static int hf_packetcable_qos_desc_flags_mtb;
+static int hf_packetcable_qos_desc_flags_mrtr;
+static int hf_packetcable_qos_desc_flags_mps;
+static int hf_packetcable_qos_desc_flags_mcb;
+static int hf_packetcable_qos_desc_flags_srtp;
+static int hf_packetcable_qos_desc_flags_npi;
+static int hf_packetcable_qos_desc_flags_tpj;
+static int hf_packetcable_qos_desc_flags_toso;
+static int hf_packetcable_qos_desc_flags_mdl;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_packetcable_bcid_time_zone_offset = -1;
-static int hf_packetcable_bcid_element_id = -1;
-static int hf_packetcable_electronic_surveillance_indication_df_df_key = -1;
-static int hf_packetcable_redirected_from_original_called_party = -1;
-static int hf_packetcable_em_header_element_id = -1;
-static int hf_packetcable_redirected_from_last_redirecting_party = -1;
-static int hf_packetcable_bcid_time_zone_dst = -1;
-static int hf_packetcable_em_header_time_zone_offset = -1;
-static int hf_packetcable_qos_service_class_name = -1;
-static int hf_packetcable_em_header_event_time = -1;
-static int hf_packetcable_em_header_time_zone_dst = -1;
+static int hf_packetcable_bcid_time_zone_offset;
+static int hf_packetcable_bcid_element_id;
+static int hf_packetcable_electronic_surveillance_indication_df_df_key;
+static int hf_packetcable_redirected_from_original_called_party;
+static int hf_packetcable_em_header_element_id;
+static int hf_packetcable_redirected_from_last_redirecting_party;
+static int hf_packetcable_bcid_time_zone_dst;
+static int hf_packetcable_em_header_time_zone_offset;
+static int hf_packetcable_qos_service_class_name;
+static int hf_packetcable_em_header_event_time;
+static int hf_packetcable_em_header_time_zone_dst;
 
 /* This is slightly ugly.  */
 static int hf_packetcable_qos_desc_fields[16];
 
-static gint ett_radius_vendor_packetcable_bcid = -1;
-static gint ett_radius_vendor_packetcable_status = -1;
-static gint ett_radius_vendor_packetcable_qos_status = -1;
-static gint ett_packetcable_term_dsply = -1;
+static gint ett_radius_vendor_packetcable_bcid;
+static gint ett_radius_vendor_packetcable_status;
+static gint ett_radius_vendor_packetcable_qos_status;
+static gint ett_packetcable_term_dsply;
 
 
 #define PACKETCABLE_QOS_STATE_INDICATION_MASK 0X0003
diff --git a/epan/dissectors/packet-raknet.c b/epan/dissectors/packet-raknet.c
index 9911fc34e5..9899b2694f 100644
--- a/epan/dissectors/packet-raknet.c
+++ b/epan/dissectors/packet-raknet.c
@@ -36,14 +36,14 @@ static guint8 RAKNET_OFFLINE_MESSAGE_DATA_ID[16] = {0x00, 0xff, 0xff, 0x00, 0xfe
 #define RAKNET_IDENTITY_LENGTH 160
 #define RAKNET_NUMBER_OF_INTERNAL_IDS 10
 
-static int proto_raknet = -1;
-static gint ett_raknet = -1; /* Should this node be expanded */
-static gint ett_raknet_system_address = -1;
-static gint ett_raknet_packet_type = -1;
-static gint ett_raknet_packet_number_range = -1;
-static gint ett_raknet_message = -1;
-static gint ett_raknet_message_flags = -1;
-static gint ett_raknet_system_message = -1;
+static int proto_raknet;
+static gint ett_raknet; /* Should this node be expanded */
+static gint ett_raknet_system_address;
+static gint ett_raknet_packet_type;
+static gint ett_raknet_packet_number_range;
+static gint ett_raknet_message;
+static gint ett_raknet_message_flags;
+static gint ett_raknet_system_message;
 
 /*
  * Dissectors
@@ -57,98 +57,98 @@ static heur_dissector_list_t raknet_heur_subdissectors = NULL;
 /*
  * Expert fields
  */
-static expert_field ei_raknet_unknown_message_id = EI_INIT;
-static expert_field ei_raknet_encrypted_message = EI_INIT;
-static expert_field ei_raknet_subdissector_failed = EI_INIT;
-static expert_field ei_raknet_ip_ver_invalid = EI_INIT;
+static expert_field ei_raknet_unknown_message_id;
+static expert_field ei_raknet_encrypted_message;
+static expert_field ei_raknet_subdissector_failed;
+static expert_field ei_raknet_ip_ver_invalid;
 
 /*
  * First byte gives us the packet id
  */
-static int hf_raknet_offline_message_id = -1;
+static int hf_raknet_offline_message_id;
 
 /*
  * General fields (fields that are in >1 packet types.
  */
-static int hf_raknet_client_guid = -1;
-static int hf_raknet_timestamp = -1;
-static int hf_raknet_offline_message_data_id = -1;
-static int hf_raknet_mtu_size = -1;
-static int hf_raknet_raknet_proto_ver = -1;
-static int hf_raknet_server_guid = -1;
-static int hf_raknet_ip_version = -1;
-static int hf_raknet_ipv4_address = -1;
-static int hf_raknet_ipv6_address = -1;
-static int hf_raknet_port = -1;
+static int hf_raknet_client_guid;
+static int hf_raknet_timestamp;
+static int hf_raknet_offline_message_data_id;
+static int hf_raknet_mtu_size;
+static int hf_raknet_raknet_proto_ver;
+static int hf_raknet_server_guid;
+static int hf_raknet_ip_version;
+static int hf_raknet_ipv4_address;
+static int hf_raknet_ipv6_address;
+static int hf_raknet_port;
 
 /*
  * Fields specific to a packet id type
  */
-static int hf_raknet_null_padding = -1;
-static int hf_raknet_use_encryption = -1;
-static int hf_raknet_server_public_key = -1;
-static int hf_raknet_cookie = -1;
-static int hf_raknet_client_wrote_challenge = -1;
-static int hf_raknet_client_challenge = -1;
-static int hf_raknet_client_address = -1;
-static int hf_raknet_server_address = -1;
-static int hf_raknet_server_answer = -1;
-static int hf_raknet_0x1C_server_id_str_len = -1;
-static int hf_raknet_0x1C_server_id_str = -1;
-static int hf_raknet_packet_type = -1;
-static int hf_raknet_packet_is_for_connected = -1;
-static int hf_raknet_packet_is_ACK = -1;
-static int hf_raknet_packet_has_B_and_AS = -1;
-static int hf_raknet_packet_is_NAK = -1;
-static int hf_raknet_packet_is_pair = -1;
-static int hf_raknet_packet_is_continuous_send = -1;
-static int hf_raknet_packet_needs_B_and_AS = -1;
-static int hf_raknet_AS = -1;
-static int hf_raknet_NACK_record_count = -1;
-static int hf_raknet_packet_number_range = -1;
-static int hf_raknet_range_max_equal_to_min = -1;
-static int hf_raknet_packet_number_min = -1;
-static int hf_raknet_packet_number_max = -1;
-static int hf_raknet_packet_number = -1;
-static int hf_raknet_message = -1;
-static int hf_raknet_message_flags = -1;
-static int hf_raknet_message_reliability = -1;
-static int hf_raknet_message_has_split_packet = -1;
-static int hf_raknet_payload_length = -1;
-static int hf_raknet_reliable_message_number = -1;
-static int hf_raknet_message_sequencing_index = -1;
-static int hf_raknet_message_ordering_index = -1;
-static int hf_raknet_message_ordering_channel = -1;
-static int hf_raknet_split_packet_count = -1;
-static int hf_raknet_split_packet_id = -1;
-static int hf_raknet_split_packet_index = -1;
-static int hf_raknet_split_packet = -1;
-static int hf_raknet_system_message = -1;
-static int hf_raknet_system_message_id = -1;
-static int hf_raknet_client_proof = -1;
-static int hf_raknet_use_client_key = -1;
-static int hf_raknet_client_identity = -1;
-static int hf_raknet_password = -1;
-static int hf_raknet_system_index = -1;
-static int hf_raknet_internal_address = -1;
+static int hf_raknet_null_padding;
+static int hf_raknet_use_encryption;
+static int hf_raknet_server_public_key;
+static int hf_raknet_cookie;
+static int hf_raknet_client_wrote_challenge;
+static int hf_raknet_client_challenge;
+static int hf_raknet_client_address;
+static int hf_raknet_server_address;
+static int hf_raknet_server_answer;
+static int hf_raknet_0x1C_server_id_str_len;
+static int hf_raknet_0x1C_server_id_str;
+static int hf_raknet_packet_type;
+static int hf_raknet_packet_is_for_connected;
+static int hf_raknet_packet_is_ACK;
+static int hf_raknet_packet_has_B_and_AS;
+static int hf_raknet_packet_is_NAK;
+static int hf_raknet_packet_is_pair;
+static int hf_raknet_packet_is_continuous_send;
+static int hf_raknet_packet_needs_B_and_AS;
+static int hf_raknet_AS;
+static int hf_raknet_NACK_record_count;
+static int hf_raknet_packet_number_range;
+static int hf_raknet_range_max_equal_to_min;
+static int hf_raknet_packet_number_min;
+static int hf_raknet_packet_number_max;
+static int hf_raknet_packet_number;
+static int hf_raknet_message;
+static int hf_raknet_message_flags;
+static int hf_raknet_message_reliability;
+static int hf_raknet_message_has_split_packet;
+static int hf_raknet_payload_length;
+static int hf_raknet_reliable_message_number;
+static int hf_raknet_message_sequencing_index;
+static int hf_raknet_message_ordering_index;
+static int hf_raknet_message_ordering_channel;
+static int hf_raknet_split_packet_count;
+static int hf_raknet_split_packet_id;
+static int hf_raknet_split_packet_index;
+static int hf_raknet_split_packet;
+static int hf_raknet_system_message;
+static int hf_raknet_system_message_id;
+static int hf_raknet_client_proof;
+static int hf_raknet_use_client_key;
+static int hf_raknet_client_identity;
+static int hf_raknet_password;
+static int hf_raknet_system_index;
+static int hf_raknet_internal_address;
 
 /*
  * Frame reassembly
  */
 static reassembly_table raknet_reassembly_table;
 
-static gint ett_raknet_fragment = -1;
-static gint ett_raknet_fragments = -1;
-static gint hf_raknet_fragment = -1;
-static gint hf_raknet_fragment_count = -1;
-static gint hf_raknet_fragment_error = -1;
-static gint hf_raknet_fragment_multiple_tails = -1;
-static gint hf_raknet_fragment_overlap = -1;
-static gint hf_raknet_fragment_overlap_conflicts = -1;
-static gint hf_raknet_fragment_too_long_fragment = -1;
-static gint hf_raknet_fragments = -1;
-static gint hf_raknet_reassembled_in = -1;
-static gint hf_raknet_reassembled_length = -1;
+static gint ett_raknet_fragment;
+static gint ett_raknet_fragments;
+static gint hf_raknet_fragment;
+static gint hf_raknet_fragment_count;
+static gint hf_raknet_fragment_error;
+static gint hf_raknet_fragment_multiple_tails;
+static gint hf_raknet_fragment_overlap;
+static gint hf_raknet_fragment_overlap_conflicts;
+static gint hf_raknet_fragment_too_long_fragment;
+static gint hf_raknet_fragments;
+static gint hf_raknet_reassembled_in;
+static gint hf_raknet_reassembled_length;
 
 static const fragment_items raknet_frag_items = {
     /* Fragment subtrees */
diff --git a/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c
index ec409e033e..3fc3e3a406 100644
--- a/epan/dissectors/packet-raw.c
+++ b/epan/dissectors/packet-raw.c
@@ -20,8 +20,8 @@
 void proto_register_raw(void);
 void proto_reg_handoff_raw(void);
 
-static int proto_raw = -1;
-static gint ett_raw = -1;
+static int proto_raw;
+static gint ett_raw;
 
 static const unsigned char zeroes[10] = {0,0,0,0,0,0,0,0,0,0};
 
diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c
index 8f8f660815..6a4c5f75f1 100644
--- a/epan/dissectors/packet-rdm.c
+++ b/epan/dissectors/packet-rdm.c
@@ -818,299 +818,299 @@ static const value_string on_off_vals[] = {
   { 0, NULL },
 };
 
-static int proto_rdm = -1;
-
-static int hf_rdm_sub_start_code = -1;
-static int hf_rdm_message_length = -1;
-static int hf_rdm_dest_uid = -1;
-static int hf_rdm_src_uid = -1;
-static int hf_rdm_transaction_number = -1;
-static int hf_rdm_port_id = -1;
-static int hf_rdm_response_type = -1;
-static int hf_rdm_message_count = -1;
-static int hf_rdm_sub_device = -1;
-static int hf_rdm_mdb = -1;
-static int hf_rdm_command_class = -1;
-static int hf_rdm_parameter_id = -1;
-static int hf_rdm_parameter_data_length = -1;
-static int hf_rdm_parameter_data = -1;
-static int hf_rdm_parameter_data_raw = -1;
-static int hf_rdm_intron = -1;
-static int hf_rdm_checksum = -1;
-static int hf_rdm_checksum_status = -1;
-static int hf_rdm_trailer = -1;
-
-static int hf_rdm_pd_ack_timer_estimated_response_time = -1;
-static int hf_rdm_pd_ack_overflow_raw_data = -1;
-static int hf_rdm_pd_nack_reason_code = -1;
-
-static int hf_rdm_pd_device_label = -1;
-
-static int hf_rdm_pd_manu_label = -1;
-
-static int hf_rdm_pd_dmx_start_address = -1;
-
-static int hf_rdm_pd_queued_message_status = -1;
-
-static int hf_rdm_pd_sensor_nr = -1;
-static int hf_rdm_pd_sensor_type = -1;
-static int hf_rdm_pd_sensor_unit = -1;
-static int hf_rdm_pd_sensor_prefix = -1;
-static int hf_rdm_pd_sensor_value_pres = -1;
-static int hf_rdm_pd_sensor_value_low = -1;
-static int hf_rdm_pd_sensor_value_high = -1;
-static int hf_rdm_pd_sensor_value_rec = -1;
-
-static int hf_rdm_pd_sensor_range_min_value = -1;
-static int hf_rdm_pd_sensor_range_max_value = -1;
-static int hf_rdm_pd_sensor_normal_min_value = -1;
-static int hf_rdm_pd_sensor_normal_max_value = -1;
-static int hf_rdm_pd_sensor_recorded_value_support = -1;
-static int hf_rdm_pd_sensor_description = -1;
-
-static int hf_rdm_pd_device_hours = -1;
-static int hf_rdm_pd_lamp_hours = -1;
-static int hf_rdm_pd_lamp_strikes = -1;
-
-
-static int hf_rdm_pd_proto_vers = -1;
-static int hf_rdm_pd_device_model_id = -1;
-static int hf_rdm_pd_product_cat = -1;
-static int hf_rdm_pd_software_vers_id = -1;
-static int hf_rdm_pd_dmx_footprint = -1;
-static int hf_rdm_pd_dmx_pers_current = -1;
-static int hf_rdm_pd_dmx_pers_total = -1;
-static int hf_rdm_pd_sub_device_count = -1;
-static int hf_rdm_pd_sensor_count = -1;
-
-static int hf_rdm_pd_device_model_description = -1;
-
-static int hf_rdm_pd_disc_unique_branch_lb_uid = -1;
-static int hf_rdm_pd_disc_unique_branch_ub_uid = -1;
-static int hf_rdm_pd_disc_mute_control_field = -1;
-static int hf_rdm_pd_disc_mute_binding_uid = -1;
-static int hf_rdm_pd_disc_unmute_control_field = -1;
-static int hf_rdm_pd_disc_unmute_binding_uid = -1;
-static int hf_rdm_pd_proxied_devices_uid = -1;
-static int hf_rdm_pd_proxied_device_count = -1;
-static int hf_rdm_pd_proxied_device_list_change = -1;
-static int hf_rdm_pd_real_time_clock_year = -1;
-static int hf_rdm_pd_real_time_clock_month = -1;
-static int hf_rdm_pd_real_time_clock_day = -1;
-static int hf_rdm_pd_real_time_clock_hour = -1;
-static int hf_rdm_pd_real_time_clock_minute = -1;
-static int hf_rdm_pd_real_time_clock_second = -1;
-static int hf_rdm_pd_lamp_state = -1;
-static int hf_rdm_pd_lamp_on_mode = -1;
-static int hf_rdm_pd_device_power_cycles = -1;
-static int hf_rdm_pd_display_invert = -1;
-static int hf_rdm_pd_display_level = -1;
-static int hf_rdm_pd_pan_invert = -1;
-static int hf_rdm_pd_tilt_invert = -1;
-static int hf_rdm_pd_tilt_swap = -1;
-static int hf_rdm_pd_selftest_nr = -1;
-static int hf_rdm_pd_selftest_state = -1;
-static int hf_rdm_pd_selftest_description = -1;
-static int hf_rdm_pd_language_code = -1;
-static int hf_rdm_pd_identify_device = -1;
-static int hf_rdm_pd_identify_device_state = -1;
-static int hf_rdm_pd_reset_device = -1;
-static int hf_rdm_pd_power_state = -1;
-static int hf_rdm_pd_capture_preset_scene_nr = -1;
-static int hf_rdm_pd_capture_preset_up_fade_time = -1;
-static int hf_rdm_pd_capture_preset_down_fade_time = -1;
-static int hf_rdm_pd_capture_preset_wait_time = -1;
-static int hf_rdm_pd_preset_playback_mode = -1;
-static int hf_rdm_pd_preset_playback_level = -1;
-static int hf_rdm_pd_parameter_id = -1;
-static int hf_rdm_pd_parameter_pdl_size = -1;
-static int hf_rdm_pd_parameter_data_type = -1;
-static int hf_rdm_pd_parameter_cmd_class = -1;
-static int hf_rdm_pd_parameter_type = -1;
-static int hf_rdm_pd_parameter_unit = -1;
-static int hf_rdm_pd_parameter_prefix = -1;
-static int hf_rdm_pd_parameter_min_value = -1;
-static int hf_rdm_pd_parameter_max_value = -1;
-static int hf_rdm_pd_parameter_default_value = -1;
-static int hf_rdm_pd_parameter_description = -1;
-static int hf_rdm_pd_software_version_label = -1;
-static int hf_rdm_pd_boot_software_version_id = -1;
-static int hf_rdm_pd_boot_software_version_label = -1;
-static int hf_rdm_pd_comms_status_short_msg = -1;
-static int hf_rdm_pd_comms_status_len_mismatch = -1;
-static int hf_rdm_pd_comms_status_csum_fail = -1;
-static int hf_rdm_pd_status_messages_type = -1;
-static int hf_rdm_pd_status_messages_sub_device_id = -1;
-static int hf_rdm_pd_status_messages_id = -1;
-static int hf_rdm_pd_status_messages_data_value_1 = -1;
-static int hf_rdm_pd_status_messages_data_value_2 = -1;
-static int hf_rdm_pd_status_id = -1;
-static int hf_rdm_pd_status_id_description = -1;
-static int hf_rdm_pd_sub_device_status_report_threshold_status_type = -1;
-static int hf_rdm_pd_product_detail_id_list = -1;
-static int hf_rdm_pd_factory_defaults = -1;
-static int hf_rdm_pd_background_discovery_endpoint_id = -1;
-static int hf_rdm_pd_background_discovery_enabled = -1;
-static int hf_rdm_pd_background_queued_status_policy_current_policy = -1;
-static int hf_rdm_pd_background_queued_status_policy_number_of_policies = -1;
-static int hf_rdm_pd_background_queued_status_policy_description_policy = -1;
-static int hf_rdm_pd_background_queued_status_policy_description_description = -1;
-static int hf_rdm_pd_binding_control_fields_endpoint_id = -1;
-static int hf_rdm_pd_binding_control_fields_uid = -1;
-static int hf_rdm_pd_binding_control_fields_control_field = -1;
-static int hf_rdm_pd_binding_control_fields_binding_uid = -1;
-static int hf_rem_pd_broker_status_set_allowed = -1;
-static int hf_rem_pd_broker_status_state = -1;
-static int hf_rdm_pd_burn_in = -1;
-static int hf_rdm_pd_component_scope_scope_slot = -1;
-static int hf_rdm_pd_component_scope_scope_string = -1;
-static int hf_rdm_pd_component_scope_scope_static_config_type = -1;
-static int hf_rdm_pd_component_scope_scope_static_ipv4_address = -1;
-static int hf_rdm_pd_component_scope_scope_static_ipv6_address = -1;
-static int hf_rdm_pd_component_scope_scope_static_port = -1;
-static int hf_rdm_pd_current_address_interface_identifier = -1;
-static int hf_rdm_pd_current_address_ipv4_address = -1;
-static int hf_rdm_pd_current_address_netmask = -1;
-static int hf_rdm_pd_current_address_dhcp_status = -1;
-static int hf_rdm_pd_curve_curve = -1;
-static int hf_rdm_pd_curve_number_of_curves = -1;
-static int hf_rdm_pd_curve_description_curve = -1;
-static int hf_rdm_pd_curve_description_text = -1;
-static int hf_rdm_pd_dhcp_mode_interface_identifier = -1;
-static int hf_rdm_pd_dhcp_mode_enabled = -1;
-static int hf_rdm_pd_dimmer_info_minimum_level_lower_limit = -1;
-static int hf_rdm_pd_dimmer_info_minimum_level_upper_limit = -1;
-static int hf_rdm_pd_dimmer_info_maximum_level_lower_limit = -1;
-static int hf_rdm_pd_dimmer_info_maximum_level_upper_limit = -1;
-static int hf_rdm_pd_dimmer_info_number_of_supported_curves = -1;
-static int hf_rdm_pd_dimmer_info_levels_resolution = -1;
-static int hf_rdm_pd_dimmer_info_minimum_level_split_levels_supported = -1;
-static int hf_rdm_pd_discovery_state_endpoint_id = -1;
-static int hf_rdm_pd_discovery_state_device_count = -1;
-static int hf_rdm_pd_discovery_state_discovery_state = -1;
-static int hf_rdm_pd_dmx_block_address_base_dmx_address = -1;
-static int hf_rdm_pd_dmx_block_address_subdevice_footprint = -1;
-static int hf_rdm_pd_dmx_fail_mode_scene_number = -1;
-static int hf_rdm_pd_dmx_fail_mode_loss_of_signal_delay = -1;
-static int hf_rdm_pd_dmx_fail_mode_hold_time = -1;
-static int hf_rdm_pd_dmx_fail_mode_level = -1;
-static int hf_rdm_pd_dmx_pers_nr = -1;
-static int hf_rdm_pd_dmx_pers_count = -1;
-static int hf_rdm_pd_dmx_pers_requested = -1;
-static int hf_rdm_pd_dmx_pers_slots = -1;
-static int hf_rdm_pd_dmx_pers_text = -1;
-static int hf_rdm_pd_dmx_startup_mode_scene_number = -1;
-static int hf_rdm_pd_dmx_startup_mode_loss_of_signal_delay = -1;
-static int hf_rdm_pd_dmx_startup_mode_hold_time = -1;
-static int hf_rdm_pd_dmx_startup_mode_level = -1;
-static int hf_rdm_pd_dns_domain_name = -1;
-static int hf_rdm_pd_dns_hostname = -1;
-static int hf_rdm_pd_dns_ipv4_name_server_index = -1;
-static int hf_rdm_pd_dns_ipv4_name_server_address = -1;
-static int hf_rdm_pd_endpoint_label_endpoint_id = -1;
-static int hf_rdm_pd_endpoint_label_label = -1;
-static int hf_rdm_pd_endpoint_list_change_number = -1;
-static int hf_rdm_pd_endpoint_list_endpoint_id = -1;
-static int hf_rdm_pd_endpoint_list_endpoint_type = -1;
-static int hf_rdm_pd_endpoint_list_change_change_number = -1;
-static int hf_rdm_pd_endpoint_mode_endpoint_id = -1;
-static int hf_rdm_pd_endpoint_mode_endpoint_mode = -1;
-static int hf_rdm_pd_endpoint_responder_list_change_endpoint_id = -1;
-static int hf_rdm_pd_endpoint_responder_list_change_change_number = -1;
-static int hf_rdm_pd_endpoint_responders_endpoint_id = -1;
-static int hf_rdm_pd_endpoint_responders_change_number = -1;
-static int hf_rdm_pd_endpoint_responders_uid = -1;
-static int hf_rdm_pd_endpoint_timing_endpoint_id = -1;
-static int hf_rdm_pd_endpoint_timing_setting = -1;
-static int hf_rdm_pd_endpoint_timing_number_of_settings = -1;
-static int hf_rdm_pd_endpoint_timing_description_setting = -1;
-static int hf_rdm_pd_endpoint_timing_description_description = -1;
-static int hf_rdm_pd_endpoint_to_universe_endpoint_id = -1;
-static int hf_rdm_pd_endpoint_to_universe_universe_number = -1;
-static int hf_rdm_pd_hardware_address_type1_interface_identifier = -1;
-static int hf_rdm_pd_hardware_address_type1_hardware_address = -1;
-static int hf_rdm_pd_identify_endpoint_endpoint_id = -1;
-static int hf_rdm_pd_identify_endpoint_identify_state = -1;
-static int hf_rdm_pd_identify_mode = -1;
-static int hf_rdm_pd_interface_apply_configuration_interface_identifier = -1;
-static int hf_rdm_pd_interface_label_interface_identifier = -1;
-static int hf_rdm_pd_interface_label_label = -1;
-static int hf_rdm_pd_interface_release_dhcp_interface_identifier = -1;
-static int hf_rdm_pd_interface_renew_dhcp_interface_identifier = -1;
-static int hf_rdm_pd_ipv4_default_route_interface_identifier = -1;
-static int hf_rdm_pd_ipv4_default_route_ipv4_default_route = -1;
-static int hf_rdm_pd_list_interfaces_interface_identifier = -1;
-static int hf_rdm_pd_list_interfaces_interface_hardware_type = -1;
-static int hf_rdm_pd_lock_pin_pin_code = -1;
-static int hf_rdm_pd_lock_pin_new_pin_code = -1;
-static int hf_rdm_pd_lock_state_lock_state = -1;
-static int hf_rdm_pd_lock_state_number_of_lock_states = -1;
-static int hf_rdm_pd_lock_state_pin_code = -1;
-static int hf_rdm_pd_lock_state_description_lock_state = -1;
-static int hf_rdm_pd_lock_state_description_text = -1;
-static int hf_rdm_pd_maximum_level_level = -1;
-static int hf_rdm_pd_preset_mergemode = -1;
-static int hf_rdm_pd_power_on_self_test = -1;
-static int hf_rdm_pd_minimum_level_increasing = -1;
-static int hf_rdm_pd_minimum_level_decreasing = -1;
-static int hf_rdm_pd_minimum_level_on_below_minimum = -1;
-static int hf_rdm_pd_modulation_frequency_modulation_frequency = -1;
-static int hf_rdm_pd_modulation_frequency_number_of_modulation_frequencies = -1;
-static int hf_rdm_pd_modulation_frequency_description_modulation_frequency = -1;
-static int hf_rdm_pd_modulation_frequency_description_text = -1;
-static int hf_rdm_pd_output_response_time_response_time = -1;
-static int hf_rdm_pd_output_response_time_number_of_response_times = -1;
-static int hf_rdm_pd_output_response_time_description_output_response_time = -1;
-static int hf_rdm_pd_output_response_time_description_text = -1;
-static int hf_rdm_pd_preset_info_level_field_supported = -1;
-static int hf_rdm_pd_preset_info_preset_sequence_supported = -1;
-static int hf_rdm_pd_preset_info_split_times_supported = -1;
-static int hf_rdm_pd_preset_info_dmx_fail_infinite_delay_time_supported = -1;
-static int hf_rdm_pd_preset_info_dmx_fail_infinite_hold_time_supported = -1;
-static int hf_rdm_pd_preset_info_start_up_infinite_hold_time_supported = -1;
-static int hf_rdm_pd_preset_info_maximum_scene_number = -1;
-static int hf_rdm_pd_preset_info_minimum_preset_fade_time_supported = -1;
-static int hf_rdm_pd_preset_info_maximum_preset_fade_time_supported = -1;
-static int hf_rdm_pd_preset_info_minimum_preset_wait_time_supported = -1;
-static int hf_rdm_pd_preset_info_maximum_preset_wait_time_supported = -1;
-static int hf_rdm_pd_preset_info_minimum_dmx_fail_delay_time_supported = -1;
-static int hf_rdm_pd_preset_info_maximum_dmx_fail_delay_time_supported = -1;
-static int hf_rdm_pd_preset_info_minimum_dmx_fail_hold_time_supported = -1;
-static int hf_rdm_pd_preset_info_maximum_dmx_fail_hold_time_supported = -1;
-static int hf_rdm_pd_preset_info_minimum_start_up_delay_time_supported = -1;
-static int hf_rdm_pd_preset_info_maximum_start_up_delay_time_supported = -1;
-static int hf_rdm_pd_preset_info_minimum_start_up_hold_time_supported = -1;
-static int hf_rdm_pd_preset_info_maximum_start_up_hold_time_supported = -1;
-static int hf_rdm_pd_preset_status_scene_number = -1;
-static int hf_rdm_pd_preset_status_up_fade_time = -1;
-static int hf_rdm_pd_preset_status_down_fade_time = -1;
-static int hf_rdm_pd_preset_status_wait_time = -1;
-static int hf_rdm_pd_preset_status_programmed = -1;
-static int hf_rdm_pd_preset_status_clear_preset = -1;
-static int hf_rdm_pd_rdm_traffic_enable_endpoint_id = -1;
-static int hf_rdm_pd_rdm_traffic_enable_rdm_enabled = -1;
-static int hf_rdm_pd_search_domain_dns_domain_name = -1;
-static int hf_rdm_pd_slot_offset = -1;
-static int hf_rdm_pd_slot_type = -1;
-static int hf_rdm_pd_slot_label_id = -1;
-static int hf_rdm_pd_slot_nr = -1;
-static int hf_rdm_pd_slot_description = -1;
-static int hf_rdm_pd_slot_value = -1;
-static int hf_rdm_pd_static_address_interface_identifier = -1;
-static int hf_rdm_pd_static_address_ipv4_address = -1;
-static int hf_rdm_pd_static_address_netmask = -1;
-static int hf_rdm_pd_tcp_comms_status_scope_string = -1;
-static int hf_rdm_pd_tcp_comms_status_broker_ipv4_address = -1;
-static int hf_rdm_pd_tcp_comms_status_broker_ipv6_address = -1;
-static int hf_rdm_pd_tcp_comms_status_broker_port = -1;
-static int hf_rdm_pd_tcp_comms_status_unhealthy_tcp_events = -1;
-static int hf_rdm_pd_zeroconf_mode_interface_identifier = -1;
-static int hf_rdm_pd_zeroconf_mode_enabled = -1;
-static int hf_rdm_pd_rec_value_support = -1;
-
-static int ett_rdm = -1;
-
-static expert_field ei_rdm_checksum = EI_INIT;
+static int proto_rdm;
+
+static int hf_rdm_sub_start_code;
+static int hf_rdm_message_length;
+static int hf_rdm_dest_uid;
+static int hf_rdm_src_uid;
+static int hf_rdm_transaction_number;
+static int hf_rdm_port_id;
+static int hf_rdm_response_type;
+static int hf_rdm_message_count;
+static int hf_rdm_sub_device;
+static int hf_rdm_mdb;
+static int hf_rdm_command_class;
+static int hf_rdm_parameter_id;
+static int hf_rdm_parameter_data_length;
+static int hf_rdm_parameter_data;
+static int hf_rdm_parameter_data_raw;
+static int hf_rdm_intron;
+static int hf_rdm_checksum;
+static int hf_rdm_checksum_status;
+static int hf_rdm_trailer;
+
+static int hf_rdm_pd_ack_timer_estimated_response_time;
+static int hf_rdm_pd_ack_overflow_raw_data;
+static int hf_rdm_pd_nack_reason_code;
+
+static int hf_rdm_pd_device_label;
+
+static int hf_rdm_pd_manu_label;
+
+static int hf_rdm_pd_dmx_start_address;
+
+static int hf_rdm_pd_queued_message_status;
+
+static int hf_rdm_pd_sensor_nr;
+static int hf_rdm_pd_sensor_type;
+static int hf_rdm_pd_sensor_unit;
+static int hf_rdm_pd_sensor_prefix;
+static int hf_rdm_pd_sensor_value_pres;
+static int hf_rdm_pd_sensor_value_low;
+static int hf_rdm_pd_sensor_value_high;
+static int hf_rdm_pd_sensor_value_rec;
+
+static int hf_rdm_pd_sensor_range_min_value;
+static int hf_rdm_pd_sensor_range_max_value;
+static int hf_rdm_pd_sensor_normal_min_value;
+static int hf_rdm_pd_sensor_normal_max_value;
+static int hf_rdm_pd_sensor_recorded_value_support;
+static int hf_rdm_pd_sensor_description;
+
+static int hf_rdm_pd_device_hours;
+static int hf_rdm_pd_lamp_hours;
+static int hf_rdm_pd_lamp_strikes;
+
+
+static int hf_rdm_pd_proto_vers;
+static int hf_rdm_pd_device_model_id;
+static int hf_rdm_pd_product_cat;
+static int hf_rdm_pd_software_vers_id;
+static int hf_rdm_pd_dmx_footprint;
+static int hf_rdm_pd_dmx_pers_current;
+static int hf_rdm_pd_dmx_pers_total;
+static int hf_rdm_pd_sub_device_count;
+static int hf_rdm_pd_sensor_count;
+
+static int hf_rdm_pd_device_model_description;
+
+static int hf_rdm_pd_disc_unique_branch_lb_uid;
+static int hf_rdm_pd_disc_unique_branch_ub_uid;
+static int hf_rdm_pd_disc_mute_control_field;
+static int hf_rdm_pd_disc_mute_binding_uid;
+static int hf_rdm_pd_disc_unmute_control_field;
+static int hf_rdm_pd_disc_unmute_binding_uid;
+static int hf_rdm_pd_proxied_devices_uid;
+static int hf_rdm_pd_proxied_device_count;
+static int hf_rdm_pd_proxied_device_list_change;
+static int hf_rdm_pd_real_time_clock_year;
+static int hf_rdm_pd_real_time_clock_month;
+static int hf_rdm_pd_real_time_clock_day;
+static int hf_rdm_pd_real_time_clock_hour;
+static int hf_rdm_pd_real_time_clock_minute;
+static int hf_rdm_pd_real_time_clock_second;
+static int hf_rdm_pd_lamp_state;
+static int hf_rdm_pd_lamp_on_mode;
+static int hf_rdm_pd_device_power_cycles;
+static int hf_rdm_pd_display_invert;
+static int hf_rdm_pd_display_level;
+static int hf_rdm_pd_pan_invert;
+static int hf_rdm_pd_tilt_invert;
+static int hf_rdm_pd_tilt_swap;
+static int hf_rdm_pd_selftest_nr;
+static int hf_rdm_pd_selftest_state;
+static int hf_rdm_pd_selftest_description;
+static int hf_rdm_pd_language_code;
+static int hf_rdm_pd_identify_device;
+static int hf_rdm_pd_identify_device_state;
+static int hf_rdm_pd_reset_device;
+static int hf_rdm_pd_power_state;
+static int hf_rdm_pd_capture_preset_scene_nr;
+static int hf_rdm_pd_capture_preset_up_fade_time;
+static int hf_rdm_pd_capture_preset_down_fade_time;
+static int hf_rdm_pd_capture_preset_wait_time;
+static int hf_rdm_pd_preset_playback_mode;
+static int hf_rdm_pd_preset_playback_level;
+static int hf_rdm_pd_parameter_id;
+static int hf_rdm_pd_parameter_pdl_size;
+static int hf_rdm_pd_parameter_data_type;
+static int hf_rdm_pd_parameter_cmd_class;
+static int hf_rdm_pd_parameter_type;
+static int hf_rdm_pd_parameter_unit;
+static int hf_rdm_pd_parameter_prefix;
+static int hf_rdm_pd_parameter_min_value;
+static int hf_rdm_pd_parameter_max_value;
+static int hf_rdm_pd_parameter_default_value;
+static int hf_rdm_pd_parameter_description;
+static int hf_rdm_pd_software_version_label;
+static int hf_rdm_pd_boot_software_version_id;
+static int hf_rdm_pd_boot_software_version_label;
+static int hf_rdm_pd_comms_status_short_msg;
+static int hf_rdm_pd_comms_status_len_mismatch;
+static int hf_rdm_pd_comms_status_csum_fail;
+static int hf_rdm_pd_status_messages_type;
+static int hf_rdm_pd_status_messages_sub_device_id;
+static int hf_rdm_pd_status_messages_id;
+static int hf_rdm_pd_status_messages_data_value_1;
+static int hf_rdm_pd_status_messages_data_value_2;
+static int hf_rdm_pd_status_id;
+static int hf_rdm_pd_status_id_description;
+static int hf_rdm_pd_sub_device_status_report_threshold_status_type;
+static int hf_rdm_pd_product_detail_id_list;
+static int hf_rdm_pd_factory_defaults;
+static int hf_rdm_pd_background_discovery_endpoint_id;
+static int hf_rdm_pd_background_discovery_enabled;
+static int hf_rdm_pd_background_queued_status_policy_current_policy;
+static int hf_rdm_pd_background_queued_status_policy_number_of_policies;
+static int hf_rdm_pd_background_queued_status_policy_description_policy;
+static int hf_rdm_pd_background_queued_status_policy_description_description;
+static int hf_rdm_pd_binding_control_fields_endpoint_id;
+static int hf_rdm_pd_binding_control_fields_uid;
+static int hf_rdm_pd_binding_control_fields_control_field;
+static int hf_rdm_pd_binding_control_fields_binding_uid;
+static int hf_rem_pd_broker_status_set_allowed;
+static int hf_rem_pd_broker_status_state;
+static int hf_rdm_pd_burn_in;
+static int hf_rdm_pd_component_scope_scope_slot;
+static int hf_rdm_pd_component_scope_scope_string;
+static int hf_rdm_pd_component_scope_scope_static_config_type;
+static int hf_rdm_pd_component_scope_scope_static_ipv4_address;
+static int hf_rdm_pd_component_scope_scope_static_ipv6_address;
+static int hf_rdm_pd_component_scope_scope_static_port;
+static int hf_rdm_pd_current_address_interface_identifier;
+static int hf_rdm_pd_current_address_ipv4_address;
+static int hf_rdm_pd_current_address_netmask;
+static int hf_rdm_pd_current_address_dhcp_status;
+static int hf_rdm_pd_curve_curve;
+static int hf_rdm_pd_curve_number_of_curves;
+static int hf_rdm_pd_curve_description_curve;
+static int hf_rdm_pd_curve_description_text;
+static int hf_rdm_pd_dhcp_mode_interface_identifier;
+static int hf_rdm_pd_dhcp_mode_enabled;
+static int hf_rdm_pd_dimmer_info_minimum_level_lower_limit;
+static int hf_rdm_pd_dimmer_info_minimum_level_upper_limit;
+static int hf_rdm_pd_dimmer_info_maximum_level_lower_limit;
+static int hf_rdm_pd_dimmer_info_maximum_level_upper_limit;
+static int hf_rdm_pd_dimmer_info_number_of_supported_curves;
+static int hf_rdm_pd_dimmer_info_levels_resolution;
+static int hf_rdm_pd_dimmer_info_minimum_level_split_levels_supported;
+static int hf_rdm_pd_discovery_state_endpoint_id;
+static int hf_rdm_pd_discovery_state_device_count;
+static int hf_rdm_pd_discovery_state_discovery_state;
+static int hf_rdm_pd_dmx_block_address_base_dmx_address;
+static int hf_rdm_pd_dmx_block_address_subdevice_footprint;
+static int hf_rdm_pd_dmx_fail_mode_scene_number;
+static int hf_rdm_pd_dmx_fail_mode_loss_of_signal_delay;
+static int hf_rdm_pd_dmx_fail_mode_hold_time;
+static int hf_rdm_pd_dmx_fail_mode_level;
+static int hf_rdm_pd_dmx_pers_nr;
+static int hf_rdm_pd_dmx_pers_count;
+static int hf_rdm_pd_dmx_pers_requested;
+static int hf_rdm_pd_dmx_pers_slots;
+static int hf_rdm_pd_dmx_pers_text;
+static int hf_rdm_pd_dmx_startup_mode_scene_number;
+static int hf_rdm_pd_dmx_startup_mode_loss_of_signal_delay;
+static int hf_rdm_pd_dmx_startup_mode_hold_time;
+static int hf_rdm_pd_dmx_startup_mode_level;
+static int hf_rdm_pd_dns_domain_name;
+static int hf_rdm_pd_dns_hostname;
+static int hf_rdm_pd_dns_ipv4_name_server_index;
+static int hf_rdm_pd_dns_ipv4_name_server_address;
+static int hf_rdm_pd_endpoint_label_endpoint_id;
+static int hf_rdm_pd_endpoint_label_label;
+static int hf_rdm_pd_endpoint_list_change_number;
+static int hf_rdm_pd_endpoint_list_endpoint_id;
+static int hf_rdm_pd_endpoint_list_endpoint_type;
+static int hf_rdm_pd_endpoint_list_change_change_number;
+static int hf_rdm_pd_endpoint_mode_endpoint_id;
+static int hf_rdm_pd_endpoint_mode_endpoint_mode;
+static int hf_rdm_pd_endpoint_responder_list_change_endpoint_id;
+static int hf_rdm_pd_endpoint_responder_list_change_change_number;
+static int hf_rdm_pd_endpoint_responders_endpoint_id;
+static int hf_rdm_pd_endpoint_responders_change_number;
+static int hf_rdm_pd_endpoint_responders_uid;
+static int hf_rdm_pd_endpoint_timing_endpoint_id;
+static int hf_rdm_pd_endpoint_timing_setting;
+static int hf_rdm_pd_endpoint_timing_number_of_settings;
+static int hf_rdm_pd_endpoint_timing_description_setting;
+static int hf_rdm_pd_endpoint_timing_description_description;
+static int hf_rdm_pd_endpoint_to_universe_endpoint_id;
+static int hf_rdm_pd_endpoint_to_universe_universe_number;
+static int hf_rdm_pd_hardware_address_type1_interface_identifier;
+static int hf_rdm_pd_hardware_address_type1_hardware_address;
+static int hf_rdm_pd_identify_endpoint_endpoint_id;
+static int hf_rdm_pd_identify_endpoint_identify_state;
+static int hf_rdm_pd_identify_mode;
+static int hf_rdm_pd_interface_apply_configuration_interface_identifier;
+static int hf_rdm_pd_interface_label_interface_identifier;
+static int hf_rdm_pd_interface_label_label;
+static int hf_rdm_pd_interface_release_dhcp_interface_identifier;
+static int hf_rdm_pd_interface_renew_dhcp_interface_identifier;
+static int hf_rdm_pd_ipv4_default_route_interface_identifier;
+static int hf_rdm_pd_ipv4_default_route_ipv4_default_route;
+static int hf_rdm_pd_list_interfaces_interface_identifier;
+static int hf_rdm_pd_list_interfaces_interface_hardware_type;
+static int hf_rdm_pd_lock_pin_pin_code;
+static int hf_rdm_pd_lock_pin_new_pin_code;
+static int hf_rdm_pd_lock_state_lock_state;
+static int hf_rdm_pd_lock_state_number_of_lock_states;
+static int hf_rdm_pd_lock_state_pin_code;
+static int hf_rdm_pd_lock_state_description_lock_state;
+static int hf_rdm_pd_lock_state_description_text;
+static int hf_rdm_pd_maximum_level_level;
+static int hf_rdm_pd_preset_mergemode;
+static int hf_rdm_pd_power_on_self_test;
+static int hf_rdm_pd_minimum_level_increasing;
+static int hf_rdm_pd_minimum_level_decreasing;
+static int hf_rdm_pd_minimum_level_on_below_minimum;
+static int hf_rdm_pd_modulation_frequency_modulation_frequency;
+static int hf_rdm_pd_modulation_frequency_number_of_modulation_frequencies;
+static int hf_rdm_pd_modulation_frequency_description_modulation_frequency;
+static int hf_rdm_pd_modulation_frequency_description_text;
+static int hf_rdm_pd_output_response_time_response_time;
+static int hf_rdm_pd_output_response_time_number_of_response_times;
+static int hf_rdm_pd_output_response_time_description_output_response_time;
+static int hf_rdm_pd_output_response_time_description_text;
+static int hf_rdm_pd_preset_info_level_field_supported;
+static int hf_rdm_pd_preset_info_preset_sequence_supported;
+static int hf_rdm_pd_preset_info_split_times_supported;
+static int hf_rdm_pd_preset_info_dmx_fail_infinite_delay_time_supported;
+static int hf_rdm_pd_preset_info_dmx_fail_infinite_hold_time_supported;
+static int hf_rdm_pd_preset_info_start_up_infinite_hold_time_supported;
+static int hf_rdm_pd_preset_info_maximum_scene_number;
+static int hf_rdm_pd_preset_info_minimum_preset_fade_time_supported;
+static int hf_rdm_pd_preset_info_maximum_preset_fade_time_supported;
+static int hf_rdm_pd_preset_info_minimum_preset_wait_time_supported;
+static int hf_rdm_pd_preset_info_maximum_preset_wait_time_supported;
+static int hf_rdm_pd_preset_info_minimum_dmx_fail_delay_time_supported;
+static int hf_rdm_pd_preset_info_maximum_dmx_fail_delay_time_supported;
+static int hf_rdm_pd_preset_info_minimum_dmx_fail_hold_time_supported;
+static int hf_rdm_pd_preset_info_maximum_dmx_fail_hold_time_supported;
+static int hf_rdm_pd_preset_info_minimum_start_up_delay_time_supported;
+static int hf_rdm_pd_preset_info_maximum_start_up_delay_time_supported;
+static int hf_rdm_pd_preset_info_minimum_start_up_hold_time_supported;
+static int hf_rdm_pd_preset_info_maximum_start_up_hold_time_supported;
+static int hf_rdm_pd_preset_status_scene_number;
+static int hf_rdm_pd_preset_status_up_fade_time;
+static int hf_rdm_pd_preset_status_down_fade_time;
+static int hf_rdm_pd_preset_status_wait_time;
+static int hf_rdm_pd_preset_status_programmed;
+static int hf_rdm_pd_preset_status_clear_preset;
+static int hf_rdm_pd_rdm_traffic_enable_endpoint_id;
+static int hf_rdm_pd_rdm_traffic_enable_rdm_enabled;
+static int hf_rdm_pd_search_domain_dns_domain_name;
+static int hf_rdm_pd_slot_offset;
+static int hf_rdm_pd_slot_type;
+static int hf_rdm_pd_slot_label_id;
+static int hf_rdm_pd_slot_nr;
+static int hf_rdm_pd_slot_description;
+static int hf_rdm_pd_slot_value;
+static int hf_rdm_pd_static_address_interface_identifier;
+static int hf_rdm_pd_static_address_ipv4_address;
+static int hf_rdm_pd_static_address_netmask;
+static int hf_rdm_pd_tcp_comms_status_scope_string;
+static int hf_rdm_pd_tcp_comms_status_broker_ipv4_address;
+static int hf_rdm_pd_tcp_comms_status_broker_ipv6_address;
+static int hf_rdm_pd_tcp_comms_status_broker_port;
+static int hf_rdm_pd_tcp_comms_status_unhealthy_tcp_events;
+static int hf_rdm_pd_zeroconf_mode_interface_identifier;
+static int hf_rdm_pd_zeroconf_mode_enabled;
+static int hf_rdm_pd_rec_value_support;
+
+static int ett_rdm;
+
+static expert_field ei_rdm_checksum;
 
 /* begin manufacturer-specific constants and variables */
 /* begin ETC */
@@ -1481,113 +1481,113 @@ static const value_string etc_model_id_vals[] = {
   { 0, NULL },
 };
 
-static int hf_etc_parameter_id = -1;       /* every manufacturer needs one of these */
-static int hf_etc_pd_parameter_id = -1;    /* every manufacturer needs one of these */
-static int hf_etc_pd_device_model_id = -1;
-static int hf_etc_pd_led_curve = -1;
-static int hf_etc_pd_led_curve_description_curve = -1;
-static int hf_etc_pd_led_curve_description_text = -1;
-static int hf_etc_pd_led_strobe = -1;
-static int hf_etc_pd_led_output_mode = -1;
-static int hf_etc_pd_led_output_mode_description_mode = -1;
-static int hf_etc_pd_led_output_mode_description_text = -1;
-static int hf_etc_pd_led_red_shift = -1;
-static int hf_etc_pd_led_white_point = -1;
-static int hf_etc_pd_led_white_point_description_white_point = -1;
-static int hf_etc_pd_led_white_point_description_text = -1;
-static int hf_etc_pd_led_frequency = -1;
-static int hf_etc_pd_dmx_data_loss_behavior = -1;
-static int hf_etc_pd_dmx_data_loss_behavior_description_behavior = -1;
-static int hf_etc_pd_dmx_data_loss_behavior_description_text = -1;
-static int hf_etc_pd_led_plus_seven = -1;
-static int hf_etc_pd_backlight_brightness = -1;
-static int hf_etc_pd_backlight_timeout = -1;
-static int hf_etc_pd_status_indicators = -1;
-static int hf_etc_pd_overtemp_mode = -1;
-static int hf_etc_pd_simple_setup_mode = -1;
-static int hf_etc_pd_led_strobe_description_strobe = -1;
-static int hf_etc_pd_led_strobe_description_text = -1;
-static int hf_etc_pd_red_shift_description_red_shift = -1;
-static int hf_etc_pd_red_shift_description_text = -1;
-static int hf_etc_pd_plus_seven_description_plus_seven = -1;
-static int hf_etc_pd_plus_seven_description_text = -1;
-static int hf_etc_pd_backlight_timeout_description_timeout = -1;
-static int hf_etc_pd_backlight_timeout_description_text = -1;
-static int hf_etc_pd_simple_setup_mode_description_mode = -1;
-static int hf_etc_pd_simple_setup_mode_description_text = -1;
-static int hf_etc_pd_overtemp_mode_description_mode = -1;
-static int hf_etc_pd_overtemp_mode_description_text = -1;
-static int hf_etc_pd_led_requested_xy_x = -1;
-static int hf_etc_pd_led_requested_xy_y = -1;
-static int hf_etc_pd_led_current_xy_x = -1;
-static int hf_etc_pd_led_current_xy_y = -1;
-static int hf_etc_pd_current_pwm_led_number = -1;
-static int hf_etc_pd_current_pwm_channel_duty_cycle = -1;
-static int hf_etc_pd_tristimulus_led_number = -1;
-static int hf_etc_pd_tristimulus_x = -1;
-static int hf_etc_pd_tristimulus_y = -1;
-static int hf_etc_pd_tristimulus_z = -1;
-static int hf_etc_pd_led_information_led_number = -1;
-static int hf_etc_pd_led_information_type = -1;
-static int hf_etc_pd_led_information_dmx_control_channel = -1;
-static int hf_etc_pd_led_information_drive_current = -1;
-static int hf_etc_pd_led_information_gamut_polygon_order = -1;
-static int hf_etc_pd_led_information_quantity = -1;
-static int hf_etc_pd_preset_config_preset_number = -1;
-static int hf_etc_pd_preset_config_fade_time = -1;
-static int hf_etc_pd_preset_config_delay_time = -1;
-static int hf_etc_pd_preset_config_hue = -1;
-static int hf_etc_pd_preset_config_saturation = -1;
-static int hf_etc_pd_preset_config_intensity = -1;
-static int hf_etc_pd_preset_config_strobe = -1;
-static int hf_etc_pd_sequence_playback_sequence_number = -1;
-static int hf_etc_pd_sequence_config_sequence_number = -1;
-static int hf_etc_pd_sequence_config_preset_steps = -1;
-static int hf_etc_pd_sequence_config_preset_step = -1;
-static int hf_etc_pd_sequence_config_step_link_times = -1;
-static int hf_etc_pd_sequence_config_step_link_time = -1;
-static int hf_etc_pd_sequence_config_rate = -1;
-static int hf_etc_pd_sequence_config_end_state = -1;
-static int hf_etc_pd_low_power_timeout = -1;
-static int hf_etc_pd_low_power_timeout_description_timeout = -1;
-static int hf_etc_pd_low_power_timeout_description_text = -1;
-static int hf_etc_pd_led_enum_frequency = -1;
-static int hf_etc_pd_led_enum_frequency_description_frequency = -1;
-static int hf_etc_pd_led_enum_frequency_description_text = -1;
-static int hf_etc_pd_rgbi_preset_config_preset_number = -1;
-static int hf_etc_pd_rgbi_preset_config_fade_time = -1;
-static int hf_etc_pd_rgbi_preset_config_delay_time = -1;
-static int hf_etc_pd_rgbi_preset_config_red = -1;
-static int hf_etc_pd_rgbi_preset_config_green = -1;
-static int hf_etc_pd_rgbi_preset_config_blue = -1;
-static int hf_etc_pd_rgbi_preset_config_intensity = -1;
-static int hf_etc_pd_rgbi_preset_config_strobe = -1;
-static int hf_etc_pd_cct_preset_config_preset_number = -1;
-static int hf_etc_pd_cct_preset_config_fade_time = -1;
-static int hf_etc_pd_cct_preset_config_delay_time = -1;
-static int hf_etc_pd_cct_preset_config_white_point = -1;
-static int hf_etc_pd_cct_preset_config_tint = -1;
-static int hf_etc_pd_cct_preset_config_strobe = -1;
-static int hf_etc_pd_cct_preset_config_intensity = -1;
-static int hf_etc_pd_cct_preset_config_tone = -1;
-static int hf_etc_pd_cct_preset_config_reserved = -1;
-static int hf_etc_pd_supplementary_device_version_param_index = -1;
-static int hf_etc_pd_supplementary_device_version_param_description = -1;
-static int hf_etc_pd_power_command = -1;
-static int hf_etc_pd_power_command_description_state = -1;
-static int hf_etc_pd_power_command_description_text = -1;
-static int hf_etc_pd_dali_short_address = -1;
-static int hf_etc_pd_dali_group_membership = -1;
-static int hf_etc_pd_auto_bind = -1;
-static int hf_etc_pd_packet_delay = -1;
-static int hf_etc_pd_has_enum_text_pid = -1;
-static int hf_etc_pd_has_enum_text_true_false = -1;
-static int hf_etc_pd_get_enum_text_pid = -1;
-static int hf_etc_pd_get_enum_text_enum = -1;
-static int hf_etc_pd_get_enum_text_description = -1;
-
-static int ett_etc_sequence_config_steps = -1;
-static int ett_etc_sequence_config_times = -1;
+static int hf_etc_parameter_id;       /* every manufacturer needs one of these */
+static int hf_etc_pd_parameter_id;    /* every manufacturer needs one of these */
+static int hf_etc_pd_device_model_id;
+static int hf_etc_pd_led_curve;
+static int hf_etc_pd_led_curve_description_curve;
+static int hf_etc_pd_led_curve_description_text;
+static int hf_etc_pd_led_strobe;
+static int hf_etc_pd_led_output_mode;
+static int hf_etc_pd_led_output_mode_description_mode;
+static int hf_etc_pd_led_output_mode_description_text;
+static int hf_etc_pd_led_red_shift;
+static int hf_etc_pd_led_white_point;
+static int hf_etc_pd_led_white_point_description_white_point;
+static int hf_etc_pd_led_white_point_description_text;
+static int hf_etc_pd_led_frequency;
+static int hf_etc_pd_dmx_data_loss_behavior;
+static int hf_etc_pd_dmx_data_loss_behavior_description_behavior;
+static int hf_etc_pd_dmx_data_loss_behavior_description_text;
+static int hf_etc_pd_led_plus_seven;
+static int hf_etc_pd_backlight_brightness;
+static int hf_etc_pd_backlight_timeout;
+static int hf_etc_pd_status_indicators;
+static int hf_etc_pd_overtemp_mode;
+static int hf_etc_pd_simple_setup_mode;
+static int hf_etc_pd_led_strobe_description_strobe;
+static int hf_etc_pd_led_strobe_description_text;
+static int hf_etc_pd_red_shift_description_red_shift;
+static int hf_etc_pd_red_shift_description_text;
+static int hf_etc_pd_plus_seven_description_plus_seven;
+static int hf_etc_pd_plus_seven_description_text;
+static int hf_etc_pd_backlight_timeout_description_timeout;
+static int hf_etc_pd_backlight_timeout_description_text;
+static int hf_etc_pd_simple_setup_mode_description_mode;
+static int hf_etc_pd_simple_setup_mode_description_text;
+static int hf_etc_pd_overtemp_mode_description_mode;
+static int hf_etc_pd_overtemp_mode_description_text;
+static int hf_etc_pd_led_requested_xy_x;
+static int hf_etc_pd_led_requested_xy_y;
+static int hf_etc_pd_led_current_xy_x;
+static int hf_etc_pd_led_current_xy_y;
+static int hf_etc_pd_current_pwm_led_number;
+static int hf_etc_pd_current_pwm_channel_duty_cycle;
+static int hf_etc_pd_tristimulus_led_number;
+static int hf_etc_pd_tristimulus_x;
+static int hf_etc_pd_tristimulus_y;
+static int hf_etc_pd_tristimulus_z;
+static int hf_etc_pd_led_information_led_number;
+static int hf_etc_pd_led_information_type;
+static int hf_etc_pd_led_information_dmx_control_channel;
+static int hf_etc_pd_led_information_drive_current;
+static int hf_etc_pd_led_information_gamut_polygon_order;
+static int hf_etc_pd_led_information_quantity;
+static int hf_etc_pd_preset_config_preset_number;
+static int hf_etc_pd_preset_config_fade_time;
+static int hf_etc_pd_preset_config_delay_time;
+static int hf_etc_pd_preset_config_hue;
+static int hf_etc_pd_preset_config_saturation;
+static int hf_etc_pd_preset_config_intensity;
+static int hf_etc_pd_preset_config_strobe;
+static int hf_etc_pd_sequence_playback_sequence_number;
+static int hf_etc_pd_sequence_config_sequence_number;
+static int hf_etc_pd_sequence_config_preset_steps;
+static int hf_etc_pd_sequence_config_preset_step;
+static int hf_etc_pd_sequence_config_step_link_times;
+static int hf_etc_pd_sequence_config_step_link_time;
+static int hf_etc_pd_sequence_config_rate;
+static int hf_etc_pd_sequence_config_end_state;
+static int hf_etc_pd_low_power_timeout;
+static int hf_etc_pd_low_power_timeout_description_timeout;
+static int hf_etc_pd_low_power_timeout_description_text;
+static int hf_etc_pd_led_enum_frequency;
+static int hf_etc_pd_led_enum_frequency_description_frequency;
+static int hf_etc_pd_led_enum_frequency_description_text;
+static int hf_etc_pd_rgbi_preset_config_preset_number;
+static int hf_etc_pd_rgbi_preset_config_fade_time;
+static int hf_etc_pd_rgbi_preset_config_delay_time;
+static int hf_etc_pd_rgbi_preset_config_red;
+static int hf_etc_pd_rgbi_preset_config_green;
+static int hf_etc_pd_rgbi_preset_config_blue;
+static int hf_etc_pd_rgbi_preset_config_intensity;
+static int hf_etc_pd_rgbi_preset_config_strobe;
+static int hf_etc_pd_cct_preset_config_preset_number;
+static int hf_etc_pd_cct_preset_config_fade_time;
+static int hf_etc_pd_cct_preset_config_delay_time;
+static int hf_etc_pd_cct_preset_config_white_point;
+static int hf_etc_pd_cct_preset_config_tint;
+static int hf_etc_pd_cct_preset_config_strobe;
+static int hf_etc_pd_cct_preset_config_intensity;
+static int hf_etc_pd_cct_preset_config_tone;
+static int hf_etc_pd_cct_preset_config_reserved;
+static int hf_etc_pd_supplementary_device_version_param_index;
+static int hf_etc_pd_supplementary_device_version_param_description;
+static int hf_etc_pd_power_command;
+static int hf_etc_pd_power_command_description_state;
+static int hf_etc_pd_power_command_description_text;
+static int hf_etc_pd_dali_short_address;
+static int hf_etc_pd_dali_group_membership;
+static int hf_etc_pd_auto_bind;
+static int hf_etc_pd_packet_delay;
+static int hf_etc_pd_has_enum_text_pid;
+static int hf_etc_pd_has_enum_text_true_false;
+static int hf_etc_pd_get_enum_text_pid;
+static int hf_etc_pd_get_enum_text_enum;
+static int hf_etc_pd_get_enum_text_description;
+
+static int ett_etc_sequence_config_steps;
+static int ett_etc_sequence_config_times;
 
 /* end ETC */
 /* end manufacturer-specific constants and variables */
diff --git a/epan/dissectors/packet-rdp.c b/epan/dissectors/packet-rdp.c
index b9457a1756..e40ff1eb00 100644
--- a/epan/dissectors/packet-rdp.c
+++ b/epan/dissectors/packet-rdp.c
@@ -34,444 +34,444 @@ void proto_reg_handoff_rdp(void);
 
 static heur_dissector_list_t rdp_heur_subdissector_list;
 
-int proto_rdp = -1;
+int proto_rdp;
 
 static dissector_handle_t drdynvc_handle;
 static dissector_handle_t rail_handle;
 static dissector_handle_t cliprdr_handle;
 static dissector_handle_t snd_handle;
 
-static int ett_rdp = -1;
-
-static int ett_negReq_flags = -1;
-static int ett_requestedProtocols = -1;
-
-static int ett_negRsp_flags = -1;
-static int ett_selectedProtocol = -1;
-
-static int ett_rdp_SendData = -1;
-static int ett_rdp_MessageData = -1;
-
-static int ett_rdp_ClientData = -1;
-static int ett_rdp_clientCoreData = -1;
-static int ett_rdp_clientSecurityData = -1;
-static int ett_rdp_clientNetworkData = -1;
-static int ett_rdp_clientClusterData = -1;
-static int ett_rdp_clientMonitorData = -1;
-static int ett_rdp_clientMonitorDefData = -1;
-static int ett_rdp_clientMsgChannelData = -1;
-static int ett_rdp_clientMonitorExData = -1;
-static int ett_rdp_clientMultiTransportData = -1;
-static int ett_rdp_clientUnknownData = -1;
-static int ett_rdp_ServerData = -1;
-static int ett_rdp_serverCoreData = -1;
-static int ett_rdp_serverSecurityData = -1;
-static int ett_rdp_serverNetworkData = -1;
-static int ett_rdp_serverMsgChannelData = -1;
-static int ett_rdp_serverMultiTransportData = -1;
-static int ett_rdp_serverUnknownData = -1;
-static int ett_rdp_channelIdArray = -1;
-static int ett_rdp_securityExchangePDU = -1;
-static int ett_rdp_clientInfoPDU = -1;
-static int ett_rdp_validClientLicenseData = -1;
-static int ett_rdp_shareControlHeader = -1;
-static int ett_rdp_pduType = -1;
-static int ett_rdp_flags = -1;
-static int ett_rdp_compressedType = -1;
-static int ett_rdp_mapFlags = -1;
-static int ett_rdp_options = -1;
-static int ett_rdp_channelDefArray = -1;
-static int ett_rdp_channelDef = -1;
-static int ett_rdp_channelPDUHeader = -1;
-static int ett_rdp_channelFlags = -1;
-static int ett_rdp_capabilitySet = -1;
-static int ett_rdp_capa_rail = -1;
-
-static int ett_rdp_StandardDate = -1;
-static int ett_rdp_DaylightDate = -1;
-static int ett_rdp_clientTimeZone = -1;
-static int ett_rdp_mt_req = -1;
-static int ett_rdp_mt_rsp = -1;
-static int ett_rdp_heartbeat = -1;
-
-static int ett_rdp_fastpath = -1;
-static int ett_rdp_fastpath_header = -1;
-static int ett_rdp_fastpath_scancode_flags = -1;
-static int ett_rdp_fastpath_mouse_flags = -1;
-static int ett_rdp_fastpath_mousex_flags = -1;
-static int ett_rdp_fastpath_compression = -1;
-
-static expert_field ei_rdp_neg_len_invalid = EI_INIT;
-static expert_field ei_rdp_not_correlation_info = EI_INIT;
-
-static int hf_rdp_rt_cookie = -1;
-static int hf_rdp_neg_type = -1;
-static int hf_rdp_negReq_flags = -1;
-static int hf_rdp_negReq_flag_restricted_admin_mode_req = -1;
-static int hf_rdp_negReq_flag_redirected_auth_req = -1;
-static int hf_rdp_negReq_flag_correlation_info_present = -1;
-static int hf_rdp_neg_length = -1;
-static int hf_rdp_requestedProtocols = -1;
-static int hf_rdp_requestedProtocols_flag_ssl = -1;
-static int hf_rdp_requestedProtocols_flag_hybrid = -1;
-static int hf_rdp_requestedProtocols_flag_rdstls = -1;
-static int hf_rdp_requestedProtocols_flag_hybrid_ex = -1;
+static int ett_rdp;
+
+static int ett_negReq_flags;
+static int ett_requestedProtocols;
+
+static int ett_negRsp_flags;
+static int ett_selectedProtocol;
+
+static int ett_rdp_SendData;
+static int ett_rdp_MessageData;
+
+static int ett_rdp_ClientData;
+static int ett_rdp_clientCoreData;
+static int ett_rdp_clientSecurityData;
+static int ett_rdp_clientNetworkData;
+static int ett_rdp_clientClusterData;
+static int ett_rdp_clientMonitorData;
+static int ett_rdp_clientMonitorDefData;
+static int ett_rdp_clientMsgChannelData;
+static int ett_rdp_clientMonitorExData;
+static int ett_rdp_clientMultiTransportData;
+static int ett_rdp_clientUnknownData;
+static int ett_rdp_ServerData;
+static int ett_rdp_serverCoreData;
+static int ett_rdp_serverSecurityData;
+static int ett_rdp_serverNetworkData;
+static int ett_rdp_serverMsgChannelData;
+static int ett_rdp_serverMultiTransportData;
+static int ett_rdp_serverUnknownData;
+static int ett_rdp_channelIdArray;
+static int ett_rdp_securityExchangePDU;
+static int ett_rdp_clientInfoPDU;
+static int ett_rdp_validClientLicenseData;
+static int ett_rdp_shareControlHeader;
+static int ett_rdp_pduType;
+static int ett_rdp_flags;
+static int ett_rdp_compressedType;
+static int ett_rdp_mapFlags;
+static int ett_rdp_options;
+static int ett_rdp_channelDefArray;
+static int ett_rdp_channelDef;
+static int ett_rdp_channelPDUHeader;
+static int ett_rdp_channelFlags;
+static int ett_rdp_capabilitySet;
+static int ett_rdp_capa_rail;
+
+static int ett_rdp_StandardDate;
+static int ett_rdp_DaylightDate;
+static int ett_rdp_clientTimeZone;
+static int ett_rdp_mt_req;
+static int ett_rdp_mt_rsp;
+static int ett_rdp_heartbeat;
+
+static int ett_rdp_fastpath;
+static int ett_rdp_fastpath_header;
+static int ett_rdp_fastpath_scancode_flags;
+static int ett_rdp_fastpath_mouse_flags;
+static int ett_rdp_fastpath_mousex_flags;
+static int ett_rdp_fastpath_compression;
+
+static expert_field ei_rdp_neg_len_invalid;
+static expert_field ei_rdp_not_correlation_info;
+
+static int hf_rdp_rt_cookie;
+static int hf_rdp_neg_type;
+static int hf_rdp_negReq_flags;
+static int hf_rdp_negReq_flag_restricted_admin_mode_req;
+static int hf_rdp_negReq_flag_redirected_auth_req;
+static int hf_rdp_negReq_flag_correlation_info_present;
+static int hf_rdp_neg_length;
+static int hf_rdp_requestedProtocols;
+static int hf_rdp_requestedProtocols_flag_ssl;
+static int hf_rdp_requestedProtocols_flag_hybrid;
+static int hf_rdp_requestedProtocols_flag_rdstls;
+static int hf_rdp_requestedProtocols_flag_hybrid_ex;
 static int hf_rdp_correlationInfo_flags;
-static int hf_rdp_correlationId = -1;
-static int hf_rdp_correlationInfo_reserved = -1;
-static int hf_rdp_negRsp_flags = -1;
-static int hf_rdp_negRsp_flag_extended_client_data_supported = -1;
-static int hf_rdp_negRsp_flag_dynvc_gfx_protocol_supported = -1;
-static int hf_rdp_negRsp_flag_restricted_admin_mode_supported = -1;
-static int hf_rdp_negRsp_flag_restricted_authentication_mode_supported = -1;
-static int hf_rdp_selectedProtocol = -1;
-static int hf_rdp_negFailure_failureCode = -1;
-
-static int hf_rdp_ClientData = -1;
-static int hf_rdp_SendData = -1;
-static int hf_rdp_MessageData = -1;
-static int hf_rdp_clientCoreData = -1;
-static int hf_rdp_clientSecurityData = -1;
-static int hf_rdp_clientNetworkData = -1;
-static int hf_rdp_clientClusterData = -1;
-static int hf_rdp_clientMonitorData = -1;
-static int hf_rdp_clientMonitorDefData = -1;
-static int hf_rdp_clientMsgChannelData = -1;
-static int hf_rdp_clientMonitorExData = -1;
-static int hf_rdp_clientMultiTransportData = -1;
-static int hf_rdp_clientUnknownData = -1;
-static int hf_rdp_ServerData = -1;
-static int hf_rdp_serverCoreData = -1;
-static int hf_rdp_serverSecurityData = -1;
-static int hf_rdp_serverNetworkData = -1;
-static int hf_rdp_serverMsgChannelData = -1;
-static int hf_rdp_serverMultiTransportData = -1;
-static int hf_rdp_serverUnknownData = -1;
-
-static int hf_rdp_rdstls_version = -1;
-static int hf_rdp_rdstls_pduType = -1;
-static int hf_rdp_rdstls_dataTypeCapabilities = -1;
-static int hf_rdp_rdstls_supportedVersions = -1;
-static int hf_rdp_rdstls_dataTypeAuthReq = -1;
-static int hf_rdp_rdstls_redirectionGuidLen = -1;
-static int hf_rdp_rdstls_redirectionGuid = -1;
-static int hf_rdp_rdstls_usernameLen = -1;
-static int hf_rdp_rdstls_username = -1;
-static int hf_rdp_rdstls_domainLen = -1;
-static int hf_rdp_rdstls_domain = -1;
-static int hf_rdp_rdstls_passwordLen = -1;
-static int hf_rdp_rdstls_password = -1;
-static int hf_rdp_rdstls_sessionId = -1;
-static int hf_rdp_rdstls_autoReconnectCookieLen = -1;
-static int hf_rdp_rdstls_autoReconnectCookie = -1;
-static int hf_rdp_rdstls_dataTypeAuthResp = -1;
-static int hf_rdp_rdstls_resultCode = -1;
-
-
-static int hf_rdp_securityExchangePDU = -1;
-static int hf_rdp_clientInfoPDU = -1;
-static int hf_rdp_validClientLicenseData = -1;
-
-static int hf_rdp_headerType = -1;
-static int hf_rdp_headerLength = -1;
-static int hf_rdp_versionMajor = -1;
-static int hf_rdp_versionMinor = -1;
-static int hf_rdp_desktopWidth = -1;
-static int hf_rdp_desktopHeight = -1;
-static int hf_rdp_colorDepth = -1;
-static int hf_rdp_SASSequence = -1;
-static int hf_rdp_keyboardLayout = -1;
-static int hf_rdp_clientBuild = -1;
-static int hf_rdp_clientName = -1;
-static int hf_rdp_keyboardType = -1;
-static int hf_rdp_keyboardSubType = -1;
-static int hf_rdp_keyboardFunctionKey = -1;
-static int hf_rdp_imeFileName = -1;
-static int hf_rdp_postBeta2ColorDepth = -1;
-static int hf_rdp_clientProductId = -1;
-static int hf_rdp_serialNumber = -1;
-static int hf_rdp_highColorDepth = -1;
-static int hf_rdp_supportedColorDepths = -1;
-static int hf_rdp_earlyCapabilityFlags = -1;
-static int hf_rdp_clientDigProductId = -1;
-static int hf_rdp_connectionType = -1;
-static int hf_rdp_pad1octet = -1;
-static int hf_rdp_serverSelectedProtocol = -1;
-
-static int hf_rdp_encryptionMethods = -1;
-static int hf_rdp_extEncryptionMethods = -1;
-static int hf_rdp_cluster_flags = -1;
-static int hf_rdp_redirectedSessionId = -1;
-static int hf_rdp_msgChannelFlags = -1;
-static int hf_rdp_msgChannelId = -1;
-static int hf_rdp_monitorFlags = -1;
-static int hf_rdp_monitorExFlags = -1;
-static int hf_rdp_monitorAttributeSize = -1;
-static int hf_rdp_monitorCount = -1;
-static int hf_rdp_multiTransportFlags = -1;
-
-static int hf_rdp_monitorDefLeft = -1;
-static int hf_rdp_monitorDefTop = -1;
-static int hf_rdp_monitorDefRight = -1;
-static int hf_rdp_monitorDefBottom = -1;
-static int hf_rdp_monitorDefFlags = -1;
-
-static int hf_rdp_encryptionMethod = -1;
-static int hf_rdp_encryptionLevel  = -1;
-static int hf_rdp_serverRandomLen  = -1;
-static int hf_rdp_serverCertLen  = -1;
-static int hf_rdp_serverRandom = -1;
-static int hf_rdp_serverCertificate = -1;
-static int hf_rdp_clientRequestedProtocols = -1;
-static int hf_rdp_MCSChannelId = -1;
-static int hf_rdp_channelCount = -1;
-static int hf_rdp_channelIdArray = -1;
-static int hf_rdp_Pad = -1;
-static int hf_rdp_length = -1;
-static int hf_rdp_encryptedClientRandom = -1;
-static int hf_rdp_dataSignature = -1;
-static int hf_rdp_fipsLength = -1;
-static int hf_rdp_fipsVersion = -1;
-static int hf_rdp_padlen = -1;
-static int hf_rdp_flags = -1;
-static int hf_rdp_flagsPkt = -1;
-static int hf_rdp_flagsEncrypt = -1;
-static int hf_rdp_flagsResetSeqno = -1;
-static int hf_rdp_flagsIgnoreSeqno = -1;
-static int hf_rdp_flagsLicenseEncrypt = -1;
-static int hf_rdp_flagsSecureChecksum = -1;
-static int hf_rdp_flagsFlagsHiValid = -1;
-static int hf_rdp_flagsAutodetectReq = -1;
-static int hf_rdp_flagsAutodetectResp = -1;
-static int hf_rdp_flagsHeartbeat = -1;
-static int hf_rdp_flagsTransportReq = -1;
-static int hf_rdp_flagsTransportResp = -1;
-static int hf_rdp_heartbeat_reserved = -1;
-static int hf_rdp_heartbeat_period = -1;
-static int hf_rdp_heartbeat_count1 = -1;
-static int hf_rdp_heartbeat_count2 = -1;
-static int hf_rdp_bandwidth_header_len = -1;
-static int hf_rdp_bandwidth_header_type = -1;
-static int hf_rdp_bandwidth_seqnumber = -1;
-static int hf_rdp_bandwidth_reqtype = -1;
-static int hf_rdp_bandwidth_resptype = -1;
-static int hf_rdp_bandwidth_measure_payload_len = -1;
-static int hf_rdp_bandwidth_measure_payload_data = -1;
-static int hf_rdp_network_characteristics_basertt = -1;
-static int hf_rdp_network_characteristics_bandwidth = -1;
-static int hf_rdp_network_characteristics_averagertt = -1;
-static int hf_rdp_rtt_measure_time_delta = -1;
-static int hf_rdp_rtt_measure_time_bytecount = -1;
-static int hf_rdp_mt_req_requestId = -1;
-static int hf_rdp_mt_req_protocol = -1;
-static int hf_rdp_mt_req_reserved = -1;
-static int hf_rdp_mt_req_securityCookie = -1;
-static int hf_rdp_mt_rsp_requestId = -1;
-static int hf_rdp_mt_rsp_hrResponse = -1;
-static int hf_rdp_flagsHi = -1;
-static int hf_rdp_codePage = -1;
-static int hf_rdp_optionFlags = -1;
-static int hf_rdp_cbDomain = -1;
-static int hf_rdp_cbUserName = -1;
-static int hf_rdp_cbPassword = -1;
-static int hf_rdp_cbAlternateShell = -1;
-static int hf_rdp_cbWorkingDir = -1;
-static int hf_rdp_cbClientAddress = -1;
-static int hf_rdp_cbClientDir = -1;
-static int hf_rdp_cbAutoReconnectLen = -1;
-static int hf_rdp_domain = -1;
-static int hf_rdp_userName = -1;
-static int hf_rdp_password = -1;
-static int hf_rdp_alternateShell = -1;
-static int hf_rdp_workingDir = -1;
-static int hf_rdp_clientAddressFamily = -1;
-static int hf_rdp_clientAddress = -1;
-static int hf_rdp_clientDir = -1;
-static int hf_rdp_clientTimeZone = -1;
-static int hf_rdp_clientSessionId = -1;
-static int hf_rdp_performanceFlags = -1;
-static int hf_rdp_autoReconnectCookie = -1;
-static int hf_rdp_reserved1 = -1;
-static int hf_rdp_reserved2 = -1;
-static int hf_rdp_bMsgType = -1;
-static int hf_rdp_bVersion = -1;
-static int hf_rdp_wMsgSize = -1;
-static int hf_rdp_wBlobType = -1;
-static int hf_rdp_wBlobLen = -1;
-static int hf_rdp_blobData = -1;
-static int hf_rdp_shareControlHeader = -1;
-static int hf_rdp_totalLength = -1;
-static int hf_rdp_pduType = -1;
-static int hf_rdp_pduTypeType = -1;
-static int hf_rdp_pduTypeVersionLow = -1;
-static int hf_rdp_pduTypeVersionHigh = -1;
-static int hf_rdp_pduSource = -1;
-
-static int hf_rdp_shareId = -1;
-static int hf_rdp_pad1 = -1;
-static int hf_rdp_streamId = -1;
-static int hf_rdp_uncompressedLength = -1;
-static int hf_rdp_pduType2 = -1;
-static int hf_rdp_compressedType = -1;
-static int hf_rdp_compressedTypeType = -1;
-static int hf_rdp_compressedTypeCompressed = -1;
-static int hf_rdp_compressedTypeAtFront = -1;
-static int hf_rdp_compressedTypeFlushed = -1;
-static int hf_rdp_compressedLength = -1;
-static int hf_rdp_wErrorCode = -1;
-static int hf_rdp_wStateTransition = -1;
-static int hf_rdp_numberEntries = -1;
-static int hf_rdp_totalNumberEntries = -1;
-static int hf_rdp_mapFlags = -1;
-static int hf_rdp_fontMapFirst = -1;
-static int hf_rdp_fontMapLast = -1;
+static int hf_rdp_correlationId;
+static int hf_rdp_correlationInfo_reserved;
+static int hf_rdp_negRsp_flags;
+static int hf_rdp_negRsp_flag_extended_client_data_supported;
+static int hf_rdp_negRsp_flag_dynvc_gfx_protocol_supported;
+static int hf_rdp_negRsp_flag_restricted_admin_mode_supported;
+static int hf_rdp_negRsp_flag_restricted_authentication_mode_supported;
+static int hf_rdp_selectedProtocol;
+static int hf_rdp_negFailure_failureCode;
+
+static int hf_rdp_ClientData;
+static int hf_rdp_SendData;
+static int hf_rdp_MessageData;
+static int hf_rdp_clientCoreData;
+static int hf_rdp_clientSecurityData;
+static int hf_rdp_clientNetworkData;
+static int hf_rdp_clientClusterData;
+static int hf_rdp_clientMonitorData;
+static int hf_rdp_clientMonitorDefData;
+static int hf_rdp_clientMsgChannelData;
+static int hf_rdp_clientMonitorExData;
+static int hf_rdp_clientMultiTransportData;
+static int hf_rdp_clientUnknownData;
+static int hf_rdp_ServerData;
+static int hf_rdp_serverCoreData;
+static int hf_rdp_serverSecurityData;
+static int hf_rdp_serverNetworkData;
+static int hf_rdp_serverMsgChannelData;
+static int hf_rdp_serverMultiTransportData;
+static int hf_rdp_serverUnknownData;
+
+static int hf_rdp_rdstls_version;
+static int hf_rdp_rdstls_pduType;
+static int hf_rdp_rdstls_dataTypeCapabilities;
+static int hf_rdp_rdstls_supportedVersions;
+static int hf_rdp_rdstls_dataTypeAuthReq;
+static int hf_rdp_rdstls_redirectionGuidLen;
+static int hf_rdp_rdstls_redirectionGuid;
+static int hf_rdp_rdstls_usernameLen;
+static int hf_rdp_rdstls_username;
+static int hf_rdp_rdstls_domainLen;
+static int hf_rdp_rdstls_domain;
+static int hf_rdp_rdstls_passwordLen;
+static int hf_rdp_rdstls_password;
+static int hf_rdp_rdstls_sessionId;
+static int hf_rdp_rdstls_autoReconnectCookieLen;
+static int hf_rdp_rdstls_autoReconnectCookie;
+static int hf_rdp_rdstls_dataTypeAuthResp;
+static int hf_rdp_rdstls_resultCode;
+
+
+static int hf_rdp_securityExchangePDU;
+static int hf_rdp_clientInfoPDU;
+static int hf_rdp_validClientLicenseData;
+
+static int hf_rdp_headerType;
+static int hf_rdp_headerLength;
+static int hf_rdp_versionMajor;
+static int hf_rdp_versionMinor;
+static int hf_rdp_desktopWidth;
+static int hf_rdp_desktopHeight;
+static int hf_rdp_colorDepth;
+static int hf_rdp_SASSequence;
+static int hf_rdp_keyboardLayout;
+static int hf_rdp_clientBuild;
+static int hf_rdp_clientName;
+static int hf_rdp_keyboardType;
+static int hf_rdp_keyboardSubType;
+static int hf_rdp_keyboardFunctionKey;
+static int hf_rdp_imeFileName;
+static int hf_rdp_postBeta2ColorDepth;
+static int hf_rdp_clientProductId;
+static int hf_rdp_serialNumber;
+static int hf_rdp_highColorDepth;
+static int hf_rdp_supportedColorDepths;
+static int hf_rdp_earlyCapabilityFlags;
+static int hf_rdp_clientDigProductId;
+static int hf_rdp_connectionType;
+static int hf_rdp_pad1octet;
+static int hf_rdp_serverSelectedProtocol;
+
+static int hf_rdp_encryptionMethods;
+static int hf_rdp_extEncryptionMethods;
+static int hf_rdp_cluster_flags;
+static int hf_rdp_redirectedSessionId;
+static int hf_rdp_msgChannelFlags;
+static int hf_rdp_msgChannelId;
+static int hf_rdp_monitorFlags;
+static int hf_rdp_monitorExFlags;
+static int hf_rdp_monitorAttributeSize;
+static int hf_rdp_monitorCount;
+static int hf_rdp_multiTransportFlags;
+
+static int hf_rdp_monitorDefLeft;
+static int hf_rdp_monitorDefTop;
+static int hf_rdp_monitorDefRight;
+static int hf_rdp_monitorDefBottom;
+static int hf_rdp_monitorDefFlags;
+
+static int hf_rdp_encryptionMethod;
+static int hf_rdp_encryptionLevel;
+static int hf_rdp_serverRandomLen;
+static int hf_rdp_serverCertLen;
+static int hf_rdp_serverRandom;
+static int hf_rdp_serverCertificate;
+static int hf_rdp_clientRequestedProtocols;
+static int hf_rdp_MCSChannelId;
+static int hf_rdp_channelCount;
+static int hf_rdp_channelIdArray;
+static int hf_rdp_Pad;
+static int hf_rdp_length;
+static int hf_rdp_encryptedClientRandom;
+static int hf_rdp_dataSignature;
+static int hf_rdp_fipsLength;
+static int hf_rdp_fipsVersion;
+static int hf_rdp_padlen;
+static int hf_rdp_flags;
+static int hf_rdp_flagsPkt;
+static int hf_rdp_flagsEncrypt;
+static int hf_rdp_flagsResetSeqno;
+static int hf_rdp_flagsIgnoreSeqno;
+static int hf_rdp_flagsLicenseEncrypt;
+static int hf_rdp_flagsSecureChecksum;
+static int hf_rdp_flagsFlagsHiValid;
+static int hf_rdp_flagsAutodetectReq;
+static int hf_rdp_flagsAutodetectResp;
+static int hf_rdp_flagsHeartbeat;
+static int hf_rdp_flagsTransportReq;
+static int hf_rdp_flagsTransportResp;
+static int hf_rdp_heartbeat_reserved;
+static int hf_rdp_heartbeat_period;
+static int hf_rdp_heartbeat_count1;
+static int hf_rdp_heartbeat_count2;
+static int hf_rdp_bandwidth_header_len;
+static int hf_rdp_bandwidth_header_type;
+static int hf_rdp_bandwidth_seqnumber;
+static int hf_rdp_bandwidth_reqtype;
+static int hf_rdp_bandwidth_resptype;
+static int hf_rdp_bandwidth_measure_payload_len;
+static int hf_rdp_bandwidth_measure_payload_data;
+static int hf_rdp_network_characteristics_basertt;
+static int hf_rdp_network_characteristics_bandwidth;
+static int hf_rdp_network_characteristics_averagertt;
+static int hf_rdp_rtt_measure_time_delta;
+static int hf_rdp_rtt_measure_time_bytecount;
+static int hf_rdp_mt_req_requestId;
+static int hf_rdp_mt_req_protocol;
+static int hf_rdp_mt_req_reserved;
+static int hf_rdp_mt_req_securityCookie;
+static int hf_rdp_mt_rsp_requestId;
+static int hf_rdp_mt_rsp_hrResponse;
+static int hf_rdp_flagsHi;
+static int hf_rdp_codePage;
+static int hf_rdp_optionFlags;
+static int hf_rdp_cbDomain;
+static int hf_rdp_cbUserName;
+static int hf_rdp_cbPassword;
+static int hf_rdp_cbAlternateShell;
+static int hf_rdp_cbWorkingDir;
+static int hf_rdp_cbClientAddress;
+static int hf_rdp_cbClientDir;
+static int hf_rdp_cbAutoReconnectLen;
+static int hf_rdp_domain;
+static int hf_rdp_userName;
+static int hf_rdp_password;
+static int hf_rdp_alternateShell;
+static int hf_rdp_workingDir;
+static int hf_rdp_clientAddressFamily;
+static int hf_rdp_clientAddress;
+static int hf_rdp_clientDir;
+static int hf_rdp_clientTimeZone;
+static int hf_rdp_clientSessionId;
+static int hf_rdp_performanceFlags;
+static int hf_rdp_autoReconnectCookie;
+static int hf_rdp_reserved1;
+static int hf_rdp_reserved2;
+static int hf_rdp_bMsgType;
+static int hf_rdp_bVersion;
+static int hf_rdp_wMsgSize;
+static int hf_rdp_wBlobType;
+static int hf_rdp_wBlobLen;
+static int hf_rdp_blobData;
+static int hf_rdp_shareControlHeader;
+static int hf_rdp_totalLength;
+static int hf_rdp_pduType;
+static int hf_rdp_pduTypeType;
+static int hf_rdp_pduTypeVersionLow;
+static int hf_rdp_pduTypeVersionHigh;
+static int hf_rdp_pduSource;
+
+static int hf_rdp_shareId;
+static int hf_rdp_pad1;
+static int hf_rdp_streamId;
+static int hf_rdp_uncompressedLength;
+static int hf_rdp_pduType2;
+static int hf_rdp_compressedType;
+static int hf_rdp_compressedTypeType;
+static int hf_rdp_compressedTypeCompressed;
+static int hf_rdp_compressedTypeAtFront;
+static int hf_rdp_compressedTypeFlushed;
+static int hf_rdp_compressedLength;
+static int hf_rdp_wErrorCode;
+static int hf_rdp_wStateTransition;
+static int hf_rdp_numberEntries;
+static int hf_rdp_totalNumberEntries;
+static int hf_rdp_mapFlags;
+static int hf_rdp_fontMapFirst;
+static int hf_rdp_fontMapLast;
 
 /* Control */
-static int hf_rdp_action = -1;
-static int hf_rdp_grantId = -1;
-static int hf_rdp_controlId = -1;
+static int hf_rdp_action;
+static int hf_rdp_grantId;
+static int hf_rdp_controlId;
 
 /* Synchronize */
-static int hf_rdp_messageType = -1;
-static int hf_rdp_targetUser = -1;
+static int hf_rdp_messageType;
+static int hf_rdp_targetUser;
 
 /* BitmapCache Persistent List */
-static int hf_rdp_numEntriesCache0 = -1;
-static int hf_rdp_numEntriesCache1 = -1;
-static int hf_rdp_numEntriesCache2 = -1;
-static int hf_rdp_numEntriesCache3 = -1;
-static int hf_rdp_numEntriesCache4 = -1;
-static int hf_rdp_totalEntriesCache0 = -1;
-static int hf_rdp_totalEntriesCache1 = -1;
-static int hf_rdp_totalEntriesCache2 = -1;
-static int hf_rdp_totalEntriesCache3 = -1;
-static int hf_rdp_totalEntriesCache4 = -1;
-static int hf_rdp_bBitMask = -1;
-static int hf_rdp_Pad2 = -1;
-static int hf_rdp_Pad3 = -1;
+static int hf_rdp_numEntriesCache0;
+static int hf_rdp_numEntriesCache1;
+static int hf_rdp_numEntriesCache2;
+static int hf_rdp_numEntriesCache3;
+static int hf_rdp_numEntriesCache4;
+static int hf_rdp_totalEntriesCache0;
+static int hf_rdp_totalEntriesCache1;
+static int hf_rdp_totalEntriesCache2;
+static int hf_rdp_totalEntriesCache3;
+static int hf_rdp_totalEntriesCache4;
+static int hf_rdp_bBitMask;
+static int hf_rdp_Pad2;
+static int hf_rdp_Pad3;
 
 /* BitmapCache Persistent List Entry */
-/* static int hf_rdp_Key1 = -1; */
-/* static int hf_rdp_Key2 = -1; */
+/* static int hf_rdp_Key1; */
+/* static int hf_rdp_Key2; */
 
 /* FontList */
 #if 0
-static int hf_rdp_numberFonts = -1;
-static int hf_rdp_totalNumFonts = -1;
-static int hf_rdp_listFlags = -1;
+static int hf_rdp_numberFonts;
+static int hf_rdp_totalNumFonts;
+static int hf_rdp_listFlags;
 #endif
-static int hf_rdp_entrySize = -1;
+static int hf_rdp_entrySize;
 
 /* Confirm Active PDU */
-static int hf_rdp_originatorId = -1;
-static int hf_rdp_lengthSourceDescriptor = -1;
-static int hf_rdp_lengthCombinedCapabilities = -1;
-static int hf_rdp_sourceDescriptor = -1;
-static int hf_rdp_numberCapabilities = -1;
-static int hf_rdp_pad2Octets = -1;
-static int hf_rdp_capabilitySet = -1;
-static int hf_rdp_capabilitySetType = -1;
-static int hf_rdp_lengthCapability = -1;
-static int hf_rdp_capabilityData = -1;
-static int hf_rdp_capaRail_supportedLevel = -1;
-static int hf_rdp_capaRail_flag_supported = -1;
-static int hf_rdp_capaRail_flag_dockedlangbar = -1;
-static int hf_rdp_capaRail_flag_shellintegration = -1;
-static int hf_rdp_capaRail_flag_lang_ime_sync = -1;
-static int hf_rdp_capaRail_flag_server_to_client_ime_sync = -1;
-static int hf_rdp_capaRail_flag_hide_minimized = -1;
-static int hf_rdp_capaRail_flag_windows_cloaking = -1;
-static int hf_rdp_capaRail_flag_handshakeex = -1;
-static int hf_rdp_sessionId = -1;
-
-/* static int hf_rdp_unknownData = -1; */
-static int hf_rdp_notYetImplemented = -1;
-static int hf_rdp_encrypted = -1;
-/* static int hf_rdp_compressed = -1; */
-
-static int hf_rdp_channelDefArray = -1;
-static int hf_rdp_channelDef = -1;
-static int hf_rdp_name = -1;
-static int hf_rdp_options = -1;
-static int hf_rdp_optionsInitialized = -1;
-static int hf_rdp_optionsEncryptRDP = -1;
-static int hf_rdp_optionsEncryptSC = -1;
-static int hf_rdp_optionsEncryptCS = -1;
-static int hf_rdp_optionsPriHigh = -1;
-static int hf_rdp_optionsPriMed = -1;
-static int hf_rdp_optionsPriLow = -1;
-static int hf_rdp_optionsCompressRDP = -1;
-static int hf_rdp_optionsCompress = -1;
-static int hf_rdp_optionsShowProtocol= -1;
-static int hf_rdp_optionsRemoteControlPersistent = -1;
-
-static int hf_rdp_channelPDUHeader = -1;
-static int hf_rdp_channelFlags = -1;
-static int hf_rdp_channelFlagFirst = -1;
-static int hf_rdp_channelFlagLast = -1;
-static int hf_rdp_channelFlagShowProtocol = -1;
-static int hf_rdp_channelFlagSuspend = -1;
-static int hf_rdp_channelFlagResume = -1;
-static int hf_rdp_channelPacketCompressed = -1;
-static int hf_rdp_channelPacketAtFront = -1;
-static int hf_rdp_channelPacketFlushed = -1;
-static int hf_rdp_channelPacketCompressionType = -1;
-static int hf_rdp_virtualChannelData = -1;
-
-static int hf_rdp_pointerFlags = -1;
-static int hf_rdp_pointerFlags_move = -1;
-static int hf_rdp_pointerFlags_down = -1;
-static int hf_rdp_pointerFlags_button1 = -1;
-static int hf_rdp_pointerFlags_button2 = -1;
-static int hf_rdp_pointerFlags_button3 = -1;
-static int hf_rdp_pointerFlags_wheel_rotation = -1;
-static int hf_rdp_pointerFlags_wheel_neg = -1;
-static int hf_rdp_pointerFlags_wheel = -1;
-static int hf_rdp_pointerFlags_hwheel = -1;
-static int hf_rdp_pointer_xpos = -1;
-static int hf_rdp_pointer_ypos = -1;
-
-static int hf_rdp_pointerxFlags = -1;
-static int hf_rdp_pointerxFlags_down = -1;
-static int hf_rdp_pointerxFlags_button1 = -1;
-static int hf_rdp_pointerxFlags_button2 = -1;
-static int hf_rdp_pointerx_xpos = -1;
-static int hf_rdp_pointerx_ypos = -1;
-
-
-static int hf_rdp_fastpathHeader = -1;
-static int hf_rdp_fastpathAction = -1;
-static int hf_rdp_fastpathFlags = -1;
-static int hf_rdp_fastpathClientNumEvents = -1;
-static int hf_rdp_fastpathServerReserved = -1;
-
-static int hf_rdp_fastpathPDULength = -1;
-static int hf_rdp_fastpathServerCompressionType = -1;
-static int hf_rdp_fastpathServerCompressionType_compressed = -1;
-static int hf_rdp_fastpathServerCompressionType_atfront = -1;
-static int hf_rdp_fastpathServerCompressionType_flushed = -1;
-static int hf_rdp_fastpathServerCompressionFlags = -1;
-
-static int hf_rdp_fastpathServerUpdateCode = -1;
-static int hf_rdp_fastpathServerFragmentation = -1;
-static int hf_rdp_fastpathServerCompression = -1;
-static int hf_rdp_fastpathServerSize = -1;
-
-static int hf_rdp_fastpathInputHeader = -1;
-static int hf_rdp_fastpathClientNumEvents2 = -1;
-static int hf_rdp_fastpathClientEventCode = -1;
-static int hf_rdp_fastpathClientFlags = -1;
-static int hf_rdp_fastpathScancodeRelease = -1;
-static int hf_rdp_fastpathScancodeExtended = -1;
-static int hf_rdp_fastpathScancodeExtended1 = -1;
-static int hf_rdp_fastpathScancodeKeyCode = -1;
-static int hf_rdp_fastpathSyncScrollLock = -1;
-static int hf_rdp_fastpathSyncNumLock = -1;
-static int hf_rdp_fastpathSyncCapsLock = -1;
-static int hf_rdp_fastpathSyncKanaLock = -1;
-static int hf_rdp_fastpathQoeTimestamp = -1;
-static int hf_rdp_fastpathUnicodeFlagsRelease = -1;
-static int hf_rdp_fastpathUnicodeCode = -1;
+static int hf_rdp_originatorId;
+static int hf_rdp_lengthSourceDescriptor;
+static int hf_rdp_lengthCombinedCapabilities;
+static int hf_rdp_sourceDescriptor;
+static int hf_rdp_numberCapabilities;
+static int hf_rdp_pad2Octets;
+static int hf_rdp_capabilitySet;
+static int hf_rdp_capabilitySetType;
+static int hf_rdp_lengthCapability;
+static int hf_rdp_capabilityData;
+static int hf_rdp_capaRail_supportedLevel;
+static int hf_rdp_capaRail_flag_supported;
+static int hf_rdp_capaRail_flag_dockedlangbar;
+static int hf_rdp_capaRail_flag_shellintegration;
+static int hf_rdp_capaRail_flag_lang_ime_sync;
+static int hf_rdp_capaRail_flag_server_to_client_ime_sync;
+static int hf_rdp_capaRail_flag_hide_minimized;
+static int hf_rdp_capaRail_flag_windows_cloaking;
+static int hf_rdp_capaRail_flag_handshakeex;
+static int hf_rdp_sessionId;
+
+/* static int hf_rdp_unknownData; */
+static int hf_rdp_notYetImplemented;
+static int hf_rdp_encrypted;
+/* static int hf_rdp_compressed; */
+
+static int hf_rdp_channelDefArray;
+static int hf_rdp_channelDef;
+static int hf_rdp_name;
+static int hf_rdp_options;
+static int hf_rdp_optionsInitialized;
+static int hf_rdp_optionsEncryptRDP;
+static int hf_rdp_optionsEncryptSC;
+static int hf_rdp_optionsEncryptCS;
+static int hf_rdp_optionsPriHigh;
+static int hf_rdp_optionsPriMed;
+static int hf_rdp_optionsPriLow;
+static int hf_rdp_optionsCompressRDP;
+static int hf_rdp_optionsCompress;
+static int hf_rdp_optionsShowProtocol;
+static int hf_rdp_optionsRemoteControlPersistent;
+
+static int hf_rdp_channelPDUHeader;
+static int hf_rdp_channelFlags;
+static int hf_rdp_channelFlagFirst;
+static int hf_rdp_channelFlagLast;
+static int hf_rdp_channelFlagShowProtocol;
+static int hf_rdp_channelFlagSuspend;
+static int hf_rdp_channelFlagResume;
+static int hf_rdp_channelPacketCompressed;
+static int hf_rdp_channelPacketAtFront;
+static int hf_rdp_channelPacketFlushed;
+static int hf_rdp_channelPacketCompressionType;
+static int hf_rdp_virtualChannelData;
+
+static int hf_rdp_pointerFlags;
+static int hf_rdp_pointerFlags_move;
+static int hf_rdp_pointerFlags_down;
+static int hf_rdp_pointerFlags_button1;
+static int hf_rdp_pointerFlags_button2;
+static int hf_rdp_pointerFlags_button3;
+static int hf_rdp_pointerFlags_wheel_rotation;
+static int hf_rdp_pointerFlags_wheel_neg;
+static int hf_rdp_pointerFlags_wheel;
+static int hf_rdp_pointerFlags_hwheel;
+static int hf_rdp_pointer_xpos;
+static int hf_rdp_pointer_ypos;
+
+static int hf_rdp_pointerxFlags;
+static int hf_rdp_pointerxFlags_down;
+static int hf_rdp_pointerxFlags_button1;
+static int hf_rdp_pointerxFlags_button2;
+static int hf_rdp_pointerx_xpos;
+static int hf_rdp_pointerx_ypos;
+
+
+static int hf_rdp_fastpathHeader;
+static int hf_rdp_fastpathAction;
+static int hf_rdp_fastpathFlags;
+static int hf_rdp_fastpathClientNumEvents;
+static int hf_rdp_fastpathServerReserved;
+
+static int hf_rdp_fastpathPDULength;
+static int hf_rdp_fastpathServerCompressionType;
+static int hf_rdp_fastpathServerCompressionType_compressed;
+static int hf_rdp_fastpathServerCompressionType_atfront;
+static int hf_rdp_fastpathServerCompressionType_flushed;
+static int hf_rdp_fastpathServerCompressionFlags;
+
+static int hf_rdp_fastpathServerUpdateCode;
+static int hf_rdp_fastpathServerFragmentation;
+static int hf_rdp_fastpathServerCompression;
+static int hf_rdp_fastpathServerSize;
+
+static int hf_rdp_fastpathInputHeader;
+static int hf_rdp_fastpathClientNumEvents2;
+static int hf_rdp_fastpathClientEventCode;
+static int hf_rdp_fastpathClientFlags;
+static int hf_rdp_fastpathScancodeRelease;
+static int hf_rdp_fastpathScancodeExtended;
+static int hf_rdp_fastpathScancodeExtended1;
+static int hf_rdp_fastpathScancodeKeyCode;
+static int hf_rdp_fastpathSyncScrollLock;
+static int hf_rdp_fastpathSyncNumLock;
+static int hf_rdp_fastpathSyncCapsLock;
+static int hf_rdp_fastpathSyncKanaLock;
+static int hf_rdp_fastpathQoeTimestamp;
+static int hf_rdp_fastpathUnicodeFlagsRelease;
+static int hf_rdp_fastpathUnicodeCode;
 
 static int * const fastpath_clientHeader_flags[] = {
 	&hf_rdp_fastpathAction,
@@ -545,22 +545,22 @@ static int * const fastpath_servercompression_flags[] = {
 };
 
 
-static int hf_rdp_wYear = -1;
-static int hf_rdp_wMonth = -1;
-static int hf_rdp_wDayOfWeek = -1;
-static int hf_rdp_wDay = -1;
-static int hf_rdp_wHour = -1;
-static int hf_rdp_wMinute = -1;
-static int hf_rdp_wSecond = -1;
-static int hf_rdp_wMilliseconds = -1;
-
-static int hf_rdp_Bias = -1;
-static int hf_rdp_StandardName = -1;
-static int hf_rdp_StandardDate = -1;
-static int hf_rdp_StandardBias = -1;
-static int hf_rdp_DaylightName = -1;
-static int hf_rdp_DaylightDate = -1;
-static int hf_rdp_DaylightBias = -1;
+static int hf_rdp_wYear;
+static int hf_rdp_wMonth;
+static int hf_rdp_wDayOfWeek;
+static int hf_rdp_wDay;
+static int hf_rdp_wHour;
+static int hf_rdp_wMinute;
+static int hf_rdp_wSecond;
+static int hf_rdp_wMilliseconds;
+
+static int hf_rdp_Bias;
+static int hf_rdp_StandardName;
+static int hf_rdp_StandardDate;
+static int hf_rdp_StandardBias;
+static int hf_rdp_DaylightName;
+static int hf_rdp_DaylightDate;
+static int hf_rdp_DaylightBias;
 
 #define TYPE_RDP_NEG_REQ          0x01
 #define TYPE_RDP_NEG_RSP          0x02
diff --git a/epan/dissectors/packet-rdp_cliprdr.c b/epan/dissectors/packet-rdp_cliprdr.c
index 0062027380..4d8eded72e 100644
--- a/epan/dissectors/packet-rdp_cliprdr.c
+++ b/epan/dissectors/packet-rdp_cliprdr.c
@@ -31,13 +31,13 @@ void proto_register_rdp_cliprdr(void);
 void proto_reg_handoff_rdp_cliprdr(void);
 
 
-static int proto_rdp_cliprdr = -1;
+static int proto_rdp_cliprdr;
 
-static int hf_cliprdr_msgType = -1;
-static int hf_cliprdr_msgFlags = -1;
-static int hf_cliprdr_dataLen = -1;
+static int hf_cliprdr_msgType;
+static int hf_cliprdr_msgFlags;
+static int hf_cliprdr_dataLen;
 
-static int ett_rdp_cliprdr = -1;
+static int ett_rdp_cliprdr;
 
 
 enum {
diff --git a/epan/dissectors/packet-rdp_drdynvc.c b/epan/dissectors/packet-rdp_drdynvc.c
index ddd3ec4b64..d87979a75e 100644
--- a/epan/dissectors/packet-rdp_drdynvc.c
+++ b/epan/dissectors/packet-rdp_drdynvc.c
@@ -22,39 +22,39 @@
 void proto_register_rdp_drdynvc(void);
 void proto_reg_handoff_drdynvc(void);
 
-static int proto_rdp_drdynvc = -1;
-
-static int hf_rdp_drdynvc_cbId = -1;
-static int hf_rdp_drdynvc_sp = -1;
-static int hf_rdp_drdynvc_pri = -1;
-static int hf_rdp_drdynvc_cmd = -1;
-static int hf_rdp_drdynvc_capa_version = -1;
-static int hf_rdp_drdynvc_capa_prio0 = -1;
-static int hf_rdp_drdynvc_capa_prio1 = -1;
-static int hf_rdp_drdynvc_capa_prio2 = -1;
-static int hf_rdp_drdynvc_capa_prio3 = -1;
-static int hf_rdp_drdynvc_channelId = -1;
-static int hf_rdp_drdynvc_pad = -1;
-static int hf_rdp_drdynvc_channelName = -1;
-static int hf_rdp_drdynvc_creationStatus = -1;
-static int hf_rdp_drdynvc_createresp_channelname = -1;
-static int hf_rdp_drdynvc_length = -1;
-static int hf_rdp_drdynvc_softsync_req_length = -1;
-static int hf_rdp_drdynvc_softsync_req_flags = -1;
-static int hf_rdp_drdynvc_softsync_req_ntunnels = -1;
-static int hf_rdp_drdynvc_softsync_req_channel_tunnelType = -1;
-static int hf_rdp_drdynvc_softsync_req_channel_ndvc = -1;
-static int hf_rdp_drdynvc_softsync_req_channel_dvcid = -1;
-static int hf_rdp_drdynvc_softsync_resp_ntunnels = -1;
-static int hf_rdp_drdynvc_softsync_resp_tunnel = -1;
-static int hf_rdp_drdynvc_data = -1;
-static int hf_rdp_drdynvc_data_progress = -1;
-
-
-static int ett_rdp_drdynvc = -1;
-static int ett_rdp_drdynvc_softsync_channels = -1;
-static int ett_rdp_drdynvc_softsync_channel = -1;
-static int ett_rdp_drdynvc_softsync_dvc = -1;
+static int proto_rdp_drdynvc;
+
+static int hf_rdp_drdynvc_cbId;
+static int hf_rdp_drdynvc_sp;
+static int hf_rdp_drdynvc_pri;
+static int hf_rdp_drdynvc_cmd;
+static int hf_rdp_drdynvc_capa_version;
+static int hf_rdp_drdynvc_capa_prio0;
+static int hf_rdp_drdynvc_capa_prio1;
+static int hf_rdp_drdynvc_capa_prio2;
+static int hf_rdp_drdynvc_capa_prio3;
+static int hf_rdp_drdynvc_channelId;
+static int hf_rdp_drdynvc_pad;
+static int hf_rdp_drdynvc_channelName;
+static int hf_rdp_drdynvc_creationStatus;
+static int hf_rdp_drdynvc_createresp_channelname;
+static int hf_rdp_drdynvc_length;
+static int hf_rdp_drdynvc_softsync_req_length;
+static int hf_rdp_drdynvc_softsync_req_flags;
+static int hf_rdp_drdynvc_softsync_req_ntunnels;
+static int hf_rdp_drdynvc_softsync_req_channel_tunnelType;
+static int hf_rdp_drdynvc_softsync_req_channel_ndvc;
+static int hf_rdp_drdynvc_softsync_req_channel_dvcid;
+static int hf_rdp_drdynvc_softsync_resp_ntunnels;
+static int hf_rdp_drdynvc_softsync_resp_tunnel;
+static int hf_rdp_drdynvc_data;
+static int hf_rdp_drdynvc_data_progress;
+
+
+static int ett_rdp_drdynvc;
+static int ett_rdp_drdynvc_softsync_channels;
+static int ett_rdp_drdynvc_softsync_channel;
+static int ett_rdp_drdynvc_softsync_dvc;
 
 dissector_handle_t egfx_handle;
 dissector_handle_t rail_handle;
diff --git a/epan/dissectors/packet-rdp_egfx.c b/epan/dissectors/packet-rdp_egfx.c
index 48726b3aae..6cdd40f4ee 100644
--- a/epan/dissectors/packet-rdp_egfx.c
+++ b/epan/dissectors/packet-rdp_egfx.c
@@ -29,61 +29,61 @@
 void proto_register_rdp_egfx(void);
 void proto_reg_handoff_rdp_egfx(void);
 
-static int proto_rdp_egfx = -1;
-
-static int hf_egfx_cmdId = -1;
-static int hf_egfx_flags = -1;
-static int hf_egfx_pduLength = -1;
-
-static int hf_egfx_caps_capsSetCount = -1;
-static int hf_egfx_cap_version = -1;
-static int hf_egfx_cap_length = -1;
-
-static int hf_egfx_reset_width = -1;
-static int hf_egfx_reset_height = -1;
-static int hf_egfx_reset_monitorCount = -1;
-static int hf_egfx_reset_monitorDefLeft = -1;
-static int hf_egfx_reset_monitorDefTop = -1;
-static int hf_egfx_reset_monitorDefRight = -1;
-static int hf_egfx_reset_monitorDefBottom = -1;
-static int hf_egfx_reset_monitorDefFlags = -1;
-
-
-static int hf_egfx_ack_queue_depth = -1;
-static int hf_egfx_ack_frame_id = -1;
-static int hf_egfx_ack_total_decoded = -1;
-static int hf_egfx_ack_frame_start = -1;
-static int hf_egfx_ack_frame_end = -1;
-
-static int hf_egfx_ackqoe_frame_id = -1;
-static int hf_egfx_ackqoe_timestamp = -1;
-static int hf_egfx_ackqoe_timediffse = -1;
-static int hf_egfx_ackqoe_timediffedr = -1;
-static int hf_egfx_ackqoe_frame_start = -1;
-static int hf_egfx_ackqoe_frame_end = -1;
-
-static int hf_egfx_start_timestamp = -1;
-static int hf_egfx_start_frameid = -1;
-static int hf_egfx_start_acked_in = -1;
-
-static int hf_egfx_end_frameid = -1;
-static int hf_egfx_end_acked_in = -1;
-
-
-static int ett_rdp_egfx = -1;
-static int ett_egfx_caps = -1;
-static int ett_egfx_capsconfirm = -1;
-static int ett_egfx_cap = -1;
-static int ett_egfx_cap_version = -1;
-static int ett_egfx_ack = -1;
-static int ett_egfx_ackqoe = -1;
-static int ett_egfx_reset = -1;
-static int ett_egfx_monitors = -1;
-static int ett_egfx_monitordef = -1;
-
-
-static expert_field ei_egfx_pdulen_invalid = EI_INIT;
-static expert_field ei_egfx_invalid_compression = EI_INIT;
+static int proto_rdp_egfx;
+
+static int hf_egfx_cmdId;
+static int hf_egfx_flags;
+static int hf_egfx_pduLength;
+
+static int hf_egfx_caps_capsSetCount;
+static int hf_egfx_cap_version;
+static int hf_egfx_cap_length;
+
+static int hf_egfx_reset_width;
+static int hf_egfx_reset_height;
+static int hf_egfx_reset_monitorCount;
+static int hf_egfx_reset_monitorDefLeft;
+static int hf_egfx_reset_monitorDefTop;
+static int hf_egfx_reset_monitorDefRight;
+static int hf_egfx_reset_monitorDefBottom;
+static int hf_egfx_reset_monitorDefFlags;
+
+
+static int hf_egfx_ack_queue_depth;
+static int hf_egfx_ack_frame_id;
+static int hf_egfx_ack_total_decoded;
+static int hf_egfx_ack_frame_start;
+static int hf_egfx_ack_frame_end;
+
+static int hf_egfx_ackqoe_frame_id;
+static int hf_egfx_ackqoe_timestamp;
+static int hf_egfx_ackqoe_timediffse;
+static int hf_egfx_ackqoe_timediffedr;
+static int hf_egfx_ackqoe_frame_start;
+static int hf_egfx_ackqoe_frame_end;
+
+static int hf_egfx_start_timestamp;
+static int hf_egfx_start_frameid;
+static int hf_egfx_start_acked_in;
+
+static int hf_egfx_end_frameid;
+static int hf_egfx_end_acked_in;
+
+
+static int ett_rdp_egfx;
+static int ett_egfx_caps;
+static int ett_egfx_capsconfirm;
+static int ett_egfx_cap;
+static int ett_egfx_cap_version;
+static int ett_egfx_ack;
+static int ett_egfx_ackqoe;
+static int ett_egfx_reset;
+static int ett_egfx_monitors;
+static int ett_egfx_monitordef;
+
+
+static expert_field ei_egfx_pdulen_invalid;
+static expert_field ei_egfx_invalid_compression;
 
 
 #define PNAME  "RDP Graphic pipeline channel Protocol"
diff --git a/epan/dissectors/packet-rdp_multitransport.c b/epan/dissectors/packet-rdp_multitransport.c
index c7ae60d853..294647d2db 100644
--- a/epan/dissectors/packet-rdp_multitransport.c
+++ b/epan/dissectors/packet-rdp_multitransport.c
@@ -28,24 +28,24 @@ void proto_reg_handoff_rdpmt(void);
 
 static dissector_handle_t rdpmt_handle;
 
-static int proto_rdpmt = -1;
-
-static int hf_rdpmt_action = -1;
-static int hf_rdpmt_flags = -1;
-static int hf_rdpmt_payload_len = -1;
-static int hf_rdpmt_header_len = -1;
-static int hf_rdpmt_subheader_len = -1;
-static int hf_rdpmt_subheader_type = -1;
-static int hf_rdpmt_createreq_reqId = -1;
-static int hf_rdpmt_createreq_reserved = -1;
-static int hf_rdpmt_createreq_cookie = -1;
-static int hf_rdpmt_createresp_hrResponse = -1;
-
-static int ett_rdpmt = -1;
-static int ett_rdpudp_subheaders = -1;
-static int ett_rdpmt_create_req = -1;
-static int ett_rdpmt_create_resp = -1;
-static int ett_rdpmt_data = -1;
+static int proto_rdpmt;
+
+static int hf_rdpmt_action;
+static int hf_rdpmt_flags;
+static int hf_rdpmt_payload_len;
+static int hf_rdpmt_header_len;
+static int hf_rdpmt_subheader_len;
+static int hf_rdpmt_subheader_type;
+static int hf_rdpmt_createreq_reqId;
+static int hf_rdpmt_createreq_reserved;
+static int hf_rdpmt_createreq_cookie;
+static int hf_rdpmt_createresp_hrResponse;
+
+static int ett_rdpmt;
+static int ett_rdpudp_subheaders;
+static int ett_rdpmt_create_req;
+static int ett_rdpmt_create_resp;
+static int ett_rdpmt_data;
 
 static dissector_handle_t drdynvcDissector;
 
diff --git a/epan/dissectors/packet-rdp_rail.c b/epan/dissectors/packet-rdp_rail.c
index eccd5fb387..361771cb1e 100644
--- a/epan/dissectors/packet-rdp_rail.c
+++ b/epan/dissectors/packet-rdp_rail.c
@@ -31,65 +31,65 @@ void proto_register_rdp_rail(void);
 void proto_reg_handoff_rdp_rail(void);
 
 
-static int proto_rdp_rail = -1;
-
-static int hf_rail_orderType = -1;
-static int hf_rail_pduLength = -1;
-
-static int hf_rail_caps_handshake_buildNumber = -1;
-
-static int hf_rail_windowId = -1;
-static int hf_rail_windowmove_left = -1;
-static int hf_rail_windowmove_top = -1;
-static int hf_rail_windowmove_right = -1;
-static int hf_rail_windowmove_bottom = -1;
-
-static int hf_rail_notify_iconId = -1;
-static int hf_rail_notify_message = -1;
-
-static int hf_rail_localmovesize_isMoveSizeStart = -1;
-static int hf_rail_localmovesize_moveSizeType = -1;
-static int hf_rail_localmovesize_posX = -1;
-static int hf_rail_localmovesize_posY = -1;
-
-static int hf_rail_minmaxinfo_maxwidth = -1;
-static int hf_rail_minmaxinfo_maxheight = -1;
-static int hf_rail_minmaxinfo_maxPosX = -1;
-static int hf_rail_minmaxinfo_maxPosY = -1;
-static int hf_rail_minmaxinfo_minTrackWidth = -1;
-static int hf_rail_minmaxinfo_minTrackHeight = -1;
-static int hf_rail_minmaxinfo_maxTrackWidth = -1;
-static int hf_rail_minmaxinfo_maxTrackHeight = -1;
-
-static int hf_rail_cloak_cloaked = -1;
-
-static int hf_rail_handshake_flags = -1;
-static int hf_rail_handshake_flags_hidef = -1;
-static int hf_rail_handshake_flags_ex_spi = -1;
-static int hf_rail_handshake_flags_snap = -1;
-static int hf_rail_handshake_flags_textscale = -1;
-static int hf_rail_handshake_flags_caretblink = -1;
-static int hf_rail_handshake_flags_ex_spi2 = -1;
-
-static int hf_rail_cstatus_flags = -1;
-static int hf_rail_cstatus_flags_allowlocalmove = -1;
-static int hf_rail_cstatus_autoreconnect = -1;
-static int hf_rail_cstatus_zorder_sync = -1;
-static int hf_rail_cstatus_resize_margin = -1;
-static int hf_rail_cstatus_hidpi_icons = -1;
-static int hf_rail_cstatus_appbar_remoting = -1;
-static int hf_rail_cstatus_powerdisplay = -1;
-static int hf_rail_cstatus_bidir_cloak = -1;
-static int hf_rail_cstatus_suppress_icon_border = -1;
-
-static int hf_rail_activate_enabled = -1;
-
-static int hf_rail_sysparam_server_params = -1;
-static int hf_rail_sysparam_client_params = -1;
-
-static int ett_rdp_rail = -1;
-static int ett_rdp_rail_handshake_flags = -1;
-static int ett_rdp_rail_clientstatus_flags = -1;
+static int proto_rdp_rail;
+
+static int hf_rail_orderType;
+static int hf_rail_pduLength;
+
+static int hf_rail_caps_handshake_buildNumber;
+
+static int hf_rail_windowId;
+static int hf_rail_windowmove_left;
+static int hf_rail_windowmove_top;
+static int hf_rail_windowmove_right;
+static int hf_rail_windowmove_bottom;
+
+static int hf_rail_notify_iconId;
+static int hf_rail_notify_message;
+
+static int hf_rail_localmovesize_isMoveSizeStart;
+static int hf_rail_localmovesize_moveSizeType;
+static int hf_rail_localmovesize_posX;
+static int hf_rail_localmovesize_posY;
+
+static int hf_rail_minmaxinfo_maxwidth;
+static int hf_rail_minmaxinfo_maxheight;
+static int hf_rail_minmaxinfo_maxPosX;
+static int hf_rail_minmaxinfo_maxPosY;
+static int hf_rail_minmaxinfo_minTrackWidth;
+static int hf_rail_minmaxinfo_minTrackHeight;
+static int hf_rail_minmaxinfo_maxTrackWidth;
+static int hf_rail_minmaxinfo_maxTrackHeight;
+
+static int hf_rail_cloak_cloaked;
+
+static int hf_rail_handshake_flags;
+static int hf_rail_handshake_flags_hidef;
+static int hf_rail_handshake_flags_ex_spi;
+static int hf_rail_handshake_flags_snap;
+static int hf_rail_handshake_flags_textscale;
+static int hf_rail_handshake_flags_caretblink;
+static int hf_rail_handshake_flags_ex_spi2;
+
+static int hf_rail_cstatus_flags;
+static int hf_rail_cstatus_flags_allowlocalmove;
+static int hf_rail_cstatus_autoreconnect;
+static int hf_rail_cstatus_zorder_sync;
+static int hf_rail_cstatus_resize_margin;
+static int hf_rail_cstatus_hidpi_icons;
+static int hf_rail_cstatus_appbar_remoting;
+static int hf_rail_cstatus_powerdisplay;
+static int hf_rail_cstatus_bidir_cloak;
+static int hf_rail_cstatus_suppress_icon_border;
+
+static int hf_rail_activate_enabled;
+
+static int hf_rail_sysparam_server_params;
+static int hf_rail_sysparam_client_params;
+
+static int ett_rdp_rail;
+static int ett_rdp_rail_handshake_flags;
+static int ett_rdp_rail_clientstatus_flags;
 
 enum {
 	TS_RAIL_ORDER_EXEC = 0x01,
diff --git a/epan/dissectors/packet-rdp_snd.c b/epan/dissectors/packet-rdp_snd.c
index 1201cedf9e..677dcc7c07 100644
--- a/epan/dissectors/packet-rdp_snd.c
+++ b/epan/dissectors/packet-rdp_snd.c
@@ -31,13 +31,13 @@ void proto_register_rdp_snd(void);
 void proto_reg_handoff_rdp_snd(void);
 
 
-static int proto_rdp_snd = -1;
+static int proto_rdp_snd;
 
-static int hf_snd_msgType = -1;
-static int hf_snd_bPad = -1;
-static int hf_snd_bodySize = -1;
+static int hf_snd_msgType;
+static int hf_snd_bPad;
+static int hf_snd_bodySize;
 
-static int ett_rdp_snd = -1;
+static int ett_rdp_snd;
 
 
 enum {
diff --git a/epan/dissectors/packet-rdpudp.c b/epan/dissectors/packet-rdpudp.c
index 1b2c4bb083..b3a97a4c2e 100644
--- a/epan/dissectors/packet-rdpudp.c
+++ b/epan/dissectors/packet-rdpudp.c
@@ -28,61 +28,61 @@ void proto_register_rdpudp(void);
 void proto_reg_handoff_rdpudp(void);
 
 static dissector_handle_t rdpudp_handle;
-int proto_rdpudp = -1;
-
-static int ett_rdpudp = -1;
-static int ett_rdpudp_flags = -1;
-static int ett_rdpudp_synex = -1;
-static int ett_rdpudp_ack = -1;
-static int ett_rdpudp_fec = -1;
-static int ett_rdpudp_data = -1;
-static int ett_rdpudp2_packetType = -1;
-static int ett_rdpudp2_flags = -1;
-static int ett_rdpudp2_ack = -1;
-static int ett_rdpudp2_overhead = -1;
-static int ett_rdpudp2_delayack = -1;
-static int ett_rdpudp2_aoa = -1;
-static int ett_rdpudp2_data = -1;
-static int ett_rdpudp2_ackvec = -1;
-static int ett_rdpudp2_ackvec_vecs = -1;
-static int ett_rdpudp2_ackvec_vec = -1;
-
-
-static int hf_rdpudp_snSourceAck = -1;
-static int hf_rdpudp_ReceiveWindowSize = -1;
-static int hf_rdpudp_flags = -1;
-static int hf_rdpudp_flag_syn = -1;
-static int hf_rdpudp_flag_fin = -1;
-static int hf_rdpudp_flag_ack = -1;
-static int hf_rdpudp_flag_data = -1;
-static int hf_rdpudp_flag_fec = -1;
-static int hf_rdpudp_flag_cn = -1;
-static int hf_rdpudp_flag_cwr = -1;
-static int hf_rdpudp_flag_aoa = -1;
-static int hf_rdpudp_flag_synlossy = -1;
-static int hf_rdpudp_flag_ackdelayed = -1;
-static int hf_rdpudp_flag_correlationId = -1;
-static int hf_rdpudp_flag_synex = -1;
-static int hf_rdpudp_snInitialSequenceNumber = -1;
-static int hf_rdpudp_upstreamMtu = -1;
-static int hf_rdpudp_downstreamMtu = -1;
-static int hf_rdpudp_correlationId = -1;
-static int hf_rdpudp_synex_flags = -1;
-static int hf_rdpudp_synex_flag_version = -1;
-static int hf_rdpudp_synex_version = -1;
-static int hf_rdpudp_synex_cookiehash = -1;
-static int hf_rdpudp_ack_vectorsize = -1;
-static int hf_rdpudp_ack_item = -1;
-static int hf_rdpudp_ack_item_state = -1;
-static int hf_rdpudp_ack_item_rle = -1;
-static int hf_rdpudp_fec_coded = -1;
-static int hf_rdpudp_fec_sourcestart = -1;
-static int hf_rdpudp_fec_range = -1;
-static int hf_rdpudp_fec_fecindex = -1;
-static int hf_rdpudp_resetseqenum = -1;
-static int hf_rdpudp_source_sncoded = -1;
-static int hf_rdpudp_source_snSourceStart = -1;
-static int hf_rdpudp_data = -1;
+int proto_rdpudp;
+
+static int ett_rdpudp;
+static int ett_rdpudp_flags;
+static int ett_rdpudp_synex;
+static int ett_rdpudp_ack;
+static int ett_rdpudp_fec;
+static int ett_rdpudp_data;
+static int ett_rdpudp2_packetType;
+static int ett_rdpudp2_flags;
+static int ett_rdpudp2_ack;
+static int ett_rdpudp2_overhead;
+static int ett_rdpudp2_delayack;
+static int ett_rdpudp2_aoa;
+static int ett_rdpudp2_data;
+static int ett_rdpudp2_ackvec;
+static int ett_rdpudp2_ackvec_vecs;
+static int ett_rdpudp2_ackvec_vec;
+
+
+static int hf_rdpudp_snSourceAck;
+static int hf_rdpudp_ReceiveWindowSize;
+static int hf_rdpudp_flags;
+static int hf_rdpudp_flag_syn;
+static int hf_rdpudp_flag_fin;
+static int hf_rdpudp_flag_ack;
+static int hf_rdpudp_flag_data;
+static int hf_rdpudp_flag_fec;
+static int hf_rdpudp_flag_cn;
+static int hf_rdpudp_flag_cwr;
+static int hf_rdpudp_flag_aoa;
+static int hf_rdpudp_flag_synlossy;
+static int hf_rdpudp_flag_ackdelayed;
+static int hf_rdpudp_flag_correlationId;
+static int hf_rdpudp_flag_synex;
+static int hf_rdpudp_snInitialSequenceNumber;
+static int hf_rdpudp_upstreamMtu;
+static int hf_rdpudp_downstreamMtu;
+static int hf_rdpudp_correlationId;
+static int hf_rdpudp_synex_flags;
+static int hf_rdpudp_synex_flag_version;
+static int hf_rdpudp_synex_version;
+static int hf_rdpudp_synex_cookiehash;
+static int hf_rdpudp_ack_vectorsize;
+static int hf_rdpudp_ack_item;
+static int hf_rdpudp_ack_item_state;
+static int hf_rdpudp_ack_item_rle;
+static int hf_rdpudp_fec_coded;
+static int hf_rdpudp_fec_sourcestart;
+static int hf_rdpudp_fec_range;
+static int hf_rdpudp_fec_fecindex;
+static int hf_rdpudp_resetseqenum;
+static int hf_rdpudp_source_sncoded;
+static int hf_rdpudp_source_snSourceStart;
+static int hf_rdpudp_data;
 
 static int * const rdpudp_flags[] = {
 		&hf_rdpudp_flag_syn,
@@ -100,42 +100,42 @@ static int * const rdpudp_flags[] = {
 		NULL
 };
 
-static int hf_rdpudp2_PacketPrefixByte = -1;
-static int hf_rdpudp2_packetType = -1;
-static int hf_rdpudp2_shortPacketLength = -1;
-static int hf_rdpudp2_flags = -1;
-static int hf_rdpudp2_flag_ack = -1;
-static int hf_rdpudp2_flag_data = -1;
-static int hf_rdpudp2_flag_ackvec = -1;
-static int hf_rdpudp2_flag_aoa = -1;
-static int hf_rdpudp2_flag_overhead = -1;
-static int hf_rdpudp2_flag_delayackinfo = -1;
-static int hf_rdpudp2_logWindow = -1;
-static int hf_rdpudp2_AckSeq = -1;
-static int hf_rdpudp2_AckTs = -1;
-static int hf_rdpudp2_AckSendTimeGap = -1;
-static int hf_rdpudp2_ndelayedAcks = -1;
-static int hf_rdpudp2_delayedTimeScale = -1;
-static int hf_rdpudp2_delayedAcks = -1;
-static int hf_rdpudp2_delayedAck = -1;
-static int hf_rdpudp2_OverHeadSize = -1;
-static int hf_rdpudp2_DelayAckMax = -1;
-static int hf_rdpudp2_DelayAckTimeout = -1;
-static int hf_rdpudp2_AckOfAcksSeqNum = -1;
-static int hf_rdpudp2_DataSeqNumber = -1;
-static int hf_rdpudp2_DataFullSeqNumber = -1;
-static int hf_rdpudp2_DataChannelSeqNumber = -1;
-static int hf_rdpudp2_DataChannelFullSeqNumber = -1;
-static int hf_rdpudp2_Data = -1;
-static int hf_rdpudp2_AckvecBaseSeq = -1;
-static int hf_rdpudp2_AckvecCodecAckVecSize = -1;
-static int hf_rdpudp2_AckvecHaveTs = -1;
-static int hf_rdpudp2_AckvecTimeStamp = -1;
-static int hf_rdpudp2_SendAckTimeGapInMs = -1;
-static int hf_rdpudp2_AckvecCodedAck = -1;
-static int hf_rdpudp2_AckvecCodedAckMode = -1;
-static int hf_rdpudp2_AckvecCodedAckRleState = -1;
-static int hf_rdpudp2_AckvecCodedAckRleLen = -1;
+static int hf_rdpudp2_PacketPrefixByte;
+static int hf_rdpudp2_packetType;
+static int hf_rdpudp2_shortPacketLength;
+static int hf_rdpudp2_flags;
+static int hf_rdpudp2_flag_ack;
+static int hf_rdpudp2_flag_data;
+static int hf_rdpudp2_flag_ackvec;
+static int hf_rdpudp2_flag_aoa;
+static int hf_rdpudp2_flag_overhead;
+static int hf_rdpudp2_flag_delayackinfo;
+static int hf_rdpudp2_logWindow;
+static int hf_rdpudp2_AckSeq;
+static int hf_rdpudp2_AckTs;
+static int hf_rdpudp2_AckSendTimeGap;
+static int hf_rdpudp2_ndelayedAcks;
+static int hf_rdpudp2_delayedTimeScale;
+static int hf_rdpudp2_delayedAcks;
+static int hf_rdpudp2_delayedAck;
+static int hf_rdpudp2_OverHeadSize;
+static int hf_rdpudp2_DelayAckMax;
+static int hf_rdpudp2_DelayAckTimeout;
+static int hf_rdpudp2_AckOfAcksSeqNum;
+static int hf_rdpudp2_DataSeqNumber;
+static int hf_rdpudp2_DataFullSeqNumber;
+static int hf_rdpudp2_DataChannelSeqNumber;
+static int hf_rdpudp2_DataChannelFullSeqNumber;
+static int hf_rdpudp2_Data;
+static int hf_rdpudp2_AckvecBaseSeq;
+static int hf_rdpudp2_AckvecCodecAckVecSize;
+static int hf_rdpudp2_AckvecHaveTs;
+static int hf_rdpudp2_AckvecTimeStamp;
+static int hf_rdpudp2_SendAckTimeGapInMs;
+static int hf_rdpudp2_AckvecCodedAck;
+static int hf_rdpudp2_AckvecCodedAckMode;
+static int hf_rdpudp2_AckvecCodedAckRleState;
+static int hf_rdpudp2_AckvecCodedAckRleLen;
 
 static int * const rdpudp2_flags[] = {
 	&hf_rdpudp2_flag_ack,
diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c
index 06be6a25aa..6bd52114e3 100644
--- a/epan/dissectors/packet-rdt.c
+++ b/epan/dissectors/packet-rdt.c
@@ -29,127 +29,127 @@
 
 static dissector_handle_t rdt_handle;
 
-static gint    proto_rdt                        = -1;
+static gint    proto_rdt;
 
 /* Packet fields */
-static gint    hf_rdt_packet                    = -1;
+static gint    hf_rdt_packet;
 
 /* flags1: shared */
-static gint    hf_rdt_len_included              = -1;
+static gint    hf_rdt_len_included;
 
 /* flags1: data packet */
-static gint    hf_rdt_data_flags1               = -1;
-static gint    hf_rdt_data_need_reliable        = -1;
-static gint    hf_rdt_data_stream_id            = -1;
-static gint    hf_rdt_data_is_reliable          = -1;
+static gint    hf_rdt_data_flags1;
+static gint    hf_rdt_data_need_reliable;
+static gint    hf_rdt_data_stream_id;
+static gint    hf_rdt_data_is_reliable;
 
 /* flags2: data packet */
-static gint    hf_rdt_data_flags2               = -1;
-static gint    hf_rdt_data_backtoback           = -1;
-static gint    hf_rdt_data_slowdata             = -1;
-static gint    hf_rdt_data_asmrule              = -1;
+static gint    hf_rdt_data_flags2;
+static gint    hf_rdt_data_backtoback;
+static gint    hf_rdt_data_slowdata;
+static gint    hf_rdt_data_asmrule;
 
 /* flags1: asm action packet */
-static gint    hf_rdt_aact_flags                = -1;
-static gint    hf_rdt_aact_stream_id            = -1;
+static gint    hf_rdt_aact_flags;
+static gint    hf_rdt_aact_stream_id;
 
 /* flags1: ack packet */
-static gint    hf_rdt_ack_flags                 = -1;
-static gint    hf_rdt_ack_lost_high             = -1;
+static gint    hf_rdt_ack_flags;
+static gint    hf_rdt_ack_lost_high;
 
 /* flags1: latency report packet */
-static gint    hf_rdt_latency_report_flags      = -1;
+static gint    hf_rdt_latency_report_flags;
 
 /* flags1: bandwidth report packet */
-static gint    hf_rdt_bandwidth_report_flags    = -1;
+static gint    hf_rdt_bandwidth_report_flags;
 
 /* flags1: stream end packet */
-static gint    hf_rdt_stre_flags                = -1;
-static gint    hf_rdt_stre_need_reliable        = -1;
-static gint    hf_rdt_stre_stream_id            = -1;
-static gint    hf_rdt_stre_packet_sent          = -1;
-static gint    hf_rdt_stre_ext_flag             = -1;
-
-/* static gint    hf_rdt_rtt_request_flags         = -1; */
-/* static gint    hf_rdt_rtt_response_flags        = -1; */
-/* static gint    hf_rdt_congestion_flags          = -1; */
-static gint    hf_rdt_report_flags              = -1;
-/* static gint    hf_rdt_tirq_flags                = -1; */
-static gint    hf_rdt_tirp_flags                = -1;
-static gint    hf_rdt_bw_probing_flags          = -1;
+static gint    hf_rdt_stre_flags;
+static gint    hf_rdt_stre_need_reliable;
+static gint    hf_rdt_stre_stream_id;
+static gint    hf_rdt_stre_packet_sent;
+static gint    hf_rdt_stre_ext_flag;
+
+/* static gint    hf_rdt_rtt_request_flags; */
+/* static gint    hf_rdt_rtt_response_flags; */
+/* static gint    hf_rdt_congestion_flags; */
+static gint    hf_rdt_report_flags;
+/* static gint    hf_rdt_tirq_flags; */
+static gint    hf_rdt_tirp_flags;
+static gint    hf_rdt_bw_probing_flags;
 
 /* Octets 1-2: sequence number or packet type */
-static gint    hf_rdt_sequence_number           = -1;
-static gint    hf_rdt_packet_type               = -1;
+static gint    hf_rdt_sequence_number;
+static gint    hf_rdt_packet_type;
 
 /* Only present if length_included */
-static gint    hf_rdt_packet_length             = -1;
+static gint    hf_rdt_packet_length;
 
 /* General shared fields */
-static gint    hf_rdt_timestamp                 = -1;
-static gint    hf_rdt_stream_id_ex              = -1;
-static gint    hf_rdt_asmrule_ex                = -1;
-static gint    hf_rdt_total_reliable            = -1;
-static gint    hf_rdt_data                      = -1;
+static gint    hf_rdt_timestamp;
+static gint    hf_rdt_stream_id_ex;
+static gint    hf_rdt_asmrule_ex;
+static gint    hf_rdt_total_reliable;
+static gint    hf_rdt_data;
 
 /* Special use fields */
-static gint    hf_rdt_aact_reliable_seqno       = -1;
-static gint    hf_rdt_brpt_interval             = -1;
-static gint    hf_rdt_brpt_bandwidth            = -1;
-static gint    hf_rdt_brpt_sequence             = -1;
-static gint    hf_rdt_rtrp_ts_sec               = -1;
-static gint    hf_rdt_rtrp_ts_usec              = -1;
-static gint    hf_rdt_cong_xmit_mult            = -1;
-static gint    hf_rdt_cong_recv_mult            = -1;
-static gint    hf_rdt_stre_seqno                = -1;
-static gint    hf_rdt_stre_dummy_flags1         = -1;
-static gint    hf_rdt_stre_dummy_type           = -1;
-static gint    hf_rdt_stre_reason_code          = -1;
-static gint    hf_rdt_lrpt_server_out_time      = -1;
-static gint    hf_rdt_tirq_request_rtt_info     = -1;
-static gint    hf_rdt_tirq_request_buffer_info  = -1;
-static gint    hf_rdt_tirq_request_time_msec    = -1;
-static gint    hf_rdt_tirp_has_rtt_info         = -1;
-static gint    hf_rdt_tirp_is_delayed           = -1;
-static gint    hf_rdt_tirp_has_buffer_info      = -1;
-static gint    hf_rdt_tirp_request_time_msec    = -1;
-static gint    hf_rdt_tirp_response_time_msec   = -1;
-static gint    hf_rdt_tirp_buffer_info          = -1;
-static gint    hf_rdt_tirp_buffer_info_count    = -1;
-static gint    hf_rdt_tirp_buffer_info_stream_id         = -1;
-static gint    hf_rdt_tirp_buffer_info_lowest_timestamp  = -1;
-static gint    hf_rdt_tirp_buffer_info_highest_timestamp = -1;
-static gint    hf_rdt_tirp_buffer_info_bytes_buffered    = -1;
-static gint    hf_rdt_bwpp_seqno                = -1;
-static gint    hf_rdt_unk_flags1                = -1;
+static gint    hf_rdt_aact_reliable_seqno;
+static gint    hf_rdt_brpt_interval;
+static gint    hf_rdt_brpt_bandwidth;
+static gint    hf_rdt_brpt_sequence;
+static gint    hf_rdt_rtrp_ts_sec;
+static gint    hf_rdt_rtrp_ts_usec;
+static gint    hf_rdt_cong_xmit_mult;
+static gint    hf_rdt_cong_recv_mult;
+static gint    hf_rdt_stre_seqno;
+static gint    hf_rdt_stre_dummy_flags1;
+static gint    hf_rdt_stre_dummy_type;
+static gint    hf_rdt_stre_reason_code;
+static gint    hf_rdt_lrpt_server_out_time;
+static gint    hf_rdt_tirq_request_rtt_info;
+static gint    hf_rdt_tirq_request_buffer_info;
+static gint    hf_rdt_tirq_request_time_msec;
+static gint    hf_rdt_tirp_has_rtt_info;
+static gint    hf_rdt_tirp_is_delayed;
+static gint    hf_rdt_tirp_has_buffer_info;
+static gint    hf_rdt_tirp_request_time_msec;
+static gint    hf_rdt_tirp_response_time_msec;
+static gint    hf_rdt_tirp_buffer_info;
+static gint    hf_rdt_tirp_buffer_info_count;
+static gint    hf_rdt_tirp_buffer_info_stream_id;
+static gint    hf_rdt_tirp_buffer_info_lowest_timestamp;
+static gint    hf_rdt_tirp_buffer_info_highest_timestamp;
+static gint    hf_rdt_tirp_buffer_info_bytes_buffered;
+static gint    hf_rdt_bwpp_seqno;
+static gint    hf_rdt_unk_flags1;
 
 /* RDT setup fields */
-static gint    hf_rdt_setup                     = -1;
-static gint    hf_rdt_setup_frame               = -1;
-static gint    hf_rdt_setup_method              = -1;
-static gint    hf_rdt_feature_level             = -1;
+static gint    hf_rdt_setup;
+static gint    hf_rdt_setup_frame;
+static gint    hf_rdt_setup_method;
+static gint    hf_rdt_feature_level;
 
 /* RDT fields defining a sub tree */
-static gint    ett_rdt                          = -1;
-static gint    ett_rdt_packet                   = -1;
-static gint    ett_rdt_setup                    = -1;
-static gint    ett_rdt_data_flags1              = -1;
-static gint    ett_rdt_data_flags2              = -1;
-static gint    ett_rdt_aact_flags               = -1;
-static gint    ett_rdt_ack_flags                = -1;
-static gint    ett_rdt_latency_report_flags     = -1;
-static gint    ett_rdt_bandwidth_report_flags   = -1;
-static gint    ett_rdt_stre_flags               = -1;
-static gint    ett_rdt_rtt_request_flags        = -1;
-static gint    ett_rdt_rtt_response_flags       = -1;
-static gint    ett_rdt_congestion_flags         = -1;
-static gint    ett_rdt_report_flags             = -1;
-static gint    ett_rdt_tirq_flags               = -1;
-static gint    ett_rdt_tirp_flags               = -1;
-static gint    ett_rdt_tirp_buffer_info         = -1;
-static gint    ett_rdt_bw_probing_flags         = -1;
-
-static expert_field ei_rdt_packet_length = EI_INIT;
+static gint    ett_rdt;
+static gint    ett_rdt_packet;
+static gint    ett_rdt_setup;
+static gint    ett_rdt_data_flags1;
+static gint    ett_rdt_data_flags2;
+static gint    ett_rdt_aact_flags;
+static gint    ett_rdt_ack_flags;
+static gint    ett_rdt_latency_report_flags;
+static gint    ett_rdt_bandwidth_report_flags;
+static gint    ett_rdt_stre_flags;
+static gint    ett_rdt_rtt_request_flags;
+static gint    ett_rdt_rtt_response_flags;
+static gint    ett_rdt_congestion_flags;
+static gint    ett_rdt_report_flags;
+static gint    ett_rdt_tirq_flags;
+static gint    ett_rdt_tirp_flags;
+static gint    ett_rdt_tirp_buffer_info;
+static gint    ett_rdt_bw_probing_flags;
+
+static expert_field ei_rdt_packet_length;
 
 #define RDT_UDP_PORT        6970
 
diff --git a/epan/dissectors/packet-realtek.c b/epan/dissectors/packet-realtek.c
index f834d3dac2..b455b684af 100644
--- a/epan/dissectors/packet-realtek.c
+++ b/epan/dissectors/packet-realtek.c
@@ -77,34 +77,34 @@ static const value_string rrcp_opcode_names[] = {
 
 static dissector_handle_t realtek_handle;
 
-static int proto_realtek = -1;
-
-static int hf_realtek_packet = -1;
-
-static int proto_rrcp = -1;
-
-static int hf_rrcp_protocol = -1;
-static int hf_rrcp_reply = -1;
-static int hf_rrcp_opcode = -1;
-static int hf_rrcp_authkey = -1;
-static int hf_rrcp_regaddr = -1;
-static int hf_rrcp_regdata = -1;
-static int hf_rrcp_hello_reply_dl_port = -1;
-static int hf_rrcp_hello_reply_ul_port = -1;
-static int hf_rrcp_hello_reply_ul_mac = -1;
-static int hf_rrcp_hello_reply_chip_id = -1;
-static int hf_rrcp_hello_reply_vendor_id = -1;
-
-static int proto_rep = -1;
-static int hf_rep_protocol = -1;
-
-static int proto_rldp = -1;
-static int hf_rldp_protocol = -1;
-
-static int ett_realtek = -1;
-static int ett_rrcp = -1;
-static int ett_rep = -1;
-static int ett_rldp = -1;
+static int proto_realtek;
+
+static int hf_realtek_packet;
+
+static int proto_rrcp;
+
+static int hf_rrcp_protocol;
+static int hf_rrcp_reply;
+static int hf_rrcp_opcode;
+static int hf_rrcp_authkey;
+static int hf_rrcp_regaddr;
+static int hf_rrcp_regdata;
+static int hf_rrcp_hello_reply_dl_port;
+static int hf_rrcp_hello_reply_ul_port;
+static int hf_rrcp_hello_reply_ul_mac;
+static int hf_rrcp_hello_reply_chip_id;
+static int hf_rrcp_hello_reply_vendor_id;
+
+static int proto_rep;
+static int hf_rep_protocol;
+
+static int proto_rldp;
+static int hf_rldp_protocol;
+
+static int ett_realtek;
+static int ett_rrcp;
+static int ett_rep;
+static int ett_rldp;
 
 static heur_dissector_list_t realtek_heur_subdissector_list;
 
diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c
index e387f1b0f1..1df0c5c744 100644
--- a/epan/dissectors/packet-redback.c
+++ b/epan/dissectors/packet-redback.c
@@ -20,7 +20,7 @@ void proto_reg_handoff_redback(void);
 
 static dissector_handle_t redback_handle;
 
-static gint ett_redback = -1;
+static gint ett_redback;
 
 static dissector_table_t osinl_incl_subdissector_table;
 static dissector_table_t osinl_excl_subdissector_table;
@@ -33,19 +33,19 @@ static dissector_handle_t arp_handle;
 static dissector_handle_t ppp_handle;
 static dissector_handle_t ppphdlc_handle;
 
-static int proto_redback = -1;
+static int proto_redback;
 
-static int hf_redback_circuit = -1;
-static int hf_redback_context = -1;
-static int hf_redback_dataoffset = -1;
-static int hf_redback_flags = -1;
-static int hf_redback_l3offset = -1;
-static int hf_redback_length = -1;
-static int hf_redback_padding = -1;
-static int hf_redback_protocol = -1;
-static int hf_redback_unknown = -1;
+static int hf_redback_circuit;
+static int hf_redback_context;
+static int hf_redback_dataoffset;
+static int hf_redback_flags;
+static int hf_redback_l3offset;
+static int hf_redback_length;
+static int hf_redback_padding;
+static int hf_redback_protocol;
+static int hf_redback_unknown;
 
-static expert_field ei_redback_protocol = EI_INIT;
+static expert_field ei_redback_protocol;
 
 static int
 dissect_redback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c
index 372a178ab1..12c58a1d5a 100644
--- a/epan/dissectors/packet-redbackli.c
+++ b/epan/dissectors/packet-redbackli.c
@@ -18,20 +18,20 @@
 void proto_register_redbackli(void);
 void proto_reg_handoff_redbackli(void);
 
-static int proto_redbackli = -1;
-
-static int hf_redbackli_avptype = -1;
-static int hf_redbackli_avplen = -1;
-static int hf_redbackli_seqno = -1;		/* Sequence No */
-static int hf_redbackli_liid = -1;		/* LI Id */
-static int hf_redbackli_sessid = -1;		/* Session Id */
-static int hf_redbackli_label = -1;		/* Label */
-static int hf_redbackli_acctid = -1;		/* Accounting Session Id */
-static int hf_redbackli_dir = -1;		/* Direction */
-static int hf_redbackli_eohpad = -1;		/* End Of Header Padding */
-static int hf_redbackli_unknownavp = -1;	/* Unknown AVP */
-
-static int ett_redbackli = -1;
+static int proto_redbackli;
+
+static int hf_redbackli_avptype;
+static int hf_redbackli_avplen;
+static int hf_redbackli_seqno;		/* Sequence No */
+static int hf_redbackli_liid;		/* LI Id */
+static int hf_redbackli_sessid;		/* Session Id */
+static int hf_redbackli_label;		/* Label */
+static int hf_redbackli_acctid;		/* Accounting Session Id */
+static int hf_redbackli_dir;		/* Direction */
+static int hf_redbackli_eohpad;		/* End Of Header Padding */
+static int hf_redbackli_unknownavp;	/* Unknown AVP */
+
+static int ett_redbackli;
 
 static dissector_handle_t ip_handle;
 static dissector_handle_t redbackli_handle;
diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c
index eac1744c31..b49116722d 100644
--- a/epan/dissectors/packet-reload-framing.c
+++ b/epan/dissectors/packet-reload-framing.c
@@ -27,20 +27,20 @@ void proto_register_reload_framing(void);
 void proto_reg_handoff_reload_framing(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_reload_framing = -1;
-
-static int hf_reload_framing_type = -1;
-static int hf_reload_framing_sequence = -1;
-static int hf_reload_framing_ack_sequence = -1;
-static int hf_reload_framing_message = -1;
-static int hf_reload_framing_message_length = -1;
-static int hf_reload_framing_message_data = -1;
-static int hf_reload_framing_received = -1;
-static int hf_reload_framing_parsed_received = -1;
-static int hf_reload_framing_duplicate = -1;
-static int hf_reload_framing_response_in = -1;
-static int hf_reload_framing_response_to = -1;
-static int hf_reload_framing_time = -1;
+static int proto_reload_framing;
+
+static int hf_reload_framing_type;
+static int hf_reload_framing_sequence;
+static int hf_reload_framing_ack_sequence;
+static int hf_reload_framing_message;
+static int hf_reload_framing_message_length;
+static int hf_reload_framing_message_data;
+static int hf_reload_framing_received;
+static int hf_reload_framing_parsed_received;
+static int hf_reload_framing_duplicate;
+static int hf_reload_framing_response_in;
+static int hf_reload_framing_response_to;
+static int hf_reload_framing_time;
 
 static dissector_handle_t reload_handle;
 static dissector_handle_t reload_framing_tcp_handle;
@@ -67,11 +67,11 @@ typedef struct _reload_frame_conv_info_t {
 
 
 /* Initialize the subtree pointers */
-static gint ett_reload_framing = -1;
-static gint ett_reload_framing_message = -1;
-static gint ett_reload_framing_received = -1;
+static gint ett_reload_framing;
+static gint ett_reload_framing_message;
+static gint ett_reload_framing_received;
 
-static expert_field ei_reload_no_dissector = EI_INIT;
+static expert_field ei_reload_no_dissector;
 
 #define UDP_PORT_RELOAD                 6084
 #define TCP_PORT_RELOAD                 6084
diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c
index 1579ca26f8..c5a9be16bc 100644
--- a/epan/dissectors/packet-reload.c
+++ b/epan/dissectors/packet-reload.c
@@ -34,283 +34,283 @@ void proto_register_reload(void);
 void proto_reg_handoff_reload(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_reload = -1;
-
-
-static int hf_reload_response_in = -1;
-static int hf_reload_response_to = -1;
-static int hf_reload_time = -1;
-static int hf_reload_duplicate = -1;
-static int hf_reload_token = -1;
-static int hf_reload_forwarding = -1;
-static int hf_reload_overlay = -1;
-static int hf_reload_configuration_sequence = -1;
-static int hf_reload_version = -1;
-static int hf_reload_ttl = -1;
-static int hf_reload_fragment_flag = -1;
-static int hf_reload_fragment_fragmented = -1;
-static int hf_reload_fragment_last_fragment = -1;
-static int hf_reload_fragment_reserved = -1;
-static int hf_reload_fragment_offset = -1;
-static int hf_reload_trans_id = -1;
-static int hf_reload_max_response_length = -1;
-static int hf_reload_via_list_length = -1;
-static int hf_reload_destination_list_length = -1;
-static int hf_reload_options_length = -1;
-static int hf_reload_via_list = -1;
-static int hf_reload_destination = -1;
-static int hf_reload_destination_compressed_id = -1;
-static int hf_reload_destination_type = -1;
-static int hf_reload_nodeid = -1;
-static int hf_reload_resourceid = -1;
-static int hf_reload_value = -1;
-static int hf_reload_destination_data_node_id = -1;
-static int hf_reload_destination_data_resource_id = -1;
-static int hf_reload_destination_data_compressed_id = -1;
-static int hf_reload_destination_list = -1;
-static int hf_reload_forwarding_options = -1;
-static int hf_reload_forwarding_option = -1;
-static int hf_reload_forwarding_option_type = -1;
-static int hf_reload_forwarding_option_flags = -1;
-static int hf_reload_forwarding_option_flag_response_copy = -1;
-static int hf_reload_forwarding_option_flag_destination_critical = -1;
-static int hf_reload_forwarding_option_flag_forward_critical = -1;
-static int hf_reload_forwarding_option_flag_ignore_state_keeping = -1;
-static int hf_reload_attachreqans = -1;
-static int hf_reload_ufrag = -1;
-static int hf_reload_password = -1;
-static int hf_reload_role = -1;
-static int hf_reload_sendupdate = -1;
-static int hf_reload_icecandidates = -1;
-static int hf_reload_icecandidate = -1;
-static int hf_reload_icecandidate_addr_port = -1;
-static int hf_reload_icecandidate_relay_addr = -1;
-static int hf_reload_icecandidate_foundation = -1;
-static int hf_reload_icecandidate_priority = -1;
-static int hf_reload_icecandidate_type = -1;
-static int hf_reload_overlaylink_type = -1;
-static int hf_reload_iceextension = -1;
-static int hf_reload_iceextensions = -1;
-static int hf_reload_iceextension_name = -1;
-static int hf_reload_iceextension_value = -1;
-static int hf_reload_ipaddressport = -1;
-static int hf_reload_ipaddressport_type = -1;
-static int hf_reload_ipv4addrport = -1;
-static int hf_reload_ipv4addr = -1;
-static int hf_reload_port = -1;
-static int hf_reload_ipv6addrport = -1;
-static int hf_reload_ipv6addr = -1;
-static int hf_reload_message_contents = -1;
-static int hf_reload_message_code = -1;
-static int hf_reload_message_body = -1;
-static int hf_reload_message_extensions = -1;
-static int hf_reload_message_extension = -1;
-static int hf_reload_message_extension_type = -1;
-static int hf_reload_message_extension_critical = -1;
-static int hf_reload_message_extension_content = -1;
-static int hf_reload_error_response = -1;
-static int hf_reload_error_response_code = -1;
-static int hf_reload_error_response_info = -1;
-static int hf_reload_security_block = -1;
-static int hf_reload_certificates = -1;
-static int hf_reload_genericcertificate = -1;
-static int hf_reload_certificate_type = -1;
-static int hf_reload_certificate = -1;
-static int hf_reload_signature = -1;
-static int hf_reload_signatureandhashalgorithm = -1;
-static int hf_reload_hash_algorithm = -1;
-static int hf_reload_signature_algorithm = -1;
-static int hf_reload_signeridentity = -1;
-static int hf_reload_signeridentity_type = -1;
-static int hf_reload_signeridentity_identity = -1;
-static int hf_reload_signeridentity_value = -1;
-static int hf_reload_signeridentity_value_hash_alg = -1;
-static int hf_reload_signeridentity_value_certificate_hash = -1;
-static int hf_reload_signeridentity_value_certificate_node_id_hash = -1;
-static int hf_reload_signature_value = -1;
-static int hf_reload_length_uint8 = -1;
-static int hf_reload_length_uint16 = -1;
-static int hf_reload_length_uint24 = -1;
-static int hf_reload_length_uint32 = -1;
-static int hf_reload_opaque = -1;
-static int hf_reload_opaque_data = -1;
-static int hf_reload_opaque_string = -1;
-static int hf_reload_routequeryreq = -1;
-static int hf_reload_routequeryreq_destination = -1;
-static int hf_reload_overlay_specific = -1;
-static int hf_reload_probereq = -1;
-static int hf_reload_probereq_requested_info = -1;
-static int hf_reload_probe_information_type = -1;
-static int hf_reload_probe_information = -1;
-static int hf_reload_probe_information_data = -1;
-static int hf_reload_responsible_set = -1;
-static int hf_reload_num_resources = -1;
-static int hf_reload_uptime = -1;
-static int hf_reload_probeans = -1;
-static int hf_reload_probeans_probe_info = -1;
-static int hf_reload_appattachreq = -1;
-static int hf_reload_appattachans = -1;
-static int hf_reload_application = -1;
-static int hf_reload_pingreq = -1;
-static int hf_reload_pingans = -1;
-static int hf_reload_ping_response_id = -1;
-static int hf_reload_ping_time = -1;
-static int hf_reload_storeddata = -1;
-static int hf_reload_storedmetadata = -1;
-static int hf_reload_storeddata_storage_time =  -1;
-static int hf_reload_storeddata_lifetime = -1;
-static int hf_reload_datavalue = -1;
-static int hf_reload_metadata = -1;
-static int hf_reload_datavalue_exists = -1;
-static int hf_reload_datavalue_value = -1;
-static int hf_reload_metadata_value_length = -1;
-static int hf_reload_metadata_hash_value = -1;
-static int hf_reload_arrayentry = -1;
-static int hf_reload_arrayentry_value = -1;
-static int hf_reload_arrayentry_index = -1;
-static int hf_reload_dictionaryentry = -1;
-static int hf_reload_dictionarykey = -1;
-static int hf_reload_dictionary_value = -1;
-static int hf_reload_kinddata = -1;
-static int hf_reload_findkinddata_closest = -1;
-static int hf_reload_kinddata_kind = -1;
-static int hf_reload_statkindresponse = -1;
-static int hf_reload_kindid = -1;
-static int hf_reload_kindid_list = -1;
-static int hf_reload_generation_counter = -1;
-static int hf_reload_values = -1;
-static int hf_reload_storereq = -1;
-static int hf_reload_resource = -1;
-static int hf_reload_store_replica_num = -1;
-static int hf_reload_store_kind_data = -1;
-static int hf_reload_storeans = -1;
-static int hf_reload_storeans_kind_responses = -1;
-static int hf_reload_storekindresponse = -1;
-static int hf_reload_replicas = -1;
-static int hf_reload_statreq = -1;
-static int hf_reload_fetchreq = -1;
-static int hf_reload_fetchreq_specifiers = -1;
-static int hf_reload_storeddataspecifier = -1;
-static int hf_reload_storeddataspecifier_indices = -1;
-static int hf_reload_storeddataspecifier_keys = -1;
-static int hf_reload_arrayrange = -1;
-static int hf_reload_fetchans = -1;
-static int hf_reload_statans = -1;
-static int hf_reload_findreq = -1;
-static int hf_reload_findans = -1;
-static int hf_reload_findkinddata = -1;
-static int hf_reload_fragments = -1;
-static int hf_reload_fragment = -1;
-static int hf_reload_fragment_overlap = -1;
-static int hf_reload_fragment_overlap_conflict = -1;
-static int hf_reload_fragment_multiple_tails = -1;
-static int hf_reload_fragment_too_long_fragment = -1;
-static int hf_reload_fragment_error = -1;
-static int hf_reload_fragment_count = -1;
-static int hf_reload_reassembled_in = -1;
-static int hf_reload_reassembled_length = -1;
-static int hf_reload_configupdatereq = -1;
-static int hf_reload_configupdatereq_type = -1;
-static int hf_reload_configupdatereq_configdata = -1;
-static int hf_reload_configupdatereq_kinds = -1;
-static int hf_reload_kinddescription = -1;
-static int hf_reload_chordupdate = -1;
-static int hf_reload_chordupdate_type = -1;
-static int hf_reload_chordupdate_predecessors = -1;
-static int hf_reload_chordupdate_successors = -1;
-static int hf_reload_chordupdate_fingers = -1;
-static int hf_reload_chordroutequeryans = -1;
-static int hf_reload_chordroutequeryans_next_peer = -1;
-static int hf_reload_chordleave = -1;
-static int hf_reload_chordleave_type = -1;
-static int hf_reload_chordleave_predecessors = -1;
-static int hf_reload_chordleave_successors = -1;
-static int hf_reload_turnserver = -1;
-static int hf_reload_turnserver_iteration = -1;
-static int hf_reload_turnserver_server_address = -1;
-static int hf_reload_sipregistration = -1;
-static int hf_reload_sipregistration_type = -1;
-static int hf_reload_sipregistration_data = -1;
-static int hf_reload_sipregistration_data_uri = -1;
-static int hf_reload_sipregistration_data_contact_prefs = -1;
-static int hf_reload_sipregistration_data_destination_list = -1;
-static int hf_reload_padding = -1;
-static int hf_reload_redirserviceproviderdata = -1;
-static int hf_reload_redirserviceproviderdata_serviceprovider = -1;
-static int hf_reload_redirserviceproviderdata_namespace = -1;
-static int hf_reload_redirserviceproviderdata_level = -1;
-static int hf_reload_redirserviceproviderdata_node = -1;
-static int hf_reload_redirserviceprovider = -1;
-static int hf_reload_self_tuning_data = -1;
-static int hf_reload_self_tuning_data_join_rate = -1;
-static int hf_reload_self_tuning_data_leave_rate = -1;
-static int hf_reload_self_tuning_data_network_size = -1;
-static int hf_reload_dmflags = -1;
-static int hf_reload_dmflag_status_info = -1;
-static int hf_reload_dmflag_routing_table_size = -1;
-static int hf_reload_dmflag_process_power = -1;
-static int hf_reload_dmflag_bandwidth = -1;
-static int hf_reload_dmflag_software_version = -1;
-static int hf_reload_dmflag_machine_uptime = -1;
-static int hf_reload_dmflag_app_uptime = -1;
-static int hf_reload_dmflag_memory_footprint = -1;
-static int hf_reload_dmflag_datasize_stored = -1;
-static int hf_reload_dmflag_instances_stored = -1;
-static int hf_reload_dmflag_messages_sent_rcvd = -1;
-static int hf_reload_dmflag_ewma_bytes_sent = -1;
-static int hf_reload_dmflag_ewma_bytes_rcvd = -1;
-static int hf_reload_dmflag_underlay_hop = -1;
-static int hf_reload_dmflag_battery_status = -1;
-static int hf_reload_diagnosticrequest = -1;
-static int hf_reload_diagnosticresponse = -1;
-static int hf_reload_diagnosticextension = -1;
-static int hf_reload_diagnosticextension_type = -1;
-static int hf_reload_diagnosticextension_contents = -1;
-static int hf_reload_diagnostic_expiration = -1;
-static int hf_reload_diagnosticrequest_timestampinitiated = -1;
-static int hf_reload_diagnosticrequest_extensions = -1;
-static int hf_reload_pathtrackreq = -1;
-static int hf_reload_pathtrackreq_destination = -1;
-static int hf_reload_pathtrackreq_request = -1;
-static int hf_reload_diagnosticinfo = -1;
-static int hf_reload_diagnosticinfo_kind = -1;
-static int hf_reload_diagnosticinfo_congestion_status = -1;
-static int hf_reload_diagnosticinfo_number_peers = -1;
-static int hf_reload_diagnosticinfo_processing_power = -1;
-static int hf_reload_diagnosticinfo_bandwidth = -1;
-static int hf_reload_diagnosticinfo_software_version = -1;
-static int hf_reload_diagnosticinfo_machine_uptime = -1;
-static int hf_reload_diagnosticinfo_app_uptime = -1;
-static int hf_reload_diagnosticinfo_memory_footprint = -1;
-static int hf_reload_diagnosticinfo_datasize_stored = -1;
-static int hf_reload_diagnosticinfo_instances_stored = -1;
-static int hf_reload_diagnosticinfo_instancesstored_info = -1;
-static int hf_reload_diagnosticinfo_instancesstored_instances = -1;
-static int hf_reload_diagnosticinfo_messages_sent_rcvd = -1;
-static int hf_reload_diagnosticinfo_messages_sent_rcvd_info = -1;
-static int hf_reload_diagnosticinfo_message_code = -1;
-static int hf_reload_diagnosticinfo_messages_sent = -1;
-static int hf_reload_diagnosticinfo_messages_rcvd = -1;
-static int hf_reload_diagnosticinfo_ewma_bytes_sent = -1;
-static int hf_reload_diagnosticinfo_ewma_bytes_rcvd = -1;
-static int hf_reload_diagnosticinfo_underlay_hops = -1;
-static int hf_reload_diagnosticinfo_battery_status = -1;
-static int hf_reload_diagnosticresponse_timestampreceived = -1;
-static int hf_reload_diagnosticresponse_hopcounter = -1;
-static int hf_reload_diagnosticresponse_diagnostic_info_list = -1;
-static int hf_reload_pathtrackans = -1;
-static int hf_reload_pathtrackans_next_hop = -1;
-static int hf_reload_pathtrackans_response = -1;
-static int hf_reload_extensiveroutingmodeoption = -1;
-static int hf_reload_routemode = -1;
-static int hf_reload_extensiveroutingmode_transport = -1;
-static int hf_reload_extensiveroutingmode_ipaddressport = -1;
-static int hf_reload_extensiveroutingmode_destination = -1;
-static int hf_reload_joinreq = -1;
-static int hf_reload_joinreq_joining_peer_id = -1;
-static int hf_reload_joinans = -1;
-static int hf_reload_leavereq = -1;
-static int hf_reload_leavereq_leaving_peer_id = -1;
+static int proto_reload;
+
+
+static int hf_reload_response_in;
+static int hf_reload_response_to;
+static int hf_reload_time;
+static int hf_reload_duplicate;
+static int hf_reload_token;
+static int hf_reload_forwarding;
+static int hf_reload_overlay;
+static int hf_reload_configuration_sequence;
+static int hf_reload_version;
+static int hf_reload_ttl;
+static int hf_reload_fragment_flag;
+static int hf_reload_fragment_fragmented;
+static int hf_reload_fragment_last_fragment;
+static int hf_reload_fragment_reserved;
+static int hf_reload_fragment_offset;
+static int hf_reload_trans_id;
+static int hf_reload_max_response_length;
+static int hf_reload_via_list_length;
+static int hf_reload_destination_list_length;
+static int hf_reload_options_length;
+static int hf_reload_via_list;
+static int hf_reload_destination;
+static int hf_reload_destination_compressed_id;
+static int hf_reload_destination_type;
+static int hf_reload_nodeid;
+static int hf_reload_resourceid;
+static int hf_reload_value;
+static int hf_reload_destination_data_node_id;
+static int hf_reload_destination_data_resource_id;
+static int hf_reload_destination_data_compressed_id;
+static int hf_reload_destination_list;
+static int hf_reload_forwarding_options;
+static int hf_reload_forwarding_option;
+static int hf_reload_forwarding_option_type;
+static int hf_reload_forwarding_option_flags;
+static int hf_reload_forwarding_option_flag_response_copy;
+static int hf_reload_forwarding_option_flag_destination_critical;
+static int hf_reload_forwarding_option_flag_forward_critical;
+static int hf_reload_forwarding_option_flag_ignore_state_keeping;
+static int hf_reload_attachreqans;
+static int hf_reload_ufrag;
+static int hf_reload_password;
+static int hf_reload_role;
+static int hf_reload_sendupdate;
+static int hf_reload_icecandidates;
+static int hf_reload_icecandidate;
+static int hf_reload_icecandidate_addr_port;
+static int hf_reload_icecandidate_relay_addr;
+static int hf_reload_icecandidate_foundation;
+static int hf_reload_icecandidate_priority;
+static int hf_reload_icecandidate_type;
+static int hf_reload_overlaylink_type;
+static int hf_reload_iceextension;
+static int hf_reload_iceextensions;
+static int hf_reload_iceextension_name;
+static int hf_reload_iceextension_value;
+static int hf_reload_ipaddressport;
+static int hf_reload_ipaddressport_type;
+static int hf_reload_ipv4addrport;
+static int hf_reload_ipv4addr;
+static int hf_reload_port;
+static int hf_reload_ipv6addrport;
+static int hf_reload_ipv6addr;
+static int hf_reload_message_contents;
+static int hf_reload_message_code;
+static int hf_reload_message_body;
+static int hf_reload_message_extensions;
+static int hf_reload_message_extension;
+static int hf_reload_message_extension_type;
+static int hf_reload_message_extension_critical;
+static int hf_reload_message_extension_content;
+static int hf_reload_error_response;
+static int hf_reload_error_response_code;
+static int hf_reload_error_response_info;
+static int hf_reload_security_block;
+static int hf_reload_certificates;
+static int hf_reload_genericcertificate;
+static int hf_reload_certificate_type;
+static int hf_reload_certificate;
+static int hf_reload_signature;
+static int hf_reload_signatureandhashalgorithm;
+static int hf_reload_hash_algorithm;
+static int hf_reload_signature_algorithm;
+static int hf_reload_signeridentity;
+static int hf_reload_signeridentity_type;
+static int hf_reload_signeridentity_identity;
+static int hf_reload_signeridentity_value;
+static int hf_reload_signeridentity_value_hash_alg;
+static int hf_reload_signeridentity_value_certificate_hash;
+static int hf_reload_signeridentity_value_certificate_node_id_hash;
+static int hf_reload_signature_value;
+static int hf_reload_length_uint8;
+static int hf_reload_length_uint16;
+static int hf_reload_length_uint24;
+static int hf_reload_length_uint32;
+static int hf_reload_opaque;
+static int hf_reload_opaque_data;
+static int hf_reload_opaque_string;
+static int hf_reload_routequeryreq;
+static int hf_reload_routequeryreq_destination;
+static int hf_reload_overlay_specific;
+static int hf_reload_probereq;
+static int hf_reload_probereq_requested_info;
+static int hf_reload_probe_information_type;
+static int hf_reload_probe_information;
+static int hf_reload_probe_information_data;
+static int hf_reload_responsible_set;
+static int hf_reload_num_resources;
+static int hf_reload_uptime;
+static int hf_reload_probeans;
+static int hf_reload_probeans_probe_info;
+static int hf_reload_appattachreq;
+static int hf_reload_appattachans;
+static int hf_reload_application;
+static int hf_reload_pingreq;
+static int hf_reload_pingans;
+static int hf_reload_ping_response_id;
+static int hf_reload_ping_time;
+static int hf_reload_storeddata;
+static int hf_reload_storedmetadata;
+static int hf_reload_storeddata_storage_time;
+static int hf_reload_storeddata_lifetime;
+static int hf_reload_datavalue;
+static int hf_reload_metadata;
+static int hf_reload_datavalue_exists;
+static int hf_reload_datavalue_value;
+static int hf_reload_metadata_value_length;
+static int hf_reload_metadata_hash_value;
+static int hf_reload_arrayentry;
+static int hf_reload_arrayentry_value;
+static int hf_reload_arrayentry_index;
+static int hf_reload_dictionaryentry;
+static int hf_reload_dictionarykey;
+static int hf_reload_dictionary_value;
+static int hf_reload_kinddata;
+static int hf_reload_findkinddata_closest;
+static int hf_reload_kinddata_kind;
+static int hf_reload_statkindresponse;
+static int hf_reload_kindid;
+static int hf_reload_kindid_list;
+static int hf_reload_generation_counter;
+static int hf_reload_values;
+static int hf_reload_storereq;
+static int hf_reload_resource;
+static int hf_reload_store_replica_num;
+static int hf_reload_store_kind_data;
+static int hf_reload_storeans;
+static int hf_reload_storeans_kind_responses;
+static int hf_reload_storekindresponse;
+static int hf_reload_replicas;
+static int hf_reload_statreq;
+static int hf_reload_fetchreq;
+static int hf_reload_fetchreq_specifiers;
+static int hf_reload_storeddataspecifier;
+static int hf_reload_storeddataspecifier_indices;
+static int hf_reload_storeddataspecifier_keys;
+static int hf_reload_arrayrange;
+static int hf_reload_fetchans;
+static int hf_reload_statans;
+static int hf_reload_findreq;
+static int hf_reload_findans;
+static int hf_reload_findkinddata;
+static int hf_reload_fragments;
+static int hf_reload_fragment;
+static int hf_reload_fragment_overlap;
+static int hf_reload_fragment_overlap_conflict;
+static int hf_reload_fragment_multiple_tails;
+static int hf_reload_fragment_too_long_fragment;
+static int hf_reload_fragment_error;
+static int hf_reload_fragment_count;
+static int hf_reload_reassembled_in;
+static int hf_reload_reassembled_length;
+static int hf_reload_configupdatereq;
+static int hf_reload_configupdatereq_type;
+static int hf_reload_configupdatereq_configdata;
+static int hf_reload_configupdatereq_kinds;
+static int hf_reload_kinddescription;
+static int hf_reload_chordupdate;
+static int hf_reload_chordupdate_type;
+static int hf_reload_chordupdate_predecessors;
+static int hf_reload_chordupdate_successors;
+static int hf_reload_chordupdate_fingers;
+static int hf_reload_chordroutequeryans;
+static int hf_reload_chordroutequeryans_next_peer;
+static int hf_reload_chordleave;
+static int hf_reload_chordleave_type;
+static int hf_reload_chordleave_predecessors;
+static int hf_reload_chordleave_successors;
+static int hf_reload_turnserver;
+static int hf_reload_turnserver_iteration;
+static int hf_reload_turnserver_server_address;
+static int hf_reload_sipregistration;
+static int hf_reload_sipregistration_type;
+static int hf_reload_sipregistration_data;
+static int hf_reload_sipregistration_data_uri;
+static int hf_reload_sipregistration_data_contact_prefs;
+static int hf_reload_sipregistration_data_destination_list;
+static int hf_reload_padding;
+static int hf_reload_redirserviceproviderdata;
+static int hf_reload_redirserviceproviderdata_serviceprovider;
+static int hf_reload_redirserviceproviderdata_namespace;
+static int hf_reload_redirserviceproviderdata_level;
+static int hf_reload_redirserviceproviderdata_node;
+static int hf_reload_redirserviceprovider;
+static int hf_reload_self_tuning_data;
+static int hf_reload_self_tuning_data_join_rate;
+static int hf_reload_self_tuning_data_leave_rate;
+static int hf_reload_self_tuning_data_network_size;
+static int hf_reload_dmflags;
+static int hf_reload_dmflag_status_info;
+static int hf_reload_dmflag_routing_table_size;
+static int hf_reload_dmflag_process_power;
+static int hf_reload_dmflag_bandwidth;
+static int hf_reload_dmflag_software_version;
+static int hf_reload_dmflag_machine_uptime;
+static int hf_reload_dmflag_app_uptime;
+static int hf_reload_dmflag_memory_footprint;
+static int hf_reload_dmflag_datasize_stored;
+static int hf_reload_dmflag_instances_stored;
+static int hf_reload_dmflag_messages_sent_rcvd;
+static int hf_reload_dmflag_ewma_bytes_sent;
+static int hf_reload_dmflag_ewma_bytes_rcvd;
+static int hf_reload_dmflag_underlay_hop;
+static int hf_reload_dmflag_battery_status;
+static int hf_reload_diagnosticrequest;
+static int hf_reload_diagnosticresponse;
+static int hf_reload_diagnosticextension;
+static int hf_reload_diagnosticextension_type;
+static int hf_reload_diagnosticextension_contents;
+static int hf_reload_diagnostic_expiration;
+static int hf_reload_diagnosticrequest_timestampinitiated;
+static int hf_reload_diagnosticrequest_extensions;
+static int hf_reload_pathtrackreq;
+static int hf_reload_pathtrackreq_destination;
+static int hf_reload_pathtrackreq_request;
+static int hf_reload_diagnosticinfo;
+static int hf_reload_diagnosticinfo_kind;
+static int hf_reload_diagnosticinfo_congestion_status;
+static int hf_reload_diagnosticinfo_number_peers;
+static int hf_reload_diagnosticinfo_processing_power;
+static int hf_reload_diagnosticinfo_bandwidth;
+static int hf_reload_diagnosticinfo_software_version;
+static int hf_reload_diagnosticinfo_machine_uptime;
+static int hf_reload_diagnosticinfo_app_uptime;
+static int hf_reload_diagnosticinfo_memory_footprint;
+static int hf_reload_diagnosticinfo_datasize_stored;
+static int hf_reload_diagnosticinfo_instances_stored;
+static int hf_reload_diagnosticinfo_instancesstored_info;
+static int hf_reload_diagnosticinfo_instancesstored_instances;
+static int hf_reload_diagnosticinfo_messages_sent_rcvd;
+static int hf_reload_diagnosticinfo_messages_sent_rcvd_info;
+static int hf_reload_diagnosticinfo_message_code;
+static int hf_reload_diagnosticinfo_messages_sent;
+static int hf_reload_diagnosticinfo_messages_rcvd;
+static int hf_reload_diagnosticinfo_ewma_bytes_sent;
+static int hf_reload_diagnosticinfo_ewma_bytes_rcvd;
+static int hf_reload_diagnosticinfo_underlay_hops;
+static int hf_reload_diagnosticinfo_battery_status;
+static int hf_reload_diagnosticresponse_timestampreceived;
+static int hf_reload_diagnosticresponse_hopcounter;
+static int hf_reload_diagnosticresponse_diagnostic_info_list;
+static int hf_reload_pathtrackans;
+static int hf_reload_pathtrackans_next_hop;
+static int hf_reload_pathtrackans_response;
+static int hf_reload_extensiveroutingmodeoption;
+static int hf_reload_routemode;
+static int hf_reload_extensiveroutingmode_transport;
+static int hf_reload_extensiveroutingmode_ipaddressport;
+static int hf_reload_extensiveroutingmode_destination;
+static int hf_reload_joinreq;
+static int hf_reload_joinreq_joining_peer_id;
+static int hf_reload_joinans;
+static int hf_reload_leavereq;
+static int hf_reload_leavereq_leaving_peer_id;
 
 static dissector_handle_t xml_handle;
 
@@ -520,119 +520,119 @@ static const char *reload_topology_plugin = TOPOLOGY_PLUGIN_CHORD_RELOAD;
 
 
 /* Initialize the subtree pointers */
-static gint ett_reload = -1;
-static gint ett_reload_forwarding = -1;
-static gint ett_reload_message = -1;
-static gint ett_reload_security=-1;
-static gint ett_reload_fragment_flag=-1;
-static gint ett_reload_destination = -1;
-static gint ett_reload_via_list = -1;
-static gint ett_reload_destination_list = -1;
-static gint ett_reload_resourceid = -1;
-static gint ett_reload_forwarding_options = -1;
-static gint ett_reload_forwarding_option = -1;
-static gint ett_reload_forwarding_option_flags = -1;
-static gint ett_reload_forwarding_option_directresponseforwarding = -1;
-static gint ett_reload_attachreqans = -1;
-static gint ett_reload_icecandidates = -1;
-static gint ett_reload_icecandidate = -1;
-static gint ett_reload_icecandidate_computed_address = -1;
-static gint ett_reload_iceextension = -1;
-static gint ett_reload_iceextensions = -1;
-static gint ett_reload_ipaddressport = -1;
-static gint ett_reload_ipv4addrport = -1;
-static gint ett_reload_ipv6addrport = -1;
-static gint ett_reload_message_contents = -1;
-static gint ett_reload_message_extensions = -1;
-static gint ett_reload_message_extension = -1;
-static gint ett_reload_error_response = -1;
-static gint ett_reload_security_block = -1;
-static gint ett_reload_genericcertificate = -1;
-static gint ett_reload_certificates = -1;
-static gint ett_reload_signature = -1;
-static gint ett_reload_signatureandhashalgorithm = -1;
-static gint ett_reload_signeridentity = -1;
-static gint ett_reload_signeridentity_identity = -1;
-static gint ett_reload_signeridentity_value = -1;
-static gint ett_reload_opaque = -1;
-static gint ett_reload_message_body = -1;
-static gint ett_reload_routequeryreq = -1;
-static gint ett_reload_probereq = -1;
-static gint ett_reload_probereq_requested_info = -1;
-static gint ett_reload_probe_information = -1;
-static gint ett_reload_probe_information_data = -1;
-static gint ett_reload_probeans = -1;
-static gint ett_reload_probeans_probe_info = -1;
-static gint ett_reload_appattach = -1;
-static gint ett_reload_pingreq = -1;
-static gint ett_reload_pingans = -1;
-static gint ett_reload_storeddata = -1;
-static gint ett_reload_kinddata = -1;
-static gint ett_reload_values = -1;
-static gint ett_reload_datavalue = -1;
-static gint ett_reload_arrayentry = -1;
-static gint ett_reload_dictionaryentry = -1;
-static gint ett_reload_storereq = -1;
-static gint ett_reload_store_kind_data = -1;
-static gint ett_reload_storeans = -1;
-static gint ett_reload_storekindresponse = -1;
-static gint ett_reload_storeans_kind_responses = -1;
-static gint ett_reload_fetchreq = -1;
-static gint ett_reload_fetchreq_specifiers = -1;
-static gint ett_reload_storeddataspecifier = -1;
-static gint ett_reload_storeddataspecifier_indices = -1;
-static gint ett_reload_storeddataspecifier_keys = -1;
-static gint ett_reload_fetchans = -1;
-static gint ett_reload_statans = -1;
-static gint ett_reload_findkinddata = -1;
-static gint ett_reload_fragments = -1;
-static gint ett_reload_fragment  = -1;
-static gint ett_reload_configupdatereq = -1;
-static gint ett_reload_configupdatereq_config_data = -1;
-static gint ett_reload_kinddescription = -1;
-static gint ett_reload_configupdatereq_kinds = -1;
-static gint ett_reload_storekindresponse_replicas = -1;
-static gint ett_reload_nodeid_list = -1;
-static gint ett_reload_chordupdate = -1;
-static gint ett_reload_chordroutequeryans = -1;
-static gint ett_reload_chordleave = -1;
-static gint ett_reload_turnserver = -1;
-static gint ett_reload_sipregistration = -1;
-static gint ett_reload_sipregistration_data = -1;
-static gint ett_reload_sipregistration_destination_list = -1;
-static gint ett_reload_dictionaryentry_key = -1;
-static gint ett_reload_overlay_specific = -1;
-static gint ett_reload_kindid_list = -1;
-static gint ett_reload_redirserviceproviderdata = -1;
-static gint ett_reload_redirserviceprovider = -1;
-static gint ett_reload_self_tuning_data = -1;
-static gint ett_reload_findreq = -1;
-static gint ett_reload_findans = -1;
-static gint ett_reload_dmflags = -1;
-static gint ett_reload_diagnosticextension = -1;
-static gint ett_reload_diagnosticrequest = -1;
-static gint ett_reload_diagnosticrequest_extensions = -1;
-static gint ett_reload_pathtrackreq = -1;
-static gint ett_reload_diagnosticinfo = -1;
-static gint ett_reload_diagnosticinfo_instances_stored = -1;
-static gint ett_reload_diagnosticinfo_instancesstored_info = -1;
-static gint ett_reload_diagnosticinfo_messages_sent_rcvd = -1;
-static gint ett_reload_diagnosticinfo_messages_sent_rcvd_info = -1;
-static gint ett_reload_diagnosticresponse = -1;
-static gint ett_reload_diagnosticresponse_diagnostic_info_list = -1;
-static gint ett_reload_pathtrackans = -1;
-static gint ett_reload_extensiveroutingmodeoption = -1;
-static gint ett_reload_extensiveroutingmode_destination = -1;
-static gint ett_reload_joinreq = -1;
-static gint ett_reload_joinans = -1;
-static gint ett_reload_leavereq = -1;
-
-static expert_field ei_reload_truncated_field = EI_INIT;
-static expert_field ei_reload_truncated_packet = EI_INIT;
-static expert_field ei_reload_computed_len_too_big = EI_INIT;
-static expert_field ei_reload_identity_type_unknown = EI_INIT;
-static expert_field ei_reload_unknown_data_model = EI_INIT;
-static expert_field ei_reload_no_xml_dissector = EI_INIT;
+static gint ett_reload;
+static gint ett_reload_forwarding;
+static gint ett_reload_message;
+static gint ett_reload_security;
+static gint ett_reload_fragment_flag;
+static gint ett_reload_destination;
+static gint ett_reload_via_list;
+static gint ett_reload_destination_list;
+static gint ett_reload_resourceid;
+static gint ett_reload_forwarding_options;
+static gint ett_reload_forwarding_option;
+static gint ett_reload_forwarding_option_flags;
+static gint ett_reload_forwarding_option_directresponseforwarding;
+static gint ett_reload_attachreqans;
+static gint ett_reload_icecandidates;
+static gint ett_reload_icecandidate;
+static gint ett_reload_icecandidate_computed_address;
+static gint ett_reload_iceextension;
+static gint ett_reload_iceextensions;
+static gint ett_reload_ipaddressport;
+static gint ett_reload_ipv4addrport;
+static gint ett_reload_ipv6addrport;
+static gint ett_reload_message_contents;
+static gint ett_reload_message_extensions;
+static gint ett_reload_message_extension;
+static gint ett_reload_error_response;
+static gint ett_reload_security_block;
+static gint ett_reload_genericcertificate;
+static gint ett_reload_certificates;
+static gint ett_reload_signature;
+static gint ett_reload_signatureandhashalgorithm;
+static gint ett_reload_signeridentity;
+static gint ett_reload_signeridentity_identity;
+static gint ett_reload_signeridentity_value;
+static gint ett_reload_opaque;
+static gint ett_reload_message_body;
+static gint ett_reload_routequeryreq;
+static gint ett_reload_probereq;
+static gint ett_reload_probereq_requested_info;
+static gint ett_reload_probe_information;
+static gint ett_reload_probe_information_data;
+static gint ett_reload_probeans;
+static gint ett_reload_probeans_probe_info;
+static gint ett_reload_appattach;
+static gint ett_reload_pingreq;
+static gint ett_reload_pingans;
+static gint ett_reload_storeddata;
+static gint ett_reload_kinddata;
+static gint ett_reload_values;
+static gint ett_reload_datavalue;
+static gint ett_reload_arrayentry;
+static gint ett_reload_dictionaryentry;
+static gint ett_reload_storereq;
+static gint ett_reload_store_kind_data;
+static gint ett_reload_storeans;
+static gint ett_reload_storekindresponse;
+static gint ett_reload_storeans_kind_responses;
+static gint ett_reload_fetchreq;
+static gint ett_reload_fetchreq_specifiers;
+static gint ett_reload_storeddataspecifier;
+static gint ett_reload_storeddataspecifier_indices;
+static gint ett_reload_storeddataspecifier_keys;
+static gint ett_reload_fetchans;
+static gint ett_reload_statans;
+static gint ett_reload_findkinddata;
+static gint ett_reload_fragments;
+static gint ett_reload_fragment;
+static gint ett_reload_configupdatereq;
+static gint ett_reload_configupdatereq_config_data;
+static gint ett_reload_kinddescription;
+static gint ett_reload_configupdatereq_kinds;
+static gint ett_reload_storekindresponse_replicas;
+static gint ett_reload_nodeid_list;
+static gint ett_reload_chordupdate;
+static gint ett_reload_chordroutequeryans;
+static gint ett_reload_chordleave;
+static gint ett_reload_turnserver;
+static gint ett_reload_sipregistration;
+static gint ett_reload_sipregistration_data;
+static gint ett_reload_sipregistration_destination_list;
+static gint ett_reload_dictionaryentry_key;
+static gint ett_reload_overlay_specific;
+static gint ett_reload_kindid_list;
+static gint ett_reload_redirserviceproviderdata;
+static gint ett_reload_redirserviceprovider;
+static gint ett_reload_self_tuning_data;
+static gint ett_reload_findreq;
+static gint ett_reload_findans;
+static gint ett_reload_dmflags;
+static gint ett_reload_diagnosticextension;
+static gint ett_reload_diagnosticrequest;
+static gint ett_reload_diagnosticrequest_extensions;
+static gint ett_reload_pathtrackreq;
+static gint ett_reload_diagnosticinfo;
+static gint ett_reload_diagnosticinfo_instances_stored;
+static gint ett_reload_diagnosticinfo_instancesstored_info;
+static gint ett_reload_diagnosticinfo_messages_sent_rcvd;
+static gint ett_reload_diagnosticinfo_messages_sent_rcvd_info;
+static gint ett_reload_diagnosticresponse;
+static gint ett_reload_diagnosticresponse_diagnostic_info_list;
+static gint ett_reload_pathtrackans;
+static gint ett_reload_extensiveroutingmodeoption;
+static gint ett_reload_extensiveroutingmode_destination;
+static gint ett_reload_joinreq;
+static gint ett_reload_joinans;
+static gint ett_reload_leavereq;
+
+static expert_field ei_reload_truncated_field;
+static expert_field ei_reload_truncated_packet;
+static expert_field ei_reload_computed_len_too_big;
+static expert_field ei_reload_identity_type_unknown;
+static expert_field ei_reload_unknown_data_model;
+static expert_field ei_reload_no_xml_dissector;
 
 static const fragment_items reload_frag_items = {
   &ett_reload_fragment,
diff --git a/epan/dissectors/packet-resp.c b/epan/dissectors/packet-resp.c
index 19bf2e4ace..b4450accb6 100644
--- a/epan/dissectors/packet-resp.c
+++ b/epan/dissectors/packet-resp.c
@@ -30,26 +30,26 @@
 static dissector_handle_t resp_handle;
 static gboolean resp_desegment = TRUE;
 
-static int proto_resp = -1;
-
-static gint ett_resp = -1;
-static gint ett_resp_bulk_string = -1;
-static gint ett_resp_array = -1;
-
-static expert_field ei_resp_partial = EI_INIT;
-static expert_field ei_resp_malformed_length = EI_INIT;
-static expert_field ei_resp_array_recursion_too_deep = EI_INIT;
-static expert_field ei_resp_reassembled_in_next_frame = EI_INIT;
-
-static int hf_resp_string = -1;
-static int hf_resp_error = -1;
-static int hf_resp_bulk_string = -1;
-static int hf_resp_bulk_string_length = -1;
-static int hf_resp_bulk_string_value = -1;
-static int hf_resp_integer = -1;
-static int hf_resp_array = -1;
-static int hf_resp_array_length = -1;
-static int hf_resp_fragment = -1;
+static int proto_resp;
+
+static gint ett_resp;
+static gint ett_resp_bulk_string;
+static gint ett_resp_array;
+
+static expert_field ei_resp_partial;
+static expert_field ei_resp_malformed_length;
+static expert_field ei_resp_array_recursion_too_deep;
+static expert_field ei_resp_reassembled_in_next_frame;
+
+static int hf_resp_string;
+static int hf_resp_error;
+static int hf_resp_bulk_string;
+static int hf_resp_bulk_string_length;
+static int hf_resp_bulk_string_value;
+static int hf_resp_integer;
+static int hf_resp_array;
+static int hf_resp_array_length;
+static int hf_resp_fragment;
 
 static int dissect_resp_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, gint array_depth, gint64 expected_elements);
 static void resp_bulk_string_enhance_colinfo_ascii(packet_info *pinfo, gint array_depth, gint bulk_string_length, const guint8 *bulk_string_as_str);
diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c
index 81a21c3c07..50c5a503bb 100644
--- a/epan/dissectors/packet-retix-bpdu.c
+++ b/epan/dissectors/packet-retix-bpdu.c
@@ -24,14 +24,14 @@
 
 void proto_register_retix_bpdu(void);
 
-static gint ett_retix_bpdu = -1;
-static int proto_retix_bpdu = -1;
-
-static int hf_retix_bpdu_root_mac = -1;
-static int hf_retix_bpdu_bridge_mac = -1;
-static int hf_retix_bpdu_max_age = -1;
-static int hf_retix_bpdu_hello_time = -1;
-static int hf_retix_bpdu_forward_delay = -1;
+static gint ett_retix_bpdu;
+static int proto_retix_bpdu;
+
+static int hf_retix_bpdu_root_mac;
+static int hf_retix_bpdu_bridge_mac;
+static int hf_retix_bpdu_max_age;
+static int hf_retix_bpdu_hello_time;
+static int hf_retix_bpdu_forward_delay;
 
 /* I don't have the spec's for this protcol so it's been reverse engineered
  * It seems quite like 802.1D
diff --git a/epan/dissectors/packet-rf4ce-nwk.c b/epan/dissectors/packet-rf4ce-nwk.c
index b926b641c7..cc156e6a5a 100644
--- a/epan/dissectors/packet-rf4ce-nwk.c
+++ b/epan/dissectors/packet-rf4ce-nwk.c
@@ -29,7 +29,7 @@
 #define RF4CE_PROTOABBREV_NWK       "rf4ce_nwk"
 #define RF4CE_PROTOABBREV_PROFILE   "rf4ce_profile"
 
-static int proto_rf4ce_nwk = -1;
+static int proto_rf4ce_nwk;
 static dissector_handle_t rf4ce_gdp_handle;
 
 /* UAT vars */
@@ -51,61 +51,61 @@ UAT_CSTRING_CB_DEF(uat_security_records, label, uat_security_record_t)
 static uat_security_record_t *uat_security_records = NULL;
 static guint num_uat_security_records = 0;
 
-static gint ett_rf4ce_nwk = -1;
-static gint ett_rf4ce_nwk_payload = -1;
-static gint ett_rf4ce_nwk_vendor_info = -1;
-static gint ett_rf4ce_nwk_usr_str = -1;
-static gint ett_rf4ce_nwk_usr_str_class_descriptor = -1;
-static gint ett_rf4ce_nwk_dev_types_list = -1;
-static gint ett_rf4ce_nwk_profiles_list = -1;
+static gint ett_rf4ce_nwk;
+static gint ett_rf4ce_nwk_payload;
+static gint ett_rf4ce_nwk_vendor_info;
+static gint ett_rf4ce_nwk_usr_str;
+static gint ett_rf4ce_nwk_usr_str_class_descriptor;
+static gint ett_rf4ce_nwk_dev_types_list;
+static gint ett_rf4ce_nwk_profiles_list;
 
 /* RF4CE NWK header */
-static int hf_rf4ce_nwk_fcf = -1;
-static int hf_rf4ce_nwk_fcf_frame_type = -1;
-static int hf_rf4ce_nwk_fcf_security_enabled = -1;
-static int hf_rf4ce_nwk_fcf_protocol_version = -1;
-static int hf_rf4ce_nwk_fcf_reserved = -1;
-static int hf_rf4ce_nwk_fcf_channel_designator = -1;
-static int hf_rf4ce_nwk_seq_num = -1;
-static int hf_rf4ce_nwk_profile_id = -1;
-static int hf_rf4ce_nwk_vendor_id = -1;
+static int hf_rf4ce_nwk_fcf;
+static int hf_rf4ce_nwk_fcf_frame_type;
+static int hf_rf4ce_nwk_fcf_security_enabled;
+static int hf_rf4ce_nwk_fcf_protocol_version;
+static int hf_rf4ce_nwk_fcf_reserved;
+static int hf_rf4ce_nwk_fcf_channel_designator;
+static int hf_rf4ce_nwk_seq_num;
+static int hf_rf4ce_nwk_profile_id;
+static int hf_rf4ce_nwk_vendor_id;
 
 /* RF4CE NWK payload common */
-static int hf_rf4ce_nwk_cmd_id = -1;
+static int hf_rf4ce_nwk_cmd_id;
 
-static int hf_rf4ce_nwk_node_capabilities = -1;
-static int hf_rf4ce_nwk_node_capabilities_node_type = -1;
-static int hf_rf4ce_nwk_node_capabilities_power_source = -1;
-static int hf_rf4ce_nwk_node_capabilities_security = -1;
-static int hf_rf4ce_nwk_node_capabilities_channel_normalization = -1;
-static int hf_rf4ce_nwk_node_capabilities_reserved = -1;
+static int hf_rf4ce_nwk_node_capabilities;
+static int hf_rf4ce_nwk_node_capabilities_node_type;
+static int hf_rf4ce_nwk_node_capabilities_power_source;
+static int hf_rf4ce_nwk_node_capabilities_security;
+static int hf_rf4ce_nwk_node_capabilities_channel_normalization;
+static int hf_rf4ce_nwk_node_capabilities_reserved;
 
-static int hf_rf4ce_nwk_disc_req_vendor_id = -1;
+static int hf_rf4ce_nwk_disc_req_vendor_id;
 
 #define RF4CE_NWK_VENDOR_STRING_MAX_LENGTH 7
-static int hf_rf4ce_nwk_vendor_string = -1;
+static int hf_rf4ce_nwk_vendor_string;
 
-static int hf_rf4ce_nwk_app_capabilities = -1;
-static int hf_rf4ce_nwk_app_capabilities_usr_str = -1;
-static int hf_rf4ce_nwk_app_capabilities_supported_dev_num = -1;
-static int hf_rf4ce_nwk_app_capabilities_reserved1 = -1;
-static int hf_rf4ce_nwk_app_capabilities_supported_profiles_num = -1;
-static int hf_rf4ce_nwk_app_capabilities_reserved2 = -1;
+static int hf_rf4ce_nwk_app_capabilities;
+static int hf_rf4ce_nwk_app_capabilities_usr_str;
+static int hf_rf4ce_nwk_app_capabilities_supported_dev_num;
+static int hf_rf4ce_nwk_app_capabilities_reserved1;
+static int hf_rf4ce_nwk_app_capabilities_supported_profiles_num;
+static int hf_rf4ce_nwk_app_capabilities_reserved2;
 
-static int hf_rf4ce_nwk_usr_str = -1;
-static int hf_rf4ce_nwk_usr_str_disc_rsp_app_usr_str = -1;
-static int hf_rf4ce_nwk_usr_str_disc_rsp_null = -1;
-static int hf_rf4ce_nwk_usr_str_disc_rsp_reserved = -1;
+static int hf_rf4ce_nwk_usr_str;
+static int hf_rf4ce_nwk_usr_str_disc_rsp_app_usr_str;
+static int hf_rf4ce_nwk_usr_str_disc_rsp_null;
+static int hf_rf4ce_nwk_usr_str_disc_rsp_reserved;
 
-static int hf_rf4ce_nwk_usr_str_disc_rsp_class_desc_tertiary = -1;
-static int hf_rf4ce_nwk_usr_str_disc_rsp_class_desc_secondary = -1;
-static int hf_rf4ce_nwk_usr_str_disc_rsp_class_desc_primary = -1;
+static int hf_rf4ce_nwk_usr_str_disc_rsp_class_desc_tertiary;
+static int hf_rf4ce_nwk_usr_str_disc_rsp_class_desc_secondary;
+static int hf_rf4ce_nwk_usr_str_disc_rsp_class_desc_primary;
 
-static int hf_rf4ce_nwk_usr_str_disc_rsp_class_desc_class_num = -1;
-static int hf_rf4ce_nwk_usr_str_disc_rsp_class_desc_duplicate_class_num_handling = -1;
-static int hf_rf4ce_nwk_usr_str_disc_rsp_class_desc_reserved = -1;
+static int hf_rf4ce_nwk_usr_str_disc_rsp_class_desc_class_num;
+static int hf_rf4ce_nwk_usr_str_disc_rsp_class_desc_duplicate_class_num_handling;
+static int hf_rf4ce_nwk_usr_str_disc_rsp_class_desc_reserved;
 
-static int hf_rf4ce_nwk_usr_str_disc_rsp_discovery_lqi_threshold = -1;
+static int hf_rf4ce_nwk_usr_str_disc_rsp_discovery_lqi_threshold;
 
 #define RF4CE_NWK_USR_STR_DISC_RSP_CLASS_DESC_CLASS_NUM_MASK                    0b00001111
 #define RF4CE_NWK_USR_STR_DISC_RSP_CLASS_DESC_DUPLICATE_CLASS_NUM_HANDLING_MASK 0b00110000
@@ -166,41 +166,41 @@ static const value_string rf4ce_nwk_usr_str_disc_rsp_class_desc_duplicate_class_
 #define RF4CE_NWK_USR_STR_PARSING_MASK_NONE      0b00000001
 #define RF4CE_NWK_USR_STR_PARSING_MASK_DISC_RESP 0b00000010
 
-static int hf_rf4ce_nwk_app_cap_dev_type = -1;
-static int hf_rf4ce_nwk_app_cap_profile_id = -1;
+static int hf_rf4ce_nwk_app_cap_dev_type;
+static int hf_rf4ce_nwk_app_cap_profile_id;
 
 /* RF4CE NWK Discovery Request */
-static int hf_rf4ce_nwk_requested_dev_type = -1;
+static int hf_rf4ce_nwk_requested_dev_type;
 
 /* RF4CE NWK Discovery Response */
-static int hf_rf4ce_nwk_disc_resp_status = -1;
-static int hf_rf4ce_nwk_disc_resp_lqi = -1;
+static int hf_rf4ce_nwk_disc_resp_status;
+static int hf_rf4ce_nwk_disc_resp_lqi;
 
 /* RF4CE NWK Pair Request */
-static int hf_rf4ce_nwk_pair_req_nwk_addr = -1;
-static int hf_rf4ce_nwk_pair_req_key_exch_num = -1;
+static int hf_rf4ce_nwk_pair_req_nwk_addr;
+static int hf_rf4ce_nwk_pair_req_key_exch_num;
 
 /* RF4CE NWK Pair Response */
-static int hf_rf4ce_nwk_pair_rsp_status = -1;
-static int hf_rf4ce_nwk_pair_rsp_allocated_nwk_addr = -1;
-static int hf_rf4ce_nwk_pair_rsp_nwk_addr = -1;
+static int hf_rf4ce_nwk_pair_rsp_status;
+static int hf_rf4ce_nwk_pair_rsp_allocated_nwk_addr;
+static int hf_rf4ce_nwk_pair_rsp_nwk_addr;
 
 /* RF4CE NWK Key Seed */
-static int hf_rf4ce_nwk_seed_seq_num = -1;
+static int hf_rf4ce_nwk_seed_seq_num;
 
 #define RF4CE_NWK_KEY_SEED_DATA_LENGTH 80
-static int hf_rf4ce_nwk_seed_data = -1;
+static int hf_rf4ce_nwk_seed_data;
 
 /* RF4CE NWK Ping Request and Response */
-static int hf_rf4ce_nwk_ping_options = -1;
-static int hf_rf4ce_nwk_ping_payload = -1;
+static int hf_rf4ce_nwk_ping_options;
+static int hf_rf4ce_nwk_ping_payload;
 
 #if 0
 /* Should be at the end of a decrypted NWK packet */
-static int hf_rf4ce_nwk_mic = -1;
+static int hf_rf4ce_nwk_mic;
 #endif
 
-static int hf_rf4ce_nwk_unparsed_payload = -1;
+static int hf_rf4ce_nwk_unparsed_payload;
 
 /* Frame Control Field */
 #define RF4CE_NWK_FCF_FRAME_TYPE_MASK         0b00000011
diff --git a/epan/dissectors/packet-rf4ce-profile.c b/epan/dissectors/packet-rf4ce-profile.c
index 0cc786b5bd..d520c89de8 100644
--- a/epan/dissectors/packet-rf4ce-profile.c
+++ b/epan/dissectors/packet-rf4ce-profile.c
@@ -20,113 +20,113 @@
 #include "packet-rf4ce-secur.h"
 
 /* TLV Node-elements */
-static int proto_rf4ce_profile = -1;
-
-static gint ett_rf4ce_profile = -1;
-static gint ett_rf4ce_profile_cmd_frame = -1;
-static gint ett_rf4ce_profile_attrs = -1;
-static gint ett_rf4ce_profile_attrs_sub = -1;
-static gint ett_rf4ce_profile_zrc20_ident_cap = -1;
-static gint ett_rf4ce_profile_zrc20_mappable_actions_entry = -1;
-static gint ett_rf4ce_profile_zrc20_action_control = -1;
-static gint ett_rf4ce_profile_zrc20_action_mappings_flags = -1;
-static gint ett_rf4ce_profile_zrc20_action_mappings_rf_descr = -1;
-static gint ett_rf4ce_profile_zrc20_action_mappings_rf_descr_rf_conf = -1;
-static gint ett_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts = -1;
-static gint ett_rf4ce_profile_zrc20_action_mappings_ir_descr = -1;
-static gint ett_rf4ce_profile_zrc20_action_mappings_ir_descr_ir_conf = -1;
-static gint ett_rf4ce_profile_gdp_poll_constraints_polling_rec = -1;
-static gint ett_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap = -1;
-static gint ett_rf4ce_profile_gdp_poll_configuration_polling_trig_conf = -1;
-static gint ett_rf4ce_profile_action_records = -1;
-static gint ett_rf4ce_profile_action_records_sub = -1;
-static gint ett_rf4ce_profile_zrc10_supported_commands = -1;
-static gint ett_rf4ce_profile_zrc10_supported_commands_sub = -1;
+static int proto_rf4ce_profile;
+
+static gint ett_rf4ce_profile;
+static gint ett_rf4ce_profile_cmd_frame;
+static gint ett_rf4ce_profile_attrs;
+static gint ett_rf4ce_profile_attrs_sub;
+static gint ett_rf4ce_profile_zrc20_ident_cap;
+static gint ett_rf4ce_profile_zrc20_mappable_actions_entry;
+static gint ett_rf4ce_profile_zrc20_action_control;
+static gint ett_rf4ce_profile_zrc20_action_mappings_flags;
+static gint ett_rf4ce_profile_zrc20_action_mappings_rf_descr;
+static gint ett_rf4ce_profile_zrc20_action_mappings_rf_descr_rf_conf;
+static gint ett_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts;
+static gint ett_rf4ce_profile_zrc20_action_mappings_ir_descr;
+static gint ett_rf4ce_profile_zrc20_action_mappings_ir_descr_ir_conf;
+static gint ett_rf4ce_profile_gdp_poll_constraints_polling_rec;
+static gint ett_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap;
+static gint ett_rf4ce_profile_gdp_poll_configuration_polling_trig_conf;
+static gint ett_rf4ce_profile_action_records;
+static gint ett_rf4ce_profile_action_records_sub;
+static gint ett_rf4ce_profile_zrc10_supported_commands;
+static gint ett_rf4ce_profile_zrc10_supported_commands_sub;
 
 static dissector_table_t rf4ce_profile_dissector_table;
 
 static dissector_handle_t rf4ce_profile_handle;
 
 /* RF4CE Profile header */
-static int hf_rf4ce_profile_fcf = -1;
-static int hf_rf4ce_profile_fcf_cmd_id = -1;
-static int hf_rf4ce_zrc20_fcf_cmd_id = -1;
-static int hf_rf4ce_profile_fcf_reserved = -1;
-static int hf_rf4ce_profile_fcf_cmd_frame = -1;
-static int hf_rf4ce_profile_fcf_data_pending = -1;
+static int hf_rf4ce_profile_fcf;
+static int hf_rf4ce_profile_fcf_cmd_id;
+static int hf_rf4ce_zrc20_fcf_cmd_id;
+static int hf_rf4ce_profile_fcf_reserved;
+static int hf_rf4ce_profile_fcf_cmd_frame;
+static int hf_rf4ce_profile_fcf_data_pending;
 
 /* RF4CE Profile command - Generic Response */
-static int hf_rf4ce_profile_cmd_generic_resp_status = -1;
+static int hf_rf4ce_profile_cmd_generic_resp_status;
 
 /* RF4CE Profile command - Configuration Complete */
-static int hf_rf4ce_profile_cmd_configuration_complete_status = -1;
+static int hf_rf4ce_profile_cmd_configuration_complete_status;
 
 /* RF4CE Profile command - Heartbeat */
-static int hf_rf4ce_profile_cmd_heartbeat_trigger = -1;
+static int hf_rf4ce_profile_cmd_heartbeat_trigger;
 
 /* RF4CE Profile Attributes - general */
-static int hf_rf4ce_profile_gdp_attr_id = -1;
-static int hf_rf4ce_profile_zrc20_attr_id = -1;
-static int hf_rf4ce_profile_attr_entry_id = -1;
-static int hf_rf4ce_profile_attr_status = -1;
-static int hf_rf4ce_profile_attr_length = -1;
-static int hf_rf4ce_profile_attr_value = -1;
+static int hf_rf4ce_profile_gdp_attr_id;
+static int hf_rf4ce_profile_zrc20_attr_id;
+static int hf_rf4ce_profile_attr_entry_id;
+static int hf_rf4ce_profile_attr_status;
+static int hf_rf4ce_profile_attr_length;
+static int hf_rf4ce_profile_attr_value;
 
 /* RF4CE Profile command - Check Validation */
-static int hf_rf4ce_profile_cmd_check_validation_sub_type = -1;
-static int hf_rf4ce_profile_cmd_check_validation_control = -1;
-static int hf_rf4ce_profile_cmd_check_validation_status = -1;
+static int hf_rf4ce_profile_cmd_check_validation_sub_type;
+static int hf_rf4ce_profile_cmd_check_validation_control;
+static int hf_rf4ce_profile_cmd_check_validation_status;
 
 /* RF4CE Profile command - Client Notification */
-static int hf_rf4ce_profile_cmd_client_notification_sub_type = -1;
+static int hf_rf4ce_profile_cmd_client_notification_sub_type;
 
-static int hf_rf4ce_profile_cmd_client_notification_identify_flags = -1;
-static int hf_rf4ce_profile_cmd_client_notification_identify_flags_stop_on_action = -1;
-static int hf_rf4ce_profile_cmd_client_notification_identify_flags_flash_light = -1;
-static int hf_rf4ce_profile_cmd_client_notification_identify_flags_make_sound = -1;
-static int hf_rf4ce_profile_cmd_client_notification_identify_flags_vibrate = -1;
-static int hf_rf4ce_profile_cmd_client_notification_identify_flags_reserved = -1;
+static int hf_rf4ce_profile_cmd_client_notification_identify_flags;
+static int hf_rf4ce_profile_cmd_client_notification_identify_flags_stop_on_action;
+static int hf_rf4ce_profile_cmd_client_notification_identify_flags_flash_light;
+static int hf_rf4ce_profile_cmd_client_notification_identify_flags_make_sound;
+static int hf_rf4ce_profile_cmd_client_notification_identify_flags_vibrate;
+static int hf_rf4ce_profile_cmd_client_notification_identify_flags_reserved;
 
-static int hf_rf4ce_profile_cmd_client_notification_identify_time = -1;
+static int hf_rf4ce_profile_cmd_client_notification_identify_time;
 
 /* RF4CE Profile command - Key Exchange */
-static int hf_rf4ce_profile_cmd_key_exchange_sub_type = -1;
+static int hf_rf4ce_profile_cmd_key_exchange_sub_type;
 
-static int hf_rf4ce_profile_cmd_key_exchange_flags = -1;
-static int hf_rf4ce_profile_cmd_key_exchange_flags_default_secret = -1;
-static int hf_rf4ce_profile_cmd_key_exchange_flags_initiator_vendor_specific_secret = -1;
-static int hf_rf4ce_profile_cmd_key_exchange_flags_responder_vendor_specific_secret = -1;
-static int hf_rf4ce_profile_cmd_key_exchange_flags_reserved = -1;
-static int hf_rf4ce_profile_cmd_key_exchange_flags_vendor_specific_parameter = -1;
+static int hf_rf4ce_profile_cmd_key_exchange_flags;
+static int hf_rf4ce_profile_cmd_key_exchange_flags_default_secret;
+static int hf_rf4ce_profile_cmd_key_exchange_flags_initiator_vendor_specific_secret;
+static int hf_rf4ce_profile_cmd_key_exchange_flags_responder_vendor_specific_secret;
+static int hf_rf4ce_profile_cmd_key_exchange_flags_reserved;
+static int hf_rf4ce_profile_cmd_key_exchange_flags_vendor_specific_parameter;
 
-static int hf_rf4ce_profile_cmd_key_exchange_rand_a = -1;
-static int hf_rf4ce_profile_cmd_key_exchange_rand_b = -1;
-static int hf_rf4ce_profile_cmd_key_exchange_tag_b = -1;
-static int hf_rf4ce_profile_cmd_key_exchange_tag_a = -1;
+static int hf_rf4ce_profile_cmd_key_exchange_rand_a;
+static int hf_rf4ce_profile_cmd_key_exchange_rand_b;
+static int hf_rf4ce_profile_cmd_key_exchange_tag_b;
+static int hf_rf4ce_profile_cmd_key_exchange_tag_a;
 
 #if 0
 /* RF4CE ZRC 2.0 Profile command - Actions */
-static int hf_rf4ce_zrc20_cmd_actions = -1;
+static int hf_rf4ce_zrc20_cmd_actions;
 #endif
 
-static int hf_rf4ce_zrc20_cmd_actions_action_control = -1;
-static int hf_rf4ce_zrc20_cmd_actions_action_control_action_type = -1;
-static int hf_rf4ce_zrc20_cmd_actions_action_control_reserved = -1;
-static int hf_rf4ce_zrc20_cmd_actions_action_control_modifier_bits_gui = -1;
-static int hf_rf4ce_zrc20_cmd_actions_action_control_modifier_bits_alt = -1;
-static int hf_rf4ce_zrc20_cmd_actions_action_control_modifier_bits_shift = -1;
-static int hf_rf4ce_zrc20_cmd_actions_action_control_modifier_bits_ctrl = -1;
+static int hf_rf4ce_zrc20_cmd_actions_action_control;
+static int hf_rf4ce_zrc20_cmd_actions_action_control_action_type;
+static int hf_rf4ce_zrc20_cmd_actions_action_control_reserved;
+static int hf_rf4ce_zrc20_cmd_actions_action_control_modifier_bits_gui;
+static int hf_rf4ce_zrc20_cmd_actions_action_control_modifier_bits_alt;
+static int hf_rf4ce_zrc20_cmd_actions_action_control_modifier_bits_shift;
+static int hf_rf4ce_zrc20_cmd_actions_action_control_modifier_bits_ctrl;
 
-static int hf_rf4ce_zrc20_cmd_actions_action_data_payload_length = -1;
-static int hf_rf4ce_zrc20_cmd_actions_action_data_action_bank = -1;
-static int hf_rf4ce_zrc20_cmd_actions_action_data_action_code = -1;
-static int hf_rf4ce_zrc20_cmd_actions_action_data_action_vendor = -1;
-static int hf_rf4ce_zrc20_cmd_actions_action_data_action_payload = -1;
+static int hf_rf4ce_zrc20_cmd_actions_action_data_payload_length;
+static int hf_rf4ce_zrc20_cmd_actions_action_data_action_bank;
+static int hf_rf4ce_zrc20_cmd_actions_action_data_action_code;
+static int hf_rf4ce_zrc20_cmd_actions_action_data_action_vendor;
+static int hf_rf4ce_zrc20_cmd_actions_action_data_action_payload;
 
 /* RF4CE ZRC 1.0 profile header */
-static int hf_rf4ce_zrc10_fcf = -1;
-static int hf_rf4ce_zrc10_fcf_cmd_id = -1;
-static int hf_rf4ce_zrc10_fcf_reserved = -1;
+static int hf_rf4ce_zrc10_fcf;
+static int hf_rf4ce_zrc10_fcf_cmd_id;
+static int hf_rf4ce_zrc10_fcf_reserved;
 
 #define RF4CE_ZRC10_FCF_CMD_ID_RESERVED                       0b00000000
 #define RF4CE_ZRC10_FCF_CMD_ID_USER_CONTROL_PRESSED           0b00000001
@@ -148,12 +148,12 @@ static const value_string rf4ce_zrc10_fcf_cmd_id_vals[] = {
     { 0, NULL }
 };
 
-static int hf_rf4ce_zrc10_cmd_common_rc_command_code = -1;
-static int hf_rf4ce_zrc10_cmd_common_rc_command_payload = -1;
-static int hf_rf4ce_zrc10_cmd_disc_reserved = -1;
-static int hf_rf4ce_zrc10_cmd_disc_rsp_supported_commands = -1;
+static int hf_rf4ce_zrc10_cmd_common_rc_command_code;
+static int hf_rf4ce_zrc10_cmd_common_rc_command_payload;
+static int hf_rf4ce_zrc10_cmd_disc_reserved;
+static int hf_rf4ce_zrc10_cmd_disc_rsp_supported_commands;
 
-static int hf_rf4ce_profile_unparsed_payload = -1;
+static int hf_rf4ce_profile_unparsed_payload;
 
 #define RF4CE_ZRC20_CMD_ACTIONS_ACTION_CONTROL_ACTION_TYPE_RESERVED 0b00000000
 #define RF4CE_ZRC20_CMD_ACTIONS_ACTION_CONTROL_ACTION_TYPE_START    0b00000001
@@ -328,12 +328,12 @@ static const value_string hf_rf4ce_profile_cmd_heartbeat_trigger_vals[] = {
 /* RF4CE GDP Attributes */
 
 /* GDP Attribute - Identification Capabilities */
-static int hf_rf4ce_profile_gdp_ident_cap = -1;
-static int hf_rf4ce_profile_gdp_ident_cap_reserved = -1;
-static int hf_rf4ce_profile_gdp_ident_cap_support_flash_light = -1;
-static int hf_rf4ce_profile_gdp_ident_cap_support_make_short_sound = -1;
-static int hf_rf4ce_profile_gdp_ident_cap_support_vibrate = -1;
-static int hf_rf4ce_profile_gdp_ident_cap_reserved2 = -1;
+static int hf_rf4ce_profile_gdp_ident_cap;
+static int hf_rf4ce_profile_gdp_ident_cap_reserved;
+static int hf_rf4ce_profile_gdp_ident_cap_support_flash_light;
+static int hf_rf4ce_profile_gdp_ident_cap_support_make_short_sound;
+static int hf_rf4ce_profile_gdp_ident_cap_support_vibrate;
+static int hf_rf4ce_profile_gdp_ident_cap_reserved2;
 
 #define RF4CE_PROFILE_GDP_IDENT_CAP_RESERVED_MASK                 0b00000001
 #define RF4CE_PROFILE_GDP_IDENT_CAP_SUPPORT_FLASH_LIGHT_MASK      0b00000010
@@ -348,10 +348,10 @@ static int hf_rf4ce_profile_gdp_ident_cap_reserved2 = -1;
      | RF4CE_PROFILE_GDP_IDENT_CAP_RESERVED2_MASK)
 
 /* GDP Attribute - Poll Constraints */
-static int hf_rf4ce_profile_gdp_poll_constraints_methods_num = -1;
+static int hf_rf4ce_profile_gdp_poll_constraints_methods_num;
 
 /* Polling constraint record - Polling method ID */
-static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_method_id = -1;
+static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_method_id;
 
 #define RF4CE_PROFILE_GDP_POLL_CONSTRAINTS_POLLING_REC_METHOD_ID_DIS           0x00
 #define RF4CE_PROFILE_GDP_POLL_CONSTRAINTS_POLLING_REC_METHOD_ID_GDP_HEARTBEAT 0x01
@@ -363,14 +363,14 @@ static const value_string rf4ce_profile_gdp_poll_constraints_polling_rec_method_
 };
 
 /* Polling constraint record - Polling trigger capabilities */
-static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap = -1;
-static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap_tbased = -1;
-static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap_on_k_press = -1;
-static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap_on_pick_up = -1;
-static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap_on_reset = -1;
-static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap_on_micro_act = -1;
-static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap_on_user_act = -1;
-static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap_reserved = -1;
+static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap;
+static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap_tbased;
+static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap_on_k_press;
+static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap_on_pick_up;
+static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap_on_reset;
+static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap_on_micro_act;
+static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap_on_user_act;
+static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap_reserved;
 
 #define RF4CE_PROFILE_GDP_POLL_CONSTRAINTS_POLLING_REC_POLLING_TRIG_CAP_TBASED_MASK       (0b0000000000000001)
 #define RF4CE_PROFILE_GDP_POLL_CONSTRAINTS_POLLING_REC_POLLING_TRIG_CAP_ON_K_PRESS_MASK   (0b0000000000000010)
@@ -390,24 +390,24 @@ static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_polling_trig_cap_re
      | RF4CE_PROFILE_GDP_POLL_CONSTRAINTS_POLLING_REC_POLLING_TRIG_CAP_RESERVED_MASK)
 
 /* Polling constraint record - other fields */
-static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_min_polling_key_press_cnt = -1;
-static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_max_polling_key_press_cnt = -1;
+static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_min_polling_key_press_cnt;
+static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_max_polling_key_press_cnt;
 
-static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_min_polling_time_interval = -1;
-static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_max_polling_time_interval = -1;
+static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_min_polling_time_interval;
+static int hf_rf4ce_profile_gdp_poll_constraints_polling_rec_max_polling_time_interval;
 
 /* GDP Attribute - Poll Configuration */
-static int hf_rf4ce_profile_gdp_poll_configuration_method_id = -1;
+static int hf_rf4ce_profile_gdp_poll_configuration_method_id;
 
 /* GDP Attribute - Poll Configuration - Polling Trigger Configuration */
-static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf = -1;
-static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf_tbased = -1;
-static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf_on_k_press = -1;
-static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf_on_pick_up = -1;
-static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf_on_reset = -1;
-static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf_on_micro_act = -1;
-static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf_on_user_act = -1;
-static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf_reserved = -1;
+static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf;
+static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf_tbased;
+static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf_on_k_press;
+static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf_on_pick_up;
+static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf_on_reset;
+static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf_on_micro_act;
+static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf_on_user_act;
+static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf_reserved;
 
 #define RF4CE_PROFILE_GDP_POLL_CONFIGURATION_POLLING_TRIG_CONF_TBASED_MASK       (0b0000000000000001)
 #define RF4CE_PROFILE_GDP_POLL_CONFIGURATION_POLLING_TRIG_CONF_ON_K_PRESS_MASK   (0b0000000000000010)
@@ -426,9 +426,9 @@ static int hf_rf4ce_profile_gdp_poll_configuration_polling_trig_conf_reserved =
      | RF4CE_PROFILE_GDP_POLL_CONFIGURATION_POLLING_TRIG_CONF_ON_USER_ACT_MASK  \
      | RF4CE_PROFILE_GDP_POLL_CONFIGURATION_POLLING_TRIG_CONF_RESERVED_MASK)
 
-static int hf_rf4ce_profile_gdp_poll_configuration_polling_key_press_cnt = -1;
-static int hf_rf4ce_profile_gdp_poll_configuration_polling_time_interval = -1;
-static int hf_rf4ce_profile_gdp_poll_configuration_polling_timeout = -1;
+static int hf_rf4ce_profile_gdp_poll_configuration_polling_key_press_cnt;
+static int hf_rf4ce_profile_gdp_poll_configuration_polling_time_interval;
+static int hf_rf4ce_profile_gdp_poll_configuration_polling_timeout;
 
                                                              /* 0x00 - 0x7f - Reserved */
 #define RF4CE_GDP_ATTR_GDP_PROFILE_VERSION                      0x80
@@ -542,9 +542,9 @@ static const value_string hf_rf4ce_profile_attr_status_vals[] = {
 };
 
 /* RF4CE ZRC 2.0 Profile - Mappable Actions attribute */
-static int hf_rf4ce_profile_zrc20_mappable_actions_action_dev_type = -1;
-static int hf_rf4ce_profile_zrc20_mappable_actions_action_bank = -1;
-static int hf_rf4ce_profile_zrc20_mappable_actions_action_code = -1;
+static int hf_rf4ce_profile_zrc20_mappable_actions_action_dev_type;
+static int hf_rf4ce_profile_zrc20_mappable_actions_action_bank;
+static int hf_rf4ce_profile_zrc20_mappable_actions_action_code;
 
 #define RF4CE_PROFILE_DEV_TYPE_RESERVED                         0x00
 #define RF4CE_PROFILE_DEV_TYPE_REMOTE_CONTROL                   0x01
@@ -595,13 +595,13 @@ static const value_string rf4ce_profile_device_type_vals[] = {
 };
 
 /* RF4CE ZRC 2.0 Profile - Action Mappings attribute - Mapping Flags */
-static int hf_rf4ce_profile_zrc20_action_mappings_mapping_flags = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_mapping_flags_rf_specified = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_mapping_flags_ir_specified = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_mapping_flags_rf_descr_first = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_mapping_flags_reserved = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_mapping_flags_use_default = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_mapping_flags_permanent = -1;
+static int hf_rf4ce_profile_zrc20_action_mappings_mapping_flags;
+static int hf_rf4ce_profile_zrc20_action_mappings_mapping_flags_rf_specified;
+static int hf_rf4ce_profile_zrc20_action_mappings_mapping_flags_ir_specified;
+static int hf_rf4ce_profile_zrc20_action_mappings_mapping_flags_rf_descr_first;
+static int hf_rf4ce_profile_zrc20_action_mappings_mapping_flags_reserved;
+static int hf_rf4ce_profile_zrc20_action_mappings_mapping_flags_use_default;
+static int hf_rf4ce_profile_zrc20_action_mappings_mapping_flags_permanent;
 
 #define RF4CE_PROFILE_ZRC20_ACTION_MAPPINGS_MAPPING_FLAGS_RF_SPECIFIED_MASK   0b00000001
 #define RF4CE_PROFILE_ZRC20_ACTION_MAPPINGS_MAPPING_FLAGS_IR_SPECIFIED_MASK   0b00000010
@@ -619,12 +619,12 @@ static int hf_rf4ce_profile_zrc20_action_mappings_mapping_flags_permanent = -1;
      | RF4CE_PROFILE_ZRC20_ACTION_MAPPINGS_MAPPING_FLAGS_PERMANENT_MASK)
 
 /* RF4CE ZRC 2.0 Profile - Action Mappings attribute - RF Descriptor - RF Config */
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_rf_conf = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_rf_conf_min_num_of_trans = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_rf_conf_keep_trans_until_key_release = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_rf_conf_short_rf_retry = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_rf_conf_atomic_action = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_rf_conf_reserved = -1;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_rf_conf;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_rf_conf_min_num_of_trans;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_rf_conf_keep_trans_until_key_release;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_rf_conf_short_rf_retry;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_rf_conf_atomic_action;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_rf_conf_reserved;
 
 #define RF4CE_PROFILE_ZRC20_ACTION_MAPPINGS_RF_DESCR_RF_CONF_MIN_NUM_OF_TRANS_MASK             0b00001111
 #define RF4CE_PROFILE_ZRC20_ACTION_MAPPINGS_RF_DESCR_RF_CONF_KEEP_TRANS_UNTIL_KEY_RELEASE_MASK 0b00010000
@@ -640,15 +640,15 @@ static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_rf_conf_reserved = -1
      | RF4CE_PROFILE_ZRC20_ACTION_MAPPINGS_RF_DESCR_RF_CONF_RESERVED_MASK)
 
 /* RF4CE ZRC 2.0 Profile - Action Mappings attribute - RF Descriptor - RF4CE TX Options */
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_trans_mode = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_dst_addr_mode = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_ack_mode = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_sec_mode = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_ch_ag_mode = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_ch_norm_mode = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_payload_mode = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_reserved = -1;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_trans_mode;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_dst_addr_mode;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_ack_mode;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_sec_mode;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_ch_ag_mode;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_ch_norm_mode;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_payload_mode;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_tx_opts_reserved;
 
 #define RF4CE_PROFILE_ZRC20_ACTION_MAPPINGS_RF_DESCR_TX_OPTS_TRANS_MODE_MASK    0b00000001
 #define RF4CE_PROFILE_ZRC20_ACTION_MAPPINGS_RF_DESCR_TX_OPTS_DST_ADDR_MODE_MASK 0b00000010
@@ -705,12 +705,12 @@ static const true_false_string rf4ce_profile_zrc20_action_mappings_rf_descr_tx_o
 };
 
 /* RF4CE ZRC 2.0 Profile - Action Mappings attribute - RF Descriptor - Action Data Length */
-static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_action_data_len = -1;
+static int hf_rf4ce_profile_zrc20_action_mappings_rf_descr_action_data_len;
 
 /* RF4CE ZRC 2.0 Profile - Action Mappings attribute - IR Descriptor - IR Config */
-static int hf_rf4ce_profile_zrc20_action_mappings_ir_descr_ir_conf = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_ir_descr_ir_conf_vendor_specific = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_ir_descr_ir_conf_reserved = -1;
+static int hf_rf4ce_profile_zrc20_action_mappings_ir_descr_ir_conf;
+static int hf_rf4ce_profile_zrc20_action_mappings_ir_descr_ir_conf_vendor_specific;
+static int hf_rf4ce_profile_zrc20_action_mappings_ir_descr_ir_conf_reserved;
 
 #define RF4CE_PROFILE_ZRC20_ACTION_MAPPINGS_IR_DESCR_IR_CONF_VENDOR_SPECIFIC_MASK 0b00000001
 #define RF4CE_PROFILE_ZRC20_ACTION_MAPPINGS_IR_DESCR_IR_CONF_RESERVED_MASK        0b11111110
@@ -720,12 +720,12 @@ static int hf_rf4ce_profile_zrc20_action_mappings_ir_descr_ir_conf_reserved = -1
      | RF4CE_PROFILE_ZRC20_ACTION_MAPPINGS_IR_DESCR_IR_CONF_RESERVED_MASK)
 
 /* RF4CE ZRC 2.0 Profile - Action Mappings attribute - IR Descriptor */
-static int hf_rf4ce_profile_zrc20_action_mappings_ir_descr_ir_vendor_id = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_ir_descr_ir_code_len = -1;
-static int hf_rf4ce_profile_zrc20_action_mappings_ir_descr_ir_code = -1;
+static int hf_rf4ce_profile_zrc20_action_mappings_ir_descr_ir_vendor_id;
+static int hf_rf4ce_profile_zrc20_action_mappings_ir_descr_ir_code_len;
+static int hf_rf4ce_profile_zrc20_action_mappings_ir_descr_ir_code;
 
 /* RF4CE ZRC 2.0 Profile - IRDB Vendor Support attribute - Vendor ID */
-static int hf_rf4ce_profile_zrc20_irdb_vendor_support_vendor_id = -1;
+static int hf_rf4ce_profile_zrc20_irdb_vendor_support_vendor_id;
 
 /* RF4CE Profile command - Check Validation */
 #define RF4CE_PROFILE_CMD_CHECK_VALIDATION_SUB_TYPE_REQ 0x00
diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c
index f003796295..8544e4de4e 100644
--- a/epan/dissectors/packet-rfc2190.c
+++ b/epan/dissectors/packet-rfc2190.c
@@ -33,38 +33,38 @@ void proto_register_rfc2190(void);
 void proto_reg_handoff_rfc2190(void);
 
 /* H.263 header fields             */
-static int proto_rfc2190        = -1;
+static int proto_rfc2190;
 
 /* Mode A header */
-static int hf_rfc2190_ftype = -1;
-static int hf_rfc2190_pbframes = -1;
-static int hf_rfc2190_sbit = -1;
-static int hf_rfc2190_ebit = -1;
-static int hf_rfc2190_srcformat = -1;
-static int hf_rfc2190_picture_coding_type_modeA = -1;
-static int hf_rfc2190_unrestricted_motion_vector_modeA = -1;
-static int hf_rfc2190_syntax_based_arithmetic_modeA = -1;
-static int hf_rfc2190_advanced_prediction_modeA = -1;
-static int hf_rfc2190_r_modeA = -1;
-static int hf_rfc2190_rr = -1;
-static int hf_rfc2190_dbq = -1;
-static int hf_rfc2190_trb = -1;
-static int hf_rfc2190_tr = -1;
+static int hf_rfc2190_ftype;
+static int hf_rfc2190_pbframes;
+static int hf_rfc2190_sbit;
+static int hf_rfc2190_ebit;
+static int hf_rfc2190_srcformat;
+static int hf_rfc2190_picture_coding_type_modeA;
+static int hf_rfc2190_unrestricted_motion_vector_modeA;
+static int hf_rfc2190_syntax_based_arithmetic_modeA;
+static int hf_rfc2190_advanced_prediction_modeA;
+static int hf_rfc2190_r_modeA;
+static int hf_rfc2190_rr;
+static int hf_rfc2190_dbq;
+static int hf_rfc2190_trb;
+static int hf_rfc2190_tr;
 /* Additional fields for Mode B or C header */
-static int hf_rfc2190_picture_coding_type_modeB = -1;
-static int hf_rfc2190_unrestricted_motion_vector_modeB = -1;
-static int hf_rfc2190_syntax_based_arithmetic_modeB = -1;
-static int hf_rfc2190_advanced_prediction_modeB = -1;
-static int hf_rfc2190_r_modeB = -1;
-static int hf_rfc2190_quant = -1;
-static int hf_rfc2190_gobn = -1;
-static int hf_rfc2190_mba = -1;
-static int hf_rfc2190_hmv1 = -1;
-static int hf_rfc2190_vmv1 = -1;
-static int hf_rfc2190_hmv2 = -1;
-static int hf_rfc2190_vmv2 = -1;
-
-static gint ett_rfc2190         = -1;
+static int hf_rfc2190_picture_coding_type_modeB;
+static int hf_rfc2190_unrestricted_motion_vector_modeB;
+static int hf_rfc2190_syntax_based_arithmetic_modeB;
+static int hf_rfc2190_advanced_prediction_modeB;
+static int hf_rfc2190_r_modeB;
+static int hf_rfc2190_quant;
+static int hf_rfc2190_gobn;
+static int hf_rfc2190_mba;
+static int hf_rfc2190_hmv1;
+static int hf_rfc2190_vmv1;
+static int hf_rfc2190_hmv2;
+static int hf_rfc2190_vmv2;
+
+static gint ett_rfc2190;
 static dissector_handle_t h263_handle;
 static dissector_handle_t rfc2190_handle;
 
diff --git a/epan/dissectors/packet-rfid-felica.c b/epan/dissectors/packet-rfid-felica.c
index 86e2de9601..74fd80ff72 100644
--- a/epan/dissectors/packet-rfid-felica.c
+++ b/epan/dissectors/packet-rfid-felica.c
@@ -25,40 +25,40 @@
 
 void proto_register_felica(void);
 
-static int proto_felica = -1;
+static int proto_felica;
 
 /* Opcodes */
-static int hf_felica_opcode = -1;
+static int hf_felica_opcode;
 
 /* System Code */
-static int hf_felica_sys_code = -1;
+static int hf_felica_sys_code;
 
 /* Timeslot */
-static int hf_felica_timeslot = -1;
+static int hf_felica_timeslot;
 
 /* Manufacture ID/NFCID2 */
-static int hf_felica_idm = -1;
+static int hf_felica_idm;
 
 /* Request Code */
-static int hf_felica_req_code = -1;
+static int hf_felica_req_code;
 
 /* Manufacture Parameter/PAD */
-static int hf_felica_pnm = -1;
+static int hf_felica_pnm;
 
 /* Number of Services */
 
-static int hf_felica_nbr_of_svcs = -1;
+static int hf_felica_nbr_of_svcs;
 
-static int hf_felica_svc_code = -1;
+static int hf_felica_svc_code;
 
-static int hf_felica_nbr_of_blocks = -1;
-static int hf_felica_block_nbr = -1;
+static int hf_felica_nbr_of_blocks;
+static int hf_felica_block_nbr;
 
 /* Status flag 1 */
-static int hf_felica_status_flag1 = -1;
+static int hf_felica_status_flag1;
 
 /* Status flag 2 */
-static int hf_felica_status_flag2 = -1;
+static int hf_felica_status_flag2;
 
 /* - Commands - */
 #define CMD_POLLING 0x00
@@ -205,7 +205,7 @@ static const value_string felica_sys_codes[] = {
 };
 
 /* Subtree handles: set by register_subtree_array */
-static gint ett_felica = -1;
+static gint ett_felica;
 
 static int dissect_felica(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
diff --git a/epan/dissectors/packet-rfid-mifare.c b/epan/dissectors/packet-rfid-mifare.c
index 2cb45daed3..3176c6c60b 100644
--- a/epan/dissectors/packet-rfid-mifare.c
+++ b/epan/dissectors/packet-rfid-mifare.c
@@ -22,15 +22,15 @@
 
 void proto_register_mifare(void);
 
-static int proto_mifare = -1;
+static int proto_mifare;
 
-static int hf_mifare_command = -1;
-static int hf_mifare_block_address = -1;
-static int hf_mifare_key_a = -1;
-static int hf_mifare_key_b = -1;
-static int hf_mifare_uid = -1;
-static int hf_mifare_operand = -1;
-static int hf_mifare_payload = -1;
+static int hf_mifare_command;
+static int hf_mifare_block_address;
+static int hf_mifare_key_a;
+static int hf_mifare_key_b;
+static int hf_mifare_uid;
+static int hf_mifare_operand;
+static int hf_mifare_payload;
 
 #define AUTH_A    0x60
 #define AUTH_B    0x61
@@ -56,7 +56,7 @@ static const value_string hf_mifare_commands[] = {
 };
 
 /* Subtree handles: set by register_subtree_array */
-static gint ett_mifare = -1;
+static gint ett_mifare;
 
 static int
 dissect_mifare(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-rfid-pn532-hci.c b/epan/dissectors/packet-rfid-pn532-hci.c
index 732667ba73..9bf964b45f 100644
--- a/epan/dissectors/packet-rfid-pn532-hci.c
+++ b/epan/dissectors/packet-rfid-pn532-hci.c
@@ -19,24 +19,24 @@
 #include <epan/expert.h>
 #include "packet-usb.h"
 
-static int proto_pn532_hci                                                 = -1;
-static int hf_preamble                                                     = -1;
-static int hf_start_code                                                   = -1;
-static int hf_length                                                       = -1;
-static int hf_length_checksum                                              = -1;
-static int hf_length_checksum_status                                       = -1;
-static int hf_extended_length                                              = -1;
-static int hf_packet_code                                                  = -1;
-static int hf_postable                                                     = -1;
-static int hf_specific_application_level_error_code                        = -1;
-static int hf_data_checksum                                                = -1;
-static int hf_data_checksum_status                                         = -1;
-static int hf_ignored                                                      = -1;
-
-static gint ett_pn532_hci                                                  = -1;
-
-static expert_field ei_invalid_length_checksum                        = EI_INIT;
-static expert_field ei_invalid_data_checksum                          = EI_INIT;
+static int proto_pn532_hci;
+static int hf_preamble;
+static int hf_start_code;
+static int hf_length;
+static int hf_length_checksum;
+static int hf_length_checksum_status;
+static int hf_extended_length;
+static int hf_packet_code;
+static int hf_postable;
+static int hf_specific_application_level_error_code;
+static int hf_data_checksum;
+static int hf_data_checksum_status;
+static int hf_ignored;
+
+static gint ett_pn532_hci;
+
+static expert_field ei_invalid_length_checksum;
+static expert_field ei_invalid_data_checksum;
 
 static dissector_handle_t  pn532_handle;
 static dissector_handle_t  pn532_hci_handle;
diff --git a/epan/dissectors/packet-rfid-pn532.c b/epan/dissectors/packet-rfid-pn532.c
index d0426fbda0..d21755e8e2 100644
--- a/epan/dissectors/packet-rfid-pn532.c
+++ b/epan/dissectors/packet-rfid-pn532.c
@@ -22,188 +22,188 @@
 #include <epan/expert.h>
 #include "packet-usb.h"
 
-static int proto_pn532 = -1;
-
-static int hf_pn532_command = -1;
-static int hf_pn532_direction = -1;
-static int hf_pn532_MaxTg = -1;
-static int hf_pn532_Tg = -1;
-static int hf_pn532_NbTg = -1;
-static int hf_pn532_BrTy = -1;
-static int hf_pn532_error = -1;
-static int hf_pn532_status_nad_present = -1;
-static int hf_pn532_status_mi = -1;
-static int hf_pn532_status_error_code = -1;
-static int hf_pn532_payload_length = -1;
-static int hf_pn532_ic_version = -1;
-static int hf_pn532_fw_version = -1;
-static int hf_pn532_fw_revision = -1;
-static int hf_pn532_fw_support = -1;
-static int hf_pn532_fw_support_rfu = -1;
-static int hf_pn532_fw_support_iso_018092 = -1;
-static int hf_pn532_fw_support_iso_iec_14443_type_b = -1;
-static int hf_pn532_fw_support_iso_iec_14443_type_a = -1;
-static int hf_pn532_14443a_uid = -1;
-static int hf_pn532_sam_mode = -1;
-static int hf_pn532_sam_timeout = -1;
-static int hf_pn532_sam_irq = -1;
-static int hf_pn532_config = -1;
-static int hf_pn532_config_not_used = -1;
-static int hf_pn532_config_auto_rfca = -1;
-static int hf_pn532_config_rf = -1;
-static int hf_pn532_config_rfu = -1;
-static int hf_pn532_config_atr_res_timeout = -1;
-static int hf_pn532_config_timeout_non_dep = -1;
-static int hf_pn532_config_max_rty_com = -1;
-static int hf_pn532_config_max_rty_atr = -1;
-static int hf_pn532_config_max_rty_psl = -1;
-static int hf_pn532_config_max_rty_passive_activation = -1;
-static int hf_pn532_afi = -1;
-static int hf_pn532_polling_method = -1;
-static int hf_pn532_config_ciu_rf_cfg = -1;
-static int hf_pn532_config_ciu_cw_gs_p = -1;
-static int hf_pn532_config_ciu_mod_gs_p = -1;
-static int hf_pn532_config_ciu_rx_threshold = -1;
-static int hf_pn532_config_ciu_demon_rf_on = -1;
-static int hf_pn532_config_ciu_demon_rf_off = -1;
-static int hf_pn532_config_ciu_gs_n_on = -1;
-static int hf_pn532_config_ciu_gs_n_off = -1;
-static int hf_pn532_config_ciu_mod_width = -1;
-static int hf_pn532_config_ciu_mif_nfc = -1;
-static int hf_pn532_config_ciu_tx_bit_phase = -1;
-static int hf_pn532_config_212_kbps = -1;
-static int hf_pn532_config_424_kbps = -1;
-static int hf_pn532_config_848_kbps = -1;
-static int hf_pn532_state = -1;
-static int hf_pn532_brit_nu_7 = -1;
-static int hf_pn532_brit_speed_target = -1;
-static int hf_pn532_brit_nu_3 = -1;
-static int hf_pn532_brit_speed_initiator = -1;
-static int hf_pn532_tg_response = -1;
-static int hf_pn532_initiator_command = -1;
-static int hf_pn532_data_in = -1;
-static int hf_pn532_data_out = -1;
-static int hf_pn532_gt = -1;
-static int hf_pn532_mode_nu_7 = -1;
-static int hf_pn532_mode_nu_3_7 = -1;
-static int hf_pn532_mode_picc_only = -1;
-static int hf_pn532_mode_dep_only = -1;
-static int hf_pn532_mode_passive_only = -1;
-static int hf_pn532_mode_mifare_parameters = -1;
-static int hf_pn532_mode_mifare_parameters_sens_res = -1;
-static int hf_pn532_mode_mifare_parameters_nfc_id_1t = -1;
-static int hf_pn532_mode_mifare_parameters_sel_res = -1;
-static int hf_pn532_mode_felica_parameters = -1;
-static int hf_pn532_mode_felica_parameters_nfc_id_2t = -1;
-static int hf_pn532_mode_felica_parameters_pad = -1;
-static int hf_pn532_mode_felica_parameters_system_code = -1;
-static int hf_pn532_mode_nfc_id_3t = -1;
-static int hf_pn532_mode_gt_length = -1;
-static int hf_pn532_mode_gt = -1;
-static int hf_pn532_mode_tk_length = -1;
-static int hf_pn532_mode_tk = -1;
-static int hf_pn532_mode_baudrate = -1;
-static int hf_pn532_mode_iso_iec_14443_4_picc = -1;
-static int hf_pn532_mode_dep = -1;
-static int hf_pn532_mode_framing_type = -1;
-static int hf_pn532_brit = -1;
-static int hf_pn532_brti = -1;
-static int hf_pn532_txmode_nu_7 = -1;
-static int hf_pn532_txmode_tx_speed = -1;
-static int hf_pn532_txmode_nu_2_3 = -1;
-static int hf_pn532_txmode_tx_framing = -1;
-static int hf_pn532_baudrate = -1;
-static int hf_pn532_flags = -1;
-static int hf_pn532_flags_rfu_7 = -1;
-static int hf_pn532_flags_remove_preamble_and_postamble = -1;
-static int hf_pn532_flags_iso_14443_4_picc_emulation = -1;
-static int hf_pn532_flags_automatic_rats = -1;
-static int hf_pn532_flags_rfu_3 = -1;
-static int hf_pn532_flags_automatic_atr_res = -1;
-static int hf_pn532_flags_did_used = -1;
-static int hf_pn532_flags_nad_used = -1;
-static int hf_pn532_target = -1;
-static int hf_pn532_wakeup_enable = -1;
-static int hf_pn532_generate_irq = -1;
-static int hf_pn532_register_address = -1;
-static int hf_pn532_register_value = -1;
-static int hf_pn532_field = -1;
-static int hf_pn532_brrx = -1;
-static int hf_pn532_brtx = -1;
-static int hf_pn532_type = -1;
-static int hf_pn532_sam_status = -1;
-static int hf_pn532_wakeup_enable_i2c = -1;
-static int hf_pn532_wakeup_enable_gpio = -1;
-static int hf_pn532_wakeup_enable_spi = -1;
-static int hf_pn532_wakeup_enable_hsu = -1;
-static int hf_pn532_wakeup_enable_rf_level_detector = -1;
-static int hf_pn532_wakeup_enable_rfu_2 = -1;
-static int hf_pn532_wakeup_enable_int_1 = -1;
-static int hf_pn532_wakeup_enable_int_0 = -1;
-static int hf_pn532_gpio_ioi1 = -1;
-static int hf_pn532_gpio_p3 = -1;
-static int hf_pn532_gpio_p7 = -1;
-static int hf_pn532_poll_number = -1;
-static int hf_pn532_period = -1;
-static int hf_pn532_autopoll_type = -1;
-static int hf_pn532_autopoll_type_act = -1;
-static int hf_pn532_autopoll_type_dep = -1;
-static int hf_pn532_autopoll_type_tcl = -1;
-static int hf_pn532_autopoll_type_mf_fe = -1;
-static int hf_pn532_autopoll_type_not_used = -1;
-static int hf_pn532_autopoll_type_baudrate_and_modulation = -1;
-static int hf_pn532_target_data = -1;
-static int hf_pn532_target_data_length = -1;
-static int hf_pn532_nfc_id_3i = -1;
-static int hf_pn532_gi = -1;
-static int hf_pn532_next_not_used_2_7 = -1;
-static int hf_pn532_next_gi = -1;
-static int hf_pn532_next_nfc_id_3i = -1;
-static int hf_pn532_nfc_id_3t = -1;
-static int hf_pn532_activation_baudrate = -1;
-static int hf_pn532_communication_mode = -1;
-static int hf_pn532_jump_next_not_used_3_7 = -1;
-static int hf_pn532_jump_next_passive_initiator_data = -1;
-static int hf_pn532_jump_next_gi = -1;
-static int hf_pn532_jump_next_nfc_id_3i = -1;
-static int hf_pn532_passive_initiator_data = -1;
-static int hf_pn532_did_target = -1;
-static int hf_pn532_send_bit_rate_target = -1;
-static int hf_pn532_receive_bit_rate_target = -1;
-static int hf_pn532_timeout = -1;
-static int hf_pn532_optional_parameters = -1;
-static int hf_pn532_test_number = -1;
-static int hf_pn532_parameters = -1;
-static int hf_pn532_parameters_length = -1;
-static int hf_pn532_sens_res = -1;
-static int hf_pn532_sel_res = -1;
-static int hf_pn532_nfc_id_length = -1;
-static int hf_pn532_nfc_id_1 = -1;
-static int hf_pn532_ats_length = -1;
-static int hf_pn532_ats = -1;
-static int hf_pn532_pol_res_length = -1;
-static int hf_pn532_response_code = -1;
-static int hf_pn532_nfc_id_2t = -1;
-static int hf_pn532_pad = -1;
-static int hf_pn532_syst_code = -1;
-static int hf_pn532_atqb_response = -1;
-static int hf_pn532_attrib_res_length = -1;
-static int hf_pn532_attrib_res = -1;
-static int hf_pn532_jewel_id = -1;
-static int hf_pn532_response_for = -1;
-static int hf_pn532_diagnose_baudrate = -1;
-static int hf_pn532_reply_delay = -1;
-static int hf_pn532_ciu_tx_mode = -1;
-static int hf_pn532_ciu_rx_mode = -1;
-static int hf_pn532_diagnose_result = -1;
-static int hf_pn532_diagnose_number_of_fails = -1;
-static int hf_pn532_andet_bot = -1;
-static int hf_pn532_andet_up = -1;
-static int hf_pn532_andet_ith = -1;
-static int hf_pn532_andet_en = -1;
-
-static expert_field ei_unknown_data = EI_INIT;
-static expert_field ei_unexpected_data = EI_INIT;
+static int proto_pn532;
+
+static int hf_pn532_command;
+static int hf_pn532_direction;
+static int hf_pn532_MaxTg;
+static int hf_pn532_Tg;
+static int hf_pn532_NbTg;
+static int hf_pn532_BrTy;
+static int hf_pn532_error;
+static int hf_pn532_status_nad_present;
+static int hf_pn532_status_mi;
+static int hf_pn532_status_error_code;
+static int hf_pn532_payload_length;
+static int hf_pn532_ic_version;
+static int hf_pn532_fw_version;
+static int hf_pn532_fw_revision;
+static int hf_pn532_fw_support;
+static int hf_pn532_fw_support_rfu;
+static int hf_pn532_fw_support_iso_018092;
+static int hf_pn532_fw_support_iso_iec_14443_type_b;
+static int hf_pn532_fw_support_iso_iec_14443_type_a;
+static int hf_pn532_14443a_uid;
+static int hf_pn532_sam_mode;
+static int hf_pn532_sam_timeout;
+static int hf_pn532_sam_irq;
+static int hf_pn532_config;
+static int hf_pn532_config_not_used;
+static int hf_pn532_config_auto_rfca;
+static int hf_pn532_config_rf;
+static int hf_pn532_config_rfu;
+static int hf_pn532_config_atr_res_timeout;
+static int hf_pn532_config_timeout_non_dep;
+static int hf_pn532_config_max_rty_com;
+static int hf_pn532_config_max_rty_atr;
+static int hf_pn532_config_max_rty_psl;
+static int hf_pn532_config_max_rty_passive_activation;
+static int hf_pn532_afi;
+static int hf_pn532_polling_method;
+static int hf_pn532_config_ciu_rf_cfg;
+static int hf_pn532_config_ciu_cw_gs_p;
+static int hf_pn532_config_ciu_mod_gs_p;
+static int hf_pn532_config_ciu_rx_threshold;
+static int hf_pn532_config_ciu_demon_rf_on;
+static int hf_pn532_config_ciu_demon_rf_off;
+static int hf_pn532_config_ciu_gs_n_on;
+static int hf_pn532_config_ciu_gs_n_off;
+static int hf_pn532_config_ciu_mod_width;
+static int hf_pn532_config_ciu_mif_nfc;
+static int hf_pn532_config_ciu_tx_bit_phase;
+static int hf_pn532_config_212_kbps;
+static int hf_pn532_config_424_kbps;
+static int hf_pn532_config_848_kbps;
+static int hf_pn532_state;
+static int hf_pn532_brit_nu_7;
+static int hf_pn532_brit_speed_target;
+static int hf_pn532_brit_nu_3;
+static int hf_pn532_brit_speed_initiator;
+static int hf_pn532_tg_response;
+static int hf_pn532_initiator_command;
+static int hf_pn532_data_in;
+static int hf_pn532_data_out;
+static int hf_pn532_gt;
+static int hf_pn532_mode_nu_7;
+static int hf_pn532_mode_nu_3_7;
+static int hf_pn532_mode_picc_only;
+static int hf_pn532_mode_dep_only;
+static int hf_pn532_mode_passive_only;
+static int hf_pn532_mode_mifare_parameters;
+static int hf_pn532_mode_mifare_parameters_sens_res;
+static int hf_pn532_mode_mifare_parameters_nfc_id_1t;
+static int hf_pn532_mode_mifare_parameters_sel_res;
+static int hf_pn532_mode_felica_parameters;
+static int hf_pn532_mode_felica_parameters_nfc_id_2t;
+static int hf_pn532_mode_felica_parameters_pad;
+static int hf_pn532_mode_felica_parameters_system_code;
+static int hf_pn532_mode_nfc_id_3t;
+static int hf_pn532_mode_gt_length;
+static int hf_pn532_mode_gt;
+static int hf_pn532_mode_tk_length;
+static int hf_pn532_mode_tk;
+static int hf_pn532_mode_baudrate;
+static int hf_pn532_mode_iso_iec_14443_4_picc;
+static int hf_pn532_mode_dep;
+static int hf_pn532_mode_framing_type;
+static int hf_pn532_brit;
+static int hf_pn532_brti;
+static int hf_pn532_txmode_nu_7;
+static int hf_pn532_txmode_tx_speed;
+static int hf_pn532_txmode_nu_2_3;
+static int hf_pn532_txmode_tx_framing;
+static int hf_pn532_baudrate;
+static int hf_pn532_flags;
+static int hf_pn532_flags_rfu_7;
+static int hf_pn532_flags_remove_preamble_and_postamble;
+static int hf_pn532_flags_iso_14443_4_picc_emulation;
+static int hf_pn532_flags_automatic_rats;
+static int hf_pn532_flags_rfu_3;
+static int hf_pn532_flags_automatic_atr_res;
+static int hf_pn532_flags_did_used;
+static int hf_pn532_flags_nad_used;
+static int hf_pn532_target;
+static int hf_pn532_wakeup_enable;
+static int hf_pn532_generate_irq;
+static int hf_pn532_register_address;
+static int hf_pn532_register_value;
+static int hf_pn532_field;
+static int hf_pn532_brrx;
+static int hf_pn532_brtx;
+static int hf_pn532_type;
+static int hf_pn532_sam_status;
+static int hf_pn532_wakeup_enable_i2c;
+static int hf_pn532_wakeup_enable_gpio;
+static int hf_pn532_wakeup_enable_spi;
+static int hf_pn532_wakeup_enable_hsu;
+static int hf_pn532_wakeup_enable_rf_level_detector;
+static int hf_pn532_wakeup_enable_rfu_2;
+static int hf_pn532_wakeup_enable_int_1;
+static int hf_pn532_wakeup_enable_int_0;
+static int hf_pn532_gpio_ioi1;
+static int hf_pn532_gpio_p3;
+static int hf_pn532_gpio_p7;
+static int hf_pn532_poll_number;
+static int hf_pn532_period;
+static int hf_pn532_autopoll_type;
+static int hf_pn532_autopoll_type_act;
+static int hf_pn532_autopoll_type_dep;
+static int hf_pn532_autopoll_type_tcl;
+static int hf_pn532_autopoll_type_mf_fe;
+static int hf_pn532_autopoll_type_not_used;
+static int hf_pn532_autopoll_type_baudrate_and_modulation;
+static int hf_pn532_target_data;
+static int hf_pn532_target_data_length;
+static int hf_pn532_nfc_id_3i;
+static int hf_pn532_gi;
+static int hf_pn532_next_not_used_2_7;
+static int hf_pn532_next_gi;
+static int hf_pn532_next_nfc_id_3i;
+static int hf_pn532_nfc_id_3t;
+static int hf_pn532_activation_baudrate;
+static int hf_pn532_communication_mode;
+static int hf_pn532_jump_next_not_used_3_7;
+static int hf_pn532_jump_next_passive_initiator_data;
+static int hf_pn532_jump_next_gi;
+static int hf_pn532_jump_next_nfc_id_3i;
+static int hf_pn532_passive_initiator_data;
+static int hf_pn532_did_target;
+static int hf_pn532_send_bit_rate_target;
+static int hf_pn532_receive_bit_rate_target;
+static int hf_pn532_timeout;
+static int hf_pn532_optional_parameters;
+static int hf_pn532_test_number;
+static int hf_pn532_parameters;
+static int hf_pn532_parameters_length;
+static int hf_pn532_sens_res;
+static int hf_pn532_sel_res;
+static int hf_pn532_nfc_id_length;
+static int hf_pn532_nfc_id_1;
+static int hf_pn532_ats_length;
+static int hf_pn532_ats;
+static int hf_pn532_pol_res_length;
+static int hf_pn532_response_code;
+static int hf_pn532_nfc_id_2t;
+static int hf_pn532_pad;
+static int hf_pn532_syst_code;
+static int hf_pn532_atqb_response;
+static int hf_pn532_attrib_res_length;
+static int hf_pn532_attrib_res;
+static int hf_pn532_jewel_id;
+static int hf_pn532_response_for;
+static int hf_pn532_diagnose_baudrate;
+static int hf_pn532_reply_delay;
+static int hf_pn532_ciu_tx_mode;
+static int hf_pn532_ciu_rx_mode;
+static int hf_pn532_diagnose_result;
+static int hf_pn532_diagnose_number_of_fails;
+static int hf_pn532_andet_bot;
+static int hf_pn532_andet_up;
+static int hf_pn532_andet_ith;
+static int hf_pn532_andet_en;
+
+static expert_field ei_unknown_data;
+static expert_field ei_unexpected_data;
 
 static wmem_tree_t *command_info = NULL;
 
@@ -312,17 +312,17 @@ static dissector_handle_t sub_handles[SUB_MAX];
 static gint sub_selected = SUB_DATA;
 
 /* Subtree handles: set by register_subtree_array */
-static gint ett_pn532 = -1;
-static gint ett_pn532_flags = -1;
-static gint ett_pn532_target = -1;
-static gint ett_pn532_fw_support = -1;
-static gint ett_pn532_config_212_kbps = -1;
-static gint ett_pn532_config_424_kbps = -1;
-static gint ett_pn532_config_848_kbps = -1;
-static gint ett_pn532_mifare_parameters = -1;
-static gint ett_pn532_felica_parameters = -1;
-static gint ett_pn532_wakeup_enable = -1;
-static gint ett_pn532_autopoll_type = -1;
+static gint ett_pn532;
+static gint ett_pn532_flags;
+static gint ett_pn532_target;
+static gint ett_pn532_fw_support;
+static gint ett_pn532_config_212_kbps;
+static gint ett_pn532_config_424_kbps;
+static gint ett_pn532_config_848_kbps;
+static gint ett_pn532_mifare_parameters;
+static gint ett_pn532_felica_parameters;
+static gint ett_pn532_wakeup_enable;
+static gint ett_pn532_autopoll_type;
 
 /* Re-arranged from defs above to be in ascending order by value */
 static const value_string pn532_commands[] = {
diff --git a/epan/dissectors/packet-rftap.c b/epan/dissectors/packet-rftap.c
index ba50665abe..0992de99aa 100644
--- a/epan/dissectors/packet-rftap.c
+++ b/epan/dissectors/packet-rftap.c
@@ -33,56 +33,56 @@ void proto_reg_handoff_rftap(void);
 void proto_register_rftap(void);
 
 /* protocols */
-static int proto_rftap = -1;
+static int proto_rftap;
 
 /* rftap fixed fields */
-static int hf_rftap_fixed_header = -1;
-static int hf_rftap_magic = -1;
-static int hf_rftap_len = -1;    /* length in bytes */
-static int hf_rftap_flags = -1;
+static int hf_rftap_fixed_header;
+static int hf_rftap_magic;
+static int hf_rftap_len;    /* length in bytes */
+static int hf_rftap_flags;
 
 /* rftap flags bit-field (16 bits) */
-static int hf_rftap_present_dlt = -1;
-static int hf_rftap_present_freq = -1;
-static int hf_rftap_present_nomfreq = -1;
-static int hf_rftap_present_freqofs = -1;
-static int hf_rftap_power_is_in_dbm = -1;
-static int hf_rftap_present_signal_power = -1;
-static int hf_rftap_present_noise_power = -1;
-static int hf_rftap_present_snr = -1;
-static int hf_rftap_present_signal_quality = -1;
-static int hf_rftap_time_is_unix_time = -1;
-static int hf_rftap_present_time = -1;
-static int hf_rftap_present_duration = -1;
-static int hf_rftap_present_location = -1;
-static int hf_rftap_present_reserved_field_13 = -1;
-static int hf_rftap_present_reserved_field_14 = -1;
-static int hf_rftap_present_reserved_field_15 = -1;
+static int hf_rftap_present_dlt;
+static int hf_rftap_present_freq;
+static int hf_rftap_present_nomfreq;
+static int hf_rftap_present_freqofs;
+static int hf_rftap_power_is_in_dbm;
+static int hf_rftap_present_signal_power;
+static int hf_rftap_present_noise_power;
+static int hf_rftap_present_snr;
+static int hf_rftap_present_signal_quality;
+static int hf_rftap_time_is_unix_time;
+static int hf_rftap_present_time;
+static int hf_rftap_present_duration;
+static int hf_rftap_present_location;
+static int hf_rftap_present_reserved_field_13;
+static int hf_rftap_present_reserved_field_14;
+static int hf_rftap_present_reserved_field_15;
 
 /* rftap optional fields */
-static int hf_rftap_dlt = -1;
-static int hf_rftap_freq = -1;
-static int hf_rftap_nomfreq = -1;
-static int hf_rftap_freqofs = -1;
-static int hf_rftap_signal_power = -1;
-static int hf_rftap_noise_power = -1;
-static int hf_rftap_snr = -1;
-static int hf_rftap_signal_quality = -1;
-static int hf_rftap_time_int = -1;
-static int hf_rftap_time_frac = -1;
-static int hf_rftap_time = -1;
-static int hf_rftap_duration = -1;
-static int hf_rftap_latitude = -1;
-static int hf_rftap_longitude = -1;
-static int hf_rftap_altitude = -1;
+static int hf_rftap_dlt;
+static int hf_rftap_freq;
+static int hf_rftap_nomfreq;
+static int hf_rftap_freqofs;
+static int hf_rftap_signal_power;
+static int hf_rftap_noise_power;
+static int hf_rftap_snr;
+static int hf_rftap_signal_quality;
+static int hf_rftap_time_int;
+static int hf_rftap_time_frac;
+static int hf_rftap_time;
+static int hf_rftap_duration;
+static int hf_rftap_latitude;
+static int hf_rftap_longitude;
+static int hf_rftap_altitude;
 
 /* rftap tag IDs >= 16 */
-static int hf_rftap_subdissector_name = -1;
+static int hf_rftap_subdissector_name;
 
 /* subtree pointers */
-static gint ett_rftap = -1;
-static gint ett_rftap_fixed_header = -1;
-static gint ett_rftap_flags = -1;
+static gint ett_rftap;
+static gint ett_rftap_fixed_header;
+static gint ett_rftap_flags;
 
 static dissector_handle_t pcap_pktdata_handle;
 
diff --git a/epan/dissectors/packet-rgmp.c b/epan/dissectors/packet-rgmp.c
index e36102aa0f..9b59a6da33 100644
--- a/epan/dissectors/packet-rgmp.c
+++ b/epan/dissectors/packet-rgmp.c
@@ -24,16 +24,16 @@
 void proto_register_rgmp(void);
 void proto_reg_handoff_rgmp(void);
 
-static int proto_rgmp      = -1;
-static int hf_type         = -1;
-static int hf_reserved     = -1;
-static int hf_checksum     = -1;
-static int hf_checksum_status = -1;
-static int hf_maddr        = -1;
+static int proto_rgmp;
+static int hf_type;
+static int hf_reserved;
+static int hf_checksum;
+static int hf_checksum_status;
+static int hf_maddr;
 
-static int ett_rgmp = -1;
+static int ett_rgmp;
 
-static expert_field ei_checksum = EI_INIT;
+static expert_field ei_checksum;
 
 static dissector_handle_t rgmp_handle;
 
diff --git a/epan/dissectors/packet-riemann.c b/epan/dissectors/packet-riemann.c
index ed61cf0b53..663aafa49e 100644
--- a/epan/dissectors/packet-riemann.c
+++ b/epan/dissectors/packet-riemann.c
@@ -72,41 +72,41 @@ void proto_register_riemann(void);
 
 static dissector_handle_t riemann_udp_handle, riemann_tcp_handle;
 
-static int proto_riemann = -1;
-static int hf_riemann_msg_ok = -1;
-static int hf_riemann_msg_error = -1;
-static int hf_riemann_attribute = -1;
-static int hf_riemann_attribute_key = -1;
-static int hf_riemann_attribute_value = -1;
-static int hf_riemann_query = -1;
-static int hf_riemann_query_string = -1;
-static int hf_riemann_event = -1;
-static int hf_riemann_event_state = -1;
-static int hf_riemann_event_service = -1;
-static int hf_riemann_event_host = -1;
-static int hf_riemann_event_description = -1;
-static int hf_riemann_event_tag = -1;
-static int hf_riemann_event_ttl = -1;
-static int hf_riemann_event_time = -1;
-static int hf_riemann_event_metric_d = -1;
-static int hf_riemann_event_metric_f = -1;
-static int hf_riemann_event_time_micros = -1;
-static int hf_riemann_event_metric_sint64 = -1;
-static int hf_riemann_state = -1;
-static int hf_riemann_state_service = -1;
-static int hf_riemann_state_host = -1;
-static int hf_riemann_state_description = -1;
-static int hf_riemann_state_tag = -1;
-static int hf_riemann_state_ttl = -1;
-static int hf_riemann_state_time = -1;
-static int hf_riemann_state_state = -1;
-static int hf_riemann_state_once = -1;
-
-static gint ett_riemann = -1;
-static gint ett_query = -1;
-static gint ett_event = -1;
-static gint ett_attribute = -1;
-static gint ett_state = -1;
+static int proto_riemann;
+static int hf_riemann_msg_ok;
+static int hf_riemann_msg_error;
+static int hf_riemann_attribute;
+static int hf_riemann_attribute_key;
+static int hf_riemann_attribute_value;
+static int hf_riemann_query;
+static int hf_riemann_query_string;
+static int hf_riemann_event;
+static int hf_riemann_event_state;
+static int hf_riemann_event_service;
+static int hf_riemann_event_host;
+static int hf_riemann_event_description;
+static int hf_riemann_event_tag;
+static int hf_riemann_event_ttl;
+static int hf_riemann_event_time;
+static int hf_riemann_event_metric_d;
+static int hf_riemann_event_metric_f;
+static int hf_riemann_event_time_micros;
+static int hf_riemann_event_metric_sint64;
+static int hf_riemann_state;
+static int hf_riemann_state_service;
+static int hf_riemann_state_host;
+static int hf_riemann_state_description;
+static int hf_riemann_state_tag;
+static int hf_riemann_state_ttl;
+static int hf_riemann_state_time;
+static int hf_riemann_state_state;
+static int hf_riemann_state_once;
+
+static gint ett_riemann;
+static gint ett_query;
+static gint ett_event;
+static gint ett_attribute;
+static gint ett_state;
 
 #define RIEMANN_MIN_LENGTH 16
 #define RIEMANN_MIN_NEEDED_FOR_HEURISTICS 10
@@ -151,9 +151,9 @@ static gint ett_state = -1;
 #define RIEMANN_WIRE_BYTES 2
 #define RIEMANN_WIRE_FLOAT 5
 
-static expert_field ei_error_unknown_wire_tag = EI_INIT;
-static expert_field ei_error_unknown_field_number = EI_INIT;
-static expert_field ei_error_insufficient_data = EI_INIT;
+static expert_field ei_error_unknown_wire_tag;
+static expert_field ei_error_unknown_field_number;
+static expert_field ei_error_insufficient_data;
 
 static void
 riemann_verify_wire_format(guint64 field_number, const char *field_name, int expected, int actual,
diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c
index fa37c8d36f..8cf33930a1 100644
--- a/epan/dissectors/packet-rip.c
+++ b/epan/dissectors/packet-rip.c
@@ -70,31 +70,31 @@ static gboolean pref_display_routing_domain = FALSE;
 
 static dissector_handle_t rip_handle;
 
-static int proto_rip = -1;
-
-static int hf_rip_auth = -1;
-static int hf_rip_auth_data_len = -1;
-static int hf_rip_auth_passwd = -1;
-static int hf_rip_auth_seq_num = -1;
-static int hf_rip_authentication_data = -1;
-static int hf_rip_command = -1;
-static int hf_rip_digest_offset = -1;
-static int hf_rip_family = -1;
-static int hf_rip_ip = -1;
-static int hf_rip_key_id = -1;
-static int hf_rip_metric = -1;
-static int hf_rip_netmask = -1;
-static int hf_rip_next_hop = -1;
-static int hf_rip_route_tag = -1;
-static int hf_rip_routing_domain = -1;
-static int hf_rip_version = -1;
-static int hf_rip_zero_padding = -1;
-
-static gint ett_rip = -1;
-static gint ett_rip_vec = -1;
-static gint ett_auth_vec = -1;
-
-static expert_field ei_rip_unknown_address_family = EI_INIT;
+static int proto_rip;
+
+static int hf_rip_auth;
+static int hf_rip_auth_data_len;
+static int hf_rip_auth_passwd;
+static int hf_rip_auth_seq_num;
+static int hf_rip_authentication_data;
+static int hf_rip_command;
+static int hf_rip_digest_offset;
+static int hf_rip_family;
+static int hf_rip_ip;
+static int hf_rip_key_id;
+static int hf_rip_metric;
+static int hf_rip_netmask;
+static int hf_rip_next_hop;
+static int hf_rip_route_tag;
+static int hf_rip_routing_domain;
+static int hf_rip_version;
+static int hf_rip_zero_padding;
+
+static gint ett_rip;
+static gint ett_rip_vec;
+static gint ett_auth_vec;
+
+static expert_field ei_rip_unknown_address_family;
 
 static void dissect_unspec_rip_vektor(tvbuff_t *tvb, int offset, guint8 version,
     proto_tree *tree);
diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c
index 8df74457f4..0bb47148d1 100644
--- a/epan/dissectors/packet-ripng.c
+++ b/epan/dissectors/packet-ripng.c
@@ -25,19 +25,19 @@ void proto_reg_handoff_ripng(void);
 
 static dissector_handle_t ripng_handle;
 
-static int proto_ripng = -1;
-static int hf_ripng_cmd = -1;
-static int hf_ripng_version = -1;
-static int hf_ripng_reserved = -1;
-
-static int hf_ripng_rte = -1;
-static int hf_ripng_rte_ipv6_prefix = -1;
-static int hf_ripng_rte_route_tag = -1;
-static int hf_ripng_rte_prefix_length = -1;
-static int hf_ripng_rte_metric = -1;
-
-static gint ett_ripng = -1;
-static gint ett_ripng_rte = -1;
+static int proto_ripng;
+static int hf_ripng_cmd;
+static int hf_ripng_version;
+static int hf_ripng_reserved;
+
+static int hf_ripng_rte;
+static int hf_ripng_rte_ipv6_prefix;
+static int hf_ripng_rte_route_tag;
+static int hf_ripng_rte_prefix_length;
+static int hf_ripng_rte_metric;
+
+static gint ett_ripng;
+static gint ett_ripng_rte;
 
 #define UDP_PORT_RIPNG  521
 
diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c
index e32457de6f..c505b0eff9 100644
--- a/epan/dissectors/packet-rlc-lte.c
+++ b/epan/dissectors/packet-rlc-lte.c
@@ -86,7 +86,7 @@ static wmem_tree_t *ue_parameters_tree;
 
 /**************************************************/
 /* Initialize the protocol and registered fields. */
-int proto_rlc_lte = -1;
+int proto_rlc_lte;
 
 extern int proto_mac_lte;
 extern int proto_pdcp_lte;
@@ -109,132 +109,132 @@ static dissector_handle_t lte_rrc_pcch_nb;
 static int rlc_lte_tap = -1;
 
 /* Decoding context */
-static int hf_rlc_lte_context = -1;
-static int hf_rlc_lte_context_mode = -1;
-static int hf_rlc_lte_context_direction = -1;
-static int hf_rlc_lte_context_priority = -1;
-static int hf_rlc_lte_context_ueid = -1;
-static int hf_rlc_lte_context_channel_type = -1;
-static int hf_rlc_lte_context_channel_id = -1;
-static int hf_rlc_lte_context_pdu_length = -1;
-static int hf_rlc_lte_context_um_sn_length = -1;
-static int hf_rlc_lte_context_am_sn_length = -1;
+static int hf_rlc_lte_context;
+static int hf_rlc_lte_context_mode;
+static int hf_rlc_lte_context_direction;
+static int hf_rlc_lte_context_priority;
+static int hf_rlc_lte_context_ueid;
+static int hf_rlc_lte_context_channel_type;
+static int hf_rlc_lte_context_channel_id;
+static int hf_rlc_lte_context_pdu_length;
+static int hf_rlc_lte_context_um_sn_length;
+static int hf_rlc_lte_context_am_sn_length;
 
 /* Transparent mode fields */
-static int hf_rlc_lte_tm = -1;
-static int hf_rlc_lte_tm_data = -1;
+static int hf_rlc_lte_tm;
+static int hf_rlc_lte_tm_data;
 
 /* Unacknowledged mode fields */
-static int hf_rlc_lte_um = -1;
-static int hf_rlc_lte_um_header = -1;
-static int hf_rlc_lte_um_fi = -1;
-static int hf_rlc_lte_um_fixed_e = -1;
-static int hf_rlc_lte_um_sn = -1;
-static int hf_rlc_lte_um_fixed_reserved = -1;
-static int hf_rlc_lte_um_data = -1;
-static int hf_rlc_lte_extension_part = -1;
+static int hf_rlc_lte_um;
+static int hf_rlc_lte_um_header;
+static int hf_rlc_lte_um_fi;
+static int hf_rlc_lte_um_fixed_e;
+static int hf_rlc_lte_um_sn;
+static int hf_rlc_lte_um_fixed_reserved;
+static int hf_rlc_lte_um_data;
+static int hf_rlc_lte_extension_part;
 
 /* Extended header (common to UM and AM) */
-static int hf_rlc_lte_extension_e = -1;
-static int hf_rlc_lte_extension_li = -1;
-static int hf_rlc_lte_extension_padding = -1;
+static int hf_rlc_lte_extension_e;
+static int hf_rlc_lte_extension_li;
+static int hf_rlc_lte_extension_padding;
 
 
 /* Acknowledged mode fields */
-static int hf_rlc_lte_am = -1;
-static int hf_rlc_lte_am_header = -1;
-static int hf_rlc_lte_am_data_control = -1;
-static int hf_rlc_lte_am_rf = -1;
-static int hf_rlc_lte_am_p = -1;
-static int hf_rlc_lte_am_fi = -1;
-static int hf_rlc_lte_am_fixed_e = -1;
-static int hf_rlc_lte_am_fixed_sn = -1;
-static int hf_rlc_lte_am_fixed_reserved = -1;
-static int hf_rlc_lte_am_segment_lsf16 = -1;
-static int hf_rlc_lte_am_fixed_reserved2 = -1;
-static int hf_rlc_lte_am_fixed_sn16 = -1;
-static int hf_rlc_lte_am_segment_lsf = -1;
-static int hf_rlc_lte_am_segment_so = -1;
-static int hf_rlc_lte_am_segment_so16 = -1;
-static int hf_rlc_lte_am_data = -1;
+static int hf_rlc_lte_am;
+static int hf_rlc_lte_am_header;
+static int hf_rlc_lte_am_data_control;
+static int hf_rlc_lte_am_rf;
+static int hf_rlc_lte_am_p;
+static int hf_rlc_lte_am_fi;
+static int hf_rlc_lte_am_fixed_e;
+static int hf_rlc_lte_am_fixed_sn;
+static int hf_rlc_lte_am_fixed_reserved;
+static int hf_rlc_lte_am_segment_lsf16;
+static int hf_rlc_lte_am_fixed_reserved2;
+static int hf_rlc_lte_am_fixed_sn16;
+static int hf_rlc_lte_am_segment_lsf;
+static int hf_rlc_lte_am_segment_so;
+static int hf_rlc_lte_am_segment_so16;
+static int hf_rlc_lte_am_data;
 
 /* Control fields */
-static int hf_rlc_lte_am_cpt = -1;
-static int hf_rlc_lte_am_ack_sn = -1;
-static int hf_rlc_lte_am_e1 = -1;
-static int hf_rlc_lte_am_e2 = -1;
-static int hf_rlc_lte_am_nack_sn = -1;
-static int hf_rlc_lte_am_nacks = -1;
-static int hf_rlc_lte_am_so_start = -1;
-static int hf_rlc_lte_am_so_end = -1;
-
-static int hf_rlc_lte_predefined_pdu = -1;
-static int hf_rlc_lte_header_only = -1;
+static int hf_rlc_lte_am_cpt;
+static int hf_rlc_lte_am_ack_sn;
+static int hf_rlc_lte_am_e1;
+static int hf_rlc_lte_am_e2;
+static int hf_rlc_lte_am_nack_sn;
+static int hf_rlc_lte_am_nacks;
+static int hf_rlc_lte_am_so_start;
+static int hf_rlc_lte_am_so_end;
+
+static int hf_rlc_lte_predefined_pdu;
+static int hf_rlc_lte_header_only;
 
 /* Sequence Analysis */
-static int hf_rlc_lte_sequence_analysis = -1;
-static int hf_rlc_lte_sequence_analysis_ok = -1;
-static int hf_rlc_lte_sequence_analysis_previous_frame = -1;
-static int hf_rlc_lte_sequence_analysis_next_frame = -1;
-static int hf_rlc_lte_sequence_analysis_expected_sn = -1;
-static int hf_rlc_lte_sequence_analysis_framing_info_correct = -1;
+static int hf_rlc_lte_sequence_analysis;
+static int hf_rlc_lte_sequence_analysis_ok;
+static int hf_rlc_lte_sequence_analysis_previous_frame;
+static int hf_rlc_lte_sequence_analysis_next_frame;
+static int hf_rlc_lte_sequence_analysis_expected_sn;
+static int hf_rlc_lte_sequence_analysis_framing_info_correct;
 
-static int hf_rlc_lte_sequence_analysis_mac_retx = -1;
-static int hf_rlc_lte_sequence_analysis_retx = -1;
-static int hf_rlc_lte_sequence_analysis_repeated = -1;
-static int hf_rlc_lte_sequence_analysis_skipped = -1;
+static int hf_rlc_lte_sequence_analysis_mac_retx;
+static int hf_rlc_lte_sequence_analysis_retx;
+static int hf_rlc_lte_sequence_analysis_repeated;
+static int hf_rlc_lte_sequence_analysis_skipped;
 
-static int hf_rlc_lte_sequence_analysis_repeated_nack = -1;
-static int hf_rlc_lte_sequence_analysis_repeated_nack_original_frame = -1;
+static int hf_rlc_lte_sequence_analysis_repeated_nack;
+static int hf_rlc_lte_sequence_analysis_repeated_nack_original_frame;
 
-static int hf_rlc_lte_sequence_analysis_ack_out_of_range = -1;
-static int hf_rlc_lte_sequence_analysis_ack_out_of_range_opposite_frame = -1;
+static int hf_rlc_lte_sequence_analysis_ack_out_of_range;
+static int hf_rlc_lte_sequence_analysis_ack_out_of_range_opposite_frame;
 
 /* Reassembly */
-static int hf_rlc_lte_reassembly_source = -1;
-static int hf_rlc_lte_reassembly_source_number_of_segments = -1;
-static int hf_rlc_lte_reassembly_source_total_length = -1;
-static int hf_rlc_lte_reassembly_source_segment = -1;
-static int hf_rlc_lte_reassembly_source_segment_sn = -1;
-static int hf_rlc_lte_reassembly_source_segment_framenum = -1;
-static int hf_rlc_lte_reassembly_source_segment_length = -1;
+static int hf_rlc_lte_reassembly_source;
+static int hf_rlc_lte_reassembly_source_number_of_segments;
+static int hf_rlc_lte_reassembly_source_total_length;
+static int hf_rlc_lte_reassembly_source_segment;
+static int hf_rlc_lte_reassembly_source_segment_sn;
+static int hf_rlc_lte_reassembly_source_segment_framenum;
+static int hf_rlc_lte_reassembly_source_segment_length;
 
 /* Subtrees. */
-static int ett_rlc_lte = -1;
-static int ett_rlc_lte_context = -1;
-static int ett_rlc_lte_um_header = -1;
-static int ett_rlc_lte_am_header = -1;
-static int ett_rlc_lte_extension_part = -1;
-static int ett_rlc_lte_sequence_analysis = -1;
-static int ett_rlc_lte_reassembly_source = -1;
-static int ett_rlc_lte_reassembly_source_segment = -1;
-
-static expert_field ei_rlc_lte_context_mode = EI_INIT;
-static expert_field ei_rlc_lte_am_nack_sn = EI_INIT;
-static expert_field ei_rlc_lte_am_nack_sn_ahead_ack = EI_INIT;
-static expert_field ei_rlc_lte_um_sn_repeated = EI_INIT;
-static expert_field ei_rlc_lte_am_nack_sn_ack_same = EI_INIT;
-static expert_field ei_rlc_lte_am_cpt = EI_INIT;
-static expert_field ei_rlc_lte_am_data_no_data = EI_INIT;
-static expert_field ei_rlc_lte_sequence_analysis_last_segment_complete = EI_INIT;
-static expert_field ei_rlc_lte_sequence_analysis_mac_retx = EI_INIT;
-static expert_field ei_rlc_lte_am_nack_sn_partial = EI_INIT;
-static expert_field ei_rlc_lte_sequence_analysis_repeated_nack = EI_INIT;
-static expert_field ei_rlc_lte_bytes_after_status_pdu_complete = EI_INIT;
-static expert_field ei_rlc_lte_sequence_analysis_repeated = EI_INIT;
-static expert_field ei_rlc_lte_wrong_sequence_number = EI_INIT;
-static expert_field ei_rlc_lte_sequence_analysis_retx = EI_INIT;
-static expert_field ei_rlc_lte_am_sn_missing = EI_INIT;
-static expert_field ei_rlc_lte_um_sn = EI_INIT;
-static expert_field ei_rlc_lte_header_only = EI_INIT;
-static expert_field ei_rlc_lte_am_data_no_data_beyond_extensions = EI_INIT;
-static expert_field ei_rlc_lte_um_sn_missing = EI_INIT;
-static expert_field ei_rlc_lte_sequence_analysis_ack_out_of_range_opposite_frame = EI_INIT;
-static expert_field ei_rlc_lte_sequence_analysis_last_segment_not_continued = EI_INIT;
-static expert_field ei_rlc_lte_reserved_bits_not_zero = EI_INIT;
-static expert_field ei_rlc_lte_no_per_frame_info = EI_INIT;
-static expert_field ei_rlc_lte_unknown_udp_framing_tag = EI_INIT;
-static expert_field ei_rlc_lte_missing_udp_framing_tag = EI_INIT;
+static int ett_rlc_lte;
+static int ett_rlc_lte_context;
+static int ett_rlc_lte_um_header;
+static int ett_rlc_lte_am_header;
+static int ett_rlc_lte_extension_part;
+static int ett_rlc_lte_sequence_analysis;
+static int ett_rlc_lte_reassembly_source;
+static int ett_rlc_lte_reassembly_source_segment;
+
+static expert_field ei_rlc_lte_context_mode;
+static expert_field ei_rlc_lte_am_nack_sn;
+static expert_field ei_rlc_lte_am_nack_sn_ahead_ack;
+static expert_field ei_rlc_lte_um_sn_repeated;
+static expert_field ei_rlc_lte_am_nack_sn_ack_same;
+static expert_field ei_rlc_lte_am_cpt;
+static expert_field ei_rlc_lte_am_data_no_data;
+static expert_field ei_rlc_lte_sequence_analysis_last_segment_complete;
+static expert_field ei_rlc_lte_sequence_analysis_mac_retx;
+static expert_field ei_rlc_lte_am_nack_sn_partial;
+static expert_field ei_rlc_lte_sequence_analysis_repeated_nack;
+static expert_field ei_rlc_lte_bytes_after_status_pdu_complete;
+static expert_field ei_rlc_lte_sequence_analysis_repeated;
+static expert_field ei_rlc_lte_wrong_sequence_number;
+static expert_field ei_rlc_lte_sequence_analysis_retx;
+static expert_field ei_rlc_lte_am_sn_missing;
+static expert_field ei_rlc_lte_um_sn;
+static expert_field ei_rlc_lte_header_only;
+static expert_field ei_rlc_lte_am_data_no_data_beyond_extensions;
+static expert_field ei_rlc_lte_um_sn_missing;
+static expert_field ei_rlc_lte_sequence_analysis_ack_out_of_range_opposite_frame;
+static expert_field ei_rlc_lte_sequence_analysis_last_segment_not_continued;
+static expert_field ei_rlc_lte_reserved_bits_not_zero;
+static expert_field ei_rlc_lte_no_per_frame_info;
+static expert_field ei_rlc_lte_unknown_udp_framing_tag;
+static expert_field ei_rlc_lte_missing_udp_framing_tag;
 
 /* Value-strings */
 static const value_string direction_vals[] =
diff --git a/epan/dissectors/packet-rlc-nr.c b/epan/dissectors/packet-rlc-nr.c
index 89ddc9fd8c..230022a343 100644
--- a/epan/dissectors/packet-rlc-nr.c
+++ b/epan/dissectors/packet-rlc-nr.c
@@ -76,7 +76,7 @@ static wmem_tree_t *reassembly_start_table_stored;
 
 /**************************************************/
 /* Initialize the protocol and registered fields. */
-int proto_rlc_nr = -1;
+int proto_rlc_nr;
 
 extern int proto_pdcp_nr;
 
@@ -90,76 +90,76 @@ static dissector_handle_t nr_rrc_dl_ccch;
 
 
 /* Decoding context */
-static int hf_rlc_nr_context = -1;
-static int hf_rlc_nr_context_mode = -1;
-static int hf_rlc_nr_context_direction = -1;
-static int hf_rlc_nr_context_ueid = -1;
-static int hf_rlc_nr_context_bearer_type = -1;
-static int hf_rlc_nr_context_bearer_id = -1;
-static int hf_rlc_nr_context_pdu_length = -1;
-static int hf_rlc_nr_context_sn_length = -1;
+static int hf_rlc_nr_context;
+static int hf_rlc_nr_context_mode;
+static int hf_rlc_nr_context_direction;
+static int hf_rlc_nr_context_ueid;
+static int hf_rlc_nr_context_bearer_type;
+static int hf_rlc_nr_context_bearer_id;
+static int hf_rlc_nr_context_pdu_length;
+static int hf_rlc_nr_context_sn_length;
 
 /* Transparent mode fields */
-static int hf_rlc_nr_tm = -1;
-static int hf_rlc_nr_tm_data = -1;
+static int hf_rlc_nr_tm;
+static int hf_rlc_nr_tm_data;
 
 /* Unacknowledged mode fields */
-static int hf_rlc_nr_um = -1;
-static int hf_rlc_nr_um_header = -1;
-static int hf_rlc_nr_um_si = -1;
-static int hf_rlc_nr_um_reserved = -1;
-static int hf_rlc_nr_um_sn6 = -1;
-static int hf_rlc_nr_um_sn12 = -1;
-static int hf_rlc_nr_um_so = -1;
-static int hf_rlc_nr_um_data = -1;
+static int hf_rlc_nr_um;
+static int hf_rlc_nr_um_header;
+static int hf_rlc_nr_um_si;
+static int hf_rlc_nr_um_reserved;
+static int hf_rlc_nr_um_sn6;
+static int hf_rlc_nr_um_sn12;
+static int hf_rlc_nr_um_so;
+static int hf_rlc_nr_um_data;
 
 /* Acknowledged mode fields */
-static int hf_rlc_nr_am = -1;
-static int hf_rlc_nr_am_header = -1;
-static int hf_rlc_nr_am_data_control = -1;
-static int hf_rlc_nr_am_p = -1;
-static int hf_rlc_nr_am_si = -1;
-static int hf_rlc_nr_am_sn12 = -1;
-static int hf_rlc_nr_am_sn18 = -1;
-static int hf_rlc_nr_am_reserved = -1;
-static int hf_rlc_nr_am_so = -1;
-static int hf_rlc_nr_am_data = -1;
+static int hf_rlc_nr_am;
+static int hf_rlc_nr_am_header;
+static int hf_rlc_nr_am_data_control;
+static int hf_rlc_nr_am_p;
+static int hf_rlc_nr_am_si;
+static int hf_rlc_nr_am_sn12;
+static int hf_rlc_nr_am_sn18;
+static int hf_rlc_nr_am_reserved;
+static int hf_rlc_nr_am_so;
+static int hf_rlc_nr_am_data;
 
 /* Control fields */
-static int hf_rlc_nr_am_cpt = -1;
-static int hf_rlc_nr_am_ack_sn = -1;
-static int hf_rlc_nr_am_e1 = -1;
-static int hf_rlc_nr_am_e2 = -1;
-static int hf_rlc_nr_am_e3 = -1;
-static int hf_rlc_nr_am_nack_sn = -1;
-static int hf_rlc_nr_am_so_start = -1;
-static int hf_rlc_nr_am_so_end = -1;
-static int hf_rlc_nr_am_nack_range = -1;
-static int hf_rlc_nr_am_nacks = -1;
-
-static int hf_rlc_nr_header_only = -1;
-
-static int hf_rlc_nr_fragments = -1;
-static int hf_rlc_nr_fragment = -1;
-static int hf_rlc_nr_fragment_overlap = -1;
-static int hf_rlc_nr_fragment_overlap_conflict = -1;
-static int hf_rlc_nr_fragment_multiple_tails = -1;
-static int hf_rlc_nr_fragment_too_long_fragment = -1;
-static int hf_rlc_nr_fragment_error = -1;
-static int hf_rlc_nr_fragment_count = -1;
-static int hf_rlc_nr_reassembled_in = -1;
-static int hf_rlc_nr_reassembled_length = -1;
-static int hf_rlc_nr_reassembled_data = -1;
+static int hf_rlc_nr_am_cpt;
+static int hf_rlc_nr_am_ack_sn;
+static int hf_rlc_nr_am_e1;
+static int hf_rlc_nr_am_e2;
+static int hf_rlc_nr_am_e3;
+static int hf_rlc_nr_am_nack_sn;
+static int hf_rlc_nr_am_so_start;
+static int hf_rlc_nr_am_so_end;
+static int hf_rlc_nr_am_nack_range;
+static int hf_rlc_nr_am_nacks;
+
+static int hf_rlc_nr_header_only;
+
+static int hf_rlc_nr_fragments;
+static int hf_rlc_nr_fragment;
+static int hf_rlc_nr_fragment_overlap;
+static int hf_rlc_nr_fragment_overlap_conflict;
+static int hf_rlc_nr_fragment_multiple_tails;
+static int hf_rlc_nr_fragment_too_long_fragment;
+static int hf_rlc_nr_fragment_error;
+static int hf_rlc_nr_fragment_count;
+static int hf_rlc_nr_reassembled_in;
+static int hf_rlc_nr_reassembled_length;
+static int hf_rlc_nr_reassembled_data;
 
 
 
 /* Subtrees. */
-static int ett_rlc_nr = -1;
-static int ett_rlc_nr_context = -1;
-static int ett_rlc_nr_um_header = -1;
-static int ett_rlc_nr_am_header = -1;
-static int ett_rlc_nr_fragments = -1;
-static int ett_rlc_nr_fragment = -1;
+static int ett_rlc_nr;
+static int ett_rlc_nr_context;
+static int ett_rlc_nr_um_header;
+static int ett_rlc_nr_am_header;
+static int ett_rlc_nr_fragments;
+static int ett_rlc_nr_fragment;
 
 
 static const fragment_items rlc_nr_frag_items = {
@@ -180,22 +180,22 @@ static const fragment_items rlc_nr_frag_items = {
 };
 
 
-static expert_field ei_rlc_nr_context_mode = EI_INIT;
-static expert_field ei_rlc_nr_am_nack_sn = EI_INIT;
-static expert_field ei_rlc_nr_am_nack_sn_ahead_ack = EI_INIT;
-static expert_field ei_rlc_nr_am_nack_sn_ack_same = EI_INIT;
-static expert_field ei_rlc_nr_am_nack_range = EI_INIT;
-static expert_field ei_rlc_nr_am_cpt = EI_INIT;
-static expert_field ei_rlc_nr_um_data_no_data = EI_INIT;
-static expert_field ei_rlc_nr_am_data_no_data = EI_INIT;
-static expert_field ei_rlc_nr_am_nack_sn_partial = EI_INIT;
-static expert_field ei_rlc_nr_bytes_after_status_pdu_complete = EI_INIT;
-static expert_field ei_rlc_nr_um_sn = EI_INIT;
-static expert_field ei_rlc_nr_am_sn = EI_INIT;
-static expert_field ei_rlc_nr_header_only = EI_INIT;
-static expert_field ei_rlc_nr_reserved_bits_not_zero = EI_INIT;
-static expert_field ei_rlc_nr_no_per_frame_info = EI_INIT;
-static expert_field ei_rlc_nr_unknown_udp_framing_tag = EI_INIT;
+static expert_field ei_rlc_nr_context_mode;
+static expert_field ei_rlc_nr_am_nack_sn;
+static expert_field ei_rlc_nr_am_nack_sn_ahead_ack;
+static expert_field ei_rlc_nr_am_nack_sn_ack_same;
+static expert_field ei_rlc_nr_am_nack_range;
+static expert_field ei_rlc_nr_am_cpt;
+static expert_field ei_rlc_nr_um_data_no_data;
+static expert_field ei_rlc_nr_am_data_no_data;
+static expert_field ei_rlc_nr_am_nack_sn_partial;
+static expert_field ei_rlc_nr_bytes_after_status_pdu_complete;
+static expert_field ei_rlc_nr_um_sn;
+static expert_field ei_rlc_nr_am_sn;
+static expert_field ei_rlc_nr_header_only;
+static expert_field ei_rlc_nr_reserved_bits_not_zero;
+static expert_field ei_rlc_nr_no_per_frame_info;
+static expert_field ei_rlc_nr_unknown_udp_framing_tag;
 
 /* Value-strings */
 static const value_string direction_vals[] =
diff --git a/epan/dissectors/packet-rlm.c b/epan/dissectors/packet-rlm.c
index c7fb71f2a0..f5508efad2 100644
--- a/epan/dissectors/packet-rlm.c
+++ b/epan/dissectors/packet-rlm.c
@@ -41,16 +41,16 @@ void proto_register_rlm(void);
 void proto_reg_handoff_rlm(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_rlm = -1;
+static int proto_rlm;
 
-static int hf_rlm_version = -1;
-static int hf_rlm_type = -1;
-static int hf_rlm_unknown = -1;
-static int hf_rlm_tid = -1;
-static int hf_rlm_unknown2 = -1;
+static int hf_rlm_version;
+static int hf_rlm_type;
+static int hf_rlm_unknown;
+static int hf_rlm_tid;
+static int hf_rlm_unknown2;
 
 /* Initialize the subtree pointers */
-static gint ett_rlm = -1;
+static gint ett_rlm;
 
 
 /* RLM definitions - missing some! */
diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c
index 93b031c520..881b7c7f13 100644
--- a/epan/dissectors/packet-rlogin.c
+++ b/epan/dissectors/packet-rlogin.c
@@ -26,34 +26,34 @@ void proto_reg_handoff_rlogin(void);
 
 static dissector_handle_t rlogin_handle;
 
-static int proto_rlogin = -1;
-
-static int ett_rlogin = -1;
-static int ett_rlogin_window = -1;
-static int ett_rlogin_user_info = -1;
-static int ett_rlogin_window_rows = -1;
-static int ett_rlogin_window_cols = -1;
-static int ett_rlogin_window_x_pixels = -1;
-static int ett_rlogin_window_y_pixels = -1;
-
-static int hf_user_info = -1;
-static int hf_client_startup_flag = -1;
-static int hf_startup_info_received_flag = -1;
-static int hf_user_info_client_user_name = -1;
-static int hf_user_info_server_user_name = -1;
-static int hf_user_info_terminal_type = -1;
-static int hf_user_info_terminal_speed = -1;
-static int hf_control_message = -1;
-static int hf_magic_cookie = -1;
-static int hf_window_info = -1;
-static int hf_window_info_ss = -1;
-static int hf_window_info_rows = -1;
-static int hf_window_info_cols = -1;
-static int hf_window_info_x_pixels = -1;
-static int hf_window_info_y_pixels = -1;
-static int hf_data = -1;
-
-static expert_field ei_rlogin_termlen_invalid = EI_INIT;
+static int proto_rlogin;
+
+static int ett_rlogin;
+static int ett_rlogin_window;
+static int ett_rlogin_user_info;
+static int ett_rlogin_window_rows;
+static int ett_rlogin_window_cols;
+static int ett_rlogin_window_x_pixels;
+static int ett_rlogin_window_y_pixels;
+
+static int hf_user_info;
+static int hf_client_startup_flag;
+static int hf_startup_info_received_flag;
+static int hf_user_info_client_user_name;
+static int hf_user_info_server_user_name;
+static int hf_user_info_terminal_type;
+static int hf_user_info_terminal_speed;
+static int hf_control_message;
+static int hf_magic_cookie;
+static int hf_window_info;
+static int hf_window_info_ss;
+static int hf_window_info_rows;
+static int hf_window_info_cols;
+static int hf_window_info_x_pixels;
+static int hf_window_info_y_pixels;
+static int hf_data;
+
+static expert_field ei_rlogin_termlen_invalid;
 
 static const value_string control_message_vals[] =
 {
diff --git a/epan/dissectors/packet-rmcp.c b/epan/dissectors/packet-rmcp.c
index 6d2abcbbe3..3dc87fb703 100644
--- a/epan/dissectors/packet-rmcp.c
+++ b/epan/dissectors/packet-rmcp.c
@@ -31,22 +31,22 @@ static dissector_handle_t rsp_handle;
  * (the ASF specification includes RMCP)
  */
 
-static int proto_rmcp = -1;
-static int hf_rmcp_version = -1;
-static int hf_rmcp_reserved = -1;
-static int hf_rmcp_sequence = -1;
-static int hf_rmcp_class = -1;
-static int hf_rmcp_type = -1;
-static int hf_rmcp_trailer = -1;
-
-static int proto_rsp = -1;
-static int hf_rsp_session_id = -1;
-static int hf_rsp_sequence = -1;
-
-static gint ett_rmcp = -1;
-static gint ett_rmcp_typeclass = -1;
-
-static gint ett_rsp = -1;
+static int proto_rmcp;
+static int hf_rmcp_version;
+static int hf_rmcp_reserved;
+static int hf_rmcp_sequence;
+static int hf_rmcp_class;
+static int hf_rmcp_type;
+static int hf_rmcp_trailer;
+
+static int proto_rsp;
+static int hf_rsp_session_id;
+static int hf_rsp_sequence;
+
+static gint ett_rmcp;
+static gint ett_rmcp_typeclass;
+
+static gint ett_rsp;
 
 static dissector_table_t rmcp_dissector_table;
 
diff --git a/epan/dissectors/packet-rmi.c b/epan/dissectors/packet-rmi.c
index 74ebe84011..f0e1a8ddaa 100644
--- a/epan/dissectors/packet-rmi.c
+++ b/epan/dissectors/packet-rmi.c
@@ -28,34 +28,34 @@ static rmi_type
 get_rmi_type(tvbuff_t *tvb, gint offset, int datalen);
 
 /* Initialize the protocol and registered fields */
-static int proto_rmi             = -1;
-static int proto_ser             = -1;
-static int hf_rmi_magic          = -1;
-static int hf_rmi_version        = -1;
-static int hf_rmi_protocol       = -1;
-static int hf_rmi_inputmessage   = -1;
-static int hf_rmi_outputmessage  = -1;
-static int hf_rmi_epid_length    = -1;
-static int hf_rmi_epid_hostname  = -1;
-static int hf_rmi_epid_port      = -1;
-static int hf_rmi_serialization_data = -1;
-static int hf_rmi_unique_identifier = -1;
-
-static int hf_ser_magic          = -1;
-static int hf_ser_version        = -1;
+static int proto_rmi;
+static int proto_ser;
+static int hf_rmi_magic;
+static int hf_rmi_version;
+static int hf_rmi_protocol;
+static int hf_rmi_inputmessage;
+static int hf_rmi_outputmessage;
+static int hf_rmi_epid_length;
+static int hf_rmi_epid_hostname;
+static int hf_rmi_epid_port;
+static int hf_rmi_serialization_data;
+static int hf_rmi_unique_identifier;
+
+static int hf_ser_magic;
+static int hf_ser_version;
 
 /* Initialize the subtree pointers */
-static gint ett_rmi               = -1;
-static gint ett_rmi_magic         = -1;
-static gint ett_rmi_version       = -1;
-static gint ett_rmi_inputmessage  = -1;
-static gint ett_rmi_outputmessage = -1;
-static gint ett_rmi_epid_length   = -1;
-static gint ett_rmi_epid_hostname = -1;
-static gint ett_rmi_epid_port     = -1;
-static gint ett_rmi_endpoint_identifier = -1;
-
-static gint ett_ser               = -1;
+static gint ett_rmi;
+static gint ett_rmi_magic;
+static gint ett_rmi_version;
+static gint ett_rmi_inputmessage;
+static gint ett_rmi_outputmessage;
+static gint ett_rmi_epid_length;
+static gint ett_rmi_epid_hostname;
+static gint ett_rmi_epid_port;
+static gint ett_rmi_endpoint_identifier;
+
+static gint ett_ser;
 
 /*
  * See
diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c
index a178018733..905090995e 100644
--- a/epan/dissectors/packet-rmp.c
+++ b/epan/dissectors/packet-rmp.c
@@ -18,20 +18,20 @@
 void proto_register_rmp(void);
 void proto_reg_handoff_rmp(void);
 
-static int proto_rmp = -1;
-
-static int hf_rmp_type = -1;
-static int hf_rmp_retcode = -1;
-static int hf_rmp_seqnum = -1;
-static int hf_rmp_sessionid = -1;
-static int hf_rmp_version = -1;
-static int hf_rmp_machtype = -1;
-static int hf_rmp_filename = -1;
-static int hf_rmp_offset = -1;
-static int hf_rmp_size = -1;
-static int hf_rmp_reserved = -1;
-
-static gint ett_rmp = -1;
+static int proto_rmp;
+
+static int hf_rmp_type;
+static int hf_rmp_retcode;
+static int hf_rmp_seqnum;
+static int hf_rmp_sessionid;
+static int hf_rmp_version;
+static int hf_rmp_machtype;
+static int hf_rmp_filename;
+static int hf_rmp_offset;
+static int hf_rmp_size;
+static int hf_rmp_reserved;
+
+static gint ett_rmp;
 
 static dissector_handle_t rmp_handle;
 
diff --git a/epan/dissectors/packet-rmt-alc.c b/epan/dissectors/packet-rmt-alc.c
index a0281738ac..57c9a1c3a9 100644
--- a/epan/dissectors/packet-rmt-alc.c
+++ b/epan/dissectors/packet-rmt-alc.c
@@ -43,19 +43,19 @@ static dissector_handle_t alc_handle;
 void proto_register_alc(void);
 void proto_reg_handoff_alc(void);
 
-static int proto_rmt_alc = -1;
+static int proto_rmt_alc;
 
-static int hf_version = -1;
-static int hf_atsc3 = -1;
-static int hf_object_start_offset = -1;
-static int hf_payload = -1;
-static int hf_uncomp_payload = -1;
+static int hf_version;
+static int hf_atsc3;
+static int hf_object_start_offset;
+static int hf_payload;
+static int hf_uncomp_payload;
 
-static int ett_main = -1;
-static int ett_uncomp_payload = -1;
-static int ett_uncomp_decode = -1;
+static int ett_main;
+static int ett_uncomp_payload;
+static int ett_uncomp_decode;
 
-static expert_field ei_version1_only = EI_INIT;
+static expert_field ei_version1_only;
 
 static dissector_handle_t xml_handle;
 static dissector_handle_t rmt_lct_handle;
diff --git a/epan/dissectors/packet-rmt-fec.c b/epan/dissectors/packet-rmt-fec.c
index e5ccec82f8..e04a6f459c 100644
--- a/epan/dissectors/packet-rmt-fec.c
+++ b/epan/dissectors/packet-rmt-fec.c
@@ -33,26 +33,26 @@
 
 void proto_register_rmt_fec(void);
 
-static int proto_rmt_fec = -1;
-
-static int hf_encoding_id = -1;
-static int hf_instance_id = -1;
-static int hf_sbn = -1;
-static int hf_sbn_with_mask = -1;
-static int hf_sbl = -1;
-static int hf_esi = -1;
-static int hf_esi_with_mask = -1;
-static int hf_fti_transfer_length = -1;
-static int hf_fti_encoding_symbol_length = -1;
-static int hf_fti_max_source_block_length = -1;
-static int hf_fti_max_number_encoding_symbols = -1;
-static int hf_fti_num_blocks = -1;
-static int hf_fti_num_subblocks = -1;
-static int hf_fti_alignment = -1;
-
-static int ett_main = -1;
-
-static expert_field ei_fec_encoding_id = EI_INIT;
+static int proto_rmt_fec;
+
+static int hf_encoding_id;
+static int hf_instance_id;
+static int hf_sbn;
+static int hf_sbn_with_mask;
+static int hf_sbl;
+static int hf_esi;
+static int hf_esi_with_mask;
+static int hf_fti_transfer_length;
+static int hf_fti_encoding_symbol_length;
+static int hf_fti_max_source_block_length;
+static int hf_fti_max_number_encoding_symbols;
+static int hf_fti_num_blocks;
+static int hf_fti_num_subblocks;
+static int hf_fti_alignment;
+
+static int ett_main;
+
+static expert_field ei_fec_encoding_id;
 
 typedef struct fec_packet_data
 {
diff --git a/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c
index ccd7c581f6..41dec6d01b 100644
--- a/epan/dissectors/packet-rmt-lct.c
+++ b/epan/dissectors/packet-rmt-lct.c
@@ -50,57 +50,57 @@
 
 void proto_register_rmt_lct(void);
 
-static int proto_rmt_lct = -1;
-
-static int hf_version = -1;
-static int hf_psi = -1;
-static int hf_spi = -1;
-static int hf_fsize_header = -1;
-static int hf_fsize_cci = -1;
-static int hf_fsize_tsi = -1;
-static int hf_fsize_toi = -1;
-static int hf_flags_header = -1;
-static int hf_flags_sct_present = -1;
-static int hf_flags_ert_present = -1;
-static int hf_flags_close_session = -1;
-static int hf_flags_close_object = -1;
-static int hf_hlen = -1;
-static int hf_codepoint = -1;
-static int hf_codepoint_atsc3 = -1;
-static int hf_cci = -1;
-static int hf_tsi16 = -1;
-static int hf_tsi32 = -1;
-static int hf_tsi48 = -1;
-static int hf_toi16 = -1;
-static int hf_toi32 = -1;
-static int hf_toi48 = -1;
-static int hf_toi64 = -1;
-static int hf_toi_extended = -1;
-static int hf_sct = -1;
-static int hf_ert = -1;
-static int hf_ext = -1;
-static int hf_hec_type = -1;
-static int hf_hec_len = -1;
-static int hf_hec_data = -1;
-static int hf_send_rate = -1;
-static int hf_cenc = -1;
-static int hf_flute_version = -1;
-static int hf_fdt_instance_id = -1;
-static int hf_ext_tol_48_transfer_len = -1;
-static int hf_ext_tol_24_transfer_len = -1;
+static int proto_rmt_lct;
+
+static int hf_version;
+static int hf_psi;
+static int hf_spi;
+static int hf_fsize_header;
+static int hf_fsize_cci;
+static int hf_fsize_tsi;
+static int hf_fsize_toi;
+static int hf_flags_header;
+static int hf_flags_sct_present;
+static int hf_flags_ert_present;
+static int hf_flags_close_session;
+static int hf_flags_close_object;
+static int hf_hlen;
+static int hf_codepoint;
+static int hf_codepoint_atsc3;
+static int hf_cci;
+static int hf_tsi16;
+static int hf_tsi32;
+static int hf_tsi48;
+static int hf_toi16;
+static int hf_toi32;
+static int hf_toi48;
+static int hf_toi64;
+static int hf_toi_extended;
+static int hf_sct;
+static int hf_ert;
+static int hf_ext;
+static int hf_hec_type;
+static int hf_hec_len;
+static int hf_hec_data;
+static int hf_send_rate;
+static int hf_cenc;
+static int hf_flute_version;
+static int hf_fdt_instance_id;
+static int hf_ext_tol_48_transfer_len;
+static int hf_ext_tol_24_transfer_len;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_cc_rate = -1;
-static int hf_cc_rtt = -1;
-static int hf_cc_flags = -1;
-static int hf_cc_loss = -1;
-static int hf_cc_sequence = -1;
-
-static int ett_main = -1;
-static int ett_fsize = -1;
-static int ett_flags = -1;
-static int ett_ext = -1;
-static int ett_ext_ext = -1;
-static int ett_psi = -1;
+static int hf_cc_rate;
+static int hf_cc_rtt;
+static int hf_cc_flags;
+static int hf_cc_loss;
+static int hf_cc_sequence;
+
+static int ett_main;
+static int ett_fsize;
+static int ett_flags;
+static int ett_ext;
+static int ett_ext_ext;
+static int ett_psi;
 
 /* Enumerated data types for LCT preferences */
 const enum_val_t enum_lct_ext_192[] =
diff --git a/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c
index 98889896e6..73751f8800 100644
--- a/epan/dissectors/packet-rmt-norm.c
+++ b/epan/dissectors/packet-rmt-norm.c
@@ -132,70 +132,70 @@ typedef struct norm_packet_data
 /* ============================================= */
 static dissector_handle_t rmt_fec_handle;
 
-static int proto_rmt_norm = -1;
-
-static int hf_version = -1;
-static int hf_type = -1;
-static int hf_hlen = -1;
-static int hf_sequence = -1;
-static int hf_source_id = -1;
-static int hf_instance_id = -1;
-static int hf_grtt = -1;
-static int hf_backoff = -1;
-static int hf_gsize = -1;
-static int hf_flags = -1;
-static int hf_flag_repair = -1;
-static int hf_flag_norm_explicit = -1;
-static int hf_flag_info = -1;
-static int hf_flag_unreliable = -1;
-static int hf_flag_file = -1;
-static int hf_flag_stream = -1;
-static int hf_flag_msgstart = -1;
-static int hf_object_transport_id = -1;
-static int hf_extension = -1;
-static int hf_reserved = -1;
-static int hf_payload_len = -1;
-static int hf_payload_offset = -1;
-static int hf_cmd_flavor = -1;
-static int hf_cc_sequence = -1;
-static int hf_cc_sts = -1;
-static int hf_cc_stus = -1;
-static int hf_cc_node_id = -1;
-static int hf_cc_flags = -1;
-static int hf_cc_flags_clr = -1;
-static int hf_cc_flags_plr = -1;
-static int hf_cc_flags_rtt = -1;
-static int hf_cc_flags_start = -1;
-static int hf_cc_flags_leave = -1;
-static int hf_cc_rtt = -1;
-static int hf_cc_rate = -1;
-static int hf_cc_transport_id = -1;
-static int hf_ack_source = -1;
-static int hf_ack_type = -1;
-static int hf_ack_id = -1;
-static int hf_ack_grtt_sec = -1;
-static int hf_ack_grtt_usec = -1;
-static int hf_nack_server = -1;
-static int hf_nack_grtt_sec = -1;
-static int hf_nack_grtt_usec = -1;
-static int hf_nack_form = -1;
-static int hf_nack_flags = -1;
-static int hf_nack_flags_segment = -1;
-static int hf_nack_flags_block = -1;
-static int hf_nack_flags_info = -1;
-static int hf_nack_flags_object = -1;
-static int hf_nack_length = -1;
-static int hf_payload = -1;
-static int hf_fec_encoding_id = -1;
-
-static int ett_main = -1;
-static int ett_hdrext = -1;
-static int ett_flags = -1;
-static int ett_streampayload = -1;
-static int ett_congestioncontrol = -1;
-static int ett_nackdata = -1;
-
-static expert_field ei_version1_only = EI_INIT;
+static int proto_rmt_norm;
+
+static int hf_version;
+static int hf_type;
+static int hf_hlen;
+static int hf_sequence;
+static int hf_source_id;
+static int hf_instance_id;
+static int hf_grtt;
+static int hf_backoff;
+static int hf_gsize;
+static int hf_flags;
+static int hf_flag_repair;
+static int hf_flag_norm_explicit;
+static int hf_flag_info;
+static int hf_flag_unreliable;
+static int hf_flag_file;
+static int hf_flag_stream;
+static int hf_flag_msgstart;
+static int hf_object_transport_id;
+static int hf_extension;
+static int hf_reserved;
+static int hf_payload_len;
+static int hf_payload_offset;
+static int hf_cmd_flavor;
+static int hf_cc_sequence;
+static int hf_cc_sts;
+static int hf_cc_stus;
+static int hf_cc_node_id;
+static int hf_cc_flags;
+static int hf_cc_flags_clr;
+static int hf_cc_flags_plr;
+static int hf_cc_flags_rtt;
+static int hf_cc_flags_start;
+static int hf_cc_flags_leave;
+static int hf_cc_rtt;
+static int hf_cc_rate;
+static int hf_cc_transport_id;
+static int hf_ack_source;
+static int hf_ack_type;
+static int hf_ack_id;
+static int hf_ack_grtt_sec;
+static int hf_ack_grtt_usec;
+static int hf_nack_server;
+static int hf_nack_grtt_sec;
+static int hf_nack_grtt_usec;
+static int hf_nack_form;
+static int hf_nack_flags;
+static int hf_nack_flags_segment;
+static int hf_nack_flags_block;
+static int hf_nack_flags_info;
+static int hf_nack_flags_object;
+static int hf_nack_length;
+static int hf_payload;
+static int hf_fec_encoding_id;
+
+static int ett_main;
+static int ett_hdrext;
+static int ett_flags;
+static int ett_streampayload;
+static int ett_congestioncontrol;
+static int ett_nackdata;
+
+static expert_field ei_version1_only;
 
 static const double RTT_MIN = 1.0e-06;
 static const double RTT_MAX = 1000;
diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c
index 690967590c..a357de7e94 100644
--- a/epan/dissectors/packet-rohc.c
+++ b/epan/dissectors/packet-rohc.c
@@ -40,178 +40,178 @@ dissect_compressed_list(int expected_encoding_type _U_, packet_info *pinfo _U_,
 static GHashTable *rohc_cid_hash = NULL;
 
 /* Initialize the protocol and registered fields */
-static int proto_rohc           = -1;
-
-
-static int hf_rohc_padding = -1;
-static int hf_rohc_add_cid = -1;
-static int hf_rohc_feedback = -1;
-static int hf_rohc_code = -1;
-static int hf_rohc_size = -1;
-static int hf_rohc_ir_packet = -1;
-static int hf_rohc_ir_dyn_packet = -1;
-static int hf_rohc_small_cid = -1;
-static int hf_rohc_large_cid = -1;
-static int hf_rohc_acktype = -1;
-static int hf_rohc_mode = -1;
-static int hf_rohc_sn = -1;
-static int hf_rohc_profile_spec_octet = -1;
-static int hf_rohc_fb1_sn = -1;
-static int hf_rohc_opt_type = -1;
-static int hf_rohc_opt_len = -1;
-static int hf_rohc_crc = -1;
-static int hf_rohc_opt_sn = -1;
-static int hf_rohc_ext = -1;
-static int hf_rohc_ext_sn = -1;
-static int hf_rohc_opt_clock = -1;
-static int hf_rohc_opt_jitter = -1;
-static int hf_rohc_opt_loss = -1;
-static int hf_rohc_profile = -1;
-static int hf_rohc_d_bit = -1;
-static int hf_rohc_ip_version = -1;
-static int hf_rohc_ip_version_ip_profile = -1;
-static int hf_rohc_ip_protocol = -1;
-static int hf_rohc_static_ipv4 = -1;
-static int hf_rohc_ipv4_src = -1;
-static int hf_rohc_ipv4_dst = -1;
-static int hf_rohc_ipv6_flow = -1;
-static int hf_rohc_ipv6_nxt_hdr = -1;
-static int hf_rohc_ipv6_src = -1;
-static int hf_rohc_ipv6_dst = -1;
-static int hf_rohc_static_udp = -1;
-static int hf_rohc_udp_src_port = -1;
-static int hf_rohc_udp_dst_port = -1;
-static int hf_rohc_static_rtp = -1;
-static int hf_rohc_rtp_ssrc = -1;
-static int hf_rohc_dynamic_ipv4 = -1;
-static int hf_rohc_dynamic_udp = -1;
-static int hf_rohc_rtp_tos = -1;
-static int hf_rohc_rtp_ttl = -1;
-static int hf_rohc_rtp_id = -1;
-static int hf_rohc_rtp_df = -1;
-static int hf_rohc_rtp_rnd = -1;
-static int hf_rohc_rtp_nbo = -1;
-static int hf_rohc_dynamic_udp_checksum = -1;
-static int hf_rohc_dynamic_rtp =-1;
-static int hf_rohc_rtp_v = -1;
-static int hf_rohc_rtp_p = -1;
-static int hf_rohc_rtp_rx = -1;
-static int hf_rohc_rtp_cc = -1;
-static int hf_rohc_rtp_m = -1;
-static int hf_rohc_rtp_pt = -1;
-static int hf_rohc_rtp_sn = -1;
-static int hf_rohc_rtp_timestamp = -1;
-static int hf_rohc_rtp_x = -1;
-static int hf_rohc_rtp_mode = -1;
-static int hf_rohc_rtp_tis = -1;
-static int hf_rohc_rtp_tss = -1;
-static int hf_rohc_rtp_ts_stride = -1;
-static int hf_rohc_rtp_time_stride = -1;
-static int hf_rohc_var_len = -1;
-static int hf_rohc_ipv6_tc = -1;
-static int hf_rohc_ipv6_hop_limit = -1;
-static int hf_rohc_ir_pkt_frame = -1;
-static int hf_rohc_ir_previous_frame = -1;
-static int hf_rohc_ir_profile = -1;
-static int hf_rohc_ir_ip_version = -1;
-static int hf_rohc_ir_mode = -1;
-static int hf_rohc_comp_sn = -1;
-static int hf_rohc_r_0_crc = -1;
-static int hf_rohc_x = -1;
-static int hf_rohc_ts = -1;
-static int hf_rohc_comp_ip_id = -1;
-static int hf_rohc_comp_ip_id2 = -1;
-static int hf_rohc_t = -1;
-static int hf_rohc_ext3_flags = -1;
-static int hf_rohc_ext3_s = -1;
-static int hf_rohc_ext3_r_ts = -1;
-static int hf_rohc_ext3_tsc = -1;
-static int hf_rohc_ext3_udp_mode = -1;
-static int hf_rohc_ext3_i = -1;
-static int hf_rohc_ext3_ip = -1;
-static int hf_rohc_ext3_ip2 = -1;
-static int hf_rohc_ext3_rtp = -1;
-static int hf_rohc_ext3_inner_ip_flags = -1;
-static int hf_rohc_ext3_inner_tos = -1;
-static int hf_rohc_ext3_inner_ttl = -1;
-static int hf_rohc_ext3_inner_df = -1;
-static int hf_rohc_ext3_inner_pr = -1;
-static int hf_rohc_ext3_inner_ipx = -1;
-static int hf_rohc_ext3_inner_nbo = -1;
-static int hf_rohc_ext3_inner_rnd = -1;
-static int hf_rohc_ext3_inner_ip2 = -1;
-static int hf_rohc_ext3_outer_ip_flags = -1;
-static int hf_rohc_ext3_outer_tos = -1;
-static int hf_rohc_ext3_outer_ttl = -1;
-static int hf_rohc_ext3_outer_df = -1;
-static int hf_rohc_ext3_outer_pr = -1;
-static int hf_rohc_ext3_outer_ipx = -1;
-static int hf_rohc_ext3_outer_nbo = -1;
-static int hf_rohc_ext3_outer_rnd = -1;
-static int hf_rohc_ext3_outer_i2 = -1;
-static int hf_rohc_ext3_rtp_flags = -1;
-static int hf_rohc_ext3_rtp_mode = -1;
-static int hf_rohc_ext3_r_pt = -1;
-static int hf_rohc_ext3_m = -1;
-static int hf_rohc_ext3_r_x = -1;
-static int hf_rohc_ext3_csrc = -1;
-static int hf_rohc_ext3_tss = -1;
-static int hf_rohc_ext3_tis = -1;
-static int hf_rohc_ext3_r_p = -1;
-
-static int hf_rohc_compressed_list = -1;
-static int hf_rohc_compressed_list_et = -1;
-static int hf_rohc_compressed_list_gp = -1;
-static int hf_rohc_compressed_list_ps = -1;
-static int hf_rohc_compressed_list_res = -1;
-static int hf_rohc_compressed_list_count = -1;
-static int hf_rohc_compressed_list_cc = -1;
-static int hf_rohc_compressed_list_xi_1 = -1;
-static int hf_rohc_compressed_list_gen_id = -1;
-static int hf_rohc_compressed_list_ref_id = -1;
-static int hf_rohc_compressed_list_mask_size = -1;
-static int hf_rohc_compressed_list_ins_bit_mask = -1;
-static int hf_rohc_compressed_list_rem_bit_mask = -1;
-static int hf_rohc_spare_bits = -1;
-static int hf_rohc_ip_id = -1;
-static int hf_rohc_udp_checksum = -1;
+static int proto_rohc;
+
+
+static int hf_rohc_padding;
+static int hf_rohc_add_cid;
+static int hf_rohc_feedback;
+static int hf_rohc_code;
+static int hf_rohc_size;
+static int hf_rohc_ir_packet;
+static int hf_rohc_ir_dyn_packet;
+static int hf_rohc_small_cid;
+static int hf_rohc_large_cid;
+static int hf_rohc_acktype;
+static int hf_rohc_mode;
+static int hf_rohc_sn;
+static int hf_rohc_profile_spec_octet;
+static int hf_rohc_fb1_sn;
+static int hf_rohc_opt_type;
+static int hf_rohc_opt_len;
+static int hf_rohc_crc;
+static int hf_rohc_opt_sn;
+static int hf_rohc_ext;
+static int hf_rohc_ext_sn;
+static int hf_rohc_opt_clock;
+static int hf_rohc_opt_jitter;
+static int hf_rohc_opt_loss;
+static int hf_rohc_profile;
+static int hf_rohc_d_bit;
+static int hf_rohc_ip_version;
+static int hf_rohc_ip_version_ip_profile;
+static int hf_rohc_ip_protocol;
+static int hf_rohc_static_ipv4;
+static int hf_rohc_ipv4_src;
+static int hf_rohc_ipv4_dst;
+static int hf_rohc_ipv6_flow;
+static int hf_rohc_ipv6_nxt_hdr;
+static int hf_rohc_ipv6_src;
+static int hf_rohc_ipv6_dst;
+static int hf_rohc_static_udp;
+static int hf_rohc_udp_src_port;
+static int hf_rohc_udp_dst_port;
+static int hf_rohc_static_rtp;
+static int hf_rohc_rtp_ssrc;
+static int hf_rohc_dynamic_ipv4;
+static int hf_rohc_dynamic_udp;
+static int hf_rohc_rtp_tos;
+static int hf_rohc_rtp_ttl;
+static int hf_rohc_rtp_id;
+static int hf_rohc_rtp_df;
+static int hf_rohc_rtp_rnd;
+static int hf_rohc_rtp_nbo;
+static int hf_rohc_dynamic_udp_checksum;
+static int hf_rohc_dynamic_rtp;
+static int hf_rohc_rtp_v;
+static int hf_rohc_rtp_p;
+static int hf_rohc_rtp_rx;
+static int hf_rohc_rtp_cc;
+static int hf_rohc_rtp_m;
+static int hf_rohc_rtp_pt;
+static int hf_rohc_rtp_sn;
+static int hf_rohc_rtp_timestamp;
+static int hf_rohc_rtp_x;
+static int hf_rohc_rtp_mode;
+static int hf_rohc_rtp_tis;
+static int hf_rohc_rtp_tss;
+static int hf_rohc_rtp_ts_stride;
+static int hf_rohc_rtp_time_stride;
+static int hf_rohc_var_len;
+static int hf_rohc_ipv6_tc;
+static int hf_rohc_ipv6_hop_limit;
+static int hf_rohc_ir_pkt_frame;
+static int hf_rohc_ir_previous_frame;
+static int hf_rohc_ir_profile;
+static int hf_rohc_ir_ip_version;
+static int hf_rohc_ir_mode;
+static int hf_rohc_comp_sn;
+static int hf_rohc_r_0_crc;
+static int hf_rohc_x;
+static int hf_rohc_ts;
+static int hf_rohc_comp_ip_id;
+static int hf_rohc_comp_ip_id2;
+static int hf_rohc_t;
+static int hf_rohc_ext3_flags;
+static int hf_rohc_ext3_s;
+static int hf_rohc_ext3_r_ts;
+static int hf_rohc_ext3_tsc;
+static int hf_rohc_ext3_udp_mode;
+static int hf_rohc_ext3_i;
+static int hf_rohc_ext3_ip;
+static int hf_rohc_ext3_ip2;
+static int hf_rohc_ext3_rtp;
+static int hf_rohc_ext3_inner_ip_flags;
+static int hf_rohc_ext3_inner_tos;
+static int hf_rohc_ext3_inner_ttl;
+static int hf_rohc_ext3_inner_df;
+static int hf_rohc_ext3_inner_pr;
+static int hf_rohc_ext3_inner_ipx;
+static int hf_rohc_ext3_inner_nbo;
+static int hf_rohc_ext3_inner_rnd;
+static int hf_rohc_ext3_inner_ip2;
+static int hf_rohc_ext3_outer_ip_flags;
+static int hf_rohc_ext3_outer_tos;
+static int hf_rohc_ext3_outer_ttl;
+static int hf_rohc_ext3_outer_df;
+static int hf_rohc_ext3_outer_pr;
+static int hf_rohc_ext3_outer_ipx;
+static int hf_rohc_ext3_outer_nbo;
+static int hf_rohc_ext3_outer_rnd;
+static int hf_rohc_ext3_outer_i2;
+static int hf_rohc_ext3_rtp_flags;
+static int hf_rohc_ext3_rtp_mode;
+static int hf_rohc_ext3_r_pt;
+static int hf_rohc_ext3_m;
+static int hf_rohc_ext3_r_x;
+static int hf_rohc_ext3_csrc;
+static int hf_rohc_ext3_tss;
+static int hf_rohc_ext3_tis;
+static int hf_rohc_ext3_r_p;
+
+static int hf_rohc_compressed_list;
+static int hf_rohc_compressed_list_et;
+static int hf_rohc_compressed_list_gp;
+static int hf_rohc_compressed_list_ps;
+static int hf_rohc_compressed_list_res;
+static int hf_rohc_compressed_list_count;
+static int hf_rohc_compressed_list_cc;
+static int hf_rohc_compressed_list_xi_1;
+static int hf_rohc_compressed_list_gen_id;
+static int hf_rohc_compressed_list_ref_id;
+static int hf_rohc_compressed_list_mask_size;
+static int hf_rohc_compressed_list_ins_bit_mask;
+static int hf_rohc_compressed_list_rem_bit_mask;
+static int hf_rohc_spare_bits;
+static int hf_rohc_ip_id;
+static int hf_rohc_udp_checksum;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_rohc_no_configuration_info = -1;
-static int hf_rohc_unknown_option_data = -1;
-static int hf_rohc_error_packet = -1;
-static int hf_rohc_configured_by_ir_packet = -1;
-
-static int ett_rohc = -1;
-static int ett_rohc_conf = -1;
-static int ett_rohc_fb = -1;
-static int ett_rohc_feedback = -1;
-static int ett_rohc_ir = -1;
-static int ett_rohc_ir_dyn = -1;
-static int ett_rohc_static_ipv4 = -1;
-static int ett_rohc_static_udp = -1;
-static int ett_rohc_static_rtp = -1;
-static int ett_rohc_rtp_static = -1;
-static int ett_rohc_rtp_dynamic = -1;
-static int ett_rohc_dynamic_ipv4 = -1;
-static int ett_rohc_dynamic_udp = -1;
-static int ett_rohc_dynamic_rtp = -1;
-static int ett_rohc_compressed_list = -1;
-static int ett_rohc_packet = -1;
-static int ett_rohc_ext = -1;
-static int ett_rohc_ext3_flags = -1;
-static int ett_rohc_ext3_inner_ip_flags = -1;
-static int ett_rohc_ext3_outer_ip_flags = -1;
-static int ett_rohc_ext3_rtp_flags = -1;
-
-static expert_field ei_rohc_profile_spec_octet = EI_INIT;
-static expert_field ei_rohc_rohc_opt_clock = EI_INIT;
-static expert_field ei_rohc_opt_jitter = EI_INIT;
-static expert_field ei_rohc_feedback_type_2_is_not_applicable_for_uncompressed_profile = EI_INIT;
-static expert_field ei_rohc_not_dissected_yet = EI_INIT;
-static expert_field ei_rohc_profile_specific = EI_INIT;
-static expert_field ei_rohc_profile_not_supported = EI_INIT;
-static expert_field ei_rohc_ip_version = EI_INIT;
-static expert_field ei_rohc_desegmentation_not_implemented = EI_INIT;
+static int hf_rohc_no_configuration_info;
+static int hf_rohc_unknown_option_data;
+static int hf_rohc_error_packet;
+static int hf_rohc_configured_by_ir_packet;
+
+static int ett_rohc;
+static int ett_rohc_conf;
+static int ett_rohc_fb;
+static int ett_rohc_feedback;
+static int ett_rohc_ir;
+static int ett_rohc_ir_dyn;
+static int ett_rohc_static_ipv4;
+static int ett_rohc_static_udp;
+static int ett_rohc_static_rtp;
+static int ett_rohc_rtp_static;
+static int ett_rohc_rtp_dynamic;
+static int ett_rohc_dynamic_ipv4;
+static int ett_rohc_dynamic_udp;
+static int ett_rohc_dynamic_rtp;
+static int ett_rohc_compressed_list;
+static int ett_rohc_packet;
+static int ett_rohc_ext;
+static int ett_rohc_ext3_flags;
+static int ett_rohc_ext3_inner_ip_flags;
+static int ett_rohc_ext3_outer_ip_flags;
+static int ett_rohc_ext3_rtp_flags;
+
+static expert_field ei_rohc_profile_spec_octet;
+static expert_field ei_rohc_rohc_opt_clock;
+static expert_field ei_rohc_opt_jitter;
+static expert_field ei_rohc_feedback_type_2_is_not_applicable_for_uncompressed_profile;
+static expert_field ei_rohc_not_dissected_yet;
+static expert_field ei_rohc_profile_specific;
+static expert_field ei_rohc_profile_not_supported;
+static expert_field ei_rohc_ip_version;
+static expert_field ei_rohc_desegmentation_not_implemented;
 
 static dissector_handle_t rohc_handle;
 
diff --git a/epan/dissectors/packet-roofnet.c b/epan/dissectors/packet-roofnet.c
index 9630969fd9..9e905c9349 100644
--- a/epan/dissectors/packet-roofnet.c
+++ b/epan/dissectors/packet-roofnet.c
@@ -64,30 +64,30 @@ void proto_reg_handoff_roofnet(void);
 static dissector_handle_t roofnet_handle;
 static dissector_handle_t ip_handle;
 static dissector_handle_t eth_withoutfcs_handle;
-static int proto_roofnet = -1;
+static int proto_roofnet;
 
 /* hf fields for the header of roofnet */
-static int hf_roofnet_version = -1;
-static int hf_roofnet_type = -1;
-static int hf_roofnet_nlinks = -1;
-static int hf_roofnet_next = -1;
-static int hf_roofnet_ttl = -1;
-static int hf_roofnet_cksum = -1;
-static int hf_roofnet_flags = -1;
-static int hf_roofnet_flags_error = -1;
-static int hf_roofnet_flags_update = -1;
-static int hf_roofnet_flags_layer2 = -1;
-static int hf_roofnet_flags_reserved = -1;
-static int hf_roofnet_data_length = -1;
-static int hf_roofnet_query_dst = -1;
-static int hf_roofnet_seq = -1;
-/* static int hf_roofnet_links = -1; */
-static int hf_roofnet_link_src = -1;
-static int hf_roofnet_link_forward = -1;
-static int hf_roofnet_link_rev = -1;
-static int hf_roofnet_link_seq = -1;
-static int hf_roofnet_link_age = -1;
-static int hf_roofnet_link_dst = -1;
+static int hf_roofnet_version;
+static int hf_roofnet_type;
+static int hf_roofnet_nlinks;
+static int hf_roofnet_next;
+static int hf_roofnet_ttl;
+static int hf_roofnet_cksum;
+static int hf_roofnet_flags;
+static int hf_roofnet_flags_error;
+static int hf_roofnet_flags_update;
+static int hf_roofnet_flags_layer2;
+static int hf_roofnet_flags_reserved;
+static int hf_roofnet_data_length;
+static int hf_roofnet_query_dst;
+static int hf_roofnet_seq;
+/* static int hf_roofnet_links; */
+static int hf_roofnet_link_src;
+static int hf_roofnet_link_forward;
+static int hf_roofnet_link_rev;
+static int hf_roofnet_link_seq;
+static int hf_roofnet_link_age;
+static int hf_roofnet_link_dst;
 
 static int * const flag_list[] = {
     &hf_roofnet_flags_error,
@@ -98,12 +98,12 @@ static int * const flag_list[] = {
 };
 
 
-static gint ett_roofnet = -1;
-static gint ett_roofnet_flags = -1;
-static gint ett_roofnet_link = -1;
+static gint ett_roofnet;
+static gint ett_roofnet_flags;
+static gint ett_roofnet_link;
 
-static expert_field ei_roofnet_too_many_links = EI_INIT;
-static expert_field ei_roofnet_too_much_data = EI_INIT;
+static expert_field ei_roofnet_too_many_links;
+static expert_field ei_roofnet_too_much_data;
 
 /*
  * dissect the header of roofnet
diff --git a/epan/dissectors/packet-roon_discovery.c b/epan/dissectors/packet-roon_discovery.c
index b0686ac084..dd79bbc3cd 100644
--- a/epan/dissectors/packet-roon_discovery.c
+++ b/epan/dissectors/packet-roon_discovery.c
@@ -29,28 +29,28 @@ void proto_register_roon_discover(void);
 static dissector_handle_t roon_discover_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_roon_discover = -1;
-static int hf_roon_disco_config_version   = -1;
-static int hf_roon_disco_device_type      = -1;
-static int hf_roon_disco_device_class     = -1;
-static int hf_roon_disco_display_version  = -1;
-static int hf_roon_disco_http_port        = -1;
-static int hf_roon_disco_https_port       = -1;
-static int hf_roon_disco_is_dev           = -1;
-static int hf_roon_disco_machine_id       = -1;
-static int hf_roon_disco_machine_name     = -1;
-static int hf_roon_disco_marker           = -1;
-static int hf_roon_disco_name             = -1;
-static int hf_roon_disco_os_version       = -1;
-static int hf_roon_disco_protocol_version = -1;
-static int hf_roon_disco_protocol_hash    = -1;
-static int hf_roon_disco_raat_version     = -1;
-static int hf_roon_disco_service_id       = -1;
-static int hf_roon_disco_tcp_port         = -1;
-static int hf_roon_disco_tid              = -1;
-static int hf_roon_disco_type             = -1;
-static int hf_roon_disco_unique_id        = -1;
-static int hf_roon_disco_user_id          = -1;
+static int proto_roon_discover;
+static int hf_roon_disco_config_version;
+static int hf_roon_disco_device_type;
+static int hf_roon_disco_device_class;
+static int hf_roon_disco_display_version;
+static int hf_roon_disco_http_port;
+static int hf_roon_disco_https_port;
+static int hf_roon_disco_is_dev;
+static int hf_roon_disco_machine_id;
+static int hf_roon_disco_machine_name;
+static int hf_roon_disco_marker;
+static int hf_roon_disco_name;
+static int hf_roon_disco_os_version;
+static int hf_roon_disco_protocol_version;
+static int hf_roon_disco_protocol_hash;
+static int hf_roon_disco_raat_version;
+static int hf_roon_disco_service_id;
+static int hf_roon_disco_tcp_port;
+static int hf_roon_disco_tid;
+static int hf_roon_disco_type;
+static int hf_roon_disco_unique_id;
+static int hf_roon_disco_user_id;
 
 
 #define ROON_DISCOVERY_ID "SOOD"
@@ -59,7 +59,7 @@ static int hf_roon_disco_user_id          = -1;
 #define ROON_DISCOVERY_UDP_PORT 9003 /* Not IANA-assigned */
 
 /* Initialize the subtree pointers */
-static gint ett_roon_discover = -1;
+static gint ett_roon_discover;
 
 #define ROON_DISCOVERY_MIN_LENGTH 98 // empirically defined
 
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 837ca20f9b..4639350f0a 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -176,108 +176,108 @@ static const value_string rpc_authdes_namekind[] = {
 };
 
 /* the protocol number */
-static int proto_rpc = -1;
-static int hf_rpc_reqframe = -1;
-static int hf_rpc_repframe = -1;
-static int hf_rpc_lastfrag = -1;
-static int hf_rpc_fraglen = -1;
-static int hf_rpc_xid = -1;
-static int hf_rpc_msgtype = -1;
-static int hf_rpc_version = -1;
-static int hf_rpc_version_min = -1;
-static int hf_rpc_version_max = -1;
-static int hf_rpc_program = -1;
-static int hf_rpc_programversion = -1;
-static int hf_rpc_programversion_min = -1;
-static int hf_rpc_programversion_max = -1;
-static int hf_rpc_procedure = -1;
-static int hf_rpc_auth_flavor = -1;
-static int hf_rpc_auth_length = -1;
-static int hf_rpc_auth_machinename = -1;
-static int hf_rpc_auth_stamp = -1;
-static int hf_rpc_auth_lk_owner = -1;
-static int hf_rpc_auth_pid = -1;
-static int hf_rpc_auth_uid = -1;
-static int hf_rpc_auth_gid = -1;
-static int hf_rpc_auth_flags = -1;
-static int hf_rpc_auth_ctime = -1;
-static int hf_rpc_authgss_v = -1;
-static int hf_rpc_authgss_proc = -1;
-static int hf_rpc_authgss_seq = -1;
-static int hf_rpc_authgss_svc = -1;
-static int hf_rpc_authgss_ctx = -1;
-static int hf_rpc_authgss_ctx_create_frame = -1;
-static int hf_rpc_authgss_ctx_destroy_frame = -1;
-static int hf_rpc_authgss_ctx_len = -1;
-static int hf_rpc_authgss_major = -1;
-static int hf_rpc_authgss_minor = -1;
-static int hf_rpc_authgss_window = -1;
-static int hf_rpc_authgss_token_length = -1;
-static int hf_rpc_authgss_data_length = -1;
-static int hf_rpc_authgss_data = -1;
-static int hf_rpc_authgss_token = -1;
-static int hf_rpc_authgss_checksum = -1;
-static int hf_rpc_authgssapi_v = -1;
-static int hf_rpc_authgssapi_msg = -1;
-static int hf_rpc_authgssapi_msgv = -1;
-static int hf_rpc_authgssapi_handle = -1;
-static int hf_rpc_authgssapi_isn = -1;
-static int hf_rpc_authdes_namekind = -1;
-static int hf_rpc_authdes_netname = -1;
-static int hf_rpc_authdes_convkey = -1;
-static int hf_rpc_authdes_window = -1;
-static int hf_rpc_authdes_nickname = -1;
-static int hf_rpc_authdes_timestamp = -1;
-static int hf_rpc_authdes_windowverf = -1;
-static int hf_rpc_authdes_timeverf = -1;
-static int hf_rpc_state_accept = -1;
-static int hf_rpc_state_reply = -1;
-static int hf_rpc_state_reject = -1;
-static int hf_rpc_state_auth = -1;
-static int hf_rpc_dup = -1;
-static int hf_rpc_call_dup = -1;
-static int hf_rpc_reply_dup = -1;
-static int hf_rpc_value_follows = -1;
-static int hf_rpc_array_len = -1;
-static int hf_rpc_time = -1;
-static int hf_rpc_fragments = -1;
-static int hf_rpc_fragment = -1;
-static int hf_rpc_fragment_overlap = -1;
-static int hf_rpc_fragment_overlap_conflict = -1;
-static int hf_rpc_fragment_multiple_tails = -1;
-static int hf_rpc_fragment_too_long_fragment = -1;
-static int hf_rpc_fragment_error = -1;
-static int hf_rpc_fragment_count = -1;
-static int hf_rpc_reassembled_length = -1;
-static int hf_rpc_unknown_body = -1;
+static int proto_rpc;
+static int hf_rpc_reqframe;
+static int hf_rpc_repframe;
+static int hf_rpc_lastfrag;
+static int hf_rpc_fraglen;
+static int hf_rpc_xid;
+static int hf_rpc_msgtype;
+static int hf_rpc_version;
+static int hf_rpc_version_min;
+static int hf_rpc_version_max;
+static int hf_rpc_program;
+static int hf_rpc_programversion;
+static int hf_rpc_programversion_min;
+static int hf_rpc_programversion_max;
+static int hf_rpc_procedure;
+static int hf_rpc_auth_flavor;
+static int hf_rpc_auth_length;
+static int hf_rpc_auth_machinename;
+static int hf_rpc_auth_stamp;
+static int hf_rpc_auth_lk_owner;
+static int hf_rpc_auth_pid;
+static int hf_rpc_auth_uid;
+static int hf_rpc_auth_gid;
+static int hf_rpc_auth_flags;
+static int hf_rpc_auth_ctime;
+static int hf_rpc_authgss_v;
+static int hf_rpc_authgss_proc;
+static int hf_rpc_authgss_seq;
+static int hf_rpc_authgss_svc;
+static int hf_rpc_authgss_ctx;
+static int hf_rpc_authgss_ctx_create_frame;
+static int hf_rpc_authgss_ctx_destroy_frame;
+static int hf_rpc_authgss_ctx_len;
+static int hf_rpc_authgss_major;
+static int hf_rpc_authgss_minor;
+static int hf_rpc_authgss_window;
+static int hf_rpc_authgss_token_length;
+static int hf_rpc_authgss_data_length;
+static int hf_rpc_authgss_data;
+static int hf_rpc_authgss_token;
+static int hf_rpc_authgss_checksum;
+static int hf_rpc_authgssapi_v;
+static int hf_rpc_authgssapi_msg;
+static int hf_rpc_authgssapi_msgv;
+static int hf_rpc_authgssapi_handle;
+static int hf_rpc_authgssapi_isn;
+static int hf_rpc_authdes_namekind;
+static int hf_rpc_authdes_netname;
+static int hf_rpc_authdes_convkey;
+static int hf_rpc_authdes_window;
+static int hf_rpc_authdes_nickname;
+static int hf_rpc_authdes_timestamp;
+static int hf_rpc_authdes_windowverf;
+static int hf_rpc_authdes_timeverf;
+static int hf_rpc_state_accept;
+static int hf_rpc_state_reply;
+static int hf_rpc_state_reject;
+static int hf_rpc_state_auth;
+static int hf_rpc_dup;
+static int hf_rpc_call_dup;
+static int hf_rpc_reply_dup;
+static int hf_rpc_value_follows;
+static int hf_rpc_array_len;
+static int hf_rpc_time;
+static int hf_rpc_fragments;
+static int hf_rpc_fragment;
+static int hf_rpc_fragment_overlap;
+static int hf_rpc_fragment_overlap_conflict;
+static int hf_rpc_fragment_multiple_tails;
+static int hf_rpc_fragment_too_long_fragment;
+static int hf_rpc_fragment_error;
+static int hf_rpc_fragment_count;
+static int hf_rpc_reassembled_length;
+static int hf_rpc_unknown_body;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_rpc_opaque_data = -1;
-static int hf_rpc_no_values = -1;
-static int hf_rpc_continuation_data = -1;
-static int hf_rpc_fill_bytes = -1;
-static int hf_rpc_argument_length = -1;
-static int hf_rpc_fragment_data = -1;
-static int hf_rpc_opaque_length = -1;
-
-static gint ett_rpc = -1;
-static gint ett_rpc_unknown_program = -1;
-static gint ett_rpc_fragments = -1;
-static gint ett_rpc_fragment = -1;
-static gint ett_rpc_fraghdr = -1;
-static gint ett_rpc_string = -1;
-static gint ett_rpc_cred = -1;
-static gint ett_rpc_verf = -1;
-static gint ett_rpc_gids = -1;
-static gint ett_rpc_gss_token = -1;
-static gint ett_rpc_gss_data = -1;
-static gint ett_rpc_array = -1;
-static gint ett_rpc_authgssapi_msg = -1;
-static gint ett_gss_context = -1;
-static gint ett_gss_wrap = -1;
-
-static expert_field ei_rpc_cannot_dissect = EI_INIT;
-static expert_field ei_rpc_segment_needed = EI_INIT;
+static int hf_rpc_opaque_data;
+static int hf_rpc_no_values;
+static int hf_rpc_continuation_data;
+static int hf_rpc_fill_bytes;
+static int hf_rpc_argument_length;
+static int hf_rpc_fragment_data;
+static int hf_rpc_opaque_length;
+
+static gint ett_rpc;
+static gint ett_rpc_unknown_program;
+static gint ett_rpc_fragments;
+static gint ett_rpc_fragment;
+static gint ett_rpc_fraghdr;
+static gint ett_rpc_string;
+static gint ett_rpc_cred;
+static gint ett_rpc_verf;
+static gint ett_rpc_gids;
+static gint ett_rpc_gss_token;
+static gint ett_rpc_gss_data;
+static gint ett_rpc_array;
+static gint ett_rpc_authgssapi_msg;
+static gint ett_gss_context;
+static gint ett_gss_wrap;
+
+static expert_field ei_rpc_cannot_dissect;
+static expert_field ei_rpc_segment_needed;
 
 static dissector_handle_t rpc_tcp_handle;
 static dissector_handle_t rpc_handle;
diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c
index 0a290a63de..64931ba230 100644
--- a/epan/dissectors/packet-rpcap.c
+++ b/epan/dissectors/packet-rpcap.c
@@ -85,131 +85,131 @@
 void proto_register_rpcap (void);
 void proto_reg_handoff_rpcap (void);
 
-static int proto_rpcap = -1;
-
-static int hf_version = -1;
-static int hf_type = -1;
-static int hf_value = -1;
-static int hf_plen = -1;
-
-static int hf_error = -1;
-static int hf_error_value = -1;
-
-static int hf_packet = -1;
-static int hf_timestamp = -1;
-static int hf_caplen = -1;
-static int hf_len = -1;
-static int hf_npkt = -1;
-
-static int hf_auth_request = -1;
-static int hf_auth_type = -1;
-static int hf_auth_slen1 = -1;
-static int hf_auth_slen2 = -1;
-static int hf_auth_username = -1;
-static int hf_auth_password = -1;
-
-static int hf_auth_reply = -1;
-static int hf_auth_minvers = -1;
-static int hf_auth_maxvers = -1;
-
-static int hf_open_request = -1;
-
-static int hf_open_reply = -1;
-static int hf_linktype = -1;
-static int hf_tzoff = -1;
-
-static int hf_startcap_request = -1;
-static int hf_snaplen = -1;
-static int hf_read_timeout = -1;
-static int hf_flags = -1;
-static int hf_flags_promisc = -1;
-static int hf_flags_dgram = -1;
-static int hf_flags_serveropen = -1;
-static int hf_flags_inbound = -1;
-static int hf_flags_outbound = -1;
-static int hf_client_port = -1;
-static int hf_startcap_reply = -1;
-static int hf_bufsize = -1;
-static int hf_server_port = -1;
-static int hf_dummy = -1;
-
-static int hf_filter = -1;
-static int hf_filtertype = -1;
-static int hf_nitems = -1;
-
-static int hf_filterbpf_insn = -1;
-static int hf_code = -1;
-static int hf_code_class = -1;
-static int hf_code_fields = -1;
-static int hf_code_ld_size = -1;
-static int hf_code_ld_mode = -1;
-static int hf_code_alu_op = -1;
-static int hf_code_jmp_op = -1;
-static int hf_code_src = -1;
-static int hf_code_rval = -1;
-static int hf_code_misc_op = -1;
-static int hf_jt = -1;
-static int hf_jf = -1;
-static int hf_instr_value = -1;
-
-static int hf_stats_reply = -1;
-static int hf_ifrecv = -1;
-static int hf_ifdrop = -1;
-static int hf_krnldrop = -1;
-static int hf_srvcapt = -1;
-
-static int hf_findalldevs_reply = -1;
-static int hf_findalldevs_if = -1;
-static int hf_namelen = -1;
-static int hf_desclen = -1;
-static int hf_if_flags = -1;
-static int hf_naddr = -1;
-static int hf_if_name = -1;
-static int hf_if_desc = -1;
-
-static int hf_findalldevs_ifaddr = -1;
-static int hf_if_addr = -1;
-static int hf_if_netmask = -1;
-static int hf_if_broadaddr = -1;
-static int hf_if_dstaddr = -1;
-static int hf_if_af = -1;
-static int hf_if_port = -1;
-static int hf_if_ipv4 = -1;
-static int hf_if_flowinfo = -1;
-static int hf_if_ipv6 = -1;
-static int hf_if_scopeid = -1;
-static int hf_if_padding = -1;
-static int hf_if_unknown = -1;
-
-static int hf_sampling_request = -1;
-static int hf_sampling_method = -1;
-static int hf_sampling_dummy1 = -1;
-static int hf_sampling_dummy2 = -1;
-static int hf_sampling_value = -1;
-
-static gint ett_rpcap = -1;
-static gint ett_error = -1;
-static gint ett_packet = -1;
-static gint ett_auth_request = -1;
-static gint ett_auth_reply = -1;
-static gint ett_open_reply = -1;
-static gint ett_startcap_request = -1;
-static gint ett_startcap_reply = -1;
-static gint ett_startcap_flags = -1;
-static gint ett_filter = -1;
-static gint ett_filterbpf_insn = -1;
-static gint ett_filterbpf_insn_code = -1;
-static gint ett_stats_reply = -1;
-static gint ett_findalldevs_reply = -1;
-static gint ett_findalldevs_if = -1;
-static gint ett_findalldevs_ifaddr = -1;
-static gint ett_ifaddr = -1;
-static gint ett_sampling_request = -1;
-
-static expert_field ei_error = EI_INIT;
-static expert_field ei_if_unknown = EI_INIT;
-static expert_field ei_no_more_data = EI_INIT;
-static expert_field ei_caplen_too_big = EI_INIT;
+static int proto_rpcap;
+
+static int hf_version;
+static int hf_type;
+static int hf_value;
+static int hf_plen;
+
+static int hf_error;
+static int hf_error_value;
+
+static int hf_packet;
+static int hf_timestamp;
+static int hf_caplen;
+static int hf_len;
+static int hf_npkt;
+
+static int hf_auth_request;
+static int hf_auth_type;
+static int hf_auth_slen1;
+static int hf_auth_slen2;
+static int hf_auth_username;
+static int hf_auth_password;
+
+static int hf_auth_reply;
+static int hf_auth_minvers;
+static int hf_auth_maxvers;
+
+static int hf_open_request;
+
+static int hf_open_reply;
+static int hf_linktype;
+static int hf_tzoff;
+
+static int hf_startcap_request;
+static int hf_snaplen;
+static int hf_read_timeout;
+static int hf_flags;
+static int hf_flags_promisc;
+static int hf_flags_dgram;
+static int hf_flags_serveropen;
+static int hf_flags_inbound;
+static int hf_flags_outbound;
+static int hf_client_port;
+static int hf_startcap_reply;
+static int hf_bufsize;
+static int hf_server_port;
+static int hf_dummy;
+
+static int hf_filter;
+static int hf_filtertype;
+static int hf_nitems;
+
+static int hf_filterbpf_insn;
+static int hf_code;
+static int hf_code_class;
+static int hf_code_fields;
+static int hf_code_ld_size;
+static int hf_code_ld_mode;
+static int hf_code_alu_op;
+static int hf_code_jmp_op;
+static int hf_code_src;
+static int hf_code_rval;
+static int hf_code_misc_op;
+static int hf_jt;
+static int hf_jf;
+static int hf_instr_value;
+
+static int hf_stats_reply;
+static int hf_ifrecv;
+static int hf_ifdrop;
+static int hf_krnldrop;
+static int hf_srvcapt;
+
+static int hf_findalldevs_reply;
+static int hf_findalldevs_if;
+static int hf_namelen;
+static int hf_desclen;
+static int hf_if_flags;
+static int hf_naddr;
+static int hf_if_name;
+static int hf_if_desc;
+
+static int hf_findalldevs_ifaddr;
+static int hf_if_addr;
+static int hf_if_netmask;
+static int hf_if_broadaddr;
+static int hf_if_dstaddr;
+static int hf_if_af;
+static int hf_if_port;
+static int hf_if_ipv4;
+static int hf_if_flowinfo;
+static int hf_if_ipv6;
+static int hf_if_scopeid;
+static int hf_if_padding;
+static int hf_if_unknown;
+
+static int hf_sampling_request;
+static int hf_sampling_method;
+static int hf_sampling_dummy1;
+static int hf_sampling_dummy2;
+static int hf_sampling_value;
+
+static gint ett_rpcap;
+static gint ett_error;
+static gint ett_packet;
+static gint ett_auth_request;
+static gint ett_auth_reply;
+static gint ett_open_reply;
+static gint ett_startcap_request;
+static gint ett_startcap_reply;
+static gint ett_startcap_flags;
+static gint ett_filter;
+static gint ett_filterbpf_insn;
+static gint ett_filterbpf_insn_code;
+static gint ett_stats_reply;
+static gint ett_findalldevs_reply;
+static gint ett_findalldevs_if;
+static gint ett_findalldevs_ifaddr;
+static gint ett_ifaddr;
+static gint ett_sampling_request;
+
+static expert_field ei_error;
+static expert_field ei_if_unknown;
+static expert_field ei_no_more_data;
+static expert_field ei_caplen_too_big;
 
 static dissector_handle_t pcap_pktdata_handle;
 static dissector_handle_t rpcap_tcp_handle;
diff --git a/epan/dissectors/packet-rpcrdma.c b/epan/dissectors/packet-rpcrdma.c
index e7f650c91b..c01eb04e67 100644
--- a/epan/dissectors/packet-rpcrdma.c
+++ b/epan/dissectors/packet-rpcrdma.c
@@ -45,61 +45,61 @@
 void proto_reg_handoff_rpcordma(void);
 void proto_register_rpcordma(void);
 
-static int proto_rpcordma = -1;
+static int proto_rpcordma;
 static dissector_handle_t rpcordma_handle;
 static dissector_handle_t rpc_handler;
 
 /* RPCoRDMA Header */
-static int hf_rpcordma_xid = -1;
-static int hf_rpcordma_vers = -1;
-static int hf_rpcordma_flow_control = -1;
-static int hf_rpcordma_message_type = -1;
+static int hf_rpcordma_xid;
+static int hf_rpcordma_vers;
+static int hf_rpcordma_flow_control;
+static int hf_rpcordma_message_type;
 
 /* chunks */
-static int hf_rpcordma_reads_count = -1;
-static int hf_rpcordma_writes_count = -1;
-static int hf_rpcordma_reply_count = -1;
+static int hf_rpcordma_reads_count;
+static int hf_rpcordma_writes_count;
+static int hf_rpcordma_reply_count;
 
-static int hf_rpcordma_position = -1;
-static int hf_rpcordma_segment_count = -1;
+static int hf_rpcordma_position;
+static int hf_rpcordma_segment_count;
 
 /* rdma_segment */
-static int hf_rpcordma_rdma_handle = -1;
-static int hf_rpcordma_rdma_length = -1;
-static int hf_rpcordma_rdma_offset = -1;
+static int hf_rpcordma_rdma_handle;
+static int hf_rpcordma_rdma_length;
+static int hf_rpcordma_rdma_offset;
 
-static int hf_rpcordma_rdma_align = -1;
-static int hf_rpcordma_rdma_thresh = -1;
+static int hf_rpcordma_rdma_align;
+static int hf_rpcordma_rdma_thresh;
 
-static int hf_rpcordma_errcode = -1;
-static int hf_rpcordma_vers_high = -1;
-static int hf_rpcordma_vers_low = -1;
+static int hf_rpcordma_errcode;
+static int hf_rpcordma_vers_high;
+static int hf_rpcordma_vers_low;
 
 /* Initialize the subtree pointers */
-static gint ett_rpcordma = -1;
-static gint ett_rpcordma_chunk = -1;
-static gint ett_rpcordma_read_list = -1;
-static gint ett_rpcordma_read_chunk = -1;
-static gint ett_rpcordma_write_list = -1;
-static gint ett_rpcordma_write_chunk = -1;
-static gint ett_rpcordma_reply_chunk = -1;
-static gint ett_rpcordma_segment = -1;
+static gint ett_rpcordma;
+static gint ett_rpcordma_chunk;
+static gint ett_rpcordma_read_list;
+static gint ett_rpcordma_read_chunk;
+static gint ett_rpcordma_write_list;
+static gint ett_rpcordma_write_chunk;
+static gint ett_rpcordma_reply_chunk;
+static gint ett_rpcordma_segment;
 
 /* Fragmentation */
-static int hf_rpcordma_fragments = -1;
-static int hf_rpcordma_fragment = -1;
-static int hf_rpcordma_fragment_overlap = -1;
-static int hf_rpcordma_fragment_overlap_conflicts = -1;
-static int hf_rpcordma_fragment_multiple_tails = -1;
-static int hf_rpcordma_fragment_too_long_fragment = -1;
-static int hf_rpcordma_fragment_error = -1;
-static int hf_rpcordma_fragment_count = -1;
-static int hf_rpcordma_reassembled_in = -1;
-static int hf_rpcordma_reassembled_length = -1;
-static int hf_rpcordma_reassembled_data = -1;
-
-static gint ett_rpcordma_fragment = -1;
-static gint ett_rpcordma_fragments = -1;
+static int hf_rpcordma_fragments;
+static int hf_rpcordma_fragment;
+static int hf_rpcordma_fragment_overlap;
+static int hf_rpcordma_fragment_overlap_conflicts;
+static int hf_rpcordma_fragment_multiple_tails;
+static int hf_rpcordma_fragment_too_long_fragment;
+static int hf_rpcordma_fragment_error;
+static int hf_rpcordma_fragment_count;
+static int hf_rpcordma_reassembled_in;
+static int hf_rpcordma_reassembled_length;
+static int hf_rpcordma_reassembled_data;
+
+static gint ett_rpcordma_fragment;
+static gint ett_rpcordma_fragments;
 
 static const fragment_items rpcordma_frag_items = {
     /* Fragment subtrees */
diff --git a/epan/dissectors/packet-rpki-rtr.c b/epan/dissectors/packet-rpki-rtr.c
index 6c464d8000..35645e1b9e 100644
--- a/epan/dissectors/packet-rpki-rtr.c
+++ b/epan/dissectors/packet-rpki-rtr.c
@@ -25,49 +25,49 @@
 void proto_register_rpkirtr(void);
 void proto_reg_handoff_rpkirtr(void);
 
-static int proto_rpkirtr = -1;
-static int hf_rpkirtr_version = -1;
-static int hf_rpkirtr_pdu_type = -1;
-static int hf_rpkirtr_reserved = -1;
-static int hf_rpkirtr_session_id = -1;
-static int hf_rpkirtr_length = -1;
-static int hf_rpkirtr_serial_number = -1;
-static int hf_rpkirtr_flags = -1;
-static int hf_rpkirtr_flags_aw = -1;
-static int hf_rpkirtr_flags_rk = -1;
-static int hf_rpkirtr_flags_ar = -1;
-static int hf_rpkirtr_flags_arafi = -1;
-static int hf_rpkirtr_prefix_length = -1;
-static int hf_rpkirtr_max_length = -1;
-static int hf_rpkirtr_ipv4_prefix = -1;
-static int hf_rpkirtr_ipv6_prefix = -1;
-static int hf_rpkirtr_as_number = -1;
-static int hf_rpkirtr_error_code = -1;
-static int hf_rpkirtr_length_pdu = -1;
-static int hf_rpkirtr_error_pdu = -1;
-static int hf_rpkirtr_length_text = -1;
-static int hf_rpkirtr_error_text = -1;
-static int hf_rpkirtr_refresh_interval = -1;
-static int hf_rpkirtr_retry_interval = -1;
-static int hf_rpkirtr_expire_interval = -1;
-static int hf_rpkirtr_subject_key_identifier = -1;
-static int hf_rpkirtr_subject_public_key_info = -1;
-static int hf_rpkirtr_aspa_provider_as_count = -1;
-static int hf_rpkirtr_aspa_customer_asn = -1;
-static int hf_rpkirtr_aspa_provider_asn = -1;
+static int proto_rpkirtr;
+static int hf_rpkirtr_version;
+static int hf_rpkirtr_pdu_type;
+static int hf_rpkirtr_reserved;
+static int hf_rpkirtr_session_id;
+static int hf_rpkirtr_length;
+static int hf_rpkirtr_serial_number;
+static int hf_rpkirtr_flags;
+static int hf_rpkirtr_flags_aw;
+static int hf_rpkirtr_flags_rk;
+static int hf_rpkirtr_flags_ar;
+static int hf_rpkirtr_flags_arafi;
+static int hf_rpkirtr_prefix_length;
+static int hf_rpkirtr_max_length;
+static int hf_rpkirtr_ipv4_prefix;
+static int hf_rpkirtr_ipv6_prefix;
+static int hf_rpkirtr_as_number;
+static int hf_rpkirtr_error_code;
+static int hf_rpkirtr_length_pdu;
+static int hf_rpkirtr_error_pdu;
+static int hf_rpkirtr_length_text;
+static int hf_rpkirtr_error_text;
+static int hf_rpkirtr_refresh_interval;
+static int hf_rpkirtr_retry_interval;
+static int hf_rpkirtr_expire_interval;
+static int hf_rpkirtr_subject_key_identifier;
+static int hf_rpkirtr_subject_public_key_info;
+static int hf_rpkirtr_aspa_provider_as_count;
+static int hf_rpkirtr_aspa_customer_asn;
+static int hf_rpkirtr_aspa_provider_asn;
 
 #define RPKI_RTR_TCP_PORT 323
 #define RPKI_RTR_TLS_PORT 324
 static guint g_port_rpkirtr_tls = RPKI_RTR_TLS_PORT;
 
-static gint ett_rpkirtr = -1;
-static gint ett_flags   = -1;
-static gint ett_flags_nd = -1;
-static gint ett_providers = -1;
+static gint ett_rpkirtr;
+static gint ett_flags;
+static gint ett_flags_nd;
+static gint ett_providers;
 
-static expert_field ei_rpkirtr_wrong_version_aspa = EI_INIT;
-static expert_field ei_rpkirtr_wrong_version_router_key = EI_INIT;
-static expert_field ei_rpkirtr_bad_length = EI_INIT;
+static expert_field ei_rpkirtr_wrong_version_aspa;
+static expert_field ei_rpkirtr_wrong_version_router_key;
+static expert_field ei_rpkirtr_bad_length;
 
 static dissector_handle_t rpkirtr_handle;
 
diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c
index 9dcfb53b13..66d4142a40 100644
--- a/epan/dissectors/packet-rpl.c
+++ b/epan/dissectors/packet-rpl.c
@@ -19,45 +19,45 @@
 void proto_register_rpl(void);
 void proto_reg_handoff_rpl(void);
 
-static int proto_rpl          = -1;
-
-static int hf_rpl_type        = -1;
-static int hf_rpl_len         = -1;
-static int hf_rpl_corrval     = -1;
-static int hf_rpl_respval     = -1;
-static int hf_rpl_maxframe    = -1;
-static int hf_rpl_connclass   = -1;
-static int hf_rpl_lmac        = -1;
-static int hf_rpl_smac        = -1;
-static int hf_rpl_sap         = -1;
-static int hf_rpl_equipment   = -1;
-static int hf_rpl_memsize     = -1;
-static int hf_rpl_bsmversion  = -1;
-static int hf_rpl_adapterid   = -1;
-static int hf_rpl_shortname   = -1;
-static int hf_rpl_laddress    = -1;
-static int hf_rpl_xaddress    = -1;
-static int hf_rpl_sequence    = -1;
-static int hf_rpl_config      = -1;
-static int hf_rpl_flags       = -1;
-static int hf_rpl_data        = -1;
-static int hf_rpl_ec          = -1;
-
-static gint ett_rpl           = -1;
-static gint ett_rpl_0004      = -1;
-static gint ett_rpl_0008      = -1;
-static gint ett_rpl_4003      = -1;
-static gint ett_rpl_4006      = -1;
-static gint ett_rpl_4007      = -1;
-static gint ett_rpl_4009      = -1;
-static gint ett_rpl_400a      = -1;
-static gint ett_rpl_400b      = -1;
-static gint ett_rpl_400c      = -1;
-static gint ett_rpl_4011      = -1;
-static gint ett_rpl_4018      = -1;
-static gint ett_rpl_c005      = -1;
-static gint ett_rpl_c014      = -1;
-static gint ett_rpl_unkn      = -1;
+static int proto_rpl;
+
+static int hf_rpl_type;
+static int hf_rpl_len;
+static int hf_rpl_corrval;
+static int hf_rpl_respval;
+static int hf_rpl_maxframe;
+static int hf_rpl_connclass;
+static int hf_rpl_lmac;
+static int hf_rpl_smac;
+static int hf_rpl_sap;
+static int hf_rpl_equipment;
+static int hf_rpl_memsize;
+static int hf_rpl_bsmversion;
+static int hf_rpl_adapterid;
+static int hf_rpl_shortname;
+static int hf_rpl_laddress;
+static int hf_rpl_xaddress;
+static int hf_rpl_sequence;
+static int hf_rpl_config;
+static int hf_rpl_flags;
+static int hf_rpl_data;
+static int hf_rpl_ec;
+
+static gint ett_rpl;
+static gint ett_rpl_0004;
+static gint ett_rpl_0008;
+static gint ett_rpl_4003;
+static gint ett_rpl_4006;
+static gint ett_rpl_4007;
+static gint ett_rpl_4009;
+static gint ett_rpl_400a;
+static gint ett_rpl_400b;
+static gint ett_rpl_400c;
+static gint ett_rpl_4011;
+static gint ett_rpl_4018;
+static gint ett_rpl_c005;
+static gint ett_rpl_c014;
+static gint ett_rpl_unkn;
 
 static dissector_handle_t rpl_handle;
 
diff --git a/epan/dissectors/packet-rquota.c b/epan/dissectors/packet-rquota.c
index 386e7f125f..142a81eb21 100644
--- a/epan/dissectors/packet-rquota.c
+++ b/epan/dissectors/packet-rquota.c
@@ -18,28 +18,28 @@
 void proto_register_rquota(void);
 void proto_reg_handoff_rquota(void);
 
-static int proto_rquota = -1;
-static int hf_rquota_procedure_v1 = -1;
-static int hf_rquota_procedure_v2 = -1;
-static int hf_rquota_pathp = -1;
-static int hf_rquota_uid = -1;
-static int hf_rquota_type = -1;
-static int hf_rquota_id = -1;
-static int hf_rquota_status = -1;
-static int hf_rquota_rquota = -1;
-static int hf_rquota_bsize = -1;
-static int hf_rquota_active = -1;
-static int hf_rquota_bhardlimit = -1;
-static int hf_rquota_bsoftlimit = -1;
-static int hf_rquota_curblocks = -1;
-static int hf_rquota_fhardlimit = -1;
-static int hf_rquota_fsoftlimit = -1;
-static int hf_rquota_curfiles = -1;
-static int hf_rquota_btimeleft = -1;
-static int hf_rquota_ftimeleft = -1;
-
-static gint ett_rquota = -1;
-static gint ett_rquota_rquota = -1;
+static int proto_rquota;
+static int hf_rquota_procedure_v1;
+static int hf_rquota_procedure_v2;
+static int hf_rquota_pathp;
+static int hf_rquota_uid;
+static int hf_rquota_type;
+static int hf_rquota_id;
+static int hf_rquota_status;
+static int hf_rquota_rquota;
+static int hf_rquota_bsize;
+static int hf_rquota_active;
+static int hf_rquota_bhardlimit;
+static int hf_rquota_bsoftlimit;
+static int hf_rquota_curblocks;
+static int hf_rquota_fhardlimit;
+static int hf_rquota_fsoftlimit;
+static int hf_rquota_curfiles;
+static int hf_rquota_btimeleft;
+static int hf_rquota_ftimeleft;
+
+static gint ett_rquota;
+static gint ett_rquota_rquota;
 
 #define RQUOTAPROC_NULL 		0
 #define RQUOTAPROC_GETQUOTA		1
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c
index 31f25fc2e6..14744ea189 100644
--- a/epan/dissectors/packet-rrc.c
+++ b/epan/dissectors/packet-rrc.c
@@ -510,7 +510,7 @@ static int dissect_SysInfoType22_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 #define maxWLANs                       64
 
 /* Initialize the protocol and registered fields */
-int proto_rrc = -1;
+int proto_rrc;
 static int hf_test;
 static int hf_urnti;
 static int hf_urnti_new;
diff --git a/epan/dissectors/packet-rsh.c b/epan/dissectors/packet-rsh.c
index 360e65b7a4..23cdedd1a9 100644
--- a/epan/dissectors/packet-rsh.c
+++ b/epan/dissectors/packet-rsh.c
@@ -35,17 +35,17 @@ static gboolean preference_info_show_server_username = TRUE;
 static gboolean preference_info_show_command = FALSE;
 
 /* Initialize the protocol and registered fields */
-static int proto_rsh = -1;
+static int proto_rsh;
 
-static int hf_rsh_stderr_port     = -1;
-static int hf_rsh_client_username = -1;
-static int hf_rsh_server_username = -1;
-static int hf_rsh_command         = -1;
-static int hf_rsh_client_server_data = -1;
-static int hf_rsh_server_client_data = -1;
+static int hf_rsh_stderr_port;
+static int hf_rsh_client_username;
+static int hf_rsh_server_username;
+static int hf_rsh_command;
+static int hf_rsh_client_server_data;
+static int hf_rsh_server_client_data;
 
 /* Initialize the subtree pointers */
-static gint ett_rsh = -1;
+static gint ett_rsh;
 
 #define RSH_STDERR_PORT_LEN 5
 #define RSH_CLIENT_USERNAME_LEN 16
diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c
index 4b90c789d8..ef2514752b 100644
--- a/epan/dissectors/packet-rsip.c
+++ b/epan/dissectors/packet-rsip.c
@@ -24,40 +24,40 @@ void proto_reg_handoff_rsip(void);
 static dissector_handle_t rsip_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_rsip = -1;
-static int hf_rsip_version = -1;
-static int hf_rsip_message_type = -1;
-static int hf_rsip_message_length = -1;
-static int hf_rsip_parameter_type = -1;
-static int hf_rsip_parameter_length = -1;
-static int hf_rsip_parameter_value = -1;
-static int hf_rsip_parameter_address_type = -1;
-static int hf_rsip_parameter_address_ipv4 = -1;
-static int hf_rsip_parameter_address_ipv4_netmask = -1;
-static int hf_rsip_parameter_address_ipv6 = -1;
-static int hf_rsip_parameter_address_fqdn = -1;
-static int hf_rsip_parameter_ports_number = -1;
-static int hf_rsip_parameter_ports_port_number = -1;
-static int hf_rsip_parameter_lease_time = -1;
-static int hf_rsip_parameter_client_id = -1;
-static int hf_rsip_parameter_bind_id = -1;
-static int hf_rsip_parameter_tunnel_type = -1;
-static int hf_rsip_parameter_method = -1;
-static int hf_rsip_parameter_error = -1;
-static int hf_rsip_parameter_flow_policy_local = -1;
-static int hf_rsip_parameter_flow_policy_remote = -1;
-static int hf_rsip_parameter_indicator = -1;
-static int hf_rsip_parameter_message_counter = -1;
-static int hf_rsip_parameter_vendor_specific_vendor_id = -1;
-static int hf_rsip_parameter_vendor_specific_subtype = -1;
-static int hf_rsip_parameter_vendor_specific_value = -1;
-static int hf_rsip_parameter_spi_number = -1;
-static int hf_rsip_parameter_spi = -1;
+static int proto_rsip;
+static int hf_rsip_version;
+static int hf_rsip_message_type;
+static int hf_rsip_message_length;
+static int hf_rsip_parameter_type;
+static int hf_rsip_parameter_length;
+static int hf_rsip_parameter_value;
+static int hf_rsip_parameter_address_type;
+static int hf_rsip_parameter_address_ipv4;
+static int hf_rsip_parameter_address_ipv4_netmask;
+static int hf_rsip_parameter_address_ipv6;
+static int hf_rsip_parameter_address_fqdn;
+static int hf_rsip_parameter_ports_number;
+static int hf_rsip_parameter_ports_port_number;
+static int hf_rsip_parameter_lease_time;
+static int hf_rsip_parameter_client_id;
+static int hf_rsip_parameter_bind_id;
+static int hf_rsip_parameter_tunnel_type;
+static int hf_rsip_parameter_method;
+static int hf_rsip_parameter_error;
+static int hf_rsip_parameter_flow_policy_local;
+static int hf_rsip_parameter_flow_policy_remote;
+static int hf_rsip_parameter_indicator;
+static int hf_rsip_parameter_message_counter;
+static int hf_rsip_parameter_vendor_specific_vendor_id;
+static int hf_rsip_parameter_vendor_specific_subtype;
+static int hf_rsip_parameter_vendor_specific_value;
+static int hf_rsip_parameter_spi_number;
+static int hf_rsip_parameter_spi;
 
 /* Initialize the subtree pointers */
-static gint ett_rsip = -1;
-static gint ett_rsip_param = -1;
-static gint ett_rsip_param_val = -1;
+static gint ett_rsip;
+static gint ett_rsip_param;
+static gint ett_rsip_param_val;
 
 #define UDP_PORT_RSIP	4555
 #define TCP_PORT_RSIP	4555
diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c
index 0875786484..04c530be29 100644
--- a/epan/dissectors/packet-rsl.c
+++ b/epan/dissectors/packet-rsl.c
@@ -38,240 +38,240 @@ void proto_reg_handoff_rsl(void);
 guint16 parse_reduced_frame_number(tvbuff_t *tvb, const gint offset);
 
 /* Initialize the protocol and registered fields */
-static int proto_rsl        = -1;
-
-static int hf_rsl_msg_type             = -1;
-static int hf_rsl_T_bit                = -1;
-static int hf_rsl_msg_dsc              = -1;
-static int hf_rsl_ie_id                = -1;
-static int hf_rsl_ie_length            = -1;
-static int hf_rsl_ch_no_Cbits          = -1;
-static int hf_rsl_ch_no_TN             = -1;
-static int hf_rsl_acc_delay            = -1;
-static int hf_rsl_rach_slot_cnt        = -1;
-static int hf_rsl_rach_busy_cnt        = -1;
-static int hf_rsl_rach_acc_cnt         = -1;
-static int hf_rsl_req_ref_ra           = -1;
-static int hf_rsl_req_ref_ra_est_cause = -1;
-static int hf_rsl_req_ref_T1prim       = -1;
-static int hf_rsl_req_ref_T3           = -1;
-static int hf_rsl_req_ref_T2           = -1;
-static int hf_rsl_req_ref_rfn          = -1;
-static int hf_rsl_timing_adv           = -1;
-static int hf_rsl_ho_ref               = -1;
-static int hf_rsl_l1inf_power_lev      = -1;
-static int hf_rsl_l1inf_fpc            = -1;
-static int hf_rsl_l1inf_srr            = -1;
-static int hf_rsl_ms_power_lev         = -1;
-static int hf_rsl_ms_fpc               = -1;
-static int hf_rsl_act_timing_adv       = -1;
-static int hf_rsl_phy_ctx              = -1;
-static int hf_rsl_na                   = -1;
-static int hf_rsl_ch_type              = -1;
-static int hf_rsl_prio                 = -1;
-static int hf_rsl_sapi                 = -1;
-static int hf_rsl_rbit                 = -1;
-static int hf_rsl_a3a2                 = -1;
-static int hf_rsl_a1_0                 = -1;
-static int hf_rsl_a1_1                 = -1;
-static int hf_rsl_a1_2                 = -1;
-static int hf_rsl_epc_mode             = -1;
-static int hf_rsl_bs_fpc_epc_mode      = -1;
-static int hf_rsl_bs_power             = -1;
-static int hf_rsl_cm_dtxd              = -1;
-static int hf_rsl_cm_dtxu              = -1;
-static int hf_rsl_speech_or_data       = -1;
-static int hf_rsl_ch_rate_and_type     = -1;
-static int hf_rsl_speech_coding_alg    = -1;
-static int hf_rsl_t_nt_bit             = -1;
-static int hf_rsl_ra_if_data_rte       = -1;
-static int hf_rsl_data_rte             = -1;
-static int hf_rsl_alg_id               = -1;
-static int hf_rsl_key                  = -1;
-static int hf_rsl_cause                = -1;
-static int hf_rsl_rel_mode             = -1;
-static int hf_rsl_interf_band          = -1;
-static int hf_rsl_interf_band_reserved = -1;
-static int hf_rsl_meas_res_no          = -1;
-static int hf_rsl_extension_bit        = -1;
-static int hf_rsl_dtxd                 = -1;
-static int hf_rsl_rxlev_full_up        = -1;
-static int hf_rsl_rxlev_sub_up         = -1;
-static int hf_rsl_rxqual_full_up       = -1;
-static int hf_rsl_rxqual_sub_up        = -1;
-static int hf_rsl_class                = -1;
-static int hf_rsl_cause_value          = -1;
-static int hf_rsl_paging_grp           = -1;
-static int hf_rsl_paging_load          = -1;
-static int hf_rsl_sys_info_type        = -1;
-static int hf_rsl_timing_offset        = -1;
-static int hf_rsl_ch_needed            = -1;
-static int hf_rsl_cbch_load_type       = -1;
-static int hf_rsl_msg_slt_cnt          = -1;
-static int hf_rsl_ch_ind               = -1;
-static int hf_rsl_command              = -1;
-static int hf_rsl_emlpp_prio           = -1;
-static int hf_rsl_rtd                  = -1;
-static int hf_rsl_delay_ind            = -1;
-static int hf_rsl_tfo                  = -1;
-static int hf_rsl_speech_mode_s        = -1;
-static int hf_rsl_speech_mode_m        = -1;
-static int hf_rsl_conn_id              = -1;
-static int hf_rsl_rtp_payload          = -1;
-static int hf_rsl_rtp_csd_fmt_d        = -1;
-static int hf_rsl_rtp_csd_fmt_ir       = -1;
-static int hf_rsl_local_port           = -1;
-static int hf_rsl_remote_port          = -1;
-static int hf_rsl_local_ip             = -1;
-static int hf_rsl_remote_ip            = -1;
-static int hf_rsl_cstat_tx_pkts        = -1;
-static int hf_rsl_cstat_tx_octs        = -1;
-static int hf_rsl_cstat_rx_pkts        = -1;
-static int hf_rsl_cstat_rx_octs        = -1;
-static int hf_rsl_cstat_lost_pkts      = -1;
-static int hf_rsl_cstat_ia_jitter      = -1;
-static int hf_rsl_cstat_avg_tx_dly     = -1;
+static int proto_rsl;
+
+static int hf_rsl_msg_type;
+static int hf_rsl_T_bit;
+static int hf_rsl_msg_dsc;
+static int hf_rsl_ie_id;
+static int hf_rsl_ie_length;
+static int hf_rsl_ch_no_Cbits;
+static int hf_rsl_ch_no_TN;
+static int hf_rsl_acc_delay;
+static int hf_rsl_rach_slot_cnt;
+static int hf_rsl_rach_busy_cnt;
+static int hf_rsl_rach_acc_cnt;
+static int hf_rsl_req_ref_ra;
+static int hf_rsl_req_ref_ra_est_cause;
+static int hf_rsl_req_ref_T1prim;
+static int hf_rsl_req_ref_T3;
+static int hf_rsl_req_ref_T2;
+static int hf_rsl_req_ref_rfn;
+static int hf_rsl_timing_adv;
+static int hf_rsl_ho_ref;
+static int hf_rsl_l1inf_power_lev;
+static int hf_rsl_l1inf_fpc;
+static int hf_rsl_l1inf_srr;
+static int hf_rsl_ms_power_lev;
+static int hf_rsl_ms_fpc;
+static int hf_rsl_act_timing_adv;
+static int hf_rsl_phy_ctx;
+static int hf_rsl_na;
+static int hf_rsl_ch_type;
+static int hf_rsl_prio;
+static int hf_rsl_sapi;
+static int hf_rsl_rbit;
+static int hf_rsl_a3a2;
+static int hf_rsl_a1_0;
+static int hf_rsl_a1_1;
+static int hf_rsl_a1_2;
+static int hf_rsl_epc_mode;
+static int hf_rsl_bs_fpc_epc_mode;
+static int hf_rsl_bs_power;
+static int hf_rsl_cm_dtxd;
+static int hf_rsl_cm_dtxu;
+static int hf_rsl_speech_or_data;
+static int hf_rsl_ch_rate_and_type;
+static int hf_rsl_speech_coding_alg;
+static int hf_rsl_t_nt_bit;
+static int hf_rsl_ra_if_data_rte;
+static int hf_rsl_data_rte;
+static int hf_rsl_alg_id;
+static int hf_rsl_key;
+static int hf_rsl_cause;
+static int hf_rsl_rel_mode;
+static int hf_rsl_interf_band;
+static int hf_rsl_interf_band_reserved;
+static int hf_rsl_meas_res_no;
+static int hf_rsl_extension_bit;
+static int hf_rsl_dtxd;
+static int hf_rsl_rxlev_full_up;
+static int hf_rsl_rxlev_sub_up;
+static int hf_rsl_rxqual_full_up;
+static int hf_rsl_rxqual_sub_up;
+static int hf_rsl_class;
+static int hf_rsl_cause_value;
+static int hf_rsl_paging_grp;
+static int hf_rsl_paging_load;
+static int hf_rsl_sys_info_type;
+static int hf_rsl_timing_offset;
+static int hf_rsl_ch_needed;
+static int hf_rsl_cbch_load_type;
+static int hf_rsl_msg_slt_cnt;
+static int hf_rsl_ch_ind;
+static int hf_rsl_command;
+static int hf_rsl_emlpp_prio;
+static int hf_rsl_rtd;
+static int hf_rsl_delay_ind;
+static int hf_rsl_tfo;
+static int hf_rsl_speech_mode_s;
+static int hf_rsl_speech_mode_m;
+static int hf_rsl_conn_id;
+static int hf_rsl_rtp_payload;
+static int hf_rsl_rtp_csd_fmt_d;
+static int hf_rsl_rtp_csd_fmt_ir;
+static int hf_rsl_local_port;
+static int hf_rsl_remote_port;
+static int hf_rsl_local_ip;
+static int hf_rsl_remote_ip;
+static int hf_rsl_cstat_tx_pkts;
+static int hf_rsl_cstat_tx_octs;
+static int hf_rsl_cstat_rx_pkts;
+static int hf_rsl_cstat_rx_octs;
+static int hf_rsl_cstat_lost_pkts;
+static int hf_rsl_cstat_ia_jitter;
+static int hf_rsl_cstat_avg_tx_dly;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_rsl_channel_description_tag = -1;
-static int hf_rsl_mobile_allocation_tag = -1;
-static int hf_rsl_mobile_allocation_len = -1;
-static int hf_rsl_no_resources_required = -1;
-static int hf_rsl_llsdu_ccch = -1;
-static int hf_rsl_llsdu_sacch = -1;
-static int hf_rsl_llsdu = -1;
-static int hf_rsl_rach_supplementary_information = -1;
-static int hf_rsl_full_immediate_assign_info_field = -1;
-static int hf_rsl_layer_3_message = -1;
-static int hf_rsl_descriptive_group_or_broadcast_call_reference = -1;
-static int hf_rsl_group_channel_description = -1;
-static int hf_rsl_uic = -1;
-static int hf_rsl_codec_list = -1;
-static int hf_rsl_cb_cmd_type = -1;
-static int hf_rsl_cb_def_bcast = -1;
-static int hf_rsl_cb_last_block = -1;
-static int hf_rsl_etws_pn = -1;
+static int hf_rsl_channel_description_tag;
+static int hf_rsl_mobile_allocation_tag;
+static int hf_rsl_mobile_allocation_len;
+static int hf_rsl_no_resources_required;
+static int hf_rsl_llsdu_ccch;
+static int hf_rsl_llsdu_sacch;
+static int hf_rsl_llsdu;
+static int hf_rsl_rach_supplementary_information;
+static int hf_rsl_full_immediate_assign_info_field;
+static int hf_rsl_layer_3_message;
+static int hf_rsl_descriptive_group_or_broadcast_call_reference;
+static int hf_rsl_group_channel_description;
+static int hf_rsl_uic;
+static int hf_rsl_codec_list;
+static int hf_rsl_cb_cmd_type;
+static int hf_rsl_cb_def_bcast;
+static int hf_rsl_cb_last_block;
+static int hf_rsl_etws_pn;
 
 /* Encapsulating paging messages into a packet REF: EP2192796 - proprietor Huawei */
-static int hf_rsl_paging_spare                 = -1;
-static int hf_rsl_paging_msg_no                = -1;
-static int hf_rsl_paging_package_ch_no         = -1;
-static int hf_rsl_paging_package_ch_needed     = -1;
-static int hf_rsl_paging_emlpp_prio            = -1;
-static int hf_rsl_paging_type                  = -1;
-static int hf_rsl_paging_group_cs              = -1;
-static int hf_rsl_paging_group_empty_package   = -1;
-static int hf_rsl_paging_group_ps_spare        = -1;
+static int hf_rsl_paging_spare;
+static int hf_rsl_paging_msg_no;
+static int hf_rsl_paging_package_ch_no;
+static int hf_rsl_paging_package_ch_needed;
+static int hf_rsl_paging_emlpp_prio;
+static int hf_rsl_paging_type;
+static int hf_rsl_paging_group_cs;
+static int hf_rsl_paging_group_empty_package;
+static int hf_rsl_paging_group_ps_spare;
 
 /* Physical Context dissection */
-static int hf_rsl_phy_ctx_ie_id                = -1;
-static int hf_rsl_phy_ctx_ext_rand_access      = -1;
-static int hf_rsl_phy_ctx_ab_rx_lvl            = -1;
-static int hf_rsl_phy_ctx_ab_err_bits          = -1;
-static int hf_rsl_phy_ctx_rx_lvl_ext           = -1;
+static int hf_rsl_phy_ctx_ie_id;
+static int hf_rsl_phy_ctx_ext_rand_access;
+static int hf_rsl_phy_ctx_ab_rx_lvl;
+static int hf_rsl_phy_ctx_ab_err_bits;
+static int hf_rsl_phy_ctx_rx_lvl_ext;
 
 /* Osmocom specific IEs */
-static int hf_rsl_osmo_rep_acch_rxqual = -1;
-static int hf_rsl_osmo_rep_acch_ul_sacch = -1;
-static int hf_rsl_osmo_rep_acch_dl_sacch = -1;
-static int hf_rsl_osmo_rep_acch_dl_facch_all = -1;
-static int hf_rsl_osmo_rep_acch_dl_facch_cmd = -1;
-static int hf_rsl_osmo_top_acch_val = -1;
-static int hf_rsl_osmo_top_acch_sacch = -1;
-static int hf_rsl_osmo_top_acch_facch = -1;
-static int hf_rsl_osmo_top_acch_rxqual = -1;
-static int hf_rsl_osmo_tsc_set = -1;
-static int hf_rsl_osmo_tsc_val = -1;
-static int hf_rsl_osmo_osmux_cid = -1;
+static int hf_rsl_osmo_rep_acch_rxqual;
+static int hf_rsl_osmo_rep_acch_ul_sacch;
+static int hf_rsl_osmo_rep_acch_dl_sacch;
+static int hf_rsl_osmo_rep_acch_dl_facch_all;
+static int hf_rsl_osmo_rep_acch_dl_facch_cmd;
+static int hf_rsl_osmo_top_acch_val;
+static int hf_rsl_osmo_top_acch_sacch;
+static int hf_rsl_osmo_top_acch_facch;
+static int hf_rsl_osmo_top_acch_rxqual;
+static int hf_rsl_osmo_tsc_set;
+static int hf_rsl_osmo_tsc_val;
+static int hf_rsl_osmo_osmux_cid;
 
 /* Initialize the subtree pointers */
-static int ett_rsl = -1;
-static int ett_ie_link_id = -1;
-static int ett_ie_act_type = -1;
-static int ett_ie_bs_power = -1;
-static int ett_ie_bs_power_params = -1;
-static int ett_ie_ch_id = -1;
-static int ett_ie_ch_mode = -1;
-static int ett_ie_enc_inf = -1;
-static int ett_ie_ch_no = -1;
-static int ett_ie_frame_no = -1;
-static int ett_ie_ho_ref = -1;
-static int ett_ie_l1_inf = -1;
-static int ett_ie_L3_inf = -1;
-static int ett_ie_ms_id = -1;
-static int ett_ie_ms_pow = -1;
-static int ett_ie_ms_pow_params = -1;
-static int ett_ie_phy_ctx = -1;
-static int ett_ie_paging_grp = -1;
-static int ett_ie_paging_load = -1;
-static int ett_ie_access_delay = -1;
-static int ett_ie_rach_load = -1;
-static int ett_ie_req_ref = -1;
-static int ett_ie_req_ref_ra = -1;
-static int ett_ie_rel_mode = -1;
-static int ett_ie_resource_inf = -1;
-static int ett_ie_rlm_cause = -1;
-static int ett_ie_staring_time = -1;
-static int ett_ie_timing_adv = -1;
-static int ett_ie_uplink_meas = -1;
-static int ett_ie_full_imm_ass_inf = -1;
-static int ett_ie_smscb_inf = -1;
-static int ett_ie_ms_timing_offset = -1;
-static int ett_ie_err_msg = -1;
-static int ett_ie_full_bcch_inf = -1;
-static int ett_ie_ch_needed = -1;
-static int ett_ie_cb_cmd_type = -1;
-static int ett_ie_smscb_mess = -1;
-static int ett_ie_cbch_load_inf = -1;
-static int ett_ie_smscb_ch_ind = -1;
-static int ett_ie_grp_call_ref = -1;
-static int ett_ie_ch_desc = -1;
-static int ett_ie_nch_drx = -1;
-static int ett_ie_cmd_ind = -1;
-static int ett_ie_emlpp_prio = -1;
-static int ett_ie_uic = -1;
-static int ett_ie_main_ch_ref = -1;
-static int ett_ie_multirate_conf = -1;
-static int ett_ie_multirate_cntrl = -1;
-static int ett_ie_sup_codec_types = -1;
-static int ett_ie_codec_conf = -1;
-static int ett_ie_rtd = -1;
-static int ett_ie_tfo_status = -1;
-static int ett_ie_llp_apdu = -1;
-static int ett_ie_tfo_transp_cont = -1;
-static int ett_ie_cause = -1;
-static int ett_ie_meas_res_no = -1;
-static int ett_ie_message_id = -1;
-static int ett_ie_sys_info_type = -1;
-static int ett_ie_speech_mode = -1;
-static int ett_ie_conn_id = -1;
-static int ett_ie_remote_ip = -1;
-static int ett_ie_remote_port = -1;
-static int ett_ie_local_port = -1;
-static int ett_ie_local_ip = -1;
-static int ett_ie_rtp_payload = -1;
-static int ett_ie_etws_pn = -1;
-static int ett_ie_osmo_rep_acch_cap = -1;
-static int ett_ie_osmo_top_acch_cap = -1;
-static int ett_ie_osmo_training_seq = -1;
+static int ett_rsl;
+static int ett_ie_link_id;
+static int ett_ie_act_type;
+static int ett_ie_bs_power;
+static int ett_ie_bs_power_params;
+static int ett_ie_ch_id;
+static int ett_ie_ch_mode;
+static int ett_ie_enc_inf;
+static int ett_ie_ch_no;
+static int ett_ie_frame_no;
+static int ett_ie_ho_ref;
+static int ett_ie_l1_inf;
+static int ett_ie_L3_inf;
+static int ett_ie_ms_id;
+static int ett_ie_ms_pow;
+static int ett_ie_ms_pow_params;
+static int ett_ie_phy_ctx;
+static int ett_ie_paging_grp;
+static int ett_ie_paging_load;
+static int ett_ie_access_delay;
+static int ett_ie_rach_load;
+static int ett_ie_req_ref;
+static int ett_ie_req_ref_ra;
+static int ett_ie_rel_mode;
+static int ett_ie_resource_inf;
+static int ett_ie_rlm_cause;
+static int ett_ie_staring_time;
+static int ett_ie_timing_adv;
+static int ett_ie_uplink_meas;
+static int ett_ie_full_imm_ass_inf;
+static int ett_ie_smscb_inf;
+static int ett_ie_ms_timing_offset;
+static int ett_ie_err_msg;
+static int ett_ie_full_bcch_inf;
+static int ett_ie_ch_needed;
+static int ett_ie_cb_cmd_type;
+static int ett_ie_smscb_mess;
+static int ett_ie_cbch_load_inf;
+static int ett_ie_smscb_ch_ind;
+static int ett_ie_grp_call_ref;
+static int ett_ie_ch_desc;
+static int ett_ie_nch_drx;
+static int ett_ie_cmd_ind;
+static int ett_ie_emlpp_prio;
+static int ett_ie_uic;
+static int ett_ie_main_ch_ref;
+static int ett_ie_multirate_conf;
+static int ett_ie_multirate_cntrl;
+static int ett_ie_sup_codec_types;
+static int ett_ie_codec_conf;
+static int ett_ie_rtd;
+static int ett_ie_tfo_status;
+static int ett_ie_llp_apdu;
+static int ett_ie_tfo_transp_cont;
+static int ett_ie_cause;
+static int ett_ie_meas_res_no;
+static int ett_ie_message_id;
+static int ett_ie_sys_info_type;
+static int ett_ie_speech_mode;
+static int ett_ie_conn_id;
+static int ett_ie_remote_ip;
+static int ett_ie_remote_port;
+static int ett_ie_local_port;
+static int ett_ie_local_ip;
+static int ett_ie_rtp_payload;
+static int ett_ie_etws_pn;
+static int ett_ie_osmo_rep_acch_cap;
+static int ett_ie_osmo_top_acch_cap;
+static int ett_ie_osmo_training_seq;
 
 /* Encapsulating paging messages into a packet REF: EP2192796 - proprietor Huawei */
-static int ett_ie_paging_package               = -1;
-static int ett_ie_paging_package_number        = -1;
-static int ett_ie_paging_package_info          = -1;
-static int ett_ie_paging_package_ch_a_emlpp    = -1;
-static int ett_ie_paging_group_paras           = -1;
+static int ett_ie_paging_package;
+static int ett_ie_paging_package_number;
+static int ett_ie_paging_package_info;
+static int ett_ie_paging_package_ch_a_emlpp;
+static int ett_ie_paging_group_paras;
 
 /* Physical Context dissection */
-static int ett_phy_ctx_ie                      = -1;
-static int ett_phy_ctx_ie_ext_rand_access      = -1;
-static int ett_phy_ctx_ab_rx_lvl_err_bits      = -1;
-static int ett_phy_ctx_rxlvl_ext               = -1;
+static int ett_phy_ctx_ie;
+static int ett_phy_ctx_ie_ext_rand_access;
+static int ett_phy_ctx_ab_rx_lvl_err_bits;
+static int ett_phy_ctx_rxlvl_ext;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_rsl_speech_or_data_indicator = EI_INIT;
-static expert_field ei_rsl_facility_information_element_3gpp_ts_44071 = EI_INIT;
-static expert_field ei_rsl_embedded_message_tfo_configuration = EI_INIT;
-static expert_field ei_rsl_mobile_allocation_deprecated = EI_INIT;
+static expert_field ei_rsl_speech_or_data_indicator;
+static expert_field ei_rsl_facility_information_element_3gpp_ts_44071;
+static expert_field ei_rsl_embedded_message_tfo_configuration;
+static expert_field ei_rsl_mobile_allocation_deprecated;
 
 static proto_tree *top_tree;
 static dissector_handle_t rsl_handle;
diff --git a/epan/dissectors/packet-rstat.c b/epan/dissectors/packet-rstat.c
index d5c8d63c1d..be2506ebf4 100644
--- a/epan/dissectors/packet-rstat.c
+++ b/epan/dissectors/packet-rstat.c
@@ -17,13 +17,13 @@
 void proto_register_rstat(void);
 void proto_reg_handoff_rstat(void);
 
-static int proto_rstat = -1;
-static int hf_rstat_procedure_v1 = -1;
-static int hf_rstat_procedure_v2 = -1;
-static int hf_rstat_procedure_v3 = -1;
-static int hf_rstat_procedure_v4 = -1;
+static int proto_rstat;
+static int hf_rstat_procedure_v1;
+static int hf_rstat_procedure_v2;
+static int hf_rstat_procedure_v3;
+static int hf_rstat_procedure_v4;
 
-static gint ett_rstat = -1;
+static gint ett_rstat;
 
 #define RSTAT_PROGRAM	100001
 
diff --git a/epan/dissectors/packet-rsvd.c b/epan/dissectors/packet-rsvd.c
index d3bcb6387d..8027594a47 100644
--- a/epan/dissectors/packet-rsvd.c
+++ b/epan/dissectors/packet-rsvd.c
@@ -26,87 +26,87 @@
 
 void proto_register_rsvd(void);
 
-static int proto_rsvd = -1;
-static int hf_svhdx_protocol_id = -1;
-static int hf_svhdx_protocol_version = -1;
-static int hf_svhdx_operation_code = -1;
-static int hf_svhdx_status = -1;
-static int hf_svhdx_request_id = -1;
-static int hf_svhdx_tunnel_scsi_length = -1;
-static int hf_svhdx_tunnel_scsi_reserved1 = -1;
-static int hf_svhdx_tunnel_scsi_cdb_length = -1;
-static int hf_svhdx_tunnel_scsi_sense_info_ex_length = -1;
-static int hf_svhdx_tunnel_scsi_data_in = -1;
-static int hf_svhdx_tunnel_scsi_reserved2 =  -1;
-static int hf_svhdx_tunnel_scsi_srb_flags = -1;
-static int hf_svhdx_tunnel_scsi_data_transfer_length = -1;
-static int hf_svhdx_tunnel_scsi_reserved3 = -1;
-static int hf_svhdx_tunnel_scsi_cdb = -1;
-static int hf_svhdx_tunnel_scsi_cdb_padding = -1;
-static int hf_svhdx_tunnel_scsi_data = -1;
-static int hf_svhdx_tunnel_scsi_auto_generated_sense = -1;
-static int hf_svhdx_tunnel_scsi_srb_status = -1;
-static int hf_svhdx_tunnel_scsi_sense_data_ex = -1;
-static int hf_svhdx_tunnel_scsi_status = -1;
-static int hf_svhdx_tunnel_file_info_server_version = -1;
-static int hf_svhdx_tunnel_file_info_sector_size = -1;
-static int hf_svhdx_tunnel_file_info_physical_sector_size = -1;
-static int hf_svhdx_tunnel_file_info_reserved = -1;
-static int hf_svhdx_tunnel_file_info_virtual_size = -1;
-static int hf_svhdx_tunnel_disk_info_reserved1 = -1;
-static int hf_svhdx_tunnel_disk_info_blocksize = -1;
-static int hf_svhdx_tunnel_disk_info_linkage_id = -1;
-static int hf_svhdx_tunnel_disk_info_disk_type = -1;
-static int hf_svhdx_tunnel_disk_info_disk_format = -1;
-static int hf_svhdx_tunnel_disk_info_is_mounted = -1;
-static int hf_svhdx_tunnel_disk_info_is_4k_aligned = -1;
-static int hf_svhdx_tunnel_disk_info_reserved = -1;
-static int hf_svhdx_tunnel_disk_info_file_size = -1;
-static int hf_svhdx_tunnel_disk_info_virtual_disk_id = -1;
-static int hf_svhdx_tunnel_validate_disk_reserved = -1;
-static int hf_svhdx_tunnel_validate_disk_is_valid_disk = -1;
-static int hf_svhdx_tunnel_srb_status_status_key = -1;
-static int hf_svhdx_tunnel_srb_status_reserved = -1;
-static int hf_svhdx_tunnel_srb_status_sense_info_auto_generated = -1;
-static int hf_svhdx_tunnel_srb_status_srb_status = -1;
-static int hf_svhdx_tunnel_srb_status_scsi_status = -1;
-static int hf_svhdx_tunnel_srb_status_sense_info_ex_length = -1;
-static int hf_svhdx_tunnel_srb_status_sense_data_ex = -1;
-static int hf_svhdx_tunnel_safe_virtual_size = -1;
-static int hf_svhdx_tunnel_transaction_id = -1;
-static int hf_svhdx_tunnel_meta_operation_type = -1;
-static int hf_svhdx_tunnel_padding = -1;
-static int hf_svhdx_tunnel_resize_new_size = -1;
-static int hf_svhdx_tunnel_resize_expand_only_flag = -1;
-static int hf_svhdx_tunnel_resize_allow_unsafe_virt_size_flag = -1;
-static int hf_svhdx_tunnel_resize_shrink_to_minimum_safe_size_flag = -1;
-static int hf_svhdx_tunnel_meta_operation_start_reserved = -1;
-static int hf_svhdx_tunnel_snapshot_type = -1;
-static int hf_svhdx_tunnel_snapshot_id = -1;
-static int hf_svhdx_tunnel_create_snapshot_flags = -1;
-static int hf_svhdx_tunnel_create_snapshot_flag_enable_change_tracking = -1;
-static int hf_svhdx_tunnel_create_snapshot_stage1 = -1;
-static int hf_svhdx_tunnel_create_snapshot_stage2 = -1;
-static int hf_svhdx_tunnel_create_snapshot_stage3 = -1;
-static int hf_svhdx_tunnel_create_snapshot_stage4 = -1;
-static int hf_svhdx_tunnel_create_snapshot_stage5 = -1;
-static int hf_svhdx_tunnel_create_snapshot_stage6 = -1;
-static int hf_svhdx_tunnel_create_snapshot_parameters_payload_size = -1;
-static int hf_svhdx_tunnel_convert_dst_vhdset_name_len = -1;
-static int hf_svhdx_tunnel_convert_dst_vhdset_name = -1;
-static int hf_svhdx_tunnel_delete_snapshot_persist_reference = -1;
-static int hf_svhdx_tunnel_meta_op_query_progress_current_progress = -1;
-static int hf_svhdx_tunnel_meta_op_query_progress_complete_value = -1;
-static int hf_svhdx_tunnel_vhdset_information_type = -1;
-static int hf_svhdx_tunnel_vhdset_snapshot_creation_time = -1;
-static int hf_svhdx_tunnel_vhdset_is_valid_snapshot = -1;
-static int hf_svhdx_tunnel_vhdset_parent_snapshot_id = -1;
-static int hf_svhdx_tunnel_vhdset_log_file_id = -1;
-
-static gint ett_rsvd = -1;
-static gint ett_svhdx_tunnel_op_header = -1;
-static gint ett_svhdx_tunnel_scsi_request = -1;
-static gint ett_rsvd_create_snapshot_flags = -1;
+static int proto_rsvd;
+static int hf_svhdx_protocol_id;
+static int hf_svhdx_protocol_version;
+static int hf_svhdx_operation_code;
+static int hf_svhdx_status;
+static int hf_svhdx_request_id;
+static int hf_svhdx_tunnel_scsi_length;
+static int hf_svhdx_tunnel_scsi_reserved1;
+static int hf_svhdx_tunnel_scsi_cdb_length;
+static int hf_svhdx_tunnel_scsi_sense_info_ex_length;
+static int hf_svhdx_tunnel_scsi_data_in;
+static int hf_svhdx_tunnel_scsi_reserved2;
+static int hf_svhdx_tunnel_scsi_srb_flags;
+static int hf_svhdx_tunnel_scsi_data_transfer_length;
+static int hf_svhdx_tunnel_scsi_reserved3;
+static int hf_svhdx_tunnel_scsi_cdb;
+static int hf_svhdx_tunnel_scsi_cdb_padding;
+static int hf_svhdx_tunnel_scsi_data;
+static int hf_svhdx_tunnel_scsi_auto_generated_sense;
+static int hf_svhdx_tunnel_scsi_srb_status;
+static int hf_svhdx_tunnel_scsi_sense_data_ex;
+static int hf_svhdx_tunnel_scsi_status;
+static int hf_svhdx_tunnel_file_info_server_version;
+static int hf_svhdx_tunnel_file_info_sector_size;
+static int hf_svhdx_tunnel_file_info_physical_sector_size;
+static int hf_svhdx_tunnel_file_info_reserved;
+static int hf_svhdx_tunnel_file_info_virtual_size;
+static int hf_svhdx_tunnel_disk_info_reserved1;
+static int hf_svhdx_tunnel_disk_info_blocksize;
+static int hf_svhdx_tunnel_disk_info_linkage_id;
+static int hf_svhdx_tunnel_disk_info_disk_type;
+static int hf_svhdx_tunnel_disk_info_disk_format;
+static int hf_svhdx_tunnel_disk_info_is_mounted;
+static int hf_svhdx_tunnel_disk_info_is_4k_aligned;
+static int hf_svhdx_tunnel_disk_info_reserved;
+static int hf_svhdx_tunnel_disk_info_file_size;
+static int hf_svhdx_tunnel_disk_info_virtual_disk_id;
+static int hf_svhdx_tunnel_validate_disk_reserved;
+static int hf_svhdx_tunnel_validate_disk_is_valid_disk;
+static int hf_svhdx_tunnel_srb_status_status_key;
+static int hf_svhdx_tunnel_srb_status_reserved;
+static int hf_svhdx_tunnel_srb_status_sense_info_auto_generated;
+static int hf_svhdx_tunnel_srb_status_srb_status;
+static int hf_svhdx_tunnel_srb_status_scsi_status;
+static int hf_svhdx_tunnel_srb_status_sense_info_ex_length;
+static int hf_svhdx_tunnel_srb_status_sense_data_ex;
+static int hf_svhdx_tunnel_safe_virtual_size;
+static int hf_svhdx_tunnel_transaction_id;
+static int hf_svhdx_tunnel_meta_operation_type;
+static int hf_svhdx_tunnel_padding;
+static int hf_svhdx_tunnel_resize_new_size;
+static int hf_svhdx_tunnel_resize_expand_only_flag;
+static int hf_svhdx_tunnel_resize_allow_unsafe_virt_size_flag;
+static int hf_svhdx_tunnel_resize_shrink_to_minimum_safe_size_flag;
+static int hf_svhdx_tunnel_meta_operation_start_reserved;
+static int hf_svhdx_tunnel_snapshot_type;
+static int hf_svhdx_tunnel_snapshot_id;
+static int hf_svhdx_tunnel_create_snapshot_flags;
+static int hf_svhdx_tunnel_create_snapshot_flag_enable_change_tracking;
+static int hf_svhdx_tunnel_create_snapshot_stage1;
+static int hf_svhdx_tunnel_create_snapshot_stage2;
+static int hf_svhdx_tunnel_create_snapshot_stage3;
+static int hf_svhdx_tunnel_create_snapshot_stage4;
+static int hf_svhdx_tunnel_create_snapshot_stage5;
+static int hf_svhdx_tunnel_create_snapshot_stage6;
+static int hf_svhdx_tunnel_create_snapshot_parameters_payload_size;
+static int hf_svhdx_tunnel_convert_dst_vhdset_name_len;
+static int hf_svhdx_tunnel_convert_dst_vhdset_name;
+static int hf_svhdx_tunnel_delete_snapshot_persist_reference;
+static int hf_svhdx_tunnel_meta_op_query_progress_current_progress;
+static int hf_svhdx_tunnel_meta_op_query_progress_complete_value;
+static int hf_svhdx_tunnel_vhdset_information_type;
+static int hf_svhdx_tunnel_vhdset_snapshot_creation_time;
+static int hf_svhdx_tunnel_vhdset_is_valid_snapshot;
+static int hf_svhdx_tunnel_vhdset_parent_snapshot_id;
+static int hf_svhdx_tunnel_vhdset_log_file_id;
+
+static gint ett_rsvd;
+static gint ett_svhdx_tunnel_op_header;
+static gint ett_svhdx_tunnel_scsi_request;
+static gint ett_rsvd_create_snapshot_flags;
 
 static const value_string rsvd_operation_code_vals[] = {
         { 0x02001001, "RSVD_TUNNEL_GET_INITIAL_INFO" },
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c
index bf8c6466a2..9e810e8e06 100644
--- a/epan/dissectors/packet-rsvp.c
+++ b/epan/dissectors/packet-rsvp.c
@@ -113,523 +113,523 @@ void proto_register_rsvp(void);
 void proto_reg_handoff_rsvp(void);
 static dissector_handle_t rsvp_handle, rsvpe2ei_handle;
 
-static int proto_rsvp = -1;
-static int proto_rsvp_e2e1 = -1;
-
-static int hf_rsvp_error_flags = -1;
-static int hf_rsvp_error_flags_path_state_removed = -1;
-static int hf_rsvp_error_flags_not_guilty = -1;
-static int hf_rsvp_error_flags_in_place = -1;
-static int hf_rsvp_eth_tspec_tlv_color_mode = -1;
-static int hf_rsvp_eth_tspec_tlv_coupling_flag = -1;
-static int hf_rsvp_sender_tspec_standard_contiguous_concatenation = -1;
-static int hf_rsvp_sender_tspec_arbitrary_contiguous_concatenation = -1;
-static int hf_rsvp_sender_tspec_regenerator_section = -1;
-static int hf_rsvp_sender_tspec_multiplex_section = -1;
-static int hf_rsvp_sender_tspec_J0_transparency = -1;
-static int hf_rsvp_sender_tspec_SOH_RSOH_DCC_transparency = -1;
-static int hf_rsvp_sender_tspec_LOH_MSOH_DCC_transparency = -1;
-static int hf_rsvp_sender_tspec_LOH_MSOH_extended_DCC_transparency = -1;
-static int hf_rsvp_sender_tspec_K1_K2_transparency = -1;
-static int hf_rsvp_sender_tspec_E1_transparency = -1;
-static int hf_rsvp_sender_tspec_F1_transparency = -1;
-static int hf_rsvp_sender_tspec_E2_transparency = -1;
-static int hf_rsvp_sender_tspec_B1_transparency = -1;
-static int hf_rsvp_sender_tspec_B2_transparency = -1;
-static int hf_rsvp_sender_tspec_M0_transparency = -1;
-static int hf_rsvp_sender_tspec_M1_transparency = -1;
-static int hf_rsvp_flowspec_standard_contiguous_concatenation = -1;
-static int hf_rsvp_flowspec_arbitrary_contiguous_concatenation = -1;
-static int hf_rsvp_flowspec_regenerator_section = -1;
-static int hf_rsvp_flowspec_multiplex_section = -1;
-static int hf_rsvp_flowspec_J0_transparency = -1;
-static int hf_rsvp_flowspec_SOH_RSOH_DCC_transparency = -1;
-static int hf_rsvp_flowspec_LOH_MSOH_DCC_transparency = -1;
-static int hf_rsvp_flowspec_LOH_MSOH_extended_DCC_transparency = -1;
-static int hf_rsvp_flowspec_K1_K2_transparency = -1;
-static int hf_rsvp_flowspec_E1_transparency = -1;
-static int hf_rsvp_flowspec_F1_transparency = -1;
-static int hf_rsvp_flowspec_E2_transparency = -1;
-static int hf_rsvp_flowspec_B1_transparency = -1;
-static int hf_rsvp_flowspec_B2_transparency = -1;
-static int hf_rsvp_flowspec_M0_transparency = -1;
-static int hf_rsvp_flowspec_M1_transparency = -1;
-static int hf_rsvp_integrity_flags_handshake = -1;
-static int hf_rsvp_sa_flags_local = -1;
-static int hf_rsvp_sa_flags_label = -1;
-static int hf_rsvp_sa_flags_se_style = -1;
-static int hf_rsvp_sa_flags_bandwidth = -1;
-static int hf_rsvp_sa_flags_node = -1;
-static int hf_rsvp_rro_flags_local_avail = -1;
-static int hf_rsvp_rro_flags_local_in_use = -1;
-static int hf_rsvp_rro_flags_bandwidth = -1;
-static int hf_rsvp_rro_flags_node = -1;
-static int hf_rsvp_rro_flags_node_address = -1;
-static int hf_rsvp_rro_flags_backup_tunnel_bandwidth = -1;
-static int hf_rsvp_rro_flags_backup_tunnel_hop = -1;
-static int hf_rsvp_rro_flags_global_label = -1;
-static int hf_rsvp_lsp_attr = -1;
-static int hf_rsvp_lsp_attr_e2e = -1;
-static int hf_rsvp_lsp_attr_boundary = -1;
-static int hf_rsvp_lsp_attr_segment = -1;
-static int hf_rsvp_lsp_attr_integrity = -1;
-static int hf_rsvp_lsp_attr_contiguous = -1;
-static int hf_rsvp_lsp_attr_stitching = -1;
-static int hf_rsvp_lsp_attr_preplanned = -1;
-static int hf_rsvp_lsp_attr_nophp = -1;
-static int hf_rsvp_lsp_attr_oobmap = -1;
-static int hf_rsvp_lsp_attr_entropy = -1;
-static int hf_rsvp_lsp_attr_oammep = -1;
-static int hf_rsvp_lsp_attr_oammip = -1;
-static int hf_rsvp_lsp_attr_loopback = -1;
-static int hf_rsvp_lsp_attr_p2mp = -1;
-static int hf_rsvp_lsp_attr_rtm = -1;
-static int hf_rsvp_lsp_attr_lsi = -1;
-static int hf_rsvp_lsp_attr_lsids2e = -1;
-static int hf_rsvp_lsp_attr_telinklabel = -1;
-static int hf_rsvp_lsp_attr_srlgcollect = -1;
-static int hf_rsvp_gen_uni_direction = -1;
-static int hf_rsvp_protection_info_flags_secondary_lsp = -1;
-static int hf_rsvp_pi_link_flags_extra_traffic = -1;
-static int hf_rsvp_pi_link_flags_unprotected = -1;
-static int hf_rsvp_pi_link_flags_shared = -1;
-static int hf_rsvp_pi_link_flags_dedicated1_1 = -1;
-static int hf_rsvp_pi_link_flags_dedicated1plus1 = -1;
-static int hf_rsvp_pi_link_flags_enhanced = -1;
-static int hf_rsvp_pi_link_flags_extra = -1;
-static int hf_rsvp_pi_link_flags_dedicated_1_1 = -1;
-static int hf_rsvp_pi_link_flags_dedicated_1plus1 = -1;
-static int hf_rsvp_rfc4872_secondary = -1;
-static int hf_rsvp_rfc4872_protecting = -1;
-static int hf_rsvp_rfc4872_notification_msg = -1;
-static int hf_rsvp_rfc4872_operational = -1;
-static int hf_rsvp_pi_lsp_flags_full_rerouting = -1;
-static int hf_rsvp_pi_lsp_flags_rerouting_extra = -1;
-static int hf_rsvp_pi_lsp_flags_1_n_protection = -1;
-static int hf_rsvp_pi_lsp_flags_1plus1_unidirectional = -1;
-static int hf_rsvp_pi_lsp_flags_1plus1_bidirectional = -1;
-static int hf_rsvp_protection_info_in_place = -1;
-static int hf_rsvp_protection_info_required = -1;
-static int hf_rsvp_pi_seg_flags_full_rerouting = -1;
-static int hf_rsvp_pi_seg_flags_rerouting_extra = -1;
-static int hf_rsvp_pi_seg_flags_1_n_protection = -1;
-static int hf_rsvp_pi_seg_flags_1plus1_unidirectional = -1;
-static int hf_rsvp_pi_seg_flags_1plus1_bidirectional = -1;
-static int hf_rsvp_frr_flags_one2one_backup = -1;
-static int hf_rsvp_frr_flags_facility_backup = -1;
-static int hf_rsvp_type = -1;
-static int hf_rsvp_3gpp_obj_tid = -1;
-static int hf_rsvp_3gpp_obj_ie_len = -1;
-static int hf_rsvp_3gpp_obj_ie_type = -1;
-static int hf_rsvp_3gpp_obj_ue_ipv4_addr = -1;
-static int hf_rsvp_3gpp_obj_ue_ipv6_addr = -1;
-static int hf_rsvp_3gpp_obj_tft_d = -1;
-static int hf_rsvp_3gpp_obj_tft_ns = -1;
-static int hf_rsvp_3gpp_obj_tft_sr_id = -1;
-static int hf_rsvp_3gpp_obj_tft_p = -1;
-static int hf_rsvp_3gpp_obj_tft_opcode = -1;
-static int hf_rsvp_3gpp_obj_tft_n_pkt_flt = -1;
-static int hf_rsvp_3gpp_obj_flow_id = -1;
-static int hf_rsvp_3gpp_obj_pf_ev_prec = -1;
-static int hf_rsvp_3gpp_obj_pf_len = -1;
-static int hf_rsvp_3gpp_obj_pf_type = -1;
-static int hf_rsvp_3gpp_obj_pf_cont_len = -1;
-static int hf_rsvp_3gpp_obj_pf_comp_type_id = -1;
-static int hf_rsvp_3gpp_obj_pf_src_ipv4 = -1;
-static int hf_rsvp_3gpp_obj_pf_dst_ipv4 = -1;
-static int hf_rsvp_3gpp_obj_pf_ipv4_mask = -1;
-static int hf_rsvp_3gpp_obj_pf_src_ipv6 = -1;
-static int hf_rsvp_3gpp_obj_pf_dst_ipv6 = -1;
-static int hf_rsvp_3gpp_obj_pf_ipv6_prefix_length = -1;
-static int hf_rsvp_3gpp_obj_pf_prot_next = -1;
-static int hf_rsvp_3gpp_obj_pf_dst_port = -1;
-static int hf_rsvp_3gpp_obj_pf_src_port = -1;
-static int hf_rsvp_3gpp_obj_pf_ipsec_spi = -1;
-static int hf_rsvp_3gpp_obj_pf_tos_tc = -1;
-static int hf_rsvp_3gpp_obj_pf_flow_lbl = -1;
-static int hf_rsvp_3gpp_obj_pf_ipv6 = -1;
-static int hf_rsvp_3gpp_obj_pf_treatment = -1;
-static int hf_rsvp_3gpp_obj_pf_hint = -1;
-static int hf_rsvp_3gpp_obj_tft_qos_list_len = -1;
-static int hf_rsvp_3gpp_r_qos_blob_len = -1;
-static int hf_rsvp_3gpp_r_qos_blob_flow_pri = -1;
-static int hf_rsvp_3gpp_r_qos_blob_num_qos_att_set = -1;
-static int hf_rsvp_3gpp_qos_att_set_len = -1;
-static int hf_rsvp_3gpp_qos_attribute_set_id = -1;
-static int hf_rsvp_3gpp_qos_attribute_verbose = -1;
-static int hf_rsvp_3gpp_qos_attribute_prof_id = -1;
-static int hf_rsvp_3gpp_qos_attribute_traff_cls = -1;
-static int hf_rsvp_3gpp_qos_attribute_peak_rate = -1;
-static int hf_rsvp_3gpp_qos_attribute_bucket_size = -1;
-static int hf_rsvp_3gpp_qos_attribute_token_rate = -1;
-static int hf_rsvp_3gpp_qos_attribute_max_latency = -1;
-static int hf_rsvp_3gpp_qos_attribute_max_loss_rte = -1;
-static int hf_rsvp_3gpp_qos_attribute_delay_var_sensitive = -1;
-static int hf_rsvp_3gpp_qos_attribute_reserved = -1;
-static int hf_rsvp_3gpp_r_qos_blob = -1;
-static int hf_rsvp_3gpp_qos_result = -1;
-static int hf_rsvp_xro_sobj_lbit = -1;
-static int hf_rsvp_rro_sobj_dbit = -1;
-static int hf_rsvp_xro_sobj_len = -1;
-static int hf_rsvp_xro_sobj_ipv4_addr = -1;
-static int hf_rsvp_xro_sobj_ipv4_prefix = -1;
-static int hf_rsvp_xro_sobj_ipv4_attr = -1;
-static int hf_rsvp_xro_sobj_ipv6_attr = -1;
-static int hf_rsvp_xro_sobj_srlg_id = -1;
-static int hf_rsvp_xro_sobj_srlg_res = -1;
-static int hf_rsvp_private_data = -1;
-static int hf_rsvp_juniper_numtlvs = -1;
-static int hf_rsvp_juniper_padlength = -1;
-static int hf_rsvp_juniper_type = -1;
-static int hf_rsvp_juniper_length = -1;
-static int hf_rsvp_juniper_attrib_cos = -1;
-static int hf_rsvp_juniper_attrib_metric1 = -1;
-static int hf_rsvp_juniper_attrib_metric2 = -1;
-static int hf_rsvp_juniper_attrib_ccc_status = -1;
-static int hf_rsvp_juniper_attrib_path = -1;
-static int hf_rsvp_juniper_attrib_unknown = -1;
-static int hf_rsvp_juniper_unknown = -1;
-static int hf_rsvp_juniper_pad = -1;
-static int hf_rsvp_unknown_data = -1;
-static int hf_rsvp_ctype = -1;
-static int hf_rsvp_ctype_session = -1;
-static int hf_rsvp_ctype_scope = -1;
-static int hf_rsvp_ctype_label_request = -1;
-static int hf_rsvp_ctype_integrity = -1;
-static int hf_rsvp_ctype_adspec = -1;
-static int hf_rsvp_ctype_tspec = -1;
-static int hf_rsvp_ctype_call_id = -1;
-static int hf_rsvp_ctype_template = -1;
-static int hf_rsvp_ctype_style = -1;
-static int hf_rsvp_ctype_policy = -1;
-static int hf_rsvp_ctype_error = -1;
-static int hf_rsvp_ctype_attribute = -1;
-static int hf_rsvp_ctype_explicit_route = -1;
-static int hf_rsvp_ctype_secondary_explicit_route = -1;
-static int hf_rsvp_ctype_flowspec = -1;
-static int hf_rsvp_ctype_hop = -1;
-static int hf_rsvp_ctype_confirm = -1;
-static int hf_rsvp_ctype_time_values = -1;
-static int hf_rsvp_ctype_record_route = -1;
-static int hf_rsvp_ctype_secondary_record_route = -1;
-static int hf_rsvp_ctype_exclude_route = -1;
-static int hf_rsvp_ctype_message_id = -1;
-static int hf_rsvp_ctype_message_id_ack = -1;
-static int hf_rsvp_ctype_message_id_list = -1;
-static int hf_rsvp_ctype_hello = -1;
-static int hf_rsvp_ctype_dclass = -1;
-static int hf_rsvp_ctype_admin_status = -1;
-static int hf_rsvp_ctype_lsp_attributes = -1;
-static int hf_rsvp_ctype_label_set = -1;
-static int hf_rsvp_ctype_association = -1;
-static int hf_rsvp_ctype_tunnel_if_id = -1;
-static int hf_rsvp_ctype_3gpp_object = -1;
-static int hf_rsvp_ctype_restart_cap = -1;
-static int hf_rsvp_ctype_link_cap = -1;
-static int hf_rsvp_ctype_protection_info = -1;
-static int hf_rsvp_ctype_fast_reroute = -1;
-static int hf_rsvp_ctype_detour = -1;
-static int hf_rsvp_ctype_diffserv = -1;
-static int hf_rsvp_ctype_diffserv_aware_te = -1;
-static int hf_rsvp_ctype_vendor = -1;
-static int hf_rsvp_ctype_juniper = -1;
-static int hf_rsvp_ctype_unknown = -1;
-static int hf_rsvp_ctype_label = -1;
-static int hf_rsvp_ctype_notify_request = -1;
-static int hf_rsvp_ctype_generalized_uni = -1;
-static int hf_rsvp_parameter = -1;
-static int hf_rsvp_parameter_flags = -1;
-static int hf_rsvp_parameter_length = -1;
-static int hf_rsvp_error_value = -1;
-static int hf_rsvp_class = -1;
-static int hf_rsvp_class_length = -1;
-static int hf_rsvp_reserved = -1;
-static int hf_rsvp_switching_granularity = -1;
-static int hf_rsvp_callid_srcaddr_ether = -1;
-static int hf_rsvp_callid_srcaddr_bytes = -1;
-static int hf_rsvp_loose_hop = -1;
-static int hf_rsvp_data_length = -1;
-
-static int hf_rsvp_ctype_s2l_sub_lsp = -1;
-static int hf_rsvp_s2l_sub_lsp_destination_ipv4_address = -1;
-static int hf_rsvp_s2l_sub_lsp_destination_ipv6_address = -1;
-static int hf_rsvp_s2l_sub_lsp_data = -1;
+static int proto_rsvp;
+static int proto_rsvp_e2e1;
+
+static int hf_rsvp_error_flags;
+static int hf_rsvp_error_flags_path_state_removed;
+static int hf_rsvp_error_flags_not_guilty;
+static int hf_rsvp_error_flags_in_place;
+static int hf_rsvp_eth_tspec_tlv_color_mode;
+static int hf_rsvp_eth_tspec_tlv_coupling_flag;
+static int hf_rsvp_sender_tspec_standard_contiguous_concatenation;
+static int hf_rsvp_sender_tspec_arbitrary_contiguous_concatenation;
+static int hf_rsvp_sender_tspec_regenerator_section;
+static int hf_rsvp_sender_tspec_multiplex_section;
+static int hf_rsvp_sender_tspec_J0_transparency;
+static int hf_rsvp_sender_tspec_SOH_RSOH_DCC_transparency;
+static int hf_rsvp_sender_tspec_LOH_MSOH_DCC_transparency;
+static int hf_rsvp_sender_tspec_LOH_MSOH_extended_DCC_transparency;
+static int hf_rsvp_sender_tspec_K1_K2_transparency;
+static int hf_rsvp_sender_tspec_E1_transparency;
+static int hf_rsvp_sender_tspec_F1_transparency;
+static int hf_rsvp_sender_tspec_E2_transparency;
+static int hf_rsvp_sender_tspec_B1_transparency;
+static int hf_rsvp_sender_tspec_B2_transparency;
+static int hf_rsvp_sender_tspec_M0_transparency;
+static int hf_rsvp_sender_tspec_M1_transparency;
+static int hf_rsvp_flowspec_standard_contiguous_concatenation;
+static int hf_rsvp_flowspec_arbitrary_contiguous_concatenation;
+static int hf_rsvp_flowspec_regenerator_section;
+static int hf_rsvp_flowspec_multiplex_section;
+static int hf_rsvp_flowspec_J0_transparency;
+static int hf_rsvp_flowspec_SOH_RSOH_DCC_transparency;
+static int hf_rsvp_flowspec_LOH_MSOH_DCC_transparency;
+static int hf_rsvp_flowspec_LOH_MSOH_extended_DCC_transparency;
+static int hf_rsvp_flowspec_K1_K2_transparency;
+static int hf_rsvp_flowspec_E1_transparency;
+static int hf_rsvp_flowspec_F1_transparency;
+static int hf_rsvp_flowspec_E2_transparency;
+static int hf_rsvp_flowspec_B1_transparency;
+static int hf_rsvp_flowspec_B2_transparency;
+static int hf_rsvp_flowspec_M0_transparency;
+static int hf_rsvp_flowspec_M1_transparency;
+static int hf_rsvp_integrity_flags_handshake;
+static int hf_rsvp_sa_flags_local;
+static int hf_rsvp_sa_flags_label;
+static int hf_rsvp_sa_flags_se_style;
+static int hf_rsvp_sa_flags_bandwidth;
+static int hf_rsvp_sa_flags_node;
+static int hf_rsvp_rro_flags_local_avail;
+static int hf_rsvp_rro_flags_local_in_use;
+static int hf_rsvp_rro_flags_bandwidth;
+static int hf_rsvp_rro_flags_node;
+static int hf_rsvp_rro_flags_node_address;
+static int hf_rsvp_rro_flags_backup_tunnel_bandwidth;
+static int hf_rsvp_rro_flags_backup_tunnel_hop;
+static int hf_rsvp_rro_flags_global_label;
+static int hf_rsvp_lsp_attr;
+static int hf_rsvp_lsp_attr_e2e;
+static int hf_rsvp_lsp_attr_boundary;
+static int hf_rsvp_lsp_attr_segment;
+static int hf_rsvp_lsp_attr_integrity;
+static int hf_rsvp_lsp_attr_contiguous;
+static int hf_rsvp_lsp_attr_stitching;
+static int hf_rsvp_lsp_attr_preplanned;
+static int hf_rsvp_lsp_attr_nophp;
+static int hf_rsvp_lsp_attr_oobmap;
+static int hf_rsvp_lsp_attr_entropy;
+static int hf_rsvp_lsp_attr_oammep;
+static int hf_rsvp_lsp_attr_oammip;
+static int hf_rsvp_lsp_attr_loopback;
+static int hf_rsvp_lsp_attr_p2mp;
+static int hf_rsvp_lsp_attr_rtm;
+static int hf_rsvp_lsp_attr_lsi;
+static int hf_rsvp_lsp_attr_lsids2e;
+static int hf_rsvp_lsp_attr_telinklabel;
+static int hf_rsvp_lsp_attr_srlgcollect;
+static int hf_rsvp_gen_uni_direction;
+static int hf_rsvp_protection_info_flags_secondary_lsp;
+static int hf_rsvp_pi_link_flags_extra_traffic;
+static int hf_rsvp_pi_link_flags_unprotected;
+static int hf_rsvp_pi_link_flags_shared;
+static int hf_rsvp_pi_link_flags_dedicated1_1;
+static int hf_rsvp_pi_link_flags_dedicated1plus1;
+static int hf_rsvp_pi_link_flags_enhanced;
+static int hf_rsvp_pi_link_flags_extra;
+static int hf_rsvp_pi_link_flags_dedicated_1_1;
+static int hf_rsvp_pi_link_flags_dedicated_1plus1;
+static int hf_rsvp_rfc4872_secondary;
+static int hf_rsvp_rfc4872_protecting;
+static int hf_rsvp_rfc4872_notification_msg;
+static int hf_rsvp_rfc4872_operational;
+static int hf_rsvp_pi_lsp_flags_full_rerouting;
+static int hf_rsvp_pi_lsp_flags_rerouting_extra;
+static int hf_rsvp_pi_lsp_flags_1_n_protection;
+static int hf_rsvp_pi_lsp_flags_1plus1_unidirectional;
+static int hf_rsvp_pi_lsp_flags_1plus1_bidirectional;
+static int hf_rsvp_protection_info_in_place;
+static int hf_rsvp_protection_info_required;
+static int hf_rsvp_pi_seg_flags_full_rerouting;
+static int hf_rsvp_pi_seg_flags_rerouting_extra;
+static int hf_rsvp_pi_seg_flags_1_n_protection;
+static int hf_rsvp_pi_seg_flags_1plus1_unidirectional;
+static int hf_rsvp_pi_seg_flags_1plus1_bidirectional;
+static int hf_rsvp_frr_flags_one2one_backup;
+static int hf_rsvp_frr_flags_facility_backup;
+static int hf_rsvp_type;
+static int hf_rsvp_3gpp_obj_tid;
+static int hf_rsvp_3gpp_obj_ie_len;
+static int hf_rsvp_3gpp_obj_ie_type;
+static int hf_rsvp_3gpp_obj_ue_ipv4_addr;
+static int hf_rsvp_3gpp_obj_ue_ipv6_addr;
+static int hf_rsvp_3gpp_obj_tft_d;
+static int hf_rsvp_3gpp_obj_tft_ns;
+static int hf_rsvp_3gpp_obj_tft_sr_id;
+static int hf_rsvp_3gpp_obj_tft_p;
+static int hf_rsvp_3gpp_obj_tft_opcode;
+static int hf_rsvp_3gpp_obj_tft_n_pkt_flt;
+static int hf_rsvp_3gpp_obj_flow_id;
+static int hf_rsvp_3gpp_obj_pf_ev_prec;
+static int hf_rsvp_3gpp_obj_pf_len;
+static int hf_rsvp_3gpp_obj_pf_type;
+static int hf_rsvp_3gpp_obj_pf_cont_len;
+static int hf_rsvp_3gpp_obj_pf_comp_type_id;
+static int hf_rsvp_3gpp_obj_pf_src_ipv4;
+static int hf_rsvp_3gpp_obj_pf_dst_ipv4;
+static int hf_rsvp_3gpp_obj_pf_ipv4_mask;
+static int hf_rsvp_3gpp_obj_pf_src_ipv6;
+static int hf_rsvp_3gpp_obj_pf_dst_ipv6;
+static int hf_rsvp_3gpp_obj_pf_ipv6_prefix_length;
+static int hf_rsvp_3gpp_obj_pf_prot_next;
+static int hf_rsvp_3gpp_obj_pf_dst_port;
+static int hf_rsvp_3gpp_obj_pf_src_port;
+static int hf_rsvp_3gpp_obj_pf_ipsec_spi;
+static int hf_rsvp_3gpp_obj_pf_tos_tc;
+static int hf_rsvp_3gpp_obj_pf_flow_lbl;
+static int hf_rsvp_3gpp_obj_pf_ipv6;
+static int hf_rsvp_3gpp_obj_pf_treatment;
+static int hf_rsvp_3gpp_obj_pf_hint;
+static int hf_rsvp_3gpp_obj_tft_qos_list_len;
+static int hf_rsvp_3gpp_r_qos_blob_len;
+static int hf_rsvp_3gpp_r_qos_blob_flow_pri;
+static int hf_rsvp_3gpp_r_qos_blob_num_qos_att_set;
+static int hf_rsvp_3gpp_qos_att_set_len;
+static int hf_rsvp_3gpp_qos_attribute_set_id;
+static int hf_rsvp_3gpp_qos_attribute_verbose;
+static int hf_rsvp_3gpp_qos_attribute_prof_id;
+static int hf_rsvp_3gpp_qos_attribute_traff_cls;
+static int hf_rsvp_3gpp_qos_attribute_peak_rate;
+static int hf_rsvp_3gpp_qos_attribute_bucket_size;
+static int hf_rsvp_3gpp_qos_attribute_token_rate;
+static int hf_rsvp_3gpp_qos_attribute_max_latency;
+static int hf_rsvp_3gpp_qos_attribute_max_loss_rte;
+static int hf_rsvp_3gpp_qos_attribute_delay_var_sensitive;
+static int hf_rsvp_3gpp_qos_attribute_reserved;
+static int hf_rsvp_3gpp_r_qos_blob;
+static int hf_rsvp_3gpp_qos_result;
+static int hf_rsvp_xro_sobj_lbit;
+static int hf_rsvp_rro_sobj_dbit;
+static int hf_rsvp_xro_sobj_len;
+static int hf_rsvp_xro_sobj_ipv4_addr;
+static int hf_rsvp_xro_sobj_ipv4_prefix;
+static int hf_rsvp_xro_sobj_ipv4_attr;
+static int hf_rsvp_xro_sobj_ipv6_attr;
+static int hf_rsvp_xro_sobj_srlg_id;
+static int hf_rsvp_xro_sobj_srlg_res;
+static int hf_rsvp_private_data;
+static int hf_rsvp_juniper_numtlvs;
+static int hf_rsvp_juniper_padlength;
+static int hf_rsvp_juniper_type;
+static int hf_rsvp_juniper_length;
+static int hf_rsvp_juniper_attrib_cos;
+static int hf_rsvp_juniper_attrib_metric1;
+static int hf_rsvp_juniper_attrib_metric2;
+static int hf_rsvp_juniper_attrib_ccc_status;
+static int hf_rsvp_juniper_attrib_path;
+static int hf_rsvp_juniper_attrib_unknown;
+static int hf_rsvp_juniper_unknown;
+static int hf_rsvp_juniper_pad;
+static int hf_rsvp_unknown_data;
+static int hf_rsvp_ctype;
+static int hf_rsvp_ctype_session;
+static int hf_rsvp_ctype_scope;
+static int hf_rsvp_ctype_label_request;
+static int hf_rsvp_ctype_integrity;
+static int hf_rsvp_ctype_adspec;
+static int hf_rsvp_ctype_tspec;
+static int hf_rsvp_ctype_call_id;
+static int hf_rsvp_ctype_template;
+static int hf_rsvp_ctype_style;
+static int hf_rsvp_ctype_policy;
+static int hf_rsvp_ctype_error;
+static int hf_rsvp_ctype_attribute;
+static int hf_rsvp_ctype_explicit_route;
+static int hf_rsvp_ctype_secondary_explicit_route;
+static int hf_rsvp_ctype_flowspec;
+static int hf_rsvp_ctype_hop;
+static int hf_rsvp_ctype_confirm;
+static int hf_rsvp_ctype_time_values;
+static int hf_rsvp_ctype_record_route;
+static int hf_rsvp_ctype_secondary_record_route;
+static int hf_rsvp_ctype_exclude_route;
+static int hf_rsvp_ctype_message_id;
+static int hf_rsvp_ctype_message_id_ack;
+static int hf_rsvp_ctype_message_id_list;
+static int hf_rsvp_ctype_hello;
+static int hf_rsvp_ctype_dclass;
+static int hf_rsvp_ctype_admin_status;
+static int hf_rsvp_ctype_lsp_attributes;
+static int hf_rsvp_ctype_label_set;
+static int hf_rsvp_ctype_association;
+static int hf_rsvp_ctype_tunnel_if_id;
+static int hf_rsvp_ctype_3gpp_object;
+static int hf_rsvp_ctype_restart_cap;
+static int hf_rsvp_ctype_link_cap;
+static int hf_rsvp_ctype_protection_info;
+static int hf_rsvp_ctype_fast_reroute;
+static int hf_rsvp_ctype_detour;
+static int hf_rsvp_ctype_diffserv;
+static int hf_rsvp_ctype_diffserv_aware_te;
+static int hf_rsvp_ctype_vendor;
+static int hf_rsvp_ctype_juniper;
+static int hf_rsvp_ctype_unknown;
+static int hf_rsvp_ctype_label;
+static int hf_rsvp_ctype_notify_request;
+static int hf_rsvp_ctype_generalized_uni;
+static int hf_rsvp_parameter;
+static int hf_rsvp_parameter_flags;
+static int hf_rsvp_parameter_length;
+static int hf_rsvp_error_value;
+static int hf_rsvp_class;
+static int hf_rsvp_class_length;
+static int hf_rsvp_reserved;
+static int hf_rsvp_switching_granularity;
+static int hf_rsvp_callid_srcaddr_ether;
+static int hf_rsvp_callid_srcaddr_bytes;
+static int hf_rsvp_loose_hop;
+static int hf_rsvp_data_length;
+
+static int hf_rsvp_ctype_s2l_sub_lsp;
+static int hf_rsvp_s2l_sub_lsp_destination_ipv4_address;
+static int hf_rsvp_s2l_sub_lsp_destination_ipv6_address;
+static int hf_rsvp_s2l_sub_lsp_data;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_rsvp_message_id_data = -1;
-static int hf_rsvp_ero_rro_subobjects_length = -1;
-static int hf_rsvp_fast_reroute_hop_limit = -1;
-static int hf_rsvp_lsp_tunnel_if_id_router_id = -1;
-static int hf_rsvp_ero_rro_subobjects_path_key = -1;
-static int hf_rsvp_ifid_tlv_area = -1;
-static int hf_rsvp_session_attribute_include_any = -1;
-static int hf_rsvp_lsp_tunnel_if_id_sc_pc_scn_address = -1;
-static int hf_rsvp_ero_rro_subobjects_ipv6_hop = -1;
-static int hf_rsvp_lsp_tunnel_if_id_ipv6_interface_address = -1;
-static int hf_rsvp_lsp_tunnel_if_id_component_link_identifier_ipv4 = -1;
-static int hf_rsvp_ifid_tlvinterface_id = -1;
-static int hf_rsvp_eth_tspec_cir = -1;
-static int hf_rsvp_confirm_receiver_address_ipv6 = -1;
-static int hf_rsvp_error_error_node_ipv6 = -1;
-static int hf_rsvp_time_values_data = -1;
-static int hf_rsvp_flowspec_rate = -1;
-static int hf_rsvp_session_attribute_hold_priority = -1;
-static int hf_rsvp_notify_request_notify_node_address_ipv4 = -1;
-static int hf_rsvp_lsp_tunnel_if_id_action = -1;
-static int hf_rsvp_scope_data = -1;
-static int hf_rsvp_label_request_l3pid = -1;
-static int hf_rsvp_eth_tspec_index = -1;
-static int hf_rsvp_integrity_sequence_number = -1;
-static int hf_rsvp_adspec_message_format_version = -1;
-static int hf_rsvp_fast_reroute_setup_priority = -1;
-static int hf_rsvp_eth_tspec_reserved = -1;
-static int hf_rsvp_eth_tspec_el2cp = -1;
-static int hf_rsvp_eth_tspec_il2cp = -1;
-static int hf_rsvp_fast_reroute_include_all = -1;
-static int hf_rsvp_association_routing_area_id = -1;
-static int hf_rsvp_label_label = -1;
-static int hf_rsvp_session_attribute_include_all = -1;
-static int hf_rsvp_flowspec_token_bucket_rate = -1;
-static int hf_rsvp_call_id_address_type = -1;
-static int hf_rsvp_session_attribute_name_length = -1;
-static int hf_rsvp_detour_data = -1;
-static int hf_rsvp_association_node_id = -1;
-static int hf_rsvp_ifid_tlv_length = -1;
-static int hf_rsvp_flags = -1;
-static int hf_rsvp_tspec_message_format_version = -1;
-static int hf_rsvp_ifid_tlv_ipv4_address = -1;
-static int hf_rsvp_hop_data = -1;
-static int hf_rsvp_ifid_tlv_data = -1;
-static int hf_rsvp_length = -1;
-static int hf_rsvp_ero_rro_subobjects_pce_id_ipv6 = -1;
-static int hf_rsvp_association_data = -1;
-static int hf_rsvp_tspec_number_of_multiplexed_components = -1;
-static int hf_rsvp_session_attribute_setup_priority = -1;
-static int hf_rsvp_message_id_flags = -1;
-static int hf_rsvp_hop_logical_interface = -1;
-static int hf_rsvp_compression_factor = -1;
-static int hf_rsvp_ero_rro_subobjects_private_data = -1;
-static int hf_rsvp_lsp_attributes_tlv_data = -1;
-static int hf_rsvp_flowspec_token_bucket_size = -1;
-static int hf_rsvp_call_id_data = -1;
-static int hf_rsvp_template_filter_source_address_ipv6 = -1;
-static int hf_rsvp_message_id_ack_flags = -1;
-static int hf_rsvp_flowspec_multiplier = -1;
-static int hf_rsvp_tspec_token_bucket_size = -1;
-static int hf_rsvp_admin_status_bits = -1;
-static int hf_rsvp_admin_status_data = -1;
-static int hf_rsvp_tspec_peak_data_rate = -1;
-static int hf_rsvp_flowspec_number_of_virtual_components = -1;
-static int hf_rsvp_hop_neighbor_address_ipv6 = -1;
-static int hf_rsvp_flowspec_signal_type_sonet = -1;
-static int hf_rsvp_ifid_tlv_autonomous_system = -1;
-static int hf_rsvp_scope_ipv6_address = -1;
-static int hf_rsvp_flowspec_service_header = -1;
-static int hf_rsvp_tspec_hint = -1;
-static int hf_rsvp_label_set_action = -1;
-static int hf_rsvp_error_data = -1;
-static int hf_rsvp_style_flags = -1;
-static int hf_rsvp_g_pid = -1;
-static int hf_rsvp_integrity_key_identifier = -1;
-static int hf_rsvp_adspec_service_header = -1;
-static int hf_rsvp_ifid_tlv_error_string = -1;
-static int hf_rsvp_session_destination_address = -1;
-static int hf_rsvp_ifid_tlv_node_id = -1;
-static int hf_rsvp_lsp_tunnel_if_id_component_link_identifier = -1;
-static int hf_rsvp_call_id_international_segment = -1;
-static int hf_rsvp_fast_reroute_include_any = -1;
-static int hf_rsvp_label_request_min_vci = -1;
-static int hf_rsvp_tspec_profile = -1;
-static int hf_rsvp_eth_tspec_length = -1;
-static int hf_rsvp_exclude_route_data = -1;
-static int hf_rsvp_record_route_data = -1;
-static int hf_rsvp_secondary_record_route_data = -1;
-static int hf_rsvp_confirm_receiver_address_ipv4 = -1;
-static int hf_rsvp_message_id_list_message_id = -1;
-static int hf_rsvp_template_filter_ipv4_tunnel_sender_address = -1;
-static int hf_rsvp_template_filter_ipv6_tunnel_sender_address = -1;
-static int hf_rsvp_template_filter_sub_group_originator_id = -1;
-static int hf_rsvp_template_filter_sub_group_id = -1;
-static int hf_rsvp_template_filter_data = -1;
-static int hf_rsvp_notify_request_notify_node_address_ipv6 = -1;
-static int hf_rsvp_message_id_ack_data = -1;
-static int hf_rsvp_eth_tspec_profile = -1;
-static int hf_rsvp_label_request_max_vpi = -1;
-static int hf_rsvp_ero_rro_subobjects_private_length = -1;
-static int hf_rsvp_fast_reroute_exclude_any = -1;
-static int hf_rsvp_lsp_tunnel_if_id_data = -1;
-static int hf_rsvp_hello_destination_instance = -1;
-static int hf_rsvp_tspec_signal_type_g709 = -1;
-static int hf_rsvp_call_id_reserved = -1;
-static int hf_rsvp_version = -1;
-static int hf_rsvp_association_source_ipv6 = -1;
-static int hf_rsvp_ero_rro_subobjects_flags = -1;
-static int hf_rsvp_lsp_tunnel_if_id_lsp_encoding_type = -1;
-static int hf_rsvp_association_type = -1;
-static int hf_rsvp_tspec_data = -1;
-static int hf_rsvp_session_destination_port = -1;
-static int hf_rsvp_association_id = -1;
-static int hf_rsvp_integrity_hash = -1;
-static int hf_rsvp_flowspec_number_of_contiguous_components = -1;
-static int hf_rsvp_policy_data = -1;
-static int hf_rsvp_tspec_token_bucket_rate = -1;
-static int hf_rsvp_tspec_multiplier = -1;
-static int hf_rsvp_dclass_dscp = -1;
-static int hf_rsvp_tspec_number_of_contiguous_components = -1;
-static int hf_rsvp_session_p2mp_id = -1;
-static int hf_rsvp_session_data = -1;
-static int hf_rsvp_lsp_tunnel_if_id_target_igp_instance = -1;
-static int hf_rsvp_flowspec_profile = -1;
-static int hf_rsvp_message_id_ack_epoch = -1;
-static int hf_rsvp_hello_source_instance = -1;
-static int hf_rsvp_scope_ipv4_address = -1;
-static int hf_rsvp_label_request_lsp_encoding_type = -1;
-static int hf_rsvp_fast_reroute_hold_priority = -1;
-static int hf_rsvp_label_request_max_vci = -1;
-static int hf_rsvp_fast_reroute_flags = -1;
-static int hf_rsvp_flowspec_peak_data_rate = -1;
-static int hf_rsvp_ero_rro_subobjects_label = -1;
-static int hf_rsvp_notify_request_data = -1;
-static int hf_rsvp_lsp_tunnel_if_id_connection_id = -1;
-static int hf_rsvp_eth_tspec_ebs = -1;
-static int hf_rsvp_fast_reroute_data = -1;
-static int hf_rsvp_label_request_min_vpi = -1;
-static int hf_rsvp_session_attribute_data = -1;
-static int hf_rsvp_protection_info_data = -1;
-static int hf_rsvp_tspec_transparency = -1;
-static int hf_rsvp_ifid_tlv_label = -1;
-static int hf_rsvp_session_extended_ipv4_address = -1;
-static int hf_rsvp_diffserv_aware_te_data = -1;
-static int hf_rsvp_lsp_tunnel_if_id_signal_type = -1;
-static int hf_rsvp_ero_rro_subobjects_pce_id_ipv4 = -1;
-static int hf_rsvp_error_error_node_ipv4 = -1;
-static int hf_rsvp_session_protocol = -1;
-static int hf_rsvp_tspec_signal_type_sonet = -1;
-static int hf_rsvp_session_attribute_flags = -1;
-static int hf_rsvp_ero_rro_subobjects_router_id = -1;
-static int hf_rsvp_message_id_list_data = -1;
-static int hf_rsvp_style_style = -1;
-static int hf_rsvp_tspec_number_of_virtual_components = -1;
-static int hf_rsvp_tspec_mtu = -1;
-static int hf_rsvp_lsp_tunnel_if_id_length = -1;
-static int hf_rsvp_ifid_tlv_ipv6_address = -1;
-static int hf_rsvp_diffserv_data = -1;
-static int hf_rsvp_session_flags = -1;
-static int hf_rsvp_flowspec_transparency = -1;
-static int hf_rsvp_dclass_data = -1;
-static int hf_rsvp_lsp_tunnel_if_id_interface_id = -1;
-static int hf_rsvp_lsp_tunnel_if_id_sc_pc_id = -1;
-static int hf_rsvp_error_error_code = -1;
-static int hf_rsvp_lsp_tunnel_if_id_ipv4_interface_address = -1;
-static int hf_rsvp_session_attribute_exclude_any = -1;
-static int hf_rsvp_sending_ttl = -1;
-static int hf_rsvp_integrity_flags = -1;
-static int hf_rsvp_message_id_ack_message_id = -1;
-static int hf_rsvp_message_id_message_id = -1;
-static int hf_rsvp_ero_rro_subobjects_interface_id = -1;
-static int hf_rsvp_message_length = -1;
-static int hf_rsvp_message_id_epoch = -1;
-static int hf_rsvp_flowspec_signal_type_g709 = -1;
-static int hf_rsvp_label_request_data = -1;
-static int hf_rsvp_restart_cap_data = -1;
-static int hf_rsvp_lsp_attributes_tlv = -1;
-static int hf_rsvp_flowspec_mtu = -1;
-static int hf_rsvp_flowspec_m = -1;
-static int hf_rsvp_tspec_service_header = -1;
-static int hf_rsvp_eth_tspec_cbs = -1;
-static int hf_rsvp_call_id_national_segment = -1;
-static int hf_rsvp_template_filter_source_port = -1;
-static int hf_rsvp_eth_tspec_eir = -1;
-static int hf_rsvp_ero_rro_subobjects_ipv4_hop = -1;
-static int hf_rsvp_lsp_tunnel_if_id_switching_type = -1;
-static int hf_rsvp_flowspec_number_of_multiplexed_components = -1;
-static int hf_rsvp_label_request_switching_type = -1;
-static int hf_rsvp_ero_rro_subobjects_prefix_length = -1;
-static int hf_rsvp_explicit_route_data = -1;
-static int hf_rsvp_secondary_explicit_route_data = -1;
-static int hf_rsvp_association_source_ipv4 = -1;
-static int hf_rsvp_call_id_local_identifier = -1;
-static int hf_rsvp_flowspec_message_format_version = -1;
-static int hf_rsvp_tspec_requested_concatenation = -1;
-static int hf_rsvp_association_padding = -1;
-static int hf_rsvp_hop_neighbor_address_ipv4 = -1;
-static int hf_rsvp_flowspec_requested_concatenation = -1;
-static int hf_rsvp_fast_reroute_bandwidth = -1;
-static int hf_rsvp_message_id_list_epoch = -1;
-static int hf_rsvp_style_data = -1;
-static int hf_rsvp_session_dscp = -1;
-static int hf_rsvp_confirm_data = -1;
-static int hf_rsvp_protection_info_link_flags = -1;
-static int hf_rsvp_message_id_list_flags = -1;
-static int hf_rsvp_label_data = -1;
-static int hf_rsvp_flowspec_slack_term = -1;
-static int hf_rsvp_label_generalized_label = -1;
-static int hf_rsvp_label_generalized_label_evpl_vlad_id = -1;
-static int hf_rsvp_session_attribute_name = -1;
-static int hf_rsvp_ifid_tlv_padding = -1;
-static int hf_rsvp_max_dlci = -1;
-static int hf_rsvp_minimum_policed_unit = -1;
-static int hf_rsvp_dlci_length = -1;
-static int hf_rsvp_label_request_m = -1;
-static int hf_rsvp_detour_avoid_node_id = -1;
-static int hf_rsvp_restart_cap_restart_time = -1;
-static int hf_rsvp_nsap_length = -1;
-static int hf_rsvp_message_checksum = -1;
-static int hf_rsvp_ero_rro_autonomous_system = -1;
-static int hf_rsvp_gen_uni_service_level = -1;
-static int hf_rsvp_hf_rsvp_adspec_break_bit = -1;
-static int hf_rsvp_extended_tunnel_id = -1;
-static int hf_rsvp_extended_tunnel_ipv6 = -1;
-static int hf_rsvp_maximum_packet_size = -1;
-static int hf_rsvp_min_dlci = -1;
-static int hf_rsvp_gen_uni_data = -1;
-static int hf_rsvp_gen_uni_logical_port_id = -1;
-static int hf_rsvp_refresh_interval = -1;
-static int hf_rsvp_detour_plr_id = -1;
-static int hf_rsvp_restart_cap_recovery_time = -1;
-static int hf_rsvp_extended_tunnel = -1;
-static int hf_rsvp_call_attributes_endpont_id = -1;
-static int hf_rsvp_isis_area_id = -1;
-static int hf_rsvp_adspec_type = -1;
-static int hf_rsvp_adspec_len = -1;
-static int hf_rsvp_adspec_uint = -1;
-static int hf_rsvp_adspec_float = -1;
-static int hf_rsvp_adspec_bytes = -1;
-static int hf_rsvp_wavelength_grid = -1;
-static int hf_rsvp_wavelength_cs1 = -1;
-static int hf_rsvp_wavelength_cs2 = -1;
-static int hf_rsvp_wavelength_cs3 = -1;
-static int hf_rsvp_wavelength_channel_spacing = -1;
-static int hf_rsvp_wavelength_n = -1;
-static int hf_rsvp_wavelength_m = -1;
-static int hf_rsvp_wavelength_freq = -1;
-static int hf_rsvp_wavelength_wavelength = -1;
-static int hf_rsvp_sonet_s = -1;
-static int hf_rsvp_sonet_u = -1;
-static int hf_rsvp_sonet_k = -1;
-static int hf_rsvp_sonet_l = -1;
-static int hf_rsvp_sonet_m = -1;
-static int hf_rsvp_g709_t3 = -1;
-static int hf_rsvp_g709_t2 = -1;
-static int hf_rsvp_g709_t1 = -1;
-static int hf_rsvp_label_set_type = -1;
-static int hf_rsvp_label_set_subchannel = -1;
-static int hf_rsvp_nsap_address = -1;
-static int hf_rsvp_class_diversity = -1;
-static int hf_rsvp_egress_label_type = -1;
-static int hf_rsvp_egress_label = -1;
-static int hf_rsvp_source_transport_network_addr = -1;
-static int hf_rsvp_ie_data = -1;
-static int hf_rsvp_3gpp_obj_pf_dst_port_range = -1;
-static int hf_rsvp_3gpp_obj_pf_src_port_range = -1;
-
-static expert_field ei_rsvp_invalid_length = EI_INIT;
-static expert_field ei_rsvp_packet_filter_component = EI_INIT;
-static expert_field ei_rsvp_bundle_component_msg = EI_INIT;
-static expert_field ei_rsvp_parameter = EI_INIT;
-static expert_field ei_rsvp_adspec_type = EI_INIT;
-static expert_field ei_rsvp_call_id_address_type = EI_INIT;
-static expert_field ei_rsvp_session_type = EI_INIT;
+static int hf_rsvp_message_id_data;
+static int hf_rsvp_ero_rro_subobjects_length;
+static int hf_rsvp_fast_reroute_hop_limit;
+static int hf_rsvp_lsp_tunnel_if_id_router_id;
+static int hf_rsvp_ero_rro_subobjects_path_key;
+static int hf_rsvp_ifid_tlv_area;
+static int hf_rsvp_session_attribute_include_any;
+static int hf_rsvp_lsp_tunnel_if_id_sc_pc_scn_address;
+static int hf_rsvp_ero_rro_subobjects_ipv6_hop;
+static int hf_rsvp_lsp_tunnel_if_id_ipv6_interface_address;
+static int hf_rsvp_lsp_tunnel_if_id_component_link_identifier_ipv4;
+static int hf_rsvp_ifid_tlvinterface_id;
+static int hf_rsvp_eth_tspec_cir;
+static int hf_rsvp_confirm_receiver_address_ipv6;
+static int hf_rsvp_error_error_node_ipv6;
+static int hf_rsvp_time_values_data;
+static int hf_rsvp_flowspec_rate;
+static int hf_rsvp_session_attribute_hold_priority;
+static int hf_rsvp_notify_request_notify_node_address_ipv4;
+static int hf_rsvp_lsp_tunnel_if_id_action;
+static int hf_rsvp_scope_data;
+static int hf_rsvp_label_request_l3pid;
+static int hf_rsvp_eth_tspec_index;
+static int hf_rsvp_integrity_sequence_number;
+static int hf_rsvp_adspec_message_format_version;
+static int hf_rsvp_fast_reroute_setup_priority;
+static int hf_rsvp_eth_tspec_reserved;
+static int hf_rsvp_eth_tspec_el2cp;
+static int hf_rsvp_eth_tspec_il2cp;
+static int hf_rsvp_fast_reroute_include_all;
+static int hf_rsvp_association_routing_area_id;
+static int hf_rsvp_label_label;
+static int hf_rsvp_session_attribute_include_all;
+static int hf_rsvp_flowspec_token_bucket_rate;
+static int hf_rsvp_call_id_address_type;
+static int hf_rsvp_session_attribute_name_length;
+static int hf_rsvp_detour_data;
+static int hf_rsvp_association_node_id;
+static int hf_rsvp_ifid_tlv_length;
+static int hf_rsvp_flags;
+static int hf_rsvp_tspec_message_format_version;
+static int hf_rsvp_ifid_tlv_ipv4_address;
+static int hf_rsvp_hop_data;
+static int hf_rsvp_ifid_tlv_data;
+static int hf_rsvp_length;
+static int hf_rsvp_ero_rro_subobjects_pce_id_ipv6;
+static int hf_rsvp_association_data;
+static int hf_rsvp_tspec_number_of_multiplexed_components;
+static int hf_rsvp_session_attribute_setup_priority;
+static int hf_rsvp_message_id_flags;
+static int hf_rsvp_hop_logical_interface;
+static int hf_rsvp_compression_factor;
+static int hf_rsvp_ero_rro_subobjects_private_data;
+static int hf_rsvp_lsp_attributes_tlv_data;
+static int hf_rsvp_flowspec_token_bucket_size;
+static int hf_rsvp_call_id_data;
+static int hf_rsvp_template_filter_source_address_ipv6;
+static int hf_rsvp_message_id_ack_flags;
+static int hf_rsvp_flowspec_multiplier;
+static int hf_rsvp_tspec_token_bucket_size;
+static int hf_rsvp_admin_status_bits;
+static int hf_rsvp_admin_status_data;
+static int hf_rsvp_tspec_peak_data_rate;
+static int hf_rsvp_flowspec_number_of_virtual_components;
+static int hf_rsvp_hop_neighbor_address_ipv6;
+static int hf_rsvp_flowspec_signal_type_sonet;
+static int hf_rsvp_ifid_tlv_autonomous_system;
+static int hf_rsvp_scope_ipv6_address;
+static int hf_rsvp_flowspec_service_header;
+static int hf_rsvp_tspec_hint;
+static int hf_rsvp_label_set_action;
+static int hf_rsvp_error_data;
+static int hf_rsvp_style_flags;
+static int hf_rsvp_g_pid;
+static int hf_rsvp_integrity_key_identifier;
+static int hf_rsvp_adspec_service_header;
+static int hf_rsvp_ifid_tlv_error_string;
+static int hf_rsvp_session_destination_address;
+static int hf_rsvp_ifid_tlv_node_id;
+static int hf_rsvp_lsp_tunnel_if_id_component_link_identifier;
+static int hf_rsvp_call_id_international_segment;
+static int hf_rsvp_fast_reroute_include_any;
+static int hf_rsvp_label_request_min_vci;
+static int hf_rsvp_tspec_profile;
+static int hf_rsvp_eth_tspec_length;
+static int hf_rsvp_exclude_route_data;
+static int hf_rsvp_record_route_data;
+static int hf_rsvp_secondary_record_route_data;
+static int hf_rsvp_confirm_receiver_address_ipv4;
+static int hf_rsvp_message_id_list_message_id;
+static int hf_rsvp_template_filter_ipv4_tunnel_sender_address;
+static int hf_rsvp_template_filter_ipv6_tunnel_sender_address;
+static int hf_rsvp_template_filter_sub_group_originator_id;
+static int hf_rsvp_template_filter_sub_group_id;
+static int hf_rsvp_template_filter_data;
+static int hf_rsvp_notify_request_notify_node_address_ipv6;
+static int hf_rsvp_message_id_ack_data;
+static int hf_rsvp_eth_tspec_profile;
+static int hf_rsvp_label_request_max_vpi;
+static int hf_rsvp_ero_rro_subobjects_private_length;
+static int hf_rsvp_fast_reroute_exclude_any;
+static int hf_rsvp_lsp_tunnel_if_id_data;
+static int hf_rsvp_hello_destination_instance;
+static int hf_rsvp_tspec_signal_type_g709;
+static int hf_rsvp_call_id_reserved;
+static int hf_rsvp_version;
+static int hf_rsvp_association_source_ipv6;
+static int hf_rsvp_ero_rro_subobjects_flags;
+static int hf_rsvp_lsp_tunnel_if_id_lsp_encoding_type;
+static int hf_rsvp_association_type;
+static int hf_rsvp_tspec_data;
+static int hf_rsvp_session_destination_port;
+static int hf_rsvp_association_id;
+static int hf_rsvp_integrity_hash;
+static int hf_rsvp_flowspec_number_of_contiguous_components;
+static int hf_rsvp_policy_data;
+static int hf_rsvp_tspec_token_bucket_rate;
+static int hf_rsvp_tspec_multiplier;
+static int hf_rsvp_dclass_dscp;
+static int hf_rsvp_tspec_number_of_contiguous_components;
+static int hf_rsvp_session_p2mp_id;
+static int hf_rsvp_session_data;
+static int hf_rsvp_lsp_tunnel_if_id_target_igp_instance;
+static int hf_rsvp_flowspec_profile;
+static int hf_rsvp_message_id_ack_epoch;
+static int hf_rsvp_hello_source_instance;
+static int hf_rsvp_scope_ipv4_address;
+static int hf_rsvp_label_request_lsp_encoding_type;
+static int hf_rsvp_fast_reroute_hold_priority;
+static int hf_rsvp_label_request_max_vci;
+static int hf_rsvp_fast_reroute_flags;
+static int hf_rsvp_flowspec_peak_data_rate;
+static int hf_rsvp_ero_rro_subobjects_label;
+static int hf_rsvp_notify_request_data;
+static int hf_rsvp_lsp_tunnel_if_id_connection_id;
+static int hf_rsvp_eth_tspec_ebs;
+static int hf_rsvp_fast_reroute_data;
+static int hf_rsvp_label_request_min_vpi;
+static int hf_rsvp_session_attribute_data;
+static int hf_rsvp_protection_info_data;
+static int hf_rsvp_tspec_transparency;
+static int hf_rsvp_ifid_tlv_label;
+static int hf_rsvp_session_extended_ipv4_address;
+static int hf_rsvp_diffserv_aware_te_data;
+static int hf_rsvp_lsp_tunnel_if_id_signal_type;
+static int hf_rsvp_ero_rro_subobjects_pce_id_ipv4;
+static int hf_rsvp_error_error_node_ipv4;
+static int hf_rsvp_session_protocol;
+static int hf_rsvp_tspec_signal_type_sonet;
+static int hf_rsvp_session_attribute_flags;
+static int hf_rsvp_ero_rro_subobjects_router_id;
+static int hf_rsvp_message_id_list_data;
+static int hf_rsvp_style_style;
+static int hf_rsvp_tspec_number_of_virtual_components;
+static int hf_rsvp_tspec_mtu;
+static int hf_rsvp_lsp_tunnel_if_id_length;
+static int hf_rsvp_ifid_tlv_ipv6_address;
+static int hf_rsvp_diffserv_data;
+static int hf_rsvp_session_flags;
+static int hf_rsvp_flowspec_transparency;
+static int hf_rsvp_dclass_data;
+static int hf_rsvp_lsp_tunnel_if_id_interface_id;
+static int hf_rsvp_lsp_tunnel_if_id_sc_pc_id;
+static int hf_rsvp_error_error_code;
+static int hf_rsvp_lsp_tunnel_if_id_ipv4_interface_address;
+static int hf_rsvp_session_attribute_exclude_any;
+static int hf_rsvp_sending_ttl;
+static int hf_rsvp_integrity_flags;
+static int hf_rsvp_message_id_ack_message_id;
+static int hf_rsvp_message_id_message_id;
+static int hf_rsvp_ero_rro_subobjects_interface_id;
+static int hf_rsvp_message_length;
+static int hf_rsvp_message_id_epoch;
+static int hf_rsvp_flowspec_signal_type_g709;
+static int hf_rsvp_label_request_data;
+static int hf_rsvp_restart_cap_data;
+static int hf_rsvp_lsp_attributes_tlv;
+static int hf_rsvp_flowspec_mtu;
+static int hf_rsvp_flowspec_m;
+static int hf_rsvp_tspec_service_header;
+static int hf_rsvp_eth_tspec_cbs;
+static int hf_rsvp_call_id_national_segment;
+static int hf_rsvp_template_filter_source_port;
+static int hf_rsvp_eth_tspec_eir;
+static int hf_rsvp_ero_rro_subobjects_ipv4_hop;
+static int hf_rsvp_lsp_tunnel_if_id_switching_type;
+static int hf_rsvp_flowspec_number_of_multiplexed_components;
+static int hf_rsvp_label_request_switching_type;
+static int hf_rsvp_ero_rro_subobjects_prefix_length;
+static int hf_rsvp_explicit_route_data;
+static int hf_rsvp_secondary_explicit_route_data;
+static int hf_rsvp_association_source_ipv4;
+static int hf_rsvp_call_id_local_identifier;
+static int hf_rsvp_flowspec_message_format_version;
+static int hf_rsvp_tspec_requested_concatenation;
+static int hf_rsvp_association_padding;
+static int hf_rsvp_hop_neighbor_address_ipv4;
+static int hf_rsvp_flowspec_requested_concatenation;
+static int hf_rsvp_fast_reroute_bandwidth;
+static int hf_rsvp_message_id_list_epoch;
+static int hf_rsvp_style_data;
+static int hf_rsvp_session_dscp;
+static int hf_rsvp_confirm_data;
+static int hf_rsvp_protection_info_link_flags;
+static int hf_rsvp_message_id_list_flags;
+static int hf_rsvp_label_data;
+static int hf_rsvp_flowspec_slack_term;
+static int hf_rsvp_label_generalized_label;
+static int hf_rsvp_label_generalized_label_evpl_vlad_id;
+static int hf_rsvp_session_attribute_name;
+static int hf_rsvp_ifid_tlv_padding;
+static int hf_rsvp_max_dlci;
+static int hf_rsvp_minimum_policed_unit;
+static int hf_rsvp_dlci_length;
+static int hf_rsvp_label_request_m;
+static int hf_rsvp_detour_avoid_node_id;
+static int hf_rsvp_restart_cap_restart_time;
+static int hf_rsvp_nsap_length;
+static int hf_rsvp_message_checksum;
+static int hf_rsvp_ero_rro_autonomous_system;
+static int hf_rsvp_gen_uni_service_level;
+static int hf_rsvp_hf_rsvp_adspec_break_bit;
+static int hf_rsvp_extended_tunnel_id;
+static int hf_rsvp_extended_tunnel_ipv6;
+static int hf_rsvp_maximum_packet_size;
+static int hf_rsvp_min_dlci;
+static int hf_rsvp_gen_uni_data;
+static int hf_rsvp_gen_uni_logical_port_id;
+static int hf_rsvp_refresh_interval;
+static int hf_rsvp_detour_plr_id;
+static int hf_rsvp_restart_cap_recovery_time;
+static int hf_rsvp_extended_tunnel;
+static int hf_rsvp_call_attributes_endpont_id;
+static int hf_rsvp_isis_area_id;
+static int hf_rsvp_adspec_type;
+static int hf_rsvp_adspec_len;
+static int hf_rsvp_adspec_uint;
+static int hf_rsvp_adspec_float;
+static int hf_rsvp_adspec_bytes;
+static int hf_rsvp_wavelength_grid;
+static int hf_rsvp_wavelength_cs1;
+static int hf_rsvp_wavelength_cs2;
+static int hf_rsvp_wavelength_cs3;
+static int hf_rsvp_wavelength_channel_spacing;
+static int hf_rsvp_wavelength_n;
+static int hf_rsvp_wavelength_m;
+static int hf_rsvp_wavelength_freq;
+static int hf_rsvp_wavelength_wavelength;
+static int hf_rsvp_sonet_s;
+static int hf_rsvp_sonet_u;
+static int hf_rsvp_sonet_k;
+static int hf_rsvp_sonet_l;
+static int hf_rsvp_sonet_m;
+static int hf_rsvp_g709_t3;
+static int hf_rsvp_g709_t2;
+static int hf_rsvp_g709_t1;
+static int hf_rsvp_label_set_type;
+static int hf_rsvp_label_set_subchannel;
+static int hf_rsvp_nsap_address;
+static int hf_rsvp_class_diversity;
+static int hf_rsvp_egress_label_type;
+static int hf_rsvp_egress_label;
+static int hf_rsvp_source_transport_network_addr;
+static int hf_rsvp_ie_data;
+static int hf_rsvp_3gpp_obj_pf_dst_port_range;
+static int hf_rsvp_3gpp_obj_pf_src_port_range;
+
+static expert_field ei_rsvp_invalid_length;
+static expert_field ei_rsvp_packet_filter_component;
+static expert_field ei_rsvp_bundle_component_msg;
+static expert_field ei_rsvp_parameter;
+static expert_field ei_rsvp_adspec_type;
+static expert_field ei_rsvp_call_id_address_type;
+static expert_field ei_rsvp_session_type;
 
 static int rsvp_tap = -1;
 
diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c
index 6e96875af6..8f9913e0e8 100644
--- a/epan/dissectors/packet-rsync.c
+++ b/epan/dissectors/packet-rsync.c
@@ -60,18 +60,18 @@ struct rsync_frame_data {
     rsync_state_t state;
 };
 
-static int proto_rsync = -1;
-
-static int hf_rsync_command_string = -1;
-static int hf_rsync_data = -1;
-static int hf_rsync_hdr_magic = -1;
-static int hf_rsync_hdr_version = -1;
-static int hf_rsync_module_list_string = -1;
-static int hf_rsync_motd_string = -1;
-static int hf_rsync_query_string = -1;
-static int hf_rsync_rsyncdok_string = -1;
-
-static gint ett_rsync = -1;
+static int proto_rsync;
+
+static int hf_rsync_command_string;
+static int hf_rsync_data;
+static int hf_rsync_hdr_magic;
+static int hf_rsync_hdr_version;
+static int hf_rsync_module_list_string;
+static int hf_rsync_motd_string;
+static int hf_rsync_query_string;
+static int hf_rsync_rsyncdok_string;
+
+static gint ett_rsync;
 
 static dissector_handle_t rsync_handle;
 
diff --git a/epan/dissectors/packet-rtacser.c b/epan/dissectors/packet-rtacser.c
index 799b3ec903..367de82578 100644
--- a/epan/dissectors/packet-rtacser.c
+++ b/epan/dissectors/packet-rtacser.c
@@ -56,21 +56,21 @@
 void proto_register_rtacser(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_rtacser                    = -1;
-static int hf_rtacser_timestamp             = -1;
-static int hf_rtacser_event_type            = -1;
-static int hf_rtacser_ctrl_cts              = -1;
-static int hf_rtacser_ctrl_dcd              = -1;
-static int hf_rtacser_ctrl_dsr              = -1;
-static int hf_rtacser_ctrl_rts              = -1;
-static int hf_rtacser_ctrl_dtr              = -1;
-static int hf_rtacser_ctrl_ring             = -1;
-static int hf_rtacser_ctrl_mbok             = -1;
-static int hf_rtacser_footer                = -1;
+static int proto_rtacser;
+static int hf_rtacser_timestamp;
+static int hf_rtacser_event_type;
+static int hf_rtacser_ctrl_cts;
+static int hf_rtacser_ctrl_dcd;
+static int hf_rtacser_ctrl_dsr;
+static int hf_rtacser_ctrl_rts;
+static int hf_rtacser_ctrl_dtr;
+static int hf_rtacser_ctrl_ring;
+static int hf_rtacser_ctrl_mbok;
+static int hf_rtacser_footer;
 
 /* Initialize the subtree pointers */
-static gint ett_rtacser                   = -1;
-static gint ett_rtacser_cl                = -1;
+static gint ett_rtacser;
+static gint ett_rtacser_cl;
 
 static dissector_handle_t rtacser_handle;
 static dissector_table_t  subdissector_table;
diff --git a/epan/dissectors/packet-rtag.c b/epan/dissectors/packet-rtag.c
index 2f7f3247c2..65453e74bb 100644
--- a/epan/dissectors/packet-rtag.c
+++ b/epan/dissectors/packet-rtag.c
@@ -14,7 +14,7 @@
 # include  <epan/packet.h>
 # include  <epan/etypes.h>
 
-static int proto_rtag = -1;
+static int proto_rtag;
 
 static dissector_handle_t ethertype_handle;
 static dissector_handle_t rtag_handle;
@@ -22,9 +22,9 @@ static dissector_handle_t rtag_handle;
 /*
  * These values and tables are a breakdown of the R-TAG parts.
  */
-static int hf_rtag_reserved = -1;
-static int hf_rtag_sequence = -1;
-static int hf_rtag_protocol = -1;
+static int hf_rtag_reserved;
+static int hf_rtag_sequence;
+static int hf_rtag_protocol;
 static hf_register_info rtag_breakdown[] = {
       { &hf_rtag_reserved,
 	{ "<reserved>", "rtag.reserved",
@@ -48,7 +48,7 @@ static hf_register_info rtag_breakdown[] = {
 
 /*
  */
-static gint ett_rtag = -1;
+static gint ett_rtag;
 static gint *ett[] = { &ett_rtag };
 
 /*
diff --git a/epan/dissectors/packet-rtcdc.c b/epan/dissectors/packet-rtcdc.c
index 88681d1ece..2a1e47a586 100644
--- a/epan/dissectors/packet-rtcdc.c
+++ b/epan/dissectors/packet-rtcdc.c
@@ -30,34 +30,34 @@ void proto_reg_handoff_rtcdc(void);
 static dissector_handle_t rtcdc_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_rtcdc = -1;
-static int hf_message_type = -1;
-static int hf_channel_type = -1;
-static int hf_flags = -1;
-static int hf_flags_reserved = -1;
-static int hf_unordered_allowed = -1;
-static int hf_reliability = -1;
-static int hf_priority = -1;
-static int hf_label = -1;
-static int hf_error = -1;
-static int hf_sid = -1;
-static int hf_new_channel_type = -1;
-static int hf_new_reliability = -1;
-static int hf_new_priority = -1;
-static int hf_new_label_length = -1;
-static int hf_new_protocol_length = -1;
-static int hf_new_label = -1;
-static int hf_new_protocol = -1;
+static int proto_rtcdc;
+static int hf_message_type;
+static int hf_channel_type;
+static int hf_flags;
+static int hf_flags_reserved;
+static int hf_unordered_allowed;
+static int hf_reliability;
+static int hf_priority;
+static int hf_label;
+static int hf_error;
+static int hf_sid;
+static int hf_new_channel_type;
+static int hf_new_reliability;
+static int hf_new_priority;
+static int hf_new_label_length;
+static int hf_new_protocol_length;
+static int hf_new_label;
+static int hf_new_protocol;
 
 /* Initialize the subtree pointers */
-static gint ett_rtcdc = -1;
-static gint ett_flags = -1;
-
-static expert_field ei_rtcdc_new_reliability_non_zero = EI_INIT;
-static expert_field ei_rtcdc_message_type_unknown = EI_INIT;
-static expert_field ei_rtcdc_inconsistent_label_and_parameter_length = EI_INIT;
-static expert_field ei_rtcdc_message_too_long = EI_INIT;
-static expert_field ei_rtcdc_new_channel_type = EI_INIT;
+static gint ett_rtcdc;
+static gint ett_flags;
+
+static expert_field ei_rtcdc_new_reliability_non_zero;
+static expert_field ei_rtcdc_message_type_unknown;
+static expert_field ei_rtcdc_inconsistent_label_and_parameter_length;
+static expert_field ei_rtcdc_message_too_long;
+static expert_field ei_rtcdc_new_channel_type;
 
 #define DATA_CHANNEL_OPEN_REQUEST     0x00
 #define DATA_CHANNEL_OPEN_RESPONSE    0x01
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index 91119fb4fc..fd7d08a0bb 100644
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -493,371 +493,371 @@ static const value_string rtcp_mccp_field_id_vals[] = {
 
 
 /* RTCP header fields                   */
-static int proto_rtcp = -1;
-static int proto_srtcp = -1;
-static int hf_rtcp_version = -1;
-static int hf_rtcp_padding = -1;
-static int hf_rtcp_rc = -1;
-static int hf_rtcp_sc = -1;
-static int hf_rtcp_pt = -1;
-static int hf_rtcp_length = -1;
-static int hf_rtcp_ssrc_sender = -1;
-static int hf_rtcp_ssrc_media_source = -1;
-static int hf_rtcp_ntp = -1;
-static int hf_rtcp_ntp_msw = -1;
-static int hf_rtcp_ntp_lsw = -1;
-static int hf_rtcp_timebase_indicator = -1;
-static int hf_rtcp_identity = -1;
-static int hf_rtcp_stream_id = -1;
-static int hf_rtcp_as_timestamp = -1;
-static int hf_rtcp_rtp_timestamp = -1;
-static int hf_rtcp_sender_pkt_cnt = -1;
-static int hf_rtcp_sender_oct_cnt = -1;
-static int hf_rtcp_ssrc_source = -1;
-static int hf_rtcp_ssrc_fraction = -1;
-static int hf_rtcp_ssrc_cum_nr = -1;
-static int hf_rtcp_ssrc_discarded = -1;
+static int proto_rtcp;
+static int proto_srtcp;
+static int hf_rtcp_version;
+static int hf_rtcp_padding;
+static int hf_rtcp_rc;
+static int hf_rtcp_sc;
+static int hf_rtcp_pt;
+static int hf_rtcp_length;
+static int hf_rtcp_ssrc_sender;
+static int hf_rtcp_ssrc_media_source;
+static int hf_rtcp_ntp;
+static int hf_rtcp_ntp_msw;
+static int hf_rtcp_ntp_lsw;
+static int hf_rtcp_timebase_indicator;
+static int hf_rtcp_identity;
+static int hf_rtcp_stream_id;
+static int hf_rtcp_as_timestamp;
+static int hf_rtcp_rtp_timestamp;
+static int hf_rtcp_sender_pkt_cnt;
+static int hf_rtcp_sender_oct_cnt;
+static int hf_rtcp_ssrc_source;
+static int hf_rtcp_ssrc_fraction;
+static int hf_rtcp_ssrc_cum_nr;
+static int hf_rtcp_ssrc_discarded;
 /* First the 32 bit number, then the split
  * up 16 bit values */
 /* These two are added to a subtree */
-static int hf_rtcp_ssrc_ext_high_seq = -1;
-static int hf_rtcp_ssrc_high_seq = -1;
-static int hf_rtcp_ssrc_high_cycles = -1;
-static int hf_rtcp_ssrc_jitter = -1;
-static int hf_rtcp_ssrc_lsr = -1;
-static int hf_rtcp_ssrc_dlsr = -1;
-/* static int hf_rtcp_ssrc_csrc = -1; */
-static int hf_rtcp_sdes_type = -1;
-static int hf_rtcp_sdes_length = -1;
-static int hf_rtcp_sdes_text = -1;
-static int hf_rtcp_sdes_prefix_len = -1;
-static int hf_rtcp_sdes_prefix_string = -1;
-static int hf_rtcp_subtype = -1;
-static int hf_rtcp_name_ascii = -1;
-static int hf_rtcp_app_data = -1;
-static int hf_rtcp_app_data_str = -1;
-static int hf_rtcp_fsn = -1;
-static int hf_rtcp_blp = -1;
-static int hf_rtcp_padding_count = -1;
-static int hf_rtcp_padding_data = -1;
-static int hf_rtcp_profile_specific_extension_type = -1;
-static int hf_rtcp_profile_specific_extension_length = -1;
-static int hf_rtcp_profile_specific_extension = -1;
-static int hf_rtcp_app_poc1 = -1;
-static int hf_rtcp_app_poc1_sip_uri = -1;
-static int hf_rtcp_app_poc1_disp_name = -1;
-static int hf_rtcp_app_poc1_priority = -1;
-static int hf_rtcp_app_poc1_request_ts = -1;
-static int hf_rtcp_app_poc1_stt = -1;
-static int hf_rtcp_app_poc1_partic = -1;
-static int hf_rtcp_app_poc1_ssrc_granted = -1;
-static int hf_rtcp_app_poc1_last_pkt_seq_no = -1;
-static int hf_rtcp_app_poc1_ignore_seq_no = -1;
-static int hf_rtcp_app_poc1_reason_code1 = -1;
-static int hf_rtcp_app_poc1_reason1_phrase = -1;
-static int hf_rtcp_app_poc1_reason_code2 = -1;
-static int hf_rtcp_app_poc1_new_time_request = -1;
-static int hf_rtcp_app_poc1_ack_subtype = -1;
-static int hf_rtcp_app_poc1_ack_reason_code = -1;
-static int hf_rtcp_app_poc1_qsresp_priority = -1;
-static int hf_rtcp_app_poc1_qsresp_position = -1;
+static int hf_rtcp_ssrc_ext_high_seq;
+static int hf_rtcp_ssrc_high_seq;
+static int hf_rtcp_ssrc_high_cycles;
+static int hf_rtcp_ssrc_jitter;
+static int hf_rtcp_ssrc_lsr;
+static int hf_rtcp_ssrc_dlsr;
+/* static int hf_rtcp_ssrc_csrc; */
+static int hf_rtcp_sdes_type;
+static int hf_rtcp_sdes_length;
+static int hf_rtcp_sdes_text;
+static int hf_rtcp_sdes_prefix_len;
+static int hf_rtcp_sdes_prefix_string;
+static int hf_rtcp_subtype;
+static int hf_rtcp_name_ascii;
+static int hf_rtcp_app_data;
+static int hf_rtcp_app_data_str;
+static int hf_rtcp_fsn;
+static int hf_rtcp_blp;
+static int hf_rtcp_padding_count;
+static int hf_rtcp_padding_data;
+static int hf_rtcp_profile_specific_extension_type;
+static int hf_rtcp_profile_specific_extension_length;
+static int hf_rtcp_profile_specific_extension;
+static int hf_rtcp_app_poc1;
+static int hf_rtcp_app_poc1_sip_uri;
+static int hf_rtcp_app_poc1_disp_name;
+static int hf_rtcp_app_poc1_priority;
+static int hf_rtcp_app_poc1_request_ts;
+static int hf_rtcp_app_poc1_stt;
+static int hf_rtcp_app_poc1_partic;
+static int hf_rtcp_app_poc1_ssrc_granted;
+static int hf_rtcp_app_poc1_last_pkt_seq_no;
+static int hf_rtcp_app_poc1_ignore_seq_no;
+static int hf_rtcp_app_poc1_reason_code1;
+static int hf_rtcp_app_poc1_reason1_phrase;
+static int hf_rtcp_app_poc1_reason_code2;
+static int hf_rtcp_app_poc1_new_time_request;
+static int hf_rtcp_app_poc1_ack_subtype;
+static int hf_rtcp_app_poc1_ack_reason_code;
+static int hf_rtcp_app_poc1_qsresp_priority;
+static int hf_rtcp_app_poc1_qsresp_position;
 static int hf_rtcp_app_poc1_conn_content[5];
-static int hf_rtcp_app_poc1_conn_session_type = -1;
-static int hf_rtcp_app_poc1_conn_add_ind_mao = -1;
+static int hf_rtcp_app_poc1_conn_session_type;
+static int hf_rtcp_app_poc1_conn_add_ind_mao;
 static int hf_rtcp_app_poc1_conn_sdes_items[5];
-static int hf_rtcp_app_mux = -1;
-static int hf_rtcp_app_mux_mux = -1;
-static int hf_rtcp_app_mux_cp = -1;
-static int hf_rtcp_app_mux_selection = -1;
-static int hf_rtcp_app_mux_localmuxport = -1;
-static int hf_rtcp_xr_block_type = -1;
-static int hf_rtcp_xr_block_specific = -1;
-static int hf_rtcp_xr_block_length = -1;
-static int hf_rtcp_xr_thinning = -1;
-static int hf_rtcp_xr_voip_metrics_burst_density = -1;
-static int hf_rtcp_xr_voip_metrics_gap_density = -1;
-static int hf_rtcp_xr_voip_metrics_burst_duration = -1;
-static int hf_rtcp_xr_voip_metrics_gap_duration = -1;
-static int hf_rtcp_xr_voip_metrics_rtdelay = -1;
-static int hf_rtcp_xr_voip_metrics_esdelay = -1;
-static int hf_rtcp_xr_voip_metrics_siglevel = -1;
-static int hf_rtcp_xr_voip_metrics_noiselevel = -1;
-static int hf_rtcp_xr_voip_metrics_rerl = -1;
-static int hf_rtcp_xr_voip_metrics_gmin = -1;
-static int hf_rtcp_xr_voip_metrics_rfactor = -1;
-static int hf_rtcp_xr_voip_metrics_extrfactor = -1;
-static int hf_rtcp_xr_voip_metrics_moslq = -1;
-static int hf_rtcp_xr_voip_metrics_moscq = -1;
-static int hf_rtcp_xr_voip_metrics_plc = -1;
-static int hf_rtcp_xr_voip_metrics_jbadaptive = -1;
-static int hf_rtcp_xr_voip_metrics_jbrate = -1;
-static int hf_rtcp_xr_voip_metrics_jbnominal = -1;
-static int hf_rtcp_xr_voip_metrics_jbmax = -1;
-static int hf_rtcp_xr_voip_metrics_jbabsmax = -1;
-static int hf_rtcp_xr_stats_loss_flag = -1;
-static int hf_rtcp_xr_stats_dup_flag = -1;
-static int hf_rtcp_xr_stats_jitter_flag = -1;
-static int hf_rtcp_xr_stats_ttl = -1;
-static int hf_rtcp_xr_beginseq = -1;
-static int hf_rtcp_xr_endseq = -1;
-static int hf_rtcp_xr_chunk_null_terminator = -1;
-static int hf_rtcp_xr_chunk_length = -1;
-static int hf_rtcp_xr_chunk_bit_vector = -1;
-static int hf_rtcp_xr_receipt_time_seq = -1;
-static int hf_rtcp_xr_stats_lost = -1;
-static int hf_rtcp_xr_stats_dups = -1;
-static int hf_rtcp_xr_stats_minjitter = -1;
-static int hf_rtcp_xr_stats_maxjitter = -1;
-static int hf_rtcp_xr_stats_meanjitter = -1;
-static int hf_rtcp_xr_stats_devjitter = -1;
-static int hf_rtcp_xr_stats_minttl = -1;
-static int hf_rtcp_xr_stats_maxttl = -1;
-static int hf_rtcp_xr_stats_meanttl = -1;
-static int hf_rtcp_xr_stats_devttl = -1;
-static int hf_rtcp_xr_timestamp = -1;
-static int hf_rtcp_xr_lrr = -1;
-static int hf_rtcp_xr_dlrr = -1;
-static int hf_rtcp_xr_idms_spst = -1;
-static int hf_rtcp_xr_idms_pt = -1;
-static int hf_rtcp_xr_idms_msci = -1;
-static int hf_rtcp_xr_idms_source_ssrc = -1;
-static int hf_rtcp_xr_idms_ntp_rcv_ts = -1;
-static int hf_rtcp_xr_idms_rtp_ts = -1;
-static int hf_rtcp_xr_idms_ntp_pres_ts = -1;
-static int hf_rtcp_length_check = -1;
-static int hf_rtcp_rtpfb_fmt = -1;
-static int hf_rtcp_rtpfb_nack_pid = -1;
-static int hf_rtcp_rtpfb_nack_blp = -1;
-static int hf_rtcp_rtpfb_transport_cc_fci_base_seq = -1;
-static int hf_rtcp_rtpfb_transport_cc_fci_pkt_stats_cnt = -1;
-static int hf_rtcp_rtpfb_transport_cc_fci_ref_time = -1;
-static int hf_rtcp_rtpfb_transport_cc_fci_fb_pkt_cnt = -1;
-static int hf_rtcp_rtpfb_transport_cc_fci_pkt_chunk = -1;
-static int hf_rtcp_rtpfb_transport_cc_fci_recv_delta_1_byte = -1;
-static int hf_rtcp_rtpfb_transport_cc_fci_recv_delta_2_bytes = -1;
-static int hf_rtcp_rtpfb_transport_cc_fci_recv_delta_padding = -1;
-static int hf_rtcp_psfb_fmt = -1;
-static int hf_rtcp_fci = -1;
-static int hf_rtcp_psfb_fir_fci_ssrc = -1;
-static int hf_rtcp_psfb_fir_fci_csn = -1;
-static int hf_rtcp_psfb_fir_fci_reserved = -1;
-static int hf_rtcp_psfb_sli_first = -1;
-static int hf_rtcp_psfb_sli_number = -1;
-static int hf_rtcp_psfb_sli_picture_id = -1;
-static int hf_rtcp_psfb_remb_fci_identifier = -1;
-static int hf_rtcp_psfb_remb_fci_number_ssrcs = -1;
-static int hf_rtcp_psfb_remb_fci_ssrc = -1;
-static int hf_rtcp_psfb_remb_fci_exp = -1;
-static int hf_rtcp_psfb_remb_fci_mantissa = -1;
-static int hf_rtcp_psfb_remb_fci_bitrate = -1;
-static int hf_rtcp_rtpfb_tmbbr_fci_ssrc = -1;
-static int hf_rtcp_rtpfb_tmbbr_fci_exp = -1;
-static int hf_rtcp_rtpfb_tmbbr_fci_mantissa = -1;
-static int hf_rtcp_rtpfb_tmbbr_fci_bitrate = -1;
-static int hf_rtcp_rtpfb_tmbbr_fci_measuredoverhead = -1;
-static int hf_srtcp_e = -1;
-static int hf_srtcp_index = -1;
-static int hf_srtcp_mki = -1;
-static int hf_srtcp_auth_tag = -1;
-static int hf_rtcp_xr_btxnq_begseq = -1;               /* added for BT XNQ block (RFC5093) */
-static int hf_rtcp_xr_btxnq_endseq = -1;
-static int hf_rtcp_xr_btxnq_vmaxdiff = -1;
-static int hf_rtcp_xr_btxnq_vrange = -1;
-static int hf_rtcp_xr_btxnq_vsum = -1;
-static int hf_rtcp_xr_btxnq_cycles = -1;
-static int hf_rtcp_xr_btxnq_jbevents = -1;
-static int hf_rtcp_xr_btxnq_tdegnet = -1;
-static int hf_rtcp_xr_btxnq_tdegjit = -1;
-static int hf_rtcp_xr_btxnq_es = -1;
-static int hf_rtcp_xr_btxnq_ses = -1;
-static int hf_rtcp_xr_btxnq_spare = -1;
+static int hf_rtcp_app_mux;
+static int hf_rtcp_app_mux_mux;
+static int hf_rtcp_app_mux_cp;
+static int hf_rtcp_app_mux_selection;
+static int hf_rtcp_app_mux_localmuxport;
+static int hf_rtcp_xr_block_type;
+static int hf_rtcp_xr_block_specific;
+static int hf_rtcp_xr_block_length;
+static int hf_rtcp_xr_thinning;
+static int hf_rtcp_xr_voip_metrics_burst_density;
+static int hf_rtcp_xr_voip_metrics_gap_density;
+static int hf_rtcp_xr_voip_metrics_burst_duration;
+static int hf_rtcp_xr_voip_metrics_gap_duration;
+static int hf_rtcp_xr_voip_metrics_rtdelay;
+static int hf_rtcp_xr_voip_metrics_esdelay;
+static int hf_rtcp_xr_voip_metrics_siglevel;
+static int hf_rtcp_xr_voip_metrics_noiselevel;
+static int hf_rtcp_xr_voip_metrics_rerl;
+static int hf_rtcp_xr_voip_metrics_gmin;
+static int hf_rtcp_xr_voip_metrics_rfactor;
+static int hf_rtcp_xr_voip_metrics_extrfactor;
+static int hf_rtcp_xr_voip_metrics_moslq;
+static int hf_rtcp_xr_voip_metrics_moscq;
+static int hf_rtcp_xr_voip_metrics_plc;
+static int hf_rtcp_xr_voip_metrics_jbadaptive;
+static int hf_rtcp_xr_voip_metrics_jbrate;
+static int hf_rtcp_xr_voip_metrics_jbnominal;
+static int hf_rtcp_xr_voip_metrics_jbmax;
+static int hf_rtcp_xr_voip_metrics_jbabsmax;
+static int hf_rtcp_xr_stats_loss_flag;
+static int hf_rtcp_xr_stats_dup_flag;
+static int hf_rtcp_xr_stats_jitter_flag;
+static int hf_rtcp_xr_stats_ttl;
+static int hf_rtcp_xr_beginseq;
+static int hf_rtcp_xr_endseq;
+static int hf_rtcp_xr_chunk_null_terminator;
+static int hf_rtcp_xr_chunk_length;
+static int hf_rtcp_xr_chunk_bit_vector;
+static int hf_rtcp_xr_receipt_time_seq;
+static int hf_rtcp_xr_stats_lost;
+static int hf_rtcp_xr_stats_dups;
+static int hf_rtcp_xr_stats_minjitter;
+static int hf_rtcp_xr_stats_maxjitter;
+static int hf_rtcp_xr_stats_meanjitter;
+static int hf_rtcp_xr_stats_devjitter;
+static int hf_rtcp_xr_stats_minttl;
+static int hf_rtcp_xr_stats_maxttl;
+static int hf_rtcp_xr_stats_meanttl;
+static int hf_rtcp_xr_stats_devttl;
+static int hf_rtcp_xr_timestamp;
+static int hf_rtcp_xr_lrr;
+static int hf_rtcp_xr_dlrr;
+static int hf_rtcp_xr_idms_spst;
+static int hf_rtcp_xr_idms_pt;
+static int hf_rtcp_xr_idms_msci;
+static int hf_rtcp_xr_idms_source_ssrc;
+static int hf_rtcp_xr_idms_ntp_rcv_ts;
+static int hf_rtcp_xr_idms_rtp_ts;
+static int hf_rtcp_xr_idms_ntp_pres_ts;
+static int hf_rtcp_length_check;
+static int hf_rtcp_rtpfb_fmt;
+static int hf_rtcp_rtpfb_nack_pid;
+static int hf_rtcp_rtpfb_nack_blp;
+static int hf_rtcp_rtpfb_transport_cc_fci_base_seq;
+static int hf_rtcp_rtpfb_transport_cc_fci_pkt_stats_cnt;
+static int hf_rtcp_rtpfb_transport_cc_fci_ref_time;
+static int hf_rtcp_rtpfb_transport_cc_fci_fb_pkt_cnt;
+static int hf_rtcp_rtpfb_transport_cc_fci_pkt_chunk;
+static int hf_rtcp_rtpfb_transport_cc_fci_recv_delta_1_byte;
+static int hf_rtcp_rtpfb_transport_cc_fci_recv_delta_2_bytes;
+static int hf_rtcp_rtpfb_transport_cc_fci_recv_delta_padding;
+static int hf_rtcp_psfb_fmt;
+static int hf_rtcp_fci;
+static int hf_rtcp_psfb_fir_fci_ssrc;
+static int hf_rtcp_psfb_fir_fci_csn;
+static int hf_rtcp_psfb_fir_fci_reserved;
+static int hf_rtcp_psfb_sli_first;
+static int hf_rtcp_psfb_sli_number;
+static int hf_rtcp_psfb_sli_picture_id;
+static int hf_rtcp_psfb_remb_fci_identifier;
+static int hf_rtcp_psfb_remb_fci_number_ssrcs;
+static int hf_rtcp_psfb_remb_fci_ssrc;
+static int hf_rtcp_psfb_remb_fci_exp;
+static int hf_rtcp_psfb_remb_fci_mantissa;
+static int hf_rtcp_psfb_remb_fci_bitrate;
+static int hf_rtcp_rtpfb_tmbbr_fci_ssrc;
+static int hf_rtcp_rtpfb_tmbbr_fci_exp;
+static int hf_rtcp_rtpfb_tmbbr_fci_mantissa;
+static int hf_rtcp_rtpfb_tmbbr_fci_bitrate;
+static int hf_rtcp_rtpfb_tmbbr_fci_measuredoverhead;
+static int hf_srtcp_e;
+static int hf_srtcp_index;
+static int hf_srtcp_mki;
+static int hf_srtcp_auth_tag;
+static int hf_rtcp_xr_btxnq_begseq;               /* added for BT XNQ block (RFC5093) */
+static int hf_rtcp_xr_btxnq_endseq;
+static int hf_rtcp_xr_btxnq_vmaxdiff;
+static int hf_rtcp_xr_btxnq_vrange;
+static int hf_rtcp_xr_btxnq_vsum;
+static int hf_rtcp_xr_btxnq_cycles;
+static int hf_rtcp_xr_btxnq_jbevents;
+static int hf_rtcp_xr_btxnq_tdegnet;
+static int hf_rtcp_xr_btxnq_tdegjit;
+static int hf_rtcp_xr_btxnq_es;
+static int hf_rtcp_xr_btxnq_ses;
+static int hf_rtcp_xr_btxnq_spare;
 
 /* RTCP setup fields */
-static int hf_rtcp_setup = -1;
-static int hf_rtcp_setup_frame = -1;
-static int hf_rtcp_setup_method = -1;
+static int hf_rtcp_setup;
+static int hf_rtcp_setup_frame;
+static int hf_rtcp_setup_method;
 
 /* RTCP roundtrip delay fields */
-static int hf_rtcp_last_sr_timestamp_frame = -1;
-static int hf_rtcp_time_since_last_sr = -1;
-static int hf_rtcp_roundtrip_delay = -1;
+static int hf_rtcp_last_sr_timestamp_frame;
+static int hf_rtcp_time_since_last_sr;
+static int hf_rtcp_roundtrip_delay;
 
 /* MS Profile Specific Extension Fields */
-static int hf_rtcp_pse_ms_bandwidth = -1;
-static int hf_rtcp_pse_ms_confidence_level = -1;
-static int hf_rtcp_pse_ms_seq_num = -1;
-static int hf_rtcp_pse_ms_frame_resolution_width = -1;
-static int hf_rtcp_pse_ms_frame_resolution_height = -1;
-static int hf_rtcp_pse_ms_bitrate = -1;
-static int hf_rtcp_pse_ms_frame_rate = -1;
-static int hf_rtcp_pse_ms_concealed_frames = -1;
-static int hf_rtcp_pse_ms_stretched_frames = -1;
-static int hf_rtcp_pse_ms_compressed_frames = -1;
-static int hf_rtcp_pse_ms_total_frames = -1;
-static int hf_rtcp_pse_ms_receive_quality_state = -1;
-static int hf_rtcp_pse_ms_fec_distance_request = -1;
-static int hf_rtcp_pse_ms_last_packet_train = -1;
-static int hf_rtcp_pse_ms_packet_idx = -1;
-static int hf_rtcp_pse_ms_packet_cnt = -1;
-static int hf_rtcp_pse_ms_packet_train_byte_cnt = -1;
-static int hf_rtcp_pse_ms_inbound_bandwidth = -1;
-static int hf_rtcp_pse_ms_outbound_bandwidth = -1;
-static int hf_rtcp_pse_ms_no_cache = -1;
-static int hf_rtcp_pse_ms_congestion_info = -1;
-static int hf_rtcp_pse_ms_modality = -1;
+static int hf_rtcp_pse_ms_bandwidth;
+static int hf_rtcp_pse_ms_confidence_level;
+static int hf_rtcp_pse_ms_seq_num;
+static int hf_rtcp_pse_ms_frame_resolution_width;
+static int hf_rtcp_pse_ms_frame_resolution_height;
+static int hf_rtcp_pse_ms_bitrate;
+static int hf_rtcp_pse_ms_frame_rate;
+static int hf_rtcp_pse_ms_concealed_frames;
+static int hf_rtcp_pse_ms_stretched_frames;
+static int hf_rtcp_pse_ms_compressed_frames;
+static int hf_rtcp_pse_ms_total_frames;
+static int hf_rtcp_pse_ms_receive_quality_state;
+static int hf_rtcp_pse_ms_fec_distance_request;
+static int hf_rtcp_pse_ms_last_packet_train;
+static int hf_rtcp_pse_ms_packet_idx;
+static int hf_rtcp_pse_ms_packet_cnt;
+static int hf_rtcp_pse_ms_packet_train_byte_cnt;
+static int hf_rtcp_pse_ms_inbound_bandwidth;
+static int hf_rtcp_pse_ms_outbound_bandwidth;
+static int hf_rtcp_pse_ms_no_cache;
+static int hf_rtcp_pse_ms_congestion_info;
+static int hf_rtcp_pse_ms_modality;
 /* Microsoft PLI Extension */
-static int hf_rtcp_psfb_pli_ms_request_id = -1;
-static int hf_rtcp_psfb_pli_ms_sfr = -1;
+static int hf_rtcp_psfb_pli_ms_request_id;
+static int hf_rtcp_psfb_pli_ms_sfr;
 /* Microsoft Video Source Request */
-static int hf_rtcp_psfb_ms_type = -1;
-static int hf_rtcp_psfb_ms_length = -1;
-static int hf_rtcp_psfb_ms_msi = -1;
-static int hf_rtcp_psfb_ms_vsr_request_id = -1;
-static int hf_rtcp_psfb_ms_vsr_version = -1;
-static int hf_rtcp_psfb_ms_vsr_key_frame_request = -1;
-static int hf_rtcp_psfb_ms_vsr_num_entries = -1;
-static int hf_rtcp_psfb_ms_vsr_entry_length = -1;
-static int hf_rtcp_psfb_ms_vsre_payload_type = -1;
-static int hf_rtcp_psfb_ms_vsre_ucconfig_mode = -1;
-static int hf_rtcp_psfb_ms_vsre_no_sp_frames = -1;
-static int hf_rtcp_psfb_ms_vsre_baseline = -1;
-static int hf_rtcp_psfb_ms_vsre_cgs = -1;
-static int hf_rtcp_psfb_ms_vsre_aspect_ratio_bitmask = -1;
-static int hf_rtcp_psfb_ms_vsre_aspect_ratio_4by3 = -1;
-static int hf_rtcp_psfb_ms_vsre_aspect_ratio_16by9 = -1;
-static int hf_rtcp_psfb_ms_vsre_aspect_ratio_1by1 = -1;
-static int hf_rtcp_psfb_ms_vsre_aspect_ratio_3by4 = -1;
-static int hf_rtcp_psfb_ms_vsre_aspect_ratio_9by16 = -1;
-static int hf_rtcp_psfb_ms_vsre_aspect_ratio_20by3 = -1;
-static int hf_rtcp_psfb_ms_vsre_max_width = -1;
-static int hf_rtcp_psfb_ms_vsre_max_height = -1;
-static int hf_rtcp_psfb_ms_vsre_min_bitrate = -1;
-static int hf_rtcp_psfb_ms_vsre_bitrate_per_level = -1;
-static int hf_rtcp_psfb_ms_vsre_bitrate_histogram = -1;
-static int hf_rtcp_psfb_ms_vsre_frame_rate_mask = -1;
-static int hf_rtcp_psfb_ms_vsre_frame_rate_7_5 = -1;
-static int hf_rtcp_psfb_ms_vsre_frame_rate_12_5 = -1;
-static int hf_rtcp_psfb_ms_vsre_frame_rate_15 = -1;
-static int hf_rtcp_psfb_ms_vsre_frame_rate_25 = -1;
-static int hf_rtcp_psfb_ms_vsre_frame_rate_30 = -1;
-static int hf_rtcp_psfb_ms_vsre_frame_rate_50= -1;
-static int hf_rtcp_psfb_ms_vsre_frame_rate_60 = -1;
-static int hf_rtcp_psfb_ms_vsre_must_instances = -1;
-static int hf_rtcp_psfb_ms_vsre_may_instances = -1;
-static int hf_rtcp_psfb_ms_vsre_quality_histogram = -1;
-static int hf_rtcp_psfb_ms_vsre_max_pixels = -1;
-
-static int hf_rtcp_mcptt_fld_id = -1;
-static int hf_rtcp_mcptt_fld_len = -1;
-static int hf_rtcp_mcptt_fld_val = -1;
-static int hf_rtcp_mcptt_granted_partys_id = -1;
-static int hf_rtcp_app_data_padding = -1;
-static int hf_rtcp_mcptt_priority = -1;
-static int hf_rtcp_mcptt_duration = -1;
-static int hf_rtcp_mcptt_user_id = -1;
-static int hf_rtcp_mcptt_floor_ind = -1;
-static int hf_rtcp_mcptt_rej_cause = -1;
+static int hf_rtcp_psfb_ms_type;
+static int hf_rtcp_psfb_ms_length;
+static int hf_rtcp_psfb_ms_msi;
+static int hf_rtcp_psfb_ms_vsr_request_id;
+static int hf_rtcp_psfb_ms_vsr_version;
+static int hf_rtcp_psfb_ms_vsr_key_frame_request;
+static int hf_rtcp_psfb_ms_vsr_num_entries;
+static int hf_rtcp_psfb_ms_vsr_entry_length;
+static int hf_rtcp_psfb_ms_vsre_payload_type;
+static int hf_rtcp_psfb_ms_vsre_ucconfig_mode;
+static int hf_rtcp_psfb_ms_vsre_no_sp_frames;
+static int hf_rtcp_psfb_ms_vsre_baseline;
+static int hf_rtcp_psfb_ms_vsre_cgs;
+static int hf_rtcp_psfb_ms_vsre_aspect_ratio_bitmask;
+static int hf_rtcp_psfb_ms_vsre_aspect_ratio_4by3;
+static int hf_rtcp_psfb_ms_vsre_aspect_ratio_16by9;
+static int hf_rtcp_psfb_ms_vsre_aspect_ratio_1by1;
+static int hf_rtcp_psfb_ms_vsre_aspect_ratio_3by4;
+static int hf_rtcp_psfb_ms_vsre_aspect_ratio_9by16;
+static int hf_rtcp_psfb_ms_vsre_aspect_ratio_20by3;
+static int hf_rtcp_psfb_ms_vsre_max_width;
+static int hf_rtcp_psfb_ms_vsre_max_height;
+static int hf_rtcp_psfb_ms_vsre_min_bitrate;
+static int hf_rtcp_psfb_ms_vsre_bitrate_per_level;
+static int hf_rtcp_psfb_ms_vsre_bitrate_histogram;
+static int hf_rtcp_psfb_ms_vsre_frame_rate_mask;
+static int hf_rtcp_psfb_ms_vsre_frame_rate_7_5;
+static int hf_rtcp_psfb_ms_vsre_frame_rate_12_5;
+static int hf_rtcp_psfb_ms_vsre_frame_rate_15;
+static int hf_rtcp_psfb_ms_vsre_frame_rate_25;
+static int hf_rtcp_psfb_ms_vsre_frame_rate_30;
+static int hf_rtcp_psfb_ms_vsre_frame_rate_50;
+static int hf_rtcp_psfb_ms_vsre_frame_rate_60;
+static int hf_rtcp_psfb_ms_vsre_must_instances;
+static int hf_rtcp_psfb_ms_vsre_may_instances;
+static int hf_rtcp_psfb_ms_vsre_quality_histogram;
+static int hf_rtcp_psfb_ms_vsre_max_pixels;
+
+static int hf_rtcp_mcptt_fld_id;
+static int hf_rtcp_mcptt_fld_len;
+static int hf_rtcp_mcptt_fld_val;
+static int hf_rtcp_mcptt_granted_partys_id;
+static int hf_rtcp_app_data_padding;
+static int hf_rtcp_mcptt_priority;
+static int hf_rtcp_mcptt_duration;
+static int hf_rtcp_mcptt_user_id;
+static int hf_rtcp_mcptt_floor_ind;
+static int hf_rtcp_mcptt_rej_cause;
 static int hf_rtcp_mcptt_rej_cause_floor_deny;
 static int hf_rtcp_mcptt_rej_cause_floor_revoke;
-static int hf_rtcp_mcptt_rej_phrase = -1;
-static int hf_rtcp_mcptt_queue_pos_inf = -1;
-static int hf_rtcp_mcptt_queue_pri_lev = -1;
-static int hf_rtcp_mcptt_perm_to_req_floor = -1;
-static int hf_rtcp_mcptt_queue_size = -1;
-static int hf_rtcp_mcptt_msg_seq_num = -1;
-static int hf_rtcp_mcptt_queued_user_id = -1;
-static int hf_rtcp_mcptt_source = -1;
-static int hf_rtcp_mcptt_queueing_cap = -1;
-static int hf_rtcp_mcptt_part_type_len = -1;
-static int hf_rtcp_mcptt_participant_type = -1;
-static int hf_rtcp_mcptt_participant_ref = - 1;
-static int hf_rtcp_mcptt_ssrc = -1;
-static int hf_rtcp_mcptt_num_users = -1;
-static int hf_rtcp_mcptt_user_id_len = -1;
-static int hf_rtcp_spare16 = -1;
-static int hf_rtcp_mcptt_num_ssrc = -1;
-static int hf_rtcp_mcptt_func_alias = -1;
-static int hf_rtcp_mcptt_num_fas = -1;
-static int hf_rtcp_mcptt_fa_len = -1;
-static int hf_rtcp_mcptt_loc_type = -1;
-static int hf_rtcp_mcptt_cellid = -1;
-static int hf_rtcp_mcptt_enodebid = -1;
-static int hf_rtcp_mcptt_ecgi_eci = -1;
-static int hf_rtcp_mcptt_tac = -1;
-static int hf_rtcp_mcptt_mbms_serv_area = -1;
-static int hf_rtcp_mcptt_mbsfn_area_id = -1;
-static int hf_rtcp_mcptt_lat = -1;
-static int hf_rtcp_mcptt_long = -1;
-static int hf_rtcp_mcptt_msg_type = -1;
-static int hf_rtcp_mcptt_num_loc = -1;
-static int hf_rtcp_mcptt_str = -1;
-static int hf_rtcp_mccp_len = -1;
-static int hf_rtcp_mccp_field_id = -1;
-static int hf_rtcp_mcptt_group_id = -1;
-static int hf_rtcp_mccp_audio_m_line_no = -1;
-static int hf_rtcp_mccp_floor_m_line_no = -1;
-static int hf_rtcp_mccp_ip_version = -1;
-static int hf_rtcp_mccp_floor_port_no = -1;
-static int hf_rtcp_mccp_media_port_no = -1;
-static int hf_rtcp_mccp_ipv4 = -1;
-static int hf_rtcp_mccp_ipv6 = -1;
-static int hf_rtcp_mccp_tmgi = -1;
-static int hf_rtcp_encrypted = -1;
+static int hf_rtcp_mcptt_rej_phrase;
+static int hf_rtcp_mcptt_queue_pos_inf;
+static int hf_rtcp_mcptt_queue_pri_lev;
+static int hf_rtcp_mcptt_perm_to_req_floor;
+static int hf_rtcp_mcptt_queue_size;
+static int hf_rtcp_mcptt_msg_seq_num;
+static int hf_rtcp_mcptt_queued_user_id;
+static int hf_rtcp_mcptt_source;
+static int hf_rtcp_mcptt_queueing_cap;
+static int hf_rtcp_mcptt_part_type_len;
+static int hf_rtcp_mcptt_participant_type;
+static int hf_rtcp_mcptt_participant_ref;
+static int hf_rtcp_mcptt_ssrc;
+static int hf_rtcp_mcptt_num_users;
+static int hf_rtcp_mcptt_user_id_len;
+static int hf_rtcp_spare16;
+static int hf_rtcp_mcptt_num_ssrc;
+static int hf_rtcp_mcptt_func_alias;
+static int hf_rtcp_mcptt_num_fas;
+static int hf_rtcp_mcptt_fa_len;
+static int hf_rtcp_mcptt_loc_type;
+static int hf_rtcp_mcptt_cellid;
+static int hf_rtcp_mcptt_enodebid;
+static int hf_rtcp_mcptt_ecgi_eci;
+static int hf_rtcp_mcptt_tac;
+static int hf_rtcp_mcptt_mbms_serv_area;
+static int hf_rtcp_mcptt_mbsfn_area_id;
+static int hf_rtcp_mcptt_lat;
+static int hf_rtcp_mcptt_long;
+static int hf_rtcp_mcptt_msg_type;
+static int hf_rtcp_mcptt_num_loc;
+static int hf_rtcp_mcptt_str;
+static int hf_rtcp_mccp_len;
+static int hf_rtcp_mccp_field_id;
+static int hf_rtcp_mcptt_group_id;
+static int hf_rtcp_mccp_audio_m_line_no;
+static int hf_rtcp_mccp_floor_m_line_no;
+static int hf_rtcp_mccp_ip_version;
+static int hf_rtcp_mccp_floor_port_no;
+static int hf_rtcp_mccp_media_port_no;
+static int hf_rtcp_mccp_ipv4;
+static int hf_rtcp_mccp_ipv6;
+static int hf_rtcp_mccp_tmgi;
+static int hf_rtcp_encrypted;
 
 /* RTCP fields defining a sub tree */
-static gint ett_rtcp                    = -1;
-static gint ett_rtcp_sr                 = -1;
-static gint ett_rtcp_rr                 = -1;
-static gint ett_rtcp_sdes               = -1;
-static gint ett_rtcp_bye                = -1;
-static gint ett_rtcp_app                = -1;
-static gint ett_rtcp_rtpfb              = -1;
-static gint ett_rtcp_psfb               = -1;
-static gint ett_rtcp_xr                 = -1;
-static gint ett_rtcp_fir                = -1;
-static gint ett_rtcp_nack               = -1;
-static gint ett_ssrc                    = -1;
-static gint ett_ssrc_item               = -1;
-static gint ett_ssrc_ext_high           = -1;
-static gint ett_sdes                    = -1;
-static gint ett_sdes_item               = -1;
-static gint ett_PoC1                    = -1;
-static gint ett_mux                     = -1;
-static gint ett_rtcp_setup              = -1;
-static gint ett_rtcp_roundtrip_delay    = -1;
-static gint ett_xr_block                = -1;
-static gint ett_xr_block_contents       = -1;
-static gint ett_xr_ssrc                 = -1;
-static gint ett_xr_loss_chunk           = -1;
-static gint ett_poc1_conn_contents      = -1;
-static gint ett_rtcp_nack_blp           = -1;
-static gint ett_pse                     = -1;
-static gint ett_ms_vsr                  = -1;
-static gint ett_ms_vsr_entry            = -1;
-static gint ett_ms_ds                   = -1;
-static gint ett_rtcp_mcpt = -1;
-static gint ett_rtcp_mcptt_participant_ref = -1;
-static gint ett_rtcp_mcptt_eci = -1;
-static gint ett_rtcp_mccp_tmgi = -1;
-
-static expert_field ei_rtcp_not_final_padding = EI_INIT;
-static expert_field ei_rtcp_bye_reason_not_padded = EI_INIT;
-static expert_field ei_rtcp_xr_block_length_bad = EI_INIT;
-static expert_field ei_rtcp_roundtrip_delay = EI_INIT;
-static expert_field ei_rtcp_length_check = EI_INIT;
-static expert_field ei_rtcp_roundtrip_delay_negative = EI_INIT;
-static expert_field ei_rtcp_psfb_ms_type = EI_INIT;
-static expert_field ei_rtcp_missing_sender_ssrc = EI_INIT;
-static expert_field ei_rtcp_missing_block_header = EI_INIT;
-static expert_field ei_rtcp_block_length = EI_INIT;
-static expert_field ei_srtcp_encrypted_payload = EI_INIT;
-static expert_field ei_rtcp_rtpfb_transportcc_bad = EI_INIT;
-static expert_field ei_rtcp_mcptt_unknown_fld = EI_INIT;
-static expert_field ei_rtcp_mcptt_location_type = EI_INIT;
-static expert_field ei_rtcp_appl_extra_bytes = EI_INIT;
-static expert_field ei_rtcp_appl_not_ascii = EI_INIT;
-static expert_field ei_rtcp_appl_non_conformant = EI_INIT;
-static expert_field ei_rtcp_appl_non_zero_pad = EI_INIT;
+static gint ett_rtcp;
+static gint ett_rtcp_sr;
+static gint ett_rtcp_rr;
+static gint ett_rtcp_sdes;
+static gint ett_rtcp_bye;
+static gint ett_rtcp_app;
+static gint ett_rtcp_rtpfb;
+static gint ett_rtcp_psfb;
+static gint ett_rtcp_xr;
+static gint ett_rtcp_fir;
+static gint ett_rtcp_nack;
+static gint ett_ssrc;
+static gint ett_ssrc_item;
+static gint ett_ssrc_ext_high;
+static gint ett_sdes;
+static gint ett_sdes_item;
+static gint ett_PoC1;
+static gint ett_mux;
+static gint ett_rtcp_setup;
+static gint ett_rtcp_roundtrip_delay;
+static gint ett_xr_block;
+static gint ett_xr_block_contents;
+static gint ett_xr_ssrc;
+static gint ett_xr_loss_chunk;
+static gint ett_poc1_conn_contents;
+static gint ett_rtcp_nack_blp;
+static gint ett_pse;
+static gint ett_ms_vsr;
+static gint ett_ms_vsr_entry;
+static gint ett_ms_ds;
+static gint ett_rtcp_mcpt;
+static gint ett_rtcp_mcptt_participant_ref;
+static gint ett_rtcp_mcptt_eci;
+static gint ett_rtcp_mccp_tmgi;
+
+static expert_field ei_rtcp_not_final_padding;
+static expert_field ei_rtcp_bye_reason_not_padded;
+static expert_field ei_rtcp_xr_block_length_bad;
+static expert_field ei_rtcp_roundtrip_delay;
+static expert_field ei_rtcp_length_check;
+static expert_field ei_rtcp_roundtrip_delay_negative;
+static expert_field ei_rtcp_psfb_ms_type;
+static expert_field ei_rtcp_missing_sender_ssrc;
+static expert_field ei_rtcp_missing_block_header;
+static expert_field ei_rtcp_block_length;
+static expert_field ei_srtcp_encrypted_payload;
+static expert_field ei_rtcp_rtpfb_transportcc_bad;
+static expert_field ei_rtcp_mcptt_unknown_fld;
+static expert_field ei_rtcp_mcptt_location_type;
+static expert_field ei_rtcp_appl_extra_bytes;
+static expert_field ei_rtcp_appl_not_ascii;
+static expert_field ei_rtcp_appl_non_conformant;
+static expert_field ei_rtcp_appl_non_zero_pad;
 
 enum default_protocol_type {
     RTCP_PROTO_RTCP,
diff --git a/epan/dissectors/packet-rtitcp.c b/epan/dissectors/packet-rtitcp.c
index 0615b4f254..8204c1cefc 100644
--- a/epan/dissectors/packet-rtitcp.c
+++ b/epan/dissectors/packet-rtitcp.c
@@ -124,32 +124,32 @@ void proto_reg_handoff_rtitcp(void);
 void proto_register_rtitcp(void);
 
 /* Initialize the protocol and registered fields */
-static gint proto_rtitcp                                         = -1;
-static gint hf_rtitcp_header_control_byte                        = -1;
-static gint hf_rtitcp_header_magic_number                        = -1;
-static gint hf_rtitcp_header_message_length                      = -1;
-static gint hf_rtitcp_control_transaction_id                     = -1;
-static gint hf_rtitcp_control_kind                               = -1;
-static gint hf_rtitcp_control_attribute_type                     = -1;
-static gint hf_rtitcp_control_attribute_length                   = -1;
-static gint hf_rtitcp_control_attribute_port                     = -1;
-static gint hf_rtitcp_attributes_list_length                     = -1;
-static gint hf_rtitcp_control_magic_cookie                       = -1;
-static gint hf_rtitcp_control_attribute_connection_cookie        = -1;
-static gint hf_rtitcp_control_attribute_connection_type          = -1;
-static gint hf_rtitcp_control_attribute_session_id               = -1;
-static gint hf_rtitcp_control_attribute_error_code_value         = -1;
-static gint hf_rtitcp_control_attribute_error_code_description   = -1;
-static gint hf_rtitcp_locator_ipv4                               = -1;
-static gint hf_rtitcp_locator_port                               = -1;
-static gint hf_rtitcp_locator_ipv6                               = -1;
-static gint hf_rtitcp_locator_kind                               = -1;
-static gint hf_rtitcp_crc_magic_cookie                           = -1;
-static gint hf_rtitcp_control_crc_value                          = -1;
-
-static gint hf_rtitcp_response_in                                = -1;
-static gint hf_rtitcp_response_to                                = -1;
-static gint hf_rtitcp_response_time                              = -1;
+static gint proto_rtitcp;
+static gint hf_rtitcp_header_control_byte;
+static gint hf_rtitcp_header_magic_number;
+static gint hf_rtitcp_header_message_length;
+static gint hf_rtitcp_control_transaction_id;
+static gint hf_rtitcp_control_kind;
+static gint hf_rtitcp_control_attribute_type;
+static gint hf_rtitcp_control_attribute_length;
+static gint hf_rtitcp_control_attribute_port;
+static gint hf_rtitcp_attributes_list_length;
+static gint hf_rtitcp_control_magic_cookie;
+static gint hf_rtitcp_control_attribute_connection_cookie;
+static gint hf_rtitcp_control_attribute_connection_type;
+static gint hf_rtitcp_control_attribute_session_id;
+static gint hf_rtitcp_control_attribute_error_code_value;
+static gint hf_rtitcp_control_attribute_error_code_description;
+static gint hf_rtitcp_locator_ipv4;
+static gint hf_rtitcp_locator_port;
+static gint hf_rtitcp_locator_ipv6;
+static gint hf_rtitcp_locator_kind;
+static gint hf_rtitcp_crc_magic_cookie;
+static gint hf_rtitcp_control_crc_value;
+
+static gint hf_rtitcp_response_in;
+static gint hf_rtitcp_response_to;
+static gint hf_rtitcp_response_time;
 
 #define RTITCP_FLAG_NOT_REQUEST 0x0100
 
@@ -164,11 +164,11 @@ typedef struct _rtitcp_conv_info_t {
 } rtitcp_conv_info_t;
 
 /* Subtree pointers */
-static gint ett_rtitcp                              = -1;
-static gint ett_rtitcp_signalling_protocol          = -1;
-static gint ett_rtitcp_message                      = -1;
-static gint ett_rtitcp_attributes_list              = -1;
-static gint ett_rtitcp_attribute                    = -1;
+static gint ett_rtitcp;
+static gint ett_rtitcp_signalling_protocol;
+static gint ett_rtitcp_message;
+static gint ett_rtitcp_attributes_list;
+static gint ett_rtitcp_attribute;
 
 static header_field_info *hfi_rtitcp                = NULL;
 static heur_dissector_list_t heur_subdissector_list;
diff --git a/epan/dissectors/packet-rtls.c b/epan/dissectors/packet-rtls.c
index 95c56819f6..8a6c32cb66 100644
--- a/epan/dissectors/packet-rtls.c
+++ b/epan/dissectors/packet-rtls.c
@@ -23,70 +23,70 @@ void proto_register_rtls(void);
 
 static dissector_handle_t rtls_handle;
 
-static int proto_rtls = -1;
-static int hf_rtls_message_type = -1;
-static int hf_rtls_message_id = -1;
-static int hf_rtls_version_major = -1;
-static int hf_rtls_version_minor = -1;
-static int hf_rtls_data_length = -1;
-static int hf_rtls_ap_mac = -1;
-static int hf_rtls_padding = -1;
-static int hf_rtls_reserved = -1;
-static int hf_rtls_signature = -1;
-
-static int hf_rtls_as_tag_addr = -1;
-static int hf_rtls_sr_mac_address = -1;
-static int hf_rtls_nack_flags = -1;
-static int hf_rtls_nack_flags_internal_error = -1;
-static int hf_rtls_nack_flags_station_not_found = -1;
-static int hf_rtls_nack_flags_reserved = -1;
-static int hf_rtls_tr_bssid = -1;
-static int hf_rtls_tr_rssi = -1;
-static int hf_rtls_tr_rssi_calculated = -1;
-static int hf_rtls_tr_noise_floor = -1;
-static int hf_rtls_tr_timestamp = -1;
-static int hf_rtls_tr_tag_mac = -1;
-static int hf_rtls_tr_frame_control = -1;
-static int hf_rtls_tr_sequence = -1;
-static int hf_rtls_tr_data_rate = -1;
-static int hf_rtls_tr_tx_power = -1;
-static int hf_rtls_tr_channel = -1;
-static int hf_rtls_tr_battery = -1;
-static int hf_rtls_sr_mac = -1;
-static int hf_rtls_sr_noise_floor = -1;
-static int hf_rtls_sr_data_rate = -1;
-static int hf_rtls_sr_channel = -1;
-static int hf_rtls_sr_rssi = -1;
-static int hf_rtls_sr_rssi_calculated = -1;
-static int hf_rtls_sr_type = -1;
-static int hf_rtls_sr_associated = -1;
-static int hf_rtls_sr_radio_bssid = -1;
-static int hf_rtls_sr_mon_bssid = -1;
-static int hf_rtls_sr_age = -1;
-static int hf_rtls_ser_mac = -1;
-static int hf_rtls_ser_bssid = -1;
-static int hf_rtls_ser_essid = -1;
-static int hf_rtls_ser_channel = -1;
-static int hf_rtls_ser_phy_type = -1;
-static int hf_rtls_ser_rssi = -1;
-static int hf_rtls_ser_rssi_calculated = -1;
-static int hf_rtls_ser_duration = -1;
-static int hf_rtls_ser_num_packets = -1;
-static int hf_rtls_ser_noise_floor = -1;
-static int hf_rtls_ser_classification = -1;
-static int hf_rtls_aer_bssid = -1;
-static int hf_rtls_aer_essid = -1;
-static int hf_rtls_aer_channel = -1;
-static int hf_rtls_aer_phy_type = -1;
-static int hf_rtls_aer_rssi = -1;
-static int hf_rtls_aer_rssi_calculated = -1;
-static int hf_rtls_aer_duration = -1;
-static int hf_rtls_aer_num_packets = -1;
-static int hf_rtls_aer_noise_floor = -1;
-static int hf_rtls_aer_classification = -1;
-static int hf_rtls_aer_match_type = -1;
-static int hf_rtls_aer_match_method = -1;
-static int hf_rtls_cmr_messages = -1;
+static int proto_rtls;
+static int hf_rtls_message_type;
+static int hf_rtls_message_id;
+static int hf_rtls_version_major;
+static int hf_rtls_version_minor;
+static int hf_rtls_data_length;
+static int hf_rtls_ap_mac;
+static int hf_rtls_padding;
+static int hf_rtls_reserved;
+static int hf_rtls_signature;
+
+static int hf_rtls_as_tag_addr;
+static int hf_rtls_sr_mac_address;
+static int hf_rtls_nack_flags;
+static int hf_rtls_nack_flags_internal_error;
+static int hf_rtls_nack_flags_station_not_found;
+static int hf_rtls_nack_flags_reserved;
+static int hf_rtls_tr_bssid;
+static int hf_rtls_tr_rssi;
+static int hf_rtls_tr_rssi_calculated;
+static int hf_rtls_tr_noise_floor;
+static int hf_rtls_tr_timestamp;
+static int hf_rtls_tr_tag_mac;
+static int hf_rtls_tr_frame_control;
+static int hf_rtls_tr_sequence;
+static int hf_rtls_tr_data_rate;
+static int hf_rtls_tr_tx_power;
+static int hf_rtls_tr_channel;
+static int hf_rtls_tr_battery;
+static int hf_rtls_sr_mac;
+static int hf_rtls_sr_noise_floor;
+static int hf_rtls_sr_data_rate;
+static int hf_rtls_sr_channel;
+static int hf_rtls_sr_rssi;
+static int hf_rtls_sr_rssi_calculated;
+static int hf_rtls_sr_type;
+static int hf_rtls_sr_associated;
+static int hf_rtls_sr_radio_bssid;
+static int hf_rtls_sr_mon_bssid;
+static int hf_rtls_sr_age;
+static int hf_rtls_ser_mac;
+static int hf_rtls_ser_bssid;
+static int hf_rtls_ser_essid;
+static int hf_rtls_ser_channel;
+static int hf_rtls_ser_phy_type;
+static int hf_rtls_ser_rssi;
+static int hf_rtls_ser_rssi_calculated;
+static int hf_rtls_ser_duration;
+static int hf_rtls_ser_num_packets;
+static int hf_rtls_ser_noise_floor;
+static int hf_rtls_ser_classification;
+static int hf_rtls_aer_bssid;
+static int hf_rtls_aer_essid;
+static int hf_rtls_aer_channel;
+static int hf_rtls_aer_phy_type;
+static int hf_rtls_aer_rssi;
+static int hf_rtls_aer_rssi_calculated;
+static int hf_rtls_aer_duration;
+static int hf_rtls_aer_num_packets;
+static int hf_rtls_aer_noise_floor;
+static int hf_rtls_aer_classification;
+static int hf_rtls_aer_match_type;
+static int hf_rtls_aer_match_method;
+static int hf_rtls_cmr_messages;
 
 static int * const rtls_nack_flags[] = {
     &hf_rtls_nack_flags_internal_error,
@@ -95,10 +95,10 @@ static int * const rtls_nack_flags[] = {
     NULL
 };
 
-static expert_field ei_rtls_undecoded = EI_INIT;
-static gint ett_rtls = -1;
-static gint ett_rtls_message = -1;
-static gint ett_rtls_nack_flags = -1;
+static expert_field ei_rtls_undecoded;
+static gint ett_rtls;
+static gint ett_rtls_message;
+static gint ett_rtls_nack_flags;
 
 #define RTLS_MIN_LENGTH 16
 
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c
index 7760318b85..785ee0ac69 100644
--- a/epan/dissectors/packet-rtmpt.c
+++ b/epan/dissectors/packet-rtmpt.c
@@ -74,65 +74,65 @@ void proto_reg_handoff_rtmpt(void);
 
 void proto_register_amf(void);
 
-static int proto_rtmpt = -1;
-
-static int hf_rtmpt_handshake_c0 = -1;
-static int hf_rtmpt_handshake_s0 = -1;
-static int hf_rtmpt_handshake_c1 = -1;
-static int hf_rtmpt_handshake_s1 = -1;
-static int hf_rtmpt_handshake_c2 = -1;
-static int hf_rtmpt_handshake_s2 = -1;
-
-static int hf_rtmpt_header_format = -1;
-static int hf_rtmpt_header_csid = -1;
-static int hf_rtmpt_header_timestamp = -1;
-static int hf_rtmpt_header_timestamp_delta = -1;
-static int hf_rtmpt_header_body_size = -1;
-static int hf_rtmpt_header_typeid = -1;
-static int hf_rtmpt_header_streamid = -1;
-static int hf_rtmpt_header_ets = -1;
-
-static int hf_rtmpt_scm_chunksize = -1;
-static int hf_rtmpt_scm_csid = -1;
-static int hf_rtmpt_scm_seq = -1;
-static int hf_rtmpt_scm_was = -1;
-static int hf_rtmpt_scm_limittype = -1;
-
-static int hf_rtmpt_ucm_eventtype = -1;
-
-static int hf_rtmpt_function_call = -1;
-static int hf_rtmpt_function_response = -1;
-
-static int hf_rtmpt_audio_control = -1;
-static int hf_rtmpt_audio_format = -1;
-static int hf_rtmpt_audio_rate = -1;
-static int hf_rtmpt_audio_size = -1;
-static int hf_rtmpt_audio_type = -1;
-static int hf_rtmpt_audio_data = -1;
-
-static int hf_rtmpt_video_control = -1;
-static int hf_rtmpt_video_type = -1;
-static int hf_rtmpt_video_format = -1;
-static int hf_rtmpt_video_data = -1;
-
-static int hf_rtmpt_tag_type = -1;
-static int hf_rtmpt_tag_datasize = -1;
-static int hf_rtmpt_tag_timestamp = -1;
-static int hf_rtmpt_tag_ets = -1;
-static int hf_rtmpt_tag_streamid = -1;
-static int hf_rtmpt_tag_tagsize = -1;
-
-static expert_field ei_amf_loop = EI_INIT;
-
-static gint ett_rtmpt = -1;
-static gint ett_rtmpt_handshake = -1;
-static gint ett_rtmpt_header = -1;
-static gint ett_rtmpt_body = -1;
-static gint ett_rtmpt_ucm = -1;
-static gint ett_rtmpt_audio_control = -1;
-static gint ett_rtmpt_video_control = -1;
-static gint ett_rtmpt_tag = -1;
-static gint ett_rtmpt_tag_data = -1;
+static int proto_rtmpt;
+
+static int hf_rtmpt_handshake_c0;
+static int hf_rtmpt_handshake_s0;
+static int hf_rtmpt_handshake_c1;
+static int hf_rtmpt_handshake_s1;
+static int hf_rtmpt_handshake_c2;
+static int hf_rtmpt_handshake_s2;
+
+static int hf_rtmpt_header_format;
+static int hf_rtmpt_header_csid;
+static int hf_rtmpt_header_timestamp;
+static int hf_rtmpt_header_timestamp_delta;
+static int hf_rtmpt_header_body_size;
+static int hf_rtmpt_header_typeid;
+static int hf_rtmpt_header_streamid;
+static int hf_rtmpt_header_ets;
+
+static int hf_rtmpt_scm_chunksize;
+static int hf_rtmpt_scm_csid;
+static int hf_rtmpt_scm_seq;
+static int hf_rtmpt_scm_was;
+static int hf_rtmpt_scm_limittype;
+
+static int hf_rtmpt_ucm_eventtype;
+
+static int hf_rtmpt_function_call;
+static int hf_rtmpt_function_response;
+
+static int hf_rtmpt_audio_control;
+static int hf_rtmpt_audio_format;
+static int hf_rtmpt_audio_rate;
+static int hf_rtmpt_audio_size;
+static int hf_rtmpt_audio_type;
+static int hf_rtmpt_audio_data;
+
+static int hf_rtmpt_video_control;
+static int hf_rtmpt_video_type;
+static int hf_rtmpt_video_format;
+static int hf_rtmpt_video_data;
+
+static int hf_rtmpt_tag_type;
+static int hf_rtmpt_tag_datasize;
+static int hf_rtmpt_tag_timestamp;
+static int hf_rtmpt_tag_ets;
+static int hf_rtmpt_tag_streamid;
+static int hf_rtmpt_tag_tagsize;
+
+static expert_field ei_amf_loop;
+
+static gint ett_rtmpt;
+static gint ett_rtmpt_handshake;
+static gint ett_rtmpt_header;
+static gint ett_rtmpt_body;
+static gint ett_rtmpt_ucm;
+static gint ett_rtmpt_audio_control;
+static gint ett_rtmpt_video_control;
+static gint ett_rtmpt_tag;
+static gint ett_rtmpt_tag_data;
 
 static dissector_handle_t amf_handle;
 static dissector_handle_t rtmpt_tcp_handle;
@@ -307,64 +307,64 @@ static const value_string rtmpt_video_codecs[] = {
         { 0, NULL }
 };
 
-static int proto_amf = -1;
-
-static int hf_amf_version = -1;
-static int hf_amf_header_count = -1;
-static int hf_amf_header_name = -1;
-static int hf_amf_header_must_understand = -1;
-static int hf_amf_header_length = -1;
-/* static int hf_amf_header_value_type = -1; */
-static int hf_amf_message_count = -1;
-static int hf_amf_message_target_uri = -1;
-static int hf_amf_message_response_uri = -1;
-static int hf_amf_message_length = -1;
-
-static int hf_amf_amf0_type = -1;
-static int hf_amf_amf3_type = -1;
-static int hf_amf_number = -1;
-static int hf_amf_integer = -1;
-static int hf_amf_boolean = -1;
-static int hf_amf_stringlength = -1;
-static int hf_amf_string = -1;
-static int hf_amf_string_reference = -1;
-static int hf_amf_object_reference = -1;
-static int hf_amf_date = -1;
-/* static int hf_amf_longstringlength = -1; */
-static int hf_amf_longstring = -1;
-static int hf_amf_xml_doc = -1;
-static int hf_amf_xmllength = -1;
-static int hf_amf_xml = -1;
-static int hf_amf_int64 = -1;
-static int hf_amf_bytearraylength = -1;
-static int hf_amf_bytearray = -1;
-
-static int hf_amf_object = -1;
-static int hf_amf_traitcount = -1;
-static int hf_amf_classnamelength = -1;
-static int hf_amf_classname = -1;
-static int hf_amf_membernamelength = -1;
-static int hf_amf_membername = -1;
-static int hf_amf_trait_reference = -1;
-static int hf_amf_ecmaarray = -1;
-static int hf_amf_strictarray = -1;
-static int hf_amf_array = -1;
-static int hf_amf_arraylength = -1;
-static int hf_amf_arraydenselength = -1;
-
-static int hf_amf_end_of_object_marker = -1;
-static int hf_amf_end_of_associative_part = -1;
-static int hf_amf_end_of_dynamic_members = -1;
-
-static gint ett_amf = -1;
-static gint ett_amf_headers = -1;
-static gint ett_amf_messages = -1;
-static gint ett_amf_value = -1;
-static gint ett_amf_property = -1;
-static gint ett_amf_string = -1;
-static gint ett_amf_array_element = -1;
-static gint ett_amf_traits = -1;
-static gint ett_amf_trait_member = -1;
+static int proto_amf;
+
+static int hf_amf_version;
+static int hf_amf_header_count;
+static int hf_amf_header_name;
+static int hf_amf_header_must_understand;
+static int hf_amf_header_length;
+/* static int hf_amf_header_value_type; */
+static int hf_amf_message_count;
+static int hf_amf_message_target_uri;
+static int hf_amf_message_response_uri;
+static int hf_amf_message_length;
+
+static int hf_amf_amf0_type;
+static int hf_amf_amf3_type;
+static int hf_amf_number;
+static int hf_amf_integer;
+static int hf_amf_boolean;
+static int hf_amf_stringlength;
+static int hf_amf_string;
+static int hf_amf_string_reference;
+static int hf_amf_object_reference;
+static int hf_amf_date;
+/* static int hf_amf_longstringlength; */
+static int hf_amf_longstring;
+static int hf_amf_xml_doc;
+static int hf_amf_xmllength;
+static int hf_amf_xml;
+static int hf_amf_int64;
+static int hf_amf_bytearraylength;
+static int hf_amf_bytearray;
+
+static int hf_amf_object;
+static int hf_amf_traitcount;
+static int hf_amf_classnamelength;
+static int hf_amf_classname;
+static int hf_amf_membernamelength;
+static int hf_amf_membername;
+static int hf_amf_trait_reference;
+static int hf_amf_ecmaarray;
+static int hf_amf_strictarray;
+static int hf_amf_array;
+static int hf_amf_arraylength;
+static int hf_amf_arraydenselength;
+
+static int hf_amf_end_of_object_marker;
+static int hf_amf_end_of_associative_part;
+static int hf_amf_end_of_dynamic_members;
+
+static gint ett_amf;
+static gint ett_amf_headers;
+static gint ett_amf_messages;
+static gint ett_amf_value;
+static gint ett_amf_property;
+static gint ett_amf_string;
+static gint ett_amf_array_element;
+static gint ett_amf_traits;
+static gint ett_amf_trait_member;
 
 /* AMF0 type markers */
 #define AMF0_NUMBER              0x00
diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c
index 43a7d76912..703deda97e 100644
--- a/epan/dissectors/packet-rtnet.c
+++ b/epan/dissectors/packet-rtnet.c
@@ -119,112 +119,112 @@ static dissector_table_t ethertype_table;
 static dissector_handle_t data_handle;
 
 /* Define the rtnet proto */
-static int proto_rtmac = -1;
-static int proto_tdma = -1;
-static int proto_rtcfg = -1;
+static int proto_rtmac;
+static int proto_tdma;
+static int proto_rtcfg;
 
 /* RTmac Header */
-static int hf_rtmac_header_type = -1;
-static int hf_rtmac_header_ver = -1;
-static int hf_rtmac_header_flags = -1;
-static int hf_rtmac_header_flags_tunnel = -1;
-static int hf_rtmac_header_flags_res = -1;
-static int hf_rtmac_header_res_v1 = -1;
+static int hf_rtmac_header_type;
+static int hf_rtmac_header_ver;
+static int hf_rtmac_header_flags;
+static int hf_rtmac_header_flags_tunnel;
+static int hf_rtmac_header_flags_res;
+static int hf_rtmac_header_res_v1;
 
 
 /* RTcfg */
-static int hf_rtcfg_vers_id = -1;
-static int hf_rtcfg_vers = -1;
-static int hf_rtcfg_id = -1;
-static int hf_rtcfg_address_type = -1;
-static int hf_rtcfg_client_ip_address = -1;
-static int hf_rtcfg_server_ip_address = -1;
-static int hf_rtcfg_burst_rate = -1;
-static int hf_rtcfg_padding = -1;
-static int hf_rtcfg_s1_config_length = -1;
-static int hf_rtcfg_config_data = -1;
-static int hf_rtcfg_client_flags = -1;
-static int hf_rtcfg_client_flags_available = -1;
-static int hf_rtcfg_client_flags_ready = -1;
-static int hf_rtcfg_client_flags_res = -1;
-static int hf_rtcfg_server_flags = -1;
-static int hf_rtcfg_server_flags_res0 = -1;
-static int hf_rtcfg_server_flags_ready = -1;
-static int hf_rtcfg_server_flags_res2 = -1;
-static int hf_rtcfg_active_stations = -1;
-static int hf_rtcfg_heartbeat_period = -1;
-static int hf_rtcfg_s2_config_length = -1;
-static int hf_rtcfg_config_offset = -1;
-static int hf_rtcfg_ack_length = -1;
-static int hf_rtcfg_client_hw_address = -1;
+static int hf_rtcfg_vers_id;
+static int hf_rtcfg_vers;
+static int hf_rtcfg_id;
+static int hf_rtcfg_address_type;
+static int hf_rtcfg_client_ip_address;
+static int hf_rtcfg_server_ip_address;
+static int hf_rtcfg_burst_rate;
+static int hf_rtcfg_padding;
+static int hf_rtcfg_s1_config_length;
+static int hf_rtcfg_config_data;
+static int hf_rtcfg_client_flags;
+static int hf_rtcfg_client_flags_available;
+static int hf_rtcfg_client_flags_ready;
+static int hf_rtcfg_client_flags_res;
+static int hf_rtcfg_server_flags;
+static int hf_rtcfg_server_flags_res0;
+static int hf_rtcfg_server_flags_ready;
+static int hf_rtcfg_server_flags_res2;
+static int hf_rtcfg_active_stations;
+static int hf_rtcfg_heartbeat_period;
+static int hf_rtcfg_s2_config_length;
+static int hf_rtcfg_config_offset;
+static int hf_rtcfg_ack_length;
+static int hf_rtcfg_client_hw_address;
 
 
 /* TDMA-V1 */
-static int hf_tdma_v1_msg = -1;
+static int hf_tdma_v1_msg;
 
 /* TDMA REQUEST_CONF */
-static int hf_tdma_v1_msg_request_conf_station = -1;
-static int hf_tdma_v1_msg_request_conf_padding = -1;
-static int hf_tdma_v1_msg_request_conf_mtu = -1;
-static int hf_tdma_v1_msg_request_conf_cycle = -1;
+static int hf_tdma_v1_msg_request_conf_station;
+static int hf_tdma_v1_msg_request_conf_padding;
+static int hf_tdma_v1_msg_request_conf_mtu;
+static int hf_tdma_v1_msg_request_conf_cycle;
 
 /* TDMA ACK_CONF */
-static int hf_tdma_v1_msg_ack_conf_station = -1;
-static int hf_tdma_v1_msg_ack_conf_padding = -1;
-static int hf_tdma_v1_msg_ack_conf_mtu = -1;
-static int hf_tdma_v1_msg_ack_conf_cycle = -1;
+static int hf_tdma_v1_msg_ack_conf_station;
+static int hf_tdma_v1_msg_ack_conf_padding;
+static int hf_tdma_v1_msg_ack_conf_mtu;
+static int hf_tdma_v1_msg_ack_conf_cycle;
 
 /* TDMA ACK_ACK_CONF */
-static int hf_tdma_v1_msg_ack_ack_conf_station = -1;
-static int hf_tdma_v1_msg_ack_ack_conf_padding = -1;
+static int hf_tdma_v1_msg_ack_ack_conf_station;
+static int hf_tdma_v1_msg_ack_ack_conf_padding;
 
 /* TDMA REQUEST_TEST */
-static int hf_tdma_v1_msg_request_test_counter = -1;
-static int hf_tdma_v1_msg_request_test_tx = -1;
+static int hf_tdma_v1_msg_request_test_counter;
+static int hf_tdma_v1_msg_request_test_tx;
 
 /* TDMA ACK_TEST */
-static int hf_tdma_v1_msg_ack_test_counter = -1;
-static int hf_tdma_v1_msg_ack_test_tx = -1;
+static int hf_tdma_v1_msg_ack_test_counter;
+static int hf_tdma_v1_msg_ack_test_tx;
 
 /* TDMA STATION_LIST */
-static int hf_tdma_v1_msg_station_list_nr_stations = -1;
-static int hf_tdma_v1_msg_station_list_padding = -1;
+static int hf_tdma_v1_msg_station_list_nr_stations;
+static int hf_tdma_v1_msg_station_list_padding;
 
-static int hf_tdma_v1_msg_station_list_ip = -1;
-static int hf_tdma_v1_msg_station_list_nr = -1;
+static int hf_tdma_v1_msg_station_list_ip;
+static int hf_tdma_v1_msg_station_list_nr;
 
 /* TDMA CHANGE_OFFSET */
-static int hf_tdma_v1_msg_request_change_offset_offset = -1;
+static int hf_tdma_v1_msg_request_change_offset_offset;
 
 /* TDMA START_OF_FRAME */
-static int hf_tdma_v1_msg_start_of_frame_timestamp = -1;
+static int hf_tdma_v1_msg_start_of_frame_timestamp;
 
 
 /* TDMA since version 2 */
-static int hf_tdma_ver = -1;
-static int hf_tdma_id = -1;
+static int hf_tdma_ver;
+static int hf_tdma_id;
 
 /* TDMA Sync */
-static int hf_tdma_sync_cycle = -1;
-static int hf_tdma_sync_xmit_stamp = -1;
-static int hf_tdma_sync_sched_xmit = -1;
+static int hf_tdma_sync_cycle;
+static int hf_tdma_sync_xmit_stamp;
+static int hf_tdma_sync_sched_xmit;
 
 /* TDMA Request Calibration */
-static int hf_tdma_req_cal_xmit_stamp = -1;
-static int hf_tdma_req_cal_rpl_cycle = -1;
-static int hf_tdma_req_cal_rpl_slot = -1;
+static int hf_tdma_req_cal_xmit_stamp;
+static int hf_tdma_req_cal_rpl_cycle;
+static int hf_tdma_req_cal_rpl_slot;
 
 /* TDMA Reply Calibration */
-static int hf_tdma_rpl_cal_req_stamp = -1;
-static int hf_tdma_rpl_cal_rcv_stamp = -1;
-static int hf_tdma_rpl_cal_xmit_stamp = -1;
+static int hf_tdma_rpl_cal_req_stamp;
+static int hf_tdma_rpl_cal_rcv_stamp;
+static int hf_tdma_rpl_cal_xmit_stamp;
 
 
 /* Define the tree for rtnet */
-static int ett_rtmac = -1;
-static int ett_rtmac_flags = -1;
-static int ett_tdma = -1;
-static int ett_rtcfg = -1;
+static int ett_rtmac;
+static int ett_rtmac_flags;
+static int ett_tdma;
+static int ett_rtcfg;
 
 static guint
 dissect_rtnet_tdma_notify_master(tvbuff_t *tvb _U_, guint offset, proto_tree *tree _U_)
diff --git a/epan/dissectors/packet-rtp-ed137.c b/epan/dissectors/packet-rtp-ed137.c
index a4ee194089..3ca0140a3e 100644
--- a/epan/dissectors/packet-rtp-ed137.c
+++ b/epan/dissectors/packet-rtp-ed137.c
@@ -50,7 +50,7 @@ typedef struct _ed137rmm_transaction_t {
     guint8   time_quality;
 } ed137rmm_transaction_t;
 
-static int proto_rtp_ed137      = -1;
+static int proto_rtp_ed137;
 
 static dissector_handle_t rtp_hdr_ext_ed137_handle;
 static dissector_handle_t rtp_hdr_ext_ed137a_handle;
@@ -64,93 +64,93 @@ static dissector_handle_t rtp_hdr_ext_ed137c_feature_climax_ddc_mam_handle;
 static dissector_table_t rtp_hdr_ext_ed137a_add_features_table;
 
 /* RTP header ED-137 extension fields   */
-static int hf_rtp_hdr_ed137s    = -1;
-static int hf_rtp_hdr_ed137     = -1;
-static int hf_rtp_hdr_ed137_add = -1;
-static int hf_rtp_hdr_ed137_ptt_type  = -1;
-static int hf_rtp_hdr_ed137_squ       = -1;
-static int hf_rtp_hdr_ed137_ptt_id    = -1;
-static int hf_rtp_hdr_ed137_sct       = -1;
-static int hf_rtp_hdr_ed137_x         = -1;
-static int hf_rtp_hdr_ed137_x_nu      = -1;
-static int hf_rtp_hdr_ed137_ft_type   = -1;
-static int hf_rtp_hdr_ed137_ft_len    = -1;
-static int hf_rtp_hdr_ed137_ft_value  = -1;
-static int hf_rtp_hdr_ed137_ft_bss_qidx  = -1;
-static int hf_rtp_hdr_ed137_ft_bss_rssi_qidx  = -1;
-static int hf_rtp_hdr_ed137_ft_bss_qidx_ml  = -1;
-static int hf_rtp_hdr_ed137_vf  = -1;
-static int hf_rtp_hdr_ed137_ft_climax_delay_value = -1;
+static int hf_rtp_hdr_ed137s;
+static int hf_rtp_hdr_ed137;
+static int hf_rtp_hdr_ed137_add;
+static int hf_rtp_hdr_ed137_ptt_type;
+static int hf_rtp_hdr_ed137_squ;
+static int hf_rtp_hdr_ed137_ptt_id;
+static int hf_rtp_hdr_ed137_sct;
+static int hf_rtp_hdr_ed137_x;
+static int hf_rtp_hdr_ed137_x_nu;
+static int hf_rtp_hdr_ed137_ft_type;
+static int hf_rtp_hdr_ed137_ft_len;
+static int hf_rtp_hdr_ed137_ft_value;
+static int hf_rtp_hdr_ed137_ft_bss_qidx;
+static int hf_rtp_hdr_ed137_ft_bss_rssi_qidx;
+static int hf_rtp_hdr_ed137_ft_bss_qidx_ml;
+static int hf_rtp_hdr_ed137_vf;
+static int hf_rtp_hdr_ed137_ft_climax_delay_value;
 
 /* RTP header ED-137A extension fields   */
-static int hf_rtp_hdr_ed137a     = -1;
-static int hf_rtp_hdr_ed137a_add = -1;
-static int hf_rtp_hdr_ed137a_ptt_type  = -1;
-static int hf_rtp_hdr_ed137a_squ       = -1;
-static int hf_rtp_hdr_ed137a_ptt_id    = -1;
-static int hf_rtp_hdr_ed137a_pm        = -1;
-static int hf_rtp_hdr_ed137a_ptts      = -1;
-static int hf_rtp_hdr_ed137a_sct       = -1;
-static int hf_rtp_hdr_ed137a_reserved  = -1;
-static int hf_rtp_hdr_ed137a_x         = -1;
-static int hf_rtp_hdr_ed137a_x_nu      = -1;
-static int hf_rtp_hdr_ed137a_ft_type   = -1;
-static int hf_rtp_hdr_ed137a_ft_len    = -1;
-static int hf_rtp_hdr_ed137a_ft_value  = -1;
-static int hf_rtp_hdr_ed137a_ft_padding  = -1;
-static int hf_rtp_hdr_ed137a_ft_sqi_qidx  = -1;
-static int hf_rtp_hdr_ed137a_ft_sqi_rssi_qidx  = -1;
-static int hf_rtp_hdr_ed137a_ft_sqi_qidx_ml  = -1;
-static int hf_rtp_hdr_ed137a_ft_climax_delay_mode  = -1;
-static int hf_rtp_hdr_ed137a_ft_climax_delay_relative_value = -1;
-static int hf_rtp_hdr_ed137a_ft_climax_delay_absolute_value = -1;
+static int hf_rtp_hdr_ed137a;
+static int hf_rtp_hdr_ed137a_add;
+static int hf_rtp_hdr_ed137a_ptt_type;
+static int hf_rtp_hdr_ed137a_squ;
+static int hf_rtp_hdr_ed137a_ptt_id;
+static int hf_rtp_hdr_ed137a_pm;
+static int hf_rtp_hdr_ed137a_ptts;
+static int hf_rtp_hdr_ed137a_sct;
+static int hf_rtp_hdr_ed137a_reserved;
+static int hf_rtp_hdr_ed137a_x;
+static int hf_rtp_hdr_ed137a_x_nu;
+static int hf_rtp_hdr_ed137a_ft_type;
+static int hf_rtp_hdr_ed137a_ft_len;
+static int hf_rtp_hdr_ed137a_ft_value;
+static int hf_rtp_hdr_ed137a_ft_padding;
+static int hf_rtp_hdr_ed137a_ft_sqi_qidx;
+static int hf_rtp_hdr_ed137a_ft_sqi_rssi_qidx;
+static int hf_rtp_hdr_ed137a_ft_sqi_qidx_ml;
+static int hf_rtp_hdr_ed137a_ft_climax_delay_mode;
+static int hf_rtp_hdr_ed137a_ft_climax_delay_relative_value;
+static int hf_rtp_hdr_ed137a_ft_climax_delay_absolute_value;
 
 /* RTP header ED-137B extension fields   */
-static int hf_rtp_hdr_ed137b_ft_rrc_single = -1;
-static int hf_rtp_hdr_ed137b_ft_rrc_single_ms_tx_f1 = -1;
-static int hf_rtp_hdr_ed137b_ft_rrc_single_ms_rx_f1 = -1;
-static int hf_rtp_hdr_ed137b_ft_rrc_single_ms_tx_f2 = -1;
-static int hf_rtp_hdr_ed137b_ft_rrc_single_ms_rx_f2 = -1;
-static int hf_rtp_hdr_ed137b_ft_rrc_single_sel_tx_f1 = -1;
-static int hf_rtp_hdr_ed137b_ft_rrc_single_sel_tx_f2 = -1;
-static int hf_rtp_hdr_ed137b_ft_rrc_single_mu_rx_f1 = -1;
-static int hf_rtp_hdr_ed137b_ft_rrc_single_mu_rx_f2 = -1;
-static int hf_rtp_hdr_ed137b_ft_climax_ddc_rmm = -1;
-static int hf_rtp_hdr_ed137b_ft_climax_ddc_rmm_tqv = -1;
-static int hf_rtp_hdr_ed137b_ft_climax_ddc_rmm_t1 = -1;
-static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam = -1;
-static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam_tqg = -1;
-static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam_t1 = -1;
-static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam_nmr = -1;
-static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam_t2 = -1;
-static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam_tsd = -1;
-static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam_tj1 = -1;
-static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam_tid = -1;
+static int hf_rtp_hdr_ed137b_ft_rrc_single;
+static int hf_rtp_hdr_ed137b_ft_rrc_single_ms_tx_f1;
+static int hf_rtp_hdr_ed137b_ft_rrc_single_ms_rx_f1;
+static int hf_rtp_hdr_ed137b_ft_rrc_single_ms_tx_f2;
+static int hf_rtp_hdr_ed137b_ft_rrc_single_ms_rx_f2;
+static int hf_rtp_hdr_ed137b_ft_rrc_single_sel_tx_f1;
+static int hf_rtp_hdr_ed137b_ft_rrc_single_sel_tx_f2;
+static int hf_rtp_hdr_ed137b_ft_rrc_single_mu_rx_f1;
+static int hf_rtp_hdr_ed137b_ft_rrc_single_mu_rx_f2;
+static int hf_rtp_hdr_ed137b_ft_climax_ddc_rmm;
+static int hf_rtp_hdr_ed137b_ft_climax_ddc_rmm_tqv;
+static int hf_rtp_hdr_ed137b_ft_climax_ddc_rmm_t1;
+static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam;
+static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam_tqg;
+static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam_t1;
+static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam_nmr;
+static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam_t2;
+static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam_tsd;
+static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam_tj1;
+static int hf_rtp_hdr_ed137b_ft_climax_ddc_mam_tid;
 
 /* RTP header ED-137C extension fields   */
-static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam = -1;
-static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_tqg = -1;
-static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_t1 = -1;
-static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_nmr = -1;
-static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_t2 = -1;
-static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_tsd = -1;
-static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_tj1 = -1;
-static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_tid = -1;
-static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_ts2 = -1;
-
-static int hf_rtp_hdr_ed137_ft_climax_ddc_rmm_response_in = -1;
-static int hf_rtp_hdr_ed137_ft_climax_ddc_rmm_no_resp = -1;
-static int hf_rtp_hdr_ed137_ft_climax_ddc_mam_request_in = -1;
-static int hf_rtp_hdr_ed137_ft_climax_ddc_mam_time = -1;
-
-static expert_field ei_rtp_hdr_ed137_ft_climax_ddc_rmm_resp_not_found = EI_INIT;
-static expert_field ei_rtp_hdr_ed137_ft_sqi_rssi_out_of_range = EI_INIT;
-
-static gint ett_hdr_ext_ed137s  = -1;
-static gint ett_hdr_ext_ed137   = -1;
-static gint ett_hdr_ext_ed137_add = -1;
-static gint ett_hdr_ext_ed137a  = -1;
-static gint ett_hdr_ext_ed137a_add = -1;
+static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam;
+static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_tqg;
+static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_t1;
+static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_nmr;
+static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_t2;
+static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_tsd;
+static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_tj1;
+static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_tid;
+static int hf_rtp_hdr_ed137c_ft_climax_ddc_mam_ts2;
+
+static int hf_rtp_hdr_ed137_ft_climax_ddc_rmm_response_in;
+static int hf_rtp_hdr_ed137_ft_climax_ddc_rmm_no_resp;
+static int hf_rtp_hdr_ed137_ft_climax_ddc_mam_request_in;
+static int hf_rtp_hdr_ed137_ft_climax_ddc_mam_time;
+
+static expert_field ei_rtp_hdr_ed137_ft_climax_ddc_rmm_resp_not_found;
+static expert_field ei_rtp_hdr_ed137_ft_sqi_rssi_out_of_range;
+
+static gint ett_hdr_ext_ed137s;
+static gint ett_hdr_ext_ed137;
+static gint ett_hdr_ext_ed137_add;
+static gint ett_hdr_ext_ed137a;
+static gint ett_hdr_ext_ed137a_add;
 
 /* Forward declaration we need below */
 void proto_register_rtp_ed137(void);
diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c
index 15d5b8ee34..3eb2264992 100644
--- a/epan/dissectors/packet-rtp-events.c
+++ b/epan/dissectors/packet-rtp-events.c
@@ -39,14 +39,14 @@ void proto_reg_handoff_rtp_events(void);
 
 /* RTP Event Fields */
 
-static int proto_rtp_events = -1;
+static int proto_rtp_events;
 static int rtp_event_tap = -1;
 
-static int hf_rtp_events_event = -1;	/* one byte */
-static int hf_rtp_events_end = -1;	/* one bit */
-static int hf_rtp_events_reserved = -1; /* one bit */
-static int hf_rtp_events_volume = -1;	/* six bits */
-static int hf_rtp_events_duration = -1; /* sixteen bits */
+static int hf_rtp_events_event;	/* one byte */
+static int hf_rtp_events_end;	/* one bit */
+static int hf_rtp_events_reserved; /* one bit */
+static int hf_rtp_events_volume;	/* six bits */
+static int hf_rtp_events_duration; /* sixteen bits */
 
 
 #define RTP_DTMF_0	0
@@ -387,7 +387,7 @@ value_string_ext rtp_event_type_values_ext = VALUE_STRING_EXT_INIT(rtp_event_typ
 
 /* RTP Events fields defining a subtree */
 
-static gint ett_rtp_events           = -1;
+static gint ett_rtp_events;
 
 static dissector_handle_t rtp_events_handle;
 
diff --git a/epan/dissectors/packet-rtp-midi.c b/epan/dissectors/packet-rtp-midi.c
index 041a8d3a67..dd074cc253 100644
--- a/epan/dissectors/packet-rtp-midi.c
+++ b/epan/dissectors/packet-rtp-midi.c
@@ -2486,404 +2486,404 @@ static const true_false_string rtp_midi_sj_chapter_x_flag_l = {
 
 
 
-static int hf_rtp_midi_bflag					= -1;
-static int hf_rtp_midi_jflag					= -1;
-static int hf_rtp_midi_zflag					= -1;
-static int hf_rtp_midi_pflag					= -1;
-static int hf_rtp_midi_shortlen					= -1;
-static int hf_rtp_midi_longlen					= -1;
-
-static int hf_rtp_midi_sflag					= -1;
-static int hf_rtp_midi_yflag					= -1;
-static int hf_rtp_midi_aflag					= -1;
-static int hf_rtp_midi_hflag					= -1;
-static int hf_rtp_midi_totchan					= -1;
-static int hf_rtp_midi_check_seq_num				= -1;
-
-static int hf_rtp_midi_deltatime1				= -1;
-static int hf_rtp_midi_deltatime2				= -1;
-static int hf_rtp_midi_deltatime3				= -1;
-static int hf_rtp_midi_deltatime4				= -1;
-
-static int hf_rtp_midi_channel_status				= -1;
-static int hf_rtp_midi_common_status				= -1;
-static int hf_rtp_midi_channel					= -1;
-static int hf_rtp_midi_note					= -1;
-static int hf_rtp_midi_velocity					= -1;
-static int hf_rtp_midi_pressure					= -1;
-static int hf_rtp_midi_controller				= -1;
-static int hf_rtp_midi_controller_value				= -1;
-static int hf_rtp_midi_program					= -1;
-static int hf_rtp_midi_channel_pressure				= -1;
-static int hf_rtp_midi_pitch_bend				= -1;
-/* static int hf_rtp_midi_pitch_bend_truncated			= -1; */
-
-static int hf_rtp_midi_manu_short				= -1;
-static int hf_rtp_midi_manu_long				= -1;
-
-static int hf_rtp_midi_sysjour_toc_s				= -1;
-static int hf_rtp_midi_sysjour_toc_d				= -1;
-static int hf_rtp_midi_sysjour_toc_v				= -1;
-static int hf_rtp_midi_sysjour_toc_q				= -1;
-static int hf_rtp_midi_sysjour_toc_f				= -1;
-static int hf_rtp_midi_sysjour_toc_x				= -1;
-static int hf_rtp_midi_sysjour_len				= -1;
-
-static int hf_rtp_midi_chanjour_sflag				= -1;
-static int hf_rtp_midi_chanjour_chan				= -1;
-static int hf_rtp_midi_chanjour_hflag				= -1;
-static int hf_rtp_midi_chanjour_len				= -1;
-static int hf_rtp_midi_chanjour_toc_p				= -1;
-static int hf_rtp_midi_chanjour_toc_c				= -1;
-static int hf_rtp_midi_chanjour_toc_m				= -1;
-static int hf_rtp_midi_chanjour_toc_w				= -1;
-static int hf_rtp_midi_chanjour_toc_n				= -1;
-static int hf_rtp_midi_chanjour_toc_e				= -1;
-static int hf_rtp_midi_chanjour_toc_t				= -1;
-static int hf_rtp_midi_chanjour_toc_a				= -1;
-
-static int hf_rtp_midi_cj_chapter_p_sflag			= -1;
-static int hf_rtp_midi_cj_chapter_p_program			= -1;
-static int hf_rtp_midi_cj_chapter_p_bflag			= -1;
-static int hf_rtp_midi_cj_chapter_p_bank_msb			= -1;
-static int hf_rtp_midi_cj_chapter_p_xflag			= -1;
-static int hf_rtp_midi_cj_chapter_p_bank_lsb			= -1;
-
-static int hf_rtp_midi_cj_chapter_c_sflag			= -1;
-static int hf_rtp_midi_cj_chapter_c_length			= -1;
-static int hf_rtp_midi_cj_chapter_c_number			= -1;
-static int hf_rtp_midi_cj_chapter_c_aflag			= -1;
-static int hf_rtp_midi_cj_chapter_c_value			= -1;
-static int hf_rtp_midi_cj_chapter_c_tflag			= -1;
-static int hf_rtp_midi_cj_chapter_c_alt				= -1;
-
-static int hf_rtp_midi_cj_chapter_m_sflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_pflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_eflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_uflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_wflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_zflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_length			= -1;
-static int hf_rtp_midi_cj_chapter_m_qflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_pending			= -1;
-static int hf_rtp_midi_cj_chapter_m_log_sflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_log_pnum_lsb		= -1;
-static int hf_rtp_midi_cj_chapter_m_log_qflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_log_pnum_msb		= -1;
-static int hf_rtp_midi_cj_chapter_m_log_jflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_log_kflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_log_lflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_log_mflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_log_nflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_log_tflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_log_vflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_log_rflag			= -1;
-static int hf_rtp_midi_cj_chapter_m_log_msb				= -1;
-static int hf_rtp_midi_cj_chapter_m_log_msb_x			= -1;
-static int hf_rtp_midi_cj_chapter_m_log_msb_entry		= -1;
-static int hf_rtp_midi_cj_chapter_m_log_lsb				= -1;
-static int hf_rtp_midi_cj_chapter_m_log_lsb_x			= -1;
-static int hf_rtp_midi_cj_chapter_m_log_lsb_entry		= -1;
-static int hf_rtp_midi_cj_chapter_m_log_a_button_g		= -1;
-static int hf_rtp_midi_cj_chapter_m_log_a_button_x		= -1;
-static int hf_rtp_midi_cj_chapter_m_log_a_button		= -1;
-static int hf_rtp_midi_cj_chapter_m_log_a_button_full	= -1;
-static int hf_rtp_midi_cj_chapter_m_log_c_button		= -1;
-static int hf_rtp_midi_cj_chapter_m_log_c_button_g		= -1;
-static int hf_rtp_midi_cj_chapter_m_log_c_button_r		= -1;
-static int hf_rtp_midi_cj_chapter_m_log_c_button_full	= -1;
-static int hf_rtp_midi_cj_chapter_m_log_count			= -1;
-static int hf_rtp_midi_cj_chapter_m_log_count_x			= -1;
-static int hf_rtp_midi_cj_chapter_m_log_count_full		= -1;
-
-static int hf_rtp_midi_cj_chapter_w_sflag			= -1;
-static int hf_rtp_midi_cj_chapter_w_first			= -1;
-static int hf_rtp_midi_cj_chapter_w_rflag			= -1;
-static int hf_rtp_midi_cj_chapter_w_second			= -1;
-
-static int hf_rtp_midi_cj_chapter_n_bflag			= -1;
-static int hf_rtp_midi_cj_chapter_n_len				= -1;
-static int hf_rtp_midi_cj_chapter_n_low				= -1;
-static int hf_rtp_midi_cj_chapter_n_high			= -1;
-static int hf_rtp_midi_cj_chapter_n_log_sflag			= -1;
-static int hf_rtp_midi_cj_chapter_n_log_notenum			= -1;
-static int hf_rtp_midi_cj_chapter_n_log_yflag			= -1;
-static int hf_rtp_midi_cj_chapter_n_log_velocity		= -1;
-static int hf_rtp_midi_cj_chapter_n_log_octet			= -1;
-
-static int hf_rtp_midi_cj_chapter_e_sflag			= -1;
-static int hf_rtp_midi_cj_chapter_e_len				= -1;
-static int hf_rtp_midi_cj_chapter_e_log_sflag			= -1;
-static int hf_rtp_midi_cj_chapter_e_log_notenum			= -1;
-static int hf_rtp_midi_cj_chapter_e_log_vflag			= -1;
-static int hf_rtp_midi_cj_chapter_e_log_velocity		= -1;
-static int hf_rtp_midi_cj_chapter_e_log_count			= -1;
-
-static int hf_rtp_midi_cj_chapter_t_channel_aftertouch	= -1;
-static int hf_rtp_midi_cj_chapter_t_sflag				= -1;
-static int hf_rtp_midi_cj_chapter_t_pressure			= -1;
-
-static int hf_rtp_midi_cj_chapter_a_sflag			= -1;
-static int hf_rtp_midi_cj_chapter_a_len				= -1;
-static int hf_rtp_midi_cj_chapter_a_log_sflag			= -1;
-static int hf_rtp_midi_cj_chapter_a_log_notenum			= -1;
-static int hf_rtp_midi_cj_chapter_a_log_xflag			= -1;
-static int hf_rtp_midi_cj_chapter_a_log_pressure		= -1;
-
-static int hf_rtp_midi_sj_chapter_v					= -1;
-static int hf_rtp_midi_sj_chapter_v_sflag			= -1;
-static int hf_rtp_midi_sj_chapter_v_count			= -1;
-
-static int hf_rtp_midi_sj_chapter_d_simple_system_commands  = -1;
-static int hf_rtp_midi_sj_chapter_d_sflag			= -1;
-static int hf_rtp_midi_sj_chapter_d_bflag			= -1;
-static int hf_rtp_midi_sj_chapter_d_gflag			= -1;
-static int hf_rtp_midi_sj_chapter_d_hflag			= -1;
-static int hf_rtp_midi_sj_chapter_d_jflag			= -1;
-static int hf_rtp_midi_sj_chapter_d_kflag			= -1;
-static int hf_rtp_midi_sj_chapter_d_yflag			= -1;
-static int hf_rtp_midi_sj_chapter_d_zflag			= -1;
-
-static int hf_rtp_midi_sj_chapter_d_reset				= -1;
-static int hf_rtp_midi_sj_chapter_d_reset_sflag			= -1;
-static int hf_rtp_midi_sj_chapter_d_reset_count			= -1;
-static int hf_rtp_midi_sj_chapter_d_tune				= -1;
-static int hf_rtp_midi_sj_chapter_d_tune_sflag			= -1;
-static int hf_rtp_midi_sj_chapter_d_tune_count			= -1;
-static int hf_rtp_midi_sj_chapter_d_song_sel			= -1;
-static int hf_rtp_midi_sj_chapter_d_song_sel_sflag		= -1;
-static int hf_rtp_midi_sj_chapter_d_song_sel_value		= -1;
-
-static int hf_rtp_midi_sj_chapter_d_syscom_sflag		= -1;
-static int hf_rtp_midi_sj_chapter_d_syscom_cflag		= -1;
-static int hf_rtp_midi_sj_chapter_d_syscom_vflag		= -1;
-static int hf_rtp_midi_sj_chapter_d_syscom_lflag		= -1;
-static int hf_rtp_midi_sj_chapter_d_syscom_dsz			= -1;
-static int hf_rtp_midi_sj_chapter_d_syscom_length		= -1;
-static int hf_rtp_midi_sj_chapter_d_syscom_count		= -1;
-static int hf_rtp_midi_sj_chapter_d_syscom_value		= -1;
-static int hf_rtp_midi_sj_chapter_d_syscom_legal		= -1;
-static int hf_rtp_midi_sj_chapter_d_syscom_data			= -1;
-
-static int hf_rtp_midi_sj_chapter_d_sysreal_sflag		= -1;
-static int hf_rtp_midi_sj_chapter_d_sysreal_cflag		= -1;
-static int hf_rtp_midi_sj_chapter_d_sysreal_lflag		= -1;
-static int hf_rtp_midi_sj_chapter_d_sysreal_length		= -1;
-static int hf_rtp_midi_sj_chapter_d_sysreal_count		= -1;
-static int hf_rtp_midi_sj_chapter_d_sysreal_legal		= -1;
-static int hf_rtp_midi_sj_chapter_d_sysreal_data		= -1;
-
-static int hf_rtp_midi_sj_chapter_q_sflag			= -1;
-static int hf_rtp_midi_sj_chapter_q_nflag			= -1;
-static int hf_rtp_midi_sj_chapter_q_dflag			= -1;
-static int hf_rtp_midi_sj_chapter_q_cflag			= -1;
-static int hf_rtp_midi_sj_chapter_q_tflag			= -1;
-static int hf_rtp_midi_sj_chapter_q_top				= -1;
-static int hf_rtp_midi_sj_chapter_q_clock			= -1;
-static int hf_rtp_midi_sj_chapter_q_timetools			= -1;
-
-static int hf_rtp_midi_sj_chapter_f_sflag			= -1;
-static int hf_rtp_midi_sj_chapter_f_cflag			= -1;
-static int hf_rtp_midi_sj_chapter_f_pflag			= -1;
-static int hf_rtp_midi_sj_chapter_f_qflag			= -1;
-static int hf_rtp_midi_sj_chapter_f_dflag			= -1;
-static int hf_rtp_midi_sj_chapter_f_point			= -1;
-static int hf_rtp_midi_sj_chapter_f_complete		= -1;
-static int hf_rtp_midi_sj_chapter_f_partial			= -1;
-static int hf_rtp_midi_sj_chapter_f_mt0				= -1;
-static int hf_rtp_midi_sj_chapter_f_mt1				= -1;
-static int hf_rtp_midi_sj_chapter_f_mt2				= -1;
-static int hf_rtp_midi_sj_chapter_f_mt3				= -1;
-static int hf_rtp_midi_sj_chapter_f_mt4				= -1;
-static int hf_rtp_midi_sj_chapter_f_mt5				= -1;
-static int hf_rtp_midi_sj_chapter_f_mt6				= -1;
-static int hf_rtp_midi_sj_chapter_f_mt7				= -1;
-static int hf_rtp_midi_sj_chapter_f_hr				= -1;
-static int hf_rtp_midi_sj_chapter_f_mn				= -1;
-static int hf_rtp_midi_sj_chapter_f_sc				= -1;
-static int hf_rtp_midi_sj_chapter_f_fr				= -1;
-
-static int hf_rtp_midi_sj_chapter_x_sflag			= -1;
-static int hf_rtp_midi_sj_chapter_x_tflag			= -1;
-static int hf_rtp_midi_sj_chapter_x_cflag			= -1;
-static int hf_rtp_midi_sj_chapter_x_fflag			= -1;
-static int hf_rtp_midi_sj_chapter_x_dflag			= -1;
-static int hf_rtp_midi_sj_chapter_x_lflag			= -1;
-static int hf_rtp_midi_sj_chapter_x_sta				= -1;
-static int hf_rtp_midi_sj_chapter_x_tcount			= -1;
-static int hf_rtp_midi_sj_chapter_x_count			= -1;
-static int hf_rtp_midi_sj_chapter_x_first1			= -1;
-static int hf_rtp_midi_sj_chapter_x_first2			= -1;
-static int hf_rtp_midi_sj_chapter_x_first3			= -1;
-static int hf_rtp_midi_sj_chapter_x_first4			= -1;
-static int hf_rtp_midi_sj_chapter_x_data			= -1;
-static int hf_rtp_midi_sj_chapter_x_invalid_data		= -1;
-
-static int hf_rtp_midi_quarter_frame_type			= -1;
-static int hf_rtp_midi_quarter_frame_value			= -1;
-/* static int hf_rtp_midi_spp_truncated				= -1; */
-static int hf_rtp_midi_spp					= -1;
-static int hf_rtp_midi_song_select				= -1;
-static int hf_rtp_midi_manu_data				= -1;
-static int hf_rtp_midi_edu_data					= -1;
-static int hf_rtp_midi_unknown_data				= -1;
-static int hf_rtp_midi_sysex_common_non_realtime		= -1;
-static int hf_rtp_midi_sysex_common_realtime			= -1;
-static int hf_rtp_midi_sysex_common_device_id			= -1;
-
-static int hf_rtp_midi_sysex_common_nrt_mtc			= -1;
-static int hf_rtp_midi_sysex_common_nrt_sd_ext			= -1;
-static int hf_rtp_midi_sysex_common_nrt_gi			= -1;
-static int hf_rtp_midi_sysex_common_nrt_fd			= -1;
-static int hf_rtp_midi_sysex_common_tuning			= -1;
-static int hf_rtp_midi_sysex_common_nrt_gm			= -1;
-static int hf_rtp_midi_sysex_common_nrt_dls			= -1;
-
-static int hf_rtp_midi_sysex_common_rt_mtc			= -1;
-static int hf_rtp_midi_sysex_common_rt_sc			= -1;
-static int hf_rtp_midi_sysex_common_rt_ni			= -1;
-static int hf_rtp_midi_sysex_common_rt_dc			= -1;
-static int hf_rtp_midi_sysex_common_rt_mtc_cueing		= -1;
-static int hf_rtp_midi_sysex_common_rt_mmc_commands		= -1;
-static int hf_rtp_midi_sysex_common_rt_mmc_responses		= -1;
-
-static int hf_rtp_midi_sysex_common_nrt_gi_device_family	= -1;
-static int hf_rtp_midi_sysex_common_nrt_gi_device_family_member = -1;
-static int hf_rtp_midi_sysex_common_nrt_gi_software_rev		= -1;
-
-static int hf_rtp_midi_sysex_common_nrt_sd_packet_number	= -1;
-
-static int hf_rtp_midi_sysex_common_nrt_sd_header_sn		= -1;
-static int hf_rtp_midi_sysex_common_nrt_sd_header_sf		= -1;
-static int hf_rtp_midi_sysex_common_nrt_sd_header_sp		= -1;
-static int hf_rtp_midi_sysex_common_nrt_sd_header_sl		= -1;
-static int hf_rtp_midi_sysex_common_nrt_sd_header_ls		= -1;
-static int hf_rtp_midi_sysex_common_nrt_sd_header_le		= -1;
-static int hf_rtp_midi_sysex_common_nrt_sd_header_lt		= -1;
-
-static int hf_rtp_midi_sysex_common_nrt_sd_packet_count		= -1;
-static int hf_rtp_midi_sysex_common_nrt_sd_packet_check		= -1;
-static int hf_rtp_midi_sysex_common_nrt_sd_packet_data		= -1;
-
-static int hf_rtp_midi_sysex_common_nrt_sd_ext_ln		= -1;
-
-static int hf_rtp_midi_sysex_common_nrt_fd_device_id		= -1;
-static int hf_rtp_midi_sysex_common_nrt_fd_type			= -1;
-static int hf_rtp_midi_sysex_common_nrt_fd_name			= -1;
-static int hf_rtp_midi_sysex_common_nrt_fd_length		= -1;
-static int hf_rtp_midi_sysex_common_nrt_fd_packet_num		= -1;
-static int hf_rtp_midi_sysex_common_nrt_fd_byte_count		= -1;
-static int hf_rtp_midi_sysex_common_nrt_fd_packet_data		= -1;
-static int hf_rtp_midi_sysex_common_nrt_fd_checksum		= -1;
-
-static int hf_rtp_midi_sysex_common_tune_program		= -1;
-static int hf_rtp_midi_sysex_common_tune_name			= -1;
-static int hf_rtp_midi_sysex_common_tune_freq			= -1;
-static int hf_rtp_midi_sysex_common_tune_checksum		= -1;
-static int hf_rtp_midi_sysex_common_tune_changes		= -1;
-static int hf_rtp_midi_sysex_common_tune_note			= -1;
-
-static int hf_rtp_midi_sysex_common_rt_mtc_fm_type		= -1;
-static int hf_rtp_midi_sysex_common_rt_mtc_fm_hr		= -1;
-static int hf_rtp_midi_sysex_common_rt_mtc_fm_mn		= -1;
-static int hf_rtp_midi_sysex_common_rt_mtc_fm_sc		= -1;
-static int hf_rtp_midi_sysex_common_rt_mtc_fm_fr		= -1;
-
-static int hf_rtp_midi_sysex_common_rt_mtc_ub_u1		= -1;
-static int hf_rtp_midi_sysex_common_rt_mtc_ub_u2		= -1;
-static int hf_rtp_midi_sysex_common_rt_mtc_ub_u3		= -1;
-static int hf_rtp_midi_sysex_common_rt_mtc_ub_u4		= -1;
-static int hf_rtp_midi_sysex_common_rt_mtc_ub_u5		= -1;
-static int hf_rtp_midi_sysex_common_rt_mtc_ub_u6		= -1;
-static int hf_rtp_midi_sysex_common_rt_mtc_ub_u7		= -1;
-static int hf_rtp_midi_sysex_common_rt_mtc_ub_u8		= -1;
-static int hf_rtp_midi_sysex_common_rt_mtc_ub_u9		= -1;
-
-static int hf_rtp_midi_sysex_common_nrt_mtc_type		= -1;
-static int hf_rtp_midi_sysex_common_nrt_mtc_hr			= -1;
-static int hf_rtp_midi_sysex_common_nrt_mtc_mn			= -1;
-static int hf_rtp_midi_sysex_common_nrt_mtc_sc			= -1;
-static int hf_rtp_midi_sysex_common_nrt_mtc_fr			= -1;
-static int hf_rtp_midi_sysex_common_nrt_mtc_ff			= -1;
-static int hf_rtp_midi_sysex_common_nrt_mtc_enl			= -1;
-static int hf_rtp_midi_sysex_common_nrt_mtc_enm			= -1;
-static int hf_rtp_midi_sysex_common_nrt_mtc_add			= -1;
-
-static int hf_rtp_midi_sysex_common_rt_mtc_cue_enl		= -1;
-static int hf_rtp_midi_sysex_common_rt_mtc_cue_enm		= -1;
-static int hf_rtp_midi_sysex_common_rt_mtc_cue_add		= -1;
-
-static int hf_rtp_midi_sysex_common_rt_ni_bar_num		= -1;
-static int hf_rtp_midi_sysex_common_rt_ni_bytes			= -1;
-static int hf_rtp_midi_sysex_common_rt_ni_numerator		= -1;
-static int hf_rtp_midi_sysex_common_rt_ni_denominator		= -1;
-static int hf_rtp_midi_sysex_common_rt_ni_midi_clocks		= -1;
-static int hf_rtp_midi_sysex_common_rt_ni_32nds			= -1;
-
-static int hf_rtp_midi_sysex_common_rt_dc_volume		= -1;
-static int hf_rtp_midi_sysex_common_rt_dc_balance		= -1;
+static int hf_rtp_midi_bflag;
+static int hf_rtp_midi_jflag;
+static int hf_rtp_midi_zflag;
+static int hf_rtp_midi_pflag;
+static int hf_rtp_midi_shortlen;
+static int hf_rtp_midi_longlen;
+
+static int hf_rtp_midi_sflag;
+static int hf_rtp_midi_yflag;
+static int hf_rtp_midi_aflag;
+static int hf_rtp_midi_hflag;
+static int hf_rtp_midi_totchan;
+static int hf_rtp_midi_check_seq_num;
+
+static int hf_rtp_midi_deltatime1;
+static int hf_rtp_midi_deltatime2;
+static int hf_rtp_midi_deltatime3;
+static int hf_rtp_midi_deltatime4;
+
+static int hf_rtp_midi_channel_status;
+static int hf_rtp_midi_common_status;
+static int hf_rtp_midi_channel;
+static int hf_rtp_midi_note;
+static int hf_rtp_midi_velocity;
+static int hf_rtp_midi_pressure;
+static int hf_rtp_midi_controller;
+static int hf_rtp_midi_controller_value;
+static int hf_rtp_midi_program;
+static int hf_rtp_midi_channel_pressure;
+static int hf_rtp_midi_pitch_bend;
+/* static int hf_rtp_midi_pitch_bend_truncated; */
+
+static int hf_rtp_midi_manu_short;
+static int hf_rtp_midi_manu_long;
+
+static int hf_rtp_midi_sysjour_toc_s;
+static int hf_rtp_midi_sysjour_toc_d;
+static int hf_rtp_midi_sysjour_toc_v;
+static int hf_rtp_midi_sysjour_toc_q;
+static int hf_rtp_midi_sysjour_toc_f;
+static int hf_rtp_midi_sysjour_toc_x;
+static int hf_rtp_midi_sysjour_len;
+
+static int hf_rtp_midi_chanjour_sflag;
+static int hf_rtp_midi_chanjour_chan;
+static int hf_rtp_midi_chanjour_hflag;
+static int hf_rtp_midi_chanjour_len;
+static int hf_rtp_midi_chanjour_toc_p;
+static int hf_rtp_midi_chanjour_toc_c;
+static int hf_rtp_midi_chanjour_toc_m;
+static int hf_rtp_midi_chanjour_toc_w;
+static int hf_rtp_midi_chanjour_toc_n;
+static int hf_rtp_midi_chanjour_toc_e;
+static int hf_rtp_midi_chanjour_toc_t;
+static int hf_rtp_midi_chanjour_toc_a;
+
+static int hf_rtp_midi_cj_chapter_p_sflag;
+static int hf_rtp_midi_cj_chapter_p_program;
+static int hf_rtp_midi_cj_chapter_p_bflag;
+static int hf_rtp_midi_cj_chapter_p_bank_msb;
+static int hf_rtp_midi_cj_chapter_p_xflag;
+static int hf_rtp_midi_cj_chapter_p_bank_lsb;
+
+static int hf_rtp_midi_cj_chapter_c_sflag;
+static int hf_rtp_midi_cj_chapter_c_length;
+static int hf_rtp_midi_cj_chapter_c_number;
+static int hf_rtp_midi_cj_chapter_c_aflag;
+static int hf_rtp_midi_cj_chapter_c_value;
+static int hf_rtp_midi_cj_chapter_c_tflag;
+static int hf_rtp_midi_cj_chapter_c_alt;
+
+static int hf_rtp_midi_cj_chapter_m_sflag;
+static int hf_rtp_midi_cj_chapter_m_pflag;
+static int hf_rtp_midi_cj_chapter_m_eflag;
+static int hf_rtp_midi_cj_chapter_m_uflag;
+static int hf_rtp_midi_cj_chapter_m_wflag;
+static int hf_rtp_midi_cj_chapter_m_zflag;
+static int hf_rtp_midi_cj_chapter_m_length;
+static int hf_rtp_midi_cj_chapter_m_qflag;
+static int hf_rtp_midi_cj_chapter_m_pending;
+static int hf_rtp_midi_cj_chapter_m_log_sflag;
+static int hf_rtp_midi_cj_chapter_m_log_pnum_lsb;
+static int hf_rtp_midi_cj_chapter_m_log_qflag;
+static int hf_rtp_midi_cj_chapter_m_log_pnum_msb;
+static int hf_rtp_midi_cj_chapter_m_log_jflag;
+static int hf_rtp_midi_cj_chapter_m_log_kflag;
+static int hf_rtp_midi_cj_chapter_m_log_lflag;
+static int hf_rtp_midi_cj_chapter_m_log_mflag;
+static int hf_rtp_midi_cj_chapter_m_log_nflag;
+static int hf_rtp_midi_cj_chapter_m_log_tflag;
+static int hf_rtp_midi_cj_chapter_m_log_vflag;
+static int hf_rtp_midi_cj_chapter_m_log_rflag;
+static int hf_rtp_midi_cj_chapter_m_log_msb;
+static int hf_rtp_midi_cj_chapter_m_log_msb_x;
+static int hf_rtp_midi_cj_chapter_m_log_msb_entry;
+static int hf_rtp_midi_cj_chapter_m_log_lsb;
+static int hf_rtp_midi_cj_chapter_m_log_lsb_x;
+static int hf_rtp_midi_cj_chapter_m_log_lsb_entry;
+static int hf_rtp_midi_cj_chapter_m_log_a_button_g;
+static int hf_rtp_midi_cj_chapter_m_log_a_button_x;
+static int hf_rtp_midi_cj_chapter_m_log_a_button;
+static int hf_rtp_midi_cj_chapter_m_log_a_button_full;
+static int hf_rtp_midi_cj_chapter_m_log_c_button;
+static int hf_rtp_midi_cj_chapter_m_log_c_button_g;
+static int hf_rtp_midi_cj_chapter_m_log_c_button_r;
+static int hf_rtp_midi_cj_chapter_m_log_c_button_full;
+static int hf_rtp_midi_cj_chapter_m_log_count;
+static int hf_rtp_midi_cj_chapter_m_log_count_x;
+static int hf_rtp_midi_cj_chapter_m_log_count_full;
+
+static int hf_rtp_midi_cj_chapter_w_sflag;
+static int hf_rtp_midi_cj_chapter_w_first;
+static int hf_rtp_midi_cj_chapter_w_rflag;
+static int hf_rtp_midi_cj_chapter_w_second;
+
+static int hf_rtp_midi_cj_chapter_n_bflag;
+static int hf_rtp_midi_cj_chapter_n_len;
+static int hf_rtp_midi_cj_chapter_n_low;
+static int hf_rtp_midi_cj_chapter_n_high;
+static int hf_rtp_midi_cj_chapter_n_log_sflag;
+static int hf_rtp_midi_cj_chapter_n_log_notenum;
+static int hf_rtp_midi_cj_chapter_n_log_yflag;
+static int hf_rtp_midi_cj_chapter_n_log_velocity;
+static int hf_rtp_midi_cj_chapter_n_log_octet;
+
+static int hf_rtp_midi_cj_chapter_e_sflag;
+static int hf_rtp_midi_cj_chapter_e_len;
+static int hf_rtp_midi_cj_chapter_e_log_sflag;
+static int hf_rtp_midi_cj_chapter_e_log_notenum;
+static int hf_rtp_midi_cj_chapter_e_log_vflag;
+static int hf_rtp_midi_cj_chapter_e_log_velocity;
+static int hf_rtp_midi_cj_chapter_e_log_count;
+
+static int hf_rtp_midi_cj_chapter_t_channel_aftertouch;
+static int hf_rtp_midi_cj_chapter_t_sflag;
+static int hf_rtp_midi_cj_chapter_t_pressure;
+
+static int hf_rtp_midi_cj_chapter_a_sflag;
+static int hf_rtp_midi_cj_chapter_a_len;
+static int hf_rtp_midi_cj_chapter_a_log_sflag;
+static int hf_rtp_midi_cj_chapter_a_log_notenum;
+static int hf_rtp_midi_cj_chapter_a_log_xflag;
+static int hf_rtp_midi_cj_chapter_a_log_pressure;
+
+static int hf_rtp_midi_sj_chapter_v;
+static int hf_rtp_midi_sj_chapter_v_sflag;
+static int hf_rtp_midi_sj_chapter_v_count;
+
+static int hf_rtp_midi_sj_chapter_d_simple_system_commands;
+static int hf_rtp_midi_sj_chapter_d_sflag;
+static int hf_rtp_midi_sj_chapter_d_bflag;
+static int hf_rtp_midi_sj_chapter_d_gflag;
+static int hf_rtp_midi_sj_chapter_d_hflag;
+static int hf_rtp_midi_sj_chapter_d_jflag;
+static int hf_rtp_midi_sj_chapter_d_kflag;
+static int hf_rtp_midi_sj_chapter_d_yflag;
+static int hf_rtp_midi_sj_chapter_d_zflag;
+
+static int hf_rtp_midi_sj_chapter_d_reset;
+static int hf_rtp_midi_sj_chapter_d_reset_sflag;
+static int hf_rtp_midi_sj_chapter_d_reset_count;
+static int hf_rtp_midi_sj_chapter_d_tune;
+static int hf_rtp_midi_sj_chapter_d_tune_sflag;
+static int hf_rtp_midi_sj_chapter_d_tune_count;
+static int hf_rtp_midi_sj_chapter_d_song_sel;
+static int hf_rtp_midi_sj_chapter_d_song_sel_sflag;
+static int hf_rtp_midi_sj_chapter_d_song_sel_value;
+
+static int hf_rtp_midi_sj_chapter_d_syscom_sflag;
+static int hf_rtp_midi_sj_chapter_d_syscom_cflag;
+static int hf_rtp_midi_sj_chapter_d_syscom_vflag;
+static int hf_rtp_midi_sj_chapter_d_syscom_lflag;
+static int hf_rtp_midi_sj_chapter_d_syscom_dsz;
+static int hf_rtp_midi_sj_chapter_d_syscom_length;
+static int hf_rtp_midi_sj_chapter_d_syscom_count;
+static int hf_rtp_midi_sj_chapter_d_syscom_value;
+static int hf_rtp_midi_sj_chapter_d_syscom_legal;
+static int hf_rtp_midi_sj_chapter_d_syscom_data;
+
+static int hf_rtp_midi_sj_chapter_d_sysreal_sflag;
+static int hf_rtp_midi_sj_chapter_d_sysreal_cflag;
+static int hf_rtp_midi_sj_chapter_d_sysreal_lflag;
+static int hf_rtp_midi_sj_chapter_d_sysreal_length;
+static int hf_rtp_midi_sj_chapter_d_sysreal_count;
+static int hf_rtp_midi_sj_chapter_d_sysreal_legal;
+static int hf_rtp_midi_sj_chapter_d_sysreal_data;
+
+static int hf_rtp_midi_sj_chapter_q_sflag;
+static int hf_rtp_midi_sj_chapter_q_nflag;
+static int hf_rtp_midi_sj_chapter_q_dflag;
+static int hf_rtp_midi_sj_chapter_q_cflag;
+static int hf_rtp_midi_sj_chapter_q_tflag;
+static int hf_rtp_midi_sj_chapter_q_top;
+static int hf_rtp_midi_sj_chapter_q_clock;
+static int hf_rtp_midi_sj_chapter_q_timetools;
+
+static int hf_rtp_midi_sj_chapter_f_sflag;
+static int hf_rtp_midi_sj_chapter_f_cflag;
+static int hf_rtp_midi_sj_chapter_f_pflag;
+static int hf_rtp_midi_sj_chapter_f_qflag;
+static int hf_rtp_midi_sj_chapter_f_dflag;
+static int hf_rtp_midi_sj_chapter_f_point;
+static int hf_rtp_midi_sj_chapter_f_complete;
+static int hf_rtp_midi_sj_chapter_f_partial;
+static int hf_rtp_midi_sj_chapter_f_mt0;
+static int hf_rtp_midi_sj_chapter_f_mt1;
+static int hf_rtp_midi_sj_chapter_f_mt2;
+static int hf_rtp_midi_sj_chapter_f_mt3;
+static int hf_rtp_midi_sj_chapter_f_mt4;
+static int hf_rtp_midi_sj_chapter_f_mt5;
+static int hf_rtp_midi_sj_chapter_f_mt6;
+static int hf_rtp_midi_sj_chapter_f_mt7;
+static int hf_rtp_midi_sj_chapter_f_hr;
+static int hf_rtp_midi_sj_chapter_f_mn;
+static int hf_rtp_midi_sj_chapter_f_sc;
+static int hf_rtp_midi_sj_chapter_f_fr;
+
+static int hf_rtp_midi_sj_chapter_x_sflag;
+static int hf_rtp_midi_sj_chapter_x_tflag;
+static int hf_rtp_midi_sj_chapter_x_cflag;
+static int hf_rtp_midi_sj_chapter_x_fflag;
+static int hf_rtp_midi_sj_chapter_x_dflag;
+static int hf_rtp_midi_sj_chapter_x_lflag;
+static int hf_rtp_midi_sj_chapter_x_sta;
+static int hf_rtp_midi_sj_chapter_x_tcount;
+static int hf_rtp_midi_sj_chapter_x_count;
+static int hf_rtp_midi_sj_chapter_x_first1;
+static int hf_rtp_midi_sj_chapter_x_first2;
+static int hf_rtp_midi_sj_chapter_x_first3;
+static int hf_rtp_midi_sj_chapter_x_first4;
+static int hf_rtp_midi_sj_chapter_x_data;
+static int hf_rtp_midi_sj_chapter_x_invalid_data;
+
+static int hf_rtp_midi_quarter_frame_type;
+static int hf_rtp_midi_quarter_frame_value;
+/* static int hf_rtp_midi_spp_truncated; */
+static int hf_rtp_midi_spp;
+static int hf_rtp_midi_song_select;
+static int hf_rtp_midi_manu_data;
+static int hf_rtp_midi_edu_data;
+static int hf_rtp_midi_unknown_data;
+static int hf_rtp_midi_sysex_common_non_realtime;
+static int hf_rtp_midi_sysex_common_realtime;
+static int hf_rtp_midi_sysex_common_device_id;
+
+static int hf_rtp_midi_sysex_common_nrt_mtc;
+static int hf_rtp_midi_sysex_common_nrt_sd_ext;
+static int hf_rtp_midi_sysex_common_nrt_gi;
+static int hf_rtp_midi_sysex_common_nrt_fd;
+static int hf_rtp_midi_sysex_common_tuning;
+static int hf_rtp_midi_sysex_common_nrt_gm;
+static int hf_rtp_midi_sysex_common_nrt_dls;
+
+static int hf_rtp_midi_sysex_common_rt_mtc;
+static int hf_rtp_midi_sysex_common_rt_sc;
+static int hf_rtp_midi_sysex_common_rt_ni;
+static int hf_rtp_midi_sysex_common_rt_dc;
+static int hf_rtp_midi_sysex_common_rt_mtc_cueing;
+static int hf_rtp_midi_sysex_common_rt_mmc_commands;
+static int hf_rtp_midi_sysex_common_rt_mmc_responses;
+
+static int hf_rtp_midi_sysex_common_nrt_gi_device_family;
+static int hf_rtp_midi_sysex_common_nrt_gi_device_family_member;
+static int hf_rtp_midi_sysex_common_nrt_gi_software_rev;
+
+static int hf_rtp_midi_sysex_common_nrt_sd_packet_number;
+
+static int hf_rtp_midi_sysex_common_nrt_sd_header_sn;
+static int hf_rtp_midi_sysex_common_nrt_sd_header_sf;
+static int hf_rtp_midi_sysex_common_nrt_sd_header_sp;
+static int hf_rtp_midi_sysex_common_nrt_sd_header_sl;
+static int hf_rtp_midi_sysex_common_nrt_sd_header_ls;
+static int hf_rtp_midi_sysex_common_nrt_sd_header_le;
+static int hf_rtp_midi_sysex_common_nrt_sd_header_lt;
+
+static int hf_rtp_midi_sysex_common_nrt_sd_packet_count;
+static int hf_rtp_midi_sysex_common_nrt_sd_packet_check;
+static int hf_rtp_midi_sysex_common_nrt_sd_packet_data;
+
+static int hf_rtp_midi_sysex_common_nrt_sd_ext_ln;
+
+static int hf_rtp_midi_sysex_common_nrt_fd_device_id;
+static int hf_rtp_midi_sysex_common_nrt_fd_type;
+static int hf_rtp_midi_sysex_common_nrt_fd_name;
+static int hf_rtp_midi_sysex_common_nrt_fd_length;
+static int hf_rtp_midi_sysex_common_nrt_fd_packet_num;
+static int hf_rtp_midi_sysex_common_nrt_fd_byte_count;
+static int hf_rtp_midi_sysex_common_nrt_fd_packet_data;
+static int hf_rtp_midi_sysex_common_nrt_fd_checksum;
+
+static int hf_rtp_midi_sysex_common_tune_program;
+static int hf_rtp_midi_sysex_common_tune_name;
+static int hf_rtp_midi_sysex_common_tune_freq;
+static int hf_rtp_midi_sysex_common_tune_checksum;
+static int hf_rtp_midi_sysex_common_tune_changes;
+static int hf_rtp_midi_sysex_common_tune_note;
+
+static int hf_rtp_midi_sysex_common_rt_mtc_fm_type;
+static int hf_rtp_midi_sysex_common_rt_mtc_fm_hr;
+static int hf_rtp_midi_sysex_common_rt_mtc_fm_mn;
+static int hf_rtp_midi_sysex_common_rt_mtc_fm_sc;
+static int hf_rtp_midi_sysex_common_rt_mtc_fm_fr;
+
+static int hf_rtp_midi_sysex_common_rt_mtc_ub_u1;
+static int hf_rtp_midi_sysex_common_rt_mtc_ub_u2;
+static int hf_rtp_midi_sysex_common_rt_mtc_ub_u3;
+static int hf_rtp_midi_sysex_common_rt_mtc_ub_u4;
+static int hf_rtp_midi_sysex_common_rt_mtc_ub_u5;
+static int hf_rtp_midi_sysex_common_rt_mtc_ub_u6;
+static int hf_rtp_midi_sysex_common_rt_mtc_ub_u7;
+static int hf_rtp_midi_sysex_common_rt_mtc_ub_u8;
+static int hf_rtp_midi_sysex_common_rt_mtc_ub_u9;
+
+static int hf_rtp_midi_sysex_common_nrt_mtc_type;
+static int hf_rtp_midi_sysex_common_nrt_mtc_hr;
+static int hf_rtp_midi_sysex_common_nrt_mtc_mn;
+static int hf_rtp_midi_sysex_common_nrt_mtc_sc;
+static int hf_rtp_midi_sysex_common_nrt_mtc_fr;
+static int hf_rtp_midi_sysex_common_nrt_mtc_ff;
+static int hf_rtp_midi_sysex_common_nrt_mtc_enl;
+static int hf_rtp_midi_sysex_common_nrt_mtc_enm;
+static int hf_rtp_midi_sysex_common_nrt_mtc_add;
+
+static int hf_rtp_midi_sysex_common_rt_mtc_cue_enl;
+static int hf_rtp_midi_sysex_common_rt_mtc_cue_enm;
+static int hf_rtp_midi_sysex_common_rt_mtc_cue_add;
+
+static int hf_rtp_midi_sysex_common_rt_ni_bar_num;
+static int hf_rtp_midi_sysex_common_rt_ni_bytes;
+static int hf_rtp_midi_sysex_common_rt_ni_numerator;
+static int hf_rtp_midi_sysex_common_rt_ni_denominator;
+static int hf_rtp_midi_sysex_common_rt_ni_midi_clocks;
+static int hf_rtp_midi_sysex_common_rt_ni_32nds;
+
+static int hf_rtp_midi_sysex_common_rt_dc_volume;
+static int hf_rtp_midi_sysex_common_rt_dc_balance;
 
 
 /* RTP MIDI fields defining a subtree */
 
-static gint ett_rtp_midi					= -1;
-static gint ett_rtp_midi_commands				= -1;
-static gint ett_rtp_midi_journal				= -1;
-static gint ett_rtp_midi_command				= -1;
-static gint ett_rtp_midi_systemjournal				= -1;
-static gint ett_rtp_midi_channeljournals			= -1;
-static gint ett_rtp_midi_systemchapters				= -1;
-static gint ett_rtp_midi_sj_chapter_d				= -1;
-static gint ett_rtp_midi_sj_chapter_d_field_b			= -1;
-static gint ett_rtp_midi_sj_chapter_d_field_g			= -1;
-static gint ett_rtp_midi_sj_chapter_d_field_h			= -1;
-static gint ett_rtp_midi_sj_chapter_d_field_j			= -1;
-static gint ett_rtp_midi_sj_chapter_d_field_k			= -1;
-static gint ett_rtp_midi_sj_chapter_d_field_y			= -1;
-static gint ett_rtp_midi_sj_chapter_d_field_z			= -1;
-static gint ett_rtp_midi_sj_chapter_v				= -1;
-static gint ett_rtp_midi_sj_chapter_q				= -1;
-static gint ett_rtp_midi_sj_chapter_f				= -1;
-static gint ett_rtp_midi_sj_chapter_f_complete			= -1;
-static gint ett_rtp_midi_sj_chapter_f_partial			= -1;
-static gint ett_rtp_midi_sj_chapter_x				= -1;
-static gint ett_rtp_midi_sj_chapter_x_first			= -1;
-static gint ett_rtp_midi_sj_chapter_x_data			= -1;
-static gint ett_rtp_midi_channeljournal				= -1;
-static gint ett_rtp_midi_channelchapters			= -1;
-static gint ett_rtp_midi_cj_chapter_p				= -1;
-static gint ett_rtp_midi_cj_chapter_c				= -1;
-static gint ett_rtp_midi_cj_chapter_c_loglist			= -1;
-static gint ett_rtp_midi_cj_chapter_c_logitem			= -1;
-static gint ett_rtp_midi_cj_chapter_m				= -1;
-static gint ett_rtp_midi_cj_chapter_m_loglist			= -1;
-static gint ett_rtp_midi_cj_chapter_m_logitem			= -1;
-static gint ett_rtp_midi_cj_chapter_m_log_msb			= -1;
-static gint ett_rtp_midi_cj_chapter_m_log_lsb			= -1;
-static gint ett_rtp_midi_cj_chapter_m_log_a_button		= -1;
-static gint ett_rtp_midi_cj_chapter_m_log_c_button		= -1;
-static gint ett_rtp_midi_cj_chapter_m_log_count			= -1;
-static gint ett_rtp_midi_cj_chapter_w				= -1;
-static gint ett_rtp_midi_cj_chapter_n				= -1;
-static gint ett_rtp_midi_cj_chapter_n_loglist			= -1;
-static gint ett_rtp_midi_cj_chapter_n_logitem			= -1;
-static gint ett_rtp_midi_cj_chapter_n_octets			= -1;
-static gint ett_rtp_midi_cj_chapter_e				= -1;
-static gint ett_rtp_midi_cj_chapter_e_loglist			= -1;
-static gint ett_rtp_midi_cj_chapter_e_logitem			= -1;
-static gint ett_rtp_midi_cj_chapter_t				= -1;
-static gint ett_rtp_midi_cj_chapter_a				= -1;
-static gint ett_rtp_midi_cj_chapter_a_loglist			= -1;
-static gint ett_rtp_midi_cj_chapter_a_logitem			= -1;
-static gint ett_rtp_midi_sysex_data				= -1;
-static gint ett_rtp_midi_sysex_edu				= -1;
-static gint ett_rtp_midi_sysex_manu				= -1;
-static gint ett_rtp_midi_sysex_common_rt			= -1;
-static gint ett_rtp_midi_sysex_common_nrt			= -1;
-static gint ett_rtp_midi_sysex_common_tune_note			= -1;
-
-
-static int proto_rtp_midi			= -1;
+static gint ett_rtp_midi;
+static gint ett_rtp_midi_commands;
+static gint ett_rtp_midi_journal;
+static gint ett_rtp_midi_command;
+static gint ett_rtp_midi_systemjournal;
+static gint ett_rtp_midi_channeljournals;
+static gint ett_rtp_midi_systemchapters;
+static gint ett_rtp_midi_sj_chapter_d;
+static gint ett_rtp_midi_sj_chapter_d_field_b;
+static gint ett_rtp_midi_sj_chapter_d_field_g;
+static gint ett_rtp_midi_sj_chapter_d_field_h;
+static gint ett_rtp_midi_sj_chapter_d_field_j;
+static gint ett_rtp_midi_sj_chapter_d_field_k;
+static gint ett_rtp_midi_sj_chapter_d_field_y;
+static gint ett_rtp_midi_sj_chapter_d_field_z;
+static gint ett_rtp_midi_sj_chapter_v;
+static gint ett_rtp_midi_sj_chapter_q;
+static gint ett_rtp_midi_sj_chapter_f;
+static gint ett_rtp_midi_sj_chapter_f_complete;
+static gint ett_rtp_midi_sj_chapter_f_partial;
+static gint ett_rtp_midi_sj_chapter_x;
+static gint ett_rtp_midi_sj_chapter_x_first;
+static gint ett_rtp_midi_sj_chapter_x_data;
+static gint ett_rtp_midi_channeljournal;
+static gint ett_rtp_midi_channelchapters;
+static gint ett_rtp_midi_cj_chapter_p;
+static gint ett_rtp_midi_cj_chapter_c;
+static gint ett_rtp_midi_cj_chapter_c_loglist;
+static gint ett_rtp_midi_cj_chapter_c_logitem;
+static gint ett_rtp_midi_cj_chapter_m;
+static gint ett_rtp_midi_cj_chapter_m_loglist;
+static gint ett_rtp_midi_cj_chapter_m_logitem;
+static gint ett_rtp_midi_cj_chapter_m_log_msb;
+static gint ett_rtp_midi_cj_chapter_m_log_lsb;
+static gint ett_rtp_midi_cj_chapter_m_log_a_button;
+static gint ett_rtp_midi_cj_chapter_m_log_c_button;
+static gint ett_rtp_midi_cj_chapter_m_log_count;
+static gint ett_rtp_midi_cj_chapter_w;
+static gint ett_rtp_midi_cj_chapter_n;
+static gint ett_rtp_midi_cj_chapter_n_loglist;
+static gint ett_rtp_midi_cj_chapter_n_logitem;
+static gint ett_rtp_midi_cj_chapter_n_octets;
+static gint ett_rtp_midi_cj_chapter_e;
+static gint ett_rtp_midi_cj_chapter_e_loglist;
+static gint ett_rtp_midi_cj_chapter_e_logitem;
+static gint ett_rtp_midi_cj_chapter_t;
+static gint ett_rtp_midi_cj_chapter_a;
+static gint ett_rtp_midi_cj_chapter_a_loglist;
+static gint ett_rtp_midi_cj_chapter_a_logitem;
+static gint ett_rtp_midi_sysex_data;
+static gint ett_rtp_midi_sysex_edu;
+static gint ett_rtp_midi_sysex_manu;
+static gint ett_rtp_midi_sysex_common_rt;
+static gint ett_rtp_midi_sysex_common_nrt;
+static gint ett_rtp_midi_sysex_common_tune_note;
+
+
+static int proto_rtp_midi;
 
 
 static dissector_handle_t	rtp_midi_handle;
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index 5f8ffaf659..ea7660fe6a 100644
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -138,19 +138,19 @@ struct _rtp_dyn_payload_t
 
 static reassembly_table rtp_reassembly_table;
 
-static int hf_rtp_fragments = -1;
-static int hf_rtp_fragment = -1;
-static int hf_rtp_fragment_overlap = -1;
-static int hf_rtp_fragment_overlap_conflict = -1;
-static int hf_rtp_fragment_multiple_tails = -1;
-static int hf_rtp_fragment_too_long_fragment = -1;
-static int hf_rtp_fragment_error = -1;
-static int hf_rtp_fragment_count = -1;
-static int hf_rtp_reassembled_in = -1;
-static int hf_rtp_reassembled_length = -1;
-
-static gint ett_rtp_fragment = -1;
-static gint ett_rtp_fragments = -1;
+static int hf_rtp_fragments;
+static int hf_rtp_fragment;
+static int hf_rtp_fragment_overlap;
+static int hf_rtp_fragment_overlap_conflict;
+static int hf_rtp_fragment_multiple_tails;
+static int hf_rtp_fragment_too_long_fragment;
+static int hf_rtp_fragment_error;
+static int hf_rtp_fragment_count;
+static int hf_rtp_reassembled_in;
+static int hf_rtp_reassembled_length;
+
+static gint ett_rtp_fragment;
+static gint ett_rtp_fragments;
 
 static const fragment_items rtp_fragment_items = {
     &ett_rtp_fragment,
@@ -200,76 +200,76 @@ static dissector_table_t rtp_hdr_ext_dissector_table;
 static dissector_table_t rtp_hdr_ext_rfc5285_dissector_table;
 
 /* Used for storing data to be retreived by the SDP dissector*/
-static int proto_sdp = -1;
+static int proto_sdp;
 
 /* RTP header fields             */
-static int proto_rtp           = -1;
-static int proto_rtp_rfc2198   = -1;
-static int hf_rtp_version      = -1;
-static int hf_rtp_padding      = -1;
-static int hf_rtp_extension    = -1;
-static int hf_rtp_csrc_count   = -1;
-static int hf_rtp_marker       = -1;
-static int hf_rtp_payload_type = -1;
-static int hf_rtp_seq_nr       = -1;
-static int hf_rtp_ext_seq_nr   = -1;
-static int hf_rtp_timestamp    = -1;
-static int hf_rtp_ssrc         = -1;
-static int hf_rtp_csrc_items   = -1;
-static int hf_rtp_csrc_item    = -1;
-static int hf_rtp_data         = -1;
-static int hf_rtp_padding_data = -1;
-static int hf_rtp_padding_count= -1;
-static int hf_rtp_rfc2198_follow= -1;
-static int hf_rtp_rfc2198_tm_off= -1;
-static int hf_rtp_rfc2198_bl_len= -1;
+static int proto_rtp;
+static int proto_rtp_rfc2198;
+static int hf_rtp_version;
+static int hf_rtp_padding;
+static int hf_rtp_extension;
+static int hf_rtp_csrc_count;
+static int hf_rtp_marker;
+static int hf_rtp_payload_type;
+static int hf_rtp_seq_nr;
+static int hf_rtp_ext_seq_nr;
+static int hf_rtp_timestamp;
+static int hf_rtp_ssrc;
+static int hf_rtp_csrc_items;
+static int hf_rtp_csrc_item;
+static int hf_rtp_data;
+static int hf_rtp_padding_data;
+static int hf_rtp_padding_count;
+static int hf_rtp_rfc2198_follow;
+static int hf_rtp_rfc2198_tm_off;
+static int hf_rtp_rfc2198_bl_len;
 
 /* RTP header extension fields   */
-static int hf_rtp_prof_define  = -1;
-static int hf_rtp_length       = -1;
-static int hf_rtp_hdr_exts     = -1;
-static int hf_rtp_hdr_ext      = -1;
+static int hf_rtp_prof_define;
+static int hf_rtp_length;
+static int hf_rtp_hdr_exts;
+static int hf_rtp_hdr_ext;
 
 /* RTP setup fields */
-static int hf_rtp_setup        = -1;
-static int hf_rtp_setup_frame  = -1;
-static int hf_rtp_setup_method = -1;
+static int hf_rtp_setup;
+static int hf_rtp_setup_frame;
+static int hf_rtp_setup_method;
 
 /* RTP fields defining a sub tree */
-static gint ett_rtp       = -1;
-static gint ett_csrc_list = -1;
-static gint ett_hdr_ext   = -1;
-static gint ett_hdr_ext_rfc5285 = -1;
-static gint ett_rtp_setup = -1;
-static gint ett_rtp_rfc2198 = -1;
-static gint ett_rtp_rfc2198_hdr = -1;
+static gint ett_rtp;
+static gint ett_csrc_list;
+static gint ett_hdr_ext;
+static gint ett_hdr_ext_rfc5285;
+static gint ett_rtp_setup;
+static gint ett_rtp_rfc2198;
+static gint ett_rtp_rfc2198_hdr;
 
 /* SRTP fields */
-static int hf_srtp_encrypted_payload = -1;
-/* static int hf_srtp_null_encrypted_payload = -1; */
-static int hf_srtp_mki = -1;
-static int hf_srtp_auth_tag = -1;
+static int hf_srtp_encrypted_payload;
+/* static int hf_srtp_null_encrypted_payload; */
+static int hf_srtp_mki;
+static int hf_srtp_auth_tag;
 
 /* PacketCable CCC header fields */
-static int proto_pkt_ccc       = -1;
-static int hf_pkt_ccc_id       = -1;
-static int hf_pkt_ccc_ts       = -1;
+static int proto_pkt_ccc;
+static int hf_pkt_ccc_id;
+static int hf_pkt_ccc_ts;
 
 /* PacketCable CCC field defining a sub tree */
-static gint ett_pkt_ccc = -1;
+static gint ett_pkt_ccc;
 
-static expert_field ei_rtp_fragment_unfinished = EI_INIT;
-static expert_field ei_rtp_padding_missing = EI_INIT;
-static expert_field ei_rtp_padding_bogus = EI_INIT;
+static expert_field ei_rtp_fragment_unfinished;
+static expert_field ei_rtp_padding_missing;
+static expert_field ei_rtp_padding_bogus;
 
 /* RFC 5285 Header extensions */
-static int hf_rtp_ext_rfc5285_id = -1;
-static int hf_rtp_ext_rfc5285_length = -1;
-static int hf_rtp_ext_rfc5285_appbits = -1;
-static int hf_rtp_ext_rfc5285_data = -1;
+static int hf_rtp_ext_rfc5285_id;
+static int hf_rtp_ext_rfc5285_length;
+static int hf_rtp_ext_rfc5285_appbits;
+static int hf_rtp_ext_rfc5285_data;
 
 /* RFC 4571 Header extension */
-static int hf_rfc4571_header_len = -1;
+static int hf_rfc4571_header_len;
 
 #define RTP0_INVALID 0
 #define RTP0_STUN    1
diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c
index 76153c7992..b20dc6720f 100644
--- a/epan/dissectors/packet-rtpproxy.c
+++ b/epan/dissectors/packet-rtpproxy.c
@@ -34,55 +34,55 @@ void proto_register_rtpproxy(void);
 
 static dissector_handle_t rtpproxy_handle;
 
-static int proto_rtpproxy = -1;
-
-static int hf_rtpproxy_cookie = -1;
-static int hf_rtpproxy_error = -1;
-static int hf_rtpproxy_status = -1;
-static int hf_rtpproxy_ok = -1;
-static int hf_rtpproxy_ipv4 = -1;
-static int hf_rtpproxy_ipv6 = -1;
-static int hf_rtpproxy_port = -1;
-static int hf_rtpproxy_lf = -1;
-static int hf_rtpproxy_request = -1;
-static int hf_rtpproxy_command = -1;
-static int hf_rtpproxy_command_parameters = -1;
-static int hf_rtpproxy_command_parameter = -1;
-static int hf_rtpproxy_command_parameter_codec = -1;
-static int hf_rtpproxy_command_parameter_local_ipv4 = -1;
-static int hf_rtpproxy_command_parameter_remote_ipv4 = -1;
-static int hf_rtpproxy_command_parameter_repacketize = -1;
-static int hf_rtpproxy_command_parameter_dtmf = -1;
-/* static int hf_rtpproxy_command_parameter_cmap = -1; TODO */
-static int hf_rtpproxy_command_parameter_proto = -1;
-static int hf_rtpproxy_command_parameter_transcode = -1;
-static int hf_rtpproxy_command_parameter_acc = -1;
-static int hf_rtpproxy_callid = -1;
-static int hf_rtpproxy_copy_target = -1;
-static int hf_rtpproxy_playback_filename = -1;
-static int hf_rtpproxy_playback_codec = -1;
-static int hf_rtpproxy_notify = -1;
-static int hf_rtpproxy_notify_ipv4 = -1;
-static int hf_rtpproxy_notify_ipv6 = -1;
-static int hf_rtpproxy_notify_port = -1;
-static int hf_rtpproxy_notify_tag = -1;
-static int hf_rtpproxy_tag = -1;
-static int hf_rtpproxy_mediaid = -1;
-static int hf_rtpproxy_reply = -1;
-static int hf_rtpproxy_version_request = -1;
-static int hf_rtpproxy_version_supported = -1;
-static int hf_rtpproxy_ng_bencode = -1;
+static int proto_rtpproxy;
+
+static int hf_rtpproxy_cookie;
+static int hf_rtpproxy_error;
+static int hf_rtpproxy_status;
+static int hf_rtpproxy_ok;
+static int hf_rtpproxy_ipv4;
+static int hf_rtpproxy_ipv6;
+static int hf_rtpproxy_port;
+static int hf_rtpproxy_lf;
+static int hf_rtpproxy_request;
+static int hf_rtpproxy_command;
+static int hf_rtpproxy_command_parameters;
+static int hf_rtpproxy_command_parameter;
+static int hf_rtpproxy_command_parameter_codec;
+static int hf_rtpproxy_command_parameter_local_ipv4;
+static int hf_rtpproxy_command_parameter_remote_ipv4;
+static int hf_rtpproxy_command_parameter_repacketize;
+static int hf_rtpproxy_command_parameter_dtmf;
+/* static int hf_rtpproxy_command_parameter_cmap; TODO */
+static int hf_rtpproxy_command_parameter_proto;
+static int hf_rtpproxy_command_parameter_transcode;
+static int hf_rtpproxy_command_parameter_acc;
+static int hf_rtpproxy_callid;
+static int hf_rtpproxy_copy_target;
+static int hf_rtpproxy_playback_filename;
+static int hf_rtpproxy_playback_codec;
+static int hf_rtpproxy_notify;
+static int hf_rtpproxy_notify_ipv4;
+static int hf_rtpproxy_notify_ipv6;
+static int hf_rtpproxy_notify_port;
+static int hf_rtpproxy_notify_tag;
+static int hf_rtpproxy_tag;
+static int hf_rtpproxy_mediaid;
+static int hf_rtpproxy_reply;
+static int hf_rtpproxy_version_request;
+static int hf_rtpproxy_version_supported;
+static int hf_rtpproxy_ng_bencode;
 
 /* Expert fields */
-static expert_field ei_rtpproxy_timeout = EI_INIT;
-static expert_field ei_rtpproxy_notify_no_ip = EI_INIT;
-static expert_field ei_rtpproxy_bad_ipv4 = EI_INIT;
-static expert_field ei_rtpproxy_bad_ipv6 = EI_INIT;
+static expert_field ei_rtpproxy_timeout;
+static expert_field ei_rtpproxy_notify_no_ip;
+static expert_field ei_rtpproxy_bad_ipv4;
+static expert_field ei_rtpproxy_bad_ipv6;
 
 /* Request/response tracking */
-static int hf_rtpproxy_request_in = -1;
-static int hf_rtpproxy_response_in = -1;
-static int hf_rtpproxy_response_time = -1;
+static int hf_rtpproxy_request_in;
+static int hf_rtpproxy_response_in;
+static int hf_rtpproxy_response_time;
 
 typedef struct _rtpproxy_info {
     guint32 req_frame;
@@ -253,26 +253,26 @@ static const string_string errortypenames[] = {
     { 0, NULL }
 };
 
-static gint ett_rtpproxy = -1;
-
-static gint ett_rtpproxy_request = -1;
-static gint ett_rtpproxy_command = -1;
-static gint ett_rtpproxy_command_parameters = -1;
-static gint ett_rtpproxy_command_parameters_codecs = -1;
-static gint ett_rtpproxy_command_parameters_local = -1;
-static gint ett_rtpproxy_command_parameters_remote = -1;
-static gint ett_rtpproxy_command_parameters_repacketize = -1;
-static gint ett_rtpproxy_command_parameters_dtmf = -1;
-static gint ett_rtpproxy_command_parameters_cmap = -1;
-static gint ett_rtpproxy_command_parameters_proto = -1;
-static gint ett_rtpproxy_command_parameters_transcode = -1;
-static gint ett_rtpproxy_command_parameters_acc = -1;
-static gint ett_rtpproxy_tag = -1;
-static gint ett_rtpproxy_notify = -1;
-
-static gint ett_rtpproxy_reply = -1;
-
-static gint ett_rtpproxy_ng_bencode = -1;
+static gint ett_rtpproxy;
+
+static gint ett_rtpproxy_request;
+static gint ett_rtpproxy_command;
+static gint ett_rtpproxy_command_parameters;
+static gint ett_rtpproxy_command_parameters_codecs;
+static gint ett_rtpproxy_command_parameters_local;
+static gint ett_rtpproxy_command_parameters_remote;
+static gint ett_rtpproxy_command_parameters_repacketize;
+static gint ett_rtpproxy_command_parameters_dtmf;
+static gint ett_rtpproxy_command_parameters_cmap;
+static gint ett_rtpproxy_command_parameters_proto;
+static gint ett_rtpproxy_command_parameters_transcode;
+static gint ett_rtpproxy_command_parameters_acc;
+static gint ett_rtpproxy_tag;
+static gint ett_rtpproxy_notify;
+
+static gint ett_rtpproxy_reply;
+
+static gint ett_rtpproxy_ng_bencode;
 
 /* Default values */
 #define RTPPROXY_PORT "22222"  /* Not IANA registered */
diff --git a/epan/dissectors/packet-rtps-processed.c b/epan/dissectors/packet-rtps-processed.c
index fa15d3bbff..3f41ad6e6c 100644
--- a/epan/dissectors/packet-rtps-processed.c
+++ b/epan/dissectors/packet-rtps-processed.c
@@ -81,15 +81,15 @@ static void get_new_colinfo_w_submessages(
 
 /* Subtree pointers */
 static gint rtpsproc_tree = -1;
-static gint ett_rtpsproc = -1;
-static gint ett_rtpsproc_security = -1;
-static gint ett_rtpsproc_advanced_frame0 = -1;
-static gint ett_rtpsproc_advanced_frame1 = -1;
+static gint ett_rtpsproc;
+static gint ett_rtpsproc_security;
+static gint ett_rtpsproc_advanced_frame0;
+static gint ett_rtpsproc_advanced_frame1;
 
 /* Initialize the protocol and registered fields */
 static header_field_info *rtpsproc_hf = NULL;
-static int hf_rtpsproc_param_id = -1;
-static int hf_rtpsproc_param_length = -1;
+static int hf_rtpsproc_param_id;
+static int hf_rtpsproc_param_length;
 
 /* Used for caching a handle to the RTPS dissector */
 static dissector_handle_t rtps_handle = NULL;
diff --git a/epan/dissectors/packet-rtps-virtual-transport.c b/epan/dissectors/packet-rtps-virtual-transport.c
index 8d1b571ee9..9ee4bd7132 100644
--- a/epan/dissectors/packet-rtps-virtual-transport.c
+++ b/epan/dissectors/packet-rtps-virtual-transport.c
@@ -112,45 +112,45 @@ static gint dissect_rtps_virtual_transport_loss_info_type(
         gint offset);
 
 /* Subtree pointers */
-static gint proto_rtpsvt = -1;
-static gint ett_rtpsvt = -1;
-static gint ett_rtpsvt_version = -1;
-static gint ett_rtpsvt_identifier = -1;
-static gint ett_rtpsvt_information = -1;
-static gint ett_rtpsvt_information_class = -1;
-static gint ett_rtpsvt_information_src_port = -1;
-static gint ett_rtpsvt_information_dst_port = -1;
-static gint ett_rtpsvt_information_src_addr = -1;
-static gint ett_rtpsvt_information_dst_addr = -1;
-static gint ett_rtpsvt_information_direction = -1;
-static gint ett_rtpsvt_monitoring_sn = -1;
-static gint ett_rtpsvt_frame = -1;
+static gint proto_rtpsvt;
+static gint ett_rtpsvt;
+static gint ett_rtpsvt_version;
+static gint ett_rtpsvt_identifier;
+static gint ett_rtpsvt_information;
+static gint ett_rtpsvt_information_class;
+static gint ett_rtpsvt_information_src_port;
+static gint ett_rtpsvt_information_dst_port;
+static gint ett_rtpsvt_information_src_addr;
+static gint ett_rtpsvt_information_dst_addr;
+static gint ett_rtpsvt_information_direction;
+static gint ett_rtpsvt_monitoring_sn;
+static gint ett_rtpsvt_frame;
 
 /* Initialize the protocol and registered fields */
 static header_field_info *rtpsvt_hf = NULL;
-static gint hf_rtpsvt_version = -1;
-static gint hf_rtpsvt_version_major = -1;
-static gint hf_rtpsvt_version_minor = -1;
-static gint hf_rtpsvt_content_kind = -1;
-static gint hf_rtpsvt_param_id = -1;
-static gint hf_rtpsvt_param_length = -1;
-static gint hf_rtpsvt_packet_identifier = -1;
-static gint hf_rtpsvt_monitoring_guid = -1;
-static gint hf_rtpsvt_monitoring_seqNr = -1;
-static gint hf_rtpsvt_information = -1;
-static gint hf_rtpsvt_class = -1;
-static gint hf_rtpsvt_source_port = -1;
-static gint hf_rtpsvt_source_address = -1;
-static gint hf_rtpsvt_source_pid = -1;
-static gint hf_rtpsvt_destination_port = -1;
-static gint hf_rtpsvt_destination_rtps_port = -1;
-static gint hf_rtpsvt_destination_address = -1;
-static gint hf_rtpsvt_direction = -1;
-static gint hf_rtpsvt_destination_pid = -1;
-static gint hf_rtpsvt_missing_messages = -1;
+static gint hf_rtpsvt_version;
+static gint hf_rtpsvt_version_major;
+static gint hf_rtpsvt_version_minor;
+static gint hf_rtpsvt_content_kind;
+static gint hf_rtpsvt_param_id;
+static gint hf_rtpsvt_param_length;
+static gint hf_rtpsvt_packet_identifier;
+static gint hf_rtpsvt_monitoring_guid;
+static gint hf_rtpsvt_monitoring_seqNr;
+static gint hf_rtpsvt_information;
+static gint hf_rtpsvt_class;
+static gint hf_rtpsvt_source_port;
+static gint hf_rtpsvt_source_address;
+static gint hf_rtpsvt_source_pid;
+static gint hf_rtpsvt_destination_port;
+static gint hf_rtpsvt_destination_rtps_port;
+static gint hf_rtpsvt_destination_address;
+static gint hf_rtpsvt_direction;
+static gint hf_rtpsvt_destination_pid;
+static gint hf_rtpsvt_missing_messages;
 
 /* expert info fields */
-static expert_field ei_missing_msg = EI_INIT;
+static expert_field ei_missing_msg;
 
 /* Vendor specific: RTI */
 static const value_string ndds_transport_class_id_vals[] = {
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c
index 241d57a414..077686044c 100644
--- a/epan/dissectors/packet-rtps.c
+++ b/epan/dissectors/packet-rtps.c
@@ -837,18 +837,18 @@ static dissector_table_t rtps_type_name_table;
 #define VENDOR_BUILTIN_ENDPOINT_SET_FLAG_PARTICIPANT_BOOTSTRAP_WRITER       (0x00000001U << 17)
 #define VENDOR_BUILTIN_ENDPOINT_SET_FLAG_PARTICIPANT_BOOTSTRAP_READER       (0x00000001U << 18)
 
-static int hf_rtps_dissection_boolean = -1;
-static int hf_rtps_dissection_byte    = -1;
-static int hf_rtps_dissection_int16   = -1;
-static int hf_rtps_dissection_uint16  = -1;
-static int hf_rtps_dissection_int32   = -1;
-static int hf_rtps_dissection_uint32  = -1;
-static int hf_rtps_dissection_int64   = -1;
-static int hf_rtps_dissection_uint64  = -1;
-static int hf_rtps_dissection_float   = -1;
-static int hf_rtps_dissection_double  = -1;
-static int hf_rtps_dissection_int128  = -1;
-static int hf_rtps_dissection_string  = -1;
+static int hf_rtps_dissection_boolean;
+static int hf_rtps_dissection_byte;
+static int hf_rtps_dissection_int16;
+static int hf_rtps_dissection_uint16;
+static int hf_rtps_dissection_int32;
+static int hf_rtps_dissection_uint32;
+static int hf_rtps_dissection_int64;
+static int hf_rtps_dissection_uint64;
+static int hf_rtps_dissection_float;
+static int hf_rtps_dissection_double;
+static int hf_rtps_dissection_int128;
+static int hf_rtps_dissection_string;
 
 static const char *const SM_EXTRA_RPLUS  = "(r+)";
 static const char *const SM_EXTRA_RMINUS = "(r-)";
@@ -861,620 +861,620 @@ static const char *const SM_EXTRA_TMINUS = "(t-)";
 
 /***************************************************************************/
 /* Protocol Fields Identifiers */
-static int proto_rtps                           = -1;
-static int hf_rtps_magic                        = -1;
-static int hf_rtps_ping                         = -1;
-static int hf_rtps_protocol_version             = -1;
-static int hf_rtps_protocol_version_major       = -1;
-static int hf_rtps_protocol_version_minor       = -1;
-static int hf_rtps_vendor_id                    = -1;
-
-static int hf_rtps_domain_id                    = -1;
-static int hf_rtps_domain_tag                   = -1;
-static int hf_rtps_participant_idx              = -1;
-static int hf_rtps_nature_type                  = -1;
-
-static int hf_rtps_guid_prefix_v1               = -1;
-static int hf_rtps_guid_prefix               = -1;
-static int hf_rtps_guid_prefix_src           = -1;
-static int hf_rtps_guid_prefix_dst           = -1;
-static int hf_rtps_host_id                      = -1;
-static int hf_rtps_app_id                       = -1;
-static int hf_rtps_app_id_instance_id           = -1;
-static int hf_rtps_app_id_app_kind              = -1;
-
-static int hf_rtps_sm_id                        = -1;
-static int hf_rtps_sm_idv2                      = -1;
-static int hf_rtps_sm_flags                     = -1;
-static int hf_rtps_sm_flags2                    = -1;
-static int hf_rtps_sm_octets_to_next_header     = -1;
-static int hf_rtps_sm_guid_prefix_v1            = -1;
-static int hf_rtps_sm_guid_prefix               = -1;
-static int hf_rtps_sm_host_id                   = -1;
-static int hf_rtps_sm_app_id                    = -1;
-static int hf_rtps_sm_instance_id_v1            = -1;
-static int hf_rtps_sm_app_kind                  = -1;
-static int hf_rtps_sm_instance_id               = -1;
-static int hf_rtps_sm_entity_id                 = -1;
-static int hf_rtps_sm_entity_id_key             = -1;
-static int hf_rtps_sm_entity_id_kind            = -1;
-static int hf_rtps_sm_rdentity_id               = -1;
-static int hf_rtps_sm_rdentity_id_key           = -1;
-static int hf_rtps_sm_rdentity_id_kind          = -1;
-static int hf_rtps_sm_wrentity_id               = -1;
-static int hf_rtps_sm_wrentity_id_key           = -1;
-static int hf_rtps_sm_wrentity_id_kind          = -1;
-static int hf_rtps_sm_seq_number                = -1;
-
-static int hf_rtps_info_src_ip                  = -1;
-static int hf_rtps_info_src_unused              = -1;
-
-static int hf_rtps_parameter_id                 = -1;
-static int hf_rtps_parameter_id_v2              = -1;
-static int hf_rtps_parameter_id_inline_rti      = -1;
-static int hf_rtps_parameter_id_toc             = -1;
-static int hf_rtps_parameter_id_rti             = -1;
-static int hf_rtps_parameter_id_adl             = -1;
-static int hf_rtps_parameter_length             = -1;
-static int hf_rtps_string_length                = -1;
-static int hf_rtps_coherent_set_start           = -1;
-static int hf_rtps_coherent_set_end             = -1;
-static int hf_rtps_param_topic_name             = -1;
-static int hf_rtps_param_strength               = -1;
-static int hf_rtps_param_type_name              = -1;
-static int hf_rtps_param_user_data              = -1;
-static int hf_rtps_param_group_data             = -1;
-static int hf_rtps_param_topic_data             = -1;
-static int hf_rtps_param_content_filter_topic_name = -1;
-static int hf_rtps_param_related_topic_name     = -1;
-static int hf_rtps_param_filter_class_name      = -1;
-static int hf_rtps_issue_data                   = -1;
-static int hf_rtps_durability_service_cleanup_delay     = -1;
-static int hf_rtps_liveliness_lease_duration            = -1;
-static int hf_rtps_participant_lease_duration           = -1;
-static int hf_rtps_time_based_filter_minimum_separation = -1;
-static int hf_rtps_reliability_max_blocking_time        = -1;
-static int hf_rtps_deadline_period                      = -1;
-static int hf_rtps_latency_budget_duration              = -1;
-static int hf_rtps_lifespan_duration                    = -1;
-static int hf_rtps_persistence                          = -1;
-static int hf_rtps_info_ts_timestamp                    = -1;
-static int hf_rtps_timestamp                            = -1;
-static int hf_rtps_locator_kind                         = -1;
-static int hf_rtps_locator_port                         = -1;
-/* static int hf_rtps_logical_port                         = -1; */
-static int hf_rtps_locator_public_address_port          = -1;
-static int hf_rtps_locator_ipv4                         = -1;
-static int hf_rtps_locator_ipv6                         = -1;
-static int hf_rtps_participant_builtin_endpoints        = -1;
-static int hf_rtps_participant_manual_liveliness_count  = -1;
-static int hf_rtps_history_depth                = -1;
-static int hf_rtps_resource_limit_max_samples   = -1;
-static int hf_rtps_resource_limit_max_instances = -1;
-static int hf_rtps_resource_limit_max_samples_per_instances = -1;
-static int hf_rtps_filter_bitmap                = -1;
-static int hf_rtps_type_checksum                = -1;
-static int hf_rtps_queue_size                   = -1;
-static int hf_rtps_acknack_count              = -1;
-static int hf_rtps_durability_service_history_kind = -1;
-static int hf_rtps_durability_service_history_depth = -1;
-static int hf_rtps_durability_service_max_samples = -1;
-static int hf_rtps_durability_service_max_instances = -1;
-static int hf_rtps_durability_service_max_samples_per_instances = -1;
-static int hf_rtps_liveliness_kind              = -1;
-static int hf_rtps_manager_key                  = -1;
-static int hf_rtps_locator_udp_v4               = -1;
-static int hf_rtps_locator_udp_v4_port          = -1;
-static int hf_param_ip_address                  = -1;
-static int hf_rtps_param_port                   = -1;
-static int hf_rtps_expects_inline_qos           = -1;
-static int hf_rtps_presentation_coherent_access = -1;
-static int hf_rtps_presentation_ordered_access  = -1;
-static int hf_rtps_expects_ack                  = -1;
-static int hf_rtps_reliability_kind             = -1;
-static int hf_rtps_durability                   = -1;
-static int hf_rtps_ownership                    = -1;
-static int hf_rtps_presentation_access_scope    = -1;
-static int hf_rtps_destination_order            = -1;
-static int hf_rtps_history_kind                 = -1;
-static int hf_rtps_data_status_info             = -1;
-static int hf_rtps_param_serialize_encap_kind   = -1;
-static int hf_rtps_param_serialize_encap_len    = -1;
-static int hf_rtps_param_transport_priority     = -1;
-static int hf_rtps_param_type_max_size_serialized = -1;
-static int hf_rtps_param_entity_name            = -1;
-static int hf_rtps_param_role_name              = -1;
-static int hf_rtps_disable_positive_ack         = -1;
-static int hf_rtps_participant_guid_v1          = -1;
-static int hf_rtps_participant_guid             = -1;
-static int hf_rtps_group_guid_v1                = -1;
-static int hf_rtps_group_guid                   = -1;
-static int hf_rtps_endpoint_guid                = -1;
-static int hf_rtps_param_host_id                = -1;
-static int hf_rtps_param_app_id                 = -1;
-static int hf_rtps_param_instance_id            = -1;
-static int hf_rtps_param_instance_id_v1         = -1;
-static int hf_rtps_param_app_kind               = -1;
-static int hf_rtps_param_entity                 = -1;
-static int hf_rtps_param_entity_key             = -1;
-static int hf_rtps_param_entity_kind         = -1;
-static int hf_rtps_data_frag_number             = -1;
-static int hf_rtps_data_frag_num_fragments      = -1;
-static int hf_rtps_data_frag_size               = -1;
-static int hf_rtps_data_frag_sample_size        = -1;
-static int hf_rtps_nokey_data_frag_number       = -1;
-static int hf_rtps_nokey_data_frag_num_fragments= -1;
-static int hf_rtps_nokey_data_frag_size         = -1;
-static int hf_rtps_nack_frag_count              = -1;
-static int hf_rtps_heartbeat_frag_number        = -1;
-static int hf_rtps_heartbeat_frag_count         = -1;
-static int hf_rtps_heartbeat_batch_count        = -1;
-static int hf_rtps_data_serialize_data          = -1;
-static int hf_rtps_data_batch_timestamp         = -1;
-static int hf_rtps_data_batch_offset_to_last_sample_sn = -1;
-static int hf_rtps_data_batch_sample_count      = -1;
-static int hf_rtps_data_batch_offset_sn         = -1;
-static int hf_rtps_data_batch_octets_to_sl_encap_id = -1;
-static int hf_rtps_data_batch_serialized_data_length = -1;
-static int hf_rtps_data_batch_octets_to_inline_qos = -1;
-static int hf_rtps_fragment_number_base64       = -1;
-static int hf_rtps_fragment_number_base         = -1;
-static int hf_rtps_fragment_number_num_bits     = -1;
-static int hf_rtps_bitmap_num_bits              = -1;
-static int hf_rtps_param_partition_num          = -1;
-static int hf_rtps_param_partition              = -1;
-static int hf_rtps_param_filter_expression      = -1;
-static int hf_rtps_param_expression_parameters_num  = -1;
-static int hf_rtps_param_expression_parameters      = -1;
-static int hf_rtps_locator_filter_list_num_channels = -1;
-static int hf_rtps_locator_filter_list_filter_name  = -1;
-static int hf_rtps_locator_filter_list_filter_exp   = -1;
-static int hf_rtps_extra_flags                      = -1;
-static int hf_rtps_param_builtin_endpoint_set_flags = -1;
-static int hf_rtps_param_vendor_builtin_endpoint_set_flags = -1;
-static int hf_rtps_param_endpoint_security_attributes      = -1;
-static int hf_rtps_param_plugin_promiscuity_kind    = -1;
-static int hf_rtps_param_service_kind               = -1;
-
-static int hf_rtps_param_sample_signature_epoch             = -1;
-static int hf_rtps_param_sample_signature_nonce             = -1;
-static int hf_rtps_param_sample_signature_length            = -1;
-static int hf_rtps_param_sample_signature_signature         = -1;
-static int hf_rtps_secure_secure_data_length                = -1;
-static int hf_rtps_secure_secure_data                       = -1;
-static int hf_rtps_param_enable_authentication              = -1;
-static int hf_rtps_param_builtin_endpoint_qos               = -1;
-static int hf_rtps_secure_dataheader_transformation_kind    = -1;
-static int hf_rtps_secure_dataheader_transformation_key_revision_id    = -1;
-static int hf_rtps_secure_dataheader_transformation_key_id  = -1;
-static int hf_rtps_secure_dataheader_init_vector_suffix     = -1;
-static int hf_rtps_secure_dataheader_session_id             = -1;
-static int hf_rtps_secure_datatag_plugin_sec_tag            = -1;
-static int hf_rtps_pgm                                      = -1;
-static int hf_rtps_pgm_dst_participant_guid                 = -1;
-static int hf_rtps_pgm_dst_endpoint_guid                    = -1;
-static int hf_rtps_pgm_src_endpoint_guid                    = -1;
-static int hf_rtps_source_participant_guid                  = -1;
-static int hf_rtps_message_identity_source_guid             = -1;
-static int hf_rtps_pgm_message_class_id                     = -1;
-static int hf_rtps_pgm_data_holder_class_id                 = -1;
-/* static int hf_rtps_pgm_data_holder_stringseq_size           = -1; */
-/* static int hf_rtps_pgm_data_holder_stringseq_name           = -1; */
-/* static int hf_rtps_pgm_data_holder_long_long                = -1; */
-
-static int hf_rtps_param_timestamp_sec                          = -1;
-static int hf_rtps_param_timestamp_fraction                     = -1;
-static int hf_rtps_transportInfo_classId                        = -1;
-static int hf_rtps_transportInfo_messageSizeMax                 = -1;
-static int hf_rtps_param_app_ack_count                          = -1;
-static int hf_rtps_param_app_ack_virtual_writer_count           = -1;
-static int hf_rtps_param_app_ack_conf_virtual_writer_count      = -1;
-static int hf_rtps_param_app_ack_conf_count                     = -1;
-static int hf_rtps_param_app_ack_interval_payload_length        = -1;
-static int hf_rtps_param_app_ack_interval_flags                 = -1;
-static int hf_rtps_param_app_ack_interval_count                 = -1;
-static int hf_rtps_param_app_ack_octets_to_next_virtual_writer  = -1;
-static int hf_rtps_expects_virtual_heartbeat                    = -1;
-static int hf_rtps_direct_communication                         = -1;
-static int hf_rtps_param_peer_host_epoch                        = -1;
-static int hf_rtps_param_endpoint_property_change_epoch         = -1;
-static int hf_rtps_virtual_heartbeat_count                      = -1;
-static int hf_rtps_virtual_heartbeat_num_virtual_guids          = -1;
-static int hf_rtps_virtual_heartbeat_num_writers                = -1;
-static int hf_rtps_param_extended_parameter                     = -1;
-static int hf_rtps_param_extended_pid_length                    = -1;
-static int hf_rtps_param_type_consistency_kind                  = -1;
-static int hf_rtps_param_data_representation                    = -1;
-static int hf_rtps_param_ignore_sequence_bounds                 = -1;
-static int hf_rtps_param_ignore_string_bounds                   = -1;
-static int hf_rtps_param_ignore_member_names                    = -1;
-static int hf_rtps_param_prevent_type_widening                  = -1;
-static int hf_rtps_param_force_type_validation                  = -1;
-static int hf_rtps_param_ignore_enum_literal_names              = -1;
-static int hf_rtps_parameter_data                               = -1;
-static int hf_rtps_param_product_version_major                  = -1;
-static int hf_rtps_param_product_version_minor                  = -1;
-static int hf_rtps_param_product_version_release                = -1;
-static int hf_rtps_param_product_version_release_as_char        = -1;
-static int hf_rtps_param_product_version_revision               = -1;
-static int hf_rtps_param_acknowledgment_kind                    = -1;
-static int hf_rtps_param_topic_query_publication_enable         = -1;
-static int hf_rtps_param_topic_query_publication_sessions       = -1;
-
-static int hf_rtps_srm                                          = -1;
-static int hf_rtps_srm_service_id                               = -1;
-static int hf_rtps_srm_request_body                             = -1;
-static int hf_rtps_srm_instance_id                              = -1;
-static int hf_rtps_topic_query_selection_filter_class_name      = -1;
-static int hf_rtps_topic_query_selection_filter_expression      = -1;
-static int hf_rtps_topic_query_selection_num_parameters         = -1;
-static int hf_rtps_topic_query_selection_filter_parameter       = -1;
-static int hf_rtps_topic_query_topic_name                       = -1;
-static int hf_rtps_topic_query_original_related_reader_guid     = -1;
-
-static int hf_rtps_encapsulation_id                             = -1;
-static int hf_rtps_encapsulation_kind                           = -1;
-static int hf_rtps_octets_to_inline_qos                         = -1;
-static int hf_rtps_filter_signature                             = -1;
-static int hf_rtps_bitmap                                       = -1;
-static int hf_rtps_acknack_analysis                             = -1;
-static int hf_rtps_property_name                                = -1;
-static int hf_rtps_property_value                               = -1;
-static int hf_rtps_union                                        = -1;
-static int hf_rtps_union_case                                   = -1;
-static int hf_rtps_struct                                       = -1;
-static int hf_rtps_member_name                                  = -1;
-static int hf_rtps_sequence                                     = -1;
-static int hf_rtps_array                                        = -1;
-static int hf_rtps_bitfield                                     = -1;
-static int hf_rtps_datatype                                     = -1;
-static int hf_rtps_sequence_size                                = -1;
-static int hf_rtps_guid                                         = -1;
-static int hf_rtps_heartbeat_count                              = -1;
-static int hf_rtps_encapsulation_options                        = -1;
-static int hf_rtps_serialized_key                               = -1;
-static int hf_rtps_serialized_data                              = -1;
-static int hf_rtps_type_object_type_id_disc                     = -1;
-static int hf_rtps_type_object_type_id                          = -1;
-static int hf_rtps_type_object_primitive_type_id                = -1;
-static int hf_rtps_type_object_base_type                        = -1;
-static int hf_rtps_type_object_base_primitive_type_id           = -1;
-static int hf_rtps_type_object_element_raw                      = -1;
-static int hf_rtps_type_object_type_property_name               = -1;
-static int hf_rtps_type_object_flags                            = -1;
-static int hf_rtps_type_object_member_id                        = -1;
-static int hf_rtps_type_object_annotation_value_d               = -1;
-static int hf_rtps_type_object_annotation_value_16              = -1;
-static int hf_rtps_type_object_union_label                      = -1;
-static int hf_rtps_type_object_bound                            = -1;
-static int hf_rtps_type_object_enum_constant_name               = -1;
-static int hf_rtps_type_object_enum_constant_value              = -1;
-static int hf_rtps_type_object_element_shared                   = -1;
-static int hf_rtps_type_object_name                             = -1;
-static int hf_rtps_type_object_element_module_name              = -1;
-static int hf_rtps_uncompressed_serialized_length               = -1;
-static int hf_rtps_compression_plugin_class_id                  = -1;
-static int hf_rtps_compressed_serialized_type_object            = -1;
-static int hf_rtps_pl_cdr_member                                = -1;
-static int hf_rtps_pl_cdr_member_id                             = -1;
-static int hf_rtps_pl_cdr_member_length                         = -1;
-static int hf_rtps_pl_cdr_member_id_ext                         = -1;
-static int hf_rtps_pl_cdr_member_length_ext                     = -1;
-static int hf_rtps_dcps_publication_data_frame_number           = -1;
-static int hf_rtps_udpv4_wan_locator_flags                      = -1;
-static int hf_rtps_uuid                                         = -1;
-static int hf_rtps_udpv4_wan_locator_public_ip                  = -1;
-static int hf_rtps_udpv4_wan_locator_public_port                = -1;
-static int hf_rtps_udpv4_wan_locator_local_ip                   = -1;
-static int hf_rtps_udpv4_wan_locator_local_port                 = -1;
-static int hf_rtps_udpv4_wan_binding_ping_port                  = -1;
-static int hf_rtps_udpv4_wan_binding_ping_flags                 = -1;
-static int hf_rtps_long_address                                 = -1;
-static int hf_rtps_param_group_coherent_set                     = -1;
-static int hf_rtps_param_end_group_coherent_set                 = -1;
-static int hf_rtps_param_mig_end_coherent_set_sample_count      = -1;
-static int hf_rtps_encapsulation_options_compression_plugin_class_id = -1;
-static int hf_rtps_padding_bytes                                = -1;
-static int hf_rtps_topic_query_selection_kind                   = -1;
-static int hf_rtps_data_session_intermediate                            = -1;
+static int proto_rtps;
+static int hf_rtps_magic;
+static int hf_rtps_ping;
+static int hf_rtps_protocol_version;
+static int hf_rtps_protocol_version_major;
+static int hf_rtps_protocol_version_minor;
+static int hf_rtps_vendor_id;
+
+static int hf_rtps_domain_id;
+static int hf_rtps_domain_tag;
+static int hf_rtps_participant_idx;
+static int hf_rtps_nature_type;
+
+static int hf_rtps_guid_prefix_v1;
+static int hf_rtps_guid_prefix;
+static int hf_rtps_guid_prefix_src;
+static int hf_rtps_guid_prefix_dst;
+static int hf_rtps_host_id;
+static int hf_rtps_app_id;
+static int hf_rtps_app_id_instance_id;
+static int hf_rtps_app_id_app_kind;
+
+static int hf_rtps_sm_id;
+static int hf_rtps_sm_idv2;
+static int hf_rtps_sm_flags;
+static int hf_rtps_sm_flags2;
+static int hf_rtps_sm_octets_to_next_header;
+static int hf_rtps_sm_guid_prefix_v1;
+static int hf_rtps_sm_guid_prefix;
+static int hf_rtps_sm_host_id;
+static int hf_rtps_sm_app_id;
+static int hf_rtps_sm_instance_id_v1;
+static int hf_rtps_sm_app_kind;
+static int hf_rtps_sm_instance_id;
+static int hf_rtps_sm_entity_id;
+static int hf_rtps_sm_entity_id_key;
+static int hf_rtps_sm_entity_id_kind;
+static int hf_rtps_sm_rdentity_id;
+static int hf_rtps_sm_rdentity_id_key;
+static int hf_rtps_sm_rdentity_id_kind;
+static int hf_rtps_sm_wrentity_id;
+static int hf_rtps_sm_wrentity_id_key;
+static int hf_rtps_sm_wrentity_id_kind;
+static int hf_rtps_sm_seq_number;
+
+static int hf_rtps_info_src_ip;
+static int hf_rtps_info_src_unused;
+
+static int hf_rtps_parameter_id;
+static int hf_rtps_parameter_id_v2;
+static int hf_rtps_parameter_id_inline_rti;
+static int hf_rtps_parameter_id_toc;
+static int hf_rtps_parameter_id_rti;
+static int hf_rtps_parameter_id_adl;
+static int hf_rtps_parameter_length;
+static int hf_rtps_string_length;
+static int hf_rtps_coherent_set_start;
+static int hf_rtps_coherent_set_end;
+static int hf_rtps_param_topic_name;
+static int hf_rtps_param_strength;
+static int hf_rtps_param_type_name;
+static int hf_rtps_param_user_data;
+static int hf_rtps_param_group_data;
+static int hf_rtps_param_topic_data;
+static int hf_rtps_param_content_filter_topic_name;
+static int hf_rtps_param_related_topic_name;
+static int hf_rtps_param_filter_class_name;
+static int hf_rtps_issue_data;
+static int hf_rtps_durability_service_cleanup_delay;
+static int hf_rtps_liveliness_lease_duration;
+static int hf_rtps_participant_lease_duration;
+static int hf_rtps_time_based_filter_minimum_separation;
+static int hf_rtps_reliability_max_blocking_time;
+static int hf_rtps_deadline_period;
+static int hf_rtps_latency_budget_duration;
+static int hf_rtps_lifespan_duration;
+static int hf_rtps_persistence;
+static int hf_rtps_info_ts_timestamp;
+static int hf_rtps_timestamp;
+static int hf_rtps_locator_kind;
+static int hf_rtps_locator_port;
+/* static int hf_rtps_logical_port; */
+static int hf_rtps_locator_public_address_port;
+static int hf_rtps_locator_ipv4;
+static int hf_rtps_locator_ipv6;
+static int hf_rtps_participant_builtin_endpoints;
+static int hf_rtps_participant_manual_liveliness_count;
+static int hf_rtps_history_depth;
+static int hf_rtps_resource_limit_max_samples;
+static int hf_rtps_resource_limit_max_instances;
+static int hf_rtps_resource_limit_max_samples_per_instances;
+static int hf_rtps_filter_bitmap;
+static int hf_rtps_type_checksum;
+static int hf_rtps_queue_size;
+static int hf_rtps_acknack_count;
+static int hf_rtps_durability_service_history_kind;
+static int hf_rtps_durability_service_history_depth;
+static int hf_rtps_durability_service_max_samples;
+static int hf_rtps_durability_service_max_instances;
+static int hf_rtps_durability_service_max_samples_per_instances;
+static int hf_rtps_liveliness_kind;
+static int hf_rtps_manager_key;
+static int hf_rtps_locator_udp_v4;
+static int hf_rtps_locator_udp_v4_port;
+static int hf_param_ip_address;
+static int hf_rtps_param_port;
+static int hf_rtps_expects_inline_qos;
+static int hf_rtps_presentation_coherent_access;
+static int hf_rtps_presentation_ordered_access;
+static int hf_rtps_expects_ack;
+static int hf_rtps_reliability_kind;
+static int hf_rtps_durability;
+static int hf_rtps_ownership;
+static int hf_rtps_presentation_access_scope;
+static int hf_rtps_destination_order;
+static int hf_rtps_history_kind;
+static int hf_rtps_data_status_info;
+static int hf_rtps_param_serialize_encap_kind;
+static int hf_rtps_param_serialize_encap_len;
+static int hf_rtps_param_transport_priority;
+static int hf_rtps_param_type_max_size_serialized;
+static int hf_rtps_param_entity_name;
+static int hf_rtps_param_role_name;
+static int hf_rtps_disable_positive_ack;
+static int hf_rtps_participant_guid_v1;
+static int hf_rtps_participant_guid;
+static int hf_rtps_group_guid_v1;
+static int hf_rtps_group_guid;
+static int hf_rtps_endpoint_guid;
+static int hf_rtps_param_host_id;
+static int hf_rtps_param_app_id;
+static int hf_rtps_param_instance_id;
+static int hf_rtps_param_instance_id_v1;
+static int hf_rtps_param_app_kind;
+static int hf_rtps_param_entity;
+static int hf_rtps_param_entity_key;
+static int hf_rtps_param_entity_kind;
+static int hf_rtps_data_frag_number;
+static int hf_rtps_data_frag_num_fragments;
+static int hf_rtps_data_frag_size;
+static int hf_rtps_data_frag_sample_size;
+static int hf_rtps_nokey_data_frag_number;
+static int hf_rtps_nokey_data_frag_num_fragments;
+static int hf_rtps_nokey_data_frag_size;
+static int hf_rtps_nack_frag_count;
+static int hf_rtps_heartbeat_frag_number;
+static int hf_rtps_heartbeat_frag_count;
+static int hf_rtps_heartbeat_batch_count;
+static int hf_rtps_data_serialize_data;
+static int hf_rtps_data_batch_timestamp;
+static int hf_rtps_data_batch_offset_to_last_sample_sn;
+static int hf_rtps_data_batch_sample_count;
+static int hf_rtps_data_batch_offset_sn;
+static int hf_rtps_data_batch_octets_to_sl_encap_id;
+static int hf_rtps_data_batch_serialized_data_length;
+static int hf_rtps_data_batch_octets_to_inline_qos;
+static int hf_rtps_fragment_number_base64;
+static int hf_rtps_fragment_number_base;
+static int hf_rtps_fragment_number_num_bits;
+static int hf_rtps_bitmap_num_bits;
+static int hf_rtps_param_partition_num;
+static int hf_rtps_param_partition;
+static int hf_rtps_param_filter_expression;
+static int hf_rtps_param_expression_parameters_num;
+static int hf_rtps_param_expression_parameters;
+static int hf_rtps_locator_filter_list_num_channels;
+static int hf_rtps_locator_filter_list_filter_name;
+static int hf_rtps_locator_filter_list_filter_exp;
+static int hf_rtps_extra_flags;
+static int hf_rtps_param_builtin_endpoint_set_flags;
+static int hf_rtps_param_vendor_builtin_endpoint_set_flags;
+static int hf_rtps_param_endpoint_security_attributes;
+static int hf_rtps_param_plugin_promiscuity_kind;
+static int hf_rtps_param_service_kind;
+
+static int hf_rtps_param_sample_signature_epoch;
+static int hf_rtps_param_sample_signature_nonce;
+static int hf_rtps_param_sample_signature_length;
+static int hf_rtps_param_sample_signature_signature;
+static int hf_rtps_secure_secure_data_length;
+static int hf_rtps_secure_secure_data;
+static int hf_rtps_param_enable_authentication;
+static int hf_rtps_param_builtin_endpoint_qos;
+static int hf_rtps_secure_dataheader_transformation_kind;
+static int hf_rtps_secure_dataheader_transformation_key_revision_id;
+static int hf_rtps_secure_dataheader_transformation_key_id;
+static int hf_rtps_secure_dataheader_init_vector_suffix;
+static int hf_rtps_secure_dataheader_session_id;
+static int hf_rtps_secure_datatag_plugin_sec_tag;
+static int hf_rtps_pgm;
+static int hf_rtps_pgm_dst_participant_guid;
+static int hf_rtps_pgm_dst_endpoint_guid;
+static int hf_rtps_pgm_src_endpoint_guid;
+static int hf_rtps_source_participant_guid;
+static int hf_rtps_message_identity_source_guid;
+static int hf_rtps_pgm_message_class_id;
+static int hf_rtps_pgm_data_holder_class_id;
+/* static int hf_rtps_pgm_data_holder_stringseq_size; */
+/* static int hf_rtps_pgm_data_holder_stringseq_name; */
+/* static int hf_rtps_pgm_data_holder_long_long; */
+
+static int hf_rtps_param_timestamp_sec;
+static int hf_rtps_param_timestamp_fraction;
+static int hf_rtps_transportInfo_classId;
+static int hf_rtps_transportInfo_messageSizeMax;
+static int hf_rtps_param_app_ack_count;
+static int hf_rtps_param_app_ack_virtual_writer_count;
+static int hf_rtps_param_app_ack_conf_virtual_writer_count;
+static int hf_rtps_param_app_ack_conf_count;
+static int hf_rtps_param_app_ack_interval_payload_length;
+static int hf_rtps_param_app_ack_interval_flags;
+static int hf_rtps_param_app_ack_interval_count;
+static int hf_rtps_param_app_ack_octets_to_next_virtual_writer;
+static int hf_rtps_expects_virtual_heartbeat;
+static int hf_rtps_direct_communication;
+static int hf_rtps_param_peer_host_epoch;
+static int hf_rtps_param_endpoint_property_change_epoch;
+static int hf_rtps_virtual_heartbeat_count;
+static int hf_rtps_virtual_heartbeat_num_virtual_guids;
+static int hf_rtps_virtual_heartbeat_num_writers;
+static int hf_rtps_param_extended_parameter;
+static int hf_rtps_param_extended_pid_length;
+static int hf_rtps_param_type_consistency_kind;
+static int hf_rtps_param_data_representation;
+static int hf_rtps_param_ignore_sequence_bounds;
+static int hf_rtps_param_ignore_string_bounds;
+static int hf_rtps_param_ignore_member_names;
+static int hf_rtps_param_prevent_type_widening;
+static int hf_rtps_param_force_type_validation;
+static int hf_rtps_param_ignore_enum_literal_names;
+static int hf_rtps_parameter_data;
+static int hf_rtps_param_product_version_major;
+static int hf_rtps_param_product_version_minor;
+static int hf_rtps_param_product_version_release;
+static int hf_rtps_param_product_version_release_as_char;
+static int hf_rtps_param_product_version_revision;
+static int hf_rtps_param_acknowledgment_kind;
+static int hf_rtps_param_topic_query_publication_enable;
+static int hf_rtps_param_topic_query_publication_sessions;
+
+static int hf_rtps_srm;
+static int hf_rtps_srm_service_id;
+static int hf_rtps_srm_request_body;
+static int hf_rtps_srm_instance_id;
+static int hf_rtps_topic_query_selection_filter_class_name;
+static int hf_rtps_topic_query_selection_filter_expression;
+static int hf_rtps_topic_query_selection_num_parameters;
+static int hf_rtps_topic_query_selection_filter_parameter;
+static int hf_rtps_topic_query_topic_name;
+static int hf_rtps_topic_query_original_related_reader_guid;
+
+static int hf_rtps_encapsulation_id;
+static int hf_rtps_encapsulation_kind;
+static int hf_rtps_octets_to_inline_qos;
+static int hf_rtps_filter_signature;
+static int hf_rtps_bitmap;
+static int hf_rtps_acknack_analysis;
+static int hf_rtps_property_name;
+static int hf_rtps_property_value;
+static int hf_rtps_union;
+static int hf_rtps_union_case;
+static int hf_rtps_struct;
+static int hf_rtps_member_name;
+static int hf_rtps_sequence;
+static int hf_rtps_array;
+static int hf_rtps_bitfield;
+static int hf_rtps_datatype;
+static int hf_rtps_sequence_size;
+static int hf_rtps_guid;
+static int hf_rtps_heartbeat_count;
+static int hf_rtps_encapsulation_options;
+static int hf_rtps_serialized_key;
+static int hf_rtps_serialized_data;
+static int hf_rtps_type_object_type_id_disc;
+static int hf_rtps_type_object_type_id;
+static int hf_rtps_type_object_primitive_type_id;
+static int hf_rtps_type_object_base_type;
+static int hf_rtps_type_object_base_primitive_type_id;
+static int hf_rtps_type_object_element_raw;
+static int hf_rtps_type_object_type_property_name;
+static int hf_rtps_type_object_flags;
+static int hf_rtps_type_object_member_id;
+static int hf_rtps_type_object_annotation_value_d;
+static int hf_rtps_type_object_annotation_value_16;
+static int hf_rtps_type_object_union_label;
+static int hf_rtps_type_object_bound;
+static int hf_rtps_type_object_enum_constant_name;
+static int hf_rtps_type_object_enum_constant_value;
+static int hf_rtps_type_object_element_shared;
+static int hf_rtps_type_object_name;
+static int hf_rtps_type_object_element_module_name;
+static int hf_rtps_uncompressed_serialized_length;
+static int hf_rtps_compression_plugin_class_id;
+static int hf_rtps_compressed_serialized_type_object;
+static int hf_rtps_pl_cdr_member;
+static int hf_rtps_pl_cdr_member_id;
+static int hf_rtps_pl_cdr_member_length;
+static int hf_rtps_pl_cdr_member_id_ext;
+static int hf_rtps_pl_cdr_member_length_ext;
+static int hf_rtps_dcps_publication_data_frame_number;
+static int hf_rtps_udpv4_wan_locator_flags;
+static int hf_rtps_uuid;
+static int hf_rtps_udpv4_wan_locator_public_ip;
+static int hf_rtps_udpv4_wan_locator_public_port;
+static int hf_rtps_udpv4_wan_locator_local_ip;
+static int hf_rtps_udpv4_wan_locator_local_port;
+static int hf_rtps_udpv4_wan_binding_ping_port;
+static int hf_rtps_udpv4_wan_binding_ping_flags;
+static int hf_rtps_long_address;
+static int hf_rtps_param_group_coherent_set;
+static int hf_rtps_param_end_group_coherent_set;
+static int hf_rtps_param_mig_end_coherent_set_sample_count;
+static int hf_rtps_encapsulation_options_compression_plugin_class_id;
+static int hf_rtps_padding_bytes;
+static int hf_rtps_topic_query_selection_kind;
+static int hf_rtps_data_session_intermediate;
 
 /* Flag bits */
-static int hf_rtps_flag_reserved80                              = -1;
-static int hf_rtps_flag_reserved40                              = -1;
-static int hf_rtps_flag_reserved20                              = -1;
-static int hf_rtps_flag_reserved10                              = -1;
-static int hf_rtps_flag_reserved08                              = -1;
-static int hf_rtps_flag_reserved04                              = -1;
-static int hf_rtps_flag_reserved02                              = -1;
-static int hf_rtps_flag_reserved8000                            = -1;
-static int hf_rtps_flag_reserved4000                            = -1;
-static int hf_rtps_flag_reserved2000                            = -1;
-static int hf_rtps_flag_reserved1000                            = -1;
-static int hf_rtps_flag_reserved0800                            = -1;
-static int hf_rtps_flag_reserved0400                            = -1;
-static int hf_rtps_flag_reserved0200                            = -1;
-static int hf_rtps_flag_reserved0100                            = -1;
-static int hf_rtps_flag_reserved0080                            = -1;
-static int hf_rtps_flag_reserved0040                            = -1;
-
-static int hf_rtps_flag_builtin_endpoint_set_reserved           = -1;
-static int hf_rtps_flag_unregister                              = -1;
-static int hf_rtps_flag_inline_qos_v1                           = -1;
-static int hf_rtps_flag_hash_key                                = -1;
-static int hf_rtps_flag_alive                                   = -1;
-static int hf_rtps_flag_data_present_v1                         = -1;
-static int hf_rtps_flag_multisubmessage                         = -1;
-static int hf_rtps_flag_endianness                              = -1;
-static int hf_rtps_flag_additional_authenticated_data           = -1;
-static int hf_rtps_flag_protected_with_psk                      = -1;
-static int hf_rtps_flag_vendor_specific_content                 = -1;
-static int hf_rtps_flag_status_info                             = -1;
-static int hf_rtps_flag_data_present_v2                         = -1;
-static int hf_rtps_flag_inline_qos_v2                           = -1;
-static int hf_rtps_flag_final                                   = -1;
-static int hf_rtps_flag_hash_key_rti                            = -1;
-static int hf_rtps_flag_liveliness                              = -1;
-static int hf_rtps_flag_multicast                               = -1;
-static int hf_rtps_flag_data_serialized_key                     = -1;
-static int hf_rtps_flag_data_frag_serialized_key                = -1;
-static int hf_rtps_flag_timestamp                               = -1;
-static int hf_rtps_flag_no_virtual_guids                        = -1;
-static int hf_rtps_flag_multiple_writers                        = -1;
-static int hf_rtps_flag_multiple_virtual_guids                  = -1;
-static int hf_rtps_flag_serialize_key16                         = -1;
-static int hf_rtps_flag_invalid_sample                          = -1;
-static int hf_rtps_flag_data_present16                          = -1;
-static int hf_rtps_flag_offsetsn_present                        = -1;
-static int hf_rtps_flag_inline_qos16_v2                         = -1;
-static int hf_rtps_flag_timestamp_present                       = -1;
-static int hf_rtps_flag_unregistered                            = -1;
-static int hf_rtps_flag_disposed                                = -1;
-static int hf_rtps_param_status_info_flags                      = -1;
-
-static int hf_rtps_flag_participant_announcer                   = -1;
-static int hf_rtps_flag_participant_detector                    = -1;
-static int hf_rtps_flag_publication_announcer                   = -1;
-static int hf_rtps_flag_publication_detector                    = -1;
-static int hf_rtps_flag_subscription_announcer                  = -1;
-static int hf_rtps_flag_subscription_detector                   = -1;
-static int hf_rtps_flag_participant_proxy_announcer             = -1;
-static int hf_rtps_flag_participant_proxy_detector              = -1;
-static int hf_rtps_flag_participant_state_announcer             = -1;
-static int hf_rtps_flag_participant_state_detector              = -1;
-static int hf_rtps_flag_participant_message_datawriter          = -1;
-static int hf_rtps_flag_participant_message_datareader          = -1;
-static int hf_rtps_flag_secure_publication_writer               = -1;
-static int hf_rtps_flag_secure_publication_reader               = -1;
-static int hf_rtps_flag_secure_subscription_writer              = -1;
-static int hf_rtps_flag_secure_subscription_reader              = -1;
-static int hf_rtps_flag_secure_participant_message_writer       = -1;
-static int hf_rtps_flag_secure_participant_message_reader       = -1;
-static int hf_rtps_flag_participant_stateless_message_writer    = -1;
-static int hf_rtps_flag_participant_stateless_message_reader    = -1;
-static int hf_rtps_flag_secure_participant_volatile_message_writer  = -1;
-static int hf_rtps_flag_secure_participant_volatile_message_reader  = -1;
-static int hf_rtps_flag_participant_secure_writer               = -1;
-static int hf_rtps_flag_participant_secure_reader               = -1;
-static int hf_rtps_flag_typeflag_final                          = -1;
-static int hf_rtps_flag_typeflag_mutable                        = -1;
-static int hf_rtps_flag_typeflag_nested                         = -1;
-static int hf_rtps_flag_memberflag_key                          = -1;
-static int hf_rtps_flag_memberflag_optional                     = -1;
-static int hf_rtps_flag_memberflag_shareable                    = -1;
-static int hf_rtps_flag_memberflag_union_default                = -1;
-static int hf_rtps_flag_service_request_writer                  = -1;
-static int hf_rtps_flag_service_request_reader                  = -1;
-static int hf_rtps_flag_locator_ping_writer                     = -1;
-static int hf_rtps_flag_locator_ping_reader                     = -1;
-static int hf_rtps_flag_secure_service_request_writer           = -1;
-static int hf_rtps_flag_cloud_discovery_service_announcer       = -1;
-static int hf_rtps_flag_participant_config_writer               = -1;
-static int hf_rtps_flag_participant_config_reader               = -1;
-static int hf_rtps_flag_participant_config_secure_writer        = -1;
-static int hf_rtps_flag_participant_config_secure_reader        = -1;
-static int hf_rtps_flag_participant_bootstrap_writer            = -1;
-static int hf_rtps_flag_participant_bootstrap_reader            = -1;
-static int hf_rtps_flag_monitoring_periodic_writer              = -1;
-static int hf_rtps_flag_monitoring_periodic_reader              = -1;
-static int hf_rtps_flag_monitoring_event_writer                 = -1;
-static int hf_rtps_flag_monitoring_event_reader                 = -1;
-static int hf_rtps_flag_monitoring_logging_writer               = -1;
-static int hf_rtps_flag_monitoring_logging_reader               = -1;
-static int hf_rtps_flag_secure_service_request_reader           = -1;
-static int hf_rtps_flag_security_access_protected               = -1;
-static int hf_rtps_flag_security_discovery_protected            = -1;
-static int hf_rtps_flag_security_submessage_protected           = -1;
-static int hf_rtps_param_participant_security_symmetric_cipher_algorithms_builtin_endpoints_required_mask                  = -1;
-static int hf_rtps_param_participant_security_symmetric_cipher_algorithms_builtin_endpoints_key_exchange_used_bit     = -1;
-static int hf_rtps_param_participant_security_symmetric_cipher_algorithms_supported_mask    = -1;
-static int hf_rtps_flag_security_symmetric_cipher_mask_aes128_gcm                           = -1;
-static int hf_rtps_flag_security_symmetric_cipher_mask_aes256_gcm                           = -1;
-static int hf_rtps_flag_security_symmetric_cipher_mask_custom_algorithm                     = -1;
-static int hf_rtps_param_compression_id_mask                                                = -1;
-static int hf_rtps_flag_compression_id_zlib                                                 = -1;
-static int hf_rtps_flag_compression_id_bzip2                                                = -1;
-static int hf_rtps_flag_compression_id_lz4                                                  = -1;
-static int hf_rtps_param_crypto_algorithm_requirements_trust_chain                          = -1;
-static int hf_rtps_param_crypto_algorithm_requirements_message_auth                         = -1;
-static int hf_rtps_flag_security_digital_signature_mask_rsassapssmgf1sha256_2048_sha256    = -1;
-static int hf_rtps_flag_security_digital_signature_mask_rsassapkcs1v15_2048_sha256         = -1;
-static int hf_rtps_flag_security_digital_signature_mask_ecdsa_p256_sha256                  = -1;
-static int hf_rtps_flag_security_digital_signature_mask_ecdsa_p384_sha384                  = -1;
-static int hf_rtps_flag_security_digital_signature_mask_custom_algorithm                   = -1;
-static int hf_rtps_flag_security_key_establishment_mask_dhe_modp2048256                    = -1;
-static int hf_rtps_flag_security_key_establishment_mask_ecdheceum_p256                     = -1;
-static int hf_rtps_flag_security_key_establishment_mask_ecdheceum_p384                     = -1;
-static int hf_rtps_flag_security_key_establishment_mask_custom_algorithm                   = -1;
-static int hf_rtps_flag_security_algorithm_compatibility_mode                              = -1;
-static int hf_rtps_flag_security_payload_protected                                        = -1;
-static int hf_rtps_flag_endpoint_security_attribute_flag_is_read_protected                = -1;
-static int hf_rtps_flag_endpoint_security_attribute_flag_is_write_protected               = -1;
-static int hf_rtps_flag_endpoint_security_attribute_flag_is_discovery_protected           = -1;
-static int hf_rtps_flag_endpoint_security_attribute_flag_is_submessage_protected          = -1;
-static int hf_rtps_flag_endpoint_security_attribute_flag_is_payload_protected             = -1;
-static int hf_rtps_flag_endpoint_security_attribute_flag_is_key_protected                 = -1;
-static int hf_rtps_flag_endpoint_security_attribute_flag_is_liveliness_protected          = -1;
-static int hf_rtps_flag_endpoint_security_attribute_flag_is_valid                         = -1;
-static int hf_rtps_param_endpoint_security_attributes_mask                                = -1;
-static int hf_rtps_flag_plugin_endpoint_security_attribute_flag_is_payload_encrypted      = -1;
-static int hf_rtps_flag_plugin_endpoint_security_attribute_flag_is_key_encrypted          = -1;
-static int hf_rtps_flag_plugin_endpoint_security_attribute_flag_is_liveliness_encrypted   = -1;
-static int hf_rtps_flag_plugin_endpoint_security_attribute_flag_is_valid                  = -1;
-static int hf_rtps_param_plugin_endpoint_security_attributes_mask                         = -1;
-static int hf_rtps_flag_participant_security_attribute_flag_is_rtps_protected             = -1;
-static int hf_rtps_flag_participant_security_attribute_flag_is_discovery_protected        = -1;
-static int hf_rtps_flag_participant_security_attribute_flag_is_liveliness_protected       = -1;
-static int hf_rtps_flag_participant_security_attribute_flag_key_revisions_enabled         = -1;
-static int hf_rtps_flag_participant_security_attribute_flag_is_valid                      = -1;
-static int hf_rtps_param_participant_security_attributes_mask                             = -1;
-static int hf_rtps_flag_plugin_participant_security_attribute_flag_is_rtps_encrypted              = -1;
-static int hf_rtps_flag_plugin_participant_security_attribute_flag_is_discovery_encrypted         = -1;
-static int hf_rtps_flag_plugin_participant_security_attribute_flag_is_liveliness_encrypted        = -1;
-static int hf_rtps_flag_plugin_participant_security_attribute_flag_is_rtps_origin_encrypted       = -1;
-static int hf_rtps_flag_plugin_participant_security_attribute_flag_is_discovery_origin_encrypted  = -1;
-static int hf_rtps_flag_plugin_participant_security_attribute_flag_is_liveliness_origin_encrypted = -1;
-static int hf_rtps_flag_plugin_participant_security_attribute_flag_is_valid                       = -1;
-static int hf_rtps_param_plugin_participant_security_attributes_mask                              = -1;
-static int hf_rtps_sm_rti_crc_number                            = -1;
-static int hf_rtps_sm_rti_crc_result                            = -1;
-static int hf_rtps_data_tag_name                                = -1;
-static int hf_rtps_data_tag_value                               = -1;
-static int hf_rtps_flag_udpv4_wan_locator_u                     = -1;
-static int hf_rtps_flag_udpv4_wan_locator_p                     = -1;
-static int hf_rtps_flag_udpv4_wan_locator_b                     = -1;
-static int hf_rtps_flag_udpv4_wan_locator_r                     = -1;
-static int hf_rtps_flag_udpv4_wan_binding_ping_e                = -1;
-static int hf_rtps_flag_udpv4_wan_binding_ping_l                = -1;
-static int hf_rtps_flag_udpv4_wan_binding_ping_b                = -1;
-static int hf_rtps_header_extension_flags                       = -1;
-static int hf_rtps_flag_header_extension_message_length         = -1;
-static int hf_rtps_flag_header_extension_uextension             = -1;
-static int hf_rtps_flag_header_extension_wextension             = -1;
-static int hf_rtps_flag_header_extension_checksum1              = -1;
-static int hf_rtps_flag_header_extension_checksum2              = -1;
-static int hf_rtps_flag_header_extension_parameters             = -1;
-static int hf_rtps_flag_header_extension_timestamp              = -1;
-
-static int hf_rtps_fragments                                    = -1;
-static int hf_rtps_fragment                                     = -1;
-static int hf_rtps_fragment_overlap                             = -1;
-static int hf_rtps_fragment_overlap_conflict                    = -1;
-static int hf_rtps_fragment_multiple_tails                      = -1;
-static int hf_rtps_fragment_too_long_fragment                   = -1;
-static int hf_rtps_fragment_error                               = -1;
-static int hf_rtps_fragment_count                               = -1;
-static int hf_rtps_reassembled_in                               = -1;
-static int hf_rtps_reassembled_length                           = -1;
-static int hf_rtps_reassembled_data                             = -1;
-static int hf_rtps_encapsulation_extended_compression_options   = -1;
-static int hf_rtps_message_length                               = -1;
-static int hf_rtps_header_extension_checksum_crc32c             = -1;
-static int hf_rtps_header_extension_checksum_crc64              = -1;
-static int hf_rtps_header_extension_checksum_md5                = -1;
-static int hf_rtps_uextension                                   = -1;
-static int hf_rtps_wextension                                   = -1;
-static int hf_rtps_writer_group_oid                             = -1;
-static int hf_rtps_reader_group_oid                             = -1;
-static int hf_rtps_writer_session_id                            = -1;
+static int hf_rtps_flag_reserved80;
+static int hf_rtps_flag_reserved40;
+static int hf_rtps_flag_reserved20;
+static int hf_rtps_flag_reserved10;
+static int hf_rtps_flag_reserved08;
+static int hf_rtps_flag_reserved04;
+static int hf_rtps_flag_reserved02;
+static int hf_rtps_flag_reserved8000;
+static int hf_rtps_flag_reserved4000;
+static int hf_rtps_flag_reserved2000;
+static int hf_rtps_flag_reserved1000;
+static int hf_rtps_flag_reserved0800;
+static int hf_rtps_flag_reserved0400;
+static int hf_rtps_flag_reserved0200;
+static int hf_rtps_flag_reserved0100;
+static int hf_rtps_flag_reserved0080;
+static int hf_rtps_flag_reserved0040;
+
+static int hf_rtps_flag_builtin_endpoint_set_reserved;
+static int hf_rtps_flag_unregister;
+static int hf_rtps_flag_inline_qos_v1;
+static int hf_rtps_flag_hash_key;
+static int hf_rtps_flag_alive;
+static int hf_rtps_flag_data_present_v1;
+static int hf_rtps_flag_multisubmessage;
+static int hf_rtps_flag_endianness;
+static int hf_rtps_flag_additional_authenticated_data;
+static int hf_rtps_flag_protected_with_psk;
+static int hf_rtps_flag_vendor_specific_content;
+static int hf_rtps_flag_status_info;
+static int hf_rtps_flag_data_present_v2;
+static int hf_rtps_flag_inline_qos_v2;
+static int hf_rtps_flag_final;
+static int hf_rtps_flag_hash_key_rti;
+static int hf_rtps_flag_liveliness;
+static int hf_rtps_flag_multicast;
+static int hf_rtps_flag_data_serialized_key;
+static int hf_rtps_flag_data_frag_serialized_key;
+static int hf_rtps_flag_timestamp;
+static int hf_rtps_flag_no_virtual_guids;
+static int hf_rtps_flag_multiple_writers;
+static int hf_rtps_flag_multiple_virtual_guids;
+static int hf_rtps_flag_serialize_key16;
+static int hf_rtps_flag_invalid_sample;
+static int hf_rtps_flag_data_present16;
+static int hf_rtps_flag_offsetsn_present;
+static int hf_rtps_flag_inline_qos16_v2;
+static int hf_rtps_flag_timestamp_present;
+static int hf_rtps_flag_unregistered;
+static int hf_rtps_flag_disposed;
+static int hf_rtps_param_status_info_flags;
+
+static int hf_rtps_flag_participant_announcer;
+static int hf_rtps_flag_participant_detector;
+static int hf_rtps_flag_publication_announcer;
+static int hf_rtps_flag_publication_detector;
+static int hf_rtps_flag_subscription_announcer;
+static int hf_rtps_flag_subscription_detector;
+static int hf_rtps_flag_participant_proxy_announcer;
+static int hf_rtps_flag_participant_proxy_detector;
+static int hf_rtps_flag_participant_state_announcer;
+static int hf_rtps_flag_participant_state_detector;
+static int hf_rtps_flag_participant_message_datawriter;
+static int hf_rtps_flag_participant_message_datareader;
+static int hf_rtps_flag_secure_publication_writer;
+static int hf_rtps_flag_secure_publication_reader;
+static int hf_rtps_flag_secure_subscription_writer;
+static int hf_rtps_flag_secure_subscription_reader;
+static int hf_rtps_flag_secure_participant_message_writer;
+static int hf_rtps_flag_secure_participant_message_reader;
+static int hf_rtps_flag_participant_stateless_message_writer;
+static int hf_rtps_flag_participant_stateless_message_reader;
+static int hf_rtps_flag_secure_participant_volatile_message_writer;
+static int hf_rtps_flag_secure_participant_volatile_message_reader;
+static int hf_rtps_flag_participant_secure_writer;
+static int hf_rtps_flag_participant_secure_reader;
+static int hf_rtps_flag_typeflag_final;
+static int hf_rtps_flag_typeflag_mutable;
+static int hf_rtps_flag_typeflag_nested;
+static int hf_rtps_flag_memberflag_key;
+static int hf_rtps_flag_memberflag_optional;
+static int hf_rtps_flag_memberflag_shareable;
+static int hf_rtps_flag_memberflag_union_default;
+static int hf_rtps_flag_service_request_writer;
+static int hf_rtps_flag_service_request_reader;
+static int hf_rtps_flag_locator_ping_writer;
+static int hf_rtps_flag_locator_ping_reader;
+static int hf_rtps_flag_secure_service_request_writer;
+static int hf_rtps_flag_cloud_discovery_service_announcer;
+static int hf_rtps_flag_participant_config_writer;
+static int hf_rtps_flag_participant_config_reader;
+static int hf_rtps_flag_participant_config_secure_writer;
+static int hf_rtps_flag_participant_config_secure_reader;
+static int hf_rtps_flag_participant_bootstrap_writer;
+static int hf_rtps_flag_participant_bootstrap_reader;
+static int hf_rtps_flag_monitoring_periodic_writer;
+static int hf_rtps_flag_monitoring_periodic_reader;
+static int hf_rtps_flag_monitoring_event_writer;
+static int hf_rtps_flag_monitoring_event_reader;
+static int hf_rtps_flag_monitoring_logging_writer;
+static int hf_rtps_flag_monitoring_logging_reader;
+static int hf_rtps_flag_secure_service_request_reader;
+static int hf_rtps_flag_security_access_protected;
+static int hf_rtps_flag_security_discovery_protected;
+static int hf_rtps_flag_security_submessage_protected;
+static int hf_rtps_param_participant_security_symmetric_cipher_algorithms_builtin_endpoints_required_mask;
+static int hf_rtps_param_participant_security_symmetric_cipher_algorithms_builtin_endpoints_key_exchange_used_bit;
+static int hf_rtps_param_participant_security_symmetric_cipher_algorithms_supported_mask;
+static int hf_rtps_flag_security_symmetric_cipher_mask_aes128_gcm;
+static int hf_rtps_flag_security_symmetric_cipher_mask_aes256_gcm;
+static int hf_rtps_flag_security_symmetric_cipher_mask_custom_algorithm;
+static int hf_rtps_param_compression_id_mask;
+static int hf_rtps_flag_compression_id_zlib;
+static int hf_rtps_flag_compression_id_bzip2;
+static int hf_rtps_flag_compression_id_lz4;
+static int hf_rtps_param_crypto_algorithm_requirements_trust_chain;
+static int hf_rtps_param_crypto_algorithm_requirements_message_auth;
+static int hf_rtps_flag_security_digital_signature_mask_rsassapssmgf1sha256_2048_sha256;
+static int hf_rtps_flag_security_digital_signature_mask_rsassapkcs1v15_2048_sha256;
+static int hf_rtps_flag_security_digital_signature_mask_ecdsa_p256_sha256;
+static int hf_rtps_flag_security_digital_signature_mask_ecdsa_p384_sha384;
+static int hf_rtps_flag_security_digital_signature_mask_custom_algorithm;
+static int hf_rtps_flag_security_key_establishment_mask_dhe_modp2048256;
+static int hf_rtps_flag_security_key_establishment_mask_ecdheceum_p256;
+static int hf_rtps_flag_security_key_establishment_mask_ecdheceum_p384;
+static int hf_rtps_flag_security_key_establishment_mask_custom_algorithm;
+static int hf_rtps_flag_security_algorithm_compatibility_mode;
+static int hf_rtps_flag_security_payload_protected;
+static int hf_rtps_flag_endpoint_security_attribute_flag_is_read_protected;
+static int hf_rtps_flag_endpoint_security_attribute_flag_is_write_protected;
+static int hf_rtps_flag_endpoint_security_attribute_flag_is_discovery_protected;
+static int hf_rtps_flag_endpoint_security_attribute_flag_is_submessage_protected;
+static int hf_rtps_flag_endpoint_security_attribute_flag_is_payload_protected;
+static int hf_rtps_flag_endpoint_security_attribute_flag_is_key_protected;
+static int hf_rtps_flag_endpoint_security_attribute_flag_is_liveliness_protected;
+static int hf_rtps_flag_endpoint_security_attribute_flag_is_valid;
+static int hf_rtps_param_endpoint_security_attributes_mask;
+static int hf_rtps_flag_plugin_endpoint_security_attribute_flag_is_payload_encrypted;
+static int hf_rtps_flag_plugin_endpoint_security_attribute_flag_is_key_encrypted;
+static int hf_rtps_flag_plugin_endpoint_security_attribute_flag_is_liveliness_encrypted;
+static int hf_rtps_flag_plugin_endpoint_security_attribute_flag_is_valid;
+static int hf_rtps_param_plugin_endpoint_security_attributes_mask;
+static int hf_rtps_flag_participant_security_attribute_flag_is_rtps_protected;
+static int hf_rtps_flag_participant_security_attribute_flag_is_discovery_protected;
+static int hf_rtps_flag_participant_security_attribute_flag_is_liveliness_protected;
+static int hf_rtps_flag_participant_security_attribute_flag_key_revisions_enabled;
+static int hf_rtps_flag_participant_security_attribute_flag_is_valid;
+static int hf_rtps_param_participant_security_attributes_mask;
+static int hf_rtps_flag_plugin_participant_security_attribute_flag_is_rtps_encrypted;
+static int hf_rtps_flag_plugin_participant_security_attribute_flag_is_discovery_encrypted;
+static int hf_rtps_flag_plugin_participant_security_attribute_flag_is_liveliness_encrypted;
+static int hf_rtps_flag_plugin_participant_security_attribute_flag_is_rtps_origin_encrypted;
+static int hf_rtps_flag_plugin_participant_security_attribute_flag_is_discovery_origin_encrypted;
+static int hf_rtps_flag_plugin_participant_security_attribute_flag_is_liveliness_origin_encrypted;
+static int hf_rtps_flag_plugin_participant_security_attribute_flag_is_valid;
+static int hf_rtps_param_plugin_participant_security_attributes_mask;
+static int hf_rtps_sm_rti_crc_number;
+static int hf_rtps_sm_rti_crc_result;
+static int hf_rtps_data_tag_name;
+static int hf_rtps_data_tag_value;
+static int hf_rtps_flag_udpv4_wan_locator_u;
+static int hf_rtps_flag_udpv4_wan_locator_p;
+static int hf_rtps_flag_udpv4_wan_locator_b;
+static int hf_rtps_flag_udpv4_wan_locator_r;
+static int hf_rtps_flag_udpv4_wan_binding_ping_e;
+static int hf_rtps_flag_udpv4_wan_binding_ping_l;
+static int hf_rtps_flag_udpv4_wan_binding_ping_b;
+static int hf_rtps_header_extension_flags;
+static int hf_rtps_flag_header_extension_message_length;
+static int hf_rtps_flag_header_extension_uextension;
+static int hf_rtps_flag_header_extension_wextension;
+static int hf_rtps_flag_header_extension_checksum1;
+static int hf_rtps_flag_header_extension_checksum2;
+static int hf_rtps_flag_header_extension_parameters;
+static int hf_rtps_flag_header_extension_timestamp;
+
+static int hf_rtps_fragments;
+static int hf_rtps_fragment;
+static int hf_rtps_fragment_overlap;
+static int hf_rtps_fragment_overlap_conflict;
+static int hf_rtps_fragment_multiple_tails;
+static int hf_rtps_fragment_too_long_fragment;
+static int hf_rtps_fragment_error;
+static int hf_rtps_fragment_count;
+static int hf_rtps_reassembled_in;
+static int hf_rtps_reassembled_length;
+static int hf_rtps_reassembled_data;
+static int hf_rtps_encapsulation_extended_compression_options;
+static int hf_rtps_message_length;
+static int hf_rtps_header_extension_checksum_crc32c;
+static int hf_rtps_header_extension_checksum_crc64;
+static int hf_rtps_header_extension_checksum_md5;
+static int hf_rtps_uextension;
+static int hf_rtps_wextension;
+static int hf_rtps_writer_group_oid;
+static int hf_rtps_reader_group_oid;
+static int hf_rtps_writer_session_id;
 
 /* Subtree identifiers */
-static gint ett_rtps_dissection_tree = -1;
-static gint ett_rtps                            = -1;
-static gint ett_rtps_default_mapping            = -1;
-static gint ett_rtps_proto_version              = -1;
-static gint ett_rtps_submessage                 = -1;
-static gint ett_rtps_parameter_sequence         = -1;
-static gint ett_rtps_parameter                  = -1;
-static gint ett_rtps_flags                      = -1;
-static gint ett_rtps_entity                     = -1;
-static gint ett_rtps_generic_guid               = -1;
-static gint ett_rtps_rdentity                   = -1;
-static gint ett_rtps_wrentity                   = -1;
-static gint ett_rtps_guid_prefix                = -1;
-static gint ett_rtps_app_id                     = -1;
-static gint ett_rtps_locator_udp_v4             = -1;
-static gint ett_rtps_locator                    = -1;
-static gint ett_rtps_locator_list               = -1;
-static gint ett_rtps_timestamp                  = -1;
-static gint ett_rtps_bitmap                     = -1;
-static gint ett_rtps_seq_string                 = -1;
-static gint ett_rtps_seq_ulong                  = -1;
-static gint ett_rtps_resource_limit             = -1;
-static gint ett_rtps_durability_service         = -1;
-static gint ett_rtps_liveliness                 = -1;
-static gint ett_rtps_manager_key                = -1;
-static gint ett_rtps_serialized_data            = -1;
-static gint ett_rtps_locator_filter_channel     = -1;
-static gint ett_rtps_part_message_data          = -1;
-static gint ett_rtps_sample_info_list           = -1;
-static gint ett_rtps_sample_info                = -1;
-static gint ett_rtps_sample_batch_list          = -1;
-static gint ett_rtps_locator_filter_locator                     = -1;
-static gint ett_rtps_writer_heartbeat_virtual_list              = -1;
-static gint ett_rtps_writer_heartbeat_virtual                   = -1;
-static gint ett_rtps_virtual_guid_heartbeat_virtual_list        = -1;
-static gint ett_rtps_virtual_guid_heartbeat_virtual             = -1;
-static gint ett_rtps_app_ack_virtual_writer_interval_list       = -1;
-static gint ett_rtps_app_ack_virtual_writer_interval            = -1;
-static gint ett_rtps_transport_info                             = -1;
-static gint ett_rtps_app_ack_virtual_writer_list                = -1;
-static gint ett_rtps_app_ack_virtual_writer                     = -1;
-static gint ett_rtps_product_version                            = -1;
-static gint ett_rtps_property_list                              = -1;
-static gint ett_rtps_property                                   = -1;
-static gint ett_rtps_topic_info                                 = -1;
-static gint ett_rtps_topic_info_dw_qos                          = -1;
-static gint ett_rtps_type_object                                = -1;
-static gint ett_rtps_type_library                               = -1;
-static gint ett_rtps_type_element                               = -1;
-static gint ett_rtps_type_annotation_usage_list                 = -1;
-static gint ett_rtps_type_enum_constant                         = -1;
-static gint ett_rtps_type_bound_list                            = -1;
-static gint ett_rtps_secure_payload_tree                        = -1;
-static gint ett_rtps_secure_dataheader_tree                     = -1;
-static gint ett_rtps_pgm_data                                   = -1;
-static gint ett_rtps_message_identity                           = -1;
-static gint ett_rtps_related_message_identity                   = -1;
-static gint ett_rtps_data_holder_seq                            = -1;
-static gint ett_rtps_data_holder                                = -1;
-static gint ett_rtps_data_holder_properties                     = -1;
-static gint ett_rtps_property_tree                              = -1;
-static gint ett_rtps_param_header_tree                          = -1;
-static gint ett_rtps_service_request_tree                       = -1;
-static gint ett_rtps_locator_ping_tree                          = -1;
-static gint ett_rtps_locator_reachability_tree                  = -1;
-static gint ett_rtps_custom_dissection_info                     = -1;
-static gint ett_rtps_locator_list_tree                          = -1;
-static gint ett_rtps_topic_query_tree                           = -1;
-static gint ett_rtps_topic_query_selection_tree                 = -1;
-static gint ett_rtps_topic_query_filter_params_tree             = -1;
-static gint ett_rtps_data_member                                = -1;
-static gint ett_rtps_data_tag_seq                               = -1;
-static gint ett_rtps_data_tag_item                              = -1;
-static gint ett_rtps_fragment                                   = -1;
-static gint ett_rtps_fragments                                  = -1;
-static gint ett_rtps_data_representation                        = -1;
-static gint ett_rtps_decompressed_type_object                   = -1;
-static gint ett_rtps_info_remaining_items                       = -1;
-static gint ett_rtps_data_encapsulation_options                 = -1;
-static gint ett_rtps_decompressed_serialized_data               = -1;
-static gint ett_rtps_instance_transition_data                   = -1;
-static gint ett_rtps_crypto_algorithm_requirements              = -1;
-
-static expert_field ei_rtps_sm_octets_to_next_header_error = EI_INIT;
-static expert_field ei_rtps_checksum_check_error = EI_INIT;
-static expert_field ei_rtps_port_invalid = EI_INIT;
-static expert_field ei_rtps_ip_invalid = EI_INIT;
-static expert_field ei_rtps_parameter_value_invalid = EI_INIT;
-static expert_field ei_rtps_extra_bytes = EI_INIT;
-static expert_field ei_rtps_missing_bytes = EI_INIT;
-static expert_field ei_rtps_locator_port = EI_INIT;
-static expert_field ei_rtps_more_samples_available = EI_INIT;
-static expert_field ei_rtps_parameter_not_decoded = EI_INIT;
-static expert_field ei_rtps_sm_octets_to_next_header_not_zero = EI_INIT;
-static expert_field ei_rtps_pid_type_csonsistency_invalid_size = EI_INIT;
-static expert_field ei_rtps_uncompression_error = EI_INIT;
-static expert_field ei_rtps_value_too_large = EI_INIT;
+static gint ett_rtps_dissection_tree;
+static gint ett_rtps;
+static gint ett_rtps_default_mapping;
+static gint ett_rtps_proto_version;
+static gint ett_rtps_submessage;
+static gint ett_rtps_parameter_sequence;
+static gint ett_rtps_parameter;
+static gint ett_rtps_flags;
+static gint ett_rtps_entity;
+static gint ett_rtps_generic_guid;
+static gint ett_rtps_rdentity;
+static gint ett_rtps_wrentity;
+static gint ett_rtps_guid_prefix;
+static gint ett_rtps_app_id;
+static gint ett_rtps_locator_udp_v4;
+static gint ett_rtps_locator;
+static gint ett_rtps_locator_list;
+static gint ett_rtps_timestamp;
+static gint ett_rtps_bitmap;
+static gint ett_rtps_seq_string;
+static gint ett_rtps_seq_ulong;
+static gint ett_rtps_resource_limit;
+static gint ett_rtps_durability_service;
+static gint ett_rtps_liveliness;
+static gint ett_rtps_manager_key;
+static gint ett_rtps_serialized_data;
+static gint ett_rtps_locator_filter_channel;
+static gint ett_rtps_part_message_data;
+static gint ett_rtps_sample_info_list;
+static gint ett_rtps_sample_info;
+static gint ett_rtps_sample_batch_list;
+static gint ett_rtps_locator_filter_locator;
+static gint ett_rtps_writer_heartbeat_virtual_list;
+static gint ett_rtps_writer_heartbeat_virtual;
+static gint ett_rtps_virtual_guid_heartbeat_virtual_list;
+static gint ett_rtps_virtual_guid_heartbeat_virtual;
+static gint ett_rtps_app_ack_virtual_writer_interval_list;
+static gint ett_rtps_app_ack_virtual_writer_interval;
+static gint ett_rtps_transport_info;
+static gint ett_rtps_app_ack_virtual_writer_list;
+static gint ett_rtps_app_ack_virtual_writer;
+static gint ett_rtps_product_version;
+static gint ett_rtps_property_list;
+static gint ett_rtps_property;
+static gint ett_rtps_topic_info;
+static gint ett_rtps_topic_info_dw_qos;
+static gint ett_rtps_type_object;
+static gint ett_rtps_type_library;
+static gint ett_rtps_type_element;
+static gint ett_rtps_type_annotation_usage_list;
+static gint ett_rtps_type_enum_constant;
+static gint ett_rtps_type_bound_list;
+static gint ett_rtps_secure_payload_tree;
+static gint ett_rtps_secure_dataheader_tree;
+static gint ett_rtps_pgm_data;
+static gint ett_rtps_message_identity;
+static gint ett_rtps_related_message_identity;
+static gint ett_rtps_data_holder_seq;
+static gint ett_rtps_data_holder;
+static gint ett_rtps_data_holder_properties;
+static gint ett_rtps_property_tree;
+static gint ett_rtps_param_header_tree;
+static gint ett_rtps_service_request_tree;
+static gint ett_rtps_locator_ping_tree;
+static gint ett_rtps_locator_reachability_tree;
+static gint ett_rtps_custom_dissection_info;
+static gint ett_rtps_locator_list_tree;
+static gint ett_rtps_topic_query_tree;
+static gint ett_rtps_topic_query_selection_tree;
+static gint ett_rtps_topic_query_filter_params_tree;
+static gint ett_rtps_data_member;
+static gint ett_rtps_data_tag_seq;
+static gint ett_rtps_data_tag_item;
+static gint ett_rtps_fragment;
+static gint ett_rtps_fragments;
+static gint ett_rtps_data_representation;
+static gint ett_rtps_decompressed_type_object;
+static gint ett_rtps_info_remaining_items;
+static gint ett_rtps_data_encapsulation_options;
+static gint ett_rtps_decompressed_serialized_data;
+static gint ett_rtps_instance_transition_data;
+static gint ett_rtps_crypto_algorithm_requirements;
+
+static expert_field ei_rtps_sm_octets_to_next_header_error;
+static expert_field ei_rtps_checksum_check_error;
+static expert_field ei_rtps_port_invalid;
+static expert_field ei_rtps_ip_invalid;
+static expert_field ei_rtps_parameter_value_invalid;
+static expert_field ei_rtps_extra_bytes;
+static expert_field ei_rtps_missing_bytes;
+static expert_field ei_rtps_locator_port;
+static expert_field ei_rtps_more_samples_available;
+static expert_field ei_rtps_parameter_not_decoded;
+static expert_field ei_rtps_sm_octets_to_next_header_not_zero;
+static expert_field ei_rtps_pid_type_csonsistency_invalid_size;
+static expert_field ei_rtps_uncompression_error;
+static expert_field ei_rtps_value_too_large;
 
 /***************************************************************************/
 /* Value-to-String Tables */
diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c
index dc671f2144..8ba34656a6 100644
--- a/epan/dissectors/packet-rtsp.c
+++ b/epan/dissectors/packet-rtsp.c
@@ -101,38 +101,38 @@ const value_string rtsp_status_code_vals[] = {
     { 0,    NULL}
 };
 
-static int proto_rtsp       = -1;
-
-static gint ett_rtsp        = -1;
-static gint ett_rtspframe   = -1;
-static gint ett_rtsp_method     = -1;
-
-static int hf_rtsp_request  = -1;
-static int hf_rtsp_response = -1;
-static int hf_rtsp_content_type = -1;
-static int hf_rtsp_content_length   = -1;
-static int hf_rtsp_method   = -1;
-static int hf_rtsp_url      = -1;
-static int hf_rtsp_status   = -1;
-static int hf_rtsp_session  = -1;
-static int hf_rtsp_transport    = -1;
-static int hf_rtsp_rdtfeaturelevel  = -1;
-static int hf_rtsp_X_Vig_Msisdn = -1;
-static int hf_rtsp_magic = -1;
-static int hf_rtsp_channel = -1;
-static int hf_rtsp_length = -1;
-static int hf_rtsp_data = -1;
+static int proto_rtsp;
+
+static gint ett_rtsp;
+static gint ett_rtspframe;
+static gint ett_rtsp_method;
+
+static int hf_rtsp_request;
+static int hf_rtsp_response;
+static int hf_rtsp_content_type;
+static int hf_rtsp_content_length;
+static int hf_rtsp_method;
+static int hf_rtsp_url;
+static int hf_rtsp_status;
+static int hf_rtsp_session;
+static int hf_rtsp_transport;
+static int hf_rtsp_rdtfeaturelevel;
+static int hf_rtsp_X_Vig_Msisdn;
+static int hf_rtsp_magic;
+static int hf_rtsp_channel;
+static int hf_rtsp_length;
+static int hf_rtsp_data;
 
 static int voip_tap = -1;
 
-static expert_field ei_rtsp_unknown_transport_type = EI_INIT;
-static expert_field ei_rtsp_bad_server_port = EI_INIT;
-static expert_field ei_rtsp_bad_client_port = EI_INIT;
-static expert_field ei_rtsp_bad_interleaved_channel = EI_INIT;
-static expert_field ei_rtsp_content_length_invalid = EI_INIT;
-static expert_field ei_rtsp_rdtfeaturelevel_invalid = EI_INIT;
-static expert_field ei_rtsp_bad_server_ip_address = EI_INIT;
-static expert_field ei_rtsp_bad_client_ip_address = EI_INIT;
+static expert_field ei_rtsp_unknown_transport_type;
+static expert_field ei_rtsp_bad_server_port;
+static expert_field ei_rtsp_bad_client_port;
+static expert_field ei_rtsp_bad_interleaved_channel;
+static expert_field ei_rtsp_content_length_invalid;
+static expert_field ei_rtsp_rdtfeaturelevel_invalid;
+static expert_field ei_rtsp_bad_server_ip_address;
+static expert_field ei_rtsp_bad_client_ip_address;
 
 static dissector_handle_t rtsp_handle;
 static dissector_handle_t rtp_handle;
diff --git a/epan/dissectors/packet-rudp.c b/epan/dissectors/packet-rudp.c
index 73bc2eff43..d4c0bde570 100644
--- a/epan/dissectors/packet-rudp.c
+++ b/epan/dissectors/packet-rudp.c
@@ -39,24 +39,24 @@ void proto_reg_handoff_rudp(void);
 
 static dissector_handle_t rudp_handle;
 
-static int proto_rudp = -1;
-
-static int hf_rudp_flags = -1;
-static int hf_rudp_flags_syn = -1;
-static int hf_rudp_flags_ack = -1;
-static int hf_rudp_flags_eak = -1;
-static int hf_rudp_flags_rst = -1;
-static int hf_rudp_flags_nul = -1;
-static int hf_rudp_flags_chk = -1;
-static int hf_rudp_flags_tcs = -1;
-static int hf_rudp_flags_0 = -1;
-static int hf_rudp_hlen = -1;
-static int hf_rudp_seq = -1;
-static int hf_rudp_ack = -1;
-static int hf_rudp_cksum = -1;
-
-static gint ett_rudp = -1;
-static gint ett_rudp_flags = -1;
+static int proto_rudp;
+
+static int hf_rudp_flags;
+static int hf_rudp_flags_syn;
+static int hf_rudp_flags_ack;
+static int hf_rudp_flags_eak;
+static int hf_rudp_flags_rst;
+static int hf_rudp_flags_nul;
+static int hf_rudp_flags_chk;
+static int hf_rudp_flags_tcs;
+static int hf_rudp_flags_0;
+static int hf_rudp_hlen;
+static int hf_rudp_seq;
+static int hf_rudp_ack;
+static int hf_rudp_cksum;
+
+static gint ett_rudp;
+static gint ett_rudp_flags;
 
 static dissector_handle_t sm_handle = NULL;
 
diff --git a/epan/dissectors/packet-rwall.c b/epan/dissectors/packet-rwall.c
index ea48db38e9..8d1d12ef27 100644
--- a/epan/dissectors/packet-rwall.c
+++ b/epan/dissectors/packet-rwall.c
@@ -23,12 +23,12 @@ static const value_string rwall1_proc_vals[] = {
 	{ 0,	NULL }
 };
 
-static int proto_rwall = -1;
+static int proto_rwall;
 
-static int hf_rwall_message = -1;
-static int hf_rwall_procedure_v1 = -1;
+static int hf_rwall_message;
+static int hf_rwall_procedure_v1;
 
-static gint ett_rwall = -1;
+static gint ett_rwall;
 
 static int
 dissect_rwall_call(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c
index 30a7b5cf8c..6a0e86db0f 100644
--- a/epan/dissectors/packet-rx.c
+++ b/epan/dissectors/packet-rx.c
@@ -67,56 +67,56 @@ static const value_string rx_ack_type[] = {
 	{ 0,			NULL	}
 };
 
-static int proto_rx = -1;
-static int hf_rx_epoch = -1;
-static int hf_rx_cid = -1;
-static int hf_rx_seq = -1;
-static int hf_rx_serial = -1;
-static int hf_rx_callnumber = -1;
-static int hf_rx_type = -1;
-static int hf_rx_flags = -1;
-static int hf_rx_flags_clientinit = -1;
-static int hf_rx_flags_request_ack = -1;
-static int hf_rx_flags_last_packet = -1;
-static int hf_rx_flags_more_packets = -1;
-static int hf_rx_flags_free_packet = -1;
-static int hf_rx_userstatus = -1;
-static int hf_rx_securityindex = -1;
-static int hf_rx_spare = -1;
-static int hf_rx_serviceid = -1;
-static int hf_rx_bufferspace = -1;
-static int hf_rx_maxskew = -1;
-static int hf_rx_first_packet = -1;
-static int hf_rx_prev_packet = -1;
-static int hf_rx_reason = -1;
-static int hf_rx_numacks = -1;
-static int hf_rx_ack_type = -1;
-static int hf_rx_ack = -1;
-static int hf_rx_challenge = -1;
-static int hf_rx_version = -1;
-static int hf_rx_nonce = -1;
-static int hf_rx_inc_nonce = -1;
-static int hf_rx_min_level = -1;
-static int hf_rx_level = -1;
-static int hf_rx_response = -1;
-static int hf_rx_encrypted = -1;
-static int hf_rx_kvno = -1;
-static int hf_rx_ticket_len = -1;
-static int hf_rx_ticket = -1;
-static int hf_rx_ifmtu = -1;
-static int hf_rx_maxmtu = -1;
-static int hf_rx_rwind = -1;
-static int hf_rx_maxpackets = -1;
-static int hf_rx_abort = -1;
-static int hf_rx_abortcode = -1;
-
-static gint ett_rx = -1;
-static gint ett_rx_flags = -1;
-static gint ett_rx_ack = -1;
-static gint ett_rx_challenge = -1;
-static gint ett_rx_response = -1;
-static gint ett_rx_encrypted = -1;
-static gint ett_rx_abort = -1;
+static int proto_rx;
+static int hf_rx_epoch;
+static int hf_rx_cid;
+static int hf_rx_seq;
+static int hf_rx_serial;
+static int hf_rx_callnumber;
+static int hf_rx_type;
+static int hf_rx_flags;
+static int hf_rx_flags_clientinit;
+static int hf_rx_flags_request_ack;
+static int hf_rx_flags_last_packet;
+static int hf_rx_flags_more_packets;
+static int hf_rx_flags_free_packet;
+static int hf_rx_userstatus;
+static int hf_rx_securityindex;
+static int hf_rx_spare;
+static int hf_rx_serviceid;
+static int hf_rx_bufferspace;
+static int hf_rx_maxskew;
+static int hf_rx_first_packet;
+static int hf_rx_prev_packet;
+static int hf_rx_reason;
+static int hf_rx_numacks;
+static int hf_rx_ack_type;
+static int hf_rx_ack;
+static int hf_rx_challenge;
+static int hf_rx_version;
+static int hf_rx_nonce;
+static int hf_rx_inc_nonce;
+static int hf_rx_min_level;
+static int hf_rx_level;
+static int hf_rx_response;
+static int hf_rx_encrypted;
+static int hf_rx_kvno;
+static int hf_rx_ticket_len;
+static int hf_rx_ticket;
+static int hf_rx_ifmtu;
+static int hf_rx_maxmtu;
+static int hf_rx_rwind;
+static int hf_rx_maxpackets;
+static int hf_rx_abort;
+static int hf_rx_abortcode;
+
+static gint ett_rx;
+static gint ett_rx_flags;
+static gint ett_rx_ack;
+static gint ett_rx_challenge;
+static gint ett_rx_response;
+static gint ett_rx_encrypted;
+static gint ett_rx_abort;
 
 static dissector_handle_t afs_handle;
 
diff --git a/epan/dissectors/packet-s101.c b/epan/dissectors/packet-s101.c
index bb0772c26b..e9d95b1b53 100644
--- a/epan/dissectors/packet-s101.c
+++ b/epan/dissectors/packet-s101.c
@@ -46,22 +46,22 @@
 #define S101_VALID_CRC 0xF0B8
 #define APP_BYTES_LEN 2
 
-static int hf_S101_frame_format = -1;
-static int hf_S101_length_size = -1;
-static int hf_S101_message_length = -1;
-static int hf_S101_slot = -1;
-static int hf_S101_message_type = -1;
-static int hf_S101_cmd_type = -1;
-static int hf_S101_version = -1;
-static int hf_S101_flags = -1;
-static int hf_S101_dtd_type = -1;
-static int hf_S101_app_bytes_len = -1;
-static int hf_S101_dtd_minor_ver = -1;
-static int hf_S101_dtd_major_ver = -1;
-static int hf_S101_crc = -1;
-static int hf_S101_crc_status = -1;
-static int hf_S101_eof = -1;
-static int hf_S101_error = -1;
+static int hf_S101_frame_format;
+static int hf_S101_length_size;
+static int hf_S101_message_length;
+static int hf_S101_slot;
+static int hf_S101_message_type;
+static int hf_S101_cmd_type;
+static int hf_S101_version;
+static int hf_S101_flags;
+static int hf_S101_dtd_type;
+static int hf_S101_app_bytes_len;
+static int hf_S101_dtd_minor_ver;
+static int hf_S101_dtd_major_ver;
+static int hf_S101_crc;
+static int hf_S101_crc_status;
+static int hf_S101_eof;
+static int hf_S101_error;
 
 static dissector_handle_t S101_handle;
 static dissector_handle_t glow_handle = NULL;
@@ -82,35 +82,35 @@ static s101_fragment_t* new_fragment_info(packet_info *pinfo);
 static void display_expert_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int offset, int len);
 
 /* Initialize the protocol and registered fields */
-static int proto_S101 = -1;
+static int proto_S101;
 
 /* Real port preferences should generally default to 0 unless there is an
  * IANA-registered (or equivalent) port for your protocol. */
 #define S101_TCP_PORT 9000 /* Not IANA-registered */
 
 /* Initialize the subtree pointers */
-static gint ett_S101 = -1;
-static gint ett_decoding_error = -1;
+static gint ett_S101;
+static gint ett_decoding_error;
 
 #define S101_MIN_LENGTH 5
 
-static int hf_msg_fragments = -1;
-static int hf_msg_fragment = -1;
-static int hf_msg_fragment_overlap = -1;
-static int hf_msg_fragment_overlap_conflicts = -1;
-static int hf_msg_fragment_multiple_tails = -1;
-static int hf_msg_fragment_too_long_fragment = -1;
-static int hf_msg_fragment_error = -1;
-static int hf_msg_fragment_count = -1;
-static int hf_msg_reassembled_in = -1;
-static int hf_msg_reassembled_length = -1;
-static int hf_msg_reassembled_data = -1;
+static int hf_msg_fragments;
+static int hf_msg_fragment;
+static int hf_msg_fragment_overlap;
+static int hf_msg_fragment_overlap_conflicts;
+static int hf_msg_fragment_multiple_tails;
+static int hf_msg_fragment_too_long_fragment;
+static int hf_msg_fragment_error;
+static int hf_msg_fragment_count;
+static int hf_msg_reassembled_in;
+static int hf_msg_reassembled_length;
+static int hf_msg_reassembled_data;
 
 
-static expert_field ei_s101_failed_reassembly = EI_INIT;
+static expert_field ei_s101_failed_reassembly;
 
-static gint ett_msg_fragment = -1;
-static gint ett_msg_fragments = -1;
+static gint ett_msg_fragment;
+static gint ett_msg_fragments;
 
 static const fragment_items msg_frag_items = {
     /* Fragment subtrees */
diff --git a/epan/dissectors/packet-s5066dts.c b/epan/dissectors/packet-s5066dts.c
index f21a3b9e2b..b8ad9df854 100644
--- a/epan/dissectors/packet-s5066dts.c
+++ b/epan/dissectors/packet-s5066dts.c
@@ -58,7 +58,7 @@
 
 void proto_register_s5066dts(void);
 
-static gint proto_s5066dts = -1;
+static gint proto_s5066dts;
 
 static dissector_handle_t s5066dts_handle;
 static dissector_handle_t s5066dts_over_tcp_handle;
@@ -67,143 +67,143 @@ static dissector_handle_t s5066dts_over_tcp_handle;
 static gboolean config_proto_desegment = TRUE;
 
 /* Initialize expert fields */
-static expert_field ei_s5066dts_eow_hdr_drc_request_invalid = EI_INIT;
-static expert_field ei_s5066dts_eow_hftrp_invalid = EI_INIT;
+static expert_field ei_s5066dts_eow_hdr_drc_request_invalid;
+static expert_field ei_s5066dts_eow_hftrp_invalid;
 
 /* TCP port that will be listened by the application that peer
  * dts layers will be connected through
  */
 static range_t *config_s5066dts_ports = NULL;
 
-static gint hf_s5066dts_sync_word = -1;
-static gint hf_s5066dts_dpdu_type = -1;
-static gint hf_s5066dts_eow_type = -1;
-static gint hf_s5066dts_eow_data = -1;
-static gint hf_s5066dts_eot = -1;
-static gint hf_s5066dts_address_size = -1;
-static gint hf_s5066dts_header_size = -1;
-static gint hf_s5066dts_header_crc = -1;
-static gint hf_s5066dts_cpdu_crc = -1;
-static gint hf_s5066dts_segmented_cpdu = -1;
-static gint hf_s5066dts_dest_addr = -1;
-static gint hf_s5066dts_src_addr = -1;
+static gint hf_s5066dts_sync_word;
+static gint hf_s5066dts_dpdu_type;
+static gint hf_s5066dts_eow_type;
+static gint hf_s5066dts_eow_data;
+static gint hf_s5066dts_eot;
+static gint hf_s5066dts_address_size;
+static gint hf_s5066dts_header_size;
+static gint hf_s5066dts_header_crc;
+static gint hf_s5066dts_cpdu_crc;
+static gint hf_s5066dts_segmented_cpdu;
+static gint hf_s5066dts_dest_addr;
+static gint hf_s5066dts_src_addr;
 
 /* EOW TYPES */
 /* { 1, "DRC_REQUEST"}, */
-static gint hf_s5066dts_eow_drc_request_data_rate = -1;
-static gint hf_s5066dts_eow_drc_request_interleaving = -1;
-static gint hf_s5066dts_eow_drc_request_others = -1;
+static gint hf_s5066dts_eow_drc_request_data_rate;
+static gint hf_s5066dts_eow_drc_request_interleaving;
+static gint hf_s5066dts_eow_drc_request_others;
 /* { 2, "DRC_RESPONSE"}, */
-static gint hf_s5066dts_eow_drc_response_response = -1;
-static gint hf_s5066dts_eow_drc_response_reason = -1;
+static gint hf_s5066dts_eow_drc_response_response;
+static gint hf_s5066dts_eow_drc_response_reason;
 /* { 3, "UNRECOGNIZED_TYPE"}, */
-static gint hf_s5066dts_eow_unrec_type_response = -1;
-static gint hf_s5066dts_eow_unrec_type_reason = -1;
+static gint hf_s5066dts_eow_unrec_type_response;
+static gint hf_s5066dts_eow_unrec_type_reason;
 /* { 4, "CAPABILITY"}, */
-static gint hf_s5066dts_eow_capability_adaptive = -1;
-static gint hf_s5066dts_eow_capability_stanag_4529 = -1;
-static gint hf_s5066dts_eow_capability_mil_std_188_110a = -1;
-static gint hf_s5066dts_eow_capability_extended = -1;
-static gint hf_s5066dts_eow_capability_full_duplex = -1;
-static gint hf_s5066dts_eow_capability_split_frequency = -1;
-static gint hf_s5066dts_eow_capability_non_arcs_ale = -1;
-static gint hf_s5066dts_eow_capability_arcs = -1;
+static gint hf_s5066dts_eow_capability_adaptive;
+static gint hf_s5066dts_eow_capability_stanag_4529;
+static gint hf_s5066dts_eow_capability_mil_std_188_110a;
+static gint hf_s5066dts_eow_capability_extended;
+static gint hf_s5066dts_eow_capability_full_duplex;
+static gint hf_s5066dts_eow_capability_split_frequency;
+static gint hf_s5066dts_eow_capability_non_arcs_ale;
+static gint hf_s5066dts_eow_capability_arcs;
 /* { 5, "ALM_REQUEST"}, */
-static gint hf_s5066dts_eow_alm_request_data_rate = -1;
-static gint hf_s5066dts_eow_alm_request_interleaving = -1;
-static gint hf_s5066dts_eow_alm_request_others = -1;
+static gint hf_s5066dts_eow_alm_request_data_rate;
+static gint hf_s5066dts_eow_alm_request_interleaving;
+static gint hf_s5066dts_eow_alm_request_others;
 /* { 6, "ALM_RESPONSE"}, */
-static gint hf_s5066dts_eow_alm_response_response = -1;
-static gint hf_s5066dts_eow_alm_response_reason = -1;
+static gint hf_s5066dts_eow_alm_response_response;
+static gint hf_s5066dts_eow_alm_response_reason;
 /* { 7, "HDR_DRC_REQUEST"}, */
-static gint hf_s5066dts_eow_hdr_drc_request_waveform = -1;
-static gint hf_s5066dts_eow_hdr_drc_request_num_channels = -1;
-static gint hf_s5066dts_eow_hdr_drc_request_data_rate = -1;
-static gint hf_s5066dts_eow_hdr_drc_request_interleaver_length = -1;
+static gint hf_s5066dts_eow_hdr_drc_request_waveform;
+static gint hf_s5066dts_eow_hdr_drc_request_num_channels;
+static gint hf_s5066dts_eow_hdr_drc_request_data_rate;
+static gint hf_s5066dts_eow_hdr_drc_request_interleaver_length;
 /* {15, "HFTRP FRAME CONTROL"}, */
-static gint hf_s5066dts_eow_hftrp_hftrp_token = -1;
+static gint hf_s5066dts_eow_hftrp_hftrp_token;
 
 /* DPDU TYPES */
 /* { 0, "DATA_ONLY"}, */
-static gint hf_s5066dts_data_only_cpdu_start = -1;
-static gint hf_s5066dts_data_only_cpdu_end = -1;
-static gint hf_s5066dts_data_only_deliver_in_order = -1;
-static gint hf_s5066dts_data_only_drop_cpdu = -1;
-static gint hf_s5066dts_data_only_tx_win_uwe = -1;
-static gint hf_s5066dts_data_only_tx_win_lwe = -1;
-static gint hf_s5066dts_data_only_segmented_cpdu_size = -1;
-static gint hf_s5066dts_data_only_transmit_sequence_number = -1;
+static gint hf_s5066dts_data_only_cpdu_start;
+static gint hf_s5066dts_data_only_cpdu_end;
+static gint hf_s5066dts_data_only_deliver_in_order;
+static gint hf_s5066dts_data_only_drop_cpdu;
+static gint hf_s5066dts_data_only_tx_win_uwe;
+static gint hf_s5066dts_data_only_tx_win_lwe;
+static gint hf_s5066dts_data_only_segmented_cpdu_size;
+static gint hf_s5066dts_data_only_transmit_sequence_number;
 /* { 1, "ACK_ONLY"}, */
-static gint hf_s5066dts_ack_only_rx_lwe = -1;
-static gint hf_s5066dts_ack_only_acks = -1;
+static gint hf_s5066dts_ack_only_rx_lwe;
+static gint hf_s5066dts_ack_only_acks;
 /* { 2, "DATA_ACK"}, */
-static gint hf_s5066dts_data_ack_cpdu_start = -1;
-static gint hf_s5066dts_data_ack_cpdu_end = -1;
-static gint hf_s5066dts_data_ack_deliver_in_order = -1;
-static gint hf_s5066dts_data_ack_drop_cpdu = -1;
-static gint hf_s5066dts_data_ack_tx_win_uwe = -1;
-static gint hf_s5066dts_data_ack_tx_win_lwe = -1;
-static gint hf_s5066dts_data_ack_segmented_cpdu_size = -1;
-static gint hf_s5066dts_data_ack_transmit_sequence_number = -1;
-static gint hf_s5066dts_data_ack_rx_lwe = -1;
-static gint hf_s5066dts_data_ack_acks = -1;
+static gint hf_s5066dts_data_ack_cpdu_start;
+static gint hf_s5066dts_data_ack_cpdu_end;
+static gint hf_s5066dts_data_ack_deliver_in_order;
+static gint hf_s5066dts_data_ack_drop_cpdu;
+static gint hf_s5066dts_data_ack_tx_win_uwe;
+static gint hf_s5066dts_data_ack_tx_win_lwe;
+static gint hf_s5066dts_data_ack_segmented_cpdu_size;
+static gint hf_s5066dts_data_ack_transmit_sequence_number;
+static gint hf_s5066dts_data_ack_rx_lwe;
+static gint hf_s5066dts_data_ack_acks;
 /* { 3, "RESET_WIN_RESYNC"}, */
-static gint hf_s5066dts_reset_win_resync_unused = -1;
-static gint hf_s5066dts_reset_win_resync_full_reset_command = -1;
-static gint hf_s5066dts_reset_win_resync_reset_tx_win_rqst = -1;
-static gint hf_s5066dts_reset_win_resync_reset_rx_win_cmnd = -1;
-static gint hf_s5066dts_reset_win_resync_reset_ack = -1;
-static gint hf_s5066dts_reset_win_resync_new_rx_lwe = -1;
-static gint hf_s5066dts_reset_win_resync_reset_frame_id_number = -1;
+static gint hf_s5066dts_reset_win_resync_unused;
+static gint hf_s5066dts_reset_win_resync_full_reset_command;
+static gint hf_s5066dts_reset_win_resync_reset_tx_win_rqst;
+static gint hf_s5066dts_reset_win_resync_reset_rx_win_cmnd;
+static gint hf_s5066dts_reset_win_resync_reset_ack;
+static gint hf_s5066dts_reset_win_resync_new_rx_lwe;
+static gint hf_s5066dts_reset_win_resync_reset_frame_id_number;
 /* { 4, "EXP_DATA_ONLY"}, */
-static gint hf_s5066dts_exp_data_only_cpdu_start = -1;
-static gint hf_s5066dts_exp_data_only_cpdu_end = -1;
-static gint hf_s5066dts_exp_data_only_cpdu_id = -1;
-static gint hf_s5066dts_exp_data_only_segmented_cpdu_size = -1;
-static gint hf_s5066dts_exp_data_only_transmit_sequence_number = -1;
+static gint hf_s5066dts_exp_data_only_cpdu_start;
+static gint hf_s5066dts_exp_data_only_cpdu_end;
+static gint hf_s5066dts_exp_data_only_cpdu_id;
+static gint hf_s5066dts_exp_data_only_segmented_cpdu_size;
+static gint hf_s5066dts_exp_data_only_transmit_sequence_number;
 /* { 5, "EXP_ACK_ONLY"}, */
-static gint hf_s5066dts_exp_ack_only_rx_lwe = -1;
-static gint hf_s5066dts_exp_ack_only_acks = -1;
+static gint hf_s5066dts_exp_ack_only_rx_lwe;
+static gint hf_s5066dts_exp_ack_only_acks;
 /* { 6, "MANAGEMENT"}, */
-static gint hf_s5066dts_management_unused = -1;
-static gint hf_s5066dts_management_extended_message_flag = -1;
-static gint hf_s5066dts_management_message = -1;
-static gint hf_s5066dts_management_ack = -1;
-static gint hf_s5066dts_management_management_frame_id = -1;
-static gint hf_s5066dts_management_extended_message = -1;
-static gint hf_s5066dts_management_extended_message_hftrp_payload_size = -1;
-static gint hf_s5066dts_management_extended_message_hftrp_ra = -1;
-static gint hf_s5066dts_management_extended_message_hftrp_seq_id = -1;
-static gint hf_s5066dts_management_extended_message_hftrp_gen_seq_id = -1;
-static gint hf_s5066dts_management_extended_message_hftrp_new_successor_id = -1;
-static gint hf_s5066dts_management_extended_message_hftrp_number_of_nodes = -1;
+static gint hf_s5066dts_management_unused;
+static gint hf_s5066dts_management_extended_message_flag;
+static gint hf_s5066dts_management_message;
+static gint hf_s5066dts_management_ack;
+static gint hf_s5066dts_management_management_frame_id;
+static gint hf_s5066dts_management_extended_message;
+static gint hf_s5066dts_management_extended_message_hftrp_payload_size;
+static gint hf_s5066dts_management_extended_message_hftrp_ra;
+static gint hf_s5066dts_management_extended_message_hftrp_seq_id;
+static gint hf_s5066dts_management_extended_message_hftrp_gen_seq_id;
+static gint hf_s5066dts_management_extended_message_hftrp_new_successor_id;
+static gint hf_s5066dts_management_extended_message_hftrp_number_of_nodes;
 /* { 7, "NON_ARQ_DATA"}, */
-static gint hf_s5066dts_non_arq_data_cpdu_id_1 = -1;
-static gint hf_s5066dts_non_arq_data_deliver_in_order = -1;
-static gint hf_s5066dts_non_arq_data_group_address = -1;
-static gint hf_s5066dts_non_arq_data_cpdu_id_2 = -1;
-static gint hf_s5066dts_non_arq_data_cpdu_size = -1;
-static gint hf_s5066dts_non_arq_data_cpdu_segment_offset = -1;
-static gint hf_s5066dts_non_arq_data_cpdu_reception_window = -1;
-static gint hf_s5066dts_non_arq_data_segmented_cpdu_size = -1;
+static gint hf_s5066dts_non_arq_data_cpdu_id_1;
+static gint hf_s5066dts_non_arq_data_deliver_in_order;
+static gint hf_s5066dts_non_arq_data_group_address;
+static gint hf_s5066dts_non_arq_data_cpdu_id_2;
+static gint hf_s5066dts_non_arq_data_cpdu_size;
+static gint hf_s5066dts_non_arq_data_cpdu_segment_offset;
+static gint hf_s5066dts_non_arq_data_cpdu_reception_window;
+static gint hf_s5066dts_non_arq_data_segmented_cpdu_size;
 /* { 8, "EXP_NON_ARQ_DATA"}, */
-static gint hf_s5066dts_exp_non_arq_data_cpdu_id_1 = -1;
-static gint hf_s5066dts_exp_non_arq_data_deliver_in_order = -1;
-static gint hf_s5066dts_exp_non_arq_data_group_address = -1;
-static gint hf_s5066dts_exp_non_arq_data_cpdu_id_2 = -1;
-static gint hf_s5066dts_exp_non_arq_data_cpdu_size = -1;
-static gint hf_s5066dts_exp_non_arq_data_cpdu_segment_offset = -1;
-static gint hf_s5066dts_exp_non_arq_data_cpdu_reception_window = -1;
-static gint hf_s5066dts_exp_non_arq_data_segmented_cpdu_size = -1;
+static gint hf_s5066dts_exp_non_arq_data_cpdu_id_1;
+static gint hf_s5066dts_exp_non_arq_data_deliver_in_order;
+static gint hf_s5066dts_exp_non_arq_data_group_address;
+static gint hf_s5066dts_exp_non_arq_data_cpdu_id_2;
+static gint hf_s5066dts_exp_non_arq_data_cpdu_size;
+static gint hf_s5066dts_exp_non_arq_data_cpdu_segment_offset;
+static gint hf_s5066dts_exp_non_arq_data_cpdu_reception_window;
+static gint hf_s5066dts_exp_non_arq_data_segmented_cpdu_size;
 /* {15, "WARNING"}, */
-static gint hf_s5066dts_warning_frame_type = -1;
-static gint hf_s5066dts_warning_reason = -1;
-
-static gint ett_s5066dts = -1;
-static gint ett_s5066dts_eow = -1;
-static gint ett_s5066dts_address = -1;
-static gint ett_s5066dts_pdu = -1;
-static gint ett_s5066dts_hftrp_token = -1;
+static gint hf_s5066dts_warning_frame_type;
+static gint hf_s5066dts_warning_reason;
+
+static gint ett_s5066dts;
+static gint ett_s5066dts_eow;
+static gint ett_s5066dts_address;
+static gint ett_s5066dts_pdu;
+static gint ett_s5066dts_hftrp_token;
 
 static const value_string s5066dts_dpdu_type[] = {
     { 0, "DATA_ONLY"},
diff --git a/epan/dissectors/packet-s5066sis.c b/epan/dissectors/packet-s5066sis.c
index c7d5dac093..f9853ea40a 100644
--- a/epan/dissectors/packet-s5066sis.c
+++ b/epan/dissectors/packet-s5066sis.c
@@ -67,7 +67,7 @@ static guint dissect_s5066_25(tvbuff_t *tvb, guint offset, proto_tree *tree, gui
 static guint dissect_s5066_26(tvbuff_t *tvb, guint offset, proto_tree *tree, guint *client_app_id);
 static guint dissect_s5066_27(tvbuff_t *tvb, guint offset, proto_tree *tree, guint *client_app_id);
 
-static gint proto_s5066 = -1;
+static gint proto_s5066;
 
 static dissector_table_t s5066sis_dissector_table;
 
@@ -83,14 +83,14 @@ static gint s5066_header_size = 5;
 static gint s5066_size_offset = 3;
 
 /* Sync should be 0x90EB */
-static gint hf_s5066_sync_word = -1;
+static gint hf_s5066_sync_word;
 /* Version should be 0x00 */
-static gint hf_s5066_version = -1;
+static gint hf_s5066_version;
 /* Total size of the PDU, excluding this size and previous fields */
 /* So total size is this + 5 bytes (s5066_header_size) */
-static gint hf_s5066_size = -1;
+static gint hf_s5066_size;
 /* Th type of PDU */
-static gint hf_s5066_type = -1;
+static gint hf_s5066_type;
 static const value_string s5066_pdu_type[] = {
 	{ 1, "S_BIND_REQUEST"},
 	{ 2, "S_UNBIND_REQUEST"},
@@ -124,15 +124,15 @@ static const value_string s5066_pdu_type[] = {
 
 /* STANAG 5066 Address */
 /* Size is defined in nibbles (4 bits) */
-static gint hf_s5066_ad_size = -1;
+static gint hf_s5066_ad_size;
 /* Group flag: 0 = false, 1 = true */
-static gint hf_s5066_ad_group = -1;
+static gint hf_s5066_ad_group;
 /* The remainder of the 4 bytes form the address */
-static gint hf_s5066_ad_address = -1;
+static gint hf_s5066_ad_address;
 
 /* Service type */
 /* Transmission mode: */
-static gint hf_s5066_st_txmode = -1;
+static gint hf_s5066_st_txmode;
 static const value_string s5066_st_txmode[] = {
 	{ 0, "Ignore service type field"},
 	{ 1, "ARQ"},
@@ -153,7 +153,7 @@ static const value_string s5066_st_txmode[] = {
 	{ 0, NULL },
 };
 /* Delivery confirmation: */
-static gint hf_s5066_st_delivery_confirmation = -1;
+static gint hf_s5066_st_delivery_confirmation;
 static const value_string s5066_st_delivery_confirmation[] = {
 	{ 0, "No confirmation"},
 	{ 1, "Node delivery confirmation"},
@@ -162,28 +162,28 @@ static const value_string s5066_st_delivery_confirmation[] = {
 	{ 0, NULL },
 };
 /* Delivery order: */
-static gint hf_s5066_st_delivery_order = -1;
+static gint hf_s5066_st_delivery_order;
 static const value_string s5066_st_delivery_order[] = {
 	{ 0, "In-order delivery"},
 	{ 1, "As-they-arrive"},
 	{ 0, NULL },
 };
 /* Extended field present: (Never in the current version.) */
-static gint hf_s5066_st_extended = -1;
+static gint hf_s5066_st_extended;
 static const value_string s5066_st_extended[] = {
 	{ 0, "No extended field"},
 	{ 1, "Extended field follows"},
 	{ 0, NULL },
 };
 /* Number of retransmissions when in Non-ARQ: */
-static gint hf_s5066_st_retries = -1;
+static gint hf_s5066_st_retries;
 
 /* Client transport layer header */
-static gint hf_s5066_ctl_conn_id = -1;
-static gint hf_s5066_ctl_reserved = -1;
-static gint hf_s5066_ctl_updu_id = -1;
-static gint hf_s5066_ctl_updu_segment = -1;
-static gint hf_s5066_ctl_app_id = -1;
+static gint hf_s5066_ctl_conn_id;
+static gint hf_s5066_ctl_reserved;
+static gint hf_s5066_ctl_updu_id;
+static gint hf_s5066_ctl_updu_segment;
+static gint hf_s5066_ctl_app_id;
 static const value_string s5066_client_application_ids[] = {
 	{ S5066_CLIENT_BFTP,			    "Basic File Transfer Protocol (BFTP) File Transfer Service"},
 	{ S5066_CLIENT_FRAP,			    "File-Receipt/Acknowledgement Protocol"},
@@ -218,20 +218,20 @@ static const value_string s5066_sapid_assignments[] = {
 };
 
 /* Type  1: S_BIND_REQUEST */
-static gint hf_s5066_01_sapid = -1;
-static gint hf_s5066_01_rank = -1;
-static gint hf_s5066_01_unused = -1;
+static gint hf_s5066_01_sapid;
+static gint hf_s5066_01_rank;
+static gint hf_s5066_01_unused;
 
 /* Type  2: S_UNBIND_REQUEST */
 /*   --- no subfields ---   */
 
 /* Type  3: S_BIND_ACCEPTED */
-static gint hf_s5066_03_sapid = -1;
-static gint hf_s5066_03_unused = -1;
-static gint hf_s5066_03_mtu = -1;
+static gint hf_s5066_03_sapid;
+static gint hf_s5066_03_unused;
+static gint hf_s5066_03_mtu;
 
 /* Type  4: S_BIND_REJECTED */
-static gint hf_s5066_04_reason = -1;
+static gint hf_s5066_04_reason;
 static const value_string s5066_04_reason[] = {
 	{ 0, "Unknown reason"},
 	{ 1, "Not enough resources"},
@@ -242,7 +242,7 @@ static const value_string s5066_04_reason[] = {
 };
 
 /* Type  5: S_UNBIND_INDICATION */
-static gint hf_s5066_05_reason = -1;
+static gint hf_s5066_05_reason;
 static const value_string s5066_05_reason[] = {
 	{ 0, "Unknown reason"},
 	{ 1, "Connection pre-empted by higher ranking client"},
@@ -263,26 +263,26 @@ static const value_string s5066_hard_link_type[] = {
 };
 
 /* Type  6: S_HARD_LINK_ESTABLISH */
-static gint hf_s5066_06_link_type = -1;
-static gint hf_s5066_06_link_priority = -1;
-static gint hf_s5066_06_sapid = -1;
+static gint hf_s5066_06_link_type;
+static gint hf_s5066_06_link_priority;
+static gint hf_s5066_06_sapid;
 
 /* Type  7: S_HARD_LINK_TERMINATE */
 /* Only  remote node address */
 
 /* Type  8: S_HARD_LINK_ESTABLISHED */
-static gint hf_s5066_08_remote_status = -1;
+static gint hf_s5066_08_remote_status;
 static const value_string s5066_08_remote_status[] = {
 	{ 0, "ERROR"},
 	{ 1, "OK"},
 	{ 0, NULL },
 };
-static gint hf_s5066_08_link_type = -1;
-static gint hf_s5066_08_link_priority = -1;
-static gint hf_s5066_08_sapid = -1;
+static gint hf_s5066_08_link_type;
+static gint hf_s5066_08_link_priority;
+static gint hf_s5066_08_sapid;
 
 /* Type  9: S_HARD_LINK_REJECTED */
-static gint hf_s5066_09_reason = -1;
+static gint hf_s5066_09_reason;
 static const value_string s5066_09_reason[] = {
 	{ 0, "--- undefined ---"},
 	{ 1, "Remote node busy"},
@@ -292,12 +292,12 @@ static const value_string s5066_09_reason[] = {
 	{ 5, "Requested Type-0 link exists"},
 	{ 0, NULL },
 };
-static gint hf_s5066_09_link_type = -1;
-static gint hf_s5066_09_link_priority = -1;
-static gint hf_s5066_09_sapid = -1;
+static gint hf_s5066_09_link_type;
+static gint hf_s5066_09_link_priority;
+static gint hf_s5066_09_sapid;
 
 /* Type 10: S_HARD_LINK_TERMINATED */
-static gint hf_s5066_10_reason = -1;
+static gint hf_s5066_10_reason;
 static const value_string s5066_10_reason[] = {
 	{ 0, "--- undefined ---"},
 	{ 1, "Link terminated by remote node"},
@@ -307,38 +307,38 @@ static const value_string s5066_10_reason[] = {
 	{ 5, "Physical link broken"},
 	{ 0, NULL },
 };
-static gint hf_s5066_10_link_type = -1;
-static gint hf_s5066_10_link_priority = -1;
-static gint hf_s5066_10_sapid = -1;
+static gint hf_s5066_10_link_type;
+static gint hf_s5066_10_link_priority;
+static gint hf_s5066_10_sapid;
 
 /* Type 11: S_HARD_LINK_INDICATION */
-static gint hf_s5066_11_remote_status = -1;
+static gint hf_s5066_11_remote_status;
 static const value_string s5066_11_remote_status[] = {
 	{ 0, "ERROR"},
 	{ 1, "OK"},
 	{ 0, NULL },
 };
-static gint hf_s5066_11_link_type = -1;
-static gint hf_s5066_11_link_priority = -1;
-static gint hf_s5066_11_sapid = -1;
+static gint hf_s5066_11_link_type;
+static gint hf_s5066_11_link_priority;
+static gint hf_s5066_11_sapid;
 
 /* Type 12: S_HARD_LINK_ACCEPT */
-static gint hf_s5066_12_link_type = -1;
-static gint hf_s5066_12_link_priority = -1;
-static gint hf_s5066_12_sapid = -1;
+static gint hf_s5066_12_link_type;
+static gint hf_s5066_12_link_priority;
+static gint hf_s5066_12_sapid;
 
 /* Type 13: S_HARD_LINK_REJECT */
-static gint hf_s5066_13_reason = -1;
+static gint hf_s5066_13_reason;
 static const value_string s5066_13_reason[] = {
 	{ 0, "--- undefined ---"},
 	{ 0, NULL },
 };
-static gint hf_s5066_13_link_type = -1;
-static gint hf_s5066_13_link_priority = -1;
-static gint hf_s5066_13_sapid = -1;
+static gint hf_s5066_13_link_type;
+static gint hf_s5066_13_link_priority;
+static gint hf_s5066_13_sapid;
 
 /* Type 14: S_SUBNET_AVAILABILITY */
-static gint hf_s5066_14_status= -1;
+static gint hf_s5066_14_status;
 static const value_string s5066_14_status[] = {
 	{ 0, "Off"},
 	{ 1, "On"},
@@ -347,7 +347,7 @@ static const value_string s5066_14_status[] = {
 	{ 4, "Full-duplex"},
 	{ 0, NULL },
 };
-static gint hf_s5066_14_reason= -1;
+static gint hf_s5066_14_reason;
 static const value_string s5066_14_reason[] = {
 	{ 0, "Unknown reason"},
 	{ 1, "Local node in EMCON"},
@@ -365,41 +365,41 @@ static const value_string s5066_14_reason[] = {
 /*   --- no subfields ---   */
 
 /* Type 18: S_MANAGEMENT_MESSAGE_REQUEST */
-static gint hf_s5066_18_type = -1;
-static gint hf_s5066_18_body = -1;
+static gint hf_s5066_18_type;
+static gint hf_s5066_18_body;
 
 /* Type 19: S_MANAGEMENT_MESSAGE_INDICATION */
-static gint hf_s5066_19_type = -1;
-static gint hf_s5066_19_body = -1;
+static gint hf_s5066_19_type;
+static gint hf_s5066_19_body;
 
 /* Type 20: S_UNIDATA_REQUEST */
-static gint hf_s5066_20_priority = -1;
-static gint hf_s5066_20_sapid = -1;
-static gint hf_s5066_20_ttl = -1;
-static gint hf_s5066_20_size = -1;
+static gint hf_s5066_20_priority;
+static gint hf_s5066_20_sapid;
+static gint hf_s5066_20_ttl;
+static gint hf_s5066_20_size;
 
 /* Type 21: S_UNIDATA_INDICATION */
-static gint hf_s5066_21_priority = -1;
-static gint hf_s5066_21_dest_sapid = -1;
-static gint hf_s5066_21_tx_mode = -1;
-static gint hf_s5066_21_src_sapid = -1;
-static gint hf_s5066_21_size = -1;
-static gint hf_s5066_21_err_blocks = -1;
-static gint hf_s5066_21_err_ptr = -1;
-static gint hf_s5066_21_err_size = -1;
-static gint hf_s5066_21_nrx_blocks = -1;
-static gint hf_s5066_21_nrx_ptr = -1;
-static gint hf_s5066_21_nrx_size = -1;
+static gint hf_s5066_21_priority;
+static gint hf_s5066_21_dest_sapid;
+static gint hf_s5066_21_tx_mode;
+static gint hf_s5066_21_src_sapid;
+static gint hf_s5066_21_size;
+static gint hf_s5066_21_err_blocks;
+static gint hf_s5066_21_err_ptr;
+static gint hf_s5066_21_err_size;
+static gint hf_s5066_21_nrx_blocks;
+static gint hf_s5066_21_nrx_ptr;
+static gint hf_s5066_21_nrx_size;
 
 
 /* Type 22: S_UNIDATA_REQUEST_CONFIRM */
-static gint hf_s5066_22_unused = -1;
-static gint hf_s5066_22_sapid = -1;
-static gint hf_s5066_22_size = -1;
-static gint hf_s5066_22_data = -1;
+static gint hf_s5066_22_unused;
+static gint hf_s5066_22_sapid;
+static gint hf_s5066_22_size;
+static gint hf_s5066_22_data;
 
 /* Type 23: S_UNIDATA_REQUEST_REJECTED */
-static gint hf_s5066_23_reason = -1;
+static gint hf_s5066_23_reason;
 static const value_string s5066_23_reason[] = {
 	{ 0, "Unknown reason"},
 	{ 1, "Time-To-Live expired"},
@@ -409,37 +409,37 @@ static const value_string s5066_23_reason[] = {
 	{ 5, "Transmission Mode not specified"},
 	{ 0, NULL },
 };
-static gint hf_s5066_23_sapid = -1;
-static gint hf_s5066_23_size = -1;
-static gint hf_s5066_23_data = -1;
+static gint hf_s5066_23_sapid;
+static gint hf_s5066_23_size;
+static gint hf_s5066_23_data;
 
 /* Type 24: S_EXPEDITED_UNIDATA_REQUEST */
-static gint hf_s5066_24_unused = -1;
-static gint hf_s5066_24_sapid = -1;
-static gint hf_s5066_24_ttl = -1;
-static gint hf_s5066_24_size = -1;
+static gint hf_s5066_24_unused;
+static gint hf_s5066_24_sapid;
+static gint hf_s5066_24_ttl;
+static gint hf_s5066_24_size;
 
 /* Type 25: S_EXPEDITED_UNIDATA_INDICATION */
-static gint hf_s5066_25_unused = -1;
-static gint hf_s5066_25_dest_sapid = -1;
-static gint hf_s5066_25_tx_mode = -1;
-static gint hf_s5066_25_src_sapid = -1;
-static gint hf_s5066_25_size = -1;
-static gint hf_s5066_25_err_blocks = -1;
-static gint hf_s5066_25_err_ptr = -1;
-static gint hf_s5066_25_err_size = -1;
-static gint hf_s5066_25_nrx_blocks = -1;
-static gint hf_s5066_25_nrx_ptr = -1;
-static gint hf_s5066_25_nrx_size = -1;
+static gint hf_s5066_25_unused;
+static gint hf_s5066_25_dest_sapid;
+static gint hf_s5066_25_tx_mode;
+static gint hf_s5066_25_src_sapid;
+static gint hf_s5066_25_size;
+static gint hf_s5066_25_err_blocks;
+static gint hf_s5066_25_err_ptr;
+static gint hf_s5066_25_err_size;
+static gint hf_s5066_25_nrx_blocks;
+static gint hf_s5066_25_nrx_ptr;
+static gint hf_s5066_25_nrx_size;
 
 /* Type 26: S_EXPEDITED_UNIDATA_REQUEST_CONFIRM */
-static gint hf_s5066_26_unused = -1;
-static gint hf_s5066_26_sapid = -1;
-static gint hf_s5066_26_size = -1;
-static gint hf_s5066_26_data = -1;
+static gint hf_s5066_26_unused;
+static gint hf_s5066_26_sapid;
+static gint hf_s5066_26_size;
+static gint hf_s5066_26_data;
 
 /* Type 27: S_EXPEDITED_UNIDATA_REQUEST_REJECTED */
-static gint hf_s5066_27_reason = -1;
+static gint hf_s5066_27_reason;
 static const value_string s5066_27_reason[] = {
 	{ 0, "Unknown reason"},
 	{ 1, "Time-To-Live expired"},
@@ -449,16 +449,16 @@ static const value_string s5066_27_reason[] = {
 	{ 5, "Transmission Mode not specified"},
 	{ 0, NULL },
 };
-static gint hf_s5066_27_sapid = -1;
-static gint hf_s5066_27_size = -1;
-static gint hf_s5066_27_data = -1;
+static gint hf_s5066_27_sapid;
+static gint hf_s5066_27_size;
+static gint hf_s5066_27_data;
 
 
-static gint ett_s5066 = -1;
-static gint ett_s5066_pdu = -1;
-static gint ett_s5066_servicetype = -1;
-static gint ett_s5066_client_transport_header = -1;
-static gint ett_s5066_address = -1;
+static gint ett_s5066;
+static gint ett_s5066_pdu;
+static gint ett_s5066_servicetype;
+static gint ett_s5066_client_transport_header;
+static gint ett_s5066_address;
 
 static guint
 dissect_s5066_address(tvbuff_t *tvb, guint offset, proto_tree *tree, gint source)
diff --git a/epan/dissectors/packet-s7comm.c b/epan/dissectors/packet-s7comm.c
index de55b83b7b..e198c66fbc 100644
--- a/epan/dissectors/packet-s7comm.c
+++ b/epan/dissectors/packet-s7comm.c
@@ -30,7 +30,7 @@
 #define S7COMM_PROT_ID                      0x32
 
 /* Wireshark ID of the S7COMM protocol */
-static int proto_s7comm = -1;
+static int proto_s7comm;
 
 /* Forward declarations */
 void proto_reg_handoff_s7comm(void);
@@ -1101,152 +1101,152 @@ static const value_string nck_module_names[] = {
 };
 static value_string_ext nck_module_names_ext = VALUE_STRING_EXT_INIT(nck_module_names);
 
-static gint hf_s7comm_tia1200_item_reserved1 = -1;          /* 1 Byte Reserved (always 0xff?) */
-static gint hf_s7comm_tia1200_item_area1 = -1;              /* 2 Byte2 Root area (DB or IQMCT) */
-static gint hf_s7comm_tia1200_item_area2 = -1;              /* 2 Bytes detail area (I/Q/M/C/T) */
-static gint hf_s7comm_tia1200_item_area2unknown = -1;       /* 2 Bytes detail area for possible unknown or not seen areas */
-static gint hf_s7comm_tia1200_item_dbnumber = -1;           /* 2 Bytes DB number */
-static gint hf_s7comm_tia1200_item_crc = -1;                /* 4 Bytes CRC */
+static gint hf_s7comm_tia1200_item_reserved1;          /* 1 Byte Reserved (always 0xff?) */
+static gint hf_s7comm_tia1200_item_area1;              /* 2 Byte2 Root area (DB or IQMCT) */
+static gint hf_s7comm_tia1200_item_area2;              /* 2 Bytes detail area (I/Q/M/C/T) */
+static gint hf_s7comm_tia1200_item_area2unknown;       /* 2 Bytes detail area for possible unknown or not seen areas */
+static gint hf_s7comm_tia1200_item_dbnumber;           /* 2 Bytes DB number */
+static gint hf_s7comm_tia1200_item_crc;                /* 4 Bytes CRC */
 
-static gint hf_s7comm_tia1200_substructure_item = -1;       /* Substructure */
-static gint hf_s7comm_tia1200_var_lid_flags = -1;           /* LID Flags */
-static gint hf_s7comm_tia1200_item_value = -1;
+static gint hf_s7comm_tia1200_substructure_item;       /* Substructure */
+static gint hf_s7comm_tia1200_var_lid_flags;           /* LID Flags */
+static gint hf_s7comm_tia1200_item_value;
 
 /**************************************************************************
  **************************************************************************/
 
 /* Header Block */
-static gint hf_s7comm_header = -1;
-static gint hf_s7comm_header_protid = -1;                   /* Header Byte  0 */
-static gint hf_s7comm_header_rosctr = -1;                   /* Header Bytes 1 */
-static gint hf_s7comm_header_redid = -1;                    /* Header Bytes 2, 3 */
-static gint hf_s7comm_header_pduref = -1;                   /* Header Bytes 4, 5 */
-static gint hf_s7comm_header_parlg = -1;                    /* Header Bytes 6, 7 */
-static gint hf_s7comm_header_datlg = -1;                    /* Header Bytes 8, 9 */
-static gint hf_s7comm_header_errcls = -1;                   /* Header Byte 10, only available at type 2 or 3 */
-static gint hf_s7comm_header_errcod = -1;                   /* Header Byte 11, only available at type 2 or 3 */
+static gint hf_s7comm_header;
+static gint hf_s7comm_header_protid;                   /* Header Byte  0 */
+static gint hf_s7comm_header_rosctr;                   /* Header Bytes 1 */
+static gint hf_s7comm_header_redid;                    /* Header Bytes 2, 3 */
+static gint hf_s7comm_header_pduref;                   /* Header Bytes 4, 5 */
+static gint hf_s7comm_header_parlg;                    /* Header Bytes 6, 7 */
+static gint hf_s7comm_header_datlg;                    /* Header Bytes 8, 9 */
+static gint hf_s7comm_header_errcls;                   /* Header Byte 10, only available at type 2 or 3 */
+static gint hf_s7comm_header_errcod;                   /* Header Byte 11, only available at type 2 or 3 */
 /* Parameter Block */
-static gint hf_s7comm_param = -1;
-static gint hf_s7comm_param_errcod = -1;                    /* Parameter part: Error code */
-static gint hf_s7comm_param_service = -1;                   /* Parameter part: service */
-static gint hf_s7comm_param_itemcount = -1;                 /* Parameter part: item count */
-static gint hf_s7comm_param_data = -1;                      /* Parameter part: data */
-static gint hf_s7comm_param_neg_pdu_length = -1;            /* Parameter part: Negotiate PDU length */
-static gint hf_s7comm_param_setup_reserved1 = -1;           /* Parameter part: Reserved byte in communication setup pdu*/
+static gint hf_s7comm_param;
+static gint hf_s7comm_param_errcod;                    /* Parameter part: Error code */
+static gint hf_s7comm_param_service;                   /* Parameter part: service */
+static gint hf_s7comm_param_itemcount;                 /* Parameter part: item count */
+static gint hf_s7comm_param_data;                      /* Parameter part: data */
+static gint hf_s7comm_param_neg_pdu_length;            /* Parameter part: Negotiate PDU length */
+static gint hf_s7comm_param_setup_reserved1;           /* Parameter part: Reserved byte in communication setup pdu*/
 
-static gint hf_s7comm_param_maxamq_calling = -1;            /* Parameter part: Max AmQ calling */
-static gint hf_s7comm_param_maxamq_called = -1;             /* Parameter part: Max AmQ called */
+static gint hf_s7comm_param_maxamq_calling;            /* Parameter part: Max AmQ calling */
+static gint hf_s7comm_param_maxamq_called;             /* Parameter part: Max AmQ called */
 
 /* Item data */
-static gint hf_s7comm_param_item = -1;
-static gint hf_s7comm_param_subitem = -1;                   /* Substructure */
-static gint hf_s7comm_item_varspec = -1;                    /* Variable specification */
-static gint hf_s7comm_item_varspec_length = -1;             /* Length of following address specification */
-static gint hf_s7comm_item_syntax_id = -1;                  /* Syntax Id */
-static gint hf_s7comm_item_transport_size = -1;             /* Transport size, 1 Byte*/
-static gint hf_s7comm_item_length = -1;                     /* length, 2 Bytes*/
-static gint hf_s7comm_item_db = -1;                         /* DB/M/E/A, 2 Bytes */
-static gint hf_s7comm_item_area = -1;                       /* Area code, 1 byte */
-static gint hf_s7comm_item_address = -1;                    /* Bit address, 3 Bytes */
-static gint hf_s7comm_item_address_byte = -1;               /* address: Byte address */
-static gint hf_s7comm_item_address_bit = -1;                /* address: Bit address */
-static gint hf_s7comm_item_address_nr = -1;                 /* address: Timer/Counter/block number */
+static gint hf_s7comm_param_item;
+static gint hf_s7comm_param_subitem;                   /* Substructure */
+static gint hf_s7comm_item_varspec;                    /* Variable specification */
+static gint hf_s7comm_item_varspec_length;             /* Length of following address specification */
+static gint hf_s7comm_item_syntax_id;                  /* Syntax Id */
+static gint hf_s7comm_item_transport_size;             /* Transport size, 1 Byte*/
+static gint hf_s7comm_item_length;                     /* length, 2 Bytes*/
+static gint hf_s7comm_item_db;                         /* DB/M/E/A, 2 Bytes */
+static gint hf_s7comm_item_area;                       /* Area code, 1 byte */
+static gint hf_s7comm_item_address;                    /* Bit address, 3 Bytes */
+static gint hf_s7comm_item_address_byte;               /* address: Byte address */
+static gint hf_s7comm_item_address_bit;                /* address: Bit address */
+static gint hf_s7comm_item_address_nr;                 /* address: Timer/Counter/block number */
 /* Special variable read with Syntax-Id 0xb0 (DBREAD) */
-static gint hf_s7comm_item_dbread_numareas = -1;            /* Number of areas following, 1 Byte*/
-static gint hf_s7comm_item_dbread_length = -1;              /* length, 1 Byte*/
-static gint hf_s7comm_item_dbread_db = -1;                  /* DB number, 2 Bytes*/
-static gint hf_s7comm_item_dbread_startadr = -1;            /* Start address, 2 Bytes*/
+static gint hf_s7comm_item_dbread_numareas;            /* Number of areas following, 1 Byte*/
+static gint hf_s7comm_item_dbread_length;              /* length, 1 Byte*/
+static gint hf_s7comm_item_dbread_db;                  /* DB number, 2 Bytes*/
+static gint hf_s7comm_item_dbread_startadr;            /* Start address, 2 Bytes*/
 /* Reading frequency inverter parameters via routing */
-static gint hf_s7comm_item_driveesany_unknown1 = -1;        /* Unknown value 1, 1 Byte */
-static gint hf_s7comm_item_driveesany_unknown2 = -1;        /* Unknown value 2, 2 Bytes */
-static gint hf_s7comm_item_driveesany_unknown3 = -1;        /* Unknown value 3, 2 Bytes */
-static gint hf_s7comm_item_driveesany_parameter_nr = -1;    /* Parameter number, 2 Bytes */
-static gint hf_s7comm_item_driveesany_parameter_idx = -1;   /* Parameter index, 2 Bytes */
+static gint hf_s7comm_item_driveesany_unknown1;        /* Unknown value 1, 1 Byte */
+static gint hf_s7comm_item_driveesany_unknown2;        /* Unknown value 2, 2 Bytes */
+static gint hf_s7comm_item_driveesany_unknown3;        /* Unknown value 3, 2 Bytes */
+static gint hf_s7comm_item_driveesany_parameter_nr;    /* Parameter number, 2 Bytes */
+static gint hf_s7comm_item_driveesany_parameter_idx;   /* Parameter index, 2 Bytes */
 /* NCK access with Syntax-Id 0x82 */
-static gint hf_s7comm_item_nck_areaunit = -1;               /* Bitmask: aaauuuuu: a=area, u=unit */
-static gint hf_s7comm_item_nck_area = -1;
-static gint hf_s7comm_item_nck_unit = -1;
-static gint hf_s7comm_item_nck_column = -1;
-static gint hf_s7comm_item_nck_line = -1;
-static gint hf_s7comm_item_nck_module = -1;
-static gint hf_s7comm_item_nck_linecount = -1;
+static gint hf_s7comm_item_nck_areaunit;               /* Bitmask: aaauuuuu: a=area, u=unit */
+static gint hf_s7comm_item_nck_area;
+static gint hf_s7comm_item_nck_unit;
+static gint hf_s7comm_item_nck_column;
+static gint hf_s7comm_item_nck_line;
+static gint hf_s7comm_item_nck_module;
+static gint hf_s7comm_item_nck_linecount;
 
-static gint hf_s7comm_data = -1;
-static gint hf_s7comm_data_returncode = -1;                 /* return code, 1 byte */
-static gint hf_s7comm_data_transport_size = -1;             /* transport size 1 byte */
-static gint hf_s7comm_data_length = -1;                     /* Length of data, 2 Bytes */
+static gint hf_s7comm_data;
+static gint hf_s7comm_data_returncode;                 /* return code, 1 byte */
+static gint hf_s7comm_data_transport_size;             /* transport size 1 byte */
+static gint hf_s7comm_data_length;                     /* Length of data, 2 Bytes */
 
-static gint hf_s7comm_data_item = -1;
+static gint hf_s7comm_data_item;
 
-static gint hf_s7comm_readresponse_data = -1;
-static gint hf_s7comm_data_fillbyte = -1;
+static gint hf_s7comm_readresponse_data;
+static gint hf_s7comm_data_fillbyte;
 
 /* timefunction: s7 timestamp */
-static gint hf_s7comm_data_ts = -1;
-static gint hf_s7comm_data_ts_reserved = -1;
-static gint hf_s7comm_data_ts_year1 = -1;                   /* first byte of BCD coded year, should be ignored */
-static gint hf_s7comm_data_ts_year2 = -1;                   /* second byte of BCD coded year, if 00...89 then it's 2000...2089, else 1990...1999*/
-static gint hf_s7comm_data_ts_month = -1;
-static gint hf_s7comm_data_ts_day = -1;
-static gint hf_s7comm_data_ts_hour = -1;
-static gint hf_s7comm_data_ts_minute = -1;
-static gint hf_s7comm_data_ts_second = -1;
-static gint hf_s7comm_data_ts_millisecond = -1;
-static gint hf_s7comm_data_ts_weekday = -1;
+static gint hf_s7comm_data_ts;
+static gint hf_s7comm_data_ts_reserved;
+static gint hf_s7comm_data_ts_year1;                   /* first byte of BCD coded year, should be ignored */
+static gint hf_s7comm_data_ts_year2;                   /* second byte of BCD coded year, if 00...89 then it's 2000...2089, else 1990...1999*/
+static gint hf_s7comm_data_ts_month;
+static gint hf_s7comm_data_ts_day;
+static gint hf_s7comm_data_ts_hour;
+static gint hf_s7comm_data_ts_minute;
+static gint hf_s7comm_data_ts_second;
+static gint hf_s7comm_data_ts_millisecond;
+static gint hf_s7comm_data_ts_weekday;
 
 /* userdata, block services */
-static gint hf_s7comm_userdata_data = -1;
-
-static gint hf_s7comm_userdata_param_type = -1;
-static gint hf_s7comm_userdata_param_funcgroup = -1;
-static gint hf_s7comm_userdata_param_subfunc_prog = -1;
-static gint hf_s7comm_userdata_param_subfunc_cyclic = -1;
-static gint hf_s7comm_userdata_param_subfunc_block = -1;
-static gint hf_s7comm_userdata_param_subfunc_cpu = -1;
-static gint hf_s7comm_userdata_param_subfunc_sec = -1;
-static gint hf_s7comm_userdata_param_subfunc_time = -1;
-static gint hf_s7comm_userdata_param_subfunc_ncprg = -1;
-static gint hf_s7comm_userdata_param_subfunc_drr = -1;
-static gint hf_s7comm_userdata_param_subfunc = -1;          /* for all other subfunctions */
-static gint hf_s7comm_userdata_param_seq_num = -1;
-static gint hf_s7comm_userdata_param_dataunitref = -1;
-static gint hf_s7comm_userdata_param_dataunit = -1;
+static gint hf_s7comm_userdata_data;
+
+static gint hf_s7comm_userdata_param_type;
+static gint hf_s7comm_userdata_param_funcgroup;
+static gint hf_s7comm_userdata_param_subfunc_prog;
+static gint hf_s7comm_userdata_param_subfunc_cyclic;
+static gint hf_s7comm_userdata_param_subfunc_block;
+static gint hf_s7comm_userdata_param_subfunc_cpu;
+static gint hf_s7comm_userdata_param_subfunc_sec;
+static gint hf_s7comm_userdata_param_subfunc_time;
+static gint hf_s7comm_userdata_param_subfunc_ncprg;
+static gint hf_s7comm_userdata_param_subfunc_drr;
+static gint hf_s7comm_userdata_param_subfunc;          /* for all other subfunctions */
+static gint hf_s7comm_userdata_param_seq_num;
+static gint hf_s7comm_userdata_param_dataunitref;
+static gint hf_s7comm_userdata_param_dataunit;
 
 /* block functions, list blocks of type */
-static gint hf_s7comm_ud_blockinfo_block_type = -1;         /* Block type, 2 bytes */
-static gint hf_s7comm_ud_blockinfo_block_num = -1;          /* Block number, 2 bytes as int */
-static gint hf_s7comm_ud_blockinfo_block_cnt = -1;          /* Count, 2 bytes as int */
-static gint hf_s7comm_ud_blockinfo_block_flags = -1;        /* Block flags (unknown), 1 byte */
-static gint hf_s7comm_ud_blockinfo_block_lang = -1;         /* Block language, 1 byte, stringlist blocklanguage_names */
+static gint hf_s7comm_ud_blockinfo_block_type;         /* Block type, 2 bytes */
+static gint hf_s7comm_ud_blockinfo_block_num;          /* Block number, 2 bytes as int */
+static gint hf_s7comm_ud_blockinfo_block_cnt;          /* Count, 2 bytes as int */
+static gint hf_s7comm_ud_blockinfo_block_flags;        /* Block flags (unknown), 1 byte */
+static gint hf_s7comm_ud_blockinfo_block_lang;         /* Block language, 1 byte, stringlist blocklanguage_names */
 /* block functions, get block infos */
-static gint hf_s7comm_ud_blockinfo_block_num_ascii = -1;    /* Block number, 5 bytes, ASCII*/
-static gint hf_s7comm_ud_blockinfo_filesys = -1;            /* Filesystem, 1 byte, ASCII*/
-static gint hf_s7comm_ud_blockinfo_res_infolength = -1;     /* Length of Info, 2 bytes as int */
-static gint hf_s7comm_ud_blockinfo_res_unknown2 = -1;       /* Unknown blockinfo 2, 2 bytes, HEX*/
-static gint hf_s7comm_ud_blockinfo_res_const3 = -1;         /* Constant 3, 2 bytes, ASCII */
-static gint hf_s7comm_ud_blockinfo_res_unknown = -1;        /* Unknown byte(s) */
-static gint hf_s7comm_ud_blockinfo_subblk_type = -1;        /* Subblk type, 1 byte, stringlist subblktype_names */
-static gint hf_s7comm_ud_blockinfo_load_mem_len = -1;       /* Length load memory, 4 bytes, int */
-static gint hf_s7comm_ud_blockinfo_blocksecurity = -1;      /* Block Security, 4 bytes, stringlist blocksecurity_names*/
-static gint hf_s7comm_ud_blockinfo_interface_timestamp = -1;/* Interface Timestamp, string */
-static gint hf_s7comm_ud_blockinfo_code_timestamp = -1;     /* Code Timestamp, string */
-static gint hf_s7comm_ud_blockinfo_ssb_len = -1;            /* SSB length, 2 bytes, int */
-static gint hf_s7comm_ud_blockinfo_add_len = -1;            /* ADD length, 2 bytes, int */
-static gint hf_s7comm_ud_blockinfo_localdata_len = -1;      /* Length localdata, 2 bytes, int */
-static gint hf_s7comm_ud_blockinfo_mc7_len = -1;            /* Length MC7 code, 2 bytes, int */
-static gint hf_s7comm_ud_blockinfo_author = -1;             /* Author, 8 bytes, ASCII */
-static gint hf_s7comm_ud_blockinfo_family = -1;             /* Family, 8 bytes, ASCII */
-static gint hf_s7comm_ud_blockinfo_headername = -1;         /* Name (Header), 8 bytes, ASCII */
-static gint hf_s7comm_ud_blockinfo_headerversion = -1;      /* Version (Header), 8 bytes, ASCII */
-static gint hf_s7comm_ud_blockinfo_checksum = -1;           /* Block checksum, 2 bytes, HEX */
-static gint hf_s7comm_ud_blockinfo_reserved1 = -1;          /* Reserved 1, 4 bytes, HEX */
-static gint hf_s7comm_ud_blockinfo_reserved2 = -1;          /* Reserved 2, 4 bytes, HEX */
-
-static gint hf_s7comm_userdata_blockinfo_flags = -1;        /* Some flags in Block info response */
-static gint hf_s7comm_userdata_blockinfo_linked = -1;       /* Some flags in Block info response */
-static gint hf_s7comm_userdata_blockinfo_standard_block = -1;
-static gint hf_s7comm_userdata_blockinfo_nonretain = -1;    /* Some flags in Block info response */
-static gint ett_s7comm_userdata_blockinfo_flags = -1;
+static gint hf_s7comm_ud_blockinfo_block_num_ascii;    /* Block number, 5 bytes, ASCII*/
+static gint hf_s7comm_ud_blockinfo_filesys;            /* Filesystem, 1 byte, ASCII*/
+static gint hf_s7comm_ud_blockinfo_res_infolength;     /* Length of Info, 2 bytes as int */
+static gint hf_s7comm_ud_blockinfo_res_unknown2;       /* Unknown blockinfo 2, 2 bytes, HEX*/
+static gint hf_s7comm_ud_blockinfo_res_const3;         /* Constant 3, 2 bytes, ASCII */
+static gint hf_s7comm_ud_blockinfo_res_unknown;        /* Unknown byte(s) */
+static gint hf_s7comm_ud_blockinfo_subblk_type;        /* Subblk type, 1 byte, stringlist subblktype_names */
+static gint hf_s7comm_ud_blockinfo_load_mem_len;       /* Length load memory, 4 bytes, int */
+static gint hf_s7comm_ud_blockinfo_blocksecurity;      /* Block Security, 4 bytes, stringlist blocksecurity_names*/
+static gint hf_s7comm_ud_blockinfo_interface_timestamp;/* Interface Timestamp, string */
+static gint hf_s7comm_ud_blockinfo_code_timestamp;     /* Code Timestamp, string */
+static gint hf_s7comm_ud_blockinfo_ssb_len;            /* SSB length, 2 bytes, int */
+static gint hf_s7comm_ud_blockinfo_add_len;            /* ADD length, 2 bytes, int */
+static gint hf_s7comm_ud_blockinfo_localdata_len;      /* Length localdata, 2 bytes, int */
+static gint hf_s7comm_ud_blockinfo_mc7_len;            /* Length MC7 code, 2 bytes, int */
+static gint hf_s7comm_ud_blockinfo_author;             /* Author, 8 bytes, ASCII */
+static gint hf_s7comm_ud_blockinfo_family;             /* Family, 8 bytes, ASCII */
+static gint hf_s7comm_ud_blockinfo_headername;         /* Name (Header), 8 bytes, ASCII */
+static gint hf_s7comm_ud_blockinfo_headerversion;      /* Version (Header), 8 bytes, ASCII */
+static gint hf_s7comm_ud_blockinfo_checksum;           /* Block checksum, 2 bytes, HEX */
+static gint hf_s7comm_ud_blockinfo_reserved1;          /* Reserved 1, 4 bytes, HEX */
+static gint hf_s7comm_ud_blockinfo_reserved2;          /* Reserved 2, 4 bytes, HEX */
+
+static gint hf_s7comm_userdata_blockinfo_flags;        /* Some flags in Block info response */
+static gint hf_s7comm_userdata_blockinfo_linked;       /* Some flags in Block info response */
+static gint hf_s7comm_userdata_blockinfo_standard_block;
+static gint hf_s7comm_userdata_blockinfo_nonretain;    /* Some flags in Block info response */
+static gint ett_s7comm_userdata_blockinfo_flags;
 static int * const s7comm_userdata_blockinfo_flags_fields[] = {
     &hf_s7comm_userdata_blockinfo_linked,
     &hf_s7comm_userdata_blockinfo_standard_block,
@@ -1255,12 +1255,12 @@ static int * const s7comm_userdata_blockinfo_flags_fields[] = {
 };
 
 /* Programmer commands / Test and installation (TIS) functions */
-static gint hf_s7comm_tis_parameter = -1;
-static gint hf_s7comm_tis_data = -1;
-static gint hf_s7comm_tis_parametersize = -1;
-static gint hf_s7comm_tis_datasize = -1;
-static gint hf_s7comm_tis_param1 = -1;
-static gint hf_s7comm_tis_param2 = -1;
+static gint hf_s7comm_tis_parameter;
+static gint hf_s7comm_tis_data;
+static gint hf_s7comm_tis_parametersize;
+static gint hf_s7comm_tis_datasize;
+static gint hf_s7comm_tis_param1;
+static gint hf_s7comm_tis_param2;
 static const value_string tis_param2_names[] = {    /* Values and their meaning are not always clearly defined in every function */
     { 0,                                    "Update Monitor Variables / Activate Modify Values"},
     { 1,                                    "Monitor Variable / Modify Variable" },
@@ -1268,48 +1268,48 @@ static const value_string tis_param2_names[] = {    /* Values and their meaning
     { 256,                                  "Force immediately" },
     { 0,                                    NULL }
 };
-static gint hf_s7comm_tis_param3 = -1;
+static gint hf_s7comm_tis_param3;
 static const value_string tis_param3_names[] = {
     { 0,                                    "Every cycle (permanent)" },
     { 1,                                    "Once" },
     { 2,                                    "Always (force)" },
     { 0,                                    NULL }
 };
-static gint hf_s7comm_tis_answersize = -1;
-static gint hf_s7comm_tis_param5 = -1;
-static gint hf_s7comm_tis_param6 = -1;
-static gint hf_s7comm_tis_param7 = -1;
-static gint hf_s7comm_tis_param8 = -1;
-static gint hf_s7comm_tis_param9 = -1;
-static gint hf_s7comm_tis_trgevent = -1;
-static gint hf_s7comm_tis_res_param1 = -1;
-static gint hf_s7comm_tis_res_param2 = -1;
-static gint hf_s7comm_tis_job_function = -1;
-static gint hf_s7comm_tis_job_seqnr = -1;
-static gint hf_s7comm_tis_job_reserved = -1;
+static gint hf_s7comm_tis_answersize;
+static gint hf_s7comm_tis_param5;
+static gint hf_s7comm_tis_param6;
+static gint hf_s7comm_tis_param7;
+static gint hf_s7comm_tis_param8;
+static gint hf_s7comm_tis_param9;
+static gint hf_s7comm_tis_trgevent;
+static gint hf_s7comm_tis_res_param1;
+static gint hf_s7comm_tis_res_param2;
+static gint hf_s7comm_tis_job_function;
+static gint hf_s7comm_tis_job_seqnr;
+static gint hf_s7comm_tis_job_reserved;
 
 
 
 /* B/I/L Stack */
-static gint hf_s7comm_tis_interrupted_blocktype = -1;
-static gint hf_s7comm_tis_interrupted_blocknr = -1;
-static gint hf_s7comm_tis_interrupted_address = -1;
-static gint hf_s7comm_tis_interrupted_prioclass = -1;
-static gint hf_s7comm_tis_continued_blocktype = -1;
-static gint hf_s7comm_tis_continued_blocknr = -1;
-static gint hf_s7comm_tis_continued_address = -1;
-static gint hf_s7comm_tis_breakpoint_blocktype = -1;
-static gint hf_s7comm_tis_breakpoint_blocknr = -1;
-static gint hf_s7comm_tis_breakpoint_address = -1;
-static gint hf_s7comm_tis_breakpoint_reserved = -1;
-
-static gint hf_s7comm_tis_p_callenv = -1;
+static gint hf_s7comm_tis_interrupted_blocktype;
+static gint hf_s7comm_tis_interrupted_blocknr;
+static gint hf_s7comm_tis_interrupted_address;
+static gint hf_s7comm_tis_interrupted_prioclass;
+static gint hf_s7comm_tis_continued_blocktype;
+static gint hf_s7comm_tis_continued_blocknr;
+static gint hf_s7comm_tis_continued_address;
+static gint hf_s7comm_tis_breakpoint_blocktype;
+static gint hf_s7comm_tis_breakpoint_blocknr;
+static gint hf_s7comm_tis_breakpoint_address;
+static gint hf_s7comm_tis_breakpoint_reserved;
+
+static gint hf_s7comm_tis_p_callenv;
 static const value_string tis_p_callenv_names[] = {
     { 0,                                   "Specified call environment"},
     { 2,                                   "Specified global and/or instance data block"},
     { 0,                                    NULL }
 };
-static gint hf_s7comm_tis_p_callcond = -1;
+static gint hf_s7comm_tis_p_callcond;
 static const value_string tis_p_callcond_names[] = {
     { 0x0000,                               "Not set" },
     { 0x0001,                               "On block number" },
@@ -1319,105 +1319,105 @@ static const value_string tis_p_callcond_names[] = {
     { 0x0a0a,                               "On DB1 (DB) and DB2 (DI) content" },
     { 0,                                    NULL }
 };
-static gint hf_s7comm_tis_p_callcond_blocktype = -1;
-static gint hf_s7comm_tis_p_callcond_blocknr = -1;
-static gint hf_s7comm_tis_p_callcond_address = -1;
-
-
-static gint hf_s7comm_tis_register_db1_type = -1;
-static gint hf_s7comm_tis_register_db2_type = -1;
-static gint hf_s7comm_tis_register_db1_nr = -1;
-static gint hf_s7comm_tis_register_db2_nr = -1;
-static gint hf_s7comm_tis_register_accu1 = -1;
-static gint hf_s7comm_tis_register_accu2 = -1;
-static gint hf_s7comm_tis_register_accu3 = -1;
-static gint hf_s7comm_tis_register_accu4 = -1;
-static gint hf_s7comm_tis_register_ar1 = -1;
-static gint hf_s7comm_tis_register_ar2 = -1;
-static gint hf_s7comm_tis_register_stw = -1;
-static gint hf_s7comm_tis_exithold_until = -1;
+static gint hf_s7comm_tis_p_callcond_blocktype;
+static gint hf_s7comm_tis_p_callcond_blocknr;
+static gint hf_s7comm_tis_p_callcond_address;
+
+
+static gint hf_s7comm_tis_register_db1_type;
+static gint hf_s7comm_tis_register_db2_type;
+static gint hf_s7comm_tis_register_db1_nr;
+static gint hf_s7comm_tis_register_db2_nr;
+static gint hf_s7comm_tis_register_accu1;
+static gint hf_s7comm_tis_register_accu2;
+static gint hf_s7comm_tis_register_accu3;
+static gint hf_s7comm_tis_register_accu4;
+static gint hf_s7comm_tis_register_ar1;
+static gint hf_s7comm_tis_register_ar2;
+static gint hf_s7comm_tis_register_stw;
+static gint hf_s7comm_tis_exithold_until;
 static const value_string tis_exithold_until_names[] = {
     { 0,                                    "Next breakpoint" },
     { 1,                                    "Next statement" },
     { 0,                                    NULL }
 };
-static gint hf_s7comm_tis_exithold_res1 = -1;
-static gint hf_s7comm_tis_bstack_nest_depth = -1;
-static gint hf_s7comm_tis_bstack_reserved = -1;
-static gint hf_s7comm_tis_istack_reserved = -1;
-static gint hf_s7comm_tis_lstack_reserved = -1;
-static gint hf_s7comm_tis_lstack_size = -1;
-static gint hf_s7comm_tis_lstack_data = -1;
-static gint hf_s7comm_tis_blockstat_flagsunknown = -1;
-static gint hf_s7comm_tis_blockstat_number_of_lines = -1;
-static gint hf_s7comm_tis_blockstat_line_address = -1;
-static gint hf_s7comm_tis_blockstat_data = -1;
-static gint hf_s7comm_tis_blockstat_reserved = -1;
+static gint hf_s7comm_tis_exithold_res1;
+static gint hf_s7comm_tis_bstack_nest_depth;
+static gint hf_s7comm_tis_bstack_reserved;
+static gint hf_s7comm_tis_istack_reserved;
+static gint hf_s7comm_tis_lstack_reserved;
+static gint hf_s7comm_tis_lstack_size;
+static gint hf_s7comm_tis_lstack_data;
+static gint hf_s7comm_tis_blockstat_flagsunknown;
+static gint hf_s7comm_tis_blockstat_number_of_lines;
+static gint hf_s7comm_tis_blockstat_line_address;
+static gint hf_s7comm_tis_blockstat_data;
+static gint hf_s7comm_tis_blockstat_reserved;
 
 /* Organization block local data */
-static gint hf_s7comm_ob_ev_class = -1;
-static gint hf_s7comm_ob_scan_1 = -1;
-static gint hf_s7comm_ob_strt_inf = -1;
-static gint hf_s7comm_ob_flt_id = -1;
-static gint hf_s7comm_ob_priority = -1;
-static gint hf_s7comm_ob_number = -1;
-static gint hf_s7comm_ob_reserved_1 = -1;
-static gint hf_s7comm_ob_reserved_2 = -1;
-static gint hf_s7comm_ob_reserved_3 = -1;
-static gint hf_s7comm_ob_reserved_4 = -1;
-static gint hf_s7comm_ob_reserved_4_dw = -1;
-static gint hf_s7comm_ob_prev_cycle = -1;
-static gint hf_s7comm_ob_min_cycle = -1;
-static gint hf_s7comm_ob_max_cycle = -1;
-static gint hf_s7comm_ob_period_exe = -1;
-static gint hf_s7comm_ob_sign = -1;
-static gint hf_s7comm_ob_dtime = -1;
-static gint hf_s7comm_ob_phase_offset = -1;
-static gint hf_s7comm_ob_exec_freq = -1;
-static gint hf_s7comm_ob_io_flag = -1;
-static gint hf_s7comm_ob_mdl_addr = -1;
-static gint hf_s7comm_ob_point_addr = -1;
-static gint hf_s7comm_ob_inf_len = -1;
-static gint hf_s7comm_ob_alarm_type = -1;
-static gint hf_s7comm_ob_alarm_slot = -1;
-static gint hf_s7comm_ob_alarm_spec = -1;
-static gint hf_s7comm_ob_error_info = -1;
-static gint hf_s7comm_ob_err_ev_class = -1;
-static gint hf_s7comm_ob_err_ev_num = -1;
-static gint hf_s7comm_ob_err_ob_priority = -1;
-static gint hf_s7comm_ob_err_ob_num = -1;
-static gint hf_s7comm_ob_rack_cpu = -1;
-static gint hf_s7comm_ob_8x_fault_flags = -1;
-static gint hf_s7comm_ob_mdl_type_b = -1;
-static gint hf_s7comm_ob_mdl_type_w = -1;
-static gint hf_s7comm_ob_rack_num = -1;
-static gint hf_s7comm_ob_racks_flt = -1;
-static gint hf_s7comm_ob_strtup = -1;
-static gint hf_s7comm_ob_stop = -1;
-static gint hf_s7comm_ob_strt_info = -1;
-static gint hf_s7comm_ob_sw_flt = -1;
-static gint hf_s7comm_ob_blk_type = -1;
-static gint hf_s7comm_ob_flt_reg = -1;
-static gint hf_s7comm_ob_flt_blk_num = -1;
-static gint hf_s7comm_ob_prg_addr = -1;
-static gint hf_s7comm_ob_mem_area = -1;
-static gint hf_s7comm_ob_mem_addr = -1;
-
-static gint hf_s7comm_diagdata_req_block_type = -1;
-static gint hf_s7comm_diagdata_req_block_num = -1;
-static gint hf_s7comm_diagdata_req_startaddr_awl = -1;
-static gint hf_s7comm_diagdata_req_saz = -1;
+static gint hf_s7comm_ob_ev_class;
+static gint hf_s7comm_ob_scan_1;
+static gint hf_s7comm_ob_strt_inf;
+static gint hf_s7comm_ob_flt_id;
+static gint hf_s7comm_ob_priority;
+static gint hf_s7comm_ob_number;
+static gint hf_s7comm_ob_reserved_1;
+static gint hf_s7comm_ob_reserved_2;
+static gint hf_s7comm_ob_reserved_3;
+static gint hf_s7comm_ob_reserved_4;
+static gint hf_s7comm_ob_reserved_4_dw;
+static gint hf_s7comm_ob_prev_cycle;
+static gint hf_s7comm_ob_min_cycle;
+static gint hf_s7comm_ob_max_cycle;
+static gint hf_s7comm_ob_period_exe;
+static gint hf_s7comm_ob_sign;
+static gint hf_s7comm_ob_dtime;
+static gint hf_s7comm_ob_phase_offset;
+static gint hf_s7comm_ob_exec_freq;
+static gint hf_s7comm_ob_io_flag;
+static gint hf_s7comm_ob_mdl_addr;
+static gint hf_s7comm_ob_point_addr;
+static gint hf_s7comm_ob_inf_len;
+static gint hf_s7comm_ob_alarm_type;
+static gint hf_s7comm_ob_alarm_slot;
+static gint hf_s7comm_ob_alarm_spec;
+static gint hf_s7comm_ob_error_info;
+static gint hf_s7comm_ob_err_ev_class;
+static gint hf_s7comm_ob_err_ev_num;
+static gint hf_s7comm_ob_err_ob_priority;
+static gint hf_s7comm_ob_err_ob_num;
+static gint hf_s7comm_ob_rack_cpu;
+static gint hf_s7comm_ob_8x_fault_flags;
+static gint hf_s7comm_ob_mdl_type_b;
+static gint hf_s7comm_ob_mdl_type_w;
+static gint hf_s7comm_ob_rack_num;
+static gint hf_s7comm_ob_racks_flt;
+static gint hf_s7comm_ob_strtup;
+static gint hf_s7comm_ob_stop;
+static gint hf_s7comm_ob_strt_info;
+static gint hf_s7comm_ob_sw_flt;
+static gint hf_s7comm_ob_blk_type;
+static gint hf_s7comm_ob_flt_reg;
+static gint hf_s7comm_ob_flt_blk_num;
+static gint hf_s7comm_ob_prg_addr;
+static gint hf_s7comm_ob_mem_area;
+static gint hf_s7comm_ob_mem_addr;
+
+static gint hf_s7comm_diagdata_req_block_type;
+static gint hf_s7comm_diagdata_req_block_num;
+static gint hf_s7comm_diagdata_req_startaddr_awl;
+static gint hf_s7comm_diagdata_req_saz;
 
 /* Flags for requested registers in diagnostic data telegrams */
-static gint hf_s7comm_diagdata_registerflag = -1;           /* Registerflags */
-static gint hf_s7comm_diagdata_registerflag_stw = -1;       /* STW = Status word */
-static gint hf_s7comm_diagdata_registerflag_accu1 = -1;     /* Accumulator 1 */
-static gint hf_s7comm_diagdata_registerflag_accu2 = -1;     /* Accumulator 2 */
-static gint hf_s7comm_diagdata_registerflag_ar1 = -1;       /* Addressregister 1 */
-static gint hf_s7comm_diagdata_registerflag_ar2 = -1;       /* Addressregister 2 */
-static gint hf_s7comm_diagdata_registerflag_db1 = -1;       /* Datablock register 1 */
-static gint hf_s7comm_diagdata_registerflag_db2 = -1;       /* Datablock register 2 */
-static gint ett_s7comm_diagdata_registerflag = -1;
+static gint hf_s7comm_diagdata_registerflag;           /* Registerflags */
+static gint hf_s7comm_diagdata_registerflag_stw;       /* STW = Status word */
+static gint hf_s7comm_diagdata_registerflag_accu1;     /* Accumulator 1 */
+static gint hf_s7comm_diagdata_registerflag_accu2;     /* Accumulator 2 */
+static gint hf_s7comm_diagdata_registerflag_ar1;       /* Addressregister 1 */
+static gint hf_s7comm_diagdata_registerflag_ar2;       /* Addressregister 2 */
+static gint hf_s7comm_diagdata_registerflag_db1;       /* Datablock register 1 */
+static gint hf_s7comm_diagdata_registerflag_db2;       /* Datablock register 2 */
+static gint ett_s7comm_diagdata_registerflag;
 static int * const s7comm_diagdata_registerflag_fields[] = {
     &hf_s7comm_diagdata_registerflag_stw,
     &hf_s7comm_diagdata_registerflag_accu1,
@@ -1431,8 +1431,8 @@ static int * const s7comm_diagdata_registerflag_fields[] = {
 
 static heur_dissector_list_t s7comm_heur_subdissector_list;
 
-static expert_field ei_s7comm_data_blockcontrol_block_num_invalid = EI_INIT;
-static expert_field ei_s7comm_ud_blockinfo_block_num_ascii_invalid = EI_INIT;
+static expert_field ei_s7comm_data_blockcontrol_block_num_invalid;
+static expert_field ei_s7comm_ud_blockinfo_block_num_ascii_invalid;
 
 /* PI service name IDs. Index represents the index in pi_service_names */
 typedef enum
@@ -1581,192 +1581,192 @@ static const string_string pi_service_names[] = {
 };
 
 /* Function 0x28 (PI Start) */
-static gint hf_s7comm_piservice_unknown1 = -1;   /* Unknown bytes */
-static gint hf_s7comm_piservice_parameterblock = -1;
-static gint hf_s7comm_piservice_parameterblock_len = -1;
-static gint hf_s7comm_piservice_servicename = -1;
-
-static gint ett_s7comm_piservice_parameterblock = -1;
-
-static gint hf_s7comm_piservice_string_len = -1;
-static gint hf_s7comm_pi_n_x_addressident = -1;
-static gint hf_s7comm_pi_n_x_password = -1;
-static gint hf_s7comm_pi_n_x_filename = -1;
-static gint hf_s7comm_pi_n_x_editwindowname = -1;
-static gint hf_s7comm_pi_n_x_seekpointer = -1;
-static gint hf_s7comm_pi_n_x_windowsize = -1;
-static gint hf_s7comm_pi_n_x_comparestring = -1;
-static gint hf_s7comm_pi_n_x_skipcount = -1;
-static gint hf_s7comm_pi_n_x_interruptnr = -1;
-static gint hf_s7comm_pi_n_x_priority = -1;
-static gint hf_s7comm_pi_n_x_liftfast = -1;
-static gint hf_s7comm_pi_n_x_blsync = -1;
-static gint hf_s7comm_pi_n_x_magnr = -1;
-static gint hf_s7comm_pi_n_x_dnr = -1;
-static gint hf_s7comm_pi_n_x_spindlenumber = -1;
-static gint hf_s7comm_pi_n_x_wznr = -1;
-static gint hf_s7comm_pi_n_x_class = -1;
-static gint hf_s7comm_pi_n_x_tnr = -1;
-static gint hf_s7comm_pi_n_x_toolnumber = -1;
-static gint hf_s7comm_pi_n_x_cenumber = -1;
-static gint hf_s7comm_pi_n_x_datablocknumber = -1;
-static gint hf_s7comm_pi_n_x_firstcolumnnumber = -1;
-static gint hf_s7comm_pi_n_x_lastcolumnnumber = -1;
-static gint hf_s7comm_pi_n_x_firstrownumber = -1;
-static gint hf_s7comm_pi_n_x_lastrownumber = -1;
-static gint hf_s7comm_pi_n_x_direction = -1;
-static gint hf_s7comm_pi_n_x_sourcefilename = -1;
-static gint hf_s7comm_pi_n_x_destinationfilename = -1;
-static gint hf_s7comm_pi_n_x_channelnumber = -1;
-static gint hf_s7comm_pi_n_x_protection = -1;
-static gint hf_s7comm_pi_n_x_oldfilename = -1;
-static gint hf_s7comm_pi_n_x_newfilename = -1;
-static gint hf_s7comm_pi_n_x_findmode = -1;
-static gint hf_s7comm_pi_n_x_switch = -1;
-static gint hf_s7comm_pi_n_x_functionnumber = -1;
-static gint hf_s7comm_pi_n_x_semaphorevalue = -1;
-static gint hf_s7comm_pi_n_x_onoff = -1;
-static gint hf_s7comm_pi_n_x_mode = -1;
-static gint hf_s7comm_pi_n_x_factor = -1;
-static gint hf_s7comm_pi_n_x_passwordlevel = -1;
-static gint hf_s7comm_pi_n_x_linenumber = -1;
-static gint hf_s7comm_pi_n_x_weargroup = -1;
-static gint hf_s7comm_pi_n_x_toolstatus = -1;
-static gint hf_s7comm_pi_n_x_wearsearchstrat = -1;
-static gint hf_s7comm_pi_n_x_toolid = -1;
-static gint hf_s7comm_pi_n_x_duplonumber = -1;
-static gint hf_s7comm_pi_n_x_edgenumber = -1;
-static gint hf_s7comm_pi_n_x_placenr = -1;
-static gint hf_s7comm_pi_n_x_placerefnr = -1;
-static gint hf_s7comm_pi_n_x_magrefnr = -1;
-static gint hf_s7comm_pi_n_x_magnrfrom = -1;
-static gint hf_s7comm_pi_n_x_placenrfrom = -1;
-static gint hf_s7comm_pi_n_x_magnrto = -1;
-static gint hf_s7comm_pi_n_x_placenrto = -1;
-static gint hf_s7comm_pi_n_x_halfplacesleft = -1;
-static gint hf_s7comm_pi_n_x_halfplacesright = -1;
-static gint hf_s7comm_pi_n_x_halfplacesup = -1;
-static gint hf_s7comm_pi_n_x_halfplacesdown = -1;
-static gint hf_s7comm_pi_n_x_placetype = -1;
-static gint hf_s7comm_pi_n_x_searchdirection = -1;
-static gint hf_s7comm_pi_n_x_toolname = -1;
-static gint hf_s7comm_pi_n_x_placenrsource = -1;
-static gint hf_s7comm_pi_n_x_magnrsource = -1;
-static gint hf_s7comm_pi_n_x_placenrdestination = -1;
-static gint hf_s7comm_pi_n_x_magnrdestination = -1;
-static gint hf_s7comm_pi_n_x_incrementnumber = -1;
-static gint hf_s7comm_pi_n_x_monitoringmode = -1;
-static gint hf_s7comm_pi_n_x_kindofsearch = -1;
-
-static gint hf_s7comm_data_plccontrol_argument = -1;        /* Argument, 2 Bytes as char */
-static gint hf_s7comm_data_plccontrol_block_cnt = -1;       /* Number of blocks, 1 Byte as int */
-static gint hf_s7comm_data_pi_inse_unknown = -1;
-static gint hf_s7comm_data_plccontrol_part2_len = -1;       /* Length part 2 in bytes, 1 Byte as Int */
+static gint hf_s7comm_piservice_unknown1;   /* Unknown bytes */
+static gint hf_s7comm_piservice_parameterblock;
+static gint hf_s7comm_piservice_parameterblock_len;
+static gint hf_s7comm_piservice_servicename;
+
+static gint ett_s7comm_piservice_parameterblock;
+
+static gint hf_s7comm_piservice_string_len;
+static gint hf_s7comm_pi_n_x_addressident;
+static gint hf_s7comm_pi_n_x_password;
+static gint hf_s7comm_pi_n_x_filename;
+static gint hf_s7comm_pi_n_x_editwindowname;
+static gint hf_s7comm_pi_n_x_seekpointer;
+static gint hf_s7comm_pi_n_x_windowsize;
+static gint hf_s7comm_pi_n_x_comparestring;
+static gint hf_s7comm_pi_n_x_skipcount;
+static gint hf_s7comm_pi_n_x_interruptnr;
+static gint hf_s7comm_pi_n_x_priority;
+static gint hf_s7comm_pi_n_x_liftfast;
+static gint hf_s7comm_pi_n_x_blsync;
+static gint hf_s7comm_pi_n_x_magnr;
+static gint hf_s7comm_pi_n_x_dnr;
+static gint hf_s7comm_pi_n_x_spindlenumber;
+static gint hf_s7comm_pi_n_x_wznr;
+static gint hf_s7comm_pi_n_x_class;
+static gint hf_s7comm_pi_n_x_tnr;
+static gint hf_s7comm_pi_n_x_toolnumber;
+static gint hf_s7comm_pi_n_x_cenumber;
+static gint hf_s7comm_pi_n_x_datablocknumber;
+static gint hf_s7comm_pi_n_x_firstcolumnnumber;
+static gint hf_s7comm_pi_n_x_lastcolumnnumber;
+static gint hf_s7comm_pi_n_x_firstrownumber;
+static gint hf_s7comm_pi_n_x_lastrownumber;
+static gint hf_s7comm_pi_n_x_direction;
+static gint hf_s7comm_pi_n_x_sourcefilename;
+static gint hf_s7comm_pi_n_x_destinationfilename;
+static gint hf_s7comm_pi_n_x_channelnumber;
+static gint hf_s7comm_pi_n_x_protection;
+static gint hf_s7comm_pi_n_x_oldfilename;
+static gint hf_s7comm_pi_n_x_newfilename;
+static gint hf_s7comm_pi_n_x_findmode;
+static gint hf_s7comm_pi_n_x_switch;
+static gint hf_s7comm_pi_n_x_functionnumber;
+static gint hf_s7comm_pi_n_x_semaphorevalue;
+static gint hf_s7comm_pi_n_x_onoff;
+static gint hf_s7comm_pi_n_x_mode;
+static gint hf_s7comm_pi_n_x_factor;
+static gint hf_s7comm_pi_n_x_passwordlevel;
+static gint hf_s7comm_pi_n_x_linenumber;
+static gint hf_s7comm_pi_n_x_weargroup;
+static gint hf_s7comm_pi_n_x_toolstatus;
+static gint hf_s7comm_pi_n_x_wearsearchstrat;
+static gint hf_s7comm_pi_n_x_toolid;
+static gint hf_s7comm_pi_n_x_duplonumber;
+static gint hf_s7comm_pi_n_x_edgenumber;
+static gint hf_s7comm_pi_n_x_placenr;
+static gint hf_s7comm_pi_n_x_placerefnr;
+static gint hf_s7comm_pi_n_x_magrefnr;
+static gint hf_s7comm_pi_n_x_magnrfrom;
+static gint hf_s7comm_pi_n_x_placenrfrom;
+static gint hf_s7comm_pi_n_x_magnrto;
+static gint hf_s7comm_pi_n_x_placenrto;
+static gint hf_s7comm_pi_n_x_halfplacesleft;
+static gint hf_s7comm_pi_n_x_halfplacesright;
+static gint hf_s7comm_pi_n_x_halfplacesup;
+static gint hf_s7comm_pi_n_x_halfplacesdown;
+static gint hf_s7comm_pi_n_x_placetype;
+static gint hf_s7comm_pi_n_x_searchdirection;
+static gint hf_s7comm_pi_n_x_toolname;
+static gint hf_s7comm_pi_n_x_placenrsource;
+static gint hf_s7comm_pi_n_x_magnrsource;
+static gint hf_s7comm_pi_n_x_placenrdestination;
+static gint hf_s7comm_pi_n_x_magnrdestination;
+static gint hf_s7comm_pi_n_x_incrementnumber;
+static gint hf_s7comm_pi_n_x_monitoringmode;
+static gint hf_s7comm_pi_n_x_kindofsearch;
+
+static gint hf_s7comm_data_plccontrol_argument;        /* Argument, 2 Bytes as char */
+static gint hf_s7comm_data_plccontrol_block_cnt;       /* Number of blocks, 1 Byte as int */
+static gint hf_s7comm_data_pi_inse_unknown;
+static gint hf_s7comm_data_plccontrol_part2_len;       /* Length part 2 in bytes, 1 Byte as Int */
 
 /* block control functions */
-static gint hf_s7comm_data_blockcontrol_unknown1 = -1;      /* for all unknown bytes in blockcontrol */
-static gint hf_s7comm_data_blockcontrol_errorcode = -1;     /* Error code 2 bytes as int, 0 is no error */
-static gint hf_s7comm_data_blockcontrol_uploadid = -1;
-static gint hf_s7comm_data_blockcontrol_file_ident = -1;    /* File identifier, as ASCII */
-static gint hf_s7comm_data_blockcontrol_block_type = -1;    /* Block type, 2 Byte */
-static gint hf_s7comm_data_blockcontrol_block_num = -1;     /* Block number, 5 Bytes, ASCII */
-static gint hf_s7comm_data_blockcontrol_dest_filesys = -1;  /* Destination filesystem, 1 Byte, ASCII */
-static gint hf_s7comm_data_blockcontrol_part2_len = -1;     /* Length part 2 in bytes, 1 Byte Int */
-static gint hf_s7comm_data_blockcontrol_part2_unknown = -1; /* Unknown char, ASCII */
-static gint hf_s7comm_data_blockcontrol_loadmem_len = -1;   /* Length load memory in bytes, ASCII */
-static gint hf_s7comm_data_blockcontrol_mc7code_len = -1;   /* Length of MC7 code in bytes, ASCII */
-static gint hf_s7comm_data_blockcontrol_filename_len = -1;
-static gint hf_s7comm_data_blockcontrol_filename = -1;
-static gint hf_s7comm_data_blockcontrol_upl_lenstring_len = -1;
-static gint hf_s7comm_data_blockcontrol_upl_lenstring = -1;
-
-static gint hf_s7comm_data_blockcontrol_functionstatus = -1;
-static gint hf_s7comm_data_blockcontrol_functionstatus_more = -1;
-static gint hf_s7comm_data_blockcontrol_functionstatus_error = -1;
-static gint ett_s7comm_data_blockcontrol_status = -1;
+static gint hf_s7comm_data_blockcontrol_unknown1;      /* for all unknown bytes in blockcontrol */
+static gint hf_s7comm_data_blockcontrol_errorcode;     /* Error code 2 bytes as int, 0 is no error */
+static gint hf_s7comm_data_blockcontrol_uploadid;
+static gint hf_s7comm_data_blockcontrol_file_ident;    /* File identifier, as ASCII */
+static gint hf_s7comm_data_blockcontrol_block_type;    /* Block type, 2 Byte */
+static gint hf_s7comm_data_blockcontrol_block_num;     /* Block number, 5 Bytes, ASCII */
+static gint hf_s7comm_data_blockcontrol_dest_filesys;  /* Destination filesystem, 1 Byte, ASCII */
+static gint hf_s7comm_data_blockcontrol_part2_len;     /* Length part 2 in bytes, 1 Byte Int */
+static gint hf_s7comm_data_blockcontrol_part2_unknown; /* Unknown char, ASCII */
+static gint hf_s7comm_data_blockcontrol_loadmem_len;   /* Length load memory in bytes, ASCII */
+static gint hf_s7comm_data_blockcontrol_mc7code_len;   /* Length of MC7 code in bytes, ASCII */
+static gint hf_s7comm_data_blockcontrol_filename_len;
+static gint hf_s7comm_data_blockcontrol_filename;
+static gint hf_s7comm_data_blockcontrol_upl_lenstring_len;
+static gint hf_s7comm_data_blockcontrol_upl_lenstring;
+
+static gint hf_s7comm_data_blockcontrol_functionstatus;
+static gint hf_s7comm_data_blockcontrol_functionstatus_more;
+static gint hf_s7comm_data_blockcontrol_functionstatus_error;
+static gint ett_s7comm_data_blockcontrol_status;
 static int * const s7comm_data_blockcontrol_status_fields[] = {
     &hf_s7comm_data_blockcontrol_functionstatus_more,
     &hf_s7comm_data_blockcontrol_functionstatus_error,
     NULL
 };
 
-static gint ett_s7comm_plcfilename = -1;
-static gint hf_s7comm_data_ncprg_unackcount = -1;
-static gint hf_s7comm_data_ncprg_filelength = -1;
-static gint hf_s7comm_data_ncprg_filetime = -1;
-static gint hf_s7comm_data_ncprg_filepath = -1;
-static gint hf_s7comm_data_ncprg_filedata = -1;
+static gint ett_s7comm_plcfilename;
+static gint hf_s7comm_data_ncprg_unackcount;
+static gint hf_s7comm_data_ncprg_filelength;
+static gint hf_s7comm_data_ncprg_filetime;
+static gint hf_s7comm_data_ncprg_filepath;
+static gint hf_s7comm_data_ncprg_filedata;
 
 /* Data record routing to Profibus */
-static gint hf_s7comm_data_drr_data = -1;
+static gint hf_s7comm_data_drr_data;
 
 /* Variable status */
-static gint hf_s7comm_varstat_unknown = -1;                  /* Unknown byte(s), hex */
-static gint hf_s7comm_varstat_item_count = -1;               /* Item count, 2 bytes, int */
-static gint hf_s7comm_varstat_req_memory_area = -1;          /* Memory area, 1 byte, stringlist userdata_tis_varstat_area_names  */
-static gint hf_s7comm_varstat_req_repetition_factor = -1;    /* Repetition factor, 1 byte as int */
-static gint hf_s7comm_varstat_req_db_number = -1;            /* DB number, 2 bytes as int */
-static gint hf_s7comm_varstat_req_startaddress = -1;         /* Startaddress, 2 bytes as int */
-static gint hf_s7comm_varstat_req_bitpos = -1;
+static gint hf_s7comm_varstat_unknown;                  /* Unknown byte(s), hex */
+static gint hf_s7comm_varstat_item_count;               /* Item count, 2 bytes, int */
+static gint hf_s7comm_varstat_req_memory_area;          /* Memory area, 1 byte, stringlist userdata_tis_varstat_area_names  */
+static gint hf_s7comm_varstat_req_repetition_factor;    /* Repetition factor, 1 byte as int */
+static gint hf_s7comm_varstat_req_db_number;            /* DB number, 2 bytes as int */
+static gint hf_s7comm_varstat_req_startaddress;         /* Startaddress, 2 bytes as int */
+static gint hf_s7comm_varstat_req_bitpos;
 
 /* cyclic services */
-static gint hf_s7comm_cycl_interval_timebase = -1;          /* Interval timebase, 1 byte, int */
-static gint hf_s7comm_cycl_interval_time = -1;              /* Interval time, 1 byte, int */
-static gint hf_s7comm_cycl_function = -1;
-static gint hf_s7comm_cycl_jobid = -1;
+static gint hf_s7comm_cycl_interval_timebase;          /* Interval timebase, 1 byte, int */
+static gint hf_s7comm_cycl_interval_time;              /* Interval time, 1 byte, int */
+static gint hf_s7comm_cycl_function;
+static gint hf_s7comm_cycl_jobid;
 
 /* Read record */
-static gint hf_s7comm_rdrec_mlen = -1;                      /* Max. length in bytes of the data record data to be read */
-static gint hf_s7comm_rdrec_index = -1;                     /* Data record number */
-static gint hf_s7comm_rdrec_id = -1;                        /* Diagnostic address */
-static gint hf_s7comm_rdrec_statuslen = -1;                 /* Length of optional status data */
-static gint hf_s7comm_rdrec_statusdata = -1;                /* Optional status data */
-static gint hf_s7comm_rdrec_recordlen = -1;                 /* Length of data record data read */
-static gint hf_s7comm_rdrec_data = -1;                      /* The read data record */
-static gint hf_s7comm_rdrec_reserved1 = -1;
+static gint hf_s7comm_rdrec_mlen;                      /* Max. length in bytes of the data record data to be read */
+static gint hf_s7comm_rdrec_index;                     /* Data record number */
+static gint hf_s7comm_rdrec_id;                        /* Diagnostic address */
+static gint hf_s7comm_rdrec_statuslen;                 /* Length of optional status data */
+static gint hf_s7comm_rdrec_statusdata;                /* Optional status data */
+static gint hf_s7comm_rdrec_recordlen;                 /* Length of data record data read */
+static gint hf_s7comm_rdrec_data;                      /* The read data record */
+static gint hf_s7comm_rdrec_reserved1;
 
 /* PBC, Programmable Block Functions */
-static gint hf_s7comm_pbc_unknown = -1;                     /* unknown, 1 byte */
-static gint hf_s7comm_pbc_bsend_r_id = -1;                  /* Request ID R_ID, 4 bytes as hex */
-static gint hf_s7comm_pbc_bsend_len = -1;
-static gint hf_s7comm_pbc_usend_unknown1 = -1;
-static gint hf_s7comm_pbc_usend_r_id = -1;
-static gint hf_s7comm_pbc_usend_unknown2 = -1;
-static gint hf_s7comm_pbc_arsend_ar_id = -1;
-static gint hf_s7comm_pbc_arsend_ret = -1;
-static gint hf_s7comm_pbc_arsend_unknown = -1;
-static gint hf_s7comm_pbc_arsend_len = -1;
+static gint hf_s7comm_pbc_unknown;                     /* unknown, 1 byte */
+static gint hf_s7comm_pbc_bsend_r_id;                  /* Request ID R_ID, 4 bytes as hex */
+static gint hf_s7comm_pbc_bsend_len;
+static gint hf_s7comm_pbc_usend_unknown1;
+static gint hf_s7comm_pbc_usend_r_id;
+static gint hf_s7comm_pbc_usend_unknown2;
+static gint hf_s7comm_pbc_arsend_ar_id;
+static gint hf_s7comm_pbc_arsend_ret;
+static gint hf_s7comm_pbc_arsend_unknown;
+static gint hf_s7comm_pbc_arsend_len;
 
 /* Alarm messages */
-static gint hf_s7comm_cpu_alarm_message_item = -1;
-static gint hf_s7comm_cpu_alarm_message_obj_item = -1;
-static gint hf_s7comm_cpu_alarm_message_function = -1;
-static gint hf_s7comm_cpu_alarm_message_nr_objects = -1;
-static gint hf_s7comm_cpu_alarm_message_nr_add_values = -1;
-static gint hf_s7comm_cpu_alarm_message_eventid = -1;
-static gint hf_s7comm_cpu_alarm_message_timestamp_coming = -1;
-static gint hf_s7comm_cpu_alarm_message_timestamp_going = -1;
-static gint hf_s7comm_cpu_alarm_message_associated_value = -1;
-static gint hf_s7comm_cpu_alarm_message_eventstate = -1;
-static gint hf_s7comm_cpu_alarm_message_state = -1;
-static gint hf_s7comm_cpu_alarm_message_ackstate_coming = -1;
-static gint hf_s7comm_cpu_alarm_message_ackstate_going = -1;
-static gint hf_s7comm_cpu_alarm_message_event_coming = -1;
-static gint hf_s7comm_cpu_alarm_message_event_going = -1;
-static gint hf_s7comm_cpu_alarm_message_event_lastchanged = -1;
-static gint hf_s7comm_cpu_alarm_message_event_reserved = -1;
-static gint hf_s7comm_cpu_alarm_message_scan_unknown1 = -1;
-static gint hf_s7comm_cpu_alarm_message_scan_unknown2 = -1;
-
-static gint hf_s7comm_cpu_alarm_message_signal_sig1 = -1;
-static gint hf_s7comm_cpu_alarm_message_signal_sig2 = -1;
-static gint hf_s7comm_cpu_alarm_message_signal_sig3 = -1;
-static gint hf_s7comm_cpu_alarm_message_signal_sig4 = -1;
-static gint hf_s7comm_cpu_alarm_message_signal_sig5 = -1;
-static gint hf_s7comm_cpu_alarm_message_signal_sig6 = -1;
-static gint hf_s7comm_cpu_alarm_message_signal_sig7 = -1;
-static gint hf_s7comm_cpu_alarm_message_signal_sig8 = -1;
-static gint ett_s7comm_cpu_alarm_message_signal = -1;
+static gint hf_s7comm_cpu_alarm_message_item;
+static gint hf_s7comm_cpu_alarm_message_obj_item;
+static gint hf_s7comm_cpu_alarm_message_function;
+static gint hf_s7comm_cpu_alarm_message_nr_objects;
+static gint hf_s7comm_cpu_alarm_message_nr_add_values;
+static gint hf_s7comm_cpu_alarm_message_eventid;
+static gint hf_s7comm_cpu_alarm_message_timestamp_coming;
+static gint hf_s7comm_cpu_alarm_message_timestamp_going;
+static gint hf_s7comm_cpu_alarm_message_associated_value;
+static gint hf_s7comm_cpu_alarm_message_eventstate;
+static gint hf_s7comm_cpu_alarm_message_state;
+static gint hf_s7comm_cpu_alarm_message_ackstate_coming;
+static gint hf_s7comm_cpu_alarm_message_ackstate_going;
+static gint hf_s7comm_cpu_alarm_message_event_coming;
+static gint hf_s7comm_cpu_alarm_message_event_going;
+static gint hf_s7comm_cpu_alarm_message_event_lastchanged;
+static gint hf_s7comm_cpu_alarm_message_event_reserved;
+static gint hf_s7comm_cpu_alarm_message_scan_unknown1;
+static gint hf_s7comm_cpu_alarm_message_scan_unknown2;
+
+static gint hf_s7comm_cpu_alarm_message_signal_sig1;
+static gint hf_s7comm_cpu_alarm_message_signal_sig2;
+static gint hf_s7comm_cpu_alarm_message_signal_sig3;
+static gint hf_s7comm_cpu_alarm_message_signal_sig4;
+static gint hf_s7comm_cpu_alarm_message_signal_sig5;
+static gint hf_s7comm_cpu_alarm_message_signal_sig6;
+static gint hf_s7comm_cpu_alarm_message_signal_sig7;
+static gint hf_s7comm_cpu_alarm_message_signal_sig8;
+static gint ett_s7comm_cpu_alarm_message_signal;
 static int * const s7comm_cpu_alarm_message_signal_fields[] = {
     &hf_s7comm_cpu_alarm_message_signal_sig1,
     &hf_s7comm_cpu_alarm_message_signal_sig2,
@@ -1779,30 +1779,30 @@ static int * const s7comm_cpu_alarm_message_signal_fields[] = {
     NULL
 };
 
-static gint hf_s7comm_cpu_alarm_query_unknown1 = -1;
-static gint hf_s7comm_cpu_alarm_query_querytype = -1;
-static gint hf_s7comm_cpu_alarm_query_unknown2 = -1;
-static gint hf_s7comm_cpu_alarm_query_alarmtype = -1;
-static gint hf_s7comm_cpu_alarm_query_completelen = -1;
-static gint hf_s7comm_cpu_alarm_query_datasetlen = -1;
-static gint hf_s7comm_cpu_alarm_query_resunknown1 = -1;
+static gint hf_s7comm_cpu_alarm_query_unknown1;
+static gint hf_s7comm_cpu_alarm_query_querytype;
+static gint hf_s7comm_cpu_alarm_query_unknown2;
+static gint hf_s7comm_cpu_alarm_query_alarmtype;
+static gint hf_s7comm_cpu_alarm_query_completelen;
+static gint hf_s7comm_cpu_alarm_query_datasetlen;
+static gint hf_s7comm_cpu_alarm_query_resunknown1;
 
 /* CPU diagnostic messages */
-static gint hf_s7comm_cpu_diag_msg_item = -1;
-static gint hf_s7comm_cpu_diag_msg_eventid = -1;
-static gint hf_s7comm_cpu_diag_msg_eventid_class = -1;
-static gint hf_s7comm_cpu_diag_msg_eventid_ident_entleave = -1;
-static gint hf_s7comm_cpu_diag_msg_eventid_ident_diagbuf = -1;
-static gint hf_s7comm_cpu_diag_msg_eventid_ident_interr = -1;
-static gint hf_s7comm_cpu_diag_msg_eventid_ident_exterr = -1;
-static gint hf_s7comm_cpu_diag_msg_eventid_nr = -1;
-static gint hf_s7comm_cpu_diag_msg_prioclass = -1;
-static gint hf_s7comm_cpu_diag_msg_obnumber = -1;
-static gint hf_s7comm_cpu_diag_msg_datid = -1;
-static gint hf_s7comm_cpu_diag_msg_info1 = -1;
-static gint hf_s7comm_cpu_diag_msg_info2 = -1;
-
-static gint ett_s7comm_cpu_diag_msg_eventid = -1;
+static gint hf_s7comm_cpu_diag_msg_item;
+static gint hf_s7comm_cpu_diag_msg_eventid;
+static gint hf_s7comm_cpu_diag_msg_eventid_class;
+static gint hf_s7comm_cpu_diag_msg_eventid_ident_entleave;
+static gint hf_s7comm_cpu_diag_msg_eventid_ident_diagbuf;
+static gint hf_s7comm_cpu_diag_msg_eventid_ident_interr;
+static gint hf_s7comm_cpu_diag_msg_eventid_ident_exterr;
+static gint hf_s7comm_cpu_diag_msg_eventid_nr;
+static gint hf_s7comm_cpu_diag_msg_prioclass;
+static gint hf_s7comm_cpu_diag_msg_obnumber;
+static gint hf_s7comm_cpu_diag_msg_datid;
+static gint hf_s7comm_cpu_diag_msg_info1;
+static gint hf_s7comm_cpu_diag_msg_info2;
+
+static gint ett_s7comm_cpu_diag_msg_eventid;
 static int * const s7comm_cpu_diag_msg_eventid_fields[] = {
     &hf_s7comm_cpu_diag_msg_eventid_class,
     &hf_s7comm_cpu_diag_msg_eventid_ident_entleave,
@@ -2419,12 +2419,12 @@ static const value_string alarm_message_query_alarmtype_names[] = {
 };
 
 /* CPU message service */
-static gint hf_s7comm_cpu_msgservice_subscribe_events = -1;
-static gint hf_s7comm_cpu_msgservice_subscribe_events_modetrans = -1;
-static gint hf_s7comm_cpu_msgservice_subscribe_events_system = -1;
-static gint hf_s7comm_cpu_msgservice_subscribe_events_userdefined = -1;
-static gint hf_s7comm_cpu_msgservice_subscribe_events_alarms = -1;
-static gint ett_s7comm_cpu_msgservice_subscribe_events = -1;
+static gint hf_s7comm_cpu_msgservice_subscribe_events;
+static gint hf_s7comm_cpu_msgservice_subscribe_events_modetrans;
+static gint hf_s7comm_cpu_msgservice_subscribe_events_system;
+static gint hf_s7comm_cpu_msgservice_subscribe_events_userdefined;
+static gint hf_s7comm_cpu_msgservice_subscribe_events_alarms;
+static gint ett_s7comm_cpu_msgservice_subscribe_events;
 static int * const s7comm_cpu_msgservice_subscribe_events_fields[] = {
     &hf_s7comm_cpu_msgservice_subscribe_events_modetrans,
     &hf_s7comm_cpu_msgservice_subscribe_events_system,
@@ -2432,14 +2432,14 @@ static int * const s7comm_cpu_msgservice_subscribe_events_fields[] = {
     &hf_s7comm_cpu_msgservice_subscribe_events_alarms,
     NULL
 };
-static gint hf_s7comm_cpu_msgservice_req_reserved1 = -1;
-static gint hf_s7comm_cpu_msgservice_username = -1;
-static gint hf_s7comm_cpu_msgservice_almtype = -1;
-static gint hf_s7comm_cpu_msgservice_req_reserved2 = -1;
-static gint hf_s7comm_cpu_msgservice_res_result = -1;
-static gint hf_s7comm_cpu_msgservice_res_reserved1 = -1;
-static gint hf_s7comm_cpu_msgservice_res_reserved2 = -1;
-static gint hf_s7comm_cpu_msgservice_res_reserved3 = -1;
+static gint hf_s7comm_cpu_msgservice_req_reserved1;
+static gint hf_s7comm_cpu_msgservice_username;
+static gint hf_s7comm_cpu_msgservice_almtype;
+static gint hf_s7comm_cpu_msgservice_req_reserved2;
+static gint hf_s7comm_cpu_msgservice_res_result;
+static gint hf_s7comm_cpu_msgservice_res_reserved1;
+static gint hf_s7comm_cpu_msgservice_res_reserved2;
+static gint hf_s7comm_cpu_msgservice_res_reserved3;
 
 #define S7COMM_CPU_MSG_ALMTYPE_SCAN_ABORT               0
 #define S7COMM_CPU_MSG_ALMTYPE_SCAN_INITIATE            1
@@ -2462,8 +2462,8 @@ static const value_string cpu_msgservice_almtype_names[] = {
     { 0,                                                NULL }
 };
 
-static gint hf_s7comm_modetrans_param_unknown1 = -1;
-static gint hf_s7comm_modetrans_param_mode = -1;
+static gint hf_s7comm_modetrans_param_unknown1;
+static gint hf_s7comm_modetrans_param_mode;
 static const value_string modetrans_param_mode_names[] = {
     { 0,                                    "STOP" },
     { 1,                                    "Warm Restart" },
@@ -2476,21 +2476,21 @@ static const value_string modetrans_param_mode_names[] = {
     { 12,                                   "UPDATE" },
     { 0,                                    NULL }
 };
-static gint hf_s7comm_modetrans_param_unknown2 = -1;
+static gint hf_s7comm_modetrans_param_unknown2;
 
 /* These fields used when reassembling S7COMM fragments */
-static gint hf_s7comm_fragments = -1;
-static gint hf_s7comm_fragment = -1;
-static gint hf_s7comm_fragment_overlap = -1;
-static gint hf_s7comm_fragment_overlap_conflict = -1;
-static gint hf_s7comm_fragment_multiple_tails = -1;
-static gint hf_s7comm_fragment_too_long_fragment = -1;
-static gint hf_s7comm_fragment_error = -1;
-static gint hf_s7comm_fragment_count = -1;
-static gint hf_s7comm_reassembled_in = -1;
-static gint hf_s7comm_reassembled_length = -1;
-static gint ett_s7comm_fragment = -1;
-static gint ett_s7comm_fragments = -1;
+static gint hf_s7comm_fragments;
+static gint hf_s7comm_fragment;
+static gint hf_s7comm_fragment_overlap;
+static gint hf_s7comm_fragment_overlap_conflict;
+static gint hf_s7comm_fragment_multiple_tails;
+static gint hf_s7comm_fragment_too_long_fragment;
+static gint hf_s7comm_fragment_error;
+static gint hf_s7comm_fragment_count;
+static gint hf_s7comm_reassembled_in;
+static gint hf_s7comm_reassembled_length;
+static gint ett_s7comm_fragment;
+static gint ett_s7comm_fragments;
 
 static const fragment_items s7comm_frag_items = {
     /* Fragment subtrees */
@@ -2518,21 +2518,21 @@ static const fragment_items s7comm_frag_items = {
 static reassembly_table s7comm_reassembly_table;
 
 /* These are the ids of the subtrees that we are creating */
-static gint ett_s7comm = -1;                                        /* S7 communication tree, parent of all other subtree */
-static gint ett_s7comm_header = -1;                                 /* Subtree for header block */
-static gint ett_s7comm_param = -1;                                  /* Subtree for parameter block */
-static gint ett_s7comm_param_item = -1;                             /* Subtree for items in parameter block */
-static gint ett_s7comm_param_subitem = -1;                          /* Subtree for subitems under items in parameter block */
-static gint ett_s7comm_data = -1;                                   /* Subtree for data block */
-static gint ett_s7comm_data_item = -1;                              /* Subtree for an item in data block */
-static gint ett_s7comm_item_address = -1;                           /* Subtree for an address (byte/bit) */
-static gint ett_s7comm_cpu_alarm_message = -1;                      /* Subtree for an alarm message */
-static gint ett_s7comm_cpu_alarm_message_object = -1;               /* Subtree for an alarm message block*/
-static gint ett_s7comm_cpu_alarm_message_timestamp = -1;            /* Subtree for an alarm message timestamp */
-static gint ett_s7comm_cpu_alarm_message_associated_value = -1;     /* Subtree for an alarm message associated value */
-static gint ett_s7comm_cpu_diag_msg = -1;                           /* Subtree for a CPU diagnostic message */
-static gint ett_s7comm_prog_parameter = -1;
-static gint ett_s7comm_prog_data = -1;
+static gint ett_s7comm;                                        /* S7 communication tree, parent of all other subtree */
+static gint ett_s7comm_header;                                 /* Subtree for header block */
+static gint ett_s7comm_param;                                  /* Subtree for parameter block */
+static gint ett_s7comm_param_item;                             /* Subtree for items in parameter block */
+static gint ett_s7comm_param_subitem;                          /* Subtree for subitems under items in parameter block */
+static gint ett_s7comm_data;                                   /* Subtree for data block */
+static gint ett_s7comm_data_item;                              /* Subtree for an item in data block */
+static gint ett_s7comm_item_address;                           /* Subtree for an address (byte/bit) */
+static gint ett_s7comm_cpu_alarm_message;                      /* Subtree for an alarm message */
+static gint ett_s7comm_cpu_alarm_message_object;               /* Subtree for an alarm message block*/
+static gint ett_s7comm_cpu_alarm_message_timestamp;            /* Subtree for an alarm message timestamp */
+static gint ett_s7comm_cpu_alarm_message_associated_value;     /* Subtree for an alarm message associated value */
+static gint ett_s7comm_cpu_diag_msg;                           /* Subtree for a CPU diagnostic message */
+static gint ett_s7comm_prog_parameter;
+static gint ett_s7comm_prog_data;
 
 static const char mon_names[][4] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
 
diff --git a/epan/dissectors/packet-s7comm_szl_ids.c b/epan/dissectors/packet-s7comm_szl_ids.c
index eabd8ca26a..e85e86332b 100644
--- a/epan/dissectors/packet-s7comm_szl_ids.c
+++ b/epan/dissectors/packet-s7comm_szl_ids.c
@@ -17,9 +17,9 @@
 #include "packet-s7comm.h"
 #include "packet-s7comm_szl_ids.h"
 
-static gint ett_s7comm_szl = -1;
-static gint hf_s7comm_userdata_szl_partial_list = -1;           /* Partial list in szl response */
-static gint hf_s7comm_userdata_szl_id = -1;                     /* SZL id */
+static gint ett_s7comm_szl;
+static gint hf_s7comm_userdata_szl_partial_list;           /* Partial list in szl response */
+static gint hf_s7comm_userdata_szl_id;                     /* SZL id */
 
 static const value_string szl_module_type_names[] = {
     { 0x0,                                  "CPU" },            /* Binary: 0000 */
@@ -28,12 +28,12 @@ static const value_string szl_module_type_names[] = {
     { 0x8,                                  "FM" },             /* Binary: 1000 */
     { 0,                                    NULL }
 };
-static gint hf_s7comm_userdata_szl_id_type = -1;
-static gint hf_s7comm_userdata_szl_id_partlist_ex = -1;
-static gint hf_s7comm_userdata_szl_id_partlist_num = -1;
-static gint hf_s7comm_userdata_szl_id_partlist_len = -1;
-static gint hf_s7comm_userdata_szl_id_partlist_cnt = -1;
-static gint ett_s7comm_userdata_szl_id = -1;
+static gint hf_s7comm_userdata_szl_id_type;
+static gint hf_s7comm_userdata_szl_id_partlist_ex;
+static gint hf_s7comm_userdata_szl_id_partlist_num;
+static gint hf_s7comm_userdata_szl_id_partlist_len;
+static gint hf_s7comm_userdata_szl_id_partlist_cnt;
+static gint ett_s7comm_userdata_szl_id;
 static int * const s7comm_userdata_szl_id_fields[] = {
     &hf_s7comm_userdata_szl_id_type,
     &hf_s7comm_userdata_szl_id_partlist_ex,
@@ -239,8 +239,8 @@ static const value_string szl_partial_list_names[] = {
 };
 static value_string_ext szl_partial_list_names_ext = VALUE_STRING_EXT_INIT(szl_partial_list_names);
 
-static gint hf_s7comm_userdata_szl_index = -1;                  /* SZL index */
-static gint hf_s7comm_userdata_szl_tree = -1;                   /* SZL item tree */
+static gint hf_s7comm_userdata_szl_index;                  /* SZL index */
+static gint hf_s7comm_userdata_szl_tree;                   /* SZL item tree */
 
 /* Index description for SZL Requests */
 static const value_string szl_0111_index_names[] = {
@@ -432,12 +432,12 @@ static const value_string szl_xy1c_index_names[] = {
 };
 
 /* Header fields of the SZL */
-static gint hf_s7comm_szl_0000_0000_szl_id = -1;
-static gint hf_s7comm_szl_0000_0000_module_type_class = -1;
-static gint hf_s7comm_szl_0000_0000_partlist_extr_nr = -1;
-static gint hf_s7comm_szl_0000_0000_partlist_nr = -1;
+static gint hf_s7comm_szl_0000_0000_szl_id;
+static gint hf_s7comm_szl_0000_0000_module_type_class;
+static gint hf_s7comm_szl_0000_0000_partlist_extr_nr;
+static gint hf_s7comm_szl_0000_0000_partlist_nr;
 
-static gint hf_s7comm_szl_xy12_0x00_charac = -1;
+static gint hf_s7comm_szl_xy12_0x00_charac;
 static const value_string szl_xy12_cpu_characteristic_names[] = {
     { 0x0000,                               "MC7 processing unit group" },
     { 0x0001,                               "MC7 processing generating code" },
@@ -489,62 +489,62 @@ static const value_string szl_xy12_cpu_characteristic_names[] = {
     { 0,                                    NULL }
 };
 
-static gint hf_s7comm_szl_0013_0000_index = -1;
+static gint hf_s7comm_szl_0013_0000_index;
 
-static gint hf_s7comm_szl_0013_0000_code = -1;
+static gint hf_s7comm_szl_0013_0000_code;
 static const value_string szl_memory_type_names[] = {
     { 0x0001,                               "volatile memory (RAM)" },
     { 0x0002,                               "non-volatile memory (FEPROM)" },
     { 0x0003,                               "mixed memory (RAM + FEPROM)" },
     { 0,                                    NULL }
 };
-static gint hf_s7comm_szl_0013_0000_size = -1;
-static gint hf_s7comm_szl_0013_0000_mode = -1;
-static gint hf_s7comm_szl_0013_0000_mode_0 = -1;
-static gint hf_s7comm_szl_0013_0000_mode_1 = -1;
-static gint hf_s7comm_szl_0013_0000_mode_2 = -1;
-static gint hf_s7comm_szl_0013_0000_mode_3 = -1;
-static gint hf_s7comm_szl_0013_0000_mode_4 = -1;
-static gint hf_s7comm_szl_0013_0000_granu = -1;
-static gint hf_s7comm_szl_0013_0000_ber1 = -1;
-static gint hf_s7comm_szl_0013_0000_belegt1 = -1;
-static gint hf_s7comm_szl_0013_0000_block1 = -1;
-static gint hf_s7comm_szl_0013_0000_ber2 = -1;
-static gint hf_s7comm_szl_0013_0000_belegt2 = -1;
-static gint hf_s7comm_szl_0013_0000_block2 = -1;
-
-static gint hf_s7comm_szl_xy11_0001_index = -1;
-static gint hf_s7comm_szl_xy11_0001_mlfb = -1;
-static gint hf_s7comm_szl_xy11_0001_bgtyp = -1;
-static gint hf_s7comm_szl_xy11_0001_ausbg = -1;
-static gint hf_s7comm_szl_xy11_0001_ausbe = -1;
-
-static gint hf_s7comm_szl_xy14_000x_index = -1;
-static gint hf_s7comm_szl_xy14_000x_code = -1;
-static gint hf_s7comm_szl_xy14_000x_quantity = -1;
-static gint hf_s7comm_szl_xy14_000x_reman = -1;
-
-static gint hf_s7comm_szl_xy15_000x_index = -1;
-static gint hf_s7comm_szl_xy15_000x_maxanz = -1;
-static gint hf_s7comm_szl_xy15_000x_maxlng = -1;
-static gint hf_s7comm_szl_xy15_000x_maxabl = -1;
-
-static gint hf_s7comm_szl_xy22_00xx_info = -1;
-static gint hf_s7comm_szl_xy22_00xx_al1 = -1;
-static gint hf_s7comm_szl_xy22_00xx_al1_0 = -1;
-static gint hf_s7comm_szl_xy22_00xx_al1_1 = -1;
-static gint hf_s7comm_szl_xy22_00xx_al1_2 = -1;
-static gint hf_s7comm_szl_xy22_00xx_al1_4 = -1;
-static gint hf_s7comm_szl_xy22_00xx_al1_5 = -1;
-static gint hf_s7comm_szl_xy22_00xx_al1_6 = -1;
-static gint hf_s7comm_szl_xy22_00xx_al2 = -1;
-static gint hf_s7comm_szl_xy22_00xx_al2_0 = -1;
-static gint hf_s7comm_szl_xy22_00xx_al2_1 = -1;
-static gint hf_s7comm_szl_xy22_00xx_al2_2 = -1;
-static gint hf_s7comm_szl_xy22_00xx_al2_3 = -1;
-static gint hf_s7comm_szl_xy22_00xx_al3 = -1;
-
-static gint ett_s7comm_szl_xy22_00xx_al1 = -1;
+static gint hf_s7comm_szl_0013_0000_size;
+static gint hf_s7comm_szl_0013_0000_mode;
+static gint hf_s7comm_szl_0013_0000_mode_0;
+static gint hf_s7comm_szl_0013_0000_mode_1;
+static gint hf_s7comm_szl_0013_0000_mode_2;
+static gint hf_s7comm_szl_0013_0000_mode_3;
+static gint hf_s7comm_szl_0013_0000_mode_4;
+static gint hf_s7comm_szl_0013_0000_granu;
+static gint hf_s7comm_szl_0013_0000_ber1;
+static gint hf_s7comm_szl_0013_0000_belegt1;
+static gint hf_s7comm_szl_0013_0000_block1;
+static gint hf_s7comm_szl_0013_0000_ber2;
+static gint hf_s7comm_szl_0013_0000_belegt2;
+static gint hf_s7comm_szl_0013_0000_block2;
+
+static gint hf_s7comm_szl_xy11_0001_index;
+static gint hf_s7comm_szl_xy11_0001_mlfb;
+static gint hf_s7comm_szl_xy11_0001_bgtyp;
+static gint hf_s7comm_szl_xy11_0001_ausbg;
+static gint hf_s7comm_szl_xy11_0001_ausbe;
+
+static gint hf_s7comm_szl_xy14_000x_index;
+static gint hf_s7comm_szl_xy14_000x_code;
+static gint hf_s7comm_szl_xy14_000x_quantity;
+static gint hf_s7comm_szl_xy14_000x_reman;
+
+static gint hf_s7comm_szl_xy15_000x_index;
+static gint hf_s7comm_szl_xy15_000x_maxanz;
+static gint hf_s7comm_szl_xy15_000x_maxlng;
+static gint hf_s7comm_szl_xy15_000x_maxabl;
+
+static gint hf_s7comm_szl_xy22_00xx_info;
+static gint hf_s7comm_szl_xy22_00xx_al1;
+static gint hf_s7comm_szl_xy22_00xx_al1_0;
+static gint hf_s7comm_szl_xy22_00xx_al1_1;
+static gint hf_s7comm_szl_xy22_00xx_al1_2;
+static gint hf_s7comm_szl_xy22_00xx_al1_4;
+static gint hf_s7comm_szl_xy22_00xx_al1_5;
+static gint hf_s7comm_szl_xy22_00xx_al1_6;
+static gint hf_s7comm_szl_xy22_00xx_al2;
+static gint hf_s7comm_szl_xy22_00xx_al2_0;
+static gint hf_s7comm_szl_xy22_00xx_al2_1;
+static gint hf_s7comm_szl_xy22_00xx_al2_2;
+static gint hf_s7comm_szl_xy22_00xx_al2_3;
+static gint hf_s7comm_szl_xy22_00xx_al3;
+
+static gint ett_s7comm_szl_xy22_00xx_al1;
 static int * const s7comm_szl_xy22_00xx_al1_fields[] = {
     &hf_s7comm_szl_xy22_00xx_al1_0,
     &hf_s7comm_szl_xy22_00xx_al1_1,
@@ -554,7 +554,7 @@ static int * const s7comm_szl_xy22_00xx_al1_fields[] = {
     &hf_s7comm_szl_xy22_00xx_al1_6,
     NULL
 };
-static gint ett_s7comm_szl_xy22_00xx_al2 = -1;
+static gint ett_s7comm_szl_xy22_00xx_al2;
 static int * const s7comm_szl_xy22_00xx_al2_fields[] = {
     &hf_s7comm_szl_xy22_00xx_al2_0,
     &hf_s7comm_szl_xy22_00xx_al2_1,
@@ -563,77 +563,77 @@ static int * const s7comm_szl_xy22_00xx_al2_fields[] = {
     NULL
 };
 
-static gint hf_s7comm_szl_0131_0001_index = -1;
-static gint hf_s7comm_szl_0131_0001_pdu = -1;
-static gint hf_s7comm_szl_0131_0001_anz= -1;
-static gint hf_s7comm_szl_0131_0001_mpi_bps = -1;
-static gint hf_s7comm_szl_0131_0001_kbus_bps = -1;
-static gint hf_s7comm_szl_0131_0001_res = -1;
-
-static gint hf_s7comm_szl_0131_0002_index = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_0 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_0_0 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_0_1 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_0_2 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_0_3 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_0_4 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_0_5 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_0_6 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_0_7 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_1 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_1_0 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_1_1 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_1_2 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_1_3 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_1_4 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_1_5 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_1_6 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_1_7 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_2 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_2_0 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_2_1 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_2_2 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_2_3 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_2_4 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_2_5 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_2_6 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_2_7 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_3 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_4 = -1;
-static gint hf_s7comm_szl_0131_0002_funkt_5 = -1;
-static gint hf_s7comm_szl_0131_0002_aseg = -1;
-static gint hf_s7comm_szl_0131_0002_eseg = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_0 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_0_0 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_0_1 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_0_2 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_0_3 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_0_4 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_0_5 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_0_6 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_0_7 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_1 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_1_0 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_1_1 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_1_2 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_1_3 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_1_4 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_1_5 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_1_6 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_1_7 = -1;
-static gint hf_s7comm_szl_0131_0002_trgereig_2 = -1;
-static gint hf_s7comm_szl_0131_0002_trgbed = -1;
-static gint hf_s7comm_szl_0131_0002_pfad = -1;
-static gint hf_s7comm_szl_0131_0002_tiefe = -1;
-static gint hf_s7comm_szl_0131_0002_systrig = -1;
-static gint hf_s7comm_szl_0131_0002_erg_par = -1;
-static gint hf_s7comm_szl_0131_0002_erg_pat_1 = -1;
-static gint hf_s7comm_szl_0131_0002_erg_pat_2 = -1;
-static gint hf_s7comm_szl_0131_0002_force = -1;
-static gint hf_s7comm_szl_0131_0002_time = -1;
-static gint hf_s7comm_szl_0131_0002_res = -1;
-
-static gint ett_s7comm_szl_0131_0002_funkt_0 = -1;
+static gint hf_s7comm_szl_0131_0001_index;
+static gint hf_s7comm_szl_0131_0001_pdu;
+static gint hf_s7comm_szl_0131_0001_anz;
+static gint hf_s7comm_szl_0131_0001_mpi_bps;
+static gint hf_s7comm_szl_0131_0001_kbus_bps;
+static gint hf_s7comm_szl_0131_0001_res;
+
+static gint hf_s7comm_szl_0131_0002_index;
+static gint hf_s7comm_szl_0131_0002_funkt_0;
+static gint hf_s7comm_szl_0131_0002_funkt_0_0;
+static gint hf_s7comm_szl_0131_0002_funkt_0_1;
+static gint hf_s7comm_szl_0131_0002_funkt_0_2;
+static gint hf_s7comm_szl_0131_0002_funkt_0_3;
+static gint hf_s7comm_szl_0131_0002_funkt_0_4;
+static gint hf_s7comm_szl_0131_0002_funkt_0_5;
+static gint hf_s7comm_szl_0131_0002_funkt_0_6;
+static gint hf_s7comm_szl_0131_0002_funkt_0_7;
+static gint hf_s7comm_szl_0131_0002_funkt_1;
+static gint hf_s7comm_szl_0131_0002_funkt_1_0;
+static gint hf_s7comm_szl_0131_0002_funkt_1_1;
+static gint hf_s7comm_szl_0131_0002_funkt_1_2;
+static gint hf_s7comm_szl_0131_0002_funkt_1_3;
+static gint hf_s7comm_szl_0131_0002_funkt_1_4;
+static gint hf_s7comm_szl_0131_0002_funkt_1_5;
+static gint hf_s7comm_szl_0131_0002_funkt_1_6;
+static gint hf_s7comm_szl_0131_0002_funkt_1_7;
+static gint hf_s7comm_szl_0131_0002_funkt_2;
+static gint hf_s7comm_szl_0131_0002_funkt_2_0;
+static gint hf_s7comm_szl_0131_0002_funkt_2_1;
+static gint hf_s7comm_szl_0131_0002_funkt_2_2;
+static gint hf_s7comm_szl_0131_0002_funkt_2_3;
+static gint hf_s7comm_szl_0131_0002_funkt_2_4;
+static gint hf_s7comm_szl_0131_0002_funkt_2_5;
+static gint hf_s7comm_szl_0131_0002_funkt_2_6;
+static gint hf_s7comm_szl_0131_0002_funkt_2_7;
+static gint hf_s7comm_szl_0131_0002_funkt_3;
+static gint hf_s7comm_szl_0131_0002_funkt_4;
+static gint hf_s7comm_szl_0131_0002_funkt_5;
+static gint hf_s7comm_szl_0131_0002_aseg;
+static gint hf_s7comm_szl_0131_0002_eseg;
+static gint hf_s7comm_szl_0131_0002_trgereig_0;
+static gint hf_s7comm_szl_0131_0002_trgereig_0_0;
+static gint hf_s7comm_szl_0131_0002_trgereig_0_1;
+static gint hf_s7comm_szl_0131_0002_trgereig_0_2;
+static gint hf_s7comm_szl_0131_0002_trgereig_0_3;
+static gint hf_s7comm_szl_0131_0002_trgereig_0_4;
+static gint hf_s7comm_szl_0131_0002_trgereig_0_5;
+static gint hf_s7comm_szl_0131_0002_trgereig_0_6;
+static gint hf_s7comm_szl_0131_0002_trgereig_0_7;
+static gint hf_s7comm_szl_0131_0002_trgereig_1;
+static gint hf_s7comm_szl_0131_0002_trgereig_1_0;
+static gint hf_s7comm_szl_0131_0002_trgereig_1_1;
+static gint hf_s7comm_szl_0131_0002_trgereig_1_2;
+static gint hf_s7comm_szl_0131_0002_trgereig_1_3;
+static gint hf_s7comm_szl_0131_0002_trgereig_1_4;
+static gint hf_s7comm_szl_0131_0002_trgereig_1_5;
+static gint hf_s7comm_szl_0131_0002_trgereig_1_6;
+static gint hf_s7comm_szl_0131_0002_trgereig_1_7;
+static gint hf_s7comm_szl_0131_0002_trgereig_2;
+static gint hf_s7comm_szl_0131_0002_trgbed;
+static gint hf_s7comm_szl_0131_0002_pfad;
+static gint hf_s7comm_szl_0131_0002_tiefe;
+static gint hf_s7comm_szl_0131_0002_systrig;
+static gint hf_s7comm_szl_0131_0002_erg_par;
+static gint hf_s7comm_szl_0131_0002_erg_pat_1;
+static gint hf_s7comm_szl_0131_0002_erg_pat_2;
+static gint hf_s7comm_szl_0131_0002_force;
+static gint hf_s7comm_szl_0131_0002_time;
+static gint hf_s7comm_szl_0131_0002_res;
+
+static gint ett_s7comm_szl_0131_0002_funkt_0;
 static int * const s7comm_szl_0131_0002_funkt_0_fields[] = {
     &hf_s7comm_szl_0131_0002_funkt_0_0,
     &hf_s7comm_szl_0131_0002_funkt_0_1,
@@ -645,7 +645,7 @@ static int * const s7comm_szl_0131_0002_funkt_0_fields[] = {
     &hf_s7comm_szl_0131_0002_funkt_0_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0002_funkt_1 = -1;
+static gint ett_s7comm_szl_0131_0002_funkt_1;
 static int * const s7comm_szl_0131_0002_funkt_1_fields[] = {
     &hf_s7comm_szl_0131_0002_funkt_1_0,
     &hf_s7comm_szl_0131_0002_funkt_1_1,
@@ -657,7 +657,7 @@ static int * const s7comm_szl_0131_0002_funkt_1_fields[] = {
     &hf_s7comm_szl_0131_0002_funkt_1_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0002_funkt_2 = -1;
+static gint ett_s7comm_szl_0131_0002_funkt_2;
 static int * const s7comm_szl_0131_0002_funkt_2_fields[] = {
     &hf_s7comm_szl_0131_0002_funkt_2_0,
     &hf_s7comm_szl_0131_0002_funkt_2_1,
@@ -669,7 +669,7 @@ static int * const s7comm_szl_0131_0002_funkt_2_fields[] = {
     &hf_s7comm_szl_0131_0002_funkt_2_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0002_trgereig_0 = -1;
+static gint ett_s7comm_szl_0131_0002_trgereig_0;
 static int * const s7comm_szl_0131_0002_trgereig_0_fields[] = {
     &hf_s7comm_szl_0131_0002_trgereig_0_0,
     &hf_s7comm_szl_0131_0002_trgereig_0_1,
@@ -681,7 +681,7 @@ static int * const s7comm_szl_0131_0002_trgereig_0_fields[] = {
     &hf_s7comm_szl_0131_0002_trgereig_0_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0002_trgereig_1 = -1;
+static gint ett_s7comm_szl_0131_0002_trgereig_1;
 static int * const s7comm_szl_0131_0002_trgereig_1_fields[] = {
     &hf_s7comm_szl_0131_0002_trgereig_1_0,
     &hf_s7comm_szl_0131_0002_trgereig_1_1,
@@ -694,50 +694,50 @@ static int * const s7comm_szl_0131_0002_trgereig_1_fields[] = {
     NULL
 };
 
-static gint hf_s7comm_szl_0131_0003_index = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_0 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_0_0 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_0_1 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_0_2 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_0_3 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_0_4 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_0_5 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_0_6 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_0_7 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_1 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_1_0 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_1_1 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_1_2 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_1_3 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_1_4 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_1_5 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_1_6 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_1_7 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_2 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_2_0 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_2_1 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_2_2 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_2_3 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_2_4 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_2_5 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_2_6 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_2_7 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_3 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_3_0 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_3_1 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_3_2 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_3_3 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_3_4 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_3_5 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_3_6 = -1;
-static gint hf_s7comm_szl_0131_0003_funkt_3_7 = -1;
-static gint hf_s7comm_szl_0131_0003_data = -1;
-static gint hf_s7comm_szl_0131_0003_anz = -1;
-static gint hf_s7comm_szl_0131_0003_per_min = -1;
-static gint hf_s7comm_szl_0131_0003_per_max = -1;
-static gint hf_s7comm_szl_0131_0003_res = -1;
-
-static gint ett_s7comm_szl_0131_0003_funkt_0 = -1;
+static gint hf_s7comm_szl_0131_0003_index;
+static gint hf_s7comm_szl_0131_0003_funkt_0;
+static gint hf_s7comm_szl_0131_0003_funkt_0_0;
+static gint hf_s7comm_szl_0131_0003_funkt_0_1;
+static gint hf_s7comm_szl_0131_0003_funkt_0_2;
+static gint hf_s7comm_szl_0131_0003_funkt_0_3;
+static gint hf_s7comm_szl_0131_0003_funkt_0_4;
+static gint hf_s7comm_szl_0131_0003_funkt_0_5;
+static gint hf_s7comm_szl_0131_0003_funkt_0_6;
+static gint hf_s7comm_szl_0131_0003_funkt_0_7;
+static gint hf_s7comm_szl_0131_0003_funkt_1;
+static gint hf_s7comm_szl_0131_0003_funkt_1_0;
+static gint hf_s7comm_szl_0131_0003_funkt_1_1;
+static gint hf_s7comm_szl_0131_0003_funkt_1_2;
+static gint hf_s7comm_szl_0131_0003_funkt_1_3;
+static gint hf_s7comm_szl_0131_0003_funkt_1_4;
+static gint hf_s7comm_szl_0131_0003_funkt_1_5;
+static gint hf_s7comm_szl_0131_0003_funkt_1_6;
+static gint hf_s7comm_szl_0131_0003_funkt_1_7;
+static gint hf_s7comm_szl_0131_0003_funkt_2;
+static gint hf_s7comm_szl_0131_0003_funkt_2_0;
+static gint hf_s7comm_szl_0131_0003_funkt_2_1;
+static gint hf_s7comm_szl_0131_0003_funkt_2_2;
+static gint hf_s7comm_szl_0131_0003_funkt_2_3;
+static gint hf_s7comm_szl_0131_0003_funkt_2_4;
+static gint hf_s7comm_szl_0131_0003_funkt_2_5;
+static gint hf_s7comm_szl_0131_0003_funkt_2_6;
+static gint hf_s7comm_szl_0131_0003_funkt_2_7;
+static gint hf_s7comm_szl_0131_0003_funkt_3;
+static gint hf_s7comm_szl_0131_0003_funkt_3_0;
+static gint hf_s7comm_szl_0131_0003_funkt_3_1;
+static gint hf_s7comm_szl_0131_0003_funkt_3_2;
+static gint hf_s7comm_szl_0131_0003_funkt_3_3;
+static gint hf_s7comm_szl_0131_0003_funkt_3_4;
+static gint hf_s7comm_szl_0131_0003_funkt_3_5;
+static gint hf_s7comm_szl_0131_0003_funkt_3_6;
+static gint hf_s7comm_szl_0131_0003_funkt_3_7;
+static gint hf_s7comm_szl_0131_0003_data;
+static gint hf_s7comm_szl_0131_0003_anz;
+static gint hf_s7comm_szl_0131_0003_per_min;
+static gint hf_s7comm_szl_0131_0003_per_max;
+static gint hf_s7comm_szl_0131_0003_res;
+
+static gint ett_s7comm_szl_0131_0003_funkt_0;
 static int * const s7comm_szl_0131_0003_funkt_0_fields[] = {
     &hf_s7comm_szl_0131_0003_funkt_0_0,
     &hf_s7comm_szl_0131_0003_funkt_0_1,
@@ -749,7 +749,7 @@ static int * const s7comm_szl_0131_0003_funkt_0_fields[] = {
     &hf_s7comm_szl_0131_0003_funkt_0_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0003_funkt_1 = -1;
+static gint ett_s7comm_szl_0131_0003_funkt_1;
 static int * const s7comm_szl_0131_0003_funkt_1_fields[] = {
     &hf_s7comm_szl_0131_0003_funkt_1_0,
     &hf_s7comm_szl_0131_0003_funkt_1_1,
@@ -761,7 +761,7 @@ static int * const s7comm_szl_0131_0003_funkt_1_fields[] = {
     &hf_s7comm_szl_0131_0003_funkt_1_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0003_funkt_2 = -1;
+static gint ett_s7comm_szl_0131_0003_funkt_2;
 static int * const s7comm_szl_0131_0003_funkt_2_fields[] = {
     &hf_s7comm_szl_0131_0003_funkt_2_0,
     &hf_s7comm_szl_0131_0003_funkt_2_1,
@@ -773,7 +773,7 @@ static int * const s7comm_szl_0131_0003_funkt_2_fields[] = {
     &hf_s7comm_szl_0131_0003_funkt_2_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0003_funkt_3 = -1;
+static gint ett_s7comm_szl_0131_0003_funkt_3;
 static int * const s7comm_szl_0131_0003_funkt_3_fields[] = {
     &hf_s7comm_szl_0131_0003_funkt_3_0,
     &hf_s7comm_szl_0131_0003_funkt_3_1,
@@ -786,63 +786,63 @@ static int * const s7comm_szl_0131_0003_funkt_3_fields[] = {
     NULL
 };
 
-static gint hf_s7comm_szl_0131_0004_index = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_0 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_0_0 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_0_1 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_0_2 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_0_3 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_0_4 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_0_5 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_0_6 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_0_7 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_1 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_1_0 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_1_1 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_1_2 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_1_3 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_1_4 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_1_5 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_1_6 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_1_7 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_2 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_2_0 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_2_1 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_2_2 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_2_3 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_2_4 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_2_5 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_2_6 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_2_7 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_3 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_3_0 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_3_1 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_3_2 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_3_3 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_3_4 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_3_5 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_3_6 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_3_7 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_4 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_4_0 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_4_1 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_4_2 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_4_3 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_4_4 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_4_5 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_4_6 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_4_7 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_5 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_6 = -1;
-static gint hf_s7comm_szl_0131_0004_funkt_7 = -1;
-static gint hf_s7comm_szl_0131_0004_kop = -1;
-static gint hf_s7comm_szl_0131_0004_del = -1;
-static gint hf_s7comm_szl_0131_0004_kett = -1;
-static gint hf_s7comm_szl_0131_0004_hoch = -1;
-static gint hf_s7comm_szl_0131_0004_ver = -1;
-static gint hf_s7comm_szl_0131_0004_res = -1;
-
-static gint ett_s7comm_szl_0131_0004_funkt_0 = -1;
+static gint hf_s7comm_szl_0131_0004_index;
+static gint hf_s7comm_szl_0131_0004_funkt_0;
+static gint hf_s7comm_szl_0131_0004_funkt_0_0;
+static gint hf_s7comm_szl_0131_0004_funkt_0_1;
+static gint hf_s7comm_szl_0131_0004_funkt_0_2;
+static gint hf_s7comm_szl_0131_0004_funkt_0_3;
+static gint hf_s7comm_szl_0131_0004_funkt_0_4;
+static gint hf_s7comm_szl_0131_0004_funkt_0_5;
+static gint hf_s7comm_szl_0131_0004_funkt_0_6;
+static gint hf_s7comm_szl_0131_0004_funkt_0_7;
+static gint hf_s7comm_szl_0131_0004_funkt_1;
+static gint hf_s7comm_szl_0131_0004_funkt_1_0;
+static gint hf_s7comm_szl_0131_0004_funkt_1_1;
+static gint hf_s7comm_szl_0131_0004_funkt_1_2;
+static gint hf_s7comm_szl_0131_0004_funkt_1_3;
+static gint hf_s7comm_szl_0131_0004_funkt_1_4;
+static gint hf_s7comm_szl_0131_0004_funkt_1_5;
+static gint hf_s7comm_szl_0131_0004_funkt_1_6;
+static gint hf_s7comm_szl_0131_0004_funkt_1_7;
+static gint hf_s7comm_szl_0131_0004_funkt_2;
+static gint hf_s7comm_szl_0131_0004_funkt_2_0;
+static gint hf_s7comm_szl_0131_0004_funkt_2_1;
+static gint hf_s7comm_szl_0131_0004_funkt_2_2;
+static gint hf_s7comm_szl_0131_0004_funkt_2_3;
+static gint hf_s7comm_szl_0131_0004_funkt_2_4;
+static gint hf_s7comm_szl_0131_0004_funkt_2_5;
+static gint hf_s7comm_szl_0131_0004_funkt_2_6;
+static gint hf_s7comm_szl_0131_0004_funkt_2_7;
+static gint hf_s7comm_szl_0131_0004_funkt_3;
+static gint hf_s7comm_szl_0131_0004_funkt_3_0;
+static gint hf_s7comm_szl_0131_0004_funkt_3_1;
+static gint hf_s7comm_szl_0131_0004_funkt_3_2;
+static gint hf_s7comm_szl_0131_0004_funkt_3_3;
+static gint hf_s7comm_szl_0131_0004_funkt_3_4;
+static gint hf_s7comm_szl_0131_0004_funkt_3_5;
+static gint hf_s7comm_szl_0131_0004_funkt_3_6;
+static gint hf_s7comm_szl_0131_0004_funkt_3_7;
+static gint hf_s7comm_szl_0131_0004_funkt_4;
+static gint hf_s7comm_szl_0131_0004_funkt_4_0;
+static gint hf_s7comm_szl_0131_0004_funkt_4_1;
+static gint hf_s7comm_szl_0131_0004_funkt_4_2;
+static gint hf_s7comm_szl_0131_0004_funkt_4_3;
+static gint hf_s7comm_szl_0131_0004_funkt_4_4;
+static gint hf_s7comm_szl_0131_0004_funkt_4_5;
+static gint hf_s7comm_szl_0131_0004_funkt_4_6;
+static gint hf_s7comm_szl_0131_0004_funkt_4_7;
+static gint hf_s7comm_szl_0131_0004_funkt_5;
+static gint hf_s7comm_szl_0131_0004_funkt_6;
+static gint hf_s7comm_szl_0131_0004_funkt_7;
+static gint hf_s7comm_szl_0131_0004_kop;
+static gint hf_s7comm_szl_0131_0004_del;
+static gint hf_s7comm_szl_0131_0004_kett;
+static gint hf_s7comm_szl_0131_0004_hoch;
+static gint hf_s7comm_szl_0131_0004_ver;
+static gint hf_s7comm_szl_0131_0004_res;
+
+static gint ett_s7comm_szl_0131_0004_funkt_0;
 static int * const s7comm_szl_0131_0004_funkt_0_fields[] = {
     &hf_s7comm_szl_0131_0004_funkt_0_0,
     &hf_s7comm_szl_0131_0004_funkt_0_1,
@@ -854,7 +854,7 @@ static int * const s7comm_szl_0131_0004_funkt_0_fields[] = {
     &hf_s7comm_szl_0131_0004_funkt_0_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0004_funkt_1 = -1;
+static gint ett_s7comm_szl_0131_0004_funkt_1;
 static int * const s7comm_szl_0131_0004_funkt_1_fields[] = {
     &hf_s7comm_szl_0131_0004_funkt_1_0,
     &hf_s7comm_szl_0131_0004_funkt_1_1,
@@ -866,7 +866,7 @@ static int * const s7comm_szl_0131_0004_funkt_1_fields[] = {
     &hf_s7comm_szl_0131_0004_funkt_1_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0004_funkt_2 = -1;
+static gint ett_s7comm_szl_0131_0004_funkt_2;
 static int * const s7comm_szl_0131_0004_funkt_2_fields[] = {
     &hf_s7comm_szl_0131_0004_funkt_2_0,
     &hf_s7comm_szl_0131_0004_funkt_2_1,
@@ -878,7 +878,7 @@ static int * const s7comm_szl_0131_0004_funkt_2_fields[] = {
     &hf_s7comm_szl_0131_0004_funkt_2_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0004_funkt_3 = -1;
+static gint ett_s7comm_szl_0131_0004_funkt_3;
 static int * const s7comm_szl_0131_0004_funkt_3_fields[] = {
     &hf_s7comm_szl_0131_0004_funkt_3_0,
     &hf_s7comm_szl_0131_0004_funkt_3_1,
@@ -890,7 +890,7 @@ static int * const s7comm_szl_0131_0004_funkt_3_fields[] = {
     &hf_s7comm_szl_0131_0004_funkt_3_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0004_funkt_4 = -1;
+static gint ett_s7comm_szl_0131_0004_funkt_4;
 static int * const s7comm_szl_0131_0004_funkt_4_fields[] = {
     &hf_s7comm_szl_0131_0004_funkt_4_0,
     &hf_s7comm_szl_0131_0004_funkt_4_1,
@@ -903,29 +903,29 @@ static int * const s7comm_szl_0131_0004_funkt_4_fields[] = {
     NULL
 };
 
-static gint hf_s7comm_szl_0131_0005_index = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_0 = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_0_0 = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_0_1 = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_0_2 = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_0_3 = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_0_4 = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_0_5 = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_0_6 = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_0_7 = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_1 = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_2 = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_3 = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_4 = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_5 = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_6 = -1;
-static gint hf_s7comm_szl_0131_0005_funkt_7 = -1;
-static gint hf_s7comm_szl_0131_0005_anz_sen = -1;
-static gint hf_s7comm_szl_0131_0005_anz_ein = -1;
-static gint hf_s7comm_szl_0131_0005_anz_mel = -1;
-static gint hf_s7comm_szl_0131_0005_res = -1;
-
-static gint ett_s7comm_szl_0131_0005_funkt_0 = -1;
+static gint hf_s7comm_szl_0131_0005_index;
+static gint hf_s7comm_szl_0131_0005_funkt_0;
+static gint hf_s7comm_szl_0131_0005_funkt_0_0;
+static gint hf_s7comm_szl_0131_0005_funkt_0_1;
+static gint hf_s7comm_szl_0131_0005_funkt_0_2;
+static gint hf_s7comm_szl_0131_0005_funkt_0_3;
+static gint hf_s7comm_szl_0131_0005_funkt_0_4;
+static gint hf_s7comm_szl_0131_0005_funkt_0_5;
+static gint hf_s7comm_szl_0131_0005_funkt_0_6;
+static gint hf_s7comm_szl_0131_0005_funkt_0_7;
+static gint hf_s7comm_szl_0131_0005_funkt_1;
+static gint hf_s7comm_szl_0131_0005_funkt_2;
+static gint hf_s7comm_szl_0131_0005_funkt_3;
+static gint hf_s7comm_szl_0131_0005_funkt_4;
+static gint hf_s7comm_szl_0131_0005_funkt_5;
+static gint hf_s7comm_szl_0131_0005_funkt_6;
+static gint hf_s7comm_szl_0131_0005_funkt_7;
+static gint hf_s7comm_szl_0131_0005_anz_sen;
+static gint hf_s7comm_szl_0131_0005_anz_ein;
+static gint hf_s7comm_szl_0131_0005_anz_mel;
+static gint hf_s7comm_szl_0131_0005_res;
+
+static gint ett_s7comm_szl_0131_0005_funkt_0;
 static int * const s7comm_szl_0131_0005_funkt_0_fields[] = {
     &hf_s7comm_szl_0131_0005_funkt_0_0,
     &hf_s7comm_szl_0131_0005_funkt_0_1,
@@ -938,130 +938,130 @@ static int * const s7comm_szl_0131_0005_funkt_0_fields[] = {
     NULL
 };
 
-static gint hf_s7comm_szl_0131_0006_index = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_0 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_0_0 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_0_1 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_0_2 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_0_3 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_0_4 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_0_5 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_0_6 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_0_7 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_1 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_1_0 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_1_1 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_1_2 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_1_3 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_1_4 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_1_5 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_1_6 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_1_7 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_2 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_2_0 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_2_1 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_2_2 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_2_3 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_2_4 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_2_5 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_2_6 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_2_7 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_3 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_3_0 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_3_1 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_3_2 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_3_3 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_3_4 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_3_5 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_3_6 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_3_7 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_4 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_5 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_6 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_6_0 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_6_1 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_6_2 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_6_3 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_6_4 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_6_5 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_6_6 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_6_7 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_7 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_7_0 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_7_1 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_7_2 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_7_3 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_7_4 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_7_5 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_7_6 = -1;
-static gint hf_s7comm_szl_0131_0006_funkt_7_7 = -1;
-static gint hf_s7comm_szl_0131_0006_schnell = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_0 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_0_0 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_0_1 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_0_2 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_0_3 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_0_4 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_0_5 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_0_6 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_0_7 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_1 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_1_0 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_1_1 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_1_2 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_1_3 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_1_4 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_1_5 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_1_6 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_1_7 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_2 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_2_0 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_2_1 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_2_2 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_2_3 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_2_4 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_2_5 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_2_6 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_2_7 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_3 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_3_0 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_3_1 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_3_2 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_3_3 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_3_4 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_3_5 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_3_6 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_3_7 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_4 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_5 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_6 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_6_0 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_6_1 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_6_2 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_6_3 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_6_4 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_6_5 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_6_6 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_6_7 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_7 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_7_0 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_7_1 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_7_2 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_7_3 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_7_4 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_7_5 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_7_6 = -1;
-static gint hf_s7comm_szl_0131_0006_zugtyp_7_7 = -1;
-static gint hf_s7comm_szl_0131_0006_res1 = -1;
-static gint hf_s7comm_szl_0131_0006_max_sd_empf = -1;
-static gint hf_s7comm_szl_0131_0006_max_sd_al8p = -1;
-static gint hf_s7comm_szl_0131_0006_max_inst = -1;
-static gint hf_s7comm_szl_0131_0006_res2 = -1;
-static gint hf_s7comm_szl_0131_0006_verb_proj = -1;
-static gint hf_s7comm_szl_0131_0006_verb_prog = -1;
-static gint hf_s7comm_szl_0131_0006_res3 = -1;
-
-static gint ett_s7comm_szl_0131_0006_funkt_0 = -1;
+static gint hf_s7comm_szl_0131_0006_index;
+static gint hf_s7comm_szl_0131_0006_funkt_0;
+static gint hf_s7comm_szl_0131_0006_funkt_0_0;
+static gint hf_s7comm_szl_0131_0006_funkt_0_1;
+static gint hf_s7comm_szl_0131_0006_funkt_0_2;
+static gint hf_s7comm_szl_0131_0006_funkt_0_3;
+static gint hf_s7comm_szl_0131_0006_funkt_0_4;
+static gint hf_s7comm_szl_0131_0006_funkt_0_5;
+static gint hf_s7comm_szl_0131_0006_funkt_0_6;
+static gint hf_s7comm_szl_0131_0006_funkt_0_7;
+static gint hf_s7comm_szl_0131_0006_funkt_1;
+static gint hf_s7comm_szl_0131_0006_funkt_1_0;
+static gint hf_s7comm_szl_0131_0006_funkt_1_1;
+static gint hf_s7comm_szl_0131_0006_funkt_1_2;
+static gint hf_s7comm_szl_0131_0006_funkt_1_3;
+static gint hf_s7comm_szl_0131_0006_funkt_1_4;
+static gint hf_s7comm_szl_0131_0006_funkt_1_5;
+static gint hf_s7comm_szl_0131_0006_funkt_1_6;
+static gint hf_s7comm_szl_0131_0006_funkt_1_7;
+static gint hf_s7comm_szl_0131_0006_funkt_2;
+static gint hf_s7comm_szl_0131_0006_funkt_2_0;
+static gint hf_s7comm_szl_0131_0006_funkt_2_1;
+static gint hf_s7comm_szl_0131_0006_funkt_2_2;
+static gint hf_s7comm_szl_0131_0006_funkt_2_3;
+static gint hf_s7comm_szl_0131_0006_funkt_2_4;
+static gint hf_s7comm_szl_0131_0006_funkt_2_5;
+static gint hf_s7comm_szl_0131_0006_funkt_2_6;
+static gint hf_s7comm_szl_0131_0006_funkt_2_7;
+static gint hf_s7comm_szl_0131_0006_funkt_3;
+static gint hf_s7comm_szl_0131_0006_funkt_3_0;
+static gint hf_s7comm_szl_0131_0006_funkt_3_1;
+static gint hf_s7comm_szl_0131_0006_funkt_3_2;
+static gint hf_s7comm_szl_0131_0006_funkt_3_3;
+static gint hf_s7comm_szl_0131_0006_funkt_3_4;
+static gint hf_s7comm_szl_0131_0006_funkt_3_5;
+static gint hf_s7comm_szl_0131_0006_funkt_3_6;
+static gint hf_s7comm_szl_0131_0006_funkt_3_7;
+static gint hf_s7comm_szl_0131_0006_funkt_4;
+static gint hf_s7comm_szl_0131_0006_funkt_5;
+static gint hf_s7comm_szl_0131_0006_funkt_6;
+static gint hf_s7comm_szl_0131_0006_funkt_6_0;
+static gint hf_s7comm_szl_0131_0006_funkt_6_1;
+static gint hf_s7comm_szl_0131_0006_funkt_6_2;
+static gint hf_s7comm_szl_0131_0006_funkt_6_3;
+static gint hf_s7comm_szl_0131_0006_funkt_6_4;
+static gint hf_s7comm_szl_0131_0006_funkt_6_5;
+static gint hf_s7comm_szl_0131_0006_funkt_6_6;
+static gint hf_s7comm_szl_0131_0006_funkt_6_7;
+static gint hf_s7comm_szl_0131_0006_funkt_7;
+static gint hf_s7comm_szl_0131_0006_funkt_7_0;
+static gint hf_s7comm_szl_0131_0006_funkt_7_1;
+static gint hf_s7comm_szl_0131_0006_funkt_7_2;
+static gint hf_s7comm_szl_0131_0006_funkt_7_3;
+static gint hf_s7comm_szl_0131_0006_funkt_7_4;
+static gint hf_s7comm_szl_0131_0006_funkt_7_5;
+static gint hf_s7comm_szl_0131_0006_funkt_7_6;
+static gint hf_s7comm_szl_0131_0006_funkt_7_7;
+static gint hf_s7comm_szl_0131_0006_schnell;
+static gint hf_s7comm_szl_0131_0006_zugtyp_0;
+static gint hf_s7comm_szl_0131_0006_zugtyp_0_0;
+static gint hf_s7comm_szl_0131_0006_zugtyp_0_1;
+static gint hf_s7comm_szl_0131_0006_zugtyp_0_2;
+static gint hf_s7comm_szl_0131_0006_zugtyp_0_3;
+static gint hf_s7comm_szl_0131_0006_zugtyp_0_4;
+static gint hf_s7comm_szl_0131_0006_zugtyp_0_5;
+static gint hf_s7comm_szl_0131_0006_zugtyp_0_6;
+static gint hf_s7comm_szl_0131_0006_zugtyp_0_7;
+static gint hf_s7comm_szl_0131_0006_zugtyp_1;
+static gint hf_s7comm_szl_0131_0006_zugtyp_1_0;
+static gint hf_s7comm_szl_0131_0006_zugtyp_1_1;
+static gint hf_s7comm_szl_0131_0006_zugtyp_1_2;
+static gint hf_s7comm_szl_0131_0006_zugtyp_1_3;
+static gint hf_s7comm_szl_0131_0006_zugtyp_1_4;
+static gint hf_s7comm_szl_0131_0006_zugtyp_1_5;
+static gint hf_s7comm_szl_0131_0006_zugtyp_1_6;
+static gint hf_s7comm_szl_0131_0006_zugtyp_1_7;
+static gint hf_s7comm_szl_0131_0006_zugtyp_2;
+static gint hf_s7comm_szl_0131_0006_zugtyp_2_0;
+static gint hf_s7comm_szl_0131_0006_zugtyp_2_1;
+static gint hf_s7comm_szl_0131_0006_zugtyp_2_2;
+static gint hf_s7comm_szl_0131_0006_zugtyp_2_3;
+static gint hf_s7comm_szl_0131_0006_zugtyp_2_4;
+static gint hf_s7comm_szl_0131_0006_zugtyp_2_5;
+static gint hf_s7comm_szl_0131_0006_zugtyp_2_6;
+static gint hf_s7comm_szl_0131_0006_zugtyp_2_7;
+static gint hf_s7comm_szl_0131_0006_zugtyp_3;
+static gint hf_s7comm_szl_0131_0006_zugtyp_3_0;
+static gint hf_s7comm_szl_0131_0006_zugtyp_3_1;
+static gint hf_s7comm_szl_0131_0006_zugtyp_3_2;
+static gint hf_s7comm_szl_0131_0006_zugtyp_3_3;
+static gint hf_s7comm_szl_0131_0006_zugtyp_3_4;
+static gint hf_s7comm_szl_0131_0006_zugtyp_3_5;
+static gint hf_s7comm_szl_0131_0006_zugtyp_3_6;
+static gint hf_s7comm_szl_0131_0006_zugtyp_3_7;
+static gint hf_s7comm_szl_0131_0006_zugtyp_4;
+static gint hf_s7comm_szl_0131_0006_zugtyp_5;
+static gint hf_s7comm_szl_0131_0006_zugtyp_6;
+static gint hf_s7comm_szl_0131_0006_zugtyp_6_0;
+static gint hf_s7comm_szl_0131_0006_zugtyp_6_1;
+static gint hf_s7comm_szl_0131_0006_zugtyp_6_2;
+static gint hf_s7comm_szl_0131_0006_zugtyp_6_3;
+static gint hf_s7comm_szl_0131_0006_zugtyp_6_4;
+static gint hf_s7comm_szl_0131_0006_zugtyp_6_5;
+static gint hf_s7comm_szl_0131_0006_zugtyp_6_6;
+static gint hf_s7comm_szl_0131_0006_zugtyp_6_7;
+static gint hf_s7comm_szl_0131_0006_zugtyp_7;
+static gint hf_s7comm_szl_0131_0006_zugtyp_7_0;
+static gint hf_s7comm_szl_0131_0006_zugtyp_7_1;
+static gint hf_s7comm_szl_0131_0006_zugtyp_7_2;
+static gint hf_s7comm_szl_0131_0006_zugtyp_7_3;
+static gint hf_s7comm_szl_0131_0006_zugtyp_7_4;
+static gint hf_s7comm_szl_0131_0006_zugtyp_7_5;
+static gint hf_s7comm_szl_0131_0006_zugtyp_7_6;
+static gint hf_s7comm_szl_0131_0006_zugtyp_7_7;
+static gint hf_s7comm_szl_0131_0006_res1;
+static gint hf_s7comm_szl_0131_0006_max_sd_empf;
+static gint hf_s7comm_szl_0131_0006_max_sd_al8p;
+static gint hf_s7comm_szl_0131_0006_max_inst;
+static gint hf_s7comm_szl_0131_0006_res2;
+static gint hf_s7comm_szl_0131_0006_verb_proj;
+static gint hf_s7comm_szl_0131_0006_verb_prog;
+static gint hf_s7comm_szl_0131_0006_res3;
+
+static gint ett_s7comm_szl_0131_0006_funkt_0;
 static int * const s7comm_szl_0131_0006_funkt_0_fields[] = {
     &hf_s7comm_szl_0131_0006_funkt_0_0,
     &hf_s7comm_szl_0131_0006_funkt_0_1,
@@ -1073,7 +1073,7 @@ static int * const s7comm_szl_0131_0006_funkt_0_fields[] = {
     &hf_s7comm_szl_0131_0006_funkt_0_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0006_funkt_1 = -1;
+static gint ett_s7comm_szl_0131_0006_funkt_1;
 static int * const s7comm_szl_0131_0006_funkt_1_fields[] = {
     &hf_s7comm_szl_0131_0006_funkt_1_0,
     &hf_s7comm_szl_0131_0006_funkt_1_1,
@@ -1085,7 +1085,7 @@ static int * const s7comm_szl_0131_0006_funkt_1_fields[] = {
     &hf_s7comm_szl_0131_0006_funkt_1_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0006_funkt_2 = -1;
+static gint ett_s7comm_szl_0131_0006_funkt_2;
 static int * const s7comm_szl_0131_0006_funkt_2_fields[] = {
     &hf_s7comm_szl_0131_0006_funkt_2_0,
     &hf_s7comm_szl_0131_0006_funkt_2_1,
@@ -1097,7 +1097,7 @@ static int * const s7comm_szl_0131_0006_funkt_2_fields[] = {
     &hf_s7comm_szl_0131_0006_funkt_2_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0006_funkt_3 = -1;
+static gint ett_s7comm_szl_0131_0006_funkt_3;
 static int * const s7comm_szl_0131_0006_funkt_3_fields[] = {
     &hf_s7comm_szl_0131_0006_funkt_3_0,
     &hf_s7comm_szl_0131_0006_funkt_3_1,
@@ -1109,7 +1109,7 @@ static int * const s7comm_szl_0131_0006_funkt_3_fields[] = {
     &hf_s7comm_szl_0131_0006_funkt_3_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0006_funkt_6 = -1;
+static gint ett_s7comm_szl_0131_0006_funkt_6;
 static int * const s7comm_szl_0131_0006_funkt_6_fields[] = {
     &hf_s7comm_szl_0131_0006_funkt_6_0,
     &hf_s7comm_szl_0131_0006_funkt_6_1,
@@ -1121,7 +1121,7 @@ static int * const s7comm_szl_0131_0006_funkt_6_fields[] = {
     &hf_s7comm_szl_0131_0006_funkt_6_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0006_funkt_7 = -1;
+static gint ett_s7comm_szl_0131_0006_funkt_7;
 static int * const s7comm_szl_0131_0006_funkt_7_fields[] = {
     &hf_s7comm_szl_0131_0006_funkt_7_0,
     &hf_s7comm_szl_0131_0006_funkt_7_1,
@@ -1133,7 +1133,7 @@ static int * const s7comm_szl_0131_0006_funkt_7_fields[] = {
     &hf_s7comm_szl_0131_0006_funkt_7_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0006_zugtyp_0 = -1;
+static gint ett_s7comm_szl_0131_0006_zugtyp_0;
 static int * const s7comm_szl_0131_0006_zugtyp_0_fields[] = {
     &hf_s7comm_szl_0131_0006_zugtyp_0_0,
     &hf_s7comm_szl_0131_0006_zugtyp_0_1,
@@ -1145,7 +1145,7 @@ static int * const s7comm_szl_0131_0006_zugtyp_0_fields[] = {
     &hf_s7comm_szl_0131_0006_zugtyp_0_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0006_zugtyp_1 = -1;
+static gint ett_s7comm_szl_0131_0006_zugtyp_1;
 static int * const s7comm_szl_0131_0006_zugtyp_1_fields[] = {
     &hf_s7comm_szl_0131_0006_zugtyp_1_0,
     &hf_s7comm_szl_0131_0006_zugtyp_1_1,
@@ -1157,7 +1157,7 @@ static int * const s7comm_szl_0131_0006_zugtyp_1_fields[] = {
     &hf_s7comm_szl_0131_0006_zugtyp_1_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0006_zugtyp_2 = -1;
+static gint ett_s7comm_szl_0131_0006_zugtyp_2;
 static int * const s7comm_szl_0131_0006_zugtyp_2_fields[] = {
     &hf_s7comm_szl_0131_0006_zugtyp_2_0,
     &hf_s7comm_szl_0131_0006_zugtyp_2_1,
@@ -1169,7 +1169,7 @@ static int * const s7comm_szl_0131_0006_zugtyp_2_fields[] = {
     &hf_s7comm_szl_0131_0006_zugtyp_2_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0006_zugtyp_3 = -1;
+static gint ett_s7comm_szl_0131_0006_zugtyp_3;
 static int * const s7comm_szl_0131_0006_zugtyp_3_fields[] = {
     &hf_s7comm_szl_0131_0006_zugtyp_3_0,
     &hf_s7comm_szl_0131_0006_zugtyp_3_1,
@@ -1181,7 +1181,7 @@ static int * const s7comm_szl_0131_0006_zugtyp_3_fields[] = {
     &hf_s7comm_szl_0131_0006_zugtyp_3_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0006_zugtyp_6 = -1;
+static gint ett_s7comm_szl_0131_0006_zugtyp_6;
 static int * const s7comm_szl_0131_0006_zugtyp_6_fields[] = {
     &hf_s7comm_szl_0131_0006_zugtyp_6_0,
     &hf_s7comm_szl_0131_0006_zugtyp_6_1,
@@ -1193,7 +1193,7 @@ static int * const s7comm_szl_0131_0006_zugtyp_6_fields[] = {
     &hf_s7comm_szl_0131_0006_zugtyp_6_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0006_zugtyp_7 = -1;
+static gint ett_s7comm_szl_0131_0006_zugtyp_7;
 static int * const s7comm_szl_0131_0006_zugtyp_7_fields[] = {
     &hf_s7comm_szl_0131_0006_zugtyp_7_0,
     &hf_s7comm_szl_0131_0006_zugtyp_7_1,
@@ -1206,47 +1206,47 @@ static int * const s7comm_szl_0131_0006_zugtyp_7_fields[] = {
     NULL
 };
 
-static gint hf_s7comm_szl_0131_0007_index = -1;
-static gint hf_s7comm_szl_0131_0007_funkt_0 = -1;
-static gint hf_s7comm_szl_0131_0007_funkt_0_0 = -1;
-static gint hf_s7comm_szl_0131_0007_funkt_0_1 = -1;
-static gint hf_s7comm_szl_0131_0007_funkt_0_2 = -1;
-static gint hf_s7comm_szl_0131_0007_funkt_0_3 = -1;
-static gint hf_s7comm_szl_0131_0007_funkt_0_4 = -1;
-static gint hf_s7comm_szl_0131_0007_funkt_0_5 = -1;
-static gint hf_s7comm_szl_0131_0007_funkt_0_6 = -1;
-static gint hf_s7comm_szl_0131_0007_funkt_0_7 = -1;
-static gint hf_s7comm_szl_0131_0007_funkt_1 = -1;
-static gint hf_s7comm_szl_0131_0007_obj_0 = -1;
-static gint hf_s7comm_szl_0131_0007_obj_0_0 = -1;
-static gint hf_s7comm_szl_0131_0007_obj_0_1 = -1;
-static gint hf_s7comm_szl_0131_0007_obj_0_2 = -1;
-static gint hf_s7comm_szl_0131_0007_obj_0_3 = -1;
-static gint hf_s7comm_szl_0131_0007_obj_0_4 = -1;
-static gint hf_s7comm_szl_0131_0007_obj_0_5 = -1;
-static gint hf_s7comm_szl_0131_0007_obj_0_6 = -1;
-static gint hf_s7comm_szl_0131_0007_obj_0_7 = -1;
-static gint hf_s7comm_szl_0131_0007_obj_1 = -1;
-static gint hf_s7comm_szl_0131_0007_kons = -1;
-static gint hf_s7comm_szl_0131_0007_sen = -1;
-static gint hf_s7comm_szl_0131_0007_rec = -1;
-static gint hf_s7comm_szl_0131_0007_time = -1;
-static gint hf_s7comm_szl_0131_0007_proj = -1;
-static gint hf_s7comm_szl_0131_0007_alarm = -1;
-static gint hf_s7comm_szl_0131_0007_mode = -1;
-static gint hf_s7comm_szl_0131_0007_mode_0 = -1;
-static gint hf_s7comm_szl_0131_0007_mode_1 = -1;
-static gint hf_s7comm_szl_0131_0007_kreis = -1;
-static gint hf_s7comm_szl_0131_0007_sk_1 = -1;
-static gint hf_s7comm_szl_0131_0007_sk_2 = -1;
-static gint hf_s7comm_szl_0131_0007_ek_1 = -1;
-static gint hf_s7comm_szl_0131_0007_ek_2 = -1;
-static gint hf_s7comm_szl_0131_0007_len_1 = -1;
-static gint hf_s7comm_szl_0131_0007_len_2 = -1;
-static gint hf_s7comm_szl_0131_0007_len_3 = -1;
-static gint hf_s7comm_szl_0131_0007_res = -1;
-
-static gint ett_s7comm_szl_0131_0007_funkt_0 = -1;
+static gint hf_s7comm_szl_0131_0007_index;
+static gint hf_s7comm_szl_0131_0007_funkt_0;
+static gint hf_s7comm_szl_0131_0007_funkt_0_0;
+static gint hf_s7comm_szl_0131_0007_funkt_0_1;
+static gint hf_s7comm_szl_0131_0007_funkt_0_2;
+static gint hf_s7comm_szl_0131_0007_funkt_0_3;
+static gint hf_s7comm_szl_0131_0007_funkt_0_4;
+static gint hf_s7comm_szl_0131_0007_funkt_0_5;
+static gint hf_s7comm_szl_0131_0007_funkt_0_6;
+static gint hf_s7comm_szl_0131_0007_funkt_0_7;
+static gint hf_s7comm_szl_0131_0007_funkt_1;
+static gint hf_s7comm_szl_0131_0007_obj_0;
+static gint hf_s7comm_szl_0131_0007_obj_0_0;
+static gint hf_s7comm_szl_0131_0007_obj_0_1;
+static gint hf_s7comm_szl_0131_0007_obj_0_2;
+static gint hf_s7comm_szl_0131_0007_obj_0_3;
+static gint hf_s7comm_szl_0131_0007_obj_0_4;
+static gint hf_s7comm_szl_0131_0007_obj_0_5;
+static gint hf_s7comm_szl_0131_0007_obj_0_6;
+static gint hf_s7comm_szl_0131_0007_obj_0_7;
+static gint hf_s7comm_szl_0131_0007_obj_1;
+static gint hf_s7comm_szl_0131_0007_kons;
+static gint hf_s7comm_szl_0131_0007_sen;
+static gint hf_s7comm_szl_0131_0007_rec;
+static gint hf_s7comm_szl_0131_0007_time;
+static gint hf_s7comm_szl_0131_0007_proj;
+static gint hf_s7comm_szl_0131_0007_alarm;
+static gint hf_s7comm_szl_0131_0007_mode;
+static gint hf_s7comm_szl_0131_0007_mode_0;
+static gint hf_s7comm_szl_0131_0007_mode_1;
+static gint hf_s7comm_szl_0131_0007_kreis;
+static gint hf_s7comm_szl_0131_0007_sk_1;
+static gint hf_s7comm_szl_0131_0007_sk_2;
+static gint hf_s7comm_szl_0131_0007_ek_1;
+static gint hf_s7comm_szl_0131_0007_ek_2;
+static gint hf_s7comm_szl_0131_0007_len_1;
+static gint hf_s7comm_szl_0131_0007_len_2;
+static gint hf_s7comm_szl_0131_0007_len_3;
+static gint hf_s7comm_szl_0131_0007_res;
+
+static gint ett_s7comm_szl_0131_0007_funkt_0;
 static int * const s7comm_szl_0131_0007_funkt_0_fields[] = {
     &hf_s7comm_szl_0131_0007_funkt_0_0,
     &hf_s7comm_szl_0131_0007_funkt_0_1,
@@ -1259,7 +1259,7 @@ static int * const s7comm_szl_0131_0007_funkt_0_fields[] = {
     NULL
 };
 
-static gint ett_s7comm_szl_0131_0007_obj_0 = -1;
+static gint ett_s7comm_szl_0131_0007_obj_0;
 static int * const s7comm_szl_0131_0007_obj_0_fields[] = {
     &hf_s7comm_szl_0131_0007_obj_0_0,
     &hf_s7comm_szl_0131_0007_obj_0_1,
@@ -1272,45 +1272,45 @@ static int * const s7comm_szl_0131_0007_obj_0_fields[] = {
     NULL
 };
 
-static gint ett_s7comm_szl_0131_0007_mode = -1;
+static gint ett_s7comm_szl_0131_0007_mode;
 static int * const s7comm_szl_0131_0007_mode_fields[] = {
     &hf_s7comm_szl_0131_0007_mode_0,
     &hf_s7comm_szl_0131_0007_mode_1,
     NULL
 };
 
-static gint hf_s7comm_szl_0131_0008_index = -1;
-static gint hf_s7comm_szl_0131_0008_last_1 = -1;
-static gint hf_s7comm_szl_0131_0008_last_1_tb = -1;
-static gint hf_s7comm_szl_0131_0008_last_2 = -1;
-static gint hf_s7comm_szl_0131_0008_last_2_tb = -1;
-static gint hf_s7comm_szl_0131_0008_last_3 = -1;
-static gint hf_s7comm_szl_0131_0008_last_3_tb = -1;
-static gint hf_s7comm_szl_0131_0008_merker = -1;
-static gint hf_s7comm_szl_0131_0008_merker_tb = -1;
-static gint hf_s7comm_szl_0131_0008_ea = -1;
-static gint hf_s7comm_szl_0131_0008_ea_tb = -1;
-static gint hf_s7comm_szl_0131_0008_tz = -1;
-static gint hf_s7comm_szl_0131_0008_tz_tb = -1;
-static gint hf_s7comm_szl_0131_0008_db = -1;
-static gint hf_s7comm_szl_0131_0008_db_tb = -1;
-static gint hf_s7comm_szl_0131_0008_ld = -1;
-static gint hf_s7comm_szl_0131_0008_ld_tb = -1;
-static gint hf_s7comm_szl_0131_0008_reg = -1;
-static gint hf_s7comm_szl_0131_0008_reg_tb = -1;
-static gint hf_s7comm_szl_0131_0008_ba_stali1 = -1;
-static gint hf_s7comm_szl_0131_0008_ba_stali1_tb = -1;
-static gint hf_s7comm_szl_0131_0008_ba_stali2 = -1;
-static gint hf_s7comm_szl_0131_0008_ba_stali2_tb = -1;
-static gint hf_s7comm_szl_0131_0008_ba_stali3 = -1;
-static gint hf_s7comm_szl_0131_0008_ba_stali3_tb = -1;
-static gint hf_s7comm_szl_0131_0008_akku = -1;
-static gint hf_s7comm_szl_0131_0008_akku_tb = -1;
-static gint hf_s7comm_szl_0131_0008_address = -1;
-static gint hf_s7comm_szl_0131_0008_address_tb = -1;
-static gint hf_s7comm_szl_0131_0008_dbreg = -1;
-static gint hf_s7comm_szl_0131_0008_dbreg_tb = -1;
-static gint hf_s7comm_szl_0131_0008_res = -1;
+static gint hf_s7comm_szl_0131_0008_index;
+static gint hf_s7comm_szl_0131_0008_last_1;
+static gint hf_s7comm_szl_0131_0008_last_1_tb;
+static gint hf_s7comm_szl_0131_0008_last_2;
+static gint hf_s7comm_szl_0131_0008_last_2_tb;
+static gint hf_s7comm_szl_0131_0008_last_3;
+static gint hf_s7comm_szl_0131_0008_last_3_tb;
+static gint hf_s7comm_szl_0131_0008_merker;
+static gint hf_s7comm_szl_0131_0008_merker_tb;
+static gint hf_s7comm_szl_0131_0008_ea;
+static gint hf_s7comm_szl_0131_0008_ea_tb;
+static gint hf_s7comm_szl_0131_0008_tz;
+static gint hf_s7comm_szl_0131_0008_tz_tb;
+static gint hf_s7comm_szl_0131_0008_db;
+static gint hf_s7comm_szl_0131_0008_db_tb;
+static gint hf_s7comm_szl_0131_0008_ld;
+static gint hf_s7comm_szl_0131_0008_ld_tb;
+static gint hf_s7comm_szl_0131_0008_reg;
+static gint hf_s7comm_szl_0131_0008_reg_tb;
+static gint hf_s7comm_szl_0131_0008_ba_stali1;
+static gint hf_s7comm_szl_0131_0008_ba_stali1_tb;
+static gint hf_s7comm_szl_0131_0008_ba_stali2;
+static gint hf_s7comm_szl_0131_0008_ba_stali2_tb;
+static gint hf_s7comm_szl_0131_0008_ba_stali3;
+static gint hf_s7comm_szl_0131_0008_ba_stali3_tb;
+static gint hf_s7comm_szl_0131_0008_akku;
+static gint hf_s7comm_szl_0131_0008_akku_tb;
+static gint hf_s7comm_szl_0131_0008_address;
+static gint hf_s7comm_szl_0131_0008_address_tb;
+static gint hf_s7comm_szl_0131_0008_dbreg;
+static gint hf_s7comm_szl_0131_0008_dbreg_tb;
+static gint hf_s7comm_szl_0131_0008_res;
 static const value_string s7comm_szl_0131_0008_timebase_names[] = {
     { 0,                                    "100 ps" },
     { 1,                                    "1 ns" },
@@ -1331,26 +1331,26 @@ static const value_string s7comm_szl_0131_0008_timebase_names[] = {
     { 0,                                    NULL }
 };
 
-static gint hf_s7comm_szl_0131_0009_index = -1;
-static gint hf_s7comm_szl_0131_0009_sync_k = -1;
-static gint hf_s7comm_szl_0131_0009_sync_k_0 = -1;
-static gint hf_s7comm_szl_0131_0009_sync_k_1 = -1;
-static gint hf_s7comm_szl_0131_0009_sync_k_2 = -1;
-static gint hf_s7comm_szl_0131_0009_sync_mpi = -1;
-static gint hf_s7comm_szl_0131_0009_sync_mpi_0 = -1;
-static gint hf_s7comm_szl_0131_0009_sync_mpi_1 = -1;
-static gint hf_s7comm_szl_0131_0009_sync_mpi_2 = -1;
-static gint hf_s7comm_szl_0131_0009_sync_mfi = -1;
-static gint hf_s7comm_szl_0131_0009_sync_mfi_0 = -1;
-static gint hf_s7comm_szl_0131_0009_sync_mfi_1 = -1;
-static gint hf_s7comm_szl_0131_0009_sync_mfi_2 = -1;
-static gint hf_s7comm_szl_0131_0009_res1 = -1;
-static gint hf_s7comm_szl_0131_0009_abw_puf = -1;
-static gint hf_s7comm_szl_0131_0009_abw_5v = -1;
-static gint hf_s7comm_szl_0131_0009_anz_bsz = -1;
-static gint hf_s7comm_szl_0131_0009_res2 = -1;
-
-static gint ett_s7comm_szl_0131_0009_sync_k = -1;
+static gint hf_s7comm_szl_0131_0009_index;
+static gint hf_s7comm_szl_0131_0009_sync_k;
+static gint hf_s7comm_szl_0131_0009_sync_k_0;
+static gint hf_s7comm_szl_0131_0009_sync_k_1;
+static gint hf_s7comm_szl_0131_0009_sync_k_2;
+static gint hf_s7comm_szl_0131_0009_sync_mpi;
+static gint hf_s7comm_szl_0131_0009_sync_mpi_0;
+static gint hf_s7comm_szl_0131_0009_sync_mpi_1;
+static gint hf_s7comm_szl_0131_0009_sync_mpi_2;
+static gint hf_s7comm_szl_0131_0009_sync_mfi;
+static gint hf_s7comm_szl_0131_0009_sync_mfi_0;
+static gint hf_s7comm_szl_0131_0009_sync_mfi_1;
+static gint hf_s7comm_szl_0131_0009_sync_mfi_2;
+static gint hf_s7comm_szl_0131_0009_res1;
+static gint hf_s7comm_szl_0131_0009_abw_puf;
+static gint hf_s7comm_szl_0131_0009_abw_5v;
+static gint hf_s7comm_szl_0131_0009_anz_bsz;
+static gint hf_s7comm_szl_0131_0009_res2;
+
+static gint ett_s7comm_szl_0131_0009_sync_k;
 static int * const s7comm_szl_0131_0009_sync_k_fields[] = {
     &hf_s7comm_szl_0131_0009_sync_k_0,
     &hf_s7comm_szl_0131_0009_sync_k_1,
@@ -1358,7 +1358,7 @@ static int * const s7comm_szl_0131_0009_sync_k_fields[] = {
     NULL
 };
 
-static gint ett_s7comm_szl_0131_0009_sync_mpi = -1;
+static gint ett_s7comm_szl_0131_0009_sync_mpi;
 static int * const s7comm_szl_0131_0009_sync_mpi_fields[] = {
     &hf_s7comm_szl_0131_0009_sync_mpi_0,
     &hf_s7comm_szl_0131_0009_sync_mpi_1,
@@ -1366,7 +1366,7 @@ static int * const s7comm_szl_0131_0009_sync_mpi_fields[] = {
     NULL
 };
 
-static gint ett_s7comm_szl_0131_0009_sync_mfi = -1;
+static gint ett_s7comm_szl_0131_0009_sync_mfi;
 static int * const s7comm_szl_0131_0009_sync_mfi_fields[] = {
     &hf_s7comm_szl_0131_0009_sync_mfi_0,
     &hf_s7comm_szl_0131_0009_sync_mfi_1,
@@ -1374,51 +1374,51 @@ static int * const s7comm_szl_0131_0009_sync_mfi_fields[] = {
     NULL
 };
 
-static gint hf_s7comm_szl_0131_0010_index = -1;
-static gint hf_s7comm_szl_0131_0010_funk_1 = -1;
-static gint hf_s7comm_szl_0131_0010_funk_1_0 = -1;
-static gint hf_s7comm_szl_0131_0010_funk_1_1 = -1;
-static gint hf_s7comm_szl_0131_0010_funk_1_2 = -1;
-static gint hf_s7comm_szl_0131_0010_funk_1_3 = -1;
-static gint hf_s7comm_szl_0131_0010_funk_1_4 = -1;
-static gint hf_s7comm_szl_0131_0010_funk_1_5 = -1;
-static gint hf_s7comm_szl_0131_0010_funk_1_6 = -1;
-static gint hf_s7comm_szl_0131_0010_funk_1_7 = -1;
-static gint hf_s7comm_szl_0131_0010_funk_2 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_meld_1 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_meld_1_0 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_meld_1_1 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_meld_1_2 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_meld_1_3 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_meld_1_4 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_meld_1_5 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_meld_1_6 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_meld_1_7 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_meld_2 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_zus_1 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_zus_1_0 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_zus_1_1 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_zus_1_2 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_zus_1_3 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_zus_1_4 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_zus_1_5 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_zus_1_6 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_zus_1_7 = -1;
-static gint hf_s7comm_szl_0131_0010_ber_zus_2 = -1;
-static gint hf_s7comm_szl_0131_0010_typ_zus_1 = -1;
-static gint hf_s7comm_szl_0131_0010_typ_zus_1_0 = -1;
-static gint hf_s7comm_szl_0131_0010_typ_zus_1_1 = -1;
-static gint hf_s7comm_szl_0131_0010_typ_zus_1_2 = -1;
-static gint hf_s7comm_szl_0131_0010_typ_zus_1_3 = -1;
-static gint hf_s7comm_szl_0131_0010_typ_zus_1_4 = -1;
-static gint hf_s7comm_szl_0131_0010_typ_zus_1_5 = -1;
-static gint hf_s7comm_szl_0131_0010_typ_zus_1_6 = -1;
-static gint hf_s7comm_szl_0131_0010_typ_zus_1_7 = -1;
-static gint hf_s7comm_szl_0131_0010_typ_zus_2 = -1;
-static gint hf_s7comm_szl_0131_0010_maxanz_arch = -1;
-static gint hf_s7comm_szl_0131_0010_res = -1;
-
-static gint ett_s7comm_szl_0131_0010_funk_1 = -1;
+static gint hf_s7comm_szl_0131_0010_index;
+static gint hf_s7comm_szl_0131_0010_funk_1;
+static gint hf_s7comm_szl_0131_0010_funk_1_0;
+static gint hf_s7comm_szl_0131_0010_funk_1_1;
+static gint hf_s7comm_szl_0131_0010_funk_1_2;
+static gint hf_s7comm_szl_0131_0010_funk_1_3;
+static gint hf_s7comm_szl_0131_0010_funk_1_4;
+static gint hf_s7comm_szl_0131_0010_funk_1_5;
+static gint hf_s7comm_szl_0131_0010_funk_1_6;
+static gint hf_s7comm_szl_0131_0010_funk_1_7;
+static gint hf_s7comm_szl_0131_0010_funk_2;
+static gint hf_s7comm_szl_0131_0010_ber_meld_1;
+static gint hf_s7comm_szl_0131_0010_ber_meld_1_0;
+static gint hf_s7comm_szl_0131_0010_ber_meld_1_1;
+static gint hf_s7comm_szl_0131_0010_ber_meld_1_2;
+static gint hf_s7comm_szl_0131_0010_ber_meld_1_3;
+static gint hf_s7comm_szl_0131_0010_ber_meld_1_4;
+static gint hf_s7comm_szl_0131_0010_ber_meld_1_5;
+static gint hf_s7comm_szl_0131_0010_ber_meld_1_6;
+static gint hf_s7comm_szl_0131_0010_ber_meld_1_7;
+static gint hf_s7comm_szl_0131_0010_ber_meld_2;
+static gint hf_s7comm_szl_0131_0010_ber_zus_1;
+static gint hf_s7comm_szl_0131_0010_ber_zus_1_0;
+static gint hf_s7comm_szl_0131_0010_ber_zus_1_1;
+static gint hf_s7comm_szl_0131_0010_ber_zus_1_2;
+static gint hf_s7comm_szl_0131_0010_ber_zus_1_3;
+static gint hf_s7comm_szl_0131_0010_ber_zus_1_4;
+static gint hf_s7comm_szl_0131_0010_ber_zus_1_5;
+static gint hf_s7comm_szl_0131_0010_ber_zus_1_6;
+static gint hf_s7comm_szl_0131_0010_ber_zus_1_7;
+static gint hf_s7comm_szl_0131_0010_ber_zus_2;
+static gint hf_s7comm_szl_0131_0010_typ_zus_1;
+static gint hf_s7comm_szl_0131_0010_typ_zus_1_0;
+static gint hf_s7comm_szl_0131_0010_typ_zus_1_1;
+static gint hf_s7comm_szl_0131_0010_typ_zus_1_2;
+static gint hf_s7comm_szl_0131_0010_typ_zus_1_3;
+static gint hf_s7comm_szl_0131_0010_typ_zus_1_4;
+static gint hf_s7comm_szl_0131_0010_typ_zus_1_5;
+static gint hf_s7comm_szl_0131_0010_typ_zus_1_6;
+static gint hf_s7comm_szl_0131_0010_typ_zus_1_7;
+static gint hf_s7comm_szl_0131_0010_typ_zus_2;
+static gint hf_s7comm_szl_0131_0010_maxanz_arch;
+static gint hf_s7comm_szl_0131_0010_res;
+
+static gint ett_s7comm_szl_0131_0010_funk_1;
 static int * const s7comm_szl_0131_0010_funk_1_fields[] = {
     &hf_s7comm_szl_0131_0010_funk_1_0,
     &hf_s7comm_szl_0131_0010_funk_1_1,
@@ -1430,7 +1430,7 @@ static int * const s7comm_szl_0131_0010_funk_1_fields[] = {
     &hf_s7comm_szl_0131_0010_funk_1_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0010_ber_meld_1 = -1;
+static gint ett_s7comm_szl_0131_0010_ber_meld_1;
 static int * const s7comm_szl_0131_0010_ber_meld_1_fields[] = {
     &hf_s7comm_szl_0131_0010_ber_meld_1_0,
     &hf_s7comm_szl_0131_0010_ber_meld_1_1,
@@ -1442,7 +1442,7 @@ static int * const s7comm_szl_0131_0010_ber_meld_1_fields[] = {
     &hf_s7comm_szl_0131_0010_ber_meld_1_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0010_ber_zus_1 = -1;
+static gint ett_s7comm_szl_0131_0010_ber_zus_1;
 static int * const s7comm_szl_0131_0010_ber_zus_1_fields[] = {
     &hf_s7comm_szl_0131_0010_ber_zus_1_0,
     &hf_s7comm_szl_0131_0010_ber_zus_1_1,
@@ -1454,7 +1454,7 @@ static int * const s7comm_szl_0131_0010_ber_zus_1_fields[] = {
     &hf_s7comm_szl_0131_0010_ber_zus_1_7,
     NULL
 };
-static gint ett_s7comm_szl_0131_0010_typ_zus_1 = -1;
+static gint ett_s7comm_szl_0131_0010_typ_zus_1;
 static int * const s7comm_szl_0131_0010_typ_zus_1_fields[] = {
     &hf_s7comm_szl_0131_0010_typ_zus_1_0,
     &hf_s7comm_szl_0131_0010_typ_zus_1_1,
@@ -1467,27 +1467,27 @@ static int * const s7comm_szl_0131_0010_typ_zus_1_fields[] = {
     NULL
 };
 
-static gint hf_s7comm_szl_0132_0001_index = -1;
-static gint hf_s7comm_szl_0132_0001_res_pg = -1;
-static gint hf_s7comm_szl_0132_0001_res_os = -1;
-static gint hf_s7comm_szl_0132_0001_u_pg = -1;
-static gint hf_s7comm_szl_0132_0001_u_os = -1;
-static gint hf_s7comm_szl_0132_0001_proj = -1;
-static gint hf_s7comm_szl_0132_0001_auf = -1;
-static gint hf_s7comm_szl_0132_0001_free = -1;
-static gint hf_s7comm_szl_0132_0001_used = -1;
-static gint hf_s7comm_szl_0132_0001_last = -1;
-static gint hf_s7comm_szl_0132_0001_res = -1;
-
-static gint hf_s7comm_szl_0132_0002_index = -1;
-static gint hf_s7comm_szl_0132_0002_anz = -1;
-static gint hf_s7comm_szl_0132_0002_res = -1;
-
-static gint hf_s7comm_szl_0132_0004_index = -1;
-static gint hf_s7comm_szl_0132_0004_key = -1;
-static gint hf_s7comm_szl_0132_0004_param = -1;
-static gint hf_s7comm_szl_0132_0004_real = -1;
-static gint hf_s7comm_szl_0132_0004_bart_sch = -1;
+static gint hf_s7comm_szl_0132_0001_index;
+static gint hf_s7comm_szl_0132_0001_res_pg;
+static gint hf_s7comm_szl_0132_0001_res_os;
+static gint hf_s7comm_szl_0132_0001_u_pg;
+static gint hf_s7comm_szl_0132_0001_u_os;
+static gint hf_s7comm_szl_0132_0001_proj;
+static gint hf_s7comm_szl_0132_0001_auf;
+static gint hf_s7comm_szl_0132_0001_free;
+static gint hf_s7comm_szl_0132_0001_used;
+static gint hf_s7comm_szl_0132_0001_last;
+static gint hf_s7comm_szl_0132_0001_res;
+
+static gint hf_s7comm_szl_0132_0002_index;
+static gint hf_s7comm_szl_0132_0002_anz;
+static gint hf_s7comm_szl_0132_0002_res;
+
+static gint hf_s7comm_szl_0132_0004_index;
+static gint hf_s7comm_szl_0132_0004_key;
+static gint hf_s7comm_szl_0132_0004_param;
+static gint hf_s7comm_szl_0132_0004_real;
+static gint hf_s7comm_szl_0132_0004_bart_sch;
 
 static const value_string szl_bart_sch_names[] = {
     { 0,                                    "undefined or cannot be ascertained" },
@@ -1497,27 +1497,27 @@ static const value_string szl_bart_sch_names[] = {
     { 4,                                    "MRES" },
     { 0,                                    NULL }
 };
-static gint hf_s7comm_szl_0132_0004_crst_wrst = -1;
+static gint hf_s7comm_szl_0132_0004_crst_wrst;
 static const value_string szl_crst_wrst_names[] = {
     { 0,                                    "undefined, does not exist or cannot be ascertained" },
     { 1,                                    "CRST" },
     { 2,                                    "WRST" },
     { 0,                                    NULL }
 };
-static gint hf_s7comm_szl_0132_0004_ken_f = -1;
-static gint hf_s7comm_szl_0132_0004_ken_rel = -1;
-static gint hf_s7comm_szl_0132_0004_ken_ver1_hw = -1;
-static gint hf_s7comm_szl_0132_0004_ken_ver2_hw = -1;
-static gint hf_s7comm_szl_0132_0004_ken_ver1_awp = -1;
-static gint hf_s7comm_szl_0132_0004_ken_ver2_awp = -1;
-static gint hf_s7comm_szl_0132_0004_res = -1;
-
-static gint hf_s7comm_szl_0132_0005_index = -1;
-static gint hf_s7comm_szl_0132_0005_erw = -1;
-static gint hf_s7comm_szl_0132_0005_send = -1;
-static gint hf_s7comm_szl_0132_0005_moeg = -1;
-static gint hf_s7comm_szl_0132_0005_ltmerz = -1;
-static gint hf_s7comm_szl_0132_0005_res = -1;
+static gint hf_s7comm_szl_0132_0004_ken_f;
+static gint hf_s7comm_szl_0132_0004_ken_rel;
+static gint hf_s7comm_szl_0132_0004_ken_ver1_hw;
+static gint hf_s7comm_szl_0132_0004_ken_ver2_hw;
+static gint hf_s7comm_szl_0132_0004_ken_ver1_awp;
+static gint hf_s7comm_szl_0132_0004_ken_ver2_awp;
+static gint hf_s7comm_szl_0132_0004_res;
+
+static gint hf_s7comm_szl_0132_0005_index;
+static gint hf_s7comm_szl_0132_0005_erw;
+static gint hf_s7comm_szl_0132_0005_send;
+static gint hf_s7comm_szl_0132_0005_moeg;
+static gint hf_s7comm_szl_0132_0005_ltmerz;
+static gint hf_s7comm_szl_0132_0005_res;
 
 static const value_string szl_0132_0005_func_exist_names[] = {
     { 0x0,                                  "No" },
@@ -1525,104 +1525,104 @@ static const value_string szl_0132_0005_func_exist_names[] = {
     { 0,                                    NULL }
 };
 
-static gint hf_s7comm_szl_0132_0006_index = -1;
-static gint hf_s7comm_szl_0132_0006_used_0 = -1;
-static gint hf_s7comm_szl_0132_0006_used_1 = -1;
-static gint hf_s7comm_szl_0132_0006_used_2 = -1;
-static gint hf_s7comm_szl_0132_0006_used_3 = -1;
-static gint hf_s7comm_szl_0132_0006_used_4 = -1;
-static gint hf_s7comm_szl_0132_0006_used_5 = -1;
-static gint hf_s7comm_szl_0132_0006_used_6 = -1;
-static gint hf_s7comm_szl_0132_0006_used_7 = -1;
-static gint hf_s7comm_szl_0132_0006_anz_schnell = -1;
-static gint hf_s7comm_szl_0132_0006_anz_inst = -1;
-static gint hf_s7comm_szl_0132_0006_anz_multicast = -1;
-static gint hf_s7comm_szl_0132_0006_res = -1;
-
-static gint hf_s7comm_szl_0132_0008_index = -1;
-static gint hf_s7comm_szl_0132_0008_zykl = -1;
-static gint hf_s7comm_szl_0132_0008_korr = -1;
-static gint hf_s7comm_szl_0132_0008_clock0 = -1;
-static gint hf_s7comm_szl_0132_0008_clock1 = -1;
-static gint hf_s7comm_szl_0132_0008_clock2 = -1;
-static gint hf_s7comm_szl_0132_0008_clock3 = -1;
-static gint hf_s7comm_szl_0132_0008_clock4 = -1;
-static gint hf_s7comm_szl_0132_0008_clock5 = -1;
-static gint hf_s7comm_szl_0132_0008_clock6 = -1;
-static gint hf_s7comm_szl_0132_0008_clock7 = -1;
-static gint hf_s7comm_szl_0132_0008_time = -1;
-static gint hf_s7comm_szl_0132_0008_res = -1;
-
-static gint hf_s7comm_szl_0132_000b_index = -1;
-static gint hf_s7comm_szl_0132_000b_bszl_0 = -1;
-static gint hf_s7comm_szl_0132_000b_bszl_1 = -1;
-static gint hf_s7comm_szl_0132_000b_bszu_0 = -1;
-static gint hf_s7comm_szl_0132_000b_bszu_1 = -1;
-static gint hf_s7comm_szl_0132_000b_clock0 = -1;
-static gint hf_s7comm_szl_0132_000b_clock1 = -1;
-static gint hf_s7comm_szl_0132_000b_clock2 = -1;
-static gint hf_s7comm_szl_0132_000b_clock3 = -1;
-static gint hf_s7comm_szl_0132_000b_clock4 = -1;
-static gint hf_s7comm_szl_0132_000b_clock5 = -1;
-static gint hf_s7comm_szl_0132_000b_clock6 = -1;
-static gint hf_s7comm_szl_0132_000b_clock7 = -1;
-static gint hf_s7comm_szl_0132_000b_res = -1;
-
-static gint hf_s7comm_szl_0132_000c_index = -1;
-static gint hf_s7comm_szl_0132_000c_bszl_0 = -1;
-static gint hf_s7comm_szl_0132_000c_bszl_1 = -1;
-static gint hf_s7comm_szl_0132_000c_bszu_0 = -1;
-static gint hf_s7comm_szl_0132_000c_bszu_1 = -1;
-static gint hf_s7comm_szl_0132_000c_clock8 = -1;
-static gint hf_s7comm_szl_0132_000c_clock9 = -1;
-static gint hf_s7comm_szl_0132_000c_clock10 = -1;
-static gint hf_s7comm_szl_0132_000c_clock11 = -1;
-static gint hf_s7comm_szl_0132_000c_clock12 = -1;
-static gint hf_s7comm_szl_0132_000c_clock13 = -1;
-static gint hf_s7comm_szl_0132_000c_clock14 = -1;
-static gint hf_s7comm_szl_0132_000c_clock15 = -1;
-static gint hf_s7comm_szl_0132_000c_res = -1;
-
-static gint hf_s7comm_szl_001c_000x_index = -1;
-static gint hf_s7comm_szl_001c_0001_name = -1;
-static gint hf_s7comm_szl_001c_0002_name = -1;
-static gint hf_s7comm_szl_001c_0003_tag = -1;
-static gint hf_s7comm_szl_001c_0004_copyright = -1;
-static gint hf_s7comm_szl_001c_0005_serialn = -1;
-static gint hf_s7comm_szl_001c_0007_cputypname = -1;
-static gint hf_s7comm_szl_001c_0008_snmcmmc = -1;
-static gint hf_s7comm_szl_001c_0009_manufacturer_id = -1;
-static gint hf_s7comm_szl_001c_0009_profile_id = -1;
-static gint hf_s7comm_szl_001c_0009_profile_spec_typ = -1;
-static gint hf_s7comm_szl_001c_000a_oem_copyright_string = -1;
-static gint hf_s7comm_szl_001c_000a_oem_id = -1;
-static gint hf_s7comm_szl_001c_000a_oem_add_id = -1;
-static gint hf_s7comm_szl_001c_000b_loc_id = -1;
-static gint hf_s7comm_szl_001c_000x_res = -1;
-
-static gint hf_s7comm_szl_0091_0000_adr1 = -1;
-static gint hf_s7comm_szl_0091_0000_adr2 = -1;
-static gint hf_s7comm_szl_0091_0000_logadr = -1;
-static gint hf_s7comm_szl_0091_0000_solltyp = -1;
-static gint hf_s7comm_szl_0091_0000_isttyp = -1;
-static gint hf_s7comm_szl_0091_0000_res1 = -1;
-static gint hf_s7comm_szl_0091_0000_res1_0c_4c_4d = -1;
-static gint hf_s7comm_szl_0091_0000_res1_0d = -1;
-static gint hf_s7comm_szl_0091_0000_eastat = -1;
-static gint hf_s7comm_szl_0091_0000_eastat_0 = -1;
-static gint hf_s7comm_szl_0091_0000_eastat_1 = -1;
-static gint hf_s7comm_szl_0091_0000_eastat_2 = -1;
-static gint hf_s7comm_szl_0091_0000_eastat_3 = -1;
-static gint hf_s7comm_szl_0091_0000_eastat_4 = -1;
-static gint hf_s7comm_szl_0091_0000_eastat_5 = -1;
-static gint hf_s7comm_szl_0091_0000_eastat_6 = -1;
-static gint hf_s7comm_szl_0091_0000_eastat_7 = -1;
-static gint hf_s7comm_szl_0091_0000_eastat_dataid = -1;
-static gint hf_s7comm_szl_0091_0000_berbgbr = -1;
-static gint hf_s7comm_szl_0091_0000_berbgbr_0_2 = -1;
-static gint hf_s7comm_szl_0091_0000_berbgbr_3 = -1;
-static gint hf_s7comm_szl_0091_0000_berbgbr_areaid = -1;
-static gint hf_s7comm_szl_0091_0000_berbgbr_7 = -1;
+static gint hf_s7comm_szl_0132_0006_index;
+static gint hf_s7comm_szl_0132_0006_used_0;
+static gint hf_s7comm_szl_0132_0006_used_1;
+static gint hf_s7comm_szl_0132_0006_used_2;
+static gint hf_s7comm_szl_0132_0006_used_3;
+static gint hf_s7comm_szl_0132_0006_used_4;
+static gint hf_s7comm_szl_0132_0006_used_5;
+static gint hf_s7comm_szl_0132_0006_used_6;
+static gint hf_s7comm_szl_0132_0006_used_7;
+static gint hf_s7comm_szl_0132_0006_anz_schnell;
+static gint hf_s7comm_szl_0132_0006_anz_inst;
+static gint hf_s7comm_szl_0132_0006_anz_multicast;
+static gint hf_s7comm_szl_0132_0006_res;
+
+static gint hf_s7comm_szl_0132_0008_index;
+static gint hf_s7comm_szl_0132_0008_zykl;
+static gint hf_s7comm_szl_0132_0008_korr;
+static gint hf_s7comm_szl_0132_0008_clock0;
+static gint hf_s7comm_szl_0132_0008_clock1;
+static gint hf_s7comm_szl_0132_0008_clock2;
+static gint hf_s7comm_szl_0132_0008_clock3;
+static gint hf_s7comm_szl_0132_0008_clock4;
+static gint hf_s7comm_szl_0132_0008_clock5;
+static gint hf_s7comm_szl_0132_0008_clock6;
+static gint hf_s7comm_szl_0132_0008_clock7;
+static gint hf_s7comm_szl_0132_0008_time;
+static gint hf_s7comm_szl_0132_0008_res;
+
+static gint hf_s7comm_szl_0132_000b_index;
+static gint hf_s7comm_szl_0132_000b_bszl_0;
+static gint hf_s7comm_szl_0132_000b_bszl_1;
+static gint hf_s7comm_szl_0132_000b_bszu_0;
+static gint hf_s7comm_szl_0132_000b_bszu_1;
+static gint hf_s7comm_szl_0132_000b_clock0;
+static gint hf_s7comm_szl_0132_000b_clock1;
+static gint hf_s7comm_szl_0132_000b_clock2;
+static gint hf_s7comm_szl_0132_000b_clock3;
+static gint hf_s7comm_szl_0132_000b_clock4;
+static gint hf_s7comm_szl_0132_000b_clock5;
+static gint hf_s7comm_szl_0132_000b_clock6;
+static gint hf_s7comm_szl_0132_000b_clock7;
+static gint hf_s7comm_szl_0132_000b_res;
+
+static gint hf_s7comm_szl_0132_000c_index;
+static gint hf_s7comm_szl_0132_000c_bszl_0;
+static gint hf_s7comm_szl_0132_000c_bszl_1;
+static gint hf_s7comm_szl_0132_000c_bszu_0;
+static gint hf_s7comm_szl_0132_000c_bszu_1;
+static gint hf_s7comm_szl_0132_000c_clock8;
+static gint hf_s7comm_szl_0132_000c_clock9;
+static gint hf_s7comm_szl_0132_000c_clock10;
+static gint hf_s7comm_szl_0132_000c_clock11;
+static gint hf_s7comm_szl_0132_000c_clock12;
+static gint hf_s7comm_szl_0132_000c_clock13;
+static gint hf_s7comm_szl_0132_000c_clock14;
+static gint hf_s7comm_szl_0132_000c_clock15;
+static gint hf_s7comm_szl_0132_000c_res;
+
+static gint hf_s7comm_szl_001c_000x_index;
+static gint hf_s7comm_szl_001c_0001_name;
+static gint hf_s7comm_szl_001c_0002_name;
+static gint hf_s7comm_szl_001c_0003_tag;
+static gint hf_s7comm_szl_001c_0004_copyright;
+static gint hf_s7comm_szl_001c_0005_serialn;
+static gint hf_s7comm_szl_001c_0007_cputypname;
+static gint hf_s7comm_szl_001c_0008_snmcmmc;
+static gint hf_s7comm_szl_001c_0009_manufacturer_id;
+static gint hf_s7comm_szl_001c_0009_profile_id;
+static gint hf_s7comm_szl_001c_0009_profile_spec_typ;
+static gint hf_s7comm_szl_001c_000a_oem_copyright_string;
+static gint hf_s7comm_szl_001c_000a_oem_id;
+static gint hf_s7comm_szl_001c_000a_oem_add_id;
+static gint hf_s7comm_szl_001c_000b_loc_id;
+static gint hf_s7comm_szl_001c_000x_res;
+
+static gint hf_s7comm_szl_0091_0000_adr1;
+static gint hf_s7comm_szl_0091_0000_adr2;
+static gint hf_s7comm_szl_0091_0000_logadr;
+static gint hf_s7comm_szl_0091_0000_solltyp;
+static gint hf_s7comm_szl_0091_0000_isttyp;
+static gint hf_s7comm_szl_0091_0000_res1;
+static gint hf_s7comm_szl_0091_0000_res1_0c_4c_4d;
+static gint hf_s7comm_szl_0091_0000_res1_0d;
+static gint hf_s7comm_szl_0091_0000_eastat;
+static gint hf_s7comm_szl_0091_0000_eastat_0;
+static gint hf_s7comm_szl_0091_0000_eastat_1;
+static gint hf_s7comm_szl_0091_0000_eastat_2;
+static gint hf_s7comm_szl_0091_0000_eastat_3;
+static gint hf_s7comm_szl_0091_0000_eastat_4;
+static gint hf_s7comm_szl_0091_0000_eastat_5;
+static gint hf_s7comm_szl_0091_0000_eastat_6;
+static gint hf_s7comm_szl_0091_0000_eastat_7;
+static gint hf_s7comm_szl_0091_0000_eastat_dataid;
+static gint hf_s7comm_szl_0091_0000_berbgbr;
+static gint hf_s7comm_szl_0091_0000_berbgbr_0_2;
+static gint hf_s7comm_szl_0091_0000_berbgbr_3;
+static gint hf_s7comm_szl_0091_0000_berbgbr_areaid;
+static gint hf_s7comm_szl_0091_0000_berbgbr_7;
 
 static const value_string szl_0091_0000_eastat_dataid_names[] = {
     { 0xb4,                                 "Input" },
@@ -1640,7 +1640,7 @@ static const value_string szl_0091_0000_berbgbr_areaid_names[] = {
     { 6,                                    "IM4 area" },
     { 0,                                    NULL }
 };
-static gint ett_s7comm_szl_0091_0000_eastat = -1;
+static gint ett_s7comm_szl_0091_0000_eastat;
 static int * const s7comm_szl_0091_0000_eastat_fields[] = {
     &hf_s7comm_szl_0091_0000_eastat_0,
     &hf_s7comm_szl_0091_0000_eastat_1,
@@ -1653,7 +1653,7 @@ static int * const s7comm_szl_0091_0000_eastat_fields[] = {
     &hf_s7comm_szl_0091_0000_eastat_dataid,
     NULL
 };
-static gint ett_s7comm_szl_0091_0000_berbgbr = -1;
+static gint ett_s7comm_szl_0091_0000_berbgbr;
 static int * const s7comm_szl_0091_0000_berbgbr_fields[] = {
     &hf_s7comm_szl_0091_0000_berbgbr_0_2,
     &hf_s7comm_szl_0091_0000_berbgbr_3,
@@ -1662,62 +1662,62 @@ static int * const s7comm_szl_0091_0000_berbgbr_fields[] = {
     NULL
 };
 
-static gint ett_s7comm_szl_xx9x_station_info = -1;
-static gint hf_s7comm_szl_xx9x_station_info = -1;
-
-static gint hf_s7comm_szl_0092_0xxx_status_0 = -1;
-static gint hf_s7comm_szl_0092_0xxx_status_1 = -1;
-static gint hf_s7comm_szl_0092_0xxx_status_2 = -1;
-static gint hf_s7comm_szl_0092_0xxx_status_3 = -1;
-static gint hf_s7comm_szl_0092_0xxx_status_4 = -1;
-static gint hf_s7comm_szl_0092_0xxx_status_5 = -1;
-static gint hf_s7comm_szl_0092_0xxx_status_6 = -1;
-static gint hf_s7comm_szl_0092_0xxx_status_7 = -1;
-static gint hf_s7comm_szl_0092_0xxx_status_8 = -1;
-static gint hf_s7comm_szl_0092_0xxx_status_9 = -1;
-static gint hf_s7comm_szl_0092_0xxx_status_10 = -1;
-static gint hf_s7comm_szl_0092_0xxx_status_11 = -1;
-static gint hf_s7comm_szl_0092_0xxx_status_12 = -1;
-static gint hf_s7comm_szl_0092_0xxx_status_13 = -1;
-static gint hf_s7comm_szl_0092_0xxx_status_14 = -1;
-static gint hf_s7comm_szl_0092_0xxx_status_15 = -1;
-
-static gint hf_s7comm_szl_0094_xxxx_index = -1;
-static gint hf_s7comm_szl_0094_xxxx_status_0 = -1;
-static gint hf_s7comm_szl_0094_xxxx_status_1_2047 = -1;
-
-static gint hf_s7comm_szl_0096_xxxx_logadr_adr = -1;
-static gint hf_s7comm_szl_0096_xxxx_logadr_area = -1;
+static gint ett_s7comm_szl_xx9x_station_info;
+static gint hf_s7comm_szl_xx9x_station_info;
+
+static gint hf_s7comm_szl_0092_0xxx_status_0;
+static gint hf_s7comm_szl_0092_0xxx_status_1;
+static gint hf_s7comm_szl_0092_0xxx_status_2;
+static gint hf_s7comm_szl_0092_0xxx_status_3;
+static gint hf_s7comm_szl_0092_0xxx_status_4;
+static gint hf_s7comm_szl_0092_0xxx_status_5;
+static gint hf_s7comm_szl_0092_0xxx_status_6;
+static gint hf_s7comm_szl_0092_0xxx_status_7;
+static gint hf_s7comm_szl_0092_0xxx_status_8;
+static gint hf_s7comm_szl_0092_0xxx_status_9;
+static gint hf_s7comm_szl_0092_0xxx_status_10;
+static gint hf_s7comm_szl_0092_0xxx_status_11;
+static gint hf_s7comm_szl_0092_0xxx_status_12;
+static gint hf_s7comm_szl_0092_0xxx_status_13;
+static gint hf_s7comm_szl_0092_0xxx_status_14;
+static gint hf_s7comm_szl_0092_0xxx_status_15;
+
+static gint hf_s7comm_szl_0094_xxxx_index;
+static gint hf_s7comm_szl_0094_xxxx_status_0;
+static gint hf_s7comm_szl_0094_xxxx_status_1_2047;
+
+static gint hf_s7comm_szl_0096_xxxx_logadr_adr;
+static gint hf_s7comm_szl_0096_xxxx_logadr_area;
 static const true_false_string tfs_szl_0096_xxx_logadr_area = {
     "Input",
     "Output"
 };
 
-static gint hf_s7comm_szl_0096_xxxx_system = -1;
-static gint hf_s7comm_szl_0096_xxxx_api = -1;
-static gint hf_s7comm_szl_0096_xxxx_station = -1;
-static gint hf_s7comm_szl_0096_xxxx_slot = -1;
-static gint hf_s7comm_szl_0096_xxxx_subslot = -1;
-static gint hf_s7comm_szl_0096_xxxx_offset = -1;
-static gint hf_s7comm_szl_0096_xxxx_solltyp1 = -1;
-static gint hf_s7comm_szl_0096_xxxx_solltyp2 = -1;
-static gint hf_s7comm_szl_0096_xxxx_solltyp3 = -1;
-static gint hf_s7comm_szl_0096_xxxx_solltyp4_5 = -1;
-static gint hf_s7comm_szl_0096_xxxx_solltyp6_7 = -1;
-static gint hf_s7comm_szl_0096_xxxx_expactid = -1;
-static gint hf_s7comm_szl_0096_xxxx_reserve1 = -1;
-static gint hf_s7comm_szl_0096_xxxx_eastat = -1;
-static gint hf_s7comm_szl_0096_xxxx_eastat_0 = -1;
-static gint hf_s7comm_szl_0096_xxxx_eastat_1 = -1;
-static gint hf_s7comm_szl_0096_xxxx_eastat_2 = -1;
-static gint hf_s7comm_szl_0096_xxxx_eastat_3 = -1;
-static gint hf_s7comm_szl_0096_xxxx_eastat_4 = -1;
-static gint hf_s7comm_szl_0096_xxxx_eastat_5 = -1;
-static gint hf_s7comm_szl_0096_xxxx_eastat_6 = -1;
-static gint hf_s7comm_szl_0096_xxxx_eastat_7 = -1;
-static gint hf_s7comm_szl_0096_xxxx_eastat_8 = -1;
-static gint hf_s7comm_szl_0096_xxxx_eastat_9 = -1;
-static gint ett_s7comm_szl_0096_xxxx_eastat = -1;
+static gint hf_s7comm_szl_0096_xxxx_system;
+static gint hf_s7comm_szl_0096_xxxx_api;
+static gint hf_s7comm_szl_0096_xxxx_station;
+static gint hf_s7comm_szl_0096_xxxx_slot;
+static gint hf_s7comm_szl_0096_xxxx_subslot;
+static gint hf_s7comm_szl_0096_xxxx_offset;
+static gint hf_s7comm_szl_0096_xxxx_solltyp1;
+static gint hf_s7comm_szl_0096_xxxx_solltyp2;
+static gint hf_s7comm_szl_0096_xxxx_solltyp3;
+static gint hf_s7comm_szl_0096_xxxx_solltyp4_5;
+static gint hf_s7comm_szl_0096_xxxx_solltyp6_7;
+static gint hf_s7comm_szl_0096_xxxx_expactid;
+static gint hf_s7comm_szl_0096_xxxx_reserve1;
+static gint hf_s7comm_szl_0096_xxxx_eastat;
+static gint hf_s7comm_szl_0096_xxxx_eastat_0;
+static gint hf_s7comm_szl_0096_xxxx_eastat_1;
+static gint hf_s7comm_szl_0096_xxxx_eastat_2;
+static gint hf_s7comm_szl_0096_xxxx_eastat_3;
+static gint hf_s7comm_szl_0096_xxxx_eastat_4;
+static gint hf_s7comm_szl_0096_xxxx_eastat_5;
+static gint hf_s7comm_szl_0096_xxxx_eastat_6;
+static gint hf_s7comm_szl_0096_xxxx_eastat_7;
+static gint hf_s7comm_szl_0096_xxxx_eastat_8;
+static gint hf_s7comm_szl_0096_xxxx_eastat_9;
+static gint ett_s7comm_szl_0096_xxxx_eastat;
 static int * const s7comm_szl_0096_xxxx_eastat_fields[] = {
     &hf_s7comm_szl_0096_xxxx_eastat_0,
     &hf_s7comm_szl_0096_xxxx_eastat_1,
@@ -1731,12 +1731,12 @@ static int * const s7comm_szl_0096_xxxx_eastat_fields[] = {
     &hf_s7comm_szl_0096_xxxx_eastat_9,
     NULL
 };
-static gint hf_s7comm_szl_0096_xxxx_berbgbr = -1;
-static gint hf_s7comm_szl_0096_xxxx_berbgbr_0_2 = -1;
-static gint hf_s7comm_szl_0096_xxxx_berbgbr_3 = -1;
-static gint hf_s7comm_szl_0096_xxxx_berbgbr_areaid = -1;
-static gint hf_s7comm_szl_0096_xxxx_berbgbr_7 = -1;
-static gint ett_s7comm_szl_0096_xxxx_berbgbr = -1;
+static gint hf_s7comm_szl_0096_xxxx_berbgbr;
+static gint hf_s7comm_szl_0096_xxxx_berbgbr_0_2;
+static gint hf_s7comm_szl_0096_xxxx_berbgbr_3;
+static gint hf_s7comm_szl_0096_xxxx_berbgbr_areaid;
+static gint hf_s7comm_szl_0096_xxxx_berbgbr_7;
+static gint ett_s7comm_szl_0096_xxxx_berbgbr;
 static int * const s7comm_szl_0096_xxxx_berbgbr_fields[] = {
     &hf_s7comm_szl_0096_xxxx_berbgbr_0_2,
     &hf_s7comm_szl_0096_xxxx_berbgbr_3,
@@ -1744,13 +1744,13 @@ static int * const s7comm_szl_0096_xxxx_berbgbr_fields[] = {
     &hf_s7comm_szl_0096_xxxx_berbgbr_7,
     NULL
 };
-static gint hf_s7comm_szl_0096_xxxx_reserve2 = -1;
+static gint hf_s7comm_szl_0096_xxxx_reserve2;
 
-static gint hf_s7comm_szl_0424_0000_ereig = -1;
-static gint hf_s7comm_szl_0424_0000_ae = -1;
-static gint hf_s7comm_szl_0424_0000_bzu_id = -1;
-static gint hf_s7comm_szl_0424_0000_bzu_id_req = -1;
-static gint hf_s7comm_szl_0424_0000_bzu_id_pre = -1;
+static gint hf_s7comm_szl_0424_0000_ereig;
+static gint hf_s7comm_szl_0424_0000_ae;
+static gint hf_s7comm_szl_0424_0000_bzu_id;
+static gint hf_s7comm_szl_0424_0000_bzu_id_req;
+static gint hf_s7comm_szl_0424_0000_bzu_id_pre;
 static const value_string szl_0424_0000_bzu_id_names[] = {
     { 0x1,                                  "STOP (update)" },
     { 0x2,                                  "STOP (memory reset)" },
@@ -1763,15 +1763,15 @@ static const value_string szl_0424_0000_bzu_id_names[] = {
     { 0xd,                                  "DEFECT" },
     { 0,                                    NULL }
 };
-static gint ett_s7comm_szl_0424_0000_bzu_id = -1;
+static gint ett_s7comm_szl_0424_0000_bzu_id;
 static int * const s7comm_szl_0424_0000_bzu_id_fields[] = {
     &hf_s7comm_szl_0424_0000_bzu_id_req,
     &hf_s7comm_szl_0424_0000_bzu_id_pre,
     NULL
 };
-static gint hf_s7comm_szl_0424_0000_res = -1;
-static gint hf_s7comm_szl_0424_0000_anlinfo1 = -1;
-static gint hf_s7comm_szl_0424_0000_anlinfo2 = -1;
+static gint hf_s7comm_szl_0424_0000_res;
+static gint hf_s7comm_szl_0424_0000_anlinfo1;
+static gint hf_s7comm_szl_0424_0000_anlinfo2;
 static const value_string szl_0424_0000_anlinfo2_names[] = {
     { 0x01,                                 "Complete restart in multicomputing" },
     { 0x03,                                 "Complete restart set at mode selector" },
@@ -1788,8 +1788,8 @@ static const value_string szl_0424_0000_anlinfo2_names[] = {
     { 0xa0,                                 "Automatic restart after battery backed power on according to parameter assignment" },
     { 0,                                    NULL }
 };
-static gint hf_s7comm_szl_0424_0000_anlinfo3 = -1;
-static gint hf_s7comm_szl_0424_0000_anlinfo4 = -1;
+static gint hf_s7comm_szl_0424_0000_anlinfo3;
+static gint hf_s7comm_szl_0424_0000_anlinfo4;
 static const value_string szl_0424_0000_anlinfo4_names[] = {
     { 0x00,                                 "No startup type" },
     { 0x01,                                 "Complete restart in multicomputing" },
@@ -1807,20 +1807,20 @@ static const value_string szl_0424_0000_anlinfo4_names[] = {
     { 0xa0,                                 "Automatic restart after battery backed power on according to parameter assignment" },
     { 0,                                    NULL }
 };
-static gint hf_s7comm_szl_0424_0000_time = -1;
+static gint hf_s7comm_szl_0424_0000_time;
 
-static gint hf_s7comm_szl_xy74_0000_cpu_led_id = -1;
-static gint hf_s7comm_szl_xy74_0000_cpu_led_id_rackno = -1;
-static gint hf_s7comm_szl_xy74_0000_cpu_led_id_cputype = -1;
-static gint hf_s7comm_szl_xy74_0000_cpu_led_id_id = -1;
-static gint hf_s7comm_szl_xy74_0000_led_on = -1;
+static gint hf_s7comm_szl_xy74_0000_cpu_led_id;
+static gint hf_s7comm_szl_xy74_0000_cpu_led_id_rackno;
+static gint hf_s7comm_szl_xy74_0000_cpu_led_id_cputype;
+static gint hf_s7comm_szl_xy74_0000_cpu_led_id_id;
+static gint hf_s7comm_szl_xy74_0000_led_on;
 static const value_string szl_xy74_0000_led_on_names[] = {
     { 0x0,                                  "Off" },
     { 0x1,                                  "On" },
     { 0,                                    NULL }
 };
 
-static gint hf_s7comm_szl_xy74_0000_led_blink = -1;
+static gint hf_s7comm_szl_xy74_0000_led_blink;
 static const value_string szl_xy74_0000_led_blink_names[] = {
     { 0x0,                                  "Not flashing" },
     { 0x1,                                  "Flashing normally (2 Hz)" },
diff --git a/epan/dissectors/packet-sadmind.c b/epan/dissectors/packet-sadmind.c
index e65d8046f0..d64a133f70 100644
--- a/epan/dissectors/packet-sadmind.c
+++ b/epan/dissectors/packet-sadmind.c
@@ -17,12 +17,12 @@
 void proto_register_sadmind(void);
 void proto_reg_handoff_sadmind(void);
 
-static int proto_sadmind = -1;
-static int hf_sadmind_procedure_v1 = -1;
-static int hf_sadmind_procedure_v2 = -1;
-static int hf_sadmind_procedure_v3 = -1;
+static int proto_sadmind;
+static int hf_sadmind_procedure_v1;
+static int hf_sadmind_procedure_v2;
+static int hf_sadmind_procedure_v3;
 
-static gint ett_sadmind = -1;
+static gint ett_sadmind;
 
 #define SADMIND_PROGRAM	100232
 
diff --git a/epan/dissectors/packet-sametime.c b/epan/dissectors/packet-sametime.c
index bef0f797c6..c565e0d7c4 100644
--- a/epan/dissectors/packet-sametime.c
+++ b/epan/dissectors/packet-sametime.c
@@ -21,7 +21,7 @@
 void proto_register_sametime(void);
 void proto_reg_handoff_sametime(void);
 
-static int proto_sametime = -1;
+static int proto_sametime;
 static dissector_handle_t sametime_handle;
 
 /*preferences*/
@@ -29,50 +29,50 @@ static gboolean global_sametime_show_length = FALSE;
 static gboolean global_sametime_reassemble_packets = TRUE;
 
 /*heart beat*/
-static int hf_sametime_heartbeat = -1;
+static int hf_sametime_heartbeat;
 
 /*sametime message header*/
-static int hf_sametime_message_length = -1;
-static int hf_sametime_message_type = -1;
-static int hf_sametime_message_options = -1;
-static int hf_sametime_message_options_attribute = -1;
-static int hf_sametime_message_options_encrypted = -1;
-static int hf_sametime_message_channel = -1;
+static int hf_sametime_message_length;
+static int hf_sametime_message_type;
+static int hf_sametime_message_options;
+static int hf_sametime_message_options_attribute;
+static int hf_sametime_message_options_encrypted;
+static int hf_sametime_message_channel;
 
 /*common types*/
-static int hf_sametime_field_length = -1;
-static int hf_sametime_field_text = -1;
-static int hf_sametime_code = -1;
-static int hf_sametime_login_type = -1;
-static int hf_sametime_time = -1;
+static int hf_sametime_field_length;
+static int hf_sametime_field_text;
+static int hf_sametime_code;
+static int hf_sametime_login_type;
+static int hf_sametime_time;
 
 /*handshake*/
-static int hf_sametime_handshake_major = -1;
-static int hf_sametime_handshake_minor = -1;
-static int hf_sametime_handshake_srvrcalc_addr = -1;
-static int hf_sametime_handshake_loclcalc_addr = -1;
+static int hf_sametime_handshake_major;
+static int hf_sametime_handshake_minor;
+static int hf_sametime_handshake_srvrcalc_addr;
+static int hf_sametime_handshake_loclcalc_addr;
 
 /*channel*/
-static int hf_sametime_channel_service = -1;
-static int hf_sametime_channel_id = -1;
-static int hf_sametime_channel_send_type = -1;
-static int hf_sametime_channel_awareness = -1;
+static int hf_sametime_channel_service;
+static int hf_sametime_channel_id;
+static int hf_sametime_channel_send_type;
+static int hf_sametime_channel_awareness;
 
 /*user status*/
-static int hf_sametime_user_status = -1;
+static int hf_sametime_user_status;
 
 /*location*/
-static int hf_sametime_location_country = -1;
-static int hf_sametime_location_postalcode = -1;
-static int hf_sametime_location_province = -1;
-static int hf_sametime_location_city = -1;
-static int hf_sametime_location_phone = -1;
-static int hf_sametime_location_name = -1;
-static int hf_sametime_location_timezone = -1;
+static int hf_sametime_location_country;
+static int hf_sametime_location_postalcode;
+static int hf_sametime_location_province;
+static int hf_sametime_location_city;
+static int hf_sametime_location_phone;
+static int hf_sametime_location_name;
+static int hf_sametime_location_timezone;
 
 /*packet detail tree*/
-static gint ett_sametime = -1;
-static gint ett_sametime_options = -1;
+static gint ett_sametime;
+static gint ett_sametime_options;
 
 /*statistics*/
 static int sametime_tap = -1;
diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c
index df30168d55..269854860e 100644
--- a/epan/dissectors/packet-sap.c
+++ b/epan/dissectors/packet-sap.c
@@ -69,39 +69,39 @@ static const value_string mcast_sap_auth_type[] = {
 #define MCAST_SAP_AUTH_BIT_P 0x10 /* Padding required for the authentication header */
 
 
-static int proto_sap = -1;
-static int hf_sap_flags = -1;
-static int hf_sap_flags_v = -1;
-static int hf_sap_flags_a = -1;
-static int hf_sap_flags_r = -1;
-static int hf_sap_flags_t = -1;
-static int hf_sap_flags_e = -1;
-static int hf_sap_flags_c = -1;
-static int hf_auth_data = -1;
-static int hf_auth_flags = -1;
-static int hf_auth_flags_v = -1;
-static int hf_auth_flags_p = -1;
-static int hf_auth_flags_t = -1;
+static int proto_sap;
+static int hf_sap_flags;
+static int hf_sap_flags_v;
+static int hf_sap_flags_a;
+static int hf_sap_flags_r;
+static int hf_sap_flags_t;
+static int hf_sap_flags_e;
+static int hf_sap_flags_c;
+static int hf_auth_data;
+static int hf_auth_flags;
+static int hf_auth_flags_v;
+static int hf_auth_flags_p;
+static int hf_auth_flags_t;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_sap_auth_len = -1;
-static int hf_sap_originating_source_ipv4 = -1;
-static int hf_sap_auth_data_padding = -1;
-static int hf_sap_auth_subheader = -1;
-static int hf_sap_originating_source_ipv6 = -1;
-static int hf_sap_message_identifier_hash = -1;
-static int hf_sap_auth_data_padding_len = -1;
-static int hf_sap_payload_type = -1;
-
-static gint ett_sap = -1;
-static gint ett_sap_flags = -1;
-static gint ett_sap_auth = -1;
-static gint ett_sap_authf = -1;
-
-static expert_field ei_sap_compressed_and_encrypted = EI_INIT;
-static expert_field ei_sap_encrypted = EI_INIT;
-static expert_field ei_sap_compressed = EI_INIT;
+static int hf_sap_auth_len;
+static int hf_sap_originating_source_ipv4;
+static int hf_sap_auth_data_padding;
+static int hf_sap_auth_subheader;
+static int hf_sap_originating_source_ipv6;
+static int hf_sap_message_identifier_hash;
+static int hf_sap_auth_data_padding_len;
+static int hf_sap_payload_type;
+
+static gint ett_sap;
+static gint ett_sap_flags;
+static gint ett_sap_auth;
+static gint ett_sap_authf;
+
+static expert_field ei_sap_compressed_and_encrypted;
+static expert_field ei_sap_encrypted;
+static expert_field ei_sap_compressed;
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_sap_bogus_authentication_or_pad_length = EI_INIT;
+static expert_field ei_sap_bogus_authentication_or_pad_length;
 
 static dissector_handle_t sdp_handle;
 
diff --git a/epan/dissectors/packet-sapdiag.c b/epan/dissectors/packet-sapdiag.c
index 9fa6510084..ebef2722b1 100644
--- a/epan/dissectors/packet-sapdiag.c
+++ b/epan/dissectors/packet-sapdiag.c
@@ -855,366 +855,366 @@ static const value_string sapdiag_item_control_properties_id_vals[] = {
 #define SAPDIAG_UI_EVENT_VALID_FLAG_NAVIGATION_DATA		0x04
 #define SAPDIAG_UI_EVENT_VALID_FLAG_FUNCTIONKEY_DATA	0x08
 
-static int proto_sapdiag = -1;
+static int proto_sapdiag;
 
-static int hf_sapdiag_dp = -1;
-static int hf_sapdiag_header = -1;
-static int hf_sapdiag_payload = -1;
+static int hf_sapdiag_dp;
+static int hf_sapdiag_header;
+static int hf_sapdiag_payload;
 
 /* Diag Header */
-static int hf_sapdiag_mode = -1;
-static int hf_sapdiag_com_flag = -1;
-static int hf_sapdiag_com_flag_TERM_EOS = -1;
-static int hf_sapdiag_com_flag_TERM_EOC = -1;
-static int hf_sapdiag_com_flag_TERM_NOP = -1;
-static int hf_sapdiag_com_flag_TERM_EOP = -1;
-static int hf_sapdiag_com_flag_TERM_INI = -1;
-static int hf_sapdiag_com_flag_TERM_CAS = -1;
-static int hf_sapdiag_com_flag_TERM_NNM = -1;
-static int hf_sapdiag_com_flag_TERM_GRA = -1;
-
-static int hf_sapdiag_mode_stat = -1;
-static int hf_sapdiag_err_no = -1;
-static int hf_sapdiag_msg_type = -1;
-static int hf_sapdiag_msg_info = -1;
-static int hf_sapdiag_msg_rc = -1;
-static int hf_sapdiag_compress = -1;
+static int hf_sapdiag_mode;
+static int hf_sapdiag_com_flag;
+static int hf_sapdiag_com_flag_TERM_EOS;
+static int hf_sapdiag_com_flag_TERM_EOC;
+static int hf_sapdiag_com_flag_TERM_NOP;
+static int hf_sapdiag_com_flag_TERM_EOP;
+static int hf_sapdiag_com_flag_TERM_INI;
+static int hf_sapdiag_com_flag_TERM_CAS;
+static int hf_sapdiag_com_flag_TERM_NNM;
+static int hf_sapdiag_com_flag_TERM_GRA;
+
+static int hf_sapdiag_mode_stat;
+static int hf_sapdiag_err_no;
+static int hf_sapdiag_msg_type;
+static int hf_sapdiag_msg_info;
+static int hf_sapdiag_msg_rc;
+static int hf_sapdiag_compress;
 
 /* Error messages */
-static int hf_sapdiag_error_message = -1;
+static int hf_sapdiag_error_message;
 
 /* Compression header */
-static int hf_sapdiag_compress_header = -1;
-static int hf_sapdiag_uncomplength = -1;
-static int hf_sapdiag_algorithm = -1;
-static int hf_sapdiag_magic = -1;
-static int hf_sapdiag_special = -1;
+static int hf_sapdiag_compress_header;
+static int hf_sapdiag_uncomplength;
+static int hf_sapdiag_algorithm;
+static int hf_sapdiag_magic;
+static int hf_sapdiag_special;
 
 /* Message Data */
-static int hf_sapdiag_item = -1;
-static int hf_sapdiag_item_type = -1;
-static int hf_sapdiag_item_id = -1;
-static int hf_sapdiag_item_sid = -1;
-static int hf_sapdiag_item_length_short = -1;
-static int hf_sapdiag_item_length_long = -1;
-static int hf_sapdiag_item_value = -1;
+static int hf_sapdiag_item;
+static int hf_sapdiag_item_type;
+static int hf_sapdiag_item_id;
+static int hf_sapdiag_item_sid;
+static int hf_sapdiag_item_length_short;
+static int hf_sapdiag_item_length_long;
+static int hf_sapdiag_item_value;
 
 /* Message DP Header */
-static int hf_sapdiag_dp_request_id = -1;
-static int hf_sapdiag_dp_retcode = -1;
-static int hf_sapdiag_dp_sender_id = -1;
-static int hf_sapdiag_dp_action_type = -1;
-static int hf_sapdiag_dp_req_info = -1;
-
-static int hf_sapdiag_dp_req_info_LOGIN = -1;
-static int hf_sapdiag_dp_req_info_LOGOFF = -1;
-static int hf_sapdiag_dp_req_info_SHUTDOWN = -1;
-static int hf_sapdiag_dp_req_info_GRAPHIC_TM = -1;
-static int hf_sapdiag_dp_req_info_ALPHA_TM = -1;
-static int hf_sapdiag_dp_req_info_ERROR_FROM_APPC = -1;
-static int hf_sapdiag_dp_req_info_CANCELMODE = -1;
-static int hf_sapdiag_dp_req_info_MSG_WITH_REQ_BUF = -1;
-static int hf_sapdiag_dp_req_info_MSG_WITH_OH = -1;
-static int hf_sapdiag_dp_req_info_BUFFER_REFRESH = -1;
-static int hf_sapdiag_dp_req_info_BTC_SCHEDULER = -1;
-static int hf_sapdiag_dp_req_info_APPC_SERVER_DOWN = -1;
-static int hf_sapdiag_dp_req_info_MS_ERROR = -1;
-static int hf_sapdiag_dp_req_info_SET_SYSTEM_USER = -1;
-static int hf_sapdiag_dp_req_info_DP_CANT_HANDLE_REQ = -1;
-static int hf_sapdiag_dp_req_info_DP_AUTO_ABAP = -1;
-static int hf_sapdiag_dp_req_info_DP_APPL_SERV_INFO = -1;
-static int hf_sapdiag_dp_req_info_DP_ADMIN = -1;
-static int hf_sapdiag_dp_req_info_DP_SPOOL_ALRM = -1;
-static int hf_sapdiag_dp_req_info_DP_HAND_SHAKE = -1;
-static int hf_sapdiag_dp_req_info_DP_CANCEL_PRIV = -1;
-static int hf_sapdiag_dp_req_info_DP_RAISE_TIMEOUT = -1;
-static int hf_sapdiag_dp_req_info_DP_NEW_MODE = -1;
-static int hf_sapdiag_dp_req_info_DP_SOFT_CANCEL = -1;
-static int hf_sapdiag_dp_req_info_DP_TM_INPUT = -1;
-static int hf_sapdiag_dp_req_info_DP_TM_OUTPUT = -1;
-static int hf_sapdiag_dp_req_info_DP_ASYNC_RFC = -1;
-static int hf_sapdiag_dp_req_info_DP_ICM_EVENT = -1;
-static int hf_sapdiag_dp_req_info_DP_AUTO_TH = -1;
-static int hf_sapdiag_dp_req_info_DP_RFC_CANCEL = -1;
-static int hf_sapdiag_dp_req_info_DP_MS_ADM = -1;
-
-static int hf_sapdiag_dp_tid = -1;
-static int hf_sapdiag_dp_uid = -1;
-static int hf_sapdiag_dp_mode = -1;
-static int hf_sapdiag_dp_wp_id = -1;
-static int hf_sapdiag_dp_wp_ca_blk = -1;
-static int hf_sapdiag_dp_appc_ca_blk = -1;
-static int hf_sapdiag_dp_len = -1; /* Length of the SAP Diag Items in the login */
-static int hf_sapdiag_dp_new_stat = -1;
-static int hf_sapdiag_dp_rq_id = -1;
-static int hf_sapdiag_dp_terminal = -1;
+static int hf_sapdiag_dp_request_id;
+static int hf_sapdiag_dp_retcode;
+static int hf_sapdiag_dp_sender_id;
+static int hf_sapdiag_dp_action_type;
+static int hf_sapdiag_dp_req_info;
+
+static int hf_sapdiag_dp_req_info_LOGIN;
+static int hf_sapdiag_dp_req_info_LOGOFF;
+static int hf_sapdiag_dp_req_info_SHUTDOWN;
+static int hf_sapdiag_dp_req_info_GRAPHIC_TM;
+static int hf_sapdiag_dp_req_info_ALPHA_TM;
+static int hf_sapdiag_dp_req_info_ERROR_FROM_APPC;
+static int hf_sapdiag_dp_req_info_CANCELMODE;
+static int hf_sapdiag_dp_req_info_MSG_WITH_REQ_BUF;
+static int hf_sapdiag_dp_req_info_MSG_WITH_OH;
+static int hf_sapdiag_dp_req_info_BUFFER_REFRESH;
+static int hf_sapdiag_dp_req_info_BTC_SCHEDULER;
+static int hf_sapdiag_dp_req_info_APPC_SERVER_DOWN;
+static int hf_sapdiag_dp_req_info_MS_ERROR;
+static int hf_sapdiag_dp_req_info_SET_SYSTEM_USER;
+static int hf_sapdiag_dp_req_info_DP_CANT_HANDLE_REQ;
+static int hf_sapdiag_dp_req_info_DP_AUTO_ABAP;
+static int hf_sapdiag_dp_req_info_DP_APPL_SERV_INFO;
+static int hf_sapdiag_dp_req_info_DP_ADMIN;
+static int hf_sapdiag_dp_req_info_DP_SPOOL_ALRM;
+static int hf_sapdiag_dp_req_info_DP_HAND_SHAKE;
+static int hf_sapdiag_dp_req_info_DP_CANCEL_PRIV;
+static int hf_sapdiag_dp_req_info_DP_RAISE_TIMEOUT;
+static int hf_sapdiag_dp_req_info_DP_NEW_MODE;
+static int hf_sapdiag_dp_req_info_DP_SOFT_CANCEL;
+static int hf_sapdiag_dp_req_info_DP_TM_INPUT;
+static int hf_sapdiag_dp_req_info_DP_TM_OUTPUT;
+static int hf_sapdiag_dp_req_info_DP_ASYNC_RFC;
+static int hf_sapdiag_dp_req_info_DP_ICM_EVENT;
+static int hf_sapdiag_dp_req_info_DP_AUTO_TH;
+static int hf_sapdiag_dp_req_info_DP_RFC_CANCEL;
+static int hf_sapdiag_dp_req_info_DP_MS_ADM;
+
+static int hf_sapdiag_dp_tid;
+static int hf_sapdiag_dp_uid;
+static int hf_sapdiag_dp_mode;
+static int hf_sapdiag_dp_wp_id;
+static int hf_sapdiag_dp_wp_ca_blk;
+static int hf_sapdiag_dp_appc_ca_blk;
+static int hf_sapdiag_dp_len; /* Length of the SAP Diag Items in the login */
+static int hf_sapdiag_dp_new_stat;
+static int hf_sapdiag_dp_rq_id;
+static int hf_sapdiag_dp_terminal;
 
 /* Dynt Atom */
-static int hf_sapdiag_item_dynt_atom = -1;
-static int hf_sapdiag_item_dynt_atom_item = -1;
-static int hf_sapdiag_item_dynt_atom_item_etype = -1;
-static int hf_sapdiag_item_dynt_atom_item_attr = -1;
-static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_COMBOSTYLE = -1;
-static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_YES3D = -1;
-static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_PROPFONT = -1;
-static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_MATCHCODE = -1;
-static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_JUSTRIGHT = -1;
-static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_INTENSIFY = -1;
-static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_INVISIBLE = -1;
-static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_PROTECTED = -1;
+static int hf_sapdiag_item_dynt_atom;
+static int hf_sapdiag_item_dynt_atom_item;
+static int hf_sapdiag_item_dynt_atom_item_etype;
+static int hf_sapdiag_item_dynt_atom_item_attr;
+static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_COMBOSTYLE;
+static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_YES3D;
+static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_PROPFONT;
+static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_MATCHCODE;
+static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_JUSTRIGHT;
+static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_INTENSIFY;
+static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_INVISIBLE;
+static int hf_sapdiag_item_dynt_atom_item_attr_DIAG_BSD_PROTECTED;
 
 /* Control properties */
-static int hf_sapdiag_item_control_properties_id = -1;
-static int hf_sapdiag_item_control_properties_value = -1;
+static int hf_sapdiag_item_control_properties_id;
+static int hf_sapdiag_item_control_properties_value;
 
 /* UI Event Source */
-static int hf_sapdiag_item_ui_event_event_type = -1;
-static int hf_sapdiag_item_ui_event_control_type = -1;
-static int hf_sapdiag_item_ui_event_valid = -1;
-static int hf_sapdiag_item_ui_event_valid_MENU_POS = -1;
-static int hf_sapdiag_item_ui_event_valid_CONTROL_POS = -1;
-static int hf_sapdiag_item_ui_event_valid_NAVIGATION_DATA = -1;
-static int hf_sapdiag_item_ui_event_valid_FUNCTIONKEY_DATA = -1;
-static int hf_sapdiag_item_ui_event_control_row = -1;
-static int hf_sapdiag_item_ui_event_control_col = -1;
-static int hf_sapdiag_item_ui_event_data = -1;
-static int hf_sapdiag_item_ui_event_navigation_data = -1;
-static int hf_sapdiag_item_ui_event_container_nrs = -1;
-static int hf_sapdiag_item_ui_event_container = -1;
+static int hf_sapdiag_item_ui_event_event_type;
+static int hf_sapdiag_item_ui_event_control_type;
+static int hf_sapdiag_item_ui_event_valid;
+static int hf_sapdiag_item_ui_event_valid_MENU_POS;
+static int hf_sapdiag_item_ui_event_valid_CONTROL_POS;
+static int hf_sapdiag_item_ui_event_valid_NAVIGATION_DATA;
+static int hf_sapdiag_item_ui_event_valid_FUNCTIONKEY_DATA;
+static int hf_sapdiag_item_ui_event_control_row;
+static int hf_sapdiag_item_ui_event_control_col;
+static int hf_sapdiag_item_ui_event_data;
+static int hf_sapdiag_item_ui_event_navigation_data;
+static int hf_sapdiag_item_ui_event_container_nrs;
+static int hf_sapdiag_item_ui_event_container;
 
 /* Menu Entries */
-static int hf_sapdiag_item_menu_entry = -1;
+static int hf_sapdiag_item_menu_entry;
 
 /* Diag Support Bits */
-static int hf_SAPDIAG_SUPPORT_BIT_PROGRESS_INDICATOR = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_LABELS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_DIAGVERSION = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_SELECT_RECT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_SYMBOL_RIGHT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_FONT_METRIC = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_COMPR_ENHANCED = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_IMODE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_LONG_MESSAGE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_TABLE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_FOCUS_1 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_PUSHBUTTON_1 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_UPPERCASE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_TABPROPERTY = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_INPUT_UPPERCASE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_RFC_DIALOG = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_LIST_HOTSPOT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_FKEY_TABLE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_MENU_SHORTCUT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_STOP_TRANS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_FULL_MENU = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_OBJECT_NAMES = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CONTAINER_TYPE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_DLGH_FLAGS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_APPL_MNU = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_MESSAGE_INFO = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_MESDUM_FLAG1 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_TABSEL_ATTRIB = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_GUIAPI = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_NOGRAPH = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_NOMESSAGES = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_NORABAX = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_NOSYSMSG = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_NOSAPSCRIPT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_NORFC = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_NEW_BSD_JUSTRIGHT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_MESSAGE_VARS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_OCX_SUPPORT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SCROLL_INFOS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_TABLE_SIZE_OK = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_MESSAGE_INFO2 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_VARINFO_OKCODE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CURR_TCODE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CONN_WSIZE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_PUSHBUTTON_2 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_TABSTRIP = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_UNKNOWN_1 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_TABSCROLL_INFOS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_TABLE_FIELD_NAMES = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_NEW_MODE_REQUEST = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_RFCBLOB_DIAG_PARSER = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_MULTI_LOGIN_USER = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CONTROL_CONTAINER = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_APPTOOLBAR_FIXED = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_USER_CHECKED = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_NEED_STDDYNPRO = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_TYPE_SERVER = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_COMBOBOX = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_INPUT_REQUIRED = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ISO_LANGUAGE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_COMBOBOX_TABLE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_FLAGS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CHECKRADIO_EVENTS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_USERID = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_ROLLCOUNT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_USER_TURNTIME2 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_NUM_FIELD = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_WIN16 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CONTEXT_MENU = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SCROLLABLE_TABSTRIP_PAGE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_EVENT_DESCRIPTION = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_LABEL_OWNER = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CLICKABLE_FIELD = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_PROPERTY_BAG = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_UNUSED_1 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_TABLE_ROW_REFERENCES_2 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_PROPFONT_VALID = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_VARINFO_CONTAINER = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_IMODEUUID = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_NOTGUI = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_WAN = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_XML_BLOBS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_RFC_QUEUE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_RFC_COMPRESS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_JAVA_BEANS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_DPLOADONDEMAND = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CTL_PROPCACHE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ENJOY_IMODEUUID = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_RFC_ASYNC_BLOB = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_KEEP_SCROLLPOS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_UNUSED_2 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_UNUSED_3 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_XML_PROPERTIES = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_UNUSED_4 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_HEX_FIELD = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_HAS_CACHE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_XML_PROP_TABLE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_UNUSED_5 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ENJOY_IMODEUUID2 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ITS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_NO_EASYACCESS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_PROPERTYPUMP = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_COOKIE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_UNUSED_6 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SUPPBIT_AREA_SIZE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_DPLOADONDEMAND_WRITE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CONTROL_FOCUS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ENTRY_HISTORY = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_AUTO_CODEPAGE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CACHED_VSETS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_EMERGENCY_REPAIR = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_AREA2FRONT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SCROLLBAR_WIDTH = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_AUTORESIZE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_EDIT_VARLEN = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_WORKPLACE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_PRINTDATA = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_UNKNOWN_2 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SINGLE_SESSION = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_NOTIFY_NEWMODE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_TOOLBAR_HEIGHT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_XMLPROP_CONTAINER = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_XMLPROP_DYNPRO = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_DP_HTTP_PUT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_DYNAMIC_PASSPORT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_WEBGUI = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_WEBGUI_HELPMODE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CONTROL_FOCUS_ON_LIST = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CBU_RBUDUMMY_2 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_EOKDUMMY_1 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_GUI_USER_SCRIPTING = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SLC = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ACCESSIBILITY = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ECATT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ENJOY_IMODEUUID3 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ENABLE_UTF8 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_AUTOLOGOUT_TIME = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_VARINFO_ICON_TITLE_LIST = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ENABLE_UTF16BE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ENABLE_UTF16LE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_CODEPAGE_APP = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ENABLE_APPL4 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_GUIPATCHLEVEL = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CBURBU_NEW_STATE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_BINARY_EVENTID = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_GUI_THEME = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_TOP_WINDOW = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_EVENT_DESCRIPTION_1 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SPLITTER = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_VALUE_4_HISTORY = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ACC_LIST = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_GUI_USER_SCRIPTING_INFO = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_TEXTEDIT_STREAM = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_DYNT_NOFOCUS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_CODEPAGE_APP_1 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_FRAME_1 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_TICKET4GUI = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ACC_LIST_PROPS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_TABSEL_ATTRIB_INPUT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_DEFAULT_TOOLTIP = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_XML_PROP_TABLE_2 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CBU_RBUDUMMY_3 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CELLINFO = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CONTROL_FOCUS_ON_LIST_2 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_TABLE_COLUMNWIDTH_INPUT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ITS_PLUGIN = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_OBJECT_NAMES_4_LOGIN_PROCESS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_RFC_SERVER_4_GUI = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_FLAGS_2 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_RCUI = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_MENUENTRY_WITH_FCODE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_WEBSAPCONSOLE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_KERNEL_VERSION = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_VARINFO_CONTAINER_LOOP = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_EOKDUMMY_2 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_MESSAGE_INFO3 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SBA2 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_MAINAREA_SIZE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_GUIPATCHLEVEL_2 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_DISPLAY_SIZE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_GUI_PACKET = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_DIALOG_STEP_NUMBER = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_TC_KEEP_SCROLL_POSITION = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_MESSAGE_SERVICE_REQUEST = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_DYNT_FOCUS_FRAME = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_MAX_STRING_LEN = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_VARINFO_CONTAINER_1 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_STD_TOOLBAR_ITEMS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_XMLPROP_LIST_DYNPRO = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_TRACE_GUI_CONNECT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_LIST_FULLWIDTH = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_ALLWAYS_SEND_CLIENT = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_UNKNOWN_3 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_GUI_SIGNATURE_COLOR = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_MAX_WSIZE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_SAP_PERSONAS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_IDA_ALV = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_IDA_ALV_FRAGMENTS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_AMC = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_EXTMODE_FONT_METRIC = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_GROUPBOX = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_AGI_ID_TS_BUTTON = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_NO_FOCUS_ON_LIST = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_FIORI_MODE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CONNECT_CHECK_DONE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_MSGINFO_WITH_CODEPAGE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_AGI_ID = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_AGI_ID_TC = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_FIORI_TOOLBARS = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_OBJECT_NAMES_ENFORCE = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_MESDUMMY_FLAGS_2_3 = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_NWBC = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_CONTAINER_LIST = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_GUI_SYSTEM_COLOR = -1;
-static int hf_SAPDIAG_SUPPORT_BIT_GROUPBOX_WITHOUT_BOTTOMLINE = -1;
-
-static gint ett_sapdiag = -1;
+static int hf_SAPDIAG_SUPPORT_BIT_PROGRESS_INDICATOR;
+static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_LABELS;
+static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_DIAGVERSION;
+static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_SELECT_RECT;
+static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_SYMBOL_RIGHT;
+static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_FONT_METRIC;
+static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_COMPR_ENHANCED;
+static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_IMODE;
+static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_LONG_MESSAGE;
+static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_TABLE;
+static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_FOCUS_1;
+static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_PUSHBUTTON_1;
+static int hf_SAPDIAG_SUPPORT_BIT_UPPERCASE;
+static int hf_SAPDIAG_SUPPORT_BIT_SAPGUI_TABPROPERTY;
+static int hf_SAPDIAG_SUPPORT_BIT_INPUT_UPPERCASE;
+static int hf_SAPDIAG_SUPPORT_BIT_RFC_DIALOG;
+static int hf_SAPDIAG_SUPPORT_BIT_LIST_HOTSPOT;
+static int hf_SAPDIAG_SUPPORT_BIT_FKEY_TABLE;
+static int hf_SAPDIAG_SUPPORT_BIT_MENU_SHORTCUT;
+static int hf_SAPDIAG_SUPPORT_BIT_STOP_TRANS;
+static int hf_SAPDIAG_SUPPORT_BIT_FULL_MENU;
+static int hf_SAPDIAG_SUPPORT_BIT_OBJECT_NAMES;
+static int hf_SAPDIAG_SUPPORT_BIT_CONTAINER_TYPE;
+static int hf_SAPDIAG_SUPPORT_BIT_DLGH_FLAGS;
+static int hf_SAPDIAG_SUPPORT_BIT_APPL_MNU;
+static int hf_SAPDIAG_SUPPORT_BIT_MESSAGE_INFO;
+static int hf_SAPDIAG_SUPPORT_BIT_MESDUM_FLAG1;
+static int hf_SAPDIAG_SUPPORT_BIT_TABSEL_ATTRIB;
+static int hf_SAPDIAG_SUPPORT_BIT_GUIAPI;
+static int hf_SAPDIAG_SUPPORT_BIT_NOGRAPH;
+static int hf_SAPDIAG_SUPPORT_BIT_NOMESSAGES;
+static int hf_SAPDIAG_SUPPORT_BIT_NORABAX;
+static int hf_SAPDIAG_SUPPORT_BIT_NOSYSMSG;
+static int hf_SAPDIAG_SUPPORT_BIT_NOSAPSCRIPT;
+static int hf_SAPDIAG_SUPPORT_BIT_NORFC;
+static int hf_SAPDIAG_SUPPORT_BIT_NEW_BSD_JUSTRIGHT;
+static int hf_SAPDIAG_SUPPORT_BIT_MESSAGE_VARS;
+static int hf_SAPDIAG_SUPPORT_BIT_OCX_SUPPORT;
+static int hf_SAPDIAG_SUPPORT_BIT_SCROLL_INFOS;
+static int hf_SAPDIAG_SUPPORT_BIT_TABLE_SIZE_OK;
+static int hf_SAPDIAG_SUPPORT_BIT_MESSAGE_INFO2;
+static int hf_SAPDIAG_SUPPORT_BIT_VARINFO_OKCODE;
+static int hf_SAPDIAG_SUPPORT_BIT_CURR_TCODE;
+static int hf_SAPDIAG_SUPPORT_BIT_CONN_WSIZE;
+static int hf_SAPDIAG_SUPPORT_BIT_PUSHBUTTON_2;
+static int hf_SAPDIAG_SUPPORT_BIT_TABSTRIP;
+static int hf_SAPDIAG_SUPPORT_BIT_UNKNOWN_1;
+static int hf_SAPDIAG_SUPPORT_BIT_TABSCROLL_INFOS;
+static int hf_SAPDIAG_SUPPORT_BIT_TABLE_FIELD_NAMES;
+static int hf_SAPDIAG_SUPPORT_BIT_NEW_MODE_REQUEST;
+static int hf_SAPDIAG_SUPPORT_BIT_RFCBLOB_DIAG_PARSER;
+static int hf_SAPDIAG_SUPPORT_BIT_MULTI_LOGIN_USER;
+static int hf_SAPDIAG_SUPPORT_BIT_CONTROL_CONTAINER;
+static int hf_SAPDIAG_SUPPORT_BIT_APPTOOLBAR_FIXED;
+static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_USER_CHECKED;
+static int hf_SAPDIAG_SUPPORT_BIT_NEED_STDDYNPRO;
+static int hf_SAPDIAG_SUPPORT_BIT_TYPE_SERVER;
+static int hf_SAPDIAG_SUPPORT_BIT_COMBOBOX;
+static int hf_SAPDIAG_SUPPORT_BIT_INPUT_REQUIRED;
+static int hf_SAPDIAG_SUPPORT_BIT_ISO_LANGUAGE;
+static int hf_SAPDIAG_SUPPORT_BIT_COMBOBOX_TABLE;
+static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_FLAGS;
+static int hf_SAPDIAG_SUPPORT_BIT_CHECKRADIO_EVENTS;
+static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_USERID;
+static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_ROLLCOUNT;
+static int hf_SAPDIAG_SUPPORT_BIT_USER_TURNTIME2;
+static int hf_SAPDIAG_SUPPORT_BIT_NUM_FIELD;
+static int hf_SAPDIAG_SUPPORT_BIT_WIN16;
+static int hf_SAPDIAG_SUPPORT_BIT_CONTEXT_MENU;
+static int hf_SAPDIAG_SUPPORT_BIT_SCROLLABLE_TABSTRIP_PAGE;
+static int hf_SAPDIAG_SUPPORT_BIT_EVENT_DESCRIPTION;
+static int hf_SAPDIAG_SUPPORT_BIT_LABEL_OWNER;
+static int hf_SAPDIAG_SUPPORT_BIT_CLICKABLE_FIELD;
+static int hf_SAPDIAG_SUPPORT_BIT_PROPERTY_BAG;
+static int hf_SAPDIAG_SUPPORT_BIT_UNUSED_1;
+static int hf_SAPDIAG_SUPPORT_BIT_TABLE_ROW_REFERENCES_2;
+static int hf_SAPDIAG_SUPPORT_BIT_PROPFONT_VALID;
+static int hf_SAPDIAG_SUPPORT_BIT_VARINFO_CONTAINER;
+static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_IMODEUUID;
+static int hf_SAPDIAG_SUPPORT_BIT_NOTGUI;
+static int hf_SAPDIAG_SUPPORT_BIT_WAN;
+static int hf_SAPDIAG_SUPPORT_BIT_XML_BLOBS;
+static int hf_SAPDIAG_SUPPORT_BIT_RFC_QUEUE;
+static int hf_SAPDIAG_SUPPORT_BIT_RFC_COMPRESS;
+static int hf_SAPDIAG_SUPPORT_BIT_JAVA_BEANS;
+static int hf_SAPDIAG_SUPPORT_BIT_DPLOADONDEMAND;
+static int hf_SAPDIAG_SUPPORT_BIT_CTL_PROPCACHE;
+static int hf_SAPDIAG_SUPPORT_BIT_ENJOY_IMODEUUID;
+static int hf_SAPDIAG_SUPPORT_BIT_RFC_ASYNC_BLOB;
+static int hf_SAPDIAG_SUPPORT_BIT_KEEP_SCROLLPOS;
+static int hf_SAPDIAG_SUPPORT_BIT_UNUSED_2;
+static int hf_SAPDIAG_SUPPORT_BIT_UNUSED_3;
+static int hf_SAPDIAG_SUPPORT_BIT_XML_PROPERTIES;
+static int hf_SAPDIAG_SUPPORT_BIT_UNUSED_4;
+static int hf_SAPDIAG_SUPPORT_BIT_HEX_FIELD;
+static int hf_SAPDIAG_SUPPORT_BIT_HAS_CACHE;
+static int hf_SAPDIAG_SUPPORT_BIT_XML_PROP_TABLE;
+static int hf_SAPDIAG_SUPPORT_BIT_UNUSED_5;
+static int hf_SAPDIAG_SUPPORT_BIT_ENJOY_IMODEUUID2;
+static int hf_SAPDIAG_SUPPORT_BIT_ITS;
+static int hf_SAPDIAG_SUPPORT_BIT_NO_EASYACCESS;
+static int hf_SAPDIAG_SUPPORT_BIT_PROPERTYPUMP;
+static int hf_SAPDIAG_SUPPORT_BIT_COOKIE;
+static int hf_SAPDIAG_SUPPORT_BIT_UNUSED_6;
+static int hf_SAPDIAG_SUPPORT_BIT_SUPPBIT_AREA_SIZE;
+static int hf_SAPDIAG_SUPPORT_BIT_DPLOADONDEMAND_WRITE;
+static int hf_SAPDIAG_SUPPORT_BIT_CONTROL_FOCUS;
+static int hf_SAPDIAG_SUPPORT_BIT_ENTRY_HISTORY;
+static int hf_SAPDIAG_SUPPORT_BIT_AUTO_CODEPAGE;
+static int hf_SAPDIAG_SUPPORT_BIT_CACHED_VSETS;
+static int hf_SAPDIAG_SUPPORT_BIT_EMERGENCY_REPAIR;
+static int hf_SAPDIAG_SUPPORT_BIT_AREA2FRONT;
+static int hf_SAPDIAG_SUPPORT_BIT_SCROLLBAR_WIDTH;
+static int hf_SAPDIAG_SUPPORT_BIT_AUTORESIZE;
+static int hf_SAPDIAG_SUPPORT_BIT_EDIT_VARLEN;
+static int hf_SAPDIAG_SUPPORT_BIT_WORKPLACE;
+static int hf_SAPDIAG_SUPPORT_BIT_PRINTDATA;
+static int hf_SAPDIAG_SUPPORT_BIT_UNKNOWN_2;
+static int hf_SAPDIAG_SUPPORT_BIT_SINGLE_SESSION;
+static int hf_SAPDIAG_SUPPORT_BIT_NOTIFY_NEWMODE;
+static int hf_SAPDIAG_SUPPORT_BIT_TOOLBAR_HEIGHT;
+static int hf_SAPDIAG_SUPPORT_BIT_XMLPROP_CONTAINER;
+static int hf_SAPDIAG_SUPPORT_BIT_XMLPROP_DYNPRO;
+static int hf_SAPDIAG_SUPPORT_BIT_DP_HTTP_PUT;
+static int hf_SAPDIAG_SUPPORT_BIT_DYNAMIC_PASSPORT;
+static int hf_SAPDIAG_SUPPORT_BIT_WEBGUI;
+static int hf_SAPDIAG_SUPPORT_BIT_WEBGUI_HELPMODE;
+static int hf_SAPDIAG_SUPPORT_BIT_CONTROL_FOCUS_ON_LIST;
+static int hf_SAPDIAG_SUPPORT_BIT_CBU_RBUDUMMY_2;
+static int hf_SAPDIAG_SUPPORT_BIT_EOKDUMMY_1;
+static int hf_SAPDIAG_SUPPORT_BIT_GUI_USER_SCRIPTING;
+static int hf_SAPDIAG_SUPPORT_BIT_SLC;
+static int hf_SAPDIAG_SUPPORT_BIT_ACCESSIBILITY;
+static int hf_SAPDIAG_SUPPORT_BIT_ECATT;
+static int hf_SAPDIAG_SUPPORT_BIT_ENJOY_IMODEUUID3;
+static int hf_SAPDIAG_SUPPORT_BIT_ENABLE_UTF8;
+static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_AUTOLOGOUT_TIME;
+static int hf_SAPDIAG_SUPPORT_BIT_VARINFO_ICON_TITLE_LIST;
+static int hf_SAPDIAG_SUPPORT_BIT_ENABLE_UTF16BE;
+static int hf_SAPDIAG_SUPPORT_BIT_ENABLE_UTF16LE;
+static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_CODEPAGE_APP;
+static int hf_SAPDIAG_SUPPORT_BIT_ENABLE_APPL4;
+static int hf_SAPDIAG_SUPPORT_BIT_GUIPATCHLEVEL;
+static int hf_SAPDIAG_SUPPORT_BIT_CBURBU_NEW_STATE;
+static int hf_SAPDIAG_SUPPORT_BIT_BINARY_EVENTID;
+static int hf_SAPDIAG_SUPPORT_BIT_GUI_THEME;
+static int hf_SAPDIAG_SUPPORT_BIT_TOP_WINDOW;
+static int hf_SAPDIAG_SUPPORT_BIT_EVENT_DESCRIPTION_1;
+static int hf_SAPDIAG_SUPPORT_BIT_SPLITTER;
+static int hf_SAPDIAG_SUPPORT_BIT_VALUE_4_HISTORY;
+static int hf_SAPDIAG_SUPPORT_BIT_ACC_LIST;
+static int hf_SAPDIAG_SUPPORT_BIT_GUI_USER_SCRIPTING_INFO;
+static int hf_SAPDIAG_SUPPORT_BIT_TEXTEDIT_STREAM;
+static int hf_SAPDIAG_SUPPORT_BIT_DYNT_NOFOCUS;
+static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_CODEPAGE_APP_1;
+static int hf_SAPDIAG_SUPPORT_BIT_FRAME_1;
+static int hf_SAPDIAG_SUPPORT_BIT_TICKET4GUI;
+static int hf_SAPDIAG_SUPPORT_BIT_ACC_LIST_PROPS;
+static int hf_SAPDIAG_SUPPORT_BIT_TABSEL_ATTRIB_INPUT;
+static int hf_SAPDIAG_SUPPORT_BIT_DEFAULT_TOOLTIP;
+static int hf_SAPDIAG_SUPPORT_BIT_XML_PROP_TABLE_2;
+static int hf_SAPDIAG_SUPPORT_BIT_CBU_RBUDUMMY_3;
+static int hf_SAPDIAG_SUPPORT_BIT_CELLINFO;
+static int hf_SAPDIAG_SUPPORT_BIT_CONTROL_FOCUS_ON_LIST_2;
+static int hf_SAPDIAG_SUPPORT_BIT_TABLE_COLUMNWIDTH_INPUT;
+static int hf_SAPDIAG_SUPPORT_BIT_ITS_PLUGIN;
+static int hf_SAPDIAG_SUPPORT_BIT_OBJECT_NAMES_4_LOGIN_PROCESS;
+static int hf_SAPDIAG_SUPPORT_BIT_RFC_SERVER_4_GUI;
+static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_FLAGS_2;
+static int hf_SAPDIAG_SUPPORT_BIT_RCUI;
+static int hf_SAPDIAG_SUPPORT_BIT_MENUENTRY_WITH_FCODE;
+static int hf_SAPDIAG_SUPPORT_BIT_WEBSAPCONSOLE;
+static int hf_SAPDIAG_SUPPORT_BIT_R3INFO_KERNEL_VERSION;
+static int hf_SAPDIAG_SUPPORT_BIT_VARINFO_CONTAINER_LOOP;
+static int hf_SAPDIAG_SUPPORT_BIT_EOKDUMMY_2;
+static int hf_SAPDIAG_SUPPORT_BIT_MESSAGE_INFO3;
+static int hf_SAPDIAG_SUPPORT_BIT_SBA2;
+static int hf_SAPDIAG_SUPPORT_BIT_MAINAREA_SIZE;
+static int hf_SAPDIAG_SUPPORT_BIT_GUIPATCHLEVEL_2;
+static int hf_SAPDIAG_SUPPORT_BIT_DISPLAY_SIZE;
+static int hf_SAPDIAG_SUPPORT_BIT_GUI_PACKET;
+static int hf_SAPDIAG_SUPPORT_BIT_DIALOG_STEP_NUMBER;
+static int hf_SAPDIAG_SUPPORT_BIT_TC_KEEP_SCROLL_POSITION;
+static int hf_SAPDIAG_SUPPORT_BIT_MESSAGE_SERVICE_REQUEST;
+static int hf_SAPDIAG_SUPPORT_BIT_DYNT_FOCUS_FRAME;
+static int hf_SAPDIAG_SUPPORT_BIT_MAX_STRING_LEN;
+static int hf_SAPDIAG_SUPPORT_BIT_VARINFO_CONTAINER_1;
+static int hf_SAPDIAG_SUPPORT_BIT_STD_TOOLBAR_ITEMS;
+static int hf_SAPDIAG_SUPPORT_BIT_XMLPROP_LIST_DYNPRO;
+static int hf_SAPDIAG_SUPPORT_BIT_TRACE_GUI_CONNECT;
+static int hf_SAPDIAG_SUPPORT_BIT_LIST_FULLWIDTH;
+static int hf_SAPDIAG_SUPPORT_BIT_ALLWAYS_SEND_CLIENT;
+static int hf_SAPDIAG_SUPPORT_BIT_UNKNOWN_3;
+static int hf_SAPDIAG_SUPPORT_BIT_GUI_SIGNATURE_COLOR;
+static int hf_SAPDIAG_SUPPORT_BIT_MAX_WSIZE;
+static int hf_SAPDIAG_SUPPORT_BIT_SAP_PERSONAS;
+static int hf_SAPDIAG_SUPPORT_BIT_IDA_ALV;
+static int hf_SAPDIAG_SUPPORT_BIT_IDA_ALV_FRAGMENTS;
+static int hf_SAPDIAG_SUPPORT_BIT_AMC;
+static int hf_SAPDIAG_SUPPORT_BIT_EXTMODE_FONT_METRIC;
+static int hf_SAPDIAG_SUPPORT_BIT_GROUPBOX;
+static int hf_SAPDIAG_SUPPORT_BIT_AGI_ID_TS_BUTTON;
+static int hf_SAPDIAG_SUPPORT_BIT_NO_FOCUS_ON_LIST;
+static int hf_SAPDIAG_SUPPORT_BIT_FIORI_MODE;
+static int hf_SAPDIAG_SUPPORT_BIT_CONNECT_CHECK_DONE;
+static int hf_SAPDIAG_SUPPORT_BIT_MSGINFO_WITH_CODEPAGE;
+static int hf_SAPDIAG_SUPPORT_BIT_AGI_ID;
+static int hf_SAPDIAG_SUPPORT_BIT_AGI_ID_TC;
+static int hf_SAPDIAG_SUPPORT_BIT_FIORI_TOOLBARS;
+static int hf_SAPDIAG_SUPPORT_BIT_OBJECT_NAMES_ENFORCE;
+static int hf_SAPDIAG_SUPPORT_BIT_MESDUMMY_FLAGS_2_3;
+static int hf_SAPDIAG_SUPPORT_BIT_NWBC;
+static int hf_SAPDIAG_SUPPORT_BIT_CONTAINER_LIST;
+static int hf_SAPDIAG_SUPPORT_BIT_GUI_SYSTEM_COLOR;
+static int hf_SAPDIAG_SUPPORT_BIT_GROUPBOX_WITHOUT_BOTTOMLINE;
+
+static gint ett_sapdiag;
 
 /* Expert info */
-static expert_field ei_sapdiag_item_unknown = EI_INIT;
-static expert_field ei_sapdiag_item_partial = EI_INIT;
-static expert_field ei_sapdiag_item_unknown_length = EI_INIT;
-static expert_field ei_sapdiag_item_offset_invalid = EI_INIT;
-static expert_field ei_sapdiag_item_length_invalid = EI_INIT;
-static expert_field ei_sapdiag_atom_item_unknown = EI_INIT;
-static expert_field ei_sapdiag_atom_item_partial = EI_INIT;
-static expert_field ei_sapdiag_atom_item_malformed = EI_INIT;
-static expert_field ei_sapdiag_dynt_focus_more_cont_ids = EI_INIT;
-static expert_field ei_sapdiag_password_field = EI_INIT;
+static expert_field ei_sapdiag_item_unknown;
+static expert_field ei_sapdiag_item_partial;
+static expert_field ei_sapdiag_item_unknown_length;
+static expert_field ei_sapdiag_item_offset_invalid;
+static expert_field ei_sapdiag_item_length_invalid;
+static expert_field ei_sapdiag_atom_item_unknown;
+static expert_field ei_sapdiag_atom_item_partial;
+static expert_field ei_sapdiag_atom_item_malformed;
+static expert_field ei_sapdiag_dynt_focus_more_cont_ids;
+static expert_field ei_sapdiag_password_field;
 
 /* Global RFC dissection preference */
 static gboolean global_sapdiag_rfc_dissection = TRUE;
diff --git a/epan/dissectors/packet-sapenqueue.c b/epan/dissectors/packet-sapenqueue.c
index 5978622f5b..76199c7771 100644
--- a/epan/dissectors/packet-sapenqueue.c
+++ b/epan/dissectors/packet-sapenqueue.c
@@ -119,59 +119,59 @@ static const value_string sapenqueue_conn_admin_param_vals[] = {
 	{  0, NULL }
 };
 
-static int proto_sapenqueue = -1;
-
-static int hf_sapenqueue_magic = -1;
-static int hf_sapenqueue_id = -1;
-static int hf_sapenqueue_length = -1;
-static int hf_sapenqueue_length_frag = -1;
-static int hf_sapenqueue_dest = -1;
-static int hf_sapenqueue_conn_admin_opcode = -1;
-static int hf_sapenqueue_more_frags = -1;
-static int hf_sapenqueue_type = -1;
-
-static int hf_sapenqueue_server_admin = -1;
-static int hf_sapenqueue_server_admin_eyecatcher = -1;
-static int hf_sapenqueue_server_admin_version = -1;
-static int hf_sapenqueue_server_admin_flag = -1;
-static int hf_sapenqueue_server_admin_length = -1;
-static int hf_sapenqueue_server_admin_opcode = -1;
-static int hf_sapenqueue_server_admin_flags = -1;
-static int hf_sapenqueue_server_admin_rc = -1;
-static int hf_sapenqueue_server_admin_value = -1;
-
-static int hf_sapenqueue_server_admin_trace_request = -1;
-static int hf_sapenqueue_server_admin_trace_protocol_version = -1;
-static int hf_sapenqueue_server_admin_trace_action = -1;
-static int hf_sapenqueue_server_admin_trace_limit = -1;
-static int hf_sapenqueue_server_admin_trace_thread = -1;
-static int hf_sapenqueue_server_admin_trace_level = -1;
-static int hf_sapenqueue_server_admin_trace_logging = -1;
-static int hf_sapenqueue_server_admin_trace_max_file_size = -1;
-static int hf_sapenqueue_server_admin_trace_nopatterns = -1;
-static int hf_sapenqueue_server_admin_trace_eyecatcher = -1;
-static int hf_sapenqueue_server_admin_trace_patterns = -1;
-static int hf_sapenqueue_server_admin_trace_unknown = -1;
-
-static int hf_sapenqueue_server_admin_trace_pattern = -1;
-static int hf_sapenqueue_server_admin_trace_pattern_len = -1;
-static int hf_sapenqueue_server_admin_trace_pattern_value = -1;
-
-static int hf_sapenqueue_conn_admin = -1;
-static int hf_sapenqueue_conn_admin_params_count = -1;
-static int hf_sapenqueue_conn_admin_params = -1;
-static int hf_sapenqueue_conn_admin_param = -1;
-static int hf_sapenqueue_conn_admin_param_id = -1;
-static int hf_sapenqueue_conn_admin_param_len = -1;
-static int hf_sapenqueue_conn_admin_param_value = -1;
-static int hf_sapenqueue_conn_admin_param_name = -1;
-
-static gint ett_sapenqueue = -1;
+static int proto_sapenqueue;
+
+static int hf_sapenqueue_magic;
+static int hf_sapenqueue_id;
+static int hf_sapenqueue_length;
+static int hf_sapenqueue_length_frag;
+static int hf_sapenqueue_dest;
+static int hf_sapenqueue_conn_admin_opcode;
+static int hf_sapenqueue_more_frags;
+static int hf_sapenqueue_type;
+
+static int hf_sapenqueue_server_admin;
+static int hf_sapenqueue_server_admin_eyecatcher;
+static int hf_sapenqueue_server_admin_version;
+static int hf_sapenqueue_server_admin_flag;
+static int hf_sapenqueue_server_admin_length;
+static int hf_sapenqueue_server_admin_opcode;
+static int hf_sapenqueue_server_admin_flags;
+static int hf_sapenqueue_server_admin_rc;
+static int hf_sapenqueue_server_admin_value;
+
+static int hf_sapenqueue_server_admin_trace_request;
+static int hf_sapenqueue_server_admin_trace_protocol_version;
+static int hf_sapenqueue_server_admin_trace_action;
+static int hf_sapenqueue_server_admin_trace_limit;
+static int hf_sapenqueue_server_admin_trace_thread;
+static int hf_sapenqueue_server_admin_trace_level;
+static int hf_sapenqueue_server_admin_trace_logging;
+static int hf_sapenqueue_server_admin_trace_max_file_size;
+static int hf_sapenqueue_server_admin_trace_nopatterns;
+static int hf_sapenqueue_server_admin_trace_eyecatcher;
+static int hf_sapenqueue_server_admin_trace_patterns;
+static int hf_sapenqueue_server_admin_trace_unknown;
+
+static int hf_sapenqueue_server_admin_trace_pattern;
+static int hf_sapenqueue_server_admin_trace_pattern_len;
+static int hf_sapenqueue_server_admin_trace_pattern_value;
+
+static int hf_sapenqueue_conn_admin;
+static int hf_sapenqueue_conn_admin_params_count;
+static int hf_sapenqueue_conn_admin_params;
+static int hf_sapenqueue_conn_admin_param;
+static int hf_sapenqueue_conn_admin_param_id;
+static int hf_sapenqueue_conn_admin_param_len;
+static int hf_sapenqueue_conn_admin_param_value;
+static int hf_sapenqueue_conn_admin_param_name;
+
+static gint ett_sapenqueue;
 
 /* Expert info */
-static expert_field ei_sapenqueue_pattern_invalid_length= EI_INIT;
-static expert_field ei_sapenqueue_support_invalid_offset = EI_INIT;
-static expert_field ei_sapenqueue_support_invalid_length = EI_INIT;
+static expert_field ei_sapenqueue_pattern_invalid_length;
+static expert_field ei_sapenqueue_support_invalid_offset;
+static expert_field ei_sapenqueue_support_invalid_length;
 
 /* Protocol handle */
 static dissector_handle_t sapenqueue_handle;
diff --git a/epan/dissectors/packet-saphdb.c b/epan/dissectors/packet-saphdb.c
index 9693555a12..02f42a1ba1 100644
--- a/epan/dissectors/packet-saphdb.c
+++ b/epan/dissectors/packet-saphdb.c
@@ -453,91 +453,91 @@ static const option_part_definition saphdb_part_lob_flags_vals[] = {
 };
 
 
-static int proto_saphdb = -1;
+static int proto_saphdb;
 
 /* SAP HDB Initialization items */
-static int hf_saphdb_initialization_request = -1;
-static int hf_saphdb_initialization_reply = -1;
-static int hf_saphdb_initialization_reply_product_version_major = -1;
-static int hf_saphdb_initialization_reply_product_version_minor = -1;
-static int hf_saphdb_initialization_reply_protocol_version_major = -1;
-static int hf_saphdb_initialization_reply_protocol_version_minor = -1;
+static int hf_saphdb_initialization_request;
+static int hf_saphdb_initialization_reply;
+static int hf_saphdb_initialization_reply_product_version_major;
+static int hf_saphdb_initialization_reply_product_version_minor;
+static int hf_saphdb_initialization_reply_protocol_version_major;
+static int hf_saphdb_initialization_reply_protocol_version_minor;
 
 /* SAP HDB Message Header items */
-static int hf_saphdb_message_header = -1;
-static int hf_saphdb_message_header_sessionid = -1;
-static int hf_saphdb_message_header_packetcount = -1;
-static int hf_saphdb_message_header_varpartlength = -1;
-static int hf_saphdb_message_header_varpartsize = -1;
-static int hf_saphdb_message_header_noofsegm = -1;
-static int hf_saphdb_message_header_packetoptions = -1;
-static int hf_saphdb_message_header_compressionvarpartlength = -1;
-static int hf_saphdb_message_header_reserved = -1;
+static int hf_saphdb_message_header;
+static int hf_saphdb_message_header_sessionid;
+static int hf_saphdb_message_header_packetcount;
+static int hf_saphdb_message_header_varpartlength;
+static int hf_saphdb_message_header_varpartsize;
+static int hf_saphdb_message_header_noofsegm;
+static int hf_saphdb_message_header_packetoptions;
+static int hf_saphdb_message_header_compressionvarpartlength;
+static int hf_saphdb_message_header_reserved;
 /* SAP HDB Message Buffer items */
-static int hf_saphdb_message_buffer = -1;
-static int hf_saphdb_compressed_buffer = -1;
+static int hf_saphdb_message_buffer;
+static int hf_saphdb_compressed_buffer;
 
 /* SAP HDB Segment items */
-static int hf_saphdb_segment = -1;
-static int hf_saphdb_segment_segmentlength = -1;
-static int hf_saphdb_segment_segmentofs = -1;
-static int hf_saphdb_segment_noofparts = -1;
-static int hf_saphdb_segment_segmentno = -1;
-static int hf_saphdb_segment_segmentkind = -1;
-static int hf_saphdb_segment_messagetype = -1;
-static int hf_saphdb_segment_commit = -1;
-static int hf_saphdb_segment_commandoptions = -1;
-static int hf_saphdb_segment_functioncode = -1;
-static int hf_saphdb_segment_reserved = -1;
+static int hf_saphdb_segment;
+static int hf_saphdb_segment_segmentlength;
+static int hf_saphdb_segment_segmentofs;
+static int hf_saphdb_segment_noofparts;
+static int hf_saphdb_segment_segmentno;
+static int hf_saphdb_segment_segmentkind;
+static int hf_saphdb_segment_messagetype;
+static int hf_saphdb_segment_commit;
+static int hf_saphdb_segment_commandoptions;
+static int hf_saphdb_segment_functioncode;
+static int hf_saphdb_segment_reserved;
 /* SAP HDB Segment Buffer items */
-static int hf_saphdb_segment_buffer = -1;
+static int hf_saphdb_segment_buffer;
 
 /* SAP HDB Part items */
-static int hf_saphdb_part = -1;
-static int hf_saphdb_part_partkind = -1;
-static int hf_saphdb_part_partattributes = -1;
-static int hf_saphdb_part_argumentcount = -1;
-static int hf_saphdb_part_bigargumentcount = -1;
-static int hf_saphdb_part_bufferlength = -1;
-static int hf_saphdb_part_buffersize = -1;
+static int hf_saphdb_part;
+static int hf_saphdb_part_partkind;
+static int hf_saphdb_part_partattributes;
+static int hf_saphdb_part_argumentcount;
+static int hf_saphdb_part_bigargumentcount;
+static int hf_saphdb_part_bufferlength;
+static int hf_saphdb_part_buffersize;
 /* SAP HDB Part Buffer items */
-static int hf_saphdb_part_buffer = -1;
+static int hf_saphdb_part_buffer;
 
 /* SAP HDB Part Buffer Option Part Data items */
-static int hf_saphdb_part_option_argcount = -1;
-static int hf_saphdb_part_option_name = -1;
-static int hf_saphdb_part_option_type = -1;
-static int hf_saphdb_part_option_length = -1;
-static int hf_saphdb_part_option_value = -1;
-static int hf_saphdb_part_option_value_bool = -1;
-static int hf_saphdb_part_option_value_byte = -1;
-static int hf_saphdb_part_option_value_short = -1;
-static int hf_saphdb_part_option_value_int = -1;
-static int hf_saphdb_part_option_value_bigint = -1;
-static int hf_saphdb_part_option_value_string = -1;
-static int hf_saphdb_part_option_value_double = -1;
+static int hf_saphdb_part_option_argcount;
+static int hf_saphdb_part_option_name;
+static int hf_saphdb_part_option_type;
+static int hf_saphdb_part_option_length;
+static int hf_saphdb_part_option_value;
+static int hf_saphdb_part_option_value_bool;
+static int hf_saphdb_part_option_value_byte;
+static int hf_saphdb_part_option_value_short;
+static int hf_saphdb_part_option_value_int;
+static int hf_saphdb_part_option_value_bigint;
+static int hf_saphdb_part_option_value_string;
+static int hf_saphdb_part_option_value_double;
 
 /* SAP HDB Part Buffer COMMAND items */
-static int hf_saphdb_part_command = -1;
+static int hf_saphdb_part_command;
 
 /* SAP HDB Part Buffer ERROR items */
-static int hf_saphdb_part_error_code = -1;
-static int hf_saphdb_part_error_position = -1;
-static int hf_saphdb_part_error_text_length = -1;
-static int hf_saphdb_part_error_level = -1;
-static int hf_saphdb_part_error_sqlstate = -1;
-static int hf_saphdb_part_error_text = -1;
+static int hf_saphdb_part_error_code;
+static int hf_saphdb_part_error_position;
+static int hf_saphdb_part_error_text_length;
+static int hf_saphdb_part_error_level;
+static int hf_saphdb_part_error_sqlstate;
+static int hf_saphdb_part_error_text;
 
 /* SAP HDB Part Buffer AUTHENTICATE items */
-static int hf_saphdb_part_authentication_field_count = -1;
-static int hf_saphdb_part_authentication_field_length = -1;
-static int hf_saphdb_part_authentication_field_value = -1;
+static int hf_saphdb_part_authentication_field_count;
+static int hf_saphdb_part_authentication_field_length;
+static int hf_saphdb_part_authentication_field_value;
 
 /* SAP HDB Part Buffer CLIENTID items */
-static int hf_saphdb_part_clientid = -1;
+static int hf_saphdb_part_clientid;
 
 
-static gint ett_saphdb = -1;
+static gint ett_saphdb;
 
 
 /* Global port preference */
@@ -545,14 +545,14 @@ static range_t *global_saphdb_port_range;
 
 
 /* Expert info */
-static expert_field ei_saphdb_compressed_unknown = EI_INIT;
-static expert_field ei_saphdb_option_part_unknown = EI_INIT;
-static expert_field ei_saphdb_segments_incorrect_order = EI_INIT;
-static expert_field ei_saphdb_segments_number_incorrect = EI_INIT;
-static expert_field ei_saphdb_segment_length = EI_INIT;
-static expert_field ei_saphdb_buffer_length = EI_INIT;
-static expert_field ei_saphdb_parts_number_incorrect = EI_INIT;
-static expert_field ei_saphdb_varpartlenght_incorrect = EI_INIT;
+static expert_field ei_saphdb_compressed_unknown;
+static expert_field ei_saphdb_option_part_unknown;
+static expert_field ei_saphdb_segments_incorrect_order;
+static expert_field ei_saphdb_segments_number_incorrect;
+static expert_field ei_saphdb_segment_length;
+static expert_field ei_saphdb_buffer_length;
+static expert_field ei_saphdb_parts_number_incorrect;
+static expert_field ei_saphdb_varpartlenght_incorrect;
 
 
 /* Global highlight preference */
diff --git a/epan/dissectors/packet-sapigs.c b/epan/dissectors/packet-sapigs.c
index 010719e2ae..c942f9e7fb 100755
--- a/epan/dissectors/packet-sapigs.c
+++ b/epan/dissectors/packet-sapigs.c
@@ -71,45 +71,45 @@ static const value_string sapigs_function_lst[] = {
 	{ 0, NULL}
 };
 
-static int proto_sapigs = -1;
+static int proto_sapigs;
 
 /* Headers */
-static int hf_sapigs_function = -1;
-static int hf_sapigs_listener = -1;
-static int hf_sapigs_hostname = -1;
-static int hf_sapigs_id = -1;
-static int hf_sapigs_padd1 = -1;
-static int hf_sapigs_flag1 = -1;
-static int hf_sapigs_padd2 = -1;
-static int hf_sapigs_flag2 = -1;
-static int hf_sapigs_padd3 = -1;
+static int hf_sapigs_function;
+static int hf_sapigs_listener;
+static int hf_sapigs_hostname;
+static int hf_sapigs_id;
+static int hf_sapigs_padd1;
+static int hf_sapigs_flag1;
+static int hf_sapigs_padd2;
+static int hf_sapigs_flag2;
+static int hf_sapigs_padd3;
 
 /* Data */
-static int hf_sapigs_eye_catcher = -1;
-static int hf_sapigs_padd4 = -1;
-static int hf_sapigs_codepage = -1;
-static int hf_sapigs_offset_data = -1;
-static int hf_sapigs_data_size = -1;
-static int hf_sapigs_data = -1;
+static int hf_sapigs_eye_catcher;
+static int hf_sapigs_padd4;
+static int hf_sapigs_codepage;
+static int hf_sapigs_offset_data;
+static int hf_sapigs_data_size;
+static int hf_sapigs_data;
 
 /* Table definition */
-static int hf_sapigs_tables = -1;
-static int hf_sapigs_table_version = -1;
-static int hf_sapigs_table_name = -1;
-static int hf_sapigs_table_line_number = -1;
-static int hf_sapigs_table_width = -1;
-static int hf_sapigs_table_column_name = -1;
-static int hf_sapigs_table_column_number = -1;
-static int hf_sapigs_table_column_width = -1;
+static int hf_sapigs_tables;
+static int hf_sapigs_table_version;
+static int hf_sapigs_table_name;
+static int hf_sapigs_table_line_number;
+static int hf_sapigs_table_width;
+static int hf_sapigs_table_column_name;
+static int hf_sapigs_table_column_number;
+static int hf_sapigs_table_column_width;
 
 /* Others */
-static int hf_sapigs_portwatcher = -1;
-static int hf_sapigs_portwatcher_version = -1;
-static int hf_sapigs_portwatcher_info = -1;
-static int hf_sapigs_interpreter = -1;
-static int hf_sapigs_chart_config = -1;
+static int hf_sapigs_portwatcher;
+static int hf_sapigs_portwatcher_version;
+static int hf_sapigs_portwatcher_info;
+static int hf_sapigs_interpreter;
+static int hf_sapigs_chart_config;
 
-static gint ett_sapigs = -1;
+static gint ett_sapigs;
 
 /* Global port preference */
 static range_t *global_sapigs_port_range;
diff --git a/epan/dissectors/packet-sapms.c b/epan/dissectors/packet-sapms.c
index 22ac15d82e..42ca140bce 100644
--- a/epan/dissectors/packet-sapms.c
+++ b/epan/dissectors/packet-sapms.c
@@ -478,171 +478,171 @@ static const value_string sapms_server_lst_status_vals[] = {
 #define SAPMS_MSG_TYPE_ATP	0x40
 #define SAPMS_MSG_TYPE_ICM	0x80
 
-static int proto_sapms = -1;
-
-static int hf_sapms_eyecatcher = -1;
-static int hf_sapms_version = -1;
-static int hf_sapms_errorno = -1;
-static int hf_sapms_toname = -1;
-static int hf_sapms_msgtypes = -1;
-static int hf_sapms_msgtypes_dia = -1;
-static int hf_sapms_msgtypes_upd = -1;
-static int hf_sapms_msgtypes_enq = -1;
-static int hf_sapms_msgtypes_btc = -1;
-static int hf_sapms_msgtypes_spo = -1;
-static int hf_sapms_msgtypes_up2 = -1;
-static int hf_sapms_msgtypes_atp = -1;
-static int hf_sapms_msgtypes_icm = -1;
-static int hf_sapms_domain = -1;
-static int hf_sapms_reserved = -1;
-static int hf_sapms_key = -1;
-static int hf_sapms_flag = -1;
-static int hf_sapms_iflag = -1;
-static int hf_sapms_fromname = -1;
-static int hf_sapms_diagport = -1;
-
-static int hf_sapms_dp_adm_dp_version = -1;
-
-static int hf_sapms_adm_eyecatcher = -1;
-static int hf_sapms_adm_version = -1;
-static int hf_sapms_adm_msgtype = -1;
-static int hf_sapms_adm_recsize = -1;
-static int hf_sapms_adm_recno = -1;
-
-static int hf_sapms_adm_record = -1;
-static int hf_sapms_adm_record_opcode = -1;
-static int hf_sapms_adm_record_serial_number = -1;
-static int hf_sapms_adm_record_executed = -1;
-static int hf_sapms_adm_record_errorno = -1;
-static int hf_sapms_adm_record_value = -1;
-
-static int hf_sapms_adm_parameter = -1;
-
-static int hf_sapms_adm_rzl_strg_type = -1;
-static int hf_sapms_adm_rzl_strg_name = -1;
-static int hf_sapms_adm_rzl_strg_value = -1;
-static int hf_sapms_adm_rzl_strg_value_integer = -1;
-static int hf_sapms_adm_rzl_strg_uptime = -1;
-static int hf_sapms_adm_rzl_strg_delay = -1;
-static int hf_sapms_adm_rzl_strg_users  = -1;
-static int hf_sapms_adm_rzl_strg_quality = -1;
-
-static int hf_sapms_opcode = -1;
-static int hf_sapms_opcode_error = -1;
-static int hf_sapms_opcode_version = -1;
-static int hf_sapms_opcode_charset = -1;
-static int hf_sapms_opcode_value = -1;
-
-static int hf_sapms_property_client = -1;
-static int hf_sapms_property_id = -1;
-static int hf_sapms_property_value = -1;
-
-static int hf_sapms_property_vhost_logon = -1;
-static int hf_sapms_property_vhost_length = -1;
-static int hf_sapms_property_vhost_value = -1;
-
-static int hf_sapms_property_ip_address = -1;
-static int hf_sapms_property_ip_address6 = -1;
-
-static int hf_sapms_property_param_name_length = -1;
-static int hf_sapms_property_param_name_value = -1;
-static int hf_sapms_property_param_value_length = -1;
-static int hf_sapms_property_param_value_value = -1;
-
-static int hf_sapms_property_service_number = -1;
-static int hf_sapms_property_service_value = -1;
-
-static int hf_sapms_property_release = -1;
-static int hf_sapms_property_release_patchno = -1;
-static int hf_sapms_property_release_supplvl = -1;
-static int hf_sapms_property_release_platform = -1;
-
-
-static int hf_sapms_text_name = -1;
-static int hf_sapms_text_length = -1;
-static int hf_sapms_text_value = -1;
-
-static int hf_sapms_counter_uuid = -1;
-static int hf_sapms_counter_count = -1;
-static int hf_sapms_counter_no = -1;
-
-static int hf_sapms_change_ip_address = -1;
-static int hf_sapms_change_ip_address6 = -1;
-
-static int hf_sapms_security_name = -1;
-static int hf_sapms_security_key = -1;
-static int hf_sapms_security_port = -1;
-static int hf_sapms_security_address = -1;
-static int hf_sapms_security_address6 = -1;
-
-static int hf_sapms_file_reload = -1;
-static int hf_sapms_file_filler = -1;
-
-static int hf_sapms_logon_type = -1;
-static int hf_sapms_logon_port = -1;
-static int hf_sapms_logon_address = -1;
-static int hf_sapms_logon_name_length = -1;
-static int hf_sapms_logon_name = -1;
-static int hf_sapms_logon_prot_length = -1;
-static int hf_sapms_logon_prot = -1;
-static int hf_sapms_logon_host_length = -1;
-static int hf_sapms_logon_host = -1;
-static int hf_sapms_logon_misc_length = -1;
-static int hf_sapms_logon_misc = -1;
-static int hf_sapms_logon_address6_length = -1;
-static int hf_sapms_logon_address6 = -1;
-static int hf_sapms_logon_end = -1;
-
-static int hf_sapms_shutdown_reason_length = -1;
-static int hf_sapms_shutdown_reason = -1;
-
-static int hf_sapms_ip_to_name_address4 = -1;
-static int hf_sapms_ip_to_name_address6 = -1;
-static int hf_sapms_ip_to_name_port = -1;
-static int hf_sapms_ip_to_name_length = -1;
-static int hf_sapms_ip_to_name = -1;
-
-static int hf_sapms_check_acl_error_code = -1;
-static int hf_sapms_check_acl_acl = -1;
-
-static int hf_sapms_codepage = -1;
-
-static int hf_sapms_dump_dest = -1;
-static int hf_sapms_dump_filler = -1;
-static int hf_sapms_dump_index = -1;
-static int hf_sapms_dump_command = -1;
-static int hf_sapms_dump_name = -1;
-
-static int hf_sapms_server_lst_client = -1;
-static int hf_sapms_server_lst_name = -1;
-static int hf_sapms_server_lst_host = -1;
-static int hf_sapms_server_lst_service = -1;
-static int hf_sapms_server_lst_msgtypes = -1;
-static int hf_sapms_server_lst_msgtypes_dia = -1;
-static int hf_sapms_server_lst_msgtypes_upd = -1;
-static int hf_sapms_server_lst_msgtypes_enq = -1;
-static int hf_sapms_server_lst_msgtypes_btc = -1;
-static int hf_sapms_server_lst_msgtypes_spo = -1;
-static int hf_sapms_server_lst_msgtypes_up2 = -1;
-static int hf_sapms_server_lst_msgtypes_atp = -1;
-static int hf_sapms_server_lst_msgtypes_icm = -1;
-static int hf_sapms_server_lst_hostaddr = -1;
-static int hf_sapms_server_lst_hostaddrv4 = -1;
-static int hf_sapms_server_lst_servno = -1;
-static int hf_sapms_server_lst_status = -1;
-static int hf_sapms_server_lst_nitrc = -1;
-static int hf_sapms_server_lst_sys_service = -1;
-
-static gint ett_sapms = -1;
+static int proto_sapms;
+
+static int hf_sapms_eyecatcher;
+static int hf_sapms_version;
+static int hf_sapms_errorno;
+static int hf_sapms_toname;
+static int hf_sapms_msgtypes;
+static int hf_sapms_msgtypes_dia;
+static int hf_sapms_msgtypes_upd;
+static int hf_sapms_msgtypes_enq;
+static int hf_sapms_msgtypes_btc;
+static int hf_sapms_msgtypes_spo;
+static int hf_sapms_msgtypes_up2;
+static int hf_sapms_msgtypes_atp;
+static int hf_sapms_msgtypes_icm;
+static int hf_sapms_domain;
+static int hf_sapms_reserved;
+static int hf_sapms_key;
+static int hf_sapms_flag;
+static int hf_sapms_iflag;
+static int hf_sapms_fromname;
+static int hf_sapms_diagport;
+
+static int hf_sapms_dp_adm_dp_version;
+
+static int hf_sapms_adm_eyecatcher;
+static int hf_sapms_adm_version;
+static int hf_sapms_adm_msgtype;
+static int hf_sapms_adm_recsize;
+static int hf_sapms_adm_recno;
+
+static int hf_sapms_adm_record;
+static int hf_sapms_adm_record_opcode;
+static int hf_sapms_adm_record_serial_number;
+static int hf_sapms_adm_record_executed;
+static int hf_sapms_adm_record_errorno;
+static int hf_sapms_adm_record_value;
+
+static int hf_sapms_adm_parameter;
+
+static int hf_sapms_adm_rzl_strg_type;
+static int hf_sapms_adm_rzl_strg_name;
+static int hf_sapms_adm_rzl_strg_value;
+static int hf_sapms_adm_rzl_strg_value_integer;
+static int hf_sapms_adm_rzl_strg_uptime;
+static int hf_sapms_adm_rzl_strg_delay;
+static int hf_sapms_adm_rzl_strg_users;
+static int hf_sapms_adm_rzl_strg_quality;
+
+static int hf_sapms_opcode;
+static int hf_sapms_opcode_error;
+static int hf_sapms_opcode_version;
+static int hf_sapms_opcode_charset;
+static int hf_sapms_opcode_value;
+
+static int hf_sapms_property_client;
+static int hf_sapms_property_id;
+static int hf_sapms_property_value;
+
+static int hf_sapms_property_vhost_logon;
+static int hf_sapms_property_vhost_length;
+static int hf_sapms_property_vhost_value;
+
+static int hf_sapms_property_ip_address;
+static int hf_sapms_property_ip_address6;
+
+static int hf_sapms_property_param_name_length;
+static int hf_sapms_property_param_name_value;
+static int hf_sapms_property_param_value_length;
+static int hf_sapms_property_param_value_value;
+
+static int hf_sapms_property_service_number;
+static int hf_sapms_property_service_value;
+
+static int hf_sapms_property_release;
+static int hf_sapms_property_release_patchno;
+static int hf_sapms_property_release_supplvl;
+static int hf_sapms_property_release_platform;
+
+
+static int hf_sapms_text_name;
+static int hf_sapms_text_length;
+static int hf_sapms_text_value;
+
+static int hf_sapms_counter_uuid;
+static int hf_sapms_counter_count;
+static int hf_sapms_counter_no;
+
+static int hf_sapms_change_ip_address;
+static int hf_sapms_change_ip_address6;
+
+static int hf_sapms_security_name;
+static int hf_sapms_security_key;
+static int hf_sapms_security_port;
+static int hf_sapms_security_address;
+static int hf_sapms_security_address6;
+
+static int hf_sapms_file_reload;
+static int hf_sapms_file_filler;
+
+static int hf_sapms_logon_type;
+static int hf_sapms_logon_port;
+static int hf_sapms_logon_address;
+static int hf_sapms_logon_name_length;
+static int hf_sapms_logon_name;
+static int hf_sapms_logon_prot_length;
+static int hf_sapms_logon_prot;
+static int hf_sapms_logon_host_length;
+static int hf_sapms_logon_host;
+static int hf_sapms_logon_misc_length;
+static int hf_sapms_logon_misc;
+static int hf_sapms_logon_address6_length;
+static int hf_sapms_logon_address6;
+static int hf_sapms_logon_end;
+
+static int hf_sapms_shutdown_reason_length;
+static int hf_sapms_shutdown_reason;
+
+static int hf_sapms_ip_to_name_address4;
+static int hf_sapms_ip_to_name_address6;
+static int hf_sapms_ip_to_name_port;
+static int hf_sapms_ip_to_name_length;
+static int hf_sapms_ip_to_name;
+
+static int hf_sapms_check_acl_error_code;
+static int hf_sapms_check_acl_acl;
+
+static int hf_sapms_codepage;
+
+static int hf_sapms_dump_dest;
+static int hf_sapms_dump_filler;
+static int hf_sapms_dump_index;
+static int hf_sapms_dump_command;
+static int hf_sapms_dump_name;
+
+static int hf_sapms_server_lst_client;
+static int hf_sapms_server_lst_name;
+static int hf_sapms_server_lst_host;
+static int hf_sapms_server_lst_service;
+static int hf_sapms_server_lst_msgtypes;
+static int hf_sapms_server_lst_msgtypes_dia;
+static int hf_sapms_server_lst_msgtypes_upd;
+static int hf_sapms_server_lst_msgtypes_enq;
+static int hf_sapms_server_lst_msgtypes_btc;
+static int hf_sapms_server_lst_msgtypes_spo;
+static int hf_sapms_server_lst_msgtypes_up2;
+static int hf_sapms_server_lst_msgtypes_atp;
+static int hf_sapms_server_lst_msgtypes_icm;
+static int hf_sapms_server_lst_hostaddr;
+static int hf_sapms_server_lst_hostaddrv4;
+static int hf_sapms_server_lst_servno;
+static int hf_sapms_server_lst_status;
+static int hf_sapms_server_lst_nitrc;
+static int hf_sapms_server_lst_sys_service;
+
+static gint ett_sapms;
 
 /* Expert info */
-static expert_field ei_sapms_adm_opcode_partial = EI_INIT;
-static expert_field ei_sapms_opcode_partial = EI_INIT;
-static expert_field ei_sapms_unknown_version = EI_INIT;
-static expert_field ei_sapms_client_invalid_offset = EI_INIT;
-static expert_field ei_sapms_client_invalid_length = EI_INIT;
-static expert_field ei_sapms_text_invalid_length = EI_INIT;
-static expert_field ei_sapms_ip_invalid_length = EI_INIT;
+static expert_field ei_sapms_adm_opcode_partial;
+static expert_field ei_sapms_opcode_partial;
+static expert_field ei_sapms_unknown_version;
+static expert_field ei_sapms_client_invalid_offset;
+static expert_field ei_sapms_client_invalid_length;
+static expert_field ei_sapms_text_invalid_length;
+static expert_field ei_sapms_ip_invalid_length;
 
 /* Global port preference */
 static range_t *global_sapms_port_range;
diff --git a/epan/dissectors/packet-sapni.c b/epan/dissectors/packet-sapni.c
index 7e6097bcf1..f5d2a3ce9b 100644
--- a/epan/dissectors/packet-sapni.c
+++ b/epan/dissectors/packet-sapni.c
@@ -41,18 +41,18 @@
  */
 #define SAP_PROTOCOL_HEADER_LEN 4
 
-static int proto_sap_protocol = -1;
+static int proto_sap_protocol;
 
-static int hf_sap_protocol_length = -1;
-static int hf_sap_protocol_payload = -1;
+static int hf_sap_protocol_length;
+static int hf_sap_protocol_payload;
 
-static int hf_sap_protocol_ping = -1;
-static int hf_sap_protocol_pong = -1;
+static int hf_sap_protocol_ping;
+static int hf_sap_protocol_pong;
 
-static gint ett_sap_protocol = -1;
+static gint ett_sap_protocol;
 
 /* Expert info */
-static expert_field ei_sap_invalid_length = EI_INIT;
+static expert_field ei_sap_invalid_length;
 
 /* Global port preference */
 static range_t *global_sap_protocol_port_range;
diff --git a/epan/dissectors/packet-saprouter.c b/epan/dissectors/packet-saprouter.c
index efdf10bb3a..d7e9ad3317 100644
--- a/epan/dissectors/packet-saprouter.c
+++ b/epan/dissectors/packet-saprouter.c
@@ -139,81 +139,81 @@ static const value_string saprouter_admin_command_vals[] = {
 
 static int credentials_tap = -1;
 
-static int proto_saprouter = -1;
+static int proto_saprouter;
 
 /* General fields */
-static int hf_saprouter_type = -1;
-static int hf_saprouter_ni_version = -1;
+static int hf_saprouter_type;
+static int hf_saprouter_ni_version;
 
 /* Niping messages */
-static int hf_saprouter_niping_message = -1;
+static int hf_saprouter_niping_message;
 
 /* Route information */
-static int hf_saprouter_route_version = -1;
-static int hf_saprouter_entries = -1;
-static int hf_saprouter_talk_mode = -1;
-static int hf_saprouter_rest_nodes = -1;
-static int hf_saprouter_route_length = -1;
-static int hf_saprouter_route_offset = -1;
-static int hf_saprouter_route = -1;
-static int hf_saprouter_route_string = -1;
-
-static int hf_saprouter_route_requested_in = -1;
-static int hf_saprouter_route_accepted_in = -1;
+static int hf_saprouter_route_version;
+static int hf_saprouter_entries;
+static int hf_saprouter_talk_mode;
+static int hf_saprouter_rest_nodes;
+static int hf_saprouter_route_length;
+static int hf_saprouter_route_offset;
+static int hf_saprouter_route;
+static int hf_saprouter_route_string;
+
+static int hf_saprouter_route_requested_in;
+static int hf_saprouter_route_accepted_in;
 
 /* Route strings */
-static int hf_saprouter_route_string_hostname = -1;
-static int hf_saprouter_route_string_service = -1;
-static int hf_saprouter_route_string_password = -1;
+static int hf_saprouter_route_string_hostname;
+static int hf_saprouter_route_string_service;
+static int hf_saprouter_route_string_password;
 
 
 /* Error Information/Control Messages */
-static int hf_saprouter_opcode = -1;
-static int hf_saprouter_return_code = -1;
-static int hf_saprouter_unknown = -1;
+static int hf_saprouter_opcode;
+static int hf_saprouter_return_code;
+static int hf_saprouter_unknown;
 
 /* Error Information Messages */
-static int hf_saprouter_error_length = -1;
-static int hf_saprouter_error_string = -1;
-static int hf_saprouter_error_eyecatcher = -1;
-static int hf_saprouter_error_counter = -1;
-static int hf_saprouter_error_error = -1;
-static int hf_saprouter_error_return_code= -1;
-static int hf_saprouter_error_component = -1;
-static int hf_saprouter_error_release = -1;
-static int hf_saprouter_error_version = -1;
-static int hf_saprouter_error_module = -1;
-static int hf_saprouter_error_line = -1;
-static int hf_saprouter_error_detail= -1;
-static int hf_saprouter_error_time = -1;
-static int hf_saprouter_error_system_call = -1;
-static int hf_saprouter_error_errorno = -1;
-static int hf_saprouter_error_errorno_text = -1;
-static int hf_saprouter_error_error_count = -1;
-static int hf_saprouter_error_location= -1;
-static int hf_saprouter_error_unknown= -1;  /* TODO: Unknown fields */
+static int hf_saprouter_error_length;
+static int hf_saprouter_error_string;
+static int hf_saprouter_error_eyecatcher;
+static int hf_saprouter_error_counter;
+static int hf_saprouter_error_error;
+static int hf_saprouter_error_return_code;
+static int hf_saprouter_error_component;
+static int hf_saprouter_error_release;
+static int hf_saprouter_error_version;
+static int hf_saprouter_error_module;
+static int hf_saprouter_error_line;
+static int hf_saprouter_error_detail;
+static int hf_saprouter_error_time;
+static int hf_saprouter_error_system_call;
+static int hf_saprouter_error_errorno;
+static int hf_saprouter_error_errorno_text;
+static int hf_saprouter_error_error_count;
+static int hf_saprouter_error_location;
+static int hf_saprouter_error_unknown;  /* TODO: Unknown fields */
 
 /* Control Messages */
-static int hf_saprouter_control_length = -1;
-static int hf_saprouter_control_string = -1;
-static int hf_saprouter_control_unknown = -1;
+static int hf_saprouter_control_length;
+static int hf_saprouter_control_string;
+static int hf_saprouter_control_unknown;
 
 /* Admin Messages */
-static int hf_saprouter_admin_command = -1;
-static int hf_saprouter_admin_password = -1;
-static int hf_saprouter_admin_client_count_short = -1;
-static int hf_saprouter_admin_client_count_int = -1;
-static int hf_saprouter_admin_client_ids = -1;
-static int hf_saprouter_admin_client_id = -1;
-static int hf_saprouter_admin_address_mask = -1;
+static int hf_saprouter_admin_command;
+static int hf_saprouter_admin_password;
+static int hf_saprouter_admin_client_count_short;
+static int hf_saprouter_admin_client_count_int;
+static int hf_saprouter_admin_client_ids;
+static int hf_saprouter_admin_client_id;
+static int hf_saprouter_admin_address_mask;
 
-static gint ett_saprouter = -1;
+static gint ett_saprouter;
 
 /* Expert info */
-static expert_field ei_saprouter_route_password_found = EI_INIT;
-static expert_field ei_saprouter_route_invalid_length = EI_INIT;
-static expert_field ei_saprouter_info_password_found = EI_INIT;
-static expert_field ei_saprouter_invalid_client_ids = EI_INIT;
+static expert_field ei_saprouter_route_password_found;
+static expert_field ei_saprouter_route_invalid_length;
+static expert_field ei_saprouter_info_password_found;
+static expert_field ei_saprouter_invalid_client_ids;
 
 /* Global port preference */
 static range_t *global_saprouter_port_range;
diff --git a/epan/dissectors/packet-sapsnc.c b/epan/dissectors/packet-sapsnc.c
index 38f4c61512..bdc568eadd 100644
--- a/epan/dissectors/packet-sapsnc.c
+++ b/epan/dissectors/packet-sapsnc.c
@@ -75,31 +75,31 @@ static const value_string sapsnc_qop_vals[] = {
 };
 
 
-static int proto_sapsnc = -1;
+static int proto_sapsnc;
 
 /* SNC Frame */
-static int hf_sapsnc_frame = -1;
-static int hf_sapsnc_eye_catcher = -1;
-static int hf_sapsnc_frame_type = -1;
-static int hf_sapsnc_protocol_version = -1;
-static int hf_sapsnc_header_length = -1;
-static int hf_sapsnc_token_length = -1;
-static int hf_sapsnc_data_length = -1;
-static int hf_sapsnc_mech_id = -1;
-static int hf_sapsnc_flags = -1;
-static int hf_sapsnc_qop_min = -1;
-static int hf_sapsnc_qop_max = -1;
-static int hf_sapsnc_qop_use = -1;
-static int hf_sapsnc_ext_flags = -1;
-static int hf_sapsnc_ext_field_length = -1;
-static int hf_sapsnc_ext_field = -1;
-static int hf_sapsnc_token = -1;
-static int hf_sapsnc_data = -1;
-
-static gint ett_sapsnc = -1;
+static int hf_sapsnc_frame;
+static int hf_sapsnc_eye_catcher;
+static int hf_sapsnc_frame_type;
+static int hf_sapsnc_protocol_version;
+static int hf_sapsnc_header_length;
+static int hf_sapsnc_token_length;
+static int hf_sapsnc_data_length;
+static int hf_sapsnc_mech_id;
+static int hf_sapsnc_flags;
+static int hf_sapsnc_qop_min;
+static int hf_sapsnc_qop_max;
+static int hf_sapsnc_qop_use;
+static int hf_sapsnc_ext_flags;
+static int hf_sapsnc_ext_field_length;
+static int hf_sapsnc_ext_field;
+static int hf_sapsnc_token;
+static int hf_sapsnc_data;
+
+static gint ett_sapsnc;
 
 /* Expert info */
-static expert_field ei_sapsnc_invalid_header_length = EI_INIT;
+static expert_field ei_sapsnc_invalid_header_length;
 
 
 void proto_reg_handoff_sapsnc(void);
diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c
index b9fc1e397a..48fca5c132 100644
--- a/epan/dissectors/packet-sasp.c
+++ b/epan/dissectors/packet-sasp.c
@@ -44,152 +44,152 @@ static guint32 dissect_weight_entry_data_comp(tvbuff_t *tvb, proto_tree *pay_loa
 static guint32 dissect_grp_wt_entry_datacomp(tvbuff_t *tvb, proto_tree *tree, guint32 offset);
 
 /* Initialize the protocol and registered fields */
-static int proto_sasp = -1;
-static int hf_sasp_type = -1;
-static int hf_sasp_length = -1;
-static int hf_sasp_vrsn = -1;
-static int hf_msg_len = -1;
-static int hf_msg_id = -1;
-static int hf_msg_type = -1;
+static int proto_sasp;
+static int hf_sasp_type;
+static int hf_sasp_length;
+static int hf_sasp_vrsn;
+static int hf_msg_len;
+static int hf_msg_id;
+static int hf_msg_type;
 
 /*reg reply*/
-static int hf_sasp_reg_rep_rcode = -1;
-static int hf_sasp_reg_rep_sz = -1;
+static int hf_sasp_reg_rep_rcode;
+static int hf_sasp_reg_rep_sz;
 
 /*reg req*/
-static int hf_sasp_reg_req_sz = -1;
-static int hf_reg_req_lbflag = -1;
-static int hf_sasp_gmd_cnt = -1;
+static int hf_sasp_reg_req_sz;
+static int hf_reg_req_lbflag;
+static int hf_sasp_gmd_cnt;
 
 /*dereg req*/
-static int hf_sasp_dereg_req_sz = -1;
-static int hf_dereg_req_lbflag = -1;
-/* static int hf_dereg_req_reason = -1; */
-static int hf_dereg_req_reason_flag = -1;
+static int hf_sasp_dereg_req_sz;
+static int hf_dereg_req_lbflag;
+/* static int hf_dereg_req_reason; */
+static int hf_dereg_req_reason_flag;
 
 /*dereg reply*/
-static int hf_sasp_dereg_rep_rcode = -1;
-static int hf_sasp_dereg_rep_sz = -1;
+static int hf_sasp_dereg_rep_rcode;
+static int hf_sasp_dereg_rep_sz;
 
 /*send wt*/
-static int hf_sasp_sendwt_gwedcnt = -1;
-static int hf_sasp_sendwt_sz = -1;
+static int hf_sasp_sendwt_gwedcnt;
+static int hf_sasp_sendwt_sz;
 
 /*setmemstate req*/
-static int hf_sasp_setmemstate_req_sz = -1;
-static int hf_setmemstate_req_lbflag = -1;
-/*static int hf_sasp_setmemstate_req_data = -1;*/
-static int hf_sasp_setmemstate_req_gmsd_cnt = -1;
+static int hf_sasp_setmemstate_req_sz;
+static int hf_setmemstate_req_lbflag;
+/*static int hf_sasp_setmemstate_req_data;*/
+static int hf_sasp_setmemstate_req_gmsd_cnt;
 
 /*setmemstate reply*/
-/* static int hf_sasp_setmemstate_rep = -1; */
-static int hf_sasp_setmemstate_rep_rcode = -1;
-static int hf_sasp_setmemstate_rep_sz = -1;
+/* static int hf_sasp_setmemstate_rep; */
+static int hf_sasp_setmemstate_rep_rcode;
+static int hf_sasp_setmemstate_rep_sz;
 
 /*mem data comp */
-static int hf_sasp_memdatacomp_type = -1;
-static int hf_sasp_memdatacomp_sz = -1;
-static int hf_sasp_memdatacomp_protocol = -1;
-static int hf_sasp_memdatacomp_port = -1;
-static int hf_sasp_memdatacomp_ip = -1;
-static int hf_sasp_memdatacomp_lab_len = -1;
-static int hf_sasp_memdatacomp_label = -1;
+static int hf_sasp_memdatacomp_type;
+static int hf_sasp_memdatacomp_sz;
+static int hf_sasp_memdatacomp_protocol;
+static int hf_sasp_memdatacomp_port;
+static int hf_sasp_memdatacomp_ip;
+static int hf_sasp_memdatacomp_lab_len;
+static int hf_sasp_memdatacomp_label;
 
 /*grp data comp */
-static int hf_sasp_grpdatacomp = -1;
-static int hf_sasp_grpdatacomp_sz = -1;
-static int hf_sasp_grpdatacomp_LB_uid_len = -1;
-static int hf_sasp_grpdatacomp_LB_uid = -1;
-static int hf_sasp_grpdatacomp_grp_name_len = -1;
-static int hf_sasp_grpdatacomp_grp_name = -1;
+static int hf_sasp_grpdatacomp;
+static int hf_sasp_grpdatacomp_sz;
+static int hf_sasp_grpdatacomp_LB_uid_len;
+static int hf_sasp_grpdatacomp_LB_uid;
+static int hf_sasp_grpdatacomp_grp_name_len;
+static int hf_sasp_grpdatacomp_grp_name;
 
 /*grp mem data comp */
-static int hf_sasp_grp_memdatacomp = -1;
-static int hf_sasp_grp_memdatacomp_sz = -1;
-static int hf_sasp_grp_memdatacomp_cnt = -1;
+static int hf_sasp_grp_memdatacomp;
+static int hf_sasp_grp_memdatacomp_sz;
+static int hf_sasp_grp_memdatacomp_cnt;
 
 /*weight req*/
-static int hf_sasp_wt_req_sz = -1;
-static int hf_sasp_wt_req_gd_cnt = -1;
+static int hf_sasp_wt_req_sz;
+static int hf_sasp_wt_req_gd_cnt;
 
 /*weight rep*/
-static int hf_sasp_wt_rep_sz = -1;
-static int hf_sasp_wt_rep_rcode = -1;
-static int hf_sasp_wt_rep_interval = -1;
-static int hf_sasp_wt_rep_gwed_cnt = -1;
+static int hf_sasp_wt_rep_sz;
+static int hf_sasp_wt_rep_rcode;
+static int hf_sasp_wt_rep_interval;
+static int hf_sasp_wt_rep_gwed_cnt;
 
 /*setlbstate req*/
-static int hf_sasp_setlbstate_req_sz  = -1;
-static int hf_sasp_setlbstate_req_LB_uid_len  = -1;
-static int hf_sasp_setlbstate_req_LB_uid  = -1;
-static int hf_sasp_setlbstate_req_LB_health  = -1;
-/*static int hf_sasp_setlbstate_req_LB_flag = -1;*/
-/* static int hf_lbstate_flag = -1; */
-static int hf_sasp_pushflag = -1;
-static int hf_sasp_trustflag = -1;
-static int hf_sasp_nochangeflag = -1;
+static int hf_sasp_setlbstate_req_sz;
+static int hf_sasp_setlbstate_req_LB_uid_len;
+static int hf_sasp_setlbstate_req_LB_uid;
+static int hf_sasp_setlbstate_req_LB_health;
+/*static int hf_sasp_setlbstate_req_LB_flag;*/
+/* static int hf_lbstate_flag; */
+static int hf_sasp_pushflag;
+static int hf_sasp_trustflag;
+static int hf_sasp_nochangeflag;
 
 /*setlbstate reply*/
-/* static int hf_sasp_setlbstate_rep = -1; */
-static int hf_sasp_setlbstate_rep_rcode = -1;
-static int hf_sasp_setlbstate_rep_sz = -1;
+/* static int hf_sasp_setlbstate_rep; */
+static int hf_sasp_setlbstate_rep_rcode;
+static int hf_sasp_setlbstate_rep_sz;
 
 /*grp mem state data*/
-static int hf_sasp_grp_memstatedatacomp = -1;
-static int hf_sasp_grp_memstatedatacomp_sz = -1;
-static int hf_sasp_grp_memstatedatacomp_cnt = -1;
+static int hf_sasp_grp_memstatedatacomp;
+static int hf_sasp_grp_memstatedatacomp_sz;
+static int hf_sasp_grp_memstatedatacomp_cnt;
 
 /*mem state data comp*/
-static int hf_sasp_memstatedatacomp_instance = -1;
-static int hf_sasp_memstatedatacomp_sz = -1;
-static int hf_sasp_memstatedatacomp_state = -1;
-static int hf_sasp_memstatedatacomp_quiesce_flag = -1;
+static int hf_sasp_memstatedatacomp_instance;
+static int hf_sasp_memstatedatacomp_sz;
+static int hf_sasp_memstatedatacomp_state;
+static int hf_sasp_memstatedatacomp_quiesce_flag;
 
 /*wt entry dat  comp*/
-static int hf_sasp_weight_entry_data_comp_type = -1;
-static int hf_sasp_weight_entry_data_comp_sz = -1;
-static int hf_sasp_weight_entry_data_comp_state = -1;
-/* static int hf_wtstate_flag = -1; */
-static int hf_sasp_wed_contactsuccess_flag = -1;
-static int hf_sasp_wed_quiesce_flag = -1;
-static int hf_sasp_wed_registration_flag = -1;
-static int hf_sasp_wed_confident_flag = -1;
-static int hf_sasp_weight_entry_data_comp_weight = -1;
+static int hf_sasp_weight_entry_data_comp_type;
+static int hf_sasp_weight_entry_data_comp_sz;
+static int hf_sasp_weight_entry_data_comp_state;
+/* static int hf_wtstate_flag; */
+static int hf_sasp_wed_contactsuccess_flag;
+static int hf_sasp_wed_quiesce_flag;
+static int hf_sasp_wed_registration_flag;
+static int hf_sasp_wed_confident_flag;
+static int hf_sasp_weight_entry_data_comp_weight;
 
 /*grp wt entry data comp */
-static int hf_sasp_grp_wt_entry_datacomp_type = -1;
-static int hf_sasp_grp_wt_entry_datacomp_sz = -1;
-static int hf_sasp_grp_wt_entry_datacomp_cnt = -1;
+static int hf_sasp_grp_wt_entry_datacomp_type;
+static int hf_sasp_grp_wt_entry_datacomp_sz;
+static int hf_sasp_grp_wt_entry_datacomp_cnt;
 
 /* Initialize the subtree pointers */
-static gint ett_sasp_data = -1;
-static gint ett_sasp_header = -1;
-static gint ett_sasp_msg = -1;
-static gint ett_sasp_payload = -1;
-static gint ett_sasp_reg_req = -1;
-static gint ett_sasp_reg_rep = -1;
-static gint ett_sasp_reg_req_sz = -1;
-static gint ett_sasp_dereg_req_sz= -1;
-static gint ett_sasp_dereg_rep = -1;
-static gint ett_sasp_sendwt = -1;
-static gint ett_sasp_setmemstate_rep = -1;
-static gint ett_sasp_memdatacomp = -1;
-static gint ett_sasp_grpdatacomp = -1;
-static gint ett_sasp_grp_memdatacomp = -1;
-static gint ett_sasp_setlbstate_req = -1;
-static gint ett_sasp_setlbstate_rep = -1;
-static gint ett_sasp_getwt= -1;
-static gint ett_sasp_setmemstate_req = -1;
-static gint ett_setlbstate_req_lbflag = -1;
-static gint ett_sasp_grp_memstatedatacomp = -1;
-static gint ett_sasp_memstatedatacomp = -1;
-/*static gint ett_dereg_req_reason_flag = -1;*/
-static gint ett_sasp_grp_wt_entry_datacomp = -1;
-static gint ett_sasp_weight_entry_data_comp = -1;
-static gint ett_wt_entry_data_flag = -1;
-static gint ett_sasp_wt_rep = -1;
-
-static expert_field ei_msg_type_invalid = EI_INIT;
+static gint ett_sasp_data;
+static gint ett_sasp_header;
+static gint ett_sasp_msg;
+static gint ett_sasp_payload;
+static gint ett_sasp_reg_req;
+static gint ett_sasp_reg_rep;
+static gint ett_sasp_reg_req_sz;
+static gint ett_sasp_dereg_req_sz;
+static gint ett_sasp_dereg_rep;
+static gint ett_sasp_sendwt;
+static gint ett_sasp_setmemstate_rep;
+static gint ett_sasp_memdatacomp;
+static gint ett_sasp_grpdatacomp;
+static gint ett_sasp_grp_memdatacomp;
+static gint ett_sasp_setlbstate_req;
+static gint ett_sasp_setlbstate_rep;
+static gint ett_sasp_getwt;
+static gint ett_sasp_setmemstate_req;
+static gint ett_setlbstate_req_lbflag;
+static gint ett_sasp_grp_memstatedatacomp;
+static gint ett_sasp_memstatedatacomp;
+/*static gint ett_dereg_req_reason_flag;*/
+static gint ett_sasp_grp_wt_entry_datacomp;
+static gint ett_sasp_weight_entry_data_comp;
+static gint ett_wt_entry_data_flag;
+static gint ett_sasp_wt_rep;
+
+static expert_field ei_msg_type_invalid;
 
 /* desegmentation of SASP over TCP */
 static gboolean sasp_desegment = TRUE;
diff --git a/epan/dissectors/packet-sbas_l1.c b/epan/dissectors/packet-sbas_l1.c
index e60ada358d..93aae36452 100644
--- a/epan/dissectors/packet-sbas_l1.c
+++ b/epan/dissectors/packet-sbas_l1.c
@@ -109,309 +109,309 @@ static const guint32 CRC24Q_TBL[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_sbas_l1 = -1;
+static int proto_sbas_l1;
 
 // see ICAO Annex 10, Vol I, Appendix B, Section 3.5.3
-static int hf_sbas_l1_preamble = -1;
-static int hf_sbas_l1_mt       = -1;
-static int hf_sbas_l1_chksum   = -1;
+static int hf_sbas_l1_preamble;
+static int hf_sbas_l1_mt;
+static int hf_sbas_l1_chksum;
 
 // see ICAO Annex 10, Vol I, Table B-38
-static int hf_sbas_l1_mt1                  = -1;
-static int hf_sbas_l1_mt1_prn_mask_gps     = -1;
-static int hf_sbas_l1_mt1_prn_mask_glonass = -1;
-static int hf_sbas_l1_mt1_prn_mask_spare_1 = -1;
-static int hf_sbas_l1_mt1_prn_mask_sbas    = -1;
-static int hf_sbas_l1_mt1_prn_mask_spare_2 = -1;
-static int hf_sbas_l1_mt1_iodp             = -1;
+static int hf_sbas_l1_mt1;
+static int hf_sbas_l1_mt1_prn_mask_gps;
+static int hf_sbas_l1_mt1_prn_mask_glonass;
+static int hf_sbas_l1_mt1_prn_mask_spare_1;
+static int hf_sbas_l1_mt1_prn_mask_sbas;
+static int hf_sbas_l1_mt1_prn_mask_spare_2;
+static int hf_sbas_l1_mt1_iodp;
 
 // see ICAO Annex 10, Vol I, Table B-39
-static int hf_sbas_l1_mt2          = -1;
-static int hf_sbas_l1_mt2_iodf_j   = -1;
-static int hf_sbas_l1_mt2_iodp     = -1;
-static int hf_sbas_l1_mt2_fc_1     = -1;
-static int hf_sbas_l1_mt2_fc_2     = -1;
-static int hf_sbas_l1_mt2_fc_3     = -1;
-static int hf_sbas_l1_mt2_fc_4     = -1;
-static int hf_sbas_l1_mt2_fc_5     = -1;
-static int hf_sbas_l1_mt2_fc_6     = -1;
-static int hf_sbas_l1_mt2_fc_7     = -1;
-static int hf_sbas_l1_mt2_fc_8     = -1;
-static int hf_sbas_l1_mt2_fc_9     = -1;
-static int hf_sbas_l1_mt2_fc_10    = -1;
-static int hf_sbas_l1_mt2_fc_11    = -1;
-static int hf_sbas_l1_mt2_fc_12    = -1;
-static int hf_sbas_l1_mt2_fc_13    = -1;
-static int hf_sbas_l1_mt2_udrei_1  = -1;
-static int hf_sbas_l1_mt2_udrei_2  = -1;
-static int hf_sbas_l1_mt2_udrei_3  = -1;
-static int hf_sbas_l1_mt2_udrei_4  = -1;
-static int hf_sbas_l1_mt2_udrei_5  = -1;
-static int hf_sbas_l1_mt2_udrei_6  = -1;
-static int hf_sbas_l1_mt2_udrei_7  = -1;
-static int hf_sbas_l1_mt2_udrei_8  = -1;
-static int hf_sbas_l1_mt2_udrei_9  = -1;
-static int hf_sbas_l1_mt2_udrei_10 = -1;
-static int hf_sbas_l1_mt2_udrei_11 = -1;
-static int hf_sbas_l1_mt2_udrei_12 = -1;
-static int hf_sbas_l1_mt2_udrei_13 = -1;
+static int hf_sbas_l1_mt2;
+static int hf_sbas_l1_mt2_iodf_j;
+static int hf_sbas_l1_mt2_iodp;
+static int hf_sbas_l1_mt2_fc_1;
+static int hf_sbas_l1_mt2_fc_2;
+static int hf_sbas_l1_mt2_fc_3;
+static int hf_sbas_l1_mt2_fc_4;
+static int hf_sbas_l1_mt2_fc_5;
+static int hf_sbas_l1_mt2_fc_6;
+static int hf_sbas_l1_mt2_fc_7;
+static int hf_sbas_l1_mt2_fc_8;
+static int hf_sbas_l1_mt2_fc_9;
+static int hf_sbas_l1_mt2_fc_10;
+static int hf_sbas_l1_mt2_fc_11;
+static int hf_sbas_l1_mt2_fc_12;
+static int hf_sbas_l1_mt2_fc_13;
+static int hf_sbas_l1_mt2_udrei_1;
+static int hf_sbas_l1_mt2_udrei_2;
+static int hf_sbas_l1_mt2_udrei_3;
+static int hf_sbas_l1_mt2_udrei_4;
+static int hf_sbas_l1_mt2_udrei_5;
+static int hf_sbas_l1_mt2_udrei_6;
+static int hf_sbas_l1_mt2_udrei_7;
+static int hf_sbas_l1_mt2_udrei_8;
+static int hf_sbas_l1_mt2_udrei_9;
+static int hf_sbas_l1_mt2_udrei_10;
+static int hf_sbas_l1_mt2_udrei_11;
+static int hf_sbas_l1_mt2_udrei_12;
+static int hf_sbas_l1_mt2_udrei_13;
 
 // see ICAO Annex 10, Vol I, Table B-39
-static int hf_sbas_l1_mt3          = -1;
-static int hf_sbas_l1_mt3_iodf_j   = -1;
-static int hf_sbas_l1_mt3_iodp     = -1;
-static int hf_sbas_l1_mt3_fc_14    = -1;
-static int hf_sbas_l1_mt3_fc_15    = -1;
-static int hf_sbas_l1_mt3_fc_16    = -1;
-static int hf_sbas_l1_mt3_fc_17    = -1;
-static int hf_sbas_l1_mt3_fc_18    = -1;
-static int hf_sbas_l1_mt3_fc_19    = -1;
-static int hf_sbas_l1_mt3_fc_20    = -1;
-static int hf_sbas_l1_mt3_fc_21    = -1;
-static int hf_sbas_l1_mt3_fc_22    = -1;
-static int hf_sbas_l1_mt3_fc_23    = -1;
-static int hf_sbas_l1_mt3_fc_24    = -1;
-static int hf_sbas_l1_mt3_fc_25    = -1;
-static int hf_sbas_l1_mt3_fc_26    = -1;
-static int hf_sbas_l1_mt3_udrei_14 = -1;
-static int hf_sbas_l1_mt3_udrei_15 = -1;
-static int hf_sbas_l1_mt3_udrei_16 = -1;
-static int hf_sbas_l1_mt3_udrei_17 = -1;
-static int hf_sbas_l1_mt3_udrei_18 = -1;
-static int hf_sbas_l1_mt3_udrei_19 = -1;
-static int hf_sbas_l1_mt3_udrei_20 = -1;
-static int hf_sbas_l1_mt3_udrei_21 = -1;
-static int hf_sbas_l1_mt3_udrei_22 = -1;
-static int hf_sbas_l1_mt3_udrei_23 = -1;
-static int hf_sbas_l1_mt3_udrei_24 = -1;
-static int hf_sbas_l1_mt3_udrei_25 = -1;
-static int hf_sbas_l1_mt3_udrei_26 = -1;
+static int hf_sbas_l1_mt3;
+static int hf_sbas_l1_mt3_iodf_j;
+static int hf_sbas_l1_mt3_iodp;
+static int hf_sbas_l1_mt3_fc_14;
+static int hf_sbas_l1_mt3_fc_15;
+static int hf_sbas_l1_mt3_fc_16;
+static int hf_sbas_l1_mt3_fc_17;
+static int hf_sbas_l1_mt3_fc_18;
+static int hf_sbas_l1_mt3_fc_19;
+static int hf_sbas_l1_mt3_fc_20;
+static int hf_sbas_l1_mt3_fc_21;
+static int hf_sbas_l1_mt3_fc_22;
+static int hf_sbas_l1_mt3_fc_23;
+static int hf_sbas_l1_mt3_fc_24;
+static int hf_sbas_l1_mt3_fc_25;
+static int hf_sbas_l1_mt3_fc_26;
+static int hf_sbas_l1_mt3_udrei_14;
+static int hf_sbas_l1_mt3_udrei_15;
+static int hf_sbas_l1_mt3_udrei_16;
+static int hf_sbas_l1_mt3_udrei_17;
+static int hf_sbas_l1_mt3_udrei_18;
+static int hf_sbas_l1_mt3_udrei_19;
+static int hf_sbas_l1_mt3_udrei_20;
+static int hf_sbas_l1_mt3_udrei_21;
+static int hf_sbas_l1_mt3_udrei_22;
+static int hf_sbas_l1_mt3_udrei_23;
+static int hf_sbas_l1_mt3_udrei_24;
+static int hf_sbas_l1_mt3_udrei_25;
+static int hf_sbas_l1_mt3_udrei_26;
 
 // see ICAO Annex 10, Vol I, Table B-39
-static int hf_sbas_l1_mt4          = -1;
-static int hf_sbas_l1_mt4_iodf_j   = -1;
-static int hf_sbas_l1_mt4_iodp     = -1;
-static int hf_sbas_l1_mt4_fc_27    = -1;
-static int hf_sbas_l1_mt4_fc_28    = -1;
-static int hf_sbas_l1_mt4_fc_29    = -1;
-static int hf_sbas_l1_mt4_fc_30    = -1;
-static int hf_sbas_l1_mt4_fc_31    = -1;
-static int hf_sbas_l1_mt4_fc_32    = -1;
-static int hf_sbas_l1_mt4_fc_33    = -1;
-static int hf_sbas_l1_mt4_fc_34    = -1;
-static int hf_sbas_l1_mt4_fc_35    = -1;
-static int hf_sbas_l1_mt4_fc_36    = -1;
-static int hf_sbas_l1_mt4_fc_37    = -1;
-static int hf_sbas_l1_mt4_fc_38    = -1;
-static int hf_sbas_l1_mt4_fc_39    = -1;
-static int hf_sbas_l1_mt4_udrei_27 = -1;
-static int hf_sbas_l1_mt4_udrei_28 = -1;
-static int hf_sbas_l1_mt4_udrei_29 = -1;
-static int hf_sbas_l1_mt4_udrei_30 = -1;
-static int hf_sbas_l1_mt4_udrei_31 = -1;
-static int hf_sbas_l1_mt4_udrei_32 = -1;
-static int hf_sbas_l1_mt4_udrei_33 = -1;
-static int hf_sbas_l1_mt4_udrei_34 = -1;
-static int hf_sbas_l1_mt4_udrei_35 = -1;
-static int hf_sbas_l1_mt4_udrei_36 = -1;
-static int hf_sbas_l1_mt4_udrei_37 = -1;
-static int hf_sbas_l1_mt4_udrei_38 = -1;
-static int hf_sbas_l1_mt4_udrei_39 = -1;
+static int hf_sbas_l1_mt4;
+static int hf_sbas_l1_mt4_iodf_j;
+static int hf_sbas_l1_mt4_iodp;
+static int hf_sbas_l1_mt4_fc_27;
+static int hf_sbas_l1_mt4_fc_28;
+static int hf_sbas_l1_mt4_fc_29;
+static int hf_sbas_l1_mt4_fc_30;
+static int hf_sbas_l1_mt4_fc_31;
+static int hf_sbas_l1_mt4_fc_32;
+static int hf_sbas_l1_mt4_fc_33;
+static int hf_sbas_l1_mt4_fc_34;
+static int hf_sbas_l1_mt4_fc_35;
+static int hf_sbas_l1_mt4_fc_36;
+static int hf_sbas_l1_mt4_fc_37;
+static int hf_sbas_l1_mt4_fc_38;
+static int hf_sbas_l1_mt4_fc_39;
+static int hf_sbas_l1_mt4_udrei_27;
+static int hf_sbas_l1_mt4_udrei_28;
+static int hf_sbas_l1_mt4_udrei_29;
+static int hf_sbas_l1_mt4_udrei_30;
+static int hf_sbas_l1_mt4_udrei_31;
+static int hf_sbas_l1_mt4_udrei_32;
+static int hf_sbas_l1_mt4_udrei_33;
+static int hf_sbas_l1_mt4_udrei_34;
+static int hf_sbas_l1_mt4_udrei_35;
+static int hf_sbas_l1_mt4_udrei_36;
+static int hf_sbas_l1_mt4_udrei_37;
+static int hf_sbas_l1_mt4_udrei_38;
+static int hf_sbas_l1_mt4_udrei_39;
 
 // see ICAO Annex 10, Vol I, Table B-39
-static int hf_sbas_l1_mt5          = -1;
-static int hf_sbas_l1_mt5_iodf_j   = -1;
-static int hf_sbas_l1_mt5_iodp     = -1;
-static int hf_sbas_l1_mt5_fc_40    = -1;
-static int hf_sbas_l1_mt5_fc_41    = -1;
-static int hf_sbas_l1_mt5_fc_42    = -1;
-static int hf_sbas_l1_mt5_fc_43    = -1;
-static int hf_sbas_l1_mt5_fc_44    = -1;
-static int hf_sbas_l1_mt5_fc_45    = -1;
-static int hf_sbas_l1_mt5_fc_46    = -1;
-static int hf_sbas_l1_mt5_fc_47    = -1;
-static int hf_sbas_l1_mt5_fc_48    = -1;
-static int hf_sbas_l1_mt5_fc_49    = -1;
-static int hf_sbas_l1_mt5_fc_50    = -1;
-static int hf_sbas_l1_mt5_fc_51    = -1;
-static int hf_sbas_l1_mt5_fc_52    = -1;
-static int hf_sbas_l1_mt5_udrei_40 = -1;
-static int hf_sbas_l1_mt5_udrei_41 = -1;
-static int hf_sbas_l1_mt5_udrei_42 = -1;
-static int hf_sbas_l1_mt5_udrei_43 = -1;
-static int hf_sbas_l1_mt5_udrei_44 = -1;
-static int hf_sbas_l1_mt5_udrei_45 = -1;
-static int hf_sbas_l1_mt5_udrei_46 = -1;
-static int hf_sbas_l1_mt5_udrei_47 = -1;
-static int hf_sbas_l1_mt5_udrei_48 = -1;
-static int hf_sbas_l1_mt5_udrei_49 = -1;
-static int hf_sbas_l1_mt5_udrei_50 = -1;
-static int hf_sbas_l1_mt5_udrei_51 = -1;
-static int hf_sbas_l1_mt5_udrei_52 = -1;
+static int hf_sbas_l1_mt5;
+static int hf_sbas_l1_mt5_iodf_j;
+static int hf_sbas_l1_mt5_iodp;
+static int hf_sbas_l1_mt5_fc_40;
+static int hf_sbas_l1_mt5_fc_41;
+static int hf_sbas_l1_mt5_fc_42;
+static int hf_sbas_l1_mt5_fc_43;
+static int hf_sbas_l1_mt5_fc_44;
+static int hf_sbas_l1_mt5_fc_45;
+static int hf_sbas_l1_mt5_fc_46;
+static int hf_sbas_l1_mt5_fc_47;
+static int hf_sbas_l1_mt5_fc_48;
+static int hf_sbas_l1_mt5_fc_49;
+static int hf_sbas_l1_mt5_fc_50;
+static int hf_sbas_l1_mt5_fc_51;
+static int hf_sbas_l1_mt5_fc_52;
+static int hf_sbas_l1_mt5_udrei_40;
+static int hf_sbas_l1_mt5_udrei_41;
+static int hf_sbas_l1_mt5_udrei_42;
+static int hf_sbas_l1_mt5_udrei_43;
+static int hf_sbas_l1_mt5_udrei_44;
+static int hf_sbas_l1_mt5_udrei_45;
+static int hf_sbas_l1_mt5_udrei_46;
+static int hf_sbas_l1_mt5_udrei_47;
+static int hf_sbas_l1_mt5_udrei_48;
+static int hf_sbas_l1_mt5_udrei_49;
+static int hf_sbas_l1_mt5_udrei_50;
+static int hf_sbas_l1_mt5_udrei_51;
+static int hf_sbas_l1_mt5_udrei_52;
 
 // see ICAO Annex 10, Vol I, Table B-40
-static int hf_sbas_l1_mt6          = -1;
-static int hf_sbas_l1_mt6_iodf_2   = -1;
-static int hf_sbas_l1_mt6_iodf_3   = -1;
-static int hf_sbas_l1_mt6_iodf_4   = -1;
-static int hf_sbas_l1_mt6_iodf_5   = -1;
-static int hf_sbas_l1_mt6_udrei_1  = -1;
-static int hf_sbas_l1_mt6_udrei_2  = -1;
-static int hf_sbas_l1_mt6_udrei_3  = -1;
-static int hf_sbas_l1_mt6_udrei_4  = -1;
-static int hf_sbas_l1_mt6_udrei_5  = -1;
-static int hf_sbas_l1_mt6_udrei_6  = -1;
-static int hf_sbas_l1_mt6_udrei_7  = -1;
-static int hf_sbas_l1_mt6_udrei_8  = -1;
-static int hf_sbas_l1_mt6_udrei_9  = -1;
-static int hf_sbas_l1_mt6_udrei_10 = -1;
-static int hf_sbas_l1_mt6_udrei_11 = -1;
-static int hf_sbas_l1_mt6_udrei_12 = -1;
-static int hf_sbas_l1_mt6_udrei_13 = -1;
-static int hf_sbas_l1_mt6_udrei_14 = -1;
-static int hf_sbas_l1_mt6_udrei_15 = -1;
-static int hf_sbas_l1_mt6_udrei_16 = -1;
-static int hf_sbas_l1_mt6_udrei_17 = -1;
-static int hf_sbas_l1_mt6_udrei_18 = -1;
-static int hf_sbas_l1_mt6_udrei_19 = -1;
-static int hf_sbas_l1_mt6_udrei_20 = -1;
-static int hf_sbas_l1_mt6_udrei_21 = -1;
-static int hf_sbas_l1_mt6_udrei_22 = -1;
-static int hf_sbas_l1_mt6_udrei_23 = -1;
-static int hf_sbas_l1_mt6_udrei_24 = -1;
-static int hf_sbas_l1_mt6_udrei_25 = -1;
-static int hf_sbas_l1_mt6_udrei_26 = -1;
-static int hf_sbas_l1_mt6_udrei_27 = -1;
-static int hf_sbas_l1_mt6_udrei_28 = -1;
-static int hf_sbas_l1_mt6_udrei_29 = -1;
-static int hf_sbas_l1_mt6_udrei_30 = -1;
-static int hf_sbas_l1_mt6_udrei_31 = -1;
-static int hf_sbas_l1_mt6_udrei_32 = -1;
-static int hf_sbas_l1_mt6_udrei_33 = -1;
-static int hf_sbas_l1_mt6_udrei_34 = -1;
-static int hf_sbas_l1_mt6_udrei_35 = -1;
-static int hf_sbas_l1_mt6_udrei_36 = -1;
-static int hf_sbas_l1_mt6_udrei_37 = -1;
-static int hf_sbas_l1_mt6_udrei_38 = -1;
-static int hf_sbas_l1_mt6_udrei_39 = -1;
-static int hf_sbas_l1_mt6_udrei_40 = -1;
-static int hf_sbas_l1_mt6_udrei_41 = -1;
-static int hf_sbas_l1_mt6_udrei_42 = -1;
-static int hf_sbas_l1_mt6_udrei_43 = -1;
-static int hf_sbas_l1_mt6_udrei_44 = -1;
-static int hf_sbas_l1_mt6_udrei_45 = -1;
-static int hf_sbas_l1_mt6_udrei_46 = -1;
-static int hf_sbas_l1_mt6_udrei_47 = -1;
-static int hf_sbas_l1_mt6_udrei_48 = -1;
-static int hf_sbas_l1_mt6_udrei_49 = -1;
-static int hf_sbas_l1_mt6_udrei_50 = -1;
-static int hf_sbas_l1_mt6_udrei_51 = -1;
+static int hf_sbas_l1_mt6;
+static int hf_sbas_l1_mt6_iodf_2;
+static int hf_sbas_l1_mt6_iodf_3;
+static int hf_sbas_l1_mt6_iodf_4;
+static int hf_sbas_l1_mt6_iodf_5;
+static int hf_sbas_l1_mt6_udrei_1;
+static int hf_sbas_l1_mt6_udrei_2;
+static int hf_sbas_l1_mt6_udrei_3;
+static int hf_sbas_l1_mt6_udrei_4;
+static int hf_sbas_l1_mt6_udrei_5;
+static int hf_sbas_l1_mt6_udrei_6;
+static int hf_sbas_l1_mt6_udrei_7;
+static int hf_sbas_l1_mt6_udrei_8;
+static int hf_sbas_l1_mt6_udrei_9;
+static int hf_sbas_l1_mt6_udrei_10;
+static int hf_sbas_l1_mt6_udrei_11;
+static int hf_sbas_l1_mt6_udrei_12;
+static int hf_sbas_l1_mt6_udrei_13;
+static int hf_sbas_l1_mt6_udrei_14;
+static int hf_sbas_l1_mt6_udrei_15;
+static int hf_sbas_l1_mt6_udrei_16;
+static int hf_sbas_l1_mt6_udrei_17;
+static int hf_sbas_l1_mt6_udrei_18;
+static int hf_sbas_l1_mt6_udrei_19;
+static int hf_sbas_l1_mt6_udrei_20;
+static int hf_sbas_l1_mt6_udrei_21;
+static int hf_sbas_l1_mt6_udrei_22;
+static int hf_sbas_l1_mt6_udrei_23;
+static int hf_sbas_l1_mt6_udrei_24;
+static int hf_sbas_l1_mt6_udrei_25;
+static int hf_sbas_l1_mt6_udrei_26;
+static int hf_sbas_l1_mt6_udrei_27;
+static int hf_sbas_l1_mt6_udrei_28;
+static int hf_sbas_l1_mt6_udrei_29;
+static int hf_sbas_l1_mt6_udrei_30;
+static int hf_sbas_l1_mt6_udrei_31;
+static int hf_sbas_l1_mt6_udrei_32;
+static int hf_sbas_l1_mt6_udrei_33;
+static int hf_sbas_l1_mt6_udrei_34;
+static int hf_sbas_l1_mt6_udrei_35;
+static int hf_sbas_l1_mt6_udrei_36;
+static int hf_sbas_l1_mt6_udrei_37;
+static int hf_sbas_l1_mt6_udrei_38;
+static int hf_sbas_l1_mt6_udrei_39;
+static int hf_sbas_l1_mt6_udrei_40;
+static int hf_sbas_l1_mt6_udrei_41;
+static int hf_sbas_l1_mt6_udrei_42;
+static int hf_sbas_l1_mt6_udrei_43;
+static int hf_sbas_l1_mt6_udrei_44;
+static int hf_sbas_l1_mt6_udrei_45;
+static int hf_sbas_l1_mt6_udrei_46;
+static int hf_sbas_l1_mt6_udrei_47;
+static int hf_sbas_l1_mt6_udrei_48;
+static int hf_sbas_l1_mt6_udrei_49;
+static int hf_sbas_l1_mt6_udrei_50;
+static int hf_sbas_l1_mt6_udrei_51;
 
 // see ICAO Annex 10, Vol I, Table B-41
-static int hf_sbas_l1_mt7          = -1;
-static int hf_sbas_l1_mt7_t_lat    = -1;
-static int hf_sbas_l1_mt7_iodp     = -1;
-static int hf_sbas_l1_mt7_spare    = -1;
-static int hf_sbas_l1_mt7_ai_1     = -1;
-static int hf_sbas_l1_mt7_ai_2     = -1;
-static int hf_sbas_l1_mt7_ai_3     = -1;
-static int hf_sbas_l1_mt7_ai_4     = -1;
-static int hf_sbas_l1_mt7_ai_5     = -1;
-static int hf_sbas_l1_mt7_ai_6     = -1;
-static int hf_sbas_l1_mt7_ai_7     = -1;
-static int hf_sbas_l1_mt7_ai_8     = -1;
-static int hf_sbas_l1_mt7_ai_9     = -1;
-static int hf_sbas_l1_mt7_ai_10    = -1;
-static int hf_sbas_l1_mt7_ai_11    = -1;
-static int hf_sbas_l1_mt7_ai_12    = -1;
-static int hf_sbas_l1_mt7_ai_13    = -1;
-static int hf_sbas_l1_mt7_ai_14    = -1;
-static int hf_sbas_l1_mt7_ai_15    = -1;
-static int hf_sbas_l1_mt7_ai_16    = -1;
-static int hf_sbas_l1_mt7_ai_17    = -1;
-static int hf_sbas_l1_mt7_ai_18    = -1;
-static int hf_sbas_l1_mt7_ai_19    = -1;
-static int hf_sbas_l1_mt7_ai_20    = -1;
-static int hf_sbas_l1_mt7_ai_21    = -1;
-static int hf_sbas_l1_mt7_ai_22    = -1;
-static int hf_sbas_l1_mt7_ai_23    = -1;
-static int hf_sbas_l1_mt7_ai_24    = -1;
-static int hf_sbas_l1_mt7_ai_25    = -1;
-static int hf_sbas_l1_mt7_ai_26    = -1;
-static int hf_sbas_l1_mt7_ai_27    = -1;
-static int hf_sbas_l1_mt7_ai_28    = -1;
-static int hf_sbas_l1_mt7_ai_29    = -1;
-static int hf_sbas_l1_mt7_ai_30    = -1;
-static int hf_sbas_l1_mt7_ai_31    = -1;
-static int hf_sbas_l1_mt7_ai_32    = -1;
-static int hf_sbas_l1_mt7_ai_33    = -1;
-static int hf_sbas_l1_mt7_ai_34    = -1;
-static int hf_sbas_l1_mt7_ai_35    = -1;
-static int hf_sbas_l1_mt7_ai_36    = -1;
-static int hf_sbas_l1_mt7_ai_37    = -1;
-static int hf_sbas_l1_mt7_ai_38    = -1;
-static int hf_sbas_l1_mt7_ai_39    = -1;
-static int hf_sbas_l1_mt7_ai_40    = -1;
-static int hf_sbas_l1_mt7_ai_41    = -1;
-static int hf_sbas_l1_mt7_ai_42    = -1;
-static int hf_sbas_l1_mt7_ai_43    = -1;
-static int hf_sbas_l1_mt7_ai_44    = -1;
-static int hf_sbas_l1_mt7_ai_45    = -1;
-static int hf_sbas_l1_mt7_ai_46    = -1;
-static int hf_sbas_l1_mt7_ai_47    = -1;
-static int hf_sbas_l1_mt7_ai_48    = -1;
-static int hf_sbas_l1_mt7_ai_49    = -1;
-static int hf_sbas_l1_mt7_ai_50    = -1;
-static int hf_sbas_l1_mt7_ai_51    = -1;
+static int hf_sbas_l1_mt7;
+static int hf_sbas_l1_mt7_t_lat;
+static int hf_sbas_l1_mt7_iodp;
+static int hf_sbas_l1_mt7_spare;
+static int hf_sbas_l1_mt7_ai_1;
+static int hf_sbas_l1_mt7_ai_2;
+static int hf_sbas_l1_mt7_ai_3;
+static int hf_sbas_l1_mt7_ai_4;
+static int hf_sbas_l1_mt7_ai_5;
+static int hf_sbas_l1_mt7_ai_6;
+static int hf_sbas_l1_mt7_ai_7;
+static int hf_sbas_l1_mt7_ai_8;
+static int hf_sbas_l1_mt7_ai_9;
+static int hf_sbas_l1_mt7_ai_10;
+static int hf_sbas_l1_mt7_ai_11;
+static int hf_sbas_l1_mt7_ai_12;
+static int hf_sbas_l1_mt7_ai_13;
+static int hf_sbas_l1_mt7_ai_14;
+static int hf_sbas_l1_mt7_ai_15;
+static int hf_sbas_l1_mt7_ai_16;
+static int hf_sbas_l1_mt7_ai_17;
+static int hf_sbas_l1_mt7_ai_18;
+static int hf_sbas_l1_mt7_ai_19;
+static int hf_sbas_l1_mt7_ai_20;
+static int hf_sbas_l1_mt7_ai_21;
+static int hf_sbas_l1_mt7_ai_22;
+static int hf_sbas_l1_mt7_ai_23;
+static int hf_sbas_l1_mt7_ai_24;
+static int hf_sbas_l1_mt7_ai_25;
+static int hf_sbas_l1_mt7_ai_26;
+static int hf_sbas_l1_mt7_ai_27;
+static int hf_sbas_l1_mt7_ai_28;
+static int hf_sbas_l1_mt7_ai_29;
+static int hf_sbas_l1_mt7_ai_30;
+static int hf_sbas_l1_mt7_ai_31;
+static int hf_sbas_l1_mt7_ai_32;
+static int hf_sbas_l1_mt7_ai_33;
+static int hf_sbas_l1_mt7_ai_34;
+static int hf_sbas_l1_mt7_ai_35;
+static int hf_sbas_l1_mt7_ai_36;
+static int hf_sbas_l1_mt7_ai_37;
+static int hf_sbas_l1_mt7_ai_38;
+static int hf_sbas_l1_mt7_ai_39;
+static int hf_sbas_l1_mt7_ai_40;
+static int hf_sbas_l1_mt7_ai_41;
+static int hf_sbas_l1_mt7_ai_42;
+static int hf_sbas_l1_mt7_ai_43;
+static int hf_sbas_l1_mt7_ai_44;
+static int hf_sbas_l1_mt7_ai_45;
+static int hf_sbas_l1_mt7_ai_46;
+static int hf_sbas_l1_mt7_ai_47;
+static int hf_sbas_l1_mt7_ai_48;
+static int hf_sbas_l1_mt7_ai_49;
+static int hf_sbas_l1_mt7_ai_50;
+static int hf_sbas_l1_mt7_ai_51;
 
 // see ICAO Annex 10, Vol I, Table B-48
-static int hf_sbas_l1_mt25                     = -1;
-static int hf_sbas_l1_mt25_h1_velocity_code    = -1;
-static int hf_sbas_l1_mt25_h1_v0_prn_mask_nr_1 = -1;
-static int hf_sbas_l1_mt25_h1_v0_iod_1         = -1;
-static int hf_sbas_l1_mt25_h1_v0_delta_x_1     = -1;
-static int hf_sbas_l1_mt25_h1_v0_delta_y_1     = -1;
-static int hf_sbas_l1_mt25_h1_v0_delta_z_1     = -1;
-static int hf_sbas_l1_mt25_h1_v0_delta_a_1_f0  = -1;
-static int hf_sbas_l1_mt25_h1_v0_prn_mask_nr_2 = -1;
-static int hf_sbas_l1_mt25_h1_v0_iod_2         = -1;
-static int hf_sbas_l1_mt25_h1_v0_delta_x_2     = -1;
-static int hf_sbas_l1_mt25_h1_v0_delta_y_2     = -1;
-static int hf_sbas_l1_mt25_h1_v0_delta_z_2     = -1;
-static int hf_sbas_l1_mt25_h1_v0_delta_a_2_f0  = -1;
-static int hf_sbas_l1_mt25_h1_v0_iodp          = -1;
-static int hf_sbas_l1_mt25_h1_v0_spare         = -1;
-static int hf_sbas_l1_mt25_h2_velocity_code    = -1;
-static int hf_sbas_l1_mt25_h2_v0_prn_mask_nr_1 = -1;
-static int hf_sbas_l1_mt25_h2_v0_iod_1         = -1;
-static int hf_sbas_l1_mt25_h2_v0_delta_x_1     = -1;
-static int hf_sbas_l1_mt25_h2_v0_delta_y_1     = -1;
-static int hf_sbas_l1_mt25_h2_v0_delta_z_1     = -1;
-static int hf_sbas_l1_mt25_h2_v0_delta_a_1_f0  = -1;
-static int hf_sbas_l1_mt25_h2_v0_prn_mask_nr_2 = -1;
-static int hf_sbas_l1_mt25_h2_v0_iod_2         = -1;
-static int hf_sbas_l1_mt25_h2_v0_delta_x_2     = -1;
-static int hf_sbas_l1_mt25_h2_v0_delta_y_2     = -1;
-static int hf_sbas_l1_mt25_h2_v0_delta_z_2     = -1;
-static int hf_sbas_l1_mt25_h2_v0_delta_a_2_f0  = -1;
-static int hf_sbas_l1_mt25_h2_v0_iodp          = -1;
-static int hf_sbas_l1_mt25_h2_v0_spare         = -1;
+static int hf_sbas_l1_mt25;
+static int hf_sbas_l1_mt25_h1_velocity_code;
+static int hf_sbas_l1_mt25_h1_v0_prn_mask_nr_1;
+static int hf_sbas_l1_mt25_h1_v0_iod_1;
+static int hf_sbas_l1_mt25_h1_v0_delta_x_1;
+static int hf_sbas_l1_mt25_h1_v0_delta_y_1;
+static int hf_sbas_l1_mt25_h1_v0_delta_z_1;
+static int hf_sbas_l1_mt25_h1_v0_delta_a_1_f0;
+static int hf_sbas_l1_mt25_h1_v0_prn_mask_nr_2;
+static int hf_sbas_l1_mt25_h1_v0_iod_2;
+static int hf_sbas_l1_mt25_h1_v0_delta_x_2;
+static int hf_sbas_l1_mt25_h1_v0_delta_y_2;
+static int hf_sbas_l1_mt25_h1_v0_delta_z_2;
+static int hf_sbas_l1_mt25_h1_v0_delta_a_2_f0;
+static int hf_sbas_l1_mt25_h1_v0_iodp;
+static int hf_sbas_l1_mt25_h1_v0_spare;
+static int hf_sbas_l1_mt25_h2_velocity_code;
+static int hf_sbas_l1_mt25_h2_v0_prn_mask_nr_1;
+static int hf_sbas_l1_mt25_h2_v0_iod_1;
+static int hf_sbas_l1_mt25_h2_v0_delta_x_1;
+static int hf_sbas_l1_mt25_h2_v0_delta_y_1;
+static int hf_sbas_l1_mt25_h2_v0_delta_z_1;
+static int hf_sbas_l1_mt25_h2_v0_delta_a_1_f0;
+static int hf_sbas_l1_mt25_h2_v0_prn_mask_nr_2;
+static int hf_sbas_l1_mt25_h2_v0_iod_2;
+static int hf_sbas_l1_mt25_h2_v0_delta_x_2;
+static int hf_sbas_l1_mt25_h2_v0_delta_y_2;
+static int hf_sbas_l1_mt25_h2_v0_delta_z_2;
+static int hf_sbas_l1_mt25_h2_v0_delta_a_2_f0;
+static int hf_sbas_l1_mt25_h2_v0_iodp;
+static int hf_sbas_l1_mt25_h2_v0_spare;
 
 static dissector_table_t sbas_l1_mt_dissector_table;
 
-static expert_field ei_sbas_l1_preamble = EI_INIT;
-static expert_field ei_sbas_l1_mt0      = EI_INIT;
-static expert_field ei_sbas_l1_crc      = EI_INIT;
-
-static int ett_sbas_l1      = -1;
-static int ett_sbas_l1_mt1  = -1;
-static int ett_sbas_l1_mt2  = -1;
-static int ett_sbas_l1_mt3  = -1;
-static int ett_sbas_l1_mt4  = -1;
-static int ett_sbas_l1_mt5  = -1;
-static int ett_sbas_l1_mt6  = -1;
-static int ett_sbas_l1_mt7  = -1;
-static int ett_sbas_l1_mt25 = -1;
+static expert_field ei_sbas_l1_preamble;
+static expert_field ei_sbas_l1_mt0;
+static expert_field ei_sbas_l1_crc;
+
+static int ett_sbas_l1;
+static int ett_sbas_l1_mt1;
+static int ett_sbas_l1_mt2;
+static int ett_sbas_l1_mt3;
+static int ett_sbas_l1_mt4;
+static int ett_sbas_l1_mt5;
+static int ett_sbas_l1_mt6;
+static int ett_sbas_l1_mt7;
+static int ett_sbas_l1_mt25;
 
 // compute the CRC24Q checksum for an SBAS L1 nav msg
 // see ICAO Annex 10, Vol I, Appendix B, Section 3.5.3.5
diff --git a/epan/dissectors/packet-sbc.c b/epan/dissectors/packet-sbc.c
index 6b802078c6..e9d7c74802 100644
--- a/epan/dissectors/packet-sbc.c
+++ b/epan/dissectors/packet-sbc.c
@@ -29,37 +29,37 @@
 
 void proto_register_sbc(void);
 
-static int proto_sbc = -1;
-
-static int hf_sbc_fragmented                                               = -1;
-static int hf_sbc_starting_packet                                          = -1;
-static int hf_sbc_last_packet                                              = -1;
-static int hf_sbc_rfa                                                      = -1;
-static int hf_sbc_number_of_frames                                         = -1;
-
-static int hf_sbc_syncword                                                 = -1;
-static int hf_sbc_sampling_frequency                                       = -1;
-static int hf_sbc_blocks                                                   = -1;
-static int hf_sbc_channel_mode                                             = -1;
-static int hf_sbc_allocation_method                                        = -1;
-static int hf_sbc_subbands                                                 = -1;
-static int hf_sbc_bitpool                                                  = -1;
-static int hf_sbc_crc_check                                                = -1;
-static int hf_sbc_expected_data_speed                                      = -1;
-static int hf_sbc_frame_duration                                           = -1;
-static int hf_sbc_cumulative_frame_duration                               = -1;
-static int hf_sbc_delta_time                                               = -1;
-static int hf_sbc_delta_time_from_the_beginning                            = -1;
-static int hf_sbc_cumulative_duration                                     = -1;
-static int hf_sbc_avrcp_song_position                                      = -1;
-static int hf_sbc_diff                                                     = -1;
-
-static int hf_sbc_data                                                     = -1;
-
-static gint ett_sbc             = -1;
-static gint ett_sbc_list        = -1;
-
-static expert_field ei_sbc_syncword = EI_INIT;
+static int proto_sbc;
+
+static int hf_sbc_fragmented;
+static int hf_sbc_starting_packet;
+static int hf_sbc_last_packet;
+static int hf_sbc_rfa;
+static int hf_sbc_number_of_frames;
+
+static int hf_sbc_syncword;
+static int hf_sbc_sampling_frequency;
+static int hf_sbc_blocks;
+static int hf_sbc_channel_mode;
+static int hf_sbc_allocation_method;
+static int hf_sbc_subbands;
+static int hf_sbc_bitpool;
+static int hf_sbc_crc_check;
+static int hf_sbc_expected_data_speed;
+static int hf_sbc_frame_duration;
+static int hf_sbc_cumulative_frame_duration;
+static int hf_sbc_delta_time;
+static int hf_sbc_delta_time_from_the_beginning;
+static int hf_sbc_cumulative_duration;
+static int hf_sbc_avrcp_song_position;
+static int hf_sbc_diff;
+
+static int hf_sbc_data;
+
+static gint ett_sbc;
+static gint ett_sbc_list;
+
+static expert_field ei_sbc_syncword;
 
 extern value_string_ext media_codec_audio_type_vals_ext;
 
diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c
index be800a526e..0d3225936d 100644
--- a/epan/dissectors/packet-sbus.c
+++ b/epan/dissectors/packet-sbus.c
@@ -186,87 +186,87 @@ static dissector_handle_t sbus_handle;
 #define SBUS_RD_WR_NAK_INVALID_SIZE    0x8A
 
 /* Initialize the protocol and registered fields */
-static int proto_sbus = -1;
-static int hf_sbus_length = -1;
-static int hf_sbus_version = -1;
-static int hf_sbus_protocol = -1;
-static int hf_sbus_sequence = -1;
-static int hf_sbus_attribut = -1;
-static int hf_sbus_dest = -1;
-static int hf_sbus_address = -1;
-static int hf_sbus_command = -1;
-static int hf_sbus_command_extension = -1;
-static int hf_sbus_rcount = -1;
-static int hf_sbus_multimedia_length = -1;
-static int hf_sbus_sub_length = -1;
-static int hf_sbus_wcount = -1;
-static int hf_sbus_wcount_calculated = -1;
-static int hf_sbus_fio_count = -1;
-static int hf_sbus_addr_rtc = -1;
-static int hf_sbus_addr_iof = -1;
-static int hf_sbus_addr_db = -1;
-static int hf_sbus_addr_base_element = -1;
-static int hf_sbus_addr_eeprom = -1;
-static int hf_sbus_addr_prog = -1;
-static int hf_sbus_addr_68k = -1;
-static int hf_sbus_block_type = -1;
-static int hf_sbus_block_nr = -1;
-static int hf_sbus_nbr_elements = -1;
-static int hf_sbus_display_register = -1;
-static int hf_sbus_data_rtc = -1;
-static int hf_sbus_data_byte = -1;
-static int hf_sbus_data_byte_hex = -1;
-static int hf_sbus_data_iof = -1;
-static int hf_sbus_cpu_type = -1;
-static int hf_sbus_fw_version = -1;
-static int hf_sbus_sysinfo_nr = -1;
-static int hf_sbus_sysinfo0_1 = -1;
-static int hf_sbus_sysinfo0_2 = -1;
-static int hf_sbus_sysinfo0_3 = -1;
-static int hf_sbus_sysinfo0_4 = -1;
-static int hf_sbus_sysinfo0_5 = -1;
-static int hf_sbus_acknackcode = -1;
-static int hf_sbus_cpu_status = -1;
-static int hf_sbus_week_day = -1;
-static int hf_sbus_date = -1;
-static int hf_sbus_time = -1;
-static int hf_sbus_crc = -1;
-static int hf_sbus_crc_status = -1;
-static int hf_sbus_flags_accu = -1;
-static int hf_sbus_flags_error = -1;
-static int hf_sbus_flags_negative = -1;
-static int hf_sbus_flags_zero = -1;
+static int proto_sbus;
+static int hf_sbus_length;
+static int hf_sbus_version;
+static int hf_sbus_protocol;
+static int hf_sbus_sequence;
+static int hf_sbus_attribut;
+static int hf_sbus_dest;
+static int hf_sbus_address;
+static int hf_sbus_command;
+static int hf_sbus_command_extension;
+static int hf_sbus_rcount;
+static int hf_sbus_multimedia_length;
+static int hf_sbus_sub_length;
+static int hf_sbus_wcount;
+static int hf_sbus_wcount_calculated;
+static int hf_sbus_fio_count;
+static int hf_sbus_addr_rtc;
+static int hf_sbus_addr_iof;
+static int hf_sbus_addr_db;
+static int hf_sbus_addr_base_element;
+static int hf_sbus_addr_eeprom;
+static int hf_sbus_addr_prog;
+static int hf_sbus_addr_68k;
+static int hf_sbus_block_type;
+static int hf_sbus_block_nr;
+static int hf_sbus_nbr_elements;
+static int hf_sbus_display_register;
+static int hf_sbus_data_rtc;
+static int hf_sbus_data_byte;
+static int hf_sbus_data_byte_hex;
+static int hf_sbus_data_iof;
+static int hf_sbus_cpu_type;
+static int hf_sbus_fw_version;
+static int hf_sbus_sysinfo_nr;
+static int hf_sbus_sysinfo0_1;
+static int hf_sbus_sysinfo0_2;
+static int hf_sbus_sysinfo0_3;
+static int hf_sbus_sysinfo0_4;
+static int hf_sbus_sysinfo0_5;
+static int hf_sbus_acknackcode;
+static int hf_sbus_cpu_status;
+static int hf_sbus_week_day;
+static int hf_sbus_date;
+static int hf_sbus_time;
+static int hf_sbus_crc;
+static int hf_sbus_crc_status;
+static int hf_sbus_flags_accu;
+static int hf_sbus_flags_error;
+static int hf_sbus_flags_negative;
+static int hf_sbus_flags_zero;
 /* Web server telegram */
-static int hf_sbus_web_size = -1;
-static int hf_sbus_web_aid = -1;
-static int hf_sbus_web_seq = -1;
+static int hf_sbus_web_size;
+static int hf_sbus_web_aid;
+static int hf_sbus_web_seq;
 /* Read/Write block telegram*/
-static int hf_sbus_rdwr_block_length = -1;
-static int hf_sbus_rdwr_block_length_ext = -1;
-static int hf_sbus_rdwr_telegram_type = -1;
-static int hf_sbus_rdwr_telegram_sequence = -1;
-static int hf_sbus_rdwr_block_size = -1;
-static int hf_sbus_rdwr_block_addr = -1;
-static int hf_sbus_rdwr_file_name = -1;
-static int hf_sbus_rdwr_list_type = -1;
-static int hf_sbus_rdwr_acknakcode = -1;
+static int hf_sbus_rdwr_block_length;
+static int hf_sbus_rdwr_block_length_ext;
+static int hf_sbus_rdwr_telegram_type;
+static int hf_sbus_rdwr_telegram_sequence;
+static int hf_sbus_rdwr_block_size;
+static int hf_sbus_rdwr_block_addr;
+static int hf_sbus_rdwr_file_name;
+static int hf_sbus_rdwr_list_type;
+static int hf_sbus_rdwr_acknakcode;
 /* Request-Response tracking */
-static int hf_sbus_response_in = -1;
-static int hf_sbus_response_to = -1;
-static int hf_sbus_response_time = -1;
-static int hf_sbus_timeout = -1;
-static int hf_sbus_request_in = -1;
+static int hf_sbus_response_in;
+static int hf_sbus_response_to;
+static int hf_sbus_response_time;
+static int hf_sbus_timeout;
+static int hf_sbus_request_in;
 
 /* Initialize the subtree pointers */
-static gint ett_sbus = -1;
-static gint ett_sbus_ether = -1;
-static gint ett_sbus_data = -1;
-
-static expert_field ei_sbus_retry = EI_INIT;
-static expert_field ei_sbus_telegram_not_acked = EI_INIT;
-static expert_field ei_sbus_crc_bad = EI_INIT;
-static expert_field ei_sbus_telegram_not_implemented = EI_INIT;
-static expert_field ei_sbus_no_request_telegram = EI_INIT;
+static gint ett_sbus;
+static gint ett_sbus_ether;
+static gint ett_sbus_data;
+
+static expert_field ei_sbus_retry;
+static expert_field ei_sbus_telegram_not_acked;
+static expert_field ei_sbus_crc_bad;
+static expert_field ei_sbus_telegram_not_implemented;
+static expert_field ei_sbus_no_request_telegram;
 
 /* True/False strings*/
 static const true_false_string tfs_sbus_flags= {
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index 802482c4c1..374c5c5161 100644
--- a/epan/dissectors/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
@@ -567,146 +567,146 @@ static const value_string sccp_isni_ti_values [] = {
   { 0,                  NULL } };
 
 /* Laded from e212 hf*/
-static int hf_assoc_imsi = -1;
+static int hf_assoc_imsi;
 
 /* Initialize the protocol and registered fields */
-static int proto_sccp = -1;
-static int hf_sccp_message_type = -1;
-static int hf_sccp_variable_pointer1 = -1;
-static int hf_sccp_variable_pointer2 = -1;
-static int hf_sccp_variable_pointer3 = -1;
-static int hf_sccp_optional_pointer = -1;
-static int hf_sccp_param_length = -1;
-static int hf_sccp_ssn = -1;
-static int hf_sccp_gt_digits = -1;
+static int proto_sccp;
+static int hf_sccp_message_type;
+static int hf_sccp_variable_pointer1;
+static int hf_sccp_variable_pointer2;
+static int hf_sccp_variable_pointer3;
+static int hf_sccp_optional_pointer;
+static int hf_sccp_param_length;
+static int hf_sccp_ssn;
+static int hf_sccp_gt_digits;
 
 /* Called Party address */
-static int hf_sccp_called_ansi_national_indicator = -1;
-static int hf_sccp_called_itu_natl_use_bit = -1;
-static int hf_sccp_called_routing_indicator = -1;
-static int hf_sccp_called_itu_global_title_indicator = -1;
-static int hf_sccp_called_ansi_global_title_indicator = -1;
-static int hf_sccp_called_itu_ssn_indicator = -1;
-static int hf_sccp_called_itu_point_code_indicator = -1;
-static int hf_sccp_called_ansi_ssn_indicator = -1;
-static int hf_sccp_called_ansi_point_code_indicator = -1;
-static int hf_sccp_called_ssn = -1;
-static int hf_sccp_called_pc_member = -1;
-static int hf_sccp_called_pc_cluster = -1;
-static int hf_sccp_called_pc_network = -1;
-static int hf_sccp_called_ansi_pc = -1;
-static int hf_sccp_called_chinese_pc = -1;
-static int hf_sccp_called_itu_pc = -1;
-static int hf_sccp_called_japan_pc = -1;
-static int hf_sccp_called_gt_nai = -1;
-static int hf_sccp_called_gt_oe = -1;
-static int hf_sccp_called_gt_tt = -1;
-static int hf_sccp_called_gt_np = -1;
-static int hf_sccp_called_gt_es = -1;
-static int hf_sccp_called_gt_digits = -1;
-static int hf_sccp_called_gt_digits_length = -1;
+static int hf_sccp_called_ansi_national_indicator;
+static int hf_sccp_called_itu_natl_use_bit;
+static int hf_sccp_called_routing_indicator;
+static int hf_sccp_called_itu_global_title_indicator;
+static int hf_sccp_called_ansi_global_title_indicator;
+static int hf_sccp_called_itu_ssn_indicator;
+static int hf_sccp_called_itu_point_code_indicator;
+static int hf_sccp_called_ansi_ssn_indicator;
+static int hf_sccp_called_ansi_point_code_indicator;
+static int hf_sccp_called_ssn;
+static int hf_sccp_called_pc_member;
+static int hf_sccp_called_pc_cluster;
+static int hf_sccp_called_pc_network;
+static int hf_sccp_called_ansi_pc;
+static int hf_sccp_called_chinese_pc;
+static int hf_sccp_called_itu_pc;
+static int hf_sccp_called_japan_pc;
+static int hf_sccp_called_gt_nai;
+static int hf_sccp_called_gt_oe;
+static int hf_sccp_called_gt_tt;
+static int hf_sccp_called_gt_np;
+static int hf_sccp_called_gt_es;
+static int hf_sccp_called_gt_digits;
+static int hf_sccp_called_gt_digits_length;
 
 /* Calling party address */
-static int hf_sccp_calling_ansi_national_indicator = -1;
-static int hf_sccp_calling_itu_natl_use_bit = -1;
-static int hf_sccp_calling_routing_indicator = -1;
-static int hf_sccp_calling_itu_global_title_indicator = -1;
-static int hf_sccp_calling_ansi_global_title_indicator = -1;
-static int hf_sccp_calling_itu_ssn_indicator = -1;
-static int hf_sccp_calling_itu_point_code_indicator = -1;
-static int hf_sccp_calling_ansi_ssn_indicator = -1;
-static int hf_sccp_calling_ansi_point_code_indicator = -1;
-static int hf_sccp_calling_ssn = -1;
-static int hf_sccp_calling_pc_member = -1;
-static int hf_sccp_calling_pc_cluster = -1;
-static int hf_sccp_calling_pc_network = -1;
-static int hf_sccp_calling_ansi_pc = -1;
-static int hf_sccp_calling_chinese_pc = -1;
-static int hf_sccp_calling_itu_pc = -1;
-static int hf_sccp_calling_japan_pc = -1;
-static int hf_sccp_calling_gt_nai = -1;
-static int hf_sccp_calling_gt_oe = -1;
-static int hf_sccp_calling_gt_tt = -1;
-static int hf_sccp_calling_gt_np = -1;
-static int hf_sccp_calling_gt_es = -1;
-static int hf_sccp_calling_gt_digits = -1;
-static int hf_sccp_calling_gt_digits_length = -1;
+static int hf_sccp_calling_ansi_national_indicator;
+static int hf_sccp_calling_itu_natl_use_bit;
+static int hf_sccp_calling_routing_indicator;
+static int hf_sccp_calling_itu_global_title_indicator;
+static int hf_sccp_calling_ansi_global_title_indicator;
+static int hf_sccp_calling_itu_ssn_indicator;
+static int hf_sccp_calling_itu_point_code_indicator;
+static int hf_sccp_calling_ansi_ssn_indicator;
+static int hf_sccp_calling_ansi_point_code_indicator;
+static int hf_sccp_calling_ssn;
+static int hf_sccp_calling_pc_member;
+static int hf_sccp_calling_pc_cluster;
+static int hf_sccp_calling_pc_network;
+static int hf_sccp_calling_ansi_pc;
+static int hf_sccp_calling_chinese_pc;
+static int hf_sccp_calling_itu_pc;
+static int hf_sccp_calling_japan_pc;
+static int hf_sccp_calling_gt_nai;
+static int hf_sccp_calling_gt_oe;
+static int hf_sccp_calling_gt_tt;
+static int hf_sccp_calling_gt_np;
+static int hf_sccp_calling_gt_es;
+static int hf_sccp_calling_gt_digits;
+static int hf_sccp_calling_gt_digits_length;
 
 /* Other parameter values */
-static int hf_sccp_dlr = -1;
-static int hf_sccp_slr = -1;
-static int hf_sccp_lr = -1;
-static int hf_sccp_class = -1;
-static int hf_sccp_handling = -1;
-static int hf_sccp_more = -1;
-static int hf_sccp_rsn = -1;
-static int hf_sccp_sequencing_segmenting_ssn = -1;
-static int hf_sccp_sequencing_segmenting_rsn = -1;
-static int hf_sccp_sequencing_segmenting_more = -1;
-static int hf_sccp_credit = -1;
-static int hf_sccp_release_cause = -1;
-static int hf_sccp_return_cause = -1;
-static int hf_sccp_reset_cause = -1;
-static int hf_sccp_error_cause = -1;
-static int hf_sccp_refusal_cause = -1;
-static int hf_sccp_segmentation_first = -1;
-static int hf_sccp_segmentation_class = -1;
-static int hf_sccp_segmentation_remaining = -1;
-static int hf_sccp_segmentation_slr = -1;
-static int hf_sccp_hop_counter = -1;
-static int hf_sccp_importance = -1;
-static int hf_sccp_ansi_isni_mi = -1;
-static int hf_sccp_ansi_isni_iri = -1;
-static int hf_sccp_ansi_isni_ti = -1;
-static int hf_sccp_ansi_isni_netspec = -1;
-static int hf_sccp_ansi_isni_counter = -1;
-static int hf_sccp_ansi_isni_network = -1;
-static int hf_sccp_ansi_isni_cluster = -1;
-static int hf_sccp_xudt_msg_fragments = -1;
-static int hf_sccp_xudt_msg_fragment = -1;
-static int hf_sccp_xudt_msg_fragment_overlap = -1;
-static int hf_sccp_xudt_msg_fragment_overlap_conflicts = -1;
-static int hf_sccp_xudt_msg_fragment_multiple_tails = -1;
-static int hf_sccp_xudt_msg_fragment_too_long_fragment = -1;
-static int hf_sccp_xudt_msg_fragment_error = -1;
-static int hf_sccp_xudt_msg_fragment_count = -1;
-static int hf_sccp_xudt_msg_reassembled_in = -1;
-static int hf_sccp_xudt_msg_reassembled_length = -1;
-static int hf_sccp_assoc_msg = -1;
-static int hf_sccp_assoc_id = -1;
-static int hf_sccp_segmented_data = -1;
-static int hf_sccp_linked_dissector = -1;
-static int hf_sccp_end_optional_param = -1;
-static int hf_sccp_unknown_message = -1;
-static int hf_sccp_unknown_parameter = -1;
+static int hf_sccp_dlr;
+static int hf_sccp_slr;
+static int hf_sccp_lr;
+static int hf_sccp_class;
+static int hf_sccp_handling;
+static int hf_sccp_more;
+static int hf_sccp_rsn;
+static int hf_sccp_sequencing_segmenting_ssn;
+static int hf_sccp_sequencing_segmenting_rsn;
+static int hf_sccp_sequencing_segmenting_more;
+static int hf_sccp_credit;
+static int hf_sccp_release_cause;
+static int hf_sccp_return_cause;
+static int hf_sccp_reset_cause;
+static int hf_sccp_error_cause;
+static int hf_sccp_refusal_cause;
+static int hf_sccp_segmentation_first;
+static int hf_sccp_segmentation_class;
+static int hf_sccp_segmentation_remaining;
+static int hf_sccp_segmentation_slr;
+static int hf_sccp_hop_counter;
+static int hf_sccp_importance;
+static int hf_sccp_ansi_isni_mi;
+static int hf_sccp_ansi_isni_iri;
+static int hf_sccp_ansi_isni_ti;
+static int hf_sccp_ansi_isni_netspec;
+static int hf_sccp_ansi_isni_counter;
+static int hf_sccp_ansi_isni_network;
+static int hf_sccp_ansi_isni_cluster;
+static int hf_sccp_xudt_msg_fragments;
+static int hf_sccp_xudt_msg_fragment;
+static int hf_sccp_xudt_msg_fragment_overlap;
+static int hf_sccp_xudt_msg_fragment_overlap_conflicts;
+static int hf_sccp_xudt_msg_fragment_multiple_tails;
+static int hf_sccp_xudt_msg_fragment_too_long_fragment;
+static int hf_sccp_xudt_msg_fragment_error;
+static int hf_sccp_xudt_msg_fragment_count;
+static int hf_sccp_xudt_msg_reassembled_in;
+static int hf_sccp_xudt_msg_reassembled_length;
+static int hf_sccp_assoc_msg;
+static int hf_sccp_assoc_id;
+static int hf_sccp_segmented_data;
+static int hf_sccp_linked_dissector;
+static int hf_sccp_end_optional_param;
+static int hf_sccp_unknown_message;
+static int hf_sccp_unknown_parameter;
 
 /* Initialize the subtree pointers */
-static gint ett_sccp = -1;
-static gint ett_sccp_called = -1;
-static gint ett_sccp_called_ai = -1;
-static gint ett_sccp_called_pc = -1;
-static gint ett_sccp_called_gt = -1;
-static gint ett_sccp_called_gt_digits = -1;
-static gint ett_sccp_calling = -1;
-static gint ett_sccp_calling_ai = -1;
-static gint ett_sccp_calling_pc = -1;
-static gint ett_sccp_calling_gt = -1;
-static gint ett_sccp_calling_gt_digits = -1;
-static gint ett_sccp_sequencing_segmenting = -1;
-static gint ett_sccp_segmentation = -1;
-static gint ett_sccp_ansi_isni_routing_control = -1;
-static gint ett_sccp_xudt_msg_fragment = -1;
-static gint ett_sccp_xudt_msg_fragments = -1;
-static gint ett_sccp_assoc = -1;
-
-static expert_field ei_sccp_wrong_length = EI_INIT;
-static expert_field ei_sccp_international_standard_address = EI_INIT;
-static expert_field ei_sccp_no_ssn_present = EI_INIT;
-static expert_field ei_sccp_ssn_zero = EI_INIT;
-static expert_field ei_sccp_class_unexpected = EI_INIT;
-static expert_field ei_sccp_handling_invalid = EI_INIT;
-static expert_field ei_sccp_gt_digits_missing = EI_INIT;
-static expert_field ei_sccp_externally_reassembled = EI_INIT;
+static gint ett_sccp;
+static gint ett_sccp_called;
+static gint ett_sccp_called_ai;
+static gint ett_sccp_called_pc;
+static gint ett_sccp_called_gt;
+static gint ett_sccp_called_gt_digits;
+static gint ett_sccp_calling;
+static gint ett_sccp_calling_ai;
+static gint ett_sccp_calling_pc;
+static gint ett_sccp_calling_gt;
+static gint ett_sccp_calling_gt_digits;
+static gint ett_sccp_sequencing_segmenting;
+static gint ett_sccp_segmentation;
+static gint ett_sccp_ansi_isni_routing_control;
+static gint ett_sccp_xudt_msg_fragment;
+static gint ett_sccp_xudt_msg_fragments;
+static gint ett_sccp_assoc;
+
+static expert_field ei_sccp_wrong_length;
+static expert_field ei_sccp_international_standard_address;
+static expert_field ei_sccp_no_ssn_present;
+static expert_field ei_sccp_ssn_zero;
+static expert_field ei_sccp_class_unexpected;
+static expert_field ei_sccp_handling_invalid;
+static expert_field ei_sccp_gt_digits_missing;
+static expert_field ei_sccp_externally_reassembled;
 
 
 static gboolean sccp_reassemble = TRUE;
diff --git a/epan/dissectors/packet-sccpmg.c b/epan/dissectors/packet-sccpmg.c
index a37115e912..225f35ac56 100644
--- a/epan/dissectors/packet-sccpmg.c
+++ b/epan/dissectors/packet-sccpmg.c
@@ -94,24 +94,24 @@ static const value_string sccpmg_message_type_acro_values[] = {
 #define SCCPMG_SSN_LENGTH    1
 
 /* Initialize the protocol and registered fields */
-static int proto_sccpmg = -1;
-static int hf_sccpmg_message_type = -1;
-static int hf_sccpmg_affected_ssn = -1;
-static int hf_sccpmg_affected_itu_pc = -1;
-static int hf_sccpmg_affected_japan_pc = -1;
-static int hf_sccpmg_affected_ansi_pc = -1;
-static int hf_sccpmg_affected_chinese_pc = -1;
-static int hf_sccpmg_affected_pc_member = -1;
-static int hf_sccpmg_affected_pc_cluster = -1;
-static int hf_sccpmg_affected_pc_network = -1;
-static int hf_sccpmg_smi = -1;
-static int hf_sccpmg_congestion_level = -1;
+static int proto_sccpmg;
+static int hf_sccpmg_message_type;
+static int hf_sccpmg_affected_ssn;
+static int hf_sccpmg_affected_itu_pc;
+static int hf_sccpmg_affected_japan_pc;
+static int hf_sccpmg_affected_ansi_pc;
+static int hf_sccpmg_affected_chinese_pc;
+static int hf_sccpmg_affected_pc_member;
+static int hf_sccpmg_affected_pc_cluster;
+static int hf_sccpmg_affected_pc_network;
+static int hf_sccpmg_smi;
+static int hf_sccpmg_congestion_level;
 
 /* Initialize the subtree pointers */
-static gint ett_sccpmg = -1;
-static gint ett_sccpmg_affected_pc = -1;
+static gint ett_sccpmg;
+static gint ett_sccpmg_affected_pc;
 
-static expert_field ei_sccpmg_unknown_msg = EI_INIT;
+static expert_field ei_sccpmg_unknown_msg;
 
 static void
 dissect_sccpmg_affected_ssn(tvbuff_t *tvb, proto_tree *sccpmg_tree)
diff --git a/epan/dissectors/packet-scop.c b/epan/dissectors/packet-scop.c
index 6386717949..1d6f2e9e81 100644
--- a/epan/dissectors/packet-scop.c
+++ b/epan/dissectors/packet-scop.c
@@ -66,15 +66,15 @@ static void dissect_scop_bridge    (tvbuff_t *tvb, packet_info *pinfo, proto_tre
 static guint get_scop_length(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data);
 
 /*  Initialize protocol and registered fields */
-static int proto_scop = -1;
-static int hf_scop_transport = -1;
-static int hf_scop_version = -1;
-static int hf_scop_length = -1;
-static int hf_scop_service = -1;
-static int hf_scop_type = -1;
-static int hf_scop_status = -1;
-
-static gint ett_scop = -1;
+static int proto_scop;
+static int hf_scop_transport;
+static int hf_scop_version;
+static int hf_scop_length;
+static int hf_scop_service;
+static int hf_scop_type;
+static int hf_scop_status;
+
+static gint ett_scop;
 
 static const value_string scop_transports [] = {
     { SCOP_TRANSPORT_UDP,       "UDP Mode 1" },
diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c
index a9ed01de0f..cdf0c21023 100644
--- a/epan/dissectors/packet-scriptingservice.c
+++ b/epan/dissectors/packet-scriptingservice.c
@@ -27,24 +27,24 @@ static dissector_handle_t ssprotocol_handle;
 
 
 /* Initialize the protocol and registered fields */
-static int proto_ssprotocol     = -1;
+static int proto_ssprotocol;
 static int tap_ssprotocol       = -1;
-static int hf_message_type      = -1;
-static int hf_message_flags     = -1;
-static int hf_message_length    = -1;
-static int hf_message_status    = -1;
-static int hf_message_data      = -1;
-static int hf_message_reason    = -1;
-static int hf_message_info      = -1;
-static int hf_message_hash      = -1;
-static int hf_environment_u_bit = -1;
+static int hf_message_type;
+static int hf_message_flags;
+static int hf_message_length;
+static int hf_message_status;
+static int hf_message_data;
+static int hf_message_reason;
+static int hf_message_info;
+static int hf_message_hash;
+static int hf_environment_u_bit;
 
 static guint64 ssprotocol_total_msgs  = 0;
 static guint64 ssprotocol_total_bytes = 0;
 
 /* Initialize the subtree pointers */
-static gint ett_ssprotocol        = -1;
-static gint ett_environment_flags = -1;
+static gint ett_ssprotocol;
+static gint ett_environment_flags;
 
 /* Dissectors for messages. This is specific to ScriptingServiceProtocol */
 #define MESSAGE_TYPE_LENGTH          1
diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c
index 63a12ff8a5..fb773b6153 100644
--- a/epan/dissectors/packet-scsi-mmc.c
+++ b/epan/dissectors/packet-scsi-mmc.c
@@ -20,192 +20,192 @@
 
 void proto_register_scsi_mmc(void);
 
-static int proto_scsi_mmc = -1;
-int hf_scsi_mmc_opcode = -1;
-static int hf_scsi_mmc_setstreaming_type = -1;
-static int hf_scsi_mmc_setstreaming_param_len = -1;
-static int hf_scsi_mmc_setstreaming_wrc = -1;
-static int hf_scsi_mmc_setstreaming_rdd = -1;
-static int hf_scsi_mmc_setstreaming_exact = -1;
-static int hf_scsi_mmc_setstreaming_ra = -1;
-static int hf_scsi_mmc_setstreaming_start_lba = -1;
-static int hf_scsi_mmc_setstreaming_end_lba = -1;
-static int hf_scsi_mmc_setstreaming_read_size = -1;
-static int hf_scsi_mmc_setstreaming_read_time = -1;
-static int hf_scsi_mmc_setstreaming_write_size = -1;
-static int hf_scsi_mmc_setstreaming_write_time = -1;
-static int hf_scsi_mmc_setcdspeed_rc = -1;
-static int hf_scsi_mmc_rbc_block = -1;
-static int hf_scsi_mmc_rbc_lob_blocks = -1;
-static int hf_scsi_mmc_rbc_alob_blocks = -1;
-static int hf_scsi_mmc_rbc_lob_bytes = -1;
-static int hf_scsi_mmc_rbc_alob_bytes = -1;
-static int hf_scsi_mmc_rti_address_type = -1;
-static int hf_scsi_mmc_rti_damage = -1;
-static int hf_scsi_mmc_rti_copy = -1;
-static int hf_scsi_mmc_rti_track_mode = -1;
-static int hf_scsi_mmc_rti_rt = -1;
-static int hf_scsi_mmc_rti_blank = -1;
-static int hf_scsi_mmc_rti_packet = -1;
-static int hf_scsi_mmc_rti_fp = -1;
-static int hf_scsi_mmc_rti_data_mode = -1;
-static int hf_scsi_mmc_rti_lra_v = -1;
-static int hf_scsi_mmc_rti_nwa_v = -1;
-static int hf_scsi_mmc_report_key_type_code = -1;
-static int hf_scsi_mmc_report_key_vendor_resets = -1;
-static int hf_scsi_mmc_report_key_user_changes = -1;
-static int hf_scsi_mmc_report_key_region_mask = -1;
-static int hf_scsi_mmc_report_key_rpc_scheme = -1;
-static int hf_scsi_mmc_key_class = -1;
-static int hf_scsi_mmc_key_format = -1;
-static int hf_scsi_mmc_disc_info_erasable = -1;
-static int hf_scsi_mmc_disc_info_state_of_last_session = -1;
-static int hf_scsi_mmc_disc_info_disk_status = -1;
-static int hf_scsi_mmc_disc_info_number_of_sessions = -1;
-static int hf_scsi_mmc_disc_info_first_track_in_last_session = -1;
-static int hf_scsi_mmc_disc_info_last_track_in_last_session = -1;
-static int hf_scsi_mmc_disc_info_did_v = -1;
-static int hf_scsi_mmc_disc_info_dbc_v = -1;
-static int hf_scsi_mmc_disc_info_uru = -1;
-static int hf_scsi_mmc_disc_info_dac_v = -1;
-static int hf_scsi_mmc_disc_info_dbit = -1;
-static int hf_scsi_mmc_disc_info_bgfs = -1;
-static int hf_scsi_mmc_disc_info_disc_type = -1;
-static int hf_scsi_mmc_disc_info_disc_identification = -1;
-static int hf_scsi_mmc_disc_info_last_session_lead_in_start_address = -1;
-static int hf_scsi_mmc_disc_info_last_possible_lead_out_start_address = -1;
-static int hf_scsi_mmc_disc_info_disc_bar_code = -1;
-static int hf_scsi_mmc_readtoc_time = -1;
-static int hf_scsi_mmc_readtoc_format = -1;
-static int hf_scsi_mmc_readtoc_first_session = -1;
-static int hf_scsi_mmc_readtoc_last_track = -1;
-static int hf_scsi_mmc_readtoc_last_session = -1;
-static int hf_scsi_mmc_q_subchannel_adr = -1;
-static int hf_scsi_mmc_q_subchannel_control = -1;
-static int hf_scsi_mmc_agid = -1;
-static int hf_scsi_mmc_track = -1;
-static int hf_scsi_mmc_track_size = -1;
-static int hf_scsi_mmc_track_start_address = -1;
-static int hf_scsi_mmc_track_start_time = -1;
-static int hf_scsi_mmc_lba             = -1;
-static int hf_scsi_mmc_session = -1;
-static int hf_scsi_mmc_data_length           = -1;
-static int hf_scsi_mmc_getconf_rt = -1;
-static int hf_scsi_mmc_getconf_starting_feature = -1;
-static int hf_scsi_mmc_getconf_current_profile = -1;
-static int hf_scsi_mmc_feature = -1;
-static int hf_scsi_mmc_feature_version = -1;
-static int hf_scsi_mmc_feature_persistent = -1;
-static int hf_scsi_mmc_feature_current = -1;
-static int hf_scsi_mmc_feature_additional_length = -1;
-static int hf_scsi_mmc_feature_lun_sn = -1;
-static int hf_scsi_mmc_feature_cdread_dap = -1;
-static int hf_scsi_mmc_feature_cdread_c2flag = -1;
-static int hf_scsi_mmc_feature_cdread_cdtext = -1;
-static int hf_scsi_mmc_feature_dvdrw_write = -1;
-static int hf_scsi_mmc_feature_dvdrw_quickstart = -1;
-static int hf_scsi_mmc_feature_dvdrw_closeonly = -1;
-static int hf_scsi_mmc_feature_dvdr_write = -1;
-static int hf_scsi_mmc_feature_tao_buf = -1;
-static int hf_scsi_mmc_feature_tao_rwraw = -1;
-static int hf_scsi_mmc_feature_tao_rwpack = -1;
-static int hf_scsi_mmc_feature_tao_testwrite = -1;
-static int hf_scsi_mmc_feature_tao_cdrw = -1;
-static int hf_scsi_mmc_feature_tao_rwsubcode = -1;
-static int hf_scsi_mmc_feature_dts = -1;
-static int hf_scsi_mmc_feature_sao_buf = -1;
-static int hf_scsi_mmc_feature_sao_sao = -1;
-static int hf_scsi_mmc_feature_sao_rawms = -1;
-static int hf_scsi_mmc_feature_sao_raw = -1;
-static int hf_scsi_mmc_feature_sao_testwrite = -1;
-static int hf_scsi_mmc_feature_sao_cdrw = -1;
-static int hf_scsi_mmc_feature_sao_rw = -1;
-static int hf_scsi_mmc_feature_sao_mcsl = -1;
-static int hf_scsi_mmc_feature_dvdr_buf = -1;
-static int hf_scsi_mmc_feature_dvdr_testwrite = -1;
-static int hf_scsi_mmc_feature_dvdr_dvdrw = -1;
-static int hf_scsi_mmc_feature_profile = -1;
-static int hf_scsi_mmc_feature_profile_current = -1;
-static int hf_scsi_mmc_feature_isw_buf = -1;
-static int hf_scsi_mmc_feature_isw_num_linksize = -1;
-static int hf_scsi_mmc_feature_isw_linksize = -1;
-static int hf_scsi_mmc_read_compatibility_lba             = -1;
-static int hf_scsi_mmc_reservation_size = -1;
-static int hf_scsi_mmc_last_recorded_address = -1;
-static int hf_scsi_mmc_first_track = -1;
-static int hf_scsi_mmc_fixed_packet_size = -1;
-static int hf_scsi_mmc_closetrack_immed = -1;
-static int hf_scsi_mmc_closetrack_func = -1;
-static int hf_scsi_mmc_synccache_immed = -1;
-static int hf_scsi_mmc_synccache_reladr = -1;
-static int hf_scsi_mmc_num_blocks      = -1;
-static int hf_scsi_mmc_next_writable_address = -1;
-static int hf_scsi_mmc_free_blocks = -1;
-static int hf_scsi_mmc_read_dvd_format = -1;
-static int hf_scsi_mmc_disc_book_type = -1;
-static int hf_scsi_mmc_disc_book_version = -1;
-static int hf_scsi_mmc_disc_size_size = -1;
-static int hf_scsi_mmc_disc_size_rate = -1;
-static int hf_scsi_mmc_disc_num_layers = -1;
-static int hf_scsi_mmc_disc_track_path = -1;
-static int hf_scsi_mmc_disc_structure_layer = -1;
-static int hf_scsi_mmc_disc_density_length = -1;
-static int hf_scsi_mmc_disc_density_pitch = -1;
-static int hf_scsi_mmc_disc_first_physical = -1;
-static int hf_scsi_mmc_disc_last_physical = -1;
-static int hf_scsi_mmc_disc_last_physical_layer0 = -1;
-static int hf_scsi_mmc_disc_extended_format_info = -1;
-static int hf_scsi_mmc_disc_application_code = -1;
-static int hf_scsi_mmc_adip_eib0 = -1;
-static int hf_scsi_mmc_adip_eib1 = -1;
-static int hf_scsi_mmc_adip_eib2 = -1;
-static int hf_scsi_mmc_adip_eib3 = -1;
-static int hf_scsi_mmc_adip_eib4 = -1;
-static int hf_scsi_mmc_adip_eib5 = -1;
-static int hf_scsi_mmc_adip_device_manuf_id = -1;
-static int hf_scsi_mmc_adip_media_type_id = -1;
-static int hf_scsi_mmc_adip_product_revision_number = -1;
-static int hf_scsi_mmc_adip_number_of_physical_info = -1;
-static int hf_scsi_mmc_gesn_polled = -1;
-static int hf_scsi_mmc_notification_flags = -1;
-static int hf_scsi_mmc_gesn_device_busy = -1;
-static int hf_scsi_mmc_gesn_multi_initiator = -1;
-static int hf_scsi_mmc_gesn_media = -1;
-static int hf_scsi_mmc_gesn_external_request = -1;
-static int hf_scsi_mmc_gesn_power_mgmt = -1;
-static int hf_scsi_mmc_gesn_operational_change = -1;
-static int hf_scsi_mmc_prevent_allow_flags = -1;
-static int hf_scsi_mmc_prevent_allow_persistent = -1;
-static int hf_scsi_mmc_prevent_allow_prevent = -1;
-static int hf_scsi_mmc_disk_flags = -1;
-static int hf_scsi_mmc_format_flags = -1;
-static int hf_scsi_mmc_track_flags = -1;
-static int hf_scsi_mmc_data_flags = -1;
+static int proto_scsi_mmc;
+int hf_scsi_mmc_opcode;
+static int hf_scsi_mmc_setstreaming_type;
+static int hf_scsi_mmc_setstreaming_param_len;
+static int hf_scsi_mmc_setstreaming_wrc;
+static int hf_scsi_mmc_setstreaming_rdd;
+static int hf_scsi_mmc_setstreaming_exact;
+static int hf_scsi_mmc_setstreaming_ra;
+static int hf_scsi_mmc_setstreaming_start_lba;
+static int hf_scsi_mmc_setstreaming_end_lba;
+static int hf_scsi_mmc_setstreaming_read_size;
+static int hf_scsi_mmc_setstreaming_read_time;
+static int hf_scsi_mmc_setstreaming_write_size;
+static int hf_scsi_mmc_setstreaming_write_time;
+static int hf_scsi_mmc_setcdspeed_rc;
+static int hf_scsi_mmc_rbc_block;
+static int hf_scsi_mmc_rbc_lob_blocks;
+static int hf_scsi_mmc_rbc_alob_blocks;
+static int hf_scsi_mmc_rbc_lob_bytes;
+static int hf_scsi_mmc_rbc_alob_bytes;
+static int hf_scsi_mmc_rti_address_type;
+static int hf_scsi_mmc_rti_damage;
+static int hf_scsi_mmc_rti_copy;
+static int hf_scsi_mmc_rti_track_mode;
+static int hf_scsi_mmc_rti_rt;
+static int hf_scsi_mmc_rti_blank;
+static int hf_scsi_mmc_rti_packet;
+static int hf_scsi_mmc_rti_fp;
+static int hf_scsi_mmc_rti_data_mode;
+static int hf_scsi_mmc_rti_lra_v;
+static int hf_scsi_mmc_rti_nwa_v;
+static int hf_scsi_mmc_report_key_type_code;
+static int hf_scsi_mmc_report_key_vendor_resets;
+static int hf_scsi_mmc_report_key_user_changes;
+static int hf_scsi_mmc_report_key_region_mask;
+static int hf_scsi_mmc_report_key_rpc_scheme;
+static int hf_scsi_mmc_key_class;
+static int hf_scsi_mmc_key_format;
+static int hf_scsi_mmc_disc_info_erasable;
+static int hf_scsi_mmc_disc_info_state_of_last_session;
+static int hf_scsi_mmc_disc_info_disk_status;
+static int hf_scsi_mmc_disc_info_number_of_sessions;
+static int hf_scsi_mmc_disc_info_first_track_in_last_session;
+static int hf_scsi_mmc_disc_info_last_track_in_last_session;
+static int hf_scsi_mmc_disc_info_did_v;
+static int hf_scsi_mmc_disc_info_dbc_v;
+static int hf_scsi_mmc_disc_info_uru;
+static int hf_scsi_mmc_disc_info_dac_v;
+static int hf_scsi_mmc_disc_info_dbit;
+static int hf_scsi_mmc_disc_info_bgfs;
+static int hf_scsi_mmc_disc_info_disc_type;
+static int hf_scsi_mmc_disc_info_disc_identification;
+static int hf_scsi_mmc_disc_info_last_session_lead_in_start_address;
+static int hf_scsi_mmc_disc_info_last_possible_lead_out_start_address;
+static int hf_scsi_mmc_disc_info_disc_bar_code;
+static int hf_scsi_mmc_readtoc_time;
+static int hf_scsi_mmc_readtoc_format;
+static int hf_scsi_mmc_readtoc_first_session;
+static int hf_scsi_mmc_readtoc_last_track;
+static int hf_scsi_mmc_readtoc_last_session;
+static int hf_scsi_mmc_q_subchannel_adr;
+static int hf_scsi_mmc_q_subchannel_control;
+static int hf_scsi_mmc_agid;
+static int hf_scsi_mmc_track;
+static int hf_scsi_mmc_track_size;
+static int hf_scsi_mmc_track_start_address;
+static int hf_scsi_mmc_track_start_time;
+static int hf_scsi_mmc_lba;
+static int hf_scsi_mmc_session;
+static int hf_scsi_mmc_data_length;
+static int hf_scsi_mmc_getconf_rt;
+static int hf_scsi_mmc_getconf_starting_feature;
+static int hf_scsi_mmc_getconf_current_profile;
+static int hf_scsi_mmc_feature;
+static int hf_scsi_mmc_feature_version;
+static int hf_scsi_mmc_feature_persistent;
+static int hf_scsi_mmc_feature_current;
+static int hf_scsi_mmc_feature_additional_length;
+static int hf_scsi_mmc_feature_lun_sn;
+static int hf_scsi_mmc_feature_cdread_dap;
+static int hf_scsi_mmc_feature_cdread_c2flag;
+static int hf_scsi_mmc_feature_cdread_cdtext;
+static int hf_scsi_mmc_feature_dvdrw_write;
+static int hf_scsi_mmc_feature_dvdrw_quickstart;
+static int hf_scsi_mmc_feature_dvdrw_closeonly;
+static int hf_scsi_mmc_feature_dvdr_write;
+static int hf_scsi_mmc_feature_tao_buf;
+static int hf_scsi_mmc_feature_tao_rwraw;
+static int hf_scsi_mmc_feature_tao_rwpack;
+static int hf_scsi_mmc_feature_tao_testwrite;
+static int hf_scsi_mmc_feature_tao_cdrw;
+static int hf_scsi_mmc_feature_tao_rwsubcode;
+static int hf_scsi_mmc_feature_dts;
+static int hf_scsi_mmc_feature_sao_buf;
+static int hf_scsi_mmc_feature_sao_sao;
+static int hf_scsi_mmc_feature_sao_rawms;
+static int hf_scsi_mmc_feature_sao_raw;
+static int hf_scsi_mmc_feature_sao_testwrite;
+static int hf_scsi_mmc_feature_sao_cdrw;
+static int hf_scsi_mmc_feature_sao_rw;
+static int hf_scsi_mmc_feature_sao_mcsl;
+static int hf_scsi_mmc_feature_dvdr_buf;
+static int hf_scsi_mmc_feature_dvdr_testwrite;
+static int hf_scsi_mmc_feature_dvdr_dvdrw;
+static int hf_scsi_mmc_feature_profile;
+static int hf_scsi_mmc_feature_profile_current;
+static int hf_scsi_mmc_feature_isw_buf;
+static int hf_scsi_mmc_feature_isw_num_linksize;
+static int hf_scsi_mmc_feature_isw_linksize;
+static int hf_scsi_mmc_read_compatibility_lba;
+static int hf_scsi_mmc_reservation_size;
+static int hf_scsi_mmc_last_recorded_address;
+static int hf_scsi_mmc_first_track;
+static int hf_scsi_mmc_fixed_packet_size;
+static int hf_scsi_mmc_closetrack_immed;
+static int hf_scsi_mmc_closetrack_func;
+static int hf_scsi_mmc_synccache_immed;
+static int hf_scsi_mmc_synccache_reladr;
+static int hf_scsi_mmc_num_blocks;
+static int hf_scsi_mmc_next_writable_address;
+static int hf_scsi_mmc_free_blocks;
+static int hf_scsi_mmc_read_dvd_format;
+static int hf_scsi_mmc_disc_book_type;
+static int hf_scsi_mmc_disc_book_version;
+static int hf_scsi_mmc_disc_size_size;
+static int hf_scsi_mmc_disc_size_rate;
+static int hf_scsi_mmc_disc_num_layers;
+static int hf_scsi_mmc_disc_track_path;
+static int hf_scsi_mmc_disc_structure_layer;
+static int hf_scsi_mmc_disc_density_length;
+static int hf_scsi_mmc_disc_density_pitch;
+static int hf_scsi_mmc_disc_first_physical;
+static int hf_scsi_mmc_disc_last_physical;
+static int hf_scsi_mmc_disc_last_physical_layer0;
+static int hf_scsi_mmc_disc_extended_format_info;
+static int hf_scsi_mmc_disc_application_code;
+static int hf_scsi_mmc_adip_eib0;
+static int hf_scsi_mmc_adip_eib1;
+static int hf_scsi_mmc_adip_eib2;
+static int hf_scsi_mmc_adip_eib3;
+static int hf_scsi_mmc_adip_eib4;
+static int hf_scsi_mmc_adip_eib5;
+static int hf_scsi_mmc_adip_device_manuf_id;
+static int hf_scsi_mmc_adip_media_type_id;
+static int hf_scsi_mmc_adip_product_revision_number;
+static int hf_scsi_mmc_adip_number_of_physical_info;
+static int hf_scsi_mmc_gesn_polled;
+static int hf_scsi_mmc_notification_flags;
+static int hf_scsi_mmc_gesn_device_busy;
+static int hf_scsi_mmc_gesn_multi_initiator;
+static int hf_scsi_mmc_gesn_media;
+static int hf_scsi_mmc_gesn_external_request;
+static int hf_scsi_mmc_gesn_power_mgmt;
+static int hf_scsi_mmc_gesn_operational_change;
+static int hf_scsi_mmc_prevent_allow_flags;
+static int hf_scsi_mmc_prevent_allow_persistent;
+static int hf_scsi_mmc_prevent_allow_prevent;
+static int hf_scsi_mmc_disk_flags;
+static int hf_scsi_mmc_format_flags;
+static int hf_scsi_mmc_track_flags;
+static int hf_scsi_mmc_data_flags;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_scsi_mmc_getperformance_data_type = -1;
-static int hf_scsi_mmc_setcdspeed_logical_unit_read_speed = -1;
-static int hf_scsi_mmc_read_dvd_agid = -1;
-static int hf_scsi_mmc_read_dvd_layer_number = -1;
-static int hf_scsi_mmc_getperformance_starting_lba = -1;
-static int hf_scsi_mmc_getperformance_max_num_descriptors = -1;
-static int hf_scsi_mmc_getperformance_type = -1;
-static int hf_scsi_mmc_setcdspeed_logical_unit_write_speed = -1;
-static int hf_scsi_mmc_read_dvd_address = -1;
-
-static gint ett_scsi_mmc_profile   = -1;
-static gint ett_scsi_notifications = -1;
-static gint ett_scsi_prevent_allow = -1;
-static gint ett_scsi_disk_flags = -1;
-static gint ett_scsi_format_flags = -1;
-static gint ett_scsi_track_flags = -1;
-static gint ett_scsi_data_flags = -1;
+static int hf_scsi_mmc_getperformance_data_type;
+static int hf_scsi_mmc_setcdspeed_logical_unit_read_speed;
+static int hf_scsi_mmc_read_dvd_agid;
+static int hf_scsi_mmc_read_dvd_layer_number;
+static int hf_scsi_mmc_getperformance_starting_lba;
+static int hf_scsi_mmc_getperformance_max_num_descriptors;
+static int hf_scsi_mmc_getperformance_type;
+static int hf_scsi_mmc_setcdspeed_logical_unit_write_speed;
+static int hf_scsi_mmc_read_dvd_address;
+
+static gint ett_scsi_mmc_profile;
+static gint ett_scsi_notifications;
+static gint ett_scsi_prevent_allow;
+static gint ett_scsi_disk_flags;
+static gint ett_scsi_format_flags;
+static gint ett_scsi_track_flags;
+static gint ett_scsi_data_flags;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_scsi_mmc_unknown_read_dvd_format = EI_INIT;
-static expert_field ei_scsi_mmc_unknown_setstreaming_type = EI_INIT;
-static expert_field ei_scsi_mmc_unknown_format_class = EI_INIT;
-static expert_field ei_scsi_mmc_unknown_read_toc_format = EI_INIT;
-static expert_field ei_scsi_mmc_unknown_feature_data = EI_INIT;
+static expert_field ei_scsi_mmc_unknown_read_dvd_format;
+static expert_field ei_scsi_mmc_unknown_setstreaming_type;
+static expert_field ei_scsi_mmc_unknown_format_class;
+static expert_field ei_scsi_mmc_unknown_read_toc_format;
+static expert_field ei_scsi_mmc_unknown_feature_data;
 
 static const true_false_string scsi_gesn_path = {
     "POLLED operation requested",
diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c
index 4893431640..d3a3ae1dc5 100644
--- a/epan/dissectors/packet-scsi-osd.c
+++ b/epan/dissectors/packet-scsi-osd.c
@@ -22,139 +22,139 @@
 
 void proto_register_scsi_osd(void);
 
-static int proto_scsi_osd                               = -1;
-int hf_scsi_osd_opcode                                  = -1;
-static int hf_scsi_osd_add_cdblen                       = -1;
-static int hf_scsi_osd_svcaction                        = -1;
-static int hf_scsi_osd_option                           = -1;
-static int hf_scsi_osd_option_dpo                       = -1;
-static int hf_scsi_osd_option_fua                       = -1;
-static int hf_scsi_osd_getsetattrib                     = -1;
-static int hf_scsi_osd_timestamps_control               = -1;
-static int hf_scsi_osd_formatted_capacity               = -1;
-static int hf_scsi_osd_get_attributes_page              = -1;
-static int hf_scsi_osd_get_attributes_allocation_length = -1;
-static int hf_scsi_osd_get_attributes_list_length       = -1;
-static int hf_scsi_osd_get_attributes_list_offset       = -1;
-static int hf_scsi_osd_retrieved_attributes_offset      = -1;
-static int hf_scsi_osd_set_attributes_page              = -1;
-static int hf_scsi_osd_set_attribute_length             = -1;
-static int hf_scsi_osd_set_attribute_number             = -1;
-static int hf_scsi_osd_set_attributes_offset            = -1;
-static int hf_scsi_osd_set_attributes_list_length       = -1;
-static int hf_scsi_osd_set_attributes_list_offset       = -1;
-static int hf_scsi_osd_capability_format                = -1;
-static int hf_scsi_osd_key_version                      = -1;
-static int hf_scsi_osd_icva                             = -1;
-static int hf_scsi_osd_security_method                  = -1;
-static int hf_scsi_osd_capability_expiration_time       = -1;
-static int hf_scsi_osd_audit                            = -1;
-static int hf_scsi_osd_capability_discriminator         = -1;
-static int hf_scsi_osd_object_created_time              = -1;
-static int hf_scsi_osd_object_type                      = -1;
-static int hf_scsi_osd_permissions                      = -1;
-static int hf_scsi_osd_permissions_read                 = -1;
-static int hf_scsi_osd_permissions_write                = -1;
-static int hf_scsi_osd_permissions_get_attr             = -1;
-static int hf_scsi_osd_permissions_set_attr             = -1;
-static int hf_scsi_osd_permissions_create               = -1;
-static int hf_scsi_osd_permissions_remove               = -1;
-static int hf_scsi_osd_permissions_obj_mgmt             = -1;
-static int hf_scsi_osd_permissions_append               = -1;
-static int hf_scsi_osd_permissions_dev_mgmt             = -1;
-static int hf_scsi_osd_permissions_global               = -1;
-static int hf_scsi_osd_permissions_pol_sec              = -1;
-static int hf_scsi_osd_object_descriptor_type           = -1;
-static int hf_scsi_osd_object_descriptor                = -1;
-static int hf_scsi_osd_ricv                             = -1;
-static int hf_scsi_osd_request_nonce                    = -1;
-static int hf_scsi_osd_diicvo                           = -1;
-static int hf_scsi_osd_doicvo                           = -1;
-static int hf_scsi_osd_requested_partition_id           = -1;
-static int hf_scsi_osd_sortorder                        = -1;
-static int hf_scsi_osd_partition_id                     = -1;
-static int hf_scsi_osd_list_identifier                  = -1;
-static int hf_scsi_osd_allocation_length                = -1;
-static int hf_scsi_osd_length                           = -1;
-static int hf_scsi_osd_starting_byte_address            = -1;
-static int hf_scsi_osd_initial_object_id                = -1;
-static int hf_scsi_osd_additional_length                = -1;
-static int hf_scsi_osd_continuation_object_id           = -1;
-static int hf_scsi_osd_list_flags_lstchg                = -1;
-static int hf_scsi_osd_list_flags_root                  = -1;
-static int hf_scsi_osd_list_collection_flags_coltn      = -1;
-static int hf_scsi_osd_user_object_id                   = -1;
-static int hf_scsi_osd_requested_user_object_id         = -1;
-static int hf_scsi_osd_number_of_user_objects           = -1;
-static int hf_scsi_osd_key_to_set                       = -1;
-static int hf_scsi_osd_set_key_version                  = -1;
-static int hf_scsi_osd_key_identifier                   = -1;
-static int hf_scsi_osd_seed                             = -1;
-static int hf_scsi_osd_collection_fcr                   = -1;
-static int hf_scsi_osd_collection_object_id             = -1;
-static int hf_scsi_osd_requested_collection_object_id   = -1;
-static int hf_scsi_osd_partition_created_in             = -1;
-static int hf_scsi_osd_partition_removed_in             = -1;
-static int hf_scsi_osd_flush_scope                      = -1;
-static int hf_scsi_osd_flush_collection_scope           = -1;
-static int hf_scsi_osd_flush_partition_scope            = -1;
-static int hf_scsi_osd_flush_osd_scope                  = -1;
-static int hf_scsi_osd_attributes_list_type             = -1;
-static int hf_scsi_osd_attributes_list_length           = -1;
-static int hf_scsi_osd_attributes_page                  = -1;
-static int hf_scsi_osd_attribute_number                 = -1;
-static int hf_scsi_osd_attribute_length                 = -1;
-static int hf_scsi_osd_attrval_user_object_logical_length = -1;
-static int hf_scsi_osd_attrval_object_type              = -1;
-static int hf_scsi_osd_attrval_partition_id             = -1;
-static int hf_scsi_osd_attrval_object_id                = -1;
-static int hf_scsi_osd2_query_type = -1;
-static int hf_scsi_osd2_query_entry_length = -1;
-static int hf_scsi_osd2_query_attributes_page = -1;
-static int hf_scsi_osd2_query_attribute_number = -1;
-static int hf_scsi_osd2_query_minimum_attribute_value_length = -1;
-static int hf_scsi_osd2_query_maximum_attribute_value_length = -1;
+static int proto_scsi_osd;
+int hf_scsi_osd_opcode;
+static int hf_scsi_osd_add_cdblen;
+static int hf_scsi_osd_svcaction;
+static int hf_scsi_osd_option;
+static int hf_scsi_osd_option_dpo;
+static int hf_scsi_osd_option_fua;
+static int hf_scsi_osd_getsetattrib;
+static int hf_scsi_osd_timestamps_control;
+static int hf_scsi_osd_formatted_capacity;
+static int hf_scsi_osd_get_attributes_page;
+static int hf_scsi_osd_get_attributes_allocation_length;
+static int hf_scsi_osd_get_attributes_list_length;
+static int hf_scsi_osd_get_attributes_list_offset;
+static int hf_scsi_osd_retrieved_attributes_offset;
+static int hf_scsi_osd_set_attributes_page;
+static int hf_scsi_osd_set_attribute_length;
+static int hf_scsi_osd_set_attribute_number;
+static int hf_scsi_osd_set_attributes_offset;
+static int hf_scsi_osd_set_attributes_list_length;
+static int hf_scsi_osd_set_attributes_list_offset;
+static int hf_scsi_osd_capability_format;
+static int hf_scsi_osd_key_version;
+static int hf_scsi_osd_icva;
+static int hf_scsi_osd_security_method;
+static int hf_scsi_osd_capability_expiration_time;
+static int hf_scsi_osd_audit;
+static int hf_scsi_osd_capability_discriminator;
+static int hf_scsi_osd_object_created_time;
+static int hf_scsi_osd_object_type;
+static int hf_scsi_osd_permissions;
+static int hf_scsi_osd_permissions_read;
+static int hf_scsi_osd_permissions_write;
+static int hf_scsi_osd_permissions_get_attr;
+static int hf_scsi_osd_permissions_set_attr;
+static int hf_scsi_osd_permissions_create;
+static int hf_scsi_osd_permissions_remove;
+static int hf_scsi_osd_permissions_obj_mgmt;
+static int hf_scsi_osd_permissions_append;
+static int hf_scsi_osd_permissions_dev_mgmt;
+static int hf_scsi_osd_permissions_global;
+static int hf_scsi_osd_permissions_pol_sec;
+static int hf_scsi_osd_object_descriptor_type;
+static int hf_scsi_osd_object_descriptor;
+static int hf_scsi_osd_ricv;
+static int hf_scsi_osd_request_nonce;
+static int hf_scsi_osd_diicvo;
+static int hf_scsi_osd_doicvo;
+static int hf_scsi_osd_requested_partition_id;
+static int hf_scsi_osd_sortorder;
+static int hf_scsi_osd_partition_id;
+static int hf_scsi_osd_list_identifier;
+static int hf_scsi_osd_allocation_length;
+static int hf_scsi_osd_length;
+static int hf_scsi_osd_starting_byte_address;
+static int hf_scsi_osd_initial_object_id;
+static int hf_scsi_osd_additional_length;
+static int hf_scsi_osd_continuation_object_id;
+static int hf_scsi_osd_list_flags_lstchg;
+static int hf_scsi_osd_list_flags_root;
+static int hf_scsi_osd_list_collection_flags_coltn;
+static int hf_scsi_osd_user_object_id;
+static int hf_scsi_osd_requested_user_object_id;
+static int hf_scsi_osd_number_of_user_objects;
+static int hf_scsi_osd_key_to_set;
+static int hf_scsi_osd_set_key_version;
+static int hf_scsi_osd_key_identifier;
+static int hf_scsi_osd_seed;
+static int hf_scsi_osd_collection_fcr;
+static int hf_scsi_osd_collection_object_id;
+static int hf_scsi_osd_requested_collection_object_id;
+static int hf_scsi_osd_partition_created_in;
+static int hf_scsi_osd_partition_removed_in;
+static int hf_scsi_osd_flush_scope;
+static int hf_scsi_osd_flush_collection_scope;
+static int hf_scsi_osd_flush_partition_scope;
+static int hf_scsi_osd_flush_osd_scope;
+static int hf_scsi_osd_attributes_list_type;
+static int hf_scsi_osd_attributes_list_length;
+static int hf_scsi_osd_attributes_page;
+static int hf_scsi_osd_attribute_number;
+static int hf_scsi_osd_attribute_length;
+static int hf_scsi_osd_attrval_user_object_logical_length;
+static int hf_scsi_osd_attrval_object_type;
+static int hf_scsi_osd_attrval_partition_id;
+static int hf_scsi_osd_attrval_object_id;
+static int hf_scsi_osd2_query_type;
+static int hf_scsi_osd2_query_entry_length;
+static int hf_scsi_osd2_query_attributes_page;
+static int hf_scsi_osd2_query_attribute_number;
+static int hf_scsi_osd2_query_minimum_attribute_value_length;
+static int hf_scsi_osd2_query_maximum_attribute_value_length;
 
 /* Fields that are defined in OSD-2 are prefixed with hf_scsi_osd2_ */
-static int hf_scsi_osd2_attributes_list_length      = -1;
-static int hf_scsi_osd2_set_attribute_value         = -1;
-static int hf_scsi_osd2_isolation                   = -1;
-static int hf_scsi_osd2_immed_tr                    = -1;
-static int hf_scsi_osd2_list_attr                   = -1;
-static int hf_scsi_osd2_object_descriptor_format    = -1;
-static int hf_scsi_osd2_matches_collection_object_id = -1;
-static int hf_scsi_osd2_source_collection_object_id = -1;
-static int hf_scsi_osd2_cdb_continuation_length     = -1;
-static int hf_scsi_osd2_cdb_continuation_format     = -1;
-static int hf_scsi_osd2_continued_service_action    = -1;
-static int hf_scsi_osd2_cdb_continuation_descriptor_type = -1;
-static int hf_scsi_osd2_cdb_continuation_descriptor_pad_length = -1;
-static int hf_scsi_osd2_cdb_continuation_descriptor_length = -1;
-static int hf_scsi_osd2_remove_scope                       = -1;
-
-static gint ett_osd_option                  = -1;
-static gint ett_osd_partition               = -1;
-static gint ett_osd_attribute_parameters    = -1;
-static gint ett_osd_capability              = -1;
-static gint ett_osd_permission_bitmask      = -1;
-static gint ett_osd_security_parameters     = -1;
-static gint ett_osd_get_attributes          = -1;
-static gint ett_osd_set_attributes          = -1;
-static gint ett_osd_multi_object            = -1;
-static gint ett_osd_attribute               = -1;
-static gint ett_osd2_query_criteria_entry   = -1;
-
-static expert_field ei_osd_attr_unknown = EI_INIT;
-static expert_field ei_osd2_invalid_offset = EI_INIT;
-static expert_field ei_osd2_invalid_object_descriptor_format = EI_INIT;
-static expert_field ei_osd_unknown_attributes_list_type = EI_INIT;
-static expert_field ei_osd2_cdb_continuation_format_unknown = EI_INIT;
-static expert_field ei_osd2_continued_service_action_mismatch = EI_INIT;
-static expert_field ei_osd2_cdb_continuation_descriptor_type_unknown = EI_INIT;
-static expert_field ei_osd2_cdb_continuation_descriptor_length_invalid = EI_INIT;
-static expert_field ei_osd2_cdb_continuation_length_invalid = EI_INIT;
-static expert_field ei_osd_attr_length_invalid = EI_INIT;
-static expert_field ei_osd2_query_values_equal= EI_INIT;
+static int hf_scsi_osd2_attributes_list_length;
+static int hf_scsi_osd2_set_attribute_value;
+static int hf_scsi_osd2_isolation;
+static int hf_scsi_osd2_immed_tr;
+static int hf_scsi_osd2_list_attr;
+static int hf_scsi_osd2_object_descriptor_format;
+static int hf_scsi_osd2_matches_collection_object_id;
+static int hf_scsi_osd2_source_collection_object_id;
+static int hf_scsi_osd2_cdb_continuation_length;
+static int hf_scsi_osd2_cdb_continuation_format;
+static int hf_scsi_osd2_continued_service_action;
+static int hf_scsi_osd2_cdb_continuation_descriptor_type;
+static int hf_scsi_osd2_cdb_continuation_descriptor_pad_length;
+static int hf_scsi_osd2_cdb_continuation_descriptor_length;
+static int hf_scsi_osd2_remove_scope;
+
+static gint ett_osd_option;
+static gint ett_osd_partition;
+static gint ett_osd_attribute_parameters;
+static gint ett_osd_capability;
+static gint ett_osd_permission_bitmask;
+static gint ett_osd_security_parameters;
+static gint ett_osd_get_attributes;
+static gint ett_osd_set_attributes;
+static gint ett_osd_multi_object;
+static gint ett_osd_attribute;
+static gint ett_osd2_query_criteria_entry;
+
+static expert_field ei_osd_attr_unknown;
+static expert_field ei_osd2_invalid_offset;
+static expert_field ei_osd2_invalid_object_descriptor_format;
+static expert_field ei_osd_unknown_attributes_list_type;
+static expert_field ei_osd2_cdb_continuation_format_unknown;
+static expert_field ei_osd2_continued_service_action_mismatch;
+static expert_field ei_osd2_cdb_continuation_descriptor_type_unknown;
+static expert_field ei_osd2_cdb_continuation_descriptor_length_invalid;
+static expert_field ei_osd2_cdb_continuation_length_invalid;
+static expert_field ei_osd_attr_length_invalid;
+static expert_field ei_osd2_query_values_equal;
 
 #define PAGE_NUMBER_OBJECT          0x00000000
 #define PAGE_NUMBER_PARTITION       0x30000000
diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c
index 7f598e9a31..1233af7690 100644
--- a/epan/dissectors/packet-scsi-sbc.c
+++ b/epan/dissectors/packet-scsi-sbc.c
@@ -31,130 +31,130 @@
 
 void proto_register_scsi_sbc(void);
 
-static int proto_scsi_sbc = -1;
-
-int hf_scsi_sbc_opcode= -1;
-static int hf_scsi_sbc_service_action= -1;
-static int hf_scsi_sbc_formatunit_flags= -1;
-static int hf_scsi_sbc_defect_list_format= -1;
-static int hf_scsi_sbc_formatunit_vendor= -1;
-static int hf_scsi_sbc_formatunit_interleave= -1;
-static int hf_scsi_sbc_rdwr6_lba= -1;
-static int hf_scsi_sbc_rdwr6_xferlen= -1;
-static int hf_scsi_sbc_rdwr10_lba= -1;
-static int hf_scsi_sbc_rdwr10_xferlen= -1;
-static int hf_scsi_sbc_rdwr12_xferlen= -1;
-static int hf_scsi_sbc_rdwr16_lba= -1;
-static int hf_scsi_sbc_ssu_immed_flags= -1;
-static int hf_scsi_sbc_ssu_immed= -1;
-static int hf_scsi_sbc_ssu_pwr_flags= -1;
-static int hf_scsi_sbc_ssu_pwr_cond= -1;
-static int hf_scsi_sbc_ssu_loej= -1;
-static int hf_scsi_sbc_ssu_start= -1;
-static int hf_scsi_sbc_bytchk= -1;
-/* static int hf_scsi_sbc_verify_reladdr= -1; */
-static int hf_scsi_sbc_verify_lba= -1;
-static int hf_scsi_sbc_verify_lba64= -1;
-static int hf_scsi_sbc_verify_vlen= -1;
-static int hf_scsi_sbc_verify_vlen32= -1;
-static int hf_scsi_sbc_wrverify_lba= -1;
-static int hf_scsi_sbc_wrverify_xferlen= -1;
-static int hf_scsi_sbc_wrverify_lba64= -1;
-static int hf_scsi_sbc_wrverify_xferlen32= -1;
-/* static int hf_scsi_sbc_readcapacity_flags= -1; */
-static int hf_scsi_sbc_readdefdata_flags= -1;
-static int hf_scsi_sbc_reassignblks_flags= -1;
-static int hf_scsi_sbc_read_flags= -1;
-static int hf_scsi_sbc_alloclen32= -1;
-static int hf_scsi_sbc_alloclen16= -1;
-static int hf_scsi_sbc_lba64_address= -1;
-static int hf_scsi_sbc_fuflags_fmtpinfo= -1;
-static int hf_scsi_sbc_fuflags_rto_req= -1;
-static int hf_scsi_sbc_fuflags_longlist= -1;
-static int hf_scsi_sbc_fuflags_fmtdata= -1;
-static int hf_scsi_sbc_fuflags_cmplist= -1;
-static int hf_scsi_sbc_prefetch_flags= -1;
-static int hf_scsi_sbc_prefetch_immed= -1;
-static int hf_scsi_sbc_group= -1;
-static int hf_scsi_sbc_rdprotect= -1;
-static int hf_scsi_sbc_dpo= -1;
-static int hf_scsi_sbc_fua= -1;
-static int hf_scsi_sbc_fua_nv= -1;
-static int hf_scsi_sbc_blocksize= -1;
-static int hf_scsi_sbc_returned_lba= -1;
-static int hf_scsi_sbc_req_plist= -1;
-static int hf_scsi_sbc_req_glist= -1;
-static int hf_scsi_sbc_corrct_flags= -1;
-static int hf_scsi_sbc_corrct= -1;
-static int hf_scsi_sbc_reassignblocks_longlba= -1;
-static int hf_scsi_sbc_reassignblocks_longlist= -1;
-static int hf_scsi_sbc_synccache_flags= -1;
-static int hf_scsi_sbc_synccache_immed= -1;
-static int hf_scsi_sbc_synccache_sync_nv= -1;
-static int hf_scsi_sbc_vrprotect= -1;
-static int hf_scsi_sbc_verify_flags= -1;
-static int hf_scsi_sbc_wrprotect= -1;
-static int hf_scsi_sbc_wrverify_flags= -1;
-static int hf_scsi_sbc_writesame_flags= -1;
-static int hf_scsi_sbc_anchor= -1;
-static int hf_scsi_sbc_unmap= -1;
-static int hf_scsi_sbc_pbdata= -1;
-static int hf_scsi_sbc_lbdata= -1;
-static int hf_scsi_sbc_xdread_flags= -1;
-static int hf_scsi_sbc_xorpinfo= -1;
-static int hf_scsi_sbc_disable_write= -1;
-static int hf_scsi_sbc_xdwrite_flags= -1;
-static int hf_scsi_sbc_xdwriteread_flags= -1;
-static int hf_scsi_sbc_xpwrite_flags= -1;
-static int hf_scsi_sbc_unmap_flags= -1;
-static int hf_scsi_sbc_unmap_anchor= -1;
-static int hf_scsi_sbc_unmap_data_length= -1;
-static int hf_scsi_sbc_unmap_block_descriptor_data_length= -1;
-static int hf_scsi_sbc_unmap_lba= -1;
-static int hf_scsi_sbc_unmap_num_blocks= -1;
-static int hf_scsi_sbc_ptype= -1;
-static int hf_scsi_sbc_prot_en= -1;
-static int hf_scsi_sbc_p_i_exponent= -1;
-static int hf_scsi_sbc_lbppbe= -1;
-static int hf_scsi_sbc_lbpme= -1;
-static int hf_scsi_sbc_lbprz= -1;
-static int hf_scsi_sbc_lalba= -1;
-static int hf_scsi_sbc_get_lba_status_lba= -1;
-static int hf_scsi_sbc_get_lba_status_data_length= -1;
-static int hf_scsi_sbc_get_lba_status_num_blocks= -1;
-static int hf_scsi_sbc_get_lba_status_provisioning_status= -1;
-static int hf_scsi_sbc_sanitize_flags= -1;
-static int hf_scsi_sbc_sanitize_immed= -1;
-static int hf_scsi_sbc_sanitize_ause= -1;
-static int hf_scsi_sbc_sanitize_sa= -1;
-static int hf_scsi_sbc_sanitize_overwrite_flags= -1;
-static int hf_scsi_sbc_sanitize_invert= -1;
-static int hf_scsi_sbc_sanitize_test= -1;
-static int hf_scsi_sbc_sanitize_owcount= -1;
-static int hf_scsi_sbc_sanitize_pattern_length= -1;
-static int hf_scsi_sbc_sanitize_pattern= -1;
-
-static gint ett_scsi_format_unit= -1;
-static gint ett_scsi_prefetch= -1;
-static gint ett_scsi_rdwr= -1;
-static gint ett_scsi_xdread= -1;
-static gint ett_scsi_xdwrite= -1;
-static gint ett_scsi_xdwriteread= -1;
-static gint ett_scsi_xpwrite= -1;
-static gint ett_scsi_defectdata= -1;
-static gint ett_scsi_corrct= -1;
-static gint ett_scsi_reassign_blocks= -1;
-static gint ett_scsi_ssu_immed= -1;
-static gint ett_scsi_ssu_pwr= -1;
-static gint ett_scsi_synccache= -1;
-static gint ett_scsi_verify= -1;
-static gint ett_scsi_wrverify= -1;
-static gint ett_scsi_writesame= -1;
-static gint ett_scsi_unmap= -1;
-static gint ett_scsi_unmap_block_descriptor= -1;
-static gint ett_scsi_lba_status_descriptor= -1;
-static gint ett_scsi_sanitize= -1;
-static gint ett_scsi_sanitize_overwrite= -1;
+static int proto_scsi_sbc;
+
+int hf_scsi_sbc_opcode;
+static int hf_scsi_sbc_service_action;
+static int hf_scsi_sbc_formatunit_flags;
+static int hf_scsi_sbc_defect_list_format;
+static int hf_scsi_sbc_formatunit_vendor;
+static int hf_scsi_sbc_formatunit_interleave;
+static int hf_scsi_sbc_rdwr6_lba;
+static int hf_scsi_sbc_rdwr6_xferlen;
+static int hf_scsi_sbc_rdwr10_lba;
+static int hf_scsi_sbc_rdwr10_xferlen;
+static int hf_scsi_sbc_rdwr12_xferlen;
+static int hf_scsi_sbc_rdwr16_lba;
+static int hf_scsi_sbc_ssu_immed_flags;
+static int hf_scsi_sbc_ssu_immed;
+static int hf_scsi_sbc_ssu_pwr_flags;
+static int hf_scsi_sbc_ssu_pwr_cond;
+static int hf_scsi_sbc_ssu_loej;
+static int hf_scsi_sbc_ssu_start;
+static int hf_scsi_sbc_bytchk;
+/* static int hf_scsi_sbc_verify_reladdr; */
+static int hf_scsi_sbc_verify_lba;
+static int hf_scsi_sbc_verify_lba64;
+static int hf_scsi_sbc_verify_vlen;
+static int hf_scsi_sbc_verify_vlen32;
+static int hf_scsi_sbc_wrverify_lba;
+static int hf_scsi_sbc_wrverify_xferlen;
+static int hf_scsi_sbc_wrverify_lba64;
+static int hf_scsi_sbc_wrverify_xferlen32;
+/* static int hf_scsi_sbc_readcapacity_flags; */
+static int hf_scsi_sbc_readdefdata_flags;
+static int hf_scsi_sbc_reassignblks_flags;
+static int hf_scsi_sbc_read_flags;
+static int hf_scsi_sbc_alloclen32;
+static int hf_scsi_sbc_alloclen16;
+static int hf_scsi_sbc_lba64_address;
+static int hf_scsi_sbc_fuflags_fmtpinfo;
+static int hf_scsi_sbc_fuflags_rto_req;
+static int hf_scsi_sbc_fuflags_longlist;
+static int hf_scsi_sbc_fuflags_fmtdata;
+static int hf_scsi_sbc_fuflags_cmplist;
+static int hf_scsi_sbc_prefetch_flags;
+static int hf_scsi_sbc_prefetch_immed;
+static int hf_scsi_sbc_group;
+static int hf_scsi_sbc_rdprotect;
+static int hf_scsi_sbc_dpo;
+static int hf_scsi_sbc_fua;
+static int hf_scsi_sbc_fua_nv;
+static int hf_scsi_sbc_blocksize;
+static int hf_scsi_sbc_returned_lba;
+static int hf_scsi_sbc_req_plist;
+static int hf_scsi_sbc_req_glist;
+static int hf_scsi_sbc_corrct_flags;
+static int hf_scsi_sbc_corrct;
+static int hf_scsi_sbc_reassignblocks_longlba;
+static int hf_scsi_sbc_reassignblocks_longlist;
+static int hf_scsi_sbc_synccache_flags;
+static int hf_scsi_sbc_synccache_immed;
+static int hf_scsi_sbc_synccache_sync_nv;
+static int hf_scsi_sbc_vrprotect;
+static int hf_scsi_sbc_verify_flags;
+static int hf_scsi_sbc_wrprotect;
+static int hf_scsi_sbc_wrverify_flags;
+static int hf_scsi_sbc_writesame_flags;
+static int hf_scsi_sbc_anchor;
+static int hf_scsi_sbc_unmap;
+static int hf_scsi_sbc_pbdata;
+static int hf_scsi_sbc_lbdata;
+static int hf_scsi_sbc_xdread_flags;
+static int hf_scsi_sbc_xorpinfo;
+static int hf_scsi_sbc_disable_write;
+static int hf_scsi_sbc_xdwrite_flags;
+static int hf_scsi_sbc_xdwriteread_flags;
+static int hf_scsi_sbc_xpwrite_flags;
+static int hf_scsi_sbc_unmap_flags;
+static int hf_scsi_sbc_unmap_anchor;
+static int hf_scsi_sbc_unmap_data_length;
+static int hf_scsi_sbc_unmap_block_descriptor_data_length;
+static int hf_scsi_sbc_unmap_lba;
+static int hf_scsi_sbc_unmap_num_blocks;
+static int hf_scsi_sbc_ptype;
+static int hf_scsi_sbc_prot_en;
+static int hf_scsi_sbc_p_i_exponent;
+static int hf_scsi_sbc_lbppbe;
+static int hf_scsi_sbc_lbpme;
+static int hf_scsi_sbc_lbprz;
+static int hf_scsi_sbc_lalba;
+static int hf_scsi_sbc_get_lba_status_lba;
+static int hf_scsi_sbc_get_lba_status_data_length;
+static int hf_scsi_sbc_get_lba_status_num_blocks;
+static int hf_scsi_sbc_get_lba_status_provisioning_status;
+static int hf_scsi_sbc_sanitize_flags;
+static int hf_scsi_sbc_sanitize_immed;
+static int hf_scsi_sbc_sanitize_ause;
+static int hf_scsi_sbc_sanitize_sa;
+static int hf_scsi_sbc_sanitize_overwrite_flags;
+static int hf_scsi_sbc_sanitize_invert;
+static int hf_scsi_sbc_sanitize_test;
+static int hf_scsi_sbc_sanitize_owcount;
+static int hf_scsi_sbc_sanitize_pattern_length;
+static int hf_scsi_sbc_sanitize_pattern;
+
+static gint ett_scsi_format_unit;
+static gint ett_scsi_prefetch;
+static gint ett_scsi_rdwr;
+static gint ett_scsi_xdread;
+static gint ett_scsi_xdwrite;
+static gint ett_scsi_xdwriteread;
+static gint ett_scsi_xpwrite;
+static gint ett_scsi_defectdata;
+static gint ett_scsi_corrct;
+static gint ett_scsi_reassign_blocks;
+static gint ett_scsi_ssu_immed;
+static gint ett_scsi_ssu_pwr;
+static gint ett_scsi_synccache;
+static gint ett_scsi_verify;
+static gint ett_scsi_wrverify;
+static gint ett_scsi_writesame;
+static gint ett_scsi_unmap;
+static gint ett_scsi_unmap_block_descriptor;
+static gint ett_scsi_lba_status_descriptor;
+static gint ett_scsi_sanitize;
+static gint ett_scsi_sanitize_overwrite;
 
 static const true_false_string dpo_tfs = {
     "Disable Page Out (don't cache this data)",
diff --git a/epan/dissectors/packet-scsi-smc.c b/epan/dissectors/packet-scsi-smc.c
index eabab20ac6..fd80ad68b8 100644
--- a/epan/dissectors/packet-scsi-smc.c
+++ b/epan/dissectors/packet-scsi-smc.c
@@ -22,68 +22,68 @@
 
 void proto_register_scsi_smc(void);
 
-static int proto_scsi_smc                       = -1;
-int hf_scsi_smc_opcode                          = -1;
-static int hf_scsi_smc_mta                      = -1;
-static int hf_scsi_smc_sa                       = -1;
-static int hf_scsi_smc_da                       = -1;
-static int hf_scsi_smc_fda                      = -1;
-static int hf_scsi_smc_sda                      = -1;
-static int hf_scsi_smc_medium_flags             = -1;
-static int hf_scsi_smc_inv1                     = -1;
-static int hf_scsi_smc_inv2                     = -1;
-static int hf_scsi_smc_range_flags              = -1;
-static int hf_scsi_smc_fast                     = -1;
-static int hf_scsi_smc_range                    = -1;
-/* static int hf_scsi_smc_sea                   = -1; */
-static int hf_scsi_smc_num_elements             = -1;
-static int hf_scsi_smc_invert                   = -1;
-static int hf_scsi_smc_ea                       = -1;
-static int hf_scsi_smc_action_code              = -1;
+static int proto_scsi_smc;
+int hf_scsi_smc_opcode;
+static int hf_scsi_smc_mta;
+static int hf_scsi_smc_sa;
+static int hf_scsi_smc_da;
+static int hf_scsi_smc_fda;
+static int hf_scsi_smc_sda;
+static int hf_scsi_smc_medium_flags;
+static int hf_scsi_smc_inv1;
+static int hf_scsi_smc_inv2;
+static int hf_scsi_smc_range_flags;
+static int hf_scsi_smc_fast;
+static int hf_scsi_smc_range;
+/* static int hf_scsi_smc_sea; */
+static int hf_scsi_smc_num_elements;
+static int hf_scsi_smc_invert;
+static int hf_scsi_smc_ea;
+static int hf_scsi_smc_action_code;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_scsi_smc_allocation_length = -1;
-static int hf_scsi_smc_first_element_address_reported = -1;
-static int hf_scsi_smc_voltag = -1;
-static int hf_scsi_smc_element_descriptor_length = -1;
-static int hf_scsi_smc_byte_count_of_descriptor_data_available = -1;
-static int hf_scsi_smc_pvoltag = -1;
-static int hf_scsi_smc_code_set = -1;
-static int hf_scsi_smc_starting_element_address = -1;
-static int hf_scsi_smc_curdata = -1;
-static int hf_scsi_smc_element_type_code = -1;
-static int hf_scsi_smc_element_type_code_0F = -1;
-static int hf_scsi_smc_identifier = -1;
-static int hf_scsi_smc_vendor_specific_data = -1;
-static int hf_scsi_smc_source_storage_element_address = -1;
-static int hf_scsi_smc_number_of_elements_available = -1;
-static int hf_scsi_smc_identifier_type = -1;
-static int hf_scsi_smc_number_of_elements = -1;
-static int hf_scsi_smc_identifier_length = -1;
-static int hf_scsi_smc_scsi_bus_address = -1;
-static int hf_scsi_smc_byte_count_of_report_available = -1;
-static int hf_scsi_smc_cmc = -1;
-static int hf_scsi_smc_svalid = -1;
-static int hf_scsi_smc_avoltag = -1;
-static int hf_scsi_smc_access = -1;
-static int hf_scsi_smc_additional_sense_code_qualifier = -1;
-static int hf_scsi_smc_lu_valid = -1;
-static int hf_scsi_smc_dvcid = -1;
-static int hf_scsi_smc_except = -1;
-static int hf_scsi_smc_id_valid = -1;
-static int hf_scsi_smc_not_bus = -1;
-static int hf_scsi_smc_exenab = -1;
-static int hf_scsi_smc_lun = -1;
-static int hf_scsi_smc_inenab = -1;
-static int hf_scsi_smc_full = -1;
-static int hf_scsi_smc_impexp = -1;
-static int hf_scsi_smc_primary_vol_tag_id = -1;
-static int hf_scsi_smc_primary_vol_seq_num = -1;
-static int hf_scsi_smc_alternate_vol_tag_id = -1;
-static int hf_scsi_smc_alternate_vol_seq_num = -1;
-
-static gint ett_scsi_exchange_medium            = -1;
-static gint ett_scsi_range                      = -1;
-static gint ett_scsi_move                       = -1;
+static int hf_scsi_smc_allocation_length;
+static int hf_scsi_smc_first_element_address_reported;
+static int hf_scsi_smc_voltag;
+static int hf_scsi_smc_element_descriptor_length;
+static int hf_scsi_smc_byte_count_of_descriptor_data_available;
+static int hf_scsi_smc_pvoltag;
+static int hf_scsi_smc_code_set;
+static int hf_scsi_smc_starting_element_address;
+static int hf_scsi_smc_curdata;
+static int hf_scsi_smc_element_type_code;
+static int hf_scsi_smc_element_type_code_0F;
+static int hf_scsi_smc_identifier;
+static int hf_scsi_smc_vendor_specific_data;
+static int hf_scsi_smc_source_storage_element_address;
+static int hf_scsi_smc_number_of_elements_available;
+static int hf_scsi_smc_identifier_type;
+static int hf_scsi_smc_number_of_elements;
+static int hf_scsi_smc_identifier_length;
+static int hf_scsi_smc_scsi_bus_address;
+static int hf_scsi_smc_byte_count_of_report_available;
+static int hf_scsi_smc_cmc;
+static int hf_scsi_smc_svalid;
+static int hf_scsi_smc_avoltag;
+static int hf_scsi_smc_access;
+static int hf_scsi_smc_additional_sense_code_qualifier;
+static int hf_scsi_smc_lu_valid;
+static int hf_scsi_smc_dvcid;
+static int hf_scsi_smc_except;
+static int hf_scsi_smc_id_valid;
+static int hf_scsi_smc_not_bus;
+static int hf_scsi_smc_exenab;
+static int hf_scsi_smc_lun;
+static int hf_scsi_smc_inenab;
+static int hf_scsi_smc_full;
+static int hf_scsi_smc_impexp;
+static int hf_scsi_smc_primary_vol_tag_id;
+static int hf_scsi_smc_primary_vol_seq_num;
+static int hf_scsi_smc_alternate_vol_tag_id;
+static int hf_scsi_smc_alternate_vol_seq_num;
+
+static gint ett_scsi_exchange_medium;
+static gint ett_scsi_range;
+static gint ett_scsi_move;
 
 static void
 dissect_smc_exchangemedium (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c
index f1ec682648..0cbaf036d6 100644
--- a/epan/dissectors/packet-scsi-ssc.c
+++ b/epan/dissectors/packet-scsi-ssc.c
@@ -28,85 +28,85 @@
 
 void proto_register_scsi_ssc(void);
 
-static int proto_scsi_ssc               = -1;
-int hf_scsi_ssc_opcode                  = -1;
-static int hf_scsi_ssc_rdwr6_xferlen    = -1;
-static int hf_scsi_ssc_ver16_verlen     = -1;
-static int hf_scsi_ssc_locate10_loid    = -1;
-static int hf_scsi_ssc_locate16_loid    = -1;
-static int hf_scsi_ssc_space6_code      = -1;
-static int hf_scsi_ssc_space6_count     = -1;
-static int hf_scsi_ssc_space16_count    = -1;
-static int hf_scsi_ssc_erase_flags              = -1;
-static int hf_scsi_ssc_fcs                      = -1;
-static int hf_scsi_ssc_lcs                      = -1;
-static int hf_scsi_ssc_erase_immed              = -1;
-static int hf_scsi_ssc_long                     = -1;
-static int hf_scsi_ssc_partition                = -1;
-static int hf_scsi_ssc_lbi                      = -1;
-static int hf_scsi_ssc_verify                   = -1;
-static int hf_scsi_ssc_immed                    = -1;
-static int hf_scsi_ssc_formatmedium_flags       = -1;
-static int hf_scsi_ssc_format                   = -1;
-static int hf_scsi_ssc_rdwr10_xferlen           = -1;
-static int hf_scsi_ssc_loadunload_immed_flags   = -1;
-static int hf_scsi_ssc_loadunload_flags         = -1;
-static int hf_scsi_ssc_hold                     = -1;
-static int hf_scsi_ssc_eot                      = -1;
-static int hf_scsi_ssc_reten                    = -1;
-static int hf_scsi_ssc_load                     = -1;
-static int hf_scsi_ssc_locate_flags             = -1;
-static int hf_scsi_ssc_bt                       = -1;
-static int hf_scsi_ssc_cp                       = -1;
-static int hf_scsi_ssc_dest_type                = -1;
-static int hf_scsi_ssc_bam_flags                = -1;
-static int hf_scsi_ssc_bam                      = -1;
-static int hf_scsi_ssc_read6_flags              = -1;
-static int hf_scsi_ssc_sili                     = -1;
-static int hf_scsi_ssc_fixed                    = -1;
-static int hf_scsi_ssc_bytord                   = -1;
-static int hf_scsi_ssc_bytcmp                   = -1;
-static int hf_scsi_ssc_verify16_immed           = -1;
-static int hf_scsi_ssc_medium_type              = -1;
-static int hf_scsi_ssc_media                    = -1;
-static int hf_scsi_ssc_capacity_prop_value      = -1;
+static int proto_scsi_ssc;
+int hf_scsi_ssc_opcode;
+static int hf_scsi_ssc_rdwr6_xferlen;
+static int hf_scsi_ssc_ver16_verlen;
+static int hf_scsi_ssc_locate10_loid;
+static int hf_scsi_ssc_locate16_loid;
+static int hf_scsi_ssc_space6_code;
+static int hf_scsi_ssc_space6_count;
+static int hf_scsi_ssc_space16_count;
+static int hf_scsi_ssc_erase_flags;
+static int hf_scsi_ssc_fcs;
+static int hf_scsi_ssc_lcs;
+static int hf_scsi_ssc_erase_immed;
+static int hf_scsi_ssc_long;
+static int hf_scsi_ssc_partition;
+static int hf_scsi_ssc_lbi;
+static int hf_scsi_ssc_verify;
+static int hf_scsi_ssc_immed;
+static int hf_scsi_ssc_formatmedium_flags;
+static int hf_scsi_ssc_format;
+static int hf_scsi_ssc_rdwr10_xferlen;
+static int hf_scsi_ssc_loadunload_immed_flags;
+static int hf_scsi_ssc_loadunload_flags;
+static int hf_scsi_ssc_hold;
+static int hf_scsi_ssc_eot;
+static int hf_scsi_ssc_reten;
+static int hf_scsi_ssc_load;
+static int hf_scsi_ssc_locate_flags;
+static int hf_scsi_ssc_bt;
+static int hf_scsi_ssc_cp;
+static int hf_scsi_ssc_dest_type;
+static int hf_scsi_ssc_bam_flags;
+static int hf_scsi_ssc_bam;
+static int hf_scsi_ssc_read6_flags;
+static int hf_scsi_ssc_sili;
+static int hf_scsi_ssc_fixed;
+static int hf_scsi_ssc_bytord;
+static int hf_scsi_ssc_bytcmp;
+static int hf_scsi_ssc_verify16_immed;
+static int hf_scsi_ssc_medium_type;
+static int hf_scsi_ssc_media;
+static int hf_scsi_ssc_capacity_prop_value;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_scsi_ssc_readposition_block_number = -1;
-static int hf_scsi_ssc_readposition_file_number = -1;
-static int hf_scsi_ssc_readposition_parameter_len = -1;
-static int hf_scsi_ssc_readblocklimits_max_block_length_limit = -1;
-static int hf_scsi_ssc_readposition_set_number = -1;
-static int hf_scsi_ssc_readblocklimits_granularity = -1;
-static int hf_scsi_ssc_readposition_flags = -1;
-static int hf_scsi_ssc_readposition_bop = -1;
-static int hf_scsi_ssc_readposition_eop = -1;
-static int hf_scsi_ssc_readposition_mpu = -1;
-static int hf_scsi_ssc_readposition_bcu = -1;
-static int hf_scsi_ssc_readposition_bycu = -1;
-static int hf_scsi_ssc_readposition_bpu = -1;
-static int hf_scsi_ssc_readposition_perr = -1;
-
-
-static int hf_scsi_ssc_readposition_additional_length = -1;
-static int hf_scsi_ssc_readposition_num_blocks_buffer = -1;
-static int hf_scsi_ssc_readposition_last_block_location = -1;
-static int hf_scsi_ssc_erase6_immed = -1;
-static int hf_scsi_ssc_erase6_long = -1;
-static int hf_scsi_ssc_readblocklimits_min_block_length_limit = -1;
-static int hf_scsi_ssc_readposition_service_action = -1;
-static int hf_scsi_ssc_readposition_num_bytes_buffer = -1;
-static int hf_scsi_ssc_readposition_first_block_location = -1;
-static int hf_scsi_ssc_space16_parameter_len = -1;
-static int hf_scsi_ssc_readposition_partition_number = -1;
-
-static gint ett_scsi_erase                      = -1;
-static gint ett_scsi_formatmedium               = -1;
-static gint ett_scsi_loadunload_immed           = -1;
-static gint ett_scsi_loadunload                 = -1;
-static gint ett_scsi_locate                     = -1;
-static gint ett_scsi_bam                        = -1;
-static gint ett_scsi_read6                      = -1;
-static gint ett_scsi_ssc_readposition_flags     = -1;
+static int hf_scsi_ssc_readposition_block_number;
+static int hf_scsi_ssc_readposition_file_number;
+static int hf_scsi_ssc_readposition_parameter_len;
+static int hf_scsi_ssc_readblocklimits_max_block_length_limit;
+static int hf_scsi_ssc_readposition_set_number;
+static int hf_scsi_ssc_readblocklimits_granularity;
+static int hf_scsi_ssc_readposition_flags;
+static int hf_scsi_ssc_readposition_bop;
+static int hf_scsi_ssc_readposition_eop;
+static int hf_scsi_ssc_readposition_mpu;
+static int hf_scsi_ssc_readposition_bcu;
+static int hf_scsi_ssc_readposition_bycu;
+static int hf_scsi_ssc_readposition_bpu;
+static int hf_scsi_ssc_readposition_perr;
+
+
+static int hf_scsi_ssc_readposition_additional_length;
+static int hf_scsi_ssc_readposition_num_blocks_buffer;
+static int hf_scsi_ssc_readposition_last_block_location;
+static int hf_scsi_ssc_erase6_immed;
+static int hf_scsi_ssc_erase6_long;
+static int hf_scsi_ssc_readblocklimits_min_block_length_limit;
+static int hf_scsi_ssc_readposition_service_action;
+static int hf_scsi_ssc_readposition_num_bytes_buffer;
+static int hf_scsi_ssc_readposition_first_block_location;
+static int hf_scsi_ssc_space16_parameter_len;
+static int hf_scsi_ssc_readposition_partition_number;
+
+static gint ett_scsi_erase;
+static gint ett_scsi_formatmedium;
+static gint ett_scsi_loadunload_immed;
+static gint ett_scsi_loadunload;
+static gint ett_scsi_locate;
+static gint ett_scsi_bam;
+static gint ett_scsi_read6;
+static gint ett_scsi_ssc_readposition_flags;
 
 
 static void
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index 5668059cbb..529c01d9ae 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -84,684 +84,684 @@
 
 void proto_register_scsi(void);
 
-static int proto_scsi                           = -1;
-static int hf_scsi_inq_control_vendor_specific  = -1;
-static int hf_scsi_inq_control_reserved         = -1;
-static int hf_scsi_inq_control_naca             = -1;
-static int hf_scsi_inq_control_obs1             = -1;
-static int hf_scsi_inq_control_obs2             = -1;
-static int hf_scsi_inq_control                  = -1;
-static int hf_scsi_control_vendor_specific      = -1;
-static int hf_scsi_control_reserved             = -1;
-static int hf_scsi_control_naca                 = -1;
-static int hf_scsi_control_obs1                 = -1;
-static int hf_scsi_control_obs2                 = -1;
-int hf_scsi_control                      = -1;
-int hf_scsi_alloclen16                   = -1;
-static int hf_scsi_alloclen32                   = -1;
-static int hf_scsi_time                         = -1;
-static int hf_scsi_request_frame                = -1;
-static int hf_scsi_response_frame               = -1;
-static int hf_scsi_status                       = -1;
-static int hf_scsi_spcopcode                    = -1;
-static int hf_scsi_inquiry_flags                = -1;
-static int hf_scsi_inquiry_evpd_page            = -1;
-static int hf_scsi_inquiry_cmdt_page            = -1;
-static int hf_scsi_alloclen                     = -1;
-static int hf_scsi_paramlen                     = -1;
-static int hf_scsi_paramlen16                   = -1;
-static int hf_scsi_modesel_flags                = -1;
-static int hf_scsi_modesns_pc                   = -1;
-static int hf_scsi_modepage_ps                  = -1;
-static int hf_scsi_modepage_spf                 = -1;
-static int hf_scsi_modepage_plen                = -1;
-static int hf_scsi_modepage_tcmos               = -1;
-static int hf_scsi_modepage_scsip               = -1;
-static int hf_scsi_modepage_ialuae              = -1;
-static int hf_scsi_modepage_icp                 = -1;
-static int hf_scsi_modepage_msdl                = -1;
-static int hf_scsi_spc_pagecode                 = -1;
-static int hf_scsi_spc_subpagecode              = -1;
-static int hf_scsi_sbcpagecode                  = -1;
-static int hf_scsi_sscpagecode                  = -1;
-static int hf_scsi_smcpagecode                  = -1;
-static int hf_scsi_mmcpagecode                  = -1;
-static int hf_scsi_modesns_flags                = -1;
-static int hf_scsi_persresvin_svcaction         = -1;
-static int hf_scsi_persresvout_svcaction        = -1;
-static int hf_scsi_persresv_scope               = -1;
-static int hf_scsi_persresv_type                = -1;
-static int hf_scsi_persresvout_reskey           = -1;
-static int hf_scsi_persresvout_sareskey         = -1;
-static int hf_scsi_persresvout_obsolete         = -1;
-static int hf_scsi_persresvout_control          = -1;
-static int hf_scsi_persresvout_rel_tpi          = -1;
-static int hf_scsi_persresvout_transportid_len  = -1;
-static int hf_scsi_persresvout_transportid      = -1;
-static int hf_scsi_persresv_control_rsvd        = -1;
-static int hf_scsi_persresv_control_rsvd1       = -1;
-static int hf_scsi_persresv_control_rsvd2       = -1;
-static int hf_scsi_persresv_control_spec_i_pt   = -1;
-static int hf_scsi_persresv_control_all_tg_pt   = -1;
-static int hf_scsi_persresv_control_aptpl       = -1;
-static int hf_scsi_persresv_control_unreg       = -1;
-static int hf_scsi_release_flags                = -1;
-static int hf_scsi_release_thirdpartyid         = -1;
-static int hf_scsi_select_report                = -1;
-static int hf_scsi_inq_add_len                  = -1;
-static int hf_scsi_inq_peripheral               = -1;
-static int hf_scsi_inq_qualifier                = -1;
-static int hf_scsi_inq_vendor_id                = -1;
-static int hf_scsi_inq_product_id               = -1;
-static int hf_scsi_inq_product_rev              = -1;
-static int hf_scsi_inq_vendor_specific          = -1;
-static int hf_scsi_inq_version_desc             = -1;
-static int hf_scsi_inq_devtype                  = -1;
-static int hf_scsi_inq_rmb                      = -1;
-static int hf_scsi_inq_version                  = -1;
-static int hf_scsi_lun_address_mode             = -1;
-static int hf_scsi_lun                          = -1;
-static int hf_scsi_lun_extended                 = -1;
-static int hf_scsi_extended_add_method_len      = -1;
-static int hf_scsi_extended_add_method          = -1;
-static int hf_scsi_bus                          = -1;
-static int hf_scsi_target                       = -1;
-static int hf_scsi_modesns_errrep               = -1;
-static int hf_scsi_modesns_tst                  = -1;
-static int hf_scsi_modesns_qmod                 = -1;
-static int hf_scsi_modesns_qerr                 = -1;
-static int hf_scsi_modesns_rac                  = -1;
-static int hf_scsi_modesns_tas                  = -1;
-static int hf_scsi_protocol                     = -1;
-static int hf_scsi_sns_errtype                  = -1;
-static int hf_scsi_snskey                       = -1;
-static int hf_scsi_snsinfo                      = -1;
-static int hf_scsi_addlsnslen                   = -1;
-static int hf_scsi_asc                          = -1;
-static int hf_scsi_ascascq                      = -1;
-static int hf_scsi_ascq                         = -1;
-static int hf_scsi_fru                          = -1;
-static int hf_scsi_sksv                         = -1;
-static int hf_scsi_sks_info                     = -1;
-static int hf_scsi_sks_fp_cd                    = -1;
-static int hf_scsi_sks_fp_bpv                   = -1;
-static int hf_scsi_sks_fp_bit                   = -1;
-static int hf_scsi_sks_fp_field                 = -1;
-static int hf_scsi_sns_desc_type                = -1;
-static int hf_scsi_sns_desc_length              = -1;
-static int hf_scsi_sns_osd_object_not_initiated = -1;
-static int hf_scsi_sns_osd_object_completed     = -1;
-static int hf_scsi_sns_osd_object_validation    = -1;
-static int hf_scsi_sns_osd_object_cmd_cap_v     = -1;
-static int hf_scsi_sns_osd_object_command       = -1;
-static int hf_scsi_sns_osd_object_imp_st_att    = -1;
-static int hf_scsi_sns_osd_object_sa_cap_v      = -1;
-static int hf_scsi_sns_osd_object_set_att       = -1;
-static int hf_scsi_sns_osd_object_ga_cap_v      = -1;
-static int hf_scsi_sns_osd_object_get_att       = -1;
-static int hf_scsi_sns_osd_partition_id         = -1;
-static int hf_scsi_sns_osd_object_id            = -1;
-static int hf_scsi_sns_osd_attr_page            = -1;
-static int hf_scsi_sns_osd_attr_number          = -1;
-static int hf_scsi_inq_reladrflags              = -1;
-static int hf_scsi_inq_reladr                   = -1;
-static int hf_scsi_inq_linked                   = -1;
-static int hf_scsi_inq_trandis                  = -1;
-static int hf_scsi_inq_cmdque                   = -1;
-static int hf_scsi_inq_bqueflags                = -1;
-static int hf_scsi_inq_bque                     = -1;
-static int hf_scsi_inq_encserv                  = -1;
-static int hf_scsi_inq_multip                   = -1;
-static int hf_scsi_inq_mchngr                   = -1;
-static int hf_scsi_inq_ackreqq                  = -1;
-static int hf_scsi_inq_sccsflags                = -1;
-static int hf_scsi_inq_sccs                     = -1;
-static int hf_scsi_inq_acc                      = -1;
-static int hf_scsi_inq_tpc                      = -1;
-static int hf_scsi_inq_protect                  = -1;
-static int hf_scsi_inq_tpgs                     = -1;
-static int hf_scsi_inq_acaflags                 = -1;
-static int hf_scsi_inq_rmbflags                 = -1;
-static int hf_scsi_inq_normaca                  = -1;
-static int hf_scsi_inq_hisup                    = -1;
-static int hf_scsi_inq_aerc                     = -1;
-static int hf_scsi_inq_trmtsk                   = -1;
-static int hf_scsi_inq_rdf                      = -1;
-static int hf_scsi_persresv_key                 = -1;
-static int hf_scsi_persresv_scopeaddr           = -1;
-static int hf_scsi_add_cdblen                   = -1;
-static int hf_scsi_svcaction                    = -1;
-static int hf_scsi_wb_mode                      = -1;
-static int hf_scsi_wb_bufferid                  = -1;
-static int hf_scsi_wb_bufoffset                 = -1;
-static int hf_scsi_paramlen24                   = -1;
-static int hf_scsi_senddiag_st_code             = -1;
-static int hf_scsi_senddiag_pf                  = -1;
-static int hf_scsi_senddiag_st                  = -1;
-static int hf_scsi_senddiag_devoff              = -1;
-static int hf_scsi_senddiag_unitoff             = -1;
-static int hf_scsi_fragments                    = -1;
-static int hf_scsi_fragment                     = -1;
-static int hf_scsi_fragment_overlap             = -1;
-static int hf_scsi_fragment_overlap_conflict    = -1;
-static int hf_scsi_fragment_multiple_tails      = -1;
-static int hf_scsi_fragment_too_long_fragment   = -1;
-static int hf_scsi_fragment_error               = -1;
-static int hf_scsi_fragment_count               = -1;
-static int hf_scsi_reassembled_in               = -1;
-static int hf_scsi_reassembled_length           = -1;
-static int hf_scsi_log_ppc_flags                = -1;
-static int hf_scsi_log_pc_flags                 = -1;
-static int hf_scsi_log_parameter_ptr            = -1;
-static int hf_scsi_log_ppc                      = -1;
-static int hf_scsi_log_pcr                      = -1;
-static int hf_scsi_log_sp                       = -1;
-static int hf_scsi_log_pagecode                 = -1;
-static int hf_scsi_log_pc                       = -1;
-static int hf_scsi_log_page_length              = -1;
-static int hf_scsi_log_parameter_code           = -1;
-static int hf_scsi_log_param_len                = -1;
-static int hf_scsi_log_param_flags              = -1;
-static int hf_scsi_log_param_data               = -1;
-static int hf_scsi_log_pf_du                    = -1;
-static int hf_scsi_log_pf_ds                    = -1;
-static int hf_scsi_log_pf_tsd                   = -1;
-static int hf_scsi_log_pf_etc                   = -1;
-static int hf_scsi_log_pf_tmc                   = -1;
-static int hf_scsi_log_pf_lbin                  = -1;
-static int hf_scsi_log_pf_lp                    = -1;
-static int hf_scsi_log_ta_rw                    = -1;
-static int hf_scsi_log_ta_ww                    = -1;
-static int hf_scsi_log_ta_he                    = -1;
-static int hf_scsi_log_ta_media                 = -1;
-static int hf_scsi_log_ta_rf                    = -1;
-static int hf_scsi_log_ta_wf                    = -1;
-static int hf_scsi_log_ta_ml                    = -1;
-static int hf_scsi_log_ta_ndg                   = -1;
-static int hf_scsi_log_ta_wp                    = -1;
-static int hf_scsi_log_ta_nr                    = -1;
-static int hf_scsi_log_ta_cm                    = -1;
-static int hf_scsi_log_ta_uf                    = -1;
-static int hf_scsi_log_ta_rmcf                  = -1;
-static int hf_scsi_log_ta_umcf                  = -1;
-static int hf_scsi_log_ta_mcicf                 = -1;
-static int hf_scsi_log_ta_fe                    = -1;
-static int hf_scsi_log_ta_rof                   = -1;
-static int hf_scsi_log_ta_tdcol                 = -1;
-static int hf_scsi_log_ta_nml                   = -1;
-static int hf_scsi_log_ta_cn                    = -1;
-static int hf_scsi_log_ta_cp                    = -1;
-static int hf_scsi_log_ta_ecm                   = -1;
-static int hf_scsi_log_ta_ict                   = -1;
-static int hf_scsi_log_ta_rr                    = -1;
-static int hf_scsi_log_ta_dpie                  = -1;
-static int hf_scsi_log_ta_cff                   = -1;
-static int hf_scsi_log_ta_psf                   = -1;
-static int hf_scsi_log_ta_pc                    = -1;
-static int hf_scsi_log_ta_dm                    = -1;
-static int hf_scsi_log_ta_hwa                   = -1;
-static int hf_scsi_log_ta_hwb                   = -1;
-static int hf_scsi_log_ta_if                    = -1;
-static int hf_scsi_log_ta_em                    = -1;
-static int hf_scsi_log_ta_dwf                   = -1;
-static int hf_scsi_log_ta_drhu                  = -1;
-static int hf_scsi_log_ta_drtm                  = -1;
-static int hf_scsi_log_ta_drvo                  = -1;
-static int hf_scsi_log_ta_pefa                  = -1;
-static int hf_scsi_log_ta_dire                  = -1;
-static int hf_scsi_log_ta_lost                  = -1;
-static int hf_scsi_log_ta_tduau                 = -1;
-static int hf_scsi_log_ta_tsawf                 = -1;
-static int hf_scsi_log_ta_tsarf                 = -1;
-static int hf_scsi_log_ta_nsod                  = -1;
-static int hf_scsi_log_ta_lofa                  = -1;
-static int hf_scsi_log_ta_uuf                   = -1;
-static int hf_scsi_log_ta_aif                   = -1;
-static int hf_scsi_log_ta_fwf                   = -1;
-static int hf_scsi_log_ta_wmicf                 = -1;
-static int hf_scsi_log_ta_wmoa                  = -1;
-static int hf_scsi_sbc_threshold_exponent       = -1;
-static int hf_scsi_sbc_lbpu                     = -1;
-static int hf_scsi_sbc_lbpws                    = -1;
-static int hf_scsi_sbc_lbpws10                  = -1;
-static int hf_scsi_sbc_lbprz                    = -1;
-static int hf_scsi_sbc_anc_sup                  = -1;
-static int hf_scsi_sbc_dp                       = -1;
-static int hf_scsi_sbc_ptype                    = -1;
-static int hf_scsi_block_limits_wsnz            = -1;
-static int hf_scsi_block_limits_mcawl           = -1;
-static int hf_scsi_block_limits_otlg            = -1;
-static int hf_scsi_block_limits_mtl             = -1;
-static int hf_scsi_block_limits_otl             = -1;
-static int hf_scsi_block_limits_mpl             = -1;
-static int hf_scsi_block_limits_mulc            = -1;
-static int hf_scsi_block_limits_mubdc           = -1;
-static int hf_scsi_block_limits_oug             = -1;
-static int hf_scsi_block_limits_ugavalid        = -1;
-static int hf_scsi_block_limits_uga             = -1;
-static int hf_scsi_block_limits_mwsl            = -1;
-static int hf_scsi_block_limits_matl            = -1;
-static int hf_scsi_block_limits_aa              = -1;
-static int hf_scsi_block_limits_atlg            = -1;
-static int hf_scsi_prevent_allow_flags          = -1;
-static int hf_scsi_prevent_allow_prevent        = -1;
-static int hf_scsi_mpi_service_action           = -1;
-static int hf_scsi_report_opcodes_rctd          = -1;
-static int hf_scsi_report_opcodes_options       = -1;
-static int hf_scsi_report_opcodes_requested_o   = -1;
-static int hf_scsi_report_opcodes_requested_sa  = -1;
-static int hf_scsi_report_opcodes_cdl           = -1;
-static int hf_scsi_report_opcodes_sa            = -1;
-static int hf_scsi_report_opcodes_ctdp          = -1;
-static int hf_scsi_report_opcodes_ctdp_one      = -1;
-static int hf_scsi_report_opcodes_servactv      = -1;
-static int hf_scsi_report_opcodes_cdb_length    = -1;
-static int hf_scsi_report_opcodes_support       = -1;
-static int hf_scsi_report_opcodes_cdb_usage_data = -1;
-static int hf_scsi_report_opcodes_tdl           = -1;
-static int hf_scsi_report_opcodes_npt           = -1;
-static int hf_scsi_report_opcodes_rct           = -1;
-static int hf_scsi_inquiry_bdc_mrr              = -1;
-static int hf_scsi_inquiry_bdc_pt               = -1;
-static int hf_scsi_inquiry_bdc_wabereq          = -1;
-static int hf_scsi_inquiry_bdc_wacereq          = -1;
-static int hf_scsi_inquiry_bdc_nff              = -1;
-static int hf_scsi_inquiry_bdc_fuab              = -1;
-static int hf_scsi_inquiry_bdc_vbuls            = -1;
+static int proto_scsi;
+static int hf_scsi_inq_control_vendor_specific;
+static int hf_scsi_inq_control_reserved;
+static int hf_scsi_inq_control_naca;
+static int hf_scsi_inq_control_obs1;
+static int hf_scsi_inq_control_obs2;
+static int hf_scsi_inq_control;
+static int hf_scsi_control_vendor_specific;
+static int hf_scsi_control_reserved;
+static int hf_scsi_control_naca;
+static int hf_scsi_control_obs1;
+static int hf_scsi_control_obs2;
+int hf_scsi_control;
+int hf_scsi_alloclen16;
+static int hf_scsi_alloclen32;
+static int hf_scsi_time;
+static int hf_scsi_request_frame;
+static int hf_scsi_response_frame;
+static int hf_scsi_status;
+static int hf_scsi_spcopcode;
+static int hf_scsi_inquiry_flags;
+static int hf_scsi_inquiry_evpd_page;
+static int hf_scsi_inquiry_cmdt_page;
+static int hf_scsi_alloclen;
+static int hf_scsi_paramlen;
+static int hf_scsi_paramlen16;
+static int hf_scsi_modesel_flags;
+static int hf_scsi_modesns_pc;
+static int hf_scsi_modepage_ps;
+static int hf_scsi_modepage_spf;
+static int hf_scsi_modepage_plen;
+static int hf_scsi_modepage_tcmos;
+static int hf_scsi_modepage_scsip;
+static int hf_scsi_modepage_ialuae;
+static int hf_scsi_modepage_icp;
+static int hf_scsi_modepage_msdl;
+static int hf_scsi_spc_pagecode;
+static int hf_scsi_spc_subpagecode;
+static int hf_scsi_sbcpagecode;
+static int hf_scsi_sscpagecode;
+static int hf_scsi_smcpagecode;
+static int hf_scsi_mmcpagecode;
+static int hf_scsi_modesns_flags;
+static int hf_scsi_persresvin_svcaction;
+static int hf_scsi_persresvout_svcaction;
+static int hf_scsi_persresv_scope;
+static int hf_scsi_persresv_type;
+static int hf_scsi_persresvout_reskey;
+static int hf_scsi_persresvout_sareskey;
+static int hf_scsi_persresvout_obsolete;
+static int hf_scsi_persresvout_control;
+static int hf_scsi_persresvout_rel_tpi;
+static int hf_scsi_persresvout_transportid_len;
+static int hf_scsi_persresvout_transportid;
+static int hf_scsi_persresv_control_rsvd;
+static int hf_scsi_persresv_control_rsvd1;
+static int hf_scsi_persresv_control_rsvd2;
+static int hf_scsi_persresv_control_spec_i_pt;
+static int hf_scsi_persresv_control_all_tg_pt;
+static int hf_scsi_persresv_control_aptpl;
+static int hf_scsi_persresv_control_unreg;
+static int hf_scsi_release_flags;
+static int hf_scsi_release_thirdpartyid;
+static int hf_scsi_select_report;
+static int hf_scsi_inq_add_len;
+static int hf_scsi_inq_peripheral;
+static int hf_scsi_inq_qualifier;
+static int hf_scsi_inq_vendor_id;
+static int hf_scsi_inq_product_id;
+static int hf_scsi_inq_product_rev;
+static int hf_scsi_inq_vendor_specific;
+static int hf_scsi_inq_version_desc;
+static int hf_scsi_inq_devtype;
+static int hf_scsi_inq_rmb;
+static int hf_scsi_inq_version;
+static int hf_scsi_lun_address_mode;
+static int hf_scsi_lun;
+static int hf_scsi_lun_extended;
+static int hf_scsi_extended_add_method_len;
+static int hf_scsi_extended_add_method;
+static int hf_scsi_bus;
+static int hf_scsi_target;
+static int hf_scsi_modesns_errrep;
+static int hf_scsi_modesns_tst;
+static int hf_scsi_modesns_qmod;
+static int hf_scsi_modesns_qerr;
+static int hf_scsi_modesns_rac;
+static int hf_scsi_modesns_tas;
+static int hf_scsi_protocol;
+static int hf_scsi_sns_errtype;
+static int hf_scsi_snskey;
+static int hf_scsi_snsinfo;
+static int hf_scsi_addlsnslen;
+static int hf_scsi_asc;
+static int hf_scsi_ascascq;
+static int hf_scsi_ascq;
+static int hf_scsi_fru;
+static int hf_scsi_sksv;
+static int hf_scsi_sks_info;
+static int hf_scsi_sks_fp_cd;
+static int hf_scsi_sks_fp_bpv;
+static int hf_scsi_sks_fp_bit;
+static int hf_scsi_sks_fp_field;
+static int hf_scsi_sns_desc_type;
+static int hf_scsi_sns_desc_length;
+static int hf_scsi_sns_osd_object_not_initiated;
+static int hf_scsi_sns_osd_object_completed;
+static int hf_scsi_sns_osd_object_validation;
+static int hf_scsi_sns_osd_object_cmd_cap_v;
+static int hf_scsi_sns_osd_object_command;
+static int hf_scsi_sns_osd_object_imp_st_att;
+static int hf_scsi_sns_osd_object_sa_cap_v;
+static int hf_scsi_sns_osd_object_set_att;
+static int hf_scsi_sns_osd_object_ga_cap_v;
+static int hf_scsi_sns_osd_object_get_att;
+static int hf_scsi_sns_osd_partition_id;
+static int hf_scsi_sns_osd_object_id;
+static int hf_scsi_sns_osd_attr_page;
+static int hf_scsi_sns_osd_attr_number;
+static int hf_scsi_inq_reladrflags;
+static int hf_scsi_inq_reladr;
+static int hf_scsi_inq_linked;
+static int hf_scsi_inq_trandis;
+static int hf_scsi_inq_cmdque;
+static int hf_scsi_inq_bqueflags;
+static int hf_scsi_inq_bque;
+static int hf_scsi_inq_encserv;
+static int hf_scsi_inq_multip;
+static int hf_scsi_inq_mchngr;
+static int hf_scsi_inq_ackreqq;
+static int hf_scsi_inq_sccsflags;
+static int hf_scsi_inq_sccs;
+static int hf_scsi_inq_acc;
+static int hf_scsi_inq_tpc;
+static int hf_scsi_inq_protect;
+static int hf_scsi_inq_tpgs;
+static int hf_scsi_inq_acaflags;
+static int hf_scsi_inq_rmbflags;
+static int hf_scsi_inq_normaca;
+static int hf_scsi_inq_hisup;
+static int hf_scsi_inq_aerc;
+static int hf_scsi_inq_trmtsk;
+static int hf_scsi_inq_rdf;
+static int hf_scsi_persresv_key;
+static int hf_scsi_persresv_scopeaddr;
+static int hf_scsi_add_cdblen;
+static int hf_scsi_svcaction;
+static int hf_scsi_wb_mode;
+static int hf_scsi_wb_bufferid;
+static int hf_scsi_wb_bufoffset;
+static int hf_scsi_paramlen24;
+static int hf_scsi_senddiag_st_code;
+static int hf_scsi_senddiag_pf;
+static int hf_scsi_senddiag_st;
+static int hf_scsi_senddiag_devoff;
+static int hf_scsi_senddiag_unitoff;
+static int hf_scsi_fragments;
+static int hf_scsi_fragment;
+static int hf_scsi_fragment_overlap;
+static int hf_scsi_fragment_overlap_conflict;
+static int hf_scsi_fragment_multiple_tails;
+static int hf_scsi_fragment_too_long_fragment;
+static int hf_scsi_fragment_error;
+static int hf_scsi_fragment_count;
+static int hf_scsi_reassembled_in;
+static int hf_scsi_reassembled_length;
+static int hf_scsi_log_ppc_flags;
+static int hf_scsi_log_pc_flags;
+static int hf_scsi_log_parameter_ptr;
+static int hf_scsi_log_ppc;
+static int hf_scsi_log_pcr;
+static int hf_scsi_log_sp;
+static int hf_scsi_log_pagecode;
+static int hf_scsi_log_pc;
+static int hf_scsi_log_page_length;
+static int hf_scsi_log_parameter_code;
+static int hf_scsi_log_param_len;
+static int hf_scsi_log_param_flags;
+static int hf_scsi_log_param_data;
+static int hf_scsi_log_pf_du;
+static int hf_scsi_log_pf_ds;
+static int hf_scsi_log_pf_tsd;
+static int hf_scsi_log_pf_etc;
+static int hf_scsi_log_pf_tmc;
+static int hf_scsi_log_pf_lbin;
+static int hf_scsi_log_pf_lp;
+static int hf_scsi_log_ta_rw;
+static int hf_scsi_log_ta_ww;
+static int hf_scsi_log_ta_he;
+static int hf_scsi_log_ta_media;
+static int hf_scsi_log_ta_rf;
+static int hf_scsi_log_ta_wf;
+static int hf_scsi_log_ta_ml;
+static int hf_scsi_log_ta_ndg;
+static int hf_scsi_log_ta_wp;
+static int hf_scsi_log_ta_nr;
+static int hf_scsi_log_ta_cm;
+static int hf_scsi_log_ta_uf;
+static int hf_scsi_log_ta_rmcf;
+static int hf_scsi_log_ta_umcf;
+static int hf_scsi_log_ta_mcicf;
+static int hf_scsi_log_ta_fe;
+static int hf_scsi_log_ta_rof;
+static int hf_scsi_log_ta_tdcol;
+static int hf_scsi_log_ta_nml;
+static int hf_scsi_log_ta_cn;
+static int hf_scsi_log_ta_cp;
+static int hf_scsi_log_ta_ecm;
+static int hf_scsi_log_ta_ict;
+static int hf_scsi_log_ta_rr;
+static int hf_scsi_log_ta_dpie;
+static int hf_scsi_log_ta_cff;
+static int hf_scsi_log_ta_psf;
+static int hf_scsi_log_ta_pc;
+static int hf_scsi_log_ta_dm;
+static int hf_scsi_log_ta_hwa;
+static int hf_scsi_log_ta_hwb;
+static int hf_scsi_log_ta_if;
+static int hf_scsi_log_ta_em;
+static int hf_scsi_log_ta_dwf;
+static int hf_scsi_log_ta_drhu;
+static int hf_scsi_log_ta_drtm;
+static int hf_scsi_log_ta_drvo;
+static int hf_scsi_log_ta_pefa;
+static int hf_scsi_log_ta_dire;
+static int hf_scsi_log_ta_lost;
+static int hf_scsi_log_ta_tduau;
+static int hf_scsi_log_ta_tsawf;
+static int hf_scsi_log_ta_tsarf;
+static int hf_scsi_log_ta_nsod;
+static int hf_scsi_log_ta_lofa;
+static int hf_scsi_log_ta_uuf;
+static int hf_scsi_log_ta_aif;
+static int hf_scsi_log_ta_fwf;
+static int hf_scsi_log_ta_wmicf;
+static int hf_scsi_log_ta_wmoa;
+static int hf_scsi_sbc_threshold_exponent;
+static int hf_scsi_sbc_lbpu;
+static int hf_scsi_sbc_lbpws;
+static int hf_scsi_sbc_lbpws10;
+static int hf_scsi_sbc_lbprz;
+static int hf_scsi_sbc_anc_sup;
+static int hf_scsi_sbc_dp;
+static int hf_scsi_sbc_ptype;
+static int hf_scsi_block_limits_wsnz;
+static int hf_scsi_block_limits_mcawl;
+static int hf_scsi_block_limits_otlg;
+static int hf_scsi_block_limits_mtl;
+static int hf_scsi_block_limits_otl;
+static int hf_scsi_block_limits_mpl;
+static int hf_scsi_block_limits_mulc;
+static int hf_scsi_block_limits_mubdc;
+static int hf_scsi_block_limits_oug;
+static int hf_scsi_block_limits_ugavalid;
+static int hf_scsi_block_limits_uga;
+static int hf_scsi_block_limits_mwsl;
+static int hf_scsi_block_limits_matl;
+static int hf_scsi_block_limits_aa;
+static int hf_scsi_block_limits_atlg;
+static int hf_scsi_prevent_allow_flags;
+static int hf_scsi_prevent_allow_prevent;
+static int hf_scsi_mpi_service_action;
+static int hf_scsi_report_opcodes_rctd;
+static int hf_scsi_report_opcodes_options;
+static int hf_scsi_report_opcodes_requested_o;
+static int hf_scsi_report_opcodes_requested_sa;
+static int hf_scsi_report_opcodes_cdl;
+static int hf_scsi_report_opcodes_sa;
+static int hf_scsi_report_opcodes_ctdp;
+static int hf_scsi_report_opcodes_ctdp_one;
+static int hf_scsi_report_opcodes_servactv;
+static int hf_scsi_report_opcodes_cdb_length;
+static int hf_scsi_report_opcodes_support;
+static int hf_scsi_report_opcodes_cdb_usage_data;
+static int hf_scsi_report_opcodes_tdl;
+static int hf_scsi_report_opcodes_npt;
+static int hf_scsi_report_opcodes_rct;
+static int hf_scsi_inquiry_bdc_mrr;
+static int hf_scsi_inquiry_bdc_pt;
+static int hf_scsi_inquiry_bdc_wabereq;
+static int hf_scsi_inquiry_bdc_wacereq;
+static int hf_scsi_inquiry_bdc_nff;
+static int hf_scsi_inquiry_bdc_fuab;
+static int hf_scsi_inquiry_bdc_vbuls;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_scsi_smc_modepage_first_storage_element_address = -1;
-static int hf_scsi_smc_modepage_first_medium_transport_element_address = -1;
-static int hf_scsi_ssc2_modepage_dde = -1;
-static int hf_scsi_inq_cmddt_version = -1;
-static int hf_scsi_mmc5_modepage_number_of_volume_levels_supported = -1;
-static int hf_scsi_ssc2_modepage_dce = -1;
-static int hf_scsi_modesel_block_descriptor_length16 = -1;
-static int hf_scsi_mmc5_modepage_audio_pause_length = -1;
-static int hf_scsi_spc_modepage_idle_condition_timer = -1;
-static int hf_scsi_blockdescs_block_length24 = -1;
-static int hf_scsi_spc_modepage_report_count = -1;
-static int hf_scsi_spc_modepage_ready_aer_holdoff_period = -1;
-static int hf_scsi_sbc_modepage_non_cache_segment_size = -1;
-static int hf_scsi_blockdescs_no_of_blocks64 = -1;
-static int hf_scsi_spc_modepage_gltsd = -1;
-static int hf_scsi_smc_modepage_st_ne_dt = -1;
-static int hf_scsi_modesel_dev_sbc_medium_type = -1;
-static int hf_scsi_inq_evpd_devid_identifier_type = -1;
-static int hf_scsi_inq_evpd_identifier_number = -1;
-static int hf_scsi_sbc_modepage_write_retry_count = -1;
-static int hf_scsi_spc_modepage_buffer_empty_ratio = -1;
-static int hf_scsi_ssc2_modepage_partition_size = -1;
-static int hf_scsi_mmc5_modepage_initiator_application_code = -1;
-static int hf_scsi_sbc_modepage_demand_read_retention_priority = -1;
-static int hf_scsi_smc_modepage_dt_dt = -1;
-static int hf_scsi_sbc_modepage_ssec = -1;
-static int hf_scsi_smc_modepage_number_of_medium_transport_elements = -1;
-static int hf_scsi_mmc5_modepage_copy_management_revision_support = -1;
-static int hf_scsi_ssc2_modepage_maximum_additional_partitions = -1;
-static int hf_scsi_blockdescs_density_code = -1;
-static int hf_scsi_ssc2_modepage_write_object_buffer_full_ratio = -1;
-static int hf_scsi_spc_modepage_rr_tov = -1;
-static int hf_scsi_inq_cmddt_support = -1;
-static int hf_scsi_mmc5_modepage_packet_size = -1;
-static int hf_scsi_ssc2_modepage_fdp = -1;
-static int hf_scsi_spc_modepage_autoload_mode = -1;
-static int hf_scsi_mmc5_modepage_rw_in_lead_in = -1;
-static int hf_scsi_spc_modepage_perf = -1;
-static int hf_scsi_inq_evpd_devid_association = -1;
-static int hf_scsi_smc_modepage_stordt = -1;
-static int hf_scsi_smc_modepage_ie_dt = -1;
-static int hf_scsi_spc_modepage_disable_queuing = -1;
-static int hf_scsi_sbc_modepage_maximum_pre_fetch_ceiling = -1;
-static int hf_scsi_persresvin_generation_number = -1;
-static int hf_scsi_ssc2_modepage_read_object_buffer_empty_ratio = -1;
-static int hf_scsi_spc_modepage_extended_self_test_completion_time = -1;
-static int hf_scsi_smc_modepage_number_of_import_export_elements = -1;
-static int hf_scsi_smc_modepage_number_of_storage_elements = -1;
-static int hf_scsi_sbc_modepage_landing_zone_cyl = -1;
-static int hf_scsi_smc_modepage_mt_ne_dt = -1;
-static int hf_scsi_mmc5_modepage_loading_mechanism_type = -1;
-static int hf_scsi_smc_modepage_mt_dt = -1;
-static int hf_scsi_smc_modepage_first_import_export_element_address = -1;
-static int hf_scsi_mmc5_modepage_link_size = -1;
-static int hf_scsi_ssc2_modepage_decompression_algorithm = -1;
-static int hf_scsi_reportluns_lun_list_length = -1;
-static int hf_scsi_spc_modepage_idle = -1;
-static int hf_scsi_spc_modepage_emdp = -1;
-static int hf_scsi_inq_evpd_devid_code_set = -1;
-static int hf_scsi_modesel_longlba = -1;
-static int hf_scsi_mmc5_modepage_bufe = -1;
-static int hf_scsi_ssc2_modepage_select_data_compression_algorithm = -1;
-static int hf_scsi_mmc5_modepage_rotation_control_selected = -1;
-static int hf_scsi_mmc5_modepage_sub_header_byte = -1;
-static int hf_scsi_spc_modepage_rr_tov_units = -1;
-static int hf_scsi_mmc5_modepage_vendor_specific = -1;
-static int hf_scsi_modesel_block_descriptor_length8 = -1;
-static int hf_scsi_smc_modepage_ie_ne_dt = -1;
-static int hf_scsi_modesel_device_specific_parameter = -1;
-static int hf_scsi_spc_modepage_connect_time_limit = -1;
-static int hf_scsi_sbc_modepage_medium_rotation_rate = -1;
-static int hf_scsi_inq_evpd_devid_identifier_length = -1;
-static int hf_scsi_blockdescs_no_of_blocks32 = -1;
-static int hf_scsi_inq_evpd_devid_identifier_str = -1;
-static int hf_scsi_sns_valid = -1;
-static int hf_scsi_mmc5_modepage_dvd_ram_read = -1;
-static int hf_scsi_ssc2_modepage_gap_size = -1;
-static int hf_scsi_smc_modepage_first_data_transfer_element_address = -1;
-static int hf_scsi_mmc5_modepage_wrparam_multi_session = -1;
-static int hf_scsi_mmc5_modepage_num_write_speed_performance = -1;
-static int hf_scsi_mmc5_modepage_buf = -1;
-static int hf_scsi_mmc5_modepage_lba_space = -1;
-static int hf_scsi_mmc5_modepage_data_block_type = -1;
-static int hf_scsi_ssc2_modepage_additional_partitions_defined = -1;
-static int hf_scsi_spc_modepage_dtfd = -1;
-static int hf_scsi_spc_modepage_disconnect_time_limit = -1;
-static int hf_scsi_sbc_modepage_read_retry_count = -1;
-static int hf_scsi_mmc5_modepage_length = -1;
-static int hf_scsi_sns_filemark = -1;
-static int hf_scsi_sbc_modepage_alternate_tracks_per_zone = -1;
-static int hf_scsi_ssc2_modepage_eod_defined = -1;
-static int hf_scsi_mmc5_modepage_media_catalog_number = -1;
-static int hf_scsi_mmc5_modepage_current_write_speed_selected = -1;
-static int hf_scsi_inq_evpd_devid_identifier_bytes = -1;
-static int hf_scsi_spc_modepage_interval_timer = -1;
-static int hf_scsi_ssc2_modepage_oir = -1;
-static int hf_scsi_sbc_modepage_correction_span = -1;
-static int hf_scsi_mmc5_modepage_session_format = -1;
-static int hf_scsi_sbc_modepage_minimum_pre_fetch = -1;
-static int hf_scsi_spc_modepage_maximum_burst_size = -1;
-static int hf_scsi_ssc2_modepage_partition_units = -1;
-static int hf_scsi_sbc_modepage_cache_segment_size = -1;
-static int hf_scsi_blockdescs_block_length32 = -1;
-static int hf_scsi_sbc_modepage_number_of_cylinders = -1;
-static int hf_scsi_sbc_modepage_alternate_tracks_per_lu = -1;
-static int hf_scsi_inq_evpd_page_length = -1;
-static int hf_scsi_sbc_modepage_starting_cyl_pre_compensation = -1;
-static int hf_scsi_sbc_modepage_head_offset_count = -1;
-static int hf_scsi_sbc_modepage_ic = -1;
-static int hf_scsi_modesel_mode_data_length16 = -1;
-static int hf_scsi_sbc_modepage_maximum_pre_fetch = -1;
-static int hf_scsi_smc_modepage_number_of_data_transfer_elements = -1;
-static int hf_scsi_ssc2_modepage_object_buffer_size_at_early_warning = -1;
-static int hf_scsi_mmc5_modepage_buffer_size_supported = -1;
-static int hf_scsi_persresvin_additional_length = -1;
-static int hf_scsi_ssc2_modepage_obr = -1;
-static int hf_scsi_spc_modepage_swp = -1;
-static int hf_scsi_inq_evpd_supported_page = -1;
-static int hf_scsi_sbc_modepage_awre = -1;
-static int hf_scsi_smc_modepage_dt_ne_dt = -1;
-static int hf_scsi_mmc5_modepage_read_bar_code = -1;
-static int hf_scsi_ssc2_modepage_media_format_recognition = -1;
-static int hf_scsi_sns_command_specific_information = -1;
-static int hf_scsi_ssc2_modepage_write_delay_time = -1;
-static int hf_scsi_sbc_modepage_track_skew_factor = -1;
-static int hf_scsi_spc_modepage_standby_condition_timer = -1;
-static int hf_scsi_sbc_modepage_interleave = -1;
-static int hf_scsi_sbc_modepage_alternate_sectors_per_zone = -1;
-static int hf_scsi_sbc_modepage_rotational_offset = -1;
-static int hf_scsi_spc_modepage_buffer_full_ratio = -1;
-static int hf_scsi_sbc_modepage_number_of_heads = -1;
-static int hf_scsi_sbc_modepage_sectors_per_track = -1;
-static int hf_scsi_sbc_modepage_recovery_time_limit = -1;
-static int hf_scsi_sbc_modepage_tracks_per_zone = -1;
-static int hf_scsi_spc_modepage_first_burst_size = -1;
-static int hf_scsi_inq_evpd_product_serial_number = -1;
-static int hf_scsi_sbc_modepage_cylinder_skew_factor = -1;
-static int hf_scsi_sbc_modepage_data_bytes_per_physical_sector = -1;
-static int hf_scsi_ssc2_modepage_compression_algorithm = -1;
-static int hf_scsi_ssc2_modepage_caf = -1;
-static int hf_scsi_sbc_modepage_starting_cyl_reduced_write_current = -1;
-static int hf_scsi_inq_cmddt_cdb_size = -1;
-static int hf_scsi_mmc5_modepage_international_standard_recording_code = -1;
-static int hf_scsi_spc_modepage_bus_inactivity_limit = -1;
-static int hf_scsi_sbc_modepage_disable_pre_fetch_xfer_len = -1;
-static int hf_scsi_spc_modepage_busy_timeout_period = -1;
-static int hf_scsi_sbc_modepage_fsw = -1;
-static int hf_scsi_ssc2_modepage_active_partition = -1;
-static int hf_scsi_modesel_mode_data_length8 = -1;
-static int hf_scsi_smc_modepage_st_dt = -1;
-static int hf_scsi_sbc_modepage_number_of_cache_segments = -1;
-static int hf_scsi_blockdescs_no_of_blocks24 = -1;
-static int hf_scsi_sbc_modepage_data_strobe_offset_count = -1;
-static int hf_scsi_modesel_medium_type = -1;
-static int hf_scsi_sbc_modepage_device_step_rate = -1;
-static int hf_scsi_mmc5_modepage_dvd_ram_write = -1;
-static int hf_scsi_mmc5_modepage_track_mode = -1;
-static int hf_scsi_smc_modepage_mt_ne_mt = -1;
-static int hf_scsi_smc_modepage_dt_mt = -1;
-static int hf_scsi_mmc5_modepage_eject = -1;
-static int hf_scsi_mmc5_modepage_mode_2_form2 = -1;
-static int hf_scsi_sbc_modepage_dra = -1;
-static int hf_scsi_mmc5_modepage_dvd_rom_write = -1;
-static int hf_scsi_sbc_modepage_eer = -1;
-static int hf_scsi_mmc5_modepage_cd_da_cmds_supported = -1;
-static int hf_scsi_smc_modepage_ie_ne_mt = -1;
-static int hf_scsi_mmc5_modepage_rw_deinterleaved_corrected = -1;
-static int hf_scsi_sbc_modepage_vendor_specific = -1;
-static int hf_scsi_spc_modepage_report_log_exception_condition = -1;
-static int hf_scsi_mmc5_modepage_c2_pointers_supported = -1;
-static int hf_scsi_mmc5_modepage_ls_v = -1;
-static int hf_scsi_sbc_modepage_tb = -1;
-static int hf_scsi_sbc_modepage_write_retention_priority = -1;
-static int hf_scsi_smc_modepage_mt_ne_ie = -1;
-static int hf_scsi_ssc2_modepage_prmwp = -1;
-static int hf_scsi_sbc_modepage_surf = -1;
-static int hf_scsi_sns_ili = -1;
-static int hf_scsi_smc_modepage_mt_ie = -1;
-static int hf_scsi_sbc_modepage_rcd = -1;
-static int hf_scsi_mmc5_modepage_composite = -1;
-static int hf_scsi_sbc_modepage_wce = -1;
-static int hf_scsi_mmc5_modepage_method_2 = -1;
-static int hf_scsi_ssc2_modepage_clear = -1;
-static int hf_scsi_sbc_modepage_lbcss = -1;
-static int hf_scsi_mmc5_modepage_cd_r_read = -1;
-static int hf_scsi_spc_modepage_test = -1;
-static int hf_scsi_ssc2_modepage_rsmk = -1;
-static int hf_scsi_spc_modepage_rha = -1;
-static int hf_scsi_mmc5_modepage_lsbf = -1;
-static int hf_scsi_mmc5_modepage_cd_rw_write = -1;
-static int hf_scsi_mmc5_modepage_wrparam_test_write = -1;
-static int hf_scsi_ssc2_modepage_eeg = -1;
-static int hf_scsi_mmc5_modepage_digital_port2 = -1;
-static int hf_scsi_mmc5_modepage_copy = -1;
-static int hf_scsi_sbc_modepage_abpf = -1;
-static int hf_scsi_spc_modepage_alwi = -1;
-static int hf_scsi_mmc5_modepage_bckf = -1;
-static int hf_scsi_ssc2_modepage_dsp = -1;
-static int hf_scsi_mmc5_modepage_mode_2_form1 = -1;
-static int hf_scsi_smc_modepage_stormt = -1;
-static int hf_scsi_mmc5_modepage_mmcap_test_write = -1;
-static int hf_scsi_smc_modepage_st_mt = -1;
-static int hf_scsi_ssc2_modepage_sew = -1;
-static int hf_scsi_ssc2_modepage_psum = -1;
-static int hf_scsi_mmc5_modepage_dvd_r_read = -1;
-static int hf_scsi_ssc2_modepage_asocwp = -1;
-static int hf_scsi_smc_modepage_st_ie = -1;
-static int hf_scsi_mmc5_modepage_cd_rw_read = -1;
-static int hf_scsi_spc_modepage_standby = -1;
-static int hf_scsi_spc_modepage_ewasc = -1;
-static int hf_scsi_sbc_modepage_arre = -1;
-static int hf_scsi_smc_modepage_st_st = -1;
-static int hf_scsi_ssc2_modepage_swp = -1;
-static int hf_scsi_smc_modepage_storie = -1;
-static int hf_scsi_mmc5_modepage_fp = -1;
-static int hf_scsi_ssc2_modepage_red = -1;
-static int hf_scsi_ssc2_modepage_active_format = -1;
-static int hf_scsi_mmc5_modepage_mmcap_multi_session = -1;
-static int hf_scsi_mmc5_modepage_lock_state = -1;
-static int hf_scsi_mmc5_modepage_side_change_capable = -1;
-static int hf_scsi_mmc5_modepage_dvd_rom_read = -1;
-static int hf_scsi_sns_eom = -1;
-static int hf_scsi_sbc_modepage_rc = -1;
-static int hf_scsi_mmc5_modepage_lock = -1;
-static int hf_scsi_sbc_modepage_per = -1;
-static int hf_scsi_ssc2_modepage_socf = -1;
-static int hf_scsi_sbc_modepage_mf = -1;
-static int hf_scsi_smc_modepage_ie_st = -1;
-static int hf_scsi_mmc5_modepage_digital_port1 = -1;
-static int hf_scsi_sbc_modepage_hsec = -1;
-static int hf_scsi_sbc_modepage_cap = -1;
-static int hf_scsi_smc_modepage_st_ne_ie = -1;
-static int hf_scsi_spc_modepage_logerr = -1;
-static int hf_scsi_sbc_modepage_rmb = -1;
-static int hf_scsi_mmc5_modepage_prevent_jumper = -1;
-static int hf_scsi_smc_modepage_ie_mt = -1;
-static int hf_scsi_mmc5_modepage_changer_supports_disc_present = -1;
-static int hf_scsi_mmc5_modepage_cd_r_write = -1;
-static int hf_scsi_ssc2_modepage_addp = -1;
-static int hf_scsi_mmc5_modepage_dvd_r_write = -1;
-static int hf_scsi_spc_modepage_dexcpt = -1;
-static int hf_scsi_spc_modepage_ebf = -1;
-static int hf_scsi_mmc5_modepage_write_type = -1;
-static int hf_scsi_spc_modepage_fab = -1;
-static int hf_scsi_smc_modepage_ie_ne_st = -1;
-static int hf_scsi_ssc2_modepage_baml = -1;
-static int hf_scsi_smc_modepage_storst = -1;
-static int hf_scsi_sbc_modepage_dte = -1;
-static int hf_scsi_mmc5_modepage_separate_volume_levels = -1;
-static int hf_scsi_mmc5_modepage_isrc = -1;
-static int hf_scsi_smc_modepage_dt_ne_mt = -1;
-static int hf_scsi_mmc5_modepage_audio_play = -1;
-static int hf_scsi_mmc5_modepage_separate_channel_mute = -1;
-static int hf_scsi_ssc2_modepage_rew = -1;
-static int hf_scsi_sbc_modepage_dcr = -1;
-static int hf_scsi_smc_modepage_dt_ie = -1;
-static int hf_scsi_ssc2_modepage_avc = -1;
-static int hf_scsi_sbc_modepage_size = -1;
-static int hf_scsi_mmc5_modepage_rw_supported = -1;
-static int hf_scsi_spc_modepage_dtipe = -1;
-static int hf_scsi_mmc5_modepage_sw_slot_selection = -1;
-static int hf_scsi_ssc2_modepage_pofm = -1;
-static int hf_scsi_spc_modepage_dlm = -1;
-static int hf_scsi_spc_modepage_plpb = -1;
-static int hf_scsi_smc_modepage_st_ne_st = -1;
-static int hf_scsi_smc_modepage_dt_ne_st = -1;
-static int hf_scsi_smc_modepage_st_ne_mt = -1;
-static int hf_scsi_ssc2_modepage_robo = -1;
-static int hf_scsi_spc_modepage_faa = -1;
-static int hf_scsi_spc_modepage_ddis = -1;
-static int hf_scsi_mmc5_modepage_cd_da_stream_is_accurate = -1;
-static int hf_scsi_ssc2_modepage_bam = -1;
-static int hf_scsi_spc_modepage_fac = -1;
-static int hf_scsi_smc_modepage_mt_st = -1;
-static int hf_scsi_smc_modepage_ie_ie = -1;
-static int hf_scsi_smc_modepage_dt_ne_ie = -1;
-static int hf_scsi_ssc2_modepage_lois = -1;
-static int hf_scsi_spc_modepage_dtoli = -1;
-static int hf_scsi_sbc_modepage_disc = -1;
-static int hf_scsi_smc_modepage_ie_ne_ie = -1;
-static int hf_scsi_smc_modepage_mt_ne_st = -1;
-static int hf_scsi_ssc2_modepage_dcc = -1;
-static int hf_scsi_mmc5_modepage_rck = -1;
-static int hf_scsi_smc_modepage_mt_mt = -1;
-static int hf_scsi_smc_modepage_dt_st = -1;
-static int hf_scsi_ssc2_modepage_rewind_on_reset = -1;
-static int hf_scsi_mmc5_modepage_upc = -1;
-static int hf_scsi_ssc2_modepage_idp = -1;
-static int hf_scsi_ssc2_modepage_perswp = -1;
-static int hf_scsi_spc_xcopy_service = -1;
-static int hf_scsi_spc_recv_copy_service = -1;
-static int hf_scsi_spc_xcopy_param_list_len = -1;
-static int hf_scsi_spc_xcopy_param_list_format = -1;
-static int hf_scsi_spc_xcopy_cscd_desc_list_len = -1;
-static int hf_scsi_spc_xcopy_head_cscd_desc_list_len = -1;
-static int hf_scsi_spc_xcopy_head_cscd_desc_type_code = -1;
-static int hf_scsi_spc_xcopy_cscd_desc_type_code = -1;
-static int hf_scsi_spc_xcopy_inline_data_len = -1;
-static int hf_scsi_spc_xcopy_seg_desc_list_len = -1;
-static int hf_scsi_spc_xcopy_list_id = -1;
-static int hf_scsi_spc_xcopy_rel_init_port_id = -1;
-static int hf_scsi_spc_xcopy_per_dev_type_byte = -1;
-static int hf_scsi_spc_xcopy_per_dev_type = -1;
-static int hf_scsi_spc_xcopy_lu_type = -1;
-static int hf_scsi_spc_xcopy_disk_block_len = -1;
-static int hf_scsi_spc_xcopy_cscd_desc_code_set = -1;
-static int hf_scsi_spc_xcopy_cscd_desc_assoc = -1;
-static int hf_scsi_spc_xcopy_cscd_desc_des_type = -1;
-static int hf_scsi_spc_xcopy_cscd_desc_des_len = -1;
-static int hf_scsi_spc_xcopy_seg_desc_type = -1;
-static int hf_scsi_spc_xcopy_seg_desc_dc = -1;
-static int hf_scsi_spc_xcopy_seg_desc_cat = -1;
-static int hf_scsi_spc_xcopy_seg_des_src_desc_id = -1;
-static int hf_scsi_spc_xcopy_seg_des_dest_desc_id = -1;
-static int hf_scsi_spc_xcopy_num_of_blocks = -1;
-static int hf_scsi_spc_xcopy_param_list_id_usage = -1;
-static int hf_scsi_spc_xcopy_param_str = -1;
-static int hf_scsi_spc_xcopy_param_priority = -1;
-static int hf_scsi_spc_xcopy_param_byte = -1;
-static int hf_scsi_spc_xcopy_source_lba = -1;
-static int hf_scsi_spc_xcopy_dest_lba = -1;
-static int hf_scsi_recv_copy_max_cscd_desc_count = -1;
-static int hf_scsi_recv_copy_max_seg_desc_count = -1;
-static int hf_scsi_recv_copy_max_desc_list_len = -1;
-static int hf_scsi_recv_copy_max_seg_len = -1;
-static int hf_scsi_recv_copy_max_inline_data_len = -1;
-static int hf_scsi_recv_copy_held_data_limit = -1;
-static int hf_scsi_recv_copy_max_stream_dev_trans_size = -1;
-static int hf_scsi_recv_copy_snlid = -1;
-static int hf_scsi_recv_copy_avail_data = -1;
-static int hf_scsi_recv_copy_total_con_copies = -1;
-static int hf_scsi_recv_copy_max_con_copies = -1;
-static int hf_scsi_recv_copy_data_seg_gran = -1;
-static int hf_scsi_recv_copy_inline_data_gran = -1;
-static int hf_scsi_recv_copy_held_data_gran = -1;
-static int hf_scsi_recv_copy_implemented_desc_list_len = -1;
-static int hf_scsi_segment_descriptor_length = -1;
-static int hf_scsi_designator = -1;
-static int hf_scsi_inline_data = -1;
-static int hf_scsi_reserved_8 = -1;
-static int hf_scsi_reserved_16 = -1;
-static int hf_scsi_reserved_24 = -1;
-static int hf_scsi_reserved_32 = -1;
-static int hf_scsi_reserved_64 = -1;
-static int hf_scsi_naa_type = -1;
-static int hf_scsi_naa_locally_assigned = -1;
-static int hf_scsi_naa_ieee_company_id = -1;
-static int hf_scsi_naa_vendor_specific = -1;
-static int hf_scsi_naa_vendor_specific_extension = -1;
-
-static gint ett_scsi = -1;
-static gint ett_scsi_page = -1;
-gint ett_scsi_control = -1;
-static gint ett_scsi_inq_control = -1;
-static gint ett_scsi_inq_peripheral = -1;
-static gint ett_scsi_inq_acaflags = -1;
-static gint ett_scsi_inq_rmbflags = -1;
-static gint ett_scsi_inq_sccsflags = -1;
-static gint ett_scsi_inq_bqueflags = -1;
-static gint ett_scsi_inq_reladrflags = -1;
-static gint ett_scsi_log = -1;
-static gint ett_scsi_log_ppc = -1;
-static gint ett_scsi_log_pc = -1;
-static gint ett_scsi_log_param = -1;
-static gint ett_scsi_fragments = -1;
-static gint ett_scsi_fragment = -1;
-static gint ett_persresv_control = -1;
-static gint ett_scsi_lun = -1;
-static gint ett_scsi_lun_unit = -1;
-static gint ett_scsi_prevent_allow = -1;
-static gint ett_command_descriptor = -1;
-static gint ett_timeout_descriptor = -1;
-static gint ett_sense_descriptor = -1;
-static gint ett_sense_osd_not_initiated = -1;
-static gint ett_sense_osd_completed = -1;
-static gint ett_xcopy_per_dev_type = -1;
-static gint ett_xcopy_param_byte = -1;
-static gint ett_scsi_xcopy_cscds = -1;
-static gint ett_scsi_xcopy_cscd = -1;
-static gint ett_scsi_xcopy_dev_params = -1;
-static gint ett_scsi_xcopy_segs = -1;
-static gint ett_scsi_xcopy_seg = -1;
-static gint ett_scsi_xcopy_seg_param = -1;
-static gint ett_scsi_cscd_desc = -1;
-static gint ett_scsi_naa = -1;
-static gint ett_scsi_designation_descriptor = -1;
+static int hf_scsi_smc_modepage_first_storage_element_address;
+static int hf_scsi_smc_modepage_first_medium_transport_element_address;
+static int hf_scsi_ssc2_modepage_dde;
+static int hf_scsi_inq_cmddt_version;
+static int hf_scsi_mmc5_modepage_number_of_volume_levels_supported;
+static int hf_scsi_ssc2_modepage_dce;
+static int hf_scsi_modesel_block_descriptor_length16;
+static int hf_scsi_mmc5_modepage_audio_pause_length;
+static int hf_scsi_spc_modepage_idle_condition_timer;
+static int hf_scsi_blockdescs_block_length24;
+static int hf_scsi_spc_modepage_report_count;
+static int hf_scsi_spc_modepage_ready_aer_holdoff_period;
+static int hf_scsi_sbc_modepage_non_cache_segment_size;
+static int hf_scsi_blockdescs_no_of_blocks64;
+static int hf_scsi_spc_modepage_gltsd;
+static int hf_scsi_smc_modepage_st_ne_dt;
+static int hf_scsi_modesel_dev_sbc_medium_type;
+static int hf_scsi_inq_evpd_devid_identifier_type;
+static int hf_scsi_inq_evpd_identifier_number;
+static int hf_scsi_sbc_modepage_write_retry_count;
+static int hf_scsi_spc_modepage_buffer_empty_ratio;
+static int hf_scsi_ssc2_modepage_partition_size;
+static int hf_scsi_mmc5_modepage_initiator_application_code;
+static int hf_scsi_sbc_modepage_demand_read_retention_priority;
+static int hf_scsi_smc_modepage_dt_dt;
+static int hf_scsi_sbc_modepage_ssec;
+static int hf_scsi_smc_modepage_number_of_medium_transport_elements;
+static int hf_scsi_mmc5_modepage_copy_management_revision_support;
+static int hf_scsi_ssc2_modepage_maximum_additional_partitions;
+static int hf_scsi_blockdescs_density_code;
+static int hf_scsi_ssc2_modepage_write_object_buffer_full_ratio;
+static int hf_scsi_spc_modepage_rr_tov;
+static int hf_scsi_inq_cmddt_support;
+static int hf_scsi_mmc5_modepage_packet_size;
+static int hf_scsi_ssc2_modepage_fdp;
+static int hf_scsi_spc_modepage_autoload_mode;
+static int hf_scsi_mmc5_modepage_rw_in_lead_in;
+static int hf_scsi_spc_modepage_perf;
+static int hf_scsi_inq_evpd_devid_association;
+static int hf_scsi_smc_modepage_stordt;
+static int hf_scsi_smc_modepage_ie_dt;
+static int hf_scsi_spc_modepage_disable_queuing;
+static int hf_scsi_sbc_modepage_maximum_pre_fetch_ceiling;
+static int hf_scsi_persresvin_generation_number;
+static int hf_scsi_ssc2_modepage_read_object_buffer_empty_ratio;
+static int hf_scsi_spc_modepage_extended_self_test_completion_time;
+static int hf_scsi_smc_modepage_number_of_import_export_elements;
+static int hf_scsi_smc_modepage_number_of_storage_elements;
+static int hf_scsi_sbc_modepage_landing_zone_cyl;
+static int hf_scsi_smc_modepage_mt_ne_dt;
+static int hf_scsi_mmc5_modepage_loading_mechanism_type;
+static int hf_scsi_smc_modepage_mt_dt;
+static int hf_scsi_smc_modepage_first_import_export_element_address;
+static int hf_scsi_mmc5_modepage_link_size;
+static int hf_scsi_ssc2_modepage_decompression_algorithm;
+static int hf_scsi_reportluns_lun_list_length;
+static int hf_scsi_spc_modepage_idle;
+static int hf_scsi_spc_modepage_emdp;
+static int hf_scsi_inq_evpd_devid_code_set;
+static int hf_scsi_modesel_longlba;
+static int hf_scsi_mmc5_modepage_bufe;
+static int hf_scsi_ssc2_modepage_select_data_compression_algorithm;
+static int hf_scsi_mmc5_modepage_rotation_control_selected;
+static int hf_scsi_mmc5_modepage_sub_header_byte;
+static int hf_scsi_spc_modepage_rr_tov_units;
+static int hf_scsi_mmc5_modepage_vendor_specific;
+static int hf_scsi_modesel_block_descriptor_length8;
+static int hf_scsi_smc_modepage_ie_ne_dt;
+static int hf_scsi_modesel_device_specific_parameter;
+static int hf_scsi_spc_modepage_connect_time_limit;
+static int hf_scsi_sbc_modepage_medium_rotation_rate;
+static int hf_scsi_inq_evpd_devid_identifier_length;
+static int hf_scsi_blockdescs_no_of_blocks32;
+static int hf_scsi_inq_evpd_devid_identifier_str;
+static int hf_scsi_sns_valid;
+static int hf_scsi_mmc5_modepage_dvd_ram_read;
+static int hf_scsi_ssc2_modepage_gap_size;
+static int hf_scsi_smc_modepage_first_data_transfer_element_address;
+static int hf_scsi_mmc5_modepage_wrparam_multi_session;
+static int hf_scsi_mmc5_modepage_num_write_speed_performance;
+static int hf_scsi_mmc5_modepage_buf;
+static int hf_scsi_mmc5_modepage_lba_space;
+static int hf_scsi_mmc5_modepage_data_block_type;
+static int hf_scsi_ssc2_modepage_additional_partitions_defined;
+static int hf_scsi_spc_modepage_dtfd;
+static int hf_scsi_spc_modepage_disconnect_time_limit;
+static int hf_scsi_sbc_modepage_read_retry_count;
+static int hf_scsi_mmc5_modepage_length;
+static int hf_scsi_sns_filemark;
+static int hf_scsi_sbc_modepage_alternate_tracks_per_zone;
+static int hf_scsi_ssc2_modepage_eod_defined;
+static int hf_scsi_mmc5_modepage_media_catalog_number;
+static int hf_scsi_mmc5_modepage_current_write_speed_selected;
+static int hf_scsi_inq_evpd_devid_identifier_bytes;
+static int hf_scsi_spc_modepage_interval_timer;
+static int hf_scsi_ssc2_modepage_oir;
+static int hf_scsi_sbc_modepage_correction_span;
+static int hf_scsi_mmc5_modepage_session_format;
+static int hf_scsi_sbc_modepage_minimum_pre_fetch;
+static int hf_scsi_spc_modepage_maximum_burst_size;
+static int hf_scsi_ssc2_modepage_partition_units;
+static int hf_scsi_sbc_modepage_cache_segment_size;
+static int hf_scsi_blockdescs_block_length32;
+static int hf_scsi_sbc_modepage_number_of_cylinders;
+static int hf_scsi_sbc_modepage_alternate_tracks_per_lu;
+static int hf_scsi_inq_evpd_page_length;
+static int hf_scsi_sbc_modepage_starting_cyl_pre_compensation;
+static int hf_scsi_sbc_modepage_head_offset_count;
+static int hf_scsi_sbc_modepage_ic;
+static int hf_scsi_modesel_mode_data_length16;
+static int hf_scsi_sbc_modepage_maximum_pre_fetch;
+static int hf_scsi_smc_modepage_number_of_data_transfer_elements;
+static int hf_scsi_ssc2_modepage_object_buffer_size_at_early_warning;
+static int hf_scsi_mmc5_modepage_buffer_size_supported;
+static int hf_scsi_persresvin_additional_length;
+static int hf_scsi_ssc2_modepage_obr;
+static int hf_scsi_spc_modepage_swp;
+static int hf_scsi_inq_evpd_supported_page;
+static int hf_scsi_sbc_modepage_awre;
+static int hf_scsi_smc_modepage_dt_ne_dt;
+static int hf_scsi_mmc5_modepage_read_bar_code;
+static int hf_scsi_ssc2_modepage_media_format_recognition;
+static int hf_scsi_sns_command_specific_information;
+static int hf_scsi_ssc2_modepage_write_delay_time;
+static int hf_scsi_sbc_modepage_track_skew_factor;
+static int hf_scsi_spc_modepage_standby_condition_timer;
+static int hf_scsi_sbc_modepage_interleave;
+static int hf_scsi_sbc_modepage_alternate_sectors_per_zone;
+static int hf_scsi_sbc_modepage_rotational_offset;
+static int hf_scsi_spc_modepage_buffer_full_ratio;
+static int hf_scsi_sbc_modepage_number_of_heads;
+static int hf_scsi_sbc_modepage_sectors_per_track;
+static int hf_scsi_sbc_modepage_recovery_time_limit;
+static int hf_scsi_sbc_modepage_tracks_per_zone;
+static int hf_scsi_spc_modepage_first_burst_size;
+static int hf_scsi_inq_evpd_product_serial_number;
+static int hf_scsi_sbc_modepage_cylinder_skew_factor;
+static int hf_scsi_sbc_modepage_data_bytes_per_physical_sector;
+static int hf_scsi_ssc2_modepage_compression_algorithm;
+static int hf_scsi_ssc2_modepage_caf;
+static int hf_scsi_sbc_modepage_starting_cyl_reduced_write_current;
+static int hf_scsi_inq_cmddt_cdb_size;
+static int hf_scsi_mmc5_modepage_international_standard_recording_code;
+static int hf_scsi_spc_modepage_bus_inactivity_limit;
+static int hf_scsi_sbc_modepage_disable_pre_fetch_xfer_len;
+static int hf_scsi_spc_modepage_busy_timeout_period;
+static int hf_scsi_sbc_modepage_fsw;
+static int hf_scsi_ssc2_modepage_active_partition;
+static int hf_scsi_modesel_mode_data_length8;
+static int hf_scsi_smc_modepage_st_dt;
+static int hf_scsi_sbc_modepage_number_of_cache_segments;
+static int hf_scsi_blockdescs_no_of_blocks24;
+static int hf_scsi_sbc_modepage_data_strobe_offset_count;
+static int hf_scsi_modesel_medium_type;
+static int hf_scsi_sbc_modepage_device_step_rate;
+static int hf_scsi_mmc5_modepage_dvd_ram_write;
+static int hf_scsi_mmc5_modepage_track_mode;
+static int hf_scsi_smc_modepage_mt_ne_mt;
+static int hf_scsi_smc_modepage_dt_mt;
+static int hf_scsi_mmc5_modepage_eject;
+static int hf_scsi_mmc5_modepage_mode_2_form2;
+static int hf_scsi_sbc_modepage_dra;
+static int hf_scsi_mmc5_modepage_dvd_rom_write;
+static int hf_scsi_sbc_modepage_eer;
+static int hf_scsi_mmc5_modepage_cd_da_cmds_supported;
+static int hf_scsi_smc_modepage_ie_ne_mt;
+static int hf_scsi_mmc5_modepage_rw_deinterleaved_corrected;
+static int hf_scsi_sbc_modepage_vendor_specific;
+static int hf_scsi_spc_modepage_report_log_exception_condition;
+static int hf_scsi_mmc5_modepage_c2_pointers_supported;
+static int hf_scsi_mmc5_modepage_ls_v;
+static int hf_scsi_sbc_modepage_tb;
+static int hf_scsi_sbc_modepage_write_retention_priority;
+static int hf_scsi_smc_modepage_mt_ne_ie;
+static int hf_scsi_ssc2_modepage_prmwp;
+static int hf_scsi_sbc_modepage_surf;
+static int hf_scsi_sns_ili;
+static int hf_scsi_smc_modepage_mt_ie;
+static int hf_scsi_sbc_modepage_rcd;
+static int hf_scsi_mmc5_modepage_composite;
+static int hf_scsi_sbc_modepage_wce;
+static int hf_scsi_mmc5_modepage_method_2;
+static int hf_scsi_ssc2_modepage_clear;
+static int hf_scsi_sbc_modepage_lbcss;
+static int hf_scsi_mmc5_modepage_cd_r_read;
+static int hf_scsi_spc_modepage_test;
+static int hf_scsi_ssc2_modepage_rsmk;
+static int hf_scsi_spc_modepage_rha;
+static int hf_scsi_mmc5_modepage_lsbf;
+static int hf_scsi_mmc5_modepage_cd_rw_write;
+static int hf_scsi_mmc5_modepage_wrparam_test_write;
+static int hf_scsi_ssc2_modepage_eeg;
+static int hf_scsi_mmc5_modepage_digital_port2;
+static int hf_scsi_mmc5_modepage_copy;
+static int hf_scsi_sbc_modepage_abpf;
+static int hf_scsi_spc_modepage_alwi;
+static int hf_scsi_mmc5_modepage_bckf;
+static int hf_scsi_ssc2_modepage_dsp;
+static int hf_scsi_mmc5_modepage_mode_2_form1;
+static int hf_scsi_smc_modepage_stormt;
+static int hf_scsi_mmc5_modepage_mmcap_test_write;
+static int hf_scsi_smc_modepage_st_mt;
+static int hf_scsi_ssc2_modepage_sew;
+static int hf_scsi_ssc2_modepage_psum;
+static int hf_scsi_mmc5_modepage_dvd_r_read;
+static int hf_scsi_ssc2_modepage_asocwp;
+static int hf_scsi_smc_modepage_st_ie;
+static int hf_scsi_mmc5_modepage_cd_rw_read;
+static int hf_scsi_spc_modepage_standby;
+static int hf_scsi_spc_modepage_ewasc;
+static int hf_scsi_sbc_modepage_arre;
+static int hf_scsi_smc_modepage_st_st;
+static int hf_scsi_ssc2_modepage_swp;
+static int hf_scsi_smc_modepage_storie;
+static int hf_scsi_mmc5_modepage_fp;
+static int hf_scsi_ssc2_modepage_red;
+static int hf_scsi_ssc2_modepage_active_format;
+static int hf_scsi_mmc5_modepage_mmcap_multi_session;
+static int hf_scsi_mmc5_modepage_lock_state;
+static int hf_scsi_mmc5_modepage_side_change_capable;
+static int hf_scsi_mmc5_modepage_dvd_rom_read;
+static int hf_scsi_sns_eom;
+static int hf_scsi_sbc_modepage_rc;
+static int hf_scsi_mmc5_modepage_lock;
+static int hf_scsi_sbc_modepage_per;
+static int hf_scsi_ssc2_modepage_socf;
+static int hf_scsi_sbc_modepage_mf;
+static int hf_scsi_smc_modepage_ie_st;
+static int hf_scsi_mmc5_modepage_digital_port1;
+static int hf_scsi_sbc_modepage_hsec;
+static int hf_scsi_sbc_modepage_cap;
+static int hf_scsi_smc_modepage_st_ne_ie;
+static int hf_scsi_spc_modepage_logerr;
+static int hf_scsi_sbc_modepage_rmb;
+static int hf_scsi_mmc5_modepage_prevent_jumper;
+static int hf_scsi_smc_modepage_ie_mt;
+static int hf_scsi_mmc5_modepage_changer_supports_disc_present;
+static int hf_scsi_mmc5_modepage_cd_r_write;
+static int hf_scsi_ssc2_modepage_addp;
+static int hf_scsi_mmc5_modepage_dvd_r_write;
+static int hf_scsi_spc_modepage_dexcpt;
+static int hf_scsi_spc_modepage_ebf;
+static int hf_scsi_mmc5_modepage_write_type;
+static int hf_scsi_spc_modepage_fab;
+static int hf_scsi_smc_modepage_ie_ne_st;
+static int hf_scsi_ssc2_modepage_baml;
+static int hf_scsi_smc_modepage_storst;
+static int hf_scsi_sbc_modepage_dte;
+static int hf_scsi_mmc5_modepage_separate_volume_levels;
+static int hf_scsi_mmc5_modepage_isrc;
+static int hf_scsi_smc_modepage_dt_ne_mt;
+static int hf_scsi_mmc5_modepage_audio_play;
+static int hf_scsi_mmc5_modepage_separate_channel_mute;
+static int hf_scsi_ssc2_modepage_rew;
+static int hf_scsi_sbc_modepage_dcr;
+static int hf_scsi_smc_modepage_dt_ie;
+static int hf_scsi_ssc2_modepage_avc;
+static int hf_scsi_sbc_modepage_size;
+static int hf_scsi_mmc5_modepage_rw_supported;
+static int hf_scsi_spc_modepage_dtipe;
+static int hf_scsi_mmc5_modepage_sw_slot_selection;
+static int hf_scsi_ssc2_modepage_pofm;
+static int hf_scsi_spc_modepage_dlm;
+static int hf_scsi_spc_modepage_plpb;
+static int hf_scsi_smc_modepage_st_ne_st;
+static int hf_scsi_smc_modepage_dt_ne_st;
+static int hf_scsi_smc_modepage_st_ne_mt;
+static int hf_scsi_ssc2_modepage_robo;
+static int hf_scsi_spc_modepage_faa;
+static int hf_scsi_spc_modepage_ddis;
+static int hf_scsi_mmc5_modepage_cd_da_stream_is_accurate;
+static int hf_scsi_ssc2_modepage_bam;
+static int hf_scsi_spc_modepage_fac;
+static int hf_scsi_smc_modepage_mt_st;
+static int hf_scsi_smc_modepage_ie_ie;
+static int hf_scsi_smc_modepage_dt_ne_ie;
+static int hf_scsi_ssc2_modepage_lois;
+static int hf_scsi_spc_modepage_dtoli;
+static int hf_scsi_sbc_modepage_disc;
+static int hf_scsi_smc_modepage_ie_ne_ie;
+static int hf_scsi_smc_modepage_mt_ne_st;
+static int hf_scsi_ssc2_modepage_dcc;
+static int hf_scsi_mmc5_modepage_rck;
+static int hf_scsi_smc_modepage_mt_mt;
+static int hf_scsi_smc_modepage_dt_st;
+static int hf_scsi_ssc2_modepage_rewind_on_reset;
+static int hf_scsi_mmc5_modepage_upc;
+static int hf_scsi_ssc2_modepage_idp;
+static int hf_scsi_ssc2_modepage_perswp;
+static int hf_scsi_spc_xcopy_service;
+static int hf_scsi_spc_recv_copy_service;
+static int hf_scsi_spc_xcopy_param_list_len;
+static int hf_scsi_spc_xcopy_param_list_format;
+static int hf_scsi_spc_xcopy_cscd_desc_list_len;
+static int hf_scsi_spc_xcopy_head_cscd_desc_list_len;
+static int hf_scsi_spc_xcopy_head_cscd_desc_type_code;
+static int hf_scsi_spc_xcopy_cscd_desc_type_code;
+static int hf_scsi_spc_xcopy_inline_data_len;
+static int hf_scsi_spc_xcopy_seg_desc_list_len;
+static int hf_scsi_spc_xcopy_list_id;
+static int hf_scsi_spc_xcopy_rel_init_port_id;
+static int hf_scsi_spc_xcopy_per_dev_type_byte;
+static int hf_scsi_spc_xcopy_per_dev_type;
+static int hf_scsi_spc_xcopy_lu_type;
+static int hf_scsi_spc_xcopy_disk_block_len;
+static int hf_scsi_spc_xcopy_cscd_desc_code_set;
+static int hf_scsi_spc_xcopy_cscd_desc_assoc;
+static int hf_scsi_spc_xcopy_cscd_desc_des_type;
+static int hf_scsi_spc_xcopy_cscd_desc_des_len;
+static int hf_scsi_spc_xcopy_seg_desc_type;
+static int hf_scsi_spc_xcopy_seg_desc_dc;
+static int hf_scsi_spc_xcopy_seg_desc_cat;
+static int hf_scsi_spc_xcopy_seg_des_src_desc_id;
+static int hf_scsi_spc_xcopy_seg_des_dest_desc_id;
+static int hf_scsi_spc_xcopy_num_of_blocks;
+static int hf_scsi_spc_xcopy_param_list_id_usage;
+static int hf_scsi_spc_xcopy_param_str;
+static int hf_scsi_spc_xcopy_param_priority;
+static int hf_scsi_spc_xcopy_param_byte;
+static int hf_scsi_spc_xcopy_source_lba;
+static int hf_scsi_spc_xcopy_dest_lba;
+static int hf_scsi_recv_copy_max_cscd_desc_count;
+static int hf_scsi_recv_copy_max_seg_desc_count;
+static int hf_scsi_recv_copy_max_desc_list_len;
+static int hf_scsi_recv_copy_max_seg_len;
+static int hf_scsi_recv_copy_max_inline_data_len;
+static int hf_scsi_recv_copy_held_data_limit;
+static int hf_scsi_recv_copy_max_stream_dev_trans_size;
+static int hf_scsi_recv_copy_snlid;
+static int hf_scsi_recv_copy_avail_data;
+static int hf_scsi_recv_copy_total_con_copies;
+static int hf_scsi_recv_copy_max_con_copies;
+static int hf_scsi_recv_copy_data_seg_gran;
+static int hf_scsi_recv_copy_inline_data_gran;
+static int hf_scsi_recv_copy_held_data_gran;
+static int hf_scsi_recv_copy_implemented_desc_list_len;
+static int hf_scsi_segment_descriptor_length;
+static int hf_scsi_designator;
+static int hf_scsi_inline_data;
+static int hf_scsi_reserved_8;
+static int hf_scsi_reserved_16;
+static int hf_scsi_reserved_24;
+static int hf_scsi_reserved_32;
+static int hf_scsi_reserved_64;
+static int hf_scsi_naa_type;
+static int hf_scsi_naa_locally_assigned;
+static int hf_scsi_naa_ieee_company_id;
+static int hf_scsi_naa_vendor_specific;
+static int hf_scsi_naa_vendor_specific_extension;
+
+static gint ett_scsi;
+static gint ett_scsi_page;
+gint ett_scsi_control;
+static gint ett_scsi_inq_control;
+static gint ett_scsi_inq_peripheral;
+static gint ett_scsi_inq_acaflags;
+static gint ett_scsi_inq_rmbflags;
+static gint ett_scsi_inq_sccsflags;
+static gint ett_scsi_inq_bqueflags;
+static gint ett_scsi_inq_reladrflags;
+static gint ett_scsi_log;
+static gint ett_scsi_log_ppc;
+static gint ett_scsi_log_pc;
+static gint ett_scsi_log_param;
+static gint ett_scsi_fragments;
+static gint ett_scsi_fragment;
+static gint ett_persresv_control;
+static gint ett_scsi_lun;
+static gint ett_scsi_lun_unit;
+static gint ett_scsi_prevent_allow;
+static gint ett_command_descriptor;
+static gint ett_timeout_descriptor;
+static gint ett_sense_descriptor;
+static gint ett_sense_osd_not_initiated;
+static gint ett_sense_osd_completed;
+static gint ett_xcopy_per_dev_type;
+static gint ett_xcopy_param_byte;
+static gint ett_scsi_xcopy_cscds;
+static gint ett_scsi_xcopy_cscd;
+static gint ett_scsi_xcopy_dev_params;
+static gint ett_scsi_xcopy_segs;
+static gint ett_scsi_xcopy_seg;
+static gint ett_scsi_xcopy_seg_param;
+static gint ett_scsi_cscd_desc;
+static gint ett_scsi_naa;
+static gint ett_scsi_designation_descriptor;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_scsi_unknown_scsi_exchange = EI_INIT;
-static expert_field ei_scsi_product_data_goes_past_end_of_page = EI_INIT;
-static expert_field ei_scsi_unknown_page = EI_INIT;
-static expert_field ei_scsi_no_dissection_for_service_action = EI_INIT;
-static expert_field ei_scsi_unknown_serv_action = EI_INIT;
+static expert_field ei_scsi_unknown_scsi_exchange;
+static expert_field ei_scsi_product_data_goes_past_end_of_page;
+static expert_field ei_scsi_unknown_page;
+static expert_field ei_scsi_no_dissection_for_service_action;
+static expert_field ei_scsi_unknown_serv_action;
 
 static int scsi_tap = -1;
 
diff --git a/epan/dissectors/packet-scte35.c b/epan/dissectors/packet-scte35.c
index 10e11cbdb9..e80f5bd822 100644
--- a/epan/dissectors/packet-scte35.c
+++ b/epan/dissectors/packet-scte35.c
@@ -61,76 +61,76 @@ static const unsigned char SCTE35_TABLE_ID = 0xFCU;
 static const int SCTE35_SI_MIN_LEN = 20;
 
 /* Protocol handle */
-static int proto_scte35 = -1;
+static int proto_scte35;
 
 /* Dissector table for scte35.splice_command_type */
 static dissector_table_t scte35_cmd_dissector_table = NULL;
 
 
 /* splice_info_section table */
-static gint ett_scte35_splice_info_section = -1;
+static gint ett_scte35_splice_info_section;
 
 /* splice_info_section fields */
-static gint hf_table_id = -1;
-static gint hf_section_syntax_indicator = -1;
-static gint hf_private_indicator = -1;
-static gint hf_reserved = -1;
-static gint hf_section_length = -1;
-static gint hf_protocol_version = -1;
-static gint hf_encrypted_packet = -1;
-static gint hf_encryption_algorithm = -1;
-static gint hf_pts_adjustment = -1;
-static gint hf_cw_index = -1;
-static gint hf_tier = -1;
-static gint hf_splice_command_length = -1;
-static gint hf_splice_command_type = -1;
-static gint hf_descriptor_loop_length = -1;
-static gint hf_splice_descriptor_tag = -1;
-static gint hf_splice_descriptor_length = -1;
-static gint hf_splice_descriptor_identifier = -1;
-static gint hf_descriptor_provider_avail_id = -1;
-static gint hf_descriptor_preroll = -1;
-static gint hf_descriptor_dtmf_count = -1;
-static gint hf_descriptor_dtmf_reserved = -1;
-static gint hf_descriptor_dtmf = -1;
-static gint hf_descriptor_event_id = -1;
-static gint hf_descriptor_cancel_indicator = -1;
-static gint hf_descriptor_reserved0 = -1;
-static gint hf_descriptor_psf = -1;
-static gint hf_descriptor_segmentation_duration_flag = -1;
-static gint hf_descriptor_delivery_not_restricted_flag = -1;
-static gint hf_descriptor_web_delivery_allowed_flag = -1;
-static gint hf_descriptor_no_regional_blackout_flag = -1;
-static gint hf_descriptor_archive_allow_flag = -1;
-static gint hf_descriptor_device_restrictions = -1;
-static gint hf_descriptor_reserved1 = -1;
-static gint hf_descriptor_component_count = -1;
-static gint hf_descriptor_component_tag = -1;
-static gint hf_descriptor_component_reserved = -1;
-static gint hf_descriptor_component_pts_offset = -1;
-static gint hf_descriptor_segmentation_duration = -1;
-static gint hf_descriptor_segmentation_upid_type = -1;
-static gint hf_descriptor_segmentation_upid_length = -1;
-static gint hf_descriptor_segmentation_upid = -1;
-static gint hf_descriptor_segmentation_type_id = -1;
-static gint hf_descriptor_segment_num = -1;
-static gint hf_descriptor_segments_expected = -1;
-static gint hf_e_crc32 = -1;
-static gint hf_crc32 = -1;
+static gint hf_table_id;
+static gint hf_section_syntax_indicator;
+static gint hf_private_indicator;
+static gint hf_reserved;
+static gint hf_section_length;
+static gint hf_protocol_version;
+static gint hf_encrypted_packet;
+static gint hf_encryption_algorithm;
+static gint hf_pts_adjustment;
+static gint hf_cw_index;
+static gint hf_tier;
+static gint hf_splice_command_length;
+static gint hf_splice_command_type;
+static gint hf_descriptor_loop_length;
+static gint hf_splice_descriptor_tag;
+static gint hf_splice_descriptor_length;
+static gint hf_splice_descriptor_identifier;
+static gint hf_descriptor_provider_avail_id;
+static gint hf_descriptor_preroll;
+static gint hf_descriptor_dtmf_count;
+static gint hf_descriptor_dtmf_reserved;
+static gint hf_descriptor_dtmf;
+static gint hf_descriptor_event_id;
+static gint hf_descriptor_cancel_indicator;
+static gint hf_descriptor_reserved0;
+static gint hf_descriptor_psf;
+static gint hf_descriptor_segmentation_duration_flag;
+static gint hf_descriptor_delivery_not_restricted_flag;
+static gint hf_descriptor_web_delivery_allowed_flag;
+static gint hf_descriptor_no_regional_blackout_flag;
+static gint hf_descriptor_archive_allow_flag;
+static gint hf_descriptor_device_restrictions;
+static gint hf_descriptor_reserved1;
+static gint hf_descriptor_component_count;
+static gint hf_descriptor_component_tag;
+static gint hf_descriptor_component_reserved;
+static gint hf_descriptor_component_pts_offset;
+static gint hf_descriptor_segmentation_duration;
+static gint hf_descriptor_segmentation_upid_type;
+static gint hf_descriptor_segmentation_upid_length;
+static gint hf_descriptor_segmentation_upid;
+static gint hf_descriptor_segmentation_type_id;
+static gint hf_descriptor_segment_num;
+static gint hf_descriptor_segments_expected;
+static gint hf_e_crc32;
+static gint hf_crc32;
 
 /* time_signal protocol and fields */
-static int proto_scte35_time = -1;
-static gint ett_scte35_time_signal = -1;
-static gint ett_scte35_time_signal_splice_time = -1;
-static gint hf_time_specified = -1;
-static gint hf_time_reserved = -1;
-static gint hf_time_pts = -1;
+static int proto_scte35_time;
+static gint ett_scte35_time_signal;
+static gint ett_scte35_time_signal_splice_time;
+static gint hf_time_specified;
+static gint hf_time_reserved;
+static gint hf_time_pts;
 
 /* private_command protocol and fields */
-static int proto_private_command = -1;
-static gint ett_private_command = -1;
-static gint hf_identifier = -1;
-static gint hf_private_byte = -1;
+static int proto_private_command;
+static gint ett_private_command;
+static gint hf_identifier;
+static gint hf_private_byte;
 
 /* Dissector table for scte35_private_command.identifier */
 static dissector_table_t private_identifier_table = NULL;
@@ -142,52 +142,52 @@ static dissector_handle_t scte35_si_handle;
 static dissector_handle_t scte35_ss_handle;
 
 /* splice_insert protocol and fields */
-static int proto_scte35_si = -1;
-static gint ett_scte35_splice_insert = -1;
-static gint hf_splice_insert_event_id = -1;
-static gint hf_splice_cancel_indicator = -1;
-static gint hf_reserved0 = -1;
-static gint hf_out_of_network_indicator = -1;
-static gint hf_program_splice_flag = -1;
-static gint hf_duration_flag = -1;
-static gint hf_splice_immediate_flag = -1;
-static gint hf_reserved1 = -1;
-static gint hf_splice_time_specified_flag = -1;
-static gint hf_splice_time_reserved = -1;
-static gint hf_splice_time_pts_time = -1;
-static gint hf_component_count = -1;
-static gint hf_component_tag = -1;
-static gint hf_component_splice_time_tsf = -1;
-static gint hf_component_splice_time_reserved = -1;
-static gint hf_component_splice_time_pts_time = -1;
-static gint hf_break_duration_auto_return = -1;
-static gint hf_break_duration_reserved = -1;
-static gint hf_break_duration_duration = -1;
-static gint hf_unique_program_id = -1;
-static gint hf_avail_num = -1;
-static gint hf_avails_expected = -1;
+static int proto_scte35_si;
+static gint ett_scte35_splice_insert;
+static gint hf_splice_insert_event_id;
+static gint hf_splice_cancel_indicator;
+static gint hf_reserved0;
+static gint hf_out_of_network_indicator;
+static gint hf_program_splice_flag;
+static gint hf_duration_flag;
+static gint hf_splice_immediate_flag;
+static gint hf_reserved1;
+static gint hf_splice_time_specified_flag;
+static gint hf_splice_time_reserved;
+static gint hf_splice_time_pts_time;
+static gint hf_component_count;
+static gint hf_component_tag;
+static gint hf_component_splice_time_tsf;
+static gint hf_component_splice_time_reserved;
+static gint hf_component_splice_time_pts_time;
+static gint hf_break_duration_auto_return;
+static gint hf_break_duration_reserved;
+static gint hf_break_duration_duration;
+static gint hf_unique_program_id;
+static gint hf_avail_num;
+static gint hf_avails_expected;
 
 /* splice_schedule protocol and fields */
-static int proto_scte35_splice_schedule = -1;
-static gint ett_scte35_splice_schedule = -1;
-static gint hf_splice_count = -1;
-static gint hf_splice_event_id = -1;
-static gint hf_splice_event_cancel_indicator = -1;
-static gint hf_splice_reserved0 = -1;
-static gint hf_splice_out_of_network = -1;
-static gint hf_splice_program_splice_flag = -1;
-static gint hf_splice_duration_flag = -1;
-static gint hf_splice_reserved1 = -1;
-static gint hf_splice_utc_splice_time = -1;
-static gint hf_splice_component_count = -1;
-static gint hf_splice_component_tag = -1;
-static gint hf_splice_component_utc_splice_time = -1;
-static gint hf_splice_break_duration_auto_return = -1;
-static gint hf_splice_break_duration_reserved = -1;
-static gint hf_splice_break_duration_duration = -1;
-static gint hf_splice_unique_program_id = -1;
-static gint hf_splice_avail_num = -1;
-static gint hf_splice_avails_expected = -1;
+static int proto_scte35_splice_schedule;
+static gint ett_scte35_splice_schedule;
+static gint hf_splice_count;
+static gint hf_splice_event_id;
+static gint hf_splice_event_cancel_indicator;
+static gint hf_splice_reserved0;
+static gint hf_splice_out_of_network;
+static gint hf_splice_program_splice_flag;
+static gint hf_splice_duration_flag;
+static gint hf_splice_reserved1;
+static gint hf_splice_utc_splice_time;
+static gint hf_splice_component_count;
+static gint hf_splice_component_tag;
+static gint hf_splice_component_utc_splice_time;
+static gint hf_splice_break_duration_auto_return;
+static gint hf_splice_break_duration_reserved;
+static gint hf_splice_break_duration_duration;
+static gint hf_splice_unique_program_id;
+static gint hf_splice_avail_num;
+static gint hf_splice_avails_expected;
 
 static const true_false_string tfs_section_syntax_indicator = {
     "Reserved", "MPEG short sections in use"};
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index f9f72a13cd..8ed4ccd5c8 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -76,185 +76,185 @@ void proto_register_sctp(void);
 void proto_reg_handoff_sctp(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_sctp = -1;
-static int hf_port = -1;
-static int hf_source_port      = -1;
-static int hf_destination_port = -1;
-static int hf_verification_tag = -1;
-static int hf_checksum         = -1;
-static int hf_checksum_adler   = -1;
-static int hf_checksum_crc32c  = -1;
-static int hf_checksum_status  = -1;
-
-static int hf_chunk_type       = -1;
-static int hf_chunk_flags      = -1;
-static int hf_chunk_bit_1      = -1;
-static int hf_chunk_bit_2      = -1;
-static int hf_chunk_length     = -1;
-static int hf_chunk_padding    = -1;
-static int hf_chunk_value    = -1;
-
-static int hf_initiate_tag   = -1;
-static int hf_init_chunk_initiate_tag   = -1;
-static int hf_init_chunk_adv_rec_window_credit = -1;
-static int hf_init_chunk_number_of_outbound_streams = -1;
-static int hf_init_chunk_number_of_inbound_streams  = -1;
-static int hf_init_chunk_initial_tsn    = -1;
-
-static int hf_initack_chunk_initiate_tag   = -1;
-static int hf_initack_chunk_adv_rec_window_credit = -1;
-static int hf_initack_chunk_number_of_outbound_streams = -1;
-static int hf_initack_chunk_number_of_inbound_streams  = -1;
-static int hf_initack_chunk_initial_tsn    = -1;
-
-static int hf_data_chunk_tsn = -1;
-static int hf_data_chunk_tsn_raw = -1;
-static int hf_data_chunk_stream_id = -1;
-static int hf_data_chunk_stream_seq_number = -1;
-static int hf_data_chunk_payload_proto_id = -1;
-static int hf_idata_chunk_reserved = -1;
-static int hf_idata_chunk_mid = -1;
-static int hf_idata_chunk_fsn = -1;
-
-static int hf_data_chunk_e_bit = -1;
-static int hf_data_chunk_b_bit = -1;
-static int hf_data_chunk_u_bit = -1;
-static int hf_data_chunk_i_bit = -1;
-
-static int hf_sack_chunk_ns = -1;
-static int hf_sack_chunk_cumulative_tsn_ack = -1;
-static int hf_sack_chunk_cumulative_tsn_ack_raw = -1;
-static int hf_sack_chunk_adv_rec_window_credit = -1;
-static int hf_sack_chunk_number_of_gap_blocks = -1;
-static int hf_sack_chunk_number_of_dup_tsns = -1;
-static int hf_sack_chunk_gap_block_start = -1;
-static int hf_sack_chunk_gap_block_end = -1;
-static int hf_sack_chunk_gap_block_start_tsn = -1;
-static int hf_sack_chunk_gap_block_end_tsn = -1;
-static int hf_sack_chunk_number_tsns_gap_acked = -1;
-static int hf_sack_chunk_duplicate_tsn = -1;
-
-static int hf_nr_sack_chunk_ns = -1;
-static int hf_nr_sack_chunk_cumulative_tsn_ack = -1;
-static int hf_nr_sack_chunk_adv_rec_window_credit = -1;
-static int hf_nr_sack_chunk_number_of_gap_blocks = -1;
-static int hf_nr_sack_chunk_number_of_nr_gap_blocks = -1;
-static int hf_nr_sack_chunk_number_of_dup_tsns = -1;
-static int hf_nr_sack_chunk_reserved = -1;
-static int hf_nr_sack_chunk_gap_block_start = -1;
-static int hf_nr_sack_chunk_gap_block_end = -1;
-static int hf_nr_sack_chunk_gap_block_start_tsn = -1;
-static int hf_nr_sack_chunk_gap_block_end_tsn = -1;
-static int hf_nr_sack_chunk_number_tsns_gap_acked = -1;
-static int hf_nr_sack_chunk_nr_gap_block_start = -1;
-static int hf_nr_sack_chunk_nr_gap_block_end = -1;
-static int hf_nr_sack_chunk_nr_gap_block_start_tsn = -1;
-static int hf_nr_sack_chunk_nr_gap_block_end_tsn = -1;
-static int hf_nr_sack_chunk_number_tsns_nr_gap_acked = -1;
-static int hf_nr_sack_chunk_duplicate_tsn = -1;
-
-static int hf_shutdown_chunk_cumulative_tsn_ack = -1;
-static int hf_cookie = -1;
-static int hf_cwr_chunk_lowest_tsn = -1;
-
-static int hf_ecne_chunk_lowest_tsn = -1;
-static int hf_abort_chunk_t_bit = -1;
-static int hf_shutdown_complete_chunk_t_bit = -1;
-
-static int hf_parameter_type = -1;
-static int hf_parameter_length = -1;
-static int hf_parameter_value = -1;
-static int hf_parameter_padding = -1;
-static int hf_parameter_bit_1      = -1;
-static int hf_parameter_bit_2      = -1;
-static int hf_ipv4_address = -1;
-static int hf_ipv6_address = -1;
-static int hf_heartbeat_info = -1;
-static int hf_state_cookie = -1;
-static int hf_cookie_preservative_increment = -1;
-static int hf_hostname = -1;
-static int hf_supported_address_type = -1;
-static int hf_stream_reset_req_seq_nr = -1;
-static int hf_stream_reset_rsp_seq_nr = -1;
-static int hf_senders_last_assigned_tsn = -1;
-static int hf_senders_next_tsn = -1;
-static int hf_receivers_next_tsn = -1;
-static int hf_stream_reset_rsp_result = -1;
-static int hf_stream_reset_sid = -1;
-static int hf_add_outgoing_streams_number_streams = -1;
-static int hf_add_outgoing_streams_reserved = -1;
-static int hf_add_incoming_streams_number_streams = -1;
-static int hf_add_incoming_streams_reserved = -1;
-
-static int hf_zero_checksum_edmid = -1;
-
-static int hf_random_number = -1;
-static int hf_chunks_to_auth = -1;
-static int hf_hmac_id = -1;
-static int hf_hmac = -1;
-static int hf_shared_key_id = -1;
-static int hf_supported_chunk_type = -1;
-
-static int hf_cause_code = -1;
-static int hf_cause_length = -1;
-static int hf_cause_padding = -1;
-static int hf_cause_info = -1;
-
-static int hf_cause_stream_identifier = -1;
-static int hf_cause_reserved = -1;
-
-static int hf_cause_number_of_missing_parameters = -1;
-static int hf_cause_missing_parameter_type = -1;
-
-static int hf_cause_measure_of_staleness = -1;
-
-static int hf_cause_tsn = -1;
-
-static int hf_forward_tsn_chunk_tsn = -1;
-static int hf_forward_tsn_chunk_sid = -1;
-static int hf_forward_tsn_chunk_ssn = -1;
-
-static int hf_i_forward_tsn_chunk_tsn = -1;
-static int hf_i_forward_tsn_chunk_sid = -1;
-static int hf_i_forward_tsn_chunk_flags = -1;
-static int hf_i_forward_tsn_chunk_res = -1;
-static int hf_i_forward_tsn_chunk_u_bit = -1;
-static int hf_i_forward_tsn_chunk_mid = -1;
-
-static int hf_asconf_ack_seq_nr = -1;
-static int hf_asconf_seq_nr = -1;
-static int hf_correlation_id = -1;
-
-static int hf_adap_indication = -1;
-
-static int hf_pktdrop_chunk_m_bit = -1;
-static int hf_pktdrop_chunk_b_bit = -1;
-static int hf_pktdrop_chunk_t_bit = -1;
-static int hf_pktdrop_chunk_bandwidth = -1;
-static int hf_pktdrop_chunk_queuesize = -1;
-static int hf_pktdrop_chunk_truncated_length = -1;
-static int hf_pktdrop_chunk_reserved = -1;
-static int hf_pktdrop_chunk_data_field = -1;
-
-static int hf_pad_chunk_padding_data = -1;
-
-static int hf_sctp_reassembled_in = -1;
-static int hf_sctp_duplicate = -1;
-static int hf_sctp_fragments = -1;
-static int hf_sctp_fragment = -1;
-
-static int hf_sctp_retransmission = -1;
-static int hf_sctp_retransmitted = -1;
-static int hf_sctp_retransmitted_count = -1;
-static int hf_sctp_data_rtt = -1;
-static int hf_sctp_sack_rtt = -1;
-static int hf_sctp_rto = -1;
-static int hf_sctp_ack_tsn = -1;
-static int hf_sctp_ack_frame = -1;
-static int hf_sctp_acked = -1;
-static int hf_sctp_retransmitted_after_ack = -1;
-
-static int hf_sctp_assoc_index = -1;
+static int proto_sctp;
+static int hf_port;
+static int hf_source_port;
+static int hf_destination_port;
+static int hf_verification_tag;
+static int hf_checksum;
+static int hf_checksum_adler;
+static int hf_checksum_crc32c;
+static int hf_checksum_status;
+
+static int hf_chunk_type;
+static int hf_chunk_flags;
+static int hf_chunk_bit_1;
+static int hf_chunk_bit_2;
+static int hf_chunk_length;
+static int hf_chunk_padding;
+static int hf_chunk_value;
+
+static int hf_initiate_tag;
+static int hf_init_chunk_initiate_tag;
+static int hf_init_chunk_adv_rec_window_credit;
+static int hf_init_chunk_number_of_outbound_streams;
+static int hf_init_chunk_number_of_inbound_streams;
+static int hf_init_chunk_initial_tsn;
+
+static int hf_initack_chunk_initiate_tag;
+static int hf_initack_chunk_adv_rec_window_credit;
+static int hf_initack_chunk_number_of_outbound_streams;
+static int hf_initack_chunk_number_of_inbound_streams;
+static int hf_initack_chunk_initial_tsn;
+
+static int hf_data_chunk_tsn;
+static int hf_data_chunk_tsn_raw;
+static int hf_data_chunk_stream_id;
+static int hf_data_chunk_stream_seq_number;
+static int hf_data_chunk_payload_proto_id;
+static int hf_idata_chunk_reserved;
+static int hf_idata_chunk_mid;
+static int hf_idata_chunk_fsn;
+
+static int hf_data_chunk_e_bit;
+static int hf_data_chunk_b_bit;
+static int hf_data_chunk_u_bit;
+static int hf_data_chunk_i_bit;
+
+static int hf_sack_chunk_ns;
+static int hf_sack_chunk_cumulative_tsn_ack;
+static int hf_sack_chunk_cumulative_tsn_ack_raw;
+static int hf_sack_chunk_adv_rec_window_credit;
+static int hf_sack_chunk_number_of_gap_blocks;
+static int hf_sack_chunk_number_of_dup_tsns;
+static int hf_sack_chunk_gap_block_start;
+static int hf_sack_chunk_gap_block_end;
+static int hf_sack_chunk_gap_block_start_tsn;
+static int hf_sack_chunk_gap_block_end_tsn;
+static int hf_sack_chunk_number_tsns_gap_acked;
+static int hf_sack_chunk_duplicate_tsn;
+
+static int hf_nr_sack_chunk_ns;
+static int hf_nr_sack_chunk_cumulative_tsn_ack;
+static int hf_nr_sack_chunk_adv_rec_window_credit;
+static int hf_nr_sack_chunk_number_of_gap_blocks;
+static int hf_nr_sack_chunk_number_of_nr_gap_blocks;
+static int hf_nr_sack_chunk_number_of_dup_tsns;
+static int hf_nr_sack_chunk_reserved;
+static int hf_nr_sack_chunk_gap_block_start;
+static int hf_nr_sack_chunk_gap_block_end;
+static int hf_nr_sack_chunk_gap_block_start_tsn;
+static int hf_nr_sack_chunk_gap_block_end_tsn;
+static int hf_nr_sack_chunk_number_tsns_gap_acked;
+static int hf_nr_sack_chunk_nr_gap_block_start;
+static int hf_nr_sack_chunk_nr_gap_block_end;
+static int hf_nr_sack_chunk_nr_gap_block_start_tsn;
+static int hf_nr_sack_chunk_nr_gap_block_end_tsn;
+static int hf_nr_sack_chunk_number_tsns_nr_gap_acked;
+static int hf_nr_sack_chunk_duplicate_tsn;
+
+static int hf_shutdown_chunk_cumulative_tsn_ack;
+static int hf_cookie;
+static int hf_cwr_chunk_lowest_tsn;
+
+static int hf_ecne_chunk_lowest_tsn;
+static int hf_abort_chunk_t_bit;
+static int hf_shutdown_complete_chunk_t_bit;
+
+static int hf_parameter_type;
+static int hf_parameter_length;
+static int hf_parameter_value;
+static int hf_parameter_padding;
+static int hf_parameter_bit_1;
+static int hf_parameter_bit_2;
+static int hf_ipv4_address;
+static int hf_ipv6_address;
+static int hf_heartbeat_info;
+static int hf_state_cookie;
+static int hf_cookie_preservative_increment;
+static int hf_hostname;
+static int hf_supported_address_type;
+static int hf_stream_reset_req_seq_nr;
+static int hf_stream_reset_rsp_seq_nr;
+static int hf_senders_last_assigned_tsn;
+static int hf_senders_next_tsn;
+static int hf_receivers_next_tsn;
+static int hf_stream_reset_rsp_result;
+static int hf_stream_reset_sid;
+static int hf_add_outgoing_streams_number_streams;
+static int hf_add_outgoing_streams_reserved;
+static int hf_add_incoming_streams_number_streams;
+static int hf_add_incoming_streams_reserved;
+
+static int hf_zero_checksum_edmid;
+
+static int hf_random_number;
+static int hf_chunks_to_auth;
+static int hf_hmac_id;
+static int hf_hmac;
+static int hf_shared_key_id;
+static int hf_supported_chunk_type;
+
+static int hf_cause_code;
+static int hf_cause_length;
+static int hf_cause_padding;
+static int hf_cause_info;
+
+static int hf_cause_stream_identifier;
+static int hf_cause_reserved;
+
+static int hf_cause_number_of_missing_parameters;
+static int hf_cause_missing_parameter_type;
+
+static int hf_cause_measure_of_staleness;
+
+static int hf_cause_tsn;
+
+static int hf_forward_tsn_chunk_tsn;
+static int hf_forward_tsn_chunk_sid;
+static int hf_forward_tsn_chunk_ssn;
+
+static int hf_i_forward_tsn_chunk_tsn;
+static int hf_i_forward_tsn_chunk_sid;
+static int hf_i_forward_tsn_chunk_flags;
+static int hf_i_forward_tsn_chunk_res;
+static int hf_i_forward_tsn_chunk_u_bit;
+static int hf_i_forward_tsn_chunk_mid;
+
+static int hf_asconf_ack_seq_nr;
+static int hf_asconf_seq_nr;
+static int hf_correlation_id;
+
+static int hf_adap_indication;
+
+static int hf_pktdrop_chunk_m_bit;
+static int hf_pktdrop_chunk_b_bit;
+static int hf_pktdrop_chunk_t_bit;
+static int hf_pktdrop_chunk_bandwidth;
+static int hf_pktdrop_chunk_queuesize;
+static int hf_pktdrop_chunk_truncated_length;
+static int hf_pktdrop_chunk_reserved;
+static int hf_pktdrop_chunk_data_field;
+
+static int hf_pad_chunk_padding_data;
+
+static int hf_sctp_reassembled_in;
+static int hf_sctp_duplicate;
+static int hf_sctp_fragments;
+static int hf_sctp_fragment;
+
+static int hf_sctp_retransmission;
+static int hf_sctp_retransmitted;
+static int hf_sctp_retransmitted_count;
+static int hf_sctp_data_rtt;
+static int hf_sctp_sack_rtt;
+static int hf_sctp_rto;
+static int hf_sctp_ack_tsn;
+static int hf_sctp_ack_frame;
+static int hf_sctp_acked;
+static int hf_sctp_retransmitted_after_ack;
+
+static int hf_sctp_assoc_index;
 
 static dissector_table_t sctp_port_dissector_table;
 static dissector_table_t sctp_ppi_dissector_table;
@@ -263,53 +263,53 @@ static int sctp_tap = -1;
 static int exported_pdu_tap = -1;
 
 /* Initialize the subtree pointers */
-static gint ett_sctp = -1;
-static gint ett_sctp_chunk = -1;
-static gint ett_sctp_chunk_parameter = -1;
-static gint ett_sctp_chunk_cause = -1;
-static gint ett_sctp_chunk_type = -1;
-static gint ett_sctp_data_chunk_flags = -1;
-static gint ett_sctp_sack_chunk_flags = -1;
-static gint ett_sctp_nr_sack_chunk_flags = -1;
-static gint ett_sctp_abort_chunk_flags = -1;
-static gint ett_sctp_shutdown_complete_chunk_flags = -1;
-static gint ett_sctp_pktdrop_chunk_flags = -1;
-static gint ett_sctp_parameter_type= -1;
-static gint ett_sctp_sack_chunk_gap_block = -1;
-static gint ett_sctp_sack_chunk_gap_block_start = -1;
-static gint ett_sctp_sack_chunk_gap_block_end = -1;
-static gint ett_sctp_nr_sack_chunk_gap_block = -1;
-static gint ett_sctp_nr_sack_chunk_gap_block_start = -1;
-static gint ett_sctp_nr_sack_chunk_gap_block_end = -1;
-static gint ett_sctp_nr_sack_chunk_nr_gap_block = -1;
-static gint ett_sctp_nr_sack_chunk_nr_gap_block_start = -1;
-static gint ett_sctp_nr_sack_chunk_nr_gap_block_end = -1;
-static gint ett_sctp_unrecognized_parameter_parameter = -1;
-static gint ett_sctp_i_forward_tsn_chunk_flags = -1;
-
-static gint ett_sctp_fragments = -1;
-static gint ett_sctp_fragment  = -1;
-
-static gint ett_sctp_tsn = -1;
-static gint ett_sctp_ack = -1;
-static gint ett_sctp_acked = -1;
-static gint ett_sctp_tsn_retransmission = -1;
-static gint ett_sctp_tsn_retransmitted_count = -1;
-static gint ett_sctp_tsn_retransmitted = -1;
-
-static expert_field ei_sctp_sack_chunk_adv_rec_window_credit = EI_INIT;
-static expert_field ei_sctp_nr_sack_chunk_number_tsns_gap_acked_100 = EI_INIT;
-static expert_field ei_sctp_parameter_length = EI_INIT;
-static expert_field ei_sctp_bad_sctp_checksum = EI_INIT;
-static expert_field ei_sctp_tsn_retransmitted_more_than_twice = EI_INIT;
-static expert_field ei_sctp_parameter_padding = EI_INIT;
-static expert_field ei_sctp_retransmitted_after_ack = EI_INIT;
-static expert_field ei_sctp_nr_sack_chunk_number_tsns_nr_gap_acked_100 = EI_INIT;
-static expert_field ei_sctp_sack_chunk_gap_block_out_of_order = EI_INIT;
-static expert_field ei_sctp_chunk_length_bad = EI_INIT;
-static expert_field ei_sctp_tsn_retransmitted = EI_INIT;
-static expert_field ei_sctp_sack_chunk_gap_block_malformed = EI_INIT;
-static expert_field ei_sctp_sack_chunk_number_tsns_gap_acked_100 = EI_INIT;
+static gint ett_sctp;
+static gint ett_sctp_chunk;
+static gint ett_sctp_chunk_parameter;
+static gint ett_sctp_chunk_cause;
+static gint ett_sctp_chunk_type;
+static gint ett_sctp_data_chunk_flags;
+static gint ett_sctp_sack_chunk_flags;
+static gint ett_sctp_nr_sack_chunk_flags;
+static gint ett_sctp_abort_chunk_flags;
+static gint ett_sctp_shutdown_complete_chunk_flags;
+static gint ett_sctp_pktdrop_chunk_flags;
+static gint ett_sctp_parameter_type;
+static gint ett_sctp_sack_chunk_gap_block;
+static gint ett_sctp_sack_chunk_gap_block_start;
+static gint ett_sctp_sack_chunk_gap_block_end;
+static gint ett_sctp_nr_sack_chunk_gap_block;
+static gint ett_sctp_nr_sack_chunk_gap_block_start;
+static gint ett_sctp_nr_sack_chunk_gap_block_end;
+static gint ett_sctp_nr_sack_chunk_nr_gap_block;
+static gint ett_sctp_nr_sack_chunk_nr_gap_block_start;
+static gint ett_sctp_nr_sack_chunk_nr_gap_block_end;
+static gint ett_sctp_unrecognized_parameter_parameter;
+static gint ett_sctp_i_forward_tsn_chunk_flags;
+
+static gint ett_sctp_fragments;
+static gint ett_sctp_fragment;
+
+static gint ett_sctp_tsn;
+static gint ett_sctp_ack;
+static gint ett_sctp_acked;
+static gint ett_sctp_tsn_retransmission;
+static gint ett_sctp_tsn_retransmitted_count;
+static gint ett_sctp_tsn_retransmitted;
+
+static expert_field ei_sctp_sack_chunk_adv_rec_window_credit;
+static expert_field ei_sctp_nr_sack_chunk_number_tsns_gap_acked_100;
+static expert_field ei_sctp_parameter_length;
+static expert_field ei_sctp_bad_sctp_checksum;
+static expert_field ei_sctp_tsn_retransmitted_more_than_twice;
+static expert_field ei_sctp_parameter_padding;
+static expert_field ei_sctp_retransmitted_after_ack;
+static expert_field ei_sctp_nr_sack_chunk_number_tsns_nr_gap_acked_100;
+static expert_field ei_sctp_sack_chunk_gap_block_out_of_order;
+static expert_field ei_sctp_chunk_length_bad;
+static expert_field ei_sctp_tsn_retransmitted;
+static expert_field ei_sctp_sack_chunk_gap_block_malformed;
+static expert_field ei_sctp_sack_chunk_number_tsns_gap_acked_100;
 
 WS_DLL_PUBLIC_DEF const value_string chunk_type_values[] = {
   { SCTP_DATA_CHUNK_ID,              "DATA" },
diff --git a/epan/dissectors/packet-scylla.c b/epan/dissectors/packet-scylla.c
index c5254f7a7a..45c7ca0d97 100644
--- a/epan/dissectors/packet-scylla.c
+++ b/epan/dissectors/packet-scylla.c
@@ -46,47 +46,47 @@ static dissector_handle_t scylla_handle;
 #define SCYLLA_NEGOTIATION_SIZE 12
 #define SCYLLA_NEGOTIATION_LEN_OFFSET 8
 
-static int proto_scylla = -1;
-
-static int hf_scylla_request = -1;
-static int hf_scylla_request_response_frame = -1;
-static int hf_scylla_timeout = -1;
-static int hf_scylla_verb = -1;
-static int hf_scylla_msg_id = -1;
-static int hf_scylla_len = -1;
-static int hf_scylla_response = -1;
-static int hf_scylla_response_size = -1;
-static int hf_scylla_response_request_frame = -1;
-static int hf_scylla_negotiation_magic = -1;
-static int hf_scylla_negotiation_size = -1;
-static int hf_scylla_payload = -1; // TODO: dissect everything, so that generic "payload" is not needed
+static int proto_scylla;
+
+static int hf_scylla_request;
+static int hf_scylla_request_response_frame;
+static int hf_scylla_timeout;
+static int hf_scylla_verb;
+static int hf_scylla_msg_id;
+static int hf_scylla_len;
+static int hf_scylla_response;
+static int hf_scylla_response_size;
+static int hf_scylla_response_request_frame;
+static int hf_scylla_negotiation_magic;
+static int hf_scylla_negotiation_size;
+static int hf_scylla_payload; // TODO: dissect everything, so that generic "payload" is not needed
 
 // Mutation
-static int hf_scylla_mut_size1 = -1;
-static int hf_scylla_mut_size2 = -1;
-static int hf_scylla_mut_table_id = -1;
-static int hf_scylla_mut_schema_id = -1;
-static int hf_scylla_mut_len_pkeys = -1;
-static int hf_scylla_mut_num_pkeys = -1;
-static int hf_scylla_mut_len_pkey = -1;
-static int hf_scylla_mut_pkey = -1;
+static int hf_scylla_mut_size1;
+static int hf_scylla_mut_size2;
+static int hf_scylla_mut_table_id;
+static int hf_scylla_mut_schema_id;
+static int hf_scylla_mut_len_pkeys;
+static int hf_scylla_mut_num_pkeys;
+static int hf_scylla_mut_len_pkey;
+static int hf_scylla_mut_pkey;
 
 // Read data
-static int hf_scylla_read_data_timeout = -1;
-static int hf_scylla_read_data_table_id = -1;
-static int hf_scylla_read_data_schema_version = -1;
-
-static gint ett_scylla = -1;
-static gint ett_scylla_header = -1;
-static gint ett_scylla_response = -1;
-static gint ett_scylla_negotiation = -1;
-static gint ett_scylla_mut = -1;
-static gint ett_scylla_mut_pkey = -1;
-static gint ett_scylla_read_data = -1;
+static int hf_scylla_read_data_timeout;
+static int hf_scylla_read_data_table_id;
+static int hf_scylla_read_data_schema_version;
+
+static gint ett_scylla;
+static gint ett_scylla_header;
+static gint ett_scylla_response;
+static gint ett_scylla_negotiation;
+static gint ett_scylla_mut;
+static gint ett_scylla_mut_pkey;
+static gint ett_scylla_read_data;
 
 static gboolean scylla_desegment = TRUE;
 
-static expert_field ei_scylla_response_missing = EI_INIT;
+static expert_field ei_scylla_response_missing;
 
 enum scylla_packets {
     CLIENT_ID = 0,
diff --git a/epan/dissectors/packet-sdh.c b/epan/dissectors/packet-sdh.c
index f060d8c520..04c2b75e1f 100644
--- a/epan/dissectors/packet-sdh.c
+++ b/epan/dissectors/packet-sdh.c
@@ -23,38 +23,38 @@
 void proto_register_sdh(void);
 void proto_reg_handoff_sdh(void);
 
-static int proto_sdh = -1;
-
-static gint ett_sdh = -1;
-
-static int hf_sdh_a1 = -1;
-static int hf_sdh_a2 = -1;
-static int hf_sdh_j0 = -1;
-static int hf_sdh_b1 = -1;
-static int hf_sdh_e1 = -1;
-static int hf_sdh_f1 = -1;
-static int hf_sdh_d1 = -1;
-static int hf_sdh_d2 = -1;
-static int hf_sdh_d3 = -1;
-static int hf_sdh_au = -1;
-static int hf_sdh_b2 = -1;
-static int hf_sdh_k1 = -1;
-static int hf_sdh_k2 = -1;
-static int hf_sdh_d4 = -1;
-static int hf_sdh_d5 = -1;
-static int hf_sdh_d6 = -1;
-static int hf_sdh_d7 = -1;
-static int hf_sdh_d8 = -1;
-static int hf_sdh_d9 = -1;
-static int hf_sdh_d10 = -1;
-static int hf_sdh_d11 = -1;
-static int hf_sdh_d12 = -1;
-static int hf_sdh_s1 = -1;
-static int hf_sdh_m1 = -1;
-static int hf_sdh_e2 = -1;
-static int hf_sdh_h1 = -1;
-static int hf_sdh_h2 = -1;
-static int hf_sdh_j1 = -1;
+static int proto_sdh;
+
+static gint ett_sdh;
+
+static int hf_sdh_a1;
+static int hf_sdh_a2;
+static int hf_sdh_j0;
+static int hf_sdh_b1;
+static int hf_sdh_e1;
+static int hf_sdh_f1;
+static int hf_sdh_d1;
+static int hf_sdh_d2;
+static int hf_sdh_d3;
+static int hf_sdh_au;
+static int hf_sdh_b2;
+static int hf_sdh_k1;
+static int hf_sdh_k2;
+static int hf_sdh_d4;
+static int hf_sdh_d5;
+static int hf_sdh_d6;
+static int hf_sdh_d7;
+static int hf_sdh_d8;
+static int hf_sdh_d9;
+static int hf_sdh_d10;
+static int hf_sdh_d11;
+static int hf_sdh_d12;
+static int hf_sdh_s1;
+static int hf_sdh_m1;
+static int hf_sdh_e2;
+static int hf_sdh_h1;
+static int hf_sdh_h2;
+static int hf_sdh_j1;
 
 static dissector_handle_t sdh_handle;
 
diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c
index 78a571a6c4..e4687044f1 100644
--- a/epan/dissectors/packet-sdlc.c
+++ b/epan/dissectors/packet-sdlc.c
@@ -29,21 +29,21 @@ void proto_reg_handoff_sdlc(void);
 
 static dissector_handle_t sdlc_handle;
 
-static int proto_sdlc = -1;
-static int hf_sdlc_address = -1;
-static int hf_sdlc_control = -1;
-static int hf_sdlc_n_r = -1;
-static int hf_sdlc_n_s = -1;
-static int hf_sdlc_p = -1;
-static int hf_sdlc_f = -1;
-static int hf_sdlc_s_ftype = -1;
-static int hf_sdlc_u_modifier_cmd = -1;
-static int hf_sdlc_u_modifier_resp = -1;
-static int hf_sdlc_ftype_i = -1;
-static int hf_sdlc_ftype_s_u = -1;
-
-static gint ett_sdlc = -1;
-static gint ett_sdlc_control = -1;
+static int proto_sdlc;
+static int hf_sdlc_address;
+static int hf_sdlc_control;
+static int hf_sdlc_n_r;
+static int hf_sdlc_n_s;
+static int hf_sdlc_p;
+static int hf_sdlc_f;
+static int hf_sdlc_s_ftype;
+static int hf_sdlc_u_modifier_cmd;
+static int hf_sdlc_u_modifier_resp;
+static int hf_sdlc_ftype_i;
+static int hf_sdlc_ftype_s_u;
+
+static gint ett_sdlc;
+static gint ett_sdlc_control;
 
 static dissector_handle_t sna_handle;
 
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index 278fa5a56b..641826352c 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -62,8 +62,8 @@ static dissector_handle_t mp4ves_config_handle;
 
 static int sdp_tap = -1;
 
-static int proto_sdp = -1;
-static int proto_sprt = -1;
+static int proto_sdp;
+static int proto_sprt;
 
 static const char* UNKNOWN_ENCODING = "Unknown";
 static wmem_tree_t *sdp_transport_reqs = NULL;
@@ -73,144 +73,144 @@ static wmem_tree_t *sdp_transport_rsps = NULL;
 static gboolean global_sdp_establish_conversation = TRUE;
 
 /* Top level fields */
-static int hf_protocol_version = -1;
-static int hf_owner = -1;
-static int hf_session_name = -1;
-static int hf_session_info = -1;
-static int hf_uri = -1;
-static int hf_email = -1;
-static int hf_phone = -1;
-static int hf_connection_info = -1;
-static int hf_bandwidth = -1;
-static int hf_timezone = -1;
-static int hf_encryption_key = -1;
-static int hf_session_attribute = -1;
-static int hf_media_attribute = -1;
-static int hf_time = -1;
-static int hf_repeat_time = -1;
-static int hf_media = -1;
-static int hf_media_title = -1;
-static int hf_unknown = -1;
-static int hf_invalid = -1;
-static int hf_ipbcp_version = -1;
-static int hf_ipbcp_type = -1;
+static int hf_protocol_version;
+static int hf_owner;
+static int hf_session_name;
+static int hf_session_info;
+static int hf_uri;
+static int hf_email;
+static int hf_phone;
+static int hf_connection_info;
+static int hf_bandwidth;
+static int hf_timezone;
+static int hf_encryption_key;
+static int hf_session_attribute;
+static int hf_media_attribute;
+static int hf_time;
+static int hf_repeat_time;
+static int hf_media;
+static int hf_media_title;
+static int hf_unknown;
+static int hf_invalid;
+static int hf_ipbcp_version;
+static int hf_ipbcp_type;
 
 /* hf_owner subfields*/
-static int hf_owner_username = -1;
-static int hf_owner_sessionid = -1;
-static int hf_owner_version = -1;
-static int hf_owner_network_type = -1;
-static int hf_owner_address_type = -1;
-static int hf_owner_address = -1;
+static int hf_owner_username;
+static int hf_owner_sessionid;
+static int hf_owner_version;
+static int hf_owner_network_type;
+static int hf_owner_address_type;
+static int hf_owner_address;
 
 /* hf_connection_info subfields */
-static int hf_connection_info_network_type = -1;
-static int hf_connection_info_address_type = -1;
-static int hf_connection_info_connection_address = -1;
-static int hf_connection_info_ttl = -1;
-static int hf_connection_info_num_addr = -1;
+static int hf_connection_info_network_type;
+static int hf_connection_info_address_type;
+static int hf_connection_info_connection_address;
+static int hf_connection_info_ttl;
+static int hf_connection_info_num_addr;
 
 /* hf_bandwidth subfields */
-static int hf_bandwidth_modifier = -1;
-static int hf_bandwidth_value = -1;
+static int hf_bandwidth_modifier;
+static int hf_bandwidth_value;
 
 /* hf_time subfields */
-static int hf_time_start = -1;
-static int hf_time_stop = -1;
+static int hf_time_start;
+static int hf_time_stop;
 
 /* hf_repeat_time subfield */
-static int hf_repeat_time_interval = -1;
-static int hf_repeat_time_duration = -1;
-static int hf_repeat_time_offset = -1;
+static int hf_repeat_time_interval;
+static int hf_repeat_time_duration;
+static int hf_repeat_time_offset;
 
 /* hf_timezone subfields */
-static int hf_timezone_time = -1;
-static int hf_timezone_offset = -1;
+static int hf_timezone_time;
+static int hf_timezone_offset;
 
 /* hf_encryption_key subfields */
-static int hf_encryption_key_type = -1;
-static int hf_encryption_key_data = -1;
+static int hf_encryption_key_type;
+static int hf_encryption_key_data;
 
 /* hf_session_attribute subfields */
-static int hf_session_attribute_field = -1;
-static int hf_session_attribute_value = -1;
+static int hf_session_attribute_field;
+static int hf_session_attribute_value;
 
 /* hf_media subfields */
-static int hf_media_media = -1;
-static int hf_media_port = -1;
-static int hf_media_port_string = -1;
-static int hf_media_portcount = -1;
-static int hf_media_proto = -1;
-static int hf_media_format = -1;
+static int hf_media_media;
+static int hf_media_port;
+static int hf_media_port_string;
+static int hf_media_portcount;
+static int hf_media_proto;
+static int hf_media_format;
 
 /* hf_session_attribute subfields */
-static int hf_media_attribute_field = -1;
-static int hf_media_attribute_value = -1;
-static int hf_media_encoding_name = -1;
-static int hf_media_sample_rate = -1;
-static int hf_media_channels = -1;
-static int hf_media_format_specific_parameter = -1;
-static int hf_sdp_fmtp_mpeg4_profile_level_id = -1;
-static int hf_sdp_fmtp_h263_profile = -1;
-static int hf_sdp_fmtp_h263_level = -1;
-static int hf_sdp_h264_packetization_mode = -1;
-static int hf_SDPh223LogicalChannelParameters = -1;
+static int hf_media_attribute_field;
+static int hf_media_attribute_value;
+static int hf_media_encoding_name;
+static int hf_media_sample_rate;
+static int hf_media_channels;
+static int hf_media_format_specific_parameter;
+static int hf_sdp_fmtp_mpeg4_profile_level_id;
+static int hf_sdp_fmtp_h263_profile;
+static int hf_sdp_fmtp_h263_level;
+static int hf_sdp_h264_packetization_mode;
+static int hf_SDPh223LogicalChannelParameters;
 
 /* hf_session_attribute hf_media_attribute subfields */
-static int hf_key_mgmt_att_value = -1;
-static int hf_key_mgmt_prtcl_id = -1;
-static int hf_key_mgmt_data = -1;
-
-static int hf_sdp_crypto_tag = -1;
-static int hf_sdp_crypto_crypto_suite = -1;
-static int hf_sdp_crypto_master_key = -1;
-static int hf_sdp_crypto_master_salt = -1;
-static int hf_sdp_crypto_lifetime = -1;
-static int hf_sdp_crypto_mki = -1;
-static int hf_sdp_crypto_mki_length = -1;
+static int hf_key_mgmt_att_value;
+static int hf_key_mgmt_prtcl_id;
+static int hf_key_mgmt_data;
+
+static int hf_sdp_crypto_tag;
+static int hf_sdp_crypto_crypto_suite;
+static int hf_sdp_crypto_master_key;
+static int hf_sdp_crypto_master_salt;
+static int hf_sdp_crypto_lifetime;
+static int hf_sdp_crypto_mki;
+static int hf_sdp_crypto_mki_length;
 
 /* a=candidate subfields */
-static int hf_ice_candidate_foundation = -1;
-static int hf_ice_candidate_componentid = -1;
-static int hf_ice_candidate_transport = -1;
-static int hf_ice_candidate_priority = -1;
-static int hf_ice_candidate_address = -1;
-static int hf_ice_candidate_port = -1;
-static int hf_ice_candidate_type = -1;
+static int hf_ice_candidate_foundation;
+static int hf_ice_candidate_componentid;
+static int hf_ice_candidate_transport;
+static int hf_ice_candidate_priority;
+static int hf_ice_candidate_address;
+static int hf_ice_candidate_port;
+static int hf_ice_candidate_type;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_sdp_nal_unit_2_string = -1;
-static int hf_sdp_key_and_salt = -1;
-static int hf_sdp_nal_unit_1_string = -1;
-static int hf_sdp_data = -1;
+static int hf_sdp_nal_unit_2_string;
+static int hf_sdp_key_and_salt;
+static int hf_sdp_nal_unit_1_string;
+static int hf_sdp_data;
 
 /* trees */
-static int ett_sdp = -1;
-static int ett_sdp_owner = -1;
-static int ett_sdp_connection_info = -1;
-static int ett_sdp_bandwidth = -1;
-static int ett_sdp_time = -1;
-static int ett_sdp_repeat_time = -1;
-static int ett_sdp_timezone = -1;
-static int ett_sdp_encryption_key = -1;
-static int ett_sdp_session_attribute = -1;
-static int ett_sdp_media = -1;
-static int ett_sdp_media_attribute = -1;
-static int ett_sdp_fmtp = -1;
-static int ett_sdp_key_mgmt = -1;
-static int ett_sdp_crypto_key_parameters = -1;
-
-static expert_field ei_sdp_invalid_key_param   = EI_INIT;
-static expert_field ei_sdp_invalid_line_equal  = EI_INIT;
-static expert_field ei_sdp_invalid_line_fields = EI_INIT;
-static expert_field ei_sdp_invalid_line_space  = EI_INIT;
-static expert_field ei_sdp_invalid_conversion = EI_INIT;
-static expert_field ei_sdp_invalid_media_port = EI_INIT;
-static expert_field ei_sdp_invalid_sample_rate = EI_INIT;
-static expert_field ei_sdp_invalid_channels = EI_INIT;
-static expert_field ei_sdp_invalid_media_format = EI_INIT;
-static expert_field ei_sdp_invalid_crypto_tag = EI_INIT;
-static expert_field ei_sdp_invalid_crypto_mki_length = EI_INIT;
+static int ett_sdp;
+static int ett_sdp_owner;
+static int ett_sdp_connection_info;
+static int ett_sdp_bandwidth;
+static int ett_sdp_time;
+static int ett_sdp_repeat_time;
+static int ett_sdp_timezone;
+static int ett_sdp_encryption_key;
+static int ett_sdp_session_attribute;
+static int ett_sdp_media;
+static int ett_sdp_media_attribute;
+static int ett_sdp_fmtp;
+static int ett_sdp_key_mgmt;
+static int ett_sdp_crypto_key_parameters;
+
+static expert_field ei_sdp_invalid_key_param;
+static expert_field ei_sdp_invalid_line_equal;
+static expert_field ei_sdp_invalid_line_fields;
+static expert_field ei_sdp_invalid_line_space;
+static expert_field ei_sdp_invalid_conversion;
+static expert_field ei_sdp_invalid_media_port;
+static expert_field ei_sdp_invalid_sample_rate;
+static expert_field ei_sdp_invalid_channels;
+static expert_field ei_sdp_invalid_media_format;
+static expert_field ei_sdp_invalid_crypto_tag;
+static expert_field ei_sdp_invalid_crypto_mki_length;
 
 /* patterns used for tvb_ws_mempbrk_pattern_guint8 */
 static ws_mempbrk_pattern pbrk_digits;
diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c
index 6fc1018fac..38857563d1 100644
--- a/epan/dissectors/packet-sebek.c
+++ b/epan/dissectors/packet-sebek.c
@@ -72,30 +72,30 @@ void proto_reg_handoff_sebek(void);
 
 static dissector_handle_t sebek_handle;
 
-static int proto_sebek = -1;
-
-static int hf_sebek_magic = -1;
-static int hf_sebek_version = -1;
-static int hf_sebek_type = -1;
-static int hf_sebek_counter = -1;
-static int hf_sebek_time = -1;
-static int hf_sebek_pid = -1;
-static int hf_sebek_uid = -1;
-static int hf_sebek_fd = -1;
-static int hf_sebek_cmd = -1;
-static int hf_sebek_len = -1;
-static int hf_sebek_data = -1;
-static int hf_sebek_ppid = -1;
-static int hf_sebek_inode = -1;
-static int hf_sebek_socket_src_ip=-1;
-static int hf_sebek_socket_src_port=-1;
-static int hf_sebek_socket_dst_ip=-1;
-static int hf_sebek_socket_dst_port=-1;
-static int hf_sebek_socket_call=-1;
-static int hf_sebek_socket_proto=-1;
-
-
-static gint ett_sebek = -1;
+static int proto_sebek;
+
+static int hf_sebek_magic;
+static int hf_sebek_version;
+static int hf_sebek_type;
+static int hf_sebek_counter;
+static int hf_sebek_time;
+static int hf_sebek_pid;
+static int hf_sebek_uid;
+static int hf_sebek_fd;
+static int hf_sebek_cmd;
+static int hf_sebek_len;
+static int hf_sebek_data;
+static int hf_sebek_ppid;
+static int hf_sebek_inode;
+static int hf_sebek_socket_src_ip;
+static int hf_sebek_socket_src_port;
+static int hf_sebek_socket_dst_ip;
+static int hf_sebek_socket_dst_port;
+static int hf_sebek_socket_call;
+static int hf_sebek_socket_proto;
+
+
+static gint ett_sebek;
 
 /* dissect_sebek - dissects sebek packet data
  * tvb - tvbuff for packet data (IN)
diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c
index f1212473a0..5a5d8b2660 100644
--- a/epan/dissectors/packet-selfm.c
+++ b/epan/dissectors/packet-selfm.c
@@ -63,185 +63,185 @@
 void proto_register_selfm(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_selfm                        = -1;
-static int hf_selfm_msgtype                   = -1;
-static int hf_selfm_padbyte                   = -1;
-static int hf_selfm_checksum                  = -1;
-static int hf_selfm_relaydef_len              = -1;
-static int hf_selfm_relaydef_numproto         = -1;
-static int hf_selfm_relaydef_numfm            = -1;
-static int hf_selfm_relaydef_numflags         = -1;
-static int hf_selfm_relaydef_fmcfg_cmd        = -1;
-static int hf_selfm_relaydef_fmdata_cmd       = -1;
-static int hf_selfm_relaydef_statbit          = -1;
-static int hf_selfm_relaydef_statbit_cmd      = -1;
-static int hf_selfm_relaydef_proto            = -1;
-static int hf_selfm_fmconfig_len              = -1;
-static int hf_selfm_fmconfig_numflags         = -1;
-static int hf_selfm_fmconfig_loc_sf           = -1;
-static int hf_selfm_fmconfig_num_sf           = -1;
-static int hf_selfm_fmconfig_num_ai           = -1;
-static int hf_selfm_fmconfig_num_samp         = -1;
-static int hf_selfm_fmconfig_num_dig          = -1;
-static int hf_selfm_fmconfig_num_calc         = -1;
-static int hf_selfm_fmconfig_ofs_ai           = -1;
-static int hf_selfm_fmconfig_ofs_ts           = -1;
-static int hf_selfm_fmconfig_ofs_dig          = -1;
-static int hf_selfm_fmconfig_ai_type          = -1;
-static int hf_selfm_fmconfig_ai_sf_type       = -1;
-static int hf_selfm_fmconfig_ai_sf_ofs        = -1;
-static int hf_selfm_fmconfig_cblk_rot         = -1;
-static int hf_selfm_fmconfig_cblk_vconn       = -1;
-static int hf_selfm_fmconfig_cblk_iconn       = -1;
-static int hf_selfm_fmconfig_cblk_ctype       = -1;
-static int hf_selfm_fmconfig_cblk_deskew_ofs  = -1;
-static int hf_selfm_fmconfig_cblk_rs_ofs      = -1;
-static int hf_selfm_fmconfig_cblk_xs_ofs      = -1;
-static int hf_selfm_fmconfig_cblk_ia_idx      = -1;
-static int hf_selfm_fmconfig_cblk_ib_idx      = -1;
-static int hf_selfm_fmconfig_cblk_ic_idx      = -1;
-static int hf_selfm_fmconfig_cblk_va_idx      = -1;
-static int hf_selfm_fmconfig_cblk_vb_idx      = -1;
-static int hf_selfm_fmconfig_cblk_vc_idx      = -1;
-static int hf_selfm_fmconfig_ai_sf_float      = -1;
-static int hf_selfm_fmdata_len                = -1;
-static int hf_selfm_fmdata_flagbyte           = -1;
-static int hf_selfm_fmdata_dig_b0             = -1;
-static int hf_selfm_fmdata_dig_b1             = -1;
-static int hf_selfm_fmdata_dig_b2             = -1;
-static int hf_selfm_fmdata_dig_b3             = -1;
-static int hf_selfm_fmdata_dig_b4             = -1;
-static int hf_selfm_fmdata_dig_b5             = -1;
-static int hf_selfm_fmdata_dig_b6             = -1;
-static int hf_selfm_fmdata_dig_b7             = -1;
-static int hf_selfm_fmdata_ai_sf_fp           = -1;
-static int hf_selfm_foconfig_len              = -1;
-static int hf_selfm_foconfig_num_brkr         = -1;
-static int hf_selfm_foconfig_num_rb           = -1;
-static int hf_selfm_foconfig_prb_supp         = -1;
-static int hf_selfm_foconfig_reserved         = -1;
-static int hf_selfm_foconfig_brkr_open        = -1;
-static int hf_selfm_foconfig_brkr_close       = -1;
-static int hf_selfm_foconfig_rb_cmd           = -1;
-static int hf_selfm_fastop_len                = -1;
-static int hf_selfm_fastop_rb_code            = -1;
-static int hf_selfm_fastop_br_code            = -1;
-static int hf_selfm_fastop_valid              = -1;
-static int hf_selfm_alt_foconfig_len          = -1;
-static int hf_selfm_alt_foconfig_num_ports    = -1;
-static int hf_selfm_alt_foconfig_num_brkr     = -1;
-static int hf_selfm_alt_foconfig_num_rb       = -1;
-static int hf_selfm_alt_foconfig_funccode     = -1;
-static int hf_selfm_alt_fastop_len            = -1;
-static int hf_selfm_alt_fastop_code           = -1;
-static int hf_selfm_alt_fastop_valid          = -1;
-
-static int hf_selfm_fastmsg_len                    = -1;
-static int hf_selfm_fastmsg_routing_addr           = -1;
-static int hf_selfm_fastmsg_status                 = -1;
-static int hf_selfm_fastmsg_funccode               = -1;
-static int hf_selfm_fastmsg_response_code          = -1;
-static int hf_selfm_fastmsg_seq                    = -1;
-static int hf_selfm_fastmsg_seq_fir                = -1;
-static int hf_selfm_fastmsg_seq_fin                = -1;
-static int hf_selfm_fastmsg_seq_cnt                = -1;
-static int hf_selfm_fastmsg_resp_num               = -1;
-static int hf_selfm_fastmsg_crc16                  = -1;
-static int hf_selfm_fastmsg_def_route_sup          = -1;
-static int hf_selfm_fastmsg_def_rx_stat            = -1;
-static int hf_selfm_fastmsg_def_tx_stat            = -1;
-static int hf_selfm_fastmsg_def_rx_maxfr           = -1;
-static int hf_selfm_fastmsg_def_tx_maxfr           = -1;
-static int hf_selfm_fastmsg_def_rx_num_fc          = -1;
-static int hf_selfm_fastmsg_def_rx_fc              = -1;
-static int hf_selfm_fastmsg_def_tx_num_fc          = -1;
-static int hf_selfm_fastmsg_def_tx_fc              = -1;
-static int hf_selfm_fastmsg_uns_en_fc              = -1;
-static int hf_selfm_fastmsg_uns_en_fc_data         = -1;
-static int hf_selfm_fastmsg_uns_dis_fc             = -1;
-static int hf_selfm_fastmsg_uns_dis_fc_data        = -1;
-static int hf_selfm_fastmsg_baseaddr               = -1;
-static int hf_selfm_fastmsg_numwords               = -1;
-static int hf_selfm_fastmsg_flags                  = -1;
-static int hf_selfm_fastmsg_datafmt_resp_numitem   = -1;
-static int hf_selfm_fastmsg_dataitem_qty           = -1;
-static int hf_selfm_fastmsg_dataitem_type          = -1;
-static int hf_selfm_fastmsg_dataitem_uint16        = -1;
-static int hf_selfm_fastmsg_dataitem_int16         = -1;
-static int hf_selfm_fastmsg_dataitem_uint32        = -1;
-static int hf_selfm_fastmsg_dataitem_int32         = -1;
-static int hf_selfm_fastmsg_dataitem_float         = -1;
-static int hf_selfm_fastmsg_devdesc_num_region     = -1;
-static int hf_selfm_fastmsg_devdesc_num_ctrl       = -1;
-static int hf_selfm_fastmsg_unsresp_orig           = -1;
-static int hf_selfm_fastmsg_unsresp_doy            = -1;
-static int hf_selfm_fastmsg_unsresp_year           = -1;
-static int hf_selfm_fastmsg_unsresp_todms          = -1;
-static int hf_selfm_fastmsg_unsresp_num_elmt       = -1;
-static int hf_selfm_fastmsg_unsresp_elmt_idx       = -1;
-static int hf_selfm_fastmsg_unsresp_elmt_ts_ofs    = -1;
-static int hf_selfm_fastmsg_unsresp_elmt_status    = -1;
-static int hf_selfm_fastmsg_unsresp_eor            = -1;
-static int hf_selfm_fastmsg_unsresp_elmt_statword  = -1;
-static int hf_selfm_fastmsg_unswrite_addr1         = -1;
-static int hf_selfm_fastmsg_unswrite_addr2         = -1;
-static int hf_selfm_fastmsg_unswrite_num_reg       = -1;
-static int hf_selfm_fastmsg_unswrite_reg_val       = -1;
-static int hf_selfm_fastmsg_soe_req_orig           = -1;
-static int hf_selfm_fastmsg_soe_resp_numblks       = -1;
-static int hf_selfm_fastmsg_soe_resp_orig          = -1;
-static int hf_selfm_fastmsg_soe_resp_numbits       = -1;
-static int hf_selfm_fastmsg_soe_resp_pad           = -1;
-static int hf_selfm_fastmsg_soe_resp_doy           = -1;
-static int hf_selfm_fastmsg_soe_resp_year          = -1;
-static int hf_selfm_fastmsg_soe_resp_tod           = -1;
-static int hf_selfm_fastmsg_soe_resp_data          = -1;
+static int proto_selfm;
+static int hf_selfm_msgtype;
+static int hf_selfm_padbyte;
+static int hf_selfm_checksum;
+static int hf_selfm_relaydef_len;
+static int hf_selfm_relaydef_numproto;
+static int hf_selfm_relaydef_numfm;
+static int hf_selfm_relaydef_numflags;
+static int hf_selfm_relaydef_fmcfg_cmd;
+static int hf_selfm_relaydef_fmdata_cmd;
+static int hf_selfm_relaydef_statbit;
+static int hf_selfm_relaydef_statbit_cmd;
+static int hf_selfm_relaydef_proto;
+static int hf_selfm_fmconfig_len;
+static int hf_selfm_fmconfig_numflags;
+static int hf_selfm_fmconfig_loc_sf;
+static int hf_selfm_fmconfig_num_sf;
+static int hf_selfm_fmconfig_num_ai;
+static int hf_selfm_fmconfig_num_samp;
+static int hf_selfm_fmconfig_num_dig;
+static int hf_selfm_fmconfig_num_calc;
+static int hf_selfm_fmconfig_ofs_ai;
+static int hf_selfm_fmconfig_ofs_ts;
+static int hf_selfm_fmconfig_ofs_dig;
+static int hf_selfm_fmconfig_ai_type;
+static int hf_selfm_fmconfig_ai_sf_type;
+static int hf_selfm_fmconfig_ai_sf_ofs;
+static int hf_selfm_fmconfig_cblk_rot;
+static int hf_selfm_fmconfig_cblk_vconn;
+static int hf_selfm_fmconfig_cblk_iconn;
+static int hf_selfm_fmconfig_cblk_ctype;
+static int hf_selfm_fmconfig_cblk_deskew_ofs;
+static int hf_selfm_fmconfig_cblk_rs_ofs;
+static int hf_selfm_fmconfig_cblk_xs_ofs;
+static int hf_selfm_fmconfig_cblk_ia_idx;
+static int hf_selfm_fmconfig_cblk_ib_idx;
+static int hf_selfm_fmconfig_cblk_ic_idx;
+static int hf_selfm_fmconfig_cblk_va_idx;
+static int hf_selfm_fmconfig_cblk_vb_idx;
+static int hf_selfm_fmconfig_cblk_vc_idx;
+static int hf_selfm_fmconfig_ai_sf_float;
+static int hf_selfm_fmdata_len;
+static int hf_selfm_fmdata_flagbyte;
+static int hf_selfm_fmdata_dig_b0;
+static int hf_selfm_fmdata_dig_b1;
+static int hf_selfm_fmdata_dig_b2;
+static int hf_selfm_fmdata_dig_b3;
+static int hf_selfm_fmdata_dig_b4;
+static int hf_selfm_fmdata_dig_b5;
+static int hf_selfm_fmdata_dig_b6;
+static int hf_selfm_fmdata_dig_b7;
+static int hf_selfm_fmdata_ai_sf_fp;
+static int hf_selfm_foconfig_len;
+static int hf_selfm_foconfig_num_brkr;
+static int hf_selfm_foconfig_num_rb;
+static int hf_selfm_foconfig_prb_supp;
+static int hf_selfm_foconfig_reserved;
+static int hf_selfm_foconfig_brkr_open;
+static int hf_selfm_foconfig_brkr_close;
+static int hf_selfm_foconfig_rb_cmd;
+static int hf_selfm_fastop_len;
+static int hf_selfm_fastop_rb_code;
+static int hf_selfm_fastop_br_code;
+static int hf_selfm_fastop_valid;
+static int hf_selfm_alt_foconfig_len;
+static int hf_selfm_alt_foconfig_num_ports;
+static int hf_selfm_alt_foconfig_num_brkr;
+static int hf_selfm_alt_foconfig_num_rb;
+static int hf_selfm_alt_foconfig_funccode;
+static int hf_selfm_alt_fastop_len;
+static int hf_selfm_alt_fastop_code;
+static int hf_selfm_alt_fastop_valid;
+
+static int hf_selfm_fastmsg_len;
+static int hf_selfm_fastmsg_routing_addr;
+static int hf_selfm_fastmsg_status;
+static int hf_selfm_fastmsg_funccode;
+static int hf_selfm_fastmsg_response_code;
+static int hf_selfm_fastmsg_seq;
+static int hf_selfm_fastmsg_seq_fir;
+static int hf_selfm_fastmsg_seq_fin;
+static int hf_selfm_fastmsg_seq_cnt;
+static int hf_selfm_fastmsg_resp_num;
+static int hf_selfm_fastmsg_crc16;
+static int hf_selfm_fastmsg_def_route_sup;
+static int hf_selfm_fastmsg_def_rx_stat;
+static int hf_selfm_fastmsg_def_tx_stat;
+static int hf_selfm_fastmsg_def_rx_maxfr;
+static int hf_selfm_fastmsg_def_tx_maxfr;
+static int hf_selfm_fastmsg_def_rx_num_fc;
+static int hf_selfm_fastmsg_def_rx_fc;
+static int hf_selfm_fastmsg_def_tx_num_fc;
+static int hf_selfm_fastmsg_def_tx_fc;
+static int hf_selfm_fastmsg_uns_en_fc;
+static int hf_selfm_fastmsg_uns_en_fc_data;
+static int hf_selfm_fastmsg_uns_dis_fc;
+static int hf_selfm_fastmsg_uns_dis_fc_data;
+static int hf_selfm_fastmsg_baseaddr;
+static int hf_selfm_fastmsg_numwords;
+static int hf_selfm_fastmsg_flags;
+static int hf_selfm_fastmsg_datafmt_resp_numitem;
+static int hf_selfm_fastmsg_dataitem_qty;
+static int hf_selfm_fastmsg_dataitem_type;
+static int hf_selfm_fastmsg_dataitem_uint16;
+static int hf_selfm_fastmsg_dataitem_int16;
+static int hf_selfm_fastmsg_dataitem_uint32;
+static int hf_selfm_fastmsg_dataitem_int32;
+static int hf_selfm_fastmsg_dataitem_float;
+static int hf_selfm_fastmsg_devdesc_num_region;
+static int hf_selfm_fastmsg_devdesc_num_ctrl;
+static int hf_selfm_fastmsg_unsresp_orig;
+static int hf_selfm_fastmsg_unsresp_doy;
+static int hf_selfm_fastmsg_unsresp_year;
+static int hf_selfm_fastmsg_unsresp_todms;
+static int hf_selfm_fastmsg_unsresp_num_elmt;
+static int hf_selfm_fastmsg_unsresp_elmt_idx;
+static int hf_selfm_fastmsg_unsresp_elmt_ts_ofs;
+static int hf_selfm_fastmsg_unsresp_elmt_status;
+static int hf_selfm_fastmsg_unsresp_eor;
+static int hf_selfm_fastmsg_unsresp_elmt_statword;
+static int hf_selfm_fastmsg_unswrite_addr1;
+static int hf_selfm_fastmsg_unswrite_addr2;
+static int hf_selfm_fastmsg_unswrite_num_reg;
+static int hf_selfm_fastmsg_unswrite_reg_val;
+static int hf_selfm_fastmsg_soe_req_orig;
+static int hf_selfm_fastmsg_soe_resp_numblks;
+static int hf_selfm_fastmsg_soe_resp_orig;
+static int hf_selfm_fastmsg_soe_resp_numbits;
+static int hf_selfm_fastmsg_soe_resp_pad;
+static int hf_selfm_fastmsg_soe_resp_doy;
+static int hf_selfm_fastmsg_soe_resp_year;
+static int hf_selfm_fastmsg_soe_resp_tod;
+static int hf_selfm_fastmsg_soe_resp_data;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_selfm_fmconfig_ai_channel = -1;
-static int hf_selfm_fmdata_ai_value16 = -1;
-static int hf_selfm_fmdata_ai_scale_factor = -1;
-static int hf_selfm_fmdata_ai_value_float = -1;
-static int hf_selfm_fmdata_ai_value_double = -1;
-static int hf_selfm_fmdata_data_type = -1;
-static int hf_selfm_fmdata_quantity = -1;
-static int hf_selfm_fmdata_ai_value_string = -1;
-static int hf_selfm_fastmsg_unsresp_elmt_ts_ofs_decoded = -1;
-static int hf_selfm_fid = -1;
-static int hf_selfm_rid = -1;
-static int hf_selfm_fastmsg_data_region_name = -1;
-static int hf_selfm_fmdata_timestamp = -1;
-static int hf_selfm_fmdata_frame_data_format_reference = -1;
-static int hf_selfm_fastmsg_bit_label_name = -1;
+static int hf_selfm_fmconfig_ai_channel;
+static int hf_selfm_fmdata_ai_value16;
+static int hf_selfm_fmdata_ai_scale_factor;
+static int hf_selfm_fmdata_ai_value_float;
+static int hf_selfm_fmdata_ai_value_double;
+static int hf_selfm_fmdata_data_type;
+static int hf_selfm_fmdata_quantity;
+static int hf_selfm_fmdata_ai_value_string;
+static int hf_selfm_fastmsg_unsresp_elmt_ts_ofs_decoded;
+static int hf_selfm_fid;
+static int hf_selfm_rid;
+static int hf_selfm_fastmsg_data_region_name;
+static int hf_selfm_fmdata_timestamp;
+static int hf_selfm_fmdata_frame_data_format_reference;
+static int hf_selfm_fastmsg_bit_label_name;
 
 /* Initialize the subtree pointers */
-static gint ett_selfm                       = -1;
-static gint ett_selfm_relaydef              = -1;
-static gint ett_selfm_relaydef_fm           = -1;
-static gint ett_selfm_relaydef_proto        = -1;
-static gint ett_selfm_relaydef_flags        = -1;
-static gint ett_selfm_fmconfig              = -1;
-static gint ett_selfm_fmconfig_ai           = -1;
-static gint ett_selfm_fmconfig_calc         = -1;
-static gint ett_selfm_foconfig              = -1;
-static gint ett_selfm_foconfig_brkr         = -1;
-static gint ett_selfm_foconfig_rb           = -1;
-static gint ett_selfm_fastop                = -1;
-static gint ett_selfm_fmdata                = -1;
-static gint ett_selfm_fmdata_ai             = -1;
-static gint ett_selfm_fmdata_dig            = -1;
-static gint ett_selfm_fmdata_ai_ch          = -1;
-static gint ett_selfm_fmdata_dig_ch         = -1;
-static gint ett_selfm_fastmsg               = -1;
-static gint ett_selfm_fastmsg_seq           = -1;
-static gint ett_selfm_fastmsg_def_fc        = -1;
-static gint ett_selfm_fastmsg_datareg       = -1;
-static gint ett_selfm_fastmsg_soeblk        = -1;
-static gint ett_selfm_fastmsg_tag           = -1;
-static gint ett_selfm_fastmsg_element_list  = -1;
-static gint ett_selfm_fastmsg_element       = -1;
+static gint ett_selfm;
+static gint ett_selfm_relaydef;
+static gint ett_selfm_relaydef_fm;
+static gint ett_selfm_relaydef_proto;
+static gint ett_selfm_relaydef_flags;
+static gint ett_selfm_fmconfig;
+static gint ett_selfm_fmconfig_ai;
+static gint ett_selfm_fmconfig_calc;
+static gint ett_selfm_foconfig;
+static gint ett_selfm_foconfig_brkr;
+static gint ett_selfm_foconfig_rb;
+static gint ett_selfm_fastop;
+static gint ett_selfm_fmdata;
+static gint ett_selfm_fmdata_ai;
+static gint ett_selfm_fmdata_dig;
+static gint ett_selfm_fmdata_ai_ch;
+static gint ett_selfm_fmdata_dig_ch;
+static gint ett_selfm_fastmsg;
+static gint ett_selfm_fastmsg_seq;
+static gint ett_selfm_fastmsg_def_fc;
+static gint ett_selfm_fastmsg_datareg;
+static gint ett_selfm_fastmsg_soeblk;
+static gint ett_selfm_fastmsg_tag;
+static gint ett_selfm_fastmsg_element_list;
+static gint ett_selfm_fastmsg_element;
 
 /* Expert fields */
-static expert_field ei_selfm_crc16_incorrect = EI_INIT;
+static expert_field ei_selfm_crc16_incorrect;
 
 static dissector_handle_t selfm_handle;
 
@@ -791,18 +791,18 @@ static reassembly_table selfm_reassembly_table;
 /* ************************************************************************* */
 /*                   Header values for reassembly                            */
 /* ************************************************************************* */
-static int   hf_selfm_fragment  = -1;
-static int   hf_selfm_fragments = -1;
-static int   hf_selfm_fragment_overlap = -1;
-static int   hf_selfm_fragment_overlap_conflict = -1;
-static int   hf_selfm_fragment_multiple_tails = -1;
-static int   hf_selfm_fragment_too_long_fragment = -1;
-static int   hf_selfm_fragment_error = -1;
-static int   hf_selfm_fragment_count = -1;
-static int   hf_selfm_fragment_reassembled_in = -1;
-static int   hf_selfm_fragment_reassembled_length = -1;
-static gint ett_selfm_fragment  = -1;
-static gint ett_selfm_fragments = -1;
+static int   hf_selfm_fragment;
+static int   hf_selfm_fragments;
+static int   hf_selfm_fragment_overlap;
+static int   hf_selfm_fragment_overlap_conflict;
+static int   hf_selfm_fragment_multiple_tails;
+static int   hf_selfm_fragment_too_long_fragment;
+static int   hf_selfm_fragment_error;
+static int   hf_selfm_fragment_count;
+static int   hf_selfm_fragment_reassembled_in;
+static int   hf_selfm_fragment_reassembled_length;
+static gint ett_selfm_fragment;
+static gint ett_selfm_fragments;
 
 static const fragment_items selfm_frag_items = {
     &ett_selfm_fragment,
diff --git a/epan/dissectors/packet-sercosiii.c b/epan/dissectors/packet-sercosiii.c
index 1d54025af5..b55ba1c89f 100644
--- a/epan/dissectors/packet-sercosiii.c
+++ b/epan/dissectors/packet-sercosiii.c
@@ -39,108 +39,108 @@ void proto_reg_handoff_sercosiii(void);
 static dissector_handle_t siii_handle;
 
 /* Initialize the protocol and registered fields */
-static gint proto_siii = -1;
+static gint proto_siii;
 
 /* Initialize the subtree pointers */
-static gint ett_siii = -1;
-static gint ett_siii_header = -1;
-static gint ett_siii_mst = -1;
-static gint ett_siii_mst_teltype = -1;
-static gint ett_siii_mst_phase = -1;
-static gint ett_siii_mdt = -1;
-static gint ett_siii_mdt_svc = -1;
-static gint ett_siii_mdt_devctrls = -1;
-static gint ett_siii_mdt_version = -1;
-static gint ett_siii_mdt_svc_channel = -1;
-static gint ett_siii_mdt_dev_control = -1;
-static gint ett_siii_mdt_devctrl = -1;
-static gint ett_siii_mdt_svcctrl = -1;
-static gint ett_siii_mdt_svcinfo = -1;
-static gint ett_siii_at_svcstat = -1;
-static gint ett_siii_at_svcinfo = -1;
-static gint ett_siii_mdt_svch_data_error_info = -1;
-static gint ett_siii_mdt_svch_data = -1;
-static gint ett_siii_at_devstatus = -1;
-static gint ett_siii_at_sercosaddress = -1;
-static gint ett_siii_at = -1;
-static gint ett_siii_at_svc = -1;
-static gint ett_siii_at_sercos_address = -1;
-static gint ett_siii_at_devstats = -1;
-static gint ett_siii_at_svc_channel = -1;
-static gint ett_siii_at_dev_status = -1;
-static gint ett_siii_mdt_hp = -1;
-static gint ett_siii_at_hp = -1;
-static gint ett_siii_mdt_hp_ctrl = -1;
-static gint ett_siii_mdt_hp_info = -1;
-static gint ett_siii_at_hp_stat = -1;
-static gint ett_siii_at_hp_info = -1;
-static gint ett_siii_recognized_devices = -1;
-
-static gint hf_siii_mdt_version = -1;
-static gint hf_siii_mdt_version_initprocvers = -1;
-static gint hf_siii_mdt_version_num_mdt_at_cp1_2 = -1;
-static gint hf_siii_mdt_version_switch_off_sercos_telegrams = -1;
-static gint hf_siii_mdt_version_fast_cp_switch = -1;
-static gint hf_siii_mdt_version_transmission_of_communication_parameters_mdt0_cp0 = -1;
-static gint hf_siii_mdt_dev_control_top_control = -1;
-static gint hf_siii_at_dev_control_ident = -1;
-static gint hf_siii_mdt_dev_control_change_topology = -1;
-static gint hf_siii_mdt_dev_control = -1;
-static gint hf_siii_mst_channel = -1;
-static gint hf_siii_mst_type = -1;
-static gint hf_siii_mst_cyclecntvalid = -1;
-static gint hf_siii_mst_telno = -1;
-static gint hf_siii_mst_phase = -1;
-static gint hf_siii_mst_cyclecnt = -1;
-static gint hf_siii_mst_crc32 = -1;
-static gint hf_siii_mdt_svch_dbe = -1;
-static gint hf_siii_mdt_svch_eot = -1;
-static gint hf_siii_mdt_svch_rw = -1;
-static gint hf_siii_mdt_svch_mhs = -1;
-static gint hf_siii_mdt_svch_info = -1;
-static gint hf_siii_at_svch_valid = -1;
-static gint hf_siii_at_svch_error = -1;
-static gint hf_siii_at_svch_busy = -1;
-static gint hf_siii_at_svch_ahs = -1;
-static gint hf_siii_at_svch_info = -1;
-static gint hf_siii_mdt_svch_idn = -1;
-static gint hf_siii_mdt_svch_ctrl = -1;
-static gint hf_siii_at_svch_stat = -1;
-/* static gint hf_siii_svch_data_telofs_telno = -1; */
-/* static gint hf_siii_svch_data_telofs_mdt_at = -1; */
-/* static gint hf_siii_svch_data_telofs_offset = -1; */
-/* static gint hf_siii_svch_data_proccmd_proccmdexec = -1; */
-/* static gint hf_siii_svch_data_proccmd_proccmd = -1; */
-static gint hf_siii_at_cp0_support_functions = -1;
-static gint hf_siii_at_cp0_device_address = -1;
-static gint hf_siii_at_dev_status = -1;
-static gint hf_siii_at_dev_status_commwarning = -1;
-static gint hf_siii_at_dev_status_change_topology = -1;
-static gint hf_siii_at_dev_status_top_status = -1;
-static gint hf_siii_at_dev_status_inactive_port_status = -1;
-static gint hf_siii_at_dev_status_errorconnection = -1;
-static gint hf_siii_at_dev_status_slave_valid = -1;
-static gint hf_siii_at_dev_status_proc_command_change = -1;
-static gint hf_siii_at_dev_status_parameterization_level_active = -1;
-static gint hf_siii_mdt_hotplug_address = -1;
-static gint hf_siii_mdt_hp_ctrl = -1;
-static gint hf_siii_mdt_hp_info = -1;
-static gint hf_siii_at_hotplug_address = -1;
-static gint hf_siii_at_hp_stat = -1;
-static gint hf_siii_at_hp_info = -1;
-static gint hf_siii_mdt_hotplug_control_param = -1;
-static gint hf_siii_mdt_hotplug_control_svc_switch = -1;
-static gint hf_siii_at_hotplug_status_param = -1;
-static gint hf_siii_at_hotplug_status_hp0_finished = -1;
-static gint hf_siii_at_hotplug_status_error = -1;
-static gint hf_siii_service_channels = -1;
-static gint hf_siii_device_controls = -1;
-static gint hf_siii_device_status = -1;
-static gint hf_siii_idn_code = -1;
-static gint hf_siii_at_cp0_num_devices = -1;
-static gint hf_siii_at_cp0_sercos_address = -1;
-
-static expert_field ei_siii_cp_unknown = EI_INIT;
+static gint ett_siii;
+static gint ett_siii_header;
+static gint ett_siii_mst;
+static gint ett_siii_mst_teltype;
+static gint ett_siii_mst_phase;
+static gint ett_siii_mdt;
+static gint ett_siii_mdt_svc;
+static gint ett_siii_mdt_devctrls;
+static gint ett_siii_mdt_version;
+static gint ett_siii_mdt_svc_channel;
+static gint ett_siii_mdt_dev_control;
+static gint ett_siii_mdt_devctrl;
+static gint ett_siii_mdt_svcctrl;
+static gint ett_siii_mdt_svcinfo;
+static gint ett_siii_at_svcstat;
+static gint ett_siii_at_svcinfo;
+static gint ett_siii_mdt_svch_data_error_info;
+static gint ett_siii_mdt_svch_data;
+static gint ett_siii_at_devstatus;
+static gint ett_siii_at_sercosaddress;
+static gint ett_siii_at;
+static gint ett_siii_at_svc;
+static gint ett_siii_at_sercos_address;
+static gint ett_siii_at_devstats;
+static gint ett_siii_at_svc_channel;
+static gint ett_siii_at_dev_status;
+static gint ett_siii_mdt_hp;
+static gint ett_siii_at_hp;
+static gint ett_siii_mdt_hp_ctrl;
+static gint ett_siii_mdt_hp_info;
+static gint ett_siii_at_hp_stat;
+static gint ett_siii_at_hp_info;
+static gint ett_siii_recognized_devices;
+
+static gint hf_siii_mdt_version;
+static gint hf_siii_mdt_version_initprocvers;
+static gint hf_siii_mdt_version_num_mdt_at_cp1_2;
+static gint hf_siii_mdt_version_switch_off_sercos_telegrams;
+static gint hf_siii_mdt_version_fast_cp_switch;
+static gint hf_siii_mdt_version_transmission_of_communication_parameters_mdt0_cp0;
+static gint hf_siii_mdt_dev_control_top_control;
+static gint hf_siii_at_dev_control_ident;
+static gint hf_siii_mdt_dev_control_change_topology;
+static gint hf_siii_mdt_dev_control;
+static gint hf_siii_mst_channel;
+static gint hf_siii_mst_type;
+static gint hf_siii_mst_cyclecntvalid;
+static gint hf_siii_mst_telno;
+static gint hf_siii_mst_phase;
+static gint hf_siii_mst_cyclecnt;
+static gint hf_siii_mst_crc32;
+static gint hf_siii_mdt_svch_dbe;
+static gint hf_siii_mdt_svch_eot;
+static gint hf_siii_mdt_svch_rw;
+static gint hf_siii_mdt_svch_mhs;
+static gint hf_siii_mdt_svch_info;
+static gint hf_siii_at_svch_valid;
+static gint hf_siii_at_svch_error;
+static gint hf_siii_at_svch_busy;
+static gint hf_siii_at_svch_ahs;
+static gint hf_siii_at_svch_info;
+static gint hf_siii_mdt_svch_idn;
+static gint hf_siii_mdt_svch_ctrl;
+static gint hf_siii_at_svch_stat;
+/* static gint hf_siii_svch_data_telofs_telno; */
+/* static gint hf_siii_svch_data_telofs_mdt_at; */
+/* static gint hf_siii_svch_data_telofs_offset; */
+/* static gint hf_siii_svch_data_proccmd_proccmdexec; */
+/* static gint hf_siii_svch_data_proccmd_proccmd; */
+static gint hf_siii_at_cp0_support_functions;
+static gint hf_siii_at_cp0_device_address;
+static gint hf_siii_at_dev_status;
+static gint hf_siii_at_dev_status_commwarning;
+static gint hf_siii_at_dev_status_change_topology;
+static gint hf_siii_at_dev_status_top_status;
+static gint hf_siii_at_dev_status_inactive_port_status;
+static gint hf_siii_at_dev_status_errorconnection;
+static gint hf_siii_at_dev_status_slave_valid;
+static gint hf_siii_at_dev_status_proc_command_change;
+static gint hf_siii_at_dev_status_parameterization_level_active;
+static gint hf_siii_mdt_hotplug_address;
+static gint hf_siii_mdt_hp_ctrl;
+static gint hf_siii_mdt_hp_info;
+static gint hf_siii_at_hotplug_address;
+static gint hf_siii_at_hp_stat;
+static gint hf_siii_at_hp_info;
+static gint hf_siii_mdt_hotplug_control_param;
+static gint hf_siii_mdt_hotplug_control_svc_switch;
+static gint hf_siii_at_hotplug_status_param;
+static gint hf_siii_at_hotplug_status_hp0_finished;
+static gint hf_siii_at_hotplug_status_error;
+static gint hf_siii_service_channels;
+static gint hf_siii_device_controls;
+static gint hf_siii_device_status;
+static gint hf_siii_idn_code;
+static gint hf_siii_at_cp0_num_devices;
+static gint hf_siii_at_cp0_sercos_address;
+
+static expert_field ei_siii_cp_unknown;
 
 
 /* Allow heuristic dissection */
diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c
index 88ecd3b9fe..0c85f33940 100644
--- a/epan/dissectors/packet-ses.c
+++ b/epan/dissectors/packet-ses.c
@@ -32,98 +32,98 @@ void proto_register_clses(void);
 void proto_reg_handoff_clses(void);
 
 /* ses header fields             */
-static int proto_ses          = -1;
-static int hf_ses_type        = -1;
-static int hf_ses_type_0      = -1;
-static int hf_ses_length      = -1;
-/* static int hf_ses_version     = -1; */
-/* static int hf_ses_reserved    = -1; */
-
-static int hf_ses_segment_data = -1;
-static int hf_ses_segments = -1;
-static int hf_ses_segment = -1;
-static int hf_ses_segment_overlap = -1;
-static int hf_ses_segment_overlap_conflicts = -1;
-static int hf_ses_segment_multiple_tails = -1;
-static int hf_ses_segment_too_long_segment = -1;
-static int hf_ses_segment_error = -1;
-static int hf_ses_segment_count = -1;
-static int hf_ses_reassembled_in = -1;
-static int hf_ses_reassembled_length = -1;
+static int proto_ses;
+static int hf_ses_type;
+static int hf_ses_type_0;
+static int hf_ses_length;
+/* static int hf_ses_version; */
+/* static int hf_ses_reserved; */
+
+static int hf_ses_segment_data;
+static int hf_ses_segments;
+static int hf_ses_segment;
+static int hf_ses_segment_overlap;
+static int hf_ses_segment_overlap_conflicts;
+static int hf_ses_segment_multiple_tails;
+static int hf_ses_segment_too_long_segment;
+static int hf_ses_segment_error;
+static int hf_ses_segment_count;
+static int hf_ses_reassembled_in;
+static int hf_ses_reassembled_length;
 
 /* ses fields defining a sub tree */
-static gint ett_ses           = -1;
-static gint ett_ses_param     = -1;
+static gint ett_ses;
+static gint ett_ses_param;
 
-static gint ett_ses_segment = -1;
-static gint ett_ses_segments = -1;
+static gint ett_ses_segment;
+static gint ett_ses_segments;
 
 
 /* flags */
-static int hf_connect_protocol_options_flags = -1;
-static int hf_version_number_options_flags = -1;
-static int hf_enclosure_item_options_flags = -1;
-static int hf_token_item_options_flags = -1;
-
-static gint ett_connect_protocol_options_flags = -1;
-static gint ett_transport_options_flags = -1;
-static gint ett_protocol_version_flags = -1;
-static gint ett_enclosure_item_flags = -1;
-static gint ett_token_item_flags = -1;
-static gint ett_ses_req_options_flags = -1;
+static int hf_connect_protocol_options_flags;
+static int hf_version_number_options_flags;
+static int hf_enclosure_item_options_flags;
+static int hf_token_item_options_flags;
+
+static gint ett_connect_protocol_options_flags;
+static gint ett_transport_options_flags;
+static gint ett_protocol_version_flags;
+static gint ett_enclosure_item_flags;
+static gint ett_token_item_flags;
+static gint ett_ses_req_options_flags;
 
 /* called SS user reference */
-static int hf_called_ss_user_reference = -1;
+static int hf_called_ss_user_reference;
 
 /* calling SS user reference */
-static int hf_calling_ss_user_reference = -1;
+static int hf_calling_ss_user_reference;
 
 /* common reference */
-static int hf_common_reference = -1;
+static int hf_common_reference;
 
 /* additional reference information */
-static int hf_additional_reference_information = -1;
+static int hf_additional_reference_information;
 
 /* token item */
-static int hf_release_token = -1;
-static int hf_major_activity_token = -1;
-static int hf_synchronize_minor_token = -1;
-static int hf_data_token = -1;
+static int hf_release_token;
+static int hf_major_activity_token;
+static int hf_synchronize_minor_token;
+static int hf_data_token;
 
 /* protocol options */
-static int hf_able_to_receive_extended_concatenated_SPDU = -1;
+static int hf_able_to_receive_extended_concatenated_SPDU;
 
 /* session requirement */
-static int hf_session_user_req_flags = -1;
-static int hf_session_exception_report= -1;
-static int hf_data_separation_function_unit= -1;
-static int hf_symmetric_synchronize_function_unit= -1;
-static int hf_typed_data_function_unit= -1;
-static int hf_exception_function_unit= -1;
-static int hf_capability_function_unit=-1;
-static int hf_negotiated_release_function_unit= -1;
-static int hf_activity_management_function_unit= -1;
-static int hf_resynchronize_function_unit= -1;
-static int hf_major_resynchronize_function_unit= -1;
-static int hf_minor_resynchronize_function_unit= -1;
-static int hf_expedited_data_resynchronize_function_unit= -1;
-static int hf_duplex_function_unit= -1;
-static int hf_half_duplex_function_unit = -1;
+static int hf_session_user_req_flags;
+static int hf_session_exception_report;
+static int hf_data_separation_function_unit;
+static int hf_symmetric_synchronize_function_unit;
+static int hf_typed_data_function_unit;
+static int hf_exception_function_unit;
+static int hf_capability_function_unit;
+static int hf_negotiated_release_function_unit;
+static int hf_activity_management_function_unit;
+static int hf_resynchronize_function_unit;
+static int hf_major_resynchronize_function_unit;
+static int hf_minor_resynchronize_function_unit;
+static int hf_expedited_data_resynchronize_function_unit;
+static int hf_duplex_function_unit;
+static int hf_half_duplex_function_unit;
 
 /* TSDU maximum size */
-static int hf_proposed_tsdu_maximum_size_i2r = -1;
-static int hf_proposed_tsdu_maximum_size_r2i = -1;
+static int hf_proposed_tsdu_maximum_size_i2r;
+static int hf_proposed_tsdu_maximum_size_r2i;
 
 /* protocol version */
-static int hf_protocol_version_1 = -1;
-static int hf_protocol_version_2 = -1;
+static int hf_protocol_version_1;
+static int hf_protocol_version_2;
 
 /* initial serial number */
-static int hf_initial_serial_number = -1;
+static int hf_initial_serial_number;
 
 /* enclosure item */
-static int hf_beginning_of_SSDU = -1;
-static int hf_end_of_SSDU = -1;
+static int hf_beginning_of_SSDU;
+static int hf_end_of_SSDU;
 
 /* token setting item */
 
@@ -137,53 +137,53 @@ static const value_string token_setting_vals[] = {
 
 static const true_false_string tfs_released_kept = { "Released", "Kept" };
 
-static int hf_release_token_setting = -1;
-static int hf_major_activity_token_setting = -1;
-static int hf_synchronize_minor_token_setting = -1;
-static int hf_data_token_setting = -1;
+static int hf_release_token_setting;
+static int hf_major_activity_token_setting;
+static int hf_synchronize_minor_token_setting;
+static int hf_data_token_setting;
 
 /* calling session selector */
-static int hf_calling_session_selector = -1;
+static int hf_calling_session_selector;
 
 /* called session selector */
-static int hf_called_session_selector = -1;
+static int hf_called_session_selector;
 
 /* activity id */
-static int hf_activity_identifier = -1;
+static int hf_activity_identifier;
 
 /* serial number */
-static int hf_serial_number = -1;
+static int hf_serial_number;
 
 /* second serial number */
-static int hf_second_serial_number = -1;
+static int hf_second_serial_number;
 
 /* second initial serial number */
-static int hf_second_initial_serial_number = -1;
+static int hf_second_initial_serial_number;
 
 /* large initial serial number */
-static int hf_large_initial_serial_number = -1;
+static int hf_large_initial_serial_number;
 
 /* large second initial serial number */
-static int hf_large_second_initial_serial_number = -1;
+static int hf_large_second_initial_serial_number;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_ses_reason_code = -1;
-static int hf_ses_transport_implementation_restriction = -1;
-static int hf_ses_transport_no_reason = -1;
-static int hf_ses_parameter_group_inside_parameter_group = -1;
-static int hf_ses_user_data = -1;
-static int hf_ses_parameter_type = -1;
-static int hf_ses_transport_protocol_error = -1;
-static int hf_ses_transport_user_abort = -1;
-static int hf_ses_parameter_length = -1;
-static int hf_ses_transport_connection = -1;
-static int hf_ses_transport_option_flags = -1;
+static int hf_ses_reason_code;
+static int hf_ses_transport_implementation_restriction;
+static int hf_ses_transport_no_reason;
+static int hf_ses_parameter_group_inside_parameter_group;
+static int hf_ses_user_data;
+static int hf_ses_parameter_type;
+static int hf_ses_transport_protocol_error;
+static int hf_ses_transport_user_abort;
+static int hf_ses_parameter_length;
+static int hf_ses_transport_connection;
+static int hf_ses_transport_option_flags;
 
 /* clses header fields             */
-static int proto_clses          = -1;
+static int proto_clses;
 
-static expert_field ei_ses_bad_length = EI_INIT;
-static expert_field ei_ses_bad_parameter_length = EI_INIT;
+static expert_field ei_ses_bad_length;
+static expert_field ei_ses_bad_parameter_length;
 
 #define PROTO_STRING_CLSES "ISO 9548-1 OSI Connectionless Session Protocol"
 
diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c
index 44185efa92..ae84a8d2c1 100644
--- a/epan/dissectors/packet-sflow.c
+++ b/epan/dissectors/packet-sflow.c
@@ -356,318 +356,318 @@ struct sflow_address_type {
 
 
 /* Initialize the protocol and registered fields */
-static int proto_sflow = -1;
-static int hf_sflow_version = -1;
-static int hf_sflow_agent_address_type = -1;
-static int hf_sflow_agent_address_v4 = -1;
-static int hf_sflow_agent_address_v6 = -1;
-static int hf_sflow_5_sub_agent_id = -1;
-static int hf_sflow_5_sample_length = -1;
-static int hf_sflow_5_flow_data_length = -1;
-/* static int hf_sflow_5_counters_data_length = -1; */
-static int hf_sflow_245_seqnum = -1;
-static int hf_sflow_245_sysuptime = -1;
-static int hf_sflow_245_numsamples = -1;
-static int hf_sflow_245_header_protocol = -1;
-static int hf_sflow_245_sampletype = -1;
-static int hf_sflow_245_sampletype12 = -1;
-static int hf_sflow_245_ipv4_precedence_type = -1;
-static int hf_sflow_5_flow_record_format = -1;
-static int hf_sflow_5_counters_record_format = -1;
-static int hf_sflow_245_header = -1;
-static int hf_sflow_245_packet_information_type = -1;
-static int hf_sflow_245_extended_information_type = -1;
-static int hf_sflow_245_vlan_in = -1; /* incoming 802.1Q VLAN ID */
-static int hf_sflow_245_vlan_out = -1; /* outgoing 802.1Q VLAN ID */
-static int hf_sflow_245_pri_in = -1; /* incominging 802.1p priority */
-static int hf_sflow_245_pri_out = -1; /* outgoing 802.1p priority */
-static int hf_sflow_245_nexthop_v4 = -1; /* nexthop address */
-static int hf_sflow_245_nexthop_v6 = -1; /* nexthop address */
-static int hf_sflow_245_ipv4_src = -1;
-static int hf_sflow_245_ipv4_dst = -1;
-static int hf_sflow_245_ipv6_src = -1;
-static int hf_sflow_245_ipv6_dst = -1;
-static int hf_sflow_245_nexthop_src_mask = -1;
-static int hf_sflow_245_nexthop_dst_mask = -1;
+static int proto_sflow;
+static int hf_sflow_version;
+static int hf_sflow_agent_address_type;
+static int hf_sflow_agent_address_v4;
+static int hf_sflow_agent_address_v6;
+static int hf_sflow_5_sub_agent_id;
+static int hf_sflow_5_sample_length;
+static int hf_sflow_5_flow_data_length;
+/* static int hf_sflow_5_counters_data_length; */
+static int hf_sflow_245_seqnum;
+static int hf_sflow_245_sysuptime;
+static int hf_sflow_245_numsamples;
+static int hf_sflow_245_header_protocol;
+static int hf_sflow_245_sampletype;
+static int hf_sflow_245_sampletype12;
+static int hf_sflow_245_ipv4_precedence_type;
+static int hf_sflow_5_flow_record_format;
+static int hf_sflow_5_counters_record_format;
+static int hf_sflow_245_header;
+static int hf_sflow_245_packet_information_type;
+static int hf_sflow_245_extended_information_type;
+static int hf_sflow_245_vlan_in; /* incoming 802.1Q VLAN ID */
+static int hf_sflow_245_vlan_out; /* outgoing 802.1Q VLAN ID */
+static int hf_sflow_245_pri_in; /* incominging 802.1p priority */
+static int hf_sflow_245_pri_out; /* outgoing 802.1p priority */
+static int hf_sflow_245_nexthop_v4; /* nexthop address */
+static int hf_sflow_245_nexthop_v6; /* nexthop address */
+static int hf_sflow_245_ipv4_src;
+static int hf_sflow_245_ipv4_dst;
+static int hf_sflow_245_ipv6_src;
+static int hf_sflow_245_ipv6_dst;
+static int hf_sflow_245_nexthop_src_mask;
+static int hf_sflow_245_nexthop_dst_mask;
 
 
 /* extended gateway (all versions) */
-static int hf_sflow_245_as = -1;
-static int hf_sflow_245_src_as = -1;
-static int hf_sflow_245_src_peer_as = -1;
-static int hf_sflow_245_dst_as_entries = -1; /* aka length */
-static int hf_sflow_245_dst_as = -1;
+static int hf_sflow_245_as;
+static int hf_sflow_245_src_as;
+static int hf_sflow_245_src_peer_as;
+static int hf_sflow_245_dst_as_entries; /* aka length */
+static int hf_sflow_245_dst_as;
 /* extended gateway (>= version 4) */
-static int hf_sflow_245_community_entries = -1;
-/* static int hf_sflow_245_community = -1; */
-static int hf_sflow_245_localpref = -1;
+static int hf_sflow_245_community_entries;
+/* static int hf_sflow_245_community; */
+static int hf_sflow_245_localpref;
 
 /* generic interface counter */
-static int hf_sflow_245_ifindex = -1;
-static int hf_sflow_245_iftype = -1;
-static int hf_sflow_245_ifspeed = -1;
-static int hf_sflow_245_ifdirection = -1;
-static int hf_sflow_245_ifadmin_status = -1;
-static int hf_sflow_245_ifoper_status = -1;
-static int hf_sflow_245_ifinoct = -1;
-static int hf_sflow_245_ifinpkt = -1;
-static int hf_sflow_245_ifinmcast = -1;
-static int hf_sflow_245_ifinbcast = -1;
-static int hf_sflow_245_ifinerr = -1;
-static int hf_sflow_245_ifindisc = -1;
-static int hf_sflow_245_ifinunk = -1;
-static int hf_sflow_245_ifoutoct = -1;
-static int hf_sflow_245_ifoutpkt = -1;
-static int hf_sflow_245_ifoutmcast = -1;
-static int hf_sflow_245_ifoutbcast = -1;
-static int hf_sflow_245_ifoutdisc = -1;
-static int hf_sflow_245_ifouterr = -1;
-static int hf_sflow_245_ifpromisc = -1;
+static int hf_sflow_245_ifindex;
+static int hf_sflow_245_iftype;
+static int hf_sflow_245_ifspeed;
+static int hf_sflow_245_ifdirection;
+static int hf_sflow_245_ifadmin_status;
+static int hf_sflow_245_ifoper_status;
+static int hf_sflow_245_ifinoct;
+static int hf_sflow_245_ifinpkt;
+static int hf_sflow_245_ifinmcast;
+static int hf_sflow_245_ifinbcast;
+static int hf_sflow_245_ifinerr;
+static int hf_sflow_245_ifindisc;
+static int hf_sflow_245_ifinunk;
+static int hf_sflow_245_ifoutoct;
+static int hf_sflow_245_ifoutpkt;
+static int hf_sflow_245_ifoutmcast;
+static int hf_sflow_245_ifoutbcast;
+static int hf_sflow_245_ifoutdisc;
+static int hf_sflow_245_ifouterr;
+static int hf_sflow_245_ifpromisc;
 
 /* ethernet interface counter */
-static int hf_sflow_245_dot3StatsAlignmentErrors = -1;
-static int hf_sflow_245_dot3StatsFCSErrors = -1;
-static int hf_sflow_245_dot3StatsSingleCollisionFrames = -1;
-static int hf_sflow_245_dot3StatsMultipleCollisionFrames = -1;
-static int hf_sflow_245_dot3StatsSQETestErrors = -1;
-static int hf_sflow_245_dot3StatsDeferredTransmissions = -1;
-static int hf_sflow_245_dot3StatsLateCollisions = -1;
-static int hf_sflow_245_dot3StatsExcessiveCollisions = -1;
-static int hf_sflow_245_dot3StatsInternalMacTransmitErrors = -1;
-static int hf_sflow_245_dot3StatsCarrierSenseErrors = -1;
-static int hf_sflow_245_dot3StatsFrameTooLongs = -1;
-static int hf_sflow_245_dot3StatsInternalMacReceiveErrors = -1;
-static int hf_sflow_245_dot3StatsSymbolErrors = -1;
+static int hf_sflow_245_dot3StatsAlignmentErrors;
+static int hf_sflow_245_dot3StatsFCSErrors;
+static int hf_sflow_245_dot3StatsSingleCollisionFrames;
+static int hf_sflow_245_dot3StatsMultipleCollisionFrames;
+static int hf_sflow_245_dot3StatsSQETestErrors;
+static int hf_sflow_245_dot3StatsDeferredTransmissions;
+static int hf_sflow_245_dot3StatsLateCollisions;
+static int hf_sflow_245_dot3StatsExcessiveCollisions;
+static int hf_sflow_245_dot3StatsInternalMacTransmitErrors;
+static int hf_sflow_245_dot3StatsCarrierSenseErrors;
+static int hf_sflow_245_dot3StatsFrameTooLongs;
+static int hf_sflow_245_dot3StatsInternalMacReceiveErrors;
+static int hf_sflow_245_dot3StatsSymbolErrors;
 
 /* token ring counter */
-static int hf_sflow_245_dot5StatsLineErrors = -1;
-static int hf_sflow_245_dot5StatsBurstErrors = -1;
-static int hf_sflow_245_dot5StatsACErrors = -1;
-static int hf_sflow_245_dot5StatsAbortTransErrors = -1;
-static int hf_sflow_245_dot5StatsInternalErrors = -1;
-static int hf_sflow_245_dot5StatsLostFrameErrors = -1;
-static int hf_sflow_245_dot5StatsReceiveCongestions = -1;
-static int hf_sflow_245_dot5StatsFrameCopiedErrors = -1;
-static int hf_sflow_245_dot5StatsTokenErrors = -1;
-static int hf_sflow_245_dot5StatsSoftErrors = -1;
-static int hf_sflow_245_dot5StatsHardErrors = -1;
-static int hf_sflow_245_dot5StatsSignalLoss = -1;
-static int hf_sflow_245_dot5StatsTransmitBeacons = -1;
-static int hf_sflow_245_dot5StatsRecoveries = -1;
-static int hf_sflow_245_dot5StatsLobeWires = -1;
-static int hf_sflow_245_dot5StatsRemoves = -1;
-static int hf_sflow_245_dot5StatsSingles = -1;
-static int hf_sflow_245_dot5StatsFreqErrors = -1;
+static int hf_sflow_245_dot5StatsLineErrors;
+static int hf_sflow_245_dot5StatsBurstErrors;
+static int hf_sflow_245_dot5StatsACErrors;
+static int hf_sflow_245_dot5StatsAbortTransErrors;
+static int hf_sflow_245_dot5StatsInternalErrors;
+static int hf_sflow_245_dot5StatsLostFrameErrors;
+static int hf_sflow_245_dot5StatsReceiveCongestions;
+static int hf_sflow_245_dot5StatsFrameCopiedErrors;
+static int hf_sflow_245_dot5StatsTokenErrors;
+static int hf_sflow_245_dot5StatsSoftErrors;
+static int hf_sflow_245_dot5StatsHardErrors;
+static int hf_sflow_245_dot5StatsSignalLoss;
+static int hf_sflow_245_dot5StatsTransmitBeacons;
+static int hf_sflow_245_dot5StatsRecoveries;
+static int hf_sflow_245_dot5StatsLobeWires;
+static int hf_sflow_245_dot5StatsRemoves;
+static int hf_sflow_245_dot5StatsSingles;
+static int hf_sflow_245_dot5StatsFreqErrors;
 
 /* 100 BaseVG interface counters */
-static int hf_sflow_245_dot12InHighPriorityFrames = -1;
-static int hf_sflow_245_dot12InHighPriorityOctets = -1;
-static int hf_sflow_245_dot12InNormPriorityFrames = -1;
-static int hf_sflow_245_dot12InNormPriorityOctets = -1;
-static int hf_sflow_245_dot12InIPMErrors = -1;
-static int hf_sflow_245_dot12InOversizeFrameErrors = -1;
-static int hf_sflow_245_dot12InDataErrors = -1;
-static int hf_sflow_245_dot12InNullAddressedFrames = -1;
-static int hf_sflow_245_dot12OutHighPriorityFrames = -1;
-static int hf_sflow_245_dot12OutHighPriorityOctets = -1;
-static int hf_sflow_245_dot12TransitionIntoTrainings = -1;
-static int hf_sflow_245_dot12HCInHighPriorityOctets = -1;
-static int hf_sflow_245_dot12HCInNormPriorityOctets = -1;
-static int hf_sflow_245_dot12HCOutHighPriorityOctets = -1;
+static int hf_sflow_245_dot12InHighPriorityFrames;
+static int hf_sflow_245_dot12InHighPriorityOctets;
+static int hf_sflow_245_dot12InNormPriorityFrames;
+static int hf_sflow_245_dot12InNormPriorityOctets;
+static int hf_sflow_245_dot12InIPMErrors;
+static int hf_sflow_245_dot12InOversizeFrameErrors;
+static int hf_sflow_245_dot12InDataErrors;
+static int hf_sflow_245_dot12InNullAddressedFrames;
+static int hf_sflow_245_dot12OutHighPriorityFrames;
+static int hf_sflow_245_dot12OutHighPriorityOctets;
+static int hf_sflow_245_dot12TransitionIntoTrainings;
+static int hf_sflow_245_dot12HCInHighPriorityOctets;
+static int hf_sflow_245_dot12HCInNormPriorityOctets;
+static int hf_sflow_245_dot12HCOutHighPriorityOctets;
 
 /* VLAN counters */
-static int hf_sflow_245_vlan_id = -1;
-static int hf_sflow_245_octets = -1;
-static int hf_sflow_245_ucastPkts = -1;
-static int hf_sflow_245_multicastPkts = -1;
-static int hf_sflow_245_broadcastPkts = -1;
-static int hf_sflow_245_discards = -1;
+static int hf_sflow_245_vlan_id;
+static int hf_sflow_245_octets;
+static int hf_sflow_245_ucastPkts;
+static int hf_sflow_245_multicastPkts;
+static int hf_sflow_245_broadcastPkts;
+static int hf_sflow_245_discards;
 
 /* 802.11 interface counters */
-static int hf_sflow_5_dot11TransmittedFragmentCount = -1;
-static int hf_sflow_5_dot11MulticastTransmittedFrameCount = -1;
-static int hf_sflow_5_dot11FailedCount = -1;
-static int hf_sflow_5_dot11RetryCount = -1;
-static int hf_sflow_5_dot11MultipleRetryCount = -1;
-static int hf_sflow_5_dot11FrameDuplicateCount = -1;
-static int hf_sflow_5_dot11RTSSuccessCount = -1;
-static int hf_sflow_5_dot11RTSFailureCount = -1;
-static int hf_sflow_5_dot11ACKFailureCount = -1;
-static int hf_sflow_5_dot11ReceivedFragmentCount = -1;
-static int hf_sflow_5_dot11MulticastReceivedFrameCount = -1;
-static int hf_sflow_5_dot11FCSErrorCount = -1;
-static int hf_sflow_5_dot11TransmittedFrameCount = -1;
-static int hf_sflow_5_dot11WEPUndecryptableCount = -1;
-static int hf_sflow_5_dot11QoSDiscardedFragmentCount = -1;
-static int hf_sflow_5_dot11AssociatedStationCount = -1;
-static int hf_sflow_5_dot11QoSCFPollsReceivedCount = -1;
-static int hf_sflow_5_dot11QoSCFPollsUnusedCount = -1;
-static int hf_sflow_5_dot11QoSCFPollsUnusableCount = -1;
-static int hf_sflow_5_dot11QoSCFPollsLostCount = -1;
-/* static int hf_sflow_5_ieee80211_version = -1; */
+static int hf_sflow_5_dot11TransmittedFragmentCount;
+static int hf_sflow_5_dot11MulticastTransmittedFrameCount;
+static int hf_sflow_5_dot11FailedCount;
+static int hf_sflow_5_dot11RetryCount;
+static int hf_sflow_5_dot11MultipleRetryCount;
+static int hf_sflow_5_dot11FrameDuplicateCount;
+static int hf_sflow_5_dot11RTSSuccessCount;
+static int hf_sflow_5_dot11RTSFailureCount;
+static int hf_sflow_5_dot11ACKFailureCount;
+static int hf_sflow_5_dot11ReceivedFragmentCount;
+static int hf_sflow_5_dot11MulticastReceivedFrameCount;
+static int hf_sflow_5_dot11FCSErrorCount;
+static int hf_sflow_5_dot11TransmittedFrameCount;
+static int hf_sflow_5_dot11WEPUndecryptableCount;
+static int hf_sflow_5_dot11QoSDiscardedFragmentCount;
+static int hf_sflow_5_dot11AssociatedStationCount;
+static int hf_sflow_5_dot11QoSCFPollsReceivedCount;
+static int hf_sflow_5_dot11QoSCFPollsUnusedCount;
+static int hf_sflow_5_dot11QoSCFPollsUnusableCount;
+static int hf_sflow_5_dot11QoSCFPollsLostCount;
+/* static int hf_sflow_5_ieee80211_version; */
 
 
 /* processor information */
-static int hf_sflow_5_cpu_5s = -1;
-static int hf_sflow_5_cpu_1m = -1;
-static int hf_sflow_5_cpu_5m = -1;
-static int hf_sflow_5_total_memory = -1;
-static int hf_sflow_5_free_memory = -1;
+static int hf_sflow_5_cpu_5s;
+static int hf_sflow_5_cpu_1m;
+static int hf_sflow_5_cpu_5m;
+static int hf_sflow_5_total_memory;
+static int hf_sflow_5_free_memory;
 
 /* radio utilisation */
-static int hf_sflow_5_elapsed_time = -1;
-static int hf_sflow_5_on_channel_time = -1;
-static int hf_sflow_5_on_channel_busy_time = -1;
+static int hf_sflow_5_elapsed_time;
+static int hf_sflow_5_on_channel_time;
+static int hf_sflow_5_on_channel_busy_time;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_sflow_5_extended_80211_suite_type = -1;
-static int hf_sflow_5_extended_80211_rx_channel = -1;
-static int hf_sflow_flow_sample_input_interface = -1;
-static int hf_sflow_counters_sample_sampling_interval = -1;
-static int hf_sflow_5_extended_url_host_length = -1;
-static int hf_sflow_245_ip_tcp_flag_syn = -1;
-static int hf_sflow_24_flow_sample_output_interface = -1;
-static int hf_sflow_5_flow_sample_output_interface = -1;
-static int hf_sflow_5_flow_sample_output_interface_form = -1;
-static int hf_sflow_5_flow_sample_output_interface_val = -1;
-static int hf_sflow_5_flow_sample_output_interface_val_discard = -1;
-static int hf_sflow_245_length_of_ip_packet = -1;
-static int hf_sflow_counters_sample_counters_type = -1;
-static int hf_sflow_5_extended_mpls_tunnel_id = -1;
-static int hf_sflow_flow_sample_sample_pool = -1;
-static int hf_sflow_5_extended_80211_tx_speed = -1;
-static int hf_sflow_5_extended_vlan_tunnel_tpid_tci_pair = -1;
-static int hf_sflow_245_extended_mpls_out_label_stack_entries = -1;
-static int hf_sflow_flow_sample_input_interface_value = -1;
-static int hf_sflow_flow_sample_sampling_rate = -1;
-static int hf_sflow_5_extended_80211_rx_rcpi = -1;
-static int hf_sflow_enterprise = -1;
-static int hf_sflow_enterprise_length = -1;
-static int hf_sflow_enterprise_data = -1;
-static int hf_sflow_245_header_frame_length = -1;
-static int hf_sflow_5_extended_user_destination_character_set = -1;
-static int hf_sflow_5_extended_80211_rx_bssid = -1;
-static int hf_sflow_5_extended_80211_tx_retransmission_duration = -1;
-static int hf_sflow_245_ethernet_length_of_mac_packet = -1;
-static int hf_sflow_245_ip_tcp_flag_psh = -1;
-static int hf_sflow_flow_sample_flow_record = -1;
-static int hf_sflow_245_extended_mpls_in_label = -1;
-static int hf_sflow_5_extended_user_source_character_set = -1;
-static int hf_sflow_5_extended_user_destination_user_string_length = -1;
-static int hf_sflow_counters_sample_sequence_number = -1;
-static int hf_sflow_5_extended_80211_rx_speed = -1;
-static int hf_sflow_5_extended_80211_rx_rsni = -1;
-static int hf_sflow_flow_sample_source_id_index = -1;
-static int hf_sflow_245_ip_tcp_flag_ece = -1;
-static int hf_sflow_245_ipv4_throughput = -1;
-static int hf_sflow_5_extended_80211_oui = -1;
-static int hf_sflow_counters_sample_source_id_type = -1;
-static int hf_sflow_flow_sample_input_interface_format = -1;
-static int hf_sflow_5_extended_80211_tx_channel = -1;
-static int hf_sflow_245_ip_tcp_flag_urg = -1;
-static int hf_sflow_5_extended_mpls_tunnel_name_length = -1;
-static int hf_sflow_5_extended_80211_tx_version = -1;
-static int hf_sflow_245_ipv4_delay = -1;
-static int hf_sflow_flow_sample_source_id_class = -1;
-static int hf_sflow_245_ethernet_source_mac_address = -1;
-static int hf_sflow_5_extended_mpls_ftn_mask = -1;
-static int hf_sflow_245_extended_mpls_out_label = -1;
-static int hf_sflow_245_ipv6_priority = -1;
-static int hf_sflow_245_ip_tcp_flag_fin = -1;
-static int hf_sflow_245_ip_destination_port = -1;
-static int hf_sflow_5_extended_mpls_vc_label_cos_value = -1;
-static int hf_sflow_5_extended_80211_rx_packet_duration = -1;
-static int hf_sflow_5_extended_80211_tx_packet_duration = -1;
-static int hf_sflow_245_ipv4_reliability = -1;
-static int hf_sflow_5_extended_80211_tx_power = -1;
-static int hf_sflow_24_flow_sample_multiple_outputs = -1;
-static int hf_sflow_5_extended_user_source_user_string_length = -1;
-static int hf_sflow_5_extended_80211_payload_length = -1;
-static int hf_sflow_24_flow_sample_output_interface_format = -1;
-static int hf_sflow_245_ethernet_packet_type = -1;
-static int hf_sflow_counters_sample_expanded_source_id_type = -1;
-static int hf_sflow_245_ip_source_port = -1;
-static int hf_sflow_245_extended_mpls_in_label_stack_entries = -1;
-static int hf_sflow_5_extended_mpls_vc_instance_name_length = -1;
-static int hf_sflow_245_ipv4_cost = -1;
-static int hf_sflow_5_extended_mpls_ftn_description_length = -1;
-static int hf_sflow_5_extended_vlan_tunnel_number_of_layers = -1;
-static int hf_sflow_5_extended_80211_tx_bssid = -1;
-static int hf_sflow_245_ip_tcp_flag_rst = -1;
-static int hf_sflow_245_ip_tcp_flag_ack = -1;
-static int hf_sflow_245_ip_tcp_flag_cwr = -1;
-static int hf_sflow_5_extended_80211_tx_retransmissions = -1;
-static int hf_sflow_5_extended_80211_rx_version = -1;
-static int hf_sflow_flow_sample_dropped_packets = -1;
-static int hf_sflow_counters_sample_expanded_source_id_index = -1;
-static int hf_sflow_245_header_payload_stripped = -1;
-static int hf_sflow_245_sampled_header_length = -1;
-static int hf_sflow_245_ethernet_destination_mac_address = -1;
-static int hf_sflow_counters_sample_source_id_class = -1;
-static int hf_sflow_5_extended_url_url_length = -1;
-static int hf_sflow_flow_sample_source_id_type = -1;
-static int hf_sflow_5_extended_mpls_fec_address_prefix_length = -1;
-static int hf_sflow_flow_sample_sequence_number = -1;
-static int hf_sflow_counters_sample_source_id_index = -1;
-static int hf_sflow_counters_sample_counters_records = -1;
-static int hf_sflow_5_extended_mpls_tunnel_cos_value = -1;
-static int hf_sflow_5_extended_mpls_vc_id = -1;
-static int hf_sflow_24_flow_sample_output_interface_value = -1;
-static int hf_sflow_5_extended_user_destination_user = -1;
-static int hf_sflow_245_as_type = -1;
-static int hf_sflow_counters_sample_index = -1;
-static int hf_sflow_5_extended_url_url = -1;
-static int hf_sflow_flow_sample_index = -1;
-static int hf_sflow_5_extended_80211_rx_ssid = -1;
-static int hf_sflow_5_extended_mpls_vc_instance_name = -1;
-static int hf_sflow_5_extended_mpls_tunnel_name = -1;
-static int hf_sflow_5_extended_80211_payload = -1;
-static int hf_sflow_5_extended_user_source_user = -1;
-static int hf_sflow_5_extended_url_host = -1;
-static int hf_sflow_5_extended_80211_tx_ssid = -1;
-static int hf_sflow_5_extended_url_direction = -1;
-static int hf_sflow_5_extended_mpls_ftn_description = -1;
-static int hf_sflow_245_ip_protocol = -1;
-
-static int hf_sflow_lag_port_padding = -1;
-static int hf_sflow_lag_port_actorsystemid = -1;
-static int hf_sflow_lag_port_partneropersystemid = -1;
-static int hf_sflow_lag_port_attachedaggid = -1;
-static int hf_sflow_lag_port_state = -1;
-static int hf_sflow_lag_port_actoradminstate = -1;
-static int hf_sflow_lag_port_actoroperstate = -1;
-static int hf_sflow_lag_port_partneradminstate = -1;
-static int hf_sflow_lag_port_partneroperstate = -1;
-static int hf_sflow_lag_port_reserved = -1;
-static int hf_sflow_5_lag_port_actoradminstate = -1;
-static int hf_sflow_5_lag_port_actoroperstate = -1;
-static int hf_sflow_5_lag_port_partneradminstate = -1;
-static int hf_sflow_5_lag_port_partneroperstate = -1;
-static int hf_sflow_lag_port_stats_lacpdusrx = -1;
-static int hf_sflow_lag_port_stats_markerpdusrx = -1;
-static int hf_sflow_lag_port_stats_markerresponsepdusrx = -1;
-static int hf_sflow_lag_port_stats_unknownrx = -1;
-static int hf_sflow_lag_port_stats_illegalrx = -1;
-static int hf_sflow_lag_port_stats_lacpdustx = -1;
-static int hf_sflow_lag_port_stats_markerpdustx = -1;
-static int hf_sflow_lag_port_stats_markerresponsepdustx = -1;
+static int hf_sflow_5_extended_80211_suite_type;
+static int hf_sflow_5_extended_80211_rx_channel;
+static int hf_sflow_flow_sample_input_interface;
+static int hf_sflow_counters_sample_sampling_interval;
+static int hf_sflow_5_extended_url_host_length;
+static int hf_sflow_245_ip_tcp_flag_syn;
+static int hf_sflow_24_flow_sample_output_interface;
+static int hf_sflow_5_flow_sample_output_interface;
+static int hf_sflow_5_flow_sample_output_interface_form;
+static int hf_sflow_5_flow_sample_output_interface_val;
+static int hf_sflow_5_flow_sample_output_interface_val_discard;
+static int hf_sflow_245_length_of_ip_packet;
+static int hf_sflow_counters_sample_counters_type;
+static int hf_sflow_5_extended_mpls_tunnel_id;
+static int hf_sflow_flow_sample_sample_pool;
+static int hf_sflow_5_extended_80211_tx_speed;
+static int hf_sflow_5_extended_vlan_tunnel_tpid_tci_pair;
+static int hf_sflow_245_extended_mpls_out_label_stack_entries;
+static int hf_sflow_flow_sample_input_interface_value;
+static int hf_sflow_flow_sample_sampling_rate;
+static int hf_sflow_5_extended_80211_rx_rcpi;
+static int hf_sflow_enterprise;
+static int hf_sflow_enterprise_length;
+static int hf_sflow_enterprise_data;
+static int hf_sflow_245_header_frame_length;
+static int hf_sflow_5_extended_user_destination_character_set;
+static int hf_sflow_5_extended_80211_rx_bssid;
+static int hf_sflow_5_extended_80211_tx_retransmission_duration;
+static int hf_sflow_245_ethernet_length_of_mac_packet;
+static int hf_sflow_245_ip_tcp_flag_psh;
+static int hf_sflow_flow_sample_flow_record;
+static int hf_sflow_245_extended_mpls_in_label;
+static int hf_sflow_5_extended_user_source_character_set;
+static int hf_sflow_5_extended_user_destination_user_string_length;
+static int hf_sflow_counters_sample_sequence_number;
+static int hf_sflow_5_extended_80211_rx_speed;
+static int hf_sflow_5_extended_80211_rx_rsni;
+static int hf_sflow_flow_sample_source_id_index;
+static int hf_sflow_245_ip_tcp_flag_ece;
+static int hf_sflow_245_ipv4_throughput;
+static int hf_sflow_5_extended_80211_oui;
+static int hf_sflow_counters_sample_source_id_type;
+static int hf_sflow_flow_sample_input_interface_format;
+static int hf_sflow_5_extended_80211_tx_channel;
+static int hf_sflow_245_ip_tcp_flag_urg;
+static int hf_sflow_5_extended_mpls_tunnel_name_length;
+static int hf_sflow_5_extended_80211_tx_version;
+static int hf_sflow_245_ipv4_delay;
+static int hf_sflow_flow_sample_source_id_class;
+static int hf_sflow_245_ethernet_source_mac_address;
+static int hf_sflow_5_extended_mpls_ftn_mask;
+static int hf_sflow_245_extended_mpls_out_label;
+static int hf_sflow_245_ipv6_priority;
+static int hf_sflow_245_ip_tcp_flag_fin;
+static int hf_sflow_245_ip_destination_port;
+static int hf_sflow_5_extended_mpls_vc_label_cos_value;
+static int hf_sflow_5_extended_80211_rx_packet_duration;
+static int hf_sflow_5_extended_80211_tx_packet_duration;
+static int hf_sflow_245_ipv4_reliability;
+static int hf_sflow_5_extended_80211_tx_power;
+static int hf_sflow_24_flow_sample_multiple_outputs;
+static int hf_sflow_5_extended_user_source_user_string_length;
+static int hf_sflow_5_extended_80211_payload_length;
+static int hf_sflow_24_flow_sample_output_interface_format;
+static int hf_sflow_245_ethernet_packet_type;
+static int hf_sflow_counters_sample_expanded_source_id_type;
+static int hf_sflow_245_ip_source_port;
+static int hf_sflow_245_extended_mpls_in_label_stack_entries;
+static int hf_sflow_5_extended_mpls_vc_instance_name_length;
+static int hf_sflow_245_ipv4_cost;
+static int hf_sflow_5_extended_mpls_ftn_description_length;
+static int hf_sflow_5_extended_vlan_tunnel_number_of_layers;
+static int hf_sflow_5_extended_80211_tx_bssid;
+static int hf_sflow_245_ip_tcp_flag_rst;
+static int hf_sflow_245_ip_tcp_flag_ack;
+static int hf_sflow_245_ip_tcp_flag_cwr;
+static int hf_sflow_5_extended_80211_tx_retransmissions;
+static int hf_sflow_5_extended_80211_rx_version;
+static int hf_sflow_flow_sample_dropped_packets;
+static int hf_sflow_counters_sample_expanded_source_id_index;
+static int hf_sflow_245_header_payload_stripped;
+static int hf_sflow_245_sampled_header_length;
+static int hf_sflow_245_ethernet_destination_mac_address;
+static int hf_sflow_counters_sample_source_id_class;
+static int hf_sflow_5_extended_url_url_length;
+static int hf_sflow_flow_sample_source_id_type;
+static int hf_sflow_5_extended_mpls_fec_address_prefix_length;
+static int hf_sflow_flow_sample_sequence_number;
+static int hf_sflow_counters_sample_source_id_index;
+static int hf_sflow_counters_sample_counters_records;
+static int hf_sflow_5_extended_mpls_tunnel_cos_value;
+static int hf_sflow_5_extended_mpls_vc_id;
+static int hf_sflow_24_flow_sample_output_interface_value;
+static int hf_sflow_5_extended_user_destination_user;
+static int hf_sflow_245_as_type;
+static int hf_sflow_counters_sample_index;
+static int hf_sflow_5_extended_url_url;
+static int hf_sflow_flow_sample_index;
+static int hf_sflow_5_extended_80211_rx_ssid;
+static int hf_sflow_5_extended_mpls_vc_instance_name;
+static int hf_sflow_5_extended_mpls_tunnel_name;
+static int hf_sflow_5_extended_80211_payload;
+static int hf_sflow_5_extended_user_source_user;
+static int hf_sflow_5_extended_url_host;
+static int hf_sflow_5_extended_80211_tx_ssid;
+static int hf_sflow_5_extended_url_direction;
+static int hf_sflow_5_extended_mpls_ftn_description;
+static int hf_sflow_245_ip_protocol;
+
+static int hf_sflow_lag_port_padding;
+static int hf_sflow_lag_port_actorsystemid;
+static int hf_sflow_lag_port_partneropersystemid;
+static int hf_sflow_lag_port_attachedaggid;
+static int hf_sflow_lag_port_state;
+static int hf_sflow_lag_port_actoradminstate;
+static int hf_sflow_lag_port_actoroperstate;
+static int hf_sflow_lag_port_partneradminstate;
+static int hf_sflow_lag_port_partneroperstate;
+static int hf_sflow_lag_port_reserved;
+static int hf_sflow_5_lag_port_actoradminstate;
+static int hf_sflow_5_lag_port_actoroperstate;
+static int hf_sflow_5_lag_port_partneradminstate;
+static int hf_sflow_5_lag_port_partneroperstate;
+static int hf_sflow_lag_port_stats_lacpdusrx;
+static int hf_sflow_lag_port_stats_markerpdusrx;
+static int hf_sflow_lag_port_stats_markerresponsepdusrx;
+static int hf_sflow_lag_port_stats_unknownrx;
+static int hf_sflow_lag_port_stats_illegalrx;
+static int hf_sflow_lag_port_stats_lacpdustx;
+static int hf_sflow_lag_port_stats_markerpdustx;
+static int hf_sflow_lag_port_stats_markerresponsepdustx;
 
 /* Initialize the subtree pointers */
-static gint ett_sflow_245 = -1;
-static gint ett_sflow_245_sample = -1;
-static gint ett_sflow_5_flow_record = -1;
-static gint ett_sflow_5_counters_record = -1;
-static gint ett_sflow_5_mpls_in_label_stack = -1;
-static gint ett_sflow_5_mpls_out_label_stack = -1;
-static gint ett_sflow_245_extended_data = -1;
-static gint ett_sflow_245_gw_as_dst = -1;
-static gint ett_sflow_245_gw_as_dst_seg = -1;
-static gint ett_sflow_245_gw_community = -1;
-static gint ett_sflow_245_sampled_header = -1;
-static gint ett_sflow_lag_port_state_flags = -1;
-static gint ett_sflow_5_output_interface = -1;
-
-static expert_field ei_sflow_invalid_address_type = EI_INIT;
+static gint ett_sflow_245;
+static gint ett_sflow_245_sample;
+static gint ett_sflow_5_flow_record;
+static gint ett_sflow_5_counters_record;
+static gint ett_sflow_5_mpls_in_label_stack;
+static gint ett_sflow_5_mpls_out_label_stack;
+static gint ett_sflow_245_extended_data;
+static gint ett_sflow_245_gw_as_dst;
+static gint ett_sflow_245_gw_as_dst_seg;
+static gint ett_sflow_245_gw_community;
+static gint ett_sflow_245_sampled_header;
+static gint ett_sflow_lag_port_state_flags;
+static gint ett_sflow_5_output_interface;
+
+static expert_field ei_sflow_invalid_address_type;
 
 static dissector_table_t   header_subdissector_table;
 
diff --git a/epan/dissectors/packet-sftp.c b/epan/dissectors/packet-sftp.c
index 8564b5ef6a..4429977ed6 100644
--- a/epan/dissectors/packet-sftp.c
+++ b/epan/dissectors/packet-sftp.c
@@ -32,42 +32,42 @@
 
 void proto_register_sftp(void);
 
-static int proto_sftp = -1;
-
-static int hf_ssh_sftp_len = -1;
-static int hf_ssh_sftp_type = -1;
-static int hf_ssh_sftp_version = -1;
-static int hf_ssh_sftp_id = -1;
-static int hf_ssh_sftp_path_len = -1;
-static int hf_ssh_sftp_path = -1;
-static int hf_ssh_sftp_pflags = -1;
-static int hf_ssh_sftp_name_count = -1;
-static int hf_ssh_sftp_name_fn_len = -1;
-static int hf_ssh_sftp_name_fn = -1;
-static int hf_ssh_sftp_name_ln_len = -1;
-static int hf_ssh_sftp_name_ln = -1;
-static int hf_ssh_sftp_attrs_flags = -1;
-static int hf_ssh_sftp_attrs_size = -1;
-static int hf_ssh_sftp_attrs_uid = -1;
-static int hf_ssh_sftp_attrs_gid = -1;
-static int hf_ssh_sftp_attrs_permissions = -1;
-static int hf_ssh_sftp_attrs_atime = -1;
-static int hf_ssh_sftp_attrs_mtime = -1;
-static int hf_ssh_sftp_attrs_extended_count = -1;
-static int hf_ssh_sftp_handle_len = -1;
-static int hf_ssh_sftp_handle = -1;
-static int hf_ssh_sftp_status = -1;
-static int hf_ssh_sftp_error_message_len = -1;
-static int hf_ssh_sftp_error_message = -1;
-static int hf_ssh_sftp_offset = -1;
-static int hf_ssh_sftp_length = -1;
-static int hf_ssh_sftp_data_len = -1;
-static int hf_ssh_sftp_data = -1;
-static int hf_ssh_lang_tag_length = -1;
-static int hf_ssh_lang_tag = -1;
-
-static gint ett_sftp = -1;
-static gint ett_sftp_attrs = -1;
+static int proto_sftp;
+
+static int hf_ssh_sftp_len;
+static int hf_ssh_sftp_type;
+static int hf_ssh_sftp_version;
+static int hf_ssh_sftp_id;
+static int hf_ssh_sftp_path_len;
+static int hf_ssh_sftp_path;
+static int hf_ssh_sftp_pflags;
+static int hf_ssh_sftp_name_count;
+static int hf_ssh_sftp_name_fn_len;
+static int hf_ssh_sftp_name_fn;
+static int hf_ssh_sftp_name_ln_len;
+static int hf_ssh_sftp_name_ln;
+static int hf_ssh_sftp_attrs_flags;
+static int hf_ssh_sftp_attrs_size;
+static int hf_ssh_sftp_attrs_uid;
+static int hf_ssh_sftp_attrs_gid;
+static int hf_ssh_sftp_attrs_permissions;
+static int hf_ssh_sftp_attrs_atime;
+static int hf_ssh_sftp_attrs_mtime;
+static int hf_ssh_sftp_attrs_extended_count;
+static int hf_ssh_sftp_handle_len;
+static int hf_ssh_sftp_handle;
+static int hf_ssh_sftp_status;
+static int hf_ssh_sftp_error_message_len;
+static int hf_ssh_sftp_error_message;
+static int hf_ssh_sftp_offset;
+static int hf_ssh_sftp_length;
+static int hf_ssh_sftp_data_len;
+static int hf_ssh_sftp_data;
+static int hf_ssh_lang_tag_length;
+static int hf_ssh_lang_tag;
+
+static gint ett_sftp;
+static gint ett_sftp_attrs;
 
 static dissector_handle_t sftp_handle;
 
diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c
index bd068c1f80..2f32f8d2b1 100644
--- a/epan/dissectors/packet-sgsap.c
+++ b/epan/dissectors/packet-sgsap.c
@@ -40,32 +40,32 @@ static dissector_handle_t gsm_a_dtap_handle;
 #define SGSAP_SCTP_PORT_RANGE "29118"
 
 /* Initialize the protocol and registered fields */
-static int proto_sgsap = -1;
-
-static int hf_sgsap_msg_type = -1;
-int hf_sgsap_elem_id = -1;
-static int hf_sgsap_eps_location_update_type = -1;
-static int hf_sgsap_service_indicator_value = -1;
-static int hf_sgsap_sgs_cause = -1;
-static int hf_sgsap_ue_emm_mode = -1;
-static int hf_sgsap_eci = -1;
-static int hf_sgsap_cn_id = -1;
-static int hf_sgsap_imsi_det_eps = -1;
-static int hf_sgsap_imsi_det_non_eps = -1;
-static int hf_sgsap_lcs_indic = -1;
-static int hf_sgsap_mme_name = -1;
-static int hf_sgsap_vlr_name = -1;
-static int hf_sgsap_imeisv = -1;
-static int hf_sgsap_unknown_msg = -1;
-static int hf_sgsap_message_elements = -1;
-static int hf_sgsap_csri = -1;
-static int hf_sgsap_sel_cs_dmn_op = -1;
-
-static int ett_sgsap = -1;
-static int ett_sgsap_sel_cs_dmn_op = -1;
-
-static expert_field ei_sgsap_extraneous_data = EI_INIT;
-static expert_field ei_sgsap_missing_mandatory_element = EI_INIT;
+static int proto_sgsap;
+
+static int hf_sgsap_msg_type;
+int hf_sgsap_elem_id;
+static int hf_sgsap_eps_location_update_type;
+static int hf_sgsap_service_indicator_value;
+static int hf_sgsap_sgs_cause;
+static int hf_sgsap_ue_emm_mode;
+static int hf_sgsap_eci;
+static int hf_sgsap_cn_id;
+static int hf_sgsap_imsi_det_eps;
+static int hf_sgsap_imsi_det_non_eps;
+static int hf_sgsap_lcs_indic;
+static int hf_sgsap_mme_name;
+static int hf_sgsap_vlr_name;
+static int hf_sgsap_imeisv;
+static int hf_sgsap_unknown_msg;
+static int hf_sgsap_message_elements;
+static int hf_sgsap_csri;
+static int hf_sgsap_sel_cs_dmn_op;
+
+static int ett_sgsap;
+static int ett_sgsap_sel_cs_dmn_op;
+
+static expert_field ei_sgsap_extraneous_data;
+static expert_field ei_sgsap_missing_mandatory_element;
 
 static dissector_handle_t sgsap_handle;
 
diff --git a/epan/dissectors/packet-shicp.c b/epan/dissectors/packet-shicp.c
index 43e9a5ae61..179579a1ac 100644
--- a/epan/dissectors/packet-shicp.c
+++ b/epan/dissectors/packet-shicp.c
@@ -20,43 +20,43 @@ void proto_reg_handoff_shicp(void);
 void proto_register_shicp(void);
 
 /* Protocols and header fields */
-static int proto_shicp = -1;
-static int hf_shicp_header = -1;
-static int hf_shicp_protocol_version = -1;
-static int hf_shicp_dst = -1;
-static int hf_shicp_src = -1;
-static int hf_shicp_flags = -1;
-static int hf_shicp_msgclass_flag = -1;
-static int hf_shicp_error_flag = -1;
-static int hf_shicp_reserved_flag = -1;
-static int hf_shicp_msgtype = -1;
-static int hf_shicp_error = -1;
-static int hf_shicp_error_string = -1;
-static int hf_shicp_auth_req = -1;
-static int hf_shicp_module_version = -1;
-static int hf_shicp_module_desc = -1;
-static int hf_shicp_supported_msg = -1;
-static int hf_shicp_ip = -1;
-static int hf_shicp_sn = -1;
-static int hf_shicp_gw = -1;
-static int hf_shicp_dns1 = -1;
-static int hf_shicp_dns2 = -1;
-static int hf_shicp_dhcp = -1;
-static int hf_shicp_hn = -1;
-static int hf_shicp_hn_max_len = -1;
-static int hf_shicp_pswd_max_len = -1;
-static int hf_shicp_challenge = -1;
-static int hf_shicp_validity_period = -1;
-static int hf_shicp_token = -1;
-static int hf_shicp_pswd = -1;
-static int hf_shicp_wink_type = -1;
-static int hf_shicp_restart_mode = -1;
-
-static gint ett_shicp = -1;
-static gint ett_shicp_flags = -1;
-
-static expert_field ei_shicp_error = EI_INIT;
-static expert_field ei_shicp_malformed = EI_INIT;
+static int proto_shicp;
+static int hf_shicp_header;
+static int hf_shicp_protocol_version;
+static int hf_shicp_dst;
+static int hf_shicp_src;
+static int hf_shicp_flags;
+static int hf_shicp_msgclass_flag;
+static int hf_shicp_error_flag;
+static int hf_shicp_reserved_flag;
+static int hf_shicp_msgtype;
+static int hf_shicp_error;
+static int hf_shicp_error_string;
+static int hf_shicp_auth_req;
+static int hf_shicp_module_version;
+static int hf_shicp_module_desc;
+static int hf_shicp_supported_msg;
+static int hf_shicp_ip;
+static int hf_shicp_sn;
+static int hf_shicp_gw;
+static int hf_shicp_dns1;
+static int hf_shicp_dns2;
+static int hf_shicp_dhcp;
+static int hf_shicp_hn;
+static int hf_shicp_hn_max_len;
+static int hf_shicp_pswd_max_len;
+static int hf_shicp_challenge;
+static int hf_shicp_validity_period;
+static int hf_shicp_token;
+static int hf_shicp_pswd;
+static int hf_shicp_wink_type;
+static int hf_shicp_restart_mode;
+
+static gint ett_shicp;
+static gint ett_shicp_flags;
+
+static expert_field ei_shicp_error;
+static expert_field ei_shicp_malformed;
 
 #define SHICP_UDP_PORT 3250
 
diff --git a/epan/dissectors/packet-shim6.c b/epan/dissectors/packet-shim6.c
index c696840c59..b7e63c8918 100644
--- a/epan/dissectors/packet-shim6.c
+++ b/epan/dissectors/packet-shim6.c
@@ -81,62 +81,62 @@ struct ip6_shim {
 #define SHIM6_REAP_EXPLORING    0x01    /* 0 000 0001 */
 #define SHIM6_REAP_INBOUNDOK    0x02    /* 0 000 0010 */
 
-static int proto_shim6                     = -1;
+static int proto_shim6;
 
-static int hf_shim6_nxt            = -1;
-static int hf_shim6_len            = -1;
-static int hf_shim6_len_oct        = -1;
-static int hf_shim6_p              = -1;
+static int hf_shim6_nxt;
+static int hf_shim6_len;
+static int hf_shim6_len_oct;
+static int hf_shim6_p;
 /* context tag is 49 bits, cannot be used for filter yet */
-static int hf_shim6_ct             = -1;
-static int hf_shim6_type           = -1;
-static int hf_shim6_proto          = -1;
-static int hf_shim6_checksum       = -1;
-static int hf_shim6_checksum_status= -1;
-static int hf_shim6_inonce         = -1; /* also for request nonce */
-static int hf_shim6_rnonce         = -1;
-static int hf_shim6_reserved       = -1;
-static int hf_shim6_reserved2      = -1;
-static int hf_shim6_precvd         = -1;
-static int hf_shim6_psent          = -1;
-static int hf_shim6_psrc           = -1;
-static int hf_shim6_pdst           = -1;
-static int hf_shim6_pnonce         = -1;
-static int hf_shim6_pdata          = -1;
-static int hf_shim6_sulid          = -1;
-static int hf_shim6_rulid          = -1;
-static int hf_shim6_reap           = -1;
-static int hf_shim6_opt_type       = -1;
-static int hf_shim6_opt_len        = -1;
-static int hf_shim6_opt_total_len  = -1;
-static int hf_shim6_opt_loc_verif_methods = -1;
-static int hf_shim6_opt_critical   = -1;
-static int hf_shim6_opt_loclist    = -1;
-static int hf_shim6_locator        = -1;
-static int hf_shim6_loc_flag       = -1;
-static int hf_shim6_loc_prio       = -1;
-static int hf_shim6_loc_weight     = -1;
-static int hf_shim6_opt_locnum     = -1;
-static int hf_shim6_opt_elemlen    = -1;
-static int hf_shim6_opt_fii        = -1;
-static int hf_shim6_validator      = -1;
-static int hf_shim6_cga_parameter_data_structure = -1;
-static int hf_shim6_cga_signature  = -1;
-static int hf_shim6_padding        = -1;
-
-static gint ett_shim6_proto        = -1;
-static gint ett_shim6_option       = -1;
-static gint ett_shim6_locators     = -1;
-static gint ett_shim6_verif_methods = -1;
-static gint ett_shim6_loc_pref     = -1;
-static gint ett_shim6_probes_sent  = -1;
-static gint ett_shim6_probe_sent   = -1;
-static gint ett_shim6_probes_rcvd  = -1;
-static gint ett_shim6_probe_rcvd   = -1;
-static gint ett_shim6_cksum        = -1;
-
-static expert_field ei_shim6_opt_elemlen_invalid = EI_INIT;
-static expert_field ei_shim6_checksum_bad = EI_INIT;
+static int hf_shim6_ct;
+static int hf_shim6_type;
+static int hf_shim6_proto;
+static int hf_shim6_checksum;
+static int hf_shim6_checksum_status;
+static int hf_shim6_inonce; /* also for request nonce */
+static int hf_shim6_rnonce;
+static int hf_shim6_reserved;
+static int hf_shim6_reserved2;
+static int hf_shim6_precvd;
+static int hf_shim6_psent;
+static int hf_shim6_psrc;
+static int hf_shim6_pdst;
+static int hf_shim6_pnonce;
+static int hf_shim6_pdata;
+static int hf_shim6_sulid;
+static int hf_shim6_rulid;
+static int hf_shim6_reap;
+static int hf_shim6_opt_type;
+static int hf_shim6_opt_len;
+static int hf_shim6_opt_total_len;
+static int hf_shim6_opt_loc_verif_methods;
+static int hf_shim6_opt_critical;
+static int hf_shim6_opt_loclist;
+static int hf_shim6_locator;
+static int hf_shim6_loc_flag;
+static int hf_shim6_loc_prio;
+static int hf_shim6_loc_weight;
+static int hf_shim6_opt_locnum;
+static int hf_shim6_opt_elemlen;
+static int hf_shim6_opt_fii;
+static int hf_shim6_validator;
+static int hf_shim6_cga_parameter_data_structure;
+static int hf_shim6_cga_signature;
+static int hf_shim6_padding;
+
+static gint ett_shim6_proto;
+static gint ett_shim6_option;
+static gint ett_shim6_locators;
+static gint ett_shim6_verif_methods;
+static gint ett_shim6_loc_pref;
+static gint ett_shim6_probes_sent;
+static gint ett_shim6_probe_sent;
+static gint ett_shim6_probes_rcvd;
+static gint ett_shim6_probe_rcvd;
+static gint ett_shim6_cksum;
+
+static expert_field ei_shim6_opt_elemlen_invalid;
+static expert_field ei_shim6_checksum_bad;
 
 static const value_string shimoptvals[] = {
     { SHIM6_OPT_RESPVAL,  "Responder Validator Option" },
diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c
index 4f385cc99c..99ee3e852d 100644
--- a/epan/dissectors/packet-sigcomp.c
+++ b/epan/dissectors/packet-sigcomp.c
@@ -33,128 +33,128 @@ void proto_register_sigcomp(void);
 void proto_reg_handoff_sigcomp(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_sigcomp                            = -1;
-static int proto_raw_sigcomp                        = -1;
-static int hf_sigcomp_t_bit                         = -1;
-static int hf_sigcomp_len                           = -1;
-static int hf_sigcomp_returned_feedback_item        = -1;
-static int hf_sigcomp_returned_feedback_item_len    = -1;
-static int hf_sigcomp_code_len                      = -1;
-static int hf_sigcomp_destination                   = -1;
-static int hf_sigcomp_partial_state                 = -1;
-static int hf_sigcomp_remaining_message_bytes       = -1;
-static int hf_sigcomp_compression_ratio             = -1;
-static int hf_sigcomp_udvm_bytecode                 = -1;
-static int hf_sigcomp_udvm_instr                    = -1;
-static int hf_udvm_multitype_bytecode               = -1;
-static int hf_udvm_reference_bytecode               = -1;
-static int hf_udvm_literal_bytecode                 = -1;
-/* static int hf_udvm_operand                          = -1; */
-static int hf_udvm_length                           = -1;
-static int hf_udvm_addr_length                      = -1;
-static int hf_udvm_destination                      = -1;
-static int hf_udvm_addr_destination                 = -1;
-static int hf_udvm_at_address                       = -1;
-static int hf_udvm_address                          = -1;
-static int hf_udvm_literal_num                      = -1;
-static int hf_udvm_value                            = -1;
-static int hf_udvm_addr_value                       = -1;
-static int hf_partial_identifier_start              = -1;
-static int hf_partial_identifier_length             = -1;
-static int hf_state_begin                           = -1;
-static int hf_udvm_state_length                     = -1;
-static int hf_udvm_state_length_addr                = -1;
-static int hf_udvm_state_address                    = -1;
-static int hf_udvm_state_address_addr               = -1;
-static int hf_udvm_state_instr                      = -1;
-static int hf_udvm_operand_1                        = -1;
-static int hf_udvm_operand_2                        = -1;
-static int hf_udvm_operand_2_addr                   = -1;
-static int hf_udvm_j                                = -1;
-static int hf_udvm_addr_j                           = -1;
-static int hf_udvm_output_start                     = -1;
-static int hf_udvm_addr_output_start                = -1;
-static int hf_udvm_output_length                    = -1;
-static int hf_udvm_output_length_addr               = -1;
-static int hf_udvm_req_feedback_loc                 = -1;
-static int hf_udvm_min_acc_len                      = -1;
-static int hf_udvm_state_ret_pri                    = -1;
-static int hf_udvm_ret_param_loc                    = -1;
-static int hf_udvm_position                         = -1;
-static int hf_udvm_ref_dest                         = -1;
-static int hf_udvm_bits                             = -1;
-static int hf_udvm_lower_bound                      = -1;
-static int hf_udvm_upper_bound                      = -1;
-static int hf_udvm_uncompressed                     = -1;
-static int hf_udvm_offset                           = -1;
-static int hf_udvm_addr_offset                      = -1;
-static int hf_udvm_start_value                      = -1;
-static int hf_udvm_execution_trace                  = -1;
-static int hf_sigcomp_nack_ver                      = -1;
-static int hf_sigcomp_nack_reason_code              = -1;
-static int hf_sigcomp_nack_failed_op_code           = -1;
-static int hf_sigcomp_nack_pc                       = -1;
-static int hf_sigcomp_nack_sha1                     = -1;
-static int hf_sigcomp_nack_state_id                 = -1;
-static int hf_sigcomp_nack_memory_size              = -1;
-static int hf_sigcomp_nack_cycles_per_bit           = -1;
-static int hf_sigcomp_decompress_instruction        = -1;
-static int hf_sigcomp_loading_result                = -1;
-static int hf_sigcomp_byte_copy                     = -1;
+static int proto_sigcomp;
+static int proto_raw_sigcomp;
+static int hf_sigcomp_t_bit;
+static int hf_sigcomp_len;
+static int hf_sigcomp_returned_feedback_item;
+static int hf_sigcomp_returned_feedback_item_len;
+static int hf_sigcomp_code_len;
+static int hf_sigcomp_destination;
+static int hf_sigcomp_partial_state;
+static int hf_sigcomp_remaining_message_bytes;
+static int hf_sigcomp_compression_ratio;
+static int hf_sigcomp_udvm_bytecode;
+static int hf_sigcomp_udvm_instr;
+static int hf_udvm_multitype_bytecode;
+static int hf_udvm_reference_bytecode;
+static int hf_udvm_literal_bytecode;
+/* static int hf_udvm_operand; */
+static int hf_udvm_length;
+static int hf_udvm_addr_length;
+static int hf_udvm_destination;
+static int hf_udvm_addr_destination;
+static int hf_udvm_at_address;
+static int hf_udvm_address;
+static int hf_udvm_literal_num;
+static int hf_udvm_value;
+static int hf_udvm_addr_value;
+static int hf_partial_identifier_start;
+static int hf_partial_identifier_length;
+static int hf_state_begin;
+static int hf_udvm_state_length;
+static int hf_udvm_state_length_addr;
+static int hf_udvm_state_address;
+static int hf_udvm_state_address_addr;
+static int hf_udvm_state_instr;
+static int hf_udvm_operand_1;
+static int hf_udvm_operand_2;
+static int hf_udvm_operand_2_addr;
+static int hf_udvm_j;
+static int hf_udvm_addr_j;
+static int hf_udvm_output_start;
+static int hf_udvm_addr_output_start;
+static int hf_udvm_output_length;
+static int hf_udvm_output_length_addr;
+static int hf_udvm_req_feedback_loc;
+static int hf_udvm_min_acc_len;
+static int hf_udvm_state_ret_pri;
+static int hf_udvm_ret_param_loc;
+static int hf_udvm_position;
+static int hf_udvm_ref_dest;
+static int hf_udvm_bits;
+static int hf_udvm_lower_bound;
+static int hf_udvm_upper_bound;
+static int hf_udvm_uncompressed;
+static int hf_udvm_offset;
+static int hf_udvm_addr_offset;
+static int hf_udvm_start_value;
+static int hf_udvm_execution_trace;
+static int hf_sigcomp_nack_ver;
+static int hf_sigcomp_nack_reason_code;
+static int hf_sigcomp_nack_failed_op_code;
+static int hf_sigcomp_nack_pc;
+static int hf_sigcomp_nack_sha1;
+static int hf_sigcomp_nack_state_id;
+static int hf_sigcomp_nack_memory_size;
+static int hf_sigcomp_nack_cycles_per_bit;
+static int hf_sigcomp_decompress_instruction;
+static int hf_sigcomp_loading_result;
+static int hf_sigcomp_byte_copy;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_sigcomp_accessing_state = -1;
-static int hf_sigcomp_getting_value = -1;
-static int hf_sigcomp_load_bytecode_into_udvm_start = -1;
-static int hf_sigcomp_instruction_code = -1;
-static int hf_sigcomp_current_instruction = -1;
-static int hf_sigcomp_decompression_failure = -1;
-static int hf_sigcomp_wireshark_udvm_diagnostic = -1;
-static int hf_sigcomp_calculated_sha_1 = -1;
-static int hf_sigcomp_copying_value = -1;
-static int hf_sigcomp_storing_value = -1;
-static int hf_sigcomp_loading_value = -1;
-static int hf_sigcomp_set_hu = -1;
-static int hf_sigcomp_loading_h = -1;
-static int hf_sigcomp_state_value = -1;
-static int hf_sigcomp_output_value = -1;
-static int hf_sigcomp_num_state_create = -1;
-static int hf_sigcomp_sha1_digest = -1;
-static int hf_sigcomp_creating_state = -1;
-static int hf_sigcomp_sigcomp_message_decompressed = -1;
-static int hf_sigcomp_starting_to_remove_escape_digits = -1;
-static int hf_sigcomp_escape_digit_found = -1;
-static int hf_sigcomp_illegal_escape_code = -1;
-static int hf_sigcomp_end_of_sigcomp_message_indication_found = -1;
-static int hf_sigcomp_addr_value = -1;
-static int hf_sigcomp_copying_bytes_literally = -1;
-static int hf_sigcomp_data_for_sigcomp_dissector = -1;
-static int hf_sigcomp_remaining_sigcomp_message = -1;
-static int hf_sigcomp_sha1buff = -1;
-static int hf_sigcomp_udvm_instruction = -1;
-static int hf_sigcomp_remaining_bytes = -1;
-static int hf_sigcomp_max_udvm_cycles = -1;
-static int hf_sigcomp_used_udvm_cycles = -1;
-static int hf_sigcomp_udvm_execution_stated = -1;
-static int hf_sigcomp_message_length = -1;
-static int hf_sigcomp_byte_code_length = -1;
+static int hf_sigcomp_accessing_state;
+static int hf_sigcomp_getting_value;
+static int hf_sigcomp_load_bytecode_into_udvm_start;
+static int hf_sigcomp_instruction_code;
+static int hf_sigcomp_current_instruction;
+static int hf_sigcomp_decompression_failure;
+static int hf_sigcomp_wireshark_udvm_diagnostic;
+static int hf_sigcomp_calculated_sha_1;
+static int hf_sigcomp_copying_value;
+static int hf_sigcomp_storing_value;
+static int hf_sigcomp_loading_value;
+static int hf_sigcomp_set_hu;
+static int hf_sigcomp_loading_h;
+static int hf_sigcomp_state_value;
+static int hf_sigcomp_output_value;
+static int hf_sigcomp_num_state_create;
+static int hf_sigcomp_sha1_digest;
+static int hf_sigcomp_creating_state;
+static int hf_sigcomp_sigcomp_message_decompressed;
+static int hf_sigcomp_starting_to_remove_escape_digits;
+static int hf_sigcomp_escape_digit_found;
+static int hf_sigcomp_illegal_escape_code;
+static int hf_sigcomp_end_of_sigcomp_message_indication_found;
+static int hf_sigcomp_addr_value;
+static int hf_sigcomp_copying_bytes_literally;
+static int hf_sigcomp_data_for_sigcomp_dissector;
+static int hf_sigcomp_remaining_sigcomp_message;
+static int hf_sigcomp_sha1buff;
+static int hf_sigcomp_udvm_instruction;
+static int hf_sigcomp_remaining_bytes;
+static int hf_sigcomp_max_udvm_cycles;
+static int hf_sigcomp_used_udvm_cycles;
+static int hf_sigcomp_udvm_execution_stated;
+static int hf_sigcomp_message_length;
+static int hf_sigcomp_byte_code_length;
 
 
 /* Initialize the subtree pointers */
-static gint ett_sigcomp             = -1;
-static gint ett_sigcomp_udvm        = -1;
-static gint ett_sigcomp_udvm_exe    = -1;
-static gint ett_raw_text            = -1;
-
-static expert_field ei_sigcomp_nack_failed_op_code = EI_INIT;
-static expert_field ei_sigcomp_invalid_instruction = EI_INIT;
-static expert_field ei_sigcomp_invalid_shift_value = EI_INIT;
+static gint ett_sigcomp;
+static gint ett_sigcomp_udvm;
+static gint ett_sigcomp_udvm_exe;
+static gint ett_raw_text;
+
+static expert_field ei_sigcomp_nack_failed_op_code;
+static expert_field ei_sigcomp_invalid_instruction;
+static expert_field ei_sigcomp_invalid_shift_value;
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_sigcomp_tcp_fragment = EI_INIT;
-static expert_field ei_sigcomp_decompression_failure = EI_INIT;
-static expert_field ei_sigcomp_failed_to_access_state_wireshark_udvm_diagnostic = EI_INIT;
-static expert_field ei_sigcomp_all_remaining_parameters_zero = EI_INIT;
-static expert_field ei_sigcomp_sigcomp_message_decompression_failure = EI_INIT;
-static expert_field ei_sigcomp_execution_of_this_instruction_is_not_implemented = EI_INIT;
+static expert_field ei_sigcomp_tcp_fragment;
+static expert_field ei_sigcomp_decompression_failure;
+static expert_field ei_sigcomp_failed_to_access_state_wireshark_udvm_diagnostic;
+static expert_field ei_sigcomp_all_remaining_parameters_zero;
+static expert_field ei_sigcomp_sigcomp_message_decompression_failure;
+static expert_field ei_sigcomp_execution_of_this_instruction_is_not_implemented;
 
 static dissector_handle_t sip_handle;
 static dissector_handle_t sigcomp_handle;
diff --git a/epan/dissectors/packet-signal-pdu.c b/epan/dissectors/packet-signal-pdu.c
index 98fcee4a84..6b3a563635 100644
--- a/epan/dissectors/packet-signal-pdu.c
+++ b/epan/dissectors/packet-signal-pdu.c
@@ -70,7 +70,7 @@
 #define DATAFILE_SPDU_ISOBUS_MAPPING                        "Signal_PDU_Binding_ISOBUS"
 
 /* ID wireshark identifies the dissector by */
-static int proto_signal_pdu                                 = -1;
+static int proto_signal_pdu;
 
 static dissector_handle_t signal_pdu_handle_someip          = NULL;
 static dissector_handle_t signal_pdu_handle_can             = NULL;
@@ -80,19 +80,19 @@ static dissector_handle_t signal_pdu_handle_pdu_transport   = NULL;
 static dissector_handle_t signal_pdu_handle_ipdum           = NULL;
 static dissector_handle_t signal_pdu_handle_isobus          = NULL;
 
-static int hf_pdu_name                                      = -1;
-static int hf_payload_unparsed                              = -1;
+static int hf_pdu_name;
+static int hf_payload_unparsed;
 
-static gint ett_spdu_payload                                = -1;
-static gint ett_spdu_signal                                 = -1;
+static gint ett_spdu_payload;
+static gint ett_spdu_signal;
 static gboolean spdu_deserializer_activated                 = TRUE;
 static gboolean spdu_deserializer_show_hidden               = FALSE;
 static gboolean spdu_deserializer_hide_raw_values           = TRUE;
 
 /*** expert info items ***/
-static expert_field ei_spdu_payload_truncated               = EI_INIT;
-static expert_field ei_spdu_config_error                    = EI_INIT;
-static expert_field ei_spdu_unaligned_data                  = EI_INIT;
+static expert_field ei_spdu_payload_truncated;
+static expert_field ei_spdu_config_error;
+static expert_field ei_spdu_unaligned_data;
 
 /*** Data Structure for UAT based config ***/
 static GHashTable *data_spdu_messages                       = NULL;
diff --git a/epan/dissectors/packet-simple.c b/epan/dissectors/packet-simple.c
index 822b94912e..dd9dd4c40d 100644
--- a/epan/dissectors/packet-simple.c
+++ b/epan/dissectors/packet-simple.c
@@ -174,72 +174,72 @@ static const value_string Link11_Role[] = {
     { 0, NULL },
 };
 
-static int proto_simple = -1;
+static int proto_simple;
 
 static dissector_handle_t simple_dissector_handle;
 static dissector_handle_t link16_handle;
 
-static gint hf_simple_sync_byte_1 = -1;
-static gint hf_simple_sync_byte_2 = -1;
-static gint hf_simple_length = -1;
-static gint hf_simple_sequence_number = -1;
-static gint hf_simple_src_node = -1;
-static gint hf_simple_src_subnode = -1;
-static gint hf_simple_dst_node = -1;
-static gint hf_simple_dst_subnode = -1;
-static gint hf_simple_packet_size = -1;
-static gint hf_simple_packet_type = -1;
-static gint hf_simple_transit_time = -1;
-static gint hf_simple_link16_subtype = -1;
-static gint hf_simple_link16_rc = -1;
-static gint hf_simple_link16_network = -1;
-static gint hf_simple_link16_ssc2 = -1;
-static gint hf_simple_link16_npg = -1;
-static gint hf_simple_link16_ssc1 = -1;
-static gint hf_simple_link16_stn = -1;
-static gint hf_simple_link16_word_count = -1;
-static gint hf_simple_link16_loopback_id = -1;
-static gint hf_simple_status_subtype = -1;
-static gint hf_simple_status_word_count = -1;
-static gint hf_simple_status_name = -1;
-static gint hf_simple_status_time_hours = -1;
-static gint hf_simple_status_node_id = -1;
-static gint hf_simple_status_time_seconds = -1;
-static gint hf_simple_status_time_minutes = -1;
-static gint hf_simple_status_security_level = -1;
-static gint hf_simple_status_node_entry_flag = -1;
-static gint hf_simple_status_relay_hop = -1;
-static gint hf_simple_status_dx_flag_system_messages = -1;
-static gint hf_simple_status_dx_flag_common_tims_bims = -1;
-static gint hf_simple_status_dx_flag_common_toms_boms = -1;
-static gint hf_simple_status_dx_flag_simple_receive = -1;
-static gint hf_simple_status_dx_flag_simple_transmit = -1;
-static gint hf_simple_status_dx_flag_all_tims_bims = -1;
-static gint hf_simple_status_dx_flag_all_toms_boms = -1;
-static gint hf_simple_status_dx_file_id = -1;
-static gint hf_simple_status_spare_1 = -1;
-static gint hf_simple_status_link16_terminal_type = -1;
-static gint hf_simple_status_link16_role = -1;
-static gint hf_simple_status_link16_sync_status = -1;
-static gint hf_simple_status_link16_terminal_host_status = -1;
-static gint hf_simple_status_link16_stn = -1;
-static gint hf_simple_status_spare_2 = -1;
-static gint hf_simple_status_link11_dts_type = -1;
-static gint hf_simple_status_link11_role = -1;
-static gint hf_simple_status_link11_pu = -1;
-static gint hf_simple_status_link11_dts_host_status = -1;
-static gint hf_simple_status_spare_3 = -1;
-static gint hf_simple_checksum = -1;
-static gint hf_simple_checksum_status = -1;
-
-static gint ett_simple = -1;
-static gint ett_packet = -1;
-static gint ett_simple_status_dx_flag = -1;
-
-static expert_field ei_simple_sync_bytes_bad = EI_INIT;
-static expert_field ei_simple_length_bad = EI_INIT;
-static expert_field ei_simple_packet_size_bad = EI_INIT;
-static expert_field ei_simple_checksum_bad = EI_INIT;
+static gint hf_simple_sync_byte_1;
+static gint hf_simple_sync_byte_2;
+static gint hf_simple_length;
+static gint hf_simple_sequence_number;
+static gint hf_simple_src_node;
+static gint hf_simple_src_subnode;
+static gint hf_simple_dst_node;
+static gint hf_simple_dst_subnode;
+static gint hf_simple_packet_size;
+static gint hf_simple_packet_type;
+static gint hf_simple_transit_time;
+static gint hf_simple_link16_subtype;
+static gint hf_simple_link16_rc;
+static gint hf_simple_link16_network;
+static gint hf_simple_link16_ssc2;
+static gint hf_simple_link16_npg;
+static gint hf_simple_link16_ssc1;
+static gint hf_simple_link16_stn;
+static gint hf_simple_link16_word_count;
+static gint hf_simple_link16_loopback_id;
+static gint hf_simple_status_subtype;
+static gint hf_simple_status_word_count;
+static gint hf_simple_status_name;
+static gint hf_simple_status_time_hours;
+static gint hf_simple_status_node_id;
+static gint hf_simple_status_time_seconds;
+static gint hf_simple_status_time_minutes;
+static gint hf_simple_status_security_level;
+static gint hf_simple_status_node_entry_flag;
+static gint hf_simple_status_relay_hop;
+static gint hf_simple_status_dx_flag_system_messages;
+static gint hf_simple_status_dx_flag_common_tims_bims;
+static gint hf_simple_status_dx_flag_common_toms_boms;
+static gint hf_simple_status_dx_flag_simple_receive;
+static gint hf_simple_status_dx_flag_simple_transmit;
+static gint hf_simple_status_dx_flag_all_tims_bims;
+static gint hf_simple_status_dx_flag_all_toms_boms;
+static gint hf_simple_status_dx_file_id;
+static gint hf_simple_status_spare_1;
+static gint hf_simple_status_link16_terminal_type;
+static gint hf_simple_status_link16_role;
+static gint hf_simple_status_link16_sync_status;
+static gint hf_simple_status_link16_terminal_host_status;
+static gint hf_simple_status_link16_stn;
+static gint hf_simple_status_spare_2;
+static gint hf_simple_status_link11_dts_type;
+static gint hf_simple_status_link11_role;
+static gint hf_simple_status_link11_pu;
+static gint hf_simple_status_link11_dts_host_status;
+static gint hf_simple_status_spare_3;
+static gint hf_simple_checksum;
+static gint hf_simple_checksum_status;
+
+static gint ett_simple;
+static gint ett_packet;
+static gint ett_simple_status_dx_flag;
+
+static expert_field ei_simple_sync_bytes_bad;
+static expert_field ei_simple_length_bad;
+static expert_field ei_simple_packet_size_bad;
+static expert_field ei_simple_checksum_bad;
 
 static void dissect_simple_link16(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset)
 {
diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c
index 5d881fd1df..043c824109 100644
--- a/epan/dissectors/packet-simulcrypt.c
+++ b/epan/dissectors/packet-simulcrypt.c
@@ -58,7 +58,7 @@ static void dissect_simulcrypt_data(proto_tree *simulcrypt_tree, proto_item *sim
 				    int container_data_length, guint16 iftype, gboolean is_subtree);
 
 /* Wireshark ID of the SIMULCRYPT protocol */
-static int proto_simulcrypt = -1;
+static int proto_simulcrypt;
 
 /* Dissector handle for SIMULCRYPT protocol */
 static dissector_handle_t simulcrypt_handle;
@@ -576,110 +576,110 @@ static value_string_ext psig_error_values_ext = VALUE_STRING_EXT_INIT(psig_error
 * our header fields; they are filled out when we call
 * proto_register_field_array() in proto_register_simulcrypt()
 */
-static gint hf_simulcrypt_header = -1;
-static gint hf_simulcrypt_version = -1;
-static gint hf_simulcrypt_message_type = -1;
-static gint hf_simulcrypt_interface = -1;
-static gint hf_simulcrypt_message_length = -1;
-static gint hf_simulcrypt_message = -1;
-static gint hf_simulcrypt_parameter = -1;
-static gint hf_simulcrypt_parameter_type = -1;
-static gint hf_simulcrypt_ecmg_parameter_type = -1;
-static gint hf_simulcrypt_emmg_parameter_type = -1;
-static gint hf_simulcrypt_parameter_length = -1;
-static gint hf_simulcrypt_ca_system_id = -1;
-static gint hf_simulcrypt_ca_subsystem_id = -1;
-static gint hf_simulcrypt_super_cas_id = -1;
-static gint hf_simulcrypt_section_tspkt_flag = -1;
-static gint hf_simulcrypt_ecm_channel_id = -1;
-static gint hf_simulcrypt_delay_start = -1;
-static gint hf_simulcrypt_delay_stop = -1;
-static gint hf_simulcrypt_ac_delay_start = -1;
-static gint hf_simulcrypt_ac_delay_stop = -1;
-static gint hf_simulcrypt_transition_delay_start = -1;
-static gint hf_simulcrypt_transition_delay_stop = -1;
-static gint hf_simulcrypt_ecm_rep_period = -1;
-static gint hf_simulcrypt_max_streams = -1;
-static gint hf_simulcrypt_min_cp_duration = -1;
-static gint hf_simulcrypt_lead_cw = -1;
-static gint hf_simulcrypt_cw_per_msg = -1;
-static gint hf_simulcrypt_max_comp_time = -1;
-static gint hf_simulcrypt_access_criteria = -1;
-static gint hf_simulcrypt_ecm_stream_id = -1;
-static gint hf_simulcrypt_nominal_cp_duration = -1;
-static gint hf_simulcrypt_access_criteria_transfer_mode = -1;
-static gint hf_simulcrypt_cp_number = -1;
-static gint hf_simulcrypt_cp_duration = -1;
-static gint hf_simulcrypt_cp_cw_combination = -1;
-static gint hf_simulcrypt_ecm_datagram = -1;
-static gint hf_simulcrypt_cw_encryption = -1;
-static gint hf_simulcrypt_ecm_id = -1;
-static gint hf_simulcrypt_client_id = -1;
-static gint hf_simulcrypt_data_channel_id = -1;
-static gint hf_simulcrypt_data_stream_id = -1;
-static gint hf_simulcrypt_datagram = -1;
-static gint hf_simulcrypt_bandwidth = -1;
-static gint hf_simulcrypt_data_type = -1;
-static gint hf_simulcrypt_data_id = -1;
-static gint hf_simulcrypt_ecmg_error_status = -1;
-static gint hf_simulcrypt_emmg_error_status = -1;
-static gint hf_simulcrypt_error_information = -1;
-
-static gint hf_simulcrypt_eis_parameter_type = -1;
-static gint hf_simulcrypt_eis_channel_id = -1;
-static gint hf_simulcrypt_service_flag = -1;
-static gint hf_simulcrypt_component_flag = -1;
-static gint hf_simulcrypt_max_scg = -1;
-static gint hf_simulcrypt_ecm_group = -1;
-static gint hf_simulcrypt_scg_id = -1;
-static gint hf_simulcrypt_scg_reference_id = -1;
-static gint hf_simulcrypt_activation_time = -1;
-static gint hf_simulcrypt_year = -1;
-static gint hf_simulcrypt_month = -1;
-static gint hf_simulcrypt_day = -1;
-static gint hf_simulcrypt_hour = -1;
-static gint hf_simulcrypt_minute = -1;
-static gint hf_simulcrypt_second = -1;
-static gint hf_simulcrypt_hundredth_second = -1;
-static gint hf_simulcrypt_activation_pending_flag = -1;
-static gint hf_simulcrypt_component_id = -1;
-static gint hf_simulcrypt_service_id = -1;
-static gint hf_simulcrypt_transport_stream_id = -1;
-static gint hf_simulcrypt_ac_changed_flag = -1;
-static gint hf_simulcrypt_scg_current_reference_id = -1;
-static gint hf_simulcrypt_scg_pending_reference_id = -1;
-static gint hf_simulcrypt_cp_duration_flag = -1;
-static gint hf_simulcrypt_recommended_cp_duration = -1;
-static gint hf_simulcrypt_scg_nominal_cp_duration = -1;
-static gint hf_simulcrypt_original_network_id = -1;
-static gint hf_simulcrypt_eis_error_status = -1;
-static gint hf_simulcrypt_error_description = -1;
-
-static gint hf_simulcrypt_psig_parameter_type = -1;
-static gint hf_simulcrypt_psig_type = -1;
-static gint hf_simulcrypt_channel_id = -1;
-static gint hf_simulcrypt_stream_id = -1;
-static gint hf_simulcrypt_packet_id = -1;
-static gint hf_simulcrypt_interface_mode_configuration = -1;
-static gint hf_simulcrypt_max_stream = -1;
-static gint hf_simulcrypt_table_period_pair = -1;
-static gint hf_simulcrypt_mpeg_section = -1;
-static gint hf_simulcrypt_repetition_rate = -1;
-static gint hf_simulcrypt_initial_bandwidth = -1;
-static gint hf_simulcrypt_asi_input_packet_id = -1;
-static gint hf_simulcrypt_psig_error_status = -1;
-static gint hf_simulcrypt_parameter_value = -1;
+static gint hf_simulcrypt_header;
+static gint hf_simulcrypt_version;
+static gint hf_simulcrypt_message_type;
+static gint hf_simulcrypt_interface;
+static gint hf_simulcrypt_message_length;
+static gint hf_simulcrypt_message;
+static gint hf_simulcrypt_parameter;
+static gint hf_simulcrypt_parameter_type;
+static gint hf_simulcrypt_ecmg_parameter_type;
+static gint hf_simulcrypt_emmg_parameter_type;
+static gint hf_simulcrypt_parameter_length;
+static gint hf_simulcrypt_ca_system_id;
+static gint hf_simulcrypt_ca_subsystem_id;
+static gint hf_simulcrypt_super_cas_id;
+static gint hf_simulcrypt_section_tspkt_flag;
+static gint hf_simulcrypt_ecm_channel_id;
+static gint hf_simulcrypt_delay_start;
+static gint hf_simulcrypt_delay_stop;
+static gint hf_simulcrypt_ac_delay_start;
+static gint hf_simulcrypt_ac_delay_stop;
+static gint hf_simulcrypt_transition_delay_start;
+static gint hf_simulcrypt_transition_delay_stop;
+static gint hf_simulcrypt_ecm_rep_period;
+static gint hf_simulcrypt_max_streams;
+static gint hf_simulcrypt_min_cp_duration;
+static gint hf_simulcrypt_lead_cw;
+static gint hf_simulcrypt_cw_per_msg;
+static gint hf_simulcrypt_max_comp_time;
+static gint hf_simulcrypt_access_criteria;
+static gint hf_simulcrypt_ecm_stream_id;
+static gint hf_simulcrypt_nominal_cp_duration;
+static gint hf_simulcrypt_access_criteria_transfer_mode;
+static gint hf_simulcrypt_cp_number;
+static gint hf_simulcrypt_cp_duration;
+static gint hf_simulcrypt_cp_cw_combination;
+static gint hf_simulcrypt_ecm_datagram;
+static gint hf_simulcrypt_cw_encryption;
+static gint hf_simulcrypt_ecm_id;
+static gint hf_simulcrypt_client_id;
+static gint hf_simulcrypt_data_channel_id;
+static gint hf_simulcrypt_data_stream_id;
+static gint hf_simulcrypt_datagram;
+static gint hf_simulcrypt_bandwidth;
+static gint hf_simulcrypt_data_type;
+static gint hf_simulcrypt_data_id;
+static gint hf_simulcrypt_ecmg_error_status;
+static gint hf_simulcrypt_emmg_error_status;
+static gint hf_simulcrypt_error_information;
+
+static gint hf_simulcrypt_eis_parameter_type;
+static gint hf_simulcrypt_eis_channel_id;
+static gint hf_simulcrypt_service_flag;
+static gint hf_simulcrypt_component_flag;
+static gint hf_simulcrypt_max_scg;
+static gint hf_simulcrypt_ecm_group;
+static gint hf_simulcrypt_scg_id;
+static gint hf_simulcrypt_scg_reference_id;
+static gint hf_simulcrypt_activation_time;
+static gint hf_simulcrypt_year;
+static gint hf_simulcrypt_month;
+static gint hf_simulcrypt_day;
+static gint hf_simulcrypt_hour;
+static gint hf_simulcrypt_minute;
+static gint hf_simulcrypt_second;
+static gint hf_simulcrypt_hundredth_second;
+static gint hf_simulcrypt_activation_pending_flag;
+static gint hf_simulcrypt_component_id;
+static gint hf_simulcrypt_service_id;
+static gint hf_simulcrypt_transport_stream_id;
+static gint hf_simulcrypt_ac_changed_flag;
+static gint hf_simulcrypt_scg_current_reference_id;
+static gint hf_simulcrypt_scg_pending_reference_id;
+static gint hf_simulcrypt_cp_duration_flag;
+static gint hf_simulcrypt_recommended_cp_duration;
+static gint hf_simulcrypt_scg_nominal_cp_duration;
+static gint hf_simulcrypt_original_network_id;
+static gint hf_simulcrypt_eis_error_status;
+static gint hf_simulcrypt_error_description;
+
+static gint hf_simulcrypt_psig_parameter_type;
+static gint hf_simulcrypt_psig_type;
+static gint hf_simulcrypt_channel_id;
+static gint hf_simulcrypt_stream_id;
+static gint hf_simulcrypt_packet_id;
+static gint hf_simulcrypt_interface_mode_configuration;
+static gint hf_simulcrypt_max_stream;
+static gint hf_simulcrypt_table_period_pair;
+static gint hf_simulcrypt_mpeg_section;
+static gint hf_simulcrypt_repetition_rate;
+static gint hf_simulcrypt_initial_bandwidth;
+static gint hf_simulcrypt_asi_input_packet_id;
+static gint hf_simulcrypt_psig_error_status;
+static gint hf_simulcrypt_parameter_value;
 
 /* These are the ids of the subtrees that we may be creating */
-static gint ett_simulcrypt = -1;
-static gint ett_simulcrypt_header = -1;
-static gint ett_simulcrypt_message = -1;
-static gint ett_simulcrypt_parameter = -1;
-static gint ett_simulcrypt_super_cas_id = -1;
-static gint ett_simulcrypt_ecm_datagram = -1;
-static gint ett_simulcrypt_ecm_group = -1;
-static gint ett_simulcrypt_activation_time = -1;
-static gint ett_simulcrypt_table_period_pair = -1;
+static gint ett_simulcrypt;
+static gint ett_simulcrypt_header;
+static gint ett_simulcrypt_message;
+static gint ett_simulcrypt_parameter;
+static gint ett_simulcrypt_super_cas_id;
+static gint ett_simulcrypt_ecm_datagram;
+static gint ett_simulcrypt_ecm_group;
+static gint ett_simulcrypt_activation_time;
+static gint ett_simulcrypt_table_period_pair;
 
 
 #define FRAME_HEADER_LEN 8
diff --git a/epan/dissectors/packet-sinecap.c b/epan/dissectors/packet-sinecap.c
index 4bdc85f675..a5510ed5cb 100644
--- a/epan/dissectors/packet-sinecap.c
+++ b/epan/dissectors/packet-sinecap.c
@@ -20,28 +20,28 @@
 #define TXP_MIN_TELEGRAM_LENGTH 22
 
 /* Wireshark ID of the AP1 protocol */
-static gint proto_ap = -1;
-
-static gint hf_ap_protoid = -1;
-static gint hf_ap_mpxadr = -1;
-static gint hf_ap_comcls = -1;
-static gint hf_ap_comcod = -1;
-static gint hf_ap_modfr1 = -1;
-static gint hf_ap_modfr2 = -1;
-static gint hf_ap_errcls = -1;
-static gint hf_ap_errcod = -1;
-static gint hf_ap_rosctr = -1;
-static gint hf_ap_sgsqnr = -1;
-static gint hf_ap_tactid = -1;
-static gint hf_ap_tasqnr = -1;
-static gint hf_ap_spare = -1;
-static gint hf_ap_pduref = -1;
-static gint hf_ap_pduid = -1;
-static gint hf_ap_pdulg = -1;
-static gint hf_ap_parlg = -1;
-static gint hf_ap_datlg = -1;
-
-static gint ett_ap = -1;
+static gint proto_ap;
+
+static gint hf_ap_protoid;
+static gint hf_ap_mpxadr;
+static gint hf_ap_comcls;
+static gint hf_ap_comcod;
+static gint hf_ap_modfr1;
+static gint hf_ap_modfr2;
+static gint hf_ap_errcls;
+static gint hf_ap_errcod;
+static gint hf_ap_rosctr;
+static gint hf_ap_sgsqnr;
+static gint hf_ap_tactid;
+static gint hf_ap_tasqnr;
+static gint hf_ap_spare;
+static gint hf_ap_pduref;
+static gint hf_ap_pduid;
+static gint hf_ap_pdulg;
+static gint hf_ap_parlg;
+static gint hf_ap_datlg;
+
+static gint ett_ap;
 
 static heur_dissector_list_t ap_heur_subdissector_list;
 
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 75083656b0..258123ed12 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -74,226 +74,226 @@ static dissector_handle_t sip_via_be_route_handle;
 static dissector_handle_t sip_reason_code_handle;
 
 /* Initialize the protocol and registered fields */
-static gint proto_sip                     = -1;
-static gint proto_raw_sip                 = -1;
-static gint hf_sip_raw_line               = -1;
-static gint hf_sip_msg_hdr                = -1;
-static gint hf_sip_Method                 = -1;
-static gint hf_Request_Line               = -1;
-static gint hf_sip_ruri_display           = -1;
-static gint hf_sip_ruri                   = -1;
-static gint hf_sip_ruri_user              = -1;
-static gint hf_sip_ruri_host              = -1;
-static gint hf_sip_ruri_port              = -1;
-static gint hf_sip_ruri_param             = -1;
-static gint hf_sip_Status_Code            = -1;
-static gint hf_sip_Status_Line            = -1;
-static gint hf_sip_display                = -1;
-static gint hf_sip_to_display             = -1;
-static gint hf_sip_to_addr                = -1;
-static gint hf_sip_to_user                = -1;
-static gint hf_sip_to_host                = -1;
-static gint hf_sip_to_port                = -1;
-static gint hf_sip_to_param               = -1;
-static gint hf_sip_to_tag                 = -1;
-static gint hf_sip_from_display           = -1;
-static gint hf_sip_from_addr              = -1;
-static gint hf_sip_from_user              = -1;
-static gint hf_sip_from_host              = -1;
-static gint hf_sip_from_port              = -1;
-static gint hf_sip_from_param             = -1;
-static gint hf_sip_from_tag               = -1;
-static gint hf_sip_tag                    = -1;
-static gint hf_sip_pai_display            = -1;
-static gint hf_sip_pai_addr               = -1;
-static gint hf_sip_pai_user               = -1;
-static gint hf_sip_pai_host               = -1;
-static gint hf_sip_pai_port               = -1;
-static gint hf_sip_pai_param              = -1;
-static gint hf_sip_pmiss_display          = -1;
-static gint hf_sip_pmiss_addr             = -1;
-static gint hf_sip_pmiss_user             = -1;
-static gint hf_sip_pmiss_host             = -1;
-static gint hf_sip_pmiss_port             = -1;
-static gint hf_sip_pmiss_param            = -1;
-static gint hf_sip_ppi_display            = -1;
-static gint hf_sip_ppi_addr               = -1;
-static gint hf_sip_ppi_user               = -1;
-static gint hf_sip_ppi_host               = -1;
-static gint hf_sip_ppi_port               = -1;
-static gint hf_sip_ppi_param              = -1;
-static gint hf_sip_tc_display             = -1;
-static gint hf_sip_tc_addr                = -1;
-static gint hf_sip_tc_user                = -1;
-static gint hf_sip_tc_host                = -1;
-static gint hf_sip_tc_port                = -1;
-static gint hf_sip_tc_param               = -1;
-static gint hf_sip_tc_turi                = -1;
-static gint hf_sip_contact_param          = -1;
-static gint hf_sip_resend                 = -1;
-static gint hf_sip_original_frame         = -1;
-static gint hf_sip_matching_request_frame = -1;
-static gint hf_sip_response_time          = -1;
-static gint hf_sip_release_time           = -1;
-static gint hf_sip_curi_display           = -1;
-static gint hf_sip_curi                   = -1;
-static gint hf_sip_curi_user              = -1;
-static gint hf_sip_curi_host              = -1;
-static gint hf_sip_curi_port              = -1;
-static gint hf_sip_curi_param             = -1;
-static gint hf_sip_route_display          = -1;
-static gint hf_sip_route                  = -1;
-static gint hf_sip_route_user             = -1;
-static gint hf_sip_route_host             = -1;
-static gint hf_sip_route_port             = -1;
-static gint hf_sip_route_param            = -1;
-static gint hf_sip_record_route_display   = -1;
-static gint hf_sip_record_route           = -1;
-static gint hf_sip_record_route_user      = -1;
-static gint hf_sip_record_route_host      = -1;
-static gint hf_sip_record_route_port      = -1;
-static gint hf_sip_record_route_param     = -1;
-static gint hf_sip_service_route_display  = -1;
-static gint hf_sip_service_route          = -1;
-static gint hf_sip_service_route_user     = -1;
-static gint hf_sip_service_route_host     = -1;
-static gint hf_sip_service_route_port     = -1;
-static gint hf_sip_service_route_param    = -1;
-static gint hf_sip_path_display           = -1;
-static gint hf_sip_path                   = -1;
-static gint hf_sip_path_user              = -1;
-static gint hf_sip_path_host              = -1;
-static gint hf_sip_path_port              = -1;
-static gint hf_sip_path_param             = -1;
-
-static gint hf_sip_auth                   = -1;
-static gint hf_sip_auth_scheme            = -1;
-static gint hf_sip_auth_digest_response   = -1;
-static gint hf_sip_auth_nc                = -1;
-static gint hf_sip_auth_username          = -1;
-static gint hf_sip_auth_realm             = -1;
-static gint hf_sip_auth_nonce             = -1;
-static gint hf_sip_auth_algorithm         = -1;
-static gint hf_sip_auth_opaque            = -1;
-static gint hf_sip_auth_qop               = -1;
-static gint hf_sip_auth_cnonce            = -1;
-static gint hf_sip_auth_uri               = -1;
-static gint hf_sip_auth_domain            = -1;
-static gint hf_sip_auth_stale             = -1;
-static gint hf_sip_auth_auts              = -1;
-static gint hf_sip_auth_rspauth           = -1;
-static gint hf_sip_auth_nextnonce         = -1;
-static gint hf_sip_auth_ik                = -1;
-static gint hf_sip_auth_ck                = -1;
-
-static gint hf_sip_cseq_seq_no            = -1;
-static gint hf_sip_cseq_method            = -1;
-
-static gint hf_sip_via_transport          = -1;
-static gint hf_sip_via_sent_by_address    = -1;
-static gint hf_sip_via_sent_by_port       = -1;
-static gint hf_sip_via_branch             = -1;
-static gint hf_sip_via_maddr              = -1;
-static gint hf_sip_via_rport              = -1;
-static gint hf_sip_via_received           = -1;
-static gint hf_sip_via_ttl                = -1;
-static gint hf_sip_via_comp               = -1;
-static gint hf_sip_via_sigcomp_id         = -1;
-static gint hf_sip_via_oc                 = -1;
-static gint hf_sip_via_oc_val             = -1;
-static gint hf_sip_via_oc_algo            = -1;
-static gint hf_sip_via_oc_validity        = -1;
-static gint hf_sip_via_oc_seq             = -1;
-static gint hf_sip_oc_seq_timestamp       = -1;
-static gint hf_sip_via_be_route           = -1;
-
-static gint hf_sip_rack_rseq_no           = -1;
-static gint hf_sip_rack_cseq_no           = -1;
-static gint hf_sip_rack_cseq_method       = -1;
-
-static gint hf_sip_reason_protocols       = -1;
-static gint hf_sip_reason_cause_q850      = -1;
-static gint hf_sip_reason_cause_sip       = -1;
-static gint hf_sip_reason_cause_other     = -1;
-static gint hf_sip_reason_text            = -1;
-
-static gint hf_sip_msg_body               = -1;
-static gint hf_sip_sec_mechanism          = -1;
-static gint hf_sip_sec_mechanism_alg      = -1;
-static gint hf_sip_sec_mechanism_ealg     = -1;
-static gint hf_sip_sec_mechanism_prot     = -1;
-static gint hf_sip_sec_mechanism_spi_c    = -1;
-static gint hf_sip_sec_mechanism_spi_s    = -1;
-static gint hf_sip_sec_mechanism_port1    = -1;
-static gint hf_sip_sec_mechanism_port_c   = -1;
-static gint hf_sip_sec_mechanism_port2    = -1;
-static gint hf_sip_sec_mechanism_port_s   = -1;
-static gint hf_sip_session_id_sess_id     = -1;
-static gint hf_sip_session_id_param       = -1;
-static gint hf_sip_session_id_local_uuid  = -1;
-static gint hf_sip_session_id_remote_uuid = -1;
-static gint hf_sip_session_id_logme       = -1;
-static gint hf_sip_continuation           = -1;
-static gint hf_sip_feature_cap            = -1;
-
-static gint hf_sip_p_acc_net_i_acc_type   = -1;
-static gint hf_sip_p_acc_net_i_ucid_3gpp  = -1;
-
-static gint hf_sip_service_priority = -1;
-static gint hf_sip_icid_value = -1;
-static gint hf_sip_icid_gen_addr = -1;
-static gint hf_sip_call_id_gen = -1;
+static gint proto_sip;
+static gint proto_raw_sip;
+static gint hf_sip_raw_line;
+static gint hf_sip_msg_hdr;
+static gint hf_sip_Method;
+static gint hf_Request_Line;
+static gint hf_sip_ruri_display;
+static gint hf_sip_ruri;
+static gint hf_sip_ruri_user;
+static gint hf_sip_ruri_host;
+static gint hf_sip_ruri_port;
+static gint hf_sip_ruri_param;
+static gint hf_sip_Status_Code;
+static gint hf_sip_Status_Line;
+static gint hf_sip_display;
+static gint hf_sip_to_display;
+static gint hf_sip_to_addr;
+static gint hf_sip_to_user;
+static gint hf_sip_to_host;
+static gint hf_sip_to_port;
+static gint hf_sip_to_param;
+static gint hf_sip_to_tag;
+static gint hf_sip_from_display;
+static gint hf_sip_from_addr;
+static gint hf_sip_from_user;
+static gint hf_sip_from_host;
+static gint hf_sip_from_port;
+static gint hf_sip_from_param;
+static gint hf_sip_from_tag;
+static gint hf_sip_tag;
+static gint hf_sip_pai_display;
+static gint hf_sip_pai_addr;
+static gint hf_sip_pai_user;
+static gint hf_sip_pai_host;
+static gint hf_sip_pai_port;
+static gint hf_sip_pai_param;
+static gint hf_sip_pmiss_display;
+static gint hf_sip_pmiss_addr;
+static gint hf_sip_pmiss_user;
+static gint hf_sip_pmiss_host;
+static gint hf_sip_pmiss_port;
+static gint hf_sip_pmiss_param;
+static gint hf_sip_ppi_display;
+static gint hf_sip_ppi_addr;
+static gint hf_sip_ppi_user;
+static gint hf_sip_ppi_host;
+static gint hf_sip_ppi_port;
+static gint hf_sip_ppi_param;
+static gint hf_sip_tc_display;
+static gint hf_sip_tc_addr;
+static gint hf_sip_tc_user;
+static gint hf_sip_tc_host;
+static gint hf_sip_tc_port;
+static gint hf_sip_tc_param;
+static gint hf_sip_tc_turi;
+static gint hf_sip_contact_param;
+static gint hf_sip_resend;
+static gint hf_sip_original_frame;
+static gint hf_sip_matching_request_frame;
+static gint hf_sip_response_time;
+static gint hf_sip_release_time;
+static gint hf_sip_curi_display;
+static gint hf_sip_curi;
+static gint hf_sip_curi_user;
+static gint hf_sip_curi_host;
+static gint hf_sip_curi_port;
+static gint hf_sip_curi_param;
+static gint hf_sip_route_display;
+static gint hf_sip_route;
+static gint hf_sip_route_user;
+static gint hf_sip_route_host;
+static gint hf_sip_route_port;
+static gint hf_sip_route_param;
+static gint hf_sip_record_route_display;
+static gint hf_sip_record_route;
+static gint hf_sip_record_route_user;
+static gint hf_sip_record_route_host;
+static gint hf_sip_record_route_port;
+static gint hf_sip_record_route_param;
+static gint hf_sip_service_route_display;
+static gint hf_sip_service_route;
+static gint hf_sip_service_route_user;
+static gint hf_sip_service_route_host;
+static gint hf_sip_service_route_port;
+static gint hf_sip_service_route_param;
+static gint hf_sip_path_display;
+static gint hf_sip_path;
+static gint hf_sip_path_user;
+static gint hf_sip_path_host;
+static gint hf_sip_path_port;
+static gint hf_sip_path_param;
+
+static gint hf_sip_auth;
+static gint hf_sip_auth_scheme;
+static gint hf_sip_auth_digest_response;
+static gint hf_sip_auth_nc;
+static gint hf_sip_auth_username;
+static gint hf_sip_auth_realm;
+static gint hf_sip_auth_nonce;
+static gint hf_sip_auth_algorithm;
+static gint hf_sip_auth_opaque;
+static gint hf_sip_auth_qop;
+static gint hf_sip_auth_cnonce;
+static gint hf_sip_auth_uri;
+static gint hf_sip_auth_domain;
+static gint hf_sip_auth_stale;
+static gint hf_sip_auth_auts;
+static gint hf_sip_auth_rspauth;
+static gint hf_sip_auth_nextnonce;
+static gint hf_sip_auth_ik;
+static gint hf_sip_auth_ck;
+
+static gint hf_sip_cseq_seq_no;
+static gint hf_sip_cseq_method;
+
+static gint hf_sip_via_transport;
+static gint hf_sip_via_sent_by_address;
+static gint hf_sip_via_sent_by_port;
+static gint hf_sip_via_branch;
+static gint hf_sip_via_maddr;
+static gint hf_sip_via_rport;
+static gint hf_sip_via_received;
+static gint hf_sip_via_ttl;
+static gint hf_sip_via_comp;
+static gint hf_sip_via_sigcomp_id;
+static gint hf_sip_via_oc;
+static gint hf_sip_via_oc_val;
+static gint hf_sip_via_oc_algo;
+static gint hf_sip_via_oc_validity;
+static gint hf_sip_via_oc_seq;
+static gint hf_sip_oc_seq_timestamp;
+static gint hf_sip_via_be_route;
+
+static gint hf_sip_rack_rseq_no;
+static gint hf_sip_rack_cseq_no;
+static gint hf_sip_rack_cseq_method;
+
+static gint hf_sip_reason_protocols;
+static gint hf_sip_reason_cause_q850;
+static gint hf_sip_reason_cause_sip;
+static gint hf_sip_reason_cause_other;
+static gint hf_sip_reason_text;
+
+static gint hf_sip_msg_body;
+static gint hf_sip_sec_mechanism;
+static gint hf_sip_sec_mechanism_alg;
+static gint hf_sip_sec_mechanism_ealg;
+static gint hf_sip_sec_mechanism_prot;
+static gint hf_sip_sec_mechanism_spi_c;
+static gint hf_sip_sec_mechanism_spi_s;
+static gint hf_sip_sec_mechanism_port1;
+static gint hf_sip_sec_mechanism_port_c;
+static gint hf_sip_sec_mechanism_port2;
+static gint hf_sip_sec_mechanism_port_s;
+static gint hf_sip_session_id_sess_id;
+static gint hf_sip_session_id_param;
+static gint hf_sip_session_id_local_uuid;
+static gint hf_sip_session_id_remote_uuid;
+static gint hf_sip_session_id_logme;
+static gint hf_sip_continuation;
+static gint hf_sip_feature_cap;
+
+static gint hf_sip_p_acc_net_i_acc_type;
+static gint hf_sip_p_acc_net_i_ucid_3gpp;
+
+static gint hf_sip_service_priority;
+static gint hf_sip_icid_value;
+static gint hf_sip_icid_gen_addr;
+static gint hf_sip_call_id_gen;
 
 /* Initialize the subtree pointers */
-static gint ett_sip                       = -1;
-static gint ett_sip_reqresp               = -1;
-static gint ett_sip_hdr                   = -1;
-static gint ett_sip_ext_hdr               = -1;
-static gint ett_raw_text                  = -1;
-static gint ett_sip_element               = -1;
-static gint ett_sip_hist                  = -1;
-static gint ett_sip_uri                   = -1;
-static gint ett_sip_contact_item          = -1;
-static gint ett_sip_message_body          = -1;
-static gint ett_sip_cseq                  = -1;
-static gint ett_sip_via                   = -1;
-static gint ett_sip_reason                = -1;
-static gint ett_sip_security_client       = -1;
-static gint ett_sip_security_server       = -1;
-static gint ett_sip_security_verify       = -1;
-static gint ett_sip_rack                  = -1;
-static gint ett_sip_route                 = -1;
-static gint ett_sip_record_route          = -1;
-static gint ett_sip_service_route         = -1;
-static gint ett_sip_path                  = -1;
-static gint ett_sip_ruri                  = -1;
-static gint ett_sip_to_uri                = -1;
-static gint ett_sip_curi                  = -1;
-static gint ett_sip_from_uri              = -1;
-static gint ett_sip_pai_uri               = -1;
-static gint ett_sip_pmiss_uri             = -1;
-static gint ett_sip_ppi_uri               = -1;
-static gint ett_sip_tc_uri                = -1;
-static gint ett_sip_session_id            = -1;
-static gint ett_sip_p_access_net_info     = -1;
-static gint ett_sip_p_charging_vector     = -1;
-static gint ett_sip_feature_caps          = -1;
-static gint ett_sip_via_be_route          = -1;
-
-static expert_field ei_sip_unrecognized_header = EI_INIT;
-static expert_field ei_sip_header_no_colon = EI_INIT;
-static expert_field ei_sip_header_not_terminated = EI_INIT;
+static gint ett_sip;
+static gint ett_sip_reqresp;
+static gint ett_sip_hdr;
+static gint ett_sip_ext_hdr;
+static gint ett_raw_text;
+static gint ett_sip_element;
+static gint ett_sip_hist;
+static gint ett_sip_uri;
+static gint ett_sip_contact_item;
+static gint ett_sip_message_body;
+static gint ett_sip_cseq;
+static gint ett_sip_via;
+static gint ett_sip_reason;
+static gint ett_sip_security_client;
+static gint ett_sip_security_server;
+static gint ett_sip_security_verify;
+static gint ett_sip_rack;
+static gint ett_sip_route;
+static gint ett_sip_record_route;
+static gint ett_sip_service_route;
+static gint ett_sip_path;
+static gint ett_sip_ruri;
+static gint ett_sip_to_uri;
+static gint ett_sip_curi;
+static gint ett_sip_from_uri;
+static gint ett_sip_pai_uri;
+static gint ett_sip_pmiss_uri;
+static gint ett_sip_ppi_uri;
+static gint ett_sip_tc_uri;
+static gint ett_sip_session_id;
+static gint ett_sip_p_access_net_info;
+static gint ett_sip_p_charging_vector;
+static gint ett_sip_feature_caps;
+static gint ett_sip_via_be_route;
+
+static expert_field ei_sip_unrecognized_header;
+static expert_field ei_sip_header_no_colon;
+static expert_field ei_sip_header_not_terminated;
 #if 0
-static expert_field ei_sip_odd_register_response = EI_INIT;
+static expert_field ei_sip_odd_register_response;
 #endif
-static expert_field ei_sip_call_id_invalid = EI_INIT;
-static expert_field ei_sip_sipsec_malformed = EI_INIT;
-static expert_field ei_sip_via_sent_by_port = EI_INIT;
-static expert_field ei_sip_content_length_invalid = EI_INIT;
-static expert_field ei_sip_retry_after_invalid = EI_INIT;
-static expert_field ei_sip_Status_Code_invalid = EI_INIT;
-static expert_field ei_sip_authorization_invalid = EI_INIT;
-static expert_field ei_sip_session_id_sess_id = EI_INIT;
+static expert_field ei_sip_call_id_invalid;
+static expert_field ei_sip_sipsec_malformed;
+static expert_field ei_sip_via_sent_by_port;
+static expert_field ei_sip_content_length_invalid;
+static expert_field ei_sip_retry_after_invalid;
+static expert_field ei_sip_Status_Code_invalid;
+static expert_field ei_sip_authorization_invalid;
+static expert_field ei_sip_session_id_sess_id;
 
 /* patterns used for tvb_ws_mempbrk_pattern_guint8 */
 static ws_mempbrk_pattern pbrk_comma_semi;
diff --git a/epan/dissectors/packet-sipfrag.c b/epan/dissectors/packet-sipfrag.c
index 2e5f39180d..5f0720fc1c 100644
--- a/epan/dissectors/packet-sipfrag.c
+++ b/epan/dissectors/packet-sipfrag.c
@@ -21,11 +21,11 @@
 void proto_register_sipfrag(void);
 
 /* Initialize the protocol and registered fields. */
-static int proto_sipfrag = -1;
-static int hf_sipfrag_line = -1;
+static int proto_sipfrag;
+static int hf_sipfrag_line;
 
 /* Protocol subtree. */
-static int ett_sipfrag = -1;
+static int ett_sipfrag;
 
 void proto_reg_handoff_sipfrag(void);
 
diff --git a/epan/dissectors/packet-sita.c b/epan/dissectors/packet-sita.c
index fabe8fa8e6..16b8aa307e 100644
--- a/epan/dissectors/packet-sita.c
+++ b/epan/dissectors/packet-sita.c
@@ -22,38 +22,38 @@ void proto_register_sita(void);
 void proto_reg_handoff_sita(void);
 
 static dissector_table_t    sita_dissector_table;
-static gint                 ett_sita            = -1;
-static gint                 ett_sita_flags      = -1;
-static gint                 ett_sita_signals    = -1;
-static gint                 ett_sita_errors1    = -1;
-static gint                 ett_sita_errors2    = -1;
-static int                  proto_sita          = -1;       /* Initialize the protocol and registered fields */
-static int                  hf_dir              = -1;
-static int                  hf_framing          = -1;
-static int                  hf_parity           = -1;
-static int                  hf_collision        = -1;
-static int                  hf_longframe        = -1;
-static int                  hf_shortframe       = -1;
-static int                  hf_droppedframe     = -1;
-static int                  hf_nonaligned       = -1;
-static int                  hf_abort            = -1;
-static int                  hf_lostcd           = -1;
-static int                  hf_lostcts          = -1;
-static int                  hf_rxdpll           = -1;
-static int                  hf_overrun          = -1;
-static int                  hf_length           = -1;
-static int                  hf_crc              = -1;
-static int                  hf_break            = -1;
-static int                  hf_underrun         = -1;
-static int                  hf_uarterror        = -1;
-static int                  hf_rtxlimit         = -1;
-static int                  hf_proto            = -1;
-static int                  hf_dsr              = -1;
-static int                  hf_dtr              = -1;
-static int                  hf_cts              = -1;
-static int                  hf_rts              = -1;
-static int                  hf_dcd              = -1;
-static int                  hf_signals          = -1;
+static gint                 ett_sita;
+static gint                 ett_sita_flags;
+static gint                 ett_sita_signals;
+static gint                 ett_sita_errors1;
+static gint                 ett_sita_errors2;
+static int                  proto_sita;       /* Initialize the protocol and registered fields */
+static int                  hf_dir;
+static int                  hf_framing;
+static int                  hf_parity;
+static int                  hf_collision;
+static int                  hf_longframe;
+static int                  hf_shortframe;
+static int                  hf_droppedframe;
+static int                  hf_nonaligned;
+static int                  hf_abort;
+static int                  hf_lostcd;
+static int                  hf_lostcts;
+static int                  hf_rxdpll;
+static int                  hf_overrun;
+static int                  hf_length;
+static int                  hf_crc;
+static int                  hf_break;
+static int                  hf_underrun;
+static int                  hf_uarterror;
+static int                  hf_rtxlimit;
+static int                  hf_proto;
+static int                  hf_dsr;
+static int                  hf_dtr;
+static int                  hf_cts;
+static int                  hf_rts;
+static int                  hf_dcd;
+static int                  hf_signals;
 
 static dissector_handle_t  sita_handle;
 
diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c
index 174d826d8d..8c9def0e18 100644
--- a/epan/dissectors/packet-skinny.c
+++ b/epan/dissectors/packet-skinny.c
@@ -1743,469 +1743,469 @@ static value_string_ext RecordingStatus_ext = VALUE_STRING_EXT_INIT(RecordingSta
 
 
 /* Staticly Declared Variables */
-static int proto_skinny                 = -1;
-static int hf_skinny_messageId          = -1;
-static int hf_skinny_data_length        = -1;
-static int hf_skinny_hdr_version        = -1;
-static int hf_skinny_xmlData            = -1;
-static int hf_skinny_ipv4or6            = -1;
-static int hf_skinny_response_in        = -1;
-static int hf_skinny_response_to        = -1;
-static int hf_skinny_response_time      = -1;
-
-static int hf_skinny_AlternateCallingParty = -1;
-static int hf_skinny_CallingPartyName = -1;
-static int hf_skinny_CallingPartyNumber = -1;
-static int hf_skinny_DSCPValue = -1;
-static int hf_skinny_DeviceName = -1;
-static int hf_skinny_FutureUse1 = -1;
-static int hf_skinny_FutureUse2 = -1;
-static int hf_skinny_FutureUse3 = -1;
-static int hf_skinny_Generic_Bitfield_Bit1 = -1;
-static int hf_skinny_Generic_Bitfield_Bit10 = -1;
-static int hf_skinny_Generic_Bitfield_Bit11 = -1;
-static int hf_skinny_Generic_Bitfield_Bit12 = -1;
-static int hf_skinny_Generic_Bitfield_Bit13 = -1;
-static int hf_skinny_Generic_Bitfield_Bit14 = -1;
-static int hf_skinny_Generic_Bitfield_Bit15 = -1;
-static int hf_skinny_Generic_Bitfield_Bit16 = -1;
-static int hf_skinny_Generic_Bitfield_Bit17 = -1;
-static int hf_skinny_Generic_Bitfield_Bit18 = -1;
-static int hf_skinny_Generic_Bitfield_Bit19 = -1;
-static int hf_skinny_Generic_Bitfield_Bit2 = -1;
-static int hf_skinny_Generic_Bitfield_Bit20 = -1;
-static int hf_skinny_Generic_Bitfield_Bit21 = -1;
-static int hf_skinny_Generic_Bitfield_Bit22 = -1;
-static int hf_skinny_Generic_Bitfield_Bit23 = -1;
-static int hf_skinny_Generic_Bitfield_Bit24 = -1;
-static int hf_skinny_Generic_Bitfield_Bit25 = -1;
-static int hf_skinny_Generic_Bitfield_Bit26 = -1;
-static int hf_skinny_Generic_Bitfield_Bit27 = -1;
-static int hf_skinny_Generic_Bitfield_Bit28 = -1;
-static int hf_skinny_Generic_Bitfield_Bit29 = -1;
-static int hf_skinny_Generic_Bitfield_Bit3 = -1;
-static int hf_skinny_Generic_Bitfield_Bit30 = -1;
-static int hf_skinny_Generic_Bitfield_Bit31 = -1;
-static int hf_skinny_Generic_Bitfield_Bit32 = -1;
-static int hf_skinny_Generic_Bitfield_Bit4 = -1;
-static int hf_skinny_Generic_Bitfield_Bit5 = -1;
-static int hf_skinny_Generic_Bitfield_Bit6 = -1;
-static int hf_skinny_Generic_Bitfield_Bit7 = -1;
-static int hf_skinny_Generic_Bitfield_Bit8 = -1;
-static int hf_skinny_Generic_Bitfield_Bit9 = -1;
-static int hf_skinny_HuntPilotName = -1;
-static int hf_skinny_HuntPilotNumber = -1;
-static int hf_skinny_MPI = -1;
-static int hf_skinny_OrigDialed = -1;
-static int hf_skinny_PhoneFeatures_Abbreviated_Dial = -1;
-static int hf_skinny_PhoneFeatures_Bit1 = -1;
-static int hf_skinny_PhoneFeatures_Bit11 = -1;
-static int hf_skinny_PhoneFeatures_Bit12 = -1;
-static int hf_skinny_PhoneFeatures_Bit13 = -1;
-static int hf_skinny_PhoneFeatures_Bit14 = -1;
-static int hf_skinny_PhoneFeatures_Bit15 = -1;
-static int hf_skinny_PhoneFeatures_Bit2 = -1;
-static int hf_skinny_PhoneFeatures_Bit3 = -1;
-static int hf_skinny_PhoneFeatures_Bit4 = -1;
-static int hf_skinny_PhoneFeatures_Bit6 = -1;
-static int hf_skinny_PhoneFeatures_Bit7 = -1;
-static int hf_skinny_PhoneFeatures_Bit9 = -1;
-static int hf_skinny_PhoneFeatures_DynamicMessages = -1;
-static int hf_skinny_PhoneFeatures_RFC2833 = -1;
-static int hf_skinny_PhoneFeatures_UTF8 = -1;
-static int hf_skinny_RFC2833PayloadType = -1;
-static int hf_skinny_RTCPPortNumber = -1;
-static int hf_skinny_RedirDialed = -1;
-static int hf_skinny_RestrictInformationType_BitsReserved = -1;
-static int hf_skinny_RestrictInformationType_CalledParty = -1;
-static int hf_skinny_RestrictInformationType_CalledPartyName = -1;
-static int hf_skinny_RestrictInformationType_CalledPartyNumber = -1;
-static int hf_skinny_RestrictInformationType_CallingParty = -1;
-static int hf_skinny_RestrictInformationType_CallingPartyName = -1;
-static int hf_skinny_RestrictInformationType_CallingPartyNumber = -1;
-static int hf_skinny_RestrictInformationType_LastRedirectParty = -1;
-static int hf_skinny_RestrictInformationType_LastRedirectPartyName = -1;
-static int hf_skinny_RestrictInformationType_LastRedirectPartyNumber = -1;
-static int hf_skinny_RestrictInformationType_OriginalCalledParty = -1;
-static int hf_skinny_RestrictInformationType_OriginalCalledPartyName = -1;
-static int hf_skinny_RestrictInformationType_OriginalCalledPartyNumber = -1;
-static int hf_skinny_ServerName = -1;
-static int hf_skinny_SoftKeyMask_SoftKey1 = -1;
-static int hf_skinny_SoftKeyMask_SoftKey10 = -1;
-static int hf_skinny_SoftKeyMask_SoftKey11 = -1;
-static int hf_skinny_SoftKeyMask_SoftKey12 = -1;
-static int hf_skinny_SoftKeyMask_SoftKey13 = -1;
-static int hf_skinny_SoftKeyMask_SoftKey14 = -1;
-static int hf_skinny_SoftKeyMask_SoftKey15 = -1;
-static int hf_skinny_SoftKeyMask_SoftKey16 = -1;
-static int hf_skinny_SoftKeyMask_SoftKey2 = -1;
-static int hf_skinny_SoftKeyMask_SoftKey3 = -1;
-static int hf_skinny_SoftKeyMask_SoftKey4 = -1;
-static int hf_skinny_SoftKeyMask_SoftKey5 = -1;
-static int hf_skinny_SoftKeyMask_SoftKey6 = -1;
-static int hf_skinny_SoftKeyMask_SoftKey7 = -1;
-static int hf_skinny_SoftKeyMask_SoftKey8 = -1;
-static int hf_skinny_SoftKeyMask_SoftKey9 = -1;
-static int hf_skinny_active = -1;
-static int hf_skinny_activeConferenceOnRegistration = -1;
-static int hf_skinny_activeConferences = -1;
-static int hf_skinny_activeForward = -1;
-static int hf_skinny_activeStreams = -1;
-static int hf_skinny_activeStreamsOnRegistration = -1;
-static int hf_skinny_add_participant_result = -1;
-static int hf_skinny_alarmInfo = -1;
-static int hf_skinny_alarmSeverity = -1;
-static int hf_skinny_algorithmID = -1;
-static int hf_skinny_alignmentPadding = -1;
-static int hf_skinny_annAckReq = -1;
-static int hf_skinny_annPlayMode = -1;
-static int hf_skinny_annStatus = -1;
-static int hf_skinny_annexNandWFutureUse = -1;
-static int hf_skinny_appConfID = -1;
-static int hf_skinny_appData = -1;
-static int hf_skinny_appInstanceID = -1;
-static int hf_skinny_appName = -1;
-static int hf_skinny_applicationId = -1;
-static int hf_skinny_areMessagesWaiting = -1;
-static int hf_skinny_associatedStreamId = -1;
-static int hf_skinny_audioCapCount = -1;
-static int hf_skinny_audioLevelAdjustment = -1;
-static int hf_skinny_audit_participant_result = -1;
-static int hf_skinny_averageBitRate = -1;
-static int hf_skinny_bandwidth = -1;
-static int hf_skinny_bitRate = -1;
-static int hf_skinny_bridgeParticipantId = -1;
-static int hf_skinny_burstSize = -1;
-static int hf_skinny_busyTrigger = -1;
-static int hf_skinny_buttonCount = -1;
-static int hf_skinny_buttonDefinition = -1;
-static int hf_skinny_buttonOffset = -1;
-static int hf_skinny_callHistoryDisposition = -1;
-static int hf_skinny_callInstance = -1;
-static int hf_skinny_callReference = -1;
-static int hf_skinny_callSecurityStatus = -1;
-static int hf_skinny_callSelectStat = -1;
-static int hf_skinny_callState = -1;
-static int hf_skinny_callType = -1;
-static int hf_skinny_calledParty = -1;
-static int hf_skinny_calledPartyName = -1;
-static int hf_skinny_callingParty = -1;
-static int hf_skinny_callingPartyName = -1;
-static int hf_skinny_callingPartyNumber = -1;
-static int hf_skinny_capAndVer = -1;
-static int hf_skinny_capCount = -1;
-static int hf_skinny_cause = -1;
-static int hf_skinny_cdpnVoiceMailbox = -1;
-static int hf_skinny_cgpnVoiceMailbox = -1;
-static int hf_skinny_chan0MaxPayload = -1;
-static int hf_skinny_chan2MaxPayload = -1;
-static int hf_skinny_chan2MaxWindow = -1;
-static int hf_skinny_chan3MaxPayload = -1;
-static int hf_skinny_clockConversionCode = -1;
-static int hf_skinny_clockDivisor = -1;
-static int hf_skinny_codecMode = -1;
-static int hf_skinny_codecParam1 = -1;
-static int hf_skinny_codecParam2 = -1;
-static int hf_skinny_command = -1;
-static int hf_skinny_compressionType = -1;
-static int hf_skinny_confServiceNum = -1;
-static int hf_skinny_conferenceId = -1;
-static int hf_skinny_conferenceName = -1;
-static int hf_skinny_configVersionStamp = -1;
-static int hf_skinny_confirmRequired = -1;
-static int hf_skinny_country = -1;
-static int hf_skinny_customMaxBRandCPB = -1;
-static int hf_skinny_customMaxDPB = -1;
-static int hf_skinny_customMaxFS = -1;
-static int hf_skinny_customMaxMBPS = -1;
-static int hf_skinny_customPictureFormatCount = -1;
-static int hf_skinny_data = -1;
-static int hf_skinny_dataCapCount = -1;
-static int hf_skinny_dataCapabilityDirection = -1;
-static int hf_skinny_dataLength = -1;
-static int hf_skinny_dataSize = -1;
-static int hf_skinny_dateTemplate = -1;
-static int hf_skinny_defendingPriority = -1;
-static int hf_skinny_delete_conf_result = -1;
-static int hf_skinny_deviceType = -1;
-static int hf_skinny_dialedNumber = -1;
-static int hf_skinny_direction = -1;
-static int hf_skinny_directoryNum = -1;
-static int hf_skinny_displayPriority = -1;
-static int hf_skinny_dtmfType = -1;
-static int hf_skinny_dynamicPayload = -1;
-static int hf_skinny_ecValue = -1;
-static int hf_skinny_encryptionCapability = -1;
-static int hf_skinny_errorCode = -1;
-static int hf_skinny_failureNodeIpAddr = -1;
-static int hf_skinny_featureCapabilities = -1;
-static int hf_skinny_featureID = -1;
-static int hf_skinny_featureIndex = -1;
-static int hf_skinny_featureStatus = -1;
-static int hf_skinny_featureTextLabel = -1;
-static int hf_skinny_features = -1;
-static int hf_skinny_firmwareLoadName = -1;
-static int hf_skinny_firstGOB = -1;
-static int hf_skinny_firstMB = -1;
-static int hf_skinny_format = -1;
-static int hf_skinny_forwardAllActive = -1;
-static int hf_skinny_forwardAllDirnum = -1;
-static int hf_skinny_forwardBusyActive = -1;
-static int hf_skinny_forwardBusyDirnum = -1;
-static int hf_skinny_forwardNoAnswerActive = -1;
-static int hf_skinny_forwardNoAnswerlDirnum = -1;
-static int hf_skinny_g723BitRate = -1;
-static int hf_skinny_headsetStatus = -1;
-static int hf_skinny_hearingConfPartyMask = -1;
-static int hf_skinny_instance = -1;
-static int hf_skinny_instanceNumber = -1;
-static int hf_skinny_ipAddr_ipv4 = -1;
-static int hf_skinny_ipAddr_ipv6 = -1;
-static int hf_skinny_ipAddressType = -1;
-static int hf_skinny_ipAddressingMode = -1;
-static int hf_skinny_ipV4AddressScope = -1;
-static int hf_skinny_ipV6AddressScope = -1;
-static int hf_skinny_isConferenceCreator = -1;
-static int hf_skinny_isMKIPresent = -1;
-static int hf_skinny_jitter = -1;
-static int hf_skinny_keepAliveInterval = -1;
-static int hf_skinny_key = -1;
-static int hf_skinny_keyDerivationRate = -1;
-static int hf_skinny_keylen = -1;
-static int hf_skinny_kpButton = -1;
-static int hf_skinny_lampMode = -1;
-static int hf_skinny_last = -1;
-static int hf_skinny_lastRedirectingParty = -1;
-static int hf_skinny_lastRedirectingPartyName = -1;
-static int hf_skinny_lastRedirectingReason = -1;
-static int hf_skinny_lastRedirectingVoiceMailbox = -1;
-static int hf_skinny_latency = -1;
-static int hf_skinny_layoutCount = -1;
-static int hf_skinny_layoutID = -1;
-static int hf_skinny_layouts = -1;
-static int hf_skinny_level = -1;
-static int hf_skinny_levelPreferenceCount = -1;
-static int hf_skinny_lineDataEntries = -1;
-static int hf_skinny_lineDirNumber = -1;
-static int hf_skinny_lineDisplayOptions = -1;
-static int hf_skinny_lineFullyQualifiedDisplayName = -1;
-static int hf_skinny_lineInstance = -1;
-static int hf_skinny_lineNumber = -1;
-static int hf_skinny_lineTextLabel = -1;
-static int hf_skinny_locale = -1;
-static int hf_skinny_locationInfo = -1;
-static int hf_skinny_longTermPictureIndex = -1;
-static int hf_skinny_macAddress = -1;
-static int hf_skinny_matrixConfPartyID = -1;
-static int hf_skinny_maxBW = -1;
-static int hf_skinny_maxBitRate = -1;
-static int hf_skinny_maxConferences = -1;
-static int hf_skinny_maxFramesPerPacket = -1;
-static int hf_skinny_maxNumCalls = -1;
-static int hf_skinny_maxNumOfAvailLines = -1;
-static int hf_skinny_maxNumberOfLines = -1;
-static int hf_skinny_maxProtocolVer = -1;
-static int hf_skinny_maxRetryNumber = -1;
-static int hf_skinny_maxStreams = -1;
-static int hf_skinny_maxStreamsPerConf = -1;
-static int hf_skinny_maximumBitRate = -1;
-static int hf_skinny_mediaPathCapabilities = -1;
-static int hf_skinny_mediaPathEvent = -1;
-static int hf_skinny_mediaPathID = -1;
-static int hf_skinny_mediaReceptionStatus = -1;
-static int hf_skinny_mediaTransmissionStatus = -1;
-static int hf_skinny_mediaTransportType = -1;
-static int hf_skinny_mediaType = -1;
-static int hf_skinny_micMode = -1;
-static int hf_skinny_milliSecondPacketSize = -1;
-static int hf_skinny_minBitRate = -1;
-static int hf_skinny_mixingMode = -1;
-static int hf_skinny_modAnd2833 = -1;
-static int hf_skinny_modelNumber = -1;
-static int hf_skinny_modify_conf_result = -1;
-static int hf_skinny_multicastIpAddr_ipv4 = -1;
-static int hf_skinny_multicastIpAddr_ipv6 = -1;
-static int hf_skinny_multicastPortNumber = -1;
-static int hf_skinny_multicastReceptionStatus = -1;
-static int hf_skinny_multimediaReceptionStatus = -1;
-static int hf_skinny_multimediaTransmissionStatus = -1;
-static int hf_skinny_mwiControlNumber = -1;
-static int hf_skinny_mwiTargetNumber = -1;
-static int hf_skinny_mwi_notification_result = -1;
-static int hf_skinny_noaudio = -1;
-static int hf_skinny_none = -1;
-static int hf_skinny_notificationStatus = -1;
-static int hf_skinny_notify = -1;
-static int hf_skinny_nse = -1;
-static int hf_skinny_numNewMsgs = -1;
-static int hf_skinny_numOldMsgs = -1;
-static int hf_skinny_numberOctetsReceived = -1;
-static int hf_skinny_numberOctetsSent = -1;
-static int hf_skinny_numberOfActiveParticipants = -1;
-static int hf_skinny_numberOfEntries = -1;
-static int hf_skinny_numberOfGOBs = -1;
-static int hf_skinny_numberOfInServiceStreams = -1;
-static int hf_skinny_numberOfLines = -1;
-static int hf_skinny_numberOfMBs = -1;
-static int hf_skinny_numberOfOutOfServiceStreams = -1;
-static int hf_skinny_numberOfReservedParticipants = -1;
-static int hf_skinny_numberOfSpeedDials = -1;
-static int hf_skinny_numberPacketsLost = -1;
-static int hf_skinny_numberPacketsReceived = -1;
-static int hf_skinny_numberPacketsSent = -1;
-static int hf_skinny_originalCalledParty = -1;
-static int hf_skinny_originalCalledPartyName = -1;
-static int hf_skinny_originalCdpnRedirectReason = -1;
-static int hf_skinny_originalCdpnVoiceMailbox = -1;
-static int hf_skinny_padding = -1;
-static int hf_skinny_parm1 = -1;
-static int hf_skinny_parm2 = -1;
-static int hf_skinny_participantEntry = -1;
-static int hf_skinny_participantName = -1;
-static int hf_skinny_participantNumber = -1;
-static int hf_skinny_partyDirection = -1;
-static int hf_skinny_passThroughPartyId = -1;
-static int hf_skinny_passThruData = -1;
-static int hf_skinny_passthruPartyID = -1;
-static int hf_skinny_payloadCapability = -1;
-static int hf_skinny_payloadDtmf = -1;
-static int hf_skinny_payloadType = -1;
-static int hf_skinny_payload_rfc_number = -1;
-static int hf_skinny_peakRate = -1;
-static int hf_skinny_pictureFormatCount = -1;
-static int hf_skinny_pictureHeight = -1;
-static int hf_skinny_pictureNumber = -1;
-static int hf_skinny_pictureWidth = -1;
-static int hf_skinny_pixelAspectRatio = -1;
-static int hf_skinny_portHandlingFlag = -1;
-static int hf_skinny_portNumber = -1;
-static int hf_skinny_precedenceDomain = -1;
-static int hf_skinny_precedenceLevel = -1;
-static int hf_skinny_precedenceValue = -1;
-static int hf_skinny_preemptionPriority = -1;
-static int hf_skinny_priority = -1;
-static int hf_skinny_privacy = -1;
-static int hf_skinny_profile = -1;
-static int hf_skinny_promptStatus = -1;
-static int hf_skinny_protocolDependentData = -1;
-static int hf_skinny_protocolVer = -1;
-static int hf_skinny_recording_status = -1;
-static int hf_skinny_recoveryReferencePictureCount = -1;
-static int hf_skinny_remoteIpAddr_ipv4 = -1;
-static int hf_skinny_remoteIpAddr_ipv6 = -1;
-static int hf_skinny_remotePortNumber = -1;
-static int hf_skinny_requestedIpAddrType = -1;
-static int hf_skinny_reserved_for_future_use = -1;
-static int hf_skinny_resetType = -1;
-static int hf_skinny_resourceType = -1;
-static int hf_skinny_result = -1;
-static int hf_skinny_resvStyle = -1;
-static int hf_skinny_retryTimer = -1;
-static int hf_skinny_rfc2833 = -1;
-static int hf_skinny_ringDuration = -1;
-static int hf_skinny_ringMode = -1;
-static int hf_skinny_routingID = -1;
-static int hf_skinny_rsvpErrorCode = -1;
-static int hf_skinny_rsvpErrorFlag = -1;
-static int hf_skinny_rsvpErrorSubCodeVal = -1;
-static int hf_skinny_rtpMediaPort = -1;
-static int hf_skinny_rtpPayloadFormat = -1;
-static int hf_skinny_salt = -1;
-static int hf_skinny_saltlen = -1;
-static int hf_skinny_secondaryKeepAliveInterval = -1;
-static int hf_skinny_sequenceFlag = -1;
-static int hf_skinny_serverName = -1;
-static int hf_skinny_serverTcpListenPort = -1;
-static int hf_skinny_serviceNum = -1;
-static int hf_skinny_serviceNumber = -1;
-static int hf_skinny_serviceResourceCount = -1;
-static int hf_skinny_serviceURL = -1;
-static int hf_skinny_serviceURLDisplayName = -1;
-static int hf_skinny_serviceURLIndex = -1;
-static int hf_skinny_sessionType = -1;
-static int hf_skinny_softKeyCount = -1;
-static int hf_skinny_softKeyEvent = -1;
-static int hf_skinny_softKeyInfoIndex = -1;
-static int hf_skinny_softKeyLabel = -1;
-static int hf_skinny_softKeyOffset = -1;
-static int hf_skinny_softKeySetCount = -1;
-static int hf_skinny_softKeySetIndex = -1;
-static int hf_skinny_softKeySetOffset = -1;
-static int hf_skinny_softKeyTemplateIndex = -1;
-static int hf_skinny_sourceIpAddr_ipv4 = -1;
-static int hf_skinny_sourceIpAddr_ipv6 = -1;
-static int hf_skinny_sourcePortNumber = -1;
-static int hf_skinny_speakerMode = -1;
-static int hf_skinny_speedDialDirNumber = -1;
-static int hf_skinny_speedDialDisplayName = -1;
-static int hf_skinny_speedDialNumber = -1;
-static int hf_skinny_ssValue = -1;
-static int hf_skinny_sse = -1;
-static int hf_skinny_standard = -1;
-static int hf_skinny_startingLineInstance = -1;
-static int hf_skinny_stationIpAddr = -1;
-static int hf_skinny_stationIpAddr_ipv4 = -1;
-static int hf_skinny_stationIpAddr_ipv6 = -1;
-static int hf_skinny_stationIpV6Addr = -1;
-static int hf_skinny_stationIpV6Addr_ipv4 = -1;
-static int hf_skinny_stationIpV6Addr_ipv6 = -1;
-static int hf_skinny_statsProcessingMode = -1;
-static int hf_skinny_status = -1;
-static int hf_skinny_stillImageTransmission = -1;
-static int hf_skinny_stimulus = -1;
-static int hf_skinny_stimulusInstance = -1;
-static int hf_skinny_stimulusStatus = -1;
-static int hf_skinny_streamPassThroughId = -1;
-static int hf_skinny_subAppID = -1;
-static int hf_skinny_subscriptionFeatureID = -1;
-static int hf_skinny_subscriptionID = -1;
-static int hf_skinny_systemTime = -1;
-static int hf_skinny_temporalSpatialTradeOff = -1;
-static int hf_skinny_temporalSpatialTradeOffCapability = -1;
-static int hf_skinny_text = -1;
-static int hf_skinny_timeOutValue = -1;
-static int hf_skinny_timer = -1;
-static int hf_skinny_tone = -1;
-static int hf_skinny_toneAnnouncement = -1;
-static int hf_skinny_tone_output_direction = -1;
-static int hf_skinny_totalButtonCount = -1;
-static int hf_skinny_totalNumOfConfiguredLines = -1;
-static int hf_skinny_totalSoftKeyCount = -1;
-static int hf_skinny_totalSoftKeySetCount = -1;
-static int hf_skinny_transactionId = -1;
-static int hf_skinny_transmitIpAddr_ipv4 = -1;
-static int hf_skinny_transmitIpAddr_ipv6 = -1;
-static int hf_skinny_transmitPreference = -1;
-static int hf_skinny_unRegReasonCode = -1;
-static int hf_skinny_unknown = -1;
-static int hf_skinny_unknown1_0159 = -1;
-static int hf_skinny_unknown2_0159 = -1;
-static int hf_skinny_unknown3_0159 = -1;
-static int hf_skinny_unknownString_0159 = -1;
-static int hf_skinny_userName = -1;
-static int hf_skinny_v150sprt = -1;
-static int hf_skinny_vendor = -1;
-static int hf_skinny_vendorID = -1;
-static int hf_skinny_version = -1;
-static int hf_skinny_versionStr = -1;
-static int hf_skinny_videoCapCount = -1;
-static int hf_skinny_videoCapabilityDirection = -1;
-static int hf_skinny_wDay = -1;
-static int hf_skinny_wDayOfWeek = -1;
-static int hf_skinny_wHour = -1;
-static int hf_skinny_wMilliseconds = -1;
-static int hf_skinny_wMinute = -1;
-static int hf_skinny_wMonth = -1;
-static int hf_skinny_wSecond = -1;
-static int hf_skinny_wYear = -1;
-static int hf_skinny_waitTimeBeforeNextReq = -1;
-static int hf_skinny_xmldata = -1;
+static int proto_skinny;
+static int hf_skinny_messageId;
+static int hf_skinny_data_length;
+static int hf_skinny_hdr_version;
+static int hf_skinny_xmlData;
+static int hf_skinny_ipv4or6;
+static int hf_skinny_response_in;
+static int hf_skinny_response_to;
+static int hf_skinny_response_time;
+
+static int hf_skinny_AlternateCallingParty;
+static int hf_skinny_CallingPartyName;
+static int hf_skinny_CallingPartyNumber;
+static int hf_skinny_DSCPValue;
+static int hf_skinny_DeviceName;
+static int hf_skinny_FutureUse1;
+static int hf_skinny_FutureUse2;
+static int hf_skinny_FutureUse3;
+static int hf_skinny_Generic_Bitfield_Bit1;
+static int hf_skinny_Generic_Bitfield_Bit10;
+static int hf_skinny_Generic_Bitfield_Bit11;
+static int hf_skinny_Generic_Bitfield_Bit12;
+static int hf_skinny_Generic_Bitfield_Bit13;
+static int hf_skinny_Generic_Bitfield_Bit14;
+static int hf_skinny_Generic_Bitfield_Bit15;
+static int hf_skinny_Generic_Bitfield_Bit16;
+static int hf_skinny_Generic_Bitfield_Bit17;
+static int hf_skinny_Generic_Bitfield_Bit18;
+static int hf_skinny_Generic_Bitfield_Bit19;
+static int hf_skinny_Generic_Bitfield_Bit2;
+static int hf_skinny_Generic_Bitfield_Bit20;
+static int hf_skinny_Generic_Bitfield_Bit21;
+static int hf_skinny_Generic_Bitfield_Bit22;
+static int hf_skinny_Generic_Bitfield_Bit23;
+static int hf_skinny_Generic_Bitfield_Bit24;
+static int hf_skinny_Generic_Bitfield_Bit25;
+static int hf_skinny_Generic_Bitfield_Bit26;
+static int hf_skinny_Generic_Bitfield_Bit27;
+static int hf_skinny_Generic_Bitfield_Bit28;
+static int hf_skinny_Generic_Bitfield_Bit29;
+static int hf_skinny_Generic_Bitfield_Bit3;
+static int hf_skinny_Generic_Bitfield_Bit30;
+static int hf_skinny_Generic_Bitfield_Bit31;
+static int hf_skinny_Generic_Bitfield_Bit32;
+static int hf_skinny_Generic_Bitfield_Bit4;
+static int hf_skinny_Generic_Bitfield_Bit5;
+static int hf_skinny_Generic_Bitfield_Bit6;
+static int hf_skinny_Generic_Bitfield_Bit7;
+static int hf_skinny_Generic_Bitfield_Bit8;
+static int hf_skinny_Generic_Bitfield_Bit9;
+static int hf_skinny_HuntPilotName;
+static int hf_skinny_HuntPilotNumber;
+static int hf_skinny_MPI;
+static int hf_skinny_OrigDialed;
+static int hf_skinny_PhoneFeatures_Abbreviated_Dial;
+static int hf_skinny_PhoneFeatures_Bit1;
+static int hf_skinny_PhoneFeatures_Bit11;
+static int hf_skinny_PhoneFeatures_Bit12;
+static int hf_skinny_PhoneFeatures_Bit13;
+static int hf_skinny_PhoneFeatures_Bit14;
+static int hf_skinny_PhoneFeatures_Bit15;
+static int hf_skinny_PhoneFeatures_Bit2;
+static int hf_skinny_PhoneFeatures_Bit3;
+static int hf_skinny_PhoneFeatures_Bit4;
+static int hf_skinny_PhoneFeatures_Bit6;
+static int hf_skinny_PhoneFeatures_Bit7;
+static int hf_skinny_PhoneFeatures_Bit9;
+static int hf_skinny_PhoneFeatures_DynamicMessages;
+static int hf_skinny_PhoneFeatures_RFC2833;
+static int hf_skinny_PhoneFeatures_UTF8;
+static int hf_skinny_RFC2833PayloadType;
+static int hf_skinny_RTCPPortNumber;
+static int hf_skinny_RedirDialed;
+static int hf_skinny_RestrictInformationType_BitsReserved;
+static int hf_skinny_RestrictInformationType_CalledParty;
+static int hf_skinny_RestrictInformationType_CalledPartyName;
+static int hf_skinny_RestrictInformationType_CalledPartyNumber;
+static int hf_skinny_RestrictInformationType_CallingParty;
+static int hf_skinny_RestrictInformationType_CallingPartyName;
+static int hf_skinny_RestrictInformationType_CallingPartyNumber;
+static int hf_skinny_RestrictInformationType_LastRedirectParty;
+static int hf_skinny_RestrictInformationType_LastRedirectPartyName;
+static int hf_skinny_RestrictInformationType_LastRedirectPartyNumber;
+static int hf_skinny_RestrictInformationType_OriginalCalledParty;
+static int hf_skinny_RestrictInformationType_OriginalCalledPartyName;
+static int hf_skinny_RestrictInformationType_OriginalCalledPartyNumber;
+static int hf_skinny_ServerName;
+static int hf_skinny_SoftKeyMask_SoftKey1;
+static int hf_skinny_SoftKeyMask_SoftKey10;
+static int hf_skinny_SoftKeyMask_SoftKey11;
+static int hf_skinny_SoftKeyMask_SoftKey12;
+static int hf_skinny_SoftKeyMask_SoftKey13;
+static int hf_skinny_SoftKeyMask_SoftKey14;
+static int hf_skinny_SoftKeyMask_SoftKey15;
+static int hf_skinny_SoftKeyMask_SoftKey16;
+static int hf_skinny_SoftKeyMask_SoftKey2;
+static int hf_skinny_SoftKeyMask_SoftKey3;
+static int hf_skinny_SoftKeyMask_SoftKey4;
+static int hf_skinny_SoftKeyMask_SoftKey5;
+static int hf_skinny_SoftKeyMask_SoftKey6;
+static int hf_skinny_SoftKeyMask_SoftKey7;
+static int hf_skinny_SoftKeyMask_SoftKey8;
+static int hf_skinny_SoftKeyMask_SoftKey9;
+static int hf_skinny_active;
+static int hf_skinny_activeConferenceOnRegistration;
+static int hf_skinny_activeConferences;
+static int hf_skinny_activeForward;
+static int hf_skinny_activeStreams;
+static int hf_skinny_activeStreamsOnRegistration;
+static int hf_skinny_add_participant_result;
+static int hf_skinny_alarmInfo;
+static int hf_skinny_alarmSeverity;
+static int hf_skinny_algorithmID;
+static int hf_skinny_alignmentPadding;
+static int hf_skinny_annAckReq;
+static int hf_skinny_annPlayMode;
+static int hf_skinny_annStatus;
+static int hf_skinny_annexNandWFutureUse;
+static int hf_skinny_appConfID;
+static int hf_skinny_appData;
+static int hf_skinny_appInstanceID;
+static int hf_skinny_appName;
+static int hf_skinny_applicationId;
+static int hf_skinny_areMessagesWaiting;
+static int hf_skinny_associatedStreamId;
+static int hf_skinny_audioCapCount;
+static int hf_skinny_audioLevelAdjustment;
+static int hf_skinny_audit_participant_result;
+static int hf_skinny_averageBitRate;
+static int hf_skinny_bandwidth;
+static int hf_skinny_bitRate;
+static int hf_skinny_bridgeParticipantId;
+static int hf_skinny_burstSize;
+static int hf_skinny_busyTrigger;
+static int hf_skinny_buttonCount;
+static int hf_skinny_buttonDefinition;
+static int hf_skinny_buttonOffset;
+static int hf_skinny_callHistoryDisposition;
+static int hf_skinny_callInstance;
+static int hf_skinny_callReference;
+static int hf_skinny_callSecurityStatus;
+static int hf_skinny_callSelectStat;
+static int hf_skinny_callState;
+static int hf_skinny_callType;
+static int hf_skinny_calledParty;
+static int hf_skinny_calledPartyName;
+static int hf_skinny_callingParty;
+static int hf_skinny_callingPartyName;
+static int hf_skinny_callingPartyNumber;
+static int hf_skinny_capAndVer;
+static int hf_skinny_capCount;
+static int hf_skinny_cause;
+static int hf_skinny_cdpnVoiceMailbox;
+static int hf_skinny_cgpnVoiceMailbox;
+static int hf_skinny_chan0MaxPayload;
+static int hf_skinny_chan2MaxPayload;
+static int hf_skinny_chan2MaxWindow;
+static int hf_skinny_chan3MaxPayload;
+static int hf_skinny_clockConversionCode;
+static int hf_skinny_clockDivisor;
+static int hf_skinny_codecMode;
+static int hf_skinny_codecParam1;
+static int hf_skinny_codecParam2;
+static int hf_skinny_command;
+static int hf_skinny_compressionType;
+static int hf_skinny_confServiceNum;
+static int hf_skinny_conferenceId;
+static int hf_skinny_conferenceName;
+static int hf_skinny_configVersionStamp;
+static int hf_skinny_confirmRequired;
+static int hf_skinny_country;
+static int hf_skinny_customMaxBRandCPB;
+static int hf_skinny_customMaxDPB;
+static int hf_skinny_customMaxFS;
+static int hf_skinny_customMaxMBPS;
+static int hf_skinny_customPictureFormatCount;
+static int hf_skinny_data;
+static int hf_skinny_dataCapCount;
+static int hf_skinny_dataCapabilityDirection;
+static int hf_skinny_dataLength;
+static int hf_skinny_dataSize;
+static int hf_skinny_dateTemplate;
+static int hf_skinny_defendingPriority;
+static int hf_skinny_delete_conf_result;
+static int hf_skinny_deviceType;
+static int hf_skinny_dialedNumber;
+static int hf_skinny_direction;
+static int hf_skinny_directoryNum;
+static int hf_skinny_displayPriority;
+static int hf_skinny_dtmfType;
+static int hf_skinny_dynamicPayload;
+static int hf_skinny_ecValue;
+static int hf_skinny_encryptionCapability;
+static int hf_skinny_errorCode;
+static int hf_skinny_failureNodeIpAddr;
+static int hf_skinny_featureCapabilities;
+static int hf_skinny_featureID;
+static int hf_skinny_featureIndex;
+static int hf_skinny_featureStatus;
+static int hf_skinny_featureTextLabel;
+static int hf_skinny_features;
+static int hf_skinny_firmwareLoadName;
+static int hf_skinny_firstGOB;
+static int hf_skinny_firstMB;
+static int hf_skinny_format;
+static int hf_skinny_forwardAllActive;
+static int hf_skinny_forwardAllDirnum;
+static int hf_skinny_forwardBusyActive;
+static int hf_skinny_forwardBusyDirnum;
+static int hf_skinny_forwardNoAnswerActive;
+static int hf_skinny_forwardNoAnswerlDirnum;
+static int hf_skinny_g723BitRate;
+static int hf_skinny_headsetStatus;
+static int hf_skinny_hearingConfPartyMask;
+static int hf_skinny_instance;
+static int hf_skinny_instanceNumber;
+static int hf_skinny_ipAddr_ipv4;
+static int hf_skinny_ipAddr_ipv6;
+static int hf_skinny_ipAddressType;
+static int hf_skinny_ipAddressingMode;
+static int hf_skinny_ipV4AddressScope;
+static int hf_skinny_ipV6AddressScope;
+static int hf_skinny_isConferenceCreator;
+static int hf_skinny_isMKIPresent;
+static int hf_skinny_jitter;
+static int hf_skinny_keepAliveInterval;
+static int hf_skinny_key;
+static int hf_skinny_keyDerivationRate;
+static int hf_skinny_keylen;
+static int hf_skinny_kpButton;
+static int hf_skinny_lampMode;
+static int hf_skinny_last;
+static int hf_skinny_lastRedirectingParty;
+static int hf_skinny_lastRedirectingPartyName;
+static int hf_skinny_lastRedirectingReason;
+static int hf_skinny_lastRedirectingVoiceMailbox;
+static int hf_skinny_latency;
+static int hf_skinny_layoutCount;
+static int hf_skinny_layoutID;
+static int hf_skinny_layouts;
+static int hf_skinny_level;
+static int hf_skinny_levelPreferenceCount;
+static int hf_skinny_lineDataEntries;
+static int hf_skinny_lineDirNumber;
+static int hf_skinny_lineDisplayOptions;
+static int hf_skinny_lineFullyQualifiedDisplayName;
+static int hf_skinny_lineInstance;
+static int hf_skinny_lineNumber;
+static int hf_skinny_lineTextLabel;
+static int hf_skinny_locale;
+static int hf_skinny_locationInfo;
+static int hf_skinny_longTermPictureIndex;
+static int hf_skinny_macAddress;
+static int hf_skinny_matrixConfPartyID;
+static int hf_skinny_maxBW;
+static int hf_skinny_maxBitRate;
+static int hf_skinny_maxConferences;
+static int hf_skinny_maxFramesPerPacket;
+static int hf_skinny_maxNumCalls;
+static int hf_skinny_maxNumOfAvailLines;
+static int hf_skinny_maxNumberOfLines;
+static int hf_skinny_maxProtocolVer;
+static int hf_skinny_maxRetryNumber;
+static int hf_skinny_maxStreams;
+static int hf_skinny_maxStreamsPerConf;
+static int hf_skinny_maximumBitRate;
+static int hf_skinny_mediaPathCapabilities;
+static int hf_skinny_mediaPathEvent;
+static int hf_skinny_mediaPathID;
+static int hf_skinny_mediaReceptionStatus;
+static int hf_skinny_mediaTransmissionStatus;
+static int hf_skinny_mediaTransportType;
+static int hf_skinny_mediaType;
+static int hf_skinny_micMode;
+static int hf_skinny_milliSecondPacketSize;
+static int hf_skinny_minBitRate;
+static int hf_skinny_mixingMode;
+static int hf_skinny_modAnd2833;
+static int hf_skinny_modelNumber;
+static int hf_skinny_modify_conf_result;
+static int hf_skinny_multicastIpAddr_ipv4;
+static int hf_skinny_multicastIpAddr_ipv6;
+static int hf_skinny_multicastPortNumber;
+static int hf_skinny_multicastReceptionStatus;
+static int hf_skinny_multimediaReceptionStatus;
+static int hf_skinny_multimediaTransmissionStatus;
+static int hf_skinny_mwiControlNumber;
+static int hf_skinny_mwiTargetNumber;
+static int hf_skinny_mwi_notification_result;
+static int hf_skinny_noaudio;
+static int hf_skinny_none;
+static int hf_skinny_notificationStatus;
+static int hf_skinny_notify;
+static int hf_skinny_nse;
+static int hf_skinny_numNewMsgs;
+static int hf_skinny_numOldMsgs;
+static int hf_skinny_numberOctetsReceived;
+static int hf_skinny_numberOctetsSent;
+static int hf_skinny_numberOfActiveParticipants;
+static int hf_skinny_numberOfEntries;
+static int hf_skinny_numberOfGOBs;
+static int hf_skinny_numberOfInServiceStreams;
+static int hf_skinny_numberOfLines;
+static int hf_skinny_numberOfMBs;
+static int hf_skinny_numberOfOutOfServiceStreams;
+static int hf_skinny_numberOfReservedParticipants;
+static int hf_skinny_numberOfSpeedDials;
+static int hf_skinny_numberPacketsLost;
+static int hf_skinny_numberPacketsReceived;
+static int hf_skinny_numberPacketsSent;
+static int hf_skinny_originalCalledParty;
+static int hf_skinny_originalCalledPartyName;
+static int hf_skinny_originalCdpnRedirectReason;
+static int hf_skinny_originalCdpnVoiceMailbox;
+static int hf_skinny_padding;
+static int hf_skinny_parm1;
+static int hf_skinny_parm2;
+static int hf_skinny_participantEntry;
+static int hf_skinny_participantName;
+static int hf_skinny_participantNumber;
+static int hf_skinny_partyDirection;
+static int hf_skinny_passThroughPartyId;
+static int hf_skinny_passThruData;
+static int hf_skinny_passthruPartyID;
+static int hf_skinny_payloadCapability;
+static int hf_skinny_payloadDtmf;
+static int hf_skinny_payloadType;
+static int hf_skinny_payload_rfc_number;
+static int hf_skinny_peakRate;
+static int hf_skinny_pictureFormatCount;
+static int hf_skinny_pictureHeight;
+static int hf_skinny_pictureNumber;
+static int hf_skinny_pictureWidth;
+static int hf_skinny_pixelAspectRatio;
+static int hf_skinny_portHandlingFlag;
+static int hf_skinny_portNumber;
+static int hf_skinny_precedenceDomain;
+static int hf_skinny_precedenceLevel;
+static int hf_skinny_precedenceValue;
+static int hf_skinny_preemptionPriority;
+static int hf_skinny_priority;
+static int hf_skinny_privacy;
+static int hf_skinny_profile;
+static int hf_skinny_promptStatus;
+static int hf_skinny_protocolDependentData;
+static int hf_skinny_protocolVer;
+static int hf_skinny_recording_status;
+static int hf_skinny_recoveryReferencePictureCount;
+static int hf_skinny_remoteIpAddr_ipv4;
+static int hf_skinny_remoteIpAddr_ipv6;
+static int hf_skinny_remotePortNumber;
+static int hf_skinny_requestedIpAddrType;
+static int hf_skinny_reserved_for_future_use;
+static int hf_skinny_resetType;
+static int hf_skinny_resourceType;
+static int hf_skinny_result;
+static int hf_skinny_resvStyle;
+static int hf_skinny_retryTimer;
+static int hf_skinny_rfc2833;
+static int hf_skinny_ringDuration;
+static int hf_skinny_ringMode;
+static int hf_skinny_routingID;
+static int hf_skinny_rsvpErrorCode;
+static int hf_skinny_rsvpErrorFlag;
+static int hf_skinny_rsvpErrorSubCodeVal;
+static int hf_skinny_rtpMediaPort;
+static int hf_skinny_rtpPayloadFormat;
+static int hf_skinny_salt;
+static int hf_skinny_saltlen;
+static int hf_skinny_secondaryKeepAliveInterval;
+static int hf_skinny_sequenceFlag;
+static int hf_skinny_serverName;
+static int hf_skinny_serverTcpListenPort;
+static int hf_skinny_serviceNum;
+static int hf_skinny_serviceNumber;
+static int hf_skinny_serviceResourceCount;
+static int hf_skinny_serviceURL;
+static int hf_skinny_serviceURLDisplayName;
+static int hf_skinny_serviceURLIndex;
+static int hf_skinny_sessionType;
+static int hf_skinny_softKeyCount;
+static int hf_skinny_softKeyEvent;
+static int hf_skinny_softKeyInfoIndex;
+static int hf_skinny_softKeyLabel;
+static int hf_skinny_softKeyOffset;
+static int hf_skinny_softKeySetCount;
+static int hf_skinny_softKeySetIndex;
+static int hf_skinny_softKeySetOffset;
+static int hf_skinny_softKeyTemplateIndex;
+static int hf_skinny_sourceIpAddr_ipv4;
+static int hf_skinny_sourceIpAddr_ipv6;
+static int hf_skinny_sourcePortNumber;
+static int hf_skinny_speakerMode;
+static int hf_skinny_speedDialDirNumber;
+static int hf_skinny_speedDialDisplayName;
+static int hf_skinny_speedDialNumber;
+static int hf_skinny_ssValue;
+static int hf_skinny_sse;
+static int hf_skinny_standard;
+static int hf_skinny_startingLineInstance;
+static int hf_skinny_stationIpAddr;
+static int hf_skinny_stationIpAddr_ipv4;
+static int hf_skinny_stationIpAddr_ipv6;
+static int hf_skinny_stationIpV6Addr;
+static int hf_skinny_stationIpV6Addr_ipv4;
+static int hf_skinny_stationIpV6Addr_ipv6;
+static int hf_skinny_statsProcessingMode;
+static int hf_skinny_status;
+static int hf_skinny_stillImageTransmission;
+static int hf_skinny_stimulus;
+static int hf_skinny_stimulusInstance;
+static int hf_skinny_stimulusStatus;
+static int hf_skinny_streamPassThroughId;
+static int hf_skinny_subAppID;
+static int hf_skinny_subscriptionFeatureID;
+static int hf_skinny_subscriptionID;
+static int hf_skinny_systemTime;
+static int hf_skinny_temporalSpatialTradeOff;
+static int hf_skinny_temporalSpatialTradeOffCapability;
+static int hf_skinny_text;
+static int hf_skinny_timeOutValue;
+static int hf_skinny_timer;
+static int hf_skinny_tone;
+static int hf_skinny_toneAnnouncement;
+static int hf_skinny_tone_output_direction;
+static int hf_skinny_totalButtonCount;
+static int hf_skinny_totalNumOfConfiguredLines;
+static int hf_skinny_totalSoftKeyCount;
+static int hf_skinny_totalSoftKeySetCount;
+static int hf_skinny_transactionId;
+static int hf_skinny_transmitIpAddr_ipv4;
+static int hf_skinny_transmitIpAddr_ipv6;
+static int hf_skinny_transmitPreference;
+static int hf_skinny_unRegReasonCode;
+static int hf_skinny_unknown;
+static int hf_skinny_unknown1_0159;
+static int hf_skinny_unknown2_0159;
+static int hf_skinny_unknown3_0159;
+static int hf_skinny_unknownString_0159;
+static int hf_skinny_userName;
+static int hf_skinny_v150sprt;
+static int hf_skinny_vendor;
+static int hf_skinny_vendorID;
+static int hf_skinny_version;
+static int hf_skinny_versionStr;
+static int hf_skinny_videoCapCount;
+static int hf_skinny_videoCapabilityDirection;
+static int hf_skinny_wDay;
+static int hf_skinny_wDayOfWeek;
+static int hf_skinny_wHour;
+static int hf_skinny_wMilliseconds;
+static int hf_skinny_wMinute;
+static int hf_skinny_wMonth;
+static int hf_skinny_wSecond;
+static int hf_skinny_wYear;
+static int hf_skinny_waitTimeBeforeNextReq;
+static int hf_skinny_xmldata;
 
 static dissector_handle_t xml_handle;
 
 /* Initialize the subtree pointers */
-static int ett_skinny          = -1;
-static int ett_skinny_tree     = -1;
+static int ett_skinny;
+static int ett_skinny_tree;
 
 /* preference globals */
 static gboolean global_skinny_desegment = true;
diff --git a/epan/dissectors/packet-skinny.c.in b/epan/dissectors/packet-skinny.c.in
index 4949748e13..7259f590b6 100644
--- a/epan/dissectors/packet-skinny.c.in
+++ b/epan/dissectors/packet-skinny.c.in
@@ -144,15 +144,15 @@ for enum in skinny.enum:
 /*[[[end]]]*/
 
 /* Staticly Declared Variables */
-static int proto_skinny                 = -1;
-static int hf_skinny_messageId          = -1;
-static int hf_skinny_data_length        = -1;
-static int hf_skinny_hdr_version        = -1;
-static int hf_skinny_xmlData            = -1;
-static int hf_skinny_ipv4or6            = -1;
-static int hf_skinny_response_in        = -1;
-static int hf_skinny_response_to        = -1;
-static int hf_skinny_response_time      = -1;
+static int proto_skinny;
+static int hf_skinny_messageId;
+static int hf_skinny_data_length;
+static int hf_skinny_hdr_version;
+static int hf_skinny_xmlData;
+static int hf_skinny_ipv4or6;
+static int hf_skinny_response_in;
+static int hf_skinny_response_to;
+static int hf_skinny_response_time;
 
 /* [[[cog
 for key in sorted(xml2skinny.fieldsArray.keys()):
@@ -163,8 +163,8 @@ for key in sorted(xml2skinny.fieldsArray.keys()):
 static dissector_handle_t xml_handle;
 
 /* Initialize the subtree pointers */
-static int ett_skinny          = -1;
-static int ett_skinny_tree     = -1;
+static int ett_skinny;
+static int ett_skinny_tree;
 
 /* preference globals */
 static gboolean global_skinny_desegment = true;
diff --git a/epan/dissectors/packet-skype.c b/epan/dissectors/packet-skype.c
index 7acd4f4aa8..a5ab300d6e 100644
--- a/epan/dissectors/packet-skype.c
+++ b/epan/dissectors/packet-skype.c
@@ -45,44 +45,44 @@ typedef struct _skype_udp_conv_info_t {
 } skype_udp_conv_info_t;
 
 /* protocol handles */
-static int proto_skype = -1;
+static int proto_skype;
 
 /* ett handles */
-static int ett_skype = -1;
+static int ett_skype;
 
 #define SKYPE_SOM_UNK_MASK	0xF0
 #define SKYPE_SOM_TYPE_MASK	0x0F
 
 /* hf elements */
 /* Start of Message */
-static int hf_skype_som_id = -1;
-static int hf_skype_som_unk = -1;
-static int hf_skype_som_type = -1;
+static int hf_skype_som_id;
+static int hf_skype_som_unk;
+static int hf_skype_som_type;
 /* Message body */
 /* Unknown_0 */
-static int hf_skype_unknown_0_unk1 = -1;
+static int hf_skype_unknown_0_unk1;
 /* Payload */
-static int hf_skype_payload_iv = -1;
-static int hf_skype_payload_crc = -1;
-static int hf_skype_payload_enc_data = -1;
+static int hf_skype_payload_iv;
+static int hf_skype_payload_crc;
+static int hf_skype_payload_enc_data;
 /* Resend */
-static int hf_skype_ffr_num = -1;
-static int hf_skype_ffr_unk1 = -1;
-static int hf_skype_ffr_iv = -1;
-static int hf_skype_ffr_crc = -1;
-static int hf_skype_ffr_enc_data = -1;
+static int hf_skype_ffr_num;
+static int hf_skype_ffr_unk1;
+static int hf_skype_ffr_iv;
+static int hf_skype_ffr_crc;
+static int hf_skype_ffr_enc_data;
 /* Nat info */
-static int hf_skype_natinfo_srcip = -1;
-static int hf_skype_natinfo_dstip = -1;
+static int hf_skype_natinfo_srcip;
+static int hf_skype_natinfo_dstip;
 /* Nat request */
-static int hf_skype_natrequest_srcip = -1;
-static int hf_skype_natrequest_dstip = -1;
+static int hf_skype_natrequest_srcip;
+static int hf_skype_natrequest_dstip;
 /* Audio */
-static int hf_skype_audio_unk1 = -1;
+static int hf_skype_audio_unk1;
 /* Unknown_f */
-static int hf_skype_unknown_f_unk1 = -1;
+static int hf_skype_unknown_f_unk1;
 /* Unknown packet type */
-static int hf_skype_unknown_packet = -1;
+static int hf_skype_unknown_packet;
 
 
 #define PROTO_SHORT_NAME "SKYPE"
diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c
index 3ef2882e9f..45ebd29dd3 100644
--- a/epan/dissectors/packet-slimp3.c
+++ b/epan/dissectors/packet-slimp3.c
@@ -23,40 +23,40 @@ void proto_reg_handoff_slimp3(void);
 
 static dissector_handle_t slimp3_handle;
 
-static int proto_slimp3 = -1;
-static int hf_slimp3_opcode = -1;
-static int hf_slimp3_control = -1;
-static int hf_slimp3_uptime = -1;
-static int hf_slimp3_code_id = -1;
-static int hf_slimp3_code_bits = -1;
-static int hf_slimp3_infrared_slimp3 = -1;
-static int hf_slimp3_infrared_jvc = -1;
-static int hf_slimp3_infrared = -1;
-static int hf_slimp3_device_id = -1;
-static int hf_slimp3_fw_rev = -1;
-static int hf_slimp3_data_offset = -1;
-static int hf_slimp3_data_command = -1;
-static int hf_slimp3_data_write_pointer = -1;
-static int hf_slimp3_data_sequence = -1;
-static int hf_slimp3_disc_rsp_server_ip = -1;
-static int hf_slimp3_disc_rsp_server_port = -1;
-static int hf_slimp3_data_ack_write_pointer = -1;
-static int hf_slimp3_data_ack_read_pointer = -1;
-static int hf_slimp3_data_ack_sequence = -1;
-static int hf_slimp3_data_req_offset = -1;
+static int proto_slimp3;
+static int hf_slimp3_opcode;
+static int hf_slimp3_control;
+static int hf_slimp3_uptime;
+static int hf_slimp3_code_id;
+static int hf_slimp3_code_bits;
+static int hf_slimp3_infrared_slimp3;
+static int hf_slimp3_infrared_jvc;
+static int hf_slimp3_infrared;
+static int hf_slimp3_device_id;
+static int hf_slimp3_fw_rev;
+static int hf_slimp3_data_offset;
+static int hf_slimp3_data_command;
+static int hf_slimp3_data_write_pointer;
+static int hf_slimp3_data_sequence;
+static int hf_slimp3_disc_rsp_server_ip;
+static int hf_slimp3_disc_rsp_server_port;
+static int hf_slimp3_data_ack_write_pointer;
+static int hf_slimp3_data_ack_read_pointer;
+static int hf_slimp3_data_ack_sequence;
+static int hf_slimp3_data_req_offset;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_slimp3_display_delay = -1;
-static int hf_slimp3_display_string = -1;
-static int hf_slimp3_display_command = -1;
-static int hf_slimp3_display_unknown = -1;
-static int hf_slimp3_hello_response_client_server = -1;
-static int hf_slimp3_hello_request_server_client = -1;
-static int hf_slimp3_i2c_response_client_server = -1;
-static int hf_slimp3_i2c_request_server_client = -1;
-static int hf_slimp3_data_length = -1;
-static int hf_slimp3_data_data = -1;
-
-static gint ett_slimp3 = -1;
+static int hf_slimp3_display_delay;
+static int hf_slimp3_display_string;
+static int hf_slimp3_display_command;
+static int hf_slimp3_display_unknown;
+static int hf_slimp3_hello_response_client_server;
+static int hf_slimp3_hello_request_server_client;
+static int hf_slimp3_i2c_response_client_server;
+static int hf_slimp3_i2c_request_server_client;
+static int hf_slimp3_data_length;
+static int hf_slimp3_data_data;
+
+static gint ett_slimp3;
 
 #define UDP_PORT_SLIMP3_V1    1069 /* Not IANA registered */
 #define UDP_PORT_SLIMP3_V2    3483
diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c
index ea3a314c56..170bceb409 100644
--- a/epan/dissectors/packet-sll.c
+++ b/epan/dissectors/packet-sll.c
@@ -87,20 +87,20 @@ static dissector_handle_t netlink_handle;
 static int proto_sll;
 static int sll_tap = -1;
 
-static int hf_sll_etype = -1;
-static int hf_sll_gretype = -1;
-static int hf_sll_halen = -1;
-static int hf_sll_hatype = -1;
-static int hf_sll_ifindex = -1;
-static int hf_sll_ltype = -1;
-static int hf_sll_pkttype = -1;
-static int hf_sll_src_eth = -1;
-static int hf_sll_src_ipv4 = -1;
-static int hf_sll_src_other = -1;
-static int hf_sll_trailer = -1;
-static int hf_sll_unused = -1;
-
-static gint ett_sll = -1;
+static int hf_sll_etype;
+static int hf_sll_gretype;
+static int hf_sll_halen;
+static int hf_sll_hatype;
+static int hf_sll_ifindex;
+static int hf_sll_ltype;
+static int hf_sll_pkttype;
+static int hf_sll_src_eth;
+static int hf_sll_src_ipv4;
+static int hf_sll_src_other;
+static int hf_sll_trailer;
+static int hf_sll_unused;
+
+static gint ett_sll;
 
 static dissector_table_t sll_hatype_dissector_table;
 static dissector_table_t sll_ltype_dissector_table;
diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c
index c8f8ad7435..740c171562 100644
--- a/epan/dissectors/packet-slowprotocols.c
+++ b/epan/dissectors/packet-slowprotocols.c
@@ -38,13 +38,13 @@ static const value_string subtype_vals[] = {
 };
 
 /* Initialise the protocol and registered fields */
-static int proto_slow = -1;
+static int proto_slow;
 
-static int hf_slow_subtype = -1;
+static int hf_slow_subtype;
 
 /* Initialise the subtree pointers */
 
-static gint ett_slow = -1;
+static gint ett_slow;
 
 /*
  * Name: dissect_slow_protocols
diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c
index 2ee9a9254a..a3808675ca 100644
--- a/epan/dissectors/packet-slsk.c
+++ b/epan/dissectors/packet-slsk.c
@@ -31,105 +31,105 @@ void proto_reg_handoff_slsk(void);
 static dissector_handle_t slsk_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_slsk = -1;
-
-static int hf_slsk_integer = -1;
-static int hf_slsk_string = -1;
-static int hf_slsk_byte = -1;
-static int hf_slsk_message_length = -1;
-static int hf_slsk_message_code = -1;
-static int hf_slsk_embedded_message_type = -1;
-static int hf_slsk_client_ip = -1;
-/* static int hf_slsk_server_ip = -1; */
-static int hf_slsk_directory_name = -1;
-static int hf_slsk_username = -1;
-static int hf_slsk_password = -1;
-static int hf_slsk_version = -1;
-static int hf_slsk_login_successful = -1;
-static int hf_slsk_login_message = -1;
-static int hf_slsk_port = -1;
-static int hf_slsk_ip = -1;
-static int hf_slsk_user_exists = -1;
-static int hf_slsk_status_code = -1;
-static int hf_slsk_room = -1;
-static int hf_slsk_chat_message = -1;
-static int hf_slsk_users_in_room = -1;
-static int hf_slsk_token = -1;
-static int hf_slsk_connection_type = -1;
-static int hf_slsk_chat_message_id = -1;
-static int hf_slsk_timestamp = -1;
-static int hf_slsk_search_text = -1;
-static int hf_slsk_folder_count = -1;
-static int hf_slsk_file_count = -1;
-static int hf_slsk_average_speed = -1;
-static int hf_slsk_download_number = -1;
-static int hf_slsk_files = -1;
-static int hf_slsk_directories = -1;
-static int hf_slsk_slotsfull = -1;
-static int hf_slsk_place_in_queue = -1;
-static int hf_slsk_number_of_rooms = -1;
-static int hf_slsk_filename = -1;
-static int hf_slsk_filename_ext = -1;
-static int hf_slsk_directory = -1;
-static int hf_slsk_size = -1;
-/* static int hf_slsk_checksum = -1; */
-static int hf_slsk_code = -1;
-static int hf_slsk_number_of_users = -1;
-static int hf_slsk_number_of_days = -1;
-static int hf_slsk_transfer_direction = -1;
-static int hf_slsk_user_description = -1;
-static int hf_slsk_picture_exists = -1;
-static int hf_slsk_picture = -1;
-/* static int hf_slsk_user_uploads = -1; */
-static int hf_slsk_total_uploads = -1;
-static int hf_slsk_queued_uploads = -1;
-static int hf_slsk_slots_available = -1;
-static int hf_slsk_allowed = -1;
-static int hf_slsk_compr_packet = -1;
-static int hf_slsk_parent_min_speed = -1;
-static int hf_slsk_parent_speed_connection_ratio = -1;
-static int hf_slsk_seconds_parent_inactivity_before_disconnect = -1;
-static int hf_slsk_seconds_server_inactivity_before_disconnect = -1;
-static int hf_slsk_nodes_in_cache_before_disconnect = -1;
-static int hf_slsk_seconds_before_ping_children = -1;
-static int hf_slsk_recommendation = -1;
-static int hf_slsk_user = -1;
-static int hf_slsk_ranking = -1;
-static int hf_slsk_compressed_packet_length = -1;
-static int hf_slsk_uncompressed_packet_length = -1;
-static int hf_slsk_num_directories = -1;
-static int hf_slsk_upload_speed = -1;
-static int hf_slsk_in_queue = -1;
-static int hf_slsk_num_slotsfull_records = -1;
-static int hf_slsk_num_recommendations = -1;
-static int hf_slsk_num_files = -1;
-static int hf_slsk_num_strings = -1;
-static int hf_slsk_file_code = -1;
-static int hf_slsk_file_size1 = -1;
-static int hf_slsk_file_size2 = -1;
-static int hf_slsk_file_num_attributes = -1;
-static int hf_slsk_file_attribute_type = -1;
-static int hf_slsk_file_attribute_value = -1;
-static int hf_slsk_free_upload_slots = -1;
-static int hf_slsk_bytes = -1;
-static int hf_slsk_same_recommendation = -1;
-static int hf_slsk_number_of_priv_users = -1;
-static int hf_slsk_num_parent_address = -1;
+static int proto_slsk;
+
+static int hf_slsk_integer;
+static int hf_slsk_string;
+static int hf_slsk_byte;
+static int hf_slsk_message_length;
+static int hf_slsk_message_code;
+static int hf_slsk_embedded_message_type;
+static int hf_slsk_client_ip;
+/* static int hf_slsk_server_ip; */
+static int hf_slsk_directory_name;
+static int hf_slsk_username;
+static int hf_slsk_password;
+static int hf_slsk_version;
+static int hf_slsk_login_successful;
+static int hf_slsk_login_message;
+static int hf_slsk_port;
+static int hf_slsk_ip;
+static int hf_slsk_user_exists;
+static int hf_slsk_status_code;
+static int hf_slsk_room;
+static int hf_slsk_chat_message;
+static int hf_slsk_users_in_room;
+static int hf_slsk_token;
+static int hf_slsk_connection_type;
+static int hf_slsk_chat_message_id;
+static int hf_slsk_timestamp;
+static int hf_slsk_search_text;
+static int hf_slsk_folder_count;
+static int hf_slsk_file_count;
+static int hf_slsk_average_speed;
+static int hf_slsk_download_number;
+static int hf_slsk_files;
+static int hf_slsk_directories;
+static int hf_slsk_slotsfull;
+static int hf_slsk_place_in_queue;
+static int hf_slsk_number_of_rooms;
+static int hf_slsk_filename;
+static int hf_slsk_filename_ext;
+static int hf_slsk_directory;
+static int hf_slsk_size;
+/* static int hf_slsk_checksum; */
+static int hf_slsk_code;
+static int hf_slsk_number_of_users;
+static int hf_slsk_number_of_days;
+static int hf_slsk_transfer_direction;
+static int hf_slsk_user_description;
+static int hf_slsk_picture_exists;
+static int hf_slsk_picture;
+/* static int hf_slsk_user_uploads; */
+static int hf_slsk_total_uploads;
+static int hf_slsk_queued_uploads;
+static int hf_slsk_slots_available;
+static int hf_slsk_allowed;
+static int hf_slsk_compr_packet;
+static int hf_slsk_parent_min_speed;
+static int hf_slsk_parent_speed_connection_ratio;
+static int hf_slsk_seconds_parent_inactivity_before_disconnect;
+static int hf_slsk_seconds_server_inactivity_before_disconnect;
+static int hf_slsk_nodes_in_cache_before_disconnect;
+static int hf_slsk_seconds_before_ping_children;
+static int hf_slsk_recommendation;
+static int hf_slsk_user;
+static int hf_slsk_ranking;
+static int hf_slsk_compressed_packet_length;
+static int hf_slsk_uncompressed_packet_length;
+static int hf_slsk_num_directories;
+static int hf_slsk_upload_speed;
+static int hf_slsk_in_queue;
+static int hf_slsk_num_slotsfull_records;
+static int hf_slsk_num_recommendations;
+static int hf_slsk_num_files;
+static int hf_slsk_num_strings;
+static int hf_slsk_file_code;
+static int hf_slsk_file_size1;
+static int hf_slsk_file_size2;
+static int hf_slsk_file_num_attributes;
+static int hf_slsk_file_attribute_type;
+static int hf_slsk_file_attribute_value;
+static int hf_slsk_free_upload_slots;
+static int hf_slsk_bytes;
+static int hf_slsk_same_recommendation;
+static int hf_slsk_number_of_priv_users;
+static int hf_slsk_num_parent_address;
 
 /* Initialize the subtree pointers */
-static gint ett_slsk = -1;
-static gint ett_slsk_compr_packet = -1;
-static gint ett_slsk_directory = -1;
-static gint ett_slsk_file = -1;
-static gint ett_slsk_file_attribute = -1;
-static gint ett_slsk_user = -1;
-static gint ett_slsk_recommendation = -1;
-static gint ett_slsk_room = -1;
-static gint ett_slsk_string = -1;
-
-static expert_field ei_slsk_unknown_data = EI_INIT;
-static expert_field ei_slsk_zlib_decompression_failed = EI_INIT;
-static expert_field ei_slsk_decompression_failed = EI_INIT;
+static gint ett_slsk;
+static gint ett_slsk_compr_packet;
+static gint ett_slsk_directory;
+static gint ett_slsk_file;
+static gint ett_slsk_file_attribute;
+static gint ett_slsk_user;
+static gint ett_slsk_recommendation;
+static gint ett_slsk_room;
+static gint ett_slsk_string;
+
+static expert_field ei_slsk_unknown_data;
+static expert_field ei_slsk_zlib_decompression_failed;
+static expert_field ei_slsk_decompression_failed;
 
 #define SLSK_TCP_PORT_RANGE   "2234,2240,5534"
 
diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c
index 1c6b543ffa..083cc102aa 100644
--- a/epan/dissectors/packet-smb-browse.c
+++ b/epan/dissectors/packet-smb-browse.c
@@ -22,78 +22,78 @@
 
 void proto_register_smb_browse(void);
 
-static int proto_smb_browse = -1;
-static int hf_command = -1;
-static int hf_update_count = -1;
-static int hf_periodicity = -1;
-static int hf_server_name = -1;
-static int hf_mb_server_name = -1;
-static int hf_mb_reset_command = -1;
-static int hf_mb_reset_demote = -1;
-static int hf_mb_reset_flush = -1;
-static int hf_mb_reset_stop = -1;
-static int hf_os_major = -1;
-static int hf_os_minor = -1;
-static int hf_server_type = -1;
-static int hf_server_type_workstation = -1;
-static int hf_server_type_server = -1;
-static int hf_server_type_sql = -1;
-static int hf_server_type_domain = -1;
-static int hf_server_type_backup = -1;
-static int hf_server_type_time = -1;
-static int hf_server_type_apple = -1;
-static int hf_server_type_novell = -1;
-static int hf_server_type_member = -1;
-static int hf_server_type_print = -1;
-static int hf_server_type_dialin = -1;
-static int hf_server_type_xenix = -1;
-static int hf_server_type_ntw = -1;
-static int hf_server_type_wfw = -1;
-static int hf_server_type_nts = -1;
-static int hf_server_type_potentialb = -1;
-static int hf_server_type_backupb = -1;
-static int hf_server_type_masterb = -1;
-static int hf_server_type_domainmasterb = -1;
-static int hf_server_type_osf = -1;
-static int hf_server_type_vms = -1;
-static int hf_server_type_w95 = -1;
-static int hf_server_type_dfs = -1;
-static int hf_server_type_local = -1;
-static int hf_server_type_domainenum = -1;
-static int hf_election_version = -1;
-static int hf_proto_major = -1;
-static int hf_proto_minor = -1;
-static int hf_sig_const = -1;
-static int hf_server_comment = -1;
-static int hf_unused_flags = -1;
-static int hf_response_computer_name = -1;
-static int hf_election_criteria = -1;
-static int hf_election_desire = -1;
-static int hf_election_desire_flags_backup = -1;
-static int hf_election_desire_flags_standby = -1;
-static int hf_election_desire_flags_master = -1;
-static int hf_election_desire_flags_domain_master = -1;
-static int hf_election_desire_flags_wins = -1;
-static int hf_election_desire_flags_nt = -1;
-/* static int hf_election_revision = -1; */
-static int hf_election_os = -1;
-static int hf_election_os_wfw = -1;
-static int hf_election_os_ntw = -1;
-static int hf_election_os_nts = -1;
-static int hf_server_uptime = -1;
-static int hf_backup_count = -1;
-static int hf_backup_token = -1;
-static int hf_backup_server = -1;
-static int hf_browser_to_promote = -1;
-static int hf_windows_version = -1;
-static int hf_mysterious_field = -1;
-
-static gint ett_browse = -1;
-static gint ett_browse_flags = -1;
-static gint ett_browse_election_criteria = -1;
-static gint ett_browse_election_os = -1;
-static gint ett_browse_election_desire = -1;
-static gint ett_browse_reset_cmd_flags = -1;
+static int proto_smb_browse;
+static int hf_command;
+static int hf_update_count;
+static int hf_periodicity;
+static int hf_server_name;
+static int hf_mb_server_name;
+static int hf_mb_reset_command;
+static int hf_mb_reset_demote;
+static int hf_mb_reset_flush;
+static int hf_mb_reset_stop;
+static int hf_os_major;
+static int hf_os_minor;
+static int hf_server_type;
+static int hf_server_type_workstation;
+static int hf_server_type_server;
+static int hf_server_type_sql;
+static int hf_server_type_domain;
+static int hf_server_type_backup;
+static int hf_server_type_time;
+static int hf_server_type_apple;
+static int hf_server_type_novell;
+static int hf_server_type_member;
+static int hf_server_type_print;
+static int hf_server_type_dialin;
+static int hf_server_type_xenix;
+static int hf_server_type_ntw;
+static int hf_server_type_wfw;
+static int hf_server_type_nts;
+static int hf_server_type_potentialb;
+static int hf_server_type_backupb;
+static int hf_server_type_masterb;
+static int hf_server_type_domainmasterb;
+static int hf_server_type_osf;
+static int hf_server_type_vms;
+static int hf_server_type_w95;
+static int hf_server_type_dfs;
+static int hf_server_type_local;
+static int hf_server_type_domainenum;
+static int hf_election_version;
+static int hf_proto_major;
+static int hf_proto_minor;
+static int hf_sig_const;
+static int hf_server_comment;
+static int hf_unused_flags;
+static int hf_response_computer_name;
+static int hf_election_criteria;
+static int hf_election_desire;
+static int hf_election_desire_flags_backup;
+static int hf_election_desire_flags_standby;
+static int hf_election_desire_flags_master;
+static int hf_election_desire_flags_domain_master;
+static int hf_election_desire_flags_wins;
+static int hf_election_desire_flags_nt;
+/* static int hf_election_revision; */
+static int hf_election_os;
+static int hf_election_os_wfw;
+static int hf_election_os_ntw;
+static int hf_election_os_nts;
+static int hf_server_uptime;
+static int hf_backup_count;
+static int hf_backup_token;
+static int hf_backup_server;
+static int hf_browser_to_promote;
+static int hf_windows_version;
+static int hf_mysterious_field;
+
+static gint ett_browse;
+static gint ett_browse_flags;
+static gint ett_browse_election_criteria;
+static gint ett_browse_election_os;
+static gint ett_browse_election_desire;
+static gint ett_browse_reset_cmd_flags;
 
 #define SERVER_WORKSTATION		 0
 #define SERVER_SERVER			 1
diff --git a/epan/dissectors/packet-smb-direct.c b/epan/dissectors/packet-smb-direct.c
index a612df37aa..75d39b19f2 100644
--- a/epan/dissectors/packet-smb-direct.c
+++ b/epan/dissectors/packet-smb-direct.c
@@ -27,43 +27,43 @@ void proto_reg_handoff_smb_direct(void);
 
 static dissector_handle_t smb_direct_handle;
 
-static int proto_smb_direct = -1;
-
-static gint ett_smb_direct = -1;
-static gint ett_smb_direct_hdr = -1;
-static gint ett_smb_direct_flags = -1;
-static gint ett_smb_direct_fragment = -1;
-static gint ett_smb_direct_fragments = -1;
-
-static int hf_smb_direct_negotiate_request = -1;
-static int hf_smb_direct_negotiate_response = -1;
-static int hf_smb_direct_data_message = -1;
-static int hf_smb_direct_min_version = -1;
-static int hf_smb_direct_max_version = -1;
-static int hf_smb_direct_negotiated_version = -1;
-static int hf_smb_direct_credits_requested = -1;
-static int hf_smb_direct_credits_granted = -1;
-static int hf_smb_direct_status = -1;
-static int hf_smb_direct_max_read_write_size = -1;
-static int hf_smb_direct_preferred_send_size = -1;
-static int hf_smb_direct_max_receive_size = -1;
-static int hf_smb_direct_max_fragmented_size = -1;
-static int hf_smb_direct_flags = -1;
-static int hf_smb_direct_flags_response_requested = -1;
-static int hf_smb_direct_remaining_length = -1;
-static int hf_smb_direct_data_offset = -1;
-static int hf_smb_direct_data_length = -1;
-static int hf_smb_direct_fragments = -1;
-static int hf_smb_direct_fragment = -1;
-static int hf_smb_direct_fragment_overlap = -1;
-static int hf_smb_direct_fragment_overlap_conflict = -1;
-static int hf_smb_direct_fragment_multiple_tails = -1;
-static int hf_smb_direct_fragment_too_long_fragment = -1;
-static int hf_smb_direct_fragment_error = -1;
-static int hf_smb_direct_fragment_count = -1;
-static int hf_smb_direct_reassembled_in = -1;
-static int hf_smb_direct_reassembled_length = -1;
-static int hf_smb_direct_reassembled_data = -1;
+static int proto_smb_direct;
+
+static gint ett_smb_direct;
+static gint ett_smb_direct_hdr;
+static gint ett_smb_direct_flags;
+static gint ett_smb_direct_fragment;
+static gint ett_smb_direct_fragments;
+
+static int hf_smb_direct_negotiate_request;
+static int hf_smb_direct_negotiate_response;
+static int hf_smb_direct_data_message;
+static int hf_smb_direct_min_version;
+static int hf_smb_direct_max_version;
+static int hf_smb_direct_negotiated_version;
+static int hf_smb_direct_credits_requested;
+static int hf_smb_direct_credits_granted;
+static int hf_smb_direct_status;
+static int hf_smb_direct_max_read_write_size;
+static int hf_smb_direct_preferred_send_size;
+static int hf_smb_direct_max_receive_size;
+static int hf_smb_direct_max_fragmented_size;
+static int hf_smb_direct_flags;
+static int hf_smb_direct_flags_response_requested;
+static int hf_smb_direct_remaining_length;
+static int hf_smb_direct_data_offset;
+static int hf_smb_direct_data_length;
+static int hf_smb_direct_fragments;
+static int hf_smb_direct_fragment;
+static int hf_smb_direct_fragment_overlap;
+static int hf_smb_direct_fragment_overlap_conflict;
+static int hf_smb_direct_fragment_multiple_tails;
+static int hf_smb_direct_fragment_too_long_fragment;
+static int hf_smb_direct_fragment_error;
+static int hf_smb_direct_fragment_count;
+static int hf_smb_direct_reassembled_in;
+static int hf_smb_direct_reassembled_length;
+static int hf_smb_direct_reassembled_data;
 
 static const fragment_items smb_direct_frag_items = {
 	&ett_smb_direct_fragment,
diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c
index 01ff63c46c..e94def350c 100644
--- a/epan/dissectors/packet-smb-logon.c
+++ b/epan/dissectors/packet-smb-logon.c
@@ -19,64 +19,64 @@
 
 void proto_register_smb_logon(void);
 
-static int proto_smb_logon = -1;
-static int hf_command = -1;
-static int hf_computer_name = -1;
-static int hf_unicode_computer_name = -1;
-static int hf_server_name = -1;
-static int hf_user_name = -1;
-static int hf_domain_name = -1;
-static int hf_server_dns_name = -1;
-static int hf_forest_dns_name = -1;
-static int hf_domain_dns_name = -1;
-static int hf_mailslot_name = -1;
-static int hf_pdc_name = -1;
-static int hf_unicode_pdc_name = -1;
-static int hf_script_name = -1;
-static int hf_nt_version = -1;
-static int hf_lmnt_token = -1;
-static int hf_lm_token = -1;
-static int hf_major_version = -1;
-static int hf_minor_version = -1;
-static int hf_os_version = -1;
-static int hf_signature = -1;
-static int hf_date_time = -1;
-static int hf_update_type = -1;
-static int hf_request_count = -1;
-static int hf_account_control = -1;
-static int hf_flags_autolock = -1;
-static int hf_flags_expire = -1;
-static int hf_flags_server_trust = -1;
-static int hf_flags_workstation_trust = -1;
-static int hf_flags_interdomain_trust = -1;
-static int hf_flags_mns_user = -1;
-static int hf_flags_normal_user = -1;
-static int hf_flags_temp_dup_user = -1;
-static int hf_flags_password_required = -1;
-static int hf_flags_homedir_required = -1;
-static int hf_flags_enabled = -1;
-static int hf_domain_sid_size = -1;
-static int hf_low_serial = -1;
-static int hf_pulse = -1;
-static int hf_random = -1;
-static int hf_db_count = -1;
-static int hf_db_index = -1;
-static int hf_large_serial = -1;
-static int hf_nt_date_time = -1;
-
-static int hf_unknown8 = -1;
-static int hf_unknown32 = -1;
-
-static int hf_domain_guid = -1;
-static int hf_server_ip = -1;
-
-static int hf_server_site_name = -1;
-static int hf_client_site_name = -1;
-static int hf_data = -1;
-
-static int ett_smb_logon = -1;
-static int ett_smb_account_flags = -1;
-static int ett_smb_db_info = -1;
+static int proto_smb_logon;
+static int hf_command;
+static int hf_computer_name;
+static int hf_unicode_computer_name;
+static int hf_server_name;
+static int hf_user_name;
+static int hf_domain_name;
+static int hf_server_dns_name;
+static int hf_forest_dns_name;
+static int hf_domain_dns_name;
+static int hf_mailslot_name;
+static int hf_pdc_name;
+static int hf_unicode_pdc_name;
+static int hf_script_name;
+static int hf_nt_version;
+static int hf_lmnt_token;
+static int hf_lm_token;
+static int hf_major_version;
+static int hf_minor_version;
+static int hf_os_version;
+static int hf_signature;
+static int hf_date_time;
+static int hf_update_type;
+static int hf_request_count;
+static int hf_account_control;
+static int hf_flags_autolock;
+static int hf_flags_expire;
+static int hf_flags_server_trust;
+static int hf_flags_workstation_trust;
+static int hf_flags_interdomain_trust;
+static int hf_flags_mns_user;
+static int hf_flags_normal_user;
+static int hf_flags_temp_dup_user;
+static int hf_flags_password_required;
+static int hf_flags_homedir_required;
+static int hf_flags_enabled;
+static int hf_domain_sid_size;
+static int hf_low_serial;
+static int hf_pulse;
+static int hf_random;
+static int hf_db_count;
+static int hf_db_index;
+static int hf_large_serial;
+static int hf_nt_date_time;
+
+static int hf_unknown8;
+static int hf_unknown32;
+
+static int hf_domain_guid;
+static int hf_server_ip;
+
+static int hf_server_site_name;
+static int hf_client_site_name;
+static int hf_data;
+
+static int ett_smb_logon;
+static int ett_smb_account_flags;
+static int ett_smb_db_info;
 
 #define ACC_FLAG_AUTO_LOCKED        0x00000400
 #define ACC_FLAG_EXPIRE             0x00000200
diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c
index d1841101bf..1b0c42bc23 100644
--- a/epan/dissectors/packet-smb-mailslot.c
+++ b/epan/dissectors/packet-smb-mailslot.c
@@ -21,14 +21,14 @@
 void proto_register_smb_mailslot(void);
 void proto_reg_handoff_smb_mailslot(void);
 
-static int proto_smb_msp = -1;
-static int hf_opcode = -1;
-static int hf_priority = -1;
-static int hf_class = -1;
-static int hf_size = -1;
-static int hf_name = -1;
-
-static int ett_smb_msp = -1;
+static int proto_smb_msp;
+static int hf_opcode;
+static int hf_priority;
+static int hf_class;
+static int hf_size;
+static int hf_name;
+
+static int ett_smb_msp;
 
 static dissector_handle_t mailslot_browse_handle;
 static dissector_handle_t mailslot_lanman_handle;
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c
index 3109c1425a..b30b119ce5 100644
--- a/epan/dissectors/packet-smb-pipe.c
+++ b/epan/dissectors/packet-smb-pipe.c
@@ -34,34 +34,34 @@ XXX  Fixme : shouldn't show [malformed frame] for long packets
 void proto_register_pipe_lanman(void);
 void proto_register_smb_pipe(void);
 
-static int proto_smb_pipe = -1;
-static int hf_smb_pipe_function = -1;
-static int hf_smb_pipe_priority = -1;
-static int hf_smb_pipe_peek_available = -1;
-static int hf_smb_pipe_peek_remaining = -1;
-static int hf_smb_pipe_peek_status = -1;
-static int hf_smb_pipe_getinfo_info_level = -1;
-static int hf_smb_pipe_getinfo_output_buffer_size = -1;
-static int hf_smb_pipe_getinfo_input_buffer_size = -1;
-static int hf_smb_pipe_getinfo_maximum_instances = -1;
-static int hf_smb_pipe_getinfo_current_instances = -1;
-static int hf_smb_pipe_getinfo_pipe_name_length = -1;
-static int hf_smb_pipe_getinfo_pipe_name = -1;
-static int hf_smb_pipe_write_raw_bytes_written = -1;
-static int hf_smb_pipe_fragments = -1;
-static int hf_smb_pipe_fragment = -1;
-static int hf_smb_pipe_fragment_overlap = -1;
-static int hf_smb_pipe_fragment_overlap_conflict = -1;
-static int hf_smb_pipe_fragment_multiple_tails = -1;
-static int hf_smb_pipe_fragment_too_long_fragment = -1;
-static int hf_smb_pipe_fragment_error = -1;
-static int hf_smb_pipe_fragment_count = -1;
-static int hf_smb_pipe_reassembled_in = -1;
-static int hf_smb_pipe_reassembled_length = -1;
-
-static gint ett_smb_pipe = -1;
-static gint ett_smb_pipe_fragment = -1;
-static gint ett_smb_pipe_fragments = -1;
+static int proto_smb_pipe;
+static int hf_smb_pipe_function;
+static int hf_smb_pipe_priority;
+static int hf_smb_pipe_peek_available;
+static int hf_smb_pipe_peek_remaining;
+static int hf_smb_pipe_peek_status;
+static int hf_smb_pipe_getinfo_info_level;
+static int hf_smb_pipe_getinfo_output_buffer_size;
+static int hf_smb_pipe_getinfo_input_buffer_size;
+static int hf_smb_pipe_getinfo_maximum_instances;
+static int hf_smb_pipe_getinfo_current_instances;
+static int hf_smb_pipe_getinfo_pipe_name_length;
+static int hf_smb_pipe_getinfo_pipe_name;
+static int hf_smb_pipe_write_raw_bytes_written;
+static int hf_smb_pipe_fragments;
+static int hf_smb_pipe_fragment;
+static int hf_smb_pipe_fragment_overlap;
+static int hf_smb_pipe_fragment_overlap_conflict;
+static int hf_smb_pipe_fragment_multiple_tails;
+static int hf_smb_pipe_fragment_too_long_fragment;
+static int hf_smb_pipe_fragment_error;
+static int hf_smb_pipe_fragment_count;
+static int hf_smb_pipe_reassembled_in;
+static int hf_smb_pipe_reassembled_length;
+
+static gint ett_smb_pipe;
+static gint ett_smb_pipe_fragment;
+static gint ett_smb_pipe_fragments;
 
 static const fragment_items smb_pipe_frag_items = {
 	&ett_smb_pipe_fragment,
@@ -81,114 +81,114 @@ static const fragment_items smb_pipe_frag_items = {
 	"fragments"
 };
 
-static int proto_smb_lanman = -1;
-static int hf_function_code = -1;
-static int hf_param_desc = -1;
-static int hf_return_desc = -1;
-static int hf_aux_data_desc = -1;
-static int hf_detail_level = -1;
-static int hf_padding = -1;
-static int hf_recv_buf_len = -1;
-static int hf_send_buf_len = -1;
-/* static int hf_continuation_from = -1; */
-static int hf_status = -1;
-static int hf_convert = -1;
-static int hf_param_no_descriptor = -1;
-static int hf_data_no_descriptor = -1;
-static int hf_data_no_recv_buffer = -1;
-static int hf_ecount = -1;
-static int hf_acount = -1;
-static int hf_share = -1;
-static int hf_share_name = -1;
-static int hf_share_type = -1;
-static int hf_share_comment = -1;
-static int hf_share_permissions = -1;
-static int hf_share_max_uses = -1;
-static int hf_share_current_uses = -1;
-static int hf_share_path = -1;
-static int hf_share_password = -1;
-static int hf_server = -1;
-static int hf_server_name = -1;
-static int hf_server_major = -1;
-static int hf_server_minor = -1;
-static int hf_server_comment = -1;
-static int hf_abytes = -1;
-static int hf_current_time = -1;
-static int hf_msecs = -1;
-static int hf_hour = -1;
-static int hf_minute = -1;
-static int hf_second = -1;
-static int hf_hundredths = -1;
-static int hf_tzoffset = -1;
-static int hf_timeinterval = -1;
-static int hf_day = -1;
-static int hf_month = -1;
-static int hf_year = -1;
-static int hf_weekday = -1;
-static int hf_enumeration_domain = -1;
-static int hf_last_entry = -1;
-static int hf_computer_name = -1;
-static int hf_user_name = -1;
-static int hf_group_name = -1;
-static int hf_workstation_domain = -1;
-static int hf_workstation_major = -1;
-static int hf_workstation_minor = -1;
-static int hf_logon_domain = -1;
-static int hf_other_domains = -1;
-static int hf_password = -1;
-static int hf_workstation_name = -1;
-static int hf_ustruct_size = -1;
-static int hf_logon_code = -1;
-static int hf_privilege_level = -1;
-static int hf_operator_privileges = -1;
-static int hf_num_logons = -1;
-static int hf_bad_pw_count = -1;
-static int hf_last_logon = -1;
-static int hf_last_logoff = -1;
-static int hf_logoff_time = -1;
-static int hf_kickoff_time = -1;
-static int hf_password_age = -1;
-static int hf_password_can_change = -1;
-static int hf_password_must_change = -1;
-static int hf_script_path = -1;
-static int hf_logoff_code = -1;
-static int hf_duration = -1;
-static int hf_comment = -1;
-static int hf_user_comment = -1;
-static int hf_full_name = -1;
-static int hf_homedir = -1;
-static int hf_parameters = -1;
-static int hf_logon_server = -1;
-static int hf_country_code = -1;
-static int hf_workstations = -1;
-static int hf_max_storage = -1;
-static int hf_units_per_week = -1;
-static int hf_logon_hours = -1;
-static int hf_code_page = -1;
-static int hf_new_password = -1;
-static int hf_old_password = -1;
-static int hf_reserved = -1;
-static int hf_aux_data_struct_count  = -1;
+static int proto_smb_lanman;
+static int hf_function_code;
+static int hf_param_desc;
+static int hf_return_desc;
+static int hf_aux_data_desc;
+static int hf_detail_level;
+static int hf_padding;
+static int hf_recv_buf_len;
+static int hf_send_buf_len;
+/* static int hf_continuation_from; */
+static int hf_status;
+static int hf_convert;
+static int hf_param_no_descriptor;
+static int hf_data_no_descriptor;
+static int hf_data_no_recv_buffer;
+static int hf_ecount;
+static int hf_acount;
+static int hf_share;
+static int hf_share_name;
+static int hf_share_type;
+static int hf_share_comment;
+static int hf_share_permissions;
+static int hf_share_max_uses;
+static int hf_share_current_uses;
+static int hf_share_path;
+static int hf_share_password;
+static int hf_server;
+static int hf_server_name;
+static int hf_server_major;
+static int hf_server_minor;
+static int hf_server_comment;
+static int hf_abytes;
+static int hf_current_time;
+static int hf_msecs;
+static int hf_hour;
+static int hf_minute;
+static int hf_second;
+static int hf_hundredths;
+static int hf_tzoffset;
+static int hf_timeinterval;
+static int hf_day;
+static int hf_month;
+static int hf_year;
+static int hf_weekday;
+static int hf_enumeration_domain;
+static int hf_last_entry;
+static int hf_computer_name;
+static int hf_user_name;
+static int hf_group_name;
+static int hf_workstation_domain;
+static int hf_workstation_major;
+static int hf_workstation_minor;
+static int hf_logon_domain;
+static int hf_other_domains;
+static int hf_password;
+static int hf_workstation_name;
+static int hf_ustruct_size;
+static int hf_logon_code;
+static int hf_privilege_level;
+static int hf_operator_privileges;
+static int hf_num_logons;
+static int hf_bad_pw_count;
+static int hf_last_logon;
+static int hf_last_logoff;
+static int hf_logoff_time;
+static int hf_kickoff_time;
+static int hf_password_age;
+static int hf_password_can_change;
+static int hf_password_must_change;
+static int hf_script_path;
+static int hf_logoff_code;
+static int hf_duration;
+static int hf_comment;
+static int hf_user_comment;
+static int hf_full_name;
+static int hf_homedir;
+static int hf_parameters;
+static int hf_logon_server;
+static int hf_country_code;
+static int hf_workstations;
+static int hf_max_storage;
+static int hf_units_per_week;
+static int hf_logon_hours;
+static int hf_code_page;
+static int hf_new_password;
+static int hf_old_password;
+static int hf_reserved;
+static int hf_aux_data_struct_count;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_smb_pipe_stringz_param = -1;
-static int hf_smb_pipe_string_param = -1;
-static int hf_smb_pipe_bytes_param = -1;
-static int hf_smb_pipe_byte_param = -1;
-static int hf_smb_pipe_doubleword_param = -1;
-static int hf_smb_pipe_word_param = -1;
-
-static gint ett_lanman = -1;
-static gint ett_lanman_unknown_entries = -1;
-static gint ett_lanman_unknown_entry = -1;
-static gint ett_lanman_shares = -1;
-static gint ett_lanman_share = -1;
-static gint ett_lanman_groups = -1;
-static gint ett_lanman_servers = -1;
-static gint ett_lanman_server = -1;
-
-static expert_field ei_smb_pipe_bogus_netwkstauserlogon = EI_INIT;
-static expert_field ei_smb_pipe_bad_type = EI_INIT;
+static int hf_smb_pipe_stringz_param;
+static int hf_smb_pipe_string_param;
+static int hf_smb_pipe_bytes_param;
+static int hf_smb_pipe_byte_param;
+static int hf_smb_pipe_doubleword_param;
+static int hf_smb_pipe_word_param;
+
+static gint ett_lanman;
+static gint ett_lanman_unknown_entries;
+static gint ett_lanman_unknown_entry;
+static gint ett_lanman_shares;
+static gint ett_lanman_share;
+static gint ett_lanman_groups;
+static gint ett_lanman_servers;
+static gint ett_lanman_server;
+
+static expert_field ei_smb_pipe_bogus_netwkstauserlogon;
+static expert_field ei_smb_pipe_bad_type;
 
 /*
  * See
diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c
index 247df81d95..29e05f1729 100644
--- a/epan/dissectors/packet-smb-sidsnooping.c
+++ b/epan/dissectors/packet-smb-sidsnooping.c
@@ -23,16 +23,16 @@
 void proto_register_smb_sidsnooping(void);
 
 #if 0
-static int hf_lsa = -1;
-static int hf_lsa_opnum = -1;
+static int hf_lsa;
+static int hf_lsa_opnum;
 #endif
-static int hf_lsa_info_level = -1;
-static int hf_lsa_domain = -1;
-static int hf_nt_domain_sid = -1;
-static int hf_samr_hnd = -1;
-static int hf_samr_rid = -1;
-static int hf_samr_acct_name = -1;
-static int hf_samr_level = -1;
+static int hf_lsa_info_level;
+static int hf_lsa_domain;
+static int hf_nt_domain_sid;
+static int hf_samr_hnd;
+static int hf_samr_rid;
+static int hf_samr_acct_name;
+static int hf_samr_level;
 
 
 GHashTable *sid_name_table = NULL;
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index b62e6b252b..af9b4a957c 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -91,785 +91,785 @@ void proto_reg_handoff_smb(void);
 #define REFENT_FLAGS_TARGET_SET_BOUNDARY 0x0004
 
 
-static int proto_smb = -1;
-static int hf_smb_cmd = -1;
-static int hf_smb_andxcmd = -1;
-static int hf_smb_mapped_in = -1;
-static int hf_smb_unmapped_in = -1;
-static int hf_smb_opened_in = -1;
-static int hf_smb_closed_in = -1;
-static int hf_smb_key = -1;
-static int hf_smb_session_id = -1;
-static int hf_smb_sequence_num = -1;
-static int hf_smb_group_id = -1;
-static int hf_smb_pid = -1;
-static int hf_smb_tid = -1;
-static int hf_smb_uid = -1;
-static int hf_smb_mid = -1;
-static int hf_smb_pid_high = -1;
-static int hf_smb_sig = -1;
-static int hf_smb_response_to = -1;
-static int hf_smb_time = -1;
-static int hf_smb_response_in = -1;
-static int hf_smb_continuation_to = -1;
-static int hf_smb_nt_status = -1;
-static int hf_smb_error_class = -1;
-static int hf_smb_error_code = -1;
-static int hf_smb_reserved = -1;
-static int hf_smb_create_flags = -1;
-static int hf_smb_create_options = -1;
-static int hf_smb_share_access = -1;
-static int hf_smb_access_mask = -1;
-static int hf_smb_flags = -1;
-static int hf_smb_flags_lock = -1;
-static int hf_smb_flags_receive_buffer = -1;
-static int hf_smb_flags_caseless = -1;
-static int hf_smb_flags_canon = -1;
-static int hf_smb_flags_oplock = -1;
-static int hf_smb_flags_notify = -1;
-static int hf_smb_flags_response = -1;
-static int hf_smb_flags2 = -1;
-static int hf_smb_flags2_long_names_allowed = -1;
-static int hf_smb_flags2_ea = -1;
-static int hf_smb_flags2_sec_sig = -1;
-static int hf_smb_flags2_compressed = -1;
-static int hf_smb_flags2_sec_sig_required = -1;
-static int hf_smb_flags2_long_names_used = -1;
-static int hf_smb_flags2_reparse_path = -1;
-static int hf_smb_flags2_esn = -1;
-static int hf_smb_flags2_dfs = -1;
-static int hf_smb_flags2_roe = -1;
-static int hf_smb_flags2_nt_error = -1;
-static int hf_smb_flags2_string = -1;
-static int hf_smb_word_count = -1;
-static int hf_smb_byte_count = -1;
-static int hf_smb_buffer_format = -1;
-static int hf_smb_dialect = -1;
-static int hf_smb_dialect_name = -1;
-static int hf_smb_dialect_index = -1;
-static int hf_smb_max_trans_buf_size = -1;
-static int hf_smb_max_mpx_count = -1;
-static int hf_smb_max_vcs_num = -1;
-static int hf_smb_session_key = -1;
-static int hf_smb_server_timezone = -1;
-static int hf_smb_challenge_length = -1;
-static int hf_smb_challenge = -1;
-static int hf_smb_primary_domain = -1;
-static int hf_smb_server = -1;
-static int hf_smb_max_raw_buf_size = -1;
-static int hf_smb_server_guid = -1;
-static int hf_smb_volume_guid = -1;
-static int hf_smb_security_blob_len = -1;
-static int hf_smb_security_blob = -1;
-static int hf_smb_sm16 = -1;
-static int hf_smb_sm_mode16 = -1;
-static int hf_smb_sm_password16 = -1;
-static int hf_smb_sm = -1;
-static int hf_smb_sm_mode = -1;
-static int hf_smb_sm_password = -1;
-static int hf_smb_sm_signatures = -1;
-static int hf_smb_sm_sig_required = -1;
-static int hf_smb_rm = -1;
-static int hf_smb_rm_read = -1;
-static int hf_smb_rm_write = -1;
-static int hf_smb_server_date_time = -1;
-static int hf_smb_server_smb_date = -1;
-static int hf_smb_server_smb_time = -1;
-static int hf_smb_server_cap = -1;
-static int hf_smb_server_cap_raw_mode = -1;
-static int hf_smb_server_cap_mpx_mode = -1;
-static int hf_smb_server_cap_unicode = -1;
-static int hf_smb_server_cap_large_files = -1;
-static int hf_smb_server_cap_nt_smbs = -1;
-static int hf_smb_server_cap_rpc_remote_apis = -1;
-static int hf_smb_server_cap_nt_status = -1;
-static int hf_smb_server_cap_level_ii_oplocks = -1;
-static int hf_smb_server_cap_lock_and_read = -1;
-static int hf_smb_server_cap_nt_find = -1;
-static int hf_smb_server_cap_dfs = -1;
-static int hf_smb_server_cap_infolevel_passthru = -1;
-static int hf_smb_server_cap_large_readx = -1;
-static int hf_smb_server_cap_large_writex = -1;
-static int hf_smb_server_cap_lwio = -1;
-static int hf_smb_server_cap_unix = -1;
-static int hf_smb_server_cap_compressed_data = -1;
-static int hf_smb_server_cap_dynamic_reauth = -1;
-static int hf_smb_server_cap_extended_security = -1;
-static int hf_smb_system_time = -1;
-static int hf_smb_unknown = -1;
-static int hf_smb_dir_name = -1;
-static int hf_smb_echo_count = -1;
-static int hf_smb_echo_data = -1;
-static int hf_smb_echo_seq_num = -1;
-static int hf_smb_max_buf_size = -1;
-static int hf_smb_password = -1;
-static int hf_smb_password_len = -1;
-static int hf_smb_ansi_password = -1;
-static int hf_smb_ansi_password_len = -1;
-static int hf_smb_unicode_password = -1;
-static int hf_smb_unicode_password_len = -1;
-static int hf_smb_path = -1;
-static int hf_smb_service = -1;
-static int hf_smb_move_flags = -1;
-static int hf_smb_move_flags_file = -1;
-static int hf_smb_move_flags_dir = -1;
-static int hf_smb_move_flags_verify = -1;
-static int hf_smb_files_moved = -1;
-static int hf_smb_file_access_mask_read_data = -1;
-static int hf_smb_file_access_mask_write_data = -1;
-static int hf_smb_file_access_mask_append_data = -1;
-static int hf_smb_file_access_mask_read_ea = -1;
-static int hf_smb_file_access_mask_write_ea = -1;
-static int hf_smb_file_access_mask_execute = -1;
-static int hf_smb_file_access_mask_read_attribute = -1;
-static int hf_smb_file_access_mask_write_attribute = -1;
-static int hf_smb_dir_access_mask_list = -1;
-static int hf_smb_dir_access_mask_add_file = -1;
-static int hf_smb_dir_access_mask_add_subdir = -1;
-static int hf_smb_dir_access_mask_read_ea = -1;
-static int hf_smb_dir_access_mask_write_ea = -1;
-static int hf_smb_dir_access_mask_traverse = -1;
-static int hf_smb_dir_access_mask_delete_child = -1;
-static int hf_smb_dir_access_mask_read_attribute = -1;
-static int hf_smb_dir_access_mask_write_attribute = -1;
-static int hf_smb_copy_flags = -1;
-static int hf_smb_copy_flags_file = -1;
-static int hf_smb_copy_flags_dir = -1;
-static int hf_smb_copy_flags_dest_mode = -1;
-static int hf_smb_copy_flags_source_mode = -1;
-static int hf_smb_copy_flags_verify = -1;
-static int hf_smb_copy_flags_tree_copy = -1;
-static int hf_smb_copy_flags_ea_action = -1;
-static int hf_smb_count = -1;
-static int hf_smb_count_low = -1;
-static int hf_smb_count_high = -1;
-static int hf_smb_file_name = -1;
-static int hf_smb_open_function = -1;
-static int hf_smb_open_function_open = -1;
-static int hf_smb_open_function_create = -1;
-static int hf_smb_fid = -1;
-static int hf_smb_file_attr_16bit = -1;
-static int hf_smb_file_attr_8bit = -1;
-static int hf_smb_file_attr_read_only_16bit = -1;
-static int hf_smb_file_attr_read_only_8bit = -1;
-static int hf_smb_file_attr_hidden_16bit = -1;
-static int hf_smb_file_attr_hidden_8bit = -1;
-static int hf_smb_file_attr_system_16bit = -1;
-static int hf_smb_file_attr_system_8bit = -1;
-static int hf_smb_file_attr_volume_16bit = -1;
-static int hf_smb_file_attr_volume_8bit = -1;
-static int hf_smb_file_attr_directory_16bit = -1;
-static int hf_smb_file_attr_directory_8bit = -1;
-static int hf_smb_file_attr_archive_16bit = -1;
-static int hf_smb_file_attr_archive_8bit = -1;
+static int proto_smb;
+static int hf_smb_cmd;
+static int hf_smb_andxcmd;
+static int hf_smb_mapped_in;
+static int hf_smb_unmapped_in;
+static int hf_smb_opened_in;
+static int hf_smb_closed_in;
+static int hf_smb_key;
+static int hf_smb_session_id;
+static int hf_smb_sequence_num;
+static int hf_smb_group_id;
+static int hf_smb_pid;
+static int hf_smb_tid;
+static int hf_smb_uid;
+static int hf_smb_mid;
+static int hf_smb_pid_high;
+static int hf_smb_sig;
+static int hf_smb_response_to;
+static int hf_smb_time;
+static int hf_smb_response_in;
+static int hf_smb_continuation_to;
+static int hf_smb_nt_status;
+static int hf_smb_error_class;
+static int hf_smb_error_code;
+static int hf_smb_reserved;
+static int hf_smb_create_flags;
+static int hf_smb_create_options;
+static int hf_smb_share_access;
+static int hf_smb_access_mask;
+static int hf_smb_flags;
+static int hf_smb_flags_lock;
+static int hf_smb_flags_receive_buffer;
+static int hf_smb_flags_caseless;
+static int hf_smb_flags_canon;
+static int hf_smb_flags_oplock;
+static int hf_smb_flags_notify;
+static int hf_smb_flags_response;
+static int hf_smb_flags2;
+static int hf_smb_flags2_long_names_allowed;
+static int hf_smb_flags2_ea;
+static int hf_smb_flags2_sec_sig;
+static int hf_smb_flags2_compressed;
+static int hf_smb_flags2_sec_sig_required;
+static int hf_smb_flags2_long_names_used;
+static int hf_smb_flags2_reparse_path;
+static int hf_smb_flags2_esn;
+static int hf_smb_flags2_dfs;
+static int hf_smb_flags2_roe;
+static int hf_smb_flags2_nt_error;
+static int hf_smb_flags2_string;
+static int hf_smb_word_count;
+static int hf_smb_byte_count;
+static int hf_smb_buffer_format;
+static int hf_smb_dialect;
+static int hf_smb_dialect_name;
+static int hf_smb_dialect_index;
+static int hf_smb_max_trans_buf_size;
+static int hf_smb_max_mpx_count;
+static int hf_smb_max_vcs_num;
+static int hf_smb_session_key;
+static int hf_smb_server_timezone;
+static int hf_smb_challenge_length;
+static int hf_smb_challenge;
+static int hf_smb_primary_domain;
+static int hf_smb_server;
+static int hf_smb_max_raw_buf_size;
+static int hf_smb_server_guid;
+static int hf_smb_volume_guid;
+static int hf_smb_security_blob_len;
+static int hf_smb_security_blob;
+static int hf_smb_sm16;
+static int hf_smb_sm_mode16;
+static int hf_smb_sm_password16;
+static int hf_smb_sm;
+static int hf_smb_sm_mode;
+static int hf_smb_sm_password;
+static int hf_smb_sm_signatures;
+static int hf_smb_sm_sig_required;
+static int hf_smb_rm;
+static int hf_smb_rm_read;
+static int hf_smb_rm_write;
+static int hf_smb_server_date_time;
+static int hf_smb_server_smb_date;
+static int hf_smb_server_smb_time;
+static int hf_smb_server_cap;
+static int hf_smb_server_cap_raw_mode;
+static int hf_smb_server_cap_mpx_mode;
+static int hf_smb_server_cap_unicode;
+static int hf_smb_server_cap_large_files;
+static int hf_smb_server_cap_nt_smbs;
+static int hf_smb_server_cap_rpc_remote_apis;
+static int hf_smb_server_cap_nt_status;
+static int hf_smb_server_cap_level_ii_oplocks;
+static int hf_smb_server_cap_lock_and_read;
+static int hf_smb_server_cap_nt_find;
+static int hf_smb_server_cap_dfs;
+static int hf_smb_server_cap_infolevel_passthru;
+static int hf_smb_server_cap_large_readx;
+static int hf_smb_server_cap_large_writex;
+static int hf_smb_server_cap_lwio;
+static int hf_smb_server_cap_unix;
+static int hf_smb_server_cap_compressed_data;
+static int hf_smb_server_cap_dynamic_reauth;
+static int hf_smb_server_cap_extended_security;
+static int hf_smb_system_time;
+static int hf_smb_unknown;
+static int hf_smb_dir_name;
+static int hf_smb_echo_count;
+static int hf_smb_echo_data;
+static int hf_smb_echo_seq_num;
+static int hf_smb_max_buf_size;
+static int hf_smb_password;
+static int hf_smb_password_len;
+static int hf_smb_ansi_password;
+static int hf_smb_ansi_password_len;
+static int hf_smb_unicode_password;
+static int hf_smb_unicode_password_len;
+static int hf_smb_path;
+static int hf_smb_service;
+static int hf_smb_move_flags;
+static int hf_smb_move_flags_file;
+static int hf_smb_move_flags_dir;
+static int hf_smb_move_flags_verify;
+static int hf_smb_files_moved;
+static int hf_smb_file_access_mask_read_data;
+static int hf_smb_file_access_mask_write_data;
+static int hf_smb_file_access_mask_append_data;
+static int hf_smb_file_access_mask_read_ea;
+static int hf_smb_file_access_mask_write_ea;
+static int hf_smb_file_access_mask_execute;
+static int hf_smb_file_access_mask_read_attribute;
+static int hf_smb_file_access_mask_write_attribute;
+static int hf_smb_dir_access_mask_list;
+static int hf_smb_dir_access_mask_add_file;
+static int hf_smb_dir_access_mask_add_subdir;
+static int hf_smb_dir_access_mask_read_ea;
+static int hf_smb_dir_access_mask_write_ea;
+static int hf_smb_dir_access_mask_traverse;
+static int hf_smb_dir_access_mask_delete_child;
+static int hf_smb_dir_access_mask_read_attribute;
+static int hf_smb_dir_access_mask_write_attribute;
+static int hf_smb_copy_flags;
+static int hf_smb_copy_flags_file;
+static int hf_smb_copy_flags_dir;
+static int hf_smb_copy_flags_dest_mode;
+static int hf_smb_copy_flags_source_mode;
+static int hf_smb_copy_flags_verify;
+static int hf_smb_copy_flags_tree_copy;
+static int hf_smb_copy_flags_ea_action;
+static int hf_smb_count;
+static int hf_smb_count_low;
+static int hf_smb_count_high;
+static int hf_smb_file_name;
+static int hf_smb_open_function;
+static int hf_smb_open_function_open;
+static int hf_smb_open_function_create;
+static int hf_smb_fid;
+static int hf_smb_file_attr_16bit;
+static int hf_smb_file_attr_8bit;
+static int hf_smb_file_attr_read_only_16bit;
+static int hf_smb_file_attr_read_only_8bit;
+static int hf_smb_file_attr_hidden_16bit;
+static int hf_smb_file_attr_hidden_8bit;
+static int hf_smb_file_attr_system_16bit;
+static int hf_smb_file_attr_system_8bit;
+static int hf_smb_file_attr_volume_16bit;
+static int hf_smb_file_attr_volume_8bit;
+static int hf_smb_file_attr_directory_16bit;
+static int hf_smb_file_attr_directory_8bit;
+static int hf_smb_file_attr_archive_16bit;
+static int hf_smb_file_attr_archive_8bit;
 #if 0
-static int hf_smb_file_attr_device = -1;
-static int hf_smb_file_attr_normal = -1;
-static int hf_smb_file_attr_temporary = -1;
-static int hf_smb_file_attr_sparse = -1;
-static int hf_smb_file_attr_reparse = -1;
-static int hf_smb_file_attr_compressed = -1;
-static int hf_smb_file_attr_offline = -1;
-static int hf_smb_file_attr_not_content_indexed = -1;
-static int hf_smb_file_attr_encrypted = -1;
+static int hf_smb_file_attr_device;
+static int hf_smb_file_attr_normal;
+static int hf_smb_file_attr_temporary;
+static int hf_smb_file_attr_sparse;
+static int hf_smb_file_attr_reparse;
+static int hf_smb_file_attr_compressed;
+static int hf_smb_file_attr_offline;
+static int hf_smb_file_attr_not_content_indexed;
+static int hf_smb_file_attr_encrypted;
 #endif
-static int hf_smb_file_size = -1;
-static int hf_smb_search_attribute = -1;
-static int hf_smb_search_attribute_read_only = -1;
-static int hf_smb_search_attribute_hidden = -1;
-static int hf_smb_search_attribute_system = -1;
-static int hf_smb_search_attribute_volume = -1;
-static int hf_smb_search_attribute_directory = -1;
-static int hf_smb_search_attribute_archive = -1;
-static int hf_smb_access_mode = -1;
-static int hf_smb_access_sharing = -1;
-static int hf_smb_access_locality = -1;
-static int hf_smb_access_caching = -1;
-static int hf_smb_access_writetru = -1;
-static int hf_smb_desired_access = -1;
-static int hf_smb_granted_access = -1;
-static int hf_smb_create_time = -1;
-static int hf_smb_modify_time = -1;
-static int hf_smb_backup_time = -1;
-static int hf_smb_mac_alloc_block_count = -1;
-static int hf_smb_mac_alloc_block_size = -1;
-static int hf_smb_mac_free_block_count = -1;
-static int hf_smb_mac_fndrinfo = -1;
-static int hf_smb_mac_root_file_count = -1;
-static int hf_smb_mac_root_dir_count = -1;
-static int hf_smb_mac_file_count = -1;
-static int hf_smb_mac_dir_count = -1;
-static int hf_smb_mac_sup = -1;
-static int hf_smb_mac_sup_access_ctrl = -1;
-static int hf_smb_mac_sup_getset_comments = -1;
-static int hf_smb_mac_sup_desktopdb_calls = -1;
-static int hf_smb_mac_sup_unique_ids = -1;
-static int hf_smb_mac_sup_streams = -1;
-static int hf_smb_create_dos_date = -1;
-static int hf_smb_create_dos_time = -1;
-static int hf_smb_last_write_time = -1;
-static int hf_smb_last_write_dos_date = -1;
-static int hf_smb_last_write_dos_time = -1;
-static int hf_smb_access_time = -1;
-static int hf_smb_access_dos_date = -1;
-static int hf_smb_access_dos_time = -1;
-static int hf_smb_old_file_name = -1;
-static int hf_smb_offset = -1;
-static int hf_smb_remaining = -1;
-static int hf_smb_padding = -1;
-static int hf_smb_file_data = -1;
-/* static int hf_smb_raw_ea_data = -1; */
-static int hf_smb_total_data_len = -1;
-static int hf_smb_data_len = -1;
-static int hf_smb_data_len_low = -1;
-static int hf_smb_data_len_high = -1;
-static int hf_smb_seek_mode = -1;
-static int hf_smb_data_size = -1;
-static int hf_smb_alloc_size = -1;
-static int hf_smb_alloc_size64 = -1;
-static int hf_smb_max_count = -1;
-static int hf_smb_max_count_low = -1;
-static int hf_smb_max_count_high = -1;
-static int hf_smb_min_count = -1;
-static int hf_smb_timeout = -1;
-static int hf_smb_high_offset = -1;
-static int hf_smb_units = -1;
-static int hf_smb_bpu = -1;
-static int hf_smb_blocksize = -1;
-static int hf_smb_freeunits = -1;
-static int hf_smb_data_offset = -1;
-static int hf_smb_dcm = -1;
-static int hf_smb_request_mask = -1;
-static int hf_smb_response_mask = -1;
-static int hf_smb_search_id = -1;
-static int hf_smb_write_mode = -1;
-static int hf_smb_write_mode_write_through = -1;
-static int hf_smb_write_mode_return_remaining = -1;
-static int hf_smb_write_mode_raw = -1;
-static int hf_smb_write_mode_message_start = -1;
-static int hf_smb_write_mode_connectionless = -1;
-static int hf_smb_resume_key_len = -1;
-static int hf_smb_resume_find_id = -1;
-static int hf_smb_resume_server_cookie = -1;
-static int hf_smb_resume_client_cookie = -1;
-static int hf_smb_andxoffset = -1;
-static int hf_smb_lock_type = -1;
-static int hf_smb_lock_type_large = -1;
-static int hf_smb_lock_type_cancel = -1;
-static int hf_smb_lock_type_change = -1;
-static int hf_smb_lock_type_oplock = -1;
-static int hf_smb_lock_type_shared = -1;
-static int hf_smb_locking_ol = -1;
-static int hf_smb_number_of_locks = -1;
-static int hf_smb_number_of_unlocks = -1;
-static int hf_smb_lock_long_offset = -1;
-static int hf_smb_lock_long_length = -1;
-static int hf_smb_file_type = -1;
-static int hf_smb_ipc_state = -1;
-static int hf_smb_ipc_state_nonblocking = -1;
-static int hf_smb_ipc_state_endpoint = -1;
-static int hf_smb_ipc_state_pipe_type = -1;
-static int hf_smb_ipc_state_read_mode = -1;
-static int hf_smb_ipc_state_icount = -1;
-static int hf_smb_server_fid = -1;
-static int hf_smb_open_flags = -1;
-static int hf_smb_open_flags_add_info = -1;
-static int hf_smb_open_flags_ex_oplock = -1;
-static int hf_smb_open_flags_batch_oplock = -1;
-static int hf_smb_open_flags_ealen = -1;
-static int hf_smb_open_action = -1;
-static int hf_smb_open_action_open = -1;
-static int hf_smb_open_action_lock = -1;
-static int hf_smb_vc_num = -1;
-static int hf_smb_account = -1;
-static int hf_smb_os = -1;
-static int hf_smb_lanman = -1;
-static int hf_smb_setup_action = -1;
-static int hf_smb_setup_action_guest = -1;
-static int hf_smb_fs = -1;
-static int hf_smb_connect_flags = -1;
-static int hf_smb_connect_flags_dtid = -1;
-static int hf_smb_connect_flags_ext_sig = -1;
-static int hf_smb_connect_flags_ext_resp = -1;
-static int hf_smb_connect_support = -1;
-static int hf_smb_connect_support_search = -1;
-static int hf_smb_connect_support_in_dfs = -1;
-static int hf_smb_connect_support_csc_mask_vals = -1;
-static int hf_smb_connect_support_uniquefilename = -1;
-static int hf_smb_connect_support_extended_signature = -1;
-static int hf_smb_max_setup_count = -1;
-static int hf_smb_total_param_count = -1;
-static int hf_smb_total_data_count = -1;
-static int hf_smb_max_param_count = -1;
-static int hf_smb_max_data_count = -1;
-static int hf_smb_param_disp16 = -1;
-static int hf_smb_param_count16 = -1;
-static int hf_smb_param_offset16 = -1;
-static int hf_smb_param_disp32 = -1;
-static int hf_smb_param_count32 = -1;
-static int hf_smb_param_offset32 = -1;
-static int hf_smb_data_disp16 = -1;
-static int hf_smb_data_count16 = -1;
-static int hf_smb_data_offset16 = -1;
-static int hf_smb_data_disp32 = -1;
-static int hf_smb_data_count32 = -1;
-static int hf_smb_data_offset32 = -1;
-static int hf_smb_setup_count = -1;
-static int hf_smb_nt_trans_subcmd = -1;
-static int hf_smb_nt_ioctl_isfsctl = -1;
-static int hf_smb_nt_ioctl_flags_completion_filter = -1;
-static int hf_smb_nt_ioctl_flags_root_handle = -1;
-static int hf_smb_nt_notify_action = -1;
-static int hf_smb_nt_notify_watch_tree = -1;
-static int hf_smb_nt_notify_completion_filter = -1;
-static int hf_smb_nt_notify_stream_write = -1;
-static int hf_smb_nt_notify_stream_size = -1;
-static int hf_smb_nt_notify_stream_name = -1;
-static int hf_smb_nt_notify_security = -1;
-static int hf_smb_nt_notify_ea = -1;
-static int hf_smb_nt_notify_creation = -1;
-static int hf_smb_nt_notify_last_access = -1;
-static int hf_smb_nt_notify_last_write = -1;
-static int hf_smb_nt_notify_size = -1;
-static int hf_smb_nt_notify_attributes = -1;
-static int hf_smb_nt_notify_dir_name = -1;
-static int hf_smb_nt_notify_file_name = -1;
-static int hf_smb_root_dir_fid = -1;
-static int hf_smb_nt_create_disposition = -1;
-static int hf_smb_sd_length = -1;
-static int hf_smb_ea_list_length = -1;
-static int hf_smb_ea_flags = -1;
-static int hf_smb_ea_name_length = -1;
-static int hf_smb_ea_data_length = -1;
-static int hf_smb_ea_name = -1;
-static int hf_smb_ea_data = -1;
-static int hf_smb_file_name_len = -1;
-static int hf_smb_nt_impersonation_level = -1;
-static int hf_smb_nt_security_flags = -1;
-static int hf_smb_nt_security_flags_context_tracking = -1;
-static int hf_smb_nt_security_flags_effective_only = -1;
-static int hf_smb_nt_access_mask_generic_read = -1;
-static int hf_smb_nt_access_mask_generic_write = -1;
-static int hf_smb_nt_access_mask_generic_execute = -1;
-static int hf_smb_nt_access_mask_generic_all = -1;
-static int hf_smb_nt_access_mask_maximum_allowed = -1;
-static int hf_smb_nt_access_mask_system_security = -1;
-static int hf_smb_nt_access_mask_synchronize = -1;
-static int hf_smb_nt_access_mask_write_owner = -1;
-static int hf_smb_nt_access_mask_write_dac = -1;
-static int hf_smb_nt_access_mask_read_control = -1;
-static int hf_smb_nt_access_mask_delete = -1;
-static int hf_smb_nt_access_mask_write_attributes = -1;
-static int hf_smb_nt_access_mask_read_attributes = -1;
-static int hf_smb_nt_access_mask_delete_child = -1;
-static int hf_smb_nt_access_mask_execute = -1;
-static int hf_smb_nt_access_mask_write_ea = -1;
-static int hf_smb_nt_access_mask_read_ea = -1;
-static int hf_smb_nt_access_mask_append = -1;
-static int hf_smb_nt_access_mask_write = -1;
-static int hf_smb_nt_access_mask_read = -1;
-static int hf_smb_nt_create_bits_oplock = -1;
-static int hf_smb_nt_create_bits_boplock = -1;
-static int hf_smb_nt_create_bits_dir = -1;
-static int hf_smb_nt_create_bits_ext_resp = -1;
-static int hf_smb_nt_create_options_directory_file = -1;
-static int hf_smb_nt_create_options_write_through = -1;
-static int hf_smb_nt_create_options_sequential_only = -1;
-static int hf_smb_nt_create_options_no_intermediate_buffering = -1;
-static int hf_smb_nt_create_options_sync_io_alert = -1;
-static int hf_smb_nt_create_options_sync_io_nonalert = -1;
-static int hf_smb_nt_create_options_non_directory_file = -1;
-static int hf_smb_nt_create_options_create_tree_connection = -1;
-static int hf_smb_nt_create_options_complete_if_oplocked = -1;
-static int hf_smb_nt_create_options_no_ea_knowledge = -1;
-static int hf_smb_nt_create_options_eight_dot_three_only = -1;
-static int hf_smb_nt_create_options_random_access = -1;
-static int hf_smb_nt_create_options_delete_on_close = -1;
-static int hf_smb_nt_create_options_open_by_fileid = -1;
-static int hf_smb_nt_create_options_backup_intent = -1;
-static int hf_smb_nt_create_options_no_compression = -1;
-static int hf_smb_nt_create_options_reserve_opfilter = -1;
-static int hf_smb_nt_create_options_open_reparse_point = -1;
-static int hf_smb_nt_create_options_open_no_recall = -1;
-static int hf_smb_nt_create_options_open_for_free_space_query = -1;
-static int hf_smb_nt_share_access_read = -1;
-static int hf_smb_nt_share_access_write = -1;
-static int hf_smb_nt_share_access_delete = -1;
-static int hf_smb_file_eattr = -1;
-static int hf_smb_file_eattr_read_only = -1;
-static int hf_smb_file_eattr_hidden = -1;
-static int hf_smb_file_eattr_system = -1;
-static int hf_smb_file_eattr_volume = -1;
-static int hf_smb_file_eattr_directory = -1;
-static int hf_smb_file_eattr_archive = -1;
-static int hf_smb_file_eattr_device = -1;
-static int hf_smb_file_eattr_normal = -1;
-static int hf_smb_file_eattr_temporary = -1;
-static int hf_smb_file_eattr_sparse = -1;
-static int hf_smb_file_eattr_reparse = -1;
-static int hf_smb_file_eattr_compressed = -1;
-static int hf_smb_file_eattr_offline = -1;
-static int hf_smb_file_eattr_not_content_indexed = -1;
-static int hf_smb_file_eattr_encrypted = -1;
-static int hf_smb_size_returned_quota_data = -1;
-static int hf_smb_sec_desc_len = -1;
-static int hf_smb_nt_qsd = -1;
-static int hf_smb_nt_qsd_owner = -1;
-static int hf_smb_nt_qsd_group = -1;
-static int hf_smb_nt_qsd_dacl = -1;
-static int hf_smb_nt_qsd_sacl = -1;
-static int hf_smb_extended_attributes = -1;
-static int hf_smb_oplock_level = -1;
-static int hf_smb_response_type = -1;
-static int hf_smb_create_action = -1;
-static int hf_smb_file_id = -1;
-static int hf_smb_file_id_64bit = -1;
-static int hf_smb_ea_error_offset = -1;
-static int hf_smb_end_of_file = -1;
-static int hf_smb_replace = -1;
-static int hf_smb_root_dir_handle = -1;
-static int hf_smb_target_name_len = -1;
-static int hf_smb_target_name = -1;
-static int hf_smb_device_type = -1;
-static int hf_smb_is_directory = -1;
-static int hf_smb_next_entry_offset = -1;
-static int hf_smb_change_time = -1;
-static int hf_smb_setup_len = -1;
-static int hf_smb_print_mode = -1;
-static int hf_smb_print_identifier = -1;
-static int hf_smb_restart_index = -1;
-static int hf_smb_print_queue_date = -1;
-static int hf_smb_print_queue_dos_date = -1;
-static int hf_smb_print_queue_dos_time = -1;
-static int hf_smb_print_status = -1;
-static int hf_smb_print_spool_file_number = -1;
-static int hf_smb_print_spool_file_size = -1;
-static int hf_smb_print_spool_file_name = -1;
-static int hf_smb_start_index = -1;
-static int hf_smb_originator_name = -1;
-static int hf_smb_destination_name = -1;
-static int hf_smb_message_len = -1;
-static int hf_smb_message = -1;
-static int hf_smb_mgid = -1;
-static int hf_smb_forwarded_name = -1;
-static int hf_smb_machine_name = -1;
-static int hf_smb_cancel_to = -1;
-static int hf_smb_trans2_subcmd = -1;
-static int hf_smb_trans_name = -1;
-static int hf_smb_transaction_flags = -1;
-static int hf_smb_transaction_flags_dtid = -1;
-static int hf_smb_transaction_flags_owt = -1;
-static int hf_smb_search_count = -1;
-static int hf_smb_search_pattern = -1;
-static int hf_smb_ff2 = -1;
-static int hf_smb_ff2_backup = -1;
-static int hf_smb_ff2_continue = -1;
-static int hf_smb_ff2_resume = -1;
-static int hf_smb_ff2_close_eos = -1;
-static int hf_smb_ff2_close = -1;
-static int hf_smb_ff2_information_level = -1;
-static int hf_smb_qpi_loi = -1;
-static int hf_smb_spi_loi = -1;
+static int hf_smb_file_size;
+static int hf_smb_search_attribute;
+static int hf_smb_search_attribute_read_only;
+static int hf_smb_search_attribute_hidden;
+static int hf_smb_search_attribute_system;
+static int hf_smb_search_attribute_volume;
+static int hf_smb_search_attribute_directory;
+static int hf_smb_search_attribute_archive;
+static int hf_smb_access_mode;
+static int hf_smb_access_sharing;
+static int hf_smb_access_locality;
+static int hf_smb_access_caching;
+static int hf_smb_access_writetru;
+static int hf_smb_desired_access;
+static int hf_smb_granted_access;
+static int hf_smb_create_time;
+static int hf_smb_modify_time;
+static int hf_smb_backup_time;
+static int hf_smb_mac_alloc_block_count;
+static int hf_smb_mac_alloc_block_size;
+static int hf_smb_mac_free_block_count;
+static int hf_smb_mac_fndrinfo;
+static int hf_smb_mac_root_file_count;
+static int hf_smb_mac_root_dir_count;
+static int hf_smb_mac_file_count;
+static int hf_smb_mac_dir_count;
+static int hf_smb_mac_sup;
+static int hf_smb_mac_sup_access_ctrl;
+static int hf_smb_mac_sup_getset_comments;
+static int hf_smb_mac_sup_desktopdb_calls;
+static int hf_smb_mac_sup_unique_ids;
+static int hf_smb_mac_sup_streams;
+static int hf_smb_create_dos_date;
+static int hf_smb_create_dos_time;
+static int hf_smb_last_write_time;
+static int hf_smb_last_write_dos_date;
+static int hf_smb_last_write_dos_time;
+static int hf_smb_access_time;
+static int hf_smb_access_dos_date;
+static int hf_smb_access_dos_time;
+static int hf_smb_old_file_name;
+static int hf_smb_offset;
+static int hf_smb_remaining;
+static int hf_smb_padding;
+static int hf_smb_file_data;
+/* static int hf_smb_raw_ea_data; */
+static int hf_smb_total_data_len;
+static int hf_smb_data_len;
+static int hf_smb_data_len_low;
+static int hf_smb_data_len_high;
+static int hf_smb_seek_mode;
+static int hf_smb_data_size;
+static int hf_smb_alloc_size;
+static int hf_smb_alloc_size64;
+static int hf_smb_max_count;
+static int hf_smb_max_count_low;
+static int hf_smb_max_count_high;
+static int hf_smb_min_count;
+static int hf_smb_timeout;
+static int hf_smb_high_offset;
+static int hf_smb_units;
+static int hf_smb_bpu;
+static int hf_smb_blocksize;
+static int hf_smb_freeunits;
+static int hf_smb_data_offset;
+static int hf_smb_dcm;
+static int hf_smb_request_mask;
+static int hf_smb_response_mask;
+static int hf_smb_search_id;
+static int hf_smb_write_mode;
+static int hf_smb_write_mode_write_through;
+static int hf_smb_write_mode_return_remaining;
+static int hf_smb_write_mode_raw;
+static int hf_smb_write_mode_message_start;
+static int hf_smb_write_mode_connectionless;
+static int hf_smb_resume_key_len;
+static int hf_smb_resume_find_id;
+static int hf_smb_resume_server_cookie;
+static int hf_smb_resume_client_cookie;
+static int hf_smb_andxoffset;
+static int hf_smb_lock_type;
+static int hf_smb_lock_type_large;
+static int hf_smb_lock_type_cancel;
+static int hf_smb_lock_type_change;
+static int hf_smb_lock_type_oplock;
+static int hf_smb_lock_type_shared;
+static int hf_smb_locking_ol;
+static int hf_smb_number_of_locks;
+static int hf_smb_number_of_unlocks;
+static int hf_smb_lock_long_offset;
+static int hf_smb_lock_long_length;
+static int hf_smb_file_type;
+static int hf_smb_ipc_state;
+static int hf_smb_ipc_state_nonblocking;
+static int hf_smb_ipc_state_endpoint;
+static int hf_smb_ipc_state_pipe_type;
+static int hf_smb_ipc_state_read_mode;
+static int hf_smb_ipc_state_icount;
+static int hf_smb_server_fid;
+static int hf_smb_open_flags;
+static int hf_smb_open_flags_add_info;
+static int hf_smb_open_flags_ex_oplock;
+static int hf_smb_open_flags_batch_oplock;
+static int hf_smb_open_flags_ealen;
+static int hf_smb_open_action;
+static int hf_smb_open_action_open;
+static int hf_smb_open_action_lock;
+static int hf_smb_vc_num;
+static int hf_smb_account;
+static int hf_smb_os;
+static int hf_smb_lanman;
+static int hf_smb_setup_action;
+static int hf_smb_setup_action_guest;
+static int hf_smb_fs;
+static int hf_smb_connect_flags;
+static int hf_smb_connect_flags_dtid;
+static int hf_smb_connect_flags_ext_sig;
+static int hf_smb_connect_flags_ext_resp;
+static int hf_smb_connect_support;
+static int hf_smb_connect_support_search;
+static int hf_smb_connect_support_in_dfs;
+static int hf_smb_connect_support_csc_mask_vals;
+static int hf_smb_connect_support_uniquefilename;
+static int hf_smb_connect_support_extended_signature;
+static int hf_smb_max_setup_count;
+static int hf_smb_total_param_count;
+static int hf_smb_total_data_count;
+static int hf_smb_max_param_count;
+static int hf_smb_max_data_count;
+static int hf_smb_param_disp16;
+static int hf_smb_param_count16;
+static int hf_smb_param_offset16;
+static int hf_smb_param_disp32;
+static int hf_smb_param_count32;
+static int hf_smb_param_offset32;
+static int hf_smb_data_disp16;
+static int hf_smb_data_count16;
+static int hf_smb_data_offset16;
+static int hf_smb_data_disp32;
+static int hf_smb_data_count32;
+static int hf_smb_data_offset32;
+static int hf_smb_setup_count;
+static int hf_smb_nt_trans_subcmd;
+static int hf_smb_nt_ioctl_isfsctl;
+static int hf_smb_nt_ioctl_flags_completion_filter;
+static int hf_smb_nt_ioctl_flags_root_handle;
+static int hf_smb_nt_notify_action;
+static int hf_smb_nt_notify_watch_tree;
+static int hf_smb_nt_notify_completion_filter;
+static int hf_smb_nt_notify_stream_write;
+static int hf_smb_nt_notify_stream_size;
+static int hf_smb_nt_notify_stream_name;
+static int hf_smb_nt_notify_security;
+static int hf_smb_nt_notify_ea;
+static int hf_smb_nt_notify_creation;
+static int hf_smb_nt_notify_last_access;
+static int hf_smb_nt_notify_last_write;
+static int hf_smb_nt_notify_size;
+static int hf_smb_nt_notify_attributes;
+static int hf_smb_nt_notify_dir_name;
+static int hf_smb_nt_notify_file_name;
+static int hf_smb_root_dir_fid;
+static int hf_smb_nt_create_disposition;
+static int hf_smb_sd_length;
+static int hf_smb_ea_list_length;
+static int hf_smb_ea_flags;
+static int hf_smb_ea_name_length;
+static int hf_smb_ea_data_length;
+static int hf_smb_ea_name;
+static int hf_smb_ea_data;
+static int hf_smb_file_name_len;
+static int hf_smb_nt_impersonation_level;
+static int hf_smb_nt_security_flags;
+static int hf_smb_nt_security_flags_context_tracking;
+static int hf_smb_nt_security_flags_effective_only;
+static int hf_smb_nt_access_mask_generic_read;
+static int hf_smb_nt_access_mask_generic_write;
+static int hf_smb_nt_access_mask_generic_execute;
+static int hf_smb_nt_access_mask_generic_all;
+static int hf_smb_nt_access_mask_maximum_allowed;
+static int hf_smb_nt_access_mask_system_security;
+static int hf_smb_nt_access_mask_synchronize;
+static int hf_smb_nt_access_mask_write_owner;
+static int hf_smb_nt_access_mask_write_dac;
+static int hf_smb_nt_access_mask_read_control;
+static int hf_smb_nt_access_mask_delete;
+static int hf_smb_nt_access_mask_write_attributes;
+static int hf_smb_nt_access_mask_read_attributes;
+static int hf_smb_nt_access_mask_delete_child;
+static int hf_smb_nt_access_mask_execute;
+static int hf_smb_nt_access_mask_write_ea;
+static int hf_smb_nt_access_mask_read_ea;
+static int hf_smb_nt_access_mask_append;
+static int hf_smb_nt_access_mask_write;
+static int hf_smb_nt_access_mask_read;
+static int hf_smb_nt_create_bits_oplock;
+static int hf_smb_nt_create_bits_boplock;
+static int hf_smb_nt_create_bits_dir;
+static int hf_smb_nt_create_bits_ext_resp;
+static int hf_smb_nt_create_options_directory_file;
+static int hf_smb_nt_create_options_write_through;
+static int hf_smb_nt_create_options_sequential_only;
+static int hf_smb_nt_create_options_no_intermediate_buffering;
+static int hf_smb_nt_create_options_sync_io_alert;
+static int hf_smb_nt_create_options_sync_io_nonalert;
+static int hf_smb_nt_create_options_non_directory_file;
+static int hf_smb_nt_create_options_create_tree_connection;
+static int hf_smb_nt_create_options_complete_if_oplocked;
+static int hf_smb_nt_create_options_no_ea_knowledge;
+static int hf_smb_nt_create_options_eight_dot_three_only;
+static int hf_smb_nt_create_options_random_access;
+static int hf_smb_nt_create_options_delete_on_close;
+static int hf_smb_nt_create_options_open_by_fileid;
+static int hf_smb_nt_create_options_backup_intent;
+static int hf_smb_nt_create_options_no_compression;
+static int hf_smb_nt_create_options_reserve_opfilter;
+static int hf_smb_nt_create_options_open_reparse_point;
+static int hf_smb_nt_create_options_open_no_recall;
+static int hf_smb_nt_create_options_open_for_free_space_query;
+static int hf_smb_nt_share_access_read;
+static int hf_smb_nt_share_access_write;
+static int hf_smb_nt_share_access_delete;
+static int hf_smb_file_eattr;
+static int hf_smb_file_eattr_read_only;
+static int hf_smb_file_eattr_hidden;
+static int hf_smb_file_eattr_system;
+static int hf_smb_file_eattr_volume;
+static int hf_smb_file_eattr_directory;
+static int hf_smb_file_eattr_archive;
+static int hf_smb_file_eattr_device;
+static int hf_smb_file_eattr_normal;
+static int hf_smb_file_eattr_temporary;
+static int hf_smb_file_eattr_sparse;
+static int hf_smb_file_eattr_reparse;
+static int hf_smb_file_eattr_compressed;
+static int hf_smb_file_eattr_offline;
+static int hf_smb_file_eattr_not_content_indexed;
+static int hf_smb_file_eattr_encrypted;
+static int hf_smb_size_returned_quota_data;
+static int hf_smb_sec_desc_len;
+static int hf_smb_nt_qsd;
+static int hf_smb_nt_qsd_owner;
+static int hf_smb_nt_qsd_group;
+static int hf_smb_nt_qsd_dacl;
+static int hf_smb_nt_qsd_sacl;
+static int hf_smb_extended_attributes;
+static int hf_smb_oplock_level;
+static int hf_smb_response_type;
+static int hf_smb_create_action;
+static int hf_smb_file_id;
+static int hf_smb_file_id_64bit;
+static int hf_smb_ea_error_offset;
+static int hf_smb_end_of_file;
+static int hf_smb_replace;
+static int hf_smb_root_dir_handle;
+static int hf_smb_target_name_len;
+static int hf_smb_target_name;
+static int hf_smb_device_type;
+static int hf_smb_is_directory;
+static int hf_smb_next_entry_offset;
+static int hf_smb_change_time;
+static int hf_smb_setup_len;
+static int hf_smb_print_mode;
+static int hf_smb_print_identifier;
+static int hf_smb_restart_index;
+static int hf_smb_print_queue_date;
+static int hf_smb_print_queue_dos_date;
+static int hf_smb_print_queue_dos_time;
+static int hf_smb_print_status;
+static int hf_smb_print_spool_file_number;
+static int hf_smb_print_spool_file_size;
+static int hf_smb_print_spool_file_name;
+static int hf_smb_start_index;
+static int hf_smb_originator_name;
+static int hf_smb_destination_name;
+static int hf_smb_message_len;
+static int hf_smb_message;
+static int hf_smb_mgid;
+static int hf_smb_forwarded_name;
+static int hf_smb_machine_name;
+static int hf_smb_cancel_to;
+static int hf_smb_trans2_subcmd;
+static int hf_smb_trans_name;
+static int hf_smb_transaction_flags;
+static int hf_smb_transaction_flags_dtid;
+static int hf_smb_transaction_flags_owt;
+static int hf_smb_search_count;
+static int hf_smb_search_pattern;
+static int hf_smb_ff2;
+static int hf_smb_ff2_backup;
+static int hf_smb_ff2_continue;
+static int hf_smb_ff2_resume;
+static int hf_smb_ff2_close_eos;
+static int hf_smb_ff2_close;
+static int hf_smb_ff2_information_level;
+static int hf_smb_qpi_loi;
+static int hf_smb_spi_loi;
 #if 0
-static int hf_smb_sfi = -1;
-static int hf_smb_sfi_writetru = -1;
-static int hf_smb_sfi_caching = -1;
+static int hf_smb_sfi;
+static int hf_smb_sfi_writetru;
+static int hf_smb_sfi_caching;
 #endif
-static int hf_smb_storage_type = -1;
-static int hf_smb_resume = -1;
-static int hf_smb_max_referral_level = -1;
-static int hf_smb_qfsi_information_level = -1;
-static int hf_smb_sfsi_information_level = -1;
-static int hf_smb_number_of_links = -1;
-static int hf_smb_delete_pending = -1;
-static int hf_smb_index_number = -1;
-static int hf_smb_position = -1;
-/* static int hf_smb_current_offset = -1; */
-static int hf_smb_t2_alignment = -1;
-static int hf_smb_t2_stream_name_length = -1;
-static int hf_smb_t2_stream_size = -1;
-static int hf_smb_t2_stream_name = -1;
-static int hf_smb_t2_compressed_file_size = -1;
-static int hf_smb_t2_compressed_format = -1;
-static int hf_smb_t2_compressed_unit_shift = -1;
-static int hf_smb_t2_compressed_chunk_shift = -1;
-static int hf_smb_t2_compressed_cluster_shift = -1;
-static int hf_smb_t2_marked_for_deletion = -1;
-static int hf_smb_dfs_path_consumed = -1;
-static int hf_smb_dfs_num_referrals = -1;
-static int hf_smb_get_dfs_flags = -1;
-static int hf_smb_get_dfs_server_hold_storage = -1;
-static int hf_smb_get_dfs_fielding = -1;
-static int hf_smb_dfs_referral_version = -1;
-static int hf_smb_dfs_referral_size = -1;
-static int hf_smb_dfs_referral_server_type = -1;
-static int hf_smb_dfs_referral_flags = -1;
-static int hf_smb_dfs_referral_flags_name_list_referral = -1;
-static int hf_smb_dfs_referral_flags_target_set_boundary = -1;
-static int hf_smb_dfs_referral_node_offset = -1;
-static int hf_smb_dfs_referral_node = -1;
-static int hf_smb_dfs_referral_proximity = -1;
-static int hf_smb_dfs_referral_ttl = -1;
-static int hf_smb_dfs_referral_path_offset = -1;
-static int hf_smb_dfs_referral_path = -1;
-static int hf_smb_dfs_referral_alt_path_offset = -1;
-static int hf_smb_dfs_referral_alt_path = -1;
-static int hf_smb_dfs_referral_domain_offset = -1;
-static int hf_smb_dfs_referral_number_of_expnames = -1;
-static int hf_smb_dfs_referral_expnames_offset = -1;
-static int hf_smb_dfs_referral_domain_name = -1;
-static int hf_smb_dfs_referral_expname = -1;
-static int hf_smb_dfs_referral_server_guid = -1;
-static int hf_smb_end_of_search = -1;
-static int hf_smb_last_name_offset = -1;
-static int hf_smb_fn_information_level = -1;
-static int hf_smb_monitor_handle = -1;
-static int hf_smb_change_count = -1;
-static int hf_smb_file_index = -1;
-static int hf_smb_short_file_name = -1;
-static int hf_smb_short_file_name_len = -1;
-static int hf_smb_fs_id = -1;
-static int hf_smb_sector_unit = -1;
-static int hf_smb_fs_units = -1;
-static int hf_smb_fs_sector = -1;
-static int hf_smb_avail_units = -1;
-static int hf_smb_volume_serial_num = -1;
-static int hf_smb_volume_label_len = -1;
-static int hf_smb_volume_label = -1;
-static int hf_smb_free_alloc_units64 = -1;
-static int hf_smb_caller_free_alloc_units64 = -1;
-static int hf_smb_actual_free_alloc_units64 = -1;
-static int hf_smb_max_name_len = -1;
-static int hf_smb_fs_name_len = -1;
-static int hf_smb_fs_name = -1;
-static int hf_smb_device_char = -1;
-static int hf_smb_device_char_removable = -1;
-static int hf_smb_device_char_read_only = -1;
-static int hf_smb_device_char_floppy = -1;
-static int hf_smb_device_char_write_once = -1;
-static int hf_smb_device_char_remote = -1;
-static int hf_smb_device_char_mounted = -1;
-static int hf_smb_device_char_virtual = -1;
-static int hf_smb_device_char_secure_open = -1;
-static int hf_smb_device_char_ts = -1;
-static int hf_smb_device_char_webdav = -1;
-static int hf_smb_device_char_aat = -1;
-static int hf_smb_device_char_portable = -1;
-static int hf_smb_fs_attr = -1;
-static int hf_smb_fs_attr_css = -1;
-static int hf_smb_fs_attr_cpn = -1;
-static int hf_smb_fs_attr_uod = -1;
-static int hf_smb_fs_attr_pacls = -1;
-static int hf_smb_fs_attr_fc = -1;
-static int hf_smb_fs_attr_vq = -1;
-static int hf_smb_fs_attr_ssf = -1;
-static int hf_smb_fs_attr_srp = -1;
-static int hf_smb_fs_attr_srs = -1;
-static int hf_smb_fs_attr_sla = -1;
-static int hf_smb_fs_attr_vic = -1;
-static int hf_smb_fs_attr_soids = -1;
-static int hf_smb_fs_attr_se = -1;
-static int hf_smb_fs_attr_ns = -1;
-static int hf_smb_fs_attr_rov = -1;
-static int hf_smb_fs_attr_swo = -1;
-static int hf_smb_fs_attr_st = -1;
-static int hf_smb_fs_attr_shl = -1;
-static int hf_smb_fs_attr_sis = -1;
-static int hf_smb_fs_attr_sbr = -1;
-static int hf_smb_fs_attr_ssv = -1;
-static int hf_smb_quota_flags = -1;
-static int hf_smb_quota_flags_enabled = -1;
-static int hf_smb_quota_flags_deny_disk = -1;
-static int hf_smb_quota_flags_log_limit = -1;
-static int hf_smb_quota_flags_log_warning = -1;
-static int hf_smb_soft_quota_limit = -1;
-static int hf_smb_hard_quota_limit = -1;
-static int hf_smb_user_quota_used = -1;
-static int hf_smb_user_quota_change_time = -1;
-static int hf_smb_length_of_sid = -1;
-static int hf_smb_user_quota_offset = -1;
-static int hf_smb_nt_rename_level = -1;
-static int hf_smb_cluster_count = -1;
-static int hf_smb_segments = -1;
-static int hf_smb_segment = -1;
-static int hf_smb_segment_overlap = -1;
-static int hf_smb_segment_overlap_conflict = -1;
-static int hf_smb_segment_multiple_tails = -1;
-static int hf_smb_segment_too_long_fragment = -1;
-static int hf_smb_segment_error = -1;
-static int hf_smb_segment_count = -1;
-static int hf_smb_reassembled_length = -1;
-static int hf_smb_pipe_write_len = -1;
-static int hf_smb_unix_major_version = -1;
-static int hf_smb_unix_minor_version = -1;
-static int hf_smb_unix_capability = -1;
-static int hf_smb_unix_capability_fcntl = -1;
-static int hf_smb_unix_capability_posix_acl = -1;
-static int hf_smb_unix_capability_xattr = -1;
-static int hf_smb_unix_capability_attr = -1;
-static int hf_smb_unix_capability_posix_paths = -1;
-static int hf_smb_unix_capability_posix_path_ops = -1;
-static int hf_smb_unix_capability_large_read = -1;
-static int hf_smb_unix_capability_large_write = -1;
-static int hf_smb_unix_capability_encryption = -1;
-static int hf_smb_unix_capability_mandatory_crypto = -1;
-static int hf_smb_unix_capability_proxy = -1;
-static int hf_smb_unix_file_link_dest = -1;
-static int hf_smb_unix_file_size = -1;
-static int hf_smb_unix_file_num_bytes = -1;
-static int hf_smb_unix_file_last_status = -1;
-static int hf_smb_unix_file_last_access = -1;
-static int hf_smb_unix_file_last_change = -1;
-static int hf_smb_unix_file_creation_time = -1;
-static int hf_smb_unix_file_uid = -1;
-static int hf_smb_unix_file_gid = -1;
-static int hf_smb_unix_file_type = -1;
-static int hf_smb_unix_file_dev_major = -1;
-static int hf_smb_unix_file_dev_minor = -1;
-static int hf_smb_unix_file_unique_id = -1;
-static int hf_smb_unix_file_permissions = -1;
-static int hf_smb_unix_file_nlinks = -1;
-static int hf_smb_unix_info2_file_flags = -1;
-static int hf_smb_unix_info2_file_flags_mask = -1;
-static int hf_smb_unix_info2_file_flags_secure_delete = -1;
-static int hf_smb_unix_info2_file_flags_enable_undelete = -1;
-static int hf_smb_unix_info2_file_flags_synchronous = -1;
-static int hf_smb_unix_info2_file_flags_immutable = -1;
-static int hf_smb_unix_info2_file_flags_append_only = -1;
-static int hf_smb_unix_info2_file_flags_do_not_backup = -1;
-static int hf_smb_unix_info2_file_flags_no_update_atime = -1;
-static int hf_smb_unix_info2_file_flags_hidden = -1;
-static int hf_smb_unix_file_name_length = -1;
-static int hf_smb_unix_file_name = -1;
-static int hf_smb_unix_find_file_nextoffset = -1;
-static int hf_smb_unix_find_file_resumekey = -1;
-static int hf_smb_unix_whoami_mapflags = -1;
-static int hf_smb_unix_whoami_mapflags_mask = -1;
-static int hf_smb_unix_whoami_num_supl_gids = -1;
-static int hf_smb_unix_whoami_num_supl_sids = -1;
-static int hf_smb_unix_whoami_sids_buflen = -1;
-static int hf_smb_disposition_delete_on_close = -1;
-static int hf_smb_pipe_info_flag = -1;
-static int hf_smb_mode = -1;
-static int hf_smb_attribute = -1;
-static int hf_smb_reparse_tag = -1;
-static int hf_smb_logged_in = -1;
-static int hf_smb_logged_out = -1;
-static int hf_smb_file_rw_offset = -1;
-static int hf_smb_file_rw_length = -1;
-static int hf_smb_posix_acl_version = -1;
-static int hf_smb_posix_num_file_aces = -1;
-static int hf_smb_posix_num_def_aces = -1;
-static int hf_smb_posix_ace_type = -1;
-static int hf_smb_posix_ace_flags = -1;
-static int hf_smb_posix_ace_perm_read = -1;
-static int hf_smb_posix_ace_perm_write = -1;
-static int hf_smb_posix_ace_perm_execute = -1;
-static int hf_smb_posix_ace_perm_owner_uid = -1;
-static int hf_smb_posix_ace_perm_owner_gid = -1;
-static int hf_smb_posix_ace_perm_uid = -1;
-static int hf_smb_posix_ace_perm_gid = -1;
-static int hf_smb_trans_data_setup_word = -1;
-static int hf_smb_trans_data_parameters = -1;
-static int hf_smb_trans_data = -1;
-static int hf_smb_extra_byte_parameters = -1;
-static int hf_smb_file_access_mask_full_control = -1;
-static int hf_smb_dir_access_mask_full_control = -1;
-static int hf_smb_word_unk_response_format = -1;
-static int hf_smb_nt_transaction_setup = -1;
-static int hf_smb_server_component = -1;
-static int hf_smb_byte_parameters = -1;
-static int hf_smb_word_parameters = -1;
-
-static gint ett_smb = -1;
-static gint ett_smb_fid = -1;
-static gint ett_smb_tid = -1;
-static gint ett_smb_uid = -1;
-static gint ett_smb_hdr = -1;
-static gint ett_smb_command = -1;
-static gint ett_smb_fileattributes = -1;
-static gint ett_smb_capabilities = -1;
-static gint ett_smb_aflags = -1;
-static gint ett_smb_dialect = -1;
-static gint ett_smb_dialects = -1;
-static gint ett_smb_mode = -1;
-static gint ett_smb_rawmode = -1;
-static gint ett_smb_flags = -1;
-static gint ett_smb_flags2 = -1;
-static gint ett_smb_desiredaccess = -1;
-static gint ett_smb_search = -1;
-static gint ett_smb_file = -1;
-static gint ett_smb_openfunction = -1;
-static gint ett_smb_filetype = -1;
-static gint ett_smb_openaction = -1;
-static gint ett_smb_writemode = -1;
-static gint ett_smb_lock_type = -1;
-static gint ett_smb_ssetupandxaction = -1;
-static gint ett_smb_optionsup = -1;
-static gint ett_smb_time_date = -1;
-static gint ett_smb_move_copy_flags = -1;
-static gint ett_smb_file_attributes = -1;
-static gint ett_smb_search_resume_key = -1;
-static gint ett_smb_search_dir_info = -1;
-static gint ett_smb_unlocks = -1;
-static gint ett_smb_unlock = -1;
-static gint ett_smb_locks = -1;
-static gint ett_smb_lock = -1;
-static gint ett_smb_open_flags = -1;
-static gint ett_smb_ipc_state = -1;
-static gint ett_smb_open_action = -1;
-static gint ett_smb_setup_action = -1;
-static gint ett_smb_connect_flags = -1;
-static gint ett_smb_connect_support_bits = -1;
-static gint ett_smb_nt_access_mask = -1;
-static gint ett_smb_nt_create_bits = -1;
-static gint ett_smb_nt_create_options = -1;
-static gint ett_smb_nt_share_access = -1;
-static gint ett_smb_nt_security_flags = -1;
-static gint ett_smb_nt_trans_setup = -1;
-static gint ett_smb_nt_trans_data = -1;
-static gint ett_smb_nt_trans_param = -1;
-static gint ett_smb_nt_notify_completion_filter = -1;
-static gint ett_smb_nt_ioctl_flags = -1;
-static gint ett_smb_security_information_mask = -1;
-static gint ett_smb_print_queue_entry = -1;
-static gint ett_smb_transaction_flags = -1;
-static gint ett_smb_transaction_params = -1;
-static gint ett_smb_find_first2_flags = -1;
-static gint ett_smb_mac_support_flags = -1;
+static int hf_smb_storage_type;
+static int hf_smb_resume;
+static int hf_smb_max_referral_level;
+static int hf_smb_qfsi_information_level;
+static int hf_smb_sfsi_information_level;
+static int hf_smb_number_of_links;
+static int hf_smb_delete_pending;
+static int hf_smb_index_number;
+static int hf_smb_position;
+/* static int hf_smb_current_offset; */
+static int hf_smb_t2_alignment;
+static int hf_smb_t2_stream_name_length;
+static int hf_smb_t2_stream_size;
+static int hf_smb_t2_stream_name;
+static int hf_smb_t2_compressed_file_size;
+static int hf_smb_t2_compressed_format;
+static int hf_smb_t2_compressed_unit_shift;
+static int hf_smb_t2_compressed_chunk_shift;
+static int hf_smb_t2_compressed_cluster_shift;
+static int hf_smb_t2_marked_for_deletion;
+static int hf_smb_dfs_path_consumed;
+static int hf_smb_dfs_num_referrals;
+static int hf_smb_get_dfs_flags;
+static int hf_smb_get_dfs_server_hold_storage;
+static int hf_smb_get_dfs_fielding;
+static int hf_smb_dfs_referral_version;
+static int hf_smb_dfs_referral_size;
+static int hf_smb_dfs_referral_server_type;
+static int hf_smb_dfs_referral_flags;
+static int hf_smb_dfs_referral_flags_name_list_referral;
+static int hf_smb_dfs_referral_flags_target_set_boundary;
+static int hf_smb_dfs_referral_node_offset;
+static int hf_smb_dfs_referral_node;
+static int hf_smb_dfs_referral_proximity;
+static int hf_smb_dfs_referral_ttl;
+static int hf_smb_dfs_referral_path_offset;
+static int hf_smb_dfs_referral_path;
+static int hf_smb_dfs_referral_alt_path_offset;
+static int hf_smb_dfs_referral_alt_path;
+static int hf_smb_dfs_referral_domain_offset;
+static int hf_smb_dfs_referral_number_of_expnames;
+static int hf_smb_dfs_referral_expnames_offset;
+static int hf_smb_dfs_referral_domain_name;
+static int hf_smb_dfs_referral_expname;
+static int hf_smb_dfs_referral_server_guid;
+static int hf_smb_end_of_search;
+static int hf_smb_last_name_offset;
+static int hf_smb_fn_information_level;
+static int hf_smb_monitor_handle;
+static int hf_smb_change_count;
+static int hf_smb_file_index;
+static int hf_smb_short_file_name;
+static int hf_smb_short_file_name_len;
+static int hf_smb_fs_id;
+static int hf_smb_sector_unit;
+static int hf_smb_fs_units;
+static int hf_smb_fs_sector;
+static int hf_smb_avail_units;
+static int hf_smb_volume_serial_num;
+static int hf_smb_volume_label_len;
+static int hf_smb_volume_label;
+static int hf_smb_free_alloc_units64;
+static int hf_smb_caller_free_alloc_units64;
+static int hf_smb_actual_free_alloc_units64;
+static int hf_smb_max_name_len;
+static int hf_smb_fs_name_len;
+static int hf_smb_fs_name;
+static int hf_smb_device_char;
+static int hf_smb_device_char_removable;
+static int hf_smb_device_char_read_only;
+static int hf_smb_device_char_floppy;
+static int hf_smb_device_char_write_once;
+static int hf_smb_device_char_remote;
+static int hf_smb_device_char_mounted;
+static int hf_smb_device_char_virtual;
+static int hf_smb_device_char_secure_open;
+static int hf_smb_device_char_ts;
+static int hf_smb_device_char_webdav;
+static int hf_smb_device_char_aat;
+static int hf_smb_device_char_portable;
+static int hf_smb_fs_attr;
+static int hf_smb_fs_attr_css;
+static int hf_smb_fs_attr_cpn;
+static int hf_smb_fs_attr_uod;
+static int hf_smb_fs_attr_pacls;
+static int hf_smb_fs_attr_fc;
+static int hf_smb_fs_attr_vq;
+static int hf_smb_fs_attr_ssf;
+static int hf_smb_fs_attr_srp;
+static int hf_smb_fs_attr_srs;
+static int hf_smb_fs_attr_sla;
+static int hf_smb_fs_attr_vic;
+static int hf_smb_fs_attr_soids;
+static int hf_smb_fs_attr_se;
+static int hf_smb_fs_attr_ns;
+static int hf_smb_fs_attr_rov;
+static int hf_smb_fs_attr_swo;
+static int hf_smb_fs_attr_st;
+static int hf_smb_fs_attr_shl;
+static int hf_smb_fs_attr_sis;
+static int hf_smb_fs_attr_sbr;
+static int hf_smb_fs_attr_ssv;
+static int hf_smb_quota_flags;
+static int hf_smb_quota_flags_enabled;
+static int hf_smb_quota_flags_deny_disk;
+static int hf_smb_quota_flags_log_limit;
+static int hf_smb_quota_flags_log_warning;
+static int hf_smb_soft_quota_limit;
+static int hf_smb_hard_quota_limit;
+static int hf_smb_user_quota_used;
+static int hf_smb_user_quota_change_time;
+static int hf_smb_length_of_sid;
+static int hf_smb_user_quota_offset;
+static int hf_smb_nt_rename_level;
+static int hf_smb_cluster_count;
+static int hf_smb_segments;
+static int hf_smb_segment;
+static int hf_smb_segment_overlap;
+static int hf_smb_segment_overlap_conflict;
+static int hf_smb_segment_multiple_tails;
+static int hf_smb_segment_too_long_fragment;
+static int hf_smb_segment_error;
+static int hf_smb_segment_count;
+static int hf_smb_reassembled_length;
+static int hf_smb_pipe_write_len;
+static int hf_smb_unix_major_version;
+static int hf_smb_unix_minor_version;
+static int hf_smb_unix_capability;
+static int hf_smb_unix_capability_fcntl;
+static int hf_smb_unix_capability_posix_acl;
+static int hf_smb_unix_capability_xattr;
+static int hf_smb_unix_capability_attr;
+static int hf_smb_unix_capability_posix_paths;
+static int hf_smb_unix_capability_posix_path_ops;
+static int hf_smb_unix_capability_large_read;
+static int hf_smb_unix_capability_large_write;
+static int hf_smb_unix_capability_encryption;
+static int hf_smb_unix_capability_mandatory_crypto;
+static int hf_smb_unix_capability_proxy;
+static int hf_smb_unix_file_link_dest;
+static int hf_smb_unix_file_size;
+static int hf_smb_unix_file_num_bytes;
+static int hf_smb_unix_file_last_status;
+static int hf_smb_unix_file_last_access;
+static int hf_smb_unix_file_last_change;
+static int hf_smb_unix_file_creation_time;
+static int hf_smb_unix_file_uid;
+static int hf_smb_unix_file_gid;
+static int hf_smb_unix_file_type;
+static int hf_smb_unix_file_dev_major;
+static int hf_smb_unix_file_dev_minor;
+static int hf_smb_unix_file_unique_id;
+static int hf_smb_unix_file_permissions;
+static int hf_smb_unix_file_nlinks;
+static int hf_smb_unix_info2_file_flags;
+static int hf_smb_unix_info2_file_flags_mask;
+static int hf_smb_unix_info2_file_flags_secure_delete;
+static int hf_smb_unix_info2_file_flags_enable_undelete;
+static int hf_smb_unix_info2_file_flags_synchronous;
+static int hf_smb_unix_info2_file_flags_immutable;
+static int hf_smb_unix_info2_file_flags_append_only;
+static int hf_smb_unix_info2_file_flags_do_not_backup;
+static int hf_smb_unix_info2_file_flags_no_update_atime;
+static int hf_smb_unix_info2_file_flags_hidden;
+static int hf_smb_unix_file_name_length;
+static int hf_smb_unix_file_name;
+static int hf_smb_unix_find_file_nextoffset;
+static int hf_smb_unix_find_file_resumekey;
+static int hf_smb_unix_whoami_mapflags;
+static int hf_smb_unix_whoami_mapflags_mask;
+static int hf_smb_unix_whoami_num_supl_gids;
+static int hf_smb_unix_whoami_num_supl_sids;
+static int hf_smb_unix_whoami_sids_buflen;
+static int hf_smb_disposition_delete_on_close;
+static int hf_smb_pipe_info_flag;
+static int hf_smb_mode;
+static int hf_smb_attribute;
+static int hf_smb_reparse_tag;
+static int hf_smb_logged_in;
+static int hf_smb_logged_out;
+static int hf_smb_file_rw_offset;
+static int hf_smb_file_rw_length;
+static int hf_smb_posix_acl_version;
+static int hf_smb_posix_num_file_aces;
+static int hf_smb_posix_num_def_aces;
+static int hf_smb_posix_ace_type;
+static int hf_smb_posix_ace_flags;
+static int hf_smb_posix_ace_perm_read;
+static int hf_smb_posix_ace_perm_write;
+static int hf_smb_posix_ace_perm_execute;
+static int hf_smb_posix_ace_perm_owner_uid;
+static int hf_smb_posix_ace_perm_owner_gid;
+static int hf_smb_posix_ace_perm_uid;
+static int hf_smb_posix_ace_perm_gid;
+static int hf_smb_trans_data_setup_word;
+static int hf_smb_trans_data_parameters;
+static int hf_smb_trans_data;
+static int hf_smb_extra_byte_parameters;
+static int hf_smb_file_access_mask_full_control;
+static int hf_smb_dir_access_mask_full_control;
+static int hf_smb_word_unk_response_format;
+static int hf_smb_nt_transaction_setup;
+static int hf_smb_server_component;
+static int hf_smb_byte_parameters;
+static int hf_smb_word_parameters;
+
+static gint ett_smb;
+static gint ett_smb_fid;
+static gint ett_smb_tid;
+static gint ett_smb_uid;
+static gint ett_smb_hdr;
+static gint ett_smb_command;
+static gint ett_smb_fileattributes;
+static gint ett_smb_capabilities;
+static gint ett_smb_aflags;
+static gint ett_smb_dialect;
+static gint ett_smb_dialects;
+static gint ett_smb_mode;
+static gint ett_smb_rawmode;
+static gint ett_smb_flags;
+static gint ett_smb_flags2;
+static gint ett_smb_desiredaccess;
+static gint ett_smb_search;
+static gint ett_smb_file;
+static gint ett_smb_openfunction;
+static gint ett_smb_filetype;
+static gint ett_smb_openaction;
+static gint ett_smb_writemode;
+static gint ett_smb_lock_type;
+static gint ett_smb_ssetupandxaction;
+static gint ett_smb_optionsup;
+static gint ett_smb_time_date;
+static gint ett_smb_move_copy_flags;
+static gint ett_smb_file_attributes;
+static gint ett_smb_search_resume_key;
+static gint ett_smb_search_dir_info;
+static gint ett_smb_unlocks;
+static gint ett_smb_unlock;
+static gint ett_smb_locks;
+static gint ett_smb_lock;
+static gint ett_smb_open_flags;
+static gint ett_smb_ipc_state;
+static gint ett_smb_open_action;
+static gint ett_smb_setup_action;
+static gint ett_smb_connect_flags;
+static gint ett_smb_connect_support_bits;
+static gint ett_smb_nt_access_mask;
+static gint ett_smb_nt_create_bits;
+static gint ett_smb_nt_create_options;
+static gint ett_smb_nt_share_access;
+static gint ett_smb_nt_security_flags;
+static gint ett_smb_nt_trans_setup;
+static gint ett_smb_nt_trans_data;
+static gint ett_smb_nt_trans_param;
+static gint ett_smb_nt_notify_completion_filter;
+static gint ett_smb_nt_ioctl_flags;
+static gint ett_smb_security_information_mask;
+static gint ett_smb_print_queue_entry;
+static gint ett_smb_transaction_flags;
+static gint ett_smb_transaction_params;
+static gint ett_smb_find_first2_flags;
+static gint ett_smb_mac_support_flags;
 #if 0
-static gint ett_smb_ioflag = -1;
+static gint ett_smb_ioflag;
 #endif
-static gint ett_smb_transaction_data = -1;
-static gint ett_smb_stream_info = -1;
-static gint ett_smb_dfs_referrals = -1;
-static gint ett_smb_dfs_referral = -1;
-static gint ett_smb_dfs_referral_flags = -1;
-static gint ett_smb_dfs_referral_expnames = -1;
-static gint ett_smb_get_dfs_flags = -1;
-static gint ett_smb_ff2_data = -1;
-static gint ett_smb_device_characteristics = -1;
-static gint ett_smb_fs_attributes = -1;
-static gint ett_smb_segments = -1;
-static gint ett_smb_segment = -1;
-static gint ett_smb_quotaflags = -1;
-static gint ett_smb_secblob = -1;
-static gint ett_smb_unicode_password = -1;
-static gint ett_smb_ea = -1;
-static gint ett_smb_unix_capabilities = -1;
-static gint ett_smb_unix_whoami_gids = -1;
-static gint ett_smb_unix_whoami_sids = -1;
-static gint ett_smb_posix_ace = -1;
-static gint ett_smb_posix_ace_perms = -1;
-static gint ett_smb_info2_file_flags = -1;
-
-static expert_field ei_smb_missing_word_parameters = EI_INIT;
-static expert_field ei_smb_mal_information_level = EI_INIT;
-static expert_field ei_smb_not_implemented = EI_INIT;
-static expert_field ei_smb_nt_transaction_setup = EI_INIT;
-static expert_field ei_smb_posix_ace_type = EI_INIT;
-static expert_field ei_smb_info_level_unknown = EI_INIT;
-static expert_field ei_smb_info_level_not_understood = EI_INIT;
+static gint ett_smb_transaction_data;
+static gint ett_smb_stream_info;
+static gint ett_smb_dfs_referrals;
+static gint ett_smb_dfs_referral;
+static gint ett_smb_dfs_referral_flags;
+static gint ett_smb_dfs_referral_expnames;
+static gint ett_smb_get_dfs_flags;
+static gint ett_smb_ff2_data;
+static gint ett_smb_device_characteristics;
+static gint ett_smb_fs_attributes;
+static gint ett_smb_segments;
+static gint ett_smb_segment;
+static gint ett_smb_quotaflags;
+static gint ett_smb_secblob;
+static gint ett_smb_unicode_password;
+static gint ett_smb_ea;
+static gint ett_smb_unix_capabilities;
+static gint ett_smb_unix_whoami_gids;
+static gint ett_smb_unix_whoami_sids;
+static gint ett_smb_posix_ace;
+static gint ett_smb_posix_ace_perms;
+static gint ett_smb_info2_file_flags;
+
+static expert_field ei_smb_missing_word_parameters;
+static expert_field ei_smb_mal_information_level;
+static expert_field ei_smb_not_implemented;
+static expert_field ei_smb_nt_transaction_setup;
+static expert_field ei_smb_posix_ace_type;
+static expert_field ei_smb_info_level_unknown;
+static expert_field ei_smb_info_level_not_understood;
 
 static int smb_tap = -1;
 static int smb_eo_tap = -1;
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c
index b52a177c7c..cc70b1909e 100644
--- a/epan/dissectors/packet-smb2.c
+++ b/epan/dissectors/packet-smb2.c
@@ -110,687 +110,687 @@ static const char smb_transform_header_label[] = "SMB2 Transform Header";
 static const char smb_comp_transform_header_label[] = "SMB2 Compression Transform Header";
 static const char smb_bad_header_label[] = "Bad SMB2 Header";
 
-static int proto_smb2 = -1;
-static int hf_smb2_cmd = -1;
-static int hf_smb2_nt_status = -1;
-static int hf_smb2_response_to = -1;
-static int hf_smb2_response_in = -1;
-static int hf_smb2_time = -1;
-static int hf_smb2_preauth_hash = -1;
-static int hf_smb2_header_len = -1;
-static int hf_smb2_msg_id = -1;
-static int hf_smb2_pid = -1;
-static int hf_smb2_tid = -1;
-static int hf_smb2_aid = -1;
-static int hf_smb2_sesid = -1;
-static int hf_smb2_previous_sesid = -1;
-static int hf_smb2_flags_response = -1;
-static int hf_smb2_flags_async_cmd = -1;
-static int hf_smb2_flags_dfs_op = -1;
-static int hf_smb2_flags_chained = -1;
-static int hf_smb2_flags_signature = -1;
-static int hf_smb2_flags_replay_operation = -1;
-static int hf_smb2_flags_priority_mask = -1;
-static int hf_smb2_chain_offset = -1;
-static int hf_smb2_security_blob = -1;
-static int hf_smb2_ioctl_in_data = -1;
-static int hf_smb2_ioctl_out_data = -1;
-static int hf_smb2_unknown = -1;
-static int hf_smb2_root_directory_mbz = -1;
-static int hf_smb2_twrp_timestamp = -1;
-static int hf_smb2_mxac_timestamp = -1;
-static int hf_smb2_mxac_status = -1;
-static int hf_smb2_qfid_fid = -1;
-static int hf_smb2_create_timestamp = -1;
-static int hf_smb2_oplock = -1;
-static int hf_smb2_close_flags = -1;
-static int hf_smb2_notify_flags = -1;
-static int hf_smb2_last_access_timestamp = -1;
-static int hf_smb2_last_write_timestamp = -1;
-static int hf_smb2_last_change_timestamp = -1;
-static int hf_smb2_current_time = -1;
-static int hf_smb2_boot_time = -1;
-static int hf_smb2_filename = -1;
-static int hf_smb2_filename_len = -1;
-static int hf_smb2_replace_if = -1;
-static int hf_smb2_nlinks = -1;
-static int hf_smb2_delete_pending = -1;
-static int hf_smb2_is_directory = -1;
-static int hf_smb2_file_id = -1;
-static int hf_smb2_allocation_size = -1;
-static int hf_smb2_end_of_file = -1;
-static int hf_smb2_tree = -1;
-static int hf_smb2_find_pattern = -1;
-static int hf_smb2_find_info_level = -1;
-static int hf_smb2_find_info_blob = -1;
-static int hf_smb2_client_guid = -1;
-static int hf_smb2_server_guid = -1;
-static int hf_smb2_object_id = -1;
-static int hf_smb2_birth_volume_id = -1;
-static int hf_smb2_birth_object_id = -1;
-static int hf_smb2_domain_id = -1;
-static int hf_smb2_class = -1;
-static int hf_smb2_infolevel = -1;
-static int hf_smb2_infolevel_file_info = -1;
-static int hf_smb2_infolevel_fs_info = -1;
-static int hf_smb2_infolevel_sec_info = -1;
-static int hf_smb2_max_response_size = -1;
-static int hf_smb2_max_ioctl_in_size = -1;
-static int hf_smb2_max_ioctl_out_size = -1;
-static int hf_smb2_flags = -1;
-static int hf_smb2_required_buffer_size = -1;
-static int hf_smb2_getinfo_input_size = -1;
-static int hf_smb2_getinfo_input_offset = -1;
-static int hf_smb2_getsetinfo_additional = -1;
-static int hf_smb2_getsetinfo_additionals = -1;
-static int hf_smb2_getsetinfo_additional_owner = -1;
-static int hf_smb2_getsetinfo_additional_group = -1;
-static int hf_smb2_getsetinfo_additional_dacl = -1;
-static int hf_smb2_getsetinfo_additional_sacl = -1;
-static int hf_smb2_getsetinfo_additional_label = -1;
-static int hf_smb2_getsetinfo_additional_attribute = -1;
-static int hf_smb2_getsetinfo_additional_scope = -1;
-static int hf_smb2_getsetinfo_additional_backup = -1;
-static int hf_smb2_getinfo_flags = -1;
-static int hf_smb2_setinfo_size = -1;
-static int hf_smb2_setinfo_offset = -1;
-static int hf_smb2_setinfo_reserved = -1;
-static int hf_smb2_file_basic_info = -1;
-static int hf_smb2_file_standard_info = -1;
-static int hf_smb2_file_internal_info = -1;
-static int hf_smb2_file_ea_info = -1;
-static int hf_smb2_file_access_info = -1;
-static int hf_smb2_file_rename_info = -1;
-static int hf_smb2_file_link_info = -1;
-static int hf_smb2_file_disposition_info = -1;
-static int hf_smb2_file_position_info = -1;
-static int hf_smb2_file_full_ea_info = -1;
-static int hf_smb2_file_mode_info = -1;
-static int hf_smb2_file_alignment_info = -1;
-static int hf_smb2_file_all_info = -1;
-static int hf_smb2_file_allocation_info = -1;
-static int hf_smb2_file_endoffile_info = -1;
-static int hf_smb2_file_alternate_name_info = -1;
-static int hf_smb2_file_stream_info = -1;
-static int hf_smb2_file_pipe_info = -1;
-static int hf_smb2_file_compression_info = -1;
-static int hf_smb2_file_network_open_info = -1;
-static int hf_smb2_file_attribute_tag_info = -1;
-static int hf_smb2_file_normalized_name_info = -1;
-static int hf_smb2_fs_info_01 = -1;
-static int hf_smb2_fs_info_03 = -1;
-static int hf_smb2_fs_info_04 = -1;
-static int hf_smb2_fs_info_05 = -1;
-static int hf_smb2_fs_info_06 = -1;
-static int hf_smb2_fs_info_07 = -1;
-static int hf_smb2_fs_objectid_info = -1;
-static int hf_smb2_fs_posix_info = -1;
-static int hf_smb2_fs_posix_optimal_transfer_size = -1;
-static int hf_smb2_fs_posix_block_size = -1;
-static int hf_smb2_fs_posix_total_blocks = -1;
-static int hf_smb2_fs_posix_blocks_available = -1;
-static int hf_smb2_fs_posix_user_blocks_available = -1;
-static int hf_smb2_fs_posix_total_file_nodes = -1;
-static int hf_smb2_fs_posix_free_file_nodes = -1;
-static int hf_smb2_fs_posix_fs_identifier = -1;
-static int hf_smb2_sec_info_00 = -1;
-static int hf_smb2_quota_info = -1;
-static int hf_smb2_query_quota_info = -1;
-static int hf_smb2_qq_single = -1;
-static int hf_smb2_qq_restart = -1;
-static int hf_smb2_qq_sidlist_len = -1;
-static int hf_smb2_qq_start_sid_len = -1;
-static int hf_smb2_qq_start_sid_offset = -1;
-static int hf_smb2_fid = -1;
-static int hf_smb2_write_length = -1;
-static int hf_smb2_write_data = -1;
-static int hf_smb2_write_flags = -1;
-static int hf_smb2_write_flags_write_through = -1;
-static int hf_smb2_write_flags_write_unbuffered = -1;
-static int hf_smb2_write_count = -1;
-static int hf_smb2_write_remaining = -1;
-static int hf_smb2_read_blob = -1;
-static int hf_smb2_read_length = -1;
-static int hf_smb2_read_remaining = -1;
-static int hf_smb2_read_padding = -1;
-static int hf_smb2_read_flags = -1;
-static int hf_smb2_read_flags_unbuffered = -1;
-static int hf_smb2_read_flags_compressed = -1;
-static int hf_smb2_file_offset = -1;
-static int hf_smb2_qfr_length = -1;
-static int hf_smb2_qfr_usage = -1;
-static int hf_smb2_qfr_flags = -1;
-static int hf_smb2_qfr_total_region_entry_count = -1;
-static int hf_smb2_qfr_region_entry_count = -1;
-static int hf_smb2_read_data = -1;
-static int hf_smb2_disposition_delete_on_close = -1;
-static int hf_smb2_create_disposition = -1;
-static int hf_smb2_create_chain_offset = -1;
-static int hf_smb2_create_chain_data = -1;
-static int hf_smb2_data_offset = -1;
-static int hf_smb2_extrainfo = -1;
-static int hf_smb2_create_action = -1;
-static int hf_smb2_create_rep_flags = -1;
-static int hf_smb2_create_rep_flags_reparse_point = -1;
-static int hf_smb2_next_offset = -1;
-static int hf_smb2_negotiate_context_type = -1;
-static int hf_smb2_negotiate_context_data_length = -1;
-static int hf_smb2_negotiate_context_offset = -1;
-static int hf_smb2_negotiate_context_count = -1;
-static int hf_smb2_hash_alg_count = -1;
-static int hf_smb2_hash_algorithm = -1;
-static int hf_smb2_salt_length = -1;
-static int hf_smb2_salt = -1;
-static int hf_smb2_cipher_count = -1;
-static int hf_smb2_cipher_id = -1;
-static int hf_smb2_signing_alg_count = -1;
-static int hf_smb2_signing_alg_id = -1;
-static int hf_smb2_comp_alg_count = -1;
-static int hf_smb2_comp_alg_id = -1;
-static int hf_smb2_comp_alg_flags = -1;
-static int hf_smb2_comp_alg_flags_chained = -1;
-static int hf_smb2_comp_alg_flags_reserved = -1;
-static int hf_smb2_netname_neg_id = -1;
-static int hf_smb2_transport_ctx_flags = -1;
-static int hf_smb2_rdma_transform_count = -1;
-static int hf_smb2_rdma_transform_reserved1 = -1;
-static int hf_smb2_rdma_transform_reserved2 = -1;
-static int hf_smb2_rdma_transform_id = -1;
-static int hf_smb2_posix_reserved = -1;
-static int hf_smb2_dev = -1;
-static int hf_smb2_inode = -1;
-static int hf_smb2_ea_size = -1;
-static int hf_smb2_ea_flags = -1;
-static int hf_smb2_ea_name_len = -1;
-static int hf_smb2_ea_data_len = -1;
-static int hf_smb2_ea_name = -1;
-static int hf_smb2_ea_data = -1;
-static int hf_smb2_position_information = -1;
-static int hf_smb2_mode_information = -1;
-static int hf_smb2_mode_file_write_through = -1;
-static int hf_smb2_mode_file_sequential_only = -1;
-static int hf_smb2_mode_file_no_intermediate_buffering = -1;
-static int hf_smb2_mode_file_synchronous_io_alert = -1;
-static int hf_smb2_mode_file_synchronous_io_nonalert = -1;
-static int hf_smb2_mode_file_delete_on_close = -1;
-static int hf_smb2_alignment_information = -1;
-static int hf_smb2_buffer_code = -1;
-static int hf_smb2_buffer_code_len = -1;
-static int hf_smb2_buffer_code_flags_dyn = -1;
-static int hf_smb2_olb_offset = -1;
-static int hf_smb2_olb_length = -1;
-static int hf_smb2_tag = -1;
-static int hf_smb2_impersonation_level = -1;
-static int hf_smb2_ioctl_function = -1;
-static int hf_smb2_ioctl_function_device = -1;
-static int hf_smb2_ioctl_function_access = -1;
-static int hf_smb2_ioctl_function_function = -1;
-static int hf_smb2_fsctl_pipe_wait_timeout = -1;
-static int hf_smb2_fsctl_pipe_wait_name = -1;
-
-static int hf_smb2_fsctl_odx_token_type = -1;
-static int hf_smb2_fsctl_odx_token_idlen = -1;
-static int hf_smb2_fsctl_odx_token_idraw = -1;
-static int hf_smb2_fsctl_odx_token_ttl = -1;
-static int hf_smb2_fsctl_odx_size = -1;
-static int hf_smb2_fsctl_odx_flags = -1;
-static int hf_smb2_fsctl_odx_file_offset = -1;
-static int hf_smb2_fsctl_odx_copy_length = -1;
-static int hf_smb2_fsctl_odx_xfer_length = -1;
-static int hf_smb2_fsctl_odx_token_offset = -1;
-
-static int hf_smb2_fsctl_sparse_flag = -1;
-static int hf_smb2_fsctl_range_offset = -1;
-static int hf_smb2_fsctl_range_length = -1;
-static int hf_smb2_ioctl_function_method = -1;
-static int hf_smb2_ioctl_resiliency_timeout = -1;
-static int hf_smb2_ioctl_resiliency_reserved = -1;
-static int hf_smb2_ioctl_shared_virtual_disk_support = -1;
-static int hf_smb2_ioctl_shared_virtual_disk_handle_state = -1;
-static int hf_smb2_ioctl_sqos_protocol_version = -1;
-static int hf_smb2_ioctl_sqos_reserved = -1;
-static int hf_smb2_ioctl_sqos_options = -1;
-static int hf_smb2_ioctl_sqos_op_set_logical_flow_id = -1;
-static int hf_smb2_ioctl_sqos_op_set_policy = -1;
-static int hf_smb2_ioctl_sqos_op_probe_policy = -1;
-static int hf_smb2_ioctl_sqos_op_get_status = -1;
-static int hf_smb2_ioctl_sqos_op_update_counters = -1;
-static int hf_smb2_ioctl_sqos_logical_flow_id = -1;
-static int hf_smb2_ioctl_sqos_policy_id = -1;
-static int hf_smb2_ioctl_sqos_initiator_id = -1;
-static int hf_smb2_ioctl_sqos_limit = -1;
-static int hf_smb2_ioctl_sqos_reservation = -1;
-static int hf_smb2_ioctl_sqos_initiator_name = -1;
-static int hf_smb2_ioctl_sqos_initiator_node_name = -1;
-static int hf_smb2_ioctl_sqos_io_count_increment = -1;
-static int hf_smb2_ioctl_sqos_normalized_io_count_increment = -1;
-static int hf_smb2_ioctl_sqos_latency_increment = -1;
-static int hf_smb2_ioctl_sqos_lower_latency_increment = -1;
-static int hf_smb2_ioctl_sqos_bandwidth_limit = -1;
-static int hf_smb2_ioctl_sqos_kilobyte_count_increment = -1;
-static int hf_smb2_ioctl_sqos_time_to_live = -1;
-static int hf_smb2_ioctl_sqos_status = -1;
-static int hf_smb2_ioctl_sqos_maximum_io_rate = -1;
-static int hf_smb2_ioctl_sqos_minimum_io_rate = -1;
-static int hf_smb2_ioctl_sqos_base_io_size = -1;
-static int hf_smb2_ioctl_sqos_reserved2 = -1;
-static int hf_smb2_ioctl_sqos_maximum_bandwidth = -1;
-static int hf_windows_sockaddr_family = -1;
-static int hf_windows_sockaddr_port = -1;
-static int hf_windows_sockaddr_in_addr = -1;
-static int hf_windows_sockaddr_in6_flowinfo = -1;
-static int hf_windows_sockaddr_in6_addr = -1;
-static int hf_windows_sockaddr_in6_scope_id = -1;
-static int hf_smb2_ioctl_network_interface_next_offset = -1;
-static int hf_smb2_ioctl_network_interface_index = -1;
-static int hf_smb2_ioctl_network_interface_rss_queue_count = -1;
-static int hf_smb2_ioctl_network_interface_capabilities = -1;
-static int hf_smb2_ioctl_network_interface_capability_rss = -1;
-static int hf_smb2_ioctl_network_interface_capability_rdma = -1;
-static int hf_smb2_ioctl_network_interface_link_speed = -1;
-static int hf_smb2_ioctl_enumerate_snapshots_num_snapshots = -1;
-static int hf_smb2_ioctl_enumerate_snapshots_num_snapshots_returned = -1;
-static int hf_smb2_ioctl_enumerate_snapshots_snapshot_array_size = -1;
-static int hf_smb2_ioctl_enumerate_snapshots_snapshot = -1;
-static int hf_smb2_ioctl_get_ntfs_volume_data_volume_serial = -1;
-static int hf_smb2_ioctl_get_ntfs_volume_data_num_sectors = -1;
-static int hf_smb2_ioctl_get_ntfs_volume_data_total_clusters = -1;
-static int hf_smb2_ioctl_get_ntfs_volume_data_free_clusters = -1;
-static int hf_smb2_ioctl_get_ntfs_volume_data_total_reserved = -1;
-static int hf_smb2_ioctl_get_ntfs_volume_data_bytes_per_sector = -1;
-static int hf_smb2_ioctl_get_ntfs_volume_data_bytes_per_cluster = -1;
-static int hf_smb2_ioctl_get_ntfs_volume_data_bytes_per_file_record_segment = -1;
-static int hf_smb2_ioctl_get_ntfs_volume_data_clusters_per_file_record_segment = -1;
-static int hf_smb2_ioctl_get_ntfs_volume_data_mft_valid_data_length = -1;
-static int hf_smb2_ioctl_get_ntfs_volume_data_mft_start_lcn = -1;
-static int hf_smb2_ioctl_get_ntfs_volume_data_mft2_start_lcn = -1;
-static int hf_smb2_ioctl_get_ntfs_volume_data_mft_zone_start = -1;
-static int hf_smb2_ioctl_get_ntfs_volume_data_mft_zone_end = -1;
-static int hf_smb2_compression_format = -1;
-static int hf_smb2_checksum_algorithm = -1;
-static int hf_smb2_integrity_reserved = -1;
-static int hf_smb2_integrity_flags = -1;
-static int hf_smb2_integrity_flags_enforcement_off = -1;
-static int hf_smb2_FILE_OBJECTID_BUFFER = -1;
-static int hf_smb2_lease_key = -1;
-static int hf_smb2_lease_state = -1;
-static int hf_smb2_lease_state_read_caching = -1;
-static int hf_smb2_lease_state_handle_caching = -1;
-static int hf_smb2_lease_state_write_caching = -1;
-static int hf_smb2_lease_flags = -1;
-static int hf_smb2_lease_flags_break_ack_required = -1;
-static int hf_smb2_lease_flags_parent_lease_key_set = -1;
-static int hf_smb2_lease_flags_break_in_progress = -1;
-static int hf_smb2_lease_duration = -1;
-static int hf_smb2_parent_lease_key = -1;
-static int hf_smb2_lease_epoch = -1;
-static int hf_smb2_lease_reserved = -1;
-static int hf_smb2_lease_break_reason = -1;
-static int hf_smb2_lease_access_mask_hint = -1;
-static int hf_smb2_lease_share_mask_hint = -1;
-static int hf_smb2_acct_name = -1;
-static int hf_smb2_domain_name = -1;
-static int hf_smb2_host_name = -1;
-static int hf_smb2_auth_frame = -1;
-static int hf_smb2_tcon_frame = -1;
-static int hf_smb2_share_type = -1;
-static int hf_smb2_signature = -1;
-static int hf_smb2_credit_charge = -1;
-static int hf_smb2_credits_requested = -1;
-static int hf_smb2_credits_granted = -1;
-static int hf_smb2_channel_sequence = -1;
-static int hf_smb2_dialect_count = -1;
-static int hf_smb2_security_mode = -1;
-static int hf_smb2_secmode_flags_sign_required = -1;
-static int hf_smb2_secmode_flags_sign_enabled = -1;
-static int hf_smb2_ses_req_flags = -1;
-static int hf_smb2_ses_req_flags_session_binding = -1;
-static int hf_smb2_capabilities = -1;
-static int hf_smb2_cap_dfs = -1;
-static int hf_smb2_cap_leasing = -1;
-static int hf_smb2_cap_large_mtu = -1;
-static int hf_smb2_cap_multi_channel = -1;
-static int hf_smb2_cap_persistent_handles = -1;
-static int hf_smb2_cap_directory_leasing = -1;
-static int hf_smb2_cap_encryption = -1;
-static int hf_smb2_dialect = -1;
-static int hf_smb2_max_trans_size = -1;
-static int hf_smb2_max_read_size = -1;
-static int hf_smb2_max_write_size = -1;
-static int hf_smb2_channel = -1;
-static int hf_smb2_rdma_v1_offset = -1;
-static int hf_smb2_rdma_v1_token = -1;
-static int hf_smb2_rdma_v1_length = -1;
-static int hf_smb2_session_flags = -1;
-static int hf_smb2_ses_flags_guest = -1;
-static int hf_smb2_ses_flags_null = -1;
-static int hf_smb2_ses_flags_encrypt = -1;
-static int hf_smb2_share_flags = -1;
-static int hf_smb2_share_flags_dfs = -1;
-static int hf_smb2_share_flags_dfs_root = -1;
-static int hf_smb2_share_flags_restrict_exclusive_opens = -1;
-static int hf_smb2_share_flags_force_shared_delete = -1;
-static int hf_smb2_share_flags_allow_namespace_caching = -1;
-static int hf_smb2_share_flags_access_based_dir_enum = -1;
-static int hf_smb2_share_flags_force_levelii_oplock = -1;
-static int hf_smb2_share_flags_enable_hash_v1 = -1;
-static int hf_smb2_share_flags_enable_hash_v2 = -1;
-static int hf_smb2_share_flags_encrypt_data = -1;
-static int hf_smb2_share_flags_identity_remoting = -1;
-static int hf_smb2_share_flags_compress_data = -1;
-static int hf_smb2_share_flags_isolated_transport = -1;
-static int hf_smb2_share_caching = -1;
-static int hf_smb2_share_caps = -1;
-static int hf_smb2_share_caps_dfs = -1;
-static int hf_smb2_share_caps_continuous_availability = -1;
-static int hf_smb2_share_caps_scaleout = -1;
-static int hf_smb2_share_caps_cluster = -1;
-static int hf_smb2_share_caps_assymetric = -1;
-static int hf_smb2_share_caps_redirect_to_owner = -1;
-static int hf_smb2_create_flags = -1;
-static int hf_smb2_lock_count = -1;
-static int hf_smb2_lock_sequence_number = -1;
-static int hf_smb2_lock_sequence_index = -1;
-static int hf_smb2_min_count = -1;
-static int hf_smb2_remaining_bytes = -1;
-static int hf_smb2_channel_info_offset = -1;
-static int hf_smb2_channel_info_length = -1;
-static int hf_smb2_channel_info_blob = -1;
-static int hf_smb2_ioctl_flags = -1;
-static int hf_smb2_ioctl_is_fsctl = -1;
-static int hf_smb2_close_pq_attrib = -1;
-static int hf_smb2_notify_watch_tree = -1;
-static int hf_smb2_output_buffer_len = -1;
-static int hf_smb2_notify_out_data = -1;
-static int hf_smb2_notify_info = -1;
-static int hf_smb2_notify_next_offset = -1;
-static int hf_smb2_notify_action = -1;
-static int hf_smb2_find_flags = -1;
-static int hf_smb2_find_flags_restart_scans = -1;
-static int hf_smb2_find_flags_single_entry = -1;
-static int hf_smb2_find_flags_index_specified = -1;
-static int hf_smb2_find_flags_reopen = -1;
-static int hf_smb2_file_index = -1;
-static int hf_smb2_file_directory_info = -1;
-static int hf_smb2_both_directory_info = -1;
-static int hf_smb2_posix_info = -1;
-static int hf_smb2_short_name_len = -1;
-static int hf_smb2_short_name = -1;
-static int hf_smb2_id_both_directory_info = -1;
-static int hf_smb2_full_directory_info = -1;
-static int hf_smb2_lock_info = -1;
-static int hf_smb2_lock_length = -1;
-static int hf_smb2_lock_flags = -1;
-static int hf_smb2_lock_flags_shared = -1;
-static int hf_smb2_lock_flags_exclusive = -1;
-static int hf_smb2_lock_flags_unlock = -1;
-static int hf_smb2_lock_flags_fail_immediately = -1;
-static int hf_smb2_dhnq_buffer_reserved = -1;
-static int hf_smb2_dh2x_buffer_timeout = -1;
-static int hf_smb2_dh2x_buffer_flags = -1;
-static int hf_smb2_dh2x_buffer_flags_persistent_handle = -1;
-static int hf_smb2_dh2x_buffer_reserved = -1;
-static int hf_smb2_dh2x_buffer_create_guid = -1;
-static int hf_smb2_APP_INSTANCE_buffer_struct_size = -1;
-static int hf_smb2_APP_INSTANCE_buffer_reserved = -1;
-static int hf_smb2_APP_INSTANCE_buffer_app_guid = -1;
-static int hf_smb2_svhdx_open_device_context_version = -1;
-static int hf_smb2_svhdx_open_device_context_has_initiator_id = -1;
-static int hf_smb2_svhdx_open_device_context_reserved = -1;
-static int hf_smb2_svhdx_open_device_context_initiator_id = -1;
-static int hf_smb2_svhdx_open_device_context_flags = -1;
-static int hf_smb2_svhdx_open_device_context_originator_flags = -1;
-static int hf_smb2_svhdx_open_device_context_open_request_id = -1;
-static int hf_smb2_svhdx_open_device_context_initiator_host_name_len = -1;
-static int hf_smb2_svhdx_open_device_context_initiator_host_name = -1;
-static int hf_smb2_svhdx_open_device_context_virtual_disk_properties_initialized = -1;
-static int hf_smb2_svhdx_open_device_context_server_service_version = -1;
-static int hf_smb2_svhdx_open_device_context_virtual_sector_size = -1;
-static int hf_smb2_svhdx_open_device_context_physical_sector_size = -1;
-static int hf_smb2_svhdx_open_device_context_virtual_size = -1;
-static int hf_smb2_app_instance_version_struct_size = -1;
-static int hf_smb2_app_instance_version_reserved = -1;
-static int hf_smb2_app_instance_version_padding = -1;
-static int hf_smb2_app_instance_version_high = -1;
-static int hf_smb2_app_instance_version_low = -1;
-static int hf_smb2_posix_perms = -1;
-static int hf_smb2_aapl_command_code = -1;
-static int hf_smb2_aapl_reserved = -1;
-static int hf_smb2_aapl_server_query_bitmask = -1;
-static int hf_smb2_aapl_server_query_bitmask_server_caps = -1;
-static int hf_smb2_aapl_server_query_bitmask_volume_caps = -1;
-static int hf_smb2_aapl_server_query_bitmask_model_info = -1;
-static int hf_smb2_aapl_server_query_caps = -1;
-static int hf_smb2_aapl_server_query_caps_supports_read_dir_attr = -1;
-static int hf_smb2_aapl_server_query_caps_supports_osx_copyfile = -1;
-static int hf_smb2_aapl_server_query_caps_unix_based = -1;
-static int hf_smb2_aapl_server_query_caps_supports_nfs_ace = -1;
-static int hf_smb2_aapl_server_query_volume_caps = -1;
-static int hf_smb2_aapl_server_query_volume_caps_support_resolve_id = -1;
-static int hf_smb2_aapl_server_query_volume_caps_case_sensitive = -1;
-static int hf_smb2_aapl_server_query_volume_caps_supports_full_sync = -1;
-static int hf_smb2_aapl_server_query_model_string = -1;
-static int hf_smb2_aapl_server_query_server_path = -1;
-static int hf_smb2_error_context_count = -1;
-static int hf_smb2_error_reserved = -1;
-static int hf_smb2_error_byte_count = -1;
-static int hf_smb2_error_data = -1;
-static int hf_smb2_error_context = -1;
-static int hf_smb2_error_context_length = -1;
-static int hf_smb2_error_context_id = -1;
-static int hf_smb2_error_min_buf_length = -1;
-static int hf_smb2_error_redir_context = -1;
-static int hf_smb2_error_redir_struct_size = -1;
-static int hf_smb2_error_redir_notif_type = -1;
-static int hf_smb2_error_redir_flags = -1;
-static int hf_smb2_error_redir_target_type = -1;
-static int hf_smb2_error_redir_ip_count = -1;
-static int hf_smb2_error_redir_ip_list = -1;
-static int hf_smb2_error_redir_res_name = -1;
-static int hf_smb2_reserved = -1;
-static int hf_smb2_reserved_random = -1;
-static int hf_smb2_transform_signature = -1;
-static int hf_smb2_transform_nonce = -1;
-static int hf_smb2_transform_msg_size = -1;
-static int hf_smb2_transform_reserved = -1;
-static int hf_smb2_transform_flags = -1;
-static int hf_smb2_transform_flags_encrypted = -1;
-static int hf_smb2_transform_encrypted_data = -1;
-static int hf_smb2_protocol_id = -1;
-static int hf_smb2_comp_transform_orig_size = -1;
-static int hf_smb2_comp_transform_comp_alg = -1;
-static int hf_smb2_comp_transform_flags = -1;
-static int hf_smb2_comp_transform_offset = -1;
-static int hf_smb2_comp_transform_length = -1;
-static int hf_smb2_comp_transform_data = -1;
-static int hf_smb2_comp_transform_orig_payload_size = -1;
-static int hf_smb2_comp_pattern_v1_pattern = -1;
-static int hf_smb2_comp_pattern_v1_reserved1 = -1;
-static int hf_smb2_comp_pattern_v1_reserved2 = -1;
-static int hf_smb2_comp_pattern_v1_repetitions = -1;
-static int hf_smb2_truncated = -1;
-static int hf_smb2_pipe_fragments = -1;
-static int hf_smb2_pipe_fragment = -1;
-static int hf_smb2_pipe_fragment_overlap = -1;
-static int hf_smb2_pipe_fragment_overlap_conflict = -1;
-static int hf_smb2_pipe_fragment_multiple_tails = -1;
-static int hf_smb2_pipe_fragment_too_long_fragment = -1;
-static int hf_smb2_pipe_fragment_error = -1;
-static int hf_smb2_pipe_fragment_count = -1;
-static int hf_smb2_pipe_reassembled_in = -1;
-static int hf_smb2_pipe_reassembled_length = -1;
-static int hf_smb2_pipe_reassembled_data = -1;
-static int hf_smb2_cchunk_resume_key = -1;
-static int hf_smb2_cchunk_count = -1;
-static int hf_smb2_cchunk_src_offset = -1;
-static int hf_smb2_cchunk_dst_offset = -1;
-static int hf_smb2_cchunk_xfer_len = -1;
-static int hf_smb2_cchunk_chunks_written = -1;
-static int hf_smb2_cchunk_bytes_written = -1;
-static int hf_smb2_cchunk_total_written = -1;
-static int hf_smb2_reparse_data_buffer = -1;
-static int hf_smb2_reparse_tag = -1;
-static int hf_smb2_reparse_guid = -1;
-static int hf_smb2_reparse_data_length = -1;
-static int hf_smb2_nfs_type = -1;
-static int hf_smb2_nfs_symlink_target = -1;
-static int hf_smb2_nfs_chr_major = -1;
-static int hf_smb2_nfs_chr_minor = -1;
-static int hf_smb2_nfs_blk_major = -1;
-static int hf_smb2_nfs_blk_minor = -1;
-static int hf_smb2_symlink_error_response = -1;
-static int hf_smb2_symlink_length = -1;
-static int hf_smb2_symlink_error_tag = -1;
-static int hf_smb2_unparsed_path_length = -1;
-static int hf_smb2_symlink_substitute_name = -1;
-static int hf_smb2_symlink_print_name = -1;
-static int hf_smb2_symlink_flags = -1;
-static int hf_smb2_bad_signature = -1;
-static int hf_smb2_good_signature = -1;
-static int hf_smb2_fscc_file_attr = -1;
-static int hf_smb2_fscc_file_attr_archive = -1;
-static int hf_smb2_fscc_file_attr_compressed = -1;
-static int hf_smb2_fscc_file_attr_directory = -1;
-static int hf_smb2_fscc_file_attr_encrypted = -1;
-static int hf_smb2_fscc_file_attr_hidden = -1;
-static int hf_smb2_fscc_file_attr_normal = -1;
-static int hf_smb2_fscc_file_attr_not_content_indexed = -1;
-static int hf_smb2_fscc_file_attr_offline = -1;
-static int hf_smb2_fscc_file_attr_read_only = -1;
-static int hf_smb2_fscc_file_attr_reparse_point = -1;
-static int hf_smb2_fscc_file_attr_sparse_file = -1;
-static int hf_smb2_fscc_file_attr_system = -1;
-static int hf_smb2_fscc_file_attr_temporary = -1;
-static int hf_smb2_fscc_file_attr_integrity_stream = -1;
-static int hf_smb2_fscc_file_attr_no_scrub_data = -1;
-static int hf_smb2_tree_connect_flags = -1;
-static int hf_smb2_tc_cluster_reconnect = -1;
-static int hf_smb2_tc_redirect_to_owner = -1;
-static int hf_smb2_tc_extension_present = -1;
-static int hf_smb2_tc_reserved = -1;
-
-static gint ett_smb2 = -1;
-static gint ett_smb2_olb = -1;
-static gint ett_smb2_ea = -1;
-static gint ett_smb2_header = -1;
-static gint ett_smb2_encrypted = -1;
-static gint ett_smb2_compressed = -1;
-static gint ett_smb2_decompressed = -1;
-static gint ett_smb2_command = -1;
-static gint ett_smb2_secblob = -1;
-static gint ett_smb2_negotiate_context_element = -1;
-static gint ett_smb2_file_basic_info = -1;
-static gint ett_smb2_file_standard_info = -1;
-static gint ett_smb2_file_internal_info = -1;
-static gint ett_smb2_file_ea_info = -1;
-static gint ett_smb2_file_access_info = -1;
-static gint ett_smb2_file_position_info = -1;
-static gint ett_smb2_file_mode_info = -1;
-static gint ett_smb2_file_alignment_info = -1;
-static gint ett_smb2_file_all_info = -1;
-static gint ett_smb2_file_allocation_info = -1;
-static gint ett_smb2_file_endoffile_info = -1;
-static gint ett_smb2_file_alternate_name_info = -1;
-static gint ett_smb2_file_stream_info = -1;
-static gint ett_smb2_file_pipe_info = -1;
-static gint ett_smb2_file_compression_info = -1;
-static gint ett_smb2_file_network_open_info = -1;
-static gint ett_smb2_file_attribute_tag_info = -1;
-static gint ett_smb2_file_rename_info = -1;
-static gint ett_smb2_file_link_info = -1;
-static gint ett_smb2_file_disposition_info = -1;
-static gint ett_smb2_file_full_ea_info = -1;
-static gint ett_smb2_file_normalized_name_info = -1;
-static gint ett_smb2_fs_info_01 = -1;
-static gint ett_smb2_fs_info_03 = -1;
-static gint ett_smb2_fs_info_04 = -1;
-static gint ett_smb2_fs_info_05 = -1;
-static gint ett_smb2_fs_info_06 = -1;
-static gint ett_smb2_fs_info_07 = -1;
-static gint ett_smb2_fs_objectid_info = -1;
-static gint ett_smb2_fs_posix_info = -1;
-static gint ett_smb2_sec_info_00 = -1;
-static gint ett_smb2_additional_information_sec_mask = -1;
-static gint ett_smb2_quota_info = -1;
-static gint ett_smb2_query_quota_info = -1;
-static gint ett_smb2_tid_tree = -1;
-static gint ett_smb2_sesid_tree = -1;
-static gint ett_smb2_create_chain_element = -1;
-static gint ett_smb2_MxAc_buffer = -1;
-static gint ett_smb2_QFid_buffer = -1;
-static gint ett_smb2_RqLs_buffer = -1;
-static gint ett_smb2_ioctl_function = -1;
-static gint ett_smb2_FILE_OBJECTID_BUFFER = -1;
-static gint ett_smb2_flags = -1;
-static gint ett_smb2_sec_mode = -1;
-static gint ett_smb2_capabilities = -1;
-static gint ett_smb2_ses_req_flags = -1;
-static gint ett_smb2_ses_flags = -1;
-static gint ett_smb2_lease_state = -1;
-static gint ett_smb2_lease_flags = -1;
-static gint ett_smb2_share_flags = -1;
-static gint ett_smb2_create_rep_flags = -1;
-static gint ett_smb2_share_caps = -1;
-static gint ett_smb2_comp_alg_flags = -1;
-static gint ett_smb2_ioctl_flags = -1;
-static gint ett_smb2_ioctl_network_interface = -1;
-static gint ett_smb2_ioctl_sqos_opeations = -1;
-static gint ett_smb2_fsctl_range_data = -1;
-static gint ett_windows_sockaddr = -1;
-static gint ett_smb2_close_flags = -1;
-static gint ett_smb2_notify_info = -1;
-static gint ett_smb2_notify_flags = -1;
-static gint ett_smb2_write_flags = -1;
-static gint ett_smb2_rdma_v1 = -1;
-static gint ett_smb2_DH2Q_buffer = -1;
-static gint ett_smb2_DH2C_buffer = -1;
-static gint ett_smb2_dh2x_flags = -1;
-static gint ett_smb2_APP_INSTANCE_buffer = -1;
-static gint ett_smb2_svhdx_open_device_context = -1;
-static gint ett_smb2_app_instance_version_buffer = -1;
-static gint ett_smb2_app_instance_version_buffer_version = -1;
-static gint ett_smb2_aapl_create_context_request = -1;
-static gint ett_smb2_aapl_server_query_bitmask = -1;
-static gint ett_smb2_aapl_server_query_caps = -1;
-static gint ett_smb2_aapl_create_context_response = -1;
-static gint ett_smb2_aapl_server_query_volume_caps = -1;
-static gint ett_smb2_integrity_flags = -1;
-static gint ett_smb2_find_flags = -1;
-static gint ett_smb2_file_directory_info = -1;
-static gint ett_smb2_both_directory_info = -1;
-static gint ett_smb2_id_both_directory_info = -1;
-static gint ett_smb2_full_directory_info = -1;
-static gint ett_smb2_posix_info = -1;
-static gint ett_smb2_file_name_info = -1;
-static gint ett_smb2_lock_info = -1;
-static gint ett_smb2_lock_flags = -1;
-static gint ett_smb2_buffercode = -1;
-static gint ett_smb2_ioctl_network_interface_capabilities = -1;
-static gint ett_smb2_tree_connect_flags = -1;
-static gint ett_qfr_entry = -1;
-static gint ett_smb2_pipe_fragment = -1;
-static gint ett_smb2_pipe_fragments = -1;
-static gint ett_smb2_cchunk_entry = -1;
-static gint ett_smb2_fsctl_odx_token = -1;
-static gint ett_smb2_symlink_error_response = -1;
-static gint ett_smb2_reparse_data_buffer = -1;
-static gint ett_smb2_error_data = -1;
-static gint ett_smb2_error_context = -1;
-static gint ett_smb2_error_redir_context = -1;
-static gint ett_smb2_error_redir_ip_list = -1;
-static gint ett_smb2_read_flags = -1;
-static gint ett_smb2_signature = -1;
-static gint ett_smb2_transform_flags = -1;
-static gint ett_smb2_fscc_file_attributes = -1;
-static gint ett_smb2_comp_payload = -1;
-static gint ett_smb2_comp_pattern_v1 = -1;
-
-static expert_field ei_smb2_invalid_length = EI_INIT;
-static expert_field ei_smb2_bad_response = EI_INIT;
-static expert_field ei_smb2_invalid_getinfo_offset = EI_INIT;
-static expert_field ei_smb2_invalid_getinfo_size = EI_INIT;
-static expert_field ei_smb2_empty_getinfo_buffer = EI_INIT;
-static expert_field ei_smb2_invalid_signature = EI_INIT;
+static int proto_smb2;
+static int hf_smb2_cmd;
+static int hf_smb2_nt_status;
+static int hf_smb2_response_to;
+static int hf_smb2_response_in;
+static int hf_smb2_time;
+static int hf_smb2_preauth_hash;
+static int hf_smb2_header_len;
+static int hf_smb2_msg_id;
+static int hf_smb2_pid;
+static int hf_smb2_tid;
+static int hf_smb2_aid;
+static int hf_smb2_sesid;
+static int hf_smb2_previous_sesid;
+static int hf_smb2_flags_response;
+static int hf_smb2_flags_async_cmd;
+static int hf_smb2_flags_dfs_op;
+static int hf_smb2_flags_chained;
+static int hf_smb2_flags_signature;
+static int hf_smb2_flags_replay_operation;
+static int hf_smb2_flags_priority_mask;
+static int hf_smb2_chain_offset;
+static int hf_smb2_security_blob;
+static int hf_smb2_ioctl_in_data;
+static int hf_smb2_ioctl_out_data;
+static int hf_smb2_unknown;
+static int hf_smb2_root_directory_mbz;
+static int hf_smb2_twrp_timestamp;
+static int hf_smb2_mxac_timestamp;
+static int hf_smb2_mxac_status;
+static int hf_smb2_qfid_fid;
+static int hf_smb2_create_timestamp;
+static int hf_smb2_oplock;
+static int hf_smb2_close_flags;
+static int hf_smb2_notify_flags;
+static int hf_smb2_last_access_timestamp;
+static int hf_smb2_last_write_timestamp;
+static int hf_smb2_last_change_timestamp;
+static int hf_smb2_current_time;
+static int hf_smb2_boot_time;
+static int hf_smb2_filename;
+static int hf_smb2_filename_len;
+static int hf_smb2_replace_if;
+static int hf_smb2_nlinks;
+static int hf_smb2_delete_pending;
+static int hf_smb2_is_directory;
+static int hf_smb2_file_id;
+static int hf_smb2_allocation_size;
+static int hf_smb2_end_of_file;
+static int hf_smb2_tree;
+static int hf_smb2_find_pattern;
+static int hf_smb2_find_info_level;
+static int hf_smb2_find_info_blob;
+static int hf_smb2_client_guid;
+static int hf_smb2_server_guid;
+static int hf_smb2_object_id;
+static int hf_smb2_birth_volume_id;
+static int hf_smb2_birth_object_id;
+static int hf_smb2_domain_id;
+static int hf_smb2_class;
+static int hf_smb2_infolevel;
+static int hf_smb2_infolevel_file_info;
+static int hf_smb2_infolevel_fs_info;
+static int hf_smb2_infolevel_sec_info;
+static int hf_smb2_max_response_size;
+static int hf_smb2_max_ioctl_in_size;
+static int hf_smb2_max_ioctl_out_size;
+static int hf_smb2_flags;
+static int hf_smb2_required_buffer_size;
+static int hf_smb2_getinfo_input_size;
+static int hf_smb2_getinfo_input_offset;
+static int hf_smb2_getsetinfo_additional;
+static int hf_smb2_getsetinfo_additionals;
+static int hf_smb2_getsetinfo_additional_owner;
+static int hf_smb2_getsetinfo_additional_group;
+static int hf_smb2_getsetinfo_additional_dacl;
+static int hf_smb2_getsetinfo_additional_sacl;
+static int hf_smb2_getsetinfo_additional_label;
+static int hf_smb2_getsetinfo_additional_attribute;
+static int hf_smb2_getsetinfo_additional_scope;
+static int hf_smb2_getsetinfo_additional_backup;
+static int hf_smb2_getinfo_flags;
+static int hf_smb2_setinfo_size;
+static int hf_smb2_setinfo_offset;
+static int hf_smb2_setinfo_reserved;
+static int hf_smb2_file_basic_info;
+static int hf_smb2_file_standard_info;
+static int hf_smb2_file_internal_info;
+static int hf_smb2_file_ea_info;
+static int hf_smb2_file_access_info;
+static int hf_smb2_file_rename_info;
+static int hf_smb2_file_link_info;
+static int hf_smb2_file_disposition_info;
+static int hf_smb2_file_position_info;
+static int hf_smb2_file_full_ea_info;
+static int hf_smb2_file_mode_info;
+static int hf_smb2_file_alignment_info;
+static int hf_smb2_file_all_info;
+static int hf_smb2_file_allocation_info;
+static int hf_smb2_file_endoffile_info;
+static int hf_smb2_file_alternate_name_info;
+static int hf_smb2_file_stream_info;
+static int hf_smb2_file_pipe_info;
+static int hf_smb2_file_compression_info;
+static int hf_smb2_file_network_open_info;
+static int hf_smb2_file_attribute_tag_info;
+static int hf_smb2_file_normalized_name_info;
+static int hf_smb2_fs_info_01;
+static int hf_smb2_fs_info_03;
+static int hf_smb2_fs_info_04;
+static int hf_smb2_fs_info_05;
+static int hf_smb2_fs_info_06;
+static int hf_smb2_fs_info_07;
+static int hf_smb2_fs_objectid_info;
+static int hf_smb2_fs_posix_info;
+static int hf_smb2_fs_posix_optimal_transfer_size;
+static int hf_smb2_fs_posix_block_size;
+static int hf_smb2_fs_posix_total_blocks;
+static int hf_smb2_fs_posix_blocks_available;
+static int hf_smb2_fs_posix_user_blocks_available;
+static int hf_smb2_fs_posix_total_file_nodes;
+static int hf_smb2_fs_posix_free_file_nodes;
+static int hf_smb2_fs_posix_fs_identifier;
+static int hf_smb2_sec_info_00;
+static int hf_smb2_quota_info;
+static int hf_smb2_query_quota_info;
+static int hf_smb2_qq_single;
+static int hf_smb2_qq_restart;
+static int hf_smb2_qq_sidlist_len;
+static int hf_smb2_qq_start_sid_len;
+static int hf_smb2_qq_start_sid_offset;
+static int hf_smb2_fid;
+static int hf_smb2_write_length;
+static int hf_smb2_write_data;
+static int hf_smb2_write_flags;
+static int hf_smb2_write_flags_write_through;
+static int hf_smb2_write_flags_write_unbuffered;
+static int hf_smb2_write_count;
+static int hf_smb2_write_remaining;
+static int hf_smb2_read_blob;
+static int hf_smb2_read_length;
+static int hf_smb2_read_remaining;
+static int hf_smb2_read_padding;
+static int hf_smb2_read_flags;
+static int hf_smb2_read_flags_unbuffered;
+static int hf_smb2_read_flags_compressed;
+static int hf_smb2_file_offset;
+static int hf_smb2_qfr_length;
+static int hf_smb2_qfr_usage;
+static int hf_smb2_qfr_flags;
+static int hf_smb2_qfr_total_region_entry_count;
+static int hf_smb2_qfr_region_entry_count;
+static int hf_smb2_read_data;
+static int hf_smb2_disposition_delete_on_close;
+static int hf_smb2_create_disposition;
+static int hf_smb2_create_chain_offset;
+static int hf_smb2_create_chain_data;
+static int hf_smb2_data_offset;
+static int hf_smb2_extrainfo;
+static int hf_smb2_create_action;
+static int hf_smb2_create_rep_flags;
+static int hf_smb2_create_rep_flags_reparse_point;
+static int hf_smb2_next_offset;
+static int hf_smb2_negotiate_context_type;
+static int hf_smb2_negotiate_context_data_length;
+static int hf_smb2_negotiate_context_offset;
+static int hf_smb2_negotiate_context_count;
+static int hf_smb2_hash_alg_count;
+static int hf_smb2_hash_algorithm;
+static int hf_smb2_salt_length;
+static int hf_smb2_salt;
+static int hf_smb2_cipher_count;
+static int hf_smb2_cipher_id;
+static int hf_smb2_signing_alg_count;
+static int hf_smb2_signing_alg_id;
+static int hf_smb2_comp_alg_count;
+static int hf_smb2_comp_alg_id;
+static int hf_smb2_comp_alg_flags;
+static int hf_smb2_comp_alg_flags_chained;
+static int hf_smb2_comp_alg_flags_reserved;
+static int hf_smb2_netname_neg_id;
+static int hf_smb2_transport_ctx_flags;
+static int hf_smb2_rdma_transform_count;
+static int hf_smb2_rdma_transform_reserved1;
+static int hf_smb2_rdma_transform_reserved2;
+static int hf_smb2_rdma_transform_id;
+static int hf_smb2_posix_reserved;
+static int hf_smb2_dev;
+static int hf_smb2_inode;
+static int hf_smb2_ea_size;
+static int hf_smb2_ea_flags;
+static int hf_smb2_ea_name_len;
+static int hf_smb2_ea_data_len;
+static int hf_smb2_ea_name;
+static int hf_smb2_ea_data;
+static int hf_smb2_position_information;
+static int hf_smb2_mode_information;
+static int hf_smb2_mode_file_write_through;
+static int hf_smb2_mode_file_sequential_only;
+static int hf_smb2_mode_file_no_intermediate_buffering;
+static int hf_smb2_mode_file_synchronous_io_alert;
+static int hf_smb2_mode_file_synchronous_io_nonalert;
+static int hf_smb2_mode_file_delete_on_close;
+static int hf_smb2_alignment_information;
+static int hf_smb2_buffer_code;
+static int hf_smb2_buffer_code_len;
+static int hf_smb2_buffer_code_flags_dyn;
+static int hf_smb2_olb_offset;
+static int hf_smb2_olb_length;
+static int hf_smb2_tag;
+static int hf_smb2_impersonation_level;
+static int hf_smb2_ioctl_function;
+static int hf_smb2_ioctl_function_device;
+static int hf_smb2_ioctl_function_access;
+static int hf_smb2_ioctl_function_function;
+static int hf_smb2_fsctl_pipe_wait_timeout;
+static int hf_smb2_fsctl_pipe_wait_name;
+
+static int hf_smb2_fsctl_odx_token_type;
+static int hf_smb2_fsctl_odx_token_idlen;
+static int hf_smb2_fsctl_odx_token_idraw;
+static int hf_smb2_fsctl_odx_token_ttl;
+static int hf_smb2_fsctl_odx_size;
+static int hf_smb2_fsctl_odx_flags;
+static int hf_smb2_fsctl_odx_file_offset;
+static int hf_smb2_fsctl_odx_copy_length;
+static int hf_smb2_fsctl_odx_xfer_length;
+static int hf_smb2_fsctl_odx_token_offset;
+
+static int hf_smb2_fsctl_sparse_flag;
+static int hf_smb2_fsctl_range_offset;
+static int hf_smb2_fsctl_range_length;
+static int hf_smb2_ioctl_function_method;
+static int hf_smb2_ioctl_resiliency_timeout;
+static int hf_smb2_ioctl_resiliency_reserved;
+static int hf_smb2_ioctl_shared_virtual_disk_support;
+static int hf_smb2_ioctl_shared_virtual_disk_handle_state;
+static int hf_smb2_ioctl_sqos_protocol_version;
+static int hf_smb2_ioctl_sqos_reserved;
+static int hf_smb2_ioctl_sqos_options;
+static int hf_smb2_ioctl_sqos_op_set_logical_flow_id;
+static int hf_smb2_ioctl_sqos_op_set_policy;
+static int hf_smb2_ioctl_sqos_op_probe_policy;
+static int hf_smb2_ioctl_sqos_op_get_status;
+static int hf_smb2_ioctl_sqos_op_update_counters;
+static int hf_smb2_ioctl_sqos_logical_flow_id;
+static int hf_smb2_ioctl_sqos_policy_id;
+static int hf_smb2_ioctl_sqos_initiator_id;
+static int hf_smb2_ioctl_sqos_limit;
+static int hf_smb2_ioctl_sqos_reservation;
+static int hf_smb2_ioctl_sqos_initiator_name;
+static int hf_smb2_ioctl_sqos_initiator_node_name;
+static int hf_smb2_ioctl_sqos_io_count_increment;
+static int hf_smb2_ioctl_sqos_normalized_io_count_increment;
+static int hf_smb2_ioctl_sqos_latency_increment;
+static int hf_smb2_ioctl_sqos_lower_latency_increment;
+static int hf_smb2_ioctl_sqos_bandwidth_limit;
+static int hf_smb2_ioctl_sqos_kilobyte_count_increment;
+static int hf_smb2_ioctl_sqos_time_to_live;
+static int hf_smb2_ioctl_sqos_status;
+static int hf_smb2_ioctl_sqos_maximum_io_rate;
+static int hf_smb2_ioctl_sqos_minimum_io_rate;
+static int hf_smb2_ioctl_sqos_base_io_size;
+static int hf_smb2_ioctl_sqos_reserved2;
+static int hf_smb2_ioctl_sqos_maximum_bandwidth;
+static int hf_windows_sockaddr_family;
+static int hf_windows_sockaddr_port;
+static int hf_windows_sockaddr_in_addr;
+static int hf_windows_sockaddr_in6_flowinfo;
+static int hf_windows_sockaddr_in6_addr;
+static int hf_windows_sockaddr_in6_scope_id;
+static int hf_smb2_ioctl_network_interface_next_offset;
+static int hf_smb2_ioctl_network_interface_index;
+static int hf_smb2_ioctl_network_interface_rss_queue_count;
+static int hf_smb2_ioctl_network_interface_capabilities;
+static int hf_smb2_ioctl_network_interface_capability_rss;
+static int hf_smb2_ioctl_network_interface_capability_rdma;
+static int hf_smb2_ioctl_network_interface_link_speed;
+static int hf_smb2_ioctl_enumerate_snapshots_num_snapshots;
+static int hf_smb2_ioctl_enumerate_snapshots_num_snapshots_returned;
+static int hf_smb2_ioctl_enumerate_snapshots_snapshot_array_size;
+static int hf_smb2_ioctl_enumerate_snapshots_snapshot;
+static int hf_smb2_ioctl_get_ntfs_volume_data_volume_serial;
+static int hf_smb2_ioctl_get_ntfs_volume_data_num_sectors;
+static int hf_smb2_ioctl_get_ntfs_volume_data_total_clusters;
+static int hf_smb2_ioctl_get_ntfs_volume_data_free_clusters;
+static int hf_smb2_ioctl_get_ntfs_volume_data_total_reserved;
+static int hf_smb2_ioctl_get_ntfs_volume_data_bytes_per_sector;
+static int hf_smb2_ioctl_get_ntfs_volume_data_bytes_per_cluster;
+static int hf_smb2_ioctl_get_ntfs_volume_data_bytes_per_file_record_segment;
+static int hf_smb2_ioctl_get_ntfs_volume_data_clusters_per_file_record_segment;
+static int hf_smb2_ioctl_get_ntfs_volume_data_mft_valid_data_length;
+static int hf_smb2_ioctl_get_ntfs_volume_data_mft_start_lcn;
+static int hf_smb2_ioctl_get_ntfs_volume_data_mft2_start_lcn;
+static int hf_smb2_ioctl_get_ntfs_volume_data_mft_zone_start;
+static int hf_smb2_ioctl_get_ntfs_volume_data_mft_zone_end;
+static int hf_smb2_compression_format;
+static int hf_smb2_checksum_algorithm;
+static int hf_smb2_integrity_reserved;
+static int hf_smb2_integrity_flags;
+static int hf_smb2_integrity_flags_enforcement_off;
+static int hf_smb2_FILE_OBJECTID_BUFFER;
+static int hf_smb2_lease_key;
+static int hf_smb2_lease_state;
+static int hf_smb2_lease_state_read_caching;
+static int hf_smb2_lease_state_handle_caching;
+static int hf_smb2_lease_state_write_caching;
+static int hf_smb2_lease_flags;
+static int hf_smb2_lease_flags_break_ack_required;
+static int hf_smb2_lease_flags_parent_lease_key_set;
+static int hf_smb2_lease_flags_break_in_progress;
+static int hf_smb2_lease_duration;
+static int hf_smb2_parent_lease_key;
+static int hf_smb2_lease_epoch;
+static int hf_smb2_lease_reserved;
+static int hf_smb2_lease_break_reason;
+static int hf_smb2_lease_access_mask_hint;
+static int hf_smb2_lease_share_mask_hint;
+static int hf_smb2_acct_name;
+static int hf_smb2_domain_name;
+static int hf_smb2_host_name;
+static int hf_smb2_auth_frame;
+static int hf_smb2_tcon_frame;
+static int hf_smb2_share_type;
+static int hf_smb2_signature;
+static int hf_smb2_credit_charge;
+static int hf_smb2_credits_requested;
+static int hf_smb2_credits_granted;
+static int hf_smb2_channel_sequence;
+static int hf_smb2_dialect_count;
+static int hf_smb2_security_mode;
+static int hf_smb2_secmode_flags_sign_required;
+static int hf_smb2_secmode_flags_sign_enabled;
+static int hf_smb2_ses_req_flags;
+static int hf_smb2_ses_req_flags_session_binding;
+static int hf_smb2_capabilities;
+static int hf_smb2_cap_dfs;
+static int hf_smb2_cap_leasing;
+static int hf_smb2_cap_large_mtu;
+static int hf_smb2_cap_multi_channel;
+static int hf_smb2_cap_persistent_handles;
+static int hf_smb2_cap_directory_leasing;
+static int hf_smb2_cap_encryption;
+static int hf_smb2_dialect;
+static int hf_smb2_max_trans_size;
+static int hf_smb2_max_read_size;
+static int hf_smb2_max_write_size;
+static int hf_smb2_channel;
+static int hf_smb2_rdma_v1_offset;
+static int hf_smb2_rdma_v1_token;
+static int hf_smb2_rdma_v1_length;
+static int hf_smb2_session_flags;
+static int hf_smb2_ses_flags_guest;
+static int hf_smb2_ses_flags_null;
+static int hf_smb2_ses_flags_encrypt;
+static int hf_smb2_share_flags;
+static int hf_smb2_share_flags_dfs;
+static int hf_smb2_share_flags_dfs_root;
+static int hf_smb2_share_flags_restrict_exclusive_opens;
+static int hf_smb2_share_flags_force_shared_delete;
+static int hf_smb2_share_flags_allow_namespace_caching;
+static int hf_smb2_share_flags_access_based_dir_enum;
+static int hf_smb2_share_flags_force_levelii_oplock;
+static int hf_smb2_share_flags_enable_hash_v1;
+static int hf_smb2_share_flags_enable_hash_v2;
+static int hf_smb2_share_flags_encrypt_data;
+static int hf_smb2_share_flags_identity_remoting;
+static int hf_smb2_share_flags_compress_data;
+static int hf_smb2_share_flags_isolated_transport;
+static int hf_smb2_share_caching;
+static int hf_smb2_share_caps;
+static int hf_smb2_share_caps_dfs;
+static int hf_smb2_share_caps_continuous_availability;
+static int hf_smb2_share_caps_scaleout;
+static int hf_smb2_share_caps_cluster;
+static int hf_smb2_share_caps_assymetric;
+static int hf_smb2_share_caps_redirect_to_owner;
+static int hf_smb2_create_flags;
+static int hf_smb2_lock_count;
+static int hf_smb2_lock_sequence_number;
+static int hf_smb2_lock_sequence_index;
+static int hf_smb2_min_count;
+static int hf_smb2_remaining_bytes;
+static int hf_smb2_channel_info_offset;
+static int hf_smb2_channel_info_length;
+static int hf_smb2_channel_info_blob;
+static int hf_smb2_ioctl_flags;
+static int hf_smb2_ioctl_is_fsctl;
+static int hf_smb2_close_pq_attrib;
+static int hf_smb2_notify_watch_tree;
+static int hf_smb2_output_buffer_len;
+static int hf_smb2_notify_out_data;
+static int hf_smb2_notify_info;
+static int hf_smb2_notify_next_offset;
+static int hf_smb2_notify_action;
+static int hf_smb2_find_flags;
+static int hf_smb2_find_flags_restart_scans;
+static int hf_smb2_find_flags_single_entry;
+static int hf_smb2_find_flags_index_specified;
+static int hf_smb2_find_flags_reopen;
+static int hf_smb2_file_index;
+static int hf_smb2_file_directory_info;
+static int hf_smb2_both_directory_info;
+static int hf_smb2_posix_info;
+static int hf_smb2_short_name_len;
+static int hf_smb2_short_name;
+static int hf_smb2_id_both_directory_info;
+static int hf_smb2_full_directory_info;
+static int hf_smb2_lock_info;
+static int hf_smb2_lock_length;
+static int hf_smb2_lock_flags;
+static int hf_smb2_lock_flags_shared;
+static int hf_smb2_lock_flags_exclusive;
+static int hf_smb2_lock_flags_unlock;
+static int hf_smb2_lock_flags_fail_immediately;
+static int hf_smb2_dhnq_buffer_reserved;
+static int hf_smb2_dh2x_buffer_timeout;
+static int hf_smb2_dh2x_buffer_flags;
+static int hf_smb2_dh2x_buffer_flags_persistent_handle;
+static int hf_smb2_dh2x_buffer_reserved;
+static int hf_smb2_dh2x_buffer_create_guid;
+static int hf_smb2_APP_INSTANCE_buffer_struct_size;
+static int hf_smb2_APP_INSTANCE_buffer_reserved;
+static int hf_smb2_APP_INSTANCE_buffer_app_guid;
+static int hf_smb2_svhdx_open_device_context_version;
+static int hf_smb2_svhdx_open_device_context_has_initiator_id;
+static int hf_smb2_svhdx_open_device_context_reserved;
+static int hf_smb2_svhdx_open_device_context_initiator_id;
+static int hf_smb2_svhdx_open_device_context_flags;
+static int hf_smb2_svhdx_open_device_context_originator_flags;
+static int hf_smb2_svhdx_open_device_context_open_request_id;
+static int hf_smb2_svhdx_open_device_context_initiator_host_name_len;
+static int hf_smb2_svhdx_open_device_context_initiator_host_name;
+static int hf_smb2_svhdx_open_device_context_virtual_disk_properties_initialized;
+static int hf_smb2_svhdx_open_device_context_server_service_version;
+static int hf_smb2_svhdx_open_device_context_virtual_sector_size;
+static int hf_smb2_svhdx_open_device_context_physical_sector_size;
+static int hf_smb2_svhdx_open_device_context_virtual_size;
+static int hf_smb2_app_instance_version_struct_size;
+static int hf_smb2_app_instance_version_reserved;
+static int hf_smb2_app_instance_version_padding;
+static int hf_smb2_app_instance_version_high;
+static int hf_smb2_app_instance_version_low;
+static int hf_smb2_posix_perms;
+static int hf_smb2_aapl_command_code;
+static int hf_smb2_aapl_reserved;
+static int hf_smb2_aapl_server_query_bitmask;
+static int hf_smb2_aapl_server_query_bitmask_server_caps;
+static int hf_smb2_aapl_server_query_bitmask_volume_caps;
+static int hf_smb2_aapl_server_query_bitmask_model_info;
+static int hf_smb2_aapl_server_query_caps;
+static int hf_smb2_aapl_server_query_caps_supports_read_dir_attr;
+static int hf_smb2_aapl_server_query_caps_supports_osx_copyfile;
+static int hf_smb2_aapl_server_query_caps_unix_based;
+static int hf_smb2_aapl_server_query_caps_supports_nfs_ace;
+static int hf_smb2_aapl_server_query_volume_caps;
+static int hf_smb2_aapl_server_query_volume_caps_support_resolve_id;
+static int hf_smb2_aapl_server_query_volume_caps_case_sensitive;
+static int hf_smb2_aapl_server_query_volume_caps_supports_full_sync;
+static int hf_smb2_aapl_server_query_model_string;
+static int hf_smb2_aapl_server_query_server_path;
+static int hf_smb2_error_context_count;
+static int hf_smb2_error_reserved;
+static int hf_smb2_error_byte_count;
+static int hf_smb2_error_data;
+static int hf_smb2_error_context;
+static int hf_smb2_error_context_length;
+static int hf_smb2_error_context_id;
+static int hf_smb2_error_min_buf_length;
+static int hf_smb2_error_redir_context;
+static int hf_smb2_error_redir_struct_size;
+static int hf_smb2_error_redir_notif_type;
+static int hf_smb2_error_redir_flags;
+static int hf_smb2_error_redir_target_type;
+static int hf_smb2_error_redir_ip_count;
+static int hf_smb2_error_redir_ip_list;
+static int hf_smb2_error_redir_res_name;
+static int hf_smb2_reserved;
+static int hf_smb2_reserved_random;
+static int hf_smb2_transform_signature;
+static int hf_smb2_transform_nonce;
+static int hf_smb2_transform_msg_size;
+static int hf_smb2_transform_reserved;
+static int hf_smb2_transform_flags;
+static int hf_smb2_transform_flags_encrypted;
+static int hf_smb2_transform_encrypted_data;
+static int hf_smb2_protocol_id;
+static int hf_smb2_comp_transform_orig_size;
+static int hf_smb2_comp_transform_comp_alg;
+static int hf_smb2_comp_transform_flags;
+static int hf_smb2_comp_transform_offset;
+static int hf_smb2_comp_transform_length;
+static int hf_smb2_comp_transform_data;
+static int hf_smb2_comp_transform_orig_payload_size;
+static int hf_smb2_comp_pattern_v1_pattern;
+static int hf_smb2_comp_pattern_v1_reserved1;
+static int hf_smb2_comp_pattern_v1_reserved2;
+static int hf_smb2_comp_pattern_v1_repetitions;
+static int hf_smb2_truncated;
+static int hf_smb2_pipe_fragments;
+static int hf_smb2_pipe_fragment;
+static int hf_smb2_pipe_fragment_overlap;
+static int hf_smb2_pipe_fragment_overlap_conflict;
+static int hf_smb2_pipe_fragment_multiple_tails;
+static int hf_smb2_pipe_fragment_too_long_fragment;
+static int hf_smb2_pipe_fragment_error;
+static int hf_smb2_pipe_fragment_count;
+static int hf_smb2_pipe_reassembled_in;
+static int hf_smb2_pipe_reassembled_length;
+static int hf_smb2_pipe_reassembled_data;
+static int hf_smb2_cchunk_resume_key;
+static int hf_smb2_cchunk_count;
+static int hf_smb2_cchunk_src_offset;
+static int hf_smb2_cchunk_dst_offset;
+static int hf_smb2_cchunk_xfer_len;
+static int hf_smb2_cchunk_chunks_written;
+static int hf_smb2_cchunk_bytes_written;
+static int hf_smb2_cchunk_total_written;
+static int hf_smb2_reparse_data_buffer;
+static int hf_smb2_reparse_tag;
+static int hf_smb2_reparse_guid;
+static int hf_smb2_reparse_data_length;
+static int hf_smb2_nfs_type;
+static int hf_smb2_nfs_symlink_target;
+static int hf_smb2_nfs_chr_major;
+static int hf_smb2_nfs_chr_minor;
+static int hf_smb2_nfs_blk_major;
+static int hf_smb2_nfs_blk_minor;
+static int hf_smb2_symlink_error_response;
+static int hf_smb2_symlink_length;
+static int hf_smb2_symlink_error_tag;
+static int hf_smb2_unparsed_path_length;
+static int hf_smb2_symlink_substitute_name;
+static int hf_smb2_symlink_print_name;
+static int hf_smb2_symlink_flags;
+static int hf_smb2_bad_signature;
+static int hf_smb2_good_signature;
+static int hf_smb2_fscc_file_attr;
+static int hf_smb2_fscc_file_attr_archive;
+static int hf_smb2_fscc_file_attr_compressed;
+static int hf_smb2_fscc_file_attr_directory;
+static int hf_smb2_fscc_file_attr_encrypted;
+static int hf_smb2_fscc_file_attr_hidden;
+static int hf_smb2_fscc_file_attr_normal;
+static int hf_smb2_fscc_file_attr_not_content_indexed;
+static int hf_smb2_fscc_file_attr_offline;
+static int hf_smb2_fscc_file_attr_read_only;
+static int hf_smb2_fscc_file_attr_reparse_point;
+static int hf_smb2_fscc_file_attr_sparse_file;
+static int hf_smb2_fscc_file_attr_system;
+static int hf_smb2_fscc_file_attr_temporary;
+static int hf_smb2_fscc_file_attr_integrity_stream;
+static int hf_smb2_fscc_file_attr_no_scrub_data;
+static int hf_smb2_tree_connect_flags;
+static int hf_smb2_tc_cluster_reconnect;
+static int hf_smb2_tc_redirect_to_owner;
+static int hf_smb2_tc_extension_present;
+static int hf_smb2_tc_reserved;
+
+static gint ett_smb2;
+static gint ett_smb2_olb;
+static gint ett_smb2_ea;
+static gint ett_smb2_header;
+static gint ett_smb2_encrypted;
+static gint ett_smb2_compressed;
+static gint ett_smb2_decompressed;
+static gint ett_smb2_command;
+static gint ett_smb2_secblob;
+static gint ett_smb2_negotiate_context_element;
+static gint ett_smb2_file_basic_info;
+static gint ett_smb2_file_standard_info;
+static gint ett_smb2_file_internal_info;
+static gint ett_smb2_file_ea_info;
+static gint ett_smb2_file_access_info;
+static gint ett_smb2_file_position_info;
+static gint ett_smb2_file_mode_info;
+static gint ett_smb2_file_alignment_info;
+static gint ett_smb2_file_all_info;
+static gint ett_smb2_file_allocation_info;
+static gint ett_smb2_file_endoffile_info;
+static gint ett_smb2_file_alternate_name_info;
+static gint ett_smb2_file_stream_info;
+static gint ett_smb2_file_pipe_info;
+static gint ett_smb2_file_compression_info;
+static gint ett_smb2_file_network_open_info;
+static gint ett_smb2_file_attribute_tag_info;
+static gint ett_smb2_file_rename_info;
+static gint ett_smb2_file_link_info;
+static gint ett_smb2_file_disposition_info;
+static gint ett_smb2_file_full_ea_info;
+static gint ett_smb2_file_normalized_name_info;
+static gint ett_smb2_fs_info_01;
+static gint ett_smb2_fs_info_03;
+static gint ett_smb2_fs_info_04;
+static gint ett_smb2_fs_info_05;
+static gint ett_smb2_fs_info_06;
+static gint ett_smb2_fs_info_07;
+static gint ett_smb2_fs_objectid_info;
+static gint ett_smb2_fs_posix_info;
+static gint ett_smb2_sec_info_00;
+static gint ett_smb2_additional_information_sec_mask;
+static gint ett_smb2_quota_info;
+static gint ett_smb2_query_quota_info;
+static gint ett_smb2_tid_tree;
+static gint ett_smb2_sesid_tree;
+static gint ett_smb2_create_chain_element;
+static gint ett_smb2_MxAc_buffer;
+static gint ett_smb2_QFid_buffer;
+static gint ett_smb2_RqLs_buffer;
+static gint ett_smb2_ioctl_function;
+static gint ett_smb2_FILE_OBJECTID_BUFFER;
+static gint ett_smb2_flags;
+static gint ett_smb2_sec_mode;
+static gint ett_smb2_capabilities;
+static gint ett_smb2_ses_req_flags;
+static gint ett_smb2_ses_flags;
+static gint ett_smb2_lease_state;
+static gint ett_smb2_lease_flags;
+static gint ett_smb2_share_flags;
+static gint ett_smb2_create_rep_flags;
+static gint ett_smb2_share_caps;
+static gint ett_smb2_comp_alg_flags;
+static gint ett_smb2_ioctl_flags;
+static gint ett_smb2_ioctl_network_interface;
+static gint ett_smb2_ioctl_sqos_opeations;
+static gint ett_smb2_fsctl_range_data;
+static gint ett_windows_sockaddr;
+static gint ett_smb2_close_flags;
+static gint ett_smb2_notify_info;
+static gint ett_smb2_notify_flags;
+static gint ett_smb2_write_flags;
+static gint ett_smb2_rdma_v1;
+static gint ett_smb2_DH2Q_buffer;
+static gint ett_smb2_DH2C_buffer;
+static gint ett_smb2_dh2x_flags;
+static gint ett_smb2_APP_INSTANCE_buffer;
+static gint ett_smb2_svhdx_open_device_context;
+static gint ett_smb2_app_instance_version_buffer;
+static gint ett_smb2_app_instance_version_buffer_version;
+static gint ett_smb2_aapl_create_context_request;
+static gint ett_smb2_aapl_server_query_bitmask;
+static gint ett_smb2_aapl_server_query_caps;
+static gint ett_smb2_aapl_create_context_response;
+static gint ett_smb2_aapl_server_query_volume_caps;
+static gint ett_smb2_integrity_flags;
+static gint ett_smb2_find_flags;
+static gint ett_smb2_file_directory_info;
+static gint ett_smb2_both_directory_info;
+static gint ett_smb2_id_both_directory_info;
+static gint ett_smb2_full_directory_info;
+static gint ett_smb2_posix_info;
+static gint ett_smb2_file_name_info;
+static gint ett_smb2_lock_info;
+static gint ett_smb2_lock_flags;
+static gint ett_smb2_buffercode;
+static gint ett_smb2_ioctl_network_interface_capabilities;
+static gint ett_smb2_tree_connect_flags;
+static gint ett_qfr_entry;
+static gint ett_smb2_pipe_fragment;
+static gint ett_smb2_pipe_fragments;
+static gint ett_smb2_cchunk_entry;
+static gint ett_smb2_fsctl_odx_token;
+static gint ett_smb2_symlink_error_response;
+static gint ett_smb2_reparse_data_buffer;
+static gint ett_smb2_error_data;
+static gint ett_smb2_error_context;
+static gint ett_smb2_error_redir_context;
+static gint ett_smb2_error_redir_ip_list;
+static gint ett_smb2_read_flags;
+static gint ett_smb2_signature;
+static gint ett_smb2_transform_flags;
+static gint ett_smb2_fscc_file_attributes;
+static gint ett_smb2_comp_payload;
+static gint ett_smb2_comp_pattern_v1;
+
+static expert_field ei_smb2_invalid_length;
+static expert_field ei_smb2_bad_response;
+static expert_field ei_smb2_invalid_getinfo_offset;
+static expert_field ei_smb2_invalid_getinfo_size;
+static expert_field ei_smb2_empty_getinfo_buffer;
+static expert_field ei_smb2_invalid_signature;
 
 static int smb2_tap = -1;
 static int smb2_eo_tap = -1;
diff --git a/epan/dissectors/packet-smc.c b/epan/dissectors/packet-smc.c
index 17b31f232a..1ef44b5d36 100644
--- a/epan/dissectors/packet-smc.c
+++ b/epan/dissectors/packet-smc.c
@@ -193,248 +193,248 @@ static const value_string smcr_llc_message_txt[] = {
 	{ 0, NULL }
 };
 
-static int proto_smc = -1;
-static int ett_smcr = -1;
-static int hf_smcr_clc_msg = -1;
-static int hf_smcr_llc_msg = -1;
+static int proto_smc;
+static int ett_smcr;
+static int hf_smcr_clc_msg;
+static int hf_smcr_llc_msg;
 
 /* SMC Proposal for both SMC-D and SMC-R */
-static int ett_proposal_flag = -1;
-static int ett_proposal_ext_flag2 = -1;
-static int hf_proposal_smc_version_release_number = -1;
-static int hf_proposal_smc_version_seid = -1;
-static int hf_proposal_smc_version = -1;
-static int hf_proposal_smc_type = -1;
-static int hf_proposal_smc_v2_type = -1;
-static int hf_smc_length = -1;
-static int hf_smc_proposal_smc_chid = -1;
-static int hf_smc_proposal_flags = -1;
-static int hf_smc_proposal_eid = -1;
-static int hf_smc_proposal_eid_count = -1;
-static int hf_smc_proposal_system_eid = -1;
-static int hf_smc_proposal_ext_flags = -1;
-static int hf_smc_proposal_client_peer_id = -1;
-static int hf_smc_proposal_ism_gid_count = -1;
-static int hf_smc_proposal_ism_gid = -1;
-static int hf_smc_proposal_client_preferred_gid = -1;
-static int hf_smc_proposal_client_preferred_mac = -1;
-static int hf_smc_proposal_smcv1_subnet_ext_offset = -1;
-static int hf_smc_proposal_smcv2_ext_offset = -1;
-static int hf_smc_proposal_outgoing_interface_subnet_mask = -1;
-static int hf_smc_proposal_smcdv2_ext_offset = -1;
-static int hf_smc_proposal_rocev2_gid_ipv4_addr = -1;
-static int hf_smc_proposal_rocev2_gid_ipv6_addr = -1;
-static int hf_smc_proposal_outgoing_subnet_mask_signifcant_bits = -1;
-static int hf_smc_proposal_ipv6_prefix_count = -1;
-static int hf_smc_proposal_ipv6_prefix = -1;
-static int hf_smc_proposal_ipv6_prefix_length = -1;
-
-static int hf_smc_reserved = -1;
+static int ett_proposal_flag;
+static int ett_proposal_ext_flag2;
+static int hf_proposal_smc_version_release_number;
+static int hf_proposal_smc_version_seid;
+static int hf_proposal_smc_version;
+static int hf_proposal_smc_type;
+static int hf_proposal_smc_v2_type;
+static int hf_smc_length;
+static int hf_smc_proposal_smc_chid;
+static int hf_smc_proposal_flags;
+static int hf_smc_proposal_eid;
+static int hf_smc_proposal_eid_count;
+static int hf_smc_proposal_system_eid;
+static int hf_smc_proposal_ext_flags;
+static int hf_smc_proposal_client_peer_id;
+static int hf_smc_proposal_ism_gid_count;
+static int hf_smc_proposal_ism_gid;
+static int hf_smc_proposal_client_preferred_gid;
+static int hf_smc_proposal_client_preferred_mac;
+static int hf_smc_proposal_smcv1_subnet_ext_offset;
+static int hf_smc_proposal_smcv2_ext_offset;
+static int hf_smc_proposal_outgoing_interface_subnet_mask;
+static int hf_smc_proposal_smcdv2_ext_offset;
+static int hf_smc_proposal_rocev2_gid_ipv4_addr;
+static int hf_smc_proposal_rocev2_gid_ipv6_addr;
+static int hf_smc_proposal_outgoing_subnet_mask_signifcant_bits;
+static int hf_smc_proposal_ipv6_prefix_count;
+static int hf_smc_proposal_ipv6_prefix;
+static int hf_smc_proposal_ipv6_prefix_length;
+
+static int hf_smc_reserved;
 
 /* SMC-R Accept */
-static int ett_accept_flag = -1;
-static int ett_accept_flag2 = -1;
-static int ett_smcr_accept_fce_flag1 = -1;
-static int hf_accept_v2_lg_type = -1;
-static int hf_accept_smc_version = -1;
-static int hf_accept_first_contact = -1;
-static int hf_accept_rmb_buffer_size = -1;
-static int hf_accept_qp_mtu_value = -1;
-static int hf_smcr_accept_flags = -1;
-static int hf_smcr_accept_flags2 = -1;
-static int hf_smcr_accept_fce_flags = -1;
-static int hf_smcr_accept_server_peer_id = -1;
-static int hf_smcr_accept_server_preferred_gid = -1;
-static int hf_smcr_accept_server_preferred_mac = -1;
-static int hf_smcr_accept_server_qp_number = -1;
-static int hf_smcr_accept_server_rmb_rkey = -1;
-static int hf_smcr_accept_server_tcp_conn_index = -1;
-static int hf_smcr_accept_server_rmb_element_alert_token = -1;
-static int hf_smcr_accept_server_rmb_virtual_address = -1;
-static int hf_smcr_accept_initial_psn = -1;
+static int ett_accept_flag;
+static int ett_accept_flag2;
+static int ett_smcr_accept_fce_flag1;
+static int hf_accept_v2_lg_type;
+static int hf_accept_smc_version;
+static int hf_accept_first_contact;
+static int hf_accept_rmb_buffer_size;
+static int hf_accept_qp_mtu_value;
+static int hf_smcr_accept_flags;
+static int hf_smcr_accept_flags2;
+static int hf_smcr_accept_fce_flags;
+static int hf_smcr_accept_server_peer_id;
+static int hf_smcr_accept_server_preferred_gid;
+static int hf_smcr_accept_server_preferred_mac;
+static int hf_smcr_accept_server_qp_number;
+static int hf_smcr_accept_server_rmb_rkey;
+static int hf_smcr_accept_server_tcp_conn_index;
+static int hf_smcr_accept_server_rmb_element_alert_token;
+static int hf_smcr_accept_server_rmb_virtual_address;
+static int hf_smcr_accept_initial_psn;
 
 /* SMC-R Confirm */
-static int ett_confirm_flag = -1;
-static int ett_confirm_flag2 = -1;
-static int hf_smcr_confirm_flags = -1;
-static int hf_smcr_confirm_client_peer_id = -1;
-static int hf_smcr_confirm_client_gid = -1;
-static int hf_smcr_confirm_client_mac = -1;
-static int hf_smcr_confirm_client_qp_number = -1;
-static int hf_smcr_confirm_client_rmb_rkey = -1;
-static int hf_smcr_confirm_client_tcp_conn_index = -1;
-static int hf_smcr_confirm_client_rmb_element_alert_token = -1;
-static int hf_smcr_confirm_flags2 = -1;
-static int hf_smcr_confirm_client_rmb_virtual_address = -1;
-static int hf_smcr_confirm_initial_psn = -1;
-static int hf_confirm_smc_version = -1;
-static int hf_confirm_rmb_buffer_size = -1;
-static int hf_confirm_qp_mtu_value = -1;
+static int ett_confirm_flag;
+static int ett_confirm_flag2;
+static int hf_smcr_confirm_flags;
+static int hf_smcr_confirm_client_peer_id;
+static int hf_smcr_confirm_client_gid;
+static int hf_smcr_confirm_client_mac;
+static int hf_smcr_confirm_client_qp_number;
+static int hf_smcr_confirm_client_rmb_rkey;
+static int hf_smcr_confirm_client_tcp_conn_index;
+static int hf_smcr_confirm_client_rmb_element_alert_token;
+static int hf_smcr_confirm_flags2;
+static int hf_smcr_confirm_client_rmb_virtual_address;
+static int hf_smcr_confirm_initial_psn;
+static int hf_confirm_smc_version;
+static int hf_confirm_rmb_buffer_size;
+static int hf_confirm_qp_mtu_value;
 
 /* SMC-D Accept */
-static int hf_accept_smc_type = -1;
-static int ett_smcd_accept_flag = -1;
-static int ett_smc_accept_fce_flag = -1;
-static int ett_smcd_accept_flag2 = -1;
-static int hf_smcd_accept_smc_version = -1;
-static int hf_accept_os_type = -1;
-static int hf_accept_smc_version_release_number = -1;
-static int hf_smcd_accept_first_contact = -1;
-static int hf_accept_dmb_buffer_size = -1;
-static int hf_smcd_accept_flags = -1;
-static int hf_smc_accept_fce_flags = -1;
-static int hf_smcd_accept_flags2 = -1;
-static int hf_smcd_accept_server_peer_id = -1;
-static int hf_smcd_accept_dmbe_conn_index = -1;
-static int hf_smcd_accept_dmb_token = -1;
-static int hf_smcd_accept_server_link_id = -1;
-static int hf_smcd_accept_smc_chid = -1;
-static int hf_smc_accept_eid = -1;
-static int hf_smc_accept_peer_name = -1;
+static int hf_accept_smc_type;
+static int ett_smcd_accept_flag;
+static int ett_smc_accept_fce_flag;
+static int ett_smcd_accept_flag2;
+static int hf_smcd_accept_smc_version;
+static int hf_accept_os_type;
+static int hf_accept_smc_version_release_number;
+static int hf_smcd_accept_first_contact;
+static int hf_accept_dmb_buffer_size;
+static int hf_smcd_accept_flags;
+static int hf_smc_accept_fce_flags;
+static int hf_smcd_accept_flags2;
+static int hf_smcd_accept_server_peer_id;
+static int hf_smcd_accept_dmbe_conn_index;
+static int hf_smcd_accept_dmb_token;
+static int hf_smcd_accept_server_link_id;
+static int hf_smcd_accept_smc_chid;
+static int hf_smc_accept_eid;
+static int hf_smc_accept_peer_name;
 
 /* SMC-D Confirm */
-static int hf_confirm_smc_type = -1;
-static int ett_smcd_confirm_flag = -1;
-static int ett_smc_confirm_fce_flag = -1;
-static int ett_smcd_confirm_flag2 = -1;
-static int hf_smcd_confirm_smc_version = -1;
-static int hf_confirm_os_type = -1;
-static int hf_smcd_confirm_flags = -1;
-static int hf_smcd_confirm_flags2 = -1;
-static int hf_smc_confirm_first_contact = -1;
-static int hf_smcd_confirm_client_peer_id = -1;
-static int hf_smcd_confirm_dmb_token = -1;
-static int hf_smcd_confirm_dmbe_conn_index = -1;
-static int hf_smcd_confirm_client_link_id = -1;
-static int hf_confirm_smc_version_release_number = -1;
-static int hf_smcd_confirm_dmb_buffer_size = -1;
-static int hf_smcd_confirm_smc_chid = -1;
-static int hf_smc_confirm_eid = -1;
-static int hf_smc_confirm_peer_name = -1;
-static int hf_smc_confirm_gid_lst_len = -1;
-static int hf_smc_confirm_gid_list_entry = -1;
+static int hf_confirm_smc_type;
+static int ett_smcd_confirm_flag;
+static int ett_smc_confirm_fce_flag;
+static int ett_smcd_confirm_flag2;
+static int hf_smcd_confirm_smc_version;
+static int hf_confirm_os_type;
+static int hf_smcd_confirm_flags;
+static int hf_smcd_confirm_flags2;
+static int hf_smc_confirm_first_contact;
+static int hf_smcd_confirm_client_peer_id;
+static int hf_smcd_confirm_dmb_token;
+static int hf_smcd_confirm_dmbe_conn_index;
+static int hf_smcd_confirm_client_link_id;
+static int hf_confirm_smc_version_release_number;
+static int hf_smcd_confirm_dmb_buffer_size;
+static int hf_smcd_confirm_smc_chid;
+static int hf_smc_confirm_eid;
+static int hf_smc_confirm_peer_name;
+static int hf_smc_confirm_gid_lst_len;
+static int hf_smc_confirm_gid_list_entry;
 
 /* SMC-R Decline */
-static int ett_decline_flag = -1;
-static int ett_decline_flag2 = -1;
-static int hf_smc_decline_flags = -1;
-static int hf_smc_decline_flags2 = -1;
-static int hf_smc_decline_peer_id = -1;
-static int hf_smc_decline_diag_info = -1;
-static int hf_decline_os_type = -1;
-static int hf_decline_smc_version = -1;
-static int hf_decline_out_of_sync = -1;
+static int ett_decline_flag;
+static int ett_decline_flag2;
+static int hf_smc_decline_flags;
+static int hf_smc_decline_flags2;
+static int hf_smc_decline_peer_id;
+static int hf_smc_decline_diag_info;
+static int hf_decline_os_type;
+static int hf_decline_smc_version;
+static int hf_decline_out_of_sync;
 
 /* SMC-R Confirm Link*/
-static int ett_confirm_link_flag = -1;
-static int hf_smcr_confirm_link_flags = -1;
-static int hf_smcr_confirm_link_mac = -1;
-static int hf_smcr_confirm_link_gid = -1;
-static int hf_smcr_confirm_link_qp_number = -1;
-static int hf_smcr_confirm_link_number = -1;
-static int hf_smcr_confirm_link_userid = -1;
-static int hf_smcr_confirm_link_max_links = -1;
-static int hf_smcr_confirm_link_response = -1;
+static int ett_confirm_link_flag;
+static int hf_smcr_confirm_link_flags;
+static int hf_smcr_confirm_link_mac;
+static int hf_smcr_confirm_link_gid;
+static int hf_smcr_confirm_link_qp_number;
+static int hf_smcr_confirm_link_number;
+static int hf_smcr_confirm_link_userid;
+static int hf_smcr_confirm_link_max_links;
+static int hf_smcr_confirm_link_response;
 
 /* SMC-R Add Link */
-static int ett_add_link_flag = -1;
-static int ett_add_link_flag2 = -1;
-static int ett_add_link_flag3 = -1;
-static int hf_smcr_add_link_flags = -1;
-static int hf_smcr_add_link_response = -1;
-static int hf_smcr_add_link_response_rejected = -1;
-static int hf_smcr_add_link_reject_reason = -1;
-static int hf_smcr_add_link_mac = -1;
-static int hf_smcr_add_link_gid = -1;
-static int hf_smcr_add_link_qp_number = -1;
-static int hf_smcr_add_link_number = -1;
-static int hf_smcr_add_link_initial_psn = -1;
-static int hf_smcr_add_link_flags2 = -1;
-static int hf_smcr_add_link_qp_mtu_value = -1;
-static int hf_smcr_add_link_client_target_gid = -1;
-static int hf_smcr_add_link_rkey_count = -1;
-static int hf_smcr_add_link_rkey = -1;
-static int hf_smcr_add_link_rkey2 = -1;
-static int hf_smcr_add_link_virt_addr = -1;
-static int hf_smcr_add_link_flags3 = -1;
-static int hf_smcr_add_link_flag3_direct_link = -1;
+static int ett_add_link_flag;
+static int ett_add_link_flag2;
+static int ett_add_link_flag3;
+static int hf_smcr_add_link_flags;
+static int hf_smcr_add_link_response;
+static int hf_smcr_add_link_response_rejected;
+static int hf_smcr_add_link_reject_reason;
+static int hf_smcr_add_link_mac;
+static int hf_smcr_add_link_gid;
+static int hf_smcr_add_link_qp_number;
+static int hf_smcr_add_link_number;
+static int hf_smcr_add_link_initial_psn;
+static int hf_smcr_add_link_flags2;
+static int hf_smcr_add_link_qp_mtu_value;
+static int hf_smcr_add_link_client_target_gid;
+static int hf_smcr_add_link_rkey_count;
+static int hf_smcr_add_link_rkey;
+static int hf_smcr_add_link_rkey2;
+static int hf_smcr_add_link_virt_addr;
+static int hf_smcr_add_link_flags3;
+static int hf_smcr_add_link_flag3_direct_link;
 
 /* SMC-R Add Link Continue*/
-static int ett_add_link_cont_flag = -1;
-static int hf_smcr_add_link_cont_flags = -1;
-static int hf_smcr_add_link_cont_response = -1;
-static int hf_smcr_add_link_cont_link_number = -1;
-static int hf_smcr_add_link_cont_number_of_rkeys = -1;
-static int hf_smcr_add_link_cont_p1_rkey = -1;
-static int hf_smcr_add_link_cont_p1_rkey2 = -1;
-static int hf_smcr_add_link_cont_p1_virt_addr = -1;
-static int hf_smcr_add_link_cont_p2_rkey = -1;
-static int hf_smcr_add_link_cont_p2_rkey2 = -1;
-static int hf_smcr_add_link_cont_p2_virt_addr = -1;
+static int ett_add_link_cont_flag;
+static int hf_smcr_add_link_cont_flags;
+static int hf_smcr_add_link_cont_response;
+static int hf_smcr_add_link_cont_link_number;
+static int hf_smcr_add_link_cont_number_of_rkeys;
+static int hf_smcr_add_link_cont_p1_rkey;
+static int hf_smcr_add_link_cont_p1_rkey2;
+static int hf_smcr_add_link_cont_p1_virt_addr;
+static int hf_smcr_add_link_cont_p2_rkey;
+static int hf_smcr_add_link_cont_p2_rkey2;
+static int hf_smcr_add_link_cont_p2_virt_addr;
 
 /* SMC-Rv2 Request Add Link */
-static int ett_request_add_link_flag = -1;
-static int hf_smcr_request_add_link_flags = -1;
-static int hf_smcr_request_add_link_response = -1;
-static int hf_smcr_request_add_link_response_rejected = -1;
-static int hf_smcr_request_add_link_reject_reason = -1;
-static int hf_smc_request_add_link_gid_lst_len = -1;
-static int hf_smc_request_add_link_gid_list_entry = -1;
+static int ett_request_add_link_flag;
+static int hf_smcr_request_add_link_flags;
+static int hf_smcr_request_add_link_response;
+static int hf_smcr_request_add_link_response_rejected;
+static int hf_smcr_request_add_link_reject_reason;
+static int hf_smc_request_add_link_gid_lst_len;
+static int hf_smc_request_add_link_gid_list_entry;
 
 /* SMC-R Delete Link */
-static int ett_delete_link_flag = -1;
-static int hf_smcr_delete_link_flags = -1;
-static int hf_smcr_delete_link_response = -1;
-static int hf_smcr_delete_link_all = -1;
-static int hf_smcr_delete_link_orderly = -1;
-static int hf_smcr_delete_link_number = -1;
-static int hf_smcr_delete_link_reason_code = -1;
+static int ett_delete_link_flag;
+static int hf_smcr_delete_link_flags;
+static int hf_smcr_delete_link_response;
+static int hf_smcr_delete_link_all;
+static int hf_smcr_delete_link_orderly;
+static int hf_smcr_delete_link_number;
+static int hf_smcr_delete_link_reason_code;
 
 /* SMC-R Confirm Rkey */
-static int ett_confirm_rkey_flag = -1;
-static int hf_smcr_confirm_rkey_response = -1;
-static int hf_smcr_confirm_rkey_flags = -1;
-static int hf_smcr_confirm_rkey_negative_response = -1;
-static int hf_smcr_confirm_rkey_retry_rkey_set = -1;
-static int hf_smcr_confirm_rkey_number = -1;
-static int hf_smcr_confirm_rkey_new_rkey = -1;
-static int hf_smcr_confirm_rkey_virtual_address = -1;
-static int hf_smcr_confirm_rkey_link_number = -1;
+static int ett_confirm_rkey_flag;
+static int hf_smcr_confirm_rkey_response;
+static int hf_smcr_confirm_rkey_flags;
+static int hf_smcr_confirm_rkey_negative_response;
+static int hf_smcr_confirm_rkey_retry_rkey_set;
+static int hf_smcr_confirm_rkey_number;
+static int hf_smcr_confirm_rkey_new_rkey;
+static int hf_smcr_confirm_rkey_virtual_address;
+static int hf_smcr_confirm_rkey_link_number;
 
 /* SMC-R Delete Rkey */
-static int ett_delete_rkey_flag = -1;
-static int hf_smcr_delete_rkey_flags = -1;
-static int hf_smcr_delete_rkey_response = -1;
-static int hf_smcr_delete_rkey_negative_response = -1;
-static int hf_smcr_delete_rkey_mask = -1;
-static int hf_smcr_delete_rkey_deleted = -1;
-static int hf_smcr_delete_rkey_count = -1;
-static int hf_smcr_delete_rkey_invalid_count = -1;
+static int ett_delete_rkey_flag;
+static int hf_smcr_delete_rkey_flags;
+static int hf_smcr_delete_rkey_response;
+static int hf_smcr_delete_rkey_negative_response;
+static int hf_smcr_delete_rkey_mask;
+static int hf_smcr_delete_rkey_deleted;
+static int hf_smcr_delete_rkey_count;
+static int hf_smcr_delete_rkey_invalid_count;
 
 /* SMC-R Test Link */
-static int ett_test_link_flag = -1;
-static int hf_smcr_test_link_flags = -1;
-static int hf_smcr_test_link_response = -1;
+static int ett_test_link_flag;
+static int hf_smcr_test_link_flags;
+static int hf_smcr_test_link_response;
 
 /* SMC-R RMBE Control */
-static int ett_rmbe_ctrl_rw_status_flag = -1;
-static int ett_rmbe_ctrl_peer_conn_state_flag = -1;
-static int hf_smcr_rmbe_ctrl_seqno = -1;
-static int hf_smcr_rmbe_ctrl_alert_token = -1;
-static int hf_smcr_rmbe_ctrl_prod_wrap_seqno = -1;
-static int hf_smcr_rmbe_ctrl_peer_prod_curs = -1;
-static int hf_smcr_rmbe_ctrl_cons_wrap_seqno = -1;
-static int hf_smcr_rmbe_ctrl_peer_cons_curs = -1;
-static int hf_smcr_rmbe_ctrl_conn_rw_status_flags = -1;
-static int hf_smcr_rmbe_ctrl_write_blocked = -1;
-static int hf_smcr_rmbe_ctrl_urgent_pending = -1;
-static int hf_smcr_rmbe_ctrl_urgent_present = -1;
-static int hf_smcr_rmbe_ctrl_cons_update_requested = -1;
-static int hf_smcr_rmbe_ctrl_failover_validation = -1;
-static int hf_smcr_rmbe_ctrl_peer_conn_state_flags = -1;
-static int hf_smcr_rmbe_ctrl_peer_sending_done = -1;
-static int hf_smcr_rmbe_ctrl_peer_closed_conn = -1;
-static int hf_smcr_rmbe_ctrl_peer_abnormal_close = -1;
+static int ett_rmbe_ctrl_rw_status_flag;
+static int ett_rmbe_ctrl_peer_conn_state_flag;
+static int hf_smcr_rmbe_ctrl_seqno;
+static int hf_smcr_rmbe_ctrl_alert_token;
+static int hf_smcr_rmbe_ctrl_prod_wrap_seqno;
+static int hf_smcr_rmbe_ctrl_peer_prod_curs;
+static int hf_smcr_rmbe_ctrl_cons_wrap_seqno;
+static int hf_smcr_rmbe_ctrl_peer_cons_curs;
+static int hf_smcr_rmbe_ctrl_conn_rw_status_flags;
+static int hf_smcr_rmbe_ctrl_write_blocked;
+static int hf_smcr_rmbe_ctrl_urgent_pending;
+static int hf_smcr_rmbe_ctrl_urgent_present;
+static int hf_smcr_rmbe_ctrl_cons_update_requested;
+static int hf_smcr_rmbe_ctrl_failover_validation;
+static int hf_smcr_rmbe_ctrl_peer_conn_state_flags;
+static int hf_smcr_rmbe_ctrl_peer_sending_done;
+static int hf_smcr_rmbe_ctrl_peer_closed_conn;
+static int hf_smcr_rmbe_ctrl_peer_abnormal_close;
 
 void proto_register_smcr(void);
 void proto_reg_handoff_smcr(void);
diff --git a/epan/dissectors/packet-sml.c b/epan/dissectors/packet-sml.c
index 8051f34015..434f815814 100644
--- a/epan/dissectors/packet-sml.c
+++ b/epan/dissectors/packet-sml.c
@@ -81,79 +81,79 @@ void proto_reg_handoff_sml(void);
 static dissector_handle_t sml_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_sml = -1;
-
-static int hf_sml_esc = -1;
-static int hf_sml_version_1 = -1;
-static int hf_sml_groupNo = -1;
-static int hf_sml_transactionId = -1;
-static int hf_sml_length = -1;
-static int hf_sml_datatype = -1;
-static int hf_sml_abortOnError = -1;
-static int hf_sml_MessageBody = -1;
-static int hf_sml_crc16 = -1;
-static int hf_sml_crc16_status = -1;
-static int hf_sml_endOfSmlMsg = -1;
-static int hf_sml_end = -1;
-static int hf_sml_codepage = -1;
-static int hf_sml_clientId = -1;
-static int hf_sml_reqFileId = -1;
-static int hf_sml_serverId = -1;
-static int hf_sml_username = -1;
-static int hf_sml_password = -1;
-static int hf_sml_smlVersion = -1;
-static int hf_sml_listName = -1;
-static int hf_sml_globalSignature = -1;
-static int hf_sml_timetype = -1;
-static int hf_sml_objName = -1;
-static int hf_sml_status = -1;
-static int hf_sml_unit = -1;
-static int hf_sml_scaler = -1;
-static int hf_sml_value = -1;
-static int hf_sml_simplevalue = -1;
-static int hf_sml_valueSignature = -1;
-static int hf_sml_listSignature = -1;
-static int hf_sml_parameterTreePath = -1;
-static int hf_sml_attribute = -1;
-static int hf_sml_parameterName = -1;
-static int hf_sml_procParValue = -1;
-static int hf_sml_padding = -1;
-static int hf_sml_secIndex = -1;
-static int hf_sml_timestamp = -1;
-static int hf_sml_localOffset = -1;
-static int hf_sml_seasonTimeOffset = -1;
-static int hf_sml_attentionNo = -1;
-static int hf_sml_attentionMsg = -1;
-static int hf_sml_withRawdata = -1;
-static int hf_sml_object_list_Entry = -1;
-static int hf_sml_regPeriod = -1;
-static int hf_sml_rawdata = -1;
-static int hf_sml_periodSignature = -1;
-static int hf_sml_profileSignature = -1;
-static int hf_sml_signature_mA_R2_R3 = -1;
-static int hf_sml_signature_pA_R1_R4 = -1;
-static int hf_sml_unit_mA = -1;
-static int hf_sml_scaler_mA = -1;
-static int hf_sml_value_mA = -1;
-static int hf_sml_unit_pA = -1;
-static int hf_sml_scaler_pA = -1;
-static int hf_sml_value_pA = -1;
-static int hf_sml_unit_R1 = -1;
-static int hf_sml_scaler_R1 = -1;
-static int hf_sml_value_R1 = -1;
-static int hf_sml_unit_R2 = -1;
-static int hf_sml_scaler_R2 = -1;
-static int hf_sml_value_R2 = -1;
-static int hf_sml_unit_R3 = -1;
-static int hf_sml_scaler_R3 = -1;
-static int hf_sml_value_R3 = -1;
-static int hf_sml_unit_R4 = -1;
-static int hf_sml_scaler_R4 = -1;
-static int hf_sml_value_R4 = -1;
-static int hf_sml_file_marker = -1;
-static int hf_sml_new_file_marker = -1;
-static int hf_sml_listtype = -1;
-static int hf_sml_cosemvalue = -1;
+static int proto_sml;
+
+static int hf_sml_esc;
+static int hf_sml_version_1;
+static int hf_sml_groupNo;
+static int hf_sml_transactionId;
+static int hf_sml_length;
+static int hf_sml_datatype;
+static int hf_sml_abortOnError;
+static int hf_sml_MessageBody;
+static int hf_sml_crc16;
+static int hf_sml_crc16_status;
+static int hf_sml_endOfSmlMsg;
+static int hf_sml_end;
+static int hf_sml_codepage;
+static int hf_sml_clientId;
+static int hf_sml_reqFileId;
+static int hf_sml_serverId;
+static int hf_sml_username;
+static int hf_sml_password;
+static int hf_sml_smlVersion;
+static int hf_sml_listName;
+static int hf_sml_globalSignature;
+static int hf_sml_timetype;
+static int hf_sml_objName;
+static int hf_sml_status;
+static int hf_sml_unit;
+static int hf_sml_scaler;
+static int hf_sml_value;
+static int hf_sml_simplevalue;
+static int hf_sml_valueSignature;
+static int hf_sml_listSignature;
+static int hf_sml_parameterTreePath;
+static int hf_sml_attribute;
+static int hf_sml_parameterName;
+static int hf_sml_procParValue;
+static int hf_sml_padding;
+static int hf_sml_secIndex;
+static int hf_sml_timestamp;
+static int hf_sml_localOffset;
+static int hf_sml_seasonTimeOffset;
+static int hf_sml_attentionNo;
+static int hf_sml_attentionMsg;
+static int hf_sml_withRawdata;
+static int hf_sml_object_list_Entry;
+static int hf_sml_regPeriod;
+static int hf_sml_rawdata;
+static int hf_sml_periodSignature;
+static int hf_sml_profileSignature;
+static int hf_sml_signature_mA_R2_R3;
+static int hf_sml_signature_pA_R1_R4;
+static int hf_sml_unit_mA;
+static int hf_sml_scaler_mA;
+static int hf_sml_value_mA;
+static int hf_sml_unit_pA;
+static int hf_sml_scaler_pA;
+static int hf_sml_value_pA;
+static int hf_sml_unit_R1;
+static int hf_sml_scaler_R1;
+static int hf_sml_value_R1;
+static int hf_sml_unit_R2;
+static int hf_sml_scaler_R2;
+static int hf_sml_value_R2;
+static int hf_sml_unit_R3;
+static int hf_sml_scaler_R3;
+static int hf_sml_value_R3;
+static int hf_sml_unit_R4;
+static int hf_sml_scaler_R4;
+static int hf_sml_value_R4;
+static int hf_sml_file_marker;
+static int hf_sml_new_file_marker;
+static int hf_sml_listtype;
+static int hf_sml_cosemvalue;
 
 static const value_string datatype []={
 	{0x52, "Integer 8"},
@@ -267,125 +267,125 @@ static const range_string bools[]={
 };
 
 /* Initialize the subtree pointers */
-static gint ett_sml = -1;
-static gint ett_sml_mainlist = -1;
-static gint ett_sml_version = -1;
-static gint ett_sml_sublist = -1;
-static gint ett_sml_trans = -1;
-static gint ett_sml_group = -1;
-static gint ett_sml_abort = -1;
-static gint ett_sml_body = -1;
-static gint ett_sml_mblist = -1;
-static gint ett_sml_mttree = -1;
-static gint ett_sml_crc16 = -1;
-static gint ett_sml_clientId = -1;
-static gint ett_sml_codepage = -1;
-static gint ett_sml_reqFileId= -1;
-static gint ett_sml_serverId = -1;
-static gint ett_sml_username = -1;
-static gint ett_sml_password = -1;
-static gint ett_sml_smlVersion = -1;
-static gint ett_sml_listName = -1;
-static gint ett_sml_globalSignature = -1;
-static gint ett_sml_refTime = -1;
-static gint ett_sml_actSensorTime = -1;
-static gint ett_sml_timetype = -1;
-static gint ett_sml_time = -1;
-static gint ett_sml_valList = -1;
-static gint ett_sml_listEntry = -1;
-static gint ett_sml_objName = -1;
-static gint ett_sml_status = -1;
-static gint ett_sml_valTime = -1;
-static gint ett_sml_unit = -1;
-static gint ett_sml_scaler = -1;
-static gint ett_sml_value = -1;
-static gint ett_sml_simplevalue = -1;
-static gint ett_sml_valueSignature = -1;
-static gint ett_sml_listSignature = -1;
-static gint ett_sml_valtree = -1;
-static gint ett_sml_actGatewayTime = -1;
-static gint ett_sml_treepath = -1;
-static gint ett_sml_parameterTreePath = -1;
-static gint ett_sml_attribute = -1;
-static gint ett_sml_parameterTree = -1;
-static gint ett_sml_parameterName = -1;
-static gint ett_sml_child = -1;
-static gint ett_sml_periodEntry = -1;
-static gint ett_sml_procParValue = -1;
-static gint ett_sml_procParValueTime = -1;
-static gint ett_sml_procParValuetype = -1;
-static gint ett_sml_msgend = -1;
-static gint ett_sml_tuple = -1;
-static gint ett_sml_secIndex = -1;
-static gint ett_sml_timestamp = -1;
-static gint ett_sml_localTimestamp = -1;
-static gint ett_sml_localOffset = -1;
-static gint ett_sml_seasonTimeOffset = -1;
-static gint ett_sml_signature = -1;
-static gint ett_sml_attentionNo = -1;
-static gint ett_sml_attentionMsg = -1;
-static gint ett_sml_withRawdata = -1;
-static gint ett_sml_beginTime = -1;
-static gint ett_sml_endTime = -1;
-static gint ett_sml_object_list = -1;
-static gint ett_sml_object_list_Entry = -1;
-static gint ett_sml_actTime = -1;
-static gint ett_sml_regPeriod = -1;
-static gint ett_sml_rawdata = -1;
-static gint ett_sml_periodSignature = -1;
-static gint ett_sml_period_List_Entry = -1;
-static gint ett_sml_periodList = -1;
-static gint ett_sml_headerList = -1;
-static gint ett_sml_header_List_Entry = -1;
-static gint ett_sml_profileSignature = -1;
-static gint ett_sml_valuelist = -1;
-static gint ett_sml_value_List_Entry = -1;
-static gint ett_sml_signature_mA_R2_R3 = -1;
-static gint ett_sml_signature_pA_R1_R4 = -1;
-static gint ett_sml_unit_mA = -1;
-static gint ett_sml_scaler_mA = -1;
-static gint ett_sml_value_mA = -1;
-static gint ett_sml_unit_pA = -1;
-static gint ett_sml_scaler_pA = -1;
-static gint ett_sml_value_pA = -1;
-static gint ett_sml_unit_R1 = -1;
-static gint ett_sml_scaler_R1 = -1;
-static gint ett_sml_value_R1 = -1;
-static gint ett_sml_unit_R2 = -1;
-static gint ett_sml_scaler_R2 = -1;
-static gint ett_sml_value_R2 = -1;
-static gint ett_sml_unit_R3 = -1;
-static gint ett_sml_scaler_R3 = -1;
-static gint ett_sml_value_R3 = -1;
-static gint ett_sml_unit_R4 = -1;
-static gint ett_sml_scaler_R4 = -1;
-static gint ett_sml_value_R4 = -1;
-static gint ett_sml_tree_Entry = -1;
-static gint ett_sml_dasDetails = -1;
-static gint ett_sml_attentionDetails = -1;
-static gint ett_sml_listtypetype = -1;
-static gint ett_sml_listtype = -1;
-static gint ett_sml_timestampedvaluetype = -1;
-static gint ett_sml_timestampedvalue = -1;
-static gint ett_sml_cosemvaluetype = -1;
-static gint ett_sml_cosemvalue = -1;
-static gint ett_sml_scaler_unit = -1;
-
-static expert_field ei_sml_messagetype_unknown = EI_INIT;
-static expert_field ei_sml_procParValue_errror = EI_INIT;
-static expert_field ei_sml_procParValue_invalid = EI_INIT;
-static expert_field ei_sml_segment_needed = EI_INIT;
-static expert_field ei_sml_endOfSmlMsg = EI_INIT;
-static expert_field ei_sml_crc_error = EI_INIT;
-static expert_field ei_sml_tuple_error = EI_INIT;
-static expert_field ei_sml_crc_error_length = EI_INIT;
-static expert_field ei_sml_invalid_count = EI_INIT;
-static expert_field ei_sml_MessageBody = EI_INIT;
-static expert_field ei_sml_esc_error = EI_INIT;
-static expert_field ei_sml_version2_not_supported = EI_INIT;
-static expert_field ei_sml_attentionNo = EI_INIT;
-static expert_field ei_sml_listtype_invalid = EI_INIT;
-static expert_field ei_sml_cosemvalue_invalid = EI_INIT;
+static gint ett_sml;
+static gint ett_sml_mainlist;
+static gint ett_sml_version;
+static gint ett_sml_sublist;
+static gint ett_sml_trans;
+static gint ett_sml_group;
+static gint ett_sml_abort;
+static gint ett_sml_body;
+static gint ett_sml_mblist;
+static gint ett_sml_mttree;
+static gint ett_sml_crc16;
+static gint ett_sml_clientId;
+static gint ett_sml_codepage;
+static gint ett_sml_reqFileId;
+static gint ett_sml_serverId;
+static gint ett_sml_username;
+static gint ett_sml_password;
+static gint ett_sml_smlVersion;
+static gint ett_sml_listName;
+static gint ett_sml_globalSignature;
+static gint ett_sml_refTime;
+static gint ett_sml_actSensorTime;
+static gint ett_sml_timetype;
+static gint ett_sml_time;
+static gint ett_sml_valList;
+static gint ett_sml_listEntry;
+static gint ett_sml_objName;
+static gint ett_sml_status;
+static gint ett_sml_valTime;
+static gint ett_sml_unit;
+static gint ett_sml_scaler;
+static gint ett_sml_value;
+static gint ett_sml_simplevalue;
+static gint ett_sml_valueSignature;
+static gint ett_sml_listSignature;
+static gint ett_sml_valtree;
+static gint ett_sml_actGatewayTime;
+static gint ett_sml_treepath;
+static gint ett_sml_parameterTreePath;
+static gint ett_sml_attribute;
+static gint ett_sml_parameterTree;
+static gint ett_sml_parameterName;
+static gint ett_sml_child;
+static gint ett_sml_periodEntry;
+static gint ett_sml_procParValue;
+static gint ett_sml_procParValueTime;
+static gint ett_sml_procParValuetype;
+static gint ett_sml_msgend;
+static gint ett_sml_tuple;
+static gint ett_sml_secIndex;
+static gint ett_sml_timestamp;
+static gint ett_sml_localTimestamp;
+static gint ett_sml_localOffset;
+static gint ett_sml_seasonTimeOffset;
+static gint ett_sml_signature;
+static gint ett_sml_attentionNo;
+static gint ett_sml_attentionMsg;
+static gint ett_sml_withRawdata;
+static gint ett_sml_beginTime;
+static gint ett_sml_endTime;
+static gint ett_sml_object_list;
+static gint ett_sml_object_list_Entry;
+static gint ett_sml_actTime;
+static gint ett_sml_regPeriod;
+static gint ett_sml_rawdata;
+static gint ett_sml_periodSignature;
+static gint ett_sml_period_List_Entry;
+static gint ett_sml_periodList;
+static gint ett_sml_headerList;
+static gint ett_sml_header_List_Entry;
+static gint ett_sml_profileSignature;
+static gint ett_sml_valuelist;
+static gint ett_sml_value_List_Entry;
+static gint ett_sml_signature_mA_R2_R3;
+static gint ett_sml_signature_pA_R1_R4;
+static gint ett_sml_unit_mA;
+static gint ett_sml_scaler_mA;
+static gint ett_sml_value_mA;
+static gint ett_sml_unit_pA;
+static gint ett_sml_scaler_pA;
+static gint ett_sml_value_pA;
+static gint ett_sml_unit_R1;
+static gint ett_sml_scaler_R1;
+static gint ett_sml_value_R1;
+static gint ett_sml_unit_R2;
+static gint ett_sml_scaler_R2;
+static gint ett_sml_value_R2;
+static gint ett_sml_unit_R3;
+static gint ett_sml_scaler_R3;
+static gint ett_sml_value_R3;
+static gint ett_sml_unit_R4;
+static gint ett_sml_scaler_R4;
+static gint ett_sml_value_R4;
+static gint ett_sml_tree_Entry;
+static gint ett_sml_dasDetails;
+static gint ett_sml_attentionDetails;
+static gint ett_sml_listtypetype;
+static gint ett_sml_listtype;
+static gint ett_sml_timestampedvaluetype;
+static gint ett_sml_timestampedvalue;
+static gint ett_sml_cosemvaluetype;
+static gint ett_sml_cosemvalue;
+static gint ett_sml_scaler_unit;
+
+static expert_field ei_sml_messagetype_unknown;
+static expert_field ei_sml_procParValue_errror;
+static expert_field ei_sml_procParValue_invalid;
+static expert_field ei_sml_segment_needed;
+static expert_field ei_sml_endOfSmlMsg;
+static expert_field ei_sml_crc_error;
+static expert_field ei_sml_tuple_error;
+static expert_field ei_sml_crc_error_length;
+static expert_field ei_sml_invalid_count;
+static expert_field ei_sml_MessageBody;
+static expert_field ei_sml_esc_error;
+static expert_field ei_sml_version2_not_supported;
+static expert_field ei_sml_attentionNo;
+static expert_field ei_sml_listtype_invalid;
+static expert_field ei_sml_cosemvalue_invalid;
 
 /*options*/
 static gboolean sml_reassemble = TRUE;
diff --git a/epan/dissectors/packet-smp.c b/epan/dissectors/packet-smp.c
index 989034f1a5..7e9603a52a 100644
--- a/epan/dissectors/packet-smp.c
+++ b/epan/dissectors/packet-smp.c
@@ -43,22 +43,22 @@
 void proto_reg_handoff_smp(void);
 void proto_register_smp(void);
 
-static int proto_smp = -1;
-
-static int hf_smp_smid = -1;
-static int hf_smp_flags = -1;
-static int hf_smp_flags_syn = -1;
-static int hf_smp_flags_ack = -1;
-static int hf_smp_flags_fin = -1;
-static int hf_smp_flags_data = -1;
-static int hf_smp_sid = -1;
-static int hf_smp_length = -1;
-static int hf_smp_seqnum = -1;
-static int hf_smp_wndw = -1;
-static int hf_smp_data = -1;
-
-static gint ett_smp = -1;
-static gint ett_smp_flags = -1;
+static int proto_smp;
+
+static int hf_smp_smid;
+static int hf_smp_flags;
+static int hf_smp_flags_syn;
+static int hf_smp_flags_ack;
+static int hf_smp_flags_fin;
+static int hf_smp_flags_data;
+static int hf_smp_sid;
+static int hf_smp_length;
+static int hf_smp_seqnum;
+static int hf_smp_wndw;
+static int hf_smp_data;
+
+static gint ett_smp;
+static gint ett_smp_flags;
 
 #define SMP_FLAGS_SYN  0x01
 #define SMP_FLAGS_ACK  0x02
diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index 0fd28c4470..efe707b1b6 100644
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -67,190 +67,190 @@ static gint exported_pdu_tap = -1;
  *
  * Fixed header section
  */
-static int proto_smpp                                 = -1;
+static int proto_smpp;
 
 static int st_smpp_ops                                = -1;
 static int st_smpp_req                                = -1;
 static int st_smpp_res                                = -1;
 static int st_smpp_res_status                         = -1;
 
-static int hf_smpp_command_id                         = -1;
-static int hf_smpp_command_request                    = -1;
-static int hf_smpp_command_response                   = -1;
-static int hf_smpp_command_length                     = -1;
-static int hf_smpp_command_status                     = -1;
-static int hf_smpp_sequence_number                    = -1;
+static int hf_smpp_command_id;
+static int hf_smpp_command_request;
+static int hf_smpp_command_response;
+static int hf_smpp_command_length;
+static int hf_smpp_command_status;
+static int hf_smpp_sequence_number;
 
 /*
  * Fixed body section
  */
-static int hf_smpp_system_id                          = -1;
-static int hf_smpp_password                           = -1;
-static int hf_smpp_system_type                        = -1;
-static int hf_smpp_interface_version                  = -1;
-static int hf_smpp_addr_ton                           = -1;
-static int hf_smpp_addr_npi                           = -1;
-static int hf_smpp_address_range                      = -1;
-static int hf_smpp_service_type                       = -1;
-static int hf_smpp_source_addr_ton                    = -1;
-static int hf_smpp_source_addr_npi                    = -1;
-static int hf_smpp_source_addr                        = -1;
-static int hf_smpp_dest_addr_ton                      = -1;
-static int hf_smpp_dest_addr_npi                      = -1;
-static int hf_smpp_destination_addr                   = -1;
-static int hf_smpp_esm_submit_msg_mode                = -1;
-static int hf_smpp_esm_submit_msg_type                = -1;
-static int hf_smpp_esm_submit_features                = -1;
-static int hf_smpp_protocol_id                        = -1;
-static int hf_smpp_priority_flag                      = -1;
-static int hf_smpp_schedule_delivery_time             = -1;
-static int hf_smpp_schedule_delivery_time_r           = -1;
-static int hf_smpp_validity_period                    = -1;
-static int hf_smpp_validity_period_r                  = -1;
-static int hf_smpp_regdel_receipt                     = -1;
-static int hf_smpp_regdel_acks                        = -1;
-static int hf_smpp_regdel_notif                       = -1;
-static int hf_smpp_replace_if_present_flag            = -1;
-static int hf_smpp_data_coding                        = -1;
-static int hf_smpp_sm_default_msg_id                  = -1;
-static int hf_smpp_sm_length                          = -1;
-static int hf_smpp_short_message                      = -1;
-static int hf_smpp_short_message_bin                  = -1;
-static int hf_smpp_message_id                         = -1;
-static int hf_smpp_dlist                              = -1;
-static int hf_smpp_dlist_resp                         = -1;
-static int hf_smpp_dl_name                            = -1;
-static int hf_smpp_final_date                         = -1;
-static int hf_smpp_final_date_r                       = -1;
-static int hf_smpp_message_state                      = -1;
-static int hf_smpp_error_code                         = -1;
-static int hf_smpp_error_status_code                  = -1;
-static int hf_smpp_esme_addr_ton                      = -1;
-static int hf_smpp_esme_addr_npi                      = -1;
-static int hf_smpp_esme_addr                          = -1;
+static int hf_smpp_system_id;
+static int hf_smpp_password;
+static int hf_smpp_system_type;
+static int hf_smpp_interface_version;
+static int hf_smpp_addr_ton;
+static int hf_smpp_addr_npi;
+static int hf_smpp_address_range;
+static int hf_smpp_service_type;
+static int hf_smpp_source_addr_ton;
+static int hf_smpp_source_addr_npi;
+static int hf_smpp_source_addr;
+static int hf_smpp_dest_addr_ton;
+static int hf_smpp_dest_addr_npi;
+static int hf_smpp_destination_addr;
+static int hf_smpp_esm_submit_msg_mode;
+static int hf_smpp_esm_submit_msg_type;
+static int hf_smpp_esm_submit_features;
+static int hf_smpp_protocol_id;
+static int hf_smpp_priority_flag;
+static int hf_smpp_schedule_delivery_time;
+static int hf_smpp_schedule_delivery_time_r;
+static int hf_smpp_validity_period;
+static int hf_smpp_validity_period_r;
+static int hf_smpp_regdel_receipt;
+static int hf_smpp_regdel_acks;
+static int hf_smpp_regdel_notif;
+static int hf_smpp_replace_if_present_flag;
+static int hf_smpp_data_coding;
+static int hf_smpp_sm_default_msg_id;
+static int hf_smpp_sm_length;
+static int hf_smpp_short_message;
+static int hf_smpp_short_message_bin;
+static int hf_smpp_message_id;
+static int hf_smpp_dlist;
+static int hf_smpp_dlist_resp;
+static int hf_smpp_dl_name;
+static int hf_smpp_final_date;
+static int hf_smpp_final_date_r;
+static int hf_smpp_message_state;
+static int hf_smpp_error_code;
+static int hf_smpp_error_status_code;
+static int hf_smpp_esme_addr_ton;
+static int hf_smpp_esme_addr_npi;
+static int hf_smpp_esme_addr;
 
 /*
  * Optional parameter section
  */
-static int hf_smpp_opt_params                         = -1;
-static int hf_smpp_opt_param                          = -1;
-static int hf_smpp_opt_param_tag                      = -1;
-static int hf_smpp_opt_param_len                      = -1;
-static int hf_smpp_vendor_op                          = -1;
-static int hf_smpp_reserved_op                        = -1;
-
-static int hf_smpp_dest_addr_subunit                  = -1;
-static int hf_smpp_dest_network_type                  = -1;
-static int hf_smpp_dest_bearer_type                   = -1;
-static int hf_smpp_dest_telematics_id                 = -1;
-static int hf_smpp_source_addr_subunit                = -1;
-static int hf_smpp_source_network_type                = -1;
-static int hf_smpp_source_bearer_type                 = -1;
-static int hf_smpp_source_telematics_id               = -1;
-static int hf_smpp_qos_time_to_live                   = -1;
-static int hf_smpp_payload_type                       = -1;
-static int hf_smpp_additional_status_info_text        = -1;
-static int hf_smpp_receipted_message_id               = -1;
-static int hf_smpp_msg_wait_ind                       = -1;
-static int hf_smpp_msg_wait_type                      = -1;
-static int hf_smpp_privacy_indicator                  = -1;
-static int hf_smpp_source_subaddress                  = -1;
-static int hf_smpp_dest_subaddress                    = -1;
-static int hf_smpp_user_message_reference             = -1;
-static int hf_smpp_user_response_code                 = -1;
-static int hf_smpp_source_port                        = -1;
-static int hf_smpp_destination_port                   = -1;
-static int hf_smpp_sar_msg_ref_num                    = -1;
-static int hf_smpp_language_indicator                 = -1;
-static int hf_smpp_sar_total_segments                 = -1;
-static int hf_smpp_sar_segment_seqnum                 = -1;
-static int hf_smpp_SC_interface_version               = -1;
-static int hf_smpp_callback_num_pres                  = -1;
-static int hf_smpp_callback_num_scrn                  = -1;
-static int hf_smpp_callback_num_atag                  = -1;
-static int hf_smpp_number_of_messages                 = -1;
-static int hf_smpp_callback_num                       = -1;
-static int hf_smpp_dpf_result                         = -1;
-static int hf_smpp_set_dpf                            = -1;
-static int hf_smpp_ms_availability_status             = -1;
-static int hf_smpp_network_error_type                 = -1;
-static int hf_smpp_network_error_code                 = -1;
-static int hf_smpp_message_payload                    = -1;
-static int hf_smpp_delivery_failure_reason            = -1;
-static int hf_smpp_more_messages_to_send              = -1;
-static int hf_smpp_ussd_service_op                    = -1;
-static int hf_smpp_display_time                       = -1;
-static int hf_smpp_sms_signal                         = -1;
-static int hf_smpp_ms_validity                        = -1;
-static int hf_smpp_alert_on_message_delivery_null     = -1;
-static int hf_smpp_alert_on_message_delivery_type     = -1;
-static int hf_smpp_its_reply_type                     = -1;
-static int hf_smpp_its_session_number                 = -1;
-static int hf_smpp_its_session_sequence               = -1;
-static int hf_smpp_its_session_ind                    = -1;
+static int hf_smpp_opt_params;
+static int hf_smpp_opt_param;
+static int hf_smpp_opt_param_tag;
+static int hf_smpp_opt_param_len;
+static int hf_smpp_vendor_op;
+static int hf_smpp_reserved_op;
+
+static int hf_smpp_dest_addr_subunit;
+static int hf_smpp_dest_network_type;
+static int hf_smpp_dest_bearer_type;
+static int hf_smpp_dest_telematics_id;
+static int hf_smpp_source_addr_subunit;
+static int hf_smpp_source_network_type;
+static int hf_smpp_source_bearer_type;
+static int hf_smpp_source_telematics_id;
+static int hf_smpp_qos_time_to_live;
+static int hf_smpp_payload_type;
+static int hf_smpp_additional_status_info_text;
+static int hf_smpp_receipted_message_id;
+static int hf_smpp_msg_wait_ind;
+static int hf_smpp_msg_wait_type;
+static int hf_smpp_privacy_indicator;
+static int hf_smpp_source_subaddress;
+static int hf_smpp_dest_subaddress;
+static int hf_smpp_user_message_reference;
+static int hf_smpp_user_response_code;
+static int hf_smpp_source_port;
+static int hf_smpp_destination_port;
+static int hf_smpp_sar_msg_ref_num;
+static int hf_smpp_language_indicator;
+static int hf_smpp_sar_total_segments;
+static int hf_smpp_sar_segment_seqnum;
+static int hf_smpp_SC_interface_version;
+static int hf_smpp_callback_num_pres;
+static int hf_smpp_callback_num_scrn;
+static int hf_smpp_callback_num_atag;
+static int hf_smpp_number_of_messages;
+static int hf_smpp_callback_num;
+static int hf_smpp_dpf_result;
+static int hf_smpp_set_dpf;
+static int hf_smpp_ms_availability_status;
+static int hf_smpp_network_error_type;
+static int hf_smpp_network_error_code;
+static int hf_smpp_message_payload;
+static int hf_smpp_delivery_failure_reason;
+static int hf_smpp_more_messages_to_send;
+static int hf_smpp_ussd_service_op;
+static int hf_smpp_display_time;
+static int hf_smpp_sms_signal;
+static int hf_smpp_ms_validity;
+static int hf_smpp_alert_on_message_delivery_null;
+static int hf_smpp_alert_on_message_delivery_type;
+static int hf_smpp_its_reply_type;
+static int hf_smpp_its_session_number;
+static int hf_smpp_its_session_sequence;
+static int hf_smpp_its_session_ind;
 
 /* Optional Parameters introduced in SMPP 5.0   */
-static int hf_smpp_congestion_state                   = -1;
-static int hf_smpp_billing_identification             = -1;
-static int hf_smpp_dest_addr_np_country               = -1;
-static int hf_smpp_dest_addr_np_information           = -1;
-static int hf_smpp_dest_addr_np_resolution            = -1;
-static int hf_smpp_source_network_id                  = -1;
-static int hf_smpp_source_node_id                     = -1;
-static int hf_smpp_dest_network_id                    = -1;
-static int hf_smpp_dest_node_id                       = -1;
+static int hf_smpp_congestion_state;
+static int hf_smpp_billing_identification;
+static int hf_smpp_dest_addr_np_country;
+static int hf_smpp_dest_addr_np_information;
+static int hf_smpp_dest_addr_np_resolution;
+static int hf_smpp_source_network_id;
+static int hf_smpp_source_node_id;
+static int hf_smpp_dest_network_id;
+static int hf_smpp_dest_node_id;
 /* Optional Parameters for Cell Broadcast Operations */
-static int hf_smpp_broadcast_channel_indicator        = -1;
-static int hf_smpp_broadcast_content_type_nw          = -1;
-static int hf_smpp_broadcast_content_type_type        = -1;
-static int hf_smpp_broadcast_content_type_info        = -1;
-static int hf_smpp_broadcast_message_class            = -1;
-static int hf_smpp_broadcast_rep_num                  = -1;
-static int hf_smpp_broadcast_frequency_interval_unit  = -1;
-static int hf_smpp_broadcast_frequency_interval_value = -1;
-static int hf_smpp_broadcast_area_identifier          = -1;
-static int hf_smpp_broadcast_area_identifier_format   = -1;
-static int hf_smpp_broadcast_error_status             = -1;
-static int hf_smpp_broadcast_area_success             = -1;
-static int hf_smpp_broadcast_end_time                 = -1;
-static int hf_smpp_broadcast_end_time_r               = -1;
-static int hf_smpp_broadcast_service_group            = -1;
+static int hf_smpp_broadcast_channel_indicator;
+static int hf_smpp_broadcast_content_type_nw;
+static int hf_smpp_broadcast_content_type_type;
+static int hf_smpp_broadcast_content_type_info;
+static int hf_smpp_broadcast_message_class;
+static int hf_smpp_broadcast_rep_num;
+static int hf_smpp_broadcast_frequency_interval_unit;
+static int hf_smpp_broadcast_frequency_interval_value;
+static int hf_smpp_broadcast_area_identifier;
+static int hf_smpp_broadcast_area_identifier_format;
+static int hf_smpp_broadcast_error_status;
+static int hf_smpp_broadcast_area_success;
+static int hf_smpp_broadcast_end_time;
+static int hf_smpp_broadcast_end_time_r;
+static int hf_smpp_broadcast_service_group;
 
 /*
  * Data Coding Scheme section
  */
-static int hf_smpp_dcs_sms_coding_group               = -1;
-static int hf_smpp_dcs_reserved                       = -1;
-static int hf_smpp_dcs_charset                        = -1;
-static int hf_smpp_dcs_class                          = -1;
-static int hf_smpp_dcs_wait_ind                       = -1;
-static int hf_smpp_dcs_reserved2                      = -1;
-static int hf_smpp_dcs_wait_type                      = -1;
+static int hf_smpp_dcs_sms_coding_group;
+static int hf_smpp_dcs_reserved;
+static int hf_smpp_dcs_charset;
+static int hf_smpp_dcs_class;
+static int hf_smpp_dcs_wait_ind;
+static int hf_smpp_dcs_reserved2;
+static int hf_smpp_dcs_wait_type;
 
 /*
  * Huawei SMPP+ extensions
  */
-static int hf_huawei_smpp_smsc_addr                   = -1;
-static int hf_huawei_smpp_msc_addr_noa                = -1;
-static int hf_huawei_smpp_msc_addr_npi                = -1;
-static int hf_huawei_smpp_msc_addr                    = -1;
-static int hf_huawei_smpp_mo_mt_flag                  = -1;
-static int hf_huawei_smpp_length_auth                 = -1;
-static int hf_huawei_smpp_sm_id                       = -1;
-static int hf_huawei_smpp_service_id                  = -1;
-static int hf_huawei_smpp_operation_result            = -1;
-static int hf_huawei_smpp_notify_mode                 = -1;
-static int hf_huawei_smpp_delivery_result             = -1;
-
-static expert_field ei_smpp_message_payload_duplicate = EI_INIT;
+static int hf_huawei_smpp_smsc_addr;
+static int hf_huawei_smpp_msc_addr_noa;
+static int hf_huawei_smpp_msc_addr_npi;
+static int hf_huawei_smpp_msc_addr;
+static int hf_huawei_smpp_mo_mt_flag;
+static int hf_huawei_smpp_length_auth;
+static int hf_huawei_smpp_sm_id;
+static int hf_huawei_smpp_service_id;
+static int hf_huawei_smpp_operation_result;
+static int hf_huawei_smpp_notify_mode;
+static int hf_huawei_smpp_delivery_result;
+
+static expert_field ei_smpp_message_payload_duplicate;
 
 /* Initialize the subtree pointers */
-static gint ett_smpp            = -1;
-static gint ett_dlist           = -1;
-static gint ett_dlist_resp      = -1;
-static gint ett_opt_params      = -1;
-static gint ett_opt_param       = -1;
-static gint ett_dcs             = -1;
+static gint ett_smpp;
+static gint ett_dlist;
+static gint ett_dlist_resp;
+static gint ett_opt_params;
+static gint ett_opt_param;
+static gint ett_dcs;
 
 static dissector_handle_t smpp_handle;
 
diff --git a/epan/dissectors/packet-smpte-2110-20.c b/epan/dissectors/packet-smpte-2110-20.c
index 8f831e379b..ee3adec426 100644
--- a/epan/dissectors/packet-smpte-2110-20.c
+++ b/epan/dissectors/packet-smpte-2110-20.c
@@ -29,24 +29,24 @@ void proto_register_st2110_20(void);
 static dissector_handle_t st2110_20_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_st2110_20 = -1;
-static int proto_rtp = -1;
-
-static int hf_st2110_ext_seqno = -1;
-static int hf_st2110_seqno = -1;
-static int hf_st2110_rtp_time = -1;
-static int hf_st2110_srd_index = -1;
-static int hf_st2110_srd_length = -1;
-static int hf_st2110_field_ident = -1;
-static int hf_st2110_row_num = -1;
-static int hf_st2110_continuation = -1;
-static int hf_st2110_srd_offset = -1;
-static int hf_st2110_srd_data = -1;
-static int hf_st2110_srd_rows = -1;
+static int proto_st2110_20;
+static int proto_rtp;
+
+static int hf_st2110_ext_seqno;
+static int hf_st2110_seqno;
+static int hf_st2110_rtp_time;
+static int hf_st2110_srd_index;
+static int hf_st2110_srd_length;
+static int hf_st2110_field_ident;
+static int hf_st2110_row_num;
+static int hf_st2110_continuation;
+static int hf_st2110_srd_offset;
+static int hf_st2110_srd_data;
+static int hf_st2110_srd_rows;
 
 /* Initialize the subtree pointers */
-static gint ett_st2110_20 = -1;
-static gint ett_st2110_20_srd_row = -1;
+static gint ett_st2110_20;
+static gint ett_st2110_20_srd_row;
 
 
 static int
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index ad679d99ce..89fa93f5f7 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -43,43 +43,43 @@
 void proto_register_smtp(void);
 void proto_reg_handoff_smtp(void);
 
-static int proto_smtp = -1;
+static int proto_smtp;
 
 static int credentials_tap = -1;
 
-static int hf_smtp_req = -1;
-static int hf_smtp_rsp = -1;
-static int hf_smtp_message = -1;
-static int hf_smtp_command_line = -1;
-static int hf_smtp_req_command = -1;
-static int hf_smtp_req_parameter = -1;
-static int hf_smtp_response = -1;
-static int hf_smtp_rsp_code = -1;
-static int hf_smtp_rsp_parameter = -1;
-static int hf_smtp_username = -1;
-static int hf_smtp_password = -1;
-static int hf_smtp_username_password = -1;
-static int hf_smtp_eom = -1;
-
-static int hf_smtp_data_fragments = -1;
-static int hf_smtp_data_fragment = -1;
-static int hf_smtp_data_fragment_overlap = -1;
-static int hf_smtp_data_fragment_overlap_conflicts = -1;
-static int hf_smtp_data_fragment_multiple_tails = -1;
-static int hf_smtp_data_fragment_too_long_fragment = -1;
-static int hf_smtp_data_fragment_error = -1;
-static int hf_smtp_data_fragment_count = -1;
-static int hf_smtp_data_reassembled_in = -1;
-static int hf_smtp_data_reassembled_length = -1;
-
-static int ett_smtp = -1;
-static int ett_smtp_cmdresp = -1;
-
-static gint ett_smtp_data_fragment = -1;
-static gint ett_smtp_data_fragments = -1;
-
-static expert_field ei_smtp_base64_decode = EI_INIT;
-static expert_field ei_smtp_rsp_code = EI_INIT;
+static int hf_smtp_req;
+static int hf_smtp_rsp;
+static int hf_smtp_message;
+static int hf_smtp_command_line;
+static int hf_smtp_req_command;
+static int hf_smtp_req_parameter;
+static int hf_smtp_response;
+static int hf_smtp_rsp_code;
+static int hf_smtp_rsp_parameter;
+static int hf_smtp_username;
+static int hf_smtp_password;
+static int hf_smtp_username_password;
+static int hf_smtp_eom;
+
+static int hf_smtp_data_fragments;
+static int hf_smtp_data_fragment;
+static int hf_smtp_data_fragment_overlap;
+static int hf_smtp_data_fragment_overlap_conflicts;
+static int hf_smtp_data_fragment_multiple_tails;
+static int hf_smtp_data_fragment_too_long_fragment;
+static int hf_smtp_data_fragment_error;
+static int hf_smtp_data_fragment_count;
+static int hf_smtp_data_reassembled_in;
+static int hf_smtp_data_reassembled_length;
+
+static int ett_smtp;
+static int ett_smtp_cmdresp;
+
+static gint ett_smtp_data_fragment;
+static gint ett_smtp_data_fragments;
+
+static expert_field ei_smtp_base64_decode;
+static expert_field ei_smtp_rsp_code;
 
 static gboolean    smtp_auth_parameter_decoding_enabled     = FALSE;
 /* desegmentation of SMTP command and response lines */
diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c
index cdf6bfdbeb..bfa2d3b065 100644
--- a/epan/dissectors/packet-sna.c
+++ b/epan/dissectors/packet-sna.c
@@ -37,268 +37,268 @@
 void proto_register_sna(void);
 void proto_reg_handoff_sna(void);
 
-static int proto_sna = -1;
-static int proto_sna_xid = -1;
-static int hf_sna_th = -1;
-static int hf_sna_th_0 = -1;
-static int hf_sna_th_fid = -1;
-static int hf_sna_th_mpf = -1;
-static int hf_sna_th_odai = -1;
-static int hf_sna_th_efi = -1;
-static int hf_sna_th_daf = -1;
-static int hf_sna_th_oaf = -1;
-static int hf_sna_th_snf = -1;
-static int hf_sna_th_dcf = -1;
-static int hf_sna_th_lsid = -1;
-static int hf_sna_th_tg_sweep = -1;
-static int hf_sna_th_er_vr_supp_ind = -1;
-static int hf_sna_th_vr_pac_cnt_ind = -1;
-static int hf_sna_th_ntwk_prty = -1;
-static int hf_sna_th_tgsf = -1;
-static int hf_sna_th_mft = -1;
-static int hf_sna_th_piubf = -1;
-static int hf_sna_th_iern = -1;
-static int hf_sna_th_nlpoi = -1;
-static int hf_sna_th_nlp_cp = -1;
-static int hf_sna_th_ern = -1;
-static int hf_sna_th_vrn = -1;
-static int hf_sna_th_tpf = -1;
-static int hf_sna_th_vr_cwi = -1;
-static int hf_sna_th_tg_nonfifo_ind = -1;
-static int hf_sna_th_vr_sqti = -1;
-static int hf_sna_th_tg_snf = -1;
-static int hf_sna_th_vrprq = -1;
-static int hf_sna_th_vrprs = -1;
-static int hf_sna_th_vr_cwri = -1;
-static int hf_sna_th_vr_rwi = -1;
-static int hf_sna_th_vr_snf_send = -1;
-static int hf_sna_th_dsaf = -1;
-static int hf_sna_th_osaf = -1;
-static int hf_sna_th_snai = -1;
-static int hf_sna_th_def = -1;
-static int hf_sna_th_oef = -1;
-static int hf_sna_th_sa = -1;
-static int hf_sna_th_cmd_fmt = -1;
-static int hf_sna_th_cmd_type = -1;
-static int hf_sna_th_cmd_sn = -1;
-static int hf_sna_th_byte1 = -1;
-static int hf_sna_th_byte2 = -1;
-static int hf_sna_th_byte3 = -1;
-static int hf_sna_th_byte4 = -1;
-static int hf_sna_th_byte6 = -1;
-static int hf_sna_th_byte16 = -1;
-
-static int hf_sna_nlp_nhdr = -1;
-static int hf_sna_nlp_nhdr_0 = -1;
-static int hf_sna_nlp_sm = -1;
-static int hf_sna_nlp_tpf = -1;
-static int hf_sna_nlp_nhdr_1 = -1;
-static int hf_sna_nlp_ft = -1;
-static int hf_sna_nlp_tspi = -1;
-static int hf_sna_nlp_slowdn1 = -1;
-static int hf_sna_nlp_slowdn2 = -1;
-static int hf_sna_nlp_fra = -1;
-static int hf_sna_nlp_anr = -1;
-static int hf_sna_nlp_frh = -1;
-static int hf_sna_nlp_thdr = -1;
-static int hf_sna_nlp_tcid = -1;
-static int hf_sna_nlp_thdr_8 = -1;
-static int hf_sna_nlp_setupi = -1;
-static int hf_sna_nlp_somi = -1;
-static int hf_sna_nlp_eomi = -1;
-static int hf_sna_nlp_sri = -1;
-static int hf_sna_nlp_rasapi = -1;
-static int hf_sna_nlp_retryi = -1;
-static int hf_sna_nlp_thdr_9 = -1;
-static int hf_sna_nlp_lmi = -1;
-static int hf_sna_nlp_cqfi = -1;
-static int hf_sna_nlp_osi = -1;
-static int hf_sna_nlp_offset = -1;
-static int hf_sna_nlp_dlf = -1;
-static int hf_sna_nlp_bsn = -1;
-static int hf_sna_nlp_opti_len = -1;
-static int hf_sna_nlp_opti_type = -1;
-static int hf_sna_nlp_opti_0d_version = -1;
-static int hf_sna_nlp_opti_0d_4 = -1;
-static int hf_sna_nlp_opti_0d_target = -1;
-static int hf_sna_nlp_opti_0d_arb = -1;
-static int hf_sna_nlp_opti_0d_reliable = -1;
-static int hf_sna_nlp_opti_0d_dedicated = -1;
-static int hf_sna_nlp_opti_0e_stat = -1;
-static int hf_sna_nlp_opti_0e_gap = -1;
-static int hf_sna_nlp_opti_0e_idle = -1;
-static int hf_sna_nlp_opti_0e_nabsp = -1;
-static int hf_sna_nlp_opti_0e_sync = -1;
-static int hf_sna_nlp_opti_0e_echo = -1;
-static int hf_sna_nlp_opti_0e_rseq = -1;
-/* static int hf_sna_nlp_opti_0e_abspbeg = -1; */
-/* static int hf_sna_nlp_opti_0e_abspend = -1; */
-static int hf_sna_nlp_opti_0f_bits = -1;
-static int hf_sna_nlp_opti_10_tcid = -1;
-static int hf_sna_nlp_opti_12_sense = -1;
-static int hf_sna_nlp_opti_14_si_len = -1;
-static int hf_sna_nlp_opti_14_si_key = -1;
-static int hf_sna_nlp_opti_14_si_2 = -1;
-static int hf_sna_nlp_opti_14_si_refifo = -1;
-static int hf_sna_nlp_opti_14_si_mobility = -1;
-static int hf_sna_nlp_opti_14_si_dirsearch = -1;
-static int hf_sna_nlp_opti_14_si_limitres = -1;
-static int hf_sna_nlp_opti_14_si_ncescope = -1;
-static int hf_sna_nlp_opti_14_si_mnpsrscv = -1;
-static int hf_sna_nlp_opti_14_si_maxpsize = -1;
-static int hf_sna_nlp_opti_14_si_switch = -1;
-static int hf_sna_nlp_opti_14_si_alive = -1;
-static int hf_sna_nlp_opti_14_rr_len = -1;
-static int hf_sna_nlp_opti_14_rr_key = -1;
-static int hf_sna_nlp_opti_14_rr_2 = -1;
-static int hf_sna_nlp_opti_14_rr_bfe = -1;
-static int hf_sna_nlp_opti_14_rr_num = -1;
-static int hf_sna_nlp_opti_22_2 = -1;
-static int hf_sna_nlp_opti_22_type = -1;
-static int hf_sna_nlp_opti_22_raa = -1;
-static int hf_sna_nlp_opti_22_parity = -1;
-static int hf_sna_nlp_opti_22_arb = -1;
-static int hf_sna_nlp_opti_22_3 = -1;
-static int hf_sna_nlp_opti_22_ratereq = -1;
-static int hf_sna_nlp_opti_22_raterep = -1;
-static int hf_sna_nlp_opti_22_field1 = -1;
-static int hf_sna_nlp_opti_22_field2 = -1;
-static int hf_sna_nlp_opti_22_field3 = -1;
-static int hf_sna_nlp_opti_22_field4 = -1;
-
-static int hf_sna_rh = -1;
-static int hf_sna_rh_0 = -1;
-static int hf_sna_rh_1 = -1;
-static int hf_sna_rh_2 = -1;
-static int hf_sna_rh_rri = -1;
-static int hf_sna_rh_ru_category = -1;
-static int hf_sna_rh_fi = -1;
-static int hf_sna_rh_sdi = -1;
-static int hf_sna_rh_bci = -1;
-static int hf_sna_rh_eci = -1;
-static int hf_sna_rh_dr1 = -1;
-static int hf_sna_rh_lcci = -1;
-static int hf_sna_rh_dr2 = -1;
-static int hf_sna_rh_eri = -1;
-static int hf_sna_rh_rti = -1;
-static int hf_sna_rh_rlwi = -1;
-static int hf_sna_rh_qri = -1;
-static int hf_sna_rh_pi = -1;
-static int hf_sna_rh_bbi = -1;
-static int hf_sna_rh_ebi = -1;
-static int hf_sna_rh_cdi = -1;
-static int hf_sna_rh_csi = -1;
-static int hf_sna_rh_edi = -1;
-static int hf_sna_rh_pdi = -1;
-static int hf_sna_rh_cebi = -1;
-/*static int hf_sna_ru = -1;*/
-
-static int hf_sna_gds = -1;
-static int hf_sna_gds_len = -1;
-static int hf_sna_gds_type = -1;
-static int hf_sna_gds_cont = -1;
-static int hf_sna_gds_info = -1;
-
-/* static int hf_sna_xid = -1; */
-static int hf_sna_xid_0 = -1;
-static int hf_sna_xid_id = -1;
-static int hf_sna_xid_format = -1;
-static int hf_sna_xid_type = -1;
-static int hf_sna_xid_len = -1;
-static int hf_sna_xid_idblock = -1;
-static int hf_sna_xid_idnum = -1;
-static int hf_sna_xid_3_8 = -1;
-static int hf_sna_xid_3_init_self = -1;
-static int hf_sna_xid_3_stand_bind = -1;
-static int hf_sna_xid_3_gener_bind = -1;
-static int hf_sna_xid_3_recve_bind = -1;
-static int hf_sna_xid_3_actpu = -1;
-static int hf_sna_xid_3_nwnode = -1;
-static int hf_sna_xid_3_cp = -1;
-static int hf_sna_xid_3_cpcp = -1;
-static int hf_sna_xid_3_state = -1;
-static int hf_sna_xid_3_nonact = -1;
-static int hf_sna_xid_3_cpchange = -1;
-static int hf_sna_xid_3_10 = -1;
-static int hf_sna_xid_3_asend_bind = -1;
-static int hf_sna_xid_3_arecv_bind = -1;
-static int hf_sna_xid_3_quiesce = -1;
-static int hf_sna_xid_3_pucap = -1;
-static int hf_sna_xid_3_pbn = -1;
-static int hf_sna_xid_3_pacing = -1;
-static int hf_sna_xid_3_11 = -1;
-static int hf_sna_xid_3_tgshare = -1;
-static int hf_sna_xid_3_dedsvc = -1;
-static int hf_sna_xid_3_12 = -1;
-static int hf_sna_xid_3_negcsup = -1;
-static int hf_sna_xid_3_negcomp = -1;
-static int hf_sna_xid_3_15 = -1;
-static int hf_sna_xid_3_partg = -1;
-static int hf_sna_xid_3_dlur = -1;
-static int hf_sna_xid_3_dlus = -1;
-static int hf_sna_xid_3_exbn = -1;
-static int hf_sna_xid_3_genodai = -1;
-static int hf_sna_xid_3_branch = -1;
-static int hf_sna_xid_3_brnn = -1;
-static int hf_sna_xid_3_tg = -1;
-static int hf_sna_xid_3_dlc = -1;
-static int hf_sna_xid_3_dlen = -1;
-
-static int hf_sna_control_len = -1;
-static int hf_sna_control_key = -1;
-static int hf_sna_control_hprkey = -1;
-static int hf_sna_control_05_delay = -1;
-static int hf_sna_control_05_type = -1;
-static int hf_sna_control_05_ptp = -1;
-static int hf_sna_control_0e_type = -1;
-static int hf_sna_control_0e_value = -1;
-static int hf_sna_padding = -1;
-static int hf_sna_reserved = -1;
-static int hf_sna_biu_segment_data = -1;
-
-static gint ett_sna = -1;
-static gint ett_sna_th = -1;
-static gint ett_sna_th_fid = -1;
-static gint ett_sna_nlp_nhdr = -1;
-static gint ett_sna_nlp_nhdr_0 = -1;
-static gint ett_sna_nlp_nhdr_1 = -1;
-static gint ett_sna_nlp_thdr = -1;
-static gint ett_sna_nlp_thdr_8 = -1;
-static gint ett_sna_nlp_thdr_9 = -1;
-static gint ett_sna_nlp_opti_un = -1;
-static gint ett_sna_nlp_opti_0d = -1;
-static gint ett_sna_nlp_opti_0d_4 = -1;
-static gint ett_sna_nlp_opti_0e = -1;
-static gint ett_sna_nlp_opti_0e_stat = -1;
-static gint ett_sna_nlp_opti_0e_absp = -1;
-static gint ett_sna_nlp_opti_0f = -1;
-static gint ett_sna_nlp_opti_10 = -1;
-static gint ett_sna_nlp_opti_12 = -1;
-static gint ett_sna_nlp_opti_14 = -1;
-static gint ett_sna_nlp_opti_14_si = -1;
-static gint ett_sna_nlp_opti_14_si_2 = -1;
-static gint ett_sna_nlp_opti_14_rr = -1;
-static gint ett_sna_nlp_opti_14_rr_2 = -1;
-static gint ett_sna_nlp_opti_22 = -1;
-static gint ett_sna_nlp_opti_22_2 = -1;
-static gint ett_sna_nlp_opti_22_3 = -1;
-static gint ett_sna_rh = -1;
-static gint ett_sna_rh_0 = -1;
-static gint ett_sna_rh_1 = -1;
-static gint ett_sna_rh_2 = -1;
-static gint ett_sna_gds = -1;
-static gint ett_sna_xid_0 = -1;
-static gint ett_sna_xid_id = -1;
-static gint ett_sna_xid_3_8 = -1;
-static gint ett_sna_xid_3_10 = -1;
-static gint ett_sna_xid_3_11 = -1;
-static gint ett_sna_xid_3_12 = -1;
-static gint ett_sna_xid_3_15 = -1;
-static gint ett_sna_control_un = -1;
-static gint ett_sna_control_05 = -1;
-static gint ett_sna_control_05hpr = -1;
-static gint ett_sna_control_05hpr_type = -1;
-static gint ett_sna_control_0e = -1;
+static int proto_sna;
+static int proto_sna_xid;
+static int hf_sna_th;
+static int hf_sna_th_0;
+static int hf_sna_th_fid;
+static int hf_sna_th_mpf;
+static int hf_sna_th_odai;
+static int hf_sna_th_efi;
+static int hf_sna_th_daf;
+static int hf_sna_th_oaf;
+static int hf_sna_th_snf;
+static int hf_sna_th_dcf;
+static int hf_sna_th_lsid;
+static int hf_sna_th_tg_sweep;
+static int hf_sna_th_er_vr_supp_ind;
+static int hf_sna_th_vr_pac_cnt_ind;
+static int hf_sna_th_ntwk_prty;
+static int hf_sna_th_tgsf;
+static int hf_sna_th_mft;
+static int hf_sna_th_piubf;
+static int hf_sna_th_iern;
+static int hf_sna_th_nlpoi;
+static int hf_sna_th_nlp_cp;
+static int hf_sna_th_ern;
+static int hf_sna_th_vrn;
+static int hf_sna_th_tpf;
+static int hf_sna_th_vr_cwi;
+static int hf_sna_th_tg_nonfifo_ind;
+static int hf_sna_th_vr_sqti;
+static int hf_sna_th_tg_snf;
+static int hf_sna_th_vrprq;
+static int hf_sna_th_vrprs;
+static int hf_sna_th_vr_cwri;
+static int hf_sna_th_vr_rwi;
+static int hf_sna_th_vr_snf_send;
+static int hf_sna_th_dsaf;
+static int hf_sna_th_osaf;
+static int hf_sna_th_snai;
+static int hf_sna_th_def;
+static int hf_sna_th_oef;
+static int hf_sna_th_sa;
+static int hf_sna_th_cmd_fmt;
+static int hf_sna_th_cmd_type;
+static int hf_sna_th_cmd_sn;
+static int hf_sna_th_byte1;
+static int hf_sna_th_byte2;
+static int hf_sna_th_byte3;
+static int hf_sna_th_byte4;
+static int hf_sna_th_byte6;
+static int hf_sna_th_byte16;
+
+static int hf_sna_nlp_nhdr;
+static int hf_sna_nlp_nhdr_0;
+static int hf_sna_nlp_sm;
+static int hf_sna_nlp_tpf;
+static int hf_sna_nlp_nhdr_1;
+static int hf_sna_nlp_ft;
+static int hf_sna_nlp_tspi;
+static int hf_sna_nlp_slowdn1;
+static int hf_sna_nlp_slowdn2;
+static int hf_sna_nlp_fra;
+static int hf_sna_nlp_anr;
+static int hf_sna_nlp_frh;
+static int hf_sna_nlp_thdr;
+static int hf_sna_nlp_tcid;
+static int hf_sna_nlp_thdr_8;
+static int hf_sna_nlp_setupi;
+static int hf_sna_nlp_somi;
+static int hf_sna_nlp_eomi;
+static int hf_sna_nlp_sri;
+static int hf_sna_nlp_rasapi;
+static int hf_sna_nlp_retryi;
+static int hf_sna_nlp_thdr_9;
+static int hf_sna_nlp_lmi;
+static int hf_sna_nlp_cqfi;
+static int hf_sna_nlp_osi;
+static int hf_sna_nlp_offset;
+static int hf_sna_nlp_dlf;
+static int hf_sna_nlp_bsn;
+static int hf_sna_nlp_opti_len;
+static int hf_sna_nlp_opti_type;
+static int hf_sna_nlp_opti_0d_version;
+static int hf_sna_nlp_opti_0d_4;
+static int hf_sna_nlp_opti_0d_target;
+static int hf_sna_nlp_opti_0d_arb;
+static int hf_sna_nlp_opti_0d_reliable;
+static int hf_sna_nlp_opti_0d_dedicated;
+static int hf_sna_nlp_opti_0e_stat;
+static int hf_sna_nlp_opti_0e_gap;
+static int hf_sna_nlp_opti_0e_idle;
+static int hf_sna_nlp_opti_0e_nabsp;
+static int hf_sna_nlp_opti_0e_sync;
+static int hf_sna_nlp_opti_0e_echo;
+static int hf_sna_nlp_opti_0e_rseq;
+/* static int hf_sna_nlp_opti_0e_abspbeg; */
+/* static int hf_sna_nlp_opti_0e_abspend; */
+static int hf_sna_nlp_opti_0f_bits;
+static int hf_sna_nlp_opti_10_tcid;
+static int hf_sna_nlp_opti_12_sense;
+static int hf_sna_nlp_opti_14_si_len;
+static int hf_sna_nlp_opti_14_si_key;
+static int hf_sna_nlp_opti_14_si_2;
+static int hf_sna_nlp_opti_14_si_refifo;
+static int hf_sna_nlp_opti_14_si_mobility;
+static int hf_sna_nlp_opti_14_si_dirsearch;
+static int hf_sna_nlp_opti_14_si_limitres;
+static int hf_sna_nlp_opti_14_si_ncescope;
+static int hf_sna_nlp_opti_14_si_mnpsrscv;
+static int hf_sna_nlp_opti_14_si_maxpsize;
+static int hf_sna_nlp_opti_14_si_switch;
+static int hf_sna_nlp_opti_14_si_alive;
+static int hf_sna_nlp_opti_14_rr_len;
+static int hf_sna_nlp_opti_14_rr_key;
+static int hf_sna_nlp_opti_14_rr_2;
+static int hf_sna_nlp_opti_14_rr_bfe;
+static int hf_sna_nlp_opti_14_rr_num;
+static int hf_sna_nlp_opti_22_2;
+static int hf_sna_nlp_opti_22_type;
+static int hf_sna_nlp_opti_22_raa;
+static int hf_sna_nlp_opti_22_parity;
+static int hf_sna_nlp_opti_22_arb;
+static int hf_sna_nlp_opti_22_3;
+static int hf_sna_nlp_opti_22_ratereq;
+static int hf_sna_nlp_opti_22_raterep;
+static int hf_sna_nlp_opti_22_field1;
+static int hf_sna_nlp_opti_22_field2;
+static int hf_sna_nlp_opti_22_field3;
+static int hf_sna_nlp_opti_22_field4;
+
+static int hf_sna_rh;
+static int hf_sna_rh_0;
+static int hf_sna_rh_1;
+static int hf_sna_rh_2;
+static int hf_sna_rh_rri;
+static int hf_sna_rh_ru_category;
+static int hf_sna_rh_fi;
+static int hf_sna_rh_sdi;
+static int hf_sna_rh_bci;
+static int hf_sna_rh_eci;
+static int hf_sna_rh_dr1;
+static int hf_sna_rh_lcci;
+static int hf_sna_rh_dr2;
+static int hf_sna_rh_eri;
+static int hf_sna_rh_rti;
+static int hf_sna_rh_rlwi;
+static int hf_sna_rh_qri;
+static int hf_sna_rh_pi;
+static int hf_sna_rh_bbi;
+static int hf_sna_rh_ebi;
+static int hf_sna_rh_cdi;
+static int hf_sna_rh_csi;
+static int hf_sna_rh_edi;
+static int hf_sna_rh_pdi;
+static int hf_sna_rh_cebi;
+/*static int hf_sna_ru;*/
+
+static int hf_sna_gds;
+static int hf_sna_gds_len;
+static int hf_sna_gds_type;
+static int hf_sna_gds_cont;
+static int hf_sna_gds_info;
+
+/* static int hf_sna_xid; */
+static int hf_sna_xid_0;
+static int hf_sna_xid_id;
+static int hf_sna_xid_format;
+static int hf_sna_xid_type;
+static int hf_sna_xid_len;
+static int hf_sna_xid_idblock;
+static int hf_sna_xid_idnum;
+static int hf_sna_xid_3_8;
+static int hf_sna_xid_3_init_self;
+static int hf_sna_xid_3_stand_bind;
+static int hf_sna_xid_3_gener_bind;
+static int hf_sna_xid_3_recve_bind;
+static int hf_sna_xid_3_actpu;
+static int hf_sna_xid_3_nwnode;
+static int hf_sna_xid_3_cp;
+static int hf_sna_xid_3_cpcp;
+static int hf_sna_xid_3_state;
+static int hf_sna_xid_3_nonact;
+static int hf_sna_xid_3_cpchange;
+static int hf_sna_xid_3_10;
+static int hf_sna_xid_3_asend_bind;
+static int hf_sna_xid_3_arecv_bind;
+static int hf_sna_xid_3_quiesce;
+static int hf_sna_xid_3_pucap;
+static int hf_sna_xid_3_pbn;
+static int hf_sna_xid_3_pacing;
+static int hf_sna_xid_3_11;
+static int hf_sna_xid_3_tgshare;
+static int hf_sna_xid_3_dedsvc;
+static int hf_sna_xid_3_12;
+static int hf_sna_xid_3_negcsup;
+static int hf_sna_xid_3_negcomp;
+static int hf_sna_xid_3_15;
+static int hf_sna_xid_3_partg;
+static int hf_sna_xid_3_dlur;
+static int hf_sna_xid_3_dlus;
+static int hf_sna_xid_3_exbn;
+static int hf_sna_xid_3_genodai;
+static int hf_sna_xid_3_branch;
+static int hf_sna_xid_3_brnn;
+static int hf_sna_xid_3_tg;
+static int hf_sna_xid_3_dlc;
+static int hf_sna_xid_3_dlen;
+
+static int hf_sna_control_len;
+static int hf_sna_control_key;
+static int hf_sna_control_hprkey;
+static int hf_sna_control_05_delay;
+static int hf_sna_control_05_type;
+static int hf_sna_control_05_ptp;
+static int hf_sna_control_0e_type;
+static int hf_sna_control_0e_value;
+static int hf_sna_padding;
+static int hf_sna_reserved;
+static int hf_sna_biu_segment_data;
+
+static gint ett_sna;
+static gint ett_sna_th;
+static gint ett_sna_th_fid;
+static gint ett_sna_nlp_nhdr;
+static gint ett_sna_nlp_nhdr_0;
+static gint ett_sna_nlp_nhdr_1;
+static gint ett_sna_nlp_thdr;
+static gint ett_sna_nlp_thdr_8;
+static gint ett_sna_nlp_thdr_9;
+static gint ett_sna_nlp_opti_un;
+static gint ett_sna_nlp_opti_0d;
+static gint ett_sna_nlp_opti_0d_4;
+static gint ett_sna_nlp_opti_0e;
+static gint ett_sna_nlp_opti_0e_stat;
+static gint ett_sna_nlp_opti_0e_absp;
+static gint ett_sna_nlp_opti_0f;
+static gint ett_sna_nlp_opti_10;
+static gint ett_sna_nlp_opti_12;
+static gint ett_sna_nlp_opti_14;
+static gint ett_sna_nlp_opti_14_si;
+static gint ett_sna_nlp_opti_14_si_2;
+static gint ett_sna_nlp_opti_14_rr;
+static gint ett_sna_nlp_opti_14_rr_2;
+static gint ett_sna_nlp_opti_22;
+static gint ett_sna_nlp_opti_22_2;
+static gint ett_sna_nlp_opti_22_3;
+static gint ett_sna_rh;
+static gint ett_sna_rh_0;
+static gint ett_sna_rh_1;
+static gint ett_sna_rh_2;
+static gint ett_sna_gds;
+static gint ett_sna_xid_0;
+static gint ett_sna_xid_id;
+static gint ett_sna_xid_3_8;
+static gint ett_sna_xid_3_10;
+static gint ett_sna_xid_3_11;
+static gint ett_sna_xid_3_12;
+static gint ett_sna_xid_3_15;
+static gint ett_sna_control_un;
+static gint ett_sna_control_05;
+static gint ett_sna_control_05hpr;
+static gint ett_sna_control_05hpr_type;
+static gint ett_sna_control_0e;
 
 static dissector_handle_t sna_handle;
 static dissector_handle_t sna_xid_handle;
diff --git a/epan/dissectors/packet-snaeth.c b/epan/dissectors/packet-snaeth.c
index 029030e93e..99ef0ebc7a 100644
--- a/epan/dissectors/packet-snaeth.c
+++ b/epan/dissectors/packet-snaeth.c
@@ -21,11 +21,11 @@
 void proto_register_snaeth(void);
 void proto_reg_handoff_snaeth(void);
 
-static int proto_snaeth = -1;
-static int hf_snaeth_len = -1;
-static int hf_snaeth_padding = -1;
+static int proto_snaeth;
+static int hf_snaeth_len;
+static int hf_snaeth_padding;
 
-static gint ett_snaeth = -1;
+static gint ett_snaeth;
 
 static dissector_handle_t llc_handle;
 static dissector_handle_t snaeth_handle;
diff --git a/epan/dissectors/packet-sndcp-xid.c b/epan/dissectors/packet-sndcp-xid.c
index 018e2199e0..864a9d74e4 100644
--- a/epan/dissectors/packet-sndcp-xid.c
+++ b/epan/dissectors/packet-sndcp-xid.c
@@ -52,7 +52,7 @@ typedef struct
 
 /* Initialize the protocol and registered fields
 */
-static int proto_sndcp_xid   = -1;
+static int proto_sndcp_xid;
 
 /* These fields are used to store the algorithm ID
 * When the P bit is not set, try to decode the algo based on what whas stored.
@@ -63,71 +63,71 @@ static guint8 pcomp_entity_algo_id[32];
 
 
 /* L3 XID parsing */
-static int hf_sndcp_xid_type = -1;
-static int hf_sndcp_xid_len = -1;
-static int hf_sndcp_xid_value = -1;
-static int hf_sndcp_xid_comp_pbit = -1;
-static int hf_sndcp_xid_comp_spare_byte1 = -1;
-static int hf_sndcp_xid_comp_entity = -1;
-static int hf_sndcp_xid_comp_spare_byte2 = -1;
-static int hf_sndcp_xid_comp_algo_id = -1;
-static int hf_sndcp_xid_comp_len = -1;
+static int hf_sndcp_xid_type;
+static int hf_sndcp_xid_len;
+static int hf_sndcp_xid_value;
+static int hf_sndcp_xid_comp_pbit;
+static int hf_sndcp_xid_comp_spare_byte1;
+static int hf_sndcp_xid_comp_entity;
+static int hf_sndcp_xid_comp_spare_byte2;
+static int hf_sndcp_xid_comp_algo_id;
+static int hf_sndcp_xid_comp_len;
 /* There is currently a maximum of 15 DCOMP/PCOMP: 6.5.1.1.5 */
 static int hf_sndcp_xid_comp[15];
-static int hf_sndcp_xid_comp_spare = -1;
-
-static int hf_element_applicable_nsapi_15 = -1;
-static int hf_element_applicable_nsapi_14 = -1;
-static int hf_element_applicable_nsapi_13 = -1;
-static int hf_element_applicable_nsapi_12 = -1;
-static int hf_element_applicable_nsapi_11 = -1;
-static int hf_element_applicable_nsapi_10 = -1;
-static int hf_element_applicable_nsapi_9 = -1;
-static int hf_element_applicable_nsapi_8 = -1;
-static int hf_element_applicable_nsapi_7 = -1;
-static int hf_element_applicable_nsapi_6 = -1;
-static int hf_element_applicable_nsapi_5 = -1;
-static int hf_element_applicable_nsapi_spare = -1;
-
-static int hf_sndcp_xid_rfc1144_s0 = -1;
-static int hf_sndcp_xid_rfc2507_f_max_period_msb = -1;
-static int hf_sndcp_xid_rfc2507_f_max_period_lsb = -1;
-static int hf_sndcp_xid_rfc2507_f_max_time = -1;
-static int hf_sndcp_xid_rfc2507_max_header = -1;
-static int hf_sndcp_xid_rfc2507_tcp_space = -1;
-static int hf_sndcp_xid_rfc2507_non_tcp_space_msb = -1;
-static int hf_sndcp_xid_rfc2507_non_tcp_space_lsb = -1;
-static int hf_sndcp_xid_rohc_max_cid_spare = -1;
-static int hf_sndcp_xid_rohc_max_cid_msb = -1;
-static int hf_sndcp_xid_rohc_max_cid_lsb = -1;
-static int hf_sndcp_xid_rohc_max_header = -1;
-static int hf_sndcp_xid_rohc_profile_msb = -1;
-static int hf_sndcp_xid_rohc_profile_lsb = -1;
-
-static int hf_sndcp_xid_V42bis_p0_spare = -1;
-static int hf_sndcp_xid_V42bis_p0 = -1;
-static int hf_sndcp_xid_V42bis_p1_msb = -1;
-static int hf_sndcp_xid_V42bis_p1_lsb = -1;
-static int hf_sndcp_xid_V42bis_p2 = -1;
-static int hf_sndcp_xid_V44_c0 = -1;
-static int hf_sndcp_xid_V44_c0_spare = -1;
-static int hf_sndcp_xid_V44_p0_spare = -1;
-static int hf_sndcp_xid_V44_p0 = -1;
-static int hf_sndcp_xid_V44_p1t_msb = -1;
-static int hf_sndcp_xid_V44_p1t_lsb = -1;
-static int hf_sndcp_xid_V44_p1r_msb = -1;
-static int hf_sndcp_xid_V44_p1r_lsb = -1;
-static int hf_sndcp_xid_V44_p3t_msb = -1;
-static int hf_sndcp_xid_V44_p3t_lsb = -1;
-static int hf_sndcp_xid_V44_p3r_msb = -1;
-static int hf_sndcp_xid_V44_p3r_lsb = -1;
+static int hf_sndcp_xid_comp_spare;
+
+static int hf_element_applicable_nsapi_15;
+static int hf_element_applicable_nsapi_14;
+static int hf_element_applicable_nsapi_13;
+static int hf_element_applicable_nsapi_12;
+static int hf_element_applicable_nsapi_11;
+static int hf_element_applicable_nsapi_10;
+static int hf_element_applicable_nsapi_9;
+static int hf_element_applicable_nsapi_8;
+static int hf_element_applicable_nsapi_7;
+static int hf_element_applicable_nsapi_6;
+static int hf_element_applicable_nsapi_5;
+static int hf_element_applicable_nsapi_spare;
+
+static int hf_sndcp_xid_rfc1144_s0;
+static int hf_sndcp_xid_rfc2507_f_max_period_msb;
+static int hf_sndcp_xid_rfc2507_f_max_period_lsb;
+static int hf_sndcp_xid_rfc2507_f_max_time;
+static int hf_sndcp_xid_rfc2507_max_header;
+static int hf_sndcp_xid_rfc2507_tcp_space;
+static int hf_sndcp_xid_rfc2507_non_tcp_space_msb;
+static int hf_sndcp_xid_rfc2507_non_tcp_space_lsb;
+static int hf_sndcp_xid_rohc_max_cid_spare;
+static int hf_sndcp_xid_rohc_max_cid_msb;
+static int hf_sndcp_xid_rohc_max_cid_lsb;
+static int hf_sndcp_xid_rohc_max_header;
+static int hf_sndcp_xid_rohc_profile_msb;
+static int hf_sndcp_xid_rohc_profile_lsb;
+
+static int hf_sndcp_xid_V42bis_p0_spare;
+static int hf_sndcp_xid_V42bis_p0;
+static int hf_sndcp_xid_V42bis_p1_msb;
+static int hf_sndcp_xid_V42bis_p1_lsb;
+static int hf_sndcp_xid_V42bis_p2;
+static int hf_sndcp_xid_V44_c0;
+static int hf_sndcp_xid_V44_c0_spare;
+static int hf_sndcp_xid_V44_p0_spare;
+static int hf_sndcp_xid_V44_p0;
+static int hf_sndcp_xid_V44_p1t_msb;
+static int hf_sndcp_xid_V44_p1t_lsb;
+static int hf_sndcp_xid_V44_p1r_msb;
+static int hf_sndcp_xid_V44_p1r_lsb;
+static int hf_sndcp_xid_V44_p3t_msb;
+static int hf_sndcp_xid_V44_p3t_lsb;
+static int hf_sndcp_xid_V44_p3r_msb;
+static int hf_sndcp_xid_V44_p3r_lsb;
 
 
 /* Initialize the subtree pointers
 */
-static gint ett_sndcp_xid                = -1;
-static gint ett_sndcp_xid_version_field  = -1;
-static gint ett_sndcp_comp_field        = -1;
+static gint ett_sndcp_xid;
+static gint ett_sndcp_xid_version_field;
+static gint ett_sndcp_comp_field;
 
 static void parse_compression_parameters(tvbuff_t *tvb, proto_tree *tree, gboolean dcomp);
 /******************************************************/
diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c
index 80c1eddf34..a6e17f29f1 100644
--- a/epan/dissectors/packet-sndcp.c
+++ b/epan/dissectors/packet-sndcp.c
@@ -26,41 +26,41 @@ void proto_reg_handoff_sndcp(void);
 
 /* Initialize the protocol and registered fields
 */
-static int proto_sndcp       = -1;
-static int hf_sndcp_x        = -1;
-static int hf_sndcp_f        = -1;
-static int hf_sndcp_t        = -1;
-static int hf_sndcp_m        = -1;
-static int hf_sndcp_nsapi    = -1;
-static int hf_sndcp_nsapib   = -1;
-static int hf_sndcp_dcomp    = -1;
-static int hf_sndcp_pcomp    = -1;
-static int hf_sndcp_segment  = -1;
-static int hf_sndcp_npdu1    = -1;
-static int hf_sndcp_npdu2    = -1;
-static int hf_sndcp_payload  = -1;
+static int proto_sndcp;
+static int hf_sndcp_x;
+static int hf_sndcp_f;
+static int hf_sndcp_t;
+static int hf_sndcp_m;
+static int hf_sndcp_nsapi;
+static int hf_sndcp_nsapib;
+static int hf_sndcp_dcomp;
+static int hf_sndcp_pcomp;
+static int hf_sndcp_segment;
+static int hf_sndcp_npdu1;
+static int hf_sndcp_npdu2;
+static int hf_sndcp_payload;
 
 /* These fields are used when reassembling N-PDU fragments
 */
-static int hf_npdu_fragments                    = -1;
-static int hf_npdu_fragment                     = -1;
-static int hf_npdu_fragment_overlap             = -1;
-static int hf_npdu_fragment_overlap_conflict    = -1;
-static int hf_npdu_fragment_multiple_tails      = -1;
-static int hf_npdu_fragment_too_long_fragment   = -1;
-static int hf_npdu_fragment_error               = -1;
-static int hf_npdu_fragment_count               = -1;
-static int hf_npdu_reassembled_in               = -1;
-static int hf_npdu_reassembled_length           = -1;
+static int hf_npdu_fragments;
+static int hf_npdu_fragment;
+static int hf_npdu_fragment_overlap;
+static int hf_npdu_fragment_overlap_conflict;
+static int hf_npdu_fragment_multiple_tails;
+static int hf_npdu_fragment_too_long_fragment;
+static int hf_npdu_fragment_error;
+static int hf_npdu_fragment_count;
+static int hf_npdu_reassembled_in;
+static int hf_npdu_reassembled_length;
 
 /* Initialize the subtree pointers
 */
-static gint ett_sndcp                   = -1;
-static gint ett_sndcp_address_field     = -1;
-static gint ett_sndcp_compression_field = -1;
-static gint ett_sndcp_npdu_field        = -1;
-static gint ett_npdu_fragment           = -1;
-static gint ett_npdu_fragments          = -1;
+static gint ett_sndcp;
+static gint ett_sndcp_address_field;
+static gint ett_sndcp_compression_field;
+static gint ett_sndcp_npdu_field;
+static gint ett_npdu_fragment;
+static gint ett_npdu_fragments;
 
 /* Structure needed for the fragmentation routines in reassemble.c
 */
diff --git a/epan/dissectors/packet-snort.c b/epan/dissectors/packet-snort.c
index 4fb9e23a57..5276e2000e 100644
--- a/epan/dissectors/packet-snort.c
+++ b/epan/dissectors/packet-snort.c
@@ -43,55 +43,55 @@ void proto_register_snort(void);
 void proto_reg_handoff_snort(void);
 
 
-static int proto_snort = -1;
+static int proto_snort;
 
 /* These are from parsing snort fast_alert output and/or looking up snort config */
-static int hf_snort_raw_alert = -1;
-static int hf_snort_classification = -1;
-static int hf_snort_rule = -1;
-static int hf_snort_msg = -1;
-static int hf_snort_rev = -1;
-static int hf_snort_sid = -1;
-static int hf_snort_generator = -1;
-static int hf_snort_priority = -1;
-static int hf_snort_rule_string = -1;
-static int hf_snort_rule_protocol = -1;
-static int hf_snort_rule_filename = -1;
-static int hf_snort_rule_line_number = -1;
-static int hf_snort_rule_ip_var = -1;
-static int hf_snort_rule_port_var = -1;
-
-static int hf_snort_reassembled_in = -1;
-static int hf_snort_reassembled_from = -1;
+static int hf_snort_raw_alert;
+static int hf_snort_classification;
+static int hf_snort_rule;
+static int hf_snort_msg;
+static int hf_snort_rev;
+static int hf_snort_sid;
+static int hf_snort_generator;
+static int hf_snort_priority;
+static int hf_snort_rule_string;
+static int hf_snort_rule_protocol;
+static int hf_snort_rule_filename;
+static int hf_snort_rule_line_number;
+static int hf_snort_rule_ip_var;
+static int hf_snort_rule_port_var;
+
+static int hf_snort_reassembled_in;
+static int hf_snort_reassembled_from;
 
 /* Patterns to match */
-static int hf_snort_content = -1;
-static int hf_snort_uricontent = -1;
-static int hf_snort_pcre = -1;
+static int hf_snort_content;
+static int hf_snort_uricontent;
+static int hf_snort_pcre;
 
 /* Web links */
-static int hf_snort_reference = -1;
+static int hf_snort_reference;
 
 /* General stats about the rule set */
-static int hf_snort_global_stats = -1;
-static int hf_snort_global_stats_rule_file_count = -1;     /* number of rules files */
-static int hf_snort_global_stats_rule_count = -1;          /* number of rules in config */
+static int hf_snort_global_stats;
+static int hf_snort_global_stats_rule_file_count;     /* number of rules files */
+static int hf_snort_global_stats_rule_count;          /* number of rules in config */
 
-static int hf_snort_global_stats_total_alerts_count = -1;
-static int hf_snort_global_stats_alert_match_number = -1;
+static int hf_snort_global_stats_total_alerts_count;
+static int hf_snort_global_stats_alert_match_number;
 
-static int hf_snort_global_stats_rule_alerts_count = -1;
-static int hf_snort_global_stats_rule_match_number = -1;
+static int hf_snort_global_stats_rule_alerts_count;
+static int hf_snort_global_stats_rule_match_number;
 
 
 /* Subtrees */
-static int ett_snort = -1;
-static int ett_snort_rule = -1;
-static int ett_snort_global_stats = -1;
+static int ett_snort;
+static int ett_snort_rule;
+static int ett_snort_global_stats;
 
 /* Expert info */
-static expert_field ei_snort_alert = EI_INIT;
-static expert_field ei_snort_content_not_matched = EI_INIT;
+static expert_field ei_snort_alert;
+static expert_field ei_snort_content_not_matched;
 
 static dissector_handle_t snort_handle;
 
diff --git a/epan/dissectors/packet-socketcan.c b/epan/dissectors/packet-socketcan.c
index 90cf2bf78b..d20b5cc558 100644
--- a/epan/dissectors/packet-socketcan.c
+++ b/epan/dissectors/packet-socketcan.c
@@ -28,62 +28,62 @@
 void proto_register_socketcan(void);
 void proto_reg_handoff_socketcan(void);
 
-static int hf_can_len = -1;
-static int hf_can_infoent_ext = -1;
-static int hf_can_infoent_std = -1;
-static int hf_can_extflag = -1;
-static int hf_can_rtrflag = -1;
-static int hf_can_errflag = -1;
-static int hf_can_reserved = -1;
-static int hf_can_padding = -1;
-
-static int hf_can_err_tx_timeout = -1;
-static int hf_can_err_lostarb = -1;
-static int hf_can_err_ctrl = -1;
-static int hf_can_err_prot = -1;
-static int hf_can_err_trx = -1;
-static int hf_can_err_ack = -1;
-static int hf_can_err_busoff = -1;
-static int hf_can_err_buserror = -1;
-static int hf_can_err_restarted = -1;
-static int hf_can_err_reserved = -1;
-
-static int hf_can_err_lostarb_bit_number = -1;
-
-static int hf_can_err_ctrl_rx_overflow = -1;
-static int hf_can_err_ctrl_tx_overflow = -1;
-static int hf_can_err_ctrl_rx_warning = -1;
-static int hf_can_err_ctrl_tx_warning = -1;
-static int hf_can_err_ctrl_rx_passive = -1;
-static int hf_can_err_ctrl_tx_passive = -1;
-static int hf_can_err_ctrl_active = -1;
-
-static int hf_can_err_prot_error_type_bit = -1;
-static int hf_can_err_prot_error_type_form = -1;
-static int hf_can_err_prot_error_type_stuff = -1;
-static int hf_can_err_prot_error_type_bit0 = -1;
-static int hf_can_err_prot_error_type_bit1 = -1;
-static int hf_can_err_prot_error_type_overload = -1;
-static int hf_can_err_prot_error_type_active = -1;
-static int hf_can_err_prot_error_type_tx = -1;
-
-static int hf_can_err_prot_error_location = -1;
-
-static int hf_can_err_trx_canh = -1;
-static int hf_can_err_trx_canl = -1;
-
-static int hf_can_err_ctrl_specific = -1;
-
-static expert_field ei_can_err_dlc_mismatch = EI_INIT;
-
-static int hf_canfd_brsflag = -1;
-static int hf_canfd_esiflag = -1;
-
-static gint ett_can = -1;
-static gint ett_can_fd = -1;
-
-static int proto_can = -1;
-static int proto_canfd = -1;
+static int hf_can_len;
+static int hf_can_infoent_ext;
+static int hf_can_infoent_std;
+static int hf_can_extflag;
+static int hf_can_rtrflag;
+static int hf_can_errflag;
+static int hf_can_reserved;
+static int hf_can_padding;
+
+static int hf_can_err_tx_timeout;
+static int hf_can_err_lostarb;
+static int hf_can_err_ctrl;
+static int hf_can_err_prot;
+static int hf_can_err_trx;
+static int hf_can_err_ack;
+static int hf_can_err_busoff;
+static int hf_can_err_buserror;
+static int hf_can_err_restarted;
+static int hf_can_err_reserved;
+
+static int hf_can_err_lostarb_bit_number;
+
+static int hf_can_err_ctrl_rx_overflow;
+static int hf_can_err_ctrl_tx_overflow;
+static int hf_can_err_ctrl_rx_warning;
+static int hf_can_err_ctrl_tx_warning;
+static int hf_can_err_ctrl_rx_passive;
+static int hf_can_err_ctrl_tx_passive;
+static int hf_can_err_ctrl_active;
+
+static int hf_can_err_prot_error_type_bit;
+static int hf_can_err_prot_error_type_form;
+static int hf_can_err_prot_error_type_stuff;
+static int hf_can_err_prot_error_type_bit0;
+static int hf_can_err_prot_error_type_bit1;
+static int hf_can_err_prot_error_type_overload;
+static int hf_can_err_prot_error_type_active;
+static int hf_can_err_prot_error_type_tx;
+
+static int hf_can_err_prot_error_location;
+
+static int hf_can_err_trx_canh;
+static int hf_can_err_trx_canl;
+
+static int hf_can_err_ctrl_specific;
+
+static expert_field ei_can_err_dlc_mismatch;
+
+static int hf_canfd_brsflag;
+static int hf_canfd_esiflag;
+
+static gint ett_can;
+static gint ett_can_fd;
+
+static int proto_can;
+static int proto_canfd;
 
 static gboolean byte_swap = FALSE;
 static gboolean heuristic_first = FALSE;
diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c
index f84c341148..2fd3c52e9d 100644
--- a/epan/dissectors/packet-socks.c
+++ b/epan/dissectors/packet-socks.c
@@ -82,41 +82,41 @@ void proto_reg_handoff_socks(void);
 
 /*********** Header field identifiers *************/
 
-static int proto_socks = -1;
-
-static int ett_socks = -1;
-static int ett_socks_auth = -1;
-static int ett_socks_name = -1;
-
-static int hf_socks_ver = -1;
-static int hf_socks_ip_dst = -1;
-static int hf_socks_ip6_dst = -1;
-static int hf_gssapi_payload = -1;
-static int hf_gssapi_command = -1;
-static int hf_gssapi_length = -1;
-static int hf_v4a_dns_name = -1;
-static int hf_socks_dstport = -1;
-static int hf_socks_cmd = -1;
-static int hf_socks_results_4 = -1;
-static int hf_socks_results_5 = -1;
-static int hf_client_auth_method_count = -1;
-static int hf_client_auth_method = -1;
-static int hf_socks_reserved = -1;
-static int hf_socks_reserved2 = -1;
-static int hf_client_port = -1;
-static int hf_server_accepted_auth_method = -1;
-static int hf_server_auth_status = -1;
-static int hf_server_remote_host_port = -1;
-static int hf_socks_subnegotiation_version = -1;
-static int hf_socks_username = -1;
-static int hf_socks_password = -1;
-static int hf_socks_remote_name = -1;
-static int hf_socks_address_type = -1;
-static int hf_socks_fragment_number = -1;
-static int hf_socks_ping_end_command = -1;
-static int hf_socks_ping_results = -1;
-static int hf_socks_traceroute_end_command = -1;
-static int hf_socks_traceroute_results = -1;
+static int proto_socks;
+
+static int ett_socks;
+static int ett_socks_auth;
+static int ett_socks_name;
+
+static int hf_socks_ver;
+static int hf_socks_ip_dst;
+static int hf_socks_ip6_dst;
+static int hf_gssapi_payload;
+static int hf_gssapi_command;
+static int hf_gssapi_length;
+static int hf_v4a_dns_name;
+static int hf_socks_dstport;
+static int hf_socks_cmd;
+static int hf_socks_results_4;
+static int hf_socks_results_5;
+static int hf_client_auth_method_count;
+static int hf_client_auth_method;
+static int hf_socks_reserved;
+static int hf_socks_reserved2;
+static int hf_client_port;
+static int hf_server_accepted_auth_method;
+static int hf_server_auth_status;
+static int hf_server_remote_host_port;
+static int hf_socks_subnegotiation_version;
+static int hf_socks_username;
+static int hf_socks_password;
+static int hf_socks_remote_name;
+static int hf_socks_address_type;
+static int hf_socks_fragment_number;
+static int hf_socks_ping_end_command;
+static int hf_socks_ping_results;
+static int hf_socks_traceroute_end_command;
+static int hf_socks_traceroute_results;
 
 /************* Dissector handles ***********/
 
diff --git a/epan/dissectors/packet-solaredge.c b/epan/dissectors/packet-solaredge.c
index 34e81c78f4..69394f151f 100644
--- a/epan/dissectors/packet-solaredge.c
+++ b/epan/dissectors/packet-solaredge.c
@@ -481,68 +481,68 @@ static dissector_handle_t solaredge_handle;
 
 static gboolean global_show_unknown_fields = TRUE;
 
-static expert_field ei_solaredge_invalid_length = EI_INIT;
-static expert_field ei_solaredge_invalid_crc = EI_INIT;
+static expert_field ei_solaredge_invalid_length;
+static expert_field ei_solaredge_invalid_crc;
 
-static int proto_solaredge = -1;
+static int proto_solaredge;
 
-static int hf_solaredge_length_type = -1;
-static int hf_solaredge_length_inverse_type = -1;
-static int hf_solaredge_sequence_number_type = -1;
-static int hf_solaredge_source_address_type = -1;
-static int hf_solaredge_destination_address_type = -1;
-static int hf_solaredge_command_type = -1;
-static int hf_solaredge_crc_type = -1;
-static int hf_solaredge_crc_status_type = -1;
+static int hf_solaredge_length_type;
+static int hf_solaredge_length_inverse_type;
+static int hf_solaredge_sequence_number_type;
+static int hf_solaredge_source_address_type;
+static int hf_solaredge_destination_address_type;
+static int hf_solaredge_command_type;
+static int hf_solaredge_crc_type;
+static int hf_solaredge_crc_status_type;
 
-static int hf_solaredge_payload_type = -1;
+static int hf_solaredge_payload_type;
 
-static int hf_solaredge_session_key_type = -1;
+static int hf_solaredge_session_key_type;
 
-static int hf_solaredge_post_type = -1;
-static int hf_solaredge_post_device_type = -1;
-static int hf_solaredge_post_device_type_type = -1;
-static int hf_solaredge_post_device_id_type = -1;
-static int hf_solaredge_post_length_type = -1;
+static int hf_solaredge_post_type;
+static int hf_solaredge_post_device_type;
+static int hf_solaredge_post_device_type_type;
+static int hf_solaredge_post_device_id_type;
+static int hf_solaredge_post_length_type;
 
-static int hf_solaredge_post_padding_uint32_type = -1;
-static int hf_solaredge_post_padding_float_type = -1;
+static int hf_solaredge_post_padding_uint32_type;
+static int hf_solaredge_post_padding_float_type;
 
-static int hf_solaredge_post_singlephase_inverter_timestamp_type = -1;
-static int hf_solaredge_post_singlephase_inverter_uptime_type = -1;
-static int hf_solaredge_post_singlephase_inverter_interval_type = -1;
-static int hf_solaredge_post_singlephase_inverter_temperature_type = -1;
-static int hf_solaredge_post_singlephase_inverter_energy_day_type = -1;
-static int hf_solaredge_post_singlephase_inverter_energy_interval_type = -1;
-static int hf_solaredge_post_singlephase_inverter_ac_voltage_type = -1;
-static int hf_solaredge_post_singlephase_inverter_ac_current_type = -1;
-static int hf_solaredge_post_singlephase_inverter_ac_frequency_type = -1;
-static int hf_solaredge_post_singlephase_inverter_dc_voltage_type = -1;
-static int hf_solaredge_post_singlephase_inverter_energy_total_type = -1;
-static int hf_solaredge_post_singlephase_inverter_power_max_type = -1;
-static int hf_solaredge_post_singlephase_inverter_ac_power_type = -1;
+static int hf_solaredge_post_singlephase_inverter_timestamp_type;
+static int hf_solaredge_post_singlephase_inverter_uptime_type;
+static int hf_solaredge_post_singlephase_inverter_interval_type;
+static int hf_solaredge_post_singlephase_inverter_temperature_type;
+static int hf_solaredge_post_singlephase_inverter_energy_day_type;
+static int hf_solaredge_post_singlephase_inverter_energy_interval_type;
+static int hf_solaredge_post_singlephase_inverter_ac_voltage_type;
+static int hf_solaredge_post_singlephase_inverter_ac_current_type;
+static int hf_solaredge_post_singlephase_inverter_ac_frequency_type;
+static int hf_solaredge_post_singlephase_inverter_dc_voltage_type;
+static int hf_solaredge_post_singlephase_inverter_energy_total_type;
+static int hf_solaredge_post_singlephase_inverter_power_max_type;
+static int hf_solaredge_post_singlephase_inverter_ac_power_type;
 
-static int hf_solaredge_post_optimizer_inverter_type = -1;
-static int hf_solaredge_post_optimizer_uptime_type = -1;
-static int hf_solaredge_post_optimizer_dc_current_panel_type = -1;
-static int hf_solaredge_post_optimizer_timestamp_type = -1;
-static int hf_solaredge_post_optimizer_uptime_short_type = -1;
-static int hf_solaredge_post_optimizer_dc_voltage_panel_type = -1;
-static int hf_solaredge_post_optimizer_dc_voltage_optimzer_type = -1;
-static int hf_solaredge_post_optimizer_dc_current_optimzer_type = -1;
-static int hf_solaredge_post_optimizer_energy_day_type = -1;
-static int hf_solaredge_post_optimizer_temperature_type = -1;
+static int hf_solaredge_post_optimizer_inverter_type;
+static int hf_solaredge_post_optimizer_uptime_type;
+static int hf_solaredge_post_optimizer_dc_current_panel_type;
+static int hf_solaredge_post_optimizer_timestamp_type;
+static int hf_solaredge_post_optimizer_uptime_short_type;
+static int hf_solaredge_post_optimizer_dc_voltage_panel_type;
+static int hf_solaredge_post_optimizer_dc_voltage_optimzer_type;
+static int hf_solaredge_post_optimizer_dc_current_optimzer_type;
+static int hf_solaredge_post_optimizer_energy_day_type;
+static int hf_solaredge_post_optimizer_temperature_type;
 
-static int hf_solaredge_post_event_timestamp_type = -1;
-static int hf_solaredge_post_event_type_type = -1;
-static int hf_solaredge_post_event_event_start_timestamp_type = -1;
-static int hf_solaredge_post_event_event_timezone_offset_type = -1;
-static int hf_solaredge_post_event_event_end_timestamp_type = -1;
+static int hf_solaredge_post_event_timestamp_type;
+static int hf_solaredge_post_event_type_type;
+static int hf_solaredge_post_event_event_start_timestamp_type;
+static int hf_solaredge_post_event_event_timezone_offset_type;
+static int hf_solaredge_post_event_event_end_timestamp_type;
 
-static gint ett_solaredge_packet = -1;
-static gint ett_solaredge_packet_decrypted = -1;
-static gint ett_solaredge_packet_post = -1;
-static gint ett_solaredge_packet_post_device = -1;
+static gint ett_solaredge_packet;
+static gint ett_solaredge_packet_decrypted;
+static gint ett_solaredge_packet_post;
+static gint ett_solaredge_packet_post_device;
 
 static const value_string solaredge_packet_commandtypes[] = {
 	{ SOLAREDGE_COMMAND_PARAMS_RESET,					"PARAMS_RESET" },
diff --git a/epan/dissectors/packet-someip-sd.c b/epan/dissectors/packet-someip-sd.c
index 2339aae0ef..7d8a9afa08 100644
--- a/epan/dissectors/packet-someip-sd.c
+++ b/epan/dissectors/packet-someip-sd.c
@@ -87,70 +87,70 @@
 #define SD_MAX_NUM_OPTIONS                      271
 
 /* ID wireshark identifies the dissector by */
-static int proto_someip_sd = -1;
+static int proto_someip_sd;
 
 /* header field */
-static int hf_someip_sd_flags = -1;
-static int hf_someip_sd_rebootflag = -1;
-static int hf_someip_sd_unicastflag = -1;
-static int hf_someip_sd_explicitiniteventflag = -1;
-static int hf_someip_sd_reserved = -1;
-
-static int hf_someip_sd_length_entriesarray = -1;
-static int hf_someip_sd_entries = -1;
-
-static int hf_someip_sd_entry = -1;
-static int hf_someip_sd_entry_type = -1;
-static int hf_someip_sd_entry_type_offerservice = -1;
-static int hf_someip_sd_entry_type_stopofferservice = -1;
-static int hf_someip_sd_entry_type_findservice = -1;
-static int hf_someip_sd_entry_type_subscribeeventgroup = -1;
-static int hf_someip_sd_entry_type_stopsubscribeeventgroup = -1;
-static int hf_someip_sd_entry_type_subscribeeventgroupack = -1;
-static int hf_someip_sd_entry_type_subscribeeventgroupnack = -1;
-static int hf_someip_sd_entry_index1 = -1;
-static int hf_someip_sd_entry_index2 = -1;
-static int hf_someip_sd_entry_numopt1 = -1;
-static int hf_someip_sd_entry_numopt2 = -1;
-static int hf_someip_sd_entry_opts_referenced = -1;
-static int hf_someip_sd_entry_serviceid = -1;
-static int hf_someip_sd_entry_servicename = -1;
-static int hf_someip_sd_entry_instanceid = -1;
-static int hf_someip_sd_entry_majorver = -1;
-static int hf_someip_sd_entry_ttl = -1;
-static int hf_someip_sd_entry_minorver = -1;
-static int hf_someip_sd_entry_eventgroupid = -1;
-static int hf_someip_sd_entry_eventgroupname = -1;
-static int hf_someip_sd_entry_reserved = -1;
-static int hf_someip_sd_entry_counter = -1;
-static int hf_someip_sd_entry_intial_event_flag = -1;
-static int hf_someip_sd_entry_reserved2 = -1;
-
-static int hf_someip_sd_length_optionsarray = -1;
-static int hf_someip_sd_options = -1;
-
-static int hf_someip_sd_option_type = -1;
-static int hf_someip_sd_option_length = -1;
-static int hf_someip_sd_option_reserved = -1;
-static int hf_someip_sd_option_ipv4 = -1;
-static int hf_someip_sd_option_ipv6 = -1;
-static int hf_someip_sd_option_port = -1;
-static int hf_someip_sd_option_proto = -1;
-static int hf_someip_sd_option_reserved2 = -1;
-static int hf_someip_sd_option_data = -1;
-static int hf_someip_sd_option_config_string = -1;
-static int hf_someip_sd_option_config_string_element = -1;
-static int hf_someip_sd_option_lb_priority = -1;
-static int hf_someip_sd_option_lb_weight = -1;
+static int hf_someip_sd_flags;
+static int hf_someip_sd_rebootflag;
+static int hf_someip_sd_unicastflag;
+static int hf_someip_sd_explicitiniteventflag;
+static int hf_someip_sd_reserved;
+
+static int hf_someip_sd_length_entriesarray;
+static int hf_someip_sd_entries;
+
+static int hf_someip_sd_entry;
+static int hf_someip_sd_entry_type;
+static int hf_someip_sd_entry_type_offerservice;
+static int hf_someip_sd_entry_type_stopofferservice;
+static int hf_someip_sd_entry_type_findservice;
+static int hf_someip_sd_entry_type_subscribeeventgroup;
+static int hf_someip_sd_entry_type_stopsubscribeeventgroup;
+static int hf_someip_sd_entry_type_subscribeeventgroupack;
+static int hf_someip_sd_entry_type_subscribeeventgroupnack;
+static int hf_someip_sd_entry_index1;
+static int hf_someip_sd_entry_index2;
+static int hf_someip_sd_entry_numopt1;
+static int hf_someip_sd_entry_numopt2;
+static int hf_someip_sd_entry_opts_referenced;
+static int hf_someip_sd_entry_serviceid;
+static int hf_someip_sd_entry_servicename;
+static int hf_someip_sd_entry_instanceid;
+static int hf_someip_sd_entry_majorver;
+static int hf_someip_sd_entry_ttl;
+static int hf_someip_sd_entry_minorver;
+static int hf_someip_sd_entry_eventgroupid;
+static int hf_someip_sd_entry_eventgroupname;
+static int hf_someip_sd_entry_reserved;
+static int hf_someip_sd_entry_counter;
+static int hf_someip_sd_entry_intial_event_flag;
+static int hf_someip_sd_entry_reserved2;
+
+static int hf_someip_sd_length_optionsarray;
+static int hf_someip_sd_options;
+
+static int hf_someip_sd_option_type;
+static int hf_someip_sd_option_length;
+static int hf_someip_sd_option_reserved;
+static int hf_someip_sd_option_ipv4;
+static int hf_someip_sd_option_ipv6;
+static int hf_someip_sd_option_port;
+static int hf_someip_sd_option_proto;
+static int hf_someip_sd_option_reserved2;
+static int hf_someip_sd_option_data;
+static int hf_someip_sd_option_config_string;
+static int hf_someip_sd_option_config_string_element;
+static int hf_someip_sd_option_lb_priority;
+static int hf_someip_sd_option_lb_weight;
 
 /* protocol tree items */
-static gint ett_someip_sd = -1;
-static gint ett_someip_sd_flags = -1;
-static gint ett_someip_sd_entries = -1;
-static gint ett_someip_sd_entry = -1;
-static gint ett_someip_sd_options = -1;
-static gint ett_someip_sd_option = -1;
-static gint ett_someip_sd_config_string = -1;
+static gint ett_someip_sd;
+static gint ett_someip_sd_flags;
+static gint ett_someip_sd_entries;
+static gint ett_someip_sd_entry;
+static gint ett_someip_sd_options;
+static gint ett_someip_sd_option;
+static gint ett_someip_sd_config_string;
 
 
 /*** Taps ***/
@@ -232,16 +232,16 @@ static const true_false_string sd_eiec_flag = {
 };
 
 /*** expert info items ***/
-static expert_field ei_someipsd_message_truncated = EI_INIT;
-static expert_field ei_someipsd_entry_array_malformed = EI_INIT;
-static expert_field ei_someipsd_entry_array_empty = EI_INIT;
-static expert_field ei_someipsd_entry_unknown = EI_INIT;
-static expert_field ei_someipsd_option_array_truncated = EI_INIT;
-static expert_field ei_someipsd_option_array_bytes_left = EI_INIT;
-static expert_field ei_someipsd_option_unknown = EI_INIT;
-static expert_field ei_someipsd_option_wrong_length = EI_INIT;
-static expert_field ei_someipsd_L4_protocol_unsupported = EI_INIT;
-static expert_field ei_someipsd_config_string_malformed = EI_INIT;
+static expert_field ei_someipsd_message_truncated;
+static expert_field ei_someipsd_entry_array_malformed;
+static expert_field ei_someipsd_entry_array_empty;
+static expert_field ei_someipsd_entry_unknown;
+static expert_field ei_someipsd_option_array_truncated;
+static expert_field ei_someipsd_option_array_bytes_left;
+static expert_field ei_someipsd_option_unknown;
+static expert_field ei_someipsd_option_wrong_length;
+static expert_field ei_someipsd_L4_protocol_unsupported;
+static expert_field ei_someipsd_config_string_malformed;
 
 /*** prototypes ***/
 void proto_register_someip_sd(void);
diff --git a/epan/dissectors/packet-someip.c b/epan/dissectors/packet-someip.c
index f3fad6f622..738111b37c 100644
--- a/epan/dissectors/packet-someip.c
+++ b/epan/dissectors/packet-someip.c
@@ -125,76 +125,76 @@
 #define SOMEIP_WTLV_MASK_DATA_ID                 0x0fff
 
 /* ID wireshark identifies the dissector by */
-static int proto_someip = -1;
+static int proto_someip;
 
 static dissector_handle_t someip_handle_udp = NULL;
 static dissector_handle_t someip_handle_tcp = NULL;
 static dissector_handle_t dtls_handle = NULL;
 
 /* header field */
-static int hf_someip_messageid                                          = -1;
-static int hf_someip_serviceid                                          = -1;
-static int hf_someip_servicename                                        = -1;
-static int hf_someip_methodid                                           = -1;
-static int hf_someip_methodname                                         = -1;
-static int hf_someip_length                                             = -1;
-static int hf_someip_clientid                                           = -1;
-static int hf_someip_clientname                                         = -1;
-static int hf_someip_sessionid                                          = -1;
-static int hf_someip_protover                                           = -1;
-static int hf_someip_interface_ver                                      = -1;
-static int hf_someip_messagetype                                        = -1;
-static int hf_someip_messagetype_ack_flag                               = -1;
-static int hf_someip_messagetype_tp_flag                                = -1;
-static int hf_someip_returncode                                         = -1;
-
-static int hf_someip_tp                                                 = -1;
-static int hf_someip_tp_offset                                          = -1;
-static int hf_someip_tp_offset_encoded                                  = -1;
-static int hf_someip_tp_flags                                           = -1;
-static int hf_someip_tp_reserved                                        = -1;
-static int hf_someip_tp_more_segments                                   = -1;
-
-static int hf_someip_payload                                            = -1;
+static int hf_someip_messageid;
+static int hf_someip_serviceid;
+static int hf_someip_servicename;
+static int hf_someip_methodid;
+static int hf_someip_methodname;
+static int hf_someip_length;
+static int hf_someip_clientid;
+static int hf_someip_clientname;
+static int hf_someip_sessionid;
+static int hf_someip_protover;
+static int hf_someip_interface_ver;
+static int hf_someip_messagetype;
+static int hf_someip_messagetype_ack_flag;
+static int hf_someip_messagetype_tp_flag;
+static int hf_someip_returncode;
+
+static int hf_someip_tp;
+static int hf_someip_tp_offset;
+static int hf_someip_tp_offset_encoded;
+static int hf_someip_tp_flags;
+static int hf_someip_tp_reserved;
+static int hf_someip_tp_more_segments;
+
+static int hf_someip_payload;
 
 /* protocol tree items */
-static gint ett_someip                                                  = -1;
-static gint ett_someip_msgtype                                          = -1;
-static gint ett_someip_tp                                               = -1;
+static gint ett_someip;
+static gint ett_someip_msgtype;
+static gint ett_someip_tp;
 
 /* dissector handling */
 static dissector_table_t someip_dissector_table = NULL;
 
 /* message reassembly for SOME/IP-TP */
-static int hf_someip_tp_fragments                                       = -1;
-static int hf_someip_tp_fragment                                        = -1;
-static int hf_someip_tp_fragment_overlap                                = -1;
-static int hf_someip_tp_fragment_overlap_conflicts                      = -1;
-static int hf_someip_tp_fragment_multiple_tails                         = -1;
-static int hf_someip_tp_fragment_too_long_fragment                      = -1;
-static int hf_someip_tp_fragment_error                                  = -1;
-static int hf_someip_tp_fragment_count                                  = -1;
-static int hf_someip_tp_reassembled_in                                  = -1;
-static int hf_someip_tp_reassembled_length                              = -1;
-static int hf_someip_tp_reassembled_data                                = -1;
-
-static int hf_payload_unparsed                                          = -1;
-static int hf_payload_length_field_8bit                                 = -1;
-static int hf_payload_length_field_16bit                                = -1;
-static int hf_payload_length_field_32bit                                = -1;
-static int hf_payload_type_field_8bit                                   = -1;
-static int hf_payload_type_field_16bit                                  = -1;
-static int hf_payload_type_field_32bit                                  = -1;
-static int hf_payload_str_base                                          = -1;
-static int hf_payload_str_string                                        = -1;
-static int hf_payload_str_struct                                        = -1;
-static int hf_payload_str_array                                         = -1;
-static int hf_payload_str_union                                         = -1;
-
-static int hf_payload_wtlv_tag                                          = -1;
-static int hf_payload_wtlv_tag_res                                      = -1;
-static int hf_payload_wtlv_tag_wire_type                                = -1;
-static int hf_payload_wtlv_tag_data_id                                  = -1;
+static int hf_someip_tp_fragments;
+static int hf_someip_tp_fragment;
+static int hf_someip_tp_fragment_overlap;
+static int hf_someip_tp_fragment_overlap_conflicts;
+static int hf_someip_tp_fragment_multiple_tails;
+static int hf_someip_tp_fragment_too_long_fragment;
+static int hf_someip_tp_fragment_error;
+static int hf_someip_tp_fragment_count;
+static int hf_someip_tp_reassembled_in;
+static int hf_someip_tp_reassembled_length;
+static int hf_someip_tp_reassembled_data;
+
+static int hf_payload_unparsed;
+static int hf_payload_length_field_8bit;
+static int hf_payload_length_field_16bit;
+static int hf_payload_length_field_32bit;
+static int hf_payload_type_field_8bit;
+static int hf_payload_type_field_16bit;
+static int hf_payload_type_field_32bit;
+static int hf_payload_str_base;
+static int hf_payload_str_string;
+static int hf_payload_str_struct;
+static int hf_payload_str_array;
+static int hf_payload_str_union;
+
+static int hf_payload_wtlv_tag;
+static int hf_payload_wtlv_tag_res;
+static int hf_payload_wtlv_tag_wire_type;
+static int hf_payload_wtlv_tag_data_id;
 
 static hf_register_info* dynamic_hf_param                               = NULL;
 static guint dynamic_hf_param_size                                      = 0;
@@ -205,16 +205,16 @@ static guint dynamic_hf_struct_size                                     = 0;
 static hf_register_info* dynamic_hf_union                               = NULL;
 static guint dynamic_hf_union_size                                      = 0;
 
-static gint ett_someip_tp_fragment                                      = -1;
-static gint ett_someip_tp_fragments                                     = -1;
-static gint ett_someip_payload                                          = -1;
-static gint ett_someip_string                                           = -1;
-static gint ett_someip_array                                            = -1;
-static gint ett_someip_array_dim                                        = -1;
-static gint ett_someip_struct                                           = -1;
-static gint ett_someip_union                                            = -1;
-static gint ett_someip_parameter                                        = -1;
-static gint ett_someip_wtlv_tag                                         = -1;
+static gint ett_someip_tp_fragment;
+static gint ett_someip_tp_fragments;
+static gint ett_someip_payload;
+static gint ett_someip_string;
+static gint ett_someip_array;
+static gint ett_someip_array_dim;
+static gint ett_someip_struct;
+static gint ett_someip_union;
+static gint ett_someip_parameter;
+static gint ett_someip_wtlv_tag;
 
 static const fragment_items someip_tp_frag_items = {
     &ett_someip_tp_fragment,
@@ -270,16 +270,16 @@ static const value_string someip_return_code[] = {
 };
 
 /*** expert info items ***/
-static expert_field ei_someip_unknown_version                           = EI_INIT;
-static expert_field ei_someip_message_truncated                         = EI_INIT;
-static expert_field ei_someip_incomplete_headers                        = EI_INIT;
-
-static expert_field ei_someip_payload_truncated                         = EI_INIT;
-static expert_field ei_someip_payload_malformed                         = EI_INIT;
-static expert_field ei_someip_payload_config_error                      = EI_INIT;
-static expert_field ei_someip_payload_alignment_error                   = EI_INIT;
-static expert_field ei_someip_payload_static_array_min_not_max          = EI_INIT;
-static expert_field ei_someip_payload_dyn_array_not_within_limit        = EI_INIT;
+static expert_field ei_someip_unknown_version;
+static expert_field ei_someip_message_truncated;
+static expert_field ei_someip_incomplete_headers;
+
+static expert_field ei_someip_payload_truncated;
+static expert_field ei_someip_payload_malformed;
+static expert_field ei_someip_payload_config_error;
+static expert_field ei_someip_payload_alignment_error;
+static expert_field ei_someip_payload_static_array_min_not_max;
+static expert_field ei_someip_payload_dyn_array_not_within_limit;
 
 /*** Data Structure for mapping IDs to Names (Services, Methods, ...) ***/
 static GHashTable *data_someip_services                                 = NULL;
diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c
index 6b8baa5cd5..5452e58dce 100644
--- a/epan/dissectors/packet-soupbintcp.c
+++ b/epan/dissectors/packet-soupbintcp.c
@@ -97,7 +97,7 @@ static const value_string reject_code_val[] = {
 
 
 /* Initialize the protocol and registered fields */
-static int proto_soupbintcp = -1;
+static int proto_soupbintcp;
 static dissector_handle_t soupbintcp_handle;
 static heur_dissector_list_t heur_subdissector_list;
 
@@ -105,23 +105,23 @@ static heur_dissector_list_t heur_subdissector_list;
 static gboolean soupbintcp_desegment = TRUE;
 
 /* Initialize the subtree pointers */
-static gint ett_soupbintcp = -1;
+static gint ett_soupbintcp;
 
 /* Header field formatting */
-static int hf_soupbintcp_packet_length = -1;
-static int hf_soupbintcp_packet_type = -1;
-static int hf_soupbintcp_message = -1;
-static int hf_soupbintcp_text = -1;
-static int hf_soupbintcp_username = -1;
-static int hf_soupbintcp_password = -1;
-static int hf_soupbintcp_session = -1;
-static int hf_soupbintcp_seq_num = -1;
-static int hf_soupbintcp_next_seq_num = -1;
-static int hf_soupbintcp_req_seq_num = -1;
-static int hf_soupbintcp_reject_code = -1;
-
-static expert_field ei_soupbintcp_next_seq_num_invalid = EI_INIT;
-static expert_field ei_soupbintcp_req_seq_num_invalid = EI_INIT;
+static int hf_soupbintcp_packet_length;
+static int hf_soupbintcp_packet_type;
+static int hf_soupbintcp_message;
+static int hf_soupbintcp_text;
+static int hf_soupbintcp_username;
+static int hf_soupbintcp_password;
+static int hf_soupbintcp_session;
+static int hf_soupbintcp_seq_num;
+static int hf_soupbintcp_next_seq_num;
+static int hf_soupbintcp_req_seq_num;
+static int hf_soupbintcp_reject_code;
+
+static expert_field ei_soupbintcp_next_seq_num_invalid;
+static expert_field ei_soupbintcp_req_seq_num_invalid;
 
 /** Dissector for SoupBinTCP messages */
 static void
diff --git a/epan/dissectors/packet-sparkplug.c b/epan/dissectors/packet-sparkplug.c
index 5a111093a5..1eb57d27c3 100644
--- a/epan/dissectors/packet-sparkplug.c
+++ b/epan/dissectors/packet-sparkplug.c
@@ -30,26 +30,26 @@ void proto_reg_handoff_sparkplug(void);
 void proto_register_sparkplug(void);
 
 /* Initialize the protocol field */
-static int proto_sparkplugb = -1;
+static int proto_sparkplugb;
 
 /* Initialize the subtree pointers */
-static gint ett_sparkplugb = -1;
-static gint ett_sparkplugb_namespace = -1;
+static gint ett_sparkplugb;
+static gint ett_sparkplugb_namespace;
 
 /* The handle to the protobuf dissector */
 dissector_handle_t protobuf_handle = NULL;
 
 /* The hf items */
-static int hf_sparkplugb_namespace = -1;
-static int hf_sparkplugb_groupid = -1;
-static int hf_sparkplugb_messagetype = -1;
-static int hf_sparkplugb_edgenodeid = -1;
-static int hf_sparkplugb_deviceid = -1;
+static int hf_sparkplugb_namespace;
+static int hf_sparkplugb_groupid;
+static int hf_sparkplugb_messagetype;
+static int hf_sparkplugb_edgenodeid;
+static int hf_sparkplugb_deviceid;
 
 /* The expert info items */
-static expert_field ei_sparkplugb_missing_groupid = EI_INIT;
-static expert_field ei_sparkplugb_missing_messagetype = EI_INIT;
-static expert_field ei_sparkplugb_missing_edgenodeid = EI_INIT;
+static expert_field ei_sparkplugb_missing_groupid;
+static expert_field ei_sparkplugb_missing_messagetype;
+static expert_field ei_sparkplugb_missing_edgenodeid;
 
 static gboolean
 dissect_sparkplugb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c
index 98eb435d12..6f5e9c0e45 100644
--- a/epan/dissectors/packet-spdy.c
+++ b/epan/dissectors/packet-spdy.c
@@ -180,53 +180,53 @@ typedef struct _spdy_stream_info_t {
 static int spdy_tap = -1;
 static int spdy_eo_tap = -1;
 
-static int proto_spdy = -1;
-static int hf_spdy_data = -1;
-static int hf_spdy_control_bit = -1;
-static int hf_spdy_version = -1;
-static int hf_spdy_type = -1;
-static int hf_spdy_flags = -1;
-static int hf_spdy_flags_fin = -1;
-static int hf_spdy_flags_unidirectional = -1;
-static int hf_spdy_flags_clear_settings = -1;
-static int hf_spdy_flags_persist_value = -1;
-static int hf_spdy_flags_persisted = -1;
-static int hf_spdy_length = -1;
-static int hf_spdy_header_block = -1;
-static int hf_spdy_header = -1;
-static int hf_spdy_header_name = -1;
-static int hf_spdy_header_value = -1;
-static int hf_spdy_streamid = -1;
-static int hf_spdy_associated_streamid = -1;
-static int hf_spdy_priority = -1;
-static int hf_spdy_unused = -1;
-static int hf_spdy_slot = -1;
-static int hf_spdy_num_headers = -1;
-static int hf_spdy_rst_stream_status = -1;
-static int hf_spdy_num_settings = -1;
-static int hf_spdy_setting = -1;
-static int hf_spdy_setting_id = -1;
-static int hf_spdy_setting_value = -1;
-static int hf_spdy_ping_id = -1;
-static int hf_spdy_goaway_last_good_stream_id = -1;
-static int hf_spdy_goaway_status = -1;
-static int hf_spdy_window_update_delta = -1;
-
-static gint ett_spdy = -1;
-static gint ett_spdy_flags = -1;
-static gint ett_spdy_header_block = -1;
-static gint ett_spdy_header = -1;
-static gint ett_spdy_setting = -1;
-
-static gint ett_spdy_encoded_entity = -1;
-
-static expert_field ei_spdy_inflation_failed = EI_INIT;
-static expert_field ei_spdy_mal_frame_data = EI_INIT;
-static expert_field ei_spdy_mal_setting_frame = EI_INIT;
-static expert_field ei_spdy_invalid_rst_stream = EI_INIT;
-static expert_field ei_spdy_invalid_go_away = EI_INIT;
-static expert_field ei_spdy_invalid_frame_type = EI_INIT;
-static expert_field ei_spdy_reassembly_info = EI_INIT;
+static int proto_spdy;
+static int hf_spdy_data;
+static int hf_spdy_control_bit;
+static int hf_spdy_version;
+static int hf_spdy_type;
+static int hf_spdy_flags;
+static int hf_spdy_flags_fin;
+static int hf_spdy_flags_unidirectional;
+static int hf_spdy_flags_clear_settings;
+static int hf_spdy_flags_persist_value;
+static int hf_spdy_flags_persisted;
+static int hf_spdy_length;
+static int hf_spdy_header_block;
+static int hf_spdy_header;
+static int hf_spdy_header_name;
+static int hf_spdy_header_value;
+static int hf_spdy_streamid;
+static int hf_spdy_associated_streamid;
+static int hf_spdy_priority;
+static int hf_spdy_unused;
+static int hf_spdy_slot;
+static int hf_spdy_num_headers;
+static int hf_spdy_rst_stream_status;
+static int hf_spdy_num_settings;
+static int hf_spdy_setting;
+static int hf_spdy_setting_id;
+static int hf_spdy_setting_value;
+static int hf_spdy_ping_id;
+static int hf_spdy_goaway_last_good_stream_id;
+static int hf_spdy_goaway_status;
+static int hf_spdy_window_update_delta;
+
+static gint ett_spdy;
+static gint ett_spdy_flags;
+static gint ett_spdy_header_block;
+static gint ett_spdy_header;
+static gint ett_spdy_setting;
+
+static gint ett_spdy_encoded_entity;
+
+static expert_field ei_spdy_inflation_failed;
+static expert_field ei_spdy_mal_frame_data;
+static expert_field ei_spdy_mal_setting_frame;
+static expert_field ei_spdy_invalid_rst_stream;
+static expert_field ei_spdy_invalid_go_away;
+static expert_field ei_spdy_invalid_frame_type;
+static expert_field ei_spdy_reassembly_info;
 
 static dissector_handle_t media_handle;
 static dissector_handle_t spdy_handle;
diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c
index 22681c11a9..0e1546b3f6 100644
--- a/epan/dissectors/packet-spice.c
+++ b/epan/dissectors/packet-spice.c
@@ -472,338 +472,338 @@ static const value_string spice_sasl_auth_result_vs[] = {
                                        return avail; \
                                    }
 
-static gint ett_spice = -1;
-static gint ett_link_client = -1;
-static gint ett_link_server = -1;
-static gint ett_link_caps = -1;
-static gint ett_data = -1;
-static gint ett_message = -1;
-static gint ett_ticket_client = -1;
-static gint ett_auth_select_client = -1;
-static gint ett_ticket_server = -1;
-static gint ett_playback = -1;
-static gint ett_display_client = -1;
-static gint ett_display_server = -1;
-static gint ett_common_server_message = -1;
-static gint ett_common_client_message = -1;
-static gint ett_point = -1;
-static gint ett_point16 = -1;
-static gint ett_cursor = -1;
-static gint ett_spice_main = -1;
-static gint ett_rect = -1;
-static gint ett_DisplayBase = -1;
-static gint ett_Clip = -1;
-static gint ett_Mask = -1;
-static gint ett_imagedesc = -1;
-static gint ett_imageQuic = -1;
-static gint ett_GLZ_RGB = -1;
-static gint ett_LZ_RGB = -1;
-static gint ett_LZ_PLT = -1;
-static gint ett_ZLIB_GLZ = -1;
-static gint ett_Uncomp_tree = -1;
-static gint ett_LZ_JPEG = -1;
-static gint ett_JPEG = -1;
-static gint ett_cursor_header = -1;
-static gint ett_RedCursor = -1;
-static gint ett_pattern = -1;
-static gint ett_brush = -1;
-static gint ett_Pixmap = -1;
-static gint ett_SpiceHead = -1;
-static gint ett_inputs_client = -1;
-static gint ett_rectlist = -1;
-static gint ett_inputs_server = -1;
-static gint ett_record_client = -1;
-static gint ett_record_server = -1;
-static gint ett_main_client = -1;
-static gint ett_spice_agent = -1;
-static gint ett_cap_tree = -1;
-static int proto_spice = -1;
-static int hf_spice_magic  = -1;
-static int hf_major_version  = -1;
-static int hf_minor_version  = -1;
-static int hf_message_size  = -1;
-static int hf_message_type  = -1;
-static int hf_conn_id  = -1;
-static int hf_channel_type  = -1;
-static int hf_channel_id  = -1;
-static int hf_num_common_caps  = -1;
-static int hf_num_channel_caps  = -1;
-static int hf_caps_offset  = -1;
-static int hf_error_code  = -1;
-static int hf_data = -1;
-static int hf_serial = -1;
-static int hf_data_size = -1;
-static int hf_data_sublist = -1;
-static int hf_link_client = -1;
-static int hf_link_server = -1;
-static int hf_ticket_client = -1;
-static int hf_auth_select_client = -1;
-static int hf_ticket_server = -1;
-static int hf_main_num_channels = -1;
-static int hf_main_cap_semi_migrate = -1;
-static int hf_main_cap_vm_name_uuid = -1;
-static int hf_main_cap_agent_connected_tokens = -1;
-static int hf_main_cap_seamless_migrate = -1;
-static int hf_inputs_cap = -1;
-static int hf_cursor_cap = -1;
-static int hf_common_cap_auth_select = -1;
-static int hf_common_cap_auth_spice = -1;
-static int hf_common_cap_auth_sasl = -1;
-static int hf_common_cap_mini_header = -1;
-static int hf_audio_timestamp = -1;
-static int hf_audio_mode = -1;
-static int hf_audio_channels = -1;
-static int hf_audio_format = -1;
-static int hf_audio_frequency = -1;
-static int hf_audio_volume = -1;
-static int hf_audio_mute = -1;
-static int hf_audio_latency = -1;
-static int hf_red_set_ack_generation = -1;
-static int hf_red_set_ack_window = -1;
-static int hf_Clip_type = -1;
-static int hf_Mask_flag = -1;
-static int hf_display_rop_descriptor = -1;
-static int hf_display_scale_mode = -1;
-static int hf_display_stream_id = -1;
-static int hf_display_stream_report_unique_id = -1;
-static int hf_display_stream_report_max_window_size = -1;
-static int hf_display_stream_report_timeout = -1;
-static int hf_display_stream_width = -1;
-static int hf_display_stream_height = -1;
-static int hf_display_stream_src_width = -1;
-static int hf_display_stream_src_height = -1;
-static int hf_display_stream_data_size = -1;
-static int hf_display_stream_codec_type = -1;
-static int hf_display_stream_stamp = -1;
-static int hf_display_stream_flags = -1;
-static int hf_red_ping_id = -1;
-static int hf_red_timestamp = -1;
-static int hf_spice_display_mode_width = -1;
-static int hf_spice_display_mode_height = -1;
-static int hf_spice_display_mode_depth = -1;
-static int hf_image_desc_id = -1;
-static int hf_image_desc_type = -1;
-static int hf_image_desc_flags = -1;
-static int hf_image_desc_width = -1;
-static int hf_image_desc_height = -1;
-static int hf_quic_width = -1;
-static int hf_quic_height = -1;
-static int hf_quic_major_version  = -1;
-static int hf_quic_minor_version  = -1;
-static int hf_quic_type = -1;
-static int hf_LZ_width = -1;
-static int hf_LZ_height = -1;
-static int hf_LZ_major_version  = -1;
-static int hf_LZ_minor_version  = -1;
-static int hf_LZ_PLT_type = -1;
-static int hf_LZ_RGB_type = -1;
-static int hf_LZ_stride = -1;
-static int hf_LZ_RGB_dict_id = -1;
-static int hf_cursor_trail_len = -1;
-static int hf_cursor_trail_freq = -1;
-static int hf_cursor_trail_visible = -1;
-static int hf_cursor_unique = -1;
-static int hf_cursor_type = -1;
-static int hf_cursor_width = -1;
-static int hf_cursor_height = -1;
-static int hf_cursor_hotspot_x = -1;
-static int hf_cursor_hotspot_y = -1;
-static int hf_cursor_flags = -1;
-static int hf_cursor_id = -1;
-static int hf_spice_display_init_cache_id = -1;
-static int hf_spice_display_init_cache_size = -1;
-static int hf_spice_display_init_glz_dict_id = -1;
-static int hf_spice_display_init_dict_window_size = -1;
-static int hf_brush_type = -1;
-static int hf_brush_rgb = -1;
-static int hf_pixmap_width = -1;
-static int hf_pixmap_height = -1;
-static int hf_pixmap_stride = -1;
-static int hf_pixmap_address = -1;
-static int hf_pixmap_format = -1;
-static int hf_pixmap_flags = -1;
-static int hf_keyboard_modifiers = -1;
-static int hf_keyboard_modifier_scroll_lock = -1;
-static int hf_keyboard_modifier_num_lock = -1;
-static int hf_keyboard_modifier_caps_lock = -1;
-static int hf_keyboard_code = -1;
-static int hf_rectlist_size = -1;
-static int hf_migrate_dest_port = -1;
-static int hf_migrate_dest_sport = -1;
-static int hf_migrate_src_mig_version = -1;
-static int hf_session_id = -1;
-static int hf_display_channels_hint = -1;
-static int hf_supported_mouse_modes = -1;
-static int hf_current_mouse_mode = -1;
-static int hf_supported_mouse_modes_flags = -1;
-static int hf_supported_mouse_modes_flag_client = -1;
-static int hf_supported_mouse_modes_flag_server = -1;
-static int hf_current_mouse_mode_flags = -1;
-static int hf_agent_connected = -1;
-static int hf_agent_tokens = -1;
-static int hf_agent_protocol = -1;
-static int hf_agent_type = -1;
-static int hf_agent_opaque = -1;
-static int hf_agent_size = -1;
-static int hf_agent_token = -1;
-static int hf_agent_clipboard_selection = -1;
-static int hf_agent_clipboard_type = -1;
-static int hf_agent_num_monitors = -1;
-static int hf_agent_monitor_height = -1;
-static int hf_agent_monitor_width = -1;
-static int hf_agent_monitor_depth = -1;
-static int hf_agent_monitor_x = -1;
-static int hf_agent_monitor_y = -1;
-static int hf_multi_media_time = -1;
-static int hf_ram_hint = -1;
-static int hf_button_state = -1;
-static int hf_mouse_display_id = -1;
-static int hf_display_text_fore_mode = -1;
-static int hf_display_text_back_mode = -1;
-static int hf_display_surface_id = -1;
-static int hf_display_surface_width = -1;
-static int hf_display_surface_height = -1;
-static int hf_display_surface_format = -1;
-static int hf_display_surface_flags = -1;
-static int hf_main_client_agent_tokens = -1;
-static int hf_tranparent_src_color = -1;
-static int hf_tranparent_true_color = -1;
-static int hf_spice_sasl_auth_result = -1;
-static int hf_playback_cap_celt_0_5_1 = -1;
-static int hf_playback_cap_volume = -1;
-static int hf_playback_cap_latency = -1;
-static int hf_playback_cap_opus = -1;
-static int hf_record_cap_celt = -1;
-static int hf_record_cap_volume = -1;
-static int hf_record_cap_opus = -1;
-static int hf_display_cap_sized_stream = -1;
-static int hf_display_cap_monitors_config = -1;
-static int hf_display_cap_composite = -1;
-static int hf_display_cap_a8_surface = -1;
-static int hf_display_cap_stream_report = -1;
-static int hf_display_cap_lz4_compression = -1;
-static int hf_display_cap_pref_compression = -1;
-static int hf_display_cap_gl_scanout = -1;
-static int hf_display_cap_multi_codec = -1;
-static int hf_display_cap_codec_mjpeg = -1;
-static int hf_display_cap_codec_vp8 = -1;
-static int hf_display_cap_codec_h264 = -1;
-static int hf_display_cap_pref_video_codec_type = -1;
-static int hf_display_cap_codec_vp9 = -1;
-static int hf_display_cap_codec_h265 = -1;
-static int hf_main_uuid = -1;
-static int hf_main_name = -1;
-static int hf_main_name_len = -1;
-static int hf_display_monitor_config_count = -1;
-static int hf_display_monitor_config_max_allowed = -1;
-static int hf_display_head_id = -1;
-static int hf_display_head_surface_id = -1;
-static int hf_display_head_width = -1;
-static int hf_display_head_height = -1;
-static int hf_display_head_x = -1;
-static int hf_display_head_y = -1;
-static int hf_display_head_flags = -1;
-static int hf_zlib_uncompress_size = -1;
-static int hf_zlib_compress_size = -1;
-static int hf_rect_left = -1;
-static int hf_rect_top = -1;
-static int hf_rect_right = -1;
-static int hf_rect_bottom = -1;
-static int hf_point32_x = -1;
-static int hf_point32_y = -1;
-static int hf_point16_x = -1;
-static int hf_point16_y = -1;
-static int hf_severity = -1;
-static int hf_visibility = -1;
-static int hf_notify_code = -1;
-static int hf_notify_message_len = -1;
-static int hf_notify_message = -1;
-static int hf_num_glyphs = -1;
-static int hf_port_opened = -1;
-static int hf_port_event = -1;
-static int hf_raw_data = -1;
-static int hf_display_inval_list_count = -1;
-static int hf_resource_type = -1;
-static int hf_resource_id = -1;
-static int hf_ref_image = -1;
-static int hf_ref_string = -1;
-static int hf_vd_agent_caps_request = -1;
-static int hf_vd_agent_cap_mouse_state = -1;
-static int hf_vd_agent_cap_monitors_config = -1;
-static int hf_vd_agent_cap_reply = -1;
-static int hf_vd_agent_cap_clipboard = -1;
-static int hf_vd_agent_cap_display_config = -1;
-static int hf_vd_agent_cap_clipboard_by_demand = -1;
-static int hf_vd_agent_cap_clipboard_selection = -1;
-static int hf_vd_agent_cap_sparse_monitors_config = -1;
-static int hf_vd_agent_cap_guest_lineend_lf = -1;
-static int hf_vd_agent_cap_guest_lineend_crlf = -1;
-static int hf_vd_agent_monitors_config_flag_use_pos = -1;
-static int hf_vd_agent_reply_type = -1;
-static int hf_vd_agent_reply_error = -1;
+static gint ett_spice;
+static gint ett_link_client;
+static gint ett_link_server;
+static gint ett_link_caps;
+static gint ett_data;
+static gint ett_message;
+static gint ett_ticket_client;
+static gint ett_auth_select_client;
+static gint ett_ticket_server;
+static gint ett_playback;
+static gint ett_display_client;
+static gint ett_display_server;
+static gint ett_common_server_message;
+static gint ett_common_client_message;
+static gint ett_point;
+static gint ett_point16;
+static gint ett_cursor;
+static gint ett_spice_main;
+static gint ett_rect;
+static gint ett_DisplayBase;
+static gint ett_Clip;
+static gint ett_Mask;
+static gint ett_imagedesc;
+static gint ett_imageQuic;
+static gint ett_GLZ_RGB;
+static gint ett_LZ_RGB;
+static gint ett_LZ_PLT;
+static gint ett_ZLIB_GLZ;
+static gint ett_Uncomp_tree;
+static gint ett_LZ_JPEG;
+static gint ett_JPEG;
+static gint ett_cursor_header;
+static gint ett_RedCursor;
+static gint ett_pattern;
+static gint ett_brush;
+static gint ett_Pixmap;
+static gint ett_SpiceHead;
+static gint ett_inputs_client;
+static gint ett_rectlist;
+static gint ett_inputs_server;
+static gint ett_record_client;
+static gint ett_record_server;
+static gint ett_main_client;
+static gint ett_spice_agent;
+static gint ett_cap_tree;
+static int proto_spice;
+static int hf_spice_magic;
+static int hf_major_version;
+static int hf_minor_version;
+static int hf_message_size;
+static int hf_message_type;
+static int hf_conn_id;
+static int hf_channel_type;
+static int hf_channel_id;
+static int hf_num_common_caps;
+static int hf_num_channel_caps;
+static int hf_caps_offset;
+static int hf_error_code;
+static int hf_data;
+static int hf_serial;
+static int hf_data_size;
+static int hf_data_sublist;
+static int hf_link_client;
+static int hf_link_server;
+static int hf_ticket_client;
+static int hf_auth_select_client;
+static int hf_ticket_server;
+static int hf_main_num_channels;
+static int hf_main_cap_semi_migrate;
+static int hf_main_cap_vm_name_uuid;
+static int hf_main_cap_agent_connected_tokens;
+static int hf_main_cap_seamless_migrate;
+static int hf_inputs_cap;
+static int hf_cursor_cap;
+static int hf_common_cap_auth_select;
+static int hf_common_cap_auth_spice;
+static int hf_common_cap_auth_sasl;
+static int hf_common_cap_mini_header;
+static int hf_audio_timestamp;
+static int hf_audio_mode;
+static int hf_audio_channels;
+static int hf_audio_format;
+static int hf_audio_frequency;
+static int hf_audio_volume;
+static int hf_audio_mute;
+static int hf_audio_latency;
+static int hf_red_set_ack_generation;
+static int hf_red_set_ack_window;
+static int hf_Clip_type;
+static int hf_Mask_flag;
+static int hf_display_rop_descriptor;
+static int hf_display_scale_mode;
+static int hf_display_stream_id;
+static int hf_display_stream_report_unique_id;
+static int hf_display_stream_report_max_window_size;
+static int hf_display_stream_report_timeout;
+static int hf_display_stream_width;
+static int hf_display_stream_height;
+static int hf_display_stream_src_width;
+static int hf_display_stream_src_height;
+static int hf_display_stream_data_size;
+static int hf_display_stream_codec_type;
+static int hf_display_stream_stamp;
+static int hf_display_stream_flags;
+static int hf_red_ping_id;
+static int hf_red_timestamp;
+static int hf_spice_display_mode_width;
+static int hf_spice_display_mode_height;
+static int hf_spice_display_mode_depth;
+static int hf_image_desc_id;
+static int hf_image_desc_type;
+static int hf_image_desc_flags;
+static int hf_image_desc_width;
+static int hf_image_desc_height;
+static int hf_quic_width;
+static int hf_quic_height;
+static int hf_quic_major_version;
+static int hf_quic_minor_version;
+static int hf_quic_type;
+static int hf_LZ_width;
+static int hf_LZ_height;
+static int hf_LZ_major_version;
+static int hf_LZ_minor_version;
+static int hf_LZ_PLT_type;
+static int hf_LZ_RGB_type;
+static int hf_LZ_stride;
+static int hf_LZ_RGB_dict_id;
+static int hf_cursor_trail_len;
+static int hf_cursor_trail_freq;
+static int hf_cursor_trail_visible;
+static int hf_cursor_unique;
+static int hf_cursor_type;
+static int hf_cursor_width;
+static int hf_cursor_height;
+static int hf_cursor_hotspot_x;
+static int hf_cursor_hotspot_y;
+static int hf_cursor_flags;
+static int hf_cursor_id;
+static int hf_spice_display_init_cache_id;
+static int hf_spice_display_init_cache_size;
+static int hf_spice_display_init_glz_dict_id;
+static int hf_spice_display_init_dict_window_size;
+static int hf_brush_type;
+static int hf_brush_rgb;
+static int hf_pixmap_width;
+static int hf_pixmap_height;
+static int hf_pixmap_stride;
+static int hf_pixmap_address;
+static int hf_pixmap_format;
+static int hf_pixmap_flags;
+static int hf_keyboard_modifiers;
+static int hf_keyboard_modifier_scroll_lock;
+static int hf_keyboard_modifier_num_lock;
+static int hf_keyboard_modifier_caps_lock;
+static int hf_keyboard_code;
+static int hf_rectlist_size;
+static int hf_migrate_dest_port;
+static int hf_migrate_dest_sport;
+static int hf_migrate_src_mig_version;
+static int hf_session_id;
+static int hf_display_channels_hint;
+static int hf_supported_mouse_modes;
+static int hf_current_mouse_mode;
+static int hf_supported_mouse_modes_flags;
+static int hf_supported_mouse_modes_flag_client;
+static int hf_supported_mouse_modes_flag_server;
+static int hf_current_mouse_mode_flags;
+static int hf_agent_connected;
+static int hf_agent_tokens;
+static int hf_agent_protocol;
+static int hf_agent_type;
+static int hf_agent_opaque;
+static int hf_agent_size;
+static int hf_agent_token;
+static int hf_agent_clipboard_selection;
+static int hf_agent_clipboard_type;
+static int hf_agent_num_monitors;
+static int hf_agent_monitor_height;
+static int hf_agent_monitor_width;
+static int hf_agent_monitor_depth;
+static int hf_agent_monitor_x;
+static int hf_agent_monitor_y;
+static int hf_multi_media_time;
+static int hf_ram_hint;
+static int hf_button_state;
+static int hf_mouse_display_id;
+static int hf_display_text_fore_mode;
+static int hf_display_text_back_mode;
+static int hf_display_surface_id;
+static int hf_display_surface_width;
+static int hf_display_surface_height;
+static int hf_display_surface_format;
+static int hf_display_surface_flags;
+static int hf_main_client_agent_tokens;
+static int hf_tranparent_src_color;
+static int hf_tranparent_true_color;
+static int hf_spice_sasl_auth_result;
+static int hf_playback_cap_celt_0_5_1;
+static int hf_playback_cap_volume;
+static int hf_playback_cap_latency;
+static int hf_playback_cap_opus;
+static int hf_record_cap_celt;
+static int hf_record_cap_volume;
+static int hf_record_cap_opus;
+static int hf_display_cap_sized_stream;
+static int hf_display_cap_monitors_config;
+static int hf_display_cap_composite;
+static int hf_display_cap_a8_surface;
+static int hf_display_cap_stream_report;
+static int hf_display_cap_lz4_compression;
+static int hf_display_cap_pref_compression;
+static int hf_display_cap_gl_scanout;
+static int hf_display_cap_multi_codec;
+static int hf_display_cap_codec_mjpeg;
+static int hf_display_cap_codec_vp8;
+static int hf_display_cap_codec_h264;
+static int hf_display_cap_pref_video_codec_type;
+static int hf_display_cap_codec_vp9;
+static int hf_display_cap_codec_h265;
+static int hf_main_uuid;
+static int hf_main_name;
+static int hf_main_name_len;
+static int hf_display_monitor_config_count;
+static int hf_display_monitor_config_max_allowed;
+static int hf_display_head_id;
+static int hf_display_head_surface_id;
+static int hf_display_head_width;
+static int hf_display_head_height;
+static int hf_display_head_x;
+static int hf_display_head_y;
+static int hf_display_head_flags;
+static int hf_zlib_uncompress_size;
+static int hf_zlib_compress_size;
+static int hf_rect_left;
+static int hf_rect_top;
+static int hf_rect_right;
+static int hf_rect_bottom;
+static int hf_point32_x;
+static int hf_point32_y;
+static int hf_point16_x;
+static int hf_point16_y;
+static int hf_severity;
+static int hf_visibility;
+static int hf_notify_code;
+static int hf_notify_message_len;
+static int hf_notify_message;
+static int hf_num_glyphs;
+static int hf_port_opened;
+static int hf_port_event;
+static int hf_raw_data;
+static int hf_display_inval_list_count;
+static int hf_resource_type;
+static int hf_resource_id;
+static int hf_ref_image;
+static int hf_ref_string;
+static int hf_vd_agent_caps_request;
+static int hf_vd_agent_cap_mouse_state;
+static int hf_vd_agent_cap_monitors_config;
+static int hf_vd_agent_cap_reply;
+static int hf_vd_agent_cap_clipboard;
+static int hf_vd_agent_cap_display_config;
+static int hf_vd_agent_cap_clipboard_by_demand;
+static int hf_vd_agent_cap_clipboard_selection;
+static int hf_vd_agent_cap_sparse_monitors_config;
+static int hf_vd_agent_cap_guest_lineend_lf;
+static int hf_vd_agent_cap_guest_lineend_crlf;
+static int hf_vd_agent_monitors_config_flag_use_pos;
+static int hf_vd_agent_reply_type;
+static int hf_vd_agent_reply_error;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_spice_supported_authentication_mechanisms_list = -1;
-static int hf_spice_selected_client_out_mechanism = -1;
-static int hf_spice_scale_mode = -1;
-static int hf_spice_supported_authentication_mechanisms_list_length = -1;
-static int hf_spice_rop3 = -1;
-static int hf_spice_x509_subjectpublickeyinfo = -1;
-static int hf_spice_glz_rgb_image_size = -1;
-static int hf_spice_vd_agent_display_config_message = -1;
-static int hf_spice_stream_data = -1;
-static int hf_spice_client_out_mechanism_length = -1;
-static int hf_spice_vd_agent_clipboard_message = -1;
-static int hf_spice_image_from_cache = -1;
-static int hf_spice_lz_rgb_compressed_image_data = -1;
-static int hf_spice_unknown_bytes = -1;
-static int hf_spice_sasl_data = -1;
-static int hf_spice_name_length = -1;
-static int hf_spice_zlib_stream = -1;
-static int hf_spice_lz_plt_image_size = -1;
-static int hf_spice_reserved = -1;
-static int hf_spice_sasl_authentication_data = -1;
-static int hf_spice_image_from_cache_lossless = -1;
-static int hf_spice_quic_magic = -1;
-static int hf_spice_surface_id = -1;
-static int hf_spice_ping_data = -1;
-static int hf_spice_display_mark_message = -1;
-static int hf_spice_pixmap_pixels = -1;
-static int hf_spice_vd_agent_clipboard_release_message = -1;
-static int hf_spice_clientout_list = -1;
-static int hf_spice_server_inputs_mouse_motion_ack_message = -1;
-static int hf_spice_cursor_data = -1;
-static int hf_spice_clientout_length = -1;
-static int hf_spice_lz_magic = -1;
-static int hf_spice_lz_rgb_image_size = -1;
-static int hf_spice_lz_plt_data = -1;
-static int hf_spice_glyph_flags = -1;
-static int hf_spice_palette_offset = -1;
+static int hf_spice_supported_authentication_mechanisms_list;
+static int hf_spice_selected_client_out_mechanism;
+static int hf_spice_scale_mode;
+static int hf_spice_supported_authentication_mechanisms_list_length;
+static int hf_spice_rop3;
+static int hf_spice_x509_subjectpublickeyinfo;
+static int hf_spice_glz_rgb_image_size;
+static int hf_spice_vd_agent_display_config_message;
+static int hf_spice_stream_data;
+static int hf_spice_client_out_mechanism_length;
+static int hf_spice_vd_agent_clipboard_message;
+static int hf_spice_image_from_cache;
+static int hf_spice_lz_rgb_compressed_image_data;
+static int hf_spice_unknown_bytes;
+static int hf_spice_sasl_data;
+static int hf_spice_name_length;
+static int hf_spice_zlib_stream;
+static int hf_spice_lz_plt_image_size;
+static int hf_spice_reserved;
+static int hf_spice_sasl_authentication_data;
+static int hf_spice_image_from_cache_lossless;
+static int hf_spice_quic_magic;
+static int hf_spice_surface_id;
+static int hf_spice_ping_data;
+static int hf_spice_display_mark_message;
+static int hf_spice_pixmap_pixels;
+static int hf_spice_vd_agent_clipboard_release_message;
+static int hf_spice_clientout_list;
+static int hf_spice_server_inputs_mouse_motion_ack_message;
+static int hf_spice_cursor_data;
+static int hf_spice_clientout_length;
+static int hf_spice_lz_magic;
+static int hf_spice_lz_rgb_image_size;
+static int hf_spice_lz_plt_data;
+static int hf_spice_glyph_flags;
+static int hf_spice_palette_offset;
 #if 0
-static int hf_spice_lz_jpeg_image_size = -1;
+static int hf_spice_lz_jpeg_image_size;
 #endif
-static int hf_spice_palette = -1;
-static int hf_spice_selected_authentication_mechanism_length = -1;
-static int hf_spice_display_reset_message = -1;
-static int hf_spice_topdown_flag = -1;
-static int hf_spice_quic_image_size = -1;
-static int hf_spice_sasl_message_length = -1;
-static int hf_spice_selected_authentication_mechanism = -1;
-static int hf_spice_lz_plt_flag = -1;
-static int hf_spice_quic_compressed_image_data = -1;
-
-static expert_field ei_spice_decompress_error = EI_INIT;
-static expert_field ei_spice_unknown_message = EI_INIT;
-static expert_field ei_spice_not_dissected = EI_INIT;
-static expert_field ei_spice_auth_unknown = EI_INIT;
-static expert_field ei_spice_sasl_auth_result = EI_INIT;
-static expert_field ei_spice_expected_from_client = EI_INIT;
+static int hf_spice_palette;
+static int hf_spice_selected_authentication_mechanism_length;
+static int hf_spice_display_reset_message;
+static int hf_spice_topdown_flag;
+static int hf_spice_quic_image_size;
+static int hf_spice_sasl_message_length;
+static int hf_spice_selected_authentication_mechanism;
+static int hf_spice_lz_plt_flag;
+static int hf_spice_quic_compressed_image_data;
+
+static expert_field ei_spice_decompress_error;
+static expert_field ei_spice_unknown_message;
+static expert_field ei_spice_not_dissected;
+static expert_field ei_spice_auth_unknown;
+static expert_field ei_spice_sasl_auth_result;
+static expert_field ei_spice_expected_from_client;
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_spice_brush_type = EI_INIT;
-static expert_field ei_spice_unknown_image_type = EI_INIT;
-static expert_field ei_spice_Mask_flag = EI_INIT;
-static expert_field ei_spice_Mask_point = EI_INIT;
-static expert_field ei_spice_common_cap_unknown = EI_INIT;
-static expert_field ei_spice_unknown_channel = EI_INIT;
+static expert_field ei_spice_brush_type;
+static expert_field ei_spice_unknown_image_type;
+static expert_field ei_spice_Mask_flag;
+static expert_field ei_spice_Mask_point;
+static expert_field ei_spice_common_cap_unknown;
+static expert_field ei_spice_unknown_channel;
 
 
 static dissector_handle_t jpeg_handle;
diff --git a/epan/dissectors/packet-spp.c b/epan/dissectors/packet-spp.c
index 01b49f2c58..b62e86cb88 100644
--- a/epan/dissectors/packet-spp.c
+++ b/epan/dissectors/packet-spp.c
@@ -18,22 +18,22 @@ void proto_register_spp(void);
 void proto_reg_handoff_spp(void);
 static dissector_handle_t spp_handle;
 
-static int proto_spp = -1;
-static int hf_spp_connection_control = -1;
-static int hf_spp_connection_control_sys = -1;
-static int hf_spp_connection_control_send_ack = -1;
-static int hf_spp_connection_control_attn = -1;
-static int hf_spp_connection_control_eom = -1;
-static int hf_spp_datastream_type = -1;
-static int hf_spp_src_id = -1;
-static int hf_spp_dst_id = -1;
-static int hf_spp_seq_nr = -1;
-static int hf_spp_ack_nr = -1;
-static int hf_spp_all_nr = -1;
-/* static int hf_spp_rexmt_frame = -1; */
-
-static gint ett_spp = -1;
-static gint ett_spp_connctrl = -1;
+static int proto_spp;
+static int hf_spp_connection_control;
+static int hf_spp_connection_control_sys;
+static int hf_spp_connection_control_send_ack;
+static int hf_spp_connection_control_attn;
+static int hf_spp_connection_control_eom;
+static int hf_spp_datastream_type;
+static int hf_spp_src_id;
+static int hf_spp_dst_id;
+static int hf_spp_seq_nr;
+static int hf_spp_ack_nr;
+static int hf_spp_all_nr;
+/* static int hf_spp_rexmt_frame; */
+
+static gint ett_spp;
+static gint ett_spp_connctrl;
 
 static dissector_table_t spp_socket_dissector_table;
 
diff --git a/epan/dissectors/packet-spray.c b/epan/dissectors/packet-spray.c
index 6ee028c366..b73a7b454b 100644
--- a/epan/dissectors/packet-spray.c
+++ b/epan/dissectors/packet-spray.c
@@ -15,16 +15,16 @@
 void proto_register_spray(void);
 void proto_reg_handoff_spray(void);
 
-static int proto_spray = -1;
-static int hf_spray_procedure_v1 = -1;
-static int hf_spray_sprayarr = -1;
-static int hf_spray_counter = -1;
-static int hf_spray_clock = -1;
-static int hf_spray_sec = -1;
-static int hf_spray_usec = -1;
-
-static gint ett_spray = -1;
-static gint ett_spray_clock = -1;
+static int proto_spray;
+static int hf_spray_procedure_v1;
+static int hf_spray_sprayarr;
+static int hf_spray_counter;
+static int hf_spray_clock;
+static int hf_spray_sec;
+static int hf_spray_usec;
+
+static gint ett_spray;
+static gint ett_spray_clock;
 
 #define PACKET_SPRAY_H
 
diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c
index 300461fda7..afd2f026e0 100644
--- a/epan/dissectors/packet-sprt.c
+++ b/epan/dissectors/packet-sprt.c
@@ -295,175 +295,175 @@ struct _sprt_conversation_info
 
 
 /* Initialize the protocol & registered fields */
-static int proto_sprt =                         -1;
-
-static int hf_sprt_setup =                      -1;
-static int hf_sprt_setup_frame =                -1;
-static int hf_sprt_setup_method =               -1;
-
-static int hf_sprt_header_extension_bit =       -1;
-static int hf_sprt_subsession_id =              -1;
-static int hf_sprt_reserved_bit =               -1;
-static int hf_sprt_payload_type =               -1;
-static int hf_sprt_transport_channel_id =       -1;
-static int hf_sprt_sequence_number =            -1;
-static int hf_sprt_number_of_ack_fields =       -1;
-static int hf_sprt_base_sequence_number =       -1;
-static int hf_sprt_ack_field_items =            -1;
-static int hf_sprt_transport_channel_item =     -1;
-static int hf_sprt_sequence_item =              -1;
-
-static int hf_sprt_payload_length =             -1;
-static int hf_sprt_payload_no_data =            -1;
-static int hf_sprt_payload_reserved_bit =       -1;
-static int hf_sprt_payload_message_id =         -1;
-
-static int hf_sprt_payload_data =               -1; /* stuff after msgid */
+static int proto_sprt;
+
+static int hf_sprt_setup;
+static int hf_sprt_setup_frame;
+static int hf_sprt_setup_method;
+
+static int hf_sprt_header_extension_bit;
+static int hf_sprt_subsession_id;
+static int hf_sprt_reserved_bit;
+static int hf_sprt_payload_type;
+static int hf_sprt_transport_channel_id;
+static int hf_sprt_sequence_number;
+static int hf_sprt_number_of_ack_fields;
+static int hf_sprt_base_sequence_number;
+static int hf_sprt_ack_field_items;
+static int hf_sprt_transport_channel_item;
+static int hf_sprt_sequence_item;
+
+static int hf_sprt_payload_length;
+static int hf_sprt_payload_no_data;
+static int hf_sprt_payload_reserved_bit;
+static int hf_sprt_payload_message_id;
+
+static int hf_sprt_payload_data; /* stuff after msgid */
 /* INIT msg: */
-static int hf_sprt_payload_msg_init_all_fields =                    -1;
-static int hf_sprt_payload_msg_init_necrxch =                       -1;
-static int hf_sprt_payload_msg_init_ecrxch =                        -1;
-static int hf_sprt_payload_msg_init_xid_prof_exch =                 -1;
-static int hf_sprt_payload_msg_init_assym_data_types =              -1;
-static int hf_sprt_payload_msg_init_opt_moip_types_i_raw_bit =      -1;
-static int hf_sprt_payload_msg_init_opt_moip_types_i_frame =        -1;
-static int hf_sprt_payload_msg_init_opt_moip_types_i_char_stat =    -1;
-static int hf_sprt_payload_msg_init_opt_moip_types_i_char_dyn =     -1;
-static int hf_sprt_payload_msg_init_opt_moip_types_i_octet_cs =     -1;
-static int hf_sprt_payload_msg_init_opt_moip_types_i_char_stat_cs = -1;
-static int hf_sprt_payload_msg_init_opt_moip_types_i_char_dyn_cs =  -1;
-static int hf_sprt_payload_msg_init_opt_moip_types_reserved =       -1;
+static int hf_sprt_payload_msg_init_all_fields;
+static int hf_sprt_payload_msg_init_necrxch;
+static int hf_sprt_payload_msg_init_ecrxch;
+static int hf_sprt_payload_msg_init_xid_prof_exch;
+static int hf_sprt_payload_msg_init_assym_data_types;
+static int hf_sprt_payload_msg_init_opt_moip_types_i_raw_bit;
+static int hf_sprt_payload_msg_init_opt_moip_types_i_frame;
+static int hf_sprt_payload_msg_init_opt_moip_types_i_char_stat;
+static int hf_sprt_payload_msg_init_opt_moip_types_i_char_dyn;
+static int hf_sprt_payload_msg_init_opt_moip_types_i_octet_cs;
+static int hf_sprt_payload_msg_init_opt_moip_types_i_char_stat_cs;
+static int hf_sprt_payload_msg_init_opt_moip_types_i_char_dyn_cs;
+static int hf_sprt_payload_msg_init_opt_moip_types_reserved;
 /* XID_XCHG message: */
-static int hf_sprt_payload_msg_xidxchg_ecp =                                    -1;
-static int hf_sprt_payload_msg_xidxchg_xidlr1_v42bis =                          -1;
-static int hf_sprt_payload_msg_xidxchg_xidlr1_v44 =                             -1;
-static int hf_sprt_payload_msg_xidxchg_xidlr1_mnp5 =                            -1;
-static int hf_sprt_payload_msg_xidxchg_xidlr1_reserved =                        -1;
-static int hf_sprt_payload_msg_xidxchg_xidlr2_v42bis_compr_req =                -1;
-static int hf_sprt_payload_msg_xidxchg_xidlr3and4_v42bis_num_codewords =        -1;
-static int hf_sprt_payload_msg_xidxchg_xidlr5_v42bis_max_strlen =               -1;
-static int hf_sprt_payload_msg_xidxchg_xidlr6_v44_capability =                  -1;
-static int hf_sprt_payload_msg_xidxchg_xidlr7_v44_compr_req =                   -1;
-static int hf_sprt_payload_msg_xidxchg_xidlr8and9_v44_num_codewords_trans =     -1;
-static int hf_sprt_payload_msg_xidxchg_xidlr10and11_v44_num_codewords_recv =    -1;
-static int hf_sprt_payload_msg_xidxchg_xidlr12_v44_max_strlen_trans =           -1;
-static int hf_sprt_payload_msg_xidxchg_xidlr13_v44_max_strlen_recv =            -1;
-static int hf_sprt_payload_msg_xidxchg_xidlr14and15_v44_history_len_trans =     -1;
-static int hf_sprt_payload_msg_xidxchg_xidlr16and17_v44_history_len_recv =      -1;
+static int hf_sprt_payload_msg_xidxchg_ecp;
+static int hf_sprt_payload_msg_xidxchg_xidlr1_v42bis;
+static int hf_sprt_payload_msg_xidxchg_xidlr1_v44;
+static int hf_sprt_payload_msg_xidxchg_xidlr1_mnp5;
+static int hf_sprt_payload_msg_xidxchg_xidlr1_reserved;
+static int hf_sprt_payload_msg_xidxchg_xidlr2_v42bis_compr_req;
+static int hf_sprt_payload_msg_xidxchg_xidlr3and4_v42bis_num_codewords;
+static int hf_sprt_payload_msg_xidxchg_xidlr5_v42bis_max_strlen;
+static int hf_sprt_payload_msg_xidxchg_xidlr6_v44_capability;
+static int hf_sprt_payload_msg_xidxchg_xidlr7_v44_compr_req;
+static int hf_sprt_payload_msg_xidxchg_xidlr8and9_v44_num_codewords_trans;
+static int hf_sprt_payload_msg_xidxchg_xidlr10and11_v44_num_codewords_recv;
+static int hf_sprt_payload_msg_xidxchg_xidlr12_v44_max_strlen_trans;
+static int hf_sprt_payload_msg_xidxchg_xidlr13_v44_max_strlen_recv;
+static int hf_sprt_payload_msg_xidxchg_xidlr14and15_v44_history_len_trans;
+static int hf_sprt_payload_msg_xidxchg_xidlr16and17_v44_history_len_recv;
 /* V.8 JM_INFO msg: */
-static int hf_sprt_payload_msg_jminfo_category_data =           -1;
-static int hf_sprt_payload_msg_jminfo_category_id =             -1;
-static int hf_sprt_payload_msg_jminfo_category_ext_info =       -1;
-static int hf_sprt_payload_msg_jminfo_unk_category_info =       -1;
-static int hf_sprt_payload_msg_jminfo_category_leftover_bits =  -1;
-static int hf_sprt_payload_msg_jminfo_call_function =           -1;
-static int hf_sprt_payload_msg_jminfo_mod_v34_duplex =          -1;
-static int hf_sprt_payload_msg_jminfo_mod_v34_half_duplex =     -1;
-static int hf_sprt_payload_msg_jminfo_mod_v32bis_v32 =          -1;
-static int hf_sprt_payload_msg_jminfo_mod_v22bis_v22 =          -1;
-static int hf_sprt_payload_msg_jminfo_mod_v17 =                 -1;
-static int hf_sprt_payload_msg_jminfo_mod_v29_half_duplex =     -1;
-static int hf_sprt_payload_msg_jminfo_mod_v27ter =              -1;
-static int hf_sprt_payload_msg_jminfo_mod_v26ter =              -1;
-static int hf_sprt_payload_msg_jminfo_mod_v26bis =              -1;
-static int hf_sprt_payload_msg_jminfo_mod_v23_duplex =          -1;
-static int hf_sprt_payload_msg_jminfo_mod_v23_half_duplex =     -1;
-static int hf_sprt_payload_msg_jminfo_mod_v21 =                 -1;
-static int hf_sprt_payload_msg_jminfo_protocols =               -1;
-static int hf_sprt_payload_msg_jminfo_pstn_access_call_dce_cell =       -1;
-static int hf_sprt_payload_msg_jminfo_pstn_access_answ_dce_cell =       -1;
-static int hf_sprt_payload_msg_jminfo_pstn_access_dce_on_digital_net =  -1;
-static int hf_sprt_payload_msg_jminfo_pcm_modem_avail_v90_v92_analog =  -1;
-static int hf_sprt_payload_msg_jminfo_pcm_modem_avail_v90_v92_digital = -1;
-static int hf_sprt_payload_msg_jminfo_pcm_modem_avail_v91 =             -1;
+static int hf_sprt_payload_msg_jminfo_category_data;
+static int hf_sprt_payload_msg_jminfo_category_id;
+static int hf_sprt_payload_msg_jminfo_category_ext_info;
+static int hf_sprt_payload_msg_jminfo_unk_category_info;
+static int hf_sprt_payload_msg_jminfo_category_leftover_bits;
+static int hf_sprt_payload_msg_jminfo_call_function;
+static int hf_sprt_payload_msg_jminfo_mod_v34_duplex;
+static int hf_sprt_payload_msg_jminfo_mod_v34_half_duplex;
+static int hf_sprt_payload_msg_jminfo_mod_v32bis_v32;
+static int hf_sprt_payload_msg_jminfo_mod_v22bis_v22;
+static int hf_sprt_payload_msg_jminfo_mod_v17;
+static int hf_sprt_payload_msg_jminfo_mod_v29_half_duplex;
+static int hf_sprt_payload_msg_jminfo_mod_v27ter;
+static int hf_sprt_payload_msg_jminfo_mod_v26ter;
+static int hf_sprt_payload_msg_jminfo_mod_v26bis;
+static int hf_sprt_payload_msg_jminfo_mod_v23_duplex;
+static int hf_sprt_payload_msg_jminfo_mod_v23_half_duplex;
+static int hf_sprt_payload_msg_jminfo_mod_v21;
+static int hf_sprt_payload_msg_jminfo_protocols;
+static int hf_sprt_payload_msg_jminfo_pstn_access_call_dce_cell;
+static int hf_sprt_payload_msg_jminfo_pstn_access_answ_dce_cell;
+static int hf_sprt_payload_msg_jminfo_pstn_access_dce_on_digital_net;
+static int hf_sprt_payload_msg_jminfo_pcm_modem_avail_v90_v92_analog;
+static int hf_sprt_payload_msg_jminfo_pcm_modem_avail_v90_v92_digital;
+static int hf_sprt_payload_msg_jminfo_pcm_modem_avail_v91;
 /* CONNECT msg: */
-static int hf_sprt_payload_msg_connect_selmod =                         -1;
-static int hf_sprt_payload_msg_connect_compr_dir =                      -1;
-static int hf_sprt_payload_msg_connect_selected_compr =                 -1;
-static int hf_sprt_payload_msg_connect_selected_err_corr =              -1;
-static int hf_sprt_payload_msg_connect_tdsr =                           -1;
-static int hf_sprt_payload_msg_connect_rdsr =                           -1;
-static int hf_sprt_payload_msg_connect_dlci_enabled =                   -1;
-static int hf_sprt_payload_msg_connect_avail_data_types =               -1;
-static int hf_sprt_payload_msg_connect_adt_octet_no_format_no_dlci =    -1;
-static int hf_sprt_payload_msg_connect_adt_i_raw_bit =                  -1;
-static int hf_sprt_payload_msg_connect_adt_i_frame =                    -1;
-static int hf_sprt_payload_msg_connect_adt_i_char_stat =                -1;
-static int hf_sprt_payload_msg_connect_adt_i_char_dyn =                 -1;
-static int hf_sprt_payload_msg_connect_adt_i_octet_cs =                 -1;
-static int hf_sprt_payload_msg_connect_adt_i_char_stat_cs =             -1;
-static int hf_sprt_payload_msg_connect_adt_i_char_dyn_cs =              -1;
-static int hf_sprt_payload_msg_connect_adt_reserved =                   -1;
-static int hf_sprt_payload_msg_connect_compr_trans_dict_sz =            -1;
-static int hf_sprt_payload_msg_connect_compr_recv_dict_sz =             -1;
-static int hf_sprt_payload_msg_connect_compr_trans_str_len =            -1;
-static int hf_sprt_payload_msg_connect_compr_recv_str_len =             -1;
-static int hf_sprt_payload_msg_connect_compr_trans_hist_sz =            -1;
-static int hf_sprt_payload_msg_connect_compr_recv_hist_sz =             -1;
+static int hf_sprt_payload_msg_connect_selmod;
+static int hf_sprt_payload_msg_connect_compr_dir;
+static int hf_sprt_payload_msg_connect_selected_compr;
+static int hf_sprt_payload_msg_connect_selected_err_corr;
+static int hf_sprt_payload_msg_connect_tdsr;
+static int hf_sprt_payload_msg_connect_rdsr;
+static int hf_sprt_payload_msg_connect_dlci_enabled;
+static int hf_sprt_payload_msg_connect_avail_data_types;
+static int hf_sprt_payload_msg_connect_adt_octet_no_format_no_dlci;
+static int hf_sprt_payload_msg_connect_adt_i_raw_bit;
+static int hf_sprt_payload_msg_connect_adt_i_frame;
+static int hf_sprt_payload_msg_connect_adt_i_char_stat;
+static int hf_sprt_payload_msg_connect_adt_i_char_dyn;
+static int hf_sprt_payload_msg_connect_adt_i_octet_cs;
+static int hf_sprt_payload_msg_connect_adt_i_char_stat_cs;
+static int hf_sprt_payload_msg_connect_adt_i_char_dyn_cs;
+static int hf_sprt_payload_msg_connect_adt_reserved;
+static int hf_sprt_payload_msg_connect_compr_trans_dict_sz;
+static int hf_sprt_payload_msg_connect_compr_recv_dict_sz;
+static int hf_sprt_payload_msg_connect_compr_trans_str_len;
+static int hf_sprt_payload_msg_connect_compr_recv_str_len;
+static int hf_sprt_payload_msg_connect_compr_trans_hist_sz;
+static int hf_sprt_payload_msg_connect_compr_recv_hist_sz;
 /* BREAK msg: */
-static int hf_sprt_payload_msg_break_source_proto =     -1;
-static int hf_sprt_payload_msg_break_type =             -1;
-static int hf_sprt_payload_msg_break_length =           -1;
+static int hf_sprt_payload_msg_break_source_proto;
+static int hf_sprt_payload_msg_break_type;
+static int hf_sprt_payload_msg_break_length;
 /* MR_EVENT msg: */
-static int hf_sprt_payload_msg_mr_event_id =            -1;
-static int hf_sprt_payload_msg_mr_evt_reason_code =     -1;
-static int hf_sprt_payload_msg_mr_evt_selmod =          -1;
-static int hf_sprt_payload_msg_mr_evt_txsen =           -1;
-static int hf_sprt_payload_msg_mr_evt_rxsen =           -1;
-static int hf_sprt_payload_msg_mr_evt_tdsr =            -1;
-static int hf_sprt_payload_msg_mr_evt_rdsr =            -1;
-static int hf_sprt_payload_msg_mr_evt_txsr =            -1;
-static int hf_sprt_payload_msg_mr_evt_rxsr =            -1;
+static int hf_sprt_payload_msg_mr_event_id;
+static int hf_sprt_payload_msg_mr_evt_reason_code;
+static int hf_sprt_payload_msg_mr_evt_selmod;
+static int hf_sprt_payload_msg_mr_evt_txsen;
+static int hf_sprt_payload_msg_mr_evt_rxsen;
+static int hf_sprt_payload_msg_mr_evt_tdsr;
+static int hf_sprt_payload_msg_mr_evt_rdsr;
+static int hf_sprt_payload_msg_mr_evt_txsr;
+static int hf_sprt_payload_msg_mr_evt_rxsr;
 /* CLEARDOWN msg: */
-static int hf_sprt_payload_msg_cleardown_reason_code =  -1;
-static int hf_sprt_payload_msg_cleardown_vendor_tag =   -1;
-static int hf_sprt_payload_msg_cleardown_vendor_info =  -1;
+static int hf_sprt_payload_msg_cleardown_reason_code;
+static int hf_sprt_payload_msg_cleardown_vendor_tag;
+static int hf_sprt_payload_msg_cleardown_vendor_info;
 /* PROF_XCHG msg: */
-static int hf_sprt_payload_msg_profxchg_v42_lapm =                              -1;
-static int hf_sprt_payload_msg_profxchg_annex_av42 =                            -1;
-static int hf_sprt_payload_msg_profxchg_v44_compr =                             -1;
-static int hf_sprt_payload_msg_profxchg_v42bis_compr =                          -1;
-static int hf_sprt_payload_msg_profxchg_mnp5_compr =                            -1;
-static int hf_sprt_payload_msg_profxchg_reserved =                              -1;
-static int hf_sprt_payload_msg_profxchg_xidlr2_v42bis_compr_req =               -1;
-static int hf_sprt_payload_msg_profxchg_xidlr3and4_v42bis_num_codewords =       -1;
-static int hf_sprt_payload_msg_profxchg_xidlr5_v42bis_max_strlen =              -1;
-static int hf_sprt_payload_msg_profxchg_xidlr6_v44_capability =                 -1;
-static int hf_sprt_payload_msg_profxchg_xidlr7_v44_compr_req =                  -1;
-static int hf_sprt_payload_msg_profxchg_xidlr8and9_v44_num_codewords_trans =    -1;
-static int hf_sprt_payload_msg_profxchg_xidlr10and11_v44_num_codewords_recv =   -1;
-static int hf_sprt_payload_msg_profxchg_xidlr12_v44_max_strlen_trans =          -1;
-static int hf_sprt_payload_msg_profxchg_xidlr13_v44_max_strlen_recv =           -1;
-static int hf_sprt_payload_msg_profxchg_xidlr14and15_v44_history_len_trans =    -1;
-static int hf_sprt_payload_msg_profxchg_xidlr16and17_v44_history_len_recv =     -1;
+static int hf_sprt_payload_msg_profxchg_v42_lapm;
+static int hf_sprt_payload_msg_profxchg_annex_av42;
+static int hf_sprt_payload_msg_profxchg_v44_compr;
+static int hf_sprt_payload_msg_profxchg_v42bis_compr;
+static int hf_sprt_payload_msg_profxchg_mnp5_compr;
+static int hf_sprt_payload_msg_profxchg_reserved;
+static int hf_sprt_payload_msg_profxchg_xidlr2_v42bis_compr_req;
+static int hf_sprt_payload_msg_profxchg_xidlr3and4_v42bis_num_codewords;
+static int hf_sprt_payload_msg_profxchg_xidlr5_v42bis_max_strlen;
+static int hf_sprt_payload_msg_profxchg_xidlr6_v44_capability;
+static int hf_sprt_payload_msg_profxchg_xidlr7_v44_compr_req;
+static int hf_sprt_payload_msg_profxchg_xidlr8and9_v44_num_codewords_trans;
+static int hf_sprt_payload_msg_profxchg_xidlr10and11_v44_num_codewords_recv;
+static int hf_sprt_payload_msg_profxchg_xidlr12_v44_max_strlen_trans;
+static int hf_sprt_payload_msg_profxchg_xidlr13_v44_max_strlen_recv;
+static int hf_sprt_payload_msg_profxchg_xidlr14and15_v44_history_len_trans;
+static int hf_sprt_payload_msg_profxchg_xidlr16and17_v44_history_len_recv;
 /* I_OCTET */
-static int hf_sprt_payload_i_octet_no_dlci =                                    -1;
-static int hf_sprt_payload_i_octet_dlci_presence_unknown =                      -1;
-static int hf_sprt_payload_i_octet_dlci1 =                                      -1;
-static int hf_sprt_payload_i_octet_cr =                                         -1;
-static int hf_sprt_payload_i_octet_ea =                                         -1;
-static int hf_sprt_payload_i_octet_dlci2 =                                      -1;
-static int hf_sprt_payload_i_octet_dlci_setup_by_connect_frame =                -1;
+static int hf_sprt_payload_i_octet_no_dlci;
+static int hf_sprt_payload_i_octet_dlci_presence_unknown;
+static int hf_sprt_payload_i_octet_dlci1;
+static int hf_sprt_payload_i_octet_cr;
+static int hf_sprt_payload_i_octet_ea;
+static int hf_sprt_payload_i_octet_dlci2;
+static int hf_sprt_payload_i_octet_dlci_setup_by_connect_frame;
 
 /* I_OCTET_CS, I_CHAR_STAT_CS, I_CHAR_DYN_CS msgs: */
-static int hf_sprt_payload_data_cs =                                            -1;
-static int hf_sprt_payload_data_reserved_bit =                                  -1;
-static int hf_sprt_payload_data_num_data_bits =                                 -1;
-static int hf_sprt_payload_data_parity_type =                                   -1;
-static int hf_sprt_payload_num_stop_bits =                                      -1;
-static int hf_sprt_payload_frame_reserved_bits =                                -1;
-static int hf_sprt_payload_frame_state =                                        -1;
-static int hf_sprt_payload_rawoctet_n_field_present =                           -1;
-static int hf_sprt_payload_rawoctet_l =                                         -1;
-static int hf_sprt_payload_rawoctet_n =                                         -1;
-static int hf_sprt_payload_rawbit_included_fields_l =                           -1;
-static int hf_sprt_payload_rawbit_included_fields_lp =                          -1;
-static int hf_sprt_payload_rawbit_included_fields_lpn =                         -1;
-static int hf_sprt_payload_rawbit_len_a =                                       -1;
-static int hf_sprt_payload_rawbit_len_b =                                       -1;
-static int hf_sprt_payload_rawbit_len_c =                                       -1;
-static int hf_sprt_payload_rawbit_p =                                           -1;
-static int hf_sprt_payload_rawbit_n =                                           -1;
+static int hf_sprt_payload_data_cs;
+static int hf_sprt_payload_data_reserved_bit;
+static int hf_sprt_payload_data_num_data_bits;
+static int hf_sprt_payload_data_parity_type;
+static int hf_sprt_payload_num_stop_bits;
+static int hf_sprt_payload_frame_reserved_bits;
+static int hf_sprt_payload_frame_state;
+static int hf_sprt_payload_rawoctet_n_field_present;
+static int hf_sprt_payload_rawoctet_l;
+static int hf_sprt_payload_rawoctet_n;
+static int hf_sprt_payload_rawbit_included_fields_l;
+static int hf_sprt_payload_rawbit_included_fields_lp;
+static int hf_sprt_payload_rawbit_included_fields_lpn;
+static int hf_sprt_payload_rawbit_len_a;
+static int hf_sprt_payload_rawbit_len_b;
+static int hf_sprt_payload_rawbit_len_c;
+static int hf_sprt_payload_rawbit_p;
+static int hf_sprt_payload_rawbit_n;
 
 /* Preferences  */
 static gboolean global_sprt_show_setup_info = TRUE; /* show how this SPRT stream got started */
@@ -475,15 +475,15 @@ static dissector_handle_t sprt_handle;
 
 
 /* initialize the subtree pointers */
-static gint ett_sprt =                  -1;
-static gint ett_sprt_setup =            -1;
-static gint ett_sprt_ack_fields =       -1;
-static gint ett_payload =               -1;
-static gint ett_init_msg_all_fields =   -1;
-static gint ett_jminfo_msg_cat_data =   -1;
-static gint ett_connect_msg_adt =       -1;
-
-static expert_field ei_sprt_sequence_number_0 = EI_INIT;
+static gint ett_sprt;
+static gint ett_sprt_setup;
+static gint ett_sprt_ack_fields;
+static gint ett_payload;
+static gint ett_init_msg_all_fields;
+static gint ett_jminfo_msg_cat_data;
+static gint ett_connect_msg_adt;
+
+static expert_field ei_sprt_sequence_number_0;
 
 /* value strings & range strings */
 static const value_string sprt_transport_channel_characteristics[] = {
diff --git a/epan/dissectors/packet-srp.c b/epan/dissectors/packet-srp.c
index 557c9dfb93..cadfaf02f1 100644
--- a/epan/dissectors/packet-srp.c
+++ b/epan/dissectors/packet-srp.c
@@ -19,22 +19,22 @@ void proto_register_ccsrl(void);
 void proto_reg_handoff_srp(void);
 
 /* Wireshark ID of the protocols */
-static int proto_srp = -1;
-static int proto_ccsrl = -1;
+static int proto_srp;
+static int proto_ccsrl;
 
 /* The following hf_* variables are used to hold the Wireshark IDs of
  * our header fields; they are filled out when we call
  * proto_register_field_array() in proto_register_srp()
  */
-static int hf_srp_header = -1;
-static int hf_srp_seqno = -1;
-static int hf_srp_crc = -1;
-static int hf_srp_crc_bad = -1;
-static int hf_ccsrl_ls = -1;
+static int hf_srp_header;
+static int hf_srp_seqno;
+static int hf_srp_crc;
+static int hf_srp_crc_bad;
+static int hf_ccsrl_ls;
 
 /* These are the ids of the subtrees that we may be creating */
-static gint ett_srp = -1;
-static gint ett_ccsrl = -1;
+static gint ett_srp;
+static gint ett_ccsrl;
 
 static dissector_handle_t ccsrl_handle;
 static dissector_handle_t h245dg_handle;
diff --git a/epan/dissectors/packet-srt.c b/epan/dissectors/packet-srt.c
index b36a89bed0..e2213f0c48 100644
--- a/epan/dissectors/packet-srt.c
+++ b/epan/dissectors/packet-srt.c
@@ -35,72 +35,72 @@ void proto_reg_handoff_srt(void);
 void proto_register_srt(void);
 
 /* Initialize the protocol */
-static int proto_srt = -1;
-static int hf_srt_iscontrol = -1;
-static int hf_srt_type = -1;
-static int hf_srt_exttype = -1;
-static int hf_srt_exttype_none = -1;
-static int hf_srt_seqno = -1;
-static int hf_srt_ack_seqno = -1;
-static int hf_srt_ackno = -1;
-static int hf_srt_msgno = -1;
-static int hf_srt_msgno_pb = -1;
-static int hf_srt_msgno_inorder = -1;
-static int hf_srt_msgno_enctypes = -1;
-static int hf_srt_msgno_rexmit = -1;
-static int hf_srt_timestamp = -1;
-static int hf_srt_id = -1;
-static int hf_srt_addinfo = -1;
-static int hf_srt_rtt = -1;
-static int hf_srt_rttvar = -1;
-static int hf_srt_bufavail = -1;
-static int hf_srt_rate = -1;
-static int hf_srt_bandwidth = -1;
-static int hf_srt_rcvrate = -1;
+static int proto_srt;
+static int hf_srt_iscontrol;
+static int hf_srt_type;
+static int hf_srt_exttype;
+static int hf_srt_exttype_none;
+static int hf_srt_seqno;
+static int hf_srt_ack_seqno;
+static int hf_srt_ackno;
+static int hf_srt_msgno;
+static int hf_srt_msgno_pb;
+static int hf_srt_msgno_inorder;
+static int hf_srt_msgno_enctypes;
+static int hf_srt_msgno_rexmit;
+static int hf_srt_timestamp;
+static int hf_srt_id;
+static int hf_srt_addinfo;
+static int hf_srt_rtt;
+static int hf_srt_rttvar;
+static int hf_srt_bufavail;
+static int hf_srt_rate;
+static int hf_srt_bandwidth;
+static int hf_srt_rcvrate;
 
 /* SRT Handshake */
-static int hf_srt_handshake_version = -1;
-static int hf_srt_handshake_type_v4 = -1;
-static int hf_srt_handshake_enc_field_v5 = -1;
-static int hf_srt_handshake_ext_field_v5 = -1;
-static int hf_srt_handshake_ext_field_v5_flag_hsreq = -1;
-static int hf_srt_handshake_ext_field_v5_flag_kmreq = -1;
-static int hf_srt_handshake_ext_field_v5_flag_config = -1;
-static int hf_srt_handshake_isn = -1;
-static int hf_srt_handshake_mtu = -1;
-static int hf_srt_handshake_flow_window = -1;
-static int hf_srt_handshake_reqtype = -1;
-static int hf_srt_handshake_failure_type = -1;
-static int hf_srt_handshake_id = -1;
-static int hf_srt_handshake_cookie = -1;
-static int hf_srt_handshake_peerip = -1;
+static int hf_srt_handshake_version;
+static int hf_srt_handshake_type_v4;
+static int hf_srt_handshake_enc_field_v5;
+static int hf_srt_handshake_ext_field_v5;
+static int hf_srt_handshake_ext_field_v5_flag_hsreq;
+static int hf_srt_handshake_ext_field_v5_flag_kmreq;
+static int hf_srt_handshake_ext_field_v5_flag_config;
+static int hf_srt_handshake_isn;
+static int hf_srt_handshake_mtu;
+static int hf_srt_handshake_flow_window;
+static int hf_srt_handshake_reqtype;
+static int hf_srt_handshake_failure_type;
+static int hf_srt_handshake_id;
+static int hf_srt_handshake_cookie;
+static int hf_srt_handshake_peerip;
 /* SRT Handshake Extension */
-static int hf_srt_handshake_ext_version = -1;
-static int hf_srt_handshake_ext_flags = -1;
-static int hf_srt_handshake_ext_flag_tsbpd_snd = -1;
-static int hf_srt_handshake_ext_flag_tsbpd_rcv = -1;
-static int hf_srt_handshake_ext_flag_haicrypt = -1;
-static int hf_srt_handshake_ext_flag_tlpkt_drop = -1;
-static int hf_srt_handshake_ext_flag_nak_report = -1;
-static int hf_srt_handshake_ext_flag_rexmit = -1;
-static int hf_srt_handshake_ext_flag_stream = -1;
-
-static int hf_srt_srths_blocktype = -1;
-static int hf_srt_srths_blocklen = -1;
-static int hf_srt_srths_agent_latency = -1; // TSBPD delay
-static int hf_srt_srths_peer_latency = -1; // TSBPD delay
-static int hf_srt_srtkm_msg = -1;
-static int hf_srt_srtkm_error = -1;
-static int hf_srt_srths_sid = -1;
-static int hf_srt_srths_congestcontrol = -1;
-
-static gint ett_srt = -1;
-static gint ett_srt_handshake_ext_flags = -1;
-static gint ett_srt_handshake_ext_field_flags = -1;
-
-static expert_field ei_srt_nak_seqno = EI_INIT;
-static expert_field ei_srt_hs_ext_hsreq_len = EI_INIT;
-static expert_field ei_srt_hs_ext_type = EI_INIT;
+static int hf_srt_handshake_ext_version;
+static int hf_srt_handshake_ext_flags;
+static int hf_srt_handshake_ext_flag_tsbpd_snd;
+static int hf_srt_handshake_ext_flag_tsbpd_rcv;
+static int hf_srt_handshake_ext_flag_haicrypt;
+static int hf_srt_handshake_ext_flag_tlpkt_drop;
+static int hf_srt_handshake_ext_flag_nak_report;
+static int hf_srt_handshake_ext_flag_rexmit;
+static int hf_srt_handshake_ext_flag_stream;
+
+static int hf_srt_srths_blocktype;
+static int hf_srt_srths_blocklen;
+static int hf_srt_srths_agent_latency; // TSBPD delay
+static int hf_srt_srths_peer_latency; // TSBPD delay
+static int hf_srt_srtkm_msg;
+static int hf_srt_srtkm_error;
+static int hf_srt_srths_sid;
+static int hf_srt_srths_congestcontrol;
+
+static gint ett_srt;
+static gint ett_srt_handshake_ext_flags;
+static gint ett_srt_handshake_ext_field_flags;
+
+static expert_field ei_srt_nak_seqno;
+static expert_field ei_srt_hs_ext_hsreq_len;
+static expert_field ei_srt_hs_ext_type;
 
 static dissector_handle_t srt_udp_handle;
 
diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c
index 18d6525895..8e789c0ab2 100644
--- a/epan/dissectors/packet-srvloc.c
+++ b/epan/dissectors/packet-srvloc.c
@@ -36,131 +36,131 @@ static dissector_handle_t srvloc_handle;
 static dissector_handle_t srvloc_tcp_handle;
 
 static gboolean srvloc_desegment = TRUE;
-static int proto_srvloc = -1;
-static int hf_srvloc_version = -1;
-static int hf_srvloc_function = -1;
-static int hf_srvloc_pktlen = -1;
-static int hf_srvloc_xid = -1;
-static int hf_srvloc_langtaglen = -1;
-static int hf_srvloc_langtag = -1;
-static int hf_srvloc_nextextoff = -1;
-static int hf_srvloc_flags_v1 = -1;
-static int hf_srvloc_flags_v1_overflow = -1;
-static int hf_srvloc_flags_v1_monolingual = -1;
-static int hf_srvloc_flags_v1_url_auth = -1;
-static int hf_srvloc_flags_v1_attribute_auth = -1;
-static int hf_srvloc_flags_v1_fresh = -1;
-static int hf_srvloc_error = -1;
-static int hf_srvloc_flags_v2 = -1;
-static int hf_srvloc_flags_v2_overflow = -1;
-static int hf_srvloc_flags_v2_fresh = -1;
-static int hf_srvloc_flags_v2_reqmulti = -1;
-static int hf_srvloc_error_v2 = -1;
-static int hf_srvloc_daadvert_timestamp = -1;
-static int hf_srvloc_daadvert_urllen = -1;
-static int hf_srvloc_daadvert_url = -1;
-static int hf_srvloc_daadvert_scopelistlen = -1;
-static int hf_srvloc_daadvert_scopelist = -1;
-static int hf_srvloc_daadvert_attrlistlen = -1;
-static int hf_srvloc_daadvert_attrlist = -1;
-static int hf_srvloc_daadvert_slpspilen = -1;
-static int hf_srvloc_daadvert_slpspi = -1;
-static int hf_srvloc_daadvert_authcount = -1;
-static int hf_srvloc_srvreq_prlistlen = -1;
-static int hf_srvloc_srvreq_prlist = -1;
-static int hf_srvloc_srvreq_srvtypelen = -1;
-static int hf_srvloc_srvreq_srvtypelist = -1;
-static int hf_srvloc_srvreq_scopelistlen = -1;
-static int hf_srvloc_srvreq_scopelist = -1;
-static int hf_srvloc_srvreq_predicatelen = -1;
-static int hf_srvloc_srvreq_predicate = -1;
-static int hf_srvloc_srvreq_slpspilen = -1;
-static int hf_srvloc_srvreq_slpspi = -1;
-static int hf_srvloc_srvrply_urlcount = -1;
-static int hf_srvloc_srvreg_attrlistlen = -1;
-static int hf_srvloc_srvreg_attrlist = -1;
-static int hf_srvloc_srvreg_attrauthcount = -1;
-static int hf_srvloc_srvreg_srvtypelen = -1;
-static int hf_srvloc_srvreg_srvtype = -1;
-static int hf_srvloc_srvreg_scopelistlen = -1;
-static int hf_srvloc_srvreg_scopelist = -1;
-static int hf_srvloc_srvdereg_scopelistlen = -1;
-static int hf_srvloc_srvdereg_scopelist = -1;
-static int hf_srvloc_srvdereg_taglistlen = -1;
-static int hf_srvloc_srvdereg_taglist = -1;
-static int hf_srvloc_attrreq_prlistlen  = -1;
-static int hf_srvloc_attrreq_prlist  = -1;
-static int hf_srvloc_attrreq_urllen  = -1;
-static int hf_srvloc_attrreq_url  = -1;
-static int hf_srvloc_attrreq_scopelistlen  = -1;
-static int hf_srvloc_attrreq_scopelist  = -1;
-static int hf_srvloc_attrreq_attrlistlen = -1;
-static int hf_srvloc_attrreq_attrlist = -1;
-static int hf_srvloc_attrreq_taglistlen  = -1;
-static int hf_srvloc_attrreq_taglist  = -1;
-static int hf_srvloc_attrreq_slpspilen = -1;
-static int hf_srvloc_attrreq_slpspi = -1;
-static int hf_srvloc_attrrply_attrlistlen = -1;
-static int hf_srvloc_attrrply_attrlist = -1;
-static int hf_srvloc_attrrply_attrauthcount = -1;
-static int hf_srvloc_srvtypereq_prlistlen = -1;
-static int hf_srvloc_srvtypereq_prlist = -1;
-static int hf_srvloc_srvtypereq_nameauthlistlen = -1;
-static int hf_srvloc_srvtypereq_nameauthlistlenall = -1;
-static int hf_srvloc_srvtypereq_nameauthlist = -1;
-static int hf_srvloc_srvtypereq_scopelistlen = -1;
-static int hf_srvloc_srvtypereq_scopelist = -1;
-static int hf_srvloc_srvtyperply_srvtypelen = -1;
-static int hf_srvloc_srvtyperply_srvtype = -1;
-static int hf_srvloc_srvtyperply_srvtypelistlen = -1;
-static int hf_srvloc_srvtyperply_srvtypelist = -1;
-static int hf_srvloc_saadvert_urllen = -1;
-static int hf_srvloc_saadvert_url = -1;
-static int hf_srvloc_saadvert_scopelistlen = -1;
-static int hf_srvloc_saadvert_scopelist = -1;
-static int hf_srvloc_saadvert_attrlistlen = -1;
-static int hf_srvloc_saadvert_attrlist = -1;
-static int hf_srvloc_saadvert_authcount = -1;
-static int hf_srvloc_authblkv2_bsd = -1;
-static int hf_srvloc_authblkv2_len = -1;
-static int hf_srvloc_authblkv2_timestamp = -1;
-static int hf_srvloc_authblkv2_slpspilen = -1;
-static int hf_srvloc_authblkv2_slpspi = -1;
-static int hf_srvloc_url_reserved = -1;
-static int hf_srvloc_url_lifetime = -1;
-static int hf_srvloc_url_urllen = -1;
-static int hf_srvloc_url_url = -1;
-static int hf_srvloc_url_numauths = -1;
-static int hf_srvloc_add_ref_ip = -1;
-static int hf_srvloc_srvrply_svcname = -1;
+static int proto_srvloc;
+static int hf_srvloc_version;
+static int hf_srvloc_function;
+static int hf_srvloc_pktlen;
+static int hf_srvloc_xid;
+static int hf_srvloc_langtaglen;
+static int hf_srvloc_langtag;
+static int hf_srvloc_nextextoff;
+static int hf_srvloc_flags_v1;
+static int hf_srvloc_flags_v1_overflow;
+static int hf_srvloc_flags_v1_monolingual;
+static int hf_srvloc_flags_v1_url_auth;
+static int hf_srvloc_flags_v1_attribute_auth;
+static int hf_srvloc_flags_v1_fresh;
+static int hf_srvloc_error;
+static int hf_srvloc_flags_v2;
+static int hf_srvloc_flags_v2_overflow;
+static int hf_srvloc_flags_v2_fresh;
+static int hf_srvloc_flags_v2_reqmulti;
+static int hf_srvloc_error_v2;
+static int hf_srvloc_daadvert_timestamp;
+static int hf_srvloc_daadvert_urllen;
+static int hf_srvloc_daadvert_url;
+static int hf_srvloc_daadvert_scopelistlen;
+static int hf_srvloc_daadvert_scopelist;
+static int hf_srvloc_daadvert_attrlistlen;
+static int hf_srvloc_daadvert_attrlist;
+static int hf_srvloc_daadvert_slpspilen;
+static int hf_srvloc_daadvert_slpspi;
+static int hf_srvloc_daadvert_authcount;
+static int hf_srvloc_srvreq_prlistlen;
+static int hf_srvloc_srvreq_prlist;
+static int hf_srvloc_srvreq_srvtypelen;
+static int hf_srvloc_srvreq_srvtypelist;
+static int hf_srvloc_srvreq_scopelistlen;
+static int hf_srvloc_srvreq_scopelist;
+static int hf_srvloc_srvreq_predicatelen;
+static int hf_srvloc_srvreq_predicate;
+static int hf_srvloc_srvreq_slpspilen;
+static int hf_srvloc_srvreq_slpspi;
+static int hf_srvloc_srvrply_urlcount;
+static int hf_srvloc_srvreg_attrlistlen;
+static int hf_srvloc_srvreg_attrlist;
+static int hf_srvloc_srvreg_attrauthcount;
+static int hf_srvloc_srvreg_srvtypelen;
+static int hf_srvloc_srvreg_srvtype;
+static int hf_srvloc_srvreg_scopelistlen;
+static int hf_srvloc_srvreg_scopelist;
+static int hf_srvloc_srvdereg_scopelistlen;
+static int hf_srvloc_srvdereg_scopelist;
+static int hf_srvloc_srvdereg_taglistlen;
+static int hf_srvloc_srvdereg_taglist;
+static int hf_srvloc_attrreq_prlistlen;
+static int hf_srvloc_attrreq_prlist;
+static int hf_srvloc_attrreq_urllen;
+static int hf_srvloc_attrreq_url;
+static int hf_srvloc_attrreq_scopelistlen;
+static int hf_srvloc_attrreq_scopelist;
+static int hf_srvloc_attrreq_attrlistlen;
+static int hf_srvloc_attrreq_attrlist;
+static int hf_srvloc_attrreq_taglistlen;
+static int hf_srvloc_attrreq_taglist;
+static int hf_srvloc_attrreq_slpspilen;
+static int hf_srvloc_attrreq_slpspi;
+static int hf_srvloc_attrrply_attrlistlen;
+static int hf_srvloc_attrrply_attrlist;
+static int hf_srvloc_attrrply_attrauthcount;
+static int hf_srvloc_srvtypereq_prlistlen;
+static int hf_srvloc_srvtypereq_prlist;
+static int hf_srvloc_srvtypereq_nameauthlistlen;
+static int hf_srvloc_srvtypereq_nameauthlistlenall;
+static int hf_srvloc_srvtypereq_nameauthlist;
+static int hf_srvloc_srvtypereq_scopelistlen;
+static int hf_srvloc_srvtypereq_scopelist;
+static int hf_srvloc_srvtyperply_srvtypelen;
+static int hf_srvloc_srvtyperply_srvtype;
+static int hf_srvloc_srvtyperply_srvtypelistlen;
+static int hf_srvloc_srvtyperply_srvtypelist;
+static int hf_srvloc_saadvert_urllen;
+static int hf_srvloc_saadvert_url;
+static int hf_srvloc_saadvert_scopelistlen;
+static int hf_srvloc_saadvert_scopelist;
+static int hf_srvloc_saadvert_attrlistlen;
+static int hf_srvloc_saadvert_attrlist;
+static int hf_srvloc_saadvert_authcount;
+static int hf_srvloc_authblkv2_bsd;
+static int hf_srvloc_authblkv2_len;
+static int hf_srvloc_authblkv2_timestamp;
+static int hf_srvloc_authblkv2_slpspilen;
+static int hf_srvloc_authblkv2_slpspi;
+static int hf_srvloc_url_reserved;
+static int hf_srvloc_url_lifetime;
+static int hf_srvloc_url_urllen;
+static int hf_srvloc_url_url;
+static int hf_srvloc_url_numauths;
+static int hf_srvloc_add_ref_ip;
+static int hf_srvloc_srvrply_svcname;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_srvloc_timestamp = -1;
-static int hf_srvloc_authentication_block = -1;
-static int hf_srvloc_transaction_id = -1;
-static int hf_srvloc_block_structure_descriptor = -1;
-static int hf_srvloc_communication_type = -1;
-static int hf_srvloc_language = -1;
-static int hf_srvloc_socket = -1;
-static int hf_srvloc_encoding = -1;
-static int hf_srvloc_node = -1;
-static int hf_srvloc_item = -1;
-static int hf_srvloc_service_type = -1;
-static int hf_srvloc_network = -1;
-static int hf_srvloc_service_type_count = -1;
-static int hf_srvloc_dialect = -1;
-static int hf_srvloc_authenticator_length = -1;
-static int hf_srvloc_protocol = -1;
-static int hf_srvloc_port = -1;
-
-
-static gint ett_srvloc = -1;
-static gint ett_srvloc_attr = -1;
-static gint ett_srvloc_flags = -1;
-
-static expert_field ei_srvloc_error = EI_INIT;
-static expert_field ei_srvloc_error_v2 = EI_INIT;
-static expert_field ei_srvloc_function_unknown = EI_INIT;
-static expert_field ei_srvloc_malformed = EI_INIT;
+static int hf_srvloc_timestamp;
+static int hf_srvloc_authentication_block;
+static int hf_srvloc_transaction_id;
+static int hf_srvloc_block_structure_descriptor;
+static int hf_srvloc_communication_type;
+static int hf_srvloc_language;
+static int hf_srvloc_socket;
+static int hf_srvloc_encoding;
+static int hf_srvloc_node;
+static int hf_srvloc_item;
+static int hf_srvloc_service_type;
+static int hf_srvloc_network;
+static int hf_srvloc_service_type_count;
+static int hf_srvloc_dialect;
+static int hf_srvloc_authenticator_length;
+static int hf_srvloc_protocol;
+static int hf_srvloc_port;
+
+
+static gint ett_srvloc;
+static gint ett_srvloc_attr;
+static gint ett_srvloc_flags;
+
+static expert_field ei_srvloc_error;
+static expert_field ei_srvloc_error_v2;
+static expert_field ei_srvloc_function_unknown;
+static expert_field ei_srvloc_malformed;
 
 static const true_false_string tfs_srvloc_flags_overflow = {
     "Message will not fit in datagram",
diff --git a/epan/dissectors/packet-sscf-nni.c b/epan/dissectors/packet-sscf-nni.c
index ae5b8927e4..db82cc806d 100644
--- a/epan/dissectors/packet-sscf-nni.c
+++ b/epan/dissectors/packet-sscf-nni.c
@@ -18,9 +18,9 @@
 void proto_register_sscf(void);
 void proto_reg_handoff_sscf(void);
 
-static int proto_sscf = -1;
+static int proto_sscf;
 
-static gint ett_sscf = -1;
+static gint ett_sscf;
 
 static dissector_handle_t mtp3_handle;
 
@@ -30,8 +30,8 @@ static dissector_handle_t mtp3_handle;
 #define SSCF_SPARE_OFFSET 0
 #define SSCF_SPARE_LENGTH 3
 
-static int hf_status = -1;
-static int hf_spare = -1;
+static int hf_status;
+static int hf_spare;
 
 #define SSCF_STATUS_OOS 0x01
 #define SSCF_STATUS_PO  0x02
diff --git a/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c
index 61d461a053..038f5a6961 100644
--- a/epan/dissectors/packet-sscop.c
+++ b/epan/dissectors/packet-sscop.c
@@ -22,21 +22,21 @@
 void proto_register_sscop(void);
 void proto_reg_handoff_sscop(void);
 
-int proto_sscop = -1;
-
-static int hf_sscop_type = -1;
-static int hf_sscop_sq = -1;
-static int hf_sscop_mr = -1;
-static int hf_sscop_s = -1;
-static int hf_sscop_ps = -1;
-static int hf_sscop_r = -1;
-static int hf_sscop_stat_s = -1;
-static int hf_sscop_pad_length = -1;
-static int hf_sscop_source = -1;
-/* static int hf_sscop_stat_count = -1; */
-
-static gint ett_sscop = -1;
-static gint ett_stat = -1;
+int proto_sscop;
+
+static int hf_sscop_type;
+static int hf_sscop_sq;
+static int hf_sscop_mr;
+static int hf_sscop_s;
+static int hf_sscop_ps;
+static int hf_sscop_r;
+static int hf_sscop_stat_s;
+static int hf_sscop_pad_length;
+static int hf_sscop_source;
+/* static int hf_sscop_stat_count; */
+
+static gint ett_sscop;
+static gint ett_stat;
 
 static dissector_handle_t q2931_handle;
 static dissector_handle_t data_handle;
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c
index 38ddb66b18..428c54dc5b 100644
--- a/epan/dissectors/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
@@ -226,193 +226,193 @@ typedef struct {
 
 static GHashTable * ssh_master_key_map = NULL;
 
-static int proto_ssh = -1;
+static int proto_ssh;
 
 /* Version exchange */
-static int hf_ssh_protocol = -1;
+static int hf_ssh_protocol;
 
 /* Framing */
-static int hf_ssh_packet_length = -1;
-static int hf_ssh_packet_length_encrypted = -1;
-static int hf_ssh_padding_length = -1;
-static int hf_ssh_payload = -1;
-static int hf_ssh_encrypted_packet = -1;
-static int hf_ssh_padding_string = -1;
-static int hf_ssh_mac_string = -1;
-static int hf_ssh_mac_status = -1;
-static int hf_ssh_seq_num = -1;
-static int hf_ssh_direction = -1;
+static int hf_ssh_packet_length;
+static int hf_ssh_packet_length_encrypted;
+static int hf_ssh_padding_length;
+static int hf_ssh_payload;
+static int hf_ssh_encrypted_packet;
+static int hf_ssh_padding_string;
+static int hf_ssh_mac_string;
+static int hf_ssh_mac_status;
+static int hf_ssh_seq_num;
+static int hf_ssh_direction;
 
 /* Message codes */
-static int hf_ssh_msg_code = -1;
-static int hf_ssh2_msg_code = -1;
-static int hf_ssh2_kex_dh_msg_code = -1;
-static int hf_ssh2_kex_dh_gex_msg_code = -1;
-static int hf_ssh2_kex_ecdh_msg_code = -1;
+static int hf_ssh_msg_code;
+static int hf_ssh2_msg_code;
+static int hf_ssh2_kex_dh_msg_code;
+static int hf_ssh2_kex_dh_gex_msg_code;
+static int hf_ssh2_kex_ecdh_msg_code;
 
 /* Algorithm negotiation */
-static int hf_ssh_cookie = -1;
-static int hf_ssh_kex_algorithms = -1;
-static int hf_ssh_server_host_key_algorithms = -1;
-static int hf_ssh_encryption_algorithms_client_to_server = -1;
-static int hf_ssh_encryption_algorithms_server_to_client = -1;
-static int hf_ssh_mac_algorithms_client_to_server = -1;
-static int hf_ssh_mac_algorithms_server_to_client = -1;
-static int hf_ssh_compression_algorithms_client_to_server = -1;
-static int hf_ssh_compression_algorithms_server_to_client = -1;
-static int hf_ssh_languages_client_to_server = -1;
-static int hf_ssh_languages_server_to_client = -1;
-static int hf_ssh_kex_algorithms_length = -1;
-static int hf_ssh_server_host_key_algorithms_length = -1;
-static int hf_ssh_encryption_algorithms_client_to_server_length = -1;
-static int hf_ssh_encryption_algorithms_server_to_client_length = -1;
-static int hf_ssh_mac_algorithms_client_to_server_length = -1;
-static int hf_ssh_mac_algorithms_server_to_client_length = -1;
-static int hf_ssh_compression_algorithms_client_to_server_length = -1;
-static int hf_ssh_compression_algorithms_server_to_client_length = -1;
-static int hf_ssh_languages_client_to_server_length = -1;
-static int hf_ssh_languages_server_to_client_length = -1;
-static int hf_ssh_first_kex_packet_follows = -1;
-static int hf_ssh_kex_reserved = -1;
-static int hf_ssh_kex_hassh_algo = -1;
-static int hf_ssh_kex_hassh = -1;
-static int hf_ssh_kex_hasshserver_algo = -1;
-static int hf_ssh_kex_hasshserver = -1;
+static int hf_ssh_cookie;
+static int hf_ssh_kex_algorithms;
+static int hf_ssh_server_host_key_algorithms;
+static int hf_ssh_encryption_algorithms_client_to_server;
+static int hf_ssh_encryption_algorithms_server_to_client;
+static int hf_ssh_mac_algorithms_client_to_server;
+static int hf_ssh_mac_algorithms_server_to_client;
+static int hf_ssh_compression_algorithms_client_to_server;
+static int hf_ssh_compression_algorithms_server_to_client;
+static int hf_ssh_languages_client_to_server;
+static int hf_ssh_languages_server_to_client;
+static int hf_ssh_kex_algorithms_length;
+static int hf_ssh_server_host_key_algorithms_length;
+static int hf_ssh_encryption_algorithms_client_to_server_length;
+static int hf_ssh_encryption_algorithms_server_to_client_length;
+static int hf_ssh_mac_algorithms_client_to_server_length;
+static int hf_ssh_mac_algorithms_server_to_client_length;
+static int hf_ssh_compression_algorithms_client_to_server_length;
+static int hf_ssh_compression_algorithms_server_to_client_length;
+static int hf_ssh_languages_client_to_server_length;
+static int hf_ssh_languages_server_to_client_length;
+static int hf_ssh_first_kex_packet_follows;
+static int hf_ssh_kex_reserved;
+static int hf_ssh_kex_hassh_algo;
+static int hf_ssh_kex_hassh;
+static int hf_ssh_kex_hasshserver_algo;
+static int hf_ssh_kex_hasshserver;
 
 /* Key exchange common elements */
-static int hf_ssh_hostkey_length = -1;
-static int hf_ssh_hostkey_type_length = -1;
-static int hf_ssh_hostkey_type = -1;
-static int hf_ssh_hostkey_data = -1;
-static int hf_ssh_hostkey_rsa_n = -1;
-static int hf_ssh_hostkey_rsa_e = -1;
-static int hf_ssh_hostkey_dsa_p = -1;
-static int hf_ssh_hostkey_dsa_q = -1;
-static int hf_ssh_hostkey_dsa_g = -1;
-static int hf_ssh_hostkey_dsa_y = -1;
-static int hf_ssh_hostkey_ecdsa_curve_id = -1;
-static int hf_ssh_hostkey_ecdsa_curve_id_length = -1;
-static int hf_ssh_hostkey_ecdsa_q = -1;
-static int hf_ssh_hostkey_ecdsa_q_length = -1;
-static int hf_ssh_hostkey_eddsa_key = -1;
-static int hf_ssh_hostkey_eddsa_key_length = -1;
-static int hf_ssh_hostsig_length = -1;
-static int hf_ssh_hostsig_type_length = -1;
-static int hf_ssh_hostsig_type = -1;
-static int hf_ssh_hostsig_rsa = -1;
-static int hf_ssh_hostsig_dsa = -1;
-static int hf_ssh_hostsig_data = -1;
+static int hf_ssh_hostkey_length;
+static int hf_ssh_hostkey_type_length;
+static int hf_ssh_hostkey_type;
+static int hf_ssh_hostkey_data;
+static int hf_ssh_hostkey_rsa_n;
+static int hf_ssh_hostkey_rsa_e;
+static int hf_ssh_hostkey_dsa_p;
+static int hf_ssh_hostkey_dsa_q;
+static int hf_ssh_hostkey_dsa_g;
+static int hf_ssh_hostkey_dsa_y;
+static int hf_ssh_hostkey_ecdsa_curve_id;
+static int hf_ssh_hostkey_ecdsa_curve_id_length;
+static int hf_ssh_hostkey_ecdsa_q;
+static int hf_ssh_hostkey_ecdsa_q_length;
+static int hf_ssh_hostkey_eddsa_key;
+static int hf_ssh_hostkey_eddsa_key_length;
+static int hf_ssh_hostsig_length;
+static int hf_ssh_hostsig_type_length;
+static int hf_ssh_hostsig_type;
+static int hf_ssh_hostsig_rsa;
+static int hf_ssh_hostsig_dsa;
+static int hf_ssh_hostsig_data;
 
 /* Key exchange: Diffie-Hellman */
-static int hf_ssh_dh_e = -1;
-static int hf_ssh_dh_f = -1;
+static int hf_ssh_dh_e;
+static int hf_ssh_dh_f;
 
 /* Key exchange: Diffie-Hellman Group Exchange */
-static int hf_ssh_dh_gex_min = -1;
-static int hf_ssh_dh_gex_nbits = -1;
-static int hf_ssh_dh_gex_max = -1;
-static int hf_ssh_dh_gex_p = -1;
-static int hf_ssh_dh_gex_g = -1;
+static int hf_ssh_dh_gex_min;
+static int hf_ssh_dh_gex_nbits;
+static int hf_ssh_dh_gex_max;
+static int hf_ssh_dh_gex_p;
+static int hf_ssh_dh_gex_g;
 
 /* Key exchange: Elliptic Curve Diffie-Hellman */
-static int hf_ssh_ecdh_q_c = -1;
-static int hf_ssh_ecdh_q_c_length = -1;
-static int hf_ssh_ecdh_q_s = -1;
-static int hf_ssh_ecdh_q_s_length = -1;
+static int hf_ssh_ecdh_q_c;
+static int hf_ssh_ecdh_q_c_length;
+static int hf_ssh_ecdh_q_s;
+static int hf_ssh_ecdh_q_s_length;
 
 /* Miscellaneous */
-static int hf_ssh_mpint_length = -1;
-
-static int hf_ssh_ignore_data_length = -1;
-static int hf_ssh_ignore_data = -1;
-static int hf_ssh_debug_always_display = -1;
-static int hf_ssh_debug_message_length = -1;
-static int hf_ssh_debug_message = -1;
-static int hf_ssh_service_name_length = -1;
-static int hf_ssh_service_name = -1;
-static int hf_ssh_userauth_user_name_length = -1;
-static int hf_ssh_userauth_user_name = -1;
-static int hf_ssh_userauth_change_password = -1;
-static int hf_ssh_userauth_service_name_length = -1;
-static int hf_ssh_userauth_service_name = -1;
-static int hf_ssh_userauth_method_name_length = -1;
-static int hf_ssh_userauth_method_name = -1;
-static int hf_ssh_userauth_have_signature = -1;
-static int hf_ssh_userauth_password_length = -1;
-static int hf_ssh_userauth_password = -1;
-static int hf_ssh_userauth_new_password_length = -1;
-static int hf_ssh_userauth_new_password = -1;
-static int hf_ssh_auth_failure_list_length = -1;
-static int hf_ssh_auth_failure_list = -1;
-static int hf_ssh_userauth_partial_success = -1;
-static int hf_ssh_userauth_pka_name_len = -1;
-static int hf_ssh_userauth_pka_name = -1;
-static int hf_ssh_pk_blob_name_length = -1;
-static int hf_ssh_pk_blob_name = -1;
-static int hf_ssh_blob_length = -1;
-static int hf_ssh_signature_length = -1;
-static int hf_ssh_pk_sig_blob_name_length = -1;
-static int hf_ssh_pk_sig_blob_name = -1;
-static int hf_ssh_connection_type_name_len = -1;
-static int hf_ssh_connection_type_name = -1;
-static int hf_ssh_connection_sender_channel = -1;
-static int hf_ssh_connection_recipient_channel = -1;
-static int hf_ssh_connection_initial_window = -1;
-static int hf_ssh_connection_maximum_packet_size = -1;
-static int hf_ssh_global_request_name_len = -1;
-static int hf_ssh_global_request_name = -1;
-static int hf_ssh_global_request_want_reply = -1;
-static int hf_ssh_global_request_hostkeys_array_len = -1;
-static int hf_ssh_channel_request_name_len = -1;
-static int hf_ssh_channel_request_name = -1;
-static int hf_ssh_channel_request_want_reply = -1;
-static int hf_ssh_subsystem_name_len = -1;
-static int hf_ssh_subsystem_name = -1;
-static int hf_ssh_channel_window_adjust = -1;
-static int hf_ssh_channel_data_len = -1;
-static int hf_ssh_exit_status = -1;
-static int hf_ssh_disconnect_reason = -1;
-static int hf_ssh_disconnect_description_length = -1;
-static int hf_ssh_disconnect_description = -1;
-static int hf_ssh_lang_tag_length = -1;
-static int hf_ssh_lang_tag = -1;
-
-static int hf_ssh_blob_p = -1;
-static int hf_ssh_blob_e = -1;
-
-static int hf_ssh_pk_sig_s_length = -1;
-static int hf_ssh_pk_sig_s = -1;
-
-static int hf_ssh_reassembled_in              = -1;
-static int hf_ssh_reassembled_length          = -1;
-static int hf_ssh_reassembled_data            = -1;
-static int hf_ssh_segments                    = -1;
-static int hf_ssh_segment                     = -1;
-static int hf_ssh_segment_overlap             = -1;
-static int hf_ssh_segment_overlap_conflict    = -1;
-static int hf_ssh_segment_multiple_tails      = -1;
-static int hf_ssh_segment_too_long_fragment   = -1;
-static int hf_ssh_segment_error               = -1;
-static int hf_ssh_segment_count               = -1;
-static int hf_ssh_segment_data                = -1;
-
-static gint ett_ssh = -1;
-static gint ett_key_exchange = -1;
-static gint ett_key_exchange_host_key = -1;
-static gint ett_key_exchange_host_sig = -1;
-static gint ett_userauth_pk_blob = -1;
-static gint ett_userauth_pk_signautre = -1;
-static gint ett_key_init = -1;
-static gint ett_ssh1 = -1;
-static gint ett_ssh2 = -1;
-static gint ett_ssh_segments = -1;
-static gint ett_ssh_segment = -1;
-
-static expert_field ei_ssh_packet_length = EI_INIT;
-static expert_field ei_ssh_packet_decode = EI_INIT;
-static expert_field ei_ssh_channel_number = EI_INIT;
-static expert_field ei_ssh_invalid_keylen = EI_INIT;
-static expert_field ei_ssh_mac_bad = EI_INIT;
+static int hf_ssh_mpint_length;
+
+static int hf_ssh_ignore_data_length;
+static int hf_ssh_ignore_data;
+static int hf_ssh_debug_always_display;
+static int hf_ssh_debug_message_length;
+static int hf_ssh_debug_message;
+static int hf_ssh_service_name_length;
+static int hf_ssh_service_name;
+static int hf_ssh_userauth_user_name_length;
+static int hf_ssh_userauth_user_name;
+static int hf_ssh_userauth_change_password;
+static int hf_ssh_userauth_service_name_length;
+static int hf_ssh_userauth_service_name;
+static int hf_ssh_userauth_method_name_length;
+static int hf_ssh_userauth_method_name;
+static int hf_ssh_userauth_have_signature;
+static int hf_ssh_userauth_password_length;
+static int hf_ssh_userauth_password;
+static int hf_ssh_userauth_new_password_length;
+static int hf_ssh_userauth_new_password;
+static int hf_ssh_auth_failure_list_length;
+static int hf_ssh_auth_failure_list;
+static int hf_ssh_userauth_partial_success;
+static int hf_ssh_userauth_pka_name_len;
+static int hf_ssh_userauth_pka_name;
+static int hf_ssh_pk_blob_name_length;
+static int hf_ssh_pk_blob_name;
+static int hf_ssh_blob_length;
+static int hf_ssh_signature_length;
+static int hf_ssh_pk_sig_blob_name_length;
+static int hf_ssh_pk_sig_blob_name;
+static int hf_ssh_connection_type_name_len;
+static int hf_ssh_connection_type_name;
+static int hf_ssh_connection_sender_channel;
+static int hf_ssh_connection_recipient_channel;
+static int hf_ssh_connection_initial_window;
+static int hf_ssh_connection_maximum_packet_size;
+static int hf_ssh_global_request_name_len;
+static int hf_ssh_global_request_name;
+static int hf_ssh_global_request_want_reply;
+static int hf_ssh_global_request_hostkeys_array_len;
+static int hf_ssh_channel_request_name_len;
+static int hf_ssh_channel_request_name;
+static int hf_ssh_channel_request_want_reply;
+static int hf_ssh_subsystem_name_len;
+static int hf_ssh_subsystem_name;
+static int hf_ssh_channel_window_adjust;
+static int hf_ssh_channel_data_len;
+static int hf_ssh_exit_status;
+static int hf_ssh_disconnect_reason;
+static int hf_ssh_disconnect_description_length;
+static int hf_ssh_disconnect_description;
+static int hf_ssh_lang_tag_length;
+static int hf_ssh_lang_tag;
+
+static int hf_ssh_blob_p;
+static int hf_ssh_blob_e;
+
+static int hf_ssh_pk_sig_s_length;
+static int hf_ssh_pk_sig_s;
+
+static int hf_ssh_reassembled_in;
+static int hf_ssh_reassembled_length;
+static int hf_ssh_reassembled_data;
+static int hf_ssh_segments;
+static int hf_ssh_segment;
+static int hf_ssh_segment_overlap;
+static int hf_ssh_segment_overlap_conflict;
+static int hf_ssh_segment_multiple_tails;
+static int hf_ssh_segment_too_long_fragment;
+static int hf_ssh_segment_error;
+static int hf_ssh_segment_count;
+static int hf_ssh_segment_data;
+
+static gint ett_ssh;
+static gint ett_key_exchange;
+static gint ett_key_exchange_host_key;
+static gint ett_key_exchange_host_sig;
+static gint ett_userauth_pk_blob;
+static gint ett_userauth_pk_signautre;
+static gint ett_key_init;
+static gint ett_ssh1;
+static gint ett_ssh2;
+static gint ett_ssh_segments;
+static gint ett_ssh_segment;
+
+static expert_field ei_ssh_packet_length;
+static expert_field ei_ssh_packet_decode;
+static expert_field ei_ssh_channel_number;
+static expert_field ei_ssh_invalid_keylen;
+static expert_field ei_ssh_mac_bad;
 
 static gboolean ssh_desegment = TRUE;
 
diff --git a/epan/dissectors/packet-sstp.c b/epan/dissectors/packet-sstp.c
index a4efe98155..d033da19b3 100644
--- a/epan/dissectors/packet-sstp.c
+++ b/epan/dissectors/packet-sstp.c
@@ -103,30 +103,30 @@ void proto_reg_handoff_sstp(void);
 #define SSTP_ATTRIB_STATUS_VALUE_NOT_SUPPORTED 0x000004
 
 static dissector_handle_t ppp_hdlc_handle = NULL;
-static gint ett_sstp = -1;
-static gint ett_sstp_attribute = -1;
-static gint ett_sstp_version = -1;
-static gint hf_sstp_attrib_id = -1;
-static gint hf_sstp_attrib_length = -1;
-static gint hf_sstp_attrib_length_reserved = -1;
-static gint hf_sstp_attrib_reserved = -1;
-static gint hf_sstp_attrib_value = -1;
-static gint hf_sstp_cert_hash = -1;
-static gint hf_sstp_compound_mac = -1;
-static gint hf_sstp_control_flag = -1;
-static gint hf_sstp_data_unknown = -1;
-static gint hf_sstp_ecapsulated_protocol = -1;
-static gint hf_sstp_hash_protocol = -1;
-static gint hf_sstp_length = -1;
-static gint hf_sstp_major = -1;
-static gint hf_sstp_messagetype = -1;
-static gint hf_sstp_minor = -1;
-static gint hf_sstp_nonce = -1;
-static gint hf_sstp_numattrib = -1;
-static gint hf_sstp_padding = -1;
-static gint hf_sstp_reserved = -1;
-static gint hf_sstp_status = -1;
-static gint proto_sstp = -1;
+static gint ett_sstp;
+static gint ett_sstp_attribute;
+static gint ett_sstp_version;
+static gint hf_sstp_attrib_id;
+static gint hf_sstp_attrib_length;
+static gint hf_sstp_attrib_length_reserved;
+static gint hf_sstp_attrib_reserved;
+static gint hf_sstp_attrib_value;
+static gint hf_sstp_cert_hash;
+static gint hf_sstp_compound_mac;
+static gint hf_sstp_control_flag;
+static gint hf_sstp_data_unknown;
+static gint hf_sstp_ecapsulated_protocol;
+static gint hf_sstp_hash_protocol;
+static gint hf_sstp_length;
+static gint hf_sstp_major;
+static gint hf_sstp_messagetype;
+static gint hf_sstp_minor;
+static gint hf_sstp_nonce;
+static gint hf_sstp_numattrib;
+static gint hf_sstp_padding;
+static gint hf_sstp_reserved;
+static gint hf_sstp_status;
+static gint proto_sstp;
 
 static const value_string sstp_messagetypes[] = {
   {SSTP_MSG_CALL_CONNECT_REQUEST, "SSTP_MSG_CALL_CONNECT_REQUEST"},
diff --git a/epan/dissectors/packet-ssyncp.c b/epan/dissectors/packet-ssyncp.c
index c5d1e09b17..79f8980c76 100644
--- a/epan/dissectors/packet-ssyncp.c
+++ b/epan/dissectors/packet-ssyncp.c
@@ -44,25 +44,25 @@ void proto_register_ssyncp(void);
 
 static dissector_handle_t ssyncp_handle;
 
-static int proto_ssyncp = -1;
-static int hf_ssyncp_direction = -1;
-static int hf_ssyncp_seq = -1;
-static int hf_ssyncp_encrypted = -1;
-static int hf_ssyncp_seq_delta = -1;
-static int hf_ssyncp_timestamp = -1;
-static int hf_ssyncp_timestamp_reply = -1;
-static int hf_ssyncp_frag_seq = -1;
-static int hf_ssyncp_frag_final = -1;
-static int hf_ssyncp_frag_idx = -1;
-static int hf_ssyncp_rtt_to_server = -1;
-static int hf_ssyncp_rtt_to_client = -1;
+static int proto_ssyncp;
+static int hf_ssyncp_direction;
+static int hf_ssyncp_seq;
+static int hf_ssyncp_encrypted;
+static int hf_ssyncp_seq_delta;
+static int hf_ssyncp_timestamp;
+static int hf_ssyncp_timestamp_reply;
+static int hf_ssyncp_frag_seq;
+static int hf_ssyncp_frag_final;
+static int hf_ssyncp_frag_idx;
+static int hf_ssyncp_rtt_to_server;
+static int hf_ssyncp_rtt_to_client;
 
 /* Initialize the subtree pointers */
-static gint ett_ssyncp = -1;
-static gint ett_ssyncp_decrypted = -1;
+static gint ett_ssyncp;
+static gint ett_ssyncp_decrypted;
 
-static expert_field ei_ssyncp_fragmented = EI_INIT;
-static expert_field ei_ssyncp_bad_key = EI_INIT;
+static expert_field ei_ssyncp_fragmented;
+static expert_field ei_ssyncp_bad_key;
 
 static const char *pref_ssyncp_key;
 static char ssyncp_raw_aes_key[16];
diff --git a/epan/dissectors/packet-stanag4607.c b/epan/dissectors/packet-stanag4607.c
index 8dcabe7b78..bbd5b7d1ae 100644
--- a/epan/dissectors/packet-stanag4607.c
+++ b/epan/dissectors/packet-stanag4607.c
@@ -14,133 +14,133 @@
 void proto_register_stanag4607(void);
 void proto_reg_handoff_stanag4607(void);
 
-static int proto_stanag4607 = -1;
-
-static int hf_4607_version = -1;
-static int hf_4607_packet_size = -1;
-static int hf_4607_nationality = -1;
-static int hf_4607_sec_class = -1;
-static int hf_4607_sec_system = -1;
-static int hf_4607_sec_code = -1;
-static int hf_4607_exercise_indicator = -1;
-static int hf_4607_platform_id = -1;
-static int hf_4607_mission_id = -1;
-static int hf_4607_job_id = -1;
-
-static int hf_4607_segment_type = -1;
-static int hf_4607_segment_size = -1;
+static int proto_stanag4607;
+
+static int hf_4607_version;
+static int hf_4607_packet_size;
+static int hf_4607_nationality;
+static int hf_4607_sec_class;
+static int hf_4607_sec_system;
+static int hf_4607_sec_code;
+static int hf_4607_exercise_indicator;
+static int hf_4607_platform_id;
+static int hf_4607_mission_id;
+static int hf_4607_job_id;
+
+static int hf_4607_segment_type;
+static int hf_4607_segment_size;
 
 /* Mission Segment */
-static int hf_4607_mission_plan = -1;
-static int hf_4607_mission_flight_plan = -1;
-static int hf_4607_mission_platform = -1;
-static int hf_4607_mission_platform_config = -1;
-static int hf_4607_mission_time_year = -1;
-static int hf_4607_mission_time_month = -1;
-static int hf_4607_mission_time_day = -1;
+static int hf_4607_mission_plan;
+static int hf_4607_mission_flight_plan;
+static int hf_4607_mission_platform;
+static int hf_4607_mission_platform_config;
+static int hf_4607_mission_time_year;
+static int hf_4607_mission_time_month;
+static int hf_4607_mission_time_day;
 
 /* Dwell Segment */
-static int hf_4607_dwell_mask = -1;
-static int hf_4607_dwell_revisit_index = -1;
-static int hf_4607_dwell_dwell_index = -1;
-static int hf_4607_dwell_last_dwell = -1;
-static int hf_4607_dwell_count = -1;
-static int hf_4607_dwell_time = -1;
-static int hf_4607_dwell_sensor_lat = -1;
-static int hf_4607_dwell_sensor_lon = -1;
-static int hf_4607_dwell_sensor_alt = -1;
-static int hf_4607_dwell_scale_lat = -1;
-static int hf_4607_dwell_scale_lon = -1;
-static int hf_4607_dwell_unc_along = -1;
-static int hf_4607_dwell_unc_cross = -1;
-static int hf_4607_dwell_unc_alt = -1;
-static int hf_4607_dwell_track = -1;
-static int hf_4607_dwell_speed = -1;
-static int hf_4607_dwell_vert_velocity = -1;
-static int hf_4607_dwell_track_unc = -1;
-static int hf_4607_dwell_speed_unc = -1;
-static int hf_4607_dwell_vv_unc = -1;
-
-static int hf_4607_dwell_plat_heading = -1;
-static int hf_4607_dwell_plat_pitch = -1;
-static int hf_4607_dwell_plat_roll = -1;
-static int hf_4607_dwell_da_lat = -1;
-static int hf_4607_dwell_da_lon = -1;
-static int hf_4607_dwell_da_range = -1;
-static int hf_4607_dwell_da_angle = -1;
-static int hf_4607_dwell_sensor_heading = -1;
-static int hf_4607_dwell_sensor_pitch = -1;
-static int hf_4607_dwell_sensor_roll = -1;
-static int hf_4607_dwell_mdv = -1;
+static int hf_4607_dwell_mask;
+static int hf_4607_dwell_revisit_index;
+static int hf_4607_dwell_dwell_index;
+static int hf_4607_dwell_last_dwell;
+static int hf_4607_dwell_count;
+static int hf_4607_dwell_time;
+static int hf_4607_dwell_sensor_lat;
+static int hf_4607_dwell_sensor_lon;
+static int hf_4607_dwell_sensor_alt;
+static int hf_4607_dwell_scale_lat;
+static int hf_4607_dwell_scale_lon;
+static int hf_4607_dwell_unc_along;
+static int hf_4607_dwell_unc_cross;
+static int hf_4607_dwell_unc_alt;
+static int hf_4607_dwell_track;
+static int hf_4607_dwell_speed;
+static int hf_4607_dwell_vert_velocity;
+static int hf_4607_dwell_track_unc;
+static int hf_4607_dwell_speed_unc;
+static int hf_4607_dwell_vv_unc;
+
+static int hf_4607_dwell_plat_heading;
+static int hf_4607_dwell_plat_pitch;
+static int hf_4607_dwell_plat_roll;
+static int hf_4607_dwell_da_lat;
+static int hf_4607_dwell_da_lon;
+static int hf_4607_dwell_da_range;
+static int hf_4607_dwell_da_angle;
+static int hf_4607_dwell_sensor_heading;
+static int hf_4607_dwell_sensor_pitch;
+static int hf_4607_dwell_sensor_roll;
+static int hf_4607_dwell_mdv;
 
 /* Target Report */
-static int hf_4607_dwell_report_index = -1;
-static int hf_4607_dwell_report_lat = -1;
-static int hf_4607_dwell_report_lon = -1;
-static int hf_4607_dwell_report_delta_lat = -1;
-static int hf_4607_dwell_report_delta_lon = -1;
-static int hf_4607_dwell_report_height = -1;
-static int hf_4607_dwell_report_radial = -1;
-static int hf_4607_dwell_report_wrap = -1;
-static int hf_4607_dwell_report_snr = -1;
-static int hf_4607_dwell_report_class = -1;
-static int hf_4607_dwell_report_prob = -1;
-static int hf_4607_dwell_report_unc_slant = -1;
-static int hf_4607_dwell_report_unc_cross = -1;
-static int hf_4607_dwell_report_unc_height = -1;
-static int hf_4607_dwell_report_unc_radial = -1;
-static int hf_4607_dwell_report_tag_app = -1;
-static int hf_4607_dwell_report_tag_entity = -1;
-static int hf_4607_dwell_report_section = -1;
+static int hf_4607_dwell_report_index;
+static int hf_4607_dwell_report_lat;
+static int hf_4607_dwell_report_lon;
+static int hf_4607_dwell_report_delta_lat;
+static int hf_4607_dwell_report_delta_lon;
+static int hf_4607_dwell_report_height;
+static int hf_4607_dwell_report_radial;
+static int hf_4607_dwell_report_wrap;
+static int hf_4607_dwell_report_snr;
+static int hf_4607_dwell_report_class;
+static int hf_4607_dwell_report_prob;
+static int hf_4607_dwell_report_unc_slant;
+static int hf_4607_dwell_report_unc_cross;
+static int hf_4607_dwell_report_unc_height;
+static int hf_4607_dwell_report_unc_radial;
+static int hf_4607_dwell_report_tag_app;
+static int hf_4607_dwell_report_tag_entity;
+static int hf_4607_dwell_report_section;
 
 /* Job Definition Segment */
-static int hf_4607_jobdef_job_id = -1;
-static int hf_4607_jobdef_sensor_type = -1;
-static int hf_4607_jobdef_sensor_model = -1;
-static int hf_4607_jobdef_filter = -1;
-static int hf_4607_jobdef_priority = -1;
-static int hf_4607_jobdef_ba_lat_a = -1;
-static int hf_4607_jobdef_ba_lon_a = -1;
-static int hf_4607_jobdef_ba_lat_b = -1;
-static int hf_4607_jobdef_ba_lon_b = -1;
-static int hf_4607_jobdef_ba_lat_c = -1;
-static int hf_4607_jobdef_ba_lon_c = -1;
-static int hf_4607_jobdef_ba_lat_d = -1;
-static int hf_4607_jobdef_ba_lon_d = -1;
-static int hf_4607_jobdef_radar_mode = -1;
-static int hf_4607_jobdef_revisit_interval = -1;
-static int hf_4607_jobdef_unc_along = -1;
-static int hf_4607_jobdef_unc_cross = -1;
-static int hf_4607_jobdef_unc_alt = -1;
-static int hf_4607_jobdef_unc_heading = -1;
-static int hf_4607_jobdef_unc_speed = -1;
-static int hf_4607_jobdef_sense_slant = -1;
-static int hf_4607_jobdef_sense_cross = -1;
-static int hf_4607_jobdef_sense_vlos = -1;
-static int hf_4607_jobdef_sense_mdv = -1;
-static int hf_4607_jobdef_sense_prob = -1;
-static int hf_4607_jobdef_sense_alarm = -1;
-static int hf_4607_jobdef_terrain_model = -1;
-static int hf_4607_jobdef_geoid_model = -1;
+static int hf_4607_jobdef_job_id;
+static int hf_4607_jobdef_sensor_type;
+static int hf_4607_jobdef_sensor_model;
+static int hf_4607_jobdef_filter;
+static int hf_4607_jobdef_priority;
+static int hf_4607_jobdef_ba_lat_a;
+static int hf_4607_jobdef_ba_lon_a;
+static int hf_4607_jobdef_ba_lat_b;
+static int hf_4607_jobdef_ba_lon_b;
+static int hf_4607_jobdef_ba_lat_c;
+static int hf_4607_jobdef_ba_lon_c;
+static int hf_4607_jobdef_ba_lat_d;
+static int hf_4607_jobdef_ba_lon_d;
+static int hf_4607_jobdef_radar_mode;
+static int hf_4607_jobdef_revisit_interval;
+static int hf_4607_jobdef_unc_along;
+static int hf_4607_jobdef_unc_cross;
+static int hf_4607_jobdef_unc_alt;
+static int hf_4607_jobdef_unc_heading;
+static int hf_4607_jobdef_unc_speed;
+static int hf_4607_jobdef_sense_slant;
+static int hf_4607_jobdef_sense_cross;
+static int hf_4607_jobdef_sense_vlos;
+static int hf_4607_jobdef_sense_mdv;
+static int hf_4607_jobdef_sense_prob;
+static int hf_4607_jobdef_sense_alarm;
+static int hf_4607_jobdef_terrain_model;
+static int hf_4607_jobdef_geoid_model;
 
 /* Platform Location Segment */
-static int hf_4607_platloc_time = -1;
-static int hf_4607_platloc_latitude = -1;
-static int hf_4607_platloc_longitude = -1;
-static int hf_4607_platloc_altitude = -1;
-static int hf_4607_platloc_track = -1;
-static int hf_4607_platloc_speed = -1;
-static int hf_4607_platloc_vertical_velocity = -1;
+static int hf_4607_platloc_time;
+static int hf_4607_platloc_latitude;
+static int hf_4607_platloc_longitude;
+static int hf_4607_platloc_altitude;
+static int hf_4607_platloc_track;
+static int hf_4607_platloc_speed;
+static int hf_4607_platloc_vertical_velocity;
 
 /* Subtree pointers */
-static gint ett_4607_hdr = -1;
-static gint ett_4607_seg = -1;
-static gint ett_4607_rpt = -1;
+static gint ett_4607_hdr;
+static gint ett_4607_seg;
+static gint ett_4607_rpt;
 
 /* Error pointers */
-static expert_field ei_bad_length      = EI_INIT;
-static expert_field ei_too_short       = EI_INIT;
-static expert_field ei_bad_packet_size = EI_INIT;
+static expert_field ei_bad_length;
+static expert_field ei_too_short;
+static expert_field ei_bad_packet_size;
 
 static dissector_handle_t stanag4607_handle;
 
diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c
index d1eccb23ab..9dd7986a17 100644
--- a/epan/dissectors/packet-starteam.c
+++ b/epan/dissectors/packet-starteam.c
@@ -24,31 +24,31 @@
 void proto_register_starteam(void);
 void proto_reg_handoff_starteam(void);
 
-static int proto_starteam = -1;
-
-static int hf_starteam_mdh_session_tag = -1;
-static int hf_starteam_mdh_ctimestamp = -1;
-static int hf_starteam_mdh_flags = -1;
-static int hf_starteam_mdh_keyid = -1;
-static int hf_starteam_mdh_reserved = -1;
-static int hf_starteam_ph_signature = -1;
-static int hf_starteam_ph_packet_size = -1;
-static int hf_starteam_ph_data_size = -1;
-static int hf_starteam_ph_data_flags = -1;
-static int hf_starteam_id_revision_level = -1;
-static int hf_starteam_id_client = -1;
-static int hf_starteam_id_connect = -1;
-static int hf_starteam_id_component = -1;
-static int hf_starteam_id_command = -1;
-static int hf_starteam_id_command_time = -1;
-static int hf_starteam_id_command_userid = -1;
-static int hf_starteam_data_data = -1;
-
-static gint ett_starteam = -1;
-static gint ett_starteam_mdh = -1;
-static gint ett_starteam_ph = -1;
-static gint ett_starteam_id = -1;
-static gint ett_starteam_data = -1;
+static int proto_starteam;
+
+static int hf_starteam_mdh_session_tag;
+static int hf_starteam_mdh_ctimestamp;
+static int hf_starteam_mdh_flags;
+static int hf_starteam_mdh_keyid;
+static int hf_starteam_mdh_reserved;
+static int hf_starteam_ph_signature;
+static int hf_starteam_ph_packet_size;
+static int hf_starteam_ph_data_size;
+static int hf_starteam_ph_data_flags;
+static int hf_starteam_id_revision_level;
+static int hf_starteam_id_client;
+static int hf_starteam_id_connect;
+static int hf_starteam_id_component;
+static int hf_starteam_id_command;
+static int hf_starteam_id_command_time;
+static int hf_starteam_id_command_userid;
+static int hf_starteam_data_data;
+
+static gint ett_starteam;
+static gint ett_starteam_mdh;
+static gint ett_starteam_ph;
+static gint ett_starteam_id;
+static gint ett_starteam_data;
 
 static dissector_handle_t starteam_tcp_handle;
 
diff --git a/epan/dissectors/packet-stat-notify.c b/epan/dissectors/packet-stat-notify.c
index b17053b8ae..e4d521ba0d 100644
--- a/epan/dissectors/packet-stat-notify.c
+++ b/epan/dissectors/packet-stat-notify.c
@@ -17,13 +17,13 @@
 void proto_register_statnotify(void);
 void proto_reg_handoff_statnotify(void);
 
-static int proto_statnotify = -1;
-static int hf_statnotify_procedure_v1 = -1;
-static int hf_statnotify_name = -1;
-static int hf_statnotify_state = -1;
-static int hf_statnotify_priv = -1;
+static int proto_statnotify;
+static int hf_statnotify_procedure_v1;
+static int hf_statnotify_name;
+static int hf_statnotify_state;
+static int hf_statnotify_priv;
 
-static gint ett_statnotify = -1;
+static gint ett_statnotify;
 
 
 static int
diff --git a/epan/dissectors/packet-stat.c b/epan/dissectors/packet-stat.c
index 01373cec60..69f3af4305 100644
--- a/epan/dissectors/packet-stat.c
+++ b/epan/dissectors/packet-stat.c
@@ -38,29 +38,29 @@ static const value_string stat_res[] =
 	{ 0, NULL }
 };
 
-static int proto_stat = -1;
-
-static int hf_stat_mon = -1;
-static int hf_stat_mon_id_name = -1;
-static int hf_stat_mon_name = -1;
-static int hf_stat_my_id = -1;
-static int hf_stat_my_id_hostname = -1;
-static int hf_stat_my_id_proc = -1;
-static int hf_stat_my_id_prog = -1;
-static int hf_stat_my_id_vers = -1;
-static int hf_stat_priv = -1;
-static int hf_stat_procedure_v1 = -1;
-static int hf_stat_stat_chge = -1;
-static int hf_stat_stat_res = -1;
-static int hf_stat_stat_res_res = -1;
-static int hf_stat_stat_res_state = -1;
-static int hf_stat_state = -1;
-
-static gint ett_stat = -1;
-static gint ett_stat_stat_res = -1;
-static gint ett_stat_mon = -1;
-static gint ett_stat_my_id = -1;
-static gint ett_stat_stat_chge = -1;
+static int proto_stat;
+
+static int hf_stat_mon;
+static int hf_stat_mon_id_name;
+static int hf_stat_mon_name;
+static int hf_stat_my_id;
+static int hf_stat_my_id_hostname;
+static int hf_stat_my_id_proc;
+static int hf_stat_my_id_prog;
+static int hf_stat_my_id_vers;
+static int hf_stat_priv;
+static int hf_stat_procedure_v1;
+static int hf_stat_stat_chge;
+static int hf_stat_stat_res;
+static int hf_stat_stat_res_res;
+static int hf_stat_stat_res_state;
+static int hf_stat_state;
+
+static gint ett_stat;
+static gint ett_stat_stat_res;
+static gint ett_stat_mon;
+static gint ett_stat_my_id;
+static gint ett_stat_stat_chge;
 
 #define STAT_SUCC	0
 #define STAT_FAIL	1
diff --git a/epan/dissectors/packet-stcsig.c b/epan/dissectors/packet-stcsig.c
index 5fa0c0081c..7c51b558c6 100644
--- a/epan/dissectors/packet-stcsig.c
+++ b/epan/dissectors/packet-stcsig.c
@@ -40,24 +40,24 @@ void proto_reg_handoff_stcsig(void);
 #define PROTO_SHORT_NAME "STCSIG"
 #define PROTO_LONG_NAME "Spirent Test Center Signature"
 
-static int proto_stcsig = -1;
-
-static int hf_stcsig_csp = -1;
-static int hf_stcsig_iv = -1;
-static int hf_stcsig_prbseq = -1;
-static int hf_stcsig_rawdata = -1;
-static int hf_stcsig_seqnum_complement = -1;
-static int hf_stcsig_seqnum_edm = -1;
-static int hf_stcsig_seqnum_sm = -1;
-static int hf_stcsig_streamid = -1;
-static int hf_stcsig_streamindex = -1;
-static int hf_stcsig_streamtype = -1;
-static int hf_stcsig_timestamp = -1;
-static int hf_stcsig_tslr = -1;
-static int hf_stcsig_unknown = -1;
-
-static gint ett_stcsig = -1;
-static gint ett_stcsig_streamid = -1;
+static int proto_stcsig;
+
+static int hf_stcsig_csp;
+static int hf_stcsig_iv;
+static int hf_stcsig_prbseq;
+static int hf_stcsig_rawdata;
+static int hf_stcsig_seqnum_complement;
+static int hf_stcsig_seqnum_edm;
+static int hf_stcsig_seqnum_sm;
+static int hf_stcsig_streamid;
+static int hf_stcsig_streamindex;
+static int hf_stcsig_streamtype;
+static int hf_stcsig_timestamp;
+static int hf_stcsig_tslr;
+static int hf_stcsig_unknown;
+
+static gint ett_stcsig;
+static gint ett_stcsig_streamid;
 
 static const true_false_string tfs_end_start = { "EndOfFrame", "StartOfFrame" };
 
diff --git a/epan/dissectors/packet-steam-ihs-discovery.c b/epan/dissectors/packet-steam-ihs-discovery.c
index 8c5748b63f..65fe9e91e4 100644
--- a/epan/dissectors/packet-steam-ihs-discovery.c
+++ b/epan/dissectors/packet-steam-ihs-discovery.c
@@ -31,55 +31,55 @@ void proto_register_steam_ihs_discovery(void);
 
 static dissector_handle_t steam_ihs_discovery_handle;
 
-static int proto_steam_ihs_discovery = -1;
-
-static int hf_steam_ihs_discovery_signature = -1;
-static int hf_steam_ihs_discovery_header_length = -1;
-static int hf_steam_ihs_discovery_header_clientid = -1;
-static int hf_steam_ihs_discovery_header_msgtype = -1;
-static int hf_steam_ihs_discovery_header_instanceid = -1;
-static int hf_steam_ihs_discovery_body_length = -1;
-static int hf_steam_ihs_discovery_body_discovery_seqnum = -1;
-static int hf_steam_ihs_discovery_body_discovery_clientids = -1;
-static int hf_steam_ihs_discovery_body_status_version = -1;
-static int hf_steam_ihs_discovery_body_status_minversion = -1;
-static int hf_steam_ihs_discovery_body_status_connectport = -1;
-static int hf_steam_ihs_discovery_body_status_hostname = -1;
-static int hf_steam_ihs_discovery_body_status_enabledservices = -1;
-static int hf_steam_ihs_discovery_body_status_ostype = -1;
-static int hf_steam_ihs_discovery_body_status_is64bit = -1;
-static int hf_steam_ihs_discovery_body_status_euniverse = -1;
-static int hf_steam_ihs_discovery_body_status_timestamp = -1;
-static int hf_steam_ihs_discovery_body_status_screenlocked = -1;
-static int hf_steam_ihs_discovery_body_status_gamesrunning = -1;
-static int hf_steam_ihs_discovery_body_status_macaddresses = -1;
-static int hf_steam_ihs_discovery_body_status_user_steamid = -1;
-static int hf_steam_ihs_discovery_body_status_user_authkeyid = -1;
-static int hf_steam_ihs_discovery_body_authrequest_devicetoken = -1;
-static int hf_steam_ihs_discovery_body_authrequest_devicename = -1;
-static int hf_steam_ihs_discovery_body_authrequest_encryptedrequest = -1;
-static int hf_steam_ihs_discovery_body_authresponse_authresult = -1;
-static int hf_steam_ihs_discovery_body_streamingrequest_requestid = -1;
-static int hf_steam_ihs_discovery_body_streamingrequest_maximumresolutionx = -1;
-static int hf_steam_ihs_discovery_body_streamingrequest_maximumresolutiony = -1;
-static int hf_steam_ihs_discovery_body_streamingrequest_audiochannelcount = -1;
-static int hf_steam_ihs_discovery_body_streamingrequest_deviceversion = -1;
-static int hf_steam_ihs_discovery_body_streamingrequest_streamdesktop = -1;
-static int hf_steam_ihs_discovery_body_streamingrequest_devicetoken = -1;
-static int hf_steam_ihs_discovery_body_streamingrequest_pin = -1;
-static int hf_steam_ihs_discovery_body_streamingrequest_enablevideostreaming = -1;
-static int hf_steam_ihs_discovery_body_streamingrequest_enableaudiostreaming = -1;
-static int hf_steam_ihs_discovery_body_streamingrequest_enableinputstreaming = -1;
-static int hf_steam_ihs_discovery_body_streamingcancelrequest_requestid = -1;
-static int hf_steam_ihs_discovery_body_streamingresponse_requestid = -1;
-static int hf_steam_ihs_discovery_body_streamingresponse_result = -1;
-static int hf_steam_ihs_discovery_body_streamingresponse_port = -1;
-static int hf_steam_ihs_discovery_body_streamingresponse_encryptedsessionkey = -1;
-static int hf_steam_ihs_discovery_body_streamingresponse_virtualherelicenseddevicecount = -1;
-static int hf_steam_ihs_discovery_body_proofrequest_challenge = -1;
-static int hf_steam_ihs_discovery_body_proofresponse_response = -1;
-static int hf_steam_ihs_discovery_unknown_data = -1;
-static int hf_steam_ihs_discovery_unknown_number = -1;
+static int proto_steam_ihs_discovery;
+
+static int hf_steam_ihs_discovery_signature;
+static int hf_steam_ihs_discovery_header_length;
+static int hf_steam_ihs_discovery_header_clientid;
+static int hf_steam_ihs_discovery_header_msgtype;
+static int hf_steam_ihs_discovery_header_instanceid;
+static int hf_steam_ihs_discovery_body_length;
+static int hf_steam_ihs_discovery_body_discovery_seqnum;
+static int hf_steam_ihs_discovery_body_discovery_clientids;
+static int hf_steam_ihs_discovery_body_status_version;
+static int hf_steam_ihs_discovery_body_status_minversion;
+static int hf_steam_ihs_discovery_body_status_connectport;
+static int hf_steam_ihs_discovery_body_status_hostname;
+static int hf_steam_ihs_discovery_body_status_enabledservices;
+static int hf_steam_ihs_discovery_body_status_ostype;
+static int hf_steam_ihs_discovery_body_status_is64bit;
+static int hf_steam_ihs_discovery_body_status_euniverse;
+static int hf_steam_ihs_discovery_body_status_timestamp;
+static int hf_steam_ihs_discovery_body_status_screenlocked;
+static int hf_steam_ihs_discovery_body_status_gamesrunning;
+static int hf_steam_ihs_discovery_body_status_macaddresses;
+static int hf_steam_ihs_discovery_body_status_user_steamid;
+static int hf_steam_ihs_discovery_body_status_user_authkeyid;
+static int hf_steam_ihs_discovery_body_authrequest_devicetoken;
+static int hf_steam_ihs_discovery_body_authrequest_devicename;
+static int hf_steam_ihs_discovery_body_authrequest_encryptedrequest;
+static int hf_steam_ihs_discovery_body_authresponse_authresult;
+static int hf_steam_ihs_discovery_body_streamingrequest_requestid;
+static int hf_steam_ihs_discovery_body_streamingrequest_maximumresolutionx;
+static int hf_steam_ihs_discovery_body_streamingrequest_maximumresolutiony;
+static int hf_steam_ihs_discovery_body_streamingrequest_audiochannelcount;
+static int hf_steam_ihs_discovery_body_streamingrequest_deviceversion;
+static int hf_steam_ihs_discovery_body_streamingrequest_streamdesktop;
+static int hf_steam_ihs_discovery_body_streamingrequest_devicetoken;
+static int hf_steam_ihs_discovery_body_streamingrequest_pin;
+static int hf_steam_ihs_discovery_body_streamingrequest_enablevideostreaming;
+static int hf_steam_ihs_discovery_body_streamingrequest_enableaudiostreaming;
+static int hf_steam_ihs_discovery_body_streamingrequest_enableinputstreaming;
+static int hf_steam_ihs_discovery_body_streamingcancelrequest_requestid;
+static int hf_steam_ihs_discovery_body_streamingresponse_requestid;
+static int hf_steam_ihs_discovery_body_streamingresponse_result;
+static int hf_steam_ihs_discovery_body_streamingresponse_port;
+static int hf_steam_ihs_discovery_body_streamingresponse_encryptedsessionkey;
+static int hf_steam_ihs_discovery_body_streamingresponse_virtualherelicenseddevicecount;
+static int hf_steam_ihs_discovery_body_proofrequest_challenge;
+static int hf_steam_ihs_discovery_body_proofresponse_response;
+static int hf_steam_ihs_discovery_unknown_data;
+static int hf_steam_ihs_discovery_unknown_number;
 
 static const val64_string hf_steam_ihs_discovery_header_msgtype_strings[] = {
     {  0, "Client Discovery" },
@@ -125,17 +125,17 @@ static const val64_string hf_steam_ihs_discovery_body_streamingresponse_result_s
     { 0, NULL }
 };
 
-static expert_field ei_steam_ihs_discovery_unknown_data = EI_INIT;
-static expert_field ei_steam_ihs_discovery_unknown_number = EI_INIT;
-static expert_field ei_steam_ihs_discovery_unknown_lengthdelimited = EI_INIT;
-static expert_field ei_steam_ihs_discovery_invalid_wiretype = EI_INIT;
-static expert_field ei_steam_ihs_discovery_invalid_length = EI_INIT;
+static expert_field ei_steam_ihs_discovery_unknown_data;
+static expert_field ei_steam_ihs_discovery_unknown_number;
+static expert_field ei_steam_ihs_discovery_unknown_lengthdelimited;
+static expert_field ei_steam_ihs_discovery_invalid_wiretype;
+static expert_field ei_steam_ihs_discovery_invalid_length;
 
 #define STEAM_IHS_DISCOVERY_UDP_PORT 27036
 
 /* Initialize the subtree pointers */
-static gint ett_steam_ihs_discovery = -1;
-static gint ett_steam_ihs_discovery_body_status_user = -1;
+static gint ett_steam_ihs_discovery;
+static gint ett_steam_ihs_discovery_body_status_user;
 
 #define STEAM_IHS_DISCOVERY_MIN_LENGTH 12
 #define STEAM_IHS_DISCOVERY_SIGNATURE_LENGTH 8
diff --git a/epan/dissectors/packet-stt.c b/epan/dissectors/packet-stt.c
index 26f5515937..5ecce25180 100644
--- a/epan/dissectors/packet-stt.c
+++ b/epan/dissectors/packet-stt.c
@@ -53,74 +53,74 @@ static gboolean pref_check_checksum = FALSE;
 void proto_register_stt(void);
 void proto_reg_handoff_stt(void);
 
-static int proto_stt = -1;
-
-static int hf_stt_stream_id = -1;
-static int hf_stt_dport = -1;
-static int hf_stt_pkt_len = -1;
-static int hf_stt_seg_off = -1;
-static int hf_stt_pkt_id = -1;
-static int hf_stt_checksum = -1;
-static int hf_stt_checksum_status = -1;
-static int hf_stt_tcp_data = -1;
-static int hf_stt_tcp_data_offset = -1;
-static int hf_stt_tcp_flags = -1;
-static int hf_stt_tcp_rsvd = -1;
-static int hf_stt_tcp_ns = -1;
-static int hf_stt_tcp_cwr = -1;
-static int hf_stt_tcp_ece = -1;
-static int hf_stt_tcp_urg = -1;
-static int hf_stt_tcp_ack = -1;
-static int hf_stt_tcp_psh = -1;
-static int hf_stt_tcp_rst = -1;
-static int hf_stt_tcp_syn = -1;
-static int hf_stt_tcp_fin = -1;
-static int hf_stt_tcp_window = -1;
-static int hf_stt_tcp_urg_ptr = -1;
-
-static int hf_stt_version = -1;
-static int hf_stt_flags = -1;
-static int hf_stt_flag_rsvd = -1;
-static int hf_stt_flag_tcp = -1;
-static int hf_stt_flag_ipv4 = -1;
-static int hf_stt_flag_partial = -1;
-static int hf_stt_flag_verified = -1;
-static int hf_stt_l4_offset = -1;
-static int hf_stt_reserved_8 = -1;
-static int hf_stt_mss = -1;
-static int hf_stt_vlan = -1;
-static int hf_stt_pcp = -1;
-static int hf_stt_v = -1;
-static int hf_stt_vlan_id= -1;
-static int hf_stt_context_id = -1;
-static int hf_stt_padding = -1;
-
-static int hf_segments = -1;
-static int hf_segment = -1;
-static int hf_segment_overlap = -1;
-static int hf_segment_overlap_conflict = -1;
-static int hf_segment_multiple_tails = -1;
-static int hf_segment_too_long_fragment = -1;
-static int hf_segment_error = -1;
-static int hf_segment_count = -1;
-static int hf_reassembled_in = -1;
-static int hf_reassembled_length = -1;
-
-static int ett_stt = -1;
-static int ett_stt_tcp_data = -1;
-static int ett_stt_tcp_flags = -1;
-static int ett_stt_flgs = -1;
-static int ett_stt_vlan = -1;
-static int ett_segment = -1;
-static int ett_segments = -1;
+static int proto_stt;
+
+static int hf_stt_stream_id;
+static int hf_stt_dport;
+static int hf_stt_pkt_len;
+static int hf_stt_seg_off;
+static int hf_stt_pkt_id;
+static int hf_stt_checksum;
+static int hf_stt_checksum_status;
+static int hf_stt_tcp_data;
+static int hf_stt_tcp_data_offset;
+static int hf_stt_tcp_flags;
+static int hf_stt_tcp_rsvd;
+static int hf_stt_tcp_ns;
+static int hf_stt_tcp_cwr;
+static int hf_stt_tcp_ece;
+static int hf_stt_tcp_urg;
+static int hf_stt_tcp_ack;
+static int hf_stt_tcp_psh;
+static int hf_stt_tcp_rst;
+static int hf_stt_tcp_syn;
+static int hf_stt_tcp_fin;
+static int hf_stt_tcp_window;
+static int hf_stt_tcp_urg_ptr;
+
+static int hf_stt_version;
+static int hf_stt_flags;
+static int hf_stt_flag_rsvd;
+static int hf_stt_flag_tcp;
+static int hf_stt_flag_ipv4;
+static int hf_stt_flag_partial;
+static int hf_stt_flag_verified;
+static int hf_stt_l4_offset;
+static int hf_stt_reserved_8;
+static int hf_stt_mss;
+static int hf_stt_vlan;
+static int hf_stt_pcp;
+static int hf_stt_v;
+static int hf_stt_vlan_id;
+static int hf_stt_context_id;
+static int hf_stt_padding;
+
+static int hf_segments;
+static int hf_segment;
+static int hf_segment_overlap;
+static int hf_segment_overlap_conflict;
+static int hf_segment_multiple_tails;
+static int hf_segment_too_long_fragment;
+static int hf_segment_error;
+static int hf_segment_count;
+static int hf_reassembled_in;
+static int hf_reassembled_length;
+
+static int ett_stt;
+static int ett_stt_tcp_data;
+static int ett_stt_tcp_flags;
+static int ett_stt_flgs;
+static int ett_stt_vlan;
+static int ett_segment;
+static int ett_segments;
 
 static reassembly_table stt_reassembly_table;
 
-static expert_field ei_stt_ver_unknown = EI_INIT;
-static expert_field ei_stt_checksum_bad = EI_INIT;
-static expert_field ei_stt_data_offset_bad = EI_INIT;
-static expert_field ei_stt_l4_offset = EI_INIT;
-static expert_field ei_stt_mss = EI_INIT;
+static expert_field ei_stt_ver_unknown;
+static expert_field ei_stt_checksum_bad;
+static expert_field ei_stt_data_offset_bad;
+static expert_field ei_stt_l4_offset;
+static expert_field ei_stt_mss;
 
 static dissector_handle_t eth_handle;
 
diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c
index af30533f5a..0ad855c7e8 100644
--- a/epan/dissectors/packet-stun.c
+++ b/epan/dissectors/packet-stun.c
@@ -147,107 +147,107 @@ static dissector_handle_t stun_tcp_handle;
 static dissector_handle_t stun_udp_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_stun = -1;
-
-static int hf_stun_channel = -1;
-
-
-static int hf_stun_tcp_frame_length = -1;
-static int hf_stun_type = -1;
-static int hf_stun_type_class = -1;
-static int hf_stun_type_method = -1;
-static int hf_stun_type_method_assignment = -1;
-static int hf_stun_length = -1;
-static int hf_stun_cookie = -1;
-static int hf_stun_id = -1;
-static int hf_stun_attributes = -1;
-static int hf_stun_response_in = -1;
-static int hf_stun_response_to = -1;
-static int hf_stun_time = -1;
-static int hf_stun_duplicate = -1;
-static int hf_stun_attr = -1;
-
-static int hf_stun_att_type = -1; /* STUN attribute fields */
-static int hf_stun_att_length = -1;
-static int hf_stun_att_family = -1;
-static int hf_stun_att_type_comprehension = -1;
-static int hf_stun_att_type_assignment = -1;
-static int hf_stun_att_ipv4 = -1;
-static int hf_stun_att_ipv6 = -1;
-static int hf_stun_att_port = -1;
-static int hf_stun_att_username = -1;
-static int hf_stun_att_username_opaque = -1;
-static int hf_stun_att_password = -1;
-static int hf_stun_att_padding = -1;
-static int hf_stun_att_hmac = -1;
-static int hf_stun_att_crc32 = -1;
-static int hf_stun_att_crc32_status = -1;
-static int hf_stun_att_error_class = -1;
-static int hf_stun_att_error_number = -1;
-static int hf_stun_att_error_reason = -1;
-static int hf_stun_att_realm = -1;
-static int hf_stun_att_nonce = -1;
-static int hf_stun_att_unknown = -1;
-static int hf_stun_att_xor_ipv4 = -1;
-static int hf_stun_att_xor_ipv6 = -1;
-static int hf_stun_att_xor_port = -1;
-static int hf_stun_att_icmp_type = -1;
-static int hf_stun_att_icmp_code = -1;
-static int hf_stun_att_ms_turn_unknown_8006 = -1;
-static int hf_stun_att_software = -1;
-static int hf_stun_att_priority = -1;
-static int hf_stun_att_tie_breaker = -1;
-static int hf_stun_att_change_ip = -1;
-static int hf_stun_att_change_port = -1;
-static int hf_stun_att_cache_timeout = -1;
-static int hf_stun_att_token = -1;
-static int hf_stun_att_pw_alg = -1;
-static int hf_stun_att_pw_alg_param_len = -1;
-static int hf_stun_att_pw_alg_param_data = -1;
-static int hf_stun_att_reserve_next = -1;
-static int hf_stun_att_reserved = -1;
-static int hf_stun_att_value = -1;
-static int hf_stun_att_transp = -1;
-static int hf_stun_att_magic_cookie = -1;
-static int hf_stun_att_bandwidth = -1;
-static int hf_stun_att_lifetime = -1;
-static int hf_stun_att_channelnum = -1;
-static int hf_stun_att_ms_version = -1;
-static int hf_stun_att_ms_version_ice = -1;
-static int hf_stun_att_ms_connection_id = -1;
-static int hf_stun_att_ms_sequence_number = -1;
-static int hf_stun_att_ms_stream_type = -1;
-static int hf_stun_att_ms_service_quality = -1;
-static int hf_stun_att_ms_foundation = -1;
-static int hf_stun_att_ms_multiplexed_turn_session_id = -1;
-static int hf_stun_att_ms_turn_session_id = -1;
-static int hf_stun_att_bandwidth_acm_type = -1;
-static int hf_stun_att_bandwidth_rsv_id = -1;
-static int hf_stun_att_bandwidth_rsv_amount_misb = -1;
-static int hf_stun_att_bandwidth_rsv_amount_masb = -1;
-static int hf_stun_att_bandwidth_rsv_amount_mirb = -1;
-static int hf_stun_att_bandwidth_rsv_amount_marb = -1;
-static int hf_stun_att_address_rp_a = -1;
-static int hf_stun_att_address_rp_b = -1;
-static int hf_stun_att_address_rp_rsv1 = -1;
-static int hf_stun_att_address_rp_rsv2 = -1;
-static int hf_stun_att_address_rp_masb = -1;
-static int hf_stun_att_address_rp_marb = -1;
-static int hf_stun_att_sip_dialog_id = -1;
-static int hf_stun_att_sip_call_id = -1;
-static int hf_stun_att_lp_peer_location = -1;
-static int hf_stun_att_lp_self_location = -1;
-static int hf_stun_att_lp_federation = -1;
-static int hf_stun_att_google_network_id = -1;
-static int hf_stun_att_google_network_cost = -1;
-static int hf_stun_network_version = -1;
+static int proto_stun;
+
+static int hf_stun_channel;
+
+
+static int hf_stun_tcp_frame_length;
+static int hf_stun_type;
+static int hf_stun_type_class;
+static int hf_stun_type_method;
+static int hf_stun_type_method_assignment;
+static int hf_stun_length;
+static int hf_stun_cookie;
+static int hf_stun_id;
+static int hf_stun_attributes;
+static int hf_stun_response_in;
+static int hf_stun_response_to;
+static int hf_stun_time;
+static int hf_stun_duplicate;
+static int hf_stun_attr;
+
+static int hf_stun_att_type; /* STUN attribute fields */
+static int hf_stun_att_length;
+static int hf_stun_att_family;
+static int hf_stun_att_type_comprehension;
+static int hf_stun_att_type_assignment;
+static int hf_stun_att_ipv4;
+static int hf_stun_att_ipv6;
+static int hf_stun_att_port;
+static int hf_stun_att_username;
+static int hf_stun_att_username_opaque;
+static int hf_stun_att_password;
+static int hf_stun_att_padding;
+static int hf_stun_att_hmac;
+static int hf_stun_att_crc32;
+static int hf_stun_att_crc32_status;
+static int hf_stun_att_error_class;
+static int hf_stun_att_error_number;
+static int hf_stun_att_error_reason;
+static int hf_stun_att_realm;
+static int hf_stun_att_nonce;
+static int hf_stun_att_unknown;
+static int hf_stun_att_xor_ipv4;
+static int hf_stun_att_xor_ipv6;
+static int hf_stun_att_xor_port;
+static int hf_stun_att_icmp_type;
+static int hf_stun_att_icmp_code;
+static int hf_stun_att_ms_turn_unknown_8006;
+static int hf_stun_att_software;
+static int hf_stun_att_priority;
+static int hf_stun_att_tie_breaker;
+static int hf_stun_att_change_ip;
+static int hf_stun_att_change_port;
+static int hf_stun_att_cache_timeout;
+static int hf_stun_att_token;
+static int hf_stun_att_pw_alg;
+static int hf_stun_att_pw_alg_param_len;
+static int hf_stun_att_pw_alg_param_data;
+static int hf_stun_att_reserve_next;
+static int hf_stun_att_reserved;
+static int hf_stun_att_value;
+static int hf_stun_att_transp;
+static int hf_stun_att_magic_cookie;
+static int hf_stun_att_bandwidth;
+static int hf_stun_att_lifetime;
+static int hf_stun_att_channelnum;
+static int hf_stun_att_ms_version;
+static int hf_stun_att_ms_version_ice;
+static int hf_stun_att_ms_connection_id;
+static int hf_stun_att_ms_sequence_number;
+static int hf_stun_att_ms_stream_type;
+static int hf_stun_att_ms_service_quality;
+static int hf_stun_att_ms_foundation;
+static int hf_stun_att_ms_multiplexed_turn_session_id;
+static int hf_stun_att_ms_turn_session_id;
+static int hf_stun_att_bandwidth_acm_type;
+static int hf_stun_att_bandwidth_rsv_id;
+static int hf_stun_att_bandwidth_rsv_amount_misb;
+static int hf_stun_att_bandwidth_rsv_amount_masb;
+static int hf_stun_att_bandwidth_rsv_amount_mirb;
+static int hf_stun_att_bandwidth_rsv_amount_marb;
+static int hf_stun_att_address_rp_a;
+static int hf_stun_att_address_rp_b;
+static int hf_stun_att_address_rp_rsv1;
+static int hf_stun_att_address_rp_rsv2;
+static int hf_stun_att_address_rp_masb;
+static int hf_stun_att_address_rp_marb;
+static int hf_stun_att_sip_dialog_id;
+static int hf_stun_att_sip_call_id;
+static int hf_stun_att_lp_peer_location;
+static int hf_stun_att_lp_self_location;
+static int hf_stun_att_lp_federation;
+static int hf_stun_att_google_network_id;
+static int hf_stun_att_google_network_cost;
+static int hf_stun_network_version;
 
 /* Expert items */
-static expert_field ei_stun_short_packet = EI_INIT;
-static expert_field ei_stun_wrong_msglen = EI_INIT;
-static expert_field ei_stun_long_attribute = EI_INIT;
-static expert_field ei_stun_unknown_attribute = EI_INIT;
-static expert_field ei_stun_fingerprint_bad = EI_INIT;
+static expert_field ei_stun_short_packet;
+static expert_field ei_stun_wrong_msglen;
+static expert_field ei_stun_long_attribute;
+static expert_field ei_stun_unknown_attribute;
+static expert_field ei_stun_fingerprint_bad;
 
 /* Structure containing transaction specific information */
 typedef struct _stun_transaction_t {
@@ -441,11 +441,11 @@ typedef struct _stun_conv_info_t {
 #define MS_MULTIPLEX_TURN 0xFF10
 
 /* Initialize the subtree pointers */
-static gint ett_stun = -1;
-static gint ett_stun_type = -1;
-static gint ett_stun_att_all= -1;
-static gint ett_stun_att = -1;
-static gint ett_stun_att_type = -1;
+static gint ett_stun;
+static gint ett_stun_type;
+static gint ett_stun_att_all;
+static gint ett_stun_att;
+static gint ett_stun_att_type;
 
 #define UDP_PORT_STUN   3478
 #define TCP_PORT_STUN   3478
diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index 18768d94e4..e75bae1b38 100644
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -222,138 +222,138 @@ const value_string sua_co_class_type_acro_values[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_sua = -1;
-static int hf_sua_version = -1;
-static int hf_sua_reserved = -1;
-static int hf_sua_message_class = -1;
-static int hf_sua_message_type = -1;
-static int hf_sua_message_length = -1;
-static int hf_sua_parameter_tag = -1;
-static int hf_sua_v8_parameter_tag = -1;
-static int hf_sua_parameter_length = -1;
-static int hf_sua_parameter_value = -1;
-static int hf_sua_parameter_padding = -1;
-static int hf_sua_info_string = -1;
-static int hf_sua_routing_context = -1;
-static int hf_sua_diagnostic_information_info = -1;
-static int hf_sua_heartbeat_data = -1;
-static int hf_sua_traffic_mode_type = -1;
-static int hf_sua_error_code = -1;
-static int hf_sua_v8_error_code = -1;
-static int hf_sua_status_type = -1;
-static int hf_sua_status_info = -1;
-static int hf_sua_congestion_level = -1;
-static int hf_sua_asp_identifier = -1;
-static int hf_sua_mask = -1;
-static int hf_sua_dpc = -1;
-static int hf_sua_registration_status = -1;
-static int hf_sua_deregistration_status = -1;
-static int hf_sua_local_routing_key_identifier = -1;
-
-static int hf_sua_source_address_routing_indicator = -1;
-static int hf_sua_source_address_reserved_bits = -1;
-static int hf_sua_source_address_gt_bit = -1;
-static int hf_sua_source_address_pc_bit = -1;
-static int hf_sua_source_address_ssn_bit = -1;
-static int hf_sua_source_gt_reserved = -1;
-static int hf_sua_source_gti = -1;
-static int hf_sua_source_number_of_digits = -1;
-static int hf_sua_source_translation_type = -1;
-static int hf_sua_source_numbering_plan = -1;
-static int hf_sua_source_nature_of_address = -1;
-static int hf_sua_source_global_title_digits = -1;
-static int hf_sua_source_point_code = -1;
-static int hf_sua_source_ssn_reserved = -1;
-static int hf_sua_source_ssn_number = -1;
-static int hf_sua_source_ipv4 = -1;
-static int hf_sua_source_hostname = -1;
-static int hf_sua_source_ipv6 = -1;
-
-static int hf_sua_destination_address_routing_indicator = -1;
-static int hf_sua_destination_address_reserved_bits = -1;
-static int hf_sua_destination_address_gt_bit = -1;
-static int hf_sua_destination_address_pc_bit = -1;
-static int hf_sua_destination_address_ssn_bit = -1;
-static int hf_sua_dest_gt_reserved = -1;
-static int hf_sua_dest_gti = -1;
-static int hf_sua_dest_number_of_digits = -1;
-static int hf_sua_dest_translation_type = -1;
-static int hf_sua_dest_numbering_plan = -1;
-static int hf_sua_dest_nature_of_address = -1;
-static int hf_sua_dest_global_title_digits = -1;
-static int hf_sua_dest_point_code = -1;
-static int hf_sua_dest_ssn_reserved = -1;
-static int hf_sua_dest_ssn_number = -1;
-static int hf_sua_dest_ipv4 = -1;
-static int hf_sua_dest_hostname = -1;
-static int hf_sua_dest_ipv6 = -1;
-
-static int hf_sua_ss7_hop_counter_counter = -1;
-static int hf_sua_ss7_hop_counter_reserved = -1;
-static int hf_sua_destination_reference_number = -1;
-static int hf_sua_source_reference_number = -1;
-static int hf_sua_cause_reserved = -1;
-static int hf_sua_cause_type = -1;
-static int hf_sua_cause_value = -1;
-static int hf_sua_sequence_number_reserved = -1;
-static int hf_sua_sequence_number_rec_number = -1;
-static int hf_sua_sequence_number_spare_bit = -1;
-static int hf_sua_sequence_number_sent_number = -1;
-static int hf_sua_sequence_number_more_data_bit = -1;
-static int hf_sua_receive_sequence_number_reserved = -1;
-static int hf_sua_receive_sequence_number_number = -1;
-static int hf_sua_receive_sequence_number_spare_bit = -1;
-static int hf_sua_protocol_classes = -1;
-static int hf_sua_protocol_class_flags = -1;
-static int hf_sua_asp_capabilities_reserved = -1;
-static int hf_sua_asp_capabilities_reserved_bits = -1;
-static int hf_sua_asp_capabilities_a_bit =-1;
-static int hf_sua_asp_capabilities_b_bit =-1;
-static int hf_sua_asp_capabilities_c_bit =-1;
-static int hf_sua_asp_capabilities_d_bit =-1;
-static int hf_sua_asp_capabilities_interworking = -1;
-static int hf_sua_credit = -1;
-static int hf_sua_data = -1;
-static int hf_sua_cause = -1;
-static int hf_sua_user = -1;
-static int hf_sua_network_appearance = -1;
-static int hf_sua_correlation_id = -1;
-static int hf_sua_importance_reserved = -1;
-static int hf_sua_importance = -1;
-static int hf_sua_message_priority_reserved = -1;
-static int hf_sua_message_priority = -1;
-static int hf_sua_protocol_class_reserved = -1;
-static int hf_sua_return_on_error_bit = -1;
-static int hf_sua_protocol_class = -1;
-static int hf_sua_sequence_control = -1;
-static int hf_sua_first_remaining = -1;
-static int hf_sua_first_bit = -1;
-static int hf_sua_number_of_remaining_segments = -1;
-static int hf_sua_segmentation_reference = -1;
-static int hf_sua_smi = -1;
-static int hf_sua_smi_reserved = -1;
-static int hf_sua_tid_label_start = -1;
-static int hf_sua_tid_label_end = -1;
-static int hf_sua_tid_label_value = -1;
-static int hf_sua_drn_label_start = -1;
-static int hf_sua_drn_label_end = -1;
-static int hf_sua_drn_label_value = -1;
-
-static int hf_sua_assoc_id = -1;
+static int proto_sua;
+static int hf_sua_version;
+static int hf_sua_reserved;
+static int hf_sua_message_class;
+static int hf_sua_message_type;
+static int hf_sua_message_length;
+static int hf_sua_parameter_tag;
+static int hf_sua_v8_parameter_tag;
+static int hf_sua_parameter_length;
+static int hf_sua_parameter_value;
+static int hf_sua_parameter_padding;
+static int hf_sua_info_string;
+static int hf_sua_routing_context;
+static int hf_sua_diagnostic_information_info;
+static int hf_sua_heartbeat_data;
+static int hf_sua_traffic_mode_type;
+static int hf_sua_error_code;
+static int hf_sua_v8_error_code;
+static int hf_sua_status_type;
+static int hf_sua_status_info;
+static int hf_sua_congestion_level;
+static int hf_sua_asp_identifier;
+static int hf_sua_mask;
+static int hf_sua_dpc;
+static int hf_sua_registration_status;
+static int hf_sua_deregistration_status;
+static int hf_sua_local_routing_key_identifier;
+
+static int hf_sua_source_address_routing_indicator;
+static int hf_sua_source_address_reserved_bits;
+static int hf_sua_source_address_gt_bit;
+static int hf_sua_source_address_pc_bit;
+static int hf_sua_source_address_ssn_bit;
+static int hf_sua_source_gt_reserved;
+static int hf_sua_source_gti;
+static int hf_sua_source_number_of_digits;
+static int hf_sua_source_translation_type;
+static int hf_sua_source_numbering_plan;
+static int hf_sua_source_nature_of_address;
+static int hf_sua_source_global_title_digits;
+static int hf_sua_source_point_code;
+static int hf_sua_source_ssn_reserved;
+static int hf_sua_source_ssn_number;
+static int hf_sua_source_ipv4;
+static int hf_sua_source_hostname;
+static int hf_sua_source_ipv6;
+
+static int hf_sua_destination_address_routing_indicator;
+static int hf_sua_destination_address_reserved_bits;
+static int hf_sua_destination_address_gt_bit;
+static int hf_sua_destination_address_pc_bit;
+static int hf_sua_destination_address_ssn_bit;
+static int hf_sua_dest_gt_reserved;
+static int hf_sua_dest_gti;
+static int hf_sua_dest_number_of_digits;
+static int hf_sua_dest_translation_type;
+static int hf_sua_dest_numbering_plan;
+static int hf_sua_dest_nature_of_address;
+static int hf_sua_dest_global_title_digits;
+static int hf_sua_dest_point_code;
+static int hf_sua_dest_ssn_reserved;
+static int hf_sua_dest_ssn_number;
+static int hf_sua_dest_ipv4;
+static int hf_sua_dest_hostname;
+static int hf_sua_dest_ipv6;
+
+static int hf_sua_ss7_hop_counter_counter;
+static int hf_sua_ss7_hop_counter_reserved;
+static int hf_sua_destination_reference_number;
+static int hf_sua_source_reference_number;
+static int hf_sua_cause_reserved;
+static int hf_sua_cause_type;
+static int hf_sua_cause_value;
+static int hf_sua_sequence_number_reserved;
+static int hf_sua_sequence_number_rec_number;
+static int hf_sua_sequence_number_spare_bit;
+static int hf_sua_sequence_number_sent_number;
+static int hf_sua_sequence_number_more_data_bit;
+static int hf_sua_receive_sequence_number_reserved;
+static int hf_sua_receive_sequence_number_number;
+static int hf_sua_receive_sequence_number_spare_bit;
+static int hf_sua_protocol_classes;
+static int hf_sua_protocol_class_flags;
+static int hf_sua_asp_capabilities_reserved;
+static int hf_sua_asp_capabilities_reserved_bits;
+static int hf_sua_asp_capabilities_a_bit;
+static int hf_sua_asp_capabilities_b_bit;
+static int hf_sua_asp_capabilities_c_bit;
+static int hf_sua_asp_capabilities_d_bit;
+static int hf_sua_asp_capabilities_interworking;
+static int hf_sua_credit;
+static int hf_sua_data;
+static int hf_sua_cause;
+static int hf_sua_user;
+static int hf_sua_network_appearance;
+static int hf_sua_correlation_id;
+static int hf_sua_importance_reserved;
+static int hf_sua_importance;
+static int hf_sua_message_priority_reserved;
+static int hf_sua_message_priority;
+static int hf_sua_protocol_class_reserved;
+static int hf_sua_return_on_error_bit;
+static int hf_sua_protocol_class;
+static int hf_sua_sequence_control;
+static int hf_sua_first_remaining;
+static int hf_sua_first_bit;
+static int hf_sua_number_of_remaining_segments;
+static int hf_sua_segmentation_reference;
+static int hf_sua_smi;
+static int hf_sua_smi_reserved;
+static int hf_sua_tid_label_start;
+static int hf_sua_tid_label_end;
+static int hf_sua_tid_label_value;
+static int hf_sua_drn_label_start;
+static int hf_sua_drn_label_end;
+static int hf_sua_drn_label_value;
+
+static int hf_sua_assoc_id;
 
 /* Initialize the subtree pointers */
-static gint ett_sua = -1;
-static gint ett_sua_parameter = -1;
-static gint ett_sua_source_address_indicator = -1;
-static gint ett_sua_destination_address_indicator = -1;
-static gint ett_sua_affected_destination = -1;
-static gint ett_sua_first_remaining = -1;
-static gint ett_sua_sequence_number_rec_number = -1;
-static gint ett_sua_sequence_number_sent_number = -1;
-static gint ett_sua_receive_sequence_number_number = -1;
-static gint ett_sua_return_on_error_bit_and_protocol_class = -1;
-static gint ett_sua_protocol_classes = -1;
-static gint ett_sua_assoc = -1;
+static gint ett_sua;
+static gint ett_sua_parameter;
+static gint ett_sua_source_address_indicator;
+static gint ett_sua_destination_address_indicator;
+static gint ett_sua_affected_destination;
+static gint ett_sua_first_remaining;
+static gint ett_sua_sequence_number_rec_number;
+static gint ett_sua_sequence_number_sent_number;
+static gint ett_sua_receive_sequence_number_number;
+static gint ett_sua_return_on_error_bit_and_protocol_class;
+static gint ett_sua_protocol_classes;
+static gint ett_sua_assoc;
 
 static int sua_tap = -1;
 
diff --git a/epan/dissectors/packet-swipe.c b/epan/dissectors/packet-swipe.c
index 0c8fee0364..3878e4f603 100644
--- a/epan/dissectors/packet-swipe.c
+++ b/epan/dissectors/packet-swipe.c
@@ -30,16 +30,16 @@ static const value_string swipe_packet_type_vals[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_swipe             = -1;
+static int proto_swipe;
 
-static int hf_swipe_packet_type    = -1;
-static int hf_swipe_len            = -1;
-static int hf_swipe_policy_id      = -1;
-static int hf_swipe_packet_seq     = -1;
-static int hf_swipe_authenticator  = -1;
+static int hf_swipe_packet_type;
+static int hf_swipe_len;
+static int hf_swipe_policy_id;
+static int hf_swipe_packet_seq;
+static int hf_swipe_authenticator;
 
 /* Initialize the subtree pointers */
-static gint ett_swipe              = -1;
+static gint ett_swipe;
 
 static dissector_handle_t swipe_handle;
 static dissector_handle_t ipv6_handle;
diff --git a/epan/dissectors/packet-symantec.c b/epan/dissectors/packet-symantec.c
index 1a0bec71a6..fe2af0f9f8 100644
--- a/epan/dissectors/packet-symantec.c
+++ b/epan/dissectors/packet-symantec.c
@@ -23,11 +23,11 @@ static dissector_handle_t symantec_handle;
 static dissector_table_t ethertype_dissector_table;
 
 /* protocols and header fields */
-static int proto_symantec = -1;
-static int hf_symantec_if = -1;
-static int hf_symantec_etype = -1;
+static int proto_symantec;
+static int hf_symantec_if;
+static int hf_symantec_etype;
 
-static gint ett_symantec = -1;
+static gint ett_symantec;
 
 static int
 dissect_symantec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-sync.c b/epan/dissectors/packet-sync.c
index 689f6f553e..43ae45e327 100644
--- a/epan/dissectors/packet-sync.c
+++ b/epan/dissectors/packet-sync.c
@@ -26,23 +26,23 @@ void proto_register_sync(void);
 void proto_reg_handoff_sync(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_sync = -1;
-static int hf_sync_type = -1;
-static int hf_sync_spare4 = -1;
-static int hf_sync_timestamp = -1;
-static int hf_sync_packet_nr = -1;
-static int hf_sync_elapsed_octet_ctr = -1;
-static int hf_sync_total_nr_of_packet = -1;
-static int hf_sync_total_nr_of_octet = -1;
-static int hf_sync_header_crc = -1;
-static int hf_sync_payload_crc = -1;
-static int hf_sync_length_of_packet = -1;
+static int proto_sync;
+static int hf_sync_type;
+static int hf_sync_spare4;
+static int hf_sync_timestamp;
+static int hf_sync_packet_nr;
+static int hf_sync_elapsed_octet_ctr;
+static int hf_sync_total_nr_of_packet;
+static int hf_sync_total_nr_of_octet;
+static int hf_sync_header_crc;
+static int hf_sync_payload_crc;
+static int hf_sync_length_of_packet;
 
 /* Initialize the subtree pointers */
-static gint ett_sync = -1;
+static gint ett_sync;
 
-static expert_field ei_sync_pdu_type2 = EI_INIT;
-static expert_field ei_sync_type = EI_INIT;
+static expert_field ei_sync_pdu_type2;
+static expert_field ei_sync_type;
 
 static dissector_handle_t sync_handle;
 static dissector_handle_t ip_handle;
diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c
index e025a4ce14..ede033a7a5 100644
--- a/epan/dissectors/packet-synergy.c
+++ b/epan/dissectors/packet-synergy.c
@@ -20,96 +20,96 @@ void proto_reg_handoff_synergy(void);
 
 #define SYNERGY_PORT        24800 /* Not IANA registered */
 
-static int proto_synergy = -1;
+static int proto_synergy;
 
-static int hf_synergy_packet_len = -1;
-static int hf_synergy_packet_type = -1;
+static int hf_synergy_packet_len;
+static int hf_synergy_packet_type;
 
-static int hf_synergy_unknown = -1;
-static int hf_synergy_handshake = -1;
-static int hf_synergy_handshake_majorversion = -1;
-static int hf_synergy_handshake_minorversion = -1;
-static int hf_synergy_handshake_clientname = -1;
+static int hf_synergy_unknown;
+static int hf_synergy_handshake;
+static int hf_synergy_handshake_majorversion;
+static int hf_synergy_handshake_minorversion;
+static int hf_synergy_handshake_clientname;
 
-static int hf_synergy_cbye = -1;
+static int hf_synergy_cbye;
 
-static int hf_synergy_cinn = -1;
-static int hf_synergy_cinn_x = -1;
-static int hf_synergy_cinn_y = -1;
-static int hf_synergy_cinn_sequence = -1;
-static int hf_synergy_cinn_modifiermask = -1;
+static int hf_synergy_cinn;
+static int hf_synergy_cinn_x;
+static int hf_synergy_cinn_y;
+static int hf_synergy_cinn_sequence;
+static int hf_synergy_cinn_modifiermask;
 
-static int hf_synergy_cout = -1;
+static int hf_synergy_cout;
 
-static int hf_synergy_cclp = -1;
-static int hf_synergy_cclp_clipboardidentifier = -1;
-static int hf_synergy_cclp_sequencenumber = -1;
+static int hf_synergy_cclp;
+static int hf_synergy_cclp_clipboardidentifier;
+static int hf_synergy_cclp_sequencenumber;
 
-static int hf_synergy_csec = -1;
+static int hf_synergy_csec;
 
-static int hf_synergy_crop = -1;
+static int hf_synergy_crop;
 
-static int hf_synergy_ciak = -1;
+static int hf_synergy_ciak;
 
-static int hf_synergy_dkdn = -1;
-static int hf_synergy_dkdn_keyid = -1;
-static int hf_synergy_dkdn_keymodifiermask = -1;
-static int hf_synergy_dkdn_keybutton = -1;
+static int hf_synergy_dkdn;
+static int hf_synergy_dkdn_keyid;
+static int hf_synergy_dkdn_keymodifiermask;
+static int hf_synergy_dkdn_keybutton;
 
-static int hf_synergy_dkrp = -1;
-static int hf_synergy_dkrp_keyid = -1;
-static int hf_synergy_dkrp_keymodifiermask = -1;
-static int hf_synergy_dkrp_numberofrepeats = -1;
-static int hf_synergy_dkrp_keybutton = -1;
+static int hf_synergy_dkrp;
+static int hf_synergy_dkrp_keyid;
+static int hf_synergy_dkrp_keymodifiermask;
+static int hf_synergy_dkrp_numberofrepeats;
+static int hf_synergy_dkrp_keybutton;
 
-static int hf_synergy_dkup = -1;
-static int hf_synergy_dkup_keyid = -1;
-static int hf_synergy_dkup_keymodifiermask = -1;
-static int hf_synergy_dkup_keybutton = -1;
+static int hf_synergy_dkup;
+static int hf_synergy_dkup_keyid;
+static int hf_synergy_dkup_keymodifiermask;
+static int hf_synergy_dkup_keybutton;
 
-static int hf_synergy_dmdn = -1;
-static int hf_synergy_dmup = -1;
+static int hf_synergy_dmdn;
+static int hf_synergy_dmup;
 
-static int hf_synergy_dmmv = -1;
-static int hf_synergy_dmmv_x = -1;
-static int hf_synergy_dmmv_y = -1;
+static int hf_synergy_dmmv;
+static int hf_synergy_dmmv_x;
+static int hf_synergy_dmmv_y;
 
-static int hf_synergy_dmrm = -1;
-static int hf_synergy_dmrm_x = -1;
-static int hf_synergy_dmrm_y = -1;
+static int hf_synergy_dmrm;
+static int hf_synergy_dmrm_x;
+static int hf_synergy_dmrm_y;
 
-static int hf_synergy_dmwm = -1;
+static int hf_synergy_dmwm;
 
-static int hf_synergy_dclp = -1;
-static int hf_synergy_dclp_clipboardidentifier = -1;
-static int hf_synergy_dclp_sequencenumber = -1;
-static int hf_synergy_dclp_clipboarddata = -1;
+static int hf_synergy_dclp;
+static int hf_synergy_dclp_clipboardidentifier;
+static int hf_synergy_dclp_sequencenumber;
+static int hf_synergy_dclp_clipboarddata;
 
-static int hf_synergy_dinf = -1;
-static int hf_synergy_dinf_clp = -1;
-static int hf_synergy_dinf_ctp= -1;
-static int hf_synergy_dinf_wsp = -1;
-static int hf_synergy_dinf_hsp = -1;
-static int hf_synergy_dinf_swz = -1;
-static int hf_synergy_dinf_x = -1;
-static int hf_synergy_dinf_y = -1;
+static int hf_synergy_dinf;
+static int hf_synergy_dinf_clp;
+static int hf_synergy_dinf_ctp;
+static int hf_synergy_dinf_wsp;
+static int hf_synergy_dinf_hsp;
+static int hf_synergy_dinf_swz;
+static int hf_synergy_dinf_x;
+static int hf_synergy_dinf_y;
 
-static int hf_synergy_dsop = -1;
+static int hf_synergy_dsop;
 
-static int hf_synergy_qinf = -1;
+static int hf_synergy_qinf;
 
-static int hf_synergy_eicv = -1;
-static int hf_synergy_eicv_majorversion = -1;
-static int hf_synergy_eicv_minorversion = -1;
+static int hf_synergy_eicv;
+static int hf_synergy_eicv_majorversion;
+static int hf_synergy_eicv_minorversion;
 
-static int hf_synergy_ebsy = -1;
+static int hf_synergy_ebsy;
 
-static int hf_synergy_eunk = -1;
+static int hf_synergy_eunk;
 
-static int hf_synergy_ebad = -1;
+static int hf_synergy_ebad;
 
 /* Initialize the subtree pointers */
-static gint ett_synergy = -1;
+static gint ett_synergy;
 
 static dissector_handle_t synergy_handle;
 
diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c
index 9ad25cac9c..5ac455bdf6 100644
--- a/epan/dissectors/packet-synphasor.c
+++ b/epan/dissectors/packet-synphasor.c
@@ -34,7 +34,7 @@ void proto_reg_handoff_synphasor(void);
 
 /* global variables */
 
-static int proto_synphasor	 = -1;
+static int proto_synphasor;
 
 /* user preferences */
 #define SYNPHASOR_TCP_PORT  4712 /* Not IANA registered */
@@ -47,131 +47,131 @@ static int proto_synphasor	 = -1;
 #define G_PMU_ID_LEN 16
 
 /* the ett... variables hold the state (open/close) of the treeview in the GUI */
-static gint ett_synphasor		= -1; /* root element for this protocol */
+static gint ett_synphasor; /* root element for this protocol */
 /* used in the common header */
-static gint ett_frtype			= -1;
-static gint ett_timequal		= -1;
+static gint ett_frtype;
+static gint ett_timequal;
 /* used for config frames */
-static gint ett_conf			= -1;
-static gint ett_conf_station		= -1;
-static gint ett_conf_format		= -1;
-static gint ett_conf_phnam		= -1;
-static gint ett_conf_annam		= -1;
-static gint ett_conf_dgnam		= -1;
-static gint ett_conf_phconv		= -1;
-static gint ett_conf_phlist		= -1;
-static gint ett_conf_phflags		= -1;
-static gint ett_conf_phmod_flags	= -1;
-static gint ett_conf_ph_user_flags	= -1;
-static gint ett_conf_anconv		= -1;
-static gint ett_conf_anlist		= -1;
-static gint ett_conf_dgmask		= -1;
-static gint ett_conf_chnam		= -1;
-static gint ett_conf_wgs84		= -1;
+static gint ett_conf;
+static gint ett_conf_station;
+static gint ett_conf_format;
+static gint ett_conf_phnam;
+static gint ett_conf_annam;
+static gint ett_conf_dgnam;
+static gint ett_conf_phconv;
+static gint ett_conf_phlist;
+static gint ett_conf_phflags;
+static gint ett_conf_phmod_flags;
+static gint ett_conf_ph_user_flags;
+static gint ett_conf_anconv;
+static gint ett_conf_anlist;
+static gint ett_conf_dgmask;
+static gint ett_conf_chnam;
+static gint ett_conf_wgs84;
 /* used for data frames */
-static gint ett_data			= -1;
-static gint ett_data_block		= -1;
-static gint ett_data_stat		= -1;
-static gint ett_data_phasors		= -1;
-static gint ett_data_analog		= -1;
-static gint ett_data_digital		= -1;
+static gint ett_data;
+static gint ett_data_block;
+static gint ett_data_stat;
+static gint ett_data_phasors;
+static gint ett_data_analog;
+static gint ett_data_digital;
 /* used for command frames */
-static gint ett_command			= -1;
-static gint ett_status_word_mask	= -1;
+static gint ett_command;
+static gint ett_status_word_mask;
 
 /* handles to the header fields hf[] in proto_register_synphasor() */
-static int hf_sync			= -1;
-static int hf_sync_frtype		= -1;
-static int hf_sync_version		= -1;
-static int hf_station_name_len		= -1;
-static int hf_station_name		= -1;
-static int hf_idcode_stream_source	= -1;
-static int hf_idcode_data_source	= -1;
-static int hf_g_pmu_id			= -1;
-static int hf_frsize			= -1;
-static int hf_soc			= -1;
-static int hf_timeqal_lsdir		= -1;
-static int hf_timeqal_lsocc		= -1;
-static int hf_timeqal_lspend		= -1;
-static int hf_timeqal_timequalindic	= -1;
-static int hf_fracsec_raw		= -1;
-static int hf_fracsec_ms		= -1;
-static int hf_cont_idx			= -1;
-static int hf_conf_timebase		= -1;
-static int hf_conf_numpmu		= -1;
-static int hf_conf_formatb3		= -1;
-static int hf_conf_formatb2		= -1;
-static int hf_conf_formatb1		= -1;
-static int hf_conf_formatb0		= -1;
-static int hf_conf_chnam_len		= -1;
-static int hf_conf_chnam		= -1;
-static int hf_conf_phasor_mod_b15	= -1;
-static int hf_conf_phasor_mod_b10	= -1;
-static int hf_conf_phasor_mod_b09	= -1;
-static int hf_conf_phasor_mod_b08	= -1;
-static int hf_conf_phasor_mod_b07	= -1;
-static int hf_conf_phasor_mod_b06	= -1;
-static int hf_conf_phasor_mod_b05	= -1;
-static int hf_conf_phasor_mod_b04	= -1;
-static int hf_conf_phasor_mod_b03	= -1;
-static int hf_conf_phasor_mod_b02	= -1;
-static int hf_conf_phasor_mod_b01	= -1;
-static int hf_conf_phasor_type_b03	= -1;
-static int hf_conf_phasor_type_b02to00	= -1;
-static int hf_conf_phasor_user_data	= -1;
-static int hf_conf_phasor_scale_factor	= -1;
-static int hf_conf_phasor_angle_offset	= -1;
-static int hf_conf_analog_scale_factor	= -1;
-static int hf_conf_analog_offset	= -1;
-static int hf_conf_pmu_lat		= -1;
-static int hf_conf_pmu_lon		= -1;
-static int hf_conf_pmu_elev		= -1;
-static int hf_conf_pmu_lat_unknown	= -1;
-static int hf_conf_pmu_lon_unknown	= -1;
-static int hf_conf_pmu_elev_unknown	= -1;
-static int hf_conf_svc_class		= -1;
-static int hf_conf_window		= -1;
-static int hf_conf_grp_dly		= -1;
-static int hf_conf_fnom			= -1;
-static int hf_conf_cfgcnt		= -1;
-static int hf_data_statb15to14		= -1;
-static int hf_data_statb13		= -1;
-static int hf_data_statb12		= -1;
-static int hf_data_statb11		= -1;
-static int hf_data_statb10		= -1;
-static int hf_data_statb09		= -1;
-static int hf_data_statb08to06		= -1;
-static int hf_data_statb05to04		= -1;
-static int hf_data_statb03to00		= -1;
-static int hf_command			= -1;
-static int hf_cfg_frame_num		= -1;
+static int hf_sync;
+static int hf_sync_frtype;
+static int hf_sync_version;
+static int hf_station_name_len;
+static int hf_station_name;
+static int hf_idcode_stream_source;
+static int hf_idcode_data_source;
+static int hf_g_pmu_id;
+static int hf_frsize;
+static int hf_soc;
+static int hf_timeqal_lsdir;
+static int hf_timeqal_lsocc;
+static int hf_timeqal_lspend;
+static int hf_timeqal_timequalindic;
+static int hf_fracsec_raw;
+static int hf_fracsec_ms;
+static int hf_cont_idx;
+static int hf_conf_timebase;
+static int hf_conf_numpmu;
+static int hf_conf_formatb3;
+static int hf_conf_formatb2;
+static int hf_conf_formatb1;
+static int hf_conf_formatb0;
+static int hf_conf_chnam_len;
+static int hf_conf_chnam;
+static int hf_conf_phasor_mod_b15;
+static int hf_conf_phasor_mod_b10;
+static int hf_conf_phasor_mod_b09;
+static int hf_conf_phasor_mod_b08;
+static int hf_conf_phasor_mod_b07;
+static int hf_conf_phasor_mod_b06;
+static int hf_conf_phasor_mod_b05;
+static int hf_conf_phasor_mod_b04;
+static int hf_conf_phasor_mod_b03;
+static int hf_conf_phasor_mod_b02;
+static int hf_conf_phasor_mod_b01;
+static int hf_conf_phasor_type_b03;
+static int hf_conf_phasor_type_b02to00;
+static int hf_conf_phasor_user_data;
+static int hf_conf_phasor_scale_factor;
+static int hf_conf_phasor_angle_offset;
+static int hf_conf_analog_scale_factor;
+static int hf_conf_analog_offset;
+static int hf_conf_pmu_lat;
+static int hf_conf_pmu_lon;
+static int hf_conf_pmu_elev;
+static int hf_conf_pmu_lat_unknown;
+static int hf_conf_pmu_lon_unknown;
+static int hf_conf_pmu_elev_unknown;
+static int hf_conf_svc_class;
+static int hf_conf_window;
+static int hf_conf_grp_dly;
+static int hf_conf_fnom;
+static int hf_conf_cfgcnt;
+static int hf_data_statb15to14;
+static int hf_data_statb13;
+static int hf_data_statb12;
+static int hf_data_statb11;
+static int hf_data_statb10;
+static int hf_data_statb09;
+static int hf_data_statb08to06;
+static int hf_data_statb05to04;
+static int hf_data_statb03to00;
+static int hf_command;
+static int hf_cfg_frame_num;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_synphasor_data					= -1;
-static int hf_synphasor_checksum				= -1;
-static int hf_synphasor_checksum_status				= -1;
-static int hf_synphasor_num_phasors				= -1;
-static int hf_synphasor_num_analog_values			= -1;
-static int hf_synphasor_num_digital_status_words		= -1;
-static int hf_synphasor_rate_of_transmission			= -1;
-static int hf_synphasor_phasor					= -1;
-static int hf_synphasor_actual_frequency_value			= -1;
-static int hf_synphasor_rate_change_frequency			= -1;
-static int hf_synphasor_frequency_deviation_from_nominal	= -1;
-static int hf_synphasor_analog_value				= -1;
-static int hf_synphasor_digital_status_word			= -1;
-static int hf_synphasor_conversion_factor			= -1;
-static int hf_synphasor_factor_for_analog_value			= -1;
-static int hf_synphasor_channel_name				= -1;
-static int hf_synphasor_extended_frame_data			= -1;
-static int hf_synphasor_unknown_data				= -1;
-static int hf_synphasor_status_word_mask_normal_state		= -1;
-static int hf_synphasor_status_word_mask_valid_bits		= -1;
-
-static expert_field ei_synphasor_extended_frame_data	= EI_INIT;
-static expert_field ei_synphasor_checksum		= EI_INIT;
-static expert_field ei_synphasor_data_error		= EI_INIT;
-static expert_field ei_synphasor_pmu_not_sync		= EI_INIT;
+static int hf_synphasor_data;
+static int hf_synphasor_checksum;
+static int hf_synphasor_checksum_status;
+static int hf_synphasor_num_phasors;
+static int hf_synphasor_num_analog_values;
+static int hf_synphasor_num_digital_status_words;
+static int hf_synphasor_rate_of_transmission;
+static int hf_synphasor_phasor;
+static int hf_synphasor_actual_frequency_value;
+static int hf_synphasor_rate_change_frequency;
+static int hf_synphasor_frequency_deviation_from_nominal;
+static int hf_synphasor_analog_value;
+static int hf_synphasor_digital_status_word;
+static int hf_synphasor_conversion_factor;
+static int hf_synphasor_factor_for_analog_value;
+static int hf_synphasor_channel_name;
+static int hf_synphasor_extended_frame_data;
+static int hf_synphasor_unknown_data;
+static int hf_synphasor_status_word_mask_normal_state;
+static int hf_synphasor_status_word_mask_valid_bits;
+
+static expert_field ei_synphasor_extended_frame_data;
+static expert_field ei_synphasor_checksum;
+static expert_field ei_synphasor_data_error;
+static expert_field ei_synphasor_pmu_not_sync;
 
 static dissector_handle_t synphasor_udp_handle;
 static dissector_handle_t synphasor_tcp_handle;
diff --git a/epan/dissectors/packet-sysdig-event.c b/epan/dissectors/packet-sysdig-event.c
index 0f5bea9d0b..8616ee3156 100644
--- a/epan/dissectors/packet-sysdig-event.c
+++ b/epan/dissectors/packet-sysdig-event.c
@@ -52,246 +52,246 @@ void proto_register_sysdig_event(void);
 static dissector_handle_t sysdig_event_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_sysdig_event = -1;
+static int proto_sysdig_event;
 /* Add byte order? */
-static int hf_se_cpu_id = -1;
-static int hf_se_thread_id = -1;
-static int hf_se_event_length = -1;
-static int hf_se_nparams = -1;
-static int hf_se_event_type = -1;
-static int hf_se_event_name = -1;
+static int hf_se_cpu_id;
+static int hf_se_thread_id;
+static int hf_se_event_length;
+static int hf_se_nparams;
+static int hf_se_event_type;
+static int hf_se_event_name;
 
-static int hf_se_param_lens = -1;
-static int hf_se_param_len = -1;
+static int hf_se_param_lens;
+static int hf_se_param_len;
 
 /* Name+type */
 /* Header fields. Automatically generated by tools/generate-sysdig-event.py */
-static int hf_param_ID_uint16 = -1;
-static int hf_param_action_uint32 = -1;
-static int hf_param_addr_bytes = -1;
-static int hf_param_addr_uint64 = -1;
-static int hf_param_arg2_int_int64 = -1;
-static int hf_param_arg2_str_string = -1;
-static int hf_param_arg_uint64 = -1;
-static int hf_param_args_string = -1;
-static int hf_param_argument_uint64 = -1;
-static int hf_param_aux_int32 = -1;
-static int hf_param_backlog_int32 = -1;
-static int hf_param_cap_effective_uint64 = -1;
-static int hf_param_cap_inheritable_uint64 = -1;
-static int hf_param_cap_permitted_uint64 = -1;
-static int hf_param_cgroups_bytes = -1;
-static int hf_param_clockid_uint8 = -1;
-static int hf_param_cmd_bytes = -1;
-static int hf_param_cmd_int16 = -1;
-static int hf_param_cmd_int64 = -1;
-static int hf_param_comm_string = -1;
-static int hf_param_container_id_string = -1;
-static int hf_param_core_uint8 = -1;
-static int hf_param_cpu_sys_uint64 = -1;
-static int hf_param_cpu_uint32 = -1;
-static int hf_param_cpu_usr_uint64 = -1;
-static int hf_param_cq_entries_uint32 = -1;
-static int hf_param_cur_int64 = -1;
-static int hf_param_cwd_string = -1;
-static int hf_param_data_bytes = -1;
-static int hf_param_desc_string = -1;
-static int hf_param_description_string = -1;
-static int hf_param_dev_string = -1;
-static int hf_param_dev_uint32 = -1;
-static int hf_param_dir_string = -1;
-static int hf_param_dirfd_int64 = -1;
-static int hf_param_domain_bytes = -1;
-static int hf_param_dpid_int64 = -1;
-static int hf_param_dqb_bhardlimit_uint64 = -1;
-static int hf_param_dqb_bsoftlimit_uint64 = -1;
-static int hf_param_dqb_btime_bytes = -1;
-static int hf_param_dqb_curspace_uint64 = -1;
-static int hf_param_dqb_ihardlimit_uint64 = -1;
-static int hf_param_dqb_isoftlimit_uint64 = -1;
-static int hf_param_dqb_itime_bytes = -1;
-static int hf_param_dqi_bgrace_bytes = -1;
-static int hf_param_dqi_flags_int8 = -1;
-static int hf_param_dqi_igrace_bytes = -1;
-static int hf_param_egid_int32 = -1;
-static int hf_param_entries_uint32 = -1;
-static int hf_param_env_string = -1;
-static int hf_param_error_int32 = -1;
-static int hf_param_euid_int32 = -1;
-static int hf_param_event_data_bytes = -1;
-static int hf_param_event_data_uint64 = -1;
-static int hf_param_event_type_uint32 = -1;
-static int hf_param_exe_ino_ctime_bytes = -1;
-static int hf_param_exe_ino_mtime_bytes = -1;
-static int hf_param_exe_ino_uint64 = -1;
-static int hf_param_exe_string = -1;
-static int hf_param_fd1_int64 = -1;
-static int hf_param_fd2_int64 = -1;
-static int hf_param_fd_in_int64 = -1;
-static int hf_param_fd_int64 = -1;
-static int hf_param_fd_out_int64 = -1;
-static int hf_param_fdin_int64 = -1;
-static int hf_param_fdlimit_int64 = -1;
-static int hf_param_fdlimit_uint64 = -1;
-static int hf_param_fdout_int64 = -1;
-static int hf_param_fds_bytes = -1;
-static int hf_param_features_int32 = -1;
-static int hf_param_filename_string = -1;
-static int hf_param_flags_int16 = -1;
-static int hf_param_flags_int32 = -1;
-static int hf_param_flags_int8 = -1;
-static int hf_param_flags_uint32 = -1;
-static int hf_param_gid_int32 = -1;
-static int hf_param_gid_uint32 = -1;
-static int hf_param_home_string = -1;
-static int hf_param_how_bytes = -1;
-static int hf_param_id_int64 = -1;
-static int hf_param_id_string = -1;
-static int hf_param_id_uint32 = -1;
-static int hf_param_image_string = -1;
-static int hf_param_img_bytes = -1;
-static int hf_param_in_fd_int64 = -1;
-static int hf_param_initval_uint64 = -1;
-static int hf_param_ino_uint64 = -1;
-static int hf_param_interval_bytes = -1;
-static int hf_param_ip_uint64 = -1;
-static int hf_param_json_string = -1;
-static int hf_param_key_int32 = -1;
-static int hf_param_key_string = -1;
-static int hf_param_len_uint64 = -1;
-static int hf_param_length_uint64 = -1;
-static int hf_param_level_bytes = -1;
-static int hf_param_linkdirfd_int64 = -1;
-static int hf_param_linkpath_string = -1;
-static int hf_param_loginuid_int32 = -1;
-static int hf_param_mask_uint32 = -1;
-static int hf_param_max_int64 = -1;
-static int hf_param_maxevents_int64 = -1;
-static int hf_param_min_complete_uint32 = -1;
-static int hf_param_mode_int32 = -1;
-static int hf_param_mode_uint32 = -1;
-static int hf_param_mountfd_int64 = -1;
-static int hf_param_name_string = -1;
-static int hf_param_nativeID_uint16 = -1;
-static int hf_param_newcur_int64 = -1;
-static int hf_param_newdir_int64 = -1;
-static int hf_param_newdirfd_int64 = -1;
-static int hf_param_newfd_int64 = -1;
-static int hf_param_newmax_int64 = -1;
-static int hf_param_newpath_string = -1;
-static int hf_param_next_int64 = -1;
-static int hf_param_nr_args_uint32 = -1;
-static int hf_param_nsems_int32 = -1;
-static int hf_param_nsops_uint32 = -1;
-static int hf_param_nstype_int32 = -1;
-static int hf_param_offin_uint64 = -1;
-static int hf_param_offout_uint64 = -1;
-static int hf_param_offset_uint64 = -1;
-static int hf_param_oldcur_int64 = -1;
-static int hf_param_olddir_int64 = -1;
-static int hf_param_olddirfd_int64 = -1;
-static int hf_param_oldfd_int64 = -1;
-static int hf_param_oldmax_int64 = -1;
-static int hf_param_oldpath_string = -1;
-static int hf_param_op_bytes = -1;
-static int hf_param_op_uint64 = -1;
-static int hf_param_opcode_bytes = -1;
-static int hf_param_operation_int32 = -1;
-static int hf_param_option_bytes = -1;
-static int hf_param_optlen_uint32 = -1;
-static int hf_param_optname_bytes = -1;
-static int hf_param_out_fd_int64 = -1;
-static int hf_param_path_string = -1;
-static int hf_param_pathname_string = -1;
-static int hf_param_peer_uint64 = -1;
-static int hf_param_pgft_maj_uint64 = -1;
-static int hf_param_pgft_min_uint64 = -1;
-static int hf_param_pgid_int64 = -1;
-static int hf_param_pgoffset_uint64 = -1;
-static int hf_param_pid_fd_int64 = -1;
-static int hf_param_pid_int64 = -1;
-static int hf_param_pidns_init_start_ts_uint64 = -1;
-static int hf_param_plugin_id_uint32 = -1;
-static int hf_param_pos_uint64 = -1;
-static int hf_param_prot_int32 = -1;
-static int hf_param_proto_uint32 = -1;
-static int hf_param_ptid_int64 = -1;
-static int hf_param_queuelen_uint32 = -1;
-static int hf_param_queuemax_uint32 = -1;
-static int hf_param_queuepct_uint8 = -1;
-static int hf_param_quota_fmt_int8 = -1;
-static int hf_param_quota_fmt_out_int8 = -1;
-static int hf_param_quotafilepath_string = -1;
-static int hf_param_ratio_uint32 = -1;
-static int hf_param_reaper_tid_int64 = -1;
-static int hf_param_request_bytes = -1;
-static int hf_param_request_uint64 = -1;
-static int hf_param_res_int64 = -1;
-static int hf_param_res_or_fd_bytes = -1;
-static int hf_param_res_uint64 = -1;
-static int hf_param_resolve_int32 = -1;
-static int hf_param_resource_bytes = -1;
-static int hf_param_ret_int64 = -1;
-static int hf_param_rgid_int32 = -1;
-static int hf_param_ruid_int32 = -1;
-static int hf_param_scope_string = -1;
-static int hf_param_sem_flg_0_int16 = -1;
-static int hf_param_sem_flg_1_int16 = -1;
-static int hf_param_sem_num_0_uint16 = -1;
-static int hf_param_sem_num_1_uint16 = -1;
-static int hf_param_sem_op_0_int16 = -1;
-static int hf_param_sem_op_1_int16 = -1;
-static int hf_param_semflg_int32 = -1;
-static int hf_param_semid_int32 = -1;
-static int hf_param_semnum_int32 = -1;
-static int hf_param_sgid_int32 = -1;
-static int hf_param_shell_string = -1;
-static int hf_param_sig_bytes = -1;
-static int hf_param_sigmask_bytes = -1;
-static int hf_param_size_int32 = -1;
-static int hf_param_size_uint32 = -1;
-static int hf_param_size_uint64 = -1;
-static int hf_param_source_string = -1;
-static int hf_param_source_uint64 = -1;
-static int hf_param_special_string = -1;
-static int hf_param_spid_int64 = -1;
-static int hf_param_sq_entries_uint32 = -1;
-static int hf_param_sq_thread_cpu_uint32 = -1;
-static int hf_param_sq_thread_idle_uint32 = -1;
-static int hf_param_status_int64 = -1;
-static int hf_param_suid_int32 = -1;
-static int hf_param_tags_bytes = -1;
-static int hf_param_target_fd_int64 = -1;
-static int hf_param_target_string = -1;
-static int hf_param_tid_int64 = -1;
-static int hf_param_timeout_bytes = -1;
-static int hf_param_timeout_int64 = -1;
-static int hf_param_to_submit_uint32 = -1;
-static int hf_param_tty_int32 = -1;
-static int hf_param_tty_uint32 = -1;
-static int hf_param_tuple_bytes = -1;
-static int hf_param_type_int8 = -1;
-static int hf_param_type_string = -1;
-static int hf_param_type_uint32 = -1;
-static int hf_param_uargs_string = -1;
-static int hf_param_uid_int32 = -1;
-static int hf_param_uid_uint32 = -1;
-static int hf_param_val_bytes = -1;
-static int hf_param_val_int32 = -1;
-static int hf_param_val_uint64 = -1;
-static int hf_param_value_bytebuf_bytes = -1;
-static int hf_param_value_charbuf_string = -1;
-static int hf_param_vm_rss_uint32 = -1;
-static int hf_param_vm_size_uint32 = -1;
-static int hf_param_vm_swap_uint32 = -1;
-static int hf_param_vpid_int64 = -1;
-static int hf_param_vtid_int64 = -1;
-static int hf_param_whence_bytes = -1;
+static int hf_param_ID_uint16;
+static int hf_param_action_uint32;
+static int hf_param_addr_bytes;
+static int hf_param_addr_uint64;
+static int hf_param_arg2_int_int64;
+static int hf_param_arg2_str_string;
+static int hf_param_arg_uint64;
+static int hf_param_args_string;
+static int hf_param_argument_uint64;
+static int hf_param_aux_int32;
+static int hf_param_backlog_int32;
+static int hf_param_cap_effective_uint64;
+static int hf_param_cap_inheritable_uint64;
+static int hf_param_cap_permitted_uint64;
+static int hf_param_cgroups_bytes;
+static int hf_param_clockid_uint8;
+static int hf_param_cmd_bytes;
+static int hf_param_cmd_int16;
+static int hf_param_cmd_int64;
+static int hf_param_comm_string;
+static int hf_param_container_id_string;
+static int hf_param_core_uint8;
+static int hf_param_cpu_sys_uint64;
+static int hf_param_cpu_uint32;
+static int hf_param_cpu_usr_uint64;
+static int hf_param_cq_entries_uint32;
+static int hf_param_cur_int64;
+static int hf_param_cwd_string;
+static int hf_param_data_bytes;
+static int hf_param_desc_string;
+static int hf_param_description_string;
+static int hf_param_dev_string;
+static int hf_param_dev_uint32;
+static int hf_param_dir_string;
+static int hf_param_dirfd_int64;
+static int hf_param_domain_bytes;
+static int hf_param_dpid_int64;
+static int hf_param_dqb_bhardlimit_uint64;
+static int hf_param_dqb_bsoftlimit_uint64;
+static int hf_param_dqb_btime_bytes;
+static int hf_param_dqb_curspace_uint64;
+static int hf_param_dqb_ihardlimit_uint64;
+static int hf_param_dqb_isoftlimit_uint64;
+static int hf_param_dqb_itime_bytes;
+static int hf_param_dqi_bgrace_bytes;
+static int hf_param_dqi_flags_int8;
+static int hf_param_dqi_igrace_bytes;
+static int hf_param_egid_int32;
+static int hf_param_entries_uint32;
+static int hf_param_env_string;
+static int hf_param_error_int32;
+static int hf_param_euid_int32;
+static int hf_param_event_data_bytes;
+static int hf_param_event_data_uint64;
+static int hf_param_event_type_uint32;
+static int hf_param_exe_ino_ctime_bytes;
+static int hf_param_exe_ino_mtime_bytes;
+static int hf_param_exe_ino_uint64;
+static int hf_param_exe_string;
+static int hf_param_fd1_int64;
+static int hf_param_fd2_int64;
+static int hf_param_fd_in_int64;
+static int hf_param_fd_int64;
+static int hf_param_fd_out_int64;
+static int hf_param_fdin_int64;
+static int hf_param_fdlimit_int64;
+static int hf_param_fdlimit_uint64;
+static int hf_param_fdout_int64;
+static int hf_param_fds_bytes;
+static int hf_param_features_int32;
+static int hf_param_filename_string;
+static int hf_param_flags_int16;
+static int hf_param_flags_int32;
+static int hf_param_flags_int8;
+static int hf_param_flags_uint32;
+static int hf_param_gid_int32;
+static int hf_param_gid_uint32;
+static int hf_param_home_string;
+static int hf_param_how_bytes;
+static int hf_param_id_int64;
+static int hf_param_id_string;
+static int hf_param_id_uint32;
+static int hf_param_image_string;
+static int hf_param_img_bytes;
+static int hf_param_in_fd_int64;
+static int hf_param_initval_uint64;
+static int hf_param_ino_uint64;
+static int hf_param_interval_bytes;
+static int hf_param_ip_uint64;
+static int hf_param_json_string;
+static int hf_param_key_int32;
+static int hf_param_key_string;
+static int hf_param_len_uint64;
+static int hf_param_length_uint64;
+static int hf_param_level_bytes;
+static int hf_param_linkdirfd_int64;
+static int hf_param_linkpath_string;
+static int hf_param_loginuid_int32;
+static int hf_param_mask_uint32;
+static int hf_param_max_int64;
+static int hf_param_maxevents_int64;
+static int hf_param_min_complete_uint32;
+static int hf_param_mode_int32;
+static int hf_param_mode_uint32;
+static int hf_param_mountfd_int64;
+static int hf_param_name_string;
+static int hf_param_nativeID_uint16;
+static int hf_param_newcur_int64;
+static int hf_param_newdir_int64;
+static int hf_param_newdirfd_int64;
+static int hf_param_newfd_int64;
+static int hf_param_newmax_int64;
+static int hf_param_newpath_string;
+static int hf_param_next_int64;
+static int hf_param_nr_args_uint32;
+static int hf_param_nsems_int32;
+static int hf_param_nsops_uint32;
+static int hf_param_nstype_int32;
+static int hf_param_offin_uint64;
+static int hf_param_offout_uint64;
+static int hf_param_offset_uint64;
+static int hf_param_oldcur_int64;
+static int hf_param_olddir_int64;
+static int hf_param_olddirfd_int64;
+static int hf_param_oldfd_int64;
+static int hf_param_oldmax_int64;
+static int hf_param_oldpath_string;
+static int hf_param_op_bytes;
+static int hf_param_op_uint64;
+static int hf_param_opcode_bytes;
+static int hf_param_operation_int32;
+static int hf_param_option_bytes;
+static int hf_param_optlen_uint32;
+static int hf_param_optname_bytes;
+static int hf_param_out_fd_int64;
+static int hf_param_path_string;
+static int hf_param_pathname_string;
+static int hf_param_peer_uint64;
+static int hf_param_pgft_maj_uint64;
+static int hf_param_pgft_min_uint64;
+static int hf_param_pgid_int64;
+static int hf_param_pgoffset_uint64;
+static int hf_param_pid_fd_int64;
+static int hf_param_pid_int64;
+static int hf_param_pidns_init_start_ts_uint64;
+static int hf_param_plugin_id_uint32;
+static int hf_param_pos_uint64;
+static int hf_param_prot_int32;
+static int hf_param_proto_uint32;
+static int hf_param_ptid_int64;
+static int hf_param_queuelen_uint32;
+static int hf_param_queuemax_uint32;
+static int hf_param_queuepct_uint8;
+static int hf_param_quota_fmt_int8;
+static int hf_param_quota_fmt_out_int8;
+static int hf_param_quotafilepath_string;
+static int hf_param_ratio_uint32;
+static int hf_param_reaper_tid_int64;
+static int hf_param_request_bytes;
+static int hf_param_request_uint64;
+static int hf_param_res_int64;
+static int hf_param_res_or_fd_bytes;
+static int hf_param_res_uint64;
+static int hf_param_resolve_int32;
+static int hf_param_resource_bytes;
+static int hf_param_ret_int64;
+static int hf_param_rgid_int32;
+static int hf_param_ruid_int32;
+static int hf_param_scope_string;
+static int hf_param_sem_flg_0_int16;
+static int hf_param_sem_flg_1_int16;
+static int hf_param_sem_num_0_uint16;
+static int hf_param_sem_num_1_uint16;
+static int hf_param_sem_op_0_int16;
+static int hf_param_sem_op_1_int16;
+static int hf_param_semflg_int32;
+static int hf_param_semid_int32;
+static int hf_param_semnum_int32;
+static int hf_param_sgid_int32;
+static int hf_param_shell_string;
+static int hf_param_sig_bytes;
+static int hf_param_sigmask_bytes;
+static int hf_param_size_int32;
+static int hf_param_size_uint32;
+static int hf_param_size_uint64;
+static int hf_param_source_string;
+static int hf_param_source_uint64;
+static int hf_param_special_string;
+static int hf_param_spid_int64;
+static int hf_param_sq_entries_uint32;
+static int hf_param_sq_thread_cpu_uint32;
+static int hf_param_sq_thread_idle_uint32;
+static int hf_param_status_int64;
+static int hf_param_suid_int32;
+static int hf_param_tags_bytes;
+static int hf_param_target_fd_int64;
+static int hf_param_target_string;
+static int hf_param_tid_int64;
+static int hf_param_timeout_bytes;
+static int hf_param_timeout_int64;
+static int hf_param_to_submit_uint32;
+static int hf_param_tty_int32;
+static int hf_param_tty_uint32;
+static int hf_param_tuple_bytes;
+static int hf_param_type_int8;
+static int hf_param_type_string;
+static int hf_param_type_uint32;
+static int hf_param_uargs_string;
+static int hf_param_uid_int32;
+static int hf_param_uid_uint32;
+static int hf_param_val_bytes;
+static int hf_param_val_int32;
+static int hf_param_val_uint64;
+static int hf_param_value_bytebuf_bytes;
+static int hf_param_value_charbuf_string;
+static int hf_param_vm_rss_uint32;
+static int hf_param_vm_size_uint32;
+static int hf_param_vm_swap_uint32;
+static int hf_param_vpid_int64;
+static int hf_param_vtid_int64;
+static int hf_param_whence_bytes;
 
 /* Initialize the subtree pointers */
-static gint ett_sysdig_event = -1;
-static gint ett_sysdig_parm_lens = -1;
-static gint ett_sysdig_syscall = -1;
+static gint ett_sysdig_event;
+static gint ett_sysdig_parm_lens;
+static gint ett_sysdig_syscall;
 
 /* Initialize the pointer to the child plugin dissector */
 static dissector_handle_t sinsp_dissector_handle = NULL;
diff --git a/epan/dissectors/packet-sysex.c b/epan/dissectors/packet-sysex.c
index d22ef9cd3b..b15b8f4c02 100644
--- a/epan/dissectors/packet-sysex.c
+++ b/epan/dissectors/packet-sysex.c
@@ -17,19 +17,19 @@ void proto_register_sysex(void);
 void proto_reg_handoff_sysex(void);
 
 /* protocols and header fields */
-static int proto_sysex = -1;
-static int hf_sysex_message_start = -1;
-static int hf_sysex_manufacturer_id = -1;
-static int hf_sysex_three_byte_manufacturer_id = -1;
-static int hf_sysex_message_eox = -1;
+static int proto_sysex;
+static int hf_sysex_message_start;
+static int hf_sysex_manufacturer_id;
+static int hf_sysex_three_byte_manufacturer_id;
+static int hf_sysex_message_eox;
 
-static gint ett_sysex = -1;
+static gint ett_sysex;
 
 static dissector_handle_t sysex_digitech_handle;
 
-static expert_field ei_sysex_message_start_byte = EI_INIT;
-static expert_field ei_sysex_message_end_byte = EI_INIT;
-static expert_field ei_sysex_undecoded = EI_INIT;
+static expert_field ei_sysex_message_start_byte;
+static expert_field ei_sysex_message_end_byte;
+static expert_field ei_sysex_undecoded;
 
 #define SYSEX_MANUFACTURER_DOD 0x000010
 
diff --git a/epan/dissectors/packet-sysex_digitech.c b/epan/dissectors/packet-sysex_digitech.c
index 57459c013a..b59b5ba743 100644
--- a/epan/dissectors/packet-sysex_digitech.c
+++ b/epan/dissectors/packet-sysex_digitech.c
@@ -15,68 +15,68 @@
 void proto_register_sysex_digitech(void);
 
 /* protocols and header fields */
-static int proto_sysex_digitech = -1;
-static int hf_digitech_device_id = -1;
-static int hf_digitech_family_id = -1;
-static int hf_digitech_rp_product_id = -1;
-static int hf_digitech_unknown_product_id = -1;
-static int hf_digitech_procedure_id = -1;
-
-static int hf_digitech_desired_device_id = -1;
-static int hf_digitech_desired_family_id = -1;
-static int hf_digitech_desired_product_id = -1;
-static int hf_digitech_received_device_id = -1;
-static int hf_digitech_os_mode = -1;
-
-static int hf_digitech_preset_bank = -1;
-static int hf_digitech_preset_index = -1;
-static int hf_digitech_preset_count = -1;
-static int hf_digitech_preset_name = -1;
-static int hf_digitech_preset_modified = -1;
-
-static int hf_digitech_message_count = -1;
-
-static int hf_digitech_parameter_count = -1;
-static int hf_digitech_parameter_id = -1;
-static int hf_digitech_parameter_id_global = -1;
-static int hf_digitech_parameter_id_pickup = -1;
-static int hf_digitech_parameter_id_wah = -1;
-static int hf_digitech_parameter_id_compressor = -1;
-static int hf_digitech_parameter_id_gnx3k_whammy = -1;
-static int hf_digitech_parameter_id_distortion = -1;
-static int hf_digitech_parameter_id_amp_channel = -1;
-static int hf_digitech_parameter_id_amp = -1;
-static int hf_digitech_parameter_id_amp_cabinet = -1;
-static int hf_digitech_parameter_id_amp_b = -1;
-static int hf_digitech_parameter_id_amp_cabinet_b = -1;
-static int hf_digitech_parameter_id_noisegate = -1;
-static int hf_digitech_parameter_id_volume_pre_fx = -1;
-static int hf_digitech_parameter_id_chorusfx = -1;
-static int hf_digitech_parameter_id_delay = -1;
-static int hf_digitech_parameter_id_reverb = -1;
-static int hf_digitech_parameter_id_volume_post_fx = -1;
-static int hf_digitech_parameter_id_preset = -1;
-static int hf_digitech_parameter_id_wah_min_max = -1;
-static int hf_digitech_parameter_id_equalizer = -1;
-static int hf_digitech_parameter_id_equalizer_b = -1;
-static int hf_digitech_parameter_id_amp_loop = -1;
-
-static int hf_digitech_parameter_position = -1;
-static int hf_digitech_parameter_data = -1;
-static int hf_digitech_parameter_data_count = -1;
-static int hf_digitech_parameter_data_two_byte_count = -1;
-static int hf_digitech_parameter_multibyte_data = -1;
-
-static int hf_digitech_ack_request_proc_id = -1;
-static int hf_digitech_nack_request_proc_id = -1;
-
-static int hf_digitech_checksum = -1;
-static int hf_digitech_checksum_status = -1;
-
-static gint ett_sysex_digitech = -1;
-
-static expert_field ei_digitech_checksum_bad = EI_INIT;
-static expert_field ei_digitech_undecoded = EI_INIT;
+static int proto_sysex_digitech;
+static int hf_digitech_device_id;
+static int hf_digitech_family_id;
+static int hf_digitech_rp_product_id;
+static int hf_digitech_unknown_product_id;
+static int hf_digitech_procedure_id;
+
+static int hf_digitech_desired_device_id;
+static int hf_digitech_desired_family_id;
+static int hf_digitech_desired_product_id;
+static int hf_digitech_received_device_id;
+static int hf_digitech_os_mode;
+
+static int hf_digitech_preset_bank;
+static int hf_digitech_preset_index;
+static int hf_digitech_preset_count;
+static int hf_digitech_preset_name;
+static int hf_digitech_preset_modified;
+
+static int hf_digitech_message_count;
+
+static int hf_digitech_parameter_count;
+static int hf_digitech_parameter_id;
+static int hf_digitech_parameter_id_global;
+static int hf_digitech_parameter_id_pickup;
+static int hf_digitech_parameter_id_wah;
+static int hf_digitech_parameter_id_compressor;
+static int hf_digitech_parameter_id_gnx3k_whammy;
+static int hf_digitech_parameter_id_distortion;
+static int hf_digitech_parameter_id_amp_channel;
+static int hf_digitech_parameter_id_amp;
+static int hf_digitech_parameter_id_amp_cabinet;
+static int hf_digitech_parameter_id_amp_b;
+static int hf_digitech_parameter_id_amp_cabinet_b;
+static int hf_digitech_parameter_id_noisegate;
+static int hf_digitech_parameter_id_volume_pre_fx;
+static int hf_digitech_parameter_id_chorusfx;
+static int hf_digitech_parameter_id_delay;
+static int hf_digitech_parameter_id_reverb;
+static int hf_digitech_parameter_id_volume_post_fx;
+static int hf_digitech_parameter_id_preset;
+static int hf_digitech_parameter_id_wah_min_max;
+static int hf_digitech_parameter_id_equalizer;
+static int hf_digitech_parameter_id_equalizer_b;
+static int hf_digitech_parameter_id_amp_loop;
+
+static int hf_digitech_parameter_position;
+static int hf_digitech_parameter_data;
+static int hf_digitech_parameter_data_count;
+static int hf_digitech_parameter_data_two_byte_count;
+static int hf_digitech_parameter_multibyte_data;
+
+static int hf_digitech_ack_request_proc_id;
+static int hf_digitech_nack_request_proc_id;
+
+static int hf_digitech_checksum;
+static int hf_digitech_checksum_status;
+
+static gint ett_sysex_digitech;
+
+static expert_field ei_digitech_checksum_bad;
+static expert_field ei_digitech_undecoded;
 
 typedef struct _digitech_conv_data_t {
     gint protocol_version;
diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c
index b8645ffc8d..72d6812e77 100644
--- a/epan/dissectors/packet-syslog.c
+++ b/epan/dissectors/packet-syslog.c
@@ -74,23 +74,23 @@ static const value_string short_facility_vals[] = {
   { 0, NULL }
 };
 
-static gint proto_syslog = -1;
-static gint hf_syslog_level = -1;
-static gint hf_syslog_facility = -1;
-static gint hf_syslog_msg = -1;
-static gint hf_syslog_msu_present = -1;
-static gint hf_syslog_version = -1;
-static gint hf_syslog_timestamp = -1;
-static gint hf_syslog_timestamp_old = -1;
-static gint hf_syslog_hostname = -1;
-static gint hf_syslog_appname = -1;
-static gint hf_syslog_procid = -1;
-static gint hf_syslog_msgid = -1;
-static gint hf_syslog_msgid_utf8 = -1;
-static gint hf_syslog_msgid_bom = -1;
-
-static gint ett_syslog = -1;
-static gint ett_syslog_msg = -1;
+static gint proto_syslog;
+static gint hf_syslog_level;
+static gint hf_syslog_facility;
+static gint hf_syslog_msg;
+static gint hf_syslog_msu_present;
+static gint hf_syslog_version;
+static gint hf_syslog_timestamp;
+static gint hf_syslog_timestamp_old;
+static gint hf_syslog_hostname;
+static gint hf_syslog_appname;
+static gint hf_syslog_procid;
+static gint hf_syslog_msgid;
+static gint hf_syslog_msgid_utf8;
+static gint hf_syslog_msgid_bom;
+
+static gint ett_syslog;
+static gint ett_syslog_msg;
 
 static dissector_handle_t syslog_handle;
 
diff --git a/epan/dissectors/packet-systemd-journal.c b/epan/dissectors/packet-systemd-journal.c
index afc9bdd6a4..2b784cf569 100644
--- a/epan/dissectors/packet-systemd-journal.c
+++ b/epan/dissectors/packet-systemd-journal.c
@@ -42,133 +42,133 @@ void proto_reg_handoff_systemd_journal(void);
 void proto_register_systemd_journal(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_systemd_journal = -1;
+static int proto_systemd_journal;
 
 // Official entries, listed in
 // https://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html
 // as of 2018-08.
-static int hf_sj_message = -1;
-static int hf_sj_message_id = -1;
-static int hf_sj_priority = -1;
-static int hf_sj_code_file = -1;
-static int hf_sj_code_line = -1;
-static int hf_sj_code_func = -1;
-static int hf_sj_errno = -1;
-static int hf_sj_syslog_facility = -1;
-static int hf_sj_syslog_identifier = -1;
-static int hf_sj_syslog_pid = -1;
-
-static int hf_sj_pid = -1;
-static int hf_sj_uid = -1;
-static int hf_sj_gid = -1;
-static int hf_sj_comm = -1;
-static int hf_sj_exe = -1;
-static int hf_sj_cmdline = -1;
-static int hf_sj_cap_effective = -1;
-static int hf_sj_audit_session = -1;
-static int hf_sj_audit_loginuid = -1;
-static int hf_sj_systemd_cgroup = -1;
-static int hf_sj_systemd_slice = -1;
-static int hf_sj_systemd_unit = -1;
-static int hf_sj_systemd_user_unit = -1;
-static int hf_sj_systemd_session = -1;
-static int hf_sj_systemd_owner_uid = -1;
-
-static int hf_sj_selinux_context = -1;
-static int hf_sj_source_realtime_timestamp = -1;
-static int hf_sj_boot_id = -1;
-static int hf_sj_machine_id = -1;
-static int hf_sj_systemd_invocation_id = -1;
-static int hf_sj_hostname = -1;
-static int hf_sj_transport = -1;
-static int hf_sj_stream_id = -1;
-static int hf_sj_line_break = -1;
-
-static int hf_sj_kernel_device = -1;
-static int hf_sj_kernel_subsystem = -1;
-static int hf_sj_udev_sysname = -1;
-static int hf_sj_udev_devnode = -1;
-static int hf_sj_udev_devlink = -1;
-
-static int hf_sj_coredump_unit = -1;
-static int hf_sj_coredump_user_unit = -1;
-static int hf_sj_object_pid = -1;
-static int hf_sj_object_uid = -1;
-static int hf_sj_object_gid = -1;
-static int hf_sj_object_comm = -1;
-static int hf_sj_object_exe = -1;
-static int hf_sj_object_cmdline = -1;
-static int hf_sj_object_audit_session = -1;
-static int hf_sj_object_audit_loginuid = -1;
-static int hf_sj_object_cap_effective = -1;
-static int hf_sj_object_selinux_context = -1;
-static int hf_sj_object_systemd_cgroup = -1;
-static int hf_sj_object_systemd_session = -1;
-static int hf_sj_object_systemd_owner_uid = -1;
-static int hf_sj_object_systemd_unit = -1;
-static int hf_sj_object_systemd_user_unit = -1;
-static int hf_sj_object_systemd_slice = -1;
-static int hf_sj_object_systemd_user_slice = -1;
-static int hf_sj_object_systemd_invocation_id = -1;
-
-static int hf_sj_cursor = -1;
-static int hf_sj_realtime_timestamp = -1;
-static int hf_sj_monotonic_timestamp = -1;
+static int hf_sj_message;
+static int hf_sj_message_id;
+static int hf_sj_priority;
+static int hf_sj_code_file;
+static int hf_sj_code_line;
+static int hf_sj_code_func;
+static int hf_sj_errno;
+static int hf_sj_syslog_facility;
+static int hf_sj_syslog_identifier;
+static int hf_sj_syslog_pid;
+
+static int hf_sj_pid;
+static int hf_sj_uid;
+static int hf_sj_gid;
+static int hf_sj_comm;
+static int hf_sj_exe;
+static int hf_sj_cmdline;
+static int hf_sj_cap_effective;
+static int hf_sj_audit_session;
+static int hf_sj_audit_loginuid;
+static int hf_sj_systemd_cgroup;
+static int hf_sj_systemd_slice;
+static int hf_sj_systemd_unit;
+static int hf_sj_systemd_user_unit;
+static int hf_sj_systemd_session;
+static int hf_sj_systemd_owner_uid;
+
+static int hf_sj_selinux_context;
+static int hf_sj_source_realtime_timestamp;
+static int hf_sj_boot_id;
+static int hf_sj_machine_id;
+static int hf_sj_systemd_invocation_id;
+static int hf_sj_hostname;
+static int hf_sj_transport;
+static int hf_sj_stream_id;
+static int hf_sj_line_break;
+
+static int hf_sj_kernel_device;
+static int hf_sj_kernel_subsystem;
+static int hf_sj_udev_sysname;
+static int hf_sj_udev_devnode;
+static int hf_sj_udev_devlink;
+
+static int hf_sj_coredump_unit;
+static int hf_sj_coredump_user_unit;
+static int hf_sj_object_pid;
+static int hf_sj_object_uid;
+static int hf_sj_object_gid;
+static int hf_sj_object_comm;
+static int hf_sj_object_exe;
+static int hf_sj_object_cmdline;
+static int hf_sj_object_audit_session;
+static int hf_sj_object_audit_loginuid;
+static int hf_sj_object_cap_effective;
+static int hf_sj_object_selinux_context;
+static int hf_sj_object_systemd_cgroup;
+static int hf_sj_object_systemd_session;
+static int hf_sj_object_systemd_owner_uid;
+static int hf_sj_object_systemd_unit;
+static int hf_sj_object_systemd_user_unit;
+static int hf_sj_object_systemd_slice;
+static int hf_sj_object_systemd_user_slice;
+static int hf_sj_object_systemd_invocation_id;
+
+static int hf_sj_cursor;
+static int hf_sj_realtime_timestamp;
+static int hf_sj_monotonic_timestamp;
 
 // Unofficial(?) fields. Not listed in the documentation but present in logs.
-static int hf_sj_result = -1;
-static int hf_sj_source_monotonic_timestamp = -1;
-static int hf_sj_journal_name = -1;
-static int hf_sj_journal_path = -1;
-static int hf_sj_current_use = -1;
-static int hf_sj_current_use_pretty = -1;
-static int hf_sj_max_use = -1;
-static int hf_sj_max_use_pretty = -1;
-static int hf_sj_disk_keep_free = -1;
-static int hf_sj_disk_keep_free_pretty = -1;
-static int hf_sj_disk_available = -1;
-static int hf_sj_disk_available_pretty = -1;
-static int hf_sj_limit = -1;
-static int hf_sj_limit_pretty = -1;
-static int hf_sj_available = -1;
-static int hf_sj_available_pretty = -1;
-static int hf_sj_audit_type = -1;
-static int hf_sj_audit_id = -1;
-static int hf_sj_audit_field_apparmor = -1;
-static int hf_sj_audit_field_operation = -1;
-static int hf_sj_audit_field_profile = -1;
-static int hf_sj_audit_field_name = -1;
-static int hf_sj_seat_id = -1;
-static int hf_sj_kernel_usec = -1;
-static int hf_sj_userspace_usec = -1;
-static int hf_sj_session_id = -1;
-static int hf_sj_user_id = -1;
-static int hf_sj_leader = -1;
-static int hf_sj_job_type = -1;
-static int hf_sj_job_result = -1;
-static int hf_sj_user_invocation_id = -1;
-static int hf_sj_systemd_user_slice = -1;
+static int hf_sj_result;
+static int hf_sj_source_monotonic_timestamp;
+static int hf_sj_journal_name;
+static int hf_sj_journal_path;
+static int hf_sj_current_use;
+static int hf_sj_current_use_pretty;
+static int hf_sj_max_use;
+static int hf_sj_max_use_pretty;
+static int hf_sj_disk_keep_free;
+static int hf_sj_disk_keep_free_pretty;
+static int hf_sj_disk_available;
+static int hf_sj_disk_available_pretty;
+static int hf_sj_limit;
+static int hf_sj_limit_pretty;
+static int hf_sj_available;
+static int hf_sj_available_pretty;
+static int hf_sj_audit_type;
+static int hf_sj_audit_id;
+static int hf_sj_audit_field_apparmor;
+static int hf_sj_audit_field_operation;
+static int hf_sj_audit_field_profile;
+static int hf_sj_audit_field_name;
+static int hf_sj_seat_id;
+static int hf_sj_kernel_usec;
+static int hf_sj_userspace_usec;
+static int hf_sj_session_id;
+static int hf_sj_user_id;
+static int hf_sj_leader;
+static int hf_sj_job_type;
+static int hf_sj_job_result;
+static int hf_sj_user_invocation_id;
+static int hf_sj_systemd_user_slice;
 
 // Metadata.
-static int hf_sj_binary_data_len = -1;
-static int hf_sj_unknown_field = -1;
-static int hf_sj_unknown_field_name = -1;
-static int hf_sj_unknown_field_value = -1;
-static int hf_sj_unknown_field_data = -1;
-static int hf_sj_unhandled_field_type = -1;
+static int hf_sj_binary_data_len;
+static int hf_sj_unknown_field;
+static int hf_sj_unknown_field_name;
+static int hf_sj_unknown_field_value;
+static int hf_sj_unknown_field_data;
+static int hf_sj_unhandled_field_type;
 
-static expert_field ei_unhandled_field_type = EI_INIT;
-static expert_field ei_nonbinary_field = EI_INIT;
-static expert_field ei_undecoded_field = EI_INIT;
+static expert_field ei_unhandled_field_type;
+static expert_field ei_nonbinary_field;
+static expert_field ei_undecoded_field;
 
 static dissector_handle_t sje_handle = NULL;
 
 #define MAX_DATA_SIZE 262144 // WTAP_MAX_PACKET_SIZE_STANDARD. Increase if needed.
 
 /* Initialize the subtree pointers */
-static gint ett_systemd_journal_entry = -1;
-static gint ett_systemd_binary_data = -1;
-static gint ett_systemd_unknown_field = -1;
+static gint ett_systemd_journal_entry;
+static gint ett_systemd_binary_data;
+static gint ett_systemd_unknown_field;
 
 // XXX Use a value_string instead?
 typedef struct _journal_field_hf_map {
diff --git a/epan/dissectors/packet-t30.c b/epan/dissectors/packet-t30.c
index b0d2fff138..23a3c80ae8 100644
--- a/epan/dissectors/packet-t30.c
+++ b/epan/dissectors/packet-t30.c
@@ -25,120 +25,120 @@
 void proto_register_t30(void);
 
 /* T30 */
-static int proto_t30 = -1;
-static int hf_t30_Address = -1;
-static int hf_t30_Control = -1;
-static int hf_t30_Facsimile_Control = -1;
-static int hf_t30_fif_sm = -1;
-static int hf_t30_fif_rtif = -1;
-static int hf_t30_fif_3gmn = -1;
-static int hf_t30_fif_v8c = -1;
-static int hf_t30_fif_op = -1;
-static int hf_t30_fif_rtfc = -1;
-static int hf_t30_fif_rfo = -1;
-static int hf_t30_fif_dsr = -1;
-static int hf_t30_fif_dsr_dcs = -1;
-static int hf_t30_fif_res = -1;
-static int hf_t30_fif_tdcc = -1;
-static int hf_t30_fif_rwc = -1;
-static int hf_t30_fif_rw_dcs = -1;
-static int hf_t30_fif_rlc = -1;
-static int hf_t30_fif_rl_dcs = -1;
-static int hf_t30_fif_msltcr = -1;
-static int hf_t30_fif_mslt_dcs = -1;
-static int hf_t30_fif_ext = -1;
-static int hf_t30_fif_cm = -1;
-static int hf_t30_fif_ecm = -1;
-static int hf_t30_fif_fs_dcs = -1;
-static int hf_t30_fif_t6 = -1;
-static int hf_t30_fif_fvc = -1;
-static int hf_t30_fif_mspc = -1;
-static int hf_t30_fif_ps = -1;
-static int hf_t30_fif_t43 = -1;
-static int hf_t30_fif_pi = -1;
-static int hf_t30_fif_vc32k = -1;
-static int hf_t30_fif_r8x15 = -1;
-static int hf_t30_fif_300x300 = -1;
-static int hf_t30_fif_r16x15 = -1;
-static int hf_t30_fif_ibrp = -1;
-static int hf_t30_fif_mbrp = -1;
-static int hf_t30_fif_msltchr = -1;
-static int hf_t30_fif_rts = -1;
-static int hf_t30_fif_sp = -1;
-static int hf_t30_fif_sc = -1;
-static int hf_t30_fif_passw = -1;
-static int hf_t30_fif_sit = -1;
-static int hf_t30_fif_rttd = -1;
-static int hf_t30_fif_bft = -1;
-static int hf_t30_fif_dtm = -1;
-static int hf_t30_fif_edi = -1;
-static int hf_t30_fif_btm = -1;
-static int hf_t30_fif_rttcmmd = -1;
-static int hf_t30_fif_chrm = -1;
-static int hf_t30_fif_mm = -1;
-static int hf_t30_fif_pm26 = -1;
-static int hf_t30_fif_dnc = -1;
-static int hf_t30_fif_do = -1;
-static int hf_t30_fif_jpeg = -1;
-static int hf_t30_fif_fcm = -1;
-static int hf_t30_fif_pht = -1;
-static int hf_t30_fif_12c = -1;
-static int hf_t30_fif_ns = -1;
-static int hf_t30_fif_ci = -1;
-static int hf_t30_fif_cgr = -1;
-static int hf_t30_fif_nalet = -1;
-static int hf_t30_fif_naleg = -1;
-static int hf_t30_fif_spscb = -1;
-static int hf_t30_fif_spsco = -1;
-static int hf_t30_fif_hkm = -1;
-static int hf_t30_fif_rsa = -1;
-static int hf_t30_fif_oc = -1;
-static int hf_t30_fif_hfx40 = -1;
-static int hf_t30_fif_acn2c = -1;
-static int hf_t30_fif_acn3c = -1;
-static int hf_t30_fif_hfx40i = -1;
-static int hf_t30_fif_ahsn2 = -1;
-static int hf_t30_fif_ahsn3 = -1;
-static int hf_t30_fif_t441 = -1;
-static int hf_t30_fif_t442 = -1;
-static int hf_t30_fif_t443 = -1;
-static int hf_t30_fif_plmss = -1;
-static int hf_t30_fif_cg300 = -1;
-static int hf_t30_fif_100x100cg = -1;
-static int hf_t30_fif_spcbft = -1;
-static int hf_t30_fif_ebft = -1;
-static int hf_t30_fif_isp = -1;
-static int hf_t30_fif_ira = -1;
-static int hf_t30_fif_600x600 = -1;
-static int hf_t30_fif_1200x1200 = -1;
-static int hf_t30_fif_300x600 = -1;
-static int hf_t30_fif_400x800 = -1;
-static int hf_t30_fif_600x1200 = -1;
-static int hf_t30_fif_cg600x600 = -1;
-static int hf_t30_fif_cg1200x1200 = -1;
-static int hf_t30_fif_dspcam = -1;
-static int hf_t30_fif_dspccm = -1;
-static int hf_t30_fif_bwmrcp = -1;
-static int hf_t30_fif_t45 = -1;
-static int hf_t30_fif_sdmc = -1;
-static int hf_t30_fif_number = -1;
-static int hf_t30_fif_country_code = -1;
-static int hf_t30_fif_non_stand_bytes = -1;
-static int hf_t30_t4_frame_num = -1;
-static int hf_t30_t4_data = -1;
-static int hf_t30_partial_page_fcf2 = -1;
-static int hf_t30_partial_page_i1 = -1;
-static int hf_t30_partial_page_i2 = -1;
-static int hf_t30_partial_page_i3 = -1;
-static int hf_t30_partial_page_request_frame_count = -1;
-static int hf_t30_partial_page_request_frames = -1;
-
-static gint ett_t30 = -1;
-static gint ett_t30_fif = -1;
-
-static expert_field ei_t30_bad_length = EI_INIT;
-static expert_field ei_t30_Address_FF = EI_INIT;
-static expert_field ei_t30_Control_C0C8 = EI_INIT;
+static int proto_t30;
+static int hf_t30_Address;
+static int hf_t30_Control;
+static int hf_t30_Facsimile_Control;
+static int hf_t30_fif_sm;
+static int hf_t30_fif_rtif;
+static int hf_t30_fif_3gmn;
+static int hf_t30_fif_v8c;
+static int hf_t30_fif_op;
+static int hf_t30_fif_rtfc;
+static int hf_t30_fif_rfo;
+static int hf_t30_fif_dsr;
+static int hf_t30_fif_dsr_dcs;
+static int hf_t30_fif_res;
+static int hf_t30_fif_tdcc;
+static int hf_t30_fif_rwc;
+static int hf_t30_fif_rw_dcs;
+static int hf_t30_fif_rlc;
+static int hf_t30_fif_rl_dcs;
+static int hf_t30_fif_msltcr;
+static int hf_t30_fif_mslt_dcs;
+static int hf_t30_fif_ext;
+static int hf_t30_fif_cm;
+static int hf_t30_fif_ecm;
+static int hf_t30_fif_fs_dcs;
+static int hf_t30_fif_t6;
+static int hf_t30_fif_fvc;
+static int hf_t30_fif_mspc;
+static int hf_t30_fif_ps;
+static int hf_t30_fif_t43;
+static int hf_t30_fif_pi;
+static int hf_t30_fif_vc32k;
+static int hf_t30_fif_r8x15;
+static int hf_t30_fif_300x300;
+static int hf_t30_fif_r16x15;
+static int hf_t30_fif_ibrp;
+static int hf_t30_fif_mbrp;
+static int hf_t30_fif_msltchr;
+static int hf_t30_fif_rts;
+static int hf_t30_fif_sp;
+static int hf_t30_fif_sc;
+static int hf_t30_fif_passw;
+static int hf_t30_fif_sit;
+static int hf_t30_fif_rttd;
+static int hf_t30_fif_bft;
+static int hf_t30_fif_dtm;
+static int hf_t30_fif_edi;
+static int hf_t30_fif_btm;
+static int hf_t30_fif_rttcmmd;
+static int hf_t30_fif_chrm;
+static int hf_t30_fif_mm;
+static int hf_t30_fif_pm26;
+static int hf_t30_fif_dnc;
+static int hf_t30_fif_do;
+static int hf_t30_fif_jpeg;
+static int hf_t30_fif_fcm;
+static int hf_t30_fif_pht;
+static int hf_t30_fif_12c;
+static int hf_t30_fif_ns;
+static int hf_t30_fif_ci;
+static int hf_t30_fif_cgr;
+static int hf_t30_fif_nalet;
+static int hf_t30_fif_naleg;
+static int hf_t30_fif_spscb;
+static int hf_t30_fif_spsco;
+static int hf_t30_fif_hkm;
+static int hf_t30_fif_rsa;
+static int hf_t30_fif_oc;
+static int hf_t30_fif_hfx40;
+static int hf_t30_fif_acn2c;
+static int hf_t30_fif_acn3c;
+static int hf_t30_fif_hfx40i;
+static int hf_t30_fif_ahsn2;
+static int hf_t30_fif_ahsn3;
+static int hf_t30_fif_t441;
+static int hf_t30_fif_t442;
+static int hf_t30_fif_t443;
+static int hf_t30_fif_plmss;
+static int hf_t30_fif_cg300;
+static int hf_t30_fif_100x100cg;
+static int hf_t30_fif_spcbft;
+static int hf_t30_fif_ebft;
+static int hf_t30_fif_isp;
+static int hf_t30_fif_ira;
+static int hf_t30_fif_600x600;
+static int hf_t30_fif_1200x1200;
+static int hf_t30_fif_300x600;
+static int hf_t30_fif_400x800;
+static int hf_t30_fif_600x1200;
+static int hf_t30_fif_cg600x600;
+static int hf_t30_fif_cg1200x1200;
+static int hf_t30_fif_dspcam;
+static int hf_t30_fif_dspccm;
+static int hf_t30_fif_bwmrcp;
+static int hf_t30_fif_t45;
+static int hf_t30_fif_sdmc;
+static int hf_t30_fif_number;
+static int hf_t30_fif_country_code;
+static int hf_t30_fif_non_stand_bytes;
+static int hf_t30_t4_frame_num;
+static int hf_t30_t4_data;
+static int hf_t30_partial_page_fcf2;
+static int hf_t30_partial_page_i1;
+static int hf_t30_partial_page_i2;
+static int hf_t30_partial_page_i3;
+static int hf_t30_partial_page_request_frame_count;
+static int hf_t30_partial_page_request_frames;
+
+static gint ett_t30;
+static gint ett_t30_fif;
+
+static expert_field ei_t30_bad_length;
+static expert_field ei_t30_Address_FF;
+static expert_field ei_t30_Control_C0C8;
 
 static const value_string t30_control_vals[] = {
     { 0xC0, "non-final frames within the procedure" },
diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c
index 386773d2b4..bfccb1be1b 100644
--- a/epan/dissectors/packet-tacacs.c
+++ b/epan/dissectors/packet-tacacs.c
@@ -43,24 +43,24 @@ static dissector_handle_t tacplus_handle;
 static void md5_xor( guint8 *data, const char *key, int data_len, guint8 *session_id, guint8 version, guint8 seq_no );
 static int  dissect_tacplus_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data);
 
-static int proto_tacacs = -1;
-static int hf_tacacs_version = -1;
-static int hf_tacacs_type = -1;
-static int hf_tacacs_nonce = -1;
-static int hf_tacacs_userlen = -1;
-static int hf_tacacs_passlen = -1;
-static int hf_tacacs_response = -1;
-static int hf_tacacs_reason = -1;
-static int hf_tacacs_result1 = -1;
-static int hf_tacacs_destaddr = -1;
-static int hf_tacacs_destport = -1;
-static int hf_tacacs_line = -1;
-static int hf_tacacs_result2 = -1;
-static int hf_tacacs_result3 = -1;
-static int hf_tacacs_username = -1;
-static int hf_tacacs_password = -1;
-
-static gint ett_tacacs = -1;
+static int proto_tacacs;
+static int hf_tacacs_version;
+static int hf_tacacs_type;
+static int hf_tacacs_nonce;
+static int hf_tacacs_userlen;
+static int hf_tacacs_passlen;
+static int hf_tacacs_response;
+static int hf_tacacs_reason;
+static int hf_tacacs_result1;
+static int hf_tacacs_destaddr;
+static int hf_tacacs_destport;
+static int hf_tacacs_line;
+static int hf_tacacs_result2;
+static int hf_tacacs_result3;
+static int hf_tacacs_username;
+static int hf_tacacs_password;
+
+static gint ett_tacacs;
 
 static gboolean tacplus_preference_desegment = TRUE;
 
@@ -272,85 +272,85 @@ proto_reg_handoff_tacacs(void)
 	dissector_add_uint_with_preference("udp.port", UDP_PORT_TACACS, tacacs_handle);
 }
 
-static int proto_tacplus = -1;
-static int hf_tacplus_response = -1;
-static int hf_tacplus_request = -1;
-static int hf_tacplus_majvers = -1;
-static int hf_tacplus_minvers = -1;
-static int hf_tacplus_type = -1;
-static int hf_tacplus_seqno = -1;
-static int hf_tacplus_flags = -1;
-static int hf_tacplus_flags_payload_type = -1;
-static int hf_tacplus_flags_connection_type = -1;
-static int hf_tacplus_acct_flags = -1;
-static int hf_tacplus_acct_flags_more = -1;
-static int hf_tacplus_acct_flags_start = -1;
-static int hf_tacplus_acct_flags_stop = -1;
-static int hf_tacplus_acct_flags_watchdog = -1;
-static int hf_tacplus_session_id = -1;
-static int hf_tacplus_packet_len = -1;
-static int hf_tacplus_auth_password = -1;
-static int hf_tacplus_port = -1;
-static int hf_tacplus_remote_address = -1;
-static int hf_tacplus_chap_challenge = -1;
-static int hf_tacplus_chap_response = -1;
-static int hf_tacplus_mschap_challenge = -1;
-static int hf_tacplus_mschap_response = -1;
-static int hf_tacplus_arap_nas_challenge = -1;
-static int hf_tacplus_arap_remote_challenge = -1;
-static int hf_tacplus_arap_remote_response = -1;
-static int hf_tacplus_privilege_level = -1;
-static int hf_tacplus_authentication_type = -1;
-static int hf_tacplus_service = -1;
-static int hf_tacplus_user_len = -1;
-static int hf_tacplus_user = -1;
-static int hf_tacplus_port_len = -1;
-static int hf_tacplus_remote_address_len = -1;
-static int hf_tacplus_arg_length = -1;
-static int hf_tacplus_arg_value = -1;
-static int hf_tacplus_chap_id = -1;
-static int hf_tacplus_mschap_id = -1;
-static int hf_tacplus_authen_action = -1;
-static int hf_tacplus_body_authen_req_cont_flags = -1;
-static int hf_tacplus_body_authen_req_cont_user_length = -1;
-static int hf_tacplus_body_authen_req_cont_user = -1;
-static int hf_tacplus_body_authen_req_cont_data_length = -1;
-static int hf_tacplus_body_authen_rep_status = -1;
-static int hf_tacplus_body_authen_rep_flags = -1;
-static int hf_tacplus_body_authen_rep_server_msg_len = -1;
-static int hf_tacplus_body_authen_rep_server_msg = -1;
-static int hf_tacplus_body_authen_rep_server_data_len = -1;
-static int hf_tacplus_body_author_req_auth_method = -1;
-static int hf_tacplus_body_author_req_arg_count = -1;
-static int hf_tacplus_body_author_rep_auth_status = -1;
-static int hf_tacplus_body_author_rep_server_msg_len = -1;
-static int hf_tacplus_body_author_rep_server_data_len = -1;
-static int hf_tacplus_body_author_rep_arg_count = -1;
-static int hf_tacplus_acct_authen_method = -1;
-static int hf_tacplus_acct_arg_count = -1;
-static int hf_tacplus_body_acct_status = -1;
-static int hf_tacplus_body_acct_server_msg_len = -1;
-static int hf_tacplus_body_acct_server_msg = -1;
-static int hf_tacplus_body_acct_data_len = -1;
-static int hf_tacplus_body_acct_data = -1;
-static int hf_tacplus_data = -1;
+static int proto_tacplus;
+static int hf_tacplus_response;
+static int hf_tacplus_request;
+static int hf_tacplus_majvers;
+static int hf_tacplus_minvers;
+static int hf_tacplus_type;
+static int hf_tacplus_seqno;
+static int hf_tacplus_flags;
+static int hf_tacplus_flags_payload_type;
+static int hf_tacplus_flags_connection_type;
+static int hf_tacplus_acct_flags;
+static int hf_tacplus_acct_flags_more;
+static int hf_tacplus_acct_flags_start;
+static int hf_tacplus_acct_flags_stop;
+static int hf_tacplus_acct_flags_watchdog;
+static int hf_tacplus_session_id;
+static int hf_tacplus_packet_len;
+static int hf_tacplus_auth_password;
+static int hf_tacplus_port;
+static int hf_tacplus_remote_address;
+static int hf_tacplus_chap_challenge;
+static int hf_tacplus_chap_response;
+static int hf_tacplus_mschap_challenge;
+static int hf_tacplus_mschap_response;
+static int hf_tacplus_arap_nas_challenge;
+static int hf_tacplus_arap_remote_challenge;
+static int hf_tacplus_arap_remote_response;
+static int hf_tacplus_privilege_level;
+static int hf_tacplus_authentication_type;
+static int hf_tacplus_service;
+static int hf_tacplus_user_len;
+static int hf_tacplus_user;
+static int hf_tacplus_port_len;
+static int hf_tacplus_remote_address_len;
+static int hf_tacplus_arg_length;
+static int hf_tacplus_arg_value;
+static int hf_tacplus_chap_id;
+static int hf_tacplus_mschap_id;
+static int hf_tacplus_authen_action;
+static int hf_tacplus_body_authen_req_cont_flags;
+static int hf_tacplus_body_authen_req_cont_user_length;
+static int hf_tacplus_body_authen_req_cont_user;
+static int hf_tacplus_body_authen_req_cont_data_length;
+static int hf_tacplus_body_authen_rep_status;
+static int hf_tacplus_body_authen_rep_flags;
+static int hf_tacplus_body_authen_rep_server_msg_len;
+static int hf_tacplus_body_authen_rep_server_msg;
+static int hf_tacplus_body_authen_rep_server_data_len;
+static int hf_tacplus_body_author_req_auth_method;
+static int hf_tacplus_body_author_req_arg_count;
+static int hf_tacplus_body_author_rep_auth_status;
+static int hf_tacplus_body_author_rep_server_msg_len;
+static int hf_tacplus_body_author_rep_server_data_len;
+static int hf_tacplus_body_author_rep_arg_count;
+static int hf_tacplus_acct_authen_method;
+static int hf_tacplus_acct_arg_count;
+static int hf_tacplus_body_acct_status;
+static int hf_tacplus_body_acct_server_msg_len;
+static int hf_tacplus_body_acct_server_msg;
+static int hf_tacplus_body_acct_data_len;
+static int hf_tacplus_body_acct_data;
+static int hf_tacplus_data;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_tacplus_ascii_length = -1;
-static int hf_tacplus_arap_data_length = -1;
-static int hf_tacplus_mschap_data_length = -1;
-static int hf_tacplus_chap_data_length = -1;
-static int hf_tacplus_password_length = -1;
-static int hf_tacplus_data_length = -1;
-
-static gint ett_tacplus = -1;
-static gint ett_tacplus_body = -1;
-static gint ett_tacplus_body_chap = -1;
-static gint ett_tacplus_flags = -1;
-static gint ett_tacplus_acct_flags = -1;
-
-static expert_field ei_tacplus_packet_len_invalid = EI_INIT;
-static expert_field ei_tacplus_unencrypted = EI_INIT;
-static expert_field ei_tacplus_bogus_data = EI_INIT;
+static int hf_tacplus_ascii_length;
+static int hf_tacplus_arap_data_length;
+static int hf_tacplus_mschap_data_length;
+static int hf_tacplus_chap_data_length;
+static int hf_tacplus_password_length;
+static int hf_tacplus_data_length;
+
+static gint ett_tacplus;
+static gint ett_tacplus_body;
+static gint ett_tacplus_body_chap;
+static gint ett_tacplus_flags;
+static gint ett_tacplus_acct_flags;
+
+static expert_field ei_tacplus_packet_len_invalid;
+static expert_field ei_tacplus_unencrypted;
+static expert_field ei_tacplus_bogus_data;
 
 typedef struct _tacplus_key_entry {
 	address *s; /* Server address */
diff --git a/epan/dissectors/packet-tali.c b/epan/dissectors/packet-tali.c
index 8450703660..3eb76c66ba 100644
--- a/epan/dissectors/packet-tali.c
+++ b/epan/dissectors/packet-tali.c
@@ -43,17 +43,17 @@
 void proto_reg_handoff_tali(void);
 void proto_register_tali(void);
 
-static int proto_tali = -1;
+static int proto_tali;
 
-static int hf_tali_length_indicator = -1;
-static int hf_tali_opcode_indicator = -1;
-static int hf_tali_sync_indicator = -1;
+static int hf_tali_length_indicator;
+static int hf_tali_opcode_indicator;
+static int hf_tali_sync_indicator;
 
 /* Initialize the subtree pointers */
-static gint ett_tali = -1;
-static gint ett_tali_sync = -1;
-static gint ett_tali_opcode = -1;
-static gint ett_tali_msu_length = -1;
+static gint ett_tali;
+static gint ett_tali_sync;
+static gint ett_tali_opcode;
+static gint ett_tali_msu_length;
 
 static dissector_table_t tali_dissector_table;
 
diff --git a/epan/dissectors/packet-tango.c b/epan/dissectors/packet-tango.c
index 4e38ae2a21..7aa9bc20f3 100644
--- a/epan/dissectors/packet-tango.c
+++ b/epan/dissectors/packet-tango.c
@@ -45,368 +45,368 @@ void proto_register_giop_tango(void);
 void proto_reg_handoff_giop_tango(void);
 
 /* Initialise the protocol and subtree pointers */
-static int proto_tango = -1;
-static gint ett_tango = -1;
+static int proto_tango;
+static gint ett_tango;
 
 
 /* Initialise the initial Alignment */
 static guint32  boundary = GIOP_HEADER_SIZE;  /* initial value */
 
-static int hf_operationrequest = -1;/* Request_Operation field */
+static int hf_operationrequest;/* Request_Operation field */
 
         /* Operation filters */
-static int hf_Tango_Device_command_inout_command = -1;
-static int hf_Tango_Device_get_attribute_config_return_loop = -1;
-static int hf_Tango_Device_get_attribute_config_names_loop = -1;
-static int hf_Tango_Device_get_attribute_config_names = -1;
-static int hf_Tango_Device_set_attribute_config_new_conf_loop = -1;
-static int hf_Tango_Device_read_attributes_return_loop = -1;
-static int hf_Tango_Device_read_attributes_names_loop = -1;
-static int hf_Tango_Device_read_attributes_names = -1;
-static int hf_Tango_Device_write_attributes_values_loop = -1;
-static int hf_Tango_Device_black_box_return_loop = -1;
-static int hf_Tango_Device_black_box_return = -1;
-static int hf_Tango_Device_black_box_n = -1;
-static int hf_Tango_Device_command_list_query_return_loop = -1;
-static int hf_Tango_Device_command_query_command = -1;
-static int hf_Tango_Device_2_command_inout_2_command = -1;
-static int hf_Tango_Device_2_command_inout_2_source = -1;
-static int hf_Tango_Device_2_read_attributes_2_return_loop = -1;
-static int hf_Tango_Device_2_read_attributes_2_names_loop = -1;
-static int hf_Tango_Device_2_read_attributes_2_names = -1;
-static int hf_Tango_Device_2_read_attributes_2_source = -1;
-static int hf_Tango_Device_2_get_attribute_config_2_return_loop = -1;
-static int hf_Tango_Device_2_get_attribute_config_2_names_loop = -1;
-static int hf_Tango_Device_2_get_attribute_config_2_names = -1;
-static int hf_Tango_Device_2_command_list_query_2_return_loop = -1;
-static int hf_Tango_Device_2_command_query_2_command = -1;
-static int hf_Tango_Device_2_command_inout_history_2_return_loop = -1;
-static int hf_Tango_Device_2_command_inout_history_2_command = -1;
-static int hf_Tango_Device_2_command_inout_history_2_n = -1;
-static int hf_Tango_Device_2_read_attribute_history_2_return_loop = -1;
-static int hf_Tango_Device_2_read_attribute_history_2_name = -1;
-static int hf_Tango_Device_2_read_attribute_history_2_n = -1;
-static int hf_Tango_Device_3_read_attributes_3_return_loop = -1;
-static int hf_Tango_Device_3_read_attributes_3_names_loop = -1;
-static int hf_Tango_Device_3_read_attributes_3_names = -1;
-static int hf_Tango_Device_3_read_attributes_3_source = -1;
-static int hf_Tango_Device_3_write_attributes_3_values_loop = -1;
-static int hf_Tango_Device_3_read_attribute_history_3_return_loop = -1;
-static int hf_Tango_Device_3_read_attribute_history_3_name = -1;
-static int hf_Tango_Device_3_read_attribute_history_3_n = -1;
-static int hf_Tango_Device_3_get_attribute_config_3_return_loop = -1;
-static int hf_Tango_Device_3_get_attribute_config_3_names_loop = -1;
-static int hf_Tango_Device_3_get_attribute_config_3_names = -1;
-static int hf_Tango_Device_3_set_attribute_config_3_new_conf_loop = -1;
-static int hf_Tango_Device_4_read_attribute_history_4_name = -1;
-static int hf_Tango_Device_4_read_attribute_history_4_n = -1;
-static int hf_Tango_Device_4_command_inout_history_4_command = -1;
-static int hf_Tango_Device_4_command_inout_history_4_n = -1;
-static int hf_Tango_Device_4_command_inout_4_command = -1;
-static int hf_Tango_Device_4_command_inout_4_source = -1;
-static int hf_Tango_Device_4_read_attributes_4_return_loop = -1;
-static int hf_Tango_Device_4_read_attributes_4_names_loop = -1;
-static int hf_Tango_Device_4_read_attributes_4_names = -1;
-static int hf_Tango_Device_4_read_attributes_4_source = -1;
-static int hf_Tango_Device_4_write_attributes_4_values_loop = -1;
-static int hf_Tango_Device_4_set_attribute_config_4_new_conf_loop = -1;
-static int hf_Tango_Device_4_write_read_attributes_4_return_loop = -1;
-static int hf_Tango_Device_4_write_read_attributes_4_values_loop = -1;
-static int hf_Tango_Device_5_get_attribute_config_5_return_loop = -1;
-static int hf_Tango_Device_5_get_attribute_config_5_names_loop = -1;
-static int hf_Tango_Device_5_get_attribute_config_5_names = -1;
-static int hf_Tango_Device_5_set_attribute_config_5_new_conf_loop = -1;
-static int hf_Tango_Device_5_read_attributes_5_return_loop = -1;
-static int hf_Tango_Device_5_read_attributes_5_names_loop = -1;
-static int hf_Tango_Device_5_read_attributes_5_names = -1;
-static int hf_Tango_Device_5_read_attributes_5_source = -1;
-static int hf_Tango_Device_5_write_read_attributes_5_return_loop = -1;
-static int hf_Tango_Device_5_write_read_attributes_5_values_loop = -1;
-static int hf_Tango_Device_5_write_read_attributes_5_r_names_loop = -1;
-static int hf_Tango_Device_5_write_read_attributes_5_r_names = -1;
-static int hf_Tango_Device_5_read_attribute_history_5_name = -1;
-static int hf_Tango_Device_5_read_attribute_history_5_n = -1;
-static int hf_Tango_Device_5_get_pipe_config_5_return_loop = -1;
-static int hf_Tango_Device_5_get_pipe_config_5_names_loop = -1;
-static int hf_Tango_Device_5_get_pipe_config_5_names = -1;
-static int hf_Tango_Device_5_set_pipe_config_5_new_conf_loop = -1;
-static int hf_Tango_Device_5_read_pipe_5_name = -1;
+static int hf_Tango_Device_command_inout_command;
+static int hf_Tango_Device_get_attribute_config_return_loop;
+static int hf_Tango_Device_get_attribute_config_names_loop;
+static int hf_Tango_Device_get_attribute_config_names;
+static int hf_Tango_Device_set_attribute_config_new_conf_loop;
+static int hf_Tango_Device_read_attributes_return_loop;
+static int hf_Tango_Device_read_attributes_names_loop;
+static int hf_Tango_Device_read_attributes_names;
+static int hf_Tango_Device_write_attributes_values_loop;
+static int hf_Tango_Device_black_box_return_loop;
+static int hf_Tango_Device_black_box_return;
+static int hf_Tango_Device_black_box_n;
+static int hf_Tango_Device_command_list_query_return_loop;
+static int hf_Tango_Device_command_query_command;
+static int hf_Tango_Device_2_command_inout_2_command;
+static int hf_Tango_Device_2_command_inout_2_source;
+static int hf_Tango_Device_2_read_attributes_2_return_loop;
+static int hf_Tango_Device_2_read_attributes_2_names_loop;
+static int hf_Tango_Device_2_read_attributes_2_names;
+static int hf_Tango_Device_2_read_attributes_2_source;
+static int hf_Tango_Device_2_get_attribute_config_2_return_loop;
+static int hf_Tango_Device_2_get_attribute_config_2_names_loop;
+static int hf_Tango_Device_2_get_attribute_config_2_names;
+static int hf_Tango_Device_2_command_list_query_2_return_loop;
+static int hf_Tango_Device_2_command_query_2_command;
+static int hf_Tango_Device_2_command_inout_history_2_return_loop;
+static int hf_Tango_Device_2_command_inout_history_2_command;
+static int hf_Tango_Device_2_command_inout_history_2_n;
+static int hf_Tango_Device_2_read_attribute_history_2_return_loop;
+static int hf_Tango_Device_2_read_attribute_history_2_name;
+static int hf_Tango_Device_2_read_attribute_history_2_n;
+static int hf_Tango_Device_3_read_attributes_3_return_loop;
+static int hf_Tango_Device_3_read_attributes_3_names_loop;
+static int hf_Tango_Device_3_read_attributes_3_names;
+static int hf_Tango_Device_3_read_attributes_3_source;
+static int hf_Tango_Device_3_write_attributes_3_values_loop;
+static int hf_Tango_Device_3_read_attribute_history_3_return_loop;
+static int hf_Tango_Device_3_read_attribute_history_3_name;
+static int hf_Tango_Device_3_read_attribute_history_3_n;
+static int hf_Tango_Device_3_get_attribute_config_3_return_loop;
+static int hf_Tango_Device_3_get_attribute_config_3_names_loop;
+static int hf_Tango_Device_3_get_attribute_config_3_names;
+static int hf_Tango_Device_3_set_attribute_config_3_new_conf_loop;
+static int hf_Tango_Device_4_read_attribute_history_4_name;
+static int hf_Tango_Device_4_read_attribute_history_4_n;
+static int hf_Tango_Device_4_command_inout_history_4_command;
+static int hf_Tango_Device_4_command_inout_history_4_n;
+static int hf_Tango_Device_4_command_inout_4_command;
+static int hf_Tango_Device_4_command_inout_4_source;
+static int hf_Tango_Device_4_read_attributes_4_return_loop;
+static int hf_Tango_Device_4_read_attributes_4_names_loop;
+static int hf_Tango_Device_4_read_attributes_4_names;
+static int hf_Tango_Device_4_read_attributes_4_source;
+static int hf_Tango_Device_4_write_attributes_4_values_loop;
+static int hf_Tango_Device_4_set_attribute_config_4_new_conf_loop;
+static int hf_Tango_Device_4_write_read_attributes_4_return_loop;
+static int hf_Tango_Device_4_write_read_attributes_4_values_loop;
+static int hf_Tango_Device_5_get_attribute_config_5_return_loop;
+static int hf_Tango_Device_5_get_attribute_config_5_names_loop;
+static int hf_Tango_Device_5_get_attribute_config_5_names;
+static int hf_Tango_Device_5_set_attribute_config_5_new_conf_loop;
+static int hf_Tango_Device_5_read_attributes_5_return_loop;
+static int hf_Tango_Device_5_read_attributes_5_names_loop;
+static int hf_Tango_Device_5_read_attributes_5_names;
+static int hf_Tango_Device_5_read_attributes_5_source;
+static int hf_Tango_Device_5_write_read_attributes_5_return_loop;
+static int hf_Tango_Device_5_write_read_attributes_5_values_loop;
+static int hf_Tango_Device_5_write_read_attributes_5_r_names_loop;
+static int hf_Tango_Device_5_write_read_attributes_5_r_names;
+static int hf_Tango_Device_5_read_attribute_history_5_name;
+static int hf_Tango_Device_5_read_attribute_history_5_n;
+static int hf_Tango_Device_5_get_pipe_config_5_return_loop;
+static int hf_Tango_Device_5_get_pipe_config_5_names_loop;
+static int hf_Tango_Device_5_get_pipe_config_5_names;
+static int hf_Tango_Device_5_set_pipe_config_5_new_conf_loop;
+static int hf_Tango_Device_5_read_pipe_5_name;
         /* Attribute filters */
-static int hf_get_Tango_Device_name_name = -1;
-static int hf_get_Tango_Device_description_description = -1;
-static int hf_get_Tango_Device_state_state = -1;
-static int hf_get_Tango_Device_status_status = -1;
-static int hf_get_Tango_Device_adm_name_adm_name = -1;
+static int hf_get_Tango_Device_name_name;
+static int hf_get_Tango_Device_description_description;
+static int hf_get_Tango_Device_state_state;
+static int hf_get_Tango_Device_status_status;
+static int hf_get_Tango_Device_adm_name_adm_name;
         /* Struct filters */
-static int hf_Tango_DevVarLongStringArray_lvalue_loop = -1;
-static int hf_Tango_DevVarLongStringArray_lvalue = -1;
-static int hf_Tango_DevVarLongStringArray_svalue_loop = -1;
-static int hf_Tango_DevVarLongStringArray_svalue = -1;
-static int hf_Tango_DevVarDoubleStringArray_dvalue_loop = -1;
-static int hf_Tango_DevVarDoubleStringArray_dvalue = -1;
-static int hf_Tango_DevVarDoubleStringArray_svalue_loop = -1;
-static int hf_Tango_DevVarDoubleStringArray_svalue = -1;
-static int hf_Tango_DevEncoded_encoded_format = -1;
-static int hf_Tango_DevEncoded_encoded_data_loop = -1;
-static int hf_Tango_DevEncoded_encoded_data = -1;
-static int hf_Tango_JavaClntIdent_MainClass = -1;
-static int hf_Tango_JavaClntIdent_uuid = -1;
-static int hf_Tango_TimeVal_tv_sec = -1;
-static int hf_Tango_TimeVal_tv_usec = -1;
-static int hf_Tango_TimeVal_tv_nsec = -1;
-static int hf_Tango_DevCmdInfo_cmd_name = -1;
-static int hf_Tango_DevCmdInfo_cmd_tag = -1;
-static int hf_Tango_DevCmdInfo_in_type = -1;
-static int hf_Tango_DevCmdInfo_out_type = -1;
-static int hf_Tango_DevCmdInfo_in_type_desc = -1;
-static int hf_Tango_DevCmdInfo_out_type_desc = -1;
-static int hf_Tango_DevCmdInfo_2_cmd_name = -1;
-static int hf_Tango_DevCmdInfo_2_level = -1;
-static int hf_Tango_DevCmdInfo_2_cmd_tag = -1;
-static int hf_Tango_DevCmdInfo_2_in_type = -1;
-static int hf_Tango_DevCmdInfo_2_out_type = -1;
-static int hf_Tango_DevCmdInfo_2_in_type_desc = -1;
-static int hf_Tango_DevCmdInfo_2_out_type_desc = -1;
-static int hf_Tango_DevError_reason = -1;
-static int hf_Tango_DevError_severity = -1;
-static int hf_Tango_DevError_desc = -1;
-static int hf_Tango_DevError_origin = -1;
-static int hf_Tango_NamedDevError_name = -1;
-static int hf_Tango_NamedDevError_index_in_call = -1;
-static int hf_Tango_NamedDevError_err_list_loop = -1;
-static int hf_Tango_AttributeConfig_name = -1;
-static int hf_Tango_AttributeConfig_writable = -1;
-static int hf_Tango_AttributeConfig_data_format = -1;
-static int hf_Tango_AttributeConfig_data_type = -1;
-static int hf_Tango_AttributeConfig_max_dim_x = -1;
-static int hf_Tango_AttributeConfig_max_dim_y = -1;
-static int hf_Tango_AttributeConfig_description = -1;
-static int hf_Tango_AttributeConfig_label = -1;
-static int hf_Tango_AttributeConfig_unit = -1;
-static int hf_Tango_AttributeConfig_standard_unit = -1;
-static int hf_Tango_AttributeConfig_display_unit = -1;
-static int hf_Tango_AttributeConfig_format = -1;
-static int hf_Tango_AttributeConfig_min_value = -1;
-static int hf_Tango_AttributeConfig_max_value = -1;
-static int hf_Tango_AttributeConfig_min_alarm = -1;
-static int hf_Tango_AttributeConfig_max_alarm = -1;
-static int hf_Tango_AttributeConfig_writable_attr_name = -1;
-static int hf_Tango_AttributeConfig_extensions_loop = -1;
-static int hf_Tango_AttributeConfig_extensions = -1;
-static int hf_Tango_AttributeConfig_2_name = -1;
-static int hf_Tango_AttributeConfig_2_writable = -1;
-static int hf_Tango_AttributeConfig_2_data_format = -1;
-static int hf_Tango_AttributeConfig_2_data_type = -1;
-static int hf_Tango_AttributeConfig_2_max_dim_x = -1;
-static int hf_Tango_AttributeConfig_2_max_dim_y = -1;
-static int hf_Tango_AttributeConfig_2_description = -1;
-static int hf_Tango_AttributeConfig_2_label = -1;
-static int hf_Tango_AttributeConfig_2_unit = -1;
-static int hf_Tango_AttributeConfig_2_standard_unit = -1;
-static int hf_Tango_AttributeConfig_2_display_unit = -1;
-static int hf_Tango_AttributeConfig_2_format = -1;
-static int hf_Tango_AttributeConfig_2_min_value = -1;
-static int hf_Tango_AttributeConfig_2_max_value = -1;
-static int hf_Tango_AttributeConfig_2_min_alarm = -1;
-static int hf_Tango_AttributeConfig_2_max_alarm = -1;
-static int hf_Tango_AttributeConfig_2_writable_attr_name = -1;
-static int hf_Tango_AttributeConfig_2_level = -1;
-static int hf_Tango_AttributeConfig_2_extensions_loop = -1;
-static int hf_Tango_AttributeConfig_2_extensions = -1;
-static int hf_Tango_AttributeValue_quality = -1;
-static int hf_Tango_AttributeValue_name = -1;
-static int hf_Tango_AttributeValue_dim_x = -1;
-static int hf_Tango_AttributeValue_dim_y = -1;
-static int hf_Tango_AttributeDim_dim_x = -1;
-static int hf_Tango_AttributeDim_dim_y = -1;
-static int hf_Tango_AttributeValue_3_quality = -1;
-static int hf_Tango_AttributeValue_3_name = -1;
-static int hf_Tango_AttributeValue_3_err_list_loop = -1;
-static int hf_Tango_AttributeValue_4_quality = -1;
-static int hf_Tango_AttributeValue_4_data_format = -1;
-static int hf_Tango_AttributeValue_4_name = -1;
-static int hf_Tango_AttributeValue_4_err_list_loop = -1;
-static int hf_Tango_AttributeValue_5_quality = -1;
-static int hf_Tango_AttributeValue_5_data_format = -1;
-static int hf_Tango_AttributeValue_5_data_type = -1;
-static int hf_Tango_AttributeValue_5_name = -1;
-static int hf_Tango_AttributeValue_5_err_list_loop = -1;
-static int hf_Tango_ChangeEventProp_rel_change = -1;
-static int hf_Tango_ChangeEventProp_abs_change = -1;
-static int hf_Tango_ChangeEventProp_extensions_loop = -1;
-static int hf_Tango_ChangeEventProp_extensions = -1;
-static int hf_Tango_PeriodicEventProp_period = -1;
-static int hf_Tango_PeriodicEventProp_extensions_loop = -1;
-static int hf_Tango_PeriodicEventProp_extensions = -1;
-static int hf_Tango_ArchiveEventProp_rel_change = -1;
-static int hf_Tango_ArchiveEventProp_abs_change = -1;
-static int hf_Tango_ArchiveEventProp_period = -1;
-static int hf_Tango_ArchiveEventProp_extensions_loop = -1;
-static int hf_Tango_ArchiveEventProp_extensions = -1;
-static int hf_Tango_AttributeAlarm_min_alarm = -1;
-static int hf_Tango_AttributeAlarm_max_alarm = -1;
-static int hf_Tango_AttributeAlarm_min_warning = -1;
-static int hf_Tango_AttributeAlarm_max_warning = -1;
-static int hf_Tango_AttributeAlarm_delta_t = -1;
-static int hf_Tango_AttributeAlarm_delta_val = -1;
-static int hf_Tango_AttributeAlarm_extensions_loop = -1;
-static int hf_Tango_AttributeAlarm_extensions = -1;
-static int hf_Tango_AttributeConfig_3_name = -1;
-static int hf_Tango_AttributeConfig_3_writable = -1;
-static int hf_Tango_AttributeConfig_3_data_format = -1;
-static int hf_Tango_AttributeConfig_3_data_type = -1;
-static int hf_Tango_AttributeConfig_3_max_dim_x = -1;
-static int hf_Tango_AttributeConfig_3_max_dim_y = -1;
-static int hf_Tango_AttributeConfig_3_description = -1;
-static int hf_Tango_AttributeConfig_3_label = -1;
-static int hf_Tango_AttributeConfig_3_unit = -1;
-static int hf_Tango_AttributeConfig_3_standard_unit = -1;
-static int hf_Tango_AttributeConfig_3_display_unit = -1;
-static int hf_Tango_AttributeConfig_3_format = -1;
-static int hf_Tango_AttributeConfig_3_min_value = -1;
-static int hf_Tango_AttributeConfig_3_max_value = -1;
-static int hf_Tango_AttributeConfig_3_writable_attr_name = -1;
-static int hf_Tango_AttributeConfig_3_level = -1;
-static int hf_Tango_AttributeConfig_3_extensions_loop = -1;
-static int hf_Tango_AttributeConfig_3_extensions = -1;
-static int hf_Tango_AttributeConfig_3_sys_extensions_loop = -1;
-static int hf_Tango_AttributeConfig_3_sys_extensions = -1;
-static int hf_Tango_AttributeConfig_5_name = -1;
-static int hf_Tango_AttributeConfig_5_writable = -1;
-static int hf_Tango_AttributeConfig_5_data_format = -1;
-static int hf_Tango_AttributeConfig_5_data_type = -1;
-static int hf_Tango_AttributeConfig_5_memorized = -1;
-static int hf_Tango_AttributeConfig_5_mem_init = -1;
-static int hf_Tango_AttributeConfig_5_max_dim_x = -1;
-static int hf_Tango_AttributeConfig_5_max_dim_y = -1;
-static int hf_Tango_AttributeConfig_5_description = -1;
-static int hf_Tango_AttributeConfig_5_label = -1;
-static int hf_Tango_AttributeConfig_5_unit = -1;
-static int hf_Tango_AttributeConfig_5_standard_unit = -1;
-static int hf_Tango_AttributeConfig_5_display_unit = -1;
-static int hf_Tango_AttributeConfig_5_format = -1;
-static int hf_Tango_AttributeConfig_5_min_value = -1;
-static int hf_Tango_AttributeConfig_5_max_value = -1;
-static int hf_Tango_AttributeConfig_5_writable_attr_name = -1;
-static int hf_Tango_AttributeConfig_5_level = -1;
-static int hf_Tango_AttributeConfig_5_root_attr_name = -1;
-static int hf_Tango_AttributeConfig_5_enum_labels_loop = -1;
-static int hf_Tango_AttributeConfig_5_enum_labels = -1;
-static int hf_Tango_AttributeConfig_5_extensions_loop = -1;
-static int hf_Tango_AttributeConfig_5_extensions = -1;
-static int hf_Tango_AttributeConfig_5_sys_extensions_loop = -1;
-static int hf_Tango_AttributeConfig_5_sys_extensions = -1;
-static int hf_Tango_PipeConfig_name = -1;
-static int hf_Tango_PipeConfig_description = -1;
-static int hf_Tango_PipeConfig_label = -1;
-static int hf_Tango_PipeConfig_level = -1;
-static int hf_Tango_PipeConfig_writable = -1;
-static int hf_Tango_PipeConfig_extensions_loop = -1;
-static int hf_Tango_PipeConfig_extensions = -1;
-static int hf_Tango_DevPipeDataElt_name = -1;
-static int hf_Tango_DevPipeDataElt_inner_blob_loop = -1;
-static int hf_Tango_DevPipeDataElt_inner_blob_name = -1;
-static int hf_Tango_DevPipeBlob_name = -1;
-static int hf_Tango_DevPipeBlob_blob_data_loop = -1;
-static int hf_Tango_DevPipeData_name = -1;
-static int hf_Tango_AttDataReady_name = -1;
-static int hf_Tango_AttDataReady_data_type = -1;
-static int hf_Tango_AttDataReady_ctr = -1;
-static int hf_Tango_DevIntrChange_dev_started = -1;
-static int hf_Tango_DevIntrChange_cmds_loop = -1;
-static int hf_Tango_DevIntrChange_atts_loop = -1;
-static int hf_Tango_DevInfo_dev_class = -1;
-static int hf_Tango_DevInfo_server_id = -1;
-static int hf_Tango_DevInfo_server_host = -1;
-static int hf_Tango_DevInfo_server_version = -1;
-static int hf_Tango_DevInfo_doc_url = -1;
-static int hf_Tango_DevInfo_3_dev_class = -1;
-static int hf_Tango_DevInfo_3_server_id = -1;
-static int hf_Tango_DevInfo_3_server_host = -1;
-static int hf_Tango_DevInfo_3_server_version = -1;
-static int hf_Tango_DevInfo_3_doc_url = -1;
-static int hf_Tango_DevInfo_3_dev_type = -1;
-static int hf_Tango_DevCmdHistory_cmd_failed = -1;
-static int hf_Tango_DevCmdHistory_errors_loop = -1;
-static int hf_Tango_DevAttrHistory_attr_failed = -1;
-static int hf_Tango_DevAttrHistory_errors_loop = -1;
-static int hf_Tango_DevAttrHistory_3_attr_failed = -1;
-static int hf_Tango_EltInArray_start = -1;
-static int hf_Tango_EltInArray_nb_elt = -1;
-static int hf_Tango_DevAttrHistory_4_name = -1;
-static int hf_Tango_DevAttrHistory_4_dates_loop = -1;
-static int hf_Tango_DevAttrHistory_4_quals_loop = -1;
-static int hf_Tango_DevAttrHistory_4_quals = -1;
-static int hf_Tango_DevAttrHistory_4_quals_array_loop = -1;
-static int hf_Tango_DevAttrHistory_4_r_dims_loop = -1;
-static int hf_Tango_DevAttrHistory_4_r_dims_array_loop = -1;
-static int hf_Tango_DevAttrHistory_4_w_dims_loop = -1;
-static int hf_Tango_DevAttrHistory_4_w_dims_array_loop = -1;
-static int hf_Tango_DevAttrHistory_4_errors_loop = -1;
-static int hf_Tango_DevAttrHistory_4_errors_array_loop = -1;
-static int hf_Tango_DevAttrHistory_5_name = -1;
-static int hf_Tango_DevAttrHistory_5_data_format = -1;
-static int hf_Tango_DevAttrHistory_5_data_type = -1;
-static int hf_Tango_DevAttrHistory_5_dates_loop = -1;
-static int hf_Tango_DevAttrHistory_5_quals_loop = -1;
-static int hf_Tango_DevAttrHistory_5_quals = -1;
-static int hf_Tango_DevAttrHistory_5_quals_array_loop = -1;
-static int hf_Tango_DevAttrHistory_5_r_dims_loop = -1;
-static int hf_Tango_DevAttrHistory_5_r_dims_array_loop = -1;
-static int hf_Tango_DevAttrHistory_5_w_dims_loop = -1;
-static int hf_Tango_DevAttrHistory_5_w_dims_array_loop = -1;
-static int hf_Tango_DevAttrHistory_5_errors_loop = -1;
-static int hf_Tango_DevAttrHistory_5_errors_array_loop = -1;
-static int hf_Tango_DevCmdHistory_4_dates_loop = -1;
-static int hf_Tango_DevCmdHistory_4_dims_loop = -1;
-static int hf_Tango_DevCmdHistory_4_dims_array_loop = -1;
-static int hf_Tango_DevCmdHistory_4_errors_loop = -1;
-static int hf_Tango_DevCmdHistory_4_errors_array_loop = -1;
-static int hf_Tango_DevCmdHistory_4_cmd_type = -1;
-static int hf_Tango_ZmqCallInfo_version = -1;
-static int hf_Tango_ZmqCallInfo_ctr = -1;
-static int hf_Tango_ZmqCallInfo_method_name = -1;
-static int hf_Tango_ZmqCallInfo_oid_loop = -1;
-static int hf_Tango_ZmqCallInfo_oid = -1;
-static int hf_Tango_ZmqCallInfo_call_is_except = -1;
+static int hf_Tango_DevVarLongStringArray_lvalue_loop;
+static int hf_Tango_DevVarLongStringArray_lvalue;
+static int hf_Tango_DevVarLongStringArray_svalue_loop;
+static int hf_Tango_DevVarLongStringArray_svalue;
+static int hf_Tango_DevVarDoubleStringArray_dvalue_loop;
+static int hf_Tango_DevVarDoubleStringArray_dvalue;
+static int hf_Tango_DevVarDoubleStringArray_svalue_loop;
+static int hf_Tango_DevVarDoubleStringArray_svalue;
+static int hf_Tango_DevEncoded_encoded_format;
+static int hf_Tango_DevEncoded_encoded_data_loop;
+static int hf_Tango_DevEncoded_encoded_data;
+static int hf_Tango_JavaClntIdent_MainClass;
+static int hf_Tango_JavaClntIdent_uuid;
+static int hf_Tango_TimeVal_tv_sec;
+static int hf_Tango_TimeVal_tv_usec;
+static int hf_Tango_TimeVal_tv_nsec;
+static int hf_Tango_DevCmdInfo_cmd_name;
+static int hf_Tango_DevCmdInfo_cmd_tag;
+static int hf_Tango_DevCmdInfo_in_type;
+static int hf_Tango_DevCmdInfo_out_type;
+static int hf_Tango_DevCmdInfo_in_type_desc;
+static int hf_Tango_DevCmdInfo_out_type_desc;
+static int hf_Tango_DevCmdInfo_2_cmd_name;
+static int hf_Tango_DevCmdInfo_2_level;
+static int hf_Tango_DevCmdInfo_2_cmd_tag;
+static int hf_Tango_DevCmdInfo_2_in_type;
+static int hf_Tango_DevCmdInfo_2_out_type;
+static int hf_Tango_DevCmdInfo_2_in_type_desc;
+static int hf_Tango_DevCmdInfo_2_out_type_desc;
+static int hf_Tango_DevError_reason;
+static int hf_Tango_DevError_severity;
+static int hf_Tango_DevError_desc;
+static int hf_Tango_DevError_origin;
+static int hf_Tango_NamedDevError_name;
+static int hf_Tango_NamedDevError_index_in_call;
+static int hf_Tango_NamedDevError_err_list_loop;
+static int hf_Tango_AttributeConfig_name;
+static int hf_Tango_AttributeConfig_writable;
+static int hf_Tango_AttributeConfig_data_format;
+static int hf_Tango_AttributeConfig_data_type;
+static int hf_Tango_AttributeConfig_max_dim_x;
+static int hf_Tango_AttributeConfig_max_dim_y;
+static int hf_Tango_AttributeConfig_description;
+static int hf_Tango_AttributeConfig_label;
+static int hf_Tango_AttributeConfig_unit;
+static int hf_Tango_AttributeConfig_standard_unit;
+static int hf_Tango_AttributeConfig_display_unit;
+static int hf_Tango_AttributeConfig_format;
+static int hf_Tango_AttributeConfig_min_value;
+static int hf_Tango_AttributeConfig_max_value;
+static int hf_Tango_AttributeConfig_min_alarm;
+static int hf_Tango_AttributeConfig_max_alarm;
+static int hf_Tango_AttributeConfig_writable_attr_name;
+static int hf_Tango_AttributeConfig_extensions_loop;
+static int hf_Tango_AttributeConfig_extensions;
+static int hf_Tango_AttributeConfig_2_name;
+static int hf_Tango_AttributeConfig_2_writable;
+static int hf_Tango_AttributeConfig_2_data_format;
+static int hf_Tango_AttributeConfig_2_data_type;
+static int hf_Tango_AttributeConfig_2_max_dim_x;
+static int hf_Tango_AttributeConfig_2_max_dim_y;
+static int hf_Tango_AttributeConfig_2_description;
+static int hf_Tango_AttributeConfig_2_label;
+static int hf_Tango_AttributeConfig_2_unit;
+static int hf_Tango_AttributeConfig_2_standard_unit;
+static int hf_Tango_AttributeConfig_2_display_unit;
+static int hf_Tango_AttributeConfig_2_format;
+static int hf_Tango_AttributeConfig_2_min_value;
+static int hf_Tango_AttributeConfig_2_max_value;
+static int hf_Tango_AttributeConfig_2_min_alarm;
+static int hf_Tango_AttributeConfig_2_max_alarm;
+static int hf_Tango_AttributeConfig_2_writable_attr_name;
+static int hf_Tango_AttributeConfig_2_level;
+static int hf_Tango_AttributeConfig_2_extensions_loop;
+static int hf_Tango_AttributeConfig_2_extensions;
+static int hf_Tango_AttributeValue_quality;
+static int hf_Tango_AttributeValue_name;
+static int hf_Tango_AttributeValue_dim_x;
+static int hf_Tango_AttributeValue_dim_y;
+static int hf_Tango_AttributeDim_dim_x;
+static int hf_Tango_AttributeDim_dim_y;
+static int hf_Tango_AttributeValue_3_quality;
+static int hf_Tango_AttributeValue_3_name;
+static int hf_Tango_AttributeValue_3_err_list_loop;
+static int hf_Tango_AttributeValue_4_quality;
+static int hf_Tango_AttributeValue_4_data_format;
+static int hf_Tango_AttributeValue_4_name;
+static int hf_Tango_AttributeValue_4_err_list_loop;
+static int hf_Tango_AttributeValue_5_quality;
+static int hf_Tango_AttributeValue_5_data_format;
+static int hf_Tango_AttributeValue_5_data_type;
+static int hf_Tango_AttributeValue_5_name;
+static int hf_Tango_AttributeValue_5_err_list_loop;
+static int hf_Tango_ChangeEventProp_rel_change;
+static int hf_Tango_ChangeEventProp_abs_change;
+static int hf_Tango_ChangeEventProp_extensions_loop;
+static int hf_Tango_ChangeEventProp_extensions;
+static int hf_Tango_PeriodicEventProp_period;
+static int hf_Tango_PeriodicEventProp_extensions_loop;
+static int hf_Tango_PeriodicEventProp_extensions;
+static int hf_Tango_ArchiveEventProp_rel_change;
+static int hf_Tango_ArchiveEventProp_abs_change;
+static int hf_Tango_ArchiveEventProp_period;
+static int hf_Tango_ArchiveEventProp_extensions_loop;
+static int hf_Tango_ArchiveEventProp_extensions;
+static int hf_Tango_AttributeAlarm_min_alarm;
+static int hf_Tango_AttributeAlarm_max_alarm;
+static int hf_Tango_AttributeAlarm_min_warning;
+static int hf_Tango_AttributeAlarm_max_warning;
+static int hf_Tango_AttributeAlarm_delta_t;
+static int hf_Tango_AttributeAlarm_delta_val;
+static int hf_Tango_AttributeAlarm_extensions_loop;
+static int hf_Tango_AttributeAlarm_extensions;
+static int hf_Tango_AttributeConfig_3_name;
+static int hf_Tango_AttributeConfig_3_writable;
+static int hf_Tango_AttributeConfig_3_data_format;
+static int hf_Tango_AttributeConfig_3_data_type;
+static int hf_Tango_AttributeConfig_3_max_dim_x;
+static int hf_Tango_AttributeConfig_3_max_dim_y;
+static int hf_Tango_AttributeConfig_3_description;
+static int hf_Tango_AttributeConfig_3_label;
+static int hf_Tango_AttributeConfig_3_unit;
+static int hf_Tango_AttributeConfig_3_standard_unit;
+static int hf_Tango_AttributeConfig_3_display_unit;
+static int hf_Tango_AttributeConfig_3_format;
+static int hf_Tango_AttributeConfig_3_min_value;
+static int hf_Tango_AttributeConfig_3_max_value;
+static int hf_Tango_AttributeConfig_3_writable_attr_name;
+static int hf_Tango_AttributeConfig_3_level;
+static int hf_Tango_AttributeConfig_3_extensions_loop;
+static int hf_Tango_AttributeConfig_3_extensions;
+static int hf_Tango_AttributeConfig_3_sys_extensions_loop;
+static int hf_Tango_AttributeConfig_3_sys_extensions;
+static int hf_Tango_AttributeConfig_5_name;
+static int hf_Tango_AttributeConfig_5_writable;
+static int hf_Tango_AttributeConfig_5_data_format;
+static int hf_Tango_AttributeConfig_5_data_type;
+static int hf_Tango_AttributeConfig_5_memorized;
+static int hf_Tango_AttributeConfig_5_mem_init;
+static int hf_Tango_AttributeConfig_5_max_dim_x;
+static int hf_Tango_AttributeConfig_5_max_dim_y;
+static int hf_Tango_AttributeConfig_5_description;
+static int hf_Tango_AttributeConfig_5_label;
+static int hf_Tango_AttributeConfig_5_unit;
+static int hf_Tango_AttributeConfig_5_standard_unit;
+static int hf_Tango_AttributeConfig_5_display_unit;
+static int hf_Tango_AttributeConfig_5_format;
+static int hf_Tango_AttributeConfig_5_min_value;
+static int hf_Tango_AttributeConfig_5_max_value;
+static int hf_Tango_AttributeConfig_5_writable_attr_name;
+static int hf_Tango_AttributeConfig_5_level;
+static int hf_Tango_AttributeConfig_5_root_attr_name;
+static int hf_Tango_AttributeConfig_5_enum_labels_loop;
+static int hf_Tango_AttributeConfig_5_enum_labels;
+static int hf_Tango_AttributeConfig_5_extensions_loop;
+static int hf_Tango_AttributeConfig_5_extensions;
+static int hf_Tango_AttributeConfig_5_sys_extensions_loop;
+static int hf_Tango_AttributeConfig_5_sys_extensions;
+static int hf_Tango_PipeConfig_name;
+static int hf_Tango_PipeConfig_description;
+static int hf_Tango_PipeConfig_label;
+static int hf_Tango_PipeConfig_level;
+static int hf_Tango_PipeConfig_writable;
+static int hf_Tango_PipeConfig_extensions_loop;
+static int hf_Tango_PipeConfig_extensions;
+static int hf_Tango_DevPipeDataElt_name;
+static int hf_Tango_DevPipeDataElt_inner_blob_loop;
+static int hf_Tango_DevPipeDataElt_inner_blob_name;
+static int hf_Tango_DevPipeBlob_name;
+static int hf_Tango_DevPipeBlob_blob_data_loop;
+static int hf_Tango_DevPipeData_name;
+static int hf_Tango_AttDataReady_name;
+static int hf_Tango_AttDataReady_data_type;
+static int hf_Tango_AttDataReady_ctr;
+static int hf_Tango_DevIntrChange_dev_started;
+static int hf_Tango_DevIntrChange_cmds_loop;
+static int hf_Tango_DevIntrChange_atts_loop;
+static int hf_Tango_DevInfo_dev_class;
+static int hf_Tango_DevInfo_server_id;
+static int hf_Tango_DevInfo_server_host;
+static int hf_Tango_DevInfo_server_version;
+static int hf_Tango_DevInfo_doc_url;
+static int hf_Tango_DevInfo_3_dev_class;
+static int hf_Tango_DevInfo_3_server_id;
+static int hf_Tango_DevInfo_3_server_host;
+static int hf_Tango_DevInfo_3_server_version;
+static int hf_Tango_DevInfo_3_doc_url;
+static int hf_Tango_DevInfo_3_dev_type;
+static int hf_Tango_DevCmdHistory_cmd_failed;
+static int hf_Tango_DevCmdHistory_errors_loop;
+static int hf_Tango_DevAttrHistory_attr_failed;
+static int hf_Tango_DevAttrHistory_errors_loop;
+static int hf_Tango_DevAttrHistory_3_attr_failed;
+static int hf_Tango_EltInArray_start;
+static int hf_Tango_EltInArray_nb_elt;
+static int hf_Tango_DevAttrHistory_4_name;
+static int hf_Tango_DevAttrHistory_4_dates_loop;
+static int hf_Tango_DevAttrHistory_4_quals_loop;
+static int hf_Tango_DevAttrHistory_4_quals;
+static int hf_Tango_DevAttrHistory_4_quals_array_loop;
+static int hf_Tango_DevAttrHistory_4_r_dims_loop;
+static int hf_Tango_DevAttrHistory_4_r_dims_array_loop;
+static int hf_Tango_DevAttrHistory_4_w_dims_loop;
+static int hf_Tango_DevAttrHistory_4_w_dims_array_loop;
+static int hf_Tango_DevAttrHistory_4_errors_loop;
+static int hf_Tango_DevAttrHistory_4_errors_array_loop;
+static int hf_Tango_DevAttrHistory_5_name;
+static int hf_Tango_DevAttrHistory_5_data_format;
+static int hf_Tango_DevAttrHistory_5_data_type;
+static int hf_Tango_DevAttrHistory_5_dates_loop;
+static int hf_Tango_DevAttrHistory_5_quals_loop;
+static int hf_Tango_DevAttrHistory_5_quals;
+static int hf_Tango_DevAttrHistory_5_quals_array_loop;
+static int hf_Tango_DevAttrHistory_5_r_dims_loop;
+static int hf_Tango_DevAttrHistory_5_r_dims_array_loop;
+static int hf_Tango_DevAttrHistory_5_w_dims_loop;
+static int hf_Tango_DevAttrHistory_5_w_dims_array_loop;
+static int hf_Tango_DevAttrHistory_5_errors_loop;
+static int hf_Tango_DevAttrHistory_5_errors_array_loop;
+static int hf_Tango_DevCmdHistory_4_dates_loop;
+static int hf_Tango_DevCmdHistory_4_dims_loop;
+static int hf_Tango_DevCmdHistory_4_dims_array_loop;
+static int hf_Tango_DevCmdHistory_4_errors_loop;
+static int hf_Tango_DevCmdHistory_4_errors_array_loop;
+static int hf_Tango_DevCmdHistory_4_cmd_type;
+static int hf_Tango_ZmqCallInfo_version;
+static int hf_Tango_ZmqCallInfo_ctr;
+static int hf_Tango_ZmqCallInfo_method_name;
+static int hf_Tango_ZmqCallInfo_oid_loop;
+static int hf_Tango_ZmqCallInfo_oid;
+static int hf_Tango_ZmqCallInfo_call_is_except;
         /* User exception filters */
-static int hf_Tango_DevFailed_errors_loop = -1;
-static int hf_Tango_MultiDevFailed_errors_loop = -1;
+static int hf_Tango_DevFailed_errors_loop;
+static int hf_Tango_MultiDevFailed_errors_loop;
         /* Union filters */
-static int hf_Tango_ClntIdent_ClntIdent = -1;
-static int hf_Tango_ClntIdent_cpp_clnt = -1;
-static int hf_Tango_AttrValUnion_AttrValUnion = -1;
-static int hf_Tango_AttrValUnion_bool_att_value_loop = -1;
-static int hf_Tango_AttrValUnion_bool_att_value = -1;
-static int hf_Tango_AttrValUnion_short_att_value_loop = -1;
-static int hf_Tango_AttrValUnion_short_att_value = -1;
-static int hf_Tango_AttrValUnion_long_att_value_loop = -1;
-static int hf_Tango_AttrValUnion_long_att_value = -1;
-static int hf_Tango_AttrValUnion_long64_att_value_loop = -1;
-static int hf_Tango_AttrValUnion_long64_att_value = -1;
-static int hf_Tango_AttrValUnion_float_att_value_loop = -1;
-static int hf_Tango_AttrValUnion_float_att_value = -1;
-static int hf_Tango_AttrValUnion_double_att_value_loop = -1;
-static int hf_Tango_AttrValUnion_double_att_value = -1;
-static int hf_Tango_AttrValUnion_uchar_att_value_loop = -1;
-static int hf_Tango_AttrValUnion_uchar_att_value = -1;
-static int hf_Tango_AttrValUnion_ushort_att_value_loop = -1;
-static int hf_Tango_AttrValUnion_ushort_att_value = -1;
-static int hf_Tango_AttrValUnion_ulong_att_value_loop = -1;
-static int hf_Tango_AttrValUnion_ulong_att_value = -1;
-static int hf_Tango_AttrValUnion_ulong64_att_value_loop = -1;
-static int hf_Tango_AttrValUnion_ulong64_att_value = -1;
-static int hf_Tango_AttrValUnion_string_att_value_loop = -1;
-static int hf_Tango_AttrValUnion_string_att_value = -1;
-static int hf_Tango_AttrValUnion_state_att_value_loop = -1;
-static int hf_Tango_AttrValUnion_state_att_value = -1;
-static int hf_Tango_AttrValUnion_dev_state_att = -1;
-static int hf_Tango_AttrValUnion_encoded_att_value_loop = -1;
-static int hf_Tango_AttrValUnion_union_no_data = -1;
+static int hf_Tango_ClntIdent_ClntIdent;
+static int hf_Tango_ClntIdent_cpp_clnt;
+static int hf_Tango_AttrValUnion_AttrValUnion;
+static int hf_Tango_AttrValUnion_bool_att_value_loop;
+static int hf_Tango_AttrValUnion_bool_att_value;
+static int hf_Tango_AttrValUnion_short_att_value_loop;
+static int hf_Tango_AttrValUnion_short_att_value;
+static int hf_Tango_AttrValUnion_long_att_value_loop;
+static int hf_Tango_AttrValUnion_long_att_value;
+static int hf_Tango_AttrValUnion_long64_att_value_loop;
+static int hf_Tango_AttrValUnion_long64_att_value;
+static int hf_Tango_AttrValUnion_float_att_value_loop;
+static int hf_Tango_AttrValUnion_float_att_value;
+static int hf_Tango_AttrValUnion_double_att_value_loop;
+static int hf_Tango_AttrValUnion_double_att_value;
+static int hf_Tango_AttrValUnion_uchar_att_value_loop;
+static int hf_Tango_AttrValUnion_uchar_att_value;
+static int hf_Tango_AttrValUnion_ushort_att_value_loop;
+static int hf_Tango_AttrValUnion_ushort_att_value;
+static int hf_Tango_AttrValUnion_ulong_att_value_loop;
+static int hf_Tango_AttrValUnion_ulong_att_value;
+static int hf_Tango_AttrValUnion_ulong64_att_value_loop;
+static int hf_Tango_AttrValUnion_ulong64_att_value;
+static int hf_Tango_AttrValUnion_string_att_value_loop;
+static int hf_Tango_AttrValUnion_string_att_value;
+static int hf_Tango_AttrValUnion_state_att_value_loop;
+static int hf_Tango_AttrValUnion_state_att_value;
+static int hf_Tango_AttrValUnion_dev_state_att;
+static int hf_Tango_AttrValUnion_encoded_att_value_loop;
+static int hf_Tango_AttrValUnion_union_no_data;
         /* Expert info filters */
-static expert_field ei_tango_unknown_giop_msg = EI_INIT;
-static expert_field ei_tango_unknown_exception = EI_INIT;
-static expert_field ei_tango_unknown_reply_status = EI_INIT;
+static expert_field ei_tango_unknown_giop_msg;
+static expert_field ei_tango_unknown_exception;
+static expert_field ei_tango_unknown_reply_status;
 
 
 static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset);
diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c
index 86337b2ede..d300564bee 100644
--- a/epan/dissectors/packet-tapa.c
+++ b/epan/dissectors/packet-tapa.c
@@ -30,49 +30,49 @@ void proto_reg_handoff_tapa(void);
 void proto_register_tapa(void);
 
 /* protocol handles */
-static int proto_tapa = -1;
+static int proto_tapa;
 
 /* ett handles */
-static int ett_tapa_discover = -1;
-static int ett_tapa_discover_req = -1;
-static int ett_tapa_tunnel = -1;
+static int ett_tapa_discover;
+static int ett_tapa_discover_req;
+static int ett_tapa_tunnel;
 
 /* hf elements */
-static int hf_tapa_discover_type = -1;
-static int hf_tapa_discover_flags = -1;
-static int hf_tapa_discover_length = -1;
-static int hf_tapa_discover_unknown = -1;
-
-static int hf_tapa_discover_req_type = -1;
-static int hf_tapa_discover_req_pad = -1;
-static int hf_tapa_discover_req_length = -1;
-static int hf_tapa_discover_req_value = -1;
-
-static int hf_tapa_discover_newtlv_type = -1;
-static int hf_tapa_discover_newtlv_pad = -1;
-static int hf_tapa_discover_newtlv_length = -1;
-static int hf_tapa_discover_newtlv_valuetext = -1;
-static int hf_tapa_discover_newtlv_valuehex = -1;
-
-static int hf_tapa_discover_reply_switchip = -1;
-static int hf_tapa_discover_reply_unused = -1;
-static int hf_tapa_discover_reply_bias = -1;
-static int hf_tapa_discover_reply_pad = -1;
-
-static int hf_tapa_tunnel_version = -1;
-static int hf_tapa_tunnel_five = -1;
-static int hf_tapa_tunnel_type = -1;
-static int hf_tapa_tunnel_zero = -1;
-static int hf_tapa_tunnel_dmac = -1;
-static int hf_tapa_tunnel_smac = -1;
-static int hf_tapa_tunnel_seqno = -1;
-static int hf_tapa_tunnel_length = -1;
-static int hf_tapa_tunnel_0804 = -1;
-static int hf_tapa_tunnel_tagsetc = -1;
-
-static int hf_tapa_tunnel_remaining = -1;
-
-static expert_field ei_tapa_length_too_short = EI_INIT;
+static int hf_tapa_discover_type;
+static int hf_tapa_discover_flags;
+static int hf_tapa_discover_length;
+static int hf_tapa_discover_unknown;
+
+static int hf_tapa_discover_req_type;
+static int hf_tapa_discover_req_pad;
+static int hf_tapa_discover_req_length;
+static int hf_tapa_discover_req_value;
+
+static int hf_tapa_discover_newtlv_type;
+static int hf_tapa_discover_newtlv_pad;
+static int hf_tapa_discover_newtlv_length;
+static int hf_tapa_discover_newtlv_valuetext;
+static int hf_tapa_discover_newtlv_valuehex;
+
+static int hf_tapa_discover_reply_switchip;
+static int hf_tapa_discover_reply_unused;
+static int hf_tapa_discover_reply_bias;
+static int hf_tapa_discover_reply_pad;
+
+static int hf_tapa_tunnel_version;
+static int hf_tapa_tunnel_five;
+static int hf_tapa_tunnel_type;
+static int hf_tapa_tunnel_zero;
+static int hf_tapa_tunnel_dmac;
+static int hf_tapa_tunnel_smac;
+static int hf_tapa_tunnel_seqno;
+static int hf_tapa_tunnel_length;
+static int hf_tapa_tunnel_0804;
+static int hf_tapa_tunnel_tagsetc;
+
+static int hf_tapa_tunnel_remaining;
+
+static expert_field ei_tapa_length_too_short;
 
 static dissector_handle_t tapa_handle;
 
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index 812db389ee..7b2fa4015a 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -44,11 +44,11 @@ static int hf_tcap_data;
 static int hf_tcap_tid;
 static int hf_tcap_constructor_eoc;
 
-int hf_tcapsrt_SessionId=-1;
-int hf_tcapsrt_Duplicate=-1;
-int hf_tcapsrt_BeginSession=-1;
-int hf_tcapsrt_EndSession=-1;
-int hf_tcapsrt_SessionTime=-1;
+int hf_tcapsrt_SessionId;
+int hf_tcapsrt_Duplicate;
+int hf_tcapsrt_BeginSession;
+int hf_tcapsrt_EndSession;
+int hf_tcapsrt_SessionTime;
 
 static int hf_tcap_UniDialoguePDU_PDU;            /* UniDialoguePDU */
 static int hf_tcap_DialoguePDU_PDU;               /* DialoguePDU */
@@ -124,7 +124,7 @@ static gint ett_param;
 
 static gint ett_otid;
 static gint ett_dtid;
-gint ett_tcap_stat = -1;
+gint ett_tcap_stat;
 
 static struct tcapsrt_info_t * gp_tcapsrt_info;
 static gboolean tcap_subdissector_used=FALSE;
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 270e504033..ec400f4bb7 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -136,358 +136,358 @@ static gint tcp_default_window_scaling = (gint)WindowScaling_NotKnown;
 
 static gint tcp_default_override_analysis = (gint)OverrideAnalysis_0;
 
-static int proto_tcp = -1;
-static int proto_ip = -1;
-static int proto_icmp = -1;
-
-static int proto_tcp_option_nop = -1;
-static int proto_tcp_option_eol = -1;
-static int proto_tcp_option_timestamp = -1;
-static int proto_tcp_option_mss = -1;
-static int proto_tcp_option_wscale = -1;
-static int proto_tcp_option_sack_perm = -1;
-static int proto_tcp_option_sack = -1;
-static int proto_tcp_option_echo = -1;
-static int proto_tcp_option_echoreply = -1;
-static int proto_tcp_option_cc = -1;
-static int proto_tcp_option_cc_new = -1;
-static int proto_tcp_option_cc_echo = -1;
-static int proto_tcp_option_md5 = -1;
-static int proto_tcp_option_ao = -1;
-static int proto_tcp_option_scps = -1;
-static int proto_tcp_option_snack = -1;
-static int proto_tcp_option_scpsrec = -1;
-static int proto_tcp_option_scpscor = -1;
-static int proto_tcp_option_qs = -1;
-static int proto_tcp_option_user_to = -1;
-static int proto_tcp_option_tfo = -1;
-static int proto_tcp_option_acc_ecn = -1;
-static int proto_tcp_option_rvbd_probe = -1;
-static int proto_tcp_option_rvbd_trpy = -1;
-static int proto_tcp_option_exp = -1;
-static int proto_tcp_option_unknown = -1;
-static int proto_mptcp = -1;
-
-static int hf_tcp_srcport = -1;
-static int hf_tcp_dstport = -1;
-static int hf_tcp_port = -1;
-static int hf_tcp_stream = -1;
-static int hf_tcp_completeness = -1;
-static int hf_tcp_completeness_syn = -1;
-static int hf_tcp_completeness_syn_ack = -1;
-static int hf_tcp_completeness_ack = -1;
-static int hf_tcp_completeness_data = -1;
-static int hf_tcp_completeness_fin = -1;
-static int hf_tcp_completeness_rst = -1;
-static int hf_tcp_completeness_str = -1;
-static int hf_tcp_seq = -1;
-static int hf_tcp_seq_abs = -1;
-static int hf_tcp_nxtseq = -1;
-static int hf_tcp_ack = -1;
-static int hf_tcp_ack_abs = -1;
-static int hf_tcp_hdr_len = -1;
-static int hf_tcp_flags = -1;
-static int hf_tcp_flags_res = -1;
-static int hf_tcp_flags_ae = -1;
-static int hf_tcp_flags_cwr = -1;
-static int hf_tcp_flags_ece = -1;
-static int hf_tcp_flags_ace = -1;
-static int hf_tcp_flags_urg = -1;
-static int hf_tcp_flags_ack = -1;
-static int hf_tcp_flags_push = -1;
-static int hf_tcp_flags_reset = -1;
-static int hf_tcp_flags_syn = -1;
-static int hf_tcp_flags_fin = -1;
-static int hf_tcp_flags_str = -1;
-static int hf_tcp_window_size_value = -1;
-static int hf_tcp_window_size = -1;
-static int hf_tcp_window_size_scalefactor = -1;
-static int hf_tcp_checksum = -1;
-static int hf_tcp_checksum_status = -1;
-static int hf_tcp_checksum_calculated = -1;
-static int hf_tcp_len = -1;
-static int hf_tcp_urgent_pointer = -1;
-static int hf_tcp_analysis = -1;
-static int hf_tcp_analysis_flags = -1;
-static int hf_tcp_analysis_bytes_in_flight = -1;
-static int hf_tcp_analysis_push_bytes_sent = -1;
-static int hf_tcp_analysis_acks_frame = -1;
-static int hf_tcp_analysis_ack_rtt = -1;
-static int hf_tcp_analysis_first_rtt = -1;
-static int hf_tcp_analysis_rto = -1;
-static int hf_tcp_analysis_rto_frame = -1;
-static int hf_tcp_analysis_duplicate_ack = -1;
-static int hf_tcp_analysis_duplicate_ack_num = -1;
-static int hf_tcp_analysis_duplicate_ack_frame = -1;
-static int hf_tcp_continuation_to = -1;
-static int hf_tcp_pdu_time = -1;
-static int hf_tcp_pdu_size = -1;
-static int hf_tcp_pdu_last_frame = -1;
-static int hf_tcp_reassembled_in = -1;
-static int hf_tcp_reassembled_length = -1;
-static int hf_tcp_reassembled_data = -1;
-static int hf_tcp_segments = -1;
-static int hf_tcp_segment = -1;
-static int hf_tcp_segment_overlap = -1;
-static int hf_tcp_segment_overlap_conflict = -1;
-static int hf_tcp_segment_multiple_tails = -1;
-static int hf_tcp_segment_too_long_fragment = -1;
-static int hf_tcp_segment_error = -1;
-static int hf_tcp_segment_count = -1;
-static int hf_tcp_options = -1;
-static int hf_tcp_option_kind = -1;
-static int hf_tcp_option_len = -1;
-static int hf_tcp_option_mss_val = -1;
-static int hf_tcp_option_wscale_shift = -1;
-static int hf_tcp_option_wscale_multiplier = -1;
-static int hf_tcp_option_sack_sle = -1;
-static int hf_tcp_option_sack_sre = -1;
-static int hf_tcp_option_sack_range_count = -1;
-static int hf_tcp_option_sack_dsack_le = -1;
-static int hf_tcp_option_sack_dsack_re = -1;
-static int hf_tcp_option_echo = -1;
-static int hf_tcp_option_timestamp_tsval = -1;
-static int hf_tcp_option_timestamp_tsecr = -1;
-static int hf_tcp_option_cc = -1;
-static int hf_tcp_option_md5_digest = -1;
-static int hf_tcp_option_ao_keyid = -1;
-static int hf_tcp_option_ao_rnextkeyid = -1;
-static int hf_tcp_option_ao_mac = -1;
-static int hf_tcp_option_qs_rate = -1;
-static int hf_tcp_option_qs_ttl_diff = -1;
-static int hf_tcp_option_tarr_rate = -1;
-static int hf_tcp_option_tarr_reserved = -1;
-static int hf_tcp_option_acc_ecn_ee0b = -1;
-static int hf_tcp_option_acc_ecn_eceb = -1;
-static int hf_tcp_option_acc_ecn_ee1b = -1;
-static int hf_tcp_option_exp_data = -1;
-static int hf_tcp_option_exp_exid = -1;
-static int hf_tcp_option_unknown_payload = -1;
-
-static int hf_tcp_option_rvbd_probe_version1 = -1;
-static int hf_tcp_option_rvbd_probe_version2 = -1;
-static int hf_tcp_option_rvbd_probe_type1 = -1;
-static int hf_tcp_option_rvbd_probe_type2 = -1;
-static int hf_tcp_option_rvbd_probe_prober = -1;
-static int hf_tcp_option_rvbd_probe_proxy = -1;
-static int hf_tcp_option_rvbd_probe_client = -1;
-static int hf_tcp_option_rvbd_probe_proxy_port = -1;
-static int hf_tcp_option_rvbd_probe_appli_ver = -1;
-static int hf_tcp_option_rvbd_probe_storeid = -1;
-static int hf_tcp_option_rvbd_probe_flags = -1;
-static int hf_tcp_option_rvbd_probe_flag_last_notify = -1;
-static int hf_tcp_option_rvbd_probe_flag_server_connected = -1;
-static int hf_tcp_option_rvbd_probe_flag_not_cfe = -1;
-static int hf_tcp_option_rvbd_probe_flag_sslcert = -1;
-static int hf_tcp_option_rvbd_probe_flag_probe_cache = -1;
-
-static int hf_tcp_option_rvbd_trpy_flags = -1;
-static int hf_tcp_option_rvbd_trpy_flag_mode = -1;
-static int hf_tcp_option_rvbd_trpy_flag_oob = -1;
-static int hf_tcp_option_rvbd_trpy_flag_chksum = -1;
-static int hf_tcp_option_rvbd_trpy_flag_fw_rst = -1;
-static int hf_tcp_option_rvbd_trpy_flag_fw_rst_inner = -1;
-static int hf_tcp_option_rvbd_trpy_flag_fw_rst_probe = -1;
-static int hf_tcp_option_rvbd_trpy_src = -1;
-static int hf_tcp_option_rvbd_trpy_dst = -1;
-static int hf_tcp_option_rvbd_trpy_src_port = -1;
-static int hf_tcp_option_rvbd_trpy_dst_port = -1;
-static int hf_tcp_option_rvbd_trpy_client_port = -1;
-
-static int hf_tcp_option_mptcp_flags = -1;
-static int hf_tcp_option_mptcp_backup_flag = -1;
-static int hf_tcp_option_mptcp_checksum_flag = -1;
-static int hf_tcp_option_mptcp_B_flag = -1;
-static int hf_tcp_option_mptcp_C_flag = -1;
-static int hf_tcp_option_mptcp_H_v0_flag = -1;
-static int hf_tcp_option_mptcp_H_v1_flag = -1;
-static int hf_tcp_option_mptcp_F_flag = -1;
-static int hf_tcp_option_mptcp_m_flag = -1;
-static int hf_tcp_option_mptcp_M_flag = -1;
-static int hf_tcp_option_mptcp_a_flag = -1;
-static int hf_tcp_option_mptcp_A_flag = -1;
-static int hf_tcp_option_mptcp_U_flag = -1;
-static int hf_tcp_option_mptcp_V_flag = -1;
-static int hf_tcp_option_mptcp_W_flag = -1;
-static int hf_tcp_option_mptcp_T_flag = -1;
-static int hf_tcp_option_mptcp_tcprst_reason = -1;
-static int hf_tcp_option_mptcp_reserved_v0_flag = -1;
-static int hf_tcp_option_mptcp_reserved_v1_flag = -1;
-static int hf_tcp_option_mptcp_subtype = -1;
-static int hf_tcp_option_mptcp_version = -1;
-static int hf_tcp_option_mptcp_reserved = -1;
-static int hf_tcp_option_mptcp_address_id = -1;
-static int hf_tcp_option_mptcp_recv_token = -1;
-static int hf_tcp_option_mptcp_sender_key = -1;
-static int hf_tcp_option_mptcp_recv_key = -1;
-static int hf_tcp_option_mptcp_sender_rand = -1;
-static int hf_tcp_option_mptcp_sender_trunc_hmac = -1;
-static int hf_tcp_option_mptcp_sender_hmac = -1;
-static int hf_tcp_option_mptcp_addaddr_trunc_hmac = -1;
-static int hf_tcp_option_mptcp_data_ack_raw = -1;
-static int hf_tcp_option_mptcp_data_seq_no_raw = -1;
-static int hf_tcp_option_mptcp_subflow_seq_no = -1;
-static int hf_tcp_option_mptcp_data_lvl_len = -1;
-static int hf_tcp_option_mptcp_checksum = -1;
-static int hf_tcp_option_mptcp_ipver = -1;
-static int hf_tcp_option_mptcp_echo = -1;
-static int hf_tcp_option_mptcp_ipv4 = -1;
-static int hf_tcp_option_mptcp_ipv6 = -1;
-static int hf_tcp_option_mptcp_port = -1;
-static int hf_mptcp_expected_idsn = -1;
-
-static int hf_mptcp_dsn = -1;
-static int hf_mptcp_rawdsn64 = -1;
-static int hf_mptcp_dss_dsn = -1;
-static int hf_mptcp_ack = -1;
-static int hf_mptcp_stream = -1;
-static int hf_mptcp_expected_token = -1;
-static int hf_mptcp_analysis = -1;
-static int hf_mptcp_analysis_master = -1;
-static int hf_mptcp_analysis_subflows = -1;
-static int hf_mptcp_number_of_removed_addresses = -1;
-static int hf_mptcp_related_mapping = -1;
-static int hf_mptcp_reinjection_of = -1;
-static int hf_mptcp_reinjected_in = -1;
-
-
-static int hf_tcp_option_fast_open_cookie_request = -1;
-static int hf_tcp_option_fast_open_cookie = -1;
-
-static int hf_tcp_ts_relative = -1;
-static int hf_tcp_ts_delta = -1;
-static int hf_tcp_option_scps_vector = -1;
-static int hf_tcp_option_scps_binding = -1;
-static int hf_tcp_option_scps_binding_len = -1;
-static int hf_tcp_scpsoption_flags_bets = -1;
-static int hf_tcp_scpsoption_flags_snack1 = -1;
-static int hf_tcp_scpsoption_flags_snack2 = -1;
-static int hf_tcp_scpsoption_flags_compress = -1;
-static int hf_tcp_scpsoption_flags_nlts = -1;
-static int hf_tcp_scpsoption_flags_reserved = -1;
-static int hf_tcp_scpsoption_connection_id = -1;
-static int hf_tcp_option_snack_offset = -1;
-static int hf_tcp_option_snack_size = -1;
-static int hf_tcp_option_snack_le = -1;
-static int hf_tcp_option_snack_re = -1;
-static int hf_tcp_option_user_to_granularity = -1;
-static int hf_tcp_option_user_to_val = -1;
-static int hf_tcp_proc_src_uid = -1;
-static int hf_tcp_proc_src_pid = -1;
-static int hf_tcp_proc_src_uname = -1;
-static int hf_tcp_proc_src_cmd = -1;
-static int hf_tcp_proc_dst_uid = -1;
-static int hf_tcp_proc_dst_pid = -1;
-static int hf_tcp_proc_dst_uname = -1;
-static int hf_tcp_proc_dst_cmd = -1;
-static int hf_tcp_segment_data = -1;
-static int hf_tcp_payload = -1;
-static int hf_tcp_reset_cause = -1;
-static int hf_tcp_fin_retransmission = -1;
-static int hf_tcp_option_rvbd_probe_reserved = -1;
-static int hf_tcp_option_scps_binding_data = -1;
-static int hf_tcp_syncookie_time = -1;
-static int hf_tcp_syncookie_mss = -1;
-static int hf_tcp_syncookie_hash = -1;
-static int hf_tcp_syncookie_option_timestamp = -1;
-static int hf_tcp_syncookie_option_ecn = -1;
-static int hf_tcp_syncookie_option_sack = -1;
-static int hf_tcp_syncookie_option_wscale = -1;
-
-static gint ett_tcp = -1;
-static gint ett_tcp_completeness = -1;
-static gint ett_tcp_flags = -1;
-static gint ett_tcp_options = -1;
-static gint ett_tcp_option_timestamp = -1;
-static gint ett_tcp_option_mss = -1;
-static gint ett_tcp_option_wscale = -1;
-static gint ett_tcp_option_sack = -1;
-static gint ett_tcp_option_snack = -1;
-static gint ett_tcp_option_scps = -1;
-static gint ett_tcp_scpsoption_flags = -1;
-static gint ett_tcp_option_scps_extended = -1;
-static gint ett_tcp_option_user_to = -1;
-static gint ett_tcp_option_exp = -1;
-static gint ett_tcp_option_acc_ecn = -1;
-static gint ett_tcp_option_sack_perm = -1;
-static gint ett_tcp_analysis = -1;
-static gint ett_tcp_analysis_faults = -1;
-static gint ett_tcp_timestamps = -1;
-static gint ett_tcp_segments = -1;
-static gint ett_tcp_segment  = -1;
-static gint ett_tcp_checksum = -1;
-static gint ett_tcp_process_info = -1;
-static gint ett_tcp_option_mptcp = -1;
-static gint ett_tcp_opt_rvbd_probe = -1;
-static gint ett_tcp_opt_rvbd_probe_flags = -1;
-static gint ett_tcp_opt_rvbd_trpy = -1;
-static gint ett_tcp_opt_rvbd_trpy_flags = -1;
-static gint ett_tcp_opt_echo = -1;
-static gint ett_tcp_opt_cc = -1;
-static gint ett_tcp_opt_md5 = -1;
-static gint ett_tcp_opt_ao = -1;
-static gint ett_tcp_opt_qs = -1;
-static gint ett_tcp_opt_recbound = -1;
-static gint ett_tcp_opt_scpscor = -1;
-static gint ett_tcp_unknown_opt = -1;
-static gint ett_tcp_option_other = -1;
-static gint ett_tcp_syncookie = -1;
-static gint ett_tcp_syncookie_option = -1;
-static gint ett_mptcp_analysis = -1;
-static gint ett_mptcp_analysis_subflows = -1;
-
-static expert_field ei_tcp_opt_len_invalid = EI_INIT;
-static expert_field ei_tcp_analysis_retransmission = EI_INIT;
-static expert_field ei_tcp_analysis_fast_retransmission = EI_INIT;
-static expert_field ei_tcp_analysis_spurious_retransmission = EI_INIT;
-static expert_field ei_tcp_analysis_out_of_order = EI_INIT;
-static expert_field ei_tcp_analysis_reused_ports = EI_INIT;
-static expert_field ei_tcp_analysis_lost_packet = EI_INIT;
-static expert_field ei_tcp_analysis_ack_lost_packet = EI_INIT;
-static expert_field ei_tcp_analysis_window_update = EI_INIT;
-static expert_field ei_tcp_analysis_window_full = EI_INIT;
-static expert_field ei_tcp_analysis_keep_alive = EI_INIT;
-static expert_field ei_tcp_analysis_keep_alive_ack = EI_INIT;
-static expert_field ei_tcp_analysis_duplicate_ack = EI_INIT;
-static expert_field ei_tcp_analysis_zero_window_probe = EI_INIT;
-static expert_field ei_tcp_analysis_zero_window = EI_INIT;
-static expert_field ei_tcp_analysis_zero_window_probe_ack = EI_INIT;
-static expert_field ei_tcp_analysis_tfo_syn = EI_INIT;
-static expert_field ei_tcp_analysis_tfo_ack = EI_INIT;
-static expert_field ei_tcp_analysis_tfo_ignored = EI_INIT;
-static expert_field ei_tcp_scps_capable = EI_INIT;
-static expert_field ei_tcp_option_sack_dsack = EI_INIT;
-static expert_field ei_tcp_option_snack_sequence = EI_INIT;
-static expert_field ei_tcp_option_wscale_shift_invalid = EI_INIT;
-static expert_field ei_tcp_option_mss_absent = EI_INIT;
-static expert_field ei_tcp_option_mss_present = EI_INIT;
-static expert_field ei_tcp_option_sack_perm_absent = EI_INIT;
-static expert_field ei_tcp_option_sack_perm_present = EI_INIT;
-static expert_field ei_tcp_short_segment = EI_INIT;
-static expert_field ei_tcp_ack_nonzero = EI_INIT;
-static expert_field ei_tcp_connection_synack = EI_INIT;
-static expert_field ei_tcp_connection_syn = EI_INIT;
-static expert_field ei_tcp_connection_fin = EI_INIT;
-static expert_field ei_tcp_connection_rst = EI_INIT;
-static expert_field ei_tcp_connection_fin_active = EI_INIT;
-static expert_field ei_tcp_connection_fin_passive = EI_INIT;
-static expert_field ei_tcp_checksum_ffff = EI_INIT;
-static expert_field ei_tcp_checksum_partial = EI_INIT;
-static expert_field ei_tcp_checksum_bad = EI_INIT;
-static expert_field ei_tcp_urgent_pointer_non_zero = EI_INIT;
-static expert_field ei_tcp_suboption_malformed = EI_INIT;
-static expert_field ei_tcp_nop = EI_INIT;
-static expert_field ei_tcp_non_zero_bytes_after_eol = EI_INIT;
-static expert_field ei_tcp_bogus_header_length = EI_INIT;
-
-/* static expert_field ei_mptcp_analysis_unexpected_idsn = EI_INIT; */
-static expert_field ei_mptcp_analysis_echoed_key_mismatch = EI_INIT;
-static expert_field ei_mptcp_analysis_missing_algorithm = EI_INIT;
-static expert_field ei_mptcp_analysis_unsupported_algorithm = EI_INIT;
-static expert_field ei_mptcp_infinite_mapping= EI_INIT;
-static expert_field ei_mptcp_mapping_missing = EI_INIT;
-/* static expert_field ei_mptcp_stream_incomplete = EI_INIT; */
-/* static expert_field ei_mptcp_analysis_dsn_out_of_order = EI_INIT; */
+static int proto_tcp;
+static int proto_ip;
+static int proto_icmp;
+
+static int proto_tcp_option_nop;
+static int proto_tcp_option_eol;
+static int proto_tcp_option_timestamp;
+static int proto_tcp_option_mss;
+static int proto_tcp_option_wscale;
+static int proto_tcp_option_sack_perm;
+static int proto_tcp_option_sack;
+static int proto_tcp_option_echo;
+static int proto_tcp_option_echoreply;
+static int proto_tcp_option_cc;
+static int proto_tcp_option_cc_new;
+static int proto_tcp_option_cc_echo;
+static int proto_tcp_option_md5;
+static int proto_tcp_option_ao;
+static int proto_tcp_option_scps;
+static int proto_tcp_option_snack;
+static int proto_tcp_option_scpsrec;
+static int proto_tcp_option_scpscor;
+static int proto_tcp_option_qs;
+static int proto_tcp_option_user_to;
+static int proto_tcp_option_tfo;
+static int proto_tcp_option_acc_ecn;
+static int proto_tcp_option_rvbd_probe;
+static int proto_tcp_option_rvbd_trpy;
+static int proto_tcp_option_exp;
+static int proto_tcp_option_unknown;
+static int proto_mptcp;
+
+static int hf_tcp_srcport;
+static int hf_tcp_dstport;
+static int hf_tcp_port;
+static int hf_tcp_stream;
+static int hf_tcp_completeness;
+static int hf_tcp_completeness_syn;
+static int hf_tcp_completeness_syn_ack;
+static int hf_tcp_completeness_ack;
+static int hf_tcp_completeness_data;
+static int hf_tcp_completeness_fin;
+static int hf_tcp_completeness_rst;
+static int hf_tcp_completeness_str;
+static int hf_tcp_seq;
+static int hf_tcp_seq_abs;
+static int hf_tcp_nxtseq;
+static int hf_tcp_ack;
+static int hf_tcp_ack_abs;
+static int hf_tcp_hdr_len;
+static int hf_tcp_flags;
+static int hf_tcp_flags_res;
+static int hf_tcp_flags_ae;
+static int hf_tcp_flags_cwr;
+static int hf_tcp_flags_ece;
+static int hf_tcp_flags_ace;
+static int hf_tcp_flags_urg;
+static int hf_tcp_flags_ack;
+static int hf_tcp_flags_push;
+static int hf_tcp_flags_reset;
+static int hf_tcp_flags_syn;
+static int hf_tcp_flags_fin;
+static int hf_tcp_flags_str;
+static int hf_tcp_window_size_value;
+static int hf_tcp_window_size;
+static int hf_tcp_window_size_scalefactor;
+static int hf_tcp_checksum;
+static int hf_tcp_checksum_status;
+static int hf_tcp_checksum_calculated;
+static int hf_tcp_len;
+static int hf_tcp_urgent_pointer;
+static int hf_tcp_analysis;
+static int hf_tcp_analysis_flags;
+static int hf_tcp_analysis_bytes_in_flight;
+static int hf_tcp_analysis_push_bytes_sent;
+static int hf_tcp_analysis_acks_frame;
+static int hf_tcp_analysis_ack_rtt;
+static int hf_tcp_analysis_first_rtt;
+static int hf_tcp_analysis_rto;
+static int hf_tcp_analysis_rto_frame;
+static int hf_tcp_analysis_duplicate_ack;
+static int hf_tcp_analysis_duplicate_ack_num;
+static int hf_tcp_analysis_duplicate_ack_frame;
+static int hf_tcp_continuation_to;
+static int hf_tcp_pdu_time;
+static int hf_tcp_pdu_size;
+static int hf_tcp_pdu_last_frame;
+static int hf_tcp_reassembled_in;
+static int hf_tcp_reassembled_length;
+static int hf_tcp_reassembled_data;
+static int hf_tcp_segments;
+static int hf_tcp_segment;
+static int hf_tcp_segment_overlap;
+static int hf_tcp_segment_overlap_conflict;
+static int hf_tcp_segment_multiple_tails;
+static int hf_tcp_segment_too_long_fragment;
+static int hf_tcp_segment_error;
+static int hf_tcp_segment_count;
+static int hf_tcp_options;
+static int hf_tcp_option_kind;
+static int hf_tcp_option_len;
+static int hf_tcp_option_mss_val;
+static int hf_tcp_option_wscale_shift;
+static int hf_tcp_option_wscale_multiplier;
+static int hf_tcp_option_sack_sle;
+static int hf_tcp_option_sack_sre;
+static int hf_tcp_option_sack_range_count;
+static int hf_tcp_option_sack_dsack_le;
+static int hf_tcp_option_sack_dsack_re;
+static int hf_tcp_option_echo;
+static int hf_tcp_option_timestamp_tsval;
+static int hf_tcp_option_timestamp_tsecr;
+static int hf_tcp_option_cc;
+static int hf_tcp_option_md5_digest;
+static int hf_tcp_option_ao_keyid;
+static int hf_tcp_option_ao_rnextkeyid;
+static int hf_tcp_option_ao_mac;
+static int hf_tcp_option_qs_rate;
+static int hf_tcp_option_qs_ttl_diff;
+static int hf_tcp_option_tarr_rate;
+static int hf_tcp_option_tarr_reserved;
+static int hf_tcp_option_acc_ecn_ee0b;
+static int hf_tcp_option_acc_ecn_eceb;
+static int hf_tcp_option_acc_ecn_ee1b;
+static int hf_tcp_option_exp_data;
+static int hf_tcp_option_exp_exid;
+static int hf_tcp_option_unknown_payload;
+
+static int hf_tcp_option_rvbd_probe_version1;
+static int hf_tcp_option_rvbd_probe_version2;
+static int hf_tcp_option_rvbd_probe_type1;
+static int hf_tcp_option_rvbd_probe_type2;
+static int hf_tcp_option_rvbd_probe_prober;
+static int hf_tcp_option_rvbd_probe_proxy;
+static int hf_tcp_option_rvbd_probe_client;
+static int hf_tcp_option_rvbd_probe_proxy_port;
+static int hf_tcp_option_rvbd_probe_appli_ver;
+static int hf_tcp_option_rvbd_probe_storeid;
+static int hf_tcp_option_rvbd_probe_flags;
+static int hf_tcp_option_rvbd_probe_flag_last_notify;
+static int hf_tcp_option_rvbd_probe_flag_server_connected;
+static int hf_tcp_option_rvbd_probe_flag_not_cfe;
+static int hf_tcp_option_rvbd_probe_flag_sslcert;
+static int hf_tcp_option_rvbd_probe_flag_probe_cache;
+
+static int hf_tcp_option_rvbd_trpy_flags;
+static int hf_tcp_option_rvbd_trpy_flag_mode;
+static int hf_tcp_option_rvbd_trpy_flag_oob;
+static int hf_tcp_option_rvbd_trpy_flag_chksum;
+static int hf_tcp_option_rvbd_trpy_flag_fw_rst;
+static int hf_tcp_option_rvbd_trpy_flag_fw_rst_inner;
+static int hf_tcp_option_rvbd_trpy_flag_fw_rst_probe;
+static int hf_tcp_option_rvbd_trpy_src;
+static int hf_tcp_option_rvbd_trpy_dst;
+static int hf_tcp_option_rvbd_trpy_src_port;
+static int hf_tcp_option_rvbd_trpy_dst_port;
+static int hf_tcp_option_rvbd_trpy_client_port;
+
+static int hf_tcp_option_mptcp_flags;
+static int hf_tcp_option_mptcp_backup_flag;
+static int hf_tcp_option_mptcp_checksum_flag;
+static int hf_tcp_option_mptcp_B_flag;
+static int hf_tcp_option_mptcp_C_flag;
+static int hf_tcp_option_mptcp_H_v0_flag;
+static int hf_tcp_option_mptcp_H_v1_flag;
+static int hf_tcp_option_mptcp_F_flag;
+static int hf_tcp_option_mptcp_m_flag;
+static int hf_tcp_option_mptcp_M_flag;
+static int hf_tcp_option_mptcp_a_flag;
+static int hf_tcp_option_mptcp_A_flag;
+static int hf_tcp_option_mptcp_U_flag;
+static int hf_tcp_option_mptcp_V_flag;
+static int hf_tcp_option_mptcp_W_flag;
+static int hf_tcp_option_mptcp_T_flag;
+static int hf_tcp_option_mptcp_tcprst_reason;
+static int hf_tcp_option_mptcp_reserved_v0_flag;
+static int hf_tcp_option_mptcp_reserved_v1_flag;
+static int hf_tcp_option_mptcp_subtype;
+static int hf_tcp_option_mptcp_version;
+static int hf_tcp_option_mptcp_reserved;
+static int hf_tcp_option_mptcp_address_id;
+static int hf_tcp_option_mptcp_recv_token;
+static int hf_tcp_option_mptcp_sender_key;
+static int hf_tcp_option_mptcp_recv_key;
+static int hf_tcp_option_mptcp_sender_rand;
+static int hf_tcp_option_mptcp_sender_trunc_hmac;
+static int hf_tcp_option_mptcp_sender_hmac;
+static int hf_tcp_option_mptcp_addaddr_trunc_hmac;
+static int hf_tcp_option_mptcp_data_ack_raw;
+static int hf_tcp_option_mptcp_data_seq_no_raw;
+static int hf_tcp_option_mptcp_subflow_seq_no;
+static int hf_tcp_option_mptcp_data_lvl_len;
+static int hf_tcp_option_mptcp_checksum;
+static int hf_tcp_option_mptcp_ipver;
+static int hf_tcp_option_mptcp_echo;
+static int hf_tcp_option_mptcp_ipv4;
+static int hf_tcp_option_mptcp_ipv6;
+static int hf_tcp_option_mptcp_port;
+static int hf_mptcp_expected_idsn;
+
+static int hf_mptcp_dsn;
+static int hf_mptcp_rawdsn64;
+static int hf_mptcp_dss_dsn;
+static int hf_mptcp_ack;
+static int hf_mptcp_stream;
+static int hf_mptcp_expected_token;
+static int hf_mptcp_analysis;
+static int hf_mptcp_analysis_master;
+static int hf_mptcp_analysis_subflows;
+static int hf_mptcp_number_of_removed_addresses;
+static int hf_mptcp_related_mapping;
+static int hf_mptcp_reinjection_of;
+static int hf_mptcp_reinjected_in;
+
+
+static int hf_tcp_option_fast_open_cookie_request;
+static int hf_tcp_option_fast_open_cookie;
+
+static int hf_tcp_ts_relative;
+static int hf_tcp_ts_delta;
+static int hf_tcp_option_scps_vector;
+static int hf_tcp_option_scps_binding;
+static int hf_tcp_option_scps_binding_len;
+static int hf_tcp_scpsoption_flags_bets;
+static int hf_tcp_scpsoption_flags_snack1;
+static int hf_tcp_scpsoption_flags_snack2;
+static int hf_tcp_scpsoption_flags_compress;
+static int hf_tcp_scpsoption_flags_nlts;
+static int hf_tcp_scpsoption_flags_reserved;
+static int hf_tcp_scpsoption_connection_id;
+static int hf_tcp_option_snack_offset;
+static int hf_tcp_option_snack_size;
+static int hf_tcp_option_snack_le;
+static int hf_tcp_option_snack_re;
+static int hf_tcp_option_user_to_granularity;
+static int hf_tcp_option_user_to_val;
+static int hf_tcp_proc_src_uid;
+static int hf_tcp_proc_src_pid;
+static int hf_tcp_proc_src_uname;
+static int hf_tcp_proc_src_cmd;
+static int hf_tcp_proc_dst_uid;
+static int hf_tcp_proc_dst_pid;
+static int hf_tcp_proc_dst_uname;
+static int hf_tcp_proc_dst_cmd;
+static int hf_tcp_segment_data;
+static int hf_tcp_payload;
+static int hf_tcp_reset_cause;
+static int hf_tcp_fin_retransmission;
+static int hf_tcp_option_rvbd_probe_reserved;
+static int hf_tcp_option_scps_binding_data;
+static int hf_tcp_syncookie_time;
+static int hf_tcp_syncookie_mss;
+static int hf_tcp_syncookie_hash;
+static int hf_tcp_syncookie_option_timestamp;
+static int hf_tcp_syncookie_option_ecn;
+static int hf_tcp_syncookie_option_sack;
+static int hf_tcp_syncookie_option_wscale;
+
+static gint ett_tcp;
+static gint ett_tcp_completeness;
+static gint ett_tcp_flags;
+static gint ett_tcp_options;
+static gint ett_tcp_option_timestamp;
+static gint ett_tcp_option_mss;
+static gint ett_tcp_option_wscale;
+static gint ett_tcp_option_sack;
+static gint ett_tcp_option_snack;
+static gint ett_tcp_option_scps;
+static gint ett_tcp_scpsoption_flags;
+static gint ett_tcp_option_scps_extended;
+static gint ett_tcp_option_user_to;
+static gint ett_tcp_option_exp;
+static gint ett_tcp_option_acc_ecn;
+static gint ett_tcp_option_sack_perm;
+static gint ett_tcp_analysis;
+static gint ett_tcp_analysis_faults;
+static gint ett_tcp_timestamps;
+static gint ett_tcp_segments;
+static gint ett_tcp_segment;
+static gint ett_tcp_checksum;
+static gint ett_tcp_process_info;
+static gint ett_tcp_option_mptcp;
+static gint ett_tcp_opt_rvbd_probe;
+static gint ett_tcp_opt_rvbd_probe_flags;
+static gint ett_tcp_opt_rvbd_trpy;
+static gint ett_tcp_opt_rvbd_trpy_flags;
+static gint ett_tcp_opt_echo;
+static gint ett_tcp_opt_cc;
+static gint ett_tcp_opt_md5;
+static gint ett_tcp_opt_ao;
+static gint ett_tcp_opt_qs;
+static gint ett_tcp_opt_recbound;
+static gint ett_tcp_opt_scpscor;
+static gint ett_tcp_unknown_opt;
+static gint ett_tcp_option_other;
+static gint ett_tcp_syncookie;
+static gint ett_tcp_syncookie_option;
+static gint ett_mptcp_analysis;
+static gint ett_mptcp_analysis_subflows;
+
+static expert_field ei_tcp_opt_len_invalid;
+static expert_field ei_tcp_analysis_retransmission;
+static expert_field ei_tcp_analysis_fast_retransmission;
+static expert_field ei_tcp_analysis_spurious_retransmission;
+static expert_field ei_tcp_analysis_out_of_order;
+static expert_field ei_tcp_analysis_reused_ports;
+static expert_field ei_tcp_analysis_lost_packet;
+static expert_field ei_tcp_analysis_ack_lost_packet;
+static expert_field ei_tcp_analysis_window_update;
+static expert_field ei_tcp_analysis_window_full;
+static expert_field ei_tcp_analysis_keep_alive;
+static expert_field ei_tcp_analysis_keep_alive_ack;
+static expert_field ei_tcp_analysis_duplicate_ack;
+static expert_field ei_tcp_analysis_zero_window_probe;
+static expert_field ei_tcp_analysis_zero_window;
+static expert_field ei_tcp_analysis_zero_window_probe_ack;
+static expert_field ei_tcp_analysis_tfo_syn;
+static expert_field ei_tcp_analysis_tfo_ack;
+static expert_field ei_tcp_analysis_tfo_ignored;
+static expert_field ei_tcp_scps_capable;
+static expert_field ei_tcp_option_sack_dsack;
+static expert_field ei_tcp_option_snack_sequence;
+static expert_field ei_tcp_option_wscale_shift_invalid;
+static expert_field ei_tcp_option_mss_absent;
+static expert_field ei_tcp_option_mss_present;
+static expert_field ei_tcp_option_sack_perm_absent;
+static expert_field ei_tcp_option_sack_perm_present;
+static expert_field ei_tcp_short_segment;
+static expert_field ei_tcp_ack_nonzero;
+static expert_field ei_tcp_connection_synack;
+static expert_field ei_tcp_connection_syn;
+static expert_field ei_tcp_connection_fin;
+static expert_field ei_tcp_connection_rst;
+static expert_field ei_tcp_connection_fin_active;
+static expert_field ei_tcp_connection_fin_passive;
+static expert_field ei_tcp_checksum_ffff;
+static expert_field ei_tcp_checksum_partial;
+static expert_field ei_tcp_checksum_bad;
+static expert_field ei_tcp_urgent_pointer_non_zero;
+static expert_field ei_tcp_suboption_malformed;
+static expert_field ei_tcp_nop;
+static expert_field ei_tcp_non_zero_bytes_after_eol;
+static expert_field ei_tcp_bogus_header_length;
+
+/* static expert_field ei_mptcp_analysis_unexpected_idsn; */
+static expert_field ei_mptcp_analysis_echoed_key_mismatch;
+static expert_field ei_mptcp_analysis_missing_algorithm;
+static expert_field ei_mptcp_analysis_unsupported_algorithm;
+static expert_field ei_mptcp_infinite_mapping;
+static expert_field ei_mptcp_mapping_missing;
+/* static expert_field ei_mptcp_stream_incomplete; */
+/* static expert_field ei_mptcp_analysis_dsn_out_of_order; */
 
 /* Some protocols such as encrypted DCE/RPCoverHTTP have dependencies
  * from one PDU to the next PDU and require that they are called in sequence.
diff --git a/epan/dissectors/packet-tcpcl.c b/epan/dissectors/packet-tcpcl.c
index 20ad8746dd..9a2825bd6d 100644
--- a/epan/dissectors/packet-tcpcl.c
+++ b/epan/dissectors/packet-tcpcl.c
@@ -58,8 +58,8 @@ void proto_reg_handoff_tcpclv3(void);
 
 static const char magic[] = {'d', 't', 'n', '!'};
 
-static int proto_tcpcl = -1;
-static int proto_tcpcl_exts = -1;
+static int proto_tcpcl;
+static int proto_tcpcl_exts;
 /// Protocol column name
 static const char *const proto_name_tcpcl = "TCPCL";
 
@@ -137,117 +137,117 @@ static const value_string v4_msg_reject_reason_vals[]={
     {0, NULL},
 };
 
-static int hf_chdr_tree = -1;
-static int hf_chdr_magic = -1;
-static int hf_chdr_version = -1;
-static int hf_chdr_related = -1;
+static int hf_chdr_tree;
+static int hf_chdr_magic;
+static int hf_chdr_version;
+static int hf_chdr_related;
 
 /* TCP Convergence Header Variables */
-static int hf_tcpclv3_mhdr = -1;
-static int hf_tcpclv3_pkt_type = -1;
+static int hf_tcpclv3_mhdr;
+static int hf_tcpclv3_pkt_type;
 
 /* Refuse-Bundle reason code */
-static int hf_tcpclv3_refuse_reason_code = -1;
+static int hf_tcpclv3_refuse_reason_code;
 
-static int hf_tcpclv3_chdr_flags = -1;
-static int hf_tcpclv3_chdr_keep_alive = -1;
-static int hf_tcpclv3_chdr_flags_ack_req = -1;
-static int hf_tcpclv3_chdr_flags_frag_enable = -1;
-static int hf_tcpclv3_chdr_flags_nak = -1;
-static int hf_tcpclv3_chdr_local_eid_length = -1;
-static int hf_tcpclv3_chdr_local_eid = -1;
+static int hf_tcpclv3_chdr_flags;
+static int hf_tcpclv3_chdr_keep_alive;
+static int hf_tcpclv3_chdr_flags_ack_req;
+static int hf_tcpclv3_chdr_flags_frag_enable;
+static int hf_tcpclv3_chdr_flags_nak;
+static int hf_tcpclv3_chdr_local_eid_length;
+static int hf_tcpclv3_chdr_local_eid;
 
 /* TCP Convergence Data Header Variables */
-static int hf_tcpclv3_data_procflags = -1;
-static int hf_tcpclv3_data_procflags_start = -1;
-static int hf_tcpclv3_data_procflags_end = -1;
-static int hf_tcpclv3_xfer_id = -1;
-static int hf_tcpclv3_data_segment_length = -1;
-static int hf_tcpclv3_data_segment_data = -1;
+static int hf_tcpclv3_data_procflags;
+static int hf_tcpclv3_data_procflags_start;
+static int hf_tcpclv3_data_procflags_end;
+static int hf_tcpclv3_xfer_id;
+static int hf_tcpclv3_data_segment_length;
+static int hf_tcpclv3_data_segment_data;
 
 /* TCP Convergence Ack Variables */
-static int hf_tcpclv3_ack_length = -1;
+static int hf_tcpclv3_ack_length;
 
 /* TCP Convergence Shutdown Header Variables */
-static int hf_tcpclv3_shutdown_flags = -1;
-static int hf_tcpclv3_shutdown_flags_reason = -1;
-static int hf_tcpclv3_shutdown_flags_delay = -1;
-static int hf_tcpclv3_shutdown_reason = -1;
-static int hf_tcpclv3_shutdown_delay = -1;
-
-static int hf_tcpclv4_chdr_flags = -1;
-static int hf_tcpclv4_chdr_flags_cantls = -1;
-static int hf_tcpclv4_negotiate_use_tls = -1;
-
-static int hf_tcpclv4_mhdr_tree = -1;
-static int hf_tcpclv4_mhdr_type = -1;
-static int hf_tcpclv4_sess_init_keepalive = -1;
-static int hf_tcpclv4_sess_init_seg_mru = -1;
-static int hf_tcpclv4_sess_init_xfer_mru = -1;
-static int hf_tcpclv4_sess_init_nodeid_len = -1;
-static int hf_tcpclv4_sess_init_nodeid_data = -1;
-static int hf_tcpclv4_sess_init_extlist_len = -1;
-static int hf_tcpclv4_sess_init_related = -1;
-static int hf_tcpclv4_negotiate_keepalive = -1;
-
-static int hf_tcpclv4_sess_term_flags = -1;
-static int hf_tcpclv4_sess_term_flags_reply = -1;
-static int hf_tcpclv4_sess_term_reason = -1;
-static int hf_tcpclv4_sess_term_related = -1;
-
-static int hf_tcpclv4_sessext_tree = -1;
-static int hf_tcpclv4_sessext_flags = -1;
-static int hf_tcpclv4_sessext_flags_crit = -1;
-static int hf_tcpclv4_sessext_type = -1;
-static int hf_tcpclv4_sessext_len = -1;
-static int hf_tcpclv4_sessext_data = -1;
-
-static int hf_tcpclv4_xferext_tree = -1;
-static int hf_tcpclv4_xferext_flags = -1;
-static int hf_tcpclv4_xferext_flags_crit = -1;
-static int hf_tcpclv4_xferext_type = -1;
-static int hf_tcpclv4_xferext_len = -1;
-static int hf_tcpclv4_xferext_data = -1;
-
-static int hf_tcpclv4_xfer_flags = -1;
-static int hf_tcpclv4_xfer_flags_start = -1;
-static int hf_tcpclv4_xfer_flags_end = -1;
-static int hf_tcpclv4_xfer_id = -1;
-static int hf_tcpclv4_xfer_total_len = -1;
-static int hf_tcpclv4_xfer_segment_extlist_len = -1;
-static int hf_tcpclv4_xfer_segment_data_len = -1;
-static int hf_tcpclv4_xfer_segment_data = -1;
-static int hf_tcpclv4_xfer_segment_seen_len = -1;
-static int hf_tcpclv4_xfer_segment_related_start = -1;
-static int hf_tcpclv4_xfer_segment_time_start = -1;
-static int hf_tcpclv4_xfer_segment_related_ack = -1;
-static int hf_tcpclv4_xfer_segment_time_diff = -1;
-static int hf_tcpclv4_xfer_ack_ack_len = -1;
-static int hf_tcpclv4_xfer_ack_related_start = -1;
-static int hf_tcpclv4_xfer_ack_time_start = -1;
-static int hf_tcpclv4_xfer_ack_related_seg = -1;
-static int hf_tcpclv4_xfer_ack_time_diff = -1;
-static int hf_tcpclv4_xfer_refuse_reason = -1;
-static int hf_tcpclv4_xfer_refuse_related_seg = -1;
-static int hf_tcpclv4_msg_reject_reason = -1;
-static int hf_tcpclv4_msg_reject_head = -1;
-
-static int hf_tcpclv4_xferext_transferlen_total_len = -1;
-
-static int hf_othername_bundleeid = -1;
+static int hf_tcpclv3_shutdown_flags;
+static int hf_tcpclv3_shutdown_flags_reason;
+static int hf_tcpclv3_shutdown_flags_delay;
+static int hf_tcpclv3_shutdown_reason;
+static int hf_tcpclv3_shutdown_delay;
+
+static int hf_tcpclv4_chdr_flags;
+static int hf_tcpclv4_chdr_flags_cantls;
+static int hf_tcpclv4_negotiate_use_tls;
+
+static int hf_tcpclv4_mhdr_tree;
+static int hf_tcpclv4_mhdr_type;
+static int hf_tcpclv4_sess_init_keepalive;
+static int hf_tcpclv4_sess_init_seg_mru;
+static int hf_tcpclv4_sess_init_xfer_mru;
+static int hf_tcpclv4_sess_init_nodeid_len;
+static int hf_tcpclv4_sess_init_nodeid_data;
+static int hf_tcpclv4_sess_init_extlist_len;
+static int hf_tcpclv4_sess_init_related;
+static int hf_tcpclv4_negotiate_keepalive;
+
+static int hf_tcpclv4_sess_term_flags;
+static int hf_tcpclv4_sess_term_flags_reply;
+static int hf_tcpclv4_sess_term_reason;
+static int hf_tcpclv4_sess_term_related;
+
+static int hf_tcpclv4_sessext_tree;
+static int hf_tcpclv4_sessext_flags;
+static int hf_tcpclv4_sessext_flags_crit;
+static int hf_tcpclv4_sessext_type;
+static int hf_tcpclv4_sessext_len;
+static int hf_tcpclv4_sessext_data;
+
+static int hf_tcpclv4_xferext_tree;
+static int hf_tcpclv4_xferext_flags;
+static int hf_tcpclv4_xferext_flags_crit;
+static int hf_tcpclv4_xferext_type;
+static int hf_tcpclv4_xferext_len;
+static int hf_tcpclv4_xferext_data;
+
+static int hf_tcpclv4_xfer_flags;
+static int hf_tcpclv4_xfer_flags_start;
+static int hf_tcpclv4_xfer_flags_end;
+static int hf_tcpclv4_xfer_id;
+static int hf_tcpclv4_xfer_total_len;
+static int hf_tcpclv4_xfer_segment_extlist_len;
+static int hf_tcpclv4_xfer_segment_data_len;
+static int hf_tcpclv4_xfer_segment_data;
+static int hf_tcpclv4_xfer_segment_seen_len;
+static int hf_tcpclv4_xfer_segment_related_start;
+static int hf_tcpclv4_xfer_segment_time_start;
+static int hf_tcpclv4_xfer_segment_related_ack;
+static int hf_tcpclv4_xfer_segment_time_diff;
+static int hf_tcpclv4_xfer_ack_ack_len;
+static int hf_tcpclv4_xfer_ack_related_start;
+static int hf_tcpclv4_xfer_ack_time_start;
+static int hf_tcpclv4_xfer_ack_related_seg;
+static int hf_tcpclv4_xfer_ack_time_diff;
+static int hf_tcpclv4_xfer_refuse_reason;
+static int hf_tcpclv4_xfer_refuse_related_seg;
+static int hf_tcpclv4_msg_reject_reason;
+static int hf_tcpclv4_msg_reject_head;
+
+static int hf_tcpclv4_xferext_transferlen_total_len;
+
+static int hf_othername_bundleeid;
 
 /*TCP Convergence Layer Reassembly boilerplate*/
-static int hf_xfer_fragments = -1;
-static int hf_xfer_fragment = -1;
-static int hf_xfer_fragment_overlap = -1;
-static int hf_xfer_fragment_overlap_conflicts = -1;
-static int hf_xfer_fragment_multiple_tails = -1;
-static int hf_xfer_fragment_too_long_fragment = -1;
-static int hf_xfer_fragment_error = -1;
-static int hf_xfer_fragment_count = -1;
-static int hf_xfer_reassembled_in = -1;
-static int hf_xfer_reassembled_length = -1;
-static int hf_xfer_reassembled_data = -1;
+static int hf_xfer_fragments;
+static int hf_xfer_fragment;
+static int hf_xfer_fragment_overlap;
+static int hf_xfer_fragment_overlap_conflicts;
+static int hf_xfer_fragment_multiple_tails;
+static int hf_xfer_fragment_too_long_fragment;
+static int hf_xfer_fragment_error;
+static int hf_xfer_fragment_count;
+static int hf_xfer_reassembled_in;
+static int hf_xfer_reassembled_length;
+static int hf_xfer_reassembled_data;
 
 static hf_register_info hf_tcpcl[] = {
     {&hf_chdr_tree, {"Contact Header", "tcpcl.contact_hdr", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
@@ -487,24 +487,24 @@ static int *const v4_xferext_flags[] = {
 };
 
 /* Tree Node Variables */
-static gint ett_proto_tcpcl = -1;
-static gint ett_chdr = -1;
-static gint ett_tcpclv3_chdr_flags = -1;
-static gint ett_tcpclv3_mhdr = -1;
-static gint ett_tcpclv3_data_procflags = -1;
-static gint ett_tcpclv3_shutdown_flags = -1;
-static gint ett_xfer_fragment = -1;
-static gint ett_xfer_fragments = -1;
-static gint ett_tcpclv4_chdr_flags = -1;
-static gint ett_tcpclv4_mhdr = -1;
-static gint ett_tcpclv4_sess_term_flags = -1;
-static gint ett_tcpclv4_xfer_flags = -1;
-static gint ett_tcpclv4_sessext = -1;
-static gint ett_tcpclv4_sessext_flags = -1;
-static gint ett_tcpclv4_sessext_data = -1;
-static gint ett_tcpclv4_xferext = -1;
-static gint ett_tcpclv4_xferext_flags = -1;
-static gint ett_tcpclv4_xferext_data = -1;
+static gint ett_proto_tcpcl;
+static gint ett_chdr;
+static gint ett_tcpclv3_chdr_flags;
+static gint ett_tcpclv3_mhdr;
+static gint ett_tcpclv3_data_procflags;
+static gint ett_tcpclv3_shutdown_flags;
+static gint ett_xfer_fragment;
+static gint ett_xfer_fragments;
+static gint ett_tcpclv4_chdr_flags;
+static gint ett_tcpclv4_mhdr;
+static gint ett_tcpclv4_sess_term_flags;
+static gint ett_tcpclv4_xfer_flags;
+static gint ett_tcpclv4_sessext;
+static gint ett_tcpclv4_sessext_flags;
+static gint ett_tcpclv4_sessext_data;
+static gint ett_tcpclv4_xferext;
+static gint ett_tcpclv4_xferext_flags;
+static gint ett_tcpclv4_xferext_data;
 
 static gint *ett[] = {
     &ett_proto_tcpcl,
@@ -527,38 +527,38 @@ static gint *ett[] = {
     &ett_xfer_fragments,
 };
 
-static expert_field ei_invalid_magic = EI_INIT;
-static expert_field ei_invalid_version = EI_INIT;
-static expert_field ei_mismatch_version = EI_INIT;
-static expert_field ei_chdr_duplicate = EI_INIT;
-static expert_field ei_length_clamped = EI_INIT;
-
-static expert_field ei_tcpclv3_eid_length = EI_INIT;
-static expert_field ei_tcpclv3_invalid_msg_type = EI_INIT;
-static expert_field ei_tcpclv3_data_flags = EI_INIT;
-static expert_field ei_tcpclv3_segment_length = EI_INIT;
-static expert_field ei_tcpclv3_ack_length = EI_INIT;
-
-static expert_field ei_tcpclv4_invalid_msg_type = EI_INIT;
-static expert_field ei_tcpclv4_invalid_sessext_type = EI_INIT;
-static expert_field ei_tcpclv4_invalid_xferext_type = EI_INIT;
-static expert_field ei_tcpclv4_extitem_critical = EI_INIT;
-static expert_field ei_tcpclv4_sess_init_missing = EI_INIT;
-static expert_field ei_tcpclv4_sess_init_duplicate = EI_INIT;
-static expert_field ei_tcpclv4_sess_term_duplicate = EI_INIT;
-static expert_field ei_tcpclv4_sess_term_reply_flag = EI_INIT;
-static expert_field ei_tcpclv4_xfer_seg_over_seg_mru = EI_INIT;
-static expert_field ei_tcpclv4_xfer_seg_missing_start = EI_INIT;
-static expert_field ei_tcpclv4_xfer_seg_duplicate_start = EI_INIT;
-static expert_field ei_tcpclv4_xfer_seg_missing_end = EI_INIT;
-static expert_field ei_tcpclv4_xfer_seg_duplicate_end = EI_INIT;
-static expert_field ei_tcpclv4_xfer_seg_no_relation = EI_INIT;
-static expert_field ei_xfer_seg_over_total_len = EI_INIT;
-static expert_field ei_xfer_mismatch_total_len = EI_INIT;
-static expert_field ei_xfer_ack_mismatch_flags = EI_INIT;
-static expert_field ei_xfer_ack_no_relation = EI_INIT;
-static expert_field ei_tcpclv4_xfer_refuse_no_transfer = EI_INIT;
-static expert_field ei_tcpclv4_xferload_over_xfer_mru = EI_INIT;
+static expert_field ei_invalid_magic;
+static expert_field ei_invalid_version;
+static expert_field ei_mismatch_version;
+static expert_field ei_chdr_duplicate;
+static expert_field ei_length_clamped;
+
+static expert_field ei_tcpclv3_eid_length;
+static expert_field ei_tcpclv3_invalid_msg_type;
+static expert_field ei_tcpclv3_data_flags;
+static expert_field ei_tcpclv3_segment_length;
+static expert_field ei_tcpclv3_ack_length;
+
+static expert_field ei_tcpclv4_invalid_msg_type;
+static expert_field ei_tcpclv4_invalid_sessext_type;
+static expert_field ei_tcpclv4_invalid_xferext_type;
+static expert_field ei_tcpclv4_extitem_critical;
+static expert_field ei_tcpclv4_sess_init_missing;
+static expert_field ei_tcpclv4_sess_init_duplicate;
+static expert_field ei_tcpclv4_sess_term_duplicate;
+static expert_field ei_tcpclv4_sess_term_reply_flag;
+static expert_field ei_tcpclv4_xfer_seg_over_seg_mru;
+static expert_field ei_tcpclv4_xfer_seg_missing_start;
+static expert_field ei_tcpclv4_xfer_seg_duplicate_start;
+static expert_field ei_tcpclv4_xfer_seg_missing_end;
+static expert_field ei_tcpclv4_xfer_seg_duplicate_end;
+static expert_field ei_tcpclv4_xfer_seg_no_relation;
+static expert_field ei_xfer_seg_over_total_len;
+static expert_field ei_xfer_mismatch_total_len;
+static expert_field ei_xfer_ack_mismatch_flags;
+static expert_field ei_xfer_ack_no_relation;
+static expert_field ei_tcpclv4_xfer_refuse_no_transfer;
+static expert_field ei_tcpclv4_xferload_over_xfer_mru;
 
 static ei_register_info ei_tcpcl[] = {
     {&ei_invalid_magic, { "tcpcl.invalid_contact_magic", PI_PROTOCOL, PI_ERROR, "Magic string is invalid", EXPFILL}},
diff --git a/epan/dissectors/packet-tcpros.c b/epan/dissectors/packet-tcpros.c
index d00106e004..b238ab12fc 100644
--- a/epan/dissectors/packet-tcpros.c
+++ b/epan/dissectors/packet-tcpros.c
@@ -25,37 +25,37 @@ void proto_register_tcpros(void);
 void proto_reg_handoff_tcpros(void);
 
 
-static int proto_tcpros = -1;
+static int proto_tcpros;
 static dissector_handle_t tcpros_handle;
 
 /** desegmentation of TCPROS over TCP */
 static gboolean tcpros_desegment = TRUE;
 
 
-static int hf_tcpros_connection_header = -1;
-static int hf_tcpros_connection_header_length = -1;
-static int hf_tcpros_connection_header_content = -1;
-static int hf_tcpros_connection_header_field = -1;
-static int hf_tcpros_connection_header_field_length = -1;
-static int hf_tcpros_connection_header_field_data = -1;
-static int hf_tcpros_connection_header_field_name = -1;
-static int hf_tcpros_connection_header_field_value = -1;
-static int hf_tcpros_clock = -1;
-static int hf_tcpros_clock_length = -1;
-static int hf_tcpros_message = -1;
-static int hf_tcpros_message_length = -1;
-static int hf_tcpros_message_body = -1;
-static int hf_tcpros_message_header = -1;
-static int hf_tcpros_message_header_seq = -1;
-static int hf_tcpros_message_header_stamp = -1;
-static int hf_tcpros_message_header_stamp_sec = -1;
-static int hf_tcpros_message_header_stamp_nsec = -1;
-static int hf_tcpros_message_header_frame = -1;
-static int hf_tcpros_message_header_frame_length = -1;
-static int hf_tcpros_message_header_frame_value = -1;
-static int hf_tcpros_message_payload = -1;
-
-static gint ett_tcpros = -1;
+static int hf_tcpros_connection_header;
+static int hf_tcpros_connection_header_length;
+static int hf_tcpros_connection_header_content;
+static int hf_tcpros_connection_header_field;
+static int hf_tcpros_connection_header_field_length;
+static int hf_tcpros_connection_header_field_data;
+static int hf_tcpros_connection_header_field_name;
+static int hf_tcpros_connection_header_field_value;
+static int hf_tcpros_clock;
+static int hf_tcpros_clock_length;
+static int hf_tcpros_message;
+static int hf_tcpros_message_length;
+static int hf_tcpros_message_body;
+static int hf_tcpros_message_header;
+static int hf_tcpros_message_header_seq;
+static int hf_tcpros_message_header_stamp;
+static int hf_tcpros_message_header_stamp_sec;
+static int hf_tcpros_message_header_stamp_nsec;
+static int hf_tcpros_message_header_frame;
+static int hf_tcpros_message_header_frame_length;
+static int hf_tcpros_message_header_frame_value;
+static int hf_tcpros_message_payload;
+
+static gint ett_tcpros;
 
 /**
  * This is the ROS connection header dissector. The general packet format is described
diff --git a/epan/dissectors/packet-tdmoe.c b/epan/dissectors/packet-tdmoe.c
index ab8bce02b6..be2ceb265d 100644
--- a/epan/dissectors/packet-tdmoe.c
+++ b/epan/dissectors/packet-tdmoe.c
@@ -25,19 +25,19 @@ void proto_register_tdmoe(void);
 static dissector_handle_t tdmoe_handle;
 
 /* protocols and header fields */
-static int proto_tdmoe = -1;
-
-static int hf_tdmoe_subaddress = -1;
-static int hf_tdmoe_samples = -1;
-static int hf_tdmoe_flags = -1;
-static int hf_tdmoe_yellow_alarm = -1;
-static int hf_tdmoe_sig_bits_present = -1;
-static int hf_tdmoe_packet_counter = -1;
-static int hf_tdmoe_channels = -1;
-static int hf_tdmoe_sig_bits = -1;
-
-static gint ett_tdmoe = -1;
-static gint ett_tdmoe_flags = -1;
+static int proto_tdmoe;
+
+static int hf_tdmoe_subaddress;
+static int hf_tdmoe_samples;
+static int hf_tdmoe_flags;
+static int hf_tdmoe_yellow_alarm;
+static int hf_tdmoe_sig_bits_present;
+static int hf_tdmoe_packet_counter;
+static int hf_tdmoe_channels;
+static int hf_tdmoe_sig_bits;
+
+static gint ett_tdmoe;
+static gint ett_tdmoe_flags;
 
 static dissector_handle_t lapd_handle;
 
diff --git a/epan/dissectors/packet-tdmop.c b/epan/dissectors/packet-tdmop.c
index 49dd19bbf0..9ffc8323fc 100644
--- a/epan/dissectors/packet-tdmop.c
+++ b/epan/dissectors/packet-tdmop.c
@@ -26,25 +26,25 @@ void proto_reg_handoff_tdmop(void);
 
 static dissector_handle_t tdmop_handle;
 
-static int proto_tdmop    = -1;
-static gint ett_tdmop     = -1;
-static gint ett_tdmop_channel    = -1;
+static int proto_tdmop;
+static gint ett_tdmop;
+static gint ett_tdmop_channel;
 
-static int hf_tdmop_TransferID   = -1;
-static int hf_tdmop_DstCh        = -1;
-static int hf_tdmop_SrcCh        = -1;
-static int hf_tdmop_Flags        = -1;
-static int hf_tdmop_Flags_no_data        = -1;
-static int hf_tdmop_Flags_lost_request   = -1;
-static int hf_tdmop_Flags_remote_no_data = -1;
-static int hf_tdmop_Flags_compressed     = -1;
-static int hf_tdmop_SrcDst        = -1;
-static int hf_tdmop_SeqNum        = -1;
-static int hf_tdmop_LastRecv      = -1;
-static int hf_tdmop_Delay         = -1;
-static int hf_tdmop_Reserved      = -1;
-static int hf_tdmop_payload       = -1;
-static int hf_tdmop_Compression_mask    = -1;
+static int hf_tdmop_TransferID;
+static int hf_tdmop_DstCh;
+static int hf_tdmop_SrcCh;
+static int hf_tdmop_Flags;
+static int hf_tdmop_Flags_no_data;
+static int hf_tdmop_Flags_lost_request;
+static int hf_tdmop_Flags_remote_no_data;
+static int hf_tdmop_Flags_compressed;
+static int hf_tdmop_SrcDst;
+static int hf_tdmop_SeqNum;
+static int hf_tdmop_LastRecv;
+static int hf_tdmop_Delay;
+static int hf_tdmop_Reserved;
+static int hf_tdmop_payload;
+static int hf_tdmop_Compression_mask;
 
 static dissector_handle_t lapd_handle    = NULL;
 
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c
index 07bc8972d0..6facf0f58a 100644
--- a/epan/dissectors/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
@@ -554,120 +554,120 @@ void proto_register_tds(void);
 
 /* LOGIN fields */
 
-static int hf_tdslogin = -1;
-static int hf_tdslogin_hostname_length = -1;
-static int hf_tdslogin_hostname = -1;
-static int hf_tdslogin_username_length = -1;
-static int hf_tdslogin_username = -1;
-static int hf_tdslogin_password_length = -1;
-static int hf_tdslogin_password = -1;
-static int hf_tdslogin_hostprocess_length = -1;
-static int hf_tdslogin_hostprocess = -1;
-static int hf_tdslogin_appname_length = -1;
-static int hf_tdslogin_appname = -1;
-static int hf_tdslogin_servername_length = -1;
-static int hf_tdslogin_servername = -1;
-static int hf_tdslogin_remotepassword_length = -1;
-static int hf_tdslogin_rempw_servername_length = -1;
-static int hf_tdslogin_rempw_servername = -1;
-static int hf_tdslogin_rempw_password_length = -1;
-static int hf_tdslogin_rempw_password = -1;
-static int hf_tdslogin_option_int2 = -1;
-static int hf_tdslogin_option_int4 = -1;
-static int hf_tdslogin_option_char = -1;
-static int hf_tdslogin_option_float = -1;
-static int hf_tdslogin_option_date8 = -1;
-static int hf_tdslogin_option_usedb = -1;
-static int hf_tdslogin_option_bulk = -1;
-static int hf_tdslogin_option_server_to_server = -1;
-static int hf_tdslogin_option_server_to_server_loginack = -1;
-static int hf_tdslogin_option_conversation_type = -1;
-static int hf_tdslogin_proto_version = -1;
-static int hf_tdslogin_progname_length = -1;
-static int hf_tdslogin_progname = -1;
-static int hf_tdslogin_progvers = -1;
-static int hf_tdslogin_option2_noshort = -1;
-static int hf_tdslogin_option2_flt4 = -1;
-static int hf_tdslogin_option2_date4 = -1;
-static int hf_tdslogin_language = -1;
-static int hf_tdslogin_language_length = -1;
-static int hf_tdslogin_setlang = -1;
-static int hf_tdslogin_seclogin = -1;
-static int hf_tdslogin_secbulk = -1;
-static int hf_tdslogin_halogin = -1;
-static int hf_tdslogin_hasessionid = -1;
-static int hf_tdslogin_charset = -1;
-static int hf_tdslogin_charset_length = -1;
-static int hf_tdslogin_setcharset = -1;
-static int hf_tdslogin_packetsize = -1;
-static int hf_tdslogin_packetsize_length = -1;
+static int hf_tdslogin;
+static int hf_tdslogin_hostname_length;
+static int hf_tdslogin_hostname;
+static int hf_tdslogin_username_length;
+static int hf_tdslogin_username;
+static int hf_tdslogin_password_length;
+static int hf_tdslogin_password;
+static int hf_tdslogin_hostprocess_length;
+static int hf_tdslogin_hostprocess;
+static int hf_tdslogin_appname_length;
+static int hf_tdslogin_appname;
+static int hf_tdslogin_servername_length;
+static int hf_tdslogin_servername;
+static int hf_tdslogin_remotepassword_length;
+static int hf_tdslogin_rempw_servername_length;
+static int hf_tdslogin_rempw_servername;
+static int hf_tdslogin_rempw_password_length;
+static int hf_tdslogin_rempw_password;
+static int hf_tdslogin_option_int2;
+static int hf_tdslogin_option_int4;
+static int hf_tdslogin_option_char;
+static int hf_tdslogin_option_float;
+static int hf_tdslogin_option_date8;
+static int hf_tdslogin_option_usedb;
+static int hf_tdslogin_option_bulk;
+static int hf_tdslogin_option_server_to_server;
+static int hf_tdslogin_option_server_to_server_loginack;
+static int hf_tdslogin_option_conversation_type;
+static int hf_tdslogin_proto_version;
+static int hf_tdslogin_progname_length;
+static int hf_tdslogin_progname;
+static int hf_tdslogin_progvers;
+static int hf_tdslogin_option2_noshort;
+static int hf_tdslogin_option2_flt4;
+static int hf_tdslogin_option2_date4;
+static int hf_tdslogin_language;
+static int hf_tdslogin_language_length;
+static int hf_tdslogin_setlang;
+static int hf_tdslogin_seclogin;
+static int hf_tdslogin_secbulk;
+static int hf_tdslogin_halogin;
+static int hf_tdslogin_hasessionid;
+static int hf_tdslogin_charset;
+static int hf_tdslogin_charset_length;
+static int hf_tdslogin_setcharset;
+static int hf_tdslogin_packetsize;
+static int hf_tdslogin_packetsize_length;
 
 /* LOGIN7 Token */
-static int hf_tds7login_total_size = -1;
-static int hf_tds7login_version = -1;
-static int hf_tds7login_packet_size = -1;
-static int hf_tds7login_client_version = -1;
-static int hf_tds7login_client_pid = -1;
-static int hf_tds7login_connection_id = -1;
-static int hf_tds7login_option_flags1 = -1;
-static int hf_tds7login_option_flags2 = -1;
-static int hf_tds7login_sql_type_flags = -1;
-static int hf_tds7login_reserved_flags = -1;
-static int hf_tds7login_time_zone = -1;
-static int hf_tds7login_collation = -1;
-static int hf_tds7login_offset = -1;
-static int hf_tds7login_length = -1;
-static int hf_tds7login_password = -1;
-static int hf_tds7login_clientname = -1;
-static int hf_tds7login_username = -1;
-static int hf_tds7login_appname = -1;
-static int hf_tds7login_servername = -1;
-static int hf_tds7login_libraryname = -1;
-static int hf_tds7login_locale = -1;
-static int hf_tds7login_databasename = -1;
+static int hf_tds7login_total_size;
+static int hf_tds7login_version;
+static int hf_tds7login_packet_size;
+static int hf_tds7login_client_version;
+static int hf_tds7login_client_pid;
+static int hf_tds7login_connection_id;
+static int hf_tds7login_option_flags1;
+static int hf_tds7login_option_flags2;
+static int hf_tds7login_sql_type_flags;
+static int hf_tds7login_reserved_flags;
+static int hf_tds7login_time_zone;
+static int hf_tds7login_collation;
+static int hf_tds7login_offset;
+static int hf_tds7login_length;
+static int hf_tds7login_password;
+static int hf_tds7login_clientname;
+static int hf_tds7login_username;
+static int hf_tds7login_appname;
+static int hf_tds7login_servername;
+static int hf_tds7login_libraryname;
+static int hf_tds7login_locale;
+static int hf_tds7login_databasename;
 
 /* PRELOGIN stream */
-static int hf_tds_prelogin = -1;
-static int hf_tds_prelogin_option_token = -1;
-static int hf_tds_prelogin_option_offset = -1;
-static int hf_tds_prelogin_option_length = -1;
-static int hf_tds_prelogin_option_version = -1;
-static int hf_tds_prelogin_option_subbuild = -1;
-static int hf_tds_prelogin_option_encryption = -1;
-static int hf_tds_prelogin_option_instopt = -1;
-static int hf_tds_prelogin_option_threadid = -1;
-static int hf_tds_prelogin_option_mars = -1;
-static int hf_tds_prelogin_option_traceid = -1;
-static int hf_tds_prelogin_option_fedauthrequired = -1;
-static int hf_tds_prelogin_option_nonceopt = -1;
+static int hf_tds_prelogin;
+static int hf_tds_prelogin_option_token;
+static int hf_tds_prelogin_option_offset;
+static int hf_tds_prelogin_option_length;
+static int hf_tds_prelogin_option_version;
+static int hf_tds_prelogin_option_subbuild;
+static int hf_tds_prelogin_option_encryption;
+static int hf_tds_prelogin_option_instopt;
+static int hf_tds_prelogin_option_threadid;
+static int hf_tds_prelogin_option_mars;
+static int hf_tds_prelogin_option_traceid;
+static int hf_tds_prelogin_option_fedauthrequired;
+static int hf_tds_prelogin_option_nonceopt;
 
 /* RPC Request Stream */
-static int hf_tds_rpc = -1;
-static int hf_tds_rpc_name_length8 = -1;
-static int hf_tds_rpc_name_length = -1;
-static int hf_tds_rpc_name = -1;
-static int hf_tds_rpc_proc_id = -1;
-static int hf_tds_rpc_options = -1;
-static int hf_tds_rpc_options_with_recomp = -1;
-static int hf_tds_rpc_options_no_metadata = -1;
-static int hf_tds_rpc_options_reuse_metadata = -1;
-static int hf_tds_rpc_separator = -1;
-static int hf_tds_rpc_parameter = -1;
-static int hf_tds_rpc_parameter_name_length = -1;
-static int hf_tds_rpc_parameter_name = -1;
-static int hf_tds_rpc_parameter_status = -1;
-static int hf_tds_rpc_parameter_status_by_ref = -1;
-static int hf_tds_rpc_parameter_status_default = -1;
-static int hf_tds_rpc_parameter_value = -1;
+static int hf_tds_rpc;
+static int hf_tds_rpc_name_length8;
+static int hf_tds_rpc_name_length;
+static int hf_tds_rpc_name;
+static int hf_tds_rpc_proc_id;
+static int hf_tds_rpc_options;
+static int hf_tds_rpc_options_with_recomp;
+static int hf_tds_rpc_options_no_metadata;
+static int hf_tds_rpc_options_reuse_metadata;
+static int hf_tds_rpc_separator;
+static int hf_tds_rpc_parameter;
+static int hf_tds_rpc_parameter_name_length;
+static int hf_tds_rpc_parameter_name;
+static int hf_tds_rpc_parameter_status;
+static int hf_tds_rpc_parameter_status_by_ref;
+static int hf_tds_rpc_parameter_status_default;
+static int hf_tds_rpc_parameter_value;
 
 /* SQLBatch Stream */
-static int hf_tds_query = -1;
+static int hf_tds_query;
 
 /* SSPI Message Stream */
 
 /* Transaction Manager Request Stream */
-static int hf_tds_transmgr = -1;
-static int hf_tds_transmgr_payload = -1;
+static int hf_tds_transmgr;
+static int hf_tds_transmgr_payload;
 
 /************************ Token definitions ************************/
 
@@ -676,632 +676,632 @@ static int hf_tds_transmgr_payload = -1;
 /* ALTROW token */
 
 /* CAPABILITY token */
-static int hf_tds_capability = -1;
-static int hf_tds_capability_length = -1;
-static int hf_tds_capability_captype = -1;
-static int hf_tds_capability_caplen = -1;
-static int hf_tds_capability_req_lang = -1;
-static int hf_tds_capability_req_rpc = -1;
-static int hf_tds_capability_req_evt = -1;
-static int hf_tds_capability_req_mstmt = -1;
-static int hf_tds_capability_req_bcp = -1;
-static int hf_tds_capability_req_cursor = -1;
-static int hf_tds_capability_req_dynf = -1;
-static int hf_tds_capability_req_msg = -1;
-static int hf_tds_capability_req_param = -1;
-static int hf_tds_capability_data_int1 = -1;
-static int hf_tds_capability_data_int2 = -1;
-static int hf_tds_capability_data_int4 = -1;
-static int hf_tds_capability_data_bit = -1;
-static int hf_tds_capability_data_char = -1;
-static int hf_tds_capability_data_vchar = -1;
-static int hf_tds_capability_data_bin = -1;
-static int hf_tds_capability_data_vbin = -1;
-static int hf_tds_capability_data_mny8 = -1;
-static int hf_tds_capability_data_mny4 = -1;
-static int hf_tds_capability_data_date8 = -1;
-static int hf_tds_capability_data_date4 = -1;
-static int hf_tds_capability_data_flt4 = -1;
-static int hf_tds_capability_data_flt8 = -1;
-static int hf_tds_capability_data_num = -1;
-static int hf_tds_capability_data_text = -1;
-static int hf_tds_capability_data_image = -1;
-static int hf_tds_capability_data_dec = -1;
-static int hf_tds_capability_data_lchar = -1;
-static int hf_tds_capability_data_lbin = -1;
-static int hf_tds_capability_data_intn = -1;
-static int hf_tds_capability_data_datetimen = -1;
-static int hf_tds_capability_data_moneyn = -1;
-static int hf_tds_capability_csr_prev = -1;
-static int hf_tds_capability_csr_first = -1;
-static int hf_tds_capability_csr_last = -1;
-static int hf_tds_capability_csr_abs = -1;
-static int hf_tds_capability_csr_rel = -1;
-static int hf_tds_capability_csr_multi = -1;
-static int hf_tds_capability_con_oob = -1;
-static int hf_tds_capability_con_inband = -1;
-static int hf_tds_capability_con_logical = -1;
-static int hf_tds_capability_proto_text = -1;
-static int hf_tds_capability_proto_bulk = -1;
-static int hf_tds_capability_req_urgevt = -1;
-static int hf_tds_capability_data_sensitivity = -1;
-static int hf_tds_capability_data_boundary = -1;
-static int hf_tds_capability_proto_dynamic = -1;
-static int hf_tds_capability_proto_dynproc = -1;
-static int hf_tds_capability_data_fltn = -1;
-static int hf_tds_capability_data_bitn = -1;
-static int hf_tds_capability_data_int8 = -1;
-static int hf_tds_capability_data_void = -1;
-static int hf_tds_capability_dol_bulk = -1;
-static int hf_tds_capability_object_java1 = -1;
-static int hf_tds_capability_object_char = -1;
-static int hf_tds_capability_data_columnstatus = -1;
-static int hf_tds_capability_object_binary = -1;
-static int hf_tds_capability_widetable = -1;
-static int hf_tds_capability_data_uint2 = -1;
-static int hf_tds_capability_data_uint4 = -1;
-static int hf_tds_capability_data_uint8 = -1;
-static int hf_tds_capability_data_uintn = -1;
-static int hf_tds_capability_cur_implicit = -1;
-static int hf_tds_capability_data_nlbin = -1;
-static int hf_tds_capability_image_nchar = -1;
-static int hf_tds_capability_blob_nchar_16 = -1;
-static int hf_tds_capability_blob_nchar_8 = -1;
-static int hf_tds_capability_blob_nchar_scsu = -1;
-static int hf_tds_capability_data_date = -1;
-static int hf_tds_capability_data_time = -1;
-static int hf_tds_capability_data_interval = -1;
-static int hf_tds_capability_csr_scroll = -1;
-static int hf_tds_capability_csr_sensitive = -1;
-static int hf_tds_capability_csr_insensitive = -1;
-static int hf_tds_capability_csr_semisensitive = -1;
-static int hf_tds_capability_csr_keysetdriven = -1;
-static int hf_tds_capability_req_srvpktsize = -1;
-static int hf_tds_capability_data_unitext = -1;
-static int hf_tds_capability_cap_clusterfailover = -1;
-static int hf_tds_capability_data_sint1 = -1;
-static int hf_tds_capability_req_largeident = -1;
-static int hf_tds_capability_req_blob_nchar_16 = -1;
-static int hf_tds_capability_data_xml = -1;
-static int hf_tds_capability_req_curinfo3 = -1;
-static int hf_tds_capability_req_dbrpc2 = -1;
-static int hf_tds_capability_res_nomsg = -1;
-static int hf_tds_capability_res_noeed = -1;
-static int hf_tds_capability_res_noparam = -1;
-static int hf_tds_capability_data_noint1 = -1;
-static int hf_tds_capability_data_noint2 = -1;
-static int hf_tds_capability_data_noint4 = -1;
-static int hf_tds_capability_data_nobit = -1;
-static int hf_tds_capability_data_nochar = -1;
-static int hf_tds_capability_data_novchar = -1;
-static int hf_tds_capability_data_nobin = -1;
-static int hf_tds_capability_data_novbin = -1;
-static int hf_tds_capability_data_nomny8 = -1;
-static int hf_tds_capability_data_nomny4 = -1;
-static int hf_tds_capability_data_nodate8 = -1;
-static int hf_tds_capability_data_nodate4 = -1;
-static int hf_tds_capability_data_noflt4 = -1;
-static int hf_tds_capability_data_noflt8 = -1;
-static int hf_tds_capability_data_nonum = -1;
-static int hf_tds_capability_data_notext = -1;
-static int hf_tds_capability_data_noimage = -1;
-static int hf_tds_capability_data_nodec = -1;
-static int hf_tds_capability_data_nolchar = -1;
-static int hf_tds_capability_data_nolbin = -1;
-static int hf_tds_capability_data_nointn = -1;
-static int hf_tds_capability_data_nodatetimen = -1;
-static int hf_tds_capability_data_nomoneyn = -1;
-static int hf_tds_capability_con_nooob = -1;
-static int hf_tds_capability_con_noinband = -1;
-static int hf_tds_capability_proto_notext = -1;
-static int hf_tds_capability_proto_nobulk = -1;
-static int hf_tds_capability_data_nosensitivity = -1;
-static int hf_tds_capability_data_noboundary = -1;
-static int hf_tds_capability_res_notdsdebug = -1;
-static int hf_tds_capability_res_nostripblanks = -1;
-static int hf_tds_capability_data_noint8 = -1;
-static int hf_tds_capability_object_nojava1 = -1;
-static int hf_tds_capability_object_nochar = -1;
-static int hf_tds_capability_data_nocolumnstatus = -1;
-static int hf_tds_capability_object_nobinary = -1;
-static int hf_tds_capability_data_nouint2 = -1;
-static int hf_tds_capability_data_nouint4 = -1;
-static int hf_tds_capability_data_nouint8 = -1;
-static int hf_tds_capability_data_nouintn = -1;
-static int hf_tds_capability_no_widetables = -1;
-static int hf_tds_capability_data_nonlbin = -1;
-static int hf_tds_capability_image_nonchar = -1;
-static int hf_tds_capability_blob_nonchar_16 = -1;
-static int hf_tds_capability_blob_nonchar_8 = -1;
-static int hf_tds_capability_blob_nonchar_scsu = -1;
-static int hf_tds_capability_data_nodate = -1;
-static int hf_tds_capability_data_notime = -1;
-static int hf_tds_capability_data_nointerval = -1;
-static int hf_tds_capability_data_nounitext = -1;
-static int hf_tds_capability_data_nosint1 = -1;
-static int hf_tds_capability_no_largeident = -1;
-static int hf_tds_capability_no_blob_nchar_16 = -1;
-static int hf_tds_capability_no_srvpktsize = -1;
-static int hf_tds_capability_data_noxml = -1;
-static int hf_tds_capability_no_nint_return_value = -1;
-static int hf_tds_capability_res_noxnldata = -1;
-static int hf_tds_capability_res_suppress_fmt = -1;
-static int hf_tds_capability_res_suppress_doneinproc = -1;
-static int hf_tds_capability_res_force_rowfmt2 = -1;
+static int hf_tds_capability;
+static int hf_tds_capability_length;
+static int hf_tds_capability_captype;
+static int hf_tds_capability_caplen;
+static int hf_tds_capability_req_lang;
+static int hf_tds_capability_req_rpc;
+static int hf_tds_capability_req_evt;
+static int hf_tds_capability_req_mstmt;
+static int hf_tds_capability_req_bcp;
+static int hf_tds_capability_req_cursor;
+static int hf_tds_capability_req_dynf;
+static int hf_tds_capability_req_msg;
+static int hf_tds_capability_req_param;
+static int hf_tds_capability_data_int1;
+static int hf_tds_capability_data_int2;
+static int hf_tds_capability_data_int4;
+static int hf_tds_capability_data_bit;
+static int hf_tds_capability_data_char;
+static int hf_tds_capability_data_vchar;
+static int hf_tds_capability_data_bin;
+static int hf_tds_capability_data_vbin;
+static int hf_tds_capability_data_mny8;
+static int hf_tds_capability_data_mny4;
+static int hf_tds_capability_data_date8;
+static int hf_tds_capability_data_date4;
+static int hf_tds_capability_data_flt4;
+static int hf_tds_capability_data_flt8;
+static int hf_tds_capability_data_num;
+static int hf_tds_capability_data_text;
+static int hf_tds_capability_data_image;
+static int hf_tds_capability_data_dec;
+static int hf_tds_capability_data_lchar;
+static int hf_tds_capability_data_lbin;
+static int hf_tds_capability_data_intn;
+static int hf_tds_capability_data_datetimen;
+static int hf_tds_capability_data_moneyn;
+static int hf_tds_capability_csr_prev;
+static int hf_tds_capability_csr_first;
+static int hf_tds_capability_csr_last;
+static int hf_tds_capability_csr_abs;
+static int hf_tds_capability_csr_rel;
+static int hf_tds_capability_csr_multi;
+static int hf_tds_capability_con_oob;
+static int hf_tds_capability_con_inband;
+static int hf_tds_capability_con_logical;
+static int hf_tds_capability_proto_text;
+static int hf_tds_capability_proto_bulk;
+static int hf_tds_capability_req_urgevt;
+static int hf_tds_capability_data_sensitivity;
+static int hf_tds_capability_data_boundary;
+static int hf_tds_capability_proto_dynamic;
+static int hf_tds_capability_proto_dynproc;
+static int hf_tds_capability_data_fltn;
+static int hf_tds_capability_data_bitn;
+static int hf_tds_capability_data_int8;
+static int hf_tds_capability_data_void;
+static int hf_tds_capability_dol_bulk;
+static int hf_tds_capability_object_java1;
+static int hf_tds_capability_object_char;
+static int hf_tds_capability_data_columnstatus;
+static int hf_tds_capability_object_binary;
+static int hf_tds_capability_widetable;
+static int hf_tds_capability_data_uint2;
+static int hf_tds_capability_data_uint4;
+static int hf_tds_capability_data_uint8;
+static int hf_tds_capability_data_uintn;
+static int hf_tds_capability_cur_implicit;
+static int hf_tds_capability_data_nlbin;
+static int hf_tds_capability_image_nchar;
+static int hf_tds_capability_blob_nchar_16;
+static int hf_tds_capability_blob_nchar_8;
+static int hf_tds_capability_blob_nchar_scsu;
+static int hf_tds_capability_data_date;
+static int hf_tds_capability_data_time;
+static int hf_tds_capability_data_interval;
+static int hf_tds_capability_csr_scroll;
+static int hf_tds_capability_csr_sensitive;
+static int hf_tds_capability_csr_insensitive;
+static int hf_tds_capability_csr_semisensitive;
+static int hf_tds_capability_csr_keysetdriven;
+static int hf_tds_capability_req_srvpktsize;
+static int hf_tds_capability_data_unitext;
+static int hf_tds_capability_cap_clusterfailover;
+static int hf_tds_capability_data_sint1;
+static int hf_tds_capability_req_largeident;
+static int hf_tds_capability_req_blob_nchar_16;
+static int hf_tds_capability_data_xml;
+static int hf_tds_capability_req_curinfo3;
+static int hf_tds_capability_req_dbrpc2;
+static int hf_tds_capability_res_nomsg;
+static int hf_tds_capability_res_noeed;
+static int hf_tds_capability_res_noparam;
+static int hf_tds_capability_data_noint1;
+static int hf_tds_capability_data_noint2;
+static int hf_tds_capability_data_noint4;
+static int hf_tds_capability_data_nobit;
+static int hf_tds_capability_data_nochar;
+static int hf_tds_capability_data_novchar;
+static int hf_tds_capability_data_nobin;
+static int hf_tds_capability_data_novbin;
+static int hf_tds_capability_data_nomny8;
+static int hf_tds_capability_data_nomny4;
+static int hf_tds_capability_data_nodate8;
+static int hf_tds_capability_data_nodate4;
+static int hf_tds_capability_data_noflt4;
+static int hf_tds_capability_data_noflt8;
+static int hf_tds_capability_data_nonum;
+static int hf_tds_capability_data_notext;
+static int hf_tds_capability_data_noimage;
+static int hf_tds_capability_data_nodec;
+static int hf_tds_capability_data_nolchar;
+static int hf_tds_capability_data_nolbin;
+static int hf_tds_capability_data_nointn;
+static int hf_tds_capability_data_nodatetimen;
+static int hf_tds_capability_data_nomoneyn;
+static int hf_tds_capability_con_nooob;
+static int hf_tds_capability_con_noinband;
+static int hf_tds_capability_proto_notext;
+static int hf_tds_capability_proto_nobulk;
+static int hf_tds_capability_data_nosensitivity;
+static int hf_tds_capability_data_noboundary;
+static int hf_tds_capability_res_notdsdebug;
+static int hf_tds_capability_res_nostripblanks;
+static int hf_tds_capability_data_noint8;
+static int hf_tds_capability_object_nojava1;
+static int hf_tds_capability_object_nochar;
+static int hf_tds_capability_data_nocolumnstatus;
+static int hf_tds_capability_object_nobinary;
+static int hf_tds_capability_data_nouint2;
+static int hf_tds_capability_data_nouint4;
+static int hf_tds_capability_data_nouint8;
+static int hf_tds_capability_data_nouintn;
+static int hf_tds_capability_no_widetables;
+static int hf_tds_capability_data_nonlbin;
+static int hf_tds_capability_image_nonchar;
+static int hf_tds_capability_blob_nonchar_16;
+static int hf_tds_capability_blob_nonchar_8;
+static int hf_tds_capability_blob_nonchar_scsu;
+static int hf_tds_capability_data_nodate;
+static int hf_tds_capability_data_notime;
+static int hf_tds_capability_data_nointerval;
+static int hf_tds_capability_data_nounitext;
+static int hf_tds_capability_data_nosint1;
+static int hf_tds_capability_no_largeident;
+static int hf_tds_capability_no_blob_nchar_16;
+static int hf_tds_capability_no_srvpktsize;
+static int hf_tds_capability_data_noxml;
+static int hf_tds_capability_no_nint_return_value;
+static int hf_tds_capability_res_noxnldata;
+static int hf_tds_capability_res_suppress_fmt;
+static int hf_tds_capability_res_suppress_doneinproc;
+static int hf_tds_capability_res_force_rowfmt2;
 
 /* COLINFO token (TDS_COLFMT_TOKEN) */
-static int hf_tds_colfmt = -1;
-static int hf_tds_colfmt_length = -1;
-static int hf_tds_colfmt_column = -1;
-static int hf_tds_colfmt_utype = -1;
-static int hf_tds_colfmt_ctype = -1;
-static int hf_tds_colfmt_csize = -1;
-static int hf_tds_colfmt_csize_long = -1;
-static int hf_tds_colfmt_text_tablename = -1;
+static int hf_tds_colfmt;
+static int hf_tds_colfmt_length;
+static int hf_tds_colfmt_column;
+static int hf_tds_colfmt_utype;
+static int hf_tds_colfmt_ctype;
+static int hf_tds_colfmt_csize;
+static int hf_tds_colfmt_csize_long;
+static int hf_tds_colfmt_text_tablename;
 
 /* COLNAME token (TDS_COL_NAME_TOKEN) */
-static int hf_tds_colname = -1;
-static int hf_tds_colname_length = -1;
-static int hf_tds_colname_column = -1;
-static int hf_tds_colname_name = -1;
+static int hf_tds_colname;
+static int hf_tds_colname_length;
+static int hf_tds_colname_column;
+static int hf_tds_colname_name;
 
 /* COLMETADATA token (TDS7_COL_METADATA_TOKEN) */
-static int hf_tds_colmetadata = -1;
-static int hf_tds_colmetadata_results_token_flags = -1;
-static int hf_tds_colmetadata_columns = -1;
-static int hf_tds_colmetadata_large2_type_size = -1;
-static int hf_tds_colmetadata_large4_type_size = -1;
-static int hf_tds_colmetadata_usertype32 = -1;
-static int hf_tds_colmetadata_usertype16 = -1;
-static int hf_tds_colmetadata_results_token_type = -1;
-static int hf_tds_colmetadata_collate_codepage = -1;
-static int hf_tds_colmetadata_collate_flags = -1;
-static int hf_tds_colmetadata_collate_charset_id = -1;
-static int hf_tds_colmetadata_colname = -1;
-static int hf_tds_colmetadata_colname_length = -1;
-static int hf_tds_colmetadata_table_name_parts = -1;
-static int hf_tds_colmetadata_table_name = -1;
-static int hf_tds_colmetadata_table_name_length = -1;
-static int hf_tds_colmetadata_csize = -1;
-static int hf_tds_colmetadata_precision = -1;
-static int hf_tds_colmetadata_scale = -1;
-static int hf_tds_colmetadata_field = -1;
-static int hf_tds_colmetadata_flags_nullable = -1;
-static int hf_tds_colmetadata_flags_updateable = -1;
-static int hf_tds_colmetadata_flags_casesen = -1;
-static int hf_tds_colmetadata_flags_identity = -1;
-static int hf_tds_colmetadata_flags_computed = -1;
-static int hf_tds_colmetadata_flags_reservedodbc = -1;
-static int hf_tds_colmetadata_flags_sparsecolumnset = -1;
-static int hf_tds_colmetadata_flags_encrypted = -1;
-static int hf_tds_colmetadata_flags_fixedlenclrtype = -1;
-static int hf_tds_colmetadata_flags_hidden = -1;
-static int hf_tds_colmetadata_flags_key = -1;
-static int hf_tds_colmetadata_flags_nullableunknown = -1;
-static int hf_tds_colmetadata_maxbytesize = -1;
-static int hf_tds_colmetadata_dbname_length = -1;
-static int hf_tds_colmetadata_dbname = -1;
-static int hf_tds_colmetadata_schemaname_length = -1;
-static int hf_tds_colmetadata_schemaname = -1;
-static int hf_tds_colmetadata_typename_length = -1;
-static int hf_tds_colmetadata_typename = -1;
-static int hf_tds_colmetadata_assemblyqualifiedname_length = -1;
-static int hf_tds_colmetadata_assemblyqualifiedname = -1;
-static int hf_tds_colmetadata_owningschema_length = -1;
-static int hf_tds_colmetadata_owningschema = -1;
-static int hf_tds_colmetadata_xmlschemacollection_length = -1;
-static int hf_tds_colmetadata_xmlschemacollection = -1;
+static int hf_tds_colmetadata;
+static int hf_tds_colmetadata_results_token_flags;
+static int hf_tds_colmetadata_columns;
+static int hf_tds_colmetadata_large2_type_size;
+static int hf_tds_colmetadata_large4_type_size;
+static int hf_tds_colmetadata_usertype32;
+static int hf_tds_colmetadata_usertype16;
+static int hf_tds_colmetadata_results_token_type;
+static int hf_tds_colmetadata_collate_codepage;
+static int hf_tds_colmetadata_collate_flags;
+static int hf_tds_colmetadata_collate_charset_id;
+static int hf_tds_colmetadata_colname;
+static int hf_tds_colmetadata_colname_length;
+static int hf_tds_colmetadata_table_name_parts;
+static int hf_tds_colmetadata_table_name;
+static int hf_tds_colmetadata_table_name_length;
+static int hf_tds_colmetadata_csize;
+static int hf_tds_colmetadata_precision;
+static int hf_tds_colmetadata_scale;
+static int hf_tds_colmetadata_field;
+static int hf_tds_colmetadata_flags_nullable;
+static int hf_tds_colmetadata_flags_updateable;
+static int hf_tds_colmetadata_flags_casesen;
+static int hf_tds_colmetadata_flags_identity;
+static int hf_tds_colmetadata_flags_computed;
+static int hf_tds_colmetadata_flags_reservedodbc;
+static int hf_tds_colmetadata_flags_sparsecolumnset;
+static int hf_tds_colmetadata_flags_encrypted;
+static int hf_tds_colmetadata_flags_fixedlenclrtype;
+static int hf_tds_colmetadata_flags_hidden;
+static int hf_tds_colmetadata_flags_key;
+static int hf_tds_colmetadata_flags_nullableunknown;
+static int hf_tds_colmetadata_maxbytesize;
+static int hf_tds_colmetadata_dbname_length;
+static int hf_tds_colmetadata_dbname;
+static int hf_tds_colmetadata_schemaname_length;
+static int hf_tds_colmetadata_schemaname;
+static int hf_tds_colmetadata_typename_length;
+static int hf_tds_colmetadata_typename;
+static int hf_tds_colmetadata_assemblyqualifiedname_length;
+static int hf_tds_colmetadata_assemblyqualifiedname;
+static int hf_tds_colmetadata_owningschema_length;
+static int hf_tds_colmetadata_owningschema;
+static int hf_tds_colmetadata_xmlschemacollection_length;
+static int hf_tds_colmetadata_xmlschemacollection;
 
 /* CONTROL token (TDS_CONTROL_TOKEN) */
-static int hf_tds_control = -1;
-static int hf_tds_control_length = -1;
-static int hf_tds_control_fmt = -1;
+static int hf_tds_control;
+static int hf_tds_control_length;
+static int hf_tds_control_fmt;
 
 /* CURCLOSE token (TDS_CURCLOSE_TOKEN) */
-static int hf_tds_curclose = -1;
-static int hf_tds_curclose_length = -1;
-static int hf_tds_curclose_cursorid = -1;
-static int hf_tds_curclose_cursor_name = -1;
-static int hf_tds_curclose_option_deallocate = -1;
+static int hf_tds_curclose;
+static int hf_tds_curclose_length;
+static int hf_tds_curclose_cursorid;
+static int hf_tds_curclose_cursor_name;
+static int hf_tds_curclose_option_deallocate;
 
 /* CURDECLARE token (TDS_CURDECLARE_TOKEN) */
-static int hf_tds_curdeclare = -1;
-static int hf_tds_curdeclare_length = -1;
-static int hf_tds_curdeclare_cursor_name = -1;
-static int hf_tds_curdeclare_options = -1;
-static int hf_tds_curdeclare_options_rdonly = -1;
-static int hf_tds_curdeclare_options_updatable = -1;
-static int hf_tds_curdeclare_options_sensitive = -1;
-static int hf_tds_curdeclare_options_dynamic = -1;
-static int hf_tds_curdeclare_options_implicit = -1;
-static int hf_tds_curdeclare_status_parameterized = -1;
-static int hf_tds_curdeclare_statement = -1;
-static int hf_tds_curdeclare_update_columns_num = -1;
-static int hf_tds_curdeclare_update_columns_name = -1;
+static int hf_tds_curdeclare;
+static int hf_tds_curdeclare_length;
+static int hf_tds_curdeclare_cursor_name;
+static int hf_tds_curdeclare_options;
+static int hf_tds_curdeclare_options_rdonly;
+static int hf_tds_curdeclare_options_updatable;
+static int hf_tds_curdeclare_options_sensitive;
+static int hf_tds_curdeclare_options_dynamic;
+static int hf_tds_curdeclare_options_implicit;
+static int hf_tds_curdeclare_status_parameterized;
+static int hf_tds_curdeclare_statement;
+static int hf_tds_curdeclare_update_columns_num;
+static int hf_tds_curdeclare_update_columns_name;
 
 /* CURFETCH token (TDS_CURFETCH_TOKEN) */
-static int hf_tds_curfetch = -1;
-static int hf_tds_curfetch_length = -1;
-static int hf_tds_curfetch_cursorid = -1;
-static int hf_tds_curfetch_cursor_name = -1;
-static int hf_tds_curfetch_type = -1;
-static int hf_tds_curfetch_rowcnt = -1;
+static int hf_tds_curfetch;
+static int hf_tds_curfetch_length;
+static int hf_tds_curfetch_cursorid;
+static int hf_tds_curfetch_cursor_name;
+static int hf_tds_curfetch_type;
+static int hf_tds_curfetch_rowcnt;
 
 /* CURINFO token (TDS_CURINFO_TOKEN) */
-static int hf_tds_curinfo = -1;
-static int hf_tds_curinfo_length = -1;
-static int hf_tds_curinfo_cursorid = -1;
-static int hf_tds_curinfo_cursor_name = -1;
-static int hf_tds_curinfo_cursor_command = -1;
-static int hf_tds_curinfo_cursor_status = -1;
-static int hf_tds_curinfo_cursor_status_declared = -1;
-static int hf_tds_curinfo_cursor_status_open = -1;
-static int hf_tds_curinfo_cursor_status_closed = -1;
-static int hf_tds_curinfo_cursor_status_rdonly = -1;
-static int hf_tds_curinfo_cursor_status_updatable = -1;
-static int hf_tds_curinfo_cursor_status_rowcnt = -1;
-static int hf_tds_curinfo_cursor_status_dealloc = -1;
-static int hf_tds_curinfo_cursor_rowcnt = -1;
+static int hf_tds_curinfo;
+static int hf_tds_curinfo_length;
+static int hf_tds_curinfo_cursorid;
+static int hf_tds_curinfo_cursor_name;
+static int hf_tds_curinfo_cursor_command;
+static int hf_tds_curinfo_cursor_status;
+static int hf_tds_curinfo_cursor_status_declared;
+static int hf_tds_curinfo_cursor_status_open;
+static int hf_tds_curinfo_cursor_status_closed;
+static int hf_tds_curinfo_cursor_status_rdonly;
+static int hf_tds_curinfo_cursor_status_updatable;
+static int hf_tds_curinfo_cursor_status_rowcnt;
+static int hf_tds_curinfo_cursor_status_dealloc;
+static int hf_tds_curinfo_cursor_rowcnt;
 
 /* CUROPEN token (TDS_CUROPEN_TOKEN) */
-static int hf_tds_curopen = -1;
-static int hf_tds_curopen_length = -1;
-static int hf_tds_curopen_cursorid = -1;
-static int hf_tds_curopen_cursor_name = -1;
-static int hf_tds_curopen_status_parameterized = -1;
+static int hf_tds_curopen;
+static int hf_tds_curopen_length;
+static int hf_tds_curopen_cursorid;
+static int hf_tds_curopen_cursor_name;
+static int hf_tds_curopen_status_parameterized;
 
 /* TDS5 DBRPC Token (TDS5_DBRPC_TOKEN) */
-static int hf_tds_dbrpc = -1;
-static int hf_tds_dbrpc_length = -1;
-static int hf_tds_dbrpc_rpcname_len = -1;
-static int hf_tds_dbrpc_rpcname = -1;
-static int hf_tds_dbrpc_options = -1;
-static int hf_tds_dbrpc_options_recompile = -1;
-static int hf_tds_dbrpc_options_params = -1;
+static int hf_tds_dbrpc;
+static int hf_tds_dbrpc_length;
+static int hf_tds_dbrpc_rpcname_len;
+static int hf_tds_dbrpc_rpcname;
+static int hf_tds_dbrpc_options;
+static int hf_tds_dbrpc_options_recompile;
+static int hf_tds_dbrpc_options_params;
 
 /* DONE token (TDS_DONE_TOKEN) */
-static int hf_tds_done = -1;
-static int hf_tds_done_curcmd = -1;
-static int hf_tds_done_status = -1;
-static int hf_tds_done_status_more = -1;
-static int hf_tds_done_status_error = -1;
-static int hf_tds_done_status_inxact = -1;
-static int hf_tds_done_status_proc = -1;
-static int hf_tds_done_status_count = -1;
-static int hf_tds_done_status_attn = -1;
-static int hf_tds_done_status_event = -1;
-static int hf_tds_done_status_rpcinbatch = -1;
-static int hf_tds_done_status_srverror = -1;
-static int hf_tds_done_donerowcount_32 = -1;
-static int hf_tds_done_donerowcount_64 = -1;
+static int hf_tds_done;
+static int hf_tds_done_curcmd;
+static int hf_tds_done_status;
+static int hf_tds_done_status_more;
+static int hf_tds_done_status_error;
+static int hf_tds_done_status_inxact;
+static int hf_tds_done_status_proc;
+static int hf_tds_done_status_count;
+static int hf_tds_done_status_attn;
+static int hf_tds_done_status_event;
+static int hf_tds_done_status_rpcinbatch;
+static int hf_tds_done_status_srverror;
+static int hf_tds_done_donerowcount_32;
+static int hf_tds_done_donerowcount_64;
 
 /* DONEPROC token (TDS_DONEPROC_TOKEN) */
-static int hf_tds_doneproc = -1;
-static int hf_tds_doneproc_curcmd = -1;
-static int hf_tds_doneproc_status = -1;
-static int hf_tds_doneproc_donerowcount_32 = -1;
-static int hf_tds_doneproc_donerowcount_64 = -1;
+static int hf_tds_doneproc;
+static int hf_tds_doneproc_curcmd;
+static int hf_tds_doneproc_status;
+static int hf_tds_doneproc_donerowcount_32;
+static int hf_tds_doneproc_donerowcount_64;
 
 /* DONEINPROC token () */
-static int hf_tds_doneinproc = -1;
-static int hf_tds_doneinproc_curcmd = -1;
-static int hf_tds_doneinproc_status = -1;
-static int hf_tds_doneinproc_donerowcount_32 = -1;
-static int hf_tds_doneinproc_donerowcount_64 = -1;
+static int hf_tds_doneinproc;
+static int hf_tds_doneinproc_curcmd;
+static int hf_tds_doneinproc_status;
+static int hf_tds_doneinproc_donerowcount_32;
+static int hf_tds_doneinproc_donerowcount_64;
 
 /* EED token (TDS5_EED_TOKEN) */
-static int hf_tds_eed = -1;
-static int hf_tds_eed_length = -1;
-static int hf_tds_eed_number = -1;
-static int hf_tds_eed_state = -1;
-static int hf_tds_eed_class = -1;
-static int hf_tds_eed_sql_state = -1;
-static int hf_tds_eed_status = -1;
-static int hf_tds_eed_transtate = -1;
-static int hf_tds_eed_msgtext = -1;
-static int hf_tds_eed_servername = -1;
-static int hf_tds_eed_procname = -1;
-static int hf_tds_eed_linenumber = -1;
+static int hf_tds_eed;
+static int hf_tds_eed_length;
+static int hf_tds_eed_number;
+static int hf_tds_eed_state;
+static int hf_tds_eed_class;
+static int hf_tds_eed_sql_state;
+static int hf_tds_eed_status;
+static int hf_tds_eed_transtate;
+static int hf_tds_eed_msgtext;
+static int hf_tds_eed_servername;
+static int hf_tds_eed_procname;
+static int hf_tds_eed_linenumber;
 
 /* ENVCHANGE token (TDS_ENVCHG_TOKEN) */
-static int hf_tds_envchg = -1;
-static int hf_tds_envchg_length = -1;
-static int hf_tds_envchg_type = -1;
-static int hf_tds_envchg_oldvalue_length = -1;
-static int hf_tds_envchg_newvalue_length = -1;
-static int hf_tds_envchg_oldvalue_string = -1;
-static int hf_tds_envchg_newvalue_string = -1;
-static int hf_tds_envchg_oldvalue_bytes = -1;
-static int hf_tds_envchg_newvalue_bytes = -1;
-static int hf_tds_envchg_collate_codepage = -1;
-static int hf_tds_envchg_collate_flags = -1;
-static int hf_tds_envchg_collate_charset_id = -1;
+static int hf_tds_envchg;
+static int hf_tds_envchg_length;
+static int hf_tds_envchg_type;
+static int hf_tds_envchg_oldvalue_length;
+static int hf_tds_envchg_newvalue_length;
+static int hf_tds_envchg_oldvalue_string;
+static int hf_tds_envchg_newvalue_string;
+static int hf_tds_envchg_oldvalue_bytes;
+static int hf_tds_envchg_newvalue_bytes;
+static int hf_tds_envchg_collate_codepage;
+static int hf_tds_envchg_collate_flags;
+static int hf_tds_envchg_collate_charset_id;
 
 /* ERROR token (TDS_ERR_TOKEN) */
-static int hf_tds_error = -1;
-static int hf_tds_error_length = -1;
-static int hf_tds_error_number = -1;
-static int hf_tds_error_state = -1;
-static int hf_tds_error_class = -1;
-static int hf_tds_error_msgtext_length = -1;
-static int hf_tds_error_msgtext = -1;
-static int hf_tds_error_servername_length = -1;
-static int hf_tds_error_servername = -1;
-static int hf_tds_error_procname_length = -1;
-static int hf_tds_error_procname = -1;
-static int hf_tds_error_linenumber_32 = -1;
-static int hf_tds_error_linenumber_16 = -1;
+static int hf_tds_error;
+static int hf_tds_error_length;
+static int hf_tds_error_number;
+static int hf_tds_error_state;
+static int hf_tds_error_class;
+static int hf_tds_error_msgtext_length;
+static int hf_tds_error_msgtext;
+static int hf_tds_error_servername_length;
+static int hf_tds_error_servername;
+static int hf_tds_error_procname_length;
+static int hf_tds_error_procname;
+static int hf_tds_error_linenumber_32;
+static int hf_tds_error_linenumber_16;
 
 /* FEATUREEXTACK token (TDS_FEATUREEXTACK_TOKEN) */
-static int hf_tds_featureextack = -1;
-static int hf_tds_featureextack_feature = -1;
-static int hf_tds_featureextack_featureid = -1;
-static int hf_tds_featureextack_featureackdata = -1;
-static int hf_tds_featureextack_featureackdatalen = -1;
+static int hf_tds_featureextack;
+static int hf_tds_featureextack_feature;
+static int hf_tds_featureextack_featureid;
+static int hf_tds_featureextack_featureackdata;
+static int hf_tds_featureextack_featureackdatalen;
 
 /* FEDAUTHINFO token */
 
 /* INFO token */
-static int hf_tds_info = -1;
-static int hf_tds_info_length = -1;
-static int hf_tds_info_number = -1;
-static int hf_tds_info_state = -1;
-static int hf_tds_info_class = -1;
-static int hf_tds_info_msgtext_length = -1;
-static int hf_tds_info_msgtext = -1;
-static int hf_tds_info_servername_length = -1;
-static int hf_tds_info_servername = -1;
-static int hf_tds_info_procname_length = -1;
-static int hf_tds_info_procname = -1;
-static int hf_tds_info_linenumber_32 = -1;
-static int hf_tds_info_linenumber_16 = -1;
+static int hf_tds_info;
+static int hf_tds_info_length;
+static int hf_tds_info_number;
+static int hf_tds_info_state;
+static int hf_tds_info_class;
+static int hf_tds_info_msgtext_length;
+static int hf_tds_info_msgtext;
+static int hf_tds_info_servername_length;
+static int hf_tds_info_servername;
+static int hf_tds_info_procname_length;
+static int hf_tds_info_procname;
+static int hf_tds_info_linenumber_32;
+static int hf_tds_info_linenumber_16;
 
 /* LOGINACK token (TDS_LOGIN_ACK_TOKEN) */
-static int hf_tds_loginack = -1;
-static int hf_tds_loginack_length = -1;
-static int hf_tds_loginack_interface = -1;
-static int hf_tds_loginack_tdsversion = -1;
-static int hf_tds_loginack_progversion = -1;
-static int hf_tds_loginack_progname = -1;
+static int hf_tds_loginack;
+static int hf_tds_loginack_length;
+static int hf_tds_loginack_interface;
+static int hf_tds_loginack_tdsversion;
+static int hf_tds_loginack_progversion;
+static int hf_tds_loginack_progname;
 
 /* LOGOUT token (TDS5_LOGOUT_TOKEN) */
-static int hf_tds_logout = -1;
-static int hf_tds_logout_options = -1;
+static int hf_tds_logout;
+static int hf_tds_logout_options;
 
 /* MSG token (TDS5_MSG_TOKEN) */
-static int hf_tds_msg = -1;
-static int hf_tds_msg_length = -1;
-static int hf_tds_msg_status = -1;
-static int hf_tds_msg_msgid = -1;
+static int hf_tds_msg;
+static int hf_tds_msg_length;
+static int hf_tds_msg_status;
+static int hf_tds_msg_msgid;
 
 /* NBCROW token (TDS_NBCROW_TOKEN) */
-static int hf_tds_nbcrow = -1;
+static int hf_tds_nbcrow;
 
 /* OFFSET token */
-static int hf_tds_offset = -1;
-static int hf_tds_offset_id = -1;
-static int hf_tds_offset_len = -1;
+static int hf_tds_offset;
+static int hf_tds_offset_id;
+static int hf_tds_offset_len;
 
 /* ORDER token (TDS_ORDER_TOKEN) */
-static int hf_tds_order = -1;
-static int hf_tds_order_length = -1;
-static int hf_tds_order_colnum = -1;
+static int hf_tds_order;
+static int hf_tds_order_length;
+static int hf_tds_order_colnum;
 
 /* PARAMFMT token (TDS5_PARAMFMT_TOKEN) */
-static int hf_tds_paramfmt = -1;
-static int hf_tds_paramfmt_length = -1;
-static int hf_tds_paramfmt_numparams = -1;
-static int hf_tds_paramfmt_colname = -1;
-static int hf_tds_paramfmt_status = -1;
-static int hf_tds_paramfmt_utype = -1;
-static int hf_tds_paramfmt_ctype = -1;
-static int hf_tds_paramfmt_csize = -1;
-static int hf_tds_paramfmt_locale_info = -1;
+static int hf_tds_paramfmt;
+static int hf_tds_paramfmt_length;
+static int hf_tds_paramfmt_numparams;
+static int hf_tds_paramfmt_colname;
+static int hf_tds_paramfmt_status;
+static int hf_tds_paramfmt_utype;
+static int hf_tds_paramfmt_ctype;
+static int hf_tds_paramfmt_csize;
+static int hf_tds_paramfmt_locale_info;
 
 /* PARAMFMT2 token (TDS5_PARAM_TOKEN) */
-static int hf_tds_paramfmt2 = -1;
-static int hf_tds_paramfmt2_length = -1;
-static int hf_tds_paramfmt2_numparams = -1;
-static int hf_tds_paramfmt2_colname = -1;
-static int hf_tds_paramfmt2_status = -1;
-static int hf_tds_paramfmt2_utype = -1;
-static int hf_tds_paramfmt2_ctype = -1;
-static int hf_tds_paramfmt2_csize = -1;
-static int hf_tds_paramfmt2_locale_info = -1;
+static int hf_tds_paramfmt2;
+static int hf_tds_paramfmt2_length;
+static int hf_tds_paramfmt2_numparams;
+static int hf_tds_paramfmt2_colname;
+static int hf_tds_paramfmt2_status;
+static int hf_tds_paramfmt2_utype;
+static int hf_tds_paramfmt2_ctype;
+static int hf_tds_paramfmt2_csize;
+static int hf_tds_paramfmt2_locale_info;
 
 /* PARAMS token (TDS5_PARAMS_TOKEN) */
-static int hf_tds_params = -1;
-static int hf_tds_params_field = -1;
+static int hf_tds_params;
+static int hf_tds_params_field;
 
 /* PROCID token (TDS_PROCID_TOKEN) */
-static int hf_tds_procid = -1;
-static int hf_tds_procid_value = -1;
+static int hf_tds_procid;
+static int hf_tds_procid_value;
 
 /* RETURNSTATUS token (TDS_RET_STAT_TOKEN) */
-static int hf_tds_returnstatus = -1;
-static int hf_tds_returnstatus_value = -1;
+static int hf_tds_returnstatus;
+static int hf_tds_returnstatus_value;
 
 /* RETURNVALUE token (TDS_RETURNVAL_TOKEN) */
 
 /* ROW token (TDS_ROW_TOKEN) */
-static int hf_tds_row = -1;
-static int hf_tds_row_field = -1;
+static int hf_tds_row;
+static int hf_tds_row_field;
 
 /* ROWFMT token (TDS5_ROWFMT_TOKEN) */
-static int hf_tds_rowfmt = -1;
-static int hf_tds_rowfmt_length = -1;
-static int hf_tds_rowfmt_numcols = -1;
-static int hf_tds_rowfmt_colname = -1;
-static int hf_tds_rowfmt_status = -1;
-static int hf_tds_rowfmt_utype = -1;
-static int hf_tds_rowfmt_ctype = -1;
-static int hf_tds_rowfmt_csize = -1;
-static int hf_tds_rowfmt_text_tablename = -1;
-static int hf_tds_rowfmt_precision = -1;
-static int hf_tds_rowfmt_scale = -1;
-static int hf_tds_rowfmt_locale_info = -1;
+static int hf_tds_rowfmt;
+static int hf_tds_rowfmt_length;
+static int hf_tds_rowfmt_numcols;
+static int hf_tds_rowfmt_colname;
+static int hf_tds_rowfmt_status;
+static int hf_tds_rowfmt_utype;
+static int hf_tds_rowfmt_ctype;
+static int hf_tds_rowfmt_csize;
+static int hf_tds_rowfmt_text_tablename;
+static int hf_tds_rowfmt_precision;
+static int hf_tds_rowfmt_scale;
+static int hf_tds_rowfmt_locale_info;
 
 /* ROWFMT2 token (TDS5_ROW_TOKEN) */
-static int hf_tds_rowfmt2 = -1;
-static int hf_tds_rowfmt2_length = -1;
-static int hf_tds_rowfmt2_numcols = -1;
-static int hf_tds_rowfmt2_labelname = -1;
-static int hf_tds_rowfmt2_catalogname = -1;
-static int hf_tds_rowfmt2_schemaname = -1;
-static int hf_tds_rowfmt2_tablename = -1;
-static int hf_tds_rowfmt2_colname = -1;
-static int hf_tds_rowfmt2_status = -1;
-static int hf_tds_rowfmt2_utype = -1;
-static int hf_tds_rowfmt2_ctype = -1;
-static int hf_tds_rowfmt2_csize = -1;
-static int hf_tds_rowfmt2_text_tablename = -1;
-static int hf_tds_rowfmt2_precision = -1;
-static int hf_tds_rowfmt2_scale = -1;
-static int hf_tds_rowfmt2_locale_info = -1;
+static int hf_tds_rowfmt2;
+static int hf_tds_rowfmt2_length;
+static int hf_tds_rowfmt2_numcols;
+static int hf_tds_rowfmt2_labelname;
+static int hf_tds_rowfmt2_catalogname;
+static int hf_tds_rowfmt2_schemaname;
+static int hf_tds_rowfmt2_tablename;
+static int hf_tds_rowfmt2_colname;
+static int hf_tds_rowfmt2_status;
+static int hf_tds_rowfmt2_utype;
+static int hf_tds_rowfmt2_ctype;
+static int hf_tds_rowfmt2_csize;
+static int hf_tds_rowfmt2_text_tablename;
+static int hf_tds_rowfmt2_precision;
+static int hf_tds_rowfmt2_scale;
+static int hf_tds_rowfmt2_locale_info;
 
 /* SESSIONSTATE token (TDS_SESSIONSTATE_TOKEN) */
-static int hf_tds_sessionstate = -1;
-static int hf_tds_sessionstate_length = -1;
-static int hf_tds_sessionstate_seqno = -1;
-static int hf_tds_sessionstate_status = -1;
-static int hf_tds_sessionstate_stateid = -1;
-static int hf_tds_sessionstate_statelen = -1;
-static int hf_tds_sessionstate_statevalue = -1;
+static int hf_tds_sessionstate;
+static int hf_tds_sessionstate_length;
+static int hf_tds_sessionstate_seqno;
+static int hf_tds_sessionstate_status;
+static int hf_tds_sessionstate_stateid;
+static int hf_tds_sessionstate_statelen;
+static int hf_tds_sessionstate_statevalue;
 
 /* SSPI token */
-static int hf_tds_sspi = -1;
-static int hf_tds_sspi_buffer = -1;
+static int hf_tds_sspi;
+static int hf_tds_sspi_buffer;
 
 /* TABNAME token */
 
 /* TVPROW Token */
 
 /* TDS5 LANG Token */
-static int hf_tds_lang_length = -1;
-static int hf_tds_lang_language_text = -1;
-static int hf_tds_lang_token_status = -1;
-static int hf_tds_lang_status_parameterized = -1;
+static int hf_tds_lang_length;
+static int hf_tds_lang_language_text;
+static int hf_tds_lang_token_status;
+static int hf_tds_lang_status_parameterized;
 
 /* Unknown token */
-static int hf_tds_unknown_tds_token = -1;
+static int hf_tds_unknown_tds_token;
 
 /*********************** Basic types *******************************/
 
-static int hf_tds_type_info = -1;
-static int hf_tds_type_info_type = -1;
-static int hf_tds_type_info_varlen = -1;
-static int hf_tds_type_info_precision = -1;
-static int hf_tds_type_info_scale = -1;
-static int hf_tds_type_info_collation = -1;
-static int hf_tds_type_info_collation_lcid = -1;
-static int hf_tds_type_info_collation_ign_case = -1;
-static int hf_tds_type_info_collation_ign_accent = -1;
-static int hf_tds_type_info_collation_ign_kana = -1;
-static int hf_tds_type_info_collation_ign_width = -1;
-static int hf_tds_type_info_collation_binary = -1;
-static int hf_tds_type_info_collation_version = -1;
-static int hf_tds_type_info_collation_sortid = -1;
-static int hf_tds_type_varbyte_length = -1;
-static int hf_tds_type_varbyte_data_null = -1;
-static int hf_tds_type_varbyte_data_boolean = -1;
-static int hf_tds_type_varbyte_data_int1 = -1;
-static int hf_tds_type_varbyte_data_int2 = -1;
-static int hf_tds_type_varbyte_data_int4 = -1;
-static int hf_tds_type_varbyte_data_int8 = -1;
-static int hf_tds_type_varbyte_data_float = -1;
-static int hf_tds_type_varbyte_data_double = -1;
-static int hf_tds_type_varbyte_data_bytes = -1;
-static int hf_tds_type_varbyte_data_uint_bytes = -1;
-static int hf_tds_type_varbyte_data_guid = -1;
-static int hf_tds_type_varbyte_data_string = -1;
-static int hf_tds_type_varbyte_data_uint_string = -1;
-static int hf_tds_type_varbyte_data_absdatetime = -1;
-static int hf_tds_type_varbyte_data_reltime = -1;
-static int hf_tds_type_varbyte_data_sign = -1;
-static int hf_tds_type_varbyte_data_textptr_len = -1;
-static int hf_tds_type_varbyte_data_textptr = -1;
-static int hf_tds_type_varbyte_data_text_ts = -1;
-static int hf_tds_type_varbyte_plp_len = -1;
-static int hf_tds_type_varbyte_plp_chunk_len = -1;
-static int hf_tds_type_varbyte_plp_chunk = -1;
-static int hf_tds_type_varbyte_column_name = -1;
+static int hf_tds_type_info;
+static int hf_tds_type_info_type;
+static int hf_tds_type_info_varlen;
+static int hf_tds_type_info_precision;
+static int hf_tds_type_info_scale;
+static int hf_tds_type_info_collation;
+static int hf_tds_type_info_collation_lcid;
+static int hf_tds_type_info_collation_ign_case;
+static int hf_tds_type_info_collation_ign_accent;
+static int hf_tds_type_info_collation_ign_kana;
+static int hf_tds_type_info_collation_ign_width;
+static int hf_tds_type_info_collation_binary;
+static int hf_tds_type_info_collation_version;
+static int hf_tds_type_info_collation_sortid;
+static int hf_tds_type_varbyte_length;
+static int hf_tds_type_varbyte_data_null;
+static int hf_tds_type_varbyte_data_boolean;
+static int hf_tds_type_varbyte_data_int1;
+static int hf_tds_type_varbyte_data_int2;
+static int hf_tds_type_varbyte_data_int4;
+static int hf_tds_type_varbyte_data_int8;
+static int hf_tds_type_varbyte_data_float;
+static int hf_tds_type_varbyte_data_double;
+static int hf_tds_type_varbyte_data_bytes;
+static int hf_tds_type_varbyte_data_uint_bytes;
+static int hf_tds_type_varbyte_data_guid;
+static int hf_tds_type_varbyte_data_string;
+static int hf_tds_type_varbyte_data_uint_string;
+static int hf_tds_type_varbyte_data_absdatetime;
+static int hf_tds_type_varbyte_data_reltime;
+static int hf_tds_type_varbyte_data_sign;
+static int hf_tds_type_varbyte_data_textptr_len;
+static int hf_tds_type_varbyte_data_textptr;
+static int hf_tds_type_varbyte_data_text_ts;
+static int hf_tds_type_varbyte_plp_len;
+static int hf_tds_type_varbyte_plp_chunk_len;
+static int hf_tds_type_varbyte_plp_chunk;
+static int hf_tds_type_varbyte_column_name;
 
 /****************************** Top level TDS ******************************/
 
-static int proto_tds = -1;
-static int hf_tds_type = -1;
-static int hf_tds_status = -1;
-static int hf_tds_status_eom = -1;
-static int hf_tds_status_ignore = -1;
-static int hf_tds_status_event_notif = -1;
-static int hf_tds_status_reset_conn = -1;
-static int hf_tds_status_reset_conn_skip_tran = -1;
-static int hf_tds_length = -1;
-static int hf_tds_channel = -1;
-static int hf_tds_packet_number = -1;
-static int hf_tds_window = -1;
-static int hf_tds_reassembled_in = -1;
-static int hf_tds_reassembled_length = -1;
-static int hf_tds_fragments = -1;
-static int hf_tds_fragment = -1;
-static int hf_tds_fragment_overlap = -1;
-static int hf_tds_fragment_overlap_conflict = -1;
-static int hf_tds_fragment_multiple_tails = -1;
-static int hf_tds_fragment_too_long_fragment = -1;
-static int hf_tds_fragment_error = -1;
-static int hf_tds_fragment_count = -1;
-static int hf_tds_all_headers = -1;
-static int hf_tds_all_headers_total_length = -1;
-static int hf_tds_all_headers_header_length = -1;
-static int hf_tds_all_headers_header_type = -1;
-static int hf_tds_all_headers_trans_descr = -1;
-static int hf_tds_all_headers_request_cnt = -1;
-static int hf_tds_unknown_tds_packet = -1;
+static int proto_tds;
+static int hf_tds_type;
+static int hf_tds_status;
+static int hf_tds_status_eom;
+static int hf_tds_status_ignore;
+static int hf_tds_status_event_notif;
+static int hf_tds_status_reset_conn;
+static int hf_tds_status_reset_conn_skip_tran;
+static int hf_tds_length;
+static int hf_tds_channel;
+static int hf_tds_packet_number;
+static int hf_tds_window;
+static int hf_tds_reassembled_in;
+static int hf_tds_reassembled_length;
+static int hf_tds_fragments;
+static int hf_tds_fragment;
+static int hf_tds_fragment_overlap;
+static int hf_tds_fragment_overlap_conflict;
+static int hf_tds_fragment_multiple_tails;
+static int hf_tds_fragment_too_long_fragment;
+static int hf_tds_fragment_error;
+static int hf_tds_fragment_count;
+static int hf_tds_all_headers;
+static int hf_tds_all_headers_total_length;
+static int hf_tds_all_headers_header_length;
+static int hf_tds_all_headers_header_type;
+static int hf_tds_all_headers_trans_descr;
+static int hf_tds_all_headers_request_cnt;
+static int hf_tds_unknown_tds_packet;
 
 /* Initialize the subtree pointers */
-static gint ett_tds = -1;
-static gint ett_tds_status = -1;
-static gint ett_tds_fragments = -1;
-static gint ett_tds_fragment = -1;
-static gint ett_tds_token = -1;
-static gint ett_tds_capability_req = -1;
-static gint ett_tds_capability_resp = -1;
-static gint ett_tds_done_status = -1;
-static gint ett_tds_all_headers = -1;
-static gint ett_tds_all_headers_header = -1;
-static gint ett_tds_type_info = -1;
-static gint ett_tds_type_info_collation = -1;
-static gint ett_tds_type_varbyte = -1;
-static gint ett_tds_message = -1;
-static gint ett_tds_rpc_options = -1;
-static gint ett_tds_rpc_parameter = -1;
-static gint ett_tds_rpc_parameter_status = -1;
-static gint ett_tds7_query = -1;
-static gint ett_tds7_prelogin = -1;
-static gint ett_tds_login = -1;
-static gint ett_tds_login_options = -1;
-static gint ett_tds_login_options2= -1;
-static gint ett_tds_login_rempw = -1;
-static gint ett_tds7_login = -1;
-static gint ett_tds7_hdr = -1;
-static gint ett_tds_col = -1;
-static gint ett_tds_flags = -1;
-static gint ett_tds_prelogin_option = -1;
-static gint ett_tds7_featureextack = -1;
-static gint ett_tds7_featureextack_feature = -1;
-static gint ett_tds5_dbrpc_options = -1;
-static gint ett_tds5_curdeclare_options = -1;
-static gint ett_tds5_curinfo_status = -1;
-
-/* static expert_field ei_tds_type_info_type_undecoded = EI_INIT; */
-static expert_field ei_tds_invalid_length = EI_INIT;
-static expert_field ei_tds_token_length_invalid = EI_INIT;
-static expert_field ei_tds_invalid_plp_length = EI_INIT;
-static expert_field ei_tds_type_info_type = EI_INIT;
-static expert_field ei_tds_all_headers_header_type = EI_INIT;
-/* static expert_field ei_tds_token_stats = EI_INIT; */
-static expert_field ei_tds_invalid_plp_type = EI_INIT;
-static expert_field ei_tds_cursor_name_mismatch = EI_INIT;
+static gint ett_tds;
+static gint ett_tds_status;
+static gint ett_tds_fragments;
+static gint ett_tds_fragment;
+static gint ett_tds_token;
+static gint ett_tds_capability_req;
+static gint ett_tds_capability_resp;
+static gint ett_tds_done_status;
+static gint ett_tds_all_headers;
+static gint ett_tds_all_headers_header;
+static gint ett_tds_type_info;
+static gint ett_tds_type_info_collation;
+static gint ett_tds_type_varbyte;
+static gint ett_tds_message;
+static gint ett_tds_rpc_options;
+static gint ett_tds_rpc_parameter;
+static gint ett_tds_rpc_parameter_status;
+static gint ett_tds7_query;
+static gint ett_tds7_prelogin;
+static gint ett_tds_login;
+static gint ett_tds_login_options;
+static gint ett_tds_login_options2;
+static gint ett_tds_login_rempw;
+static gint ett_tds7_login;
+static gint ett_tds7_hdr;
+static gint ett_tds_col;
+static gint ett_tds_flags;
+static gint ett_tds_prelogin_option;
+static gint ett_tds7_featureextack;
+static gint ett_tds7_featureextack_feature;
+static gint ett_tds5_dbrpc_options;
+static gint ett_tds5_curdeclare_options;
+static gint ett_tds5_curinfo_status;
+
+/* static expert_field ei_tds_type_info_type_undecoded; */
+static expert_field ei_tds_invalid_length;
+static expert_field ei_tds_token_length_invalid;
+static expert_field ei_tds_invalid_plp_length;
+static expert_field ei_tds_type_info_type;
+static expert_field ei_tds_all_headers_header_type;
+/* static expert_field ei_tds_token_stats; */
+static expert_field ei_tds_invalid_plp_type;
+static expert_field ei_tds_cursor_name_mismatch;
 
 /* Desegmentation of Netlib buffers crossing TCP segment boundaries. */
 static gboolean tds_desegment = TRUE;
diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c
index 0a287d3077..32ecfc5c0b 100644
--- a/epan/dissectors/packet-teamspeak2.c
+++ b/epan/dissectors/packet-teamspeak2.c
@@ -96,21 +96,21 @@ void proto_register_ts2(void);
 
 static dissector_handle_t ts2_handle;
 
-static int hf_msg_fragments = -1;
-static int hf_msg_fragment = -1;
-static int hf_msg_fragment_overlap = -1;
-static int hf_msg_fragment_overlap_conflicts = -1;
-static int hf_msg_fragment_multiple_tails = -1;
-static int hf_msg_fragment_too_long_fragment = -1;
-static int hf_msg_fragment_error = -1;
-static int hf_msg_fragment_count = -1;
-static int hf_msg_reassembled_in = -1;
-static int hf_msg_reassembled_length = -1;
-
-static gint ett_msg_fragment = -1;
-static gint ett_msg_fragments = -1;
-
-static expert_field ei_ts2_crc32 = EI_INIT;
+static int hf_msg_fragments;
+static int hf_msg_fragment;
+static int hf_msg_fragment_overlap;
+static int hf_msg_fragment_overlap_conflicts;
+static int hf_msg_fragment_multiple_tails;
+static int hf_msg_fragment_too_long_fragment;
+static int hf_msg_fragment_error;
+static int hf_msg_fragment_count;
+static int hf_msg_reassembled_in;
+static int hf_msg_reassembled_length;
+
+static gint ett_msg_fragment;
+static gint ett_msg_fragments;
+
+static expert_field ei_ts2_crc32;
 
 static const fragment_items msg_frag_items = {
     /* Fragment subtrees */
@@ -216,59 +216,59 @@ static const value_string codecnames[] =
 
 #define TS2_PORT 8767 /* Not IANA registered */
 
-static int proto_ts2 = -1;
-
-static int hf_ts2_type = -1;
-static int hf_ts2_class = -1;
-static int hf_ts2_clientid = -1;
-static int hf_ts2_sessionkey = -1;
-static int hf_ts2_crc32 = -1;
-static int hf_ts2_crc32_status = -1;
-static int hf_ts2_ackto = -1;
-static int hf_ts2_seqnum = -1;
-static int hf_ts2_protocol_string = -1;
-/* static int hf_ts2_string = -1; */
-static int hf_ts2_registeredlogin = -1;
-static int hf_ts2_name = -1;
-static int hf_ts2_password = -1;
-static int hf_ts2_nick = -1;
-static int hf_ts2_badlogin = -1;
-static int hf_ts2_unknown = -1;
-static int hf_ts2_channel = -1;
-static int hf_ts2_subchannel = -1;
-static int hf_ts2_channelpassword = -1;
-static int hf_ts2_emptyspace = -1;
-static int hf_ts2_fragmentnumber = -1;
-static int hf_ts2_platform_string = -1;
-static int hf_ts2_server_name = -1;
-static int hf_ts2_server_welcome_message = -1;
-static int hf_ts2_parent_channel_id = -1;
-static int hf_ts2_codec = -1;
-static int hf_ts2_channel_flags = -1;
-static int hf_ts2_channel_id = -1;
-static int hf_ts2_channel_name = -1;
-static int hf_ts2_channel_topic = -1;
-static int hf_ts2_channel_description = -1;
-static int hf_ts2_player_id = -1;
-static int hf_ts2_player_status_flags = -1;
-static int hf_ts2_number_of_players = -1;
-static int hf_ts2_number_of_channels = -1;
-static int hf_ts2_resend_count = -1;
-static int hf_ts2_status_channelcommander = -1;
-static int hf_ts2_status_blockwhispers = -1;
-static int hf_ts2_status_away = -1;
-static int hf_ts2_status_mutemicrophone = -1;
-static int hf_ts2_status_mute = -1;
-static int hf_ts2_channel_unregistered = -1;
-static int hf_ts2_channel_moderated = -1;
-static int hf_ts2_channel_password = -1;
-static int hf_ts2_channel_subchannels = -1;
-static int hf_ts2_channel_default = -1;
-static int hf_ts2_channel_order = -1;
-static int hf_ts2_max_users = -1;
-
-static gint ett_ts2 = -1;
-static gint ett_ts2_channel_flags = -1;
+static int proto_ts2;
+
+static int hf_ts2_type;
+static int hf_ts2_class;
+static int hf_ts2_clientid;
+static int hf_ts2_sessionkey;
+static int hf_ts2_crc32;
+static int hf_ts2_crc32_status;
+static int hf_ts2_ackto;
+static int hf_ts2_seqnum;
+static int hf_ts2_protocol_string;
+/* static int hf_ts2_string; */
+static int hf_ts2_registeredlogin;
+static int hf_ts2_name;
+static int hf_ts2_password;
+static int hf_ts2_nick;
+static int hf_ts2_badlogin;
+static int hf_ts2_unknown;
+static int hf_ts2_channel;
+static int hf_ts2_subchannel;
+static int hf_ts2_channelpassword;
+static int hf_ts2_emptyspace;
+static int hf_ts2_fragmentnumber;
+static int hf_ts2_platform_string;
+static int hf_ts2_server_name;
+static int hf_ts2_server_welcome_message;
+static int hf_ts2_parent_channel_id;
+static int hf_ts2_codec;
+static int hf_ts2_channel_flags;
+static int hf_ts2_channel_id;
+static int hf_ts2_channel_name;
+static int hf_ts2_channel_topic;
+static int hf_ts2_channel_description;
+static int hf_ts2_player_id;
+static int hf_ts2_player_status_flags;
+static int hf_ts2_number_of_players;
+static int hf_ts2_number_of_channels;
+static int hf_ts2_resend_count;
+static int hf_ts2_status_channelcommander;
+static int hf_ts2_status_blockwhispers;
+static int hf_ts2_status_away;
+static int hf_ts2_status_mutemicrophone;
+static int hf_ts2_status_mute;
+static int hf_ts2_channel_unregistered;
+static int hf_ts2_channel_moderated;
+static int hf_ts2_channel_password;
+static int hf_ts2_channel_subchannels;
+static int hf_ts2_channel_default;
+static int hf_ts2_channel_order;
+static int hf_ts2_max_users;
+
+static gint ett_ts2;
+static gint ett_ts2_channel_flags;
 
 /* Conversation Variables */
 typedef struct
diff --git a/epan/dissectors/packet-teap.c b/epan/dissectors/packet-teap.c
index ac24f8cfde..af77b78ed5 100644
--- a/epan/dissectors/packet-teap.c
+++ b/epan/dissectors/packet-teap.c
@@ -18,13 +18,13 @@
 void proto_register_teap(void);
 void proto_reg_handoff_teap(void);
 
-static int proto_teap = -1;
+static int proto_teap;
 
-static gint ett_teap = -1;
-static gint ett_teap_tlv = -1;
-static gint ett_pac_attr_tlv = -1;
+static gint ett_teap;
+static gint ett_teap_tlv;
+static gint ett_pac_attr_tlv;
 
-static expert_field ei_teap_bad_length = EI_INIT;
+static expert_field ei_teap_bad_length;
 
 static dissector_handle_t teap_handle;
 
@@ -210,44 +210,44 @@ static const value_string pac_type_vals[] = {
    { 0, NULL }
  };
 
-static int hf_teap_tlv_mandatory = -1;
-static int hf_teap_tlv_reserved = -1;
-static int hf_teap_tlv_type = -1;
-static int hf_teap_tlv_len = -1;
-static int hf_teap_tlv_val = -1;
-static int hf_teap_auth_id = -1;
-static int hf_teap_identity = -1;
-static int hf_teap_status = -1;
-static int hf_teap_vendor_id = -1;
-static int hf_teap_request_action_status = -1;
-static int hf_teap_request_action_action = -1;
-static int hf_teap_crypto_reserved = -1;
-static int hf_teap_crypto_version = -1;
-static int hf_teap_crypto_rcv_version = -1;
-static int hf_teap_crypto_flags = -1;
-static int hf_teap_crypto_subtype = -1;
-static int hf_teap_crypto_nonce = -1;
-static int hf_teap_crypto_emsk = -1;
-static int hf_teap_crypto_msk = -1;
-static int hf_teap_nak_type = -1;
-static int hf_teap_error_code = -1;
-static int hf_teap_prompt = -1;
-static int hf_teap_user_len = -1;
-static int hf_teap_username = -1;
-static int hf_teap_pass_len = -1;
-static int hf_teap_password = -1;
-
-static int hf_pac_attr_type = -1;
-static int hf_pac_attr_pac_key = -1;
-static int hf_pac_attr_pac_opaque = -1;
-static int hf_pac_attr_pac_lifetime = -1;
-static int hf_pac_attr_pac_a_id = -1;
-static int hf_pac_attr_pac_i_id = -1;
-static int hf_pac_attr_pac_reserved = -1;
-static int hf_pac_attr_pac_a_id_info = -1;
-static int hf_pac_attr_pac_result = -1;
-static int hf_pac_attr_pac_type = -1;
-static int hf_pac_attr_val = -1;
+static int hf_teap_tlv_mandatory;
+static int hf_teap_tlv_reserved;
+static int hf_teap_tlv_type;
+static int hf_teap_tlv_len;
+static int hf_teap_tlv_val;
+static int hf_teap_auth_id;
+static int hf_teap_identity;
+static int hf_teap_status;
+static int hf_teap_vendor_id;
+static int hf_teap_request_action_status;
+static int hf_teap_request_action_action;
+static int hf_teap_crypto_reserved;
+static int hf_teap_crypto_version;
+static int hf_teap_crypto_rcv_version;
+static int hf_teap_crypto_flags;
+static int hf_teap_crypto_subtype;
+static int hf_teap_crypto_nonce;
+static int hf_teap_crypto_emsk;
+static int hf_teap_crypto_msk;
+static int hf_teap_nak_type;
+static int hf_teap_error_code;
+static int hf_teap_prompt;
+static int hf_teap_user_len;
+static int hf_teap_username;
+static int hf_teap_pass_len;
+static int hf_teap_password;
+
+static int hf_pac_attr_type;
+static int hf_pac_attr_pac_key;
+static int hf_pac_attr_pac_opaque;
+static int hf_pac_attr_pac_lifetime;
+static int hf_pac_attr_pac_a_id;
+static int hf_pac_attr_pac_i_id;
+static int hf_pac_attr_pac_reserved;
+static int hf_pac_attr_pac_a_id_info;
+static int hf_pac_attr_pac_result;
+static int hf_pac_attr_pac_type;
+static int hf_pac_attr_val;
 
 static int
 dissect_teap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_);
diff --git a/epan/dissectors/packet-tecmp.c b/epan/dissectors/packet-tecmp.c
index 0a11438ad2..91e9d61247 100644
--- a/epan/dissectors/packet-tecmp.c
+++ b/epan/dissectors/packet-tecmp.c
@@ -40,8 +40,8 @@ void proto_reg_handoff_tecmp_payload(void);
 
 static dissector_handle_t tecmp_handle;
 
-static int proto_tecmp = -1;
-static int proto_tecmp_payload = -1;
+static int proto_tecmp;
+static int proto_tecmp_payload;
 
 static dissector_handle_t eth_handle;
 static int proto_vlan;
@@ -57,98 +57,98 @@ static dissector_handle_t text_lines_handle;
 
 /* Header fields */
 /* TECMP */
-static int hf_tecmp_device_id = -1;
-static int hf_tecmp_counter = -1;
-static int hf_tecmp_version = -1;
-static int hf_tecmp_msgtype = -1;
-static int hf_tecmp_data_type = -1;
-static int hf_tecmp_res = -1;
-
-static int hf_tecmp_flags = -1;
-static int hf_tecmp_flags_eos = -1;
-static int hf_tecmp_flags_sos = -1;
-static int hf_tecmp_flags_spy = -1;
-static int hf_tecmp_flags_multi_frame = -1;
-static int hf_tecmp_flags_dev_overflow = -1;
+static int hf_tecmp_device_id;
+static int hf_tecmp_counter;
+static int hf_tecmp_version;
+static int hf_tecmp_msgtype;
+static int hf_tecmp_data_type;
+static int hf_tecmp_res;
+
+static int hf_tecmp_flags;
+static int hf_tecmp_flags_eos;
+static int hf_tecmp_flags_sos;
+static int hf_tecmp_flags_spy;
+static int hf_tecmp_flags_multi_frame;
+static int hf_tecmp_flags_dev_overflow;
 
 /* TECMP Payload */
-static int hf_tecmp_payload_interface_id = -1;
-static int hf_tecmp_payload_interface_name = -1;
-static int hf_tecmp_payload_timestamp = -1;
-static int hf_tecmp_payload_timestamp_ns = -1;
-static int hf_tecmp_payload_timestamp_async = -1;
-static int hf_tecmp_payload_timestamp_res = -1;
-static int hf_tecmp_payload_length = -1;
-static int hf_tecmp_payload_data = -1;
-static int hf_tecmp_payload_data_length = -1;
+static int hf_tecmp_payload_interface_id;
+static int hf_tecmp_payload_interface_name;
+static int hf_tecmp_payload_timestamp;
+static int hf_tecmp_payload_timestamp_ns;
+static int hf_tecmp_payload_timestamp_async;
+static int hf_tecmp_payload_timestamp_res;
+static int hf_tecmp_payload_length;
+static int hf_tecmp_payload_data;
+static int hf_tecmp_payload_data_length;
 
 /* TECMP Payload flags */
 /* Generic */
-static int hf_tecmp_payload_data_flags = -1;
-static int hf_tecmp_payload_data_flags_crc = -1;
-static int hf_tecmp_payload_data_flags_checksum = -1;
-static int hf_tecmp_payload_data_flags_tx = -1;
-static int hf_tecmp_payload_data_flags_overflow = -1;
+static int hf_tecmp_payload_data_flags;
+static int hf_tecmp_payload_data_flags_crc;
+static int hf_tecmp_payload_data_flags_checksum;
+static int hf_tecmp_payload_data_flags_tx;
+static int hf_tecmp_payload_data_flags_overflow;
 
 /* ILaS*/
-static int hf_tecmp_payload_data_flags_crc_enabled = -1;
-static int hf_tecmp_payload_data_flags_direction = -1;
+static int hf_tecmp_payload_data_flags_crc_enabled;
+static int hf_tecmp_payload_data_flags_direction;
 
 /* Ethernet 10BASE-T1S */
-static int hf_tecmp_payload_data_flags_phy_event_error = -1;
+static int hf_tecmp_payload_data_flags_phy_event_error;
 
 /* LIN */
-static int hf_tecmp_payload_data_flags_coll = -1;
-static int hf_tecmp_payload_data_flags_parity = -1;
-static int hf_tecmp_payload_data_flags_no_resp = -1;
-static int hf_tecmp_payload_data_flags_wup = -1;
-static int hf_tecmp_payload_data_flags_short_wup = -1;
-static int hf_tecmp_payload_data_flags_sleep = -1;
+static int hf_tecmp_payload_data_flags_coll;
+static int hf_tecmp_payload_data_flags_parity;
+static int hf_tecmp_payload_data_flags_no_resp;
+static int hf_tecmp_payload_data_flags_wup;
+static int hf_tecmp_payload_data_flags_short_wup;
+static int hf_tecmp_payload_data_flags_sleep;
 
 /* CAN and CAN-FD DATA */
-static int hf_tecmp_payload_data_flags_ack = -1;
-static int hf_tecmp_payload_data_flags_rtr = -1;  /* CAN DATA only */
-static int hf_tecmp_payload_data_flags_esi = -1;  /* CAN-FD DATA only */
-static int hf_tecmp_payload_data_flags_ide = -1;
-static int hf_tecmp_payload_data_flags_err = -1;
-static int hf_tecmp_payload_data_flags_brs = -1;  /* CAN-FD DATA only */
-
-static int hf_tecmp_payload_data_flags_can_bit_stuff_err = -1;
-static int hf_tecmp_payload_data_flags_can_crc_del_err = -1;
-static int hf_tecmp_payload_data_flags_can_ack_del_err = -1;
-static int hf_tecmp_payload_data_flags_can_eof_err = -1;
-static int hf_tecmp_payload_data_flags_canfd_bit_stuff_err = -1;
-static int hf_tecmp_payload_data_flags_canfd_crc_del_err = -1;
-static int hf_tecmp_payload_data_flags_canfd_ack_del_err = -1;
-static int hf_tecmp_payload_data_flags_canfd_eof_err = -1;
+static int hf_tecmp_payload_data_flags_ack;
+static int hf_tecmp_payload_data_flags_rtr;  /* CAN DATA only */
+static int hf_tecmp_payload_data_flags_esi;  /* CAN-FD DATA only */
+static int hf_tecmp_payload_data_flags_ide;
+static int hf_tecmp_payload_data_flags_err;
+static int hf_tecmp_payload_data_flags_brs;  /* CAN-FD DATA only */
+
+static int hf_tecmp_payload_data_flags_can_bit_stuff_err;
+static int hf_tecmp_payload_data_flags_can_crc_del_err;
+static int hf_tecmp_payload_data_flags_can_ack_del_err;
+static int hf_tecmp_payload_data_flags_can_eof_err;
+static int hf_tecmp_payload_data_flags_canfd_bit_stuff_err;
+static int hf_tecmp_payload_data_flags_canfd_crc_del_err;
+static int hf_tecmp_payload_data_flags_canfd_ack_del_err;
+static int hf_tecmp_payload_data_flags_canfd_eof_err;
 
 /* FlexRay */
-static int hf_tecmp_payload_data_flags_nf = -1;
-static int hf_tecmp_payload_data_flags_sf = -1;
-static int hf_tecmp_payload_data_flags_sync = -1;
-static int hf_tecmp_payload_data_flags_wus = -1;
-static int hf_tecmp_payload_data_flags_ppi = -1;
-static int hf_tecmp_payload_data_flags_cas = -1;
-static int hf_tecmp_payload_data_flags_header_crc_err = -1;
-static int hf_tecmp_payload_data_flags_frame_crc_err = -1;
+static int hf_tecmp_payload_data_flags_nf;
+static int hf_tecmp_payload_data_flags_sf;
+static int hf_tecmp_payload_data_flags_sync;
+static int hf_tecmp_payload_data_flags_wus;
+static int hf_tecmp_payload_data_flags_ppi;
+static int hf_tecmp_payload_data_flags_cas;
+static int hf_tecmp_payload_data_flags_header_crc_err;
+static int hf_tecmp_payload_data_flags_frame_crc_err;
 
 /* UART/RS232 ASCII*/
-static int hf_tecmp_payload_data_flags_dl = -1;
-static int hf_tecmp_payload_data_flags_parity_error = -1;
+static int hf_tecmp_payload_data_flags_dl;
+static int hf_tecmp_payload_data_flags_parity_error;
 
 /* Analog */
-static int hf_tecmp_payload_data_flags_sample_time = -1;
-static int hf_tecmp_payload_data_flags_factor = -1;
-static int hf_tecmp_payload_data_flags_unit = -1;
-static int hf_tecmp_payload_data_flags_threshold_u = -1;
-static int hf_tecmp_payload_data_flags_threshold_o = -1;
+static int hf_tecmp_payload_data_flags_sample_time;
+static int hf_tecmp_payload_data_flags_factor;
+static int hf_tecmp_payload_data_flags_unit;
+static int hf_tecmp_payload_data_flags_threshold_u;
+static int hf_tecmp_payload_data_flags_threshold_o;
 
 /* Special TX Data Flags */
-static int hf_tecmp_payload_data_flags_use_crc_value = -1;
-static int hf_tecmp_payload_data_flags_use_header_crc_value = -1;
-static int hf_tecmp_payload_data_flags_use_checksum_value = -1;
-static int hf_tecmp_payload_data_flags_use_parity_bits = -1;
-static int hf_tecmp_payload_data_flags_tx_mode = -1;
+static int hf_tecmp_payload_data_flags_use_crc_value;
+static int hf_tecmp_payload_data_flags_use_header_crc_value;
+static int hf_tecmp_payload_data_flags_use_checksum_value;
+static int hf_tecmp_payload_data_flags_use_parity_bits;
+static int hf_tecmp_payload_data_flags_tx_mode;
 
 static const unit_name_string tecmp_units_amp_hour = { "Ah", NULL };
 
@@ -159,166 +159,166 @@ static const unit_name_string tecmp_units_amp_hour = { "Ah", NULL };
 
 /* TECMP Payload Fields */
 /* Ethernet 10BASE-T1S */
-static int hf_tecmp_payload_data_beacon_timestamp = -1;
-static int hf_tecmp_payload_data_beacon_timestamp_ns = -1;
-static int hf_tecmp_payload_data_beacon_to_timestamp_ns = -1;
+static int hf_tecmp_payload_data_beacon_timestamp;
+static int hf_tecmp_payload_data_beacon_timestamp_ns;
+static int hf_tecmp_payload_data_beacon_to_timestamp_ns;
 
 /* LIN */
-static int hf_tecmp_payload_data_id_field_8bit = -1;
-static int hf_tecmp_payload_data_id_field_6bit = -1;
-static int hf_tecmp_payload_data_parity_bits = -1;
-static int hf_tecmp_payload_data_checksum_8bit = -1;
+static int hf_tecmp_payload_data_id_field_8bit;
+static int hf_tecmp_payload_data_id_field_6bit;
+static int hf_tecmp_payload_data_parity_bits;
+static int hf_tecmp_payload_data_checksum_8bit;
 
 /* CAN DATA / CAN-FD DATA */
-static int hf_tecmp_payload_data_id_field_32bit = -1;
-static int hf_tecmp_payload_data_id_type = -1;
-static int hf_tecmp_payload_data_id_11 = -1;
-static int hf_tecmp_payload_data_id_29 = -1;
-static int hf_tecmp_payload_data_crc15 = -1;
-static int hf_tecmp_payload_data_crc17 = -1;
-static int hf_tecmp_payload_data_crc21 = -1;
+static int hf_tecmp_payload_data_id_field_32bit;
+static int hf_tecmp_payload_data_id_type;
+static int hf_tecmp_payload_data_id_11;
+static int hf_tecmp_payload_data_id_29;
+static int hf_tecmp_payload_data_crc15;
+static int hf_tecmp_payload_data_crc17;
+static int hf_tecmp_payload_data_crc21;
 
 /* FlexRay DATA */
-static int hf_tecmp_payload_data_cycle = -1;
-static int hf_tecmp_payload_data_frame_id = -1;
-static int hf_tecmp_payload_data_header_crc = -1;
-static int hf_tecmp_payload_data_frame_crc = -1;
+static int hf_tecmp_payload_data_cycle;
+static int hf_tecmp_payload_data_frame_id;
+static int hf_tecmp_payload_data_header_crc;
+static int hf_tecmp_payload_data_frame_crc;
 
 /* Analog */
-static int hf_tecmp_payload_data_analog_value_raw = -1;
-static int hf_tecmp_payload_data_analog_value_raw_signed = -1;
-static int hf_tecmp_payload_data_analog_value_volt = -1;
-static int hf_tecmp_payload_data_analog_value_amp = -1;
-static int hf_tecmp_payload_data_analog_value_watt = -1;
-static int hf_tecmp_payload_data_analog_value_amp_hour = -1;
-static int hf_tecmp_payload_data_analog_value_celsius = -1;
+static int hf_tecmp_payload_data_analog_value_raw;
+static int hf_tecmp_payload_data_analog_value_raw_signed;
+static int hf_tecmp_payload_data_analog_value_volt;
+static int hf_tecmp_payload_data_analog_value_amp;
+static int hf_tecmp_payload_data_analog_value_watt;
+static int hf_tecmp_payload_data_analog_value_amp_hour;
+static int hf_tecmp_payload_data_analog_value_celsius;
 
 /* TECMP Status Messsages */
 /* Status Device */
-static int hf_tecmp_payload_status_vendor_id = -1;
-static int hf_tecmp_payload_status_dev_version = -1;
-static int hf_tecmp_payload_status_dev_type = -1;
-static int hf_tecmp_payload_status_res = -1;
-static int hf_tecmp_payload_status_length_vendor_data = -1;
-static int hf_tecmp_payload_status_device_id = -1;
-static int hf_tecmp_payload_status_sn = -1;
-static int hf_tecmp_payload_status_vendor_data = -1;
+static int hf_tecmp_payload_status_vendor_id;
+static int hf_tecmp_payload_status_dev_version;
+static int hf_tecmp_payload_status_dev_type;
+static int hf_tecmp_payload_status_res;
+static int hf_tecmp_payload_status_length_vendor_data;
+static int hf_tecmp_payload_status_device_id;
+static int hf_tecmp_payload_status_sn;
+static int hf_tecmp_payload_status_vendor_data;
 
 /* Status Bus */
-static int hf_tecmp_payload_status_bus_data = -1;
-static int hf_tecmp_payload_status_bus_data_entry = -1;
-static int hf_tecmp_payload_status_bus_interface_id = -1;
-static int hf_tecmp_payload_status_bus_total = -1;
-static int hf_tecmp_payload_status_bus_errors = -1;
+static int hf_tecmp_payload_status_bus_data;
+static int hf_tecmp_payload_status_bus_data_entry;
+static int hf_tecmp_payload_status_bus_interface_id;
+static int hf_tecmp_payload_status_bus_total;
+static int hf_tecmp_payload_status_bus_errors;
 
 /* Status Device Vendor Data Technica Engineering */
-static int hf_tecmp_payload_status_dev_vendor_technica_res = -1;
-static int hf_tecmp_payload_status_dev_vendor_technica_sw = -1;
-static int hf_tecmp_payload_status_dev_vendor_technica_hw = -1;
-static int hf_tecmp_payload_status_dev_vendor_technica_buffer_fill_level = -1;
-static int hf_tecmp_payload_status_dev_vendor_technica_buffer_overflow = -1;
-static int hf_tecmp_payload_status_dev_vendor_technica_buffer_size = -1;
-static int hf_tecmp_payload_status_dev_vendor_technica_lifecycle = -1;
-static int hf_tecmp_payload_status_dev_vendor_technica_lifecycle_start = -1;
-static int hf_tecmp_payload_status_dev_vendor_technica_voltage = -1;
-static int hf_tecmp_payload_status_dev_vendor_technica_temperature = -1;
-static int hf_tecmp_payload_status_dev_vendor_technica_temperature_chassis = -1;
-static int hf_tecmp_payload_status_dev_vendor_technica_temperature_silicon = -1;
+static int hf_tecmp_payload_status_dev_vendor_technica_res;
+static int hf_tecmp_payload_status_dev_vendor_technica_sw;
+static int hf_tecmp_payload_status_dev_vendor_technica_hw;
+static int hf_tecmp_payload_status_dev_vendor_technica_buffer_fill_level;
+static int hf_tecmp_payload_status_dev_vendor_technica_buffer_overflow;
+static int hf_tecmp_payload_status_dev_vendor_technica_buffer_size;
+static int hf_tecmp_payload_status_dev_vendor_technica_lifecycle;
+static int hf_tecmp_payload_status_dev_vendor_technica_lifecycle_start;
+static int hf_tecmp_payload_status_dev_vendor_technica_voltage;
+static int hf_tecmp_payload_status_dev_vendor_technica_temperature;
+static int hf_tecmp_payload_status_dev_vendor_technica_temperature_chassis;
+static int hf_tecmp_payload_status_dev_vendor_technica_temperature_silicon;
 
 #define VENDOR_TECHNICA_TEMP_MAX 127
 #define VENDOR_TECHNICA_TEMP_NA  -128
 
 /* Status Bus Vendor Data Technica Engineering */
-static int hf_tecmp_payload_status_bus_vendor_technica_link_status = -1;
-static int hf_tecmp_payload_status_bus_vendor_technica_link_quality = -1;
-static int hf_tecmp_payload_status_bus_vendor_technica_linkup_time = -1;
-
-static int hf_tecmp_payload_status_bus_vendor_technica_10m_flags = -1;
-static int hf_tecmp_payload_status_bus_vendor_technica_10m_flags_beacons_received = -1;
-static int hf_tecmp_payload_status_bus_vendor_technica_10m_flags_plca_enabled = -1;
-static int hf_tecmp_payload_status_bus_vendor_technica_res0 = -1;
-static int hf_tecmp_payload_status_bus_vendor_technica_beacon_counter = -1;
-static int hf_tecmp_payload_status_bus_vendor_technica_res1 = -1;
-static int hf_tecmp_payload_status_bus_vendor_technica_res2 = -1;
-static int hf_tecmp_payload_status_bus_vendor_technica_5b_decode_err_cnt = -1;
-static int hf_tecmp_payload_status_bus_vendor_technica_eos_delim_err_cnt = -1;
-static int hf_tecmp_payload_status_bus_vendor_technica_plca_symbols_detected_cnt = -1;
-static int hf_tecmp_payload_status_bus_vendor_technica_plca_symbols_missing_cnt = -1;
-static int hf_tecmp_payload_status_bus_vendor_technica_plca_symbols_empty_cycle_cnt = -1;
+static int hf_tecmp_payload_status_bus_vendor_technica_link_status;
+static int hf_tecmp_payload_status_bus_vendor_technica_link_quality;
+static int hf_tecmp_payload_status_bus_vendor_technica_linkup_time;
+
+static int hf_tecmp_payload_status_bus_vendor_technica_10m_flags;
+static int hf_tecmp_payload_status_bus_vendor_technica_10m_flags_beacons_received;
+static int hf_tecmp_payload_status_bus_vendor_technica_10m_flags_plca_enabled;
+static int hf_tecmp_payload_status_bus_vendor_technica_res0;
+static int hf_tecmp_payload_status_bus_vendor_technica_beacon_counter;
+static int hf_tecmp_payload_status_bus_vendor_technica_res1;
+static int hf_tecmp_payload_status_bus_vendor_technica_res2;
+static int hf_tecmp_payload_status_bus_vendor_technica_5b_decode_err_cnt;
+static int hf_tecmp_payload_status_bus_vendor_technica_eos_delim_err_cnt;
+static int hf_tecmp_payload_status_bus_vendor_technica_plca_symbols_detected_cnt;
+static int hf_tecmp_payload_status_bus_vendor_technica_plca_symbols_missing_cnt;
+static int hf_tecmp_payload_status_bus_vendor_technica_plca_symbols_empty_cycle_cnt;
 
 
 /* Status Configuration Data Technica Engineering */
-static int hf_tecmp_payload_status_cfg_vendor_technica_version = -1;
-static int hf_tecmp_payload_status_cfg_vendor_technica_reserved = -1;
-static int hf_tecmp_payload_status_cfg_vendor_technica_msg_id = -1;
-static int hf_tecmp_payload_status_cfg_vendor_technica_total_length = -1;
-static int hf_tecmp_payload_status_cfg_vendor_technica_total_num_seg = -1;
-static int hf_tecmp_payload_status_cfg_vendor_technica_segment_num = -1;
-static int hf_tecmp_payload_status_cfg_vendor_technica_segment_length = -1;
-static int hf_tecmp_payload_status_cfg_vendor_technica_segment_data = -1;
+static int hf_tecmp_payload_status_cfg_vendor_technica_version;
+static int hf_tecmp_payload_status_cfg_vendor_technica_reserved;
+static int hf_tecmp_payload_status_cfg_vendor_technica_msg_id;
+static int hf_tecmp_payload_status_cfg_vendor_technica_total_length;
+static int hf_tecmp_payload_status_cfg_vendor_technica_total_num_seg;
+static int hf_tecmp_payload_status_cfg_vendor_technica_segment_num;
+static int hf_tecmp_payload_status_cfg_vendor_technica_segment_length;
+static int hf_tecmp_payload_status_cfg_vendor_technica_segment_data;
 
 /* TECMP Control Message */
-static int hf_tecmp_payload_ctrl_msg_device_id = -1;
-static int hf_tecmp_payload_ctrl_msg_id = -1;
-static int hf_tecmp_payload_ctrl_msg_unparsed_bytes = -1;
-static int hf_tecmp_payload_ctrl_msg_can_replay_fill_level_fill_level = -1;
-static int hf_tecmp_payload_ctrl_msg_can_replay_fill_level_buffer_overflow = -1;
-static int hf_tecmp_payload_ctrl_msg_can_replay_fill_level_queue_size = -1;
-static int hf_tecmp_payload_ctrl_msg_can_replay_fill_level_queue_length = -1;
-static int hf_tecmp_payload_ctrl_msg_flexray_poc_interface_id = -1;
-static int hf_tecmp_payload_ctrl_msg_flexray_poc_state = -1;
-static int hf_tecmp_payload_ctrl_msg_10baset1s_interface_id = -1;
-static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_flags = -1;
-static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_flags_beacons_received = -1;
-static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_flags_plca_enabled = -1;
-static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_reserved = -1;
-static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_events = -1;
-static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_events_5b_decode_error = -1;
-static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_events_eos_delim_error = -1;
-static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_events_plca_symb_detected = -1;
-static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_events_plca_symb_missing = -1;
-static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_events_plca_empty_cycle = -1;
+static int hf_tecmp_payload_ctrl_msg_device_id;
+static int hf_tecmp_payload_ctrl_msg_id;
+static int hf_tecmp_payload_ctrl_msg_unparsed_bytes;
+static int hf_tecmp_payload_ctrl_msg_can_replay_fill_level_fill_level;
+static int hf_tecmp_payload_ctrl_msg_can_replay_fill_level_buffer_overflow;
+static int hf_tecmp_payload_ctrl_msg_can_replay_fill_level_queue_size;
+static int hf_tecmp_payload_ctrl_msg_can_replay_fill_level_queue_length;
+static int hf_tecmp_payload_ctrl_msg_flexray_poc_interface_id;
+static int hf_tecmp_payload_ctrl_msg_flexray_poc_state;
+static int hf_tecmp_payload_ctrl_msg_10baset1s_interface_id;
+static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_flags;
+static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_flags_beacons_received;
+static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_flags_plca_enabled;
+static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_reserved;
+static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_events;
+static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_events_5b_decode_error;
+static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_events_eos_delim_error;
+static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_events_plca_symb_detected;
+static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_events_plca_symb_missing;
+static int hf_tecmp_payload_ctrl_msg_10baset1s_10m_events_plca_empty_cycle;
 
 /* Counter Event */
-static int hf_tecmp_payload_counter_event_device_id = -1;
-static int hf_tecmp_payload_counter_event_interface_id = -1;
-static int hf_tecmp_payload_counter_event_counter_last = -1;
-static int hf_tecmp_payload_counter_event_counter_cur = -1;
+static int hf_tecmp_payload_counter_event_device_id;
+static int hf_tecmp_payload_counter_event_interface_id;
+static int hf_tecmp_payload_counter_event_counter_last;
+static int hf_tecmp_payload_counter_event_counter_cur;
 
 /* TimeSync Event */
-static int hf_tecmp_payload_timesync_event_device_id = -1;
-static int hf_tecmp_payload_timesync_event_interface_id = -1;
-static int hf_tecmp_payload_timesync_event_reserved = -1;
-static int hf_tecmp_payload_timesync_event_async = -1;
-static int hf_tecmp_payload_timesync_event_time_delta = -1;
+static int hf_tecmp_payload_timesync_event_device_id;
+static int hf_tecmp_payload_timesync_event_interface_id;
+static int hf_tecmp_payload_timesync_event_reserved;
+static int hf_tecmp_payload_timesync_event_async;
+static int hf_tecmp_payload_timesync_event_time_delta;
 
 
 /* protocol tree items */
-static gint ett_tecmp = -1;
-static gint ett_tecmp_flags = -1;
-
-static gint ett_tecmp_payload = -1;
-static gint ett_tecmp_payload_interface_id = -1;
-static gint ett_tecmp_payload_data = -1;
-static gint ett_tecmp_payload_timestamp = -1;
-static gint ett_tecmp_payload_dataflags = -1;
-static gint ett_tecmp_payload_instruction_address = -1;
-static gint ett_tecmp_payload_data_id = -1;
-static gint ett_tecmp_payload_lin_id = -1;
-static gint ett_tecmp_status_bus_data = -1;
-static gint ett_tecmp_status_bus_data_entry = -1;
-static gint ett_tecmp_status_dev_vendor_data = -1;
-static gint ett_tecmp_status_bus_vendor_data = -1;
-static gint ett_tecmp_status_bus_vendor_data_flags = -1;
-static gint ett_tecmp_ctrl_message_10baset1s_flags = -1;
-static gint ett_tecmp_ctrl_message_10baset1s_events_errors = -1;
+static gint ett_tecmp;
+static gint ett_tecmp_flags;
+
+static gint ett_tecmp_payload;
+static gint ett_tecmp_payload_interface_id;
+static gint ett_tecmp_payload_data;
+static gint ett_tecmp_payload_timestamp;
+static gint ett_tecmp_payload_dataflags;
+static gint ett_tecmp_payload_instruction_address;
+static gint ett_tecmp_payload_data_id;
+static gint ett_tecmp_payload_lin_id;
+static gint ett_tecmp_status_bus_data;
+static gint ett_tecmp_status_bus_data_entry;
+static gint ett_tecmp_status_dev_vendor_data;
+static gint ett_tecmp_status_bus_vendor_data;
+static gint ett_tecmp_status_bus_vendor_data_flags;
+static gint ett_tecmp_ctrl_message_10baset1s_flags;
+static gint ett_tecmp_ctrl_message_10baset1s_events_errors;
 
 /* dissector handle to hand off to ASAM CMP (successor protocol) */
 static dissector_handle_t asam_cmp_handle;
 
 /*** expert info items ***/
-static expert_field ei_tecmp_payload_length_mismatch = EI_INIT;
-static expert_field ei_tecmp_payload_header_crc_overflow = EI_INIT;
+static expert_field ei_tecmp_payload_length_mismatch;
+static expert_field ei_tecmp_payload_header_crc_overflow;
 
 /* TECMP Type Names */
 
diff --git a/epan/dissectors/packet-teklink.c b/epan/dissectors/packet-teklink.c
index 81ea9ef471..69081fa81f 100644
--- a/epan/dissectors/packet-teklink.c
+++ b/epan/dissectors/packet-teklink.c
@@ -18,28 +18,28 @@
 void proto_reg_handoff_teklink(void);
 void proto_register_teklink(void);
 
-static int proto_teklink = -1;
-static int hf_teklink_procedure = -1;
-static int hf_teklink_unknown_long = -1;
-static int hf_teklink_unknown_string = -1;
-static int hf_teklink_cmd = -1;
-static int hf_teklink_user = -1;
-static int hf_teklink_host = -1;
-static int hf_teklink_location = -1;
-static int hf_teklink_tla_type = -1;
-static int hf_teklink_locked = -1;
-static int hf_teklink_vtc_srcnames = -1;
-static int hf_teklink_vtc_dstnames = -1;
-static int hf_teklink_vtc_sigpol = -1;
-static int hf_teklink_vtc_sigen = -1;
-static int hf_teklink_vtc_clksource = -1;
-static int hf_teklink_vtc_clkmode = -1;
-static int hf_teklink_vtc_clkedge = -1;
-static int hf_teklink_vtc_mode = -1;
-static int hf_teklink_vtc_edge = -1;
-static int hf_teklink_vtc_sigfeedback = -1;
-
-static gint ett_teklink = -1;
+static int proto_teklink;
+static int hf_teklink_procedure;
+static int hf_teklink_unknown_long;
+static int hf_teklink_unknown_string;
+static int hf_teklink_cmd;
+static int hf_teklink_user;
+static int hf_teklink_host;
+static int hf_teklink_location;
+static int hf_teklink_tla_type;
+static int hf_teklink_locked;
+static int hf_teklink_vtc_srcnames;
+static int hf_teklink_vtc_dstnames;
+static int hf_teklink_vtc_sigpol;
+static int hf_teklink_vtc_sigen;
+static int hf_teklink_vtc_clksource;
+static int hf_teklink_vtc_clkmode;
+static int hf_teklink_vtc_clkedge;
+static int hf_teklink_vtc_mode;
+static int hf_teklink_vtc_edge;
+static int hf_teklink_vtc_sigfeedback;
+
+static gint ett_teklink;
 
 static const value_string teklink_vtc_srcnames[] = {
 	{ 0, "VTC_SRC_APPSIG0" },
diff --git a/epan/dissectors/packet-telkonet.c b/epan/dissectors/packet-telkonet.c
index 5d30da4de0..82da3feeb0 100644
--- a/epan/dissectors/packet-telkonet.c
+++ b/epan/dissectors/packet-telkonet.c
@@ -25,10 +25,10 @@
 void proto_reg_handoff_telkonet(void);
 void proto_register_telkonet(void);
 
-static int proto_telkonet = -1;
-static int hf_telkonet_type = -1;
+static int proto_telkonet;
+static int hf_telkonet_type;
 
-static gint ett_telkonet = -1;
+static gint ett_telkonet;
 
 static dissector_handle_t telkonet_handle;
 static dissector_handle_t eth_withoutfcs_handle;
diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c
index cda90c0834..7c6f403d25 100644
--- a/epan/dissectors/packet-telnet.c
+++ b/epan/dissectors/packet-telnet.c
@@ -28,125 +28,125 @@
 void proto_reg_handoff_telnet(void);
 void proto_register_telnet(void);
 
-static int proto_telnet = -1;
-static int hf_telnet_cmd = -1;
-static int hf_telnet_subcmd = -1;
-static int hf_telnet_auth_cmd = -1;
-static int hf_telnet_auth_name = -1;
-static int hf_telnet_auth_type = -1;
-static int hf_telnet_auth_mod_who = -1;
-static int hf_telnet_auth_mod_how = -1;
-static int hf_telnet_auth_mod_cred_fwd = -1;
-static int hf_telnet_auth_mod_enc = -1;
-static int hf_telnet_auth_krb5_type = -1;
-static int hf_telnet_auth_ssl_status = -1;
-static int hf_telnet_auth_data = -1;
-
-static int hf_telnet_string_subopt_value = -1;
-static int hf_telnet_naws_subopt_width = -1;
-static int hf_telnet_naws_subopt_height = -1;
-static int hf_telnet_outmark_subopt_cmd = -1;
-static int hf_telnet_outmark_subopt_banner = -1;
-static int hf_telnet_comport_subopt_signature = -1;
-static int hf_telnet_comport_subopt_baud_rate = -1;
-static int hf_telnet_comport_subopt_data_size = -1;
-static int hf_telnet_comport_subopt_parity = -1;
-static int hf_telnet_comport_subopt_stop = -1;
-static int hf_telnet_comport_subopt_control = -1;
-static int hf_telnet_comport_linestate = -1;
-static int hf_telnet_comport_set_linestate_mask = -1;
-static int hf_telnet_comport_modemstate = -1;
-static int hf_telnet_comport_set_modemstate_mask = -1;
-static int hf_telnet_comport_subopt_flow_control_suspend = -1;
-static int hf_telnet_comport_subopt_flow_control_resume = -1;
-static int hf_telnet_comport_subopt_purge = -1;
-static int hf_telnet_rfc_subopt_cmd = -1;
-static int hf_telnet_tabstop = -1;
-
-static int hf_telnet_enc_cmd = -1;
-static int hf_telnet_enc_type = -1;
-static int hf_telnet_enc_type_data = -1;
-static int hf_telnet_enc_key_id = -1;
-
-static int hf_telnet_data = -1;
-static int hf_telnet_option_data = -1;
-static int hf_telnet_subcommand_data = -1;
-
-static int hf_tn3270_subopt = -1;
-static int hf_tn3270_connect = -1;
-static int hf_tn3270_is = -1;
-static int hf_tn3270_request_string = -1;
-static int hf_tn3270_reason = -1;
-static int hf_tn3270_request = -1;
-static int hf_tn3270_regime_subopt_value = -1;
-static int hf_tn3270_regime_cmd = -1;
-
-static int hf_telnet_starttls = -1;
-
-static int hf_telnet_vmware_cmd = -1;
-static int hf_telnet_vmware_known_suboption_code = -1;
-static int hf_telnet_vmware_unknown_subopt_code = -1;
-static int hf_telnet_vmware_vmotion_sequence = -1;
-static int hf_telnet_vmware_proxy_direction = -1;
-static int hf_telnet_vmware_proxy_serviceUri = -1;
-static int hf_telnet_vmware_vm_vc_uuid = -1;
-static int hf_telnet_vmware_vm_bios_uuid = -1;
-static int hf_telnet_vmware_vm_location_uuid = -1;
-static int hf_telnet_vmware_vm_name = -1;
-
-static gint ett_telnet = -1;
-static gint ett_telnet_cmd = -1;
-static gint ett_telnet_subopt = -1;
-static gint ett_status_subopt = -1;
-static gint ett_rcte_subopt = -1;
-static gint ett_olw_subopt = -1;
-static gint ett_ops_subopt = -1;
-static gint ett_crdisp_subopt = -1;
-static gint ett_htstops_subopt = -1;
-static gint ett_htdisp_subopt = -1;
-static gint ett_ffdisp_subopt = -1;
-static gint ett_vtstops_subopt = -1;
-static gint ett_vtdisp_subopt = -1;
-static gint ett_lfdisp_subopt = -1;
-static gint ett_extasc_subopt = -1;
-static gint ett_bytemacro_subopt = -1;
-static gint ett_det_subopt = -1;
-static gint ett_supdupout_subopt = -1;
-static gint ett_sendloc_subopt = -1;
-static gint ett_termtype_subopt = -1;
-static gint ett_tacacsui_subopt = -1;
-static gint ett_outmark_subopt = -1;
-static gint ett_tlocnum_subopt = -1;
-static gint ett_tn3270reg_subopt = -1;
-static gint ett_x3pad_subopt = -1;
-static gint ett_naws_subopt = -1;
-static gint ett_tspeed_subopt = -1;
-static gint ett_rfc_subopt = -1;
-static gint ett_linemode_subopt = -1;
-static gint ett_xdpyloc_subopt = -1;
-static gint ett_env_subopt = -1;
-static gint ett_auth_subopt = -1;
-static gint ett_enc_subopt = -1;
-static gint ett_newenv_subopt = -1;
-static gint ett_tn3270e_subopt = -1;
-static gint ett_xauth_subopt = -1;
-static gint ett_charset_subopt = -1;
-static gint ett_rsp_subopt = -1;
-static gint ett_comport_subopt = -1;
-static gint ett_starttls_subopt = -1;
-
-static expert_field ei_telnet_suboption_length = EI_INIT;
-static expert_field ei_telnet_invalid_subcommand = EI_INIT;
-static expert_field ei_telnet_invalid_linestate = EI_INIT;
-static expert_field ei_telnet_invalid_stop = EI_INIT;
-static expert_field ei_telnet_enc_cmd_unknown = EI_INIT;
-static expert_field ei_telnet_invalid_data_size = EI_INIT;
-static expert_field ei_telnet_invalid_modemstate = EI_INIT;
-static expert_field ei_telnet_invalid_parity = EI_INIT;
-static expert_field ei_telnet_invalid_purge = EI_INIT;
-static expert_field ei_telnet_invalid_baud_rate = EI_INIT;
-static expert_field ei_telnet_invalid_control = EI_INIT;
-static expert_field ei_telnet_vmware_unexp_data = EI_INIT;
+static int proto_telnet;
+static int hf_telnet_cmd;
+static int hf_telnet_subcmd;
+static int hf_telnet_auth_cmd;
+static int hf_telnet_auth_name;
+static int hf_telnet_auth_type;
+static int hf_telnet_auth_mod_who;
+static int hf_telnet_auth_mod_how;
+static int hf_telnet_auth_mod_cred_fwd;
+static int hf_telnet_auth_mod_enc;
+static int hf_telnet_auth_krb5_type;
+static int hf_telnet_auth_ssl_status;
+static int hf_telnet_auth_data;
+
+static int hf_telnet_string_subopt_value;
+static int hf_telnet_naws_subopt_width;
+static int hf_telnet_naws_subopt_height;
+static int hf_telnet_outmark_subopt_cmd;
+static int hf_telnet_outmark_subopt_banner;
+static int hf_telnet_comport_subopt_signature;
+static int hf_telnet_comport_subopt_baud_rate;
+static int hf_telnet_comport_subopt_data_size;
+static int hf_telnet_comport_subopt_parity;
+static int hf_telnet_comport_subopt_stop;
+static int hf_telnet_comport_subopt_control;
+static int hf_telnet_comport_linestate;
+static int hf_telnet_comport_set_linestate_mask;
+static int hf_telnet_comport_modemstate;
+static int hf_telnet_comport_set_modemstate_mask;
+static int hf_telnet_comport_subopt_flow_control_suspend;
+static int hf_telnet_comport_subopt_flow_control_resume;
+static int hf_telnet_comport_subopt_purge;
+static int hf_telnet_rfc_subopt_cmd;
+static int hf_telnet_tabstop;
+
+static int hf_telnet_enc_cmd;
+static int hf_telnet_enc_type;
+static int hf_telnet_enc_type_data;
+static int hf_telnet_enc_key_id;
+
+static int hf_telnet_data;
+static int hf_telnet_option_data;
+static int hf_telnet_subcommand_data;
+
+static int hf_tn3270_subopt;
+static int hf_tn3270_connect;
+static int hf_tn3270_is;
+static int hf_tn3270_request_string;
+static int hf_tn3270_reason;
+static int hf_tn3270_request;
+static int hf_tn3270_regime_subopt_value;
+static int hf_tn3270_regime_cmd;
+
+static int hf_telnet_starttls;
+
+static int hf_telnet_vmware_cmd;
+static int hf_telnet_vmware_known_suboption_code;
+static int hf_telnet_vmware_unknown_subopt_code;
+static int hf_telnet_vmware_vmotion_sequence;
+static int hf_telnet_vmware_proxy_direction;
+static int hf_telnet_vmware_proxy_serviceUri;
+static int hf_telnet_vmware_vm_vc_uuid;
+static int hf_telnet_vmware_vm_bios_uuid;
+static int hf_telnet_vmware_vm_location_uuid;
+static int hf_telnet_vmware_vm_name;
+
+static gint ett_telnet;
+static gint ett_telnet_cmd;
+static gint ett_telnet_subopt;
+static gint ett_status_subopt;
+static gint ett_rcte_subopt;
+static gint ett_olw_subopt;
+static gint ett_ops_subopt;
+static gint ett_crdisp_subopt;
+static gint ett_htstops_subopt;
+static gint ett_htdisp_subopt;
+static gint ett_ffdisp_subopt;
+static gint ett_vtstops_subopt;
+static gint ett_vtdisp_subopt;
+static gint ett_lfdisp_subopt;
+static gint ett_extasc_subopt;
+static gint ett_bytemacro_subopt;
+static gint ett_det_subopt;
+static gint ett_supdupout_subopt;
+static gint ett_sendloc_subopt;
+static gint ett_termtype_subopt;
+static gint ett_tacacsui_subopt;
+static gint ett_outmark_subopt;
+static gint ett_tlocnum_subopt;
+static gint ett_tn3270reg_subopt;
+static gint ett_x3pad_subopt;
+static gint ett_naws_subopt;
+static gint ett_tspeed_subopt;
+static gint ett_rfc_subopt;
+static gint ett_linemode_subopt;
+static gint ett_xdpyloc_subopt;
+static gint ett_env_subopt;
+static gint ett_auth_subopt;
+static gint ett_enc_subopt;
+static gint ett_newenv_subopt;
+static gint ett_tn3270e_subopt;
+static gint ett_xauth_subopt;
+static gint ett_charset_subopt;
+static gint ett_rsp_subopt;
+static gint ett_comport_subopt;
+static gint ett_starttls_subopt;
+
+static expert_field ei_telnet_suboption_length;
+static expert_field ei_telnet_invalid_subcommand;
+static expert_field ei_telnet_invalid_linestate;
+static expert_field ei_telnet_invalid_stop;
+static expert_field ei_telnet_enc_cmd_unknown;
+static expert_field ei_telnet_invalid_data_size;
+static expert_field ei_telnet_invalid_modemstate;
+static expert_field ei_telnet_invalid_parity;
+static expert_field ei_telnet_invalid_purge;
+static expert_field ei_telnet_invalid_baud_rate;
+static expert_field ei_telnet_invalid_control;
+static expert_field ei_telnet_vmware_unexp_data;
 
 static dissector_handle_t telnet_handle;
 
diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c
index 3598c0f8de..8637f1e26a 100644
--- a/epan/dissectors/packet-teredo.c
+++ b/epan/dissectors/packet-teredo.c
@@ -27,22 +27,22 @@ void proto_register_teredo(void);
 
 static int teredo_tap = -1;
 
-static int proto_teredo = -1;
-
-static int hf_teredo_auth = -1;
-static int hf_teredo_auth_idlen = -1;
-static int hf_teredo_auth_aulen = -1;
-static int hf_teredo_auth_id = -1;
-static int hf_teredo_auth_value = -1;
-static int hf_teredo_auth_nonce = -1;
-static int hf_teredo_auth_conf = -1;
-static int hf_teredo_orig = -1;
-static int hf_teredo_orig_port = -1;
-static int hf_teredo_orig_addr = -1;
-
-static gint ett_teredo = -1;
-static gint ett_teredo_auth = -1;
-static gint ett_teredo_orig = -1;
+static int proto_teredo;
+
+static int hf_teredo_auth;
+static int hf_teredo_auth_idlen;
+static int hf_teredo_auth_aulen;
+static int hf_teredo_auth_id;
+static int hf_teredo_auth_value;
+static int hf_teredo_auth_nonce;
+static int hf_teredo_auth_conf;
+static int hf_teredo_orig;
+static int hf_teredo_orig_port;
+static int hf_teredo_orig_addr;
+
+static gint ett_teredo;
+static gint ett_teredo_auth;
+static gint ett_teredo_orig;
 
 typedef struct {
 	guint16 th_indtyp;
diff --git a/epan/dissectors/packet-text-media.c b/epan/dissectors/packet-text-media.c
index 1a40eb998f..4179de923d 100644
--- a/epan/dissectors/packet-text-media.c
+++ b/epan/dissectors/packet-text-media.c
@@ -33,10 +33,10 @@ void proto_register_text_lines(void);
 void proto_reg_handoff_text_lines(void);
 
 /* Filterable header fields */
-static gint proto_text_lines = -1;
+static gint proto_text_lines;
 
 /* Subtrees */
-static gint ett_text_lines = -1;
+static gint ett_text_lines;
 
 /* Dissector handles */
 static dissector_handle_t xml_handle;
diff --git a/epan/dissectors/packet-tfp.c b/epan/dissectors/packet-tfp.c
index 19af67a4ee..bc5eec4710 100644
--- a/epan/dissectors/packet-tfp.c
+++ b/epan/dissectors/packet-tfp.c
@@ -29,21 +29,21 @@ void proto_register_tfp(void);
 static dissector_handle_t tfp_handle_tcp;
 
 /* variables for creating the tree */
-static gint proto_tfp = -1;
-static gint ett_tfp = -1;
+static gint proto_tfp;
+static gint ett_tfp;
 
 /* header field variables */
-static gint hf_tfp_uid = -1;
-static gint hf_tfp_uid_numeric = -1;
-static gint hf_tfp_len = -1;
-static gint hf_tfp_fid = -1;
-static gint hf_tfp_seq = -1;
-static gint hf_tfp_r = -1;
-static gint hf_tfp_a = -1;
-static gint hf_tfp_oo = -1;
-static gint hf_tfp_e = -1;
-static gint hf_tfp_future_use = -1;
-static gint hf_tfp_payload = -1;
+static gint hf_tfp_uid;
+static gint hf_tfp_uid_numeric;
+static gint hf_tfp_len;
+static gint hf_tfp_fid;
+static gint hf_tfp_seq;
+static gint hf_tfp_r;
+static gint hf_tfp_a;
+static gint hf_tfp_oo;
+static gint hf_tfp_e;
+static gint hf_tfp_future_use;
+static gint hf_tfp_payload;
 
 /* bit and byte offsets for dissection */
 static const gint byte_offset_len	   = 4;
diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c
index e543ea88da..41950f3a17 100644
--- a/epan/dissectors/packet-tftp.c
+++ b/epan/dissectors/packet-tftp.c
@@ -81,46 +81,46 @@ typedef struct _tftp_conv_info_t {
 } tftp_conv_info_t;
 
 
-static int proto_tftp = -1;
-static int hf_tftp_opcode = -1;
-static int hf_tftp_source_file = -1;
-static int hf_tftp_destination_file = -1;
-static int hf_tftp_request_frame = -1;
-static int hf_tftp_transfer_type = -1;
-static int hf_tftp_blocknum = -1;
-static int hf_tftp_full_blocknum = -1;
-static int hf_tftp_nextwindowsize = -1;
-static int hf_tftp_error_code = -1;
-static int hf_tftp_error_string = -1;
-static int hf_tftp_option_name = -1;
-static int hf_tftp_option_value = -1;
-static int hf_tftp_data = -1;
-
-static int hf_tftp_fragments = -1;
-static int hf_tftp_fragment = -1;
-static int hf_tftp_fragment_overlap = -1;
-static int hf_tftp_fragment_overlap_conflicts = -1;
-static int hf_tftp_fragment_multiple_tails = -1;
-static int hf_tftp_fragment_too_long_fragment = -1;
-static int hf_tftp_fragment_error = -1;
-static int hf_tftp_fragment_count = -1;
-static int hf_tftp_reassembled_in = -1;
-static int hf_tftp_reassembled_length = -1;
-static int hf_tftp_reassembled_data = -1;
-
-static gint ett_tftp = -1;
-static gint ett_tftp_option = -1;
-
-static gint ett_tftp_fragment = -1;
-static gint ett_tftp_fragments = -1;
-
-static expert_field ei_tftp_error = EI_INIT;
-static expert_field ei_tftp_likely_tsize_probe = EI_INIT;
-static expert_field ei_tftp_blocksize_range = EI_INIT;
-static expert_field ei_tftp_blocknum_will_wrap = EI_INIT;
-static expert_field ei_tftp_windowsize_range = EI_INIT;
-static expert_field ei_tftp_msftwindow_unrecognized = EI_INIT;
-static expert_field ei_tftp_windowsize_change = EI_INIT;
+static int proto_tftp;
+static int hf_tftp_opcode;
+static int hf_tftp_source_file;
+static int hf_tftp_destination_file;
+static int hf_tftp_request_frame;
+static int hf_tftp_transfer_type;
+static int hf_tftp_blocknum;
+static int hf_tftp_full_blocknum;
+static int hf_tftp_nextwindowsize;
+static int hf_tftp_error_code;
+static int hf_tftp_error_string;
+static int hf_tftp_option_name;
+static int hf_tftp_option_value;
+static int hf_tftp_data;
+
+static int hf_tftp_fragments;
+static int hf_tftp_fragment;
+static int hf_tftp_fragment_overlap;
+static int hf_tftp_fragment_overlap_conflicts;
+static int hf_tftp_fragment_multiple_tails;
+static int hf_tftp_fragment_too_long_fragment;
+static int hf_tftp_fragment_error;
+static int hf_tftp_fragment_count;
+static int hf_tftp_reassembled_in;
+static int hf_tftp_reassembled_length;
+static int hf_tftp_reassembled_data;
+
+static gint ett_tftp;
+static gint ett_tftp_option;
+
+static gint ett_tftp_fragment;
+static gint ett_tftp_fragments;
+
+static expert_field ei_tftp_error;
+static expert_field ei_tftp_likely_tsize_probe;
+static expert_field ei_tftp_blocksize_range;
+static expert_field ei_tftp_blocknum_will_wrap;
+static expert_field ei_tftp_windowsize_range;
+static expert_field ei_tftp_msftwindow_unrecognized;
+static expert_field ei_tftp_windowsize_change;
 
 #define LIKELY_TSIZE_PROBE_KEY 0
 #define FULL_BLOCKNUM_KEY 1
diff --git a/epan/dissectors/packet-thread.c b/epan/dissectors/packet-thread.c
index c4f836d200..20c7de5c8c 100644
--- a/epan/dissectors/packet-thread.c
+++ b/epan/dissectors/packet-thread.c
@@ -49,343 +49,343 @@ void proto_reg_handoff_thread_bcn(void);
 void proto_register_thread(void);
 void proto_reg_handoff_thread(void);
 
-static int proto_thread_address = -1;
-static int proto_thread_dg = -1;
-static int proto_thread_mc = -1;
-static int proto_thread_nwd = -1;
-static int proto_thread_coap = -1;
-static int proto_thread_bcn = -1;
-static int proto_thread = -1;
-static int proto_coap = -1;
+static int proto_thread_address;
+static int proto_thread_dg;
+static int proto_thread_mc;
+static int proto_thread_nwd;
+static int proto_thread_coap;
+static int proto_thread_bcn;
+static int proto_thread;
+static int proto_coap;
 
 /* Header fields */
 
 /* Thread address */
 
-static int hf_thread_address_tlv = -1;
-static int hf_thread_address_tlv_type = -1;
-static int hf_thread_address_tlv_length = -1;
-static int hf_thread_address_tlv_unknown = -1;
-/* static int hf_thread_address_tlv_sub_tlvs = -1; */
+static int hf_thread_address_tlv;
+static int hf_thread_address_tlv_type;
+static int hf_thread_address_tlv_length;
+static int hf_thread_address_tlv_unknown;
+/* static int hf_thread_address_tlv_sub_tlvs; */
 
 /* Target EID TLV fields */
-static int hf_thread_address_tlv_target_eid = -1;
+static int hf_thread_address_tlv_target_eid;
 
 /* Ext. MAC address TLV fields */
-static int hf_thread_address_tlv_ext_mac_addr = -1;
+static int hf_thread_address_tlv_ext_mac_addr;
 
 /* RLOC16 TLV fields */
-static int hf_thread_address_tlv_rloc16 = -1;
+static int hf_thread_address_tlv_rloc16;
 
 /* Mesh Local IID TLV fields */
-static int hf_thread_address_tlv_ml_eid = -1;
+static int hf_thread_address_tlv_ml_eid;
 
 /* Status TLV fields */
-static int hf_thread_address_tlv_status = -1;
+static int hf_thread_address_tlv_status;
 
 /* Attached time TLV fields */
-/* static int hf_thread_address_tlv_attached_time = -1; */
+/* static int hf_thread_address_tlv_attached_time; */
 
 /* Last transaction time TLV fields */
-static int hf_thread_address_tlv_last_transaction_time = -1;
+static int hf_thread_address_tlv_last_transaction_time;
 
 /* Router Mask TLV fields */
-static int hf_thread_address_tlv_router_mask_id_seq = -1;
-static int hf_thread_address_tlv_router_mask_assigned = -1;
+static int hf_thread_address_tlv_router_mask_id_seq;
+static int hf_thread_address_tlv_router_mask_assigned;
 
 /* ND option fields */
-static int hf_thread_address_tlv_nd_option = -1;
+static int hf_thread_address_tlv_nd_option;
 
 /* ND data fields */
-static int hf_thread_address_tlv_nd_data = -1;
+static int hf_thread_address_tlv_nd_data;
 
 /* Thread diagnostics */
 
-static int hf_thread_dg_tlv = -1;
-static int hf_thread_dg_tlv_type = -1;
-static int hf_thread_dg_tlv_length8 = -1;
-static int hf_thread_dg_tlv_length16 = -1;
-static int hf_thread_dg_tlv_general = -1;
-static int hf_thread_dg_tlv_unknown = -1;
+static int hf_thread_dg_tlv;
+static int hf_thread_dg_tlv_type;
+static int hf_thread_dg_tlv_length8;
+static int hf_thread_dg_tlv_length16;
+static int hf_thread_dg_tlv_general;
+static int hf_thread_dg_tlv_unknown;
 
 #if 0
 /**** TBC: will be added later. For now, just use general string ****/
-static int hf_thread_dg_tlv_source_addr = -1;
-static int hf_thread_dg_tlv_mode_device_type = -1;
-static int hf_thread_dg_tlv_mode_idle_rx = -1;
-static int hf_thread_dg_tlv_mode_sec_data_req = -1;
-static int hf_thread_dg_tlv_mode_nwk_data = -1;
-static int hf_thread_dg_tlv_timeout = -1;
-static int hf_thread_dg_tlv_lqi_c = -1;
-static int hf_thread_dg_tlv_lqi_size = -1;
-static int hf_thread_dg_tlv_neighbor = -1;
-static int hf_thread_dg_tlv_neighbor_flagI = -1;
-static int hf_thread_dg_tlv_neighbor_flagO = -1;
-static int hf_thread_dg_tlv_neighbor_flagP = -1;
-static int hf_thread_dg_tlv_neighbor_idr = -1;
-static int hf_thread_dg_tlv_neighbor_addr = -1;
-static int hf_thread_dg_tlv_network_param_id = -1;
-static int hf_thread_dg_tlv_network_delay = -1;
-static int hf_thread_dg_tlv_network_channel = -1;
-static int hf_thread_dg_tlv_network_pan_id = -1;
-static int hf_thread_dg_tlv_network_pmt_join = -1;
-static int hf_thread_dg_tlv_network_bcn_payload = -1;
-static int hf_thread_dg_tlv_network_unknown = -1;
-static int hf_thread_dg_tlv_mle_frm_cntr = -1;
-static int hf_thread_dg_tlv_route_tbl_id_seq = -1;
-static int hf_thread_dg_tlv_route_tbl_id_mask = -1;
-static int hf_thread_dg_tlv_route_tbl_entry = -1;
-static int hf_thread_dg_tlv_route_tbl_nbr_out = -1;
-static int hf_thread_dg_tlv_route_tbl_nbr_in = -1;
-static int hf_thread_dg_tlv_route_tbl_cost = -1;
-static int hf_thread_dg_tlv_route_tbl_unknown = -1;
-static int hf_thread_dg_tlv_addr_16 = -1;
-static int hf_thread_dg_tlv_leader_data_partition_id = -1;
-static int hf_thread_dg_tlv_leader_data_weighting = -1;
-static int hf_thread_dg_tlv_leader_data_version = -1;
-static int hf_thread_dg_tlv_leader_data_stable_version = -1;
-static int hf_thread_dg_tlv_leader_data_router_id = -1;
-static int hf_thread_dg_tlv_network_data = -1;
-static int hf_thread_dg_tlv_scan_mask_r = -1;
-static int hf_thread_dg_tlv_scan_mask_e = -1;
-static int hf_thread_dg_tlv_conn_max_child_cnt = -1;
-static int hf_thread_dg_tlv_conn_child_cnt = -1;
-static int hf_thread_dg_tlv_conn_lq3 = -1;
-static int hf_thread_dg_tlv_conn_lq2 = -1;
-static int hf_thread_dg_tlv_conn_lq1 = -1;
-static int hf_thread_dg_tlv_conn_leader_cost = -1;
-static int hf_thread_dg_tlv_conn_id_seq = -1;
-static int hf_thread_dg_tlv_link_margin = -1;
-static int hf_thread_dg_tlv_status = -1;
-static int hf_thread_dg_tlv_version = -1;
-static int hf_thread_dg_tlv_addr_reg_entry = -1;
-static int hf_thread_dg_tlv_addr_reg_iid_type = -1;
-static int hf_thread_dg_tlv_addr_reg_cid = -1;
-static int hf_thread_dg_tlv_addr_reg_iid = -1;
-static int hf_thread_dg_tlv_addr_reg_ipv6 = -1;
-static int hf_thread_dg_tlv_hold_time = -1;
+static int hf_thread_dg_tlv_source_addr;
+static int hf_thread_dg_tlv_mode_device_type;
+static int hf_thread_dg_tlv_mode_idle_rx;
+static int hf_thread_dg_tlv_mode_sec_data_req;
+static int hf_thread_dg_tlv_mode_nwk_data;
+static int hf_thread_dg_tlv_timeout;
+static int hf_thread_dg_tlv_lqi_c;
+static int hf_thread_dg_tlv_lqi_size;
+static int hf_thread_dg_tlv_neighbor;
+static int hf_thread_dg_tlv_neighbor_flagI;
+static int hf_thread_dg_tlv_neighbor_flagO;
+static int hf_thread_dg_tlv_neighbor_flagP;
+static int hf_thread_dg_tlv_neighbor_idr;
+static int hf_thread_dg_tlv_neighbor_addr;
+static int hf_thread_dg_tlv_network_param_id;
+static int hf_thread_dg_tlv_network_delay;
+static int hf_thread_dg_tlv_network_channel;
+static int hf_thread_dg_tlv_network_pan_id;
+static int hf_thread_dg_tlv_network_pmt_join;
+static int hf_thread_dg_tlv_network_bcn_payload;
+static int hf_thread_dg_tlv_network_unknown;
+static int hf_thread_dg_tlv_mle_frm_cntr;
+static int hf_thread_dg_tlv_route_tbl_id_seq;
+static int hf_thread_dg_tlv_route_tbl_id_mask;
+static int hf_thread_dg_tlv_route_tbl_entry;
+static int hf_thread_dg_tlv_route_tbl_nbr_out;
+static int hf_thread_dg_tlv_route_tbl_nbr_in;
+static int hf_thread_dg_tlv_route_tbl_cost;
+static int hf_thread_dg_tlv_route_tbl_unknown;
+static int hf_thread_dg_tlv_addr_16;
+static int hf_thread_dg_tlv_leader_data_partition_id;
+static int hf_thread_dg_tlv_leader_data_weighting;
+static int hf_thread_dg_tlv_leader_data_version;
+static int hf_thread_dg_tlv_leader_data_stable_version;
+static int hf_thread_dg_tlv_leader_data_router_id;
+static int hf_thread_dg_tlv_network_data;
+static int hf_thread_dg_tlv_scan_mask_r;
+static int hf_thread_dg_tlv_scan_mask_e;
+static int hf_thread_dg_tlv_conn_max_child_cnt;
+static int hf_thread_dg_tlv_conn_child_cnt;
+static int hf_thread_dg_tlv_conn_lq3;
+static int hf_thread_dg_tlv_conn_lq2;
+static int hf_thread_dg_tlv_conn_lq1;
+static int hf_thread_dg_tlv_conn_leader_cost;
+static int hf_thread_dg_tlv_conn_id_seq;
+static int hf_thread_dg_tlv_link_margin;
+static int hf_thread_dg_tlv_status;
+static int hf_thread_dg_tlv_version;
+static int hf_thread_dg_tlv_addr_reg_entry;
+static int hf_thread_dg_tlv_addr_reg_iid_type;
+static int hf_thread_dg_tlv_addr_reg_cid;
+static int hf_thread_dg_tlv_addr_reg_iid;
+static int hf_thread_dg_tlv_addr_reg_ipv6;
+static int hf_thread_dg_tlv_hold_time;
 #endif
 
 /* Thread MeshCoP */
 
-static int hf_thread_mc_tlv = -1;
-static int hf_thread_mc_tlv_type = -1;
-static int hf_thread_mc_tlv_length8 = -1;
-static int hf_thread_mc_tlv_length16 = -1;
-static int hf_thread_mc_tlv_unknown = -1;
-/* static int hf_thread_mc_tlv_sub_tlvs = -1; */
+static int hf_thread_mc_tlv;
+static int hf_thread_mc_tlv_type;
+static int hf_thread_mc_tlv_length8;
+static int hf_thread_mc_tlv_length16;
+static int hf_thread_mc_tlv_unknown;
+/* static int hf_thread_mc_tlv_sub_tlvs; */
 
 /* Channel TLV fields */
-static int hf_thread_mc_tlv_channel_page = -1;
-static int hf_thread_mc_tlv_channel = -1;
+static int hf_thread_mc_tlv_channel_page;
+static int hf_thread_mc_tlv_channel;
 
 /* PAN ID TLV fields */
-static int hf_thread_mc_tlv_pan_id = -1;
+static int hf_thread_mc_tlv_pan_id;
 
 /* Extended PAN ID TLV fields */
-static int hf_thread_mc_tlv_xpan_id = -1;
+static int hf_thread_mc_tlv_xpan_id;
 
 /* Network Name TLV fields */
-static int hf_thread_mc_tlv_net_name = -1;
+static int hf_thread_mc_tlv_net_name;
 
 /* PSKc TLV fields */
-static int hf_thread_mc_tlv_pskc = -1;
+static int hf_thread_mc_tlv_pskc;
 
 /* Master Key TLV fields */
-static int hf_thread_mc_tlv_master_key = -1;
+static int hf_thread_mc_tlv_master_key;
 
 /* Network Key Sequence TLV fields */
-static int hf_thread_mc_tlv_net_key_seq_ctr = -1;
+static int hf_thread_mc_tlv_net_key_seq_ctr;
 
 /* Mesh Local ULA TLV fields */
-static int hf_thread_mc_tlv_ml_prefix = -1;
+static int hf_thread_mc_tlv_ml_prefix;
 
 /* Steering Data TLV fields */
-static int hf_thread_mc_tlv_steering_data = -1;
+static int hf_thread_mc_tlv_steering_data;
 
 /* Border Agent Locator TLV fields */
-static int hf_thread_mc_tlv_ba_locator = -1;
+static int hf_thread_mc_tlv_ba_locator;
 
 /* Commissioner ID TLV fields */
-static int hf_thread_mc_tlv_commissioner_id = -1;
+static int hf_thread_mc_tlv_commissioner_id;
 
 /* Commissioner ID TLV fields */
-static int hf_thread_mc_tlv_commissioner_sess_id = -1;
+static int hf_thread_mc_tlv_commissioner_sess_id;
 
 /* Security Policy TLV fields */
-static int hf_thread_mc_tlv_sec_policy_rot = -1;
-static int hf_thread_mc_tlv_sec_policy_o = -1;
-static int hf_thread_mc_tlv_sec_policy_n = -1;
-static int hf_thread_mc_tlv_sec_policy_r = -1;
-static int hf_thread_mc_tlv_sec_policy_c = -1;
-static int hf_thread_mc_tlv_sec_policy_b = -1;
+static int hf_thread_mc_tlv_sec_policy_rot;
+static int hf_thread_mc_tlv_sec_policy_o;
+static int hf_thread_mc_tlv_sec_policy_n;
+static int hf_thread_mc_tlv_sec_policy_r;
+static int hf_thread_mc_tlv_sec_policy_c;
+static int hf_thread_mc_tlv_sec_policy_b;
 
 /* State TLV fields */
-static int hf_thread_mc_tlv_state = -1;
+static int hf_thread_mc_tlv_state;
 
 /* Timestamp TLV fields */
-static int hf_thread_mc_tlv_active_tstamp = -1;
-static int hf_thread_mc_tlv_pending_tstamp = -1;
+static int hf_thread_mc_tlv_active_tstamp;
+static int hf_thread_mc_tlv_pending_tstamp;
 
 /* Delay Timer TLV fields */
-static int hf_thread_mc_tlv_delay_timer = -1;
+static int hf_thread_mc_tlv_delay_timer;
 
 /* UDP Encapsulation TLV fields */
-static int hf_thread_mc_tlv_udp_encap_src_port = -1;
-static int hf_thread_mc_tlv_udp_encap_dst_port = -1;
+static int hf_thread_mc_tlv_udp_encap_src_port;
+static int hf_thread_mc_tlv_udp_encap_dst_port;
 
 /* IPv6 Address fields */
-static int hf_thread_mc_tlv_ipv6_addr = -1;
+static int hf_thread_mc_tlv_ipv6_addr;
 
 /* UDP Port TLV fields */
-static int hf_thread_mc_tlv_udp_port = -1;
+static int hf_thread_mc_tlv_udp_port;
 
 /* IID TLV fields */
-static int hf_thread_mc_tlv_iid = -1;
+static int hf_thread_mc_tlv_iid;
 
 /* Joiner Router locator TLV fields */
-static int hf_thread_mc_tlv_jr_locator = -1;
+static int hf_thread_mc_tlv_jr_locator;
 
 /* KEK TLV fields */
-static int hf_thread_mc_tlv_kek = -1;
+static int hf_thread_mc_tlv_kek;
 
 /* Provisioning URL TLV fields */
-static int hf_thread_mc_tlv_provisioning_url = -1;
+static int hf_thread_mc_tlv_provisioning_url;
 
 /* Vendor TLV fields */
-static int hf_thread_mc_tlv_vendor_name = -1;
-static int hf_thread_mc_tlv_vendor_model = -1;
-static int hf_thread_mc_tlv_vendor_sw_ver = -1;
-static int hf_thread_mc_tlv_vendor_data = -1;
-static int hf_thread_mc_tlv_vendor_stack_ver_oui = -1;
-static int hf_thread_mc_tlv_vendor_stack_ver_build = -1;
-static int hf_thread_mc_tlv_vendor_stack_ver_rev = -1;
-static int hf_thread_mc_tlv_vendor_stack_ver_min = -1;
-static int hf_thread_mc_tlv_vendor_stack_ver_maj = -1;
+static int hf_thread_mc_tlv_vendor_name;
+static int hf_thread_mc_tlv_vendor_model;
+static int hf_thread_mc_tlv_vendor_sw_ver;
+static int hf_thread_mc_tlv_vendor_data;
+static int hf_thread_mc_tlv_vendor_stack_ver_oui;
+static int hf_thread_mc_tlv_vendor_stack_ver_build;
+static int hf_thread_mc_tlv_vendor_stack_ver_rev;
+static int hf_thread_mc_tlv_vendor_stack_ver_min;
+static int hf_thread_mc_tlv_vendor_stack_ver_maj;
 
 /* Channel Mask TLV fields */
-static int hf_thread_mc_tlv_chan_mask = -1;
-static int hf_thread_mc_tlv_chan_mask_page = -1;
-static int hf_thread_mc_tlv_chan_mask_len = -1;
-static int hf_thread_mc_tlv_chan_mask_mask = -1;
+static int hf_thread_mc_tlv_chan_mask;
+static int hf_thread_mc_tlv_chan_mask_page;
+static int hf_thread_mc_tlv_chan_mask_len;
+static int hf_thread_mc_tlv_chan_mask_mask;
 
 /* Count TLV fields */
-static int hf_thread_mc_tlv_count = -1;
+static int hf_thread_mc_tlv_count;
 
 /* Period TLV fields */
-static int hf_thread_mc_tlv_period = -1;
+static int hf_thread_mc_tlv_period;
 
 /* Period TLV fields */
-static int hf_thread_mc_tlv_scan_duration = -1;
+static int hf_thread_mc_tlv_scan_duration;
 
 /* Energy List TLV fields */
-static int hf_thread_mc_tlv_energy_list = -1;
-static int hf_thread_mc_tlv_el_count = -1;
+static int hf_thread_mc_tlv_energy_list;
+static int hf_thread_mc_tlv_el_count;
 
 /* Discovery Request TLV fields */
-static int hf_thread_mc_tlv_discovery_req_ver = -1;
-static int hf_thread_mc_tlv_discovery_req_j = -1;
+static int hf_thread_mc_tlv_discovery_req_ver;
+static int hf_thread_mc_tlv_discovery_req_j;
 
 /* Discovery Response TLV fields */
-static int hf_thread_mc_tlv_discovery_rsp_ver = -1;
-static int hf_thread_mc_tlv_discovery_rsp_n = -1;
+static int hf_thread_mc_tlv_discovery_rsp_ver;
+static int hf_thread_mc_tlv_discovery_rsp_n;
 
 /* Thread Network Data */
 
-static int hf_thread_nwd_tlv = -1;
-static int hf_thread_nwd_tlv_type = -1;
-static int hf_thread_nwd_tlv_stable = -1;
-static int hf_thread_nwd_tlv_length = -1;
-static int hf_thread_nwd_tlv_unknown = -1;
-static int hf_thread_nwd_tlv_sub_tlvs = -1;
+static int hf_thread_nwd_tlv;
+static int hf_thread_nwd_tlv_type;
+static int hf_thread_nwd_tlv_stable;
+static int hf_thread_nwd_tlv_length;
+static int hf_thread_nwd_tlv_unknown;
+static int hf_thread_nwd_tlv_sub_tlvs;
 
 /* Has Route TLV fields */
-static int hf_thread_nwd_tlv_has_route = -1;
-static int hf_thread_nwd_tlv_has_route_br_16 = -1;
-static int hf_thread_nwd_tlv_has_route_pref = -1;
+static int hf_thread_nwd_tlv_has_route;
+static int hf_thread_nwd_tlv_has_route_br_16;
+static int hf_thread_nwd_tlv_has_route_pref;
 
 /* Prefix TLV fields */
-static int hf_thread_nwd_tlv_prefix = -1;
-static int hf_thread_nwd_tlv_prefix_domain_id = -1;
-static int hf_thread_nwd_tlv_prefix_length = -1;
+static int hf_thread_nwd_tlv_prefix;
+static int hf_thread_nwd_tlv_prefix_domain_id;
+static int hf_thread_nwd_tlv_prefix_length;
 
 /* Border Router TLV fields */
-static int hf_thread_nwd_tlv_border_router = -1;
-static int hf_thread_nwd_tlv_border_router_16 = -1;
-static int hf_thread_nwd_tlv_border_router_pref = -1;
-static int hf_thread_nwd_tlv_border_router_p = -1;
-static int hf_thread_nwd_tlv_border_router_s = -1;
-static int hf_thread_nwd_tlv_border_router_d = -1;
-static int hf_thread_nwd_tlv_border_router_c = -1;
-static int hf_thread_nwd_tlv_border_router_r = -1;
-static int hf_thread_nwd_tlv_border_router_o = -1;
-static int hf_thread_nwd_tlv_border_router_n = -1;
+static int hf_thread_nwd_tlv_border_router;
+static int hf_thread_nwd_tlv_border_router_16;
+static int hf_thread_nwd_tlv_border_router_pref;
+static int hf_thread_nwd_tlv_border_router_p;
+static int hf_thread_nwd_tlv_border_router_s;
+static int hf_thread_nwd_tlv_border_router_d;
+static int hf_thread_nwd_tlv_border_router_c;
+static int hf_thread_nwd_tlv_border_router_r;
+static int hf_thread_nwd_tlv_border_router_o;
+static int hf_thread_nwd_tlv_border_router_n;
 
 /* 6LoWPAN ID TLV fields */
-static int hf_thread_nwd_tlv_6lowpan_id_6co_context_length = -1;
-static int hf_thread_nwd_tlv_6lowpan_id_6co_flag = -1;
-static int hf_thread_nwd_tlv_6lowpan_id_6co_flag_c = -1;
-static int hf_thread_nwd_tlv_6lowpan_id_6co_flag_cid = -1;
-static int hf_thread_nwd_tlv_6lowpan_id_6co_flag_reserved = -1;
+static int hf_thread_nwd_tlv_6lowpan_id_6co_context_length;
+static int hf_thread_nwd_tlv_6lowpan_id_6co_flag;
+static int hf_thread_nwd_tlv_6lowpan_id_6co_flag_c;
+static int hf_thread_nwd_tlv_6lowpan_id_6co_flag_cid;
+static int hf_thread_nwd_tlv_6lowpan_id_6co_flag_reserved;
 
 /* Commissioning Data fields */
-/* static int hf_thread_nwd_tlv_comm_data = -1; */
+/* static int hf_thread_nwd_tlv_comm_data; */
 
 /* Service fields */
-static int hf_thread_nwd_tlv_service_t = -1;
-static int hf_thread_nwd_tlv_service_s_id = -1;
-static int hf_thread_nwd_tlv_service_s_ent_num = -1;
-static int hf_thread_nwd_tlv_service_s_data_len = -1;
-static int hf_thread_nwd_tlv_service_s_data = -1;
+static int hf_thread_nwd_tlv_service_t;
+static int hf_thread_nwd_tlv_service_s_id;
+static int hf_thread_nwd_tlv_service_s_ent_num;
+static int hf_thread_nwd_tlv_service_s_data_len;
+static int hf_thread_nwd_tlv_service_s_data;
 
 /* Server fields */
-static int hf_thread_nwd_tlv_server_16 = -1;
-static int hf_thread_nwd_tlv_server_data = -1;
+static int hf_thread_nwd_tlv_server_16;
+static int hf_thread_nwd_tlv_server_data;
 
 /* Thread Beacon */
 
-static int hf_thread_bcn_protocol = -1;
-static int hf_thread_bcn_joining = -1;
-static int hf_thread_bcn_native = -1;
-static int hf_thread_bcn_version = -1;
-static int hf_thread_bcn_network_id = -1;
-static int hf_thread_bcn_epid = -1;
-static int hf_thread_bcn_tlv = -1;
-static int hf_thread_bcn_tlv_type = -1;
-static int hf_thread_bcn_tlv_length = -1;
-static int hf_thread_bcn_tlv_steering_data = -1;
-static int hf_thread_bcn_tlv_unknown = -1;
+static int hf_thread_bcn_protocol;
+static int hf_thread_bcn_joining;
+static int hf_thread_bcn_native;
+static int hf_thread_bcn_version;
+static int hf_thread_bcn_network_id;
+static int hf_thread_bcn_epid;
+static int hf_thread_bcn_tlv;
+static int hf_thread_bcn_tlv_type;
+static int hf_thread_bcn_tlv_length;
+static int hf_thread_bcn_tlv_steering_data;
+static int hf_thread_bcn_tlv_unknown;
 
 /* Tree types */
 
-static gint ett_thread_address = -1;
-static gint ett_thread_address_tlv = -1;
-static gint ett_thread_dg = -1;
-static gint ett_thread_dg_tlv = -1;
-static gint ett_thread_mc = -1;
-static gint ett_thread_mc_tlv = -1;
-static gint ett_thread_mc_chan_mask = -1;
-static gint ett_thread_mc_el_count = -1;
-static gint ett_thread_nwd = -1;
-static gint ett_thread_nwd_tlv = -1;
-static gint ett_thread_nwd_has_route = -1;
-static gint ett_thread_nwd_6co_flag = -1;
-static gint ett_thread_nwd_border_router = -1;
-static gint ett_thread_nwd_prefix_sub_tlvs = -1;
-static gint ett_thread_bcn = -1;
-static gint ett_thread_bcn_tlv = -1;
+static gint ett_thread_address;
+static gint ett_thread_address_tlv;
+static gint ett_thread_dg;
+static gint ett_thread_dg_tlv;
+static gint ett_thread_mc;
+static gint ett_thread_mc_tlv;
+static gint ett_thread_mc_chan_mask;
+static gint ett_thread_mc_el_count;
+static gint ett_thread_nwd;
+static gint ett_thread_nwd_tlv;
+static gint ett_thread_nwd_has_route;
+static gint ett_thread_nwd_6co_flag;
+static gint ett_thread_nwd_border_router;
+static gint ett_thread_nwd_prefix_sub_tlvs;
+static gint ett_thread_bcn;
+static gint ett_thread_bcn_tlv;
 
 /* Expert info. */
 
-/* static expert_field ei_thread_address_tlv_length_failed = EI_INIT; */
-static expert_field ei_thread_address_len_size_mismatch = EI_INIT;
-/* static expert_field ei_thread_dg_tlv_length_failed = EI_INIT; */
-/* static expert_field ei_thread_dg_len_size_mismatch = EI_INIT; */
-static expert_field ei_thread_mc_tlv_length_failed = EI_INIT;
-static expert_field ei_thread_mc_len_size_mismatch = EI_INIT;
-static expert_field ei_thread_mc_len_too_long      = EI_INIT;
-/* static expert_field ei_thread_nwd_tlv_length_failed = EI_INIT; */
-static expert_field ei_thread_nwd_len_size_mismatch = EI_INIT;
+/* static expert_field ei_thread_address_tlv_length_failed; */
+static expert_field ei_thread_address_len_size_mismatch;
+/* static expert_field ei_thread_dg_tlv_length_failed; */
+/* static expert_field ei_thread_dg_len_size_mismatch; */
+static expert_field ei_thread_mc_tlv_length_failed;
+static expert_field ei_thread_mc_len_size_mismatch;
+static expert_field ei_thread_mc_len_too_long;
+/* static expert_field ei_thread_nwd_tlv_length_failed; */
+static expert_field ei_thread_nwd_len_size_mismatch;
 
 static dissector_table_t thread_coap_namespace;
 
diff --git a/epan/dissectors/packet-thrift.c b/epan/dissectors/packet-thrift.c
index 9f03f0dd48..8435524b34 100644
--- a/epan/dissectors/packet-thrift.c
+++ b/epan/dissectors/packet-thrift.c
@@ -129,69 +129,69 @@ static const guint32 TCP_THRIFT_NIBBLE_MASK = 0xf;
 static const int OCTETS_TO_BITS_SHIFT = 3;   /* 8 bits per octets = 3 shifts left. */
 static const int DISABLE_SUBTREE = -1;
 
-static int proto_thrift = -1;
-static int hf_thrift_frame_length = -1;
-static int hf_thrift_protocol_id = -1;
-static int hf_thrift_version = -1;
-static int hf_thrift_mtype = -1;
-static int hf_thrift_str_len = -1;
-static int hf_thrift_method = -1;
-static int hf_thrift_seq_id = -1;
-static int hf_thrift_type = -1;
-static int hf_thrift_key_type = -1;
-static int hf_thrift_value_type = -1;
-static int hf_thrift_compact_struct_type = -1;
-static int hf_thrift_fid = -1;
-static int hf_thrift_fid_delta = -1;
-static int hf_thrift_bool = -1;
-static int hf_thrift_i8 = -1;
-static int hf_thrift_i16 = -1;
-static int hf_thrift_i32 = -1;
-static int hf_thrift_i64 = -1;
-static int hf_thrift_uuid = -1;
-static int hf_thrift_binary = -1;
-static int hf_thrift_string = -1;
-static int hf_thrift_struct = -1;
-static int hf_thrift_list = -1;
-static int hf_thrift_set = -1;
-static int hf_thrift_map = -1;
-static int hf_thrift_num_list_item = -1;
-static int hf_thrift_num_list_pos = -1;
-static int hf_thrift_num_set_item = -1;
-static int hf_thrift_num_set_pos = -1;
-static int hf_thrift_num_map_item = -1;
-static int hf_thrift_large_container = -1;
-static int hf_thrift_double = -1;
-static int hf_thrift_exception = -1;
-static int hf_thrift_exception_message = -1;
-static int hf_thrift_exception_type = -1;
-
-static int ett_thrift = -1;
-static int ett_thrift_header = -1;
-static int ett_thrift_params = -1;
-static int ett_thrift_field = -1;
-static int ett_thrift_struct = -1;
-static int ett_thrift_list = -1;
-static int ett_thrift_set = -1;
-static int ett_thrift_map = -1;
-static int ett_thrift_error = -1; /* Error while reading the header. */
-static int ett_thrift_exception = -1; /* ME_THRIFT_T_EXCEPTION */
-
-static expert_field ei_thrift_wrong_type = EI_INIT;
-static expert_field ei_thrift_wrong_field_id = EI_INIT;
-static expert_field ei_thrift_negative_length = EI_INIT;
-static expert_field ei_thrift_wrong_proto_version = EI_INIT;
-static expert_field ei_thrift_struct_fid_not_in_seq = EI_INIT;
-static expert_field ei_thrift_frame_too_short = EI_INIT;
-static expert_field ei_thrift_not_enough_data = EI_INIT;
-static expert_field ei_thrift_frame_too_long = EI_INIT;
-static expert_field ei_thrift_varint_too_large = EI_INIT;
-static expert_field ei_thrift_undefined_field_id = EI_INIT;
-static expert_field ei_thrift_negative_field_id = EI_INIT;
-static expert_field ei_thrift_unordered_field_id = EI_INIT;
-static expert_field ei_thrift_application_exception = EI_INIT;
-static expert_field ei_thrift_protocol_exception = EI_INIT;
-static expert_field ei_thrift_too_many_subtypes = EI_INIT;
+static int proto_thrift;
+static int hf_thrift_frame_length;
+static int hf_thrift_protocol_id;
+static int hf_thrift_version;
+static int hf_thrift_mtype;
+static int hf_thrift_str_len;
+static int hf_thrift_method;
+static int hf_thrift_seq_id;
+static int hf_thrift_type;
+static int hf_thrift_key_type;
+static int hf_thrift_value_type;
+static int hf_thrift_compact_struct_type;
+static int hf_thrift_fid;
+static int hf_thrift_fid_delta;
+static int hf_thrift_bool;
+static int hf_thrift_i8;
+static int hf_thrift_i16;
+static int hf_thrift_i32;
+static int hf_thrift_i64;
+static int hf_thrift_uuid;
+static int hf_thrift_binary;
+static int hf_thrift_string;
+static int hf_thrift_struct;
+static int hf_thrift_list;
+static int hf_thrift_set;
+static int hf_thrift_map;
+static int hf_thrift_num_list_item;
+static int hf_thrift_num_list_pos;
+static int hf_thrift_num_set_item;
+static int hf_thrift_num_set_pos;
+static int hf_thrift_num_map_item;
+static int hf_thrift_large_container;
+static int hf_thrift_double;
+static int hf_thrift_exception;
+static int hf_thrift_exception_message;
+static int hf_thrift_exception_type;
+
+static int ett_thrift;
+static int ett_thrift_header;
+static int ett_thrift_params;
+static int ett_thrift_field;
+static int ett_thrift_struct;
+static int ett_thrift_list;
+static int ett_thrift_set;
+static int ett_thrift_map;
+static int ett_thrift_error; /* Error while reading the header. */
+static int ett_thrift_exception; /* ME_THRIFT_T_EXCEPTION */
+
+static expert_field ei_thrift_wrong_type;
+static expert_field ei_thrift_wrong_field_id;
+static expert_field ei_thrift_negative_length;
+static expert_field ei_thrift_wrong_proto_version;
+static expert_field ei_thrift_struct_fid_not_in_seq;
+static expert_field ei_thrift_frame_too_short;
+static expert_field ei_thrift_not_enough_data;
+static expert_field ei_thrift_frame_too_long;
+static expert_field ei_thrift_varint_too_large;
+static expert_field ei_thrift_undefined_field_id;
+static expert_field ei_thrift_negative_field_id;
+static expert_field ei_thrift_unordered_field_id;
+static expert_field ei_thrift_application_exception;
+static expert_field ei_thrift_protocol_exception;
+static expert_field ei_thrift_too_many_subtypes;
 
 static const thrift_member_t thrift_exception[] = {
     { &hf_thrift_exception_message, 1, TRUE, DE_THRIFT_T_BINARY, NULL, { .encoding = ENC_UTF_8|ENC_NA } },
diff --git a/epan/dissectors/packet-tibia.c b/epan/dissectors/packet-tibia.c
index ef0e166312..e03915a53a 100644
--- a/epan/dissectors/packet-tibia.c
+++ b/epan/dissectors/packet-tibia.c
@@ -198,98 +198,98 @@ static guint nxteakeys = 0;
 
 #define TIBIA_DEFAULT_TCP_PORT_RANGE "7171,7172"
 
-static gint proto_tibia = -1;
-
-static gint hf_tibia_len                     = -1;
-static gint hf_tibia_nonce                   = -1;
-static gint hf_tibia_adler32                 = -1;
-static gint hf_tibia_adler32_status          = -1;
-static gint hf_tibia_os                      = -1;
-static gint hf_tibia_proto_version           = -1;
-static gint hf_tibia_client_version          = -1;
-static gint hf_tibia_file_versions           = -1;
-static gint hf_tibia_file_version_spr        = -1;
-static gint hf_tibia_file_version_dat        = -1;
-static gint hf_tibia_file_version_pic        = -1;
-static gint hf_tibia_game_preview_state      = -1;
-static gint hf_tibia_content_revision        = -1;
-static gint hf_tibia_undecoded_rsa_data      = -1;
-static gint hf_tibia_undecoded_xtea_data     = -1;
-static gint hf_tibia_unknown                 = -1;
-static gint hf_tibia_xtea_key                = -1;
-static gint hf_tibia_loginflags_gm           = -1;
-static gint hf_tibia_acc_name                = -1;
-static gint hf_tibia_acc_number              = -1;
-static gint hf_tibia_session_key             = -1;
-static gint hf_tibia_char_name               = -1;
-static gint hf_tibia_acc_pass                = -1;
-static gint hf_tibia_char_name_convo         = -1;
-static gint hf_tibia_acc_name_convo          = -1;
-static gint hf_tibia_acc_pass_convo          = -1;
-static gint hf_tibia_session_key_convo       = -1;
-
-static gint hf_tibia_client_info             = -1;
-static gint hf_tibia_client_locale           = -1;
-static gint hf_tibia_client_locale_id        = -1;
-static gint hf_tibia_client_locale_name      = -1;
-static gint hf_tibia_client_ram              = -1;
-static gint hf_tibia_client_cpu              = -1;
-static gint hf_tibia_client_cpu_name         = -1;
-static gint hf_tibia_client_clock            = -1;
-static gint hf_tibia_client_clock2           = -1;
-static gint hf_tibia_client_gpu              = -1;
-static gint hf_tibia_client_vram             = -1;
-static gint hf_tibia_client_resolution       = -1;
-static gint hf_tibia_client_resolution_x     = -1;
-static gint hf_tibia_client_resolution_y     = -1;
-static gint hf_tibia_client_resolution_hz    = -1;
-
-static gint hf_tibia_payload_len             = -1;
-static gint hf_tibia_loginserv_command       = -1;
-static gint hf_tibia_gameserv_command        = -1;
-static gint hf_tibia_client_command          = -1;
-
-static gint hf_tibia_motd                    = -1;
-static gint hf_tibia_dlg_error               = -1;
-static gint hf_tibia_dlg_info                = -1;
-
-static gint hf_tibia_charlist                = -1;
-static gint hf_tibia_charlist_length         = -1;
-static gint hf_tibia_charlist_entry_name     = -1;
-static gint hf_tibia_charlist_entry_world    = -1;
-static gint hf_tibia_charlist_entry_ip       = -1;
-static gint hf_tibia_charlist_entry_port     = -1;
-
-static gint hf_tibia_worldlist               = -1;
-static gint hf_tibia_worldlist_length        = -1;
-static gint hf_tibia_worldlist_entry_name    = -1;
-static gint hf_tibia_worldlist_entry_ip      = -1;
-static gint hf_tibia_worldlist_entry_port    = -1;
-static gint hf_tibia_worldlist_entry_preview = -1;
-static gint hf_tibia_worldlist_entry_id      = -1;
-static gint hf_tibia_pacc_days               = -1;
-
-static gint hf_tibia_channel_id              = -1;
-static gint hf_tibia_channel_name            = -1;
-
-static gint hf_tibia_char_cond               = -1;
-static gint hf_tibia_char_cond_poisoned      = -1;
-static gint hf_tibia_char_cond_burning       = -1;
-static gint hf_tibia_char_cond_electrocuted  = -1;
-static gint hf_tibia_char_cond_drunk         = -1;
-static gint hf_tibia_char_cond_manashield    = -1;
-static gint hf_tibia_char_cond_paralyzed     = -1;
-static gint hf_tibia_char_cond_haste         = -1;
-static gint hf_tibia_char_cond_battle        = -1;
-static gint hf_tibia_char_cond_drowning      = -1;
-static gint hf_tibia_char_cond_freezing      = -1;
-static gint hf_tibia_char_cond_dazzled       = -1;
-static gint hf_tibia_char_cond_cursed        = -1;
-static gint hf_tibia_char_cond_buff          = -1;
-static gint hf_tibia_char_cond_pzblock       = -1;
-static gint hf_tibia_char_cond_pz            = -1;
-static gint hf_tibia_char_cond_bleeding      = -1;
-static gint hf_tibia_char_cond_hungry        = -1;
+static gint proto_tibia;
+
+static gint hf_tibia_len;
+static gint hf_tibia_nonce;
+static gint hf_tibia_adler32;
+static gint hf_tibia_adler32_status;
+static gint hf_tibia_os;
+static gint hf_tibia_proto_version;
+static gint hf_tibia_client_version;
+static gint hf_tibia_file_versions;
+static gint hf_tibia_file_version_spr;
+static gint hf_tibia_file_version_dat;
+static gint hf_tibia_file_version_pic;
+static gint hf_tibia_game_preview_state;
+static gint hf_tibia_content_revision;
+static gint hf_tibia_undecoded_rsa_data;
+static gint hf_tibia_undecoded_xtea_data;
+static gint hf_tibia_unknown;
+static gint hf_tibia_xtea_key;
+static gint hf_tibia_loginflags_gm;
+static gint hf_tibia_acc_name;
+static gint hf_tibia_acc_number;
+static gint hf_tibia_session_key;
+static gint hf_tibia_char_name;
+static gint hf_tibia_acc_pass;
+static gint hf_tibia_char_name_convo;
+static gint hf_tibia_acc_name_convo;
+static gint hf_tibia_acc_pass_convo;
+static gint hf_tibia_session_key_convo;
+
+static gint hf_tibia_client_info;
+static gint hf_tibia_client_locale;
+static gint hf_tibia_client_locale_id;
+static gint hf_tibia_client_locale_name;
+static gint hf_tibia_client_ram;
+static gint hf_tibia_client_cpu;
+static gint hf_tibia_client_cpu_name;
+static gint hf_tibia_client_clock;
+static gint hf_tibia_client_clock2;
+static gint hf_tibia_client_gpu;
+static gint hf_tibia_client_vram;
+static gint hf_tibia_client_resolution;
+static gint hf_tibia_client_resolution_x;
+static gint hf_tibia_client_resolution_y;
+static gint hf_tibia_client_resolution_hz;
+
+static gint hf_tibia_payload_len;
+static gint hf_tibia_loginserv_command;
+static gint hf_tibia_gameserv_command;
+static gint hf_tibia_client_command;
+
+static gint hf_tibia_motd;
+static gint hf_tibia_dlg_error;
+static gint hf_tibia_dlg_info;
+
+static gint hf_tibia_charlist;
+static gint hf_tibia_charlist_length;
+static gint hf_tibia_charlist_entry_name;
+static gint hf_tibia_charlist_entry_world;
+static gint hf_tibia_charlist_entry_ip;
+static gint hf_tibia_charlist_entry_port;
+
+static gint hf_tibia_worldlist;
+static gint hf_tibia_worldlist_length;
+static gint hf_tibia_worldlist_entry_name;
+static gint hf_tibia_worldlist_entry_ip;
+static gint hf_tibia_worldlist_entry_port;
+static gint hf_tibia_worldlist_entry_preview;
+static gint hf_tibia_worldlist_entry_id;
+static gint hf_tibia_pacc_days;
+
+static gint hf_tibia_channel_id;
+static gint hf_tibia_channel_name;
+
+static gint hf_tibia_char_cond;
+static gint hf_tibia_char_cond_poisoned;
+static gint hf_tibia_char_cond_burning;
+static gint hf_tibia_char_cond_electrocuted;
+static gint hf_tibia_char_cond_drunk;
+static gint hf_tibia_char_cond_manashield;
+static gint hf_tibia_char_cond_paralyzed;
+static gint hf_tibia_char_cond_haste;
+static gint hf_tibia_char_cond_battle;
+static gint hf_tibia_char_cond_drowning;
+static gint hf_tibia_char_cond_freezing;
+static gint hf_tibia_char_cond_dazzled;
+static gint hf_tibia_char_cond_cursed;
+static gint hf_tibia_char_cond_buff;
+static gint hf_tibia_char_cond_pzblock;
+static gint hf_tibia_char_cond_pz;
+static gint hf_tibia_char_cond_bleeding;
+static gint hf_tibia_char_cond_hungry;
 
 static int * const char_conds[] = {
     &hf_tibia_char_cond_poisoned,
@@ -312,65 +312,65 @@ static int * const char_conds[] = {
     NULL
 };
 
-static gint hf_tibia_chat_msg            = -1;
-static gint hf_tibia_speech_type         = -1;
+static gint hf_tibia_chat_msg;
+static gint hf_tibia_speech_type;
 
-static gint hf_tibia_coords_x            = -1;
-static gint hf_tibia_coords_y            = -1;
-static gint hf_tibia_coords_z            = -1;
-static gint hf_tibia_coords              = -1;
-static gint hf_tibia_stackpos            = -1;
+static gint hf_tibia_coords_x;
+static gint hf_tibia_coords_y;
+static gint hf_tibia_coords_z;
+static gint hf_tibia_coords;
+static gint hf_tibia_stackpos;
 
 #if 0
-static gint hf_tibia_item                = -1;
+static gint hf_tibia_item;
 #endif
-static gint hf_tibia_container           = -1;
-static gint hf_tibia_container_icon      = -1;
-static gint hf_tibia_container_slot      = -1;
-static gint hf_tibia_container_slots     = -1;
-static gint hf_tibia_inventory           = -1;
-static gint hf_tibia_vip                 = -1;
-static gint hf_tibia_vip_online          = -1;
-static gint hf_tibia_player              = -1;
-static gint hf_tibia_creature            = -1;
-static gint hf_tibia_creature_health     = -1;
-static gint hf_tibia_window              = -1;
-static gint hf_tibia_window_icon         = -1;
-static gint hf_tibia_window_textlen      = -1;
-static gint hf_tibia_window_text         = -1;
-
-static gint hf_tibia_light_level         = -1;
-static gint hf_tibia_light_color         = -1;
-static gint hf_tibia_magic_effect_id     = -1;
-static gint hf_tibia_animated_text_color = -1;
-static gint hf_tibia_animated_text       = -1;
-static gint hf_tibia_projectile          = -1;
-static gint hf_tibia_squarecolor         = -1;
-static gint hf_tibia_textmsg_class       = -1;
-static gint hf_tibia_textmsg             = -1;
-static gint hf_tibia_walk_dir            = -1;
-
-
-static gint ett_tibia               = -1;
-static gint ett_command             = -1;
-static gint ett_file_versions       = -1;
-static gint ett_client_info         = -1;
-static gint ett_locale              = -1;
-static gint ett_cpu                 = -1;
-static gint ett_resolution          = -1;
-static gint ett_charlist            = -1;
-static gint ett_worldlist           = -1;
-static gint ett_char                = -1;
-static gint ett_world               = -1;
-static gint ett_coords              = -1;
-static gint ett_char_cond           = -1;
-
-
-static expert_field ei_xtea_len_toobig               = EI_INIT;
-static expert_field ei_adler32_checksum_bad          = EI_INIT;
-static expert_field ei_rsa_plaintext_no_leading_zero = EI_INIT;
-static expert_field ei_rsa_ciphertext_too_short      = EI_INIT;
-static expert_field ei_rsa_decrypt_failed            = EI_INIT;
+static gint hf_tibia_container;
+static gint hf_tibia_container_icon;
+static gint hf_tibia_container_slot;
+static gint hf_tibia_container_slots;
+static gint hf_tibia_inventory;
+static gint hf_tibia_vip;
+static gint hf_tibia_vip_online;
+static gint hf_tibia_player;
+static gint hf_tibia_creature;
+static gint hf_tibia_creature_health;
+static gint hf_tibia_window;
+static gint hf_tibia_window_icon;
+static gint hf_tibia_window_textlen;
+static gint hf_tibia_window_text;
+
+static gint hf_tibia_light_level;
+static gint hf_tibia_light_color;
+static gint hf_tibia_magic_effect_id;
+static gint hf_tibia_animated_text_color;
+static gint hf_tibia_animated_text;
+static gint hf_tibia_projectile;
+static gint hf_tibia_squarecolor;
+static gint hf_tibia_textmsg_class;
+static gint hf_tibia_textmsg;
+static gint hf_tibia_walk_dir;
+
+
+static gint ett_tibia;
+static gint ett_command;
+static gint ett_file_versions;
+static gint ett_client_info;
+static gint ett_locale;
+static gint ett_cpu;
+static gint ett_resolution;
+static gint ett_charlist;
+static gint ett_worldlist;
+static gint ett_char;
+static gint ett_world;
+static gint ett_coords;
+static gint ett_char_cond;
+
+
+static expert_field ei_xtea_len_toobig;
+static expert_field ei_adler32_checksum_bad;
+static expert_field ei_rsa_plaintext_no_leading_zero;
+static expert_field ei_rsa_ciphertext_too_short;
+static expert_field ei_rsa_decrypt_failed;
 
 
 struct proto_traits {
diff --git a/epan/dissectors/packet-time.c b/epan/dissectors/packet-time.c
index d7c2d7e34b..c6cc3d84f4 100644
--- a/epan/dissectors/packet-time.c
+++ b/epan/dissectors/packet-time.c
@@ -31,11 +31,11 @@ static const enum_val_t time_display_types[] = {
     { NULL, NULL, 0 }
 };
 
-static int proto_time = -1;
-static int hf_time_time = -1;
-static int hf_time_response = -1;
+static int proto_time;
+static int hf_time_time;
+static int hf_time_response;
 
-static gint ett_time = -1;
+static gint ett_time;
 
 /* Use int instead of a field_display_type_e enum to avoid incompatible
  * pointer type warnings with prefs_register_enum_preference() */
diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c
index fb41797d0c..900a841923 100644
--- a/epan/dissectors/packet-tipc.c
+++ b/epan/dissectors/packet-tipc.c
@@ -30,159 +30,159 @@
 
 void proto_register_tipc(void);
 
-static int proto_tipc = -1;
-
-static int hf_tipc_msg_fragments = -1;
-static int hf_tipc_msg_fragment = -1;
-static int hf_tipc_msg_fragment_overlap = -1;
-static int hf_tipc_msg_fragment_overlap_conflicts = -1;
-static int hf_tipc_msg_fragment_multiple_tails = -1;
-static int hf_tipc_msg_fragment_too_long_fragment = -1;
-static int hf_tipc_msg_fragment_error = -1;
-static int hf_tipc_msg_fragment_count = -1;
-static int hf_tipc_msg_reassembled_in = -1;
-static int hf_tipc_msg_reassembled_length = -1;
-
-static int hf_tipc_ver = -1;
-static int hf_tipc_usr = -1;
-static int hf_tipcv2_usr = -1;
-static int hf_tipc_hdr_size = -1;
-static int hf_tipc_nonsequenced = -1;
-static int hf_tipc_destdrop = -1;
-static int hf_tipc_unused = -1;
-static int hf_tipc_msg_size = -1;
-static int hf_tipc_ack_link_lev_seq = -1;
-static int hf_tipc_link_lev_seq = -1;
-static int hf_tipc_prev_proc = -1;
-static int hf_tipc_org_port = -1;
-static int hf_tipc_dst_port = -1;
-static int hf_tipc_data_msg_type = -1;
-static int hf_tipc_err_code = -1;
-static int hf_tipc_reroute_cnt = -1;
-static int hf_tipc_act_id = -1;
-static int hf_tipc_org_proc = -1;
-static int hf_tipc_dst_proc = -1;
-static int hf_tipc_unused2 = -1;
-static int hf_tipc_importance = -1;
-static int hf_tipc_link_selector = -1;
-static int hf_tipc_msg_cnt = -1;
-static int hf_tipc_probe = -1;
-static int hf_tipc_bearer_id = -1;
-static int hf_tipc_link_selector2 = -1;
-static int hf_tipc_remote_addr = -1;
-static int hf_tipc_rm_msg_type = -1;
-static int hf_tipc_nd_msg_type = -1;
-static int hf_tipc_cm_msg_type = -1;
-static int hf_tipc_lp_msg_type = -1;
-static int hf_tipc_cng_prot_msg_type = -1;
-static int hf_tipc_sm_msg_type = -1;
-static int hf_tipc_unknown_msg_type = -1;
-static int hf_tipc_seq_gap = -1;
-static int hf_tipc_nxt_snt_pkg = -1;
-static int hf_tipc_unused_word = -1;
-static int hf_tipc_bearer_name = -1;
-static int hf_tipc_data = -1;
-static int hf_tipc_msg_no_bundle = -1;
-static int hf_tipc_changeover_protocol = -1;
-static int hf_tipc_named_msg_hdr = -1;
-static int hf_tipc_port_name_type = -1;
-static int hf_tipc_port_name_instance = -1;
-static int hf_tipc_data_fragment = -1;
-static int hf_tipc_message_bundle = -1;
-
-
-static int hf_tipc_name_dist_type = -1;
-static int hf_tipc_name_dist_lower = -1;
-static int hf_tipc_name_dist_upper = -1;
-static int hf_tipc_name_dist_port = -1;
-static int hf_tipc_name_dist_key = -1;
-
-static int hf_tipcv2_srcdrop = -1;
-static int hf_tipcv2_data_msg_type = -1;
-static int hf_tipcv2_bcast_mtype = -1;
-static int hf_tipcv2_bundler_mtype = -1;
-static int hf_tipcv2_link_mtype = -1;
-static int hf_tipcv2_connmgr_mtype = -1;
-static int hf_tipcv2_route_mtype_1_6 = -1;
-static int hf_tipcv2_route_mtype_1_7 = -1;
-static int hf_tipcv2_changeover_mtype = -1;
-static int hf_tipcv2_naming_mtype = -1;
-static int hf_tipcv2_fragmenter_mtype = -1;
-static int hf_tipcv2_neighbour_mtype = -1;
-static int hf_tipcv2_errorcode = -1;
-static int hf_tipcv2_rer_cnt = -1;
-static int hf_tipcv2_lookup_scope = -1;
-static int hf_tipcv2_opt_p = -1;
-static int hf_tipcv2_broadcast_ack_no = -1;
-static int hf_tipcv2_link_level_ack_no = -1;
-static int hf_tipcv2_link_level_seq_no = -1;
-/* static int hf_tipcv2_bcast_seq_no = -1; */
-static int hf_tipcv2_prev_node = -1;
-static int hf_tipcv2_orig_node = -1;
-static int hf_tipcv2_dest_node = -1;
-static int hf_tipcv2_port_name_type = -1;
-static int hf_tipcv2_port_name_instance = -1;
-static int hf_tipcv2_multicast_lower = -1;
-static int hf_tipcv2_multicast_upper = -1;
-
-static int hf_tipcv2_sequence_gap = -1;
-static int hf_tipcv2_next_sent_broadcast = -1;
-static int hf_tipcv2_fragment_number = -1;
-static int hf_tipcv2_fragment_msg_number = -1;
-static int hf_tipcv2_next_sent_packet = -1;
-static int hf_tipcv2_session_no = -1;
-static int hf_tipcv2_link_prio = -1;
-static int hf_tipcv2_network_plane = -1;
-static int hf_tipcv2_probe = -1;
-static int hf_tipcv2_link_tolerance = -1;
-static int hf_tipcv2_bearer_instance = -1;
-static int hf_tipcv2_padding = -1;
-static int hf_tipcv2_bearer_level_orig_addr = -1;
-static int hf_tipcv2_cluster_address = -1;
-static int hf_tipcv2_bitmap = -1;
-static int hf_tipcv2_node_address = -1;
-static int hf_tipcv2_destination_domain = -1;
-static int hf_tipcv2_network_id = -1;
-
-static int hf_tipcv2_bcast_tag = -1;
-static int hf_tipcv2_msg_count = -1;
-static int hf_tipcv2_max_packet = -1;
-static int hf_tipcv2_transport_seq_no = -1;
-static int hf_tipcv2_redundant_link = -1;
-static int hf_tipcv2_bearer_id = -1;
-static int hf_tipcv2_conn_mgr_msg_ack = -1;
-static int hf_tipcv2_minor_pv = -1;
-static int hf_tipcv2_node_sig = -1;
-static int hf_tipcv2_filler_mtu_discovery = -1;
-static int hf_tipcv2_vendor_specific_data = -1;
-static int hf_tipcv2_options = -1;
+static int proto_tipc;
+
+static int hf_tipc_msg_fragments;
+static int hf_tipc_msg_fragment;
+static int hf_tipc_msg_fragment_overlap;
+static int hf_tipc_msg_fragment_overlap_conflicts;
+static int hf_tipc_msg_fragment_multiple_tails;
+static int hf_tipc_msg_fragment_too_long_fragment;
+static int hf_tipc_msg_fragment_error;
+static int hf_tipc_msg_fragment_count;
+static int hf_tipc_msg_reassembled_in;
+static int hf_tipc_msg_reassembled_length;
+
+static int hf_tipc_ver;
+static int hf_tipc_usr;
+static int hf_tipcv2_usr;
+static int hf_tipc_hdr_size;
+static int hf_tipc_nonsequenced;
+static int hf_tipc_destdrop;
+static int hf_tipc_unused;
+static int hf_tipc_msg_size;
+static int hf_tipc_ack_link_lev_seq;
+static int hf_tipc_link_lev_seq;
+static int hf_tipc_prev_proc;
+static int hf_tipc_org_port;
+static int hf_tipc_dst_port;
+static int hf_tipc_data_msg_type;
+static int hf_tipc_err_code;
+static int hf_tipc_reroute_cnt;
+static int hf_tipc_act_id;
+static int hf_tipc_org_proc;
+static int hf_tipc_dst_proc;
+static int hf_tipc_unused2;
+static int hf_tipc_importance;
+static int hf_tipc_link_selector;
+static int hf_tipc_msg_cnt;
+static int hf_tipc_probe;
+static int hf_tipc_bearer_id;
+static int hf_tipc_link_selector2;
+static int hf_tipc_remote_addr;
+static int hf_tipc_rm_msg_type;
+static int hf_tipc_nd_msg_type;
+static int hf_tipc_cm_msg_type;
+static int hf_tipc_lp_msg_type;
+static int hf_tipc_cng_prot_msg_type;
+static int hf_tipc_sm_msg_type;
+static int hf_tipc_unknown_msg_type;
+static int hf_tipc_seq_gap;
+static int hf_tipc_nxt_snt_pkg;
+static int hf_tipc_unused_word;
+static int hf_tipc_bearer_name;
+static int hf_tipc_data;
+static int hf_tipc_msg_no_bundle;
+static int hf_tipc_changeover_protocol;
+static int hf_tipc_named_msg_hdr;
+static int hf_tipc_port_name_type;
+static int hf_tipc_port_name_instance;
+static int hf_tipc_data_fragment;
+static int hf_tipc_message_bundle;
+
+
+static int hf_tipc_name_dist_type;
+static int hf_tipc_name_dist_lower;
+static int hf_tipc_name_dist_upper;
+static int hf_tipc_name_dist_port;
+static int hf_tipc_name_dist_key;
+
+static int hf_tipcv2_srcdrop;
+static int hf_tipcv2_data_msg_type;
+static int hf_tipcv2_bcast_mtype;
+static int hf_tipcv2_bundler_mtype;
+static int hf_tipcv2_link_mtype;
+static int hf_tipcv2_connmgr_mtype;
+static int hf_tipcv2_route_mtype_1_6;
+static int hf_tipcv2_route_mtype_1_7;
+static int hf_tipcv2_changeover_mtype;
+static int hf_tipcv2_naming_mtype;
+static int hf_tipcv2_fragmenter_mtype;
+static int hf_tipcv2_neighbour_mtype;
+static int hf_tipcv2_errorcode;
+static int hf_tipcv2_rer_cnt;
+static int hf_tipcv2_lookup_scope;
+static int hf_tipcv2_opt_p;
+static int hf_tipcv2_broadcast_ack_no;
+static int hf_tipcv2_link_level_ack_no;
+static int hf_tipcv2_link_level_seq_no;
+/* static int hf_tipcv2_bcast_seq_no; */
+static int hf_tipcv2_prev_node;
+static int hf_tipcv2_orig_node;
+static int hf_tipcv2_dest_node;
+static int hf_tipcv2_port_name_type;
+static int hf_tipcv2_port_name_instance;
+static int hf_tipcv2_multicast_lower;
+static int hf_tipcv2_multicast_upper;
+
+static int hf_tipcv2_sequence_gap;
+static int hf_tipcv2_next_sent_broadcast;
+static int hf_tipcv2_fragment_number;
+static int hf_tipcv2_fragment_msg_number;
+static int hf_tipcv2_next_sent_packet;
+static int hf_tipcv2_session_no;
+static int hf_tipcv2_link_prio;
+static int hf_tipcv2_network_plane;
+static int hf_tipcv2_probe;
+static int hf_tipcv2_link_tolerance;
+static int hf_tipcv2_bearer_instance;
+static int hf_tipcv2_padding;
+static int hf_tipcv2_bearer_level_orig_addr;
+static int hf_tipcv2_cluster_address;
+static int hf_tipcv2_bitmap;
+static int hf_tipcv2_node_address;
+static int hf_tipcv2_destination_domain;
+static int hf_tipcv2_network_id;
+
+static int hf_tipcv2_bcast_tag;
+static int hf_tipcv2_msg_count;
+static int hf_tipcv2_max_packet;
+static int hf_tipcv2_transport_seq_no;
+static int hf_tipcv2_redundant_link;
+static int hf_tipcv2_bearer_id;
+static int hf_tipcv2_conn_mgr_msg_ack;
+static int hf_tipcv2_minor_pv;
+static int hf_tipcv2_node_sig;
+static int hf_tipcv2_filler_mtu_discovery;
+static int hf_tipcv2_vendor_specific_data;
+static int hf_tipcv2_options;
 
 /* added for TIPC v1.7 */
-static int hf_tipcv2_timestamp = -1;
-static int hf_tipcv2_item_size = -1;
-static int hf_tipcv2_network_region = -1;
-static int hf_tipcv2_local_router = -1;
-static int hf_tipcv2_remote_router = -1;
-static int hf_tipcv2_dist_dist = -1;
-static int hf_tipcv2_dist_scope = -1;
-static int hf_tipcv2_name_dist_port_id_node = -1;
-static int hf_tipcv2_media_id = -1;
+static int hf_tipcv2_timestamp;
+static int hf_tipcv2_item_size;
+static int hf_tipcv2_network_region;
+static int hf_tipcv2_local_router;
+static int hf_tipcv2_remote_router;
+static int hf_tipcv2_dist_dist;
+static int hf_tipcv2_dist_scope;
+static int hf_tipcv2_name_dist_port_id_node;
+static int hf_tipcv2_media_id;
 
 /* added in minor PV 1 */
-static int hf_tipcv2_syn = -1;
+static int hf_tipcv2_syn;
 
 
-static gint ett_tipc_msg_fragment = -1;
-static gint ett_tipc_msg_fragments = -1;
+static gint ett_tipc_msg_fragment;
+static gint ett_tipc_msg_fragments;
 
 
 /* Initialize the subtree pointer */
-static gint ett_tipc = -1;
-static gint ett_tipc_data = -1;
+static gint ett_tipc;
+static gint ett_tipc_data;
 
-static expert_field ei_tipc_field_not_specified = EI_INIT;
-static expert_field ei_tipc_invalid_bundle_size = EI_INIT;
-static expert_field ei_tipc_max_recursion_depth_reached = EI_INIT;
+static expert_field ei_tipc_field_not_specified;
+static expert_field ei_tipc_invalid_bundle_size;
+static expert_field ei_tipc_max_recursion_depth_reached;
 
 static int tipc_address_type = -1;
 
diff --git a/epan/dissectors/packet-tivoconnect.c b/epan/dissectors/packet-tivoconnect.c
index 367b5d57b4..8c7c63695c 100644
--- a/epan/dissectors/packet-tivoconnect.c
+++ b/epan/dissectors/packet-tivoconnect.c
@@ -33,16 +33,16 @@ static dissector_handle_t tivoconnect_udp_handle;
 
 #define TIVOCONNECT_PORT 2190
 
-static int proto_tivoconnect = -1;
-static int hf_tivoconnect_flavor = -1;
-static int hf_tivoconnect_method = -1;
-static int hf_tivoconnect_platform = -1;
-static int hf_tivoconnect_machine = -1;
-static int hf_tivoconnect_identity = -1;
-static int hf_tivoconnect_services = -1;
-static int hf_tivoconnect_version = -1;
-
-static gint ett_tivoconnect = -1;
+static int proto_tivoconnect;
+static int hf_tivoconnect_flavor;
+static int hf_tivoconnect_method;
+static int hf_tivoconnect_platform;
+static int hf_tivoconnect_machine;
+static int hf_tivoconnect_identity;
+static int hf_tivoconnect_services;
+static int hf_tivoconnect_version;
+
+static gint ett_tivoconnect;
 
 static int
 dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_tcp)
diff --git a/epan/dissectors/packet-tls.c b/epan/dissectors/packet-tls.c
index 6c1941c7eb..92440fd09a 100644
--- a/epan/dissectors/packet-tls.c
+++ b/epan/dissectors/packet-tls.c
@@ -94,88 +94,88 @@ static gboolean tls_ignore_mac_failed  = FALSE;
 /* Initialize the protocol and registered fields */
 static gint tls_tap                           = -1;
 static gint exported_pdu_tap                  = -1;
-static gint proto_tls                         = -1;
-static gint hf_tls_record                     = -1;
-static gint hf_tls_record_content_type        = -1;
-static gint hf_tls_record_opaque_type         = -1;
-static gint hf_tls_record_version             = -1;
-static gint hf_tls_record_length              = -1;
-static gint hf_tls_record_appdata             = -1;
-static gint hf_tls_record_appdata_proto       = -1;
-static gint hf_ssl2_record                    = -1;
-static gint hf_ssl2_record_is_escape          = -1;
-static gint hf_ssl2_record_padding_length     = -1;
-static gint hf_ssl2_msg_type                  = -1;
-static gint hf_tls_alert_message              = -1;
-static gint hf_tls_alert_message_level        = -1;
-static gint hf_tls_alert_message_description  = -1;
-static gint hf_tls_handshake_protocol         = -1;
-static gint hf_tls_handshake_type             = -1;
-static gint hf_tls_handshake_length           = -1;
-static gint hf_tls_handshake_npn_selected_protocol_len = -1;
-static gint hf_tls_handshake_npn_selected_protocol = -1;
-static gint hf_tls_handshake_npn_padding_len = -1;
-static gint hf_tls_handshake_npn_padding = -1;
-static gint hf_ssl2_handshake_cipher_spec_len = -1;
-static gint hf_ssl2_handshake_session_id_len  = -1;
-static gint hf_ssl2_handshake_challenge_len   = -1;
-static gint hf_ssl2_handshake_cipher_spec     = -1;
-static gint hf_ssl2_handshake_challenge       = -1;
-static gint hf_ssl2_handshake_clear_key_len   = -1;
-static gint hf_ssl2_handshake_enc_key_len     = -1;
-static gint hf_ssl2_handshake_key_arg_len     = -1;
-static gint hf_ssl2_handshake_clear_key       = -1;
-static gint hf_ssl2_handshake_enc_key         = -1;
-static gint hf_ssl2_handshake_key_arg         = -1;
-static gint hf_ssl2_handshake_session_id_hit  = -1;
-static gint hf_ssl2_handshake_cert_type       = -1;
-static gint hf_ssl2_handshake_connection_id_len = -1;
-static gint hf_ssl2_handshake_connection_id   = -1;
-
-static int hf_tls_reassembled_in              = -1;
-static int hf_tls_reassembled_length          = -1;
-static int hf_tls_reassembled_data            = -1;
-static int hf_tls_segments                    = -1;
-static int hf_tls_segment                     = -1;
-static int hf_tls_segment_overlap             = -1;
-static int hf_tls_segment_overlap_conflict    = -1;
-static int hf_tls_segment_multiple_tails      = -1;
-static int hf_tls_segment_too_long_fragment   = -1;
-static int hf_tls_segment_error               = -1;
-static int hf_tls_segment_count               = -1;
-static int hf_tls_segment_data                = -1;
-
-static int hf_tls_handshake_reassembled_in    = -1;
-static int hf_tls_handshake_fragments         = -1;
-static int hf_tls_handshake_fragment          = -1;
-static int hf_tls_handshake_fragment_count    = -1;
-
-static gint hf_tls_heartbeat_message                 = -1;
-static gint hf_tls_heartbeat_message_type            = -1;
-static gint hf_tls_heartbeat_message_payload_length  = -1;
-static gint hf_tls_heartbeat_message_payload         = -1;
-static gint hf_tls_heartbeat_message_padding         = -1;
+static gint proto_tls;
+static gint hf_tls_record;
+static gint hf_tls_record_content_type;
+static gint hf_tls_record_opaque_type;
+static gint hf_tls_record_version;
+static gint hf_tls_record_length;
+static gint hf_tls_record_appdata;
+static gint hf_tls_record_appdata_proto;
+static gint hf_ssl2_record;
+static gint hf_ssl2_record_is_escape;
+static gint hf_ssl2_record_padding_length;
+static gint hf_ssl2_msg_type;
+static gint hf_tls_alert_message;
+static gint hf_tls_alert_message_level;
+static gint hf_tls_alert_message_description;
+static gint hf_tls_handshake_protocol;
+static gint hf_tls_handshake_type;
+static gint hf_tls_handshake_length;
+static gint hf_tls_handshake_npn_selected_protocol_len;
+static gint hf_tls_handshake_npn_selected_protocol;
+static gint hf_tls_handshake_npn_padding_len;
+static gint hf_tls_handshake_npn_padding;
+static gint hf_ssl2_handshake_cipher_spec_len;
+static gint hf_ssl2_handshake_session_id_len;
+static gint hf_ssl2_handshake_challenge_len;
+static gint hf_ssl2_handshake_cipher_spec;
+static gint hf_ssl2_handshake_challenge;
+static gint hf_ssl2_handshake_clear_key_len;
+static gint hf_ssl2_handshake_enc_key_len;
+static gint hf_ssl2_handshake_key_arg_len;
+static gint hf_ssl2_handshake_clear_key;
+static gint hf_ssl2_handshake_enc_key;
+static gint hf_ssl2_handshake_key_arg;
+static gint hf_ssl2_handshake_session_id_hit;
+static gint hf_ssl2_handshake_cert_type;
+static gint hf_ssl2_handshake_connection_id_len;
+static gint hf_ssl2_handshake_connection_id;
+
+static int hf_tls_reassembled_in;
+static int hf_tls_reassembled_length;
+static int hf_tls_reassembled_data;
+static int hf_tls_segments;
+static int hf_tls_segment;
+static int hf_tls_segment_overlap;
+static int hf_tls_segment_overlap_conflict;
+static int hf_tls_segment_multiple_tails;
+static int hf_tls_segment_too_long_fragment;
+static int hf_tls_segment_error;
+static int hf_tls_segment_count;
+static int hf_tls_segment_data;
+
+static int hf_tls_handshake_reassembled_in;
+static int hf_tls_handshake_fragments;
+static int hf_tls_handshake_fragment;
+static int hf_tls_handshake_fragment_count;
+
+static gint hf_tls_heartbeat_message;
+static gint hf_tls_heartbeat_message_type;
+static gint hf_tls_heartbeat_message_payload_length;
+static gint hf_tls_heartbeat_message_payload;
+static gint hf_tls_heartbeat_message_padding;
 
 static ssl_hfs_t ssl_hfs;
 
 /* Initialize the subtree pointers */
-static gint ett_tls                   = -1;
-static gint ett_tls_record            = -1;
-static gint ett_tls_alert             = -1;
-static gint ett_tls_handshake         = -1;
-static gint ett_tls_heartbeat         = -1;
-static gint ett_tls_certs             = -1;
-static gint ett_tls_segments          = -1;
-static gint ett_tls_segment           = -1;
-static gint ett_tls_hs_fragments       = -1;
-static gint ett_tls_hs_fragment        = -1;
-
-static expert_field ei_ssl2_handshake_session_id_len_error = EI_INIT;
-static expert_field ei_ssl3_heartbeat_payload_length = EI_INIT;
-static expert_field ei_tls_unexpected_message = EI_INIT;
+static gint ett_tls;
+static gint ett_tls_record;
+static gint ett_tls_alert;
+static gint ett_tls_handshake;
+static gint ett_tls_heartbeat;
+static gint ett_tls_certs;
+static gint ett_tls_segments;
+static gint ett_tls_segment;
+static gint ett_tls_hs_fragments;
+static gint ett_tls_hs_fragment;
+
+static expert_field ei_ssl2_handshake_session_id_len_error;
+static expert_field ei_ssl3_heartbeat_payload_length;
+static expert_field ei_tls_unexpected_message;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_tls_ignored_unknown_record = EI_INIT;
+static expert_field ei_tls_ignored_unknown_record;
 
 /* not all of the hf_fields below make sense for TLS but we have to provide
    them anyways to comply with the api (which was aimed for ip fragment
diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c
index 2c318a9507..fbbc7f3530 100644
--- a/epan/dissectors/packet-tn3270.c
+++ b/epan/dissectors/packet-tn3270.c
@@ -1242,375 +1242,375 @@ typedef struct tn3270_conv_info_t {
 } tn3270_conv_info_t;
 
 
-static int proto_tn3270 = -1;
-
-static int hf_tn3270_fa_display = -1;
-static int hf_tn3270_fa_graphic_convert = -1;
-static int hf_tn3270_fa_modified = -1;
-static int hf_tn3270_fa_numeric = -1;
-static int hf_tn3270_fa_protected = -1;
-static int hf_tn3270_fa_reserved = -1;
-static int hf_tn3270_field_attribute = -1;
-static int hf_tn3270_aid = -1;
-static int hf_tn3270_all_character_attributes = -1;
-static int hf_tn3270_attribute_type = -1;
-static int hf_tn3270_begin_end_flags1 = -1;
-static int hf_tn3270_begin_end_flags2 = -1;
-static int hf_tn3270_bsc = -1;
-static int hf_tn3270_buffer_address = -1;
-static int hf_tn3270_c_cav = -1;
-static int hf_tn3270_cc = -1;
-static int hf_tn3270_character_code = -1;
-static int hf_tn3270_character_set = -1;
-static int hf_tn3270_charset = -1;
-static int hf_tn3270_checkpoint = -1;
-static int hf_tn3270_c_ci = -1;
-static int hf_tn3270_c_offset = -1;
-static int hf_tn3270_color = -1;
-static int hf_tn3270_color_command = -1;
-static int hf_tn3270_color_flags = -1;
-static int hf_tn3270_command_code = -1;
-static int hf_tn3270_cro = -1;
-static int hf_tn3270_c_scsoff = -1;
-static int hf_tn3270_c_seqoff = -1;
-static int hf_tn3270_c_sequence = -1;
-static int hf_tn3270_cursor_address = -1;
-static int hf_tn3270_cw = -1;
-static int hf_tn3270_data_chain_fields = -1;
-static int hf_tn3270_data_chain_group = -1;
-static int hf_tn3270_data_chain_inbound_control = -1;
-static int hf_tn3270_destination_or_origin_flags_input_control = -1;
-static int hf_tn3270_destination_or_origin_doid = -1;
-static int hf_tn3270_erase_flags = -1;
-static int hf_tn3270_exception_or_status_flags = -1;
-static int hf_tn3270_extended_highlighting = -1;
-static int hf_tn3270_extended_ps_color = -1;
-static int hf_tn3270_extended_ps_echar = -1;
-static int hf_tn3270_extended_ps_flags = -1;
-static int hf_tn3270_extended_ps_length = -1;
-static int hf_tn3270_extended_ps_lw = -1;
-static int hf_tn3270_extended_ps_lh = -1;
-static int hf_tn3270_extended_ps_nh = -1;
-static int hf_tn3270_extended_ps_nw = -1;
-static int hf_tn3270_extended_ps_res = -1;
-static int hf_tn3270_extended_ps_stsubs = -1;
-static int hf_tn3270_extended_ps_subsn = -1;
-static int hf_tn3270_featl = -1;
-static int hf_tn3270_feats = -1;
-static int hf_tn3270_field_data = -1;
-static int hf_tn3270_field_outlining = -1;
-static int hf_tn3270_field_validation_mandatory_entry = -1;
-static int hf_tn3270_field_validation_mandatory_fill = -1;
-static int hf_tn3270_field_validation_trigger = -1;
-static int hf_tn3270_format_group = -1;
-static int hf_tn3270_format_name = -1;
-static int hf_tn3270_fov = -1;
-static int hf_tn3270_fpc = -1;
-static int hf_tn3270_hilite = -1;
-static int hf_tn3270_h_length = -1;
-static int hf_tn3270_h_offset = -1;
-static int hf_tn3270_horizon = -1;
-static int hf_tn3270_h_sequence = -1;
-static int hf_tn3270_hw = -1;
-static int hf_tn3270_interval = -1;
-static int hf_tn3270_limin = -1;
-static int hf_tn3270_limout = -1;
-static int hf_tn3270_lines = -1;
-static int hf_tn3270_load_color_command = -1;
-static int hf_tn3270_load_format_storage_flags1 = -1;
-static int hf_tn3270_load_format_storage_flags2 = -1;
-static int hf_tn3270_load_format_storage_format_data = -1;
-static int hf_tn3270_load_format_storage_localname = -1;
-static int hf_tn3270_load_format_storage_operand = -1;
-static int hf_tn3270_load_line_type_command = -1;
-static int hf_tn3270_lvl = -1;
-static int hf_tn3270_mode = -1;
-static int hf_tn3270_msr_ind_mask = -1;
-static int hf_tn3270_msr_ind_value = -1;
-static int hf_tn3270_msr_state_mask = -1;
-static int hf_tn3270_msr_state_value = -1;
-static int hf_tn3270_msr_type = -1;
-static int hf_tn3270_ap_na = -1;
-static int hf_tn3270_ap_m = -1;
-static int hf_tn3270_ap_vertical_scrolling = -1;
-static int hf_tn3270_ap_horizontal_scrolling = -1;
-static int hf_tn3270_ap_apres1 = -1;
-static int hf_tn3270_ap_apa = -1;
-static int hf_tn3270_ap_pp = -1;
-static int hf_tn3270_ap_lc = -1;
-static int hf_tn3270_ap_mp = -1;
-static int hf_tn3270_ap_apres2 = -1;
-static int hf_tn3270_c_np = -1;
-static int hf_tn3270_number_of_attributes = -1;
-static int hf_tn3270_object_control_flags = -1;
-static int hf_tn3270_object_type = -1;
-static int hf_tn3270_order_code = -1;
-static int hf_tn3270_outbound_text_header_operation_type = -1;
-static int hf_tn3270_outbound_text_header_hdr = -1;
-static int hf_tn3270_outbound_text_header_lhdr = -1;
-static int hf_tn3270_pages = -1;
-static int hf_tn3270_partition_command = -1;
-static int hf_tn3270_partition_cv = -1;
-static int hf_tn3270_partition_cw = -1;
-static int hf_tn3270_partition_flags = -1;
-static int hf_tn3270_partition_height = -1;
-static int hf_tn3270_partition_hv = -1;
-static int hf_tn3270_partition_id = -1;
-static int hf_tn3270_partition_ph = -1;
-static int hf_tn3270_partition_pw = -1;
-static int hf_tn3270_partition_res = -1;
-static int hf_tn3270_partition_rs = -1;
-static int hf_tn3270_partition_rv = -1;
-static int hf_tn3270_partition_rw = -1;
-static int hf_tn3270_partition_uom = -1;
-static int hf_tn3270_partition_width = -1;
-static int hf_tn3270_partition_wv = -1;
-static int hf_tn3270_prime = -1;
-static int hf_tn3270_printer_flags = -1;
-static int hf_tn3270_ps_char = -1;
-static int hf_tn3270_ps_flags = -1;
-static int hf_tn3270_ps_lcid = -1;
-static int hf_tn3270_ps_rws = -1;
-static int hf_tn3270_query_reply_alphanumeric_flags = -1;
-static int hf_tn3270_recovery_data_flags = -1;
-static int hf_tn3270_reply_mode_attr_list = -1;
-static int hf_tn3270_read_partition_operation_type = -1;
-static int hf_tn3270_read_partition_reqtyp = -1;
-static int hf_tn3270_resbyte = -1;
-static int hf_tn3270_resbytes = -1;
-static int hf_tn3270_res_twobytes = -1;
-static int hf_tn3270_rw = -1;
-static int hf_tn3270_save_or_restore_format_flags = -1;
-static int hf_tn3270_scs_data = -1;
-static int hf_tn3270_sf_single_byte_id = -1;
-static int hf_tn3270_sf_double_byte_id = -1;
-static int hf_tn3270_sf_length = -1;
-static int hf_tn3270_sf_query_reply = -1;
-static int hf_tn3270_sld = -1;
-static int hf_tn3270_spd = -1;
-static int hf_tn3270_start_line = -1;
-static int hf_tn3270_start_page = -1;
-static int hf_tn3270_stop_address = -1;
-static int hf_tn3270_transparency = -1;
-static int hf_tn3270_type_1_text_outbound_data = -1;
-static int hf_tn3270_vertical = -1;
-static int hf_tn3270_v_length = -1;
-static int hf_tn3270_v_offset = -1;
-static int hf_tn3270_v_sequence = -1;
-static int hf_tn3270_wcc_nop = -1;
-static int hf_tn3270_wcc_reset = -1;
-static int hf_tn3270_wcc_printer1 = -1;
-static int hf_tn3270_wcc_printer2 = -1;
-static int hf_tn3270_wcc_start_printer = -1;
-static int hf_tn3270_wcc_sound_alarm = -1;
-static int hf_tn3270_wcc_keyboard_restore = -1;
-static int hf_tn3270_wcc_reset_mdt = -1;
-static int hf_tn3270_ww = -1;
-static int hf_tn3270_tn3270e_data_type = -1;
-static int hf_tn3270_tn3270e_request_flag = -1;
-static int hf_tn3270_tn3270e_response_flag_3270_SCS = -1;
-static int hf_tn3270_tn3270e_response_flag_response = -1;
-static int hf_tn3270_tn3270e_response_flag_unused = -1;
-static int hf_tn3270_tn3270e_seq_number = -1;
-static int hf_tn3270_tn3270e_header_data = -1;
-static int hf_tn3270_ua_cell_units = -1;
-static int hf_tn3270_ua_characters = -1;
-static int hf_tn3270_ua_hard_copy = -1;
-static int hf_tn3270_ua_page_printer = -1;
-static int hf_tn3270_ua_reserved1 = -1;
-static int hf_tn3270_ua_reserved2 = -1;
-static int hf_tn3270_ua_variable_cells = -1;
-static int hf_tn3270_usable_area_flags1 = -1;
-static int hf_tn3270_usable_area_flags2 = -1;
-static int hf_tn3270_ua_addressing = -1;
-static int hf_tn3270_ua_width_cells_pels = -1;
-static int hf_tn3270_ua_height_cells_pels = -1;
-static int hf_tn3270_ua_uom_cells_pels = -1;
-static int hf_tn3270_ua_xr = -1;
-static int hf_tn3270_ua_yr = -1;
-static int hf_tn3270_ua_aw = -1;
-static int hf_tn3270_ua_ah = -1;
-static int hf_tn3270_ua_buffsz = -1;
-static int hf_tn3270_ua_xmin = -1;
-static int hf_tn3270_ua_ymin = -1;
-static int hf_tn3270_ua_xmax = -1;
-static int hf_tn3270_ua_ymax = -1;
-static int hf_tn3270_cs_ge = -1;
-static int hf_tn3270_cs_mi = -1;
-static int hf_tn3270_cs_lps = -1;
-static int hf_tn3270_cs_lpse = -1;
-static int hf_tn3270_cs_ms = -1;
-static int hf_tn3270_cs_ch2 = -1;
-static int hf_tn3270_cs_gf = -1;
-static int hf_tn3270_cs_res = -1;
-static int hf_tn3270_cs_res2 = -1;
-static int hf_tn3270_cs_pscs = -1;
-static int hf_tn3270_cs_res3 = -1;
-static int hf_tn3270_cs_cf = -1;
-static int hf_tn3270_cs_form_type1 = -1;
-static int hf_tn3270_cs_form_type2 = -1;
-static int hf_tn3270_cs_form_type3 = -1;
-static int hf_tn3270_cs_form_type4 = -1;
-static int hf_tn3270_cs_form_type5 = -1;
-static int hf_tn3270_cs_form_type6 = -1;
-static int hf_tn3270_cs_form_type8 = -1;
-static int hf_tn3270_cs_ds_load = -1;
-static int hf_tn3270_cs_ds_triple = -1;
-static int hf_tn3270_cs_ds_char = -1;
-static int hf_tn3270_cs_ds_cb = -1;
-static int hf_tn3270_character_sets_flags1 = -1;
-static int hf_tn3270_character_sets_flags2 = -1;
-static int hf_tn3270_sdw = -1;
-static int hf_tn3270_sdh = -1;
-static int hf_tn3270_form = -1;
-static int hf_tn3270_formres = -1;
-static int hf_tn3270_cs_dl = -1;
-static int hf_tn3270_cs_descriptor_set = -1;
-static int hf_tn3270_cs_descriptor_flags = -1;
-static int hf_tn3270_lcid = -1;
-static int hf_tn3270_sw = -1;
-static int hf_tn3270_sh = -1;
-static int hf_tn3270_ssubsn = -1;
-static int hf_tn3270_esubsn = -1;
-static int hf_tn3270_ccsgid = -1;
-static int hf_tn3270_ccsid = -1;
-static int hf_tn3270_c_prtblk = -1;
-static int hf_tn3270_h_np = -1;
-static int hf_tn3270_h_vi = -1;
-static int hf_tn3270_h_ai = -1;
-static int hf_tn3270_ddm_flags = -1;
-static int hf_tn3270_ddm_limin = -1;
-static int hf_tn3270_ddm_limout = -1;
-static int hf_tn3270_ddm_nss = -1;
-static int hf_tn3270_ddm_ddmss = -1;
-static int hf_tn3270_rpq_device = -1;
-static int hf_tn3270_rpq_mid = -1;
-static int hf_tn3270_rpq_rpql = -1;
-static int hf_tn3270_rpq_name = -1;
-static int hf_tn3270_ip_flags = -1;
-static int hf_tn3270_ipdd_wd = -1;
-static int hf_tn3270_ipdd_hd = -1;
-static int hf_tn3270_ipdd_wa = -1;
-static int hf_tn3270_ipdd_ha = -1;
-static int hf_tn3270_ippd_dpbs = -1;
-static int hf_tn3270_ippd_apbs = -1;
-static int hf_tn3270_ipccd_wcd = -1;
-static int hf_tn3270_ipccd_hcd = -1;
-static int hf_tn3270_ipccd_wca = -1;
-static int hf_tn3270_ipccd_hca = -1;
-static int hf_tn3270_dc_dir = -1;
-static int hf_tn3270_oem_dsref = -1;
-static int hf_tn3270_oem_dtype = -1;
-static int hf_tn3270_oem_uname = -1;
-static int hf_tn3270_sdp_daid = -1;
-static int hf_tn3270_oem_sdp_ll_limin = -1;
-static int hf_tn3270_oem_sdp_ll_limout = -1;
-static int hf_tn3270_oem_sdp_pclk_vers = -1;
-static int hf_tn3270_null = -1;
-static int hf_tn3270_unknown_data = -1;
-static int hf_tn3270_ds_default_sfid = -1;
-static int hf_tn3270_ds_sfid = -1;
-static int hf_tn3270_asia_sdp_sosi_soset = -1;
-static int hf_tn3270_asia_sdp_ic_func = -1;
-static int hf_tn3270_ccc = -1;
-static int hf_tn3270_ccc_coding = -1;
-static int hf_tn3270_ccc_printout = -1;
-static int hf_tn3270_ccc_start_print = -1;
-static int hf_tn3270_ccc_sound_alarm = -1;
-static int hf_tn3270_ccc_copytype = -1;
-static int hf_tn3270_msr_user = -1;
-static int hf_tn3270_msr_locked = -1;
-static int hf_tn3270_msr_auto = -1;
-static int hf_tn3270_msr_ind1 = -1;
-static int hf_tn3270_msr_ind2 = -1;
-static int hf_tn3270_spc_sdp_ot = -1;
-static int hf_tn3270_spc_sdp_ob = -1;
-static int hf_tn3270_spc_sdp_ol = -1;
-static int hf_tn3270_spc_sdp_or = -1;
-static int hf_tn3270_spc_sdp_eucflags = -1;
-static int hf_tn3270_spc_sdp_srepc = -1;
-static int hf_tn3270_srf_fpcb = -1;
-static int hf_tn3270_sdp_statcode = -1;
-static int hf_tn3270_sdp_excode = -1;
-static int hf_tn3270_sdp_ngl = -1;
-static int hf_tn3270_sdp_nml = -1;
-static int hf_tn3270_sdp_nlml = -1;
-static int hf_tn3270_sdp_stor = -1;
-static int hf_tn3270_ap_cm = -1;
-static int hf_tn3270_ap_ro = -1;
-static int hf_tn3270_ap_co = -1;
-static int hf_tn3270_ap_fo = -1;
-static int hf_tn3270_sdp_ln = -1;
-static int hf_tn3270_sdp_id = -1;
-static int hf_tn3270_db_cavdef = -1;
-static int hf_tn3270_db_cidef = -1;
-static int hf_tn3270_dia_flags = -1;
-static int hf_tn3270_dia_limin = -1;
-static int hf_tn3270_dia_limout = -1;
-static int hf_tn3270_dia_nfs = -1;
-static int hf_tn3270_dia_diafs = -1;
-static int hf_tn3270_dia_diafn = -1;
-static int hf_tn3270_fo_flags = -1;
-static int hf_tn3270_fo_vpos = -1;
-static int hf_tn3270_fo_hpos = -1;
-static int hf_tn3270_fo_hpos0 = -1;
-static int hf_tn3270_fo_hpos1 = -1;
-static int hf_tn3270_fsad_flags = -1;
-static int hf_tn3270_fsad_limin = -1;
-static int hf_tn3270_fsad_limout = -1;
-static int hf_tn3270_fsad_size = -1;
-static int hf_tn3270_ibm_flags = -1;
-static int hf_tn3270_ibm_limin = -1;
-static int hf_tn3270_ibm_limout = -1;
-static int hf_tn3270_ibm_type = -1;
-static int hf_tn3270_msr_nd = -1;
-static int hf_tn3270_pft_flags = -1;
-static int hf_tn3270_pft_tmo = -1;
-static int hf_tn3270_pft_bmo = -1;
-static int hf_tn3270_ioca_limin = -1;
-static int hf_tn3270_ioca_limout = -1;
-static int hf_tn3270_ioca_type = -1;
-static int hf_tn3270_pc_vo_thickness = -1;
-static int hf_tn3270_pdds_ssid = -1;
-static int hf_tn3270_pdds_refid = -1;
-static int hf_tn3270_srf_fpcbl = -1;
-static int hf_tn3270_spc_epc_flags = -1;
-static int hf_tn3270_sp_spid = -1;
-static int hf_tn3270_sp_size = -1;
-static int hf_tn3270_sp_space = -1;
-static int hf_tn3270_sp_objlist = -1;
-static int hf_tn3270_tp_nt = -1;
-static int hf_tn3270_tp_m = -1;
-static int hf_tn3270_tp_flags = -1;
-static int hf_tn3270_tp_ntt = -1;
-static int hf_tn3270_tp_tlist = -1;
-static int hf_tn3270_t_np = -1;
-static int hf_tn3270_t_vi = -1;
-static int hf_tn3270_t_ai = -1;
-static int hf_tn3270_3270_tranlim = -1;
-
-static gint ett_tn3270 = -1;
-static gint ett_tn3270e_hdr = -1;
-static gint ett_sf = -1;
-static gint ett_tn3270_field_attribute = -1;
-static gint ett_tn3270_field_validation = -1;
-static gint ett_tn3270_wcc = -1;
-static gint ett_tn3270_usable_area_flags1 = -1;
-static gint ett_tn3270_usable_area_flags2 = -1;
-static gint ett_tn3270_query_reply_alphanumeric_flags = -1;
-static gint ett_tn3270_character_sets_flags1 = -1;
-static gint ett_tn3270_character_sets_flags2 = -1;
-static gint ett_tn3270_character_sets_form = -1;
-static gint ett_tn3270_cs_descriptor_flags = -1;
-static gint ett_tn3270_color_flags = -1;
-static gint ett_tn3270_ccc = -1;
-static gint ett_tn3270_msr_state_mask = -1;
-static gint ett_tn3270_data_chain_fields = -1;
-static gint ett_tn3270_query_list = -1;
-
-static expert_field ei_tn3270_order_code = EI_INIT;
-static expert_field ei_tn3270_command_code = EI_INIT;
-static expert_field ei_tn3270_aid = EI_INIT;
+static int proto_tn3270;
+
+static int hf_tn3270_fa_display;
+static int hf_tn3270_fa_graphic_convert;
+static int hf_tn3270_fa_modified;
+static int hf_tn3270_fa_numeric;
+static int hf_tn3270_fa_protected;
+static int hf_tn3270_fa_reserved;
+static int hf_tn3270_field_attribute;
+static int hf_tn3270_aid;
+static int hf_tn3270_all_character_attributes;
+static int hf_tn3270_attribute_type;
+static int hf_tn3270_begin_end_flags1;
+static int hf_tn3270_begin_end_flags2;
+static int hf_tn3270_bsc;
+static int hf_tn3270_buffer_address;
+static int hf_tn3270_c_cav;
+static int hf_tn3270_cc;
+static int hf_tn3270_character_code;
+static int hf_tn3270_character_set;
+static int hf_tn3270_charset;
+static int hf_tn3270_checkpoint;
+static int hf_tn3270_c_ci;
+static int hf_tn3270_c_offset;
+static int hf_tn3270_color;
+static int hf_tn3270_color_command;
+static int hf_tn3270_color_flags;
+static int hf_tn3270_command_code;
+static int hf_tn3270_cro;
+static int hf_tn3270_c_scsoff;
+static int hf_tn3270_c_seqoff;
+static int hf_tn3270_c_sequence;
+static int hf_tn3270_cursor_address;
+static int hf_tn3270_cw;
+static int hf_tn3270_data_chain_fields;
+static int hf_tn3270_data_chain_group;
+static int hf_tn3270_data_chain_inbound_control;
+static int hf_tn3270_destination_or_origin_flags_input_control;
+static int hf_tn3270_destination_or_origin_doid;
+static int hf_tn3270_erase_flags;
+static int hf_tn3270_exception_or_status_flags;
+static int hf_tn3270_extended_highlighting;
+static int hf_tn3270_extended_ps_color;
+static int hf_tn3270_extended_ps_echar;
+static int hf_tn3270_extended_ps_flags;
+static int hf_tn3270_extended_ps_length;
+static int hf_tn3270_extended_ps_lw;
+static int hf_tn3270_extended_ps_lh;
+static int hf_tn3270_extended_ps_nh;
+static int hf_tn3270_extended_ps_nw;
+static int hf_tn3270_extended_ps_res;
+static int hf_tn3270_extended_ps_stsubs;
+static int hf_tn3270_extended_ps_subsn;
+static int hf_tn3270_featl;
+static int hf_tn3270_feats;
+static int hf_tn3270_field_data;
+static int hf_tn3270_field_outlining;
+static int hf_tn3270_field_validation_mandatory_entry;
+static int hf_tn3270_field_validation_mandatory_fill;
+static int hf_tn3270_field_validation_trigger;
+static int hf_tn3270_format_group;
+static int hf_tn3270_format_name;
+static int hf_tn3270_fov;
+static int hf_tn3270_fpc;
+static int hf_tn3270_hilite;
+static int hf_tn3270_h_length;
+static int hf_tn3270_h_offset;
+static int hf_tn3270_horizon;
+static int hf_tn3270_h_sequence;
+static int hf_tn3270_hw;
+static int hf_tn3270_interval;
+static int hf_tn3270_limin;
+static int hf_tn3270_limout;
+static int hf_tn3270_lines;
+static int hf_tn3270_load_color_command;
+static int hf_tn3270_load_format_storage_flags1;
+static int hf_tn3270_load_format_storage_flags2;
+static int hf_tn3270_load_format_storage_format_data;
+static int hf_tn3270_load_format_storage_localname;
+static int hf_tn3270_load_format_storage_operand;
+static int hf_tn3270_load_line_type_command;
+static int hf_tn3270_lvl;
+static int hf_tn3270_mode;
+static int hf_tn3270_msr_ind_mask;
+static int hf_tn3270_msr_ind_value;
+static int hf_tn3270_msr_state_mask;
+static int hf_tn3270_msr_state_value;
+static int hf_tn3270_msr_type;
+static int hf_tn3270_ap_na;
+static int hf_tn3270_ap_m;
+static int hf_tn3270_ap_vertical_scrolling;
+static int hf_tn3270_ap_horizontal_scrolling;
+static int hf_tn3270_ap_apres1;
+static int hf_tn3270_ap_apa;
+static int hf_tn3270_ap_pp;
+static int hf_tn3270_ap_lc;
+static int hf_tn3270_ap_mp;
+static int hf_tn3270_ap_apres2;
+static int hf_tn3270_c_np;
+static int hf_tn3270_number_of_attributes;
+static int hf_tn3270_object_control_flags;
+static int hf_tn3270_object_type;
+static int hf_tn3270_order_code;
+static int hf_tn3270_outbound_text_header_operation_type;
+static int hf_tn3270_outbound_text_header_hdr;
+static int hf_tn3270_outbound_text_header_lhdr;
+static int hf_tn3270_pages;
+static int hf_tn3270_partition_command;
+static int hf_tn3270_partition_cv;
+static int hf_tn3270_partition_cw;
+static int hf_tn3270_partition_flags;
+static int hf_tn3270_partition_height;
+static int hf_tn3270_partition_hv;
+static int hf_tn3270_partition_id;
+static int hf_tn3270_partition_ph;
+static int hf_tn3270_partition_pw;
+static int hf_tn3270_partition_res;
+static int hf_tn3270_partition_rs;
+static int hf_tn3270_partition_rv;
+static int hf_tn3270_partition_rw;
+static int hf_tn3270_partition_uom;
+static int hf_tn3270_partition_width;
+static int hf_tn3270_partition_wv;
+static int hf_tn3270_prime;
+static int hf_tn3270_printer_flags;
+static int hf_tn3270_ps_char;
+static int hf_tn3270_ps_flags;
+static int hf_tn3270_ps_lcid;
+static int hf_tn3270_ps_rws;
+static int hf_tn3270_query_reply_alphanumeric_flags;
+static int hf_tn3270_recovery_data_flags;
+static int hf_tn3270_reply_mode_attr_list;
+static int hf_tn3270_read_partition_operation_type;
+static int hf_tn3270_read_partition_reqtyp;
+static int hf_tn3270_resbyte;
+static int hf_tn3270_resbytes;
+static int hf_tn3270_res_twobytes;
+static int hf_tn3270_rw;
+static int hf_tn3270_save_or_restore_format_flags;
+static int hf_tn3270_scs_data;
+static int hf_tn3270_sf_single_byte_id;
+static int hf_tn3270_sf_double_byte_id;
+static int hf_tn3270_sf_length;
+static int hf_tn3270_sf_query_reply;
+static int hf_tn3270_sld;
+static int hf_tn3270_spd;
+static int hf_tn3270_start_line;
+static int hf_tn3270_start_page;
+static int hf_tn3270_stop_address;
+static int hf_tn3270_transparency;
+static int hf_tn3270_type_1_text_outbound_data;
+static int hf_tn3270_vertical;
+static int hf_tn3270_v_length;
+static int hf_tn3270_v_offset;
+static int hf_tn3270_v_sequence;
+static int hf_tn3270_wcc_nop;
+static int hf_tn3270_wcc_reset;
+static int hf_tn3270_wcc_printer1;
+static int hf_tn3270_wcc_printer2;
+static int hf_tn3270_wcc_start_printer;
+static int hf_tn3270_wcc_sound_alarm;
+static int hf_tn3270_wcc_keyboard_restore;
+static int hf_tn3270_wcc_reset_mdt;
+static int hf_tn3270_ww;
+static int hf_tn3270_tn3270e_data_type;
+static int hf_tn3270_tn3270e_request_flag;
+static int hf_tn3270_tn3270e_response_flag_3270_SCS;
+static int hf_tn3270_tn3270e_response_flag_response;
+static int hf_tn3270_tn3270e_response_flag_unused;
+static int hf_tn3270_tn3270e_seq_number;
+static int hf_tn3270_tn3270e_header_data;
+static int hf_tn3270_ua_cell_units;
+static int hf_tn3270_ua_characters;
+static int hf_tn3270_ua_hard_copy;
+static int hf_tn3270_ua_page_printer;
+static int hf_tn3270_ua_reserved1;
+static int hf_tn3270_ua_reserved2;
+static int hf_tn3270_ua_variable_cells;
+static int hf_tn3270_usable_area_flags1;
+static int hf_tn3270_usable_area_flags2;
+static int hf_tn3270_ua_addressing;
+static int hf_tn3270_ua_width_cells_pels;
+static int hf_tn3270_ua_height_cells_pels;
+static int hf_tn3270_ua_uom_cells_pels;
+static int hf_tn3270_ua_xr;
+static int hf_tn3270_ua_yr;
+static int hf_tn3270_ua_aw;
+static int hf_tn3270_ua_ah;
+static int hf_tn3270_ua_buffsz;
+static int hf_tn3270_ua_xmin;
+static int hf_tn3270_ua_ymin;
+static int hf_tn3270_ua_xmax;
+static int hf_tn3270_ua_ymax;
+static int hf_tn3270_cs_ge;
+static int hf_tn3270_cs_mi;
+static int hf_tn3270_cs_lps;
+static int hf_tn3270_cs_lpse;
+static int hf_tn3270_cs_ms;
+static int hf_tn3270_cs_ch2;
+static int hf_tn3270_cs_gf;
+static int hf_tn3270_cs_res;
+static int hf_tn3270_cs_res2;
+static int hf_tn3270_cs_pscs;
+static int hf_tn3270_cs_res3;
+static int hf_tn3270_cs_cf;
+static int hf_tn3270_cs_form_type1;
+static int hf_tn3270_cs_form_type2;
+static int hf_tn3270_cs_form_type3;
+static int hf_tn3270_cs_form_type4;
+static int hf_tn3270_cs_form_type5;
+static int hf_tn3270_cs_form_type6;
+static int hf_tn3270_cs_form_type8;
+static int hf_tn3270_cs_ds_load;
+static int hf_tn3270_cs_ds_triple;
+static int hf_tn3270_cs_ds_char;
+static int hf_tn3270_cs_ds_cb;
+static int hf_tn3270_character_sets_flags1;
+static int hf_tn3270_character_sets_flags2;
+static int hf_tn3270_sdw;
+static int hf_tn3270_sdh;
+static int hf_tn3270_form;
+static int hf_tn3270_formres;
+static int hf_tn3270_cs_dl;
+static int hf_tn3270_cs_descriptor_set;
+static int hf_tn3270_cs_descriptor_flags;
+static int hf_tn3270_lcid;
+static int hf_tn3270_sw;
+static int hf_tn3270_sh;
+static int hf_tn3270_ssubsn;
+static int hf_tn3270_esubsn;
+static int hf_tn3270_ccsgid;
+static int hf_tn3270_ccsid;
+static int hf_tn3270_c_prtblk;
+static int hf_tn3270_h_np;
+static int hf_tn3270_h_vi;
+static int hf_tn3270_h_ai;
+static int hf_tn3270_ddm_flags;
+static int hf_tn3270_ddm_limin;
+static int hf_tn3270_ddm_limout;
+static int hf_tn3270_ddm_nss;
+static int hf_tn3270_ddm_ddmss;
+static int hf_tn3270_rpq_device;
+static int hf_tn3270_rpq_mid;
+static int hf_tn3270_rpq_rpql;
+static int hf_tn3270_rpq_name;
+static int hf_tn3270_ip_flags;
+static int hf_tn3270_ipdd_wd;
+static int hf_tn3270_ipdd_hd;
+static int hf_tn3270_ipdd_wa;
+static int hf_tn3270_ipdd_ha;
+static int hf_tn3270_ippd_dpbs;
+static int hf_tn3270_ippd_apbs;
+static int hf_tn3270_ipccd_wcd;
+static int hf_tn3270_ipccd_hcd;
+static int hf_tn3270_ipccd_wca;
+static int hf_tn3270_ipccd_hca;
+static int hf_tn3270_dc_dir;
+static int hf_tn3270_oem_dsref;
+static int hf_tn3270_oem_dtype;
+static int hf_tn3270_oem_uname;
+static int hf_tn3270_sdp_daid;
+static int hf_tn3270_oem_sdp_ll_limin;
+static int hf_tn3270_oem_sdp_ll_limout;
+static int hf_tn3270_oem_sdp_pclk_vers;
+static int hf_tn3270_null;
+static int hf_tn3270_unknown_data;
+static int hf_tn3270_ds_default_sfid;
+static int hf_tn3270_ds_sfid;
+static int hf_tn3270_asia_sdp_sosi_soset;
+static int hf_tn3270_asia_sdp_ic_func;
+static int hf_tn3270_ccc;
+static int hf_tn3270_ccc_coding;
+static int hf_tn3270_ccc_printout;
+static int hf_tn3270_ccc_start_print;
+static int hf_tn3270_ccc_sound_alarm;
+static int hf_tn3270_ccc_copytype;
+static int hf_tn3270_msr_user;
+static int hf_tn3270_msr_locked;
+static int hf_tn3270_msr_auto;
+static int hf_tn3270_msr_ind1;
+static int hf_tn3270_msr_ind2;
+static int hf_tn3270_spc_sdp_ot;
+static int hf_tn3270_spc_sdp_ob;
+static int hf_tn3270_spc_sdp_ol;
+static int hf_tn3270_spc_sdp_or;
+static int hf_tn3270_spc_sdp_eucflags;
+static int hf_tn3270_spc_sdp_srepc;
+static int hf_tn3270_srf_fpcb;
+static int hf_tn3270_sdp_statcode;
+static int hf_tn3270_sdp_excode;
+static int hf_tn3270_sdp_ngl;
+static int hf_tn3270_sdp_nml;
+static int hf_tn3270_sdp_nlml;
+static int hf_tn3270_sdp_stor;
+static int hf_tn3270_ap_cm;
+static int hf_tn3270_ap_ro;
+static int hf_tn3270_ap_co;
+static int hf_tn3270_ap_fo;
+static int hf_tn3270_sdp_ln;
+static int hf_tn3270_sdp_id;
+static int hf_tn3270_db_cavdef;
+static int hf_tn3270_db_cidef;
+static int hf_tn3270_dia_flags;
+static int hf_tn3270_dia_limin;
+static int hf_tn3270_dia_limout;
+static int hf_tn3270_dia_nfs;
+static int hf_tn3270_dia_diafs;
+static int hf_tn3270_dia_diafn;
+static int hf_tn3270_fo_flags;
+static int hf_tn3270_fo_vpos;
+static int hf_tn3270_fo_hpos;
+static int hf_tn3270_fo_hpos0;
+static int hf_tn3270_fo_hpos1;
+static int hf_tn3270_fsad_flags;
+static int hf_tn3270_fsad_limin;
+static int hf_tn3270_fsad_limout;
+static int hf_tn3270_fsad_size;
+static int hf_tn3270_ibm_flags;
+static int hf_tn3270_ibm_limin;
+static int hf_tn3270_ibm_limout;
+static int hf_tn3270_ibm_type;
+static int hf_tn3270_msr_nd;
+static int hf_tn3270_pft_flags;
+static int hf_tn3270_pft_tmo;
+static int hf_tn3270_pft_bmo;
+static int hf_tn3270_ioca_limin;
+static int hf_tn3270_ioca_limout;
+static int hf_tn3270_ioca_type;
+static int hf_tn3270_pc_vo_thickness;
+static int hf_tn3270_pdds_ssid;
+static int hf_tn3270_pdds_refid;
+static int hf_tn3270_srf_fpcbl;
+static int hf_tn3270_spc_epc_flags;
+static int hf_tn3270_sp_spid;
+static int hf_tn3270_sp_size;
+static int hf_tn3270_sp_space;
+static int hf_tn3270_sp_objlist;
+static int hf_tn3270_tp_nt;
+static int hf_tn3270_tp_m;
+static int hf_tn3270_tp_flags;
+static int hf_tn3270_tp_ntt;
+static int hf_tn3270_tp_tlist;
+static int hf_tn3270_t_np;
+static int hf_tn3270_t_vi;
+static int hf_tn3270_t_ai;
+static int hf_tn3270_3270_tranlim;
+
+static gint ett_tn3270;
+static gint ett_tn3270e_hdr;
+static gint ett_sf;
+static gint ett_tn3270_field_attribute;
+static gint ett_tn3270_field_validation;
+static gint ett_tn3270_wcc;
+static gint ett_tn3270_usable_area_flags1;
+static gint ett_tn3270_usable_area_flags2;
+static gint ett_tn3270_query_reply_alphanumeric_flags;
+static gint ett_tn3270_character_sets_flags1;
+static gint ett_tn3270_character_sets_flags2;
+static gint ett_tn3270_character_sets_form;
+static gint ett_tn3270_cs_descriptor_flags;
+static gint ett_tn3270_color_flags;
+static gint ett_tn3270_ccc;
+static gint ett_tn3270_msr_state_mask;
+static gint ett_tn3270_data_chain_fields;
+static gint ett_tn3270_query_list;
+
+static expert_field ei_tn3270_order_code;
+static expert_field ei_tn3270_command_code;
+static expert_field ei_tn3270_aid;
 
 static gint dissect_orders_and_data(proto_tree *tn3270_tree, packet_info *pinfo, tvbuff_t *tvb, gint offset, tn3270_conv_info_t *tn3270_info);
 static gint dissect_buffer_address(proto_tree *tn3270_tree, tvbuff_t *tvb, gint offset, gint hf, tn3270_conv_info_t *tn3270_info);
diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c
index 58ebe9b126..7f4039b01a 100644
--- a/epan/dissectors/packet-tn5250.c
+++ b/epan/dissectors/packet-tn5250.c
@@ -2287,604 +2287,604 @@ static const range_string vals_tn5250_reserved[] = {
 };
 
 
-static int proto_tn5250 = -1;
-static int hf_tn5250_aid = -1;
-static int hf_tn5250_attn_key = -1;
-static int hf_tn5250_attribute_type = -1;
-static int hf_tn5250_buffer_x = -1;
-static int hf_tn5250_buffer_y = -1;
-static int hf_tn5250_command_code = -1;
-static int hf_tn5250_ctp_lsid = -1;
-static int hf_tn5250_ctp_mlpp = -1;
-static int hf_tn5250_cua_parm = -1;
-static int hf_tn5250_dawt_char = -1;
-static int hf_tn5250_dawt_id = -1;
-static int hf_tn5250_dawt_length = -1;
-static int hf_tn5250_dawt_message = -1;
-static int hf_tn5250_dckf_function_code = -1;
-static int hf_tn5250_dckf_id = -1;
-static int hf_tn5250_dckf_key_code = -1;
-static int hf_tn5250_dckf_length = -1;
-static int hf_tn5250_dckf_prompt_text = -1;
-static int hf_tn5250_dfdpck_coreflag = -1;
-static int hf_tn5250_dfdpck_coreflag_0 = -1;
-static int hf_tn5250_dfdpck_coreflag_1 = -1;
-static int hf_tn5250_dfdpck_coreflag_2 = -1;
-static int hf_tn5250_dfdpck_coreflag_3 = -1;
-static int hf_tn5250_dfdpck_coreflag_4 = -1;
-static int hf_tn5250_dfdpck_coreflag_5 = -1;
-static int hf_tn5250_dfdpck_coreflag_6 = -1;
-static int hf_tn5250_dfdpck_coreflag_7 = -1;
-static int hf_tn5250_dfdpck_data_field = -1;
-static int hf_tn5250_dfdpck_partition = -1;
-static int hf_tn5250_dfdpck_toprowflag1 = -1;
-static int hf_tn5250_dfdpck_toprowflag1_0 = -1;
-static int hf_tn5250_dfdpck_toprowflag1_1 = -1;
-static int hf_tn5250_dfdpck_toprowflag1_2 = -1;
-static int hf_tn5250_dfdpck_toprowflag1_3 = -1;
-static int hf_tn5250_dfdpck_toprowflag1_4 = -1;
-static int hf_tn5250_dfdpck_toprowflag1_5 = -1;
-static int hf_tn5250_dfdpck_toprowflag1_6 = -1;
-static int hf_tn5250_dfdpck_toprowflag1_7 = -1;
-static int hf_tn5250_dfdpck_toprowflag2 = -1;
-static int hf_tn5250_dfdpck_toprowflag2_0 = -1;
-static int hf_tn5250_dfdpck_toprowflag2_1 = -1;
-static int hf_tn5250_dfdpck_toprowflag2_2 = -1;
-static int hf_tn5250_dfdpck_toprowflag2_3 = -1;
-static int hf_tn5250_dfdpck_toprowflag2_4 = -1;
-static int hf_tn5250_dfdpck_toprowflag2_5 = -1;
-static int hf_tn5250_dfdpck_toprowflag2_6 = -1;
-static int hf_tn5250_dfdpck_toprowflag2_7 = -1;
-static int hf_tn5250_dfdpck_toprowflag3 = -1;
-static int hf_tn5250_dfdpck_toprowflag3_0 = -1;
-static int hf_tn5250_dfdpck_toprowflag3_1 = -1;
-static int hf_tn5250_dfdpck_toprowflag3_2 = -1;
-static int hf_tn5250_dfdpck_toprowflag3_3 = -1;
-static int hf_tn5250_dfdpck_toprowflag3_4 = -1;
-static int hf_tn5250_dfdpck_toprowflag3_5 = -1;
-static int hf_tn5250_dfdpck_toprowflag3_6 = -1;
-static int hf_tn5250_dfdpck_toprowflag3_7 = -1;
-static int hf_tn5250_dorm_ec = -1;
-static int hf_tn5250_dorm_id = -1;
-static int hf_tn5250_dorm_length = -1;
-static int hf_tn5250_dorm_mt = -1;
-static int hf_tn5250_dpo_displace_characters = -1;
-static int hf_tn5250_dpo_flag1 = -1;
-static int hf_tn5250_dpo_flag1_0 = -1;
-static int hf_tn5250_dpo_flag1_1 = -1;
-static int hf_tn5250_dpo_flag1_2 = -1;
-static int hf_tn5250_dpo_flag1_3 = -1;
-static int hf_tn5250_dpo_flag1_4 = -1;
-static int hf_tn5250_dpo_flag1_5 = -1;
-static int hf_tn5250_dpo_flag1_6 = -1;
-static int hf_tn5250_dpo_flag1_7 = -1;
-static int hf_tn5250_dpo_flag2 = -1;
-static int hf_tn5250_dpo_flag2_0 = -1;
-static int hf_tn5250_dpo_flag2_reserved = -1;
-static int hf_tn5250_dpo_partition = -1;
-static int hf_tn5250_dpo_start_location_col = -1;
-static int hf_tn5250_dpo_start_location_row = -1;
-static int hf_tn5250_dpt_ec = -1;
-static int hf_tn5250_dpt_id = -1;
-static int hf_tn5250_ds_output_error = -1;
-static int hf_tn5250_dsc_ev = -1;
-static int hf_tn5250_dsc_partition = -1;
-static int hf_tn5250_dsc_sk = -1;
-static int hf_tn5250_dsl_flag1 = -1;
-static int hf_tn5250_dsl_flag1_0 = -1;
-static int hf_tn5250_dsl_flag1_1 = -1;
-static int hf_tn5250_dsl_flag1_2 = -1;
-static int hf_tn5250_dsl_flag1_reserved = -1;
-static int hf_tn5250_dsl_function = -1;
-static int hf_tn5250_dsl_id = -1;
-static int hf_tn5250_dsl_location = -1;
-static int hf_tn5250_dsl_offset = -1;
-static int hf_tn5250_dsl_partition = -1;
-static int hf_tn5250_dsl_rtl_offset = -1;
-static int hf_tn5250_dtsf_first_line = -1;
-static int hf_tn5250_dtsf_flag1 = -1;
-static int hf_tn5250_dtsf_flag1_0 = -1;
-static int hf_tn5250_dtsf_flag1_1 = -1;
-static int hf_tn5250_dtsf_flag1_2 = -1;
-static int hf_tn5250_dtsf_flag1_3 = -1;
-static int hf_tn5250_dtsf_flag1_4 = -1;
-static int hf_tn5250_dtsf_flag1_5 = -1;
-static int hf_tn5250_dtsf_flag1_6 = -1;
-static int hf_tn5250_dtsf_flag1_7 = -1;
-static int hf_tn5250_dtsf_flag2 = -1;
-static int hf_tn5250_dtsf_flag2_0 = -1;
-static int hf_tn5250_dtsf_flag2_1 = -1;
-static int hf_tn5250_dtsf_flag2_2 = -1;
-static int hf_tn5250_dtsf_flag2_3 = -1;
-static int hf_tn5250_dtsf_flag2_4to7 = -1;
-static int hf_tn5250_dtsf_line_cmd_field_size = -1;
-static int hf_tn5250_dtsf_location_of_pitch = -1;
-static int hf_tn5250_dtsf_partition = -1;
-static int hf_tn5250_dtsf_text_body_height = -1;
-static int hf_tn5250_dtsf_text_body_width = -1;
-static int hf_tn5250_soh_err = -1;
-static int hf_tn5250_error_code = -1;
-static int hf_tn5250_error_state = -1;
-static int hf_tn5250_escape_code = -1;
-static int hf_tn5250_fa_color = -1;
-static int hf_tn5250_fcw = -1;
-static int hf_tn5250_ffw = -1;
-static int hf_tn5250_ffw_adjust = -1;
-static int hf_tn5250_ffw_auto = -1;
-static int hf_tn5250_ffw_bypass = -1;
-static int hf_tn5250_ffw_dup = -1;
-static int hf_tn5250_ffw_fer = -1;
-static int hf_tn5250_ffw_id = -1;
-static int hf_tn5250_ffw_mdt = -1;
-static int hf_tn5250_ffw_me = -1;
-static int hf_tn5250_ffw_monocase = -1;
-static int hf_tn5250_ffw_res = -1;
-static int hf_tn5250_ffw_shift = -1;
-static int hf_tn5250_field_data = -1;
-static int hf_tn5250_foreground_color_attr = -1;
-static int hf_tn5250_header_flags = -1;
-static int hf_tn5250_ideographic_attr = -1;
-static int hf_tn5250_length = -1;
-static int hf_tn5250_length_twobyte = -1;
-static int hf_tn5250_logical_record_length = -1;
-static int hf_tn5250_operation_code = -1;
-static int hf_tn5250_order_code = -1;
-static int hf_tn5250_repeated_character = -1;
-static int hf_tn5250_reserved = -1;
-static int hf_tn5250_roll_bottom_line = -1;
-static int hf_tn5250_roll_flag1 = -1;
-static int hf_tn5250_roll_flag1_0 = -1;
-static int hf_tn5250_roll_flag1_lines = -1;
-static int hf_tn5250_roll_flag1_reserved = -1;
-static int hf_tn5250_roll_top_line = -1;
-static int hf_tn5250_rts_flag1 = -1;
-static int hf_tn5250_rts_flag1_0 = -1;
-static int hf_tn5250_rts_flag1_reserved = -1;
-static int hf_tn5250_rts_partition = -1;
-static int hf_tn5250_sf_attr_flag = -1;
-static int hf_tn5250_sf_class = -1;
-static int hf_tn5250_fa = -1;
-static int hf_tn5250_sf_length = -1;
-static int hf_tn5250_sf_type = -1;
-static int hf_tn5250_sna_record_type = -1;
-static int hf_tn5250_soh_cursor_direction = -1;
-static int hf_tn5250_soh_flags = -1;
-static int hf_tn5250_soh_input_capable_only = -1;
-static int hf_tn5250_soh_pf1 = -1;
-static int hf_tn5250_soh_pf10 = -1;
-static int hf_tn5250_soh_pf11 = -1;
-static int hf_tn5250_soh_pf12 = -1;
-static int hf_tn5250_soh_pf13 = -1;
-static int hf_tn5250_soh_pf14 = -1;
-static int hf_tn5250_soh_pf15 = -1;
-static int hf_tn5250_soh_pf16 = -1;
-static int hf_tn5250_soh_pf16to9 = -1;
-static int hf_tn5250_soh_pf17 = -1;
-static int hf_tn5250_soh_pf18 = -1;
-static int hf_tn5250_soh_pf19 = -1;
-static int hf_tn5250_soh_pf2 = -1;
-static int hf_tn5250_soh_pf20 = -1;
-static int hf_tn5250_soh_pf21 = -1;
-static int hf_tn5250_soh_pf22 = -1;
-static int hf_tn5250_soh_pf23 = -1;
-static int hf_tn5250_soh_pf24 = -1;
-static int hf_tn5250_soh_pf24to17 = -1;
-static int hf_tn5250_soh_pf3 = -1;
-static int hf_tn5250_soh_pf4 = -1;
-static int hf_tn5250_soh_pf5 = -1;
-static int hf_tn5250_soh_pf6 = -1;
-static int hf_tn5250_soh_pf7 = -1;
-static int hf_tn5250_soh_pf8 = -1;
-static int hf_tn5250_soh_pf8to1 = -1;
-static int hf_tn5250_soh_pf9 = -1;
-static int hf_tn5250_soh_resq = -1;
-static int hf_tn5250_soh_screen_reverse = -1;
-static int hf_tn5250_sps_flag1 = -1;
-static int hf_tn5250_sps_flag1_0 = -1;
-static int hf_tn5250_sps_flag1_reserved = -1;
-static int hf_tn5250_sps_left_column = -1;
-static int hf_tn5250_sps_top_row = -1;
-static int hf_tn5250_sps_window_depth = -1;
-static int hf_tn5250_sps_window_width = -1;
-static int hf_tn5250_sys_request_key = -1;
-static int hf_tn5250_test_request_key = -1;
-static int hf_tn5250_unknown_data = -1;
-static int hf_tn5250_variable_record_length = -1;
-static int hf_tn5250_wdsf_cw_bp_flag1_reserved = -1;
-static int hf_tn5250_wdsf_cw_tf_flag_reserved = -1;
-static int hf_tn5250_wdsf_deg_flag2_reserved = -1;
-static int hf_tn5250_wdsf_deg_ms_flag1_reserved = -1;
-static int hf_tn5250_wdsf_ds_ci_flag1_reserved = -1;
-static int hf_tn5250_wdsf_ds_cpda_flag1_reserved = -1;
-static int hf_tn5250_wdsf_ds_ct_flag3_reserved = -1;
-static int hf_tn5250_wdsf_ds_gdc_reserved = -1;
-static int hf_tn5250_wdsf_ds_nws_reserved = -1;
-static int hf_tn5250_wdsf_ds_sbi_flag1_reserved = -1;
-static int hf_tn5250_wdsf_dsb_flag1_reserved = -1;
-static int hf_tn5250_wdsf_pmb_flag1_reserved = -1;
-static int hf_tn5250_wdsf_wdf_flag1_reserved = -1;
-static int hf_tn5250_wdsf_cgl_partition = -1;
-static int hf_tn5250_wdsf_cgl_rectangle_height = -1;
-static int hf_tn5250_wdsf_cgl_rectangle_width = -1;
-static int hf_tn5250_wdsf_cgl_start_column = -1;
-static int hf_tn5250_wdsf_cgl_start_row = -1;
-static int hf_tn5250_wdsf_cw_bp_bbc = -1;
-static int hf_tn5250_wdsf_cw_bp_cba = -1;
-static int hf_tn5250_wdsf_cw_bp_flag1 = -1;
-static int hf_tn5250_wdsf_cw_bp_flag1_1 = -1;
-static int hf_tn5250_wdsf_cw_bp_lbc = -1;
-static int hf_tn5250_wdsf_cw_bp_llbc = -1;
-static int hf_tn5250_wdsf_cw_bp_lrbc = -1;
-static int hf_tn5250_wdsf_cw_bp_mba = -1;
-static int hf_tn5250_wdsf_cw_bp_rbc = -1;
-static int hf_tn5250_wdsf_cw_bp_tbc = -1;
-static int hf_tn5250_wdsf_cw_bp_ulbc = -1;
-static int hf_tn5250_wdsf_cw_bp_urbc = -1;
-static int hf_tn5250_wdsf_cw_flag1 = -1;
-static int hf_tn5250_wdsf_cw_flag1_1 = -1;
-static int hf_tn5250_wdsf_cw_flag1_2 = -1;
-static int hf_tn5250_wdsf_cw_flag1_reserved = -1;
-static int hf_tn5250_wdsf_cw_minor_type = -1;
-static int hf_tn5250_wdsf_cw_tf_cba = -1;
-static int hf_tn5250_wdsf_cw_tf_flag = -1;
-static int hf_tn5250_wdsf_cw_tf_flag_1 = -1;
-static int hf_tn5250_wdsf_cw_tf_flag_orientation = -1;
-static int hf_tn5250_wdsf_cw_tf_mba = -1;
-static int hf_tn5250_wdsf_cw_tf_text = -1;
-static int hf_tn5250_wdsf_cw_wd = -1;
-static int hf_tn5250_wdsf_cw_ww = -1;
-static int hf_tn5250_wdsf_deg_default_color = -1;
-static int hf_tn5250_wdsf_deg_default_line = -1;
-static int hf_tn5250_wdsf_deg_flag1 = -1;
-static int hf_tn5250_wdsf_deg_flag1_0 = -1;
-static int hf_tn5250_wdsf_deg_flag1_reserved = -1;
-static int hf_tn5250_wdsf_deg_flag2 = -1;
-static int hf_tn5250_wdsf_deg_flag2_0 = -1;
-static int hf_tn5250_wdsf_deg_minor_type = -1;
-static int hf_tn5250_wdsf_deg_ms_default_color = -1;
-static int hf_tn5250_wdsf_deg_ms_flag1 = -1;
-static int hf_tn5250_wdsf_deg_ms_flag1_0 = -1;
-static int hf_tn5250_wdsf_deg_ms_horizontal_dimension = -1;
-static int hf_tn5250_wdsf_deg_ms_line_interval = -1;
-static int hf_tn5250_wdsf_deg_ms_line_repeat = -1;
-static int hf_tn5250_wdsf_deg_ms_start_column = -1;
-static int hf_tn5250_wdsf_deg_ms_start_row = -1;
-static int hf_tn5250_wdsf_deg_ms_vertical_dimension = -1;
-static int hf_tn5250_wdsf_deg_partition = -1;
-static int hf_tn5250_wdsf_ds_cancel_aid = -1;
-static int hf_tn5250_wdsf_ds_ci_first_choice = -1;
-static int hf_tn5250_wdsf_ds_ci_flag1 = -1;
-static int hf_tn5250_wdsf_ds_ci_flag1_0 = -1;
-static int hf_tn5250_wdsf_ds_ci_left_push = -1;
-static int hf_tn5250_wdsf_ds_ci_right_push = -1;
-static int hf_tn5250_wdsf_ds_columns = -1;
-static int hf_tn5250_wdsf_ds_country_sel = -1;
-static int hf_tn5250_wdsf_ds_cpda_color_avail = -1;
-static int hf_tn5250_wdsf_ds_cpda_color_indicator = -1;
-static int hf_tn5250_wdsf_ds_cpda_color_sel_avail = -1;
-static int hf_tn5250_wdsf_ds_cpda_color_sel_selected = -1;
-static int hf_tn5250_wdsf_ds_cpda_color_sel_unavail = -1;
-static int hf_tn5250_wdsf_ds_cpda_color_selected = -1;
-static int hf_tn5250_wdsf_ds_cpda_color_unavail = -1;
-static int hf_tn5250_wdsf_ds_cpda_color_unavail_indicator = -1;
-static int hf_tn5250_wdsf_ds_cpda_flag1 = -1;
-static int hf_tn5250_wdsf_ds_cpda_flag1_0 = -1;
-static int hf_tn5250_wdsf_ds_cpda_flag1_1 = -1;
-static int hf_tn5250_wdsf_ds_cpda_flag1_2 = -1;
-static int hf_tn5250_wdsf_ds_cpda_monochrome_avail = -1;
-static int hf_tn5250_wdsf_ds_cpda_monochrome_indicator = -1;
-static int hf_tn5250_wdsf_ds_cpda_monochrome_sel_avail = -1;
-static int hf_tn5250_wdsf_ds_cpda_monochrome_sel_selected = -1;
-static int hf_tn5250_wdsf_ds_cpda_monochrome_sel_unavail = -1;
-static int hf_tn5250_wdsf_ds_cpda_monochrome_selected = -1;
-static int hf_tn5250_wdsf_ds_cpda_monochrome_unavail = -1;
-static int hf_tn5250_wdsf_ds_cpda_monochrome_unavail_indicator = -1;
-static int hf_tn5250_wdsf_ds_ct_aid = -1;
-static int hf_tn5250_wdsf_ds_ct_flag1 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag1_2 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag1_3 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag1_4 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag1_5 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag1_choice_state = -1;
-static int hf_tn5250_wdsf_ds_ct_flag1_numeric_selection = -1;
-static int hf_tn5250_wdsf_ds_ct_flag2 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag2_0 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag2_1 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag2_2 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag2_3 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag2_4 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag2_5 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag2_6 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag2_7 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag3 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag3_0 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag3_1 = -1;
-static int hf_tn5250_wdsf_ds_ct_flag3_2 = -1;
-static int hf_tn5250_wdsf_ds_ct_mnemonic_offset = -1;
-static int hf_tn5250_wdsf_ds_ct_numeric_onebyte = -1;
-static int hf_tn5250_wdsf_ds_ct_numeric_twobyte = -1;
-static int hf_tn5250_wdsf_ds_ct_text = -1;
-static int hf_tn5250_wdsf_ds_flag1 = -1;
-static int hf_tn5250_wdsf_ds_flag1_1 = -1;
-static int hf_tn5250_wdsf_ds_flag1_2 = -1;
-static int hf_tn5250_wdsf_ds_flag1_auto_enter = -1;
-static int hf_tn5250_wdsf_ds_flag1_mouse_characteristics = -1;
-static int hf_tn5250_wdsf_ds_flag1_reserved = -1;
-static int hf_tn5250_wdsf_ds_flag2 = -1;
-static int hf_tn5250_wdsf_ds_flag2_1 = -1;
-static int hf_tn5250_wdsf_ds_flag2_2 = -1;
-static int hf_tn5250_wdsf_ds_flag2_3 = -1;
-static int hf_tn5250_wdsf_ds_flag2_4 = -1;
-static int hf_tn5250_wdsf_ds_flag2_5 = -1;
-static int hf_tn5250_wdsf_ds_flag2_6 = -1;
-static int hf_tn5250_wdsf_ds_flag2_reserved = -1;
-static int hf_tn5250_wdsf_ds_flag3 = -1;
-static int hf_tn5250_wdsf_ds_flag3_1 = -1;
-static int hf_tn5250_wdsf_ds_flag3_reserved = -1;
-static int hf_tn5250_wdsf_ds_gdc = -1;
-static int hf_tn5250_wdsf_ds_gdc_indicators = -1;
-static int hf_tn5250_wdsf_ds_gdc_selection_techniques = -1;
-static int hf_tn5250_wdsf_ds_mbs_color_sep = -1;
-static int hf_tn5250_wdsf_ds_mbs_end_column = -1;
-static int hf_tn5250_wdsf_ds_mbs_flag = -1;
-static int hf_tn5250_wdsf_ds_mbs_flag_0 = -1;
-static int hf_tn5250_wdsf_ds_mbs_flag_1 = -1;
-static int hf_tn5250_wdsf_ds_mbs_flag_reserved = -1;
-static int hf_tn5250_wdsf_ds_mbs_monochrome_sep = -1;
-static int hf_tn5250_wdsf_ds_mbs_sep_char = -1;
-static int hf_tn5250_wdsf_ds_mbs_start_column = -1;
-static int hf_tn5250_wdsf_ds_minor_type = -1;
-static int hf_tn5250_wdsf_ds_numeric_sep = -1;
-static int hf_tn5250_wdsf_ds_nws = -1;
-static int hf_tn5250_wdsf_ds_nws_indicators = -1;
-static int hf_tn5250_wdsf_ds_nws_selection_techniques = -1;
-static int hf_tn5250_wdsf_ds_nws_wout = -1;
-static int hf_tn5250_wdsf_ds_padding = -1;
-static int hf_tn5250_wdsf_ds_rows = -1;
-static int hf_tn5250_wdsf_ds_sbi_bottom_character = -1;
-static int hf_tn5250_wdsf_ds_sbi_color_top_highlight = -1;
-static int hf_tn5250_wdsf_ds_sbi_color_top_highlight_shaft = -1;
-static int hf_tn5250_wdsf_ds_sbi_empty_character = -1;
-static int hf_tn5250_wdsf_ds_sbi_flag1 = -1;
-static int hf_tn5250_wdsf_ds_sbi_flag1_0 = -1;
-static int hf_tn5250_wdsf_ds_sbi_monochrome_top_highlight = -1;
-static int hf_tn5250_wdsf_ds_sbi_monochrome_top_highlight_shaft = -1;
-static int hf_tn5250_wdsf_ds_sbi_slider_character = -1;
-static int hf_tn5250_wdsf_ds_sbi_top_character = -1;
-static int hf_tn5250_wdsf_ds_sliderpos = -1;
-static int hf_tn5250_wdsf_ds_textsize = -1;
-static int hf_tn5250_wdsf_ds_totalrows = -1;
-static int hf_tn5250_wdsf_ds_type = -1;
-static int hf_tn5250_wdsf_dsb_flag1 = -1;
-static int hf_tn5250_wdsf_dsb_flag1_0 = -1;
-static int hf_tn5250_wdsf_dsb_flag1_1 = -1;
-static int hf_tn5250_wdsf_dsb_flag1_7 = -1;
-static int hf_tn5250_wdsf_pmb_first_mouse_event = -1;
-static int hf_tn5250_wdsf_pmb_flag1 = -1;
-static int hf_tn5250_wdsf_pmb_flag1_0 = -1;
-static int hf_tn5250_wdsf_pmb_flag1_1 = -1;
-static int hf_tn5250_wdsf_pmb_flag1_2 = -1;
-static int hf_tn5250_wdsf_pmb_flag1_3 = -1;
-static int hf_tn5250_wdsf_pmb_second_mouse_event = -1;
-static int hf_tn5250_wdsf_ragc_flag1 = -1;
-static int hf_tn5250_wdsf_ragc_flag1_0 = -1;
-static int hf_tn5250_wdsf_ragc_reserved = -1;
-static int hf_tn5250_wdsf_rgw_flag1 = -1;
-static int hf_tn5250_wdsf_rgw_flag1_0 = -1;
-static int hf_tn5250_wdsf_rgw_flag1_1 = -1;
-static int hf_tn5250_wdsf_rgw_reserved = -1;
-static int hf_tn5250_wdsf_sbi_rowscols = -1;
-static int hf_tn5250_wdsf_sbi_sliderpos = -1;
-static int hf_tn5250_wdsf_sbi_total_scroll = -1;
-static int hf_tn5250_wdsf_wdf_flag1 = -1;
-static int hf_tn5250_wdsf_wdf_flag1_0 = -1;
-static int hf_tn5250_wea_prim_attr = -1;
-static int hf_tn5250_wea_prim_attr_blink = -1;
-static int hf_tn5250_wea_prim_attr_col = -1;
-static int hf_tn5250_wea_prim_attr_flag = -1;
-static int hf_tn5250_wea_prim_attr_int = -1;
-static int hf_tn5250_wea_prim_attr_rev = -1;
-static int hf_tn5250_wea_prim_attr_und = -1;
-static int hf_tn5250_wectw_end_column = -1;
-static int hf_tn5250_wectw_start_column = -1;
-static int hf_tn5250_wsf_qss_flag1 = -1;
-static int hf_tn5250_wsf_qss_flag1_0 = -1;
-static int hf_tn5250_wsf_qss_flag1_reserved = -1;
-static int hf_tn5250_wsf_qss_flag2 = -1;
-static int hf_tn5250_wsf_qss_flag2_7 = -1;
-static int hf_tn5250_wsf_qss_flag2_reserved = -1;
-static int hf_tn5250_wssf_cc_flag1 = -1;
-static int hf_tn5250_wssf_cc_flag1_7 = -1;
-static int hf_tn5250_wssf_cc_flag1_reserved = -1;
-static int hf_tn5250_wssf_flag1 = -1;
-static int hf_tn5250_wssf_flag2 = -1;
-static int hf_tn5250_wssf_flag2_0 = -1;
-static int hf_tn5250_wssf_flag2_1 = -1;
-static int hf_tn5250_wssf_flag2_2 = -1;
-static int hf_tn5250_wssf_flag2_3 = -1;
-static int hf_tn5250_wssf_flag2_4 = -1;
-static int hf_tn5250_wssf_flag2_5 = -1;
-static int hf_tn5250_wssf_flag2_6 = -1;
-static int hf_tn5250_wssf_flag2_7 = -1;
-static int hf_tn5250_wssf_ifc_background_color = -1;
-static int hf_tn5250_wssf_ifc_flag1 = -1;
-static int hf_tn5250_wssf_ifc_flag1_0 = -1;
-static int hf_tn5250_wssf_ifc_flag1_1to3 = -1;
-static int hf_tn5250_wssf_ifc_flag1_4 = -1;
-static int hf_tn5250_wssf_ifc_flag1_5 = -1;
-static int hf_tn5250_wssf_ifc_flag1_6 = -1;
-static int hf_tn5250_wssf_ifc_flag1_7 = -1;
-static int hf_tn5250_wssf_ifc_flag2 = -1;
-static int hf_tn5250_wssf_ifc_flag2_0 = -1;
-static int hf_tn5250_wssf_ifc_flag2_1 = -1;
-static int hf_tn5250_wssf_ifc_flag2_7 = -1;
-static int hf_tn5250_wssf_ifc_flag2_reserved = -1;
-static int hf_tn5250_wssf_ifc_foreground_color = -1;
-static int hf_tn5250_wssf_ifc_image_format = -1;
-static int hf_tn5250_wssf_ifc_imagefax_name = -1;
-static int hf_tn5250_wssf_ifc_rotation = -1;
-static int hf_tn5250_wssf_ifc_scaling = -1;
-static int hf_tn5250_wssf_ifc_viewimage_location_col = -1;
-static int hf_tn5250_wssf_ifc_viewimage_location_row = -1;
-static int hf_tn5250_wssf_ifc_viewport_location_col = -1;
-static int hf_tn5250_wssf_ifc_viewport_location_row = -1;
-static int hf_tn5250_wssf_ifc_viewport_size_col = -1;
-static int hf_tn5250_wssf_ifc_viewport_size_row = -1;
-static int hf_tn5250_wssf_ifd_flag1 = -1;
-static int hf_tn5250_wssf_ifd_flag1_0 = -1;
-static int hf_tn5250_wssf_ifd_flag1_reserved = -1;
-static int hf_tn5250_wssf_ifd_imagefax_data = -1;
-static int hf_tn5250_wssf_ifd_imagefax_name = -1;
-static int hf_tn5250_wssf_kbc_flag1 = -1;
-static int hf_tn5250_wssf_kbc_flag1_5 = -1;
-static int hf_tn5250_wssf_kbc_flag1_6 = -1;
-static int hf_tn5250_wssf_kbc_flag1_7 = -1;
-static int hf_tn5250_wssf_kbc_flag1_reserved = -1;
-static int hf_tn5250_wssf_wsc_minor_type = -1;
-static int hf_tn5250_wtd_ccc1 = -1;
-static int hf_tn5250_wtd_ccc2 = -1;
-static int hf_tn5250_wtd_ccc2_alarm = -1;
-static int hf_tn5250_wtd_ccc2_cursor = -1;
-static int hf_tn5250_wtd_ccc2_off = -1;
-static int hf_tn5250_wtd_ccc2_on = -1;
-static int hf_tn5250_wtd_ccc2_res = -1;
-static int hf_tn5250_wtd_ccc2_reset = -1;
-static int hf_tn5250_wtd_ccc2_set = -1;
-static int hf_tn5250_wtd_ccc2_unlock = -1;
-static int hf_tn5250_wts_cld_flag1 = -1;
-static int hf_tn5250_wts_cld_flag1_0 = -1;
-static int hf_tn5250_wts_cld_flag1_1 = -1;
-static int hf_tn5250_wts_cld_flag1_2 = -1;
-static int hf_tn5250_wts_cld_flag1_3 = -1;
-static int hf_tn5250_wts_cld_flag1_4 = -1;
-static int hf_tn5250_wts_cld_flag1_5 = -1;
-static int hf_tn5250_wts_cld_flag1_6 = -1;
-static int hf_tn5250_wts_cld_flag1_7 = -1;
-static int hf_tn5250_wts_cld_flag2 = -1;
-static int hf_tn5250_wts_cld_flag2_0 = -1;
-static int hf_tn5250_wts_cld_flag2_1 = -1;
-static int hf_tn5250_wts_cld_flag2_2 = -1;
-static int hf_tn5250_wts_cld_flag2_3 = -1;
-static int hf_tn5250_wts_cld_flag2_4 = -1;
-static int hf_tn5250_wts_cld_flag2_line_spacing = -1;
-static int hf_tn5250_wts_cld_flag3 = -1;
-static int hf_tn5250_wts_cld_flag3_0 = -1;
-static int hf_tn5250_wts_cld_flag3_1 = -1;
-static int hf_tn5250_wts_cld_flag3_2 = -1;
-static int hf_tn5250_wts_cld_flag3_3 = -1;
-static int hf_tn5250_wts_cld_flag3_4 = -1;
-static int hf_tn5250_wts_cld_flag3_5 = -1;
-static int hf_tn5250_wts_cld_flag3_6 = -1;
-static int hf_tn5250_wts_cld_flag3_7 = -1;
-static int hf_tn5250_wts_cld_io = -1;
-static int hf_tn5250_wts_cld_li = -1;
-static int hf_tn5250_wts_cld_lmo = -1;
-static int hf_tn5250_wts_cld_page_num = -1;
-static int hf_tn5250_wts_cld_row = -1;
-static int hf_tn5250_wts_cld_sli = -1;
-static int hf_tn5250_wts_flag1 = -1;
-static int hf_tn5250_wts_flag1_0 = -1;
-static int hf_tn5250_wts_flag1_1 = -1;
-static int hf_tn5250_wts_flag1_2 = -1;
-static int hf_tn5250_wts_flag1_3 = -1;
-static int hf_tn5250_wts_flag1_reserved = -1;
-static int hf_tn5250_wts_flag2 = -1;
-static int hf_tn5250_wts_flag2_6 = -1;
-static int hf_tn5250_wts_flag2_reserved = -1;
-static int hf_tn5250_wts_flag2_reserved2 = -1;
-static int hf_tn5250_wts_flag3 = -1;
-static int hf_tn5250_wts_flag3_0 = -1;
-static int hf_tn5250_wts_flag3_1 = -1;
-static int hf_tn5250_wts_flag3_2 = -1;
-static int hf_tn5250_wts_flag3_3 = -1;
-static int hf_tn5250_wts_flag3_4 = -1;
-static int hf_tn5250_wts_flag3_5 = -1;
-static int hf_tn5250_wts_flag3_6 = -1;
-static int hf_tn5250_wts_flag3_7 = -1;
-static int hf_tn5250_wts_home_position_col = -1;
-static int hf_tn5250_wts_home_position_row = -1;
-static int hf_tn5250_wts_partition = -1;
-static int hf_tn5250_soh_length = -1;
-static int hf_tn5250_negative_response = -1;
-static int hf_tn5250_qr_ccl = -1;
-static int hf_tn5250_qr_chc= -1;
-static int hf_tn5250_qr_dm= -1;
-static int hf_tn5250_qr_dsn= -1;
-static int hf_tn5250_qr_dt= -1;
-static int hf_tn5250_qr_dtc= -1;
-static int hf_tn5250_qr_eki= -1;
-static int hf_tn5250_qr_flag= -1;
-static int hf_tn5250_qr_flag1= -1;
-static int hf_tn5250_qr_flag2= -1;
-static int hf_tn5250_qr_flag3= -1;
-static int hf_tn5250_qr_flag4= -1;
-static int hf_tn5250_qr_ki= -1;
-static int hf_tn5250_qr_flag1_0= -1;
-static int hf_tn5250_qr_flag1_1= -1;
-static int hf_tn5250_qr_flag1_2= -1;
-static int hf_tn5250_qr_flag1_3= -1;
-static int hf_tn5250_qr_flag1_4= -1;
-static int hf_tn5250_qr_flag1_5= -1;
-static int hf_tn5250_qr_flag1_6= -1;
-static int hf_tn5250_qr_flag1_7= -1;
-static int hf_tn5250_qr_flag2_0to3= -1;
-static int hf_tn5250_qr_flag2_4= -1;
-static int hf_tn5250_qr_flag2_5= -1;
-static int hf_tn5250_qr_flag2_6to7= -1;
-static int hf_tn5250_qr_flag_0= -1;
-static int hf_tn5250_qr_flag_reserved= -1;
-static int hf_tn5250_qr_mni= -1;
-static int hf_tn5250_image_fax_error = -1;
-static int hf_tn5250_vac_data = -1;
-static int hf_tn5250_vac_prefix = -1;
-static int hf_tn5250_wssf_ttw_flag = -1;
-static int hf_tn5250_wssf_ttw_data = -1;
-
-static gint ett_tn5250 = -1;
-static gint ett_tn5250_wcc = -1;
-static gint ett_sf = -1;
-static gint ett_tn5250_field_attribute = -1;
-static gint ett_tn5250_dfdpck_mask = -1;
-static gint ett_tn5250_field_validation = -1;
-static gint ett_tn5250_header_flags = -1;
-static gint ett_tn5250_roll_mask = -1;
-static gint ett_tn5250_soh_mask = -1;
-static gint ett_tn5250_soh_pf16to9_mask = -1;
-static gint ett_tn5250_soh_pf24to17_mask = -1;
-static gint ett_tn5250_soh_pf8to1_mask = -1;
-static gint ett_tn5250_sps_mask = -1;
-static gint ett_tn5250_wdsf_cw_bp_mask = -1;
-static gint ett_tn5250_wdsf_cw_mask = -1;
-static gint ett_tn5250_wdsf_cw_tf_mask = -1;
-static gint ett_tn5250_wdsf_deg_mask = -1;
-static gint ett_tn5250_wdsf_deg_ms_mask = -1;
-static gint ett_tn5250_wdsf_ds_ci_mask = -1;
-static gint ett_tn5250_wdsf_ds_cpda_mask = -1;
-static gint ett_tn5250_wdsf_ds_ct_mask = -1;
-static gint ett_tn5250_wdsf_ds_mask = -1;
-static gint ett_tn5250_wdsf_ds_mbs_mask = -1;
-static gint ett_tn5250_wdsf_ds_sbi_mask = -1;
-static gint ett_tn5250_wdsf_dsb_mask = -1;
-static gint ett_tn5250_wdsf_pmb_mask = -1;
-static gint ett_tn5250_wdsf_ragc_mask = -1;
-static gint ett_tn5250_wdsf_rgw_mask = -1;
-static gint ett_tn5250_wdsf_wdf_mask = -1;
-static gint ett_tn5250_wsf_dpo_mask = -1;
-static gint ett_tn5250_wsf_dsl_mask = -1;
-static gint ett_tn5250_wsf_dtsf_mask = -1;
-static gint ett_tn5250_wsf_qss_mask = -1;
-static gint ett_tn5250_wsf_rts_mask = -1;
-static gint ett_tn5250_wssf_cc_mask = -1;
-static gint ett_tn5250_wssf_ifc_mask = -1;
-static gint ett_tn5250_wssf_ifd_mask = -1;
-static gint ett_tn5250_wssf_kbc_mask = -1;
-static gint ett_tn5250_wssf_mask = -1;
-static gint ett_tn5250_wts_mask = -1;
-static gint ett_tn5250_qr_mask = -1;
-static gint ett_tn5250_wea_prim_attr = -1;
-static gint ett_cc = -1;
-
-static expert_field ei_tn5250_command_code = EI_INIT;
+static int proto_tn5250;
+static int hf_tn5250_aid;
+static int hf_tn5250_attn_key;
+static int hf_tn5250_attribute_type;
+static int hf_tn5250_buffer_x;
+static int hf_tn5250_buffer_y;
+static int hf_tn5250_command_code;
+static int hf_tn5250_ctp_lsid;
+static int hf_tn5250_ctp_mlpp;
+static int hf_tn5250_cua_parm;
+static int hf_tn5250_dawt_char;
+static int hf_tn5250_dawt_id;
+static int hf_tn5250_dawt_length;
+static int hf_tn5250_dawt_message;
+static int hf_tn5250_dckf_function_code;
+static int hf_tn5250_dckf_id;
+static int hf_tn5250_dckf_key_code;
+static int hf_tn5250_dckf_length;
+static int hf_tn5250_dckf_prompt_text;
+static int hf_tn5250_dfdpck_coreflag;
+static int hf_tn5250_dfdpck_coreflag_0;
+static int hf_tn5250_dfdpck_coreflag_1;
+static int hf_tn5250_dfdpck_coreflag_2;
+static int hf_tn5250_dfdpck_coreflag_3;
+static int hf_tn5250_dfdpck_coreflag_4;
+static int hf_tn5250_dfdpck_coreflag_5;
+static int hf_tn5250_dfdpck_coreflag_6;
+static int hf_tn5250_dfdpck_coreflag_7;
+static int hf_tn5250_dfdpck_data_field;
+static int hf_tn5250_dfdpck_partition;
+static int hf_tn5250_dfdpck_toprowflag1;
+static int hf_tn5250_dfdpck_toprowflag1_0;
+static int hf_tn5250_dfdpck_toprowflag1_1;
+static int hf_tn5250_dfdpck_toprowflag1_2;
+static int hf_tn5250_dfdpck_toprowflag1_3;
+static int hf_tn5250_dfdpck_toprowflag1_4;
+static int hf_tn5250_dfdpck_toprowflag1_5;
+static int hf_tn5250_dfdpck_toprowflag1_6;
+static int hf_tn5250_dfdpck_toprowflag1_7;
+static int hf_tn5250_dfdpck_toprowflag2;
+static int hf_tn5250_dfdpck_toprowflag2_0;
+static int hf_tn5250_dfdpck_toprowflag2_1;
+static int hf_tn5250_dfdpck_toprowflag2_2;
+static int hf_tn5250_dfdpck_toprowflag2_3;
+static int hf_tn5250_dfdpck_toprowflag2_4;
+static int hf_tn5250_dfdpck_toprowflag2_5;
+static int hf_tn5250_dfdpck_toprowflag2_6;
+static int hf_tn5250_dfdpck_toprowflag2_7;
+static int hf_tn5250_dfdpck_toprowflag3;
+static int hf_tn5250_dfdpck_toprowflag3_0;
+static int hf_tn5250_dfdpck_toprowflag3_1;
+static int hf_tn5250_dfdpck_toprowflag3_2;
+static int hf_tn5250_dfdpck_toprowflag3_3;
+static int hf_tn5250_dfdpck_toprowflag3_4;
+static int hf_tn5250_dfdpck_toprowflag3_5;
+static int hf_tn5250_dfdpck_toprowflag3_6;
+static int hf_tn5250_dfdpck_toprowflag3_7;
+static int hf_tn5250_dorm_ec;
+static int hf_tn5250_dorm_id;
+static int hf_tn5250_dorm_length;
+static int hf_tn5250_dorm_mt;
+static int hf_tn5250_dpo_displace_characters;
+static int hf_tn5250_dpo_flag1;
+static int hf_tn5250_dpo_flag1_0;
+static int hf_tn5250_dpo_flag1_1;
+static int hf_tn5250_dpo_flag1_2;
+static int hf_tn5250_dpo_flag1_3;
+static int hf_tn5250_dpo_flag1_4;
+static int hf_tn5250_dpo_flag1_5;
+static int hf_tn5250_dpo_flag1_6;
+static int hf_tn5250_dpo_flag1_7;
+static int hf_tn5250_dpo_flag2;
+static int hf_tn5250_dpo_flag2_0;
+static int hf_tn5250_dpo_flag2_reserved;
+static int hf_tn5250_dpo_partition;
+static int hf_tn5250_dpo_start_location_col;
+static int hf_tn5250_dpo_start_location_row;
+static int hf_tn5250_dpt_ec;
+static int hf_tn5250_dpt_id;
+static int hf_tn5250_ds_output_error;
+static int hf_tn5250_dsc_ev;
+static int hf_tn5250_dsc_partition;
+static int hf_tn5250_dsc_sk;
+static int hf_tn5250_dsl_flag1;
+static int hf_tn5250_dsl_flag1_0;
+static int hf_tn5250_dsl_flag1_1;
+static int hf_tn5250_dsl_flag1_2;
+static int hf_tn5250_dsl_flag1_reserved;
+static int hf_tn5250_dsl_function;
+static int hf_tn5250_dsl_id;
+static int hf_tn5250_dsl_location;
+static int hf_tn5250_dsl_offset;
+static int hf_tn5250_dsl_partition;
+static int hf_tn5250_dsl_rtl_offset;
+static int hf_tn5250_dtsf_first_line;
+static int hf_tn5250_dtsf_flag1;
+static int hf_tn5250_dtsf_flag1_0;
+static int hf_tn5250_dtsf_flag1_1;
+static int hf_tn5250_dtsf_flag1_2;
+static int hf_tn5250_dtsf_flag1_3;
+static int hf_tn5250_dtsf_flag1_4;
+static int hf_tn5250_dtsf_flag1_5;
+static int hf_tn5250_dtsf_flag1_6;
+static int hf_tn5250_dtsf_flag1_7;
+static int hf_tn5250_dtsf_flag2;
+static int hf_tn5250_dtsf_flag2_0;
+static int hf_tn5250_dtsf_flag2_1;
+static int hf_tn5250_dtsf_flag2_2;
+static int hf_tn5250_dtsf_flag2_3;
+static int hf_tn5250_dtsf_flag2_4to7;
+static int hf_tn5250_dtsf_line_cmd_field_size;
+static int hf_tn5250_dtsf_location_of_pitch;
+static int hf_tn5250_dtsf_partition;
+static int hf_tn5250_dtsf_text_body_height;
+static int hf_tn5250_dtsf_text_body_width;
+static int hf_tn5250_soh_err;
+static int hf_tn5250_error_code;
+static int hf_tn5250_error_state;
+static int hf_tn5250_escape_code;
+static int hf_tn5250_fa_color;
+static int hf_tn5250_fcw;
+static int hf_tn5250_ffw;
+static int hf_tn5250_ffw_adjust;
+static int hf_tn5250_ffw_auto;
+static int hf_tn5250_ffw_bypass;
+static int hf_tn5250_ffw_dup;
+static int hf_tn5250_ffw_fer;
+static int hf_tn5250_ffw_id;
+static int hf_tn5250_ffw_mdt;
+static int hf_tn5250_ffw_me;
+static int hf_tn5250_ffw_monocase;
+static int hf_tn5250_ffw_res;
+static int hf_tn5250_ffw_shift;
+static int hf_tn5250_field_data;
+static int hf_tn5250_foreground_color_attr;
+static int hf_tn5250_header_flags;
+static int hf_tn5250_ideographic_attr;
+static int hf_tn5250_length;
+static int hf_tn5250_length_twobyte;
+static int hf_tn5250_logical_record_length;
+static int hf_tn5250_operation_code;
+static int hf_tn5250_order_code;
+static int hf_tn5250_repeated_character;
+static int hf_tn5250_reserved;
+static int hf_tn5250_roll_bottom_line;
+static int hf_tn5250_roll_flag1;
+static int hf_tn5250_roll_flag1_0;
+static int hf_tn5250_roll_flag1_lines;
+static int hf_tn5250_roll_flag1_reserved;
+static int hf_tn5250_roll_top_line;
+static int hf_tn5250_rts_flag1;
+static int hf_tn5250_rts_flag1_0;
+static int hf_tn5250_rts_flag1_reserved;
+static int hf_tn5250_rts_partition;
+static int hf_tn5250_sf_attr_flag;
+static int hf_tn5250_sf_class;
+static int hf_tn5250_fa;
+static int hf_tn5250_sf_length;
+static int hf_tn5250_sf_type;
+static int hf_tn5250_sna_record_type;
+static int hf_tn5250_soh_cursor_direction;
+static int hf_tn5250_soh_flags;
+static int hf_tn5250_soh_input_capable_only;
+static int hf_tn5250_soh_pf1;
+static int hf_tn5250_soh_pf10;
+static int hf_tn5250_soh_pf11;
+static int hf_tn5250_soh_pf12;
+static int hf_tn5250_soh_pf13;
+static int hf_tn5250_soh_pf14;
+static int hf_tn5250_soh_pf15;
+static int hf_tn5250_soh_pf16;
+static int hf_tn5250_soh_pf16to9;
+static int hf_tn5250_soh_pf17;
+static int hf_tn5250_soh_pf18;
+static int hf_tn5250_soh_pf19;
+static int hf_tn5250_soh_pf2;
+static int hf_tn5250_soh_pf20;
+static int hf_tn5250_soh_pf21;
+static int hf_tn5250_soh_pf22;
+static int hf_tn5250_soh_pf23;
+static int hf_tn5250_soh_pf24;
+static int hf_tn5250_soh_pf24to17;
+static int hf_tn5250_soh_pf3;
+static int hf_tn5250_soh_pf4;
+static int hf_tn5250_soh_pf5;
+static int hf_tn5250_soh_pf6;
+static int hf_tn5250_soh_pf7;
+static int hf_tn5250_soh_pf8;
+static int hf_tn5250_soh_pf8to1;
+static int hf_tn5250_soh_pf9;
+static int hf_tn5250_soh_resq;
+static int hf_tn5250_soh_screen_reverse;
+static int hf_tn5250_sps_flag1;
+static int hf_tn5250_sps_flag1_0;
+static int hf_tn5250_sps_flag1_reserved;
+static int hf_tn5250_sps_left_column;
+static int hf_tn5250_sps_top_row;
+static int hf_tn5250_sps_window_depth;
+static int hf_tn5250_sps_window_width;
+static int hf_tn5250_sys_request_key;
+static int hf_tn5250_test_request_key;
+static int hf_tn5250_unknown_data;
+static int hf_tn5250_variable_record_length;
+static int hf_tn5250_wdsf_cw_bp_flag1_reserved;
+static int hf_tn5250_wdsf_cw_tf_flag_reserved;
+static int hf_tn5250_wdsf_deg_flag2_reserved;
+static int hf_tn5250_wdsf_deg_ms_flag1_reserved;
+static int hf_tn5250_wdsf_ds_ci_flag1_reserved;
+static int hf_tn5250_wdsf_ds_cpda_flag1_reserved;
+static int hf_tn5250_wdsf_ds_ct_flag3_reserved;
+static int hf_tn5250_wdsf_ds_gdc_reserved;
+static int hf_tn5250_wdsf_ds_nws_reserved;
+static int hf_tn5250_wdsf_ds_sbi_flag1_reserved;
+static int hf_tn5250_wdsf_dsb_flag1_reserved;
+static int hf_tn5250_wdsf_pmb_flag1_reserved;
+static int hf_tn5250_wdsf_wdf_flag1_reserved;
+static int hf_tn5250_wdsf_cgl_partition;
+static int hf_tn5250_wdsf_cgl_rectangle_height;
+static int hf_tn5250_wdsf_cgl_rectangle_width;
+static int hf_tn5250_wdsf_cgl_start_column;
+static int hf_tn5250_wdsf_cgl_start_row;
+static int hf_tn5250_wdsf_cw_bp_bbc;
+static int hf_tn5250_wdsf_cw_bp_cba;
+static int hf_tn5250_wdsf_cw_bp_flag1;
+static int hf_tn5250_wdsf_cw_bp_flag1_1;
+static int hf_tn5250_wdsf_cw_bp_lbc;
+static int hf_tn5250_wdsf_cw_bp_llbc;
+static int hf_tn5250_wdsf_cw_bp_lrbc;
+static int hf_tn5250_wdsf_cw_bp_mba;
+static int hf_tn5250_wdsf_cw_bp_rbc;
+static int hf_tn5250_wdsf_cw_bp_tbc;
+static int hf_tn5250_wdsf_cw_bp_ulbc;
+static int hf_tn5250_wdsf_cw_bp_urbc;
+static int hf_tn5250_wdsf_cw_flag1;
+static int hf_tn5250_wdsf_cw_flag1_1;
+static int hf_tn5250_wdsf_cw_flag1_2;
+static int hf_tn5250_wdsf_cw_flag1_reserved;
+static int hf_tn5250_wdsf_cw_minor_type;
+static int hf_tn5250_wdsf_cw_tf_cba;
+static int hf_tn5250_wdsf_cw_tf_flag;
+static int hf_tn5250_wdsf_cw_tf_flag_1;
+static int hf_tn5250_wdsf_cw_tf_flag_orientation;
+static int hf_tn5250_wdsf_cw_tf_mba;
+static int hf_tn5250_wdsf_cw_tf_text;
+static int hf_tn5250_wdsf_cw_wd;
+static int hf_tn5250_wdsf_cw_ww;
+static int hf_tn5250_wdsf_deg_default_color;
+static int hf_tn5250_wdsf_deg_default_line;
+static int hf_tn5250_wdsf_deg_flag1;
+static int hf_tn5250_wdsf_deg_flag1_0;
+static int hf_tn5250_wdsf_deg_flag1_reserved;
+static int hf_tn5250_wdsf_deg_flag2;
+static int hf_tn5250_wdsf_deg_flag2_0;
+static int hf_tn5250_wdsf_deg_minor_type;
+static int hf_tn5250_wdsf_deg_ms_default_color;
+static int hf_tn5250_wdsf_deg_ms_flag1;
+static int hf_tn5250_wdsf_deg_ms_flag1_0;
+static int hf_tn5250_wdsf_deg_ms_horizontal_dimension;
+static int hf_tn5250_wdsf_deg_ms_line_interval;
+static int hf_tn5250_wdsf_deg_ms_line_repeat;
+static int hf_tn5250_wdsf_deg_ms_start_column;
+static int hf_tn5250_wdsf_deg_ms_start_row;
+static int hf_tn5250_wdsf_deg_ms_vertical_dimension;
+static int hf_tn5250_wdsf_deg_partition;
+static int hf_tn5250_wdsf_ds_cancel_aid;
+static int hf_tn5250_wdsf_ds_ci_first_choice;
+static int hf_tn5250_wdsf_ds_ci_flag1;
+static int hf_tn5250_wdsf_ds_ci_flag1_0;
+static int hf_tn5250_wdsf_ds_ci_left_push;
+static int hf_tn5250_wdsf_ds_ci_right_push;
+static int hf_tn5250_wdsf_ds_columns;
+static int hf_tn5250_wdsf_ds_country_sel;
+static int hf_tn5250_wdsf_ds_cpda_color_avail;
+static int hf_tn5250_wdsf_ds_cpda_color_indicator;
+static int hf_tn5250_wdsf_ds_cpda_color_sel_avail;
+static int hf_tn5250_wdsf_ds_cpda_color_sel_selected;
+static int hf_tn5250_wdsf_ds_cpda_color_sel_unavail;
+static int hf_tn5250_wdsf_ds_cpda_color_selected;
+static int hf_tn5250_wdsf_ds_cpda_color_unavail;
+static int hf_tn5250_wdsf_ds_cpda_color_unavail_indicator;
+static int hf_tn5250_wdsf_ds_cpda_flag1;
+static int hf_tn5250_wdsf_ds_cpda_flag1_0;
+static int hf_tn5250_wdsf_ds_cpda_flag1_1;
+static int hf_tn5250_wdsf_ds_cpda_flag1_2;
+static int hf_tn5250_wdsf_ds_cpda_monochrome_avail;
+static int hf_tn5250_wdsf_ds_cpda_monochrome_indicator;
+static int hf_tn5250_wdsf_ds_cpda_monochrome_sel_avail;
+static int hf_tn5250_wdsf_ds_cpda_monochrome_sel_selected;
+static int hf_tn5250_wdsf_ds_cpda_monochrome_sel_unavail;
+static int hf_tn5250_wdsf_ds_cpda_monochrome_selected;
+static int hf_tn5250_wdsf_ds_cpda_monochrome_unavail;
+static int hf_tn5250_wdsf_ds_cpda_monochrome_unavail_indicator;
+static int hf_tn5250_wdsf_ds_ct_aid;
+static int hf_tn5250_wdsf_ds_ct_flag1;
+static int hf_tn5250_wdsf_ds_ct_flag1_2;
+static int hf_tn5250_wdsf_ds_ct_flag1_3;
+static int hf_tn5250_wdsf_ds_ct_flag1_4;
+static int hf_tn5250_wdsf_ds_ct_flag1_5;
+static int hf_tn5250_wdsf_ds_ct_flag1_choice_state;
+static int hf_tn5250_wdsf_ds_ct_flag1_numeric_selection;
+static int hf_tn5250_wdsf_ds_ct_flag2;
+static int hf_tn5250_wdsf_ds_ct_flag2_0;
+static int hf_tn5250_wdsf_ds_ct_flag2_1;
+static int hf_tn5250_wdsf_ds_ct_flag2_2;
+static int hf_tn5250_wdsf_ds_ct_flag2_3;
+static int hf_tn5250_wdsf_ds_ct_flag2_4;
+static int hf_tn5250_wdsf_ds_ct_flag2_5;
+static int hf_tn5250_wdsf_ds_ct_flag2_6;
+static int hf_tn5250_wdsf_ds_ct_flag2_7;
+static int hf_tn5250_wdsf_ds_ct_flag3;
+static int hf_tn5250_wdsf_ds_ct_flag3_0;
+static int hf_tn5250_wdsf_ds_ct_flag3_1;
+static int hf_tn5250_wdsf_ds_ct_flag3_2;
+static int hf_tn5250_wdsf_ds_ct_mnemonic_offset;
+static int hf_tn5250_wdsf_ds_ct_numeric_onebyte;
+static int hf_tn5250_wdsf_ds_ct_numeric_twobyte;
+static int hf_tn5250_wdsf_ds_ct_text;
+static int hf_tn5250_wdsf_ds_flag1;
+static int hf_tn5250_wdsf_ds_flag1_1;
+static int hf_tn5250_wdsf_ds_flag1_2;
+static int hf_tn5250_wdsf_ds_flag1_auto_enter;
+static int hf_tn5250_wdsf_ds_flag1_mouse_characteristics;
+static int hf_tn5250_wdsf_ds_flag1_reserved;
+static int hf_tn5250_wdsf_ds_flag2;
+static int hf_tn5250_wdsf_ds_flag2_1;
+static int hf_tn5250_wdsf_ds_flag2_2;
+static int hf_tn5250_wdsf_ds_flag2_3;
+static int hf_tn5250_wdsf_ds_flag2_4;
+static int hf_tn5250_wdsf_ds_flag2_5;
+static int hf_tn5250_wdsf_ds_flag2_6;
+static int hf_tn5250_wdsf_ds_flag2_reserved;
+static int hf_tn5250_wdsf_ds_flag3;
+static int hf_tn5250_wdsf_ds_flag3_1;
+static int hf_tn5250_wdsf_ds_flag3_reserved;
+static int hf_tn5250_wdsf_ds_gdc;
+static int hf_tn5250_wdsf_ds_gdc_indicators;
+static int hf_tn5250_wdsf_ds_gdc_selection_techniques;
+static int hf_tn5250_wdsf_ds_mbs_color_sep;
+static int hf_tn5250_wdsf_ds_mbs_end_column;
+static int hf_tn5250_wdsf_ds_mbs_flag;
+static int hf_tn5250_wdsf_ds_mbs_flag_0;
+static int hf_tn5250_wdsf_ds_mbs_flag_1;
+static int hf_tn5250_wdsf_ds_mbs_flag_reserved;
+static int hf_tn5250_wdsf_ds_mbs_monochrome_sep;
+static int hf_tn5250_wdsf_ds_mbs_sep_char;
+static int hf_tn5250_wdsf_ds_mbs_start_column;
+static int hf_tn5250_wdsf_ds_minor_type;
+static int hf_tn5250_wdsf_ds_numeric_sep;
+static int hf_tn5250_wdsf_ds_nws;
+static int hf_tn5250_wdsf_ds_nws_indicators;
+static int hf_tn5250_wdsf_ds_nws_selection_techniques;
+static int hf_tn5250_wdsf_ds_nws_wout;
+static int hf_tn5250_wdsf_ds_padding;
+static int hf_tn5250_wdsf_ds_rows;
+static int hf_tn5250_wdsf_ds_sbi_bottom_character;
+static int hf_tn5250_wdsf_ds_sbi_color_top_highlight;
+static int hf_tn5250_wdsf_ds_sbi_color_top_highlight_shaft;
+static int hf_tn5250_wdsf_ds_sbi_empty_character;
+static int hf_tn5250_wdsf_ds_sbi_flag1;
+static int hf_tn5250_wdsf_ds_sbi_flag1_0;
+static int hf_tn5250_wdsf_ds_sbi_monochrome_top_highlight;
+static int hf_tn5250_wdsf_ds_sbi_monochrome_top_highlight_shaft;
+static int hf_tn5250_wdsf_ds_sbi_slider_character;
+static int hf_tn5250_wdsf_ds_sbi_top_character;
+static int hf_tn5250_wdsf_ds_sliderpos;
+static int hf_tn5250_wdsf_ds_textsize;
+static int hf_tn5250_wdsf_ds_totalrows;
+static int hf_tn5250_wdsf_ds_type;
+static int hf_tn5250_wdsf_dsb_flag1;
+static int hf_tn5250_wdsf_dsb_flag1_0;
+static int hf_tn5250_wdsf_dsb_flag1_1;
+static int hf_tn5250_wdsf_dsb_flag1_7;
+static int hf_tn5250_wdsf_pmb_first_mouse_event;
+static int hf_tn5250_wdsf_pmb_flag1;
+static int hf_tn5250_wdsf_pmb_flag1_0;
+static int hf_tn5250_wdsf_pmb_flag1_1;
+static int hf_tn5250_wdsf_pmb_flag1_2;
+static int hf_tn5250_wdsf_pmb_flag1_3;
+static int hf_tn5250_wdsf_pmb_second_mouse_event;
+static int hf_tn5250_wdsf_ragc_flag1;
+static int hf_tn5250_wdsf_ragc_flag1_0;
+static int hf_tn5250_wdsf_ragc_reserved;
+static int hf_tn5250_wdsf_rgw_flag1;
+static int hf_tn5250_wdsf_rgw_flag1_0;
+static int hf_tn5250_wdsf_rgw_flag1_1;
+static int hf_tn5250_wdsf_rgw_reserved;
+static int hf_tn5250_wdsf_sbi_rowscols;
+static int hf_tn5250_wdsf_sbi_sliderpos;
+static int hf_tn5250_wdsf_sbi_total_scroll;
+static int hf_tn5250_wdsf_wdf_flag1;
+static int hf_tn5250_wdsf_wdf_flag1_0;
+static int hf_tn5250_wea_prim_attr;
+static int hf_tn5250_wea_prim_attr_blink;
+static int hf_tn5250_wea_prim_attr_col;
+static int hf_tn5250_wea_prim_attr_flag;
+static int hf_tn5250_wea_prim_attr_int;
+static int hf_tn5250_wea_prim_attr_rev;
+static int hf_tn5250_wea_prim_attr_und;
+static int hf_tn5250_wectw_end_column;
+static int hf_tn5250_wectw_start_column;
+static int hf_tn5250_wsf_qss_flag1;
+static int hf_tn5250_wsf_qss_flag1_0;
+static int hf_tn5250_wsf_qss_flag1_reserved;
+static int hf_tn5250_wsf_qss_flag2;
+static int hf_tn5250_wsf_qss_flag2_7;
+static int hf_tn5250_wsf_qss_flag2_reserved;
+static int hf_tn5250_wssf_cc_flag1;
+static int hf_tn5250_wssf_cc_flag1_7;
+static int hf_tn5250_wssf_cc_flag1_reserved;
+static int hf_tn5250_wssf_flag1;
+static int hf_tn5250_wssf_flag2;
+static int hf_tn5250_wssf_flag2_0;
+static int hf_tn5250_wssf_flag2_1;
+static int hf_tn5250_wssf_flag2_2;
+static int hf_tn5250_wssf_flag2_3;
+static int hf_tn5250_wssf_flag2_4;
+static int hf_tn5250_wssf_flag2_5;
+static int hf_tn5250_wssf_flag2_6;
+static int hf_tn5250_wssf_flag2_7;
+static int hf_tn5250_wssf_ifc_background_color;
+static int hf_tn5250_wssf_ifc_flag1;
+static int hf_tn5250_wssf_ifc_flag1_0;
+static int hf_tn5250_wssf_ifc_flag1_1to3;
+static int hf_tn5250_wssf_ifc_flag1_4;
+static int hf_tn5250_wssf_ifc_flag1_5;
+static int hf_tn5250_wssf_ifc_flag1_6;
+static int hf_tn5250_wssf_ifc_flag1_7;
+static int hf_tn5250_wssf_ifc_flag2;
+static int hf_tn5250_wssf_ifc_flag2_0;
+static int hf_tn5250_wssf_ifc_flag2_1;
+static int hf_tn5250_wssf_ifc_flag2_7;
+static int hf_tn5250_wssf_ifc_flag2_reserved;
+static int hf_tn5250_wssf_ifc_foreground_color;
+static int hf_tn5250_wssf_ifc_image_format;
+static int hf_tn5250_wssf_ifc_imagefax_name;
+static int hf_tn5250_wssf_ifc_rotation;
+static int hf_tn5250_wssf_ifc_scaling;
+static int hf_tn5250_wssf_ifc_viewimage_location_col;
+static int hf_tn5250_wssf_ifc_viewimage_location_row;
+static int hf_tn5250_wssf_ifc_viewport_location_col;
+static int hf_tn5250_wssf_ifc_viewport_location_row;
+static int hf_tn5250_wssf_ifc_viewport_size_col;
+static int hf_tn5250_wssf_ifc_viewport_size_row;
+static int hf_tn5250_wssf_ifd_flag1;
+static int hf_tn5250_wssf_ifd_flag1_0;
+static int hf_tn5250_wssf_ifd_flag1_reserved;
+static int hf_tn5250_wssf_ifd_imagefax_data;
+static int hf_tn5250_wssf_ifd_imagefax_name;
+static int hf_tn5250_wssf_kbc_flag1;
+static int hf_tn5250_wssf_kbc_flag1_5;
+static int hf_tn5250_wssf_kbc_flag1_6;
+static int hf_tn5250_wssf_kbc_flag1_7;
+static int hf_tn5250_wssf_kbc_flag1_reserved;
+static int hf_tn5250_wssf_wsc_minor_type;
+static int hf_tn5250_wtd_ccc1;
+static int hf_tn5250_wtd_ccc2;
+static int hf_tn5250_wtd_ccc2_alarm;
+static int hf_tn5250_wtd_ccc2_cursor;
+static int hf_tn5250_wtd_ccc2_off;
+static int hf_tn5250_wtd_ccc2_on;
+static int hf_tn5250_wtd_ccc2_res;
+static int hf_tn5250_wtd_ccc2_reset;
+static int hf_tn5250_wtd_ccc2_set;
+static int hf_tn5250_wtd_ccc2_unlock;
+static int hf_tn5250_wts_cld_flag1;
+static int hf_tn5250_wts_cld_flag1_0;
+static int hf_tn5250_wts_cld_flag1_1;
+static int hf_tn5250_wts_cld_flag1_2;
+static int hf_tn5250_wts_cld_flag1_3;
+static int hf_tn5250_wts_cld_flag1_4;
+static int hf_tn5250_wts_cld_flag1_5;
+static int hf_tn5250_wts_cld_flag1_6;
+static int hf_tn5250_wts_cld_flag1_7;
+static int hf_tn5250_wts_cld_flag2;
+static int hf_tn5250_wts_cld_flag2_0;
+static int hf_tn5250_wts_cld_flag2_1;
+static int hf_tn5250_wts_cld_flag2_2;
+static int hf_tn5250_wts_cld_flag2_3;
+static int hf_tn5250_wts_cld_flag2_4;
+static int hf_tn5250_wts_cld_flag2_line_spacing;
+static int hf_tn5250_wts_cld_flag3;
+static int hf_tn5250_wts_cld_flag3_0;
+static int hf_tn5250_wts_cld_flag3_1;
+static int hf_tn5250_wts_cld_flag3_2;
+static int hf_tn5250_wts_cld_flag3_3;
+static int hf_tn5250_wts_cld_flag3_4;
+static int hf_tn5250_wts_cld_flag3_5;
+static int hf_tn5250_wts_cld_flag3_6;
+static int hf_tn5250_wts_cld_flag3_7;
+static int hf_tn5250_wts_cld_io;
+static int hf_tn5250_wts_cld_li;
+static int hf_tn5250_wts_cld_lmo;
+static int hf_tn5250_wts_cld_page_num;
+static int hf_tn5250_wts_cld_row;
+static int hf_tn5250_wts_cld_sli;
+static int hf_tn5250_wts_flag1;
+static int hf_tn5250_wts_flag1_0;
+static int hf_tn5250_wts_flag1_1;
+static int hf_tn5250_wts_flag1_2;
+static int hf_tn5250_wts_flag1_3;
+static int hf_tn5250_wts_flag1_reserved;
+static int hf_tn5250_wts_flag2;
+static int hf_tn5250_wts_flag2_6;
+static int hf_tn5250_wts_flag2_reserved;
+static int hf_tn5250_wts_flag2_reserved2;
+static int hf_tn5250_wts_flag3;
+static int hf_tn5250_wts_flag3_0;
+static int hf_tn5250_wts_flag3_1;
+static int hf_tn5250_wts_flag3_2;
+static int hf_tn5250_wts_flag3_3;
+static int hf_tn5250_wts_flag3_4;
+static int hf_tn5250_wts_flag3_5;
+static int hf_tn5250_wts_flag3_6;
+static int hf_tn5250_wts_flag3_7;
+static int hf_tn5250_wts_home_position_col;
+static int hf_tn5250_wts_home_position_row;
+static int hf_tn5250_wts_partition;
+static int hf_tn5250_soh_length;
+static int hf_tn5250_negative_response;
+static int hf_tn5250_qr_ccl;
+static int hf_tn5250_qr_chc;
+static int hf_tn5250_qr_dm;
+static int hf_tn5250_qr_dsn;
+static int hf_tn5250_qr_dt;
+static int hf_tn5250_qr_dtc;
+static int hf_tn5250_qr_eki;
+static int hf_tn5250_qr_flag;
+static int hf_tn5250_qr_flag1;
+static int hf_tn5250_qr_flag2;
+static int hf_tn5250_qr_flag3;
+static int hf_tn5250_qr_flag4;
+static int hf_tn5250_qr_ki;
+static int hf_tn5250_qr_flag1_0;
+static int hf_tn5250_qr_flag1_1;
+static int hf_tn5250_qr_flag1_2;
+static int hf_tn5250_qr_flag1_3;
+static int hf_tn5250_qr_flag1_4;
+static int hf_tn5250_qr_flag1_5;
+static int hf_tn5250_qr_flag1_6;
+static int hf_tn5250_qr_flag1_7;
+static int hf_tn5250_qr_flag2_0to3;
+static int hf_tn5250_qr_flag2_4;
+static int hf_tn5250_qr_flag2_5;
+static int hf_tn5250_qr_flag2_6to7;
+static int hf_tn5250_qr_flag_0;
+static int hf_tn5250_qr_flag_reserved;
+static int hf_tn5250_qr_mni;
+static int hf_tn5250_image_fax_error;
+static int hf_tn5250_vac_data;
+static int hf_tn5250_vac_prefix;
+static int hf_tn5250_wssf_ttw_flag;
+static int hf_tn5250_wssf_ttw_data;
+
+static gint ett_tn5250;
+static gint ett_tn5250_wcc;
+static gint ett_sf;
+static gint ett_tn5250_field_attribute;
+static gint ett_tn5250_dfdpck_mask;
+static gint ett_tn5250_field_validation;
+static gint ett_tn5250_header_flags;
+static gint ett_tn5250_roll_mask;
+static gint ett_tn5250_soh_mask;
+static gint ett_tn5250_soh_pf16to9_mask;
+static gint ett_tn5250_soh_pf24to17_mask;
+static gint ett_tn5250_soh_pf8to1_mask;
+static gint ett_tn5250_sps_mask;
+static gint ett_tn5250_wdsf_cw_bp_mask;
+static gint ett_tn5250_wdsf_cw_mask;
+static gint ett_tn5250_wdsf_cw_tf_mask;
+static gint ett_tn5250_wdsf_deg_mask;
+static gint ett_tn5250_wdsf_deg_ms_mask;
+static gint ett_tn5250_wdsf_ds_ci_mask;
+static gint ett_tn5250_wdsf_ds_cpda_mask;
+static gint ett_tn5250_wdsf_ds_ct_mask;
+static gint ett_tn5250_wdsf_ds_mask;
+static gint ett_tn5250_wdsf_ds_mbs_mask;
+static gint ett_tn5250_wdsf_ds_sbi_mask;
+static gint ett_tn5250_wdsf_dsb_mask;
+static gint ett_tn5250_wdsf_pmb_mask;
+static gint ett_tn5250_wdsf_ragc_mask;
+static gint ett_tn5250_wdsf_rgw_mask;
+static gint ett_tn5250_wdsf_wdf_mask;
+static gint ett_tn5250_wsf_dpo_mask;
+static gint ett_tn5250_wsf_dsl_mask;
+static gint ett_tn5250_wsf_dtsf_mask;
+static gint ett_tn5250_wsf_qss_mask;
+static gint ett_tn5250_wsf_rts_mask;
+static gint ett_tn5250_wssf_cc_mask;
+static gint ett_tn5250_wssf_ifc_mask;
+static gint ett_tn5250_wssf_ifd_mask;
+static gint ett_tn5250_wssf_kbc_mask;
+static gint ett_tn5250_wssf_mask;
+static gint ett_tn5250_wts_mask;
+static gint ett_tn5250_qr_mask;
+static gint ett_tn5250_wea_prim_attr;
+static gint ett_cc;
+
+static expert_field ei_tn5250_command_code;
 
 static guint32 dissect_tn5250_orders_and_data(proto_tree *tn5250_tree, tvbuff_t *tvb, gint offset);
 
diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c
index 4464c4e53e..cfe52d77d4 100644
--- a/epan/dissectors/packet-tnef.c
+++ b/epan/dissectors/packet-tnef.c
@@ -74,84 +74,84 @@
 void proto_register_tnef(void);
 void proto_reg_handoff_tnef(void);
 
-static int proto_tnef = -1;
-
-static int hf_tnef_signature = -1;
-static int hf_tnef_key = -1;
-static int hf_tnef_attribute = -1;
-static int hf_tnef_attribute_lvl = -1;
-static int hf_tnef_attribute_tag = -1;
-static int hf_tnef_attribute_tag_type = -1;
-static int hf_tnef_attribute_tag_id = -1;
-static int hf_tnef_attribute_length = -1;
-static int hf_tnef_attribute_value = -1;
-static int hf_tnef_attribute_string = -1;
-static int hf_tnef_attribute_date = -1;
-static int hf_tnef_attribute_display_name = -1;
-static int hf_tnef_attribute_email_address = -1;
-static int hf_tnef_attribute_checksum = -1;
-static int hf_tnef_mapi_props = -1;
-static int hf_tnef_oem_codepage = -1;
-static int hf_tnef_version = -1;
-static int hf_tnef_message_class = -1;
-static int hf_tnef_original_message_class = -1;
-static int hf_tnef_priority = -1;
-static int hf_tnef_mapi_props_count = -1;
-
-static int hf_tnef_property = -1;
-static int hf_tnef_property_tag = -1;
-static int hf_tnef_property_tag_type = -1;
-static int hf_tnef_property_tag_id = -1;
-static int hf_tnef_property_tag_set = -1;
-static int hf_tnef_property_tag_kind = -1;
-static int hf_tnef_property_tag_name_id = -1;
-static int hf_tnef_property_tag_name_length = -1;
-static int hf_tnef_property_tag_name_string = -1;
-static int hf_tnef_property_padding = -1;
-static int hf_tnef_padding = -1;
-
-static int hf_tnef_values_count = -1;
-static int hf_tnef_value_length = -1;
-
-static int hf_tnef_attribute_date_year = -1;
-static int hf_tnef_attribute_date_month = -1;
-static int hf_tnef_attribute_date_day = -1;
-static int hf_tnef_attribute_date_hour = -1;
-static int hf_tnef_attribute_date_minute = -1;
-static int hf_tnef_attribute_date_second = -1;
-static int hf_tnef_attribute_date_day_of_week = -1;
-
-static int hf_tnef_PropValue_i = -1;
-static int hf_tnef_PropValue_l = -1;
-static int hf_tnef_PropValue_b = -1;
-static int hf_tnef_PropValue_lpszA = -1;
-static int hf_tnef_PropValue_lpszW = -1;
-static int hf_tnef_PropValue_lpguid = -1;
-static int hf_tnef_PropValue_bin = -1;
-static int hf_tnef_PropValue_ft = -1;
-static int hf_tnef_PropValue_err = -1;
-static int hf_tnef_PropValue_MVi = -1;
-static int hf_tnef_PropValue_MVl = -1;
-static int hf_tnef_PropValue_MVszA = -1;
-static int hf_tnef_PropValue_MVbin = -1;
-static int hf_tnef_PropValue_MVguid = -1;
-static int hf_tnef_PropValue_MVszW = -1;
-static int hf_tnef_PropValue_MVft = -1;
-static int hf_tnef_PropValue_null = -1;
-static int hf_tnef_PropValue_object = -1;
-
-static int ett_tnef = -1;
-static int ett_tnef_attribute = -1;
-static int ett_tnef_attribute_tag = -1;
-static int ett_tnef_mapi_props = -1;
-static int ett_tnef_property = -1;
-static int ett_tnef_property_tag = -1;
-static int ett_tnef_counted_items = -1;
-static int ett_tnef_attribute_date = -1;
-static int ett_tnef_attribute_address = -1;
-
-static expert_field ei_tnef_expect_single_item = EI_INIT;
-static expert_field ei_tnef_incorrect_signature = EI_INIT;
+static int proto_tnef;
+
+static int hf_tnef_signature;
+static int hf_tnef_key;
+static int hf_tnef_attribute;
+static int hf_tnef_attribute_lvl;
+static int hf_tnef_attribute_tag;
+static int hf_tnef_attribute_tag_type;
+static int hf_tnef_attribute_tag_id;
+static int hf_tnef_attribute_length;
+static int hf_tnef_attribute_value;
+static int hf_tnef_attribute_string;
+static int hf_tnef_attribute_date;
+static int hf_tnef_attribute_display_name;
+static int hf_tnef_attribute_email_address;
+static int hf_tnef_attribute_checksum;
+static int hf_tnef_mapi_props;
+static int hf_tnef_oem_codepage;
+static int hf_tnef_version;
+static int hf_tnef_message_class;
+static int hf_tnef_original_message_class;
+static int hf_tnef_priority;
+static int hf_tnef_mapi_props_count;
+
+static int hf_tnef_property;
+static int hf_tnef_property_tag;
+static int hf_tnef_property_tag_type;
+static int hf_tnef_property_tag_id;
+static int hf_tnef_property_tag_set;
+static int hf_tnef_property_tag_kind;
+static int hf_tnef_property_tag_name_id;
+static int hf_tnef_property_tag_name_length;
+static int hf_tnef_property_tag_name_string;
+static int hf_tnef_property_padding;
+static int hf_tnef_padding;
+
+static int hf_tnef_values_count;
+static int hf_tnef_value_length;
+
+static int hf_tnef_attribute_date_year;
+static int hf_tnef_attribute_date_month;
+static int hf_tnef_attribute_date_day;
+static int hf_tnef_attribute_date_hour;
+static int hf_tnef_attribute_date_minute;
+static int hf_tnef_attribute_date_second;
+static int hf_tnef_attribute_date_day_of_week;
+
+static int hf_tnef_PropValue_i;
+static int hf_tnef_PropValue_l;
+static int hf_tnef_PropValue_b;
+static int hf_tnef_PropValue_lpszA;
+static int hf_tnef_PropValue_lpszW;
+static int hf_tnef_PropValue_lpguid;
+static int hf_tnef_PropValue_bin;
+static int hf_tnef_PropValue_ft;
+static int hf_tnef_PropValue_err;
+static int hf_tnef_PropValue_MVi;
+static int hf_tnef_PropValue_MVl;
+static int hf_tnef_PropValue_MVszA;
+static int hf_tnef_PropValue_MVbin;
+static int hf_tnef_PropValue_MVguid;
+static int hf_tnef_PropValue_MVszW;
+static int hf_tnef_PropValue_MVft;
+static int hf_tnef_PropValue_null;
+static int hf_tnef_PropValue_object;
+
+static int ett_tnef;
+static int ett_tnef_attribute;
+static int ett_tnef_attribute_tag;
+static int ett_tnef_mapi_props;
+static int ett_tnef_property;
+static int ett_tnef_property_tag;
+static int ett_tnef_counted_items;
+static int ett_tnef_attribute_date;
+static int ett_tnef_attribute_address;
+
+static expert_field ei_tnef_expect_single_item;
+static expert_field ei_tnef_incorrect_signature;
 
 static dissector_handle_t tnef_handle;
 
diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c
index f22b73c0d7..782cfdbd76 100644
--- a/epan/dissectors/packet-tns.c
+++ b/epan/dissectors/packet-tns.c
@@ -74,153 +74,153 @@ static gboolean tns_desegment = TRUE;
 
 static dissector_handle_t tns_handle;
 
-static int proto_tns = -1;
-static int hf_tns_request = -1;
-static int hf_tns_response = -1;
-static int hf_tns_length = -1;
-static int hf_tns_packet_checksum = -1;
-static int hf_tns_header_checksum = -1;
-static int hf_tns_packet_type = -1;
-static int hf_tns_reserved_byte = -1;
-static int hf_tns_version = -1;
-static int hf_tns_compat_version = -1;
-
-static int hf_tns_service_options = -1;
-static int hf_tns_sopt_flag_bconn = -1;
-static int hf_tns_sopt_flag_pc = -1;
-static int hf_tns_sopt_flag_hc = -1;
-static int hf_tns_sopt_flag_fd = -1;
-static int hf_tns_sopt_flag_hd = -1;
-static int hf_tns_sopt_flag_dc1 = -1;
-static int hf_tns_sopt_flag_dc2 = -1;
-static int hf_tns_sopt_flag_dio = -1;
-static int hf_tns_sopt_flag_ap = -1;
-static int hf_tns_sopt_flag_ra = -1;
-static int hf_tns_sopt_flag_sa = -1;
-
-static int hf_tns_sdu_size = -1;
-static int hf_tns_max_tdu_size = -1;
-
-static int hf_tns_nt_proto_characteristics = -1;
-static int hf_tns_ntp_flag_hangon = -1;
-static int hf_tns_ntp_flag_crel = -1;
-static int hf_tns_ntp_flag_tduio = -1;
-static int hf_tns_ntp_flag_srun = -1;
-static int hf_tns_ntp_flag_dtest = -1;
-static int hf_tns_ntp_flag_cbio = -1;
-static int hf_tns_ntp_flag_asio = -1;
-static int hf_tns_ntp_flag_pio = -1;
-static int hf_tns_ntp_flag_grant = -1;
-static int hf_tns_ntp_flag_handoff = -1;
-static int hf_tns_ntp_flag_sigio = -1;
-static int hf_tns_ntp_flag_sigpipe = -1;
-static int hf_tns_ntp_flag_sigurg = -1;
-static int hf_tns_ntp_flag_urgentio = -1;
-static int hf_tns_ntp_flag_fdio = -1;
-static int hf_tns_ntp_flag_testop = -1;
-
-static int hf_tns_line_turnaround = -1;
-static int hf_tns_value_of_one = -1;
-static int hf_tns_connect_data_length = -1;
-static int hf_tns_connect_data_offset = -1;
-static int hf_tns_connect_data_max = -1;
-
-static int hf_tns_connect_flags0 = -1;
-static int hf_tns_connect_flags1 = -1;
-static int hf_tns_conn_flag_nareq = -1;
-static int hf_tns_conn_flag_nalink = -1;
-static int hf_tns_conn_flag_enablena = -1;
-static int hf_tns_conn_flag_ichg = -1;
-static int hf_tns_conn_flag_wantna = -1;
-
-static int hf_tns_connect_data = -1;
-static int hf_tns_trace_cf1 = -1;
-static int hf_tns_trace_cf2 = -1;
-static int hf_tns_trace_cid = -1;
-
-static int hf_tns_accept_data_length = -1;
-static int hf_tns_accept_data_offset = -1;
-static int hf_tns_accept_data = -1;
-
-static int hf_tns_refuse_reason_user = -1;
-static int hf_tns_refuse_reason_system = -1;
-static int hf_tns_refuse_data_length = -1;
-static int hf_tns_refuse_data = -1;
-
-static int hf_tns_abort_reason_user = -1;
-static int hf_tns_abort_reason_system = -1;
-static int hf_tns_abort_data = -1;
-
-static int hf_tns_marker_type = -1;
-static int hf_tns_marker_data_byte = -1;
-/* static int hf_tns_marker_data = -1; */
-
-static int hf_tns_redirect_data_length = -1;
-static int hf_tns_redirect_data = -1;
-
-static int hf_tns_control_cmd = -1;
-static int hf_tns_control_data = -1;
-
-static int hf_tns_data_flag = -1;
-static int hf_tns_data_flag_send = -1;
-static int hf_tns_data_flag_rc = -1;
-static int hf_tns_data_flag_c = -1;
-static int hf_tns_data_flag_reserved = -1;
-static int hf_tns_data_flag_more = -1;
-static int hf_tns_data_flag_eof = -1;
-static int hf_tns_data_flag_dic = -1;
-static int hf_tns_data_flag_rts = -1;
-static int hf_tns_data_flag_sntt = -1;
-
-static int hf_tns_data_id = -1;
-static int hf_tns_data_length = -1;
-static int hf_tns_data_oci_id = -1;
-static int hf_tns_data_piggyback_id = -1;
-static int hf_tns_data_unused = -1;
-
-static int hf_tns_data_opi_version2_banner_len = -1;
-static int hf_tns_data_opi_version2_banner = -1;
-static int hf_tns_data_opi_version2_vsnum = -1;
-
-static int hf_tns_data_opi_num_of_params = -1;
-static int hf_tns_data_opi_param_length = -1;
-static int hf_tns_data_opi_param_name = -1;
-static int hf_tns_data_opi_param_value = -1;
-
-static int hf_tns_data_setp_acc_version = -1;
-static int hf_tns_data_setp_cli_plat = -1;
-static int hf_tns_data_setp_version = -1;
-static int hf_tns_data_setp_banner = -1;
-
-static int hf_tns_data_sns_cli_vers = -1;
-static int hf_tns_data_sns_srv_vers = -1;
-static int hf_tns_data_sns_srvcnt = -1;
-
-static int hf_tns_data_descriptor_row_count = -1;
-static int hf_tns_data_descriptor_row_size = -1;
-
-static gint ett_tns = -1;
-static gint ett_tns_connect = -1;
-static gint ett_tns_accept = -1;
-static gint ett_tns_refuse = -1;
-static gint ett_tns_abort = -1;
-static gint ett_tns_redirect = -1;
-static gint ett_tns_marker = -1;
-static gint ett_tns_attention = -1;
-static gint ett_tns_control = -1;
-static gint ett_tns_data = -1;
-static gint ett_tns_data_flag = -1;
-static gint ett_tns_acc_versions = -1;
-static gint ett_tns_opi_params = -1;
-static gint ett_tns_opi_par = -1;
-static gint ett_tns_sopt_flag = -1;
-static gint ett_tns_ntp_flag = -1;
-static gint ett_tns_conn_flag = -1;
-static gint ett_tns_rows = -1;
-static gint ett_sql = -1;
-
-static expert_field ei_tns_connect_data_next_packet = EI_INIT;
-static expert_field ei_tns_data_descriptor_size_mismatch = EI_INIT;
+static int proto_tns;
+static int hf_tns_request;
+static int hf_tns_response;
+static int hf_tns_length;
+static int hf_tns_packet_checksum;
+static int hf_tns_header_checksum;
+static int hf_tns_packet_type;
+static int hf_tns_reserved_byte;
+static int hf_tns_version;
+static int hf_tns_compat_version;
+
+static int hf_tns_service_options;
+static int hf_tns_sopt_flag_bconn;
+static int hf_tns_sopt_flag_pc;
+static int hf_tns_sopt_flag_hc;
+static int hf_tns_sopt_flag_fd;
+static int hf_tns_sopt_flag_hd;
+static int hf_tns_sopt_flag_dc1;
+static int hf_tns_sopt_flag_dc2;
+static int hf_tns_sopt_flag_dio;
+static int hf_tns_sopt_flag_ap;
+static int hf_tns_sopt_flag_ra;
+static int hf_tns_sopt_flag_sa;
+
+static int hf_tns_sdu_size;
+static int hf_tns_max_tdu_size;
+
+static int hf_tns_nt_proto_characteristics;
+static int hf_tns_ntp_flag_hangon;
+static int hf_tns_ntp_flag_crel;
+static int hf_tns_ntp_flag_tduio;
+static int hf_tns_ntp_flag_srun;
+static int hf_tns_ntp_flag_dtest;
+static int hf_tns_ntp_flag_cbio;
+static int hf_tns_ntp_flag_asio;
+static int hf_tns_ntp_flag_pio;
+static int hf_tns_ntp_flag_grant;
+static int hf_tns_ntp_flag_handoff;
+static int hf_tns_ntp_flag_sigio;
+static int hf_tns_ntp_flag_sigpipe;
+static int hf_tns_ntp_flag_sigurg;
+static int hf_tns_ntp_flag_urgentio;
+static int hf_tns_ntp_flag_fdio;
+static int hf_tns_ntp_flag_testop;
+
+static int hf_tns_line_turnaround;
+static int hf_tns_value_of_one;
+static int hf_tns_connect_data_length;
+static int hf_tns_connect_data_offset;
+static int hf_tns_connect_data_max;
+
+static int hf_tns_connect_flags0;
+static int hf_tns_connect_flags1;
+static int hf_tns_conn_flag_nareq;
+static int hf_tns_conn_flag_nalink;
+static int hf_tns_conn_flag_enablena;
+static int hf_tns_conn_flag_ichg;
+static int hf_tns_conn_flag_wantna;
+
+static int hf_tns_connect_data;
+static int hf_tns_trace_cf1;
+static int hf_tns_trace_cf2;
+static int hf_tns_trace_cid;
+
+static int hf_tns_accept_data_length;
+static int hf_tns_accept_data_offset;
+static int hf_tns_accept_data;
+
+static int hf_tns_refuse_reason_user;
+static int hf_tns_refuse_reason_system;
+static int hf_tns_refuse_data_length;
+static int hf_tns_refuse_data;
+
+static int hf_tns_abort_reason_user;
+static int hf_tns_abort_reason_system;
+static int hf_tns_abort_data;
+
+static int hf_tns_marker_type;
+static int hf_tns_marker_data_byte;
+/* static int hf_tns_marker_data; */
+
+static int hf_tns_redirect_data_length;
+static int hf_tns_redirect_data;
+
+static int hf_tns_control_cmd;
+static int hf_tns_control_data;
+
+static int hf_tns_data_flag;
+static int hf_tns_data_flag_send;
+static int hf_tns_data_flag_rc;
+static int hf_tns_data_flag_c;
+static int hf_tns_data_flag_reserved;
+static int hf_tns_data_flag_more;
+static int hf_tns_data_flag_eof;
+static int hf_tns_data_flag_dic;
+static int hf_tns_data_flag_rts;
+static int hf_tns_data_flag_sntt;
+
+static int hf_tns_data_id;
+static int hf_tns_data_length;
+static int hf_tns_data_oci_id;
+static int hf_tns_data_piggyback_id;
+static int hf_tns_data_unused;
+
+static int hf_tns_data_opi_version2_banner_len;
+static int hf_tns_data_opi_version2_banner;
+static int hf_tns_data_opi_version2_vsnum;
+
+static int hf_tns_data_opi_num_of_params;
+static int hf_tns_data_opi_param_length;
+static int hf_tns_data_opi_param_name;
+static int hf_tns_data_opi_param_value;
+
+static int hf_tns_data_setp_acc_version;
+static int hf_tns_data_setp_cli_plat;
+static int hf_tns_data_setp_version;
+static int hf_tns_data_setp_banner;
+
+static int hf_tns_data_sns_cli_vers;
+static int hf_tns_data_sns_srv_vers;
+static int hf_tns_data_sns_srvcnt;
+
+static int hf_tns_data_descriptor_row_count;
+static int hf_tns_data_descriptor_row_size;
+
+static gint ett_tns;
+static gint ett_tns_connect;
+static gint ett_tns_accept;
+static gint ett_tns_refuse;
+static gint ett_tns_abort;
+static gint ett_tns_redirect;
+static gint ett_tns_marker;
+static gint ett_tns_attention;
+static gint ett_tns_control;
+static gint ett_tns_data;
+static gint ett_tns_data_flag;
+static gint ett_tns_acc_versions;
+static gint ett_tns_opi_params;
+static gint ett_tns_opi_par;
+static gint ett_tns_sopt_flag;
+static gint ett_tns_ntp_flag;
+static gint ett_tns_conn_flag;
+static gint ett_tns_rows;
+static gint ett_sql;
+
+static expert_field ei_tns_connect_data_next_packet;
+static expert_field ei_tns_data_descriptor_size_mismatch;
 
 #define TCP_PORT_TNS			1521 /* Not IANA registered */
 
diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c
index df79c2f806..6c9f0c0a0c 100644
--- a/epan/dissectors/packet-tpkt.c
+++ b/epan/dissectors/packet-tpkt.c
@@ -30,17 +30,17 @@ void proto_reg_handoff_tpkt(void);
 static heur_dissector_list_t tpkt_heur_subdissector_list;
 
 /* TPKT header fields             */
-static int proto_tpkt                = -1;
-static int proto_tpkt_heur           = -1;
+static int proto_tpkt;
+static int proto_tpkt_heur;
 static protocol_t *proto_tpkt_ptr;
-static int hf_tpkt_version           = -1;
-static int hf_tpkt_reserved          = -1;
-static int hf_tpkt_length            = -1;
-static int hf_tpkt_continuation_data = -1;
+static int hf_tpkt_version;
+static int hf_tpkt_reserved;
+static int hf_tpkt_length;
+static int hf_tpkt_continuation_data;
 
 
 /* TPKT fields defining a sub tree */
-static gint ett_tpkt           = -1;
+static gint ett_tpkt;
 
 /* desegmentation of OSI over TPKT over TCP */
 static gboolean tpkt_desegment = TRUE;
diff --git a/epan/dissectors/packet-tplink-smarthome.c b/epan/dissectors/packet-tplink-smarthome.c
index 023c67e3b1..e2f7e133b4 100644
--- a/epan/dissectors/packet-tplink-smarthome.c
+++ b/epan/dissectors/packet-tplink-smarthome.c
@@ -51,11 +51,11 @@ static dissector_handle_t tplink_smarthome_message_handle;
 
 		/* Initialize the protocol and registered fields */
 
-static int	proto_tplink_smarthome	= -1;
-static gint	ett_tplink_smarthome	= -1;		/* Initialize the subtree pointers */
+static int	proto_tplink_smarthome;
+static gint	ett_tplink_smarthome;		/* Initialize the subtree pointers */
 
-static int	hf_tplink_smarthome_Len	= -1;
-static int	hf_tplink_smarthome_Msg	= -1;
+static int	hf_tplink_smarthome_Len;
+static int	hf_tplink_smarthome_Msg;
 
 static gboolean
 test_tplink_smarthome(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_)
diff --git a/epan/dissectors/packet-tpm20.c b/epan/dissectors/packet-tpm20.c
index 83a90c2d48..f9e3502912 100644
--- a/epan/dissectors/packet-tpm20.c
+++ b/epan/dissectors/packet-tpm20.c
@@ -30,91 +30,91 @@ static guint last_command_pnum;
 static bool response_size = TRUE;
 
 /* sub tree items */
-static int proto_tpm20 = -1;
-static int proto_tpm20_header = -1;
-static int proto_tpm20_resp_header = -1;
-static int proto_tpm20_hndl_area = -1;
-static int proto_tpm20_auth_area = -1;
-static int proto_tpm20_params_area = -1;
+static int proto_tpm20;
+static int proto_tpm20_header;
+static int proto_tpm20_resp_header;
+static int proto_tpm20_hndl_area;
+static int proto_tpm20_auth_area;
+static int proto_tpm20_params_area;
 
 /* pdu fields */
-static int hf_tpm20_platform_cmd = -1;
-static int hf_tpm20_platform_resp_code = -1;
-static int hf_tpm20_platform_resp_size = -1;
-static int hf_tpm20_tag = -1;
-static int hf_tpm20_size = -1;
-static int hf_tpm20_cc = -1;
-static int hf_tpm20_resp_tag = -1;
-static int hf_tpm20_resp_size = -1;
-static int hf_tpm20_resp_code = -1;
-static int hf_tpm20_startup_type = -1;
-static int hf_tpmi_rh_hierarhy = -1;
-static int hf_tpmi_rh_provision = -1;
-static int hf_tpmi_rh_platform = -1;
-static int hf_tpmi_rh_endorsment = -1;
-static int hf_tpmi_rh_nv_index = -1;
-static int hf_tpmi_rh_nv_auth = -1;
-static int hf_tpmi_rh_hierarhy_auth = -1;
-static int hf_tpmi_rh_clear = -1;
-static int hf_tpmi_rh_lockout = -1;
-static int hf_tpmi_dh_object = -1;
-static int hf_tpmi_dh_entity = -1;
-static int hf_tpmi_dh_context = -1;
-static int hf_tpmi_dh_parent = -1;
-static int hf_tpmi_dh_pcr = -1;
-static int hf_tpmi_ht_handle = -1;
-static int hf_tpmi_sh_auth_session = -1;
-static int hf_tpmi_rh_act = -1;
-static int hf_auth_area_size = -1;
-static int hf_session_nonce_size = -1;
-static int hf_session_nonce = -1;
-static int hf_session_attribs_cont = -1;
-static int hf_session_attribs_auditex = -1;
-static int hf_session_attribs_auditreset = -1;
-static int hf_session_attribs_res = -1;
-static int hf_session_attribs_decrypt = -1;
-static int hf_session_attribs_encrypt = -1;
-static int hf_session_attribs_audit = -1;
-static int hf_session_auth_size = -1;
-static int hf_session_auth = -1;
-static int hf_resp_param_size = -1;
-static int hf_encrypted_secret_size = -1;
-static int hf_encrypted_secret = -1;
-static int hf_session_type = -1;
-static int hf_alg_hash = -1;
-static int hf_alg_sym = -1;
-static int hf_alg_sym_keybits = -1;
-static int hf_alg_sym_mode = -1;
-static int hf_tpm_priv_size = -1;
-static int hf_tpm_priv = -1;
-static int hf_tpm_pub_size = -1;
-static int hf_tpm_pub = -1;
-static int hf_tpm_name_size = -1;
-static int hf_tpm_name = -1;
-static int hf_tpm_sensitive_crate_size = -1;
-static int hf_tpm_sensitive_crate = -1;
-static int hf_tpm_template_size = -1;
-static int hf_tpm_template = -1;
-static int hf_tpm_data_size = -1;
-static int hf_tpm_data = -1;
-static int hf_tpm_creation_data_size = -1;
-static int hf_tpm_creation_data = -1;
-static int hf_tpm_digest_size = -1;
-static int hf_tpm_digest = -1;
-static int hf_params = -1;
+static int hf_tpm20_platform_cmd;
+static int hf_tpm20_platform_resp_code;
+static int hf_tpm20_platform_resp_size;
+static int hf_tpm20_tag;
+static int hf_tpm20_size;
+static int hf_tpm20_cc;
+static int hf_tpm20_resp_tag;
+static int hf_tpm20_resp_size;
+static int hf_tpm20_resp_code;
+static int hf_tpm20_startup_type;
+static int hf_tpmi_rh_hierarhy;
+static int hf_tpmi_rh_provision;
+static int hf_tpmi_rh_platform;
+static int hf_tpmi_rh_endorsment;
+static int hf_tpmi_rh_nv_index;
+static int hf_tpmi_rh_nv_auth;
+static int hf_tpmi_rh_hierarhy_auth;
+static int hf_tpmi_rh_clear;
+static int hf_tpmi_rh_lockout;
+static int hf_tpmi_dh_object;
+static int hf_tpmi_dh_entity;
+static int hf_tpmi_dh_context;
+static int hf_tpmi_dh_parent;
+static int hf_tpmi_dh_pcr;
+static int hf_tpmi_ht_handle;
+static int hf_tpmi_sh_auth_session;
+static int hf_tpmi_rh_act;
+static int hf_auth_area_size;
+static int hf_session_nonce_size;
+static int hf_session_nonce;
+static int hf_session_attribs_cont;
+static int hf_session_attribs_auditex;
+static int hf_session_attribs_auditreset;
+static int hf_session_attribs_res;
+static int hf_session_attribs_decrypt;
+static int hf_session_attribs_encrypt;
+static int hf_session_attribs_audit;
+static int hf_session_auth_size;
+static int hf_session_auth;
+static int hf_resp_param_size;
+static int hf_encrypted_secret_size;
+static int hf_encrypted_secret;
+static int hf_session_type;
+static int hf_alg_hash;
+static int hf_alg_sym;
+static int hf_alg_sym_keybits;
+static int hf_alg_sym_mode;
+static int hf_tpm_priv_size;
+static int hf_tpm_priv;
+static int hf_tpm_pub_size;
+static int hf_tpm_pub;
+static int hf_tpm_name_size;
+static int hf_tpm_name;
+static int hf_tpm_sensitive_crate_size;
+static int hf_tpm_sensitive_crate;
+static int hf_tpm_template_size;
+static int hf_tpm_template;
+static int hf_tpm_data_size;
+static int hf_tpm_data;
+static int hf_tpm_creation_data_size;
+static int hf_tpm_creation_data;
+static int hf_tpm_digest_size;
+static int hf_tpm_digest;
+static int hf_params;
 
 /* sub trees */
-static gint ett_tpm = -1;
-static gint ett_tpm_header = -1;
-static gint ett_tpm_response_header = -1;
-static gint ett_tpm_handles = -1;
-static gint ett_tpm_auth = -1;
-static gint ett_tpm_params = -1;
-static gint ett_tpm_attrib = -1;
-
-static expert_field ei_invalid_tag = EI_INIT;
-static expert_field ei_invalid_auth_size = EI_INIT;
-static expert_field ei_invalid_num_sessions = EI_INIT;
+static gint ett_tpm;
+static gint ett_tpm_header;
+static gint ett_tpm_response_header;
+static gint ett_tpm_handles;
+static gint ett_tpm_auth;
+static gint ett_tpm_params;
+static gint ett_tpm_attrib;
+
+static expert_field ei_invalid_tag;
+static expert_field ei_invalid_auth_size;
+static expert_field ei_invalid_num_sessions;
 
 void proto_register_tpm20(void);
 void proto_reg_handoff_tpm20(void);
diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c
index 1e8e1caad8..c367f4dd38 100644
--- a/epan/dissectors/packet-tpncp.c
+++ b/epan/dissectors/packet-tpncp.c
@@ -90,21 +90,21 @@ static tpncp_data_field_info tpncp_commands_info_db[MAX_TPNCP_DB_SIZE];
 static gint bits[] = {0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80};
 
 /* TPNCP packet header fields. */
-static gint proto_tpncp = -1;
-static gint hf_tpncp_version = -1;
-static gint hf_tpncp_length = -1;
-static gint hf_tpncp_seq_number = -1;
-static gint hf_tpncp_length_ext = -1;
-static gint hf_tpncp_reserved = -1;
-static gint hf_tpncp_command_id = -1;
-static gint hf_tpncp_event_id = -1;
-static gint hf_tpncp_cid = -1;
-
-static expert_field ei_tpncp_unknown_data = EI_INIT;
+static gint proto_tpncp;
+static gint hf_tpncp_version;
+static gint hf_tpncp_length;
+static gint hf_tpncp_seq_number;
+static gint hf_tpncp_length_ext;
+static gint hf_tpncp_reserved;
+static gint hf_tpncp_command_id;
+static gint hf_tpncp_event_id;
+static gint hf_tpncp_cid;
+
+static expert_field ei_tpncp_unknown_data;
 
 /* TPNCP fields defining a subtree. */
-static gint ett_tpncp = -1;
-static gint ett_tpncp_body = -1;
+static gint ett_tpncp;
+static gint ett_tpncp_body;
 
 static gboolean global_tpncp_load_db = FALSE;
 
diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c
index 89ab0f2045..6875cc6b16 100644
--- a/epan/dissectors/packet-tr.c
+++ b/epan/dissectors/packet-tr.c
@@ -24,34 +24,34 @@
 void proto_register_tr(void);
 void proto_reg_handoff_tr(void);
 
-static int proto_tr = -1;
-static int hf_tr_dst = -1;
-static int hf_tr_src = -1;
-static int hf_tr_addr = -1;
-static int hf_tr_sr = -1;
-static int hf_tr_ac = -1;
-static int hf_tr_priority = -1;
-static int hf_tr_frame = -1;
-static int hf_tr_monitor_cnt = -1;
-static int hf_tr_priority_reservation = -1;
-static int hf_tr_fc = -1;
-static int hf_tr_fc_type = -1;
-static int hf_tr_fc_pcf = -1;
-static int hf_tr_rif_bytes = -1;
-static int hf_tr_broadcast = -1;
-static int hf_tr_max_frame_size = -1;
-static int hf_tr_direction = -1;
-static int hf_tr_rif = -1;
-static int hf_tr_rif_ring = -1;
-static int hf_tr_rif_bridge = -1;
-static int hf_tr_extra_rif = -1;
-
-static gint ett_token_ring = -1;
-static gint ett_token_ring_ac = -1;
-static gint ett_token_ring_fc = -1;
-
-static expert_field ei_token_empty_rif = EI_INIT;
-static expert_field ei_token_fake_llc_snap_header = EI_INIT;
+static int proto_tr;
+static int hf_tr_dst;
+static int hf_tr_src;
+static int hf_tr_addr;
+static int hf_tr_sr;
+static int hf_tr_ac;
+static int hf_tr_priority;
+static int hf_tr_frame;
+static int hf_tr_monitor_cnt;
+static int hf_tr_priority_reservation;
+static int hf_tr_fc;
+static int hf_tr_fc_type;
+static int hf_tr_fc_pcf;
+static int hf_tr_rif_bytes;
+static int hf_tr_broadcast;
+static int hf_tr_max_frame_size;
+static int hf_tr_direction;
+static int hf_tr_rif;
+static int hf_tr_rif_ring;
+static int hf_tr_rif_bridge;
+static int hf_tr_extra_rif;
+
+static gint ett_token_ring;
+static gint ett_token_ring_ac;
+static gint ett_token_ring_fc;
+
+static expert_field ei_token_empty_rif;
+static expert_field ei_token_fake_llc_snap_header;
 
 static int tr_tap = -1;
 
diff --git a/epan/dissectors/packet-trdp.c b/epan/dissectors/packet-trdp.c
index 116a442392..8b877d5c85 100644
--- a/epan/dissectors/packet-trdp.c
+++ b/epan/dissectors/packet-trdp.c
@@ -24,24 +24,24 @@ void proto_reg_handoff_trdp(void);
 void proto_register_trdp(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_trdp = -1;
-static int hf_trdp_seq = -1;
-static int hf_trdp_ver = -1;
-static int hf_trdp_msgtype = -1;
-static int hf_trdp_comid = -1;
-static int hf_trdp_etb_topo = -1;
-static int hf_trdp_oper_topo = -1;
-static int hf_trdp_len = -1;
-static int hf_trdp_res = -1;
-static int hf_trdp_reply_comid = -1;
-static int hf_trdp_reply_ipaddr = -1;
-static int hf_trdp_header_fcs = -1;
-static int hf_trdp_padding = -1;
-static int hf_trdp_reply_status = -1;
-static int hf_trdp_session_id = -1;
-static int hf_trdp_reply_timeout = -1;
-static int hf_trdp_source_uri = -1;
-static int hf_trdp_dest_uri = -1;
+static int proto_trdp;
+static int hf_trdp_seq;
+static int hf_trdp_ver;
+static int hf_trdp_msgtype;
+static int hf_trdp_comid;
+static int hf_trdp_etb_topo;
+static int hf_trdp_oper_topo;
+static int hf_trdp_len;
+static int hf_trdp_res;
+static int hf_trdp_reply_comid;
+static int hf_trdp_reply_ipaddr;
+static int hf_trdp_header_fcs;
+static int hf_trdp_padding;
+static int hf_trdp_reply_status;
+static int hf_trdp_session_id;
+static int hf_trdp_reply_timeout;
+static int hf_trdp_source_uri;
+static int hf_trdp_dest_uri;
 
 #define TRDP_PD_UDP_PORT 17224
 #define TRDP_MD_TCP_UDP_PORT 17225
@@ -49,7 +49,7 @@ static int hf_trdp_dest_uri = -1;
 #define TRDP_MD_HEADER_LEN 116
 
 /* Initialize the subtree pointers */
-static gint ett_trdp = -1;
+static gint ett_trdp;
 
 /* Initialize dissector table */
 static dissector_table_t trdp_dissector_table;
diff --git a/epan/dissectors/packet-trill.c b/epan/dissectors/packet-trill.c
index 755b272e59..295c3d066e 100644
--- a/epan/dissectors/packet-trill.c
+++ b/epan/dissectors/packet-trill.c
@@ -23,20 +23,20 @@ void proto_reg_handoff_trill(void);
 
 static dissector_handle_t trill_handle;
 
-static int proto_trill = -1 ;
-static gint ett_trill = -1 ;
-
-static int hf_trill_version = -1 ;
-static int hf_trill_reserved = -1 ;
-static int hf_trill_multi_dst = -1 ;
-static int hf_trill_op_len = -1 ;
-static int hf_trill_hop_cnt = -1 ;
-static int hf_trill_egress_nick = -1 ;
-static int hf_trill_ingress_nick = -1 ;
+static int proto_trill;
+static gint ett_trill;
+
+static int hf_trill_version;
+static int hf_trill_reserved;
+static int hf_trill_multi_dst;
+static int hf_trill_op_len;
+static int hf_trill_hop_cnt;
+static int hf_trill_egress_nick;
+static int hf_trill_ingress_nick;
 /* TODO For now we will just add all the options into a byte field.
    Later this should be parsed out into a sub-tree with all the option
    details. */
-static int hf_trill_options= -1 ;
+static int hf_trill_options;
 
 static dissector_handle_t eth_dissector ;
 
diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c
index b93a837ec1..a277f9ece5 100644
--- a/epan/dissectors/packet-trmac.c
+++ b/epan/dissectors/packet-trmac.c
@@ -17,58 +17,58 @@
 
 void proto_register_trmac(void);
 
-static int proto_trmac = -1;
-static int hf_trmac_mv = -1;
-static int hf_trmac_length = -1;
-static int hf_trmac_srcclass = -1;
-static int hf_trmac_dstclass = -1;
-static int hf_trmac_sv_len = -1;
-static int hf_trmac_sv_id = -1;
-static int hf_trmac_errors_iso = -1;
-static int hf_trmac_errors_line = -1;
-static int hf_trmac_errors_internal = -1;
-static int hf_trmac_errors_burst = -1;
-static int hf_trmac_errors_ac = -1;
-static int hf_trmac_errors_abort = -1;
-static int hf_trmac_errors_noniso = -1;
-static int hf_trmac_errors_lost = -1;
-static int hf_trmac_errors_congestion = -1;
-static int hf_trmac_errors_fc = -1;
-static int hf_trmac_errors_freq = -1;
-static int hf_trmac_errors_token = -1;
-static int hf_trmac_naun = -1;
-static int hf_trmac_beacon_type = -1;
-static int hf_trmac_assign_physical_drop_number = -1;
-static int hf_trmac_error_code = -1;
-static int hf_trmac_group_address32 = -1;
-static int hf_trmac_transmit_status_code = -1;
-static int hf_trmac_station_identifier = -1;
-static int hf_trmac_sa_of_last_amp_or_smp_frame = -1;
-static int hf_trmac_error_report_timer_value = -1;
-static int hf_trmac_individual_address_count = -1;
-static int hf_trmac_correlator = -1;
-static int hf_trmac_group_address_ether = -1;
-static int hf_trmac_authorized_access_priority = -1;
-static int hf_trmac_physical_drop_number = -1;
-static int hf_trmac_authorized_function_classes = -1;
-static int hf_trmac_local_ring_number = -1;
-static int hf_trmac_functional_addresses = -1;
+static int proto_trmac;
+static int hf_trmac_mv;
+static int hf_trmac_length;
+static int hf_trmac_srcclass;
+static int hf_trmac_dstclass;
+static int hf_trmac_sv_len;
+static int hf_trmac_sv_id;
+static int hf_trmac_errors_iso;
+static int hf_trmac_errors_line;
+static int hf_trmac_errors_internal;
+static int hf_trmac_errors_burst;
+static int hf_trmac_errors_ac;
+static int hf_trmac_errors_abort;
+static int hf_trmac_errors_noniso;
+static int hf_trmac_errors_lost;
+static int hf_trmac_errors_congestion;
+static int hf_trmac_errors_fc;
+static int hf_trmac_errors_freq;
+static int hf_trmac_errors_token;
+static int hf_trmac_naun;
+static int hf_trmac_beacon_type;
+static int hf_trmac_assign_physical_drop_number;
+static int hf_trmac_error_code;
+static int hf_trmac_group_address32;
+static int hf_trmac_transmit_status_code;
+static int hf_trmac_station_identifier;
+static int hf_trmac_sa_of_last_amp_or_smp_frame;
+static int hf_trmac_error_report_timer_value;
+static int hf_trmac_individual_address_count;
+static int hf_trmac_correlator;
+static int hf_trmac_group_address_ether;
+static int hf_trmac_authorized_access_priority;
+static int hf_trmac_physical_drop_number;
+static int hf_trmac_authorized_function_classes;
+static int hf_trmac_local_ring_number;
+static int hf_trmac_functional_addresses;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_trmac_unknown_subvector = -1;
-static int hf_trmac_response_code48 = -1;
-static int hf_trmac_product_instance_id = -1;
-static int hf_trmac_ring_station_version_number = -1;
-static int hf_trmac_wrap_data = -1;
-static int hf_trmac_ring_station_status = -1;
-static int hf_trmac_frame_forward = -1;
-static int hf_trmac_response_code32 = -1;
-
-static gint ett_tr_mac = -1;
-static gint ett_tr_sv = -1;
-static gint ett_tr_ierr_cnt = -1;
-static gint ett_tr_nerr_cnt = -1;
-
-static expert_field ei_trmac_sv_len = EI_INIT;
+static int hf_trmac_unknown_subvector;
+static int hf_trmac_response_code48;
+static int hf_trmac_product_instance_id;
+static int hf_trmac_ring_station_version_number;
+static int hf_trmac_wrap_data;
+static int hf_trmac_ring_station_status;
+static int hf_trmac_frame_forward;
+static int hf_trmac_response_code32;
+
+static gint ett_tr_mac;
+static gint ett_tr_sv;
+static gint ett_tr_ierr_cnt;
+static gint ett_tr_nerr_cnt;
+
+static expert_field ei_trmac_sv_len;
 
 /* Major Vector */
 static const value_string major_vector_vs[] = {
diff --git a/epan/dissectors/packet-tsdns.c b/epan/dissectors/packet-tsdns.c
index 62b9280dad..fa773169dc 100644
--- a/epan/dissectors/packet-tsdns.c
+++ b/epan/dissectors/packet-tsdns.c
@@ -22,19 +22,19 @@ void proto_register_tsdns(void);
 void proto_reg_handoff_tsdns(void);
 static dissector_handle_t tsdns_handle;
 
-static int proto_tsdns = -1;
+static int proto_tsdns;
 
-static int hf_tsdns_data = -1;
-static int hf_tsdns_request = -1;
-static int hf_tsdns_request_domain = -1;
-static int hf_tsdns_response = -1;
-static int hf_tsdns_response_ip = -1;
-static int hf_tsdns_response_address = -1;
-static int hf_tsdns_response_port = -1;
+static int hf_tsdns_data;
+static int hf_tsdns_request;
+static int hf_tsdns_request_domain;
+static int hf_tsdns_response;
+static int hf_tsdns_response_ip;
+static int hf_tsdns_response_address;
+static int hf_tsdns_response_port;
 
-static expert_field ei_response_port_malformed = EI_INIT;
+static expert_field ei_response_port_malformed;
 
-static gint ett_tsdns = -1;
+static gint ett_tsdns;
 
 static int dissect_tsdns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
diff --git a/epan/dissectors/packet-tsp.c b/epan/dissectors/packet-tsp.c
index 43b76538c4..a958df14c9 100644
--- a/epan/dissectors/packet-tsp.c
+++ b/epan/dissectors/packet-tsp.c
@@ -25,16 +25,16 @@ void proto_reg_handoff_tsp(void);
 
 static dissector_handle_t tsp_handle;
 
-static int proto_tsp = -1;
-static int hf_tsp_type = -1;
-static int hf_tsp_vers = -1;
-static int hf_tsp_seq = -1;
-static int hf_tsp_hopcnt = -1;
-static int hf_tsp_time_sec = -1;
-static int hf_tsp_time_usec = -1;
-static int hf_tsp_name = -1;
-
-static gint ett_tsp = -1;
+static int proto_tsp;
+static int hf_tsp_type;
+static int hf_tsp_vers;
+static int hf_tsp_seq;
+static int hf_tsp_hopcnt;
+static int hf_tsp_time_sec;
+static int hf_tsp_time_usec;
+static int hf_tsp_name;
+
+static gint ett_tsp;
 
 /* timed port from /etc/services */
 #define UDP_PORT_TIMED	525
diff --git a/epan/dissectors/packet-tte-pcf.c b/epan/dissectors/packet-tte-pcf.c
index 823927edd8..e7a836c369 100644
--- a/epan/dissectors/packet-tte-pcf.c
+++ b/epan/dissectors/packet-tte-pcf.c
@@ -25,19 +25,19 @@ void proto_register_tte_pcf(void);
 void proto_reg_handoff_tte_pcf(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_tte_pcf = -1;
+static int proto_tte_pcf;
 
-static int hf_tte_pcf_ic = -1;
-static int hf_tte_pcf_mn = -1;
-/* static int hf_tte_pcf_res0 = -1; */
-static int hf_tte_pcf_sp = -1;
-static int hf_tte_pcf_sd = -1;
-static int hf_tte_pcf_type = -1;
-/* static int hf_tte_pcf_res1 = -1; */
-static int hf_tte_pcf_tc = -1;
+static int hf_tte_pcf_ic;
+static int hf_tte_pcf_mn;
+/* static int hf_tte_pcf_res0; */
+static int hf_tte_pcf_sp;
+static int hf_tte_pcf_sd;
+static int hf_tte_pcf_type;
+/* static int hf_tte_pcf_res1; */
+static int hf_tte_pcf_tc;
 
 /* Initialize the subtree pointers */
-static gint ett_tte_pcf = -1;
+static gint ett_tte_pcf;
 
 static dissector_handle_t tte_pcf_handle;
 
diff --git a/epan/dissectors/packet-tte.c b/epan/dissectors/packet-tte.c
index 200f710787..36cbb06646 100644
--- a/epan/dissectors/packet-tte.c
+++ b/epan/dissectors/packet-tte.c
@@ -28,21 +28,21 @@ void proto_reg_handoff_tte(void);
 static dissector_handle_t ethertype_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_tte = -1;
+static int proto_tte;
 
-static int hf_eth_dst       = -1;
-static int hf_tte_dst_cf    = -1;
-static int hf_tte_ctid      = -1;
-static int hf_eth_src       = -1;
-static int hf_eth_type      = -1;
+static int hf_eth_dst;
+static int hf_tte_dst_cf;
+static int hf_tte_ctid;
+static int hf_eth_src;
+static int hf_eth_type;
 
 /* preference value pointers */
 static guint32    tte_pref_ct_marker    = 0xFFFFFFFF;
 static guint32    tte_pref_ct_mask      = 0x0;
 
 /* Initialize the subtree pointers */
-static gint ett_tte = -1;
-static gint ett_tte_macdest = -1;
+static gint ett_tte;
+static gint ett_tte_macdest;
 
 
 /* Code to actually dissect the packets */
diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c
index 47653eb51c..64d16c176f 100644
--- a/epan/dissectors/packet-turbocell.c
+++ b/epan/dissectors/packet-turbocell.c
@@ -40,30 +40,30 @@
 void proto_register_turbocell(void);
 void proto_reg_handoff_turbocell(void);
 
-static int proto_turbocell = -1;
-static int proto_aggregate = -1;
-
-static int hf_turbocell_type = -1;
-static int hf_turbocell_dst = -1;
-static int hf_turbocell_counter = -1;
-static int hf_turbocell_name = -1;
-static int hf_turbocell_nwid = -1;
-static int hf_turbocell_satmode = -1;
-static int hf_turbocell_unknown = -1;
-static int hf_turbocell_timestamp = -1;
-static int hf_turbocell_station = -1;
-static int hf_turbocell_ip = -1;
-
-static int hf_turbocell_aggregate_msdu_header_text = -1;
-static int hf_turbocell_aggregate_msdu_len = -1;
-static int hf_turbocell_aggregate_unknown1 = -1;
-static int hf_turbocell_aggregate_unknown2 = -1;
-static int hf_turbocell_aggregate_len = -1;
-
-static gint ett_turbocell = -1;
-static gint ett_network = -1;
-static gint ett_msdu_aggregation_parent_tree = -1;
-static gint ett_msdu_aggregation_subframe_tree = -1;
+static int proto_turbocell;
+static int proto_aggregate;
+
+static int hf_turbocell_type;
+static int hf_turbocell_dst;
+static int hf_turbocell_counter;
+static int hf_turbocell_name;
+static int hf_turbocell_nwid;
+static int hf_turbocell_satmode;
+static int hf_turbocell_unknown;
+static int hf_turbocell_timestamp;
+static int hf_turbocell_station;
+static int hf_turbocell_ip;
+
+static int hf_turbocell_aggregate_msdu_header_text;
+static int hf_turbocell_aggregate_msdu_len;
+static int hf_turbocell_aggregate_unknown1;
+static int hf_turbocell_aggregate_unknown2;
+static int hf_turbocell_aggregate_len;
+
+static gint ett_turbocell;
+static gint ett_network;
+static gint ett_msdu_aggregation_parent_tree;
+static gint ett_msdu_aggregation_subframe_tree;
 
 /* The ethernet dissector we hand off to */
 static dissector_handle_t eth_handle;
diff --git a/epan/dissectors/packet-turnchannel.c b/epan/dissectors/packet-turnchannel.c
index e575343963..3d8113bd28 100644
--- a/epan/dissectors/packet-turnchannel.c
+++ b/epan/dissectors/packet-turnchannel.c
@@ -39,17 +39,17 @@ void proto_reg_handoff_turnchannel(void);
 static heur_dissector_list_t heur_subdissector_list;
 
 /* Initialize the protocol and registered fields */
-static int proto_turnchannel = -1;
+static int proto_turnchannel;
 
-static int hf_turnchannel_id = -1;
-static int hf_turnchannel_len = -1;
+static int hf_turnchannel_id;
+static int hf_turnchannel_len;
 
 #define TURNCHANNEL_HDR_LEN	((guint)4)
 
 #define MS_MULTIPLEX_TURN 0xFF10
 
 /* Initialize the subtree pointers */
-static gint ett_turnchannel = -1;
+static gint ett_turnchannel;
 
 static dissector_handle_t turnchannel_tcp_handle;
 static dissector_handle_t turnchannel_udp_handle;
diff --git a/epan/dissectors/packet-tuxedo.c b/epan/dissectors/packet-tuxedo.c
index 423f261989..0c041a4070 100644
--- a/epan/dissectors/packet-tuxedo.c
+++ b/epan/dissectors/packet-tuxedo.c
@@ -18,11 +18,11 @@
 void proto_register_tuxedo(void);
 void proto_reg_handoff_tuxedo(void);
 
-static int proto_tuxedo = -1;
-static int hf_tuxedo_magic = -1;
-static int hf_tuxedo_opcode = -1;
+static int proto_tuxedo;
+static int hf_tuxedo_magic;
+static int hf_tuxedo_opcode;
 
-static gint ett_tuxedo = -1;
+static gint ett_tuxedo;
 
 static dissector_handle_t tuxedo_handle;
 
diff --git a/epan/dissectors/packet-twamp.c b/epan/dissectors/packet-twamp.c
index 1f0f7de019..88138582d2 100644
--- a/epan/dissectors/packet-twamp.c
+++ b/epan/dissectors/packet-twamp.c
@@ -87,63 +87,63 @@ static dissector_handle_t twamp_test_handle;
 static dissector_handle_t twamp_control_handle;
 
 /* Protocol enabled flags */
-static int proto_owamp_test = -1;
-static int proto_twamp_test = -1;
-static int proto_twamp_control = -1;
-static gint ett_owamp_test = -1;
-static gint ett_twamp_test = -1;
-static gint ett_twamp_control = -1;
-static gint ett_twamp_error_estimate = -1;
+static int proto_owamp_test;
+static int proto_twamp_test;
+static int proto_twamp_control;
+static gint ett_owamp_test;
+static gint ett_twamp_test;
+static gint ett_twamp_control;
+static gint ett_twamp_error_estimate;
 
 /* Twamp test fields */
-static int hf_twamp_seq_number = -1;
-static int hf_twamp_sender_timestamp = -1;
-static int hf_twamp_error_estimate = -1;
-static int hf_twamp_mbz1 = -1;
-static int hf_twamp_receive_timestamp = -1;
-static int hf_twamp_sender_seq_number = -1;
-static int hf_twamp_timestamp = -1;
-static int hf_twamp_sender_error_estimate = -1;
-static int hf_twamp_mbz2 = -1;
-static int hf_twamp_sender_ttl = -1;
-static int hf_twamp_padding = -1;
-static int hf_twamp_error_estimate_multiplier = -1;
-static int hf_twamp_error_estimate_scale = -1;
-static int hf_twamp_error_estimate_b14 = -1;
-static int hf_twamp_error_estimate_b15 = -1;
+static int hf_twamp_seq_number;
+static int hf_twamp_sender_timestamp;
+static int hf_twamp_error_estimate;
+static int hf_twamp_mbz1;
+static int hf_twamp_receive_timestamp;
+static int hf_twamp_sender_seq_number;
+static int hf_twamp_timestamp;
+static int hf_twamp_sender_error_estimate;
+static int hf_twamp_mbz2;
+static int hf_twamp_sender_ttl;
+static int hf_twamp_padding;
+static int hf_twamp_error_estimate_multiplier;
+static int hf_twamp_error_estimate_scale;
+static int hf_twamp_error_estimate_b14;
+static int hf_twamp_error_estimate_b15;
 
 /* Twamp control fields */
-static int hf_twamp_control_unused = -1;
-static int hf_twamp_control_command = -1;
-static int hf_twamp_control_modes = -1;
-static int hf_twamp_control_mode = -1;
-static int hf_twamp_control_challenge = -1;
-static int hf_twamp_control_salt   = -1;
-static int hf_twamp_control_count  = -1;
-static int hf_twamp_control_keyid  = -1;
-static int hf_twamp_control_sessionid  = -1;
-static int hf_twamp_control_iv = -1;
-static int hf_twamp_control_ipvn = -1;
-static int hf_twamp_control_conf_sender = -1;
-static int hf_twamp_control_conf_receiver = -1;
-static int hf_twamp_control_number_of_schedule_slots = -1;
-static int hf_twamp_control_number_of_packets = -1;
-static int hf_twamp_control_start_time = -1;
-static int hf_twamp_control_accept = -1;
-static int hf_twamp_control_timeout = -1;
-static int hf_twamp_control_type_p = -1;
-static int hf_twamp_control_mbz1   = -1;
-static int hf_twamp_control_mbz2   = -1;
-static int hf_twamp_control_hmac   = -1;
-static int hf_twamp_control_num_sessions   = -1;
-static int hf_twamp_control_sender_port    = -1;
-static int hf_twamp_control_server_uptime  = -1;
-static int hf_twamp_control_receiver_port  = -1;
-static int hf_twamp_control_padding_length = -1;
-static int hf_twamp_control_sender_ipv4 = -1;
-static int hf_twamp_control_sender_ipv6 = -1;
-static int hf_twamp_control_receiver_ipv4 = -1;
-static int hf_twamp_control_receiver_ipv6 = -1;
+static int hf_twamp_control_unused;
+static int hf_twamp_control_command;
+static int hf_twamp_control_modes;
+static int hf_twamp_control_mode;
+static int hf_twamp_control_challenge;
+static int hf_twamp_control_salt;
+static int hf_twamp_control_count;
+static int hf_twamp_control_keyid;
+static int hf_twamp_control_sessionid;
+static int hf_twamp_control_iv;
+static int hf_twamp_control_ipvn;
+static int hf_twamp_control_conf_sender;
+static int hf_twamp_control_conf_receiver;
+static int hf_twamp_control_number_of_schedule_slots;
+static int hf_twamp_control_number_of_packets;
+static int hf_twamp_control_start_time;
+static int hf_twamp_control_accept;
+static int hf_twamp_control_timeout;
+static int hf_twamp_control_type_p;
+static int hf_twamp_control_mbz1;
+static int hf_twamp_control_mbz2;
+static int hf_twamp_control_hmac;
+static int hf_twamp_control_num_sessions;
+static int hf_twamp_control_sender_port;
+static int hf_twamp_control_server_uptime;
+static int hf_twamp_control_receiver_port;
+static int hf_twamp_control_padding_length;
+static int hf_twamp_control_sender_ipv4;
+static int hf_twamp_control_sender_ipv6;
+static int hf_twamp_control_receiver_ipv4;
+static int hf_twamp_control_receiver_ipv6;
 
 static const value_string twamp_control_accept_vals[] = {
     { 0, "OK" },
diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c
index 37cb4b53fe..96fe9f312f 100644
--- a/epan/dissectors/packet-tzsp.c
+++ b/epan/dissectors/packet-tzsp.c
@@ -30,10 +30,10 @@
 void proto_register_tzsp(void);
 void proto_reg_handoff_tzsp(void);
 
-static int proto_tzsp = -1;
-static int hf_tzsp_version = -1;
-static int hf_tzsp_type = -1;
-static int hf_tzsp_encap = -1;
+static int proto_tzsp;
+static int hf_tzsp_version;
+static int hf_tzsp_type;
+static int hf_tzsp_encap;
 
 static dissector_handle_t tzsp_handle;
 
@@ -88,8 +88,8 @@ static const value_string tzsp_encapsulation[] = {
     {0, NULL}
 };
 
-static gint ett_tzsp = -1;
-static gint ett_tag = -1;
+static gint ett_tzsp;
+static gint ett_tag;
 
 static dissector_handle_t eth_maybefcs_handle;
 static dissector_handle_t tr_handle;
@@ -105,30 +105,30 @@ static dissector_handle_t ieee_802_11_radiotap_handle;
 /*                WLAN radio header fields                                    */
 /* ************************************************************************* */
 
-static int hf_option_tag = -1;
-static int hf_option_length = -1;
-/* static int hf_status_field = -1; */
-static int hf_status_msg_type = -1;
-static int hf_status_pcf = -1;
-/* static int hf_status_mac_port = -1; */
-static int hf_status_undecrypted = -1;
-static int hf_status_fcs_error = -1;
-
-static int hf_time = -1;
-static int hf_silence = -1;
-static int hf_signal = -1;
-static int hf_rate = -1;
-static int hf_channel = -1;
-static int hf_unknown = -1;
-static int hf_original_length = -1;
-static int hf_sensormac = -1;
-
-static int hf_device_name = -1;
-static int hf_capture_location = -1;
-static int hf_capture_info = -1;
-static int hf_capture_id = -1;
-static int hf_time_stamp = -1;
-static int hf_packet_id = -1;
+static int hf_option_tag;
+static int hf_option_length;
+/* static int hf_status_field; */
+static int hf_status_msg_type;
+static int hf_status_pcf;
+/* static int hf_status_mac_port; */
+static int hf_status_undecrypted;
+static int hf_status_fcs_error;
+
+static int hf_time;
+static int hf_silence;
+static int hf_signal;
+static int hf_rate;
+static int hf_channel;
+static int hf_unknown;
+static int hf_original_length;
+static int hf_sensormac;
+
+static int hf_device_name;
+static int hf_capture_location;
+static int hf_capture_info;
+static int hf_capture_id;
+static int hf_time_stamp;
+static int hf_packet_id;
 
 
 
diff --git a/epan/dissectors/packet-u3v.c b/epan/dissectors/packet-u3v.c
index cc5573ee70..b753e35597 100644
--- a/epan/dissectors/packet-u3v.c
+++ b/epan/dissectors/packet-u3v.c
@@ -418,7 +418,7 @@ void proto_register_u3v(void);
 void proto_reg_handoff_u3v(void);
 
 /* Define the u3v protocol */
-static int proto_u3v = -1;
+static int proto_u3v;
 
 /* GenCP transaction tracking
  * the protocol only allows strict sequential
@@ -457,153 +457,153 @@ typedef struct _u3v_conv_info_t {
 /*
  \brief IDs used for bootstrap dissection
 */
-static int hf_u3v_gencp_prefix = -1;
-static int hf_u3v_flag = -1;
-static int hf_u3v_acknowledge_required_flag = -1;
-static int hf_u3v_command_id = -1;
-static int hf_u3v_length = -1;
-static int hf_u3v_request_id = -1;
-static int hf_u3v_status = -1;
-static int hf_u3v_address = -1;
-static int hf_u3v_count = -1;
-static int hf_u3v_eventcmd_id = -1;
-static int hf_u3v_eventcmd_error_id = -1;
-static int hf_u3v_eventcmd_device_specific_id = -1;
-static int hf_u3v_eventcmd_timestamp = -1;
-static int hf_u3v_eventcmd_data = -1;
-static int hf_u3v_time_to_completion = -1;
-static int hf_u3v_payloaddata = -1;
-static int hf_u3v_reserved = -1;
-
-static int hf_u3v_bootstrap_GenCP_Version = -1;
-static int hf_u3v_bootstrap_Manufacturer_Name = -1;
-static int hf_u3v_bootstrap_Model_Name = -1;
-static int hf_u3v_bootstrap_Family_Name = -1;
-static int hf_u3v_bootstrap_Device_Version = -1;
-static int hf_u3v_bootstrap_Manufacturer_Info = -1;
-static int hf_u3v_bootstrap_Serial_Number = -1;
-static int hf_u3v_bootstrap_User_Defined_Name = -1;
-static int hf_u3v_bootstrap_Device_Capability = -1;
-static int hf_u3v_bootstrap_Maximum_Device_Response_Time = -1;
-static int hf_u3v_bootstrap_Manifest_Table_Address = -1;
-static int hf_u3v_bootstrap_SBRM_Address = -1;
-static int hf_u3v_bootstrap_Device_Configuration = -1;
-static int hf_u3v_bootstrap_Heartbeat_Timeout = -1;
-static int hf_u3v_bootstrap_Message_Channel_channel_id = -1;
-static int hf_u3v_bootstrap_Timestamp = -1;
-static int hf_u3v_bootstrap_Timestamp_Latch = -1;
-static int hf_u3v_bootstrap_Timestamp_Increment = -1;
-static int hf_u3v_bootstrap_Access_Privilege = -1;
-static int hf_u3v_bootstrap_Protocol_Endianness = -1;
-static int hf_u3v_bootstrap_Implementation_Endianness = -1;
-static int hf_u3v_bootstrap_U3V_Version = -1;
-static int hf_u3v_bootstrap_U3VCP_Capability_Register = -1;
-static int hf_u3v_bootstrap_U3VCP_Configuration_Register = -1;
-static int hf_u3v_bootstrap_Maximum_Command_Transfer_Length = -1;
-static int hf_u3v_bootstrap_Maximum_Acknowledge_Transfer_Length = -1;
-static int hf_u3v_bootstrap_Number_of_Stream_Channels = -1;
-static int hf_u3v_bootstrap_SIRM_Address = -1;
-static int hf_u3v_bootstrap_SIRM_Length = -1;
-static int hf_u3v_bootstrap_EIRM_Address = -1;
-static int hf_u3v_bootstrap_EIRM_Length = -1;
-static int hf_u3v_bootstrap_IIDC2_Address = -1;
-static int hf_u3v_bootstrap_Current_Speed = -1;
-static int hf_u3v_bootstrap_SI_Info = -1;
-static int hf_u3v_bootstrap_SI_Control = -1;
-static int hf_u3v_bootstrap_SI_Required_Payload_Size = -1;
-static int hf_u3v_bootstrap_SI_Required_Leader_Size = -1;
-static int hf_u3v_bootstrap_SI_Required_Trailer_Size = -1;
-static int hf_u3v_bootstrap_SI_Maximum_Leader_Size = -1;
-static int hf_u3v_bootstrap_SI_Payload_Transfer_Size = -1;
-static int hf_u3v_bootstrap_SI_Payload_Transfer_Count = -1;
-static int hf_u3v_bootstrap_SI_Payload_Final_Transfer1_Size = -1;
-static int hf_u3v_bootstrap_SI_Payload_Final_Transfer2_Size = -1;
-static int hf_u3v_bootstrap_SI_Maximum_Trailer_Size = -1;
-static int hf_u3v_bootstrap_EI_Control = -1;
-static int hf_u3v_bootstrap_Maximum_Event_Transfer_Length = -1;
-static int hf_u3v_bootstrap_Event_Test_Control = -1;
-static int hf_u3v_custom_memory_addr = -1;
-static int hf_u3v_custom_memory_data = -1;
-
-static int hf_u3v_scd_readmem_cmd = -1;
-static int hf_u3v_scd_writemem_cmd = -1;
-static int hf_u3v_scd_event_cmd = -1;
-static int hf_u3v_scd_ack_readmem_ack = -1;
-static int hf_u3v_scd_writemem_ack = -1;
-static int hf_u3v_ccd_pending_ack = -1;
-static int hf_u3v_stream_leader = -1;
-static int hf_u3v_stream_trailer = -1;
-static int hf_u3v_stream_payload = -1;
-static int hf_u3v_ccd_cmd = -1;
-static int hf_u3v_ccd_ack = -1;
-static int hf_u3v_device_info_descriptor = -1;
+static int hf_u3v_gencp_prefix;
+static int hf_u3v_flag;
+static int hf_u3v_acknowledge_required_flag;
+static int hf_u3v_command_id;
+static int hf_u3v_length;
+static int hf_u3v_request_id;
+static int hf_u3v_status;
+static int hf_u3v_address;
+static int hf_u3v_count;
+static int hf_u3v_eventcmd_id;
+static int hf_u3v_eventcmd_error_id;
+static int hf_u3v_eventcmd_device_specific_id;
+static int hf_u3v_eventcmd_timestamp;
+static int hf_u3v_eventcmd_data;
+static int hf_u3v_time_to_completion;
+static int hf_u3v_payloaddata;
+static int hf_u3v_reserved;
+
+static int hf_u3v_bootstrap_GenCP_Version;
+static int hf_u3v_bootstrap_Manufacturer_Name;
+static int hf_u3v_bootstrap_Model_Name;
+static int hf_u3v_bootstrap_Family_Name;
+static int hf_u3v_bootstrap_Device_Version;
+static int hf_u3v_bootstrap_Manufacturer_Info;
+static int hf_u3v_bootstrap_Serial_Number;
+static int hf_u3v_bootstrap_User_Defined_Name;
+static int hf_u3v_bootstrap_Device_Capability;
+static int hf_u3v_bootstrap_Maximum_Device_Response_Time;
+static int hf_u3v_bootstrap_Manifest_Table_Address;
+static int hf_u3v_bootstrap_SBRM_Address;
+static int hf_u3v_bootstrap_Device_Configuration;
+static int hf_u3v_bootstrap_Heartbeat_Timeout;
+static int hf_u3v_bootstrap_Message_Channel_channel_id;
+static int hf_u3v_bootstrap_Timestamp;
+static int hf_u3v_bootstrap_Timestamp_Latch;
+static int hf_u3v_bootstrap_Timestamp_Increment;
+static int hf_u3v_bootstrap_Access_Privilege;
+static int hf_u3v_bootstrap_Protocol_Endianness;
+static int hf_u3v_bootstrap_Implementation_Endianness;
+static int hf_u3v_bootstrap_U3V_Version;
+static int hf_u3v_bootstrap_U3VCP_Capability_Register;
+static int hf_u3v_bootstrap_U3VCP_Configuration_Register;
+static int hf_u3v_bootstrap_Maximum_Command_Transfer_Length;
+static int hf_u3v_bootstrap_Maximum_Acknowledge_Transfer_Length;
+static int hf_u3v_bootstrap_Number_of_Stream_Channels;
+static int hf_u3v_bootstrap_SIRM_Address;
+static int hf_u3v_bootstrap_SIRM_Length;
+static int hf_u3v_bootstrap_EIRM_Address;
+static int hf_u3v_bootstrap_EIRM_Length;
+static int hf_u3v_bootstrap_IIDC2_Address;
+static int hf_u3v_bootstrap_Current_Speed;
+static int hf_u3v_bootstrap_SI_Info;
+static int hf_u3v_bootstrap_SI_Control;
+static int hf_u3v_bootstrap_SI_Required_Payload_Size;
+static int hf_u3v_bootstrap_SI_Required_Leader_Size;
+static int hf_u3v_bootstrap_SI_Required_Trailer_Size;
+static int hf_u3v_bootstrap_SI_Maximum_Leader_Size;
+static int hf_u3v_bootstrap_SI_Payload_Transfer_Size;
+static int hf_u3v_bootstrap_SI_Payload_Transfer_Count;
+static int hf_u3v_bootstrap_SI_Payload_Final_Transfer1_Size;
+static int hf_u3v_bootstrap_SI_Payload_Final_Transfer2_Size;
+static int hf_u3v_bootstrap_SI_Maximum_Trailer_Size;
+static int hf_u3v_bootstrap_EI_Control;
+static int hf_u3v_bootstrap_Maximum_Event_Transfer_Length;
+static int hf_u3v_bootstrap_Event_Test_Control;
+static int hf_u3v_custom_memory_addr;
+static int hf_u3v_custom_memory_data;
+
+static int hf_u3v_scd_readmem_cmd;
+static int hf_u3v_scd_writemem_cmd;
+static int hf_u3v_scd_event_cmd;
+static int hf_u3v_scd_ack_readmem_ack;
+static int hf_u3v_scd_writemem_ack;
+static int hf_u3v_ccd_pending_ack;
+static int hf_u3v_stream_leader;
+static int hf_u3v_stream_trailer;
+static int hf_u3v_stream_payload;
+static int hf_u3v_ccd_cmd;
+static int hf_u3v_ccd_ack;
+static int hf_u3v_device_info_descriptor;
 
 /* stream elements */
-static int hf_u3v_stream_reserved = -1;
-static int hf_u3v_stream_leader_size = -1;
+static int hf_u3v_stream_reserved;
+static int hf_u3v_stream_leader_size;
 
-static int hf_u3v_stream_prefix = -1;
-static int hf_u3v_stream_trailer_size = -1;
+static int hf_u3v_stream_prefix;
+static int hf_u3v_stream_trailer_size;
 
-static int hf_u3v_stream_block_id = -1;
-static int hf_u3v_stream_payload_type = -1;
-static int hf_u3v_stream_status = -1;
-static int hf_u3v_stream_valid_payload_size = -1;
+static int hf_u3v_stream_block_id;
+static int hf_u3v_stream_payload_type;
+static int hf_u3v_stream_status;
+static int hf_u3v_stream_valid_payload_size;
 
-static int hf_u3v_stream_timestamp = -1;
-static int hf_u3v_stream_pixel_format = -1;
-static int hf_u3v_stream_size_x = -1;
-static int hf_u3v_stream_size_y = -1;
-static int hf_u3v_stream_offset_x = -1;
-static int hf_u3v_stream_offset_y = -1;
-static int hf_u3v_stream_padding_x = -1;
-static int hf_u3v_stream_chunk_layout_id = -1;
+static int hf_u3v_stream_timestamp;
+static int hf_u3v_stream_pixel_format;
+static int hf_u3v_stream_size_x;
+static int hf_u3v_stream_size_y;
+static int hf_u3v_stream_offset_x;
+static int hf_u3v_stream_offset_y;
+static int hf_u3v_stream_padding_x;
+static int hf_u3v_stream_chunk_layout_id;
 
-static int hf_u3v_stream_data = -1;
+static int hf_u3v_stream_data;
 
 /* U3V device info descriptor */
-static int hf_u3v_device_info_descriptor_bLength = -1;
-static int hf_u3v_device_info_descriptor_bDescriptorType = -1;
-static int hf_u3v_device_info_descriptor_bDescriptorSubtype = -1;
-static int hf_u3v_device_info_descriptor_bGenCPVersion = -1;
-static int hf_u3v_device_info_descriptor_bGenCPVersion_minor = -1;
-static int hf_u3v_device_info_descriptor_bGenCPVersion_major = -1;
-static int hf_u3v_device_info_descriptor_bU3VVersion = -1;
-static int hf_u3v_device_info_descriptor_bU3VVersion_minor = -1;
-static int hf_u3v_device_info_descriptor_bU3VVersion_major = -1;
-static int hf_u3v_device_info_descriptor_iDeviceGUID = -1;
-static int hf_u3v_device_info_descriptor_iVendorName = -1;
-static int hf_u3v_device_info_descriptor_iModelName = -1;
-static int hf_u3v_device_info_descriptor_iFamilyName = -1;
-static int hf_u3v_device_info_descriptor_iDeviceVersion = -1;
-static int hf_u3v_device_info_descriptor_iManufacturerInfo = -1;
-static int hf_u3v_device_info_descriptor_iSerialNumber = -1;
-static int hf_u3v_device_info_descriptor_iUserDefinedName = -1;
-static int hf_u3v_device_info_descriptor_bmSpeedSupport = -1;
-static int hf_u3v_device_info_descriptor_bmSpeedSupport_low_speed = -1;
-static int hf_u3v_device_info_descriptor_bmSpeedSupport_full_speed = -1;
-static int hf_u3v_device_info_descriptor_bmSpeedSupport_high_speed = -1;
-static int hf_u3v_device_info_descriptor_bmSpeedSupport_super_speed = -1;
-static int hf_u3v_device_info_descriptor_bmSpeedSupport_reserved = -1;
+static int hf_u3v_device_info_descriptor_bLength;
+static int hf_u3v_device_info_descriptor_bDescriptorType;
+static int hf_u3v_device_info_descriptor_bDescriptorSubtype;
+static int hf_u3v_device_info_descriptor_bGenCPVersion;
+static int hf_u3v_device_info_descriptor_bGenCPVersion_minor;
+static int hf_u3v_device_info_descriptor_bGenCPVersion_major;
+static int hf_u3v_device_info_descriptor_bU3VVersion;
+static int hf_u3v_device_info_descriptor_bU3VVersion_minor;
+static int hf_u3v_device_info_descriptor_bU3VVersion_major;
+static int hf_u3v_device_info_descriptor_iDeviceGUID;
+static int hf_u3v_device_info_descriptor_iVendorName;
+static int hf_u3v_device_info_descriptor_iModelName;
+static int hf_u3v_device_info_descriptor_iFamilyName;
+static int hf_u3v_device_info_descriptor_iDeviceVersion;
+static int hf_u3v_device_info_descriptor_iManufacturerInfo;
+static int hf_u3v_device_info_descriptor_iSerialNumber;
+static int hf_u3v_device_info_descriptor_iUserDefinedName;
+static int hf_u3v_device_info_descriptor_bmSpeedSupport;
+static int hf_u3v_device_info_descriptor_bmSpeedSupport_low_speed;
+static int hf_u3v_device_info_descriptor_bmSpeedSupport_full_speed;
+static int hf_u3v_device_info_descriptor_bmSpeedSupport_high_speed;
+static int hf_u3v_device_info_descriptor_bmSpeedSupport_super_speed;
+static int hf_u3v_device_info_descriptor_bmSpeedSupport_reserved;
 
 /*Define the tree for u3v*/
-static int ett_u3v = -1;
-static int ett_u3v_cmd = -1;
-static int ett_u3v_flags = -1;
-static int ett_u3v_ack = -1;
-static int ett_u3v_payload_cmd = -1;
-static int ett_u3v_payload_ack = -1;
-static int ett_u3v_payload_cmd_subtree = -1;
-static int ett_u3v_payload_ack_subtree = -1;
-static int ett_u3v_bootstrap_fields = -1;
-static int ett_u3v_stream_leader = -1;
-static int ett_u3v_stream_trailer = -1;
-static int ett_u3v_stream_payload = -1;
-
-static int ett_u3v_device_info_descriptor = -1;
-static int ett_u3v_device_info_descriptor_speed_support = -1;
-static int ett_u3v_device_info_descriptor_gencp_version = -1;
-static int ett_u3v_device_info_descriptor_u3v_version = -1;
+static int ett_u3v;
+static int ett_u3v_cmd;
+static int ett_u3v_flags;
+static int ett_u3v_ack;
+static int ett_u3v_payload_cmd;
+static int ett_u3v_payload_ack;
+static int ett_u3v_payload_cmd_subtree;
+static int ett_u3v_payload_ack_subtree;
+static int ett_u3v_bootstrap_fields;
+static int ett_u3v_stream_leader;
+static int ett_u3v_stream_trailer;
+static int ett_u3v_stream_payload;
+
+static int ett_u3v_device_info_descriptor;
+static int ett_u3v_device_info_descriptor_speed_support;
+static int ett_u3v_device_info_descriptor_gencp_version;
+static int ett_u3v_device_info_descriptor_u3v_version;
 
 static dissector_handle_t u3v_handle = NULL;
 
diff --git a/epan/dissectors/packet-ua.c b/epan/dissectors/packet-ua.c
index c5e5d4604e..ad02bbb887 100644
--- a/epan/dissectors/packet-ua.c
+++ b/epan/dissectors/packet-ua.c
@@ -25,8 +25,8 @@ void proto_reg_handoff_ua_msg(void);
 static dissector_table_t ua_opcode_dissector_table;
 #endif
 
-static int  proto_ua_msg        = -1;
-static gint ett_ua_msg          = -1;
+static int  proto_ua_msg;
+static gint ett_ua_msg;
 
 static dissector_handle_t noe_handle;
 static dissector_handle_t ua3g_handle;
diff --git a/epan/dissectors/packet-ua3g.c b/epan/dissectors/packet-ua3g.c
index 51ae81562b..a370d246b3 100644
--- a/epan/dissectors/packet-ua3g.c
+++ b/epan/dissectors/packet-ua3g.c
@@ -30,392 +30,392 @@ void proto_reg_handoff_ua3g(void);
 static dissector_table_t ua3g_opcode_dissector_table;
 #endif
 
-static int  proto_ua3g          = -1;
-static gint ett_ua3g            = -1;
-static gint ett_ua3g_body       = -1;
-static gint ett_ua3g_param      = -1;
-static gint ett_ua3g_param_sub  = -1;
-static gint ett_ua3g_option     = -1;
-static gint ett_ua3g_beep_beep_destination = -1;
-static gint ett_ua3g_note       = -1;
+static int  proto_ua3g;
+static gint ett_ua3g;
+static gint ett_ua3g_body;
+static gint ett_ua3g_param;
+static gint ett_ua3g_param_sub;
+static gint ett_ua3g_option;
+static gint ett_ua3g_beep_beep_destination;
+static gint ett_ua3g_note;
 
 static gboolean setup_conversations_enabled = TRUE;
 
-static int  hf_ua3g_length                  = -1;
-static int  hf_ua3g_opcode_sys              = -1;
-static int  hf_ua3g_opcode_term             = -1;
-static int  hf_ua3g_opcode_production_test  = -1;
-static int  hf_ua3g_opcode_subservice_reset = -1;
-static int  hf_ua3g_opcode_are_you_there    = -1;
-static int  hf_ua3g_opcode_set_speaker_vol  = -1;
-static int  hf_ua3g_opcode_trace_on         = -1;
-static int  hf_ua3g_ip                      = -1;
-static int  hf_ua3g_ip_cs                   = -1;
-static int  hf_ua3g_command_led             = -1;
-static int  hf_ua3g_command_lcd_line        = -1;
-static int  hf_ua3g_main_voice_mode         = -1;
-static int  hf_ua3g_command_set_clck        = -1;
-static int  hf_ua3g_external_ringing_command= -1;
-static int  hf_ua3g_lcd_cursor              = -1;
-static int  hf_ua3g_command_beep            = -1;
-static int  hf_ua3g_command_sidetone        = -1;
-static int  hf_ua3g_command_mute            = -1;
-static int  hf_ua3g_command_feedback        = -1;
-static int  hf_ua3g_command_audio_config    = -1;
-static int  hf_ua3g_command_key_release     = -1;
-static int  hf_ua3g_command_amplified_handset = -1;
-static int  hf_ua3g_command_loudspeaker     = -1;
-static int  hf_ua3g_command_announce        = -1;
-static int  hf_ua3g_command_ring            = -1;
-static int  hf_ua3g_command_ua_dwl_protocol = -1;
-static int  hf_ua3g_command_unsolicited_msg = -1;
-static int  hf_ua3g_ip_device_routing_stop_rtp_parameter = -1;
-static int  hf_ua3g_ip_device_routing_stop_rtp_parameter_length = -1;
-static int  hf_ua3g_ip_device_routing_stop_rtp_parameter_value_num = -1;
-static int  hf_ua3g_ip_device_routing_stop_rtp_parameter_value_bytes = -1;
+static int  hf_ua3g_length;
+static int  hf_ua3g_opcode_sys;
+static int  hf_ua3g_opcode_term;
+static int  hf_ua3g_opcode_production_test;
+static int  hf_ua3g_opcode_subservice_reset;
+static int  hf_ua3g_opcode_are_you_there;
+static int  hf_ua3g_opcode_set_speaker_vol;
+static int  hf_ua3g_opcode_trace_on;
+static int  hf_ua3g_ip;
+static int  hf_ua3g_ip_cs;
+static int  hf_ua3g_command_led;
+static int  hf_ua3g_command_lcd_line;
+static int  hf_ua3g_main_voice_mode;
+static int  hf_ua3g_command_set_clck;
+static int  hf_ua3g_external_ringing_command;
+static int  hf_ua3g_lcd_cursor;
+static int  hf_ua3g_command_beep;
+static int  hf_ua3g_command_sidetone;
+static int  hf_ua3g_command_mute;
+static int  hf_ua3g_command_feedback;
+static int  hf_ua3g_command_audio_config;
+static int  hf_ua3g_command_key_release;
+static int  hf_ua3g_command_amplified_handset;
+static int  hf_ua3g_command_loudspeaker;
+static int  hf_ua3g_command_announce;
+static int  hf_ua3g_command_ring;
+static int  hf_ua3g_command_ua_dwl_protocol;
+static int  hf_ua3g_command_unsolicited_msg;
+static int  hf_ua3g_ip_device_routing_stop_rtp_parameter;
+static int  hf_ua3g_ip_device_routing_stop_rtp_parameter_length;
+static int  hf_ua3g_ip_device_routing_stop_rtp_parameter_value_num;
+static int  hf_ua3g_ip_device_routing_stop_rtp_parameter_value_bytes;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_ua3g_ip_device_routing_start_tone_direction = -1;
-static int hf_ua3g_ip_device_routing_start_tone_num_entries = -1;
-static int hf_ua3g_ip_device_routing_def_tones_num_entries = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd00_characteristic_number = -1;
-static int hf_ua3g_subdevice_msg_subdev_type = -1;
-static int hf_ua3g_unsolicited_msg_next_byte_of_bad_segment = -1;
-static int hf_ua3g_ip_device_routing_start_tone_identification = -1;
-static int hf_ua3g_ip_device_routing_def_tones_level_2 = -1;
-static int hf_ua3g_r_w_peripheral_content = -1;
-static int hf_ua3g_subdevice_metastate_subchannel_address = -1;
-static int hf_ua3g_subdevice_parameter_bytes = -1;
-static int hf_ua3g_subdevice_msg_parameter_bytes = -1;
-static int hf_ua3g_set_clck_timer_pos_call_timer_column_number = -1;
-static int hf_ua3g_unsolicited_msg_segment_failure_s = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter = -1;
-static int hf_ua3g_ip_device_routing_get_param_req_parameter = -1;
-static int hf_ua3g_set_lcd_contrast_driver_number = -1;
-static int hf_ua3g_dwl_special_char_character_number = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd00_vta_type = -1;
-static int hf_ua3g_ua_dwl_protocol_cause = -1;
-static int hf_ua3g_audio_padded_path_emission_padded_level = -1;
-static int hf_ua3g_set_clck_timer_pos_clock_column_number = -1;
-static int hf_ua3g_segment_msg_num_remaining = -1;
-static int hf_ua3g_ip_device_routing_digit_value = -1;
-static int hf_ua3g_super_msg_data = -1;
-static int hf_ua3g_unsolicited_msg_hardware_version = -1;
-static int hf_ua3g_voice_channel_announce = -1;
-static int hf_ua3g_ring_silent = -1;
-static int hf_ua3g_audio_config_handsfree_return = -1;
-static int hf_ua3g_dwl_dtmf_clck_format_inter_digit_pause_time = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_length = -1;
-static int hf_ua3g_unsolicited_msg_opcode_bad_segment = -1;
-static int hf_ua3g_unsolicited_msg_firmware_version_loader = -1;
-static int hf_ua3g_debug_in_line = -1;
-static int hf_ua3g_voice_channel_b_microphones = -1;
-static int hf_ua3g_beep_beep_number = -1;
-static int hf_ua3g_main_voice_mode_tune = -1;
-static int hf_ua3g_super_msg_length = -1;
-static int hf_ua3g_ip_device_routing_redirect_parameter = -1;
-static int hf_ua3g_unsolicited_msg_next_byte_of_bad_command = -1;
-static int hf_ua3g_unsolicited_msg_self_test_result = -1;
-static int hf_ua3g_beep_on_off = -1;
-static int hf_ua3g_ua_dwl_protocol_binary_length = -1;
-static int hf_ua3g_ring_speaker_level = -1;
-static int hf_ua3g_voice_channel_channel_mode = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_length = -1;
-static int hf_ua3g_ip_device_routing_start_rtp_parameter = -1;
-static int hf_ua3g_subdevice_metastate_new_metastate = -1;
-static int hf_ua3g_unsolicited_msg_other_information_2 = -1;
-static int hf_ua3g_set_lcd_contrast_contrast_value = -1;
-static int hf_ua3g_unsolicited_msg_vta_type = -1;
-static int hf_ua3g_ua_dwl_protocol_packet_number = -1;
-static int hf_ua3g_unsolicited_msg_segment_failure_l = -1;
-static int hf_ua3g_voice_channel_b_ear_piece = -1;
-static int hf_ua3g_subdevice_msg_subdev_address = -1;
-static int hf_ua3g_ring_progressive = -1;
-static int hf_ua3g_ua_dwl_protocol_item_version = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter_length = -1;
-static int hf_ua3g_dwl_dtmf_clck_format_minimum_on_time = -1;
-static int hf_ua3g_ring_melody = -1;
-static int hf_ua3g_ua_dwl_protocol_item_identifier = -1;
-static int hf_ua3g_main_voice_mode_speaker_volume = -1;
-static int hf_ua3g_ip_device_routing_listen_rtp_parameter_length = -1;
-static int hf_ua3g_ringing_cadence_length = -1;
-static int hf_ua3g_software_reset = -1;
-static int hf_ua3g_feedback_level = -1;
-static int hf_ua3g_ip_phone_warmstart = -1;
-static int hf_ua3g_subdevice_opcode = -1;
-static int hf_ua3g_unsolicited_msg_device_event = -1;
-static int hf_ua3g_segment_message_data = -1;
-static int hf_ua3g_main_voice_mode_sending_level = -1;
-static int hf_ua3g_subdevice_msg_subdevice_opcode = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter = -1;
-static int hf_ua3g_audio_padded_path_reception_padded_level = -1;
-static int hf_ua3g_ua_dwl_protocol_force_mode = -1;
-static int hf_ua3g_lcd_line_cmd_starting_column = -1;
-static int hf_ua3g_subdevice_address = -1;
-static int hf_ua3g_ip_device_routing_pause_restart_rtp_parameter = -1;
-static int hf_ua3g_audio_config_ignored = -1;
-static int hf_ua3g_lcd_line_cmd_lcd_options = -1;
-static int hf_ua3g_main_voice_mode_cadence = -1;
-static int hf_ua3g_segment_msg_length = -1;
-static int hf_ua3g_ua_dwl_protocol_acknowledge = -1;
-static int hf_ua3g_command_led_number = -1;
-static int hf_ua3g_set_clck_timer_pos_call_timer_line_number = -1;
-static int hf_ua3g_unsolicited_msg_segment_failure_t = -1;
-static int hf_ua3g_ip_device_routing_start_tone_duration = -1;
-static int hf_ua3g_unsolicited_msg_other_information_1 = -1;
-static int hf_ua3g_unsolicited_msg_firmware_datas_patch_version = -1;
-static int hf_ua3g_ring_beep_number = -1;
-static int hf_ua3g_feedback_duration = -1;
-static int hf_ua3g_ip_device_routing_start_stop_record_rtp_parameter_length = -1;
-static int hf_ua3g_audio_config_law = -1;
-static int hf_ua3g_ua_dwl_protocol_checksum = -1;
-static int hf_ua3g_ip_device_routing_pause_restart_rtp_parameter_value = -1;
-static int hf_ua3g_audio_config_handsfree_handsfree = -1;
-static int hf_ua3g_ringing_cadence_cadence = -1;
-static int hf_ua3g_lcd_cursor_line_number = -1;
-static int hf_ua3g_ip_device_routing_def_tones_level_1 = -1;
-static int hf_ua3g_unsolicited_msg_opcode_of_bad_command = -1;
-static int hf_ua3g_ua_dwl_protocol_download_ack_status = -1;
-static int hf_ua3g_voice_channel_main_voice = -1;
-static int hf_ua3g_ip_device_routing_pause_restart_rtp_parameter_length = -1;
-static int hf_ua3g_icon_cmd_segment = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd01_incident_0 = -1;
-static int hf_ua3g_beep_destination = -1;
-static int hf_ua3g_ip_device_routing_def_tones_frequency_1 = -1;
-static int hf_ua3g_unsolicited_msg_datas_version = -1;
-static int hf_ua3g_dwl_dtmf_clck_format_dtmf_country_adaptation = -1;
-static int hf_ua3g_ringing_cadence_on_off = -1;
-static int hf_ua3g_audio_config_volume_level = -1;
-static int hf_ua3g_voice_channel_b_general = -1;
-static int hf_ua3g_beep_terminator = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd02_parameter = -1;
-static int hf_ua3g_unsolicited_msg_firmware_version_bootloader = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter = -1;
-static int hf_ua3g_ip_device_routing_start_rtp_direction = -1;
-static int hf_ua3g_set_clck_timer_pos_clock_line_number = -1;
-static int hf_ua3g_voice_channel_b_loud_speaker = -1;
-static int hf_ua3g_ip_device_routing_start_stop_record_rtp_parameter = -1;
-static int hf_ua3g_on_off_level_level_on_loudspeaker = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_length = -1;
-static int hf_ua3g_main_voice_mode_microphone_volume = -1;
-static int hf_ua3g_sidetone_level = -1;
-static int hf_ua3g_beep_number_of_notes = -1;
-static int hf_ua3g_unsolicited_msg_segment_failure_num = -1;
-static int hf_ua3g_dwl_special_char_byte = -1;
-static int hf_ua3g_ring_cadence = -1;
-static int hf_ua3g_unsolicited_msg_device_type = -1;
-static int hf_ua3g_voice_channel_codec = -1;
-static int hf_ua3g_ip_device_routing_redirect_parameter_length = -1;
-static int hf_ua3g_ip_device_routing_listen_rtp_parameter = -1;
-static int hf_ua3g_beep_cadence = -1;
-static int hf_ua3g_voice_channel_voice_channel = -1;
-static int hf_ua3g_unsolicited_msg_other_information = -1;
-static int hf_ua3g_ip_device_routing_def_tones_frequency_2 = -1;
-static int hf_ua3g_digit_dialed_digit_value = -1;
-static int hf_ua3g_unsolicited_msg_subdevice_address = -1;
-static int hf_ua3g_ua_dwl_protocol_packet_download_end_ack_ok_status = -1;
-static int hf_ua3g_r_w_peripheral_address = -1;
-static int hf_ua3g_icon_cmd_icon_number = -1;
-static int hf_ua3g_dwl_dtmf_clck_format_clock_time_format = -1;
-static int hf_ua3g_ip_device_routing_start_rtp_parameter_length = -1;
-static int hf_ua3g_i_m_here_id_code = -1;
-static int hf_ua3g_ua_dwl_protocol_item_version_nc = -1;
-static int hf_ua3g_unsolicited_msg_firmware_version = -1;
-static int hf_ua3g_segment_msg_segment = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter_noe_update = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter_noe_update_bootloader = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter_noe_update_data = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter_noe_update_customization = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter_noe_update_localization = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter_noe_update_code = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter_noe_update_sip = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter_value = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter_bad_sec_mode = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter_cust_name = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter_l10n_name = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter_appl_mode = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter_sip_name = -1;
-static int hf_ua3g_ip_device_routing_reset_parameter_reset_mac = -1;
-static int hf_ua3g_ip_device_routing_start_rtp_parameter_ip = -1;
-static int hf_ua3g_ip_device_routing_start_rtp_parameter_compressor = -1;
-static int hf_ua3g_ip_device_routing_start_rtp_parameter_value = -1;
-static int hf_ua3g_ip_device_routing_start_rtp_parameter_enabler = -1;
-static int hf_ua3g_ip_device_routing_start_rtp_parameter_send_qos = -1;
-static int hf_ua3g_ip_device_routing_start_rtp_parameter_dtmf_sending = -1;
-static int hf_ua3g_ip_device_routing_start_rtp_parameter_rfc2198 = -1;
-static int hf_ua3g_ip_device_routing_start_rtp_parameter_srtp_encryption = -1;
-static int hf_ua3g_ip_device_routing_start_rtp_parameter_uint = -1;
-static int hf_ua3g_ip_device_routing_redirect_parameter_ip = -1;
-static int hf_ua3g_ip_device_routing_redirect_parameter_uint = -1;
-static int hf_ua3g_ip_device_routing_redirect_parameter_value = -1;
-static int hf_ua3g_ip_device_routing_listen_rtp_parameter_ip = -1;
-static int hf_ua3g_ip_device_routing_listen_rtp_parameter_port = -1;
-static int hf_ua3g_ip_device_routing_listen_rtp_parameter_value = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_compressor = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_err_string = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_tftp_backup_ip = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_set_pc_port_status = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_record_rtp_auth = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_security_flag_filter = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_stable_mode = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_skin_id = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_language_id = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_usb_boost = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_als_device = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_busy_light = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_audio_env = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_uint = -1;
-static int hf_ua3g_ip_device_routing_set_param_req_parameter_value = -1;
-static int hf_ua3g_ip_device_routing_pause_restart_rtp_parameter_uint = -1;
-static int hf_ua3g_ip_device_routing_start_stop_record_rtp_parameter_remote_ip = -1;
-static int hf_ua3g_ip_device_routing_start_stop_record_rtp_parameter_uint = -1;
-static int hf_ua3g_ip_device_routing_start_stop_record_rtp_parameter_value = -1;
-static int hf_ua3g_ip_device_routing_freeseating_parameter = -1;
-static int hf_ua3g_ip_device_routing_freeseating_parameter_length = -1;
-static int hf_ua3g_ip_device_routing_freeseating_parameter_mac = -1;
-static int hf_ua3g_ip_device_routing_freeseating_parameter_ip = -1;
-static int hf_ua3g_ip_device_routing_freeseating_parameter_ipv6 = -1;
-static int hf_ua3g_ip_device_routing_freeseating_parameter_do_reset = -1;
-static int hf_ua3g_ip_device_routing_freeseating_parameter_uint = -1;
-static int hf_ua3g_ip_device_routing_freeseating_parameter_value = -1;
-static int hf_ua3g_ip_device_routing_appl_parameter = -1;
-static int hf_ua3g_ip_device_routing_appl_parameter_length = -1;
-static int hf_ua3g_ip_device_routing_appl_parameter_id = -1;
-static int hf_ua3g_ip_device_routing_appl_parameter_enable = -1;
-static int hf_ua3g_ip_device_routing_appl_parameter_url = -1;
-static int hf_ua3g_ip_device_routing_appl_parameter_uint = -1;
-static int hf_ua3g_ip_device_routing_appl_parameter_value = -1;
-static int hf_ua3g_main_voice_mode_handset_level = -1;
-static int hf_ua3g_main_voice_mode_headset_level = -1;
-static int hf_ua3g_main_voice_mode_handsfree_level = -1;
-static int hf_ua3g_audio_config_dpi_chan_ua_tx1 = -1;
-static int hf_ua3g_audio_config_dpi_chan_ua_tx2 = -1;
-static int hf_ua3g_audio_config_dpi_chan_gci_tx1 = -1;
-static int hf_ua3g_audio_config_dpi_chan_gci_tx2 = -1;
-static int hf_ua3g_audio_config_dpi_chan_cod_tx = -1;
-static int hf_ua3g_audio_config_audio_circuit_dth = -1;
-static int hf_ua3g_audio_config_audio_circuit_dtr = -1;
-static int hf_ua3g_audio_config_audio_circuit_dtf = -1;
-static int hf_ua3g_audio_config_audio_circuit_str = -1;
-static int hf_ua3g_audio_config_audio_circuit_ahp1 = -1;
-static int hf_ua3g_audio_config_audio_circuit_ahp2 = -1;
-static int hf_ua3g_audio_config_audio_circuit_ath = -1;
-static int hf_ua3g_audio_config_audio_circuit_atr = -1;
-static int hf_ua3g_audio_config_audio_circuit_atf = -1;
-static int hf_ua3g_audio_config_audio_circuit_alm = -1;
-static int hf_ua3g_audio_config_loudspeaker_aco_param_group_listen = -1;
-static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_attenuation = -1;
-static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_stay_in_send = -1;
-static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_shift_right_mtx = -1;
-static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_shift_right_mrc = -1;
-static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_idle_trans_threshold = -1;
-static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_low_trans_threshold = -1;
-static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_idle_recv_threshold = -1;
-static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_low_recv_threshold = -1;
-static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_med_recv_threshold = -1;
-static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_high_recv_threshold = -1;
-static int hf_ua3g_ua_dwl_protocol_files_inc_boot_binary = -1;
-static int hf_ua3g_ua_dwl_protocol_files_inc_loader_binary = -1;
-static int hf_ua3g_ua_dwl_protocol_files_inc_appli_binary = -1;
-static int hf_ua3g_ua_dwl_protocol_files_inc_data_binary = -1;
-static int hf_ua3g_ua_dwl_protocol_model_selection_a = -1;
-static int hf_ua3g_ua_dwl_protocol_model_selection_b = -1;
-static int hf_ua3g_ua_dwl_protocol_model_selection_c = -1;
-static int hf_ua3g_ua_dwl_protocol_model_selection_country_ver = -1;
-static int hf_ua3g_ua_dwl_protocol_hardware_selection_ivanoe1 = -1;
-static int hf_ua3g_ua_dwl_protocol_hardware_selection_ivanoe2 = -1;
-static int hf_ua3g_ua_dwl_protocol_memory_sizes_flash = -1;
-static int hf_ua3g_ua_dwl_protocol_memory_sizes_ext_ram = -1;
-static int hf_ua3g_unsolicited_msg_char_num_vta_subtype = -1;
-static int hf_ua3g_unsolicited_msg_char_num_generation = -1;
-static int hf_ua3g_unsolicited_msg_char_num_design = -1;
-static int hf_ua3g_unsolicited_msg_hardware_config_vta_type = -1;
-static int hf_ua3g_unsolicited_msg_hardware_config_design = -1;
-static int hf_ua3g_unsolicited_msg_hardware_config_subtype = -1;
-static int hf_ua3g_unsolicited_msg_hardware_config_hard_config_chip = -1;
-static int hf_ua3g_unsolicited_msg_hardware_config_hard_config_flash = -1;
-static int hf_ua3g_unsolicited_msg_hardware_config_config_ram = -1;
-static int hf_ua3g_unsolicited_msg_hardware_config = -1;
-static int hf_ua3g_unsolicited_msg_hardware_config_export_full = -1;
-static int hf_ua3g_unsolicited_msg_hardware_config_ethernet_hardware = -1;
-static int hf_ua3g_unsolicited_msg_hardware_config_extended_edition = -1;
-static int hf_ua3g_unsolicited_msg_hardware_config_wideband = -1;
-static int hf_ua3g_unsolicited_msg_hardware_config_3g_set = -1;
-static int hf_ua3g_unsolicited_msg_hardware_config_8082_set = -1;
-static int hf_ua3g_unsolicited_msg_hardware_config_super_wideband = -1;
-static int hf_ua3g_unsolicited_msg_hook_status = -1;
-static int hf_ua3g_unsolicited_msg_additional_vta_type = -1;
-static int hf_ua3g_unsolicited_msg_capability_info_bluetooth_supported = -1;
-static int hf_ua3g_unsolicited_msg_capability_info_vpn_encryption_status = -1;
-static int hf_ua3g_unsolicited_msg_capability_info_vpn = -1;
-static int hf_ua3g_unsolicited_msg_capability_info_ipsec = -1;
-static int hf_ua3g_unsolicited_msg_capability_info_dtls = -1;
-static int hf_ua3g_unsolicited_msg_capability_info_wlan_status = -1;
-static int hf_ua3g_unsolicited_msg_capability_info_reserved = -1;
-static int hf_ua3g_special_key_shift = -1;
-static int hf_ua3g_special_key_ctrl = -1;
-static int hf_ua3g_special_key_alt = -1;
-static int hf_ua3g_special_key_cmd = -1;
-static int hf_ua3g_special_key_shift_prime = -1;
-static int hf_ua3g_special_key_ctrl_prime = -1;
-static int hf_ua3g_special_key_alt_prime = -1;
-static int hf_ua3g_special_key_cmd_prime = -1;
-static int hf_ua3g_lcd_line_cmd_lcd_options_call_timer = -1;
-static int hf_ua3g_lcd_line_cmd_lcd_options_blink = -1;
-static int hf_ua3g_lcd_line_cmd_lcd_options_call_timer_control = -1;
-static int hf_ua3g_lcd_line_cmd_lcd_options_call_timer_display = -1;
-static int hf_ua3g_lcd_line_cmd_lcd_options_time_of_day_display = -1;
-static int hf_ua3g_lcd_line_cmd_lcd_options_suspend_display_refresh = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_firmware_version = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_tscip_version = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_ip = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_default_codec_uint = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_default_codec_bytes = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_mac_address = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_uint = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_value = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_lan_speed = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_lan_duplex = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_pc_speed = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_pc_duplex = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_type_of_equip = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_firmware_version = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_ip = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_string = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_codec = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_vad = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_ece = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_voice_mode = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_delay_distribution = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_consecutive_bfi = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_bfi_distribution = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_8021Q_used = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_8021P_priority = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_vlan_id = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_diffserv = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_bfi_distribution_200ms = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_consecutive_rtp_lost = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_uint = -1;
-static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_jitter_depth_distribution = -1;
-static int hf_ua3g_special_key_param_dtmf = -1;
-static int hf_ua3g_special_key_hookswitch_status = -1;
-static int hf_ua3g_subdevice_state = -1;
-static int hf_ua3g_cs_ip_device_routing_param_identifier = -1;
-static int hf_ua3g_key_number = -1;
-static int hf_ua3g_ua_dwl_protocol_binary_info = -1;
-static int hf_ua3g_lcd_line_cmd_unused = -1;
-static int hf_ua3g_lcd_line_cmd_ascii_char = -1;
-static int hf_ua3g_call_timer = -1;
-static int hf_ua3g_current_time = -1;
-static int hf_ua3g_beep_beep_destination_handset = -1;
-static int hf_ua3g_beep_beep_destination_headset = -1;
-static int hf_ua3g_beep_beep_destination_loudspeaker = -1;
-static int hf_ua3g_beep_beep_destination_announce_loudspeaker = -1;
-static int hf_ua3g_beep_beep_destination_handsfree = -1;
-static int hf_ua3g_beep_beep_destination = -1;
-static int hf_ua3g_beep_freq_sample = -1;
-static int hf_ua3g_beep_level = -1;
-static int hf_ua3g_beep_duration = -1;
-static int hf_ua3g_device_configuration = -1;
+static int hf_ua3g_ip_device_routing_start_tone_direction;
+static int hf_ua3g_ip_device_routing_start_tone_num_entries;
+static int hf_ua3g_ip_device_routing_def_tones_num_entries;
+static int hf_ua3g_cs_ip_device_routing_cmd00_characteristic_number;
+static int hf_ua3g_subdevice_msg_subdev_type;
+static int hf_ua3g_unsolicited_msg_next_byte_of_bad_segment;
+static int hf_ua3g_ip_device_routing_start_tone_identification;
+static int hf_ua3g_ip_device_routing_def_tones_level_2;
+static int hf_ua3g_r_w_peripheral_content;
+static int hf_ua3g_subdevice_metastate_subchannel_address;
+static int hf_ua3g_subdevice_parameter_bytes;
+static int hf_ua3g_subdevice_msg_parameter_bytes;
+static int hf_ua3g_set_clck_timer_pos_call_timer_column_number;
+static int hf_ua3g_unsolicited_msg_segment_failure_s;
+static int hf_ua3g_ip_device_routing_reset_parameter;
+static int hf_ua3g_ip_device_routing_get_param_req_parameter;
+static int hf_ua3g_set_lcd_contrast_driver_number;
+static int hf_ua3g_dwl_special_char_character_number;
+static int hf_ua3g_cs_ip_device_routing_cmd00_vta_type;
+static int hf_ua3g_ua_dwl_protocol_cause;
+static int hf_ua3g_audio_padded_path_emission_padded_level;
+static int hf_ua3g_set_clck_timer_pos_clock_column_number;
+static int hf_ua3g_segment_msg_num_remaining;
+static int hf_ua3g_ip_device_routing_digit_value;
+static int hf_ua3g_super_msg_data;
+static int hf_ua3g_unsolicited_msg_hardware_version;
+static int hf_ua3g_voice_channel_announce;
+static int hf_ua3g_ring_silent;
+static int hf_ua3g_audio_config_handsfree_return;
+static int hf_ua3g_dwl_dtmf_clck_format_inter_digit_pause_time;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_length;
+static int hf_ua3g_unsolicited_msg_opcode_bad_segment;
+static int hf_ua3g_unsolicited_msg_firmware_version_loader;
+static int hf_ua3g_debug_in_line;
+static int hf_ua3g_voice_channel_b_microphones;
+static int hf_ua3g_beep_beep_number;
+static int hf_ua3g_main_voice_mode_tune;
+static int hf_ua3g_super_msg_length;
+static int hf_ua3g_ip_device_routing_redirect_parameter;
+static int hf_ua3g_unsolicited_msg_next_byte_of_bad_command;
+static int hf_ua3g_unsolicited_msg_self_test_result;
+static int hf_ua3g_beep_on_off;
+static int hf_ua3g_ua_dwl_protocol_binary_length;
+static int hf_ua3g_ring_speaker_level;
+static int hf_ua3g_voice_channel_channel_mode;
+static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_length;
+static int hf_ua3g_ip_device_routing_start_rtp_parameter;
+static int hf_ua3g_subdevice_metastate_new_metastate;
+static int hf_ua3g_unsolicited_msg_other_information_2;
+static int hf_ua3g_set_lcd_contrast_contrast_value;
+static int hf_ua3g_unsolicited_msg_vta_type;
+static int hf_ua3g_ua_dwl_protocol_packet_number;
+static int hf_ua3g_unsolicited_msg_segment_failure_l;
+static int hf_ua3g_voice_channel_b_ear_piece;
+static int hf_ua3g_subdevice_msg_subdev_address;
+static int hf_ua3g_ring_progressive;
+static int hf_ua3g_ua_dwl_protocol_item_version;
+static int hf_ua3g_ip_device_routing_reset_parameter_length;
+static int hf_ua3g_dwl_dtmf_clck_format_minimum_on_time;
+static int hf_ua3g_ring_melody;
+static int hf_ua3g_ua_dwl_protocol_item_identifier;
+static int hf_ua3g_main_voice_mode_speaker_volume;
+static int hf_ua3g_ip_device_routing_listen_rtp_parameter_length;
+static int hf_ua3g_ringing_cadence_length;
+static int hf_ua3g_software_reset;
+static int hf_ua3g_feedback_level;
+static int hf_ua3g_ip_phone_warmstart;
+static int hf_ua3g_subdevice_opcode;
+static int hf_ua3g_unsolicited_msg_device_event;
+static int hf_ua3g_segment_message_data;
+static int hf_ua3g_main_voice_mode_sending_level;
+static int hf_ua3g_subdevice_msg_subdevice_opcode;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter;
+static int hf_ua3g_audio_padded_path_reception_padded_level;
+static int hf_ua3g_ua_dwl_protocol_force_mode;
+static int hf_ua3g_lcd_line_cmd_starting_column;
+static int hf_ua3g_subdevice_address;
+static int hf_ua3g_ip_device_routing_pause_restart_rtp_parameter;
+static int hf_ua3g_audio_config_ignored;
+static int hf_ua3g_lcd_line_cmd_lcd_options;
+static int hf_ua3g_main_voice_mode_cadence;
+static int hf_ua3g_segment_msg_length;
+static int hf_ua3g_ua_dwl_protocol_acknowledge;
+static int hf_ua3g_command_led_number;
+static int hf_ua3g_set_clck_timer_pos_call_timer_line_number;
+static int hf_ua3g_unsolicited_msg_segment_failure_t;
+static int hf_ua3g_ip_device_routing_start_tone_duration;
+static int hf_ua3g_unsolicited_msg_other_information_1;
+static int hf_ua3g_unsolicited_msg_firmware_datas_patch_version;
+static int hf_ua3g_ring_beep_number;
+static int hf_ua3g_feedback_duration;
+static int hf_ua3g_ip_device_routing_start_stop_record_rtp_parameter_length;
+static int hf_ua3g_audio_config_law;
+static int hf_ua3g_ua_dwl_protocol_checksum;
+static int hf_ua3g_ip_device_routing_pause_restart_rtp_parameter_value;
+static int hf_ua3g_audio_config_handsfree_handsfree;
+static int hf_ua3g_ringing_cadence_cadence;
+static int hf_ua3g_lcd_cursor_line_number;
+static int hf_ua3g_ip_device_routing_def_tones_level_1;
+static int hf_ua3g_unsolicited_msg_opcode_of_bad_command;
+static int hf_ua3g_ua_dwl_protocol_download_ack_status;
+static int hf_ua3g_voice_channel_main_voice;
+static int hf_ua3g_ip_device_routing_pause_restart_rtp_parameter_length;
+static int hf_ua3g_icon_cmd_segment;
+static int hf_ua3g_cs_ip_device_routing_cmd01_incident_0;
+static int hf_ua3g_beep_destination;
+static int hf_ua3g_ip_device_routing_def_tones_frequency_1;
+static int hf_ua3g_unsolicited_msg_datas_version;
+static int hf_ua3g_dwl_dtmf_clck_format_dtmf_country_adaptation;
+static int hf_ua3g_ringing_cadence_on_off;
+static int hf_ua3g_audio_config_volume_level;
+static int hf_ua3g_voice_channel_b_general;
+static int hf_ua3g_beep_terminator;
+static int hf_ua3g_cs_ip_device_routing_cmd02_parameter;
+static int hf_ua3g_unsolicited_msg_firmware_version_bootloader;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter;
+static int hf_ua3g_ip_device_routing_start_rtp_direction;
+static int hf_ua3g_set_clck_timer_pos_clock_line_number;
+static int hf_ua3g_voice_channel_b_loud_speaker;
+static int hf_ua3g_ip_device_routing_start_stop_record_rtp_parameter;
+static int hf_ua3g_on_off_level_level_on_loudspeaker;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_length;
+static int hf_ua3g_main_voice_mode_microphone_volume;
+static int hf_ua3g_sidetone_level;
+static int hf_ua3g_beep_number_of_notes;
+static int hf_ua3g_unsolicited_msg_segment_failure_num;
+static int hf_ua3g_dwl_special_char_byte;
+static int hf_ua3g_ring_cadence;
+static int hf_ua3g_unsolicited_msg_device_type;
+static int hf_ua3g_voice_channel_codec;
+static int hf_ua3g_ip_device_routing_redirect_parameter_length;
+static int hf_ua3g_ip_device_routing_listen_rtp_parameter;
+static int hf_ua3g_beep_cadence;
+static int hf_ua3g_voice_channel_voice_channel;
+static int hf_ua3g_unsolicited_msg_other_information;
+static int hf_ua3g_ip_device_routing_def_tones_frequency_2;
+static int hf_ua3g_digit_dialed_digit_value;
+static int hf_ua3g_unsolicited_msg_subdevice_address;
+static int hf_ua3g_ua_dwl_protocol_packet_download_end_ack_ok_status;
+static int hf_ua3g_r_w_peripheral_address;
+static int hf_ua3g_icon_cmd_icon_number;
+static int hf_ua3g_dwl_dtmf_clck_format_clock_time_format;
+static int hf_ua3g_ip_device_routing_start_rtp_parameter_length;
+static int hf_ua3g_i_m_here_id_code;
+static int hf_ua3g_ua_dwl_protocol_item_version_nc;
+static int hf_ua3g_unsolicited_msg_firmware_version;
+static int hf_ua3g_segment_msg_segment;
+static int hf_ua3g_ip_device_routing_reset_parameter_noe_update;
+static int hf_ua3g_ip_device_routing_reset_parameter_noe_update_bootloader;
+static int hf_ua3g_ip_device_routing_reset_parameter_noe_update_data;
+static int hf_ua3g_ip_device_routing_reset_parameter_noe_update_customization;
+static int hf_ua3g_ip_device_routing_reset_parameter_noe_update_localization;
+static int hf_ua3g_ip_device_routing_reset_parameter_noe_update_code;
+static int hf_ua3g_ip_device_routing_reset_parameter_noe_update_sip;
+static int hf_ua3g_ip_device_routing_reset_parameter_value;
+static int hf_ua3g_ip_device_routing_reset_parameter_bad_sec_mode;
+static int hf_ua3g_ip_device_routing_reset_parameter_cust_name;
+static int hf_ua3g_ip_device_routing_reset_parameter_l10n_name;
+static int hf_ua3g_ip_device_routing_reset_parameter_appl_mode;
+static int hf_ua3g_ip_device_routing_reset_parameter_sip_name;
+static int hf_ua3g_ip_device_routing_reset_parameter_reset_mac;
+static int hf_ua3g_ip_device_routing_start_rtp_parameter_ip;
+static int hf_ua3g_ip_device_routing_start_rtp_parameter_compressor;
+static int hf_ua3g_ip_device_routing_start_rtp_parameter_value;
+static int hf_ua3g_ip_device_routing_start_rtp_parameter_enabler;
+static int hf_ua3g_ip_device_routing_start_rtp_parameter_send_qos;
+static int hf_ua3g_ip_device_routing_start_rtp_parameter_dtmf_sending;
+static int hf_ua3g_ip_device_routing_start_rtp_parameter_rfc2198;
+static int hf_ua3g_ip_device_routing_start_rtp_parameter_srtp_encryption;
+static int hf_ua3g_ip_device_routing_start_rtp_parameter_uint;
+static int hf_ua3g_ip_device_routing_redirect_parameter_ip;
+static int hf_ua3g_ip_device_routing_redirect_parameter_uint;
+static int hf_ua3g_ip_device_routing_redirect_parameter_value;
+static int hf_ua3g_ip_device_routing_listen_rtp_parameter_ip;
+static int hf_ua3g_ip_device_routing_listen_rtp_parameter_port;
+static int hf_ua3g_ip_device_routing_listen_rtp_parameter_value;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_compressor;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_err_string;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_tftp_backup_ip;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_set_pc_port_status;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_record_rtp_auth;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_security_flag_filter;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_stable_mode;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_skin_id;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_language_id;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_usb_boost;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_als_device;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_busy_light;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_audio_env;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_uint;
+static int hf_ua3g_ip_device_routing_set_param_req_parameter_value;
+static int hf_ua3g_ip_device_routing_pause_restart_rtp_parameter_uint;
+static int hf_ua3g_ip_device_routing_start_stop_record_rtp_parameter_remote_ip;
+static int hf_ua3g_ip_device_routing_start_stop_record_rtp_parameter_uint;
+static int hf_ua3g_ip_device_routing_start_stop_record_rtp_parameter_value;
+static int hf_ua3g_ip_device_routing_freeseating_parameter;
+static int hf_ua3g_ip_device_routing_freeseating_parameter_length;
+static int hf_ua3g_ip_device_routing_freeseating_parameter_mac;
+static int hf_ua3g_ip_device_routing_freeseating_parameter_ip;
+static int hf_ua3g_ip_device_routing_freeseating_parameter_ipv6;
+static int hf_ua3g_ip_device_routing_freeseating_parameter_do_reset;
+static int hf_ua3g_ip_device_routing_freeseating_parameter_uint;
+static int hf_ua3g_ip_device_routing_freeseating_parameter_value;
+static int hf_ua3g_ip_device_routing_appl_parameter;
+static int hf_ua3g_ip_device_routing_appl_parameter_length;
+static int hf_ua3g_ip_device_routing_appl_parameter_id;
+static int hf_ua3g_ip_device_routing_appl_parameter_enable;
+static int hf_ua3g_ip_device_routing_appl_parameter_url;
+static int hf_ua3g_ip_device_routing_appl_parameter_uint;
+static int hf_ua3g_ip_device_routing_appl_parameter_value;
+static int hf_ua3g_main_voice_mode_handset_level;
+static int hf_ua3g_main_voice_mode_headset_level;
+static int hf_ua3g_main_voice_mode_handsfree_level;
+static int hf_ua3g_audio_config_dpi_chan_ua_tx1;
+static int hf_ua3g_audio_config_dpi_chan_ua_tx2;
+static int hf_ua3g_audio_config_dpi_chan_gci_tx1;
+static int hf_ua3g_audio_config_dpi_chan_gci_tx2;
+static int hf_ua3g_audio_config_dpi_chan_cod_tx;
+static int hf_ua3g_audio_config_audio_circuit_dth;
+static int hf_ua3g_audio_config_audio_circuit_dtr;
+static int hf_ua3g_audio_config_audio_circuit_dtf;
+static int hf_ua3g_audio_config_audio_circuit_str;
+static int hf_ua3g_audio_config_audio_circuit_ahp1;
+static int hf_ua3g_audio_config_audio_circuit_ahp2;
+static int hf_ua3g_audio_config_audio_circuit_ath;
+static int hf_ua3g_audio_config_audio_circuit_atr;
+static int hf_ua3g_audio_config_audio_circuit_atf;
+static int hf_ua3g_audio_config_audio_circuit_alm;
+static int hf_ua3g_audio_config_loudspeaker_aco_param_group_listen;
+static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_attenuation;
+static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_stay_in_send;
+static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_shift_right_mtx;
+static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_shift_right_mrc;
+static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_idle_trans_threshold;
+static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_low_trans_threshold;
+static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_idle_recv_threshold;
+static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_low_recv_threshold;
+static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_med_recv_threshold;
+static int hf_ua3g_audio_config_loudspeaker_aco_param_handsfree_high_recv_threshold;
+static int hf_ua3g_ua_dwl_protocol_files_inc_boot_binary;
+static int hf_ua3g_ua_dwl_protocol_files_inc_loader_binary;
+static int hf_ua3g_ua_dwl_protocol_files_inc_appli_binary;
+static int hf_ua3g_ua_dwl_protocol_files_inc_data_binary;
+static int hf_ua3g_ua_dwl_protocol_model_selection_a;
+static int hf_ua3g_ua_dwl_protocol_model_selection_b;
+static int hf_ua3g_ua_dwl_protocol_model_selection_c;
+static int hf_ua3g_ua_dwl_protocol_model_selection_country_ver;
+static int hf_ua3g_ua_dwl_protocol_hardware_selection_ivanoe1;
+static int hf_ua3g_ua_dwl_protocol_hardware_selection_ivanoe2;
+static int hf_ua3g_ua_dwl_protocol_memory_sizes_flash;
+static int hf_ua3g_ua_dwl_protocol_memory_sizes_ext_ram;
+static int hf_ua3g_unsolicited_msg_char_num_vta_subtype;
+static int hf_ua3g_unsolicited_msg_char_num_generation;
+static int hf_ua3g_unsolicited_msg_char_num_design;
+static int hf_ua3g_unsolicited_msg_hardware_config_vta_type;
+static int hf_ua3g_unsolicited_msg_hardware_config_design;
+static int hf_ua3g_unsolicited_msg_hardware_config_subtype;
+static int hf_ua3g_unsolicited_msg_hardware_config_hard_config_chip;
+static int hf_ua3g_unsolicited_msg_hardware_config_hard_config_flash;
+static int hf_ua3g_unsolicited_msg_hardware_config_config_ram;
+static int hf_ua3g_unsolicited_msg_hardware_config;
+static int hf_ua3g_unsolicited_msg_hardware_config_export_full;
+static int hf_ua3g_unsolicited_msg_hardware_config_ethernet_hardware;
+static int hf_ua3g_unsolicited_msg_hardware_config_extended_edition;
+static int hf_ua3g_unsolicited_msg_hardware_config_wideband;
+static int hf_ua3g_unsolicited_msg_hardware_config_3g_set;
+static int hf_ua3g_unsolicited_msg_hardware_config_8082_set;
+static int hf_ua3g_unsolicited_msg_hardware_config_super_wideband;
+static int hf_ua3g_unsolicited_msg_hook_status;
+static int hf_ua3g_unsolicited_msg_additional_vta_type;
+static int hf_ua3g_unsolicited_msg_capability_info_bluetooth_supported;
+static int hf_ua3g_unsolicited_msg_capability_info_vpn_encryption_status;
+static int hf_ua3g_unsolicited_msg_capability_info_vpn;
+static int hf_ua3g_unsolicited_msg_capability_info_ipsec;
+static int hf_ua3g_unsolicited_msg_capability_info_dtls;
+static int hf_ua3g_unsolicited_msg_capability_info_wlan_status;
+static int hf_ua3g_unsolicited_msg_capability_info_reserved;
+static int hf_ua3g_special_key_shift;
+static int hf_ua3g_special_key_ctrl;
+static int hf_ua3g_special_key_alt;
+static int hf_ua3g_special_key_cmd;
+static int hf_ua3g_special_key_shift_prime;
+static int hf_ua3g_special_key_ctrl_prime;
+static int hf_ua3g_special_key_alt_prime;
+static int hf_ua3g_special_key_cmd_prime;
+static int hf_ua3g_lcd_line_cmd_lcd_options_call_timer;
+static int hf_ua3g_lcd_line_cmd_lcd_options_blink;
+static int hf_ua3g_lcd_line_cmd_lcd_options_call_timer_control;
+static int hf_ua3g_lcd_line_cmd_lcd_options_call_timer_display;
+static int hf_ua3g_lcd_line_cmd_lcd_options_time_of_day_display;
+static int hf_ua3g_lcd_line_cmd_lcd_options_suspend_display_refresh;
+static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_firmware_version;
+static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_tscip_version;
+static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_ip;
+static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_default_codec_uint;
+static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_default_codec_bytes;
+static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_mac_address;
+static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_uint;
+static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_value;
+static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_lan_speed;
+static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_lan_duplex;
+static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_pc_speed;
+static int hf_ua3g_cs_ip_device_routing_cmd02_parameter_eth_driver_config_port_pc_duplex;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_type_of_equip;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_firmware_version;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_ip;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_string;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_codec;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_vad;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_ece;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_voice_mode;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_delay_distribution;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_consecutive_bfi;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_bfi_distribution;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_8021Q_used;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_8021P_priority;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_vlan_id;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_diffserv;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_bfi_distribution_200ms;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_consecutive_rtp_lost;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_uint;
+static int hf_ua3g_cs_ip_device_routing_cmd03_parameter_jitter_depth_distribution;
+static int hf_ua3g_special_key_param_dtmf;
+static int hf_ua3g_special_key_hookswitch_status;
+static int hf_ua3g_subdevice_state;
+static int hf_ua3g_cs_ip_device_routing_param_identifier;
+static int hf_ua3g_key_number;
+static int hf_ua3g_ua_dwl_protocol_binary_info;
+static int hf_ua3g_lcd_line_cmd_unused;
+static int hf_ua3g_lcd_line_cmd_ascii_char;
+static int hf_ua3g_call_timer;
+static int hf_ua3g_current_time;
+static int hf_ua3g_beep_beep_destination_handset;
+static int hf_ua3g_beep_beep_destination_headset;
+static int hf_ua3g_beep_beep_destination_loudspeaker;
+static int hf_ua3g_beep_beep_destination_announce_loudspeaker;
+static int hf_ua3g_beep_beep_destination_handsfree;
+static int hf_ua3g_beep_beep_destination;
+static int hf_ua3g_beep_freq_sample;
+static int hf_ua3g_beep_level;
+static int hf_ua3g_beep_duration;
+static int hf_ua3g_device_configuration;
 
 
 /* Definition of opcodes */
diff --git a/epan/dissectors/packet-uasip.c b/epan/dissectors/packet-uasip.c
index 5939ac5e25..de1d40b6b3 100644
--- a/epan/dissectors/packet-uasip.c
+++ b/epan/dissectors/packet-uasip.c
@@ -30,26 +30,26 @@ static tap_struct_uaudp ua_tap_info;
 static int uasip_tap                = -1;
 #endif
 
-static int proto_uasip              = -1;
-static int hf_uasip_opcode          = -1;
-static int hf_uasip_version         = -1;
-static int hf_uasip_window_size     = -1;
-static int hf_uasip_mtu             = -1;
-static int hf_uasip_udp_lost        = -1;
-static int hf_uasip_udp_lost_reinit = -1;
-static int hf_uasip_keepalive       = -1;
-static int hf_uasip_qos_ip_tos      = -1;
-static int hf_uasip_qos_8021_vlid   = -1;
-static int hf_uasip_qos_8021_pri    = -1;
-static int hf_uasip_expseq          = -1;
-static int hf_uasip_sntseq          = -1;
-static int hf_uasip_type            = -1;
-static int hf_uasip_length          = -1;
-
-static gint ett_uasip               = -1;
-static gint ett_uasip_tlv           = -1;
-
-static expert_field ei_uasip_tlv_length = EI_INIT;
+static int proto_uasip;
+static int hf_uasip_opcode;
+static int hf_uasip_version;
+static int hf_uasip_window_size;
+static int hf_uasip_mtu;
+static int hf_uasip_udp_lost;
+static int hf_uasip_udp_lost_reinit;
+static int hf_uasip_keepalive;
+static int hf_uasip_qos_ip_tos;
+static int hf_uasip_qos_8021_vlid;
+static int hf_uasip_qos_8021_pri;
+static int hf_uasip_expseq;
+static int hf_uasip_sntseq;
+static int hf_uasip_type;
+static int hf_uasip_length;
+
+static gint ett_uasip;
+static gint ett_uasip_tlv;
+
+static expert_field ei_uasip_tlv_length;
 
 static guint8      proxy_ipaddr[4];
 static const char *pref_proxy_ipaddr_s = NULL;
diff --git a/epan/dissectors/packet-uaudp.c b/epan/dissectors/packet-uaudp.c
index fe52439401..a41064f2ed 100644
--- a/epan/dissectors/packet-uaudp.c
+++ b/epan/dissectors/packet-uaudp.c
@@ -27,30 +27,30 @@ void proto_reg_handoff_uaudp(void);
 
 static dissector_handle_t uaudp_handle;
 
-static int proto_uaudp              = -1;
-
-static int hf_uaudp_opcode          = -1;
-static int hf_uaudp_version         = -1;
-static int hf_uaudp_window_size     = -1;
-static int hf_uaudp_mtu             = -1;
-static int hf_uaudp_udp_lost        = -1;
-static int hf_uaudp_udp_lost_reinit = -1;
-static int hf_uaudp_keepalive       = -1;
-static int hf_uaudp_qos_ip_tos      = -1;
-static int hf_uaudp_qos_8021_vlid   = -1;
-static int hf_uaudp_qos_8021_pri    = -1;
-static int hf_uaudp_superfast_connect = -1;
-static int hf_uaudp_expseq          = -1;
-static int hf_uaudp_sntseq          = -1;
-static int hf_uaudp_type            = -1;
-static int hf_uaudp_length          = -1;
-static int hf_uaudp_startsig_reserved = -1;
-static int hf_uaudp_startsig_filename = -1;
-
-static gint ett_uaudp               = -1;
-static gint ett_uaudp_tlv           = -1;
-
-static expert_field ei_uaudp_tlv_length = EI_INIT;
+static int proto_uaudp;
+
+static int hf_uaudp_opcode;
+static int hf_uaudp_version;
+static int hf_uaudp_window_size;
+static int hf_uaudp_mtu;
+static int hf_uaudp_udp_lost;
+static int hf_uaudp_udp_lost_reinit;
+static int hf_uaudp_keepalive;
+static int hf_uaudp_qos_ip_tos;
+static int hf_uaudp_qos_8021_vlid;
+static int hf_uaudp_qos_8021_pri;
+static int hf_uaudp_superfast_connect;
+static int hf_uaudp_expseq;
+static int hf_uaudp_sntseq;
+static int hf_uaudp_type;
+static int hf_uaudp_length;
+static int hf_uaudp_startsig_reserved;
+static int hf_uaudp_startsig_filename;
+
+static gint ett_uaudp;
+static gint ett_uaudp_tlv;
+
+static expert_field ei_uaudp_tlv_length;
 
 /* pref */
 #define UAUDP_PORT_RANGE "32000,32512" /* Not IANA registered */
diff --git a/epan/dissectors/packet-uavcan-can.c b/epan/dissectors/packet-uavcan-can.c
index 0240bf986c..f23865920e 100644
--- a/epan/dissectors/packet-uavcan-can.c
+++ b/epan/dissectors/packet-uavcan-can.c
@@ -54,22 +54,22 @@ void proto_reg_handoff_uavcan(void);
 
 static dissector_handle_t uavcan_handle;
 
-static int proto_uavcan = -1;
-
-static int hf_uavcan_can_id = -1;
-static int hf_uavcan_priority = -1;
-static int hf_uavcan_anonymous = -1;
-static int hf_uavcan_req_not_rsp = -1;
-static int hf_uavcan_serv_not_msg = -1;
-static int hf_uavcan_subject_id = -1;
-static int hf_uavcan_service_id = -1;
-static int hf_uavcan_dst_addr = -1;
-static int hf_uavcan_src_addr = -1;
-static int hf_uavcan_data = -1;
-static int hf_uavcan_start_of_transfer = -1;
-static int hf_uavcan_end_of_transfer = -1;
-static int hf_uavcan_toggle = -1;
-static int hf_uavcan_transfer_id = -1;
+static int proto_uavcan;
+
+static int hf_uavcan_can_id;
+static int hf_uavcan_priority;
+static int hf_uavcan_anonymous;
+static int hf_uavcan_req_not_rsp;
+static int hf_uavcan_serv_not_msg;
+static int hf_uavcan_subject_id;
+static int hf_uavcan_service_id;
+static int hf_uavcan_dst_addr;
+static int hf_uavcan_src_addr;
+static int hf_uavcan_data;
+static int hf_uavcan_start_of_transfer;
+static int hf_uavcan_end_of_transfer;
+static int hf_uavcan_toggle;
+static int hf_uavcan_transfer_id;
 
 static int uavcan_address_type = -1;
 
@@ -77,27 +77,27 @@ static wmem_tree_t *fragment_info_table = NULL;
 
 static reassembly_table uavcan_reassembly_table;
 
-static int hf_uavcan_packet_crc = -1;
-
-static gint ett_uavcan = -1;
-static gint ett_uavcan_can = -1;
-static gint ett_uavcan_message = -1;
-
-static expert_field ei_uavcan_toggle_bit_error = EI_INIT;
-static expert_field ei_uavcan_transfer_crc_error = EI_INIT;
-
-static gint ett_uavcan_fragment = -1;
-static gint ett_uavcan_fragments = -1;
-static int hf_uavcan_fragments = -1;
-static int hf_uavcan_fragment = -1;
-static int hf_uavcan_fragment_overlap = -1;
-static int hf_uavcan_fragment_overlap_conflicts = -1;
-static int hf_uavcan_fragment_multiple_tails = -1;
-static int hf_uavcan_fragment_too_long_fragment = -1;
-static int hf_uavcan_fragment_error = -1;
-static int hf_uavcan_fragment_count = -1;
-static int hf_uavcan_reassembled_in = -1;
-static int hf_uavcan_reassembled_length = -1;
+static int hf_uavcan_packet_crc;
+
+static gint ett_uavcan;
+static gint ett_uavcan_can;
+static gint ett_uavcan_message;
+
+static expert_field ei_uavcan_toggle_bit_error;
+static expert_field ei_uavcan_transfer_crc_error;
+
+static gint ett_uavcan_fragment;
+static gint ett_uavcan_fragments;
+static int hf_uavcan_fragments;
+static int hf_uavcan_fragment;
+static int hf_uavcan_fragment_overlap;
+static int hf_uavcan_fragment_overlap_conflicts;
+static int hf_uavcan_fragment_multiple_tails;
+static int hf_uavcan_fragment_too_long_fragment;
+static int hf_uavcan_fragment_error;
+static int hf_uavcan_fragment_count;
+static int hf_uavcan_reassembled_in;
+static int hf_uavcan_reassembled_length;
 
 /* fragment struct to store packet assembly data */
 typedef struct _fragment_info_t
diff --git a/epan/dissectors/packet-uavcan-dsdl.c b/epan/dissectors/packet-uavcan-dsdl.c
index c0c764cf75..384a8ad2e4 100644
--- a/epan/dissectors/packet-uavcan-dsdl.c
+++ b/epan/dissectors/packet-uavcan-dsdl.c
@@ -23,69 +23,69 @@
 void proto_register_dsdl(void);
 void proto_reg_handoff_dsdl(void);
 
-static int proto_dsdl = -1;
-
-static int hf_heartbeat_uptime = -1;
-static int hf_heartbeat_health = -1;
-static int hf_heartbeat_mode = -1;
-static int hf_heartbeat_status_code = -1;
-
-static int hf_list_index = -1;
-static int hf_register_name = -1;
-static int hf_register_access_mutable = -1;
-static int hf_register_access_persistent = -1;
-static int hf_register_value_tag = -1;
-static int hf_register_value_size = -1;
-
-
-static int hf_node_id = -1;
-static int hf_pnp_unique_id = -1;
-static int hf_pnp_unique_id_hash = -1;
-static int hf_pnp_alloc = -1;
-
-static int hf_uavcan_primitive_Empty = -1;
-static int hf_uavcan_primitive_String = -1;
-static int hf_uavcan_primitive_Unstructured = -1;
-static int hf_uavcan_primitive_array_Integer64 = -1;
-static int hf_uavcan_primitive_array_Integer32 = -1;
-static int hf_uavcan_primitive_array_Integer16 = -1;
-static int hf_uavcan_primitive_array_Integer8 = -1;
-static int hf_uavcan_primitive_array_Natural64 = -1;
-static int hf_uavcan_primitive_array_Natural32 = -1;
-static int hf_uavcan_primitive_array_Natural16 = -1;
-static int hf_uavcan_primitive_array_Natural8 = -1;
-static int hf_uavcan_primitive_array_Real64 = -1;
-static int hf_uavcan_primitive_array_Real32 = -1;
-static int hf_uavcan_primitive_array_Real16 = -1;
-
-
-static int hf_uavcan_getinfo_path = -1;
-static int hf_uavcan_getinfo_error = -1;
-static int hf_uavcan_getinfo_size = -1;
-static int hf_uavcan_getinfo_timestamp = -1;
-static int hf_uavcan_getinfo_is_file_not_directory = -1;
-static int hf_uavcan_getinfo_is_link = -1;
-static int hf_uavcan_getinfo_is_readable = -1;
-static int hf_uavcan_getinfo_is_writeable = -1;
-static int hf_uavcan_directory_path = -1;
-static int hf_uavcan_entry_base_name = -1;
-static int hf_uavcan_modify_error = -1;
-static int hf_uavcan_modify_source_path = -1;
-static int hf_uavcan_modify_destination_path = -1;
-static int hf_uavcan_modify_preserve_source = -1;
-static int hf_uavcan_modify_overwrite_destination = -1;
-static int hf_uavcan_read_offset = -1;
-static int hf_uavcan_read_path = -1;
-static int hf_uavcan_read_error = -1;
-static int hf_uavcan_write_offset = -1;
-static int hf_uavcan_write_path = -1;
-static int hf_uavcan_write_error = -1;
-static int hf_uavcan_entry_index = -1;
-
-static int hf_uavcan_time_syncronizedtimestamp = -1;
-static int hf_uavcan_diagnostic_severity = -1;
-
-static gint ett_dsdl = -1;
+static int proto_dsdl;
+
+static int hf_heartbeat_uptime;
+static int hf_heartbeat_health;
+static int hf_heartbeat_mode;
+static int hf_heartbeat_status_code;
+
+static int hf_list_index;
+static int hf_register_name;
+static int hf_register_access_mutable;
+static int hf_register_access_persistent;
+static int hf_register_value_tag;
+static int hf_register_value_size;
+
+
+static int hf_node_id;
+static int hf_pnp_unique_id;
+static int hf_pnp_unique_id_hash;
+static int hf_pnp_alloc;
+
+static int hf_uavcan_primitive_Empty;
+static int hf_uavcan_primitive_String;
+static int hf_uavcan_primitive_Unstructured;
+static int hf_uavcan_primitive_array_Integer64;
+static int hf_uavcan_primitive_array_Integer32;
+static int hf_uavcan_primitive_array_Integer16;
+static int hf_uavcan_primitive_array_Integer8;
+static int hf_uavcan_primitive_array_Natural64;
+static int hf_uavcan_primitive_array_Natural32;
+static int hf_uavcan_primitive_array_Natural16;
+static int hf_uavcan_primitive_array_Natural8;
+static int hf_uavcan_primitive_array_Real64;
+static int hf_uavcan_primitive_array_Real32;
+static int hf_uavcan_primitive_array_Real16;
+
+
+static int hf_uavcan_getinfo_path;
+static int hf_uavcan_getinfo_error;
+static int hf_uavcan_getinfo_size;
+static int hf_uavcan_getinfo_timestamp;
+static int hf_uavcan_getinfo_is_file_not_directory;
+static int hf_uavcan_getinfo_is_link;
+static int hf_uavcan_getinfo_is_readable;
+static int hf_uavcan_getinfo_is_writeable;
+static int hf_uavcan_directory_path;
+static int hf_uavcan_entry_base_name;
+static int hf_uavcan_modify_error;
+static int hf_uavcan_modify_source_path;
+static int hf_uavcan_modify_destination_path;
+static int hf_uavcan_modify_preserve_source;
+static int hf_uavcan_modify_overwrite_destination;
+static int hf_uavcan_read_offset;
+static int hf_uavcan_read_path;
+static int hf_uavcan_read_error;
+static int hf_uavcan_write_offset;
+static int hf_uavcan_write_path;
+static int hf_uavcan_write_error;
+static int hf_uavcan_entry_index;
+
+static int hf_uavcan_time_syncronizedtimestamp;
+static int hf_uavcan_diagnostic_severity;
+
+static gint ett_dsdl;
 
 const range_string uavcan_subject_id_vals[] = {
     {      0,   6143, "Unregulated identifier"                 },
diff --git a/epan/dissectors/packet-ubdp.c b/epan/dissectors/packet-ubdp.c
index e4da04addf..9b05cff6b3 100644
--- a/epan/dissectors/packet-ubdp.c
+++ b/epan/dissectors/packet-ubdp.c
@@ -35,34 +35,34 @@
 void proto_register_ubdp(void);
 void proto_reg_handoff_ubdp(void);
 
-static int proto_ubdp = -1;
+static int proto_ubdp;
 
-static int hf_ubdp_version = -1;
-static int hf_ubdp_command = -1;
-static int hf_ubdp_size = -1;
-static int hf_ubdp_type = -1;
-static int hf_ubdp_len = -1;
-static int hf_ubdp_mac = -1;
-static int hf_ubdp_ip = -1;
-static int hf_ubdp_firmware_full = -1;
-static int hf_ubdp_username = -1;
-static int hf_ubdp_uptime = -1;
-static int hf_ubdp_hostname = -1;
-static int hf_ubdp_product = -1;
-static int hf_ubdp_ssid = -1;
-static int hf_ubdp_wlan_mode = -1;
-static int hf_ubdp_system_id = -1;
-static int hf_ubdp_seq_num = -1;
-static int hf_ubdp_model = -1;
-static int hf_ubdp_firmware = -1;
-static int hf_ubdp_platform_vers = -1;
-static int hf_ubdp_generic = -1;
+static int hf_ubdp_version;
+static int hf_ubdp_command;
+static int hf_ubdp_size;
+static int hf_ubdp_type;
+static int hf_ubdp_len;
+static int hf_ubdp_mac;
+static int hf_ubdp_ip;
+static int hf_ubdp_firmware_full;
+static int hf_ubdp_username;
+static int hf_ubdp_uptime;
+static int hf_ubdp_hostname;
+static int hf_ubdp_product;
+static int hf_ubdp_ssid;
+static int hf_ubdp_wlan_mode;
+static int hf_ubdp_system_id;
+static int hf_ubdp_seq_num;
+static int hf_ubdp_model;
+static int hf_ubdp_firmware;
+static int hf_ubdp_platform_vers;
+static int hf_ubdp_generic;
 
-static gint ett_ubdp = -1;
-static gint ett_ubdp_tlv = -1;
+static gint ett_ubdp;
+static gint ett_ubdp_tlv;
 
-static expert_field ei_ubdp_bad_version = EI_INIT;
-static expert_field ei_ubdp_unexpected_len = EI_INIT;
+static expert_field ei_ubdp_bad_version;
+static expert_field ei_ubdp_unexpected_len;
 
 static dissector_handle_t ubdp_handle;
 
diff --git a/epan/dissectors/packet-ubertooth.c b/epan/dissectors/packet-ubertooth.c
index 7cf823aab5..7da829d354 100644
--- a/epan/dissectors/packet-ubertooth.c
+++ b/epan/dissectors/packet-ubertooth.c
@@ -20,306 +20,306 @@
 #include "packet-bluetooth.h"
 #include "packet-ubertooth.h"
 
-static int proto_ubertooth = -1;
-
-static int hf_command = -1;
-static int hf_response = -1;
-static int hf_argument_0 = -1;
-static int hf_argument_1 = -1;
-static int hf_estimated_length = -1;
-static int hf_board_id = -1;
-static int hf_reserved = -1;
-static int hf_length = -1;
-static int hf_firmware_revision = -1;
-static int hf_firmware_compile_info = -1;
-static int hf_user_led = -1;
-static int hf_rx_led = -1;
-static int hf_tx_led = -1;
-static int hf_1v8_led = -1;
-static int hf_channel = -1;
-static int hf_status = -1;
-static int hf_serial_number = -1;
-static int hf_part_number = -1;
-static int hf_packet_type = -1;
-static int hf_chip_status_dma_overflow = -1;
-static int hf_chip_status_dma_error = -1;
-static int hf_chip_status_cs_trigger = -1;
-static int hf_chip_status_fifo_overflow = -1;
-static int hf_chip_status_rssi_trigger = -1;
-static int hf_chip_status_reserved = -1;
-static int hf_clock_ns = -1;
-static int hf_clock_100ns = -1;
-static int hf_rssi_min = -1;
-static int hf_rssi_max = -1;
-static int hf_rssi_avg = -1;
-static int hf_rssi_count = -1;
-static int hf_data = -1;
-static int hf_crc_verify = -1;
-static int hf_paen = -1;
-static int hf_hgm = -1;
-static int hf_modulation = -1;
-static int hf_power_amplifier_reserved = -1;
-static int hf_power_amplifier_level = -1;
-static int hf_range_test_valid = -1;
-static int hf_range_test_request_power_amplifier = -1;
-static int hf_range_test_request_number = -1;
-static int hf_range_test_reply_power_amplifier = -1;
-static int hf_range_test_reply_number = -1;
-static int hf_squelch = -1;
-static int hf_register = -1;
-static int hf_register_value = -1;
-static int hf_access_address = -1;
-static int hf_high_frequency = -1;
-static int hf_low_frequency = -1;
-static int hf_rx_packets = -1;
-static int hf_rssi_threshold = -1;
-static int hf_clock_offset = -1;
-static int hf_afh_map = -1;
-static int hf_bdaddr = -1;
-static int hf_usb_rx_packet = -1;
-static int hf_state = -1;
-static int hf_crc_init = -1;
-static int hf_hop_interval = -1;
-static int hf_hop_increment = -1;
-static int hf_usb_rx_packet_channel = -1;
-static int hf_spectrum_entry = -1;
-static int hf_frequency = -1;
-static int hf_rssi = -1;
-static int hf_jam_mode = -1;
-static int hf_ego_mode = -1;
-static int hf_cc2400_value = -1;
-static int hf_cc2400_main_resetn = -1;
-static int hf_cc2400_main_reserved_14_10 = -1;
-static int hf_cc2400_main_fs_force_en = -1;
-static int hf_cc2400_main_rxn_tx = -1;
-static int hf_cc2400_main_reserved_7_4 = -1;
-static int hf_cc2400_main_reserved_3 = -1;
-static int hf_cc2400_main_reserved_2 = -1;
-static int hf_cc2400_main_xosc16m_bypass = -1;
-static int hf_cc2400_main_xosc16m_en = -1;
-static int hf_cc2400_fsctrl_reserved = -1;
-static int hf_cc2400_fsctrl_lock_threshold = -1;
-static int hf_cc2400_fsctrl_cal_done = -1;
-static int hf_cc2400_fsctrl_cal_running = -1;
-static int hf_cc2400_fsctrl_lock_length = -1;
-static int hf_cc2400_fsctrl_lock_status = -1;
-static int hf_cc2400_fsdiv_reserved = -1;
-static int hf_cc2400_fsdiv_frequency = -1;
-static int hf_cc2400_fsdiv_freq_high = -1;
-static int hf_cc2400_fsdiv_freq = -1;
-static int hf_cc2400_mdmctrl_reserved = -1;
-static int hf_cc2400_mdmctrl_mod_offset = -1;
-static int hf_cc2400_mdmctrl_mod_dev = -1;
-static int hf_cc2400_agcctrl_vga_gain = -1;
-static int hf_cc2400_agcctrl_reserved = -1;
-static int hf_cc2400_agcctrl_agc_locked = -1;
-static int hf_cc2400_agcctrl_agc_lock = -1;
-static int hf_cc2400_agcctrl_agc_sync_lock = -1;
-static int hf_cc2400_agcctrl_vga_gain_oe = -1;
-static int hf_cc2400_frend_reserved_15_4 = -1;
-static int hf_cc2400_frend_reserved_3 = -1;
-static int hf_cc2400_frend_pa_level = -1;
-static int hf_cc2400_rssi_rssi_val = -1;
-static int hf_cc2400_rssi_rssi_cs_thres = -1;
-static int hf_cc2400_rssi_rssi_filt = -1;
-static int hf_cc2400_freqest_rx_freq_offset = -1;
-static int hf_cc2400_freqest_reserved = -1;
-static int hf_cc2400_iocfg_reserved = -1;
-static int hf_cc2400_iocfg_gio6_cfg = -1;
-static int hf_cc2400_iocfg_gio1_cfg = -1;
-static int hf_cc2400_iocfg_hssd_src = -1;
-static int hf_cc2400_fsmtc_tc_rxon2agcen = -1;
-static int hf_cc2400_fsmtc_tc_paon2switch = -1;
-static int hf_cc2400_fsmtc_res = -1;
-static int hf_cc2400_fsmtc_tc_txend2switch = -1;
-static int hf_cc2400_fsmtc_tc_txend2paoff = -1;
-static int hf_cc2400_reserved_0x0C_res_15_5 = -1;
-static int hf_cc2400_reserved_0x0C_res_4_0 = -1;
-static int hf_cc2400_manand_vga_reset_n = -1;
-static int hf_cc2400_manand_lock_status = -1;
-static int hf_cc2400_manand_balun_ctrl = -1;
-static int hf_cc2400_manand_rxtx = -1;
-static int hf_cc2400_manand_pre_pd = -1;
-static int hf_cc2400_manand_pa_n_pd = -1;
-static int hf_cc2400_manand_pa_p_pd = -1;
-static int hf_cc2400_manand_dac_lpf_pd = -1;
-static int hf_cc2400_manand_bias_pd = -1;
-static int hf_cc2400_manand_xosc16m_pd = -1;
-static int hf_cc2400_manand_chp_pd = -1;
-static int hf_cc2400_manand_fs_pd = -1;
-static int hf_cc2400_manand_adc_pd = -1;
-static int hf_cc2400_manand_vga_pd = -1;
-static int hf_cc2400_manand_rxbpf_pd = -1;
-static int hf_cc2400_manand_lnamix_pd = -1;
-static int hf_cc2400_fsmstate_reserved_15_13 = -1;
-static int hf_cc2400_fsmstate_fsm_state_bkpt = -1;
-static int hf_cc2400_fsmstate_reserved_7_5 = -1;
-static int hf_cc2400_fsmstate_fsm_cur_state = -1;
-static int hf_cc2400_adctst_reserved_15 = -1;
-static int hf_cc2400_adctst_adc_i = -1;
-static int hf_cc2400_adctst_reserved_7 = -1;
-static int hf_cc2400_adctst_adc_q = -1;
-static int hf_cc2400_rxbpftst_reserved = -1;
-static int hf_cc2400_rxbpftst_rxbpf_cap_oe = -1;
-static int hf_cc2400_rxbpftst_rxbpf_cap_o = -1;
-static int hf_cc2400_rxbpftst_rxbpf_cap_res = -1;
-static int hf_cc2400_pamtst_reserved_15_13 = -1;
-static int hf_cc2400_pamtst_vc_in_test_en = -1;
-static int hf_cc2400_pamtst_atestmod_pd = -1;
-static int hf_cc2400_pamtst_atestmod_mode = -1;
-static int hf_cc2400_pamtst_reserved_7 = -1;
-static int hf_cc2400_pamtst_txmix_cap_array = -1;
-static int hf_cc2400_pamtst_txmix_current = -1;
-static int hf_cc2400_pamtst_pa_current = -1;
-static int hf_cc2400_lmtst_reserved = -1;
-static int hf_cc2400_lmtst_rxmix_hgm = -1;
-static int hf_cc2400_lmtst_rxmix_tail = -1;
-static int hf_cc2400_lmtst_rxmix_vcm = -1;
-static int hf_cc2400_lmtst_rxmix_current = -1;
-static int hf_cc2400_lmtst_lna_cap_array = -1;
-static int hf_cc2400_lmtst_lna_lowgain = -1;
-static int hf_cc2400_lmtst_lna_gain = -1;
-static int hf_cc2400_lmtst_lna_current = -1;
-static int hf_cc2400_manor_vga_reset_n = -1;
-static int hf_cc2400_manor_lock_status = -1;
-static int hf_cc2400_manor_balun_ctrl = -1;
-static int hf_cc2400_manor_rxtx = -1;
-static int hf_cc2400_manor_pre_pd = -1;
-static int hf_cc2400_manor_pa_n_pd = -1;
-static int hf_cc2400_manor_pa_p_pd = -1;
-static int hf_cc2400_manor_dac_lpf_pd = -1;
-static int hf_cc2400_manor_bias_pd = -1;
-static int hf_cc2400_manor_xosc16m_pd = -1;
-static int hf_cc2400_manor_chp_pd = -1;
-static int hf_cc2400_manor_fs_pd = -1;
-static int hf_cc2400_manor_adc_pd = -1;
-static int hf_cc2400_manor_vga_pd = -1;
-static int hf_cc2400_manor_rxbpf_pd = -1;
-static int hf_cc2400_manor_lnamix_pd = -1;
-static int hf_cc2400_mdmtst0_reserved = -1;
-static int hf_cc2400_mdmtst0_tx_prng = -1;
-static int hf_cc2400_mdmtst0_tx_1mhz_offset_n = -1;
-static int hf_cc2400_mdmtst0_invert_data = -1;
-static int hf_cc2400_mdmtst0_afc_adjust_on_packet = -1;
-static int hf_cc2400_mdmtst0_afc_settling = -1;
-static int hf_cc2400_mdmtst0_afc_delta = -1;
-static int hf_cc2400_mdmtst1_reserved = -1;
-static int hf_cc2400_mdmtst1_bsync_threshold = -1;
-static int hf_cc2400_dactst_reserved = -1;
-static int hf_cc2400_dactst_dac_src = -1;
-static int hf_cc2400_dactst_dac_i_o = -1;
-static int hf_cc2400_dactst_dac_q_o = -1;
-static int hf_cc2400_agctst0_agc_settle_blank_dn = -1;
-static int hf_cc2400_agctst0_agc_win_size = -1;
-static int hf_cc2400_agctst0_agc_settle_peak = -1;
-static int hf_cc2400_agctst0_agc_settle_adc = -1;
-static int hf_cc2400_agctst0_agc_attempts = -1;
-static int hf_cc2400_agctst1_reserved = -1;
-static int hf_cc2400_agctst1_agc_var_gain_sat = -1;
-static int hf_cc2400_agctst1_agc_settle_blank_up = -1;
-static int hf_cc2400_agctst1_peakdet_cur_boost = -1;
-static int hf_cc2400_agctst1_agc_mult_slow = -1;
-static int hf_cc2400_agctst1_agc_settle_fixed = -1;
-static int hf_cc2400_agctst1_agc_settle_var = -1;
-static int hf_cc2400_agctst2_reserved = -1;
-static int hf_cc2400_agctst2_agc_backend_blanking = -1;
-static int hf_cc2400_agctst2_agc_adjust_m3db = -1;
-static int hf_cc2400_agctst2_agc_adjust_m1db = -1;
-static int hf_cc2400_agctst2_agc_adjust_p3db = -1;
-static int hf_cc2400_agctst2_agc_adjust_p1db = -1;
-static int hf_cc2400_fstst0_rxmixbuf_cur = -1;
-static int hf_cc2400_fstst0_txmixbuf_cur = -1;
-static int hf_cc2400_fstst0_vco_array_settle_long = -1;
-static int hf_cc2400_fstst0_vco_array_oe = -1;
-static int hf_cc2400_fstst0_vco_array_o = -1;
-static int hf_cc2400_fstst0_vco_array_res = -1;
-static int hf_cc2400_fstst1_rxbpf_locur = -1;
-static int hf_cc2400_fstst1_rxbpf_midcur = -1;
-static int hf_cc2400_fstst1_vco_current_ref = -1;
-static int hf_cc2400_fstst1_vco_current_k = -1;
-static int hf_cc2400_fstst1_vc_dac_en = -1;
-static int hf_cc2400_fstst1_vc_dac_val = -1;
-static int hf_cc2400_fstst2_reserved = -1;
-static int hf_cc2400_fstst2_vco_curcal_speed = -1;
-static int hf_cc2400_fstst2_vco_current_oe = -1;
-static int hf_cc2400_fstst2_vco_current_o = -1;
-static int hf_cc2400_fstst2_vco_current_res = -1;
-static int hf_cc2400_fstst3_reserved = -1;
-static int hf_cc2400_fstst3_chp_test_up = -1;
-static int hf_cc2400_fstst3_chp_test_dn = -1;
-static int hf_cc2400_fstst3_chp_disable = -1;
-static int hf_cc2400_fstst3_pd_delay = -1;
-static int hf_cc2400_fstst3_chp_step_period = -1;
-static int hf_cc2400_fstst3_stop_chp_current = -1;
-static int hf_cc2400_fstst3_start_chp_current = -1;
-static int hf_cc2400_manfidl_partnum = -1;
-static int hf_cc2400_manfidl_manfid = -1;
-static int hf_cc2400_manfidh_version = -1;
-static int hf_cc2400_manfidh_partnum = -1;
-static int hf_cc2400_grmdm_reserved = -1;
-static int hf_cc2400_grmdm_sync_errbits_allowed = -1;
-static int hf_cc2400_grmdm_pin_mode = -1;
-static int hf_cc2400_grmdm_packet_mode = -1;
-static int hf_cc2400_grmdm_pre_bytes = -1;
-static int hf_cc2400_grmdm_sync_word_size = -1;
-static int hf_cc2400_grmdm_crc_on = -1;
-static int hf_cc2400_grmdm_data_format = -1;
-static int hf_cc2400_grmdm_modulation_format = -1;
-static int hf_cc2400_grmdm_tx_gaussian_filter = -1;
-static int hf_cc2400_grdec_reserved = -1;
-static int hf_cc2400_grdec_ind_saturation = -1;
-static int hf_cc2400_grdec_dec_shift = -1;
-static int hf_cc2400_grdec_channel_dec = -1;
-static int hf_cc2400_grdec_dec_val = -1;
-static int hf_cc2400_pktstatus_reserved_15_11 = -1;
-static int hf_cc2400_pktstatus_sync_word_received = -1;
-static int hf_cc2400_pktstatus_crc_ok = -1;
-static int hf_cc2400_pktstatus_reserved_8 = -1;
-static int hf_cc2400_pktstatus_reserved_7_0 = -1;
-static int hf_cc2400_int_reserved_15_8 = -1;
-static int hf_cc2400_int_reserved_7 = -1;
-static int hf_cc2400_int_pkt_polarity = -1;
-static int hf_cc2400_int_fifo_polarity = -1;
-static int hf_cc2400_int_fifo_threshold = -1;
-static int hf_cc2400_reserved_0x24_res_15_14 = -1;
-static int hf_cc2400_reserved_0x24_res_13_10 = -1;
-static int hf_cc2400_reserved_0x24_res_9_7 = -1;
-static int hf_cc2400_reserved_0x24_res_6_0 = -1;
-static int hf_cc2400_reserved_0x25_res_15_12 = -1;
-static int hf_cc2400_reserved_0x25_res_11_0 = -1;
-static int hf_cc2400_reserved_0x26_res_15_10 = -1;
-static int hf_cc2400_reserved_0x26_res_9_0 = -1;
-static int hf_cc2400_reserved_0x27_res_15_8 = -1;
-static int hf_cc2400_reserved_0x27_res_7_3 = -1;
-static int hf_cc2400_reserved_0x27_res_2_0 = -1;
-static int hf_cc2400_reserved_0x28_res_15 = -1;
-static int hf_cc2400_reserved_0x28_res_14_13 = -1;
-static int hf_cc2400_reserved_0x28_res_12_7 = -1;
-static int hf_cc2400_reserved_0x28_res_6_0 = -1;
-static int hf_cc2400_reserved_0x29_res_15_8 = -1;
-static int hf_cc2400_reserved_0x29_res_7_3 = -1;
-static int hf_cc2400_reserved_0x29_res_2_0 = -1;
-static int hf_cc2400_reserved_0x2A_res_15_11 = -1;
-static int hf_cc2400_reserved_0x2A_res_10 = -1;
-static int hf_cc2400_reserved_0x2A_res_9_0 = -1;
-static int hf_cc2400_reserved_0x2B_res_15_14 = -1;
-static int hf_cc2400_reserved_0x2B_res_13 = -1;
-static int hf_cc2400_reserved_0x2B_res_12 = -1;
-static int hf_cc2400_reserved_0x2B_res_11_0 = -1;
-static int hf_cc2400_syncl = -1;
-static int hf_cc2400_synch = -1;
-
-static gint ett_ubertooth = -1;
-static gint ett_command = -1;
-static gint ett_usb_rx_packet = -1;
-static gint ett_usb_rx_packet_data = -1;
-static gint ett_entry = -1;
-static gint ett_register_value = -1;
-static gint ett_fsdiv_frequency = -1;
-
-static expert_field ei_unexpected_response = EI_INIT;
-static expert_field ei_unknown_data = EI_INIT;
-static expert_field ei_unexpected_data = EI_INIT;
+static int proto_ubertooth;
+
+static int hf_command;
+static int hf_response;
+static int hf_argument_0;
+static int hf_argument_1;
+static int hf_estimated_length;
+static int hf_board_id;
+static int hf_reserved;
+static int hf_length;
+static int hf_firmware_revision;
+static int hf_firmware_compile_info;
+static int hf_user_led;
+static int hf_rx_led;
+static int hf_tx_led;
+static int hf_1v8_led;
+static int hf_channel;
+static int hf_status;
+static int hf_serial_number;
+static int hf_part_number;
+static int hf_packet_type;
+static int hf_chip_status_dma_overflow;
+static int hf_chip_status_dma_error;
+static int hf_chip_status_cs_trigger;
+static int hf_chip_status_fifo_overflow;
+static int hf_chip_status_rssi_trigger;
+static int hf_chip_status_reserved;
+static int hf_clock_ns;
+static int hf_clock_100ns;
+static int hf_rssi_min;
+static int hf_rssi_max;
+static int hf_rssi_avg;
+static int hf_rssi_count;
+static int hf_data;
+static int hf_crc_verify;
+static int hf_paen;
+static int hf_hgm;
+static int hf_modulation;
+static int hf_power_amplifier_reserved;
+static int hf_power_amplifier_level;
+static int hf_range_test_valid;
+static int hf_range_test_request_power_amplifier;
+static int hf_range_test_request_number;
+static int hf_range_test_reply_power_amplifier;
+static int hf_range_test_reply_number;
+static int hf_squelch;
+static int hf_register;
+static int hf_register_value;
+static int hf_access_address;
+static int hf_high_frequency;
+static int hf_low_frequency;
+static int hf_rx_packets;
+static int hf_rssi_threshold;
+static int hf_clock_offset;
+static int hf_afh_map;
+static int hf_bdaddr;
+static int hf_usb_rx_packet;
+static int hf_state;
+static int hf_crc_init;
+static int hf_hop_interval;
+static int hf_hop_increment;
+static int hf_usb_rx_packet_channel;
+static int hf_spectrum_entry;
+static int hf_frequency;
+static int hf_rssi;
+static int hf_jam_mode;
+static int hf_ego_mode;
+static int hf_cc2400_value;
+static int hf_cc2400_main_resetn;
+static int hf_cc2400_main_reserved_14_10;
+static int hf_cc2400_main_fs_force_en;
+static int hf_cc2400_main_rxn_tx;
+static int hf_cc2400_main_reserved_7_4;
+static int hf_cc2400_main_reserved_3;
+static int hf_cc2400_main_reserved_2;
+static int hf_cc2400_main_xosc16m_bypass;
+static int hf_cc2400_main_xosc16m_en;
+static int hf_cc2400_fsctrl_reserved;
+static int hf_cc2400_fsctrl_lock_threshold;
+static int hf_cc2400_fsctrl_cal_done;
+static int hf_cc2400_fsctrl_cal_running;
+static int hf_cc2400_fsctrl_lock_length;
+static int hf_cc2400_fsctrl_lock_status;
+static int hf_cc2400_fsdiv_reserved;
+static int hf_cc2400_fsdiv_frequency;
+static int hf_cc2400_fsdiv_freq_high;
+static int hf_cc2400_fsdiv_freq;
+static int hf_cc2400_mdmctrl_reserved;
+static int hf_cc2400_mdmctrl_mod_offset;
+static int hf_cc2400_mdmctrl_mod_dev;
+static int hf_cc2400_agcctrl_vga_gain;
+static int hf_cc2400_agcctrl_reserved;
+static int hf_cc2400_agcctrl_agc_locked;
+static int hf_cc2400_agcctrl_agc_lock;
+static int hf_cc2400_agcctrl_agc_sync_lock;
+static int hf_cc2400_agcctrl_vga_gain_oe;
+static int hf_cc2400_frend_reserved_15_4;
+static int hf_cc2400_frend_reserved_3;
+static int hf_cc2400_frend_pa_level;
+static int hf_cc2400_rssi_rssi_val;
+static int hf_cc2400_rssi_rssi_cs_thres;
+static int hf_cc2400_rssi_rssi_filt;
+static int hf_cc2400_freqest_rx_freq_offset;
+static int hf_cc2400_freqest_reserved;
+static int hf_cc2400_iocfg_reserved;
+static int hf_cc2400_iocfg_gio6_cfg;
+static int hf_cc2400_iocfg_gio1_cfg;
+static int hf_cc2400_iocfg_hssd_src;
+static int hf_cc2400_fsmtc_tc_rxon2agcen;
+static int hf_cc2400_fsmtc_tc_paon2switch;
+static int hf_cc2400_fsmtc_res;
+static int hf_cc2400_fsmtc_tc_txend2switch;
+static int hf_cc2400_fsmtc_tc_txend2paoff;
+static int hf_cc2400_reserved_0x0C_res_15_5;
+static int hf_cc2400_reserved_0x0C_res_4_0;
+static int hf_cc2400_manand_vga_reset_n;
+static int hf_cc2400_manand_lock_status;
+static int hf_cc2400_manand_balun_ctrl;
+static int hf_cc2400_manand_rxtx;
+static int hf_cc2400_manand_pre_pd;
+static int hf_cc2400_manand_pa_n_pd;
+static int hf_cc2400_manand_pa_p_pd;
+static int hf_cc2400_manand_dac_lpf_pd;
+static int hf_cc2400_manand_bias_pd;
+static int hf_cc2400_manand_xosc16m_pd;
+static int hf_cc2400_manand_chp_pd;
+static int hf_cc2400_manand_fs_pd;
+static int hf_cc2400_manand_adc_pd;
+static int hf_cc2400_manand_vga_pd;
+static int hf_cc2400_manand_rxbpf_pd;
+static int hf_cc2400_manand_lnamix_pd;
+static int hf_cc2400_fsmstate_reserved_15_13;
+static int hf_cc2400_fsmstate_fsm_state_bkpt;
+static int hf_cc2400_fsmstate_reserved_7_5;
+static int hf_cc2400_fsmstate_fsm_cur_state;
+static int hf_cc2400_adctst_reserved_15;
+static int hf_cc2400_adctst_adc_i;
+static int hf_cc2400_adctst_reserved_7;
+static int hf_cc2400_adctst_adc_q;
+static int hf_cc2400_rxbpftst_reserved;
+static int hf_cc2400_rxbpftst_rxbpf_cap_oe;
+static int hf_cc2400_rxbpftst_rxbpf_cap_o;
+static int hf_cc2400_rxbpftst_rxbpf_cap_res;
+static int hf_cc2400_pamtst_reserved_15_13;
+static int hf_cc2400_pamtst_vc_in_test_en;
+static int hf_cc2400_pamtst_atestmod_pd;
+static int hf_cc2400_pamtst_atestmod_mode;
+static int hf_cc2400_pamtst_reserved_7;
+static int hf_cc2400_pamtst_txmix_cap_array;
+static int hf_cc2400_pamtst_txmix_current;
+static int hf_cc2400_pamtst_pa_current;
+static int hf_cc2400_lmtst_reserved;
+static int hf_cc2400_lmtst_rxmix_hgm;
+static int hf_cc2400_lmtst_rxmix_tail;
+static int hf_cc2400_lmtst_rxmix_vcm;
+static int hf_cc2400_lmtst_rxmix_current;
+static int hf_cc2400_lmtst_lna_cap_array;
+static int hf_cc2400_lmtst_lna_lowgain;
+static int hf_cc2400_lmtst_lna_gain;
+static int hf_cc2400_lmtst_lna_current;
+static int hf_cc2400_manor_vga_reset_n;
+static int hf_cc2400_manor_lock_status;
+static int hf_cc2400_manor_balun_ctrl;
+static int hf_cc2400_manor_rxtx;
+static int hf_cc2400_manor_pre_pd;
+static int hf_cc2400_manor_pa_n_pd;
+static int hf_cc2400_manor_pa_p_pd;
+static int hf_cc2400_manor_dac_lpf_pd;
+static int hf_cc2400_manor_bias_pd;
+static int hf_cc2400_manor_xosc16m_pd;
+static int hf_cc2400_manor_chp_pd;
+static int hf_cc2400_manor_fs_pd;
+static int hf_cc2400_manor_adc_pd;
+static int hf_cc2400_manor_vga_pd;
+static int hf_cc2400_manor_rxbpf_pd;
+static int hf_cc2400_manor_lnamix_pd;
+static int hf_cc2400_mdmtst0_reserved;
+static int hf_cc2400_mdmtst0_tx_prng;
+static int hf_cc2400_mdmtst0_tx_1mhz_offset_n;
+static int hf_cc2400_mdmtst0_invert_data;
+static int hf_cc2400_mdmtst0_afc_adjust_on_packet;
+static int hf_cc2400_mdmtst0_afc_settling;
+static int hf_cc2400_mdmtst0_afc_delta;
+static int hf_cc2400_mdmtst1_reserved;
+static int hf_cc2400_mdmtst1_bsync_threshold;
+static int hf_cc2400_dactst_reserved;
+static int hf_cc2400_dactst_dac_src;
+static int hf_cc2400_dactst_dac_i_o;
+static int hf_cc2400_dactst_dac_q_o;
+static int hf_cc2400_agctst0_agc_settle_blank_dn;
+static int hf_cc2400_agctst0_agc_win_size;
+static int hf_cc2400_agctst0_agc_settle_peak;
+static int hf_cc2400_agctst0_agc_settle_adc;
+static int hf_cc2400_agctst0_agc_attempts;
+static int hf_cc2400_agctst1_reserved;
+static int hf_cc2400_agctst1_agc_var_gain_sat;
+static int hf_cc2400_agctst1_agc_settle_blank_up;
+static int hf_cc2400_agctst1_peakdet_cur_boost;
+static int hf_cc2400_agctst1_agc_mult_slow;
+static int hf_cc2400_agctst1_agc_settle_fixed;
+static int hf_cc2400_agctst1_agc_settle_var;
+static int hf_cc2400_agctst2_reserved;
+static int hf_cc2400_agctst2_agc_backend_blanking;
+static int hf_cc2400_agctst2_agc_adjust_m3db;
+static int hf_cc2400_agctst2_agc_adjust_m1db;
+static int hf_cc2400_agctst2_agc_adjust_p3db;
+static int hf_cc2400_agctst2_agc_adjust_p1db;
+static int hf_cc2400_fstst0_rxmixbuf_cur;
+static int hf_cc2400_fstst0_txmixbuf_cur;
+static int hf_cc2400_fstst0_vco_array_settle_long;
+static int hf_cc2400_fstst0_vco_array_oe;
+static int hf_cc2400_fstst0_vco_array_o;
+static int hf_cc2400_fstst0_vco_array_res;
+static int hf_cc2400_fstst1_rxbpf_locur;
+static int hf_cc2400_fstst1_rxbpf_midcur;
+static int hf_cc2400_fstst1_vco_current_ref;
+static int hf_cc2400_fstst1_vco_current_k;
+static int hf_cc2400_fstst1_vc_dac_en;
+static int hf_cc2400_fstst1_vc_dac_val;
+static int hf_cc2400_fstst2_reserved;
+static int hf_cc2400_fstst2_vco_curcal_speed;
+static int hf_cc2400_fstst2_vco_current_oe;
+static int hf_cc2400_fstst2_vco_current_o;
+static int hf_cc2400_fstst2_vco_current_res;
+static int hf_cc2400_fstst3_reserved;
+static int hf_cc2400_fstst3_chp_test_up;
+static int hf_cc2400_fstst3_chp_test_dn;
+static int hf_cc2400_fstst3_chp_disable;
+static int hf_cc2400_fstst3_pd_delay;
+static int hf_cc2400_fstst3_chp_step_period;
+static int hf_cc2400_fstst3_stop_chp_current;
+static int hf_cc2400_fstst3_start_chp_current;
+static int hf_cc2400_manfidl_partnum;
+static int hf_cc2400_manfidl_manfid;
+static int hf_cc2400_manfidh_version;
+static int hf_cc2400_manfidh_partnum;
+static int hf_cc2400_grmdm_reserved;
+static int hf_cc2400_grmdm_sync_errbits_allowed;
+static int hf_cc2400_grmdm_pin_mode;
+static int hf_cc2400_grmdm_packet_mode;
+static int hf_cc2400_grmdm_pre_bytes;
+static int hf_cc2400_grmdm_sync_word_size;
+static int hf_cc2400_grmdm_crc_on;
+static int hf_cc2400_grmdm_data_format;
+static int hf_cc2400_grmdm_modulation_format;
+static int hf_cc2400_grmdm_tx_gaussian_filter;
+static int hf_cc2400_grdec_reserved;
+static int hf_cc2400_grdec_ind_saturation;
+static int hf_cc2400_grdec_dec_shift;
+static int hf_cc2400_grdec_channel_dec;
+static int hf_cc2400_grdec_dec_val;
+static int hf_cc2400_pktstatus_reserved_15_11;
+static int hf_cc2400_pktstatus_sync_word_received;
+static int hf_cc2400_pktstatus_crc_ok;
+static int hf_cc2400_pktstatus_reserved_8;
+static int hf_cc2400_pktstatus_reserved_7_0;
+static int hf_cc2400_int_reserved_15_8;
+static int hf_cc2400_int_reserved_7;
+static int hf_cc2400_int_pkt_polarity;
+static int hf_cc2400_int_fifo_polarity;
+static int hf_cc2400_int_fifo_threshold;
+static int hf_cc2400_reserved_0x24_res_15_14;
+static int hf_cc2400_reserved_0x24_res_13_10;
+static int hf_cc2400_reserved_0x24_res_9_7;
+static int hf_cc2400_reserved_0x24_res_6_0;
+static int hf_cc2400_reserved_0x25_res_15_12;
+static int hf_cc2400_reserved_0x25_res_11_0;
+static int hf_cc2400_reserved_0x26_res_15_10;
+static int hf_cc2400_reserved_0x26_res_9_0;
+static int hf_cc2400_reserved_0x27_res_15_8;
+static int hf_cc2400_reserved_0x27_res_7_3;
+static int hf_cc2400_reserved_0x27_res_2_0;
+static int hf_cc2400_reserved_0x28_res_15;
+static int hf_cc2400_reserved_0x28_res_14_13;
+static int hf_cc2400_reserved_0x28_res_12_7;
+static int hf_cc2400_reserved_0x28_res_6_0;
+static int hf_cc2400_reserved_0x29_res_15_8;
+static int hf_cc2400_reserved_0x29_res_7_3;
+static int hf_cc2400_reserved_0x29_res_2_0;
+static int hf_cc2400_reserved_0x2A_res_15_11;
+static int hf_cc2400_reserved_0x2A_res_10;
+static int hf_cc2400_reserved_0x2A_res_9_0;
+static int hf_cc2400_reserved_0x2B_res_15_14;
+static int hf_cc2400_reserved_0x2B_res_13;
+static int hf_cc2400_reserved_0x2B_res_12;
+static int hf_cc2400_reserved_0x2B_res_11_0;
+static int hf_cc2400_syncl;
+static int hf_cc2400_synch;
+
+static gint ett_ubertooth;
+static gint ett_command;
+static gint ett_usb_rx_packet;
+static gint ett_usb_rx_packet_data;
+static gint ett_entry;
+static gint ett_register_value;
+static gint ett_fsdiv_frequency;
+
+static expert_field ei_unexpected_response;
+static expert_field ei_unknown_data;
+static expert_field ei_unexpected_data;
 
 static dissector_handle_t ubertooth_handle;
 static dissector_handle_t bluetooth_ubertooth_handle;
diff --git a/epan/dissectors/packet-ubx-gps_l1_lnav.c b/epan/dissectors/packet-ubx-gps_l1_lnav.c
index 0758175e08..d114ea5330 100644
--- a/epan/dissectors/packet-ubx-gps_l1_lnav.c
+++ b/epan/dissectors/packet-ubx-gps_l1_lnav.c
@@ -120,68 +120,68 @@ static const value_string SV_HEALTH_CODE[] = {
 };
 
 // Initialize the protocol and registered fields
-static int proto_ubx_gps_l1 = -1;
+static int proto_ubx_gps_l1;
 
 // Telemetry Word (see IS-GPS-200N, Section 20.3.3.1)
-static int hf_ubx_gps_l1_tlm_preamble          = -1;
-static int hf_ubx_gps_l1_tlm_message           = -1;
-static int hf_ubx_gps_l1_tlm_integrity         = -1;
-static int hf_ubx_gps_l1_tlm_reserved          = -1;
-static int hf_ubx_gps_l1_tlm_parity            = -1;
+static int hf_ubx_gps_l1_tlm_preamble;
+static int hf_ubx_gps_l1_tlm_message;
+static int hf_ubx_gps_l1_tlm_integrity;
+static int hf_ubx_gps_l1_tlm_reserved;
+static int hf_ubx_gps_l1_tlm_parity;
 
 // Handover Word (see IS-GPS-200N, Section 20.3.3.2)
-static int hf_ubx_gps_l1_how_tow_count         = -1;
-static int hf_ubx_gps_l1_how_alert             = -1;
-static int hf_ubx_gps_l1_how_anti_spoof        = -1;
-static int hf_ubx_gps_l1_how_subframe_id       = -1;
-static int hf_ubx_gps_l1_how_parity_sol        = -1;
-static int hf_ubx_gps_l1_how_parity            = -1;
+static int hf_ubx_gps_l1_how_tow_count;
+static int hf_ubx_gps_l1_how_alert;
+static int hf_ubx_gps_l1_how_anti_spoof;
+static int hf_ubx_gps_l1_how_subframe_id;
+static int hf_ubx_gps_l1_how_parity_sol;
+static int hf_ubx_gps_l1_how_parity;
 
 // Subframe 1 (see IS-GPS-200N, Section 20.3.3.3)
-static int hf_ubx_gps_l1_sf1                   = -1;
-static int hf_ubx_gps_l1_sf1_week_no           = -1;
-static int hf_ubx_gps_l1_sf1_l2_channel_code   = -1;
-static int hf_ubx_gps_l1_sf1_ura_index         = -1;
-static int hf_ubx_gps_l1_sf1_sv_health_summary = -1;
-static int hf_ubx_gps_l1_sf1_sv_health         = -1;
-static int hf_ubx_gps_l1_sf1_iodc_msbs         = -1;
-static int hf_ubx_gps_l1_sf1_w3_parity         = -1;
-static int hf_ubx_gps_l1_sf1_w4_l2_p_data_flag = -1;
-static int hf_ubx_gps_l1_sf1_w4_reserved       = -1;
-static int hf_ubx_gps_l1_sf1_w4_parity         = -1;
-static int hf_ubx_gps_l1_sf1_w5_reserved       = -1;
-static int hf_ubx_gps_l1_sf1_w5_parity         = -1;
-static int hf_ubx_gps_l1_sf1_w6_reserved       = -1;
-static int hf_ubx_gps_l1_sf1_w6_parity         = -1;
-static int hf_ubx_gps_l1_sf1_w7_reserved       = -1;
-static int hf_ubx_gps_l1_sf1_w7_tgd            = -1;
-static int hf_ubx_gps_l1_sf1_w7_parity         = -1;
-static int hf_ubx_gps_l1_sf1_w8_iodc_lsbs      = -1;
-static int hf_ubx_gps_l1_sf1_w8_toc            = -1;
-static int hf_ubx_gps_l1_sf1_w8_parity         = -1;
-static int hf_ubx_gps_l1_sf1_w9_af2            = -1;
-static int hf_ubx_gps_l1_sf1_w9_af1            = -1;
-static int hf_ubx_gps_l1_sf1_w9_parity         = -1;
-static int hf_ubx_gps_l1_sf1_w10_af0           = -1;
-static int hf_ubx_gps_l1_sf1_w10_parity        = -1;
+static int hf_ubx_gps_l1_sf1;
+static int hf_ubx_gps_l1_sf1_week_no;
+static int hf_ubx_gps_l1_sf1_l2_channel_code;
+static int hf_ubx_gps_l1_sf1_ura_index;
+static int hf_ubx_gps_l1_sf1_sv_health_summary;
+static int hf_ubx_gps_l1_sf1_sv_health;
+static int hf_ubx_gps_l1_sf1_iodc_msbs;
+static int hf_ubx_gps_l1_sf1_w3_parity;
+static int hf_ubx_gps_l1_sf1_w4_l2_p_data_flag;
+static int hf_ubx_gps_l1_sf1_w4_reserved;
+static int hf_ubx_gps_l1_sf1_w4_parity;
+static int hf_ubx_gps_l1_sf1_w5_reserved;
+static int hf_ubx_gps_l1_sf1_w5_parity;
+static int hf_ubx_gps_l1_sf1_w6_reserved;
+static int hf_ubx_gps_l1_sf1_w6_parity;
+static int hf_ubx_gps_l1_sf1_w7_reserved;
+static int hf_ubx_gps_l1_sf1_w7_tgd;
+static int hf_ubx_gps_l1_sf1_w7_parity;
+static int hf_ubx_gps_l1_sf1_w8_iodc_lsbs;
+static int hf_ubx_gps_l1_sf1_w8_toc;
+static int hf_ubx_gps_l1_sf1_w8_parity;
+static int hf_ubx_gps_l1_sf1_w9_af2;
+static int hf_ubx_gps_l1_sf1_w9_af1;
+static int hf_ubx_gps_l1_sf1_w9_parity;
+static int hf_ubx_gps_l1_sf1_w10_af0;
+static int hf_ubx_gps_l1_sf1_w10_parity;
 
 static dissector_table_t ubx_gps_l1_sf_dissector_table;
 
-static expert_field ei_ubx_gps_l1_tlm_preamble    = EI_INIT;
-static expert_field ei_ubx_gps_l1_how_tow_count   = EI_INIT;
-static expert_field ei_ubx_gps_l1_how_subframe_id = EI_INIT;
-
-static int ett_ubx_gps_l1         = -1;
-static int ett_ubx_gps_l1_tlm     = -1;
-static int ett_ubx_gps_l1_how     = -1;
-static int ett_ubx_gps_l1_sf1_w3  = -1;
-static int ett_ubx_gps_l1_sf1_w4  = -1;
-static int ett_ubx_gps_l1_sf1_w5  = -1;
-static int ett_ubx_gps_l1_sf1_w6  = -1;
-static int ett_ubx_gps_l1_sf1_w7  = -1;
-static int ett_ubx_gps_l1_sf1_w8  = -1;
-static int ett_ubx_gps_l1_sf1_w9  = -1;
-static int ett_ubx_gps_l1_sf1_w10 = -1;
+static expert_field ei_ubx_gps_l1_tlm_preamble;
+static expert_field ei_ubx_gps_l1_how_tow_count;
+static expert_field ei_ubx_gps_l1_how_subframe_id;
+
+static int ett_ubx_gps_l1;
+static int ett_ubx_gps_l1_tlm;
+static int ett_ubx_gps_l1_how;
+static int ett_ubx_gps_l1_sf1_w3;
+static int ett_ubx_gps_l1_sf1_w4;
+static int ett_ubx_gps_l1_sf1_w5;
+static int ett_ubx_gps_l1_sf1_w6;
+static int ett_ubx_gps_l1_sf1_w7;
+static int ett_ubx_gps_l1_sf1_w8;
+static int ett_ubx_gps_l1_sf1_w9;
+static int ett_ubx_gps_l1_sf1_w10;
 
 /* Format TOW count */
 static void fmt_tow_count(gchar *label, gint32 c) {
diff --git a/epan/dissectors/packet-ubx.c b/epan/dissectors/packet-ubx.c
index 4ce9541744..3a49f269d9 100644
--- a/epan/dissectors/packet-ubx.c
+++ b/epan/dissectors/packet-ubx.c
@@ -258,154 +258,154 @@ static const value_string UBX_ORBIT_SOURCE[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_ubx = -1;
-
-static int hf_ubx_preamble      = -1;
-static int hf_ubx_msg_class_id  = -1;
-static int hf_ubx_payload_len   = -1;
-static int hf_ubx_chksum        = -1;
-
-static int hf_ubx_nav_dop      = -1;
-static int hf_ubx_nav_dop_itow = -1;
-static int hf_ubx_nav_dop_gdop = -1;
-static int hf_ubx_nav_dop_pdop = -1;
-static int hf_ubx_nav_dop_tdop = -1;
-static int hf_ubx_nav_dop_vdop = -1;
-static int hf_ubx_nav_dop_hdop = -1;
-static int hf_ubx_nav_dop_ndop = -1;
-static int hf_ubx_nav_dop_edop = -1;
-
-static int hf_ubx_nav_eoe      = -1;
-static int hf_ubx_nav_eoe_itow = -1;
-
-static int hf_ubx_nav_posecef       = -1;
-static int hf_ubx_nav_posecef_itow  = -1;
-static int hf_ubx_nav_posecef_ecefx = -1;
-static int hf_ubx_nav_posecef_ecefy = -1;
-static int hf_ubx_nav_posecef_ecefz = -1;
-static int hf_ubx_nav_posecef_pacc  = -1;
-
-static int hf_ubx_nav_pvt                   = -1;
-static int hf_ubx_nav_pvt_itow              = -1;
-static int hf_ubx_nav_pvt_year              = -1;
-static int hf_ubx_nav_pvt_month             = -1;
-static int hf_ubx_nav_pvt_day               = -1;
-static int hf_ubx_nav_pvt_hour              = -1;
-static int hf_ubx_nav_pvt_min               = -1;
-static int hf_ubx_nav_pvt_sec               = -1;
-static int hf_ubx_nav_pvt_validmag          = -1;
-static int hf_ubx_nav_pvt_fullyresolved     = -1;
-static int hf_ubx_nav_pvt_validtime         = -1;
-static int hf_ubx_nav_pvt_validdate         = -1;
-static int hf_ubx_nav_pvt_tacc              = -1;
-static int hf_ubx_nav_pvt_nano              = -1;
-static int hf_ubx_nav_pvt_fixtype           = -1;
-static int hf_ubx_nav_pvt_headvehvalid      = -1;
-static int hf_ubx_nav_pvt_psmstate          = -1;
-static int hf_ubx_nav_pvt_diffsoln          = -1;
-static int hf_ubx_nav_pvt_gnssfixok         = -1;
-static int hf_ubx_nav_pvt_confirmedtime     = -1;
-static int hf_ubx_nav_pvt_confirmeddate     = -1;
-static int hf_ubx_nav_pvt_confirmedavai     = -1;
-static int hf_ubx_nav_pvt_numsv             = -1;
-static int hf_ubx_nav_pvt_lon               = -1;
-static int hf_ubx_nav_pvt_lat               = -1;
-static int hf_ubx_nav_pvt_height            = -1;
-static int hf_ubx_nav_pvt_hmsl              = -1;
-static int hf_ubx_nav_pvt_hacc              = -1;
-static int hf_ubx_nav_pvt_vacc              = -1;
-static int hf_ubx_nav_pvt_veln              = -1;
-static int hf_ubx_nav_pvt_vele              = -1;
-static int hf_ubx_nav_pvt_veld              = -1;
-static int hf_ubx_nav_pvt_gspeed            = -1;
-static int hf_ubx_nav_pvt_headmot           = -1;
-static int hf_ubx_nav_pvt_sacc              = -1;
-static int hf_ubx_nav_pvt_headacc           = -1;
-static int hf_ubx_nav_pvt_pdop              = -1;
-static int hf_ubx_nav_pvt_lastcorrectionage = -1;
-static int hf_ubx_nav_pvt_invalidllh        = -1;
-static int hf_ubx_nav_pvt_reserved1         = -1;
-static int hf_ubx_nav_pvt_headveh           = -1;
-static int hf_ubx_nav_pvt_magdec            = -1;
-static int hf_ubx_nav_pvt_magacc            = -1;
-
-static int hf_ubx_nav_sat                  = -1;
-static int hf_ubx_nav_sat_itow             = -1;
-static int hf_ubx_nav_sat_version          = -1;
-static int hf_ubx_nav_sat_num_svs          = -1;
-static int hf_ubx_nav_sat_reserved1        = -1;
-static int hf_ubx_nav_sat_gnss_id          = -1;
-static int hf_ubx_nav_sat_sv_id            = -1;
-static int hf_ubx_nav_sat_cn0              = -1;
-static int hf_ubx_nav_sat_elev             = -1;
-static int hf_ubx_nav_sat_azim             = -1;
-static int hf_ubx_nav_sat_pr_res           = -1;
-static int hf_ubx_nav_sat_quality_ind      = -1;
-static int hf_ubx_nav_sat_sv_used          = -1;
-static int hf_ubx_nav_sat_health           = -1;
-static int hf_ubx_nav_sat_diff_corr        = -1;
-static int hf_ubx_nav_sat_smoothed         = -1;
-static int hf_ubx_nav_sat_orbit_src        = -1;
-static int hf_ubx_nav_sat_eph_avail        = -1;
-static int hf_ubx_nav_sat_alm_avail        = -1;
-static int hf_ubx_nav_sat_ano_avail        = -1;
-static int hf_ubx_nav_sat_aop_avail        = -1;
-static int hf_ubx_nav_sat_sbas_corr_used   = -1;
-static int hf_ubx_nav_sat_rtcm_corr_used   = -1;
-static int hf_ubx_nav_sat_slas_corr_used   = -1;
-static int hf_ubx_nav_sat_spartn_corr_used = -1;
-static int hf_ubx_nav_sat_pr_corr_used     = -1;
-static int hf_ubx_nav_sat_cr_corr_used     = -1;
-static int hf_ubx_nav_sat_do_corr_used     = -1;
-static int hf_ubx_nav_sat_clas_corr_used   = -1;
-
-static int hf_ubx_nav_timegps            = -1;
-static int hf_ubx_nav_timegps_itow       = -1;
-static int hf_ubx_nav_timegps_ftow       = -1;
-static int hf_ubx_nav_timegps_week       = -1;
-static int hf_ubx_nav_timegps_leaps      = -1;
-static int hf_ubx_nav_timegps_leapsvalid = -1;
-static int hf_ubx_nav_timegps_weekvalid  = -1;
-static int hf_ubx_nav_timegps_towvalid   = -1;
-static int hf_ubx_nav_timegps_tacc       = -1;
-
-static int hf_ubx_nav_velecef        = -1;
-static int hf_ubx_nav_velecef_itow   = -1;
-static int hf_ubx_nav_velecef_ecefvx = -1;
-static int hf_ubx_nav_velecef_ecefvy = -1;
-static int hf_ubx_nav_velecef_ecefvz = -1;
-static int hf_ubx_nav_velecef_sacc   = -1;
-
-static int hf_ubx_rxm_sfrbx           = -1;
-static int hf_ubx_rxm_sfrbx_gnssid    = -1;
-static int hf_ubx_rxm_sfrbx_svid      = -1;
-static int hf_ubx_rxm_sfrbx_sigid     = -1;
-static int hf_ubx_rxm_sfrbx_freqid    = -1;
-static int hf_ubx_rxm_sfrbx_numwords  = -1;
-static int hf_ubx_rxm_sfrbx_chn       = -1;
-static int hf_ubx_rxm_sfrbx_version   = -1;
-static int hf_ubx_rxm_sfrbx_dwrd      = -1;
-static int hf_ubx_rxm_sfrbx_reserved1 = -1;
-static int hf_ubx_rxm_sfrbx_reserved2 = -1;
-static int hf_ubx_rxm_sfrbx_reserved3 = -1;
+static int proto_ubx;
+
+static int hf_ubx_preamble;
+static int hf_ubx_msg_class_id;
+static int hf_ubx_payload_len;
+static int hf_ubx_chksum;
+
+static int hf_ubx_nav_dop;
+static int hf_ubx_nav_dop_itow;
+static int hf_ubx_nav_dop_gdop;
+static int hf_ubx_nav_dop_pdop;
+static int hf_ubx_nav_dop_tdop;
+static int hf_ubx_nav_dop_vdop;
+static int hf_ubx_nav_dop_hdop;
+static int hf_ubx_nav_dop_ndop;
+static int hf_ubx_nav_dop_edop;
+
+static int hf_ubx_nav_eoe;
+static int hf_ubx_nav_eoe_itow;
+
+static int hf_ubx_nav_posecef;
+static int hf_ubx_nav_posecef_itow;
+static int hf_ubx_nav_posecef_ecefx;
+static int hf_ubx_nav_posecef_ecefy;
+static int hf_ubx_nav_posecef_ecefz;
+static int hf_ubx_nav_posecef_pacc;
+
+static int hf_ubx_nav_pvt;
+static int hf_ubx_nav_pvt_itow;
+static int hf_ubx_nav_pvt_year;
+static int hf_ubx_nav_pvt_month;
+static int hf_ubx_nav_pvt_day;
+static int hf_ubx_nav_pvt_hour;
+static int hf_ubx_nav_pvt_min;
+static int hf_ubx_nav_pvt_sec;
+static int hf_ubx_nav_pvt_validmag;
+static int hf_ubx_nav_pvt_fullyresolved;
+static int hf_ubx_nav_pvt_validtime;
+static int hf_ubx_nav_pvt_validdate;
+static int hf_ubx_nav_pvt_tacc;
+static int hf_ubx_nav_pvt_nano;
+static int hf_ubx_nav_pvt_fixtype;
+static int hf_ubx_nav_pvt_headvehvalid;
+static int hf_ubx_nav_pvt_psmstate;
+static int hf_ubx_nav_pvt_diffsoln;
+static int hf_ubx_nav_pvt_gnssfixok;
+static int hf_ubx_nav_pvt_confirmedtime;
+static int hf_ubx_nav_pvt_confirmeddate;
+static int hf_ubx_nav_pvt_confirmedavai;
+static int hf_ubx_nav_pvt_numsv;
+static int hf_ubx_nav_pvt_lon;
+static int hf_ubx_nav_pvt_lat;
+static int hf_ubx_nav_pvt_height;
+static int hf_ubx_nav_pvt_hmsl;
+static int hf_ubx_nav_pvt_hacc;
+static int hf_ubx_nav_pvt_vacc;
+static int hf_ubx_nav_pvt_veln;
+static int hf_ubx_nav_pvt_vele;
+static int hf_ubx_nav_pvt_veld;
+static int hf_ubx_nav_pvt_gspeed;
+static int hf_ubx_nav_pvt_headmot;
+static int hf_ubx_nav_pvt_sacc;
+static int hf_ubx_nav_pvt_headacc;
+static int hf_ubx_nav_pvt_pdop;
+static int hf_ubx_nav_pvt_lastcorrectionage;
+static int hf_ubx_nav_pvt_invalidllh;
+static int hf_ubx_nav_pvt_reserved1;
+static int hf_ubx_nav_pvt_headveh;
+static int hf_ubx_nav_pvt_magdec;
+static int hf_ubx_nav_pvt_magacc;
+
+static int hf_ubx_nav_sat;
+static int hf_ubx_nav_sat_itow;
+static int hf_ubx_nav_sat_version;
+static int hf_ubx_nav_sat_num_svs;
+static int hf_ubx_nav_sat_reserved1;
+static int hf_ubx_nav_sat_gnss_id;
+static int hf_ubx_nav_sat_sv_id;
+static int hf_ubx_nav_sat_cn0;
+static int hf_ubx_nav_sat_elev;
+static int hf_ubx_nav_sat_azim;
+static int hf_ubx_nav_sat_pr_res;
+static int hf_ubx_nav_sat_quality_ind;
+static int hf_ubx_nav_sat_sv_used;
+static int hf_ubx_nav_sat_health;
+static int hf_ubx_nav_sat_diff_corr;
+static int hf_ubx_nav_sat_smoothed;
+static int hf_ubx_nav_sat_orbit_src;
+static int hf_ubx_nav_sat_eph_avail;
+static int hf_ubx_nav_sat_alm_avail;
+static int hf_ubx_nav_sat_ano_avail;
+static int hf_ubx_nav_sat_aop_avail;
+static int hf_ubx_nav_sat_sbas_corr_used;
+static int hf_ubx_nav_sat_rtcm_corr_used;
+static int hf_ubx_nav_sat_slas_corr_used;
+static int hf_ubx_nav_sat_spartn_corr_used;
+static int hf_ubx_nav_sat_pr_corr_used;
+static int hf_ubx_nav_sat_cr_corr_used;
+static int hf_ubx_nav_sat_do_corr_used;
+static int hf_ubx_nav_sat_clas_corr_used;
+
+static int hf_ubx_nav_timegps;
+static int hf_ubx_nav_timegps_itow;
+static int hf_ubx_nav_timegps_ftow;
+static int hf_ubx_nav_timegps_week;
+static int hf_ubx_nav_timegps_leaps;
+static int hf_ubx_nav_timegps_leapsvalid;
+static int hf_ubx_nav_timegps_weekvalid;
+static int hf_ubx_nav_timegps_towvalid;
+static int hf_ubx_nav_timegps_tacc;
+
+static int hf_ubx_nav_velecef;
+static int hf_ubx_nav_velecef_itow;
+static int hf_ubx_nav_velecef_ecefvx;
+static int hf_ubx_nav_velecef_ecefvy;
+static int hf_ubx_nav_velecef_ecefvz;
+static int hf_ubx_nav_velecef_sacc;
+
+static int hf_ubx_rxm_sfrbx;
+static int hf_ubx_rxm_sfrbx_gnssid;
+static int hf_ubx_rxm_sfrbx_svid;
+static int hf_ubx_rxm_sfrbx_sigid;
+static int hf_ubx_rxm_sfrbx_freqid;
+static int hf_ubx_rxm_sfrbx_numwords;
+static int hf_ubx_rxm_sfrbx_chn;
+static int hf_ubx_rxm_sfrbx_version;
+static int hf_ubx_rxm_sfrbx_dwrd;
+static int hf_ubx_rxm_sfrbx_reserved1;
+static int hf_ubx_rxm_sfrbx_reserved2;
+static int hf_ubx_rxm_sfrbx_reserved3;
 
 static dissector_table_t ubx_class_id_dissector_table;
 static dissector_table_t ubx_gnssid_dissector_table;
 
-static expert_field ei_ubx_chksum = EI_INIT;
+static expert_field ei_ubx_chksum;
 
-static int ett_ubx                   = -1;
-static int ett_ubx_nav_dop           = -1;
-static int ett_ubx_nav_eoe           = -1;
-static int ett_ubx_nav_posecef       = -1;
-static int ett_ubx_nav_pvt           = -1;
-static int ett_ubx_nav_pvt_datetime  = -1;
-static int ett_ubx_nav_sat           = -1;
+static int ett_ubx;
+static int ett_ubx_nav_dop;
+static int ett_ubx_nav_eoe;
+static int ett_ubx_nav_posecef;
+static int ett_ubx_nav_pvt;
+static int ett_ubx_nav_pvt_datetime;
+static int ett_ubx_nav_sat;
 static int ett_ubx_nav_sat_sv_info[309];
-static int ett_ubx_nav_timegps       = -1;
-static int ett_ubx_nav_timegps_tow   = -1;
-static int ett_ubx_nav_velecef       = -1;
-static int ett_ubx_rxm_sfrbx = -1;
+static int ett_ubx_nav_timegps;
+static int ett_ubx_nav_timegps_tow;
+static int ett_ubx_nav_velecef;
+static int ett_ubx_rxm_sfrbx;
 
 static dissector_handle_t ubx_handle;
 
diff --git a/epan/dissectors/packet-uci.c b/epan/dissectors/packet-uci.c
index 42dd2f1aef..0b45255239 100644
--- a/epan/dissectors/packet-uci.c
+++ b/epan/dissectors/packet-uci.c
@@ -183,82 +183,82 @@ void proto_register_uci(void);
 static gboolean gPREF_TCP_DESEGMENT = TRUE;
 static guint gPREF_TCP_PORT = 7000;
 
-static int proto_uci = -1;
+static int proto_uci;
 static dissector_handle_t handle_uci = NULL;
 
-static int hf_uci_message_type = -1;
-static int hf_uci_packet_boundary_flag = -1;
-static int hf_uci_group_id = -1;
-static int hf_uci_opcode_id = -1;
-static int hf_uci_payload_length = -1;
-static int hf_uci_status = -1;
-static int hf_uci_reset_config = -1;
-static int hf_uci_device_state = -1;
-static int hf_uci_generic_version = -1;
-static int hf_uci_version_major = -1;
-static int hf_uci_version_minor = -1;
-static int hf_uci_maintenance_number = -1;
-static int hf_uci_mac_version = -1;
-static int hf_uci_phy_version = -1;
-static int hf_uci_test_version = -1;
-static int hf_uci_vendor_specific_information_length = -1;
-static int hf_uci_vendor_specific_information = -1;
-static int hf_uci_capability_parameters_count = -1;
-static int hf_uci_capability_parameter_type = -1;
-static int hf_uci_capability_parameter_len = -1;
-static int hf_uci_capability_parameter_value = -1;
-static int hf_uci_parameters_count = -1;
-static int hf_uci_parameter_type = -1;
-static int hf_uci_parameter_len = -1;
-static int hf_uci_parameter_value = -1;
-static int hf_uci_parameter_status = -1;
-static int hf_uci_session_id = -1;
-static int hf_uci_session_type = -1;
-static int hf_uci_session_state = -1;
-static int hf_uci_session_count = -1;
-static int hf_uci_app_config_parameters_count = -1;
-static int hf_uci_app_config_parameter_type = -1;
-static int hf_uci_app_config_parameter_len = -1;
-static int hf_uci_app_config_parameter_value = -1;
-static int hf_uci_app_config_parameter_status = -1;
-static int hf_uci_update_controller_multicast_list_action = -1;
-static int hf_uci_controlees_count = -1;
-static int hf_uci_controlee_short_address = -1;
-static int hf_uci_controlee_subsession_id = -1;
-static int hf_uci_controlee_status = -1;
-static int hf_uci_remaining_multicast_list_size = -1;
-static int hf_uci_ranging_count = -1;
-static int hf_uci_sequence_number = -1;
-static int hf_uci_current_ranging_interval = -1;
-static int hf_uci_ranging_measurement_type = -1;
-static int hf_uci_mac_addressing_mode_indicator = -1;
-static int hf_uci_ranging_measurement_count = -1;
-static int hf_uci_mac_address = -1;
-static int hf_uci_nlos = -1;
-static int hf_uci_distance = -1;
-static int hf_uci_aoa_azimuth = -1;
-static int hf_uci_aoa_azimuth_fom = -1;
-static int hf_uci_aoa_elevation = -1;
-static int hf_uci_aoa_elevation_fom = -1;
-static int hf_uci_aoa_destination_azimuth = -1;
-static int hf_uci_aoa_destination_azimuth_fom = -1;
-static int hf_uci_aoa_destination_elevation = -1;
-static int hf_uci_aoa_destination_elevation_fom = -1;
-static int hf_uci_slot_index = -1;
-
-static gint ett_uci = -1;
-static gint ett_uci_header = -1;
-static gint ett_uci_payload = -1;
-static gint ett_uci_capability_parameters = -1;
-static gint ett_uci_capability_parameter = -1;
-static gint ett_uci_parameters = -1;
-static gint ett_uci_parameter = -1;
-static gint ett_uci_app_config_parameters = -1;
-static gint ett_uci_app_config_parameter = -1;
-static gint ett_uci_controlee_list = -1;
-static gint ett_uci_controlee = -1;
-static gint ett_uci_ranging_measurements = -1;
-static gint ett_uci_ranging_measurement = -1;
+static int hf_uci_message_type;
+static int hf_uci_packet_boundary_flag;
+static int hf_uci_group_id;
+static int hf_uci_opcode_id;
+static int hf_uci_payload_length;
+static int hf_uci_status;
+static int hf_uci_reset_config;
+static int hf_uci_device_state;
+static int hf_uci_generic_version;
+static int hf_uci_version_major;
+static int hf_uci_version_minor;
+static int hf_uci_maintenance_number;
+static int hf_uci_mac_version;
+static int hf_uci_phy_version;
+static int hf_uci_test_version;
+static int hf_uci_vendor_specific_information_length;
+static int hf_uci_vendor_specific_information;
+static int hf_uci_capability_parameters_count;
+static int hf_uci_capability_parameter_type;
+static int hf_uci_capability_parameter_len;
+static int hf_uci_capability_parameter_value;
+static int hf_uci_parameters_count;
+static int hf_uci_parameter_type;
+static int hf_uci_parameter_len;
+static int hf_uci_parameter_value;
+static int hf_uci_parameter_status;
+static int hf_uci_session_id;
+static int hf_uci_session_type;
+static int hf_uci_session_state;
+static int hf_uci_session_count;
+static int hf_uci_app_config_parameters_count;
+static int hf_uci_app_config_parameter_type;
+static int hf_uci_app_config_parameter_len;
+static int hf_uci_app_config_parameter_value;
+static int hf_uci_app_config_parameter_status;
+static int hf_uci_update_controller_multicast_list_action;
+static int hf_uci_controlees_count;
+static int hf_uci_controlee_short_address;
+static int hf_uci_controlee_subsession_id;
+static int hf_uci_controlee_status;
+static int hf_uci_remaining_multicast_list_size;
+static int hf_uci_ranging_count;
+static int hf_uci_sequence_number;
+static int hf_uci_current_ranging_interval;
+static int hf_uci_ranging_measurement_type;
+static int hf_uci_mac_addressing_mode_indicator;
+static int hf_uci_ranging_measurement_count;
+static int hf_uci_mac_address;
+static int hf_uci_nlos;
+static int hf_uci_distance;
+static int hf_uci_aoa_azimuth;
+static int hf_uci_aoa_azimuth_fom;
+static int hf_uci_aoa_elevation;
+static int hf_uci_aoa_elevation_fom;
+static int hf_uci_aoa_destination_azimuth;
+static int hf_uci_aoa_destination_azimuth_fom;
+static int hf_uci_aoa_destination_elevation;
+static int hf_uci_aoa_destination_elevation_fom;
+static int hf_uci_slot_index;
+
+static gint ett_uci;
+static gint ett_uci_header;
+static gint ett_uci_payload;
+static gint ett_uci_capability_parameters;
+static gint ett_uci_capability_parameter;
+static gint ett_uci_parameters;
+static gint ett_uci_parameter;
+static gint ett_uci_app_config_parameters;
+static gint ett_uci_app_config_parameter;
+static gint ett_uci_controlee_list;
+static gint ett_uci_controlee;
+static gint ett_uci_ranging_measurements;
+static gint ett_uci_ranging_measurement;
 
 static const value_string message_type_vals[] = {
     { UCI_MT_COMMAND, "Command" },
diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c
index 5032b831ba..a224e2f057 100644
--- a/epan/dissectors/packet-ucp.c
+++ b/epan/dissectors/packet-ucp.c
@@ -80,12 +80,12 @@ static  dissector_handle_t ucp_handle;
  *
  * Header (fixed) section
  */
-static int proto_ucp             = -1;
+static int proto_ucp;
 
-static int hf_ucp_hdr_TRN        = -1;
-static int hf_ucp_hdr_LEN        = -1;
-static int hf_ucp_hdr_O_R        = -1;
-static int hf_ucp_hdr_OT         = -1;
+static int hf_ucp_hdr_TRN;
+static int hf_ucp_hdr_LEN;
+static int hf_ucp_hdr_O_R;
+static int hf_ucp_hdr_OT;
 
 /*
  * Stats section
@@ -107,121 +107,121 @@ static const gchar st_str_neg[]     = "Negative";
 /*
  * Data (variable) section
  */
-static int hf_ucp_oper_section   = -1;
-static int hf_ucp_parm_AdC       = -1;
-static int hf_ucp_parm_OAdC      = -1;
-static int hf_ucp_parm_DAdC      = -1;
-static int hf_ucp_parm_AC        = -1;
-static int hf_ucp_parm_OAC       = -1;
-static int hf_ucp_parm_BAS       = -1;
-static int hf_ucp_parm_LAR       = -1;
-static int hf_ucp_parm_LAC       = -1;
-static int hf_ucp_parm_L1R       = -1;
-static int hf_ucp_parm_L1P       = -1;
-static int hf_ucp_parm_L3R       = -1;
-static int hf_ucp_parm_L3P       = -1;
-static int hf_ucp_parm_LCR       = -1;
-static int hf_ucp_parm_LUR       = -1;
-static int hf_ucp_parm_LRR       = -1;
-static int hf_ucp_parm_RT        = -1;
-static int hf_ucp_parm_NoN       = -1;
-static int hf_ucp_parm_NoA       = -1;
-static int hf_ucp_parm_NoB       = -1;
-static int hf_ucp_parm_NAC       = -1;
-static int hf_ucp_parm_PNC       = -1;
-static int hf_ucp_parm_AMsg      = -1;
-static int hf_ucp_parm_LNo       = -1;
-static int hf_ucp_parm_LST       = -1;
-static int hf_ucp_parm_TNo       = -1;
-static int hf_ucp_parm_CS        = -1;
-static int hf_ucp_parm_PID       = -1;
-static int hf_ucp_parm_NPL       = -1;
-static int hf_ucp_parm_GA        = -1;
-static int hf_ucp_parm_RP        = -1;
-static int hf_ucp_parm_LRP       = -1;
-static int hf_ucp_parm_PR        = -1;
-static int hf_ucp_parm_LPR       = -1;
-static int hf_ucp_parm_UM        = -1;
-static int hf_ucp_parm_LUM       = -1;
-static int hf_ucp_parm_RC        = -1;
-static int hf_ucp_parm_LRC       = -1;
-static int hf_ucp_parm_NRq       = -1;
-static int hf_ucp_parm_GAdC      = -1;
-static int hf_ucp_parm_A_D       = -1;
-static int hf_ucp_parm_CT        = -1;
-static int hf_ucp_parm_AAC       = -1;
-static int hf_ucp_parm_MNo       = -1;
-static int hf_ucp_parm_R_T       = -1;
-static int hf_ucp_parm_IVR5x     = -1;
-static int hf_ucp_parm_REQ_OT    = -1;
-static int hf_ucp_parm_SSTAT     = -1;
-static int hf_ucp_parm_LMN       = -1;
-static int hf_ucp_parm_NMESS     = -1;
-static int hf_ucp_parm_NAdC      = -1;
-static int hf_ucp_parm_NT        = -1;
-static int hf_ucp_parm_NPID      = -1;
-static int hf_ucp_parm_LRq       = -1;
-static int hf_ucp_parm_LRAd      = -1;
-static int hf_ucp_parm_LPID      = -1;
-static int hf_ucp_parm_DD        = -1;
-static int hf_ucp_parm_DDT       = -1;
-static int hf_ucp_parm_STx       = -1;
-static int hf_ucp_parm_ST        = -1;
-static int hf_ucp_parm_SP        = -1;
-static int hf_ucp_parm_VP        = -1;
-static int hf_ucp_parm_RPID      = -1;
-static int hf_ucp_parm_SCTS      = -1;
-static int hf_ucp_parm_Dst       = -1;
-static int hf_ucp_parm_Rsn       = -1;
-static int hf_ucp_parm_DSCTS     = -1;
-static int hf_ucp_parm_MT        = -1;
-static int hf_ucp_parm_NB        = -1;
-static int hf_ucp_data_section   = -1;
-static int hf_ucp_parm_MMS       = -1;
-static int hf_ucp_parm_DCs       = -1;
-static int hf_ucp_parm_MCLs      = -1;
-static int hf_ucp_parm_RPI       = -1;
-static int hf_ucp_parm_CPg       = -1;
-static int hf_ucp_parm_RPLy      = -1;
-static int hf_ucp_parm_OTOA      = -1;
-static int hf_ucp_parm_HPLMN     = -1;
-static int hf_ucp_parm_RES4      = -1;
-static int hf_ucp_parm_RES5      = -1;
-static int hf_ucp_parm_OTON      = -1;
-static int hf_ucp_parm_ONPI      = -1;
-static int hf_ucp_parm_STYP0     = -1;
-static int hf_ucp_parm_STYP1     = -1;
-static int hf_ucp_parm_ACK       = -1;
-static int hf_ucp_parm_PWD       = -1;
-static int hf_ucp_parm_NPWD      = -1;
-static int hf_ucp_parm_VERS      = -1;
-static int hf_ucp_parm_LAdC      = -1;
-static int hf_ucp_parm_LTON      = -1;
-static int hf_ucp_parm_LNPI      = -1;
-static int hf_ucp_parm_OPID      = -1;
-static int hf_ucp_parm_RES1      = -1;
-static int hf_ucp_parm_RES2      = -1;
-static int hf_ucp_parm_MVP       = -1;
-static int hf_ucp_parm_EC        = -1;
-static int hf_ucp_parm_SM        = -1;
-static int hf_ucp_not_subscribed = -1;
-static int hf_ucp_ga_roaming     = -1;
-static int hf_ucp_call_barring   = -1;
-static int hf_ucp_deferred_delivery = -1;
-static int hf_ucp_diversion      = -1;
-
-static int hf_ucp_parm_XSer      = -1;
-static int hf_xser_service       = -1;
-static int hf_xser_length        = -1;
-static int hf_xser_data          = -1;
+static int hf_ucp_oper_section;
+static int hf_ucp_parm_AdC;
+static int hf_ucp_parm_OAdC;
+static int hf_ucp_parm_DAdC;
+static int hf_ucp_parm_AC;
+static int hf_ucp_parm_OAC;
+static int hf_ucp_parm_BAS;
+static int hf_ucp_parm_LAR;
+static int hf_ucp_parm_LAC;
+static int hf_ucp_parm_L1R;
+static int hf_ucp_parm_L1P;
+static int hf_ucp_parm_L3R;
+static int hf_ucp_parm_L3P;
+static int hf_ucp_parm_LCR;
+static int hf_ucp_parm_LUR;
+static int hf_ucp_parm_LRR;
+static int hf_ucp_parm_RT;
+static int hf_ucp_parm_NoN;
+static int hf_ucp_parm_NoA;
+static int hf_ucp_parm_NoB;
+static int hf_ucp_parm_NAC;
+static int hf_ucp_parm_PNC;
+static int hf_ucp_parm_AMsg;
+static int hf_ucp_parm_LNo;
+static int hf_ucp_parm_LST;
+static int hf_ucp_parm_TNo;
+static int hf_ucp_parm_CS;
+static int hf_ucp_parm_PID;
+static int hf_ucp_parm_NPL;
+static int hf_ucp_parm_GA;
+static int hf_ucp_parm_RP;
+static int hf_ucp_parm_LRP;
+static int hf_ucp_parm_PR;
+static int hf_ucp_parm_LPR;
+static int hf_ucp_parm_UM;
+static int hf_ucp_parm_LUM;
+static int hf_ucp_parm_RC;
+static int hf_ucp_parm_LRC;
+static int hf_ucp_parm_NRq;
+static int hf_ucp_parm_GAdC;
+static int hf_ucp_parm_A_D;
+static int hf_ucp_parm_CT;
+static int hf_ucp_parm_AAC;
+static int hf_ucp_parm_MNo;
+static int hf_ucp_parm_R_T;
+static int hf_ucp_parm_IVR5x;
+static int hf_ucp_parm_REQ_OT;
+static int hf_ucp_parm_SSTAT;
+static int hf_ucp_parm_LMN;
+static int hf_ucp_parm_NMESS;
+static int hf_ucp_parm_NAdC;
+static int hf_ucp_parm_NT;
+static int hf_ucp_parm_NPID;
+static int hf_ucp_parm_LRq;
+static int hf_ucp_parm_LRAd;
+static int hf_ucp_parm_LPID;
+static int hf_ucp_parm_DD;
+static int hf_ucp_parm_DDT;
+static int hf_ucp_parm_STx;
+static int hf_ucp_parm_ST;
+static int hf_ucp_parm_SP;
+static int hf_ucp_parm_VP;
+static int hf_ucp_parm_RPID;
+static int hf_ucp_parm_SCTS;
+static int hf_ucp_parm_Dst;
+static int hf_ucp_parm_Rsn;
+static int hf_ucp_parm_DSCTS;
+static int hf_ucp_parm_MT;
+static int hf_ucp_parm_NB;
+static int hf_ucp_data_section;
+static int hf_ucp_parm_MMS;
+static int hf_ucp_parm_DCs;
+static int hf_ucp_parm_MCLs;
+static int hf_ucp_parm_RPI;
+static int hf_ucp_parm_CPg;
+static int hf_ucp_parm_RPLy;
+static int hf_ucp_parm_OTOA;
+static int hf_ucp_parm_HPLMN;
+static int hf_ucp_parm_RES4;
+static int hf_ucp_parm_RES5;
+static int hf_ucp_parm_OTON;
+static int hf_ucp_parm_ONPI;
+static int hf_ucp_parm_STYP0;
+static int hf_ucp_parm_STYP1;
+static int hf_ucp_parm_ACK;
+static int hf_ucp_parm_PWD;
+static int hf_ucp_parm_NPWD;
+static int hf_ucp_parm_VERS;
+static int hf_ucp_parm_LAdC;
+static int hf_ucp_parm_LTON;
+static int hf_ucp_parm_LNPI;
+static int hf_ucp_parm_OPID;
+static int hf_ucp_parm_RES1;
+static int hf_ucp_parm_RES2;
+static int hf_ucp_parm_MVP;
+static int hf_ucp_parm_EC;
+static int hf_ucp_parm_SM;
+static int hf_ucp_not_subscribed;
+static int hf_ucp_ga_roaming;
+static int hf_ucp_call_barring;
+static int hf_ucp_deferred_delivery;
+static int hf_ucp_diversion;
+
+static int hf_ucp_parm_XSer;
+static int hf_xser_service;
+static int hf_xser_length;
+static int hf_xser_data;
 
 /* Initialize the subtree pointers */
-static gint ett_ucp              = -1;
-static gint ett_sub              = -1;
-static gint ett_XSer             = -1;
+static gint ett_ucp;
+static gint ett_sub;
+static gint ett_XSer;
 
-static expert_field ei_ucp_stx_missing = EI_INIT;
-static expert_field ei_ucp_intstring_invalid = EI_INIT;
+static expert_field ei_ucp_stx_missing;
+static expert_field ei_ucp_intstring_invalid;
 
 /* Tap */
 static int ucp_tap               = -1;
diff --git a/epan/dissectors/packet-udld.c b/epan/dissectors/packet-udld.c
index b9e2de993b..11612ecaaf 100644
--- a/epan/dissectors/packet-udld.c
+++ b/epan/dissectors/packet-udld.c
@@ -31,25 +31,25 @@ void proto_reg_handoff_udld(void);
 
 static dissector_handle_t udld_handle;
 
-static int proto_udld = -1;
-static int hf_udld_version = -1;
-static int hf_udld_opcode = -1;
-static int hf_udld_flags = -1;
-static int hf_udld_flags_rt = -1;
-static int hf_udld_flags_rsy = -1;
-static int hf_udld_checksum = -1;
-static int hf_udld_tlvtype = -1;
-static int hf_udld_tlvlength = -1;
-static int hf_udld_device_id = -1;
-static int hf_udld_sent_through_interface = -1;
-static int hf_udld_data = -1;
-
-
-static expert_field ei_udld_tlvlength = EI_INIT;
-
-static gint ett_udld = -1;
-static gint ett_udld_flags = -1;
-static gint ett_udld_tlv = -1;
+static int proto_udld;
+static int hf_udld_version;
+static int hf_udld_opcode;
+static int hf_udld_flags;
+static int hf_udld_flags_rt;
+static int hf_udld_flags_rsy;
+static int hf_udld_checksum;
+static int hf_udld_tlvtype;
+static int hf_udld_tlvlength;
+static int hf_udld_device_id;
+static int hf_udld_sent_through_interface;
+static int hf_udld_data;
+
+
+static expert_field ei_udld_tlvlength;
+
+static gint ett_udld;
+static gint ett_udld_flags;
+static gint ett_udld_tlv;
 
 #define TYPE_DEVICE_ID        0x0001
 #define TYPE_PORT_ID          0x0002
diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c
index 4dc2dff95f..638505b3c6 100644
--- a/epan/dissectors/packet-udp.c
+++ b/epan/dissectors/packet-udp.c
@@ -47,43 +47,43 @@ static int udp_tap = -1;
 static int udp_follow_tap = -1;
 static int exported_pdu_tap = -1;
 
-static int proto_udp = -1;
-static int proto_udplite = -1;
-
-static int hf_udp_checksum = -1;
-static int hf_udp_checksum_calculated = -1;
-static int hf_udp_checksum_status = -1;
-static int hf_udp_dstport = -1;
-static int hf_udp_length = -1;
-static int hf_udp_payload = -1;
-static int hf_udp_pdu_size = -1;
-static int hf_udp_port = -1;
-static int hf_udp_proc_dst_cmd = -1;
-static int hf_udp_proc_dst_pid = -1;
-static int hf_udp_proc_dst_uid = -1;
-static int hf_udp_proc_dst_uname = -1;
-static int hf_udp_proc_src_cmd = -1;
-static int hf_udp_proc_src_pid = -1;
-static int hf_udp_proc_src_uid = -1;
-static int hf_udp_proc_src_uname = -1;
-static int hf_udp_srcport = -1;
-static int hf_udp_stream = -1;
-static int hf_udp_ts_delta = -1;
-static int hf_udp_ts_relative = -1;
-static int hf_udplite_checksum_coverage = -1;
-
-static gint ett_udp = -1;
-static gint ett_udp_checksum = -1;
-static gint ett_udp_process_info = -1;
-static gint ett_udp_timestamps = -1;
-
-static expert_field ei_udp_possible_traceroute = EI_INIT;
-static expert_field ei_udp_length_bad = EI_INIT;
-static expert_field ei_udplite_checksum_coverage_bad = EI_INIT;
-static expert_field ei_udp_checksum_zero = EI_INIT;
-static expert_field ei_udp_checksum_partial = EI_INIT;
-static expert_field ei_udp_checksum_bad = EI_INIT;
-static expert_field ei_udp_length_bad_zero = EI_INIT;
+static int proto_udp;
+static int proto_udplite;
+
+static int hf_udp_checksum;
+static int hf_udp_checksum_calculated;
+static int hf_udp_checksum_status;
+static int hf_udp_dstport;
+static int hf_udp_length;
+static int hf_udp_payload;
+static int hf_udp_pdu_size;
+static int hf_udp_port;
+static int hf_udp_proc_dst_cmd;
+static int hf_udp_proc_dst_pid;
+static int hf_udp_proc_dst_uid;
+static int hf_udp_proc_dst_uname;
+static int hf_udp_proc_src_cmd;
+static int hf_udp_proc_src_pid;
+static int hf_udp_proc_src_uid;
+static int hf_udp_proc_src_uname;
+static int hf_udp_srcport;
+static int hf_udp_stream;
+static int hf_udp_ts_delta;
+static int hf_udp_ts_relative;
+static int hf_udplite_checksum_coverage;
+
+static gint ett_udp;
+static gint ett_udp_checksum;
+static gint ett_udp_process_info;
+static gint ett_udp_timestamps;
+
+static expert_field ei_udp_possible_traceroute;
+static expert_field ei_udp_length_bad;
+static expert_field ei_udplite_checksum_coverage_bad;
+static expert_field ei_udp_checksum_zero;
+static expert_field ei_udp_checksum_partial;
+static expert_field ei_udp_checksum_bad;
+static expert_field ei_udp_length_bad_zero;
 
 /* Preferences */
 
diff --git a/epan/dissectors/packet-udpcp.c b/epan/dissectors/packet-udpcp.c
index 4122157b45..9c53092182 100644
--- a/epan/dissectors/packet-udpcp.c
+++ b/epan/dissectors/packet-udpcp.c
@@ -26,50 +26,50 @@
 
 void proto_register_udpcp(void);
 
-static int proto_udpcp = -1;
+static int proto_udpcp;
 
-static int hf_udpcp_checksum = -1;
-static int hf_udpcp_msg_type = -1;
-static int hf_udpcp_version = -1;
+static int hf_udpcp_checksum;
+static int hf_udpcp_msg_type;
+static int hf_udpcp_version;
 
-static int hf_udpcp_packet_transfer_options = -1;
-static int hf_udpcp_n = -1;
-static int hf_udpcp_c = -1;
-static int hf_udpcp_s = -1;
-static int hf_udpcp_d = -1;
-static int hf_udpcp_reserved = -1;
+static int hf_udpcp_packet_transfer_options;
+static int hf_udpcp_n;
+static int hf_udpcp_c;
+static int hf_udpcp_s;
+static int hf_udpcp_d;
+static int hf_udpcp_reserved;
 
-static int hf_udpcp_fragment_amount = -1;
-static int hf_udpcp_fragment_number = -1;
+static int hf_udpcp_fragment_amount;
+static int hf_udpcp_fragment_number;
 
-static int hf_udpcp_message_id = -1;
-static int hf_udpcp_message_data_length = -1;
+static int hf_udpcp_message_id;
+static int hf_udpcp_message_data_length;
 
-static int hf_udpcp_payload = -1;
+static int hf_udpcp_payload;
 
-static int hf_udpcp_ack_frame = -1;
-static int hf_udpcp_sn_frame = -1;
+static int hf_udpcp_ack_frame;
+static int hf_udpcp_sn_frame;
 
 
 /* For reassembly */
-static int hf_udpcp_fragments = -1;
-static int hf_udpcp_fragment = -1;
-static int hf_udpcp_fragment_overlap = -1;
-static int hf_udpcp_fragment_overlap_conflict = -1;
-static int hf_udpcp_fragment_multiple_tails = -1;
-static int hf_udpcp_fragment_too_long_fragment = -1;
-static int hf_udpcp_fragment_error = -1;
-static int hf_udpcp_fragment_count = -1;
-static int hf_udpcp_reassembled_in = -1;
-static int hf_udpcp_reassembled_length = -1;
-static int hf_udpcp_reassembled_data = -1;
+static int hf_udpcp_fragments;
+static int hf_udpcp_fragment;
+static int hf_udpcp_fragment_overlap;
+static int hf_udpcp_fragment_overlap_conflict;
+static int hf_udpcp_fragment_multiple_tails;
+static int hf_udpcp_fragment_too_long_fragment;
+static int hf_udpcp_fragment_error;
+static int hf_udpcp_fragment_count;
+static int hf_udpcp_reassembled_in;
+static int hf_udpcp_reassembled_length;
+static int hf_udpcp_reassembled_data;
 
 
 /* Subtrees */
-static gint ett_udpcp = -1;
-static gint ett_udpcp_packet_transfer_options = -1;
-static gint ett_udpcp_fragments = -1;
-static gint ett_udpcp_fragment  = -1;
+static gint ett_udpcp;
+static gint ett_udpcp_packet_transfer_options;
+static gint ett_udpcp_fragments;
+static gint ett_udpcp_fragment;
 
 static const fragment_items udpcp_frag_items = {
   &ett_udpcp_fragment,
@@ -89,14 +89,14 @@ static const fragment_items udpcp_frag_items = {
 };
 
 
-static expert_field ei_udpcp_checksum_should_be_zero = EI_INIT;
-static expert_field ei_udpcp_d_not_zero_for_data = EI_INIT;
-static expert_field ei_udpcp_reserved_not_zero = EI_INIT;
-static expert_field ei_udpcp_n_s_ack = EI_INIT;
-static expert_field ei_udpcp_payload_wrong_size = EI_INIT;
-static expert_field ei_udpcp_wrong_sequence_number = EI_INIT;
-static expert_field ei_udpcp_no_ack = EI_INIT;
-static expert_field ei_udpcp_no_sn_frame = EI_INIT;
+static expert_field ei_udpcp_checksum_should_be_zero;
+static expert_field ei_udpcp_d_not_zero_for_data;
+static expert_field ei_udpcp_reserved_not_zero;
+static expert_field ei_udpcp_n_s_ack;
+static expert_field ei_udpcp_payload_wrong_size;
+static expert_field ei_udpcp_wrong_sequence_number;
+static expert_field ei_udpcp_no_ack;
+static expert_field ei_udpcp_no_sn_frame;
 
 static dissector_handle_t udpcp_handle;
 
diff --git a/epan/dissectors/packet-uds.c b/epan/dissectors/packet-uds.c
index f4789e14dd..1a18af8a82 100644
--- a/epan/dissectors/packet-uds.c
+++ b/epan/dissectors/packet-uds.c
@@ -838,241 +838,241 @@ static const value_string uds_standard_dtc_types[] = {
  * Fields
  */
 
-static int hf_uds_diag_addr = -1;
-static int hf_uds_diag_addr_name = -1;
-static int hf_uds_diag_source_addr = -1;
-static int hf_uds_diag_source_addr_name = -1;
-static int hf_uds_diag_target_addr = -1;
-static int hf_uds_diag_target_addr_name = -1;
-
-static int hf_uds_service = -1;
-static int hf_uds_reply = -1;
-
-static int hf_uds_subfunction = -1;
-static int hf_uds_suppress_pos_rsp_msg_ind = -1;
-static int hf_uds_data_record = -1;
-
-static int hf_uds_compression_method = -1;
-static int hf_uds_encrypting_method = -1;
-static int hf_uds_memory_size_length = -1;
-static int hf_uds_memory_address_length = -1;
-static int hf_uds_memory_address = -1;
-static int hf_uds_memory_size = -1;
-static int hf_uds_max_block_len_len = -1;
-static int hf_uds_max_block_len = -1;
-
-static int hf_uds_dsc_subfunction = -1;
-static int hf_uds_dsc_suppress_pos_rsp_msg_ind = -1;
-static int hf_uds_dsc_parameter_record = -1;
-static int hf_uds_dsc_default_p2_server_timer = -1;
-static int hf_uds_dsc_enhanced_p2_server_timer = -1;
-
-static int hf_uds_er_subfunction = -1;
-static int hf_uds_er_power_down_time = -1;
-
-static int hf_uds_cdtci_group_of_dtc = -1;
-static int hf_uds_cdtci_memory_selection = -1;
-
-static int hf_uds_rdtci_subfunction = -1;
-static int hf_uds_rdtci_dtc_status_mask = -1;
-static int hf_uds_rdtci_dtc_status_mask_tf = -1;
-static int hf_uds_rdtci_dtc_status_mask_tftoc = -1;
-static int hf_uds_rdtci_dtc_status_mask_pdtc = -1;
-static int hf_uds_rdtci_dtc_status_mask_cdtc = -1;
-static int hf_uds_rdtci_dtc_status_mask_tncslc = -1;
-static int hf_uds_rdtci_dtc_status_mask_tfslc = -1;
-static int hf_uds_rdtci_dtc_status_mask_tnctoc = -1;
-static int hf_uds_rdtci_dtc_status_mask_wir = -1;
-static int hf_uds_rdtci_dtc_mask_record = -1;
-static int hf_uds_rdtci_dtc_snapshot_rec_no = -1;
-static int hf_uds_rdtci_dtc_stored_data_rec_no = -1;
-static int hf_uds_rdtci_dtc_ext_data_rec_no = -1;
-static int hf_uds_rdtci_memory_selection = -1;
-static int hf_uds_rdtci_user_def_dtc_snapshot_rec_no = -1;
-static int hf_uds_rdtci_dtc_severity_mask = -1;
-static int hf_uds_rdtci_functional_group_id = -1;
-static int hf_uds_rdtci_dtc_readiness_group_id = -1;
-static int hf_uds_rdtci_dtc_status_avail = -1;
-static int hf_uds_rdtci_dtc_status_avail_tf = -1;
-static int hf_uds_rdtci_dtc_status_avail_tftoc = -1;
-static int hf_uds_rdtci_dtc_status_avail_pdtc = -1;
-static int hf_uds_rdtci_dtc_status_avail_cdtc = -1;
-static int hf_uds_rdtci_dtc_status_avail_tncslc = -1;
-static int hf_uds_rdtci_dtc_status_avail_tfslc = -1;
-static int hf_uds_rdtci_dtc_status_avail_tnctoc = -1;
-static int hf_uds_rdtci_dtc_status_avail_wir = -1;
-static int hf_uds_rdtci_dtc_id = -1;
-static int hf_uds_rdtci_dtc_status = -1;
-static int hf_uds_rdtci_dtc_status_tf = -1;
-static int hf_uds_rdtci_dtc_status_tftoc = -1;
-static int hf_uds_rdtci_dtc_status_pdtc = -1;
-static int hf_uds_rdtci_dtc_status_cdtc = -1;
-static int hf_uds_rdtci_dtc_status_tncslc = -1;
-static int hf_uds_rdtci_dtc_status_tfslc = -1;
-static int hf_uds_rdtci_dtc_status_tnctoc = -1;
-static int hf_uds_rdtci_dtc_status_wir = -1;
-static int hf_uds_rdtci_dtc_format_id = -1;
-static int hf_uds_rdtci_dtc_count = -1;
-static int hf_uds_rdtci_dtc_snapshot_record_number_of_ids = -1;
-static int hf_uds_rdtci_dtc_stored_data_record_number_of_ids = -1;
-static int hf_uds_rdtci_dtc_severity = -1;
-static int hf_uds_rdtci_dtc_functional_unit = -1;
-static int hf_uds_rdtci_dtc_fault_detect_counter = -1;
-static int hf_uds_rdtci_dtc_severity_avail = -1;
-static int hf_uds_rdtci_record = -1;
-static int hf_uds_rdtci_record_unparsed = -1;
-
-static int hf_uds_rdbi_data_identifier = -1;
-
-static int hf_uds_rsdbi_data_identifier = -1;
-static int hf_uds_rsdbi_scaling_byte = -1;
-static int hf_uds_rsdbi_scaling_byte_data_type = -1;
-static int hf_uds_rsdbi_scaling_byte_num_of_bytes = -1;
-static int hf_uds_rsdbi_validity_mask = -1;
-static int hf_uds_rsdbi_formula_identifier = -1;
-static int hf_uds_rsdbi_formula_constant = -1;
-static int hf_uds_rsdbi_formula_constant_exp = -1;
-static int hf_uds_rsdbi_formula_constant_mantissa = -1;
-static int hf_uds_rsdbi_unit = -1;
-
-static int hf_uds_sa_subfunction = -1;
-static int hf_uds_sa_key = -1;
-static int hf_uds_sa_seed = -1;
-
-static int hf_uds_cc_subfunction_no_suppress = -1;
-static int hf_uds_cc_comm_type_and_subnet_number = -1;
-static int hf_uds_cc_communication_type = -1;
-static int hf_uds_cc_subnet_number = -1;
-static int hf_uds_cc_node_identifier_number = -1;
-
-static int hf_uds_ars_subfunction_no_suppress = -1;
-static int hf_uds_ars_comm_config = -1;
-static int hf_uds_ars_length_of_cert_client = -1;
-static int hf_uds_ars_cert_client = -1;
-static int hf_uds_ars_length_of_cert_server = -1;
-static int hf_uds_ars_cert_server = -1;
-static int hf_uds_ars_length_of_challenge_client = -1;
-static int hf_uds_ars_challenge_client = -1;
-static int hf_uds_ars_length_of_challenge_server = -1;
-static int hf_uds_ars_challenge_server = -1;
-static int hf_uds_ars_length_of_proof_of_ownership_client = -1;
-static int hf_uds_ars_proof_of_ownership_client = -1;
-static int hf_uds_ars_length_of_proof_of_ownership_server = -1;
-static int hf_uds_ars_proof_of_ownership_server = -1;
-static int hf_uds_ars_length_of_ephemeral_public_key_client = -1;
-static int hf_uds_ars_ephemeral_public_key_client = -1;
-static int hf_uds_ars_length_of_ephemeral_public_key_server = -1;
-static int hf_uds_ars_ephemeral_public_key_server = -1;
-static int hf_uds_ars_cert_eval_id = -1;
-static int hf_uds_ars_length_of_cert_data = -1;
-static int hf_uds_ars_cert_data = -1;
-static int hf_uds_ars_algo_indicator = -1;
-static int hf_uds_ars_length_of_additional_parameter = -1;
-static int hf_uds_ars_additional_parameter = -1;
-static int hf_uds_ars_length_of_needed_additional_parameter = -1;
-static int hf_uds_ars_needed_additional_parameter = -1;
-static int hf_uds_ars_auth_ret_param = -1;
-static int hf_uds_ars_length_of_session_key_info = -1;
-static int hf_uds_ars_session_key_info = -1;
-
-static int hf_uds_signedCertificate = -1;
-
-static int hf_uds_rdbpi_transmission_mode = -1;
-static int hf_uds_rdbpi_periodic_data_identifier = -1;
-
-static int hf_uds_dddi_subfunction_no_suppress = -1;
-static int hf_uds_dddi_dyn_defined_data_identifier = -1;
-static int hf_uds_dddi_source_data_identifier = -1;
-static int hf_uds_dddi_position_in_source_data_record = -1;
-static int hf_uds_dddi_memory_size = -1;
-
-static int hf_uds_wdbi_data_identifier = -1;
-
-static int hf_uds_iocbi_data_identifier = -1;
-static int hf_uds_iocbi_parameter = -1;
-static int hf_uds_iocbi_state = -1;
-
-static int hf_uds_rc_subfunction = -1;
-static int hf_uds_rc_identifier = -1;
-static int hf_uds_rc_option_record = -1;
-static int hf_uds_rc_info = -1;
-static int hf_uds_rc_status_record = -1;
-
-static int hf_uds_td_sequence_counter = -1;
-static int hf_uds_td_record_data = -1;
-
-static int hf_uds_rte_record_data = -1;
-
-static int hf_uds_rft_mode_of_operation = -1;
-static int hf_uds_rft_length_of_file_path_and_name = -1;
-static int hf_uds_rft_file_path_and_name = -1;
-static int hf_uds_rft_file_size_param_length = -1;
-static int hf_uds_rft_file_size_uncompressed = -1;
-static int hf_uds_rft_file_size_compressed = -1;
-static int hf_uds_rft_length_format_identifier = -1;
-static int hf_uds_rft_max_num_of_block_length = -1;
-static int hf_uds_rft_file_size_or_dir_info_param_length = -1;
-static int hf_uds_rft_file_size_uncompressed_or_dir_info_length = -1;
-static int hf_uds_rft_file_position = -1;
-
-static int hf_uds_tp_subfunction_no_suppress = -1;
-
-static int hf_uds_err_sid = -1;
-static int hf_uds_err_code = -1;
-
-static int hf_uds_sdt_administrative_param = -1;
-static int hf_uds_sdt_administrative_param_req = -1;
-static int hf_uds_sdt_administrative_param_pre_estab_key = -1;
-static int hf_uds_sdt_administrative_param_encrypted = -1;
-static int hf_uds_sdt_administrative_param_signed = -1;
-static int hf_uds_sdt_administrative_param_resp_sign_req = -1;
-static int hf_uds_sdt_signature_encryption_calculation = -1;
-static int hf_uds_sdt_signature_length = -1;
-static int hf_uds_sdt_anti_replay_counter = -1;
-static int hf_uds_sdt_encapsulated_message = -1;
-static int hf_uds_sdt_encapsulated_message_sid = -1;
-static int hf_uds_sdt_encapsulated_message_sid_reply = -1;
-static int hf_uds_sdt_signature_mac = -1;
-
-static int hf_uds_cdtcs_subfunction = -1;
-static int hf_uds_cdtcs_subfunction_no_suppress = -1;
-static int hf_uds_cdtcs_subfunction_pos_rsp_msg_ind = -1;
-static int hf_uds_cdtcs_option_record = -1;
-static int hf_uds_cdtcs_type = -1;
-
-static int hf_uds_lc_subfunction = -1;
-static int hf_uds_lc_subfunction_no_suppress = -1;
-static int hf_uds_lc_subfunction_pos_rsp_msg_ind = -1;
-static int hf_uds_lc_control_mode_id = -1;
-static int hf_uds_lc_link_record = -1;
-
-static int hf_uds_did_reply_f186_diag_session = -1;
-static int hf_uds_did_reply_f190_vin = -1;
-static int hf_uds_did_reply_ff00_version = -1;
-static int hf_uds_did_reply_ff01_dlc_support = -1;
-
-static int hf_uds_unparsed_bytes = -1;
+static int hf_uds_diag_addr;
+static int hf_uds_diag_addr_name;
+static int hf_uds_diag_source_addr;
+static int hf_uds_diag_source_addr_name;
+static int hf_uds_diag_target_addr;
+static int hf_uds_diag_target_addr_name;
+
+static int hf_uds_service;
+static int hf_uds_reply;
+
+static int hf_uds_subfunction;
+static int hf_uds_suppress_pos_rsp_msg_ind;
+static int hf_uds_data_record;
+
+static int hf_uds_compression_method;
+static int hf_uds_encrypting_method;
+static int hf_uds_memory_size_length;
+static int hf_uds_memory_address_length;
+static int hf_uds_memory_address;
+static int hf_uds_memory_size;
+static int hf_uds_max_block_len_len;
+static int hf_uds_max_block_len;
+
+static int hf_uds_dsc_subfunction;
+static int hf_uds_dsc_suppress_pos_rsp_msg_ind;
+static int hf_uds_dsc_parameter_record;
+static int hf_uds_dsc_default_p2_server_timer;
+static int hf_uds_dsc_enhanced_p2_server_timer;
+
+static int hf_uds_er_subfunction;
+static int hf_uds_er_power_down_time;
+
+static int hf_uds_cdtci_group_of_dtc;
+static int hf_uds_cdtci_memory_selection;
+
+static int hf_uds_rdtci_subfunction;
+static int hf_uds_rdtci_dtc_status_mask;
+static int hf_uds_rdtci_dtc_status_mask_tf;
+static int hf_uds_rdtci_dtc_status_mask_tftoc;
+static int hf_uds_rdtci_dtc_status_mask_pdtc;
+static int hf_uds_rdtci_dtc_status_mask_cdtc;
+static int hf_uds_rdtci_dtc_status_mask_tncslc;
+static int hf_uds_rdtci_dtc_status_mask_tfslc;
+static int hf_uds_rdtci_dtc_status_mask_tnctoc;
+static int hf_uds_rdtci_dtc_status_mask_wir;
+static int hf_uds_rdtci_dtc_mask_record;
+static int hf_uds_rdtci_dtc_snapshot_rec_no;
+static int hf_uds_rdtci_dtc_stored_data_rec_no;
+static int hf_uds_rdtci_dtc_ext_data_rec_no;
+static int hf_uds_rdtci_memory_selection;
+static int hf_uds_rdtci_user_def_dtc_snapshot_rec_no;
+static int hf_uds_rdtci_dtc_severity_mask;
+static int hf_uds_rdtci_functional_group_id;
+static int hf_uds_rdtci_dtc_readiness_group_id;
+static int hf_uds_rdtci_dtc_status_avail;
+static int hf_uds_rdtci_dtc_status_avail_tf;
+static int hf_uds_rdtci_dtc_status_avail_tftoc;
+static int hf_uds_rdtci_dtc_status_avail_pdtc;
+static int hf_uds_rdtci_dtc_status_avail_cdtc;
+static int hf_uds_rdtci_dtc_status_avail_tncslc;
+static int hf_uds_rdtci_dtc_status_avail_tfslc;
+static int hf_uds_rdtci_dtc_status_avail_tnctoc;
+static int hf_uds_rdtci_dtc_status_avail_wir;
+static int hf_uds_rdtci_dtc_id;
+static int hf_uds_rdtci_dtc_status;
+static int hf_uds_rdtci_dtc_status_tf;
+static int hf_uds_rdtci_dtc_status_tftoc;
+static int hf_uds_rdtci_dtc_status_pdtc;
+static int hf_uds_rdtci_dtc_status_cdtc;
+static int hf_uds_rdtci_dtc_status_tncslc;
+static int hf_uds_rdtci_dtc_status_tfslc;
+static int hf_uds_rdtci_dtc_status_tnctoc;
+static int hf_uds_rdtci_dtc_status_wir;
+static int hf_uds_rdtci_dtc_format_id;
+static int hf_uds_rdtci_dtc_count;
+static int hf_uds_rdtci_dtc_snapshot_record_number_of_ids;
+static int hf_uds_rdtci_dtc_stored_data_record_number_of_ids;
+static int hf_uds_rdtci_dtc_severity;
+static int hf_uds_rdtci_dtc_functional_unit;
+static int hf_uds_rdtci_dtc_fault_detect_counter;
+static int hf_uds_rdtci_dtc_severity_avail;
+static int hf_uds_rdtci_record;
+static int hf_uds_rdtci_record_unparsed;
+
+static int hf_uds_rdbi_data_identifier;
+
+static int hf_uds_rsdbi_data_identifier;
+static int hf_uds_rsdbi_scaling_byte;
+static int hf_uds_rsdbi_scaling_byte_data_type;
+static int hf_uds_rsdbi_scaling_byte_num_of_bytes;
+static int hf_uds_rsdbi_validity_mask;
+static int hf_uds_rsdbi_formula_identifier;
+static int hf_uds_rsdbi_formula_constant;
+static int hf_uds_rsdbi_formula_constant_exp;
+static int hf_uds_rsdbi_formula_constant_mantissa;
+static int hf_uds_rsdbi_unit;
+
+static int hf_uds_sa_subfunction;
+static int hf_uds_sa_key;
+static int hf_uds_sa_seed;
+
+static int hf_uds_cc_subfunction_no_suppress;
+static int hf_uds_cc_comm_type_and_subnet_number;
+static int hf_uds_cc_communication_type;
+static int hf_uds_cc_subnet_number;
+static int hf_uds_cc_node_identifier_number;
+
+static int hf_uds_ars_subfunction_no_suppress;
+static int hf_uds_ars_comm_config;
+static int hf_uds_ars_length_of_cert_client;
+static int hf_uds_ars_cert_client;
+static int hf_uds_ars_length_of_cert_server;
+static int hf_uds_ars_cert_server;
+static int hf_uds_ars_length_of_challenge_client;
+static int hf_uds_ars_challenge_client;
+static int hf_uds_ars_length_of_challenge_server;
+static int hf_uds_ars_challenge_server;
+static int hf_uds_ars_length_of_proof_of_ownership_client;
+static int hf_uds_ars_proof_of_ownership_client;
+static int hf_uds_ars_length_of_proof_of_ownership_server;
+static int hf_uds_ars_proof_of_ownership_server;
+static int hf_uds_ars_length_of_ephemeral_public_key_client;
+static int hf_uds_ars_ephemeral_public_key_client;
+static int hf_uds_ars_length_of_ephemeral_public_key_server;
+static int hf_uds_ars_ephemeral_public_key_server;
+static int hf_uds_ars_cert_eval_id;
+static int hf_uds_ars_length_of_cert_data;
+static int hf_uds_ars_cert_data;
+static int hf_uds_ars_algo_indicator;
+static int hf_uds_ars_length_of_additional_parameter;
+static int hf_uds_ars_additional_parameter;
+static int hf_uds_ars_length_of_needed_additional_parameter;
+static int hf_uds_ars_needed_additional_parameter;
+static int hf_uds_ars_auth_ret_param;
+static int hf_uds_ars_length_of_session_key_info;
+static int hf_uds_ars_session_key_info;
+
+static int hf_uds_signedCertificate;
+
+static int hf_uds_rdbpi_transmission_mode;
+static int hf_uds_rdbpi_periodic_data_identifier;
+
+static int hf_uds_dddi_subfunction_no_suppress;
+static int hf_uds_dddi_dyn_defined_data_identifier;
+static int hf_uds_dddi_source_data_identifier;
+static int hf_uds_dddi_position_in_source_data_record;
+static int hf_uds_dddi_memory_size;
+
+static int hf_uds_wdbi_data_identifier;
+
+static int hf_uds_iocbi_data_identifier;
+static int hf_uds_iocbi_parameter;
+static int hf_uds_iocbi_state;
+
+static int hf_uds_rc_subfunction;
+static int hf_uds_rc_identifier;
+static int hf_uds_rc_option_record;
+static int hf_uds_rc_info;
+static int hf_uds_rc_status_record;
+
+static int hf_uds_td_sequence_counter;
+static int hf_uds_td_record_data;
+
+static int hf_uds_rte_record_data;
+
+static int hf_uds_rft_mode_of_operation;
+static int hf_uds_rft_length_of_file_path_and_name;
+static int hf_uds_rft_file_path_and_name;
+static int hf_uds_rft_file_size_param_length;
+static int hf_uds_rft_file_size_uncompressed;
+static int hf_uds_rft_file_size_compressed;
+static int hf_uds_rft_length_format_identifier;
+static int hf_uds_rft_max_num_of_block_length;
+static int hf_uds_rft_file_size_or_dir_info_param_length;
+static int hf_uds_rft_file_size_uncompressed_or_dir_info_length;
+static int hf_uds_rft_file_position;
+
+static int hf_uds_tp_subfunction_no_suppress;
+
+static int hf_uds_err_sid;
+static int hf_uds_err_code;
+
+static int hf_uds_sdt_administrative_param;
+static int hf_uds_sdt_administrative_param_req;
+static int hf_uds_sdt_administrative_param_pre_estab_key;
+static int hf_uds_sdt_administrative_param_encrypted;
+static int hf_uds_sdt_administrative_param_signed;
+static int hf_uds_sdt_administrative_param_resp_sign_req;
+static int hf_uds_sdt_signature_encryption_calculation;
+static int hf_uds_sdt_signature_length;
+static int hf_uds_sdt_anti_replay_counter;
+static int hf_uds_sdt_encapsulated_message;
+static int hf_uds_sdt_encapsulated_message_sid;
+static int hf_uds_sdt_encapsulated_message_sid_reply;
+static int hf_uds_sdt_signature_mac;
+
+static int hf_uds_cdtcs_subfunction;
+static int hf_uds_cdtcs_subfunction_no_suppress;
+static int hf_uds_cdtcs_subfunction_pos_rsp_msg_ind;
+static int hf_uds_cdtcs_option_record;
+static int hf_uds_cdtcs_type;
+
+static int hf_uds_lc_subfunction;
+static int hf_uds_lc_subfunction_no_suppress;
+static int hf_uds_lc_subfunction_pos_rsp_msg_ind;
+static int hf_uds_lc_control_mode_id;
+static int hf_uds_lc_link_record;
+
+static int hf_uds_did_reply_f186_diag_session;
+static int hf_uds_did_reply_f190_vin;
+static int hf_uds_did_reply_ff00_version;
+static int hf_uds_did_reply_ff01_dlc_support;
+
+static int hf_uds_unparsed_bytes;
 
 /*
  * Trees
  */
-static gint ett_uds = -1;
-static gint ett_uds_subfunction = -1;
-static gint ett_uds_dtc_status_entry = -1;
-static gint ett_uds_dtc_status_bits = -1;
-static gint ett_uds_dtc_snapshot_entry = -1;
-static gint ett_uds_dtc_counter_entry = -1;
-static gint ett_uds_dsc_parameter_record = -1;
-static gint ett_uds_rsdbi_scaling_byte = -1;
-static gint ett_uds_rsdbi_formula_constant = -1;
-static gint ett_uds_cc_communication_type = -1;
-static gint ett_uds_ars_certificate = -1;
-static gint ett_uds_ars_algo_indicator = -1;
-static gint ett_uds_dddi_entry = -1;
-static gint ett_uds_sdt_admin_param = -1;
-static gint ett_uds_sdt_encap_message = -1;
-
-static int proto_uds = -1;
+static gint ett_uds;
+static gint ett_uds_subfunction;
+static gint ett_uds_dtc_status_entry;
+static gint ett_uds_dtc_status_bits;
+static gint ett_uds_dtc_snapshot_entry;
+static gint ett_uds_dtc_counter_entry;
+static gint ett_uds_dsc_parameter_record;
+static gint ett_uds_rsdbi_scaling_byte;
+static gint ett_uds_rsdbi_formula_constant;
+static gint ett_uds_cc_communication_type;
+static gint ett_uds_ars_certificate;
+static gint ett_uds_ars_algo_indicator;
+static gint ett_uds_dddi_entry;
+static gint ett_uds_sdt_admin_param;
+static gint ett_uds_sdt_encap_message;
+
+static int proto_uds;
 
 static dissector_handle_t uds_handle;
 static dissector_handle_t uds_handle_doip;
diff --git a/epan/dissectors/packet-udt.c b/epan/dissectors/packet-udt.c
index 38f1acfc95..28a937ff4b 100644
--- a/epan/dissectors/packet-udt.c
+++ b/epan/dissectors/packet-udt.c
@@ -76,37 +76,37 @@ static const value_string udt_types[] = {
 	{0, NULL},
 };
 
-static int proto_udt = -1;
-static int hf_udt_iscontrol = -1;
-static int hf_udt_type = -1;
-static int hf_udt_seqno = -1;
-static int hf_udt_ack_seqno = -1;
-static int hf_udt_ackno = -1;
-static int hf_udt_msgno = -1;
-static int hf_udt_msgno_first = -1;
-static int hf_udt_msgno_last = -1;
-static int hf_udt_msgno_inorder = -1;
-static int hf_udt_timestamp = -1;
-static int hf_udt_id = -1;
-static int hf_udt_addinfo = -1;
-static int hf_udt_rtt = -1;
-static int hf_udt_rttvar = -1;
-static int hf_udt_bufavail = -1;
-static int hf_udt_rate = -1;
-static int hf_udt_linkcap = -1;
-static int hf_udt_handshake_version = -1;
-static int hf_udt_handshake_type = -1;
-static int hf_udt_handshake_isn = -1;
-static int hf_udt_handshake_mtu = -1;
-static int hf_udt_handshake_flow_window = -1;
-static int hf_udt_handshake_reqtype = -1;
-static int hf_udt_handshake_id = -1;
-static int hf_udt_handshake_cookie = -1;
-static int hf_udt_handshake_peerip = -1;
-
-static gint ett_udt = -1;
-
-static expert_field ei_udt_nak_seqno = EI_INIT;
+static int proto_udt;
+static int hf_udt_iscontrol;
+static int hf_udt_type;
+static int hf_udt_seqno;
+static int hf_udt_ack_seqno;
+static int hf_udt_ackno;
+static int hf_udt_msgno;
+static int hf_udt_msgno_first;
+static int hf_udt_msgno_last;
+static int hf_udt_msgno_inorder;
+static int hf_udt_timestamp;
+static int hf_udt_id;
+static int hf_udt_addinfo;
+static int hf_udt_rtt;
+static int hf_udt_rttvar;
+static int hf_udt_bufavail;
+static int hf_udt_rate;
+static int hf_udt_linkcap;
+static int hf_udt_handshake_version;
+static int hf_udt_handshake_type;
+static int hf_udt_handshake_isn;
+static int hf_udt_handshake_mtu;
+static int hf_udt_handshake_flow_window;
+static int hf_udt_handshake_reqtype;
+static int hf_udt_handshake_id;
+static int hf_udt_handshake_cookie;
+static int hf_udt_handshake_peerip;
+
+static gint ett_udt;
+
+static expert_field ei_udt_nak_seqno;
 
 static dissector_handle_t udt_handle;
 
diff --git a/epan/dissectors/packet-uftp.c b/epan/dissectors/packet-uftp.c
index 4f7c6f51ab..36f726cec7 100644
--- a/epan/dissectors/packet-uftp.c
+++ b/epan/dissectors/packet-uftp.c
@@ -127,245 +127,245 @@ void proto_reg_handoff_uftp(void);
 
 static dissector_handle_t uftp_handle;
 
-static int proto_uftp = -1;
+static int proto_uftp;
 #define UFTP_PORT   1044 /* Not IANA registered */
 
 /* main header and common fields */
-static int hf_uftp_version = -1;
-static int hf_uftp_func = -1;
-static int hf_uftp_blsize = -1;
-static int hf_uftp_group_id = -1;
-static int hf_uftp_srcaddr = -1;
-static int hf_uftp_destaddr = -1;
+static int hf_uftp_version;
+static int hf_uftp_func;
+static int hf_uftp_blsize;
+static int hf_uftp_group_id;
+static int hf_uftp_srcaddr;
+static int hf_uftp_destaddr;
 
-static int hf_uftp_destlist = -1;
-static int hf_uftp_dest = -1;
+static int hf_uftp_destlist;
+static int hf_uftp_dest;
 
 /* ANNOUNCE fields */
-static int hf_uftp_announce = -1;
-static int hf_uftp_announce_func = -1;
-static int hf_uftp_announce_flags = -1;
-static int hf_uftp_announce_flags_restart = -1;
-static int hf_uftp_announce_flags_sync = -1;
-static int hf_uftp_announce_flags_syncpreview = -1;
-static int hf_uftp_announce_flags_reserved = -1;
-static int hf_uftp_announce_destcount = -1;
-static int hf_uftp_announce_announce_int = -1;
-static int hf_uftp_announce_status_int = -1;
-static int hf_uftp_announce_register_int = -1;
-static int hf_uftp_announce_done_int = -1;
-static int hf_uftp_announce_announce_time = -1;
-static int hf_uftp_announce_status_time = -1;
-static int hf_uftp_announce_mtu = -1;
-static int hf_uftp_announce_privatemcast = -1;
-static int hf_uftp_announce_client_auth = -1;
-static int hf_uftp_announce_sigtype = -1;
-static int hf_uftp_announce_hashtype = -1;
-static int hf_uftp_announce_keytype = -1;
-static int hf_uftp_announce_keylen = -1;
-static int hf_uftp_announce_reserved = -1;
-static int hf_uftp_announce_keyexp = -1;
-static int hf_uftp_announce_rand1 = -1;
-static int hf_uftp_announce_keymod = -1;
+static int hf_uftp_announce;
+static int hf_uftp_announce_func;
+static int hf_uftp_announce_flags;
+static int hf_uftp_announce_flags_restart;
+static int hf_uftp_announce_flags_sync;
+static int hf_uftp_announce_flags_syncpreview;
+static int hf_uftp_announce_flags_reserved;
+static int hf_uftp_announce_destcount;
+static int hf_uftp_announce_announce_int;
+static int hf_uftp_announce_status_int;
+static int hf_uftp_announce_register_int;
+static int hf_uftp_announce_done_int;
+static int hf_uftp_announce_announce_time;
+static int hf_uftp_announce_status_time;
+static int hf_uftp_announce_mtu;
+static int hf_uftp_announce_privatemcast;
+static int hf_uftp_announce_client_auth;
+static int hf_uftp_announce_sigtype;
+static int hf_uftp_announce_hashtype;
+static int hf_uftp_announce_keytype;
+static int hf_uftp_announce_keylen;
+static int hf_uftp_announce_reserved;
+static int hf_uftp_announce_keyexp;
+static int hf_uftp_announce_rand1;
+static int hf_uftp_announce_keymod;
 
 /* REGISTER fields */
-static int hf_uftp_register = -1;
-static int hf_uftp_register_func = -1;
-static int hf_uftp_register_reserved = -1;
-static int hf_uftp_register_destcount = -1;
-static int hf_uftp_register_premaster_len = -1;
-static int hf_uftp_register_rand2 = -1;
-static int hf_uftp_register_premaster = -1;
+static int hf_uftp_register;
+static int hf_uftp_register_func;
+static int hf_uftp_register_reserved;
+static int hf_uftp_register_destcount;
+static int hf_uftp_register_premaster_len;
+static int hf_uftp_register_rand2;
+static int hf_uftp_register_premaster;
 
 /* CLIENT_KEY fields */
-static int hf_uftp_clientkey = -1;
-static int hf_uftp_clientkey_func = -1;
-static int hf_uftp_clientkey_reserved = -1;
-static int hf_uftp_clientkey_keylen = -1;
-static int hf_uftp_clientkey_verifylen = -1;
-static int hf_uftp_clientkey_keyexp = -1;
-static int hf_uftp_clientkey_keymod = -1;
-static int hf_uftp_clientkey_verify = -1;
+static int hf_uftp_clientkey;
+static int hf_uftp_clientkey_func;
+static int hf_uftp_clientkey_reserved;
+static int hf_uftp_clientkey_keylen;
+static int hf_uftp_clientkey_verifylen;
+static int hf_uftp_clientkey_keyexp;
+static int hf_uftp_clientkey_keymod;
+static int hf_uftp_clientkey_verify;
 
 /* REG_CONF fields */
-static int hf_uftp_regconf = -1;
-static int hf_uftp_regconf_func = -1;
-static int hf_uftp_regconf_reserved = -1;
-static int hf_uftp_regconf_destcount = -1;
+static int hf_uftp_regconf;
+static int hf_uftp_regconf_func;
+static int hf_uftp_regconf_reserved;
+static int hf_uftp_regconf_destcount;
 
 /* FILEINFO fields */
-static int hf_uftp_fileinfo = -1;
-static int hf_uftp_fileinfo_func = -1;
-static int hf_uftp_fileinfo_ftype = -1;
-static int hf_uftp_fileinfo_file_id = -1;
-static int hf_uftp_fileinfo_block_total = -1;
-static int hf_uftp_fileinfo_section_total = -1;
-static int hf_uftp_fileinfo_destcount = -1;
-static int hf_uftp_fileinfo_fsize = -1;
-static int hf_uftp_fileinfo_ftstamp = -1;
-static int hf_uftp_fileinfo_name = -1;
+static int hf_uftp_fileinfo;
+static int hf_uftp_fileinfo_func;
+static int hf_uftp_fileinfo_ftype;
+static int hf_uftp_fileinfo_file_id;
+static int hf_uftp_fileinfo_block_total;
+static int hf_uftp_fileinfo_section_total;
+static int hf_uftp_fileinfo_destcount;
+static int hf_uftp_fileinfo_fsize;
+static int hf_uftp_fileinfo_ftstamp;
+static int hf_uftp_fileinfo_name;
 
 /* KEYINFO fields */
-static int hf_uftp_keyinfo = -1;
-static int hf_uftp_keyinfo_func = -1;
-static int hf_uftp_keyinfo_reserved = -1;
-static int hf_uftp_keyinfo_destcount = -1;
-static int hf_uftp_keyinfo_groupmaster_len = -1;
-static int hf_uftp_keyinfo_tstamp = -1;
-static int hf_uftp_keyinfo_destkey = -1;
-static int hf_uftp_keyinfo_destaddr = -1;
-static int hf_uftp_keyinfo_groupmaster = -1;
+static int hf_uftp_keyinfo;
+static int hf_uftp_keyinfo_func;
+static int hf_uftp_keyinfo_reserved;
+static int hf_uftp_keyinfo_destcount;
+static int hf_uftp_keyinfo_groupmaster_len;
+static int hf_uftp_keyinfo_tstamp;
+static int hf_uftp_keyinfo_destkey;
+static int hf_uftp_keyinfo_destaddr;
+static int hf_uftp_keyinfo_groupmaster;
 
 /* INFO_ACK fields */
-static int hf_uftp_infoack = -1;
-static int hf_uftp_infoack_func = -1;
-static int hf_uftp_infoack_flags = -1;
-static int hf_uftp_infoack_flags_partial = -1;
-static int hf_uftp_infoack_flags_reserved = -1;
-static int hf_uftp_infoack_file_id = -1;
-static int hf_uftp_infoack_destcount = -1;
-static int hf_uftp_infoack_reserved = -1;
-static int hf_uftp_infoack_verify_data = -1;
+static int hf_uftp_infoack;
+static int hf_uftp_infoack_func;
+static int hf_uftp_infoack_flags;
+static int hf_uftp_infoack_flags_partial;
+static int hf_uftp_infoack_flags_reserved;
+static int hf_uftp_infoack_file_id;
+static int hf_uftp_infoack_destcount;
+static int hf_uftp_infoack_reserved;
+static int hf_uftp_infoack_verify_data;
 
 /* FILESEG fields */
-static int hf_uftp_fileseg = -1;
-static int hf_uftp_fileseg_func = -1;
-static int hf_uftp_fileseg_reserved1 = -1;
-static int hf_uftp_fileseg_file_id = -1;
-static int hf_uftp_fileseg_pass = -1;
-static int hf_uftp_fileseg_reserved2 = -1;
-static int hf_uftp_fileseg_section = -1;
-static int hf_uftp_fileseg_seq_num = -1;
-static int hf_uftp_fileseg_data = -1;
+static int hf_uftp_fileseg;
+static int hf_uftp_fileseg_func;
+static int hf_uftp_fileseg_reserved1;
+static int hf_uftp_fileseg_file_id;
+static int hf_uftp_fileseg_pass;
+static int hf_uftp_fileseg_reserved2;
+static int hf_uftp_fileseg_section;
+static int hf_uftp_fileseg_seq_num;
+static int hf_uftp_fileseg_data;
 
 /* DONE fields */
-static int hf_uftp_done = -1;
-static int hf_uftp_done_func = -1;
-static int hf_uftp_done_pass = -1;
-static int hf_uftp_done_section = -1;
-static int hf_uftp_done_file_id = -1;
-static int hf_uftp_done_destcount = -1;
+static int hf_uftp_done;
+static int hf_uftp_done_func;
+static int hf_uftp_done_pass;
+static int hf_uftp_done_section;
+static int hf_uftp_done_file_id;
+static int hf_uftp_done_destcount;
 
 /* STATUS fields */
-static int hf_uftp_status = -1;
-static int hf_uftp_status_func = -1;
-static int hf_uftp_status_reserved = -1;
-static int hf_uftp_status_file_id = -1;
-static int hf_uftp_status_pass = -1;
-static int hf_uftp_status_seq = -1;
-static int hf_uftp_status_section = -1;
-static int hf_uftp_status_nak_count = -1;
-static int hf_uftp_status_naks = -1;
+static int hf_uftp_status;
+static int hf_uftp_status_func;
+static int hf_uftp_status_reserved;
+static int hf_uftp_status_file_id;
+static int hf_uftp_status_pass;
+static int hf_uftp_status_seq;
+static int hf_uftp_status_section;
+static int hf_uftp_status_nak_count;
+static int hf_uftp_status_naks;
 
 /* PRSTATUS fields */
-static int hf_uftp_prstatus = -1;
-static int hf_uftp_prstatus_func = -1;
-static int hf_uftp_prstatus_reserved1 = -1;
-static int hf_uftp_prstatus_file_id = -1;
-static int hf_uftp_prstatus_pass = -1;
-static int hf_uftp_prstatus_seq = -1;
-static int hf_uftp_prstatus_section = -1;
-static int hf_uftp_prstatus_destcount = -1;
-static int hf_uftp_prstatus_reserved2 = -1;
+static int hf_uftp_prstatus;
+static int hf_uftp_prstatus_func;
+static int hf_uftp_prstatus_reserved1;
+static int hf_uftp_prstatus_file_id;
+static int hf_uftp_prstatus_pass;
+static int hf_uftp_prstatus_seq;
+static int hf_uftp_prstatus_section;
+static int hf_uftp_prstatus_destcount;
+static int hf_uftp_prstatus_reserved2;
 
 /* COMPLETE fields */
-static int hf_uftp_complete = -1;
-static int hf_uftp_complete_func = -1;
-static int hf_uftp_complete_status = -1;
-static int hf_uftp_complete_file_id = -1;
-static int hf_uftp_complete_destcount = -1;
-static int hf_uftp_complete_reserved2 = -1;
+static int hf_uftp_complete;
+static int hf_uftp_complete_func;
+static int hf_uftp_complete_status;
+static int hf_uftp_complete_file_id;
+static int hf_uftp_complete_destcount;
+static int hf_uftp_complete_reserved2;
 
 /* DONE_CONF fields */
-static int hf_uftp_doneconf = -1;
-static int hf_uftp_doneconf_func = -1;
-static int hf_uftp_doneconf_reserved1 = -1;
-static int hf_uftp_doneconf_file_id = -1;
-static int hf_uftp_doneconf_destcount = -1;
-static int hf_uftp_doneconf_reserved2 = -1;
+static int hf_uftp_doneconf;
+static int hf_uftp_doneconf_func;
+static int hf_uftp_doneconf_reserved1;
+static int hf_uftp_doneconf_file_id;
+static int hf_uftp_doneconf_destcount;
+static int hf_uftp_doneconf_reserved2;
 
 /* HB_REQ fields */
-static int hf_uftp_hbreq = -1;
-static int hf_uftp_hbreq_func = -1;
-static int hf_uftp_hbreq_reserved = -1;
-static int hf_uftp_hbreq_nonce = -1;
-static int hf_uftp_hbreq_keylen = -1;
-static int hf_uftp_hbreq_siglen = -1;
-static int hf_uftp_hbreq_keyexp = -1;
-static int hf_uftp_hbreq_keymod = -1;
-static int hf_uftp_hbreq_verify = -1;
+static int hf_uftp_hbreq;
+static int hf_uftp_hbreq_func;
+static int hf_uftp_hbreq_reserved;
+static int hf_uftp_hbreq_nonce;
+static int hf_uftp_hbreq_keylen;
+static int hf_uftp_hbreq_siglen;
+static int hf_uftp_hbreq_keyexp;
+static int hf_uftp_hbreq_keymod;
+static int hf_uftp_hbreq_verify;
 
 /* HB_RESP fields */
-static int hf_uftp_hbresp = -1;
-static int hf_uftp_hbresp_func = -1;
-static int hf_uftp_hbresp_authenticated = -1;
-static int hf_uftp_hbresp_reserved = -1;
-static int hf_uftp_hbresp_nonce = -1;
+static int hf_uftp_hbresp;
+static int hf_uftp_hbresp_func;
+static int hf_uftp_hbresp_authenticated;
+static int hf_uftp_hbresp_reserved;
+static int hf_uftp_hbresp_nonce;
 
 /* KEY_REQ fields */
-static int hf_uftp_keyreq = -1;
-static int hf_uftp_keyreq_func = -1;
-static int hf_uftp_keyreq_reserved = -1;
+static int hf_uftp_keyreq;
+static int hf_uftp_keyreq_func;
+static int hf_uftp_keyreq_reserved;
 
 /* PROXY_KEY fields */
-static int hf_uftp_proxykey = -1;
-static int hf_uftp_proxykey_func = -1;
-static int hf_uftp_proxykey_reserved = -1;
-static int hf_uftp_proxykey_nonce = -1;
-static int hf_uftp_proxykey_keylen = -1;
-static int hf_uftp_proxykey_siglen = -1;
-static int hf_uftp_proxykey_keyexp = -1;
-static int hf_uftp_proxykey_keymod = -1;
-static int hf_uftp_proxykey_verify = -1;
+static int hf_uftp_proxykey;
+static int hf_uftp_proxykey_func;
+static int hf_uftp_proxykey_reserved;
+static int hf_uftp_proxykey_nonce;
+static int hf_uftp_proxykey_keylen;
+static int hf_uftp_proxykey_siglen;
+static int hf_uftp_proxykey_keyexp;
+static int hf_uftp_proxykey_keymod;
+static int hf_uftp_proxykey_verify;
 
 /* ENCRYPTED fields */
-static int hf_uftp_encrypted = -1;
-static int hf_uftp_encrypted_tstamp = -1;
-static int hf_uftp_encrypted_sig_len = -1;
-static int hf_uftp_encrypted_payload_len = -1;
-static int hf_uftp_encrypted_signature = -1;
-static int hf_uftp_encrypted_payload = -1;
+static int hf_uftp_encrypted;
+static int hf_uftp_encrypted_tstamp;
+static int hf_uftp_encrypted_sig_len;
+static int hf_uftp_encrypted_payload_len;
+static int hf_uftp_encrypted_signature;
+static int hf_uftp_encrypted_payload;
 
 /* ABORT fields */
-static int hf_uftp_abort = -1;
-static int hf_uftp_abort_func = -1;
-static int hf_uftp_abort_flags = -1;
-static int hf_uftp_abort_flags_curfile = -1;
-static int hf_uftp_abort_flags_reserved = -1;
-static int hf_uftp_abort_reserved = -1;
-static int hf_uftp_abort_host = -1;
-static int hf_uftp_abort_message = -1;
-
-static gint ett_uftp = -1;
-static gint ett_uftp_announce = -1;
-static gint ett_uftp_register = -1;
-static gint ett_uftp_clientkey = -1;
-static gint ett_uftp_regconf = -1;
-static gint ett_uftp_fileinfo = -1;
-static gint ett_uftp_keyinfo = -1;
-static gint ett_uftp_infoack = -1;
-static gint ett_uftp_fileseg = -1;
-static gint ett_uftp_done = -1;
-static gint ett_uftp_status = -1;
-static gint ett_uftp_prstatus = -1;
-static gint ett_uftp_complete = -1;
-static gint ett_uftp_doneconf = -1;
-static gint ett_uftp_hbreq = -1;
-static gint ett_uftp_hbresp = -1;
-static gint ett_uftp_keyreq = -1;
-static gint ett_uftp_proxykey = -1;
-static gint ett_uftp_encrypted = -1;
-static gint ett_uftp_abort = -1;
-
-static gint ett_uftp_announce_flags = -1;
-static gint ett_uftp_keyinfo_destkey = -1;
-static gint ett_uftp_infoack_flags = -1;
-static gint ett_uftp_abort_flags = -1;
-
-static gint ett_uftp_destlist = -1;
-
-static expert_field ei_uftp_length_invalid = EI_INIT;
-static expert_field ei_uftp_func_unknown = EI_INIT;
+static int hf_uftp_abort;
+static int hf_uftp_abort_func;
+static int hf_uftp_abort_flags;
+static int hf_uftp_abort_flags_curfile;
+static int hf_uftp_abort_flags_reserved;
+static int hf_uftp_abort_reserved;
+static int hf_uftp_abort_host;
+static int hf_uftp_abort_message;
+
+static gint ett_uftp;
+static gint ett_uftp_announce;
+static gint ett_uftp_register;
+static gint ett_uftp_clientkey;
+static gint ett_uftp_regconf;
+static gint ett_uftp_fileinfo;
+static gint ett_uftp_keyinfo;
+static gint ett_uftp_infoack;
+static gint ett_uftp_fileseg;
+static gint ett_uftp_done;
+static gint ett_uftp_status;
+static gint ett_uftp_prstatus;
+static gint ett_uftp_complete;
+static gint ett_uftp_doneconf;
+static gint ett_uftp_hbreq;
+static gint ett_uftp_hbresp;
+static gint ett_uftp_keyreq;
+static gint ett_uftp_proxykey;
+static gint ett_uftp_encrypted;
+static gint ett_uftp_abort;
+
+static gint ett_uftp_announce_flags;
+static gint ett_uftp_keyinfo_destkey;
+static gint ett_uftp_infoack_flags;
+static gint ett_uftp_abort_flags;
+
+static gint ett_uftp_destlist;
+
+static expert_field ei_uftp_length_invalid;
+static expert_field ei_uftp_func_unknown;
 
 static dissector_handle_t uftp4_handle;
 static dissector_handle_t uftp5_handle;
diff --git a/epan/dissectors/packet-uftp4.c b/epan/dissectors/packet-uftp4.c
index 85a98de370..b422551a34 100644
--- a/epan/dissectors/packet-uftp4.c
+++ b/epan/dissectors/packet-uftp4.c
@@ -209,337 +209,337 @@
 
 void proto_register_uftp4(void);
 
-static int proto_uftp = -1;
+static int proto_uftp;
 
 /* main header and common fields */
-static int hf_uftp_version = -1;
-static int hf_uftp_func = -1;
-static int hf_uftp_seq = -1;
-static int hf_uftp_src_id = -1;
-static int hf_uftp_group_id = -1;
-static int hf_uftp_group_inst = -1;
-static int hf_uftp_grtt = -1;
-static int hf_uftp_gsize = -1;
-static int hf_uftp_reserved = -1;
-
-static int hf_uftp_destlist = -1;
-static int hf_uftp_dest = -1;
+static int hf_uftp_version;
+static int hf_uftp_func;
+static int hf_uftp_seq;
+static int hf_uftp_src_id;
+static int hf_uftp_group_id;
+static int hf_uftp_group_inst;
+static int hf_uftp_grtt;
+static int hf_uftp_gsize;
+static int hf_uftp_reserved;
+
+static int hf_uftp_destlist;
+static int hf_uftp_dest;
 
 /* ANNOUNCE fields */
-static int hf_uftp_announce = -1;
-static int hf_uftp_announce_func = -1;
-static int hf_uftp_announce_hlen = -1;
-static int hf_uftp_announce_flags = -1;
-static int hf_uftp_announce_flags_sync = -1;
-static int hf_uftp_announce_flags_syncpreview = -1;
-static int hf_uftp_announce_flags_ipv6 = -1;
-static int hf_uftp_announce_flags_reserved = -1;
-static int hf_uftp_announce_robust = -1;
-static int hf_uftp_announce_cc_type = -1;
-static int hf_uftp_announce_reserved = -1;
-static int hf_uftp_announce_blocksize = -1;
-static int hf_uftp_announce_tstamp = -1;
-static int hf_uftp_announce_publicmcast_ipv4 = -1;
-static int hf_uftp_announce_publicmcast_ipv6 = -1;
-static int hf_uftp_announce_privatemcast_ipv4 = -1;
-static int hf_uftp_announce_privatemcast_ipv6 = -1;
+static int hf_uftp_announce;
+static int hf_uftp_announce_func;
+static int hf_uftp_announce_hlen;
+static int hf_uftp_announce_flags;
+static int hf_uftp_announce_flags_sync;
+static int hf_uftp_announce_flags_syncpreview;
+static int hf_uftp_announce_flags_ipv6;
+static int hf_uftp_announce_flags_reserved;
+static int hf_uftp_announce_robust;
+static int hf_uftp_announce_cc_type;
+static int hf_uftp_announce_reserved;
+static int hf_uftp_announce_blocksize;
+static int hf_uftp_announce_tstamp;
+static int hf_uftp_announce_publicmcast_ipv4;
+static int hf_uftp_announce_publicmcast_ipv6;
+static int hf_uftp_announce_privatemcast_ipv4;
+static int hf_uftp_announce_privatemcast_ipv6;
 
 /* EXT_ENC_INFO fields */
-static int hf_uftp_encinfo = -1;
-static int hf_uftp_encinfo_exttype = -1;
-static int hf_uftp_encinfo_extlen = -1;
-static int hf_uftp_encinfo_flags = -1;
-static int hf_uftp_encinfo_flags_client_auth = -1;
-static int hf_uftp_encinfo_flags_reserved = -1;
-static int hf_uftp_encinfo_keyextype = -1;
-static int hf_uftp_encinfo_sigtype = -1;
-static int hf_uftp_encinfo_keytype = -1;
-static int hf_uftp_encinfo_hashtype = -1;
-static int hf_uftp_encinfo_keylen = -1;
-static int hf_uftp_encinfo_dhlen = -1;
-static int hf_uftp_encinfo_siglen = -1;
-static int hf_uftp_encinfo_rand1 = -1;
-static int hf_uftp_encinfo_keyblob = -1;
-static int hf_uftp_encinfo_dhblob = -1;
-static int hf_uftp_encinfo_sig = -1;
+static int hf_uftp_encinfo;
+static int hf_uftp_encinfo_exttype;
+static int hf_uftp_encinfo_extlen;
+static int hf_uftp_encinfo_flags;
+static int hf_uftp_encinfo_flags_client_auth;
+static int hf_uftp_encinfo_flags_reserved;
+static int hf_uftp_encinfo_keyextype;
+static int hf_uftp_encinfo_sigtype;
+static int hf_uftp_encinfo_keytype;
+static int hf_uftp_encinfo_hashtype;
+static int hf_uftp_encinfo_keylen;
+static int hf_uftp_encinfo_dhlen;
+static int hf_uftp_encinfo_siglen;
+static int hf_uftp_encinfo_rand1;
+static int hf_uftp_encinfo_keyblob;
+static int hf_uftp_encinfo_dhblob;
+static int hf_uftp_encinfo_sig;
 
 /* rsa_blob_t fields */
-static int hf_uftp_rsablob_blobtype = -1;
-static int hf_uftp_rsablob_reserved = -1;
-static int hf_uftp_rsablob_modlen = -1;
-static int hf_uftp_rsablob_exponent = -1;
-static int hf_uftp_rsablob_modulus = -1;
+static int hf_uftp_rsablob_blobtype;
+static int hf_uftp_rsablob_reserved;
+static int hf_uftp_rsablob_modlen;
+static int hf_uftp_rsablob_exponent;
+static int hf_uftp_rsablob_modulus;
 
 /* ec_blob_t fields */
-static int hf_uftp_ecblob_blobtype = -1;
-static int hf_uftp_ecblob_curve = -1;
-static int hf_uftp_ecblob_keylen = -1;
-static int hf_uftp_ecblob_key = -1;
+static int hf_uftp_ecblob_blobtype;
+static int hf_uftp_ecblob_curve;
+static int hf_uftp_ecblob_keylen;
+static int hf_uftp_ecblob_key;
 
 /* REGISTER fields */
-static int hf_uftp_register = -1;
-static int hf_uftp_register_func = -1;
-static int hf_uftp_register_hlen = -1;
-static int hf_uftp_register_keyinfo_len = -1;
-static int hf_uftp_register_tstamp = -1;
-static int hf_uftp_register_rand2 = -1;
-static int hf_uftp_register_keyinfo = -1;
+static int hf_uftp_register;
+static int hf_uftp_register_func;
+static int hf_uftp_register_hlen;
+static int hf_uftp_register_keyinfo_len;
+static int hf_uftp_register_tstamp;
+static int hf_uftp_register_rand2;
+static int hf_uftp_register_keyinfo;
 
 /* CLIENT_KEY fields */
-static int hf_uftp_clientkey = -1;
-static int hf_uftp_clientkey_func = -1;
-static int hf_uftp_clientkey_hlen = -1;
-static int hf_uftp_clientkey_reserved = -1;
-static int hf_uftp_clientkey_bloblen = -1;
-static int hf_uftp_clientkey_siglen = -1;
-static int hf_uftp_clientkey_keyblob = -1;
-static int hf_uftp_clientkey_verify = -1;
+static int hf_uftp_clientkey;
+static int hf_uftp_clientkey_func;
+static int hf_uftp_clientkey_hlen;
+static int hf_uftp_clientkey_reserved;
+static int hf_uftp_clientkey_bloblen;
+static int hf_uftp_clientkey_siglen;
+static int hf_uftp_clientkey_keyblob;
+static int hf_uftp_clientkey_verify;
 
 /* REG_CONF fields */
-static int hf_uftp_regconf = -1;
-static int hf_uftp_regconf_func = -1;
-static int hf_uftp_regconf_hlen = -1;
-static int hf_uftp_regconf_reserved = -1;
+static int hf_uftp_regconf;
+static int hf_uftp_regconf_func;
+static int hf_uftp_regconf_hlen;
+static int hf_uftp_regconf_reserved;
 
 /* KEYINFO fields */
-static int hf_uftp_keyinfo = -1;
-static int hf_uftp_keyinfo_func = -1;
-static int hf_uftp_keyinfo_hlen = -1;
-static int hf_uftp_keyinfo_reserved = -1;
-static int hf_uftp_keyinfo_ivctr = -1;
-static int hf_uftp_keyinfo_destkey = -1;
-static int hf_uftp_keyinfo_destid = -1;
-static int hf_uftp_keyinfo_groupmaster = -1;
+static int hf_uftp_keyinfo;
+static int hf_uftp_keyinfo_func;
+static int hf_uftp_keyinfo_hlen;
+static int hf_uftp_keyinfo_reserved;
+static int hf_uftp_keyinfo_ivctr;
+static int hf_uftp_keyinfo_destkey;
+static int hf_uftp_keyinfo_destid;
+static int hf_uftp_keyinfo_groupmaster;
 
 /* KEYINFO_ACK fields */
-static int hf_uftp_keyinfoack = -1;
-static int hf_uftp_keyinfoack_func = -1;
-static int hf_uftp_keyinfoack_hlen = -1;
-static int hf_uftp_keyinfoack_reserved = -1;
-static int hf_uftp_keyinfoack_verify_data = -1;
+static int hf_uftp_keyinfoack;
+static int hf_uftp_keyinfoack_func;
+static int hf_uftp_keyinfoack_hlen;
+static int hf_uftp_keyinfoack_reserved;
+static int hf_uftp_keyinfoack_verify_data;
 
 /* FILEINFO fields */
-static int hf_uftp_fileinfo = -1;
-static int hf_uftp_fileinfo_func = -1;
-static int hf_uftp_fileinfo_hlen = -1;
-static int hf_uftp_fileinfo_file_id = -1;
-static int hf_uftp_fileinfo_ftype = -1;
-static int hf_uftp_fileinfo_reserved = -1;
-static int hf_uftp_fileinfo_namelen = -1;
-static int hf_uftp_fileinfo_linklen = -1;
-static int hf_uftp_fileinfo_fsize = -1;
-static int hf_uftp_fileinfo_ftstamp = -1;
-static int hf_uftp_fileinfo_tstamp = -1;
-static int hf_uftp_fileinfo_name = -1;
-static int hf_uftp_fileinfo_link = -1;
+static int hf_uftp_fileinfo;
+static int hf_uftp_fileinfo_func;
+static int hf_uftp_fileinfo_hlen;
+static int hf_uftp_fileinfo_file_id;
+static int hf_uftp_fileinfo_ftype;
+static int hf_uftp_fileinfo_reserved;
+static int hf_uftp_fileinfo_namelen;
+static int hf_uftp_fileinfo_linklen;
+static int hf_uftp_fileinfo_fsize;
+static int hf_uftp_fileinfo_ftstamp;
+static int hf_uftp_fileinfo_tstamp;
+static int hf_uftp_fileinfo_name;
+static int hf_uftp_fileinfo_link;
 
 /* FILEINFO_ACK fields */
-static int hf_uftp_fileinfoack = -1;
-static int hf_uftp_fileinfoack_func = -1;
-static int hf_uftp_fileinfoack_hlen = -1;
-static int hf_uftp_fileinfoack_file_id = -1;
-static int hf_uftp_fileinfoack_flags = -1;
-static int hf_uftp_fileinfoack_flags_partial = -1;
-static int hf_uftp_fileinfoack_flags_reserved = -1;
-static int hf_uftp_fileinfoack_reserved = -1;
-static int hf_uftp_fileinfoack_tstamp = -1;
+static int hf_uftp_fileinfoack;
+static int hf_uftp_fileinfoack_func;
+static int hf_uftp_fileinfoack_hlen;
+static int hf_uftp_fileinfoack_file_id;
+static int hf_uftp_fileinfoack_flags;
+static int hf_uftp_fileinfoack_flags_partial;
+static int hf_uftp_fileinfoack_flags_reserved;
+static int hf_uftp_fileinfoack_reserved;
+static int hf_uftp_fileinfoack_tstamp;
 
 /* FILESEG fields */
-static int hf_uftp_fileseg = -1;
-static int hf_uftp_fileseg_func = -1;
-static int hf_uftp_fileseg_hlen = -1;
-static int hf_uftp_fileseg_file_id = -1;
-static int hf_uftp_fileseg_section = -1;
-static int hf_uftp_fileseg_sec_block = -1;
-static int hf_uftp_fileseg_data = -1;
+static int hf_uftp_fileseg;
+static int hf_uftp_fileseg_func;
+static int hf_uftp_fileseg_hlen;
+static int hf_uftp_fileseg_file_id;
+static int hf_uftp_fileseg_section;
+static int hf_uftp_fileseg_sec_block;
+static int hf_uftp_fileseg_data;
 
 /* EXT_TFMCC_DATA_INFO fields */
-static int hf_uftp_tfmccdata = -1;
-static int hf_uftp_tfmccdata_exttype = -1;
-static int hf_uftp_tfmccdata_extlen = -1;
-static int hf_uftp_tfmccdata_send_rate = -1;
-static int hf_uftp_tfmccdata_cc_seq = -1;
-static int hf_uftp_tfmccdata_cc_rate = -1;
+static int hf_uftp_tfmccdata;
+static int hf_uftp_tfmccdata_exttype;
+static int hf_uftp_tfmccdata_extlen;
+static int hf_uftp_tfmccdata_send_rate;
+static int hf_uftp_tfmccdata_cc_seq;
+static int hf_uftp_tfmccdata_cc_rate;
 
 /* DONE fields */
-static int hf_uftp_done = -1;
-static int hf_uftp_done_func = -1;
-static int hf_uftp_done_hlen = -1;
-static int hf_uftp_done_file_id = -1;
-static int hf_uftp_done_section = -1;
-static int hf_uftp_done_reserved = -1;
+static int hf_uftp_done;
+static int hf_uftp_done_func;
+static int hf_uftp_done_hlen;
+static int hf_uftp_done_file_id;
+static int hf_uftp_done_section;
+static int hf_uftp_done_reserved;
 
 /* STATUS fields */
-static int hf_uftp_status = -1;
-static int hf_uftp_status_func = -1;
-static int hf_uftp_status_hlen = -1;
-static int hf_uftp_status_file_id = -1;
-static int hf_uftp_status_section = -1;
-static int hf_uftp_status_reserved = -1;
-static int hf_uftp_status_naks = -1;
+static int hf_uftp_status;
+static int hf_uftp_status_func;
+static int hf_uftp_status_hlen;
+static int hf_uftp_status_file_id;
+static int hf_uftp_status_section;
+static int hf_uftp_status_reserved;
+static int hf_uftp_status_naks;
 
 /* COMPLETE fields */
-static int hf_uftp_complete = -1;
-static int hf_uftp_complete_func = -1;
-static int hf_uftp_complete_hlen = -1;
-static int hf_uftp_complete_file_id = -1;
-static int hf_uftp_complete_status = -1;
-static int hf_uftp_complete_reserved = -1;
+static int hf_uftp_complete;
+static int hf_uftp_complete_func;
+static int hf_uftp_complete_hlen;
+static int hf_uftp_complete_file_id;
+static int hf_uftp_complete_status;
+static int hf_uftp_complete_reserved;
 
 /* EXT_FREESPACE_INFO fields */
-static int hf_uftp_freespace = -1;
-static int hf_uftp_freespace_exttype = -1;
-static int hf_uftp_freespace_extlen = -1;
-static int hf_uftp_freespace_reserved = -1;
-static int hf_uftp_freespace_freespace = -1;
+static int hf_uftp_freespace;
+static int hf_uftp_freespace_exttype;
+static int hf_uftp_freespace_extlen;
+static int hf_uftp_freespace_reserved;
+static int hf_uftp_freespace_freespace;
 
 /* DONE_CONF fields */
-static int hf_uftp_doneconf = -1;
-static int hf_uftp_doneconf_func = -1;
-static int hf_uftp_doneconf_hlen = -1;
-static int hf_uftp_doneconf_reserved = -1;
+static int hf_uftp_doneconf;
+static int hf_uftp_doneconf_func;
+static int hf_uftp_doneconf_hlen;
+static int hf_uftp_doneconf_reserved;
 
 /* HB_REQ fields */
-static int hf_uftp_hbreq = -1;
-static int hf_uftp_hbreq_func = -1;
-static int hf_uftp_hbreq_hlen = -1;
-static int hf_uftp_hbreq_reserved = -1;
-static int hf_uftp_hbreq_bloblen = -1;
-static int hf_uftp_hbreq_siglen = -1;
-static int hf_uftp_hbreq_nonce = -1;
-static int hf_uftp_hbreq_keyblob = -1;
-static int hf_uftp_hbreq_verify = -1;
+static int hf_uftp_hbreq;
+static int hf_uftp_hbreq_func;
+static int hf_uftp_hbreq_hlen;
+static int hf_uftp_hbreq_reserved;
+static int hf_uftp_hbreq_bloblen;
+static int hf_uftp_hbreq_siglen;
+static int hf_uftp_hbreq_nonce;
+static int hf_uftp_hbreq_keyblob;
+static int hf_uftp_hbreq_verify;
 
 /* HB_RESP fields */
-static int hf_uftp_hbresp = -1;
-static int hf_uftp_hbresp_func = -1;
-static int hf_uftp_hbresp_hlen = -1;
-static int hf_uftp_hbresp_authenticated = -1;
-static int hf_uftp_hbresp_reserved = -1;
-static int hf_uftp_hbresp_nonce = -1;
+static int hf_uftp_hbresp;
+static int hf_uftp_hbresp_func;
+static int hf_uftp_hbresp_hlen;
+static int hf_uftp_hbresp_authenticated;
+static int hf_uftp_hbresp_reserved;
+static int hf_uftp_hbresp_nonce;
 
 /* KEY_REQ fields */
-static int hf_uftp_keyreq = -1;
-static int hf_uftp_keyreq_func = -1;
-static int hf_uftp_keyreq_hlen = -1;
-static int hf_uftp_keyreq_reserved = -1;
+static int hf_uftp_keyreq;
+static int hf_uftp_keyreq_func;
+static int hf_uftp_keyreq_hlen;
+static int hf_uftp_keyreq_reserved;
 
 /* PROXY_KEY fields */
-static int hf_uftp_proxykey = -1;
-static int hf_uftp_proxykey_func = -1;
-static int hf_uftp_proxykey_hlen = -1;
-static int hf_uftp_proxykey_bloblen = -1;
-static int hf_uftp_proxykey_dhlen = -1;
-static int hf_uftp_proxykey_siglen = -1;
-static int hf_uftp_proxykey_nonce = -1;
-static int hf_uftp_proxykey_keyblob = -1;
-static int hf_uftp_proxykey_dhblob = -1;
-static int hf_uftp_proxykey_verify = -1;
+static int hf_uftp_proxykey;
+static int hf_uftp_proxykey_func;
+static int hf_uftp_proxykey_hlen;
+static int hf_uftp_proxykey_bloblen;
+static int hf_uftp_proxykey_dhlen;
+static int hf_uftp_proxykey_siglen;
+static int hf_uftp_proxykey_nonce;
+static int hf_uftp_proxykey_keyblob;
+static int hf_uftp_proxykey_dhblob;
+static int hf_uftp_proxykey_verify;
 
 /* CONG_CTRL fields */
-static int hf_uftp_congctrl = -1;
-static int hf_uftp_congctrl_func = -1;
-static int hf_uftp_congctrl_hlen = -1;
-static int hf_uftp_congctrl_reserved = -1;
-static int hf_uftp_congctrl_cc_seq = -1;
-static int hf_uftp_congctrl_cc_rate = -1;
-static int hf_uftp_congctrl_tstamp = -1;
-static int hf_uftp_congctrl_cclist = -1;
-static int hf_uftp_congctrl_item = -1;
-static int hf_uftp_congctrl_item_destid = -1;
-static int hf_uftp_congctrl_item_flags = -1;
-static int hf_uftp_congctrl_item_flags_clr = -1;
-static int hf_uftp_congctrl_item_flags_rtt = -1;
-static int hf_uftp_congctrl_item_flags_start = -1;
-static int hf_uftp_congctrl_item_flags_leave = -1;
-static int hf_uftp_congctrl_item_flags_reserved = -1;
-static int hf_uftp_congctrl_item_rtt = -1;
-static int hf_uftp_congctrl_item_rate = -1;
+static int hf_uftp_congctrl;
+static int hf_uftp_congctrl_func;
+static int hf_uftp_congctrl_hlen;
+static int hf_uftp_congctrl_reserved;
+static int hf_uftp_congctrl_cc_seq;
+static int hf_uftp_congctrl_cc_rate;
+static int hf_uftp_congctrl_tstamp;
+static int hf_uftp_congctrl_cclist;
+static int hf_uftp_congctrl_item;
+static int hf_uftp_congctrl_item_destid;
+static int hf_uftp_congctrl_item_flags;
+static int hf_uftp_congctrl_item_flags_clr;
+static int hf_uftp_congctrl_item_flags_rtt;
+static int hf_uftp_congctrl_item_flags_start;
+static int hf_uftp_congctrl_item_flags_leave;
+static int hf_uftp_congctrl_item_flags_reserved;
+static int hf_uftp_congctrl_item_rtt;
+static int hf_uftp_congctrl_item_rate;
 
 /* CC_ACK fields */
-static int hf_uftp_ccack = -1;
-static int hf_uftp_ccack_func = -1;
-static int hf_uftp_ccack_hlen = -1;
-static int hf_uftp_ccack_reserved = -1;
+static int hf_uftp_ccack;
+static int hf_uftp_ccack_func;
+static int hf_uftp_ccack_hlen;
+static int hf_uftp_ccack_reserved;
 
 /* EXT_TFMCC_ACK_INFO fields */
-static int hf_uftp_tfmccack = -1;
-static int hf_uftp_tfmccack_exttype = -1;
-static int hf_uftp_tfmccack_extlen = -1;
-static int hf_uftp_tfmccack_flags = -1;
-static int hf_uftp_tfmccack_flags_clr = -1;
-static int hf_uftp_tfmccack_flags_rtt = -1;
-static int hf_uftp_tfmccack_flags_start = -1;
-static int hf_uftp_tfmccack_flags_leave = -1;
-static int hf_uftp_tfmccack_flags_reserved = -1;
-static int hf_uftp_tfmccack_reserved = -1;
-static int hf_uftp_tfmccack_cc_seq = -1;
-static int hf_uftp_tfmccack_cc_rate = -1;
-static int hf_uftp_tfmccack_client_id = -1;
-static int hf_uftp_tfmccack_tstamp = -1;
+static int hf_uftp_tfmccack;
+static int hf_uftp_tfmccack_exttype;
+static int hf_uftp_tfmccack_extlen;
+static int hf_uftp_tfmccack_flags;
+static int hf_uftp_tfmccack_flags_clr;
+static int hf_uftp_tfmccack_flags_rtt;
+static int hf_uftp_tfmccack_flags_start;
+static int hf_uftp_tfmccack_flags_leave;
+static int hf_uftp_tfmccack_flags_reserved;
+static int hf_uftp_tfmccack_reserved;
+static int hf_uftp_tfmccack_cc_seq;
+static int hf_uftp_tfmccack_cc_rate;
+static int hf_uftp_tfmccack_client_id;
+static int hf_uftp_tfmccack_tstamp;
 
 /* ENCRYPTED fields */
-static int hf_uftp_encrypted = -1;
-static int hf_uftp_encrypted_ivctr = -1;
-static int hf_uftp_encrypted_sig_len = -1;
-static int hf_uftp_encrypted_payload_len = -1;
-static int hf_uftp_encrypted_signature = -1;
-static int hf_uftp_encrypted_payload = -1;
+static int hf_uftp_encrypted;
+static int hf_uftp_encrypted_ivctr;
+static int hf_uftp_encrypted_sig_len;
+static int hf_uftp_encrypted_payload_len;
+static int hf_uftp_encrypted_signature;
+static int hf_uftp_encrypted_payload;
 
 /* ABORT fields */
-static int hf_uftp_abort = -1;
-static int hf_uftp_abort_func = -1;
-static int hf_uftp_abort_hlen = -1;
-static int hf_uftp_abort_flags = -1;
-static int hf_uftp_abort_flags_curfile = -1;
-static int hf_uftp_abort_flags_reserved = -1;
-static int hf_uftp_abort_reserved = -1;
-static int hf_uftp_abort_clientid = -1;
-static int hf_uftp_abort_message = -1;
-
-static gint ett_uftp = -1;
-static gint ett_uftp_announce = -1;
-static gint ett_uftp_register = -1;
-static gint ett_uftp_clientkey = -1;
-static gint ett_uftp_regconf = -1;
-static gint ett_uftp_keyinfo = -1;
-static gint ett_uftp_keyinfoack = -1;
-static gint ett_uftp_fileinfo = -1;
-static gint ett_uftp_fileinfoack = -1;
-static gint ett_uftp_fileseg = -1;
-static gint ett_uftp_done = -1;
-static gint ett_uftp_status = -1;
-static gint ett_uftp_complete = -1;
-static gint ett_uftp_doneconf = -1;
-static gint ett_uftp_hbreq = -1;
-static gint ett_uftp_hbresp = -1;
-static gint ett_uftp_keyreq = -1;
-static gint ett_uftp_proxykey = -1;
-static gint ett_uftp_congctrl = -1;
-static gint ett_uftp_ccack = -1;
-static gint ett_uftp_encrypted = -1;
-static gint ett_uftp_abort = -1;
-
-static gint ett_uftp_announce_flags = -1;
-static gint ett_uftp_encinfo = -1;
-static gint ett_uftp_encinfo_flags = -1;
-static gint ett_uftp_keyinfo_destkey = -1;
-static gint ett_uftp_fileinfoack_flags = -1;
-static gint ett_uftp_congctrl_cclist = -1;
-static gint ett_uftp_congctrl_item = -1;
-static gint ett_uftp_congctrl_item_flags = -1;
-static gint ett_uftp_tfmccdata = -1;
-static gint ett_uftp_tfmccack = -1;
-static gint ett_uftp_tfmccack_flags = -1;
-static gint ett_uftp_freespace = -1;
-static gint ett_uftp_abort_flags = -1;
-
-static gint ett_uftp_destlist = -1;
-static gint ett_uftp_rsablob = -1;
-static gint ett_uftp_ecblob = -1;
-
-static expert_field ei_uftp_length_invalid = EI_INIT;
-static expert_field ei_uftp_func_unknown = EI_INIT;
+static int hf_uftp_abort;
+static int hf_uftp_abort_func;
+static int hf_uftp_abort_hlen;
+static int hf_uftp_abort_flags;
+static int hf_uftp_abort_flags_curfile;
+static int hf_uftp_abort_flags_reserved;
+static int hf_uftp_abort_reserved;
+static int hf_uftp_abort_clientid;
+static int hf_uftp_abort_message;
+
+static gint ett_uftp;
+static gint ett_uftp_announce;
+static gint ett_uftp_register;
+static gint ett_uftp_clientkey;
+static gint ett_uftp_regconf;
+static gint ett_uftp_keyinfo;
+static gint ett_uftp_keyinfoack;
+static gint ett_uftp_fileinfo;
+static gint ett_uftp_fileinfoack;
+static gint ett_uftp_fileseg;
+static gint ett_uftp_done;
+static gint ett_uftp_status;
+static gint ett_uftp_complete;
+static gint ett_uftp_doneconf;
+static gint ett_uftp_hbreq;
+static gint ett_uftp_hbresp;
+static gint ett_uftp_keyreq;
+static gint ett_uftp_proxykey;
+static gint ett_uftp_congctrl;
+static gint ett_uftp_ccack;
+static gint ett_uftp_encrypted;
+static gint ett_uftp_abort;
+
+static gint ett_uftp_announce_flags;
+static gint ett_uftp_encinfo;
+static gint ett_uftp_encinfo_flags;
+static gint ett_uftp_keyinfo_destkey;
+static gint ett_uftp_fileinfoack_flags;
+static gint ett_uftp_congctrl_cclist;
+static gint ett_uftp_congctrl_item;
+static gint ett_uftp_congctrl_item_flags;
+static gint ett_uftp_tfmccdata;
+static gint ett_uftp_tfmccack;
+static gint ett_uftp_tfmccack_flags;
+static gint ett_uftp_freespace;
+static gint ett_uftp_abort_flags;
+
+static gint ett_uftp_destlist;
+static gint ett_uftp_rsablob;
+static gint ett_uftp_ecblob;
+
+static expert_field ei_uftp_length_invalid;
+static expert_field ei_uftp_func_unknown;
 
 static const value_string messages[] = {
     { ANNOUNCE,      "ANNOUNCE" },
diff --git a/epan/dissectors/packet-uftp5.c b/epan/dissectors/packet-uftp5.c
index 9a495237dc..8b310f1e2a 100644
--- a/epan/dissectors/packet-uftp5.c
+++ b/epan/dissectors/packet-uftp5.c
@@ -208,329 +208,329 @@
 
 void proto_register_uftp5(void);
 
-static int proto_uftp = -1;
+static int proto_uftp;
 
 /* main header and common fields */
-static int hf_uftp_version = -1;
-static int hf_uftp_func = -1;
-static int hf_uftp_seq = -1;
-static int hf_uftp_src_id = -1;
-static int hf_uftp_group_id = -1;
-static int hf_uftp_group_inst = -1;
-static int hf_uftp_grtt = -1;
-static int hf_uftp_gsize = -1;
-static int hf_uftp_reserved = -1;
-
-static int hf_uftp_destlist = -1;
-static int hf_uftp_dest = -1;
+static int hf_uftp_version;
+static int hf_uftp_func;
+static int hf_uftp_seq;
+static int hf_uftp_src_id;
+static int hf_uftp_group_id;
+static int hf_uftp_group_inst;
+static int hf_uftp_grtt;
+static int hf_uftp_gsize;
+static int hf_uftp_reserved;
+
+static int hf_uftp_destlist;
+static int hf_uftp_dest;
 
 /* ANNOUNCE fields */
-static int hf_uftp_announce = -1;
-static int hf_uftp_announce_func = -1;
-static int hf_uftp_announce_hlen = -1;
-static int hf_uftp_announce_flags = -1;
-static int hf_uftp_announce_flags_sync = -1;
-static int hf_uftp_announce_flags_syncpreview = -1;
-static int hf_uftp_announce_flags_ipv6 = -1;
-static int hf_uftp_announce_flags_reserved = -1;
-static int hf_uftp_announce_robust = -1;
-static int hf_uftp_announce_cc_type = -1;
-static int hf_uftp_announce_reserved = -1;
-static int hf_uftp_announce_blocksize = -1;
-static int hf_uftp_announce_tstamp = -1;
-static int hf_uftp_announce_publicmcast_ipv4 = -1;
-static int hf_uftp_announce_publicmcast_ipv6 = -1;
-static int hf_uftp_announce_privatemcast_ipv4 = -1;
-static int hf_uftp_announce_privatemcast_ipv6 = -1;
+static int hf_uftp_announce;
+static int hf_uftp_announce_func;
+static int hf_uftp_announce_hlen;
+static int hf_uftp_announce_flags;
+static int hf_uftp_announce_flags_sync;
+static int hf_uftp_announce_flags_syncpreview;
+static int hf_uftp_announce_flags_ipv6;
+static int hf_uftp_announce_flags_reserved;
+static int hf_uftp_announce_robust;
+static int hf_uftp_announce_cc_type;
+static int hf_uftp_announce_reserved;
+static int hf_uftp_announce_blocksize;
+static int hf_uftp_announce_tstamp;
+static int hf_uftp_announce_publicmcast_ipv4;
+static int hf_uftp_announce_publicmcast_ipv6;
+static int hf_uftp_announce_privatemcast_ipv4;
+static int hf_uftp_announce_privatemcast_ipv6;
 
 /* EXT_ENC_INFO fields */
-static int hf_uftp_encinfo = -1;
-static int hf_uftp_encinfo_exttype = -1;
-static int hf_uftp_encinfo_extlen = -1;
-static int hf_uftp_encinfo_flags = -1;
-static int hf_uftp_encinfo_flags_client_auth = -1;
-static int hf_uftp_encinfo_flags_reserved = -1;
-static int hf_uftp_encinfo_reserved = -1;
-static int hf_uftp_encinfo_keytype = -1;
-static int hf_uftp_encinfo_hashtype = -1;
-static int hf_uftp_encinfo_keylen = -1;
-static int hf_uftp_encinfo_dhlen = -1;
-static int hf_uftp_encinfo_siglen = -1;
-static int hf_uftp_encinfo_rand1 = -1;
-static int hf_uftp_encinfo_keyblob = -1;
-static int hf_uftp_encinfo_dhblob = -1;
-static int hf_uftp_encinfo_sig = -1;
+static int hf_uftp_encinfo;
+static int hf_uftp_encinfo_exttype;
+static int hf_uftp_encinfo_extlen;
+static int hf_uftp_encinfo_flags;
+static int hf_uftp_encinfo_flags_client_auth;
+static int hf_uftp_encinfo_flags_reserved;
+static int hf_uftp_encinfo_reserved;
+static int hf_uftp_encinfo_keytype;
+static int hf_uftp_encinfo_hashtype;
+static int hf_uftp_encinfo_keylen;
+static int hf_uftp_encinfo_dhlen;
+static int hf_uftp_encinfo_siglen;
+static int hf_uftp_encinfo_rand1;
+static int hf_uftp_encinfo_keyblob;
+static int hf_uftp_encinfo_dhblob;
+static int hf_uftp_encinfo_sig;
 
 /* rsa_blob_t fields */
-static int hf_uftp_rsablob_blobtype = -1;
-static int hf_uftp_rsablob_reserved = -1;
-static int hf_uftp_rsablob_modlen = -1;
-static int hf_uftp_rsablob_exponent = -1;
-static int hf_uftp_rsablob_modulus = -1;
+static int hf_uftp_rsablob_blobtype;
+static int hf_uftp_rsablob_reserved;
+static int hf_uftp_rsablob_modlen;
+static int hf_uftp_rsablob_exponent;
+static int hf_uftp_rsablob_modulus;
 
 /* ec_blob_t fields */
-static int hf_uftp_ecblob_blobtype = -1;
-static int hf_uftp_ecblob_curve = -1;
-static int hf_uftp_ecblob_keylen = -1;
-static int hf_uftp_ecblob_key = -1;
+static int hf_uftp_ecblob_blobtype;
+static int hf_uftp_ecblob_curve;
+static int hf_uftp_ecblob_keylen;
+static int hf_uftp_ecblob_key;
 
 /* REGISTER fields */
-static int hf_uftp_register = -1;
-static int hf_uftp_register_func = -1;
-static int hf_uftp_register_hlen = -1;
-static int hf_uftp_register_dhlen = -1;
-static int hf_uftp_register_tstamp = -1;
-static int hf_uftp_register_rand2 = -1;
-static int hf_uftp_register_dhkey = -1;
+static int hf_uftp_register;
+static int hf_uftp_register_func;
+static int hf_uftp_register_hlen;
+static int hf_uftp_register_dhlen;
+static int hf_uftp_register_tstamp;
+static int hf_uftp_register_rand2;
+static int hf_uftp_register_dhkey;
 
 /* CLIENT_KEY fields */
-static int hf_uftp_clientkey = -1;
-static int hf_uftp_clientkey_func = -1;
-static int hf_uftp_clientkey_hlen = -1;
-static int hf_uftp_clientkey_reserved = -1;
-static int hf_uftp_clientkey_bloblen = -1;
-static int hf_uftp_clientkey_siglen = -1;
-static int hf_uftp_clientkey_keyblob = -1;
-static int hf_uftp_clientkey_verify = -1;
+static int hf_uftp_clientkey;
+static int hf_uftp_clientkey_func;
+static int hf_uftp_clientkey_hlen;
+static int hf_uftp_clientkey_reserved;
+static int hf_uftp_clientkey_bloblen;
+static int hf_uftp_clientkey_siglen;
+static int hf_uftp_clientkey_keyblob;
+static int hf_uftp_clientkey_verify;
 
 /* REG_CONF fields */
-static int hf_uftp_regconf = -1;
-static int hf_uftp_regconf_func = -1;
-static int hf_uftp_regconf_hlen = -1;
-static int hf_uftp_regconf_reserved = -1;
+static int hf_uftp_regconf;
+static int hf_uftp_regconf_func;
+static int hf_uftp_regconf_hlen;
+static int hf_uftp_regconf_reserved;
 
 /* KEYINFO fields */
-static int hf_uftp_keyinfo = -1;
-static int hf_uftp_keyinfo_func = -1;
-static int hf_uftp_keyinfo_hlen = -1;
-static int hf_uftp_keyinfo_siglen = -1;
-static int hf_uftp_keyinfo_ivctr = -1;
-static int hf_uftp_keyinfo_sig = -1;
-static int hf_uftp_keyinfo_destkey = -1;
-static int hf_uftp_keyinfo_destid = -1;
-static int hf_uftp_keyinfo_groupmaster = -1;
+static int hf_uftp_keyinfo;
+static int hf_uftp_keyinfo_func;
+static int hf_uftp_keyinfo_hlen;
+static int hf_uftp_keyinfo_siglen;
+static int hf_uftp_keyinfo_ivctr;
+static int hf_uftp_keyinfo_sig;
+static int hf_uftp_keyinfo_destkey;
+static int hf_uftp_keyinfo_destid;
+static int hf_uftp_keyinfo_groupmaster;
 
 /* KEYINFO_ACK fields */
-static int hf_uftp_keyinfoack = -1;
-static int hf_uftp_keyinfoack_func = -1;
-static int hf_uftp_keyinfoack_hlen = -1;
-static int hf_uftp_keyinfoack_verify_len = -1;
-static int hf_uftp_keyinfoack_verify_data = -1;
+static int hf_uftp_keyinfoack;
+static int hf_uftp_keyinfoack_func;
+static int hf_uftp_keyinfoack_hlen;
+static int hf_uftp_keyinfoack_verify_len;
+static int hf_uftp_keyinfoack_verify_data;
 
 /* FILEINFO fields */
-static int hf_uftp_fileinfo = -1;
-static int hf_uftp_fileinfo_func = -1;
-static int hf_uftp_fileinfo_hlen = -1;
-static int hf_uftp_fileinfo_file_id = -1;
-static int hf_uftp_fileinfo_ftype = -1;
-static int hf_uftp_fileinfo_reserved = -1;
-static int hf_uftp_fileinfo_ftstamp_hi = -1;
-static int hf_uftp_fileinfo_namelen = -1;
-static int hf_uftp_fileinfo_linklen = -1;
-static int hf_uftp_fileinfo_fsize = -1;
-static int hf_uftp_fileinfo_ftstamp = -1;
-static int hf_uftp_fileinfo_tstamp = -1;
-static int hf_uftp_fileinfo_name = -1;
-static int hf_uftp_fileinfo_link = -1;
+static int hf_uftp_fileinfo;
+static int hf_uftp_fileinfo_func;
+static int hf_uftp_fileinfo_hlen;
+static int hf_uftp_fileinfo_file_id;
+static int hf_uftp_fileinfo_ftype;
+static int hf_uftp_fileinfo_reserved;
+static int hf_uftp_fileinfo_ftstamp_hi;
+static int hf_uftp_fileinfo_namelen;
+static int hf_uftp_fileinfo_linklen;
+static int hf_uftp_fileinfo_fsize;
+static int hf_uftp_fileinfo_ftstamp;
+static int hf_uftp_fileinfo_tstamp;
+static int hf_uftp_fileinfo_name;
+static int hf_uftp_fileinfo_link;
 
 /* FILEINFO_ACK fields */
-static int hf_uftp_fileinfoack = -1;
-static int hf_uftp_fileinfoack_func = -1;
-static int hf_uftp_fileinfoack_hlen = -1;
-static int hf_uftp_fileinfoack_file_id = -1;
-static int hf_uftp_fileinfoack_flags = -1;
-static int hf_uftp_fileinfoack_flags_partial = -1;
-static int hf_uftp_fileinfoack_flags_reserved = -1;
-static int hf_uftp_fileinfoack_reserved = -1;
-static int hf_uftp_fileinfoack_tstamp = -1;
+static int hf_uftp_fileinfoack;
+static int hf_uftp_fileinfoack_func;
+static int hf_uftp_fileinfoack_hlen;
+static int hf_uftp_fileinfoack_file_id;
+static int hf_uftp_fileinfoack_flags;
+static int hf_uftp_fileinfoack_flags_partial;
+static int hf_uftp_fileinfoack_flags_reserved;
+static int hf_uftp_fileinfoack_reserved;
+static int hf_uftp_fileinfoack_tstamp;
 
 /* FILESEG fields */
-static int hf_uftp_fileseg = -1;
-static int hf_uftp_fileseg_func = -1;
-static int hf_uftp_fileseg_hlen = -1;
-static int hf_uftp_fileseg_file_id = -1;
-static int hf_uftp_fileseg_section = -1;
-static int hf_uftp_fileseg_sec_block = -1;
-static int hf_uftp_fileseg_data = -1;
+static int hf_uftp_fileseg;
+static int hf_uftp_fileseg_func;
+static int hf_uftp_fileseg_hlen;
+static int hf_uftp_fileseg_file_id;
+static int hf_uftp_fileseg_section;
+static int hf_uftp_fileseg_sec_block;
+static int hf_uftp_fileseg_data;
 
 /* EXT_TFMCC_DATA_INFO fields */
-static int hf_uftp_tfmccdata = -1;
-static int hf_uftp_tfmccdata_exttype = -1;
-static int hf_uftp_tfmccdata_extlen = -1;
-static int hf_uftp_tfmccdata_send_rate = -1;
-static int hf_uftp_tfmccdata_cc_seq = -1;
-static int hf_uftp_tfmccdata_cc_rate = -1;
+static int hf_uftp_tfmccdata;
+static int hf_uftp_tfmccdata_exttype;
+static int hf_uftp_tfmccdata_extlen;
+static int hf_uftp_tfmccdata_send_rate;
+static int hf_uftp_tfmccdata_cc_seq;
+static int hf_uftp_tfmccdata_cc_rate;
 
 /* DONE fields */
-static int hf_uftp_done = -1;
-static int hf_uftp_done_func = -1;
-static int hf_uftp_done_hlen = -1;
-static int hf_uftp_done_file_id = -1;
-static int hf_uftp_done_section = -1;
-static int hf_uftp_done_reserved = -1;
+static int hf_uftp_done;
+static int hf_uftp_done_func;
+static int hf_uftp_done_hlen;
+static int hf_uftp_done_file_id;
+static int hf_uftp_done_section;
+static int hf_uftp_done_reserved;
 
 /* STATUS fields */
-static int hf_uftp_status = -1;
-static int hf_uftp_status_func = -1;
-static int hf_uftp_status_hlen = -1;
-static int hf_uftp_status_file_id = -1;
-static int hf_uftp_status_section = -1;
-static int hf_uftp_status_reserved = -1;
-static int hf_uftp_status_naks = -1;
+static int hf_uftp_status;
+static int hf_uftp_status_func;
+static int hf_uftp_status_hlen;
+static int hf_uftp_status_file_id;
+static int hf_uftp_status_section;
+static int hf_uftp_status_reserved;
+static int hf_uftp_status_naks;
 
 /* COMPLETE fields */
-static int hf_uftp_complete = -1;
-static int hf_uftp_complete_func = -1;
-static int hf_uftp_complete_hlen = -1;
-static int hf_uftp_complete_file_id = -1;
-static int hf_uftp_complete_status = -1;
-static int hf_uftp_complete_reserved = -1;
+static int hf_uftp_complete;
+static int hf_uftp_complete_func;
+static int hf_uftp_complete_hlen;
+static int hf_uftp_complete_file_id;
+static int hf_uftp_complete_status;
+static int hf_uftp_complete_reserved;
 
 /* EXT_FREESPACE_INFO fields */
-static int hf_uftp_freespace = -1;
-static int hf_uftp_freespace_exttype = -1;
-static int hf_uftp_freespace_extlen = -1;
-static int hf_uftp_freespace_reserved = -1;
-static int hf_uftp_freespace_freespace = -1;
+static int hf_uftp_freespace;
+static int hf_uftp_freespace_exttype;
+static int hf_uftp_freespace_extlen;
+static int hf_uftp_freespace_reserved;
+static int hf_uftp_freespace_freespace;
 
 /* DONE_CONF fields */
-static int hf_uftp_doneconf = -1;
-static int hf_uftp_doneconf_func = -1;
-static int hf_uftp_doneconf_hlen = -1;
-static int hf_uftp_doneconf_reserved = -1;
+static int hf_uftp_doneconf;
+static int hf_uftp_doneconf_func;
+static int hf_uftp_doneconf_hlen;
+static int hf_uftp_doneconf_reserved;
 
 /* HB_REQ fields */
-static int hf_uftp_hbreq = -1;
-static int hf_uftp_hbreq_func = -1;
-static int hf_uftp_hbreq_hlen = -1;
-static int hf_uftp_hbreq_reserved = -1;
-static int hf_uftp_hbreq_bloblen = -1;
-static int hf_uftp_hbreq_siglen = -1;
-static int hf_uftp_hbreq_nonce = -1;
-static int hf_uftp_hbreq_keyblob = -1;
-static int hf_uftp_hbreq_verify = -1;
+static int hf_uftp_hbreq;
+static int hf_uftp_hbreq_func;
+static int hf_uftp_hbreq_hlen;
+static int hf_uftp_hbreq_reserved;
+static int hf_uftp_hbreq_bloblen;
+static int hf_uftp_hbreq_siglen;
+static int hf_uftp_hbreq_nonce;
+static int hf_uftp_hbreq_keyblob;
+static int hf_uftp_hbreq_verify;
 
 /* HB_RESP fields */
-static int hf_uftp_hbresp = -1;
-static int hf_uftp_hbresp_func = -1;
-static int hf_uftp_hbresp_hlen = -1;
-static int hf_uftp_hbresp_authenticated = -1;
-static int hf_uftp_hbresp_reserved = -1;
-static int hf_uftp_hbresp_nonce = -1;
+static int hf_uftp_hbresp;
+static int hf_uftp_hbresp_func;
+static int hf_uftp_hbresp_hlen;
+static int hf_uftp_hbresp_authenticated;
+static int hf_uftp_hbresp_reserved;
+static int hf_uftp_hbresp_nonce;
 
 /* PROXY_KEY fields */
-static int hf_uftp_proxykey = -1;
-static int hf_uftp_proxykey_func = -1;
-static int hf_uftp_proxykey_hlen = -1;
-static int hf_uftp_proxykey_bloblen = -1;
-static int hf_uftp_proxykey_dhlen = -1;
-static int hf_uftp_proxykey_siglen = -1;
-static int hf_uftp_proxykey_keyblob = -1;
-static int hf_uftp_proxykey_dhblob = -1;
-static int hf_uftp_proxykey_sig = -1;
+static int hf_uftp_proxykey;
+static int hf_uftp_proxykey_func;
+static int hf_uftp_proxykey_hlen;
+static int hf_uftp_proxykey_bloblen;
+static int hf_uftp_proxykey_dhlen;
+static int hf_uftp_proxykey_siglen;
+static int hf_uftp_proxykey_keyblob;
+static int hf_uftp_proxykey_dhblob;
+static int hf_uftp_proxykey_sig;
 
 /* CONG_CTRL fields */
-static int hf_uftp_congctrl = -1;
-static int hf_uftp_congctrl_func = -1;
-static int hf_uftp_congctrl_hlen = -1;
-static int hf_uftp_congctrl_reserved = -1;
-static int hf_uftp_congctrl_cc_seq = -1;
-static int hf_uftp_congctrl_cc_rate = -1;
-static int hf_uftp_congctrl_tstamp = -1;
-static int hf_uftp_congctrl_cclist = -1;
-static int hf_uftp_congctrl_item = -1;
-static int hf_uftp_congctrl_item_destid = -1;
-static int hf_uftp_congctrl_item_flags = -1;
-static int hf_uftp_congctrl_item_flags_clr = -1;
-static int hf_uftp_congctrl_item_flags_rtt = -1;
-static int hf_uftp_congctrl_item_flags_start = -1;
-static int hf_uftp_congctrl_item_flags_leave = -1;
-static int hf_uftp_congctrl_item_flags_reserved = -1;
-static int hf_uftp_congctrl_item_rtt = -1;
-static int hf_uftp_congctrl_item_rate = -1;
+static int hf_uftp_congctrl;
+static int hf_uftp_congctrl_func;
+static int hf_uftp_congctrl_hlen;
+static int hf_uftp_congctrl_reserved;
+static int hf_uftp_congctrl_cc_seq;
+static int hf_uftp_congctrl_cc_rate;
+static int hf_uftp_congctrl_tstamp;
+static int hf_uftp_congctrl_cclist;
+static int hf_uftp_congctrl_item;
+static int hf_uftp_congctrl_item_destid;
+static int hf_uftp_congctrl_item_flags;
+static int hf_uftp_congctrl_item_flags_clr;
+static int hf_uftp_congctrl_item_flags_rtt;
+static int hf_uftp_congctrl_item_flags_start;
+static int hf_uftp_congctrl_item_flags_leave;
+static int hf_uftp_congctrl_item_flags_reserved;
+static int hf_uftp_congctrl_item_rtt;
+static int hf_uftp_congctrl_item_rate;
 
 /* CC_ACK fields */
-static int hf_uftp_ccack = -1;
-static int hf_uftp_ccack_func = -1;
-static int hf_uftp_ccack_hlen = -1;
-static int hf_uftp_ccack_reserved = -1;
+static int hf_uftp_ccack;
+static int hf_uftp_ccack_func;
+static int hf_uftp_ccack_hlen;
+static int hf_uftp_ccack_reserved;
 
 /* EXT_TFMCC_ACK_INFO fields */
-static int hf_uftp_tfmccack = -1;
-static int hf_uftp_tfmccack_exttype = -1;
-static int hf_uftp_tfmccack_extlen = -1;
-static int hf_uftp_tfmccack_flags = -1;
-static int hf_uftp_tfmccack_flags_clr = -1;
-static int hf_uftp_tfmccack_flags_rtt = -1;
-static int hf_uftp_tfmccack_flags_start = -1;
-static int hf_uftp_tfmccack_flags_leave = -1;
-static int hf_uftp_tfmccack_flags_reserved = -1;
-static int hf_uftp_tfmccack_reserved = -1;
-static int hf_uftp_tfmccack_cc_seq = -1;
-static int hf_uftp_tfmccack_cc_rate = -1;
-static int hf_uftp_tfmccack_client_id = -1;
-static int hf_uftp_tfmccack_tstamp = -1;
+static int hf_uftp_tfmccack;
+static int hf_uftp_tfmccack_exttype;
+static int hf_uftp_tfmccack_extlen;
+static int hf_uftp_tfmccack_flags;
+static int hf_uftp_tfmccack_flags_clr;
+static int hf_uftp_tfmccack_flags_rtt;
+static int hf_uftp_tfmccack_flags_start;
+static int hf_uftp_tfmccack_flags_leave;
+static int hf_uftp_tfmccack_flags_reserved;
+static int hf_uftp_tfmccack_reserved;
+static int hf_uftp_tfmccack_cc_seq;
+static int hf_uftp_tfmccack_cc_rate;
+static int hf_uftp_tfmccack_client_id;
+static int hf_uftp_tfmccack_tstamp;
 
 /* ENCRYPTED fields */
-static int hf_uftp_encrypted = -1;
-static int hf_uftp_encrypted_ivctr = -1;
-static int hf_uftp_encrypted_reserved = -1;
-static int hf_uftp_encrypted_payload_len = -1;
-static int hf_uftp_encrypted_payload = -1;
+static int hf_uftp_encrypted;
+static int hf_uftp_encrypted_ivctr;
+static int hf_uftp_encrypted_reserved;
+static int hf_uftp_encrypted_payload_len;
+static int hf_uftp_encrypted_payload;
 
 /* ABORT fields */
-static int hf_uftp_abort = -1;
-static int hf_uftp_abort_func = -1;
-static int hf_uftp_abort_hlen = -1;
-static int hf_uftp_abort_flags = -1;
-static int hf_uftp_abort_flags_curfile = -1;
-static int hf_uftp_abort_flags_reserved = -1;
-static int hf_uftp_abort_reserved = -1;
-static int hf_uftp_abort_clientid = -1;
-static int hf_uftp_abort_message = -1;
-
-static gint ett_uftp = -1;
-static gint ett_uftp_announce = -1;
-static gint ett_uftp_register = -1;
-static gint ett_uftp_clientkey = -1;
-static gint ett_uftp_regconf = -1;
-static gint ett_uftp_keyinfo = -1;
-static gint ett_uftp_keyinfoack = -1;
-static gint ett_uftp_fileinfo = -1;
-static gint ett_uftp_fileinfoack = -1;
-static gint ett_uftp_fileseg = -1;
-static gint ett_uftp_done = -1;
-static gint ett_uftp_status = -1;
-static gint ett_uftp_complete = -1;
-static gint ett_uftp_doneconf = -1;
-static gint ett_uftp_hbreq = -1;
-static gint ett_uftp_hbresp = -1;
-static gint ett_uftp_proxykey = -1;
-static gint ett_uftp_congctrl = -1;
-static gint ett_uftp_ccack = -1;
-static gint ett_uftp_encrypted = -1;
-static gint ett_uftp_abort = -1;
-
-static gint ett_uftp_announce_flags = -1;
-static gint ett_uftp_encinfo = -1;
-static gint ett_uftp_encinfo_flags = -1;
-static gint ett_uftp_keyinfo_destkey = -1;
-static gint ett_uftp_fileinfoack_flags = -1;
-static gint ett_uftp_congctrl_cclist = -1;
-static gint ett_uftp_congctrl_item = -1;
-static gint ett_uftp_congctrl_item_flags = -1;
-static gint ett_uftp_tfmccdata = -1;
-static gint ett_uftp_tfmccack = -1;
-static gint ett_uftp_tfmccack_flags = -1;
-static gint ett_uftp_freespace = -1;
-static gint ett_uftp_abort_flags = -1;
-
-static gint ett_uftp_destlist = -1;
-static gint ett_uftp_rsablob = -1;
-static gint ett_uftp_ecblob = -1;
-
-static expert_field ei_uftp_length_invalid = EI_INIT;
-static expert_field ei_uftp_func_unknown = EI_INIT;
+static int hf_uftp_abort;
+static int hf_uftp_abort_func;
+static int hf_uftp_abort_hlen;
+static int hf_uftp_abort_flags;
+static int hf_uftp_abort_flags_curfile;
+static int hf_uftp_abort_flags_reserved;
+static int hf_uftp_abort_reserved;
+static int hf_uftp_abort_clientid;
+static int hf_uftp_abort_message;
+
+static gint ett_uftp;
+static gint ett_uftp_announce;
+static gint ett_uftp_register;
+static gint ett_uftp_clientkey;
+static gint ett_uftp_regconf;
+static gint ett_uftp_keyinfo;
+static gint ett_uftp_keyinfoack;
+static gint ett_uftp_fileinfo;
+static gint ett_uftp_fileinfoack;
+static gint ett_uftp_fileseg;
+static gint ett_uftp_done;
+static gint ett_uftp_status;
+static gint ett_uftp_complete;
+static gint ett_uftp_doneconf;
+static gint ett_uftp_hbreq;
+static gint ett_uftp_hbresp;
+static gint ett_uftp_proxykey;
+static gint ett_uftp_congctrl;
+static gint ett_uftp_ccack;
+static gint ett_uftp_encrypted;
+static gint ett_uftp_abort;
+
+static gint ett_uftp_announce_flags;
+static gint ett_uftp_encinfo;
+static gint ett_uftp_encinfo_flags;
+static gint ett_uftp_keyinfo_destkey;
+static gint ett_uftp_fileinfoack_flags;
+static gint ett_uftp_congctrl_cclist;
+static gint ett_uftp_congctrl_item;
+static gint ett_uftp_congctrl_item_flags;
+static gint ett_uftp_tfmccdata;
+static gint ett_uftp_tfmccack;
+static gint ett_uftp_tfmccack_flags;
+static gint ett_uftp_freespace;
+static gint ett_uftp_abort_flags;
+
+static gint ett_uftp_destlist;
+static gint ett_uftp_rsablob;
+static gint ett_uftp_ecblob;
+
+static expert_field ei_uftp_length_invalid;
+static expert_field ei_uftp_func_unknown;
 
 static const value_string messages[] = {
     { ANNOUNCE,      "ANNOUNCE" },
diff --git a/epan/dissectors/packet-uhd.c b/epan/dissectors/packet-uhd.c
index 85ecf8cf06..da87a4c860 100644
--- a/epan/dissectors/packet-uhd.c
+++ b/epan/dissectors/packet-uhd.c
@@ -83,28 +83,28 @@ typedef struct{
 } usrp2_ctrl_data_t;
  */
 
-static int proto_uhd = -1;
-
-static int hf_uhd_version = -1;
-static int hf_uhd_id = -1;
-static int hf_uhd_seq = -1;
-static int hf_uhd_ip_addr = -1;
-static int hf_uhd_i2c_addr = -1;
-static int hf_uhd_i2c_bytes = -1;
-static int hf_uhd_i2c_data = -1;
-static int hf_uhd_spi_dev = -1;
-static int hf_uhd_spi_data = -1;
-static int hf_uhd_spi_miso_edge = -1;
-static int hf_uhd_spi_mosi_edge = -1;
-static int hf_uhd_spi_num_bits = -1;
-static int hf_uhd_spi_readback = -1;
-static int hf_uhd_reg_addr = -1;
-static int hf_uhd_reg_data = -1;
-static int hf_uhd_reg_action = -1;
-static int hf_uhd_echo_len = -1;
-
-
-static gint ett_uhd = -1;
+static int proto_uhd;
+
+static int hf_uhd_version;
+static int hf_uhd_id;
+static int hf_uhd_seq;
+static int hf_uhd_ip_addr;
+static int hf_uhd_i2c_addr;
+static int hf_uhd_i2c_bytes;
+static int hf_uhd_i2c_data;
+static int hf_uhd_spi_dev;
+static int hf_uhd_spi_data;
+static int hf_uhd_spi_miso_edge;
+static int hf_uhd_spi_mosi_edge;
+static int hf_uhd_spi_num_bits;
+static int hf_uhd_spi_readback;
+static int hf_uhd_reg_addr;
+static int hf_uhd_reg_data;
+static int hf_uhd_reg_action;
+static int hf_uhd_echo_len;
+
+
+static gint ett_uhd;
 
 
 static const value_string uhd_ids[] = {
diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c
index 1cceff1714..4688544b45 100644
--- a/epan/dissectors/packet-uma.c
+++ b/epan/dissectors/packet-uma.c
@@ -67,120 +67,120 @@ static dissector_handle_t rtcp_handle;
 static dissector_handle_t llc_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_uma					= -1;
-static int hf_uma_length_indicator			= -1;
-static int hf_uma_pd					= -1;
-static int hf_uma_skip_ind				= -1;
-static int hf_uma_urr_msg_type				= -1;
-static int hf_uma_urlc_msg_type				= -1;
-static int hf_uma_urlc_TLLI				= -1;
-static int hf_uma_urlc_seq_nr				= -1;
-static int hf_uma_urr_IE				= -1;
-static int hf_uma_urr_IE_len				= -1;
-static int hf_uma_urr_uri				= -1;
-static int hf_uma_urr_radio_type_of_id			= -1;
-static int hf_uma_urr_radio_id				= -1;
-static int hf_uma_urr_cell_id				= -1;
-static int hf_uma_urr_lac				= -1;
-static int hf_uma_urr_gci				= -1;
-static int hf_uma_urr_tura				= -1;
-static int hf_uma_urr_gc				= -1;
-static int hf_uma_urr_uc				= -1;
-static int hf_uma_urr_rrs				= -1;
-static int hf_uma_urr_gmsi				= -1;
-static int hf_uma_urr_psho				= -1;
-static int hf_uma_urr_IP_Address_type			= -1;
-static int hf_uma_urr_FQDN				= -1;
-static int hf_uma_urr_sgw_ipv4				= -1;
-static int hf_uma_urr_redirection_counter		= -1;
-static int hf_uma_urr_dis_rej_cau			= -1;
-static int hf_uma_urr_MSCR				= -1;
-static int hf_uma_urr_ATT				= -1;
-static int hf_uma_urr_DTM				= -1;
-static int hf_uma_urr_GPRS				= -1;
-static int hf_uma_urr_NMO				= -1;
-static int hf_uma_urr_ECMC				= -1;
-static int hf_uma_urr_T3212_timer			= -1;
-static int hf_uma_urr_RAC				= -1;
-static int hf_uma_urr_ap_location			= -1;
-static int hf_uma_urr_SGSNR				= -1;
-static int hf_uma_urr_ECMP				= -1;
-static int hf_uma_urr_RE				= -1;
-static int hf_uma_urr_PFCFM				= -1;
-static int hf_uma_urr_3GECS				= -1;
-static int hf_uma_urr_TU3907_timer			= -1;
-static int hf_uma_urr_GSM_RR_state			= -1;
-static int hf_uma_urr_gan_band				= -1;
-static int hf_uma_urr_URR_state				= -1;
-static int hf_uma_urr_register_reject_cause 		= -1;
-static int hf_uma_urr_TU3906_timer			= -1;
-static int hf_uma_urr_TU3910_timer			= -1;
-static int hf_uma_urr_TU3902_timer			= -1;
-static int hf_uma_urr_communication_port 		= -1;
-static int hf_uma_urr_L3_Message			= -1;
-static int hf_uma_urr_L3_protocol_discriminator 	= -1;
-static int hf_uma_urr_GPRS_resumption			= -1;
-static int hf_uma_urr_ULQI				= -1;
-static int hf_uma_urr_TU3920_timer			= -1;
-static int hf_uma_urr_peak_tpt_cls			= -1;
-static int hf_uma_urr_radio_pri				= -1;
-static int hf_uma_urr_rlc_mode				= -1;
-static int hf_uma_urr_ga_psr_cause			= -1;
-static int hf_uma_urr_udr				= -1;
-static int hf_uma_urr_TU4001_timer			= -1;
-static int hf_uma_urr_LS				= -1;
-static int hf_uma_urr_cipher_res			= -1;
-static int hf_uma_urr_rand_val				= -1;
-static int hf_uma_urr_ciphering_command_mac 		= -1;
-static int hf_uma_urr_ciphering_key_seq_num 		= -1;
-static int hf_uma_urr_sapi_id				= -1;
-static int hf_uma_urr_establishment_cause 		= -1;
-static int hf_uma_urr_channel				= -1;
-static int hf_uma_urr_PDU_in_error			= -1;
-static int hf_uma_urr_sample_size			= -1;
-static int hf_uma_urr_payload_type			= -1;
-static int hf_uma_urr_LLC_PDU				= -1;
-static int hf_uma_urr_LBLI				= -1;
-static int hf_uma_urr_RI				= -1;
-static int hf_uma_urr_TU4003_timer			= -1;
-static int hf_uma_urr_ap_service_name_type 		= -1;
-static int hf_uma_urr_ap_Service_name_value 		= -1;
-static int hf_uma_urr_uma_service_zone_icon_ind 	= -1;
-static int hf_uma_urr_uma_service_zone_str_len 		= -1;
-static int hf_uma_urr_window_size			= -1;
-static int hf_uma_urr_uma_codec_mode			= -1;
-static int hf_uma_urr_UTRAN_cell_id_disc 		= -1;
-static int hf_uma_urr_ms_radio_id			= -1;
-static int hf_uma_urr_uma_service_zone_str 		= -1;
-static int hf_uma_urr_suti				= -1;
-static int hf_uma_urr_uma_mps				= -1;
-static int hf_uma_urr_num_of_plms			= -1;
-static int hf_uma_urr_cbs				= -1;
-static int hf_uma_urr_num_of_cbs_frms			= -1;
-static int hf_uma_urr_unc_ipv4				= -1;
-static int hf_uma_unc_FQDN				= -1;
-static int hf_uma_urr_GPRS_user_data_transport_ipv4 	= -1;
-static int hf_uma_urr_GPRS_port				= -1;
-static int hf_uma_urr_UNC_tcp_port			= -1;
-static int hf_uma_urr_RTP_port				= -1;
-static int hf_uma_urr_RTCP_port				= -1;
-static int hf_uma_urr_RXLEV_NCELL			= -1;
+static int proto_uma;
+static int hf_uma_length_indicator;
+static int hf_uma_pd;
+static int hf_uma_skip_ind;
+static int hf_uma_urr_msg_type;
+static int hf_uma_urlc_msg_type;
+static int hf_uma_urlc_TLLI;
+static int hf_uma_urlc_seq_nr;
+static int hf_uma_urr_IE;
+static int hf_uma_urr_IE_len;
+static int hf_uma_urr_uri;
+static int hf_uma_urr_radio_type_of_id;
+static int hf_uma_urr_radio_id;
+static int hf_uma_urr_cell_id;
+static int hf_uma_urr_lac;
+static int hf_uma_urr_gci;
+static int hf_uma_urr_tura;
+static int hf_uma_urr_gc;
+static int hf_uma_urr_uc;
+static int hf_uma_urr_rrs;
+static int hf_uma_urr_gmsi;
+static int hf_uma_urr_psho;
+static int hf_uma_urr_IP_Address_type;
+static int hf_uma_urr_FQDN;
+static int hf_uma_urr_sgw_ipv4;
+static int hf_uma_urr_redirection_counter;
+static int hf_uma_urr_dis_rej_cau;
+static int hf_uma_urr_MSCR;
+static int hf_uma_urr_ATT;
+static int hf_uma_urr_DTM;
+static int hf_uma_urr_GPRS;
+static int hf_uma_urr_NMO;
+static int hf_uma_urr_ECMC;
+static int hf_uma_urr_T3212_timer;
+static int hf_uma_urr_RAC;
+static int hf_uma_urr_ap_location;
+static int hf_uma_urr_SGSNR;
+static int hf_uma_urr_ECMP;
+static int hf_uma_urr_RE;
+static int hf_uma_urr_PFCFM;
+static int hf_uma_urr_3GECS;
+static int hf_uma_urr_TU3907_timer;
+static int hf_uma_urr_GSM_RR_state;
+static int hf_uma_urr_gan_band;
+static int hf_uma_urr_URR_state;
+static int hf_uma_urr_register_reject_cause;
+static int hf_uma_urr_TU3906_timer;
+static int hf_uma_urr_TU3910_timer;
+static int hf_uma_urr_TU3902_timer;
+static int hf_uma_urr_communication_port;
+static int hf_uma_urr_L3_Message;
+static int hf_uma_urr_L3_protocol_discriminator;
+static int hf_uma_urr_GPRS_resumption;
+static int hf_uma_urr_ULQI;
+static int hf_uma_urr_TU3920_timer;
+static int hf_uma_urr_peak_tpt_cls;
+static int hf_uma_urr_radio_pri;
+static int hf_uma_urr_rlc_mode;
+static int hf_uma_urr_ga_psr_cause;
+static int hf_uma_urr_udr;
+static int hf_uma_urr_TU4001_timer;
+static int hf_uma_urr_LS;
+static int hf_uma_urr_cipher_res;
+static int hf_uma_urr_rand_val;
+static int hf_uma_urr_ciphering_command_mac;
+static int hf_uma_urr_ciphering_key_seq_num;
+static int hf_uma_urr_sapi_id;
+static int hf_uma_urr_establishment_cause;
+static int hf_uma_urr_channel;
+static int hf_uma_urr_PDU_in_error;
+static int hf_uma_urr_sample_size;
+static int hf_uma_urr_payload_type;
+static int hf_uma_urr_LLC_PDU;
+static int hf_uma_urr_LBLI;
+static int hf_uma_urr_RI;
+static int hf_uma_urr_TU4003_timer;
+static int hf_uma_urr_ap_service_name_type;
+static int hf_uma_urr_ap_Service_name_value;
+static int hf_uma_urr_uma_service_zone_icon_ind;
+static int hf_uma_urr_uma_service_zone_str_len;
+static int hf_uma_urr_window_size;
+static int hf_uma_urr_uma_codec_mode;
+static int hf_uma_urr_UTRAN_cell_id_disc;
+static int hf_uma_urr_ms_radio_id;
+static int hf_uma_urr_uma_service_zone_str;
+static int hf_uma_urr_suti;
+static int hf_uma_urr_uma_mps;
+static int hf_uma_urr_num_of_plms;
+static int hf_uma_urr_cbs;
+static int hf_uma_urr_num_of_cbs_frms;
+static int hf_uma_urr_unc_ipv4;
+static int hf_uma_unc_FQDN;
+static int hf_uma_urr_GPRS_user_data_transport_ipv4;
+static int hf_uma_urr_GPRS_port;
+static int hf_uma_urr_UNC_tcp_port;
+static int hf_uma_urr_RTP_port;
+static int hf_uma_urr_RTCP_port;
+static int hf_uma_urr_RXLEV_NCELL;
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_uma_access_control_class_n = -1;
-static int hf_uma_data = -1;
+static int hf_uma_access_control_class_n;
+static int hf_uma_data;
 
 /* Initialize the subtree pointers */
-static int ett_uma     = -1;
-static int ett_uma_toc = -1;
-static int ett_urr_ie  = -1;
+static int ett_uma;
+static int ett_uma_toc;
+static int ett_urr_ie;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static expert_field ei_uma_fqdn_not_present = EI_INIT;
-static expert_field ei_uma_wrong_message_type = EI_INIT;
-static expert_field ei_uma_unknown_protocol = EI_INIT;
-static expert_field ei_uma_skip_this_message = EI_INIT;
-static expert_field ei_uma_cbs_frames = EI_INIT;
-static expert_field ei_uma_unknown_format = EI_INIT;
+static expert_field ei_uma_fqdn_not_present;
+static expert_field ei_uma_wrong_message_type;
+static expert_field ei_uma_unknown_protocol;
+static expert_field ei_uma_skip_this_message;
+static expert_field ei_uma_cbs_frames;
+static expert_field ei_uma_unknown_format;
 
 /* The dynamic payload type which will be dissected as uma */
 #define DEFAULT_UMA_PORT_RANGE "14001" /* Not IANA registered */
diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c
index 7386349a56..b43a87fc63 100644
--- a/epan/dissectors/packet-umts_fp.c
+++ b/epan/dissectors/packet-umts_fp.c
@@ -44,189 +44,189 @@ void proto_reg_handoff_fp(void);
 
 /* Initialize the protocol and registered fields. */
 
-int proto_fp = -1;
+int proto_fp;
 extern int proto_umts_mac;
 extern int proto_umts_rlc;
 
-static int hf_fp_release = -1;
-static int hf_fp_release_version = -1;
-static int hf_fp_release_year = -1;
-static int hf_fp_release_month = -1;
-static int hf_fp_channel_type = -1;
-static int hf_fp_division = -1;
-static int hf_fp_direction = -1;
-static int hf_fp_ddi_config = -1;
-static int hf_fp_ddi_config_ddi = -1;
-static int hf_fp_ddi_config_macd_pdu_size = -1;
-
-static int hf_fp_header_crc = -1;
-static int hf_fp_ft = -1;
-static int hf_fp_cfn = -1;
-static int hf_fp_pch_cfn = -1;
-static int hf_fp_pch_toa = -1;
-static int hf_fp_cfn_control = -1;
-static int hf_fp_toa = -1;
-static int hf_fp_tfi = -1;
-static int hf_fp_usch_tfi = -1;
-static int hf_fp_cpch_tfi = -1;
-static int hf_fp_propagation_delay = -1;
-static int hf_fp_tb = -1;
-static int hf_fp_chan_zero_tbs = -1;
-static int hf_fp_received_sync_ul_timing_deviation = -1;
-static int hf_fp_pch_pi = -1;
-static int hf_fp_pch_tfi = -1;
-static int hf_fp_fach_tfi = -1;
-static int hf_fp_transmit_power_level = -1;
-static int hf_fp_paging_indication_bitmap = -1;
-static int hf_fp_relevant_paging_indication_bitmap = -1;
-static int hf_fp_pdsch_set_id = -1;
-static int hf_fp_rx_timing_deviation = -1;
-static int hf_fp_dch_e_rucch_flag = -1;
-static int hf_fp_dch_control_frame_type = -1;
-static int hf_fp_dch_rx_timing_deviation = -1;
-static int hf_fp_quality_estimate = -1;
-static int hf_fp_payload_crc = -1;
-static int hf_fp_payload_crc_status = -1;
-static int hf_fp_edch_header_crc = -1;
-static int hf_fp_edch_fsn = -1;
-static int hf_fp_edch_subframe = -1;
-static int hf_fp_edch_number_of_subframes = -1;
-static int hf_fp_edch_harq_retransmissions = -1;
-static int hf_fp_edch_subframe_number = -1;
-static int hf_fp_edch_number_of_mac_es_pdus = -1;
-static int hf_fp_edch_ddi = -1;
-static int hf_fp_edch_subframe_header = -1;
-static int hf_fp_edch_number_of_mac_d_pdus = -1;
-static int hf_fp_edch_pdu_padding = -1;
-static int hf_fp_edch_tsn = -1;
-static int hf_fp_edch_mac_es_pdu = -1;
-
-static int hf_fp_edch_user_buffer_size = -1;
-static int hf_fp_edch_no_macid_sdus = -1;
-static int hf_fp_edch_number_of_mac_is_pdus = -1;
-static int hf_fp_edch_mac_is_pdu = -1;
-
-static int hf_fp_edch_e_rnti = -1;
-static int hf_fp_edch_macis_descriptors = -1;
-static int hf_fp_edch_macis_lchid = -1;
-static int hf_fp_edch_macis_length = -1;
-static int hf_fp_edch_macis_flag = -1;
-static int hf_fp_edch_entity = -1;
-
-static int hf_fp_frame_seq_nr = -1;
-static int hf_fp_hsdsch_pdu_block_header = -1;
-/* static int hf_fp_hsdsch_pdu_block = -1; */
-static int hf_fp_flush = -1;
-static int hf_fp_fsn_drt_reset = -1;
-static int hf_fp_drt_indicator = -1;
-static int hf_fp_fach_indicator = -1;
-static int hf_fp_total_pdu_blocks = -1;
-static int hf_fp_drt = -1;
-static int hf_fp_hrnti = -1;
-static int hf_fp_rach_measurement_result = -1;
-static int hf_fp_lchid = -1;
-static int hf_fp_pdu_length_in_block = -1;
-static int hf_fp_pdus_in_block = -1;
-static int hf_fp_cmch_pi = -1;
-static int hf_fp_user_buffer_size = -1;
-static int hf_fp_hsdsch_credits = -1;
-static int hf_fp_hsdsch_max_macd_pdu_len = -1;
-static int hf_fp_hsdsch_max_macdc_pdu_len = -1;
-static int hf_fp_hsdsch_interval = -1;
-static int hf_fp_hsdsch_calculated_rate = -1;
-static int hf_fp_hsdsch_unlimited_rate = -1;
-static int hf_fp_hsdsch_repetition_period = -1;
-static int hf_fp_hsdsch_data_padding = -1;
-static int hf_fp_hsdsch_new_ie_flags = -1;
+static int hf_fp_release;
+static int hf_fp_release_version;
+static int hf_fp_release_year;
+static int hf_fp_release_month;
+static int hf_fp_channel_type;
+static int hf_fp_division;
+static int hf_fp_direction;
+static int hf_fp_ddi_config;
+static int hf_fp_ddi_config_ddi;
+static int hf_fp_ddi_config_macd_pdu_size;
+
+static int hf_fp_header_crc;
+static int hf_fp_ft;
+static int hf_fp_cfn;
+static int hf_fp_pch_cfn;
+static int hf_fp_pch_toa;
+static int hf_fp_cfn_control;
+static int hf_fp_toa;
+static int hf_fp_tfi;
+static int hf_fp_usch_tfi;
+static int hf_fp_cpch_tfi;
+static int hf_fp_propagation_delay;
+static int hf_fp_tb;
+static int hf_fp_chan_zero_tbs;
+static int hf_fp_received_sync_ul_timing_deviation;
+static int hf_fp_pch_pi;
+static int hf_fp_pch_tfi;
+static int hf_fp_fach_tfi;
+static int hf_fp_transmit_power_level;
+static int hf_fp_paging_indication_bitmap;
+static int hf_fp_relevant_paging_indication_bitmap;
+static int hf_fp_pdsch_set_id;
+static int hf_fp_rx_timing_deviation;
+static int hf_fp_dch_e_rucch_flag;
+static int hf_fp_dch_control_frame_type;
+static int hf_fp_dch_rx_timing_deviation;
+static int hf_fp_quality_estimate;
+static int hf_fp_payload_crc;
+static int hf_fp_payload_crc_status;
+static int hf_fp_edch_header_crc;
+static int hf_fp_edch_fsn;
+static int hf_fp_edch_subframe;
+static int hf_fp_edch_number_of_subframes;
+static int hf_fp_edch_harq_retransmissions;
+static int hf_fp_edch_subframe_number;
+static int hf_fp_edch_number_of_mac_es_pdus;
+static int hf_fp_edch_ddi;
+static int hf_fp_edch_subframe_header;
+static int hf_fp_edch_number_of_mac_d_pdus;
+static int hf_fp_edch_pdu_padding;
+static int hf_fp_edch_tsn;
+static int hf_fp_edch_mac_es_pdu;
+
+static int hf_fp_edch_user_buffer_size;
+static int hf_fp_edch_no_macid_sdus;
+static int hf_fp_edch_number_of_mac_is_pdus;
+static int hf_fp_edch_mac_is_pdu;
+
+static int hf_fp_edch_e_rnti;
+static int hf_fp_edch_macis_descriptors;
+static int hf_fp_edch_macis_lchid;
+static int hf_fp_edch_macis_length;
+static int hf_fp_edch_macis_flag;
+static int hf_fp_edch_entity;
+
+static int hf_fp_frame_seq_nr;
+static int hf_fp_hsdsch_pdu_block_header;
+/* static int hf_fp_hsdsch_pdu_block; */
+static int hf_fp_flush;
+static int hf_fp_fsn_drt_reset;
+static int hf_fp_drt_indicator;
+static int hf_fp_fach_indicator;
+static int hf_fp_total_pdu_blocks;
+static int hf_fp_drt;
+static int hf_fp_hrnti;
+static int hf_fp_rach_measurement_result;
+static int hf_fp_lchid;
+static int hf_fp_pdu_length_in_block;
+static int hf_fp_pdus_in_block;
+static int hf_fp_cmch_pi;
+static int hf_fp_user_buffer_size;
+static int hf_fp_hsdsch_credits;
+static int hf_fp_hsdsch_max_macd_pdu_len;
+static int hf_fp_hsdsch_max_macdc_pdu_len;
+static int hf_fp_hsdsch_interval;
+static int hf_fp_hsdsch_calculated_rate;
+static int hf_fp_hsdsch_unlimited_rate;
+static int hf_fp_hsdsch_repetition_period;
+static int hf_fp_hsdsch_data_padding;
+static int hf_fp_hsdsch_new_ie_flags;
 static int hf_fp_hsdsch_new_ie_flag[8];
-static int hf_fp_hsdsch_drt = -1;
-static int hf_fp_hsdsch_entity = -1;
-static int hf_fp_hsdsch_physical_layer_category = -1;
-static int hf_fp_timing_advance = -1;
-static int hf_fp_num_of_pdu = -1;
-static int hf_fp_mac_d_pdu_len = -1;
-static int hf_fp_mac_d_pdu = -1;
-static int hf_fp_data = -1;
-static int hf_fp_crcis = -1;
+static int hf_fp_hsdsch_drt;
+static int hf_fp_hsdsch_entity;
+static int hf_fp_hsdsch_physical_layer_category;
+static int hf_fp_timing_advance;
+static int hf_fp_num_of_pdu;
+static int hf_fp_mac_d_pdu_len;
+static int hf_fp_mac_d_pdu;
+static int hf_fp_data;
+static int hf_fp_crcis;
 static int hf_fp_crci[8];
-static int hf_fp_common_control_frame_type = -1;
-static int hf_fp_t1 = -1;
-static int hf_fp_t2 = -1;
-static int hf_fp_t3 = -1;
-static int hf_fp_ul_sir_target = -1;
-static int hf_fp_pusch_set_id = -1;
-static int hf_fp_activation_cfn = -1;
-static int hf_fp_duration = -1;
-static int hf_fp_power_offset = -1;
-static int hf_fp_code_number = -1;
-static int hf_fp_spreading_factor = -1;
-static int hf_fp_mc_info = -1;
-
-static int hf_fp_rach_new_ie_flags = -1;
+static int hf_fp_common_control_frame_type;
+static int hf_fp_t1;
+static int hf_fp_t2;
+static int hf_fp_t3;
+static int hf_fp_ul_sir_target;
+static int hf_fp_pusch_set_id;
+static int hf_fp_activation_cfn;
+static int hf_fp_duration;
+static int hf_fp_power_offset;
+static int hf_fp_code_number;
+static int hf_fp_spreading_factor;
+static int hf_fp_mc_info;
+
+static int hf_fp_rach_new_ie_flags;
 static int hf_fp_rach_new_ie_flag_unused[7];
-static int hf_fp_rach_ext_propagation_delay_present = -1;
-static int hf_fp_rach_cell_portion_id_present = -1;
-static int hf_fp_rach_angle_of_arrival_present = -1;
-static int hf_fp_rach_ext_rx_sync_ul_timing_deviation_present = -1;
-static int hf_fp_rach_ext_rx_timing_deviation_present = -1;
+static int hf_fp_rach_ext_propagation_delay_present;
+static int hf_fp_rach_cell_portion_id_present;
+static int hf_fp_rach_angle_of_arrival_present;
+static int hf_fp_rach_ext_rx_sync_ul_timing_deviation_present;
+static int hf_fp_rach_ext_rx_timing_deviation_present;
 
-static int hf_fp_cell_portion_id = -1;
-static int hf_fp_ext_propagation_delay = -1;
-static int hf_fp_angle_of_arrival = -1;
-static int hf_fp_ext_received_sync_ul_timing_deviation = -1;
+static int hf_fp_cell_portion_id;
+static int hf_fp_ext_propagation_delay;
+static int hf_fp_angle_of_arrival;
+static int hf_fp_ext_received_sync_ul_timing_deviation;
 
 static int hf_fp_radio_interface_parameter_update_flag[5];
-static int hf_fp_dpc_mode = -1;
-static int hf_fp_tpc_po = -1;
-static int hf_fp_multiple_rl_set_indicator = -1;
-static int hf_fp_max_ue_tx_pow = -1;
-static int hf_fp_congestion_status = -1;
-static int hf_fp_e_rucch_present = -1;
-static int hf_fp_extended_bits_present = -1;
-static int hf_fp_extended_bits = -1;
-static int hf_fp_spare_extension = -1;
-static int hf_fp_ul_setup_frame = -1;
-static int hf_fp_dl_setup_frame = -1;
-static int hf_fp_relevant_pi_frame = -1;
+static int hf_fp_dpc_mode;
+static int hf_fp_tpc_po;
+static int hf_fp_multiple_rl_set_indicator;
+static int hf_fp_max_ue_tx_pow;
+static int hf_fp_congestion_status;
+static int hf_fp_e_rucch_present;
+static int hf_fp_extended_bits_present;
+static int hf_fp_extended_bits;
+static int hf_fp_spare_extension;
+static int hf_fp_ul_setup_frame;
+static int hf_fp_dl_setup_frame;
+static int hf_fp_relevant_pi_frame;
 
 /* Subtrees. */
-static int ett_fp = -1;
-static int ett_fp_release = -1;
-static int ett_fp_data = -1;
-static int ett_fp_crcis = -1;
-static int ett_fp_ddi_config = -1;
-static int ett_fp_edch_subframe_header = -1;
-static int ett_fp_edch_subframe = -1;
-static int ett_fp_edch_maces = -1;
-static int ett_fp_edch_macis_descriptors = -1;
-static int ett_fp_hsdsch_new_ie_flags = -1;
-static int ett_fp_rach_new_ie_flags = -1;
-static int ett_fp_hsdsch_pdu_block_header = -1;
-static int ett_fp_pch_relevant_pi = -1;
-
-static expert_field ei_fp_hsdsch_common_experimental_support = EI_INIT;
-static expert_field ei_fp_hsdsch_common_t3_not_implemented = EI_INIT;
-static expert_field ei_fp_channel_type_unknown = EI_INIT;
-static expert_field ei_fp_ddi_not_defined = EI_INIT;
-static expert_field ei_fp_stop_hsdpa_transmission = EI_INIT;
-static expert_field ei_fp_hsdsch_entity_not_specified = EI_INIT;
-static expert_field ei_fp_expecting_tdd = EI_INIT;
-static expert_field ei_fp_bad_payload_checksum = EI_INIT;
-static expert_field ei_fp_e_rnti_t2_edch_frames = EI_INIT;
-static expert_field ei_fp_crci_no_subdissector = EI_INIT;
-static expert_field ei_fp_timing_adjustmentment_reported = EI_INIT;
-static expert_field ei_fp_mac_is_sdus_miscount = EI_INIT;
-static expert_field ei_fp_maybe_srb = EI_INIT;
-static expert_field ei_fp_transport_channel_type_unknown = EI_INIT;
-static expert_field ei_fp_pch_lost_relevant_pi_frame = EI_INIT;
-static expert_field ei_fp_unable_to_locate_ddi_entry = EI_INIT;
-static expert_field ei_fp_e_rnti_first_entry = EI_INIT;
-static expert_field ei_fp_bad_header_checksum = EI_INIT;
-static expert_field ei_fp_crci_error_bit_set_for_tb = EI_INIT;
-static expert_field ei_fp_spare_extension = EI_INIT;
-static expert_field ei_fp_no_per_frame_info = EI_INIT;
-static expert_field ei_fp_no_per_conv_channel_info = EI_INIT;
-static expert_field ei_fp_invalid_frame_count = EI_INIT;
+static int ett_fp;
+static int ett_fp_release;
+static int ett_fp_data;
+static int ett_fp_crcis;
+static int ett_fp_ddi_config;
+static int ett_fp_edch_subframe_header;
+static int ett_fp_edch_subframe;
+static int ett_fp_edch_maces;
+static int ett_fp_edch_macis_descriptors;
+static int ett_fp_hsdsch_new_ie_flags;
+static int ett_fp_rach_new_ie_flags;
+static int ett_fp_hsdsch_pdu_block_header;
+static int ett_fp_pch_relevant_pi;
+
+static expert_field ei_fp_hsdsch_common_experimental_support;
+static expert_field ei_fp_hsdsch_common_t3_not_implemented;
+static expert_field ei_fp_channel_type_unknown;
+static expert_field ei_fp_ddi_not_defined;
+static expert_field ei_fp_stop_hsdpa_transmission;
+static expert_field ei_fp_hsdsch_entity_not_specified;
+static expert_field ei_fp_expecting_tdd;
+static expert_field ei_fp_bad_payload_checksum;
+static expert_field ei_fp_e_rnti_t2_edch_frames;
+static expert_field ei_fp_crci_no_subdissector;
+static expert_field ei_fp_timing_adjustmentment_reported;
+static expert_field ei_fp_mac_is_sdus_miscount;
+static expert_field ei_fp_maybe_srb;
+static expert_field ei_fp_transport_channel_type_unknown;
+static expert_field ei_fp_pch_lost_relevant_pi_frame;
+static expert_field ei_fp_unable_to_locate_ddi_entry;
+static expert_field ei_fp_e_rnti_first_entry;
+static expert_field ei_fp_bad_header_checksum;
+static expert_field ei_fp_crci_error_bit_set_for_tb;
+static expert_field ei_fp_spare_extension;
+static expert_field ei_fp_no_per_frame_info;
+static expert_field ei_fp_no_per_conv_channel_info;
+static expert_field ei_fp_invalid_frame_count;
 
 static dissector_handle_t rlc_bcch_handle;
 static dissector_handle_t mac_fdd_dch_handle;
diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c
index 61043df2a7..8a1887ce5f 100644
--- a/epan/dissectors/packet-umts_mac.c
+++ b/epan/dissectors/packet-umts_mac.c
@@ -24,65 +24,65 @@
 void proto_register_umts_mac(void);
 void proto_reg_handoff_umts_mac(void);
 
-int proto_umts_mac = -1;
+int proto_umts_mac;
 extern int proto_fp;
 extern int proto_umts_rlc;
 
 /* dissector fields */
-static int hf_mac_fach_fdd_tctf = -1;
-static int hf_mac_rach_fdd_tctf = -1;
-static int hf_mac_ct = -1;
-static int hf_mac_ueid_type = -1;
-static int hf_mac_crnti = -1;
-static int hf_mac_urnti = -1;
-static int hf_mac_resolved_urnti = -1;
-static int hf_mac_crnti_urnti_match_frame = -1;
-static int hf_mac_channel = -1;
-/* static int hf_mac_channel_str = -1; */
-
-static int hf_mac_lch_id = -1;
-static int hf_mac_macdflowd_id = -1;
-/* static int hf_mac_channel_hsdsch = -1; */
-static int hf_mac_trch_id = -1;
-
-/* static int hf_mac_edch_type2_subframe_header = -1; */
-/* static int hf_mac_edch_type2_descriptors = -1; */
-/* static int hf_mac_edch_type2_lchid = -1; */
-/* static int hf_mac_edch_type2_length = -1; */
-/* static int hf_mac_edch_type2_flag = -1; */
-static int hf_mac_edch_type2_tsn = -1;
-static int hf_mac_edch_type2_ss = -1;
-static int hf_mac_edch_type2_ss_interpretation = -1;
-static int hf_mac_edch_type2_sdu = -1;
-static int hf_mac_edch_type2_sdu_data = -1;
-static int hf_mac_is_fraglink = -1;
-static int hf_mac_is_reasmin = -1;
+static int hf_mac_fach_fdd_tctf;
+static int hf_mac_rach_fdd_tctf;
+static int hf_mac_ct;
+static int hf_mac_ueid_type;
+static int hf_mac_crnti;
+static int hf_mac_urnti;
+static int hf_mac_resolved_urnti;
+static int hf_mac_crnti_urnti_match_frame;
+static int hf_mac_channel;
+/* static int hf_mac_channel_str; */
+
+static int hf_mac_lch_id;
+static int hf_mac_macdflowd_id;
+/* static int hf_mac_channel_hsdsch; */
+static int hf_mac_trch_id;
+
+/* static int hf_mac_edch_type2_subframe_header; */
+/* static int hf_mac_edch_type2_descriptors; */
+/* static int hf_mac_edch_type2_lchid; */
+/* static int hf_mac_edch_type2_length; */
+/* static int hf_mac_edch_type2_flag; */
+static int hf_mac_edch_type2_tsn;
+static int hf_mac_edch_type2_ss;
+static int hf_mac_edch_type2_ss_interpretation;
+static int hf_mac_edch_type2_sdu;
+static int hf_mac_edch_type2_sdu_data;
+static int hf_mac_is_fraglink;
+static int hf_mac_is_reasmin;
 
 /* subtrees */
-static int ett_mac = -1;
-static int ett_mac_fach = -1;
-static int ett_mac_rach = -1;
-static int ett_mac_dch = -1;
-static int ett_mac_pch = -1;
-static int ett_mac_edch = -1;
-static int ett_mac_hsdsch = -1;
-static int ett_mac_edch_type2 = -1;
-static int ett_mac_edch_type2_sdu = -1;
-static int ett_mac_resolved_urnti = -1;
-
-static expert_field ei_mac_cs_dtch_not_implemented = EI_INIT;
-static expert_field ei_mac_rach_tctf_unknown = EI_INIT;
-static expert_field ei_mac_unknown_content = EI_INIT;
-static expert_field ei_mac_per_frame_info_missing = EI_INIT;
-static expert_field ei_mac_fach_content_type_unknown = EI_INIT;
-static expert_field ei_mac_no_logical_channel = EI_INIT;
-static expert_field ei_mac_faked_logical_channel_id = EI_INIT;
-static expert_field ei_mac_macis_sdu_reassembled = EI_INIT;
-static expert_field ei_mac_macis_sdu_first = EI_INIT;
-static expert_field ei_mac_macis_sdu_middle = EI_INIT;
-static expert_field ei_mac_macis_sdu_last = EI_INIT;
-static expert_field ei_mac_macis_sdu_complete = EI_INIT;
-static expert_field ei_mac_reserved_c_t = EI_INIT;
+static int ett_mac;
+static int ett_mac_fach;
+static int ett_mac_rach;
+static int ett_mac_dch;
+static int ett_mac_pch;
+static int ett_mac_edch;
+static int ett_mac_hsdsch;
+static int ett_mac_edch_type2;
+static int ett_mac_edch_type2_sdu;
+static int ett_mac_resolved_urnti;
+
+static expert_field ei_mac_cs_dtch_not_implemented;
+static expert_field ei_mac_rach_tctf_unknown;
+static expert_field ei_mac_unknown_content;
+static expert_field ei_mac_per_frame_info_missing;
+static expert_field ei_mac_fach_content_type_unknown;
+static expert_field ei_mac_no_logical_channel;
+static expert_field ei_mac_faked_logical_channel_id;
+static expert_field ei_mac_macis_sdu_reassembled;
+static expert_field ei_mac_macis_sdu_first;
+static expert_field ei_mac_macis_sdu_middle;
+static expert_field ei_mac_macis_sdu_last;
+static expert_field ei_mac_macis_sdu_complete;
+static expert_field ei_mac_reserved_c_t;
 
 static dissector_handle_t rlc_pcch_handle;
 static dissector_handle_t rlc_ccch_handle;
diff --git a/epan/dissectors/packet-umts_rlc.c b/epan/dissectors/packet-umts_rlc.c
index 33e2e5a3e3..8ad24eeb7b 100644
--- a/epan/dissectors/packet-umts_rlc.c
+++ b/epan/dissectors/packet-umts_rlc.c
@@ -38,7 +38,7 @@
 void proto_register_rlc(void);
 void proto_reg_handoff_rlc(void);
 
-int proto_umts_rlc = -1;
+int proto_umts_rlc;
 
 extern int proto_fp;
 
@@ -73,82 +73,82 @@ static const enum_val_t li_size_enumvals[] = {
     {NULL, NULL, -1}};
 
 /* fields */
-static int hf_rlc_seq = -1;
-static int hf_rlc_ext = -1;
-static int hf_rlc_pad = -1;
-static int hf_rlc_reassembled_data = -1;
-static int hf_rlc_frags = -1;
-static int hf_rlc_frag = -1;
-static int hf_rlc_duplicate_of = -1;
-static int hf_rlc_reassembled_in = -1;
-static int hf_rlc_he = -1;
-static int hf_rlc_dc = -1;
-static int hf_rlc_p = -1;
-static int hf_rlc_li = -1;
-static int hf_rlc_li_value = -1;
-static int hf_rlc_li_ext = -1;
-static int hf_rlc_li_data = -1;
-static int hf_rlc_data = -1;
-static int hf_rlc_ciphered_data = -1;
-static int hf_rlc_ciphered_lis_data = -1;
-static int hf_rlc_ctrl_type = -1;
-static int hf_rlc_r1 = -1;
-static int hf_rlc_rsn = -1;
-static int hf_rlc_hfni = -1;
-static int hf_rlc_sufi = -1;
-static int hf_rlc_sufi_type = -1;
-static int hf_rlc_sufi_lsn = -1;
-static int hf_rlc_sufi_wsn = -1;
-static int hf_rlc_sufi_sn = -1;
-static int hf_rlc_sufi_l = -1;
-static int hf_rlc_sufi_fsn = -1;
-static int hf_rlc_sufi_len = -1;
-static int hf_rlc_sufi_bitmap = -1;
-static int hf_rlc_sufi_cw = -1;
-static int hf_rlc_sufi_n = -1;
-static int hf_rlc_sufi_sn_ack = -1;
-static int hf_rlc_sufi_sn_mrw = -1;
-static int hf_rlc_sufi_poll_sn = -1;
-static int hf_rlc_header_only = -1;
-static int hf_rlc_channel = -1;
-static int hf_rlc_channel_rbid = -1;
-static int hf_rlc_channel_dir = -1;
-static int hf_rlc_channel_ueid = -1;
-static int hf_rlc_sequence_number = -1;
-static int hf_rlc_length = -1;
-static int hf_rlc_bitmap_string = -1;
+static int hf_rlc_seq;
+static int hf_rlc_ext;
+static int hf_rlc_pad;
+static int hf_rlc_reassembled_data;
+static int hf_rlc_frags;
+static int hf_rlc_frag;
+static int hf_rlc_duplicate_of;
+static int hf_rlc_reassembled_in;
+static int hf_rlc_he;
+static int hf_rlc_dc;
+static int hf_rlc_p;
+static int hf_rlc_li;
+static int hf_rlc_li_value;
+static int hf_rlc_li_ext;
+static int hf_rlc_li_data;
+static int hf_rlc_data;
+static int hf_rlc_ciphered_data;
+static int hf_rlc_ciphered_lis_data;
+static int hf_rlc_ctrl_type;
+static int hf_rlc_r1;
+static int hf_rlc_rsn;
+static int hf_rlc_hfni;
+static int hf_rlc_sufi;
+static int hf_rlc_sufi_type;
+static int hf_rlc_sufi_lsn;
+static int hf_rlc_sufi_wsn;
+static int hf_rlc_sufi_sn;
+static int hf_rlc_sufi_l;
+static int hf_rlc_sufi_fsn;
+static int hf_rlc_sufi_len;
+static int hf_rlc_sufi_bitmap;
+static int hf_rlc_sufi_cw;
+static int hf_rlc_sufi_n;
+static int hf_rlc_sufi_sn_ack;
+static int hf_rlc_sufi_sn_mrw;
+static int hf_rlc_sufi_poll_sn;
+static int hf_rlc_header_only;
+static int hf_rlc_channel;
+static int hf_rlc_channel_rbid;
+static int hf_rlc_channel_dir;
+static int hf_rlc_channel_ueid;
+static int hf_rlc_sequence_number;
+static int hf_rlc_length;
+static int hf_rlc_bitmap_string;
 
 /* subtrees */
-static int ett_rlc = -1;
-static int ett_rlc_frag = -1;
-static int ett_rlc_fragments = -1;
-static int ett_rlc_sdu = -1;
-static int ett_rlc_sufi = -1;
-static int ett_rlc_bitmap = -1;
-static int ett_rlc_rlist = -1;
-static int ett_rlc_channel = -1;
-
-static expert_field ei_rlc_li_reserved = EI_INIT;
-static expert_field ei_rlc_he = EI_INIT;
-static expert_field ei_rlc_li_incorrect_mal = EI_INIT;
-static expert_field ei_rlc_sufi_cw = EI_INIT;
-static expert_field ei_rlc_kasumi_implementation_missing = EI_INIT;
-static expert_field ei_rlc_reassembly_unknown_error = EI_INIT;
-static expert_field ei_rlc_reassembly_lingering_endpoint = EI_INIT;
-static expert_field ei_rlc_sufi_len = EI_INIT;
-static expert_field ei_rlc_reassembly_fail_unfinished_sequence = EI_INIT;
-static expert_field ei_rlc_reassembly_fail_flag_set = EI_INIT;
-static expert_field ei_rlc_sufi_type = EI_INIT;
-static expert_field ei_rlc_reserved_bits_not_zero = EI_INIT;
-static expert_field ei_rlc_ctrl_type = EI_INIT;
-static expert_field ei_rlc_li_incorrect_warn = EI_INIT;
-static expert_field ei_rlc_li_too_many = EI_INIT;
-static expert_field ei_rlc_header_only = EI_INIT;
-static expert_field ei_rlc_ciphered_data = EI_INIT;
-static expert_field ei_rlc_no_per_frame_data = EI_INIT;
-static expert_field ei_rlc_incomplete_sequence = EI_INIT;
-static expert_field ei_rlc_unknown_udp_framing_tag = EI_INIT;
-static expert_field ei_rlc_missing_udp_framing_tag = EI_INIT;
+static int ett_rlc;
+static int ett_rlc_frag;
+static int ett_rlc_fragments;
+static int ett_rlc_sdu;
+static int ett_rlc_sufi;
+static int ett_rlc_bitmap;
+static int ett_rlc_rlist;
+static int ett_rlc_channel;
+
+static expert_field ei_rlc_li_reserved;
+static expert_field ei_rlc_he;
+static expert_field ei_rlc_li_incorrect_mal;
+static expert_field ei_rlc_sufi_cw;
+static expert_field ei_rlc_kasumi_implementation_missing;
+static expert_field ei_rlc_reassembly_unknown_error;
+static expert_field ei_rlc_reassembly_lingering_endpoint;
+static expert_field ei_rlc_sufi_len;
+static expert_field ei_rlc_reassembly_fail_unfinished_sequence;
+static expert_field ei_rlc_reassembly_fail_flag_set;
+static expert_field ei_rlc_sufi_type;
+static expert_field ei_rlc_reserved_bits_not_zero;
+static expert_field ei_rlc_ctrl_type;
+static expert_field ei_rlc_li_incorrect_warn;
+static expert_field ei_rlc_li_too_many;
+static expert_field ei_rlc_header_only;
+static expert_field ei_rlc_ciphered_data;
+static expert_field ei_rlc_no_per_frame_data;
+static expert_field ei_rlc_incomplete_sequence;
+static expert_field ei_rlc_unknown_udp_framing_tag;
+static expert_field ei_rlc_missing_udp_framing_tag;
 
 static dissector_handle_t ip_handle;
 static dissector_handle_t rrc_handle;
diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c
index c69aa4dd2d..c7a85ef0c1 100644
--- a/epan/dissectors/packet-usb-audio.c
+++ b/epan/dissectors/packet-usb-audio.c
@@ -26,332 +26,332 @@ void proto_register_usb_audio(void);
 void proto_reg_handoff_usb_audio(void);
 
 /* protocols and header fields */
-static int proto_usb_audio = -1;
-static int hf_midi_cable_number = -1;
-static int hf_midi_code_index = -1;
-static int hf_midi_event = -1;
-static int hf_midi_padding = -1;
-static int hf_ac_if_desc_subtype = -1;
-static int hf_ac_if_hdr_ver = -1;
-static int hf_ac_if_hdr_total_len = -1;
-static int hf_ac_if_hdr_bInCollection = -1;
-static int hf_ac_if_hdr_if_num = -1;
-static int hf_ac_if_hdr_category = -1;
-static int hf_ac_if_hdr_controls = -1;
-static int hf_ac_if_hdr_controls_latency = -1;
-static int hf_ac_if_hdr_controls_rsv = -1;
-static int hf_ac_if_input_terminalid = -1;
-static int hf_ac_if_input_terminaltype = -1;
-static int hf_ac_if_input_assocterminal = -1;
-static int hf_ac_if_input_csourceid = -1;
-static int hf_ac_if_input_nrchannels = -1;
-static int hf_ac_if_input_wchannelconfig = -1;
-static int hf_ac_if_input_wchannelconfig_d0 = -1;
-static int hf_ac_if_input_wchannelconfig_d1 = -1;
-static int hf_ac_if_input_wchannelconfig_d2 = -1;
-static int hf_ac_if_input_wchannelconfig_d3 = -1;
-static int hf_ac_if_input_wchannelconfig_d4 = -1;
-static int hf_ac_if_input_wchannelconfig_d5 = -1;
-static int hf_ac_if_input_wchannelconfig_d6 = -1;
-static int hf_ac_if_input_wchannelconfig_d7 = -1;
-static int hf_ac_if_input_wchannelconfig_d8 = -1;
-static int hf_ac_if_input_wchannelconfig_d9 = -1;
-static int hf_ac_if_input_wchannelconfig_d10 = -1;
-static int hf_ac_if_input_wchannelconfig_d11 = -1;
-static int hf_ac_if_input_wchannelconfig_rsv = -1;
-static int hf_ac_if_input_bmchannelconfig = -1;
-static int hf_ac_if_input_bmchannelconfig_d0 = -1;
-static int hf_ac_if_input_bmchannelconfig_d1 = -1;
-static int hf_ac_if_input_bmchannelconfig_d2 = -1;
-static int hf_ac_if_input_bmchannelconfig_d3 = -1;
-static int hf_ac_if_input_bmchannelconfig_d4 = -1;
-static int hf_ac_if_input_bmchannelconfig_d5 = -1;
-static int hf_ac_if_input_bmchannelconfig_d6 = -1;
-static int hf_ac_if_input_bmchannelconfig_d7 = -1;
-static int hf_ac_if_input_bmchannelconfig_d8 = -1;
-static int hf_ac_if_input_bmchannelconfig_d9 = -1;
-static int hf_ac_if_input_bmchannelconfig_d10 = -1;
-static int hf_ac_if_input_bmchannelconfig_d11 = -1;
-static int hf_ac_if_input_bmchannelconfig_d12 = -1;
-static int hf_ac_if_input_bmchannelconfig_d13 = -1;
-static int hf_ac_if_input_bmchannelconfig_d14 = -1;
-static int hf_ac_if_input_bmchannelconfig_d15 = -1;
-static int hf_ac_if_input_bmchannelconfig_d16 = -1;
-static int hf_ac_if_input_bmchannelconfig_d17 = -1;
-static int hf_ac_if_input_bmchannelconfig_d18 = -1;
-static int hf_ac_if_input_bmchannelconfig_d19 = -1;
-static int hf_ac_if_input_bmchannelconfig_d20 = -1;
-static int hf_ac_if_input_bmchannelconfig_d21 = -1;
-static int hf_ac_if_input_bmchannelconfig_d22 = -1;
-static int hf_ac_if_input_bmchannelconfig_d23 = -1;
-static int hf_ac_if_input_bmchannelconfig_d24 = -1;
-static int hf_ac_if_input_bmchannelconfig_d25 = -1;
-static int hf_ac_if_input_bmchannelconfig_d26 = -1;
-static int hf_ac_if_input_bmchannelconfig_rsv = -1;
-static int hf_ac_if_input_bmchannelconfig_d31 = -1;
-static int hf_ac_if_input_channelnames = -1;
-static int hf_ac_if_input_controls = -1;
-static int hf_ac_if_input_controls_copy = -1;
-static int hf_ac_if_input_controls_connector = -1;
-static int hf_ac_if_input_controls_overload = -1;
-static int hf_ac_if_input_controls_cluster = -1;
-static int hf_ac_if_input_controls_underflow = -1;
-static int hf_ac_if_input_controls_overflow = -1;
-static int hf_ac_if_input_controls_rsv = -1;
-static int hf_ac_if_input_terminal = -1;
-static int hf_ac_if_output_terminalid = -1;
-static int hf_ac_if_output_terminaltype = -1;
-static int hf_ac_if_output_assocterminal = -1;
-static int hf_ac_if_output_sourceid = -1;
-static int hf_ac_if_output_clk_sourceid = -1;
-static int hf_ac_if_output_controls = -1;
-static int hf_ac_if_output_controls_copy = -1;
-static int hf_ac_if_output_controls_connector = -1;
-static int hf_ac_if_output_controls_overload = -1;
-static int hf_ac_if_output_controls_underflow = -1;
-static int hf_ac_if_output_controls_overflow = -1;
-static int hf_ac_if_output_controls_rsv = -1;
-static int hf_ac_if_output_terminal = -1;
-static int hf_ac_if_fu_unitid = -1;
-static int hf_ac_if_fu_sourceid = -1;
-static int hf_ac_if_fu_controlsize = -1;
-static int hf_ac_if_fu_controls = -1;
-static int hf_ac_if_fu_control = -1;
-static int hf_ac_if_fu_controls_d0 = -1;
-static int hf_ac_if_fu_controls_d1 = -1;
-static int hf_ac_if_fu_controls_d2 = -1;
-static int hf_ac_if_fu_controls_d3 = -1;
-static int hf_ac_if_fu_controls_d4 = -1;
-static int hf_ac_if_fu_controls_d5 = -1;
-static int hf_ac_if_fu_controls_d6 = -1;
-static int hf_ac_if_fu_controls_d7 = -1;
-static int hf_ac_if_fu_controls_d8 = -1;
-static int hf_ac_if_fu_controls_d9 = -1;
-static int hf_ac_if_fu_controls_rsv = -1;
-static int hf_ac_if_fu_controls_v2 = -1;
-static int hf_ac_if_fu_control_v2 = -1;
-static int hf_ac_if_fu_controls_v2_d0 = -1;
-static int hf_ac_if_fu_controls_v2_d1 = -1;
-static int hf_ac_if_fu_controls_v2_d2 = -1;
-static int hf_ac_if_fu_controls_v2_d3 = -1;
-static int hf_ac_if_fu_controls_v2_d4 = -1;
-static int hf_ac_if_fu_controls_v2_d5 = -1;
-static int hf_ac_if_fu_controls_v2_d6 = -1;
-static int hf_ac_if_fu_controls_v2_d7 = -1;
-static int hf_ac_if_fu_controls_v2_d8 = -1;
-static int hf_ac_if_fu_controls_v2_d9 = -1;
-static int hf_ac_if_fu_controls_v2_d10 = -1;
-static int hf_ac_if_fu_controls_v2_d11 = -1;
-static int hf_ac_if_fu_controls_v2_d12 = -1;
-static int hf_ac_if_fu_controls_v2_d13 = -1;
-static int hf_ac_if_fu_controls_v2_d14 = -1;
-static int hf_ac_if_fu_controls_v2_rsv = -1;
-static int hf_ac_if_fu_ifeature = -1;
-static int hf_ac_if_su_unitid = -1;
-static int hf_ac_if_su_nrinpins = -1;
-static int hf_ac_if_su_sourceids = -1;
-static int hf_ac_if_su_sourceid = -1;
-static int hf_ac_if_su_controls = -1;
-static int hf_ac_if_su_controls_d0 = -1;
-static int hf_ac_if_su_controls_rsv = -1;
-static int hf_ac_if_su_iselector = -1;
-static int hf_ac_if_mu_unitid = -1;
-static int hf_ac_if_mu_nrinpins = -1;
-static int hf_ac_if_mu_sourceid = -1;
-static int hf_ac_if_mu_nrchannels = -1;
-static int hf_ac_if_mu_channelconfig = -1;
-static int hf_ac_if_mu_channelconfig_d0 = -1;
-static int hf_ac_if_mu_channelconfig_d1 = -1;
-static int hf_ac_if_mu_channelconfig_d2 = -1;
-static int hf_ac_if_mu_channelconfig_d3 = -1;
-static int hf_ac_if_mu_channelconfig_d4 = -1;
-static int hf_ac_if_mu_channelconfig_d5 = -1;
-static int hf_ac_if_mu_channelconfig_d6 = -1;
-static int hf_ac_if_mu_channelconfig_d7 = -1;
-static int hf_ac_if_mu_channelconfig_d8 = -1;
-static int hf_ac_if_mu_channelconfig_d9 = -1;
-static int hf_ac_if_mu_channelconfig_d10 = -1;
-static int hf_ac_if_mu_channelconfig_d11 = -1;
-static int hf_ac_if_mu_channelconfig_rsv = -1;
-static int hf_ac_if_mu_channelnames = -1;
-static int hf_ac_if_mu_controls = -1;
-static int hf_ac_if_mu_imixer = -1;
-static int hf_ac_if_clksrc_id = -1;
-static int hf_ac_if_clksrc_attr = -1;
-static int hf_ac_if_clksrc_attr_type = -1;
-static int hf_ac_if_clksrc_attr_d2 = -1;
-static int hf_ac_if_clksrc_attr_rsv = -1;
-static int hf_ac_if_clksrc_controls = -1;
-static int hf_ac_if_clksrc_controls_freq = -1;
-static int hf_ac_if_clksrc_controls_validity = -1;
-static int hf_ac_if_clksrc_controls_rsv = -1;
-static int hf_ac_if_clksrc_assocterminal = -1;
-static int hf_ac_if_clksrc_clocksource = -1;
-static int hf_ac_if_clksel_id = -1;
-static int hf_ac_if_clksel_nrpins = -1;
-static int hf_ac_if_clksel_sourceid = -1;
-static int hf_ac_if_clksel_controls = -1;
-static int hf_ac_if_clksel_controls_clksel = -1;
-static int hf_ac_if_clksel_controls_rsv = -1;
-static int hf_ac_if_clksel_clockselector = -1;
-static int hf_as_if_desc_subtype = -1;
-static int hf_as_if_gen_term_link = -1;
-static int hf_as_if_gen_delay = -1;
-static int hf_as_if_gen_wformattag = -1;
-static int hf_as_if_gen_controls = -1;
-static int hf_as_if_gen_controls_active = -1;
-static int hf_as_if_gen_controls_valid = -1;
-static int hf_as_if_gen_controls_rsv = -1;
-static int hf_as_if_gen_formattype = -1;
-static int hf_as_if_gen_formats = -1;
-static int hf_as_if_gen_formats_i_d0 = -1;
-static int hf_as_if_gen_formats_i_d1 = -1;
-static int hf_as_if_gen_formats_i_d2 = -1;
-static int hf_as_if_gen_formats_i_d3 = -1;
-static int hf_as_if_gen_formats_i_d4 = -1;
-static int hf_as_if_gen_formats_i_rsv = -1;
-static int hf_as_if_gen_formats_i_d31 = -1;
-static int hf_as_if_gen_formats_ii_d0 = -1;
-static int hf_as_if_gen_formats_ii_d1 = -1;
-static int hf_as_if_gen_formats_ii_d2 = -1;
-static int hf_as_if_gen_formats_ii_d3 = -1;
-static int hf_as_if_gen_formats_ii_rsv = -1;
-static int hf_as_if_gen_formats_ii_d31 = -1;
-static int hf_as_if_gen_formats_iii_d0 = -1;
-static int hf_as_if_gen_formats_iii_d1 = -1;
-static int hf_as_if_gen_formats_iii_d2 = -1;
-static int hf_as_if_gen_formats_iii_d3 = -1;
-static int hf_as_if_gen_formats_iii_d4 = -1;
-static int hf_as_if_gen_formats_iii_d5 = -1;
-static int hf_as_if_gen_formats_iii_d6 = -1;
-static int hf_as_if_gen_formats_iii_d7 = -1;
-static int hf_as_if_gen_formats_iii_d8 = -1;
-static int hf_as_if_gen_formats_iii_d9 = -1;
-static int hf_as_if_gen_formats_iii_d10 = -1;
-static int hf_as_if_gen_formats_iii_d11 = -1;
-static int hf_as_if_gen_formats_iii_d12 = -1;
-static int hf_as_if_gen_formats_iii_rsv = -1;
-static int hf_as_if_gen_formats_iv_d0 = -1;
-static int hf_as_if_gen_formats_iv_d1 = -1;
-static int hf_as_if_gen_formats_iv_d2 = -1;
-static int hf_as_if_gen_formats_iv_d3 = -1;
-static int hf_as_if_gen_formats_iv_d4 = -1;
-static int hf_as_if_gen_formats_iv_d5 = -1;
-static int hf_as_if_gen_formats_iv_d6 = -1;
-static int hf_as_if_gen_formats_iv_d7 = -1;
-static int hf_as_if_gen_formats_iv_d8 = -1;
-static int hf_as_if_gen_formats_iv_d9 = -1;
-static int hf_as_if_gen_formats_iv_d10 = -1;
-static int hf_as_if_gen_formats_iv_d11 = -1;
-static int hf_as_if_gen_formats_iv_d12 = -1;
-static int hf_as_if_gen_formats_iv_d13 = -1;
-static int hf_as_if_gen_formats_iv_d14 = -1;
-static int hf_as_if_gen_formats_iv_d15 = -1;
-static int hf_as_if_gen_formats_iv_d16 = -1;
-static int hf_as_if_gen_formats_iv_d17 = -1;
-static int hf_as_if_gen_formats_iv_d18 = -1;
-static int hf_as_if_gen_formats_iv_d19 = -1;
-static int hf_as_if_gen_formats_iv_d20 = -1;
-static int hf_as_if_gen_formats_iv_d21 = -1;
-static int hf_as_if_gen_formats_iv_rsv = -1;
-static int hf_as_if_gen_nrchannels = -1;
-static int hf_as_if_gen_bmchannelconfig = -1;
-static int hf_as_if_gen_bmchannelconfig_d0 = -1;
-static int hf_as_if_gen_bmchannelconfig_d1 = -1;
-static int hf_as_if_gen_bmchannelconfig_d2 = -1;
-static int hf_as_if_gen_bmchannelconfig_d3 = -1;
-static int hf_as_if_gen_bmchannelconfig_d4 = -1;
-static int hf_as_if_gen_bmchannelconfig_d5 = -1;
-static int hf_as_if_gen_bmchannelconfig_d6 = -1;
-static int hf_as_if_gen_bmchannelconfig_d7 = -1;
-static int hf_as_if_gen_bmchannelconfig_d8 = -1;
-static int hf_as_if_gen_bmchannelconfig_d9 = -1;
-static int hf_as_if_gen_bmchannelconfig_d10 = -1;
-static int hf_as_if_gen_bmchannelconfig_d11 = -1;
-static int hf_as_if_gen_bmchannelconfig_d12 = -1;
-static int hf_as_if_gen_bmchannelconfig_d13 = -1;
-static int hf_as_if_gen_bmchannelconfig_d14 = -1;
-static int hf_as_if_gen_bmchannelconfig_d15 = -1;
-static int hf_as_if_gen_bmchannelconfig_d16 = -1;
-static int hf_as_if_gen_bmchannelconfig_d17 = -1;
-static int hf_as_if_gen_bmchannelconfig_d18 = -1;
-static int hf_as_if_gen_bmchannelconfig_d19 = -1;
-static int hf_as_if_gen_bmchannelconfig_d20 = -1;
-static int hf_as_if_gen_bmchannelconfig_d21 = -1;
-static int hf_as_if_gen_bmchannelconfig_d22 = -1;
-static int hf_as_if_gen_bmchannelconfig_d23 = -1;
-static int hf_as_if_gen_bmchannelconfig_d24 = -1;
-static int hf_as_if_gen_bmchannelconfig_d25 = -1;
-static int hf_as_if_gen_bmchannelconfig_d26 = -1;
-static int hf_as_if_gen_bmchannelconfig_rsv = -1;
-static int hf_as_if_gen_bmchannelconfig_d31 = -1;
-static int hf_as_if_gen_channelnames = -1;
-static int hf_as_if_ft_formattype = -1;
-static int hf_as_if_ft_maxbitrate = -1;
-static int hf_as_if_ft_nrchannels = -1;
-static int hf_as_if_ft_subframesize = -1;
-static int hf_as_if_ft_subslotsize = -1;
-static int hf_as_if_ft_bitresolution = -1;
-static int hf_as_if_ft_samplesperframe = -1;
-static int hf_as_if_ft_samfreqtype = -1;
-static int hf_as_if_ft_lowersamfreq = -1;
-static int hf_as_if_ft_uppersamfreq = -1;
-static int hf_as_if_ft_samfreq = -1;
-static int hf_as_ep_desc_subtype = -1;
-static int hf_as_ep_gen_bmattributes = -1;
-static int hf_as_ep_gen_bmattributes_d0 = -1;
-static int hf_as_ep_gen_bmattributes_d1 = -1;
-static int hf_as_ep_gen_bmattributes_rsv = -1;
-static int hf_as_ep_gen_bmattributes_d7 = -1;
-static int hf_as_ep_gen_controls = -1;
-static int hf_as_ep_gen_controls_pitch = -1;
-static int hf_as_ep_gen_controls_data_overrun = -1;
-static int hf_as_ep_gen_controls_data_underrun = -1;
-static int hf_as_ep_gen_controls_rsv = -1;
-static int hf_as_ep_gen_lockdelayunits = -1;
-static int hf_as_ep_gen_lockdelay = -1;
-static int hf_ms_if_desc_subtype = -1;
-static int hf_ms_if_hdr_ver = -1;
-static int hf_ms_if_hdr_total_len = -1;
-static int hf_ms_if_midi_in_bjacktype = -1;
-static int hf_ms_if_midi_in_bjackid = -1;
-static int hf_ms_if_midi_in_ijack = -1;
-static int hf_ms_if_midi_out_bjacktype = -1;
-static int hf_ms_if_midi_out_bjackid = -1;
-static int hf_ms_if_midi_out_bnrinputpins = -1;
-static int hf_ms_if_midi_out_basourceid = -1;
-static int hf_ms_if_midi_out_basourcepin = -1;
-static int hf_ms_if_midi_out_ijack = -1;
-static int hf_ms_ep_gen_numjacks = -1;
-static int hf_ms_ep_gen_baassocjackid = -1;
-static int hf_ms_ep_desc_subtype = -1;
+static int proto_usb_audio;
+static int hf_midi_cable_number;
+static int hf_midi_code_index;
+static int hf_midi_event;
+static int hf_midi_padding;
+static int hf_ac_if_desc_subtype;
+static int hf_ac_if_hdr_ver;
+static int hf_ac_if_hdr_total_len;
+static int hf_ac_if_hdr_bInCollection;
+static int hf_ac_if_hdr_if_num;
+static int hf_ac_if_hdr_category;
+static int hf_ac_if_hdr_controls;
+static int hf_ac_if_hdr_controls_latency;
+static int hf_ac_if_hdr_controls_rsv;
+static int hf_ac_if_input_terminalid;
+static int hf_ac_if_input_terminaltype;
+static int hf_ac_if_input_assocterminal;
+static int hf_ac_if_input_csourceid;
+static int hf_ac_if_input_nrchannels;
+static int hf_ac_if_input_wchannelconfig;
+static int hf_ac_if_input_wchannelconfig_d0;
+static int hf_ac_if_input_wchannelconfig_d1;
+static int hf_ac_if_input_wchannelconfig_d2;
+static int hf_ac_if_input_wchannelconfig_d3;
+static int hf_ac_if_input_wchannelconfig_d4;
+static int hf_ac_if_input_wchannelconfig_d5;
+static int hf_ac_if_input_wchannelconfig_d6;
+static int hf_ac_if_input_wchannelconfig_d7;
+static int hf_ac_if_input_wchannelconfig_d8;
+static int hf_ac_if_input_wchannelconfig_d9;
+static int hf_ac_if_input_wchannelconfig_d10;
+static int hf_ac_if_input_wchannelconfig_d11;
+static int hf_ac_if_input_wchannelconfig_rsv;
+static int hf_ac_if_input_bmchannelconfig;
+static int hf_ac_if_input_bmchannelconfig_d0;
+static int hf_ac_if_input_bmchannelconfig_d1;
+static int hf_ac_if_input_bmchannelconfig_d2;
+static int hf_ac_if_input_bmchannelconfig_d3;
+static int hf_ac_if_input_bmchannelconfig_d4;
+static int hf_ac_if_input_bmchannelconfig_d5;
+static int hf_ac_if_input_bmchannelconfig_d6;
+static int hf_ac_if_input_bmchannelconfig_d7;
+static int hf_ac_if_input_bmchannelconfig_d8;
+static int hf_ac_if_input_bmchannelconfig_d9;
+static int hf_ac_if_input_bmchannelconfig_d10;
+static int hf_ac_if_input_bmchannelconfig_d11;
+static int hf_ac_if_input_bmchannelconfig_d12;
+static int hf_ac_if_input_bmchannelconfig_d13;
+static int hf_ac_if_input_bmchannelconfig_d14;
+static int hf_ac_if_input_bmchannelconfig_d15;
+static int hf_ac_if_input_bmchannelconfig_d16;
+static int hf_ac_if_input_bmchannelconfig_d17;
+static int hf_ac_if_input_bmchannelconfig_d18;
+static int hf_ac_if_input_bmchannelconfig_d19;
+static int hf_ac_if_input_bmchannelconfig_d20;
+static int hf_ac_if_input_bmchannelconfig_d21;
+static int hf_ac_if_input_bmchannelconfig_d22;
+static int hf_ac_if_input_bmchannelconfig_d23;
+static int hf_ac_if_input_bmchannelconfig_d24;
+static int hf_ac_if_input_bmchannelconfig_d25;
+static int hf_ac_if_input_bmchannelconfig_d26;
+static int hf_ac_if_input_bmchannelconfig_rsv;
+static int hf_ac_if_input_bmchannelconfig_d31;
+static int hf_ac_if_input_channelnames;
+static int hf_ac_if_input_controls;
+static int hf_ac_if_input_controls_copy;
+static int hf_ac_if_input_controls_connector;
+static int hf_ac_if_input_controls_overload;
+static int hf_ac_if_input_controls_cluster;
+static int hf_ac_if_input_controls_underflow;
+static int hf_ac_if_input_controls_overflow;
+static int hf_ac_if_input_controls_rsv;
+static int hf_ac_if_input_terminal;
+static int hf_ac_if_output_terminalid;
+static int hf_ac_if_output_terminaltype;
+static int hf_ac_if_output_assocterminal;
+static int hf_ac_if_output_sourceid;
+static int hf_ac_if_output_clk_sourceid;
+static int hf_ac_if_output_controls;
+static int hf_ac_if_output_controls_copy;
+static int hf_ac_if_output_controls_connector;
+static int hf_ac_if_output_controls_overload;
+static int hf_ac_if_output_controls_underflow;
+static int hf_ac_if_output_controls_overflow;
+static int hf_ac_if_output_controls_rsv;
+static int hf_ac_if_output_terminal;
+static int hf_ac_if_fu_unitid;
+static int hf_ac_if_fu_sourceid;
+static int hf_ac_if_fu_controlsize;
+static int hf_ac_if_fu_controls;
+static int hf_ac_if_fu_control;
+static int hf_ac_if_fu_controls_d0;
+static int hf_ac_if_fu_controls_d1;
+static int hf_ac_if_fu_controls_d2;
+static int hf_ac_if_fu_controls_d3;
+static int hf_ac_if_fu_controls_d4;
+static int hf_ac_if_fu_controls_d5;
+static int hf_ac_if_fu_controls_d6;
+static int hf_ac_if_fu_controls_d7;
+static int hf_ac_if_fu_controls_d8;
+static int hf_ac_if_fu_controls_d9;
+static int hf_ac_if_fu_controls_rsv;
+static int hf_ac_if_fu_controls_v2;
+static int hf_ac_if_fu_control_v2;
+static int hf_ac_if_fu_controls_v2_d0;
+static int hf_ac_if_fu_controls_v2_d1;
+static int hf_ac_if_fu_controls_v2_d2;
+static int hf_ac_if_fu_controls_v2_d3;
+static int hf_ac_if_fu_controls_v2_d4;
+static int hf_ac_if_fu_controls_v2_d5;
+static int hf_ac_if_fu_controls_v2_d6;
+static int hf_ac_if_fu_controls_v2_d7;
+static int hf_ac_if_fu_controls_v2_d8;
+static int hf_ac_if_fu_controls_v2_d9;
+static int hf_ac_if_fu_controls_v2_d10;
+static int hf_ac_if_fu_controls_v2_d11;
+static int hf_ac_if_fu_controls_v2_d12;
+static int hf_ac_if_fu_controls_v2_d13;
+static int hf_ac_if_fu_controls_v2_d14;
+static int hf_ac_if_fu_controls_v2_rsv;
+static int hf_ac_if_fu_ifeature;
+static int hf_ac_if_su_unitid;
+static int hf_ac_if_su_nrinpins;
+static int hf_ac_if_su_sourceids;
+static int hf_ac_if_su_sourceid;
+static int hf_ac_if_su_controls;
+static int hf_ac_if_su_controls_d0;
+static int hf_ac_if_su_controls_rsv;
+static int hf_ac_if_su_iselector;
+static int hf_ac_if_mu_unitid;
+static int hf_ac_if_mu_nrinpins;
+static int hf_ac_if_mu_sourceid;
+static int hf_ac_if_mu_nrchannels;
+static int hf_ac_if_mu_channelconfig;
+static int hf_ac_if_mu_channelconfig_d0;
+static int hf_ac_if_mu_channelconfig_d1;
+static int hf_ac_if_mu_channelconfig_d2;
+static int hf_ac_if_mu_channelconfig_d3;
+static int hf_ac_if_mu_channelconfig_d4;
+static int hf_ac_if_mu_channelconfig_d5;
+static int hf_ac_if_mu_channelconfig_d6;
+static int hf_ac_if_mu_channelconfig_d7;
+static int hf_ac_if_mu_channelconfig_d8;
+static int hf_ac_if_mu_channelconfig_d9;
+static int hf_ac_if_mu_channelconfig_d10;
+static int hf_ac_if_mu_channelconfig_d11;
+static int hf_ac_if_mu_channelconfig_rsv;
+static int hf_ac_if_mu_channelnames;
+static int hf_ac_if_mu_controls;
+static int hf_ac_if_mu_imixer;
+static int hf_ac_if_clksrc_id;
+static int hf_ac_if_clksrc_attr;
+static int hf_ac_if_clksrc_attr_type;
+static int hf_ac_if_clksrc_attr_d2;
+static int hf_ac_if_clksrc_attr_rsv;
+static int hf_ac_if_clksrc_controls;
+static int hf_ac_if_clksrc_controls_freq;
+static int hf_ac_if_clksrc_controls_validity;
+static int hf_ac_if_clksrc_controls_rsv;
+static int hf_ac_if_clksrc_assocterminal;
+static int hf_ac_if_clksrc_clocksource;
+static int hf_ac_if_clksel_id;
+static int hf_ac_if_clksel_nrpins;
+static int hf_ac_if_clksel_sourceid;
+static int hf_ac_if_clksel_controls;
+static int hf_ac_if_clksel_controls_clksel;
+static int hf_ac_if_clksel_controls_rsv;
+static int hf_ac_if_clksel_clockselector;
+static int hf_as_if_desc_subtype;
+static int hf_as_if_gen_term_link;
+static int hf_as_if_gen_delay;
+static int hf_as_if_gen_wformattag;
+static int hf_as_if_gen_controls;
+static int hf_as_if_gen_controls_active;
+static int hf_as_if_gen_controls_valid;
+static int hf_as_if_gen_controls_rsv;
+static int hf_as_if_gen_formattype;
+static int hf_as_if_gen_formats;
+static int hf_as_if_gen_formats_i_d0;
+static int hf_as_if_gen_formats_i_d1;
+static int hf_as_if_gen_formats_i_d2;
+static int hf_as_if_gen_formats_i_d3;
+static int hf_as_if_gen_formats_i_d4;
+static int hf_as_if_gen_formats_i_rsv;
+static int hf_as_if_gen_formats_i_d31;
+static int hf_as_if_gen_formats_ii_d0;
+static int hf_as_if_gen_formats_ii_d1;
+static int hf_as_if_gen_formats_ii_d2;
+static int hf_as_if_gen_formats_ii_d3;
+static int hf_as_if_gen_formats_ii_rsv;
+static int hf_as_if_gen_formats_ii_d31;
+static int hf_as_if_gen_formats_iii_d0;
+static int hf_as_if_gen_formats_iii_d1;
+static int hf_as_if_gen_formats_iii_d2;
+static int hf_as_if_gen_formats_iii_d3;
+static int hf_as_if_gen_formats_iii_d4;
+static int hf_as_if_gen_formats_iii_d5;
+static int hf_as_if_gen_formats_iii_d6;
+static int hf_as_if_gen_formats_iii_d7;
+static int hf_as_if_gen_formats_iii_d8;
+static int hf_as_if_gen_formats_iii_d9;
+static int hf_as_if_gen_formats_iii_d10;
+static int hf_as_if_gen_formats_iii_d11;
+static int hf_as_if_gen_formats_iii_d12;
+static int hf_as_if_gen_formats_iii_rsv;
+static int hf_as_if_gen_formats_iv_d0;
+static int hf_as_if_gen_formats_iv_d1;
+static int hf_as_if_gen_formats_iv_d2;
+static int hf_as_if_gen_formats_iv_d3;
+static int hf_as_if_gen_formats_iv_d4;
+static int hf_as_if_gen_formats_iv_d5;
+static int hf_as_if_gen_formats_iv_d6;
+static int hf_as_if_gen_formats_iv_d7;
+static int hf_as_if_gen_formats_iv_d8;
+static int hf_as_if_gen_formats_iv_d9;
+static int hf_as_if_gen_formats_iv_d10;
+static int hf_as_if_gen_formats_iv_d11;
+static int hf_as_if_gen_formats_iv_d12;
+static int hf_as_if_gen_formats_iv_d13;
+static int hf_as_if_gen_formats_iv_d14;
+static int hf_as_if_gen_formats_iv_d15;
+static int hf_as_if_gen_formats_iv_d16;
+static int hf_as_if_gen_formats_iv_d17;
+static int hf_as_if_gen_formats_iv_d18;
+static int hf_as_if_gen_formats_iv_d19;
+static int hf_as_if_gen_formats_iv_d20;
+static int hf_as_if_gen_formats_iv_d21;
+static int hf_as_if_gen_formats_iv_rsv;
+static int hf_as_if_gen_nrchannels;
+static int hf_as_if_gen_bmchannelconfig;
+static int hf_as_if_gen_bmchannelconfig_d0;
+static int hf_as_if_gen_bmchannelconfig_d1;
+static int hf_as_if_gen_bmchannelconfig_d2;
+static int hf_as_if_gen_bmchannelconfig_d3;
+static int hf_as_if_gen_bmchannelconfig_d4;
+static int hf_as_if_gen_bmchannelconfig_d5;
+static int hf_as_if_gen_bmchannelconfig_d6;
+static int hf_as_if_gen_bmchannelconfig_d7;
+static int hf_as_if_gen_bmchannelconfig_d8;
+static int hf_as_if_gen_bmchannelconfig_d9;
+static int hf_as_if_gen_bmchannelconfig_d10;
+static int hf_as_if_gen_bmchannelconfig_d11;
+static int hf_as_if_gen_bmchannelconfig_d12;
+static int hf_as_if_gen_bmchannelconfig_d13;
+static int hf_as_if_gen_bmchannelconfig_d14;
+static int hf_as_if_gen_bmchannelconfig_d15;
+static int hf_as_if_gen_bmchannelconfig_d16;
+static int hf_as_if_gen_bmchannelconfig_d17;
+static int hf_as_if_gen_bmchannelconfig_d18;
+static int hf_as_if_gen_bmchannelconfig_d19;
+static int hf_as_if_gen_bmchannelconfig_d20;
+static int hf_as_if_gen_bmchannelconfig_d21;
+static int hf_as_if_gen_bmchannelconfig_d22;
+static int hf_as_if_gen_bmchannelconfig_d23;
+static int hf_as_if_gen_bmchannelconfig_d24;
+static int hf_as_if_gen_bmchannelconfig_d25;
+static int hf_as_if_gen_bmchannelconfig_d26;
+static int hf_as_if_gen_bmchannelconfig_rsv;
+static int hf_as_if_gen_bmchannelconfig_d31;
+static int hf_as_if_gen_channelnames;
+static int hf_as_if_ft_formattype;
+static int hf_as_if_ft_maxbitrate;
+static int hf_as_if_ft_nrchannels;
+static int hf_as_if_ft_subframesize;
+static int hf_as_if_ft_subslotsize;
+static int hf_as_if_ft_bitresolution;
+static int hf_as_if_ft_samplesperframe;
+static int hf_as_if_ft_samfreqtype;
+static int hf_as_if_ft_lowersamfreq;
+static int hf_as_if_ft_uppersamfreq;
+static int hf_as_if_ft_samfreq;
+static int hf_as_ep_desc_subtype;
+static int hf_as_ep_gen_bmattributes;
+static int hf_as_ep_gen_bmattributes_d0;
+static int hf_as_ep_gen_bmattributes_d1;
+static int hf_as_ep_gen_bmattributes_rsv;
+static int hf_as_ep_gen_bmattributes_d7;
+static int hf_as_ep_gen_controls;
+static int hf_as_ep_gen_controls_pitch;
+static int hf_as_ep_gen_controls_data_overrun;
+static int hf_as_ep_gen_controls_data_underrun;
+static int hf_as_ep_gen_controls_rsv;
+static int hf_as_ep_gen_lockdelayunits;
+static int hf_as_ep_gen_lockdelay;
+static int hf_ms_if_desc_subtype;
+static int hf_ms_if_hdr_ver;
+static int hf_ms_if_hdr_total_len;
+static int hf_ms_if_midi_in_bjacktype;
+static int hf_ms_if_midi_in_bjackid;
+static int hf_ms_if_midi_in_ijack;
+static int hf_ms_if_midi_out_bjacktype;
+static int hf_ms_if_midi_out_bjackid;
+static int hf_ms_if_midi_out_bnrinputpins;
+static int hf_ms_if_midi_out_basourceid;
+static int hf_ms_if_midi_out_basourcepin;
+static int hf_ms_if_midi_out_ijack;
+static int hf_ms_ep_gen_numjacks;
+static int hf_ms_ep_gen_baassocjackid;
+static int hf_ms_ep_desc_subtype;
 
 static reassembly_table midi_data_reassembly_table;
 
-static gint ett_usb_audio      = -1;
-static gint ett_usb_audio_desc = -1;
-
-static gint ett_ac_if_hdr_controls = -1;
-static gint ett_ac_if_fu_controls = -1;
-static gint ett_ac_if_fu_controls0 = -1;
-static gint ett_ac_if_fu_controls1 = -1;
-static gint ett_ac_if_fu_controls_v2 = -1;
-static gint ett_ac_if_fu_control_v2 = -1;
-static gint ett_ac_if_su_sourceids = -1;
-static gint ett_ac_if_su_controls = -1;
-static gint ett_ac_if_input_wchannelconfig = -1;
-static gint ett_ac_if_input_bmchannelconfig = -1;
-static gint ett_ac_if_input_controls = -1;
-static gint ett_ac_if_output_controls = -1;
-static gint ett_ac_if_mu_channelconfig = -1;
-static gint ett_ac_if_clksrc_attr = -1;
-static gint ett_ac_if_clksrc_controls = -1;
-static gint ett_ac_if_clksel_controls = -1;
-static gint ett_as_if_gen_controls = -1;
-static gint ett_as_if_gen_formats = -1;
-static gint ett_as_if_gen_bmchannelconfig = -1;
-static gint ett_as_ep_gen_attributes = -1;
-static gint ett_as_ep_gen_controls = -1;
+static gint ett_usb_audio;
+static gint ett_usb_audio_desc;
+
+static gint ett_ac_if_hdr_controls;
+static gint ett_ac_if_fu_controls;
+static gint ett_ac_if_fu_controls0;
+static gint ett_ac_if_fu_controls1;
+static gint ett_ac_if_fu_controls_v2;
+static gint ett_ac_if_fu_control_v2;
+static gint ett_ac_if_su_sourceids;
+static gint ett_ac_if_su_controls;
+static gint ett_ac_if_input_wchannelconfig;
+static gint ett_ac_if_input_bmchannelconfig;
+static gint ett_ac_if_input_controls;
+static gint ett_ac_if_output_controls;
+static gint ett_ac_if_mu_channelconfig;
+static gint ett_ac_if_clksrc_attr;
+static gint ett_ac_if_clksrc_controls;
+static gint ett_ac_if_clksel_controls;
+static gint ett_as_if_gen_controls;
+static gint ett_as_if_gen_formats;
+static gint ett_as_if_gen_bmchannelconfig;
+static gint ett_as_ep_gen_attributes;
+static gint ett_as_ep_gen_controls;
 
 static dissector_handle_t sysex_handle;
 static dissector_handle_t usb_audio_bulk_handle;
@@ -654,26 +654,26 @@ typedef struct _audio_conv_info_t {
     guint8 midi_ver_major;
 } audio_conv_info_t;
 
-static int hf_sysex_msg_fragments = -1;
-static int hf_sysex_msg_fragment = -1;
-static int hf_sysex_msg_fragment_overlap = -1;
-static int hf_sysex_msg_fragment_overlap_conflicts = -1;
-static int hf_sysex_msg_fragment_multiple_tails = -1;
-static int hf_sysex_msg_fragment_too_long_fragment = -1;
-static int hf_sysex_msg_fragment_error = -1;
-static int hf_sysex_msg_fragment_count = -1;
-static int hf_sysex_msg_reassembled_in = -1;
-static int hf_sysex_msg_reassembled_length = -1;
-static int hf_sysex_msg_reassembled_data = -1;
-
-static gint ett_sysex_msg_fragment = -1;
-static gint ett_sysex_msg_fragments = -1;
-
-static expert_field ei_usb_audio_undecoded = EI_INIT;
-static expert_field ei_usb_audio_invalid_feature_unit_length = EI_INIT;
-static expert_field ei_usb_audio_invalid_type_3_ft_nrchannels = EI_INIT;
-static expert_field ei_usb_audio_invalid_type_3_ft_subframesize = EI_INIT;
-static expert_field ei_usb_audio_invalid_type_3_ft_bitresolution = EI_INIT;
+static int hf_sysex_msg_fragments;
+static int hf_sysex_msg_fragment;
+static int hf_sysex_msg_fragment_overlap;
+static int hf_sysex_msg_fragment_overlap_conflicts;
+static int hf_sysex_msg_fragment_multiple_tails;
+static int hf_sysex_msg_fragment_too_long_fragment;
+static int hf_sysex_msg_fragment_error;
+static int hf_sysex_msg_fragment_count;
+static int hf_sysex_msg_reassembled_in;
+static int hf_sysex_msg_reassembled_length;
+static int hf_sysex_msg_reassembled_data;
+
+static gint ett_sysex_msg_fragment;
+static gint ett_sysex_msg_fragments;
+
+static expert_field ei_usb_audio_undecoded;
+static expert_field ei_usb_audio_invalid_feature_unit_length;
+static expert_field ei_usb_audio_invalid_type_3_ft_nrchannels;
+static expert_field ei_usb_audio_invalid_type_3_ft_subframesize;
+static expert_field ei_usb_audio_invalid_type_3_ft_bitresolution;
 
 static const fragment_items sysex_msg_frag_items = {
     /* Fragment subtrees */
diff --git a/epan/dissectors/packet-usb-ccid.c b/epan/dissectors/packet-usb-ccid.c
index d538294c61..ba57202fd3 100644
--- a/epan/dissectors/packet-usb-ccid.c
+++ b/epan/dissectors/packet-usb-ccid.c
@@ -20,98 +20,98 @@
 #include <epan/prefs.h>
 #include "packet-usb.h"
 
-static int proto_ccid = -1;
+static int proto_ccid;
 
 static dissector_table_t subdissector_table;
 
-static int hf_ccid_bMessageType = -1;
-static int hf_ccid_dwLength = -1;
-static int hf_ccid_bSlot = -1;
-static int hf_ccid_bSeq = -1;
-static int hf_ccid_bStatus = -1;
-static int hf_ccid_bStatus_bmIccStatus = -1;
-static int hf_ccid_bStatus_bmCommandStatus = -1;
-static int hf_ccid_bError = -1;
-static int hf_ccid_bRFU = -1;
-static int hf_ccid_abRFU = -1;
-static int hf_ccid_bChainParameter = -1;
-static int hf_ccid_bPowerSelect = -1;
-static int hf_ccid_bClockStatus = -1;
-static int hf_ccid_bProtocolNum = -1;
-static int hf_ccid_bBWI = -1;
-static int hf_ccid_wLevelParameter = -1;
-static int hf_ccid_bcdCCID = -1;
-static int hf_ccid_bMaxSlotIndex = -1;
-static int hf_ccid_bVoltageSupport = -1;
-static int hf_ccid_bVoltageSupport18 = -1;
-static int hf_ccid_bVoltageSupport30 = -1;
-static int hf_ccid_bVoltageSupport50 = -1;
-static int hf_ccid_dwProtocols = -1;
-static int hf_ccid_dwProtocols_t0 = -1;
-static int hf_ccid_dwProtocols_t1 = -1;
-static int hf_ccid_dwDefaultClock = -1;
-static int hf_ccid_dwMaximumClock = -1;
-static int hf_ccid_bNumClockSupported = -1;
-static int hf_ccid_dwDataRate = -1;
-static int hf_ccid_dwMaxDataRate = -1;
-static int hf_ccid_bNumDataRatesSupported = -1;
-static int hf_ccid_dwMaxIFSD = -1;
-static int hf_ccid_dwSynchProtocols = -1;
-static int hf_ccid_dwMechanical = -1;
-static int hf_ccid_dwFeatures = -1;
-static int hf_ccid_dwFeatures_autoParam = -1;
-static int hf_ccid_dwFeatures_autoIccActivation = -1;
-static int hf_ccid_dwFeatures_autoIccVoltSelect = -1;
-static int hf_ccid_dwFeatures_autoIccClk = -1;
-static int hf_ccid_dwFeatures_autoBaudRate = -1;
-static int hf_ccid_dwFeatures_autoParamNegotiation = -1;
-static int hf_ccid_dwFeatures_autoPPS = -1;
-static int hf_ccid_dwFeatures_stopIccClk = -1;
-static int hf_ccid_dwFeatures_nadValNot0accept = -1;
-static int hf_ccid_dwFeatures_autoIfsd = -1;
-static int hf_ccid_dwFeatures_levelExchangeTDPU = -1;
-static int hf_ccid_dwFeatures_levelExchangeShortAPDU = -1;
-static int hf_ccid_dwFeatures_levelExchangeShortExtendedAPDU = -1;
-static int hf_ccid_dwFeatures_UsbWakeUp = -1;
-static int hf_ccid_dwMaxCCIDMessageLength = -1;
-static int hf_ccid_bClassGetResponse = -1;
-static int hf_ccid_bClassEnvelope = -1;
-static int hf_ccid_wLcdLayout = -1;
-static int hf_ccid_wLcdLayout_lines = -1;
-static int hf_ccid_wLcdLayout_chars = -1;
-static int hf_ccid_bPINSupport = -1;
-static int hf_ccid_bPINSupport_modify = -1;
-static int hf_ccid_bPINSupport_vrfy = -1;
-static int hf_ccid_bMaxCCIDBusySlots = -1;
-static int hf_ccid_Reserved = -1;
-static int hf_ccid_bmSlotICCState = -1;
-static int hf_ccid_bmSlotICCState_slot0Current = -1;
-static int hf_ccid_bmSlotICCState_slot0Changed = -1;
-static int hf_ccid_bmSlotICCState_slot1Current = -1;
-static int hf_ccid_bmSlotICCState_slot1Changed = -1;
-static int hf_ccid_bmSlotICCState_slot2Current = -1;
-static int hf_ccid_bmSlotICCState_slot2Changed = -1;
-static int hf_ccid_bmSlotICCState_slot3Current = -1;
-static int hf_ccid_bmSlotICCState_slot3Changed = -1;
-static int hf_ccid_bmSlotICCState_slot4Current = -1;
-static int hf_ccid_bmSlotICCState_slot4Changed = -1;
-static int hf_ccid_bmSlotICCState_slot5Current = -1;
-static int hf_ccid_bmSlotICCState_slot5Changed = -1;
-static int hf_ccid_bmSlotICCState_slot6Current = -1;
-static int hf_ccid_bmSlotICCState_slot6Changed = -1;
-static int hf_ccid_bmSlotICCState_slot7Current = -1;
-static int hf_ccid_bmSlotICCState_slot7Changed = -1;
-static int hf_ccid_bHardwareErrorCode = -1;
-static int hf_ccid_bmFindexDindex = -1;
-static int hf_ccid_bmTCCKST0 = -1;
-static int hf_ccid_bmTCCKST1 = -1;
-static int hf_ccid_bGuardTimeT0 = -1;
-static int hf_ccid_bGuardTimeT1 = -1;
-static int hf_ccid_bWaitingIntegerT0 = -1;
-static int hf_ccid_bmWaitingIntegersT1 = -1;
-static int hf_ccid_bClockStop = -1;
-static int hf_ccid_bIFSC = -1;
-static int hf_ccid_bNadValue = -1;
+static int hf_ccid_bMessageType;
+static int hf_ccid_dwLength;
+static int hf_ccid_bSlot;
+static int hf_ccid_bSeq;
+static int hf_ccid_bStatus;
+static int hf_ccid_bStatus_bmIccStatus;
+static int hf_ccid_bStatus_bmCommandStatus;
+static int hf_ccid_bError;
+static int hf_ccid_bRFU;
+static int hf_ccid_abRFU;
+static int hf_ccid_bChainParameter;
+static int hf_ccid_bPowerSelect;
+static int hf_ccid_bClockStatus;
+static int hf_ccid_bProtocolNum;
+static int hf_ccid_bBWI;
+static int hf_ccid_wLevelParameter;
+static int hf_ccid_bcdCCID;
+static int hf_ccid_bMaxSlotIndex;
+static int hf_ccid_bVoltageSupport;
+static int hf_ccid_bVoltageSupport18;
+static int hf_ccid_bVoltageSupport30;
+static int hf_ccid_bVoltageSupport50;
+static int hf_ccid_dwProtocols;
+static int hf_ccid_dwProtocols_t0;
+static int hf_ccid_dwProtocols_t1;
+static int hf_ccid_dwDefaultClock;
+static int hf_ccid_dwMaximumClock;
+static int hf_ccid_bNumClockSupported;
+static int hf_ccid_dwDataRate;
+static int hf_ccid_dwMaxDataRate;
+static int hf_ccid_bNumDataRatesSupported;
+static int hf_ccid_dwMaxIFSD;
+static int hf_ccid_dwSynchProtocols;
+static int hf_ccid_dwMechanical;
+static int hf_ccid_dwFeatures;
+static int hf_ccid_dwFeatures_autoParam;
+static int hf_ccid_dwFeatures_autoIccActivation;
+static int hf_ccid_dwFeatures_autoIccVoltSelect;
+static int hf_ccid_dwFeatures_autoIccClk;
+static int hf_ccid_dwFeatures_autoBaudRate;
+static int hf_ccid_dwFeatures_autoParamNegotiation;
+static int hf_ccid_dwFeatures_autoPPS;
+static int hf_ccid_dwFeatures_stopIccClk;
+static int hf_ccid_dwFeatures_nadValNot0accept;
+static int hf_ccid_dwFeatures_autoIfsd;
+static int hf_ccid_dwFeatures_levelExchangeTDPU;
+static int hf_ccid_dwFeatures_levelExchangeShortAPDU;
+static int hf_ccid_dwFeatures_levelExchangeShortExtendedAPDU;
+static int hf_ccid_dwFeatures_UsbWakeUp;
+static int hf_ccid_dwMaxCCIDMessageLength;
+static int hf_ccid_bClassGetResponse;
+static int hf_ccid_bClassEnvelope;
+static int hf_ccid_wLcdLayout;
+static int hf_ccid_wLcdLayout_lines;
+static int hf_ccid_wLcdLayout_chars;
+static int hf_ccid_bPINSupport;
+static int hf_ccid_bPINSupport_modify;
+static int hf_ccid_bPINSupport_vrfy;
+static int hf_ccid_bMaxCCIDBusySlots;
+static int hf_ccid_Reserved;
+static int hf_ccid_bmSlotICCState;
+static int hf_ccid_bmSlotICCState_slot0Current;
+static int hf_ccid_bmSlotICCState_slot0Changed;
+static int hf_ccid_bmSlotICCState_slot1Current;
+static int hf_ccid_bmSlotICCState_slot1Changed;
+static int hf_ccid_bmSlotICCState_slot2Current;
+static int hf_ccid_bmSlotICCState_slot2Changed;
+static int hf_ccid_bmSlotICCState_slot3Current;
+static int hf_ccid_bmSlotICCState_slot3Changed;
+static int hf_ccid_bmSlotICCState_slot4Current;
+static int hf_ccid_bmSlotICCState_slot4Changed;
+static int hf_ccid_bmSlotICCState_slot5Current;
+static int hf_ccid_bmSlotICCState_slot5Changed;
+static int hf_ccid_bmSlotICCState_slot6Current;
+static int hf_ccid_bmSlotICCState_slot6Changed;
+static int hf_ccid_bmSlotICCState_slot7Current;
+static int hf_ccid_bmSlotICCState_slot7Changed;
+static int hf_ccid_bHardwareErrorCode;
+static int hf_ccid_bmFindexDindex;
+static int hf_ccid_bmTCCKST0;
+static int hf_ccid_bmTCCKST1;
+static int hf_ccid_bGuardTimeT0;
+static int hf_ccid_bGuardTimeT1;
+static int hf_ccid_bWaitingIntegerT0;
+static int hf_ccid_bmWaitingIntegersT1;
+static int hf_ccid_bClockStop;
+static int hf_ccid_bIFSC;
+static int hf_ccid_bNadValue;
 
 static dissector_handle_t usb_ccid_handle;
 static dissector_handle_t usb_ccid_descr_handle;
@@ -349,16 +349,16 @@ static const value_string ccid_status_cmd_status_vals[] = {
 };
 
 /* Subtree handles: set by register_subtree_array */
-static gint ett_ccid      = -1;
-static gint ett_ccid_desc = -1;
-static gint ett_ccid_protocol_data_structure = -1;
-static gint ett_ccid_voltage_level = -1;
-static gint ett_ccid_protocols = -1;
-static gint ett_ccid_features = -1;
-static gint ett_ccid_lcd_layout = -1;
-static gint ett_ccid_pin_support = -1;
-static gint ett_ccid_slot_change = -1;
-static gint ett_ccid_status = -1;
+static gint ett_ccid;
+static gint ett_ccid_desc;
+static gint ett_ccid_protocol_data_structure;
+static gint ett_ccid_voltage_level;
+static gint ett_ccid_protocols;
+static gint ett_ccid_features;
+static gint ett_ccid_lcd_layout;
+static gint ett_ccid_pin_support;
+static gint ett_ccid_slot_change;
+static gint ett_ccid_status;
 
 static gint
 dissect_usb_ccid_descriptor(tvbuff_t *tvb, packet_info *pinfo _U_,
diff --git a/epan/dissectors/packet-usb-com.c b/epan/dissectors/packet-usb-com.c
index 937c877e05..ad52ebff0e 100644
--- a/epan/dissectors/packet-usb-com.c
+++ b/epan/dissectors/packet-usb-com.c
@@ -17,115 +17,115 @@
 #include "packet-usb.h"
 
 static int cdc_data_follow_tap = -1;
-static int proto_usb = -1;
+static int proto_usb;
 
 /* protocols and header fields */
-static int proto_usb_com = -1;
-static int hf_usb_com_descriptor_subtype = -1;
-static int hf_usb_com_descriptor_cdc = -1;
-static int hf_usb_com_descriptor_payload = -1;
-static int hf_usb_com_control_subclass = -1;
-static int hf_usb_com_control_request_code = -1;
-static int hf_usb_com_control_value = -1;
-static int hf_usb_com_control_index = -1;
-static int hf_usb_com_control_length = -1;
-static int hf_usb_com_control_response_code = -1;
-static int hf_usb_com_control_payload = -1;
-static int hf_usb_com_get_ntb_params_length = -1;
-static int hf_usb_com_get_ntb_params_ntb_formats_supported = -1;
-static int hf_usb_com_get_ntb_params_ntb_formats_supported_16bit = -1;
-static int hf_usb_com_get_ntb_params_ntb_formats_supported_32bit = -1;
-static int hf_usb_com_get_ntb_params_ntb_in_max_size = -1;
-static int hf_usb_com_get_ntb_params_ndp_in_divisor = -1;
-static int hf_usb_com_get_ntb_params_ndp_in_payload_remainder = -1;
-static int hf_usb_com_get_ntb_params_ndp_in_alignment = -1;
-static int hf_usb_com_get_ntb_params_reserved = -1;
-static int hf_usb_com_get_ntb_params_ntb_out_max_size = -1;
-static int hf_usb_com_get_ntb_params_ndp_out_divisor = -1;
-static int hf_usb_com_get_ntb_params_ndp_out_payload_remainder = -1;
-static int hf_usb_com_get_ntb_params_ndp_out_alignment = -1;
-static int hf_usb_com_get_ntb_params_ntb_out_max_datagrams = -1;
-static int hf_usb_com_get_net_address_eui48 = -1;
-static int hf_usb_com_set_net_address_eui48 = -1;
-static int hf_usb_com_get_ntb_format_ntb_format = -1;
-static int hf_usb_com_set_ntb_format_ntb_format = -1;
-static int hf_usb_com_get_ntb_input_size_ntb_in_max_size = -1;
-static int hf_usb_com_get_ntb_input_size_ntb_in_max_datagrams = -1;
-static int hf_usb_com_get_ntb_input_size_reserved = -1;
-static int hf_usb_com_set_ntb_input_size_ntb_in_max_size = -1;
-static int hf_usb_com_set_ntb_input_size_ntb_in_max_datagrams = -1;
-static int hf_usb_com_set_ntb_input_size_reserved = -1;
-static int hf_usb_com_get_max_datagram_size_size = -1;
-static int hf_usb_com_set_max_datagram_size_size = -1;
-static int hf_usb_com_get_crc_mode_crc_mode = -1;
-static int hf_usb_com_set_crc_mode_crc_mode = -1;
-static int hf_usb_com_capabilities = -1;
-static int hf_usb_com_descriptor_acm_capabilities_reserved = -1;
-static int hf_usb_com_descriptor_acm_capabilities_network_connection = -1;
-static int hf_usb_com_descriptor_acm_capabilities_send_break = -1;
-static int hf_usb_com_descriptor_acm_capabilities_line_and_state = -1;
-static int hf_usb_com_descriptor_acm_capabilities_comm_features = -1;
-static int hf_usb_com_descriptor_control_interface = -1;
-static int hf_usb_com_descriptor_subordinate_interface = -1;
-static int hf_usb_com_descriptor_cm_capabilities_reserved = -1;
-static int hf_usb_com_descriptor_cm_capabilities_call_management_over_data_class_interface = -1;
-static int hf_usb_com_descriptor_cm_capabilities_call_management = -1;
-static int hf_usb_com_descriptor_cm_data_interface = -1;
-static int hf_usb_com_descriptor_ecm_mac_address = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_reserved = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_xmit_late_collisions = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_xmit_times_crs_lost = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_xmit_heartbeat_failure = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_xmit_underrun = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_rcv_overrun = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_xmit_max_collisions = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_xmit_deferred = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_xmit_more_collisions = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_xmit_one_collision = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_rcv_error_alignment = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_transmit_queue_length = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_rcv_crc_error = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_broadcast_frames_rcv = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_broadcast_bytes_rcv = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_multicast_frames_rcv = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_multicast_bytes_rcv = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_directed_frames_rcv = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_directed_bytes_rcv = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_broadcast_frames_xmit = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_broadcast_bytes_xmit = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_multicast_frames_xmit = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_multicast_bytes_xmit = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_directed_frames_xmit = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_directed_bytes_xmit = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_rcv_no_buffer = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_rcv_error = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_xmit_error = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_rvc_ok = -1;
-static int hf_usb_com_descriptor_ecm_eth_stats_xmit_ok = -1;
-static int hf_usb_com_descriptor_ecm_max_segment_size = -1;
-static int hf_usb_com_descriptor_ecm_nb_mc_filters = -1;
-static int hf_usb_com_descriptor_ecm_nb_mc_filters_mc_address_filtering = -1;
-static int hf_usb_com_descriptor_ecm_nb_mc_filters_nb_filters_supported = -1;
-static int hf_usb_com_descriptor_ecm_nb_power_filters = -1;
-static int hf_usb_com_interrupt_request_type = -1;
-static int hf_usb_com_interrupt_notif_code = -1;
-static int hf_usb_com_interrupt_value = -1;
-static int hf_usb_com_interrupt_value_nw_conn = -1;
-static int hf_usb_com_interrupt_index = -1;
-static int hf_usb_com_interrupt_length = -1;
-static int hf_usb_com_interrupt_dl_bitrate = -1;
-static int hf_usb_com_interrupt_ul_bitrate = -1;
-static int hf_usb_com_interrupt_payload = -1;
-static int hf_usb_com_data_stream = -1;
-static int hf_usb_com_data_in_payload = -1;
-static int hf_usb_com_data_out_payload = -1;
-
-static gint ett_usb_com = -1;
-static gint ett_usb_com_capabilities = -1;
-static gint ett_usb_com_bitmap = -1;
-static gint ett_usb_com_descriptor_ecm_eth_stats = -1;
-static gint ett_usb_com_descriptor_ecm_nb_mc_filters = -1;
+static int proto_usb_com;
+static int hf_usb_com_descriptor_subtype;
+static int hf_usb_com_descriptor_cdc;
+static int hf_usb_com_descriptor_payload;
+static int hf_usb_com_control_subclass;
+static int hf_usb_com_control_request_code;
+static int hf_usb_com_control_value;
+static int hf_usb_com_control_index;
+static int hf_usb_com_control_length;
+static int hf_usb_com_control_response_code;
+static int hf_usb_com_control_payload;
+static int hf_usb_com_get_ntb_params_length;
+static int hf_usb_com_get_ntb_params_ntb_formats_supported;
+static int hf_usb_com_get_ntb_params_ntb_formats_supported_16bit;
+static int hf_usb_com_get_ntb_params_ntb_formats_supported_32bit;
+static int hf_usb_com_get_ntb_params_ntb_in_max_size;
+static int hf_usb_com_get_ntb_params_ndp_in_divisor;
+static int hf_usb_com_get_ntb_params_ndp_in_payload_remainder;
+static int hf_usb_com_get_ntb_params_ndp_in_alignment;
+static int hf_usb_com_get_ntb_params_reserved;
+static int hf_usb_com_get_ntb_params_ntb_out_max_size;
+static int hf_usb_com_get_ntb_params_ndp_out_divisor;
+static int hf_usb_com_get_ntb_params_ndp_out_payload_remainder;
+static int hf_usb_com_get_ntb_params_ndp_out_alignment;
+static int hf_usb_com_get_ntb_params_ntb_out_max_datagrams;
+static int hf_usb_com_get_net_address_eui48;
+static int hf_usb_com_set_net_address_eui48;
+static int hf_usb_com_get_ntb_format_ntb_format;
+static int hf_usb_com_set_ntb_format_ntb_format;
+static int hf_usb_com_get_ntb_input_size_ntb_in_max_size;
+static int hf_usb_com_get_ntb_input_size_ntb_in_max_datagrams;
+static int hf_usb_com_get_ntb_input_size_reserved;
+static int hf_usb_com_set_ntb_input_size_ntb_in_max_size;
+static int hf_usb_com_set_ntb_input_size_ntb_in_max_datagrams;
+static int hf_usb_com_set_ntb_input_size_reserved;
+static int hf_usb_com_get_max_datagram_size_size;
+static int hf_usb_com_set_max_datagram_size_size;
+static int hf_usb_com_get_crc_mode_crc_mode;
+static int hf_usb_com_set_crc_mode_crc_mode;
+static int hf_usb_com_capabilities;
+static int hf_usb_com_descriptor_acm_capabilities_reserved;
+static int hf_usb_com_descriptor_acm_capabilities_network_connection;
+static int hf_usb_com_descriptor_acm_capabilities_send_break;
+static int hf_usb_com_descriptor_acm_capabilities_line_and_state;
+static int hf_usb_com_descriptor_acm_capabilities_comm_features;
+static int hf_usb_com_descriptor_control_interface;
+static int hf_usb_com_descriptor_subordinate_interface;
+static int hf_usb_com_descriptor_cm_capabilities_reserved;
+static int hf_usb_com_descriptor_cm_capabilities_call_management_over_data_class_interface;
+static int hf_usb_com_descriptor_cm_capabilities_call_management;
+static int hf_usb_com_descriptor_cm_data_interface;
+static int hf_usb_com_descriptor_ecm_mac_address;
+static int hf_usb_com_descriptor_ecm_eth_stats;
+static int hf_usb_com_descriptor_ecm_eth_stats_reserved;
+static int hf_usb_com_descriptor_ecm_eth_stats_xmit_late_collisions;
+static int hf_usb_com_descriptor_ecm_eth_stats_xmit_times_crs_lost;
+static int hf_usb_com_descriptor_ecm_eth_stats_xmit_heartbeat_failure;
+static int hf_usb_com_descriptor_ecm_eth_stats_xmit_underrun;
+static int hf_usb_com_descriptor_ecm_eth_stats_rcv_overrun;
+static int hf_usb_com_descriptor_ecm_eth_stats_xmit_max_collisions;
+static int hf_usb_com_descriptor_ecm_eth_stats_xmit_deferred;
+static int hf_usb_com_descriptor_ecm_eth_stats_xmit_more_collisions;
+static int hf_usb_com_descriptor_ecm_eth_stats_xmit_one_collision;
+static int hf_usb_com_descriptor_ecm_eth_stats_rcv_error_alignment;
+static int hf_usb_com_descriptor_ecm_eth_stats_transmit_queue_length;
+static int hf_usb_com_descriptor_ecm_eth_stats_rcv_crc_error;
+static int hf_usb_com_descriptor_ecm_eth_stats_broadcast_frames_rcv;
+static int hf_usb_com_descriptor_ecm_eth_stats_broadcast_bytes_rcv;
+static int hf_usb_com_descriptor_ecm_eth_stats_multicast_frames_rcv;
+static int hf_usb_com_descriptor_ecm_eth_stats_multicast_bytes_rcv;
+static int hf_usb_com_descriptor_ecm_eth_stats_directed_frames_rcv;
+static int hf_usb_com_descriptor_ecm_eth_stats_directed_bytes_rcv;
+static int hf_usb_com_descriptor_ecm_eth_stats_broadcast_frames_xmit;
+static int hf_usb_com_descriptor_ecm_eth_stats_broadcast_bytes_xmit;
+static int hf_usb_com_descriptor_ecm_eth_stats_multicast_frames_xmit;
+static int hf_usb_com_descriptor_ecm_eth_stats_multicast_bytes_xmit;
+static int hf_usb_com_descriptor_ecm_eth_stats_directed_frames_xmit;
+static int hf_usb_com_descriptor_ecm_eth_stats_directed_bytes_xmit;
+static int hf_usb_com_descriptor_ecm_eth_stats_rcv_no_buffer;
+static int hf_usb_com_descriptor_ecm_eth_stats_rcv_error;
+static int hf_usb_com_descriptor_ecm_eth_stats_xmit_error;
+static int hf_usb_com_descriptor_ecm_eth_stats_rvc_ok;
+static int hf_usb_com_descriptor_ecm_eth_stats_xmit_ok;
+static int hf_usb_com_descriptor_ecm_max_segment_size;
+static int hf_usb_com_descriptor_ecm_nb_mc_filters;
+static int hf_usb_com_descriptor_ecm_nb_mc_filters_mc_address_filtering;
+static int hf_usb_com_descriptor_ecm_nb_mc_filters_nb_filters_supported;
+static int hf_usb_com_descriptor_ecm_nb_power_filters;
+static int hf_usb_com_interrupt_request_type;
+static int hf_usb_com_interrupt_notif_code;
+static int hf_usb_com_interrupt_value;
+static int hf_usb_com_interrupt_value_nw_conn;
+static int hf_usb_com_interrupt_index;
+static int hf_usb_com_interrupt_length;
+static int hf_usb_com_interrupt_dl_bitrate;
+static int hf_usb_com_interrupt_ul_bitrate;
+static int hf_usb_com_interrupt_payload;
+static int hf_usb_com_data_stream;
+static int hf_usb_com_data_in_payload;
+static int hf_usb_com_data_out_payload;
+
+static gint ett_usb_com;
+static gint ett_usb_com_capabilities;
+static gint ett_usb_com_bitmap;
+static gint ett_usb_com_descriptor_ecm_eth_stats;
+static gint ett_usb_com_descriptor_ecm_nb_mc_filters;
 
 static dissector_handle_t usb_com_descriptor_handle;
 static dissector_handle_t usb_com_control_handle;
@@ -137,7 +137,7 @@ static dissector_handle_t mbim_descriptor_handle;
 static dissector_handle_t mbim_bulk_handle;
 static dissector_handle_t eth_withoutfcs_handle;
 
-static expert_field ei_unexpected_controlling_iface = EI_INIT;
+static expert_field ei_unexpected_controlling_iface;
 
 static wmem_tree_t* controlling_ifaces = NULL;
 
diff --git a/epan/dissectors/packet-usb-dfu.c b/epan/dissectors/packet-usb-dfu.c
index 7f8deaee1f..6a2fe7465b 100644
--- a/epan/dissectors/packet-usb-dfu.c
+++ b/epan/dissectors/packet-usb-dfu.c
@@ -17,40 +17,40 @@
 #include <epan/expert.h>
 #include "packet-usb.h"
 
-static int proto_usb_dfu = -1;
-
-static gint hf_setup_command = -1;
-static gint hf_setup_unused = -1;
-static gint hf_setup_interface = -1;
-static gint hf_setup_length = -1;
-static gint hf_setup_timeout = -1;
-static gint hf_setup_block_number = -1;
-static gint hf_response = -1;
-static gint hf_command_in_frame = -1;
-static gint hf_state = -1;
-static gint hf_status = -1;
-static gint hf_poll_timeout = -1;
-static gint hf_iString = -1;
-static gint hf_data = -1;
-static gint hf_usb_dfu_descriptor = -1;
-static gint hf_usb_dfu_descriptor_bmAttributes_reserved = -1;
-static gint hf_usb_dfu_descriptor_bmAttributes_WillDetach = -1;
-static gint hf_usb_dfu_descriptor_bmAttributes_ManifestationTolerant = -1;
-static gint hf_usb_dfu_descriptor_bmAttributes_CanUpload = -1;
-static gint hf_usb_dfu_descriptor_bmAttributes_CanDownload = -1;
-static gint hf_usb_dfu_descriptor_wDetachTimeOut = -1;
-static gint hf_usb_dfu_descriptor_wTransferSize = -1;
-static gint hf_usb_dfu_descriptor_bcdDFUVersion = -1;
-
-static gint ett_usb_dfu = -1;
-static gint ett_usb_dfu_descriptor = -1;
-static gint ett_command = -1;
-
-static expert_field ei_unexpected_response = EI_INIT;
-static expert_field ei_unknown_data = EI_INIT;
-static expert_field ei_unexpected_data = EI_INIT;
-static expert_field ei_descriptor_invalid_length = EI_INIT;
-static expert_field ei_invalid_command_for_request_type = EI_INIT;
+static int proto_usb_dfu;
+
+static gint hf_setup_command;
+static gint hf_setup_unused;
+static gint hf_setup_interface;
+static gint hf_setup_length;
+static gint hf_setup_timeout;
+static gint hf_setup_block_number;
+static gint hf_response;
+static gint hf_command_in_frame;
+static gint hf_state;
+static gint hf_status;
+static gint hf_poll_timeout;
+static gint hf_iString;
+static gint hf_data;
+static gint hf_usb_dfu_descriptor;
+static gint hf_usb_dfu_descriptor_bmAttributes_reserved;
+static gint hf_usb_dfu_descriptor_bmAttributes_WillDetach;
+static gint hf_usb_dfu_descriptor_bmAttributes_ManifestationTolerant;
+static gint hf_usb_dfu_descriptor_bmAttributes_CanUpload;
+static gint hf_usb_dfu_descriptor_bmAttributes_CanDownload;
+static gint hf_usb_dfu_descriptor_wDetachTimeOut;
+static gint hf_usb_dfu_descriptor_wTransferSize;
+static gint hf_usb_dfu_descriptor_bcdDFUVersion;
+
+static gint ett_usb_dfu;
+static gint ett_usb_dfu_descriptor;
+static gint ett_command;
+
+static expert_field ei_unexpected_response;
+static expert_field ei_unknown_data;
+static expert_field ei_unexpected_data;
+static expert_field ei_descriptor_invalid_length;
+static expert_field ei_invalid_command_for_request_type;
 
 static dissector_handle_t usb_dfu_handle;
 static dissector_handle_t usf_dfu_descriptor_handle;
diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c
index afd4bfd8e9..4bd4f85bf2 100644
--- a/epan/dissectors/packet-usb-hid.c
+++ b/epan/dissectors/packet-usb-hid.c
@@ -31,140 +31,140 @@ static dissector_handle_t usb_hid_interrupt_handle;
 static dissector_handle_t usb_hid_descr_handle;
 
 /* protocols and header fields */
-static int proto_usb_hid = -1;
-static int hf_usb_hid_item_bSize = -1;
-static int hf_usb_hid_item_bType = -1;
-static int hf_usb_hid_mainitem_bTag = -1;
-static int hf_usb_hid_globalitem_bTag = -1;
-static int hf_usb_hid_localitem_bTag = -1;
-static int hf_usb_hid_longitem_bTag = -1;
-static int hf_usb_hid_item_bDataSize = -1;
-static int hf_usb_hid_item_bLongItemTag = -1;
-static int hf_usb_hid_item_unk_data = -1;
-
-static int hf_usb_hid_mainitem_bit0 = -1;
-static int hf_usb_hid_mainitem_bit1 = -1;
-static int hf_usb_hid_mainitem_bit2 = -1;
-static int hf_usb_hid_mainitem_bit3 = -1;
-static int hf_usb_hid_mainitem_bit4 = -1;
-static int hf_usb_hid_mainitem_bit5 = -1;
-static int hf_usb_hid_mainitem_bit6 = -1;
-static int hf_usb_hid_mainitem_bit7 = -1;
-static int hf_usb_hid_mainitem_bit7_input = -1;
-static int hf_usb_hid_mainitem_bit8 = -1;
-static int hf_usb_hid_mainitem_colltype = -1;
-
-static int hf_usb_hid_globalitem_usage = -1;
-static int hf_usb_hid_globalitem_log_min = -1;
-static int hf_usb_hid_globalitem_log_max = -1;
-static int hf_usb_hid_globalitem_phy_min = -1;
-static int hf_usb_hid_globalitem_phy_max = -1;
-static int hf_usb_hid_globalitem_unit_exp = -1;
-static int hf_usb_hid_globalitem_unit_sys = -1;
-static int hf_usb_hid_globalitem_unit_len = -1;
-static int hf_usb_hid_globalitem_unit_mass = -1;
-static int hf_usb_hid_globalitem_unit_time = -1;
-static int hf_usb_hid_globalitem_unit_temp = -1;
-static int hf_usb_hid_globalitem_unit_current = -1;
-static int hf_usb_hid_globalitem_unit_brightness = -1;
-static int hf_usb_hid_globalitem_report_size = -1;
-static int hf_usb_hid_globalitem_report_id = -1;
-static int hf_usb_hid_globalitem_report_count = -1;
-static int hf_usb_hid_globalitem_push = -1;
-static int hf_usb_hid_globalitem_pop = -1;
-
-static int hf_usb_hid_localitem_usage = -1;
-static int hf_usb_hid_localitem_usage_min = -1;
-static int hf_usb_hid_localitem_usage_max = -1;
-static int hf_usb_hid_localitem_desig_index = -1;
-static int hf_usb_hid_localitem_desig_min = -1;
-static int hf_usb_hid_localitem_desig_max = -1;
-static int hf_usb_hid_localitem_string_index = -1;
-static int hf_usb_hid_localitem_string_min = -1;
-static int hf_usb_hid_localitem_string_max = -1;
-static int hf_usb_hid_localitem_delimiter = -1;
-
-static gint ett_usb_hid_report = -1;
-static gint ett_usb_hid_item_header = -1;
-static gint ett_usb_hid_wValue = -1;
-static gint ett_usb_hid_descriptor = -1;
-static gint ett_usb_hid_data = -1;
-static gint ett_usb_hid_unknown_data = -1;
-static gint ett_usb_hid_array = -1;
-
-static int hf_usb_hid_request = -1;
-static int hf_usb_hid_value = -1;
-static int hf_usb_hid_index = -1;
-static int hf_usb_hid_length = -1;
-static int hf_usb_hid_report_type = -1;
-static int hf_usb_hid_report_id = -1;
-static int hf_usb_hid_duration = -1;
-static int hf_usb_hid_zero = -1;
-
-static int hf_usb_hid_bcdHID = -1;
-static int hf_usb_hid_bCountryCode = -1;
-static int hf_usb_hid_bNumDescriptors = -1;
-static int hf_usb_hid_bDescriptorIndex = -1;
-static int hf_usb_hid_bDescriptorType = -1;
-static int hf_usb_hid_wInterfaceNumber = -1;
-static int hf_usb_hid_wDescriptorLength = -1;
-
-static int hf_usbhid_boot_report_keyboard_modifier_right_gui = -1;
-static int hf_usbhid_boot_report_keyboard_modifier_right_alt = -1;
-static int hf_usbhid_boot_report_keyboard_modifier_right_shift = -1;
-static int hf_usbhid_boot_report_keyboard_modifier_right_ctrl = -1;
-static int hf_usbhid_boot_report_keyboard_modifier_left_gui = -1;
-static int hf_usbhid_boot_report_keyboard_modifier_left_alt = -1;
-static int hf_usbhid_boot_report_keyboard_modifier_left_shift = -1;
-static int hf_usbhid_boot_report_keyboard_modifier_left_ctrl = -1;
-static int hf_usbhid_boot_report_keyboard_reserved = -1;
-static int hf_usbhid_boot_report_keyboard_keycode_1 = -1;
-static int hf_usbhid_boot_report_keyboard_keycode_2 = -1;
-static int hf_usbhid_boot_report_keyboard_keycode_3 = -1;
-static int hf_usbhid_boot_report_keyboard_keycode_4 = -1;
-static int hf_usbhid_boot_report_keyboard_keycode_5 = -1;
-static int hf_usbhid_boot_report_keyboard_keycode_6 = -1;
-static int hf_usbhid_boot_report_keyboard_leds_constants = -1;
-static int hf_usbhid_boot_report_keyboard_leds_kana = -1;
-static int hf_usbhid_boot_report_keyboard_leds_compose = -1;
-static int hf_usbhid_boot_report_keyboard_leds_scroll_lock = -1;
-static int hf_usbhid_boot_report_keyboard_leds_caps_lock = -1;
-static int hf_usbhid_boot_report_keyboard_leds_num_lock = -1;
-static int hf_usbhid_boot_report_mouse_button_8 = -1;
-static int hf_usbhid_boot_report_mouse_button_7 = -1;
-static int hf_usbhid_boot_report_mouse_button_6 = -1;
-static int hf_usbhid_boot_report_mouse_button_5 = -1;
-static int hf_usbhid_boot_report_mouse_button_4 = -1;
-static int hf_usbhid_boot_report_mouse_button_middle = -1;
-static int hf_usbhid_boot_report_mouse_button_right = -1;
-static int hf_usbhid_boot_report_mouse_button_left = -1;
-static int hf_usbhid_boot_report_mouse_x_displacement = -1;
-static int hf_usbhid_boot_report_mouse_y_displacement = -1;
-static int hf_usbhid_boot_report_mouse_horizontal_scroll_wheel = -1;
-static int hf_usbhid_boot_report_mouse_vertical_scroll_wheel = -1;
-static int hf_usbhid_data = -1;
-static int hf_usbhid_unknown_data = -1;
-static int hf_usbhid_vendor_data = -1;
-static int hf_usbhid_report_id = -1;
-static int hf_usbhid_padding = -1;
-static int hf_usbhid_axis_x = -1;
-static int hf_usbhid_axis_y = -1;
-static int hf_usbhid_axis_z = -1;
-static int hf_usbhid_axis_rx = -1;
-static int hf_usbhid_axis_ry = -1;
-static int hf_usbhid_axis_rz = -1;
-static int hf_usbhid_axis_slider = -1;
-static int hf_usbhid_axis_vx = -1;
-static int hf_usbhid_axis_vy = -1;
-static int hf_usbhid_axis_vz = -1;
-static int hf_usbhid_axis_vbrx = -1;
-static int hf_usbhid_axis_vbry = -1;
-static int hf_usbhid_axis_vbrz = -1;
-static int hf_usbhid_axis_vno = -1;
-static int hf_usbhid_button = -1;
-static int hf_usbhid_key = -1;
-static int hf_usbhid_array = -1;
-static int hf_usbhid_array_usage = -1;
+static int proto_usb_hid;
+static int hf_usb_hid_item_bSize;
+static int hf_usb_hid_item_bType;
+static int hf_usb_hid_mainitem_bTag;
+static int hf_usb_hid_globalitem_bTag;
+static int hf_usb_hid_localitem_bTag;
+static int hf_usb_hid_longitem_bTag;
+static int hf_usb_hid_item_bDataSize;
+static int hf_usb_hid_item_bLongItemTag;
+static int hf_usb_hid_item_unk_data;
+
+static int hf_usb_hid_mainitem_bit0;
+static int hf_usb_hid_mainitem_bit1;
+static int hf_usb_hid_mainitem_bit2;
+static int hf_usb_hid_mainitem_bit3;
+static int hf_usb_hid_mainitem_bit4;
+static int hf_usb_hid_mainitem_bit5;
+static int hf_usb_hid_mainitem_bit6;
+static int hf_usb_hid_mainitem_bit7;
+static int hf_usb_hid_mainitem_bit7_input;
+static int hf_usb_hid_mainitem_bit8;
+static int hf_usb_hid_mainitem_colltype;
+
+static int hf_usb_hid_globalitem_usage;
+static int hf_usb_hid_globalitem_log_min;
+static int hf_usb_hid_globalitem_log_max;
+static int hf_usb_hid_globalitem_phy_min;
+static int hf_usb_hid_globalitem_phy_max;
+static int hf_usb_hid_globalitem_unit_exp;
+static int hf_usb_hid_globalitem_unit_sys;
+static int hf_usb_hid_globalitem_unit_len;
+static int hf_usb_hid_globalitem_unit_mass;
+static int hf_usb_hid_globalitem_unit_time;
+static int hf_usb_hid_globalitem_unit_temp;
+static int hf_usb_hid_globalitem_unit_current;
+static int hf_usb_hid_globalitem_unit_brightness;
+static int hf_usb_hid_globalitem_report_size;
+static int hf_usb_hid_globalitem_report_id;
+static int hf_usb_hid_globalitem_report_count;
+static int hf_usb_hid_globalitem_push;
+static int hf_usb_hid_globalitem_pop;
+
+static int hf_usb_hid_localitem_usage;
+static int hf_usb_hid_localitem_usage_min;
+static int hf_usb_hid_localitem_usage_max;
+static int hf_usb_hid_localitem_desig_index;
+static int hf_usb_hid_localitem_desig_min;
+static int hf_usb_hid_localitem_desig_max;
+static int hf_usb_hid_localitem_string_index;
+static int hf_usb_hid_localitem_string_min;
+static int hf_usb_hid_localitem_string_max;
+static int hf_usb_hid_localitem_delimiter;
+
+static gint ett_usb_hid_report;
+static gint ett_usb_hid_item_header;
+static gint ett_usb_hid_wValue;
+static gint ett_usb_hid_descriptor;
+static gint ett_usb_hid_data;
+static gint ett_usb_hid_unknown_data;
+static gint ett_usb_hid_array;
+
+static int hf_usb_hid_request;
+static int hf_usb_hid_value;
+static int hf_usb_hid_index;
+static int hf_usb_hid_length;
+static int hf_usb_hid_report_type;
+static int hf_usb_hid_report_id;
+static int hf_usb_hid_duration;
+static int hf_usb_hid_zero;
+
+static int hf_usb_hid_bcdHID;
+static int hf_usb_hid_bCountryCode;
+static int hf_usb_hid_bNumDescriptors;
+static int hf_usb_hid_bDescriptorIndex;
+static int hf_usb_hid_bDescriptorType;
+static int hf_usb_hid_wInterfaceNumber;
+static int hf_usb_hid_wDescriptorLength;
+
+static int hf_usbhid_boot_report_keyboard_modifier_right_gui;
+static int hf_usbhid_boot_report_keyboard_modifier_right_alt;
+static int hf_usbhid_boot_report_keyboard_modifier_right_shift;
+static int hf_usbhid_boot_report_keyboard_modifier_right_ctrl;
+static int hf_usbhid_boot_report_keyboard_modifier_left_gui;
+static int hf_usbhid_boot_report_keyboard_modifier_left_alt;
+static int hf_usbhid_boot_report_keyboard_modifier_left_shift;
+static int hf_usbhid_boot_report_keyboard_modifier_left_ctrl;
+static int hf_usbhid_boot_report_keyboard_reserved;
+static int hf_usbhid_boot_report_keyboard_keycode_1;
+static int hf_usbhid_boot_report_keyboard_keycode_2;
+static int hf_usbhid_boot_report_keyboard_keycode_3;
+static int hf_usbhid_boot_report_keyboard_keycode_4;
+static int hf_usbhid_boot_report_keyboard_keycode_5;
+static int hf_usbhid_boot_report_keyboard_keycode_6;
+static int hf_usbhid_boot_report_keyboard_leds_constants;
+static int hf_usbhid_boot_report_keyboard_leds_kana;
+static int hf_usbhid_boot_report_keyboard_leds_compose;
+static int hf_usbhid_boot_report_keyboard_leds_scroll_lock;
+static int hf_usbhid_boot_report_keyboard_leds_caps_lock;
+static int hf_usbhid_boot_report_keyboard_leds_num_lock;
+static int hf_usbhid_boot_report_mouse_button_8;
+static int hf_usbhid_boot_report_mouse_button_7;
+static int hf_usbhid_boot_report_mouse_button_6;
+static int hf_usbhid_boot_report_mouse_button_5;
+static int hf_usbhid_boot_report_mouse_button_4;
+static int hf_usbhid_boot_report_mouse_button_middle;
+static int hf_usbhid_boot_report_mouse_button_right;
+static int hf_usbhid_boot_report_mouse_button_left;
+static int hf_usbhid_boot_report_mouse_x_displacement;
+static int hf_usbhid_boot_report_mouse_y_displacement;
+static int hf_usbhid_boot_report_mouse_horizontal_scroll_wheel;
+static int hf_usbhid_boot_report_mouse_vertical_scroll_wheel;
+static int hf_usbhid_data;
+static int hf_usbhid_unknown_data;
+static int hf_usbhid_vendor_data;
+static int hf_usbhid_report_id;
+static int hf_usbhid_padding;
+static int hf_usbhid_axis_x;
+static int hf_usbhid_axis_y;
+static int hf_usbhid_axis_z;
+static int hf_usbhid_axis_rx;
+static int hf_usbhid_axis_ry;
+static int hf_usbhid_axis_rz;
+static int hf_usbhid_axis_slider;
+static int hf_usbhid_axis_vx;
+static int hf_usbhid_axis_vy;
+static int hf_usbhid_axis_vz;
+static int hf_usbhid_axis_vbrx;
+static int hf_usbhid_axis_vbry;
+static int hf_usbhid_axis_vbrz;
+static int hf_usbhid_axis_vno;
+static int hf_usbhid_button;
+static int hf_usbhid_key;
+static int hf_usbhid_array;
+static int hf_usbhid_array_usage;
 
 static const true_false_string tfs_mainitem_bit0 = {"Constant", "Data"};
 static const true_false_string tfs_mainitem_bit1 = {"Variable", "Array"};
diff --git a/epan/dissectors/packet-usb-hub.c b/epan/dissectors/packet-usb-hub.c
index 0ecf2f5f10..15ad67060e 100644
--- a/epan/dissectors/packet-usb-hub.c
+++ b/epan/dissectors/packet-usb-hub.c
@@ -24,50 +24,50 @@ void proto_reg_handoff_usb_hub(void);
 static dissector_handle_t usb_hub_control_handle;
 
 /* protocols and header fields */
-static int proto_usb_hub = -1;
+static int proto_usb_hub;
 
 /* USB 2.0, Chapter 11.24.2 Class-Specific Requests */
-static int hf_usb_hub_request = -1;
-static int hf_usb_hub_value = -1;
-static int hf_usb_hub_index = -1;
-static int hf_usb_hub_length = -1;
-
-static int hf_usb_hub_hub_feature_selector = -1;
-static int hf_usb_hub_port_feature_selector = -1;
-static int hf_usb_hub_dev_addr = -1;
-static int hf_usb_hub_ep_num = -1;
-static int hf_usb_hub_descriptor_type = -1;
-static int hf_usb_hub_descriptor_index = -1;
-static int hf_usb_hub_zero = -1;
-static int hf_usb_hub_tt_flags = -1;
-static int hf_usb_hub_tt_port = -1;
-static int hf_usb_hub_tt_state_length = -1;
-static int hf_usb_hub_port = -1;
-static int hf_usb_hub_port_selector = -1;
-static int hf_usb_hub_port_status = -1;
-static int hf_usb_hub_port_change = -1;
-static int hf_usb_hub_port_status_connection = -1;
-static int hf_usb_hub_port_status_enable = -1;
-static int hf_usb_hub_port_status_suspend = -1;
-static int hf_usb_hub_port_status_overcurrent = -1;
-static int hf_usb_hub_port_status_reset = -1;
-static int hf_usb_hub_port_status_power = -1;
-static int hf_usb_hub_port_status_low_speed = -1;
-static int hf_usb_hub_port_status_high_speed = -1;
-static int hf_usb_hub_port_status_test = -1;
-static int hf_usb_hub_port_status_indicator = -1;
-static int hf_usb_hub_port_change_connection = -1;
-static int hf_usb_hub_port_change_enable = -1;
-static int hf_usb_hub_port_change_suspend = -1;
-static int hf_usb_hub_port_change_overcurrent = -1;
-static int hf_usb_hub_port_change_reset = -1;
-static int hf_usb_hub_descriptor_length = -1;
-
-static gint ett_usb_hub_wValue = -1;
-static gint ett_usb_hub_wIndex = -1;
-static gint ett_usb_hub_wLength = -1;
-static gint ett_usb_hub_port_status = -1;
-static gint ett_usb_hub_port_change = -1;
+static int hf_usb_hub_request;
+static int hf_usb_hub_value;
+static int hf_usb_hub_index;
+static int hf_usb_hub_length;
+
+static int hf_usb_hub_hub_feature_selector;
+static int hf_usb_hub_port_feature_selector;
+static int hf_usb_hub_dev_addr;
+static int hf_usb_hub_ep_num;
+static int hf_usb_hub_descriptor_type;
+static int hf_usb_hub_descriptor_index;
+static int hf_usb_hub_zero;
+static int hf_usb_hub_tt_flags;
+static int hf_usb_hub_tt_port;
+static int hf_usb_hub_tt_state_length;
+static int hf_usb_hub_port;
+static int hf_usb_hub_port_selector;
+static int hf_usb_hub_port_status;
+static int hf_usb_hub_port_change;
+static int hf_usb_hub_port_status_connection;
+static int hf_usb_hub_port_status_enable;
+static int hf_usb_hub_port_status_suspend;
+static int hf_usb_hub_port_status_overcurrent;
+static int hf_usb_hub_port_status_reset;
+static int hf_usb_hub_port_status_power;
+static int hf_usb_hub_port_status_low_speed;
+static int hf_usb_hub_port_status_high_speed;
+static int hf_usb_hub_port_status_test;
+static int hf_usb_hub_port_status_indicator;
+static int hf_usb_hub_port_change_connection;
+static int hf_usb_hub_port_change_enable;
+static int hf_usb_hub_port_change_suspend;
+static int hf_usb_hub_port_change_overcurrent;
+static int hf_usb_hub_port_change_reset;
+static int hf_usb_hub_descriptor_length;
+
+static gint ett_usb_hub_wValue;
+static gint ett_usb_hub_wIndex;
+static gint ett_usb_hub_wLength;
+static gint ett_usb_hub_port_status;
+static gint ett_usb_hub_port_change;
 
 /* Table 11-16. Hub Class Request Codes */
 #define USB_HUB_REQUEST_GET_STATUS            0
diff --git a/epan/dissectors/packet-usb-i1d3.c b/epan/dissectors/packet-usb-i1d3.c
index 652690ff3e..589ace3f1f 100644
--- a/epan/dissectors/packet-usb-i1d3.c
+++ b/epan/dissectors/packet-usb-i1d3.c
@@ -40,60 +40,60 @@ static dissector_handle_t usb_i1d3_dissector;
 #define USB_I1D3_LED_ONTIME_FACTOR (USB_I1D3_CLOCK_FREQUENCY / (1 << 19))
 #define USB_I1D3_LED_ONTIME_FADE_FACTOR (USB_I1D3_CLOCK_FREQUENCY / (1 << 23))
 
-static int proto_usb_i1d3 = -1;
-static int ett_usb_i1d3 = -1;
-static int ett_usb_i1d3_measured_duration = -1;
-static int ett_usb_i1d3_requested_edge_count = -1;
-
-static int hf_usb_i1d3_challenge_response = -1;
-static int hf_usb_i1d3_challenge_data = -1;
-static int hf_usb_i1d3_challenge_decode_key = -1;
-static int hf_usb_i1d3_challenge_encode_key = -1;
-static int hf_usb_i1d3_command_code = -1;
-static int hf_usb_i1d3_diffuser_position = -1;
-static int hf_usb_i1d3_echoed_command_code = -1;
-static int hf_usb_i1d3_firmdate = -1;
-static int hf_usb_i1d3_firmver = -1;
-static int hf_usb_i1d3_information = -1;
-static int hf_usb_i1d3_measured_duration = -1;
-static int hf_usb_i1d3_measured_duration_red = -1;
-static int hf_usb_i1d3_measured_duration_green = -1;
-static int hf_usb_i1d3_measured_duration_blue = -1;
-static int hf_usb_i1d3_measured_edge_count = -1;
-static int hf_usb_i1d3_measured_edge_count_red = -1;
-static int hf_usb_i1d3_measured_edge_count_green = -1;
-static int hf_usb_i1d3_measured_edge_count_blue = -1;
-static int hf_usb_i1d3_led_mode = -1;
-static int hf_usb_i1d3_led_offtime = -1;
-static int hf_usb_i1d3_led_ontime = -1;
-static int hf_usb_i1d3_led_pulse_count = -1;
-static int hf_usb_i1d3_locked = -1;
-static int hf_usb_i1d3_prodname = -1;
-static int hf_usb_i1d3_prodtype = -1;
-static int hf_usb_i1d3_request_in = -1;
-static int hf_usb_i1d3_requested_edge_count = -1;
-static int hf_usb_i1d3_requested_edge_count_red = -1;
-static int hf_usb_i1d3_requested_edge_count_green = -1;
-static int hf_usb_i1d3_requested_edge_count_blue = -1;
-static int hf_usb_i1d3_requested_integration_time = -1;
-static int hf_usb_i1d3_response_code = -1;
-static int hf_usb_i1d3_response_in = -1;
-static int hf_usb_i1d3_readextee_data = -1;
-static int hf_usb_i1d3_readextee_offset = -1;
-static int hf_usb_i1d3_readextee_length = -1;
-static int hf_usb_i1d3_readintee_data = -1;
-static int hf_usb_i1d3_readintee_offset = -1;
-static int hf_usb_i1d3_readintee_length = -1;
-static int hf_usb_i1d3_status = -1;
-static int hf_usb_i1d3_unlock_result = -1;
-
-static expert_field ei_usb_i1d3_echoed_command_code_mismatch = EI_INIT;
-static expert_field ei_usb_i1d3_error = EI_INIT;
-static expert_field ei_usb_i1d3_unexpected_response = EI_INIT;
-static expert_field ei_usb_i1d3_unknown_command = EI_INIT;
-static expert_field ei_usb_i1d3_unknown_diffuser_position = EI_INIT;
-static expert_field ei_usb_i1d3_unlock_failed = EI_INIT;
-static expert_field ei_usb_i1d3_unusual_length = EI_INIT;
+static int proto_usb_i1d3;
+static int ett_usb_i1d3;
+static int ett_usb_i1d3_measured_duration;
+static int ett_usb_i1d3_requested_edge_count;
+
+static int hf_usb_i1d3_challenge_response;
+static int hf_usb_i1d3_challenge_data;
+static int hf_usb_i1d3_challenge_decode_key;
+static int hf_usb_i1d3_challenge_encode_key;
+static int hf_usb_i1d3_command_code;
+static int hf_usb_i1d3_diffuser_position;
+static int hf_usb_i1d3_echoed_command_code;
+static int hf_usb_i1d3_firmdate;
+static int hf_usb_i1d3_firmver;
+static int hf_usb_i1d3_information;
+static int hf_usb_i1d3_measured_duration;
+static int hf_usb_i1d3_measured_duration_red;
+static int hf_usb_i1d3_measured_duration_green;
+static int hf_usb_i1d3_measured_duration_blue;
+static int hf_usb_i1d3_measured_edge_count;
+static int hf_usb_i1d3_measured_edge_count_red;
+static int hf_usb_i1d3_measured_edge_count_green;
+static int hf_usb_i1d3_measured_edge_count_blue;
+static int hf_usb_i1d3_led_mode;
+static int hf_usb_i1d3_led_offtime;
+static int hf_usb_i1d3_led_ontime;
+static int hf_usb_i1d3_led_pulse_count;
+static int hf_usb_i1d3_locked;
+static int hf_usb_i1d3_prodname;
+static int hf_usb_i1d3_prodtype;
+static int hf_usb_i1d3_request_in;
+static int hf_usb_i1d3_requested_edge_count;
+static int hf_usb_i1d3_requested_edge_count_red;
+static int hf_usb_i1d3_requested_edge_count_green;
+static int hf_usb_i1d3_requested_edge_count_blue;
+static int hf_usb_i1d3_requested_integration_time;
+static int hf_usb_i1d3_response_code;
+static int hf_usb_i1d3_response_in;
+static int hf_usb_i1d3_readextee_data;
+static int hf_usb_i1d3_readextee_offset;
+static int hf_usb_i1d3_readextee_length;
+static int hf_usb_i1d3_readintee_data;
+static int hf_usb_i1d3_readintee_offset;
+static int hf_usb_i1d3_readintee_length;
+static int hf_usb_i1d3_status;
+static int hf_usb_i1d3_unlock_result;
+
+static expert_field ei_usb_i1d3_echoed_command_code_mismatch;
+static expert_field ei_usb_i1d3_error;
+static expert_field ei_usb_i1d3_unexpected_response;
+static expert_field ei_usb_i1d3_unknown_command;
+static expert_field ei_usb_i1d3_unknown_diffuser_position;
+static expert_field ei_usb_i1d3_unlock_failed;
+static expert_field ei_usb_i1d3_unusual_length;
 
 // Derived from ArgyllCMS spectro/i1d3.c.
 typedef enum _usb_i1d3_command_code {
diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c
index 62489e6046..648c3d051e 100644
--- a/epan/dissectors/packet-usb-masstorage.c
+++ b/epan/dissectors/packet-usb-masstorage.c
@@ -14,7 +14,7 @@
 #include <epan/packet.h>
 #include "packet-usb.h"
 
-static int proto_usb_ms = -1;
+static int proto_usb_ms;
 
 static dissector_handle_t usb_ms_bulk_handle;
 static dissector_handle_t usb_ms_control_handle;
diff --git a/epan/dissectors/packet-usb-printer.c b/epan/dissectors/packet-usb-printer.c
index c03122f9b8..4ecc086e44 100644
--- a/epan/dissectors/packet-usb-printer.c
+++ b/epan/dissectors/packet-usb-printer.c
@@ -27,17 +27,17 @@
 
 static dissector_handle_t usb_printer_ctl_handle;
 
-static int proto_usb_printer = -1;
+static int proto_usb_printer;
 
-static int hf_usb_printer_req = -1;
-static int hf_usb_printer_cfg_idx = -1;
-static int hf_usb_printer_intf = -1;
-static int hf_usb_printer_alt_set = -1;
-static int hf_usb_printer_max_len = -1;
-static int hf_usb_printer_dev_id_len = -1;
-static int hf_usb_printer_dev_id = -1;
+static int hf_usb_printer_req;
+static int hf_usb_printer_cfg_idx;
+static int hf_usb_printer_intf;
+static int hf_usb_printer_alt_set;
+static int hf_usb_printer_max_len;
+static int hf_usb_printer_dev_id_len;
+static int hf_usb_printer_dev_id;
 
-static gint ett_usb_printer   = -1;
+static gint ett_usb_printer;
 
 void proto_register_usb_printer(void);
 void proto_reg_handoff_usb_printer(void);
diff --git a/epan/dissectors/packet-usb-video.c b/epan/dissectors/packet-usb-video.c
index fd03404d6b..f0942faff4 100644
--- a/epan/dissectors/packet-usb-video.c
+++ b/epan/dissectors/packet-usb-video.c
@@ -206,143 +206,143 @@ static dissector_handle_t usb_vid_descriptor_handle;
 static dissector_handle_t usb_vid_interrupt_handle;
 
 /* protocols and header fields */
-static int proto_usb_vid = -1;
-
-static int hf_usb_vid_control_entity    = -1;
-static int hf_usb_vid_control_interface = -1;
-static int hf_usb_vid_control_selector  = -1;
-static int hf_usb_vid_epdesc_subtype = -1;
-static int hf_usb_vid_epdesc_max_transfer_sz = -1;
-static int hf_usb_vid_control_ifdesc_subtype = -1;
-static int hf_usb_vid_control_ifdesc_terminal_id = -1;
-static int hf_usb_vid_control_ifdesc_terminal_type = -1;
-static int hf_usb_vid_control_ifdesc_assoc_terminal = -1;
-static int hf_usb_vid_streaming_ifdesc_subtype = -1;
-static int hf_usb_vid_streaming_ifdesc_bNumFormats = -1;
-static int hf_usb_vid_control_ifdesc_unit_id = -1;
-static int hf_usb_vid_request = -1;
-static int hf_usb_vid_length = -1;
-static int hf_usb_vid_interrupt_bStatusType = -1;
-static int hf_usb_vid_interrupt_bOriginator = -1;
-static int hf_usb_vid_interrupt_bAttribute = -1;
-static int hf_usb_vid_control_interrupt_bEvent = -1;
-static int hf_usb_vid_control_ifdesc_bcdUVC = -1;
-static int hf_usb_vid_ifdesc_wTotalLength = -1;
-static int hf_usb_vid_control_ifdesc_dwClockFrequency = -1;
-static int hf_usb_vid_control_ifdesc_bInCollection = -1;
-static int hf_usb_vid_control_ifdesc_baInterfaceNr = -1;
-static int hf_usb_vid_control_ifdesc_iTerminal = -1;
-static int hf_usb_vid_control_ifdesc_src_id = -1;
-static int hf_usb_vid_cam_objective_focal_len_min = -1;
-static int hf_usb_vid_cam_objective_focal_len_max = -1;
-static int hf_usb_vid_cam_ocular_focal_len = -1;
-static int hf_usb_vid_bControlSize = -1;
-static int hf_usb_vid_bmControl = -1;
-static int hf_usb_vid_bmControl_bytes = -1;
-static int hf_usb_vid_control_default = -1;
-static int hf_usb_vid_control_min = -1;
-static int hf_usb_vid_control_max = -1;
-static int hf_usb_vid_control_res = -1;
-static int hf_usb_vid_control_cur = -1;
-static int hf_usb_vid_control_info = -1;
+static int proto_usb_vid;
+
+static int hf_usb_vid_control_entity;
+static int hf_usb_vid_control_interface;
+static int hf_usb_vid_control_selector;
+static int hf_usb_vid_epdesc_subtype;
+static int hf_usb_vid_epdesc_max_transfer_sz;
+static int hf_usb_vid_control_ifdesc_subtype;
+static int hf_usb_vid_control_ifdesc_terminal_id;
+static int hf_usb_vid_control_ifdesc_terminal_type;
+static int hf_usb_vid_control_ifdesc_assoc_terminal;
+static int hf_usb_vid_streaming_ifdesc_subtype;
+static int hf_usb_vid_streaming_ifdesc_bNumFormats;
+static int hf_usb_vid_control_ifdesc_unit_id;
+static int hf_usb_vid_request;
+static int hf_usb_vid_length;
+static int hf_usb_vid_interrupt_bStatusType;
+static int hf_usb_vid_interrupt_bOriginator;
+static int hf_usb_vid_interrupt_bAttribute;
+static int hf_usb_vid_control_interrupt_bEvent;
+static int hf_usb_vid_control_ifdesc_bcdUVC;
+static int hf_usb_vid_ifdesc_wTotalLength;
+static int hf_usb_vid_control_ifdesc_dwClockFrequency;
+static int hf_usb_vid_control_ifdesc_bInCollection;
+static int hf_usb_vid_control_ifdesc_baInterfaceNr;
+static int hf_usb_vid_control_ifdesc_iTerminal;
+static int hf_usb_vid_control_ifdesc_src_id;
+static int hf_usb_vid_cam_objective_focal_len_min;
+static int hf_usb_vid_cam_objective_focal_len_max;
+static int hf_usb_vid_cam_ocular_focal_len;
+static int hf_usb_vid_bControlSize;
+static int hf_usb_vid_bmControl;
+static int hf_usb_vid_bmControl_bytes;
+static int hf_usb_vid_control_default;
+static int hf_usb_vid_control_min;
+static int hf_usb_vid_control_max;
+static int hf_usb_vid_control_res;
+static int hf_usb_vid_control_cur;
+static int hf_usb_vid_control_info;
 static int hf_usb_vid_control_info_D[7];
-static int hf_usb_vid_control_length = -1;
+static int hf_usb_vid_control_length;
 static int hf_usb_vid_cam_control_D[22];
 static int hf_usb_vid_proc_control_D[19];
 static int hf_usb_vid_proc_standards_D[6];
-static int hf_usb_vid_exten_guid = -1;
-static int hf_usb_vid_exten_num_controls = -1;
-static int hf_usb_vid_num_inputs = -1;
-static int hf_usb_vid_sources = -1;
-static int hf_usb_vid_streaming_bmInfo = -1;
+static int hf_usb_vid_exten_guid;
+static int hf_usb_vid_exten_num_controls;
+static int hf_usb_vid_num_inputs;
+static int hf_usb_vid_sources;
+static int hf_usb_vid_streaming_bmInfo;
 static int hf_usb_vid_streaming_info_D[1];
-static int hf_usb_vid_streaming_terminal_link = -1;
-static int hf_usb_vid_streaming_still_capture_method = -1;
-static int hf_usb_vid_streaming_trigger_support = -1;
-static int hf_usb_vid_streaming_trigger_usage = -1;
+static int hf_usb_vid_streaming_terminal_link;
+static int hf_usb_vid_streaming_still_capture_method;
+static int hf_usb_vid_streaming_trigger_support;
+static int hf_usb_vid_streaming_trigger_usage;
 static int hf_usb_vid_streaming_control_D[6];
-static int hf_usb_vid_format_index = -1;
-static int hf_usb_vid_format_num_frame_descriptors = -1;
-static int hf_usb_vid_format_guid = -1;
-static int hf_usb_vid_format_bits_per_pixel = -1;
-static int hf_usb_vid_default_frame_index = -1;
-static int hf_usb_vid_aspect_ratio_x = -1;
-static int hf_usb_vid_aspect_ratio_y = -1;
-static int hf_usb_vid_interlace_flags = -1;
-static int hf_usb_vid_is_interlaced = -1;
-static int hf_usb_vid_interlaced_fields = -1;
-static int hf_usb_vid_field_1_first = -1;
-static int hf_usb_vid_field_pattern = -1;
-static int hf_usb_vid_copy_protect = -1;
-static int hf_usb_vid_variable_size = -1;
-static int hf_usb_vid_frame_index = -1;
-static int hf_usb_vid_frame_capabilities = -1;
-static int hf_usb_vid_frame_stills_supported = -1;
-static int hf_usb_vid_frame_fixed_frame_rate = -1;
-static int hf_usb_vid_frame_width = -1;
-static int hf_usb_vid_frame_height = -1;
-static int hf_usb_vid_frame_min_bit_rate = -1;
-static int hf_usb_vid_frame_max_bit_rate = -1;
-static int hf_usb_vid_frame_max_frame_sz = -1;
-static int hf_usb_vid_frame_default_interval = -1;
-static int hf_usb_vid_frame_bytes_per_line = -1;
-static int hf_usb_vid_mjpeg_flags = -1;
-static int hf_usb_vid_mjpeg_fixed_samples = -1;
-static int hf_usb_vid_probe_hint = -1;
+static int hf_usb_vid_format_index;
+static int hf_usb_vid_format_num_frame_descriptors;
+static int hf_usb_vid_format_guid;
+static int hf_usb_vid_format_bits_per_pixel;
+static int hf_usb_vid_default_frame_index;
+static int hf_usb_vid_aspect_ratio_x;
+static int hf_usb_vid_aspect_ratio_y;
+static int hf_usb_vid_interlace_flags;
+static int hf_usb_vid_is_interlaced;
+static int hf_usb_vid_interlaced_fields;
+static int hf_usb_vid_field_1_first;
+static int hf_usb_vid_field_pattern;
+static int hf_usb_vid_copy_protect;
+static int hf_usb_vid_variable_size;
+static int hf_usb_vid_frame_index;
+static int hf_usb_vid_frame_capabilities;
+static int hf_usb_vid_frame_stills_supported;
+static int hf_usb_vid_frame_fixed_frame_rate;
+static int hf_usb_vid_frame_width;
+static int hf_usb_vid_frame_height;
+static int hf_usb_vid_frame_min_bit_rate;
+static int hf_usb_vid_frame_max_bit_rate;
+static int hf_usb_vid_frame_max_frame_sz;
+static int hf_usb_vid_frame_default_interval;
+static int hf_usb_vid_frame_bytes_per_line;
+static int hf_usb_vid_mjpeg_flags;
+static int hf_usb_vid_mjpeg_fixed_samples;
+static int hf_usb_vid_probe_hint;
 static int hf_usb_vid_probe_hint_D[5];
-static int hf_usb_vid_frame_interval = -1;
-static int hf_usb_vid_probe_key_frame_rate = -1;
-static int hf_usb_vid_probe_p_frame_rate = -1;
-static int hf_usb_vid_probe_comp_quality = -1;
-static int hf_usb_vid_probe_comp_window = -1;
-static int hf_usb_vid_probe_delay = -1;
-static int hf_usb_vid_probe_max_frame_sz = -1;
-static int hf_usb_vid_probe_max_payload_sz = -1;
-static int hf_usb_vid_probe_clock_freq = -1;
-static int hf_usb_vid_probe_framing = -1;
+static int hf_usb_vid_frame_interval;
+static int hf_usb_vid_probe_key_frame_rate;
+static int hf_usb_vid_probe_p_frame_rate;
+static int hf_usb_vid_probe_comp_quality;
+static int hf_usb_vid_probe_comp_window;
+static int hf_usb_vid_probe_delay;
+static int hf_usb_vid_probe_max_frame_sz;
+static int hf_usb_vid_probe_max_payload_sz;
+static int hf_usb_vid_probe_clock_freq;
+static int hf_usb_vid_probe_framing;
 static int hf_usb_vid_probe_framing_D[2];
-static int hf_usb_vid_probe_preferred_ver = -1;
-static int hf_usb_vid_probe_min_ver = -1;
-static int hf_usb_vid_probe_max_ver = -1;
-static int hf_usb_vid_frame_interval_type = -1;
-static int hf_usb_vid_frame_min_interval = -1;
-static int hf_usb_vid_frame_max_interval = -1;
-static int hf_usb_vid_frame_step_interval = -1;
-static int hf_usb_vid_color_primaries = -1;
-static int hf_usb_vid_transfer_characteristics = -1;
-static int hf_usb_vid_matrix_coefficients = -1;
-static int hf_usb_vid_max_multiplier = -1;
-static int hf_usb_vid_iProcessing = -1;
-static int hf_usb_vid_iExtension = -1;
-static int hf_usb_vid_iSelector = -1;
-static int hf_usb_vid_proc_standards = -1;
-static int hf_usb_vid_request_error = -1;
-static int hf_usb_vid_descriptor_data = -1;
-static int hf_usb_vid_control_data = -1;
-static int hf_usb_vid_control_value = -1;
-static int hf_usb_vid_value_data = -1;
+static int hf_usb_vid_probe_preferred_ver;
+static int hf_usb_vid_probe_min_ver;
+static int hf_usb_vid_probe_max_ver;
+static int hf_usb_vid_frame_interval_type;
+static int hf_usb_vid_frame_min_interval;
+static int hf_usb_vid_frame_max_interval;
+static int hf_usb_vid_frame_step_interval;
+static int hf_usb_vid_color_primaries;
+static int hf_usb_vid_transfer_characteristics;
+static int hf_usb_vid_matrix_coefficients;
+static int hf_usb_vid_max_multiplier;
+static int hf_usb_vid_iProcessing;
+static int hf_usb_vid_iExtension;
+static int hf_usb_vid_iSelector;
+static int hf_usb_vid_proc_standards;
+static int hf_usb_vid_request_error;
+static int hf_usb_vid_descriptor_data;
+static int hf_usb_vid_control_data;
+static int hf_usb_vid_control_value;
+static int hf_usb_vid_value_data;
 
 
 /* Subtrees */
-static gint ett_usb_vid = -1;
-static gint ett_descriptor_video_endpoint = -1;
-static gint ett_descriptor_video_control = -1;
-static gint ett_descriptor_video_streaming = -1;
-static gint ett_camera_controls = -1;
-static gint ett_processing_controls = -1;
-static gint ett_streaming_controls = -1;
-static gint ett_streaming_info = -1;
-static gint ett_interlace_flags = -1;
-static gint ett_frame_capability_flags = -1;
-static gint ett_mjpeg_flags = -1;
-static gint ett_video_probe = -1;
-static gint ett_probe_hint = -1;
-static gint ett_probe_framing = -1;
-static gint ett_video_standards = -1;
-static gint ett_control_capabilities = -1;
-
-static expert_field ei_usb_vid_subtype_unknown = EI_INIT;
-static expert_field ei_usb_vid_bitmask_len = EI_INIT;
+static gint ett_usb_vid;
+static gint ett_descriptor_video_endpoint;
+static gint ett_descriptor_video_control;
+static gint ett_descriptor_video_streaming;
+static gint ett_camera_controls;
+static gint ett_processing_controls;
+static gint ett_streaming_controls;
+static gint ett_streaming_info;
+static gint ett_interlace_flags;
+static gint ett_frame_capability_flags;
+static gint ett_mjpeg_flags;
+static gint ett_video_probe;
+static gint ett_probe_hint;
+static gint ett_probe_framing;
+static gint ett_video_standards;
+static gint ett_control_capabilities;
+
+static expert_field ei_usb_vid_subtype_unknown;
+static expert_field ei_usb_vid_bitmask_len;
 
 /* Lookup tables */
 static const value_string vc_ep_descriptor_subtypes[] = {
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index c06e5636c7..3331c0edab 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -42,95 +42,95 @@ static dissector_handle_t  darwin_usb_handle;
 static dissector_handle_t  netmon_usb_port_handle;
 
 /* protocols and header fields */
-static int proto_usb = -1;
-static int proto_usbport = -1;
+static int proto_usb;
+static int proto_usbport;
 
 /* USB pseudoheader fields, both FreeBSD and Linux */
-static int hf_usb_totlen = -1;
-static int hf_usb_busunit = -1;
-static int hf_usb_address = -1;
-static int hf_usb_mode = -1;
-static int hf_usb_freebsd_urb_type = -1;
-static int hf_usb_freebsd_transfer_type = -1;
-static int hf_usb_xferflags = -1;
-static int hf_usb_xferflags_force_short_xfer = -1;
-static int hf_usb_xferflags_short_xfer_ok = -1;
-static int hf_usb_xferflags_short_frames_ok = -1;
-static int hf_usb_xferflags_pipe_bof = -1;
-static int hf_usb_xferflags_proxy_buffer = -1;
-static int hf_usb_xferflags_ext_buffer = -1;
-static int hf_usb_xferflags_manual_status = -1;
-static int hf_usb_xferflags_no_pipe_ok = -1;
-static int hf_usb_xferflags_stall_pipe = -1;
-static int hf_usb_xferstatus = -1;
-static int hf_usb_xferstatus_open = -1;
-static int hf_usb_xferstatus_transferring = -1;
-static int hf_usb_xferstatus_did_dma_delay = -1;
-static int hf_usb_xferstatus_did_close = -1;
-static int hf_usb_xferstatus_draining = -1;
-static int hf_usb_xferstatus_started = -1;
-static int hf_usb_xferstatus_bw_reclaimed = -1;
-static int hf_usb_xferstatus_control_xfr = -1;
-static int hf_usb_xferstatus_control_hdr = -1;
-static int hf_usb_xferstatus_control_act = -1;
-static int hf_usb_xferstatus_control_stall = -1;
-static int hf_usb_xferstatus_short_frames_ok = -1;
-static int hf_usb_xferstatus_short_xfer_ok = -1;
-static int hf_usb_xferstatus_bdma_enable = -1;
-static int hf_usb_xferstatus_bdma_no_post_sync = -1;
-static int hf_usb_xferstatus_bdma_setup = -1;
-static int hf_usb_xferstatus_isochronous_xfr = -1;
-static int hf_usb_xferstatus_curr_dma_set = -1;
-static int hf_usb_xferstatus_can_cancel_immed = -1;
-static int hf_usb_xferstatus_doing_callback = -1;
-static int hf_usb_error = -1;
-static int hf_usb_interval = -1;
-static int hf_usb_nframes = -1;
-static int hf_usb_packet_size = -1;
-static int hf_usb_packet_count = -1;
-static int hf_usb_speed = -1;
-static int hf_usb_frame_length = -1;
-static int hf_usb_frame_flags = -1;
-static int hf_usb_frame_flags_read = -1;
-static int hf_usb_frame_flags_data_follows = -1;
-static int hf_usb_frame_data = -1;
-static int hf_usb_urb_id = -1;
-static int hf_usb_linux_urb_type = -1;
-static int hf_usb_linux_transfer_type = -1;
-static int hf_usb_endpoint_address = -1;
-static int hf_usb_endpoint_direction = -1;
-static int hf_usb_endpoint_number = -1;
-static int hf_usb_device_address = -1;
-static int hf_usb_bus_id = -1;
-static int hf_usb_setup_flag = -1;
-static int hf_usb_data_flag = -1;
-static int hf_usb_urb_ts_sec = -1;
-static int hf_usb_urb_ts_usec = -1;
-static int hf_usb_urb_status = -1;
-static int hf_usb_urb_len = -1;
-static int hf_usb_urb_data_len = -1;
-static int hf_usb_urb_unused_setup_header = -1;
-static int hf_usb_urb_interval = -1;
-static int hf_usb_urb_start_frame = -1;
-static int hf_usb_urb_copy_of_transfer_flags = -1;
+static int hf_usb_totlen;
+static int hf_usb_busunit;
+static int hf_usb_address;
+static int hf_usb_mode;
+static int hf_usb_freebsd_urb_type;
+static int hf_usb_freebsd_transfer_type;
+static int hf_usb_xferflags;
+static int hf_usb_xferflags_force_short_xfer;
+static int hf_usb_xferflags_short_xfer_ok;
+static int hf_usb_xferflags_short_frames_ok;
+static int hf_usb_xferflags_pipe_bof;
+static int hf_usb_xferflags_proxy_buffer;
+static int hf_usb_xferflags_ext_buffer;
+static int hf_usb_xferflags_manual_status;
+static int hf_usb_xferflags_no_pipe_ok;
+static int hf_usb_xferflags_stall_pipe;
+static int hf_usb_xferstatus;
+static int hf_usb_xferstatus_open;
+static int hf_usb_xferstatus_transferring;
+static int hf_usb_xferstatus_did_dma_delay;
+static int hf_usb_xferstatus_did_close;
+static int hf_usb_xferstatus_draining;
+static int hf_usb_xferstatus_started;
+static int hf_usb_xferstatus_bw_reclaimed;
+static int hf_usb_xferstatus_control_xfr;
+static int hf_usb_xferstatus_control_hdr;
+static int hf_usb_xferstatus_control_act;
+static int hf_usb_xferstatus_control_stall;
+static int hf_usb_xferstatus_short_frames_ok;
+static int hf_usb_xferstatus_short_xfer_ok;
+static int hf_usb_xferstatus_bdma_enable;
+static int hf_usb_xferstatus_bdma_no_post_sync;
+static int hf_usb_xferstatus_bdma_setup;
+static int hf_usb_xferstatus_isochronous_xfr;
+static int hf_usb_xferstatus_curr_dma_set;
+static int hf_usb_xferstatus_can_cancel_immed;
+static int hf_usb_xferstatus_doing_callback;
+static int hf_usb_error;
+static int hf_usb_interval;
+static int hf_usb_nframes;
+static int hf_usb_packet_size;
+static int hf_usb_packet_count;
+static int hf_usb_speed;
+static int hf_usb_frame_length;
+static int hf_usb_frame_flags;
+static int hf_usb_frame_flags_read;
+static int hf_usb_frame_flags_data_follows;
+static int hf_usb_frame_data;
+static int hf_usb_urb_id;
+static int hf_usb_linux_urb_type;
+static int hf_usb_linux_transfer_type;
+static int hf_usb_endpoint_address;
+static int hf_usb_endpoint_direction;
+static int hf_usb_endpoint_number;
+static int hf_usb_device_address;
+static int hf_usb_bus_id;
+static int hf_usb_setup_flag;
+static int hf_usb_data_flag;
+static int hf_usb_urb_ts_sec;
+static int hf_usb_urb_ts_usec;
+static int hf_usb_urb_status;
+static int hf_usb_urb_len;
+static int hf_usb_urb_data_len;
+static int hf_usb_urb_unused_setup_header;
+static int hf_usb_urb_interval;
+static int hf_usb_urb_start_frame;
+static int hf_usb_urb_copy_of_transfer_flags;
 
 /* transfer_flags */
-static int hf_short_not_ok = -1;
-static int hf_iso_asap = -1;
-static int hf_no_transfer_dma_map = -1;
-static int hf_no_fsbr = -1;
-static int hf_zero_packet = -1;
-static int hf_no_interrupt = -1;
-static int hf_free_buffer = -1;
-static int hf_dir_in = -1;
-static int hf_dma_map_single = -1;
-static int hf_dma_map_page = -1;
-static int hf_dma_map_sg = -1;
-static int hf_map_local = -1;
-static int hf_setup_map_single = -1;
-static int hf_setup_map_local = -1;
-static int hf_dma_sg_combined = -1;
-static int hf_aligned_temp_buffer = -1;
+static int hf_short_not_ok;
+static int hf_iso_asap;
+static int hf_no_transfer_dma_map;
+static int hf_no_fsbr;
+static int hf_zero_packet;
+static int hf_no_interrupt;
+static int hf_free_buffer;
+static int hf_dir_in;
+static int hf_dma_map_single;
+static int hf_dma_map_page;
+static int hf_dma_map_sg;
+static int hf_map_local;
+static int hf_setup_map_single;
+static int hf_setup_map_local;
+static int hf_dma_sg_combined;
+static int hf_aligned_temp_buffer;
 
 static int * const transfer_flags_fields[] = {
     &hf_short_not_ok,
@@ -153,260 +153,260 @@ static int * const transfer_flags_fields[] = {
 };
 
 /* Win32 USBPcap pseudoheader fields */
-static int hf_usb_win32_header_len = -1;
-static int hf_usb_irp_id = -1;
-static int hf_usb_usbd_status = -1;
-static int hf_usb_function = -1;
-static int hf_usb_info = -1;
-static int hf_usb_usbpcap_info_reserved = -1;
-static int hf_usb_usbpcap_info_direction = -1;
-static int hf_usb_win32_device_address = -1;
-static int hf_usb_win32_transfer_type = -1;
+static int hf_usb_win32_header_len;
+static int hf_usb_irp_id;
+static int hf_usb_usbd_status;
+static int hf_usb_function;
+static int hf_usb_info;
+static int hf_usb_usbpcap_info_reserved;
+static int hf_usb_usbpcap_info_direction;
+static int hf_usb_win32_device_address;
+static int hf_usb_win32_transfer_type;
 /* hf_usb_bus_id, hf_usb_endpoint_address, hf_usb_endpoint_direction,
  * hf_usb_endpoint_number are common with
  * FreeBSD and Linux pseudoheaders */
-static int hf_usb_win32_data_len = -1;
-static int hf_usb_win32_control_stage = -1;
-static int hf_usb_win32_iso_start_frame = -1;
-static int hf_usb_win32_iso_num_packets = -1;
-static int hf_usb_win32_iso_error_count = -1;
-static int hf_usb_win32_iso_offset = -1;
-static int hf_usb_win32_iso_length = -1;
-static int hf_usb_win32_iso_status = -1;
-
-static int hf_usb_request = -1;
-static int hf_usb_request_unknown_class = -1;
-static int hf_usb_value = -1;
-static int hf_usb_index = -1;
-static int hf_usb_length = -1;
-/* static int hf_usb_data_len = -1; */
-static int hf_usb_capdata = -1;
-static int hf_usb_device_wFeatureSelector = -1;
-static int hf_usb_interface_wFeatureSelector = -1;
-static int hf_usb_endpoint_wFeatureSelector = -1;
-static int hf_usb_wInterface = -1;
-static int hf_usb_wEndpoint = -1;
-static int hf_usb_wStatus = -1;
-static int hf_usb_wFrameNumber = -1;
-
-static int hf_usb_iso_error_count = -1;
-static int hf_usb_iso_numdesc = -1;
-static int hf_usb_iso_status = -1;
-static int hf_usb_iso_off = -1;
-static int hf_usb_iso_len = -1;
-static int hf_usb_iso_actual_len = -1;
-static int hf_usb_iso_pad = -1;
-static int hf_usb_iso_data = -1;
-
-static int hf_usb_bmRequestType = -1;
-static int hf_usb_control_response_generic = -1;
-static int hf_usb_bmRequestType_direction = -1;
-static int hf_usb_bmRequestType_type = -1;
-static int hf_usb_bmRequestType_recipient = -1;
-static int hf_usb_bDescriptorType = -1;
-static int hf_usb_get_descriptor_resp_generic = -1;
-static int hf_usb_descriptor_index = -1;
-static int hf_usb_language_id = -1;
-static int hf_usb_bLength = -1;
-static int hf_usb_bcdUSB = -1;
-static int hf_usb_bDeviceClass = -1;
-static int hf_usb_bDeviceSubClass = -1;
-static int hf_usb_bDeviceProtocol = -1;
-static int hf_usb_bMaxPacketSize0 = -1;
-static int hf_usb_idVendor = -1;
-static int hf_usb_idProduct = -1;
-static int hf_usb_bcdDevice = -1;
-static int hf_usb_iManufacturer = -1;
-static int hf_usb_iProduct = -1;
-static int hf_usb_iSerialNumber = -1;
-static int hf_usb_bNumConfigurations = -1;
-static int hf_usb_wLANGID = -1;
-static int hf_usb_bString = -1;
-static int hf_usb_bInterfaceNumber = -1;
-static int hf_usb_bAlternateSetting = -1;
-static int hf_usb_bNumEndpoints = -1;
-static int hf_usb_bInterfaceClass = -1;
-static int hf_usb_bInterfaceSubClass = -1;
-static int hf_usb_bInterfaceSubClass_audio = -1;
-static int hf_usb_bInterfaceSubClass_cdc = -1;
-static int hf_usb_bInterfaceSubClass_massstorage = -1;
-static int hf_usb_bInterfaceSubClass_hid = -1;
-static int hf_usb_bInterfaceSubClass_misc = -1;
-static int hf_usb_bInterfaceSubClass_app = -1;
-static int hf_usb_bInterfaceProtocol = -1;
-static int hf_usb_bInterfaceProtocol_cdc = -1;
-static int hf_usb_bInterfaceProtocol_massstorage = -1;
-static int hf_usb_bInterfaceProtocol_cdc_data = -1;
-static int hf_usb_bInterfaceProtocol_hid_boot = -1;
-static int hf_usb_bInterfaceProtocol_app_dfu = -1;
-static int hf_usb_bInterfaceProtocol_app_irda = -1;
-static int hf_usb_bInterfaceProtocol_app_usb_test_and_measurement = -1;
-static int hf_usb_iInterface = -1;
-static int hf_usb_bEndpointAddress = -1;
-static int hf_usb_bmAttributes = -1;
-static int hf_usb_bEndpointAttributeTransfer = -1;
-static int hf_usb_bEndpointAttributeSynchonisation = -1;
-static int hf_usb_bEndpointAttributeBehaviour = -1;
-static int hf_usb_wMaxPacketSize = -1;
-static int hf_usb_wMaxPacketSize_size = -1;
-static int hf_usb_wMaxPacketSize_slots = -1;
-static int hf_usb_bInterval = -1;
-static int hf_usb_bMaxBurst = -1;
-static int hf_usb_audio_bRefresh = -1;
-static int hf_usb_audio_bSynchAddress = -1;
-static int hf_usb_bSSEndpointAttributeBulkMaxStreams = -1;
-static int hf_usb_bSSEndpointAttributeIsoMult = -1;
-static int hf_usb_wBytesPerInterval = -1;
-static int hf_usb_wTotalLength = -1;
-static int hf_usb_bNumInterfaces = -1;
-static int hf_usb_bConfigurationValue = -1;
-static int hf_usb_iConfiguration = -1;
-static int hf_usb_bMaxPower = -1;
-static int hf_usb_configuration_bmAttributes = -1;
-static int hf_usb_configuration_legacy10buspowered = -1;
-static int hf_usb_configuration_selfpowered = -1;
-static int hf_usb_configuration_remotewakeup = -1;
-static int hf_usb_bEndpointAddress_direction = -1;
-static int hf_usb_bEndpointAddress_number = -1;
-static int hf_usb_response_in = -1;
-static int hf_usb_time = -1;
-static int hf_usb_request_in = -1;
-static int hf_usb_bFirstInterface = -1;
-static int hf_usb_bInterfaceCount = -1;
-static int hf_usb_bFunctionClass = -1;
-static int hf_usb_bFunctionSubClass = -1;
-static int hf_usb_bFunctionProtocol = -1;
-static int hf_usb_iFunction = -1;
-static int hf_usb_bNumDeviceCaps = -1;
-static int hf_usb_bDevCapabilityType = -1;
-static int hf_usb_usb20ext_bmAttributes = -1;
-static int hf_usb_usb20ext_LPM = -1;
-static int hf_usb_usb20ext_BESL_HIRD = -1;
-static int hf_usb_usb20ext_baseline_BESL_valid = -1;
-static int hf_usb_usb20ext_deep_BESL_valid = -1;
-static int hf_usb_usb20ext_baseline_BESL = -1;
-static int hf_usb_usb20ext_deep_BESL = -1;
-static int hf_usb_bReserved = -1;
-static int hf_usb_PlatformCapabilityUUID = -1;
-static int hf_usb_webusb_bcdVersion = -1;
-static int hf_usb_webusb_bVendorCode = -1;
-static int hf_usb_webusb_iLandingPage = -1;
-static int hf_usb_msos20_dwWindowsVersion = -1;
-static int hf_usb_msos20_wMSOSDescriptorSetTotalLength = -1;
-static int hf_usb_msos20_bMS_VendorCode = -1;
-static int hf_usb_msos20_bAltEnumCode = -1;
-static int hf_usb_data_fragment = -1;
-static int hf_usb_src = -1;
-static int hf_usb_dst = -1;
-static int hf_usb_addr = -1;
+static int hf_usb_win32_data_len;
+static int hf_usb_win32_control_stage;
+static int hf_usb_win32_iso_start_frame;
+static int hf_usb_win32_iso_num_packets;
+static int hf_usb_win32_iso_error_count;
+static int hf_usb_win32_iso_offset;
+static int hf_usb_win32_iso_length;
+static int hf_usb_win32_iso_status;
+
+static int hf_usb_request;
+static int hf_usb_request_unknown_class;
+static int hf_usb_value;
+static int hf_usb_index;
+static int hf_usb_length;
+/* static int hf_usb_data_len; */
+static int hf_usb_capdata;
+static int hf_usb_device_wFeatureSelector;
+static int hf_usb_interface_wFeatureSelector;
+static int hf_usb_endpoint_wFeatureSelector;
+static int hf_usb_wInterface;
+static int hf_usb_wEndpoint;
+static int hf_usb_wStatus;
+static int hf_usb_wFrameNumber;
+
+static int hf_usb_iso_error_count;
+static int hf_usb_iso_numdesc;
+static int hf_usb_iso_status;
+static int hf_usb_iso_off;
+static int hf_usb_iso_len;
+static int hf_usb_iso_actual_len;
+static int hf_usb_iso_pad;
+static int hf_usb_iso_data;
+
+static int hf_usb_bmRequestType;
+static int hf_usb_control_response_generic;
+static int hf_usb_bmRequestType_direction;
+static int hf_usb_bmRequestType_type;
+static int hf_usb_bmRequestType_recipient;
+static int hf_usb_bDescriptorType;
+static int hf_usb_get_descriptor_resp_generic;
+static int hf_usb_descriptor_index;
+static int hf_usb_language_id;
+static int hf_usb_bLength;
+static int hf_usb_bcdUSB;
+static int hf_usb_bDeviceClass;
+static int hf_usb_bDeviceSubClass;
+static int hf_usb_bDeviceProtocol;
+static int hf_usb_bMaxPacketSize0;
+static int hf_usb_idVendor;
+static int hf_usb_idProduct;
+static int hf_usb_bcdDevice;
+static int hf_usb_iManufacturer;
+static int hf_usb_iProduct;
+static int hf_usb_iSerialNumber;
+static int hf_usb_bNumConfigurations;
+static int hf_usb_wLANGID;
+static int hf_usb_bString;
+static int hf_usb_bInterfaceNumber;
+static int hf_usb_bAlternateSetting;
+static int hf_usb_bNumEndpoints;
+static int hf_usb_bInterfaceClass;
+static int hf_usb_bInterfaceSubClass;
+static int hf_usb_bInterfaceSubClass_audio;
+static int hf_usb_bInterfaceSubClass_cdc;
+static int hf_usb_bInterfaceSubClass_massstorage;
+static int hf_usb_bInterfaceSubClass_hid;
+static int hf_usb_bInterfaceSubClass_misc;
+static int hf_usb_bInterfaceSubClass_app;
+static int hf_usb_bInterfaceProtocol;
+static int hf_usb_bInterfaceProtocol_cdc;
+static int hf_usb_bInterfaceProtocol_massstorage;
+static int hf_usb_bInterfaceProtocol_cdc_data;
+static int hf_usb_bInterfaceProtocol_hid_boot;
+static int hf_usb_bInterfaceProtocol_app_dfu;
+static int hf_usb_bInterfaceProtocol_app_irda;
+static int hf_usb_bInterfaceProtocol_app_usb_test_and_measurement;
+static int hf_usb_iInterface;
+static int hf_usb_bEndpointAddress;
+static int hf_usb_bmAttributes;
+static int hf_usb_bEndpointAttributeTransfer;
+static int hf_usb_bEndpointAttributeSynchonisation;
+static int hf_usb_bEndpointAttributeBehaviour;
+static int hf_usb_wMaxPacketSize;
+static int hf_usb_wMaxPacketSize_size;
+static int hf_usb_wMaxPacketSize_slots;
+static int hf_usb_bInterval;
+static int hf_usb_bMaxBurst;
+static int hf_usb_audio_bRefresh;
+static int hf_usb_audio_bSynchAddress;
+static int hf_usb_bSSEndpointAttributeBulkMaxStreams;
+static int hf_usb_bSSEndpointAttributeIsoMult;
+static int hf_usb_wBytesPerInterval;
+static int hf_usb_wTotalLength;
+static int hf_usb_bNumInterfaces;
+static int hf_usb_bConfigurationValue;
+static int hf_usb_iConfiguration;
+static int hf_usb_bMaxPower;
+static int hf_usb_configuration_bmAttributes;
+static int hf_usb_configuration_legacy10buspowered;
+static int hf_usb_configuration_selfpowered;
+static int hf_usb_configuration_remotewakeup;
+static int hf_usb_bEndpointAddress_direction;
+static int hf_usb_bEndpointAddress_number;
+static int hf_usb_response_in;
+static int hf_usb_time;
+static int hf_usb_request_in;
+static int hf_usb_bFirstInterface;
+static int hf_usb_bInterfaceCount;
+static int hf_usb_bFunctionClass;
+static int hf_usb_bFunctionSubClass;
+static int hf_usb_bFunctionProtocol;
+static int hf_usb_iFunction;
+static int hf_usb_bNumDeviceCaps;
+static int hf_usb_bDevCapabilityType;
+static int hf_usb_usb20ext_bmAttributes;
+static int hf_usb_usb20ext_LPM;
+static int hf_usb_usb20ext_BESL_HIRD;
+static int hf_usb_usb20ext_baseline_BESL_valid;
+static int hf_usb_usb20ext_deep_BESL_valid;
+static int hf_usb_usb20ext_baseline_BESL;
+static int hf_usb_usb20ext_deep_BESL;
+static int hf_usb_bReserved;
+static int hf_usb_PlatformCapabilityUUID;
+static int hf_usb_webusb_bcdVersion;
+static int hf_usb_webusb_bVendorCode;
+static int hf_usb_webusb_iLandingPage;
+static int hf_usb_msos20_dwWindowsVersion;
+static int hf_usb_msos20_wMSOSDescriptorSetTotalLength;
+static int hf_usb_msos20_bMS_VendorCode;
+static int hf_usb_msos20_bAltEnumCode;
+static int hf_usb_data_fragment;
+static int hf_usb_src;
+static int hf_usb_dst;
+static int hf_usb_addr;
 
 /* macOS */
-static int hf_usb_darwin_bcd_version = -1;
-static int hf_usb_darwin_header_len = -1;
-static int hf_usb_darwin_request_type = -1;
-static int hf_usb_darwin_io_len = -1;
-static int hf_usb_darwin_io_status = -1;
-static int hf_usb_darwin_iso_num_packets = -1;
-static int hf_usb_darwin_io_id = -1;
-static int hf_usb_darwin_device_location = -1;
-static int hf_usb_darwin_speed = -1;
-static int hf_usb_darwin_device_address = -1;
-static int hf_usb_darwin_endpoint_address = -1;
-static int hf_usb_darwin_endpoint_type = -1;
-static int hf_usb_darwin_iso_status = -1;
-static int hf_usb_darwin_iso_frame_number = -1;
-static int hf_usb_darwin_iso_timestamp = -1;
+static int hf_usb_darwin_bcd_version;
+static int hf_usb_darwin_header_len;
+static int hf_usb_darwin_request_type;
+static int hf_usb_darwin_io_len;
+static int hf_usb_darwin_io_status;
+static int hf_usb_darwin_iso_num_packets;
+static int hf_usb_darwin_io_id;
+static int hf_usb_darwin_device_location;
+static int hf_usb_darwin_speed;
+static int hf_usb_darwin_device_address;
+static int hf_usb_darwin_endpoint_address;
+static int hf_usb_darwin_endpoint_type;
+static int hf_usb_darwin_iso_status;
+static int hf_usb_darwin_iso_frame_number;
+static int hf_usb_darwin_iso_timestamp;
 
 /* NetMon */
-static int hf_usbport_event_id = -1;
-static int hf_usbport_device_object = -1;
-static int hf_usbport_pci_bus = -1;
-static int hf_usbport_pci_device = -1;
-static int hf_usbport_pci_function = -1;
-static int hf_usbport_pci_vendor_id = -1;
-static int hf_usbport_pci_device_id = -1;
-static int hf_usbport_port_path_depth = -1;
-static int hf_usbport_port_path0 = -1;
-static int hf_usbport_port_path1 = -1;
-static int hf_usbport_port_path2 = -1;
-static int hf_usbport_port_path3 = -1;
-static int hf_usbport_port_path4 = -1;
-static int hf_usbport_port_path5 = -1;
-static int hf_usbport_device_handle = -1;
-static int hf_usbport_device_speed = -1;
-static int hf_usbport_endpoint = -1;
-static int hf_usbport_pipehandle = -1;
-static int hf_usbport_endpoint_desc_length = -1;
-static int hf_usbport_endpoint_desc_type = -1;
-static int hf_usbport_endpoint_address = -1;
-static int hf_usbport_bm_attributes = -1;
-static int hf_usbport_max_packet_size = -1;
-static int hf_usbport_interval = -1;
-static int hf_usbport_irp = -1;
-static int hf_usbport_urb = -1;
-static int hf_usbport_urb_transfer_data = -1;
-static int hf_usbport_urb_header_length = -1;
-static int hf_usbport_urb_header_function = -1;
-static int hf_usbport_urb_header_status = -1;
-static int hf_usbport_urb_header_usbddevice_handle = -1;
-static int hf_usbport_urb_header_usbdflags = -1;
-static int hf_usbport_urb_configuration_desc = -1;
-static int hf_usbport_urb_configuration_handle = -1;
-static int hf_usbport_urb_pipe_handle = -1;
-static int hf_usbport_urb_xferflags = -1;
-static int hf_usbport_urb_transfer_buffer_length = -1;
-static int hf_usbport_urb_transfer_buffer = -1;
-static int hf_usbport_urb_transfer_buffer_mdl = -1;
-static int hf_usbport_urb_reserved_mbz = -1;
-static int hf_usbport_urb_reserved_hcd = -1;
-static int hf_usbport_urb_reserved = -1;
-static int hf_usbport_keyword = -1;
-static int hf_usbport_keyword_diagnostic = -1;
-static int hf_usbport_keyword_power_diagnostics = -1;
-static int hf_usbport_keyword_perf_diagnostics = -1;
-static int hf_usbport_keyword_reserved1 = -1;
-
-static gint ett_usb_hdr = -1;
-static gint ett_usb_setup_hdr = -1;
-static gint ett_usb_isodesc = -1;
-static gint ett_usb_win32_iso_packet = -1;
-static gint ett_usb_endpoint = -1;
-static gint ett_usb_setup_bmrequesttype = -1;
-static gint ett_usb_usbpcap_info = -1;
-static gint ett_descriptor_device = -1;
-static gint ett_configuration_bmAttributes = -1;
-static gint ett_configuration_bEndpointAddress = -1;
-static gint ett_endpoint_bmAttributes = -1;
-static gint ett_endpoint_wMaxPacketSize = -1;
-static gint ett_usb_xferflags = -1;
-static gint ett_usb_xferstatus = -1;
-static gint ett_usb_frame = -1;
-static gint ett_usb_frame_flags = -1;
-static gint ett_usbport = -1;
-static gint ett_usbport_host_controller = -1;
-static gint ett_usbport_path = -1;
-static gint ett_usbport_device = -1;
-static gint ett_usbport_endpoint = -1;
-static gint ett_usbport_endpoint_desc = -1;
-static gint ett_usbport_urb = -1;
-static gint ett_usbport_keyword = -1;
-static gint ett_transfer_flags = -1;
-static gint ett_usb20ext_bmAttributes = -1;
-
-static expert_field ei_usb_undecoded = EI_INIT;
-static expert_field ei_usb_bLength_even = EI_INIT;
-static expert_field ei_usb_bLength_too_short = EI_INIT;
-static expert_field ei_usb_desc_length_invalid = EI_INIT;
-static expert_field ei_usb_invalid_setup = EI_INIT;
-static expert_field ei_usb_ss_ep_companion_before_ep = EI_INIT;
-static expert_field ei_usb_usbpcap_unknown_urb = EI_INIT;
-static expert_field ei_usb_bad_length = EI_INIT;
-static expert_field ei_usb_invalid_max_packet_size = EI_INIT;
-static expert_field ei_usb_invalid_max_packet_size0 = EI_INIT;
-static expert_field ei_usb_invalid_endpoint_type = EI_INIT;
-static expert_field ei_usb_unexpected_desc_type = EI_INIT;
-
-static expert_field ei_usbport_invalid_path_depth = EI_INIT;
+static int hf_usbport_event_id;
+static int hf_usbport_device_object;
+static int hf_usbport_pci_bus;
+static int hf_usbport_pci_device;
+static int hf_usbport_pci_function;
+static int hf_usbport_pci_vendor_id;
+static int hf_usbport_pci_device_id;
+static int hf_usbport_port_path_depth;
+static int hf_usbport_port_path0;
+static int hf_usbport_port_path1;
+static int hf_usbport_port_path2;
+static int hf_usbport_port_path3;
+static int hf_usbport_port_path4;
+static int hf_usbport_port_path5;
+static int hf_usbport_device_handle;
+static int hf_usbport_device_speed;
+static int hf_usbport_endpoint;
+static int hf_usbport_pipehandle;
+static int hf_usbport_endpoint_desc_length;
+static int hf_usbport_endpoint_desc_type;
+static int hf_usbport_endpoint_address;
+static int hf_usbport_bm_attributes;
+static int hf_usbport_max_packet_size;
+static int hf_usbport_interval;
+static int hf_usbport_irp;
+static int hf_usbport_urb;
+static int hf_usbport_urb_transfer_data;
+static int hf_usbport_urb_header_length;
+static int hf_usbport_urb_header_function;
+static int hf_usbport_urb_header_status;
+static int hf_usbport_urb_header_usbddevice_handle;
+static int hf_usbport_urb_header_usbdflags;
+static int hf_usbport_urb_configuration_desc;
+static int hf_usbport_urb_configuration_handle;
+static int hf_usbport_urb_pipe_handle;
+static int hf_usbport_urb_xferflags;
+static int hf_usbport_urb_transfer_buffer_length;
+static int hf_usbport_urb_transfer_buffer;
+static int hf_usbport_urb_transfer_buffer_mdl;
+static int hf_usbport_urb_reserved_mbz;
+static int hf_usbport_urb_reserved_hcd;
+static int hf_usbport_urb_reserved;
+static int hf_usbport_keyword;
+static int hf_usbport_keyword_diagnostic;
+static int hf_usbport_keyword_power_diagnostics;
+static int hf_usbport_keyword_perf_diagnostics;
+static int hf_usbport_keyword_reserved1;
+
+static gint ett_usb_hdr;
+static gint ett_usb_setup_hdr;
+static gint ett_usb_isodesc;
+static gint ett_usb_win32_iso_packet;
+static gint ett_usb_endpoint;
+static gint ett_usb_setup_bmrequesttype;
+static gint ett_usb_usbpcap_info;
+static gint ett_descriptor_device;
+static gint ett_configuration_bmAttributes;
+static gint ett_configuration_bEndpointAddress;
+static gint ett_endpoint_bmAttributes;
+static gint ett_endpoint_wMaxPacketSize;
+static gint ett_usb_xferflags;
+static gint ett_usb_xferstatus;
+static gint ett_usb_frame;
+static gint ett_usb_frame_flags;
+static gint ett_usbport;
+static gint ett_usbport_host_controller;
+static gint ett_usbport_path;
+static gint ett_usbport_device;
+static gint ett_usbport_endpoint;
+static gint ett_usbport_endpoint_desc;
+static gint ett_usbport_urb;
+static gint ett_usbport_keyword;
+static gint ett_transfer_flags;
+static gint ett_usb20ext_bmAttributes;
+
+static expert_field ei_usb_undecoded;
+static expert_field ei_usb_bLength_even;
+static expert_field ei_usb_bLength_too_short;
+static expert_field ei_usb_desc_length_invalid;
+static expert_field ei_usb_invalid_setup;
+static expert_field ei_usb_ss_ep_companion_before_ep;
+static expert_field ei_usb_usbpcap_unknown_urb;
+static expert_field ei_usb_bad_length;
+static expert_field ei_usb_invalid_max_packet_size;
+static expert_field ei_usb_invalid_max_packet_size0;
+static expert_field ei_usb_invalid_endpoint_type;
+static expert_field ei_usb_unexpected_desc_type;
+
+static expert_field ei_usbport_invalid_path_depth;
 
 static int usb_address_type = -1;
 
diff --git a/epan/dissectors/packet-usbip.c b/epan/dissectors/packet-usbip.c
index 7509f46c57..05f525392b 100644
--- a/epan/dissectors/packet-usbip.c
+++ b/epan/dissectors/packet-usbip.c
@@ -38,57 +38,57 @@ static dissector_handle_t usbip_handle;
 
 /* Initialize the protocol and registered fields
  */
-static int proto_usbip = -1;
-
-static int hf_usbip_version = -1;
-static int hf_usbip_operation = -1;
-static int hf_usbip_command = -1;
-static int hf_usbip_status = -1;
-static int hf_usbip_number_devices = -1;
-static int hf_usbip_path = -1;
-static int hf_usbip_devid = -1;
-static int hf_usbip_busid = -1;
-static int hf_usbip_busnum = -1;
-static int hf_usbip_devnum = -1;
-static int hf_usbip_speed = -1;
-static int hf_usbip_idVendor = -1;
-static int hf_usbip_idProduct = -1;
-static int hf_usbip_bcdDevice = -1;
-static int hf_usbip_bDeviceClass = -1;
-static int hf_usbip_bDeviceSubClass = -1;
-static int hf_usbip_bDeviceProtocol = -1;
-static int hf_usbip_bConfigurationValue = -1;
-static int hf_usbip_bNumConfigurations = -1;
-static int hf_usbip_bNumInterfaces = -1;
-static int hf_usbip_bInterfaceClass = -1;
-static int hf_usbip_bInterfaceSubClass = -1;
-static int hf_usbip_bInterfaceProtocol = -1;
-static int hf_usbip_padding = -1;
-
-static int hf_usbip_device = -1;
-static int hf_usbip_interface = -1;
-static int hf_usbip_interval = -1;
-
-static int hf_usbip_actual_length = -1;
-static int hf_usbip_error_count = -1;
-
-static int hf_usbip_seqnum = -1;
-static int hf_usbip_cmd_frame = -1;
-static int hf_usbip_ret_frame = -1;
-static int hf_usbip_vic_frame = -1;
-static int hf_usbip_direction = -1;
-static int hf_usbip_ep = -1;
-static int hf_usbip_transfer_flags = -1;
-static int hf_usbip_transfer_buffer_length = -1;
-static int hf_usbip_start_frame = -1;
-static int hf_usbip_number_of_packets = -1;
-static int hf_usbip_setup = -1;
-static int hf_usbip_urb_data = -1;
+static int proto_usbip;
+
+static int hf_usbip_version;
+static int hf_usbip_operation;
+static int hf_usbip_command;
+static int hf_usbip_status;
+static int hf_usbip_number_devices;
+static int hf_usbip_path;
+static int hf_usbip_devid;
+static int hf_usbip_busid;
+static int hf_usbip_busnum;
+static int hf_usbip_devnum;
+static int hf_usbip_speed;
+static int hf_usbip_idVendor;
+static int hf_usbip_idProduct;
+static int hf_usbip_bcdDevice;
+static int hf_usbip_bDeviceClass;
+static int hf_usbip_bDeviceSubClass;
+static int hf_usbip_bDeviceProtocol;
+static int hf_usbip_bConfigurationValue;
+static int hf_usbip_bNumConfigurations;
+static int hf_usbip_bNumInterfaces;
+static int hf_usbip_bInterfaceClass;
+static int hf_usbip_bInterfaceSubClass;
+static int hf_usbip_bInterfaceProtocol;
+static int hf_usbip_padding;
+
+static int hf_usbip_device;
+static int hf_usbip_interface;
+static int hf_usbip_interval;
+
+static int hf_usbip_actual_length;
+static int hf_usbip_error_count;
+
+static int hf_usbip_seqnum;
+static int hf_usbip_cmd_frame;
+static int hf_usbip_ret_frame;
+static int hf_usbip_vic_frame;
+static int hf_usbip_direction;
+static int hf_usbip_ep;
+static int hf_usbip_transfer_flags;
+static int hf_usbip_transfer_buffer_length;
+static int hf_usbip_start_frame;
+static int hf_usbip_number_of_packets;
+static int hf_usbip_setup;
+static int hf_usbip_urb_data;
 
 /* Initialize the subtree pointers */
-static gint ett_usbip = -1;
-static gint ett_usbip_dev = -1;
-static gint ett_usbip_intf = -1;
+static gint ett_usbip;
+static gint ett_usbip_dev;
+static gint ett_usbip_intf;
 
 enum usb_device_speed {
         USBIP_SPEED_UNKNOWN = 0,                  /* enumerating */
@@ -162,7 +162,7 @@ static const value_string usb_endpoint_direction_vals[] = {
     {0,             NULL                         }
 };
 
-static expert_field ei_usbip = EI_INIT;
+static expert_field ei_usbip;
 
 typedef struct _usbip_transaction_t
 {
diff --git a/epan/dissectors/packet-usbll.c b/epan/dissectors/packet-usbll.c
index 17f5ad4b76..577916b3a2 100644
--- a/epan/dissectors/packet-usbll.c
+++ b/epan/dissectors/packet-usbll.c
@@ -33,53 +33,53 @@ static dissector_handle_t low_speed_handle;
 static dissector_handle_t full_speed_handle;
 static dissector_handle_t high_speed_handle;
 
-static int proto_usbll = -1;
+static int proto_usbll;
 
 /* Fields defined by USB 2.0 standard */
-static int hf_usbll_pid = -1;
-static int hf_usbll_device_addr = -1;
-static int hf_usbll_endp = -1;
-static int hf_usbll_crc5 = -1;
-static int hf_usbll_crc5_status = -1;
-static int hf_usbll_data = -1;
-static int hf_usbll_data_crc = -1;
-static int hf_usbll_data_crc_status = -1;
-static int hf_usbll_sof_framenum = -1;
-static int hf_usbll_split_hub_addr = -1;
-static int hf_usbll_split_sc = -1;
-static int hf_usbll_split_port = -1;
-static int hf_usbll_split_s = -1;
-static int hf_usbll_split_e = -1;
-static int hf_usbll_split_u = -1;
-static int hf_usbll_split_iso_se = -1;
-static int hf_usbll_split_et = -1;
-static int hf_usbll_split_crc5 = -1;
-static int hf_usbll_split_crc5_status = -1;
-static int hf_usbll_src = -1;
-static int hf_usbll_dst = -1;
-static int hf_usbll_addr = -1;
-static int hf_usbll_transfer_fragments = -1;
-static int hf_usbll_transfer_fragment = -1;
-static int hf_usbll_transfer_fragment_overlap = -1;
-static int hf_usbll_transfer_fragment_overlap_conflicts = -1;
-static int hf_usbll_transfer_fragment_multiple_tails = -1;
-static int hf_usbll_transfer_fragment_too_long_fragment = -1;
-static int hf_usbll_transfer_fragment_error = -1;
-static int hf_usbll_transfer_fragment_count = -1;
-static int hf_usbll_transfer_reassembled_in = -1;
-static int hf_usbll_transfer_reassembled_length = -1;
+static int hf_usbll_pid;
+static int hf_usbll_device_addr;
+static int hf_usbll_endp;
+static int hf_usbll_crc5;
+static int hf_usbll_crc5_status;
+static int hf_usbll_data;
+static int hf_usbll_data_crc;
+static int hf_usbll_data_crc_status;
+static int hf_usbll_sof_framenum;
+static int hf_usbll_split_hub_addr;
+static int hf_usbll_split_sc;
+static int hf_usbll_split_port;
+static int hf_usbll_split_s;
+static int hf_usbll_split_e;
+static int hf_usbll_split_u;
+static int hf_usbll_split_iso_se;
+static int hf_usbll_split_et;
+static int hf_usbll_split_crc5;
+static int hf_usbll_split_crc5_status;
+static int hf_usbll_src;
+static int hf_usbll_dst;
+static int hf_usbll_addr;
+static int hf_usbll_transfer_fragments;
+static int hf_usbll_transfer_fragment;
+static int hf_usbll_transfer_fragment_overlap;
+static int hf_usbll_transfer_fragment_overlap_conflicts;
+static int hf_usbll_transfer_fragment_multiple_tails;
+static int hf_usbll_transfer_fragment_too_long_fragment;
+static int hf_usbll_transfer_fragment_error;
+static int hf_usbll_transfer_fragment_count;
+static int hf_usbll_transfer_reassembled_in;
+static int hf_usbll_transfer_reassembled_length;
 /* Fields defined by USB 2.0 ECN: Link Power Management (LPM) and
  * USB 2.0 ECN Errata for Link Power Management 9/28/2011
  */
-static int hf_usbll_subpid = -1;
-static int hf_usbll_lpm_link_state = -1;
-static int hf_usbll_lpm_besl = -1;
-static int hf_usbll_lpm_remote_wake = -1;
-static int hf_usbll_lpm_reserved = -1;
+static int hf_usbll_subpid;
+static int hf_usbll_lpm_link_state;
+static int hf_usbll_lpm_besl;
+static int hf_usbll_lpm_remote_wake;
+static int hf_usbll_lpm_reserved;
 
-static int ett_usbll = -1;
-static int ett_usbll_transfer_fragment = -1;
-static int ett_usbll_transfer_fragments = -1;
+static int ett_usbll;
+static int ett_usbll_transfer_fragment;
+static int ett_usbll_transfer_fragments;
 
 static const fragment_items usbll_frag_items = {
     /* Fragment subtrees */
@@ -104,17 +104,17 @@ static const fragment_items usbll_frag_items = {
     "USB transfer fragments"
 };
 
-static expert_field ei_invalid_pid = EI_INIT;
-static expert_field ei_invalid_subpid = EI_INIT;
-static expert_field ei_conflicting_subpid = EI_INIT;
-static expert_field ei_undecoded = EI_INIT;
-static expert_field ei_wrong_crc5 = EI_INIT;
-static expert_field ei_wrong_split_crc5 = EI_INIT;
-static expert_field ei_wrong_crc16 = EI_INIT;
-static expert_field ei_invalid_s = EI_INIT;
-static expert_field ei_invalid_e_u = EI_INIT;
-static expert_field ei_invalid_pid_sequence = EI_INIT;
-static expert_field ei_invalid_setup_data = EI_INIT;
+static expert_field ei_invalid_pid;
+static expert_field ei_invalid_subpid;
+static expert_field ei_conflicting_subpid;
+static expert_field ei_undecoded;
+static expert_field ei_wrong_crc5;
+static expert_field ei_wrong_split_crc5;
+static expert_field ei_wrong_crc16;
+static expert_field ei_invalid_s;
+static expert_field ei_invalid_e_u;
+static expert_field ei_invalid_pid_sequence;
+static expert_field ei_invalid_setup_data;
 
 static int usbll_address_type = -1;
 
diff --git a/epan/dissectors/packet-usbms-bot.c b/epan/dissectors/packet-usbms-bot.c
index d5d31fc0f2..ef1793b288 100644
--- a/epan/dissectors/packet-usbms-bot.c
+++ b/epan/dissectors/packet-usbms-bot.c
@@ -19,24 +19,24 @@ void proto_reg_handoff_usbms_bot(void);
 #define IF_PROTOCOL_BULK_ONLY 0x50
 
 /* protocols and header fields */
-static int proto_usbms_bot = -1;
-static int hf_usbms_bot_dCBWSignature = -1;
-static int hf_usbms_bot_dCBWTag = -1;
-static int hf_usbms_bot_dCBWDataTransferLength = -1;
-static int hf_usbms_bot_dCBWFlags = -1;
-static int hf_usbms_bot_dCBWTarget = -1;
-static int hf_usbms_bot_dCBWLUN = -1;
-static int hf_usbms_bot_dCBWCBLength = -1;
-static int hf_usbms_bot_dCSWSignature = -1;
-static int hf_usbms_bot_dCSWDataResidue = -1;
-static int hf_usbms_bot_dCSWStatus = -1;
-static int hf_usbms_bot_request = -1;
-static int hf_usbms_bot_value = -1;
-static int hf_usbms_bot_index = -1;
-static int hf_usbms_bot_length = -1;
-static int hf_usbms_bot_maxlun = -1;
-
-static gint ett_usbms_bot = -1;
+static int proto_usbms_bot;
+static int hf_usbms_bot_dCBWSignature;
+static int hf_usbms_bot_dCBWTag;
+static int hf_usbms_bot_dCBWDataTransferLength;
+static int hf_usbms_bot_dCBWFlags;
+static int hf_usbms_bot_dCBWTarget;
+static int hf_usbms_bot_dCBWLUN;
+static int hf_usbms_bot_dCBWCBLength;
+static int hf_usbms_bot_dCSWSignature;
+static int hf_usbms_bot_dCSWDataResidue;
+static int hf_usbms_bot_dCSWStatus;
+static int hf_usbms_bot_request;
+static int hf_usbms_bot_value;
+static int hf_usbms_bot_index;
+static int hf_usbms_bot_length;
+static int hf_usbms_bot_maxlun;
+
+static gint ett_usbms_bot;
 
 static dissector_handle_t usbms_bot_bulk_handle;
 static dissector_handle_t usbms_bot_control_handle;
diff --git a/epan/dissectors/packet-usbms-uasp.c b/epan/dissectors/packet-usbms-uasp.c
index d3df7fe464..0c42bbc31f 100644
--- a/epan/dissectors/packet-usbms-uasp.c
+++ b/epan/dissectors/packet-usbms-uasp.c
@@ -23,30 +23,30 @@ void proto_reg_handoff_uasp(void);
 static dissector_handle_t uasp_descriptor_handle;
 static dissector_handle_t uasp_bulk_handle;
 
-static int proto_uasp = -1;
-
-static int hf_pipe_usage_descr_pipe_id = -1;
-static int hf_uas_iu_id = -1;
-static int hf_uas_tag = -1;
-static int hf_uas_cmd_command_priority = -1;
-static int hf_uas_cmd_task_attribute = -1;
-static int hf_uas_cmd_additional_cdb_length = -1;
-static int hf_uas_sense_status_qualifier = -1;
-static int hf_uas_sense_status = -1;
-static int hf_uas_sense_length = -1;
-static int hf_uas_response_additional_info = -1;
-static int hf_uas_response_code = -1;
-static int hf_uas_taskmgmt_function = -1;
-static int hf_uas_taskmgmt_tag_of_managed_task = -1;
-static int hf_uas_tag_started_frame = -1;
-static int hf_uas_tag_completed_frame = -1;
-static int hf_uas_tag_read_ready_frame = -1;
-static int hf_uas_tag_write_ready_frame = -1;
-static int hf_uas_tag_data_recv_frame = -1;
-static int hf_uas_tag_data_sent_frame = -1;
-
-static int ett_uasp = -1;
-static int ett_uasp_desc = -1;
+static int proto_uasp;
+
+static int hf_pipe_usage_descr_pipe_id;
+static int hf_uas_iu_id;
+static int hf_uas_tag;
+static int hf_uas_cmd_command_priority;
+static int hf_uas_cmd_task_attribute;
+static int hf_uas_cmd_additional_cdb_length;
+static int hf_uas_sense_status_qualifier;
+static int hf_uas_sense_status;
+static int hf_uas_sense_length;
+static int hf_uas_response_additional_info;
+static int hf_uas_response_code;
+static int hf_uas_taskmgmt_function;
+static int hf_uas_taskmgmt_tag_of_managed_task;
+static int hf_uas_tag_started_frame;
+static int hf_uas_tag_completed_frame;
+static int hf_uas_tag_read_ready_frame;
+static int hf_uas_tag_write_ready_frame;
+static int hf_uas_tag_data_recv_frame;
+static int hf_uas_tag_data_sent_frame;
+
+static int ett_uasp;
+static int ett_uasp_desc;
 
 #define DT_PIPE_USAGE 0x24
 
diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c
index 164aca377b..af0b0571f0 100644
--- a/epan/dissectors/packet-user_encap.c
+++ b/epan/dissectors/packet-user_encap.c
@@ -60,9 +60,9 @@ static const value_string user_dlts[] = {
     { WTAP_ENCAP_USER15, "User 15 (DLT=162)"},
     { 0, NULL }
 };
-static int proto_user_encap = -1;
+static int proto_user_encap;
 
-static expert_field ei_user_encap_not_handled = EI_INIT;
+static expert_field ei_user_encap_not_handled;
 
 static user_encap_t* encaps = NULL;
 static guint num_encaps = 0;
diff --git a/epan/dissectors/packet-userlog.c b/epan/dissectors/packet-userlog.c
index 1671440d3a..edd632922e 100644
--- a/epan/dissectors/packet-userlog.c
+++ b/epan/dissectors/packet-userlog.c
@@ -31,43 +31,43 @@ void proto_reg_handoff_userlog(void);
 
 static dissector_handle_t userlog_handle;
 
-static int proto_userlog           = -1;
-
-static int hf_userlog_version      = -1;
-static int hf_userlog_logtype      = -1;
-static int hf_userlog_count        = -1;
-static int hf_userlog_timestamp    = -1;
-static int hf_userlog_header_reserved = -1;
-
-static int hf_userlog_proto        = -1;
-static int hf_userlog_Operator     = -1;
-static int hf_userlog_IPVerion     = -1;
-static int hf_userlog_IPToS        = -1;
-
-static int hf_userlog_SourceIP     = -1;
-static int hf_userlog_SrcNatIP     = -1;
-static int hf_userlog_DestIP       = -1;
-static int hf_userlog_DestNatIP    = -1;
-static int hf_userlog_SrcPort      = -1;
-static int hf_userlog_SrcNatPort   = -1;
-static int hf_userlog_DestPort     = -1;
-static int hf_userlog_DestNatPort  = -1;
-
-static int hf_userlog_StartTime    = -1;
-static int hf_userlog_EndTime      = -1;
-
-static int hf_userlog_InTotalPkg   = -1;
-static int hf_userlog_InTotalByte  = -1;
-static int hf_userlog_OutTotalPkg  = -1;
-static int hf_userlog_OutTotalByte = -1;
-
-static int hf_userlog_Reserved1    = -1;
-static int hf_userlog_Reserved2    = -1;
-static int hf_userlog_Reserved3    = -1;
-
-static gint ett_userlog            = -1;
-static gint ett_userlog_header     = -1;
-static gint ett_userlog_log        = -1;
+static int proto_userlog;
+
+static int hf_userlog_version;
+static int hf_userlog_logtype;
+static int hf_userlog_count;
+static int hf_userlog_timestamp;
+static int hf_userlog_header_reserved;
+
+static int hf_userlog_proto;
+static int hf_userlog_Operator;
+static int hf_userlog_IPVerion;
+static int hf_userlog_IPToS;
+
+static int hf_userlog_SourceIP;
+static int hf_userlog_SrcNatIP;
+static int hf_userlog_DestIP;
+static int hf_userlog_DestNatIP;
+static int hf_userlog_SrcPort;
+static int hf_userlog_SrcNatPort;
+static int hf_userlog_DestPort;
+static int hf_userlog_DestNatPort;
+
+static int hf_userlog_StartTime;
+static int hf_userlog_EndTime;
+
+static int hf_userlog_InTotalPkg;
+static int hf_userlog_InTotalByte;
+static int hf_userlog_OutTotalPkg;
+static int hf_userlog_OutTotalByte;
+
+static int hf_userlog_Reserved1;
+static int hf_userlog_Reserved2;
+static int hf_userlog_Reserved3;
+
+static gint ett_userlog;
+static gint ett_userlog_header;
+static gint ett_userlog_log;
 
 static const value_string version[] = {
 { 1, "V1" },
diff --git a/epan/dissectors/packet-uts.c b/epan/dissectors/packet-uts.c
index ecf7a4efba..995a491eef 100644
--- a/epan/dissectors/packet-uts.c
+++ b/epan/dissectors/packet-uts.c
@@ -36,21 +36,21 @@
 
 void proto_register_uts(void);
 
-static int	proto_uts	= -1;
-static gint	ett_uts		= -1;
-static gint	ett_header_uts	= -1;
-static gint	ett_trailer_uts	= -1;
-static int	hf_rid		= -1;
-static int	hf_sid		= -1;
-static int	hf_did		= -1;
-static int	hf_retxrequest	= -1;
-static int	hf_ack		= -1;
-static int	hf_replyrequest	= -1;
-static int	hf_busy		= -1;
-static int	hf_notbusy	= -1;
-static int	hf_msgwaiting	= -1;
-static int	hf_function	= -1;
-static int	hf_data		= -1;
+static int	proto_uts;
+static gint	ett_uts;
+static gint	ett_header_uts;
+static gint	ett_trailer_uts;
+static int	hf_rid;
+static int	hf_sid;
+static int	hf_did;
+static int	hf_retxrequest;
+static int	hf_ack;
+static int	hf_replyrequest;
+static int	hf_busy;
+static int	hf_notbusy;
+static int	hf_msgwaiting;
+static int	hf_function;
+static int	hf_data;
 
 #define MATCH	(1)
 #define FETCH	(2)
diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c
index 01661c4d4c..c814064f76 100644
--- a/epan/dissectors/packet-v120.c
+++ b/epan/dissectors/packet-v120.c
@@ -16,46 +16,46 @@
 
 void proto_register_v120(void);
 
-static int proto_v120 = -1;
-static int hf_v120_address = -1;
-static int hf_v120_rc = -1;
-static int hf_v120_lli = -1;
-static int hf_v120_ea0 = -1;
-static int hf_v120_ea1 = -1;
-static int hf_v120_control = -1;
-static int hf_v120_n_r = -1;
-static int hf_v120_n_s = -1;
-static int hf_v120_p = -1;
-static int hf_v120_p_ext = -1;
-static int hf_v120_f = -1;
-static int hf_v120_f_ext = -1;
-static int hf_v120_s_ftype = -1;
-static int hf_v120_u_modifier_cmd = -1;
-static int hf_v120_u_modifier_resp = -1;
-static int hf_v120_ftype_i = -1;
-static int hf_v120_ftype_s_u = -1;
-static int hf_v120_ftype_s_u_ext = -1;
-static int hf_v120_header8 = -1;
-static int hf_v120_header_ext8 = -1;
-static int hf_v120_header_break8 = -1;
-static int hf_v120_header_error_control8 = -1;
-static int hf_v120_header_segb8 = -1;
-static int hf_v120_header_segf8 = -1;
-static int hf_v120_header16 = -1;
-static int hf_v120_header_ext16 = -1;
-static int hf_v120_header_break16 = -1;
-static int hf_v120_header_error_control16 = -1;
-static int hf_v120_header_segb16 = -1;
-static int hf_v120_header_segf16 = -1;
-static int hf_v120_header_e = -1;
-static int hf_v120_header_dr = -1;
-static int hf_v120_header_sr = -1;
-static int hf_v120_header_rr = -1;
+static int proto_v120;
+static int hf_v120_address;
+static int hf_v120_rc;
+static int hf_v120_lli;
+static int hf_v120_ea0;
+static int hf_v120_ea1;
+static int hf_v120_control;
+static int hf_v120_n_r;
+static int hf_v120_n_s;
+static int hf_v120_p;
+static int hf_v120_p_ext;
+static int hf_v120_f;
+static int hf_v120_f_ext;
+static int hf_v120_s_ftype;
+static int hf_v120_u_modifier_cmd;
+static int hf_v120_u_modifier_resp;
+static int hf_v120_ftype_i;
+static int hf_v120_ftype_s_u;
+static int hf_v120_ftype_s_u_ext;
+static int hf_v120_header8;
+static int hf_v120_header_ext8;
+static int hf_v120_header_break8;
+static int hf_v120_header_error_control8;
+static int hf_v120_header_segb8;
+static int hf_v120_header_segf8;
+static int hf_v120_header16;
+static int hf_v120_header_ext16;
+static int hf_v120_header_break16;
+static int hf_v120_header_error_control16;
+static int hf_v120_header_segb16;
+static int hf_v120_header_segf16;
+static int hf_v120_header_e;
+static int hf_v120_header_dr;
+static int hf_v120_header_sr;
+static int hf_v120_header_rr;
 
-static gint ett_v120 = -1;
-static gint ett_v120_address = -1;
-static gint ett_v120_control = -1;
-static gint ett_v120_header = -1;
+static gint ett_v120;
+static gint ett_v120_address;
+static gint ett_v120_control;
+static gint ett_v120_header;
 
 static int dissect_v120_header(tvbuff_t *tvb, int offset, proto_tree *tree);
 
diff --git a/epan/dissectors/packet-v150fw.c b/epan/dissectors/packet-v150fw.c
index 782d9708d7..75d0665433 100644
--- a/epan/dissectors/packet-v150fw.c
+++ b/epan/dissectors/packet-v150fw.c
@@ -23,49 +23,49 @@ void proto_register_v150fw(void);
 /* Initialize the protocol & registered fields
  * Look familiar?  This is in the same format as an NTE (named telephone event) from RFC 2833:
  */
-static int proto_v150fw =                   -1;
-
-static int hf_v150fw_event_id =             -1; /* 6 bits */
-static int hf_v150fw_force_response_bit =   -1;
-static int hf_v150fw_extension_bit =        -1;
-
-static int hf_v150fw_reason_id_code =                       -1; /* value & string */
-
-static int hf_v150fw_reason_id_code_info =                  -1; /* 16 bits */
-
-static int hf_v150fw_ric_info_mod_avail =                   -1; /* ric = 1,2 */
-static int hf_v150fw_cm_jm_mod_avail_pcm_mode =             -1;
-static int hf_v150fw_cm_jm_mod_avail_v34_duplex =           -1;
-static int hf_v150fw_cm_jm_mod_avail_v34_half_duplex =      -1;
-static int hf_v150fw_cm_jm_mod_avail_v32_v32bis =           -1;
-static int hf_v150fw_cm_jm_mod_avail_v22_v22bis =           -1;
-static int hf_v150fw_cm_jm_mod_avail_v17 =                  -1;
-static int hf_v150fw_cm_jm_mod_avail_v29_half_duplex =      -1;
-static int hf_v150fw_cm_jm_mod_avail_v27ter =               -1;
-static int hf_v150fw_cm_jm_mod_avail_v26ter =               -1;
-static int hf_v150fw_cm_jm_mod_avail_v26bis =               -1;
-static int hf_v150fw_cm_jm_mod_avail_v23_duplex =           -1;
-static int hf_v150fw_cm_jm_mod_avail_v23_half_duplex =      -1;
-static int hf_v150fw_cm_jm_mod_avail_v21 =                  -1;
-static int hf_v150fw_cm_jm_mod_avail_v90_or_v92_analog =    -1;
-static int hf_v150fw_cm_jm_mod_avail_v90_or_v92_digital =   -1;
-static int hf_v150fw_cm_jm_mod_avail_v91 =                  -1;
-
-static int hf_v150fw_ric_info_timeout =                     -1; /* ric= 18 */
-static int hf_v150fw_ric_info_timeout_vendor =              -1;
-
-static int hf_v150fw_ric_info_cleardown =                   -1; /* ric = 20 */
-static int hf_v150fw_ric_info_cleardown_reserved =          -1;
-static int hf_v150fw_ric_info_cleardown_vendor_tag =        -1; /* extension fields */
-static int hf_v150fw_ric_info_cleardown_vendor_info =       -1;
-
-static int hf_v150fw_reserved =             -1; /* 5 bits */
-static int hf_v150fw_extension_len =        -1; /* 11 bits */
-static int hf_v150fw_remainder =            -1;
+static int proto_v150fw;
+
+static int hf_v150fw_event_id; /* 6 bits */
+static int hf_v150fw_force_response_bit;
+static int hf_v150fw_extension_bit;
+
+static int hf_v150fw_reason_id_code; /* value & string */
+
+static int hf_v150fw_reason_id_code_info; /* 16 bits */
+
+static int hf_v150fw_ric_info_mod_avail; /* ric = 1,2 */
+static int hf_v150fw_cm_jm_mod_avail_pcm_mode;
+static int hf_v150fw_cm_jm_mod_avail_v34_duplex;
+static int hf_v150fw_cm_jm_mod_avail_v34_half_duplex;
+static int hf_v150fw_cm_jm_mod_avail_v32_v32bis;
+static int hf_v150fw_cm_jm_mod_avail_v22_v22bis;
+static int hf_v150fw_cm_jm_mod_avail_v17;
+static int hf_v150fw_cm_jm_mod_avail_v29_half_duplex;
+static int hf_v150fw_cm_jm_mod_avail_v27ter;
+static int hf_v150fw_cm_jm_mod_avail_v26ter;
+static int hf_v150fw_cm_jm_mod_avail_v26bis;
+static int hf_v150fw_cm_jm_mod_avail_v23_duplex;
+static int hf_v150fw_cm_jm_mod_avail_v23_half_duplex;
+static int hf_v150fw_cm_jm_mod_avail_v21;
+static int hf_v150fw_cm_jm_mod_avail_v90_or_v92_analog;
+static int hf_v150fw_cm_jm_mod_avail_v90_or_v92_digital;
+static int hf_v150fw_cm_jm_mod_avail_v91;
+
+static int hf_v150fw_ric_info_timeout; /* ric= 18 */
+static int hf_v150fw_ric_info_timeout_vendor;
+
+static int hf_v150fw_ric_info_cleardown; /* ric = 20 */
+static int hf_v150fw_ric_info_cleardown_reserved;
+static int hf_v150fw_ric_info_cleardown_vendor_tag; /* extension fields */
+static int hf_v150fw_ric_info_cleardown_vendor_info;
+
+static int hf_v150fw_reserved; /* 5 bits */
+static int hf_v150fw_extension_len; /* 11 bits */
+static int hf_v150fw_remainder;
 
 /* initialize the subtree pointers */
-static gint ett_v150fw = -1;
-static gint ett_available_modulations = -1;
+static gint ett_v150fw;
+static gint ett_available_modulations;
 
 /* for some "range_string"s, there's only one value in the range  */
 #define V150FW_VALUE_RANGE(a) a,a
diff --git a/epan/dissectors/packet-v52.c b/epan/dissectors/packet-v52.c
index 9b60e4d1c6..7eb42b749d 100644
--- a/epan/dissectors/packet-v52.c
+++ b/epan/dissectors/packet-v52.c
@@ -24,91 +24,91 @@
 
 void proto_register_v52(void);
 
-static int proto_v52                           = -1;
-static int hf_v52_discriminator                = -1;
-
-static gint ett_v52                            = -1;
-static gint ett_v52_info                       = -1;
-
-/* static int hf_v52_address                      = -1; */
-/* static int hf_v52_low_address                  = -1; */
-
-static int hf_v52_msg_type                     = -1;
-static int hf_v52_info_element                 = -1;
-
-static int hf_v52_isdn_address                 = -1;
-static int hf_v52_isdn_low_address             = -1;
-static int hf_v52_pstn_address                 = -1;
-static int hf_v52_pstn_low_address             = -1;
-static int hf_v52_link_address                 = -1;
-static int hf_v52_link_low_address             = -1;
-static int hf_v52_bcc_address                  = -1;
-static int hf_v52_bcc_low_address              = -1;
-static int hf_v52_prot_address                 = -1;
-static int hf_v52_prot_low_address             = -1;
-/* static int hf_v52_ctrl_address                 = -1; */
-/* static int hf_v52_ctrl_low_address             = -1; */
-static int hf_v52_cadenced_ring                = -1;
-static int hf_v52_pulse_notification           = -1;
-static int hf_v52_info_length                  = -1;
+static int proto_v52;
+static int hf_v52_discriminator;
+
+static gint ett_v52;
+static gint ett_v52_info;
+
+/* static int hf_v52_address; */
+/* static int hf_v52_low_address; */
+
+static int hf_v52_msg_type;
+static int hf_v52_info_element;
+
+static int hf_v52_isdn_address;
+static int hf_v52_isdn_low_address;
+static int hf_v52_pstn_address;
+static int hf_v52_pstn_low_address;
+static int hf_v52_link_address;
+static int hf_v52_link_low_address;
+static int hf_v52_bcc_address;
+static int hf_v52_bcc_low_address;
+static int hf_v52_prot_address;
+static int hf_v52_prot_low_address;
+/* static int hf_v52_ctrl_address; */
+/* static int hf_v52_ctrl_low_address; */
+static int hf_v52_cadenced_ring;
+static int hf_v52_pulse_notification;
+static int hf_v52_info_length;
 
 /*PSTN Message*/
-static int hf_v52_line_info                    = -1;
-static int hf_v52_pulse_type                   = -1;
-static int hf_v52_suppression_indicator        = -1;
-static int hf_v52_pulse_duration               = -1;
-static int hf_v52_ack_request_indicator        = -1;
-static int hf_v52_number_of_pulses             = -1;
-static int hf_v52_steady_signal                = -1;
-static int hf_v52_auto_signalling_sequence     = -1;
-static int hf_v52_sequence_response            = -1;
-static int hf_v52_digit_ack                    = -1;
-static int hf_v52_digit_spare                  = -1;
-static int hf_v52_digit_info                   = -1;
-static int hf_v52_res_unavailable              = -1;
-static int hf_v52_state                        = -1;
-static int hf_v52_cause_type                   = -1;
-static int hf_v52_pstn_sequence_number         = -1;
-static int hf_v52_duration_type                = -1;
+static int hf_v52_line_info;
+static int hf_v52_pulse_type;
+static int hf_v52_suppression_indicator;
+static int hf_v52_pulse_duration;
+static int hf_v52_ack_request_indicator;
+static int hf_v52_number_of_pulses;
+static int hf_v52_steady_signal;
+static int hf_v52_auto_signalling_sequence;
+static int hf_v52_sequence_response;
+static int hf_v52_digit_ack;
+static int hf_v52_digit_spare;
+static int hf_v52_digit_info;
+static int hf_v52_res_unavailable;
+static int hf_v52_state;
+static int hf_v52_cause_type;
+static int hf_v52_pstn_sequence_number;
+static int hf_v52_duration_type;
 /*Link control*/
-static int hf_v52_link_control_function        = -1;
+static int hf_v52_link_control_function;
 /*Protection protocol*/
-static int hf_v52_rejection_cause              = -1;
-static int hf_v52_error_cause                  = -1;
-static int hf_v52_diagnostic_msg               = -1;
-static int hf_v52_diagnostic_element           = -1;
+static int hf_v52_rejection_cause;
+static int hf_v52_error_cause;
+static int hf_v52_diagnostic_msg;
+static int hf_v52_diagnostic_element;
 /*BCC protocol*/
-static int hf_v52_pstn_user_port_id            = -1;
-static int hf_v52_pstn_user_port_id_lower      = -1;
+static int hf_v52_pstn_user_port_id;
+static int hf_v52_pstn_user_port_id_lower;
 
-static int hf_v52_isdn_user_port_id            = -1;
-static int hf_v52_isdn_user_port_id_lower      = -1;
+static int hf_v52_isdn_user_port_id;
+static int hf_v52_isdn_user_port_id_lower;
 
-static int hf_v52_isdn_user_port_ts_num        = -1;
-static int hf_v52_override                     = -1;
-static int hf_v52_reject_cause_type            = -1;
-static int hf_v52_bcc_protocol_error_cause     = -1;
-static int hf_v52_connection_incomplete_reason = -1;
+static int hf_v52_isdn_user_port_ts_num;
+static int hf_v52_override;
+static int hf_v52_reject_cause_type;
+static int hf_v52_bcc_protocol_error_cause;
+static int hf_v52_connection_incomplete_reason;
 
-static int hf_v52_diagnostic_message           = -1;
-static int hf_v52_diagnostic_information       = -1;
+static int hf_v52_diagnostic_message;
+static int hf_v52_diagnostic_information;
 
 /*Control protocol*/
-static int hf_v52_control_function_element     = -1;
-static int hf_v52_control_function_id          = -1;
-static int hf_v52_variant                      = -1;
-static int hf_v52_if_up_id                     = -1;
-static int hf_v52_if_id                        = -1;
-static int hf_v52_if_low_id                    = -1;
-static int hf_v52_if_all_id                    = -1;
-static int hf_v52_performance_grading          = -1;
-static int hf_v52_cp_rejection_cause           = -1;
-
-static int hf_v52_v5_link_id                   = -1;
-static int hf_v52_v5_time_slot                 = -1;
-static int hf_v52_sequence_number              = -1;
-
-static int hf_v52_v5_multi_slot_elements       = -1;
+static int hf_v52_control_function_element;
+static int hf_v52_control_function_id;
+static int hf_v52_variant;
+static int hf_v52_if_up_id;
+static int hf_v52_if_id;
+static int hf_v52_if_low_id;
+static int hf_v52_if_all_id;
+static int hf_v52_performance_grading;
+static int hf_v52_cp_rejection_cause;
+
+static int hf_v52_v5_link_id;
+static int hf_v52_v5_time_slot;
+static int hf_v52_sequence_number;
+
+static int hf_v52_v5_multi_slot_elements;
 
 static int message_type_tmp                    = -1;
 
diff --git a/epan/dissectors/packet-v5dl.c b/epan/dissectors/packet-v5dl.c
index 2066c1a395..9c53f4256d 100644
--- a/epan/dissectors/packet-v5dl.c
+++ b/epan/dissectors/packet-v5dl.c
@@ -26,38 +26,38 @@
 
 void proto_register_v5dl(void);
 
-static int proto_v5dl = -1;
-static int hf_v5dl_direction = -1;
-/* static int hf_v5dl_address = -1; */
-static int hf_v5dl_ef = -1;
-static int hf_v5dl_eah = -1;
-static int hf_v5dl_cr = -1;
-static int hf_v5dl_ea1 = -1;
-static int hf_v5dl_eal = -1;
-static int hf_v5dl_ea2 = -1;
-static int hf_v5dl_control = -1;
-static int hf_v5dl_n_r = -1;
-static int hf_v5dl_n_s = -1;
-static int hf_v5dl_p = -1;
-static int hf_v5dl_p_ext = -1;
-static int hf_v5dl_f = -1;
-static int hf_v5dl_f_ext = -1;
-static int hf_v5dl_s_ftype = -1;
-static int hf_v5dl_u_modifier_cmd = -1;
-static int hf_v5dl_u_modifier_resp = -1;
-static int hf_v5dl_ftype_i = -1;
-static int hf_v5dl_ftype_s_u = -1;
-static int hf_v5dl_ftype_s_u_ext = -1;
+static int proto_v5dl;
+static int hf_v5dl_direction;
+/* static int hf_v5dl_address; */
+static int hf_v5dl_ef;
+static int hf_v5dl_eah;
+static int hf_v5dl_cr;
+static int hf_v5dl_ea1;
+static int hf_v5dl_eal;
+static int hf_v5dl_ea2;
+static int hf_v5dl_control;
+static int hf_v5dl_n_r;
+static int hf_v5dl_n_s;
+static int hf_v5dl_p;
+static int hf_v5dl_p_ext;
+static int hf_v5dl_f;
+static int hf_v5dl_f_ext;
+static int hf_v5dl_s_ftype;
+static int hf_v5dl_u_modifier_cmd;
+static int hf_v5dl_u_modifier_resp;
+static int hf_v5dl_ftype_i;
+static int hf_v5dl_ftype_s_u;
+static int hf_v5dl_ftype_s_u_ext;
 #if 0
-static int hf_v5dl_checksum = -1;
-static int hf_v5dl_checksum_status = -1;
+static int hf_v5dl_checksum;
+static int hf_v5dl_checksum_status;
 #endif
-static gint ett_v5dl = -1;
-static gint ett_v5dl_address = -1;
-static gint ett_v5dl_control = -1;
-/* static gint ett_v5dl_checksum = -1; */
+static gint ett_v5dl;
+static gint ett_v5dl_address;
+static gint ett_v5dl_control;
+/* static gint ett_v5dl_checksum; */
 
-static expert_field ei_v5dl_checksum = EI_INIT;
+static expert_field ei_v5dl_checksum;
 
 static dissector_handle_t v52_handle;
 
diff --git a/epan/dissectors/packet-v5ef.c b/epan/dissectors/packet-v5ef.c
index 89afcd1aed..c272e5248b 100644
--- a/epan/dissectors/packet-v5ef.c
+++ b/epan/dissectors/packet-v5ef.c
@@ -25,16 +25,16 @@
 void proto_register_v5ef(void);
 void proto_reg_handoff_v5ef(void);
 
-static int proto_v5ef = -1;
-static int hf_v5ef_direction = -1;
-static int hf_v5ef_address = -1;
-static int hf_v5ef_eah = -1;
-static int hf_v5ef_ea1 = -1;
-static int hf_v5ef_eal = -1;
-static int hf_v5ef_ea2 = -1;
-
-static gint ett_v5ef = -1;
-static gint ett_v5ef_address = -1;
+static int proto_v5ef;
+static int hf_v5ef_direction;
+static int hf_v5ef_address;
+static int hf_v5ef_eah;
+static int hf_v5ef_ea1;
+static int hf_v5ef_eal;
+static int hf_v5ef_ea2;
+
+static gint ett_v5ef;
+static gint ett_v5ef_address;
 
 static dissector_handle_t v5dl_handle, lapd_phdr_handle, v5ef_handle;
 
diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c
index 6844135deb..9a06ad1684 100644
--- a/epan/dissectors/packet-v5ua.c
+++ b/epan/dissectors/packet-v5ua.c
@@ -44,64 +44,64 @@ static int paddingl = 0;
 static int dlci_efa = -1;
 
 /* Initialize the protocol and registered fields */
-static int proto_v5ua                    = -1;
+static int proto_v5ua;
 
 static dissector_handle_t q931_handle;
 static dissector_handle_t v52_handle;
 
 /* common msg-header */
-static int hf_version               = -1;
-static int hf_reserved              = -1;
-static int hf_msg_class             = -1;
-static int hf_msg_type              = -1;
-/* static int hf_msg_type_id        = -1; */
-static int hf_msg_length            = -1;
+static int hf_version;
+static int hf_reserved;
+static int hf_msg_class;
+static int hf_msg_type;
+/* static int hf_msg_type_id; */
+static int hf_msg_length;
 /* V5UA message header */
-static int hf_link_id               = -1;
-static int hf_chnl_id               = -1;
-static int hf_adaptation_layer_id   = -1;
-static int hf_text_if_id            = -1;
-static int hf_scn_protocol_id       = -1;
-static int hf_info_string           = -1;
-static int hf_asp_identifier        = -1;
-static int hf_dlci_zero_bit         = -1;
-static int hf_dlci_spare_bit        = -1;
-static int hf_dlci_sapi             = -1;
-static int hf_dlci_one_bit          = -1;
-static int hf_dlci_tei              = -1;
-static int hf_efa                   = -1;
-/* static int hf_spare_efa          = -1; */
+static int hf_link_id;
+static int hf_chnl_id;
+static int hf_adaptation_layer_id;
+static int hf_text_if_id;
+static int hf_scn_protocol_id;
+static int hf_info_string;
+static int hf_asp_identifier;
+static int hf_dlci_zero_bit;
+static int hf_dlci_spare_bit;
+static int hf_dlci_sapi;
+static int hf_dlci_one_bit;
+static int hf_dlci_tei;
+static int hf_efa;
+/* static int hf_spare_efa; */
 /* variable length parameter (msg) */
-static int hf_parameter_tag         = -1;
-static int hf_parameter_tag_draft   = -1;
-static int hf_parameter_length      = -1;
-static int hf_parameter_value       = -1;
-static int hf_parameter_padding     = -1;
+static int hf_parameter_tag;
+static int hf_parameter_tag_draft;
+static int hf_parameter_length;
+static int hf_parameter_value;
+static int hf_parameter_padding;
 
  /* parameter fields */
-static int hf_link_status           = -1;
-static int hf_sa_bit_id             = -1;
-static int hf_sa_bit_value          = -1;
-static int hf_diagnostic_info       = -1;
-static int hf_if_range_start        = -1;
-static int hf_if_range_end          = -1;
-static int hf_heartbeat_data        = -1;
-static int hf_traffic_mode_type     = -1;
-static int hf_error_code            = -1;
-static int hf_draft_error_code      = -1;
-static int hf_status_type           = -1;
-static int hf_status_id             = -1;
-static int hf_error_reason          = -1;
-static int hf_asp_reason            = -1;
-static int hf_tei_status            = -1;
-static int hf_tei_draft_status      = -1;
-static int hf_release_reason        = -1;
+static int hf_link_status;
+static int hf_sa_bit_id;
+static int hf_sa_bit_value;
+static int hf_diagnostic_info;
+static int hf_if_range_start;
+static int hf_if_range_end;
+static int hf_heartbeat_data;
+static int hf_traffic_mode_type;
+static int hf_error_code;
+static int hf_draft_error_code;
+static int hf_status_type;
+static int hf_status_id;
+static int hf_error_reason;
+static int hf_asp_reason;
+static int hf_tei_status;
+static int hf_tei_draft_status;
+static int hf_release_reason;
 
 /* Initialize the subtree pointers */
-static gint ett_v5ua              = -1;
-static gint ett_v5ua_common_header= -1;
-static gint ett_v5ua_parameter    = -1;
-static gint ett_v5ua_layer3       = -1;
+static gint ett_v5ua;
+static gint ett_v5ua_common_header;
+static gint ett_v5ua_parameter;
+static gint ett_v5ua_layer3;
 
 #define RFC             0x1
 #define DRAFT           0x2
diff --git a/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c
index b0b6b9c0f2..65fd651d0f 100644
--- a/epan/dissectors/packet-vcdu.c
+++ b/epan/dissectors/packet-vcdu.c
@@ -22,42 +22,42 @@ void proto_register_vcdu(void);
 void proto_reg_handoff_vcdu(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_vcdu = -1;
-
-static int hf_smex_gsc = -1;
-/* static int hf_smex_unused = -1; */
-static int hf_smex_version = -1;
-static int hf_smex_framelen = -1;
-static int hf_smex_rs_error = -1;
-static int hf_smex_rs_enable = -1;
-static int hf_smex_crc_enable = -1;
-static int hf_smex_crc_error = -1;
-static int hf_smex_mcs_enable = -1;
-static int hf_smex_mcs_num_error = -1;
-static int hf_smex_data_inv = -1;
-static int hf_smex_frame_sync = -1;
-static int hf_smex_data_dir = -1;
-static int hf_smex_data_class = -1;
-static int hf_smex_pb5 = -1;
-static int hf_smex_jday = -1;
-static int hf_smex_seconds = -1;
-static int hf_smex_msec = -1;
-/* static int hf_smex_spare = -1; */
-
-static int hf_vcdu_version = -1;
-static int hf_vcdu_sp_id = -1;
-static int hf_vcdu_vc_id = -1;
-static int hf_vcdu_seq = -1;
-static int hf_vcdu_replay = -1;
+static int proto_vcdu;
+
+static int hf_smex_gsc;
+/* static int hf_smex_unused; */
+static int hf_smex_version;
+static int hf_smex_framelen;
+static int hf_smex_rs_error;
+static int hf_smex_rs_enable;
+static int hf_smex_crc_enable;
+static int hf_smex_crc_error;
+static int hf_smex_mcs_enable;
+static int hf_smex_mcs_num_error;
+static int hf_smex_data_inv;
+static int hf_smex_frame_sync;
+static int hf_smex_data_dir;
+static int hf_smex_data_class;
+static int hf_smex_pb5;
+static int hf_smex_jday;
+static int hf_smex_seconds;
+static int hf_smex_msec;
+/* static int hf_smex_spare; */
+
+static int hf_vcdu_version;
+static int hf_vcdu_sp_id;
+static int hf_vcdu_vc_id;
+static int hf_vcdu_seq;
+static int hf_vcdu_replay;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_vcdu_data = -1;
-static int hf_vcdu_ground_receipt_time = -1;
-static int hf_vcdu_ccsds_all_fill = -1;
-static int hf_vcdu_bitream_all_fill = -1;
-static int hf_vcdu_bitream_all_data = -1;
-static int hf_vcdu_bitream_all_data_anomaly = -1;
-static int hf_vcdu_ccsds_continuation_packet = -1;
+static int hf_vcdu_data;
+static int hf_vcdu_ground_receipt_time;
+static int hf_vcdu_ccsds_all_fill;
+static int hf_vcdu_bitream_all_fill;
+static int hf_vcdu_bitream_all_data;
+static int hf_vcdu_bitream_all_data_anomaly;
+static int hf_vcdu_ccsds_continuation_packet;
 
 /* although technically not part of the vcdu header, the
  * first header pointer (for ccsds), and the last bit
@@ -65,19 +65,19 @@ static int hf_vcdu_ccsds_continuation_packet = -1;
  * simply adding them to the tail end of the vcdu header
  * branch rather than creating a distinct branch for them
  */
-static int hf_vcdu_fhp = -1;
-static int hf_vcdu_lbp = -1;
+static int hf_vcdu_fhp;
+static int hf_vcdu_lbp;
 
 static dissector_handle_t vcdu_handle;
 
 static dissector_handle_t ccsds_handle;
 
 /* Initialize the subtree pointers */
-static gint ett_vcdu  = -1;
-static gint ett_smex  = -1;
-static gint ett_vcduh = -1;
+static gint ett_vcdu;
+static gint ett_smex;
+static gint ett_vcduh;
 
-static expert_field ei_vcdu_fhp_too_close_to_end_of_vcdu = EI_INIT;
+static expert_field ei_vcdu_fhp_too_close_to_end_of_vcdu;
 
 /*
  * Bits in the first 16-bit header word
diff --git a/epan/dissectors/packet-vicp.c b/epan/dissectors/packet-vicp.c
index 001a5d7421..57c0e97718 100644
--- a/epan/dissectors/packet-vicp.c
+++ b/epan/dissectors/packet-vicp.c
@@ -17,14 +17,14 @@
 #include <epan/ptvcursor.h>
 
 /* registration object IDs */
-static int proto_vicp = -1;
-static int hf_vicp_operation = -1;
-static int hf_vicp_version = -1;
-static int hf_vicp_sequence = -1;
-static int hf_vicp_unused = -1;
-static int hf_vicp_length = -1;
-static int hf_vicp_data = -1;
-static gint ett_vicp = -1;
+static int proto_vicp;
+static int hf_vicp_operation;
+static int hf_vicp_version;
+static int hf_vicp_sequence;
+static int hf_vicp_unused;
+static int hf_vicp_length;
+static int hf_vicp_data;
+static gint ett_vicp;
 
 #define VICP_PORT 1861
 
diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c
index 7f0a671c4a..5b516c94f8 100644
--- a/epan/dissectors/packet-vines.c
+++ b/epan/dissectors/packet-vines.c
@@ -103,172 +103,172 @@ void proto_reg_handoff_vines_icp(void);
 
 #define UDP_PORT_VINES	573
 
-static int proto_vines_frp = -1;
-static int hf_vines_frp_flags = -1;
-static int hf_vines_frp_flags_first_fragment = -1;
-static int hf_vines_frp_flags_last_fragment = -1;
-static int hf_vines_frp_sequence_number = -1;
+static int proto_vines_frp;
+static int hf_vines_frp_flags;
+static int hf_vines_frp_flags_first_fragment;
+static int hf_vines_frp_flags_last_fragment;
+static int hf_vines_frp_sequence_number;
 
-static gint ett_vines_frp = -1;
-static gint ett_vines_frp_flags = -1;
+static gint ett_vines_frp;
+static gint ett_vines_frp_flags;
 
 static dissector_handle_t vines_frp_handle, vines_frp_new_handle;
 
-static int proto_vines_llc = -1;
-static int hf_vines_llc_packet_type = -1;
+static int proto_vines_llc;
+static int hf_vines_llc_packet_type;
 
-static gint ett_vines_llc = -1;
+static gint ett_vines_llc;
 
 static dissector_handle_t vines_llc_handle;
 
-static int proto_vines_ip = -1;
-static int hf_vines_ip_protocol = -1;
-static int hf_vines_ip_checksum = -1;
-static int hf_vines_ip_length = -1;
-static int hf_vines_ip_source = -1;
-static int hf_vines_ip_destination = -1;
-static int hf_vines_tctl = -1;
-static int hf_vines_tctl_node = -1;
-static int hf_vines_tctl_class = -1;
-static int hf_vines_tctl_forward_router = -1;
-static int hf_vines_tctl_metric = -1;
-static int hf_vines_tctl_notif_packet = -1;
-static int hf_vines_tctl_hop_count = -1;
-
-static gint ett_vines_ip = -1;
-static gint ett_vines_ip_tctl = -1;
+static int proto_vines_ip;
+static int hf_vines_ip_protocol;
+static int hf_vines_ip_checksum;
+static int hf_vines_ip_length;
+static int hf_vines_ip_source;
+static int hf_vines_ip_destination;
+static int hf_vines_tctl;
+static int hf_vines_tctl_node;
+static int hf_vines_tctl_class;
+static int hf_vines_tctl_forward_router;
+static int hf_vines_tctl_metric;
+static int hf_vines_tctl_notif_packet;
+static int hf_vines_tctl_hop_count;
+
+static gint ett_vines_ip;
+static gint ett_vines_ip_tctl;
 
 static dissector_handle_t vines_ip_handle;
 
-static int proto_vines_echo = -1;
+static int proto_vines_echo;
 
-static gint hf_vines_echo_data = -1;
+static gint hf_vines_echo_data;
 
-static gint ett_vines_echo = -1;
+static gint ett_vines_echo;
 
 static dissector_handle_t vines_echo_handle;
 
-static int proto_vines_ipc = -1;
-static int hf_vines_ipc_src_port = -1;
-static int hf_vines_ipc_dest_port = -1;
-static int hf_vines_ipc_packet_type = -1;
-static int hf_vines_ipc_control = -1;
-static int hf_vines_ipc_control_ack = -1;
-static int hf_vines_ipc_control_end_msg = -1;
-static int hf_vines_ipc_control_beg_msg = -1;
-static int hf_vines_ipc_control_abort_msg = -1;
-static int hf_vines_ipc_local_connection_id = -1;
-static int hf_vines_ipc_sequence_number = -1;
-static int hf_vines_ipc_length = -1;
-static int hf_vines_ipc_remote_connection_id = -1;
-static int hf_vines_ipc_ack_number = -1;
-static int hf_vines_ipc_error = -1;
-
-static gint ett_vines_ipc = -1;
-static gint ett_vines_ipc_control = -1;
+static int proto_vines_ipc;
+static int hf_vines_ipc_src_port;
+static int hf_vines_ipc_dest_port;
+static int hf_vines_ipc_packet_type;
+static int hf_vines_ipc_control;
+static int hf_vines_ipc_control_ack;
+static int hf_vines_ipc_control_end_msg;
+static int hf_vines_ipc_control_beg_msg;
+static int hf_vines_ipc_control_abort_msg;
+static int hf_vines_ipc_local_connection_id;
+static int hf_vines_ipc_sequence_number;
+static int hf_vines_ipc_length;
+static int hf_vines_ipc_remote_connection_id;
+static int hf_vines_ipc_ack_number;
+static int hf_vines_ipc_error;
+
+static gint ett_vines_ipc;
+static gint ett_vines_ipc_control;
 
 static dissector_handle_t vines_ipc_handle;
 
-static int proto_vines_spp = -1;
-static int hf_vines_spp_src_port = -1;
-static int hf_vines_spp_dest_port = -1;
-static int hf_vines_spp_packet_type = -1;
-static int hf_vines_spp_control = -1;
-static int hf_vines_spp_control_ack = -1;
-static int hf_vines_spp_control_end_msg = -1;
-static int hf_vines_spp_control_beg_msg = -1;
-static int hf_vines_spp_control_abort_msg = -1;
-static int hf_vines_spp_local_id = -1;
-static int hf_vines_spp_remote_id = -1;
-static int hf_vines_spp_seq_num = -1;
-static int hf_vines_spp_ack_num = -1;
-static int hf_vines_spp_window = -1;
-
-static gint ett_vines_spp = -1;
-static gint ett_vines_spp_control = -1;
+static int proto_vines_spp;
+static int hf_vines_spp_src_port;
+static int hf_vines_spp_dest_port;
+static int hf_vines_spp_packet_type;
+static int hf_vines_spp_control;
+static int hf_vines_spp_control_ack;
+static int hf_vines_spp_control_end_msg;
+static int hf_vines_spp_control_beg_msg;
+static int hf_vines_spp_control_abort_msg;
+static int hf_vines_spp_local_id;
+static int hf_vines_spp_remote_id;
+static int hf_vines_spp_seq_num;
+static int hf_vines_spp_ack_num;
+static int hf_vines_spp_window;
+
+static gint ett_vines_spp;
+static gint ett_vines_spp_control;
 
 static dissector_handle_t vines_spp_handle;
 
-static int proto_vines_arp = -1;
-static int hf_vines_arp_address = -1;
-static int hf_vines_arp_version = -1;
-static int hf_vines_arp_packet_type = -1;
-static int hf_vines_arp_interface_metric = -1;
-static int hf_vines_arp_sequence_number = -1;
+static int proto_vines_arp;
+static int hf_vines_arp_address;
+static int hf_vines_arp_version;
+static int hf_vines_arp_packet_type;
+static int hf_vines_arp_interface_metric;
+static int hf_vines_arp_sequence_number;
 
-static gint ett_vines_arp = -1;
+static gint ett_vines_arp;
 
 static dissector_handle_t vines_arp_handle;
 
-static int proto_vines_rtp = -1;
-static int hf_vines_rtp_comp_flag = -1;
-static int hf_vines_rtp_comp_flag_neighbor_router = -1;
-static int hf_vines_rtp_comp_flag_sequence_rtp = -1;
-static int hf_vines_rtp_comp_flag_sequence_rtp_version = -1;
-static int hf_vines_rtp_control = -1;
-static int hf_vines_rtp_control_sync_broadcast = -1;
-static int hf_vines_rtp_control_topology_update = -1;
-static int hf_vines_rtp_control_specific_request = -1;
-static int hf_vines_rtp_control_end_msg = -1;
-static int hf_vines_rtp_control_beg_msg = -1;
-static int hf_vines_rtp_machine_rtp = -1;
-static int hf_vines_rtp_machine_tcpip = -1;
-static int hf_vines_rtp_machine_bus = -1;
-static int hf_vines_rtp_flag_sequence_rtp = -1;
-static int hf_vines_rtp_flag_network_p2p = -1;
-static int hf_vines_rtp_flag_data_link_p2p = -1;
-static int hf_vines_rtp_flag_broadcast_medium = -1;
-static int hf_vines_rtp_metric_to_preferred_gateway = -1;
-static int hf_vines_rtp_requested_info = -1;
-static int hf_vines_rtp_metric_to_destination = -1;
-static int hf_vines_rtp_source_route_length = -1;
-static int hf_vines_rtp_router_sequence_number = -1;
-static int hf_vines_rtp_sequence_number = -1;
-static int hf_vines_rtp_data_offset = -1;
-static int hf_vines_rtp_preferred_gateway_sequence_number = -1;
-static int hf_vines_rtp_preferred_gateway_node_type = -1;
-static int hf_vines_rtp_metric = -1;
-static int hf_vines_rtp_destination_sequence_number = -1;
-static int hf_vines_rtp_link_address_length = -1;
-static int hf_vines_rtp_controller_type = -1;
-static int hf_vines_rtp_destination_node_type = -1;
-static int hf_vines_rtp_information_type = -1;
-static int hf_vines_rtp_version = -1;
-static int hf_vines_rtp_preferred_gateway = -1;
-static int hf_vines_rtp_neighbor_metric = -1;
-static int hf_vines_rtp_destination = -1;
-static int hf_vines_rtp_node_type = -1;
-static int hf_vines_rtp_operation_type = -1;
-static int hf_vines_rtp_packet_id = -1;
-static int hf_vines_rtp_network_number = -1;
-static int hf_vines_rtp_machine_type = -1;
-static int hf_vines_rtp_destination_controller_type = -1;
-static int hf_vines_rtp_destination_machine = -1;
-static int hf_vines_rtp_pref_gateway_controller_type = -1;
-static int hf_vines_rtp_pref_gateway_machine = -1;
-static int hf_vines_rtp_network_flags = -1;
-static int hf_vines_rtp_destination_flags = -1;
-static int hf_vines_rtp_preferred_gateway_flags = -1;
-static int hf_vines_rtp_preferred_gateway_data_link_address_ether = -1;
-static int hf_vines_rtp_preferred_gateway_data_link_address_bytes = -1;
-static int hf_vines_rtp_preferred_gateway_source_route = -1;
-
-static gint ett_vines_rtp = -1;
-static gint ett_vines_rtp_compatibility_flags = -1;
-static gint ett_vines_rtp_req_info = -1;
-static gint ett_vines_rtp_control_flags = -1;
-static gint ett_vines_rtp_mtype = -1;
-static gint ett_vines_rtp_flags = -1;
+static int proto_vines_rtp;
+static int hf_vines_rtp_comp_flag;
+static int hf_vines_rtp_comp_flag_neighbor_router;
+static int hf_vines_rtp_comp_flag_sequence_rtp;
+static int hf_vines_rtp_comp_flag_sequence_rtp_version;
+static int hf_vines_rtp_control;
+static int hf_vines_rtp_control_sync_broadcast;
+static int hf_vines_rtp_control_topology_update;
+static int hf_vines_rtp_control_specific_request;
+static int hf_vines_rtp_control_end_msg;
+static int hf_vines_rtp_control_beg_msg;
+static int hf_vines_rtp_machine_rtp;
+static int hf_vines_rtp_machine_tcpip;
+static int hf_vines_rtp_machine_bus;
+static int hf_vines_rtp_flag_sequence_rtp;
+static int hf_vines_rtp_flag_network_p2p;
+static int hf_vines_rtp_flag_data_link_p2p;
+static int hf_vines_rtp_flag_broadcast_medium;
+static int hf_vines_rtp_metric_to_preferred_gateway;
+static int hf_vines_rtp_requested_info;
+static int hf_vines_rtp_metric_to_destination;
+static int hf_vines_rtp_source_route_length;
+static int hf_vines_rtp_router_sequence_number;
+static int hf_vines_rtp_sequence_number;
+static int hf_vines_rtp_data_offset;
+static int hf_vines_rtp_preferred_gateway_sequence_number;
+static int hf_vines_rtp_preferred_gateway_node_type;
+static int hf_vines_rtp_metric;
+static int hf_vines_rtp_destination_sequence_number;
+static int hf_vines_rtp_link_address_length;
+static int hf_vines_rtp_controller_type;
+static int hf_vines_rtp_destination_node_type;
+static int hf_vines_rtp_information_type;
+static int hf_vines_rtp_version;
+static int hf_vines_rtp_preferred_gateway;
+static int hf_vines_rtp_neighbor_metric;
+static int hf_vines_rtp_destination;
+static int hf_vines_rtp_node_type;
+static int hf_vines_rtp_operation_type;
+static int hf_vines_rtp_packet_id;
+static int hf_vines_rtp_network_number;
+static int hf_vines_rtp_machine_type;
+static int hf_vines_rtp_destination_controller_type;
+static int hf_vines_rtp_destination_machine;
+static int hf_vines_rtp_pref_gateway_controller_type;
+static int hf_vines_rtp_pref_gateway_machine;
+static int hf_vines_rtp_network_flags;
+static int hf_vines_rtp_destination_flags;
+static int hf_vines_rtp_preferred_gateway_flags;
+static int hf_vines_rtp_preferred_gateway_data_link_address_ether;
+static int hf_vines_rtp_preferred_gateway_data_link_address_bytes;
+static int hf_vines_rtp_preferred_gateway_source_route;
+
+static gint ett_vines_rtp;
+static gint ett_vines_rtp_compatibility_flags;
+static gint ett_vines_rtp_req_info;
+static gint ett_vines_rtp_control_flags;
+static gint ett_vines_rtp_mtype;
+static gint ett_vines_rtp_flags;
 
 static dissector_handle_t vines_rtp_handle;
 
-static int proto_vines = -1;
-static int proto_vines_icp = -1;
-static int hf_vines_icp_exception_code = -1;
-static int hf_vines_icp_metric = -1;
-static int hf_vines_icp_packet_type = -1;
+static int proto_vines;
+static int proto_vines_icp;
+static int hf_vines_icp_exception_code;
+static int hf_vines_icp_metric;
+static int hf_vines_icp_packet_type;
 
-static gint ett_vines_icp = -1;
+static gint ett_vines_icp;
 
 static dissector_handle_t vines_icp_handle;
 static capture_dissector_handle_t vines_echo_cap_handle;
diff --git a/epan/dissectors/packet-vj-comp.c b/epan/dissectors/packet-vj-comp.c
index ad01793f55..c766506418 100644
--- a/epan/dissectors/packet-vj-comp.c
+++ b/epan/dissectors/packet-vj-comp.c
@@ -94,20 +94,20 @@ static dissector_handle_t ip_handle;
 void proto_register_vjc(void);
 void proto_reg_handoff_vjc(void);
 
-static int proto_vjc = -1;
+static int proto_vjc;
 
-static gint ett_vjc = -1;
-static gint ett_vjc_change_mask = -1;
+static gint ett_vjc;
+static gint ett_vjc_change_mask;
 
-static expert_field ei_vjc_sawu = EI_INIT;
-static expert_field ei_vjc_swu = EI_INIT;
-static expert_field ei_vjc_no_cnum = EI_INIT;
-static expert_field ei_vjc_no_conversation = EI_INIT;
-static expert_field ei_vjc_no_direction = EI_INIT;
-static expert_field ei_vjc_no_conv_data = EI_INIT;
-static expert_field ei_vjc_undecoded = EI_INIT;
-static expert_field ei_vjc_bad_data = EI_INIT;
-static expert_field ei_vjc_error = EI_INIT;
+static expert_field ei_vjc_sawu;
+static expert_field ei_vjc_swu;
+static expert_field ei_vjc_no_cnum;
+static expert_field ei_vjc_no_conversation;
+static expert_field ei_vjc_no_direction;
+static expert_field ei_vjc_no_conv_data;
+static expert_field ei_vjc_undecoded;
+static expert_field ei_vjc_bad_data;
+static expert_field ei_vjc_error;
 
 #define VJC_FLAG_R 0x80
 #define VJC_FLAG_C 0x40
@@ -121,24 +121,24 @@ static expert_field ei_vjc_error = EI_INIT;
 #define VJC_FLAGS_SAWU 0x0F
 #define VJC_FLAGS_SWU 0x0B
 
-static int hf_vjc_comp = -1;
-static int hf_vjc_cnum = -1;
-static int hf_vjc_change_mask = -1;
-static int hf_vjc_change_mask_r = -1;
-static int hf_vjc_change_mask_c = -1;
-static int hf_vjc_change_mask_i = -1;
-static int hf_vjc_change_mask_p = -1;
-static int hf_vjc_change_mask_s = -1;
-static int hf_vjc_change_mask_a = -1;
-static int hf_vjc_change_mask_w = -1;
-static int hf_vjc_change_mask_u = -1;
-static int hf_vjc_chksum = -1;
-static int hf_vjc_urg = -1;
-static int hf_vjc_d_win = -1;
-static int hf_vjc_d_ack = -1;
-static int hf_vjc_d_seq = -1;
-static int hf_vjc_d_ipid = -1;
-static int hf_vjc_tcpdata = -1;
+static int hf_vjc_comp;
+static int hf_vjc_cnum;
+static int hf_vjc_change_mask;
+static int hf_vjc_change_mask_r;
+static int hf_vjc_change_mask_c;
+static int hf_vjc_change_mask_i;
+static int hf_vjc_change_mask_p;
+static int hf_vjc_change_mask_s;
+static int hf_vjc_change_mask_a;
+static int hf_vjc_change_mask_w;
+static int hf_vjc_change_mask_u;
+static int hf_vjc_chksum;
+static int hf_vjc_urg;
+static int hf_vjc_d_win;
+static int hf_vjc_d_ack;
+static int hf_vjc_d_seq;
+static int hf_vjc_d_ipid;
+static int hf_vjc_tcpdata;
 
 static int * const vjc_change_mask_fields[] = {
     &hf_vjc_change_mask_r,
diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c
index 1c0e83b8b4..b64d0ccc52 100644
--- a/epan/dissectors/packet-vlan.c
+++ b/epan/dissectors/packet-vlan.c
@@ -54,23 +54,23 @@ static capture_dissector_handle_t ipx_cap_handle;
 
 static int proto_vlan;
 
-static int hf_vlan_cfi = -1;
-static int hf_vlan_dei = -1;
-static int hf_vlan_etype = -1;
-static int hf_vlan_id = -1;
-static int hf_vlan_id_name = -1;
-static int hf_vlan_len = -1;
-static int hf_vlan_priority = -1;
-static int hf_vlan_priority_5 = -1;
-static int hf_vlan_priority_6 = -1;
-static int hf_vlan_priority_7 = -1;
-static int hf_vlan_priority_old = -1;
-static int hf_vlan_trailer = -1;
-
-static gint ett_vlan = -1;
-
-static expert_field ei_vlan_len = EI_INIT;
-static expert_field ei_vlan_too_many_tags = EI_INIT;
+static int hf_vlan_cfi;
+static int hf_vlan_dei;
+static int hf_vlan_etype;
+static int hf_vlan_id;
+static int hf_vlan_id_name;
+static int hf_vlan_len;
+static int hf_vlan_priority;
+static int hf_vlan_priority_5;
+static int hf_vlan_priority_6;
+static int hf_vlan_priority_7;
+static int hf_vlan_priority_old;
+static int hf_vlan_trailer;
+
+static gint ett_vlan;
+
+static expert_field ei_vlan_len;
+static expert_field ei_vlan_too_many_tags;
 
 /* From Table G-2 of IEEE standard 802.1D-2004 */
 /* Note that 0 is the default priority, but is above 1 and 2.
diff --git a/epan/dissectors/packet-vmlab.c b/epan/dissectors/packet-vmlab.c
index 41890b61ec..1a003a161f 100644
--- a/epan/dissectors/packet-vmlab.c
+++ b/epan/dissectors/packet-vmlab.c
@@ -39,20 +39,20 @@ void proto_reg_handoff_vmlab(void);
 static dissector_handle_t vmlab_handle;
 static dissector_handle_t ethertype_handle;
 
-static int proto_vmlab = -1;
+static int proto_vmlab;
 
-static int hf_vmlab_flags_part1 = -1;           /* Unknown so far */
-static int hf_vmlab_flags_fragment = -1;
-static int hf_vmlab_flags_part2 = -1;           /* Unknown so far */
+static int hf_vmlab_flags_part1;           /* Unknown so far */
+static int hf_vmlab_flags_fragment;
+static int hf_vmlab_flags_part2;           /* Unknown so far */
 
-static int hf_vmlab_portgroup = -1;
-static int hf_vmlab_eth_src = -1;
-static int hf_vmlab_eth_dst = -1;
-static int hf_vmlab_eth_addr = -1;
-static int hf_vmlab_etype = -1;
-static int hf_vmlab_trailer = -1;
+static int hf_vmlab_portgroup;
+static int hf_vmlab_eth_src;
+static int hf_vmlab_eth_dst;
+static int hf_vmlab_eth_addr;
+static int hf_vmlab_etype;
+static int hf_vmlab_trailer;
 
-static gint ett_vmlab = -1;
+static gint ett_vmlab;
 
 static int
 dissect_vmlab(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-vmware-hb.c b/epan/dissectors/packet-vmware-hb.c
index 4d40d0230b..0c4a3dc08b 100644
--- a/epan/dissectors/packet-vmware-hb.c
+++ b/epan/dissectors/packet-vmware-hb.c
@@ -24,23 +24,23 @@
 void proto_reg_handoff_vmware_hb(void);
 void proto_register_vmware_hb(void);
 
-static int proto_vmware_hb = -1;
-static int hf_vmware_hb_magic = -1;
-static int hf_vmware_hb_build_number = -1;
-static int hf_vmware_hb_server_id = -1;
-static int hf_vmware_hb_host_key_length = -1;
-static int hf_vmware_hb_host_key = -1;
-static int hf_vmware_hb_change_gen = -1;
-static int hf_vmware_hb_spec_gen = -1;
-static int hf_vmware_hb_bundle_version = -1;
-static int hf_vmware_hb_heartbeat_counter = -1;
-static int hf_vmware_hb_ip4_address_length = -1;
-static int hf_vmware_hb_ip4_address = -1;
-static int hf_vmware_hb_verification_signature = -1;
+static int proto_vmware_hb;
+static int hf_vmware_hb_magic;
+static int hf_vmware_hb_build_number;
+static int hf_vmware_hb_server_id;
+static int hf_vmware_hb_host_key_length;
+static int hf_vmware_hb_host_key;
+static int hf_vmware_hb_change_gen;
+static int hf_vmware_hb_spec_gen;
+static int hf_vmware_hb_bundle_version;
+static int hf_vmware_hb_heartbeat_counter;
+static int hf_vmware_hb_ip4_address_length;
+static int hf_vmware_hb_ip4_address;
+static int hf_vmware_hb_verification_signature;
 
 static dissector_handle_t vmware_hb_handle;
 
-static gint ett_vmware_hb = -1;
+static gint ett_vmware_hb;
 
 static const value_string vmware_hb_build_number[] = {
     { 164009, "ESXi 4.0.0 GA" },
diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c
index dd1d83b998..7b2e3541e4 100644
--- a/epan/dissectors/packet-vnc.c
+++ b/epan/dissectors/packet-vnc.c
@@ -581,291 +581,291 @@ static guint vnc_h264_encoding(tvbuff_t *tvb, gint *offset, proto_tree *tree);
 		return (a);
 
 /* Initialize the protocol and registered fields */
-static int proto_vnc = -1; /* Protocol subtree */
-static int hf_vnc_padding = -1;
-static int hf_vnc_server_proto_ver = -1;
-static int hf_vnc_client_proto_ver = -1;
-static int hf_vnc_num_security_types = -1;
-static int hf_vnc_security_type = -1;
-static int hf_vnc_server_security_type = -1;
-static int hf_vnc_client_security_type = -1;
-static int hf_vnc_auth_challenge = -1;
-static int hf_vnc_auth_response = -1;
-static int hf_vnc_auth_result = -1;
-static int hf_vnc_auth_error = -1;
-static int hf_vnc_auth_error_length = -1;
-
-static int hf_vnc_ard_auth_generator = -1;
-static int hf_vnc_ard_auth_key_len = -1;
-static int hf_vnc_ard_auth_modulus = -1;
-static int hf_vnc_ard_auth_server_key = -1;
-static int hf_vnc_ard_auth_credentials = -1;
-static int hf_vnc_ard_auth_client_key = -1;
-
-static int hf_vnc_share_desktop_flag = -1;
-static int hf_vnc_width = -1;
-static int hf_vnc_height = -1;
-static int hf_vnc_server_bits_per_pixel = -1;
-static int hf_vnc_server_depth = -1;
-static int hf_vnc_server_big_endian_flag = -1;
-static int hf_vnc_server_true_color_flag = -1;
-static int hf_vnc_server_red_max = -1;
-static int hf_vnc_server_green_max = -1;
-static int hf_vnc_server_blue_max = -1;
-static int hf_vnc_server_red_shift = -1;
-static int hf_vnc_server_green_shift = -1;
-static int hf_vnc_server_blue_shift = -1;
-static int hf_vnc_desktop_name = -1;
-static int hf_vnc_desktop_name_len = -1;
-static int hf_vnc_desktop_screen_num = -1;
-static int hf_vnc_desktop_screen_id = -1;
-static int hf_vnc_desktop_screen_x = -1;
-static int hf_vnc_desktop_screen_y = -1;
-static int hf_vnc_desktop_screen_width = -1;
-static int hf_vnc_desktop_screen_height = -1;
-static int hf_vnc_desktop_screen_flags = -1;
-static int hf_vnc_num_server_message_types = -1;
-static int hf_vnc_num_client_message_types = -1;
-static int hf_vnc_num_encoding_types = -1;
+static int proto_vnc; /* Protocol subtree */
+static int hf_vnc_padding;
+static int hf_vnc_server_proto_ver;
+static int hf_vnc_client_proto_ver;
+static int hf_vnc_num_security_types;
+static int hf_vnc_security_type;
+static int hf_vnc_server_security_type;
+static int hf_vnc_client_security_type;
+static int hf_vnc_auth_challenge;
+static int hf_vnc_auth_response;
+static int hf_vnc_auth_result;
+static int hf_vnc_auth_error;
+static int hf_vnc_auth_error_length;
+
+static int hf_vnc_ard_auth_generator;
+static int hf_vnc_ard_auth_key_len;
+static int hf_vnc_ard_auth_modulus;
+static int hf_vnc_ard_auth_server_key;
+static int hf_vnc_ard_auth_credentials;
+static int hf_vnc_ard_auth_client_key;
+
+static int hf_vnc_share_desktop_flag;
+static int hf_vnc_width;
+static int hf_vnc_height;
+static int hf_vnc_server_bits_per_pixel;
+static int hf_vnc_server_depth;
+static int hf_vnc_server_big_endian_flag;
+static int hf_vnc_server_true_color_flag;
+static int hf_vnc_server_red_max;
+static int hf_vnc_server_green_max;
+static int hf_vnc_server_blue_max;
+static int hf_vnc_server_red_shift;
+static int hf_vnc_server_green_shift;
+static int hf_vnc_server_blue_shift;
+static int hf_vnc_desktop_name;
+static int hf_vnc_desktop_name_len;
+static int hf_vnc_desktop_screen_num;
+static int hf_vnc_desktop_screen_id;
+static int hf_vnc_desktop_screen_x;
+static int hf_vnc_desktop_screen_y;
+static int hf_vnc_desktop_screen_width;
+static int hf_vnc_desktop_screen_height;
+static int hf_vnc_desktop_screen_flags;
+static int hf_vnc_num_server_message_types;
+static int hf_vnc_num_client_message_types;
+static int hf_vnc_num_encoding_types;
 
 /********** Client Message Types **********/
 
-static int hf_vnc_client_message_type = -1; /* A subtree under VNC */
-static int hf_vnc_client_bits_per_pixel = -1;
-static int hf_vnc_client_depth = -1;
-static int hf_vnc_client_big_endian_flag = -1;
-static int hf_vnc_client_true_color_flag = -1;
-static int hf_vnc_client_red_max = -1;
-static int hf_vnc_client_green_max = -1;
-static int hf_vnc_client_blue_max = -1;
-static int hf_vnc_client_red_shift = -1;
-static int hf_vnc_client_green_shift = -1;
-static int hf_vnc_client_blue_shift = -1;
+static int hf_vnc_client_message_type; /* A subtree under VNC */
+static int hf_vnc_client_bits_per_pixel;
+static int hf_vnc_client_depth;
+static int hf_vnc_client_big_endian_flag;
+static int hf_vnc_client_true_color_flag;
+static int hf_vnc_client_red_max;
+static int hf_vnc_client_green_max;
+static int hf_vnc_client_blue_max;
+static int hf_vnc_client_red_shift;
+static int hf_vnc_client_green_shift;
+static int hf_vnc_client_blue_shift;
 
 /* Client Key Event */
-static int hf_vnc_key_down = -1;
-static int hf_vnc_key = -1;
+static int hf_vnc_key_down;
+static int hf_vnc_key;
 
 /* Client Pointer Event */
-static int hf_vnc_button_1_pos = -1;
-static int hf_vnc_button_2_pos = -1;
-static int hf_vnc_button_3_pos = -1;
-static int hf_vnc_button_4_pos = -1;
-static int hf_vnc_button_5_pos = -1;
-static int hf_vnc_button_6_pos = -1;
-static int hf_vnc_button_7_pos = -1;
-static int hf_vnc_button_8_pos = -1;
-static int hf_vnc_pointer_x_pos = -1;
-static int hf_vnc_pointer_y_pos = -1;
+static int hf_vnc_button_1_pos;
+static int hf_vnc_button_2_pos;
+static int hf_vnc_button_3_pos;
+static int hf_vnc_button_4_pos;
+static int hf_vnc_button_5_pos;
+static int hf_vnc_button_6_pos;
+static int hf_vnc_button_7_pos;
+static int hf_vnc_button_8_pos;
+static int hf_vnc_pointer_x_pos;
+static int hf_vnc_pointer_y_pos;
 
 /* Client Framebuffer Update Request */
-static int hf_vnc_update_req_incremental = -1;
-static int hf_vnc_update_req_x_pos = -1;
-static int hf_vnc_update_req_y_pos = -1;
-static int hf_vnc_update_req_width = -1;
-static int hf_vnc_update_req_height = -1;
+static int hf_vnc_update_req_incremental;
+static int hf_vnc_update_req_x_pos;
+static int hf_vnc_update_req_y_pos;
+static int hf_vnc_update_req_width;
+static int hf_vnc_update_req_height;
 
 /* Client Set Encodings */
-static int hf_vnc_encoding_num = -1;
-static int hf_vnc_client_set_encodings_encoding_type = -1;
+static int hf_vnc_encoding_num;
+static int hf_vnc_client_set_encodings_encoding_type;
 
 /* Client Cut Text */
-static int hf_vnc_client_cut_text_len = -1;
-static int hf_vnc_client_cut_text = -1;
+static int hf_vnc_client_cut_text_len;
+static int hf_vnc_client_cut_text;
 
 /********** Server Message Types **********/
 
-static int hf_vnc_server_message_type = -1; /* Subtree */
+static int hf_vnc_server_message_type; /* Subtree */
 
 /* Tunneling capabilities (TightVNC extension) */
-static int hf_vnc_tight_num_tunnel_types = -1;
-static int hf_vnc_tight_tunnel_type_code = -1;
-static int hf_vnc_tight_tunnel_type_vendor = -1;
-static int hf_vnc_tight_tunnel_type_signature = -1;
+static int hf_vnc_tight_num_tunnel_types;
+static int hf_vnc_tight_tunnel_type_code;
+static int hf_vnc_tight_tunnel_type_vendor;
+static int hf_vnc_tight_tunnel_type_signature;
 
 /* Authentication capabilities (TightVNC extension) */
-static int hf_vnc_tight_num_auth_types = -1;
-static int hf_vnc_tight_auth_code = -1;
+static int hf_vnc_tight_num_auth_types;
+static int hf_vnc_tight_auth_code;
 /* TightVNC capabilities */
-static int hf_vnc_tight_server_message_type = -1;
-static int hf_vnc_tight_server_vendor = -1;
-static int hf_vnc_tight_signature = -1;
-static int hf_vnc_tight_server_name = -1;
+static int hf_vnc_tight_server_message_type;
+static int hf_vnc_tight_server_vendor;
+static int hf_vnc_tight_signature;
+static int hf_vnc_tight_server_name;
 
-static int hf_vnc_tight_client_message_type = -1;
-static int hf_vnc_tight_client_vendor = -1;
-static int hf_vnc_tight_client_name = -1;
+static int hf_vnc_tight_client_message_type;
+static int hf_vnc_tight_client_vendor;
+static int hf_vnc_tight_client_name;
 
-static int hf_vnc_tight_encoding_type = -1;
-static int hf_vnc_tight_encoding_vendor = -1;
-static int hf_vnc_tight_encoding_name = -1;
+static int hf_vnc_tight_encoding_type;
+static int hf_vnc_tight_encoding_vendor;
+static int hf_vnc_tight_encoding_name;
 
 /* VeNCrypt capabilities */
-static int hf_vnc_vencrypt_server_major_ver = -1;
-static int hf_vnc_vencrypt_server_minor_ver = -1;
-static int hf_vnc_vencrypt_client_major_ver = -1;
-static int hf_vnc_vencrypt_client_minor_ver = -1;
-static int hf_vnc_vencrypt_version_ack = -1;
-static int hf_vnc_vencrypt_num_auth_types = -1;
-static int hf_vnc_vencrypt_auth_type = -1;
-static int hf_vnc_vencrypt_auth_type_ack = -1;
+static int hf_vnc_vencrypt_server_major_ver;
+static int hf_vnc_vencrypt_server_minor_ver;
+static int hf_vnc_vencrypt_client_major_ver;
+static int hf_vnc_vencrypt_client_minor_ver;
+static int hf_vnc_vencrypt_version_ack;
+static int hf_vnc_vencrypt_num_auth_types;
+static int hf_vnc_vencrypt_auth_type;
+static int hf_vnc_vencrypt_auth_type_ack;
 
 /* Tight compression parameters */
-static int hf_vnc_tight_reset_stream0 = -1;
-static int hf_vnc_tight_reset_stream1 = -1;
-static int hf_vnc_tight_reset_stream2 = -1;
-static int hf_vnc_tight_reset_stream3 = -1;
+static int hf_vnc_tight_reset_stream0;
+static int hf_vnc_tight_reset_stream1;
+static int hf_vnc_tight_reset_stream2;
+static int hf_vnc_tight_reset_stream3;
 
-static int hf_vnc_tight_rect_type = -1;
+static int hf_vnc_tight_rect_type;
 
-static int hf_vnc_tight_image_len = -1;
-static int hf_vnc_tight_image_data = -1;
+static int hf_vnc_tight_image_len;
+static int hf_vnc_tight_image_data;
 
-static int hf_vnc_tight_fill_color = -1;
+static int hf_vnc_tight_fill_color;
 
-static int hf_vnc_tight_filter_flag = -1;
-static int hf_vnc_tight_filter_id = -1;
+static int hf_vnc_tight_filter_flag;
+static int hf_vnc_tight_filter_id;
 
-static int hf_vnc_tight_palette_num_colors = -1;
-static int hf_vnc_tight_palette_data = -1;
+static int hf_vnc_tight_palette_num_colors;
+static int hf_vnc_tight_palette_data;
 
 /* Server Framebuffer Update */
-static int hf_vnc_rectangle_num = -1;
-static int hf_vnc_fb_update_x_pos = -1;
-static int hf_vnc_fb_update_y_pos = -1;
-static int hf_vnc_fb_update_width = -1;
-static int hf_vnc_fb_update_height = -1;
-static int hf_vnc_fb_update_encoding_type = -1;
+static int hf_vnc_rectangle_num;
+static int hf_vnc_fb_update_x_pos;
+static int hf_vnc_fb_update_y_pos;
+static int hf_vnc_fb_update_width;
+static int hf_vnc_fb_update_height;
+static int hf_vnc_fb_update_encoding_type;
 
 /* Raw Encoding */
-static int hf_vnc_raw_pixel_data = -1;
+static int hf_vnc_raw_pixel_data;
 
 /* CopyRect Encoding */
-static int hf_vnc_copyrect_src_x_pos = -1;
-static int hf_vnc_copyrect_src_y_pos = -1;
+static int hf_vnc_copyrect_src_x_pos;
+static int hf_vnc_copyrect_src_y_pos;
 
 /* RRE Encoding */
-static int hf_vnc_rre_num_subrects = -1;
-static int hf_vnc_rre_bg_pixel = -1;
+static int hf_vnc_rre_num_subrects;
+static int hf_vnc_rre_bg_pixel;
 
-static int hf_vnc_rre_subrect_pixel = -1;
-static int hf_vnc_rre_subrect_x_pos = -1;
-static int hf_vnc_rre_subrect_y_pos = -1;
-static int hf_vnc_rre_subrect_width = -1;
-static int hf_vnc_rre_subrect_height = -1;
+static int hf_vnc_rre_subrect_pixel;
+static int hf_vnc_rre_subrect_x_pos;
+static int hf_vnc_rre_subrect_y_pos;
+static int hf_vnc_rre_subrect_width;
+static int hf_vnc_rre_subrect_height;
 
 /* Hextile Encoding */
-static int hf_vnc_hextile_subencoding_mask = -1;
-static int hf_vnc_hextile_raw = -1;
-static int hf_vnc_hextile_raw_value = -1;
-static int hf_vnc_hextile_bg = -1;
-static int hf_vnc_hextile_bg_value = -1;
-static int hf_vnc_hextile_fg = -1;
-static int hf_vnc_hextile_fg_value = -1;
-static int hf_vnc_hextile_anysubrects = -1;
-static int hf_vnc_hextile_num_subrects = -1;
-static int hf_vnc_hextile_subrectscolored = -1;
-static int hf_vnc_hextile_subrect_pixel_value = -1;
-static int hf_vnc_hextile_subrect_x_pos = -1;
-static int hf_vnc_hextile_subrect_y_pos = -1;
-static int hf_vnc_hextile_subrect_width = -1;
-static int hf_vnc_hextile_subrect_height = -1;
+static int hf_vnc_hextile_subencoding_mask;
+static int hf_vnc_hextile_raw;
+static int hf_vnc_hextile_raw_value;
+static int hf_vnc_hextile_bg;
+static int hf_vnc_hextile_bg_value;
+static int hf_vnc_hextile_fg;
+static int hf_vnc_hextile_fg_value;
+static int hf_vnc_hextile_anysubrects;
+static int hf_vnc_hextile_num_subrects;
+static int hf_vnc_hextile_subrectscolored;
+static int hf_vnc_hextile_subrect_pixel_value;
+static int hf_vnc_hextile_subrect_x_pos;
+static int hf_vnc_hextile_subrect_y_pos;
+static int hf_vnc_hextile_subrect_width;
+static int hf_vnc_hextile_subrect_height;
 
 /* ZRLE Encoding */
-static int hf_vnc_zrle_len = -1;
-static int hf_vnc_zrle_subencoding = -1;
-static int hf_vnc_zrle_rle = -1;
-static int hf_vnc_zrle_palette_size = -1;
-static int hf_vnc_zrle_data = -1;
-static int hf_vnc_zrle_raw = -1;
-static int hf_vnc_zrle_palette = -1;
+static int hf_vnc_zrle_len;
+static int hf_vnc_zrle_subencoding;
+static int hf_vnc_zrle_rle;
+static int hf_vnc_zrle_palette_size;
+static int hf_vnc_zrle_data;
+static int hf_vnc_zrle_raw;
+static int hf_vnc_zrle_palette;
 
 /* Cursor Encoding */
-static int hf_vnc_cursor_x_fore_back = -1;
-static int hf_vnc_cursor_encoding_pixels = -1;
-static int hf_vnc_cursor_encoding_bitmask = -1;
+static int hf_vnc_cursor_x_fore_back;
+static int hf_vnc_cursor_encoding_pixels;
+static int hf_vnc_cursor_encoding_bitmask;
 
 /* Server Set Colormap Entries */
-static int hf_vnc_color_groups = -1;
-static int hf_vnc_colormap_first_color = -1;
-static int hf_vnc_colormap_num_colors = -1;
-static int hf_vnc_colormap_red = -1;
-static int hf_vnc_colormap_green = -1;
-static int hf_vnc_colormap_blue = -1;
+static int hf_vnc_color_groups;
+static int hf_vnc_colormap_first_color;
+static int hf_vnc_colormap_num_colors;
+static int hf_vnc_colormap_red;
+static int hf_vnc_colormap_green;
+static int hf_vnc_colormap_blue;
 
 /* Server Cut Text */
-static int hf_vnc_server_cut_text_len = -1;
-static int hf_vnc_server_cut_text = -1;
+static int hf_vnc_server_cut_text_len;
+static int hf_vnc_server_cut_text;
 
 /* LibVNCServer additions */
-static int hf_vnc_supported_messages_client2server = -1;
-static int hf_vnc_supported_messages_server2client = -1;
-static int hf_vnc_num_supported_encodings = -1;
-static int hf_vnc_supported_encodings = -1;
-static int hf_vnc_server_identity = -1;
+static int hf_vnc_supported_messages_client2server;
+static int hf_vnc_supported_messages_server2client;
+static int hf_vnc_num_supported_encodings;
+static int hf_vnc_supported_encodings;
+static int hf_vnc_server_identity;
 
 /* MirrorLink */
-static int hf_vnc_mirrorlink_type = -1;
-static int hf_vnc_mirrorlink_length = -1;
-static int hf_vnc_mirrorlink_version_major = -1;
-static int hf_vnc_mirrorlink_version_minor = -1;
-static int hf_vnc_mirrorlink_framebuffer_configuration = -1;
-static int hf_vnc_mirrorlink_pixel_width = -1;
-static int hf_vnc_mirrorlink_pixel_height = -1;
-static int hf_vnc_mirrorlink_pixel_format = -1;
-static int hf_vnc_mirrorlink_display_width = -1;
-static int hf_vnc_mirrorlink_display_height = -1;
-static int hf_vnc_mirrorlink_display_distance = -1;
-static int hf_vnc_mirrorlink_keyboard_language = -1;
-static int hf_vnc_mirrorlink_keyboard_country = -1;
-static int hf_vnc_mirrorlink_ui_language = -1;
-static int hf_vnc_mirrorlink_ui_country = -1;
-static int hf_vnc_mirrorlink_knob_keys = -1;
-static int hf_vnc_mirrorlink_device_keys = -1;
-static int hf_vnc_mirrorlink_multimedia_keys = -1;
-static int hf_vnc_mirrorlink_key_related = -1;
-static int hf_vnc_mirrorlink_pointer_related = -1;
-static int hf_vnc_mirrorlink_key_symbol_value_client = -1;
-static int hf_vnc_mirrorlink_key_symbol_value_server = -1;
-static int hf_vnc_mirrorlink_key_configuration = -1;
-static int hf_vnc_mirrorlink_key_num_events = -1;
-static int hf_vnc_mirrorlink_key_event_counter = -1;
-static int hf_vnc_mirrorlink_key_symbol_value = -1;
-static int hf_vnc_mirrorlink_key_request_configuration = -1;
-static int hf_vnc_mirrorlink_keyboard_configuration = -1;
-static int hf_vnc_mirrorlink_cursor_x = -1;
-static int hf_vnc_mirrorlink_cursor_y = -1;
-static int hf_vnc_mirrorlink_text_x = -1;
-static int hf_vnc_mirrorlink_text_y = -1;
-static int hf_vnc_mirrorlink_text_width = -1;
-static int hf_vnc_mirrorlink_text_height = -1;
-static int hf_vnc_mirrorlink_keyboard_request_configuration = -1;
-static int hf_vnc_mirrorlink_device_status = -1;
-static int hf_vnc_mirrorlink_app_id = -1;
-static int hf_vnc_mirrorlink_fb_block_x = -1;
-static int hf_vnc_mirrorlink_fb_block_y = -1;
-static int hf_vnc_mirrorlink_fb_block_width = -1;
-static int hf_vnc_mirrorlink_fb_block_height = -1;
-static int hf_vnc_mirrorlink_fb_block_reason = -1;
-static int hf_vnc_mirrorlink_audio_block_reason = -1;
-static int hf_vnc_mirrorlink_touch_num_events = -1;
-static int hf_vnc_mirrorlink_touch_x = -1;
-static int hf_vnc_mirrorlink_touch_y = -1;
-static int hf_vnc_mirrorlink_touch_id = -1;
-static int hf_vnc_mirrorlink_touch_pressure = -1;
-static int hf_vnc_mirrorlink_text = -1;
-static int hf_vnc_mirrorlink_text_length = -1;
-static int hf_vnc_mirrorlink_text_max_length = -1;
-static int hf_vnc_mirrorlink_unknown = -1;
+static int hf_vnc_mirrorlink_type;
+static int hf_vnc_mirrorlink_length;
+static int hf_vnc_mirrorlink_version_major;
+static int hf_vnc_mirrorlink_version_minor;
+static int hf_vnc_mirrorlink_framebuffer_configuration;
+static int hf_vnc_mirrorlink_pixel_width;
+static int hf_vnc_mirrorlink_pixel_height;
+static int hf_vnc_mirrorlink_pixel_format;
+static int hf_vnc_mirrorlink_display_width;
+static int hf_vnc_mirrorlink_display_height;
+static int hf_vnc_mirrorlink_display_distance;
+static int hf_vnc_mirrorlink_keyboard_language;
+static int hf_vnc_mirrorlink_keyboard_country;
+static int hf_vnc_mirrorlink_ui_language;
+static int hf_vnc_mirrorlink_ui_country;
+static int hf_vnc_mirrorlink_knob_keys;
+static int hf_vnc_mirrorlink_device_keys;
+static int hf_vnc_mirrorlink_multimedia_keys;
+static int hf_vnc_mirrorlink_key_related;
+static int hf_vnc_mirrorlink_pointer_related;
+static int hf_vnc_mirrorlink_key_symbol_value_client;
+static int hf_vnc_mirrorlink_key_symbol_value_server;
+static int hf_vnc_mirrorlink_key_configuration;
+static int hf_vnc_mirrorlink_key_num_events;
+static int hf_vnc_mirrorlink_key_event_counter;
+static int hf_vnc_mirrorlink_key_symbol_value;
+static int hf_vnc_mirrorlink_key_request_configuration;
+static int hf_vnc_mirrorlink_keyboard_configuration;
+static int hf_vnc_mirrorlink_cursor_x;
+static int hf_vnc_mirrorlink_cursor_y;
+static int hf_vnc_mirrorlink_text_x;
+static int hf_vnc_mirrorlink_text_y;
+static int hf_vnc_mirrorlink_text_width;
+static int hf_vnc_mirrorlink_text_height;
+static int hf_vnc_mirrorlink_keyboard_request_configuration;
+static int hf_vnc_mirrorlink_device_status;
+static int hf_vnc_mirrorlink_app_id;
+static int hf_vnc_mirrorlink_fb_block_x;
+static int hf_vnc_mirrorlink_fb_block_y;
+static int hf_vnc_mirrorlink_fb_block_width;
+static int hf_vnc_mirrorlink_fb_block_height;
+static int hf_vnc_mirrorlink_fb_block_reason;
+static int hf_vnc_mirrorlink_audio_block_reason;
+static int hf_vnc_mirrorlink_touch_num_events;
+static int hf_vnc_mirrorlink_touch_x;
+static int hf_vnc_mirrorlink_touch_y;
+static int hf_vnc_mirrorlink_touch_id;
+static int hf_vnc_mirrorlink_touch_pressure;
+static int hf_vnc_mirrorlink_text;
+static int hf_vnc_mirrorlink_text_length;
+static int hf_vnc_mirrorlink_text_max_length;
+static int hf_vnc_mirrorlink_unknown;
 
 /* Fence */
-static int hf_vnc_fence_flags = -1;
-static int hf_vnc_fence_request = -1;
-static int hf_vnc_fence_sync_next = -1;
-static int hf_vnc_fence_block_after = -1;
-static int hf_vnc_fence_block_before = -1;
-static int hf_vnc_fence_payload_length = -1;
-static int hf_vnc_fence_payload = -1;
+static int hf_vnc_fence_flags;
+static int hf_vnc_fence_request;
+static int hf_vnc_fence_sync_next;
+static int hf_vnc_fence_block_after;
+static int hf_vnc_fence_block_before;
+static int hf_vnc_fence_payload_length;
+static int hf_vnc_fence_payload;
 
 static int * const vnc_fence_flags[] = {
 	&hf_vnc_fence_request,
@@ -876,59 +876,59 @@ static int * const vnc_fence_flags[] = {
 };
 
 /* Context Information */
-static int hf_vnc_context_information_app_id = -1;
-static int hf_vnc_context_information_app_category = -1;
-static int hf_vnc_context_information_app_trust_level = -1;
-static int hf_vnc_context_information_content_category = -1;
-static int hf_vnc_context_information_content_rules = -1;
-static int hf_vnc_context_information_content_trust_level = -1;
+static int hf_vnc_context_information_app_id;
+static int hf_vnc_context_information_app_category;
+static int hf_vnc_context_information_app_trust_level;
+static int hf_vnc_context_information_content_category;
+static int hf_vnc_context_information_content_rules;
+static int hf_vnc_context_information_content_trust_level;
 
 /* Scan Line based Run-Length Encoding */
-static int hf_vnc_slrle_run_num = -1;
-static int hf_vnc_slrle_run_data = -1;
+static int hf_vnc_slrle_run_num;
+static int hf_vnc_slrle_run_data;
 
 /* H.264 Encoding */
-static int hf_vnc_h264_slice_type = -1;
-static int hf_vnc_h264_nbytes = -1;
-static int hf_vnc_h264_width = -1;
-static int hf_vnc_h264_height = -1;
-static int hf_vnc_h264_data = -1;
+static int hf_vnc_h264_slice_type;
+static int hf_vnc_h264_nbytes;
+static int hf_vnc_h264_width;
+static int hf_vnc_h264_height;
+static int hf_vnc_h264_data;
 
 /********** End of Server Message Types **********/
 
 static gboolean vnc_preference_desegment = TRUE;
 
 /* Initialize the subtree pointers */
-static gint ett_vnc = -1;
-static gint ett_vnc_client_message_type = -1;
-static gint ett_vnc_server_message_type = -1;
-static gint ett_vnc_rect = -1;
-static gint ett_vnc_encoding_type = -1;
-static gint ett_vnc_rre_subrect = -1;
-static gint ett_vnc_hextile_subencoding_mask = -1;
-static gint ett_vnc_hextile_num_subrects = -1;
-static gint ett_vnc_hextile_subrect = -1;
-static gint ett_vnc_hextile_tile = -1;
-static gint ett_vnc_zrle_subencoding = -1;
-static gint ett_vnc_colormap_num_groups = -1;
-static gint ett_vnc_colormap_color_group = -1;
-static gint ett_vnc_desktop_screen = -1;
-static gint ett_vnc_key_events = -1;
-static gint ett_vnc_touch_events = -1;
-static gint ett_vnc_slrle_subline = -1;
-static gint ett_vnc_fence_flags = -1;
-
-static expert_field ei_vnc_possible_gtk_vnc_bug = EI_INIT;
-static expert_field ei_vnc_auth_code_mismatch = EI_INIT;
-static expert_field ei_vnc_unknown_tight_vnc_auth = EI_INIT;
-static expert_field ei_vnc_too_many_rectangles = EI_INIT;
-static expert_field ei_vnc_too_many_sub_rectangles = EI_INIT;
-static expert_field ei_vnc_invalid_encoding = EI_INIT;
-static expert_field ei_vnc_too_many_colors = EI_INIT;
-static expert_field ei_vnc_too_many_cut_text = EI_INIT;
-static expert_field ei_vnc_zrle_failed = EI_INIT;
-static expert_field ei_vnc_unknown_tight = EI_INIT;
-static expert_field ei_vnc_reassemble = EI_INIT;
+static gint ett_vnc;
+static gint ett_vnc_client_message_type;
+static gint ett_vnc_server_message_type;
+static gint ett_vnc_rect;
+static gint ett_vnc_encoding_type;
+static gint ett_vnc_rre_subrect;
+static gint ett_vnc_hextile_subencoding_mask;
+static gint ett_vnc_hextile_num_subrects;
+static gint ett_vnc_hextile_subrect;
+static gint ett_vnc_hextile_tile;
+static gint ett_vnc_zrle_subencoding;
+static gint ett_vnc_colormap_num_groups;
+static gint ett_vnc_colormap_color_group;
+static gint ett_vnc_desktop_screen;
+static gint ett_vnc_key_events;
+static gint ett_vnc_touch_events;
+static gint ett_vnc_slrle_subline;
+static gint ett_vnc_fence_flags;
+
+static expert_field ei_vnc_possible_gtk_vnc_bug;
+static expert_field ei_vnc_auth_code_mismatch;
+static expert_field ei_vnc_unknown_tight_vnc_auth;
+static expert_field ei_vnc_too_many_rectangles;
+static expert_field ei_vnc_too_many_sub_rectangles;
+static expert_field ei_vnc_invalid_encoding;
+static expert_field ei_vnc_too_many_colors;
+static expert_field ei_vnc_too_many_cut_text;
+static expert_field ei_vnc_zrle_failed;
+static expert_field ei_vnc_unknown_tight;
+static expert_field ei_vnc_reassemble;
 
 #define VNC_PORT_RANGE "5500-5501,5900-5901"
 /* Port 5900 is IANA registered (under the service name "Remote Framebuffer"),
diff --git a/epan/dissectors/packet-vntag.c b/epan/dissectors/packet-vntag.c
index 64fca81f5a..64b2fe2135 100644
--- a/epan/dissectors/packet-vntag.c
+++ b/epan/dissectors/packet-vntag.c
@@ -21,22 +21,22 @@ void proto_reg_handoff_vntag(void);
 static dissector_handle_t vntag_handle;
 static dissector_handle_t ethertype_handle;
 
-static int proto_vntag = -1;
-
-static int hf_vntag_etype = -1;
-static int hf_vntag_dir = -1;
-static int hf_vntag_ptr = -1;
-static int hf_vntag_dst = -1;
-static int hf_vntag_looped = -1;
-static int hf_vntag_r = -1;
-static int hf_vntag_version = -1;
-static int hf_vntag_src = -1;
-static int hf_vntag_len = -1;
-static int hf_vntag_trailer = -1;
-
-static gint ett_vntag = -1;
-
-static expert_field ei_vntag_len = EI_INIT;
+static int proto_vntag;
+
+static int hf_vntag_etype;
+static int hf_vntag_dir;
+static int hf_vntag_ptr;
+static int hf_vntag_dst;
+static int hf_vntag_looped;
+static int hf_vntag_r;
+static int hf_vntag_version;
+static int hf_vntag_src;
+static int hf_vntag_len;
+static int hf_vntag_trailer;
+
+static gint ett_vntag;
+
+static expert_field ei_vntag_len;
 
 static const true_false_string vntag_dir_tfs = {
         "From Bridge",
diff --git a/epan/dissectors/packet-vp8.c b/epan/dissectors/packet-vp8.c
index 7a426bcefc..e7363f953d 100644
--- a/epan/dissectors/packet-vp8.c
+++ b/epan/dissectors/packet-vp8.c
@@ -48,49 +48,49 @@ void proto_register_vp8(void);
 static dissector_handle_t vp8_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_vp8 = -1;
-static int hf_vp8_pld_x_bit = -1;
-static int hf_vp8_pld_r_bit = -1;
-static int hf_vp8_pld_n_bit = -1;
-static int hf_vp8_pld_s_bit = -1;
-static int hf_vp8_pld_part_id = -1;
-static int hf_vp8_pld_i_bit = -1;
-static int hf_vp8_pld_l_bit = -1;
-static int hf_vp8_pld_t_bit = -1;
-static int hf_vp8_pld_k_bit = -1;
-static int hf_vp8_pld_rsv_a = -1;
-static int hf_vp8_pld_picture_id = -1;
-static int hf_vp8_pld_extended_picture_id = -1;
-static int hf_vp8_pld_tl0picidx = -1;
-static int hf_vp8_pld_tid = -1;
-static int hf_vp8_pld_y_bit = -1;
-static int hf_vp8_pld_keyidx = -1;
+static int proto_vp8;
+static int hf_vp8_pld_x_bit;
+static int hf_vp8_pld_r_bit;
+static int hf_vp8_pld_n_bit;
+static int hf_vp8_pld_s_bit;
+static int hf_vp8_pld_part_id;
+static int hf_vp8_pld_i_bit;
+static int hf_vp8_pld_l_bit;
+static int hf_vp8_pld_t_bit;
+static int hf_vp8_pld_k_bit;
+static int hf_vp8_pld_rsv_a;
+static int hf_vp8_pld_picture_id;
+static int hf_vp8_pld_extended_picture_id;
+static int hf_vp8_pld_tl0picidx;
+static int hf_vp8_pld_tid;
+static int hf_vp8_pld_y_bit;
+static int hf_vp8_pld_keyidx;
 
 /* payload header fields */
-static int hf_vp8_hdr_frametype = -1;
-static int hf_vp8_hdr_version = -1;
-static int hf_vp8_hdr_show_bit = -1;
-static int hf_vp8_hdr_first_partition_size = -1;
+static int hf_vp8_hdr_frametype;
+static int hf_vp8_hdr_version;
+static int hf_vp8_hdr_show_bit;
+static int hf_vp8_hdr_first_partition_size;
 
 /* keyframe fields */
-static int hf_vp8_keyframe_start_code = -1;
-static int hf_vp8_keyframe_width = -1;
-static int hf_vp8_keyframe_horizontal_scale = -1;
-static int hf_vp8_keyframe_height = -1;
-static int hf_vp8_keyframe_vertical_scale = -1;
+static int hf_vp8_keyframe_start_code;
+static int hf_vp8_keyframe_width;
+static int hf_vp8_keyframe_horizontal_scale;
+static int hf_vp8_keyframe_height;
+static int hf_vp8_keyframe_vertical_scale;
 
 /* Initialize the subtree pointers */
-static int ett_vp8 = -1;
-static int ett_vp8_payload_descriptor = -1;
-static int ett_vp8_payload_header = -1;
-static int ett_vp8_payload = -1;
-static int ett_vp8_keyframe = -1;
-
-static expert_field ei_vp8_startcode = EI_INIT;
-static expert_field ei_vp8_undecoded = EI_INIT;
-static expert_field ei_vp8_continuation = EI_INIT;
-static expert_field ei_vp8_first_partition_split = EI_INIT;
-static expert_field ei_vp8_first_partition_plus = EI_INIT;
+static int ett_vp8;
+static int ett_vp8_payload_descriptor;
+static int ett_vp8_payload_header;
+static int ett_vp8_payload;
+static int ett_vp8_keyframe;
+
+static expert_field ei_vp8_startcode;
+static expert_field ei_vp8_undecoded;
+static expert_field ei_vp8_continuation;
+static expert_field ei_vp8_first_partition_split;
+static expert_field ei_vp8_first_partition_plus;
 
 static void
 dissect_vp8_payload_descriptor(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *vp8_tree, gint *offset, gboolean *hasHeader);
diff --git a/epan/dissectors/packet-vp9.c b/epan/dissectors/packet-vp9.c
index cab0ad3191..381e02508d 100644
--- a/epan/dissectors/packet-vp9.c
+++ b/epan/dissectors/packet-vp9.c
@@ -41,37 +41,37 @@
 #define VP9_16_BITS_MASK 0xFFFF
 #define VP9_EXTENDED_PID 0x7FFF
 
-static int proto_vp9 = -1;
+static int proto_vp9;
 
-static int hf_vp9_pld_i_bit = -1;
-static int hf_vp9_pld_p_bit = -1;
-static int hf_vp9_pld_l_bit = -1;
-static int hf_vp9_pld_f_bit = -1;
-static int hf_vp9_pld_b_bit = -1;
-static int hf_vp9_pld_e_bit = -1;
-static int hf_vp9_pld_v_bit = -1;
-static int hf_vp9_pld_z_bit = -1;
-static int hf_vp9_pld_u_bit = -1;
-static int hf_vp9_pld_m_bit = -1;
-static int hf_vp9_pld_d_bit = -1;
-static int hf_vp9_pld_n_bit = -1;
-static int hf_vp9_pld_y_bit = -1;
-static int hf_vp9_pld_g_bit = -1;
-static int hf_vp9_pld_pg_bits = -1;
-static int hf_vp9_pld_n_s_bits = -1;
-static int hf_vp9_pld_n_g_bits = -1;
-static int hf_vp9_pld_sid_bits = -1;
-static int hf_vp9_pld_pid_bits = -1;
-static int hf_vp9_pld_tid_bits = -1;
-static int hf_vp9_pld_width_bits = -1;
-static int hf_vp9_pld_height_bits = -1;
-static int hf_vp9_pld_p_diff_bits = -1;
-static int hf_vp9_pld_tl0picidx_bits = -1;
-static int hf_vp9_pld_pg_extended_bits = -1;
-static int hf_vp9_pld_pid_extended_bits = -1;
+static int hf_vp9_pld_i_bit;
+static int hf_vp9_pld_p_bit;
+static int hf_vp9_pld_l_bit;
+static int hf_vp9_pld_f_bit;
+static int hf_vp9_pld_b_bit;
+static int hf_vp9_pld_e_bit;
+static int hf_vp9_pld_v_bit;
+static int hf_vp9_pld_z_bit;
+static int hf_vp9_pld_u_bit;
+static int hf_vp9_pld_m_bit;
+static int hf_vp9_pld_d_bit;
+static int hf_vp9_pld_n_bit;
+static int hf_vp9_pld_y_bit;
+static int hf_vp9_pld_g_bit;
+static int hf_vp9_pld_pg_bits;
+static int hf_vp9_pld_n_s_bits;
+static int hf_vp9_pld_n_g_bits;
+static int hf_vp9_pld_sid_bits;
+static int hf_vp9_pld_pid_bits;
+static int hf_vp9_pld_tid_bits;
+static int hf_vp9_pld_width_bits;
+static int hf_vp9_pld_height_bits;
+static int hf_vp9_pld_p_diff_bits;
+static int hf_vp9_pld_tl0picidx_bits;
+static int hf_vp9_pld_pg_extended_bits;
+static int hf_vp9_pld_pid_extended_bits;
 
-static int ett_vp9 = -1;
-static int ett_vp9_descriptor = -1;
+static int ett_vp9;
+static int ett_vp9_descriptor;
 
 static int *ett[] = {
     &ett_vp9,
diff --git a/epan/dissectors/packet-vpp.c b/epan/dissectors/packet-vpp.c
index 8e7525fdd2..898d7093d5 100644
--- a/epan/dissectors/packet-vpp.c
+++ b/epan/dissectors/packet-vpp.c
@@ -25,32 +25,32 @@
 void proto_register_vpp(void);
 void proto_reg_handoff_vpp(void);
 
-static int proto_vpp = -1;
-static int proto_vpp_metadata = -1;
-static int proto_vpp_opaque = -1;
-static int proto_vpp_opaque2 = -1;
-static int proto_vpp_trace = -1;
-static int hf_vpp_nodename = -1;
-static int hf_vpp_metadata = -1;
-static int hf_vpp_buffer_index = -1;
-static int hf_vpp_buffer_opaque = -1;
-static int hf_vpp_buffer_opaque2 = -1;
-static int hf_vpp_buffer_trace = -1;
-static int hf_vpp_major_version = -1;
-static int hf_vpp_minor_version = -1;
-static int hf_vpp_protocol_hint = -1;
+static int proto_vpp;
+static int proto_vpp_metadata;
+static int proto_vpp_opaque;
+static int proto_vpp_opaque2;
+static int proto_vpp_trace;
+static int hf_vpp_nodename;
+static int hf_vpp_metadata;
+static int hf_vpp_buffer_index;
+static int hf_vpp_buffer_opaque;
+static int hf_vpp_buffer_opaque2;
+static int hf_vpp_buffer_trace;
+static int hf_vpp_major_version;
+static int hf_vpp_minor_version;
+static int hf_vpp_protocol_hint;
 
 static expert_module_t* expert_vpp;
 
-static expert_field ei_vpp_major_version_error = EI_INIT;
-static expert_field ei_vpp_minor_version_error = EI_INIT;
-static expert_field ei_vpp_protocol_hint_error = EI_INIT;
+static expert_field ei_vpp_major_version_error;
+static expert_field ei_vpp_minor_version_error;
+static expert_field ei_vpp_protocol_hint_error;
 
-static gint ett_vpp = -1;
-static gint ett_vpp_opaque = -1;
-static gint ett_vpp_opaque2 = -1;
-static gint ett_vpp_metadata = -1;
-static gint ett_vpp_trace = -1;
+static gint ett_vpp;
+static gint ett_vpp_opaque;
+static gint ett_vpp_opaque2;
+static gint ett_vpp_metadata;
+static gint ett_vpp_trace;
 
 static dissector_handle_t vpp_dissector_handle;
 static dissector_handle_t vpp_opaque_dissector_handle;
diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c
index 2edf9979d4..72ac275d46 100644
--- a/epan/dissectors/packet-vrrp.c
+++ b/epan/dissectors/packet-vrrp.c
@@ -26,30 +26,30 @@ void proto_reg_handoff_vrrp(void);
 
 static dissector_handle_t vrrp_handle;
 
-static gint proto_vrrp = -1;
-static gint ett_vrrp = -1;
-static gint ett_vrrp_ver_type = -1;
-
-static gint hf_vrrp_ver_type = -1;
-static gint hf_vrrp_version = -1;
-static gint hf_vrrp_type = -1;
-static gint hf_vrrp_virt_rtr_id = -1;
-static gint hf_vrrp_prio = -1;
-static gint hf_vrrp_addr_count = -1;
-static gint hf_vrrp_checksum = -1;
-static gint hf_vrrp_checksum_status = -1;
-static gint hf_vrrp_auth_type = -1;
-static gint hf_vrrp_adver_int = -1;
-static gint hf_vrrp_reserved_mbz = -1;
-static gint hf_vrrp_short_adver_int = -1;
-static gint hf_vrrp_ip = -1;
-static gint hf_vrrp_ip6 = -1;
-static gint hf_vrrp_auth_string = -1;
-static gint hf_vrrp_md5_auth_data = -1;
+static gint proto_vrrp;
+static gint ett_vrrp;
+static gint ett_vrrp_ver_type;
+
+static gint hf_vrrp_ver_type;
+static gint hf_vrrp_version;
+static gint hf_vrrp_type;
+static gint hf_vrrp_virt_rtr_id;
+static gint hf_vrrp_prio;
+static gint hf_vrrp_addr_count;
+static gint hf_vrrp_checksum;
+static gint hf_vrrp_checksum_status;
+static gint hf_vrrp_auth_type;
+static gint hf_vrrp_adver_int;
+static gint hf_vrrp_reserved_mbz;
+static gint hf_vrrp_short_adver_int;
+static gint hf_vrrp_ip;
+static gint hf_vrrp_ip6;
+static gint hf_vrrp_auth_string;
+static gint hf_vrrp_md5_auth_data;
 
 static gboolean g_vrrp_v3_checksum_as_in_v2 = FALSE;
 
-static expert_field ei_vrrp_checksum = EI_INIT;
+static expert_field ei_vrrp_checksum;
 
 #define VRRP_VERSION_MASK  0xf0
 #define VRRP_TYPE_MASK     0x0f
diff --git a/epan/dissectors/packet-vrt.c b/epan/dissectors/packet-vrt.c
index 118e1ba524..809416d008 100644
--- a/epan/dissectors/packet-vrt.c
+++ b/epan/dissectors/packet-vrt.c
@@ -67,117 +67,117 @@ typedef int (*complex_dissector_t)(proto_tree *tree, tvbuff_t *tvb, int offset);
 
 static gboolean vrt_use_ettus_uhd_header_format = FALSE;
 
-static int proto_vrt = -1;
+static int proto_vrt;
 
 /* fields */
-static int hf_vrt_header = -1; /* 32-bit header */
-static int hf_vrt_type = -1; /* 4-bit pkt type */
-static int hf_vrt_cidflag = -1; /* 1-bit class ID flag */
-static int hf_vrt_tflag = -1; /* 1-bit trailer flag */
-static int hf_vrt_tsmflag = -1; /* 1-bit timestamp mode */
-static int hf_vrt_tsi = -1; /* 2-bit timestamp type */
-static int hf_vrt_tsf = -1; /* 2-bit fractional timestamp type */
-static int hf_vrt_seq = -1; /* 4-bit sequence number */
-static int hf_vrt_len = -1; /* 16-bit length */
-static int hf_vrt_sid = -1; /* 32-bit stream ID (opt.) */
-static int hf_vrt_cid = -1; /* 64-bit class ID (opt.) */
-static int hf_vrt_cid_oui = -1; /* 24-bit class ID OUI */
-static int hf_vrt_cid_icc = -1; /* 16-bit class ID ICC */
-static int hf_vrt_cid_pcc = -1; /* 16-bit class ID PCC */
+static int hf_vrt_header; /* 32-bit header */
+static int hf_vrt_type; /* 4-bit pkt type */
+static int hf_vrt_cidflag; /* 1-bit class ID flag */
+static int hf_vrt_tflag; /* 1-bit trailer flag */
+static int hf_vrt_tsmflag; /* 1-bit timestamp mode */
+static int hf_vrt_tsi; /* 2-bit timestamp type */
+static int hf_vrt_tsf; /* 2-bit fractional timestamp type */
+static int hf_vrt_seq; /* 4-bit sequence number */
+static int hf_vrt_len; /* 16-bit length */
+static int hf_vrt_sid; /* 32-bit stream ID (opt.) */
+static int hf_vrt_cid; /* 64-bit class ID (opt.) */
+static int hf_vrt_cid_oui; /* 24-bit class ID OUI */
+static int hf_vrt_cid_icc; /* 16-bit class ID ICC */
+static int hf_vrt_cid_pcc; /* 16-bit class ID PCC */
 static int hf_vrt_cif[8]; /* 32-bit CIF0-CIF7 (opt.) */
-static int hf_vrt_cif0_change_flag = -1; /* 1-bit context field change indicator */
-static int hf_vrt_cif0_ref_pt_id = -1; /* 1-bit reference point identifier */
-static int hf_vrt_cif0_bandwidth = -1; /* 1-bit bandwidth */
-static int hf_vrt_cif0_if_freq = -1; /* 1-bit IF reference frequency */
-static int hf_vrt_cif0_rf_freq = -1; /* 1-bit RF reference frequency */
-static int hf_vrt_cif0_rf_freq_offset = -1; /* 1-bit RF reference frequency offset */
-static int hf_vrt_cif0_if_band_offset = -1; /* 1-bit IF band offset */
-static int hf_vrt_cif0_ref_level = -1; /* 1-bit reference level */
-static int hf_vrt_cif0_gain = -1; /* 1-bit gain */
-static int hf_vrt_cif0_over_range_count = -1; /* 1-bit over-range count */
-static int hf_vrt_cif0_sample_rate = -1; /* 1-bit sample rate */
-static int hf_vrt_cif0_timestamp_adjust = -1; /* 1-bit timestamp adjustment */
-static int hf_vrt_cif0_timestamp_cal = -1; /* 1-bit timestamp calibration time */
-static int hf_vrt_cif0_temperature = -1; /* 1-bit temperature */
-static int hf_vrt_cif0_device_id = -1; /* 1-bit device identifier */
-static int hf_vrt_cif0_state_event = -1; /* 1-bit state/event indicators */
-static int hf_vrt_cif0_signal_data_format = -1; /* 1-bit signal data packet payload format */
-static int hf_vrt_cif0_gps = -1; /* 1-bit formatted GPS */
-static int hf_vrt_cif0_ins = -1; /* 1-bit formatted INS */
-static int hf_vrt_cif0_ecef_ephemeris = -1; /* 1-bit ECEF ephemeris */
-static int hf_vrt_cif0_rel_ephemeris = -1; /* 1-bit relative ephemeris */
-static int hf_vrt_cif0_ephemeris_ref_id = -1; /* 1-bit ephemeris ref ID */
-static int hf_vrt_cif0_gps_ascii = -1; /* 1-bit GPS ASCII */
-static int hf_vrt_cif0_context_assoc_lists = -1; /* 1-bit context association lists */
-static int hf_vrt_cif0_cif7 = -1; /* 1-bit CIF7 */
-static int hf_vrt_cif0_cif6 = -1; /* 1-bit CIF6 */
-static int hf_vrt_cif0_cif5 = -1; /* 1-bit CIF5 */
-static int hf_vrt_cif0_cif4 = -1; /* 1-bit CIF4 */
-static int hf_vrt_cif0_cif3 = -1; /* 1-bit CIF3 */
-static int hf_vrt_cif0_cif2 = -1; /* 1-bit CIF2 */
-static int hf_vrt_cif0_cif1 = -1; /* 1-bit CIF1 */
+static int hf_vrt_cif0_change_flag; /* 1-bit context field change indicator */
+static int hf_vrt_cif0_ref_pt_id; /* 1-bit reference point identifier */
+static int hf_vrt_cif0_bandwidth; /* 1-bit bandwidth */
+static int hf_vrt_cif0_if_freq; /* 1-bit IF reference frequency */
+static int hf_vrt_cif0_rf_freq; /* 1-bit RF reference frequency */
+static int hf_vrt_cif0_rf_freq_offset; /* 1-bit RF reference frequency offset */
+static int hf_vrt_cif0_if_band_offset; /* 1-bit IF band offset */
+static int hf_vrt_cif0_ref_level; /* 1-bit reference level */
+static int hf_vrt_cif0_gain; /* 1-bit gain */
+static int hf_vrt_cif0_over_range_count; /* 1-bit over-range count */
+static int hf_vrt_cif0_sample_rate; /* 1-bit sample rate */
+static int hf_vrt_cif0_timestamp_adjust; /* 1-bit timestamp adjustment */
+static int hf_vrt_cif0_timestamp_cal; /* 1-bit timestamp calibration time */
+static int hf_vrt_cif0_temperature; /* 1-bit temperature */
+static int hf_vrt_cif0_device_id; /* 1-bit device identifier */
+static int hf_vrt_cif0_state_event; /* 1-bit state/event indicators */
+static int hf_vrt_cif0_signal_data_format; /* 1-bit signal data packet payload format */
+static int hf_vrt_cif0_gps; /* 1-bit formatted GPS */
+static int hf_vrt_cif0_ins; /* 1-bit formatted INS */
+static int hf_vrt_cif0_ecef_ephemeris; /* 1-bit ECEF ephemeris */
+static int hf_vrt_cif0_rel_ephemeris; /* 1-bit relative ephemeris */
+static int hf_vrt_cif0_ephemeris_ref_id; /* 1-bit ephemeris ref ID */
+static int hf_vrt_cif0_gps_ascii; /* 1-bit GPS ASCII */
+static int hf_vrt_cif0_context_assoc_lists; /* 1-bit context association lists */
+static int hf_vrt_cif0_cif7; /* 1-bit CIF7 */
+static int hf_vrt_cif0_cif6; /* 1-bit CIF6 */
+static int hf_vrt_cif0_cif5; /* 1-bit CIF5 */
+static int hf_vrt_cif0_cif4; /* 1-bit CIF4 */
+static int hf_vrt_cif0_cif3; /* 1-bit CIF3 */
+static int hf_vrt_cif0_cif2; /* 1-bit CIF2 */
+static int hf_vrt_cif0_cif1; /* 1-bit CIF1 */
 /* TODO: complete CIF1 support (have partial CIF1 support) */
-static int hf_vrt_cif1_phase_offset = -1; /* 1-bit phase offset */
-static int hf_vrt_cif1_polarization = -1; /* 1-bit polarization */
-static int hf_vrt_cif1_range = -1; /* 1-bit range (distance) */
-static int hf_vrt_cif1_aux_freq = -1; /* 1-bit aux frequency */
-static int hf_vrt_cif1_aux_bandwidth = -1; /* 1-bit aux bandwidth */
-static int hf_vrt_cif1_io32 = -1; /* 1-bit discrete I/O (32-bit) */
-static int hf_vrt_cif1_io64 = -1; /* 1-bit discrete I/O (64-bit) */
-static int hf_vrt_cif1_v49_spec = -1; /* 1-bit V49 spec compliance */
-static int hf_vrt_cif1_ver = -1; /* 1-bit version and build code */
-static int hf_vrt_context_ref_pt_id = -1; /* 32-bit reference point identifier */
-static int hf_vrt_context_bandwidth = -1; /* 64-bit bandwidth */
-static int hf_vrt_context_if_freq = -1; /* 64-bit IF reference frequency */
-static int hf_vrt_context_rf_freq = -1; /* 64-bit RF reference frequency */
-static int hf_vrt_context_rf_freq_offset = -1; /* 64-bit RF frequency offset */
-static int hf_vrt_context_if_band_offset = -1; /* 64-bit IF band offset */
-static int hf_vrt_context_ref_level = -1; /* 16-bit reference level */
-static int hf_vrt_context_gain_stage2 = -1; /* 16-bit gain stage 2 */
-static int hf_vrt_context_gain_stage1 = -1; /* 16-bit gain stage 1 */
-static int hf_vrt_context_over_range_count = -1; /* 32-bit over-range count */
-static int hf_vrt_context_sample_rate = -1; /* 64-bit sample rate */
-static int hf_vrt_context_timestamp_adjust = -1; /* 64-bit timestamp adjustment */
-static int hf_vrt_context_timestamp_cal = -1; /* 32-bit timestamp calibration */
-static int hf_vrt_context_temperature = -1; /* 16-bit device temperature */
-static int hf_vrt_context_device_id_oui = -1; /* 24-bit device ID OUI */
-static int hf_vrt_context_device_id_code = -1; /* 16-bit device ID code */
-static int hf_vrt_context_state_event_en_cal_time = -1; /* 1-bit enable calibrated time */
-static int hf_vrt_context_state_event_en_valid_data = -1; /* 1-bit enable valid data */
-static int hf_vrt_context_state_event_en_ref_lock = -1; /* 1-bit enable reference lock */
-static int hf_vrt_context_state_event_en_agc = -1; /* 1-bit enable AGC/MGC */
-static int hf_vrt_context_state_event_en_detected_sig = -1; /* 1-bit enable detected signal */
-static int hf_vrt_context_state_event_en_spectral_inv = -1; /* 1-bit enable spectral inversion */
-static int hf_vrt_context_state_event_en_over_range = -1; /* 1-bit enable over-range */
-static int hf_vrt_context_state_event_en_sample_loss = -1; /* 1-bit enable sample loss */
-static int hf_vrt_context_state_event_cal_time = -1; /* 1-bit enable calibrated time */
-static int hf_vrt_context_state_event_valid_data = -1; /* 1-bit enable valid data */
-static int hf_vrt_context_state_event_ref_lock = -1; /* 1-bit enable reference lock */
-static int hf_vrt_context_state_event_agc = -1; /* 1-bit enable AGC/MGC */
-static int hf_vrt_context_state_event_detected_sig = -1; /* 1-bit enable detected signal */
-static int hf_vrt_context_state_event_spectral_inv = -1; /* 1-bit enable spectral inversion */
-static int hf_vrt_context_state_event_over_range = -1; /* 1-bit enable over-range */
-static int hf_vrt_context_state_event_sample_loss = -1; /* 1-bit enable sample loss */
-static int hf_vrt_context_state_event_user = -1; /* 8-bit user-defined */
-static int hf_vrt_context_signal_data_format_packing = -1; /* 1-bit signal data format packing */
-static int hf_vrt_context_signal_data_format_type = -1; /* 2-bit real/complex type */
-static int hf_vrt_context_signal_data_format_item = -1; /* 5-bit data item format */
-static int hf_vrt_context_signal_data_format_repeat = -1; /* 1-bit sample-component repeat indicator */
-static int hf_vrt_context_signal_data_format_event_size = -1; /* 3-bit event-tag size */
-static int hf_vrt_context_signal_data_format_channel_size = -1; /* 4-bit channel-tag size */
-static int hf_vrt_context_signal_data_format_fraction_size = -1; /* 4-bit data item fraction size */
-static int hf_vrt_context_signal_data_format_packing_size = -1; /* 6-bit item packing field size */
-static int hf_vrt_context_signal_data_format_item_size = -1; /* 6-bit data item size */
-static int hf_vrt_context_signal_data_format_repeat_count = -1; /* 16-bit repeat count */
-static int hf_vrt_context_signal_data_format_vector_size = -1; /* 16-bit vector size */
+static int hf_vrt_cif1_phase_offset; /* 1-bit phase offset */
+static int hf_vrt_cif1_polarization; /* 1-bit polarization */
+static int hf_vrt_cif1_range; /* 1-bit range (distance) */
+static int hf_vrt_cif1_aux_freq; /* 1-bit aux frequency */
+static int hf_vrt_cif1_aux_bandwidth; /* 1-bit aux bandwidth */
+static int hf_vrt_cif1_io32; /* 1-bit discrete I/O (32-bit) */
+static int hf_vrt_cif1_io64; /* 1-bit discrete I/O (64-bit) */
+static int hf_vrt_cif1_v49_spec; /* 1-bit V49 spec compliance */
+static int hf_vrt_cif1_ver; /* 1-bit version and build code */
+static int hf_vrt_context_ref_pt_id; /* 32-bit reference point identifier */
+static int hf_vrt_context_bandwidth; /* 64-bit bandwidth */
+static int hf_vrt_context_if_freq; /* 64-bit IF reference frequency */
+static int hf_vrt_context_rf_freq; /* 64-bit RF reference frequency */
+static int hf_vrt_context_rf_freq_offset; /* 64-bit RF frequency offset */
+static int hf_vrt_context_if_band_offset; /* 64-bit IF band offset */
+static int hf_vrt_context_ref_level; /* 16-bit reference level */
+static int hf_vrt_context_gain_stage2; /* 16-bit gain stage 2 */
+static int hf_vrt_context_gain_stage1; /* 16-bit gain stage 1 */
+static int hf_vrt_context_over_range_count; /* 32-bit over-range count */
+static int hf_vrt_context_sample_rate; /* 64-bit sample rate */
+static int hf_vrt_context_timestamp_adjust; /* 64-bit timestamp adjustment */
+static int hf_vrt_context_timestamp_cal; /* 32-bit timestamp calibration */
+static int hf_vrt_context_temperature; /* 16-bit device temperature */
+static int hf_vrt_context_device_id_oui; /* 24-bit device ID OUI */
+static int hf_vrt_context_device_id_code; /* 16-bit device ID code */
+static int hf_vrt_context_state_event_en_cal_time; /* 1-bit enable calibrated time */
+static int hf_vrt_context_state_event_en_valid_data; /* 1-bit enable valid data */
+static int hf_vrt_context_state_event_en_ref_lock; /* 1-bit enable reference lock */
+static int hf_vrt_context_state_event_en_agc; /* 1-bit enable AGC/MGC */
+static int hf_vrt_context_state_event_en_detected_sig; /* 1-bit enable detected signal */
+static int hf_vrt_context_state_event_en_spectral_inv; /* 1-bit enable spectral inversion */
+static int hf_vrt_context_state_event_en_over_range; /* 1-bit enable over-range */
+static int hf_vrt_context_state_event_en_sample_loss; /* 1-bit enable sample loss */
+static int hf_vrt_context_state_event_cal_time; /* 1-bit enable calibrated time */
+static int hf_vrt_context_state_event_valid_data; /* 1-bit enable valid data */
+static int hf_vrt_context_state_event_ref_lock; /* 1-bit enable reference lock */
+static int hf_vrt_context_state_event_agc; /* 1-bit enable AGC/MGC */
+static int hf_vrt_context_state_event_detected_sig; /* 1-bit enable detected signal */
+static int hf_vrt_context_state_event_spectral_inv; /* 1-bit enable spectral inversion */
+static int hf_vrt_context_state_event_over_range; /* 1-bit enable over-range */
+static int hf_vrt_context_state_event_sample_loss; /* 1-bit enable sample loss */
+static int hf_vrt_context_state_event_user; /* 8-bit user-defined */
+static int hf_vrt_context_signal_data_format_packing; /* 1-bit signal data format packing */
+static int hf_vrt_context_signal_data_format_type; /* 2-bit real/complex type */
+static int hf_vrt_context_signal_data_format_item; /* 5-bit data item format */
+static int hf_vrt_context_signal_data_format_repeat; /* 1-bit sample-component repeat indicator */
+static int hf_vrt_context_signal_data_format_event_size; /* 3-bit event-tag size */
+static int hf_vrt_context_signal_data_format_channel_size; /* 4-bit channel-tag size */
+static int hf_vrt_context_signal_data_format_fraction_size; /* 4-bit data item fraction size */
+static int hf_vrt_context_signal_data_format_packing_size; /* 6-bit item packing field size */
+static int hf_vrt_context_signal_data_format_item_size; /* 6-bit data item size */
+static int hf_vrt_context_signal_data_format_repeat_count; /* 16-bit repeat count */
+static int hf_vrt_context_signal_data_format_vector_size; /* 16-bit vector size */
 static formatted_gps_ins_fields hf_vrt_context_gps; /* struct for formatted GPS */
 static formatted_gps_ins_fields hf_vrt_context_ins; /* struct for formatted INS */
 static ephemeris_fields hf_vrt_context_ecef_ephemeris; /* struct for ECEF ephemeris */
 static ephemeris_fields hf_vrt_context_rel_ephemeris; /* struct for relative ephemeris */
-static int hf_vrt_context_ephemeris_ref_id = -1; /* 32-bit ephemeris reference identifier */
+static int hf_vrt_context_ephemeris_ref_id; /* 32-bit ephemeris reference identifier */
 static int hf_vrt_context_gps_ascii_oui; /* 24-bit GPS/INS manufacturer OUI */
 static int hf_vrt_context_gps_ascii_size; /* 32-bit number of words */
-static int hf_vrt_context_gps_ascii_data = -1; /* Variable GPS ASCII data */
+static int hf_vrt_context_gps_ascii_data; /* Variable GPS ASCII data */
 static int hf_vrt_context_assoc_lists_src_size; /* 32-bit source list size */
 static int hf_vrt_context_assoc_lists_sys_size; /* 32-bit system list size */
 static int hf_vrt_context_assoc_lists_vec_size; /* 32-bit vector-component list size */
@@ -188,52 +188,52 @@ static int hf_vrt_context_assoc_lists_sys_data; /* Variable system context assoc
 static int hf_vrt_context_assoc_lists_vec_data; /* Variable vector-component context association list */
 static int hf_vrt_context_assoc_lists_asy_data; /* Variable asynchronous-channel context association list */
 static int hf_vrt_context_assoc_lists_asy_tag_data; /* Variable asynchronous-channel tag list */
-static int hf_vrt_context_phase_offset = -1; /* 16-bit phase offset */
-static int hf_vrt_context_pol_tilt = -1; /* 16-bit polarization tilt angle */
-static int hf_vrt_context_pol_ellipticity = -1; /* 16-bit polarization ellipticity angle */
-static int hf_vrt_context_range = -1; /* 32-bit range (distance) */
-static int hf_vrt_context_aux_freq = -1; /* 64-bit aux frequency */
-static int hf_vrt_context_aux_bandwidth = -1; /* 64-bit aux bandwidth */
-static int hf_vrt_context_io32 = -1; /* 32-bit discrete I/O */
-static int hf_vrt_context_io64 = -1; /* 64-bit discrete I/O */
-static int hf_vrt_context_v49_spec = -1; /* 32-bit V49 spec compliance */
-static int hf_vrt_context_ver_year = -1; /* 7-bit year */
-static int hf_vrt_context_ver_day = -1; /* 9-bit day */
-static int hf_vrt_context_ver_rev = -1; /* 6-bit revision */
-static int hf_vrt_context_ver_user = -1; /* 10-bit user defined */
-static int hf_vrt_ts_int = -1; /* 32-bit integer timestamp (opt.) */
-static int hf_vrt_ts_frac_picosecond = -1; /* 64-bit fractional timestamp (opt.) */
-static int hf_vrt_ts_frac_sample = -1; /* 64-bit fractional timestamp (opt.) */
-static int hf_vrt_data = -1; /* data */
-static int hf_vrt_trailer = -1; /* 32-bit trailer (opt.) */
-static int hf_vrt_trailer_enables = -1; /* trailer indicator enables */
-static int hf_vrt_trailer_ind = -1; /* trailer indicators */
-static int hf_vrt_trailer_e = -1; /* ass con pac cnt enable */
-static int hf_vrt_trailer_acpc = -1; /* associated context packet count */
-static int hf_vrt_trailer_en_caltime = -1; /* calibrated time indicator */
-static int hf_vrt_trailer_en_valid = -1; /* valid data ind */
-static int hf_vrt_trailer_en_reflock = -1; /* reference locked ind */
-static int hf_vrt_trailer_en_agc = -1; /* AGC/MGC enabled ind */
-static int hf_vrt_trailer_en_sig = -1; /* signal detected ind */
-static int hf_vrt_trailer_en_inv = -1; /* spectral inversion ind */
-static int hf_vrt_trailer_en_overrng = -1; /* overrange indicator */
-static int hf_vrt_trailer_en_sampleloss = -1; /* sample loss indicator */
-static int hf_vrt_trailer_en_user0 = -1; /* User indicator 0 */
-static int hf_vrt_trailer_en_user1 = -1; /* User indicator 1 */
-static int hf_vrt_trailer_en_user2 = -1; /* User indicator 2 */
-static int hf_vrt_trailer_en_user3 = -1; /* User indicator 3 */
-static int hf_vrt_trailer_ind_caltime = -1; /* calibrated time indicator */
-static int hf_vrt_trailer_ind_valid = -1; /* valid data ind */
-static int hf_vrt_trailer_ind_reflock = -1; /* reference locked ind */
-static int hf_vrt_trailer_ind_agc = -1; /* AGC/MGC enabled ind */
-static int hf_vrt_trailer_ind_sig = -1; /* signal detected ind */
-static int hf_vrt_trailer_ind_inv = -1; /* spectral inversion ind */
-static int hf_vrt_trailer_ind_overrng = -1; /* overrange indicator */
-static int hf_vrt_trailer_ind_sampleloss = -1; /* sample loss indicator */
-static int hf_vrt_trailer_ind_user0 = -1; /* User indicator 0 */
-static int hf_vrt_trailer_ind_user1 = -1; /* User indicator 1 */
-static int hf_vrt_trailer_ind_user2 = -1; /* User indicator 2 */
-static int hf_vrt_trailer_ind_user3 = -1; /* User indicator 3 */
+static int hf_vrt_context_phase_offset; /* 16-bit phase offset */
+static int hf_vrt_context_pol_tilt; /* 16-bit polarization tilt angle */
+static int hf_vrt_context_pol_ellipticity; /* 16-bit polarization ellipticity angle */
+static int hf_vrt_context_range; /* 32-bit range (distance) */
+static int hf_vrt_context_aux_freq; /* 64-bit aux frequency */
+static int hf_vrt_context_aux_bandwidth; /* 64-bit aux bandwidth */
+static int hf_vrt_context_io32; /* 32-bit discrete I/O */
+static int hf_vrt_context_io64; /* 64-bit discrete I/O */
+static int hf_vrt_context_v49_spec; /* 32-bit V49 spec compliance */
+static int hf_vrt_context_ver_year; /* 7-bit year */
+static int hf_vrt_context_ver_day; /* 9-bit day */
+static int hf_vrt_context_ver_rev; /* 6-bit revision */
+static int hf_vrt_context_ver_user; /* 10-bit user defined */
+static int hf_vrt_ts_int; /* 32-bit integer timestamp (opt.) */
+static int hf_vrt_ts_frac_picosecond; /* 64-bit fractional timestamp (opt.) */
+static int hf_vrt_ts_frac_sample; /* 64-bit fractional timestamp (opt.) */
+static int hf_vrt_data; /* data */
+static int hf_vrt_trailer; /* 32-bit trailer (opt.) */
+static int hf_vrt_trailer_enables; /* trailer indicator enables */
+static int hf_vrt_trailer_ind; /* trailer indicators */
+static int hf_vrt_trailer_e; /* ass con pac cnt enable */
+static int hf_vrt_trailer_acpc; /* associated context packet count */
+static int hf_vrt_trailer_en_caltime; /* calibrated time indicator */
+static int hf_vrt_trailer_en_valid; /* valid data ind */
+static int hf_vrt_trailer_en_reflock; /* reference locked ind */
+static int hf_vrt_trailer_en_agc; /* AGC/MGC enabled ind */
+static int hf_vrt_trailer_en_sig; /* signal detected ind */
+static int hf_vrt_trailer_en_inv; /* spectral inversion ind */
+static int hf_vrt_trailer_en_overrng; /* overrange indicator */
+static int hf_vrt_trailer_en_sampleloss; /* sample loss indicator */
+static int hf_vrt_trailer_en_user0; /* User indicator 0 */
+static int hf_vrt_trailer_en_user1; /* User indicator 1 */
+static int hf_vrt_trailer_en_user2; /* User indicator 2 */
+static int hf_vrt_trailer_en_user3; /* User indicator 3 */
+static int hf_vrt_trailer_ind_caltime; /* calibrated time indicator */
+static int hf_vrt_trailer_ind_valid; /* valid data ind */
+static int hf_vrt_trailer_ind_reflock; /* reference locked ind */
+static int hf_vrt_trailer_ind_agc; /* AGC/MGC enabled ind */
+static int hf_vrt_trailer_ind_sig; /* signal detected ind */
+static int hf_vrt_trailer_ind_inv; /* spectral inversion ind */
+static int hf_vrt_trailer_ind_overrng; /* overrange indicator */
+static int hf_vrt_trailer_ind_sampleloss; /* sample loss indicator */
+static int hf_vrt_trailer_ind_user0; /* User indicator 0 */
+static int hf_vrt_trailer_ind_user1; /* User indicator 1 */
+static int hf_vrt_trailer_ind_user2; /* User indicator 2 */
+static int hf_vrt_trailer_ind_user3; /* User indicator 3 */
 
 /* fixed sizes (in bytes) of context packet CIF field bits */
 static int context_size_cif0[32] = { 0, 4, 4, 4, 4, 4, 4, 4, 8, 8, 4, 52, 52, 44, 44, 8,
@@ -242,26 +242,26 @@ static int context_size_cif1[32] = { 0, 8, 4, 4, 4, 8, 4, 0, 0, 0, 52, 0, 0, 8,
     4, 4, 4, 4, 4, 0, 0, 0, 4, 4, 4, 4, 0, 4, 4, 4 };
 
 /* subtree state variables */
-static gint ett_vrt = -1;
-static gint ett_header = -1;
-static gint ett_trailer = -1;
-static gint ett_indicators = -1;
-static gint ett_ind_enables = -1;
-static gint ett_cid = -1;
-static gint ett_cif0 = -1;
-static gint ett_cif1 = -1;
-static gint ett_gain = -1;
-static gint ett_device_id = -1;
-static gint ett_state_event = -1;
-static gint ett_signal_data_format = -1;
-static gint ett_gps = -1;
-static gint ett_ins = -1;
-static gint ett_ecef_ephem = -1;
-static gint ett_rel_ephem = -1;
-static gint ett_gps_ascii = -1;
-static gint ett_assoc_lists = -1;
-static gint ett_pol = -1;
-static gint ett_ver = -1;
+static gint ett_vrt;
+static gint ett_header;
+static gint ett_trailer;
+static gint ett_indicators;
+static gint ett_ind_enables;
+static gint ett_cid;
+static gint ett_cif0;
+static gint ett_cif1;
+static gint ett_gain;
+static gint ett_device_id;
+static gint ett_state_event;
+static gint ett_signal_data_format;
+static gint ett_gps;
+static gint ett_ins;
+static gint ett_ecef_ephem;
+static gint ett_rel_ephem;
+static gint ett_gps_ascii;
+static gint ett_assoc_lists;
+static gint ett_pol;
+static gint ett_ver;
 
 /* constants (unit conversion) */
 static const double FEMTOSEC_PER_SEC = 1e-15;
diff --git a/epan/dissectors/packet-vsip.c b/epan/dissectors/packet-vsip.c
index 455cb0b4ce..956a7c2d10 100644
--- a/epan/dissectors/packet-vsip.c
+++ b/epan/dissectors/packet-vsip.c
@@ -677,157 +677,157 @@ static value_string_ext EVsipErrorCode_vals_ext = VALUE_STRING_EXT_INIT(EVsipErr
 
 
 /* Global module variables. */
-static int proto_vsip = -1;
-
-static int hf_vsip_ValueTypeString_Size = -1;
-static int hf_vsip_ValueTypeBinary_Size = -1;
-static int hf_vsip_PingReq_ReplyAddress = -1;
-static int hf_vsip_PingReq_ReplyPort = -1;
-static int hf_vsip_PingReq_ConnType = -1;
-static int hf_vsip_PingResp_SuppConnTypes_VOLATILE = -1;
-static int hf_vsip_PingResp_SuppConnTypes_RTP = -1;
-static int hf_vsip_PingResp_SuppConnTypes_SSL = -1;
-static int hf_vsip_PingResp_SuppConnTypes_UDP_BROADCAST = -1;
-static int hf_vsip_PingResp_SuppConnTypes_TCP_CLIENT = -1;
-static int hf_vsip_PingResp_SuppConnTypes_TCP_SERVER = -1;
-static int hf_vsip_PingResp_SuppConnTypes_UDP_MULTICAST = -1;
-static int hf_vsip_PingResp_SuppConnTypes_UDP_UNICAST = -1;
-static int hf_vsip_PingResp_DeviceIP = -1;
-static int hf_vsip_PingResp_DevicePort = -1;
-static int hf_vsip_PingResp_SuppConnTypes = -1;
-static int hf_vsip_ContentTypeSwitchReq_DeviceGUID = -1;
-static int hf_vsip_PingResp_DeviceGUID = -1;
-static int hf_vsip_PingResp_VendorID = -1;
-static int hf_vsip_PingResp_ProductType = -1;
-static int hf_vsip_PingResp_Status = -1;
-static int hf_vsip_PingResp_SubtypeLen = -1;
-static int hf_vsip_PingResp_Subtype = -1;
-static int hf_vsip_ContentTypeSwitchReq_ApplicationGUID = -1;
-static int hf_vsip_ContentTypeSwitchReq_ContentType = -1;
-static int hf_vsip_ContentTypeSwitchResp_DeviceGUID = -1;
-static int hf_vsip_ContentTypeSwitchResp_SwitchResult = -1;
-static int hf_vsip_GetCapabilitiesReq_DisabledCapabilities = -1;
-static int hf_vsip_GetCapabilitiesResp_CapabilityArray_EntityType = -1;
-static int hf_vsip_GetCapabilitiesResp_CapabilityArray_CapabilityGUID = -1;
-static int hf_vsip_GetCapabilitiesResp_CapabilityArray_VendorID = -1;
-static int hf_vsip_GetCapabilitiesResp_CapabilityArray_VersionNumber = -1;
-static int hf_vsip_GetCapabilitiesResp_CapabilityCount = -1;
-static int hf_vsip_StartDevice_CapabilityGUID = -1;
-static int hf_vsip_StartDevice_TargetAddress = -1;
-static int hf_vsip_StartDevice_TargetPort = -1;
-static int hf_vsip_StartDevice_LocalPort = -1;
-static int hf_vsip_StartDevice_ConnectionType = -1;
-static int hf_vsip_StartDeviceEx_CapabilityGUID = -1;
-static int hf_vsip_StartDeviceEx_TargetAddress = -1;
-static int hf_vsip_StartDeviceEx_TargetPort = -1;
-static int hf_vsip_StartDeviceEx_LocalPort = -1;
-static int hf_vsip_StartDeviceEx_ConnectionType = -1;
-static int hf_vsip_StartDeviceEx_TargetGUID = -1;
-static int hf_vsip_StopDevice_CapabilityGUID = -1;
-static int hf_vsip_StopDeviceEx_CapabilityGUID = -1;
-static int hf_vsip_StopDeviceEx_TargetGUID = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_ShortValue = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_ValueType = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_ConfigItemID = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_IntValue = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_StringValue = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_UintValue = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_GuidValue = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_FloatValue = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_BinaryValue = -1;
-static int hf_vsip_SetConfigReq_CapabilityGUID = -1;
-static int hf_vsip_SetConfigReq_ConfigItemCount = -1;
-static int hf_vsip_GetConfigReq_ConfigItemArray_ConfigItemID = -1;
-static int hf_vsip_GetConfigReq_CapabilityGUID = -1;
-static int hf_vsip_GetConfigReq_ConfigItemCount = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_ConfigItemID = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_ValueType = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_CharValue = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_ShortValue = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_IntValue = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_StringValue = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_UintValue = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_GuidValue = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_FloatValue = -1;
-static int hf_vsip_GetConfigResp_ConfigItemArray_Value_BinaryValue = -1;
-static int hf_vsip_SetConfigReq_ConfigItemArray_Value_CharValue = -1;
-static int hf_vsip_GetConfigResp_CapabilityGUID = -1;
-static int hf_vsip_GetConfigResp_ConfigItemCount = -1;
-static int hf_vsip_SendCommand_CapabilityGUID = -1;
-static int hf_vsip_SendCommand_CommandCode = -1;
-static int hf_vsip_SendCommand_Arg1 = -1;
-static int hf_vsip_SendCommand_Arg2 = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_ValueType = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_CharValue = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_ShortValue = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_IntValue = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_StringValue = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_UintValue = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_GuidValue = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_FloatValue = -1;
-static int hf_vsip_SendCommandEx_AddArgsArray_Value_BinaryValue = -1;
-static int hf_vsip_SendCommandEx_CapabilityGUID = -1;
-static int hf_vsip_SendCommandEx_CommandCode = -1;
-static int hf_vsip_SendCommandEx_Arg1 = -1;
-static int hf_vsip_SendCommandEx_Arg2 = -1;
-static int hf_vsip_SendCommandEx_NumAddArgs = -1;
-static int hf_vsip_EventNotify_CapabilityGUID = -1;
-static int hf_vsip_EventNotify_EventType = -1;
-static int hf_vsip_EventNotify_EventArgument = -1;
-static int hf_vsip_EventSubscribeReq_ReceiverAddress = -1;
-static int hf_vsip_EventSubscribeReq_ReceiverPort = -1;
-static int hf_vsip_EventSubscribeReq_ConnectionType = -1;
-static int hf_vsip_EventSubscribeExReq_ReceiverAddress = -1;
-static int hf_vsip_EventSubscribeExReq_ReceiverPort = -1;
-static int hf_vsip_EventSubscribeExReq_ConnectionType = -1;
-static int hf_vsip_EventSubscribeExReq_DestinationGUID = -1;
-static int hf_vsip_ErrorResponse_RequestMessageType = -1;
-static int hf_vsip_ErrorResponse_StatusCode = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_ValueType = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_CharValue = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_ShortValue = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_IntValue = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_StringValue = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_UintValue = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_GuidValue = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_FloatValue = -1;
-static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_BinaryValue = -1;
-static int hf_vsip_ErrorVAResponse_NumAddArgs = -1;
-static int hf_vsip_Version = -1;
-static int hf_vsip_Type = -1;
-static int hf_vsip_TransacId = -1;
-static int hf_vsip_PacketSize = -1;
-
-static int ett_vsipValueTypeString = -1;
-static int ett_vsipValueTypeBinary = -1;
-static int ett_vsipPingReq = -1;
-static int ett_vsipPingResp_SuppConnTypes = -1;
-static int ett_vsipPingResp = -1;
-static int ett_vsipContentTypeSwitchReq = -1;
-static int ett_vsipContentTypeSwitchResp = -1;
-static int ett_vsipGetCapabilitiesReq = -1;
-static int ett_vsipGetCapabilitiesResp_CapabilityArray = -1;
-static int ett_vsipGetCapabilitiesResp = -1;
-static int ett_vsipStartDevice = -1;
-static int ett_vsipStartDeviceEx = -1;
-static int ett_vsipStopDevice = -1;
-static int ett_vsipStopDeviceEx = -1;
-static int ett_vsipSetConfigReq_ConfigItemArray = -1;
-static int ett_vsipSetConfigReq = -1;
-static int ett_vsipGetConfigReq_ConfigItemArray = -1;
-static int ett_vsipGetConfigReq = -1;
-static int ett_vsipGetConfigResp_ConfigItemArray = -1;
-static int ett_vsipGetConfigResp = -1;
-static int ett_vsipSendCommand = -1;
-static int ett_vsipSendCommandEx_AddArgsArray = -1;
-static int ett_vsipSendCommandEx = -1;
-static int ett_vsipEventNotify = -1;
-static int ett_vsipEventSubscribeReq = -1;
-static int ett_vsipEventSubscribeExReq = -1;
-static int ett_vsipErrorResponse = -1;
-static int ett_vsipErrorVAResponse_AddArgsArray = -1;
-static int ett_vsipErrorVAResponse = -1;
-static int ett_vsip = -1;
+static int proto_vsip;
+
+static int hf_vsip_ValueTypeString_Size;
+static int hf_vsip_ValueTypeBinary_Size;
+static int hf_vsip_PingReq_ReplyAddress;
+static int hf_vsip_PingReq_ReplyPort;
+static int hf_vsip_PingReq_ConnType;
+static int hf_vsip_PingResp_SuppConnTypes_VOLATILE;
+static int hf_vsip_PingResp_SuppConnTypes_RTP;
+static int hf_vsip_PingResp_SuppConnTypes_SSL;
+static int hf_vsip_PingResp_SuppConnTypes_UDP_BROADCAST;
+static int hf_vsip_PingResp_SuppConnTypes_TCP_CLIENT;
+static int hf_vsip_PingResp_SuppConnTypes_TCP_SERVER;
+static int hf_vsip_PingResp_SuppConnTypes_UDP_MULTICAST;
+static int hf_vsip_PingResp_SuppConnTypes_UDP_UNICAST;
+static int hf_vsip_PingResp_DeviceIP;
+static int hf_vsip_PingResp_DevicePort;
+static int hf_vsip_PingResp_SuppConnTypes;
+static int hf_vsip_ContentTypeSwitchReq_DeviceGUID;
+static int hf_vsip_PingResp_DeviceGUID;
+static int hf_vsip_PingResp_VendorID;
+static int hf_vsip_PingResp_ProductType;
+static int hf_vsip_PingResp_Status;
+static int hf_vsip_PingResp_SubtypeLen;
+static int hf_vsip_PingResp_Subtype;
+static int hf_vsip_ContentTypeSwitchReq_ApplicationGUID;
+static int hf_vsip_ContentTypeSwitchReq_ContentType;
+static int hf_vsip_ContentTypeSwitchResp_DeviceGUID;
+static int hf_vsip_ContentTypeSwitchResp_SwitchResult;
+static int hf_vsip_GetCapabilitiesReq_DisabledCapabilities;
+static int hf_vsip_GetCapabilitiesResp_CapabilityArray_EntityType;
+static int hf_vsip_GetCapabilitiesResp_CapabilityArray_CapabilityGUID;
+static int hf_vsip_GetCapabilitiesResp_CapabilityArray_VendorID;
+static int hf_vsip_GetCapabilitiesResp_CapabilityArray_VersionNumber;
+static int hf_vsip_GetCapabilitiesResp_CapabilityCount;
+static int hf_vsip_StartDevice_CapabilityGUID;
+static int hf_vsip_StartDevice_TargetAddress;
+static int hf_vsip_StartDevice_TargetPort;
+static int hf_vsip_StartDevice_LocalPort;
+static int hf_vsip_StartDevice_ConnectionType;
+static int hf_vsip_StartDeviceEx_CapabilityGUID;
+static int hf_vsip_StartDeviceEx_TargetAddress;
+static int hf_vsip_StartDeviceEx_TargetPort;
+static int hf_vsip_StartDeviceEx_LocalPort;
+static int hf_vsip_StartDeviceEx_ConnectionType;
+static int hf_vsip_StartDeviceEx_TargetGUID;
+static int hf_vsip_StopDevice_CapabilityGUID;
+static int hf_vsip_StopDeviceEx_CapabilityGUID;
+static int hf_vsip_StopDeviceEx_TargetGUID;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_ShortValue;
+static int hf_vsip_SetConfigReq_ConfigItemArray_ValueType;
+static int hf_vsip_SetConfigReq_ConfigItemArray_ConfigItemID;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_IntValue;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_StringValue;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_UintValue;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_GuidValue;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_FloatValue;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_BinaryValue;
+static int hf_vsip_SetConfigReq_CapabilityGUID;
+static int hf_vsip_SetConfigReq_ConfigItemCount;
+static int hf_vsip_GetConfigReq_ConfigItemArray_ConfigItemID;
+static int hf_vsip_GetConfigReq_CapabilityGUID;
+static int hf_vsip_GetConfigReq_ConfigItemCount;
+static int hf_vsip_GetConfigResp_ConfigItemArray_ConfigItemID;
+static int hf_vsip_GetConfigResp_ConfigItemArray_ValueType;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_CharValue;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_ShortValue;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_IntValue;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_StringValue;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_UintValue;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_GuidValue;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_FloatValue;
+static int hf_vsip_GetConfigResp_ConfigItemArray_Value_BinaryValue;
+static int hf_vsip_SetConfigReq_ConfigItemArray_Value_CharValue;
+static int hf_vsip_GetConfigResp_CapabilityGUID;
+static int hf_vsip_GetConfigResp_ConfigItemCount;
+static int hf_vsip_SendCommand_CapabilityGUID;
+static int hf_vsip_SendCommand_CommandCode;
+static int hf_vsip_SendCommand_Arg1;
+static int hf_vsip_SendCommand_Arg2;
+static int hf_vsip_SendCommandEx_AddArgsArray_ValueType;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_CharValue;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_ShortValue;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_IntValue;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_StringValue;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_UintValue;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_GuidValue;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_FloatValue;
+static int hf_vsip_SendCommandEx_AddArgsArray_Value_BinaryValue;
+static int hf_vsip_SendCommandEx_CapabilityGUID;
+static int hf_vsip_SendCommandEx_CommandCode;
+static int hf_vsip_SendCommandEx_Arg1;
+static int hf_vsip_SendCommandEx_Arg2;
+static int hf_vsip_SendCommandEx_NumAddArgs;
+static int hf_vsip_EventNotify_CapabilityGUID;
+static int hf_vsip_EventNotify_EventType;
+static int hf_vsip_EventNotify_EventArgument;
+static int hf_vsip_EventSubscribeReq_ReceiverAddress;
+static int hf_vsip_EventSubscribeReq_ReceiverPort;
+static int hf_vsip_EventSubscribeReq_ConnectionType;
+static int hf_vsip_EventSubscribeExReq_ReceiverAddress;
+static int hf_vsip_EventSubscribeExReq_ReceiverPort;
+static int hf_vsip_EventSubscribeExReq_ConnectionType;
+static int hf_vsip_EventSubscribeExReq_DestinationGUID;
+static int hf_vsip_ErrorResponse_RequestMessageType;
+static int hf_vsip_ErrorResponse_StatusCode;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_ValueType;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_CharValue;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_ShortValue;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_IntValue;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_StringValue;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_UintValue;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_GuidValue;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_FloatValue;
+static int hf_vsip_ErrorVAResponse_AddArgsArray_Value_BinaryValue;
+static int hf_vsip_ErrorVAResponse_NumAddArgs;
+static int hf_vsip_Version;
+static int hf_vsip_Type;
+static int hf_vsip_TransacId;
+static int hf_vsip_PacketSize;
+
+static int ett_vsipValueTypeString;
+static int ett_vsipValueTypeBinary;
+static int ett_vsipPingReq;
+static int ett_vsipPingResp_SuppConnTypes;
+static int ett_vsipPingResp;
+static int ett_vsipContentTypeSwitchReq;
+static int ett_vsipContentTypeSwitchResp;
+static int ett_vsipGetCapabilitiesReq;
+static int ett_vsipGetCapabilitiesResp_CapabilityArray;
+static int ett_vsipGetCapabilitiesResp;
+static int ett_vsipStartDevice;
+static int ett_vsipStartDeviceEx;
+static int ett_vsipStopDevice;
+static int ett_vsipStopDeviceEx;
+static int ett_vsipSetConfigReq_ConfigItemArray;
+static int ett_vsipSetConfigReq;
+static int ett_vsipGetConfigReq_ConfigItemArray;
+static int ett_vsipGetConfigReq;
+static int ett_vsipGetConfigResp_ConfigItemArray;
+static int ett_vsipGetConfigResp;
+static int ett_vsipSendCommand;
+static int ett_vsipSendCommandEx_AddArgsArray;
+static int ett_vsipSendCommandEx;
+static int ett_vsipEventNotify;
+static int ett_vsipEventSubscribeReq;
+static int ett_vsipEventSubscribeExReq;
+static int ett_vsipErrorResponse;
+static int ett_vsipErrorVAResponse_AddArgsArray;
+static int ett_vsipErrorVAResponse;
+static int ett_vsip;
 
 
 static guint32 vsip_ValueTypeString(proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, int offset, int hf_string)
diff --git a/epan/dissectors/packet-vsock.c b/epan/dissectors/packet-vsock.c
index 689d7cbfe6..7ae63b4713 100644
--- a/epan/dissectors/packet-vsock.c
+++ b/epan/dissectors/packet-vsock.c
@@ -26,35 +26,35 @@
 void proto_register_vsock(void);
 void proto_reg_handoff_vsock(void);
 
-static int proto_vsock = -1;
+static int proto_vsock;
 static int vsock_address_type = -1;
 static dissector_handle_t vsock_handle;
 
 /* Generic header related fields */
-static int hf_vsock_src_cid = -1;
-static int hf_vsock_src_port = -1;
-static int hf_vsock_dst_cid = -1;
-static int hf_vsock_dst_port = -1;
-static int hf_vsock_op = -1;
-static int hf_vsock_t = -1;
-static int hf_vsock_t_len = -1;
-static int hf_vsock_reserved = -1;
-static int hf_vsock_payload = -1;
+static int hf_vsock_src_cid;
+static int hf_vsock_src_port;
+static int hf_vsock_dst_cid;
+static int hf_vsock_dst_port;
+static int hf_vsock_op;
+static int hf_vsock_t;
+static int hf_vsock_t_len;
+static int hf_vsock_reserved;
+static int hf_vsock_payload;
 
 /* Virtio related fields */
-static int hf_virtio_src_cid = -1;
-static int hf_virtio_dst_cid = -1;
-static int hf_virtio_src_port = -1;
-static int hf_virtio_dst_port = -1;
-static int hf_virtio_len = -1;
-static int hf_virtio_type = -1;
-static int hf_virtio_op = -1;
-static int hf_virtio_flags = -1;
-static int hf_virtio_buf_alloc = -1;
-static int hf_virtio_fwd_cnt = -1;
-
-static gint ett_vsock = -1;
-static gint ett_virtio = -1;
+static int hf_virtio_src_cid;
+static int hf_virtio_dst_cid;
+static int hf_virtio_src_port;
+static int hf_virtio_dst_port;
+static int hf_virtio_len;
+static int hf_virtio_type;
+static int hf_virtio_op;
+static int hf_virtio_flags;
+static int hf_virtio_buf_alloc;
+static int hf_virtio_fwd_cnt;
+
+static gint ett_vsock;
+static gint ett_virtio;
 
 static const value_string af_vsockmon_op_names[] = {
     { 0, "Unknown" },
diff --git a/epan/dissectors/packet-vssmonitoring.c b/epan/dissectors/packet-vssmonitoring.c
index fa5f5e5348..e5762af71f 100644
--- a/epan/dissectors/packet-vssmonitoring.c
+++ b/epan/dissectors/packet-vssmonitoring.c
@@ -37,13 +37,13 @@ static const value_string clksrc_vals[] = {
 void proto_register_vssmonitoring(void);
 void proto_reg_handoff_vssmonitoring(void);
 
-static int proto_vssmonitoring = -1;
+static int proto_vssmonitoring;
 
-static int hf_vssmonitoring_time = -1;
-static int hf_vssmonitoring_clksrc = -1;
-static int hf_vssmonitoring_srcport = -1;
+static int hf_vssmonitoring_time;
+static int hf_vssmonitoring_clksrc;
+static int hf_vssmonitoring_srcport;
 
-static gint ett_vssmonitoring = -1;
+static gint ett_vssmonitoring;
 
 static gboolean vss_dissect_portstamping_only = FALSE;
 static gboolean vss_two_byte_portstamps = FALSE;
diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c
index 87d8791f70..8c6daf7b5f 100644
--- a/epan/dissectors/packet-vtp.c
+++ b/epan/dissectors/packet-vtp.c
@@ -26,52 +26,52 @@ void proto_reg_handoff_vtp(void);
 
 static dissector_handle_t vtp_handle;
 
-static int proto_vtp = -1;
-static int hf_vtp_version = -1;
-static int hf_vtp_code = -1;
-static int hf_vtp_followers = -1;
-static int hf_vtp_md_len = -1;
-static int hf_vtp_md = -1;
-static int hf_vtp_conf_rev_num = -1;
-static int hf_vtp_upd_id = -1;
-static int hf_vtp_upd_ts = -1;
-static int hf_vtp_md5_digest = -1;
-static int hf_vtp_seq_num = -1;
-static int hf_vtp_start_value = -1;
-static int hf_vtp_vlan_info_len = -1;
-static int hf_vtp_vlan_status = -1;
-static int hf_vtp_vlan_status_vlan_susp = -1;
-static int hf_vtp_vlan_type = -1;
-static int hf_vtp_vlan_name_len = -1;
-static int hf_vtp_isl_vlan_id = -1;
-static int hf_vtp_mtu_size = -1;
-static int hf_vtp_802_10_index = -1;
-static int hf_vtp_vlan_name = -1;
-static int hf_vtp_vlan_tlvtype = -1;
-static int hf_vtp_vlan_tlvlength = -1;
-static int hf_vtp_pruning_first_vid = -1;
-static int hf_vtp_pruning_last_vid = -1;
-static int hf_vtp_pruning_active_vid = -1;
-static int hf_vtp_vlan_src_route_ring_num = -1;
-static int hf_vtp_vlan_src_route_bridge_num = -1;
-static int hf_vtp_vlan_stp_type = -1;
-static int hf_vtp_vlan_parent_vlan = -1;
-static int hf_vtp_vlan_translationally_bridged_vlans = -1;
-static int hf_vtp_vlan_pruning = -1;
-static int hf_vtp_vlan_bridge_type = -1;
-static int hf_vtp_vlan_max_are_hop_count = -1;
-static int hf_vtp_vlan_max_ste_hop_count = -1;
-static int hf_vtp_vlan_backup_crf_mode = -1;
-static int hf_vtp_vlan_data = -1;
-static int hf_vtp_reserved = -1;
-
-static gint ett_vtp = -1;
-static gint ett_vtp_vlan_info = -1;
-static gint ett_vtp_vlan_status = -1;
-static gint ett_vtp_tlv = -1;
-static gint ett_vtp_pruning = -1;
-
-static expert_field ei_vtp_vlan_tlvlength_bad = EI_INIT;
+static int proto_vtp;
+static int hf_vtp_version;
+static int hf_vtp_code;
+static int hf_vtp_followers;
+static int hf_vtp_md_len;
+static int hf_vtp_md;
+static int hf_vtp_conf_rev_num;
+static int hf_vtp_upd_id;
+static int hf_vtp_upd_ts;
+static int hf_vtp_md5_digest;
+static int hf_vtp_seq_num;
+static int hf_vtp_start_value;
+static int hf_vtp_vlan_info_len;
+static int hf_vtp_vlan_status;
+static int hf_vtp_vlan_status_vlan_susp;
+static int hf_vtp_vlan_type;
+static int hf_vtp_vlan_name_len;
+static int hf_vtp_isl_vlan_id;
+static int hf_vtp_mtu_size;
+static int hf_vtp_802_10_index;
+static int hf_vtp_vlan_name;
+static int hf_vtp_vlan_tlvtype;
+static int hf_vtp_vlan_tlvlength;
+static int hf_vtp_pruning_first_vid;
+static int hf_vtp_pruning_last_vid;
+static int hf_vtp_pruning_active_vid;
+static int hf_vtp_vlan_src_route_ring_num;
+static int hf_vtp_vlan_src_route_bridge_num;
+static int hf_vtp_vlan_stp_type;
+static int hf_vtp_vlan_parent_vlan;
+static int hf_vtp_vlan_translationally_bridged_vlans;
+static int hf_vtp_vlan_pruning;
+static int hf_vtp_vlan_bridge_type;
+static int hf_vtp_vlan_max_are_hop_count;
+static int hf_vtp_vlan_max_ste_hop_count;
+static int hf_vtp_vlan_backup_crf_mode;
+static int hf_vtp_vlan_data;
+static int hf_vtp_reserved;
+
+static gint ett_vtp;
+static gint ett_vtp_vlan_info;
+static gint ett_vtp_vlan_status;
+static gint ett_vtp_tlv;
+static gint ett_vtp_pruning;
+
+static expert_field ei_vtp_vlan_tlvlength_bad;
 
 static int
 dissect_vlan_info(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree);
diff --git a/epan/dissectors/packet-vuze-dht.c b/epan/dissectors/packet-vuze-dht.c
index 053c7070c1..d0dea0da84 100644
--- a/epan/dissectors/packet-vuze-dht.c
+++ b/epan/dissectors/packet-vuze-dht.c
@@ -183,114 +183,114 @@ static const value_string vuze_dht_network_coordinate_type_vals[] = {
   { 0, NULL }
 };
 
-static int proto_vuze_dht = -1;
+static int proto_vuze_dht;
 
 /* --- fields ---*/
 
 /* address appears in contacts, request header, reply error */
-static int hf_vuze_dht_address = -1;
-static int hf_vuze_dht_address_len = -1;
-static int hf_vuze_dht_address_v4 = -1;
-static int hf_vuze_dht_address_v6 = -1;
-static int hf_vuze_dht_address_port = -1;
+static int hf_vuze_dht_address;
+static int hf_vuze_dht_address_len;
+static int hf_vuze_dht_address_v4;
+static int hf_vuze_dht_address_v6;
+static int hf_vuze_dht_address_port;
 
 /* contact appears in values, reply find_node, reply find_value */
-static int hf_vuze_dht_contact = -1;
-static int hf_vuze_dht_contact_type = -1;
-static int hf_vuze_dht_proto_ver = -1;
+static int hf_vuze_dht_contact;
+static int hf_vuze_dht_contact_type;
+static int hf_vuze_dht_proto_ver;
 
 /* value appears in reply find_value */
-static int hf_vuze_dht_value = -1;
-static int hf_vuze_dht_value_ver = -1;
-static int hf_vuze_dht_value_created = -1;
-static int hf_vuze_dht_value_bytes_count = -1;
-static int hf_vuze_dht_value_bytes = -1;
-static int hf_vuze_dht_value_flags = -1;
-static int hf_vuze_dht_value_life_hours = -1;
-static int hf_vuze_dht_value_replication_factor = -1;
+static int hf_vuze_dht_value;
+static int hf_vuze_dht_value_ver;
+static int hf_vuze_dht_value_created;
+static int hf_vuze_dht_value_bytes_count;
+static int hf_vuze_dht_value_bytes;
+static int hf_vuze_dht_value_flags;
+static int hf_vuze_dht_value_life_hours;
+static int hf_vuze_dht_value_replication_factor;
 
 /* firstly appear in request header */
-static int hf_vuze_dht_connection_id = -1;
-static int hf_vuze_dht_action = -1;
-static int hf_vuze_dht_transaction_id = -1;
-static int hf_vuze_dht_vendor_id = -1;
-static int hf_vuze_dht_network_id = -1;
-static int hf_vuze_dht_local_proto_ver = -1;
-static int hf_vuze_dht_instance_id = -1;
-static int hf_vuze_dht_time = -1;
-static int hf_vuze_dht_generic_flags = -1;
-static int hf_vuze_dht_generic_flags2 = -1;
+static int hf_vuze_dht_connection_id;
+static int hf_vuze_dht_action;
+static int hf_vuze_dht_transaction_id;
+static int hf_vuze_dht_vendor_id;
+static int hf_vuze_dht_network_id;
+static int hf_vuze_dht_local_proto_ver;
+static int hf_vuze_dht_instance_id;
+static int hf_vuze_dht_time;
+static int hf_vuze_dht_generic_flags;
+static int hf_vuze_dht_generic_flags2;
 
 /* firstly appear in reply ping */
-static int hf_vuze_dht_network_coordinates_count = -1;
-static int hf_vuze_dht_network_coordinates = -1;
-static int hf_vuze_dht_network_coordinate = -1;
-static int hf_vuze_dht_network_coordinate_type = -1;
-static int hf_vuze_dht_network_coordinate_size = -1;
-static int hf_vuze_dht_network_coordinate_data = -1;
-static int hf_vuze_dht_network_coordinate_x = -1;
-static int hf_vuze_dht_network_coordinate_y = -1;
-static int hf_vuze_dht_network_coordinate_height = -1;
-static int hf_vuze_dht_network_coordinate_error = -1;
+static int hf_vuze_dht_network_coordinates_count;
+static int hf_vuze_dht_network_coordinates;
+static int hf_vuze_dht_network_coordinate;
+static int hf_vuze_dht_network_coordinate_type;
+static int hf_vuze_dht_network_coordinate_size;
+static int hf_vuze_dht_network_coordinate_data;
+static int hf_vuze_dht_network_coordinate_x;
+static int hf_vuze_dht_network_coordinate_y;
+static int hf_vuze_dht_network_coordinate_height;
+static int hf_vuze_dht_network_coordinate_error;
 
 /* firstly appear in request store */
-static int hf_vuze_dht_spoof_id = -1;
-static int hf_vuze_dht_keys_count = -1;
-static int hf_vuze_dht_keys = -1;
-static int hf_vuze_dht_key = -1;
-static int hf_vuze_dht_key_len = -1;
-static int hf_vuze_dht_key_data = -1;
-static int hf_vuze_dht_value_group = -1;
-static int hf_vuze_dht_value_groups = -1;
-static int hf_vuze_dht_value_groups_count = -1;
-static int hf_vuze_dht_values_count = -1;
+static int hf_vuze_dht_spoof_id;
+static int hf_vuze_dht_keys_count;
+static int hf_vuze_dht_keys;
+static int hf_vuze_dht_key;
+static int hf_vuze_dht_key_len;
+static int hf_vuze_dht_key_data;
+static int hf_vuze_dht_value_group;
+static int hf_vuze_dht_value_groups;
+static int hf_vuze_dht_value_groups_count;
+static int hf_vuze_dht_values_count;
 
 /* firstly appear in reply store */
-static int hf_vuze_dht_diversifications_len = -1;
-static int hf_vuze_dht_diversifications = -1;
+static int hf_vuze_dht_diversifications_len;
+static int hf_vuze_dht_diversifications;
 
 /* firstly appear in request find_node */
-static int hf_vuze_dht_id_len = -1;
-static int hf_vuze_dht_id = -1;
-static int hf_vuze_dht_node_status = -1;
-static int hf_vuze_dht_size = -1;
+static int hf_vuze_dht_id_len;
+static int hf_vuze_dht_id;
+static int hf_vuze_dht_node_status;
+static int hf_vuze_dht_size;
 
 /* firstly appear in reply find_node */
-static int hf_vuze_dht_node_type = -1;
-static int hf_vuze_dht_contacts_count = -1;
-static int hf_vuze_dht_contacts = -1;
+static int hf_vuze_dht_node_type;
+static int hf_vuze_dht_contacts_count;
+static int hf_vuze_dht_contacts;
 
 /* firstly appear in request find_value */
-static int hf_vuze_dht_flags = -1;
-static int hf_vuze_dht_values_num = -1;
-static int hf_vuze_dht_values_total = -1;
-static int hf_vuze_dht_reads_per_min = -1;
-static int hf_vuze_dht_diversification_type = -1;
-static int hf_vuze_dht_max_values = -1;
+static int hf_vuze_dht_flags;
+static int hf_vuze_dht_values_num;
+static int hf_vuze_dht_values_total;
+static int hf_vuze_dht_reads_per_min;
+static int hf_vuze_dht_diversification_type;
+static int hf_vuze_dht_max_values;
 
 /* firstly appear in reply find_value */
-static int hf_vuze_dht_has_continuation = -1;
-static int hf_vuze_dht_has_values = -1;
+static int hf_vuze_dht_has_continuation;
+static int hf_vuze_dht_has_values;
 
 /* firstly appear in reply error */
-static int hf_vuze_dht_error_type = -1;
-static int hf_vuze_dht_key_block_request_len = -1;
-static int hf_vuze_dht_key_block_request = -1;
-static int hf_vuze_dht_signature_len = -1;
-static int hf_vuze_dht_signature = -1;
+static int hf_vuze_dht_error_type;
+static int hf_vuze_dht_key_block_request_len;
+static int hf_vuze_dht_key_block_request;
+static int hf_vuze_dht_signature_len;
+static int hf_vuze_dht_signature;
 
 /* trees */
-static gint ett_vuze_dht = -1;
-static gint ett_vuze_dht_address = -1;
-static gint ett_vuze_dht_contacts = -1;
-static gint ett_vuze_dht_contact = -1;
-static gint ett_vuze_dht_keys = -1;
-static gint ett_vuze_dht_key = -1;
-static gint ett_vuze_dht_value_groups = -1;
-static gint ett_vuze_dht_value_group = -1;
-static gint ett_vuze_dht_value = -1;
-static gint ett_vuze_dht_network_coordinates = -1;
-static gint ett_vuze_dht_network_coordinate = -1;
+static gint ett_vuze_dht;
+static gint ett_vuze_dht_address;
+static gint ett_vuze_dht_contacts;
+static gint ett_vuze_dht_contact;
+static gint ett_vuze_dht_keys;
+static gint ett_vuze_dht_key;
+static gint ett_vuze_dht_value_groups;
+static gint ett_vuze_dht_value_group;
+static gint ett_vuze_dht_value;
+static gint ett_vuze_dht_network_coordinates;
+static gint ett_vuze_dht_network_coordinate;
 
 static dissector_handle_t vuze_dht_handle;
 
diff --git a/epan/dissectors/packet-vxi11.c b/epan/dissectors/packet-vxi11.c
index d93b8bd07b..93eeaaa31d 100644
--- a/epan/dissectors/packet-vxi11.c
+++ b/epan/dissectors/packet-vxi11.c
@@ -92,43 +92,43 @@ void proto_reg_handoff_vxi11_async(void);
 void proto_register_vxi11_intr(void);
 void proto_reg_handoff_vxi11_intr(void);
 
-static int proto_vxi11_core = -1;
-
-static gint ett_vxi11_core = -1;
-static gint ett_vxi11_core_flags = -1;
-static gint ett_vxi11_core_reason = -1;
-
-static int hf_vxi11_core_procedure_v1 = -1;
-static int hf_vxi11_core_abort_port = -1;
-static int hf_vxi11_core_client_id = -1;
-static int hf_vxi11_core_cmd = -1;
-static int hf_vxi11_core_data = -1;
-static int hf_vxi11_core_device = -1;
-static int hf_vxi11_core_enable = -1;
-static int hf_vxi11_core_error = -1;
-static int hf_vxi11_core_flags = -1;
-static int hf_vxi11_core_flag_wait_lock = -1;
-static int hf_vxi11_core_flag_end = -1;
-static int hf_vxi11_core_flag_term_chr_set = -1;
-static int hf_vxi11_core_handle = -1;
-static int hf_vxi11_core_host_addr = -1;
-static int hf_vxi11_core_host_port = -1;
-static int hf_vxi11_core_io_timeout = -1;
-static int hf_vxi11_core_lid = -1;
-static int hf_vxi11_core_lock_device = -1;
-static int hf_vxi11_core_lock_timeout = -1;
-static int hf_vxi11_core_max_recv_size = -1;
-static int hf_vxi11_core_network_order = -1;
-static int hf_vxi11_core_prog_family = -1;
-static int hf_vxi11_core_prog_num = -1;
-static int hf_vxi11_core_prog_vers = -1;
-static int hf_vxi11_core_reason = -1;
-static int hf_vxi11_core_reason_req_cnt = -1;
-static int hf_vxi11_core_reason_chr = -1;
-static int hf_vxi11_core_reason_end = -1;
-static int hf_vxi11_core_size = -1;
-static int hf_vxi11_core_stb = -1;
-static int hf_vxi11_core_term_char = -1;
+static int proto_vxi11_core;
+
+static gint ett_vxi11_core;
+static gint ett_vxi11_core_flags;
+static gint ett_vxi11_core_reason;
+
+static int hf_vxi11_core_procedure_v1;
+static int hf_vxi11_core_abort_port;
+static int hf_vxi11_core_client_id;
+static int hf_vxi11_core_cmd;
+static int hf_vxi11_core_data;
+static int hf_vxi11_core_device;
+static int hf_vxi11_core_enable;
+static int hf_vxi11_core_error;
+static int hf_vxi11_core_flags;
+static int hf_vxi11_core_flag_wait_lock;
+static int hf_vxi11_core_flag_end;
+static int hf_vxi11_core_flag_term_chr_set;
+static int hf_vxi11_core_handle;
+static int hf_vxi11_core_host_addr;
+static int hf_vxi11_core_host_port;
+static int hf_vxi11_core_io_timeout;
+static int hf_vxi11_core_lid;
+static int hf_vxi11_core_lock_device;
+static int hf_vxi11_core_lock_timeout;
+static int hf_vxi11_core_max_recv_size;
+static int hf_vxi11_core_network_order;
+static int hf_vxi11_core_prog_family;
+static int hf_vxi11_core_prog_num;
+static int hf_vxi11_core_prog_vers;
+static int hf_vxi11_core_reason;
+static int hf_vxi11_core_reason_req_cnt;
+static int hf_vxi11_core_reason_chr;
+static int hf_vxi11_core_reason_end;
+static int hf_vxi11_core_size;
+static int hf_vxi11_core_stb;
+static int hf_vxi11_core_term_char;
 
 static const value_string vxi11_core_error_vals[] = {
     { VXI11_CORE_ERROR_NO_ERROR, "No Error" },
@@ -169,11 +169,11 @@ static const value_string vxi11_core_cmd_vals[] = {
 #define VXI11_ASYNC_PROGRAM 0x0607B0
 #define VXI11_ASYNC_VERSION 1
 
-static int proto_vxi11_async = -1;
+static int proto_vxi11_async;
 
-static gint ett_vxi11_async = -1;
+static gint ett_vxi11_async;
 
-static int hf_vxi11_async_procedure_v1 = -1;
+static int hf_vxi11_async_procedure_v1;
 
 
 /* Interrupt protocol. */
@@ -184,12 +184,12 @@ static int hf_vxi11_async_procedure_v1 = -1;
 #define VXI11_INTR_PROGRAM 0x0607B1
 #define VXI11_INTR_VERSION 1
 
-static int proto_vxi11_intr = -1;
+static int proto_vxi11_intr;
 
-static gint ett_vxi11_intr = -1;
+static gint ett_vxi11_intr;
 
-static int hf_vxi11_intr_procedure_v1 = -1;
-static int hf_vxi11_intr_handle = -1;
+static int hf_vxi11_intr_procedure_v1;
+static int hf_vxi11_intr_handle;
 
 
 /* Helper routines for dissecting common fields. */
diff --git a/epan/dissectors/packet-vxlan.c b/epan/dissectors/packet-vxlan.c
index 4bcc61dd62..4064156ae3 100644
--- a/epan/dissectors/packet-vxlan.c
+++ b/epan/dissectors/packet-vxlan.c
@@ -28,28 +28,28 @@ void proto_reg_handoff_vxlan(void);
 static dissector_handle_t vxlan_handle;
 static dissector_handle_t vxlan_gpe_handle;
 
-static int proto_vxlan = -1;
-static int proto_vxlan_gpe = -1;
-
-static int hf_vxlan_flags = -1;
-static int hf_vxlan_gpe_flags = -1;
-static int hf_vxlan_flags_reserved = -1;
-static int hf_vxlan_reserved_8 = -1;
-static int hf_vxlan_flag_a = -1;
-static int hf_vxlan_flag_d = -1;
-static int hf_vxlan_flag_i = -1;
-static int hf_vxlan_flag_g = -1;
-static int hf_vxlan_gbp = -1;
-static int hf_vxlan_vni = -1;
-static int hf_vxlan_gpe_flag_i = -1;
-static int hf_vxlan_gpe_flag_p = -1;
-static int hf_vxlan_gpe_flag_o = -1;
-static int hf_vxlan_gpe_flag_ver = -1;
-static int hf_vxlan_gpe_flag_reserved = -1;
-static int hf_vxlan_gpe_reserved_16 = -1;
-static int hf_vxlan_next_proto = -1;
-static int ett_vxlan = -1;
-static int ett_vxlan_flags = -1;
+static int proto_vxlan;
+static int proto_vxlan_gpe;
+
+static int hf_vxlan_flags;
+static int hf_vxlan_gpe_flags;
+static int hf_vxlan_flags_reserved;
+static int hf_vxlan_reserved_8;
+static int hf_vxlan_flag_a;
+static int hf_vxlan_flag_d;
+static int hf_vxlan_flag_i;
+static int hf_vxlan_flag_g;
+static int hf_vxlan_gbp;
+static int hf_vxlan_vni;
+static int hf_vxlan_gpe_flag_i;
+static int hf_vxlan_gpe_flag_p;
+static int hf_vxlan_gpe_flag_o;
+static int hf_vxlan_gpe_flag_ver;
+static int hf_vxlan_gpe_flag_reserved;
+static int hf_vxlan_gpe_reserved_16;
+static int hf_vxlan_next_proto;
+static int ett_vxlan;
+static int ett_vxlan_flags;
 
 static int * const flags_fields[] = {
         &hf_vxlan_flag_g,
diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c
index a50b5b7797..a85bf109b6 100644
--- a/epan/dissectors/packet-wai.c
+++ b/epan/dissectors/packet-wai.c
@@ -54,98 +54,98 @@ static reassembly_table wai_reassembly_table;
 
 static dissector_handle_t wai_handle;
 
-static int proto_wai = -1;
-
-static gint hf_wai_version = -1;
-static gint hf_wai_type = -1;
-static gint hf_wai_subtype = -1;
-static gint hf_wai_reserved = -1;
-static gint hf_wai_length = -1;
-static gint hf_wai_seq = -1;
-static gint hf_wai_fragm_seq = -1;
-static gint hf_wai_flag = -1;
-static gint hf_wai_data = -1;
-static gint hf_wai_bk_rekeying_flag = -1;
-static gint hf_wai_preauthentication_flag = -1;
-static gint hf_wai_certificate_flag = -1;
-static gint hf_wai_optional_flag = -1;
-static gint hf_wai_usk_rekeying_flag = -1;
-static gint hf_wai_negotiation_flag = -1;
-static gint hf_wai_revoking_flag = -1;
-static gint hf_wai_reserved_flag = -1;
-static gint hf_wai_attr_type = -1;
-static gint hf_wai_cert = -1;
-static gint hf_wai_cert_id = -1;
-static gint hf_wai_cert_data = -1;
-static gint hf_wai_cert_len = -1;
-static gint hf_wai_addid = -1;
-static gint hf_wai_ae_mac = -1;
-static gint hf_wai_asue_mac = -1;
-static gint hf_wai_bkid = -1;
-static gint hf_wai_uskid = -1;
-static gint hf_wai_wie = -1;
-static gint hf_wai_message_auth_code = -1;
-static gint hf_wai_mskid = -1;
-static gint hf_wai_data_pack_num = -1;
-static gint hf_wai_key_data = -1;
-static gint hf_wai_key_data_len = -1;
-static gint hf_wai_key_data_content = -1;
-static gint hf_wai_key_ann_id = -1;
-static gint hf_wai_auth_id = -1;
-static gint hf_wai_identity = -1;
-static gint hf_wai_identity_id = -1;
-static gint hf_wai_identity_len = -1;
-static gint hf_wai_identity_data = -1;
-static gint hf_wai_ecdh = -1;
-static gint hf_wai_ecdh_id = -1;
-static gint hf_wai_ecdh_len = -1;
-static gint hf_wai_ecdh_content = -1;
-static gint hf_wai_counter = -1;
-static gint hf_wai_sta_key_id = -1;
-static gint hf_wai_challenge = -1;
-static gint hf_wai_cert_ver = -1;
-static gint hf_wai_nonce = -1;
-static gint hf_wai_ver_res = -1;
-static gint hf_wai_sign_alg = -1;
-static gint hf_wai_hash_alg_id = -1;
-static gint hf_wai_sign_alg_id = -1;
-static gint hf_wai_param = -1;
-static gint hf_wai_param_id = -1;
-static gint hf_wai_param_content = -1;
-static gint hf_wai_sign_val = -1;
-static gint hf_wai_sign_content = -1;
-static gint hf_wai_sign = -1;
-static gint hf_wai_identity_list = -1;
-static gint hf_wai_reserved_byte = -1;
-static gint hf_wai_no_of_ids = -1;
-static gint hf_wai_access_res = -1;
-static gint hf_wai_fragments = -1;
-static gint hf_wai_fragment = -1;
-static gint hf_wai_fragment_overlap = -1;
-static gint hf_wai_fragment_overlap_conflicts = -1;
-static gint hf_wai_fragment_multiple_tails = -1;
-static gint hf_wai_fragment_too_long_fragment = -1;
-static gint hf_wai_fragment_error = -1;
-static gint hf_wai_fragment_count = -1;
-static gint hf_wai_reassembled_in = -1;
-static gint hf_wai_reassembled_length = -1;
-
-static gint ett_wai = -1;
-static gint ett_wai_data = -1;
-static gint ett_wai_flags = -1;
-static gint ett_wai_certificate = -1;
-static gint ett_wai_mac = -1;
-static gint ett_wai_identity = -1;
-static gint ett_wai_key_data = -1;
-static gint ett_wai_ecdh_param = -1;
-static gint ett_wai_certificate_verification = -1;
-static gint ett_wai_identity_list = -1;
-static gint ett_wai_sign = -1;
-static gint ett_wai_sign_alg = -1;
-static gint ett_wai_sign_val = -1;
-static gint ett_wai_parameter = -1;
-static gint ett_wai_fragment = -1;
-static gint ett_wai_fragments = -1;
+static int proto_wai;
+
+static gint hf_wai_version;
+static gint hf_wai_type;
+static gint hf_wai_subtype;
+static gint hf_wai_reserved;
+static gint hf_wai_length;
+static gint hf_wai_seq;
+static gint hf_wai_fragm_seq;
+static gint hf_wai_flag;
+static gint hf_wai_data;
+static gint hf_wai_bk_rekeying_flag;
+static gint hf_wai_preauthentication_flag;
+static gint hf_wai_certificate_flag;
+static gint hf_wai_optional_flag;
+static gint hf_wai_usk_rekeying_flag;
+static gint hf_wai_negotiation_flag;
+static gint hf_wai_revoking_flag;
+static gint hf_wai_reserved_flag;
+static gint hf_wai_attr_type;
+static gint hf_wai_cert;
+static gint hf_wai_cert_id;
+static gint hf_wai_cert_data;
+static gint hf_wai_cert_len;
+static gint hf_wai_addid;
+static gint hf_wai_ae_mac;
+static gint hf_wai_asue_mac;
+static gint hf_wai_bkid;
+static gint hf_wai_uskid;
+static gint hf_wai_wie;
+static gint hf_wai_message_auth_code;
+static gint hf_wai_mskid;
+static gint hf_wai_data_pack_num;
+static gint hf_wai_key_data;
+static gint hf_wai_key_data_len;
+static gint hf_wai_key_data_content;
+static gint hf_wai_key_ann_id;
+static gint hf_wai_auth_id;
+static gint hf_wai_identity;
+static gint hf_wai_identity_id;
+static gint hf_wai_identity_len;
+static gint hf_wai_identity_data;
+static gint hf_wai_ecdh;
+static gint hf_wai_ecdh_id;
+static gint hf_wai_ecdh_len;
+static gint hf_wai_ecdh_content;
+static gint hf_wai_counter;
+static gint hf_wai_sta_key_id;
+static gint hf_wai_challenge;
+static gint hf_wai_cert_ver;
+static gint hf_wai_nonce;
+static gint hf_wai_ver_res;
+static gint hf_wai_sign_alg;
+static gint hf_wai_hash_alg_id;
+static gint hf_wai_sign_alg_id;
+static gint hf_wai_param;
+static gint hf_wai_param_id;
+static gint hf_wai_param_content;
+static gint hf_wai_sign_val;
+static gint hf_wai_sign_content;
+static gint hf_wai_sign;
+static gint hf_wai_identity_list;
+static gint hf_wai_reserved_byte;
+static gint hf_wai_no_of_ids;
+static gint hf_wai_access_res;
+static gint hf_wai_fragments;
+static gint hf_wai_fragment;
+static gint hf_wai_fragment_overlap;
+static gint hf_wai_fragment_overlap_conflicts;
+static gint hf_wai_fragment_multiple_tails;
+static gint hf_wai_fragment_too_long_fragment;
+static gint hf_wai_fragment_error;
+static gint hf_wai_fragment_count;
+static gint hf_wai_reassembled_in;
+static gint hf_wai_reassembled_length;
+
+static gint ett_wai;
+static gint ett_wai_data;
+static gint ett_wai_flags;
+static gint ett_wai_certificate;
+static gint ett_wai_mac;
+static gint ett_wai_identity;
+static gint ett_wai_key_data;
+static gint ett_wai_ecdh_param;
+static gint ett_wai_certificate_verification;
+static gint ett_wai_identity_list;
+static gint ett_wai_sign;
+static gint ett_wai_sign_alg;
+static gint ett_wai_sign_val;
+static gint ett_wai_parameter;
+static gint ett_wai_fragment;
+static gint ett_wai_fragments;
 
 static const value_string wai_type_names [] = {
     { 1, "WAI protocol package"},
diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c
index f48f2e8c51..29e4884f94 100644
--- a/epan/dissectors/packet-wassp.c
+++ b/epan/dissectors/packet-wassp.c
@@ -3885,136 +3885,136 @@ static const true_false_string wassp_eid_rustate_types =
 
 
 /* Wassp protocol registered fields or ru discover fields*/
-static int proto_wassp = -1;
-static int hf_wassp_version = -1;
-static int hf_wassp_type = -1;
-static int hf_ru_rad_num = -1;
-static int hf_ru_checksum = -1;
-static int hf_ru_ac_op = -1;
-static int hf_ru_mac = -1;
-static int hf_ru_ac_mode = -1;
-static int hf_wassp_seq_num_flag = -1;
-static int hf_seq_num = -1;
-static int hf_wassp_use_frag = -1;
-static int hf_wassp_data_frag = -1;
-static int hf_wassp_more_frag = -1;
-static int hf_wassp_first_frag = -1;
-static int hf_wassp_sessionid = -1;
-static int hf_wassp_length = -1;
-static int hf_wassp_header = -1;
-static int hf_ru_discover_header =-1;
+static int proto_wassp;
+static int hf_wassp_version;
+static int hf_wassp_type;
+static int hf_ru_rad_num;
+static int hf_ru_checksum;
+static int hf_ru_ac_op;
+static int hf_ru_mac;
+static int hf_ru_ac_mode;
+static int hf_wassp_seq_num_flag;
+static int hf_seq_num;
+static int hf_wassp_use_frag;
+static int hf_wassp_data_frag;
+static int hf_wassp_more_frag;
+static int hf_wassp_first_frag;
+static int hf_wassp_sessionid;
+static int hf_wassp_length;
+static int hf_wassp_header;
+static int hf_ru_discover_header;
 
 /* ----------- MU data --------------*/
-static int hf_wassp_mu_type = -1;
-static int hf_wassp_mu_qos = -1;
-static int hf_wassp_mu_action_ssid = -1;
-static int hf_wassp_mu_mac = -1;
-static int hf_wassp_mu_data_tree = -1;
-static int hf_wassp_mu_resv0 = -1;
-static int hf_wassp_mu_resv1 = -1;
-static int hf_wassp_mu_assoc_status = -1;
-static int hf_wassp_mu_data_header =-1;
-static int hf_wassp_mu_action =-1;
-static int hf_wassp_mu_action_field_value =-1;
+static int hf_wassp_mu_type;
+static int hf_wassp_mu_qos;
+static int hf_wassp_mu_action_ssid;
+static int hf_wassp_mu_mac;
+static int hf_wassp_mu_data_tree;
+static int hf_wassp_mu_resv0;
+static int hf_wassp_mu_resv1;
+static int hf_wassp_mu_assoc_status;
+static int hf_wassp_mu_data_header;
+static int hf_wassp_mu_action;
+static int hf_wassp_mu_action_field_value;
 
 
 
 // netflow
-static int  hf_wassp_mu_netflow_version = -1;
-static int  hf_wassp_mu_netflow_length = -1;
-static int  hf_wassp_mu_netflow_flags  = -1;
-static int  hf_wassp_mu_netflow_uptime = -1;
-static int  hf_wassp_mu_netflow_record = -1;
-static int  hf_wassp_mu_netflow_in_bytes = -1;
-static int  hf_wassp_mu_netflow_in_packets = -1;
-static int  hf_wassp_mu_netflow_ip_protocol_number = -1;
-static int  hf_wassp_mu_netflow_source_tos = -1;
-static int  hf_wassp_mu_netflow_source_port = -1;
-static int  hf_wassp_mu_netflow_source_ip = -1;
-static int  hf_wassp_mu_netflow_input_snmp = -1;
-static int  hf_wassp_mu_netflow_dest_port = -1;
-static int  hf_wassp_mu_netflow_dest_ip = -1;
-static int  hf_wassp_mu_netflow_output_snmp = -1;
-static int  hf_wassp_mu_netflow_last_time = -1;
-static int  hf_wassp_mu_netflow_first_time = -1;
-static int  hf_wassp_mu_netflow_in_source_mac = -1;
-static int  hf_wassp_mu_netflow_in_dest_mac = -1;
-static int  hf_wassp_mu_netflow_tree = -1;
-static int  hf_wassp_mu_netflow_header = -1;
+static int  hf_wassp_mu_netflow_version;
+static int  hf_wassp_mu_netflow_length;
+static int  hf_wassp_mu_netflow_flags;
+static int  hf_wassp_mu_netflow_uptime;
+static int  hf_wassp_mu_netflow_record;
+static int  hf_wassp_mu_netflow_in_bytes;
+static int  hf_wassp_mu_netflow_in_packets;
+static int  hf_wassp_mu_netflow_ip_protocol_number;
+static int  hf_wassp_mu_netflow_source_tos;
+static int  hf_wassp_mu_netflow_source_port;
+static int  hf_wassp_mu_netflow_source_ip;
+static int  hf_wassp_mu_netflow_input_snmp;
+static int  hf_wassp_mu_netflow_dest_port;
+static int  hf_wassp_mu_netflow_dest_ip;
+static int  hf_wassp_mu_netflow_output_snmp;
+static int  hf_wassp_mu_netflow_last_time;
+static int  hf_wassp_mu_netflow_first_time;
+static int  hf_wassp_mu_netflow_in_source_mac;
+static int  hf_wassp_mu_netflow_in_dest_mac;
+static int  hf_wassp_mu_netflow_tree;
+static int  hf_wassp_mu_netflow_header;
 
 
 
 /* ------  wassp TLV -------*/
-static int hf_wassp_tlv_value = -1;
-static int hf_wassp_tlv_type_main = -1;
-static int hf_wassp_tlv_type_sub = -1;
-static int hf_wassp_tlv_length = -1;
-static int hf_wassp_tlv_value_octext = -1;    // PW_TYPE_OCTETS
-static int hf_wassp_tlv_value_string = -1;
-static int hf_wassp_tlv_value_ip = -1;
-static int hf_wassp_tlv_value_int = -1;
-static int hf_wassp_tlv_eid_status = -1;
-static int hf_wassp_tlv_eid_action = -1;
-static int hf_wassp_tlv_eid_rustate = -1;
-static int hf_wassp_tlv_unknown = -1;
-static int hf_wassp_tlv_invalid = -1;
-
-static int hf_wassp_ipaddress = -1;
-static int hf_wassp_sub_tree = -1;
-static int hf_wassp_topologykey = -1;
-static int hf_wassp_vlanid = -1;
-static int hf_wassp_topology_mode = -1;
-static int hf_wassp_in_cir = -1;
-static int hf_wassp_out_cir = -1;
-
-static int hf_wassp_flag_1b = -1;
-static int hf_wassp_tos = -1;
-static int hf_cos_tos = -1;
-static int hf_cos_tos_mask = -1;
-static int hf_cos_priority_txq = -1;
-
-static int hf_wassp_tos_mask = -1;
-static int hf_filter_tos_maskbit_priority = -1;
-static int hf_wassp_priority = -1;
-static int hf_cos_rateid = -1;
-static int hf_wassp_filter_rule = -1;
-static int hf_wassp_filter_flag = -1;
-static int hf_filter_rule_port_range = -1;
-static int hf_wassp_ipprotocol = -1;
-static int hf_wassp_netmasklength = -1;
-static int hf_wassp_macaddr = -1;
-static int hf_wassp_macaddr_mask = -1;
-static int hf_wassp_ethernet_type = -1;
-static int hf_wassp_reserve = -1;
-static int hf_wassp_freq = -1;
-static int hf_wassp_rss = -1;
-static int hf_wassp_rssi = -1;
-static int hf_wassp_threatstate = -1;
-static int hf_wassp_radioparams = -1;
-static int hf_wassp_channelfreq = -1;
-static int hf_wassp_mu = -1;
-static int hf_wassp_apprules = -1;
-static int hf_wassp_displayid = -1;
-static int hf_wassp_txbytes = -1;
-static int hf_wassp_rxbytes = -1;
+static int hf_wassp_tlv_value;
+static int hf_wassp_tlv_type_main;
+static int hf_wassp_tlv_type_sub;
+static int hf_wassp_tlv_length;
+static int hf_wassp_tlv_value_octext;    // PW_TYPE_OCTETS
+static int hf_wassp_tlv_value_string;
+static int hf_wassp_tlv_value_ip;
+static int hf_wassp_tlv_value_int;
+static int hf_wassp_tlv_eid_status;
+static int hf_wassp_tlv_eid_action;
+static int hf_wassp_tlv_eid_rustate;
+static int hf_wassp_tlv_unknown;
+static int hf_wassp_tlv_invalid;
+
+static int hf_wassp_ipaddress;
+static int hf_wassp_sub_tree;
+static int hf_wassp_topologykey;
+static int hf_wassp_vlanid;
+static int hf_wassp_topology_mode;
+static int hf_wassp_in_cir;
+static int hf_wassp_out_cir;
+
+static int hf_wassp_flag_1b;
+static int hf_wassp_tos;
+static int hf_cos_tos;
+static int hf_cos_tos_mask;
+static int hf_cos_priority_txq;
+
+static int hf_wassp_tos_mask;
+static int hf_filter_tos_maskbit_priority;
+static int hf_wassp_priority;
+static int hf_cos_rateid;
+static int hf_wassp_filter_rule;
+static int hf_wassp_filter_flag;
+static int hf_filter_rule_port_range;
+static int hf_wassp_ipprotocol;
+static int hf_wassp_netmasklength;
+static int hf_wassp_macaddr;
+static int hf_wassp_macaddr_mask;
+static int hf_wassp_ethernet_type;
+static int hf_wassp_reserve;
+static int hf_wassp_freq;
+static int hf_wassp_rss;
+static int hf_wassp_rssi;
+static int hf_wassp_threatstate;
+static int hf_wassp_radioparams;
+static int hf_wassp_channelfreq;
+static int hf_wassp_mu;
+static int hf_wassp_apprules;
+static int hf_wassp_displayid;
+static int hf_wassp_txbytes;
+static int hf_wassp_rxbytes;
 
 
 
 /* ************************************************************************* */
 /*                   Header values for reassembly                            */
 /* ************************************************************************* */
-static int hf_wassp_fragments = -1;
-static int hf_wassp_fragment = -1;
-static int hf_wassp_fragment_overlap = -1;
-static int hf_wassp_fragment_overlap_conflict = -1;
-static int hf_wassp_fragment_multiple_tails = -1;
-static int hf_wassp_fragment_too_long_fragment = -1;
-static int hf_wassp_fragment_error = -1;
-static int hf_wassp_fragment_count = -1;
-static int hf_wassp_reassembled_in = -1;
-static int hf_wassp_reassembled_length = -1;
-static gint ett_wassp_fragment = -1;
-static gint ett_wassp_fragments = -1;
+static int hf_wassp_fragments;
+static int hf_wassp_fragment;
+static int hf_wassp_fragment_overlap;
+static int hf_wassp_fragment_overlap_conflict;
+static int hf_wassp_fragment_multiple_tails;
+static int hf_wassp_fragment_too_long_fragment;
+static int hf_wassp_fragment_error;
+static int hf_wassp_fragment_count;
+static int hf_wassp_reassembled_in;
+static int hf_wassp_reassembled_length;
+static gint ett_wassp_fragment;
+static gint ett_wassp_fragments;
 
 
 static const fragment_items wassp_frag_items =
@@ -4041,80 +4041,80 @@ static const fragment_items wassp_frag_items =
 
 
 /* Wassp protocol registered subtrees */
-static gint ett_wassp = -1;
-static gint ett_seq_flags = -1;
-static gint ett_wassp_header = -1;
-static gint ett_mu_data_header = -1;
-static gint ett_mu_action_field =-1;
-
-static gint ett_ru_discover_header = -1;
-static gint ett_wassp_tlv = -1;
-static gint ett_wassp_filter_rule = -1;
-static gint ett_lbs_header = -1;
-
-static gint ett_wassp_mu_appl_stats = -1;
-static gint ett_wassp_data = -1;
-static gint ett_wassp_mu_data_netflow = -1;
-static gint ett_wassp_mu_data_netflow_header = -1;
-static gint ett_wassp_tlv_missing = -1;
-static gint ett_wassp_ap_stats_block = -1;
-static gint ett_wassp_mu_rf_stats_block = -1;
-static gint ett_wassp_config_error_block = -1;
-static gint ett_wassp_config_modified_block = -1;
-static gint ett_wassp_global_config_block = -1;
-static gint ett_wassp_radio_config_block = -1;
-static gint ett_wassp_vns_config_block = -1;
-static gint ett_wassp_mu_stats_block = -1;
-static gint ett_wassp_radio_stats_block = -1;
-static gint ett_wassp_ether_stats_block = -1;
-static gint ett_wassp_wds_stats_block = -1;
-static gint ett_wassp_dot1x_stats_block = -1;
-static gint ett_wassp_filter_config_block = -1;
-static gint ett_wassp_site_filter_config_block = -1;
-static gint ett_wassp_filter_ext_config_block = -1;
-static gint ett_wassp_vns_stats_block = -1;
-static gint ett_wassp_radius_config_block = -1;
-static gint ett_wassp_eid_main_tlv_block = -1;
-static gint ett_wassp_radius_server_config_block = -1;
-static gint ett_wassp_site_config_block = -1;
-static gint ett_wassp_policy_config_block = -1;
-static gint ett_wassp_cos_config_block = -1;
-static gint ett_wassp_localbase_lookup_block = -1;
-static gint ett_wassp_app_policy_fixed_block = -1;
-static gint ett_wassp_app_policy_entry_block = -1;
-static gint ett_wassp_s_topo_m_filter_entry_block = -1;
-static gint ett_wassp_s_topo_m_filter_ext_entry_block = -1;
-static gint ett_wassp_11u_config_entry_block = -1;
-static gint ett_wassp_hs2_config_entry_block = -1;
-static gint ett_wassp_extapp_config_entry_block = -1;
+static gint ett_wassp;
+static gint ett_seq_flags;
+static gint ett_wassp_header;
+static gint ett_mu_data_header;
+static gint ett_mu_action_field;
+
+static gint ett_ru_discover_header;
+static gint ett_wassp_tlv;
+static gint ett_wassp_filter_rule;
+static gint ett_lbs_header;
+
+static gint ett_wassp_mu_appl_stats;
+static gint ett_wassp_data;
+static gint ett_wassp_mu_data_netflow;
+static gint ett_wassp_mu_data_netflow_header;
+static gint ett_wassp_tlv_missing;
+static gint ett_wassp_ap_stats_block;
+static gint ett_wassp_mu_rf_stats_block;
+static gint ett_wassp_config_error_block;
+static gint ett_wassp_config_modified_block;
+static gint ett_wassp_global_config_block;
+static gint ett_wassp_radio_config_block;
+static gint ett_wassp_vns_config_block;
+static gint ett_wassp_mu_stats_block;
+static gint ett_wassp_radio_stats_block;
+static gint ett_wassp_ether_stats_block;
+static gint ett_wassp_wds_stats_block;
+static gint ett_wassp_dot1x_stats_block;
+static gint ett_wassp_filter_config_block;
+static gint ett_wassp_site_filter_config_block;
+static gint ett_wassp_filter_ext_config_block;
+static gint ett_wassp_vns_stats_block;
+static gint ett_wassp_radius_config_block;
+static gint ett_wassp_eid_main_tlv_block;
+static gint ett_wassp_radius_server_config_block;
+static gint ett_wassp_site_config_block;
+static gint ett_wassp_policy_config_block;
+static gint ett_wassp_cos_config_block;
+static gint ett_wassp_localbase_lookup_block;
+static gint ett_wassp_app_policy_fixed_block;
+static gint ett_wassp_app_policy_entry_block;
+static gint ett_wassp_s_topo_m_filter_entry_block;
+static gint ett_wassp_s_topo_m_filter_ext_entry_block;
+static gint ett_wassp_11u_config_entry_block;
+static gint ett_wassp_hs2_config_entry_block;
+static gint ett_wassp_extapp_config_entry_block;
 
 
 /* aeroscout */
-static int hf_aeroscout_header = -1;
-static int hf_aeroscout_header_magic_number = -1;  // 2 bytes
-static int hf_aeroscout_request_id = -1;           // 2 bytes
-static int hf_aeroscout_code = -1;                 // 1 byte
-static int hf_aeroscout_sub_code = -1;             // 1 byte
-static int hf_aeroscout_datalength = -1;           // 2 bytes
-static int hf_lbs_vendor_id = -1;                  // 2 byte
-static int hf_lbs_rsvd1 = -1;                      // 2 bytes
-static int hf_lbs_ap_bssid = -1;                   // 6 bytes
-static int hf_lbs_rsvd2 = -1;                      // 1
-static int hf_lbs_rxchan = -1;                     // 1
-static int hf_lsb_tstamp = -1;                     // 4 bytes
-static int hf_lsb_rsvd3 = -1;                      // 2 bytes
-static int hf_lsb_rssi = -1;                       // 1
-static int hf_lsb_rsvd = -1;                       // 1
-static int hf_lsb_noise_floor = -1;                // 1
-static int hf_lsb_rsvd4 = -1;                      // 3 bytes
-static int hf_lsb_chan_rate = -1;                  // 1
-static int hf_lsb_rsvd5 = -1;                      // 1
-static int hf_lsb_wh_addr2 = -1;                   // 6 bytes
-static int hf_lsb_wh_fc = -1;                      // 2 bytes
-static int hf_lsb_wh_seq = -1;                     // 2 bytes
-static int hf_lsb_rsvd6 = -1;                      // 2 bytes
-static int hf_lsb_wh_addr3 = -1;                   // 6 bytes
-static int hf_lsb_wh_addr4 = -1;                   // 6 bytes
+static int hf_aeroscout_header;
+static int hf_aeroscout_header_magic_number;  // 2 bytes
+static int hf_aeroscout_request_id;           // 2 bytes
+static int hf_aeroscout_code;                 // 1 byte
+static int hf_aeroscout_sub_code;             // 1 byte
+static int hf_aeroscout_datalength;           // 2 bytes
+static int hf_lbs_vendor_id;                  // 2 byte
+static int hf_lbs_rsvd1;                      // 2 bytes
+static int hf_lbs_ap_bssid;                   // 6 bytes
+static int hf_lbs_rsvd2;                      // 1
+static int hf_lbs_rxchan;                     // 1
+static int hf_lsb_tstamp;                     // 4 bytes
+static int hf_lsb_rsvd3;                      // 2 bytes
+static int hf_lsb_rssi;                       // 1
+static int hf_lsb_rsvd;                       // 1
+static int hf_lsb_noise_floor;                // 1
+static int hf_lsb_rsvd4;                      // 3 bytes
+static int hf_lsb_chan_rate;                  // 1
+static int hf_lsb_rsvd5;                      // 1
+static int hf_lsb_wh_addr2;                   // 6 bytes
+static int hf_lsb_wh_fc;                      // 2 bytes
+static int hf_lsb_wh_seq;                     // 2 bytes
+static int hf_lsb_rsvd6;                      // 2 bytes
+static int hf_lsb_wh_addr3;                   // 6 bytes
+static int hf_lsb_wh_addr4;                   // 6 bytes
 
 
 
diff --git a/epan/dissectors/packet-waveagent.c b/epan/dissectors/packet-waveagent.c
index 43f426ad59..86ff3c6d46 100644
--- a/epan/dissectors/packet-waveagent.c
+++ b/epan/dissectors/packet-waveagent.c
@@ -29,140 +29,140 @@ void proto_register_waveagent(void);
 void proto_reg_handoff_waveagent(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_waveagent = -1;
-static int hf_waveagent_controlword = -1;
-static int hf_waveagent_payloadlen = -1;
-static int hf_waveagent_transnum = -1;
-static int hf_waveagent_rtoken = -1;
-static int hf_waveagent_flowid = -1;
-static int hf_waveagent_capstatus = -1;
-static int hf_waveagent_protocolversion = -1;
-static int hf_waveagent_capimpl = -1;
-static int hf_waveagent_id = -1;
-static int hf_waveagent_bindtag = -1;
-static int hf_waveagent_version = -1;
-static int hf_waveagent_brokerip = -1;
-static int hf_waveagent_brokerport = -1;
-static int hf_waveagent_bindlevel = -1;
-static int hf_waveagent_bindport = -1;
-static int hf_waveagent_numinterfaces = -1;
-static int hf_waveagent_capabilities2 = -1;
-static int hf_waveagent_ifmask = -1;
-static int hf_waveagent_commandstatus = -1;
-static int hf_waveagent_syserrno = -1;
-static int hf_waveagent_statusstring = -1;
-static int hf_waveagent_rxdatapckts = -1;
-static int hf_waveagent_rxdatabytes = -1;
-static int hf_waveagent_rxpcktrate = -1;
-static int hf_waveagent_rxbyterate = -1;
-static int hf_waveagent_txdatapckts = -1;
-static int hf_waveagent_txdatabytes = -1;
-static int hf_waveagent_txpcktrate = -1;
-static int hf_waveagent_txbyterate = -1;
-static int hf_waveagent_looppckts = -1;
-static int hf_waveagent_loopbytes = -1;
-static int hf_waveagent_rxctlpckts = -1;
-static int hf_waveagent_rxctlbytes = -1;
-static int hf_waveagent_txctlpckts = -1;
-static int hf_waveagent_txctlbytes = -1;
-static int hf_waveagent_unknowncmds = -1;
-static int hf_waveagent_snap = -1;
-static int hf_waveagent_state = -1;
-static int hf_waveagent_appstate = -1;
-static int hf_waveagent_rx1pl = -1;
-static int hf_waveagent_rx2pl = -1;
-static int hf_waveagent_rx3pl = -1;
-static int hf_waveagent_rx4pl = -1;
-static int hf_waveagent_rx5pl = -1;
-static int hf_waveagent_rxoospkts = -1;
-/* static int hf_waveagent_rxmeanlatency = -1; */
-/* static int hf_waveagent_rxminlatency = -1; */
-/* static int hf_waveagent_rxmaxlatency = -1; */
-static int hf_waveagent_latencysum = -1;
-static int hf_waveagent_latencycount = -1;
-static int hf_waveagent_txflowstop = -1;
-static int hf_waveagent_jitter = -1;
-static int hf_waveagent_remoteport = -1;
-static int hf_waveagent_remoteaddr = -1;
-static int hf_waveagent_dscp = -1;
-static int hf_waveagent_fsflags = -1;
-static int hf_waveagent_fscbrflag = -1;
-static int hf_waveagent_fscombinedsetupflag = -1;
-/* static int hf_waveagent_totalbytes = -1; */
-static int hf_waveagent_payfill = -1;
-static int hf_waveagent_paysize = -1;
-static int hf_waveagent_avgrate = -1;
-static int hf_waveagent_rxflownum = -1;
-static int hf_waveagent_mode = -1;
-static int hf_waveagent_endpointtype = -1;
-static int hf_waveagent_totalframes = -1;
-static int hf_waveagent_bssidstartindex = -1;
-static int hf_waveagent_bssidstopindex = -1;
-static int hf_waveagent_ifindex = -1;
-static int hf_waveagent_iftype = -1;
-static int hf_waveagent_ifdescription = -1;
-static int hf_waveagent_ifmacaddr = -1;
-static int hf_waveagent_iflinkspeed = -1;
-static int hf_waveagent_ifdhcp = -1;
-static int hf_waveagent_ifwlanbssid = -1;
-static int hf_waveagent_ifwlanssid = -1;
-static int hf_waveagent_ifiptype = -1;
-static int hf_waveagent_ifipv4 = -1;
-static int hf_waveagent_ifipv6 = -1;
-static int hf_waveagent_ifdhcpserver = -1;
-static int hf_waveagent_ifgateway = -1;
-static int hf_waveagent_ifdnsserver = -1;
-static int hf_waveagent_ifethl2status = -1;
-static int hf_waveagent_ifwlanl2status = -1;
-static int hf_waveagent_ifl3status = -1;
-static int hf_waveagent_totalbssid = -1;
-static int hf_waveagent_returnedbssid = -1;
-static int hf_waveagent_scanbssid = -1;
-static int hf_waveagent_scanssid = -1;
-static int hf_waveagent_ifwlanrssi = -1;
-static int hf_waveagent_ifwlansupprates = -1;
-static int hf_waveagent_ifwlancapabilities = -1;
-static int hf_waveagent_ifwlanchannel = -1;
-static int hf_waveagent_ifwlanprivacy = -1;
-static int hf_waveagent_ifwlanbssmode = -1;
-static int hf_waveagent_ifwlannoise = -1;
-static int hf_waveagent_ifphytypes = -1;
-static int hf_waveagent_ifphytypebit0 = -1;
-static int hf_waveagent_ifphytypebit1 = -1;
-static int hf_waveagent_ifphytypebit2 = -1;
-static int hf_waveagent_ifphytypebit3 = -1;
-/* static int hf_waveagent_ifphytypebit4 = -1; */
-static int hf_waveagent_ifwlanauthentication = -1;
-static int hf_waveagent_ifwlancipher = -1;
-static int hf_waveagent_delayfactor = -1;
-static int hf_waveagent_medialossrate = -1;
-static int hf_waveagent_txstartts = -1;
-static int hf_waveagent_txendts = -1;
-static int hf_waveagent_rxstartts = -1;
-static int hf_waveagent_rxendts = -1;
-static int hf_waveagent_oidcode = -1;
-static int hf_waveagent_oidvalue = -1;
-static int hf_waveagent_destip = -1;
-static int hf_waveagent_destport = -1;
-static int hf_waveagent_connectflags = -1;
-static int hf_waveagent_connecttype = -1;
-static int hf_waveagent_minrssi = -1;
-static int hf_waveagent_connecttimeout = -1;
-static int hf_waveagent_connectattempts = -1;
-static int hf_waveagent_reason = -1;
-static int hf_waveagent_sigsequencenum = -1;
-static int hf_waveagent_relaydestid = -1;
-static int hf_waveagent_relaysrcid = -1;
-static int hf_waveagent_relaymessagest = -1;
+static int proto_waveagent;
+static int hf_waveagent_controlword;
+static int hf_waveagent_payloadlen;
+static int hf_waveagent_transnum;
+static int hf_waveagent_rtoken;
+static int hf_waveagent_flowid;
+static int hf_waveagent_capstatus;
+static int hf_waveagent_protocolversion;
+static int hf_waveagent_capimpl;
+static int hf_waveagent_id;
+static int hf_waveagent_bindtag;
+static int hf_waveagent_version;
+static int hf_waveagent_brokerip;
+static int hf_waveagent_brokerport;
+static int hf_waveagent_bindlevel;
+static int hf_waveagent_bindport;
+static int hf_waveagent_numinterfaces;
+static int hf_waveagent_capabilities2;
+static int hf_waveagent_ifmask;
+static int hf_waveagent_commandstatus;
+static int hf_waveagent_syserrno;
+static int hf_waveagent_statusstring;
+static int hf_waveagent_rxdatapckts;
+static int hf_waveagent_rxdatabytes;
+static int hf_waveagent_rxpcktrate;
+static int hf_waveagent_rxbyterate;
+static int hf_waveagent_txdatapckts;
+static int hf_waveagent_txdatabytes;
+static int hf_waveagent_txpcktrate;
+static int hf_waveagent_txbyterate;
+static int hf_waveagent_looppckts;
+static int hf_waveagent_loopbytes;
+static int hf_waveagent_rxctlpckts;
+static int hf_waveagent_rxctlbytes;
+static int hf_waveagent_txctlpckts;
+static int hf_waveagent_txctlbytes;
+static int hf_waveagent_unknowncmds;
+static int hf_waveagent_snap;
+static int hf_waveagent_state;
+static int hf_waveagent_appstate;
+static int hf_waveagent_rx1pl;
+static int hf_waveagent_rx2pl;
+static int hf_waveagent_rx3pl;
+static int hf_waveagent_rx4pl;
+static int hf_waveagent_rx5pl;
+static int hf_waveagent_rxoospkts;
+/* static int hf_waveagent_rxmeanlatency; */
+/* static int hf_waveagent_rxminlatency; */
+/* static int hf_waveagent_rxmaxlatency; */
+static int hf_waveagent_latencysum;
+static int hf_waveagent_latencycount;
+static int hf_waveagent_txflowstop;
+static int hf_waveagent_jitter;
+static int hf_waveagent_remoteport;
+static int hf_waveagent_remoteaddr;
+static int hf_waveagent_dscp;
+static int hf_waveagent_fsflags;
+static int hf_waveagent_fscbrflag;
+static int hf_waveagent_fscombinedsetupflag;
+/* static int hf_waveagent_totalbytes; */
+static int hf_waveagent_payfill;
+static int hf_waveagent_paysize;
+static int hf_waveagent_avgrate;
+static int hf_waveagent_rxflownum;
+static int hf_waveagent_mode;
+static int hf_waveagent_endpointtype;
+static int hf_waveagent_totalframes;
+static int hf_waveagent_bssidstartindex;
+static int hf_waveagent_bssidstopindex;
+static int hf_waveagent_ifindex;
+static int hf_waveagent_iftype;
+static int hf_waveagent_ifdescription;
+static int hf_waveagent_ifmacaddr;
+static int hf_waveagent_iflinkspeed;
+static int hf_waveagent_ifdhcp;
+static int hf_waveagent_ifwlanbssid;
+static int hf_waveagent_ifwlanssid;
+static int hf_waveagent_ifiptype;
+static int hf_waveagent_ifipv4;
+static int hf_waveagent_ifipv6;
+static int hf_waveagent_ifdhcpserver;
+static int hf_waveagent_ifgateway;
+static int hf_waveagent_ifdnsserver;
+static int hf_waveagent_ifethl2status;
+static int hf_waveagent_ifwlanl2status;
+static int hf_waveagent_ifl3status;
+static int hf_waveagent_totalbssid;
+static int hf_waveagent_returnedbssid;
+static int hf_waveagent_scanbssid;
+static int hf_waveagent_scanssid;
+static int hf_waveagent_ifwlanrssi;
+static int hf_waveagent_ifwlansupprates;
+static int hf_waveagent_ifwlancapabilities;
+static int hf_waveagent_ifwlanchannel;
+static int hf_waveagent_ifwlanprivacy;
+static int hf_waveagent_ifwlanbssmode;
+static int hf_waveagent_ifwlannoise;
+static int hf_waveagent_ifphytypes;
+static int hf_waveagent_ifphytypebit0;
+static int hf_waveagent_ifphytypebit1;
+static int hf_waveagent_ifphytypebit2;
+static int hf_waveagent_ifphytypebit3;
+/* static int hf_waveagent_ifphytypebit4; */
+static int hf_waveagent_ifwlanauthentication;
+static int hf_waveagent_ifwlancipher;
+static int hf_waveagent_delayfactor;
+static int hf_waveagent_medialossrate;
+static int hf_waveagent_txstartts;
+static int hf_waveagent_txendts;
+static int hf_waveagent_rxstartts;
+static int hf_waveagent_rxendts;
+static int hf_waveagent_oidcode;
+static int hf_waveagent_oidvalue;
+static int hf_waveagent_destip;
+static int hf_waveagent_destport;
+static int hf_waveagent_connectflags;
+static int hf_waveagent_connecttype;
+static int hf_waveagent_minrssi;
+static int hf_waveagent_connecttimeout;
+static int hf_waveagent_connectattempts;
+static int hf_waveagent_reason;
+static int hf_waveagent_sigsequencenum;
+static int hf_waveagent_relaydestid;
+static int hf_waveagent_relaysrcid;
+static int hf_waveagent_relaymessagest;
 
 /* Initialize the subtree pointers */
-static gint ett_waveagent = -1;
-static gint ett_statechange = -1;
-static gint ett_phytypes = -1;
-static gint ett_fsflags = -1;
+static gint ett_waveagent;
+static gint ett_statechange;
+static gint ett_phytypes;
+static gint ett_fsflags;
 static gint ett_scindex[8];  /* NUM_STATE_CHANGES */
 static gint ett_bss[8];  /* NUM_BSS           */
-static gint ett_relaymessage = -1;
+static gint ett_relaymessage;
 
 
 static const value_string control_words[] = {
diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c
index 21045beeae..64f42cde12 100644
--- a/epan/dissectors/packet-wbxml.c
+++ b/epan/dissectors/packet-wbxml.c
@@ -125,49 +125,49 @@ void proto_reg_handoff_wbxml(void);
 
 
 /* Initialize the protocol and registered fields */
-static int proto_wbxml = -1;
-static int hf_wbxml_version = -1;
-static int hf_wbxml_public_id_known = -1;
-static int hf_wbxml_public_id_literal = -1;
-static int hf_wbxml_charset = -1;
-static int hf_wbxml_string_table_item_offset = -1;
-static int hf_wbxml_string_table_item_string = -1;
-static int hf_wbxml_switch_page = -1;
-static int hf_wbxml_known_tag = -1;
-static int hf_wbxml_end_known_tag = -1;
-static int hf_wbxml_end_known_tag_uint = -1;
-static int hf_wbxml_str_i = -1;
-static int hf_wbxml_str_t = -1;
-static int hf_wbxml_opaque_data = -1;
-static int hf_wbxml_entity = -1;
-static int hf_wbxml_literal = -1;
-static int hf_wbxml_ext_i = -1;
-static int hf_wbxml_ext_t = -1;
-static int hf_wbxml_extension_token = -1;
-static int hf_wbxml_reserved_2 = -1;
-static int hf_wbxml_invalid_token = -1;
-static int hf_wbxml_known_attrvalue = -1;
-static int hf_wbxml_known_attrstart = -1;
-static int hf_wbxml_end_literal_tag = -1;
-static int hf_wbxml_literal_a = -1;
-static int hf_wbxml_literal_c = -1;
-static int hf_wbxml_literal_ac = -1;
-static int hf_wbxml_end_pi = -1;
-static int hf_wbxml_end_attribute_list = -1;
-static int hf_wbxml_pi_xml = -1;
+static int proto_wbxml;
+static int hf_wbxml_version;
+static int hf_wbxml_public_id_known;
+static int hf_wbxml_public_id_literal;
+static int hf_wbxml_charset;
+static int hf_wbxml_string_table_item_offset;
+static int hf_wbxml_string_table_item_string;
+static int hf_wbxml_switch_page;
+static int hf_wbxml_known_tag;
+static int hf_wbxml_end_known_tag;
+static int hf_wbxml_end_known_tag_uint;
+static int hf_wbxml_str_i;
+static int hf_wbxml_str_t;
+static int hf_wbxml_opaque_data;
+static int hf_wbxml_entity;
+static int hf_wbxml_literal;
+static int hf_wbxml_ext_i;
+static int hf_wbxml_ext_t;
+static int hf_wbxml_extension_token;
+static int hf_wbxml_reserved_2;
+static int hf_wbxml_invalid_token;
+static int hf_wbxml_known_attrvalue;
+static int hf_wbxml_known_attrstart;
+static int hf_wbxml_end_literal_tag;
+static int hf_wbxml_literal_a;
+static int hf_wbxml_literal_c;
+static int hf_wbxml_literal_ac;
+static int hf_wbxml_end_pi;
+static int hf_wbxml_end_attribute_list;
+static int hf_wbxml_pi_xml;
 
 /* Initialize the subtree pointers */
-static gint ett_wbxml = -1;
-static gint ett_wbxml_str_tbl = -1;
-static gint ett_wbxml_content = -1;
-static gint ett_wbxml_tags = -1;
-static gint ett_wbxml_string_table_item = -1;
-
-static expert_field ei_wbxml_data_not_shown = EI_INIT;
-static expert_field ei_wbxml_content_type_not_supported = EI_INIT;
-static expert_field ei_wbxml_content_type_disabled = EI_INIT;
-static expert_field ei_wbxml_oversized_uintvar = EI_INIT;
-static expert_field ei_wbxml_too_much_recursion = EI_INIT;
+static gint ett_wbxml;
+static gint ett_wbxml_str_tbl;
+static gint ett_wbxml_content;
+static gint ett_wbxml_tags;
+static gint ett_wbxml_string_table_item;
+
+static expert_field ei_wbxml_data_not_shown;
+static expert_field ei_wbxml_content_type_not_supported;
+static expert_field ei_wbxml_content_type_disabled;
+static expert_field ei_wbxml_oversized_uintvar;
+static expert_field ei_wbxml_too_much_recursion;
 
 static dissector_handle_t wbxml_handle;
 
diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c
index f81dc28f73..72bec2d4dd 100644
--- a/epan/dissectors/packet-wccp.c
+++ b/epan/dissectors/packet-wccp.c
@@ -22,252 +22,252 @@ void proto_reg_handoff_wccp(void);
 
 static dissector_handle_t wccp_handle;
 
-static int proto_wccp = -1;
-static int hf_wccp_message_type = -1;   /* the message type */
-static int hf_wccp_version = -1;        /* protocol version */
-static int hf_bucket = -1;
-static int hf_bucket_bit = -1;
-static int hf_message_header_version = -1;
-static int hf_hash_revision = -1;       /* the version of the hash */
-static int hf_change_num = -1;          /* change number */
-static int hf_hash_flag = -1;
-static int hf_hash_flag_u = -1;
-static int hf_recvd_id = -1;
-static int hf_wc_num = -1;
-static int hf_wc_view_wc_num = -1;
-static int hf_cache_ip = -1;
-static int hf_message_header_length = -1;
-static int hf_item_type = -1;
-static int hf_item_length = -1;
-static int hf_item_data = -1;
-static int hf_security_info_option = -1;
-static int hf_security_info_md5_checksum = -1;
-static int hf_command_element_type = -1;
-static int hf_command_element_length = -1;
-static int hf_command_length = -1;
-static int hf_command_element_shutdown_ip_index = -1;
-static int hf_command_element_shutdown_ipv4 = -1;
-static int hf_command_element_shutdown_ipv6 = -1;
-static int hf_command_unknown = -1;
-static int hf_service_info_type = -1;
-static int hf_service_info_id_standard = -1;
-static int hf_service_info_id_dynamic = -1;
-static int hf_service_info_priority = -1;
-static int hf_service_info_protocol = -1;
-static int hf_service_info_flags = -1;
-static int hf_service_info_flags_src_ip_hash = -1;
-static int hf_service_info_flags_dest_ip_hash = -1;
-static int hf_service_info_flags_src_port_hash = -1;
-static int hf_service_info_flags_dest_port_hash = -1;
-static int hf_service_info_flags_ports_defined = -1;
-static int hf_service_info_flags_ports_source = -1;
-static int hf_service_info_flags_redirect_only_protocol_0 = -1;
-static int hf_service_info_flags_src_ip_alt_hash = -1;
-static int hf_service_info_flags_dest_ip_alt_hash = -1;
-static int hf_service_info_flags_src_port_alt_hash = -1;
-static int hf_service_info_flags_dest_port_alt_hash = -1;
-static int hf_service_info_flags_reserved = -1;
-static int hf_service_info_source_port = -1;
-static int hf_service_info_destination_port = -1;
-static int hf_router_identity_ip_index = -1;
-static int hf_router_identity_ipv4 = -1;
-static int hf_router_identity_ipv6 = -1;
-static int hf_router_identity_receive_id = -1;
-static int hf_router_identity_send_to_ip_index = -1;
-static int hf_router_identity_send_to_ipv4 = -1;
-static int hf_router_identity_send_to_ipv6 = -1;
-static int hf_router_identity_received_from_num = -1;
-static int hf_web_cache_identity_index = -1;
-static int hf_web_cache_identity_ipv4 = -1;
-static int hf_web_cache_identity_ipv6 = -1;
-static int hf_web_cache_identity_hash_rev = -1;
-static int hf_web_cache_identity_flags = -1;
-static int hf_web_cache_identity_flag_hash_info = -1;
-static int hf_web_cache_identity_flag_assign_type = -1;
-static int hf_web_cache_identity_flag_version_request = -1;
-static int hf_web_cache_identity_flag_reserved = -1;
-static int hf_mask_value_set_element_value_element_num = -1;
-static int hf_assignment_weight = -1;
-static int hf_assignment_status = -1;
-static int hf_assignment_key_ip_index = -1;
-static int hf_assignment_key_ipv4 = -1;
-static int hf_assignment_key_ipv6 = -1;
-static int hf_assignment_key_change_num = -1;
-static int hf_assignment_no_data = -1;
-static int hf_router_view_member_change_num = -1;
-static int hf_router_router_num = -1;
-static int hf_router_identity_router_ip_index = -1;
-static int hf_router_identity_router_ipv4 = -1;
-static int hf_router_identity_router_ipv6 = -1;
-static int hf_wc_view_info_change_num = -1;
-static int hf_wc_view_info_router_ip_index = -1;
-static int hf_wc_view_info_router_ipv4 = -1;
-static int hf_wc_view_info_router_ipv6 = -1;
-static int hf_wc_view_info_wc_ip_index = -1;
-static int hf_wc_view_info_wc_ipv4 = -1;
-static int hf_wc_view_info_wc_ipv6 = -1;
-static int hf_wc_view_router_num = -1;
-static int hf_wc_identity_ip_address_index = -1;
-static int hf_wc_identity_ip_address_ipv4 = -1;
-static int hf_wc_identity_ip_address_ipv6 = -1;
-static int hf_router_identity_received_from_ip_index = -1;
-static int hf_router_identity_received_from_ipv4 = -1;
-static int hf_router_identity_received_from_ipv6 = -1;
-static int hf_router_assignment_element_change_num = -1;
-static int hf_assignment_info_router_num = -1;
-static int hf_hash_buckets_assignment_wc_num = -1;
-static int hf_hash_buckets_assignment_wc_ip_index = -1;
-static int hf_hash_buckets_assignment_wc_ipv4 = -1;
-static int hf_hash_buckets_assignment_wc_ipv6 = -1;
-static int hf_assignment_info_router_ip_index = -1;
-static int hf_assignment_info_router_ipv4 = -1;
-static int hf_assignment_info_router_ipv6 = -1;
-static int hf_router_view_ip_index = -1;
-static int hf_router_view_ipv4 = -1;
-static int hf_router_view_ipv6 = -1;
-static int hf_router_query_info_ip_index = -1;
-static int hf_router_query_info_ipv4 = -1;
-static int hf_router_query_info_ipv6 = -1;
-static int hf_router_query_info_send_to_ip_index = -1;
-static int hf_router_query_info_send_to_ipv4 = -1;
-static int hf_router_query_info_send_to_ipv6 = -1;
-static int hf_router_query_info_target_ip_index = -1;
-static int hf_router_query_info_target_ipv4 = -1;
-static int hf_router_query_info_target_ipv6 = -1;
-static int hf_capability_element_type = -1;
-static int hf_capability_element_length = -1;
-static int hf_capability_info_value = -1;
-static int hf_capability_forwarding_method_flag_gre = -1;
-static int hf_capability_forwarding_method_flag_l2 = -1;
-static int hf_capability_assignment_method_flag_hash = -1;
-static int hf_capability_assignment_method_flag_mask = -1;
-static int hf_capability_return_method_flag_gre = -1;
-static int hf_capability_return_method_flag_l2 = -1;
-static int hf_capability_transmit_t = -1;
-static int hf_capability_transmit_t_upper_limit = -1;
-static int hf_capability_transmit_t_lower_limit = -1;
-static int hf_capability_timer_scale_timeout_scale = -1;
-static int hf_capability_timer_scale_ra_timer_scale = -1;
-static int hf_capability_timer_scale_timeout_scale_upper_limit = -1;
-static int hf_capability_timer_scale_timeout_scale_lower_limit = -1;
-static int hf_capability_timer_scale_ra_scale_upper_limit = -1;
-static int hf_capability_timer_scale_ra_scale_lower_limit = -1;
-static int hf_capability_value = -1;
-static int hf_reserved_zero = -1;
-static int hf_value_element_src_ip_index = -1;
-static int hf_value_element_src_ipv4 = -1;
-static int hf_value_element_src_ipv6 = -1;
-static int hf_value_element_dest_ip_index = -1;
-static int hf_value_element_dest_ipv4 = -1;
-static int hf_value_element_dest_ipv6 = -1;
-static int hf_value_element_src_port = -1;
-static int hf_value_element_dest_port = -1;
-static int hf_value_element_web_cache_ip_index = -1;
-static int hf_value_element_web_cache_ipv4 = -1;
-static int hf_value_element_web_cache_ipv6 = -1;
-static int hf_mask_value_set_list_num_elements = -1;
-static int hf_mask_element_src_ip = -1;
-static int hf_mask_element_dest_ip = -1;
-static int hf_mask_element_src_port = -1;
-static int hf_mask_element_dest_port = -1;
-static int hf_alt_assignment_info_assignment_type = -1;
-static int hf_extended_assignment_data_type = -1;
-static int hf_alt_assignment_info_assignment_length = -1;
-static int hf_alt_assignment_map_assignment_type = -1;
-static int hf_alt_assignment_map_assignment_length = -1;
-static int hf_extended_assignment_data_length = -1;
-static int hf_alt_assignment_info_num_routers = -1;
-static int hf_alt_assignment_mask_value_set_element_num_wc_value_elements = -1;
-static int hf_web_cache_value_element_wc_address_index = -1;
-static int hf_web_cache_value_element_wc_address_ipv4 = -1;
-static int hf_web_cache_value_element_wc_address_ipv6 = -1;
-static int hf_web_cache_value_element_num_values = -1;
-static int hf_web_cache_value_seq_num = -1;
-static int hf_alt_assignment_mask_value_set_list_num_elements = -1;
-static int hf_address_table_family = -1;
-static int hf_address_table_address_length = -1;
-static int hf_address_table_length = -1;
-static int hf_address_table_element = -1;
-
-static gint ett_wccp = -1;
-static gint ett_buckets = -1;
-static gint ett_hash_assignment_buckets = -1;
-static gint ett_mask_assignment_data_element = -1;
-static gint ett_alternate_mask_assignment_data_element = -1;
-static gint ett_extended_assigment_data_element = -1;
-static gint ett_table_element = -1;
-static gint ett_hash_flags = -1;
-static gint ett_wc_identity_flags = -1;
-static gint ett_cache_info = -1;
-static gint ett_security_info = -1;
-static gint ett_service_info = -1;
-static gint ett_service_flags = -1;
-static gint ett_service_info_ports = -1;
-static gint ett_wc_view_info_router_element = -1;
-static gint ett_router_identity_info = -1;
-static gint ett_wc_identity_element = -1;
-static gint ett_wc_identity_info = -1;
-static gint ett_router_view_info = -1;
-static gint ett_wc_view_info = -1;
-static gint ett_router_assignment_element = -1;
-static gint ett_hash_buckets_assignment_wc_element=-1;
-static gint ett_hash_buckets_assignment_buckets=-1;
-static gint ett_router_alt_assignment_element = -1;
-static gint ett_router_assignment_info = -1;
-static gint ett_query_info = -1;
-static gint ett_capabilities_info = -1;
-static gint ett_capability_element = -1;
-static gint ett_capability_forwarding_method = -1;
-static gint ett_capability_assignment_method = -1;
-static gint ett_capability_return_method = -1;
-static gint ett_capability_transmit_t = -1;
-static gint ett_capability_timer_scale = -1;
-static gint ett_alt_assignment_info = -1;
-static gint ett_alt_assignment_map = -1;
-static gint ett_address_table = -1;
-static gint ett_assignment_map = -1;
-static gint ett_command_extension = -1;
-static gint ett_alternate_mask_value_set=-1;
-static gint ett_alternate_mask_value_set_element=-1;
-static gint ett_mv_set_list = -1;
-static gint ett_mv_set_element = -1;
-static gint ett_mv_set_value_list = -1;
-static gint ett_alternate_mv_set_element_list = -1;
-static gint ett_web_cache_value_element_list = -1;
-static gint ett_alternate_mv_set_element = -1;
-static gint ett_value_element = -1;
-static gint ett_unknown_info = -1;
-
-static expert_field ei_wccp_missing_security_info = EI_INIT;
-static expert_field ei_wccp_missing_service_info = EI_INIT;
-static expert_field ei_wccp_missing_wc_id_info = EI_INIT;
-static expert_field ei_wccp_missing_router_id_info = EI_INIT;
-static expert_field ei_wccp_missing_query_info = EI_INIT;
-static expert_field ei_wccp_missing_wc_view_info = EI_INIT;
-static expert_field ei_wccp_missing_rtr_view_info = EI_INIT;
-static expert_field ei_wccp_contains_redirect_assignment = EI_INIT;
-static expert_field ei_wccp_contains_router_id_info = EI_INIT;
-static expert_field ei_wccp_contains_rtr_view_info = EI_INIT;
-static expert_field ei_wccp_contains_query_info = EI_INIT;
-static expert_field ei_wccp_contains_alt_assignment = EI_INIT;
-static expert_field ei_wccp_contains_assign_map = EI_INIT;
-static expert_field ei_wccp_contains_alt_assignment_map = EI_INIT;
-static expert_field ei_wccp_contains_wc_id_info = EI_INIT;
-static expert_field ei_wccp_contains_wc_view_info = EI_INIT;
-static expert_field ei_wccp_contains_capabilities_info = EI_INIT;
-static expert_field ei_wccp_contains_command_extension = EI_INIT;
-static expert_field ei_wccp_missing_assignment = EI_INIT;
-static expert_field ei_wccp_assignment_length_bad = EI_INIT;
-static expert_field ei_wccp_length_bad = EI_INIT;
-static expert_field ei_wccp_service_info_priority_nonzero = EI_INIT;
-static expert_field ei_wccp_service_info_protocol_nonzero = EI_INIT;
-static expert_field ei_wccp_router_identity_receive_id_zero = EI_INIT;
-static expert_field ei_wccp_web_cache_identity_hash_rev_zero = EI_INIT;
-static expert_field ei_wccp_address_table_family_unknown = EI_INIT;
-static expert_field ei_wccp_capability_element_length = EI_INIT;
-static expert_field ei_wccp_port_fields_not_used = EI_INIT;
-static expert_field ei_wccp_a_zero_not_c = EI_INIT;
-/* static expert_field ei_wccp_c_zero_not_a = EI_INIT; */
+static int proto_wccp;
+static int hf_wccp_message_type;   /* the message type */
+static int hf_wccp_version;        /* protocol version */
+static int hf_bucket;
+static int hf_bucket_bit;
+static int hf_message_header_version;
+static int hf_hash_revision;       /* the version of the hash */
+static int hf_change_num;          /* change number */
+static int hf_hash_flag;
+static int hf_hash_flag_u;
+static int hf_recvd_id;
+static int hf_wc_num;
+static int hf_wc_view_wc_num;
+static int hf_cache_ip;
+static int hf_message_header_length;
+static int hf_item_type;
+static int hf_item_length;
+static int hf_item_data;
+static int hf_security_info_option;
+static int hf_security_info_md5_checksum;
+static int hf_command_element_type;
+static int hf_command_element_length;
+static int hf_command_length;
+static int hf_command_element_shutdown_ip_index;
+static int hf_command_element_shutdown_ipv4;
+static int hf_command_element_shutdown_ipv6;
+static int hf_command_unknown;
+static int hf_service_info_type;
+static int hf_service_info_id_standard;
+static int hf_service_info_id_dynamic;
+static int hf_service_info_priority;
+static int hf_service_info_protocol;
+static int hf_service_info_flags;
+static int hf_service_info_flags_src_ip_hash;
+static int hf_service_info_flags_dest_ip_hash;
+static int hf_service_info_flags_src_port_hash;
+static int hf_service_info_flags_dest_port_hash;
+static int hf_service_info_flags_ports_defined;
+static int hf_service_info_flags_ports_source;
+static int hf_service_info_flags_redirect_only_protocol_0;
+static int hf_service_info_flags_src_ip_alt_hash;
+static int hf_service_info_flags_dest_ip_alt_hash;
+static int hf_service_info_flags_src_port_alt_hash;
+static int hf_service_info_flags_dest_port_alt_hash;
+static int hf_service_info_flags_reserved;
+static int hf_service_info_source_port;
+static int hf_service_info_destination_port;
+static int hf_router_identity_ip_index;
+static int hf_router_identity_ipv4;
+static int hf_router_identity_ipv6;
+static int hf_router_identity_receive_id;
+static int hf_router_identity_send_to_ip_index;
+static int hf_router_identity_send_to_ipv4;
+static int hf_router_identity_send_to_ipv6;
+static int hf_router_identity_received_from_num;
+static int hf_web_cache_identity_index;
+static int hf_web_cache_identity_ipv4;
+static int hf_web_cache_identity_ipv6;
+static int hf_web_cache_identity_hash_rev;
+static int hf_web_cache_identity_flags;
+static int hf_web_cache_identity_flag_hash_info;
+static int hf_web_cache_identity_flag_assign_type;
+static int hf_web_cache_identity_flag_version_request;
+static int hf_web_cache_identity_flag_reserved;
+static int hf_mask_value_set_element_value_element_num;
+static int hf_assignment_weight;
+static int hf_assignment_status;
+static int hf_assignment_key_ip_index;
+static int hf_assignment_key_ipv4;
+static int hf_assignment_key_ipv6;
+static int hf_assignment_key_change_num;
+static int hf_assignment_no_data;
+static int hf_router_view_member_change_num;
+static int hf_router_router_num;
+static int hf_router_identity_router_ip_index;
+static int hf_router_identity_router_ipv4;
+static int hf_router_identity_router_ipv6;
+static int hf_wc_view_info_change_num;
+static int hf_wc_view_info_router_ip_index;
+static int hf_wc_view_info_router_ipv4;
+static int hf_wc_view_info_router_ipv6;
+static int hf_wc_view_info_wc_ip_index;
+static int hf_wc_view_info_wc_ipv4;
+static int hf_wc_view_info_wc_ipv6;
+static int hf_wc_view_router_num;
+static int hf_wc_identity_ip_address_index;
+static int hf_wc_identity_ip_address_ipv4;
+static int hf_wc_identity_ip_address_ipv6;
+static int hf_router_identity_received_from_ip_index;
+static int hf_router_identity_received_from_ipv4;
+static int hf_router_identity_received_from_ipv6;
+static int hf_router_assignment_element_change_num;
+static int hf_assignment_info_router_num;
+static int hf_hash_buckets_assignment_wc_num;
+static int hf_hash_buckets_assignment_wc_ip_index;
+static int hf_hash_buckets_assignment_wc_ipv4;
+static int hf_hash_buckets_assignment_wc_ipv6;
+static int hf_assignment_info_router_ip_index;
+static int hf_assignment_info_router_ipv4;
+static int hf_assignment_info_router_ipv6;
+static int hf_router_view_ip_index;
+static int hf_router_view_ipv4;
+static int hf_router_view_ipv6;
+static int hf_router_query_info_ip_index;
+static int hf_router_query_info_ipv4;
+static int hf_router_query_info_ipv6;
+static int hf_router_query_info_send_to_ip_index;
+static int hf_router_query_info_send_to_ipv4;
+static int hf_router_query_info_send_to_ipv6;
+static int hf_router_query_info_target_ip_index;
+static int hf_router_query_info_target_ipv4;
+static int hf_router_query_info_target_ipv6;
+static int hf_capability_element_type;
+static int hf_capability_element_length;
+static int hf_capability_info_value;
+static int hf_capability_forwarding_method_flag_gre;
+static int hf_capability_forwarding_method_flag_l2;
+static int hf_capability_assignment_method_flag_hash;
+static int hf_capability_assignment_method_flag_mask;
+static int hf_capability_return_method_flag_gre;
+static int hf_capability_return_method_flag_l2;
+static int hf_capability_transmit_t;
+static int hf_capability_transmit_t_upper_limit;
+static int hf_capability_transmit_t_lower_limit;
+static int hf_capability_timer_scale_timeout_scale;
+static int hf_capability_timer_scale_ra_timer_scale;
+static int hf_capability_timer_scale_timeout_scale_upper_limit;
+static int hf_capability_timer_scale_timeout_scale_lower_limit;
+static int hf_capability_timer_scale_ra_scale_upper_limit;
+static int hf_capability_timer_scale_ra_scale_lower_limit;
+static int hf_capability_value;
+static int hf_reserved_zero;
+static int hf_value_element_src_ip_index;
+static int hf_value_element_src_ipv4;
+static int hf_value_element_src_ipv6;
+static int hf_value_element_dest_ip_index;
+static int hf_value_element_dest_ipv4;
+static int hf_value_element_dest_ipv6;
+static int hf_value_element_src_port;
+static int hf_value_element_dest_port;
+static int hf_value_element_web_cache_ip_index;
+static int hf_value_element_web_cache_ipv4;
+static int hf_value_element_web_cache_ipv6;
+static int hf_mask_value_set_list_num_elements;
+static int hf_mask_element_src_ip;
+static int hf_mask_element_dest_ip;
+static int hf_mask_element_src_port;
+static int hf_mask_element_dest_port;
+static int hf_alt_assignment_info_assignment_type;
+static int hf_extended_assignment_data_type;
+static int hf_alt_assignment_info_assignment_length;
+static int hf_alt_assignment_map_assignment_type;
+static int hf_alt_assignment_map_assignment_length;
+static int hf_extended_assignment_data_length;
+static int hf_alt_assignment_info_num_routers;
+static int hf_alt_assignment_mask_value_set_element_num_wc_value_elements;
+static int hf_web_cache_value_element_wc_address_index;
+static int hf_web_cache_value_element_wc_address_ipv4;
+static int hf_web_cache_value_element_wc_address_ipv6;
+static int hf_web_cache_value_element_num_values;
+static int hf_web_cache_value_seq_num;
+static int hf_alt_assignment_mask_value_set_list_num_elements;
+static int hf_address_table_family;
+static int hf_address_table_address_length;
+static int hf_address_table_length;
+static int hf_address_table_element;
+
+static gint ett_wccp;
+static gint ett_buckets;
+static gint ett_hash_assignment_buckets;
+static gint ett_mask_assignment_data_element;
+static gint ett_alternate_mask_assignment_data_element;
+static gint ett_extended_assigment_data_element;
+static gint ett_table_element;
+static gint ett_hash_flags;
+static gint ett_wc_identity_flags;
+static gint ett_cache_info;
+static gint ett_security_info;
+static gint ett_service_info;
+static gint ett_service_flags;
+static gint ett_service_info_ports;
+static gint ett_wc_view_info_router_element;
+static gint ett_router_identity_info;
+static gint ett_wc_identity_element;
+static gint ett_wc_identity_info;
+static gint ett_router_view_info;
+static gint ett_wc_view_info;
+static gint ett_router_assignment_element;
+static gint ett_hash_buckets_assignment_wc_element;
+static gint ett_hash_buckets_assignment_buckets;
+static gint ett_router_alt_assignment_element;
+static gint ett_router_assignment_info;
+static gint ett_query_info;
+static gint ett_capabilities_info;
+static gint ett_capability_element;
+static gint ett_capability_forwarding_method;
+static gint ett_capability_assignment_method;
+static gint ett_capability_return_method;
+static gint ett_capability_transmit_t;
+static gint ett_capability_timer_scale;
+static gint ett_alt_assignment_info;
+static gint ett_alt_assignment_map;
+static gint ett_address_table;
+static gint ett_assignment_map;
+static gint ett_command_extension;
+static gint ett_alternate_mask_value_set;
+static gint ett_alternate_mask_value_set_element;
+static gint ett_mv_set_list;
+static gint ett_mv_set_element;
+static gint ett_mv_set_value_list;
+static gint ett_alternate_mv_set_element_list;
+static gint ett_web_cache_value_element_list;
+static gint ett_alternate_mv_set_element;
+static gint ett_value_element;
+static gint ett_unknown_info;
+
+static expert_field ei_wccp_missing_security_info;
+static expert_field ei_wccp_missing_service_info;
+static expert_field ei_wccp_missing_wc_id_info;
+static expert_field ei_wccp_missing_router_id_info;
+static expert_field ei_wccp_missing_query_info;
+static expert_field ei_wccp_missing_wc_view_info;
+static expert_field ei_wccp_missing_rtr_view_info;
+static expert_field ei_wccp_contains_redirect_assignment;
+static expert_field ei_wccp_contains_router_id_info;
+static expert_field ei_wccp_contains_rtr_view_info;
+static expert_field ei_wccp_contains_query_info;
+static expert_field ei_wccp_contains_alt_assignment;
+static expert_field ei_wccp_contains_assign_map;
+static expert_field ei_wccp_contains_alt_assignment_map;
+static expert_field ei_wccp_contains_wc_id_info;
+static expert_field ei_wccp_contains_wc_view_info;
+static expert_field ei_wccp_contains_capabilities_info;
+static expert_field ei_wccp_contains_command_extension;
+static expert_field ei_wccp_missing_assignment;
+static expert_field ei_wccp_assignment_length_bad;
+static expert_field ei_wccp_length_bad;
+static expert_field ei_wccp_service_info_priority_nonzero;
+static expert_field ei_wccp_service_info_protocol_nonzero;
+static expert_field ei_wccp_router_identity_receive_id_zero;
+static expert_field ei_wccp_web_cache_identity_hash_rev_zero;
+static expert_field ei_wccp_address_table_family_unknown;
+static expert_field ei_wccp_capability_element_length;
+static expert_field ei_wccp_port_fields_not_used;
+static expert_field ei_wccp_a_zero_not_c;
+/* static expert_field ei_wccp_c_zero_not_a; */
 
 /*
  * At
diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c
index 50cf090be2..b9e849473c 100644
--- a/epan/dissectors/packet-wcp.c
+++ b/epan/dissectors/packet-wcp.c
@@ -122,45 +122,45 @@ typedef struct {
 } wcp_pdata_t;
 
 
-static int proto_wcp = -1;
-static int hf_wcp_cmd = -1;
-static int hf_wcp_ext_cmd = -1;
-static int hf_wcp_seq = -1;
-static int hf_wcp_chksum = -1;
-static int hf_wcp_tid = -1;
-static int hf_wcp_rev = -1;
-static int hf_wcp_init = -1;
-static int hf_wcp_seq_size = -1;
-static int hf_wcp_alg = -1;
-static int hf_wcp_alg_cnt = -1;
-static int hf_wcp_alg_a = -1;
-static int hf_wcp_alg_b = -1;
-static int hf_wcp_alg_c = -1;
-static int hf_wcp_alg_d = -1;
-/* static int hf_wcp_rexmit = -1; */
-
-static int hf_wcp_hist_size = -1;
-static int hf_wcp_ppc = -1;
-static int hf_wcp_pib = -1;
-
-static int hf_wcp_compressed_data = -1;
-static int hf_wcp_comp_bits = -1;
-/* static int hf_wcp_comp_marker = -1; */
-static int hf_wcp_short_len = -1;
-static int hf_wcp_long_len = -1;
-static int hf_wcp_short_run = -1;
-static int hf_wcp_long_run = -1;
-static int hf_wcp_offset = -1;
-
-static gint ett_wcp = -1;
-static gint ett_wcp_comp_data = -1;
-static gint ett_wcp_field = -1;
-
-static expert_field ei_wcp_compressed_data_exceeds = EI_INIT;
-static expert_field ei_wcp_uncompressed_data_exceeds = EI_INIT;
-static expert_field ei_wcp_invalid_window_offset = EI_INIT;
-static expert_field ei_wcp_buffer_too_long = EI_INIT;
-/* static expert_field ei_wcp_invalid_match_length = EI_INIT; */
+static int proto_wcp;
+static int hf_wcp_cmd;
+static int hf_wcp_ext_cmd;
+static int hf_wcp_seq;
+static int hf_wcp_chksum;
+static int hf_wcp_tid;
+static int hf_wcp_rev;
+static int hf_wcp_init;
+static int hf_wcp_seq_size;
+static int hf_wcp_alg;
+static int hf_wcp_alg_cnt;
+static int hf_wcp_alg_a;
+static int hf_wcp_alg_b;
+static int hf_wcp_alg_c;
+static int hf_wcp_alg_d;
+/* static int hf_wcp_rexmit; */
+
+static int hf_wcp_hist_size;
+static int hf_wcp_ppc;
+static int hf_wcp_pib;
+
+static int hf_wcp_compressed_data;
+static int hf_wcp_comp_bits;
+/* static int hf_wcp_comp_marker; */
+static int hf_wcp_short_len;
+static int hf_wcp_long_len;
+static int hf_wcp_short_run;
+static int hf_wcp_long_run;
+static int hf_wcp_offset;
+
+static gint ett_wcp;
+static gint ett_wcp_comp_data;
+static gint ett_wcp_field;
+
+static expert_field ei_wcp_compressed_data_exceeds;
+static expert_field ei_wcp_uncompressed_data_exceeds;
+static expert_field ei_wcp_invalid_window_offset;
+static expert_field ei_wcp_buffer_too_long;
+/* static expert_field ei_wcp_invalid_match_length; */
 
 static dissector_handle_t wcp_handle;
 static dissector_handle_t fr_uncompressed_handle;
diff --git a/epan/dissectors/packet-websocket.c b/epan/dissectors/packet-websocket.c
index 8affbe7250..e29bfc3463 100644
--- a/epan/dissectors/packet-websocket.c
+++ b/epan/dissectors/packet-websocket.c
@@ -86,48 +86,48 @@ typedef struct {
 static int websocket_follow_tap = -1;
 
 /* Initialize the protocol and registered fields */
-static int proto_websocket = -1;
-static int proto_http = -1;
-
-static int hf_ws_fin = -1;
-static int hf_ws_reserved = -1;
-static int hf_ws_pmc = -1;
-static int hf_ws_opcode = -1;
-static int hf_ws_mask = -1;
-static int hf_ws_payload_length = -1;
-static int hf_ws_payload_length_ext_16 = -1;
-static int hf_ws_payload_length_ext_64 = -1;
-static int hf_ws_masking_key = -1;
-static int hf_ws_payload = -1;
-static int hf_ws_masked_payload = -1;
-static int hf_ws_payload_continue = -1;
-static int hf_ws_payload_text = -1;
-static int hf_ws_payload_close = -1;
-static int hf_ws_payload_close_status_code = -1;
-static int hf_ws_payload_close_reason = -1;
-static int hf_ws_payload_ping = -1;
-static int hf_ws_payload_pong = -1;
-static int hf_ws_payload_unknown = -1;
-static int hf_ws_fragments = -1;
-static int hf_ws_fragment = -1;
-static int hf_ws_fragment_overlap = -1;
-static int hf_ws_fragment_overlap_conflict = -1;
-static int hf_ws_fragment_multiple_tails = -1;
-static int hf_ws_fragment_too_long_fragment = -1;
-static int hf_ws_fragment_error = -1;
-static int hf_ws_fragment_count = -1;
-static int hf_ws_reassembled_length = -1;
-
-static gint ett_ws = -1;
-static gint ett_ws_pl = -1;
-static gint ett_ws_mask = -1;
-static gint ett_ws_control_close = -1;
-static gint ett_ws_fragments = -1;
-static gint ett_ws_fragment = -1;
-
-static expert_field ei_ws_payload_unknown = EI_INIT;
-static expert_field ei_ws_decompression_failed = EI_INIT;
-static expert_field ei_ws_not_fully_unmasked = EI_INIT;
+static int proto_websocket;
+static int proto_http;
+
+static int hf_ws_fin;
+static int hf_ws_reserved;
+static int hf_ws_pmc;
+static int hf_ws_opcode;
+static int hf_ws_mask;
+static int hf_ws_payload_length;
+static int hf_ws_payload_length_ext_16;
+static int hf_ws_payload_length_ext_64;
+static int hf_ws_masking_key;
+static int hf_ws_payload;
+static int hf_ws_masked_payload;
+static int hf_ws_payload_continue;
+static int hf_ws_payload_text;
+static int hf_ws_payload_close;
+static int hf_ws_payload_close_status_code;
+static int hf_ws_payload_close_reason;
+static int hf_ws_payload_ping;
+static int hf_ws_payload_pong;
+static int hf_ws_payload_unknown;
+static int hf_ws_fragments;
+static int hf_ws_fragment;
+static int hf_ws_fragment_overlap;
+static int hf_ws_fragment_overlap_conflict;
+static int hf_ws_fragment_multiple_tails;
+static int hf_ws_fragment_too_long_fragment;
+static int hf_ws_fragment_error;
+static int hf_ws_fragment_count;
+static int hf_ws_reassembled_length;
+
+static gint ett_ws;
+static gint ett_ws_pl;
+static gint ett_ws_mask;
+static gint ett_ws_control_close;
+static gint ett_ws_fragments;
+static gint ett_ws_fragment;
+
+static expert_field ei_ws_payload_unknown;
+static expert_field ei_ws_decompression_failed;
+static expert_field ei_ws_not_fully_unmasked;
 
 #define WS_CONTINUE 0x0
 #define WS_TEXT     0x1
diff --git a/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c
index 069de52681..a5d1bb8e27 100644
--- a/epan/dissectors/packet-wfleet-hdlc.c
+++ b/epan/dissectors/packet-wfleet-hdlc.c
@@ -17,11 +17,11 @@
 void proto_register_wfleet_hdlc(void);
 void proto_reg_handoff_wfleet_hdlc(void);
 
-static int proto_wfleet_hdlc = -1;
-static int hf_wfleet_hdlc_addr = -1;
-static int hf_wfleet_hdlc_cmd = -1;
+static int proto_wfleet_hdlc;
+static int hf_wfleet_hdlc_addr;
+static int hf_wfleet_hdlc_cmd;
 
-static gint ett_wfleet_hdlc = -1;
+static gint ett_wfleet_hdlc;
 
 static dissector_handle_t eth_withoutfcs_handle;
 static dissector_handle_t wfleet_hdlc_handle;
diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c
index 70636d8124..120145b60a 100644
--- a/epan/dissectors/packet-who.c
+++ b/epan/dissectors/packet-who.c
@@ -50,24 +50,24 @@ void proto_reg_handoff_who(void);
 
 static dissector_handle_t who_handle;
 
-static int proto_who = -1;
-static int hf_who_vers = -1;
-static int hf_who_type = -1;
-static int hf_who_sendtime = -1;
-static int hf_who_recvtime = -1;
-static int hf_who_hostname = -1;
-static int hf_who_loadav_5 = -1;
-static int hf_who_loadav_10 = -1;
-static int hf_who_loadav_15 = -1;
-static int hf_who_boottime = -1;
-static int hf_who_whoent = -1;
-static int hf_who_tty = -1;
-static int hf_who_uid = -1;
-static int hf_who_timeon = -1;
-static int hf_who_idle = -1;
-
-static gint ett_who = -1;
-static gint ett_whoent = -1;
+static int proto_who;
+static int hf_who_vers;
+static int hf_who_type;
+static int hf_who_sendtime;
+static int hf_who_recvtime;
+static int hf_who_hostname;
+static int hf_who_loadav_5;
+static int hf_who_loadav_10;
+static int hf_who_loadav_15;
+static int hf_who_boottime;
+static int hf_who_whoent;
+static int hf_who_tty;
+static int hf_who_uid;
+static int hf_who_timeon;
+static int hf_who_idle;
+
+static gint ett_who;
+static gint ett_whoent;
 
 #define UDP_PORT_WHO    513
 
diff --git a/epan/dissectors/packet-whois.c b/epan/dissectors/packet-whois.c
index 527f20d980..11e3fd2d9a 100644
--- a/epan/dissectors/packet-whois.c
+++ b/epan/dissectors/packet-whois.c
@@ -23,17 +23,17 @@ void proto_reg_handoff_whois(void);
 
 static dissector_handle_t whois_handle;
 
-static int proto_whois = -1;
-static int hf_whois_query = -1;
-static int hf_whois_answer = -1;
-static int hf_whois_answer_in = -1;
-static int hf_whois_answer_to = -1;
-static int hf_whois_response_time = -1;
+static int proto_whois;
+static int hf_whois_query;
+static int hf_whois_answer;
+static int hf_whois_answer_in;
+static int hf_whois_answer_to;
+static int hf_whois_response_time;
 
-static expert_field ei_whois_nocrlf = EI_INIT;
-static expert_field ei_whois_encoding = EI_INIT;
+static expert_field ei_whois_nocrlf;
+static expert_field ei_whois_encoding;
 
-static gint ett_whois = -1;
+static gint ett_whois;
 
 typedef struct _whois_transaction_t {
     guint32  req_frame;
diff --git a/epan/dissectors/packet-wifi-display.c b/epan/dissectors/packet-wifi-display.c
index b2123e6e01..14edd32e37 100644
--- a/epan/dissectors/packet-wifi-display.c
+++ b/epan/dissectors/packet-wifi-display.c
@@ -18,72 +18,72 @@
 void proto_register_wifi_display(void);
 void proto_reg_handoff_wifi_display(void);
 
-static int proto_wifi_display = -1;
-
-static int hf_wfd_subelem_id = -1;
-static int hf_wfd_subelem_len = -1;
-
-static int hf_wfd_subelem_dev_info_type = -1;
-static int hf_wfd_subelem_dev_info_coupled_sink_source = -1;
-static int hf_wfd_subelem_dev_info_coupled_sink_sink = -1;
-static int hf_wfd_subelem_dev_info_available = -1;
-static int hf_wfd_subelem_dev_info_wsd = -1;
-static int hf_wfd_subelem_dev_info_pc = -1;
-static int hf_wfd_subelem_dev_info_content_protection = -1;
-static int hf_wfd_subelem_dev_info_time_sync = -1;
-static int hf_wfd_subelem_dev_info_control_port = -1;
-static int hf_wfd_subelem_dev_info_max_throughput = -1;
-static int hf_wfd_subelem_dev_info_audio_unsupp_pri_sink = -1;
-static int hf_wfd_subelem_dev_info_audio_only_supp_source = -1;
-static int hf_wfd_subelem_dev_info_tdls_persistent_group = -1;
-static int hf_wfd_subelem_dev_info_tdls_persistent_group_reinvoke = -1;
-static int hf_wfd_subelem_dev_info_reserved = -1;
-
-static int hf_wfd_subelem_assoc_bssid = -1;
-
-static int hf_wfd_subelem_coupled_sink_status_bitmap = -1;
-static int hf_wfd_subelem_coupled_sink_reserved = -1;
-static int hf_wfd_subelem_coupled_sink_mac_addr = -1;
-
-static int hf_wfd_subelem_session_descr_len = -1;
-static int hf_wfd_subelem_session_dev_addr = -1;
-static int hf_wfd_subelem_session_assoc_bssid = -1;
-static int hf_wfd_subelem_session_dev_info_type = -1;
-static int hf_wfd_subelem_session_dev_info_coupled_sink_source = -1;
-static int hf_wfd_subelem_session_dev_info_coupled_sink_sink = -1;
-static int hf_wfd_subelem_session_dev_info_available = -1;
-static int hf_wfd_subelem_session_dev_info_wsd = -1;
-static int hf_wfd_subelem_session_dev_info_pc = -1;
-static int hf_wfd_subelem_session_dev_info_content_protection = -1;
-static int hf_wfd_subelem_session_dev_info_time_sync = -1;
-static int hf_wfd_subelem_session_dev_info_audio_unsupp_pri_sink = -1;
-static int hf_wfd_subelem_session_dev_info_audio_only_supp_source = -1;
-static int hf_wfd_subelem_session_dev_info_tdls_persistent_group = -1;
-static int hf_wfd_subelem_session_dev_info_tdls_persistent_group_reinvoke = -1;
-static int hf_wfd_subelem_session_dev_info_reserved = -1;
-static int hf_wfd_subelem_session_dev_info_max_throughput = -1;
-static int hf_wfd_subelem_session_coupled_sink_status_bitmap = -1;
-static int hf_wfd_subelem_session_coupled_sink_reserved = -1;
-static int hf_wfd_subelem_session_coupled_sink_addr = -1;
-static int hf_wfd_subelem_session_extra_info = -1;
-
-static int hf_wfd_subelem_ext_capab = -1;
-static int hf_wfd_subelem_ext_capab_uibc = -1;
-static int hf_wfd_subelem_ext_capab_i2c_read_write = -1;
-static int hf_wfd_subelem_ext_capab_preferred_display_mode = -1;
-static int hf_wfd_subelem_ext_capab_standby_resume_control = -1;
-static int hf_wfd_subelem_ext_capab_tdls_persistent = -1;
-static int hf_wfd_subelem_ext_capab_tdls_persistent_bssid = -1;
-static int hf_wfd_subelem_ext_capab_reserved = -1;
-
-static int hf_wfd_subelem_alt_mac_addr = -1;
-
-static gint ett_wfd_subelem = -1;
-static gint ett_wfd_dev_info_descr = -1;
-
-static expert_field ei_wfd_subelem_len_invalid = EI_INIT;
-static expert_field ei_wfd_subelem_session_descr_invalid = EI_INIT;
-static expert_field ei_wfd_subelem_id = EI_INIT;
+static int proto_wifi_display;
+
+static int hf_wfd_subelem_id;
+static int hf_wfd_subelem_len;
+
+static int hf_wfd_subelem_dev_info_type;
+static int hf_wfd_subelem_dev_info_coupled_sink_source;
+static int hf_wfd_subelem_dev_info_coupled_sink_sink;
+static int hf_wfd_subelem_dev_info_available;
+static int hf_wfd_subelem_dev_info_wsd;
+static int hf_wfd_subelem_dev_info_pc;
+static int hf_wfd_subelem_dev_info_content_protection;
+static int hf_wfd_subelem_dev_info_time_sync;
+static int hf_wfd_subelem_dev_info_control_port;
+static int hf_wfd_subelem_dev_info_max_throughput;
+static int hf_wfd_subelem_dev_info_audio_unsupp_pri_sink;
+static int hf_wfd_subelem_dev_info_audio_only_supp_source;
+static int hf_wfd_subelem_dev_info_tdls_persistent_group;
+static int hf_wfd_subelem_dev_info_tdls_persistent_group_reinvoke;
+static int hf_wfd_subelem_dev_info_reserved;
+
+static int hf_wfd_subelem_assoc_bssid;
+
+static int hf_wfd_subelem_coupled_sink_status_bitmap;
+static int hf_wfd_subelem_coupled_sink_reserved;
+static int hf_wfd_subelem_coupled_sink_mac_addr;
+
+static int hf_wfd_subelem_session_descr_len;
+static int hf_wfd_subelem_session_dev_addr;
+static int hf_wfd_subelem_session_assoc_bssid;
+static int hf_wfd_subelem_session_dev_info_type;
+static int hf_wfd_subelem_session_dev_info_coupled_sink_source;
+static int hf_wfd_subelem_session_dev_info_coupled_sink_sink;
+static int hf_wfd_subelem_session_dev_info_available;
+static int hf_wfd_subelem_session_dev_info_wsd;
+static int hf_wfd_subelem_session_dev_info_pc;
+static int hf_wfd_subelem_session_dev_info_content_protection;
+static int hf_wfd_subelem_session_dev_info_time_sync;
+static int hf_wfd_subelem_session_dev_info_audio_unsupp_pri_sink;
+static int hf_wfd_subelem_session_dev_info_audio_only_supp_source;
+static int hf_wfd_subelem_session_dev_info_tdls_persistent_group;
+static int hf_wfd_subelem_session_dev_info_tdls_persistent_group_reinvoke;
+static int hf_wfd_subelem_session_dev_info_reserved;
+static int hf_wfd_subelem_session_dev_info_max_throughput;
+static int hf_wfd_subelem_session_coupled_sink_status_bitmap;
+static int hf_wfd_subelem_session_coupled_sink_reserved;
+static int hf_wfd_subelem_session_coupled_sink_addr;
+static int hf_wfd_subelem_session_extra_info;
+
+static int hf_wfd_subelem_ext_capab;
+static int hf_wfd_subelem_ext_capab_uibc;
+static int hf_wfd_subelem_ext_capab_i2c_read_write;
+static int hf_wfd_subelem_ext_capab_preferred_display_mode;
+static int hf_wfd_subelem_ext_capab_standby_resume_control;
+static int hf_wfd_subelem_ext_capab_tdls_persistent;
+static int hf_wfd_subelem_ext_capab_tdls_persistent_bssid;
+static int hf_wfd_subelem_ext_capab_reserved;
+
+static int hf_wfd_subelem_alt_mac_addr;
+
+static gint ett_wfd_subelem;
+static gint ett_wfd_dev_info_descr;
+
+static expert_field ei_wfd_subelem_len_invalid;
+static expert_field ei_wfd_subelem_session_descr_invalid;
+static expert_field ei_wfd_subelem_id;
 
 static dissector_handle_t wifi_display_ie_handle;
 
diff --git a/epan/dissectors/packet-wifi-dpp.c b/epan/dissectors/packet-wifi-dpp.c
index 73cd42a5cd..8baecfe959 100644
--- a/epan/dissectors/packet-wifi-dpp.c
+++ b/epan/dissectors/packet-wifi-dpp.c
@@ -205,56 +205,56 @@ static const range_string dpp_protocol_version_rvals[] = {
   { 0, 0, NULL }
 };
 
-static int proto_wifi_dpp = -1;
-
-static gint ett_wifi_dpp_ie_generic = -1;
-static gint ett_wifi_dpp_attributes = -1;
-static gint ett_wifi_dpp_pa = -1;
-static gint ett_wifi_dpp_attribute = -1;
-static gint ett_wifi_dpp_attr_header = -1;
-static gint ett_wifi_dpp_attr_value = -1;
-
-static int hf_wifi_dpp_ie_attr_id = -1;
-static int hf_wifi_dpp_ie_attr_len = -1;
-static int hf_wifi_dpp_ie_generic = -1;  /* Remove eventually */
-static int hf_wifi_dpp_action_dialog_token = -1;
-static int hf_wifi_dpp_action_subtype = -1;
-static int hf_wifi_dpp_crypto_suite = -1;
-static int hf_wifi_dpp_public_action_subtype = -1;
-static int hf_wifi_dpp_init_hash = -1;
-static int hf_wifi_dpp_resp_hash = -1;
-static int hf_wifi_dpp_status = -1;
-static int hf_wifi_dpp_key_x = -1;
-static int hf_wifi_dpp_key_y = -1;
-static int hf_wifi_dpp_trans_id = -1;
-static int hf_wifi_dpp_finite_cyclic_group = -1;
-static int hf_wifi_dpp_capabilities = -1;
-static int hf_wifi_dpp_code_identifier = -1;
-static int hf_wifi_dpp_enc_key_attribute = -1;
-static int hf_wifi_dpp_primary_wrapped_data = -1;
-static int hf_wifi_dpp_connector_attr = -1;
-static int hf_wifi_dpp_initiator_nonce = -1;
-static int hf_wifi_dpp_operating_class = -1;
-static int hf_wifi_dpp_channel = -1;
-static int hf_wifi_dpp_protocol_version = -1;
-static int hf_wifi_dpp_a_nonce = -1;
-static int hf_wifi_dpp_e_prime_id = -1;
-static int hf_wifi_dpp_unknown_anqp_item = -1;
-
-static int hf_wifi_dpp_tcp_pdu_length = -1;
-static int hf_wifi_dpp_tcp_pdu_action_field = -1;
-static int hf_wifi_dpp_tcp_oui = -1;
-static int hf_wifi_dpp_tcp_oui_type = -1;
-static int hf_wifi_dpp_tcp_dialog_token = -1;
-static int hf_wifi_dpp_tcp_adv_proto_elt = -1;
-static int hf_wifi_dpp_tcp_vendor_specific = -1;
-static int hf_wifi_dpp_tcp_vendor_spec_len = -1;
-static int hf_wifi_dpp_tcp_config = -1;
-static int hf_wifi_dpp_tcp_query_req_len = -1;
-static int hf_wifi_dpp_tcp_status_code = -1;
-static int hf_wifi_dpp_gas_query_resp_frag_id = -1;
-static int hf_wifi_dpp_tcp_comeback_delay = -1;
-static int hf_wifi_dpp_tcp_query_resp_len = -1;
+static int proto_wifi_dpp;
+
+static gint ett_wifi_dpp_ie_generic;
+static gint ett_wifi_dpp_attributes;
+static gint ett_wifi_dpp_pa;
+static gint ett_wifi_dpp_attribute;
+static gint ett_wifi_dpp_attr_header;
+static gint ett_wifi_dpp_attr_value;
+
+static int hf_wifi_dpp_ie_attr_id;
+static int hf_wifi_dpp_ie_attr_len;
+static int hf_wifi_dpp_ie_generic;  /* Remove eventually */
+static int hf_wifi_dpp_action_dialog_token;
+static int hf_wifi_dpp_action_subtype;
+static int hf_wifi_dpp_crypto_suite;
+static int hf_wifi_dpp_public_action_subtype;
+static int hf_wifi_dpp_init_hash;
+static int hf_wifi_dpp_resp_hash;
+static int hf_wifi_dpp_status;
+static int hf_wifi_dpp_key_x;
+static int hf_wifi_dpp_key_y;
+static int hf_wifi_dpp_trans_id;
+static int hf_wifi_dpp_finite_cyclic_group;
+static int hf_wifi_dpp_capabilities;
+static int hf_wifi_dpp_code_identifier;
+static int hf_wifi_dpp_enc_key_attribute;
+static int hf_wifi_dpp_primary_wrapped_data;
+static int hf_wifi_dpp_connector_attr;
+static int hf_wifi_dpp_initiator_nonce;
+static int hf_wifi_dpp_operating_class;
+static int hf_wifi_dpp_channel;
+static int hf_wifi_dpp_protocol_version;
+static int hf_wifi_dpp_a_nonce;
+static int hf_wifi_dpp_e_prime_id;
+static int hf_wifi_dpp_unknown_anqp_item;
+
+static int hf_wifi_dpp_tcp_pdu_length;
+static int hf_wifi_dpp_tcp_pdu_action_field;
+static int hf_wifi_dpp_tcp_oui;
+static int hf_wifi_dpp_tcp_oui_type;
+static int hf_wifi_dpp_tcp_dialog_token;
+static int hf_wifi_dpp_tcp_adv_proto_elt;
+static int hf_wifi_dpp_tcp_vendor_specific;
+static int hf_wifi_dpp_tcp_vendor_spec_len;
+static int hf_wifi_dpp_tcp_config;
+static int hf_wifi_dpp_tcp_query_req_len;
+static int hf_wifi_dpp_tcp_status_code;
+static int hf_wifi_dpp_gas_query_resp_frag_id;
+static int hf_wifi_dpp_tcp_comeback_delay;
+static int hf_wifi_dpp_tcp_query_resp_len;
 
 static int
 dissect_wifi_dpp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_)
diff --git a/epan/dissectors/packet-wifi-nan.c b/epan/dissectors/packet-wifi-nan.c
index e438dd7ae7..292d60aa63 100644
--- a/epan/dissectors/packet-wifi-nan.c
+++ b/epan/dissectors/packet-wifi-nan.c
@@ -60,281 +60,281 @@ static dissector_table_t ie_handle_table;
 #define NAN_UNALIGNED_SCH_CHANNEL_ENTRY_EXIST 1
 #define NAN_UNALIGNED_SCH_CHANNEL_ENTRY_W_AUX_EXIST 2
 
-static int proto_nan = -1;
-
-static expert_field ei_nan_elem_len_invalid = EI_INIT;
-static expert_field ei_nan_unknown_attr_id = EI_INIT;
-static expert_field ei_nan_unknown_op_class = EI_INIT;
-static expert_field ei_nan_unknown_beacon_type = EI_INIT;
-
-static gint ett_nan = -1;
-static gint ett_attributes = -1;
-static gint ett_map_control = -1;
-static gint ett_type_status = -1;
-static gint ett_time_bitmap_ctrl = -1;
-static gint ett_non_nan_op_channel = -1;
-static gint ett_non_nan_beacon = -1;
-static gint ett_cluster_anchor_master_info = -1;
-static gint ett_sda_service_ctr = -1;
-static gint ett_sda_srf_ctr = -1;
-static gint ett_sdea_ctr = -1;
-static gint ett_sdea_range_limit = -1;
-static gint ett_sdea_service_info = -1;
-static gint ett_connection_cap_field = -1;
-static gint ett_further_av_map_entry_ctrl = -1;
-static gint ett_device_cap_map_id = -1;
-static gint ett_device_cap_committed_dw = -1;
-static gint ett_device_cap_supported_bands = -1;
-static gint ett_device_cap_op_mode = -1;
-static gint ett_device_cap_antennas = -1;
-static gint ett_device_cap_capabilities = -1;
-static gint ett_ndp_control = -1;
-static gint ett_ndpe_tlv = -1;
-static gint ett_availability_ctr = -1;
-static gint ett_availability_entry = -1;
-static gint ett_availability_entry_ctr = -1;
-static gint ett_availability_entry_entries = -1;
-static gint ett_availability_entry_entries_channel = -1;
-static gint ett_ndc_ctr = -1;
-static gint ett_ndc_entries = -1;
-static gint ett_device_ndc_map_id = -1;
-static gint ett_ndl_control = -1;
-static gint ett_ndl_schedule_entries = -1;
-static gint ett_unaligned_sch_ctrl = -1;
-static gint ett_unaligned_sch_ulw_overwrite = -1;
-static gint ett_unaligned_sch_ulw_ctrl = -1;
-static gint ett_ranging_setup_ftm_params = -1;
-static gint ett_ranging_setup_ctrl = -1;
-static gint ett_ranging_setup_schedule_entries = -1;
-static gint ett_ranging_info_location_info_availability = -1;
-static gint ett_p2p_device_role = -1;
-static gint ett_cipher_suite_info_list = -1;
-static gint ett_security_context_identifiers = -1;
-static gint ett_public_availability_sch_entries = -1;
-static gint ett_ie_tree = -1;
-static gint ett_availability_op_class = -1;
-
-static int hf_nan_attribute_type = -1;
-static int hf_nan_attribute_len = -1;
-static int hf_nan_action_subtype = -1;
-static int hf_nan_instance_id = -1;
-static int hf_nan_service_id = -1;
-static int hf_nan_map_id = -1;
-static int hf_nan_oui = -1;
-static int hf_nan_type_status = -1;
-static int hf_nan_reason_code = -1;
-static int hf_nan_status_1 = -1;
-static int hf_nan_status_2 = -1;
-static int hf_nan_bss_id = -1;
-static int hf_nan_availability_intervals_bitmap = -1;
-static int hf_nan_mac_address = -1;
-static int hf_nan_publish_id = -1;
-static int hf_nan_dialog_tokens = -1;
-static int hf_nan_time_bitmap = -1;
-static int hf_nan_time_bitmap_len = -1;
-static int hf_nan_time_bitmap_ctrl = -1;
-static int hf_nan_time_bitmap_ctrl_bit_duration = -1;
-static int hf_nan_time_bitmap_ctrl_period = -1;
-static int hf_nan_time_bitmap_ctrl_start_offset = -1;
-static int hf_nan_map_ctrl_map_id = -1;
-static int hf_nan_map_ctrl_availability_interval_duration = -1;
-static int hf_nan_map_ctrl_repeat = -1;
-static int hf_nan_map_ctrl_field = -1;
-static int hf_nan_non_op_channel_global_op_class = -1;
-static int hf_nan_non_op_channel_channel = -1;
-static int hf_nan_non_op_channel_center_freq = -1;
-static int hf_nan_non_beacon_tbtt_offset = -1;
-static int hf_nan_non_beacon_interval = -1;
-static int hf_nan_attr_master_preference = -1;
-static int hf_nan_attr_master_random_factor = -1;
-static int hf_nan_attr_cluster_anchor_master_rank = -1;
-static int hf_nan_attr_cluster_hop_count = -1;
-static int hf_nan_attr_cluster_beacon_transmission_time = -1;
-static int hf_nan_attr_sda_requestor_instance_id = -1;
-static int hf_nan_attr_sda_sc = -1;
-static int hf_nan_attr_sda_sc_type = -1;
-static int hf_nan_attr_sda_sc_matching_filter = -1;
-static int hf_nan_attr_sda_sc_service_response = -1;
-static int hf_nan_attr_sda_sc_service_info = -1;
-static int hf_nan_attr_sda_sc_discovery_range = -1;
-static int hf_nan_attr_sda_sc_binding_bitmap = -1;
-static int hf_nan_attr_sda_binding_bitmap = -1;
-static int hf_nan_attr_sda_matching_filter_len = -1;
-static int hf_nan_attr_sda_matching_filter_val = -1;
-static int hf_nan_attr_sda_service_response_filter_len = -1;
-static int hf_nan_attr_sda_srf_ctr = -1;
-static int hf_nan_attr_sda_srf_ctr_type = -1;
-static int hf_nan_attr_sda_srf_ctr_include = -1;
-static int hf_nan_attr_sda_srf_ctr_bloom_filter_index = -1;
-static int hf_nan_attr_sda_srf_address_set = -1;
-static int hf_nan_attr_sda_service_info_len = -1;
-static int hf_nan_attr_sda_service_info = -1;
-static int hf_nan_attr_sdea_ctr = -1;
-static int hf_nan_attr_sdea_ctr_fsd = -1;
-static int hf_nan_attr_sdea_ctr_fsd_w_gas = -1;
-static int hf_nan_attr_sdea_ctr_data_path = -1;
-static int hf_nan_attr_sdea_ctr_data_path_type = -1;
-static int hf_nan_attr_sdea_ctr_reserved_multicast_type = -1;
-static int hf_nan_attr_sdea_ctr_qos = -1;
-static int hf_nan_attr_sdea_ctr_security = -1;
-static int hf_nan_attr_sdea_ctr_ranging = -1;
-static int hf_nan_attr_sdea_ctr_range_limit = -1;
-static int hf_nan_attr_sdea_ctr_service_update_indicator = -1;
-static int hf_nan_attr_sdea_ingress_range_limit = -1;
-static int hf_nan_attr_sdea_egress_range_limit = -1;
-static int hf_nan_attr_sdea_service_update_indicator = -1;
-static int hf_nan_attr_sdea_service_info_length = -1;
-static int hf_nan_attr_sdea_service_info_protocol_type = -1;
-static int hf_nan_attr_sdea_service_info_specific = -1;
-static int hf_nan_attr_connection_cap_bitmap = -1;
-static int hf_nan_attr_connection_cap_wifi_direct = -1;
-static int hf_nan_attr_connection_cap_p2ps = -1;
-static int hf_nan_attr_connection_cap_tdls = -1;
-static int hf_nan_attr_connection_cap_wlan_infra = -1;
-static int hf_nan_attr_connection_cap_ibss = -1;
-static int hf_nan_attr_connection_cap_mesh = -1;
-static int hf_nan_attr_wlan_infra_device_role = -1;
-static int hf_nan_attr_p2p_device_role_device = -1;
-static int hf_nan_attr_p2p_device_role_group_owner = -1;
-static int hf_nan_attr_p2p_device_role_client = -1;
-static int hf_nan_attr_p2p_device_role = -1;
-static int hf_nan_attr_mesh_id = -1;
-static int hf_nan_attr_further_av_map_entry_av_interval_duration = -1;
-static int hf_nan_attr_further_av_map_op_class = -1;
-static int hf_nan_attr_further_av_map_channel_num = -1;
-static int hf_nan_attr_further_av_map_entry_ctrl = -1;
-static int hf_nan_attr_further_av_map_id = -1;
-static int hf_nan_attr_country_code = -1;
-static int hf_nan_attr_ranging_protocol = -1;
-static int hf_nan_attr_cluster_disc_id = -1;
-static int hf_nan_attr_cluster_disc_time_offset = -1;
-static int hf_nan_attr_cluster_disc_anchor_master_rank = -1;
-static int hf_nan_attr_device_cap_map_id_apply_to = -1;
-static int hf_nan_attr_device_cap_map_id_associated_maps = -1;
-static int hf_nan_attr_device_cap_committed_dw = -1;
-static int hf_nan_attr_device_cap_committed_dw_24ghz = -1;
-static int hf_nan_attr_device_cap_committed_dw_5ghz = -1;
-static int hf_nan_attr_device_cap_committed_dw_24ghz_overwrite = -1;
-static int hf_nan_attr_device_cap_committed_dw_5ghz_overwrite = -1;
-static int hf_nan_attr_device_cap_supported_bands = -1;
-static int hf_nan_attr_device_cap_supported_bands_reserved_tv_whitespaces = -1;
-static int hf_nan_attr_device_cap_supported_bands_sub_1ghz = -1;
-static int hf_nan_attr_device_cap_supported_bands_24ghz = -1;
-static int hf_nan_attr_device_cap_supported_bands_reserved_36ghz = -1;
-static int hf_nan_attr_device_cap_supported_bands_5ghz = -1;
-static int hf_nan_attr_device_cap_supported_bands_reserved_60ghz = -1;
-static int hf_nan_attr_device_cap_op_mode = -1;
-static int hf_nan_attr_device_cap_op_mode_phy = -1;
-static int hf_nan_attr_device_cap_op_mode_vht8080 = -1;
-static int hf_nan_attr_device_cap_op_mode_vht160 = -1;
-static int hf_nan_attr_device_cap_op_mode_reserved_paging_ndl = -1;
-static int hf_nan_attr_device_cap_antennas = -1;
-static int hf_nan_attr_device_cap_antennas_tx = -1;
-static int hf_nan_attr_device_cap_antennas_rx = -1;
-static int hf_nan_attr_device_cap_max_channel_switch_time = -1;
-static int hf_nan_attr_device_cap_capabilities = -1;
-static int hf_nan_attr_device_cap_capabilities_dfs_master = -1;
-static int hf_nan_attr_device_cap_capabilities_extended_key_id = -1;
-static int hf_nan_attr_device_cap_capabilities_simul_ndp_reception = -1;
-static int hf_nan_attr_device_cap_capabilities_ndpe_attr_support = -1;
-static int hf_nan_attr_ndp_type = -1;
-static int hf_nan_attr_ndp_initiator = -1;
-static int hf_nan_attr_ndp_id = -1;
-static int hf_nan_attr_ndp_ctrl_confirm = -1;
-static int hf_nan_attr_ndp_ctrl_security_pres = -1;
-static int hf_nan_attr_ndp_ctrl_publish_id_pres = -1;
-static int hf_nan_attr_ndp_ctrl_responder_ndi_pres = -1;
-static int hf_nan_attr_ndp_ctrl_sepcific_info_pres = -1;
-static int hf_nan_attr_ndp_control = -1;
-static int hf_nan_attr_ndp_responder_ndi = -1;
-static int hf_nan_attr_ndp_specific_info = -1;
-static int hf_nan_attr_ndpe_tlv_type = -1;
-static int hf_nan_attr_ndpe_tlv_len = -1;
-static int hf_nan_attr_ndpe_tlv_ipv6_interface_identifier = -1;
-static int hf_nan_attr_availability_sequence_id = -1;
-static int hf_nan_attr_availability_ctr = -1;
-static int hf_nan_attr_availability_map_id = -1;
-static int hf_nan_attr_availability_committed_changed = -1;
-static int hf_nan_attr_availability_potential_changed = -1;
-static int hf_nan_attr_availability_public_availability_changed = -1;
-static int hf_nan_attr_availability_ndc_changed = -1;
-static int hf_nan_attr_availability_reserved_multicast_schedule_changed = -1;
-static int hf_nan_attr_availability_reserved_multicast_schedule_change_changed = -1;
-static int hf_nan_attr_availability_entry_len = -1;
-static int hf_nan_attr_availability_entry_ctr = -1;
-static int hf_nan_attr_availability_entry_ctr_type = -1;
-static int hf_nan_attr_availability_entry_ctr_pref = -1;
-static int hf_nan_attr_availability_entry_ctr_utilization = -1;
-static int hf_nan_attr_availability_entry_ctr_rx_nss = -1;
-static int hf_nan_attr_availability_entry_ctr_time_bitmap = -1;
-static int hf_nan_attr_availability_entry_entries_type = -1;
-static int hf_nan_attr_availability_entry_entries_non_contiguous_bw = -1;
-static int hf_nan_attr_availability_entry_entries_num_entries = -1;
-static int hf_nan_attr_availability_entry_entries_band = -1;
-static int hf_nan_attr_availability_entry_entries_channel_op_class = -1;
-static int hf_nan_attr_availability_entry_entries_channel_bitmap = -1;
-static int hf_nan_attr_availability_entry_entries_primary_channel_bitmap = -1;
-static int hf_nan_attr_availability_entry_entries_aux_channel_bitmap = -1;
-static int hf_nan_attr_availability_entry_entries_channel_set = -1;
-static int hf_nan_attr_availability_entry_entries_start_freq = -1;
-static int hf_nan_attr_availability_entry_entries_bandwidth = -1;
-static int hf_nan_attr_ndc_id = -1;
-static int hf_nan_attr_ndc_ctrl = -1;
-static int hf_nan_attr_ndc_ctrl_selected = -1;
-static int hf_nan_attr_ndc_map_id_related_sch = -1;
-static int hf_nan_attr_ndl_type = -1;
-static int hf_nan_attr_ndl_control = -1;
-static int hf_nan_attr_ndl_ctrl_peer_id = -1;
-static int hf_nan_attr_ndl_ctrl_immutable_schedule_pres = -1;
-static int hf_nan_attr_ndl_ctrl_ndc_pres = -1;
-static int hf_nan_attr_ndl_ctrl_qos = -1;
-static int hf_nan_attr_ndl_ctrl_type = -1;
-static int hf_nan_attr_ndl_ctrl_setup_reason = -1;
-static int hf_nan_attr_ndl_ctrl_max_idle_pres = -1;
-static int hf_nan_attr_ndl_reserved_peer_id = -1;
-static int hf_nan_attr_ndl_max_idle = -1;
-static int hf_nan_attr_ndlqos_min_time_slots = -1;
-static int hf_nan_attr_ndlqos_max_latency = -1;
-static int hf_nan_attr_unaligned_sch_ctrl = -1;
-static int hf_nan_attr_unaligned_sch_ctrl_schedule_id = -1;
-static int hf_nan_attr_unaligned_sch_ctrl_seq_id = -1;
-static int hf_nan_attr_unaligned_sch_starting_time = -1;
-static int hf_nan_attr_unaligned_sch_duration = -1;
-static int hf_nan_attr_unaligned_sch_period = -1;
-static int hf_nan_attr_unaligned_sch_count_down = -1;
-static int hf_nan_attr_unaligned_sch_ulw_overwrite = -1;
-static int hf_nan_attr_unaligned_sch_ulw_overwrite_all = -1;
-static int hf_nan_attr_unaligned_sch_ulw_overwrite_map_id = -1;
-static int hf_nan_attr_unaligned_sch_ulw_ctrl = -1;
-static int hf_nan_attr_unaligned_sch_ulw_ctrl_type = -1;
-static int hf_nan_attr_unaligned_sch_ulw_ctrl_channel_av = -1;
-static int hf_nan_attr_unaligned_sch_ulw_ctrl_rxnss = -1;
-static int hf_nan_attr_ranging_info_location_info_avail = -1;
-static int hf_nan_attr_ranging_info_location_info_avail_lci = -1;
-static int hf_nan_attr_ranging_info_location_info_avail_geospatial = -1;
-static int hf_nan_attr_ranging_info_location_info_avail_civic_location = -1;
-static int hf_nan_attr_ranging_info_location_info_avail_last_movement_pres = -1;
-static int hf_nan_attr_ranging_info_last_movement_indication = -1;
-static int hf_nan_attr_ranging_setup_type = -1;
-static int hf_nan_attr_ranging_setup_ctrl = -1;
-static int hf_nan_attr_ranging_setup_ctrl_report_req = -1;
-static int hf_nan_attr_ranging_setup_ctrl_ftm_params = -1;
-static int hf_nan_attr_ranging_setup_ctrl_entry_list = -1;
-static int hf_nan_attr_ranging_setup_ftm_params = -1;
-static int hf_nan_attr_ranging_setup_ftm_max_per_burst = -1;
-static int hf_nan_attr_ranging_setup_ftm_min_delta = -1;
-static int hf_nan_attr_ranging_setup_ftm_max_burst_duration = -1;
-static int hf_nan_attr_ranging_setup_ftm_format_bw = -1;
-static int hf_nan_attr_ftm_range_report = -1;
-static int hf_nan_attr_cipher_suite_capabilities = -1;
-static int hf_nan_attr_cipher_suite_id = -1;
-static int hf_nan_attr_security_context_identifier = -1;
-static int hf_nan_attr_security_context_identifier_len = -1;
-static int hf_nan_attr_security_context_identifier_type = -1;
-static int hf_nan_attr_shared_key_rsna_descriptor = -1;
-static int hf_nan_attr_vendor_specific_body = -1;
-static int hf_nan_attr_container_element_id = -1;
-static int hf_nan_attr_container_element_len = -1;
+static int proto_nan;
+
+static expert_field ei_nan_elem_len_invalid;
+static expert_field ei_nan_unknown_attr_id;
+static expert_field ei_nan_unknown_op_class;
+static expert_field ei_nan_unknown_beacon_type;
+
+static gint ett_nan;
+static gint ett_attributes;
+static gint ett_map_control;
+static gint ett_type_status;
+static gint ett_time_bitmap_ctrl;
+static gint ett_non_nan_op_channel;
+static gint ett_non_nan_beacon;
+static gint ett_cluster_anchor_master_info;
+static gint ett_sda_service_ctr;
+static gint ett_sda_srf_ctr;
+static gint ett_sdea_ctr;
+static gint ett_sdea_range_limit;
+static gint ett_sdea_service_info;
+static gint ett_connection_cap_field;
+static gint ett_further_av_map_entry_ctrl;
+static gint ett_device_cap_map_id;
+static gint ett_device_cap_committed_dw;
+static gint ett_device_cap_supported_bands;
+static gint ett_device_cap_op_mode;
+static gint ett_device_cap_antennas;
+static gint ett_device_cap_capabilities;
+static gint ett_ndp_control;
+static gint ett_ndpe_tlv;
+static gint ett_availability_ctr;
+static gint ett_availability_entry;
+static gint ett_availability_entry_ctr;
+static gint ett_availability_entry_entries;
+static gint ett_availability_entry_entries_channel;
+static gint ett_ndc_ctr;
+static gint ett_ndc_entries;
+static gint ett_device_ndc_map_id;
+static gint ett_ndl_control;
+static gint ett_ndl_schedule_entries;
+static gint ett_unaligned_sch_ctrl;
+static gint ett_unaligned_sch_ulw_overwrite;
+static gint ett_unaligned_sch_ulw_ctrl;
+static gint ett_ranging_setup_ftm_params;
+static gint ett_ranging_setup_ctrl;
+static gint ett_ranging_setup_schedule_entries;
+static gint ett_ranging_info_location_info_availability;
+static gint ett_p2p_device_role;
+static gint ett_cipher_suite_info_list;
+static gint ett_security_context_identifiers;
+static gint ett_public_availability_sch_entries;
+static gint ett_ie_tree;
+static gint ett_availability_op_class;
+
+static int hf_nan_attribute_type;
+static int hf_nan_attribute_len;
+static int hf_nan_action_subtype;
+static int hf_nan_instance_id;
+static int hf_nan_service_id;
+static int hf_nan_map_id;
+static int hf_nan_oui;
+static int hf_nan_type_status;
+static int hf_nan_reason_code;
+static int hf_nan_status_1;
+static int hf_nan_status_2;
+static int hf_nan_bss_id;
+static int hf_nan_availability_intervals_bitmap;
+static int hf_nan_mac_address;
+static int hf_nan_publish_id;
+static int hf_nan_dialog_tokens;
+static int hf_nan_time_bitmap;
+static int hf_nan_time_bitmap_len;
+static int hf_nan_time_bitmap_ctrl;
+static int hf_nan_time_bitmap_ctrl_bit_duration;
+static int hf_nan_time_bitmap_ctrl_period;
+static int hf_nan_time_bitmap_ctrl_start_offset;
+static int hf_nan_map_ctrl_map_id;
+static int hf_nan_map_ctrl_availability_interval_duration;
+static int hf_nan_map_ctrl_repeat;
+static int hf_nan_map_ctrl_field;
+static int hf_nan_non_op_channel_global_op_class;
+static int hf_nan_non_op_channel_channel;
+static int hf_nan_non_op_channel_center_freq;
+static int hf_nan_non_beacon_tbtt_offset;
+static int hf_nan_non_beacon_interval;
+static int hf_nan_attr_master_preference;
+static int hf_nan_attr_master_random_factor;
+static int hf_nan_attr_cluster_anchor_master_rank;
+static int hf_nan_attr_cluster_hop_count;
+static int hf_nan_attr_cluster_beacon_transmission_time;
+static int hf_nan_attr_sda_requestor_instance_id;
+static int hf_nan_attr_sda_sc;
+static int hf_nan_attr_sda_sc_type;
+static int hf_nan_attr_sda_sc_matching_filter;
+static int hf_nan_attr_sda_sc_service_response;
+static int hf_nan_attr_sda_sc_service_info;
+static int hf_nan_attr_sda_sc_discovery_range;
+static int hf_nan_attr_sda_sc_binding_bitmap;
+static int hf_nan_attr_sda_binding_bitmap;
+static int hf_nan_attr_sda_matching_filter_len;
+static int hf_nan_attr_sda_matching_filter_val;
+static int hf_nan_attr_sda_service_response_filter_len;
+static int hf_nan_attr_sda_srf_ctr;
+static int hf_nan_attr_sda_srf_ctr_type;
+static int hf_nan_attr_sda_srf_ctr_include;
+static int hf_nan_attr_sda_srf_ctr_bloom_filter_index;
+static int hf_nan_attr_sda_srf_address_set;
+static int hf_nan_attr_sda_service_info_len;
+static int hf_nan_attr_sda_service_info;
+static int hf_nan_attr_sdea_ctr;
+static int hf_nan_attr_sdea_ctr_fsd;
+static int hf_nan_attr_sdea_ctr_fsd_w_gas;
+static int hf_nan_attr_sdea_ctr_data_path;
+static int hf_nan_attr_sdea_ctr_data_path_type;
+static int hf_nan_attr_sdea_ctr_reserved_multicast_type;
+static int hf_nan_attr_sdea_ctr_qos;
+static int hf_nan_attr_sdea_ctr_security;
+static int hf_nan_attr_sdea_ctr_ranging;
+static int hf_nan_attr_sdea_ctr_range_limit;
+static int hf_nan_attr_sdea_ctr_service_update_indicator;
+static int hf_nan_attr_sdea_ingress_range_limit;
+static int hf_nan_attr_sdea_egress_range_limit;
+static int hf_nan_attr_sdea_service_update_indicator;
+static int hf_nan_attr_sdea_service_info_length;
+static int hf_nan_attr_sdea_service_info_protocol_type;
+static int hf_nan_attr_sdea_service_info_specific;
+static int hf_nan_attr_connection_cap_bitmap;
+static int hf_nan_attr_connection_cap_wifi_direct;
+static int hf_nan_attr_connection_cap_p2ps;
+static int hf_nan_attr_connection_cap_tdls;
+static int hf_nan_attr_connection_cap_wlan_infra;
+static int hf_nan_attr_connection_cap_ibss;
+static int hf_nan_attr_connection_cap_mesh;
+static int hf_nan_attr_wlan_infra_device_role;
+static int hf_nan_attr_p2p_device_role_device;
+static int hf_nan_attr_p2p_device_role_group_owner;
+static int hf_nan_attr_p2p_device_role_client;
+static int hf_nan_attr_p2p_device_role;
+static int hf_nan_attr_mesh_id;
+static int hf_nan_attr_further_av_map_entry_av_interval_duration;
+static int hf_nan_attr_further_av_map_op_class;
+static int hf_nan_attr_further_av_map_channel_num;
+static int hf_nan_attr_further_av_map_entry_ctrl;
+static int hf_nan_attr_further_av_map_id;
+static int hf_nan_attr_country_code;
+static int hf_nan_attr_ranging_protocol;
+static int hf_nan_attr_cluster_disc_id;
+static int hf_nan_attr_cluster_disc_time_offset;
+static int hf_nan_attr_cluster_disc_anchor_master_rank;
+static int hf_nan_attr_device_cap_map_id_apply_to;
+static int hf_nan_attr_device_cap_map_id_associated_maps;
+static int hf_nan_attr_device_cap_committed_dw;
+static int hf_nan_attr_device_cap_committed_dw_24ghz;
+static int hf_nan_attr_device_cap_committed_dw_5ghz;
+static int hf_nan_attr_device_cap_committed_dw_24ghz_overwrite;
+static int hf_nan_attr_device_cap_committed_dw_5ghz_overwrite;
+static int hf_nan_attr_device_cap_supported_bands;
+static int hf_nan_attr_device_cap_supported_bands_reserved_tv_whitespaces;
+static int hf_nan_attr_device_cap_supported_bands_sub_1ghz;
+static int hf_nan_attr_device_cap_supported_bands_24ghz;
+static int hf_nan_attr_device_cap_supported_bands_reserved_36ghz;
+static int hf_nan_attr_device_cap_supported_bands_5ghz;
+static int hf_nan_attr_device_cap_supported_bands_reserved_60ghz;
+static int hf_nan_attr_device_cap_op_mode;
+static int hf_nan_attr_device_cap_op_mode_phy;
+static int hf_nan_attr_device_cap_op_mode_vht8080;
+static int hf_nan_attr_device_cap_op_mode_vht160;
+static int hf_nan_attr_device_cap_op_mode_reserved_paging_ndl;
+static int hf_nan_attr_device_cap_antennas;
+static int hf_nan_attr_device_cap_antennas_tx;
+static int hf_nan_attr_device_cap_antennas_rx;
+static int hf_nan_attr_device_cap_max_channel_switch_time;
+static int hf_nan_attr_device_cap_capabilities;
+static int hf_nan_attr_device_cap_capabilities_dfs_master;
+static int hf_nan_attr_device_cap_capabilities_extended_key_id;
+static int hf_nan_attr_device_cap_capabilities_simul_ndp_reception;
+static int hf_nan_attr_device_cap_capabilities_ndpe_attr_support;
+static int hf_nan_attr_ndp_type;
+static int hf_nan_attr_ndp_initiator;
+static int hf_nan_attr_ndp_id;
+static int hf_nan_attr_ndp_ctrl_confirm;
+static int hf_nan_attr_ndp_ctrl_security_pres;
+static int hf_nan_attr_ndp_ctrl_publish_id_pres;
+static int hf_nan_attr_ndp_ctrl_responder_ndi_pres;
+static int hf_nan_attr_ndp_ctrl_sepcific_info_pres;
+static int hf_nan_attr_ndp_control;
+static int hf_nan_attr_ndp_responder_ndi;
+static int hf_nan_attr_ndp_specific_info;
+static int hf_nan_attr_ndpe_tlv_type;
+static int hf_nan_attr_ndpe_tlv_len;
+static int hf_nan_attr_ndpe_tlv_ipv6_interface_identifier;
+static int hf_nan_attr_availability_sequence_id;
+static int hf_nan_attr_availability_ctr;
+static int hf_nan_attr_availability_map_id;
+static int hf_nan_attr_availability_committed_changed;
+static int hf_nan_attr_availability_potential_changed;
+static int hf_nan_attr_availability_public_availability_changed;
+static int hf_nan_attr_availability_ndc_changed;
+static int hf_nan_attr_availability_reserved_multicast_schedule_changed;
+static int hf_nan_attr_availability_reserved_multicast_schedule_change_changed;
+static int hf_nan_attr_availability_entry_len;
+static int hf_nan_attr_availability_entry_ctr;
+static int hf_nan_attr_availability_entry_ctr_type;
+static int hf_nan_attr_availability_entry_ctr_pref;
+static int hf_nan_attr_availability_entry_ctr_utilization;
+static int hf_nan_attr_availability_entry_ctr_rx_nss;
+static int hf_nan_attr_availability_entry_ctr_time_bitmap;
+static int hf_nan_attr_availability_entry_entries_type;
+static int hf_nan_attr_availability_entry_entries_non_contiguous_bw;
+static int hf_nan_attr_availability_entry_entries_num_entries;
+static int hf_nan_attr_availability_entry_entries_band;
+static int hf_nan_attr_availability_entry_entries_channel_op_class;
+static int hf_nan_attr_availability_entry_entries_channel_bitmap;
+static int hf_nan_attr_availability_entry_entries_primary_channel_bitmap;
+static int hf_nan_attr_availability_entry_entries_aux_channel_bitmap;
+static int hf_nan_attr_availability_entry_entries_channel_set;
+static int hf_nan_attr_availability_entry_entries_start_freq;
+static int hf_nan_attr_availability_entry_entries_bandwidth;
+static int hf_nan_attr_ndc_id;
+static int hf_nan_attr_ndc_ctrl;
+static int hf_nan_attr_ndc_ctrl_selected;
+static int hf_nan_attr_ndc_map_id_related_sch;
+static int hf_nan_attr_ndl_type;
+static int hf_nan_attr_ndl_control;
+static int hf_nan_attr_ndl_ctrl_peer_id;
+static int hf_nan_attr_ndl_ctrl_immutable_schedule_pres;
+static int hf_nan_attr_ndl_ctrl_ndc_pres;
+static int hf_nan_attr_ndl_ctrl_qos;
+static int hf_nan_attr_ndl_ctrl_type;
+static int hf_nan_attr_ndl_ctrl_setup_reason;
+static int hf_nan_attr_ndl_ctrl_max_idle_pres;
+static int hf_nan_attr_ndl_reserved_peer_id;
+static int hf_nan_attr_ndl_max_idle;
+static int hf_nan_attr_ndlqos_min_time_slots;
+static int hf_nan_attr_ndlqos_max_latency;
+static int hf_nan_attr_unaligned_sch_ctrl;
+static int hf_nan_attr_unaligned_sch_ctrl_schedule_id;
+static int hf_nan_attr_unaligned_sch_ctrl_seq_id;
+static int hf_nan_attr_unaligned_sch_starting_time;
+static int hf_nan_attr_unaligned_sch_duration;
+static int hf_nan_attr_unaligned_sch_period;
+static int hf_nan_attr_unaligned_sch_count_down;
+static int hf_nan_attr_unaligned_sch_ulw_overwrite;
+static int hf_nan_attr_unaligned_sch_ulw_overwrite_all;
+static int hf_nan_attr_unaligned_sch_ulw_overwrite_map_id;
+static int hf_nan_attr_unaligned_sch_ulw_ctrl;
+static int hf_nan_attr_unaligned_sch_ulw_ctrl_type;
+static int hf_nan_attr_unaligned_sch_ulw_ctrl_channel_av;
+static int hf_nan_attr_unaligned_sch_ulw_ctrl_rxnss;
+static int hf_nan_attr_ranging_info_location_info_avail;
+static int hf_nan_attr_ranging_info_location_info_avail_lci;
+static int hf_nan_attr_ranging_info_location_info_avail_geospatial;
+static int hf_nan_attr_ranging_info_location_info_avail_civic_location;
+static int hf_nan_attr_ranging_info_location_info_avail_last_movement_pres;
+static int hf_nan_attr_ranging_info_last_movement_indication;
+static int hf_nan_attr_ranging_setup_type;
+static int hf_nan_attr_ranging_setup_ctrl;
+static int hf_nan_attr_ranging_setup_ctrl_report_req;
+static int hf_nan_attr_ranging_setup_ctrl_ftm_params;
+static int hf_nan_attr_ranging_setup_ctrl_entry_list;
+static int hf_nan_attr_ranging_setup_ftm_params;
+static int hf_nan_attr_ranging_setup_ftm_max_per_burst;
+static int hf_nan_attr_ranging_setup_ftm_min_delta;
+static int hf_nan_attr_ranging_setup_ftm_max_burst_duration;
+static int hf_nan_attr_ranging_setup_ftm_format_bw;
+static int hf_nan_attr_ftm_range_report;
+static int hf_nan_attr_cipher_suite_capabilities;
+static int hf_nan_attr_cipher_suite_id;
+static int hf_nan_attr_security_context_identifier;
+static int hf_nan_attr_security_context_identifier_len;
+static int hf_nan_attr_security_context_identifier_type;
+static int hf_nan_attr_shared_key_rsna_descriptor;
+static int hf_nan_attr_vendor_specific_body;
+static int hf_nan_attr_container_element_id;
+static int hf_nan_attr_container_element_len;
 
 enum {
     NAN_ATTR_MASTER_INDICATION = 0x00,
diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c
index 76486fbc7b..bc41025d2c 100644
--- a/epan/dissectors/packet-wifi-p2p.c
+++ b/epan/dissectors/packet-wifi-p2p.c
@@ -242,182 +242,182 @@ static const value_string p2p_oob_group_owner_negotiation_channel_role_indicatio
   { 0, NULL }
 };
 
-static int proto_p2p = -1;
-
-static gint ett_p2p_tlv = -1;
-static gint ett_p2p_service_tlv = -1;
-static gint ett_p2p_advertised_service = -1;
-static gint ett_p2p_client_descr = -1;
-
-static int hf_p2p_attr_type = -1;
-static int hf_p2p_attr_len = -1;
-
-/* static int hf_p2p_attr_capab = -1; */
-static int hf_p2p_attr_capab_device = -1;
-static int hf_p2p_attr_capab_device_service_discovery = -1;
-static int hf_p2p_attr_capab_device_client_discoverability = -1;
-static int hf_p2p_attr_capab_device_concurrent_operation = -1;
-static int hf_p2p_attr_capab_device_infrastructure_managed = -1;
-static int hf_p2p_attr_capab_device_limit = -1;
-static int hf_p2p_attr_capab_invitation_procedure = -1;
-static int hf_p2p_attr_capab_group = -1;
-static int hf_p2p_attr_capab_group_owner = -1;
-static int hf_p2p_attr_capab_group_persistent = -1;
-static int hf_p2p_attr_capab_group_limit = -1;
-static int hf_p2p_attr_capab_group_intra_bss_distribution = -1;
-static int hf_p2p_attr_capab_group_cross_connection = -1;
-static int hf_p2p_attr_capab_group_persistent_reconnect = -1;
-static int hf_p2p_attr_capab_group_group_formation = -1;
-static int hf_p2p_attr_capab_group_ip_address_allocation = -1;
-
-static int hf_p2p_attr_device_id = -1;
-
-static int hf_p2p_attr_status = -1;
-
-static int hf_p2p_attr_go_intent = -1;
-static int hf_p2p_attr_go_intent_tie_breaker = -1;
-
-/* static int hf_p2p_attr_listen_channel = -1; */
-static int hf_p2p_attr_listen_channel_country = -1;
-static int hf_p2p_attr_listen_channel_oper_class = -1;
-static int hf_p2p_attr_listen_channel_number = -1;
-
-/* static int hf_p2p_attr_operating_channel = -1; */
-static int hf_p2p_attr_operating_channel_country = -1;
-static int hf_p2p_attr_operating_channel_oper_class = -1;
-static int hf_p2p_attr_operating_channel_number = -1;
-
-/* static int hf_p2p_attr_channel_list = -1; */
-static int hf_p2p_attr_channel_list_country = -1;
-static int hf_p2p_attr_channel_list_oper_class = -1;
-static int hf_p2p_attr_channel_list_num_chan = -1;
-static int hf_p2p_attr_channel_list_chan = -1;
-
-/* static int hf_p2p_attr_dev_info = -1; */
-static int hf_p2p_attr_dev_info_p2p_dev_addr = -1;
-static int hf_p2p_attr_dev_info_pri_dev_type = -1;
-static int hf_p2p_attr_dev_info_pri_dev_type_category = -1;
-static int hf_p2p_attr_dev_info_pri_dev_type_oui = -1;
-static int hf_p2p_attr_dev_info_pri_dev_type_subcategory = -1;
-static int hf_p2p_attr_dev_info_num_sec = -1;
-static int hf_p2p_attr_dev_info_sec_dev_type = -1;
-static int hf_p2p_attr_dev_info_dev_name_type = -1;
-static int hf_p2p_attr_dev_info_dev_name_len = -1;
-static int hf_p2p_attr_dev_info_dev_name = -1;
-static int hf_p2p_attr_dev_info_config_methods = -1;
-static int hf_p2p_attr_dev_info_config_methods_usba = -1;
-static int hf_p2p_attr_dev_info_config_methods_ethernet = -1;
-static int hf_p2p_attr_dev_info_config_methods_label = -1;
-static int hf_p2p_attr_dev_info_config_methods_display = -1;
-static int hf_p2p_attr_dev_info_config_methods_ext_nfc_token = -1;
-static int hf_p2p_attr_dev_info_config_methods_int_nfc_token = -1;
-static int hf_p2p_attr_dev_info_config_methods_nfc_interface = -1;
-static int hf_p2p_attr_dev_info_config_methods_pushbutton = -1;
-static int hf_p2p_attr_dev_info_config_methods_keypad = -1;
-static int hf_p2p_attr_config_timeout_go = -1;
-static int hf_p2p_attr_config_timeout_client = -1;
-static int hf_p2p_attr_intended_interface_addr = -1;
-static int hf_p2p_attr_extended_listen_timing_period = -1;
-static int hf_p2p_attr_extended_listen_timing_interval = -1;
-static int hf_p2p_attr_p2p_group_id_dev_addr = -1;
-static int hf_p2p_attr_p2p_group_id_ssid = -1;
-static int hf_p2p_attr_p2p_group_bssid = -1;
-
-static int hf_p2p_attr_noa_index = -1;
-static int hf_p2p_attr_noa_params = -1;
-static int hf_p2p_attr_noa_params_opp_ps = -1;
-static int hf_p2p_attr_noa_params_ctwindow = -1;
-static int hf_p2p_attr_noa_count_type = -1;
-static int hf_p2p_attr_noa_duration = -1;
-static int hf_p2p_attr_noa_interval = -1;
-static int hf_p2p_attr_noa_start_time = -1;
-
-/* static int hf_p2p_attr_gi = -1; */
-static int hf_p2p_attr_gi_length = -1;
-static int hf_p2p_attr_gi_p2p_dev_addr = -1;
-static int hf_p2p_attr_gi_p2p_iface_addr = -1;
-static int hf_p2p_attr_gi_dev_capab = -1;
-static int hf_p2p_attr_gi_dev_capab_service_discovery = -1;
-static int hf_p2p_attr_gi_dev_capab_client_discoverability = -1;
-static int hf_p2p_attr_gi_dev_capab_concurrent_operation = -1;
-static int hf_p2p_attr_gi_dev_capab_infrastructure_managed = -1;
-static int hf_p2p_attr_gi_dev_capab_limit = -1;
-/* static int hf_p2p_attr_gi_dev_capab_invitation_procedure = -1; */
-static int hf_p2p_attr_gi_config_methods = -1;
-/* static int hf_p2p_attr_gi_config_methods_usba = -1; */
-/* static int hf_p2p_attr_gi_config_methods_ethernet = -1; */
-/* static int hf_p2p_attr_gi_config_methods_label = -1; */
-/* static int hf_p2p_attr_gi_config_methods_display = -1; */
-/* static int hf_p2p_attr_gi_config_methods_ext_nfc_token = -1; */
-/* static int hf_p2p_attr_gi_config_methods_int_nfc_token = -1; */
-/* static int hf_p2p_attr_gi_config_methods_nfc_interface = -1; */
-/* static int hf_p2p_attr_gi_config_methods_pushbutton = -1; */
-/* static int hf_p2p_attr_gi_config_methods_keypad = -1; */
-static int hf_p2p_attr_gi_pri_dev_type = -1;
-static int hf_p2p_attr_gi_pri_dev_type_category = -1;
-static int hf_p2p_attr_gi_pri_dev_type_oui = -1;
-static int hf_p2p_attr_gi_pri_dev_type_subcategory = -1;
-static int hf_p2p_attr_gi_num_sec_dev_types = -1;
-static int hf_p2p_attr_gi_sec_dev_type = -1;
-static int hf_p2p_attr_gi_dev_name_type = -1;
-static int hf_p2p_attr_gi_dev_name_len = -1;
-static int hf_p2p_attr_gi_dev_name = -1;
-
-static int hf_p2p_attr_invitation_flags = -1;
-static int hf_p2p_attr_invitation_flags_type = -1;
-
-static int hf_p2p_attr_manageability_bitmap = -1;
-static int hf_p2p_attr_manageability_bitmap_mgmt = -1;
-static int hf_p2p_attr_manageability_bitmap_cross_connect = -1;
-static int hf_p2p_attr_manageability_bitmap_coex_opt = -1;
-
-static int hf_p2p_attr_minor_reason_code = -1;
-
-static int hf_p2p_attr_oob_group_owner_negotiation_channel_country = -1;
-static int hf_p2p_attr_oob_group_owner_negotiation_channel_oper_class = -1;
-static int hf_p2p_attr_oob_group_owner_negotiation_channel_number = -1;
-static int hf_p2p_attr_oob_group_owner_negotiation_channel_role_indication = -1;
-
-static int hf_p2p_attr_service_hash = -1;
-
-static int hf_p2p_attr_session_information = -1;
-
-static int hf_p2p_attr_connection_capability = -1;
-
-static int hf_p2p_attr_advertisement_id = -1;
-static int hf_p2p_attr_advertisement_id_service_mac_address = -1;
-
-static int hf_p2p_attr_advertised_service_advertisement_id = -1;
-static int hf_p2p_attr_advertised_service_config_methods = -1;
-static int hf_p2p_attr_advertised_service_service_name_length = -1;
-static int hf_p2p_attr_advertised_service_service_name = -1;
-
-static int hf_p2p_attr_session_id = -1;
-static int hf_p2p_attr_session_id_session_mac_address = -1;
-
-static int hf_p2p_attr_feature_capability = -1;
-
-static int hf_p2p_attr_persistent_group_p2p_device_address = -1;
-static int hf_p2p_attr_persistent_group_ssid = -1;
-
-
-static int hf_p2p_anqp_service_update_indicator = -1;
-static int hf_p2p_anqp_length = -1;
-static int hf_p2p_anqp_service_protocol_type = -1;
-static int hf_p2p_anqp_service_transaction_id = -1;
-static int hf_p2p_anqp_query_data = -1;
-static int hf_p2p_anqp_status_code = -1;
-static int hf_p2p_anqp_response_data = -1;
-
-static int hf_p2p_action_subtype = -1;
-static int hf_p2p_action_dialog_token = -1;
-static int hf_p2p_public_action_subtype = -1;
-static int hf_p2p_public_action_dialog_token = -1;
-
-static expert_field ei_wifi_p2p_attr_dev_info_dev_name_type = EI_INIT;
-static expert_field ei_wifi_p2p_attr_len = EI_INIT;
-static expert_field ei_wifi_p2p_anqp_length = EI_INIT;
-static expert_field ei_wifi_p2p_anqp_unexpected_padding = EI_INIT;
+static int proto_p2p;
+
+static gint ett_p2p_tlv;
+static gint ett_p2p_service_tlv;
+static gint ett_p2p_advertised_service;
+static gint ett_p2p_client_descr;
+
+static int hf_p2p_attr_type;
+static int hf_p2p_attr_len;
+
+/* static int hf_p2p_attr_capab; */
+static int hf_p2p_attr_capab_device;
+static int hf_p2p_attr_capab_device_service_discovery;
+static int hf_p2p_attr_capab_device_client_discoverability;
+static int hf_p2p_attr_capab_device_concurrent_operation;
+static int hf_p2p_attr_capab_device_infrastructure_managed;
+static int hf_p2p_attr_capab_device_limit;
+static int hf_p2p_attr_capab_invitation_procedure;
+static int hf_p2p_attr_capab_group;
+static int hf_p2p_attr_capab_group_owner;
+static int hf_p2p_attr_capab_group_persistent;
+static int hf_p2p_attr_capab_group_limit;
+static int hf_p2p_attr_capab_group_intra_bss_distribution;
+static int hf_p2p_attr_capab_group_cross_connection;
+static int hf_p2p_attr_capab_group_persistent_reconnect;
+static int hf_p2p_attr_capab_group_group_formation;
+static int hf_p2p_attr_capab_group_ip_address_allocation;
+
+static int hf_p2p_attr_device_id;
+
+static int hf_p2p_attr_status;
+
+static int hf_p2p_attr_go_intent;
+static int hf_p2p_attr_go_intent_tie_breaker;
+
+/* static int hf_p2p_attr_listen_channel; */
+static int hf_p2p_attr_listen_channel_country;
+static int hf_p2p_attr_listen_channel_oper_class;
+static int hf_p2p_attr_listen_channel_number;
+
+/* static int hf_p2p_attr_operating_channel; */
+static int hf_p2p_attr_operating_channel_country;
+static int hf_p2p_attr_operating_channel_oper_class;
+static int hf_p2p_attr_operating_channel_number;
+
+/* static int hf_p2p_attr_channel_list; */
+static int hf_p2p_attr_channel_list_country;
+static int hf_p2p_attr_channel_list_oper_class;
+static int hf_p2p_attr_channel_list_num_chan;
+static int hf_p2p_attr_channel_list_chan;
+
+/* static int hf_p2p_attr_dev_info; */
+static int hf_p2p_attr_dev_info_p2p_dev_addr;
+static int hf_p2p_attr_dev_info_pri_dev_type;
+static int hf_p2p_attr_dev_info_pri_dev_type_category;
+static int hf_p2p_attr_dev_info_pri_dev_type_oui;
+static int hf_p2p_attr_dev_info_pri_dev_type_subcategory;
+static int hf_p2p_attr_dev_info_num_sec;
+static int hf_p2p_attr_dev_info_sec_dev_type;
+static int hf_p2p_attr_dev_info_dev_name_type;
+static int hf_p2p_attr_dev_info_dev_name_len;
+static int hf_p2p_attr_dev_info_dev_name;
+static int hf_p2p_attr_dev_info_config_methods;
+static int hf_p2p_attr_dev_info_config_methods_usba;
+static int hf_p2p_attr_dev_info_config_methods_ethernet;
+static int hf_p2p_attr_dev_info_config_methods_label;
+static int hf_p2p_attr_dev_info_config_methods_display;
+static int hf_p2p_attr_dev_info_config_methods_ext_nfc_token;
+static int hf_p2p_attr_dev_info_config_methods_int_nfc_token;
+static int hf_p2p_attr_dev_info_config_methods_nfc_interface;
+static int hf_p2p_attr_dev_info_config_methods_pushbutton;
+static int hf_p2p_attr_dev_info_config_methods_keypad;
+static int hf_p2p_attr_config_timeout_go;
+static int hf_p2p_attr_config_timeout_client;
+static int hf_p2p_attr_intended_interface_addr;
+static int hf_p2p_attr_extended_listen_timing_period;
+static int hf_p2p_attr_extended_listen_timing_interval;
+static int hf_p2p_attr_p2p_group_id_dev_addr;
+static int hf_p2p_attr_p2p_group_id_ssid;
+static int hf_p2p_attr_p2p_group_bssid;
+
+static int hf_p2p_attr_noa_index;
+static int hf_p2p_attr_noa_params;
+static int hf_p2p_attr_noa_params_opp_ps;
+static int hf_p2p_attr_noa_params_ctwindow;
+static int hf_p2p_attr_noa_count_type;
+static int hf_p2p_attr_noa_duration;
+static int hf_p2p_attr_noa_interval;
+static int hf_p2p_attr_noa_start_time;
+
+/* static int hf_p2p_attr_gi; */
+static int hf_p2p_attr_gi_length;
+static int hf_p2p_attr_gi_p2p_dev_addr;
+static int hf_p2p_attr_gi_p2p_iface_addr;
+static int hf_p2p_attr_gi_dev_capab;
+static int hf_p2p_attr_gi_dev_capab_service_discovery;
+static int hf_p2p_attr_gi_dev_capab_client_discoverability;
+static int hf_p2p_attr_gi_dev_capab_concurrent_operation;
+static int hf_p2p_attr_gi_dev_capab_infrastructure_managed;
+static int hf_p2p_attr_gi_dev_capab_limit;
+/* static int hf_p2p_attr_gi_dev_capab_invitation_procedure; */
+static int hf_p2p_attr_gi_config_methods;
+/* static int hf_p2p_attr_gi_config_methods_usba; */
+/* static int hf_p2p_attr_gi_config_methods_ethernet; */
+/* static int hf_p2p_attr_gi_config_methods_label; */
+/* static int hf_p2p_attr_gi_config_methods_display; */
+/* static int hf_p2p_attr_gi_config_methods_ext_nfc_token; */
+/* static int hf_p2p_attr_gi_config_methods_int_nfc_token; */
+/* static int hf_p2p_attr_gi_config_methods_nfc_interface; */
+/* static int hf_p2p_attr_gi_config_methods_pushbutton; */
+/* static int hf_p2p_attr_gi_config_methods_keypad; */
+static int hf_p2p_attr_gi_pri_dev_type;
+static int hf_p2p_attr_gi_pri_dev_type_category;
+static int hf_p2p_attr_gi_pri_dev_type_oui;
+static int hf_p2p_attr_gi_pri_dev_type_subcategory;
+static int hf_p2p_attr_gi_num_sec_dev_types;
+static int hf_p2p_attr_gi_sec_dev_type;
+static int hf_p2p_attr_gi_dev_name_type;
+static int hf_p2p_attr_gi_dev_name_len;
+static int hf_p2p_attr_gi_dev_name;
+
+static int hf_p2p_attr_invitation_flags;
+static int hf_p2p_attr_invitation_flags_type;
+
+static int hf_p2p_attr_manageability_bitmap;
+static int hf_p2p_attr_manageability_bitmap_mgmt;
+static int hf_p2p_attr_manageability_bitmap_cross_connect;
+static int hf_p2p_attr_manageability_bitmap_coex_opt;
+
+static int hf_p2p_attr_minor_reason_code;
+
+static int hf_p2p_attr_oob_group_owner_negotiation_channel_country;
+static int hf_p2p_attr_oob_group_owner_negotiation_channel_oper_class;
+static int hf_p2p_attr_oob_group_owner_negotiation_channel_number;
+static int hf_p2p_attr_oob_group_owner_negotiation_channel_role_indication;
+
+static int hf_p2p_attr_service_hash;
+
+static int hf_p2p_attr_session_information;
+
+static int hf_p2p_attr_connection_capability;
+
+static int hf_p2p_attr_advertisement_id;
+static int hf_p2p_attr_advertisement_id_service_mac_address;
+
+static int hf_p2p_attr_advertised_service_advertisement_id;
+static int hf_p2p_attr_advertised_service_config_methods;
+static int hf_p2p_attr_advertised_service_service_name_length;
+static int hf_p2p_attr_advertised_service_service_name;
+
+static int hf_p2p_attr_session_id;
+static int hf_p2p_attr_session_id_session_mac_address;
+
+static int hf_p2p_attr_feature_capability;
+
+static int hf_p2p_attr_persistent_group_p2p_device_address;
+static int hf_p2p_attr_persistent_group_ssid;
+
+
+static int hf_p2p_anqp_service_update_indicator;
+static int hf_p2p_anqp_length;
+static int hf_p2p_anqp_service_protocol_type;
+static int hf_p2p_anqp_service_transaction_id;
+static int hf_p2p_anqp_query_data;
+static int hf_p2p_anqp_status_code;
+static int hf_p2p_anqp_response_data;
+
+static int hf_p2p_action_subtype;
+static int hf_p2p_action_dialog_token;
+static int hf_p2p_public_action_subtype;
+static int hf_p2p_public_action_dialog_token;
+
+static expert_field ei_wifi_p2p_attr_dev_info_dev_name_type;
+static expert_field ei_wifi_p2p_attr_len;
+static expert_field ei_wifi_p2p_anqp_length;
+static expert_field ei_wifi_p2p_anqp_unexpected_padding;
 
 static dissector_handle_t wifi_p2p_act_handle;
 static dissector_handle_t wifi_p2p_anqp_handle;
diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c
index 9dd5b96e9d..49d4d96580 100644
--- a/epan/dissectors/packet-windows-common.c
+++ b/epan/dissectors/packet-windows-common.c
@@ -86,128 +86,128 @@ static const value_string ace_sra_type_vals[] = {
 	{ 0, NULL }
 };
 
-static int hf_nt_sec_desc_revision = -1;
-static int hf_nt_sec_desc_type_owner_defaulted = -1;
-static int hf_nt_sec_desc_type_group_defaulted = -1;
-static int hf_nt_sec_desc_type_dacl_present = -1;
-static int hf_nt_sec_desc_type_dacl_defaulted = -1;
-static int hf_nt_sec_desc_type_sacl_present = -1;
-static int hf_nt_sec_desc_type_sacl_defaulted = -1;
-static int hf_nt_sec_desc_type_dacl_trusted = -1;
-static int hf_nt_sec_desc_type_server_security = -1;
-static int hf_nt_sec_desc_type_dacl_auto_inherit_req = -1;
-static int hf_nt_sec_desc_type_sacl_auto_inherit_req = -1;
-static int hf_nt_sec_desc_type_dacl_auto_inherited = -1;
-static int hf_nt_sec_desc_type_sacl_auto_inherited = -1;
-static int hf_nt_sec_desc_type_dacl_protected = -1;
-static int hf_nt_sec_desc_type_sacl_protected = -1;
-static int hf_nt_sec_desc_type_rm_control_valid = -1;
-static int hf_nt_sec_desc_type_self_relative = -1;
-static int hf_nt_sid = -1;
-static int hf_nt_sid_revision = -1;
-static int hf_nt_sid_num_auth = -1;
-static int hf_nt_sid_auth_dec = -1;
-static int hf_nt_sid_auth_hex = -1;
-static int hf_nt_sid_subauth = -1;
-static int hf_nt_sid_rid_dec = -1;
-static int hf_nt_sid_rid_hex = -1;
-static int hf_nt_sid_wkwn = -1;
-static int hf_nt_sid_domain = -1;
-static int hf_nt_acl_revision = -1;
-static int hf_nt_acl_size = -1;
-static int hf_nt_acl_num_aces = -1;
-static int hf_nt_ace_flags_object_inherit = -1;
-static int hf_nt_ace_flags_container_inherit = -1;
-static int hf_nt_ace_flags_non_propagate_inherit = -1;
-static int hf_nt_ace_flags_inherit_only = -1;
-static int hf_nt_ace_flags_inherited_ace = -1;
-static int hf_nt_ace_flags_successful_access = -1;
-static int hf_nt_ace_flags_failed_access = -1;
-static int hf_nt_ace_type = -1;
-static int hf_nt_ace_size = -1;
-static int hf_nt_ace_flags_object_type_present = -1;
-static int hf_nt_ace_flags_inherited_object_type_present = -1;
-static int hf_nt_ace_guid = -1;
-static int hf_nt_ace_inherited_guid = -1;
+static int hf_nt_sec_desc_revision;
+static int hf_nt_sec_desc_type_owner_defaulted;
+static int hf_nt_sec_desc_type_group_defaulted;
+static int hf_nt_sec_desc_type_dacl_present;
+static int hf_nt_sec_desc_type_dacl_defaulted;
+static int hf_nt_sec_desc_type_sacl_present;
+static int hf_nt_sec_desc_type_sacl_defaulted;
+static int hf_nt_sec_desc_type_dacl_trusted;
+static int hf_nt_sec_desc_type_server_security;
+static int hf_nt_sec_desc_type_dacl_auto_inherit_req;
+static int hf_nt_sec_desc_type_sacl_auto_inherit_req;
+static int hf_nt_sec_desc_type_dacl_auto_inherited;
+static int hf_nt_sec_desc_type_sacl_auto_inherited;
+static int hf_nt_sec_desc_type_dacl_protected;
+static int hf_nt_sec_desc_type_sacl_protected;
+static int hf_nt_sec_desc_type_rm_control_valid;
+static int hf_nt_sec_desc_type_self_relative;
+static int hf_nt_sid;
+static int hf_nt_sid_revision;
+static int hf_nt_sid_num_auth;
+static int hf_nt_sid_auth_dec;
+static int hf_nt_sid_auth_hex;
+static int hf_nt_sid_subauth;
+static int hf_nt_sid_rid_dec;
+static int hf_nt_sid_rid_hex;
+static int hf_nt_sid_wkwn;
+static int hf_nt_sid_domain;
+static int hf_nt_acl_revision;
+static int hf_nt_acl_size;
+static int hf_nt_acl_num_aces;
+static int hf_nt_ace_flags_object_inherit;
+static int hf_nt_ace_flags_container_inherit;
+static int hf_nt_ace_flags_non_propagate_inherit;
+static int hf_nt_ace_flags_inherit_only;
+static int hf_nt_ace_flags_inherited_ace;
+static int hf_nt_ace_flags_successful_access;
+static int hf_nt_ace_flags_failed_access;
+static int hf_nt_ace_type;
+static int hf_nt_ace_size;
+static int hf_nt_ace_flags_object_type_present;
+static int hf_nt_ace_flags_inherited_object_type_present;
+static int hf_nt_ace_guid;
+static int hf_nt_ace_inherited_guid;
 
 /* Conditional ACE dissect */
-static int hf_nt_ace_cond = -1;
-static int hf_nt_ace_cond_token = -1;
-static int hf_nt_ace_cond_sign = -1;
-static int hf_nt_ace_cond_base = -1;
-static int hf_nt_ace_cond_value_int8 = -1;
-static int hf_nt_ace_cond_value_int16 = -1;
-static int hf_nt_ace_cond_value_int32 = -1;
-static int hf_nt_ace_cond_value_int64 = -1;
-static int hf_nt_ace_cond_value_string = -1;
-static int hf_nt_ace_cond_value_octet_string = -1;
-static int hf_nt_ace_cond_local_attr = -1;
-static int hf_nt_ace_cond_user_attr = -1;
-static int hf_nt_ace_cond_resource_attr = -1;
-static int hf_nt_ace_cond_device_attr = -1;
+static int hf_nt_ace_cond;
+static int hf_nt_ace_cond_token;
+static int hf_nt_ace_cond_sign;
+static int hf_nt_ace_cond_base;
+static int hf_nt_ace_cond_value_int8;
+static int hf_nt_ace_cond_value_int16;
+static int hf_nt_ace_cond_value_int32;
+static int hf_nt_ace_cond_value_int64;
+static int hf_nt_ace_cond_value_string;
+static int hf_nt_ace_cond_value_octet_string;
+static int hf_nt_ace_cond_local_attr;
+static int hf_nt_ace_cond_user_attr;
+static int hf_nt_ace_cond_resource_attr;
+static int hf_nt_ace_cond_device_attr;
 
 /* System Resource Attribute ACE dissect */
-static int hf_nt_ace_sra = -1;
-static int hf_nt_ace_sra_name_offset = -1;
-static int hf_nt_ace_sra_name = -1;
-static int hf_nt_ace_sra_type = -1;
-static int hf_nt_ace_sra_reserved = -1;
-static int hf_nt_ace_sra_flags = -1;
-static int hf_nt_ace_sra_flags_manual = -1;
-static int hf_nt_ace_sra_flags_policy_derived = -1;
-static int hf_nt_ace_sra_flags_non_inheritable = -1;
-static int hf_nt_ace_sra_flags_case_sensitive = -1;
-static int hf_nt_ace_sra_flags_deny_only = -1;
-static int hf_nt_ace_sra_flags_disabled_by_default = -1;
-static int hf_nt_ace_sra_flags_disabled = -1;
-static int hf_nt_ace_sra_flags_mandatory = -1;
-static int hf_nt_ace_sra_value_count = -1;
-static int hf_nt_ace_sra_value_offset = -1;
-static int hf_nt_ace_sra_value_int64 = -1;
-static int hf_nt_ace_sra_value_uint64 = -1;
-static int hf_nt_ace_sra_value_string = -1;
-static int hf_nt_ace_sra_value_sid = -1;
-static int hf_nt_ace_sra_value_boolean = -1;
-static int hf_nt_ace_sra_value_octet_string = -1;
-
-static int hf_nt_security_information_sacl = -1;
-static int hf_nt_security_information_dacl = -1;
-static int hf_nt_security_information_group = -1;
-static int hf_nt_security_information_owner = -1;
+static int hf_nt_ace_sra;
+static int hf_nt_ace_sra_name_offset;
+static int hf_nt_ace_sra_name;
+static int hf_nt_ace_sra_type;
+static int hf_nt_ace_sra_reserved;
+static int hf_nt_ace_sra_flags;
+static int hf_nt_ace_sra_flags_manual;
+static int hf_nt_ace_sra_flags_policy_derived;
+static int hf_nt_ace_sra_flags_non_inheritable;
+static int hf_nt_ace_sra_flags_case_sensitive;
+static int hf_nt_ace_sra_flags_deny_only;
+static int hf_nt_ace_sra_flags_disabled_by_default;
+static int hf_nt_ace_sra_flags_disabled;
+static int hf_nt_ace_sra_flags_mandatory;
+static int hf_nt_ace_sra_value_count;
+static int hf_nt_ace_sra_value_offset;
+static int hf_nt_ace_sra_value_int64;
+static int hf_nt_ace_sra_value_uint64;
+static int hf_nt_ace_sra_value_string;
+static int hf_nt_ace_sra_value_sid;
+static int hf_nt_ace_sra_value_boolean;
+static int hf_nt_ace_sra_value_octet_string;
+
+static int hf_nt_security_information_sacl;
+static int hf_nt_security_information_dacl;
+static int hf_nt_security_information_group;
+static int hf_nt_security_information_owner;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_nt_security_information = -1;
-static int hf_nt_sec_desc_type = -1;
-static int hf_nt_offset_to_dacl = -1;
-static int hf_nt_offset_to_owner_sid = -1;
-static int hf_nt_ace_flags_object = -1;
-static int hf_nt_offset_to_group_sid = -1;
-static int hf_nt_ace_flags = -1;
-static int hf_nt_offset_to_sacl = -1;
-
-static gint ett_nt_sec_desc = -1;
-static gint ett_nt_sec_desc_type = -1;
-static gint ett_nt_sid = -1;
-static gint ett_nt_acl = -1;
-static gint ett_nt_ace = -1;
-static gint ett_nt_ace_flags = -1;
-static gint ett_nt_ace_object = -1;
-static gint ett_nt_ace_object_flags = -1;
-static gint ett_nt_security_information = -1;
-static gint ett_nt_ace_cond = -1;
-static gint ett_nt_ace_cond_data = -1;
-static gint ett_nt_ace_sra = -1;
-static gint ett_nt_ace_sra_flags = -1;
-static gint ett_nt_ace_sra_value_offsets = -1;
-static gint ett_nt_ace_sra_values = -1;
-
-static expert_field ei_nt_owner_sid_beyond_data = EI_INIT;
-static expert_field ei_nt_owner_sid_beyond_reassembled_data = EI_INIT;
-static expert_field ei_nt_ace_extends_beyond_data = EI_INIT;
-static expert_field ei_nt_ace_extends_beyond_reassembled_data = EI_INIT;
-static expert_field ei_nt_group_sid_beyond_data = EI_INIT;
-static expert_field ei_nt_group_sid_beyond_reassembled_data = EI_INIT;
-static expert_field ei_nt_item_offs_out_of_range = EI_INIT;
+static int hf_nt_security_information;
+static int hf_nt_sec_desc_type;
+static int hf_nt_offset_to_dacl;
+static int hf_nt_offset_to_owner_sid;
+static int hf_nt_ace_flags_object;
+static int hf_nt_offset_to_group_sid;
+static int hf_nt_ace_flags;
+static int hf_nt_offset_to_sacl;
+
+static gint ett_nt_sec_desc;
+static gint ett_nt_sec_desc_type;
+static gint ett_nt_sid;
+static gint ett_nt_acl;
+static gint ett_nt_ace;
+static gint ett_nt_ace_flags;
+static gint ett_nt_ace_object;
+static gint ett_nt_ace_object_flags;
+static gint ett_nt_security_information;
+static gint ett_nt_ace_cond;
+static gint ett_nt_ace_cond_data;
+static gint ett_nt_ace_sra;
+static gint ett_nt_ace_sra_flags;
+static gint ett_nt_ace_sra_value_offsets;
+static gint ett_nt_ace_sra_values;
+
+static expert_field ei_nt_owner_sid_beyond_data;
+static expert_field ei_nt_owner_sid_beyond_reassembled_data;
+static expert_field ei_nt_ace_extends_beyond_data;
+static expert_field ei_nt_ace_extends_beyond_reassembled_data;
+static expert_field ei_nt_group_sid_beyond_data;
+static expert_field ei_nt_group_sid_beyond_reassembled_data;
+static expert_field ei_nt_item_offs_out_of_range;
 
 
 /* WERR error codes */
@@ -2195,38 +2195,38 @@ dissect_nt_conditional_ace(tvbuff_t *tvb, int offset, guint16 size, proto_tree *
      https://docs.microsoft.com/en-us/windows/win32/secauthz/access-mask-format
 
 */
-static gint ett_nt_access_mask = -1;
-static gint ett_nt_access_mask_generic = -1;
-static gint ett_nt_access_mask_standard = -1;
-static gint ett_nt_access_mask_specific = -1;
-
-static int hf_access_sacl = -1;
-static int hf_access_maximum_allowed = -1;
-static int hf_access_generic_read = -1;
-static int hf_access_generic_write = -1;
-static int hf_access_generic_execute = -1;
-static int hf_access_generic_all = -1;
-static int hf_access_standard_delete = -1;
-static int hf_access_standard_read_control = -1;
-static int hf_access_standard_synchronise = -1;
-static int hf_access_standard_write_dac = -1;
-static int hf_access_standard_write_owner = -1;
-static int hf_access_specific_15 = -1;
-static int hf_access_specific_14 = -1;
-static int hf_access_specific_13 = -1;
-static int hf_access_specific_12 = -1;
-static int hf_access_specific_11 = -1;
-static int hf_access_specific_10 = -1;
-static int hf_access_specific_9 = -1;
-static int hf_access_specific_8 = -1;
-static int hf_access_specific_7 = -1;
-static int hf_access_specific_6 = -1;
-static int hf_access_specific_5 = -1;
-static int hf_access_specific_4 = -1;
-static int hf_access_specific_3 = -1;
-static int hf_access_specific_2 = -1;
-static int hf_access_specific_1 = -1;
-static int hf_access_specific_0 = -1;
+static gint ett_nt_access_mask;
+static gint ett_nt_access_mask_generic;
+static gint ett_nt_access_mask_standard;
+static gint ett_nt_access_mask_specific;
+
+static int hf_access_sacl;
+static int hf_access_maximum_allowed;
+static int hf_access_generic_read;
+static int hf_access_generic_write;
+static int hf_access_generic_execute;
+static int hf_access_generic_all;
+static int hf_access_standard_delete;
+static int hf_access_standard_read_control;
+static int hf_access_standard_synchronise;
+static int hf_access_standard_write_dac;
+static int hf_access_standard_write_owner;
+static int hf_access_specific_15;
+static int hf_access_specific_14;
+static int hf_access_specific_13;
+static int hf_access_specific_12;
+static int hf_access_specific_11;
+static int hf_access_specific_10;
+static int hf_access_specific_9;
+static int hf_access_specific_8;
+static int hf_access_specific_7;
+static int hf_access_specific_6;
+static int hf_access_specific_5;
+static int hf_access_specific_4;
+static int hf_access_specific_3;
+static int hf_access_specific_2;
+static int hf_access_specific_1;
+static int hf_access_specific_0;
 
 /* Map generic permissions to specific permissions */
 
@@ -2409,7 +2409,7 @@ dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo,
 	return offset;
 }
 
-static int hf_nt_access_mask = -1;
+static int hf_nt_access_mask;
 
 #define ACL_REVISION_NT4		2
 #define ACL_REVISION_ADS		4
diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c
index d4d443becb..f8c0959c53 100644
--- a/epan/dissectors/packet-winsrepl.c
+++ b/epan/dissectors/packet-winsrepl.c
@@ -30,63 +30,63 @@ static dissector_handle_t winsrepl_handle;
 
 static gboolean winsrepl_reassemble = TRUE;
 
-static int proto_winsrepl = -1;
+static int proto_winsrepl;
 
-static int hf_winsrepl_size = -1;
-static int hf_winsrepl_opcode = -1;
-static int hf_winsrepl_assoc_ctx = -1;
-static int hf_winsrepl_mess_type = -1;
+static int hf_winsrepl_size;
+static int hf_winsrepl_opcode;
+static int hf_winsrepl_assoc_ctx;
+static int hf_winsrepl_mess_type;
 
-static int hf_winsrepl_start_minor_version = -1;
-static int hf_winsrepl_start_major_version = -1;
+static int hf_winsrepl_start_minor_version;
+static int hf_winsrepl_start_major_version;
 
-static int hf_winsrepl_stop_reason = -1;
+static int hf_winsrepl_stop_reason;
 
-static int hf_winsrepl_replication_command = -1;
+static int hf_winsrepl_replication_command;
 
-static int hf_winsrepl_owner_address = -1;
-static int hf_winsrepl_owner_max_version = -1;
-static int hf_winsrepl_owner_min_version = -1;
-static int hf_winsrepl_owner_type = -1;
+static int hf_winsrepl_owner_address;
+static int hf_winsrepl_owner_max_version;
+static int hf_winsrepl_owner_min_version;
+static int hf_winsrepl_owner_type;
 
-static int hf_winsrepl_table_partner_count = -1;
-static int hf_winsrepl_table_initiator = -1;
+static int hf_winsrepl_table_partner_count;
+static int hf_winsrepl_table_initiator;
 
-static int hf_winsrepl_ip_owner = -1;
-static int hf_winsrepl_ip_ip = -1;
-static int hf_winsrepl_addr_list_num_ips = -1;
+static int hf_winsrepl_ip_owner;
+static int hf_winsrepl_ip_ip;
+static int hf_winsrepl_addr_list_num_ips;
 
-static int hf_winsrepl_name_len = -1;
-static int hf_winsrepl_name_flags = -1;
-static int hf_winsrepl_name_flags_rectype = -1;
-static int hf_winsrepl_name_flags_recstate = -1;
-static int hf_winsrepl_name_flags_local = -1;
-static int hf_winsrepl_name_flags_hosttype = -1;
-static int hf_winsrepl_name_flags_static = -1;
-static int hf_winsrepl_name_group_flag = -1;
-static int hf_winsrepl_name_version_id = -1;
-static int hf_winsrepl_name_unknown = -1;
+static int hf_winsrepl_name_len;
+static int hf_winsrepl_name_flags;
+static int hf_winsrepl_name_flags_rectype;
+static int hf_winsrepl_name_flags_recstate;
+static int hf_winsrepl_name_flags_local;
+static int hf_winsrepl_name_flags_hosttype;
+static int hf_winsrepl_name_flags_static;
+static int hf_winsrepl_name_group_flag;
+static int hf_winsrepl_name_version_id;
+static int hf_winsrepl_name_unknown;
 
-static int hf_winsrepl_reply_num_names = -1;
+static int hf_winsrepl_reply_num_names;
 
-static gint ett_winsrepl = -1;
+static gint ett_winsrepl;
 
-static gint ett_winsrepl_start = -1;
-static gint ett_winsrepl_stop = -1;
-static gint ett_winsrepl_replication = -1;
+static gint ett_winsrepl_start;
+static gint ett_winsrepl_stop;
+static gint ett_winsrepl_replication;
 
-static gint ett_winsrepl_owner = -1;
-static gint ett_winsrepl_table_reply = -1;
+static gint ett_winsrepl_owner;
+static gint ett_winsrepl_table_reply;
 
-static gint ett_winsrepl_ip = -1;
-static gint ett_winsrepl_addr_list = -1;
+static gint ett_winsrepl_ip;
+static gint ett_winsrepl_addr_list;
 
-static gint ett_winsrepl_name = -1;
-static gint ett_winsrepl_send_reply = -1;
+static gint ett_winsrepl_name;
+static gint ett_winsrepl_send_reply;
 
-static gint ett_winsrepl_flags = -1;
+static gint ett_winsrepl_flags;
 
-static expert_field ei_winsrepl_name_len = EI_INIT;
+static expert_field ei_winsrepl_name_len;
 
 #define WINS_REPLICATION_PORT	( 42 )
 #define WREPL_OPCODE_BITS	( 0x7800 )
diff --git a/epan/dissectors/packet-wireguard.c b/epan/dissectors/packet-wireguard.c
index ff4e09ee9d..b226520237 100644
--- a/epan/dissectors/packet-wireguard.c
+++ b/epan/dissectors/packet-wireguard.c
@@ -36,43 +36,43 @@
 void proto_reg_handoff_wg(void);
 void proto_register_wg(void);
 
-static int proto_wg = -1;
-static int hf_wg_type = -1;
-static int hf_wg_reserved = -1;
-static int hf_wg_sender = -1;
-static int hf_wg_ephemeral = -1;
-static int hf_wg_encrypted_static = -1;
-static int hf_wg_static = -1;
-static int hf_wg_encrypted_timestamp = -1;
-static int hf_wg_timestamp_tai64_label = -1;
-static int hf_wg_timestamp_nanoseconds = -1;
-static int hf_wg_timestamp_value = -1;
-static int hf_wg_mac1 = -1;
-static int hf_wg_mac2 = -1;
-static int hf_wg_receiver = -1;
-static int hf_wg_encrypted_empty = -1;
-static int hf_wg_handshake_ok = -1;
-static int hf_wg_nonce = -1;
-static int hf_wg_encrypted_cookie = -1;
-static int hf_wg_counter = -1;
-static int hf_wg_encrypted_packet = -1;
-static int hf_wg_stream = -1;
-static int hf_wg_response_in = -1;
-static int hf_wg_response_to = -1;
-static int hf_wg_receiver_pubkey = -1;
-static int hf_wg_receiver_pubkey_known_privkey = -1;
-static int hf_wg_ephemeral_known_privkey = -1;
-static int hf_wg_static_known_pubkey = -1;
-static int hf_wg_static_known_privkey = -1;
-
-static gint ett_wg = -1;
-static gint ett_timestamp = -1;
-static gint ett_key_info = -1;
-
-static expert_field ei_wg_bad_packet_length = EI_INIT;
-static expert_field ei_wg_keepalive  = EI_INIT;
-static expert_field ei_wg_decryption_error = EI_INIT;
-static expert_field ei_wg_decryption_unsupported = EI_INIT;
+static int proto_wg;
+static int hf_wg_type;
+static int hf_wg_reserved;
+static int hf_wg_sender;
+static int hf_wg_ephemeral;
+static int hf_wg_encrypted_static;
+static int hf_wg_static;
+static int hf_wg_encrypted_timestamp;
+static int hf_wg_timestamp_tai64_label;
+static int hf_wg_timestamp_nanoseconds;
+static int hf_wg_timestamp_value;
+static int hf_wg_mac1;
+static int hf_wg_mac2;
+static int hf_wg_receiver;
+static int hf_wg_encrypted_empty;
+static int hf_wg_handshake_ok;
+static int hf_wg_nonce;
+static int hf_wg_encrypted_cookie;
+static int hf_wg_counter;
+static int hf_wg_encrypted_packet;
+static int hf_wg_stream;
+static int hf_wg_response_in;
+static int hf_wg_response_to;
+static int hf_wg_receiver_pubkey;
+static int hf_wg_receiver_pubkey_known_privkey;
+static int hf_wg_ephemeral_known_privkey;
+static int hf_wg_static_known_pubkey;
+static int hf_wg_static_known_privkey;
+
+static gint ett_wg;
+static gint ett_timestamp;
+static gint ett_key_info;
+
+static expert_field ei_wg_bad_packet_length;
+static expert_field ei_wg_keepalive;
+static expert_field ei_wg_decryption_error;
+static expert_field ei_wg_decryption_unsupported;
 
 static gboolean     pref_dissect_packet = TRUE;
 static const char  *pref_keylog_file;
diff --git a/epan/dissectors/packet-wisun.c b/epan/dissectors/packet-wisun.c
index e0a6d34a33..3860b443e2 100644
--- a/epan/dissectors/packet-wisun.c
+++ b/epan/dissectors/packet-wisun.c
@@ -120,247 +120,247 @@ static reassembly_table netricity_reassembly_table;
 
 #define WISUN_CMD_MDR 0x03
 
-static int proto_wisun = -1;
-static int hf_wisun_subid = -1;
-static int hf_wisun_unknown_ie = -1;
-static int hf_wisun_uttie = -1;
-static int hf_wisun_uttie_type = -1;
-static int hf_wisun_uttie_ufsi = -1;
-static int hf_wisun_btie = -1;
-static int hf_wisun_btie_slot = -1;
-static int hf_wisun_btie_bio = -1;
-static int hf_wisun_fcie = -1;
-static int hf_wisun_fcie_tx = -1;
-static int hf_wisun_fcie_rx = -1;
-static int hf_wisun_fcie_src = -1;
-static int hf_wisun_fcie_initial_frame = -1;
-static int hf_wisun_rslie = -1;
-static int hf_wisun_rslie_rsl = -1;
-static int hf_wisun_vhie = -1;
-static int hf_wisun_vhie_vid = -1;
-static int hf_wisun_eaie = -1;
-static int hf_wisun_eaie_eui = -1;
+static int proto_wisun;
+static int hf_wisun_subid;
+static int hf_wisun_unknown_ie;
+static int hf_wisun_uttie;
+static int hf_wisun_uttie_type;
+static int hf_wisun_uttie_ufsi;
+static int hf_wisun_btie;
+static int hf_wisun_btie_slot;
+static int hf_wisun_btie_bio;
+static int hf_wisun_fcie;
+static int hf_wisun_fcie_tx;
+static int hf_wisun_fcie_rx;
+static int hf_wisun_fcie_src;
+static int hf_wisun_fcie_initial_frame;
+static int hf_wisun_rslie;
+static int hf_wisun_rslie_rsl;
+static int hf_wisun_vhie;
+static int hf_wisun_vhie_vid;
+static int hf_wisun_eaie;
+static int hf_wisun_eaie_eui;
 
 // LFN (FAN 1.1)
-static int hf_wisun_luttie = -1;
-static int hf_wisun_luttie_usn = -1;
-static int hf_wisun_luttie_uio = -1;
-static int hf_wisun_lbtie = -1;
-static int hf_wisun_lbtie_slot = -1;
-static int hf_wisun_lbtie_bio = -1;
-static int hf_wisun_nrie = -1;
-static int hf_wisun_nrie_nr_id = -1;
-static int hf_wisun_nrie_timing_accuracy = -1;
-static int hf_wisun_nrie_listening_interval_min = -1;
-static int hf_wisun_nrie_listening_interval_max = -1;
-static int hf_wisun_lusie = -1;
-static int hf_wisun_lusie_listen_interval = -1;
-static int hf_wisun_lusie_channel_plan_tag = -1;
-static int hf_wisun_flusie = -1;
-static int hf_wisun_flusie_dwell_interval = -1;
-static int hf_wisun_flusie_channel_plan_tag = -1;
-static int hf_wisun_lbsie = -1;
-static int hf_wisun_lbsie_broadcast_interval = -1;
-static int hf_wisun_lbsie_broadcast_id = -1;
-static int hf_wisun_lbsie_channel_plan_tag = -1;
-static int hf_wisun_lbsie_broadcast_sync_period = -1;
-static int hf_wisun_lndie = -1;
-static int hf_wisun_lndie_response_threshold = -1;
-static int hf_wisun_lndie_response_delay = -1;
-static int hf_wisun_lndie_discovery_slot_time = -1;
-static int hf_wisun_lndie_discovery_slots = -1;
-static int hf_wisun_lndie_discovery_first_slot = -1;
-static int hf_wisun_ltoie = -1;
-static int hf_wisun_ltoie_offset = -1;
-static int hf_wisun_ltoie_listening_interval = -1;
-static int hf_wisun_panidie = -1;
-static int hf_wisun_panidie_panid = -1;
-static int hf_wisun_rtie = -1;
-static int hf_wisun_rtie_rendezvous_time = -1;
-static int hf_wisun_rtie_wakeup_interval = -1;
-static int hf_wisun_lbcie = -1;
-static int hf_wisun_lbcie_broadcast_interval = -1;
-static int hf_wisun_lbcie_broadcast_sync_period = -1;
-
-static int hf_wisun_pie = -1;
-static int hf_wisun_wsie = -1;
-static int hf_wisun_wsie_type = -1;
-static int hf_wisun_wsie_id = -1;
-static int hf_wisun_wsie_length = -1;
-static int hf_wisun_wsie_id_short = -1;
-static int hf_wisun_wsie_length_short = -1;
-static int hf_wisun_usie = -1;
-static int hf_wisun_usie_dwell_interval = -1;
-static int hf_wisun_usie_clock_drift = -1;
-static int hf_wisun_usie_timing_accuracy = -1;
-static int hf_wisun_usie_channel_control = -1;
-static int hf_wisun_usie_channel_plan = -1;
-static int hf_wisun_usie_channel_function = -1;
-static int hf_wisun_usie_channel_exclude = -1;
-static int hf_wisun_usie_regulatory_domain = -1;
-static int hf_wisun_usie_operating_class = -1;
-static int hf_wisun_usie_channel_plan_id = -1;
-static int hf_wisun_usie_explicit = -1;
-static int hf_wisun_usie_explicit_frequency = -1;
-static int hf_wisun_usie_explicit_reserved = -1;
-static int hf_wisun_usie_explicit_spacing = -1;
-static int hf_wisun_usie_number_channels = -1;
-static int hf_wisun_usie_fixed_channel = -1;
-static int hf_wisun_usie_hop_count = -1;
-static int hf_wisun_usie_hop_list = -1;
-static int hf_wisun_usie_number_ranges = -1;
-static int hf_wisun_usie_exclude_range_start = -1;
-static int hf_wisun_usie_exclude_range_end = -1;
-static int hf_wisun_usie_exclude_mask = -1;
-static int hf_wisun_bsie = -1;
-static int hf_wisun_bsie_bcast_interval = -1;
-static int hf_wisun_bsie_bcast_schedule_id = -1;
-static int hf_wisun_vpie = -1;
-static int hf_wisun_vpie_vid = -1;
-static int hf_wisun_lcpie = -1;
-static int hf_wisun_panie = -1;
-static int hf_wisun_panie_size = -1;
-static int hf_wisun_panie_cost = -1;
-static int hf_wisun_panie_flags = -1;
-static int hf_wisun_panie_flag_parent_bsie = -1;
-static int hf_wisun_panie_flag_routing_method = -1;
-static int hf_wisun_panie_flag_lfn_window_style = -1;
-static int hf_wisun_panie_flag_version = -1;
-static int hf_wisun_netnameie = -1;
-static int hf_wisun_netnameie_name = -1;
-static int hf_wisun_panverie = -1;
-static int hf_wisun_panverie_version = -1;
-static int hf_wisun_gtkhashie = -1;
-static int hf_wisun_gtkhashie_gtk0 = -1;
-static int hf_wisun_gtkhashie_gtk1 = -1;
-static int hf_wisun_gtkhashie_gtk2 = -1;
-static int hf_wisun_gtkhashie_gtk3 = -1;
-static int hf_wisun_pomie = -1;
-static int hf_wisun_pomie_hdr = -1;
-static int hf_wisun_pomie_number_operating_modes = -1;
-static int hf_wisun_pomie_mdr_command_capable_flag = -1;
-static int hf_wisun_pomie_reserved = -1;
-static int hf_wisun_pomie_phy_mode_id = -1;
-static int hf_wisun_pomie_phy_type = -1;
-static int hf_wisun_pomie_phy_mode_fsk = -1;
-static int hf_wisun_pomie_phy_mode_ofdm = -1;
-static int hf_wisun_lfnverie = -1;
-static int hf_wisun_lfnverie_version = -1;
-static int hf_wisun_lgtkhashie = -1;
-static int hf_wisun_lgtkhashie_flags = -1;
-static int hf_wisun_lgtkhashie_flag_includes_lgtk0 = -1;
-static int hf_wisun_lgtkhashie_flag_includes_lgtk1 = -1;
-static int hf_wisun_lgtkhashie_flag_includes_lgtk2 = -1;
-static int hf_wisun_lgtkhashie_flag_active_lgtk_index = -1;
-static int hf_wisun_lgtkhashie_gtk0 = -1;
-static int hf_wisun_lgtkhashie_gtk1 = -1;
-static int hf_wisun_lgtkhashie_gtk2 = -1;
-static int hf_wisun_lbatsie = -1;
-static int hf_wisun_lbatsie_additional_tx = -1;
-static int hf_wisun_lbatsie_next_tx_delay = -1;
-static int hf_wisun_jmie = -1;
-static int hf_wisun_jmie_version = -1;
-static int hf_wisun_jmie_metric_hdr = -1;
-static int hf_wisun_jmie_metric_id = -1;
-static int hf_wisun_jmie_metric_len = -1;
-static int hf_wisun_jmie_metric_plf = -1;
-static int hf_wisun_jmie_metric_plf_data = -1;
-static int hf_wisun_jmie_metric_unknown = -1;
-
-static int proto_wisun_sec = -1;
-static int hf_wisun_sec_function = -1;
-static int hf_wisun_sec_error_type = -1;
-static int hf_wisun_sec_error_nonce = -1;
+static int hf_wisun_luttie;
+static int hf_wisun_luttie_usn;
+static int hf_wisun_luttie_uio;
+static int hf_wisun_lbtie;
+static int hf_wisun_lbtie_slot;
+static int hf_wisun_lbtie_bio;
+static int hf_wisun_nrie;
+static int hf_wisun_nrie_nr_id;
+static int hf_wisun_nrie_timing_accuracy;
+static int hf_wisun_nrie_listening_interval_min;
+static int hf_wisun_nrie_listening_interval_max;
+static int hf_wisun_lusie;
+static int hf_wisun_lusie_listen_interval;
+static int hf_wisun_lusie_channel_plan_tag;
+static int hf_wisun_flusie;
+static int hf_wisun_flusie_dwell_interval;
+static int hf_wisun_flusie_channel_plan_tag;
+static int hf_wisun_lbsie;
+static int hf_wisun_lbsie_broadcast_interval;
+static int hf_wisun_lbsie_broadcast_id;
+static int hf_wisun_lbsie_channel_plan_tag;
+static int hf_wisun_lbsie_broadcast_sync_period;
+static int hf_wisun_lndie;
+static int hf_wisun_lndie_response_threshold;
+static int hf_wisun_lndie_response_delay;
+static int hf_wisun_lndie_discovery_slot_time;
+static int hf_wisun_lndie_discovery_slots;
+static int hf_wisun_lndie_discovery_first_slot;
+static int hf_wisun_ltoie;
+static int hf_wisun_ltoie_offset;
+static int hf_wisun_ltoie_listening_interval;
+static int hf_wisun_panidie;
+static int hf_wisun_panidie_panid;
+static int hf_wisun_rtie;
+static int hf_wisun_rtie_rendezvous_time;
+static int hf_wisun_rtie_wakeup_interval;
+static int hf_wisun_lbcie;
+static int hf_wisun_lbcie_broadcast_interval;
+static int hf_wisun_lbcie_broadcast_sync_period;
+
+static int hf_wisun_pie;
+static int hf_wisun_wsie;
+static int hf_wisun_wsie_type;
+static int hf_wisun_wsie_id;
+static int hf_wisun_wsie_length;
+static int hf_wisun_wsie_id_short;
+static int hf_wisun_wsie_length_short;
+static int hf_wisun_usie;
+static int hf_wisun_usie_dwell_interval;
+static int hf_wisun_usie_clock_drift;
+static int hf_wisun_usie_timing_accuracy;
+static int hf_wisun_usie_channel_control;
+static int hf_wisun_usie_channel_plan;
+static int hf_wisun_usie_channel_function;
+static int hf_wisun_usie_channel_exclude;
+static int hf_wisun_usie_regulatory_domain;
+static int hf_wisun_usie_operating_class;
+static int hf_wisun_usie_channel_plan_id;
+static int hf_wisun_usie_explicit;
+static int hf_wisun_usie_explicit_frequency;
+static int hf_wisun_usie_explicit_reserved;
+static int hf_wisun_usie_explicit_spacing;
+static int hf_wisun_usie_number_channels;
+static int hf_wisun_usie_fixed_channel;
+static int hf_wisun_usie_hop_count;
+static int hf_wisun_usie_hop_list;
+static int hf_wisun_usie_number_ranges;
+static int hf_wisun_usie_exclude_range_start;
+static int hf_wisun_usie_exclude_range_end;
+static int hf_wisun_usie_exclude_mask;
+static int hf_wisun_bsie;
+static int hf_wisun_bsie_bcast_interval;
+static int hf_wisun_bsie_bcast_schedule_id;
+static int hf_wisun_vpie;
+static int hf_wisun_vpie_vid;
+static int hf_wisun_lcpie;
+static int hf_wisun_panie;
+static int hf_wisun_panie_size;
+static int hf_wisun_panie_cost;
+static int hf_wisun_panie_flags;
+static int hf_wisun_panie_flag_parent_bsie;
+static int hf_wisun_panie_flag_routing_method;
+static int hf_wisun_panie_flag_lfn_window_style;
+static int hf_wisun_panie_flag_version;
+static int hf_wisun_netnameie;
+static int hf_wisun_netnameie_name;
+static int hf_wisun_panverie;
+static int hf_wisun_panverie_version;
+static int hf_wisun_gtkhashie;
+static int hf_wisun_gtkhashie_gtk0;
+static int hf_wisun_gtkhashie_gtk1;
+static int hf_wisun_gtkhashie_gtk2;
+static int hf_wisun_gtkhashie_gtk3;
+static int hf_wisun_pomie;
+static int hf_wisun_pomie_hdr;
+static int hf_wisun_pomie_number_operating_modes;
+static int hf_wisun_pomie_mdr_command_capable_flag;
+static int hf_wisun_pomie_reserved;
+static int hf_wisun_pomie_phy_mode_id;
+static int hf_wisun_pomie_phy_type;
+static int hf_wisun_pomie_phy_mode_fsk;
+static int hf_wisun_pomie_phy_mode_ofdm;
+static int hf_wisun_lfnverie;
+static int hf_wisun_lfnverie_version;
+static int hf_wisun_lgtkhashie;
+static int hf_wisun_lgtkhashie_flags;
+static int hf_wisun_lgtkhashie_flag_includes_lgtk0;
+static int hf_wisun_lgtkhashie_flag_includes_lgtk1;
+static int hf_wisun_lgtkhashie_flag_includes_lgtk2;
+static int hf_wisun_lgtkhashie_flag_active_lgtk_index;
+static int hf_wisun_lgtkhashie_gtk0;
+static int hf_wisun_lgtkhashie_gtk1;
+static int hf_wisun_lgtkhashie_gtk2;
+static int hf_wisun_lbatsie;
+static int hf_wisun_lbatsie_additional_tx;
+static int hf_wisun_lbatsie_next_tx_delay;
+static int hf_wisun_jmie;
+static int hf_wisun_jmie_version;
+static int hf_wisun_jmie_metric_hdr;
+static int hf_wisun_jmie_metric_id;
+static int hf_wisun_jmie_metric_len;
+static int hf_wisun_jmie_metric_plf;
+static int hf_wisun_jmie_metric_plf_data;
+static int hf_wisun_jmie_metric_unknown;
+
+static int proto_wisun_sec;
+static int hf_wisun_sec_function;
+static int hf_wisun_sec_error_type;
+static int hf_wisun_sec_error_nonce;
 
 // EAPOL Relay
 static dissector_handle_t wisun_eapol_relay_handle;
-static int proto_wisun_eapol_relay = -1;
-static int hf_wisun_eapol_relay_sup = -1;
-static int hf_wisun_eapol_relay_kmp_id = -1;
-static int hf_wisun_eapol_relay_direction = -1;
+static int proto_wisun_eapol_relay;
+static int hf_wisun_eapol_relay_sup;
+static int hf_wisun_eapol_relay_kmp_id;
+static int hf_wisun_eapol_relay_direction;
 
-static int hf_wisun_cmd_subid = -1;
-static int hf_wisun_cmd_mdr_phy_mode_id = -1;
-static int hf_wisun_cmd_mdr_phy_type = -1;
-static int hf_wisun_cmd_mdr_phy_mode_fsk = -1;
-static int hf_wisun_cmd_mdr_phy_mode_ofdm = -1;
+static int hf_wisun_cmd_subid;
+static int hf_wisun_cmd_mdr_phy_mode_id;
+static int hf_wisun_cmd_mdr_phy_type;
+static int hf_wisun_cmd_mdr_phy_mode_fsk;
+static int hf_wisun_cmd_mdr_phy_mode_ofdm;
 
 // Netricity
 static int proto_wisun_netricity_sc;
-static int hf_wisun_netricity_nftie = -1;
-static int hf_wisun_netricity_nftie_type = -1;
-static int hf_wisun_netricity_lqiie = -1;
-static int hf_wisun_netricity_lqiie_lqi = -1;
-static int hf_wisun_netricity_sc_flags = -1;
-static int hf_wisun_netricity_sc_reserved = -1;
-static int hf_wisun_netricity_sc_tone_map_request = -1;
-static int hf_wisun_netricity_sc_contention_control = -1;
-static int hf_wisun_netricity_sc_channel_access_priority = -1;
-static int hf_wisun_netricity_sc_last_segment = -1;
-static int hf_wisun_netricity_sc_segment_count = -1;
-static int hf_wisun_netricity_sc_segment_length = -1;
+static int hf_wisun_netricity_nftie;
+static int hf_wisun_netricity_nftie_type;
+static int hf_wisun_netricity_lqiie;
+static int hf_wisun_netricity_lqiie_lqi;
+static int hf_wisun_netricity_sc_flags;
+static int hf_wisun_netricity_sc_reserved;
+static int hf_wisun_netricity_sc_tone_map_request;
+static int hf_wisun_netricity_sc_contention_control;
+static int hf_wisun_netricity_sc_channel_access_priority;
+static int hf_wisun_netricity_sc_last_segment;
+static int hf_wisun_netricity_sc_segment_count;
+static int hf_wisun_netricity_sc_segment_length;
 // Reassembly
-static int hf_wisun_netricity_scr_segments = -1;
-static int hf_wisun_netricity_scr_segment = -1;
-static int hf_wisun_netricity_scr_segment_overlap = -1;
-static int hf_wisun_netricity_scr_segment_overlap_conflicts = -1;
-static int hf_wisun_netricity_scr_segment_multiple_tails = -1;
-static int hf_wisun_netricity_scr_segment_too_long_segment = -1;
-static int hf_wisun_netricity_scr_segment_error = -1;
-static int hf_wisun_netricity_scr_segment_count = -1;
-static int hf_wisun_netricity_scr_reassembled_in = -1;
-static int hf_wisun_netricity_scr_reassembled_length = -1;
-
-static gint ett_wisun_phy_mode_id = -1;
-static gint ett_wisun_unknown_ie = -1;
-static gint ett_wisun_uttie = -1;
-static gint ett_wisun_btie = -1;
-static gint ett_wisun_fcie = -1;
-static gint ett_wisun_rslie = -1;
-static gint ett_wisun_vhie = -1;
-static gint ett_wisun_eaie = -1;
-static gint ett_wisun_pie = -1;
-static gint ett_wisun_wsie_bitmap = -1;
-static gint ett_wisun_usie = -1;
-static gint ett_wisun_bsie = -1;
-static gint ett_wisun_vpie = -1;
-static gint ett_wisun_lcpie = -1;
+static int hf_wisun_netricity_scr_segments;
+static int hf_wisun_netricity_scr_segment;
+static int hf_wisun_netricity_scr_segment_overlap;
+static int hf_wisun_netricity_scr_segment_overlap_conflicts;
+static int hf_wisun_netricity_scr_segment_multiple_tails;
+static int hf_wisun_netricity_scr_segment_too_long_segment;
+static int hf_wisun_netricity_scr_segment_error;
+static int hf_wisun_netricity_scr_segment_count;
+static int hf_wisun_netricity_scr_reassembled_in;
+static int hf_wisun_netricity_scr_reassembled_length;
+
+static gint ett_wisun_phy_mode_id;
+static gint ett_wisun_unknown_ie;
+static gint ett_wisun_uttie;
+static gint ett_wisun_btie;
+static gint ett_wisun_fcie;
+static gint ett_wisun_rslie;
+static gint ett_wisun_vhie;
+static gint ett_wisun_eaie;
+static gint ett_wisun_pie;
+static gint ett_wisun_wsie_bitmap;
+static gint ett_wisun_usie;
+static gint ett_wisun_bsie;
+static gint ett_wisun_vpie;
+static gint ett_wisun_lcpie;
 static gint ett_wisun_usie_channel_control;
 static gint ett_wisun_usie_explicit;
-static gint ett_wisun_luttie = -1;
-static gint ett_wisun_nrie = -1;
-static gint ett_wisun_lusie = -1;
-static gint ett_wisun_flusie = -1;
-static gint ett_wisun_lbsie = -1;
-static gint ett_wisun_lndie = -1;
-static gint ett_wisun_ltoie = -1;
-static gint ett_wisun_panidie = -1;
-static gint ett_wisun_rtie = -1;
-static gint ett_wisun_lbcie = -1;
-static gint ett_wisun_panie = -1;
-static gint ett_wisun_panie_flags = -1;
-static gint ett_wisun_netnameie = -1;
-static gint ett_wisun_panverie = -1;
-static gint ett_wisun_gtkhashie = -1;
-static gint ett_wisun_pomie = -1;
-static gint ett_wisun_pomie_hdr = -1;
-static gint ett_wisun_lfnverie = -1;
-static gint ett_wisun_lgtkhashie = -1;
-static gint ett_wisun_lgtkhashie_flags = -1;
-static gint ett_wisun_lbatsie = -1;
-static gint ett_wisun_jmie = -1;
-static gint ett_wisun_jmie_metric_hdr = -1;
-static gint ett_wisun_jmie_metric_plf = -1;
-static gint ett_wisun_jmie_metric_unknown = -1;
-static gint ett_wisun_sec = -1;
-static gint ett_wisun_eapol_relay = -1;
+static gint ett_wisun_luttie;
+static gint ett_wisun_nrie;
+static gint ett_wisun_lusie;
+static gint ett_wisun_flusie;
+static gint ett_wisun_lbsie;
+static gint ett_wisun_lndie;
+static gint ett_wisun_ltoie;
+static gint ett_wisun_panidie;
+static gint ett_wisun_rtie;
+static gint ett_wisun_lbcie;
+static gint ett_wisun_panie;
+static gint ett_wisun_panie_flags;
+static gint ett_wisun_netnameie;
+static gint ett_wisun_panverie;
+static gint ett_wisun_gtkhashie;
+static gint ett_wisun_pomie;
+static gint ett_wisun_pomie_hdr;
+static gint ett_wisun_lfnverie;
+static gint ett_wisun_lgtkhashie;
+static gint ett_wisun_lgtkhashie_flags;
+static gint ett_wisun_lbatsie;
+static gint ett_wisun_jmie;
+static gint ett_wisun_jmie_metric_hdr;
+static gint ett_wisun_jmie_metric_plf;
+static gint ett_wisun_jmie_metric_unknown;
+static gint ett_wisun_sec;
+static gint ett_wisun_eapol_relay;
 // Netricity
-static gint ett_wisun_netricity_nftie = -1;
-static gint ett_wisun_netricity_lqiie = -1;
-static gint ett_wisun_netricity_sc = -1;
-static gint ett_wisun_netricity_sc_bitmask = -1;
-static gint ett_wisun_netricity_scr_segment = -1;
-static gint ett_wisun_netricity_scr_segments = -1;
+static gint ett_wisun_netricity_nftie;
+static gint ett_wisun_netricity_lqiie;
+static gint ett_wisun_netricity_sc;
+static gint ett_wisun_netricity_sc_bitmask;
+static gint ett_wisun_netricity_scr_segment;
+static gint ett_wisun_netricity_scr_segments;
 
 static const fragment_items netricity_scr_frag_items = {
         /* Fragment subtrees */
@@ -654,12 +654,12 @@ static int * const wisun_format_nested_ie_short[] = {
     NULL
 };
 
-static expert_field ei_wisun_subid_unsupported = EI_INIT;
-static expert_field ei_wisun_wsie_unsupported = EI_INIT;
-static expert_field ei_wisun_usie_channel_plan_invalid = EI_INIT;
-static expert_field ei_wisun_edfe_start_not_found = EI_INIT;
-static expert_field ei_wisun_usie_explicit_reserved_bits_not_zero = EI_INIT;
-static expert_field ei_wisun_jmie_metric_unsupported = EI_INIT;
+static expert_field ei_wisun_subid_unsupported;
+static expert_field ei_wisun_wsie_unsupported;
+static expert_field ei_wisun_usie_channel_plan_invalid;
+static expert_field ei_wisun_edfe_start_not_found;
+static expert_field ei_wisun_usie_explicit_reserved_bits_not_zero;
+static expert_field ei_wisun_jmie_metric_unsupported;
 
 static guint
 wisun_add_wbxml_uint(tvbuff_t *tvb, proto_tree *tree, int hf, guint offset)
diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c
index 9fe1a94658..a7383715b3 100644
--- a/epan/dissectors/packet-wlccp.c
+++ b/epan/dissectors/packet-wlccp.c
@@ -430,250 +430,250 @@ static gboolean get_mic_flag(void);
 static gboolean mic_flag=0, tlv_flag=0;
 
 /* Initialize the protocol and registered fields */
-static int proto_wlccp = -1;
+static int proto_wlccp;
 
-static int hf_llc_wlccp_pid = -1;
+static int hf_llc_wlccp_pid;
 
 
 
-static int hf_wlccp_dstmac = -1;
-static int hf_wlccp_srcmac = -1;
-static int hf_wlccp_hostname = -1;
+static int hf_wlccp_dstmac;
+static int hf_wlccp_srcmac;
+static int hf_wlccp_hostname;
 
 /* WLCCP Fixed header fields */
-static int hf_wlccp_version = -1;
-
-static int hf_wlccp_sap = -1; /* SAP Tree */
-static int hf_wlccp_sap_version = -1;
-static int hf_wlccp_sap_id = -1;
-
-static int hf_wlccp_destination_node_type = -1;
-static int hf_wlccp_length = -1;
-
-static int hf_wlccp_type = -1; /* Message Type Tree */
-static int hf_wlccp_subtype = -1;
-static int hf_wlccp_base_message_type_0 = -1;
-static int hf_wlccp_base_message_type_1 = -1;
-static int hf_wlccp_base_message_type_2 = -1;
-static int hf_wlccp_base_message_type_3 = -1;
-static int hf_wlccp_base_message_type_4 = -1;
-static int hf_wlccp_base_message_type_5 = -1;
-static int hf_wlccp_base_message_type_unknown = -1;
-
-static int hf_wlccp_hops = -1;
-static int hf_wlccp_nm_version = -1;
-
-static int hf_wlccp_msg_id = -1;
-
-static int hf_wlccp_flags = -1; /* Flags Tree */
-static int hf_wlccp_rm_flags = -1;
-static int hf_wlccp_retry_flag = -1;
-static int hf_wlccp_response_request_flag = -1;
-static int hf_wlccp_ack_required_flag = -1;
-static int hf_wlccp_tlv_flag = -1;
-static int hf_wlccp_inbound_flag = -1;
-static int hf_wlccp_outbound_flag = -1;
-static int hf_wlccp_hopwise_routing_flag = -1;
-static int hf_wlccp_root_cm_flag = -1;
-static int hf_wlccp_relay_flag = -1;
-static int hf_wlccp_mic_flag = -1;
-static int hf_wlccp_rm_request_reply_flag = -1;
-static int hf_wlccp_rm_mic_flag = -1;
-
-static int hf_wlccp_originator = -1; /* Originator Tree */
-static int hf_wlccp_originator_node_type = -1;
-/* static int hf_wlccp_originator_id = -1; */
-
-static int hf_wlccp_responder = -1; /* Responder Tree */
-static int hf_wlccp_responder_node_type = -1;
-/*static int hf_wlccp_responder_id = -1; */
-
-
-/* static int hf_wlccp_relay_node = -1;*/ /* Relay Node Tree */
-static int hf_wlccp_relay_node_type = -1;
-static int hf_wlccp_relay_node_id = -1;
-
-/* static int hf_wlccp_priority = -1; */
-/* static int hf_wlccp_age = -1; */
-/* static int hf_wlccp_period = -1; */
-static int hf_wlccp_ipv4_address = -1;
+static int hf_wlccp_version;
+
+static int hf_wlccp_sap; /* SAP Tree */
+static int hf_wlccp_sap_version;
+static int hf_wlccp_sap_id;
+
+static int hf_wlccp_destination_node_type;
+static int hf_wlccp_length;
+
+static int hf_wlccp_type; /* Message Type Tree */
+static int hf_wlccp_subtype;
+static int hf_wlccp_base_message_type_0;
+static int hf_wlccp_base_message_type_1;
+static int hf_wlccp_base_message_type_2;
+static int hf_wlccp_base_message_type_3;
+static int hf_wlccp_base_message_type_4;
+static int hf_wlccp_base_message_type_5;
+static int hf_wlccp_base_message_type_unknown;
+
+static int hf_wlccp_hops;
+static int hf_wlccp_nm_version;
+
+static int hf_wlccp_msg_id;
+
+static int hf_wlccp_flags; /* Flags Tree */
+static int hf_wlccp_rm_flags;
+static int hf_wlccp_retry_flag;
+static int hf_wlccp_response_request_flag;
+static int hf_wlccp_ack_required_flag;
+static int hf_wlccp_tlv_flag;
+static int hf_wlccp_inbound_flag;
+static int hf_wlccp_outbound_flag;
+static int hf_wlccp_hopwise_routing_flag;
+static int hf_wlccp_root_cm_flag;
+static int hf_wlccp_relay_flag;
+static int hf_wlccp_mic_flag;
+static int hf_wlccp_rm_request_reply_flag;
+static int hf_wlccp_rm_mic_flag;
+
+static int hf_wlccp_originator; /* Originator Tree */
+static int hf_wlccp_originator_node_type;
+/* static int hf_wlccp_originator_id; */
+
+static int hf_wlccp_responder; /* Responder Tree */
+static int hf_wlccp_responder_node_type;
+/*static int hf_wlccp_responder_id; */
+
+
+/* static int hf_wlccp_relay_node;*/ /* Relay Node Tree */
+static int hf_wlccp_relay_node_type;
+static int hf_wlccp_relay_node_id;
+
+/* static int hf_wlccp_priority; */
+/* static int hf_wlccp_age; */
+/* static int hf_wlccp_period; */
+static int hf_wlccp_ipv4_address;
 
 /* SCM Advertisement */
-static int hf_wlccp_scm_hop_address = -1;
+static int hf_wlccp_scm_hop_address;
 
-static int hf_wlccp_scm_flags = -1; /* SCM Flags Tree */
-static int hf_wlccp_scm_active_flag = -1;
-static int hf_wlccp_scm_unscheduled_flag = -1;
-static int hf_wlccp_scm_unattached_flag = -1;
-static int hf_wlccp_scm_layer2update_flag = -1;
+static int hf_wlccp_scm_flags; /* SCM Flags Tree */
+static int hf_wlccp_scm_active_flag;
+static int hf_wlccp_scm_unscheduled_flag;
+static int hf_wlccp_scm_unattached_flag;
+static int hf_wlccp_scm_layer2update_flag;
 
-static int hf_wlccp_scm_election_group = -1;
-static int hf_wlccp_scm_attach_count = -1;
+static int hf_wlccp_scm_election_group;
+static int hf_wlccp_scm_attach_count;
 
-static int hf_wlccp_scm_priority_flags = -1; /* SCM Priority Flags */
-static int hf_wlccp_scm_priority = -1;
-static int hf_wlccp_scm_preferred_flag = -1;
+static int hf_wlccp_scm_priority_flags; /* SCM Priority Flags */
+static int hf_wlccp_scm_priority;
+static int hf_wlccp_scm_preferred_flag;
 
-static int hf_wlccp_scm_bridge_priority_flags = -1; /* SCM Bridge Priority Flags */
-static int hf_wlccp_scm_bridge_priority = -1;
-static int hf_wlccp_scm_bridge_disable_flag = -1;
+static int hf_wlccp_scm_bridge_priority_flags; /* SCM Bridge Priority Flags */
+static int hf_wlccp_scm_bridge_priority;
+static int hf_wlccp_scm_bridge_disable_flag;
 
-static int hf_wlccp_scm_node_id = -1;
-static int hf_wlccp_scm_unknown_short = -1;
-static int hf_wlccp_scm_instance_age = -1;
-static int hf_wlccp_scm_path_cost = -1;
-static int hf_wlccp_scm_hop_count = -1;
-static int hf_wlccp_scm_advperiod = -1;
+static int hf_wlccp_scm_node_id;
+static int hf_wlccp_scm_unknown_short;
+static int hf_wlccp_scm_instance_age;
+static int hf_wlccp_scm_path_cost;
+static int hf_wlccp_scm_hop_count;
+static int hf_wlccp_scm_advperiod;
 
 /*kan for apRegistration messages*/
-static int hf_wlccp_timestamp = -1;
-static int hf_wlccp_apregstatus = -1;
-static int hf_wlccp_ap_node_id = -1;
-static int hf_wlccp_ap_node_type = -1;
-static int hf_wlccp_ap_node_id_address = -1;
+static int hf_wlccp_timestamp;
+static int hf_wlccp_apregstatus;
+static int hf_wlccp_ap_node_id;
+static int hf_wlccp_ap_node_type;
+static int hf_wlccp_ap_node_id_address;
 /*kan for nmPathInit messages */
-static int hf_wlccp_requ_node_type = -1;
-static int hf_wlccp_requ_node_id = -1;
-static int hf_wlccp_status = -1;
-static int hf_wlccp_path_init_rsvd = -1;
+static int hf_wlccp_requ_node_type;
+static int hf_wlccp_requ_node_id;
+static int hf_wlccp_status;
+static int hf_wlccp_path_init_rsvd;
 /*kan - for cmAAA messages */
-static int hf_wlccp_aaa_msg_type = -1;
-static int hf_wlccp_aaa_auth_type = -1;
-static int hf_wlccp_keymgmt_type = -1;
+static int hf_wlccp_aaa_msg_type;
+static int hf_wlccp_aaa_auth_type;
+static int hf_wlccp_keymgmt_type;
 /*kan - for cmAAA EAPOL messages */
-static int hf_wlccp_eapol_msg = -1;
-static int hf_wlccp_eapol_version = -1;
-static int hf_wlccp_eapol_type = -1;
-static int hf_wlccp_eap_msg_length = -1;
-static int hf_wlccp_eap_msg = -1;
+static int hf_wlccp_eapol_msg;
+static int hf_wlccp_eapol_version;
+static int hf_wlccp_eapol_type;
+static int hf_wlccp_eap_msg_length;
+static int hf_wlccp_eap_msg;
 /*kan - for cmAAA Proprietary message */
-static int hf_wlccp_cisco_acctg_msg = -1;
+static int hf_wlccp_cisco_acctg_msg;
 /*kan - for cmWIDS */
-static int hf_wlccp_wids_msg_type = -1;
+static int hf_wlccp_wids_msg_type;
 /*kan - for nmConfigRequest and nmConfigReply */
-static int hf_wlccp_nmconfig = -1;
-
-static int hf_wlccp_scmstate_change = -1;
-static int hf_wlccp_scmstate_change_reason = -1;
-
-static int hf_wlccp_scmattach_state = -1;
-static int hf_wlccp_nmcapability = -1;
-static int hf_wlccp_refresh_req_id = -1;
-
-static int hf_wlccp_tlv = -1;
-static int hf_tlv_flags = -1;
-
-static int hf_wlccp_null_tlv = -1;
-
-static int hf_wlccp_tlv_type = -1;
-static int hf_wlccp_tlv_type0 = -1;
-static int hf_wlccp_tlv_type1 = -1;
-static int hf_wlccp_tlv_type2 = -1;
-static int hf_wlccp_tlv_type3 = -1;
-static int hf_wlccp_tlv_type4 = -1;
-static int hf_wlccp_tlv_type5 = -1;
-static int hf_wlccp_tlv_group = -1;
-static int hf_wlccp_tlv_container_flag = -1;
-static int hf_wlccp_tlv_encrypted_flag = -1;
-static int hf_wlccp_tlv_request_flag = -1;
-static int hf_wlccp_tlv_reserved_bit = -1;
-static int hf_wlccp_tlv_length = -1;
-
-/* static int hf_wlccp_tlv_value = -1; */
-
-static int hf_wlccp_path_length = -1;
-static int hf_wlccp_mic_msg_seq_count = -1;
-static int hf_wlccp_mic_length = -1;
-static int hf_wlccp_mic_value = -1;
-
-static int hf_wlccp_key_seq_count = -1;
-static int hf_wlccp_dest_node_type = -1;
-static int hf_wlccp_dest_node_id = -1;
-static int hf_wlccp_supp_node_type = -1;
-static int hf_wlccp_supp_node_id = -1;
-static int hf_wlccp_key_mgmt_type = -1;
-static int hf_wlccp_nonce = -1;
-static int hf_wlccp_session_timeout = -1;
-static int hf_wlccp_src_node_type = -1;
-static int hf_wlccp_src_node_id = -1;
-static int hf_wlccp_token = -1;
-static int hf_wlccp_mode = -1;
-static int hf_wlccp_scan_mode = -1;
-static int hf_wlccp_rss = -1;
-static int hf_wlccp_srcidx = -1;
-static int hf_wlccp_parent_tsf = -1;
-static int hf_wlccp_target_tsf = -1;
-
-static int hf_wlccp_channel = -1;
-static int hf_wlccp_phy_type = -1;
-static int hf_wlccp_bssid = -1;
-static int hf_wlccp_beacon_interval = -1;
-/* static int hf_wlccp_capabilities = -1; */
-static int hf_wlccp_tlv80211 = -1;
-static int hf_wlccp_duration = -1;
-static int hf_wlccp_rpidensity = -1;
-static int hf_wlccp_ccabusy = -1;
-static int hf_wlccp_sta_type = -1;
-static int hf_wlccp_stamac = -1;
-static int hf_wlccp_token2 = -1;
-static int hf_wlccp_interval = -1;
-static int hf_wlccp_count = -1;
-static int hf_framereport_elements = -1;
-static int hf_wlccp_numframes = -1;
-static int hf_wlccp_mfpcapability = -1;
-static int hf_wlccp_mfpflags = -1;
-static int hf_wlccp_mfpconfig = -1;
-static int hf_wlccp_clientmac = -1;
-static int hf_time_elapsed = -1;
-static int hf_wlccp_parent_ap_mac = -1;
-static int hf_wlccp_auth_type =-1;
-static int hf_reg_lifetime = -1;
-static int hf_wlccp_radius_user_name = -1;
-static int hf_wds_reason = -1;
-
-
-static int hf_wlccp_80211_capabilities = -1;
-static int hf_80211_cap_ess = -1;
-static int hf_80211_cap_ibss = -1;
-static int hf_80211_cap_cf_pollable = -1;
-static int hf_80211_cap_cf_poll_req = -1;
-static int hf_80211_cap_privacy = -1;
-static int hf_80211_short_preamble = -1;
-static int hf_80211_pbcc = -1;
-static int hf_80211_chan_agility = -1;
-static int hf_80211_spectrum_mgmt = -1;
-static int hf_80211_qos = -1;
-static int hf_80211_short_time_slot = -1;
-static int hf_80211_apsd = -1;
-static int hf_80211_reserved = -1;
-static int hf_80211_dsss_ofdm = -1;
-static int hf_80211_dlyd_block_ack = -1;
-static int hf_80211_imm_block_ack = -1;
-
-
-static int hf_wlccp_tlv_unknown_value = -1;
+static int hf_wlccp_nmconfig;
+
+static int hf_wlccp_scmstate_change;
+static int hf_wlccp_scmstate_change_reason;
+
+static int hf_wlccp_scmattach_state;
+static int hf_wlccp_nmcapability;
+static int hf_wlccp_refresh_req_id;
+
+static int hf_wlccp_tlv;
+static int hf_tlv_flags;
+
+static int hf_wlccp_null_tlv;
+
+static int hf_wlccp_tlv_type;
+static int hf_wlccp_tlv_type0;
+static int hf_wlccp_tlv_type1;
+static int hf_wlccp_tlv_type2;
+static int hf_wlccp_tlv_type3;
+static int hf_wlccp_tlv_type4;
+static int hf_wlccp_tlv_type5;
+static int hf_wlccp_tlv_group;
+static int hf_wlccp_tlv_container_flag;
+static int hf_wlccp_tlv_encrypted_flag;
+static int hf_wlccp_tlv_request_flag;
+static int hf_wlccp_tlv_reserved_bit;
+static int hf_wlccp_tlv_length;
+
+/* static int hf_wlccp_tlv_value; */
+
+static int hf_wlccp_path_length;
+static int hf_wlccp_mic_msg_seq_count;
+static int hf_wlccp_mic_length;
+static int hf_wlccp_mic_value;
+
+static int hf_wlccp_key_seq_count;
+static int hf_wlccp_dest_node_type;
+static int hf_wlccp_dest_node_id;
+static int hf_wlccp_supp_node_type;
+static int hf_wlccp_supp_node_id;
+static int hf_wlccp_key_mgmt_type;
+static int hf_wlccp_nonce;
+static int hf_wlccp_session_timeout;
+static int hf_wlccp_src_node_type;
+static int hf_wlccp_src_node_id;
+static int hf_wlccp_token;
+static int hf_wlccp_mode;
+static int hf_wlccp_scan_mode;
+static int hf_wlccp_rss;
+static int hf_wlccp_srcidx;
+static int hf_wlccp_parent_tsf;
+static int hf_wlccp_target_tsf;
+
+static int hf_wlccp_channel;
+static int hf_wlccp_phy_type;
+static int hf_wlccp_bssid;
+static int hf_wlccp_beacon_interval;
+/* static int hf_wlccp_capabilities; */
+static int hf_wlccp_tlv80211;
+static int hf_wlccp_duration;
+static int hf_wlccp_rpidensity;
+static int hf_wlccp_ccabusy;
+static int hf_wlccp_sta_type;
+static int hf_wlccp_stamac;
+static int hf_wlccp_token2;
+static int hf_wlccp_interval;
+static int hf_wlccp_count;
+static int hf_framereport_elements;
+static int hf_wlccp_numframes;
+static int hf_wlccp_mfpcapability;
+static int hf_wlccp_mfpflags;
+static int hf_wlccp_mfpconfig;
+static int hf_wlccp_clientmac;
+static int hf_time_elapsed;
+static int hf_wlccp_parent_ap_mac;
+static int hf_wlccp_auth_type;
+static int hf_reg_lifetime;
+static int hf_wlccp_radius_user_name;
+static int hf_wds_reason;
+
+
+static int hf_wlccp_80211_capabilities;
+static int hf_80211_cap_ess;
+static int hf_80211_cap_ibss;
+static int hf_80211_cap_cf_pollable;
+static int hf_80211_cap_cf_poll_req;
+static int hf_80211_cap_privacy;
+static int hf_80211_short_preamble;
+static int hf_80211_pbcc;
+static int hf_80211_chan_agility;
+static int hf_80211_spectrum_mgmt;
+static int hf_80211_qos;
+static int hf_80211_short_time_slot;
+static int hf_80211_apsd;
+static int hf_80211_reserved;
+static int hf_80211_dsss_ofdm;
+static int hf_80211_dlyd_block_ack;
+static int hf_80211_imm_block_ack;
+
+
+static int hf_wlccp_tlv_unknown_value;
 
 /* Initialize the subtree pointers */
-static gint ett_wlccp = -1;
-static gint ett_wlccp_sap_tree = -1;
-static gint ett_wlccp_type = -1;
-static gint ett_wlccp_cm_flags = -1;
-static gint ett_wlccp_scm_flags = -1;
-static gint ett_wlccp_scm_priority_flags = -1;
-static gint ett_wlccp_scm_bridge_priority_flags = -1;
-static gint ett_wlccp_rm_flags = -1;
-static gint ett_wlccp_nm_flags = -1;
-
-
-static gint ett_wlccp_flags = -1;
-static gint ett_wlccp_ap_node_id = -1;
-static gint ett_wlccp_eapol_msg_tree = -1;
-static gint ett_wlccp_eap_tree = -1;
-static gint ett_wlccp_tlv_tree = -1;
-static gint ett_tlv_flags_tree = -1;
-static gint ett_tlv_sub_tree = -1;
-static gint ett_80211_capability_flags_tree = -1;
-static gint ett_framereport_elements_tree = -1;
+static gint ett_wlccp;
+static gint ett_wlccp_sap_tree;
+static gint ett_wlccp_type;
+static gint ett_wlccp_cm_flags;
+static gint ett_wlccp_scm_flags;
+static gint ett_wlccp_scm_priority_flags;
+static gint ett_wlccp_scm_bridge_priority_flags;
+static gint ett_wlccp_rm_flags;
+static gint ett_wlccp_nm_flags;
+
+
+static gint ett_wlccp_flags;
+static gint ett_wlccp_ap_node_id;
+static gint ett_wlccp_eapol_msg_tree;
+static gint ett_wlccp_eap_tree;
+static gint ett_wlccp_tlv_tree;
+static gint ett_tlv_flags_tree;
+static gint ett_tlv_sub_tree;
+static gint ett_80211_capability_flags_tree;
+static gint ett_framereport_elements_tree;
 
 
 
diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c
index aea56310a0..dc3b0774b5 100644
--- a/epan/dissectors/packet-wol.c
+++ b/epan/dissectors/packet-wol.c
@@ -52,14 +52,14 @@ void proto_reg_handoff_wol(void);
 static dissector_handle_t wol_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_wol = -1;
-static int hf_wol_sync = -1;
-static int hf_wol_mac = -1;
-static int hf_wol_passwd = -1;
+static int proto_wol;
+static int hf_wol_sync;
+static int hf_wol_mac;
+static int hf_wol_passwd;
 
 /* Initialize the subtree pointers */
-static gint ett_wol = -1;
-static gint ett_wol_macblock = -1;
+static gint ett_wol;
+static gint ett_wol_macblock;
 
 /* Code to actually dissect the packets */
 static int
diff --git a/epan/dissectors/packet-wow.c b/epan/dissectors/packet-wow.c
index c672534166..7ae29243c3 100644
--- a/epan/dissectors/packet-wow.c
+++ b/epan/dissectors/packet-wow.c
@@ -131,77 +131,77 @@ static const value_string realm_type_vs[] = {
 #define WOW_SERVER_TO_CLIENT pinfo->srcport  == WOW_PORT
 
 /* Initialize the protocol and registered fields */
-static int proto_wow = -1;
+static int proto_wow;
 
 /* More than 1 packet */
-static int hf_wow_command = -1;
-static int hf_wow_error = -1;
-static int hf_wow_protocol_version = -1;
-static int hf_wow_pkt_size = -1;
-static int hf_wow_two_factor_pin_salt = -1;
-static int hf_wow_num_keys = -1;
-static int hf_wow_two_factor_enabled = -1;
-static int hf_wow_challenge_data = -1;
+static int hf_wow_command;
+static int hf_wow_error;
+static int hf_wow_protocol_version;
+static int hf_wow_pkt_size;
+static int hf_wow_two_factor_pin_salt;
+static int hf_wow_num_keys;
+static int hf_wow_two_factor_enabled;
+static int hf_wow_challenge_data;
 
 /* Logon Challenge Client to Server */
-static int hf_wow_gamename = -1;
-static int hf_wow_version1 = -1;
-static int hf_wow_version2 = -1;
-static int hf_wow_version3 = -1;
-static int hf_wow_build = -1;
-static int hf_wow_platform = -1;
-static int hf_wow_os = -1;
-static int hf_wow_country = -1;
-static int hf_wow_timezone_bias = -1;
-static int hf_wow_ip = -1;
-static int hf_wow_srp_i_len = -1;
-static int hf_wow_srp_i = -1;
+static int hf_wow_gamename;
+static int hf_wow_version1;
+static int hf_wow_version2;
+static int hf_wow_version3;
+static int hf_wow_build;
+static int hf_wow_platform;
+static int hf_wow_os;
+static int hf_wow_country;
+static int hf_wow_timezone_bias;
+static int hf_wow_ip;
+static int hf_wow_srp_i_len;
+static int hf_wow_srp_i;
 
 /* Logon Challenge Server to Client */
-static int hf_wow_srp_b = -1;
-static int hf_wow_srp_g_len = -1;
-static int hf_wow_srp_g = -1;
-static int hf_wow_srp_n_len = -1;
-static int hf_wow_srp_n = -1;
-static int hf_wow_srp_s = -1;
-static int hf_wow_crc_salt = -1;
-static int hf_wow_two_factor_pin_grid_seed = -1;
+static int hf_wow_srp_b;
+static int hf_wow_srp_g_len;
+static int hf_wow_srp_g;
+static int hf_wow_srp_n_len;
+static int hf_wow_srp_n;
+static int hf_wow_srp_s;
+static int hf_wow_crc_salt;
+static int hf_wow_two_factor_pin_grid_seed;
 
 /* Logon Proof Client to Server */
-static int hf_wow_srp_a = -1;
-static int hf_wow_srp_m1 = -1;
-static int hf_wow_crc_hash = -1;
-static int hf_wow_two_factor_pin_hash = -1;
+static int hf_wow_srp_a;
+static int hf_wow_srp_m1;
+static int hf_wow_crc_hash;
+static int hf_wow_two_factor_pin_hash;
 
 /* Logon Proof Server to Client */
-static int hf_wow_srp_m2 = -1;
-static int hf_wow_hardware_survey_id = -1;
-static int hf_wow_account_flags = -1;
-static int hf_wow_unknown_flags = -1;
+static int hf_wow_srp_m2;
+static int hf_wow_hardware_survey_id;
+static int hf_wow_account_flags;
+static int hf_wow_unknown_flags;
 
 /* Reconnect Challenge Server to Client */
-static int hf_wow_checksum_salt = -1;
+static int hf_wow_checksum_salt;
 
 /* Reconnect Proof Client to Server */
-static int hf_wow_client_proof = -1;
-static int hf_wow_client_checksum = -1;
+static int hf_wow_client_proof;
+static int hf_wow_client_checksum;
 
 /* Realm List Server to Client */
-static int hf_wow_num_realms = -1;
-static int hf_wow_realm_type = -1;
-static int hf_wow_realm_locked = -1;
-static int hf_wow_realm_flags = -1;
-static int hf_wow_realm_category = -1;
-static int hf_wow_realm_name = -1;
-static int hf_wow_realm_socket = -1;
-static int hf_wow_realm_population_level = -1;
-static int hf_wow_realm_num_characters = -1;
-static int hf_wow_realm_id = -1;
+static int hf_wow_num_realms;
+static int hf_wow_realm_type;
+static int hf_wow_realm_locked;
+static int hf_wow_realm_flags;
+static int hf_wow_realm_category;
+static int hf_wow_realm_name;
+static int hf_wow_realm_socket;
+static int hf_wow_realm_population_level;
+static int hf_wow_realm_num_characters;
+static int hf_wow_realm_id;
 
 static gboolean wow_preference_desegment = TRUE;
 
-static gint ett_wow = -1;
-static gint ett_wow_realms = -1;
+static gint ett_wow;
+static gint ett_wow_realms;
 
 struct game_version {
 	gint8 major_version;
diff --git a/epan/dissectors/packet-woww.c b/epan/dissectors/packet-woww.c
index be6eab4401..ebb7c5b7e2 100644
--- a/epan/dissectors/packet-woww.c
+++ b/epan/dissectors/packet-woww.c
@@ -65,820 +65,820 @@ void proto_reg_handoff_woww(void);
 void proto_register_woww(void);
 static dissector_handle_t woww_handle;
 
-static int proto_woww = -1;
+static int proto_woww;
 
 /* Fields that all packets have */
-static int hf_woww_size = -1;
-static int hf_woww_opcode = -1;
+static int hf_woww_size;
+static int hf_woww_opcode;
 
-static int hf_woww_string_length = -1;
+static int hf_woww_string_length;
 
-static int hf_woww_aura_mask = -1;
-static int hf_woww_aura = -1;
-static int hf_woww_amount_of_masks = -1;
-static int hf_woww_update_mask = -1;
-static int hf_woww_update_mask_index = -1;
-static int hf_woww_update_mask_value = -1;
-static int hf_woww_amount_of_splines = -1;
-static int hf_woww_packed_spline = -1;
+static int hf_woww_aura_mask;
+static int hf_woww_aura;
+static int hf_woww_amount_of_masks;
+static int hf_woww_update_mask;
+static int hf_woww_update_mask_index;
+static int hf_woww_update_mask_value;
+static int hf_woww_amount_of_splines;
+static int hf_woww_packed_spline;
 
 /* AUTOGENERATED_START_HF */
-static int hf_woww_absorb = -1;
-static int hf_woww_absorbed = -1;
-static int hf_woww_absorbed_damage = -1;
-static int hf_woww_account_data_type = -1;
-static int hf_woww_action = -1;
-static int hf_woww_action_bar = -1;
-static int hf_woww_action_bars = -1;
-static int hf_woww_action_type = -1;
-static int hf_woww_activate_taxi_reply = -1;
-static int hf_woww_actual_roll = -1;
-static int hf_woww_addon_crc = -1;
-static int hf_woww_addon_extra_crc = -1;
-static int hf_woww_addon_has_signature = -1;
-static int hf_woww_addon_name = -1;
-static int hf_woww_addon_type = -1;
-static int hf_woww_agility = -1;
-static int hf_woww_ai_reaction = -1;
-static int hf_woww_allow_movement = -1;
-static int hf_woww_allowed_class = -1;
-static int hf_woww_allowed_genders = -1;
-static int hf_woww_allowed_guild_id = -1;
-static int hf_woww_allowed_maximum_level = -1;
-static int hf_woww_allowed_minimum_level = -1;
-static int hf_woww_allowed_race = -1;
-static int hf_woww_ammo_display_id = -1;
-static int hf_woww_ammo_inventory_type = -1;
-static int hf_woww_ammo_type = -1;
-static int hf_woww_amount = -1;
-static int hf_woww_amount_bought = -1;
-static int hf_woww_amount_for_sale = -1;
-static int hf_woww_amount_of_accounts_in_guild = -1;
-static int hf_woww_amount_of_auras = -1;
-static int hf_woww_amount_of_carriers = -1;
-static int hf_woww_amount_of_characters = -1;
-static int hf_woww_amount_of_characters_in_guild = -1;
-static int hf_woww_amount_of_choice_item_rewards = -1;
-static int hf_woww_amount_of_cooldowns = -1;
-static int hf_woww_amount_of_damages = -1;
-static int hf_woww_amount_of_effects = -1;
-static int hf_woww_amount_of_emotes = -1;
-static int hf_woww_amount_of_entries = -1;
-static int hf_woww_amount_of_events = -1;
-static int hf_woww_amount_of_extra_fields = -1;
-static int hf_woww_amount_of_faction_standings = -1;
-static int hf_woww_amount_of_factions = -1;
-static int hf_woww_amount_of_friends = -1;
-static int hf_woww_amount_of_gossip_items = -1;
-static int hf_woww_amount_of_hits = -1;
-static int hf_woww_amount_of_ignored = -1;
-static int hf_woww_amount_of_item_rewards = -1;
-static int hf_woww_amount_of_items = -1;
-static int hf_woww_amount_of_logs = -1;
-static int hf_woww_amount_of_mails = -1;
-static int hf_woww_amount_of_members = -1;
-static int hf_woww_amount_of_misses = -1;
-static int hf_woww_amount_of_nodes = -1;
-static int hf_woww_amount_of_objects = -1;
-static int hf_woww_amount_of_outbid_items = -1;
-static int hf_woww_amount_of_petitions = -1;
-static int hf_woww_amount_of_pets = -1;
-static int hf_woww_amount_of_players = -1;
-static int hf_woww_amount_of_quests = -1;
-static int hf_woww_amount_of_raid_infos = -1;
-static int hf_woww_amount_of_reactions = -1;
-static int hf_woww_amount_of_records = -1;
-static int hf_woww_amount_of_required_items = -1;
-static int hf_woww_amount_of_rights = -1;
-static int hf_woww_amount_of_signatures = -1;
-static int hf_woww_amount_of_spells = -1;
-static int hf_woww_amount_of_states = -1;
-static int hf_woww_amount_of_strings = -1;
-static int hf_woww_amount_of_targets = -1;
-static int hf_woww_amount_of_teammates = -1;
-static int hf_woww_amount_of_zones = -1;
-static int hf_woww_angle = -1;
-static int hf_woww_animation_id = -1;
-static int hf_woww_answer = -1;
-static int hf_woww_answer_comment = -1;
-static int hf_woww_apply = -1;
-static int hf_woww_arcane_resistance = -1;
-static int hf_woww_area = -1;
-static int hf_woww_argument = -1;
-static int hf_woww_armor = -1;
-static int hf_woww_attacker = -1;
-static int hf_woww_auction_command_action = -1;
-static int hf_woww_auction_command_result = -1;
-static int hf_woww_auction_command_result_two = -1;
-static int hf_woww_auction_duration_in_minutes = -1;
-static int hf_woww_auction_house = -1;
-static int hf_woww_auction_id = -1;
-static int hf_woww_auction_main_category = -1;
-static int hf_woww_auction_out_bid = -1;
-static int hf_woww_auction_outbid = -1;
-static int hf_woww_auction_slot_id = -1;
-static int hf_woww_auction_sub_category = -1;
-static int hf_woww_auctioneer = -1;
-static int hf_woww_aura_duration = -1;
-static int hf_woww_aura_slot = -1;
-static int hf_woww_aura_type = -1;
-static int hf_woww_auto_decline_time = -1;
-static int hf_woww_auto_finish = -1;
-static int hf_woww_autocast_enabled = -1;
-static int hf_woww_average_wait_time_in_ms = -1;
-static int hf_woww_background_color = -1;
-static int hf_woww_backwards_running_speed = -1;
-static int hf_woww_backwards_swimming_speed = -1;
-static int hf_woww_bag = -1;
-static int hf_woww_bag_family = -1;
-static int hf_woww_bag_index = -1;
-static int hf_woww_bag_slot = -1;
-static int hf_woww_bag_type_subclass = -1;
-static int hf_woww_battlefield_port_action = -1;
-static int hf_woww_battleground_bracket = -1;
-static int hf_woww_battleground_end_status = -1;
-static int hf_woww_battleground_winner = -1;
-static int hf_woww_battlegrounds = -1;
-static int hf_woww_battlemaster = -1;
-static int hf_woww_bg_type_id = -1;
-static int hf_woww_bid = -1;
-static int hf_woww_bidder = -1;
-static int hf_woww_billing_flags = -1;
-static int hf_woww_billing_rested = -1;
-static int hf_woww_billing_time = -1;
-static int hf_woww_block = -1;
-static int hf_woww_blocked = -1;
-static int hf_woww_blocked_amount = -1;
-static int hf_woww_body = -1;
-static int hf_woww_body_text = -1;
-static int hf_woww_bonding = -1;
-static int hf_woww_bonus_honor = -1;
-static int hf_woww_border_color = -1;
-static int hf_woww_border_style = -1;
-static int hf_woww_bug_type = -1;
-static int hf_woww_build = -1;
-static int hf_woww_button = -1;
-static int hf_woww_buy_bank_slot_result = -1;
-static int hf_woww_buy_price = -1;
-static int hf_woww_buy_result = -1;
-static int hf_woww_buyback_slot = -1;
-static int hf_woww_buyout = -1;
-static int hf_woww_buyout_amount = -1;
-static int hf_woww_cash_on_delivery_amount = -1;
-static int hf_woww_cast_failure_reason = -1;
-static int hf_woww_cast_flags = -1;
-static int hf_woww_cast_item = -1;
-static int hf_woww_caster = -1;
-static int hf_woww_category_cooldown = -1;
-static int hf_woww_channel = -1;
-static int hf_woww_channel_flags = -1;
-static int hf_woww_channel_member_flags = -1;
-static int hf_woww_channel_name = -1;
-static int hf_woww_channel_password = -1;
-static int hf_woww_character_flags = -1;
-static int hf_woww_character_guid = -1;
-static int hf_woww_character_name = -1;
-static int hf_woww_charter_display_id = -1;
-static int hf_woww_charter_entry = -1;
-static int hf_woww_charter_owner = -1;
-static int hf_woww_chat_credit = -1;
-static int hf_woww_chat_data_line_count = -1;
-static int hf_woww_chat_data_size_uncompressed = -1;
-static int hf_woww_chat_notify = -1;
-static int hf_woww_chat_type = -1;
-static int hf_woww_checked_timestamp = -1;
-static int hf_woww_cinematic_sequence_id = -1;
-static int hf_woww_civilian = -1;
-static int hf_woww_class = -1;
-static int hf_woww_class_mask = -1;
-static int hf_woww_client_instance_id = -1;
-static int hf_woww_client_proof = -1;
-static int hf_woww_client_seed = -1;
-static int hf_woww_code = -1;
-static int hf_woww_coded = -1;
-static int hf_woww_comment = -1;
-static int hf_woww_compressed_chat_data = -1;
-static int hf_woww_compressed_data = -1;
-static int hf_woww_compressed_move_opcode = -1;
-static int hf_woww_container_slots = -1;
-static int hf_woww_content = -1;
-static int hf_woww_cooldown = -1;
-static int hf_woww_cooldown_count = -1;
-static int hf_woww_cooldown_time = -1;
-static int hf_woww_corpse = -1;
-static int hf_woww_corpse_query_result = -1;
-static int hf_woww_cos_angle = -1;
-static int hf_woww_cost_in_copper = -1;
-static int hf_woww_count = -1;
-static int hf_woww_countdown_time = -1;
-static int hf_woww_counter = -1;
-static int hf_woww_created_day = -1;
-static int hf_woww_created_month = -1;
-static int hf_woww_created_year = -1;
-static int hf_woww_creature = -1;
-static int hf_woww_creature_entry = -1;
-static int hf_woww_creature_family = -1;
-static int hf_woww_creature_id = -1;
-static int hf_woww_creature_rank = -1;
-static int hf_woww_creature_type = -1;
-static int hf_woww_critical = -1;
-static int hf_woww_current_health = -1;
-static int hf_woww_current_power = -1;
-static int hf_woww_damage = -1;
-static int hf_woww_damage_float = -1;
-static int hf_woww_damage_maximum = -1;
-static int hf_woww_damage_minimum = -1;
-static int hf_woww_damage_state = -1;
-static int hf_woww_damage_uint = -1;
-static int hf_woww_data = -1;
-static int hf_woww_data_type = -1;
-static int hf_woww_datetime = -1;
-static int hf_woww_days_since_last_updated = -1;
-static int hf_woww_days_since_oldest_ticket_creation = -1;
-static int hf_woww_days_since_ticket_creation = -1;
-static int hf_woww_deadline = -1;
-static int hf_woww_deaths = -1;
-static int hf_woww_debug_log_format = -1;
-static int hf_woww_decompressed_addon_info_size = -1;
-static int hf_woww_decompressed_size = -1;
-static int hf_woww_delay = -1;
-static int hf_woww_delay_time = -1;
-static int hf_woww_description = -1;
-static int hf_woww_destination_bag = -1;
-static int hf_woww_destination_node = -1;
-static int hf_woww_destination_slot = -1;
-static int hf_woww_destionation_slot = -1;
-static int hf_woww_details = -1;
-static int hf_woww_dismount_result = -1;
-static int hf_woww_display_id = -1;
-static int hf_woww_duel_winner_reason = -1;
-static int hf_woww_durability = -1;
-static int hf_woww_duration = -1;
-static int hf_woww_eff = -1;
-static int hf_woww_emblem_color = -1;
-static int hf_woww_emblem_style = -1;
-static int hf_woww_emote_delay = -1;
-static int hf_woww_emote_enum = -1;
-static int hf_woww_emote_int = -1;
-static int hf_woww_enable_pvp = -1;
-static int hf_woww_enchantment = -1;
-static int hf_woww_encrypted_data = -1;
-static int hf_woww_end_text = -1;
-static int hf_woww_ended_without_interruption = -1;
-static int hf_woww_enemy = -1;
-static int hf_woww_energize_amount = -1;
-static int hf_woww_energize_power = -1;
-static int hf_woww_energy = -1;
-static int hf_woww_entry = -1;
-static int hf_woww_entry_id = -1;
-static int hf_woww_environmental_damage_type = -1;
-static int hf_woww_equip_error = -1;
-static int hf_woww_equipment_display_id = -1;
-static int hf_woww_equipped_item_class = -1;
-static int hf_woww_equipped_item_inventory_type_mask = -1;
-static int hf_woww_equipped_item_subclass_mask = -1;
-static int hf_woww_event_descriptions = -1;
-static int hf_woww_exp_group_bonus = -1;
-static int hf_woww_experience = -1;
-static int hf_woww_experience_award_type = -1;
-static int hf_woww_experience_reward = -1;
-static int hf_woww_experience_without_rested = -1;
-static int hf_woww_expiration_time = -1;
-static int hf_woww_extend_flag = -1;
-static int hf_woww_extra_attacks = -1;
-static int hf_woww_face = -1;
-static int hf_woww_facial_hair = -1;
-static int hf_woww_faction = -1;
-static int hf_woww_faction_flag = -1;
-static int hf_woww_fall_time = -1;
-static int hf_woww_far_sight_operation = -1;
-static int hf_woww_feed_pet_item = -1;
-static int hf_woww_fields = -1;
-static int hf_woww_fire_resistance = -1;
-static int hf_woww_first_bag_display_id = -1;
-static int hf_woww_first_bag_inventory_id = -1;
-static int hf_woww_first_login = -1;
-static int hf_woww_first_rank = -1;
-static int hf_woww_flags = -1;
-static int hf_woww_focus = -1;
-static int hf_woww_friend_result = -1;
-static int hf_woww_friend_status = -1;
-static int hf_woww_frost_resistance = -1;
-static int hf_woww_gain_multiplier = -1;
-static int hf_woww_gameobject = -1;
-static int hf_woww_gender = -1;
-static int hf_woww_gift_bag_index = -1;
-static int hf_woww_gift_slot = -1;
-static int hf_woww_gift_wrapper = -1;
-static int hf_woww_gm_ticket_escalation_status = -1;
-static int hf_woww_gm_ticket_queue_status = -1;
-static int hf_woww_gm_ticket_response = -1;
-static int hf_woww_gm_ticket_status = -1;
-static int hf_woww_gm_ticket_status_response = -1;
-static int hf_woww_gm_ticket_type = -1;
-static int hf_woww_gold = -1;
-static int hf_woww_gossip_list_id = -1;
-static int hf_woww_grade = -1;
-static int hf_woww_greeting = -1;
-static int hf_woww_group_loot_setting = -1;
-static int hf_woww_group_member_online_status = -1;
-static int hf_woww_group_number = -1;
-static int hf_woww_group_type = -1;
-static int hf_woww_group_update_flags = -1;
-static int hf_woww_guid = -1;
-static int hf_woww_guids = -1;
-static int hf_woww_guild = -1;
-static int hf_woww_guild_charter_cost = -1;
-static int hf_woww_guild_command = -1;
-static int hf_woww_guild_command_result = -1;
-static int hf_woww_guild_emblem_result = -1;
-static int hf_woww_guild_event = -1;
-static int hf_woww_guild_id = -1;
-static int hf_woww_guild_info = -1;
-static int hf_woww_guild_member_status = -1;
-static int hf_woww_guild_name = -1;
-static int hf_woww_hair_color = -1;
-static int hf_woww_hair_style = -1;
-static int hf_woww_happiness = -1;
-static int hf_woww_has_transport = -1;
-static int hf_woww_heal_amount = -1;
-static int hf_woww_heal_critical = -1;
-static int hf_woww_health = -1;
-static int hf_woww_higher_bidder = -1;
-static int hf_woww_highest_bid = -1;
-static int hf_woww_highest_bidder = -1;
-static int hf_woww_hit_info = -1;
-static int hf_woww_hits = -1;
-static int hf_woww_holy_resistance = -1;
-static int hf_woww_homebind_timer = -1;
-static int hf_woww_honor_points = -1;
-static int hf_woww_honorable_kills = -1;
-static int hf_woww_horizontal_speed = -1;
-static int hf_woww_icon = -1;
-static int hf_woww_id = -1;
-static int hf_woww_ignored = -1;
-static int hf_woww_inactive = -1;
-static int hf_woww_index = -1;
-static int hf_woww_info_block = -1;
-static int hf_woww_info_type = -1;
-static int hf_woww_initiator = -1;
-static int hf_woww_initiator_name = -1;
-static int hf_woww_instance_id = -1;
-static int hf_woww_instance_reset_failed_reason = -1;
-static int hf_woww_intellect = -1;
-static int hf_woww_interrupted_spell = -1;
-static int hf_woww_inventory_result = -1;
-static int hf_woww_inventory_type = -1;
-static int hf_woww_invited_player = -1;
-static int hf_woww_is_applied = -1;
-static int hf_woww_is_frozen = -1;
-static int hf_woww_is_online = -1;
-static int hf_woww_issue_date = -1;
-static int hf_woww_item = -1;
-static int hf_woww_item_bag_index = -1;
-static int hf_woww_item_charges = -1;
-static int hf_woww_item_class = -1;
-static int hf_woww_item_class_and_sub_class = -1;
-static int hf_woww_item_count = -1;
-static int hf_woww_item_creator = -1;
-static int hf_woww_item_display_id = -1;
-static int hf_woww_item_enchant_id = -1;
-static int hf_woww_item_enchantment = -1;
-static int hf_woww_item_flag = -1;
-static int hf_woww_item_icon = -1;
-static int hf_woww_item_id = -1;
-static int hf_woww_item_level = -1;
-static int hf_woww_item_limit_category_id = -1;
-static int hf_woww_item_name = -1;
-static int hf_woww_item_owner = -1;
-static int hf_woww_item_quality = -1;
-static int hf_woww_item_random_properties_id = -1;
-static int hf_woww_item_random_property_id = -1;
-static int hf_woww_item_random_suffix = -1;
-static int hf_woww_item_random_suffix_id = -1;
-static int hf_woww_item_set = -1;
-static int hf_woww_item_slot = -1;
-static int hf_woww_item_slot_int = -1;
-static int hf_woww_item_spell_charges = -1;
-static int hf_woww_item_stack_count = -1;
-static int hf_woww_item_stack_size = -1;
-static int hf_woww_item_stat_type = -1;
-static int hf_woww_item_sub_class_mask = -1;
-static int hf_woww_item_suffix_factor = -1;
-static int hf_woww_item_template = -1;
-static int hf_woww_item_text_id = -1;
-static int hf_woww_item_to_damage = -1;
-static int hf_woww_items_required = -1;
-static int hf_woww_join_as_group = -1;
-static int hf_woww_key_version = -1;
-static int hf_woww_kill_count = -1;
-static int hf_woww_killing_blows = -1;
-static int hf_woww_lag = -1;
-static int hf_woww_language = -1;
-static int hf_woww_last_week_honor = -1;
-static int hf_woww_last_week_honorable = -1;
-static int hf_woww_leader = -1;
-static int hf_woww_level = -1;
-static int hf_woww_level_played_time = -1;
-static int hf_woww_lifetime_dishonorable = -1;
-static int hf_woww_lifetime_honorable = -1;
-static int hf_woww_list_from = -1;
-static int hf_woww_list_start_item = -1;
-static int hf_woww_listed_players = -1;
-static int hf_woww_living_orientation = -1;
-static int hf_woww_location_name = -1;
-static int hf_woww_lock_id = -1;
-static int hf_woww_log_format = -1;
-static int hf_woww_logout_result = -1;
-static int hf_woww_logout_speed = -1;
-static int hf_woww_loot = -1;
-static int hf_woww_loot_master = -1;
-static int hf_woww_loot_method = -1;
-static int hf_woww_loot_method_error = -1;
-static int hf_woww_loot_slot = -1;
-static int hf_woww_loot_slot_type = -1;
-static int hf_woww_looted_target = -1;
-static int hf_woww_loyalty = -1;
-static int hf_woww_mail_action = -1;
-static int hf_woww_mail_id = -1;
-static int hf_woww_mail_result = -1;
-static int hf_woww_mail_result_two = -1;
-static int hf_woww_mail_template_id = -1;
-static int hf_woww_mail_type = -1;
-static int hf_woww_mailbox = -1;
-static int hf_woww_mailbox_id = -1;
-static int hf_woww_mana = -1;
-static int hf_woww_map = -1;
-static int hf_woww_master_loot = -1;
-static int hf_woww_material = -1;
-static int hf_woww_max_count = -1;
-static int hf_woww_max_durability = -1;
-static int hf_woww_max_health = -1;
-static int hf_woww_max_items = -1;
-static int hf_woww_max_level_money_reward = -1;
-static int hf_woww_max_power = -1;
-static int hf_woww_maximum = -1;
-static int hf_woww_maximum_level = -1;
-static int hf_woww_maximum_signatures = -1;
-static int hf_woww_meeting_stone_failure = -1;
-static int hf_woww_meeting_stone_status = -1;
-static int hf_woww_member = -1;
-static int hf_woww_message = -1;
-static int hf_woww_message_id = -1;
-static int hf_woww_message_of_the_day = -1;
-static int hf_woww_minimum = -1;
-static int hf_woww_minimum_bid = -1;
-static int hf_woww_minimum_level = -1;
-static int hf_woww_minimum_signatures = -1;
-static int hf_woww_misc = -1;
-static int hf_woww_misc_value = -1;
-static int hf_woww_money = -1;
-static int hf_woww_money_in_trade = -1;
-static int hf_woww_money_reward = -1;
-static int hf_woww_monster = -1;
-static int hf_woww_monster_move_type = -1;
-static int hf_woww_monster_name = -1;
-static int hf_woww_motd = -1;
-static int hf_woww_mount_result = -1;
-static int hf_woww_move_event = -1;
-static int hf_woww_movement_counter = -1;
-static int hf_woww_movement_flags = -1;
-static int hf_woww_multiplier = -1;
-static int hf_woww_name = -1;
-static int hf_woww_nature_resistance = -1;
-static int hf_woww_nearest_node = -1;
-static int hf_woww_new_bid = -1;
-static int hf_woww_new_guild_leader_name = -1;
-static int hf_woww_new_item_chat_alert = -1;
-static int hf_woww_new_item_creation_type = -1;
-static int hf_woww_new_item_source = -1;
-static int hf_woww_new_level = -1;
-static int hf_woww_new_name = -1;
-static int hf_woww_new_owner = -1;
-static int hf_woww_new_speed = -1;
-static int hf_woww_new_spell_id = -1;
-static int hf_woww_next_page_id = -1;
-static int hf_woww_next_quest_in_chain = -1;
-static int hf_woww_next_resurrect_time = -1;
-static int hf_woww_node_count = -1;
-static int hf_woww_nodes = -1;
-static int hf_woww_note = -1;
-static int hf_woww_notification = -1;
-static int hf_woww_npc = -1;
-static int hf_woww_number_of_battlegrounds = -1;
-static int hf_woww_number_of_choices = -1;
-static int hf_woww_object_type = -1;
-static int hf_woww_object_unk = -1;
-static int hf_woww_objective_text = -1;
-static int hf_woww_objective_texts = -1;
-static int hf_woww_objectives = -1;
-static int hf_woww_offer_reward_text = -1;
-static int hf_woww_officer_note = -1;
-static int hf_woww_old_mover = -1;
-static int hf_woww_old_spell_id = -1;
-static int hf_woww_online_players = -1;
-static int hf_woww_op = -1;
-static int hf_woww_opponent_name = -1;
-static int hf_woww_orientation = -1;
-static int hf_woww_out_bid = -1;
-static int hf_woww_outbid_item_ids = -1;
-static int hf_woww_outfit_id = -1;
-static int hf_woww_owner = -1;
-static int hf_woww_page_id = -1;
-static int hf_woww_page_text = -1;
-static int hf_woww_page_text_material = -1;
-static int hf_woww_party_operation = -1;
-static int hf_woww_party_result = -1;
-static int hf_woww_party_status = -1;
-static int hf_woww_periodic_log = -1;
-static int hf_woww_pet = -1;
-static int hf_woww_pet_command_state = -1;
-static int hf_woww_pet_current_health = -1;
-static int hf_woww_pet_current_power = -1;
-static int hf_woww_pet_display_id = -1;
-static int hf_woww_pet_enabled = -1;
-static int hf_woww_pet_feedback = -1;
-static int hf_woww_pet_level = -1;
-static int hf_woww_pet_max_health = -1;
-static int hf_woww_pet_max_power = -1;
-static int hf_woww_pet_name = -1;
-static int hf_woww_pet_name_timestamp = -1;
-static int hf_woww_pet_number = -1;
-static int hf_woww_pet_react_state = -1;
-static int hf_woww_pet_slot = -1;
-static int hf_woww_pet_talk_reason = -1;
-static int hf_woww_pet_tame_failure_reason = -1;
-static int hf_woww_petition = -1;
-static int hf_woww_petition_id = -1;
-static int hf_woww_petition_result = -1;
-static int hf_woww_pitch = -1;
-static int hf_woww_player = -1;
-static int hf_woww_player_chat_tag = -1;
-static int hf_woww_player_is_saved_to_a_raid = -1;
-static int hf_woww_player_name = -1;
-static int hf_woww_player_rank = -1;
-static int hf_woww_player_with_killing_blow = -1;
-static int hf_woww_point_map_id = -1;
-static int hf_woww_point_opt = -1;
-static int hf_woww_position = -1;
-static int hf_woww_position_x = -1;
-static int hf_woww_position_x_int = -1;
-static int hf_woww_position_y = -1;
-static int hf_woww_position_y_int = -1;
-static int hf_woww_power = -1;
-static int hf_woww_price = -1;
-static int hf_woww_probability = -1;
-static int hf_woww_public_key = -1;
-static int hf_woww_public_note = -1;
-static int hf_woww_pvp_corpse = -1;
-static int hf_woww_pvp_rank = -1;
-static int hf_woww_query = -1;
-static int hf_woww_quest_completable = -1;
-static int hf_woww_quest_failed_reason = -1;
-static int hf_woww_quest_flags = -1;
-static int hf_woww_quest_giver_status = -1;
-static int hf_woww_quest_icon = -1;
-static int hf_woww_quest_id = -1;
-static int hf_woww_quest_level = -1;
-static int hf_woww_quest_method = -1;
-static int hf_woww_quest_party_message = -1;
-static int hf_woww_quest_title = -1;
-static int hf_woww_quest_type = -1;
-static int hf_woww_question_id = -1;
-static int hf_woww_queue_position = -1;
-static int hf_woww_queue_slot = -1;
-static int hf_woww_race = -1;
-static int hf_woww_race_mask = -1;
-static int hf_woww_racial_leader = -1;
-static int hf_woww_rage = -1;
-static int hf_woww_raid_group_error = -1;
-static int hf_woww_raid_instance_message = -1;
-static int hf_woww_raid_target_index = -1;
-static int hf_woww_raid_target_update_type = -1;
-static int hf_woww_random_property = -1;
-static int hf_woww_random_property_id = -1;
-static int hf_woww_ranged_range_modification = -1;
-static int hf_woww_rank = -1;
-static int hf_woww_rank_id = -1;
-static int hf_woww_rank_name = -1;
-static int hf_woww_rank_names = -1;
-static int hf_woww_rank_progress_bar = -1;
-static int hf_woww_raw_data = -1;
-static int hf_woww_read_by_gm = -1;
-static int hf_woww_realm_name = -1;
-static int hf_woww_receiver = -1;
-static int hf_woww_records = -1;
-static int hf_woww_reputation_objective_value = -1;
-static int hf_woww_reputation_rank = -1;
-static int hf_woww_request_items_text = -1;
-static int hf_woww_requested_rank = -1;
-static int hf_woww_required_city_rank = -1;
-static int hf_woww_required_faction_rank = -1;
-static int hf_woww_required_honor_rank = -1;
-static int hf_woww_required_item_count = -1;
-static int hf_woww_required_item_id = -1;
-static int hf_woww_required_kill_count = -1;
-static int hf_woww_required_level = -1;
-static int hf_woww_required_money = -1;
-static int hf_woww_required_opposite_reputation_value = -1;
-static int hf_woww_required_skill_rank = -1;
-static int hf_woww_required_skill_value = -1;
-static int hf_woww_required_spell = -1;
-static int hf_woww_required_spell_focus = -1;
-static int hf_woww_required_spells = -1;
-static int hf_woww_reserved_for_future_use = -1;
-static int hf_woww_reset_time = -1;
-static int hf_woww_resist = -1;
-static int hf_woww_resisted = -1;
-static int hf_woww_reward = -1;
-static int hf_woww_reward_spell = -1;
-static int hf_woww_reward_spell_cast = -1;
-static int hf_woww_rights = -1;
-static int hf_woww_roll_number = -1;
-static int hf_woww_roll_vote = -1;
-static int hf_woww_round_time_in_ms = -1;
-static int hf_woww_running_speed = -1;
-static int hf_woww_scale = -1;
-static int hf_woww_search_strings = -1;
-static int hf_woww_searched_name = -1;
-static int hf_woww_self_player = -1;
-static int hf_woww_sell_item_result = -1;
-static int hf_woww_sell_price = -1;
-static int hf_woww_sender = -1;
-static int hf_woww_sender_id = -1;
-static int hf_woww_sender_name = -1;
-static int hf_woww_sequence_id = -1;
-static int hf_woww_server_id = -1;
-static int hf_woww_server_message_type = -1;
-static int hf_woww_server_seed = -1;
-static int hf_woww_set_assistant = -1;
-static int hf_woww_shadow_resistance = -1;
-static int hf_woww_sheath_state = -1;
-static int hf_woww_sheathe_type = -1;
-static int hf_woww_show_affiliation = -1;
-static int hf_woww_signer = -1;
-static int hf_woww_simple_spell_cast_result = -1;
-static int hf_woww_sin_angle = -1;
-static int hf_woww_size_struct = -1;
-static int hf_woww_skill = -1;
-static int hf_woww_skin = -1;
-static int hf_woww_skin_color = -1;
-static int hf_woww_slot = -1;
-static int hf_woww_slot_id = -1;
-static int hf_woww_slot_index = -1;
-static int hf_woww_sound_id = -1;
-static int hf_woww_source_bag = -1;
-static int hf_woww_source_item_id = -1;
-static int hf_woww_source_node = -1;
-static int hf_woww_source_slot = -1;
-static int hf_woww_speech_bubble_credit = -1;
-static int hf_woww_speed = -1;
-static int hf_woww_spell = -1;
-static int hf_woww_spell_art_kit = -1;
-static int hf_woww_spell_cast_result = -1;
-static int hf_woww_spell_cast_target_flags = -1;
-static int hf_woww_spell_category = -1;
-static int hf_woww_spell_category_cooldown = -1;
-static int hf_woww_spell_charges = -1;
-static int hf_woww_spell_cooldown = -1;
-static int hf_woww_spell_cost = -1;
-static int hf_woww_spell_count = -1;
-static int hf_woww_spell_data_id = -1;
-static int hf_woww_spell_effect = -1;
-static int hf_woww_spell_id = -1;
-static int hf_woww_spell_index = -1;
-static int hf_woww_spell_miss_info = -1;
-static int hf_woww_spell_on_lowest_slot = -1;
-static int hf_woww_spell_school = -1;
-static int hf_woww_spell_school_mask = -1;
-static int hf_woww_spell_trigger_type = -1;
-static int hf_woww_spell_visual_kit = -1;
-static int hf_woww_spells = -1;
-static int hf_woww_spirit = -1;
-static int hf_woww_spirit_released = -1;
-static int hf_woww_spline_elevation = -1;
-static int hf_woww_spline_flag = -1;
-static int hf_woww_spline_id = -1;
-static int hf_woww_stable_master = -1;
-static int hf_woww_stable_result = -1;
-static int hf_woww_stable_slots = -1;
-static int hf_woww_stack_count = -1;
-static int hf_woww_stackable = -1;
-static int hf_woww_stamina = -1;
-static int hf_woww_standing = -1;
-static int hf_woww_start_bid = -1;
-static int hf_woww_start_from_page = -1;
-static int hf_woww_start_quest = -1;
-static int hf_woww_starting_bid = -1;
-static int hf_woww_state = -1;
-static int hf_woww_stationery = -1;
-static int hf_woww_status = -1;
-static int hf_woww_status_id = -1;
-static int hf_woww_strength = -1;
-static int hf_woww_string = -1;
-static int hf_woww_sub_name = -1;
-static int hf_woww_subject = -1;
-static int hf_woww_suggestion = -1;
-static int hf_woww_summoner = -1;
-static int hf_woww_survey_id = -1;
-static int hf_woww_swap_with_name = -1;
-static int hf_woww_swimming_speed = -1;
-static int hf_woww_talent = -1;
-static int hf_woww_talent_point_cost = -1;
-static int hf_woww_talent_reset_cost = -1;
-static int hf_woww_target = -1;
-static int hf_woww_target_error = -1;
-static int hf_woww_target_player = -1;
-static int hf_woww_target_string = -1;
-static int hf_woww_targets = -1;
-static int hf_woww_taxi_mask_node_known = -1;
-static int hf_woww_text = -1;
-static int hf_woww_text_emote = -1;
-static int hf_woww_text_id = -1;
-static int hf_woww_texts = -1;
-static int hf_woww_this_week_honor = -1;
-static int hf_woww_this_week_honorable = -1;
-static int hf_woww_time = -1;
-static int hf_woww_time_in_queue_in_ms = -1;
-static int hf_woww_time_left = -1;
-static int hf_woww_time_offline = -1;
-static int hf_woww_time_passed = -1;
-static int hf_woww_time_remaining = -1;
-static int hf_woww_time_skipped = -1;
-static int hf_woww_time_to_bg_autoleave_in_ms = -1;
-static int hf_woww_time_to_bg_start_in_ms = -1;
-static int hf_woww_time_to_remove_in_queue_in_ms = -1;
-static int hf_woww_timer = -1;
-static int hf_woww_timer_type = -1;
-static int hf_woww_timescale = -1;
-static int hf_woww_timestamp = -1;
-static int hf_woww_title = -1;
-static int hf_woww_title_text_id = -1;
-static int hf_woww_today_honorable_and_dishonorable = -1;
-static int hf_woww_todo_amount_of_signers = -1;
-static int hf_woww_total_amount_of_auctions = -1;
-static int hf_woww_total_cost = -1;
-static int hf_woww_total_damage = -1;
-static int hf_woww_total_exp = -1;
-static int hf_woww_total_played_time = -1;
-static int hf_woww_trade_item = -1;
-static int hf_woww_trade_slot = -1;
-static int hf_woww_trade_slot_count = -1;
-static int hf_woww_trade_slot_number = -1;
-static int hf_woww_trade_status = -1;
-static int hf_woww_trainer_spell_state = -1;
-static int hf_woww_trainer_type = -1;
-static int hf_woww_training_failure_reason = -1;
-static int hf_woww_transfer_abort_reason = -1;
-static int hf_woww_transport = -1;
-static int hf_woww_transport_guid = -1;
-static int hf_woww_transport_orientation = -1;
-static int hf_woww_transport_progress_in_ms = -1;
-static int hf_woww_trigger_id = -1;
-static int hf_woww_turn_rate = -1;
-static int hf_woww_tutorial_data = -1;
-static int hf_woww_tutorial_flag = -1;
-static int hf_woww_type_flags = -1;
-static int hf_woww_unit_stand_state = -1;
-static int hf_woww_unit_target = -1;
-static int hf_woww_unknown_flags = -1;
-static int hf_woww_unknown_float = -1;
-static int hf_woww_unknown_guid = -1;
-static int hf_woww_unknown_int = -1;
-static int hf_woww_unread_mails = -1;
-static int hf_woww_unused = -1;
-static int hf_woww_update_available_flag = -1;
-static int hf_woww_update_flag = -1;
-static int hf_woww_update_type = -1;
-static int hf_woww_url = -1;
-static int hf_woww_url_info = -1;
-static int hf_woww_usable = -1;
-static int hf_woww_username = -1;
-static int hf_woww_v_cos = -1;
-static int hf_woww_v_sin = -1;
-static int hf_woww_value = -1;
-static int hf_woww_vendor = -1;
-static int hf_woww_vendor_slot = -1;
-static int hf_woww_vertical_speed = -1;
-static int hf_woww_victim = -1;
-static int hf_woww_walking_speed = -1;
-static int hf_woww_weather_change_type = -1;
-static int hf_woww_weather_type = -1;
-static int hf_woww_winning_player = -1;
-static int hf_woww_winning_roll = -1;
-static int hf_woww_wiping_npc = -1;
-static int hf_woww_won = -1;
-static int hf_woww_world_result = -1;
-static int hf_woww_wrapped = -1;
-static int hf_woww_x = -1;
-static int hf_woww_xy_speed = -1;
-static int hf_woww_y = -1;
-static int hf_woww_yesterday_honor = -1;
-static int hf_woww_yesterday_honorable = -1;
-static int hf_woww_z = -1;
-static int hf_woww_z_speed = -1;
-static int hf_woww_zone_or_sort = -1;
-static int hf_woww_zones = -1;
+static int hf_woww_absorb;
+static int hf_woww_absorbed;
+static int hf_woww_absorbed_damage;
+static int hf_woww_account_data_type;
+static int hf_woww_action;
+static int hf_woww_action_bar;
+static int hf_woww_action_bars;
+static int hf_woww_action_type;
+static int hf_woww_activate_taxi_reply;
+static int hf_woww_actual_roll;
+static int hf_woww_addon_crc;
+static int hf_woww_addon_extra_crc;
+static int hf_woww_addon_has_signature;
+static int hf_woww_addon_name;
+static int hf_woww_addon_type;
+static int hf_woww_agility;
+static int hf_woww_ai_reaction;
+static int hf_woww_allow_movement;
+static int hf_woww_allowed_class;
+static int hf_woww_allowed_genders;
+static int hf_woww_allowed_guild_id;
+static int hf_woww_allowed_maximum_level;
+static int hf_woww_allowed_minimum_level;
+static int hf_woww_allowed_race;
+static int hf_woww_ammo_display_id;
+static int hf_woww_ammo_inventory_type;
+static int hf_woww_ammo_type;
+static int hf_woww_amount;
+static int hf_woww_amount_bought;
+static int hf_woww_amount_for_sale;
+static int hf_woww_amount_of_accounts_in_guild;
+static int hf_woww_amount_of_auras;
+static int hf_woww_amount_of_carriers;
+static int hf_woww_amount_of_characters;
+static int hf_woww_amount_of_characters_in_guild;
+static int hf_woww_amount_of_choice_item_rewards;
+static int hf_woww_amount_of_cooldowns;
+static int hf_woww_amount_of_damages;
+static int hf_woww_amount_of_effects;
+static int hf_woww_amount_of_emotes;
+static int hf_woww_amount_of_entries;
+static int hf_woww_amount_of_events;
+static int hf_woww_amount_of_extra_fields;
+static int hf_woww_amount_of_faction_standings;
+static int hf_woww_amount_of_factions;
+static int hf_woww_amount_of_friends;
+static int hf_woww_amount_of_gossip_items;
+static int hf_woww_amount_of_hits;
+static int hf_woww_amount_of_ignored;
+static int hf_woww_amount_of_item_rewards;
+static int hf_woww_amount_of_items;
+static int hf_woww_amount_of_logs;
+static int hf_woww_amount_of_mails;
+static int hf_woww_amount_of_members;
+static int hf_woww_amount_of_misses;
+static int hf_woww_amount_of_nodes;
+static int hf_woww_amount_of_objects;
+static int hf_woww_amount_of_outbid_items;
+static int hf_woww_amount_of_petitions;
+static int hf_woww_amount_of_pets;
+static int hf_woww_amount_of_players;
+static int hf_woww_amount_of_quests;
+static int hf_woww_amount_of_raid_infos;
+static int hf_woww_amount_of_reactions;
+static int hf_woww_amount_of_records;
+static int hf_woww_amount_of_required_items;
+static int hf_woww_amount_of_rights;
+static int hf_woww_amount_of_signatures;
+static int hf_woww_amount_of_spells;
+static int hf_woww_amount_of_states;
+static int hf_woww_amount_of_strings;
+static int hf_woww_amount_of_targets;
+static int hf_woww_amount_of_teammates;
+static int hf_woww_amount_of_zones;
+static int hf_woww_angle;
+static int hf_woww_animation_id;
+static int hf_woww_answer;
+static int hf_woww_answer_comment;
+static int hf_woww_apply;
+static int hf_woww_arcane_resistance;
+static int hf_woww_area;
+static int hf_woww_argument;
+static int hf_woww_armor;
+static int hf_woww_attacker;
+static int hf_woww_auction_command_action;
+static int hf_woww_auction_command_result;
+static int hf_woww_auction_command_result_two;
+static int hf_woww_auction_duration_in_minutes;
+static int hf_woww_auction_house;
+static int hf_woww_auction_id;
+static int hf_woww_auction_main_category;
+static int hf_woww_auction_out_bid;
+static int hf_woww_auction_outbid;
+static int hf_woww_auction_slot_id;
+static int hf_woww_auction_sub_category;
+static int hf_woww_auctioneer;
+static int hf_woww_aura_duration;
+static int hf_woww_aura_slot;
+static int hf_woww_aura_type;
+static int hf_woww_auto_decline_time;
+static int hf_woww_auto_finish;
+static int hf_woww_autocast_enabled;
+static int hf_woww_average_wait_time_in_ms;
+static int hf_woww_background_color;
+static int hf_woww_backwards_running_speed;
+static int hf_woww_backwards_swimming_speed;
+static int hf_woww_bag;
+static int hf_woww_bag_family;
+static int hf_woww_bag_index;
+static int hf_woww_bag_slot;
+static int hf_woww_bag_type_subclass;
+static int hf_woww_battlefield_port_action;
+static int hf_woww_battleground_bracket;
+static int hf_woww_battleground_end_status;
+static int hf_woww_battleground_winner;
+static int hf_woww_battlegrounds;
+static int hf_woww_battlemaster;
+static int hf_woww_bg_type_id;
+static int hf_woww_bid;
+static int hf_woww_bidder;
+static int hf_woww_billing_flags;
+static int hf_woww_billing_rested;
+static int hf_woww_billing_time;
+static int hf_woww_block;
+static int hf_woww_blocked;
+static int hf_woww_blocked_amount;
+static int hf_woww_body;
+static int hf_woww_body_text;
+static int hf_woww_bonding;
+static int hf_woww_bonus_honor;
+static int hf_woww_border_color;
+static int hf_woww_border_style;
+static int hf_woww_bug_type;
+static int hf_woww_build;
+static int hf_woww_button;
+static int hf_woww_buy_bank_slot_result;
+static int hf_woww_buy_price;
+static int hf_woww_buy_result;
+static int hf_woww_buyback_slot;
+static int hf_woww_buyout;
+static int hf_woww_buyout_amount;
+static int hf_woww_cash_on_delivery_amount;
+static int hf_woww_cast_failure_reason;
+static int hf_woww_cast_flags;
+static int hf_woww_cast_item;
+static int hf_woww_caster;
+static int hf_woww_category_cooldown;
+static int hf_woww_channel;
+static int hf_woww_channel_flags;
+static int hf_woww_channel_member_flags;
+static int hf_woww_channel_name;
+static int hf_woww_channel_password;
+static int hf_woww_character_flags;
+static int hf_woww_character_guid;
+static int hf_woww_character_name;
+static int hf_woww_charter_display_id;
+static int hf_woww_charter_entry;
+static int hf_woww_charter_owner;
+static int hf_woww_chat_credit;
+static int hf_woww_chat_data_line_count;
+static int hf_woww_chat_data_size_uncompressed;
+static int hf_woww_chat_notify;
+static int hf_woww_chat_type;
+static int hf_woww_checked_timestamp;
+static int hf_woww_cinematic_sequence_id;
+static int hf_woww_civilian;
+static int hf_woww_class;
+static int hf_woww_class_mask;
+static int hf_woww_client_instance_id;
+static int hf_woww_client_proof;
+static int hf_woww_client_seed;
+static int hf_woww_code;
+static int hf_woww_coded;
+static int hf_woww_comment;
+static int hf_woww_compressed_chat_data;
+static int hf_woww_compressed_data;
+static int hf_woww_compressed_move_opcode;
+static int hf_woww_container_slots;
+static int hf_woww_content;
+static int hf_woww_cooldown;
+static int hf_woww_cooldown_count;
+static int hf_woww_cooldown_time;
+static int hf_woww_corpse;
+static int hf_woww_corpse_query_result;
+static int hf_woww_cos_angle;
+static int hf_woww_cost_in_copper;
+static int hf_woww_count;
+static int hf_woww_countdown_time;
+static int hf_woww_counter;
+static int hf_woww_created_day;
+static int hf_woww_created_month;
+static int hf_woww_created_year;
+static int hf_woww_creature;
+static int hf_woww_creature_entry;
+static int hf_woww_creature_family;
+static int hf_woww_creature_id;
+static int hf_woww_creature_rank;
+static int hf_woww_creature_type;
+static int hf_woww_critical;
+static int hf_woww_current_health;
+static int hf_woww_current_power;
+static int hf_woww_damage;
+static int hf_woww_damage_float;
+static int hf_woww_damage_maximum;
+static int hf_woww_damage_minimum;
+static int hf_woww_damage_state;
+static int hf_woww_damage_uint;
+static int hf_woww_data;
+static int hf_woww_data_type;
+static int hf_woww_datetime;
+static int hf_woww_days_since_last_updated;
+static int hf_woww_days_since_oldest_ticket_creation;
+static int hf_woww_days_since_ticket_creation;
+static int hf_woww_deadline;
+static int hf_woww_deaths;
+static int hf_woww_debug_log_format;
+static int hf_woww_decompressed_addon_info_size;
+static int hf_woww_decompressed_size;
+static int hf_woww_delay;
+static int hf_woww_delay_time;
+static int hf_woww_description;
+static int hf_woww_destination_bag;
+static int hf_woww_destination_node;
+static int hf_woww_destination_slot;
+static int hf_woww_destionation_slot;
+static int hf_woww_details;
+static int hf_woww_dismount_result;
+static int hf_woww_display_id;
+static int hf_woww_duel_winner_reason;
+static int hf_woww_durability;
+static int hf_woww_duration;
+static int hf_woww_eff;
+static int hf_woww_emblem_color;
+static int hf_woww_emblem_style;
+static int hf_woww_emote_delay;
+static int hf_woww_emote_enum;
+static int hf_woww_emote_int;
+static int hf_woww_enable_pvp;
+static int hf_woww_enchantment;
+static int hf_woww_encrypted_data;
+static int hf_woww_end_text;
+static int hf_woww_ended_without_interruption;
+static int hf_woww_enemy;
+static int hf_woww_energize_amount;
+static int hf_woww_energize_power;
+static int hf_woww_energy;
+static int hf_woww_entry;
+static int hf_woww_entry_id;
+static int hf_woww_environmental_damage_type;
+static int hf_woww_equip_error;
+static int hf_woww_equipment_display_id;
+static int hf_woww_equipped_item_class;
+static int hf_woww_equipped_item_inventory_type_mask;
+static int hf_woww_equipped_item_subclass_mask;
+static int hf_woww_event_descriptions;
+static int hf_woww_exp_group_bonus;
+static int hf_woww_experience;
+static int hf_woww_experience_award_type;
+static int hf_woww_experience_reward;
+static int hf_woww_experience_without_rested;
+static int hf_woww_expiration_time;
+static int hf_woww_extend_flag;
+static int hf_woww_extra_attacks;
+static int hf_woww_face;
+static int hf_woww_facial_hair;
+static int hf_woww_faction;
+static int hf_woww_faction_flag;
+static int hf_woww_fall_time;
+static int hf_woww_far_sight_operation;
+static int hf_woww_feed_pet_item;
+static int hf_woww_fields;
+static int hf_woww_fire_resistance;
+static int hf_woww_first_bag_display_id;
+static int hf_woww_first_bag_inventory_id;
+static int hf_woww_first_login;
+static int hf_woww_first_rank;
+static int hf_woww_flags;
+static int hf_woww_focus;
+static int hf_woww_friend_result;
+static int hf_woww_friend_status;
+static int hf_woww_frost_resistance;
+static int hf_woww_gain_multiplier;
+static int hf_woww_gameobject;
+static int hf_woww_gender;
+static int hf_woww_gift_bag_index;
+static int hf_woww_gift_slot;
+static int hf_woww_gift_wrapper;
+static int hf_woww_gm_ticket_escalation_status;
+static int hf_woww_gm_ticket_queue_status;
+static int hf_woww_gm_ticket_response;
+static int hf_woww_gm_ticket_status;
+static int hf_woww_gm_ticket_status_response;
+static int hf_woww_gm_ticket_type;
+static int hf_woww_gold;
+static int hf_woww_gossip_list_id;
+static int hf_woww_grade;
+static int hf_woww_greeting;
+static int hf_woww_group_loot_setting;
+static int hf_woww_group_member_online_status;
+static int hf_woww_group_number;
+static int hf_woww_group_type;
+static int hf_woww_group_update_flags;
+static int hf_woww_guid;
+static int hf_woww_guids;
+static int hf_woww_guild;
+static int hf_woww_guild_charter_cost;
+static int hf_woww_guild_command;
+static int hf_woww_guild_command_result;
+static int hf_woww_guild_emblem_result;
+static int hf_woww_guild_event;
+static int hf_woww_guild_id;
+static int hf_woww_guild_info;
+static int hf_woww_guild_member_status;
+static int hf_woww_guild_name;
+static int hf_woww_hair_color;
+static int hf_woww_hair_style;
+static int hf_woww_happiness;
+static int hf_woww_has_transport;
+static int hf_woww_heal_amount;
+static int hf_woww_heal_critical;
+static int hf_woww_health;
+static int hf_woww_higher_bidder;
+static int hf_woww_highest_bid;
+static int hf_woww_highest_bidder;
+static int hf_woww_hit_info;
+static int hf_woww_hits;
+static int hf_woww_holy_resistance;
+static int hf_woww_homebind_timer;
+static int hf_woww_honor_points;
+static int hf_woww_honorable_kills;
+static int hf_woww_horizontal_speed;
+static int hf_woww_icon;
+static int hf_woww_id;
+static int hf_woww_ignored;
+static int hf_woww_inactive;
+static int hf_woww_index;
+static int hf_woww_info_block;
+static int hf_woww_info_type;
+static int hf_woww_initiator;
+static int hf_woww_initiator_name;
+static int hf_woww_instance_id;
+static int hf_woww_instance_reset_failed_reason;
+static int hf_woww_intellect;
+static int hf_woww_interrupted_spell;
+static int hf_woww_inventory_result;
+static int hf_woww_inventory_type;
+static int hf_woww_invited_player;
+static int hf_woww_is_applied;
+static int hf_woww_is_frozen;
+static int hf_woww_is_online;
+static int hf_woww_issue_date;
+static int hf_woww_item;
+static int hf_woww_item_bag_index;
+static int hf_woww_item_charges;
+static int hf_woww_item_class;
+static int hf_woww_item_class_and_sub_class;
+static int hf_woww_item_count;
+static int hf_woww_item_creator;
+static int hf_woww_item_display_id;
+static int hf_woww_item_enchant_id;
+static int hf_woww_item_enchantment;
+static int hf_woww_item_flag;
+static int hf_woww_item_icon;
+static int hf_woww_item_id;
+static int hf_woww_item_level;
+static int hf_woww_item_limit_category_id;
+static int hf_woww_item_name;
+static int hf_woww_item_owner;
+static int hf_woww_item_quality;
+static int hf_woww_item_random_properties_id;
+static int hf_woww_item_random_property_id;
+static int hf_woww_item_random_suffix;
+static int hf_woww_item_random_suffix_id;
+static int hf_woww_item_set;
+static int hf_woww_item_slot;
+static int hf_woww_item_slot_int;
+static int hf_woww_item_spell_charges;
+static int hf_woww_item_stack_count;
+static int hf_woww_item_stack_size;
+static int hf_woww_item_stat_type;
+static int hf_woww_item_sub_class_mask;
+static int hf_woww_item_suffix_factor;
+static int hf_woww_item_template;
+static int hf_woww_item_text_id;
+static int hf_woww_item_to_damage;
+static int hf_woww_items_required;
+static int hf_woww_join_as_group;
+static int hf_woww_key_version;
+static int hf_woww_kill_count;
+static int hf_woww_killing_blows;
+static int hf_woww_lag;
+static int hf_woww_language;
+static int hf_woww_last_week_honor;
+static int hf_woww_last_week_honorable;
+static int hf_woww_leader;
+static int hf_woww_level;
+static int hf_woww_level_played_time;
+static int hf_woww_lifetime_dishonorable;
+static int hf_woww_lifetime_honorable;
+static int hf_woww_list_from;
+static int hf_woww_list_start_item;
+static int hf_woww_listed_players;
+static int hf_woww_living_orientation;
+static int hf_woww_location_name;
+static int hf_woww_lock_id;
+static int hf_woww_log_format;
+static int hf_woww_logout_result;
+static int hf_woww_logout_speed;
+static int hf_woww_loot;
+static int hf_woww_loot_master;
+static int hf_woww_loot_method;
+static int hf_woww_loot_method_error;
+static int hf_woww_loot_slot;
+static int hf_woww_loot_slot_type;
+static int hf_woww_looted_target;
+static int hf_woww_loyalty;
+static int hf_woww_mail_action;
+static int hf_woww_mail_id;
+static int hf_woww_mail_result;
+static int hf_woww_mail_result_two;
+static int hf_woww_mail_template_id;
+static int hf_woww_mail_type;
+static int hf_woww_mailbox;
+static int hf_woww_mailbox_id;
+static int hf_woww_mana;
+static int hf_woww_map;
+static int hf_woww_master_loot;
+static int hf_woww_material;
+static int hf_woww_max_count;
+static int hf_woww_max_durability;
+static int hf_woww_max_health;
+static int hf_woww_max_items;
+static int hf_woww_max_level_money_reward;
+static int hf_woww_max_power;
+static int hf_woww_maximum;
+static int hf_woww_maximum_level;
+static int hf_woww_maximum_signatures;
+static int hf_woww_meeting_stone_failure;
+static int hf_woww_meeting_stone_status;
+static int hf_woww_member;
+static int hf_woww_message;
+static int hf_woww_message_id;
+static int hf_woww_message_of_the_day;
+static int hf_woww_minimum;
+static int hf_woww_minimum_bid;
+static int hf_woww_minimum_level;
+static int hf_woww_minimum_signatures;
+static int hf_woww_misc;
+static int hf_woww_misc_value;
+static int hf_woww_money;
+static int hf_woww_money_in_trade;
+static int hf_woww_money_reward;
+static int hf_woww_monster;
+static int hf_woww_monster_move_type;
+static int hf_woww_monster_name;
+static int hf_woww_motd;
+static int hf_woww_mount_result;
+static int hf_woww_move_event;
+static int hf_woww_movement_counter;
+static int hf_woww_movement_flags;
+static int hf_woww_multiplier;
+static int hf_woww_name;
+static int hf_woww_nature_resistance;
+static int hf_woww_nearest_node;
+static int hf_woww_new_bid;
+static int hf_woww_new_guild_leader_name;
+static int hf_woww_new_item_chat_alert;
+static int hf_woww_new_item_creation_type;
+static int hf_woww_new_item_source;
+static int hf_woww_new_level;
+static int hf_woww_new_name;
+static int hf_woww_new_owner;
+static int hf_woww_new_speed;
+static int hf_woww_new_spell_id;
+static int hf_woww_next_page_id;
+static int hf_woww_next_quest_in_chain;
+static int hf_woww_next_resurrect_time;
+static int hf_woww_node_count;
+static int hf_woww_nodes;
+static int hf_woww_note;
+static int hf_woww_notification;
+static int hf_woww_npc;
+static int hf_woww_number_of_battlegrounds;
+static int hf_woww_number_of_choices;
+static int hf_woww_object_type;
+static int hf_woww_object_unk;
+static int hf_woww_objective_text;
+static int hf_woww_objective_texts;
+static int hf_woww_objectives;
+static int hf_woww_offer_reward_text;
+static int hf_woww_officer_note;
+static int hf_woww_old_mover;
+static int hf_woww_old_spell_id;
+static int hf_woww_online_players;
+static int hf_woww_op;
+static int hf_woww_opponent_name;
+static int hf_woww_orientation;
+static int hf_woww_out_bid;
+static int hf_woww_outbid_item_ids;
+static int hf_woww_outfit_id;
+static int hf_woww_owner;
+static int hf_woww_page_id;
+static int hf_woww_page_text;
+static int hf_woww_page_text_material;
+static int hf_woww_party_operation;
+static int hf_woww_party_result;
+static int hf_woww_party_status;
+static int hf_woww_periodic_log;
+static int hf_woww_pet;
+static int hf_woww_pet_command_state;
+static int hf_woww_pet_current_health;
+static int hf_woww_pet_current_power;
+static int hf_woww_pet_display_id;
+static int hf_woww_pet_enabled;
+static int hf_woww_pet_feedback;
+static int hf_woww_pet_level;
+static int hf_woww_pet_max_health;
+static int hf_woww_pet_max_power;
+static int hf_woww_pet_name;
+static int hf_woww_pet_name_timestamp;
+static int hf_woww_pet_number;
+static int hf_woww_pet_react_state;
+static int hf_woww_pet_slot;
+static int hf_woww_pet_talk_reason;
+static int hf_woww_pet_tame_failure_reason;
+static int hf_woww_petition;
+static int hf_woww_petition_id;
+static int hf_woww_petition_result;
+static int hf_woww_pitch;
+static int hf_woww_player;
+static int hf_woww_player_chat_tag;
+static int hf_woww_player_is_saved_to_a_raid;
+static int hf_woww_player_name;
+static int hf_woww_player_rank;
+static int hf_woww_player_with_killing_blow;
+static int hf_woww_point_map_id;
+static int hf_woww_point_opt;
+static int hf_woww_position;
+static int hf_woww_position_x;
+static int hf_woww_position_x_int;
+static int hf_woww_position_y;
+static int hf_woww_position_y_int;
+static int hf_woww_power;
+static int hf_woww_price;
+static int hf_woww_probability;
+static int hf_woww_public_key;
+static int hf_woww_public_note;
+static int hf_woww_pvp_corpse;
+static int hf_woww_pvp_rank;
+static int hf_woww_query;
+static int hf_woww_quest_completable;
+static int hf_woww_quest_failed_reason;
+static int hf_woww_quest_flags;
+static int hf_woww_quest_giver_status;
+static int hf_woww_quest_icon;
+static int hf_woww_quest_id;
+static int hf_woww_quest_level;
+static int hf_woww_quest_method;
+static int hf_woww_quest_party_message;
+static int hf_woww_quest_title;
+static int hf_woww_quest_type;
+static int hf_woww_question_id;
+static int hf_woww_queue_position;
+static int hf_woww_queue_slot;
+static int hf_woww_race;
+static int hf_woww_race_mask;
+static int hf_woww_racial_leader;
+static int hf_woww_rage;
+static int hf_woww_raid_group_error;
+static int hf_woww_raid_instance_message;
+static int hf_woww_raid_target_index;
+static int hf_woww_raid_target_update_type;
+static int hf_woww_random_property;
+static int hf_woww_random_property_id;
+static int hf_woww_ranged_range_modification;
+static int hf_woww_rank;
+static int hf_woww_rank_id;
+static int hf_woww_rank_name;
+static int hf_woww_rank_names;
+static int hf_woww_rank_progress_bar;
+static int hf_woww_raw_data;
+static int hf_woww_read_by_gm;
+static int hf_woww_realm_name;
+static int hf_woww_receiver;
+static int hf_woww_records;
+static int hf_woww_reputation_objective_value;
+static int hf_woww_reputation_rank;
+static int hf_woww_request_items_text;
+static int hf_woww_requested_rank;
+static int hf_woww_required_city_rank;
+static int hf_woww_required_faction_rank;
+static int hf_woww_required_honor_rank;
+static int hf_woww_required_item_count;
+static int hf_woww_required_item_id;
+static int hf_woww_required_kill_count;
+static int hf_woww_required_level;
+static int hf_woww_required_money;
+static int hf_woww_required_opposite_reputation_value;
+static int hf_woww_required_skill_rank;
+static int hf_woww_required_skill_value;
+static int hf_woww_required_spell;
+static int hf_woww_required_spell_focus;
+static int hf_woww_required_spells;
+static int hf_woww_reserved_for_future_use;
+static int hf_woww_reset_time;
+static int hf_woww_resist;
+static int hf_woww_resisted;
+static int hf_woww_reward;
+static int hf_woww_reward_spell;
+static int hf_woww_reward_spell_cast;
+static int hf_woww_rights;
+static int hf_woww_roll_number;
+static int hf_woww_roll_vote;
+static int hf_woww_round_time_in_ms;
+static int hf_woww_running_speed;
+static int hf_woww_scale;
+static int hf_woww_search_strings;
+static int hf_woww_searched_name;
+static int hf_woww_self_player;
+static int hf_woww_sell_item_result;
+static int hf_woww_sell_price;
+static int hf_woww_sender;
+static int hf_woww_sender_id;
+static int hf_woww_sender_name;
+static int hf_woww_sequence_id;
+static int hf_woww_server_id;
+static int hf_woww_server_message_type;
+static int hf_woww_server_seed;
+static int hf_woww_set_assistant;
+static int hf_woww_shadow_resistance;
+static int hf_woww_sheath_state;
+static int hf_woww_sheathe_type;
+static int hf_woww_show_affiliation;
+static int hf_woww_signer;
+static int hf_woww_simple_spell_cast_result;
+static int hf_woww_sin_angle;
+static int hf_woww_size_struct;
+static int hf_woww_skill;
+static int hf_woww_skin;
+static int hf_woww_skin_color;
+static int hf_woww_slot;
+static int hf_woww_slot_id;
+static int hf_woww_slot_index;
+static int hf_woww_sound_id;
+static int hf_woww_source_bag;
+static int hf_woww_source_item_id;
+static int hf_woww_source_node;
+static int hf_woww_source_slot;
+static int hf_woww_speech_bubble_credit;
+static int hf_woww_speed;
+static int hf_woww_spell;
+static int hf_woww_spell_art_kit;
+static int hf_woww_spell_cast_result;
+static int hf_woww_spell_cast_target_flags;
+static int hf_woww_spell_category;
+static int hf_woww_spell_category_cooldown;
+static int hf_woww_spell_charges;
+static int hf_woww_spell_cooldown;
+static int hf_woww_spell_cost;
+static int hf_woww_spell_count;
+static int hf_woww_spell_data_id;
+static int hf_woww_spell_effect;
+static int hf_woww_spell_id;
+static int hf_woww_spell_index;
+static int hf_woww_spell_miss_info;
+static int hf_woww_spell_on_lowest_slot;
+static int hf_woww_spell_school;
+static int hf_woww_spell_school_mask;
+static int hf_woww_spell_trigger_type;
+static int hf_woww_spell_visual_kit;
+static int hf_woww_spells;
+static int hf_woww_spirit;
+static int hf_woww_spirit_released;
+static int hf_woww_spline_elevation;
+static int hf_woww_spline_flag;
+static int hf_woww_spline_id;
+static int hf_woww_stable_master;
+static int hf_woww_stable_result;
+static int hf_woww_stable_slots;
+static int hf_woww_stack_count;
+static int hf_woww_stackable;
+static int hf_woww_stamina;
+static int hf_woww_standing;
+static int hf_woww_start_bid;
+static int hf_woww_start_from_page;
+static int hf_woww_start_quest;
+static int hf_woww_starting_bid;
+static int hf_woww_state;
+static int hf_woww_stationery;
+static int hf_woww_status;
+static int hf_woww_status_id;
+static int hf_woww_strength;
+static int hf_woww_string;
+static int hf_woww_sub_name;
+static int hf_woww_subject;
+static int hf_woww_suggestion;
+static int hf_woww_summoner;
+static int hf_woww_survey_id;
+static int hf_woww_swap_with_name;
+static int hf_woww_swimming_speed;
+static int hf_woww_talent;
+static int hf_woww_talent_point_cost;
+static int hf_woww_talent_reset_cost;
+static int hf_woww_target;
+static int hf_woww_target_error;
+static int hf_woww_target_player;
+static int hf_woww_target_string;
+static int hf_woww_targets;
+static int hf_woww_taxi_mask_node_known;
+static int hf_woww_text;
+static int hf_woww_text_emote;
+static int hf_woww_text_id;
+static int hf_woww_texts;
+static int hf_woww_this_week_honor;
+static int hf_woww_this_week_honorable;
+static int hf_woww_time;
+static int hf_woww_time_in_queue_in_ms;
+static int hf_woww_time_left;
+static int hf_woww_time_offline;
+static int hf_woww_time_passed;
+static int hf_woww_time_remaining;
+static int hf_woww_time_skipped;
+static int hf_woww_time_to_bg_autoleave_in_ms;
+static int hf_woww_time_to_bg_start_in_ms;
+static int hf_woww_time_to_remove_in_queue_in_ms;
+static int hf_woww_timer;
+static int hf_woww_timer_type;
+static int hf_woww_timescale;
+static int hf_woww_timestamp;
+static int hf_woww_title;
+static int hf_woww_title_text_id;
+static int hf_woww_today_honorable_and_dishonorable;
+static int hf_woww_todo_amount_of_signers;
+static int hf_woww_total_amount_of_auctions;
+static int hf_woww_total_cost;
+static int hf_woww_total_damage;
+static int hf_woww_total_exp;
+static int hf_woww_total_played_time;
+static int hf_woww_trade_item;
+static int hf_woww_trade_slot;
+static int hf_woww_trade_slot_count;
+static int hf_woww_trade_slot_number;
+static int hf_woww_trade_status;
+static int hf_woww_trainer_spell_state;
+static int hf_woww_trainer_type;
+static int hf_woww_training_failure_reason;
+static int hf_woww_transfer_abort_reason;
+static int hf_woww_transport;
+static int hf_woww_transport_guid;
+static int hf_woww_transport_orientation;
+static int hf_woww_transport_progress_in_ms;
+static int hf_woww_trigger_id;
+static int hf_woww_turn_rate;
+static int hf_woww_tutorial_data;
+static int hf_woww_tutorial_flag;
+static int hf_woww_type_flags;
+static int hf_woww_unit_stand_state;
+static int hf_woww_unit_target;
+static int hf_woww_unknown_flags;
+static int hf_woww_unknown_float;
+static int hf_woww_unknown_guid;
+static int hf_woww_unknown_int;
+static int hf_woww_unread_mails;
+static int hf_woww_unused;
+static int hf_woww_update_available_flag;
+static int hf_woww_update_flag;
+static int hf_woww_update_type;
+static int hf_woww_url;
+static int hf_woww_url_info;
+static int hf_woww_usable;
+static int hf_woww_username;
+static int hf_woww_v_cos;
+static int hf_woww_v_sin;
+static int hf_woww_value;
+static int hf_woww_vendor;
+static int hf_woww_vendor_slot;
+static int hf_woww_vertical_speed;
+static int hf_woww_victim;
+static int hf_woww_walking_speed;
+static int hf_woww_weather_change_type;
+static int hf_woww_weather_type;
+static int hf_woww_winning_player;
+static int hf_woww_winning_roll;
+static int hf_woww_wiping_npc;
+static int hf_woww_won;
+static int hf_woww_world_result;
+static int hf_woww_wrapped;
+static int hf_woww_x;
+static int hf_woww_xy_speed;
+static int hf_woww_y;
+static int hf_woww_yesterday_honor;
+static int hf_woww_yesterday_honorable;
+static int hf_woww_z;
+static int hf_woww_z_speed;
+static int hf_woww_zone_or_sort;
+static int hf_woww_zones;
 /* AUTOGENERATED_END_HF */
 
 #define WOWW_CLIENT_TO_SERVER pinfo->srcport > pinfo->destport
@@ -893,9 +893,9 @@ static int hf_woww_zones = -1;
 // _always_ 40 bytes.
 #define WOWW_SESSION_KEY_LENGTH 40
 
-static gint ett_woww = -1;
-static gint ett_message = -1;
-static gint ett_character = -1;
+static gint ett_woww;
+static gint ett_message;
+static gint ett_character;
 
 // Packets that do not have at least a u16 size field and a u16 opcode field are not valid.
 #define WOWW_MIN_LENGTH 4
diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c
index 3360bd22a5..c4a22517be 100644
--- a/epan/dissectors/packet-wps.c
+++ b/epan/dissectors/packet-wps.c
@@ -32,18 +32,18 @@
 void proto_register_wps(void);
 void proto_reg_handoff_wps(void);
 
-static int  hf_eapwps_opcode     = -1;
-static int  hf_eapwps_flags      = -1;
-static int  hf_eapwps_flag_mf    = -1;
-static int  hf_eapwps_flag_lf    = -1;
-static int  hf_eapwps_msglen     = -1;
+static int  hf_eapwps_opcode;
+static int  hf_eapwps_flags;
+static int  hf_eapwps_flag_mf;
+static int  hf_eapwps_flag_lf;
+static int  hf_eapwps_msglen;
 
-static gint ett_eap_wps_attr     = -1;
-static gint ett_eap_wps_flags    = -1;
+static gint ett_eap_wps_attr;
+static gint ett_eap_wps_flags;
 
-static expert_field ei_eapwps_packet_too_short = EI_INIT;
-static expert_field ei_eapwps_fmt_warn_too_long = EI_INIT;
-static expert_field ei_eapwps_fmt_length_warn = EI_INIT;
+static expert_field ei_eapwps_packet_too_short;
+static expert_field ei_eapwps_fmt_warn_too_long;
+static expert_field ei_eapwps_fmt_length_warn;
 
 static dissector_handle_t wps_handle;
 
@@ -282,262 +282,262 @@ static const value_string wps_wfa_ext_multi_ap_profiles_vals[] = {
 };
 #define WFA_OUI             0x0050F204
 
-static int proto_wps = -1;
-
-static int hf_eapwps_tlv_type = -1;
-static int hf_eapwps_tlv_len = -1;
-
-static int hf_eapwps_tlv_ap_channel = -1;
-static int hf_eapwps_tlv_association_state = -1;
-static int hf_eapwps_tlv_authentication_type = -1;
-static int hf_eapwps_tlv_authentication_type_flags = -1;
-static int hf_eapwps_tlv_authentication_type_flags_open = -1;
-static int hf_eapwps_tlv_authentication_type_flags_wpapsk = -1;
-static int hf_eapwps_tlv_authentication_type_flags_shared = -1;
-static int hf_eapwps_tlv_authentication_type_flags_wpa = -1;
-static int hf_eapwps_tlv_authentication_type_flags_wpa2 = -1;
-static int hf_eapwps_tlv_authentication_type_flags_wpa2psk = -1;
-static int hf_eapwps_tlv_authenticator = -1;
-static int hf_eapwps_tlv_config_methods = -1;
-static int hf_eapwps_tlv_config_methods_usba = -1;
-static int hf_eapwps_tlv_config_methods_ethernet = -1;
-static int hf_eapwps_tlv_config_methods_label = -1;
-static int hf_eapwps_tlv_config_methods_display = -1;
-static int hf_eapwps_tlv_config_methods_phy_display = -1;
-static int hf_eapwps_tlv_config_methods_virt_display = -1;
-static int hf_eapwps_tlv_config_methods_nfcext = -1;
-static int hf_eapwps_tlv_config_methods_nfcint = -1;
-static int hf_eapwps_tlv_config_methods_nfcinf = -1;
-static int hf_eapwps_tlv_config_methods_pushbutton = -1;
-static int hf_eapwps_tlv_config_methods_phy_pushbutton = -1;
-static int hf_eapwps_tlv_config_methods_virt_pushbutton = -1;
-static int hf_eapwps_tlv_config_methods_keypad = -1;
-static int hf_eapwps_tlv_configuration_error = -1;
-static int hf_eapwps_tlv_confirmation_url4 = -1;
-static int hf_eapwps_tlv_confirmation_url6 = -1;
-static int hf_eapwps_tlv_connection_type = -1;
-static int hf_eapwps_tlv_connection_type_flags = -1;
-static int hf_eapwps_tlv_connection_type_flags_ess = -1;
-static int hf_eapwps_tlv_connection_type_flags_ibss = -1;
-static int hf_eapwps_tlv_credential = -1;
-static int hf_eapwps_tlv_device_name = -1;
-static int hf_eapwps_tlv_device_password_id = -1;
-static int hf_eapwps_tlv_e_hash1 = -1;
-static int hf_eapwps_tlv_e_hash2 = -1;
-static int hf_eapwps_tlv_e_snonce1 = -1;
-static int hf_eapwps_tlv_e_snonce2 = -1;
-static int hf_eapwps_tlv_encrypted_settings = -1;
-static int hf_eapwps_tlv_encryption_type = -1;
-static int hf_eapwps_tlv_encryption_type_flags = -1;
-static int hf_eapwps_tlv_encryption_type_flags_none = -1;
-static int hf_eapwps_tlv_encryption_type_flags_wep = -1;
-static int hf_eapwps_tlv_encryption_type_flags_tkip = -1;
-static int hf_eapwps_tlv_encryption_type_flags_aes = -1;
-static int hf_eapwps_tlv_enrollee_nonce = -1;
-static int hf_eapwps_tlv_feature_id = -1;
-static int hf_eapwps_tlv_identity = -1;
-static int hf_eapwps_tlv_identity_proof = -1;
-static int hf_eapwps_tlv_key_wrap_authenticator = -1;
-static int hf_eapwps_tlv_key_identifier = -1;
-static int hf_eapwps_tlv_mac_address = -1;
-static int hf_eapwps_tlv_manufacturer = -1;
-static int hf_eapwps_tlv_message_type = -1;
-static int hf_eapwps_tlv_model_name = -1;
-static int hf_eapwps_tlv_model_number = -1;
-static int hf_eapwps_tlv_network_index = -1;
-static int hf_eapwps_tlv_network_key = -1;
-static int hf_eapwps_tlv_network_key_index = -1;
-static int hf_eapwps_tlv_new_device_name = -1;
-static int hf_eapwps_tlv_new_password = -1;
-static int hf_eapwps_tlv_oob_device_password = -1;
-static int hf_eapwps_tlv_os_version = -1;
-static int hf_eapwps_tlv_power_level = -1;
-static int hf_eapwps_tlv_psk_current = -1;
-static int hf_eapwps_tlv_psk_max = -1;
-static int hf_eapwps_tlv_public_key = -1;
-static int hf_eapwps_tlv_radio_enabled = -1;
-static int hf_eapwps_tlv_reboot = -1;
-static int hf_eapwps_tlv_registrar_current = -1;
-static int hf_eapwps_tlv_registrar_established = -1;
-static int hf_eapwps_tlv_registrar_list = -1;
-static int hf_eapwps_tlv_registrar_max = -1;
-static int hf_eapwps_tlv_registrar_nonce = -1;
-static int hf_eapwps_tlv_request_type = -1;
-static int hf_eapwps_tlv_response_type = -1;
-static int hf_eapwps_tlv_rf_bands = -1;
-static int hf_eapwps_tlv_r_hash1 = -1;
-static int hf_eapwps_tlv_r_hash2 = -1;
-static int hf_eapwps_tlv_r_snonce1 = -1;
-static int hf_eapwps_tlv_r_snonce2 = -1;
-static int hf_eapwps_tlv_selected_registrar = -1;
-static int hf_eapwps_tlv_serial_number = -1;
-static int hf_eapwps_tlv_wifi_protected_setup_state = -1;
-static int hf_eapwps_tlv_ssid = -1;
-static int hf_eapwps_tlv_total_networks = -1;
-static int hf_eapwps_tlv_uuid_e = -1;
-static int hf_eapwps_tlv_uuid_r = -1;
-static int hf_eapwps_tlv_vendor_extension = -1;
-static int hf_eapwps_tlv_version = -1;
-static int hf_eapwps_tlv_x509_certificate_request = -1;
-static int hf_eapwps_tlv_x509_certificate = -1;
-static int hf_eapwps_tlv_eap_identity = -1;
-static int hf_eapwps_tlv_message_counter = -1;
-static int hf_eapwps_tlv_public_key_hash = -1;
-static int hf_eapwps_tlv_rekey_key = -1;
-static int hf_eapwps_tlv_key_lifetime = -1;
-static int hf_eapwps_tlv_permitted_config_methods = -1;
-static int hf_eapwps_tlv_permitted_config_methods_usba = -1;
-static int hf_eapwps_tlv_permitted_config_methods_ethernet = -1;
-static int hf_eapwps_tlv_permitted_config_methods_label = -1;
-static int hf_eapwps_tlv_permitted_config_methods_display = -1;
-static int hf_eapwps_tlv_permitted_config_methods_phy_display = -1;
-static int hf_eapwps_tlv_permitted_config_methods_virt_display = -1;
-static int hf_eapwps_tlv_permitted_config_methods_nfcext = -1;
-static int hf_eapwps_tlv_permitted_config_methods_nfcint = -1;
-static int hf_eapwps_tlv_permitted_config_methods_nfcinf = -1;
-static int hf_eapwps_tlv_permitted_config_methods_pushbutton = -1;
-static int hf_eapwps_tlv_permitted_config_methods_phy_pushbutton = -1;
-static int hf_eapwps_tlv_permitted_config_methods_virt_pushbutton = -1;
-static int hf_eapwps_tlv_permitted_config_methods_keypad = -1;
-static int hf_eapwps_tlv_selected_registrar_config_methods = -1;
-static int hf_eapwps_tlv_selected_registrar_config_methods_usba = -1;
-static int hf_eapwps_tlv_selected_registrar_config_methods_ethernet = -1;
-static int hf_eapwps_tlv_selected_registrar_config_methods_label = -1;
-static int hf_eapwps_tlv_selected_registrar_config_methods_display = -1;
-static int hf_eapwps_tlv_selected_registrar_config_methods_phy_display = -1;
-static int hf_eapwps_tlv_selected_registrar_config_methods_virt_display = -1;
-static int hf_eapwps_tlv_selected_registrar_config_methods_nfcext = -1;
-static int hf_eapwps_tlv_selected_registrar_config_methods_nfcint = -1;
-static int hf_eapwps_tlv_selected_registrar_config_methods_nfcinf = -1;
-static int hf_eapwps_tlv_selected_registrar_config_methods_pushbutton = -1;
-static int hf_eapwps_tlv_selected_registrar_config_methods_phy_pushbutton = -1;
-static int hf_eapwps_tlv_selected_registrar_config_methods_virt_pushbutton = -1;
-static int hf_eapwps_tlv_selected_registrar_config_methods_keypad = -1;
-static int hf_eapwps_tlv_primary_device_type = -1;
-static int hf_eapwps_tlv_primary_device_type_category = -1;
+static int proto_wps;
+
+static int hf_eapwps_tlv_type;
+static int hf_eapwps_tlv_len;
+
+static int hf_eapwps_tlv_ap_channel;
+static int hf_eapwps_tlv_association_state;
+static int hf_eapwps_tlv_authentication_type;
+static int hf_eapwps_tlv_authentication_type_flags;
+static int hf_eapwps_tlv_authentication_type_flags_open;
+static int hf_eapwps_tlv_authentication_type_flags_wpapsk;
+static int hf_eapwps_tlv_authentication_type_flags_shared;
+static int hf_eapwps_tlv_authentication_type_flags_wpa;
+static int hf_eapwps_tlv_authentication_type_flags_wpa2;
+static int hf_eapwps_tlv_authentication_type_flags_wpa2psk;
+static int hf_eapwps_tlv_authenticator;
+static int hf_eapwps_tlv_config_methods;
+static int hf_eapwps_tlv_config_methods_usba;
+static int hf_eapwps_tlv_config_methods_ethernet;
+static int hf_eapwps_tlv_config_methods_label;
+static int hf_eapwps_tlv_config_methods_display;
+static int hf_eapwps_tlv_config_methods_phy_display;
+static int hf_eapwps_tlv_config_methods_virt_display;
+static int hf_eapwps_tlv_config_methods_nfcext;
+static int hf_eapwps_tlv_config_methods_nfcint;
+static int hf_eapwps_tlv_config_methods_nfcinf;
+static int hf_eapwps_tlv_config_methods_pushbutton;
+static int hf_eapwps_tlv_config_methods_phy_pushbutton;
+static int hf_eapwps_tlv_config_methods_virt_pushbutton;
+static int hf_eapwps_tlv_config_methods_keypad;
+static int hf_eapwps_tlv_configuration_error;
+static int hf_eapwps_tlv_confirmation_url4;
+static int hf_eapwps_tlv_confirmation_url6;
+static int hf_eapwps_tlv_connection_type;
+static int hf_eapwps_tlv_connection_type_flags;
+static int hf_eapwps_tlv_connection_type_flags_ess;
+static int hf_eapwps_tlv_connection_type_flags_ibss;
+static int hf_eapwps_tlv_credential;
+static int hf_eapwps_tlv_device_name;
+static int hf_eapwps_tlv_device_password_id;
+static int hf_eapwps_tlv_e_hash1;
+static int hf_eapwps_tlv_e_hash2;
+static int hf_eapwps_tlv_e_snonce1;
+static int hf_eapwps_tlv_e_snonce2;
+static int hf_eapwps_tlv_encrypted_settings;
+static int hf_eapwps_tlv_encryption_type;
+static int hf_eapwps_tlv_encryption_type_flags;
+static int hf_eapwps_tlv_encryption_type_flags_none;
+static int hf_eapwps_tlv_encryption_type_flags_wep;
+static int hf_eapwps_tlv_encryption_type_flags_tkip;
+static int hf_eapwps_tlv_encryption_type_flags_aes;
+static int hf_eapwps_tlv_enrollee_nonce;
+static int hf_eapwps_tlv_feature_id;
+static int hf_eapwps_tlv_identity;
+static int hf_eapwps_tlv_identity_proof;
+static int hf_eapwps_tlv_key_wrap_authenticator;
+static int hf_eapwps_tlv_key_identifier;
+static int hf_eapwps_tlv_mac_address;
+static int hf_eapwps_tlv_manufacturer;
+static int hf_eapwps_tlv_message_type;
+static int hf_eapwps_tlv_model_name;
+static int hf_eapwps_tlv_model_number;
+static int hf_eapwps_tlv_network_index;
+static int hf_eapwps_tlv_network_key;
+static int hf_eapwps_tlv_network_key_index;
+static int hf_eapwps_tlv_new_device_name;
+static int hf_eapwps_tlv_new_password;
+static int hf_eapwps_tlv_oob_device_password;
+static int hf_eapwps_tlv_os_version;
+static int hf_eapwps_tlv_power_level;
+static int hf_eapwps_tlv_psk_current;
+static int hf_eapwps_tlv_psk_max;
+static int hf_eapwps_tlv_public_key;
+static int hf_eapwps_tlv_radio_enabled;
+static int hf_eapwps_tlv_reboot;
+static int hf_eapwps_tlv_registrar_current;
+static int hf_eapwps_tlv_registrar_established;
+static int hf_eapwps_tlv_registrar_list;
+static int hf_eapwps_tlv_registrar_max;
+static int hf_eapwps_tlv_registrar_nonce;
+static int hf_eapwps_tlv_request_type;
+static int hf_eapwps_tlv_response_type;
+static int hf_eapwps_tlv_rf_bands;
+static int hf_eapwps_tlv_r_hash1;
+static int hf_eapwps_tlv_r_hash2;
+static int hf_eapwps_tlv_r_snonce1;
+static int hf_eapwps_tlv_r_snonce2;
+static int hf_eapwps_tlv_selected_registrar;
+static int hf_eapwps_tlv_serial_number;
+static int hf_eapwps_tlv_wifi_protected_setup_state;
+static int hf_eapwps_tlv_ssid;
+static int hf_eapwps_tlv_total_networks;
+static int hf_eapwps_tlv_uuid_e;
+static int hf_eapwps_tlv_uuid_r;
+static int hf_eapwps_tlv_vendor_extension;
+static int hf_eapwps_tlv_version;
+static int hf_eapwps_tlv_x509_certificate_request;
+static int hf_eapwps_tlv_x509_certificate;
+static int hf_eapwps_tlv_eap_identity;
+static int hf_eapwps_tlv_message_counter;
+static int hf_eapwps_tlv_public_key_hash;
+static int hf_eapwps_tlv_rekey_key;
+static int hf_eapwps_tlv_key_lifetime;
+static int hf_eapwps_tlv_permitted_config_methods;
+static int hf_eapwps_tlv_permitted_config_methods_usba;
+static int hf_eapwps_tlv_permitted_config_methods_ethernet;
+static int hf_eapwps_tlv_permitted_config_methods_label;
+static int hf_eapwps_tlv_permitted_config_methods_display;
+static int hf_eapwps_tlv_permitted_config_methods_phy_display;
+static int hf_eapwps_tlv_permitted_config_methods_virt_display;
+static int hf_eapwps_tlv_permitted_config_methods_nfcext;
+static int hf_eapwps_tlv_permitted_config_methods_nfcint;
+static int hf_eapwps_tlv_permitted_config_methods_nfcinf;
+static int hf_eapwps_tlv_permitted_config_methods_pushbutton;
+static int hf_eapwps_tlv_permitted_config_methods_phy_pushbutton;
+static int hf_eapwps_tlv_permitted_config_methods_virt_pushbutton;
+static int hf_eapwps_tlv_permitted_config_methods_keypad;
+static int hf_eapwps_tlv_selected_registrar_config_methods;
+static int hf_eapwps_tlv_selected_registrar_config_methods_usba;
+static int hf_eapwps_tlv_selected_registrar_config_methods_ethernet;
+static int hf_eapwps_tlv_selected_registrar_config_methods_label;
+static int hf_eapwps_tlv_selected_registrar_config_methods_display;
+static int hf_eapwps_tlv_selected_registrar_config_methods_phy_display;
+static int hf_eapwps_tlv_selected_registrar_config_methods_virt_display;
+static int hf_eapwps_tlv_selected_registrar_config_methods_nfcext;
+static int hf_eapwps_tlv_selected_registrar_config_methods_nfcint;
+static int hf_eapwps_tlv_selected_registrar_config_methods_nfcinf;
+static int hf_eapwps_tlv_selected_registrar_config_methods_pushbutton;
+static int hf_eapwps_tlv_selected_registrar_config_methods_phy_pushbutton;
+static int hf_eapwps_tlv_selected_registrar_config_methods_virt_pushbutton;
+static int hf_eapwps_tlv_selected_registrar_config_methods_keypad;
+static int hf_eapwps_tlv_primary_device_type;
+static int hf_eapwps_tlv_primary_device_type_category;
 #define WPS_DEVICE_TYPE_CATEGORY_MAX 11
 static int hf_eapwps_tlv_primary_device_type_subcategory[WPS_DEVICE_TYPE_CATEGORY_MAX];
-static int hf_eapwps_tlv_secondary_device_type_list = -1;
-static int hf_eapwps_tlv_portable_device = -1;
-static int hf_eapwps_tlv_ap_setup_locked = -1;
-static int hf_eapwps_tlv_application_extension = -1;
-static int hf_eapwps_tlv_eap_type = -1;
-static int hf_eapwps_tlv_initialization_vector = -1;
-static int hf_eapwps_tlv_key_provided_automatically = -1;
-static int hf_eapwps_tlv_8021x_enabled = -1;
-static int hf_eapwps_tlv_appsessionkey = -1;
-static int hf_eapwps_tlv_weptransmitkey = -1;
-static int hf_eapwps_tlv_requested_dev_type = -1;
-
-static int hf_eapwps_vendor_id = -1;
-static int hf_eapwps_wfa_ext_id = -1;
-static int hf_eapwps_wfa_ext_len = -1;
-
-static int hf_eapwps_wfa_ext_version2 = -1;
-static int hf_eapwps_wfa_ext_authorizedmacs = -1;
-static int hf_eapwps_wfa_ext_network_key_shareable = -1;
-static int hf_eapwps_wfa_ext_request_to_enroll = -1;
-static int hf_eapwps_wfa_ext_settings_delay_time = -1;
-static int hf_multi_ap_backhaul_sta = -1;
-static int hf_multi_ap_backhaul_bss = -1;
-static int hf_multi_ap_fronthaul_bss = -1;
-static int hf_multi_ap_teardown_bsses = -1;
-static int hf_multi_ap_profile1_backhaul_sta_assoc_disallowed = -1;
-static int hf_multi_ap_profile2_backhaul_sta_assoc_disallowed = -1;
-static int hf_multi_ap_reserved = -1;
-static int hf_multi_ap_flags = -1;
-static int hf_multi_ap_profiles = -1;
-static int hf_multi_ap_8021q = -1;
-
-static gint ett_wps_tlv = -1;
-static gint ett_eap_wps_ap_channel = -1;
-static gint ett_eap_wps_association_state = -1;
-static gint ett_eap_wps_authentication_type = -1;
-static gint ett_eap_wps_authentication_type_flags = -1;
-static gint ett_eap_wps_authenticator = -1;
-static gint ett_eap_wps_config_methods = -1;
-static gint ett_eap_wps_configuration_error = -1;
-static gint ett_eap_wps_confirmation_url4 = -1;
-static gint ett_eap_wps_confirmation_url6 = -1;
-static gint ett_eap_wps_connection_type = -1;
-static gint ett_eap_wps_connection_type_flags = -1;
-static gint ett_eap_wps_credential = -1;
-static gint ett_eap_wps_device_name = -1;
-static gint ett_eap_wps_device_password_id = -1;
-static gint ett_eap_wps_e_hash1 = -1;
-static gint ett_eap_wps_e_hash2 = -1;
-static gint ett_eap_wps_e_snonce1 = -1;
-static gint ett_eap_wps_e_snonce2 = -1;
-static gint ett_eap_wps_encrypted_settings = -1;
-static gint ett_eap_wps_encryption_type = -1;
-static gint ett_eap_wps_encryption_type_flags = -1;
-static gint ett_eap_wps_enrollee_nonce = -1;
-static gint ett_eap_wps_feature_id = -1;
-static gint ett_eap_wps_identity = -1;
-static gint ett_eap_wps_identity_proof = -1;
-static gint ett_eap_wps_key_wrap_authenticator = -1;
-static gint ett_eap_wps_key_identifier = -1;
-static gint ett_eap_wps_mac_address = -1;
-static gint ett_eap_wps_manufacturer = -1;
-static gint ett_eap_wps_message_type = -1;
-static gint ett_eap_wps_model_name = -1;
-static gint ett_eap_wps_model_number = -1;
-static gint ett_eap_wps_network_index = -1;
-static gint ett_eap_wps_network_key = -1;
-static gint ett_eap_wps_network_key_index = -1;
-static gint ett_eap_wps_new_device_name = -1;
-static gint ett_eap_wps_new_password = -1;
-static gint ett_eap_wps_oob_device_password = -1;
-static gint ett_eap_wps_os_version = -1;
-static gint ett_eap_wps_power_level = -1;
-static gint ett_eap_wps_psk_current = -1;
-static gint ett_eap_wps_psk_max = -1;
-static gint ett_eap_wps_public_key = -1;
-static gint ett_eap_wps_radio_enabled = -1;
-static gint ett_eap_wps_reboot = -1;
-static gint ett_eap_wps_registrar_current = -1;
-static gint ett_eap_wps_registrar_established = -1;
-static gint ett_eap_wps_registrar_list = -1;
-static gint ett_eap_wps_registrar_max = -1;
-static gint ett_eap_wps_registrar_nonce = -1;
-static gint ett_eap_wps_request_type = -1;
-static gint ett_eap_wps_response_type = -1;
-static gint ett_eap_wps_rf_bands = -1;
-static gint ett_eap_wps_r_hash1 = -1;
-static gint ett_eap_wps_r_hash2 = -1;
-static gint ett_eap_wps_r_snonce1 = -1;
-static gint ett_eap_wps_r_snonce2 = -1;
-static gint ett_eap_wps_selected_registrar = -1;
-static gint ett_eap_wps_serial_number = -1;
-static gint ett_eap_wps_wifi_protected_setup_state = -1;
-static gint ett_eap_wps_ssid = -1;
-static gint ett_eap_wps_total_networks = -1;
-static gint ett_eap_wps_uuid_e = -1;
-static gint ett_eap_wps_uuid_r = -1;
-static gint ett_eap_wps_vendor_extension = -1;
-static gint ett_eap_wps_version = -1;
-static gint ett_eap_wps_x509_certificate_request = -1;
-static gint ett_eap_wps_x509_certificate = -1;
-static gint ett_eap_wps_eap_identity = -1;
-static gint ett_eap_wps_message_counter = -1;
-static gint ett_eap_wps_public_key_hash = -1;
-static gint ett_eap_wps_rekey_key = -1;
-static gint ett_eap_wps_key_lifetime = -1;
-static gint ett_eap_wps_permitted_config_methods = -1;
-static gint ett_eap_wps_selected_registrar_config_methods = -1;
-static gint ett_eap_wps_primary_device_type = -1;
-static gint ett_eap_wps_secondary_device_type_list = -1;
-static gint ett_eap_wps_portable_device = -1;
-static gint ett_eap_wps_ap_setup_locked = -1;
-static gint ett_eap_wps_application_extension = -1;
-static gint ett_eap_wps_eap_type = -1;
-static gint ett_eap_wps_initialization_vector = -1;
-static gint ett_eap_wps_key_provided_automatically = -1;
-static gint ett_eap_wps_8021x_enabled = -1;
-static gint ett_eap_wps_appsessionkey = -1;
-static gint ett_eap_wps_weptransmitkey = -1;
-static gint ett_wps_wfa_ext = -1;
-static gint ett_multi_ap_flags = -1;
+static int hf_eapwps_tlv_secondary_device_type_list;
+static int hf_eapwps_tlv_portable_device;
+static int hf_eapwps_tlv_ap_setup_locked;
+static int hf_eapwps_tlv_application_extension;
+static int hf_eapwps_tlv_eap_type;
+static int hf_eapwps_tlv_initialization_vector;
+static int hf_eapwps_tlv_key_provided_automatically;
+static int hf_eapwps_tlv_8021x_enabled;
+static int hf_eapwps_tlv_appsessionkey;
+static int hf_eapwps_tlv_weptransmitkey;
+static int hf_eapwps_tlv_requested_dev_type;
+
+static int hf_eapwps_vendor_id;
+static int hf_eapwps_wfa_ext_id;
+static int hf_eapwps_wfa_ext_len;
+
+static int hf_eapwps_wfa_ext_version2;
+static int hf_eapwps_wfa_ext_authorizedmacs;
+static int hf_eapwps_wfa_ext_network_key_shareable;
+static int hf_eapwps_wfa_ext_request_to_enroll;
+static int hf_eapwps_wfa_ext_settings_delay_time;
+static int hf_multi_ap_backhaul_sta;
+static int hf_multi_ap_backhaul_bss;
+static int hf_multi_ap_fronthaul_bss;
+static int hf_multi_ap_teardown_bsses;
+static int hf_multi_ap_profile1_backhaul_sta_assoc_disallowed;
+static int hf_multi_ap_profile2_backhaul_sta_assoc_disallowed;
+static int hf_multi_ap_reserved;
+static int hf_multi_ap_flags;
+static int hf_multi_ap_profiles;
+static int hf_multi_ap_8021q;
+
+static gint ett_wps_tlv;
+static gint ett_eap_wps_ap_channel;
+static gint ett_eap_wps_association_state;
+static gint ett_eap_wps_authentication_type;
+static gint ett_eap_wps_authentication_type_flags;
+static gint ett_eap_wps_authenticator;
+static gint ett_eap_wps_config_methods;
+static gint ett_eap_wps_configuration_error;
+static gint ett_eap_wps_confirmation_url4;
+static gint ett_eap_wps_confirmation_url6;
+static gint ett_eap_wps_connection_type;
+static gint ett_eap_wps_connection_type_flags;
+static gint ett_eap_wps_credential;
+static gint ett_eap_wps_device_name;
+static gint ett_eap_wps_device_password_id;
+static gint ett_eap_wps_e_hash1;
+static gint ett_eap_wps_e_hash2;
+static gint ett_eap_wps_e_snonce1;
+static gint ett_eap_wps_e_snonce2;
+static gint ett_eap_wps_encrypted_settings;
+static gint ett_eap_wps_encryption_type;
+static gint ett_eap_wps_encryption_type_flags;
+static gint ett_eap_wps_enrollee_nonce;
+static gint ett_eap_wps_feature_id;
+static gint ett_eap_wps_identity;
+static gint ett_eap_wps_identity_proof;
+static gint ett_eap_wps_key_wrap_authenticator;
+static gint ett_eap_wps_key_identifier;
+static gint ett_eap_wps_mac_address;
+static gint ett_eap_wps_manufacturer;
+static gint ett_eap_wps_message_type;
+static gint ett_eap_wps_model_name;
+static gint ett_eap_wps_model_number;
+static gint ett_eap_wps_network_index;
+static gint ett_eap_wps_network_key;
+static gint ett_eap_wps_network_key_index;
+static gint ett_eap_wps_new_device_name;
+static gint ett_eap_wps_new_password;
+static gint ett_eap_wps_oob_device_password;
+static gint ett_eap_wps_os_version;
+static gint ett_eap_wps_power_level;
+static gint ett_eap_wps_psk_current;
+static gint ett_eap_wps_psk_max;
+static gint ett_eap_wps_public_key;
+static gint ett_eap_wps_radio_enabled;
+static gint ett_eap_wps_reboot;
+static gint ett_eap_wps_registrar_current;
+static gint ett_eap_wps_registrar_established;
+static gint ett_eap_wps_registrar_list;
+static gint ett_eap_wps_registrar_max;
+static gint ett_eap_wps_registrar_nonce;
+static gint ett_eap_wps_request_type;
+static gint ett_eap_wps_response_type;
+static gint ett_eap_wps_rf_bands;
+static gint ett_eap_wps_r_hash1;
+static gint ett_eap_wps_r_hash2;
+static gint ett_eap_wps_r_snonce1;
+static gint ett_eap_wps_r_snonce2;
+static gint ett_eap_wps_selected_registrar;
+static gint ett_eap_wps_serial_number;
+static gint ett_eap_wps_wifi_protected_setup_state;
+static gint ett_eap_wps_ssid;
+static gint ett_eap_wps_total_networks;
+static gint ett_eap_wps_uuid_e;
+static gint ett_eap_wps_uuid_r;
+static gint ett_eap_wps_vendor_extension;
+static gint ett_eap_wps_version;
+static gint ett_eap_wps_x509_certificate_request;
+static gint ett_eap_wps_x509_certificate;
+static gint ett_eap_wps_eap_identity;
+static gint ett_eap_wps_message_counter;
+static gint ett_eap_wps_public_key_hash;
+static gint ett_eap_wps_rekey_key;
+static gint ett_eap_wps_key_lifetime;
+static gint ett_eap_wps_permitted_config_methods;
+static gint ett_eap_wps_selected_registrar_config_methods;
+static gint ett_eap_wps_primary_device_type;
+static gint ett_eap_wps_secondary_device_type_list;
+static gint ett_eap_wps_portable_device;
+static gint ett_eap_wps_ap_setup_locked;
+static gint ett_eap_wps_application_extension;
+static gint ett_eap_wps_eap_type;
+static gint ett_eap_wps_initialization_vector;
+static gint ett_eap_wps_key_provided_automatically;
+static gint ett_eap_wps_8021x_enabled;
+static gint ett_eap_wps_appsessionkey;
+static gint ett_eap_wps_weptransmitkey;
+static gint ett_wps_wfa_ext;
+static gint ett_multi_ap_flags;
 
 static const value_string eapwps_tlv_association_state_vals[] = {
   { 0, "Not associated" },
diff --git a/epan/dissectors/packet-wreth.c b/epan/dissectors/packet-wreth.c
index 366d928156..a6a2910394 100644
--- a/epan/dissectors/packet-wreth.c
+++ b/epan/dissectors/packet-wreth.c
@@ -67,115 +67,115 @@ static gint WrethCodefEquipmentInfoDissection(tvbuff_t *tvb, guint8 Offset, pack
 static gint wreth_proto = -1;
 
 /* static gint wreth_mail_proto = -1; */
-static int hf_Wreth_Subtype = -1;
-static int hf_Wreth_Size = -1;
-static int hf_Wreth_FunctionCode = -1;
-static int hf_Wreth_FrameId = -1;
-static int hf_Wreth_ErrorCode = -1;
-static int hf_Wreth_Fragmented = -1;
-static int hf_Wreth_Retry = -1;
-static int hf_Wreth_IdentificationBiosVersion = -1;
-static int hf_Wreth_IdentificationBoardNumber = -1;
-static int hf_Wreth_IdentificationProtocolVersion = -1;
-static int hf_Wreth_IdentificationBoardId = -1;
-static int hf_Wreth_IdentificationState = -1;
-static int hf_Wreth_IdentificationMacAddr = -1;
-static int hf_Wreth_ConnectProtocolVersion = -1;
-static int hf_Wreth_ConnectTimeout = -1;
-static int hf_Wreth_BlinkyPeriod = -1;
-static int hf_Wreth_GetValueVal = -1;
-static int hf_Wreth_SetValueVal = -1;
-static int hf_Wreth_BoostValue = -1;
-static int hf_Wreth_MailDestTic = -1;
-static int hf_Wreth_MailReserved = -1;
-static int hf_Wreth_Mail_Codef = -1;
-static int hf_Wreth_Mail_Status = -1;
-static int hf_Wreth_Mail_TicUser_Root = -1;
-static int hf_Wreth_Mail_PidUser = -1;
-static int hf_Wreth_Mail_Mode = -1;
-static int hf_Wreth_Mail_Time = -1;
-static int hf_Wreth_Mail_Stop = -1;
-static int hf_Wreth_Mail_Nfonc = -1;
-static int hf_Wreth_Mail_Ncard = -1;
-static int hf_Wreth_Mail_Nchan = -1;
-static int hf_Wreth_Mail_Nes = -1;
-static int hf_Wreth_Mail_Nb = -1;
-static int hf_Wreth_Mail_TypVar = -1;
-static int hf_Wreth_Mail_Adr = -1;
-static int hf_Wreth_Mail_TicUser_DispCyc = -1;
-static int hf_Wreth_Mail_Nb_Max_Size_Mail = -1;
-static int hf_Wreth_Mail_User_ThreadID = -1;
-static int hf_Wreth_Mail_DispCyc_Version = -1;
-static int hf_Wreth_Mail_DifUserParam = -1;
-static int hf_Wreth_Mail_Filler = -1;
-/* static int hf_Wreth_Mail_Data = -1; */
-static int hf_Wreth_Mail_Mastinf_Version = -1;
-static int hf_Wreth_Mail_Mastinf_Release = -1;
-static int hf_Wreth_Mail_Mastinf_Protocol = -1;
-static int hf_Wreth_Mail_Mastinf_CyclicFlux = -1;
-static int hf_Wreth_Mail_Mastinf_szProtocolName = -1;
-static int hf_Wreth_Mail_Mastinf_MaxTypeEquipment = -1;
-static int hf_Wreth_Mail_Mastinf_MinEquipmentNumber = -1;
-static int hf_Wreth_Mail_Mastinf_MaxEquipmentNumber = -1;
-static int hf_Wreth_Mail_Equinf_Version = -1;
-static int hf_Wreth_Mail_Equinf_Release = -1;
-static int hf_Wreth_Mail_Equinf_Network = -1;
-static int hf_Wreth_Mail_Equinf_Protocol = -1;
-static int hf_Wreth_Mail_Equinf_Messaging = -1;
-static int hf_Wreth_Mail_Equinf_Equipment = -1;
-static int hf_Wreth_Mail_Equinf_Flux = -1;
-static int hf_Wreth_Mail_Equinf_IncWord = -1;
-static int hf_Wreth_Mail_Equinf_IncDWord = -1;
-static int hf_Wreth_Mail_Equinf_IncFWord = -1;
-static int hf_Wreth_Mail_Mastinf_DllItemName = -1;
-static int hf_Wreth_Mail_Mastinf_szEquipmentName = -1;
-static int hf_Wreth_Mail_Equinf_MaxWriteBit = -1;
-static int hf_Wreth_Mail_Equinf_MaxReadBit = -1;
-static int hf_Wreth_Mail_Equinf_BreakBit = -1;
-static int hf_Wreth_Mail_Equinf_MaxWriteIBit = -1;
-static int hf_Wreth_Mail_Equinf_MaxReadIBit = -1;
-static int hf_Wreth_Mail_Equinf_MaxWriteQBit = -1;
-static int hf_Wreth_Mail_Equinf_MaxReadQBit = -1;
-static int hf_Wreth_Mail_Equinf_BreakQBit = -1;
-static int hf_Wreth_Mail_Equinf_MaxWriteByte = -1;
-static int hf_Wreth_Mail_Equinf_MaxReadByte = -1;
-static int hf_Wreth_Mail_Equinf_BreakByte = -1;
-static int hf_Wreth_Mail_Equinf_MaxWriteIByte = -1;
-static int hf_Wreth_Mail_Equinf_MaxReadIByte = -1;
-static int hf_Wreth_Mail_Equinf_BreakIByte = -1;
-static int hf_Wreth_Mail_Equinf_MaxWriteQByte = -1;
-static int hf_Wreth_Mail_Equinf_MaxReadQByte = -1;
-static int hf_Wreth_Mail_Equinf_BreakQByte = -1;
-static int hf_Wreth_Mail_Equinf_MaxWriteWord = -1;
-static int hf_Wreth_Mail_Equinf_MaxReadWord = -1;
-static int hf_Wreth_Mail_Equinf_BreakWord = -1;
-static int hf_Wreth_Mail_Equinf_MaxWriteIWord = -1;
-static int hf_Wreth_Mail_Equinf_MaxReadIWord = -1;
-static int hf_Wreth_Mail_Equinf_BreakIWord = -1;
-static int hf_Wreth_Mail_Equinf_MaxWriteQWord = -1;
-static int hf_Wreth_Mail_Equinf_MaxReadQWord = -1;
-static int hf_Wreth_Mail_Equinf_BreakQWord = -1;
-static int hf_Wreth_Mail_Equinf_MaxWriteDWord = -1;
-static int hf_Wreth_Mail_Equinf_MaxReadDWord = -1;
-static int hf_Wreth_Mail_Equinf_BreakDWord = -1;
-static int hf_Wreth_Mail_Equinf_MaxWriteFWord = -1;
-static int hf_Wreth_Mail_Equinf_MaxReadFWord = -1;
-static int hf_Wreth_Mail_Equinf_BreakFWord = -1;
-static int hf_Wreth_Mail_Equinf_ReadFactorWord = -1;
-static int hf_Wreth_Mail_Equinf_ReadFactorIWord = -1;
-static int hf_Wreth_Mail_Equinf_ReadFactorQWord = -1;
-static int hf_Wreth_Mail_Equinf_ReadFactorDWord = -1;
-static int hf_Wreth_Mail_Equinf_ReadFactorFWord = -1;
-static int hf_Wreth_Mail_Equinf_WriteFactorWord = -1;
-static int hf_Wreth_Mail_Equinf_WriteFactorIWord = -1;
-static int hf_Wreth_Mail_Equinf_WriteFactorQWord = -1;
-static int hf_Wreth_Mail_Equinf_WriteFactorDWord = -1;
-static int hf_Wreth_Mail_Equinf_WriteFactorFWord = -1;
-static int hf_Wreth_Mail_Equinf_DataFormat = -1;
-static int hf_Wreth_Mail_Equinf_BreakIBit = -1;
+static int hf_Wreth_Subtype;
+static int hf_Wreth_Size;
+static int hf_Wreth_FunctionCode;
+static int hf_Wreth_FrameId;
+static int hf_Wreth_ErrorCode;
+static int hf_Wreth_Fragmented;
+static int hf_Wreth_Retry;
+static int hf_Wreth_IdentificationBiosVersion;
+static int hf_Wreth_IdentificationBoardNumber;
+static int hf_Wreth_IdentificationProtocolVersion;
+static int hf_Wreth_IdentificationBoardId;
+static int hf_Wreth_IdentificationState;
+static int hf_Wreth_IdentificationMacAddr;
+static int hf_Wreth_ConnectProtocolVersion;
+static int hf_Wreth_ConnectTimeout;
+static int hf_Wreth_BlinkyPeriod;
+static int hf_Wreth_GetValueVal;
+static int hf_Wreth_SetValueVal;
+static int hf_Wreth_BoostValue;
+static int hf_Wreth_MailDestTic;
+static int hf_Wreth_MailReserved;
+static int hf_Wreth_Mail_Codef;
+static int hf_Wreth_Mail_Status;
+static int hf_Wreth_Mail_TicUser_Root;
+static int hf_Wreth_Mail_PidUser;
+static int hf_Wreth_Mail_Mode;
+static int hf_Wreth_Mail_Time;
+static int hf_Wreth_Mail_Stop;
+static int hf_Wreth_Mail_Nfonc;
+static int hf_Wreth_Mail_Ncard;
+static int hf_Wreth_Mail_Nchan;
+static int hf_Wreth_Mail_Nes;
+static int hf_Wreth_Mail_Nb;
+static int hf_Wreth_Mail_TypVar;
+static int hf_Wreth_Mail_Adr;
+static int hf_Wreth_Mail_TicUser_DispCyc;
+static int hf_Wreth_Mail_Nb_Max_Size_Mail;
+static int hf_Wreth_Mail_User_ThreadID;
+static int hf_Wreth_Mail_DispCyc_Version;
+static int hf_Wreth_Mail_DifUserParam;
+static int hf_Wreth_Mail_Filler;
+/* static int hf_Wreth_Mail_Data; */
+static int hf_Wreth_Mail_Mastinf_Version;
+static int hf_Wreth_Mail_Mastinf_Release;
+static int hf_Wreth_Mail_Mastinf_Protocol;
+static int hf_Wreth_Mail_Mastinf_CyclicFlux;
+static int hf_Wreth_Mail_Mastinf_szProtocolName;
+static int hf_Wreth_Mail_Mastinf_MaxTypeEquipment;
+static int hf_Wreth_Mail_Mastinf_MinEquipmentNumber;
+static int hf_Wreth_Mail_Mastinf_MaxEquipmentNumber;
+static int hf_Wreth_Mail_Equinf_Version;
+static int hf_Wreth_Mail_Equinf_Release;
+static int hf_Wreth_Mail_Equinf_Network;
+static int hf_Wreth_Mail_Equinf_Protocol;
+static int hf_Wreth_Mail_Equinf_Messaging;
+static int hf_Wreth_Mail_Equinf_Equipment;
+static int hf_Wreth_Mail_Equinf_Flux;
+static int hf_Wreth_Mail_Equinf_IncWord;
+static int hf_Wreth_Mail_Equinf_IncDWord;
+static int hf_Wreth_Mail_Equinf_IncFWord;
+static int hf_Wreth_Mail_Mastinf_DllItemName;
+static int hf_Wreth_Mail_Mastinf_szEquipmentName;
+static int hf_Wreth_Mail_Equinf_MaxWriteBit;
+static int hf_Wreth_Mail_Equinf_MaxReadBit;
+static int hf_Wreth_Mail_Equinf_BreakBit;
+static int hf_Wreth_Mail_Equinf_MaxWriteIBit;
+static int hf_Wreth_Mail_Equinf_MaxReadIBit;
+static int hf_Wreth_Mail_Equinf_MaxWriteQBit;
+static int hf_Wreth_Mail_Equinf_MaxReadQBit;
+static int hf_Wreth_Mail_Equinf_BreakQBit;
+static int hf_Wreth_Mail_Equinf_MaxWriteByte;
+static int hf_Wreth_Mail_Equinf_MaxReadByte;
+static int hf_Wreth_Mail_Equinf_BreakByte;
+static int hf_Wreth_Mail_Equinf_MaxWriteIByte;
+static int hf_Wreth_Mail_Equinf_MaxReadIByte;
+static int hf_Wreth_Mail_Equinf_BreakIByte;
+static int hf_Wreth_Mail_Equinf_MaxWriteQByte;
+static int hf_Wreth_Mail_Equinf_MaxReadQByte;
+static int hf_Wreth_Mail_Equinf_BreakQByte;
+static int hf_Wreth_Mail_Equinf_MaxWriteWord;
+static int hf_Wreth_Mail_Equinf_MaxReadWord;
+static int hf_Wreth_Mail_Equinf_BreakWord;
+static int hf_Wreth_Mail_Equinf_MaxWriteIWord;
+static int hf_Wreth_Mail_Equinf_MaxReadIWord;
+static int hf_Wreth_Mail_Equinf_BreakIWord;
+static int hf_Wreth_Mail_Equinf_MaxWriteQWord;
+static int hf_Wreth_Mail_Equinf_MaxReadQWord;
+static int hf_Wreth_Mail_Equinf_BreakQWord;
+static int hf_Wreth_Mail_Equinf_MaxWriteDWord;
+static int hf_Wreth_Mail_Equinf_MaxReadDWord;
+static int hf_Wreth_Mail_Equinf_BreakDWord;
+static int hf_Wreth_Mail_Equinf_MaxWriteFWord;
+static int hf_Wreth_Mail_Equinf_MaxReadFWord;
+static int hf_Wreth_Mail_Equinf_BreakFWord;
+static int hf_Wreth_Mail_Equinf_ReadFactorWord;
+static int hf_Wreth_Mail_Equinf_ReadFactorIWord;
+static int hf_Wreth_Mail_Equinf_ReadFactorQWord;
+static int hf_Wreth_Mail_Equinf_ReadFactorDWord;
+static int hf_Wreth_Mail_Equinf_ReadFactorFWord;
+static int hf_Wreth_Mail_Equinf_WriteFactorWord;
+static int hf_Wreth_Mail_Equinf_WriteFactorIWord;
+static int hf_Wreth_Mail_Equinf_WriteFactorQWord;
+static int hf_Wreth_Mail_Equinf_WriteFactorDWord;
+static int hf_Wreth_Mail_Equinf_WriteFactorFWord;
+static int hf_Wreth_Mail_Equinf_DataFormat;
+static int hf_Wreth_Mail_Equinf_BreakIBit;
 
 /* Initialize the subtree pointers */
-static gint ett_wreth = -1;
+static gint ett_wreth;
 
 /* Note: vals are stored as unsigned 32 bit quantities */
 static const value_string tabStatus[] = {
diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c
index 309b00b755..d56e987074 100644
--- a/epan/dissectors/packet-wsmp.c
+++ b/epan/dissectors/packet-wsmp.c
@@ -42,36 +42,36 @@ static const value_string wsmp_elemenid_names[] = {
 
 
 /* Initialize the protocol and registered fields */
-static int proto_wsmp = -1;
-static int hf_wsmp_version = -1;
-static int hf_wsmp_var_len_det = -1;
-static int hf_wsmp_psid = -1;
-static int hf_wsmp_rate = -1;
-static int hf_wsmp_channel = -1;
-static int hf_wsmp_txpower = -1;
-static int hf_wsmp_WAVEid = -1;
-static int hf_wsmp_wsmlength = -1;
-static int hf_wsmp_WSMP_S_data = -1;
-
-static int hf_wsmp_subtype = -1;
-static int hf_wsmp_N_header_opt_ind = -1;
-static int hf_wsmp_version_v3 = -1;
-static int hf_wsmp_no_elements = -1;
-static int hf_wsmp_wave_ie = -1;
-static int hf_wsmp_wave_ie_len = -1;
-static int hf_wsmp_wave_ie_data = -1;
-static int hf_wsmp_tpid = -1;
+static int proto_wsmp;
+static int hf_wsmp_version;
+static int hf_wsmp_var_len_det;
+static int hf_wsmp_psid;
+static int hf_wsmp_rate;
+static int hf_wsmp_channel;
+static int hf_wsmp_txpower;
+static int hf_wsmp_WAVEid;
+static int hf_wsmp_wsmlength;
+static int hf_wsmp_WSMP_S_data;
+
+static int hf_wsmp_subtype;
+static int hf_wsmp_N_header_opt_ind;
+static int hf_wsmp_version_v3;
+static int hf_wsmp_no_elements;
+static int hf_wsmp_wave_ie;
+static int hf_wsmp_wave_ie_len;
+static int hf_wsmp_wave_ie_data;
+static int hf_wsmp_tpid;
 
 /* Initialize the subtree pointers */
-static int ett_wsmp = -1;
-static int ett_wsmdata = -1;
-static int ett_wsmp_n_hdr = -1;
-static int ett_wsmp_t_hdr = -1;
-static int ett_wsmp_ie_ext = -1;
-static int ett_wsmp_ie = -1;
-
-static expert_field ei_wsmp_length_field_err = EI_INIT;
-static expert_field ei_wsmp_psid_invalid = EI_INIT;
+static int ett_wsmp;
+static int ett_wsmdata;
+static int ett_wsmp_n_hdr;
+static int ett_wsmp_t_hdr;
+static int ett_wsmp_ie_ext;
+static int ett_wsmp_ie;
+
+static expert_field ei_wsmp_length_field_err;
+static expert_field ei_wsmp_psid_invalid;
 
 dissector_handle_t IEEE1609dot2_handle;
 
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index 4e7ff93b90..320bf02da6 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -52,322 +52,322 @@ static int wsp_tap = -1;
 
 
 /* File scoped variables for the protocol and registered fields */
-static int proto_wsp                                    = -1;
-static int proto_sir                                    = -1;
+static int proto_wsp;
+static int proto_sir;
 
 /*
  * Initialize the header field pointers
  */
 
 /* WSP header fields and their subfields if available */
-static int hf_hdr_name_value                            = -1;
-static int hf_hdr_name_string                           = -1;
-static int hf_hdr_accept                                = -1;
-static int hf_hdr_accept_charset                        = -1;
-static int hf_hdr_accept_encoding                       = -1;
-static int hf_hdr_accept_language                       = -1;
-static int hf_hdr_accept_ranges                         = -1;
-static int hf_hdr_age                                   = -1;
-static int hf_hdr_allow                                 = -1;
-static int hf_hdr_authorization                         = -1;
-static int hf_hdr_authorization_scheme                  = -1; /* Subfield */
-static int hf_hdr_authorization_user_id                 = -1; /* Subfield */
-static int hf_hdr_authorization_password                = -1; /* Subfield */
-static int hf_hdr_cache_control                         = -1;
-static int hf_hdr_connection                            = -1;
-static int hf_hdr_content_base                          = -1;
-static int hf_hdr_content_encoding                      = -1;
-static int hf_hdr_content_language                      = -1;
-static int hf_hdr_content_length                        = -1;
-static int hf_hdr_content_location                      = -1;
-static int hf_hdr_content_md5                           = -1;
-static int hf_hdr_content_range                         = -1;
-static int hf_hdr_content_range_first_byte_pos          = -1; /* Subfield */
-static int hf_hdr_content_range_entity_length           = -1; /* Subfield */
-static int hf_hdr_content_type                          = -1;
-static int hf_hdr_date                                  = -1;
-static int hf_hdr_etag                                  = -1;
-static int hf_hdr_expires                               = -1;
-static int hf_hdr_from                                  = -1;
-static int hf_hdr_host                                  = -1;
-static int hf_hdr_if_modified_since                     = -1;
-static int hf_hdr_if_match                              = -1;
-static int hf_hdr_if_none_match                         = -1;
-static int hf_hdr_if_range                              = -1;
-static int hf_hdr_if_unmodified_since                   = -1;
-static int hf_hdr_last_modified                         = -1;
-static int hf_hdr_location                              = -1;
-static int hf_hdr_max_forwards                          = -1;
-static int hf_hdr_pragma                                = -1;
-static int hf_hdr_proxy_authenticate                    = -1;
-static int hf_hdr_proxy_authenticate_scheme             = -1; /* Subfield */
-static int hf_hdr_proxy_authenticate_realm              = -1; /* Subfield */
-static int hf_hdr_proxy_authorization                   = -1;
-static int hf_hdr_proxy_authorization_scheme            = -1; /* Subfield */
-static int hf_hdr_proxy_authorization_user_id           = -1; /* Subfield */
-static int hf_hdr_proxy_authorization_password          = -1; /* Subfield */
-static int hf_hdr_public                                = -1;
-static int hf_hdr_range                                 = -1;
-static int hf_hdr_range_first_byte_pos                  = -1; /* Subfield */
-static int hf_hdr_range_last_byte_pos                   = -1; /* Subfield */
-static int hf_hdr_range_suffix_length                   = -1; /* Subfield */
-static int hf_hdr_referer                               = -1;
-static int hf_hdr_retry_after                           = -1;
-static int hf_hdr_server                                = -1;
-static int hf_hdr_transfer_encoding                     = -1;
-static int hf_hdr_upgrade                               = -1;
-static int hf_hdr_user_agent                            = -1;
-static int hf_hdr_vary                                  = -1;
-static int hf_hdr_via                                   = -1;
-static int hf_hdr_warning                               = -1;
-static int hf_hdr_warning_code                          = -1; /* Subfield */
-static int hf_hdr_warning_agent                         = -1; /* Subfield */
-static int hf_hdr_warning_text                          = -1; /* Subfield */
-static int hf_hdr_www_authenticate                      = -1;
-static int hf_hdr_www_authenticate_scheme               = -1; /* Subfield */
-static int hf_hdr_www_authenticate_realm                = -1; /* Subfield */
-static int hf_hdr_content_disposition                   = -1;
-static int hf_hdr_application_id                        = -1;
-static int hf_hdr_content_uri                           = -1;
-static int hf_hdr_initiator_uri                         = -1;
-static int hf_hdr_bearer_indication                     = -1;
-static int hf_hdr_push_flag                             = -1;
-static int hf_hdr_push_flag_auth                        = -1; /* Subfield */
-static int hf_hdr_push_flag_trust                       = -1; /* Subfield */
-static int hf_hdr_push_flag_last                        = -1; /* Subfield */
-static int hf_hdr_profile                               = -1;
-static int hf_hdr_profile_diff                          = -1;
-static int hf_hdr_profile_warning                       = -1;
-static int hf_hdr_expect                                = -1;
-static int hf_hdr_te                                    = -1;
-static int hf_hdr_trailer                               = -1;
-static int hf_hdr_x_wap_tod                             = -1;
-static int hf_hdr_content_id                            = -1;
-static int hf_hdr_set_cookie                            = -1;
-static int hf_hdr_cookie                                = -1;
-static int hf_hdr_encoding_version                      = -1;
-static int hf_hdr_x_wap_security                        = -1;
-static int hf_hdr_x_wap_application_id                  = -1;
-static int hf_hdr_accept_application                    = -1;
+static int hf_hdr_name_value;
+static int hf_hdr_name_string;
+static int hf_hdr_accept;
+static int hf_hdr_accept_charset;
+static int hf_hdr_accept_encoding;
+static int hf_hdr_accept_language;
+static int hf_hdr_accept_ranges;
+static int hf_hdr_age;
+static int hf_hdr_allow;
+static int hf_hdr_authorization;
+static int hf_hdr_authorization_scheme; /* Subfield */
+static int hf_hdr_authorization_user_id; /* Subfield */
+static int hf_hdr_authorization_password; /* Subfield */
+static int hf_hdr_cache_control;
+static int hf_hdr_connection;
+static int hf_hdr_content_base;
+static int hf_hdr_content_encoding;
+static int hf_hdr_content_language;
+static int hf_hdr_content_length;
+static int hf_hdr_content_location;
+static int hf_hdr_content_md5;
+static int hf_hdr_content_range;
+static int hf_hdr_content_range_first_byte_pos; /* Subfield */
+static int hf_hdr_content_range_entity_length; /* Subfield */
+static int hf_hdr_content_type;
+static int hf_hdr_date;
+static int hf_hdr_etag;
+static int hf_hdr_expires;
+static int hf_hdr_from;
+static int hf_hdr_host;
+static int hf_hdr_if_modified_since;
+static int hf_hdr_if_match;
+static int hf_hdr_if_none_match;
+static int hf_hdr_if_range;
+static int hf_hdr_if_unmodified_since;
+static int hf_hdr_last_modified;
+static int hf_hdr_location;
+static int hf_hdr_max_forwards;
+static int hf_hdr_pragma;
+static int hf_hdr_proxy_authenticate;
+static int hf_hdr_proxy_authenticate_scheme; /* Subfield */
+static int hf_hdr_proxy_authenticate_realm; /* Subfield */
+static int hf_hdr_proxy_authorization;
+static int hf_hdr_proxy_authorization_scheme; /* Subfield */
+static int hf_hdr_proxy_authorization_user_id; /* Subfield */
+static int hf_hdr_proxy_authorization_password; /* Subfield */
+static int hf_hdr_public;
+static int hf_hdr_range;
+static int hf_hdr_range_first_byte_pos; /* Subfield */
+static int hf_hdr_range_last_byte_pos; /* Subfield */
+static int hf_hdr_range_suffix_length; /* Subfield */
+static int hf_hdr_referer;
+static int hf_hdr_retry_after;
+static int hf_hdr_server;
+static int hf_hdr_transfer_encoding;
+static int hf_hdr_upgrade;
+static int hf_hdr_user_agent;
+static int hf_hdr_vary;
+static int hf_hdr_via;
+static int hf_hdr_warning;
+static int hf_hdr_warning_code; /* Subfield */
+static int hf_hdr_warning_agent; /* Subfield */
+static int hf_hdr_warning_text; /* Subfield */
+static int hf_hdr_www_authenticate;
+static int hf_hdr_www_authenticate_scheme; /* Subfield */
+static int hf_hdr_www_authenticate_realm; /* Subfield */
+static int hf_hdr_content_disposition;
+static int hf_hdr_application_id;
+static int hf_hdr_content_uri;
+static int hf_hdr_initiator_uri;
+static int hf_hdr_bearer_indication;
+static int hf_hdr_push_flag;
+static int hf_hdr_push_flag_auth; /* Subfield */
+static int hf_hdr_push_flag_trust; /* Subfield */
+static int hf_hdr_push_flag_last; /* Subfield */
+static int hf_hdr_profile;
+static int hf_hdr_profile_diff;
+static int hf_hdr_profile_warning;
+static int hf_hdr_expect;
+static int hf_hdr_te;
+static int hf_hdr_trailer;
+static int hf_hdr_x_wap_tod;
+static int hf_hdr_content_id;
+static int hf_hdr_set_cookie;
+static int hf_hdr_cookie;
+static int hf_hdr_encoding_version;
+static int hf_hdr_x_wap_security;
+static int hf_hdr_x_wap_application_id;
+static int hf_hdr_accept_application;
 
 
 /* Openwave headers */
-static int hf_hdr_openwave_default_int                  = -1;
-static int hf_hdr_openwave_default_string               = -1;
-static int hf_hdr_openwave_default_val_len              = -1;
-static int hf_hdr_openwave_name_value                   = -1;
-static int hf_hdr_openwave_x_up_proxy_operator_domain   = -1;
-static int hf_hdr_openwave_x_up_proxy_home_page         = -1;
-static int hf_hdr_openwave_x_up_proxy_uplink_version    = -1;
-static int hf_hdr_openwave_x_up_proxy_ba_realm          = -1;
-static int hf_hdr_openwave_x_up_proxy_request_uri       = -1;
+static int hf_hdr_openwave_default_int;
+static int hf_hdr_openwave_default_string;
+static int hf_hdr_openwave_default_val_len;
+static int hf_hdr_openwave_name_value;
+static int hf_hdr_openwave_x_up_proxy_operator_domain;
+static int hf_hdr_openwave_x_up_proxy_home_page;
+static int hf_hdr_openwave_x_up_proxy_uplink_version;
+static int hf_hdr_openwave_x_up_proxy_ba_realm;
+static int hf_hdr_openwave_x_up_proxy_request_uri;
 #if 0
-static int hf_hdr_openwave_x_up_proxy_client_id         = -1;
+static int hf_hdr_openwave_x_up_proxy_client_id;
 #endif
-static int hf_hdr_openwave_x_up_proxy_bookmark          = -1;
-static int hf_hdr_openwave_x_up_proxy_push_seq          = -1;
-static int hf_hdr_openwave_x_up_proxy_notify            = -1;
-static int hf_hdr_openwave_x_up_proxy_net_ask           = -1;
-static int hf_hdr_openwave_x_up_proxy_tod               = -1;
-static int hf_hdr_openwave_x_up_proxy_ba_enable         = -1;
-static int hf_hdr_openwave_x_up_proxy_redirect_enable   = -1;
-static int hf_hdr_openwave_x_up_proxy_redirect_status   = -1;
-static int hf_hdr_openwave_x_up_proxy_linger            = -1;
-static int hf_hdr_openwave_x_up_proxy_enable_trust      = -1;
-static int hf_hdr_openwave_x_up_proxy_trust             = -1;
-static int hf_hdr_openwave_x_up_devcap_has_color        = -1;
-static int hf_hdr_openwave_x_up_devcap_num_softkeys     = -1;
-static int hf_hdr_openwave_x_up_devcap_softkey_size     = -1;
-static int hf_hdr_openwave_x_up_devcap_screen_chars     = -1;
-static int hf_hdr_openwave_x_up_devcap_screen_pixels    = -1;
-static int hf_hdr_openwave_x_up_devcap_em_size          = -1;
-static int hf_hdr_openwave_x_up_devcap_screen_depth     = -1;
-static int hf_hdr_openwave_x_up_devcap_immed_alert      = -1;
-static int hf_hdr_openwave_x_up_devcap_gui              = -1;
-static int hf_hdr_openwave_x_up_proxy_trans_charset     = -1;
-static int hf_hdr_openwave_x_up_proxy_push_accept       = -1;
+static int hf_hdr_openwave_x_up_proxy_bookmark;
+static int hf_hdr_openwave_x_up_proxy_push_seq;
+static int hf_hdr_openwave_x_up_proxy_notify;
+static int hf_hdr_openwave_x_up_proxy_net_ask;
+static int hf_hdr_openwave_x_up_proxy_tod;
+static int hf_hdr_openwave_x_up_proxy_ba_enable;
+static int hf_hdr_openwave_x_up_proxy_redirect_enable;
+static int hf_hdr_openwave_x_up_proxy_redirect_status;
+static int hf_hdr_openwave_x_up_proxy_linger;
+static int hf_hdr_openwave_x_up_proxy_enable_trust;
+static int hf_hdr_openwave_x_up_proxy_trust;
+static int hf_hdr_openwave_x_up_devcap_has_color;
+static int hf_hdr_openwave_x_up_devcap_num_softkeys;
+static int hf_hdr_openwave_x_up_devcap_softkey_size;
+static int hf_hdr_openwave_x_up_devcap_screen_chars;
+static int hf_hdr_openwave_x_up_devcap_screen_pixels;
+static int hf_hdr_openwave_x_up_devcap_em_size;
+static int hf_hdr_openwave_x_up_devcap_screen_depth;
+static int hf_hdr_openwave_x_up_devcap_immed_alert;
+static int hf_hdr_openwave_x_up_devcap_gui;
+static int hf_hdr_openwave_x_up_proxy_trans_charset;
+static int hf_hdr_openwave_x_up_proxy_push_accept;
 
 
 /* WSP parameter fields */
-static int hf_parameter_q                               = -1;
-static int hf_parameter_charset                         = -1;
+static int hf_parameter_q;
+static int hf_parameter_charset;
 
 /* Old header fields */
 
-static int hf_wsp_header_tid                            = -1;
-static int hf_wsp_header_pdu_type                       = -1;
-static int hf_wsp_version_major                         = -1;
-static int hf_wsp_version_minor                         = -1;
+static int hf_wsp_header_tid;
+static int hf_wsp_header_pdu_type;
+static int hf_wsp_version_major;
+static int hf_wsp_version_minor;
 /* Session capabilities (CO-WSP) */
-static int hf_capabilities_length                       = -1;
-static int hf_capabilities_section                      = -1;
-static int hf_capa_client_sdu_size                      = -1;
-static int hf_capa_server_sdu_size                      = -1;
-static int hf_capa_protocol_options                     = -1;
-static int hf_capa_protocol_option_confirmed_push       = -1; /* Subfield */
-static int hf_capa_protocol_option_push                 = -1; /* Subfield */
-static int hf_capa_protocol_option_session_resume       = -1; /* Subfield */
-static int hf_capa_protocol_option_ack_headers          = -1; /* Subfield */
-static int hf_capa_protocol_option_large_data_transfer  = -1; /* Subfield */
-static int hf_capa_method_mor                           = -1;
-static int hf_capa_push_mor                             = -1;
-static int hf_capa_extended_method                      = -1;
-static int hf_capa_header_code_page                     = -1;
-static int hf_capa_aliases                              = -1;
-static int hf_capa_client_message_size                  = -1;
-static int hf_capa_server_message_size                  = -1;
-
-static int hf_wsp_header_uri_len                        = -1;
-static int hf_wsp_header_uri                            = -1;
-static int hf_wsp_server_session_id                     = -1;
-static int hf_wsp_header_status                         = -1;
-static int hf_wsp_header_length                         = -1;
-static int hf_wsp_headers_section                       = -1;
-static int hf_wsp_parameter_untype_quote_text           = -1;
-static int hf_wsp_parameter_untype_text                 = -1;
-static int hf_wsp_parameter_untype_int                  = -1;
-static int hf_wsp_parameter_type                        = -1;
-static int hf_wsp_parameter_int_type                    = -1;
-static int hf_wsp_parameter_name                        = -1;
-static int hf_wsp_parameter_filename                    = -1;
-static int hf_wsp_parameter_start                       = -1;
-static int hf_wsp_parameter_start_info                  = -1;
-static int hf_wsp_parameter_comment                     = -1;
-static int hf_wsp_parameter_domain                      = -1;
-static int hf_wsp_parameter_path                        = -1;
-static int hf_wsp_parameter_sec                         = -1;
-static int hf_wsp_parameter_mac                         = -1;
-static int hf_wsp_parameter_upart_type                  = -1;
-static int hf_wsp_parameter_level                       = -1;
-static int hf_wsp_parameter_size                        = -1;
+static int hf_capabilities_length;
+static int hf_capabilities_section;
+static int hf_capa_client_sdu_size;
+static int hf_capa_server_sdu_size;
+static int hf_capa_protocol_options;
+static int hf_capa_protocol_option_confirmed_push; /* Subfield */
+static int hf_capa_protocol_option_push; /* Subfield */
+static int hf_capa_protocol_option_session_resume; /* Subfield */
+static int hf_capa_protocol_option_ack_headers; /* Subfield */
+static int hf_capa_protocol_option_large_data_transfer; /* Subfield */
+static int hf_capa_method_mor;
+static int hf_capa_push_mor;
+static int hf_capa_extended_method;
+static int hf_capa_header_code_page;
+static int hf_capa_aliases;
+static int hf_capa_client_message_size;
+static int hf_capa_server_message_size;
+
+static int hf_wsp_header_uri_len;
+static int hf_wsp_header_uri;
+static int hf_wsp_server_session_id;
+static int hf_wsp_header_status;
+static int hf_wsp_header_length;
+static int hf_wsp_headers_section;
+static int hf_wsp_parameter_untype_quote_text;
+static int hf_wsp_parameter_untype_text;
+static int hf_wsp_parameter_untype_int;
+static int hf_wsp_parameter_type;
+static int hf_wsp_parameter_int_type;
+static int hf_wsp_parameter_name;
+static int hf_wsp_parameter_filename;
+static int hf_wsp_parameter_start;
+static int hf_wsp_parameter_start_info;
+static int hf_wsp_parameter_comment;
+static int hf_wsp_parameter_domain;
+static int hf_wsp_parameter_path;
+static int hf_wsp_parameter_sec;
+static int hf_wsp_parameter_mac;
+static int hf_wsp_parameter_upart_type;
+static int hf_wsp_parameter_level;
+static int hf_wsp_parameter_size;
 #if 0
-static int hf_wsp_reply_data                            = -1;
+static int hf_wsp_reply_data;
 #endif
-static int hf_wsp_post_data                             = -1;
+static int hf_wsp_post_data;
 #if 0
-static int hf_wsp_push_data                             = -1;
-static int hf_wsp_multipart_data                        = -1;
+static int hf_wsp_push_data;
+static int hf_wsp_multipart_data;
 #endif
-static int hf_wsp_mpart                                 = -1;
-static int hf_wsp_header_text_value                     = -1;
-static int hf_wsp_variable_value                        = -1;
-static int hf_wsp_default_int                           = -1;
-static int hf_wsp_default_string                        = -1;
-static int hf_wsp_default_val_len                       = -1;
+static int hf_wsp_mpart;
+static int hf_wsp_header_text_value;
+static int hf_wsp_variable_value;
+static int hf_wsp_default_int;
+static int hf_wsp_default_string;
+static int hf_wsp_default_val_len;
 
 /* Header code page shift sequence */
-static int hf_wsp_header_shift_code                     = -1;
+static int hf_wsp_header_shift_code;
 
 /* WSP Redirect fields */
-static int hf_wsp_redirect_flags                        = -1;
-static int hf_wsp_redirect_permanent                    = -1;
-static int hf_wsp_redirect_reuse_security_session       = -1;
-static int hf_redirect_addresses                        = -1;
+static int hf_wsp_redirect_flags;
+static int hf_wsp_redirect_permanent;
+static int hf_wsp_redirect_reuse_security_session;
+static int hf_redirect_addresses;
 
 /* Address fields */
-static int hf_address_entry                             = -1;
-static int hf_address_flags_length                      = -1;
-static int hf_address_flags_length_bearer_type_included = -1; /* Subfield */
-static int hf_address_flags_length_port_number_included = -1; /* Subfield */
-static int hf_address_flags_length_address_len          = -1; /* Subfield */
-static int hf_address_bearer_type                       = -1;
-static int hf_address_port_num                          = -1;
-static int hf_address_ipv4_addr                         = -1;
-static int hf_address_ipv6_addr                         = -1;
-static int hf_address_addr                              = -1;
+static int hf_address_entry;
+static int hf_address_flags_length;
+static int hf_address_flags_length_bearer_type_included; /* Subfield */
+static int hf_address_flags_length_port_number_included; /* Subfield */
+static int hf_address_flags_length_address_len; /* Subfield */
+static int hf_address_bearer_type;
+static int hf_address_port_num;
+static int hf_address_ipv4_addr;
+static int hf_address_ipv6_addr;
+static int hf_address_addr;
 
 /* Session Initiation Request fields */
-static int hf_sir_section                               = -1;
-static int hf_sir_version                               = -1;
-static int hf_sir_app_id_list_len                       = -1;
-static int hf_sir_app_id_list                           = -1;
-static int hf_sir_wsp_contact_points_len                = -1;
-static int hf_sir_wsp_contact_points                    = -1;
-static int hf_sir_contact_points_len                    = -1;
-static int hf_sir_contact_points                        = -1;
-static int hf_sir_protocol_options_len                  = -1;
-static int hf_sir_protocol_options                      = -1;
-static int hf_sir_prov_url_len                          = -1;
-static int hf_sir_prov_url                              = -1;
-static int hf_sir_cpi_tag_len                           = -1;
-static int hf_sir_cpi_tag                               = -1;
+static int hf_sir_section;
+static int hf_sir_version;
+static int hf_sir_app_id_list_len;
+static int hf_sir_app_id_list;
+static int hf_sir_wsp_contact_points_len;
+static int hf_sir_wsp_contact_points;
+static int hf_sir_contact_points_len;
+static int hf_sir_contact_points;
+static int hf_sir_protocol_options_len;
+static int hf_sir_protocol_options;
+static int hf_sir_prov_url_len;
+static int hf_sir_prov_url;
+static int hf_sir_cpi_tag_len;
+static int hf_sir_cpi_tag;
 
 /*
  * Initialize the subtree pointers
  */
 
 /* WSP tree */
-static int ett_wsp                      = -1;
+static int ett_wsp;
 /* WSP headers tree */
-static int ett_header                   = -1;
+static int ett_header;
 /* WSP header subtree */
-static int ett_headers                  = -1;
-static int ett_wsp_parameter_type       = -1;
-static int ett_content_type_header      = -1;
+static int ett_headers;
+static int ett_wsp_parameter_type;
+static int ett_content_type_header;
 /* CO-WSP session capabilities */
-static int ett_capabilities             = -1;
-static int ett_capabilities_entry       = -1;
-static int ett_proto_option_capability  = -1;
-static int ett_capabilities_header_code_pages = -1;
-static int ett_capabilities_extended_methods = -1;
-static int ett_post                     = -1;
-static int ett_redirect_flags           = -1;
-static int ett_address_flags            = -1;
-static int ett_multiparts               = -1;
-static int ett_mpartlist                = -1;
+static int ett_capabilities;
+static int ett_capabilities_entry;
+static int ett_proto_option_capability;
+static int ett_capabilities_header_code_pages;
+static int ett_capabilities_extended_methods;
+static int ett_post;
+static int ett_redirect_flags;
+static int ett_address_flags;
+static int ett_multiparts;
+static int ett_mpartlist;
 /* Session Initiation Request tree */
-static int ett_sir                      = -1;
-static int ett_addresses                = -1;
-static int ett_address                  = -1;
-
-static int ett_default                  = -1;
-static int ett_add_content_type         = -1;
-static int ett_accept_x_q_header        = -1;
-static int ett_push_flag                = -1;
-static int ett_profile_diff_wbxml       = -1;
-static int ett_allow                    = -1;
-static int ett_public                   = -1;
-static int ett_vary                     = -1;
-static int ett_x_wap_security           = -1;
-static int ett_connection               = -1;
-static int ett_transfer_encoding        = -1;
-static int ett_accept_ranges            = -1;
-static int ett_content_encoding         = -1;
-static int ett_accept_encoding          = -1;
-static int ett_content_disposition      = -1;
-static int ett_text_header              = -1;
-static int ett_content_id               = -1;
-static int ett_text_or_date_value       = -1;
-static int ett_date_value               = -1;
-static int ett_tod_value                = -1;
-static int ett_age                      = -1;
-static int ett_integer_lookup           = -1;
-static int ett_challenge                = -1;
-static int ett_credentials_value        = -1;
-static int ett_content_md5              = -1;
-static int ett_pragma                   = -1;
-static int ett_integer_value            = -1;
-static int ett_integer_lookup_value     = -1;
-static int ett_cache_control            = -1;
-static int ett_warning                  = -1;
-static int ett_profile_warning          = -1;
-static int ett_encoding_version         = -1;
-static int ett_content_range            = -1;
-static int ett_range                    = -1;
-static int ett_te_value                 = -1;
-static int ett_openwave_default         = -1;
-
-static expert_field ei_wsp_capability_invalid = EI_INIT;
-static expert_field ei_wsp_capability_length_invalid = EI_INIT;
-static expert_field ei_wsp_capability_encoding_invalid = EI_INIT;
-static expert_field ei_wsp_text_field_invalid = EI_INIT;
-static expert_field ei_wsp_header_invalid_value    = EI_INIT;
-static expert_field ei_wsp_invalid_parameter_value = EI_INIT;
-static expert_field ei_wsp_undecoded_parameter = EI_INIT;
-static expert_field ei_hdr_x_wap_tod = EI_INIT;
-static expert_field ei_wsp_trailing_quote = EI_INIT;
-static expert_field ei_wsp_header_invalid = EI_INIT;
-static expert_field ei_wsp_oversized_uintvar = EI_INIT;
+static int ett_sir;
+static int ett_addresses;
+static int ett_address;
+
+static int ett_default;
+static int ett_add_content_type;
+static int ett_accept_x_q_header;
+static int ett_push_flag;
+static int ett_profile_diff_wbxml;
+static int ett_allow;
+static int ett_public;
+static int ett_vary;
+static int ett_x_wap_security;
+static int ett_connection;
+static int ett_transfer_encoding;
+static int ett_accept_ranges;
+static int ett_content_encoding;
+static int ett_accept_encoding;
+static int ett_content_disposition;
+static int ett_text_header;
+static int ett_content_id;
+static int ett_text_or_date_value;
+static int ett_date_value;
+static int ett_tod_value;
+static int ett_age;
+static int ett_integer_lookup;
+static int ett_challenge;
+static int ett_credentials_value;
+static int ett_content_md5;
+static int ett_pragma;
+static int ett_integer_value;
+static int ett_integer_lookup_value;
+static int ett_cache_control;
+static int ett_warning;
+static int ett_profile_warning;
+static int ett_encoding_version;
+static int ett_content_range;
+static int ett_range;
+static int ett_te_value;
+static int ett_openwave_default;
+
+static expert_field ei_wsp_capability_invalid;
+static expert_field ei_wsp_capability_length_invalid;
+static expert_field ei_wsp_capability_encoding_invalid;
+static expert_field ei_wsp_text_field_invalid;
+static expert_field ei_wsp_header_invalid_value;
+static expert_field ei_wsp_invalid_parameter_value;
+static expert_field ei_wsp_undecoded_parameter;
+static expert_field ei_hdr_x_wap_tod;
+static expert_field ei_wsp_trailing_quote;
+static expert_field ei_wsp_header_invalid;
+static expert_field ei_wsp_oversized_uintvar;
 
 
 /* Handle for WSP-over-UDP dissector */
diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c
index 4f525cfa12..6f54f666ea 100644
--- a/epan/dissectors/packet-wtls.c
+++ b/epan/dissectors/packet-wtls.c
@@ -30,86 +30,86 @@ void proto_reg_handoff_wtls(void);
 static dissector_handle_t wtls_handle;
 
 /* File scoped variables for the protocol and registered fields */
-static int proto_wtls = -1;
+static int proto_wtls;
 
 /* These fields used by fixed part of header */
-static int hf_wtls_record = -1;
-static int hf_wtls_record_type = -1;
-static int hf_wtls_record_length = -1;
-static int hf_wtls_record_sequence = -1;
-static int hf_wtls_record_ciphered = -1;
-static int hf_wtls_hands = -1;
-static int hf_wtls_hands_type = -1;
-static int hf_wtls_hands_length = -1;
-static int hf_wtls_hands_cli_hello = -1;
-static int hf_wtls_hands_cli_hello_version = -1;
-static int hf_wtls_hands_cli_hello_gmt = -1;
-static int hf_wtls_hands_cli_hello_random = -1;
-static int hf_wtls_hands_cli_hello_session = -1;
-static int hf_wtls_hands_cli_hello_session_str = -1;
-static int hf_wtls_hands_cli_hello_cli_key_id = -1;
-static int hf_wtls_hands_cli_hello_cli_key_len = -1;
-static int hf_wtls_hands_cli_hello_trust_key_id = -1;
-static int hf_wtls_hands_cli_hello_key_exchange = -1;
-static int hf_wtls_hands_cli_hello_key_exchange_suite = -1;
-static int hf_wtls_hands_cli_hello_key_parameter_index = -1;
-static int hf_wtls_hands_cli_hello_key_parameter_set = -1;
-static int hf_wtls_hands_cli_hello_key_identifier_type = -1;
-static int hf_wtls_hands_cli_hello_key_identifier_charset = -1;
-static int hf_wtls_hands_cli_hello_key_identifier_size = -1;
-static int hf_wtls_hands_cli_hello_key_identifier = -1;
-static int hf_wtls_hands_cli_hello_key_identifier_str = -1;
-static int hf_wtls_hands_cli_hello_cipher_suite = -1;
-static int hf_wtls_hands_cli_hello_cipher_suite_item = -1;
-static int hf_wtls_hands_cli_hello_compression_methods = -1;
-static int hf_wtls_hands_cli_hello_compression = -1;
-static int hf_wtls_hands_cli_hello_sequence_mode = -1;
-static int hf_wtls_hands_cli_hello_key_refresh = -1;
-static int hf_wtls_hands_serv_hello = -1;
-static int hf_wtls_hands_serv_hello_version = -1;
-static int hf_wtls_hands_serv_hello_gmt = -1;
-static int hf_wtls_hands_serv_hello_random = -1;
-static int hf_wtls_hands_serv_hello_session = -1;
-static int hf_wtls_hands_serv_hello_session_str = -1;
-static int hf_wtls_hands_serv_hello_cli_key_id = -1;
-static int hf_wtls_hands_serv_hello_cipher_suite_item = -1;
-static int hf_wtls_hands_serv_hello_cipher_bulk = -1;
-static int hf_wtls_hands_serv_hello_cipher_mac = -1;
-static int hf_wtls_hands_serv_hello_compression = -1;
-static int hf_wtls_hands_serv_hello_sequence_mode = -1;
-static int hf_wtls_hands_serv_hello_key_refresh = -1;
-static int hf_wtls_hands_certificates = -1;
-static int hf_wtls_hands_certificate = -1;
-static int hf_wtls_hands_certificate_type = -1;
-static int hf_wtls_hands_certificate_wtls_version = -1;
-static int hf_wtls_hands_certificate_wtls_signature_type = -1;
-static int hf_wtls_hands_certificate_wtls_issuer_type = -1;
-static int hf_wtls_hands_certificate_wtls_issuer_charset = -1;
-static int hf_wtls_hands_certificate_wtls_issuer_size = -1;
-static int hf_wtls_hands_certificate_wtls_issuer_name = -1;
-static int hf_wtls_hands_certificate_wtls_valid_not_before = -1;
-static int hf_wtls_hands_certificate_wtls_valid_not_after = -1;
-static int hf_wtls_hands_certificate_wtls_subject_type = -1;
-static int hf_wtls_hands_certificate_wtls_subject_charset = -1;
-static int hf_wtls_hands_certificate_wtls_subject_size = -1;
-static int hf_wtls_hands_certificate_wtls_subject_name = -1;
-static int hf_wtls_hands_certificate_wtls_public_key_type = -1;
-static int hf_wtls_hands_certificate_wtls_key_parameter_index = -1;
-static int hf_wtls_hands_certificate_wtls_key_parameter_set = -1;
-static int hf_wtls_hands_certificate_wtls_rsa_exponent = -1;
-static int hf_wtls_hands_certificate_wtls_rsa_modules = -1;
-static int hf_wtls_hands_certificate_wtls_signature = -1;
-static int hf_wtls_alert = -1;
-static int hf_wtls_alert_level = -1;
-static int hf_wtls_alert_description = -1;
+static int hf_wtls_record;
+static int hf_wtls_record_type;
+static int hf_wtls_record_length;
+static int hf_wtls_record_sequence;
+static int hf_wtls_record_ciphered;
+static int hf_wtls_hands;
+static int hf_wtls_hands_type;
+static int hf_wtls_hands_length;
+static int hf_wtls_hands_cli_hello;
+static int hf_wtls_hands_cli_hello_version;
+static int hf_wtls_hands_cli_hello_gmt;
+static int hf_wtls_hands_cli_hello_random;
+static int hf_wtls_hands_cli_hello_session;
+static int hf_wtls_hands_cli_hello_session_str;
+static int hf_wtls_hands_cli_hello_cli_key_id;
+static int hf_wtls_hands_cli_hello_cli_key_len;
+static int hf_wtls_hands_cli_hello_trust_key_id;
+static int hf_wtls_hands_cli_hello_key_exchange;
+static int hf_wtls_hands_cli_hello_key_exchange_suite;
+static int hf_wtls_hands_cli_hello_key_parameter_index;
+static int hf_wtls_hands_cli_hello_key_parameter_set;
+static int hf_wtls_hands_cli_hello_key_identifier_type;
+static int hf_wtls_hands_cli_hello_key_identifier_charset;
+static int hf_wtls_hands_cli_hello_key_identifier_size;
+static int hf_wtls_hands_cli_hello_key_identifier;
+static int hf_wtls_hands_cli_hello_key_identifier_str;
+static int hf_wtls_hands_cli_hello_cipher_suite;
+static int hf_wtls_hands_cli_hello_cipher_suite_item;
+static int hf_wtls_hands_cli_hello_compression_methods;
+static int hf_wtls_hands_cli_hello_compression;
+static int hf_wtls_hands_cli_hello_sequence_mode;
+static int hf_wtls_hands_cli_hello_key_refresh;
+static int hf_wtls_hands_serv_hello;
+static int hf_wtls_hands_serv_hello_version;
+static int hf_wtls_hands_serv_hello_gmt;
+static int hf_wtls_hands_serv_hello_random;
+static int hf_wtls_hands_serv_hello_session;
+static int hf_wtls_hands_serv_hello_session_str;
+static int hf_wtls_hands_serv_hello_cli_key_id;
+static int hf_wtls_hands_serv_hello_cipher_suite_item;
+static int hf_wtls_hands_serv_hello_cipher_bulk;
+static int hf_wtls_hands_serv_hello_cipher_mac;
+static int hf_wtls_hands_serv_hello_compression;
+static int hf_wtls_hands_serv_hello_sequence_mode;
+static int hf_wtls_hands_serv_hello_key_refresh;
+static int hf_wtls_hands_certificates;
+static int hf_wtls_hands_certificate;
+static int hf_wtls_hands_certificate_type;
+static int hf_wtls_hands_certificate_wtls_version;
+static int hf_wtls_hands_certificate_wtls_signature_type;
+static int hf_wtls_hands_certificate_wtls_issuer_type;
+static int hf_wtls_hands_certificate_wtls_issuer_charset;
+static int hf_wtls_hands_certificate_wtls_issuer_size;
+static int hf_wtls_hands_certificate_wtls_issuer_name;
+static int hf_wtls_hands_certificate_wtls_valid_not_before;
+static int hf_wtls_hands_certificate_wtls_valid_not_after;
+static int hf_wtls_hands_certificate_wtls_subject_type;
+static int hf_wtls_hands_certificate_wtls_subject_charset;
+static int hf_wtls_hands_certificate_wtls_subject_size;
+static int hf_wtls_hands_certificate_wtls_subject_name;
+static int hf_wtls_hands_certificate_wtls_public_key_type;
+static int hf_wtls_hands_certificate_wtls_key_parameter_index;
+static int hf_wtls_hands_certificate_wtls_key_parameter_set;
+static int hf_wtls_hands_certificate_wtls_rsa_exponent;
+static int hf_wtls_hands_certificate_wtls_rsa_modules;
+static int hf_wtls_hands_certificate_wtls_signature;
+static int hf_wtls_alert;
+static int hf_wtls_alert_level;
+static int hf_wtls_alert_description;
 
 /* Initialize the subtree pointers */
-static gint ett_wtls = -1;
-static gint ett_wtls_rec = -1;
-static gint ett_wtls_msg_type = -1;
-static gint ett_wtls_msg_type_item = -1;
-static gint ett_wtls_msg_type_item_sub = -1;
-static gint ett_wtls_msg_type_item_sub_sub = -1;
+static gint ett_wtls;
+static gint ett_wtls_rec;
+static gint ett_wtls_msg_type;
+static gint ett_wtls_msg_type_item;
+static gint ett_wtls_msg_type_item_sub;
+static gint ett_wtls_msg_type_item_sub_sub;
 
 static const value_string wtls_vals_record_type[] = {
 	{ 1, "change_cipher_data" },
diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c
index 5a46af127d..80efba0fda 100644
--- a/epan/dissectors/packet-wtp.c
+++ b/epan/dissectors/packet-wtp.c
@@ -129,60 +129,60 @@ static const value_string vals_tpi_opt[] = {
 };
 
 /* File scoped variables for the protocol and registered fields */
-static int proto_wtp = -1;
+static int proto_wtp;
 
 /* These fields used by fixed part of header */
-static int hf_wtp_header_sub_pdu_size      = -1;
-static int hf_wtp_header_flag_continue     = -1;
-static int hf_wtp_header_pdu_type          = -1;
-static int hf_wtp_header_flag_Trailer      = -1;
-static int hf_wtp_header_flag_RID          = -1;
-static int hf_wtp_header_flag_TID          = -1;
-static int hf_wtp_header_flag_TID_response = -1;
+static int hf_wtp_header_sub_pdu_size;
+static int hf_wtp_header_flag_continue;
+static int hf_wtp_header_pdu_type;
+static int hf_wtp_header_flag_Trailer;
+static int hf_wtp_header_flag_RID;
+static int hf_wtp_header_flag_TID;
+static int hf_wtp_header_flag_TID_response;
 
 /* These fields used by Invoke packets */
-static int hf_wtp_header_Inv_version          = -1;
-static int hf_wtp_header_Inv_flag_TIDNew      = -1;
-static int hf_wtp_header_Inv_flag_UP          = -1;
-static int hf_wtp_header_Inv_Reserved         = -1;
-static int hf_wtp_header_Inv_TransactionClass = -1;
-
-/* static int hf_wtp_header_variable_part = -1; */
-/* static int hf_wtp_data                 = -1; */
-
-static int hf_wtp_tpi_type   = -1;
-static int hf_wtp_tpi_psn    = -1;
-static int hf_wtp_tpi_opt    = -1;
-static int hf_wtp_tpi_optval = -1;
-static int hf_wtp_tpi_info   = -1;
-
-static int hf_wtp_header_Ack_flag_TVETOK       = -1;
-static int hf_wtp_header_Abort_type            = -1;
-static int hf_wtp_header_Abort_reason_provider = -1;
-static int hf_wtp_header_Abort_reason_user     = -1;
-static int hf_wtp_header_sequence_number       = -1;
-static int hf_wtp_header_missing_packets       = -1;
-static int hf_wtp_payload                      = -1;
+static int hf_wtp_header_Inv_version;
+static int hf_wtp_header_Inv_flag_TIDNew;
+static int hf_wtp_header_Inv_flag_UP;
+static int hf_wtp_header_Inv_Reserved;
+static int hf_wtp_header_Inv_TransactionClass;
+
+/* static int hf_wtp_header_variable_part; */
+/* static int hf_wtp_data; */
+
+static int hf_wtp_tpi_type;
+static int hf_wtp_tpi_psn;
+static int hf_wtp_tpi_opt;
+static int hf_wtp_tpi_optval;
+static int hf_wtp_tpi_info;
+
+static int hf_wtp_header_Ack_flag_TVETOK;
+static int hf_wtp_header_Abort_type;
+static int hf_wtp_header_Abort_reason_provider;
+static int hf_wtp_header_Abort_reason_user;
+static int hf_wtp_header_sequence_number;
+static int hf_wtp_header_missing_packets;
+static int hf_wtp_payload;
 
 /* These fields used when reassembling WTP fragments */
-static int hf_wtp_fragments                  = -1;
-static int hf_wtp_fragment                   = -1;
-static int hf_wtp_fragment_overlap           = -1;
-static int hf_wtp_fragment_overlap_conflict  = -1;
-static int hf_wtp_fragment_multiple_tails    = -1;
-static int hf_wtp_fragment_too_long_fragment = -1;
-static int hf_wtp_fragment_error             = -1;
-static int hf_wtp_fragment_count             = -1;
-static int hf_wtp_reassembled_in             = -1;
-static int hf_wtp_reassembled_length         = -1;
+static int hf_wtp_fragments;
+static int hf_wtp_fragment;
+static int hf_wtp_fragment_overlap;
+static int hf_wtp_fragment_overlap_conflict;
+static int hf_wtp_fragment_multiple_tails;
+static int hf_wtp_fragment_too_long_fragment;
+static int hf_wtp_fragment_error;
+static int hf_wtp_fragment_count;
+static int hf_wtp_reassembled_in;
+static int hf_wtp_reassembled_length;
 
 /* Initialize the subtree pointers */
-static gint ett_wtp              = -1;
-static gint ett_wtp_sub_pdu_tree = -1;
-static gint ett_header           = -1;
-static gint ett_tpilist          = -1;
-static gint ett_wsp_fragments    = -1;
-static gint ett_wtp_fragment     = -1;
+static gint ett_wtp;
+static gint ett_wtp_sub_pdu_tree;
+static gint ett_header;
+static gint ett_tpilist;
+static gint ett_wsp_fragments;
+static gint ett_wtp_fragment;
 
 static const fragment_items wtp_frag_items = {
     &ett_wtp_fragment,
diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index bb65432857..32e44dba18 100644
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -106,124 +106,124 @@ typedef enum {
 #define X25_FAC_CALL_DEFLECT            0xD1
 #define X25_FAC_PRIORITY                0xD2
 
-static int proto_x25 = -1;
-static int hf_x25_facility = -1;
-static int hf_x25_facilities_length = -1;
-static int hf_x25_facility_length = -1;
-static int hf_x25_facility_class = -1;
-static int hf_x25_facility_classA = -1;
-static int hf_x25_facility_classA_comp_mark = -1;
-static int hf_x25_facility_classA_reverse = -1;
-static int hf_x25_facility_classA_charging_info = -1;
-static int hf_x25_facility_reverse_charging = -1;
-static int hf_x25_facility_charging_info = -1;
-static int hf_x25_facility_throughput_called_dte = -1;
-static int hf_x25_throughput_called_dte = -1;
-static int hf_x25_facility_classA_cug = -1;
-static int hf_x25_facility_classA_called_motif = -1;
-static int hf_x25_facility_classA_cug_outgoing_acc = -1;
-static int hf_x25_facility_classA_throughput_min = -1;
-static int hf_x25_facility_classA_express_data = -1;
-static int hf_x25_facility_classA_unknown = -1;
-static int hf_x25_facility_classB = -1;
-static int hf_x25_facility_classB_bilateral_cug = -1;
-static int hf_x25_facility_packet_size_called_dte = -1;
-static int hf_x25_facility_packet_size_calling_dte = -1;
-static int hf_x25_facility_data_network_id_code = -1;
-static int hf_x25_facility_cug_ext = -1;
-static int hf_x25_facility_cug_outgoing_acc_ext = -1;
-static int hf_x25_facility_transit_delay = -1;
-static int hf_x25_facility_classB_unknown = -1;
-static int hf_x25_facility_classC = -1;
-static int hf_x25_facility_classC_unknown = -1;
-static int hf_x25_facility_classD = -1;
-static int hf_x25_gfi = -1;
-static int hf_x25_abit = -1;
-static int hf_x25_qbit = -1;
-static int hf_x25_dbit = -1;
-static int hf_x25_mod = -1;
-static int hf_x25_lcn = -1;
-static int hf_x25_type = -1;
-static int hf_x25_type_fc_mod8 = -1;
-static int hf_x25_type_data = -1;
-static int hf_x25_diagnostic = -1;
-static int hf_x25_p_r_mod8 = -1;
-static int hf_x25_p_r_mod128 = -1;
-static int hf_x25_mbit_mod8 = -1;
-static int hf_x25_mbit_mod128 = -1;
-static int hf_x25_p_s_mod8 = -1;
-static int hf_x25_p_s_mod128 = -1;
-static int hf_x25_window_size_called_dte = -1;
-static int hf_x25_window_size_calling_dte = -1;
-static int hf_x25_dte_address_length = -1;
-static int hf_x25_dce_address_length = -1;
-static int hf_x25_calling_address_length = -1;
-static int hf_x25_called_address_length = -1;
-static int hf_x25_facility_call_transfer_reason = -1;
-static int hf_x25_facility_monetary_unit = -1;
-static int hf_x25_facility_nui = -1;
-static int hf_x25_facility_cumulative_ete_transit_delay = -1;
-static int hf_x25_facility_requested_ete_transit_delay = -1;
-static int hf_x25_facility_max_acceptable_ete_transit_delay = -1;
-static int hf_x25_facility_priority_data = -1;
-static int hf_x25_facility_priority_estab_conn = -1;
-static int hf_x25_facility_priority_keep_conn = -1;
-static int hf_x25_facility_min_acceptable_priority_data = -1;
-static int hf_x25_facility_min_acceptable_priority_estab_conn = -1;
-static int hf_x25_facility_min_acceptable_priority_keep_conn = -1;
-static int hf_x25_facility_classD_unknown = -1;
-static int hf_x25_facility_call_transfer_num_semi_octets = -1;
-static int hf_x25_facility_calling_addr_ext_num_semi_octets = -1;
-static int hf_x25_facility_called_addr_ext_num_semi_octets = -1;
-static int hf_x25_facility_call_deflect_num_semi_octets = -1;
-static int hf_x264_length_indicator = -1;
-static int hf_x264_un_tpdu_id = -1;
-static int hf_x264_protocol_id = -1;
-static int hf_x264_sharing_strategy = -1;
-static int hf_x263_sec_protocol_id = -1;
-static int hf_x25_reg_request_length = -1;
-static int hf_x25_reg_confirm_length = -1;
+static int proto_x25;
+static int hf_x25_facility;
+static int hf_x25_facilities_length;
+static int hf_x25_facility_length;
+static int hf_x25_facility_class;
+static int hf_x25_facility_classA;
+static int hf_x25_facility_classA_comp_mark;
+static int hf_x25_facility_classA_reverse;
+static int hf_x25_facility_classA_charging_info;
+static int hf_x25_facility_reverse_charging;
+static int hf_x25_facility_charging_info;
+static int hf_x25_facility_throughput_called_dte;
+static int hf_x25_throughput_called_dte;
+static int hf_x25_facility_classA_cug;
+static int hf_x25_facility_classA_called_motif;
+static int hf_x25_facility_classA_cug_outgoing_acc;
+static int hf_x25_facility_classA_throughput_min;
+static int hf_x25_facility_classA_express_data;
+static int hf_x25_facility_classA_unknown;
+static int hf_x25_facility_classB;
+static int hf_x25_facility_classB_bilateral_cug;
+static int hf_x25_facility_packet_size_called_dte;
+static int hf_x25_facility_packet_size_calling_dte;
+static int hf_x25_facility_data_network_id_code;
+static int hf_x25_facility_cug_ext;
+static int hf_x25_facility_cug_outgoing_acc_ext;
+static int hf_x25_facility_transit_delay;
+static int hf_x25_facility_classB_unknown;
+static int hf_x25_facility_classC;
+static int hf_x25_facility_classC_unknown;
+static int hf_x25_facility_classD;
+static int hf_x25_gfi;
+static int hf_x25_abit;
+static int hf_x25_qbit;
+static int hf_x25_dbit;
+static int hf_x25_mod;
+static int hf_x25_lcn;
+static int hf_x25_type;
+static int hf_x25_type_fc_mod8;
+static int hf_x25_type_data;
+static int hf_x25_diagnostic;
+static int hf_x25_p_r_mod8;
+static int hf_x25_p_r_mod128;
+static int hf_x25_mbit_mod8;
+static int hf_x25_mbit_mod128;
+static int hf_x25_p_s_mod8;
+static int hf_x25_p_s_mod128;
+static int hf_x25_window_size_called_dte;
+static int hf_x25_window_size_calling_dte;
+static int hf_x25_dte_address_length;
+static int hf_x25_dce_address_length;
+static int hf_x25_calling_address_length;
+static int hf_x25_called_address_length;
+static int hf_x25_facility_call_transfer_reason;
+static int hf_x25_facility_monetary_unit;
+static int hf_x25_facility_nui;
+static int hf_x25_facility_cumulative_ete_transit_delay;
+static int hf_x25_facility_requested_ete_transit_delay;
+static int hf_x25_facility_max_acceptable_ete_transit_delay;
+static int hf_x25_facility_priority_data;
+static int hf_x25_facility_priority_estab_conn;
+static int hf_x25_facility_priority_keep_conn;
+static int hf_x25_facility_min_acceptable_priority_data;
+static int hf_x25_facility_min_acceptable_priority_estab_conn;
+static int hf_x25_facility_min_acceptable_priority_keep_conn;
+static int hf_x25_facility_classD_unknown;
+static int hf_x25_facility_call_transfer_num_semi_octets;
+static int hf_x25_facility_calling_addr_ext_num_semi_octets;
+static int hf_x25_facility_called_addr_ext_num_semi_octets;
+static int hf_x25_facility_call_deflect_num_semi_octets;
+static int hf_x264_length_indicator;
+static int hf_x264_un_tpdu_id;
+static int hf_x264_protocol_id;
+static int hf_x264_sharing_strategy;
+static int hf_x263_sec_protocol_id;
+static int hf_x25_reg_request_length;
+static int hf_x25_reg_confirm_length;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_x25_call_duration = -1;
-static int hf_x25_segments_to_dte = -1;
-static int hf_x25_segments_from_dte = -1;
-static int hf_x25_dte_address = -1;
-static int hf_x25_data_network_identification_code = -1;
-static int hf_x25_facility_call_deflect_reason = -1;
-static int hf_x25_alternative_dte_address = -1;
-static int hf_x25_dce_address = -1;
-static int hf_x25_called_address = -1;
-static int hf_x25_calling_address = -1;
-static int hf_x25_clear_cause = -1;
-static int hf_x25_reset_cause = -1;
-static int hf_x25_restart_cause = -1;
-static int hf_x25_registration = -1;
-static int hf_x25_user_data = -1;
-
-static gint ett_x25 = -1;
-static gint ett_x25_gfi = -1;
-static gint ett_x25_facilities = -1;
-static gint ett_x25_facility = -1;
-static gint ett_x25_user_data = -1;
-
-static gint ett_x25_segment = -1;
-static gint ett_x25_segments = -1;
-static gint hf_x25_segments = -1;
-static gint hf_x25_segment = -1;
-static gint hf_x25_segment_overlap = -1;
-static gint hf_x25_segment_overlap_conflict = -1;
-static gint hf_x25_segment_multiple_tails = -1;
-static gint hf_x25_segment_too_long_segment = -1;
-static gint hf_x25_segment_error = -1;
-static gint hf_x25_segment_count = -1;
-static gint hf_x25_reassembled_length = -1;
-static gint hf_x25_fast_select = -1;
-static gint hf_x25_icrd = -1;
-static gint hf_x25_reg_confirm_cause = -1;
-static gint hf_x25_reg_confirm_diagnostic = -1;
-
-static expert_field ei_x25_facility_length = EI_INIT;
+static int hf_x25_call_duration;
+static int hf_x25_segments_to_dte;
+static int hf_x25_segments_from_dte;
+static int hf_x25_dte_address;
+static int hf_x25_data_network_identification_code;
+static int hf_x25_facility_call_deflect_reason;
+static int hf_x25_alternative_dte_address;
+static int hf_x25_dce_address;
+static int hf_x25_called_address;
+static int hf_x25_calling_address;
+static int hf_x25_clear_cause;
+static int hf_x25_reset_cause;
+static int hf_x25_restart_cause;
+static int hf_x25_registration;
+static int hf_x25_user_data;
+
+static gint ett_x25;
+static gint ett_x25_gfi;
+static gint ett_x25_facilities;
+static gint ett_x25_facility;
+static gint ett_x25_user_data;
+
+static gint ett_x25_segment;
+static gint ett_x25_segments;
+static gint hf_x25_segments;
+static gint hf_x25_segment;
+static gint hf_x25_segment_overlap;
+static gint hf_x25_segment_overlap_conflict;
+static gint hf_x25_segment_multiple_tails;
+static gint hf_x25_segment_too_long_segment;
+static gint hf_x25_segment_error;
+static gint hf_x25_segment_count;
+static gint hf_x25_reassembled_length;
+static gint hf_x25_fast_select;
+static gint hf_x25_icrd;
+static gint hf_x25_reg_confirm_cause;
+static gint hf_x25_reg_confirm_diagnostic;
+
+static expert_field ei_x25_facility_length;
 
 static dissector_handle_t x25_handle;
 
diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c
index 819c9ecf4b..958abcd63a 100644
--- a/epan/dissectors/packet-x29.c
+++ b/epan/dissectors/packet-x29.c
@@ -18,23 +18,23 @@ void proto_reg_handoff_x29(void);
 
 static dissector_handle_t x29_handle;
 
-static int proto_x29 = -1;
-static int hf_msg_code = -1;
-static int hf_error_type = -1;
-static int hf_inv_msg_code = -1;
+static int proto_x29;
+static int hf_msg_code;
+static int hf_error_type;
+static int hf_inv_msg_code;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_x29_pad_message_data = -1;
-static int hf_x29_type_reference_value = -1;
-static int hf_x29_type_reference = -1;
-static int hf_x29_data = -1;
-static int hf_x29_type_of_aspect = -1;
-static int hf_x29_reselection_message_data = -1;
-static int hf_x29_break_value = -1;
-static int hf_x29_parameter = -1;
-static int hf_x29_value = -1;
-
-static gint ett_x29 = -1;
+static int hf_x29_pad_message_data;
+static int hf_x29_type_reference_value;
+static int hf_x29_type_reference;
+static int hf_x29_data;
+static int hf_x29_type_of_aspect;
+static int hf_x29_reselection_message_data;
+static int hf_x29_break_value;
+static int hf_x29_parameter;
+static int hf_x29_value;
+
+static gint ett_x29;
 
 /*
  * PAD messages.
diff --git a/epan/dissectors/packet-x75.c b/epan/dissectors/packet-x75.c
index 0d94673dab..173f956dbd 100644
--- a/epan/dissectors/packet-x75.c
+++ b/epan/dissectors/packet-x75.c
@@ -26,21 +26,21 @@ void proto_reg_handoff_x75(void);
 #define X75_ADDRESS_MLP_STE_C 0x0F
 #define X75_ADDRESS_MLP_STE_D 0x07
 
-static int proto_x75 = -1;
-static int hf_x75_address = -1;
-static int hf_x75_control = -1;
-static int hf_x75_n_r = -1;
-static int hf_x75_n_s = -1;
-static int hf_x75_p = -1;
-static int hf_x75_f = -1;
-static int hf_x75_s_ftype = -1;
-static int hf_x75_u_modifier_cmd = -1;
-static int hf_x75_u_modifier_resp = -1;
-static int hf_x75_ftype_i = -1;
-static int hf_x75_ftype_s_u = -1;
-
-static gint ett_x75 = -1;
-static gint ett_x75_control = -1;
+static int proto_x75;
+static int hf_x75_address;
+static int hf_x75_control;
+static int hf_x75_n_r;
+static int hf_x75_n_s;
+static int hf_x75_p;
+static int hf_x75_f;
+static int hf_x75_s_ftype;
+static int hf_x75_u_modifier_cmd;
+static int hf_x75_u_modifier_resp;
+static int hf_x75_ftype_i;
+static int hf_x75_ftype_s_u;
+
+static gint ett_x75;
+static gint ett_x75_control;
 
 static dissector_handle_t data_handle;
 static dissector_handle_t x75_handle;
diff --git a/epan/dissectors/packet-xcsl.c b/epan/dissectors/packet-xcsl.c
index 0b8a8e1569..f6b311981e 100644
--- a/epan/dissectors/packet-xcsl.c
+++ b/epan/dissectors/packet-xcsl.c
@@ -24,17 +24,17 @@
 void proto_register_xcsl(void);
 void proto_reg_handoff_xcsl(void);
 
-static int proto_xcsl = -1;
+static int proto_xcsl;
 
-static int hf_xcsl_command = -1;
-static int hf_xcsl_information = -1;
-static int hf_xcsl_parameter = -1;
-static int hf_xcsl_protocol_version = -1;
-static int hf_xcsl_result = -1;
-static int hf_xcsl_transaction_id = -1;
+static int hf_xcsl_command;
+static int hf_xcsl_information;
+static int hf_xcsl_parameter;
+static int hf_xcsl_protocol_version;
+static int hf_xcsl_result;
+static int hf_xcsl_transaction_id;
 
 /* Initialize the subtree pointers */
-static gint ett_xcsl = -1;
+static gint ett_xcsl;
 
 /* Xcsl result codes */
 #define XCSL_SUCCESS      0
diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c
index cc6463b2b1..5a0fedd80d 100644
--- a/epan/dissectors/packet-xdmcp.c
+++ b/epan/dissectors/packet-xdmcp.c
@@ -66,44 +66,44 @@ static const value_string family_vals[] = {
   { 0, NULL }
 };
 
-static gint proto_xdmcp = -1;
-static gint hf_xdmcp_version = -1;
-static gint hf_xdmcp_opcode = -1;
-static gint hf_xdmcp_length = -1;
-static gint hf_xdmcp_authentication_name = -1;
-static gint hf_xdmcp_authorization_name = -1;
-static gint hf_xdmcp_hostname = -1;
-static gint hf_xdmcp_status = -1;
-static gint hf_xdmcp_session_id = -1;
-static gint hf_xdmcp_display_number = -1;
-static gint hf_xdmcp_manufacturer_display_id = -1;
-static gint hf_xdmcp_manufacturer_display_id_len = -1;
-static gint hf_xdmcp_display_class = -1;
-static gint hf_xdmcp_display_class_len = -1;
-static gint hf_xdmcp_client_address_ipv4 = -1;
-static gint hf_xdmcp_client_address_ipv6 = -1;
-static gint hf_xdmcp_client_address_bytes = -1;
-static gint hf_xdmcp_client_address_bytes_len = -1;
-static gint hf_xdmcp_client_port_u16 = -1;
-static gint hf_xdmcp_client_port_bytes = -1;
-static gint hf_xdmcp_client_port_len = -1;
-static gint hf_xdmcp_authentication_data = -1;
-static gint hf_xdmcp_authentication_data_len = -1;
-static gint hf_xdmcp_authorization_data = -1;
-static gint hf_xdmcp_authorization_data_len = -1;
-static gint hf_xdmcp_connection_type = -1;
-static gint hf_xdmcp_connection_address_ipv4 = -1;
-static gint hf_xdmcp_connection_address_ipv6 = -1;
-static gint hf_xdmcp_connection_address_bytes = -1;
-static gint hf_xdmcp_session_running = -1;
-
-static gint ett_xdmcp = -1;
-static gint ett_xdmcp_authentication_names = -1;
-static gint ett_xdmcp_authorization_names = -1;
-static gint ett_xdmcp_connections = -1;
-static gint ett_xdmcp_connection = -1;
-
-static expert_field ei_xdmcp_conn_address_mismatch = EI_INIT;
+static gint proto_xdmcp;
+static gint hf_xdmcp_version;
+static gint hf_xdmcp_opcode;
+static gint hf_xdmcp_length;
+static gint hf_xdmcp_authentication_name;
+static gint hf_xdmcp_authorization_name;
+static gint hf_xdmcp_hostname;
+static gint hf_xdmcp_status;
+static gint hf_xdmcp_session_id;
+static gint hf_xdmcp_display_number;
+static gint hf_xdmcp_manufacturer_display_id;
+static gint hf_xdmcp_manufacturer_display_id_len;
+static gint hf_xdmcp_display_class;
+static gint hf_xdmcp_display_class_len;
+static gint hf_xdmcp_client_address_ipv4;
+static gint hf_xdmcp_client_address_ipv6;
+static gint hf_xdmcp_client_address_bytes;
+static gint hf_xdmcp_client_address_bytes_len;
+static gint hf_xdmcp_client_port_u16;
+static gint hf_xdmcp_client_port_bytes;
+static gint hf_xdmcp_client_port_len;
+static gint hf_xdmcp_authentication_data;
+static gint hf_xdmcp_authentication_data_len;
+static gint hf_xdmcp_authorization_data;
+static gint hf_xdmcp_authorization_data_len;
+static gint hf_xdmcp_connection_type;
+static gint hf_xdmcp_connection_address_ipv4;
+static gint hf_xdmcp_connection_address_ipv6;
+static gint hf_xdmcp_connection_address_bytes;
+static gint hf_xdmcp_session_running;
+
+static gint ett_xdmcp;
+static gint ett_xdmcp_authentication_names;
+static gint ett_xdmcp_authorization_names;
+static gint ett_xdmcp_connections;
+static gint ett_xdmcp_connection;
+
+static expert_field ei_xdmcp_conn_address_mismatch;
 
 static gint xdmcp_add_string(proto_tree *tree, gint hf,
                              tvbuff_t *tvb, gint offset)
diff --git a/epan/dissectors/packet-xip-serval.c b/epan/dissectors/packet-xip-serval.c
index d959744619..f7cf7d071f 100644
--- a/epan/dissectors/packet-xip-serval.c
+++ b/epan/dissectors/packet-xip-serval.c
@@ -23,39 +23,39 @@ void proto_reg_handoff_xip_serval(void);
 static dissector_handle_t tcp_handle;
 static dissector_handle_t udp_handle;
 
-static gint proto_xip_serval		= -1;
+static gint proto_xip_serval;
 
 /* XIP Serval header. */
-static gint hf_xip_serval_hl		= -1;
-static gint hf_xip_serval_proto		= -1;
-static gint hf_xip_serval_check		= -1;
-static gint hf_xip_serval_check_status = -1;
+static gint hf_xip_serval_hl;
+static gint hf_xip_serval_proto;
+static gint hf_xip_serval_check;
+static gint hf_xip_serval_check_status;
 
 /* XIP Serval general extension header. */
-static gint hf_xip_serval_ext_type	= -1;
-static gint hf_xip_serval_ext_length	= -1;
+static gint hf_xip_serval_ext_type;
+static gint hf_xip_serval_ext_length;
 
 /* XIP Serval control extension header. */
-static gint hf_xip_serval_cext		= -1;
-static gint hf_xip_serval_cext_flags	= -1;
-static gint hf_xip_serval_cext_syn	= -1;
-static gint hf_xip_serval_cext_rsyn	= -1;
-static gint hf_xip_serval_cext_ack	= -1;
-static gint hf_xip_serval_cext_nack	= -1;
-static gint hf_xip_serval_cext_rst	= -1;
-static gint hf_xip_serval_cext_fin	= -1;
-static gint hf_xip_serval_cext_verno	= -1;
-static gint hf_xip_serval_cext_ackno	= -1;
-static gint hf_xip_serval_cext_nonce	= -1;
-
-static gint ett_xip_serval_tree		= -1;
-static gint ett_xip_serval_cext		= -1;
-static gint ett_xip_serval_cext_flags	= -1;
-
-static expert_field ei_xip_serval_bad_len	= EI_INIT;
-static expert_field ei_xip_serval_bad_proto	= EI_INIT;
-static expert_field ei_xip_serval_bad_checksum	= EI_INIT;
-static expert_field ei_xip_serval_bad_ext	= EI_INIT;
+static gint hf_xip_serval_cext;
+static gint hf_xip_serval_cext_flags;
+static gint hf_xip_serval_cext_syn;
+static gint hf_xip_serval_cext_rsyn;
+static gint hf_xip_serval_cext_ack;
+static gint hf_xip_serval_cext_nack;
+static gint hf_xip_serval_cext_rst;
+static gint hf_xip_serval_cext_fin;
+static gint hf_xip_serval_cext_verno;
+static gint hf_xip_serval_cext_ackno;
+static gint hf_xip_serval_cext_nonce;
+
+static gint ett_xip_serval_tree;
+static gint ett_xip_serval_cext;
+static gint ett_xip_serval_cext_flags;
+
+static expert_field ei_xip_serval_bad_len;
+static expert_field ei_xip_serval_bad_proto;
+static expert_field ei_xip_serval_bad_checksum;
+static expert_field ei_xip_serval_bad_ext;
 
 #define XIP_SERVAL_PROTO_DATA		0
 static const value_string xip_serval_proto_vals[] = {
diff --git a/epan/dissectors/packet-xip.c b/epan/dissectors/packet-xip.c
index d39e832e9a..8d7ea7866a 100644
--- a/epan/dissectors/packet-xip.c
+++ b/epan/dissectors/packet-xip.c
@@ -33,28 +33,28 @@ void proto_reg_handoff_xip(void);
 /* Next dissector handles. */
 static dissector_handle_t xip_serval_handle;
 
-static gint proto_xip			= -1;
-
-static gint hf_xip_version		= -1;
-static gint hf_xip_next_hdr		= -1;
-static gint hf_xip_payload_len		= -1;
-static gint hf_xip_hop_limit		= -1;
-static gint hf_xip_num_dst		= -1;
-static gint hf_xip_num_src		= -1;
-static gint hf_xip_last_node		= -1;
-static gint hf_xip_dst_dag		= -1;
-static gint hf_xip_dst_dag_entry	= -1;
-static gint hf_xip_src_dag		= -1;
-static gint hf_xip_src_dag_entry	= -1;
-
-static gint ett_xip_tree		= -1;
-static gint ett_xip_ddag		= -1;
-static gint ett_xip_sdag		= -1;
-
-static expert_field ei_xip_invalid_len = EI_INIT;
-static expert_field ei_xip_next_header = EI_INIT;
-static expert_field ei_xip_bad_num_dst = EI_INIT;
-static expert_field ei_xip_bad_num_src = EI_INIT;
+static gint proto_xip;
+
+static gint hf_xip_version;
+static gint hf_xip_next_hdr;
+static gint hf_xip_payload_len;
+static gint hf_xip_hop_limit;
+static gint hf_xip_num_dst;
+static gint hf_xip_num_src;
+static gint hf_xip_last_node;
+static gint hf_xip_dst_dag;
+static gint hf_xip_dst_dag_entry;
+static gint hf_xip_src_dag;
+static gint hf_xip_src_dag_entry;
+
+static gint ett_xip_tree;
+static gint ett_xip_ddag;
+static gint ett_xip_sdag;
+
+static expert_field ei_xip_invalid_len;
+static expert_field ei_xip_next_header;
+static expert_field ei_xip_bad_num_dst;
+static expert_field ei_xip_bad_num_src;
 
 static dissector_handle_t xip_handle;
 
diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c
index ff10ad858a..ea27386884 100644
--- a/epan/dissectors/packet-xmcp.c
+++ b/epan/dissectors/packet-xmcp.c
@@ -29,11 +29,11 @@ void proto_register_xmcp(void);
 static dissector_table_t media_type_dissector_table;
 
 /* Initialize the protocol and registered fields */
-static int proto_xmcp = -1;
+static int proto_xmcp;
 
-static int hf_xmcp_response_in = -1;
-static int hf_xmcp_response_to = -1;
-static int hf_xmcp_time = -1;
+static int hf_xmcp_response_in;
+static int hf_xmcp_response_to;
+static int hf_xmcp_time;
 
 typedef struct _xmcp_transaction_t {
   guint32 request_frame;
@@ -46,82 +46,82 @@ typedef struct _xmcp_conv_info_t {
   wmem_tree_t *transaction_pdus;
 } xmcp_conv_info_t;
 
-static int hf_xmcp_type = -1;
-static int hf_xmcp_type_reserved = -1;
-static int hf_xmcp_type_class = -1;
-static int hf_xmcp_type_method = -1;
-static int hf_xmcp_length = -1;
-static int hf_xmcp_cookie = -1;
-static int hf_xmcp_id = -1;
-static int hf_xmcp_attributes = -1;
-static int hf_xmcp_attr = -1;
-static int hf_xmcp_msg_is_keepalive = -1;
-
-static int hf_xmcp_attr_type = -1;
-static int hf_xmcp_attr_length = -1;
-static int hf_xmcp_attr_value = -1; /* generic value for unrecognized attrs */
-static int hf_xmcp_attr_padding = -1; /* generic value for TLV padding bytes */
-static int hf_xmcp_attr_reserved = -1;
-static int hf_xmcp_attr_username = -1;
-static int hf_xmcp_attr_message_integrity = -1;
-static int hf_xmcp_attr_error_reserved = -1;
-static int hf_xmcp_attr_error_class = -1;
-static int hf_xmcp_attr_error_number = -1;
-static int hf_xmcp_attr_error_code = -1;
-static int hf_xmcp_attr_error_reason = -1;
-static int hf_xmcp_attr_realm = -1;
-static int hf_xmcp_attr_nonce = -1;
-static int hf_xmcp_attr_client_name = -1;
-static int hf_xmcp_attr_client_handle = -1;
-static int hf_xmcp_attr_version_major = -1;
-static int hf_xmcp_attr_version_minor = -1;
-static int hf_xmcp_attr_page_size = -1;
-static int hf_xmcp_attr_client_label = -1;
-static int hf_xmcp_attr_keepalive = -1;
-static int hf_xmcp_attr_serv_service = -1;
-static int hf_xmcp_attr_serv_subservice = -1;
-static int hf_xmcp_attr_serv_instance = -1;
-static int hf_xmcp_attr_servtrans_family = -1;
-static int hf_xmcp_attr_servtrans_port = -1;
-static int hf_xmcp_attr_servtrans_ipv4 = -1;
-static int hf_xmcp_attr_servtrans_ipv6 = -1;
-static int hf_xmcp_attr_service_protocol = -1;
-static int hf_xmcp_attr_flag = -1;
-static int hf_xmcp_attr_flag_type = -1;
-static int hf_xmcp_attr_flag_value = -1;
-static int hf_xmcp_attr_flag_removal_reason_network_withdraw = -1;
-static int hf_xmcp_attr_flag_removal_reason_reserved = -1;
-static int hf_xmcp_attr_flag_trust = -1;
-static int hf_xmcp_attr_flag_visibility_unauthenticated = -1;
-static int hf_xmcp_attr_flag_visibility_reserved = -1;
-static int hf_xmcp_attr_service_version = -1;
-static int hf_xmcp_attr_service_data = -1;
-static int hf_xmcp_attr_subscription_id = -1;
-static int hf_xmcp_attr_service_removed_reason = -1;
-static int hf_xmcp_attr_domain = -1;
-
-static gint ett_xmcp = -1;
-static gint ett_xmcp_type = -1;
-static gint ett_xmcp_attr_all = -1;
-static gint ett_xmcp_attr = -1;
-static gint ett_xmcp_attr_flag = -1;
-
-static expert_field ei_xmcp_message_class_reserved = EI_INIT;
-static expert_field ei_xmcp_attr_length_bad = EI_INIT;
-static expert_field ei_xmcp_attr_error_number_out_of_range = EI_INIT;
-static expert_field ei_xmcp_type_reserved_not_zero = EI_INIT;
-static expert_field ei_xmcp_data_following_message_integrity = EI_INIT;
-static expert_field ei_xmcp_msg_type_method_reserved = EI_INIT;
-static expert_field ei_xmcp_xmcp_attr_servtrans_unknown = EI_INIT;
-static expert_field ei_xmcp_attr_realm_incorrect = EI_INIT;
-static expert_field ei_xmcp_new_session = EI_INIT;
-static expert_field ei_xmcp_response_without_request = EI_INIT;
-static expert_field ei_xmcp_length_bad = EI_INIT;
-static expert_field ei_xmcp_error_response = EI_INIT;
-static expert_field ei_xmcp_magic_cookie_incorrect = EI_INIT;
-static expert_field ei_xmcp_attr_type_unknown = EI_INIT;
-static expert_field ei_xmcp_session_termination = EI_INIT;
-static expert_field ei_xmcp_attr_error_code_unusual = EI_INIT;
+static int hf_xmcp_type;
+static int hf_xmcp_type_reserved;
+static int hf_xmcp_type_class;
+static int hf_xmcp_type_method;
+static int hf_xmcp_length;
+static int hf_xmcp_cookie;
+static int hf_xmcp_id;
+static int hf_xmcp_attributes;
+static int hf_xmcp_attr;
+static int hf_xmcp_msg_is_keepalive;
+
+static int hf_xmcp_attr_type;
+static int hf_xmcp_attr_length;
+static int hf_xmcp_attr_value; /* generic value for unrecognized attrs */
+static int hf_xmcp_attr_padding; /* generic value for TLV padding bytes */
+static int hf_xmcp_attr_reserved;
+static int hf_xmcp_attr_username;
+static int hf_xmcp_attr_message_integrity;
+static int hf_xmcp_attr_error_reserved;
+static int hf_xmcp_attr_error_class;
+static int hf_xmcp_attr_error_number;
+static int hf_xmcp_attr_error_code;
+static int hf_xmcp_attr_error_reason;
+static int hf_xmcp_attr_realm;
+static int hf_xmcp_attr_nonce;
+static int hf_xmcp_attr_client_name;
+static int hf_xmcp_attr_client_handle;
+static int hf_xmcp_attr_version_major;
+static int hf_xmcp_attr_version_minor;
+static int hf_xmcp_attr_page_size;
+static int hf_xmcp_attr_client_label;
+static int hf_xmcp_attr_keepalive;
+static int hf_xmcp_attr_serv_service;
+static int hf_xmcp_attr_serv_subservice;
+static int hf_xmcp_attr_serv_instance;
+static int hf_xmcp_attr_servtrans_family;
+static int hf_xmcp_attr_servtrans_port;
+static int hf_xmcp_attr_servtrans_ipv4;
+static int hf_xmcp_attr_servtrans_ipv6;
+static int hf_xmcp_attr_service_protocol;
+static int hf_xmcp_attr_flag;
+static int hf_xmcp_attr_flag_type;
+static int hf_xmcp_attr_flag_value;
+static int hf_xmcp_attr_flag_removal_reason_network_withdraw;
+static int hf_xmcp_attr_flag_removal_reason_reserved;
+static int hf_xmcp_attr_flag_trust;
+static int hf_xmcp_attr_flag_visibility_unauthenticated;
+static int hf_xmcp_attr_flag_visibility_reserved;
+static int hf_xmcp_attr_service_version;
+static int hf_xmcp_attr_service_data;
+static int hf_xmcp_attr_subscription_id;
+static int hf_xmcp_attr_service_removed_reason;
+static int hf_xmcp_attr_domain;
+
+static gint ett_xmcp;
+static gint ett_xmcp_type;
+static gint ett_xmcp_attr_all;
+static gint ett_xmcp_attr;
+static gint ett_xmcp_attr_flag;
+
+static expert_field ei_xmcp_message_class_reserved;
+static expert_field ei_xmcp_attr_length_bad;
+static expert_field ei_xmcp_attr_error_number_out_of_range;
+static expert_field ei_xmcp_type_reserved_not_zero;
+static expert_field ei_xmcp_data_following_message_integrity;
+static expert_field ei_xmcp_msg_type_method_reserved;
+static expert_field ei_xmcp_xmcp_attr_servtrans_unknown;
+static expert_field ei_xmcp_attr_realm_incorrect;
+static expert_field ei_xmcp_new_session;
+static expert_field ei_xmcp_response_without_request;
+static expert_field ei_xmcp_length_bad;
+static expert_field ei_xmcp_error_response;
+static expert_field ei_xmcp_magic_cookie_incorrect;
+static expert_field ei_xmcp_attr_type_unknown;
+static expert_field ei_xmcp_session_termination;
+static expert_field ei_xmcp_attr_error_code_unusual;
 
 #define TCP_PORT_XMCP 4788
 #define XMCP_MAGIC_COOKIE 0x7f5a9bc7
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c
index d723c8647a..9756f2ae4f 100644
--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@@ -41,19 +41,19 @@ struct _attr_reg_data {
 };
 
 
-static gint ett_dtd = -1;
-static gint ett_xmpli = -1;
-
-static int hf_unknowwn_attrib = -1;
-static int hf_comment = -1;
-static int hf_xmlpi = -1;
-static int hf_dtd_tag = -1;
-static int hf_doctype = -1;
-static int hf_cdatasection = -1;
-
-static expert_field ei_xml_closing_unopened_tag = EI_INIT;
-static expert_field ei_xml_closing_unopened_xmpli_tag = EI_INIT;
-static expert_field ei_xml_unrecognized_text = EI_INIT;
+static gint ett_dtd;
+static gint ett_xmpli;
+
+static int hf_unknowwn_attrib;
+static int hf_comment;
+static int hf_xmlpi;
+static int hf_dtd_tag;
+static int hf_doctype;
+static int hf_cdatasection;
+
+static expert_field ei_xml_closing_unopened_tag;
+static expert_field ei_xml_closing_unopened_xmpli_tag;
+static expert_field ei_xml_unrecognized_text;
 
 /* dissector handles */
 static dissector_handle_t xml_handle;
diff --git a/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c
index a9de74ff5f..fcdf027106 100644
--- a/epan/dissectors/packet-xmpp.c
+++ b/epan/dissectors/packet-xmpp.c
@@ -27,337 +27,337 @@
 void proto_register_xmpp(void);
 void proto_reg_handoff_xmpp(void);
 
-int proto_xmpp = -1;
+int proto_xmpp;
 
 static gboolean xmpp_desegment = TRUE;
 
-gint hf_xmpp_xmlns = -1;
-gint hf_xmpp_id = -1;
-gint hf_xmpp_from = -1;
-gint hf_xmpp_to = -1;
-gint hf_xmpp_type = -1;
-gint hf_xmpp_cdata = -1;
-gint hf_xmpp_attribute = -1;
-
-gint hf_xmpp_iq = -1;
-
-gint hf_xmpp_query = -1;
-gint hf_xmpp_query_node = -1;
-
-gint hf_xmpp_query_item = -1;
-gint hf_xmpp_query_item_jid = -1;
-gint hf_xmpp_query_item_name = -1;
-gint hf_xmpp_query_item_subscription = -1;
-gint hf_xmpp_query_item_ask = -1;
-gint hf_xmpp_query_item_group = -1;
-gint hf_xmpp_query_item_node = -1;
-gint hf_xmpp_query_item_approved = -1;
-
-gint hf_xmpp_query_identity = -1;
-gint hf_xmpp_query_identity_category = -1;
-gint hf_xmpp_query_identity_type = -1;
-gint hf_xmpp_query_identity_name = -1;
-static gint hf_xmpp_query_identity_lang = -1;
-
-gint hf_xmpp_query_feature = -1;
-
-gint hf_xmpp_query_streamhost = -1;
-gint hf_xmpp_query_streamhost_used = -1;
-gint hf_xmpp_query_activate = -1;
-gint hf_xmpp_query_udpsuccess = -1;
-
-gint hf_xmpp_error = -1;
-gint hf_xmpp_error_type = -1;
-gint hf_xmpp_error_code = -1;
-gint hf_xmpp_error_condition = -1;
-gint hf_xmpp_error_text = -1;
-
-gint hf_xmpp_iq_bind = -1;
-gint hf_xmpp_iq_bind_jid = -1;
-gint hf_xmpp_iq_bind_resource = -1;
-
-gint hf_xmpp_services = -1;
-gint hf_xmpp_channel = -1;
-
-gint hf_xmpp_iq_session = -1;
-gint hf_xmpp_stream = -1;
-gint hf_xmpp_features = -1;
-
-gint hf_xmpp_vcard  = -1;
-gint hf_xmpp_vcard_x_update = -1;
-
-gint hf_xmpp_jingle = -1;
-gint hf_xmpp_jingle_sid = -1;
-gint hf_xmpp_jingle_initiator = -1;
-gint hf_xmpp_jingle_responder = -1;
-gint hf_xmpp_jingle_action = -1;
-
-gint hf_xmpp_jingle_content = -1;
-gint hf_xmpp_jingle_content_creator = -1;
-gint hf_xmpp_jingle_content_name = -1;
-gint hf_xmpp_jingle_content_disposition = -1;
-gint hf_xmpp_jingle_content_senders = -1;
-
-gint hf_xmpp_jingle_content_description = -1;
-gint hf_xmpp_jingle_content_description_media = -1;
-gint hf_xmpp_jingle_content_description_ssrc = -1;
-
-gint hf_xmpp_jingle_cont_desc_payload = -1;
-gint hf_xmpp_jingle_cont_desc_payload_id = -1;
-gint hf_xmpp_jingle_cont_desc_payload_channels = -1;
-gint hf_xmpp_jingle_cont_desc_payload_clockrate = -1;
-gint hf_xmpp_jingle_cont_desc_payload_maxptime = -1;
-gint hf_xmpp_jingle_cont_desc_payload_name = -1;
-gint hf_xmpp_jingle_cont_desc_payload_ptime = -1;
-
-gint hf_xmpp_jingle_cont_desc_payload_param = -1;
-gint hf_xmpp_jingle_cont_desc_payload_param_value = -1;
-gint hf_xmpp_jingle_cont_desc_payload_param_name = -1;
-
-gint hf_xmpp_jingle_cont_desc_enc = -1;
-gint hf_xmpp_jingle_cont_desc_enc_zrtp_hash = -1;
-gint hf_xmpp_jingle_cont_desc_enc_crypto = -1;
-
-gint hf_xmpp_jingle_cont_desc_rtp_hdr = -1;
-gint hf_xmpp_jingle_cont_desc_bandwidth = -1;
-
-gint hf_xmpp_jingle_cont_trans = -1;
-gint hf_xmpp_jingle_cont_trans_pwd = -1;
-gint hf_xmpp_jingle_cont_trans_ufrag = -1;
-
-gint hf_xmpp_jingle_cont_trans_cand = -1;
-gint hf_xmpp_jingle_cont_trans_rem_cand = -1;
-gint hf_xmpp_jingle_cont_trans_activated = -1;
-gint hf_xmpp_jingle_cont_trans_candidate_error = -1;
-gint hf_xmpp_jingle_cont_trans_candidate_used = -1;
-gint hf_xmpp_jingle_cont_trans_proxy_error = -1;
-
-
-gint hf_xmpp_jingle_reason = -1;
-gint hf_xmpp_jingle_reason_condition = -1;
-gint hf_xmpp_jingle_reason_text = -1;
-
-gint hf_xmpp_jingle_rtp_info = -1;
-
-gint hf_xmpp_jingle_file_transfer_offer = -1;
-gint hf_xmpp_jingle_file_transfer_request = -1;
-gint hf_xmpp_jingle_file_transfer_received = -1;
-gint hf_xmpp_jingle_file_transfer_abort = -1;
-gint hf_xmpp_jingle_file_transfer_checksum = -1;
-
-gint hf_xmpp_si = -1;
-gint hf_xmpp_si_file = -1;
-
-gint hf_xmpp_iq_feature_neg = -1;
-gint hf_xmpp_x_data = -1;
-gint hf_xmpp_x_data_field = -1;
-gint hf_xmpp_x_data_field_value = -1;
-gint hf_xmpp_x_data_instructions = -1;
-gint hf_xmpp_muc_user_status = -1;
-
-gint hf_xmpp_message = -1;
-gint hf_xmpp_message_chatstate = -1;
-
-gint hf_xmpp_message_thread = -1;
-gint hf_xmpp_message_thread_parent = -1;
-
-gint hf_xmpp_message_body = -1;
-gint hf_xmpp_message_subject = -1;
-
-gint hf_xmpp_ibb_open = -1;
-gint hf_xmpp_ibb_close = -1;
-gint hf_xmpp_ibb_data = -1;
-
-gint hf_xmpp_delay = -1;
-
-gint hf_xmpp_x_event = -1;
-gint hf_xmpp_x_event_condition = -1;
-
-gint hf_xmpp_presence = -1;
-gint hf_xmpp_presence_show = -1;
-gint hf_xmpp_presence_status = -1;
-gint hf_xmpp_presence_caps = -1;
-
-gint hf_xmpp_auth = -1;
-gint hf_xmpp_failure = -1;
-gint hf_xmpp_failure_text = -1;
-gint hf_xmpp_starttls = -1;
-gint hf_xmpp_proceed = -1;
-gint hf_xmpp_xml_header_version = -1;
-gint hf_xmpp_stream_end = -1;
-
-gint hf_xmpp_muc_x = -1;
-gint hf_xmpp_muc_user_x  = -1;
-gint hf_xmpp_muc_user_item  = -1;
-gint hf_xmpp_muc_user_invite  = -1;
-
-gint hf_xmpp_gtalk_session = -1;
-gint hf_xmpp_gtalk_session_type = -1;
-gint hf_xmpp_gtalk = -1;
-gint hf_xmpp_gtalk_setting = -1;
-gint hf_xmpp_gtalk_setting_element = -1;
-gint hf_xmpp_gtalk_nosave_x = -1;
-gint hf_xmpp_gtalk_mail_mailbox = -1;
-gint hf_xmpp_gtalk_mail_new_mail = -1;
-gint hf_xmpp_gtalk_transport_p2p = -1;
-gint hf_xmpp_gtalk_mail_snippet = -1;
-gint hf_xmpp_gtalk_status_status_list = -1;
-
-gint hf_xmpp_conf_info = -1;
-gint hf_xmpp_conf_info_sid = -1;
-
-gint hf_xmpp_unknown = -1;
-gint hf_xmpp_unknown_attr = -1;
-
-static gint hf_xmpp_out = -1;
-static gint hf_xmpp_in = -1;
-gint hf_xmpp_response_in = -1;
-gint hf_xmpp_response_to = -1;
-gint hf_xmpp_jingle_session = -1;
-gint hf_xmpp_ibb = -1;
-
-gint hf_xmpp_ping = -1;
-gint hf_xmpp_hashes = -1;
-
-gint hf_xmpp_jitsi_inputevt = -1;
-gint hf_xmpp_jitsi_inputevt_rmt_ctrl = -1;
-
-static gint ett_xmpp = -1;
-gint ett_xmpp_iq = -1;
-gint ett_xmpp_query = -1;
-gint ett_xmpp_query_item = -1;
-gint ett_xmpp_query_identity = -1;
-static gint ett_xmpp_query_feature = -1;
-
-gint ett_xmpp_query_streamhost = -1;
-gint ett_xmpp_query_streamhost_used = -1;
-gint ett_xmpp_query_udpsuccess = -1;
-
-static gint ett_xmpp_iq_error = -1;
-gint ett_xmpp_iq_bind = -1;
-gint ett_xmpp_iq_session = -1;
-gint ett_xmpp_vcard = -1;
-gint ett_xmpp_vcard_x_update = -1;
-
-gint ett_xmpp_jingle = -1;
-gint ett_xmpp_jingle_content = -1;
-gint ett_xmpp_jingle_content_description = -1;
-gint ett_xmpp_jingle_cont_desc_enc = -1;
-gint ett_xmpp_jingle_cont_desc_enc_zrtp_hash = -1;
-gint ett_xmpp_jingle_cont_desc_enc_crypto = -1;
-gint ett_xmpp_jingle_cont_desc_rtp_hdr = -1;
-gint ett_xmpp_jingle_cont_desc_bandwidth = -1;
-gint ett_xmpp_jingle_cont_desc_payload = -1;
-gint ett_xmpp_jingle_cont_desc_payload_param = -1;
-gint ett_xmpp_jingle_cont_trans = -1;
-gint ett_xmpp_jingle_cont_trans_cand = -1;
-gint ett_xmpp_jingle_cont_trans_rem_cand = -1;
-gint ett_xmpp_jingle_reason = -1;
-gint ett_xmpp_jingle_rtp_info = -1;
-
-gint ett_xmpp_jingle_file_transfer_offer = -1;
-gint ett_xmpp_jingle_file_transfer_request = -1;
-gint ett_xmpp_jingle_file_transfer_abort = -1;
-gint ett_xmpp_jingle_file_transfer_received = -1;
-gint ett_xmpp_jingle_file_transfer_checksum = -1;
-gint ett_xmpp_jingle_file_transfer_file = -1;
-
-gint ett_xmpp_services = -1;
-gint ett_xmpp_services_relay = -1;
-gint ett_xmpp_channel = -1;
-
-gint ett_xmpp_si = -1;
-gint ett_xmpp_si_file = -1;
-gint ett_xmpp_si_file_range = -1;
-
-gint ett_xmpp_iq_feature_neg = -1;
-gint ett_xmpp_x_data = -1;
-gint ett_xmpp_x_data_field = -1;
-gint ett_xmpp_x_data_field_value = -1;
-
-gint ett_xmpp_ibb_open = -1;
-gint ett_xmpp_ibb_close = -1;
-gint ett_xmpp_ibb_data = -1;
-
-gint ett_xmpp_delay = -1;
-
-gint ett_xmpp_x_event = -1;
-
-gint ett_xmpp_message = -1;
-gint ett_xmpp_message_thread = -1;
-gint ett_xmpp_message_body = -1;
-gint ett_xmpp_message_subject = -1;
-
-gint ett_xmpp_presence = -1;
-gint ett_xmpp_presence_status = -1;
-gint ett_xmpp_presence_caps = -1;
-
-gint ett_xmpp_auth = -1;
-static gint ett_xmpp_challenge = -1;
-static gint ett_xmpp_response = -1;
-static gint ett_xmpp_success = -1;
-gint ett_xmpp_failure = -1;
-gint ett_xmpp_stream = -1;
-gint ett_xmpp_features = -1;
-gint ett_xmpp_features_mechanisms = -1;
-gint ett_xmpp_starttls = -1;
-gint ett_xmpp_proceed = -1;
-
-gint ett_xmpp_muc_x = -1;
-gint ett_xmpp_muc_hist = -1;
-gint ett_xmpp_muc_user_x = -1;
-gint ett_xmpp_muc_user_item = -1;
-gint ett_xmpp_muc_user_invite = -1;
-
-gint ett_xmpp_gtalk_session = -1;
-gint ett_xmpp_gtalk_session_desc = -1;
-gint ett_xmpp_gtalk_session_cand = -1;
-gint ett_xmpp_gtalk_session_desc_payload = -1;
-gint ett_xmpp_gtalk_session_reason = -1;
-gint ett_xmpp_gtalk_jingleinfo_stun = -1;
-gint ett_xmpp_gtalk_jingleinfo_server = -1;
-gint ett_xmpp_gtalk_jingleinfo_relay = -1;
-gint ett_xmpp_gtalk_jingleinfo_relay_serv = -1;
-gint ett_xmpp_gtalk_setting = -1;
-gint ett_xmpp_gtalk_nosave_x = -1;
-gint ett_xmpp_gtalk_mail_mailbox = -1;
-gint ett_xmpp_gtalk_mail_mail_info = -1;
-gint ett_xmpp_gtalk_mail_senders = -1;
-gint ett_xmpp_gtalk_mail_sender = -1;
-gint ett_xmpp_gtalk_status_status_list = -1;
-gint ett_xmpp_gtalk_transport_p2p = -1;
-gint ett_xmpp_gtalk_transport_p2p_cand = -1;
-
-gint ett_xmpp_conf_info = -1;
-gint ett_xmpp_conf_desc = -1;
-gint ett_xmpp_conf_state = -1;
-gint ett_xmpp_conf_users = -1;
-gint ett_xmpp_conf_user = -1;
-gint ett_xmpp_conf_endpoint = -1;
-gint ett_xmpp_conf_media = -1;
-
-gint ett_xmpp_ping = -1;
-gint ett_xmpp_hashes = -1;
-gint ett_xmpp_hashes_hash = -1;
-
-gint ett_xmpp_jitsi_inputevt = -1;
-gint ett_xmpp_jitsi_inputevt_rmt_ctrl = -1;
+gint hf_xmpp_xmlns;
+gint hf_xmpp_id;
+gint hf_xmpp_from;
+gint hf_xmpp_to;
+gint hf_xmpp_type;
+gint hf_xmpp_cdata;
+gint hf_xmpp_attribute;
+
+gint hf_xmpp_iq;
+
+gint hf_xmpp_query;
+gint hf_xmpp_query_node;
+
+gint hf_xmpp_query_item;
+gint hf_xmpp_query_item_jid;
+gint hf_xmpp_query_item_name;
+gint hf_xmpp_query_item_subscription;
+gint hf_xmpp_query_item_ask;
+gint hf_xmpp_query_item_group;
+gint hf_xmpp_query_item_node;
+gint hf_xmpp_query_item_approved;
+
+gint hf_xmpp_query_identity;
+gint hf_xmpp_query_identity_category;
+gint hf_xmpp_query_identity_type;
+gint hf_xmpp_query_identity_name;
+static gint hf_xmpp_query_identity_lang;
+
+gint hf_xmpp_query_feature;
+
+gint hf_xmpp_query_streamhost;
+gint hf_xmpp_query_streamhost_used;
+gint hf_xmpp_query_activate;
+gint hf_xmpp_query_udpsuccess;
+
+gint hf_xmpp_error;
+gint hf_xmpp_error_type;
+gint hf_xmpp_error_code;
+gint hf_xmpp_error_condition;
+gint hf_xmpp_error_text;
+
+gint hf_xmpp_iq_bind;
+gint hf_xmpp_iq_bind_jid;
+gint hf_xmpp_iq_bind_resource;
+
+gint hf_xmpp_services;
+gint hf_xmpp_channel;
+
+gint hf_xmpp_iq_session;
+gint hf_xmpp_stream;
+gint hf_xmpp_features;
+
+gint hf_xmpp_vcard;
+gint hf_xmpp_vcard_x_update;
+
+gint hf_xmpp_jingle;
+gint hf_xmpp_jingle_sid;
+gint hf_xmpp_jingle_initiator;
+gint hf_xmpp_jingle_responder;
+gint hf_xmpp_jingle_action;
+
+gint hf_xmpp_jingle_content;
+gint hf_xmpp_jingle_content_creator;
+gint hf_xmpp_jingle_content_name;
+gint hf_xmpp_jingle_content_disposition;
+gint hf_xmpp_jingle_content_senders;
+
+gint hf_xmpp_jingle_content_description;
+gint hf_xmpp_jingle_content_description_media;
+gint hf_xmpp_jingle_content_description_ssrc;
+
+gint hf_xmpp_jingle_cont_desc_payload;
+gint hf_xmpp_jingle_cont_desc_payload_id;
+gint hf_xmpp_jingle_cont_desc_payload_channels;
+gint hf_xmpp_jingle_cont_desc_payload_clockrate;
+gint hf_xmpp_jingle_cont_desc_payload_maxptime;
+gint hf_xmpp_jingle_cont_desc_payload_name;
+gint hf_xmpp_jingle_cont_desc_payload_ptime;
+
+gint hf_xmpp_jingle_cont_desc_payload_param;
+gint hf_xmpp_jingle_cont_desc_payload_param_value;
+gint hf_xmpp_jingle_cont_desc_payload_param_name;
+
+gint hf_xmpp_jingle_cont_desc_enc;
+gint hf_xmpp_jingle_cont_desc_enc_zrtp_hash;
+gint hf_xmpp_jingle_cont_desc_enc_crypto;
+
+gint hf_xmpp_jingle_cont_desc_rtp_hdr;
+gint hf_xmpp_jingle_cont_desc_bandwidth;
+
+gint hf_xmpp_jingle_cont_trans;
+gint hf_xmpp_jingle_cont_trans_pwd;
+gint hf_xmpp_jingle_cont_trans_ufrag;
+
+gint hf_xmpp_jingle_cont_trans_cand;
+gint hf_xmpp_jingle_cont_trans_rem_cand;
+gint hf_xmpp_jingle_cont_trans_activated;
+gint hf_xmpp_jingle_cont_trans_candidate_error;
+gint hf_xmpp_jingle_cont_trans_candidate_used;
+gint hf_xmpp_jingle_cont_trans_proxy_error;
+
+
+gint hf_xmpp_jingle_reason;
+gint hf_xmpp_jingle_reason_condition;
+gint hf_xmpp_jingle_reason_text;
+
+gint hf_xmpp_jingle_rtp_info;
+
+gint hf_xmpp_jingle_file_transfer_offer;
+gint hf_xmpp_jingle_file_transfer_request;
+gint hf_xmpp_jingle_file_transfer_received;
+gint hf_xmpp_jingle_file_transfer_abort;
+gint hf_xmpp_jingle_file_transfer_checksum;
+
+gint hf_xmpp_si;
+gint hf_xmpp_si_file;
+
+gint hf_xmpp_iq_feature_neg;
+gint hf_xmpp_x_data;
+gint hf_xmpp_x_data_field;
+gint hf_xmpp_x_data_field_value;
+gint hf_xmpp_x_data_instructions;
+gint hf_xmpp_muc_user_status;
+
+gint hf_xmpp_message;
+gint hf_xmpp_message_chatstate;
+
+gint hf_xmpp_message_thread;
+gint hf_xmpp_message_thread_parent;
+
+gint hf_xmpp_message_body;
+gint hf_xmpp_message_subject;
+
+gint hf_xmpp_ibb_open;
+gint hf_xmpp_ibb_close;
+gint hf_xmpp_ibb_data;
+
+gint hf_xmpp_delay;
+
+gint hf_xmpp_x_event;
+gint hf_xmpp_x_event_condition;
+
+gint hf_xmpp_presence;
+gint hf_xmpp_presence_show;
+gint hf_xmpp_presence_status;
+gint hf_xmpp_presence_caps;
+
+gint hf_xmpp_auth;
+gint hf_xmpp_failure;
+gint hf_xmpp_failure_text;
+gint hf_xmpp_starttls;
+gint hf_xmpp_proceed;
+gint hf_xmpp_xml_header_version;
+gint hf_xmpp_stream_end;
+
+gint hf_xmpp_muc_x;
+gint hf_xmpp_muc_user_x;
+gint hf_xmpp_muc_user_item;
+gint hf_xmpp_muc_user_invite;
+
+gint hf_xmpp_gtalk_session;
+gint hf_xmpp_gtalk_session_type;
+gint hf_xmpp_gtalk;
+gint hf_xmpp_gtalk_setting;
+gint hf_xmpp_gtalk_setting_element;
+gint hf_xmpp_gtalk_nosave_x;
+gint hf_xmpp_gtalk_mail_mailbox;
+gint hf_xmpp_gtalk_mail_new_mail;
+gint hf_xmpp_gtalk_transport_p2p;
+gint hf_xmpp_gtalk_mail_snippet;
+gint hf_xmpp_gtalk_status_status_list;
+
+gint hf_xmpp_conf_info;
+gint hf_xmpp_conf_info_sid;
+
+gint hf_xmpp_unknown;
+gint hf_xmpp_unknown_attr;
+
+static gint hf_xmpp_out;
+static gint hf_xmpp_in;
+gint hf_xmpp_response_in;
+gint hf_xmpp_response_to;
+gint hf_xmpp_jingle_session;
+gint hf_xmpp_ibb;
+
+gint hf_xmpp_ping;
+gint hf_xmpp_hashes;
+
+gint hf_xmpp_jitsi_inputevt;
+gint hf_xmpp_jitsi_inputevt_rmt_ctrl;
+
+static gint ett_xmpp;
+gint ett_xmpp_iq;
+gint ett_xmpp_query;
+gint ett_xmpp_query_item;
+gint ett_xmpp_query_identity;
+static gint ett_xmpp_query_feature;
+
+gint ett_xmpp_query_streamhost;
+gint ett_xmpp_query_streamhost_used;
+gint ett_xmpp_query_udpsuccess;
+
+static gint ett_xmpp_iq_error;
+gint ett_xmpp_iq_bind;
+gint ett_xmpp_iq_session;
+gint ett_xmpp_vcard;
+gint ett_xmpp_vcard_x_update;
+
+gint ett_xmpp_jingle;
+gint ett_xmpp_jingle_content;
+gint ett_xmpp_jingle_content_description;
+gint ett_xmpp_jingle_cont_desc_enc;
+gint ett_xmpp_jingle_cont_desc_enc_zrtp_hash;
+gint ett_xmpp_jingle_cont_desc_enc_crypto;
+gint ett_xmpp_jingle_cont_desc_rtp_hdr;
+gint ett_xmpp_jingle_cont_desc_bandwidth;
+gint ett_xmpp_jingle_cont_desc_payload;
+gint ett_xmpp_jingle_cont_desc_payload_param;
+gint ett_xmpp_jingle_cont_trans;
+gint ett_xmpp_jingle_cont_trans_cand;
+gint ett_xmpp_jingle_cont_trans_rem_cand;
+gint ett_xmpp_jingle_reason;
+gint ett_xmpp_jingle_rtp_info;
+
+gint ett_xmpp_jingle_file_transfer_offer;
+gint ett_xmpp_jingle_file_transfer_request;
+gint ett_xmpp_jingle_file_transfer_abort;
+gint ett_xmpp_jingle_file_transfer_received;
+gint ett_xmpp_jingle_file_transfer_checksum;
+gint ett_xmpp_jingle_file_transfer_file;
+
+gint ett_xmpp_services;
+gint ett_xmpp_services_relay;
+gint ett_xmpp_channel;
+
+gint ett_xmpp_si;
+gint ett_xmpp_si_file;
+gint ett_xmpp_si_file_range;
+
+gint ett_xmpp_iq_feature_neg;
+gint ett_xmpp_x_data;
+gint ett_xmpp_x_data_field;
+gint ett_xmpp_x_data_field_value;
+
+gint ett_xmpp_ibb_open;
+gint ett_xmpp_ibb_close;
+gint ett_xmpp_ibb_data;
+
+gint ett_xmpp_delay;
+
+gint ett_xmpp_x_event;
+
+gint ett_xmpp_message;
+gint ett_xmpp_message_thread;
+gint ett_xmpp_message_body;
+gint ett_xmpp_message_subject;
+
+gint ett_xmpp_presence;
+gint ett_xmpp_presence_status;
+gint ett_xmpp_presence_caps;
+
+gint ett_xmpp_auth;
+static gint ett_xmpp_challenge;
+static gint ett_xmpp_response;
+static gint ett_xmpp_success;
+gint ett_xmpp_failure;
+gint ett_xmpp_stream;
+gint ett_xmpp_features;
+gint ett_xmpp_features_mechanisms;
+gint ett_xmpp_starttls;
+gint ett_xmpp_proceed;
+
+gint ett_xmpp_muc_x;
+gint ett_xmpp_muc_hist;
+gint ett_xmpp_muc_user_x;
+gint ett_xmpp_muc_user_item;
+gint ett_xmpp_muc_user_invite;
+
+gint ett_xmpp_gtalk_session;
+gint ett_xmpp_gtalk_session_desc;
+gint ett_xmpp_gtalk_session_cand;
+gint ett_xmpp_gtalk_session_desc_payload;
+gint ett_xmpp_gtalk_session_reason;
+gint ett_xmpp_gtalk_jingleinfo_stun;
+gint ett_xmpp_gtalk_jingleinfo_server;
+gint ett_xmpp_gtalk_jingleinfo_relay;
+gint ett_xmpp_gtalk_jingleinfo_relay_serv;
+gint ett_xmpp_gtalk_setting;
+gint ett_xmpp_gtalk_nosave_x;
+gint ett_xmpp_gtalk_mail_mailbox;
+gint ett_xmpp_gtalk_mail_mail_info;
+gint ett_xmpp_gtalk_mail_senders;
+gint ett_xmpp_gtalk_mail_sender;
+gint ett_xmpp_gtalk_status_status_list;
+gint ett_xmpp_gtalk_transport_p2p;
+gint ett_xmpp_gtalk_transport_p2p_cand;
+
+gint ett_xmpp_conf_info;
+gint ett_xmpp_conf_desc;
+gint ett_xmpp_conf_state;
+gint ett_xmpp_conf_users;
+gint ett_xmpp_conf_user;
+gint ett_xmpp_conf_endpoint;
+gint ett_xmpp_conf_media;
+
+gint ett_xmpp_ping;
+gint ett_xmpp_hashes;
+gint ett_xmpp_hashes_hash;
+
+gint ett_xmpp_jitsi_inputevt;
+gint ett_xmpp_jitsi_inputevt_rmt_ctrl;
 
 gint ett_unknown[ETT_UNKNOWN_LEN];
 
-static expert_field ei_xmpp_xml_disabled = EI_INIT;
-static expert_field ei_xmpp_packet_unknown = EI_INIT;
-expert_field ei_xmpp_starttls_missing = EI_INIT;
-expert_field ei_xmpp_response = EI_INIT;
-static expert_field ei_xmpp_challenge = EI_INIT;
-static expert_field ei_xmpp_success = EI_INIT;
-expert_field ei_xmpp_proceed_already_in_frame = EI_INIT;
-expert_field ei_xmpp_starttls_already_in_frame = EI_INIT;
-expert_field ei_xmpp_packet_without_response = EI_INIT;
-expert_field ei_xmpp_unknown_element = EI_INIT;
-expert_field ei_xmpp_field_unexpected_value = EI_INIT;
-expert_field ei_xmpp_unknown_attribute = EI_INIT;
-expert_field ei_xmpp_required_attribute = EI_INIT;
+static expert_field ei_xmpp_xml_disabled;
+static expert_field ei_xmpp_packet_unknown;
+expert_field ei_xmpp_starttls_missing;
+expert_field ei_xmpp_response;
+static expert_field ei_xmpp_challenge;
+static expert_field ei_xmpp_success;
+expert_field ei_xmpp_proceed_already_in_frame;
+expert_field ei_xmpp_starttls_already_in_frame;
+expert_field ei_xmpp_packet_without_response;
+expert_field ei_xmpp_unknown_element;
+expert_field ei_xmpp_field_unexpected_value;
+expert_field ei_xmpp_unknown_attribute;
+expert_field ei_xmpp_required_attribute;
 
 static dissector_handle_t xmpp_handle;
 
diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c
index 9708be335b..c8b6543aea 100644
--- a/epan/dissectors/packet-xot.c
+++ b/epan/dissectors/packet-xot.c
@@ -62,27 +62,27 @@ static const value_string xot_pvc_status_vals[] = {
    { 0,   NULL}
 };
 
-static gint proto_xot = -1;
-static gint ett_xot = -1;
-static gint hf_xot_version = -1;
-static gint hf_xot_length = -1;
-
-static gint hf_x25_gfi = -1;
-static gint hf_x25_lcn = -1;
-static gint hf_x25_type = -1;
-
-static gint hf_xot_pvc_version = -1;
-static gint hf_xot_pvc_status = -1;
-static gint hf_xot_pvc_init_itf_name_len = -1;
-static gint hf_xot_pvc_init_lcn = -1;
-static gint hf_xot_pvc_resp_itf_name_len = -1;
-static gint hf_xot_pvc_resp_lcn = -1;
-static gint hf_xot_pvc_send_inc_window = -1;
-static gint hf_xot_pvc_send_out_window = -1;
-static gint hf_xot_pvc_send_inc_pkt_size = -1;
-static gint hf_xot_pvc_send_out_pkt_size = -1;
-static gint hf_xot_pvc_init_itf_name = -1;
-static gint hf_xot_pvc_resp_itf_name = -1;
+static gint proto_xot;
+static gint ett_xot;
+static gint hf_xot_version;
+static gint hf_xot_length;
+
+static gint hf_x25_gfi;
+static gint hf_x25_lcn;
+static gint hf_x25_type;
+
+static gint hf_xot_pvc_version;
+static gint hf_xot_pvc_status;
+static gint hf_xot_pvc_init_itf_name_len;
+static gint hf_xot_pvc_init_lcn;
+static gint hf_xot_pvc_resp_itf_name_len;
+static gint hf_xot_pvc_resp_lcn;
+static gint hf_xot_pvc_send_inc_window;
+static gint hf_xot_pvc_send_out_window;
+static gint hf_xot_pvc_send_inc_pkt_size;
+static gint hf_xot_pvc_send_out_pkt_size;
+static gint hf_xot_pvc_init_itf_name;
+static gint hf_xot_pvc_resp_itf_name;
 
 static dissector_handle_t xot_handle;
 static dissector_handle_t xot_tcp_handle;
diff --git a/epan/dissectors/packet-xra.c b/epan/dissectors/packet-xra.c
index 3973e6d37c..262c2d9d6a 100644
--- a/epan/dissectors/packet-xra.c
+++ b/epan/dissectors/packet-xra.c
@@ -24,133 +24,133 @@ void proto_reg_handoff_xra(void);
 static dissector_handle_t docsis_handle;
 static dissector_handle_t xra_handle;
 
-static int proto_xra = -1;
-
-static int proto_plc = -1;
-static int proto_ncp = -1;
-static int proto_segment = -1;
-static int proto_init_ranging = -1;
-
-static gint ett_xra = -1;
-static gint ett_xra_tlv = -1;
-static gint ett_xra_tlv_cw_info = -1;
-static gint ett_xra_tlv_ms_info = -1;
-static gint ett_xra_tlv_burst_info = -1;
-static gint ett_plc = -1;
-static gint ett_plc_mb = -1;
-static gint ett_plc_timestamp = -1;
-static gint ett_ncp = -1;
-static gint ett_ncp_mb = -1;
-static gint ett_init_ranging = -1;
-
-static gint hf_xra_version = -1;
-static gint hf_xra_direction = -1;
-static gint hf_xra_packettype = -1;
-static gint hf_xra_tlvlength = -1;
-static gint hf_xra_tlv = -1;
+static int proto_xra;
+
+static int proto_plc;
+static int proto_ncp;
+static int proto_segment;
+static int proto_init_ranging;
+
+static gint ett_xra;
+static gint ett_xra_tlv;
+static gint ett_xra_tlv_cw_info;
+static gint ett_xra_tlv_ms_info;
+static gint ett_xra_tlv_burst_info;
+static gint ett_plc;
+static gint ett_plc_mb;
+static gint ett_plc_timestamp;
+static gint ett_ncp;
+static gint ett_ncp_mb;
+static gint ett_init_ranging;
+
+static gint hf_xra_version;
+static gint hf_xra_direction;
+static gint hf_xra_packettype;
+static gint hf_xra_tlvlength;
+static gint hf_xra_tlv;
 
 /* XRA TLV */
-static gint hf_xra_tlv_ds_channel_id = -1;
-static gint hf_xra_tlv_ds_channel_frequency = -1;
-static gint hf_xra_tlv_modulation = -1;
-static gint hf_xra_tlv_annex = -1;
-static gint hf_xra_tlv_us_channel_id = -1;
-static gint hf_xra_tlv_profile_id = -1;
-static gint hf_xra_tlv_sid = -1;
-static gint hf_xra_tlv_iuc = -1;
-static gint hf_xra_tlv_burstid = -1;
-static gint hf_xra_tlv_ms_info = -1;
-static gint hf_xra_tlv_burst_info = -1;
-static gint hf_xra_tlv_ucd_ccc_parity = -1;
-static gint hf_xra_tlv_grant_size = -1;
-static gint hf_xra_tlv_segment_header_present = -1;
-static gint hf_xra_tlv_ncp_trunc = -1;
-static gint hf_xra_tlv_ncp_symbolid = -1;
+static gint hf_xra_tlv_ds_channel_id;
+static gint hf_xra_tlv_ds_channel_frequency;
+static gint hf_xra_tlv_modulation;
+static gint hf_xra_tlv_annex;
+static gint hf_xra_tlv_us_channel_id;
+static gint hf_xra_tlv_profile_id;
+static gint hf_xra_tlv_sid;
+static gint hf_xra_tlv_iuc;
+static gint hf_xra_tlv_burstid;
+static gint hf_xra_tlv_ms_info;
+static gint hf_xra_tlv_burst_info;
+static gint hf_xra_tlv_ucd_ccc_parity;
+static gint hf_xra_tlv_grant_size;
+static gint hf_xra_tlv_segment_header_present;
+static gint hf_xra_tlv_ncp_trunc;
+static gint hf_xra_tlv_ncp_symbolid;
 
 /* Minislot Info */
-static gint hf_xra_tlv_start_minislot_id_abs = -1;
-static gint hf_xra_tlv_start_minislot_id_rel = -1;
-static gint hf_xra_tlv_stop_minislot_id_rel = -1;
+static gint hf_xra_tlv_start_minislot_id_abs;
+static gint hf_xra_tlv_start_minislot_id_rel;
+static gint hf_xra_tlv_stop_minislot_id_rel;
 
 /* Ranging TLV */
-static gint hf_xra_tlv_ranging_number_ofdma_frames = -1;
-static gint hf_xra_tlv_ranging_timing_adjust = -1;
+static gint hf_xra_tlv_ranging_number_ofdma_frames;
+static gint hf_xra_tlv_ranging_timing_adjust;
 
-static gint hf_xra_tlv_power_level = -1;
-static gint hf_xra_tlv_mer = -1;
-static gint hf_xra_tlv_subslot_id =-1;
-static gint hf_xra_tlv_control_word = -1;
+static gint hf_xra_tlv_power_level;
+static gint hf_xra_tlv_mer;
+static gint hf_xra_tlv_subslot_id;
+static gint hf_xra_tlv_control_word;
 
-static gint hf_xra_unknown = -1;
+static gint hf_xra_unknown;
 
 /* Codeword Info TLV */
-static gint hf_xra_tlv_cw_info = -1;
-static gint hf_xra_tlv_cw_info_nr_of_info_bytes = -1;
-static gint hf_xra_tlv_cw_info_bch_decoding_successful = -1;
-static gint hf_xra_tlv_cw_info_profile_parity = -1;
-static gint hf_xra_tlv_cw_info_bch_number_of_corrected_bits = -1;
-static gint hf_xra_tlv_cw_info_ldpc_nr_of_code_bits = -1;
-static gint hf_xra_tlv_cw_info_ldpc_decoding_successful = -1;
-static gint hf_xra_tlv_cw_info_ldpc_number_of_corrected_bits = -1;
-static gint hf_xra_tlv_cw_info_ldpc_number_of_iterations = -1;
-static gint hf_xra_tlv_cw_info_rs_decoding_successful = -1;
-static gint hf_xra_tlv_cw_info_rs_number_of_corrected_symbols = -1;
+static gint hf_xra_tlv_cw_info;
+static gint hf_xra_tlv_cw_info_nr_of_info_bytes;
+static gint hf_xra_tlv_cw_info_bch_decoding_successful;
+static gint hf_xra_tlv_cw_info_profile_parity;
+static gint hf_xra_tlv_cw_info_bch_number_of_corrected_bits;
+static gint hf_xra_tlv_cw_info_ldpc_nr_of_code_bits;
+static gint hf_xra_tlv_cw_info_ldpc_decoding_successful;
+static gint hf_xra_tlv_cw_info_ldpc_number_of_corrected_bits;
+static gint hf_xra_tlv_cw_info_ldpc_number_of_iterations;
+static gint hf_xra_tlv_cw_info_rs_decoding_successful;
+static gint hf_xra_tlv_cw_info_rs_number_of_corrected_symbols;
 
 /* Burst Info TLV */
-static gint hf_xra_tlv_burst_info_burst_id_reference = -1;
+static gint hf_xra_tlv_burst_info_burst_id_reference;
 
 /* PLC Specific */
-static gint hf_plc_mb = -1;
+static gint hf_plc_mb;
 
 /* NCP Specific */
-static gint hf_ncp_mb = -1;
-static gint hf_ncp_mb_profileid = -1;
-static gint hf_ncp_mb_z = -1;
-static gint hf_ncp_mb_c = -1;
-static gint hf_ncp_mb_n = -1;
-static gint hf_ncp_mb_l = -1;
-static gint hf_ncp_mb_t = -1;
-static gint hf_ncp_mb_u = -1;
-static gint hf_ncp_mb_r = -1;
-static gint hf_ncp_mb_subcarrier_start_pointer = -1;
-static gint hf_ncp_crc = -1;
+static gint hf_ncp_mb;
+static gint hf_ncp_mb_profileid;
+static gint hf_ncp_mb_z;
+static gint hf_ncp_mb_c;
+static gint hf_ncp_mb_n;
+static gint hf_ncp_mb_l;
+static gint hf_ncp_mb_t;
+static gint hf_ncp_mb_u;
+static gint hf_ncp_mb_r;
+static gint hf_ncp_mb_subcarrier_start_pointer;
+static gint hf_ncp_crc;
 
 /* Init Ranging Specific */
-static gint hf_xra_init_ranging_mac = -1;
-static gint hf_xra_init_ranging_ds_channel_id = -1;
-static gint hf_xra_init_ranging_crc = -1;
+static gint hf_xra_init_ranging_mac;
+static gint hf_xra_init_ranging_ds_channel_id;
+static gint hf_xra_init_ranging_crc;
 
 /* PLC MB */
-static gint hf_plc_em_mb = -1;
-static gint hf_plc_trigger_mb = -1;
+static gint hf_plc_em_mb;
+static gint hf_plc_trigger_mb;
 
 /* PLC Timestamp MB Specific */
-static gint hf_plc_mb_ts_reserved = -1;
-static gint hf_plc_mb_ts_timestamp = -1;
-static gint hf_plc_mb_ts_timestamp_epoch = -1;
-static gint hf_plc_mb_ts_timestamp_d30timestamp = -1;
-static gint hf_plc_mb_ts_timestamp_extra_204_8 = -1;
-static gint hf_plc_mb_ts_timestamp_extra_204_8_X_16 = -1;
-static gint hf_plc_mb_ts_timestamp_formatted = -1;
-static gint hf_plc_mb_ts_crc24d = -1;
+static gint hf_plc_mb_ts_reserved;
+static gint hf_plc_mb_ts_timestamp;
+static gint hf_plc_mb_ts_timestamp_epoch;
+static gint hf_plc_mb_ts_timestamp_d30timestamp;
+static gint hf_plc_mb_ts_timestamp_extra_204_8;
+static gint hf_plc_mb_ts_timestamp_extra_204_8_X_16;
+static gint hf_plc_mb_ts_timestamp_formatted;
+static gint hf_plc_mb_ts_crc24d;
 
 /* PLC Message Channel MB Specific */
-static gint hf_plc_mb_mc_reserved = -1;
-static gint hf_plc_mb_mc_pspf_present = -1;
-static gint hf_plc_mb_mc_psp = -1;
+static gint hf_plc_mb_mc_reserved;
+static gint hf_plc_mb_mc_pspf_present;
+static gint hf_plc_mb_mc_psp;
 
 /* OFDMA Segment */
-static gint hf_docsis_segment_pfi = -1;
-static gint hf_docsis_segment_reserved = -1;
-static gint hf_docsis_segment_pointerfield = -1;
-static gint hf_docsis_segment_sequencenumber = -1;
-static gint hf_docsis_segment_sidclusterid = -1;
-static gint hf_docsis_segment_request = -1;
-static gint hf_docsis_segment_hcs = -1;
-static gint hf_docsis_segment_hcs_status = -1;
-static gint hf_docsis_segment_data = -1;
-
-static expert_field ei_docsis_segment_hcs_bad = EI_INIT;
+static gint hf_docsis_segment_pfi;
+static gint hf_docsis_segment_reserved;
+static gint hf_docsis_segment_pointerfield;
+static gint hf_docsis_segment_sequencenumber;
+static gint hf_docsis_segment_sidclusterid;
+static gint hf_docsis_segment_request;
+static gint hf_docsis_segment_hcs;
+static gint hf_docsis_segment_hcs_status;
+static gint hf_docsis_segment_data;
+
+static expert_field ei_docsis_segment_hcs_bad;
 
 static int dissect_xra(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_);
 static int dissect_xra_tlv(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_, guint16 tlvLength, guint* segmentHeaderPresent);
diff --git a/epan/dissectors/packet-xti.c b/epan/dissectors/packet-xti.c
index b5e5e2a221..7e20b8805c 100644
--- a/epan/dissectors/packet-xti.c
+++ b/epan/dissectors/packet-xti.c
@@ -43,18 +43,18 @@ void proto_register_xti(void);
 
 static dissector_handle_t xti_handle;
 
-static int proto_xti = -1;
-static expert_field ei_xti_counter_overflow = EI_INIT;
-static expert_field ei_xti_invalid_template = EI_INIT;
-static expert_field ei_xti_invalid_length = EI_INIT;
-static expert_field ei_xti_unaligned = EI_INIT;
-static expert_field ei_xti_missing = EI_INIT;
-static expert_field ei_xti_overused = EI_INIT;
+static int proto_xti;
+static expert_field ei_xti_counter_overflow;
+static expert_field ei_xti_invalid_template;
+static expert_field ei_xti_invalid_length;
+static expert_field ei_xti_unaligned;
+static expert_field ei_xti_missing;
+static expert_field ei_xti_overused;
 
 static int hf_xti[324];
-static int hf_xti_dscp_exec_summary = -1;
-static int hf_xti_dscp_improved = -1;
-static int hf_xti_dscp_widened = -1;
+static int hf_xti_dscp_exec_summary;
+static int hf_xti_dscp_improved;
+static int hf_xti_dscp_widened;
 enum Field_Handle_Index {
       ACCOUNT_FH_IDX
     , ACCRUEDINTERESAMT_FH_IDX
@@ -2021,7 +2021,7 @@ struct ETI_Field {
 };
 
 static gint ett_xti[32];
-static gint ett_xti_dscp = -1;
+static gint ett_xti_dscp;
 /* This method dissects fully reassembled messages */
 static int
 dissect_xti_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c
index b85abf165e..1918cadd81 100644
--- a/epan/dissectors/packet-xtp.c
+++ b/epan/dissectors/packet-xtp.c
@@ -224,93 +224,93 @@ static const value_string diag_val_vals[] = {
 };
 
 /* Initialize the protocol and registered fields */
-static int proto_xtp = -1;
+static int proto_xtp;
 /* common header */
-static int hf_xtp_key = -1;
-static int hf_xtp_cmd = -1;
-static int hf_xtp_cmd_options = -1;
-static int hf_xtp_cmd_options_nocheck = -1;
-static int hf_xtp_cmd_options_edge = -1;
-static int hf_xtp_cmd_options_noerr = -1;
-static int hf_xtp_cmd_options_multi = -1;
-static int hf_xtp_cmd_options_res = -1;
-static int hf_xtp_cmd_options_sort = -1;
-static int hf_xtp_cmd_options_noflow = -1;
-static int hf_xtp_cmd_options_fastnak = -1;
-static int hf_xtp_cmd_options_sreq = -1;
-static int hf_xtp_cmd_options_dreq = -1;
-static int hf_xtp_cmd_options_rclose = -1;
-static int hf_xtp_cmd_options_wclose = -1;
-static int hf_xtp_cmd_options_eom = -1;
-static int hf_xtp_cmd_options_end = -1;
-static int hf_xtp_cmd_options_btag = -1;
-static int hf_xtp_cmd_ptype = -1;
-static int hf_xtp_cmd_ptype_ver = -1;
-static int hf_xtp_cmd_ptype_pformat = -1;
-static int hf_xtp_dlen = -1;
-static int hf_xtp_sort = -1;
-static int hf_xtp_sync = -1;
-static int hf_xtp_seq = -1;
+static int hf_xtp_key;
+static int hf_xtp_cmd;
+static int hf_xtp_cmd_options;
+static int hf_xtp_cmd_options_nocheck;
+static int hf_xtp_cmd_options_edge;
+static int hf_xtp_cmd_options_noerr;
+static int hf_xtp_cmd_options_multi;
+static int hf_xtp_cmd_options_res;
+static int hf_xtp_cmd_options_sort;
+static int hf_xtp_cmd_options_noflow;
+static int hf_xtp_cmd_options_fastnak;
+static int hf_xtp_cmd_options_sreq;
+static int hf_xtp_cmd_options_dreq;
+static int hf_xtp_cmd_options_rclose;
+static int hf_xtp_cmd_options_wclose;
+static int hf_xtp_cmd_options_eom;
+static int hf_xtp_cmd_options_end;
+static int hf_xtp_cmd_options_btag;
+static int hf_xtp_cmd_ptype;
+static int hf_xtp_cmd_ptype_ver;
+static int hf_xtp_cmd_ptype_pformat;
+static int hf_xtp_dlen;
+static int hf_xtp_sort;
+static int hf_xtp_sync;
+static int hf_xtp_seq;
 /* control segment */
-static int hf_xtp_cntl_rseq = -1;
-static int hf_xtp_cntl_alloc = -1;
-static int hf_xtp_cntl_echo = -1;
-static int hf_xtp_ecntl_rseq = -1;
-static int hf_xtp_ecntl_alloc = -1;
-static int hf_xtp_ecntl_echo = -1;
-static int hf_xtp_ecntl_nspan = -1;
-static int hf_xtp_ecntl_span_left = -1;
-static int hf_xtp_ecntl_span_right = -1;
-static int hf_xtp_tcntl_rseq = -1;
-static int hf_xtp_tcntl_alloc = -1;
-static int hf_xtp_tcntl_echo = -1;
-static int hf_xtp_tcntl_rsvd = -1;
-static int hf_xtp_tcntl_xkey = -1;
+static int hf_xtp_cntl_rseq;
+static int hf_xtp_cntl_alloc;
+static int hf_xtp_cntl_echo;
+static int hf_xtp_ecntl_rseq;
+static int hf_xtp_ecntl_alloc;
+static int hf_xtp_ecntl_echo;
+static int hf_xtp_ecntl_nspan;
+static int hf_xtp_ecntl_span_left;
+static int hf_xtp_ecntl_span_right;
+static int hf_xtp_tcntl_rseq;
+static int hf_xtp_tcntl_alloc;
+static int hf_xtp_tcntl_echo;
+static int hf_xtp_tcntl_rsvd;
+static int hf_xtp_tcntl_xkey;
 /* traffic specifier */
-static int hf_xtp_tspec_tlen = -1;
-static int hf_xtp_tspec_service = -1;
-static int hf_xtp_tspec_tformat = -1;
-static int hf_xtp_tspec_traffic = -1;
-static int hf_xtp_tspec_maxdata = -1;
-static int hf_xtp_tspec_inrate = -1;
-static int hf_xtp_tspec_outrate = -1;
-static int hf_xtp_tspec_inburst = -1;
-static int hf_xtp_tspec_outburst = -1;
+static int hf_xtp_tspec_tlen;
+static int hf_xtp_tspec_service;
+static int hf_xtp_tspec_tformat;
+static int hf_xtp_tspec_traffic;
+static int hf_xtp_tspec_maxdata;
+static int hf_xtp_tspec_inrate;
+static int hf_xtp_tspec_outrate;
+static int hf_xtp_tspec_inburst;
+static int hf_xtp_tspec_outburst;
 /* address segment */
-static int hf_xtp_aseg_alen = -1;
-static int hf_xtp_aseg_adomain = -1;
-static int hf_xtp_aseg_aformat = -1;
-static int hf_xtp_aseg_address = -1;
-static int hf_xtp_aseg_dsthost = -1;
-static int hf_xtp_aseg_srchost = -1;
-static int hf_xtp_aseg_dstport = -1;
-static int hf_xtp_aseg_srcport = -1;
+static int hf_xtp_aseg_alen;
+static int hf_xtp_aseg_adomain;
+static int hf_xtp_aseg_aformat;
+static int hf_xtp_aseg_address;
+static int hf_xtp_aseg_dsthost;
+static int hf_xtp_aseg_srchost;
+static int hf_xtp_aseg_dstport;
+static int hf_xtp_aseg_srcport;
 /* others */
-static int hf_xtp_btag = -1;
-static int hf_xtp_diag_code = -1;
-static int hf_xtp_diag_val = -1;
-static int hf_xtp_diag_msg = -1;
-static int hf_xtp_checksum = -1;
-static int hf_xtp_checksum_status = -1;
-static int hf_xtp_data = -1;
+static int hf_xtp_btag;
+static int hf_xtp_diag_code;
+static int hf_xtp_diag_val;
+static int hf_xtp_diag_msg;
+static int hf_xtp_checksum;
+static int hf_xtp_checksum_status;
+static int hf_xtp_data;
 
 /* Initialize the subtree pointers */
-static gint ett_xtp = -1;
-static gint ett_xtp_cmd = -1;
-static gint ett_xtp_cmd_options = -1;
-static gint ett_xtp_cmd_ptype = -1;
-static gint ett_xtp_cntl = -1;
-static gint ett_xtp_ecntl = -1;
-static gint ett_xtp_tcntl = -1;
-static gint ett_xtp_tspec = -1;
-static gint ett_xtp_jcntl = -1;
-static gint ett_xtp_first = -1;
-static gint ett_xtp_aseg = -1;
-static gint ett_xtp_data = -1;
-static gint ett_xtp_diag = -1;
-
-static expert_field ei_xtp_spans_bad = EI_INIT;
-static expert_field ei_xtp_checksum = EI_INIT;
+static gint ett_xtp;
+static gint ett_xtp_cmd;
+static gint ett_xtp_cmd_options;
+static gint ett_xtp_cmd_ptype;
+static gint ett_xtp_cntl;
+static gint ett_xtp_ecntl;
+static gint ett_xtp_tcntl;
+static gint ett_xtp_tspec;
+static gint ett_xtp_jcntl;
+static gint ett_xtp_first;
+static gint ett_xtp_aseg;
+static gint ett_xtp_data;
+static gint ett_xtp_diag;
+
+static expert_field ei_xtp_spans_bad;
+static expert_field ei_xtp_checksum;
 
 /* dissector of each payload */
 static int
diff --git a/epan/dissectors/packet-xyplex.c b/epan/dissectors/packet-xyplex.c
index 6c9b511385..31d05b40af 100644
--- a/epan/dissectors/packet-xyplex.c
+++ b/epan/dissectors/packet-xyplex.c
@@ -20,16 +20,16 @@
 void proto_register_xyplex(void);
 void proto_reg_handoff_xyplex(void);
 
-static int proto_xyplex = -1;
-static int hf_xyplex_type = -1;
-static int hf_xyplex_pad = -1;
-static int hf_xyplex_server_port = -1;
-static int hf_xyplex_return_port = -1;
-static int hf_xyplex_reserved = -1;
-static int hf_xyplex_reply = -1;
-static int hf_xyplex_data = -1;
-
-static gint ett_xyplex = -1;
+static int proto_xyplex;
+static int hf_xyplex_type;
+static int hf_xyplex_pad;
+static int hf_xyplex_server_port;
+static int hf_xyplex_return_port;
+static int hf_xyplex_reserved;
+static int hf_xyplex_reply;
+static int hf_xyplex_data;
+
+static gint ett_xyplex;
 
 static dissector_handle_t xyplex_handle;
 
diff --git a/epan/dissectors/packet-yami.c b/epan/dissectors/packet-yami.c
index eaa2e757a8..ba2dad82e9 100644
--- a/epan/dissectors/packet-yami.c
+++ b/epan/dissectors/packet-yami.c
@@ -57,30 +57,30 @@ static const value_string yami_param_type_vals[] = {
 	{ 0, NULL }
 };
 
-static int proto_yami = -1;
-
-static int hf_yami_frame_number = -1;
-static int hf_yami_frame_payload_size = -1;
-static int hf_yami_items_count = -1;
-static int hf_yami_message_data = -1;
-static int hf_yami_message_hdr = -1;
-static int hf_yami_message_header_size = -1;
-static int hf_yami_message_id = -1;
-static int hf_yami_param = -1;
-static int hf_yami_param_name = -1;
-static int hf_yami_param_type = -1;
-static int hf_yami_param_value_bin = -1;
-static int hf_yami_param_value_bool = -1;
-static int hf_yami_param_value_double = -1;
-static int hf_yami_param_value_int = -1;
-static int hf_yami_param_value_long = -1;
-static int hf_yami_param_value_str = -1;
-static int hf_yami_params_count = -1;
-
-static int ett_yami = -1;
-static int ett_yami_msg_hdr = -1;
-static int ett_yami_msg_data = -1;
-static int ett_yami_param = -1;
+static int proto_yami;
+
+static int hf_yami_frame_number;
+static int hf_yami_frame_payload_size;
+static int hf_yami_items_count;
+static int hf_yami_message_data;
+static int hf_yami_message_hdr;
+static int hf_yami_message_header_size;
+static int hf_yami_message_id;
+static int hf_yami_param;
+static int hf_yami_param_name;
+static int hf_yami_param_type;
+static int hf_yami_param_value_bin;
+static int hf_yami_param_value_bool;
+static int hf_yami_param_value_double;
+static int hf_yami_param_value_int;
+static int hf_yami_param_value_long;
+static int hf_yami_param_value_str;
+static int hf_yami_params_count;
+
+static int ett_yami;
+static int ett_yami_msg_hdr;
+static int ett_yami_msg_data;
+static int ett_yami_param;
 
 static int
 dissect_yami_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_item *par_ti)
diff --git a/epan/dissectors/packet-yhoo.c b/epan/dissectors/packet-yhoo.c
index a251d111f3..2860c0b03d 100644
--- a/epan/dissectors/packet-yhoo.c
+++ b/epan/dissectors/packet-yhoo.c
@@ -18,19 +18,19 @@
 void proto_register_yhoo(void);
 void proto_reg_handoff_yhoo(void);
 
-static int proto_yhoo = -1;
-static int hf_yhoo_version = -1;
-static int hf_yhoo_len = -1;
-static int hf_yhoo_service = -1;
-static int hf_yhoo_connection_id = -1;
-static int hf_yhoo_magic_id = -1;
-static int hf_yhoo_unknown1 = -1;
-static int hf_yhoo_msgtype = -1;
-static int hf_yhoo_nick1 = -1;
-static int hf_yhoo_nick2 = -1;
-static int hf_yhoo_content = -1;
-
-static gint ett_yhoo = -1;
+static int proto_yhoo;
+static int hf_yhoo_version;
+static int hf_yhoo_len;
+static int hf_yhoo_service;
+static int hf_yhoo_connection_id;
+static int hf_yhoo_magic_id;
+static int hf_yhoo_unknown1;
+static int hf_yhoo_msgtype;
+static int hf_yhoo_nick1;
+static int hf_yhoo_nick2;
+static int hf_yhoo_content;
+
+static gint ett_yhoo;
 
 #define TCP_PORT_YHOO	5050
 
diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c
index 9a762a877d..1fa09cd900 100644
--- a/epan/dissectors/packet-ymsg.c
+++ b/epan/dissectors/packet-ymsg.c
@@ -20,22 +20,22 @@
 void proto_register_ymsg(void);
 void proto_reg_handoff_ymsg(void);
 
-static int proto_ymsg = -1;
-static int hf_ymsg_version = -1;
-static int hf_ymsg_vendor = -1;
-static int hf_ymsg_len = -1;
-static int hf_ymsg_service = -1;
-static int hf_ymsg_status = -1;
-static int hf_ymsg_session_id = -1;
-
-static int hf_ymsg_content = -1;
-static int hf_ymsg_content_line = -1;
-static int hf_ymsg_content_line_key = -1;
-static int hf_ymsg_content_line_value = -1;
-
-static gint ett_ymsg = -1;
-static gint ett_ymsg_content = -1;
-static gint ett_ymsg_content_line = -1;
+static int proto_ymsg;
+static int hf_ymsg_version;
+static int hf_ymsg_vendor;
+static int hf_ymsg_len;
+static int hf_ymsg_service;
+static int hf_ymsg_status;
+static int hf_ymsg_session_id;
+
+static int hf_ymsg_content;
+static int hf_ymsg_content_line;
+static int hf_ymsg_content_line_key;
+static int hf_ymsg_content_line_value;
+
+static gint ett_ymsg;
+static gint ett_ymsg_content;
+static gint ett_ymsg_content_line;
 
 #define TCP_PORT_YMSG	  23	/* XXX - this is Telnet! */
 #define TCP_PORT_YMSG_2	  25	/* And this is SMTP! */
diff --git a/epan/dissectors/packet-ypbind.c b/epan/dissectors/packet-ypbind.c
index 4d4965ca0f..22aa45437d 100644
--- a/epan/dissectors/packet-ypbind.c
+++ b/epan/dissectors/packet-ypbind.c
@@ -20,17 +20,17 @@
 void proto_register_ypbind(void);
 void proto_reg_handoff_ypbind(void);
 
-static int proto_ypbind = -1;
-static int hf_ypbind_procedure_v1 = -1;
-static int hf_ypbind_procedure_v2 = -1;
-static int hf_ypbind_domain = -1;
-static int hf_ypbind_resp_type = -1;
-/* static int hf_ypbind_error = -1; */
-static int hf_ypbind_addr = -1;
-static int hf_ypbind_port = -1;
-static int hf_ypbind_setdom_version = -1;
-
-static gint ett_ypbind = -1;
+static int proto_ypbind;
+static int hf_ypbind_procedure_v1;
+static int hf_ypbind_procedure_v2;
+static int hf_ypbind_domain;
+static int hf_ypbind_resp_type;
+/* static int hf_ypbind_error; */
+static int hf_ypbind_addr;
+static int hf_ypbind_port;
+static int hf_ypbind_setdom_version;
+
+static gint ett_ypbind;
 
 
 static int
diff --git a/epan/dissectors/packet-yppasswd.c b/epan/dissectors/packet-yppasswd.c
index 1520194cec..ccf284e2d0 100644
--- a/epan/dissectors/packet-yppasswd.c
+++ b/epan/dissectors/packet-yppasswd.c
@@ -16,21 +16,21 @@
 void proto_register_yppasswd(void);
 void proto_reg_handoff_yppasswd(void);
 
-static int proto_yppasswd = -1;
-static int hf_yppasswd_procedure_v1 = -1;
-static int hf_yppasswd_status = -1;
-static int hf_yppasswd_oldpass = -1;
-static int hf_yppasswd_newpw = -1;
-static int hf_yppasswd_newpw_name = -1;
-static int hf_yppasswd_newpw_passwd = -1;
-static int hf_yppasswd_newpw_uid = -1;
-static int hf_yppasswd_newpw_gid = -1;
-static int hf_yppasswd_newpw_gecos = -1;
-static int hf_yppasswd_newpw_dir = -1;
-static int hf_yppasswd_newpw_shell = -1;
-
-static gint ett_yppasswd = -1;
-static gint ett_yppasswd_newpw = -1;
+static int proto_yppasswd;
+static int hf_yppasswd_procedure_v1;
+static int hf_yppasswd_status;
+static int hf_yppasswd_oldpass;
+static int hf_yppasswd_newpw;
+static int hf_yppasswd_newpw_name;
+static int hf_yppasswd_newpw_passwd;
+static int hf_yppasswd_newpw_uid;
+static int hf_yppasswd_newpw_gid;
+static int hf_yppasswd_newpw_gecos;
+static int hf_yppasswd_newpw_dir;
+static int hf_yppasswd_newpw_shell;
+
+static gint ett_yppasswd;
+static gint ett_yppasswd_newpw;
 
 static int
 dissect_yppasswd_call(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
diff --git a/epan/dissectors/packet-ypserv.c b/epan/dissectors/packet-ypserv.c
index c9c2f1bb05..363dc34cd6 100644
--- a/epan/dissectors/packet-ypserv.c
+++ b/epan/dissectors/packet-ypserv.c
@@ -21,26 +21,26 @@
 void proto_register_ypserv(void);
 void proto_reg_handoff_ypserv(void);
 
-static int proto_ypserv = -1;
-static int hf_ypserv_procedure_v1 = -1;
-static int hf_ypserv_procedure_v2 = -1;
-static int hf_ypserv_domain = -1;
-static int hf_ypserv_servesdomain = -1;
-static int hf_ypserv_map = -1;
-static int hf_ypserv_key = -1;
-static int hf_ypserv_peer = -1;
-static int hf_ypserv_more = -1;
-static int hf_ypserv_ordernum = -1;
-static int hf_ypserv_transid = -1;
-static int hf_ypserv_prog = -1;
-static int hf_ypserv_port = -1;
-static int hf_ypserv_value = -1;
-static int hf_ypserv_status = -1;
-static int hf_ypserv_map_parms = -1;
-static int hf_ypserv_xfrstat = -1;
-
-static gint ett_ypserv = -1;
-static gint ett_ypserv_map_parms = -1;
+static int proto_ypserv;
+static int hf_ypserv_procedure_v1;
+static int hf_ypserv_procedure_v2;
+static int hf_ypserv_domain;
+static int hf_ypserv_servesdomain;
+static int hf_ypserv_map;
+static int hf_ypserv_key;
+static int hf_ypserv_peer;
+static int hf_ypserv_more;
+static int hf_ypserv_ordernum;
+static int hf_ypserv_transid;
+static int hf_ypserv_prog;
+static int hf_ypserv_port;
+static int hf_ypserv_value;
+static int hf_ypserv_status;
+static int hf_ypserv_map_parms;
+static int hf_ypserv_xfrstat;
+
+static gint ett_ypserv;
+static gint ett_ypserv_map_parms;
 
 static const value_string ypstat[] =
 {
diff --git a/epan/dissectors/packet-ypxfr.c b/epan/dissectors/packet-ypxfr.c
index 40e464e49e..0ecd7e9545 100644
--- a/epan/dissectors/packet-ypxfr.c
+++ b/epan/dissectors/packet-ypxfr.c
@@ -18,10 +18,10 @@
 void proto_register_ypxfr(void);
 void proto_reg_handoff_ypxfr(void);
 
-static int proto_ypxfr = -1;
-static int hf_ypxfr_procedure_v1 = -1;
+static int proto_ypxfr;
+static int hf_ypxfr_procedure_v1;
 
-static gint ett_ypxfr = -1;
+static gint ett_ypxfr;
 
 /* proc number, "proc name", dissect_request, dissect_reply */
 static const vsff ypxfr1_proc[] = {
diff --git a/epan/dissectors/packet-z21.c b/epan/dissectors/packet-z21.c
index 2be95db7b2..e1de93aaed 100644
--- a/epan/dissectors/packet-z21.c
+++ b/epan/dissectors/packet-z21.c
@@ -26,152 +26,152 @@ void proto_register_z21(void);
 void proto_reg_handoff_z21(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_z21 = -1;
-static int hf_z21_datalen = -1;
-static int hf_z21_command = -1;
-static int hf_z21_x_bus = -1;
-static int hf_z21_serial_number = -1;
-static int hf_z21_checksum = -1;
-static int hf_z21_main_current = -1;
-static int hf_z21_prog_current = -1;
-static int hf_z21_filtered_main_current = -1;
-static int hf_z21_temperature = -1;
-static int hf_z21_supply_voltage = -1;
-static int hf_z21_track_voltage = -1;
-static int hf_z21_central_state = -1;
-static int hf_z21_central_state_ex = -1;
-static int hf_z21_systemstate_reserved = -1;
-static int hf_z21_capabilities = -1;
-static int hf_z21_status = -1;
-static int hf_z21_loco_address = -1;
-static int hf_z21_loco_direction_and_speed = -1;
-static int hf_z21_loco_direction = -1;
-static int hf_z21_loco_speed = -1;
-static int hf_z21_loco_info_mm = -1;
-static int hf_z21_loco_info_busy = -1;
-static int hf_z21_loco_info_speed_steps = -1;
-static int hf_z21_loco_info_direction = -1;
-static int hf_z21_loco_info_speed = -1;
-static int hf_z21_loco_info_double_traction = -1;
-static int hf_z21_loco_info_smartsearch = -1;
-static int hf_z21_loco_info_f0 = -1;
-static int hf_z21_loco_info_f1 = -1;
-static int hf_z21_loco_info_f2 = -1;
-static int hf_z21_loco_info_f3 = -1;
-static int hf_z21_loco_info_f4 = -1;
-static int hf_z21_loco_info_f5 = -1;
-static int hf_z21_loco_info_f6 = -1;
-static int hf_z21_loco_info_f7 = -1;
-static int hf_z21_loco_info_f8 = -1;
-static int hf_z21_loco_info_f9 = -1;
-static int hf_z21_loco_info_f10 = -1;
-static int hf_z21_loco_info_f11 = -1;
-static int hf_z21_loco_info_f12 = -1;
-static int hf_z21_loco_info_f13 = -1;
-static int hf_z21_loco_info_f14 = -1;
-static int hf_z21_loco_info_f15 = -1;
-static int hf_z21_loco_info_f16 = -1;
-static int hf_z21_loco_info_f17 = -1;
-static int hf_z21_loco_info_f18 = -1;
-static int hf_z21_loco_info_f19 = -1;
-static int hf_z21_loco_info_f20 = -1;
-static int hf_z21_loco_info_f21 = -1;
-static int hf_z21_loco_info_f22 = -1;
-static int hf_z21_loco_info_f23 = -1;
-static int hf_z21_loco_info_f24 = -1;
-static int hf_z21_loco_info_f25 = -1;
-static int hf_z21_loco_info_f26 = -1;
-static int hf_z21_loco_info_f27 = -1;
-static int hf_z21_loco_info_f28 = -1;
-static int hf_z21_loco_info_f29 = -1;
-static int hf_z21_loco_info_f30 = -1;
-static int hf_z21_loco_info_f31 = -1;
-static int hf_z21_loco_info_extensions = -1;
-static int hf_z21_loco_func_switch_type = -1;
-static int hf_z21_loco_func_index = -1;
-static int hf_z21_speed_steps = -1;
-static int hf_z21_firmware_version = -1;
-static int hf_z21_state_emergency_stop = -1;
-static int hf_z21_state_track_voltage_off = -1;
-static int hf_z21_state_short_circuit = -1;
-static int hf_z21_state_programming_mode = -1;
-static int hf_z21_state_high_temperature = -1;
-static int hf_z21_state_power_lost = -1;
-static int hf_z21_state_short_circuit_external = -1;
-static int hf_z21_state_short_circuit_internal = -1;
-static int hf_z21_state_rcn_213 = -1;
-static int hf_z21_capability_dcc = -1;
-static int hf_z21_capability_mm = -1;
-static int hf_z21_capability_reserved = -1;
-static int hf_z21_capability_railcom = -1;
-static int hf_z21_capability_loco_cmds = -1;
-static int hf_z21_capability_accessory_cmds = -1;
-static int hf_z21_capability_detector_cmds = -1;
-static int hf_z21_capability_needs_unlock_code = -1;
-static int hf_z21_function_address = -1;
-static int hf_z21_turnout_state = -1;
-static int hf_z21_turnout_activate_bit = -1;
-static int hf_z21_turnout_output_bit = -1;
-static int hf_z21_turnout_queue_bit = -1;
-static int hf_z21_accessory_address = -1;
-static int hf_z21_accessory_state = -1;
-static int hf_z21_accessory_status = -1;
-static int hf_z21_cv_address = -1;
-static int hf_z21_cv_value = -1;
-static int hf_z21_register = -1;
-static int hf_z21_register_value = -1;
-static int hf_z21_pom_operation = -1;
-static int hf_z21_cv_bit_position = -1;
-static int hf_z21_cv_bit_value = -1;
-static int hf_z21_rmbus_group = -1;
-static int hf_z21_rmbus_feedbacks = -1;
-static int hf_z21_rmbus_address = -1;
-static int hf_z21_railcom_receive_counter = -1;
-static int hf_z21_railcom_error_counter = -1;
-static int hf_z21_railcom_reserved1 = -1;
-static int hf_z21_railcom_options = -1;
-static int hf_z21_railcom_speed = -1;
-static int hf_z21_railcom_qos = -1;
-static int hf_z21_railcom_reserved2 = -1;
-static int hf_z21_railcom_type = -1;
-static int hf_z21_loconet_message = -1;
-static int hf_z21_loconet_result = -1;
-static int hf_z21_loconet_type = -1;
-static int hf_z21_loconet_report_address = -1;
-static int hf_z21_loconet_feedback_address = -1;
-static int hf_z21_loconet_info = -1;
-static int hf_z21_can_type = -1;
-static int hf_z21_can_network_id = -1;
-static int hf_z21_can_module_address = -1;
-static int hf_z21_can_port = -1;
-static int hf_z21_can_value1 = -1;
-static int hf_z21_can_value2 = -1;
-static int hf_z21_can_booster_name = -1;
-static int hf_z21_can_booster_output_port = -1;
-static int hf_z21_can_booster_state = -1;
-static int hf_z21_can_booster_state_bg_active = -1;
-static int hf_z21_can_booster_state_short_circuit = -1;
-static int hf_z21_can_booster_state_track_voltage_off = -1;
-static int hf_z21_can_booster_state_railcom_active = -1;
-static int hf_z21_can_booster_state_output_disabled = -1;
-static int hf_z21_can_booster_vcc = -1;
-static int hf_z21_can_booster_current = -1;
-static int hf_z21_can_booster_power = -1;
-static int hf_z21_zlink_message_type = -1;
-static int hf_z21_zlink_hwid = -1;
-static int hf_z21_zlink_fw_major = -1;
-static int hf_z21_zlink_fw_minor = -1;
-static int hf_z21_zlink_fw_build = -1;
-static int hf_z21_zlink_mac = -1;
-static int hf_z21_zlink_name = -1;
-static int hf_z21_zlink_reserved = -1;
-static int hf_z21_booster_name = -1;
-static int hf_z21_booster_port = -1;
-static int hf_z21_booster_port_state = -1;
-static int hf_z21_booster_state_data = -1;
-static int hf_z21_decoder_name = -1;
-static int hf_z21_decoder_state_data = -1;
-static int hf_z21_data = -1;
+static int proto_z21;
+static int hf_z21_datalen;
+static int hf_z21_command;
+static int hf_z21_x_bus;
+static int hf_z21_serial_number;
+static int hf_z21_checksum;
+static int hf_z21_main_current;
+static int hf_z21_prog_current;
+static int hf_z21_filtered_main_current;
+static int hf_z21_temperature;
+static int hf_z21_supply_voltage;
+static int hf_z21_track_voltage;
+static int hf_z21_central_state;
+static int hf_z21_central_state_ex;
+static int hf_z21_systemstate_reserved;
+static int hf_z21_capabilities;
+static int hf_z21_status;
+static int hf_z21_loco_address;
+static int hf_z21_loco_direction_and_speed;
+static int hf_z21_loco_direction;
+static int hf_z21_loco_speed;
+static int hf_z21_loco_info_mm;
+static int hf_z21_loco_info_busy;
+static int hf_z21_loco_info_speed_steps;
+static int hf_z21_loco_info_direction;
+static int hf_z21_loco_info_speed;
+static int hf_z21_loco_info_double_traction;
+static int hf_z21_loco_info_smartsearch;
+static int hf_z21_loco_info_f0;
+static int hf_z21_loco_info_f1;
+static int hf_z21_loco_info_f2;
+static int hf_z21_loco_info_f3;
+static int hf_z21_loco_info_f4;
+static int hf_z21_loco_info_f5;
+static int hf_z21_loco_info_f6;
+static int hf_z21_loco_info_f7;
+static int hf_z21_loco_info_f8;
+static int hf_z21_loco_info_f9;
+static int hf_z21_loco_info_f10;
+static int hf_z21_loco_info_f11;
+static int hf_z21_loco_info_f12;
+static int hf_z21_loco_info_f13;
+static int hf_z21_loco_info_f14;
+static int hf_z21_loco_info_f15;
+static int hf_z21_loco_info_f16;
+static int hf_z21_loco_info_f17;
+static int hf_z21_loco_info_f18;
+static int hf_z21_loco_info_f19;
+static int hf_z21_loco_info_f20;
+static int hf_z21_loco_info_f21;
+static int hf_z21_loco_info_f22;
+static int hf_z21_loco_info_f23;
+static int hf_z21_loco_info_f24;
+static int hf_z21_loco_info_f25;
+static int hf_z21_loco_info_f26;
+static int hf_z21_loco_info_f27;
+static int hf_z21_loco_info_f28;
+static int hf_z21_loco_info_f29;
+static int hf_z21_loco_info_f30;
+static int hf_z21_loco_info_f31;
+static int hf_z21_loco_info_extensions;
+static int hf_z21_loco_func_switch_type;
+static int hf_z21_loco_func_index;
+static int hf_z21_speed_steps;
+static int hf_z21_firmware_version;
+static int hf_z21_state_emergency_stop;
+static int hf_z21_state_track_voltage_off;
+static int hf_z21_state_short_circuit;
+static int hf_z21_state_programming_mode;
+static int hf_z21_state_high_temperature;
+static int hf_z21_state_power_lost;
+static int hf_z21_state_short_circuit_external;
+static int hf_z21_state_short_circuit_internal;
+static int hf_z21_state_rcn_213;
+static int hf_z21_capability_dcc;
+static int hf_z21_capability_mm;
+static int hf_z21_capability_reserved;
+static int hf_z21_capability_railcom;
+static int hf_z21_capability_loco_cmds;
+static int hf_z21_capability_accessory_cmds;
+static int hf_z21_capability_detector_cmds;
+static int hf_z21_capability_needs_unlock_code;
+static int hf_z21_function_address;
+static int hf_z21_turnout_state;
+static int hf_z21_turnout_activate_bit;
+static int hf_z21_turnout_output_bit;
+static int hf_z21_turnout_queue_bit;
+static int hf_z21_accessory_address;
+static int hf_z21_accessory_state;
+static int hf_z21_accessory_status;
+static int hf_z21_cv_address;
+static int hf_z21_cv_value;
+static int hf_z21_register;
+static int hf_z21_register_value;
+static int hf_z21_pom_operation;
+static int hf_z21_cv_bit_position;
+static int hf_z21_cv_bit_value;
+static int hf_z21_rmbus_group;
+static int hf_z21_rmbus_feedbacks;
+static int hf_z21_rmbus_address;
+static int hf_z21_railcom_receive_counter;
+static int hf_z21_railcom_error_counter;
+static int hf_z21_railcom_reserved1;
+static int hf_z21_railcom_options;
+static int hf_z21_railcom_speed;
+static int hf_z21_railcom_qos;
+static int hf_z21_railcom_reserved2;
+static int hf_z21_railcom_type;
+static int hf_z21_loconet_message;
+static int hf_z21_loconet_result;
+static int hf_z21_loconet_type;
+static int hf_z21_loconet_report_address;
+static int hf_z21_loconet_feedback_address;
+static int hf_z21_loconet_info;
+static int hf_z21_can_type;
+static int hf_z21_can_network_id;
+static int hf_z21_can_module_address;
+static int hf_z21_can_port;
+static int hf_z21_can_value1;
+static int hf_z21_can_value2;
+static int hf_z21_can_booster_name;
+static int hf_z21_can_booster_output_port;
+static int hf_z21_can_booster_state;
+static int hf_z21_can_booster_state_bg_active;
+static int hf_z21_can_booster_state_short_circuit;
+static int hf_z21_can_booster_state_track_voltage_off;
+static int hf_z21_can_booster_state_railcom_active;
+static int hf_z21_can_booster_state_output_disabled;
+static int hf_z21_can_booster_vcc;
+static int hf_z21_can_booster_current;
+static int hf_z21_can_booster_power;
+static int hf_z21_zlink_message_type;
+static int hf_z21_zlink_hwid;
+static int hf_z21_zlink_fw_major;
+static int hf_z21_zlink_fw_minor;
+static int hf_z21_zlink_fw_build;
+static int hf_z21_zlink_mac;
+static int hf_z21_zlink_name;
+static int hf_z21_zlink_reserved;
+static int hf_z21_booster_name;
+static int hf_z21_booster_port;
+static int hf_z21_booster_port_state;
+static int hf_z21_booster_state_data;
+static int hf_z21_decoder_name;
+static int hf_z21_decoder_state_data;
+static int hf_z21_data;
 
 static dissector_handle_t z21_handle;
 
@@ -179,10 +179,10 @@ static dissector_handle_t z21_handle;
 static range_t *udp_port_range;
 
 /* Initialize the subtree pointers */
-static int ett_z21 = -1;
+static int ett_z21;
 
 /* Initialize expert fields */
-static expert_field ei_z21_invalid_checksum = EI_INIT;
+static expert_field ei_z21_invalid_checksum;
 
 #define Z21_MIN_LENGTH 4
 
diff --git a/epan/dissectors/packet-zabbix.c b/epan/dissectors/packet-zabbix.c
index 070c245a8b..b11e12472f 100644
--- a/epan/dissectors/packet-zabbix.c
+++ b/epan/dissectors/packet-zabbix.c
@@ -34,57 +34,57 @@ static dissector_handle_t zabbix_handle;
 static gboolean zabbix_desegment = true;
 
 /* Initialize the protocol and registered fields */
-static int proto_zabbix = -1;
-static int hf_zabbix_header = -1;
-static int hf_zabbix_flags = -1;
-static int hf_zabbix_flag_zabbix_communications = -1;
-static int hf_zabbix_flag_compressed = -1;
-static int hf_zabbix_flag_largepacket = -1;
-static int hf_zabbix_flag_reserved = -1;
-static int hf_zabbix_length = -1;
-static int hf_zabbix_reserved = -1;
-static int hf_zabbix_uncompressed_length = -1;
-static int hf_zabbix_large_length = -1;
-static int hf_zabbix_large_reserved = -1;
-static int hf_zabbix_large_uncompressed_length = -1;
-static int hf_zabbix_data = -1;
-static int hf_zabbix_time = -1;
-static int hf_zabbix_agent = -1;
-static int hf_zabbix_agent_config = -1;
-static int hf_zabbix_agent_data = -1;
-static int hf_zabbix_agent_passive = -1;
-static int hf_zabbix_agent_name = -1;
-static int hf_zabbix_agent_hb = -1;
-static int hf_zabbix_agent_hb_freq = -1;
-static int hf_zabbix_agent_hostmetadata = -1;
-static int hf_zabbix_agent_hostinterface = -1;
-static int hf_zabbix_agent_listenipv4 = -1;
-static int hf_zabbix_agent_listenipv6 = -1;
-static int hf_zabbix_agent_listenport = -1;
-static int hf_zabbix_proxy = -1;
-static int hf_zabbix_proxy_hb = -1;
-static int hf_zabbix_proxy_name = -1;
-static int hf_zabbix_proxy_data = -1;
-static int hf_zabbix_proxy_config = -1;
-static int hf_zabbix_proxy_fullsync = -1;
-static int hf_zabbix_proxy_incr_config = -1;
-static int hf_zabbix_proxy_no_config_change = -1;
-static int hf_zabbix_sender = -1;
-static int hf_zabbix_sender_name = -1;
-static int hf_zabbix_request = -1;
-static int hf_zabbix_response = -1;
-static int hf_zabbix_success = -1;
-static int hf_zabbix_failed = -1;
-static int hf_zabbix_config_revision = -1;
-static int hf_zabbix_session = -1;
-static int hf_zabbix_version = -1;
+static int proto_zabbix;
+static int hf_zabbix_header;
+static int hf_zabbix_flags;
+static int hf_zabbix_flag_zabbix_communications;
+static int hf_zabbix_flag_compressed;
+static int hf_zabbix_flag_largepacket;
+static int hf_zabbix_flag_reserved;
+static int hf_zabbix_length;
+static int hf_zabbix_reserved;
+static int hf_zabbix_uncompressed_length;
+static int hf_zabbix_large_length;
+static int hf_zabbix_large_reserved;
+static int hf_zabbix_large_uncompressed_length;
+static int hf_zabbix_data;
+static int hf_zabbix_time;
+static int hf_zabbix_agent;
+static int hf_zabbix_agent_config;
+static int hf_zabbix_agent_data;
+static int hf_zabbix_agent_passive;
+static int hf_zabbix_agent_name;
+static int hf_zabbix_agent_hb;
+static int hf_zabbix_agent_hb_freq;
+static int hf_zabbix_agent_hostmetadata;
+static int hf_zabbix_agent_hostinterface;
+static int hf_zabbix_agent_listenipv4;
+static int hf_zabbix_agent_listenipv6;
+static int hf_zabbix_agent_listenport;
+static int hf_zabbix_proxy;
+static int hf_zabbix_proxy_hb;
+static int hf_zabbix_proxy_name;
+static int hf_zabbix_proxy_data;
+static int hf_zabbix_proxy_config;
+static int hf_zabbix_proxy_fullsync;
+static int hf_zabbix_proxy_incr_config;
+static int hf_zabbix_proxy_no_config_change;
+static int hf_zabbix_sender;
+static int hf_zabbix_sender_name;
+static int hf_zabbix_request;
+static int hf_zabbix_response;
+static int hf_zabbix_success;
+static int hf_zabbix_failed;
+static int hf_zabbix_config_revision;
+static int hf_zabbix_session;
+static int hf_zabbix_version;
 
 /* Initialize the subtree pointers */
-static int ett_zabbix = -1;
+static int ett_zabbix;
 
 /* Initialize expert fields */
-static expert_field ei_zabbix_packet_too_large = EI_INIT;
-static expert_field ei_zabbix_json_error = EI_INIT;
+static expert_field ei_zabbix_packet_too_large;
+static expert_field ei_zabbix_json_error;
 
 /* Other dissector-specifics */
 static range_t *zabbix_port_range;
diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c
index 636e4c58fb..e54c643f14 100644
--- a/epan/dissectors/packet-zbee-aps.c
+++ b/epan/dissectors/packet-zbee-aps.c
@@ -60,96 +60,96 @@ void proto_register_zbee_aps(void);
  ********************
  */
 /* Field indices. */
-static int proto_zbee_aps = -1;
-static int hf_zbee_aps_fcf_frame_type = -1;
-static int hf_zbee_aps_fcf_delivery = -1;
-static int hf_zbee_aps_fcf_indirect_mode = -1;  /* ZigBee 2004 and earlier. */
-static int hf_zbee_aps_fcf_ack_format = -1;       /* ZigBee 2007 and later. */
-static int hf_zbee_aps_fcf_security = -1;
-static int hf_zbee_aps_fcf_ack_req = -1;
-static int hf_zbee_aps_fcf_ext_header = -1;
-static int hf_zbee_aps_dst = -1;
-static int hf_zbee_aps_group = -1;
-static int hf_zbee_aps_cluster = -1;
-static int hf_zbee_aps_profile = -1;
-static int hf_zbee_aps_src = -1;
-static int hf_zbee_aps_counter = -1;
-static int hf_zbee_aps_fragmentation = -1;
-static int hf_zbee_aps_block_number = -1;
-static int hf_zbee_aps_block_ack = -1;
-static int hf_zbee_aps_block_ack1 = -1;
-static int hf_zbee_aps_block_ack2 = -1;
-static int hf_zbee_aps_block_ack3 = -1;
-static int hf_zbee_aps_block_ack4 = -1;
-static int hf_zbee_aps_block_ack5 = -1;
-static int hf_zbee_aps_block_ack6 = -1;
-static int hf_zbee_aps_block_ack7 = -1;
-static int hf_zbee_aps_block_ack8 = -1;
-
-static int hf_zbee_aps_cmd_id = -1;
-static int hf_zbee_aps_cmd_initiator = -1;
-static int hf_zbee_aps_cmd_responder = -1;
-static int hf_zbee_aps_cmd_partner = -1;
-static int hf_zbee_aps_cmd_initiator_flag = -1;
-static int hf_zbee_aps_cmd_device = -1;
-static int hf_zbee_aps_cmd_challenge = -1;
-static int hf_zbee_aps_cmd_mac = -1;
-static int hf_zbee_aps_cmd_key = -1;
-static int hf_zbee_aps_cmd_key_hash = -1;
-static int hf_zbee_aps_cmd_key_type = -1;
-static int hf_zbee_aps_cmd_dst = -1;
-static int hf_zbee_aps_cmd_src = -1;
-static int hf_zbee_aps_cmd_seqno = -1;
-static int hf_zbee_aps_cmd_short_addr = -1;
-static int hf_zbee_aps_cmd_device_status = -1;
-static int hf_zbee_aps_cmd_status = -1;
-static int hf_zbee_aps_cmd_ea_key_type = -1;
-static int hf_zbee_aps_cmd_ea_data = -1;
+static int proto_zbee_aps;
+static int hf_zbee_aps_fcf_frame_type;
+static int hf_zbee_aps_fcf_delivery;
+static int hf_zbee_aps_fcf_indirect_mode;  /* ZigBee 2004 and earlier. */
+static int hf_zbee_aps_fcf_ack_format;       /* ZigBee 2007 and later. */
+static int hf_zbee_aps_fcf_security;
+static int hf_zbee_aps_fcf_ack_req;
+static int hf_zbee_aps_fcf_ext_header;
+static int hf_zbee_aps_dst;
+static int hf_zbee_aps_group;
+static int hf_zbee_aps_cluster;
+static int hf_zbee_aps_profile;
+static int hf_zbee_aps_src;
+static int hf_zbee_aps_counter;
+static int hf_zbee_aps_fragmentation;
+static int hf_zbee_aps_block_number;
+static int hf_zbee_aps_block_ack;
+static int hf_zbee_aps_block_ack1;
+static int hf_zbee_aps_block_ack2;
+static int hf_zbee_aps_block_ack3;
+static int hf_zbee_aps_block_ack4;
+static int hf_zbee_aps_block_ack5;
+static int hf_zbee_aps_block_ack6;
+static int hf_zbee_aps_block_ack7;
+static int hf_zbee_aps_block_ack8;
+
+static int hf_zbee_aps_cmd_id;
+static int hf_zbee_aps_cmd_initiator;
+static int hf_zbee_aps_cmd_responder;
+static int hf_zbee_aps_cmd_partner;
+static int hf_zbee_aps_cmd_initiator_flag;
+static int hf_zbee_aps_cmd_device;
+static int hf_zbee_aps_cmd_challenge;
+static int hf_zbee_aps_cmd_mac;
+static int hf_zbee_aps_cmd_key;
+static int hf_zbee_aps_cmd_key_hash;
+static int hf_zbee_aps_cmd_key_type;
+static int hf_zbee_aps_cmd_dst;
+static int hf_zbee_aps_cmd_src;
+static int hf_zbee_aps_cmd_seqno;
+static int hf_zbee_aps_cmd_short_addr;
+static int hf_zbee_aps_cmd_device_status;
+static int hf_zbee_aps_cmd_status;
+static int hf_zbee_aps_cmd_ea_key_type;
+static int hf_zbee_aps_cmd_ea_data;
 
 /* Field indices for ZigBee 2003 & earlier Application Framework. */
-static int proto_zbee_apf = -1;
-static int hf_zbee_apf_count = -1;
-static int hf_zbee_apf_type = -1;
+static int proto_zbee_apf;
+static int hf_zbee_apf_count;
+static int hf_zbee_apf_type;
 
 /* Subtree indices. */
-static gint ett_zbee_aps = -1;
-static gint ett_zbee_aps_fcf = -1;
-static gint ett_zbee_aps_ext = -1;
-static gint ett_zbee_aps_cmd = -1;
+static gint ett_zbee_aps;
+static gint ett_zbee_aps_fcf;
+static gint ett_zbee_aps_ext;
+static gint ett_zbee_aps_cmd;
 
 /* Fragmentation indices. */
-static int hf_zbee_aps_fragments = -1;
-static int hf_zbee_aps_fragment = -1;
-static int hf_zbee_aps_fragment_overlap = -1;
-static int hf_zbee_aps_fragment_overlap_conflicts = -1;
-static int hf_zbee_aps_fragment_multiple_tails = -1;
-static int hf_zbee_aps_fragment_too_long_fragment = -1;
-static int hf_zbee_aps_fragment_error = -1;
-static int hf_zbee_aps_fragment_count = -1;
-static int hf_zbee_aps_reassembled_in = -1;
-static int hf_zbee_aps_reassembled_length = -1;
-static gint ett_zbee_aps_fragment = -1;
-static gint ett_zbee_aps_fragments = -1;
+static int hf_zbee_aps_fragments;
+static int hf_zbee_aps_fragment;
+static int hf_zbee_aps_fragment_overlap;
+static int hf_zbee_aps_fragment_overlap_conflicts;
+static int hf_zbee_aps_fragment_multiple_tails;
+static int hf_zbee_aps_fragment_too_long_fragment;
+static int hf_zbee_aps_fragment_error;
+static int hf_zbee_aps_fragment_count;
+static int hf_zbee_aps_reassembled_in;
+static int hf_zbee_aps_reassembled_length;
+static gint ett_zbee_aps_fragment;
+static gint ett_zbee_aps_fragments;
 
 /* Test Profile #2 indices. */
-static int hf_zbee_aps_t2_cluster = -1;
-static int hf_zbee_aps_t2_btres_octet_sequence = -1;
-static int hf_zbee_aps_t2_btres_octet_sequence_length_requested = -1;
-static int hf_zbee_aps_t2_btres_status = -1;
-static int hf_zbee_aps_t2_btreq_octet_sequence_length = -1;
+static int hf_zbee_aps_t2_cluster;
+static int hf_zbee_aps_t2_btres_octet_sequence;
+static int hf_zbee_aps_t2_btres_octet_sequence_length_requested;
+static int hf_zbee_aps_t2_btres_status;
+static int hf_zbee_aps_t2_btreq_octet_sequence_length;
 
 /* ZDP indices. */
-static int hf_zbee_aps_zdp_cluster = -1;
+static int hf_zbee_aps_zdp_cluster;
 
 /* Subtree indices for the ZigBee 2004 & earlier Application Framework. */
-static gint ett_zbee_apf = -1;
-static gint ett_zbee_aps_frag_ack = -1;
+static gint ett_zbee_apf;
+static gint ett_zbee_aps_frag_ack;
 
 /* Subtree indices for the ZigBee Test Profile #2. */
-static gint ett_zbee_aps_t2 = -1;
+static gint ett_zbee_aps_t2;
 
-static expert_field ei_zbee_aps_invalid_delivery_mode = EI_INIT;
-static expert_field ei_zbee_aps_missing_payload = EI_INIT;
+static expert_field ei_zbee_aps_invalid_delivery_mode;
+static expert_field ei_zbee_aps_missing_payload;
 
 /* Dissector Handles. */
 static dissector_handle_t   zbee_aps_handle;
diff --git a/epan/dissectors/packet-zbee-direct.c b/epan/dissectors/packet-zbee-direct.c
index e31b787199..20d72fdbd5 100644
--- a/epan/dissectors/packet-zbee-direct.c
+++ b/epan/dissectors/packet-zbee-direct.c
@@ -49,45 +49,45 @@ static int dissect_zb_direct_common(tvbuff_t **tvb, packet_info *pinfo, proto_tr
 static dissector_handle_t zbee_nwk_handle;
 
 /* TLV Node-elements */
-static int proto_zb_direct = -1;
+static int proto_zb_direct;
 
 /* Leaf-elements */
-static int hf_zb_direct_info_type = -1;
-static int hf_zb_direct_info_key = -1;
-static int hf_zb_direct_info_zdd_ieee = -1;
-static int hf_zb_direct_info_zvd_ieee = -1;
-static int hf_zb_direct_info_encryption = -1;
-static int hf_zb_direct_msg_type = -1;
+static int hf_zb_direct_info_type;
+static int hf_zb_direct_info_key;
+static int hf_zb_direct_info_zdd_ieee;
+static int hf_zb_direct_info_zvd_ieee;
+static int hf_zb_direct_info_encryption;
+static int hf_zb_direct_msg_type;
 
 /* Commissioning */
-static int hf_zb_direct_comm_permit_time = -1;
-static int hf_zb_direct_comm_rejoin = -1;
-static int hf_zb_direct_comm_rm_children = -1;
-static int hf_zb_direct_comm_identify_time = -1;
-static int hf_zb_direct_comm_fb_endpoint = -1;
-static int hf_zb_direct_comm_fb_initiator = -1;
+static int hf_zb_direct_comm_permit_time;
+static int hf_zb_direct_comm_rejoin;
+static int hf_zb_direct_comm_rm_children;
+static int hf_zb_direct_comm_identify_time;
+static int hf_zb_direct_comm_fb_endpoint;
+static int hf_zb_direct_comm_fb_initiator;
 
 /* Markers (also leafs) */
-static int hf_zb_direct_unrecognized_msg = -1;
-static int hf_zb_direct_char_info = -1;
-static int hf_zb_direct_char_c25519_aesmmo = -1;
-static int hf_zb_direct_char_c25519_sha256 = -1;
-static int hf_zb_direct_char_p256 = -1;
-static int hf_zb_direct_char_form = -1;
-static int hf_zb_direct_char_status = -1;
-static int hf_zb_direct_char_join = -1;
-static int hf_zb_direct_char_permit_join = -1;
-static int hf_zb_direct_char_leave = -1;
-static int hf_zb_direct_char_manage_joiners = -1;
-static int hf_zb_direct_char_identify = -1;
-static int hf_zb_direct_char_finding_binding = -1;
-static int hf_zb_direct_char_tunneling = -1;
+static int hf_zb_direct_unrecognized_msg;
+static int hf_zb_direct_char_info;
+static int hf_zb_direct_char_c25519_aesmmo;
+static int hf_zb_direct_char_c25519_sha256;
+static int hf_zb_direct_char_p256;
+static int hf_zb_direct_char_form;
+static int hf_zb_direct_char_status;
+static int hf_zb_direct_char_join;
+static int hf_zb_direct_char_permit_join;
+static int hf_zb_direct_char_leave;
+static int hf_zb_direct_char_manage_joiners;
+static int hf_zb_direct_char_identify;
+static int hf_zb_direct_char_finding_binding;
+static int hf_zb_direct_char_tunneling;
 
 /* Expert items */
-static expert_field ei_zb_direct_crypt_error = EI_INIT;
+static expert_field ei_zb_direct_crypt_error;
 
 /* Trees entitties */
-static gint ett_zb_direct = -1;
+static gint ett_zb_direct;
 
 static const guint8 serv_secur_uuid[]           = { 0xe3, 0x29, 0xb4, 0x99, 0x02, 0x6d, 0xe9, 0xbf,
                                                     0x81, 0x44, 0x00, 0x00, 0xf4, 0x4a, 0x14, 0x29 };
diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c
index 5d6e827622..7aa7685c38 100644
--- a/epan/dissectors/packet-zbee-nwk-gp.c
+++ b/epan/dissectors/packet-zbee-nwk-gp.c
@@ -191,142 +191,142 @@ typedef struct {
 /*********************/
 
 /* GP proto handle. */
-static int proto_zbee_nwk_gp = -1;
+static int proto_zbee_nwk_gp;
 
 /* GP NWK FC. */
-static int hf_zbee_nwk_gp_auto_commissioning = -1;
-static int hf_zbee_nwk_gp_fc_ext = -1;
-static int hf_zbee_nwk_gp_fcf = -1;
-static int hf_zbee_nwk_gp_frame_type = -1;
-static int hf_zbee_nwk_gp_proto_version = -1;
+static int hf_zbee_nwk_gp_auto_commissioning;
+static int hf_zbee_nwk_gp_fc_ext;
+static int hf_zbee_nwk_gp_fcf;
+static int hf_zbee_nwk_gp_frame_type;
+static int hf_zbee_nwk_gp_proto_version;
 
 /* GP NWK FC extension. */
-static int hf_zbee_nwk_gp_fc_ext_field = -1;
-static int hf_zbee_nwk_gp_fc_ext_app_id = -1;
-static int hf_zbee_nwk_gp_fc_ext_direction = -1;
-static int hf_zbee_nwk_gp_fc_ext_rx_after_tx = -1;
-static int hf_zbee_nwk_gp_fc_ext_sec_key = -1;
-static int hf_zbee_nwk_gp_fc_ext_sec_level = -1;
+static int hf_zbee_nwk_gp_fc_ext_field;
+static int hf_zbee_nwk_gp_fc_ext_app_id;
+static int hf_zbee_nwk_gp_fc_ext_direction;
+static int hf_zbee_nwk_gp_fc_ext_rx_after_tx;
+static int hf_zbee_nwk_gp_fc_ext_sec_key;
+static int hf_zbee_nwk_gp_fc_ext_sec_level;
 
 /* ZGPD Src ID. */
-static int hf_zbee_nwk_gp_zgpd_src_id = -1;
+static int hf_zbee_nwk_gp_zgpd_src_id;
 
 /* ZGPD Endpoint */
-static int hf_zbee_nwk_gp_zgpd_endpoint = -1;
+static int hf_zbee_nwk_gp_zgpd_endpoint;
 
 /* Security frame counter. */
-static int hf_zbee_nwk_gp_security_frame_counter = -1;
+static int hf_zbee_nwk_gp_security_frame_counter;
 
 /* Security MIC. */
-static int hf_zbee_nwk_gp_security_mic_2b = -1;
-static int hf_zbee_nwk_gp_security_mic_4b = -1;
+static int hf_zbee_nwk_gp_security_mic_2b;
+static int hf_zbee_nwk_gp_security_mic_4b;
 
 /* Payload subframe. */
-static int hf_zbee_nwk_gp_command_id = -1;
+static int hf_zbee_nwk_gp_command_id;
 
 /* Commissioning. */
-static int hf_zbee_nwk_gp_cmd_comm_device_id = -1;
-static int hf_zbee_nwk_gp_cmd_comm_ext_opt = -1;
-static int hf_zbee_nwk_gp_cmd_comm_ext_opt_gpd_key_encr = -1;
-static int hf_zbee_nwk_gp_cmd_comm_ext_opt_gpd_key_present = -1;
-static int hf_zbee_nwk_gp_cmd_comm_ext_opt_key_type = -1;
-static int hf_zbee_nwk_gp_cmd_comm_ext_opt_outgoing_counter = -1;
-static int hf_zbee_nwk_gp_cmd_comm_ext_opt_sec_level_cap = -1;
-static int hf_zbee_nwk_gp_cmd_comm_security_key = -1;
-static int hf_zbee_nwk_gp_cmd_comm_gpd_sec_key_mic = -1;
-static int hf_zbee_nwk_gp_cmd_comm_opt_ext_opt = -1;
-static int hf_zbee_nwk_gp_cmd_comm_opt = -1;
-static int hf_zbee_nwk_gp_cmd_comm_opt_fixed_location = -1;
-static int hf_zbee_nwk_gp_cmd_comm_opt_mac_sec_num_cap = -1;
-static int hf_zbee_nwk_gp_cmd_comm_opt_appli_info_present = -1;
-static int hf_zbee_nwk_gp_cmd_comm_opt_panid_req = -1;
-static int hf_zbee_nwk_gp_cmd_comm_opt_rx_on_cap = -1;
-static int hf_zbee_nwk_gp_cmd_comm_opt_sec_key_req = -1;
-static int hf_zbee_nwk_gp_cmd_comm_outgoing_counter = -1;
-static int hf_zbee_nwk_gp_cmd_comm_manufacturer_greenpeak_dev_id = -1;
-static int hf_zbee_nwk_gp_cmd_comm_manufacturer_dev_id = -1;
-static int hf_zbee_nwk_gp_cmd_comm_manufacturer_id = -1;
-static int hf_zbee_nwk_gp_cmd_comm_appli_info = -1;
-static int hf_zbee_nwk_gp_cmd_comm_appli_info_crp = -1;
-static int hf_zbee_nwk_gp_cmd_comm_appli_info_gclp = -1;
-static int hf_zbee_nwk_gp_cmd_comm_appli_info_mip = -1;
-static int hf_zbee_nwk_gp_cmd_comm_appli_info_mmip = -1;
-static int hf_zbee_nwk_gp_cmd_comm_gpd_cmd_num = -1;
-static int hf_zbee_nwk_gp_cmd_comm_gpd_cmd_id_list = -1;
-static int hf_zbee_nwk_gp_cmd_comm_length_of_clid_list = -1;
-static int hf_zbee_nwk_gp_cmd_comm_length_of_clid_list_server = -1;
-static int hf_zbee_nwk_gp_cmd_comm_length_of_clid_list_client = -1;
-static int hf_zbee_nwk_cmd_comm_clid_list_server = -1;
-static int hf_zbee_nwk_cmd_comm_clid_list_client = -1;
-static int hf_zbee_nwk_cmd_comm_cluster_id = -1;
+static int hf_zbee_nwk_gp_cmd_comm_device_id;
+static int hf_zbee_nwk_gp_cmd_comm_ext_opt;
+static int hf_zbee_nwk_gp_cmd_comm_ext_opt_gpd_key_encr;
+static int hf_zbee_nwk_gp_cmd_comm_ext_opt_gpd_key_present;
+static int hf_zbee_nwk_gp_cmd_comm_ext_opt_key_type;
+static int hf_zbee_nwk_gp_cmd_comm_ext_opt_outgoing_counter;
+static int hf_zbee_nwk_gp_cmd_comm_ext_opt_sec_level_cap;
+static int hf_zbee_nwk_gp_cmd_comm_security_key;
+static int hf_zbee_nwk_gp_cmd_comm_gpd_sec_key_mic;
+static int hf_zbee_nwk_gp_cmd_comm_opt_ext_opt;
+static int hf_zbee_nwk_gp_cmd_comm_opt;
+static int hf_zbee_nwk_gp_cmd_comm_opt_fixed_location;
+static int hf_zbee_nwk_gp_cmd_comm_opt_mac_sec_num_cap;
+static int hf_zbee_nwk_gp_cmd_comm_opt_appli_info_present;
+static int hf_zbee_nwk_gp_cmd_comm_opt_panid_req;
+static int hf_zbee_nwk_gp_cmd_comm_opt_rx_on_cap;
+static int hf_zbee_nwk_gp_cmd_comm_opt_sec_key_req;
+static int hf_zbee_nwk_gp_cmd_comm_outgoing_counter;
+static int hf_zbee_nwk_gp_cmd_comm_manufacturer_greenpeak_dev_id;
+static int hf_zbee_nwk_gp_cmd_comm_manufacturer_dev_id;
+static int hf_zbee_nwk_gp_cmd_comm_manufacturer_id;
+static int hf_zbee_nwk_gp_cmd_comm_appli_info;
+static int hf_zbee_nwk_gp_cmd_comm_appli_info_crp;
+static int hf_zbee_nwk_gp_cmd_comm_appli_info_gclp;
+static int hf_zbee_nwk_gp_cmd_comm_appli_info_mip;
+static int hf_zbee_nwk_gp_cmd_comm_appli_info_mmip;
+static int hf_zbee_nwk_gp_cmd_comm_gpd_cmd_num;
+static int hf_zbee_nwk_gp_cmd_comm_gpd_cmd_id_list;
+static int hf_zbee_nwk_gp_cmd_comm_length_of_clid_list;
+static int hf_zbee_nwk_gp_cmd_comm_length_of_clid_list_server;
+static int hf_zbee_nwk_gp_cmd_comm_length_of_clid_list_client;
+static int hf_zbee_nwk_cmd_comm_clid_list_server;
+static int hf_zbee_nwk_cmd_comm_clid_list_client;
+static int hf_zbee_nwk_cmd_comm_cluster_id;
 
 /* Commissioning reply. */
-static int hf_zbee_nwk_gp_cmd_comm_rep_opt = -1;
-static int hf_zbee_nwk_gp_cmd_comm_rep_opt_key_encr = -1;
-static int hf_zbee_nwk_gp_cmd_comm_rep_opt_panid_present = -1;
-static int hf_zbee_nwk_gp_cmd_comm_rep_opt_sec_key_present = -1;
-static int hf_zbee_nwk_gp_cmd_comm_rep_opt_sec_level = -1;
-static int hf_zbee_nwk_gp_cmd_comm_rep_opt_sec_type = -1;
-static int hf_zbee_nwk_gp_cmd_comm_rep_pan_id = -1;
-static int hf_zbee_nwk_gp_cmd_comm_rep_frame_counter = -1;
+static int hf_zbee_nwk_gp_cmd_comm_rep_opt;
+static int hf_zbee_nwk_gp_cmd_comm_rep_opt_key_encr;
+static int hf_zbee_nwk_gp_cmd_comm_rep_opt_panid_present;
+static int hf_zbee_nwk_gp_cmd_comm_rep_opt_sec_key_present;
+static int hf_zbee_nwk_gp_cmd_comm_rep_opt_sec_level;
+static int hf_zbee_nwk_gp_cmd_comm_rep_opt_sec_type;
+static int hf_zbee_nwk_gp_cmd_comm_rep_pan_id;
+static int hf_zbee_nwk_gp_cmd_comm_rep_frame_counter;
 
 /* Read attribute and read attribute response. */
-static int hf_zbee_nwk_gp_cmd_read_att_opt_multi_rec = -1;
-static int hf_zbee_nwk_gp_cmd_read_att_opt_man_field_present = -1;
-static int hf_zbee_nwk_gp_cmd_read_att_opt = -1;
-static int hf_zbee_nwk_gp_cmd_read_att_record_len = -1;
+static int hf_zbee_nwk_gp_cmd_read_att_opt_multi_rec;
+static int hf_zbee_nwk_gp_cmd_read_att_opt_man_field_present;
+static int hf_zbee_nwk_gp_cmd_read_att_opt;
+static int hf_zbee_nwk_gp_cmd_read_att_record_len;
 
 /* Common to commands returning data */
-static int hf_zbee_nwk_gp_zcl_attr_status = -1;
-static int hf_zbee_nwk_gp_zcl_attr_data_type = -1;
-static int hf_zbee_nwk_gp_zcl_attr_cluster_id = -1;
+static int hf_zbee_nwk_gp_zcl_attr_status;
+static int hf_zbee_nwk_gp_zcl_attr_data_type;
+static int hf_zbee_nwk_gp_zcl_attr_cluster_id;
 
 /* Common to all manufacturer specific commands */
-static int hf_zbee_zcl_gp_cmd_ms_manufacturer_code = -1;
+static int hf_zbee_zcl_gp_cmd_ms_manufacturer_code;
 
 /* Channel request. */
-static int hf_zbee_nwk_gp_cmd_channel_request_toggling_behaviour = -1;
-static int hf_zbee_nwk_gp_cmd_channel_request_toggling_behaviour_1st = -1;
-static int hf_zbee_nwk_gp_cmd_channel_request_toggling_behaviour_2nd = -1;
+static int hf_zbee_nwk_gp_cmd_channel_request_toggling_behaviour;
+static int hf_zbee_nwk_gp_cmd_channel_request_toggling_behaviour_1st;
+static int hf_zbee_nwk_gp_cmd_channel_request_toggling_behaviour_2nd;
 
 /* Channel Configuration command. */
-static int hf_zbee_nwk_gp_cmd_operational_channel = -1;
-static int hf_zbee_nwk_gp_cmd_channel_configuration = -1;
+static int hf_zbee_nwk_gp_cmd_operational_channel;
+static int hf_zbee_nwk_gp_cmd_channel_configuration;
 
 /* Move Color command. */
-static int hf_zbee_nwk_gp_cmd_move_color_ratex = -1;
-static int hf_zbee_nwk_gp_cmd_move_color_ratey = -1;
+static int hf_zbee_nwk_gp_cmd_move_color_ratex;
+static int hf_zbee_nwk_gp_cmd_move_color_ratey;
 
 /* Move Up/Down command. */
-static int hf_zbee_nwk_gp_cmd_move_up_down_rate = -1;
+static int hf_zbee_nwk_gp_cmd_move_up_down_rate;
 
 /* Step Color command. */
-static int hf_zbee_nwk_gp_cmd_step_color_stepx = -1;
-static int hf_zbee_nwk_gp_cmd_step_color_stepy = -1;
-static int hf_zbee_nwk_gp_cmd_step_color_transition_time = -1;
+static int hf_zbee_nwk_gp_cmd_step_color_stepx;
+static int hf_zbee_nwk_gp_cmd_step_color_stepy;
+static int hf_zbee_nwk_gp_cmd_step_color_transition_time;
 
 /* Step Up/Down command. */
-static int hf_zbee_nwk_gp_cmd_step_up_down_step_size = -1;
-static int hf_zbee_nwk_gp_cmd_step_up_down_transition_time = -1;
+static int hf_zbee_nwk_gp_cmd_step_up_down_step_size;
+static int hf_zbee_nwk_gp_cmd_step_up_down_transition_time;
 
-static expert_field ei_zbee_nwk_gp_no_payload = EI_INIT;
-static expert_field ei_zbee_nwk_gp_inval_residual_data = EI_INIT;
-static expert_field ei_zbee_nwk_gp_com_rep_no_out_cnt = EI_INIT;
+static expert_field ei_zbee_nwk_gp_no_payload;
+static expert_field ei_zbee_nwk_gp_inval_residual_data;
+static expert_field ei_zbee_nwk_gp_com_rep_no_out_cnt;
 
 /* Proto tree elements. */
-static gint ett_zbee_nwk = -1;
-static gint ett_zbee_nwk_cmd = -1;
-static gint ett_zbee_nwk_cmd_cinfo = -1;
-static gint ett_zbee_nwk_cmd_appli_info = -1;
-static gint ett_zbee_nwk_cmd_options = -1;
-static gint ett_zbee_nwk_fcf = -1;
-static gint ett_zbee_nwk_fcf_ext = -1;
-static gint ett_zbee_nwk_clu_rec = -1;
-static gint ett_zbee_nwk_att_rec = -1;
-static gint ett_zbee_nwk_cmd_comm_gpd_cmd_id_list = -1;
-static gint ett_zbee_nwk_cmd_comm_length_of_clid_list = -1;
-static gint ett_zbee_nwk_cmd_comm_clid_list_server = -1;
-static gint ett_zbee_nwk_cmd_comm_clid_list_client = -1;
+static gint ett_zbee_nwk;
+static gint ett_zbee_nwk_cmd;
+static gint ett_zbee_nwk_cmd_cinfo;
+static gint ett_zbee_nwk_cmd_appli_info;
+static gint ett_zbee_nwk_cmd_options;
+static gint ett_zbee_nwk_fcf;
+static gint ett_zbee_nwk_fcf_ext;
+static gint ett_zbee_nwk_clu_rec;
+static gint ett_zbee_nwk_att_rec;
+static gint ett_zbee_nwk_cmd_comm_gpd_cmd_id_list;
+static gint ett_zbee_nwk_cmd_comm_length_of_clid_list;
+static gint ett_zbee_nwk_cmd_comm_clid_list_server;
+static gint ett_zbee_nwk_cmd_comm_clid_list_client;
 
 /* Common. */
 static GSList *zbee_gp_keyring = NULL;
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c
index f30e45f235..44faeb913a 100644
--- a/epan/dissectors/packet-zbee-nwk.c
+++ b/epan/dissectors/packet-zbee-nwk.c
@@ -76,142 +76,142 @@ void               proto_reg_handoff_zbee_nwk(void);
 /********************/
 /* Global Variables */
 /********************/
-static int proto_zbee_nwk = -1;
-static int proto_zbee_beacon = -1;
-static int proto_zbip_beacon = -1;
-static int proto_zbee_ie = -1;
-static int hf_zbee_nwk_fcf = -1;
-static int hf_zbee_nwk_frame_type = -1;
-static int hf_zbee_nwk_proto_version = -1;
-static int hf_zbee_nwk_discover_route = -1;
-static int hf_zbee_nwk_multicast = -1;
-static int hf_zbee_nwk_security = -1;
-static int hf_zbee_nwk_source_route = -1;
-static int hf_zbee_nwk_ext_dst = -1;
-static int hf_zbee_nwk_ext_src = -1;
-static int hf_zbee_nwk_end_device_initiator = -1;
-static int hf_zbee_nwk_dst = -1;
-static int hf_zbee_nwk_src = -1;
-static int hf_zbee_nwk_addr = -1;
-static int hf_zbee_nwk_radius = -1;
-static int hf_zbee_nwk_seqno = -1;
-static int hf_zbee_nwk_mcast = -1;
-static int hf_zbee_nwk_mcast_mode = -1;
-static int hf_zbee_nwk_mcast_radius = -1;
-static int hf_zbee_nwk_mcast_max_radius = -1;
-static int hf_zbee_nwk_dst64 = -1;
-static int hf_zbee_nwk_src64 = -1;
-static int hf_zbee_nwk_addr64 = -1;
-static int hf_zbee_nwk_src64_origin = -1;
-static int hf_zbee_nwk_relay_count = -1;
-static int hf_zbee_nwk_relay_index = -1;
-static int hf_zbee_nwk_relay = -1;
-
-static int hf_zbee_nwk_cmd_id = -1;
-static int hf_zbee_nwk_cmd_addr = -1;
-static int hf_zbee_nwk_cmd_route_id = -1;
-static int hf_zbee_nwk_cmd_route_dest = -1;
-static int hf_zbee_nwk_cmd_route_orig = -1;
-static int hf_zbee_nwk_cmd_route_resp = -1;
-static int hf_zbee_nwk_cmd_route_dest_ext = -1;
-static int hf_zbee_nwk_cmd_route_orig_ext = -1;
-static int hf_zbee_nwk_cmd_route_resp_ext = -1;
-static int hf_zbee_nwk_cmd_route_cost = -1;
-static int hf_zbee_nwk_cmd_route_options = -1;
-static int hf_zbee_nwk_cmd_route_opt_repair = -1;
-static int hf_zbee_nwk_cmd_route_opt_multicast = -1;
-static int hf_zbee_nwk_cmd_route_opt_dest_ext = -1;
-static int hf_zbee_nwk_cmd_route_opt_resp_ext = -1;
-static int hf_zbee_nwk_cmd_route_opt_orig_ext = -1;
-static int hf_zbee_nwk_cmd_route_opt_many_to_one = -1;
-static int hf_zbee_nwk_cmd_nwk_status = -1;
-static int hf_zbee_nwk_cmd_nwk_status_command_id = -1;
-static int hf_zbee_nwk_cmd_leave_rejoin = -1;
-static int hf_zbee_nwk_cmd_leave_request = -1;
-static int hf_zbee_nwk_cmd_leave_children = -1;
-static int hf_zbee_nwk_cmd_relay_count = -1;
-static int hf_zbee_nwk_cmd_relay_device = -1;
-static int hf_zbee_nwk_cmd_cinfo = -1;
-static int hf_zbee_nwk_cmd_cinfo_alt_coord = -1;
-static int hf_zbee_nwk_cmd_cinfo_type = -1;
-static int hf_zbee_nwk_cmd_cinfo_power = -1;
-static int hf_zbee_nwk_cmd_cinfo_idle_rx = -1;
-static int hf_zbee_nwk_cmd_cinfo_security = -1;
-static int hf_zbee_nwk_cmd_cinfo_alloc = -1;
-static int hf_zbee_nwk_cmd_rejoin_status = -1;
-static int hf_zbee_nwk_cmd_link_last = -1;
-static int hf_zbee_nwk_cmd_link_first = -1;
-static int hf_zbee_nwk_cmd_link_count = -1;
-static int hf_zbee_nwk_cmd_link_address = -1;
-static int hf_zbee_nwk_cmd_link_incoming_cost = -1;
-static int hf_zbee_nwk_cmd_link_outgoing_cost = -1;
-static int hf_zbee_nwk_cmd_report_type = -1;
-static int hf_zbee_nwk_cmd_report_count = -1;
-static int hf_zbee_nwk_cmd_update_type = -1;
-static int hf_zbee_nwk_cmd_update_count = -1;
-static int hf_zbee_nwk_cmd_update_id = -1;
-static int hf_zbee_nwk_panid = -1;
-static int hf_zbee_zboss_nwk_cmd_key = -1;
-static int hf_zbee_nwk_cmd_epid = -1;
-static int hf_zbee_nwk_cmd_end_device_timeout_request_enum = -1;
-static int hf_zbee_nwk_cmd_end_device_configuration = -1;
-static int hf_zbee_nwk_cmd_end_device_timeout_resp_status = -1;
-static int hf_zbee_nwk_cmd_end_device_timeout_resp_parent_info = -1;
-static int hf_zbee_nwk_cmd_prnt_info_mac_data_poll_keepalive_supported = -1;
-static int hf_zbee_nwk_cmd_prnt_info_ed_to_req_keepalive_supported = -1;
-static int hf_zbee_nwk_cmd_prnt_info_power_negotiation_supported = -1;
-static int hf_zbee_nwk_cmd_link_pwr_list_count = -1;
-static int hf_zbee_nwk_cmd_link_pwr_type = -1;
-static int hf_zbee_nwk_cmd_link_pwr_device_address = -1;
-static int hf_zbee_nwk_cmd_link_pwr_power_delta = -1;
-static int hf_zbee_nwk_cmd_association_type = -1;
+static int proto_zbee_nwk;
+static int proto_zbee_beacon;
+static int proto_zbip_beacon;
+static int proto_zbee_ie;
+static int hf_zbee_nwk_fcf;
+static int hf_zbee_nwk_frame_type;
+static int hf_zbee_nwk_proto_version;
+static int hf_zbee_nwk_discover_route;
+static int hf_zbee_nwk_multicast;
+static int hf_zbee_nwk_security;
+static int hf_zbee_nwk_source_route;
+static int hf_zbee_nwk_ext_dst;
+static int hf_zbee_nwk_ext_src;
+static int hf_zbee_nwk_end_device_initiator;
+static int hf_zbee_nwk_dst;
+static int hf_zbee_nwk_src;
+static int hf_zbee_nwk_addr;
+static int hf_zbee_nwk_radius;
+static int hf_zbee_nwk_seqno;
+static int hf_zbee_nwk_mcast;
+static int hf_zbee_nwk_mcast_mode;
+static int hf_zbee_nwk_mcast_radius;
+static int hf_zbee_nwk_mcast_max_radius;
+static int hf_zbee_nwk_dst64;
+static int hf_zbee_nwk_src64;
+static int hf_zbee_nwk_addr64;
+static int hf_zbee_nwk_src64_origin;
+static int hf_zbee_nwk_relay_count;
+static int hf_zbee_nwk_relay_index;
+static int hf_zbee_nwk_relay;
+
+static int hf_zbee_nwk_cmd_id;
+static int hf_zbee_nwk_cmd_addr;
+static int hf_zbee_nwk_cmd_route_id;
+static int hf_zbee_nwk_cmd_route_dest;
+static int hf_zbee_nwk_cmd_route_orig;
+static int hf_zbee_nwk_cmd_route_resp;
+static int hf_zbee_nwk_cmd_route_dest_ext;
+static int hf_zbee_nwk_cmd_route_orig_ext;
+static int hf_zbee_nwk_cmd_route_resp_ext;
+static int hf_zbee_nwk_cmd_route_cost;
+static int hf_zbee_nwk_cmd_route_options;
+static int hf_zbee_nwk_cmd_route_opt_repair;
+static int hf_zbee_nwk_cmd_route_opt_multicast;
+static int hf_zbee_nwk_cmd_route_opt_dest_ext;
+static int hf_zbee_nwk_cmd_route_opt_resp_ext;
+static int hf_zbee_nwk_cmd_route_opt_orig_ext;
+static int hf_zbee_nwk_cmd_route_opt_many_to_one;
+static int hf_zbee_nwk_cmd_nwk_status;
+static int hf_zbee_nwk_cmd_nwk_status_command_id;
+static int hf_zbee_nwk_cmd_leave_rejoin;
+static int hf_zbee_nwk_cmd_leave_request;
+static int hf_zbee_nwk_cmd_leave_children;
+static int hf_zbee_nwk_cmd_relay_count;
+static int hf_zbee_nwk_cmd_relay_device;
+static int hf_zbee_nwk_cmd_cinfo;
+static int hf_zbee_nwk_cmd_cinfo_alt_coord;
+static int hf_zbee_nwk_cmd_cinfo_type;
+static int hf_zbee_nwk_cmd_cinfo_power;
+static int hf_zbee_nwk_cmd_cinfo_idle_rx;
+static int hf_zbee_nwk_cmd_cinfo_security;
+static int hf_zbee_nwk_cmd_cinfo_alloc;
+static int hf_zbee_nwk_cmd_rejoin_status;
+static int hf_zbee_nwk_cmd_link_last;
+static int hf_zbee_nwk_cmd_link_first;
+static int hf_zbee_nwk_cmd_link_count;
+static int hf_zbee_nwk_cmd_link_address;
+static int hf_zbee_nwk_cmd_link_incoming_cost;
+static int hf_zbee_nwk_cmd_link_outgoing_cost;
+static int hf_zbee_nwk_cmd_report_type;
+static int hf_zbee_nwk_cmd_report_count;
+static int hf_zbee_nwk_cmd_update_type;
+static int hf_zbee_nwk_cmd_update_count;
+static int hf_zbee_nwk_cmd_update_id;
+static int hf_zbee_nwk_panid;
+static int hf_zbee_zboss_nwk_cmd_key;
+static int hf_zbee_nwk_cmd_epid;
+static int hf_zbee_nwk_cmd_end_device_timeout_request_enum;
+static int hf_zbee_nwk_cmd_end_device_configuration;
+static int hf_zbee_nwk_cmd_end_device_timeout_resp_status;
+static int hf_zbee_nwk_cmd_end_device_timeout_resp_parent_info;
+static int hf_zbee_nwk_cmd_prnt_info_mac_data_poll_keepalive_supported;
+static int hf_zbee_nwk_cmd_prnt_info_ed_to_req_keepalive_supported;
+static int hf_zbee_nwk_cmd_prnt_info_power_negotiation_supported;
+static int hf_zbee_nwk_cmd_link_pwr_list_count;
+static int hf_zbee_nwk_cmd_link_pwr_type;
+static int hf_zbee_nwk_cmd_link_pwr_device_address;
+static int hf_zbee_nwk_cmd_link_pwr_power_delta;
+static int hf_zbee_nwk_cmd_association_type;
 
 /*  ZigBee Beacons */
-static int hf_zbee_beacon_protocol = -1;
-static int hf_zbee_beacon_stack_profile = -1;
-static int hf_zbee_beacon_version = -1;
-static int hf_zbee_beacon_router_capacity = -1;
-static int hf_zbee_beacon_depth = -1;
-static int hf_zbee_beacon_end_device_capacity = -1;
-static int hf_zbee_beacon_epid = -1;
-static int hf_zbee_beacon_tx_offset = -1;
-static int hf_zbee_beacon_update_id = -1;
-
-static int hf_zbip_beacon_allow_join = -1;
-static int hf_zbip_beacon_router_capacity = -1;
-static int hf_zbip_beacon_host_capacity = -1;
-static int hf_zbip_beacon_unsecure = -1;
-static int hf_zbip_beacon_network_id = -1;
+static int hf_zbee_beacon_protocol;
+static int hf_zbee_beacon_stack_profile;
+static int hf_zbee_beacon_version;
+static int hf_zbee_beacon_router_capacity;
+static int hf_zbee_beacon_depth;
+static int hf_zbee_beacon_end_device_capacity;
+static int hf_zbee_beacon_epid;
+static int hf_zbee_beacon_tx_offset;
+static int hf_zbee_beacon_update_id;
+
+static int hf_zbip_beacon_allow_join;
+static int hf_zbip_beacon_router_capacity;
+static int hf_zbip_beacon_host_capacity;
+static int hf_zbip_beacon_unsecure;
+static int hf_zbip_beacon_network_id;
 
 /* IEEE 802.15.4 IEs (Information Elements) */
-static int hf_ieee802154_zigbee_ie = -1;
-static int hf_ieee802154_zigbee_ie_id = -1;
-static int hf_ieee802154_zigbee_ie_length = -1;
-static int hf_ieee802154_zigbee_ie_tx_power = -1;
-static int hf_ieee802154_zigbee_ie_source_addr = -1;
-
-static int hf_ieee802154_zigbee_rejoin_epid = -1;
-static int hf_ieee802154_zigbee_rejoin_source_addr = -1;
-
-static gint ett_zbee_nwk = -1;
-static gint ett_zbee_nwk_beacon = -1;
-static gint ett_zbee_nwk_fcf = -1;
-static gint ett_zbee_nwk_fcf_ext = -1;
-static gint ett_zbee_nwk_mcast = -1;
-static gint ett_zbee_nwk_route = -1;
-static gint ett_zbee_nwk_cmd = -1;
-static gint ett_zbee_nwk_cmd_options = -1;
-static gint ett_zbee_nwk_cmd_cinfo = -1;
-static gint ett_zbee_nwk_cmd_link = -1;
-static gint ett_zbee_nwk_cmd_ed_to_rsp_prnt_info = -1;
-static gint ett_zbee_nwk_cmd_link_pwr_struct = -1;
-static gint ett_zbee_nwk_zigbee_ie_fields = -1;
-static gint ett_zbee_nwk_ie_rejoin = -1;
-static gint ett_zbee_nwk_header = -1;
-static gint ett_zbee_nwk_header_ie = -1;
-static gint ett_zbee_nwk_beacon_bitfield = -1;
-
-static expert_field ei_zbee_nwk_missing_payload = EI_INIT;
+static int hf_ieee802154_zigbee_ie;
+static int hf_ieee802154_zigbee_ie_id;
+static int hf_ieee802154_zigbee_ie_length;
+static int hf_ieee802154_zigbee_ie_tx_power;
+static int hf_ieee802154_zigbee_ie_source_addr;
+
+static int hf_ieee802154_zigbee_rejoin_epid;
+static int hf_ieee802154_zigbee_rejoin_source_addr;
+
+static gint ett_zbee_nwk;
+static gint ett_zbee_nwk_beacon;
+static gint ett_zbee_nwk_fcf;
+static gint ett_zbee_nwk_fcf_ext;
+static gint ett_zbee_nwk_mcast;
+static gint ett_zbee_nwk_route;
+static gint ett_zbee_nwk_cmd;
+static gint ett_zbee_nwk_cmd_options;
+static gint ett_zbee_nwk_cmd_cinfo;
+static gint ett_zbee_nwk_cmd_link;
+static gint ett_zbee_nwk_cmd_ed_to_rsp_prnt_info;
+static gint ett_zbee_nwk_cmd_link_pwr_struct;
+static gint ett_zbee_nwk_zigbee_ie_fields;
+static gint ett_zbee_nwk_ie_rejoin;
+static gint ett_zbee_nwk_header;
+static gint ett_zbee_nwk_header_ie;
+static gint ett_zbee_nwk_beacon_bitfield;
+
+static expert_field ei_zbee_nwk_missing_payload;
 
 static dissector_handle_t   aps_handle;
 static dissector_handle_t   zbee_gp_handle;
diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c
index f8c1a206da..62f9250fbe 100644
--- a/epan/dissectors/packet-zbee-security.c
+++ b/epan/dissectors/packet-zbee-security.c
@@ -42,26 +42,26 @@ static gboolean    zbee_sec_decrypt_payload(zbee_security_packet *, const gchar
 static gboolean    zbee_security_parse_key(const gchar *, guint8 *, gboolean);
 
 /* Field pointers. */
-static int hf_zbee_sec_field = -1;
-static int hf_zbee_sec_level = -1;
-static int hf_zbee_sec_key_id = -1;
-static int hf_zbee_sec_nonce = -1;
-static int hf_zbee_sec_verified_fc = -1;
-static int hf_zbee_sec_counter = -1;
-static int hf_zbee_sec_src64 = -1;
-static int hf_zbee_sec_key_seqno = -1;
-static int hf_zbee_sec_mic = -1;
-static int hf_zbee_sec_key = -1;
-static int hf_zbee_sec_key_origin = -1;
-static int hf_zbee_sec_decryption_key = -1;
+static int hf_zbee_sec_field;
+static int hf_zbee_sec_level;
+static int hf_zbee_sec_key_id;
+static int hf_zbee_sec_nonce;
+static int hf_zbee_sec_verified_fc;
+static int hf_zbee_sec_counter;
+static int hf_zbee_sec_src64;
+static int hf_zbee_sec_key_seqno;
+static int hf_zbee_sec_mic;
+static int hf_zbee_sec_key;
+static int hf_zbee_sec_key_origin;
+static int hf_zbee_sec_decryption_key;
 
 /* Subtree pointers. */
-static gint ett_zbee_sec = -1;
-static gint ett_zbee_sec_control = -1;
+static gint ett_zbee_sec;
+static gint ett_zbee_sec_control;
 
-static expert_field ei_zbee_sec_encrypted_payload = EI_INIT;
-static expert_field ei_zbee_sec_encrypted_payload_sliced = EI_INIT;
-static expert_field ei_zbee_sec_extended_source_unknown = EI_INIT;
+static expert_field ei_zbee_sec_encrypted_payload;
+static expert_field ei_zbee_sec_encrypted_payload_sliced;
+static expert_field ei_zbee_sec_extended_source_unknown;
 
 static const value_string zbee_sec_key_names[] = {
     { ZBEE_SEC_KEY_LINK,        "Link Key" },
diff --git a/epan/dissectors/packet-zbee-tlv.c b/epan/dissectors/packet-zbee-tlv.c
index 96838e7119..a4b078c375 100644
--- a/epan/dissectors/packet-zbee-tlv.c
+++ b/epan/dissectors/packet-zbee-tlv.c
@@ -90,149 +90,149 @@ static guint dissect_zbd_msg_secur_local_tlv(tvbuff_t *tvb, packet_info *pinfo _
 void proto_register_zbee_tlv(void);
 
 /* Initialize Protocol and Registered fields */
-static int proto_zbee_tlv = -1;
+static int proto_zbee_tlv;
 static dissector_handle_t zigbee_aps_handle;
 static dissector_handle_t zbee_nwk_handle;
 
-static int hf_zbee_tlv_global_type = -1;
-static int hf_zbee_tlv_local_type_key_update_req_rsp = -1;
-static int hf_zbee_tlv_local_type_key_negotiation_req_rsp = -1;
-static int hf_zbee_tlv_local_type_get_auth_level_rsp = -1;
-static int hf_zbee_tlv_local_type_clear_all_bindings_req = -1;
-static int hf_zbee_tlv_local_type_req_security_get_auth_token = -1;
-static int hf_zbee_tlv_local_type_req_security_get_auth_level = -1;
-static int hf_zbee_tlv_local_type_req_security_decommission = -1;
-static int hf_zbee_tlv_local_type_req_beacon_survey = -1;
-static int hf_zbee_tlv_local_type_rsp_beacon_survey = -1;
-static int hf_zbee_tlv_local_type_req_challenge = -1;
-static int hf_zbee_tlv_local_type_rsp_challenge = -1;
-static int hf_zbee_tlv_local_type_rsp_set_configuration = -1;
-
-static int hf_zbee_tlv_length = -1;
-static int hf_zbee_tlv_type = -1;
-static int hf_zbee_tlv_value = -1;
-static int hf_zbee_tlv_count = -1;
-static int hf_zbee_tlv_manufacturer_specific = -1;
-
-static int hf_zbee_tlv_local_status_count = -1;
-static int hf_zbee_tlv_local_type_id = -1;
-static int hf_zbee_tlv_local_proc_status = -1;
-
-static int hf_zbee_tlv_local_comm_ext_pan_id = -1;
-static int hf_zbee_tlv_local_comm_short_pan_id = -1;
-static int hf_zbee_tlv_local_comm_channel_mask = -1;
-static int hf_zbee_tlv_local_comm_channel_page = -1;
-static int hf_zbee_tlv_local_comm_channel_page_count = -1;
-static int hf_zbee_tlv_local_comm_nwk_key = -1;
-static int hf_zbee_tlv_local_comm_link_key = -1;
-static int hf_zbee_tlv_local_comm_link_key_flags = -1;
-static int hf_zbee_tlv_local_comm_link_key_flags_unique = -1;
-static int hf_zbee_tlv_local_comm_link_key_flags_provisional = -1;
-static int hf_zbee_tlv_local_comm_dev_type = -1;
-static int hf_zbee_tlv_local_comm_nwk_addr = -1;
-static int hf_zbee_tlv_local_comm_join_method = -1;
-static int hf_zbee_tlv_local_comm_tc_addr = -1;
-static int hf_zbee_tlv_local_comm_network_status_map = -1;
-static int hf_zbee_tlv_local_comm_network_status_map_joined_status = -1;
-static int hf_zbee_tlv_local_comm_network_status_map_open_status = -1;
-static int hf_zbee_tlv_network_status_map_network_type = -1;
-static int hf_zbee_tlv_local_comm_nwk_upd_id = -1;
-static int hf_zbee_tlv_local_comm_key_seq_num = -1;
-static int hf_zbee_tlv_local_comm_adm_key = -1;
-static int hf_zbee_tlv_local_comm_status_code_domain = -1;
-static int hf_zbee_tlv_local_comm_status_code_value = -1;
-static int hf_zbee_tlv_local_comm_mj_prov_lnk_key = -1;
-static int hf_zbee_tlv_local_comm_mj_ieee_addr = -1;
-static int hf_zbee_tlv_local_comm_mj_cmd = -1;
-
-static int hf_zbee_tlv_local_tunneling_npdu = -1;
-static int hf_zbee_tlv_local_tunneling_npdu_flags = -1;
-static int hf_zbee_tlv_local_tunneling_npdu_flags_security = -1;
-static int hf_zbee_tlv_local_tunneling_npdu_flags_reserved = -1;
-static int hf_zbee_tlv_local_tunneling_npdu_length = -1;
-
-static int hf_zbee_tlv_local_selected_key_method = -1;
-static int hf_zbee_tlv_local_selected_psk_secret = -1;
-static int hf_zbee_tlv_local_nwk_key_seq_num = -1;
-static int hf_zbee_tlv_local_mac_tag = -1;
-
-static int hf_zbee_tlv_zbd_comm_tlv = -1;
-static int hf_zbee_tlv_zbd_comm_mj_cmd_tlv = -1;
-static int hf_zbee_tlv_zbd_secur_tlv = - 1;
-static int hf_zbee_tlv_zbd_tunneling_npdu_msg_tlv = -1;
-
-static int hf_zbee_tlv_next_pan_id = -1;
-static int hf_zbee_tlv_next_channel_change =-1;
-static int hf_zbee_tlv_passphrase = -1;
-static int hf_zbee_tlv_configuration_param = -1;
-static int hf_zbee_tlv_configuration_param_restricted_mode =-1;
-static int hf_zbee_tlv_configuration_param_link_key_enc = -1;
-static int hf_zbee_tlv_configuration_param_leave_req_allowed = -1;
-
-static int hf_zbee_tlv_dev_cap_ext_capability_information = -1;
-static int hf_zbee_tlv_dev_cap_ext_zbdirect_virt_device = -1;
-
-static int hf_zbee_tlv_challenge_value = -1;
-static int hf_zbee_tlv_aps_frame_counter = -1;
-static int hf_zbee_tlv_challenge_counter = -1;
-static int hf_zbee_tlv_mic64 = -1;
-
-static int hf_zbee_tlv_lqa = -1;
-
-static int hf_zbee_tlv_router_information = -1;
-static int hf_zbee_tlv_router_information_hub_connectivity = -1;
-static int hf_zbee_tlv_router_information_uptime = -1;
-static int hf_zbee_tlv_router_information_pref_parent = -1;
-static int hf_zbee_tlv_router_information_battery_backup = -1;
-static int hf_zbee_tlv_router_information_enhanced_beacon_request_support = -1;
-static int hf_zbee_tlv_router_information_mac_data_poll_keepalive_support = -1;
-static int hf_zbee_tlv_router_information_end_device_keepalive_support = -1;
-static int hf_zbee_tlv_router_information_power_negotiation_support = -1;
-
-static int hf_zbee_tlv_node_id = -1;
-static int hf_zbee_tlv_frag_opt = -1;
-static int hf_zbee_tlv_max_reassembled_buf_size = -1;
-
-static int hf_zbee_tlv_supported_key_negotiation_methods = -1;
-static int hf_zbee_tlv_supported_key_negotiation_methods_key_request = -1;
-static int hf_zbee_tlv_supported_key_negotiation_methods_ecdhe_using_curve25519_aes_mmo128 = -1;
-static int hf_zbee_tlv_supported_key_negotiation_methods_ecdhe_using_curve25519_sha256 = -1;
-static int hf_zbee_tlv_supported_secrets = -1;
-static int hf_zbee_tlv_supported_preshared_secrets_auth_token = -1;
-static int hf_zbee_tlv_supported_preshared_secrets_ic = -1;
-static int hf_zbee_tlv_supported_preshared_secrets_passcode_pake = -1;
-static int hf_zbee_tlv_supported_preshared_secrets_basic_access_key = -1;
-static int hf_zbee_tlv_supported_preshared_secrets_admin_access_key = -1;
-
-static int hf_zbee_tlv_panid_conflict_cnt = -1;
-
-static int hf_zbee_tlv_selected_key_negotiation_method = -1;
-static int hf_zbee_tlv_selected_pre_shared_secret = -1;
-static int hf_zbee_tlv_device_eui64 = -1;
-static int hf_zbee_tlv_public_point = -1;
-static int hf_zbee_tlv_global_tlv_id = -1;
-static int hf_zbee_tlv_local_ieee_addr = -1;
-static int hf_zbee_tlv_local_initial_join_method = -1;
-static int hf_zbee_tlv_local_active_lk_type = -1;
-
-static int hf_zbee_tlv_relay_msg_type = -1;
-static int hf_zbee_tlv_relay_msg_length = -1;
-static int hf_zbee_tlv_relay_msg_joiner_ieee = -1;
-
-static gint ett_zbee_aps_tlv = -1;
-static gint ett_zbee_aps_relay = -1;
-static gint ett_zbee_tlv = -1;
-static gint ett_zbee_tlv_supported_key_negotiation_methods = -1;
-static gint ett_zbee_tlv_supported_secrets = -1;
-static gint ett_zbee_tlv_router_information = -1;
-static gint ett_zbee_tlv_configuration_param = -1;
-static gint ett_zbee_tlv_capability_information = -1;
-
-static gint ett_zbee_tlv_zbd_tunneling_npdu = -1;
-static gint ett_zbee_tlv_zbd_tunneling_npdu_flags = -1;
-
-static gint ett_zbee_tlv_link_key_flags = -1;
-static gint ett_zbee_tlv_network_status_map = -1;
+static int hf_zbee_tlv_global_type;
+static int hf_zbee_tlv_local_type_key_update_req_rsp;
+static int hf_zbee_tlv_local_type_key_negotiation_req_rsp;
+static int hf_zbee_tlv_local_type_get_auth_level_rsp;
+static int hf_zbee_tlv_local_type_clear_all_bindings_req;
+static int hf_zbee_tlv_local_type_req_security_get_auth_token;
+static int hf_zbee_tlv_local_type_req_security_get_auth_level;
+static int hf_zbee_tlv_local_type_req_security_decommission;
+static int hf_zbee_tlv_local_type_req_beacon_survey;
+static int hf_zbee_tlv_local_type_rsp_beacon_survey;
+static int hf_zbee_tlv_local_type_req_challenge;
+static int hf_zbee_tlv_local_type_rsp_challenge;
+static int hf_zbee_tlv_local_type_rsp_set_configuration;
+
+static int hf_zbee_tlv_length;
+static int hf_zbee_tlv_type;
+static int hf_zbee_tlv_value;
+static int hf_zbee_tlv_count;
+static int hf_zbee_tlv_manufacturer_specific;
+
+static int hf_zbee_tlv_local_status_count;
+static int hf_zbee_tlv_local_type_id;
+static int hf_zbee_tlv_local_proc_status;
+
+static int hf_zbee_tlv_local_comm_ext_pan_id;
+static int hf_zbee_tlv_local_comm_short_pan_id;
+static int hf_zbee_tlv_local_comm_channel_mask;
+static int hf_zbee_tlv_local_comm_channel_page;
+static int hf_zbee_tlv_local_comm_channel_page_count;
+static int hf_zbee_tlv_local_comm_nwk_key;
+static int hf_zbee_tlv_local_comm_link_key;
+static int hf_zbee_tlv_local_comm_link_key_flags;
+static int hf_zbee_tlv_local_comm_link_key_flags_unique;
+static int hf_zbee_tlv_local_comm_link_key_flags_provisional;
+static int hf_zbee_tlv_local_comm_dev_type;
+static int hf_zbee_tlv_local_comm_nwk_addr;
+static int hf_zbee_tlv_local_comm_join_method;
+static int hf_zbee_tlv_local_comm_tc_addr;
+static int hf_zbee_tlv_local_comm_network_status_map;
+static int hf_zbee_tlv_local_comm_network_status_map_joined_status;
+static int hf_zbee_tlv_local_comm_network_status_map_open_status;
+static int hf_zbee_tlv_network_status_map_network_type;
+static int hf_zbee_tlv_local_comm_nwk_upd_id;
+static int hf_zbee_tlv_local_comm_key_seq_num;
+static int hf_zbee_tlv_local_comm_adm_key;
+static int hf_zbee_tlv_local_comm_status_code_domain;
+static int hf_zbee_tlv_local_comm_status_code_value;
+static int hf_zbee_tlv_local_comm_mj_prov_lnk_key;
+static int hf_zbee_tlv_local_comm_mj_ieee_addr;
+static int hf_zbee_tlv_local_comm_mj_cmd;
+
+static int hf_zbee_tlv_local_tunneling_npdu;
+static int hf_zbee_tlv_local_tunneling_npdu_flags;
+static int hf_zbee_tlv_local_tunneling_npdu_flags_security;
+static int hf_zbee_tlv_local_tunneling_npdu_flags_reserved;
+static int hf_zbee_tlv_local_tunneling_npdu_length;
+
+static int hf_zbee_tlv_local_selected_key_method;
+static int hf_zbee_tlv_local_selected_psk_secret;
+static int hf_zbee_tlv_local_nwk_key_seq_num;
+static int hf_zbee_tlv_local_mac_tag;
+
+static int hf_zbee_tlv_zbd_comm_tlv;
+static int hf_zbee_tlv_zbd_comm_mj_cmd_tlv;
+static int hf_zbee_tlv_zbd_secur_tlv;
+static int hf_zbee_tlv_zbd_tunneling_npdu_msg_tlv;
+
+static int hf_zbee_tlv_next_pan_id;
+static int hf_zbee_tlv_next_channel_change;
+static int hf_zbee_tlv_passphrase;
+static int hf_zbee_tlv_configuration_param;
+static int hf_zbee_tlv_configuration_param_restricted_mode;
+static int hf_zbee_tlv_configuration_param_link_key_enc;
+static int hf_zbee_tlv_configuration_param_leave_req_allowed;
+
+static int hf_zbee_tlv_dev_cap_ext_capability_information;
+static int hf_zbee_tlv_dev_cap_ext_zbdirect_virt_device;
+
+static int hf_zbee_tlv_challenge_value;
+static int hf_zbee_tlv_aps_frame_counter;
+static int hf_zbee_tlv_challenge_counter;
+static int hf_zbee_tlv_mic64;
+
+static int hf_zbee_tlv_lqa;
+
+static int hf_zbee_tlv_router_information;
+static int hf_zbee_tlv_router_information_hub_connectivity;
+static int hf_zbee_tlv_router_information_uptime;
+static int hf_zbee_tlv_router_information_pref_parent;
+static int hf_zbee_tlv_router_information_battery_backup;
+static int hf_zbee_tlv_router_information_enhanced_beacon_request_support;
+static int hf_zbee_tlv_router_information_mac_data_poll_keepalive_support;
+static int hf_zbee_tlv_router_information_end_device_keepalive_support;
+static int hf_zbee_tlv_router_information_power_negotiation_support;
+
+static int hf_zbee_tlv_node_id;
+static int hf_zbee_tlv_frag_opt;
+static int hf_zbee_tlv_max_reassembled_buf_size;
+
+static int hf_zbee_tlv_supported_key_negotiation_methods;
+static int hf_zbee_tlv_supported_key_negotiation_methods_key_request;
+static int hf_zbee_tlv_supported_key_negotiation_methods_ecdhe_using_curve25519_aes_mmo128;
+static int hf_zbee_tlv_supported_key_negotiation_methods_ecdhe_using_curve25519_sha256;
+static int hf_zbee_tlv_supported_secrets;
+static int hf_zbee_tlv_supported_preshared_secrets_auth_token;
+static int hf_zbee_tlv_supported_preshared_secrets_ic;
+static int hf_zbee_tlv_supported_preshared_secrets_passcode_pake;
+static int hf_zbee_tlv_supported_preshared_secrets_basic_access_key;
+static int hf_zbee_tlv_supported_preshared_secrets_admin_access_key;
+
+static int hf_zbee_tlv_panid_conflict_cnt;
+
+static int hf_zbee_tlv_selected_key_negotiation_method;
+static int hf_zbee_tlv_selected_pre_shared_secret;
+static int hf_zbee_tlv_device_eui64;
+static int hf_zbee_tlv_public_point;
+static int hf_zbee_tlv_global_tlv_id;
+static int hf_zbee_tlv_local_ieee_addr;
+static int hf_zbee_tlv_local_initial_join_method;
+static int hf_zbee_tlv_local_active_lk_type;
+
+static int hf_zbee_tlv_relay_msg_type;
+static int hf_zbee_tlv_relay_msg_length;
+static int hf_zbee_tlv_relay_msg_joiner_ieee;
+
+static gint ett_zbee_aps_tlv;
+static gint ett_zbee_aps_relay;
+static gint ett_zbee_tlv;
+static gint ett_zbee_tlv_supported_key_negotiation_methods;
+static gint ett_zbee_tlv_supported_secrets;
+static gint ett_zbee_tlv_router_information;
+static gint ett_zbee_tlv_configuration_param;
+static gint ett_zbee_tlv_capability_information;
+
+static gint ett_zbee_tlv_zbd_tunneling_npdu;
+static gint ett_zbee_tlv_zbd_tunneling_npdu_flags;
+
+static gint ett_zbee_tlv_link_key_flags;
+static gint ett_zbee_tlv_network_status_map;
 
 static const value_string zbee_tlv_local_types_key_method_str[] =
 {
diff --git a/epan/dissectors/packet-zbee-zcl-closures.c b/epan/dissectors/packet-zbee-zcl-closures.c
index b4d78ccc09..624ea9792b 100644
--- a/epan/dissectors/packet-zbee-zcl-closures.c
+++ b/epan/dissectors/packet-zbee-zcl-closures.c
@@ -64,19 +64,19 @@ static void dissect_zcl_shade_configuration_attr_data      (proto_tree *tree, tv
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_shade_configuration = -1;
+static int proto_zbee_zcl_shade_configuration;
 
-static int hf_zbee_zcl_shade_configuration_attr_id = -1;
-static int hf_zbee_zcl_shade_configuration_status = -1;
-static int hf_zbee_zcl_shade_configuration_status_shade_operational = -1;
-static int hf_zbee_zcl_shade_configuration_status_shade_adjusting = -1;
-static int hf_zbee_zcl_shade_configuration_status_shade_direction = -1;
-static int hf_zbee_zcl_shade_configuration_status_motor_forward_direction = -1;
-static int hf_zbee_zcl_shade_configuration_mode = -1;
+static int hf_zbee_zcl_shade_configuration_attr_id;
+static int hf_zbee_zcl_shade_configuration_status;
+static int hf_zbee_zcl_shade_configuration_status_shade_operational;
+static int hf_zbee_zcl_shade_configuration_status_shade_adjusting;
+static int hf_zbee_zcl_shade_configuration_status_shade_direction;
+static int hf_zbee_zcl_shade_configuration_status_motor_forward_direction;
+static int hf_zbee_zcl_shade_configuration_mode;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_shade_configuration = -1;
-static gint ett_zbee_zcl_shade_configuration_status = -1;
+static gint ett_zbee_zcl_shade_configuration;
+static gint ett_zbee_zcl_shade_configuration_status;
 
 /* Attributes */
 static const value_string zbee_zcl_shade_configuration_attr_names[] = {
@@ -289,19 +289,19 @@ static void dissect_zcl_door_lock_attr_data                        (proto_tree *
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_door_lock = -1;
+static int proto_zbee_zcl_door_lock;
 
-static int hf_zbee_zcl_door_lock_attr_id = -1;
-static int hf_zbee_zcl_door_lock_lock_state = -1;
-static int hf_zbee_zcl_door_lock_lock_type = -1;
-static int hf_zbee_zcl_door_lock_door_state = -1;
-static int hf_zbee_zcl_door_lock_actuator_enabled = -1;
-static int hf_zbee_zcl_door_lock_status = -1;
-static int hf_zbee_zcl_door_lock_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_door_lock_srv_tx_cmd_id = -1;
+static int hf_zbee_zcl_door_lock_attr_id;
+static int hf_zbee_zcl_door_lock_lock_state;
+static int hf_zbee_zcl_door_lock_lock_type;
+static int hf_zbee_zcl_door_lock_door_state;
+static int hf_zbee_zcl_door_lock_actuator_enabled;
+static int hf_zbee_zcl_door_lock_status;
+static int hf_zbee_zcl_door_lock_srv_rx_cmd_id;
+static int hf_zbee_zcl_door_lock_srv_tx_cmd_id;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_door_lock = -1;
+static gint ett_zbee_zcl_door_lock;
 
 /* Attributes */
 static const value_string zbee_zcl_door_lock_attr_names[] = {
diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c
index e8d58bf669..d46d4792e4 100644
--- a/epan/dissectors/packet-zbee-zcl-general.c
+++ b/epan/dissectors/packet-zbee-zcl-general.c
@@ -92,25 +92,25 @@ static void dissect_zcl_basic_attr_data(proto_tree *tree, tvbuff_t *tvb, guint *
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_basic = -1;
-
-static int hf_zbee_zcl_basic_attr_id = -1;
-static int hf_zbee_zcl_basic_pwr_src = -1;
-static int hf_zbee_zcl_basic_dev_en = -1;
-static int hf_zbee_zcl_basic_alarm_mask = -1;
-static int hf_zbee_zcl_basic_alarm_mask_gen_hw_fault = -1;
-static int hf_zbee_zcl_basic_alarm_mask_gen_sw_fault = -1;
-static int hf_zbee_zcl_basic_alarm_mask_reserved = -1;
-static int hf_zbee_zcl_basic_disable_local_cfg = -1;
-static int hf_zbee_zcl_basic_disable_local_cfg_reset = -1;
-static int hf_zbee_zcl_basic_disable_local_cfg_device_cfg = -1;
-static int hf_zbee_zcl_basic_disable_local_cfg_reserved = -1;
-static int hf_zbee_zcl_basic_srv_rx_cmd_id = -1;
+static int proto_zbee_zcl_basic;
+
+static int hf_zbee_zcl_basic_attr_id;
+static int hf_zbee_zcl_basic_pwr_src;
+static int hf_zbee_zcl_basic_dev_en;
+static int hf_zbee_zcl_basic_alarm_mask;
+static int hf_zbee_zcl_basic_alarm_mask_gen_hw_fault;
+static int hf_zbee_zcl_basic_alarm_mask_gen_sw_fault;
+static int hf_zbee_zcl_basic_alarm_mask_reserved;
+static int hf_zbee_zcl_basic_disable_local_cfg;
+static int hf_zbee_zcl_basic_disable_local_cfg_reset;
+static int hf_zbee_zcl_basic_disable_local_cfg_device_cfg;
+static int hf_zbee_zcl_basic_disable_local_cfg_reserved;
+static int hf_zbee_zcl_basic_srv_rx_cmd_id;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_basic = -1;
-static gint ett_zbee_zcl_basic_alarm_mask = -1;
-static gint ett_zbee_zcl_basic_dis_local_cfg = -1;
+static gint ett_zbee_zcl_basic;
+static gint ett_zbee_zcl_basic_alarm_mask;
+static gint ett_zbee_zcl_basic_dis_local_cfg;
 
 /* Attributes */
 static const value_string zbee_zcl_basic_attr_names[] = {
@@ -472,30 +472,30 @@ static void dissect_zcl_power_config_attr_data(proto_tree *tree, tvbuff_t *tvb,
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_power_config = -1;
-static int hf_zbee_zcl_power_config_attr_id = -1;
-static int hf_zbee_zcl_power_config_batt_type = -1;
-static int hf_zbee_zcl_power_config_mains_alarm_mask = -1;
-static int hf_zbee_zcl_power_config_mains_alarm_mask_low = -1;
-static int hf_zbee_zcl_power_config_mains_alarm_mask_high = -1;
-static int hf_zbee_zcl_power_config_mains_alarm_mask_reserved = -1;
-static int hf_zbee_zcl_power_config_batt_alarm_mask = -1;
-static int hf_zbee_zcl_power_config_batt_alarm_mask_low = -1;
-static int hf_zbee_zcl_power_config_batt_alarm_mask_reserved = -1;
-static int hf_zbee_zcl_power_config_mains_voltage = -1;
-static int hf_zbee_zcl_power_config_mains_frequency = -1;
-static int hf_zbee_zcl_power_config_mains_voltage_min_thr = -1;
-static int hf_zbee_zcl_power_config_mains_voltage_max_thr = -1;
-static int hf_zbee_zcl_power_config_mains_voltage_dwell_tp = -1;
-static int hf_zbee_zcl_power_config_batt_voltage = -1;
-static int hf_zbee_zcl_power_config_batt_percentage = -1;
-static int hf_zbee_zcl_power_config_batt_ah_rating = -1;
-static int hf_zbee_zcl_power_config_batt_rated_voltage = -1;
-static int hf_zbee_zcl_power_config_batt_voltage_min_thr = -1;
+static int proto_zbee_zcl_power_config;
+static int hf_zbee_zcl_power_config_attr_id;
+static int hf_zbee_zcl_power_config_batt_type;
+static int hf_zbee_zcl_power_config_mains_alarm_mask;
+static int hf_zbee_zcl_power_config_mains_alarm_mask_low;
+static int hf_zbee_zcl_power_config_mains_alarm_mask_high;
+static int hf_zbee_zcl_power_config_mains_alarm_mask_reserved;
+static int hf_zbee_zcl_power_config_batt_alarm_mask;
+static int hf_zbee_zcl_power_config_batt_alarm_mask_low;
+static int hf_zbee_zcl_power_config_batt_alarm_mask_reserved;
+static int hf_zbee_zcl_power_config_mains_voltage;
+static int hf_zbee_zcl_power_config_mains_frequency;
+static int hf_zbee_zcl_power_config_mains_voltage_min_thr;
+static int hf_zbee_zcl_power_config_mains_voltage_max_thr;
+static int hf_zbee_zcl_power_config_mains_voltage_dwell_tp;
+static int hf_zbee_zcl_power_config_batt_voltage;
+static int hf_zbee_zcl_power_config_batt_percentage;
+static int hf_zbee_zcl_power_config_batt_ah_rating;
+static int hf_zbee_zcl_power_config_batt_rated_voltage;
+static int hf_zbee_zcl_power_config_batt_voltage_min_thr;
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_power_config = -1;
-static gint ett_zbee_zcl_power_config_mains_alarm_mask = -1;
-static gint ett_zbee_zcl_power_config_batt_alarm_mask = -1;
+static gint ett_zbee_zcl_power_config;
+static gint ett_zbee_zcl_power_config_mains_alarm_mask;
+static gint ett_zbee_zcl_power_config_batt_alarm_mask;
 
 /* Attributes */
 static const value_string zbee_zcl_power_config_attr_names[] = {
@@ -924,17 +924,17 @@ static void dissect_zcl_device_temperature_configuration_attr_data      (proto_t
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_device_temperature_configuration = -1;
+static int proto_zbee_zcl_device_temperature_configuration;
 
-static int hf_zbee_zcl_device_temperature_configuration_attr_id = -1;
-static int hf_zbee_zcl_device_temperature_configuration_device_temp_alarm_mask = -1;
-static int hf_zbee_zcl_device_temperature_configuration_device_temp_alarm_mask_too_low = -1;
-static int hf_zbee_zcl_device_temperature_configuration_device_temp_alarm_mask_too_high = -1;
-static int hf_zbee_zcl_device_temperature_configuration_device_temp_alarm_mask_reserved = -1;
+static int hf_zbee_zcl_device_temperature_configuration_attr_id;
+static int hf_zbee_zcl_device_temperature_configuration_device_temp_alarm_mask;
+static int hf_zbee_zcl_device_temperature_configuration_device_temp_alarm_mask_too_low;
+static int hf_zbee_zcl_device_temperature_configuration_device_temp_alarm_mask_too_high;
+static int hf_zbee_zcl_device_temperature_configuration_device_temp_alarm_mask_reserved;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_device_temperature_configuration = -1;
-static gint ett_zbee_zcl_device_temperature_configuration_device_temp_alarm_mask = -1;
+static gint ett_zbee_zcl_device_temperature_configuration;
+static gint ett_zbee_zcl_device_temperature_configuration_device_temp_alarm_mask;
 
 /* Attributes */
 static const value_string zbee_zcl_device_temperature_configuration_attr_names[] = {
@@ -1147,18 +1147,18 @@ static void dissect_zcl_identify_attr_data              (proto_tree *tree, tvbuf
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_identify = -1;
+static int proto_zbee_zcl_identify;
 
-static int hf_zbee_zcl_identify_attr_id = -1;
-static int hf_zbee_zcl_identify_identify_time = -1;
-static int hf_zbee_zcl_identify_identify_timeout = -1;
-static int hf_zbee_zcl_identify_effect_id = -1;
-static int hf_zbee_zcl_identify_effect_variant = -1;
-static int hf_zbee_zcl_identify_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_identify_srv_tx_cmd_id = -1;
+static int hf_zbee_zcl_identify_attr_id;
+static int hf_zbee_zcl_identify_identify_time;
+static int hf_zbee_zcl_identify_identify_timeout;
+static int hf_zbee_zcl_identify_effect_id;
+static int hf_zbee_zcl_identify_effect_variant;
+static int hf_zbee_zcl_identify_srv_rx_cmd_id;
+static int hf_zbee_zcl_identify_srv_tx_cmd_id;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_identify = -1;
+static gint ett_zbee_zcl_identify;
 
 /* Attributes */
 static const value_string zbee_zcl_identify_attr_names[] = {
@@ -1538,23 +1538,23 @@ static void dissect_zcl_groups_attr_data                        (proto_tree *tre
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_groups = -1;
-
-static int hf_zbee_zcl_groups_attr_id = -1;
-static int hf_zbee_zcl_groups_group_name_support = -1;
-static int hf_zbee_zcl_groups_group_id = -1;
-static int hf_zbee_zcl_groups_group_count = -1;
-static int hf_zbee_zcl_groups_group_capacity = -1;
-static int hf_zbee_zcl_groups_status = -1;
-static int hf_zbee_zcl_groups_attr_str_len = -1;
-static int hf_zbee_zcl_groups_attr_str = -1;
-static int hf_zbee_zcl_groups_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_groups_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_groups_group_list = -1;
+static int proto_zbee_zcl_groups;
+
+static int hf_zbee_zcl_groups_attr_id;
+static int hf_zbee_zcl_groups_group_name_support;
+static int hf_zbee_zcl_groups_group_id;
+static int hf_zbee_zcl_groups_group_count;
+static int hf_zbee_zcl_groups_group_capacity;
+static int hf_zbee_zcl_groups_status;
+static int hf_zbee_zcl_groups_attr_str_len;
+static int hf_zbee_zcl_groups_attr_str;
+static int hf_zbee_zcl_groups_srv_rx_cmd_id;
+static int hf_zbee_zcl_groups_srv_tx_cmd_id;
+static int hf_zbee_zcl_groups_group_list;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_groups = -1;
-static gint ett_zbee_zcl_groups_grp_ctrl = -1;
+static gint ett_zbee_zcl_groups;
+static gint ett_zbee_zcl_groups_grp_ctrl;
 
 /* Attributes */
 static const value_string zbee_zcl_groups_attr_names[] = {
@@ -2168,50 +2168,50 @@ static void dissect_zcl_scenes_attr_data                                    (pro
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_scenes = -1;
-
-static int hf_zbee_zcl_scenes_attr_id = -1;
-static int hf_zbee_zcl_scenes_attr_id_scene_valid = -1;
-static int hf_zbee_zcl_scenes_attr_id_name_support = -1;
-static int hf_zbee_zcl_scenes_group_id = -1;
-static int hf_zbee_zcl_scenes_group_id_from = -1;
-static int hf_zbee_zcl_scenes_group_id_to = -1;
-static int hf_zbee_zcl_scenes_scene_id = -1;
-static int hf_zbee_zcl_scenes_scene_id_from = -1;
-static int hf_zbee_zcl_scenes_scene_id_to = -1;
-static int hf_zbee_zcl_scenes_transit_time = -1;
-static int hf_zbee_zcl_scenes_enh_transit_time = -1;
-static int hf_zbee_zcl_scenes_extension_set_cluster = -1;
-static int hf_zbee_zcl_scenes_extension_set_onoff = -1;
-static int hf_zbee_zcl_scenes_extension_set_level = -1;
-static int hf_zbee_zcl_scenes_extension_set_x = -1;
-static int hf_zbee_zcl_scenes_extension_set_y = -1;
-static int hf_zbee_zcl_scenes_extension_set_hue = -1;
-static int hf_zbee_zcl_scenes_extension_set_saturation = -1;
-static int hf_zbee_zcl_scenes_extension_set_color_loop_active = -1;
-static int hf_zbee_zcl_scenes_extension_set_color_loop_direction = -1;
-static int hf_zbee_zcl_scenes_extension_set_color_loop_time = -1;
-static int hf_zbee_zcl_scenes_extension_set_cooling_setpoint = -1;
-static int hf_zbee_zcl_scenes_extension_set_heating_setpoint = -1;
-static int hf_zbee_zcl_scenes_extension_set_system_mode = -1;
-static int hf_zbee_zcl_scenes_extension_set_lock_state = -1;
-static int hf_zbee_zcl_scenes_extension_set_lift_percentage = -1;
-static int hf_zbee_zcl_scenes_extension_set_tilt_percentage = -1;
-
-static int hf_zbee_zcl_scenes_status = -1;
-static int hf_zbee_zcl_scenes_capacity = -1;
-static int hf_zbee_zcl_scenes_scene_count = -1;
-static int hf_zbee_zcl_scenes_attr_str_len = -1;
-static int hf_zbee_zcl_scenes_attr_str = -1;
-static int hf_zbee_zcl_scenes_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_scenes_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_scenes_scene_list = -1;
-static int hf_zbee_zcl_scenes_copy_mode = -1;
+static int proto_zbee_zcl_scenes;
+
+static int hf_zbee_zcl_scenes_attr_id;
+static int hf_zbee_zcl_scenes_attr_id_scene_valid;
+static int hf_zbee_zcl_scenes_attr_id_name_support;
+static int hf_zbee_zcl_scenes_group_id;
+static int hf_zbee_zcl_scenes_group_id_from;
+static int hf_zbee_zcl_scenes_group_id_to;
+static int hf_zbee_zcl_scenes_scene_id;
+static int hf_zbee_zcl_scenes_scene_id_from;
+static int hf_zbee_zcl_scenes_scene_id_to;
+static int hf_zbee_zcl_scenes_transit_time;
+static int hf_zbee_zcl_scenes_enh_transit_time;
+static int hf_zbee_zcl_scenes_extension_set_cluster;
+static int hf_zbee_zcl_scenes_extension_set_onoff;
+static int hf_zbee_zcl_scenes_extension_set_level;
+static int hf_zbee_zcl_scenes_extension_set_x;
+static int hf_zbee_zcl_scenes_extension_set_y;
+static int hf_zbee_zcl_scenes_extension_set_hue;
+static int hf_zbee_zcl_scenes_extension_set_saturation;
+static int hf_zbee_zcl_scenes_extension_set_color_loop_active;
+static int hf_zbee_zcl_scenes_extension_set_color_loop_direction;
+static int hf_zbee_zcl_scenes_extension_set_color_loop_time;
+static int hf_zbee_zcl_scenes_extension_set_cooling_setpoint;
+static int hf_zbee_zcl_scenes_extension_set_heating_setpoint;
+static int hf_zbee_zcl_scenes_extension_set_system_mode;
+static int hf_zbee_zcl_scenes_extension_set_lock_state;
+static int hf_zbee_zcl_scenes_extension_set_lift_percentage;
+static int hf_zbee_zcl_scenes_extension_set_tilt_percentage;
+
+static int hf_zbee_zcl_scenes_status;
+static int hf_zbee_zcl_scenes_capacity;
+static int hf_zbee_zcl_scenes_scene_count;
+static int hf_zbee_zcl_scenes_attr_str_len;
+static int hf_zbee_zcl_scenes_attr_str;
+static int hf_zbee_zcl_scenes_srv_rx_cmd_id;
+static int hf_zbee_zcl_scenes_srv_tx_cmd_id;
+static int hf_zbee_zcl_scenes_scene_list;
+static int hf_zbee_zcl_scenes_copy_mode;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_scenes = -1;
-static gint ett_zbee_zcl_scenes_scene_ctrl = -1;
-static gint ett_zbee_zcl_scenes_extension_field_set = -1;
+static gint ett_zbee_zcl_scenes;
+static gint ett_zbee_zcl_scenes_scene_ctrl;
+static gint ett_zbee_zcl_scenes_extension_field_set;
 
 /* Attributes */
 static const value_string zbee_zcl_scenes_attr_names[] = {
@@ -3239,28 +3239,28 @@ static void dissect_zcl_on_off_attr_data(proto_tree *tree, tvbuff_t *tvb, guint
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_on_off = -1;
+static int proto_zbee_zcl_on_off;
 
-static int hf_zbee_zcl_on_off_attr_id = -1;
-static int hf_zbee_zcl_on_off_attr_onoff = -1;
-static int hf_zbee_zcl_on_off_attr_globalscenecontrol = -1;
-static int hf_zbee_zcl_on_off_attr_ontime = -1;
-static int hf_zbee_zcl_on_off_attr_offwaittime = -1;
-static int hf_zbee_zcl_on_off_attr_startuponoff = -1;
-static int hf_zbee_zcl_on_off_srv_rx_cmd_id = -1;
+static int hf_zbee_zcl_on_off_attr_id;
+static int hf_zbee_zcl_on_off_attr_onoff;
+static int hf_zbee_zcl_on_off_attr_globalscenecontrol;
+static int hf_zbee_zcl_on_off_attr_ontime;
+static int hf_zbee_zcl_on_off_attr_offwaittime;
+static int hf_zbee_zcl_on_off_attr_startuponoff;
+static int hf_zbee_zcl_on_off_srv_rx_cmd_id;
 
-static int hf_zbee_zcl_on_off_effect_identifier = -1;
-static int hf_zbee_zcl_on_off_effect_variant_delayed_all_off = -1;
-static int hf_zbee_zcl_on_off_effect_variant_dying_light = -1;
-static int hf_zbee_zcl_on_off_effect_variant_reserved = -1;
+static int hf_zbee_zcl_on_off_effect_identifier;
+static int hf_zbee_zcl_on_off_effect_variant_delayed_all_off;
+static int hf_zbee_zcl_on_off_effect_variant_dying_light;
+static int hf_zbee_zcl_on_off_effect_variant_reserved;
 
-static int hf_zbee_zcl_on_off_timed_off_control_mask = -1;
-static int hf_zbee_zcl_on_off_timed_off_control_mask_accept_only_when_on = -1;
-static int hf_zbee_zcl_on_off_timed_off_control_mask_reserved = -1;
+static int hf_zbee_zcl_on_off_timed_off_control_mask;
+static int hf_zbee_zcl_on_off_timed_off_control_mask_accept_only_when_on;
+static int hf_zbee_zcl_on_off_timed_off_control_mask_reserved;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_on_off = -1;
-static gint ett_zbee_zcl_on_off_timed_off_control_mask = -1;
+static gint ett_zbee_zcl_on_off;
+static gint ett_zbee_zcl_on_off_timed_off_control_mask;
 
 /* Attributes */
 static const value_string zbee_zcl_on_off_attr_names[] = {
@@ -3608,14 +3608,14 @@ static void dissect_zcl_on_off_switch_configuration_attr_data     (proto_tree *t
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_on_off_switch_configuration = -1;
+static int proto_zbee_zcl_on_off_switch_configuration;
 
-static int hf_zbee_zcl_on_off_switch_configuration_attr_id = -1;
-static int hf_zbee_zcl_on_off_switch_configuration_attr_switch_type = -1;
-static int hf_zbee_zcl_on_off_switch_configuration_attr_switch_actions = -1;
+static int hf_zbee_zcl_on_off_switch_configuration_attr_id;
+static int hf_zbee_zcl_on_off_switch_configuration_attr_switch_type;
+static int hf_zbee_zcl_on_off_switch_configuration_attr_switch_actions;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_on_off_switch_configuration = -1;
+static gint ett_zbee_zcl_on_off_switch_configuration;
 
 /* Attributes */
 static const value_string zbee_zcl_on_off_switch_configuration_attr_names[] = {
@@ -3809,18 +3809,18 @@ void proto_reg_handoff_zbee_zcl_alarms(void);
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_alarms = -1;
+static int proto_zbee_zcl_alarms;
 
-static int hf_zbee_zcl_alarms_attr_id = -1;
-static int hf_zbee_zcl_alarms_alarm_code = -1;
-static int hf_zbee_zcl_alarms_cluster_id = -1;
-static int hf_zbee_zcl_alarms_status = -1;
-static int hf_zbee_zcl_alarms_timestamp = -1;
-static int hf_zbee_zcl_alarms_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_alarms_srv_tx_cmd_id = -1;
+static int hf_zbee_zcl_alarms_attr_id;
+static int hf_zbee_zcl_alarms_alarm_code;
+static int hf_zbee_zcl_alarms_cluster_id;
+static int hf_zbee_zcl_alarms_status;
+static int hf_zbee_zcl_alarms_timestamp;
+static int hf_zbee_zcl_alarms_srv_rx_cmd_id;
+static int hf_zbee_zcl_alarms_srv_tx_cmd_id;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_alarms = -1;
+static gint ett_zbee_zcl_alarms;
 
 /* Attributes */
 static const value_string zbee_zcl_alarms_attr_names[] = {
@@ -4175,18 +4175,18 @@ void proto_reg_handoff_zbee_zcl_time(void);
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_time = -1;
+static int proto_zbee_zcl_time;
 
-static int hf_zbee_zcl_time_attr_id = -1;
-static int hf_zbee_zcl_time_status = -1;
-static int hf_zbee_zcl_time_status_master = -1;
-static int hf_zbee_zcl_time_status_synchronized = -1;
-static int hf_zbee_zcl_time_status_master_zone_dst = -1;
-static int hf_zbee_zcl_time_status_superseding = -1;
+static int hf_zbee_zcl_time_attr_id;
+static int hf_zbee_zcl_time_status;
+static int hf_zbee_zcl_time_status_master;
+static int hf_zbee_zcl_time_status_synchronized;
+static int hf_zbee_zcl_time_status_master_zone_dst;
+static int hf_zbee_zcl_time_status_superseding;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_time = -1;
-static gint ett_zbee_zcl_time_status_mask = -1;
+static gint ett_zbee_zcl_time;
+static gint ett_zbee_zcl_time_status_mask;
 
 /* Attributes */
 static const value_string zbee_zcl_time_attr_names[] = {
@@ -4406,24 +4406,24 @@ void proto_reg_handoff_zbee_zcl_level_control(void);
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_level_control = -1;
-
-static int hf_zbee_zcl_level_control_attr_id = -1;
-static int hf_zbee_zcl_level_control_attr_current_level = -1;
-static int hf_zbee_zcl_level_control_attr_remaining_time = -1;
-static int hf_zbee_zcl_level_control_attr_onoff_transmit_time = -1;
-static int hf_zbee_zcl_level_control_attr_on_level = -1;
-static int hf_zbee_zcl_level_control_attr_startup_level = -1;
-static int hf_zbee_zcl_level_control_level = -1;
-static int hf_zbee_zcl_level_control_move_mode = -1;
-static int hf_zbee_zcl_level_control_rate = -1;
-static int hf_zbee_zcl_level_control_step_mode = -1;
-static int hf_zbee_zcl_level_control_step_size = -1;
-static int hf_zbee_zcl_level_control_transit_time = -1;
-static int hf_zbee_zcl_level_control_srv_rx_cmd_id = -1;
+static int proto_zbee_zcl_level_control;
+
+static int hf_zbee_zcl_level_control_attr_id;
+static int hf_zbee_zcl_level_control_attr_current_level;
+static int hf_zbee_zcl_level_control_attr_remaining_time;
+static int hf_zbee_zcl_level_control_attr_onoff_transmit_time;
+static int hf_zbee_zcl_level_control_attr_on_level;
+static int hf_zbee_zcl_level_control_attr_startup_level;
+static int hf_zbee_zcl_level_control_level;
+static int hf_zbee_zcl_level_control_move_mode;
+static int hf_zbee_zcl_level_control_rate;
+static int hf_zbee_zcl_level_control_step_mode;
+static int hf_zbee_zcl_level_control_step_size;
+static int hf_zbee_zcl_level_control_transit_time;
+static int hf_zbee_zcl_level_control_srv_rx_cmd_id;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_level_control = -1;
+static gint ett_zbee_zcl_level_control;
 
 /* Attributes */
 static const value_string zbee_zcl_level_control_attr_names[] = {
@@ -4884,49 +4884,49 @@ static void dissect_zcl_rssi_location_attr_data                        (proto_tr
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_rssi_location = -1;
-
-static int hf_zbee_zcl_rssi_location_attr_id = -1;
-static int hf_zbee_zcl_rssi_location_location_type = -1;
-static int hf_zbee_zcl_rssi_location_location_type_absolute = -1;
-static int hf_zbee_zcl_rssi_location_location_type_2D = -1;
-static int hf_zbee_zcl_rssi_location_location_type_coordinate_system = -1;
-static int hf_zbee_zcl_rssi_location_location_type_reserved = -1;
-static int hf_zbee_zcl_rssi_location_attr_id_location_method = -1;
-static int hf_zbee_zcl_rssi_location_coordinate1 = -1;
-static int hf_zbee_zcl_rssi_location_coordinate2 = -1;
-static int hf_zbee_zcl_rssi_location_coordinate3 = -1;
-static int hf_zbee_zcl_rssi_location_power = -1;
-static int hf_zbee_zcl_rssi_location_path_loss_expo = -1;
-static int hf_zbee_zcl_rssi_location_calc_period = -1;
-static int hf_zbee_zcl_rssi_location_number_rssi_meas = -1;
-static int hf_zbee_zcl_rssi_location_reporting_period = -1;
-static int hf_zbee_zcl_rssi_location_target_add = -1;
-static int hf_zbee_zcl_rssi_location_header = -1;
-static int hf_zbee_zcl_rssi_location_header_abs_only = -1;
-static int hf_zbee_zcl_rssi_location_header_recalc = -1;
-static int hf_zbee_zcl_rssi_location_header_bcast_ind = -1;
-static int hf_zbee_zcl_rssi_location_header_bcast_res = -1;
-static int hf_zbee_zcl_rssi_location_header_compact_res = -1;
-static int hf_zbee_zcl_rssi_location_header_res = -1;
-static int hf_zbee_zcl_rssi_location_number_responses = -1;
-static int hf_zbee_zcl_rssi_location_replaying_device = -1;
-static int hf_zbee_zcl_rssi_location_rssi = -1;
-static int hf_zbee_zcl_rssi_location_anchor_node_add = -1;
-static int hf_zbee_zcl_rssi_location_status = -1;
-static int hf_zbee_zcl_rssi_location_quality_measure = -1;
-static int hf_zbee_zcl_rssi_location_location_age = -1;
-static int hf_zbee_zcl_rssi_location_reporting_add = -1;
-static int hf_zbee_zcl_rssi_location_no_of_neigh = -1;
-static int hf_zbee_zcl_rssi_location_neighbour_add = -1;
-static int hf_zbee_zcl_rssi_location_request_add = -1;
-static int hf_zbee_zcl_rssi_location_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_rssi_location_srv_tx_cmd_id = -1;
+static int proto_zbee_zcl_rssi_location;
+
+static int hf_zbee_zcl_rssi_location_attr_id;
+static int hf_zbee_zcl_rssi_location_location_type;
+static int hf_zbee_zcl_rssi_location_location_type_absolute;
+static int hf_zbee_zcl_rssi_location_location_type_2D;
+static int hf_zbee_zcl_rssi_location_location_type_coordinate_system;
+static int hf_zbee_zcl_rssi_location_location_type_reserved;
+static int hf_zbee_zcl_rssi_location_attr_id_location_method;
+static int hf_zbee_zcl_rssi_location_coordinate1;
+static int hf_zbee_zcl_rssi_location_coordinate2;
+static int hf_zbee_zcl_rssi_location_coordinate3;
+static int hf_zbee_zcl_rssi_location_power;
+static int hf_zbee_zcl_rssi_location_path_loss_expo;
+static int hf_zbee_zcl_rssi_location_calc_period;
+static int hf_zbee_zcl_rssi_location_number_rssi_meas;
+static int hf_zbee_zcl_rssi_location_reporting_period;
+static int hf_zbee_zcl_rssi_location_target_add;
+static int hf_zbee_zcl_rssi_location_header;
+static int hf_zbee_zcl_rssi_location_header_abs_only;
+static int hf_zbee_zcl_rssi_location_header_recalc;
+static int hf_zbee_zcl_rssi_location_header_bcast_ind;
+static int hf_zbee_zcl_rssi_location_header_bcast_res;
+static int hf_zbee_zcl_rssi_location_header_compact_res;
+static int hf_zbee_zcl_rssi_location_header_res;
+static int hf_zbee_zcl_rssi_location_number_responses;
+static int hf_zbee_zcl_rssi_location_replaying_device;
+static int hf_zbee_zcl_rssi_location_rssi;
+static int hf_zbee_zcl_rssi_location_anchor_node_add;
+static int hf_zbee_zcl_rssi_location_status;
+static int hf_zbee_zcl_rssi_location_quality_measure;
+static int hf_zbee_zcl_rssi_location_location_age;
+static int hf_zbee_zcl_rssi_location_reporting_add;
+static int hf_zbee_zcl_rssi_location_no_of_neigh;
+static int hf_zbee_zcl_rssi_location_neighbour_add;
+static int hf_zbee_zcl_rssi_location_request_add;
+static int hf_zbee_zcl_rssi_location_srv_rx_cmd_id;
+static int hf_zbee_zcl_rssi_location_srv_tx_cmd_id;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_rssi_location = -1;
-static gint ett_zbee_zcl_rssi_location_location_type = -1;
-static gint ett_zbee_zcl_rssi_location_header = -1;
+static gint ett_zbee_zcl_rssi_location;
+static gint ett_zbee_zcl_rssi_location_location_type;
+static gint ett_zbee_zcl_rssi_location_header;
 
 /* Attributes */
 static const value_string zbee_zcl_rssi_location_attr_names[] = {
@@ -6080,19 +6080,19 @@ static void dissect_zcl_analog_input_basic_attr_data      (proto_tree *tree, tvb
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_analog_input_basic = -1;
+static int proto_zbee_zcl_analog_input_basic;
 
-static int hf_zbee_zcl_analog_input_basic_attr_id = -1;
-static int hf_zbee_zcl_analog_input_basic_reliability = -1;
-static int hf_zbee_zcl_analog_input_basic_status_flags = -1;
-static int hf_zbee_zcl_analog_input_basic_status_in_alarm = -1;
-static int hf_zbee_zcl_analog_input_basic_status_fault = -1;
-static int hf_zbee_zcl_analog_input_basic_status_overridden = -1;
-static int hf_zbee_zcl_analog_input_basic_status_out_of_service = -1;
+static int hf_zbee_zcl_analog_input_basic_attr_id;
+static int hf_zbee_zcl_analog_input_basic_reliability;
+static int hf_zbee_zcl_analog_input_basic_status_flags;
+static int hf_zbee_zcl_analog_input_basic_status_in_alarm;
+static int hf_zbee_zcl_analog_input_basic_status_fault;
+static int hf_zbee_zcl_analog_input_basic_status_overridden;
+static int hf_zbee_zcl_analog_input_basic_status_out_of_service;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_analog_input_basic = -1;
-static gint ett_zbee_zcl_analog_input_basic_status_flags = -1;
+static gint ett_zbee_zcl_analog_input_basic;
+static gint ett_zbee_zcl_analog_input_basic_status_flags;
 
 /* Attributes */
 static const value_string zbee_zcl_analog_input_basic_attr_names[] = {
@@ -6325,25 +6325,25 @@ static void dissect_zcl_analog_output_basic_attr_data      (proto_tree *tree, tv
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_analog_output_basic = -1;
-
-static int hf_zbee_zcl_analog_output_basic_attr_id = -1;
-static int hf_zbee_zcl_analog_output_basic_reliability = -1;
-static int hf_zbee_zcl_analog_output_basic_status_flags = -1;
-static int hf_zbee_zcl_analog_output_basic_status_in_alarm = -1;
-static int hf_zbee_zcl_analog_output_basic_status_fault = -1;
-static int hf_zbee_zcl_analog_output_basic_status_overridden = -1;
-static int hf_zbee_zcl_analog_output_basic_status_out_of_service = -1;
-static int hf_zbee_zcl_analog_output_basic_priority_array_bool = -1;
-static int hf_zbee_zcl_analog_output_basic_priority_array_sing_prec = -1;
-static int hf_zbee_zcl_analog_output_basic_priority_array = -1;
-static int hf_zbee_zcl_analog_output_basic_structure = -1;
+static int proto_zbee_zcl_analog_output_basic;
+
+static int hf_zbee_zcl_analog_output_basic_attr_id;
+static int hf_zbee_zcl_analog_output_basic_reliability;
+static int hf_zbee_zcl_analog_output_basic_status_flags;
+static int hf_zbee_zcl_analog_output_basic_status_in_alarm;
+static int hf_zbee_zcl_analog_output_basic_status_fault;
+static int hf_zbee_zcl_analog_output_basic_status_overridden;
+static int hf_zbee_zcl_analog_output_basic_status_out_of_service;
+static int hf_zbee_zcl_analog_output_basic_priority_array_bool;
+static int hf_zbee_zcl_analog_output_basic_priority_array_sing_prec;
+static int hf_zbee_zcl_analog_output_basic_priority_array;
+static int hf_zbee_zcl_analog_output_basic_structure;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_analog_output_basic = -1;
-static gint ett_zbee_zcl_analog_output_basic_status_flags = -1;
-static gint ett_zbee_zcl_analog_output_basic_priority_array = -1;
-static gint ett_zbee_zcl_analog_output_basic_priority_array_structure = -1;
+static gint ett_zbee_zcl_analog_output_basic;
+static gint ett_zbee_zcl_analog_output_basic_status_flags;
+static gint ett_zbee_zcl_analog_output_basic_priority_array;
+static gint ett_zbee_zcl_analog_output_basic_priority_array_structure;
 
 /* Attributes */
 static const value_string zbee_zcl_analog_output_basic_attr_names[] = {
@@ -6614,25 +6614,25 @@ static void dissect_zcl_analog_value_basic_attr_data      (proto_tree *tree, tvb
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_analog_value_basic = -1;
-
-static int hf_zbee_zcl_analog_value_basic_attr_id = -1;
-static int hf_zbee_zcl_analog_value_basic_reliability = -1;
-static int hf_zbee_zcl_analog_value_basic_status_flags = -1;
-static int hf_zbee_zcl_analog_value_basic_status_in_alarm = -1;
-static int hf_zbee_zcl_analog_value_basic_status_fault = -1;
-static int hf_zbee_zcl_analog_value_basic_status_overridden = -1;
-static int hf_zbee_zcl_analog_value_basic_status_out_of_service = -1;
-static int hf_zbee_zcl_analog_value_basic_priority_array_bool = -1;
-static int hf_zbee_zcl_analog_value_basic_priority_array_sing_prec = -1;
-static int hf_zbee_zcl_analog_value_basic_priority_array = -1;
-static int hf_zbee_zcl_analog_value_basic_structure = -1;
+static int proto_zbee_zcl_analog_value_basic;
+
+static int hf_zbee_zcl_analog_value_basic_attr_id;
+static int hf_zbee_zcl_analog_value_basic_reliability;
+static int hf_zbee_zcl_analog_value_basic_status_flags;
+static int hf_zbee_zcl_analog_value_basic_status_in_alarm;
+static int hf_zbee_zcl_analog_value_basic_status_fault;
+static int hf_zbee_zcl_analog_value_basic_status_overridden;
+static int hf_zbee_zcl_analog_value_basic_status_out_of_service;
+static int hf_zbee_zcl_analog_value_basic_priority_array_bool;
+static int hf_zbee_zcl_analog_value_basic_priority_array_sing_prec;
+static int hf_zbee_zcl_analog_value_basic_priority_array;
+static int hf_zbee_zcl_analog_value_basic_structure;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_analog_value_basic = -1;
-static gint ett_zbee_zcl_analog_value_basic_status_flags = -1;
-static gint ett_zbee_zcl_analog_value_basic_priority_array = -1;
-static gint ett_zbee_zcl_analog_value_basic_priority_array_structure = -1;
+static gint ett_zbee_zcl_analog_value_basic;
+static gint ett_zbee_zcl_analog_value_basic_status_flags;
+static gint ett_zbee_zcl_analog_value_basic_priority_array;
+static gint ett_zbee_zcl_analog_value_basic_priority_array_structure;
 
 /* Attributes */
 static const value_string zbee_zcl_analog_value_basic_attr_names[] = {
@@ -6901,20 +6901,20 @@ static void dissect_zcl_binary_input_basic_attr_data      (proto_tree *tree, tvb
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_binary_input_basic = -1;
+static int proto_zbee_zcl_binary_input_basic;
 
-static int hf_zbee_zcl_binary_input_basic_attr_id = -1;
-static int hf_zbee_zcl_binary_input_basic_status_flags = -1;
-static int hf_zbee_zcl_binary_input_basic_status_in_alarm = -1;
-static int hf_zbee_zcl_binary_input_basic_status_fault = -1;
-static int hf_zbee_zcl_binary_input_basic_status_overridden = -1;
-static int hf_zbee_zcl_binary_input_basic_status_out_of_service = -1;
-static int hf_zbee_zcl_binary_input_basic_polarity = -1;
-static int hf_zbee_zcl_binary_input_basic_reliability= -1;
+static int hf_zbee_zcl_binary_input_basic_attr_id;
+static int hf_zbee_zcl_binary_input_basic_status_flags;
+static int hf_zbee_zcl_binary_input_basic_status_in_alarm;
+static int hf_zbee_zcl_binary_input_basic_status_fault;
+static int hf_zbee_zcl_binary_input_basic_status_overridden;
+static int hf_zbee_zcl_binary_input_basic_status_out_of_service;
+static int hf_zbee_zcl_binary_input_basic_polarity;
+static int hf_zbee_zcl_binary_input_basic_reliability;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_binary_input_basic = -1;
-static gint ett_zbee_zcl_binary_input_basic_status_flags = -1;
+static gint ett_zbee_zcl_binary_input_basic;
+static gint ett_zbee_zcl_binary_input_basic_status_flags;
 
 /* Attributes */
 static const value_string zbee_zcl_binary_input_basic_attr_names[] = {
@@ -7158,26 +7158,26 @@ static void dissect_zcl_binary_output_basic_attr_data      (proto_tree *tree, tv
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_binary_output_basic = -1;
-
-static int hf_zbee_zcl_binary_output_basic_attr_id = -1;
-static int hf_zbee_zcl_binary_output_basic_status_flags = -1;
-static int hf_zbee_zcl_binary_output_basic_status_in_alarm = -1;
-static int hf_zbee_zcl_binary_output_basic_status_fault = -1;
-static int hf_zbee_zcl_binary_output_basic_status_overridden = -1;
-static int hf_zbee_zcl_binary_output_basic_status_out_of_service = -1;
-static int hf_zbee_zcl_binary_output_basic_priority_array_bool = -1;
-static int hf_zbee_zcl_binary_output_basic_priority_array_sing_prec = -1;
-static int hf_zbee_zcl_binary_output_basic_polarity = -1;
-static int hf_zbee_zcl_binary_output_basic_reliability = -1;
-static int hf_zbee_zcl_binary_output_basic_priority_array = -1;
-static int hf_zbee_zcl_binary_output_basic_structure = -1;
+static int proto_zbee_zcl_binary_output_basic;
+
+static int hf_zbee_zcl_binary_output_basic_attr_id;
+static int hf_zbee_zcl_binary_output_basic_status_flags;
+static int hf_zbee_zcl_binary_output_basic_status_in_alarm;
+static int hf_zbee_zcl_binary_output_basic_status_fault;
+static int hf_zbee_zcl_binary_output_basic_status_overridden;
+static int hf_zbee_zcl_binary_output_basic_status_out_of_service;
+static int hf_zbee_zcl_binary_output_basic_priority_array_bool;
+static int hf_zbee_zcl_binary_output_basic_priority_array_sing_prec;
+static int hf_zbee_zcl_binary_output_basic_polarity;
+static int hf_zbee_zcl_binary_output_basic_reliability;
+static int hf_zbee_zcl_binary_output_basic_priority_array;
+static int hf_zbee_zcl_binary_output_basic_structure;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_binary_output_basic = -1;
-static gint ett_zbee_zcl_binary_output_basic_status_flags = -1;
-static gint ett_zbee_zcl_binary_output_basic_priority_array = -1;
-static gint ett_zbee_zcl_binary_output_basic_priority_array_structure = -1;
+static gint ett_zbee_zcl_binary_output_basic;
+static gint ett_zbee_zcl_binary_output_basic_status_flags;
+static gint ett_zbee_zcl_binary_output_basic_priority_array;
+static gint ett_zbee_zcl_binary_output_basic_priority_array_structure;
 
 /* Attributes */
 static const value_string zbee_zcl_binary_output_basic_attr_names[] = {
@@ -7458,25 +7458,25 @@ static void dissect_zcl_binary_value_basic_attr_data      (proto_tree *tree, tvb
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_binary_value_basic = -1;
-
-static int hf_zbee_zcl_binary_value_basic_attr_id = -1;
-static int hf_zbee_zcl_binary_value_basic_status_flags = -1;
-static int hf_zbee_zcl_binary_value_basic_status_in_alarm = -1;
-static int hf_zbee_zcl_binary_value_basic_status_fault = -1;
-static int hf_zbee_zcl_binary_value_basic_status_overridden = -1;
-static int hf_zbee_zcl_binary_value_basic_status_out_of_service = -1;
-static int hf_zbee_zcl_binary_value_basic_priority_array_bool = -1;
-static int hf_zbee_zcl_binary_value_basic_priority_array_sing_prec = -1;
-static int hf_zbee_zcl_binary_value_basic_reliability = -1;
-static int hf_zbee_zcl_binary_value_basic_priority_array = -1;
-static int hf_zbee_zcl_binary_value_basic_structure = -1;
+static int proto_zbee_zcl_binary_value_basic;
+
+static int hf_zbee_zcl_binary_value_basic_attr_id;
+static int hf_zbee_zcl_binary_value_basic_status_flags;
+static int hf_zbee_zcl_binary_value_basic_status_in_alarm;
+static int hf_zbee_zcl_binary_value_basic_status_fault;
+static int hf_zbee_zcl_binary_value_basic_status_overridden;
+static int hf_zbee_zcl_binary_value_basic_status_out_of_service;
+static int hf_zbee_zcl_binary_value_basic_priority_array_bool;
+static int hf_zbee_zcl_binary_value_basic_priority_array_sing_prec;
+static int hf_zbee_zcl_binary_value_basic_reliability;
+static int hf_zbee_zcl_binary_value_basic_priority_array;
+static int hf_zbee_zcl_binary_value_basic_structure;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_binary_value_basic = -1;
-static gint ett_zbee_zcl_binary_value_basic_status_flags = -1;
-static gint ett_zbee_zcl_binary_value_basic_priority_array = -1;
-static gint ett_zbee_zcl_binary_value_basic_priority_array_structure = -1;
+static gint ett_zbee_zcl_binary_value_basic;
+static gint ett_zbee_zcl_binary_value_basic_status_flags;
+static gint ett_zbee_zcl_binary_value_basic_priority_array;
+static gint ett_zbee_zcl_binary_value_basic_priority_array_structure;
 
 /* Attributes */
 static const value_string zbee_zcl_binary_value_basic_attr_names[] = {
@@ -7744,19 +7744,19 @@ static void dissect_zcl_multistate_input_basic_attr_data      (proto_tree *tree,
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_multistate_input_basic = -1;
+static int proto_zbee_zcl_multistate_input_basic;
 
-static int hf_zbee_zcl_multistate_input_basic_attr_id = -1;
-static int hf_zbee_zcl_multistate_input_basic_status_flags = -1;
-static int hf_zbee_zcl_multistate_input_basic_status_in_alarm = -1;
-static int hf_zbee_zcl_multistate_input_basic_status_fault = -1;
-static int hf_zbee_zcl_multistate_input_basic_status_overridden = -1;
-static int hf_zbee_zcl_multistate_input_basic_status_out_of_service = -1;
-static int hf_zbee_zcl_multistate_input_basic_reliability = -1;
+static int hf_zbee_zcl_multistate_input_basic_attr_id;
+static int hf_zbee_zcl_multistate_input_basic_status_flags;
+static int hf_zbee_zcl_multistate_input_basic_status_in_alarm;
+static int hf_zbee_zcl_multistate_input_basic_status_fault;
+static int hf_zbee_zcl_multistate_input_basic_status_overridden;
+static int hf_zbee_zcl_multistate_input_basic_status_out_of_service;
+static int hf_zbee_zcl_multistate_input_basic_reliability;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_multistate_input_basic = -1;
-static gint ett_zbee_zcl_multistate_input_basic_status_flags = -1;
+static gint ett_zbee_zcl_multistate_input_basic;
+static gint ett_zbee_zcl_multistate_input_basic_status_flags;
 
 /* Attributes */
 static const value_string zbee_zcl_multistate_input_basic_attr_names[] = {
@@ -7980,25 +7980,25 @@ static void dissect_zcl_multistate_output_basic_attr_data      (proto_tree *tree
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_multistate_output_basic = -1;
-
-static int hf_zbee_zcl_multistate_output_basic_attr_id = -1;
-static int hf_zbee_zcl_multistate_output_basic_status_flags = -1;
-static int hf_zbee_zcl_multistate_output_basic_status_in_alarm = -1;
-static int hf_zbee_zcl_multistate_output_basic_status_fault = -1;
-static int hf_zbee_zcl_multistate_output_basic_status_overridden = -1;
-static int hf_zbee_zcl_multistate_output_basic_status_out_of_service = -1;
-static int hf_zbee_zcl_multistate_output_basic_reliability = -1;
-static int hf_zbee_zcl_multistate_output_basic_priority_array_bool = -1;
-static int hf_zbee_zcl_multistate_output_basic_priority_array_sing_prec = -1;
-static int hf_zbee_zcl_multistate_output_basic_priority_array = -1;
-static int hf_zbee_zcl_multistate_output_basic_structure = -1;
+static int proto_zbee_zcl_multistate_output_basic;
+
+static int hf_zbee_zcl_multistate_output_basic_attr_id;
+static int hf_zbee_zcl_multistate_output_basic_status_flags;
+static int hf_zbee_zcl_multistate_output_basic_status_in_alarm;
+static int hf_zbee_zcl_multistate_output_basic_status_fault;
+static int hf_zbee_zcl_multistate_output_basic_status_overridden;
+static int hf_zbee_zcl_multistate_output_basic_status_out_of_service;
+static int hf_zbee_zcl_multistate_output_basic_reliability;
+static int hf_zbee_zcl_multistate_output_basic_priority_array_bool;
+static int hf_zbee_zcl_multistate_output_basic_priority_array_sing_prec;
+static int hf_zbee_zcl_multistate_output_basic_priority_array;
+static int hf_zbee_zcl_multistate_output_basic_structure;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_multistate_output_basic = -1;
-static gint ett_zbee_zcl_multistate_output_basic_status_flags = -1;
-static gint ett_zbee_zcl_multistate_output_basic_priority_array = -1;
-static gint ett_zbee_zcl_multistate_output_basic_priority_array_structure = -1;
+static gint ett_zbee_zcl_multistate_output_basic;
+static gint ett_zbee_zcl_multistate_output_basic_status_flags;
+static gint ett_zbee_zcl_multistate_output_basic_priority_array;
+static gint ett_zbee_zcl_multistate_output_basic_priority_array_structure;
 
 /* Attributes */
 static const value_string zbee_zcl_multistate_output_basic_attr_names[] = {
@@ -8269,26 +8269,26 @@ static void dissect_zcl_multistate_value_basic_attr_data      (proto_tree *tree,
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_multistate_value_basic = -1;
+static int proto_zbee_zcl_multistate_value_basic;
 
-static int hf_zbee_zcl_multistate_value_basic_attr_id = -1;
-static int hf_zbee_zcl_multistate_value_basic_status_flags = -1;
-static int hf_zbee_zcl_multistate_value_basic_status_in_alarm = -1;
-static int hf_zbee_zcl_multistate_value_basic_status_fault = -1;
-static int hf_zbee_zcl_multistate_value_basic_status_overridden = -1;
-static int hf_zbee_zcl_multistate_value_basic_status_out_of_service = -1;
-static int hf_zbee_zcl_multistate_value_basic_reliability = -1;
-static int hf_zbee_zcl_multistate_value_basic_priority_array_bool = -1;
-static int hf_zbee_zcl_multistate_value_basic_priority_array_sing_prec = -1;
-static int hf_zbee_zcl_multistate_value_basic_priority_array = -1;
-static int hf_zbee_zcl_multistate_value_basic_structure = -1;
+static int hf_zbee_zcl_multistate_value_basic_attr_id;
+static int hf_zbee_zcl_multistate_value_basic_status_flags;
+static int hf_zbee_zcl_multistate_value_basic_status_in_alarm;
+static int hf_zbee_zcl_multistate_value_basic_status_fault;
+static int hf_zbee_zcl_multistate_value_basic_status_overridden;
+static int hf_zbee_zcl_multistate_value_basic_status_out_of_service;
+static int hf_zbee_zcl_multistate_value_basic_reliability;
+static int hf_zbee_zcl_multistate_value_basic_priority_array_bool;
+static int hf_zbee_zcl_multistate_value_basic_priority_array_sing_prec;
+static int hf_zbee_zcl_multistate_value_basic_priority_array;
+static int hf_zbee_zcl_multistate_value_basic_structure;
 
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_multistate_value_basic = -1;
-static gint ett_zbee_zcl_multistate_value_basic_status_flags = -1;
-static gint ett_zbee_zcl_multistate_value_basic_priority_array = -1;
-static gint ett_zbee_zcl_multistate_value_basic_priority_array_structure = -1;
+static gint ett_zbee_zcl_multistate_value_basic;
+static gint ett_zbee_zcl_multistate_value_basic_status_flags;
+static gint ett_zbee_zcl_multistate_value_basic_priority_array;
+static gint ett_zbee_zcl_multistate_value_basic_priority_array_structure;
 
 /* Attributes */
 static const value_string zbee_zcl_multistate_value_basic_attr_names[] = {
@@ -8597,32 +8597,32 @@ static void dissect_zcl_commissioning_attr_data                             (pro
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_commissioning = -1;
-
-static int hf_zbee_zcl_commissioning_attr_id = -1;
-static int hf_zbee_zcl_commissioning_attr_stack_profile = -1;
-static int hf_zbee_zcl_commissioning_attr_startup_control = -1;
-static int hf_zbee_zcl_commissioning_restart_device_options = -1;
-static int hf_zbee_zcl_commissioning_restart_device_options_startup_mode = -1;
-static int hf_zbee_zcl_commissioning_restart_device_options_immediate = -1;
-static int hf_zbee_zcl_commissioning_restart_device_options_reserved = -1;
-static int hf_zbee_zcl_commissioning_delay = -1;
-static int hf_zbee_zcl_commissioning_jitter = -1;
-static int hf_zbee_zcl_commissioning_options = -1;
-static int hf_zbee_zcl_commissioning_index = -1;
-static int hf_zbee_zcl_commissioning_reset_startup_options = -1;
-static int hf_zbee_zcl_commissioning_reset_startup_options_reset_current = -1;
-static int hf_zbee_zcl_commissioning_reset_startup_options_reset_all = -1;
-static int hf_zbee_zcl_commissioning_reset_startup_options_erase_index = -1;
-static int hf_zbee_zcl_commissioning_reset_startup_options_reserved = -1;
-static int hf_zbee_zcl_commissioning_status = -1;
-static int hf_zbee_zcl_commissioning_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_commissioning_srv_tx_cmd_id = -1;
+static int proto_zbee_zcl_commissioning;
+
+static int hf_zbee_zcl_commissioning_attr_id;
+static int hf_zbee_zcl_commissioning_attr_stack_profile;
+static int hf_zbee_zcl_commissioning_attr_startup_control;
+static int hf_zbee_zcl_commissioning_restart_device_options;
+static int hf_zbee_zcl_commissioning_restart_device_options_startup_mode;
+static int hf_zbee_zcl_commissioning_restart_device_options_immediate;
+static int hf_zbee_zcl_commissioning_restart_device_options_reserved;
+static int hf_zbee_zcl_commissioning_delay;
+static int hf_zbee_zcl_commissioning_jitter;
+static int hf_zbee_zcl_commissioning_options;
+static int hf_zbee_zcl_commissioning_index;
+static int hf_zbee_zcl_commissioning_reset_startup_options;
+static int hf_zbee_zcl_commissioning_reset_startup_options_reset_current;
+static int hf_zbee_zcl_commissioning_reset_startup_options_reset_all;
+static int hf_zbee_zcl_commissioning_reset_startup_options_erase_index;
+static int hf_zbee_zcl_commissioning_reset_startup_options_reserved;
+static int hf_zbee_zcl_commissioning_status;
+static int hf_zbee_zcl_commissioning_srv_rx_cmd_id;
+static int hf_zbee_zcl_commissioning_srv_tx_cmd_id;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_commissioning = -1;
-static gint ett_zbee_zcl_commissioning_restart_device_options = -1;
-static gint ett_zbee_zcl_commissioning_reset_startup_options = -1;
+static gint ett_zbee_zcl_commissioning;
+static gint ett_zbee_zcl_commissioning_restart_device_options;
+static gint ett_zbee_zcl_commissioning_reset_startup_options;
 
 /* Attributes */
 static const value_string zbee_zcl_commissioning_attr_names[] = {
@@ -9185,28 +9185,28 @@ static void dissect_zcl_part_rdhandshakeparamrsp    (tvbuff_t *tvb, packet_info
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_part = -1;
-
-static int hf_zbee_zcl_part_attr_id = -1;
-static int hf_zbee_zcl_part_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_part_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_part_opt = -1;
-static int hf_zbee_zcl_part_opt_first_block = -1;
-static int hf_zbee_zcl_part_opt_indic_len = -1;
-static int hf_zbee_zcl_part_opt_res = -1;
-static int hf_zbee_zcl_part_first_frame_id = -1;
-static int hf_zbee_zcl_part_part_indicator = -1;
-static int hf_zbee_zcl_part_part_frame = -1;
-static int hf_zbee_zcl_part_partitioned_cluster_id = -1;
-static int hf_zbee_zcl_part_ack_opt = -1;
-static int hf_zbee_zcl_part_ack_opt_nack_id_len = -1;
-static int hf_zbee_zcl_part_ack_opt_res = -1;
-static int hf_zbee_zcl_part_nack_id = -1;
+static int proto_zbee_zcl_part;
+
+static int hf_zbee_zcl_part_attr_id;
+static int hf_zbee_zcl_part_srv_tx_cmd_id;
+static int hf_zbee_zcl_part_srv_rx_cmd_id;
+static int hf_zbee_zcl_part_opt;
+static int hf_zbee_zcl_part_opt_first_block;
+static int hf_zbee_zcl_part_opt_indic_len;
+static int hf_zbee_zcl_part_opt_res;
+static int hf_zbee_zcl_part_first_frame_id;
+static int hf_zbee_zcl_part_part_indicator;
+static int hf_zbee_zcl_part_part_frame;
+static int hf_zbee_zcl_part_partitioned_cluster_id;
+static int hf_zbee_zcl_part_ack_opt;
+static int hf_zbee_zcl_part_ack_opt_nack_id_len;
+static int hf_zbee_zcl_part_ack_opt_res;
+static int hf_zbee_zcl_part_nack_id;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_part = -1;
-static gint ett_zbee_zcl_part_fragm_options = -1;
-static gint ett_zbee_zcl_part_ack_opts = -1;
+static gint ett_zbee_zcl_part;
+static gint ett_zbee_zcl_part_fragm_options;
+static gint ett_zbee_zcl_part_ack_opts;
 static gint ett_zbee_zcl_part_nack_id_list[ZBEE_ZCL_PART_NUM_NACK_ID_ETT];
 static gint ett_zbee_zcl_part_attrs_id_list[ZBEE_ZCL_PART_NUM_ATTRS_ID_ETT];
 
@@ -9783,53 +9783,53 @@ void proto_reg_handoff_zbee_zcl_ota(void);
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_ota = -1;
-
-static int hf_zbee_zcl_ota_attr_id = -1;
-static int hf_zbee_zcl_ota_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_ota_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_ota_image_upgrade_status = -1;
-static int hf_zbee_zcl_ota_zb_stack_ver = -1;
-static int hf_zbee_zcl_ota_file_offset = -1;
-static int hf_zbee_zcl_ota_payload_type = -1;
-static int hf_zbee_zcl_ota_query_jitter = -1;
-static int hf_zbee_zcl_ota_manufacturer_code = -1;
-static int hf_zbee_zcl_ota_image_type = -1;
-static int hf_zbee_zcl_ota_file_version = -1;
-static int hf_zbee_zcl_ota_file_version_appl_release = -1;
-static int hf_zbee_zcl_ota_file_version_appl_build = -1;
-static int hf_zbee_zcl_ota_file_version_stack_release = -1;
-static int hf_zbee_zcl_ota_file_version_stack_build = -1;
-static int hf_zbee_zcl_ota_query_next_image_req_field_ctrl = -1;
-static int hf_zbee_zcl_ota_query_next_image_req_field_ctrl_hw_ver_present = -1;
-static int hf_zbee_zcl_ota_query_next_image_req_field_ctrl_reserved = -1;
-static int hf_zbee_zcl_ota_image_block_req_field_ctrl = -1;
-static int hf_zbee_zcl_ota_image_block_req_field_ctrl_ieee_addr_present = -1;
-static int hf_zbee_zcl_ota_image_block_req_field_ctrl_min_block_period_present = -1;
-static int hf_zbee_zcl_ota_image_block_req_field_ctrl_reserved = -1;
-static int hf_zbee_zcl_ota_image_page_req_field_ctrl = -1;
-static int hf_zbee_zcl_ota_image_page_req_field_ctrl_ieee_addr_present = -1;
-static int hf_zbee_zcl_ota_image_page_req_field_ctrl_reserved = -1;
-static int hf_zbee_zcl_ota_hw_version = -1;
-static int hf_zbee_zcl_ota_status = -1;
-static int hf_zbee_zcl_ota_image_size = -1;
-static int hf_zbee_zcl_ota_max_data_size = -1;
-static int hf_zbee_zcl_ota_min_block_period = -1;
-static int hf_zbee_zcl_ota_req_node_addr = -1;
-static int hf_zbee_zcl_ota_current_time = -1;
-static int hf_zbee_zcl_ota_request_time = -1;
-static int hf_zbee_zcl_ota_upgrade_time = -1;
-static int hf_zbee_zcl_ota_data_size = -1;
-static int hf_zbee_zcl_ota_image_data = -1;
-static int hf_zbee_zcl_ota_page_size = -1;
-static int hf_zbee_zcl_ota_rsp_spacing = -1;
+static int proto_zbee_zcl_ota;
+
+static int hf_zbee_zcl_ota_attr_id;
+static int hf_zbee_zcl_ota_srv_tx_cmd_id;
+static int hf_zbee_zcl_ota_srv_rx_cmd_id;
+static int hf_zbee_zcl_ota_image_upgrade_status;
+static int hf_zbee_zcl_ota_zb_stack_ver;
+static int hf_zbee_zcl_ota_file_offset;
+static int hf_zbee_zcl_ota_payload_type;
+static int hf_zbee_zcl_ota_query_jitter;
+static int hf_zbee_zcl_ota_manufacturer_code;
+static int hf_zbee_zcl_ota_image_type;
+static int hf_zbee_zcl_ota_file_version;
+static int hf_zbee_zcl_ota_file_version_appl_release;
+static int hf_zbee_zcl_ota_file_version_appl_build;
+static int hf_zbee_zcl_ota_file_version_stack_release;
+static int hf_zbee_zcl_ota_file_version_stack_build;
+static int hf_zbee_zcl_ota_query_next_image_req_field_ctrl;
+static int hf_zbee_zcl_ota_query_next_image_req_field_ctrl_hw_ver_present;
+static int hf_zbee_zcl_ota_query_next_image_req_field_ctrl_reserved;
+static int hf_zbee_zcl_ota_image_block_req_field_ctrl;
+static int hf_zbee_zcl_ota_image_block_req_field_ctrl_ieee_addr_present;
+static int hf_zbee_zcl_ota_image_block_req_field_ctrl_min_block_period_present;
+static int hf_zbee_zcl_ota_image_block_req_field_ctrl_reserved;
+static int hf_zbee_zcl_ota_image_page_req_field_ctrl;
+static int hf_zbee_zcl_ota_image_page_req_field_ctrl_ieee_addr_present;
+static int hf_zbee_zcl_ota_image_page_req_field_ctrl_reserved;
+static int hf_zbee_zcl_ota_hw_version;
+static int hf_zbee_zcl_ota_status;
+static int hf_zbee_zcl_ota_image_size;
+static int hf_zbee_zcl_ota_max_data_size;
+static int hf_zbee_zcl_ota_min_block_period;
+static int hf_zbee_zcl_ota_req_node_addr;
+static int hf_zbee_zcl_ota_current_time;
+static int hf_zbee_zcl_ota_request_time;
+static int hf_zbee_zcl_ota_upgrade_time;
+static int hf_zbee_zcl_ota_data_size;
+static int hf_zbee_zcl_ota_image_data;
+static int hf_zbee_zcl_ota_page_size;
+static int hf_zbee_zcl_ota_rsp_spacing;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_ota = -1;
-static gint ett_zbee_zcl_ota_query_next_image_req_field_ctrl = -1;
-static gint ett_zbee_zcl_ota_image_block_req_field_ctrl = -1;
-static gint ett_zbee_zcl_ota_image_page_req_field_ctrl = -1;
-static gint ett_zbee_zcl_ota_file_version = -1;
+static gint ett_zbee_zcl_ota;
+static gint ett_zbee_zcl_ota_query_next_image_req_field_ctrl;
+static gint ett_zbee_zcl_ota_image_block_req_field_ctrl;
+static gint ett_zbee_zcl_ota_image_page_req_field_ctrl;
+static gint ett_zbee_zcl_ota_file_version;
 
 /* Attributes */
 static const value_string zbee_zcl_ota_attr_names[] = {
@@ -11045,50 +11045,50 @@ static void decode_energy               (gchar *s, guint16 value);
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_pwr_prof = -1;
-
-static int hf_zbee_zcl_pwr_prof_attr_id = -1;
-static int hf_zbee_zcl_pwr_prof_tot_prof_num = -1;
-static int hf_zbee_zcl_pwr_prof_multiple_sched = -1;
-static int hf_zbee_zcl_pwr_prof_energy_format = -1;
-static int hf_zbee_zcl_pwr_prof_energy_format_rdigit = -1;
-static int hf_zbee_zcl_pwr_prof_energy_format_ldigit = -1;
-static int hf_zbee_zcl_pwr_prof_energy_format_noleadingzero = -1;
-static int hf_zbee_zcl_pwr_prof_energy_remote = -1;
-static int hf_zbee_zcl_pwr_prof_sched_mode = -1;
-static int hf_zbee_zcl_pwr_prof_sched_mode_cheapest = -1;
-static int hf_zbee_zcl_pwr_prof_sched_mode_greenest = -1;
-static int hf_zbee_zcl_pwr_prof_sched_mode_reserved = -1;
-static int hf_zbee_zcl_pwr_prof_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_pwr_prof_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_pwr_prof_pwr_prof_id = -1;
-static int hf_zbee_zcl_pwr_prof_currency = -1;
-static int hf_zbee_zcl_pwr_prof_price = -1;
-static int hf_zbee_zcl_pwr_prof_price_trailing_digit = -1;
-static int hf_zbee_zcl_pwr_prof_num_of_sched_phases = -1;
-static int hf_zbee_zcl_pwr_prof_scheduled_time = -1;
-static int hf_zbee_zcl_pwr_prof_pwr_prof_count = -1;
-static int hf_zbee_zcl_pwr_prof_num_of_trans_phases = -1;
-static int hf_zbee_zcl_pwr_prof_energy_phase_id = -1;
-static int hf_zbee_zcl_pwr_prof_macro_phase_id = -1;
-static int hf_zbee_zcl_pwr_prof_expect_duration = -1;
-static int hf_zbee_zcl_pwr_prof_peak_power = -1;
-static int hf_zbee_zcl_pwr_prof_energy = -1;
-static int hf_zbee_zcl_pwr_prof_max_active_delay = -1;
-static int hf_zbee_zcl_pwr_prof_pwr_prof_rem_ctrl = -1;
-static int hf_zbee_zcl_pwr_prof_pwr_prof_state = -1;
-static int hf_zbee_zcl_pwr_prof_start_after = -1;
-static int hf_zbee_zcl_pwr_prof_stop_before = -1;
-static int hf_zbee_zcl_pwr_prof_options = -1;
-static int hf_zbee_zcl_pwr_prof_options_01 = -1;
-static int hf_zbee_zcl_pwr_prof_options_res = -1;
-static int hf_zbee_zcl_pwr_prof_pwr_prof_stime = -1;
+static int proto_zbee_zcl_pwr_prof;
+
+static int hf_zbee_zcl_pwr_prof_attr_id;
+static int hf_zbee_zcl_pwr_prof_tot_prof_num;
+static int hf_zbee_zcl_pwr_prof_multiple_sched;
+static int hf_zbee_zcl_pwr_prof_energy_format;
+static int hf_zbee_zcl_pwr_prof_energy_format_rdigit;
+static int hf_zbee_zcl_pwr_prof_energy_format_ldigit;
+static int hf_zbee_zcl_pwr_prof_energy_format_noleadingzero;
+static int hf_zbee_zcl_pwr_prof_energy_remote;
+static int hf_zbee_zcl_pwr_prof_sched_mode;
+static int hf_zbee_zcl_pwr_prof_sched_mode_cheapest;
+static int hf_zbee_zcl_pwr_prof_sched_mode_greenest;
+static int hf_zbee_zcl_pwr_prof_sched_mode_reserved;
+static int hf_zbee_zcl_pwr_prof_srv_tx_cmd_id;
+static int hf_zbee_zcl_pwr_prof_srv_rx_cmd_id;
+static int hf_zbee_zcl_pwr_prof_pwr_prof_id;
+static int hf_zbee_zcl_pwr_prof_currency;
+static int hf_zbee_zcl_pwr_prof_price;
+static int hf_zbee_zcl_pwr_prof_price_trailing_digit;
+static int hf_zbee_zcl_pwr_prof_num_of_sched_phases;
+static int hf_zbee_zcl_pwr_prof_scheduled_time;
+static int hf_zbee_zcl_pwr_prof_pwr_prof_count;
+static int hf_zbee_zcl_pwr_prof_num_of_trans_phases;
+static int hf_zbee_zcl_pwr_prof_energy_phase_id;
+static int hf_zbee_zcl_pwr_prof_macro_phase_id;
+static int hf_zbee_zcl_pwr_prof_expect_duration;
+static int hf_zbee_zcl_pwr_prof_peak_power;
+static int hf_zbee_zcl_pwr_prof_energy;
+static int hf_zbee_zcl_pwr_prof_max_active_delay;
+static int hf_zbee_zcl_pwr_prof_pwr_prof_rem_ctrl;
+static int hf_zbee_zcl_pwr_prof_pwr_prof_state;
+static int hf_zbee_zcl_pwr_prof_start_after;
+static int hf_zbee_zcl_pwr_prof_stop_before;
+static int hf_zbee_zcl_pwr_prof_options;
+static int hf_zbee_zcl_pwr_prof_options_01;
+static int hf_zbee_zcl_pwr_prof_options_res;
+static int hf_zbee_zcl_pwr_prof_pwr_prof_stime;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_pwr_prof = -1;
-static gint ett_zbee_zcl_pwr_prof_options = -1;
-static gint ett_zbee_zcl_pwr_prof_en_format = -1;
-static gint ett_zbee_zcl_pwr_prof_sched_mode = -1;
+static gint ett_zbee_zcl_pwr_prof;
+static gint ett_zbee_zcl_pwr_prof_options;
+static gint ett_zbee_zcl_pwr_prof_en_format;
+static gint ett_zbee_zcl_pwr_prof_sched_mode;
 static gint ett_zbee_zcl_pwr_prof_pwrprofiles[ZBEE_ZCL_PWR_PROF_NUM_PWR_PROF_ETT];
 static gint ett_zbee_zcl_pwr_prof_enphases[ZBEE_ZCL_PWR_PROF_NUM_EN_PHS_ETT];
 
@@ -12194,29 +12194,29 @@ static void dissect_zcl_appl_ctrl_attr_data             (proto_tree *tree, tvbuf
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_appl_ctrl = -1;
-
-static int hf_zbee_zcl_appl_ctrl_attr_id = -1;
-static int hf_zbee_zcl_appl_ctrl_time = -1;
-static int hf_zbee_zcl_appl_ctrl_time_mm = -1;
-static int hf_zbee_zcl_appl_ctrl_time_encoding_type = -1;
-static int hf_zbee_zcl_appl_ctrl_time_hh = -1;
-static int hf_zbee_zcl_appl_ctrl_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_appl_ctrl_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_appl_ctrl_exec_cmd_id = -1;
-static int hf_zbee_zcl_appl_ctrl_attr_func_id = -1;
-static int hf_zbee_zcl_appl_ctrl_attr_func_data_type = -1;
-static int hf_zbee_zcl_appl_ctrl_warning_id = -1;
-static int hf_zbee_zcl_appl_ctrl_appl_status = -1;
-static int hf_zbee_zcl_appl_ctrl_rem_en_flags_raw = -1;
-static int hf_zbee_zcl_appl_ctrl_rem_en_flags = -1;
-static int hf_zbee_zcl_appl_ctrl_status2 = -1;
-static int hf_zbee_zcl_appl_ctrl_status2_array = -1;
+static int proto_zbee_zcl_appl_ctrl;
+
+static int hf_zbee_zcl_appl_ctrl_attr_id;
+static int hf_zbee_zcl_appl_ctrl_time;
+static int hf_zbee_zcl_appl_ctrl_time_mm;
+static int hf_zbee_zcl_appl_ctrl_time_encoding_type;
+static int hf_zbee_zcl_appl_ctrl_time_hh;
+static int hf_zbee_zcl_appl_ctrl_srv_tx_cmd_id;
+static int hf_zbee_zcl_appl_ctrl_srv_rx_cmd_id;
+static int hf_zbee_zcl_appl_ctrl_exec_cmd_id;
+static int hf_zbee_zcl_appl_ctrl_attr_func_id;
+static int hf_zbee_zcl_appl_ctrl_attr_func_data_type;
+static int hf_zbee_zcl_appl_ctrl_warning_id;
+static int hf_zbee_zcl_appl_ctrl_appl_status;
+static int hf_zbee_zcl_appl_ctrl_rem_en_flags_raw;
+static int hf_zbee_zcl_appl_ctrl_rem_en_flags;
+static int hf_zbee_zcl_appl_ctrl_status2;
+static int hf_zbee_zcl_appl_ctrl_status2_array;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_appl_ctrl = -1;
-static gint ett_zbee_zcl_appl_ctrl_flags = -1;
-static gint ett_zbee_zcl_appl_ctrl_time = -1;
+static gint ett_zbee_zcl_appl_ctrl;
+static gint ett_zbee_zcl_appl_ctrl_flags;
+static gint ett_zbee_zcl_appl_ctrl_time;
 static gint ett_zbee_zcl_appl_ctrl_func[ZBEE_ZCL_APPL_CTRL_NUM_FUNC_ETT];
 
 /* Attributes */
@@ -12805,17 +12805,17 @@ static const value_string zbee_zcl_poll_ctrl_srv_rx_cmd_names[] = {
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_poll_ctrl = -1;
+static int proto_zbee_zcl_poll_ctrl;
 
-static int hf_zbee_zcl_poll_ctrl_attr_id = -1;
-static int hf_zbee_zcl_poll_ctrl_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_poll_ctrl_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_poll_ctrl_start_fast_polling = -1;
-static int hf_zbee_zcl_poll_ctrl_fast_poll_timeout = -1;
-static int hf_zbee_zcl_poll_ctrl_new_long_poll_interval = -1;
-static int hf_zbee_zcl_poll_ctrl_new_short_poll_interval = -1;
+static int hf_zbee_zcl_poll_ctrl_attr_id;
+static int hf_zbee_zcl_poll_ctrl_srv_rx_cmd_id;
+static int hf_zbee_zcl_poll_ctrl_srv_tx_cmd_id;
+static int hf_zbee_zcl_poll_ctrl_start_fast_polling;
+static int hf_zbee_zcl_poll_ctrl_fast_poll_timeout;
+static int hf_zbee_zcl_poll_ctrl_new_long_poll_interval;
+static int hf_zbee_zcl_poll_ctrl_new_short_poll_interval;
 
-static gint ett_zbee_zcl_poll_ctrl = -1;
+static gint ett_zbee_zcl_poll_ctrl;
 
 /*************************/
 /* Function Declarations */
@@ -13381,298 +13381,298 @@ static const value_string zbee_zcl_gp_proxy_sink_tbl_req_type[] = {
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_gp = -1;
+static int proto_zbee_zcl_gp;
 
-static int hf_zbee_zcl_gp_attr_id = -1;
-static int hf_zbee_zcl_gp_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_gp_srv_tx_cmd_id = -1;
+static int hf_zbee_zcl_gp_attr_id;
+static int hf_zbee_zcl_gp_srv_rx_cmd_id;
+static int hf_zbee_zcl_gp_srv_tx_cmd_id;
 
-static gint ett_zbee_zcl_gp = -1;
+static gint ett_zbee_zcl_gp;
 
 /* GP_PROXY_COMMISSIONING_MODE */
-static gint ett_zbee_gp_cmd_proxy_commissioning_mode_options = -1;
-static gint ett_zbee_gp_cmd_proxy_commissioning_mode_exit_mode = -1;
-static gint hf_zbee_gp_cmd_proxy_commissioning_mode_options = -1;
-static gint hf_zbee_gp_cmd_pcm_opt_action = -1;
-static gint hf_zbee_gp_cmd_pcm_opt_exit_mode = -1;
-static gint hf_zbee_gp_cmd_pcm_opt_channel_present = -1;
-static gint hf_zbee_gp_cmd_pcm_opt_unicast_comm = -1;
-static gint hf_zbee_gp_cmd_proxy_commissioning_mode_exit_mode = -1;
-static gint hf_zbee_gp_cmd_pcm_exit_mode_on_comm_window_expire = -1;
-static gint hf_zbee_gp_cmd_pcm_exit_mode_on_pairing_success = -1;
-static gint hf_zbee_gp_cmd_pcm_exit_mode_on_gp_proxy_comm_mode = -1;
-static gint hf_zbee_zcl_gp_commissioning_window = -1;
-static gint hf_zbee_zcl_gp_channel = -1;
+static gint ett_zbee_gp_cmd_proxy_commissioning_mode_options;
+static gint ett_zbee_gp_cmd_proxy_commissioning_mode_exit_mode;
+static gint hf_zbee_gp_cmd_proxy_commissioning_mode_options;
+static gint hf_zbee_gp_cmd_pcm_opt_action;
+static gint hf_zbee_gp_cmd_pcm_opt_exit_mode;
+static gint hf_zbee_gp_cmd_pcm_opt_channel_present;
+static gint hf_zbee_gp_cmd_pcm_opt_unicast_comm;
+static gint hf_zbee_gp_cmd_proxy_commissioning_mode_exit_mode;
+static gint hf_zbee_gp_cmd_pcm_exit_mode_on_comm_window_expire;
+static gint hf_zbee_gp_cmd_pcm_exit_mode_on_pairing_success;
+static gint hf_zbee_gp_cmd_pcm_exit_mode_on_gp_proxy_comm_mode;
+static gint hf_zbee_zcl_gp_commissioning_window;
+static gint hf_zbee_zcl_gp_channel;
 
 /* GP_COMMISSIONING_NOTIFICATION */
-static gint hf_zbee_gp_cmd_comm_notif_opt_app_id = -1;
-static gint hf_zbee_gp_cmd_comm_notif_opt_rx_after_tx = -1;
-static gint hf_zbee_gp_cmd_comm_notif_opt_secur_level = -1;
-static gint hf_zbee_gp_cmd_comm_notif_opt_secur_key_type = -1;
-static gint hf_zbee_gp_cmd_comm_notif_opt_secur_fail = -1;
-static gint hf_zbee_gp_cmd_comm_notif_opt_bidir_cap = -1;
-static gint hf_zbee_gp_cmd_comm_notif_opt_proxy_info_present = -1;
-static gint hf_zbee_gp_cmd_commissioning_notification_options = -1;
-static gint ett_zbee_gp_cmd_commissioning_notification_options = -1;
-static gint hf_zbee_gp_src_id = -1;
-static gint hf_zbee_gp_ieee = -1;
-static gint hf_zbee_gp_endpoint = -1;
-static gint hf_zbee_gp_secur_frame_counter = -1;
-static gint hf_zbee_gp_gpd_command_id = -1;
-static gint hf_zbee_gp_short_addr = -1;
-static gint hf_zbee_gp_gpp_gpd_link = -1;
-static gint hf_zbee_gp_mic = -1;
-static gint ett_zbee_gp_gpp_gpd_link = -1;
-static gint hf_zbee_gpp_gpd_link_rssi = -1;
-static gint hf_zbee_gpp_gpd_link_lqi = -1;
-static gint hf_zbee_gp_gpd_payload_size = -1;
+static gint hf_zbee_gp_cmd_comm_notif_opt_app_id;
+static gint hf_zbee_gp_cmd_comm_notif_opt_rx_after_tx;
+static gint hf_zbee_gp_cmd_comm_notif_opt_secur_level;
+static gint hf_zbee_gp_cmd_comm_notif_opt_secur_key_type;
+static gint hf_zbee_gp_cmd_comm_notif_opt_secur_fail;
+static gint hf_zbee_gp_cmd_comm_notif_opt_bidir_cap;
+static gint hf_zbee_gp_cmd_comm_notif_opt_proxy_info_present;
+static gint hf_zbee_gp_cmd_commissioning_notification_options;
+static gint ett_zbee_gp_cmd_commissioning_notification_options;
+static gint hf_zbee_gp_src_id;
+static gint hf_zbee_gp_ieee;
+static gint hf_zbee_gp_endpoint;
+static gint hf_zbee_gp_secur_frame_counter;
+static gint hf_zbee_gp_gpd_command_id;
+static gint hf_zbee_gp_short_addr;
+static gint hf_zbee_gp_gpp_gpd_link;
+static gint hf_zbee_gp_mic;
+static gint ett_zbee_gp_gpp_gpd_link;
+static gint hf_zbee_gpp_gpd_link_rssi;
+static gint hf_zbee_gpp_gpd_link_lqi;
+static gint hf_zbee_gp_gpd_payload_size;
 
 
 /* GP_NOTIFICATION */
-static gint hf_zbee_gp_cmd_notification_options = -1;
-static gint ett_zbee_gp_cmd_notification_options = -1;
-static gint hf_zbee_gp_cmd_notif_opt_app_id = -1;
-static gint hf_zbee_gp_cmd_notif_opt_also_unicast = -1;
-static gint hf_zbee_gp_cmd_notif_opt_also_derived_group = -1;
-static gint hf_zbee_gp_cmd_notif_opt_also_comm_group = -1;
-static gint hf_zbee_gp_cmd_notif_opt_secur_level = -1;
-static gint hf_zbee_gp_cmd_notif_opt_secur_key_type = -1;
-static gint hf_zbee_gp_cmd_notif_opt_rx_after_tx = -1;
-static gint hf_zbee_gp_cmd_notif_opt_tx_q_full = -1;
-static gint hf_zbee_gp_cmd_notif_opt_bidir_cap = -1;
-static gint hf_zbee_gp_cmd_notif_opt_proxy_info_present = -1;
+static gint hf_zbee_gp_cmd_notification_options;
+static gint ett_zbee_gp_cmd_notification_options;
+static gint hf_zbee_gp_cmd_notif_opt_app_id;
+static gint hf_zbee_gp_cmd_notif_opt_also_unicast;
+static gint hf_zbee_gp_cmd_notif_opt_also_derived_group;
+static gint hf_zbee_gp_cmd_notif_opt_also_comm_group;
+static gint hf_zbee_gp_cmd_notif_opt_secur_level;
+static gint hf_zbee_gp_cmd_notif_opt_secur_key_type;
+static gint hf_zbee_gp_cmd_notif_opt_rx_after_tx;
+static gint hf_zbee_gp_cmd_notif_opt_tx_q_full;
+static gint hf_zbee_gp_cmd_notif_opt_bidir_cap;
+static gint hf_zbee_gp_cmd_notif_opt_proxy_info_present;
 
 /* GP_PAIRING */
-static gint hf_zbee_gp_cmd_pairing_opt_app_id = -1;
-static gint hf_zbee_gp_cmd_pairing_opt_add_sink = -1;
-static gint hf_zbee_gp_cmd_pairing_opt_remove_gpd = -1;
-static gint hf_zbee_gp_cmd_pairing_opt_communication_mode = -1;
-static gint hf_zbee_gp_cmd_pairing_opt_gpd_fixed = -1;
-static gint hf_zbee_gp_cmd_pairing_opt_gpd_mac_seq_num_cap = -1;
-static gint hf_zbee_gp_cmd_pairing_opt_secur_level = -1;
-static gint hf_zbee_gp_cmd_pairing_opt_secur_key_type = -1;
-static gint hf_zbee_gp_cmd_pairing_opt_gpd_frame_cnt_present = -1;
-static gint hf_zbee_gp_cmd_pairing_opt_gpd_secur_key_present = -1;
-static gint hf_zbee_gp_cmd_pairing_opt_assigned_alias_present = -1;
-static gint hf_zbee_gp_cmd_pairing_opt_fwd_radius_present = -1;
-static gint hf_zbee_gp_cmd_pairing_options = -1;
-static gint ett_zbee_gp_cmd_pairing_options = -1;
-static gint hf_zbee_gp_sink_ieee = -1;
-static gint hf_zbee_gp_sink_nwk = -1;
-static gint hf_zbee_gp_sink_group_id = -1;
-static gint hf_zbee_gp_device_id = -1;
-static gint hf_zbee_gp_assigned_alias = -1;
-static gint hf_zbee_gp_forwarding_radius = -1;
-static gint hf_zbee_gp_gpd_key = -1;
-static gint hf_zbee_gp_groupcast_radius = -1;
+static gint hf_zbee_gp_cmd_pairing_opt_app_id;
+static gint hf_zbee_gp_cmd_pairing_opt_add_sink;
+static gint hf_zbee_gp_cmd_pairing_opt_remove_gpd;
+static gint hf_zbee_gp_cmd_pairing_opt_communication_mode;
+static gint hf_zbee_gp_cmd_pairing_opt_gpd_fixed;
+static gint hf_zbee_gp_cmd_pairing_opt_gpd_mac_seq_num_cap;
+static gint hf_zbee_gp_cmd_pairing_opt_secur_level;
+static gint hf_zbee_gp_cmd_pairing_opt_secur_key_type;
+static gint hf_zbee_gp_cmd_pairing_opt_gpd_frame_cnt_present;
+static gint hf_zbee_gp_cmd_pairing_opt_gpd_secur_key_present;
+static gint hf_zbee_gp_cmd_pairing_opt_assigned_alias_present;
+static gint hf_zbee_gp_cmd_pairing_opt_fwd_radius_present;
+static gint hf_zbee_gp_cmd_pairing_options;
+static gint ett_zbee_gp_cmd_pairing_options;
+static gint hf_zbee_gp_sink_ieee;
+static gint hf_zbee_gp_sink_nwk;
+static gint hf_zbee_gp_sink_group_id;
+static gint hf_zbee_gp_device_id;
+static gint hf_zbee_gp_assigned_alias;
+static gint hf_zbee_gp_forwarding_radius;
+static gint hf_zbee_gp_gpd_key;
+static gint hf_zbee_gp_groupcast_radius;
 
 /* GP Response */
-static gint hf_zbee_gp_cmd_response_options = -1;
-static gint ett_zbee_gp_cmd_response_options = -1;
-static gint hf_zbee_gp_cmd_response_tx_channel = -1;
-static gint ett_zbee_gp_cmd_response_tx_channel = -1;
-static gint hf_zbee_gp_cmd_resp_opt_app_id = -1;
-static gint hf_zbee_gp_cmd_resp_opt_tx_on_ep_match = -1;
-static gint hf_zbee_gp_tmp_master_short_addr = -1;
-static gint hf_zbee_gp_cmd_resp_tx_channel = -1;
+static gint hf_zbee_gp_cmd_response_options;
+static gint ett_zbee_gp_cmd_response_options;
+static gint hf_zbee_gp_cmd_response_tx_channel;
+static gint ett_zbee_gp_cmd_response_tx_channel;
+static gint hf_zbee_gp_cmd_resp_opt_app_id;
+static gint hf_zbee_gp_cmd_resp_opt_tx_on_ep_match;
+static gint hf_zbee_gp_tmp_master_short_addr;
+static gint hf_zbee_gp_cmd_resp_tx_channel;
 
 /* GP_PAIRING_CONFIGURATION */
-static int hf_zbee_gp_cmd_pc_actions_action = -1;
-static int hf_zbee_gp_cmd_pc_actions_send_gp_pairing = -1;
-static int hf_zbee_gp_cmd_pc_opt_app_id = -1;
-static int hf_zbee_gp_cmd_pc_opt_communication_mode = -1;
-static int hf_zbee_gp_cmd_pc_opt_seq_number_cap = -1;
-static int hf_zbee_gp_cmd_px_opt_rx_on_cap = -1;
-static int hf_zbee_gp_cmd_pc_opt_fixed_location = -1;
-static int hf_zbee_gp_cmd_pc_opt_assigned_alias = -1;
-static int hf_zbee_gp_cmd_pc_opt_security_use = -1;
-static int hf_zbee_gp_cmd_pc_opt_app_info_present = -1;
-static int hf_zbee_gp_cmd_pc_secur_level = -1;
-static int hf_zbee_gp_cmd_pc_secur_key_type = -1;
-static int hf_zbee_gp_cmd_pc_app_info_manuf_id_present = -1;
-static int hf_zbee_gp_cmd_pc_app_info_model_id_present = -1;
-static int hf_zbee_gp_cmd_pc_app_info_gpd_commands_present = -1;
-static int hf_zbee_gp_cmd_pc_app_info_cluster_list_present = -1;
-static int hf_zbee_gp_cmd_pc_actions = -1;
-static gint ett_zbee_gp_cmd_pc_actions = -1;
-static int hf_zbee_gp_cmd_pc_options = -1;
-static gint ett_zbee_gp_cmd_pc_options = -1;
-static gint ett_zbee_zcl_gp_group_list = -1;
-static int hf_zbee_gp_group_list_len = -1;
-static int hf_zbee_gp_group_list_group_id = -1;
-static int hf_zbee_gp_group_list_alias = -1;
-static int hf_zbee_gp_cmd_pc_secur_options = -1;
-static gint ett_zbee_gp_cmd_pc_secur_options = -1;
-static int hf_zbee_gp_n_paired_endpoints = -1;
-static int hf_zbee_gp_paired_endpoint = -1;
-static int hf_zbee_gp_cmd_pc_app_info = -1;
-static gint ett_zbee_gp_cmd_pc_app_info = -1;
-static int hf_zbee_zcl_gp_manufacturer_id = -1;
-static int hf_zbee_zcl_gp_model_id = -1;
-static int hf_zbee_gp_n_gpd_commands = -1;
-static int hf_zbee_gp_gpd_command = -1;
-static int hf_zbee_gp_n_srv_clusters = -1;
-static int hf_zbee_gp_n_cli_clusters = -1;
-static int hf_zbee_gp_gpd_cluster_id = -1;
-static gint ett_zbee_zcl_gp_ep = -1;
-static gint ett_zbee_zcl_gp_cmds = -1;
-static gint ett_zbee_zcl_gp_clusters = -1;
-static gint ett_zbee_zcl_gp_srv_clusters = -1;
-static gint ett_zbee_zcl_gp_cli_clusters = -1;
+static int hf_zbee_gp_cmd_pc_actions_action;
+static int hf_zbee_gp_cmd_pc_actions_send_gp_pairing;
+static int hf_zbee_gp_cmd_pc_opt_app_id;
+static int hf_zbee_gp_cmd_pc_opt_communication_mode;
+static int hf_zbee_gp_cmd_pc_opt_seq_number_cap;
+static int hf_zbee_gp_cmd_px_opt_rx_on_cap;
+static int hf_zbee_gp_cmd_pc_opt_fixed_location;
+static int hf_zbee_gp_cmd_pc_opt_assigned_alias;
+static int hf_zbee_gp_cmd_pc_opt_security_use;
+static int hf_zbee_gp_cmd_pc_opt_app_info_present;
+static int hf_zbee_gp_cmd_pc_secur_level;
+static int hf_zbee_gp_cmd_pc_secur_key_type;
+static int hf_zbee_gp_cmd_pc_app_info_manuf_id_present;
+static int hf_zbee_gp_cmd_pc_app_info_model_id_present;
+static int hf_zbee_gp_cmd_pc_app_info_gpd_commands_present;
+static int hf_zbee_gp_cmd_pc_app_info_cluster_list_present;
+static int hf_zbee_gp_cmd_pc_actions;
+static gint ett_zbee_gp_cmd_pc_actions;
+static int hf_zbee_gp_cmd_pc_options;
+static gint ett_zbee_gp_cmd_pc_options;
+static gint ett_zbee_zcl_gp_group_list;
+static int hf_zbee_gp_group_list_len;
+static int hf_zbee_gp_group_list_group_id;
+static int hf_zbee_gp_group_list_alias;
+static int hf_zbee_gp_cmd_pc_secur_options;
+static gint ett_zbee_gp_cmd_pc_secur_options;
+static int hf_zbee_gp_n_paired_endpoints;
+static int hf_zbee_gp_paired_endpoint;
+static int hf_zbee_gp_cmd_pc_app_info;
+static gint ett_zbee_gp_cmd_pc_app_info;
+static int hf_zbee_zcl_gp_manufacturer_id;
+static int hf_zbee_zcl_gp_model_id;
+static int hf_zbee_gp_n_gpd_commands;
+static int hf_zbee_gp_gpd_command;
+static int hf_zbee_gp_n_srv_clusters;
+static int hf_zbee_gp_n_cli_clusters;
+static int hf_zbee_gp_gpd_cluster_id;
+static gint ett_zbee_zcl_gp_ep;
+static gint ett_zbee_zcl_gp_cmds;
+static gint ett_zbee_zcl_gp_clusters;
+static gint ett_zbee_zcl_gp_srv_clusters;
+static gint ett_zbee_zcl_gp_cli_clusters;
 
 /* GP_SINK_TABLE_REQUEST and GP_PROXY_TABLE_REQUEST */
-static gint ett_zbee_zcl_proxy_sink_tbl_req_options = -1;
-static int hf_zbee_zcl_proxy_sink_tbl_req_options = -1;
-static int hf_zbee_zcl_proxy_sink_tbl_req_fld_app_id = -1;
-static int hf_zbee_zcl_proxy_sink_tbl_req_fld_req_type = -1;
-static int hf_zbee_zcl_proxy_sink_tbl_req_index = -1;
+static gint ett_zbee_zcl_proxy_sink_tbl_req_options;
+static int hf_zbee_zcl_proxy_sink_tbl_req_options;
+static int hf_zbee_zcl_proxy_sink_tbl_req_fld_app_id;
+static int hf_zbee_zcl_proxy_sink_tbl_req_fld_req_type;
+static int hf_zbee_zcl_proxy_sink_tbl_req_index;
 
 /* GP_SINK_TABLE_RESPONSE and GP_PROXY_TABLE_RESPONSE */
-static int hf_zbee_zcl_proxy_sink_tbl_resp_status = -1;
-static int hf_zbee_zcl_proxy_sink_tbl_resp_entries_total = -1;
-static int hf_zbee_zcl_proxy_sink_tbl_resp_start_index = -1;
-static int hf_zbee_zcl_proxy_sink_tbl_resp_entries_count = -1;
+static int hf_zbee_zcl_proxy_sink_tbl_resp_status;
+static int hf_zbee_zcl_proxy_sink_tbl_resp_entries_total;
+static int hf_zbee_zcl_proxy_sink_tbl_resp_start_index;
+static int hf_zbee_zcl_proxy_sink_tbl_resp_entries_count;
 
 /* GP SINK_COMMISSIONING_MODE */
-static gint ett_zbee_zcl_gp_cmd_sink_comm_mode_options = -1;
-static gint hf_zbee_zcl_gp_cmd_sink_comm_mode_options = -1;
+static gint ett_zbee_zcl_gp_cmd_sink_comm_mode_options;
+static gint hf_zbee_zcl_gp_cmd_sink_comm_mode_options;
 
-static gint hf_zbee_zcl_gp_cmd_sink_comm_mode_options_fld_action = -1;
-static gint hf_zbee_zcl_gp_cmd_sink_comm_mode_options_fld_inv_gpm_in_secur = -1;
-static gint hf_zbee_zcl_gp_cmd_sink_comm_mode_options_fld_inv_gpm_in_pairing = -1;
-static gint hf_zbee_zcl_gp_cmd_sink_comm_mode_options_fld_inv_proxies = -1;
+static gint hf_zbee_zcl_gp_cmd_sink_comm_mode_options_fld_action;
+static gint hf_zbee_zcl_gp_cmd_sink_comm_mode_options_fld_inv_gpm_in_secur;
+static gint hf_zbee_zcl_gp_cmd_sink_comm_mode_options_fld_inv_gpm_in_pairing;
+static gint hf_zbee_zcl_gp_cmd_sink_comm_mode_options_fld_inv_proxies;
 
-static gint hf_zbee_gp_zcl_cmd_sink_comm_mode_gpm_addr_for_secur = -1;
-static gint hf_zbee_gp_zcl_cmd_sink_comm_mode_gpm_addr_for_pairing = -1;
-static gint hf_zbee_gp_zcl_cmd_sink_comm_mode_sink_ep = -1;
+static gint hf_zbee_gp_zcl_cmd_sink_comm_mode_gpm_addr_for_secur;
+static gint hf_zbee_gp_zcl_cmd_sink_comm_mode_gpm_addr_for_pairing;
+static gint hf_zbee_gp_zcl_cmd_sink_comm_mode_sink_ep;
 
 /* GP Sink Table Attribute */
-static gint ett_zbee_gp_sink_tbl = -1;
-static gint ett_zbee_gp_sink_tbl_entry = -1;
-static gint ett_zbee_gp_sink_tbl_entry_options = -1;
-
-static gint hf_zbee_gp_sink_tbl_length = -1;
-static gint hf_zbee_gp_sink_tbl_entry_options = -1;
-
-static gint hf_zbee_gp_sink_tbl_entry_options_app_id = -1;
-static gint hf_zbee_gp_sink_tbl_entry_options_comm_mode = -1;
-static gint hf_zbee_gp_sink_tbl_entry_options_seq_num_cap = -1;
-static gint hf_zbee_gp_sink_tbl_entry_options_rx_on_cap = -1;
-static gint hf_zbee_gp_sink_tbl_entry_options_fixed_loc = -1;
-static gint hf_zbee_gp_sink_tbl_entry_options_assigned_alias = -1;
-static gint hf_zbee_gp_sink_tbl_entry_options_sec_use = -1;
-
-static gint ett_zbee_gp_sec_options = -1;
-static gint hf_zbee_gp_sec_options = -1;
-static gint hf_zbee_gp_sec_options_sec_level = -1;
-static gint hf_zbee_gp_sec_options_sec_key_type = -1;
+static gint ett_zbee_gp_sink_tbl;
+static gint ett_zbee_gp_sink_tbl_entry;
+static gint ett_zbee_gp_sink_tbl_entry_options;
+
+static gint hf_zbee_gp_sink_tbl_length;
+static gint hf_zbee_gp_sink_tbl_entry_options;
+
+static gint hf_zbee_gp_sink_tbl_entry_options_app_id;
+static gint hf_zbee_gp_sink_tbl_entry_options_comm_mode;
+static gint hf_zbee_gp_sink_tbl_entry_options_seq_num_cap;
+static gint hf_zbee_gp_sink_tbl_entry_options_rx_on_cap;
+static gint hf_zbee_gp_sink_tbl_entry_options_fixed_loc;
+static gint hf_zbee_gp_sink_tbl_entry_options_assigned_alias;
+static gint hf_zbee_gp_sink_tbl_entry_options_sec_use;
+
+static gint ett_zbee_gp_sec_options;
+static gint hf_zbee_gp_sec_options;
+static gint hf_zbee_gp_sec_options_sec_level;
+static gint hf_zbee_gp_sec_options_sec_key_type;
 
 /* GP Proxy Table Attribute */
-static gint ett_zbee_gp_proxy_tbl = -1;
-static gint ett_zbee_gp_proxy_tbl_entry = -1;
-static gint ett_zbee_gp_proxy_tbl_entry_options = -1;
-static gint ett_zbee_gp_proxy_tbl_entry_ext_options = -1;
-
-static gint hf_zbee_gp_proxy_tbl_length = -1;
-static gint hf_zbee_gp_proxy_tbl_entry_options = -1;
-static gint hf_zbee_gp_proxy_tbl_entry_ext_options = -1;
-
-static gint hf_zbee_gp_proxy_tbl_entry_options_app_id = -1;
-static gint hf_zbee_gp_proxy_tbl_entry_options_entry_active = -1;
-static gint hf_zbee_gp_proxy_tbl_entry_options_entry_valid = -1;
-static gint hf_zbee_gp_proxy_tbl_entry_options_seq_num_cap = -1;
-static gint hf_zbee_gp_proxy_tbl_entry_options_lw_ucast_gps = -1;
-static gint hf_zbee_gp_proxy_tbl_entry_options_derived_group_gps = -1;
-static gint hf_zbee_gp_proxy_tbl_entry_options_comm_group_gps = -1;
-static gint hf_zbee_gp_proxy_tbl_entry_options_first_to_forward = -1;
-static gint hf_zbee_gp_proxy_tbl_entry_options_in_range = -1;
-static gint hf_zbee_gp_proxy_tbl_entry_options_gpd_fixed = -1;
-static gint hf_zbee_gp_proxy_tbl_entry_options_has_all_ucast_routes = -1;
-static gint hf_zbee_gp_proxy_tbl_entry_options_assigned_alias = -1;
-static gint hf_zbee_gp_proxy_tbl_entry_options_sec_use = -1;
-static gint hf_zbee_gp_proxy_tbl_entry_options_opt_ext = -1;
-
-static gint hf_zbee_gp_proxy_tbl_entry_search_counter = -1;
-
-static gint hf_zbee_gp_proxy_tbl_entry_ext_options_full_ucast_gps = -1;
-
-static gint ett_zbee_gp_sink_address_list = -1;
-static gint hf_zbee_gp_sink_address_list_length = -1;
+static gint ett_zbee_gp_proxy_tbl;
+static gint ett_zbee_gp_proxy_tbl_entry;
+static gint ett_zbee_gp_proxy_tbl_entry_options;
+static gint ett_zbee_gp_proxy_tbl_entry_ext_options;
+
+static gint hf_zbee_gp_proxy_tbl_length;
+static gint hf_zbee_gp_proxy_tbl_entry_options;
+static gint hf_zbee_gp_proxy_tbl_entry_ext_options;
+
+static gint hf_zbee_gp_proxy_tbl_entry_options_app_id;
+static gint hf_zbee_gp_proxy_tbl_entry_options_entry_active;
+static gint hf_zbee_gp_proxy_tbl_entry_options_entry_valid;
+static gint hf_zbee_gp_proxy_tbl_entry_options_seq_num_cap;
+static gint hf_zbee_gp_proxy_tbl_entry_options_lw_ucast_gps;
+static gint hf_zbee_gp_proxy_tbl_entry_options_derived_group_gps;
+static gint hf_zbee_gp_proxy_tbl_entry_options_comm_group_gps;
+static gint hf_zbee_gp_proxy_tbl_entry_options_first_to_forward;
+static gint hf_zbee_gp_proxy_tbl_entry_options_in_range;
+static gint hf_zbee_gp_proxy_tbl_entry_options_gpd_fixed;
+static gint hf_zbee_gp_proxy_tbl_entry_options_has_all_ucast_routes;
+static gint hf_zbee_gp_proxy_tbl_entry_options_assigned_alias;
+static gint hf_zbee_gp_proxy_tbl_entry_options_sec_use;
+static gint hf_zbee_gp_proxy_tbl_entry_options_opt_ext;
+
+static gint hf_zbee_gp_proxy_tbl_entry_search_counter;
+
+static gint hf_zbee_gp_proxy_tbl_entry_ext_options_full_ucast_gps;
+
+static gint ett_zbee_gp_sink_address_list;
+static gint hf_zbee_gp_sink_address_list_length;
 
 /* GP gppFunctionality Attribute */
-static gint ett_zbee_zcl_gp_attr_gpp_func = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func = -1;
-
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_gp_feature = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_direct_comm = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_derived_gcast_comm = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_pre_commissioned_gcast_comm = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_full_ucast_comm = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_lw_ucast_comm = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_bidir_op = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_proxy_tbl_maintenance = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_gp_commissioning = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_ct_based_commissioning = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_maintenance_of_gpd = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_gpd_secur_lvl_00 = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_gpd_secur_lvl_01 = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_gpd_secur_lvl_10 = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_gpd_secur_lvl_11 = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_func_fld_gpd_ieee_address = -1;
+static gint ett_zbee_zcl_gp_attr_gpp_func;
+static gint hf_zbee_zcl_gp_attr_gpp_func;
+
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_gp_feature;
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_direct_comm;
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_derived_gcast_comm;
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_pre_commissioned_gcast_comm;
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_full_ucast_comm;
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_lw_ucast_comm;
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_bidir_op;
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_proxy_tbl_maintenance;
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_gp_commissioning;
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_ct_based_commissioning;
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_maintenance_of_gpd;
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_gpd_secur_lvl_00;
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_gpd_secur_lvl_01;
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_gpd_secur_lvl_10;
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_gpd_secur_lvl_11;
+static gint hf_zbee_zcl_gp_attr_gpp_func_fld_gpd_ieee_address;
 
 /* GP gppActiveFunctionality Attribute */
-static gint ett_zbee_zcl_gp_attr_gpp_active_func = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_active_func = -1;
-static gint hf_zbee_zcl_gp_attr_gpp_active_func_fld_gp_functionality = -1;
+static gint ett_zbee_zcl_gp_attr_gpp_active_func;
+static gint hf_zbee_zcl_gp_attr_gpp_active_func;
+static gint hf_zbee_zcl_gp_attr_gpp_active_func_fld_gp_functionality;
 
 /* GP gpsFunctionality Attribute */
-static gint ett_zbee_zcl_gp_attr_gps_func = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func = -1;
-
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_gp_feature = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_direct_comm = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_derived_gcast_comm = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_pre_commissioned_gcast_comm = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_full_ucast_comm = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_lw_ucast_comm = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_proximity_bidir_op = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_multi_hop_bidir_op = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_proxy_tbl_maintenance = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_proximity_commissioning = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_multi_hop_commissioning = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_ct_based_commissioning = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_maintenance_of_gpd = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_gpd_secur_lvl_00 = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_gpd_secur_lvl_01 = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_gpd_secur_lvl_10 = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_gpd_secur_lvl_11 = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_sink_tbl_based_gcast_forwarding = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_translation_table = -1;
-static gint hf_zbee_zcl_gp_attr_gps_func_fld_gpd_ieee_address = -1;
+static gint ett_zbee_zcl_gp_attr_gps_func;
+static gint hf_zbee_zcl_gp_attr_gps_func;
+
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_gp_feature;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_direct_comm;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_derived_gcast_comm;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_pre_commissioned_gcast_comm;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_full_ucast_comm;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_lw_ucast_comm;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_proximity_bidir_op;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_multi_hop_bidir_op;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_proxy_tbl_maintenance;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_proximity_commissioning;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_multi_hop_commissioning;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_ct_based_commissioning;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_maintenance_of_gpd;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_gpd_secur_lvl_00;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_gpd_secur_lvl_01;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_gpd_secur_lvl_10;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_gpd_secur_lvl_11;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_sink_tbl_based_gcast_forwarding;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_translation_table;
+static gint hf_zbee_zcl_gp_attr_gps_func_fld_gpd_ieee_address;
 
 /* GP gppActiveFunctionality Attribute */
-static gint ett_zbee_zcl_gp_attr_gps_active_func = -1;
-static gint hf_zbee_zcl_gp_attr_gps_active_func = -1;
-static gint hf_zbee_zcl_gp_attr_gps_active_func_fld_gp_functionality = -1;
+static gint ett_zbee_zcl_gp_attr_gps_active_func;
+static gint hf_zbee_zcl_gp_attr_gps_active_func;
+static gint hf_zbee_zcl_gp_attr_gps_active_func_fld_gp_functionality;
 
 /* GP gpsCommissioningExitMode Attribute */
-static gint ett_zbee_zcl_gp_attr_gps_comm_exit_mode = -1;
-static gint hf_zbee_zcl_gp_attr_gps_comm_exit_mode = -1;
-static gint hf_zbee_zcl_gp_attr_gps_comm_exit_mode_fld_on_comm_window_expire = -1;
-static gint hf_zbee_zcl_gp_attr_gps_comm_exit_mode_fld_on_pairing_success = -1;
-static gint hf_zbee_zcl_gp_attr_gps_comm_exit_mode_fld_on_gp_proxy_comm_mode = -1;
+static gint ett_zbee_zcl_gp_attr_gps_comm_exit_mode;
+static gint hf_zbee_zcl_gp_attr_gps_comm_exit_mode;
+static gint hf_zbee_zcl_gp_attr_gps_comm_exit_mode_fld_on_comm_window_expire;
+static gint hf_zbee_zcl_gp_attr_gps_comm_exit_mode_fld_on_pairing_success;
+static gint hf_zbee_zcl_gp_attr_gps_comm_exit_mode_fld_on_gp_proxy_comm_mode;
 
 /* GP gpsCommunicationMode Attribute */
-static gint ett_zbee_zcl_gp_attr_gps_communication_mode = -1;
-static gint hf_zbee_zcl_gp_attr_gps_communication_mode = -1;
-static gint hf_zbee_zcl_gp_attr_gps_communication_mode_fld_mode = -1;
+static gint ett_zbee_zcl_gp_attr_gps_communication_mode;
+static gint hf_zbee_zcl_gp_attr_gps_communication_mode;
+static gint hf_zbee_zcl_gp_attr_gps_communication_mode_fld_mode;
 
 /* GP gpsSecurityLevel Attribute */
-static gint ett_zbee_zcl_gp_attr_gps_secur_lvl = -1;
-static gint hf_zbee_zcl_gp_attr_gps_secur_lvl = -1;
-static gint hf_zbee_zcl_gp_attr_gps_secur_lvl_fld_min_gpd_secur_lvl = -1;
-static gint hf_zbee_zcl_gp_attr_gps_secur_lvl_fld_protection_with_gp_link_key = -1;
-static gint hf_zbee_zcl_gp_attr_gps_secur_lvl_fld_involve_tc = -1;
+static gint ett_zbee_zcl_gp_attr_gps_secur_lvl;
+static gint hf_zbee_zcl_gp_attr_gps_secur_lvl;
+static gint hf_zbee_zcl_gp_attr_gps_secur_lvl_fld_min_gpd_secur_lvl;
+static gint hf_zbee_zcl_gp_attr_gps_secur_lvl_fld_protection_with_gp_link_key;
+static gint hf_zbee_zcl_gp_attr_gps_secur_lvl_fld_involve_tc;
 
 /* reuse ZGPD command names */
 extern value_string_ext zbee_nwk_gp_cmd_names_ext;
@@ -15828,62 +15828,62 @@ void proto_reg_handoff_zbee_zcl_touchlink(void);
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_touchlink = -1;
-
-static int hf_zbee_zcl_touchlink_rx_cmd_id = -1;
-static int hf_zbee_zcl_touchlink_tx_cmd_id = -1;
-static int hf_zbee_zcl_touchlink_transaction_id = -1;
-static int hf_zbee_zcl_touchlink_zbee = -1;
-static int hf_zbee_zcl_touchlink_zbee_type = -1;
-static int hf_zbee_zcl_touchlink_zbee_rxidle = -1;
-static int hf_zbee_zcl_touchlink_info = -1;
-static int hf_zbee_zcl_touchlink_info_factory = -1;
-static int hf_zbee_zcl_touchlink_info_assignment = -1;
-static int hf_zbee_zcl_touchlink_info_initiator = -1;
-static int hf_zbee_zcl_touchlink_info_undefined = -1;
-static int hf_zbee_zcl_touchlink_info_profile_introp = -1;
-static int hf_zbee_zcl_touchlink_start_index = -1;
-static int hf_zbee_zcl_touchlink_ident_duration = -1;
-
-static int hf_zbee_zcl_touchlink_rssi_correction = -1;
-static int hf_zbee_zcl_touchlink_response_id = -1;
-static int hf_zbee_zcl_touchlink_ext_panid = -1;
-static int hf_zbee_zcl_touchlink_nwk_update_id = -1;
-static int hf_zbee_zcl_touchlink_channel = -1;
-static int hf_zbee_zcl_touchlink_nwk_addr = -1;
-static int hf_zbee_zcl_touchlink_ext_addr = -1;
-static int hf_zbee_zcl_touchlink_panid = -1;
-static int hf_zbee_zcl_touchlink_sub_devices = -1;
-static int hf_zbee_zcl_touchlink_total_groups = -1;
-static int hf_zbee_zcl_touchlink_endpoint = -1;
-static int hf_zbee_zcl_touchlink_profile_id = -1;
-static int hf_zbee_zcl_touchlink_device_id = -1;
-static int hf_zbee_zcl_touchlink_version = -1;
-static int hf_zbee_zcl_touchlink_group_count = -1;
-static int hf_zbee_zcl_touchlink_group_begin = -1;
-static int hf_zbee_zcl_touchlink_group_end = -1;
-static int hf_zbee_zcl_touchlink_group_type = -1;
-static int hf_zbee_zcl_touchlink_group_id = -1;
-static int hf_zbee_zcl_touchlink_addr_range_begin = -1;
-static int hf_zbee_zcl_touchlink_addr_range_end = -1;
-static int hf_zbee_zcl_touchlink_group_range_begin = -1;
-static int hf_zbee_zcl_touchlink_group_range_end = -1;
-static int hf_zbee_zcl_touchlink_key_bitmask = -1;
-static int hf_zbee_zcl_touchlink_key_bit_dev = -1;
-static int hf_zbee_zcl_touchlink_key_bit_master = -1;
-static int hf_zbee_zcl_touchlink_key_bit_cert = -1;
-static int hf_zbee_zcl_touchlink_key_index = -1;
-static int hf_zbee_zcl_touchlink_key = -1;
-static int hf_zbee_zcl_touchlink_init_addr = -1;
-static int hf_zbee_zcl_touchlink_init_eui64 = -1;
-static int hf_zbee_zcl_touchlink_status = -1;
+static int proto_zbee_zcl_touchlink;
+
+static int hf_zbee_zcl_touchlink_rx_cmd_id;
+static int hf_zbee_zcl_touchlink_tx_cmd_id;
+static int hf_zbee_zcl_touchlink_transaction_id;
+static int hf_zbee_zcl_touchlink_zbee;
+static int hf_zbee_zcl_touchlink_zbee_type;
+static int hf_zbee_zcl_touchlink_zbee_rxidle;
+static int hf_zbee_zcl_touchlink_info;
+static int hf_zbee_zcl_touchlink_info_factory;
+static int hf_zbee_zcl_touchlink_info_assignment;
+static int hf_zbee_zcl_touchlink_info_initiator;
+static int hf_zbee_zcl_touchlink_info_undefined;
+static int hf_zbee_zcl_touchlink_info_profile_introp;
+static int hf_zbee_zcl_touchlink_start_index;
+static int hf_zbee_zcl_touchlink_ident_duration;
+
+static int hf_zbee_zcl_touchlink_rssi_correction;
+static int hf_zbee_zcl_touchlink_response_id;
+static int hf_zbee_zcl_touchlink_ext_panid;
+static int hf_zbee_zcl_touchlink_nwk_update_id;
+static int hf_zbee_zcl_touchlink_channel;
+static int hf_zbee_zcl_touchlink_nwk_addr;
+static int hf_zbee_zcl_touchlink_ext_addr;
+static int hf_zbee_zcl_touchlink_panid;
+static int hf_zbee_zcl_touchlink_sub_devices;
+static int hf_zbee_zcl_touchlink_total_groups;
+static int hf_zbee_zcl_touchlink_endpoint;
+static int hf_zbee_zcl_touchlink_profile_id;
+static int hf_zbee_zcl_touchlink_device_id;
+static int hf_zbee_zcl_touchlink_version;
+static int hf_zbee_zcl_touchlink_group_count;
+static int hf_zbee_zcl_touchlink_group_begin;
+static int hf_zbee_zcl_touchlink_group_end;
+static int hf_zbee_zcl_touchlink_group_type;
+static int hf_zbee_zcl_touchlink_group_id;
+static int hf_zbee_zcl_touchlink_addr_range_begin;
+static int hf_zbee_zcl_touchlink_addr_range_end;
+static int hf_zbee_zcl_touchlink_group_range_begin;
+static int hf_zbee_zcl_touchlink_group_range_end;
+static int hf_zbee_zcl_touchlink_key_bitmask;
+static int hf_zbee_zcl_touchlink_key_bit_dev;
+static int hf_zbee_zcl_touchlink_key_bit_master;
+static int hf_zbee_zcl_touchlink_key_bit_cert;
+static int hf_zbee_zcl_touchlink_key_index;
+static int hf_zbee_zcl_touchlink_key;
+static int hf_zbee_zcl_touchlink_init_addr;
+static int hf_zbee_zcl_touchlink_init_eui64;
+static int hf_zbee_zcl_touchlink_status;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_touchlink = -1;
-static gint ett_zbee_zcl_touchlink_zbee = -1;
-static gint ett_zbee_zcl_touchlink_info = -1;
-static gint ett_zbee_zcl_touchlink_keybits = -1;
-static gint ett_zbee_zcl_touchlink_groups = -1;
+static gint ett_zbee_zcl_touchlink;
+static gint ett_zbee_zcl_touchlink_zbee;
+static gint ett_zbee_zcl_touchlink_info;
+static gint ett_zbee_zcl_touchlink_keybits;
+static gint ett_zbee_zcl_touchlink_groups;
 
 /* Command names */
 static const value_string zbee_zcl_touchlink_rx_cmd_names[] = {
diff --git a/epan/dissectors/packet-zbee-zcl-ha.c b/epan/dissectors/packet-zbee-zcl-ha.c
index 3aa7a33c98..7701314244 100644
--- a/epan/dissectors/packet-zbee-zcl-ha.c
+++ b/epan/dissectors/packet-zbee-zcl-ha.c
@@ -104,19 +104,19 @@ static void dissect_zcl_appl_idt_attr_data(proto_tree *tree, tvbuff_t *tvb, guin
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_appl_idt = -1;
+static int proto_zbee_zcl_appl_idt;
 
-static int hf_zbee_zcl_appl_idt_attr_id = -1;
-static int hf_zbee_zcl_appl_idt_company_id = -1;
-static int hf_zbee_zcl_appl_idt_brand_id = -1;
-static int hf_zbee_zcl_appl_idt_string_len = -1;
-static int hf_zbee_zcl_appl_idt_prod_type_name = -1;
-static int hf_zbee_zcl_appl_idt_prod_type_id = -1;
-static int hf_zbee_zcl_appl_idt_ceced_spec_ver = -1;
+static int hf_zbee_zcl_appl_idt_attr_id;
+static int hf_zbee_zcl_appl_idt_company_id;
+static int hf_zbee_zcl_appl_idt_brand_id;
+static int hf_zbee_zcl_appl_idt_string_len;
+static int hf_zbee_zcl_appl_idt_prod_type_name;
+static int hf_zbee_zcl_appl_idt_prod_type_id;
+static int hf_zbee_zcl_appl_idt_ceced_spec_ver;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_appl_idt = -1;
-static gint ett_zbee_zcl_appl_idt_basic = -1;
+static gint ett_zbee_zcl_appl_idt;
+static gint ett_zbee_zcl_appl_idt_basic;
 
 /* Attributes */
 static const value_string zbee_zcl_appl_idt_attr_names[] = {
@@ -405,14 +405,14 @@ static void dissect_zcl_met_idt_attr_data  (proto_tree *tree, tvbuff_t *tvb, gui
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_met_idt = -1;
+static int proto_zbee_zcl_met_idt;
 
-static int hf_zbee_zcl_met_idt_attr_id = -1;
-static int hf_zbee_zcl_met_idt_meter_type_id = -1;
-static int hf_zbee_zcl_met_idt_data_quality_id = -1;
+static int hf_zbee_zcl_met_idt_attr_id;
+static int hf_zbee_zcl_met_idt_meter_type_id;
+static int hf_zbee_zcl_met_idt_data_quality_id;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_met_idt = -1;
+static gint ett_zbee_zcl_met_idt;
 
 /* Attributes */
 static const value_string zbee_zcl_met_idt_attr_names[] = {
@@ -625,22 +625,22 @@ static void dissect_zcl_appl_evtalt_event_notif           (tvbuff_t *tvb, proto_
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_appl_evtalt = -1;
-
-static int hf_zbee_zcl_appl_evtalt_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_appl_evtalt_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_appl_evtalt_count_num = -1;
-static int hf_zbee_zcl_appl_evtalt_count_type = -1;
-static int hf_zbee_zcl_appl_evtalt_alert_id = -1;
-static int hf_zbee_zcl_appl_evtalt_category = -1;
-static int hf_zbee_zcl_appl_evtalt_status = -1;
-static int hf_zbee_zcl_appl_evtalt_reserved = -1;
-static int hf_zbee_zcl_appl_evtalt_proprietary = -1;
-static int hf_zbee_zcl_appl_evtalt_event_hdr = -1;
-static int hf_zbee_zcl_appl_evtalt_event_id = -1;
+static int proto_zbee_zcl_appl_evtalt;
+
+static int hf_zbee_zcl_appl_evtalt_srv_tx_cmd_id;
+static int hf_zbee_zcl_appl_evtalt_srv_rx_cmd_id;
+static int hf_zbee_zcl_appl_evtalt_count_num;
+static int hf_zbee_zcl_appl_evtalt_count_type;
+static int hf_zbee_zcl_appl_evtalt_alert_id;
+static int hf_zbee_zcl_appl_evtalt_category;
+static int hf_zbee_zcl_appl_evtalt_status;
+static int hf_zbee_zcl_appl_evtalt_reserved;
+static int hf_zbee_zcl_appl_evtalt_proprietary;
+static int hf_zbee_zcl_appl_evtalt_event_hdr;
+static int hf_zbee_zcl_appl_evtalt_event_id;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_appl_evtalt = -1;
+static gint ett_zbee_zcl_appl_evtalt;
 static gint ett_zbee_zcl_appl_evtalt_alerts_struct[ZBEE_ZCL_APPL_EVTALT_NUM_STRUCT_ETT];
 
 /* Server Commands Received */
@@ -982,19 +982,19 @@ static void decode_zcl_appl_stats_utc_time              (gchar *s, guint32 value
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_appl_stats = -1;
+static int proto_zbee_zcl_appl_stats;
 
-static int hf_zbee_zcl_appl_stats_attr_id = -1;
-static int hf_zbee_zcl_appl_stats_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_appl_stats_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_appl_stats_utc_time = -1;
-static int hf_zbee_zcl_appl_stats_log_length = -1;
-static int hf_zbee_zcl_appl_stats_log_payload = -1;
-static int hf_zbee_zcl_appl_stats_log_queue_size = -1;
-static int hf_zbee_zcl_appl_stats_log_id = -1;
+static int hf_zbee_zcl_appl_stats_attr_id;
+static int hf_zbee_zcl_appl_stats_srv_tx_cmd_id;
+static int hf_zbee_zcl_appl_stats_srv_rx_cmd_id;
+static int hf_zbee_zcl_appl_stats_utc_time;
+static int hf_zbee_zcl_appl_stats_log_length;
+static int hf_zbee_zcl_appl_stats_log_payload;
+static int hf_zbee_zcl_appl_stats_log_queue_size;
+static int hf_zbee_zcl_appl_stats_log_id;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_appl_stats = -1;
+static gint ett_zbee_zcl_appl_stats;
 static gint ett_zbee_zcl_appl_stats_logs[ZBEE_ZCL_APPL_STATS_NUM_LOGS_ETT];
 
 /* Attributes */
diff --git a/epan/dissectors/packet-zbee-zcl-hvac.c b/epan/dissectors/packet-zbee-zcl-hvac.c
index 7ea373dcd2..fcfb1d4a96 100644
--- a/epan/dissectors/packet-zbee-zcl-hvac.c
+++ b/epan/dissectors/packet-zbee-zcl-hvac.c
@@ -102,43 +102,43 @@ static void dissect_zcl_pump_config_control_attr_data      (proto_tree *tree, tv
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_pump_config_control = -1;
-
-static int hf_zbee_zcl_pump_config_control_attr_id = -1;
-static int hf_zbee_zcl_pump_config_control_attr_eff_opr_mode = -1;
-static int hf_zbee_zcl_pump_config_control_attr_opr_mode = -1;
-static int hf_zbee_zcl_pump_config_control_attr_eff_ctrl_mode = -1;
-static int hf_zbee_zcl_pump_config_control_attr_ctrl_mode = -1;
-static int hf_zbee_zcl_pump_config_control_status = -1;
-static int hf_zbee_zcl_pump_config_control_status_device_fault = -1;
-static int hf_zbee_zcl_pump_config_control_status_supply_fault = -1;
-static int hf_zbee_zcl_pump_config_control_status_speed_low = -1;
-static int hf_zbee_zcl_pump_config_control_status_speed_high = -1;
-static int hf_zbee_zcl_pump_config_control_status_local_override = -1;
-static int hf_zbee_zcl_pump_config_control_status_running = -1;
-static int hf_zbee_zcl_pump_config_control_status_rem_pressure = -1;
-static int hf_zbee_zcl_pump_config_control_status_rem_flow = -1;
-static int hf_zbee_zcl_pump_config_control_status_rem_temp = -1;
-static int hf_zbee_zcl_pump_config_control_alarm = -1;
-static int hf_zbee_zcl_pump_config_control_alarm_volt_too_low = -1;
-static int hf_zbee_zcl_pump_config_control_alarm_volt_too_high = -1;
-static int hf_zbee_zcl_pump_config_control_alarm_pwr_missing_phase = -1;
-static int hf_zbee_zcl_pump_config_control_alarm_press_too_low = -1;
-static int hf_zbee_zcl_pump_config_control_alarm_press_too_high = -1;
-static int hf_zbee_zcl_pump_config_control_alarm_dry_running = -1;
-static int hf_zbee_zcl_pump_config_control_alarm_mtr_temp_too_high = -1;
-static int hf_zbee_zcl_pump_config_control_alarm_pump_mtr_fatal_fail = -1;
-static int hf_zbee_zcl_pump_config_control_alarm_elec_temp_too_high = -1;
-static int hf_zbee_zcl_pump_config_control_alarm_pump_block = -1;
-static int hf_zbee_zcl_pump_config_control_alarm_sensor_fail = -1;
-static int hf_zbee_zcl_pump_config_control_alarm_elec_non_fatal_fail = -1;
-static int hf_zbee_zcl_pump_config_control_alarm_fatal_fail = -1;
-static int hf_zbee_zcl_pump_config_control_alarm_gen_fault = -1;
+static int proto_zbee_zcl_pump_config_control;
+
+static int hf_zbee_zcl_pump_config_control_attr_id;
+static int hf_zbee_zcl_pump_config_control_attr_eff_opr_mode;
+static int hf_zbee_zcl_pump_config_control_attr_opr_mode;
+static int hf_zbee_zcl_pump_config_control_attr_eff_ctrl_mode;
+static int hf_zbee_zcl_pump_config_control_attr_ctrl_mode;
+static int hf_zbee_zcl_pump_config_control_status;
+static int hf_zbee_zcl_pump_config_control_status_device_fault;
+static int hf_zbee_zcl_pump_config_control_status_supply_fault;
+static int hf_zbee_zcl_pump_config_control_status_speed_low;
+static int hf_zbee_zcl_pump_config_control_status_speed_high;
+static int hf_zbee_zcl_pump_config_control_status_local_override;
+static int hf_zbee_zcl_pump_config_control_status_running;
+static int hf_zbee_zcl_pump_config_control_status_rem_pressure;
+static int hf_zbee_zcl_pump_config_control_status_rem_flow;
+static int hf_zbee_zcl_pump_config_control_status_rem_temp;
+static int hf_zbee_zcl_pump_config_control_alarm;
+static int hf_zbee_zcl_pump_config_control_alarm_volt_too_low;
+static int hf_zbee_zcl_pump_config_control_alarm_volt_too_high;
+static int hf_zbee_zcl_pump_config_control_alarm_pwr_missing_phase;
+static int hf_zbee_zcl_pump_config_control_alarm_press_too_low;
+static int hf_zbee_zcl_pump_config_control_alarm_press_too_high;
+static int hf_zbee_zcl_pump_config_control_alarm_dry_running;
+static int hf_zbee_zcl_pump_config_control_alarm_mtr_temp_too_high;
+static int hf_zbee_zcl_pump_config_control_alarm_pump_mtr_fatal_fail;
+static int hf_zbee_zcl_pump_config_control_alarm_elec_temp_too_high;
+static int hf_zbee_zcl_pump_config_control_alarm_pump_block;
+static int hf_zbee_zcl_pump_config_control_alarm_sensor_fail;
+static int hf_zbee_zcl_pump_config_control_alarm_elec_non_fatal_fail;
+static int hf_zbee_zcl_pump_config_control_alarm_fatal_fail;
+static int hf_zbee_zcl_pump_config_control_alarm_gen_fault;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_pump_config_control = -1;
-static gint ett_zbee_zcl_pump_config_control_status = -1;
-static gint ett_zbee_zcl_pump_config_control_alarm = -1;
+static gint ett_zbee_zcl_pump_config_control;
+static gint ett_zbee_zcl_pump_config_control_status;
+static gint ett_zbee_zcl_pump_config_control_alarm;
 
 /* Attributes */
 static const value_string zbee_zcl_pump_config_control_attr_names[] = {
@@ -518,14 +518,14 @@ static void dissect_zcl_fan_control_attr_data      (proto_tree *tree, tvbuff_t *
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_fan_control = -1;
+static int proto_zbee_zcl_fan_control;
 
-static int hf_zbee_zcl_fan_control_attr_id = -1;
-static int hf_zbee_zcl_fan_control_attr_fan_mode = -1;
-static int hf_zbee_zcl_fan_control_attr_fan_mode_seq = -1;
+static int hf_zbee_zcl_fan_control_attr_id;
+static int hf_zbee_zcl_fan_control_attr_fan_mode;
+static int hf_zbee_zcl_fan_control_attr_fan_mode_seq;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_fan_control = -1;
+static gint ett_zbee_zcl_fan_control;
 
 /* Attributes */
 static const value_string zbee_zcl_fan_control_attr_names[] = {
@@ -706,15 +706,15 @@ static void dissect_zcl_dehumidification_control_attr_data      (proto_tree *tre
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_dehumidification_control = -1;
+static int proto_zbee_zcl_dehumidification_control;
 
-static int hf_zbee_zcl_dehumidification_control_attr_id = -1;
-static int hf_zbee_zcl_dehumidification_control_attr_rel_hum_mode = -1;
-static int hf_zbee_zcl_dehumidification_control_attr_dehum_lockout = -1;
-static int hf_zbee_zcl_dehumidification_control_attr_rel_hum_display = -1;
+static int hf_zbee_zcl_dehumidification_control_attr_id;
+static int hf_zbee_zcl_dehumidification_control_attr_rel_hum_mode;
+static int hf_zbee_zcl_dehumidification_control_attr_dehum_lockout;
+static int hf_zbee_zcl_dehumidification_control_attr_rel_hum_display;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_dehumidification_control = -1;
+static gint ett_zbee_zcl_dehumidification_control;
 
 /* Attributes */
 static const value_string zbee_zcl_dehumidification_control_attr_names[] = {
@@ -908,14 +908,14 @@ static void dissect_zcl_thermostat_ui_config_attr_data      (proto_tree *tree, t
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_thermostat_ui_config = -1;
+static int proto_zbee_zcl_thermostat_ui_config;
 
-static int hf_zbee_zcl_thermostat_ui_config_attr_id = -1;
-static int hf_zbee_zcl_thermostat_ui_config_attr_temp_disp_mode = -1;
-static int hf_zbee_zcl_thermostat_ui_config_attr_keypad_lockout = -1;
+static int hf_zbee_zcl_thermostat_ui_config_attr_id;
+static int hf_zbee_zcl_thermostat_ui_config_attr_temp_disp_mode;
+static int hf_zbee_zcl_thermostat_ui_config_attr_keypad_lockout;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_thermostat_ui_config = -1;
+static gint ett_zbee_zcl_thermostat_ui_config;
 
 /* Attributes */
 static const value_string zbee_zcl_thermostat_ui_config_attr_names[] = {
diff --git a/epan/dissectors/packet-zbee-zcl-lighting.c b/epan/dissectors/packet-zbee-zcl-lighting.c
index ca9ccd9458..90a865d95c 100644
--- a/epan/dissectors/packet-zbee-zcl-lighting.c
+++ b/epan/dissectors/packet-zbee-zcl-lighting.c
@@ -147,99 +147,99 @@ static void dissect_zcl_color_control_attr_data
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_color_control = -1;
-
-static int hf_zbee_zcl_color_control_attr_id = -1;
-static int hf_zbee_zcl_color_control_attr_current_hue = -1;
-static int hf_zbee_zcl_color_control_attr_current_saturation = -1;
-static int hf_zbee_zcl_color_control_attr_remaining_time = -1;
-static int hf_zbee_zcl_color_control_attr_color_x = -1;
-static int hf_zbee_zcl_color_control_attr_color_y = -1;
-static int hf_zbee_zcl_color_control_attr_drift_compensation = -1;
-static int hf_zbee_zcl_color_control_attr_color_temperature = -1;
-static int hf_zbee_zcl_color_control_attr_color_mode = -1;
-static int hf_zbee_zcl_color_control_attr_nr_of_primaries = -1;
-static int hf_zbee_zcl_color_control_attr_primary_1_x = -1;
-static int hf_zbee_zcl_color_control_attr_primary_1_y = -1;
-static int hf_zbee_zcl_color_control_attr_primary_1_intensity = -1;
-static int hf_zbee_zcl_color_control_attr_primary_2_x = -1;
-static int hf_zbee_zcl_color_control_attr_primary_2_y = -1;
-static int hf_zbee_zcl_color_control_attr_primary_2_intensity = -1;
-static int hf_zbee_zcl_color_control_attr_primary_3_x = -1;
-static int hf_zbee_zcl_color_control_attr_primary_3_y = -1;
-static int hf_zbee_zcl_color_control_attr_primary_3_intensity = -1;
-static int hf_zbee_zcl_color_control_attr_primary_4_x = -1;
-static int hf_zbee_zcl_color_control_attr_primary_4_y = -1;
-static int hf_zbee_zcl_color_control_attr_primary_4_intensity = -1;
-static int hf_zbee_zcl_color_control_attr_primary_5_x = -1;
-static int hf_zbee_zcl_color_control_attr_primary_5_y = -1;
-static int hf_zbee_zcl_color_control_attr_primary_5_intensity = -1;
-static int hf_zbee_zcl_color_control_attr_primary_6_x = -1;
-static int hf_zbee_zcl_color_control_attr_primary_6_y = -1;
-static int hf_zbee_zcl_color_control_attr_primary_6_intensity = -1;
-static int hf_zbee_zcl_color_control_attr_white_point_x = -1;
-static int hf_zbee_zcl_color_control_attr_white_point_y = -1;
-static int hf_zbee_zcl_color_control_attr_red_x = -1;
-static int hf_zbee_zcl_color_control_attr_red_y = -1;
-static int hf_zbee_zcl_color_control_attr_red_intensity = -1;
-static int hf_zbee_zcl_color_control_attr_green_x = -1;
-static int hf_zbee_zcl_color_control_attr_green_y = -1;
-static int hf_zbee_zcl_color_control_attr_green_intensity = -1;
-static int hf_zbee_zcl_color_control_attr_blue_x = -1;
-static int hf_zbee_zcl_color_control_attr_blue_y = -1;
-static int hf_zbee_zcl_color_control_attr_blue_intensity = -1;
-static int hf_zbee_zcl_color_control_attr_enhanced_current_hue = -1;
-static int hf_zbee_zcl_color_control_attr_enhanced_color_mode = -1;
-static int hf_zbee_zcl_color_control_attr_color_loop_active = -1;
-static int hf_zbee_zcl_color_control_attr_color_loop_direction = -1;
-static int hf_zbee_zcl_color_control_attr_color_loop_time = -1;
-static int hf_zbee_zcl_color_control_attr_color_loop_start_enhanced_hue = -1;
-static int hf_zbee_zcl_color_control_attr_color_loop_stored_enhanced_hue = -1;
-static int hf_zbee_zcl_color_control_attr_color_capabilities = -1;
-static int hf_zbee_zcl_color_control_attr_color_capabilities_hs = -1;
-static int hf_zbee_zcl_color_control_attr_color_capabilities_ehs = -1;
-static int hf_zbee_zcl_color_control_attr_color_capabilities_loop = -1;
-static int hf_zbee_zcl_color_control_attr_color_capabilities_xy = -1;
-static int hf_zbee_zcl_color_control_attr_color_capabilities_ct = -1;
-static int hf_zbee_zcl_color_control_attr_color_temperature_phys_min = -1;
-static int hf_zbee_zcl_color_control_attr_color_temperature_phys_max = -1;
-static int hf_zbee_zcl_color_control_attr_startup_color_temperature = -1;
-static int hf_zbee_zcl_color_control_hue = -1;
-static int hf_zbee_zcl_color_control_direction = -1;
-static int hf_zbee_zcl_color_control_transit_time = -1;
-static int hf_zbee_zcl_color_control_move_mode = -1;
-static int hf_zbee_zcl_color_control_rate = -1;
-static int hf_zbee_zcl_color_control_step_mode = -1;
-static int hf_zbee_zcl_color_control_step_size = -1;
-static int hf_zbee_zcl_color_control_transit_time_8bit = -1;
-static int hf_zbee_zcl_color_control_saturation = -1;
-static int hf_zbee_zcl_color_control_color_X = -1;
-static int hf_zbee_zcl_color_control_color_Y = -1;
-static int hf_zbee_zcl_color_control_rate_X = -1;
-static int hf_zbee_zcl_color_control_rate_Y = -1;
-static int hf_zbee_zcl_color_control_step_X = -1;
-static int hf_zbee_zcl_color_control_step_Y = -1;
-static int hf_zbee_zcl_color_control_color_temp = -1;
-static int hf_zbee_zcl_color_control_enhanced_hue = -1;
-static int hf_zbee_zcl_color_control_enhanced_rate = -1;
-static int hf_zbee_zcl_color_control_enhanced_step_size = -1;
-static int hf_zbee_zcl_color_control_color_loop_update_flags = -1;
-static int hf_zbee_zcl_color_control_color_loop_update_action = -1;
-static int hf_zbee_zcl_color_control_color_loop_update_direction = -1;
-static int hf_zbee_zcl_color_control_color_loop_update_time = -1;
-static int hf_zbee_zcl_color_control_color_loop_update_start_hue = -1;
-static int hf_zbee_zcl_color_control_color_loop_action = -1;
-static int hf_zbee_zcl_color_control_color_loop_direction = -1;
-static int hf_zbee_zcl_color_control_color_loop_time = -1;
-static int hf_zbee_zcl_color_control_color_loop_start_hue = -1;
-static int hf_zbee_zcl_color_control_color_temp_min = -1;
-static int hf_zbee_zcl_color_control_color_temp_max = -1;
-static int hf_zbee_zcl_color_control_srv_rx_cmd_id = -1;
+static int proto_zbee_zcl_color_control;
+
+static int hf_zbee_zcl_color_control_attr_id;
+static int hf_zbee_zcl_color_control_attr_current_hue;
+static int hf_zbee_zcl_color_control_attr_current_saturation;
+static int hf_zbee_zcl_color_control_attr_remaining_time;
+static int hf_zbee_zcl_color_control_attr_color_x;
+static int hf_zbee_zcl_color_control_attr_color_y;
+static int hf_zbee_zcl_color_control_attr_drift_compensation;
+static int hf_zbee_zcl_color_control_attr_color_temperature;
+static int hf_zbee_zcl_color_control_attr_color_mode;
+static int hf_zbee_zcl_color_control_attr_nr_of_primaries;
+static int hf_zbee_zcl_color_control_attr_primary_1_x;
+static int hf_zbee_zcl_color_control_attr_primary_1_y;
+static int hf_zbee_zcl_color_control_attr_primary_1_intensity;
+static int hf_zbee_zcl_color_control_attr_primary_2_x;
+static int hf_zbee_zcl_color_control_attr_primary_2_y;
+static int hf_zbee_zcl_color_control_attr_primary_2_intensity;
+static int hf_zbee_zcl_color_control_attr_primary_3_x;
+static int hf_zbee_zcl_color_control_attr_primary_3_y;
+static int hf_zbee_zcl_color_control_attr_primary_3_intensity;
+static int hf_zbee_zcl_color_control_attr_primary_4_x;
+static int hf_zbee_zcl_color_control_attr_primary_4_y;
+static int hf_zbee_zcl_color_control_attr_primary_4_intensity;
+static int hf_zbee_zcl_color_control_attr_primary_5_x;
+static int hf_zbee_zcl_color_control_attr_primary_5_y;
+static int hf_zbee_zcl_color_control_attr_primary_5_intensity;
+static int hf_zbee_zcl_color_control_attr_primary_6_x;
+static int hf_zbee_zcl_color_control_attr_primary_6_y;
+static int hf_zbee_zcl_color_control_attr_primary_6_intensity;
+static int hf_zbee_zcl_color_control_attr_white_point_x;
+static int hf_zbee_zcl_color_control_attr_white_point_y;
+static int hf_zbee_zcl_color_control_attr_red_x;
+static int hf_zbee_zcl_color_control_attr_red_y;
+static int hf_zbee_zcl_color_control_attr_red_intensity;
+static int hf_zbee_zcl_color_control_attr_green_x;
+static int hf_zbee_zcl_color_control_attr_green_y;
+static int hf_zbee_zcl_color_control_attr_green_intensity;
+static int hf_zbee_zcl_color_control_attr_blue_x;
+static int hf_zbee_zcl_color_control_attr_blue_y;
+static int hf_zbee_zcl_color_control_attr_blue_intensity;
+static int hf_zbee_zcl_color_control_attr_enhanced_current_hue;
+static int hf_zbee_zcl_color_control_attr_enhanced_color_mode;
+static int hf_zbee_zcl_color_control_attr_color_loop_active;
+static int hf_zbee_zcl_color_control_attr_color_loop_direction;
+static int hf_zbee_zcl_color_control_attr_color_loop_time;
+static int hf_zbee_zcl_color_control_attr_color_loop_start_enhanced_hue;
+static int hf_zbee_zcl_color_control_attr_color_loop_stored_enhanced_hue;
+static int hf_zbee_zcl_color_control_attr_color_capabilities;
+static int hf_zbee_zcl_color_control_attr_color_capabilities_hs;
+static int hf_zbee_zcl_color_control_attr_color_capabilities_ehs;
+static int hf_zbee_zcl_color_control_attr_color_capabilities_loop;
+static int hf_zbee_zcl_color_control_attr_color_capabilities_xy;
+static int hf_zbee_zcl_color_control_attr_color_capabilities_ct;
+static int hf_zbee_zcl_color_control_attr_color_temperature_phys_min;
+static int hf_zbee_zcl_color_control_attr_color_temperature_phys_max;
+static int hf_zbee_zcl_color_control_attr_startup_color_temperature;
+static int hf_zbee_zcl_color_control_hue;
+static int hf_zbee_zcl_color_control_direction;
+static int hf_zbee_zcl_color_control_transit_time;
+static int hf_zbee_zcl_color_control_move_mode;
+static int hf_zbee_zcl_color_control_rate;
+static int hf_zbee_zcl_color_control_step_mode;
+static int hf_zbee_zcl_color_control_step_size;
+static int hf_zbee_zcl_color_control_transit_time_8bit;
+static int hf_zbee_zcl_color_control_saturation;
+static int hf_zbee_zcl_color_control_color_X;
+static int hf_zbee_zcl_color_control_color_Y;
+static int hf_zbee_zcl_color_control_rate_X;
+static int hf_zbee_zcl_color_control_rate_Y;
+static int hf_zbee_zcl_color_control_step_X;
+static int hf_zbee_zcl_color_control_step_Y;
+static int hf_zbee_zcl_color_control_color_temp;
+static int hf_zbee_zcl_color_control_enhanced_hue;
+static int hf_zbee_zcl_color_control_enhanced_rate;
+static int hf_zbee_zcl_color_control_enhanced_step_size;
+static int hf_zbee_zcl_color_control_color_loop_update_flags;
+static int hf_zbee_zcl_color_control_color_loop_update_action;
+static int hf_zbee_zcl_color_control_color_loop_update_direction;
+static int hf_zbee_zcl_color_control_color_loop_update_time;
+static int hf_zbee_zcl_color_control_color_loop_update_start_hue;
+static int hf_zbee_zcl_color_control_color_loop_action;
+static int hf_zbee_zcl_color_control_color_loop_direction;
+static int hf_zbee_zcl_color_control_color_loop_time;
+static int hf_zbee_zcl_color_control_color_loop_start_hue;
+static int hf_zbee_zcl_color_control_color_temp_min;
+static int hf_zbee_zcl_color_control_color_temp_max;
+static int hf_zbee_zcl_color_control_srv_rx_cmd_id;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_color_control = -1;
-static gint ett_zbee_zcl_color_control_color_capabilities = -1;
-static gint ett_zbee_zcl_color_control_color_loop_settings = -1;
+static gint ett_zbee_zcl_color_control;
+static gint ett_zbee_zcl_color_control_color_capabilities;
+static gint ett_zbee_zcl_color_control_color_loop_settings;
 
 /* Attributes */
 static const value_string zbee_zcl_color_control_attr_names[] = {
@@ -1640,19 +1640,19 @@ static void dissect_zcl_ballast_configuration_attr_data      (proto_tree *tree,
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_ballast_configuration = -1;
+static int proto_zbee_zcl_ballast_configuration;
 
-static int hf_zbee_zcl_ballast_configuration_attr_id = -1;
-static int hf_zbee_zcl_ballast_configuration_status = -1;
-static int hf_zbee_zcl_ballast_configuration_status_non_operational = -1;
-static int hf_zbee_zcl_ballast_configuration_status_lamp_not_in_socket = -1;
-static int hf_zbee_zcl_ballast_configuration_lamp_alarm_mode = -1;
-static int hf_zbee_zcl_ballast_configuration_lamp_alarm_mode_lamp_burn_hours = -1;
+static int hf_zbee_zcl_ballast_configuration_attr_id;
+static int hf_zbee_zcl_ballast_configuration_status;
+static int hf_zbee_zcl_ballast_configuration_status_non_operational;
+static int hf_zbee_zcl_ballast_configuration_status_lamp_not_in_socket;
+static int hf_zbee_zcl_ballast_configuration_lamp_alarm_mode;
+static int hf_zbee_zcl_ballast_configuration_lamp_alarm_mode_lamp_burn_hours;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_ballast_configuration = -1;
-static gint ett_zbee_zcl_ballast_configuration_status = -1;
-static gint ett_zbee_zcl_ballast_configuration_lamp_alarm_mode = -1;
+static gint ett_zbee_zcl_ballast_configuration;
+static gint ett_zbee_zcl_ballast_configuration_status;
+static gint ett_zbee_zcl_ballast_configuration_lamp_alarm_mode;
 
 /* Attributes */
 static const value_string zbee_zcl_ballast_configuration_attr_names[] = {
diff --git a/epan/dissectors/packet-zbee-zcl-meas-sensing.c b/epan/dissectors/packet-zbee-zcl-meas-sensing.c
index 7a4b95bc12..9bbadc5e58 100644
--- a/epan/dissectors/packet-zbee-zcl-meas-sensing.c
+++ b/epan/dissectors/packet-zbee-zcl-meas-sensing.c
@@ -82,17 +82,17 @@ static void decode_illum_meas_tolerance          (gchar *s, guint16 value);
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_illum_meas = -1;
+static int proto_zbee_zcl_illum_meas;
 
-static int hf_zbee_zcl_illum_meas_attr_id = -1;
-static int hf_zbee_zcl_illum_meas_measured_value = -1;
-static int hf_zbee_zcl_illum_meas_min_measured_value = -1;
-static int hf_zbee_zcl_illum_meas_max_measured_value = -1;
-static int hf_zbee_zcl_illum_meas_tolerance = -1;
-static int hf_zbee_zcl_illum_meas_sensor_type = -1;
+static int hf_zbee_zcl_illum_meas_attr_id;
+static int hf_zbee_zcl_illum_meas_measured_value;
+static int hf_zbee_zcl_illum_meas_min_measured_value;
+static int hf_zbee_zcl_illum_meas_max_measured_value;
+static int hf_zbee_zcl_illum_meas_tolerance;
+static int hf_zbee_zcl_illum_meas_sensor_type;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_illum_meas = -1;
+static gint ett_zbee_zcl_illum_meas;
 
 /* Attributes */
 static const value_string zbee_zcl_illum_meas_attr_names[] = {
@@ -365,15 +365,15 @@ static void decode_illum_level_sen_target_level                 (gchar *s, guint
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_illum_level_sen = -1;
+static int proto_zbee_zcl_illum_level_sen;
 
-static int hf_zbee_zcl_illum_level_sen_attr_id = -1;
-static int hf_zbee_zcl_illum_level_sen_level_status = -1;
-static int hf_zbee_zcl_illum_level_sen_light_sensor_type = -1;
-static int hf_zbee_zcl_illum_level_sen_illum_target_level = -1;
+static int hf_zbee_zcl_illum_level_sen_attr_id;
+static int hf_zbee_zcl_illum_level_sen_level_status;
+static int hf_zbee_zcl_illum_level_sen_light_sensor_type;
+static int hf_zbee_zcl_illum_level_sen_illum_target_level;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_illum_level_sen = -1;
+static gint ett_zbee_zcl_illum_level_sen;
 
 /* Attributes */
 static const value_string zbee_zcl_illum_level_sen_attr_names[] = {
@@ -586,16 +586,16 @@ static void decode_temp_meas_tolerance          (gchar *s, guint16 value);
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_temp_meas = -1;
+static int proto_zbee_zcl_temp_meas;
 
-static int hf_zbee_zcl_temp_meas_attr_id = -1;
-static int hf_zbee_zcl_temp_meas_measured_value = -1;
-static int hf_zbee_zcl_temp_meas_min_measured_value = -1;
-static int hf_zbee_zcl_temp_meas_max_measured_value = -1;
-static int hf_zbee_zcl_temp_meas_tolerance = -1;
+static int hf_zbee_zcl_temp_meas_attr_id;
+static int hf_zbee_zcl_temp_meas_measured_value;
+static int hf_zbee_zcl_temp_meas_min_measured_value;
+static int hf_zbee_zcl_temp_meas_max_measured_value;
+static int hf_zbee_zcl_temp_meas_tolerance;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_temp_meas = -1;
+static gint ett_zbee_zcl_temp_meas;
 
 /* Attributes */
 static const value_string zbee_zcl_temp_meas_attr_names[] = {
@@ -861,21 +861,21 @@ static void decode_press_meas_tolerance          (gchar *s, guint16 value);
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_press_meas = -1;
-
-static int hf_zbee_zcl_press_meas_attr_id = -1;
-static int hf_zbee_zcl_press_meas_measured_value = -1;
-static int hf_zbee_zcl_press_meas_min_measured_value = -1;
-static int hf_zbee_zcl_press_meas_max_measured_value = -1;
-static int hf_zbee_zcl_press_meas_tolerance = -1;
-static int hf_zbee_zcl_press_meas_scaled_value = -1;
-static int hf_zbee_zcl_press_meas_min_scaled_value = -1;
-static int hf_zbee_zcl_press_meas_max_scaled_value = -1;
-static int hf_zbee_zcl_press_meas_scaled_tolerance = -1;
-static int hf_zbee_zcl_press_meas_scale = -1;
+static int proto_zbee_zcl_press_meas;
+
+static int hf_zbee_zcl_press_meas_attr_id;
+static int hf_zbee_zcl_press_meas_measured_value;
+static int hf_zbee_zcl_press_meas_min_measured_value;
+static int hf_zbee_zcl_press_meas_max_measured_value;
+static int hf_zbee_zcl_press_meas_tolerance;
+static int hf_zbee_zcl_press_meas_scaled_value;
+static int hf_zbee_zcl_press_meas_min_scaled_value;
+static int hf_zbee_zcl_press_meas_max_scaled_value;
+static int hf_zbee_zcl_press_meas_scaled_tolerance;
+static int hf_zbee_zcl_press_meas_scale;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_press_meas = -1;
+static gint ett_zbee_zcl_press_meas;
 
 /* Attributes */
 static const value_string zbee_zcl_press_meas_attr_names[] = {
@@ -1183,16 +1183,16 @@ static void decode_flow_meas_tolerance          (gchar *s, guint16 value);
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_flow_meas = -1;
+static int proto_zbee_zcl_flow_meas;
 
-static int hf_zbee_zcl_flow_meas_attr_id = -1;
-static int hf_zbee_zcl_flow_meas_measured_value = -1;
-static int hf_zbee_zcl_flow_meas_min_measured_value = -1;
-static int hf_zbee_zcl_flow_meas_max_measured_value = -1;
-static int hf_zbee_zcl_flow_meas_tolerance = -1;
+static int hf_zbee_zcl_flow_meas_attr_id;
+static int hf_zbee_zcl_flow_meas_measured_value;
+static int hf_zbee_zcl_flow_meas_min_measured_value;
+static int hf_zbee_zcl_flow_meas_max_measured_value;
+static int hf_zbee_zcl_flow_meas_tolerance;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_flow_meas = -1;
+static gint ett_zbee_zcl_flow_meas;
 
 /* Attributes */
 static const value_string zbee_zcl_flow_meas_attr_names[] = {
@@ -1454,16 +1454,16 @@ static void decode_relhum_meas_tolerance          (gchar *s, guint16 value);
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_relhum_meas = -1;
+static int proto_zbee_zcl_relhum_meas;
 
-static int hf_zbee_zcl_relhum_meas_attr_id = -1;
-static int hf_zbee_zcl_relhum_meas_measured_value = -1;
-static int hf_zbee_zcl_relhum_meas_min_measured_value = -1;
-static int hf_zbee_zcl_relhum_meas_max_measured_value = -1;
-static int hf_zbee_zcl_relhum_meas_tolerance = -1;
+static int hf_zbee_zcl_relhum_meas_attr_id;
+static int hf_zbee_zcl_relhum_meas_measured_value;
+static int hf_zbee_zcl_relhum_meas_min_measured_value;
+static int hf_zbee_zcl_relhum_meas_max_measured_value;
+static int hf_zbee_zcl_relhum_meas_tolerance;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_relhum_meas = -1;
+static gint ett_zbee_zcl_relhum_meas;
 
 /* Attributes */
 static const value_string zbee_zcl_relhum_meas_attr_names[] = {
@@ -1714,16 +1714,16 @@ static void dissect_zcl_occ_sen_attr_data               (proto_tree *tree, tvbuf
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_occ_sen = -1;
+static int proto_zbee_zcl_occ_sen;
 
-static int hf_zbee_zcl_occ_sen_attr_id = -1;
-static int hf_zbee_zcl_occ_sen_occupancy = -1;
-static int hf_zbee_zcl_occ_sen_occupancy_occupied = -1;
-static int hf_zbee_zcl_occ_sen_occ_sensor_type = -1;
+static int hf_zbee_zcl_occ_sen_attr_id;
+static int hf_zbee_zcl_occ_sen_occupancy;
+static int hf_zbee_zcl_occ_sen_occupancy_occupied;
+static int hf_zbee_zcl_occ_sen_occ_sensor_type;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_occ_sen = -1;
-static gint ett_zbee_zcl_occ_sen_occupancy = -1;
+static gint ett_zbee_zcl_occ_sen;
+static gint ett_zbee_zcl_occ_sen_occupancy;
 
 /* Attributes */
 static const value_string zbee_zcl_occ_sen_attr_names[] = {
@@ -2049,22 +2049,22 @@ static void dissect_zcl_elec_mes_get_measurement_profile_info_response  (tvbuff_
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_elec_mes = -1;
-
-static int hf_zbee_zcl_elec_mes_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_elec_mes_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_elec_mes_attr_id = -1;
-static int hf_zbee_zcl_elec_mes_start_time = -1;
-static int hf_zbee_zcl_elec_mes_number_of_intervals = -1;
-static int hf_zbee_zcl_elec_mes_profile_count = -1;
-static int hf_zbee_zcl_elec_mes_profile_interval_period = -1;
-static int hf_zbee_zcl_elec_mes_max_number_of_intervals = -1;
-static int hf_zbee_zcl_elec_mes_status = -1;
-static int hf_zbee_zcl_elec_mes_number_of_intervals_delivered = -1;
-static int hf_zbee_zcl_elec_mes_intervals = -1;
+static int proto_zbee_zcl_elec_mes;
+
+static int hf_zbee_zcl_elec_mes_srv_tx_cmd_id;
+static int hf_zbee_zcl_elec_mes_srv_rx_cmd_id;
+static int hf_zbee_zcl_elec_mes_attr_id;
+static int hf_zbee_zcl_elec_mes_start_time;
+static int hf_zbee_zcl_elec_mes_number_of_intervals;
+static int hf_zbee_zcl_elec_mes_profile_count;
+static int hf_zbee_zcl_elec_mes_profile_interval_period;
+static int hf_zbee_zcl_elec_mes_max_number_of_intervals;
+static int hf_zbee_zcl_elec_mes_status;
+static int hf_zbee_zcl_elec_mes_number_of_intervals_delivered;
+static int hf_zbee_zcl_elec_mes_intervals;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_elec_mes = -1;
+static gint ett_zbee_zcl_elec_mes;
 
 /* Attributes */
 static const value_string zbee_zcl_elec_mes_attr_names[] = {
diff --git a/epan/dissectors/packet-zbee-zcl-misc.c b/epan/dissectors/packet-zbee-zcl-misc.c
index a7476b1c18..a3b93c8200 100644
--- a/epan/dissectors/packet-zbee-zcl-misc.c
+++ b/epan/dissectors/packet-zbee-zcl-misc.c
@@ -194,34 +194,34 @@ static const value_string zbee_zcl_thermostat_setpoint_mode_names[] = {
 /*************************/
 /* Global Variables      */
 /*************************/
-static int proto_zbee_zcl_thermostat = -1;
-
-static int hf_zbee_zcl_thermostat_attr_id = -1;
-static int hf_zbee_zcl_thermostat_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_thermostat_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_thermostat_setpoint_mode = -1;
-static int hf_zbee_zcl_thermostat_setpoint_amount = -1;
-
-static int hf_zbee_zcl_thermostat_schedule_num_trans = -1;
-static int hf_zbee_zcl_thermostat_schedule_day_sequence = -1;
-static int hf_zbee_zcl_thermostat_schedule_day_sunday = -1;
-static int hf_zbee_zcl_thermostat_schedule_day_monday = -1;
-static int hf_zbee_zcl_thermostat_schedule_day_tuesday = -1;
-static int hf_zbee_zcl_thermostat_schedule_day_wednesday = -1;
-static int hf_zbee_zcl_thermostat_schedule_day_thursday = -1;
-static int hf_zbee_zcl_thermostat_schedule_day_friday = -1;
-static int hf_zbee_zcl_thermostat_schedule_day_saturday = -1;
-static int hf_zbee_zcl_thermostat_schedule_day_vacation = -1;
-static int hf_zbee_zcl_thermostat_schedule_mode_sequence = -1;
-static int hf_zbee_zcl_thermostat_schedule_mode_heat = -1;
-static int hf_zbee_zcl_thermostat_schedule_mode_cool = -1;
-static int hf_zbee_zcl_thermostat_schedule_time = -1;
-static int hf_zbee_zcl_thermostat_schedule_heat = -1;
-static int hf_zbee_zcl_thermostat_schedule_cool = -1;
-
-static gint ett_zbee_zcl_thermostat = -1;
-static gint ett_zbee_zcl_thermostat_schedule_days = -1;
-static gint ett_zbee_zcl_thermostat_schedule_mode = -1;
+static int proto_zbee_zcl_thermostat;
+
+static int hf_zbee_zcl_thermostat_attr_id;
+static int hf_zbee_zcl_thermostat_srv_rx_cmd_id;
+static int hf_zbee_zcl_thermostat_srv_tx_cmd_id;
+static int hf_zbee_zcl_thermostat_setpoint_mode;
+static int hf_zbee_zcl_thermostat_setpoint_amount;
+
+static int hf_zbee_zcl_thermostat_schedule_num_trans;
+static int hf_zbee_zcl_thermostat_schedule_day_sequence;
+static int hf_zbee_zcl_thermostat_schedule_day_sunday;
+static int hf_zbee_zcl_thermostat_schedule_day_monday;
+static int hf_zbee_zcl_thermostat_schedule_day_tuesday;
+static int hf_zbee_zcl_thermostat_schedule_day_wednesday;
+static int hf_zbee_zcl_thermostat_schedule_day_thursday;
+static int hf_zbee_zcl_thermostat_schedule_day_friday;
+static int hf_zbee_zcl_thermostat_schedule_day_saturday;
+static int hf_zbee_zcl_thermostat_schedule_day_vacation;
+static int hf_zbee_zcl_thermostat_schedule_mode_sequence;
+static int hf_zbee_zcl_thermostat_schedule_mode_heat;
+static int hf_zbee_zcl_thermostat_schedule_mode_cool;
+static int hf_zbee_zcl_thermostat_schedule_time;
+static int hf_zbee_zcl_thermostat_schedule_heat;
+static int hf_zbee_zcl_thermostat_schedule_cool;
+
+static gint ett_zbee_zcl_thermostat;
+static gint ett_zbee_zcl_thermostat_schedule_days;
+static gint ett_zbee_zcl_thermostat_schedule_mode;
 
 /*************************/
 /* Function Declarations */
@@ -678,27 +678,27 @@ static const value_string zbee_zcl_ias_zone_enroll_code_names[] = {
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_ias_zone = -1;
-
-static int hf_zbee_zcl_ias_zone_attr_id = -1;
-static int hf_zbee_zcl_ias_zone_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_ias_zone_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_ias_zone_enroll_code = -1;
-static int hf_zbee_zcl_ias_zone_zone_id = -1;
-static int hf_zbee_zcl_ias_zone_state = -1;
-static int hf_zbee_zcl_ias_zone_type = -1;
-static int hf_zbee_zcl_ias_zone_status = -1;
-static int hf_zbee_zcl_ias_zone_delay = -1;
-static int hf_zbee_zcl_ias_zone_ext_status = -1;
-static int hf_zbee_zcl_ias_zone_manufacturer_code = -1;
-static int hf_zbee_zcl_ias_zone_status_ac_mains = -1;
-static int hf_zbee_zcl_ias_zone_status_alarm1 = -1;
-static int hf_zbee_zcl_ias_zone_status_alarm2 = -1;
-static int hf_zbee_zcl_ias_zone_status_battery = -1;
-static int hf_zbee_zcl_ias_zone_status_restore_reports = -1;
-static int hf_zbee_zcl_ias_zone_status_supervision_reports = -1;
-static int hf_zbee_zcl_ias_zone_status_tamper = -1;
-static int hf_zbee_zcl_ias_zone_status_trouble = -1;
+static int proto_zbee_zcl_ias_zone;
+
+static int hf_zbee_zcl_ias_zone_attr_id;
+static int hf_zbee_zcl_ias_zone_srv_rx_cmd_id;
+static int hf_zbee_zcl_ias_zone_srv_tx_cmd_id;
+static int hf_zbee_zcl_ias_zone_enroll_code;
+static int hf_zbee_zcl_ias_zone_zone_id;
+static int hf_zbee_zcl_ias_zone_state;
+static int hf_zbee_zcl_ias_zone_type;
+static int hf_zbee_zcl_ias_zone_status;
+static int hf_zbee_zcl_ias_zone_delay;
+static int hf_zbee_zcl_ias_zone_ext_status;
+static int hf_zbee_zcl_ias_zone_manufacturer_code;
+static int hf_zbee_zcl_ias_zone_status_ac_mains;
+static int hf_zbee_zcl_ias_zone_status_alarm1;
+static int hf_zbee_zcl_ias_zone_status_alarm2;
+static int hf_zbee_zcl_ias_zone_status_battery;
+static int hf_zbee_zcl_ias_zone_status_restore_reports;
+static int hf_zbee_zcl_ias_zone_status_supervision_reports;
+static int hf_zbee_zcl_ias_zone_status_tamper;
+static int hf_zbee_zcl_ias_zone_status_trouble;
 
 static const true_false_string tfs_ac_mains = {
     "AC/Mains fault",
@@ -735,8 +735,8 @@ static const true_false_string tfs_trouble_failure = {
     "OK"
 };
 
-static gint ett_zbee_zcl_ias_zone = -1;
-static gint ett_zbee_zcl_ias_zone_status = -1;
+static gint ett_zbee_zcl_ias_zone;
+static gint ett_zbee_zcl_ias_zone_status;
 
 /*************************/
 /* Function Declarations */
diff --git a/epan/dissectors/packet-zbee-zcl-sas.c b/epan/dissectors/packet-zbee-zcl-sas.c
index 61dfbea90c..cfa0250e47 100644
--- a/epan/dissectors/packet-zbee-zcl-sas.c
+++ b/epan/dissectors/packet-zbee-zcl-sas.c
@@ -67,24 +67,24 @@ static void dissect_zcl_ias_ace_get_zone_info_res       (tvbuff_t *tvb, proto_tr
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_ias_ace = -1;
-
-static int hf_zbee_zcl_ias_ace_arm_mode = -1;
-static int hf_zbee_zcl_ias_ace_no_of_zones = -1;
-static int hf_zbee_zcl_ias_ace_zone_id = -1;
-static int hf_zbee_zcl_ias_ace_zone_id_list = -1;
-static int hf_zbee_zcl_ias_ace_arm_notif = -1;
-static int hf_zbee_zcl_ias_ace_zone_id_map_section = -1;
-static int hf_zbee_zcl_ias_ace_zone_type = -1;
-static int hf_zbee_zcl_ias_ace_ieee_add = -1;
-static int hf_zbee_zcl_ias_ace_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_ias_ace_srv_tx_cmd_id = -1;
+static int proto_zbee_zcl_ias_ace;
+
+static int hf_zbee_zcl_ias_ace_arm_mode;
+static int hf_zbee_zcl_ias_ace_no_of_zones;
+static int hf_zbee_zcl_ias_ace_zone_id;
+static int hf_zbee_zcl_ias_ace_zone_id_list;
+static int hf_zbee_zcl_ias_ace_arm_notif;
+static int hf_zbee_zcl_ias_ace_zone_id_map_section;
+static int hf_zbee_zcl_ias_ace_zone_type;
+static int hf_zbee_zcl_ias_ace_ieee_add;
+static int hf_zbee_zcl_ias_ace_srv_rx_cmd_id;
+static int hf_zbee_zcl_ias_ace_srv_tx_cmd_id;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_ias_ace = -1;
-static gint ett_zbee_zcl_ias_ace_zone_id = -1;
-static gint ett_zbee_zcl_ias_ace_zone_id_map_sec = -1;
-static gint ett_zbee_zcl_ias_ace_zone_id_map_sec_elem = -1;
+static gint ett_zbee_zcl_ias_ace;
+static gint ett_zbee_zcl_ias_ace_zone_id;
+static gint ett_zbee_zcl_ias_ace_zone_id_map_sec;
+static gint ett_zbee_zcl_ias_ace_zone_id_map_sec_elem;
 
 /* Server Commands Received */
 static const value_string zbee_zcl_ias_ace_srv_rx_cmd_names[] = {
@@ -479,19 +479,19 @@ static void dissect_zcl_ias_wd_squawk                   (tvbuff_t *tvb, proto_tr
 /* Global Variables      */
 /*************************/
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_ias_wd = -1;
+static int proto_zbee_zcl_ias_wd;
 
-static int hf_zbee_zcl_ias_wd_attr_id = -1;
-static int hf_zbee_zcl_ias_wd_warning_mode = -1;
-static int hf_zbee_zcl_ias_wd_strobe_2bit = -1;
-static int hf_zbee_zcl_ias_wd_squawk_mode = -1;
-static int hf_zbee_zcl_ias_wd_strobe_1bit = -1;
-static int hf_zbee_zcl_ias_wd_warning_duration = -1;
-static int hf_zbee_zcl_ias_wd_squawk_level = -1;
-static int hf_zbee_zcl_ias_wd_srv_rx_cmd_id = -1;
+static int hf_zbee_zcl_ias_wd_attr_id;
+static int hf_zbee_zcl_ias_wd_warning_mode;
+static int hf_zbee_zcl_ias_wd_strobe_2bit;
+static int hf_zbee_zcl_ias_wd_squawk_mode;
+static int hf_zbee_zcl_ias_wd_strobe_1bit;
+static int hf_zbee_zcl_ias_wd_warning_duration;
+static int hf_zbee_zcl_ias_wd_squawk_level;
+static int hf_zbee_zcl_ias_wd_srv_rx_cmd_id;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_ias_wd = -1;
+static gint ett_zbee_zcl_ias_wd;
 
 /* Attributes */
 static const value_string zbee_zcl_ias_wd_attr_names[] = {
diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c
index 4eea153b3a..d6558f8af4 100644
--- a/epan/dissectors/packet-zbee-zcl-se.c
+++ b/epan/dissectors/packet-zbee-zcl-se.c
@@ -110,15 +110,15 @@ static void dissect_zcl_keep_alive_attr_data(proto_tree *tree, tvbuff_t *tvb, gu
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_keep_alive = -1;
+static int proto_zbee_zcl_keep_alive;
 
-static int hf_zbee_zcl_keep_alive_attr_id = -1;
-static int hf_zbee_zcl_keep_alive_attr_reporting_status = -1;
-static int hf_zbee_zcl_keep_alive_base = -1;
-static int hf_zbee_zcl_keep_alive_jitter = -1;
+static int hf_zbee_zcl_keep_alive_attr_id;
+static int hf_zbee_zcl_keep_alive_attr_reporting_status;
+static int hf_zbee_zcl_keep_alive_base;
+static int hf_zbee_zcl_keep_alive_jitter;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_keep_alive = -1;
+static gint ett_zbee_zcl_keep_alive;
 
 /*************************/
 /* Function Bodies       */
@@ -1486,138 +1486,138 @@ static void dissect_zcl_price_publish_cancel_tariff          (tvbuff_t *tvb, pro
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_price = -1;
-
-static int hf_zbee_zcl_price_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_price_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_price_attr_server_id = -1;
-static int hf_zbee_zcl_price_attr_client_id = -1;
-static int hf_zbee_zcl_price_attr_reporting_status = -1;
-static int hf_zbee_zcl_price_provider_id = -1;
-static int hf_zbee_zcl_price_issuer_event_id = -1;
-static int hf_zbee_zcl_price_min_issuer_event_id = -1;
-static int hf_zbee_zcl_price_issuer_tariff_id = -1;
-static int hf_zbee_zcl_price_command_index = -1;
-static int hf_zbee_zcl_price_total_number_of_commands = -1;
-static int hf_zbee_zcl_price_number_of_commands = -1;
-static int hf_zbee_zcl_price_number_of_events = -1;
-static int hf_zbee_zcl_price_number_of_records = -1;
-static int hf_zbee_zcl_price_number_of_block_thresholds = -1;
-static int hf_zbee_zcl_price_number_of_generation_tiers = -1;
-static int hf_zbee_zcl_price_extended_number_of_price_tiers = -1;
-static int hf_zbee_zcl_price_command_options = -1;
-static int hf_zbee_zcl_price_control = -1;
-static int hf_zbee_zcl_price_tier = -1;
-static int hf_zbee_zcl_price_tariff_type_mask = -1;
-static int hf_zbee_zcl_price_tariff_type = -1;
-static int hf_zbee_zcl_price_tariff_resolution_period = -1;
-static int hf_zbee_zcl_price_cpp_auth = -1;
-static int hf_zbee_zcl_price_cpp_price_tier= -1;
-static int hf_zbee_zcl_price_rate_label = -1;
-static int hf_zbee_zcl_price_unit_of_measure = -1;
-static int hf_zbee_zcl_price_currency = -1;
-static int hf_zbee_zcl_price_trailing_digit_and_price_tier = -1;
-static int hf_zbee_zcl_price_trailing_digit = -1;
-static int hf_zbee_zcl_price_extended_price_tier = -1;
-static int hf_zbee_zcl_price_number_of_price_tiers_and_register_tier = -1;
-static int hf_zbee_zcl_price_register_tier = -1;
-static int hf_zbee_zcl_price_number_of_price_tiers = -1;
-static int hf_zbee_zcl_price_extended_register_tier = -1;
-static int hf_zbee_zcl_price_duration_in_minutes = -1;
-static int hf_zbee_zcl_price = -1;
-static int hf_zbee_zcl_price_ratio = -1;
-static int hf_zbee_zcl_price_generation_price = -1;
-static int hf_zbee_zcl_price_generation_price_ratio = -1;
-static int hf_zbee_zcl_price_generation_tier = -1;
-static int hf_zbee_zcl_price_alternate_cost_delivered = -1;
-static int hf_zbee_zcl_price_alternate_cost_unit = -1;
-static int hf_zbee_zcl_price_alternate_cost_trailing_digit_mask = -1;
-static int hf_zbee_zcl_price_alternate_cost_trailing_digit = -1;
-static int hf_zbee_zcl_price_start_time = -1;
-static int hf_zbee_zcl_price_earliest_start_time = -1;
-static int hf_zbee_zcl_price_latest_end_time = -1;
-static int hf_zbee_zcl_price_current_time = -1;
-static int hf_zbee_zcl_price_price_ack_time = -1;
-static int hf_zbee_zcl_price_block_period_start_time = -1;
-static int hf_zbee_zcl_price_block_period_duration = -1;
-static int hf_zbee_zcl_price_block_period_duration_type = -1;
-static int hf_zbee_zcl_price_block_period_duration_timebase = -1;
-static int hf_zbee_zcl_price_block_period_duration_control = -1;
-static int hf_zbee_zcl_price_block_period_control = -1;
-static int hf_zbee_zcl_price_block_period_control_price_acknowledgement = -1;
-static int hf_zbee_zcl_price_block_period_control_repeating_block = -1;
-static int hf_zbee_zcl_price_conversion_factor = -1;
-static int hf_zbee_zcl_price_conversion_factor_trailing_digit_mask = -1;
-static int hf_zbee_zcl_price_conversion_factor_trailing_digit = -1;
-static int hf_zbee_zcl_price_calorific_value = -1;
-static int hf_zbee_zcl_price_calorific_value_unit = -1;
-static int hf_zbee_zcl_price_calorific_value_trailing_digit_mask = -1;
-static int hf_zbee_zcl_price_calorific_value_trailing_digit = -1;
-static int hf_zbee_zcl_price_tariff_information_type_and_charging_scheme = -1;
-static int hf_zbee_zcl_price_tariff_information_type = -1;
-static int hf_zbee_zcl_price_tariff_information_charging_scheme = -1;
-static int hf_zbee_zcl_price_tariff_information_tariff_label = -1;
-static int hf_zbee_zcl_price_tariff_information_number_of_price_tiers_in_use = -1;
-static int hf_zbee_zcl_price_tariff_information_number_of_block_thresholds_in_use = -1;
-static int hf_zbee_zcl_price_tariff_information_price_trailing_digit_mask = -1;
-static int hf_zbee_zcl_price_tariff_information_price_trailing_digit = -1;
-static int hf_zbee_zcl_price_tariff_information_standing_charge = -1;
-static int hf_zbee_zcl_price_tariff_information_tier_block_mode = -1;
-static int hf_zbee_zcl_price_tariff_information_block_threshold_multiplier = -1;
-static int hf_zbee_zcl_price_tariff_information_block_threshold_divisor = -1;
-static int hf_zbee_zcl_price_price_matrix_sub_payload_control = -1;
-static int hf_zbee_zcl_price_price_matrix_tier_block_id = -1;
-static int hf_zbee_zcl_price_price_matrix_tier_block_id_block = -1;
-static int hf_zbee_zcl_price_price_matrix_tier_block_id_tier = -1;
-static int hf_zbee_zcl_price_price_matrix_tier_block_id_tou_tier = -1;
-static int hf_zbee_zcl_price_price_matrix_price = -1;
-static int hf_zbee_zcl_price_block_thresholds_sub_payload_control = -1;
-static int hf_zbee_zcl_price_block_thresholds_tier_number_of_block_thresholds = -1;
-static int hf_zbee_zcl_price_block_thresholds_tier = -1;
-static int hf_zbee_zcl_price_block_thresholds_number_of_block_thresholds = -1;
-static int hf_zbee_zcl_price_block_thresholds_block_threshold = -1;
-static int hf_zbee_zcl_price_co2_value = -1;
-static int hf_zbee_zcl_price_co2_unit = -1;
-static int hf_zbee_zcl_price_co2_value_trailing_digit_mask = -1;
-static int hf_zbee_zcl_price_co2_value_trailing_digit = -1;
-static int hf_zbee_zcl_price_tier_labels_number_of_labels = -1;
-static int hf_zbee_zcl_price_tier_labels_tier_id = -1;
-static int hf_zbee_zcl_price_tier_labels_tier_label = -1;
-static int hf_zbee_zcl_price_billing_period_start_time = -1;
-static int hf_zbee_zcl_price_billing_period_duration = -1;
-static int hf_zbee_zcl_price_billing_period_duration_type = -1;
-static int hf_zbee_zcl_price_billing_period_duration_timebase = -1;
-static int hf_zbee_zcl_price_billing_period_duration_control = -1;
-static int hf_zbee_zcl_price_consolidated_bill = -1;
-static int hf_zbee_zcl_price_consolidated_bill_trailing_digit_mask = -1;
-static int hf_zbee_zcl_price_consolidated_bill_trailing_digit = -1;
-static int hf_zbee_zcl_price_credit_payment_due_date = -1;
-static int hf_zbee_zcl_price_credit_payment_overdue_amount = -1;
-static int hf_zbee_zcl_price_credit_payment_status = -1;
-static int hf_zbee_zcl_price_credit_payment = -1;
-static int hf_zbee_zcl_price_credit_payment_date = -1;
-static int hf_zbee_zcl_price_credit_payment_ref = -1;
-static int hf_zbee_zcl_price_old_currency = -1;
-static int hf_zbee_zcl_price_new_currency = -1;
-static int hf_zbee_zcl_price_currency_change_control_flags = -1;
+static int proto_zbee_zcl_price;
+
+static int hf_zbee_zcl_price_srv_tx_cmd_id;
+static int hf_zbee_zcl_price_srv_rx_cmd_id;
+static int hf_zbee_zcl_price_attr_server_id;
+static int hf_zbee_zcl_price_attr_client_id;
+static int hf_zbee_zcl_price_attr_reporting_status;
+static int hf_zbee_zcl_price_provider_id;
+static int hf_zbee_zcl_price_issuer_event_id;
+static int hf_zbee_zcl_price_min_issuer_event_id;
+static int hf_zbee_zcl_price_issuer_tariff_id;
+static int hf_zbee_zcl_price_command_index;
+static int hf_zbee_zcl_price_total_number_of_commands;
+static int hf_zbee_zcl_price_number_of_commands;
+static int hf_zbee_zcl_price_number_of_events;
+static int hf_zbee_zcl_price_number_of_records;
+static int hf_zbee_zcl_price_number_of_block_thresholds;
+static int hf_zbee_zcl_price_number_of_generation_tiers;
+static int hf_zbee_zcl_price_extended_number_of_price_tiers;
+static int hf_zbee_zcl_price_command_options;
+static int hf_zbee_zcl_price_control;
+static int hf_zbee_zcl_price_tier;
+static int hf_zbee_zcl_price_tariff_type_mask;
+static int hf_zbee_zcl_price_tariff_type;
+static int hf_zbee_zcl_price_tariff_resolution_period;
+static int hf_zbee_zcl_price_cpp_auth;
+static int hf_zbee_zcl_price_cpp_price_tier;
+static int hf_zbee_zcl_price_rate_label;
+static int hf_zbee_zcl_price_unit_of_measure;
+static int hf_zbee_zcl_price_currency;
+static int hf_zbee_zcl_price_trailing_digit_and_price_tier;
+static int hf_zbee_zcl_price_trailing_digit;
+static int hf_zbee_zcl_price_extended_price_tier;
+static int hf_zbee_zcl_price_number_of_price_tiers_and_register_tier;
+static int hf_zbee_zcl_price_register_tier;
+static int hf_zbee_zcl_price_number_of_price_tiers;
+static int hf_zbee_zcl_price_extended_register_tier;
+static int hf_zbee_zcl_price_duration_in_minutes;
+static int hf_zbee_zcl_price;
+static int hf_zbee_zcl_price_ratio;
+static int hf_zbee_zcl_price_generation_price;
+static int hf_zbee_zcl_price_generation_price_ratio;
+static int hf_zbee_zcl_price_generation_tier;
+static int hf_zbee_zcl_price_alternate_cost_delivered;
+static int hf_zbee_zcl_price_alternate_cost_unit;
+static int hf_zbee_zcl_price_alternate_cost_trailing_digit_mask;
+static int hf_zbee_zcl_price_alternate_cost_trailing_digit;
+static int hf_zbee_zcl_price_start_time;
+static int hf_zbee_zcl_price_earliest_start_time;
+static int hf_zbee_zcl_price_latest_end_time;
+static int hf_zbee_zcl_price_current_time;
+static int hf_zbee_zcl_price_price_ack_time;
+static int hf_zbee_zcl_price_block_period_start_time;
+static int hf_zbee_zcl_price_block_period_duration;
+static int hf_zbee_zcl_price_block_period_duration_type;
+static int hf_zbee_zcl_price_block_period_duration_timebase;
+static int hf_zbee_zcl_price_block_period_duration_control;
+static int hf_zbee_zcl_price_block_period_control;
+static int hf_zbee_zcl_price_block_period_control_price_acknowledgement;
+static int hf_zbee_zcl_price_block_period_control_repeating_block;
+static int hf_zbee_zcl_price_conversion_factor;
+static int hf_zbee_zcl_price_conversion_factor_trailing_digit_mask;
+static int hf_zbee_zcl_price_conversion_factor_trailing_digit;
+static int hf_zbee_zcl_price_calorific_value;
+static int hf_zbee_zcl_price_calorific_value_unit;
+static int hf_zbee_zcl_price_calorific_value_trailing_digit_mask;
+static int hf_zbee_zcl_price_calorific_value_trailing_digit;
+static int hf_zbee_zcl_price_tariff_information_type_and_charging_scheme;
+static int hf_zbee_zcl_price_tariff_information_type;
+static int hf_zbee_zcl_price_tariff_information_charging_scheme;
+static int hf_zbee_zcl_price_tariff_information_tariff_label;
+static int hf_zbee_zcl_price_tariff_information_number_of_price_tiers_in_use;
+static int hf_zbee_zcl_price_tariff_information_number_of_block_thresholds_in_use;
+static int hf_zbee_zcl_price_tariff_information_price_trailing_digit_mask;
+static int hf_zbee_zcl_price_tariff_information_price_trailing_digit;
+static int hf_zbee_zcl_price_tariff_information_standing_charge;
+static int hf_zbee_zcl_price_tariff_information_tier_block_mode;
+static int hf_zbee_zcl_price_tariff_information_block_threshold_multiplier;
+static int hf_zbee_zcl_price_tariff_information_block_threshold_divisor;
+static int hf_zbee_zcl_price_price_matrix_sub_payload_control;
+static int hf_zbee_zcl_price_price_matrix_tier_block_id;
+static int hf_zbee_zcl_price_price_matrix_tier_block_id_block;
+static int hf_zbee_zcl_price_price_matrix_tier_block_id_tier;
+static int hf_zbee_zcl_price_price_matrix_tier_block_id_tou_tier;
+static int hf_zbee_zcl_price_price_matrix_price;
+static int hf_zbee_zcl_price_block_thresholds_sub_payload_control;
+static int hf_zbee_zcl_price_block_thresholds_tier_number_of_block_thresholds;
+static int hf_zbee_zcl_price_block_thresholds_tier;
+static int hf_zbee_zcl_price_block_thresholds_number_of_block_thresholds;
+static int hf_zbee_zcl_price_block_thresholds_block_threshold;
+static int hf_zbee_zcl_price_co2_value;
+static int hf_zbee_zcl_price_co2_unit;
+static int hf_zbee_zcl_price_co2_value_trailing_digit_mask;
+static int hf_zbee_zcl_price_co2_value_trailing_digit;
+static int hf_zbee_zcl_price_tier_labels_number_of_labels;
+static int hf_zbee_zcl_price_tier_labels_tier_id;
+static int hf_zbee_zcl_price_tier_labels_tier_label;
+static int hf_zbee_zcl_price_billing_period_start_time;
+static int hf_zbee_zcl_price_billing_period_duration;
+static int hf_zbee_zcl_price_billing_period_duration_type;
+static int hf_zbee_zcl_price_billing_period_duration_timebase;
+static int hf_zbee_zcl_price_billing_period_duration_control;
+static int hf_zbee_zcl_price_consolidated_bill;
+static int hf_zbee_zcl_price_consolidated_bill_trailing_digit_mask;
+static int hf_zbee_zcl_price_consolidated_bill_trailing_digit;
+static int hf_zbee_zcl_price_credit_payment_due_date;
+static int hf_zbee_zcl_price_credit_payment_overdue_amount;
+static int hf_zbee_zcl_price_credit_payment_status;
+static int hf_zbee_zcl_price_credit_payment;
+static int hf_zbee_zcl_price_credit_payment_date;
+static int hf_zbee_zcl_price_credit_payment_ref;
+static int hf_zbee_zcl_price_old_currency;
+static int hf_zbee_zcl_price_new_currency;
+static int hf_zbee_zcl_price_currency_change_control_flags;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_price = -1;
-static gint ett_zbee_zcl_price_tariff_type = -1;
-static gint ett_zbee_zcl_price_trailing_digit_and_price_tier = -1;
-static gint ett_zbee_zcl_price_number_of_price_tiers_and_register_tier = -1;
-static gint ett_zbee_zcl_price_alternate_cost_trailing_digit = -1;
-static gint ett_zbee_zcl_price_block_period_control = -1;
-static gint ett_zbee_zcl_price_block_period_duration_type = -1;
-static gint ett_zbee_zcl_price_conversion_factor_trailing_digit = -1;
-static gint ett_zbee_zcl_price_calorific_value_trailing_digit = -1;
-static gint ett_zbee_zcl_price_tariff_information_tariff_type_and_charging_scheme = -1;
-static gint ett_zbee_zcl_price_tariff_information_price_trailing_digit = -1;
-static gint ett_zbee_zcl_price_price_matrix_tier_block_id = -1;
-static gint ett_zbee_zcl_price_block_thresholds_tier_number_of_block_thresholds = -1;
-static gint ett_zbee_zcl_price_co2_value_trailing_digit = -1;
-static gint ett_zbee_zcl_price_billing_period_duration_type = -1;
-static gint ett_zbee_zcl_price_consolidated_bill_trailing_digit = -1;
+static gint ett_zbee_zcl_price;
+static gint ett_zbee_zcl_price_tariff_type;
+static gint ett_zbee_zcl_price_trailing_digit_and_price_tier;
+static gint ett_zbee_zcl_price_number_of_price_tiers_and_register_tier;
+static gint ett_zbee_zcl_price_alternate_cost_trailing_digit;
+static gint ett_zbee_zcl_price_block_period_control;
+static gint ett_zbee_zcl_price_block_period_duration_type;
+static gint ett_zbee_zcl_price_conversion_factor_trailing_digit;
+static gint ett_zbee_zcl_price_calorific_value_trailing_digit;
+static gint ett_zbee_zcl_price_tariff_information_tariff_type_and_charging_scheme;
+static gint ett_zbee_zcl_price_tariff_information_price_trailing_digit;
+static gint ett_zbee_zcl_price_price_matrix_tier_block_id;
+static gint ett_zbee_zcl_price_block_thresholds_tier_number_of_block_thresholds;
+static gint ett_zbee_zcl_price_co2_value_trailing_digit;
+static gint ett_zbee_zcl_price_billing_period_duration_type;
+static gint ett_zbee_zcl_price_consolidated_bill_trailing_digit;
 
 static int * const zbee_zcl_price_billing_period_duration_type[] = {
     &hf_zbee_zcl_price_billing_period_duration_timebase,
@@ -3755,59 +3755,59 @@ static void dissect_zcl_drlc_attr_data                                  (proto_t
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_drlc = -1;
-
-static int hf_zbee_zcl_drlc_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_drlc_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_drlc_attr_client_id = -1;
-static int hf_zbee_zcl_drlc_attr_reporting_status = -1;
-static int hf_zbee_zcl_drlc_issuer_event_id = -1;
-static int hf_zbee_zcl_drlc_device_class = -1;
-static int hf_zbee_zcl_drlc_device_class_hvac_compressor_or_furnace = -1;
-static int hf_zbee_zcl_drlc_device_class_strip_heaters_baseboard_heaters = -1;
-static int hf_zbee_zcl_drlc_device_class_water_heater = -1;
-static int hf_zbee_zcl_drlc_device_class_pool_pump_spa_jacuzzi = -1;
-static int hf_zbee_zcl_drlc_device_class_smart_appliances = -1;
-static int hf_zbee_zcl_drlc_device_class_irrigation_pump = -1;
-static int hf_zbee_zcl_drlc_device_class_managed_c_i_loads= -1;
-static int hf_zbee_zcl_drlc_device_class_simple_misc_loads = -1;
-static int hf_zbee_zcl_drlc_device_class_exterior_lighting = -1;
-static int hf_zbee_zcl_drlc_device_class_interior_lighting = -1;
-static int hf_zbee_zcl_drlc_device_class_electric_vehicle = -1;
-static int hf_zbee_zcl_drlc_device_class_generation_systems = -1;
-static int hf_zbee_zcl_drlc_device_class_reserved = -1;
-static int hf_zbee_zcl_drlc_utility_enrollment_group = -1;
-static int hf_zbee_zcl_drlc_start_time = -1;
-static int hf_zbee_zcl_drlc_duration_in_minutes = -1;
-static int hf_zbee_zcl_drlc_criticality_level = -1;
-static int hf_zbee_zcl_drlc_cooling_temp_offset = -1;
-static int hf_zbee_zcl_drlc_heating_temp_offset = -1;
-static int hf_zbee_zcl_drlc_cooling_temp_set_point = -1;
-static int hf_zbee_zcl_drlc_heating_temp_set_point = -1;
-static int hf_zbee_zcl_drlc_average_load_adjustment_percentage = -1;
-static int hf_zbee_zcl_drlc_duty_cycle = -1;
-static int hf_zbee_zcl_drlc_event_control = -1;
-static int hf_zbee_zcl_drlc_event_control_randomize_start_time = -1;
-static int hf_zbee_zcl_drlc_event_control_randomize_duration_time = -1;
-static int hf_zbee_zcl_drlc_event_control_reserved = -1;
-static int hf_zbee_zcl_drlc_cancel_control = -1;
-static int hf_zbee_zcl_drlc_cancel_control_event_in_process = -1;
-static int hf_zbee_zcl_drlc_cancel_control_reserved = -1;
-static int hf_zbee_zcl_drlc_effective_time = -1;
-static int hf_zbee_zcl_drlc_report_event_issuer_event_id = -1;
-static int hf_zbee_zcl_drlc_report_event_event_status = -1;
-static int hf_zbee_zcl_drlc_report_event_event_status_time = -1;
-static int hf_zbee_zcl_drlc_report_event_criticality_level_applied = -1;
-static int hf_zbee_zcl_drlc_report_event_cooling_temp_set_point_applied = -1;
-static int hf_zbee_zcl_drlc_report_event_heating_temp_set_point_applied = -1;
-static int hf_zbee_zcl_drlc_report_event_average_load_adjustment_percentage = -1;
-static int hf_zbee_zcl_drlc_report_event_duty_cycle = -1;
-static int hf_zbee_zcl_drlc_report_event_event_control = -1;
-static int hf_zbee_zcl_drlc_report_event_signature_type = -1;
-static int hf_zbee_zcl_drlc_report_event_signature = -1;
-static int hf_zbee_zcl_drlc_get_scheduled_events_start_time = -1;
-static int hf_zbee_zcl_drlc_get_scheduled_events_number_of_events = -1;
-static int hf_zbee_zcl_drlc_get_scheduled_events_issuer_event_id = -1;
+static int proto_zbee_zcl_drlc;
+
+static int hf_zbee_zcl_drlc_srv_tx_cmd_id;
+static int hf_zbee_zcl_drlc_srv_rx_cmd_id;
+static int hf_zbee_zcl_drlc_attr_client_id;
+static int hf_zbee_zcl_drlc_attr_reporting_status;
+static int hf_zbee_zcl_drlc_issuer_event_id;
+static int hf_zbee_zcl_drlc_device_class;
+static int hf_zbee_zcl_drlc_device_class_hvac_compressor_or_furnace;
+static int hf_zbee_zcl_drlc_device_class_strip_heaters_baseboard_heaters;
+static int hf_zbee_zcl_drlc_device_class_water_heater;
+static int hf_zbee_zcl_drlc_device_class_pool_pump_spa_jacuzzi;
+static int hf_zbee_zcl_drlc_device_class_smart_appliances;
+static int hf_zbee_zcl_drlc_device_class_irrigation_pump;
+static int hf_zbee_zcl_drlc_device_class_managed_c_i_loads;
+static int hf_zbee_zcl_drlc_device_class_simple_misc_loads;
+static int hf_zbee_zcl_drlc_device_class_exterior_lighting;
+static int hf_zbee_zcl_drlc_device_class_interior_lighting;
+static int hf_zbee_zcl_drlc_device_class_electric_vehicle;
+static int hf_zbee_zcl_drlc_device_class_generation_systems;
+static int hf_zbee_zcl_drlc_device_class_reserved;
+static int hf_zbee_zcl_drlc_utility_enrollment_group;
+static int hf_zbee_zcl_drlc_start_time;
+static int hf_zbee_zcl_drlc_duration_in_minutes;
+static int hf_zbee_zcl_drlc_criticality_level;
+static int hf_zbee_zcl_drlc_cooling_temp_offset;
+static int hf_zbee_zcl_drlc_heating_temp_offset;
+static int hf_zbee_zcl_drlc_cooling_temp_set_point;
+static int hf_zbee_zcl_drlc_heating_temp_set_point;
+static int hf_zbee_zcl_drlc_average_load_adjustment_percentage;
+static int hf_zbee_zcl_drlc_duty_cycle;
+static int hf_zbee_zcl_drlc_event_control;
+static int hf_zbee_zcl_drlc_event_control_randomize_start_time;
+static int hf_zbee_zcl_drlc_event_control_randomize_duration_time;
+static int hf_zbee_zcl_drlc_event_control_reserved;
+static int hf_zbee_zcl_drlc_cancel_control;
+static int hf_zbee_zcl_drlc_cancel_control_event_in_process;
+static int hf_zbee_zcl_drlc_cancel_control_reserved;
+static int hf_zbee_zcl_drlc_effective_time;
+static int hf_zbee_zcl_drlc_report_event_issuer_event_id;
+static int hf_zbee_zcl_drlc_report_event_event_status;
+static int hf_zbee_zcl_drlc_report_event_event_status_time;
+static int hf_zbee_zcl_drlc_report_event_criticality_level_applied;
+static int hf_zbee_zcl_drlc_report_event_cooling_temp_set_point_applied;
+static int hf_zbee_zcl_drlc_report_event_heating_temp_set_point_applied;
+static int hf_zbee_zcl_drlc_report_event_average_load_adjustment_percentage;
+static int hf_zbee_zcl_drlc_report_event_duty_cycle;
+static int hf_zbee_zcl_drlc_report_event_event_control;
+static int hf_zbee_zcl_drlc_report_event_signature_type;
+static int hf_zbee_zcl_drlc_report_event_signature;
+static int hf_zbee_zcl_drlc_get_scheduled_events_start_time;
+static int hf_zbee_zcl_drlc_get_scheduled_events_number_of_events;
+static int hf_zbee_zcl_drlc_get_scheduled_events_issuer_event_id;
 
 static int* const zbee_zcl_drlc_control_event_device_classes[] = {
     &hf_zbee_zcl_drlc_device_class_hvac_compressor_or_furnace,
@@ -3839,10 +3839,10 @@ static int* const hf_zbee_zcl_drlc_cancel_control_flags[] = {
     NULL
 };
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_drlc = -1;
-static gint ett_zbee_zcl_drlc_device_class = -1;
-static gint ett_zbee_zcl_drlc_event_control = -1;
-static gint ett_zbee_zcl_drlc_cancel_control = -1;
+static gint ett_zbee_zcl_drlc;
+static gint ett_zbee_zcl_drlc_device_class;
+static gint ett_zbee_zcl_drlc_event_control;
+static gint ett_zbee_zcl_drlc_cancel_control;
 
 /*************************/
 /* Function Bodies       */
@@ -5631,210 +5631,210 @@ static void dissect_zcl_met_notification_flags              (tvbuff_t *tvb, prot
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_met = -1;
-
-static int hf_zbee_zcl_met_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_met_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_met_attr_server_id = -1;
-static int hf_zbee_zcl_met_attr_client_id = -1;
-static int hf_zbee_zcl_met_attr_reporting_status = -1;
-static int hf_zbee_zcl_met_func_noti_flags = -1;
-static int hf_zbee_zcl_met_func_noti_flag_new_ota_firmware = -1;
-static int hf_zbee_zcl_met_func_noti_flag_cbke_update_request = -1;
-static int hf_zbee_zcl_met_func_noti_flag_time_sync = -1;
-static int hf_zbee_zcl_met_func_noti_flag_stay_awake_request_han = -1;
-static int hf_zbee_zcl_met_func_noti_flag_stay_awake_request_wan = -1;
-static int hf_zbee_zcl_met_func_noti_flag_push_historical_metering_data_attribute_set = -1;
-static int hf_zbee_zcl_met_func_noti_flag_push_historical_prepayment_data_attribute_set = -1;
-static int hf_zbee_zcl_met_func_noti_flag_push_all_static_data_basic_cluster = -1;
-static int hf_zbee_zcl_met_func_noti_flag_push_all_static_data_metering_cluster = -1;
-static int hf_zbee_zcl_met_func_noti_flag_push_all_static_data_prepayment_cluster = -1;
-static int hf_zbee_zcl_met_func_noti_flag_network_key_active = -1;
-static int hf_zbee_zcl_met_func_noti_flag_display_message = -1;
-static int hf_zbee_zcl_met_func_noti_flag_cancel_all_messages = -1;
-static int hf_zbee_zcl_met_func_noti_flag_change_supply = -1;
-static int hf_zbee_zcl_met_func_noti_flag_local_change_supply = -1;
-static int hf_zbee_zcl_met_func_noti_flag_set_uncontrolled_flow_threshold = -1;
-static int hf_zbee_zcl_met_func_noti_flag_tunnel_message_pending = -1;
-static int hf_zbee_zcl_met_func_noti_flag_get_snapshot = -1;
-static int hf_zbee_zcl_met_func_noti_flag_get_sampled_data = -1;
-static int hf_zbee_zcl_met_func_noti_flag_new_sub_ghz_channel_masks_available = -1;
-static int hf_zbee_zcl_met_func_noti_flag_energy_scan_pending = -1;
-static int hf_zbee_zcl_met_func_noti_flag_channel_change_pending = -1;
-static int hf_zbee_zcl_met_func_noti_flag_reserved = -1;
-static int hf_zbee_zcl_met_noti_flags_2 = -1;
-static int hf_zbee_zcl_met_noti_flag_2_publish_price = -1;
-static int hf_zbee_zcl_met_noti_flag_2_publish_block_period = -1;
-static int hf_zbee_zcl_met_noti_flag_2_publish_tariff_info = -1;
-static int hf_zbee_zcl_met_noti_flag_2_publish_conversion_factor = -1;
-static int hf_zbee_zcl_met_noti_flag_2_publish_calorific_value = -1;
-static int hf_zbee_zcl_met_noti_flag_2_publish_co2_value = -1;
-static int hf_zbee_zcl_met_noti_flag_2_publish_billing_period = -1;
-static int hf_zbee_zcl_met_noti_flag_2_publish_consolidated_bill = -1;
-static int hf_zbee_zcl_met_noti_flag_2_publish_price_matrix = -1;
-static int hf_zbee_zcl_met_noti_flag_2_publish_block_thresholds = -1;
-static int hf_zbee_zcl_met_noti_flag_2_publish_currency_conversion = -1;
-static int hf_zbee_zcl_met_noti_flag_2_publish_credit_payment_info = -1;
-static int hf_zbee_zcl_met_noti_flag_2_publish_cpp_event = -1;
-static int hf_zbee_zcl_met_noti_flag_2_publish_tier_labels = -1;
-static int hf_zbee_zcl_met_noti_flag_2_cancel_tariff = -1;
-static int hf_zbee_zcl_met_noti_flag_2_reserved = -1;
-static int hf_zbee_zcl_met_noti_flags_3 = -1;
-static int hf_zbee_zcl_met_noti_flag_3_publish_calendar = -1;
-static int hf_zbee_zcl_met_noti_flag_3_publish_special_days = -1;
-static int hf_zbee_zcl_met_noti_flag_3_publish_seasons = -1;
-static int hf_zbee_zcl_met_noti_flag_3_publish_week = -1;
-static int hf_zbee_zcl_met_noti_flag_3_publish_day = -1;
-static int hf_zbee_zcl_met_noti_flag_3_cancel_calendar = -1;
-static int hf_zbee_zcl_met_noti_flag_3_reserved = -1;
-static int hf_zbee_zcl_met_noti_flags_4 = -1;
-static int hf_zbee_zcl_met_noti_flag_4_select_available_emergency_credit = -1;
-static int hf_zbee_zcl_met_noti_flag_4_change_debt = -1;
-static int hf_zbee_zcl_met_noti_flag_4_emergency_credit_setup = -1;
-static int hf_zbee_zcl_met_noti_flag_4_consumer_top_up = -1;
-static int hf_zbee_zcl_met_noti_flag_4_credit_adjustment = -1;
-static int hf_zbee_zcl_met_noti_flag_4_change_payment_mode = -1;
-static int hf_zbee_zcl_met_noti_flag_4_get_prepay_snapshot = -1;
-static int hf_zbee_zcl_met_noti_flag_4_get_top_up_log = -1;
-static int hf_zbee_zcl_met_noti_flag_4_set_low_credit_warning_level = -1;
-static int hf_zbee_zcl_met_noti_flag_4_get_debt_repayment_log = -1;
-static int hf_zbee_zcl_met_noti_flag_4_set_maximum_credit_limit = -1;
-static int hf_zbee_zcl_met_noti_flag_4_set_overall_debt_cap = -1;
-static int hf_zbee_zcl_met_noti_flag_4_reserved = -1;
-static int hf_zbee_zcl_met_noti_flags_5 = -1;
-static int hf_zbee_zcl_met_noti_flag_5_publish_change_of_tenancy = -1;
-static int hf_zbee_zcl_met_noti_flag_5_publish_change_of_supplier = -1;
-static int hf_zbee_zcl_met_noti_flag_5_request_new_password_1_response = -1;
-static int hf_zbee_zcl_met_noti_flag_5_request_new_password_2_response = -1;
-static int hf_zbee_zcl_met_noti_flag_5_request_new_password_3_response = -1;
-static int hf_zbee_zcl_met_noti_flag_5_request_new_password_4_response = -1;
-static int hf_zbee_zcl_met_noti_flag_5_update_site_id = -1;
-static int hf_zbee_zcl_met_noti_flag_5_reset_battery_counter = -1;
-static int hf_zbee_zcl_met_noti_flag_5_update_cin = -1;
-static int hf_zbee_zcl_met_noti_flag_5_reserved = -1;
-static int hf_zbee_zcl_met_get_profile_interval_channel = -1;
-static int hf_zbee_zcl_met_get_profile_end_time = -1;
-static int hf_zbee_zcl_met_get_profile_number_of_periods = -1;
-static int hf_zbee_zcl_met_request_mirror_rsp_endpoint_id = -1;
-static int hf_zbee_zcl_met_mirror_removed_removed_endpoint_id = -1;
-static int hf_zbee_zcl_met_request_fast_poll_mode_fast_poll_update_period = -1;
-static int hf_zbee_zcl_met_request_fast_poll_mode_duration = -1;
-static int hf_zbee_zcl_met_schedule_snapshot_issuer_event_id = -1;
-static int hf_zbee_zcl_met_schedule_snapshot_command_index = -1;
-static int hf_zbee_zcl_met_schedule_snapshot_snapshot_schedule_payload_snapshot_schedule_id = -1;
-static int hf_zbee_zcl_met_schedule_snapshot_snapshot_schedule_payload_snapshot_start_time = -1;
-static int hf_zbee_zcl_met_schedule_snapshot_snapshot_schedule_payload_snapshot_schedule = -1;
-static int hf_zbee_zcl_met_schedule_snapshot_snapshot_schedule_payload_shapshot_payload_type = -1;
-static int hf_zbee_zcl_met_schedule_snapshot_snapshot_schedule_payload_snapshot_cause = -1;
-static int hf_zbee_zcl_met_schedule_snapshot_total_number_of_commands = -1;
-static int hf_zbee_zcl_met_take_snapshot_snapshot_cause = -1;
-static int hf_zbee_zcl_met_get_snapshot_start_time = -1;
-static int hf_zbee_zcl_met_get_snapshot_end_time = -1;
-static int hf_zbee_zcl_met_get_snapshot_snapshot_offset = -1;
-static int hf_zbee_zcl_met_get_snapshot_snapshot_cause = -1;
-static int hf_zbee_zcl_met_start_sampling_issuer_event_id = -1;
-static int hf_zbee_zcl_met_start_sampling_start_sampling_time = -1;
-static int hf_zbee_zcl_met_start_sampling_sample_type = -1;
-static int hf_zbee_zcl_met_start_sampling_sample_request_interval = -1;
-static int hf_zbee_zcl_met_start_sampling_max_number_of_samples = -1;
-static int hf_zbee_zcl_met_get_sampled_data_sample_id = -1;
-static int hf_zbee_zcl_met_get_sampled_data_sample_start_time = -1;
-static int hf_zbee_zcl_met_get_sampled_data_sample_type = -1;
-static int hf_zbee_zcl_met_get_sampled_data_number_of_samples = -1;
-static int hf_zbee_zcl_met_start_sampling_response_sample_id = -1;
-static int hf_zbee_zcl_met_mirror_report_attribute_response_notification_scheme = -1;
-static int hf_zbee_zcl_met_mirror_report_attribute_response_notification_flags_n = -1;
-static int hf_zbee_zcl_met_reset_load_limit_counter_provider_id = -1;
-static int hf_zbee_zcl_met_reset_load_limit_counter_issuer_event_id = -1;
-static int hf_zbee_zcl_met_change_supply_provider_id = -1;
-static int hf_zbee_zcl_met_change_supply_issuer_event_id = -1;
-static int hf_zbee_zcl_met_change_supply_request_date_time = -1;
-static int hf_zbee_zcl_met_change_supply_implementation_date_time = -1;
-static int hf_zbee_zcl_met_change_supply_proposed_supply_status = -1;
-static int hf_zbee_zcl_met_change_supply_supply_control_bits = -1;
-static int hf_zbee_zcl_met_local_change_supply_proposed_supply_status = -1;
-static int hf_zbee_zcl_met_set_supply_status_issuer_event_id = -1;
-static int hf_zbee_zcl_met_set_supply_status_supply_tamper_state = -1;
-static int hf_zbee_zcl_met_set_supply_status_supply_depletion_state = -1;
-static int hf_zbee_zcl_met_set_supply_status_supply_uncontrolled_flow_state = -1;
-static int hf_zbee_zcl_met_set_supply_status_load_limit_supply_state = -1;
-static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_provider_id = -1;
-static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_issuer_event_id = -1;
-static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_uncontrolled_flow_threshold = -1;
-static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_unit_of_measure = -1;
-static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_multiplier = -1;
-static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_divisor = -1;
-static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_stabilisation_period = -1;
-static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_measurement_period = -1;
-static int hf_zbee_zcl_met_get_profile_response_end_time = -1;
-static int hf_zbee_zcl_met_get_profile_response_status = -1;
-static int hf_zbee_zcl_met_get_profile_response_profile_interval_period = -1;
-static int hf_zbee_zcl_met_get_profile_response_number_of_periods_delivered = -1;
-static int hf_zbee_zcl_met_get_profile_response_intervals = -1;
-static int hf_zbee_zcl_met_request_fast_poll_mode_response_applied_update_period = -1;
-static int hf_zbee_zcl_met_request_fast_poll_mode_response_fast_poll_mode_end_time = -1;
-static int hf_zbee_zcl_met_schedule_snapshot_response_issuer_event_id = -1;
-static int hf_zbee_zcl_met_schedule_snapshot_response_snapshot_schedule_id = -1;
-static int hf_zbee_zcl_met_schedule_snapshot_response_snapshot_schedule_confirmation = -1;
-static int hf_zbee_zcl_met_take_snapshot_response_snapshot_id = -1;
-static int hf_zbee_zcl_met_take_snapshot_response_snapshot_confirmation = -1;
-static int hf_zbee_zcl_met_publish_snapshot_snapshot_id = -1;
-static int hf_zbee_zcl_met_publish_snapshot_snapshot_time = -1;
-static int hf_zbee_zcl_met_publish_snapshot_snapshots_found = -1;
-static int hf_zbee_zcl_met_publish_snapshot_cmd_index = -1;
-static int hf_zbee_zcl_met_publish_snapshot_total_commands = -1;
-static int hf_zbee_zcl_met_publish_snapshot_snapshot_cause = -1;
-static int hf_zbee_zcl_met_publish_snapshot_snapshot_payload_type = -1;
-static int hf_zbee_zcl_met_publish_snapshot_snapshot_sub_payload = -1;
-static int hf_zbee_zcl_met_get_sampled_data_rsp_sample_id = -1;
-static int hf_zbee_zcl_met_get_sampled_data_rsp_sample_start_time = -1;
-static int hf_zbee_zcl_met_get_sampled_data_rsp_sample_type = -1;
-static int hf_zbee_zcl_met_get_sampled_data_rsp_sample_request_interval = -1;
-static int hf_zbee_zcl_met_get_sampled_data_rsp_sample_number_of_samples = -1;
-static int hf_zbee_zcl_met_get_sampled_data_rsp_sample_samples = -1;
-static int hf_zbee_zcl_met_configure_mirror_issuer_event_id = -1;
-static int hf_zbee_zcl_met_configure_mirror_reporting_interval = -1;
-static int hf_zbee_zcl_met_configure_mirror_mirror_notification_reporting = -1;
-static int hf_zbee_zcl_met_configure_mirror_notification_scheme = -1;
-static int hf_zbee_zcl_met_configure_notification_scheme_issuer_event_id = -1;
-static int hf_zbee_zcl_met_configure_notification_scheme_notification_scheme = -1;
-static int hf_zbee_zcl_met_configure_notification_scheme_notification_flag_order = -1;
-static int hf_zbee_zcl_met_configure_notification_flags_issuer_event_id = -1;
-static int hf_zbee_zcl_met_configure_notification_flags_notification_scheme = -1;
-static int hf_zbee_zcl_met_configure_notification_flags_notification_flag_attribute_id = -1;
-static int hf_zbee_zcl_met_configure_notification_flags_bit_field_allocation_cluster_id = -1;
-static int hf_zbee_zcl_met_configure_notification_flags_bit_field_allocation_manufacturer_code = -1;
-static int hf_zbee_zcl_met_configure_notification_flags_bit_field_allocation_no_of_commands = -1;
-static int hf_zbee_zcl_met_configure_notification_flags_bit_field_allocation_command_identifier = -1;
-static int hf_zbee_zcl_met_get_notified_msg_notification_scheme = -1;
-static int hf_zbee_zcl_met_get_notified_msg_notification_flag_attribute_id = -1;
-static int hf_zbee_zcl_met_get_notified_msg_notification_flags = -1;
-static int hf_zbee_zcl_met_supply_status_response_provider_id = -1;
-static int hf_zbee_zcl_met_supply_status_response_issuer_event_id = -1;
-static int hf_zbee_zcl_met_supply_status_response_implementation_date_time = -1;
-static int hf_zbee_zcl_met_supply_status_response_supply_status_after_implementation = -1;
-static int hf_zbee_zcl_met_snapshot_cause_general = -1;
-static int hf_zbee_zcl_met_snapshot_cause_end_of_billing_period = -1;
-static int hf_zbee_zcl_met_snapshot_cause_end_of_block_period = -1;
-static int hf_zbee_zcl_met_snapshot_cause_change_of_tariff_information = -1;
-static int hf_zbee_zcl_met_snapshot_cause_change_of_price_matrix = -1;
-static int hf_zbee_zcl_met_snapshot_cause_change_of_block_thresholds = -1;
-static int hf_zbee_zcl_met_snapshot_cause_change_of_cv = -1;
-static int hf_zbee_zcl_met_snapshot_cause_change_of_cf = -1;
-static int hf_zbee_zcl_met_snapshot_cause_change_of_calendar = -1;
-static int hf_zbee_zcl_met_snapshot_cause_critical_peak_pricing = -1;
-static int hf_zbee_zcl_met_snapshot_cause_manually_triggered_from_client = -1;
-static int hf_zbee_zcl_met_snapshot_cause_end_of_resolve_period = -1;
-static int hf_zbee_zcl_met_snapshot_cause_change_of_tenancy = -1;
-static int hf_zbee_zcl_met_snapshot_cause_change_of_supplier = -1;
-static int hf_zbee_zcl_met_snapshot_cause_change_of_meter_mode = -1;
-static int hf_zbee_zcl_met_snapshot_cause_debt_payment = -1;
-static int hf_zbee_zcl_met_snapshot_cause_scheduled_snapshot = -1;
-static int hf_zbee_zcl_met_snapshot_cause_ota_firmware_download = -1;
-static int hf_zbee_zcl_met_snapshot_cause_reserved = -1;
-static int hf_zbee_zcl_met_snapshot_schedule_frequency = -1;
-static int hf_zbee_zcl_met_snapshot_schedule_frequency_type = -1;
-static int hf_zbee_zcl_met_snapshot_schedule_frequency_wild_card = -1;
+static int proto_zbee_zcl_met;
+
+static int hf_zbee_zcl_met_srv_tx_cmd_id;
+static int hf_zbee_zcl_met_srv_rx_cmd_id;
+static int hf_zbee_zcl_met_attr_server_id;
+static int hf_zbee_zcl_met_attr_client_id;
+static int hf_zbee_zcl_met_attr_reporting_status;
+static int hf_zbee_zcl_met_func_noti_flags;
+static int hf_zbee_zcl_met_func_noti_flag_new_ota_firmware;
+static int hf_zbee_zcl_met_func_noti_flag_cbke_update_request;
+static int hf_zbee_zcl_met_func_noti_flag_time_sync;
+static int hf_zbee_zcl_met_func_noti_flag_stay_awake_request_han;
+static int hf_zbee_zcl_met_func_noti_flag_stay_awake_request_wan;
+static int hf_zbee_zcl_met_func_noti_flag_push_historical_metering_data_attribute_set;
+static int hf_zbee_zcl_met_func_noti_flag_push_historical_prepayment_data_attribute_set;
+static int hf_zbee_zcl_met_func_noti_flag_push_all_static_data_basic_cluster;
+static int hf_zbee_zcl_met_func_noti_flag_push_all_static_data_metering_cluster;
+static int hf_zbee_zcl_met_func_noti_flag_push_all_static_data_prepayment_cluster;
+static int hf_zbee_zcl_met_func_noti_flag_network_key_active;
+static int hf_zbee_zcl_met_func_noti_flag_display_message;
+static int hf_zbee_zcl_met_func_noti_flag_cancel_all_messages;
+static int hf_zbee_zcl_met_func_noti_flag_change_supply;
+static int hf_zbee_zcl_met_func_noti_flag_local_change_supply;
+static int hf_zbee_zcl_met_func_noti_flag_set_uncontrolled_flow_threshold;
+static int hf_zbee_zcl_met_func_noti_flag_tunnel_message_pending;
+static int hf_zbee_zcl_met_func_noti_flag_get_snapshot;
+static int hf_zbee_zcl_met_func_noti_flag_get_sampled_data;
+static int hf_zbee_zcl_met_func_noti_flag_new_sub_ghz_channel_masks_available;
+static int hf_zbee_zcl_met_func_noti_flag_energy_scan_pending;
+static int hf_zbee_zcl_met_func_noti_flag_channel_change_pending;
+static int hf_zbee_zcl_met_func_noti_flag_reserved;
+static int hf_zbee_zcl_met_noti_flags_2;
+static int hf_zbee_zcl_met_noti_flag_2_publish_price;
+static int hf_zbee_zcl_met_noti_flag_2_publish_block_period;
+static int hf_zbee_zcl_met_noti_flag_2_publish_tariff_info;
+static int hf_zbee_zcl_met_noti_flag_2_publish_conversion_factor;
+static int hf_zbee_zcl_met_noti_flag_2_publish_calorific_value;
+static int hf_zbee_zcl_met_noti_flag_2_publish_co2_value;
+static int hf_zbee_zcl_met_noti_flag_2_publish_billing_period;
+static int hf_zbee_zcl_met_noti_flag_2_publish_consolidated_bill;
+static int hf_zbee_zcl_met_noti_flag_2_publish_price_matrix;
+static int hf_zbee_zcl_met_noti_flag_2_publish_block_thresholds;
+static int hf_zbee_zcl_met_noti_flag_2_publish_currency_conversion;
+static int hf_zbee_zcl_met_noti_flag_2_publish_credit_payment_info;
+static int hf_zbee_zcl_met_noti_flag_2_publish_cpp_event;
+static int hf_zbee_zcl_met_noti_flag_2_publish_tier_labels;
+static int hf_zbee_zcl_met_noti_flag_2_cancel_tariff;
+static int hf_zbee_zcl_met_noti_flag_2_reserved;
+static int hf_zbee_zcl_met_noti_flags_3;
+static int hf_zbee_zcl_met_noti_flag_3_publish_calendar;
+static int hf_zbee_zcl_met_noti_flag_3_publish_special_days;
+static int hf_zbee_zcl_met_noti_flag_3_publish_seasons;
+static int hf_zbee_zcl_met_noti_flag_3_publish_week;
+static int hf_zbee_zcl_met_noti_flag_3_publish_day;
+static int hf_zbee_zcl_met_noti_flag_3_cancel_calendar;
+static int hf_zbee_zcl_met_noti_flag_3_reserved;
+static int hf_zbee_zcl_met_noti_flags_4;
+static int hf_zbee_zcl_met_noti_flag_4_select_available_emergency_credit;
+static int hf_zbee_zcl_met_noti_flag_4_change_debt;
+static int hf_zbee_zcl_met_noti_flag_4_emergency_credit_setup;
+static int hf_zbee_zcl_met_noti_flag_4_consumer_top_up;
+static int hf_zbee_zcl_met_noti_flag_4_credit_adjustment;
+static int hf_zbee_zcl_met_noti_flag_4_change_payment_mode;
+static int hf_zbee_zcl_met_noti_flag_4_get_prepay_snapshot;
+static int hf_zbee_zcl_met_noti_flag_4_get_top_up_log;
+static int hf_zbee_zcl_met_noti_flag_4_set_low_credit_warning_level;
+static int hf_zbee_zcl_met_noti_flag_4_get_debt_repayment_log;
+static int hf_zbee_zcl_met_noti_flag_4_set_maximum_credit_limit;
+static int hf_zbee_zcl_met_noti_flag_4_set_overall_debt_cap;
+static int hf_zbee_zcl_met_noti_flag_4_reserved;
+static int hf_zbee_zcl_met_noti_flags_5;
+static int hf_zbee_zcl_met_noti_flag_5_publish_change_of_tenancy;
+static int hf_zbee_zcl_met_noti_flag_5_publish_change_of_supplier;
+static int hf_zbee_zcl_met_noti_flag_5_request_new_password_1_response;
+static int hf_zbee_zcl_met_noti_flag_5_request_new_password_2_response;
+static int hf_zbee_zcl_met_noti_flag_5_request_new_password_3_response;
+static int hf_zbee_zcl_met_noti_flag_5_request_new_password_4_response;
+static int hf_zbee_zcl_met_noti_flag_5_update_site_id;
+static int hf_zbee_zcl_met_noti_flag_5_reset_battery_counter;
+static int hf_zbee_zcl_met_noti_flag_5_update_cin;
+static int hf_zbee_zcl_met_noti_flag_5_reserved;
+static int hf_zbee_zcl_met_get_profile_interval_channel;
+static int hf_zbee_zcl_met_get_profile_end_time;
+static int hf_zbee_zcl_met_get_profile_number_of_periods;
+static int hf_zbee_zcl_met_request_mirror_rsp_endpoint_id;
+static int hf_zbee_zcl_met_mirror_removed_removed_endpoint_id;
+static int hf_zbee_zcl_met_request_fast_poll_mode_fast_poll_update_period;
+static int hf_zbee_zcl_met_request_fast_poll_mode_duration;
+static int hf_zbee_zcl_met_schedule_snapshot_issuer_event_id;
+static int hf_zbee_zcl_met_schedule_snapshot_command_index;
+static int hf_zbee_zcl_met_schedule_snapshot_snapshot_schedule_payload_snapshot_schedule_id;
+static int hf_zbee_zcl_met_schedule_snapshot_snapshot_schedule_payload_snapshot_start_time;
+static int hf_zbee_zcl_met_schedule_snapshot_snapshot_schedule_payload_snapshot_schedule;
+static int hf_zbee_zcl_met_schedule_snapshot_snapshot_schedule_payload_shapshot_payload_type;
+static int hf_zbee_zcl_met_schedule_snapshot_snapshot_schedule_payload_snapshot_cause;
+static int hf_zbee_zcl_met_schedule_snapshot_total_number_of_commands;
+static int hf_zbee_zcl_met_take_snapshot_snapshot_cause;
+static int hf_zbee_zcl_met_get_snapshot_start_time;
+static int hf_zbee_zcl_met_get_snapshot_end_time;
+static int hf_zbee_zcl_met_get_snapshot_snapshot_offset;
+static int hf_zbee_zcl_met_get_snapshot_snapshot_cause;
+static int hf_zbee_zcl_met_start_sampling_issuer_event_id;
+static int hf_zbee_zcl_met_start_sampling_start_sampling_time;
+static int hf_zbee_zcl_met_start_sampling_sample_type;
+static int hf_zbee_zcl_met_start_sampling_sample_request_interval;
+static int hf_zbee_zcl_met_start_sampling_max_number_of_samples;
+static int hf_zbee_zcl_met_get_sampled_data_sample_id;
+static int hf_zbee_zcl_met_get_sampled_data_sample_start_time;
+static int hf_zbee_zcl_met_get_sampled_data_sample_type;
+static int hf_zbee_zcl_met_get_sampled_data_number_of_samples;
+static int hf_zbee_zcl_met_start_sampling_response_sample_id;
+static int hf_zbee_zcl_met_mirror_report_attribute_response_notification_scheme;
+static int hf_zbee_zcl_met_mirror_report_attribute_response_notification_flags_n;
+static int hf_zbee_zcl_met_reset_load_limit_counter_provider_id;
+static int hf_zbee_zcl_met_reset_load_limit_counter_issuer_event_id;
+static int hf_zbee_zcl_met_change_supply_provider_id;
+static int hf_zbee_zcl_met_change_supply_issuer_event_id;
+static int hf_zbee_zcl_met_change_supply_request_date_time;
+static int hf_zbee_zcl_met_change_supply_implementation_date_time;
+static int hf_zbee_zcl_met_change_supply_proposed_supply_status;
+static int hf_zbee_zcl_met_change_supply_supply_control_bits;
+static int hf_zbee_zcl_met_local_change_supply_proposed_supply_status;
+static int hf_zbee_zcl_met_set_supply_status_issuer_event_id;
+static int hf_zbee_zcl_met_set_supply_status_supply_tamper_state;
+static int hf_zbee_zcl_met_set_supply_status_supply_depletion_state;
+static int hf_zbee_zcl_met_set_supply_status_supply_uncontrolled_flow_state;
+static int hf_zbee_zcl_met_set_supply_status_load_limit_supply_state;
+static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_provider_id;
+static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_issuer_event_id;
+static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_uncontrolled_flow_threshold;
+static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_unit_of_measure;
+static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_multiplier;
+static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_divisor;
+static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_stabilisation_period;
+static int hf_zbee_zcl_met_set_uncontrolled_flow_threshold_measurement_period;
+static int hf_zbee_zcl_met_get_profile_response_end_time;
+static int hf_zbee_zcl_met_get_profile_response_status;
+static int hf_zbee_zcl_met_get_profile_response_profile_interval_period;
+static int hf_zbee_zcl_met_get_profile_response_number_of_periods_delivered;
+static int hf_zbee_zcl_met_get_profile_response_intervals;
+static int hf_zbee_zcl_met_request_fast_poll_mode_response_applied_update_period;
+static int hf_zbee_zcl_met_request_fast_poll_mode_response_fast_poll_mode_end_time;
+static int hf_zbee_zcl_met_schedule_snapshot_response_issuer_event_id;
+static int hf_zbee_zcl_met_schedule_snapshot_response_snapshot_schedule_id;
+static int hf_zbee_zcl_met_schedule_snapshot_response_snapshot_schedule_confirmation;
+static int hf_zbee_zcl_met_take_snapshot_response_snapshot_id;
+static int hf_zbee_zcl_met_take_snapshot_response_snapshot_confirmation;
+static int hf_zbee_zcl_met_publish_snapshot_snapshot_id;
+static int hf_zbee_zcl_met_publish_snapshot_snapshot_time;
+static int hf_zbee_zcl_met_publish_snapshot_snapshots_found;
+static int hf_zbee_zcl_met_publish_snapshot_cmd_index;
+static int hf_zbee_zcl_met_publish_snapshot_total_commands;
+static int hf_zbee_zcl_met_publish_snapshot_snapshot_cause;
+static int hf_zbee_zcl_met_publish_snapshot_snapshot_payload_type;
+static int hf_zbee_zcl_met_publish_snapshot_snapshot_sub_payload;
+static int hf_zbee_zcl_met_get_sampled_data_rsp_sample_id;
+static int hf_zbee_zcl_met_get_sampled_data_rsp_sample_start_time;
+static int hf_zbee_zcl_met_get_sampled_data_rsp_sample_type;
+static int hf_zbee_zcl_met_get_sampled_data_rsp_sample_request_interval;
+static int hf_zbee_zcl_met_get_sampled_data_rsp_sample_number_of_samples;
+static int hf_zbee_zcl_met_get_sampled_data_rsp_sample_samples;
+static int hf_zbee_zcl_met_configure_mirror_issuer_event_id;
+static int hf_zbee_zcl_met_configure_mirror_reporting_interval;
+static int hf_zbee_zcl_met_configure_mirror_mirror_notification_reporting;
+static int hf_zbee_zcl_met_configure_mirror_notification_scheme;
+static int hf_zbee_zcl_met_configure_notification_scheme_issuer_event_id;
+static int hf_zbee_zcl_met_configure_notification_scheme_notification_scheme;
+static int hf_zbee_zcl_met_configure_notification_scheme_notification_flag_order;
+static int hf_zbee_zcl_met_configure_notification_flags_issuer_event_id;
+static int hf_zbee_zcl_met_configure_notification_flags_notification_scheme;
+static int hf_zbee_zcl_met_configure_notification_flags_notification_flag_attribute_id;
+static int hf_zbee_zcl_met_configure_notification_flags_bit_field_allocation_cluster_id;
+static int hf_zbee_zcl_met_configure_notification_flags_bit_field_allocation_manufacturer_code;
+static int hf_zbee_zcl_met_configure_notification_flags_bit_field_allocation_no_of_commands;
+static int hf_zbee_zcl_met_configure_notification_flags_bit_field_allocation_command_identifier;
+static int hf_zbee_zcl_met_get_notified_msg_notification_scheme;
+static int hf_zbee_zcl_met_get_notified_msg_notification_flag_attribute_id;
+static int hf_zbee_zcl_met_get_notified_msg_notification_flags;
+static int hf_zbee_zcl_met_supply_status_response_provider_id;
+static int hf_zbee_zcl_met_supply_status_response_issuer_event_id;
+static int hf_zbee_zcl_met_supply_status_response_implementation_date_time;
+static int hf_zbee_zcl_met_supply_status_response_supply_status_after_implementation;
+static int hf_zbee_zcl_met_snapshot_cause_general;
+static int hf_zbee_zcl_met_snapshot_cause_end_of_billing_period;
+static int hf_zbee_zcl_met_snapshot_cause_end_of_block_period;
+static int hf_zbee_zcl_met_snapshot_cause_change_of_tariff_information;
+static int hf_zbee_zcl_met_snapshot_cause_change_of_price_matrix;
+static int hf_zbee_zcl_met_snapshot_cause_change_of_block_thresholds;
+static int hf_zbee_zcl_met_snapshot_cause_change_of_cv;
+static int hf_zbee_zcl_met_snapshot_cause_change_of_cf;
+static int hf_zbee_zcl_met_snapshot_cause_change_of_calendar;
+static int hf_zbee_zcl_met_snapshot_cause_critical_peak_pricing;
+static int hf_zbee_zcl_met_snapshot_cause_manually_triggered_from_client;
+static int hf_zbee_zcl_met_snapshot_cause_end_of_resolve_period;
+static int hf_zbee_zcl_met_snapshot_cause_change_of_tenancy;
+static int hf_zbee_zcl_met_snapshot_cause_change_of_supplier;
+static int hf_zbee_zcl_met_snapshot_cause_change_of_meter_mode;
+static int hf_zbee_zcl_met_snapshot_cause_debt_payment;
+static int hf_zbee_zcl_met_snapshot_cause_scheduled_snapshot;
+static int hf_zbee_zcl_met_snapshot_cause_ota_firmware_download;
+static int hf_zbee_zcl_met_snapshot_cause_reserved;
+static int hf_zbee_zcl_met_snapshot_schedule_frequency;
+static int hf_zbee_zcl_met_snapshot_schedule_frequency_type;
+static int hf_zbee_zcl_met_snapshot_schedule_frequency_wild_card;
 
 static int* const zbee_zcl_met_snapshot_schedule_bits[] = {
     &hf_zbee_zcl_met_snapshot_schedule_frequency,
@@ -5956,18 +5956,18 @@ static int* const zbee_zcl_met_snapshot_cause_flags[] = {
 };
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_met = -1;
-static gint ett_zbee_zcl_met_func_noti_flags = -1;
-static gint ett_zbee_zcl_met_noti_flags_2 = -1;
-static gint ett_zbee_zcl_met_noti_flags_3 = -1;
-static gint ett_zbee_zcl_met_noti_flags_4 = -1;
-static gint ett_zbee_zcl_met_noti_flags_5 = -1;
-static gint ett_zbee_zcl_met_snapshot_cause_flags = -1;
-static gint ett_zbee_zcl_met_snapshot_schedule = -1;
-static gint ett_zbee_zcl_met_schedule_snapshot_response_payload = -1;
-static gint ett_zbee_zcl_met_schedule_snapshot_payload = -1;
-static gint ett_zbee_zcl_met_mirror_noti_flag = -1;
-static gint ett_zbee_zcl_met_bit_field_allocation = -1;
+static gint ett_zbee_zcl_met;
+static gint ett_zbee_zcl_met_func_noti_flags;
+static gint ett_zbee_zcl_met_noti_flags_2;
+static gint ett_zbee_zcl_met_noti_flags_3;
+static gint ett_zbee_zcl_met_noti_flags_4;
+static gint ett_zbee_zcl_met_noti_flags_5;
+static gint ett_zbee_zcl_met_snapshot_cause_flags;
+static gint ett_zbee_zcl_met_snapshot_schedule;
+static gint ett_zbee_zcl_met_schedule_snapshot_response_payload;
+static gint ett_zbee_zcl_met_schedule_snapshot_payload;
+static gint ett_zbee_zcl_met_mirror_noti_flag;
+static gint ett_zbee_zcl_met_bit_field_allocation;
 
 /*************************/
 /* Function Bodies       */
@@ -7996,34 +7996,34 @@ static void decode_zcl_msg_duration             (gchar *s, guint16 value);
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_msg = -1;
-
-static int hf_zbee_zcl_msg_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_msg_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_msg_message_id = -1;
-static int hf_zbee_zcl_msg_ctrl = -1;
-static int hf_zbee_zcl_msg_ctrl_tx = -1;
-static int hf_zbee_zcl_msg_ctrl_importance = -1;
-static int hf_zbee_zcl_msg_ctrl_enh_confirm = -1;
-static int hf_zbee_zcl_msg_ctrl_reserved = -1;
-static int hf_zbee_zcl_msg_ctrl_confirm = -1;
-static int hf_zbee_zcl_msg_ext_ctrl = -1;
-static int hf_zbee_zcl_msg_ext_ctrl_status = -1;
-static int hf_zbee_zcl_msg_start_time = -1;
-static int hf_zbee_zcl_msg_duration = -1;
-static int hf_zbee_zcl_msg_message = -1;
-static int hf_zbee_zcl_msg_confirm_time = -1;
-static int hf_zbee_zcl_msg_confirm_ctrl = -1;
-static int hf_zbee_zcl_msg_confirm_response = -1;
-static int hf_zbee_zcl_msg_implementation_time = -1;
-static int hf_zbee_zcl_msg_earliest_time = -1;
+static int proto_zbee_zcl_msg;
+
+static int hf_zbee_zcl_msg_srv_tx_cmd_id;
+static int hf_zbee_zcl_msg_srv_rx_cmd_id;
+static int hf_zbee_zcl_msg_message_id;
+static int hf_zbee_zcl_msg_ctrl;
+static int hf_zbee_zcl_msg_ctrl_tx;
+static int hf_zbee_zcl_msg_ctrl_importance;
+static int hf_zbee_zcl_msg_ctrl_enh_confirm;
+static int hf_zbee_zcl_msg_ctrl_reserved;
+static int hf_zbee_zcl_msg_ctrl_confirm;
+static int hf_zbee_zcl_msg_ext_ctrl;
+static int hf_zbee_zcl_msg_ext_ctrl_status;
+static int hf_zbee_zcl_msg_start_time;
+static int hf_zbee_zcl_msg_duration;
+static int hf_zbee_zcl_msg_message;
+static int hf_zbee_zcl_msg_confirm_time;
+static int hf_zbee_zcl_msg_confirm_ctrl;
+static int hf_zbee_zcl_msg_confirm_response;
+static int hf_zbee_zcl_msg_implementation_time;
+static int hf_zbee_zcl_msg_earliest_time;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_msg = -1;
-static gint ett_zbee_zcl_msg_message_control = -1;
-static gint ett_zbee_zcl_msg_ext_message_control = -1;
+static gint ett_zbee_zcl_msg;
+static gint ett_zbee_zcl_msg_message_control;
+static gint ett_zbee_zcl_msg_ext_message_control;
 
-static expert_field ei_zbee_zcl_msg_msg_ctrl_deprecated = EI_INIT;
+static expert_field ei_zbee_zcl_msg_msg_ctrl_deprecated;
 
 /* Message Control Transmission */
 static const value_string zbee_zcl_msg_ctrl_tx_names[] = {
@@ -8525,29 +8525,29 @@ static void dissect_zcl_tun_attr_data  (proto_tree *tree, tvbuff_t *tvb, guint *
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_tun = -1;
-
-static int hf_zbee_zcl_tun_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_tun_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_tun_attr_id = -1;
-static int hf_zbee_zcl_tun_attr_reporting_status = -1;
-static int hf_zbee_zcl_tun_attr_close_timeout = -1;
-static int hf_zbee_zcl_tun_protocol_id = -1;
-static int hf_zbee_zcl_tun_manufacturer_code = -1;
-static int hf_zbee_zcl_tun_flow_control_support = -1;
-static int hf_zbee_zcl_tun_max_in_size = -1;
-static int hf_zbee_zcl_tun_tunnel_id = -1;
-static int hf_zbee_zcl_tun_num_octets_left = -1;
-static int hf_zbee_zcl_tun_protocol_offset = -1;
-static int hf_zbee_zcl_tun_protocol_list_complete = -1;
-static int hf_zbee_zcl_tun_protocol_count = -1;
-static int hf_zbee_zcl_tun_transfer_status = -1;
-static int hf_zbee_zcl_tun_transfer_data_status = -1;
+static int proto_zbee_zcl_tun;
+
+static int hf_zbee_zcl_tun_srv_tx_cmd_id;
+static int hf_zbee_zcl_tun_srv_rx_cmd_id;
+static int hf_zbee_zcl_tun_attr_id;
+static int hf_zbee_zcl_tun_attr_reporting_status;
+static int hf_zbee_zcl_tun_attr_close_timeout;
+static int hf_zbee_zcl_tun_protocol_id;
+static int hf_zbee_zcl_tun_manufacturer_code;
+static int hf_zbee_zcl_tun_flow_control_support;
+static int hf_zbee_zcl_tun_max_in_size;
+static int hf_zbee_zcl_tun_tunnel_id;
+static int hf_zbee_zcl_tun_num_octets_left;
+static int hf_zbee_zcl_tun_protocol_offset;
+static int hf_zbee_zcl_tun_protocol_list_complete;
+static int hf_zbee_zcl_tun_protocol_count;
+static int hf_zbee_zcl_tun_transfer_status;
+static int hf_zbee_zcl_tun_transfer_data_status;
 
 static heur_dissector_list_t zbee_zcl_tun_heur_subdissector_list;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_tun = -1;
+static gint ett_zbee_zcl_tun;
 
 #define zbee_zcl_tun_protocol_names_VALUE_STRING_LIST(XXX) \
     XXX(ZBEE_ZCL_TUN_PROTO_DLMS,                                0x00, "DLMS/COSEM (IEC 62056)" ) \
@@ -9272,108 +9272,108 @@ static void dissect_zcl_pp_publish_debt_log                     (tvbuff_t *tvb,
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_pp = -1;
-
-static int hf_zbee_zcl_pp_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_pp_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_pp_attr_id = -1;
-static int hf_zbee_zcl_pp_attr_reporting_status = -1;
-static int hf_zbee_zcl_pp_select_available_emc_cmd_issue_date_time = -1;
-static int hf_zbee_zcl_pp_select_available_emc_originating_device = -1;
-static int hf_zbee_zcl_pp_change_debt_issuer_event_id = -1;
-static int hf_zbee_zcl_pp_change_debt_label = -1;
-static int hf_zbee_zcl_pp_change_debt_amount = -1;
-static int hf_zbee_zcl_pp_change_debt_recovery_method = -1;
-static int hf_zbee_zcl_pp_change_debt_amount_type = -1;
-static int hf_zbee_zcl_pp_change_debt_recovery_start_time = -1;
-static int hf_zbee_zcl_pp_change_debt_recovery_collection_time = -1;
-static int hf_zbee_zcl_pp_change_debt_recovery_frequency = -1;
-static int hf_zbee_zcl_pp_change_debt_recovery_amount = -1;
-static int hf_zbee_zcl_pp_change_debt_recovery_balance_percentage = -1;
-static int hf_zbee_zcl_pp_emergency_credit_setup_issuer_event_id = -1;
-static int hf_zbee_zcl_pp_emergency_credit_setup_start_time = -1;
-static int hf_zbee_zcl_pp_emergency_credit_setup_emergency_credit_limit = -1;
-static int hf_zbee_zcl_pp_emergency_credit_setup_emergency_credit_threshold = -1;
-static int hf_zbee_zcl_pp_consumer_top_up_originating_device = -1;
-static int hf_zbee_zcl_pp_consumer_top_up_top_up_code = -1;
-static int hf_zbee_zcl_pp_credit_adjustment_issuer_event_id = -1;
-static int hf_zbee_zcl_pp_credit_adjustment_start_time = -1;
-static int hf_zbee_zcl_pp_credit_adjustment_credit_adjustment_type = -1;
-static int hf_zbee_zcl_pp_credit_adjustment_credit_adjustment_value = -1;
-static int hf_zbee_zcl_pp_change_payment_mode_provider_id = -1;
-static int hf_zbee_zcl_pp_change_payment_mode_issuer_event_id = -1;
-static int hf_zbee_zcl_pp_change_payment_mode_implementation_date_time = -1;
-static int hf_zbee_zcl_pp_change_payment_mode_proposed_payment_control_configuration = -1;
-static int hf_zbee_zcl_pp_change_payment_mode_cut_off_value = -1;
-static int hf_zbee_zcl_pp_get_prepay_snapshot_earliest_start_time = -1;
-static int hf_zbee_zcl_pp_get_prepay_snapshot_latest_end_time = -1;
-static int hf_zbee_zcl_pp_get_prepay_snapshot_snapshot_offset = -1;
-static int hf_zbee_zcl_pp_get_prepay_snapshot_snapshot_cause = -1;
-static int hf_zbee_zcl_pp_get_top_up_log_latest_end_time = -1;
-static int hf_zbee_zcl_pp_get_top_up_log_number_of_records = -1;
-static int hf_zbee_zcl_pp_set_low_credit_warning_level_low_credit_warning_level = -1;
-static int hf_zbee_zcl_pp_get_debt_repayment_log_latest_end_time = -1;
-static int hf_zbee_zcl_pp_get_debt_repayment_log_number_of_debts = -1;
-static int hf_zbee_zcl_pp_get_debt_repayment_log_debt_type = -1;
-static int hf_zbee_zcl_pp_set_maximum_credit_limit_provider_id = -1;
-static int hf_zbee_zcl_pp_set_maximum_credit_limit_issuer_event_id = -1;
-static int hf_zbee_zcl_pp_set_maximum_credit_limit_implementation_date_time = -1;
-static int hf_zbee_zcl_pp_set_maximum_credit_limit_maximum_credit_level = -1;
-static int hf_zbee_zcl_pp_set_maximum_credit_limit_maximum_credit_per_top_up = -1;
-static int hf_zbee_zcl_pp_set_overall_debt_cap_limit_provider_id = -1;
-static int hf_zbee_zcl_pp_set_overall_debt_cap_limit_issuer_event_id = -1;
-static int hf_zbee_zcl_pp_set_overall_debt_cap_limit_implementation_date_time = -1;
-static int hf_zbee_zcl_pp_set_overall_debt_cap_limit_overall_debt_cap = -1;
-static int hf_zbee_zcl_pp_publish_prepay_snapshot_snapshot_id = -1;
-static int hf_zbee_zcl_pp_publish_prepay_snapshot_snapshot_time = -1;
-static int hf_zbee_zcl_pp_publish_prepay_snapshot_total_snapshots_found = -1;
-static int hf_zbee_zcl_pp_publish_prepay_snapshot_command_index = -1;
-static int hf_zbee_zcl_pp_publish_prepay_snapshot_total_number_of_commands = -1;
-static int hf_zbee_zcl_pp_publish_prepay_snapshot_snapshot_cause = -1;
-static int hf_zbee_zcl_pp_publish_prepay_snapshot_snapshot_payload_type = -1;
-static int hf_zbee_zcl_pp_publish_prepay_snapshot_snapshot_payload = -1;
-static int hf_zbee_zcl_pp_change_payment_mode_response_friendly_credit = -1;
-static int hf_zbee_zcl_pp_change_payment_mode_response_friendly_credit_calendar_id = -1;
-static int hf_zbee_zcl_pp_change_payment_mode_response_emergency_credit_limit = -1;
-static int hf_zbee_zcl_pp_change_payment_mode_response_emergency_credit_threshold = -1;
-static int hf_zbee_zcl_pp_consumer_top_up_response_result_type = -1;
-static int hf_zbee_zcl_pp_consumer_top_up_response_top_up_value = -1;
-static int hf_zbee_zcl_pp_consumer_top_up_response_source_of_top_up = -1;
-static int hf_zbee_zcl_pp_consumer_top_up_response_credit_remaining = -1;
-static int hf_zbee_zcl_pp_publish_top_up_log_command_index = -1;
-static int hf_zbee_zcl_pp_publish_top_up_log_total_number_of_commands = -1;
-static int hf_zbee_zcl_pp_publish_top_up_log_top_up_code = -1;
-static int hf_zbee_zcl_pp_publish_top_up_log_top_up_amount = -1;
-static int hf_zbee_zcl_pp_publish_top_up_log_top_up_time = -1;
-static int hf_zbee_zcl_pp_publish_debt_log_command_index = -1;
-static int hf_zbee_zcl_pp_publish_debt_log_total_number_of_commands = -1;
-static int hf_zbee_zcl_pp_publish_debt_log_collection_time = -1;
-static int hf_zbee_zcl_pp_publish_debt_log_amount_collected = -1;
-static int hf_zbee_zcl_pp_publish_debt_log_debt_type = -1;
-static int hf_zbee_zcl_pp_publish_debt_log_outstanding_debt = -1;
-static int hf_zbee_zcl_pp_payment_control_configuration = -1;
-static int hf_zbee_zcl_pp_payment_control_configuration_disconnection_enabled = -1;
-static int hf_zbee_zcl_pp_payment_control_configuration_prepayment_enabled = -1;
-static int hf_zbee_zcl_pp_payment_control_configuration_credit_management_enabled = -1;
-static int hf_zbee_zcl_pp_payment_control_configuration_credit_display_enabled = -1;
-static int hf_zbee_zcl_pp_payment_control_configuration_account_base = -1;
-static int hf_zbee_zcl_pp_payment_control_configuration_contactor_fitted = -1;
-static int hf_zbee_zcl_pp_payment_control_configuration_standing_charge_configuration = -1;
-static int hf_zbee_zcl_pp_payment_control_configuration_emergency_standing_charge_configuration = -1;
-static int hf_zbee_zcl_pp_payment_control_configuration_debt_configuration = -1;
-static int hf_zbee_zcl_pp_payment_control_configuration_emergency_debt_configuration = -1;
-static int hf_zbee_zcl_pp_payment_control_configuration_reserved = -1;
-static int hf_zbee_zcl_pp_snapshot_payload_cause_general = -1;
-static int hf_zbee_zcl_pp_snapshot_payload_cause_end_of_billing_period = -1;
-static int hf_zbee_zcl_pp_snapshot_payload_cause_change_of_tariff_information = -1;
-static int hf_zbee_zcl_pp_snapshot_payload_cause_change_of_price_matrix = -1;
-static int hf_zbee_zcl_pp_snapshot_payload_cause_manually_triggered_from_client = -1;
-static int hf_zbee_zcl_pp_snapshot_payload_cause_change_of_tenancy = -1;
-static int hf_zbee_zcl_pp_snapshot_payload_cause_change_of_supplier = -1;
-static int hf_zbee_zcl_pp_snapshot_payload_cause_change_of_meter_mode = -1;
-static int hf_zbee_zcl_pp_snapshot_payload_cause_top_up_addition = -1;
-static int hf_zbee_zcl_pp_snapshot_payload_cause_debt_credit_addition = -1;
-static int hf_zbee_zcl_pp_snapshot_payload_cause_reserved = -1;
+static int proto_zbee_zcl_pp;
+
+static int hf_zbee_zcl_pp_srv_tx_cmd_id;
+static int hf_zbee_zcl_pp_srv_rx_cmd_id;
+static int hf_zbee_zcl_pp_attr_id;
+static int hf_zbee_zcl_pp_attr_reporting_status;
+static int hf_zbee_zcl_pp_select_available_emc_cmd_issue_date_time;
+static int hf_zbee_zcl_pp_select_available_emc_originating_device;
+static int hf_zbee_zcl_pp_change_debt_issuer_event_id;
+static int hf_zbee_zcl_pp_change_debt_label;
+static int hf_zbee_zcl_pp_change_debt_amount;
+static int hf_zbee_zcl_pp_change_debt_recovery_method;
+static int hf_zbee_zcl_pp_change_debt_amount_type;
+static int hf_zbee_zcl_pp_change_debt_recovery_start_time;
+static int hf_zbee_zcl_pp_change_debt_recovery_collection_time;
+static int hf_zbee_zcl_pp_change_debt_recovery_frequency;
+static int hf_zbee_zcl_pp_change_debt_recovery_amount;
+static int hf_zbee_zcl_pp_change_debt_recovery_balance_percentage;
+static int hf_zbee_zcl_pp_emergency_credit_setup_issuer_event_id;
+static int hf_zbee_zcl_pp_emergency_credit_setup_start_time;
+static int hf_zbee_zcl_pp_emergency_credit_setup_emergency_credit_limit;
+static int hf_zbee_zcl_pp_emergency_credit_setup_emergency_credit_threshold;
+static int hf_zbee_zcl_pp_consumer_top_up_originating_device;
+static int hf_zbee_zcl_pp_consumer_top_up_top_up_code;
+static int hf_zbee_zcl_pp_credit_adjustment_issuer_event_id;
+static int hf_zbee_zcl_pp_credit_adjustment_start_time;
+static int hf_zbee_zcl_pp_credit_adjustment_credit_adjustment_type;
+static int hf_zbee_zcl_pp_credit_adjustment_credit_adjustment_value;
+static int hf_zbee_zcl_pp_change_payment_mode_provider_id;
+static int hf_zbee_zcl_pp_change_payment_mode_issuer_event_id;
+static int hf_zbee_zcl_pp_change_payment_mode_implementation_date_time;
+static int hf_zbee_zcl_pp_change_payment_mode_proposed_payment_control_configuration;
+static int hf_zbee_zcl_pp_change_payment_mode_cut_off_value;
+static int hf_zbee_zcl_pp_get_prepay_snapshot_earliest_start_time;
+static int hf_zbee_zcl_pp_get_prepay_snapshot_latest_end_time;
+static int hf_zbee_zcl_pp_get_prepay_snapshot_snapshot_offset;
+static int hf_zbee_zcl_pp_get_prepay_snapshot_snapshot_cause;
+static int hf_zbee_zcl_pp_get_top_up_log_latest_end_time;
+static int hf_zbee_zcl_pp_get_top_up_log_number_of_records;
+static int hf_zbee_zcl_pp_set_low_credit_warning_level_low_credit_warning_level;
+static int hf_zbee_zcl_pp_get_debt_repayment_log_latest_end_time;
+static int hf_zbee_zcl_pp_get_debt_repayment_log_number_of_debts;
+static int hf_zbee_zcl_pp_get_debt_repayment_log_debt_type;
+static int hf_zbee_zcl_pp_set_maximum_credit_limit_provider_id;
+static int hf_zbee_zcl_pp_set_maximum_credit_limit_issuer_event_id;
+static int hf_zbee_zcl_pp_set_maximum_credit_limit_implementation_date_time;
+static int hf_zbee_zcl_pp_set_maximum_credit_limit_maximum_credit_level;
+static int hf_zbee_zcl_pp_set_maximum_credit_limit_maximum_credit_per_top_up;
+static int hf_zbee_zcl_pp_set_overall_debt_cap_limit_provider_id;
+static int hf_zbee_zcl_pp_set_overall_debt_cap_limit_issuer_event_id;
+static int hf_zbee_zcl_pp_set_overall_debt_cap_limit_implementation_date_time;
+static int hf_zbee_zcl_pp_set_overall_debt_cap_limit_overall_debt_cap;
+static int hf_zbee_zcl_pp_publish_prepay_snapshot_snapshot_id;
+static int hf_zbee_zcl_pp_publish_prepay_snapshot_snapshot_time;
+static int hf_zbee_zcl_pp_publish_prepay_snapshot_total_snapshots_found;
+static int hf_zbee_zcl_pp_publish_prepay_snapshot_command_index;
+static int hf_zbee_zcl_pp_publish_prepay_snapshot_total_number_of_commands;
+static int hf_zbee_zcl_pp_publish_prepay_snapshot_snapshot_cause;
+static int hf_zbee_zcl_pp_publish_prepay_snapshot_snapshot_payload_type;
+static int hf_zbee_zcl_pp_publish_prepay_snapshot_snapshot_payload;
+static int hf_zbee_zcl_pp_change_payment_mode_response_friendly_credit;
+static int hf_zbee_zcl_pp_change_payment_mode_response_friendly_credit_calendar_id;
+static int hf_zbee_zcl_pp_change_payment_mode_response_emergency_credit_limit;
+static int hf_zbee_zcl_pp_change_payment_mode_response_emergency_credit_threshold;
+static int hf_zbee_zcl_pp_consumer_top_up_response_result_type;
+static int hf_zbee_zcl_pp_consumer_top_up_response_top_up_value;
+static int hf_zbee_zcl_pp_consumer_top_up_response_source_of_top_up;
+static int hf_zbee_zcl_pp_consumer_top_up_response_credit_remaining;
+static int hf_zbee_zcl_pp_publish_top_up_log_command_index;
+static int hf_zbee_zcl_pp_publish_top_up_log_total_number_of_commands;
+static int hf_zbee_zcl_pp_publish_top_up_log_top_up_code;
+static int hf_zbee_zcl_pp_publish_top_up_log_top_up_amount;
+static int hf_zbee_zcl_pp_publish_top_up_log_top_up_time;
+static int hf_zbee_zcl_pp_publish_debt_log_command_index;
+static int hf_zbee_zcl_pp_publish_debt_log_total_number_of_commands;
+static int hf_zbee_zcl_pp_publish_debt_log_collection_time;
+static int hf_zbee_zcl_pp_publish_debt_log_amount_collected;
+static int hf_zbee_zcl_pp_publish_debt_log_debt_type;
+static int hf_zbee_zcl_pp_publish_debt_log_outstanding_debt;
+static int hf_zbee_zcl_pp_payment_control_configuration;
+static int hf_zbee_zcl_pp_payment_control_configuration_disconnection_enabled;
+static int hf_zbee_zcl_pp_payment_control_configuration_prepayment_enabled;
+static int hf_zbee_zcl_pp_payment_control_configuration_credit_management_enabled;
+static int hf_zbee_zcl_pp_payment_control_configuration_credit_display_enabled;
+static int hf_zbee_zcl_pp_payment_control_configuration_account_base;
+static int hf_zbee_zcl_pp_payment_control_configuration_contactor_fitted;
+static int hf_zbee_zcl_pp_payment_control_configuration_standing_charge_configuration;
+static int hf_zbee_zcl_pp_payment_control_configuration_emergency_standing_charge_configuration;
+static int hf_zbee_zcl_pp_payment_control_configuration_debt_configuration;
+static int hf_zbee_zcl_pp_payment_control_configuration_emergency_debt_configuration;
+static int hf_zbee_zcl_pp_payment_control_configuration_reserved;
+static int hf_zbee_zcl_pp_snapshot_payload_cause_general;
+static int hf_zbee_zcl_pp_snapshot_payload_cause_end_of_billing_period;
+static int hf_zbee_zcl_pp_snapshot_payload_cause_change_of_tariff_information;
+static int hf_zbee_zcl_pp_snapshot_payload_cause_change_of_price_matrix;
+static int hf_zbee_zcl_pp_snapshot_payload_cause_manually_triggered_from_client;
+static int hf_zbee_zcl_pp_snapshot_payload_cause_change_of_tenancy;
+static int hf_zbee_zcl_pp_snapshot_payload_cause_change_of_supplier;
+static int hf_zbee_zcl_pp_snapshot_payload_cause_change_of_meter_mode;
+static int hf_zbee_zcl_pp_snapshot_payload_cause_top_up_addition;
+static int hf_zbee_zcl_pp_snapshot_payload_cause_debt_credit_addition;
+static int hf_zbee_zcl_pp_snapshot_payload_cause_reserved;
 
 static int* const zbee_zcl_pp_payment_control_configuration_flags[] = {
         &hf_zbee_zcl_pp_payment_control_configuration_disconnection_enabled,
@@ -9413,9 +9413,9 @@ static int* const zbee_zcl_pp_snapshot_payload_cause_flags[] = {
                                                        ZBEE_ZCL_SE_PP_NUM_PUBLISH_TOP_UP_LOG_ETT + \
                                                        ZBEE_ZCL_SE_PP_NUM_PUBLISH_DEBT_LOG_ETT)
 
-static gint ett_zbee_zcl_pp = -1;
-static gint ett_zbee_zcl_pp_payment_control_configuration = -1;
-static gint ett_zbee_zcl_pp_snapshot_payload_cause = -1;
+static gint ett_zbee_zcl_pp;
+static gint ett_zbee_zcl_pp_payment_control_configuration;
+static gint ett_zbee_zcl_pp_snapshot_payload_cause;
 static gint ett_zbee_zcl_pp_publish_top_up_entry[ZBEE_ZCL_SE_PP_NUM_PUBLISH_TOP_UP_LOG_ETT];
 static gint ett_zbee_zcl_pp_publish_debt_log_entry[ZBEE_ZCL_SE_PP_NUM_PUBLISH_DEBT_LOG_ETT];
 
@@ -10645,47 +10645,47 @@ static void dissect_zcl_energy_management_attr_data                     (proto_t
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_energy_management = -1;
-
-static int hf_zbee_zcl_energy_management_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_energy_management_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_energy_management_attr_id = -1;
-static int hf_zbee_zcl_energy_management_attr_reporting_status = -1;
-static int hf_zbee_zcl_energy_management_issuer_event_id = -1;
-static int hf_zbee_zcl_energy_management_device_class = -1;
-static int hf_zbee_zcl_energy_management_device_class_hvac_compressor_or_furnace = -1;
-static int hf_zbee_zcl_energy_management_device_class_strip_heaters_baseboard_heaters = -1;
-static int hf_zbee_zcl_energy_management_device_class_water_heater = -1;
-static int hf_zbee_zcl_energy_management_device_class_pool_pump_spa_jacuzzi = -1;
-static int hf_zbee_zcl_energy_management_device_class_smart_appliances = -1;
-static int hf_zbee_zcl_energy_management_device_class_irrigation_pump = -1;
-static int hf_zbee_zcl_energy_management_device_class_managed_c_i_loads= -1;
-static int hf_zbee_zcl_energy_management_device_class_simple_misc_loads = -1;
-static int hf_zbee_zcl_energy_management_device_class_exterior_lighting = -1;
-static int hf_zbee_zcl_energy_management_device_class_interior_lighting = -1;
-static int hf_zbee_zcl_energy_management_device_class_electric_vehicle = -1;
-static int hf_zbee_zcl_energy_management_device_class_generation_systems = -1;
-static int hf_zbee_zcl_energy_management_device_class_reserved = -1;
-static int hf_zbee_zcl_energy_management_utility_enrollment_group = -1;
-static int hf_zbee_zcl_energy_management_action_required = -1;
-static int hf_zbee_zcl_energy_management_action_required_opt_out_of_event = -1;
-static int hf_zbee_zcl_energy_management_action_required_opt_into_event = -1;
-static int hf_zbee_zcl_energy_management_action_required_disable_duty_cycling = -1;
-static int hf_zbee_zcl_energy_management_action_required_enable_duty_cycling = -1;
-static int hf_zbee_zcl_energy_management_action_required_reserved = -1;
-
-static int hf_zbee_zcl_energy_management_report_event_issuer_event_id = -1;
-static int hf_zbee_zcl_energy_management_report_event_event_status = -1;
-static int hf_zbee_zcl_energy_management_report_event_event_status_time = -1;
-static int hf_zbee_zcl_energy_management_report_event_criticality_level_applied = -1;
-static int hf_zbee_zcl_energy_management_report_event_cooling_temp_set_point_applied = -1;
-static int hf_zbee_zcl_energy_management_report_event_heating_temp_set_point_applied = -1;
-static int hf_zbee_zcl_energy_management_report_event_average_load_adjustment_percentage = -1;
-static int hf_zbee_zcl_energy_management_report_event_duty_cycle = -1;
-static int hf_zbee_zcl_energy_management_report_event_event_control = -1;
-static int hf_zbee_zcl_energy_management_report_event_event_control_randomize_start_time = -1;
-static int hf_zbee_zcl_energy_management_report_event_event_control_randomize_duration_time = -1;
-static int hf_zbee_zcl_energy_management_report_event_event_control_reserved = -1;
+static int proto_zbee_zcl_energy_management;
+
+static int hf_zbee_zcl_energy_management_srv_tx_cmd_id;
+static int hf_zbee_zcl_energy_management_srv_rx_cmd_id;
+static int hf_zbee_zcl_energy_management_attr_id;
+static int hf_zbee_zcl_energy_management_attr_reporting_status;
+static int hf_zbee_zcl_energy_management_issuer_event_id;
+static int hf_zbee_zcl_energy_management_device_class;
+static int hf_zbee_zcl_energy_management_device_class_hvac_compressor_or_furnace;
+static int hf_zbee_zcl_energy_management_device_class_strip_heaters_baseboard_heaters;
+static int hf_zbee_zcl_energy_management_device_class_water_heater;
+static int hf_zbee_zcl_energy_management_device_class_pool_pump_spa_jacuzzi;
+static int hf_zbee_zcl_energy_management_device_class_smart_appliances;
+static int hf_zbee_zcl_energy_management_device_class_irrigation_pump;
+static int hf_zbee_zcl_energy_management_device_class_managed_c_i_loads;
+static int hf_zbee_zcl_energy_management_device_class_simple_misc_loads;
+static int hf_zbee_zcl_energy_management_device_class_exterior_lighting;
+static int hf_zbee_zcl_energy_management_device_class_interior_lighting;
+static int hf_zbee_zcl_energy_management_device_class_electric_vehicle;
+static int hf_zbee_zcl_energy_management_device_class_generation_systems;
+static int hf_zbee_zcl_energy_management_device_class_reserved;
+static int hf_zbee_zcl_energy_management_utility_enrollment_group;
+static int hf_zbee_zcl_energy_management_action_required;
+static int hf_zbee_zcl_energy_management_action_required_opt_out_of_event;
+static int hf_zbee_zcl_energy_management_action_required_opt_into_event;
+static int hf_zbee_zcl_energy_management_action_required_disable_duty_cycling;
+static int hf_zbee_zcl_energy_management_action_required_enable_duty_cycling;
+static int hf_zbee_zcl_energy_management_action_required_reserved;
+
+static int hf_zbee_zcl_energy_management_report_event_issuer_event_id;
+static int hf_zbee_zcl_energy_management_report_event_event_status;
+static int hf_zbee_zcl_energy_management_report_event_event_status_time;
+static int hf_zbee_zcl_energy_management_report_event_criticality_level_applied;
+static int hf_zbee_zcl_energy_management_report_event_cooling_temp_set_point_applied;
+static int hf_zbee_zcl_energy_management_report_event_heating_temp_set_point_applied;
+static int hf_zbee_zcl_energy_management_report_event_average_load_adjustment_percentage;
+static int hf_zbee_zcl_energy_management_report_event_duty_cycle;
+static int hf_zbee_zcl_energy_management_report_event_event_control;
+static int hf_zbee_zcl_energy_management_report_event_event_control_randomize_start_time;
+static int hf_zbee_zcl_energy_management_report_event_event_control_randomize_duration_time;
+static int hf_zbee_zcl_energy_management_report_event_event_control_reserved;
 
 
 static int* const zbee_zcl_energy_management_device_classes[] = {
@@ -10722,10 +10722,10 @@ static int* const hf_zbee_zcl_energy_management_event_control_flags[] = {
 };
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_energy_management = -1;
-static gint ett_zbee_zcl_energy_management_device_class = -1;
-static gint ett_zbee_zcl_energy_management_actions_required = -1;
-static gint ett_zbee_zcl_energy_management_report_event_event_control = -1;
+static gint ett_zbee_zcl_energy_management;
+static gint ett_zbee_zcl_energy_management_device_class;
+static gint ett_zbee_zcl_energy_management_actions_required;
+static gint ett_zbee_zcl_energy_management_report_event_event_control;
 
 static const range_string zbee_zcl_energy_management_load_control_event_criticality_level[] = {
     { 0x0, 0x0,   "Reserved" },
@@ -11214,58 +11214,58 @@ static void dissect_zcl_calendar_cancel(tvbuff_t *tvb, proto_tree *tree, guint *
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_calendar = -1;
-
-static int hf_zbee_zcl_calendar_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_calendar_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_calendar_attr_id = -1;
-static int hf_zbee_zcl_calendar_attr_reporting_status = -1;
-static int hf_zbee_zcl_calendar_type = -1;
-static int hf_zbee_zcl_calendar_start_time = -1;
-static int hf_zbee_zcl_calendar_earliest_start_time = -1;
-static int hf_zbee_zcl_calendar_time_reference = -1;
-static int hf_zbee_zcl_calendar_name = -1;
-static int hf_zbee_zcl_calendar_command_index = -1;
-static int hf_zbee_zcl_calendar_date_year = -1;
-static int hf_zbee_zcl_calendar_date_month = -1;
-static int hf_zbee_zcl_calendar_date_month_day = -1;
-static int hf_zbee_zcl_calendar_date_week_day = -1;
-static int hf_zbee_zcl_calendar_provider_id = -1;
-static int hf_zbee_zcl_calendar_issuer_event_id = -1;
-static int hf_zbee_zcl_calendar_min_issuer_event_id = -1;
-static int hf_zbee_zcl_calendar_issuer_calendar_id = -1;
-static int hf_zbee_zcl_calendar_day_id = -1;
-static int hf_zbee_zcl_calendar_day_id_ref = -1;
-static int hf_zbee_zcl_calendar_day_id_ref_monday = -1;
-static int hf_zbee_zcl_calendar_day_id_ref_tuesday = -1;
-static int hf_zbee_zcl_calendar_day_id_ref_wednesday = -1;
-static int hf_zbee_zcl_calendar_day_id_ref_thursday = -1;
-static int hf_zbee_zcl_calendar_day_id_ref_friday = -1;
-static int hf_zbee_zcl_calendar_day_id_ref_saturday = -1;
-static int hf_zbee_zcl_calendar_day_id_ref_sunday = -1;
-static int hf_zbee_zcl_calendar_week_id = -1;
-static int hf_zbee_zcl_calendar_week_id_ref = -1;
-static int hf_zbee_zcl_calendar_start_day_id = -1;
-static int hf_zbee_zcl_calendar_start_week_id = -1;
-static int hf_zbee_zcl_calendar_number_of_calendars = -1;
-static int hf_zbee_zcl_calendar_number_of_events = -1;
-static int hf_zbee_zcl_calendar_number_of_days = -1;
-static int hf_zbee_zcl_calendar_number_of_weeks = -1;
-static int hf_zbee_zcl_calendar_number_of_seasons = -1;
-static int hf_zbee_zcl_calendar_number_of_day_profiles = -1;
-static int hf_zbee_zcl_calendar_number_of_week_profiles = -1;
-static int hf_zbee_zcl_calendar_total_number_of_schedule_entries = -1;
-static int hf_zbee_zcl_calendar_total_number_of_special_days = -1;
-static int hf_zbee_zcl_calendar_total_number_of_commands = -1;
-static int hf_zbee_zcl_calendar_schedule_entry_start_time = -1;
-static int hf_zbee_zcl_calendar_schedule_entry_price_tier = -1;
-static int hf_zbee_zcl_calendar_schedule_entry_friendly_credit_enable = -1;
-static int hf_zbee_zcl_calendar_schedule_entry_auxiliary_load_switch_state = -1;
+static int proto_zbee_zcl_calendar;
+
+static int hf_zbee_zcl_calendar_srv_tx_cmd_id;
+static int hf_zbee_zcl_calendar_srv_rx_cmd_id;
+static int hf_zbee_zcl_calendar_attr_id;
+static int hf_zbee_zcl_calendar_attr_reporting_status;
+static int hf_zbee_zcl_calendar_type;
+static int hf_zbee_zcl_calendar_start_time;
+static int hf_zbee_zcl_calendar_earliest_start_time;
+static int hf_zbee_zcl_calendar_time_reference;
+static int hf_zbee_zcl_calendar_name;
+static int hf_zbee_zcl_calendar_command_index;
+static int hf_zbee_zcl_calendar_date_year;
+static int hf_zbee_zcl_calendar_date_month;
+static int hf_zbee_zcl_calendar_date_month_day;
+static int hf_zbee_zcl_calendar_date_week_day;
+static int hf_zbee_zcl_calendar_provider_id;
+static int hf_zbee_zcl_calendar_issuer_event_id;
+static int hf_zbee_zcl_calendar_min_issuer_event_id;
+static int hf_zbee_zcl_calendar_issuer_calendar_id;
+static int hf_zbee_zcl_calendar_day_id;
+static int hf_zbee_zcl_calendar_day_id_ref;
+static int hf_zbee_zcl_calendar_day_id_ref_monday;
+static int hf_zbee_zcl_calendar_day_id_ref_tuesday;
+static int hf_zbee_zcl_calendar_day_id_ref_wednesday;
+static int hf_zbee_zcl_calendar_day_id_ref_thursday;
+static int hf_zbee_zcl_calendar_day_id_ref_friday;
+static int hf_zbee_zcl_calendar_day_id_ref_saturday;
+static int hf_zbee_zcl_calendar_day_id_ref_sunday;
+static int hf_zbee_zcl_calendar_week_id;
+static int hf_zbee_zcl_calendar_week_id_ref;
+static int hf_zbee_zcl_calendar_start_day_id;
+static int hf_zbee_zcl_calendar_start_week_id;
+static int hf_zbee_zcl_calendar_number_of_calendars;
+static int hf_zbee_zcl_calendar_number_of_events;
+static int hf_zbee_zcl_calendar_number_of_days;
+static int hf_zbee_zcl_calendar_number_of_weeks;
+static int hf_zbee_zcl_calendar_number_of_seasons;
+static int hf_zbee_zcl_calendar_number_of_day_profiles;
+static int hf_zbee_zcl_calendar_number_of_week_profiles;
+static int hf_zbee_zcl_calendar_total_number_of_schedule_entries;
+static int hf_zbee_zcl_calendar_total_number_of_special_days;
+static int hf_zbee_zcl_calendar_total_number_of_commands;
+static int hf_zbee_zcl_calendar_schedule_entry_start_time;
+static int hf_zbee_zcl_calendar_schedule_entry_price_tier;
+static int hf_zbee_zcl_calendar_schedule_entry_friendly_credit_enable;
+static int hf_zbee_zcl_calendar_schedule_entry_auxiliary_load_switch_state;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_calendar = -1;
-static gint ett_zbee_zcl_calendar_special_day_date = -1;
-static gint ett_zbee_zcl_calendar_season_start_date = -1;
+static gint ett_zbee_zcl_calendar;
+static gint ett_zbee_zcl_calendar_special_day_date;
+static gint ett_zbee_zcl_calendar_season_start_date;
 
 #define zbee_zcl_calendar_type_names_VALUE_STRING_LIST(XXX) \
     XXX(ZBEE_ZCL_CALENDAR_TYPE_DELIVERED,                                0x00, "Delivered Calendar" ) \
@@ -12177,30 +12177,30 @@ static void dissect_zcl_daily_schedule_cancel_schedule(tvbuff_t *tvb, proto_tree
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_daily_schedule = -1;
+static int proto_zbee_zcl_daily_schedule;
 
-static int hf_zbee_zcl_daily_schedule_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_daily_schedule_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_daily_schedule_attr_server_id = -1;
+static int hf_zbee_zcl_daily_schedule_srv_tx_cmd_id;
+static int hf_zbee_zcl_daily_schedule_srv_rx_cmd_id;
+static int hf_zbee_zcl_daily_schedule_attr_server_id;
 /* Get Schedule cmd */
-static int hf_zbee_zcl_daily_schedule_type = -1;
-static int hf_zbee_zcl_daily_schedule_name = -1;
-static int hf_zbee_zcl_daily_schedule_start_time = -1;
-static int hf_zbee_zcl_daily_schedule_earliest_start_time = -1;
-static int hf_zbee_zcl_daily_schedule_command_index = -1;
-static int hf_zbee_zcl_daily_schedule_id = -1;
-static int hf_zbee_zcl_daily_schedule_time_reference = -1;
-static int hf_zbee_zcl_daily_schedule_provider_id = -1;
-static int hf_zbee_zcl_daily_schedule_issuer_event_id = -1;
-static int hf_zbee_zcl_daily_schedule_min_issuer_event_id = -1;
-static int hf_zbee_zcl_daily_schedule_number_of_schedules = -1;
-static int hf_zbee_zcl_daily_schedule_total_number_of_schedule_entries = -1;
-static int hf_zbee_zcl_daily_schedule_schedule_entry_start_time = -1;
-static int hf_zbee_zcl_daily_schedule_schedule_entry_price_tier = -1;
-static int hf_zbee_zcl_daily_schedule_schedule_entry_auxiliary_load_switch_state = -1;
+static int hf_zbee_zcl_daily_schedule_type;
+static int hf_zbee_zcl_daily_schedule_name;
+static int hf_zbee_zcl_daily_schedule_start_time;
+static int hf_zbee_zcl_daily_schedule_earliest_start_time;
+static int hf_zbee_zcl_daily_schedule_command_index;
+static int hf_zbee_zcl_daily_schedule_id;
+static int hf_zbee_zcl_daily_schedule_time_reference;
+static int hf_zbee_zcl_daily_schedule_provider_id;
+static int hf_zbee_zcl_daily_schedule_issuer_event_id;
+static int hf_zbee_zcl_daily_schedule_min_issuer_event_id;
+static int hf_zbee_zcl_daily_schedule_number_of_schedules;
+static int hf_zbee_zcl_daily_schedule_total_number_of_schedule_entries;
+static int hf_zbee_zcl_daily_schedule_schedule_entry_start_time;
+static int hf_zbee_zcl_daily_schedule_schedule_entry_price_tier;
+static int hf_zbee_zcl_daily_schedule_schedule_entry_auxiliary_load_switch_state;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_daily_schedule = -1;
+static gint ett_zbee_zcl_daily_schedule;
 
 #define zbee_zcl_daily_schedule_type_names_VALUE_STRING_LIST(XXX) \
     XXX(ZBEE_ZCL_SCHEDULE_TYPE_LINKY_SCHEDULE,                           0x00, "Linky Schedule" ) \
@@ -13200,79 +13200,79 @@ static void dissect_zcl_device_management_attr_data(proto_tree *tree, tvbuff_t *
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_device_management = -1;
-
-static int hf_zbee_zcl_device_management_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_device_management_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_device_management_attr_server_id = -1;
-static int hf_zbee_zcl_device_management_attr_client_id = -1;
-static int hf_zbee_zcl_device_management_attr_reporting_status = -1;
-static int hf_zbee_zcl_device_management_password_type = -1;
-static int hf_zbee_zcl_device_management_command_index = -1;
-static int hf_zbee_zcl_device_management_total_commands = -1;
-static int hf_zbee_zcl_device_management_event_id= -1;
-static int hf_zbee_zcl_device_management_event_configuration = -1;
-static int hf_zbee_zcl_device_management_event_configuration_logging = -1;
-static int hf_zbee_zcl_device_management_event_configuration_push_event_to_wan = -1;
-static int hf_zbee_zcl_device_management_event_configuration_push_event_to_han = -1;
-static int hf_zbee_zcl_device_management_event_configuration_raise_alarm_zigbee = -1;
-static int hf_zbee_zcl_device_management_event_configuration_raise_alarm_physical = -1;
-static int hf_zbee_zcl_device_management_event_configuration_reserved = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_provider_id = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_issuer_event_id = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_tariff_type = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_implementation_date = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_pre_snapshot = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_post_snapshot = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_reset_credit_register = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_reset_debit_register = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_reset_billing_period = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_clear_tariff_plan = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_clear_standing_charge = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_block_historical_load_profile_information = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_clear_historical_load_profile_information = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_clear_ihd_data_consumer = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_clear_ihd_data_supplier = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_meter_contactor_state = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_clear_transaction_log = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_clear_prepayment_data = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_reserved = -1;
-
-static int hf_zbee_zcl_device_management_publish_change_of_supplier_current_provider_id = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_supplier_issuer_event_id = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_supplier_tariff_type = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_supplier_proposed_provider_id = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_supplier_provider_change_implementation_time = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_supplier_provider_change_control = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_supplier_provider_proposed_provider_name = -1;
-static int hf_zbee_zcl_device_management_publish_change_of_supplier_provider_proposed_provider_contact_details = -1;
-
-static int hf_zbee_zcl_device_management_request_new_password_issuer_event_id = -1;
-static int hf_zbee_zcl_device_management_request_new_password_implementation_date = -1;
-static int hf_zbee_zcl_device_management_request_new_password_password = -1;
-static int hf_zbee_zcl_device_management_request_new_password_duration_in_minutes = -1;
-
-static int hf_zbee_zcl_device_management_update_site_id_issuer_event_id = -1;
-static int hf_zbee_zcl_device_management_update_site_id_site_id_time = -1;
-static int hf_zbee_zcl_device_management_update_site_id_provider_id = -1;
-static int hf_zbee_zcl_device_management_update_site_id_site_id = -1;
-
-static int hf_zbee_zcl_device_management_set_event_configuration_issuer_event_id = -1;
-static int hf_zbee_zcl_device_management_set_event_configuration_start_time = -1;
-static int hf_zbee_zcl_device_management_set_event_configuration_configuration_control = -1;
-static int hf_zbee_zcl_device_management_set_event_configuration_event_configuration_number_of_events = -1;
-static int hf_zbee_zcl_device_management_set_event_configuration_event_configuration_event_id = -1;
-static int hf_zbee_zcl_device_management_set_event_configuration_event_configuration_event_group_id = -1;
-static int hf_zbee_zcl_device_management_set_event_configuration_event_configuration_event_log_id = -1;
-static int hf_zbee_zcl_device_management_set_event_configuration_event_configuration_event_configuration_value_match = -1;
-
-static int hf_zbee_zcl_device_management_get_event_configuration_event_id = -1;
-
-static int hf_zbee_zcl_device_management_update_cin_issuer_event_id = -1;
-static int hf_zbee_zcl_device_management_update_cin_cin_implementation_time = -1;
-static int hf_zbee_zcl_device_management_update_cin_provider_id = -1;
-static int hf_zbee_zcl_device_management_update_cin_customerid_number = -1;
+static int proto_zbee_zcl_device_management;
+
+static int hf_zbee_zcl_device_management_srv_tx_cmd_id;
+static int hf_zbee_zcl_device_management_srv_rx_cmd_id;
+static int hf_zbee_zcl_device_management_attr_server_id;
+static int hf_zbee_zcl_device_management_attr_client_id;
+static int hf_zbee_zcl_device_management_attr_reporting_status;
+static int hf_zbee_zcl_device_management_password_type;
+static int hf_zbee_zcl_device_management_command_index;
+static int hf_zbee_zcl_device_management_total_commands;
+static int hf_zbee_zcl_device_management_event_id;
+static int hf_zbee_zcl_device_management_event_configuration;
+static int hf_zbee_zcl_device_management_event_configuration_logging;
+static int hf_zbee_zcl_device_management_event_configuration_push_event_to_wan;
+static int hf_zbee_zcl_device_management_event_configuration_push_event_to_han;
+static int hf_zbee_zcl_device_management_event_configuration_raise_alarm_zigbee;
+static int hf_zbee_zcl_device_management_event_configuration_raise_alarm_physical;
+static int hf_zbee_zcl_device_management_event_configuration_reserved;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_provider_id;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_issuer_event_id;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_tariff_type;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_implementation_date;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_pre_snapshot;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_post_snapshot;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_reset_credit_register;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_reset_debit_register;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_reset_billing_period;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_clear_tariff_plan;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_clear_standing_charge;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_block_historical_load_profile_information;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_clear_historical_load_profile_information;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_clear_ihd_data_consumer;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_clear_ihd_data_supplier;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_meter_contactor_state;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_clear_transaction_log;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_clear_prepayment_data;
+static int hf_zbee_zcl_device_management_publish_change_of_tenancy_proposed_tenancy_change_control_reserved;
+
+static int hf_zbee_zcl_device_management_publish_change_of_supplier_current_provider_id;
+static int hf_zbee_zcl_device_management_publish_change_of_supplier_issuer_event_id;
+static int hf_zbee_zcl_device_management_publish_change_of_supplier_tariff_type;
+static int hf_zbee_zcl_device_management_publish_change_of_supplier_proposed_provider_id;
+static int hf_zbee_zcl_device_management_publish_change_of_supplier_provider_change_implementation_time;
+static int hf_zbee_zcl_device_management_publish_change_of_supplier_provider_change_control;
+static int hf_zbee_zcl_device_management_publish_change_of_supplier_provider_proposed_provider_name;
+static int hf_zbee_zcl_device_management_publish_change_of_supplier_provider_proposed_provider_contact_details;
+
+static int hf_zbee_zcl_device_management_request_new_password_issuer_event_id;
+static int hf_zbee_zcl_device_management_request_new_password_implementation_date;
+static int hf_zbee_zcl_device_management_request_new_password_password;
+static int hf_zbee_zcl_device_management_request_new_password_duration_in_minutes;
+
+static int hf_zbee_zcl_device_management_update_site_id_issuer_event_id;
+static int hf_zbee_zcl_device_management_update_site_id_site_id_time;
+static int hf_zbee_zcl_device_management_update_site_id_provider_id;
+static int hf_zbee_zcl_device_management_update_site_id_site_id;
+
+static int hf_zbee_zcl_device_management_set_event_configuration_issuer_event_id;
+static int hf_zbee_zcl_device_management_set_event_configuration_start_time;
+static int hf_zbee_zcl_device_management_set_event_configuration_configuration_control;
+static int hf_zbee_zcl_device_management_set_event_configuration_event_configuration_number_of_events;
+static int hf_zbee_zcl_device_management_set_event_configuration_event_configuration_event_id;
+static int hf_zbee_zcl_device_management_set_event_configuration_event_configuration_event_group_id;
+static int hf_zbee_zcl_device_management_set_event_configuration_event_configuration_event_log_id;
+static int hf_zbee_zcl_device_management_set_event_configuration_event_configuration_event_configuration_value_match;
+
+static int hf_zbee_zcl_device_management_get_event_configuration_event_id;
+
+static int hf_zbee_zcl_device_management_update_cin_issuer_event_id;
+static int hf_zbee_zcl_device_management_update_cin_cin_implementation_time;
+static int hf_zbee_zcl_device_management_update_cin_provider_id;
+static int hf_zbee_zcl_device_management_update_cin_customerid_number;
 
 static int* const hf_zbee_zcl_device_management_event_configuration_flags[] = {
     &hf_zbee_zcl_device_management_event_configuration_logging,
@@ -13304,10 +13304,10 @@ static int* const hf_zbee_zcl_device_management_publish_change_of_tenancy_propos
 };
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_device_management = -1;
-static gint ett_zbee_zcl_device_management_event_configuration_payload = -1;
-static gint ett_zbee_zcl_device_management_event_configuration = -1;
-static gint ett_zbee_zcl_device_management_proposed_tenancy_change_control = -1;
+static gint ett_zbee_zcl_device_management;
+static gint ett_zbee_zcl_device_management_event_configuration_payload;
+static gint ett_zbee_zcl_device_management_event_configuration;
+static gint ett_zbee_zcl_device_management_proposed_tenancy_change_control;
 
 /*************************/
 /* Function Bodies       */
@@ -14129,38 +14129,38 @@ static void dissect_zcl_events_clear_event_log_response         (tvbuff_t *tvb,
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_events = -1;
-
-static int hf_zbee_zcl_events_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_events_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_events_get_event_log_event_control_log_id = -1;
-static int hf_zbee_zcl_events_get_event_log_event_id = -1;
-static int hf_zbee_zcl_events_get_event_log_start_time = -1;
-static int hf_zbee_zcl_events_get_event_log_end_time = -1;
-static int hf_zbee_zcl_events_get_event_log_number_of_events = -1;
-static int hf_zbee_zcl_events_get_event_log_event_offset = -1;
-static int hf_zbee_zcl_events_clear_event_log_request_log_id = -1;
-static int hf_zbee_zcl_events_publish_event_log_id = -1;
-static int hf_zbee_zcl_events_publish_event_event_id = -1;
-static int hf_zbee_zcl_events_publish_event_event_time = -1;
-static int hf_zbee_zcl_events_publish_event_event_control = -1;
-static int hf_zbee_zcl_events_publish_event_event_data = -1;
-static int hf_zbee_zcl_events_publish_event_log_total_number_of_matching_events = -1;
-static int hf_zbee_zcl_events_publish_event_log_command_index = -1;
-static int hf_zbee_zcl_events_publish_event_log_total_commands = -1;
-static int hf_zbee_zcl_events_publish_event_log_number_of_events_log_payload_control = -1;
-static int hf_zbee_zcl_events_publish_event_log_log_id = -1;
-static int hf_zbee_zcl_events_publish_event_log_event_id = -1;
-static int hf_zbee_zcl_events_publish_event_log_event_time = -1;
-static int hf_zbee_zcl_events_publish_event_log_event_data = -1;
-static int hf_zbee_zcl_events_clear_event_log_response_cleared_event_logs = -1;
+static int proto_zbee_zcl_events;
+
+static int hf_zbee_zcl_events_srv_tx_cmd_id;
+static int hf_zbee_zcl_events_srv_rx_cmd_id;
+static int hf_zbee_zcl_events_get_event_log_event_control_log_id;
+static int hf_zbee_zcl_events_get_event_log_event_id;
+static int hf_zbee_zcl_events_get_event_log_start_time;
+static int hf_zbee_zcl_events_get_event_log_end_time;
+static int hf_zbee_zcl_events_get_event_log_number_of_events;
+static int hf_zbee_zcl_events_get_event_log_event_offset;
+static int hf_zbee_zcl_events_clear_event_log_request_log_id;
+static int hf_zbee_zcl_events_publish_event_log_id;
+static int hf_zbee_zcl_events_publish_event_event_id;
+static int hf_zbee_zcl_events_publish_event_event_time;
+static int hf_zbee_zcl_events_publish_event_event_control;
+static int hf_zbee_zcl_events_publish_event_event_data;
+static int hf_zbee_zcl_events_publish_event_log_total_number_of_matching_events;
+static int hf_zbee_zcl_events_publish_event_log_command_index;
+static int hf_zbee_zcl_events_publish_event_log_total_commands;
+static int hf_zbee_zcl_events_publish_event_log_number_of_events_log_payload_control;
+static int hf_zbee_zcl_events_publish_event_log_log_id;
+static int hf_zbee_zcl_events_publish_event_log_event_id;
+static int hf_zbee_zcl_events_publish_event_log_event_time;
+static int hf_zbee_zcl_events_publish_event_log_event_data;
+static int hf_zbee_zcl_events_clear_event_log_response_cleared_event_logs;
 
 /* Initialize the subtree pointers */
 #define ZBEE_ZCL_SE_EVENTS_NUM_INDIVIDUAL_ETT             1
 #define ZBEE_ZCL_SE_EVENTS_NUM_PUBLISH_EVENT_LOG_ETT      100 // The Great Britain Companion Specification (GBCS) allows up to 100 even though ZigBee only allows 15
 #define ZBEE_ZCL_SE_EVENTS_NUM_TOTAL_ETT                  (ZBEE_ZCL_SE_EVENTS_NUM_INDIVIDUAL_ETT + ZBEE_ZCL_SE_EVENTS_NUM_PUBLISH_EVENT_LOG_ETT)
 
-static gint ett_zbee_zcl_events = -1;
+static gint ett_zbee_zcl_events;
 static gint ett_zbee_zcl_events_publish_event_log_entry[ZBEE_ZCL_SE_EVENTS_NUM_PUBLISH_EVENT_LOG_ETT];
 
 /*************************/
@@ -14605,20 +14605,20 @@ static void dissect_zcl_mdu_pairing_response(tvbuff_t *tvb, proto_tree *tree, gu
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_mdu_pairing = -1;
-
-static int hf_zbee_zcl_mdu_pairing_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_mdu_pairing_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_mdu_pairing_info_version = -1;
-static int hf_zbee_zcl_mdu_pairing_total_devices_number = -1;
-static int hf_zbee_zcl_mdu_pairing_cmd_id = -1;
-static int hf_zbee_zcl_mdu_pairing_total_commands_number = -1;
-static int hf_zbee_zcl_mdu_pairing_device_eui64 = -1;
-static int hf_zbee_zcl_mdu_pairing_local_info_version = -1;
-static int hf_zbee_zcl_mdu_pairing_requesting_device_eui64 = -1;
+static int proto_zbee_zcl_mdu_pairing;
+
+static int hf_zbee_zcl_mdu_pairing_srv_tx_cmd_id;
+static int hf_zbee_zcl_mdu_pairing_srv_rx_cmd_id;
+static int hf_zbee_zcl_mdu_pairing_info_version;
+static int hf_zbee_zcl_mdu_pairing_total_devices_number;
+static int hf_zbee_zcl_mdu_pairing_cmd_id;
+static int hf_zbee_zcl_mdu_pairing_total_commands_number;
+static int hf_zbee_zcl_mdu_pairing_device_eui64;
+static int hf_zbee_zcl_mdu_pairing_local_info_version;
+static int hf_zbee_zcl_mdu_pairing_requesting_device_eui64;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_mdu_pairing = -1;
+static gint ett_zbee_zcl_mdu_pairing;
 
 /*************************/
 /* Function Bodies       */
@@ -14885,16 +14885,16 @@ static void dissect_zcl_sub_ghz_suspend_zcl_messages(tvbuff_t *tvb, proto_tree *
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_sub_ghz = -1;
+static int proto_zbee_zcl_sub_ghz;
 
-static int hf_zbee_zcl_sub_ghz_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_sub_ghz_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_sub_ghz_attr_id = -1;
-static int hf_zbee_zcl_sub_ghz_attr_reporting_status = -1;
-static int hf_zbee_zcl_sub_ghz_zcl_messages_suspension_period = -1;
+static int hf_zbee_zcl_sub_ghz_srv_tx_cmd_id;
+static int hf_zbee_zcl_sub_ghz_srv_rx_cmd_id;
+static int hf_zbee_zcl_sub_ghz_attr_id;
+static int hf_zbee_zcl_sub_ghz_attr_reporting_status;
+static int hf_zbee_zcl_sub_ghz_zcl_messages_suspension_period;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_sub_ghz = -1;
+static gint ett_zbee_zcl_sub_ghz;
 
 /*************************/
 /* Function Bodies       */
@@ -15181,37 +15181,37 @@ void proto_reg_handoff_zbee_zcl_ke(void);
 /*************************/
 
 /* Initialize the protocol and registered fields */
-static int proto_zbee_zcl_ke = -1;
-static int hf_zbee_zcl_ke_srv_tx_cmd_id = -1;
-static int hf_zbee_zcl_ke_srv_rx_cmd_id = -1;
-static int hf_zbee_zcl_ke_attr_id = -1;
-static int hf_zbee_zcl_ke_attr_client_id = -1;
-static int hf_zbee_zcl_ke_suite = -1;
-static int hf_zbee_zcl_ke_ephemeral_time = -1;
-static int hf_zbee_zcl_ke_confirm_time = -1;
-static int hf_zbee_zcl_ke_status = -1;
-static int hf_zbee_zcl_ke_wait_time = -1;
-static int hf_zbee_zcl_ke_cert_reconstr = -1;
-static int hf_zbee_zcl_ke_cert_subject = -1;
-static int hf_zbee_zcl_ke_cert_issuer = -1;
-static int hf_zbee_zcl_ke_cert_profile_attr = -1;
-static int hf_zbee_zcl_ke_cert_type = -1;
-static int hf_zbee_zcl_ke_cert_serialno = -1;
-static int hf_zbee_zcl_ke_cert_curve = -1;
-static int hf_zbee_zcl_ke_cert_hash = -1;
-static int hf_zbee_zcl_ke_cert_valid_from = -1;
-static int hf_zbee_zcl_ke_cert_valid_to = -1;
-static int hf_zbee_zcl_ke_cert_key_usage_agreement = -1;
-static int hf_zbee_zcl_ke_cert_key_usage_signature = -1;
-static int hf_zbee_zcl_ke_ephemeral_qeu = -1;
-static int hf_zbee_zcl_ke_ephemeral_qev = -1;
-static int hf_zbee_zcl_ke_macu = -1;
-static int hf_zbee_zcl_ke_macv = -1;
+static int proto_zbee_zcl_ke;
+static int hf_zbee_zcl_ke_srv_tx_cmd_id;
+static int hf_zbee_zcl_ke_srv_rx_cmd_id;
+static int hf_zbee_zcl_ke_attr_id;
+static int hf_zbee_zcl_ke_attr_client_id;
+static int hf_zbee_zcl_ke_suite;
+static int hf_zbee_zcl_ke_ephemeral_time;
+static int hf_zbee_zcl_ke_confirm_time;
+static int hf_zbee_zcl_ke_status;
+static int hf_zbee_zcl_ke_wait_time;
+static int hf_zbee_zcl_ke_cert_reconstr;
+static int hf_zbee_zcl_ke_cert_subject;
+static int hf_zbee_zcl_ke_cert_issuer;
+static int hf_zbee_zcl_ke_cert_profile_attr;
+static int hf_zbee_zcl_ke_cert_type;
+static int hf_zbee_zcl_ke_cert_serialno;
+static int hf_zbee_zcl_ke_cert_curve;
+static int hf_zbee_zcl_ke_cert_hash;
+static int hf_zbee_zcl_ke_cert_valid_from;
+static int hf_zbee_zcl_ke_cert_valid_to;
+static int hf_zbee_zcl_ke_cert_key_usage_agreement;
+static int hf_zbee_zcl_ke_cert_key_usage_signature;
+static int hf_zbee_zcl_ke_ephemeral_qeu;
+static int hf_zbee_zcl_ke_ephemeral_qev;
+static int hf_zbee_zcl_ke_macu;
+static int hf_zbee_zcl_ke_macv;
 
 /* Initialize the subtree pointers */
-static gint ett_zbee_zcl_ke = -1;
-static gint ett_zbee_zcl_ke_cert = -1;
-static gint ett_zbee_zcl_ke_key_usage = -1;
+static gint ett_zbee_zcl_ke;
+static gint ett_zbee_zcl_ke_cert;
+static gint ett_zbee_zcl_ke_key_usage;
 
 /*************************/
 /* Function Bodies       */
diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c
index dae4d4d63a..7da36391ff 100644
--- a/epan/dissectors/packet-zbee-zcl.c
+++ b/epan/dissectors/packet-zbee-zcl.c
@@ -60,85 +60,85 @@ static void dissect_zcl_discover_cmd_attr_extended_resp(tvbuff_t* tvb, packet_in
  ********************
  */
 /* Header Field Indices. */
-static int proto_zbee_zcl = -1;
-static int hf_zbee_zcl_fcf_frame_type = -1;
-static int hf_zbee_zcl_fcf_mfr_spec = -1;
-static int hf_zbee_zcl_fcf_dir = -1;
-static int hf_zbee_zcl_fcf_disable_default_resp = -1;
-static int hf_zbee_zcl_mfr_code = -1;
-static int hf_zbee_zcl_tran_seqno = -1;
-static int hf_zbee_zcl_cmd_id = -1;
-static int hf_zbee_zcl_cs_cmd_id = -1;
-static int hf_zbee_zcl_cmd_id_rsp = -1;
-static int hf_zbee_zcl_attr_id = -1;
-static int hf_zbee_zcl_attr_data_type = -1;
-static int hf_zbee_zcl_attr_access_ctrl = -1;
-static int hf_zbee_zcl_indicator = -1;
-static int hf_zbee_zcl_index = -1;
-static int hf_zbee_zcl_cmd_start = -1;
-static int hf_zbee_zcl_cmd_maxnum = -1;
-static int hf_zbee_zcl_attr_boolean = -1;
-static int hf_zbee_zcl_attr_bitmap8 = -1;
-static int hf_zbee_zcl_attr_bitmap16 = -1;
-static int hf_zbee_zcl_attr_bitmap24 = -1;
-static int hf_zbee_zcl_attr_bitmap32 = -1;
-static int hf_zbee_zcl_attr_bitmap40 = -1;
-static int hf_zbee_zcl_attr_bitmap48 = -1;
-static int hf_zbee_zcl_attr_bitmap56 = -1;
-static int hf_zbee_zcl_attr_bitmap64 = -1;
-static int hf_zbee_zcl_attr_uint8 = -1;
-static int hf_zbee_zcl_attr_uint16 = -1;
-static int hf_zbee_zcl_attr_uint24 = -1;
-static int hf_zbee_zcl_attr_uint32 = -1;
-static int hf_zbee_zcl_attr_uint40 = -1;
-static int hf_zbee_zcl_attr_uint48 = -1;
-static int hf_zbee_zcl_attr_uint56 = -1;
-static int hf_zbee_zcl_attr_uint64 = -1;
-static int hf_zbee_zcl_attr_int8 = -1;
-static int hf_zbee_zcl_attr_int16 = -1;
-static int hf_zbee_zcl_attr_int24 = -1;
-static int hf_zbee_zcl_attr_int32 = -1;
-static int hf_zbee_zcl_attr_int64 = -1;
-/* static int hf_zbee_zcl_attr_semi = -1; */
-static int hf_zbee_zcl_attr_float = -1;
-static int hf_zbee_zcl_attr_double = -1;
-static int hf_zbee_zcl_attr_bytes = -1;
-static int hf_zbee_zcl_attr_minint = -1;
-static int hf_zbee_zcl_attr_maxint = -1;
-static int hf_zbee_zcl_attr_timeout = -1;
-static int hf_zbee_zcl_attr_cid = -1;
-static int hf_zbee_zcl_attr_hours = -1;
-static int hf_zbee_zcl_attr_mins = -1;
-static int hf_zbee_zcl_attr_secs = -1;
-static int hf_zbee_zcl_attr_csecs = -1;
-static int hf_zbee_zcl_attr_yy = -1;
-static int hf_zbee_zcl_attr_mm = -1;
-static int hf_zbee_zcl_attr_md = -1;
-static int hf_zbee_zcl_attr_wd = -1;
-static int hf_zbee_zcl_attr_utc = -1;
-static int hf_zbee_zcl_attr_status = -1;
-static int hf_zbee_zcl_attr_dir = -1;
-static int hf_zbee_zcl_attr_dis = -1;
-static int hf_zbee_zcl_attr_start = -1;
-static int hf_zbee_zcl_attr_maxnum = -1;
-static int hf_zbee_zcl_attr_str = -1;
-static int hf_zbee_zcl_attr_ostr = -1;
-static int hf_zbee_zcl_attr_array_elements_type = -1;
-static int hf_zbee_zcl_attr_array_elements_num = -1;
-static int hf_zbee_zcl_attr_set_elements_type = -1;
-static int hf_zbee_zcl_attr_set_elements_num = -1;
-static int hf_zbee_zcl_attr_bag_elements_type = -1;
-static int hf_zbee_zcl_attr_bag_elements_num = -1;
+static int proto_zbee_zcl;
+static int hf_zbee_zcl_fcf_frame_type;
+static int hf_zbee_zcl_fcf_mfr_spec;
+static int hf_zbee_zcl_fcf_dir;
+static int hf_zbee_zcl_fcf_disable_default_resp;
+static int hf_zbee_zcl_mfr_code;
+static int hf_zbee_zcl_tran_seqno;
+static int hf_zbee_zcl_cmd_id;
+static int hf_zbee_zcl_cs_cmd_id;
+static int hf_zbee_zcl_cmd_id_rsp;
+static int hf_zbee_zcl_attr_id;
+static int hf_zbee_zcl_attr_data_type;
+static int hf_zbee_zcl_attr_access_ctrl;
+static int hf_zbee_zcl_indicator;
+static int hf_zbee_zcl_index;
+static int hf_zbee_zcl_cmd_start;
+static int hf_zbee_zcl_cmd_maxnum;
+static int hf_zbee_zcl_attr_boolean;
+static int hf_zbee_zcl_attr_bitmap8;
+static int hf_zbee_zcl_attr_bitmap16;
+static int hf_zbee_zcl_attr_bitmap24;
+static int hf_zbee_zcl_attr_bitmap32;
+static int hf_zbee_zcl_attr_bitmap40;
+static int hf_zbee_zcl_attr_bitmap48;
+static int hf_zbee_zcl_attr_bitmap56;
+static int hf_zbee_zcl_attr_bitmap64;
+static int hf_zbee_zcl_attr_uint8;
+static int hf_zbee_zcl_attr_uint16;
+static int hf_zbee_zcl_attr_uint24;
+static int hf_zbee_zcl_attr_uint32;
+static int hf_zbee_zcl_attr_uint40;
+static int hf_zbee_zcl_attr_uint48;
+static int hf_zbee_zcl_attr_uint56;
+static int hf_zbee_zcl_attr_uint64;
+static int hf_zbee_zcl_attr_int8;
+static int hf_zbee_zcl_attr_int16;
+static int hf_zbee_zcl_attr_int24;
+static int hf_zbee_zcl_attr_int32;
+static int hf_zbee_zcl_attr_int64;
+/* static int hf_zbee_zcl_attr_semi; */
+static int hf_zbee_zcl_attr_float;
+static int hf_zbee_zcl_attr_double;
+static int hf_zbee_zcl_attr_bytes;
+static int hf_zbee_zcl_attr_minint;
+static int hf_zbee_zcl_attr_maxint;
+static int hf_zbee_zcl_attr_timeout;
+static int hf_zbee_zcl_attr_cid;
+static int hf_zbee_zcl_attr_hours;
+static int hf_zbee_zcl_attr_mins;
+static int hf_zbee_zcl_attr_secs;
+static int hf_zbee_zcl_attr_csecs;
+static int hf_zbee_zcl_attr_yy;
+static int hf_zbee_zcl_attr_mm;
+static int hf_zbee_zcl_attr_md;
+static int hf_zbee_zcl_attr_wd;
+static int hf_zbee_zcl_attr_utc;
+static int hf_zbee_zcl_attr_status;
+static int hf_zbee_zcl_attr_dir;
+static int hf_zbee_zcl_attr_dis;
+static int hf_zbee_zcl_attr_start;
+static int hf_zbee_zcl_attr_maxnum;
+static int hf_zbee_zcl_attr_str;
+static int hf_zbee_zcl_attr_ostr;
+static int hf_zbee_zcl_attr_array_elements_type;
+static int hf_zbee_zcl_attr_array_elements_num;
+static int hf_zbee_zcl_attr_set_elements_type;
+static int hf_zbee_zcl_attr_set_elements_num;
+static int hf_zbee_zcl_attr_bag_elements_type;
+static int hf_zbee_zcl_attr_bag_elements_num;
 
 /* Subtree indices. */
-static gint ett_zbee_zcl = -1;
-static gint ett_zbee_zcl_fcf = -1;
+static gint ett_zbee_zcl;
+static gint ett_zbee_zcl_fcf;
 static gint ett_zbee_zcl_attr[ZBEE_ZCL_NUM_ATTR_ETT];
 static gint ett_zbee_zcl_sel[ZBEE_ZCL_NUM_IND_FIELD];
 static gint ett_zbee_zcl_array_elements[ZBEE_ZCL_NUM_ARRAY_ELEM_ETT];
 
-static expert_field ei_cfg_rpt_rsp_short_non_success = EI_INIT;
-static expert_field ei_zbee_zero_length_element = EI_INIT;
+static expert_field ei_cfg_rpt_rsp_short_non_success;
+static expert_field ei_zbee_zero_length_element;
 
 /* Dissector List. */
 static dissector_table_t    zbee_zcl_dissector_table;
diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c
index 914456986e..f4338241fa 100644
--- a/epan/dissectors/packet-zbee-zdp.c
+++ b/epan/dissectors/packet-zbee-zdp.c
@@ -39,210 +39,210 @@ static guint16 zdp_convert_2003cluster     (guint8 cluster);
  **************************************
  */
 /* Global field indicies. */
-static int proto_zbee_zdp = -1;
-static int hf_zbee_zdp_seqno = -1;
+static int proto_zbee_zdp;
+static int hf_zbee_zdp_seqno;
 #if 0
-static int hf_zbee_zdp_length = -1; /* Deprecates since ZigBee 2006. */
+static int hf_zbee_zdp_length; /* Deprecates since ZigBee 2006. */
 #endif
 
 /* General indicies. */
-       int hf_zbee_zdp_ext_addr = -1;
-       int hf_zbee_zdp_nwk_addr = -1;
-       int hf_zbee_zdp_req_type = -1;
-       int hf_zbee_zdp_index = -1;
-static int hf_zbee_zdp_status = -1;
-       int hf_zbee_zdp_ep_count = -1;
-       int hf_zbee_zdp_endpoint = -1;
-       int hf_zbee_zdp_profile = -1;
-       int hf_zbee_zdp_cluster = -1;
-       int hf_zbee_zdp_addr_mode = -1;
-       int hf_zbee_zdp_table_size = -1;
-       int hf_zbee_zdp_table_count = -1;
-       int hf_zbee_zdp_in_count = -1;
-       int hf_zbee_zdp_out_count = -1;
-       int hf_zbee_zdp_in_cluster = -1;
-       int hf_zbee_zdp_out_cluster = -1;
-       int hf_zbee_zdp_assoc_device_count = -1;
-       int hf_zbee_zdp_assoc_device = -1;
-       int hf_zbee_zdp_cache_address = -1;
+       int hf_zbee_zdp_ext_addr;
+       int hf_zbee_zdp_nwk_addr;
+       int hf_zbee_zdp_req_type;
+       int hf_zbee_zdp_index;
+static int hf_zbee_zdp_status;
+       int hf_zbee_zdp_ep_count;
+       int hf_zbee_zdp_endpoint;
+       int hf_zbee_zdp_profile;
+       int hf_zbee_zdp_cluster;
+       int hf_zbee_zdp_addr_mode;
+       int hf_zbee_zdp_table_size;
+       int hf_zbee_zdp_table_count;
+       int hf_zbee_zdp_in_count;
+       int hf_zbee_zdp_out_count;
+       int hf_zbee_zdp_in_cluster;
+       int hf_zbee_zdp_out_cluster;
+       int hf_zbee_zdp_assoc_device_count;
+       int hf_zbee_zdp_assoc_device;
+       int hf_zbee_zdp_cache_address;
 
 /* Capability information indicies. */
-static int hf_zbee_zdp_cinfo = -1;
-static int hf_zbee_zdp_cinfo_alloc = -1;
-static int hf_zbee_zdp_cinfo_security = -1;
-static int hf_zbee_zdp_cinfo_idle_rx = -1;
-static int hf_zbee_zdp_cinfo_power = -1;
-static int hf_zbee_zdp_cinfo_ffd = -1;
-static int hf_zbee_zdp_cinfo_alt_coord = -1;
+static int hf_zbee_zdp_cinfo;
+static int hf_zbee_zdp_cinfo_alloc;
+static int hf_zbee_zdp_cinfo_security;
+static int hf_zbee_zdp_cinfo_idle_rx;
+static int hf_zbee_zdp_cinfo_power;
+static int hf_zbee_zdp_cinfo_ffd;
+static int hf_zbee_zdp_cinfo_alt_coord;
 
 /* Server mode flag indicies. */
-static int hf_zbee_zdp_server          = -1;
-static int hf_zbee_zdp_server_pri_trust = -1;
-static int hf_zbee_zdp_server_bak_trust = -1;
-static int hf_zbee_zdp_server_pri_bind = -1;
-static int hf_zbee_zdp_server_bak_bind = -1;
-static int hf_zbee_zdp_server_pri_disc = -1;
-static int hf_zbee_zdp_server_bak_disc = -1;
-static int hf_zbee_zdp_server_network_manager = -1;
-static int hf_zbee_zdp_server_stk_compl_rev = -1;
+static int hf_zbee_zdp_server;
+static int hf_zbee_zdp_server_pri_trust;
+static int hf_zbee_zdp_server_bak_trust;
+static int hf_zbee_zdp_server_pri_bind;
+static int hf_zbee_zdp_server_bak_bind;
+static int hf_zbee_zdp_server_pri_disc;
+static int hf_zbee_zdp_server_bak_disc;
+static int hf_zbee_zdp_server_network_manager;
+static int hf_zbee_zdp_server_stk_compl_rev;
 
 /* Node descriptor indicies. */
-static int hf_zbee_zdp_node_type = -1;
-static int hf_zbee_zdp_node_complex = -1;
-static int hf_zbee_zdp_node_user = -1;
-static int hf_zbee_zdp_node_frag_support = -1;
-static int hf_zbee_zdp_node_freq_868 = -1;
-static int hf_zbee_zdp_node_freq_900 = -1;
-static int hf_zbee_zdp_node_freq_2400 = -1;
-static int hf_zbee_zdp_node_freq_eu_sub_ghz = -1;
-static int hf_zbee_zdp_node_manufacturer = -1;
-static int hf_zbee_zdp_node_max_buffer = -1;
-static int hf_zbee_zdp_node_max_incoming_transfer = -1;
-static int hf_zbee_zdp_node_max_outgoing_transfer = -1;
-static int hf_zbee_zdp_dcf = -1;
-static int hf_zbee_zdp_dcf_eaela = -1;
-static int hf_zbee_zdp_dcf_esdla = -1;
+static int hf_zbee_zdp_node_type;
+static int hf_zbee_zdp_node_complex;
+static int hf_zbee_zdp_node_user;
+static int hf_zbee_zdp_node_frag_support;
+static int hf_zbee_zdp_node_freq_868;
+static int hf_zbee_zdp_node_freq_900;
+static int hf_zbee_zdp_node_freq_2400;
+static int hf_zbee_zdp_node_freq_eu_sub_ghz;
+static int hf_zbee_zdp_node_manufacturer;
+static int hf_zbee_zdp_node_max_buffer;
+static int hf_zbee_zdp_node_max_incoming_transfer;
+static int hf_zbee_zdp_node_max_outgoing_transfer;
+static int hf_zbee_zdp_dcf;
+static int hf_zbee_zdp_dcf_eaela;
+static int hf_zbee_zdp_dcf_esdla;
 
 /* Power descriptor indicies. */
-static int hf_zbee_zdp_power = -1;
-static int hf_zbee_zdp_power_mode = -1;
-static int hf_zbee_zdp_power_avail_ac = -1;
-static int hf_zbee_zdp_power_avail_recharge = -1;
-static int hf_zbee_zdp_power_avail_dispose = -1;
-static int hf_zbee_zdp_power_source_ac = -1;
-static int hf_zbee_zdp_power_source_recharge = -1;
-static int hf_zbee_zdp_power_source_dispose = -1;
-static int hf_zbee_zdp_power_level = -1;
+static int hf_zbee_zdp_power;
+static int hf_zbee_zdp_power_mode;
+static int hf_zbee_zdp_power_avail_ac;
+static int hf_zbee_zdp_power_avail_recharge;
+static int hf_zbee_zdp_power_avail_dispose;
+static int hf_zbee_zdp_power_source_ac;
+static int hf_zbee_zdp_power_source_recharge;
+static int hf_zbee_zdp_power_source_dispose;
+static int hf_zbee_zdp_power_level;
 
 /* Simple descriptor indicies. */
-static int hf_zbee_zdp_simple_app_device = -1;
-static int hf_zbee_zdp_simple_zll_app_device = -1;
-static int hf_zbee_zdp_simple_ha_app_device = -1;
-static int hf_zbee_zdp_simple_app_version = -1;
-       int hf_zbee_zdp_simple_length = -1;
+static int hf_zbee_zdp_simple_app_device;
+static int hf_zbee_zdp_simple_zll_app_device;
+static int hf_zbee_zdp_simple_ha_app_device;
+static int hf_zbee_zdp_simple_app_version;
+       int hf_zbee_zdp_simple_length;
 
 /* Complex descriptor indicies. */
-       int hf_zbee_zdp_complex_length = -1;
-static int hf_zbee_zdp_complex = -1;
+       int hf_zbee_zdp_complex_length;
+static int hf_zbee_zdp_complex;
 
 /* User descriptor indicies. */
-       int hf_zbee_zdp_user = -1;
-       int hf_zbee_zdp_user_length = -1;
+       int hf_zbee_zdp_user;
+       int hf_zbee_zdp_user_length;
 
 /* Discovery indicies. */
-       int hf_zbee_zdp_cache = -1;
-       int hf_zbee_zdp_disc_node_size = -1;
-       int hf_zbee_zdp_disc_power_size = -1;
-       int hf_zbee_zdp_disc_ep_count = -1;
-       int hf_zbee_zdp_disc_simple_count = -1;
-       int hf_zbee_zdp_disc_simple_size = -1;
+       int hf_zbee_zdp_cache;
+       int hf_zbee_zdp_disc_node_size;
+       int hf_zbee_zdp_disc_power_size;
+       int hf_zbee_zdp_disc_ep_count;
+       int hf_zbee_zdp_disc_simple_count;
+       int hf_zbee_zdp_disc_simple_size;
 
 /* Binding indicies. */
-       int hf_zbee_zdp_target = -1;
-       int hf_zbee_zdp_replacement = -1;
-       int hf_zbee_zdp_replacement_ep = -1;
-       int hf_zbee_zdp_bind_src = -1;
-       int hf_zbee_zdp_bind_src64 = -1;
-       int hf_zbee_zdp_bind_src_ep = -1;
-       int hf_zbee_zdp_bind_dst = -1;
-       int hf_zbee_zdp_bind_dst64 = -1;
-       int hf_zbee_zdp_bind_dst_ep = -1;
+       int hf_zbee_zdp_target;
+       int hf_zbee_zdp_replacement;
+       int hf_zbee_zdp_replacement_ep;
+       int hf_zbee_zdp_bind_src;
+       int hf_zbee_zdp_bind_src64;
+       int hf_zbee_zdp_bind_src_ep;
+       int hf_zbee_zdp_bind_dst;
+       int hf_zbee_zdp_bind_dst64;
+       int hf_zbee_zdp_bind_dst_ep;
 
 /* Network Management indicies. */
-       int hf_zbee_zdp_duration = -1;
-       int hf_zbee_zdp_leave_children = -1;
-       int hf_zbee_zdp_leave_rejoin = -1;
-       int hf_zbee_zdp_significance = -1;
-       int hf_zbee_zdp_scan_count = -1;
-       int hf_zbee_zdp_update_id = -1;
-       int hf_zbee_zdp_manager = -1;
-       int hf_zbee_zdp_tx_total = -1;
-       int hf_zbee_zdp_tx_fail = -1;
-       int hf_zbee_zdp_tx_retries = -1;
-       int hf_zbee_zdp_period_time_results = -1;
-       int hf_zbee_zdp_channel_count = -1;
-       int hf_zbee_zdp_channel_mask = -1;
-       int hf_zbee_zdp_channel_page = -1;
-       int hf_zbee_zdp_channel_page_count = -1;
-       int hf_zbee_zdp_channel_energy = -1;
-       int hf_zbee_zdp_pan_eui64 = -1;
-       int hf_zbee_zdp_pan_uint = -1;
-       int hf_zbee_zdp_channel = -1;
-       int hf_zbee_zdp_nwk_desc_profile = -1;
-       int hf_zbee_zdp_profile_version = -1;
-       int hf_zbee_zdp_beacon = -1;
-       int hf_zbee_zdp_superframe = -1;
-       int hf_zbee_zdp_permit_joining = -1;
-       int hf_zbee_zdp_extended_pan = -1;
-       int hf_zbee_zdp_addr = -1;
-       int hf_zbee_zdp_table_entry_type = -1;
-       int hf_zbee_zdp_table_entry_idle_rx_0c = -1;
-       int hf_zbee_zdp_table_entry_relationship_70 = -1;
-       int hf_zbee_zdp_table_entry_idle_rx_04 = -1;
-       int hf_zbee_zdp_table_entry_relationship_18 = -1;
-       int hf_zbee_zdp_depth = -1;
-       int hf_zbee_zdp_permit_joining_03 = -1;
-       int hf_zbee_zdp_lqi = -1;
-static int hf_zbee_zdp_scan_channel = -1;
-       int hf_zbee_zdp_ieee_join_start_index = -1;
-       int hf_zbee_zdp_ieee_join_update_id = -1;
-       int hf_zbee_zdp_ieee_join_policy = -1;
-       int hf_zbee_zdp_ieee_join_list_total = -1;
-       int hf_zbee_zdp_ieee_join_list_start = -1;
-       int hf_zbee_zdp_ieee_join_list_count = -1;
-       int hf_zbee_zdp_ieee_join_list_ieee = -1;
-       int hf_zbee_zdp_number_of_children = -1;
-       int hf_zbee_zdp_beacon_survey_scan_mask = -1;
-       int hf_zbee_zdp_beacon_survey_scan_mask_cnt = -1;
-       int hf_zbee_zdp_beacon_survey_conf_mask = -1;
-       int hf_zbee_zdp_beacon_survey_total = -1;
-       int hf_zbee_zdp_beacon_survey_cur_zbn = -1;
-       int hf_zbee_zdp_beacon_survey_cur_zbn_potent_parents = -1;
-       int hf_zbee_zdp_beacon_survey_other_zbn = -1;
-       int hf_zbee_zdp_beacon_survey_current_parent = -1;
-       int hf_zbee_zdp_beacon_survey_cnt_parents = -1;
-       int hf_zbee_zdp_beacon_survey_parent = -1;
-       int hf_zbee_zdp_tlv_count = -1;
-       int hf_zbee_zdp_tlv_id = -1;
+       int hf_zbee_zdp_duration;
+       int hf_zbee_zdp_leave_children;
+       int hf_zbee_zdp_leave_rejoin;
+       int hf_zbee_zdp_significance;
+       int hf_zbee_zdp_scan_count;
+       int hf_zbee_zdp_update_id;
+       int hf_zbee_zdp_manager;
+       int hf_zbee_zdp_tx_total;
+       int hf_zbee_zdp_tx_fail;
+       int hf_zbee_zdp_tx_retries;
+       int hf_zbee_zdp_period_time_results;
+       int hf_zbee_zdp_channel_count;
+       int hf_zbee_zdp_channel_mask;
+       int hf_zbee_zdp_channel_page;
+       int hf_zbee_zdp_channel_page_count;
+       int hf_zbee_zdp_channel_energy;
+       int hf_zbee_zdp_pan_eui64;
+       int hf_zbee_zdp_pan_uint;
+       int hf_zbee_zdp_channel;
+       int hf_zbee_zdp_nwk_desc_profile;
+       int hf_zbee_zdp_profile_version;
+       int hf_zbee_zdp_beacon;
+       int hf_zbee_zdp_superframe;
+       int hf_zbee_zdp_permit_joining;
+       int hf_zbee_zdp_extended_pan;
+       int hf_zbee_zdp_addr;
+       int hf_zbee_zdp_table_entry_type;
+       int hf_zbee_zdp_table_entry_idle_rx_0c;
+       int hf_zbee_zdp_table_entry_relationship_70;
+       int hf_zbee_zdp_table_entry_idle_rx_04;
+       int hf_zbee_zdp_table_entry_relationship_18;
+       int hf_zbee_zdp_depth;
+       int hf_zbee_zdp_permit_joining_03;
+       int hf_zbee_zdp_lqi;
+static int hf_zbee_zdp_scan_channel;
+       int hf_zbee_zdp_ieee_join_start_index;
+       int hf_zbee_zdp_ieee_join_update_id;
+       int hf_zbee_zdp_ieee_join_policy;
+       int hf_zbee_zdp_ieee_join_list_total;
+       int hf_zbee_zdp_ieee_join_list_start;
+       int hf_zbee_zdp_ieee_join_list_count;
+       int hf_zbee_zdp_ieee_join_list_ieee;
+       int hf_zbee_zdp_number_of_children;
+       int hf_zbee_zdp_beacon_survey_scan_mask;
+       int hf_zbee_zdp_beacon_survey_scan_mask_cnt;
+       int hf_zbee_zdp_beacon_survey_conf_mask;
+       int hf_zbee_zdp_beacon_survey_total;
+       int hf_zbee_zdp_beacon_survey_cur_zbn;
+       int hf_zbee_zdp_beacon_survey_cur_zbn_potent_parents;
+       int hf_zbee_zdp_beacon_survey_other_zbn;
+       int hf_zbee_zdp_beacon_survey_current_parent;
+       int hf_zbee_zdp_beacon_survey_cnt_parents;
+       int hf_zbee_zdp_beacon_survey_parent;
+       int hf_zbee_zdp_tlv_count;
+       int hf_zbee_zdp_tlv_id;
 /* Routing Table */
-       int hf_zbee_zdp_rtg = -1;
-       int hf_zbee_zdp_rtg_entry = -1;
-       int hf_zbee_zdp_rtg_destination = -1;
-       int hf_zbee_zdp_rtg_next_hop = -1;
-       int hf_zbee_zdp_rtg_status = -1;
+       int hf_zbee_zdp_rtg;
+       int hf_zbee_zdp_rtg_entry;
+       int hf_zbee_zdp_rtg_destination;
+       int hf_zbee_zdp_rtg_next_hop;
+       int hf_zbee_zdp_rtg_status;
 
 
 /* Subtree indicies. */
-static gint ett_zbee_zdp = -1;
-       gint ett_zbee_zdp_endpoint = -1;
-       gint ett_zbee_zdp_match_in = -1;
-       gint ett_zbee_zdp_match_out = -1;
-       gint ett_zbee_zdp_node = -1;
-static gint ett_zbee_zdp_node_in = -1;
-static gint ett_zbee_zdp_node_out = -1;
-       gint ett_zbee_zdp_power = -1;
-       gint ett_zbee_zdp_simple = -1;
-       gint ett_zbee_zdp_cinfo = -1;
-       gint ett_zbee_zdp_server = -1;
-       gint ett_zbee_zdp_simple_sizes = -1;
-       gint ett_zbee_zdp_bind = -1;
-       gint ett_zbee_zdp_bind_entry = -1;
-       gint ett_zbee_zdp_bind_end_in = -1;
-       gint ett_zbee_zdp_bind_end_out = -1;
-static gint ett_zbee_zdp_bind_table = -1;
-       gint ett_zbee_zdp_bind_source = -1;
-       gint ett_zbee_zdp_assoc_device = -1;
-       gint ett_zbee_zdp_nwk = -1;
-       gint ett_zbee_zdp_perm_join_fc = -1;
-       gint ett_zbee_zdp_lqi = -1;
-       gint ett_zbee_zdp_rtg = -1;
-       gint ett_zbee_zdp_cache = -1;
-       gint ett_zbee_zdp_nwk_desc = -1;
-       gint ett_zbee_zdp_table_entry = -1;
-static gint ett_zbee_zdp_descriptor_capability_field = -1;
+static gint ett_zbee_zdp;
+       gint ett_zbee_zdp_endpoint;
+       gint ett_zbee_zdp_match_in;
+       gint ett_zbee_zdp_match_out;
+       gint ett_zbee_zdp_node;
+static gint ett_zbee_zdp_node_in;
+static gint ett_zbee_zdp_node_out;
+       gint ett_zbee_zdp_power;
+       gint ett_zbee_zdp_simple;
+       gint ett_zbee_zdp_cinfo;
+       gint ett_zbee_zdp_server;
+       gint ett_zbee_zdp_simple_sizes;
+       gint ett_zbee_zdp_bind;
+       gint ett_zbee_zdp_bind_entry;
+       gint ett_zbee_zdp_bind_end_in;
+       gint ett_zbee_zdp_bind_end_out;
+static gint ett_zbee_zdp_bind_table;
+       gint ett_zbee_zdp_bind_source;
+       gint ett_zbee_zdp_assoc_device;
+       gint ett_zbee_zdp_nwk;
+       gint ett_zbee_zdp_perm_join_fc;
+       gint ett_zbee_zdp_lqi;
+       gint ett_zbee_zdp_rtg;
+       gint ett_zbee_zdp_cache;
+       gint ett_zbee_zdp_nwk_desc;
+       gint ett_zbee_zdp_table_entry;
+static gint ett_zbee_zdp_descriptor_capability_field;
 
 /* Expert Info */
-static expert_field ei_deprecated_command = EI_INIT;
+static expert_field ei_deprecated_command;
 
 /**************************************
  * Value Strings
diff --git a/epan/dissectors/packet-zbncp.c b/epan/dissectors/packet-zbncp.c
index 5c88707a1e..5992c0b510 100644
--- a/epan/dissectors/packet-zbncp.c
+++ b/epan/dissectors/packet-zbncp.c
@@ -66,371 +66,371 @@ static tvbuff_t *dissect_zbncp_dump_info(tvbuff_t *, packet_info *, proto_tree *
 
 /* ZBNCP hdr */
 static int zbncp_frame = -1;
-static int proto_zbncp = -1;
-
-static int hf_zbncp_hdr_sign = -1;
-static int hf_zbncp_packet_len = -1;
-static int hf_zbncp_hdr_type = -1;
-static int hf_zbncp_hdr_flags = -1;
-static int hf_zbncp_hdr_flags_isack = -1;
-static int hf_zbncp_hdr_flags_retrans = -1;
-static int hf_zbncp_hdr_flags_packetseq = -1;
-static int hf_zbncp_hdr_flags_ackseq = -1;
-static int hf_zbncp_hdr_flags_first_frag = -1;
-static int hf_zbncp_hdr_flags_last_frag = -1;
-static int hf_zbncp_hdr_crc8 = -1;
-
-static int hf_zbncp_body_data_crc16 = -1;
-static int hf_zbncp_data_hl_version = -1;
-static int hf_zbncp_data_hl_packet_type = -1;
-static int hf_zbncp_data_hl_call_id = -1;
-static int hf_zbncp_data_hl_tsn = -1;
-static int hf_zbncp_data_hl_status_cat = -1;
-static int hf_zbncp_data_hl_status = -1;
-static int hf_zbncp_data_hl_status_generic = -1;
-static int hf_zbncp_data_hl_status_mac = -1;
-static int hf_zbncp_data_hl_status_nwk = -1;
-static int hf_zbncp_data_hl_status_cbke = -1;
-static int hf_zbncp_data_fw_vers = -1;
-static int hf_zbncp_data_stack_vers = -1;
-static int hf_zbncp_data_proto_vers = -1;
-static int hf_zbncp_data_reset_opt = -1;
-static int hf_zbncp_data_zb_role = -1;
-static int hf_zbncp_data_ch_list_len = -1;
-static int hf_zbncp_data_page = -1;
-static int hf_zbncp_data_ch_mask = -1;
-static int hf_zbncp_data_channel = -1;
-static int hf_zbncp_data_channel4 = -1;
-static int hf_zbncp_data_pan_id = -1;
-static int hf_zbncp_data_mac_int_num = -1;
-static int hf_zbncp_data_index = -1;
-static int hf_zbncp_data_enable = -1;
-static int hf_zbncp_data_bind_type = -1;
-static int hf_zbncp_data_ieee_addr = -1;
-static int hf_zbncp_data_ext_pan_id = -1;
-static int hf_zbncp_data_coordinator_version = -1;
-static int hf_zbncp_data_trust_center_addres = -1;
-static int hf_zbncp_data_remote_ieee_addr = -1;
-static int hf_zbncp_data_src_ieee_addr = -1;
-static int hf_zbncp_data_dst_ieee_addr = -1;
-static int hf_zbncp_data_partner_ieee_addr = -1;
-static int hf_zbncp_data_trace_mask = -1;
-static int hf_zbncp_data_trace_wireless_traf = -1;
-static int hf_zbncp_data_trace_reserved = -1;
-static int hf_zbncp_data_trace_ncp_ll_proto = -1;
-static int hf_zbncp_data_trace_host_int_line = -1;
-static int hf_zbncp_data_trace_sleep_awake = -1;
-static int hf_zbncp_data_keepalive = -1;
-static int hf_zbncp_data_rx_on_idle = -1;
-static int hf_zbncp_data_res_tx_power = -1;
-static int hf_zbncp_data_req_tx_power = -1;
-static int hf_zbncp_data_joined = -1;
-static int hf_zbncp_data_joined_bit = -1;
-static int hf_zbncp_data_parent_bit = -1;
-static int hf_zbncp_data_authenticated = -1;
-static int hf_zbncp_data_timeout = -1;
-static int hf_zbncp_data_keepalive_mode = -1;
-static int hf_zbncp_force_route_record_sending = -1;
-static int hf_zbncp_data_nwk_addr = -1;
-static int hf_zbncp_data_nwk_parent_addr = -1;
-static int hf_zbncp_data_src_nwk_addr = -1;
-static int hf_zbncp_data_dst_nwk_addr = -1;
-static int hf_zbncp_data_remote_nwk_addr = -1;
-static int hf_zbncp_data_group_nwk_addr = -1;
-static int hf_zbncp_data_src_mac_addr = -1;
-static int hf_zbncp_data_dst_mac_addr = -1;
-static int hf_zbncp_data_nwk_key = -1;
-static int hf_zbncp_data_key_num = -1;
-static int hf_zbncp_data_serial_num = -1;
-static int hf_zbncp_data_size = -1;
-static int hf_zbncp_data_vendor_data = -1;
-static int hf_zbncp_data_dump_type = -1;
-static int hf_zbncp_data_dump_text = -1;
-static int hf_zbncp_data_dump_bin = -1;
-static int hf_zbncp_data_parameter_id = -1;
-static int hf_zbncp_data_value8_dec = -1;
-static int hf_zbncp_data_value16_dec = -1;
-static int hf_zbncp_data_aps_ack_to_non_sleepy = -1;
-static int hf_zbncp_data_aps_ack_to_sleepy = -1;
-static int hf_zbncp_data_min16 = -1;
-static int hf_zbncp_data_max16 = -1;
-static int hf_zbncp_data_default8_sign = -1;
-static int hf_zbncp_data_current8_sign = -1;
-static int hf_zbncp_data_is_concentrator = -1;
-static int hf_zbncp_data_concentrator_radius = -1;
-static int hf_zbncp_data_time16 = -1;
-static int hf_zbncp_data_lock_status = -1;
-static int hf_zbncp_data_reset_source = -1;
-static int hf_zbncp_nwk_leave_allowed = -1;
-static int hf_zbncp_data_nvram_dataset_quantity = -1;
-static int hf_zbncp_data_nvram_dataset_type = -1;
-static int hf_zbncp_data_nvram_version = -1;
-static int hf_zbncp_data_dataset_version = -1;
-static int hf_zbncp_data_dataset_length = -1;
-static int hf_zbncp_data_nvram_dataset_data = -1;
-static int hf_zbncp_data_tc_policy_type = -1;
-static int hf_zbncp_data_tc_policy_value = -1;
-static int hf_zbncp_max_children = -1;
-static int hf_zbncp_zdo_leave_allowed = -1;
-static int hf_zbncp_zdo_leave_wo_rejoin_allowed = -1;
-static int hf_zbncp_data_aps_key = -1;
-static int hf_zbncp_data_endpoint = -1;
-static int hf_zbncp_data_aps_group_num = -1;
-static int hf_zbncp_data_aps_group = -1;
-static int hf_zbncp_data_src_endpoint = -1;
-static int hf_zbncp_data_dst_endpoint = -1;
-static int hf_zbncp_data_poll_pkt_cnt = -1;
-static int hf_zbncp_data_poll_timeout = -1;
-static int hf_zbncp_data_poll_permit_flag = -1;
-static int hf_zbncp_data_profile_id = -1;
-static int hf_zbncp_data_device_id = -1;
-static int hf_zbncp_data_dev_version = -1;
-static int hf_zbncp_data_in_cl_cnt = -1;
-static int hf_zbncp_data_out_cl_cnt = -1;
-static int hf_zbncp_data_cluster_id = -1;
-static int hf_zbncp_data_mac_cap = -1;
-static int hf_zbncp_data_manuf_id = -1;
-static int hf_zbncp_data_cur_pwr_mode = -1;
-static int hf_zbncp_data_cur_pwr_lvl = -1;
-static int hf_zbncp_data_susp_period = -1;
-static int hf_zbncp_data_av_pwr_src = -1;
-static int hf_zbncp_data_cur_pwr_src = -1;
-static int hf_zbncp_data_pwr_src_const = -1;
-static int hf_zbncp_data_pwr_src_recharge = -1;
-static int hf_zbncp_data_pwr_src_disposable = -1;
-static int hf_zbncp_data_req_type = -1;
-static int hf_zbncp_data_start_idx = -1;
-static int hf_zbncp_data_start_idx_16b = -1;
-static int hf_zbncp_data_upd_idx = -1;
-static int hf_zbncp_data_entry_idx = -1;
-static int hf_zbncp_data_num_asoc_dec = -1;
-static int hf_zbncp_data_pwr_desc = -1;
-static int hf_zbncp_data_pwr_desc_cur_power_mode = -1;
-static int hf_zbncp_data_pwr_desc_av_pwr_src = -1;
-static int hf_zbncp_data_pwr_desc_cur_pwr_src = -1;
-static int hf_zbncp_data_pwr_desc_cur_pwr_lvl = -1;
-static int hf_zbncp_data_max_buf_size = -1;
-static int hf_zbncp_data_max_inc_trans_size = -1;
-static int hf_zbncp_data_max_out_trans_size = -1;
-static int hf_zbncp_data_desc_cap = -1;
-static int hf_zbncp_data_desc_cap_ext_act_ep_list_av = -1;
-static int hf_zbncp_data_desc_cap_ext_simple_desc_list_av = -1;
-static int hf_zbncp_data_flags8 = -1;
-static int hf_zbncp_data_flags_permit_join = -1;
-static int hf_zbncp_data_flags_router_cap = -1;
-static int hf_zbncp_data_flags_ed_cap = -1;
-static int hf_zbncp_data_flags_stack_profile = -1;
-static int hf_zbncp_data_flags16 = -1;
-static int hf_zbncp_data_flags_zb_role = -1;
-static int hf_zbncp_data_flags_comp_desc_av = -1;
-static int hf_zbncp_data_flags_user_desc_av = -1;
-static int hf_zbncp_data_flags_freq_868 = -1;
-static int hf_zbncp_data_flags_freq_902 = -1;
-static int hf_zbncp_data_flags_freq_2400 = -1;
-static int hf_zbncp_data_flags_freq_eu_sub_ghz = -1;
-static int hf_zbncp_data_srv_msk = -1;
-static int hf_zbncp_data_srv_msk_prim_tc = -1;
-static int hf_zbncp_data_srv_msk_backup_tc = -1;
-static int hf_zbncp_data_srv_msk_prim_bind_tbl_cache = -1;
-static int hf_zbncp_data_srv_msk_backup_bind_tbl_cache = -1;
-static int hf_zbncp_data_remote_bind_offset = -1;
-static int hf_zbncp_data_srv_msk_prim_disc_cache = -1;
-static int hf_zbncp_data_srv_msk_backup_disc_cache = -1;
-static int hf_zbncp_data_srv_msk_nwk_manager = -1;
-static int hf_zbncp_data_srv_msk_stack_compl_rev = -1;
-static int hf_zbncp_data_ep_cnt = -1;
-static int hf_zbncp_data_dst_addr_mode = -1;
-static int hf_zbncp_data_leave_flags = -1;
-static int hf_zbncp_data_leave_flags_remove_chil = -1;
-static int hf_zbncp_data_leave_flags_rejoin = -1;
-static int hf_zbncp_data_permit_dur = -1;
-static int hf_zbncp_data_tc_sign = -1;
-static int hf_zbncp_data_secur_rejoin = -1;
-static int hf_zbncp_data_zdo_rejoin_flags = -1;
-static int hf_zbncp_data_zdo_rejoin_flags_tcsw_happened = -1;
-static int hf_zbncp_data_dlen8 = -1;
-static int hf_zbncp_data_dlen16 = -1;
-static int hf_zbncp_data_param_len = -1;
-static int hf_zbncp_data_radius = -1;
-static int hf_zbncp_data_time_between_disc = -1;
-static int hf_zbncp_data_enable_flag = -1;
-static int hf_zbncp_data_array = -1;
-static int hf_zbncp_data_use_alias = -1;
-static int hf_zbncp_data_alias_src = -1;
-static int hf_zbncp_data_alias_seq = -1;
-static int hf_zbncp_data_tx_opt = -1;
-static int hf_zbncp_data_tx_opt_secur = -1;
-static int hf_zbncp_data_tx_opt_obsolete = -1;
-static int hf_zbncp_data_tx_opt_ack = -1;
-static int hf_zbncp_data_tx_opt_frag = -1;
-static int hf_zbncp_data_tx_opt_inc_ext_nonce = -1;
-static int hf_zbncp_data_tx_opt_force_mesh_route = -1;
-static int hf_zbncp_data_tx_opt_send_route_record = -1;
-static int hf_zbncp_data_lqi = -1;
-static int hf_zbncp_data_rssi = -1;
-static int hf_zbncp_data_do_cleanup = -1;
-static int hf_zbncp_data_max_rx_bcast = -1;
-static int hf_zbncp_data_mac_tx_bcast = -1;
-static int hf_zbncp_data_mac_rx_ucast = -1;
-static int hf_zbncp_data_mac_tx_ucast_total_zcl = -1;
-static int hf_zbncp_data_mac_tx_ucast_failures_zcl = -1;
-static int hf_zbncp_data_mac_tx_ucast_retries_zcl = -1;
-static int hf_zbncp_data_mac_tx_ucast_total = -1;
-static int hf_zbncp_data_mac_tx_ucast_failures = -1;
-static int hf_zbncp_data_mac_tx_ucast_retries = -1;
-static int hf_zbncp_data_mac_validate_drop_cnt = -1;
-static int hf_zbncp_data_mac_phy_cca_fail_count = -1;
-static int hf_zbncp_data_phy_to_mac_que_lim_reached = -1;
-static int hf_zbncp_data_period_of_time = -1;
-static int hf_zbncp_data_last_msg_lqi = -1;
-static int hf_zbncp_data_last_msg_rssi = -1;
-static int hf_zbncp_data_number_of_resets = -1;
-static int hf_zbncp_data_aps_tx_bcast = -1;
-static int hf_zbncp_data_aps_tx_ucast_success = -1;
-static int hf_zbncp_data_aps_tx_ucast_retry = -1;
-static int hf_zbncp_data_aps_tx_ucast_fail = -1;
-static int hf_zbncp_data_route_disc_initiated = -1;
-static int hf_zbncp_data_nwk_neighbor_added = -1;
-static int hf_zbncp_data_nwk_neighbor_removed = -1;
-static int hf_zbncp_data_nwk_neighbor_stale = -1;
-static int hf_zbncp_upd_status_code = -1;
-static int hf_zbncp_data_join_indication = -1;
-static int hf_zbncp_data_childs_removed = -1;
-static int hf_zbncp_data_aps_decrypt_failure = -1;
-static int hf_zbncp_data_packet_buffer_allocate_failures = -1;
-static int hf_zbncp_data_aps_unauthorized_key = -1;
-static int hf_zbncp_data_nwk_decrypt_failure = -1;
-static int hf_zbncp_data_average_mac_retry_per_aps_message_sent = -1;
-static int hf_zbncp_data_nwk_fc_failure = -1;
-static int hf_zbncp_data_aps_fc_failure = -1;
-static int hf_zbncp_data_nwk_retry_overflow = -1;
-static int hf_zbncp_data_nwk_bcast_table_full = -1;
-static int hf_zbncp_data_status = -1;
-static int hf_zbncp_zdo_auth_type = -1;
-static int hf_zbncp_zdo_leg_auth_status_code = -1;
-static int hf_zbncp_zdo_tclk_auth_status_code = -1;
-static int hf_zbncp_zdo_server_mask = -1;
-static int hf_zbncp_zdo_start_entry_idx = -1;
-static int hf_zbncp_zdo_scan_duration = -1;
-static int hf_zbncp_zdo_scan_cnt = -1;
-static int hf_zbncp_zdo_scan_mgr_addr = -1;
-static int hf_zbncp_data_aps_cnt = -1;
-static int hf_zbncp_data_aps_fc = -1;
-static int hf_zbncp_data_aps_fc_deliv_mode = -1;
-static int hf_zbncp_data_aps_fc_secur = -1;
-static int hf_zbncp_data_aps_fc_ack_retrans = -1;
-static int hf_zbncp_data_aps_key_attr = -1;
-static int hf_zbncp_data_aps_key_attr_key_src = -1;
-static int hf_zbncp_data_aps_key_attr_key_used = -1;
-static int hf_zbncp_data_pkt_len = -1;
-static int hf_zbncp_data_pkt = -1;
-static int hf_zbncp_data_scan_dur = -1;
-static int hf_zbncp_data_distr_nwk_flag = -1;
-static int hf_zbncp_data_nwk_count = -1;
-static int hf_zbncp_data_nwk_upd_id = -1;
-static int hf_zbncp_data_rejoin = -1;
-static int hf_zbncp_data_rejoin_nwk = -1;
-static int hf_zbncp_data_secur_en = -1;
-static int hf_zbncp_data_beacon_type = -1;
-static int hf_zbncp_data_beacon_order = -1;
-static int hf_zbncp_data_superframe_order = -1;
-static int hf_zbncp_data_battery_life_ext = -1;
-static int hf_zbncp_data_enh_beacon = -1;
-static int hf_zbncp_data_mac_if = -1;
-static int hf_zbncp_data_mac_if_idx = -1;
-static int hf_zbncp_data_ed_config = -1;
-static int hf_zbncp_data_timeout_cnt = -1;
-static int hf_zbncp_data_dev_timeout = -1;
-static int hf_zbncp_data_relationship = -1;
-static int hf_zbncp_data_tx_fail_cnt = -1;
-static int hf_zbncp_data_out_cost = -1;
-static int hf_zbncp_data_age = -1;
-static int hf_zbncp_data_keepalive_rec = -1;
-static int hf_zbncp_data_fast_poll_int = -1;
-static int hf_zbncp_data_long_poll_int = -1;
-static int hf_zbncp_data_fast_poll_flag = -1;
-static int hf_zbncp_data_stop_fast_poll_result = -1;
-static int hf_zbncp_data_time = -1;
-static int hf_zbncp_data_pan_id_cnt = -1;
-static int hf_zbncp_data_ic = -1;
-static int hf_zbncp_data_ic_table_size = -1;
-static int hf_zbncp_data_ic_ent_cnt = -1;
-static int hf_zbncp_data_cs = -1;
-static int hf_zbncp_data_ca_pub_key = -1;
-static int hf_zbncp_data_ca_priv_key = -1;
-static int hf_zbncp_data_cert = -1;
-static int hf_zbncp_data_ic_en = -1;
-static int hf_zbncp_data_key_type = -1;
-static int hf_zbncp_data_issuer = -1;
-static int hf_zbncp_data_tx_power = -1;
-static int hf_zbncp_data_seed = -1;
-static int hf_zbncp_data_tx_time = -1;
-static int hf_zbncp_data_link_key = -1;
-static int hf_zbncp_data_aps_link_key_type = -1;
-static int hf_zbncp_data_key_src = -1;
-static int hf_zbncp_data_key_attr = -1;
-static int hf_zbncp_data_out_frame_cnt = -1;
-static int hf_zbncp_data_inc_frame_cnt = -1;
-static int hf_zbncp_data_offset = -1;
-static int hf_zbncp_data_do_erase = -1;
-static int hf_zbncp_data_calibration_status = -1;
-static int hf_zbncp_data_calibration_value = -1;
-static int hf_zbncp_data_zgp_key_type = -1;
-static int hf_zbncp_data_zgp_link_key = -1;
-static int hf_zbncp_data_prod_conf_hdr_crc = -1;
-static int hf_zbncp_data_prod_conf_hdr_len = -1;
-static int hf_zbncp_data_prod_conf_hdr_version = -1;
-static int hf_zbncp_data_prod_conf_body = -1;
+static int proto_zbncp;
+
+static int hf_zbncp_hdr_sign;
+static int hf_zbncp_packet_len;
+static int hf_zbncp_hdr_type;
+static int hf_zbncp_hdr_flags;
+static int hf_zbncp_hdr_flags_isack;
+static int hf_zbncp_hdr_flags_retrans;
+static int hf_zbncp_hdr_flags_packetseq;
+static int hf_zbncp_hdr_flags_ackseq;
+static int hf_zbncp_hdr_flags_first_frag;
+static int hf_zbncp_hdr_flags_last_frag;
+static int hf_zbncp_hdr_crc8;
+
+static int hf_zbncp_body_data_crc16;
+static int hf_zbncp_data_hl_version;
+static int hf_zbncp_data_hl_packet_type;
+static int hf_zbncp_data_hl_call_id;
+static int hf_zbncp_data_hl_tsn;
+static int hf_zbncp_data_hl_status_cat;
+static int hf_zbncp_data_hl_status;
+static int hf_zbncp_data_hl_status_generic;
+static int hf_zbncp_data_hl_status_mac;
+static int hf_zbncp_data_hl_status_nwk;
+static int hf_zbncp_data_hl_status_cbke;
+static int hf_zbncp_data_fw_vers;
+static int hf_zbncp_data_stack_vers;
+static int hf_zbncp_data_proto_vers;
+static int hf_zbncp_data_reset_opt;
+static int hf_zbncp_data_zb_role;
+static int hf_zbncp_data_ch_list_len;
+static int hf_zbncp_data_page;
+static int hf_zbncp_data_ch_mask;
+static int hf_zbncp_data_channel;
+static int hf_zbncp_data_channel4;
+static int hf_zbncp_data_pan_id;
+static int hf_zbncp_data_mac_int_num;
+static int hf_zbncp_data_index;
+static int hf_zbncp_data_enable;
+static int hf_zbncp_data_bind_type;
+static int hf_zbncp_data_ieee_addr;
+static int hf_zbncp_data_ext_pan_id;
+static int hf_zbncp_data_coordinator_version;
+static int hf_zbncp_data_trust_center_addres;
+static int hf_zbncp_data_remote_ieee_addr;
+static int hf_zbncp_data_src_ieee_addr;
+static int hf_zbncp_data_dst_ieee_addr;
+static int hf_zbncp_data_partner_ieee_addr;
+static int hf_zbncp_data_trace_mask;
+static int hf_zbncp_data_trace_wireless_traf;
+static int hf_zbncp_data_trace_reserved;
+static int hf_zbncp_data_trace_ncp_ll_proto;
+static int hf_zbncp_data_trace_host_int_line;
+static int hf_zbncp_data_trace_sleep_awake;
+static int hf_zbncp_data_keepalive;
+static int hf_zbncp_data_rx_on_idle;
+static int hf_zbncp_data_res_tx_power;
+static int hf_zbncp_data_req_tx_power;
+static int hf_zbncp_data_joined;
+static int hf_zbncp_data_joined_bit;
+static int hf_zbncp_data_parent_bit;
+static int hf_zbncp_data_authenticated;
+static int hf_zbncp_data_timeout;
+static int hf_zbncp_data_keepalive_mode;
+static int hf_zbncp_force_route_record_sending;
+static int hf_zbncp_data_nwk_addr;
+static int hf_zbncp_data_nwk_parent_addr;
+static int hf_zbncp_data_src_nwk_addr;
+static int hf_zbncp_data_dst_nwk_addr;
+static int hf_zbncp_data_remote_nwk_addr;
+static int hf_zbncp_data_group_nwk_addr;
+static int hf_zbncp_data_src_mac_addr;
+static int hf_zbncp_data_dst_mac_addr;
+static int hf_zbncp_data_nwk_key;
+static int hf_zbncp_data_key_num;
+static int hf_zbncp_data_serial_num;
+static int hf_zbncp_data_size;
+static int hf_zbncp_data_vendor_data;
+static int hf_zbncp_data_dump_type;
+static int hf_zbncp_data_dump_text;
+static int hf_zbncp_data_dump_bin;
+static int hf_zbncp_data_parameter_id;
+static int hf_zbncp_data_value8_dec;
+static int hf_zbncp_data_value16_dec;
+static int hf_zbncp_data_aps_ack_to_non_sleepy;
+static int hf_zbncp_data_aps_ack_to_sleepy;
+static int hf_zbncp_data_min16;
+static int hf_zbncp_data_max16;
+static int hf_zbncp_data_default8_sign;
+static int hf_zbncp_data_current8_sign;
+static int hf_zbncp_data_is_concentrator;
+static int hf_zbncp_data_concentrator_radius;
+static int hf_zbncp_data_time16;
+static int hf_zbncp_data_lock_status;
+static int hf_zbncp_data_reset_source;
+static int hf_zbncp_nwk_leave_allowed;
+static int hf_zbncp_data_nvram_dataset_quantity;
+static int hf_zbncp_data_nvram_dataset_type;
+static int hf_zbncp_data_nvram_version;
+static int hf_zbncp_data_dataset_version;
+static int hf_zbncp_data_dataset_length;
+static int hf_zbncp_data_nvram_dataset_data;
+static int hf_zbncp_data_tc_policy_type;
+static int hf_zbncp_data_tc_policy_value;
+static int hf_zbncp_max_children;
+static int hf_zbncp_zdo_leave_allowed;
+static int hf_zbncp_zdo_leave_wo_rejoin_allowed;
+static int hf_zbncp_data_aps_key;
+static int hf_zbncp_data_endpoint;
+static int hf_zbncp_data_aps_group_num;
+static int hf_zbncp_data_aps_group;
+static int hf_zbncp_data_src_endpoint;
+static int hf_zbncp_data_dst_endpoint;
+static int hf_zbncp_data_poll_pkt_cnt;
+static int hf_zbncp_data_poll_timeout;
+static int hf_zbncp_data_poll_permit_flag;
+static int hf_zbncp_data_profile_id;
+static int hf_zbncp_data_device_id;
+static int hf_zbncp_data_dev_version;
+static int hf_zbncp_data_in_cl_cnt;
+static int hf_zbncp_data_out_cl_cnt;
+static int hf_zbncp_data_cluster_id;
+static int hf_zbncp_data_mac_cap;
+static int hf_zbncp_data_manuf_id;
+static int hf_zbncp_data_cur_pwr_mode;
+static int hf_zbncp_data_cur_pwr_lvl;
+static int hf_zbncp_data_susp_period;
+static int hf_zbncp_data_av_pwr_src;
+static int hf_zbncp_data_cur_pwr_src;
+static int hf_zbncp_data_pwr_src_const;
+static int hf_zbncp_data_pwr_src_recharge;
+static int hf_zbncp_data_pwr_src_disposable;
+static int hf_zbncp_data_req_type;
+static int hf_zbncp_data_start_idx;
+static int hf_zbncp_data_start_idx_16b;
+static int hf_zbncp_data_upd_idx;
+static int hf_zbncp_data_entry_idx;
+static int hf_zbncp_data_num_asoc_dec;
+static int hf_zbncp_data_pwr_desc;
+static int hf_zbncp_data_pwr_desc_cur_power_mode;
+static int hf_zbncp_data_pwr_desc_av_pwr_src;
+static int hf_zbncp_data_pwr_desc_cur_pwr_src;
+static int hf_zbncp_data_pwr_desc_cur_pwr_lvl;
+static int hf_zbncp_data_max_buf_size;
+static int hf_zbncp_data_max_inc_trans_size;
+static int hf_zbncp_data_max_out_trans_size;
+static int hf_zbncp_data_desc_cap;
+static int hf_zbncp_data_desc_cap_ext_act_ep_list_av;
+static int hf_zbncp_data_desc_cap_ext_simple_desc_list_av;
+static int hf_zbncp_data_flags8;
+static int hf_zbncp_data_flags_permit_join;
+static int hf_zbncp_data_flags_router_cap;
+static int hf_zbncp_data_flags_ed_cap;
+static int hf_zbncp_data_flags_stack_profile;
+static int hf_zbncp_data_flags16;
+static int hf_zbncp_data_flags_zb_role;
+static int hf_zbncp_data_flags_comp_desc_av;
+static int hf_zbncp_data_flags_user_desc_av;
+static int hf_zbncp_data_flags_freq_868;
+static int hf_zbncp_data_flags_freq_902;
+static int hf_zbncp_data_flags_freq_2400;
+static int hf_zbncp_data_flags_freq_eu_sub_ghz;
+static int hf_zbncp_data_srv_msk;
+static int hf_zbncp_data_srv_msk_prim_tc;
+static int hf_zbncp_data_srv_msk_backup_tc;
+static int hf_zbncp_data_srv_msk_prim_bind_tbl_cache;
+static int hf_zbncp_data_srv_msk_backup_bind_tbl_cache;
+static int hf_zbncp_data_remote_bind_offset;
+static int hf_zbncp_data_srv_msk_prim_disc_cache;
+static int hf_zbncp_data_srv_msk_backup_disc_cache;
+static int hf_zbncp_data_srv_msk_nwk_manager;
+static int hf_zbncp_data_srv_msk_stack_compl_rev;
+static int hf_zbncp_data_ep_cnt;
+static int hf_zbncp_data_dst_addr_mode;
+static int hf_zbncp_data_leave_flags;
+static int hf_zbncp_data_leave_flags_remove_chil;
+static int hf_zbncp_data_leave_flags_rejoin;
+static int hf_zbncp_data_permit_dur;
+static int hf_zbncp_data_tc_sign;
+static int hf_zbncp_data_secur_rejoin;
+static int hf_zbncp_data_zdo_rejoin_flags;
+static int hf_zbncp_data_zdo_rejoin_flags_tcsw_happened;
+static int hf_zbncp_data_dlen8;
+static int hf_zbncp_data_dlen16;
+static int hf_zbncp_data_param_len;
+static int hf_zbncp_data_radius;
+static int hf_zbncp_data_time_between_disc;
+static int hf_zbncp_data_enable_flag;
+static int hf_zbncp_data_array;
+static int hf_zbncp_data_use_alias;
+static int hf_zbncp_data_alias_src;
+static int hf_zbncp_data_alias_seq;
+static int hf_zbncp_data_tx_opt;
+static int hf_zbncp_data_tx_opt_secur;
+static int hf_zbncp_data_tx_opt_obsolete;
+static int hf_zbncp_data_tx_opt_ack;
+static int hf_zbncp_data_tx_opt_frag;
+static int hf_zbncp_data_tx_opt_inc_ext_nonce;
+static int hf_zbncp_data_tx_opt_force_mesh_route;
+static int hf_zbncp_data_tx_opt_send_route_record;
+static int hf_zbncp_data_lqi;
+static int hf_zbncp_data_rssi;
+static int hf_zbncp_data_do_cleanup;
+static int hf_zbncp_data_max_rx_bcast;
+static int hf_zbncp_data_mac_tx_bcast;
+static int hf_zbncp_data_mac_rx_ucast;
+static int hf_zbncp_data_mac_tx_ucast_total_zcl;
+static int hf_zbncp_data_mac_tx_ucast_failures_zcl;
+static int hf_zbncp_data_mac_tx_ucast_retries_zcl;
+static int hf_zbncp_data_mac_tx_ucast_total;
+static int hf_zbncp_data_mac_tx_ucast_failures;
+static int hf_zbncp_data_mac_tx_ucast_retries;
+static int hf_zbncp_data_mac_validate_drop_cnt;
+static int hf_zbncp_data_mac_phy_cca_fail_count;
+static int hf_zbncp_data_phy_to_mac_que_lim_reached;
+static int hf_zbncp_data_period_of_time;
+static int hf_zbncp_data_last_msg_lqi;
+static int hf_zbncp_data_last_msg_rssi;
+static int hf_zbncp_data_number_of_resets;
+static int hf_zbncp_data_aps_tx_bcast;
+static int hf_zbncp_data_aps_tx_ucast_success;
+static int hf_zbncp_data_aps_tx_ucast_retry;
+static int hf_zbncp_data_aps_tx_ucast_fail;
+static int hf_zbncp_data_route_disc_initiated;
+static int hf_zbncp_data_nwk_neighbor_added;
+static int hf_zbncp_data_nwk_neighbor_removed;
+static int hf_zbncp_data_nwk_neighbor_stale;
+static int hf_zbncp_upd_status_code;
+static int hf_zbncp_data_join_indication;
+static int hf_zbncp_data_childs_removed;
+static int hf_zbncp_data_aps_decrypt_failure;
+static int hf_zbncp_data_packet_buffer_allocate_failures;
+static int hf_zbncp_data_aps_unauthorized_key;
+static int hf_zbncp_data_nwk_decrypt_failure;
+static int hf_zbncp_data_average_mac_retry_per_aps_message_sent;
+static int hf_zbncp_data_nwk_fc_failure;
+static int hf_zbncp_data_aps_fc_failure;
+static int hf_zbncp_data_nwk_retry_overflow;
+static int hf_zbncp_data_nwk_bcast_table_full;
+static int hf_zbncp_data_status;
+static int hf_zbncp_zdo_auth_type;
+static int hf_zbncp_zdo_leg_auth_status_code;
+static int hf_zbncp_zdo_tclk_auth_status_code;
+static int hf_zbncp_zdo_server_mask;
+static int hf_zbncp_zdo_start_entry_idx;
+static int hf_zbncp_zdo_scan_duration;
+static int hf_zbncp_zdo_scan_cnt;
+static int hf_zbncp_zdo_scan_mgr_addr;
+static int hf_zbncp_data_aps_cnt;
+static int hf_zbncp_data_aps_fc;
+static int hf_zbncp_data_aps_fc_deliv_mode;
+static int hf_zbncp_data_aps_fc_secur;
+static int hf_zbncp_data_aps_fc_ack_retrans;
+static int hf_zbncp_data_aps_key_attr;
+static int hf_zbncp_data_aps_key_attr_key_src;
+static int hf_zbncp_data_aps_key_attr_key_used;
+static int hf_zbncp_data_pkt_len;
+static int hf_zbncp_data_pkt;
+static int hf_zbncp_data_scan_dur;
+static int hf_zbncp_data_distr_nwk_flag;
+static int hf_zbncp_data_nwk_count;
+static int hf_zbncp_data_nwk_upd_id;
+static int hf_zbncp_data_rejoin;
+static int hf_zbncp_data_rejoin_nwk;
+static int hf_zbncp_data_secur_en;
+static int hf_zbncp_data_beacon_type;
+static int hf_zbncp_data_beacon_order;
+static int hf_zbncp_data_superframe_order;
+static int hf_zbncp_data_battery_life_ext;
+static int hf_zbncp_data_enh_beacon;
+static int hf_zbncp_data_mac_if;
+static int hf_zbncp_data_mac_if_idx;
+static int hf_zbncp_data_ed_config;
+static int hf_zbncp_data_timeout_cnt;
+static int hf_zbncp_data_dev_timeout;
+static int hf_zbncp_data_relationship;
+static int hf_zbncp_data_tx_fail_cnt;
+static int hf_zbncp_data_out_cost;
+static int hf_zbncp_data_age;
+static int hf_zbncp_data_keepalive_rec;
+static int hf_zbncp_data_fast_poll_int;
+static int hf_zbncp_data_long_poll_int;
+static int hf_zbncp_data_fast_poll_flag;
+static int hf_zbncp_data_stop_fast_poll_result;
+static int hf_zbncp_data_time;
+static int hf_zbncp_data_pan_id_cnt;
+static int hf_zbncp_data_ic;
+static int hf_zbncp_data_ic_table_size;
+static int hf_zbncp_data_ic_ent_cnt;
+static int hf_zbncp_data_cs;
+static int hf_zbncp_data_ca_pub_key;
+static int hf_zbncp_data_ca_priv_key;
+static int hf_zbncp_data_cert;
+static int hf_zbncp_data_ic_en;
+static int hf_zbncp_data_key_type;
+static int hf_zbncp_data_issuer;
+static int hf_zbncp_data_tx_power;
+static int hf_zbncp_data_seed;
+static int hf_zbncp_data_tx_time;
+static int hf_zbncp_data_link_key;
+static int hf_zbncp_data_aps_link_key_type;
+static int hf_zbncp_data_key_src;
+static int hf_zbncp_data_key_attr;
+static int hf_zbncp_data_out_frame_cnt;
+static int hf_zbncp_data_inc_frame_cnt;
+static int hf_zbncp_data_offset;
+static int hf_zbncp_data_do_erase;
+static int hf_zbncp_data_calibration_status;
+static int hf_zbncp_data_calibration_value;
+static int hf_zbncp_data_zgp_key_type;
+static int hf_zbncp_data_zgp_link_key;
+static int hf_zbncp_data_prod_conf_hdr_crc;
+static int hf_zbncp_data_prod_conf_hdr_len;
+static int hf_zbncp_data_prod_conf_hdr_version;
+static int hf_zbncp_data_prod_conf_body;
 
 /* IEEE802.15.4 capability info (copied from IEEE802.15.4 95e212e6c7 commit)*/
-static int hf_ieee802154_cinfo_alt_coord = -1;
-static int hf_ieee802154_cinfo_device_type = -1;
-static int hf_ieee802154_cinfo_power_src = -1;
-static int hf_ieee802154_cinfo_idle_rx = -1;
-static int hf_ieee802154_cinfo_sec_capable = -1;
-static int hf_ieee802154_cinfo_alloc_addr = -1;
+static int hf_ieee802154_cinfo_alt_coord;
+static int hf_ieee802154_cinfo_device_type;
+static int hf_ieee802154_cinfo_power_src;
+static int hf_ieee802154_cinfo_idle_rx;
+static int hf_ieee802154_cinfo_sec_capable;
+static int hf_ieee802154_cinfo_alloc_addr;
 
 /* ZBNCP traffic dump */
-static int hf_zbncp_dump_preamble = -1;
-static int hf_zbncp_dump_version = -1;
-static int hf_zbncp_dump_type = -1;
-static int hf_zbncp_dump_options = -1;
-static int hf_zbncp_dump_options_dir = -1;
-static int hf_zbncp_dump_options_int_state = -1;
-static int hf_zbncp_dump_options_tx_conflict = -1;
+static int hf_zbncp_dump_preamble;
+static int hf_zbncp_dump_version;
+static int hf_zbncp_dump_type;
+static int hf_zbncp_dump_options;
+static int hf_zbncp_dump_options_dir;
+static int hf_zbncp_dump_options_int_state;
+static int hf_zbncp_dump_options_tx_conflict;
 
 /* Initialize subtree pointers */
-static gint ett_zbncp_hdr = -1;
-static gint ett_zbncp_hdr_flags = -1;
-static gint ett_zbncp_ll_body = -1;
-static gint ett_zbncp_hl_hdr = -1;
-static gint ett_zbncp_hl_body = -1;
-static gint ett_zbncp_data_in_cl_list = -1;
-static gint ett_zbncp_data_out_cl_list = -1;
-static gint ett_zbncp_data_mac_cap = -1;
-static gint ett_zbncp_data_pwr_src = -1;
-static gint ett_zbncp_data_cur_pwr_src = -1;
-static gint ett_zbncp_data_asoc_nwk_list = -1;
-static gint ett_zbncp_data_pwr_desc = -1;
-static gint ett_zbncp_data_desc_cap = -1;
-static gint ett_zbncp_data_flags = -1;
-static gint ett_zbncp_data_server_mask = -1;
-static gint ett_zbncp_data_ep_list = -1;
-static gint ett_zbncp_data_leave_flags = -1;
-static gint ett_zbncp_data_tx_opt = -1;
-static gint ett_zbncp_data_zdo_rejoin_flags = -1;
-static gint ett_zbncp_data_apc_fc = -1;
-static gint ett_zbncp_data_prod_conf_hdr = -1;
-static gint ett_zbncp_data_aps_key_attr = -1;
-static gint ett_zbncp_data_ch_list = -1;
-static gint ett_zbncp_data_channel = -1;
-static gint ett_zbncp_data_nwk_descr = -1;
-static gint ett_zbncp_data_cmd_opt = -1;
-static gint ett_zbncp_data_joind_bitmask = -1;
-static gint ett_zbncp_data_trace_bitmask = -1;
-
-static gint ett_zbncp_dump = -1;
-static gint ett_zbncp_dump_opt = -1;
+static gint ett_zbncp_hdr;
+static gint ett_zbncp_hdr_flags;
+static gint ett_zbncp_ll_body;
+static gint ett_zbncp_hl_hdr;
+static gint ett_zbncp_hl_body;
+static gint ett_zbncp_data_in_cl_list;
+static gint ett_zbncp_data_out_cl_list;
+static gint ett_zbncp_data_mac_cap;
+static gint ett_zbncp_data_pwr_src;
+static gint ett_zbncp_data_cur_pwr_src;
+static gint ett_zbncp_data_asoc_nwk_list;
+static gint ett_zbncp_data_pwr_desc;
+static gint ett_zbncp_data_desc_cap;
+static gint ett_zbncp_data_flags;
+static gint ett_zbncp_data_server_mask;
+static gint ett_zbncp_data_ep_list;
+static gint ett_zbncp_data_leave_flags;
+static gint ett_zbncp_data_tx_opt;
+static gint ett_zbncp_data_zdo_rejoin_flags;
+static gint ett_zbncp_data_apc_fc;
+static gint ett_zbncp_data_prod_conf_hdr;
+static gint ett_zbncp_data_aps_key_attr;
+static gint ett_zbncp_data_ch_list;
+static gint ett_zbncp_data_channel;
+static gint ett_zbncp_data_nwk_descr;
+static gint ett_zbncp_data_cmd_opt;
+static gint ett_zbncp_data_joind_bitmask;
+static gint ett_zbncp_data_trace_bitmask;
+
+static gint ett_zbncp_dump;
+static gint ett_zbncp_dump_opt;
 
 static dissector_handle_t zbncp_handle;
 
diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c
index 2ab039769a..0c523f5919 100644
--- a/epan/dissectors/packet-zebra.c
+++ b/epan/dissectors/packet-zebra.c
@@ -50,105 +50,105 @@ void proto_register_zebra(void);
 
 static dissector_handle_t zebra_handle;
 
-static int proto_zebra = -1;
-static int hf_zebra_len = -1;
-static int hf_zebra_command = -1;
-static int hf_zebra_request = -1;
-static int hf_zebra_interface = -1;
-static int hf_zebra_index = -1;
-static int hf_zebra_indexnum = -1;
-static int hf_zebra_type_v0 = -1;
-static int hf_zebra_type_v1 = -1;
-static int hf_zebra_intflags = -1;
-static int hf_zebra_rtflags = -1;
-static int hf_zebra_distance = -1;
-static int hf_zebra_metric = -1;
-static int hf_zebra_mtu = -1;
-static int hf_zebra_mtu6 = -1;
-static int hf_zebra_bandwidth = -1;
-static int hf_zebra_family = -1;
-static int hf_zebra_flags = -1;
-static int hf_zebra_message = -1;
-static int hf_zebra_route_safi = -1;
-static int hf_zebra_msg_nexthop = -1;
-static int hf_zebra_msg_index = -1;
-static int hf_zebra_msg_distance = -1;
-static int hf_zebra_msg_metric = -1;
-static int hf_zebra_nexthopnum = -1;
-static int hf_zebra_nexthop4 = -1;
-static int hf_zebra_nexthop6 = -1;
-static int hf_zebra_dest4 = -1;
-static int hf_zebra_dest6 = -1;
-static int hf_zebra_prefixlen = -1;
-static int hf_zebra_prefix4 = -1;
-static int hf_zebra_prefix6 = -1;
-static int hf_zebra_version = -1;
-static int hf_zebra_marker = -1;
-static int hf_zebra_intstatus = -1;
-static int hf_zebra_routeridaddress = -1;
-static int hf_zebra_routeridmask = -1;
-static int hf_zebra_mac = -1;
-static int hf_zebra_redist_default = -1;
-static int hf_zebra_vrfid = -1;
-static int hf_zebra_routeridfamily = -1;
-static int hf_zebra_nexthoptype = -1;
-static int hf_zebra_msg_mtu = -1;
-static int hf_zebra_msg_tag = -1;
-static int hf_zebra_tag = -1;
-static int hf_zebra_maclen = -1;
-static int hf_zebra_haslinkparam = -1;
+static int proto_zebra;
+static int hf_zebra_len;
+static int hf_zebra_command;
+static int hf_zebra_request;
+static int hf_zebra_interface;
+static int hf_zebra_index;
+static int hf_zebra_indexnum;
+static int hf_zebra_type_v0;
+static int hf_zebra_type_v1;
+static int hf_zebra_intflags;
+static int hf_zebra_rtflags;
+static int hf_zebra_distance;
+static int hf_zebra_metric;
+static int hf_zebra_mtu;
+static int hf_zebra_mtu6;
+static int hf_zebra_bandwidth;
+static int hf_zebra_family;
+static int hf_zebra_flags;
+static int hf_zebra_message;
+static int hf_zebra_route_safi;
+static int hf_zebra_msg_nexthop;
+static int hf_zebra_msg_index;
+static int hf_zebra_msg_distance;
+static int hf_zebra_msg_metric;
+static int hf_zebra_nexthopnum;
+static int hf_zebra_nexthop4;
+static int hf_zebra_nexthop6;
+static int hf_zebra_dest4;
+static int hf_zebra_dest6;
+static int hf_zebra_prefixlen;
+static int hf_zebra_prefix4;
+static int hf_zebra_prefix6;
+static int hf_zebra_version;
+static int hf_zebra_marker;
+static int hf_zebra_intstatus;
+static int hf_zebra_routeridaddress;
+static int hf_zebra_routeridmask;
+static int hf_zebra_mac;
+static int hf_zebra_redist_default;
+static int hf_zebra_vrfid;
+static int hf_zebra_routeridfamily;
+static int hf_zebra_nexthoptype;
+static int hf_zebra_msg_mtu;
+static int hf_zebra_msg_tag;
+static int hf_zebra_tag;
+static int hf_zebra_maclen;
+static int hf_zebra_haslinkparam;
 /* FRRouting, Zebra API v4, v5 and v6 */
-static int hf_zebra_command_v4 = -1;
-static int hf_zebra_command_v5 = -1;
-static int hf_zebra_command_v6 = -1;
-static int hf_zebra_type_v4 = -1;
-static int hf_zebra_type_v5 = -1;
-static int hf_zebra_ptmenable = -1;
-static int hf_zebra_ptmstatus = -1;
-static int hf_zebra_instance = -1;
-static int hf_zebra_rtflags_u32 = -1;
-static int hf_zebra_speed = -1;
-static int hf_zebra_lltype = -1;
-static int hf_zebra_message4 = -1;
-static int hf_zebra_message5 = -1;
-static int hf_zebra_route_safi_u8 = -1;
-static int hf_zebra_rmac = -1;
-static int hf_zebra_msg4_tag = -1;
-static int hf_zebra_msg4_mtu = -1;
-static int hf_zebra_msg4_srcpfx = -1;
-static int hf_zebra_msg5_distance = -1;
-static int hf_zebra_msg5_metric = -1;
-static int hf_zebra_msg5_tag = -1;
-static int hf_zebra_msg5_mtu = -1;
-static int hf_zebra_msg5_srcpfx = -1;
-static int hf_zebra_msg_label = -1;
-static int hf_zebra_msg_tableid = -1;
-static int hf_zebra_nexthopnum_u16 = -1;
-static int hf_zebra_nexthoptype_frr = -1;
-static int hf_zebra_bhtype = -1;
-static int hf_zebra_srcprefixlen = -1;
-static int hf_zebra_srcprefix4 = -1;
-static int hf_zebra_srcprefix6 = -1;
-static int hf_zebra_tableid = -1;
-static int hf_zebra_afi = -1;
-static int hf_zebra_pid = -1;
-static int hf_zebra_vrf_table_id = -1;
-static int hf_zebra_vrf_netns_name = -1;
-static int hf_zebra_vrf_name = -1;
-static int hf_zebra_proto = -1;
-static int hf_zebra_label_chunk_keep = -1;
-static int hf_zebra_label_chunk_size = -1;
-static int hf_zebra_label_chunk_start = -1;
-static int hf_zebra_label_chunk_end = -1;
-static int hf_zebra_mpls_enabled = -1;
-static int hf_zebra_multipath_num = -1;
-static int hf_zebra_labelnum = -1;
-static int hf_zebra_label = -1;
-static int hf_zebra_receive_notify = -1;
-
-static gint ett_zebra = -1;
-static gint ett_zebra_request = -1;
-static gint ett_message = -1;
+static int hf_zebra_command_v4;
+static int hf_zebra_command_v5;
+static int hf_zebra_command_v6;
+static int hf_zebra_type_v4;
+static int hf_zebra_type_v5;
+static int hf_zebra_ptmenable;
+static int hf_zebra_ptmstatus;
+static int hf_zebra_instance;
+static int hf_zebra_rtflags_u32;
+static int hf_zebra_speed;
+static int hf_zebra_lltype;
+static int hf_zebra_message4;
+static int hf_zebra_message5;
+static int hf_zebra_route_safi_u8;
+static int hf_zebra_rmac;
+static int hf_zebra_msg4_tag;
+static int hf_zebra_msg4_mtu;
+static int hf_zebra_msg4_srcpfx;
+static int hf_zebra_msg5_distance;
+static int hf_zebra_msg5_metric;
+static int hf_zebra_msg5_tag;
+static int hf_zebra_msg5_mtu;
+static int hf_zebra_msg5_srcpfx;
+static int hf_zebra_msg_label;
+static int hf_zebra_msg_tableid;
+static int hf_zebra_nexthopnum_u16;
+static int hf_zebra_nexthoptype_frr;
+static int hf_zebra_bhtype;
+static int hf_zebra_srcprefixlen;
+static int hf_zebra_srcprefix4;
+static int hf_zebra_srcprefix6;
+static int hf_zebra_tableid;
+static int hf_zebra_afi;
+static int hf_zebra_pid;
+static int hf_zebra_vrf_table_id;
+static int hf_zebra_vrf_netns_name;
+static int hf_zebra_vrf_name;
+static int hf_zebra_proto;
+static int hf_zebra_label_chunk_keep;
+static int hf_zebra_label_chunk_size;
+static int hf_zebra_label_chunk_start;
+static int hf_zebra_label_chunk_end;
+static int hf_zebra_mpls_enabled;
+static int hf_zebra_multipath_num;
+static int hf_zebra_labelnum;
+static int hf_zebra_label;
+static int hf_zebra_receive_notify;
+
+static gint ett_zebra;
+static gint ett_zebra_request;
+static gint ett_message;
 
 #define TCP_PORT_ZEBRA			2600 /* Not IANA registered */
 
diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c
index b50e4e9055..27033af9c3 100644
--- a/epan/dissectors/packet-zep.c
+++ b/epan/dissectors/packet-zep.c
@@ -65,21 +65,21 @@ static const range_string type_rvals[] = {
 static const true_false_string tfs_crc_lqi = { "CRC", "LQI" };
 
 /*  Initialize protocol and registered fields. */
-static int proto_zep = -1;
-static int hf_zep_version = -1;
-static int hf_zep_type = -1;
-static int hf_zep_channel_id = -1;
-static int hf_zep_device_id = -1;
-static int hf_zep_lqi_mode = -1;
-static int hf_zep_lqi = -1;
-static int hf_zep_timestamp = -1;
-static int hf_zep_seqno = -1;
-static int hf_zep_ieee_length = -1;
-static int hf_zep_protocol_id = -1;
-static int hf_zep_reserved_field = -1;
+static int proto_zep;
+static int hf_zep_version;
+static int hf_zep_type;
+static int hf_zep_channel_id;
+static int hf_zep_device_id;
+static int hf_zep_lqi_mode;
+static int hf_zep_lqi;
+static int hf_zep_timestamp;
+static int hf_zep_seqno;
+static int hf_zep_ieee_length;
+static int hf_zep_protocol_id;
+static int hf_zep_reserved_field;
 
 /* Initialize protocol subtrees. */
-static gint ett_zep = -1;
+static gint ett_zep;
 
 /*  Dissector handle */
 static dissector_handle_t zep_handle;
diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c
index cd3ed1765c..86f3cd627a 100644
--- a/epan/dissectors/packet-ziop.c
+++ b/epan/dissectors/packet-ziop.c
@@ -39,24 +39,24 @@ void proto_register_ziop(void);
  * ------------------------------------------------------------------------------------------+
  */
 
-static int proto_ziop = -1;
+static int proto_ziop;
 
 /*
  * (sub)Tree declares
  */
 
-static gint hf_ziop_magic = -1;
-static gint hf_ziop_giop_version_major = -1;
-static gint hf_ziop_giop_version_minor = -1;
-static gint hf_ziop_flags = -1;
-static gint hf_ziop_message_type = -1;
-static gint hf_ziop_message_size = -1;
-static gint hf_ziop_compressor_id = -1;
-static gint hf_ziop_original_length = -1;
+static gint hf_ziop_magic;
+static gint hf_ziop_giop_version_major;
+static gint hf_ziop_giop_version_minor;
+static gint hf_ziop_flags;
+static gint hf_ziop_message_type;
+static gint hf_ziop_message_size;
+static gint hf_ziop_compressor_id;
+static gint hf_ziop_original_length;
 
-static gint ett_ziop = -1;
+static gint ett_ziop;
 
-static expert_field ei_ziop_version = EI_INIT;
+static expert_field ei_ziop_version;
 
 static dissector_handle_t ziop_tcp_handle;
 
diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c
index 59a89b2454..fa6951af78 100644
--- a/epan/dissectors/packet-zrtp.c
+++ b/epan/dissectors/packet-zrtp.c
@@ -28,100 +28,100 @@ void proto_register_zrtp(void);
 /*
   RTP header
 */
-static int proto_zrtp = -1;
-static int hf_zrtp_rtpversion = -1;
-static int hf_zrtp_rtppadding = -1;
-static int hf_zrtp_rtpextension = -1;
-/* static int hf_zrtp_id = -1; */
-static int hf_zrtp_sequence = -1;
-static int hf_zrtp_cookie = -1;
-static int hf_zrtp_source_id = -1;
+static int proto_zrtp;
+static int hf_zrtp_rtpversion;
+static int hf_zrtp_rtppadding;
+static int hf_zrtp_rtpextension;
+/* static int hf_zrtp_id; */
+static int hf_zrtp_sequence;
+static int hf_zrtp_cookie;
+static int hf_zrtp_source_id;
 
 /*
   ZRTP header
 */
-static int hf_zrtp_signature = -1;
-static int hf_zrtp_msg_length = -1;
-static int hf_zrtp_msg_type = -1;
-static int hf_zrtp_msg_version = -1;
+static int hf_zrtp_signature;
+static int hf_zrtp_msg_length;
+static int hf_zrtp_msg_type;
+static int hf_zrtp_msg_version;
 
 /*
   Hello Data
 */
-static int hf_zrtp_msg_client_id = -1;
-static int hf_zrtp_msg_zid = -1;
-static int hf_zrtp_msg_sigcap = -1;
-static int hf_zrtp_msg_mitm = -1;
-static int hf_zrtp_msg_passive = -1;
-static int hf_zrtp_msg_hash_count = -1;
-static int hf_zrtp_msg_cipher_count = -1;
-static int hf_zrtp_msg_authtag_count = -1;
-static int hf_zrtp_msg_key_count = -1;
-static int hf_zrtp_msg_sas_count = -1;
-static int hf_zrtp_msg_hash = -1;
-static int hf_zrtp_msg_cipher = -1;
-static int hf_zrtp_msg_at = -1;
-static int hf_zrtp_msg_keya = -1;
-static int hf_zrtp_msg_sas = -1;
-static int hf_zrtp_msg_hash_image = -1;
+static int hf_zrtp_msg_client_id;
+static int hf_zrtp_msg_zid;
+static int hf_zrtp_msg_sigcap;
+static int hf_zrtp_msg_mitm;
+static int hf_zrtp_msg_passive;
+static int hf_zrtp_msg_hash_count;
+static int hf_zrtp_msg_cipher_count;
+static int hf_zrtp_msg_authtag_count;
+static int hf_zrtp_msg_key_count;
+static int hf_zrtp_msg_sas_count;
+static int hf_zrtp_msg_hash;
+static int hf_zrtp_msg_cipher;
+static int hf_zrtp_msg_at;
+static int hf_zrtp_msg_keya;
+static int hf_zrtp_msg_sas;
+static int hf_zrtp_msg_hash_image;
 
 /*
   Commit Data
 */
-static int hf_zrtp_msg_hvi = -1;
-static int hf_zrtp_msg_nonce = -1;
-static int hf_zrtp_msg_key_id = -1;
+static int hf_zrtp_msg_hvi;
+static int hf_zrtp_msg_nonce;
+static int hf_zrtp_msg_key_id;
 
 /*
   DHParts Data
 */
-static int hf_zrtp_msg_rs1ID = -1;
-static int hf_zrtp_msg_rs2ID = -1;
-static int hf_zrtp_msg_auxs = -1;
-static int hf_zrtp_msg_pbxs = -1;
+static int hf_zrtp_msg_rs1ID;
+static int hf_zrtp_msg_rs2ID;
+static int hf_zrtp_msg_auxs;
+static int hf_zrtp_msg_pbxs;
 
 /*
   Confirm Data
 */
-static int hf_zrtp_msg_hmac = -1;
-static int hf_zrtp_msg_cfb = -1;
+static int hf_zrtp_msg_hmac;
+static int hf_zrtp_msg_cfb;
 
 /*
   Error Data
 */
-static int hf_zrtp_msg_error = -1;
+static int hf_zrtp_msg_error;
 
 /*
   Ping Data
 */
-static int hf_zrtp_msg_ping_version = -1;
-static int hf_zrtp_msg_ping_endpointhash = -1;
-static int hf_zrtp_msg_pingack_endpointhash = -1;
-static int hf_zrtp_msg_ping_ssrc = -1;
+static int hf_zrtp_msg_ping_version;
+static int hf_zrtp_msg_ping_endpointhash;
+static int hf_zrtp_msg_pingack_endpointhash;
+static int hf_zrtp_msg_ping_ssrc;
 
 /*
   Checksum Data
 */
-static int hf_zrtp_checksum = -1;
-static int hf_zrtp_checksum_status = -1;
+static int hf_zrtp_checksum;
+static int hf_zrtp_checksum_status;
 
 /*
   Sub-Tree
 */
-static gint ett_zrtp = -1;
-static gint ett_zrtp_msg = -1;
-static gint ett_zrtp_msg_data = -1;
+static gint ett_zrtp;
+static gint ett_zrtp_msg;
+static gint ett_zrtp_msg_data;
 
-static gint ett_zrtp_msg_hc = -1;
-static gint ett_zrtp_msg_kc = -1;
-static gint ett_zrtp_msg_ac = -1;
-static gint ett_zrtp_msg_cc = -1;
-static gint ett_zrtp_msg_sc = -1;
+static gint ett_zrtp_msg_hc;
+static gint ett_zrtp_msg_kc;
+static gint ett_zrtp_msg_ac;
+static gint ett_zrtp_msg_cc;
+static gint ett_zrtp_msg_sc;
 
-static gint ett_zrtp_checksum = -1;
+static gint ett_zrtp_checksum;
 
 
-static expert_field ei_zrtp_checksum = EI_INIT;
+static expert_field ei_zrtp_checksum;
 
 static dissector_handle_t zrtp_handle;
 
diff --git a/epan/dissectors/packet-zvt.c b/epan/dissectors/packet-zvt.c
index 78f4bee6e1..33048219b4 100644
--- a/epan/dissectors/packet-zvt.c
+++ b/epan/dissectors/packet-zvt.c
@@ -226,64 +226,64 @@ void proto_reg_handoff_zvt(void);
 
 static dissector_handle_t zvt_tcp_handle;
 
-static int proto_zvt = -1;
-
-static int ett_zvt = -1;
-static int ett_zvt_apdu = -1;
-static int ett_zvt_bitmap = -1;
-static int ett_zvt_tlv_dat_obj = -1;
-static int ett_zvt_tlv_subseq = -1;
-static int ett_zvt_tlv_tag = -1;
-static int ett_zvt_tlv_receipt = -1;
-
-static int hf_zvt_resp_in = -1;
-static int hf_zvt_resp_to = -1;
-static int hf_zvt_serial_char = -1;
-static int hf_zvt_crc = -1;
-static int hf_zvt_ctrl = -1;
-static int hf_zvt_ccrc = -1;
-static int hf_zvt_aprc = -1;
-static int hf_zvt_len = -1;
-static int hf_zvt_data = -1;
-static int hf_zvt_int_status = -1;
-static int hf_zvt_pwd = -1;
-static int hf_zvt_reg_cfg = -1;
-static int hf_zvt_res_code = -1;
-static int hf_zvt_cc = -1;
-static int hf_zvt_amount = -1;
-static int hf_zvt_terminal_id = -1;
-static int hf_zvt_time = -1;
-static int hf_zvt_date = -1;
-static int hf_zvt_card_type = -1;
-static int hf_zvt_bmp = -1;
-static int hf_zvt_tlv_total_len = -1;
-static int hf_zvt_tlv_tag = -1;
-static int hf_zvt_tlv_tag_class = -1;
-static int hf_zvt_tlv_tag_type = -1;
-static int hf_zvt_tlv_len = -1;
-static int hf_zvt_text_lines_line = -1;
-static int hf_zvt_permitted_cmd = -1;
-static int hf_zvt_receipt_type = -1;
-static int hf_zvt_receipt_parameter_positive_customer = -1;
-static int hf_zvt_receipt_parameter_negative_customer = -1;
-static int hf_zvt_receipt_parameter_positive_merchant = -1;
-static int hf_zvt_receipt_parameter_negative_merchant = -1;
-static int hf_zvt_receipt_parameter_customer_before_merchant = -1;
-static int hf_zvt_receipt_parameter_print_short_receipt = -1;
-static int hf_zvt_receipt_parameter_no_product_data = -1;
-static int hf_zvt_receipt_parameter_ecr_as_printer = -1;
-static int hf_zvt_receipt_parameter = -1;
-static int hf_zvt_trace_number = -1;
-static int hf_zvt_expiry_date = -1;
-static int hf_zvt_card_number = -1;
-static int hf_zvt_card_name = -1;
-static int hf_zvt_additional_data = -1;
-static int hf_zvt_characters_per_line = -1;
-static int hf_zvt_receipt_info = -1;
-static int hf_zvt_receipt_info_positive = -1;
-static int hf_zvt_receipt_info_signature = -1;
-static int hf_zvt_receipt_info_negative = -1;
-static int hf_zvt_receipt_info_printing = -1;
+static int proto_zvt;
+
+static int ett_zvt;
+static int ett_zvt_apdu;
+static int ett_zvt_bitmap;
+static int ett_zvt_tlv_dat_obj;
+static int ett_zvt_tlv_subseq;
+static int ett_zvt_tlv_tag;
+static int ett_zvt_tlv_receipt;
+
+static int hf_zvt_resp_in;
+static int hf_zvt_resp_to;
+static int hf_zvt_serial_char;
+static int hf_zvt_crc;
+static int hf_zvt_ctrl;
+static int hf_zvt_ccrc;
+static int hf_zvt_aprc;
+static int hf_zvt_len;
+static int hf_zvt_data;
+static int hf_zvt_int_status;
+static int hf_zvt_pwd;
+static int hf_zvt_reg_cfg;
+static int hf_zvt_res_code;
+static int hf_zvt_cc;
+static int hf_zvt_amount;
+static int hf_zvt_terminal_id;
+static int hf_zvt_time;
+static int hf_zvt_date;
+static int hf_zvt_card_type;
+static int hf_zvt_bmp;
+static int hf_zvt_tlv_total_len;
+static int hf_zvt_tlv_tag;
+static int hf_zvt_tlv_tag_class;
+static int hf_zvt_tlv_tag_type;
+static int hf_zvt_tlv_len;
+static int hf_zvt_text_lines_line;
+static int hf_zvt_permitted_cmd;
+static int hf_zvt_receipt_type;
+static int hf_zvt_receipt_parameter_positive_customer;
+static int hf_zvt_receipt_parameter_negative_customer;
+static int hf_zvt_receipt_parameter_positive_merchant;
+static int hf_zvt_receipt_parameter_negative_merchant;
+static int hf_zvt_receipt_parameter_customer_before_merchant;
+static int hf_zvt_receipt_parameter_print_short_receipt;
+static int hf_zvt_receipt_parameter_no_product_data;
+static int hf_zvt_receipt_parameter_ecr_as_printer;
+static int hf_zvt_receipt_parameter;
+static int hf_zvt_trace_number;
+static int hf_zvt_expiry_date;
+static int hf_zvt_card_number;
+static int hf_zvt_card_name;
+static int hf_zvt_additional_data;
+static int hf_zvt_characters_per_line;
+static int hf_zvt_receipt_info;
+static int hf_zvt_receipt_info_positive;
+static int hf_zvt_receipt_info_signature;
+static int hf_zvt_receipt_info_negative;
+static int hf_zvt_receipt_info_printing;
 
 static int * const receipt_parameter_flag_fields[] = {
     &hf_zvt_receipt_parameter_positive_customer,
@@ -305,7 +305,7 @@ static int * const receipt_info_fields[] = {
     NULL
 };
 
-static expert_field ei_invalid_apdu_len = EI_INIT;
+static expert_field ei_invalid_apdu_len;
 
 static const value_string serial_char[] = {
     { STX, "Start of text (STX)" },